diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index cfc6773..34061cf 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,6 +1,7 @@
 [Builtin Hooks]
 clang_format = true
 xmllint = true
+bpfmt = true
 
 [Builtin Hooks Options]
 clang_format = --commit ${PREUPLOAD_COMMIT} --style file --extensions c,h,cc,cpp
@@ -10,49 +11,10 @@
 
 [Hook Scripts]
 checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}
-                  -fw apps/CtsVerifier/
-                      apps/CtsVerifierUSBCompanion/
-                      common/device-side/bedstead/
-                      common/device-side/util/
-                      hostsidetests/car/
-                      hostsidetests/devicepolicy
-                      hostsidetests/dumpsys
-                      hostsidetests/graphics
-                      hostsidetests/inputmethodservice/
-                      hostsidetests/multiuser/
-                      hostsidetests/scopedstorage/
-                      hostsidetests/stagedinstall/
-                      hostsidetests/userspacereboot/
-                      libs/
-                      tests/app/
-                      tests/autofillservice/
-                      tests/contentcaptureservice/
-                      tests/devicepolicy/
-                      tests/inputmethod/
-                      tests/tests/animation/
-                      tests/tests/carrierapi/
-                      tests/tests/content/
-                      tests/tests/graphics/
-                      tests/tests/hardware/
-                      tests/tests/packageinstaller/atomicinstall/
-                      tests/tests/permission2/
-                      tests/tests/permission/
-                      tests/tests/preference/
-                      tests/tests/print/
-                      tests/tests/telephony/
-                      tests/tests/telephony2/
-                      tests/tests/telephony3/
-                      tests/tests/telephony4/
-                      tests/tests/telephonyprovider/
-                      tests/tests/text/
-                      tests/tests/theme/
-                      tests/tests/transition/
-                      tests/tests/uirendering/
-                      tests/tests/view/
-                      tests/tests/widget/
 
 ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py -f ${PREUPLOAD_FILES}
 
 splits_native_libs_hook = ${REPO_ROOT}/cts/hostsidetests/appsecurity/test-apps/SplitApp/check_not_modify_libs.sh
                           ${PREUPLOAD_FILES}
 
+bedstead_aosp_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "common/device-side/bedstead/"
diff --git a/apps/CameraITS/build/envsetup.sh b/apps/CameraITS/build/envsetup.sh
index c52e57e..224a1c5 100644
--- a/apps/CameraITS/build/envsetup.sh
+++ b/apps/CameraITS/build/envsetup.sh
@@ -61,7 +61,7 @@
 
 
 
-for M in sensor_fusion_utils camera_properties_utils capture_request_utils opencv_processing_utils image_processing_utils its_session_utils scene_change_utils target_exposure_utils
+for M in sensor_fusion_utils camera_properties_utils capture_request_utils opencv_processing_utils image_processing_utils its_session_utils target_exposure_utils image_fov_utils
 do
     python "utils/$M.py" 2>&1 | grep -q "OK" || \
         echo ">> Unit test for $M failed" >&2
diff --git a/apps/CameraITS/config.yml b/apps/CameraITS/config.yml
index fc712b3..2a668c0 100644
--- a/apps/CameraITS/config.yml
+++ b/apps/CameraITS/config.yml
@@ -28,7 +28,8 @@
       brightness: 96
       chart_distance: 31.0
       debug_mode: "False"  # quotes are needed here
-      chart_loc_arg: ""
+      lighting_cntl: <controller-type>  # can be arduino or "None"
+      lighting_ch: <controller-channel>
       camera: <camera-id>
       scene: <scene-name>  # if <scene-name> left as-is runs all scenes
 
diff --git a/apps/CameraITS/tests/its_base_test.py b/apps/CameraITS/tests/its_base_test.py
index afa0128..ae4958ec 100644
--- a/apps/CameraITS/tests/its_base_test.py
+++ b/apps/CameraITS/tests/its_base_test.py
@@ -22,6 +22,7 @@
 from mobly.controllers import android_device
 
 import its_session_utils
+import lighting_control_utils
 
 ADAPTIVE_BRIGHTNESS_OFF = '0'
 TABLET_CMD_DELAY_SEC = 0.5  # found empirically
@@ -37,8 +38,7 @@
 NOT_YET_MANDATED = {
     'scene0': [['test_test_patterns', 30],
                ['test_tonemap_curve', 30]],
-    'scene1_1': [['test_ae_precapture_trigger', 28],
-                 ['test_channel_saturation', 29]],
+    'scene1_1': [['test_ae_precapture_trigger', 28]],
     'scene1_2': [],
     'scene2_a': [['test_jpeg_quality', 30]],
     'scene2_b': [['test_auto_per_frame_control', NOT_YET_MANDATED_ALL]],
@@ -50,7 +50,6 @@
     'scene5': [],
     'scene6': [['test_zoom', 30]],
     'sensor_fusion': [],
-    'scene_change': [['test_scene_change', 31]]
 }
 
 
@@ -77,10 +76,13 @@
     if self.user_params.get('chart_distance'):
       self.chart_distance = float(self.user_params['chart_distance'])
       logging.debug('Chart distance: %s cm', self.chart_distance)
-    if self.user_params.get('chart_loc_arg'):
-      self.chart_loc_arg = self.user_params['chart_loc_arg']
+    if (self.user_params.get('lighting_cntl') and
+        self.user_params.get('lighting_ch')):
+      self.lighting_cntl = self.user_params['lighting_cntl']
+      self.lighting_ch = str(self.user_params['lighting_ch'])
     else:
-      self.chart_loc_arg = ''
+      self.lighting_cntl = 'None'
+      self.lighting_ch = '1'
     if self.user_params.get('debug_mode'):
       self.debug_mode = True if self.user_params[
           'debug_mode'] == 'True' else False
@@ -115,6 +117,13 @@
 
     self._setup_devices(num_devices)
 
+    arduino_serial_port = lighting_control_utils.lighting_control(
+        self.lighting_cntl, self.lighting_ch)
+    if arduino_serial_port:
+      lighting_control_utils.set_light_brightness(
+          self.lighting_ch, 255, arduino_serial_port)
+      logging.debug('Light is turned ON.')
+
   def _setup_devices(self, num):
     """Sets up each device in parallel if more than one device."""
     if num not in VALID_NUM_DEVICES:
@@ -132,6 +141,7 @@
   def setup_dut(self, device):
     self.dut.adb.shell(
         'am start -n com.android.cts.verifier/.CtsVerifierActivity')
+    logging.debug('Setting up device: %s', str(device))
     # Wait for the app screen to appear.
     time.sleep(WAIT_TIME_SEC)
 
@@ -171,17 +181,18 @@
     logging.debug('dumpsys window output: %s', output.decode('utf-8').strip())
     output_list = str(output.decode('utf-8')).strip().split(' ')
     for val in output_list:
-        if 'LandscapeRotation' in val:
-            landscape_val = str(val.split('=')[-1])
-            # For some tablets the values are in constant forms such as ROTATION_90
-            if 'ROTATION_90' in landscape_val:
-                landscape_val = '1'
-            logging.debug('Changing the orientation to landscape mode.')
-            self.tablet.adb.shell(['settings', 'put', 'system', 'user_rotation',
-                                   landscape_val])
-            break
-    logging.debug('Reported tablet orientation is: %d',
-                  int(self.tablet.adb.shell('settings get system user_rotation')))
+      if 'LandscapeRotation' in val:
+        landscape_val = str(val.split('=')[-1])
+        # For some tablets the values are in constant forms such as ROTATION_90
+        if 'ROTATION_90' in landscape_val:
+          landscape_val = '1'
+        logging.debug('Changing the orientation to landscape mode.')
+        self.tablet.adb.shell(['settings', 'put', 'system', 'user_rotation',
+                               landscape_val])
+        break
+    logging.debug(
+        'Reported tablet orientation is: %d',
+        int(self.tablet.adb.shell('settings get system user_rotation')))
 
   def parse_hidden_camera_id(self):
     """Parse the string of camera ID into an array.
diff --git a/apps/CameraITS/tests/scene0/test_metadata.py b/apps/CameraITS/tests/scene0/test_metadata.py
index b0995a7..c6a69a3 100644
--- a/apps/CameraITS/tests/scene0/test_metadata.py
+++ b/apps/CameraITS/tests/scene0/test_metadata.py
@@ -23,6 +23,8 @@
 import capture_request_utils
 import its_session_utils
 
+_HYPERFOCAL_MIN = 0.02
+
 
 class MetadataTest(its_base_test.ItsBaseTest):
   """Test the validity of some metadata entries.
@@ -119,7 +121,8 @@
         check(self, props['android.sensor.blackLevelPattern'] is not None,
               'props["android.sensor.blackLevelPattern"] is not None')
 
-      assert not self.failed
+      if self.failed:
+        raise AssertionError('props failure. Check test_log.DEBUG.')
 
       if not camera_properties_utils.legacy(props):
         # Test: pixel_pitch, FOV, and hyperfocal distance are reasonable
@@ -132,23 +135,27 @@
         pixel_pitch_w = (sensor_size['width'] / fmts[0]['width'] * 1E3)
         logging.debug('Assert pixel_pitch WxH: %.2f um, %.2f um', pixel_pitch_w,
                       pixel_pitch_h)
-        assert 0.7 <= pixel_pitch_w <= 10
-        assert 0.7 <= pixel_pitch_h <= 10
-        assert 0.333 <= pixel_pitch_w/pixel_pitch_h <= 3.0
+        if (not 0.7 <= pixel_pitch_w <= 10 or
+            not 0.7 <= pixel_pitch_h <= 10 or
+            not 0.333 <= pixel_pitch_w/pixel_pitch_h <= 3.0):
+          raise AssertionError(
+              f'Pixel pitch error! w: {pixel_pitch_w}, h: {pixel_pitch_h}')
 
         diag = math.sqrt(sensor_size['height']**2 + sensor_size['width']**2)
         fl = md['android.lens.focalLength']
         logging.debug('Focal length: %.3f', fl)
         fov = 2 * math.degrees(math.atan(diag / (2 * fl)))
         logging.debug('Assert field of view: %.1f degrees', fov)
-        assert 10 <= fov <= 130
+        if not 10 <= fov <= 130:
+          raise AssertionError(f'FoV error: {fov:.1f}')
 
         if camera_properties_utils.lens_approx_calibrated(props):
           diopter_hyperfocal = props['android.lens.info.hyperfocalDistance']
           if diopter_hyperfocal != 0.0:
             hyperfocal = 1.0 / diopter_hyperfocal
-            logging.debug('Assert hyperfocal distance: %.2f m', hyperfocal)
-            assert 0.02 <= hyperfocal
+            if _HYPERFOCAL_MIN > hyperfocal:
+              raise AssertionError('hyperfocal distance error: '
+                                   f'{hyperfocal:.2f}, MIN: {_HYPERFOCAL_MIN}')
 
         logging.debug('Minimum focus distance: %3.f',
                       props['android.lens.info.minimumFocusDistance'])
diff --git a/apps/CameraITS/tests/scene0/test_param_sensitivity_burst.py b/apps/CameraITS/tests/scene0/test_param_sensitivity_burst.py
index 863ffbc..b5f672d 100644
--- a/apps/CameraITS/tests/scene0/test_param_sensitivity_burst.py
+++ b/apps/CameraITS/tests/scene0/test_param_sensitivity_burst.py
@@ -46,7 +46,8 @@
       sens_step = (sens_range[1] - sens_range[0]) // NUM_STEPS
       sens_list = range(sens_range[0], sens_range[1], sens_step)
       exp = min(props['android.sensor.info.exposureTimeRange'])
-      assert exp != 0
+      if exp == 0:
+        raise AssertionError('Minimum exposure time is 0')
       reqs = [
           capture_request_utils.manual_capture_request(s, exp)
           for s in sens_list
@@ -56,11 +57,10 @@
       caps = cam.do_capture(reqs, fmt)
       for i, cap in enumerate(caps):
         s_req = sens_list[i]
-        s_res = cap['metadata']['android.sensor.sensitivity']
-        msg = 's_write: %d, s_read: %d, TOL: %.2f' % (s_req, s_res,
-                                                      ERROR_TOLERANCE)
-        assert s_req >= s_res, msg
-        assert s_res / float(s_req) > ERROR_TOLERANCE, msg
+        s_cap = cap['metadata']['android.sensor.sensitivity']
+        if (s_req < s_cap or s_cap / float(s_req) < ERROR_TOLERANCE):
+          raise AssertionError(f's_request: {s_req}, s_capture: {s_cap}, '
+                               f'TOL: {ERROR_TOLERANCE:.2f}')
 
 
 if __name__ == '__main__':
diff --git a/apps/CameraITS/tests/scene0/test_read_write.py b/apps/CameraITS/tests/scene0/test_read_write.py
index e8b514a..32bcd56 100644
--- a/apps/CameraITS/tests/scene0/test_read_write.py
+++ b/apps/CameraITS/tests/scene0/test_read_write.py
@@ -56,7 +56,8 @@
       logging.debug('sensor sensitivity range: %s', sens_range)
 
       # determine if exposure test range is within sensor reported range
-      assert sensor_exp_range[0] != 0
+      if sensor_exp_range[0] == 0:
+        raise AssertionError('Min expsoure == 0')
       exp_range = []
       if sensor_exp_range[0] < TEST_EXP_RANGE[0]:
         exp_range.append(TEST_EXP_RANGE[0])
@@ -135,8 +136,11 @@
             logging.debug('e_write: %d, e_read: %d, RTOL: %.2f',
                           fail['e_write'], fail['e_read'], RTOL_EXP_GAIN)
 
-        # assert PASS/FAIL
-        assert not e_failed + s_failed
+        # PASS/FAIL
+        if e_failed:
+          raise AssertionError(f'Exposure fails: {e_failed}')
+        if s_failed:
+          raise AssertionError(f'Sensitivity fails: {s_failed}')
 
 
 if __name__ == '__main__':
diff --git a/apps/CameraITS/tests/scene0/test_sensor_events.py b/apps/CameraITS/tests/scene0/test_sensor_events.py
index e8afbb2..f5c165f 100644
--- a/apps/CameraITS/tests/scene0/test_sensor_events.py
+++ b/apps/CameraITS/tests/scene0/test_sensor_events.py
@@ -51,9 +51,9 @@
       for key, existing in sensors.items():
         # Vibrator does not return any sensor event. b/142653973
         if existing and key != 'vibrator':
-          e_msg = 'Sensor %s has no events!' % key
           # Check len(events[key]) > 0
-          assert events[key], e_msg
+          if not events[key]:
+            raise AssertionError(f'Sensor {key} has no events!')
 
 
 if __name__ == '__main__':
diff --git a/apps/CameraITS/tests/scene0/test_test_patterns.py b/apps/CameraITS/tests/scene0/test_test_patterns.py
index dbf1ee2..6aced4e 100644
--- a/apps/CameraITS/tests/scene0/test_test_patterns.py
+++ b/apps/CameraITS/tests/scene0/test_test_patterns.py
@@ -153,10 +153,11 @@
                                          True)
 
       # Check pattern for correctness
-      assert check_pattern(cap, props, pattern)
+      if not check_pattern(cap, props, pattern):
+        raise AssertionError(f'Pattern {pattern} failed')
     else:
       logging.debug('%d not in android.sensor.availableTestPatternModes.',
-                    (pattern))
+                    pattern)
 
 
 class TestPatterns(its_base_test.ItsBaseTest):
diff --git a/apps/CameraITS/tests/scene0/test_unified_timestamps.py b/apps/CameraITS/tests/scene0/test_unified_timestamps.py
index f7e5991..a4c83ad 100644
--- a/apps/CameraITS/tests/scene0/test_unified_timestamps.py
+++ b/apps/CameraITS/tests/scene0/test_unified_timestamps.py
@@ -63,7 +63,8 @@
       for sensor, existing in sensors.items():
       # Vibrator doesn't generate outputs: b/142653973
         if existing and sensor != 'vibrator':
-          assert events[sensor], '%s sensor has no events!' % sensor
+          if not events[sensor]:
+            raise AssertionError(f'{sensor} has no events!')
           ts_sensor_first[sensor] = events[sensor][0]['time']
           ts_sensor_last[sensor] = events[sensor][-1]['time']
 
@@ -78,8 +79,12 @@
         if existing and sensor != 'vibrator':
           logging.debug('%s timestamps: %d %d', sensor, ts_sensor_first[sensor],
                         ts_sensor_last[sensor])
-          assert ts_image0 < ts_sensor_first[sensor] < ts_image1
-          assert ts_image0 < ts_sensor_last[sensor] < ts_image1
+          if (not ts_image0 < ts_sensor_first[sensor] < ts_image1 or
+              not ts_image0 < ts_sensor_last[sensor] < ts_image1):
+            raise AssertionError(
+                f'{sensor} times not bounded by camera! camera: '
+                f'{ts_image0}:{ts_image1}, {sensor}: '
+                f'{ts_sensor_first[sensor]}:{ts_sensor_last[sensor]}')
 
 
 if __name__ == '__main__':
diff --git a/apps/CameraITS/tests/scene0/test_vibration_restriction.py b/apps/CameraITS/tests/scene0/test_vibration_restriction.py
index 45c82e9..0ece4b0 100644
--- a/apps/CameraITS/tests/scene0/test_vibration_restriction.py
+++ b/apps/CameraITS/tests/scene0/test_vibration_restriction.py
@@ -102,10 +102,10 @@
           'Accel variance with/without/restricted vibration (%f, %f, %f)',
           var_w_vibration, var_wo_vibration, var_w_vibration_restricted)
 
-      e_msg = 'Device vibrated while vibration is muted'
       vibration_variance = var_w_vibration_restricted < (
           var_wo_vibration * THRESHOLD_VIBRATION_VAR)
-      assert vibration_variance, e_msg
+      if not vibration_variance:
+        raise AssertionError('Device vibrated while vibration is muted.')
 
 
 if __name__ == '__main__':
diff --git a/apps/CameraITS/tests/scene1_1/test_3a.py b/apps/CameraITS/tests/scene1_1/test_3a.py
index 9db3bdc..9100e79 100644
--- a/apps/CameraITS/tests/scene1_1/test_3a.py
+++ b/apps/CameraITS/tests/scene1_1/test_3a.py
@@ -28,6 +28,11 @@
 NAME = os.path.splitext(os.path.basename(__file__))[0]
 
 
+def assert_is_number(x):
+  if np.isnan(x):
+    raise AssertionError(f'{x} is not a number!')
+
+
 class ThreeATest(its_base_test.ItsBaseTest):
   """Test basic camera 3A behavior.
 
@@ -57,15 +62,22 @@
       logging.debug('AE: sensitivity %d, exposure %dns', s, e)
       logging.debug('AF: distance %.3f', focus)
 
-      assert len(awb_gains) == AWB_GAINS_LENGTH
+      if len(awb_gains) != AWB_GAINS_LENGTH:
+        raise AssertionError(
+            f'AWB gains has unexpected # of terms! {awb_gains}')
       for g in awb_gains:
-        assert not np.isnan(g)
-      assert len(awb_xform) == AWB_XFORM_LENGTH
+        assert_is_number(g)
+      if len(awb_xform) != AWB_XFORM_LENGTH:
+        raise AssertionError(
+            f'AWB transform has unexpected # of terms! {awb_xform}')
       for x in awb_xform:
-        assert not np.isnan(x)
-      assert s > 0
-      assert e > 0
-      assert focus >= 0
+        assert_is_number(x)
+      if s <= 0:
+        raise AssertionError(f'sensitivity {s} <= 0!')
+      if e <= 0:
+        raise AssertionError(f'exposure {e} <= 0!')
+      if focus < 0:
+        raise AssertionError(f'focus distance {focus} < 0!')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_ae_precapture_trigger.py b/apps/CameraITS/tests/scene1_1/test_ae_precapture_trigger.py
index dae3c05..49886a5 100644
--- a/apps/CameraITS/tests/scene1_1/test_ae_precapture_trigger.py
+++ b/apps/CameraITS/tests/scene1_1/test_ae_precapture_trigger.py
@@ -86,8 +86,8 @@
         state = cap['metadata']['android.control.aeState']
         msg = 'AE state after manual request %d: %d' % (i, state)
         logging.debug('%s', msg)
-        e_msg = msg + ' AE_INACTIVE: %d' % AE_INACTIVE
-        assert state == AE_INACTIVE, e_msg
+        if state != AE_INACTIVE:
+          raise AssertionError(f'{msg} AE_INACTIVE: {AE_INACTIVE}')
 
       # Capture auto request and verify the AE state: no trigger.
       logging.debug('Auto capture')
@@ -97,9 +97,9 @@
       state = cap['metadata']['android.control.aeState']
       msg = 'AE state after auto request: %d' % state
       logging.debug('%s', msg)
-      e_msg = msg + ' AE_SEARCHING: %d, AE_CONVERGED: %d' % (
-          AE_SEARCHING, AE_CONVERGED)
-      assert state in [AE_SEARCHING, AE_CONVERGED], e_msg
+      if state not in [AE_SEARCHING, AE_CONVERGED]:
+        raise AssertionError(f'{msg} AE_SEARCHING: {AE_SEARCHING}, '
+                             f'AE_CONVERGED: {AE_CONVERGED}')
 
       # Capture auto request with a precapture trigger.
       logging.debug('Auto capture with precapture trigger')
@@ -108,9 +108,10 @@
       state = cap['metadata']['android.control.aeState']
       msg = 'AE state after auto request with precapture trigger: %d' % state
       logging.debug('%s', msg)
-      e_msg = msg + ' AE_SEARCHING: %d, AE_CONVERGED: %d, AE_PRECAPTURE: %d' % (
-          AE_SEARCHING, AE_CONVERGED, AE_PRECAPTURE)
-      assert state in [AE_SEARCHING, AE_CONVERGED, AE_PRECAPTURE], e_msg
+      if state not in [AE_SEARCHING, AE_CONVERGED, AE_PRECAPTURE]:
+        raise AssertionError(f'{msg} AE_SEARCHING: {AE_SEARCHING}, '
+                             f'AE_CONVERGED: {AE_CONVERGED}, '
+                             f'AE_PRECAPTURE: {AE_PRECAPTURE}')
 
       # Capture some more auto requests, and AE should converge.
       logging.debug('Additional auto captures')
@@ -122,8 +123,8 @@
         logging.debug('%s', msg)
         if state == AE_CONVERGED:
           return
-      e_msg = msg + ' AE_CONVERGED: %d' % AE_CONVERGED
-      assert state == AE_CONVERGED, e_msg
+      if state != AE_CONVERGED:
+        raise AssertionError(f'{msg}  AE_CONVERGED: {AE_CONVERGED}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_auto_vs_manual.py b/apps/CameraITS/tests/scene1_1/test_auto_vs_manual.py
index 72c791d..2cf6247 100644
--- a/apps/CameraITS/tests/scene1_1/test_auto_vs_manual.py
+++ b/apps/CameraITS/tests/scene1_1/test_auto_vs_manual.py
@@ -123,22 +123,22 @@
 
       # Check AWB gains & transform in manual results match values from do_3a
       for g, x in [(awb_gains_m1, awb_xform_m1), (awb_gains_m2, awb_xform_m2)]:
-        e_msg = 'awb_xform 3A: %s, manual: %s, ATOL=%.2f' % (
-            str(awb_xform), str(x), AWB_MANUAL_ATOL)
-        assert np.allclose(awb_xform, x, atol=AWB_MANUAL_ATOL, rtol=0), e_msg
-        e_msg = 'awb_gains 3A: %s, manual: %s, ATOL=%.2f' % (
-            str(awb_gains), str(g), AWB_MANUAL_ATOL)
-        assert np.allclose(awb_gains, g, atol=AWB_MANUAL_ATOL, rtol=0), e_msg
+        if not np.allclose(awb_xform, x, atol=AWB_MANUAL_ATOL, rtol=0):
+          raise AssertionError(
+              f'awb_xform 3A: {awb_xform}, manual: {x}, ATOL={AWB_MANUAL_ATOL}')
+        if not np.allclose(awb_gains, g, atol=AWB_MANUAL_ATOL, rtol=0):
+          raise AssertionError(
+              f'awb_gains 3A: {awb_gains}, manual: {g}, ATOL={AWB_MANUAL_ATOL}')
 
       # Check AWB gains & transform in auto results match values from do_3a
-      e_msg = 'awb_xform 3A: %s, auto: %s, RTOL=%.2f, ATOL=%.2f' % (
-          str(awb_xform), str(awb_xform_a), AWB_AUTO_RTOL, AWB_AUTO_ATOL)
-      assert np.allclose(awb_xform_a, awb_xform, atol=AWB_AUTO_ATOL,
-                         rtol=AWB_AUTO_RTOL), e_msg
-      e_msg = 'awb_gains 3A: %s, auto: %s, RTOL=%.2f, ATOL=%.2f' % (
-          str(awb_gains), str(awb_gains_a), AWB_AUTO_RTOL, AWB_AUTO_ATOL)
-      assert np.allclose(awb_gains_a, awb_gains, atol=AWB_AUTO_ATOL,
-                         rtol=AWB_AUTO_RTOL), e_msg
+      if not np.allclose(awb_xform_a, awb_xform, atol=AWB_AUTO_ATOL,
+                         rtol=AWB_AUTO_RTOL):
+        raise AssertionError(f'awb_xform 3A: {awb_xform}, auto: {awb_xform_a},'
+                             f'RTOL={AWB_AUTO_RTOL}, ATOL={AWB_AUTO_ATOL}')
+      if not np.allclose(awb_gains_a, awb_gains, atol=AWB_AUTO_ATOL,
+                         rtol=AWB_AUTO_RTOL):
+        raise AssertionError(f'awb_gains 3A: {awb_gains}, auto: {awb_gains_a},'
+                             f'RTOL={AWB_AUTO_RTOL}, ATOL={AWB_AUTO_ATOL}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_black_white.py b/apps/CameraITS/tests/scene1_1/test_black_white.py
index 6cf9de0..356e349 100644
--- a/apps/CameraITS/tests/scene1_1/test_black_white.py
+++ b/apps/CameraITS/tests/scene1_1/test_black_white.py
@@ -15,6 +15,7 @@
 
 
 import logging
+import math
 import os.path
 import matplotlib
 from matplotlib import pylab
@@ -138,23 +139,23 @@
 
       # Assert blacks below CH_THRESH_BLACK
       for ch, mean in enumerate(black_means):
-        e_msg = '%s black: %.1f, THRESH: %.f' % (
-            COLOR_PLANES[ch], mean, CH_THRESH_BLACK)
-        assert mean < CH_THRESH_BLACK, e_msg
+        if mean >= CH_THRESH_BLACK:
+          raise AssertionError(f'{COLOR_PLANES[ch]} black: {mean:.1f}, '
+                               f'THRESH: {CH_THRESH_BLACK}')
 
       # Assert whites above CH_THRESH_WHITE
       for ch, mean in enumerate(white_means):
-        e_msg = '%s white: %.1f, THRESH: %.f' % (
-            COLOR_PLANES[ch], mean, CH_THRESH_WHITE)
-        assert mean > CH_THRESH_WHITE, e_msg
+        if mean <= CH_THRESH_WHITE:
+          raise AssertionError(f'{COLOR_PLANES[ch]} white: {mean:.1f}, '
+                               f'THRESH: {CH_THRESH_WHITE}')
 
       # Assert channels saturate evenly (was test_channel_saturation)
       first_api_level = its_session_utils.get_first_api_level(self.dut.serial)
       if first_api_level > _ANDROID10_API_LEVEL:
-        e_msg = 'ch saturation not equal! RGB: %s, ATOL: %.f' % (
-            str(white_means), CH_TOL_WHITE)
-        assert np.isclose(
-            np.amin(white_means), np.amax(white_means), atol=CH_TOL_WHITE), e_msg
+        if not math.isclose(
+            np.amin(white_means), np.amax(white_means), abs_tol=CH_TOL_WHITE):
+          raise AssertionError('channel saturation not equal! '
+                               f'RGB: {white_means}, ATOL: {CH_TOL_WHITE}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_burst_sameness_manual.py b/apps/CameraITS/tests/scene1_1/test_burst_sameness_manual.py
index b43067c..8354cf1 100644
--- a/apps/CameraITS/tests/scene1_1/test_burst_sameness_manual.py
+++ b/apps/CameraITS/tests/scene1_1/test_burst_sameness_manual.py
@@ -128,11 +128,10 @@
       # PASS/FAIL based on center patch similarity.
       for plane, means in enumerate([r_means, g_means, b_means]):
         spread = max(means) - min(means)
-        msg = '%s spread: %.5f, spread_thresh: %.2f' % (
-            COLORS[plane], spread, spread_thresh)
-        logging.debug('%s', msg)
-        assert spread < spread_thresh, msg
+        logging.debug('%s spread: %.5f', COLORS[plane], spread)
+        if spread > spread_thresh:
+          raise AssertionError(f'{COLORS[plane]} spread > THRESH. spread: '
+                               f'{spread}, THRESH: {spread_thresh:.2f}')
 
 if __name__ == '__main__':
   test_runner.main()
-
diff --git a/apps/CameraITS/tests/scene1_1/test_capture_result.py b/apps/CameraITS/tests/scene1_1/test_capture_result.py
index 73dfe5a..304a737 100644
--- a/apps/CameraITS/tests/scene1_1/test_capture_result.py
+++ b/apps/CameraITS/tests/scene1_1/test_capture_result.py
@@ -83,8 +83,10 @@
     logging.debug('AWB region: %s', str(metadata['android.control.awbRegions']))
 
   # Color correction gains and transform should be the same size
-  assert len(awb_gains) == AWB_GAINS_NUM
-  assert len(awb_xform) == AWB_XFORM_NUM
+  if len(awb_gains) != AWB_GAINS_NUM:
+    raise AssertionError(f'AWB gains wrong length! {awb_gains}')
+  if len(awb_xform) != AWB_XFORM_NUM:
+    raise AssertionError(f'AWB transform wrong length! {awb_xform}')
 
 
 def test_auto(cam, props, log_path):
@@ -110,23 +112,33 @@
 
   ctrl_mode = metadata['android.control.mode']
   logging.debug('Control mode: %d', ctrl_mode)
-  assert ctrl_mode == 1, 'ctrl_mode: %d' % ctrl_mode
+  if ctrl_mode != 1:
+    raise AssertionError(f'ctrl_mode != 1: {ctrl_mode}')
 
   # Color correction gain and transform must be valid.
   metadata_checks(metadata, props)
   awb_gains = metadata['android.colorCorrection.gains']
   awb_xform = metadata['android.colorCorrection.transform']
-  assert all([g > 0 for g in awb_gains])
-  assert all([t['denominator'] != 0 for t in awb_xform])
+  if not all([g > 0 for g in awb_gains]):
+    raise AssertionError(f'AWB gains has negative terms: {awb_gains}')
+  if not all([t['denominator'] != 0 for t in awb_xform]):
+    raise AssertionError(f'AWB transform has 0 denominators: {awb_xform}')
 
   # Color correction should not match the manual settings.
-  assert not np.allclose(awb_gains, MANUAL_AWB_GAINS, atol=ISCLOSE_ATOL)
-  assert not all([is_close_rational(awb_xform[i], MANUAL_AWB_XFORM[i])
-                  for i in range(AWB_XFORM_NUM)])
+  if np.allclose(awb_gains, MANUAL_AWB_GAINS, atol=ISCLOSE_ATOL):
+    raise AssertionError('Manual and automatic AWB gains are same! '
+                         f'manual: {MANUAL_AWB_GAINS}, auto: {awb_gains}, '
+                         f'ATOL: {ISCLOSE_ATOL}')
+  if all([is_close_rational(awb_xform[i], MANUAL_AWB_XFORM[i])
+          for i in range(AWB_XFORM_NUM)]):
+    raise AssertionError('Manual and automatic AWB transforms are same! '
+                         f'manual: {MANUAL_AWB_XFORM}, auto: {awb_xform}, '
+                         f'ATOL: {ISCLOSE_ATOL}')
 
   # Exposure time must be valid.
   exp_time = metadata['android.sensor.exposureTime']
-  assert exp_time > 0
+  if exp_time <= 0:
+    raise AssertionError(f'exposure time is <= 0! {exp_time}')
 
   # Draw lens shading correction map
   lsc_obj = metadata['android.statistics.lensShadingCorrectionMap']
@@ -173,35 +185,47 @@
 
   ctrl_mode = metadata['android.control.mode']
   logging.debug('Control mode: %d', ctrl_mode)
-  assert ctrl_mode == 0, 'ctrl_mode: %d' % ctrl_mode
+  if ctrl_mode != 0:
+    raise AssertionError(f'ctrl_mode: {ctrl_mode}')
 
   # Color correction gains and transform should be the same size and
   # values as the manually set values.
   metadata_checks(metadata, props)
   awb_gains = metadata['android.colorCorrection.gains']
   awb_xform = metadata['android.colorCorrection.transform']
-  assert (all([np.isclose(awb_gains[i], MANUAL_GAINS_OK[0][i],
+  if not (all([np.isclose(awb_gains[i], MANUAL_GAINS_OK[0][i],
                           atol=ISCLOSE_ATOL) for i in range(AWB_GAINS_NUM)]) or
           all([np.isclose(awb_gains[i], MANUAL_GAINS_OK[1][i],
                           atol=ISCLOSE_ATOL) for i in range(AWB_GAINS_NUM)]) or
           all([np.isclose(awb_gains[i], MANUAL_GAINS_OK[2][i],
-                          atol=ISCLOSE_ATOL) for i in range(AWB_GAINS_NUM)]))
-  assert (all([is_close_rational(awb_xform[i], MANUAL_AWB_XFORM[i])
-               for i in range(AWB_XFORM_NUM)]))
+                          atol=ISCLOSE_ATOL) for i in range(AWB_GAINS_NUM)])):
+    raise AssertionError('request/capture mismatch in AWB gains! '
+                         f'req: {MANUAL_GAINS_OK}, cap: {awb_gains}, '
+                         f'ATOL: {ISCLOSE_ATOL}')
+  if not (all([is_close_rational(awb_xform[i], MANUAL_AWB_XFORM[i])
+               for i in range(AWB_XFORM_NUM)])):
+    raise AssertionError('request/capture mismatch in AWB transforms! '
+                         f'req: {MANUAL_AWB_XFORM}, cap: {awb_xform}, '
+                         f'ATOL: {ISCLOSE_ATOL}')
 
   # The returned tonemap must be linear.
   curves = [metadata['android.tonemap.curve']['red'],
             metadata['android.tonemap.curve']['green'],
             metadata['android.tonemap.curve']['blue']]
   logging.debug('Tonemap: %s', str(curves[0][1::16]))
-  for c in curves:
-    assert c, 'c in curves is empty.'
-    assert all([np.isclose(c[i], c[i+1], atol=ISCLOSE_ATOL)
-                for i in range(0, len(c), 2)])
+  for j, c in enumerate(curves):
+    if not c:
+      raise AssertionError('c in curves is empty.')
+    if not all([np.isclose(c[i], c[i+1], atol=ISCLOSE_ATOL)
+                for i in range(0, len(c), 2)]):
+      raise AssertionError(f"tonemap 'RGB'[i] is not linear! {c}")
 
   # Exposure time must be close to the requested exposure time.
   exp_time = metadata['android.sensor.exposureTime']
-  assert np.isclose(exp_time*1.0E-6, exp_min*1.0E-6, atol=ISCLOSE_ATOL)
+  if not np.isclose(exp_time, exp_min, atol=ISCLOSE_ATOL/1E-06):
+    raise AssertionError('request/capture exposure time mismatch! '
+                         f'req: {exp_min}, cap: {exp_time}, '
+                         f'ATOL: {ISCLOSE_ATOL/1E-6}')
 
   # Lens shading map must be valid
   lsc_obj = metadata['android.statistics.lensShadingCorrectionMap']
@@ -209,9 +233,11 @@
   lsc_map_w = lsc_obj['width']
   lsc_map_h = lsc_obj['height']
   logging.debug('LSC map: %dx%d, %s', lsc_map_w, lsc_map_h, str(lsc_map[:8]))
-  assert (lsc_map_w > 0 and lsc_map_h > 0 and
-          lsc_map_w*lsc_map_h*4 == len(lsc_map))
-  assert all([m >= 1 for m in lsc_map])
+  if not (lsc_map_w > 0 and lsc_map_h > 0 and
+          lsc_map_w*lsc_map_h*4 == len(lsc_map)):
+    raise AssertionError(f'Incorrect lens shading map size! {lsc_map}')
+  if not all([m >= 1 for m in lsc_map]):
+    raise AssertionError(f'Lens shading map has negative vals! {lsc_map}')
 
   # Draw lens shading correction map
   draw_lsc_plot(lsc_map_w, lsc_map_h, lsc_map, 'manual', log_path)
diff --git a/apps/CameraITS/tests/scene1_1/test_crop_region_raw.py b/apps/CameraITS/tests/scene1_1/test_crop_region_raw.py
index 69cc33f..8a598bd 100644
--- a/apps/CameraITS/tests/scene1_1/test_crop_region_raw.py
+++ b/apps/CameraITS/tests/scene1_1/test_crop_region_raw.py
@@ -71,7 +71,8 @@
 
       # Calculate a center crop region.
       zoom = min(3.0, camera_properties_utils.get_max_digital_zoom(props))
-      assert zoom >= 1, 'zoom: %.2f' % zoom
+      if zoom < 1:
+        raise AssertionError(f'zoom: {zoom:.2f}')
       crop_w = aw // zoom
       crop_h = ah // zoom
 
@@ -129,13 +130,13 @@
           ex = aw * err_delta
           ey = ah * err_delta
         logging.debug('error X, Y: %.2f, %.2f', ex, ey)
-        e_msg = 'expected: %s, reported: %s, ex: %.2f, ex: %.2f' % (
-            str(cr_expected), str(cr_reported), ex, ey)
-        assert (
+        if not (
             (abs(cr_expected['left'] - cr_reported['left']) <= ex) and
             (abs(cr_expected['right'] - cr_reported['right']) <= ex) and
             (abs(cr_expected['top'] - cr_reported['top']) <= ey) and
-            (abs(cr_expected['bottom'] - cr_reported['bottom']) <= ey)), e_msg
+            (abs(cr_expected['bottom'] - cr_reported['bottom']) <= ey)):
+          raise AssertionError(f'expected: {cr_expected}, reported: '
+                               f'{cr_reported}, ex: {ex:.2f}, ey: {ey:.2f}')
 
       # Also check the image content; 3 of the 4 shots should match.
       # Note that all the shots are RGB below; the variable names correspond
@@ -178,10 +179,12 @@
       logging.debug('YUV diff (crop vs. non-crop): %.3f', diff_yuv)
       logging.debug('RAW diff (crop vs. non-crop): %.3f', diff_raw)
 
-      assert diff_yuv > DIFF_THRESH, 'diff_yuv: %.3f, THRESH: %.2f' % (
-          diff_yuv, DIFF_THRESH)
-      assert diff_raw < DIFF_THRESH, 'diff_raw: %.3f, THRESH: %.2f' % (
-          diff_raw, DIFF_THRESH)
+      if diff_yuv <= DIFF_THRESH:
+        raise AssertionError('YUV diff too small! '
+                             f'diff_yuv: {diff_yuv:.3f}, THRESH: {DIFF_THRESH}')
+      if diff_raw >= DIFF_THRESH:
+        raise AssertionError('RAW diff too big! '
+                             f'diff_raw: {diff_raw:.3f}, THRESH: {DIFF_THRESH}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_crop_regions.py b/apps/CameraITS/tests/scene1_1/test_crop_regions.py
index 77e35ed..8e979a3 100644
--- a/apps/CameraITS/tests/scene1_1/test_crop_regions.py
+++ b/apps/CameraITS/tests/scene1_1/test_crop_regions.py
@@ -68,9 +68,9 @@
 
       # Uses a 2x digital zoom.
       max_digital_zoom = capture_request_utils.get_max_digital_zoom(props)
-      e_msg = 'Max digital zoom: %d, THRESH: %d' % (max_digital_zoom,
-                                                    MIN_DIGITAL_ZOOM_THRESH)
-      assert max_digital_zoom >= MIN_DIGITAL_ZOOM_THRESH, e_msg
+      if max_digital_zoom < MIN_DIGITAL_ZOOM_THRESH:
+        raise AssertionError(f'Max digital zoom: {max_digital_zoom}, '
+                             f'THRESH: {MIN_DIGITAL_ZOOM_THRESH}')
 
       # Capture a full frame.
       req = capture_request_utils.manual_capture_request(s, e)
@@ -95,6 +95,7 @@
         reqs.append(req)
       caps_regions = cam.do_capture(reqs)
       match_failed = False
+      e_msg = []
       for i, cap in enumerate(caps_regions):
         a = cap['metadata']['android.scaler.cropRegion']
         ax, ay = a['left'], a['top']
@@ -125,11 +126,13 @@
             min_diff_region = j
         if i != min_diff_region:
           match_failed = True
+          e_msg.append(f'i != min_diff_region. i: {i}, '
+                       f'min_diff_region: {min_diff_region}. ')
         logging.debug('Crop image %d (%d,%d %dx%d) best match with region %d',
                       i, ax, ay, aw, ah, min_diff_region)
 
-    assert not match_failed
+    if match_failed:
+      raise AssertionError(f'Match failed: {e_msg}')
 
 if __name__ == '__main__':
   test_runner.main()
-
diff --git a/apps/CameraITS/tests/scene1_1/test_dng_noise_model.py b/apps/CameraITS/tests/scene1_1/test_dng_noise_model.py
index 8af5aed..3589586 100644
--- a/apps/CameraITS/tests/scene1_1/test_dng_noise_model.py
+++ b/apps/CameraITS/tests/scene1_1/test_dng_noise_model.py
@@ -103,7 +103,9 @@
 
         # Test each raw color channel (R, GR, GB, B)
         noise_profile = cap['metadata']['android.sensor.noiseProfile']
-        assert len(noise_profile) == len(BAYER_LIST)
+        if len(noise_profile) != len(BAYER_LIST):
+          raise AssertionError(
+              f'noise_profile wrong length! {len(noise_profile)}')
         for i, ch in enumerate(BAYER_LIST):
           # Get the noise model parameters for this channel of this shot.
           s, o = noise_profile[cfa_idxs[i]]
@@ -129,11 +131,11 @@
           # so the check remains correct even after the signal starts to clip.
           mean_minus_3sigma = mean_img_ch - math.sqrt(var_model) * 3
           if mean_minus_3sigma < 0:
-            e_msg = 'Pixel distribution crosses 0. Likely black level '
-            e_msg += 'over-clips. Linear model is not valid. '
-            e_msg += 'mean: %.3e, var: %.3e, u-3s: %.3e' % (
-                mean_img_ch, var_model, mean_minus_3sigma)
-            assert mean_minus_3sigma < 0, e_msg
+            if mean_minus_3sigma >= 0:
+              raise AssertionError(
+                  'Pixel distribution crosses 0. Likely black level over-clips.'
+                  f' Linear model is not valid. mean: {mean_img_ch:.3e},'
+                  f' var: {var_model:.3e}, u-3s: {mean_minus_3sigma:.3e}')
           else:
             var = image_processing_utils.compute_image_variances(patch_norm)[0]
             var_meas[i].append(var)
@@ -167,7 +169,8 @@
       logging.debug('%s variance diffs: %s', ch, str(var_diffs))
       for j, diff in enumerate(var_diffs):
         thresh = max(VAR_ATOL_THRESH, VAR_RTOL_THRESH*var_exp[i][j])
-        assert diff <= thresh, 'var diff: %.5f, thresh: %.4f' % (diff, thresh)
+        if diff > thresh:
+          raise AssertionError(f'var diff: {diff:.5f}, thresh: {thresh:.4f}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_jpeg.py b/apps/CameraITS/tests/scene1_1/test_jpeg.py
index 2c11d29..c55c8c7 100644
--- a/apps/CameraITS/tests/scene1_1/test_jpeg.py
+++ b/apps/CameraITS/tests/scene1_1/test_jpeg.py
@@ -97,12 +97,12 @@
       rgb_means_jpg = compute_img_means_and_save(img, 'jpg', log_path)
 
       # Assert images are similar
-      rms_diff = image_processing_utils.compute_image_rms_difference(
+      rms_diff = image_processing_utils.compute_image_rms_difference_1d(
           rgb_means_yuv, rgb_means_jpg)
       logging.debug('RMS difference: %.3f', rms_diff)
-      e_msg = 'RMS difference: %.3f, spec: %.2f' % (
-          rms_diff, THRESHOLD_MAX_RMS_DIFF)
-      assert rms_diff < THRESHOLD_MAX_RMS_DIFF, e_msg
+      if rms_diff >= THRESHOLD_MAX_RMS_DIFF:
+        raise AssertionError(
+            f'RMS diff: {rms_diff:.3f}, spec: {THRESHOLD_MAX_RMS_DIFF}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_latching.py b/apps/CameraITS/tests/scene1_1/test_latching.py
index 158bb0f..6ebb405 100644
--- a/apps/CameraITS/tests/scene1_1/test_latching.py
+++ b/apps/CameraITS/tests/scene1_1/test_latching.py
@@ -90,7 +90,7 @@
         elif req_type == 'iso':
           reqs.append(iso_mult_req)
         else:
-          assert 0, 'Incorrect capture request!'
+          raise AssertionError(f'Incorrect capture request! {req_type}')
 
       caps = cam.do_capture(reqs, fmt)
       for i, cap in enumerate(caps):
@@ -121,8 +121,8 @@
       # check G mean pattern for correctness
       g_avg_for_caps = sum(g_means) / len(g_means)
       g_high = [g / g_avg_for_caps > 1 for g in g_means]
-      assert g_high == PATTERN_CHECK, 'G means: %s, TEMPLATE: %s' % (
-          str(g_means), str(REQ_PATTERN))
+      if g_high != PATTERN_CHECK:
+        raise AssertionError(f'G means: {g_means}, TEMPLATE: {REQ_PATTERN}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_linearity.py b/apps/CameraITS/tests/scene1_1/test_linearity.py
index 885311b..33baa52 100644
--- a/apps/CameraITS/tests/scene1_1/test_linearity.py
+++ b/apps/CameraITS/tests/scene1_1/test_linearity.py
@@ -126,9 +126,11 @@
             range(len(sensitivities)), means, 1, full=True)
         logging.debug('Line: m=%f, b=%f, resid=%f',
                       line[0], line[1], residuals[0])
-        msg = 'residual: %.5f, THRESH: %.4f' % (residuals[0], RESIDUAL_THRESH)
-        assert residuals[0] < RESIDUAL_THRESH, msg
-        assert line[0] > 0, 'slope %.6f less than 0!' % line[0]
+        if residuals[0] > RESIDUAL_THRESH:
+          raise AssertionError(
+              'residual: {residuals[0]:.5f}, THRESH: {RESIDUAL_THRESH}')
+        if line[0] <= 0:
+          raise AssertionError(f'slope {line[0]:.6f} <=  0!')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_locked_burst.py b/apps/CameraITS/tests/scene1_1/test_locked_burst.py
index db72259..c586373 100644
--- a/apps/CameraITS/tests/scene1_1/test_locked_burst.py
+++ b/apps/CameraITS/tests/scene1_1/test_locked_burst.py
@@ -102,15 +102,15 @@
         logging.debug('%s patch mean spread %.5f. means = %s',
                       plane, spread, str(means))
         for j in range(BURST_LEN):
-          e_msg = '%s frame %d too dark! mean: %.5f, THRESH: %.2f' % (
-              plane, j, min_means, VALUE_THRESH)
-          assert min_means > VALUE_THRESH, e_msg
+          if min_means <= VALUE_THRESH:
+            raise AssertionError(f'{plane} frame {j} too dark! mean: '
+                                 f'{min_means:.5f}, THRESH: {VALUE_THRESH}')
           threshold = SPREAD_THRESH
           if camera_properties_utils.manual_sensor(props):
             threshold = SPREAD_THRESH_MANUAL_SENSOR
-          e_msg = '%s center patch spread: %.5f, THRESH: %.2f' % (
-              plane, spread, threshold)
-          assert spread < threshold, e_msg
+          if spread >= threshold:
+            raise AssertionError(f'{plane} center patch spread: {spread:.5f}, '
+                                 f'THRESH: {threshold:.2f}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_multi_camera_match.py b/apps/CameraITS/tests/scene1_1/test_multi_camera_match.py
deleted file mode 100644
index 6c8d0e8..0000000
--- a/apps/CameraITS/tests/scene1_1/test_multi_camera_match.py
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 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.
-"""Verifies sub-cameras have similar RGB values for gray patch."""
-
-
-import logging
-import os.path
-
-from mobly import test_runner
-import numpy as np
-
-import its_base_test
-import camera_properties_utils
-import capture_request_utils
-import image_processing_utils
-import its_session_utils
-
-_NAME = os.path.splitext(os.path.basename(__file__))[0]
-_PATCH_H = 0.0625  # 1/16 x 1/16 in center of image
-_PATCH_W = 0.0625
-_PATCH_X = 0.5 - _PATCH_W/2
-_PATCH_Y = 0.5 - _PATCH_H/2
-_THRESH_DIFF = 0.06
-_THRESH_GAIN = 0.1
-_THRESH_EXP = 0.05
-
-
-class MultiCameraMatchTest(its_base_test.ItsBaseTest):
-  """Test both cameras give similar RGB values for gray patch.
-
-  This test uses android.lens.info.availableFocalLengths to determine
-  subcameras. The test will take images of the gray chart for each cameras,
-  crop the center patch, and compare the Y (of YUV) means of the two images.
-  Y means must be within _THRESH_DIFF for the test to pass.
-
-  Cameras that use android.control.zoomRatioRange will have only 1 focal
-  length and will need separate test.
-  """
-
-  def test_multi_camera_match(self):
-    logging.debug('Starting %s', _NAME)
-    yuv_sizes = {}
-    with its_session_utils.ItsSession(
-        device_id=self.dut.serial,
-        camera_id=self.camera_id,
-        hidden_physical_id=self.hidden_physical_id) as cam:
-      props = cam.get_camera_properties()
-      props = cam.override_with_hidden_physical_camera_props(props)
-      log_path = self.log_path
-
-      # check SKIP conditions
-      camera_properties_utils.skip_unless(
-          camera_properties_utils.per_frame_control(props) and
-          camera_properties_utils.logical_multi_camera(props))
-
-      # Load chart for scene
-      its_session_utils.load_scene(
-          cam, props, self.scene, self.tablet, self.chart_distance)
-
-      ids = camera_properties_utils.logical_multi_camera_physical_ids(props)
-      for i in ids:
-        physical_props = cam.get_camera_properties_by_id(i)
-        camera_properties_utils.skip_unless(
-            not camera_properties_utils.mono_camera(physical_props) and
-            camera_properties_utils.backward_compatible(physical_props))
-        yuv_sizes[i] = capture_request_utils.get_available_output_sizes(
-            'yuv', physical_props)
-        if i == ids[0]:  # get_available_output_sizes returns sorted list
-          yuv_match_sizes = yuv_sizes[i]
-        else:
-          yuv_match_sizes = list(
-              set(yuv_sizes[i]).intersection(yuv_match_sizes))
-
-      # find matched size for captures
-      yuv_match_sizes.sort()
-      w = yuv_match_sizes[-1][0]
-      h = yuv_match_sizes[-1][1]
-      logging.debug('Matched YUV size: (%d, %d)', w, h)
-
-      # do 3a and create requests
-      cam.do_3a()
-      reqs = []
-      avail_fls = sorted(props['android.lens.info.availableFocalLengths'],
-                         reverse=True)
-      # SKIP test if only 1 focal length
-      camera_properties_utils.skip_unless(len(avail_fls) > 1)
-
-      for i, fl in enumerate(avail_fls):
-        reqs.append(capture_request_utils.auto_capture_request())
-        reqs[i]['android.lens.focalLength'] = fl
-        if i > 0:
-          # Calculate the active sensor region for a non-cropped image
-          zoom = avail_fls[0] / fl
-          aa = props['android.sensor.info.activeArraySize']
-          aa_w, aa_h = aa['right'] - aa['left'], aa['bottom'] - aa['top']
-
-          # Calculate a center crop region.
-          assert zoom >= 1
-          crop_w = aa_w // zoom
-          crop_h = aa_h // zoom
-          crop_region = {'left': aa_w // 2 - crop_w // 2,
-                         'top': aa_h // 2 - crop_h // 2,
-                         'right': aa_w // 2 + crop_w // 2,
-                         'bottom': aa_h // 2 + crop_h // 2}
-          reqs[i]['android.scaler.cropRegion'] = crop_region
-
-      # capture YUVs
-      y_means = {}
-      e_msg = ''
-      fmt = [{'format': 'yuv', 'width': w, 'height': h}]
-      caps = cam.do_capture(reqs, fmt)
-      for i, fl in enumerate(avail_fls):
-        img = image_processing_utils.convert_capture_to_rgb_image(
-            caps[i], props=props)
-        image_processing_utils.write_image(img, '%s_yuv_fl=%s.jpg' % (
-            os.path.join(log_path, _NAME), fl))
-        y, _, _ = image_processing_utils.convert_capture_to_planes(
-            caps[i], props=props)
-        y_mean = image_processing_utils.compute_image_means(
-            image_processing_utils.get_image_patch(
-                y, _PATCH_X, _PATCH_Y, _PATCH_W, _PATCH_H))[0]
-        msg = 'y[%s]: %.3f, ' % (fl, y_mean)
-        logging.debug(msg)
-        e_msg += msg
-        y_means[fl] = y_mean
-
-      # compare Y means
-      e_msg += 'TOL=%.5f' % _THRESH_DIFF
-      assert np.isclose(max(y_means.values()), min(y_means.values()),
-                        rtol=_THRESH_DIFF), e_msg
-
-if __name__ == '__main__':
-  test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_param_exposure_time.py b/apps/CameraITS/tests/scene1_1/test_param_exposure_time.py
index 7000bc2..5cfa5a5 100644
--- a/apps/CameraITS/tests/scene1_1/test_param_exposure_time.py
+++ b/apps/CameraITS/tests/scene1_1/test_param_exposure_time.py
@@ -82,6 +82,7 @@
         patch = image_processing_utils.get_image_patch(
             img, PATCH_X, PATCH_Y, PATCH_W, PATCH_H)
         rgb_means = image_processing_utils.compute_image_means(patch)
+        logging.debug('RGB means: %s', str(rgb_means))
         exp_times.append(e * e_mult)
         r_means.append(rgb_means[0])
         g_means.append(rgb_means[1])
@@ -101,8 +102,10 @@
     # Assert each shot is brighter than previous.
     for ch, means in enumerate([r_means, g_means, b_means]):
       for i in range(len(EXP_MULT_FACTORS)-1):
-        e_msg = '%s [i+1]: %.4f, [i]: %.4f' % (COLORS[ch], means[i+1], means[i])
-        assert means[i+1] > means[i], e_msg
+        if means[i+1] <= means[i]:
+          raise AssertionError(f'{COLORS[ch]} not increasing in brightness! '
+                               f'{COLORS[ch]}[i+1]: {means[i+1]:.4f}, '
+                               f'{COLORS[ch]}[i]: {means[i]:.4f}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_param_flash_mode.py b/apps/CameraITS/tests/scene1_1/test_param_flash_mode.py
index 601b7fb..fca0f7d 100644
--- a/apps/CameraITS/tests/scene1_1/test_param_flash_mode.py
+++ b/apps/CameraITS/tests/scene1_1/test_param_flash_mode.py
@@ -108,19 +108,23 @@
       # Assert state behavior
       logging.debug('Reported modes: %s', str(modes))
       logging.debug('Reported states: %s', str(states))
-      assert modes == list(FLASH_MODES.values()), str(modes)
+      if modes != list(FLASH_MODES.values()):
+        raise AssertionError(f'modes != FLASH_MODES! {modes}')
 
-      e_msg = 'flash state reported[OFF]: %d' % states[FLASH_MODES['OFF']]
-      assert states[FLASH_MODES['OFF']] not in [
-          FLASH_STATES['FIRED'], FLASH_STATES['PARTIAL']], e_msg
+      if states[FLASH_MODES['OFF']] in [
+          FLASH_STATES['FIRED'], FLASH_STATES['PARTIAL']]:
+        raise AssertionError('flash state reported[OFF]: '
+                             f"{states[FLASH_MODES['OFF']]}")
 
-      e_msg = 'flash state reported[SINGLE]: %d' % states[FLASH_MODES['SINGLE']]
-      assert states[FLASH_MODES['SINGLE']] in [
-          FLASH_STATES['FIRED'], FLASH_STATES['PARTIAL']], e_msg
+      if states[FLASH_MODES['SINGLE']] not in [
+          FLASH_STATES['FIRED'], FLASH_STATES['PARTIAL']]:
+        raise AssertionError('flash state reported[SINGLE]: '
+                             f"{states[FLASH_MODES['SINGLE']]}")
 
-      e_msg = 'flash state reported[TORCH]: %d' % states[FLASH_MODES['TORCH']]
-      assert states[FLASH_MODES['TORCH']] in [
-          FLASH_STATES['FIRED'], FLASH_STATES['PARTIAL']], e_msg
+      if states[FLASH_MODES['TORCH']] not in [
+          FLASH_STATES['FIRED'], FLASH_STATES['PARTIAL']]:
+        raise AssertionError('flash state reported[TORCH]: '
+                             f"{states[FLASH_MODES['TORCH']]}")
 
       # Assert image behavior: change between OFF & SINGLE
       logging.debug('Brightness means: %s', str(means))
@@ -128,23 +132,23 @@
       grad_delta = grads[FLASH_MODES['SINGLE']] - grads[FLASH_MODES['OFF']]
       mean_delta = ((means[FLASH_MODES['SINGLE']] - means[FLASH_MODES['OFF']]) /
                     means[FLASH_MODES['OFF']])
-      e_msg = 'gradient SINGLE-OFF: %.3f, ATOL: %.3f' % (
-          grad_delta, GRADIENT_DELTA)
-      e_msg += ' mean SINGLE:OFF %.3f, ATOL: %.3f' % (
-          mean_delta, Y_RELATIVE_DELTA_FLASH)
-      assert (grad_delta > GRADIENT_DELTA or
-              mean_delta > Y_RELATIVE_DELTA_FLASH), e_msg
+      if not (grad_delta > GRADIENT_DELTA or
+              mean_delta > Y_RELATIVE_DELTA_FLASH):
+        raise AssertionError(f'gradient SINGLE-OFF: {grad_delta:.3f}, '
+                             f'ATOL: {GRADIENT_DELTA}, '
+                             f'mean SINGLE:OFF {mean_delta:.3f}, '
+                             f'ATOL: {Y_RELATIVE_DELTA_FLASH}')
 
       # Assert image behavior: change between OFF & TORCH
       grad_delta = grads[FLASH_MODES['TORCH']] - grads[FLASH_MODES['OFF']]
       mean_delta = ((means[FLASH_MODES['TORCH']] - means[FLASH_MODES['OFF']]) /
                     means[FLASH_MODES['OFF']])
-      e_msg = 'gradient TORCH-OFF: %.3f, ATOL: %.3f' % (
-          grad_delta, GRADIENT_DELTA)
-      e_msg += ' mean TORCH:OFF %.3f, ATOL: %.3f' % (
-          mean_delta, Y_RELATIVE_DELTA_TORCH)
-      assert (grad_delta > GRADIENT_DELTA or
-              mean_delta > Y_RELATIVE_DELTA_TORCH), e_msg
+      if not (grad_delta > GRADIENT_DELTA or
+              mean_delta > Y_RELATIVE_DELTA_TORCH):
+        raise AssertionError(f'gradient TORCH-OFF: {grad_delta:.3f}, '
+                             f'ATOL: {GRADIENT_DELTA}, '
+                             f'mean TORCH:OFF {mean_delta:.3f}, '
+                             f'ATOL: {Y_RELATIVE_DELTA_TORCH}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_1/test_param_noise_reduction.py b/apps/CameraITS/tests/scene1_1/test_param_noise_reduction.py
index b605757..6323a4a 100644
--- a/apps/CameraITS/tests/scene1_1/test_param_noise_reduction.py
+++ b/apps/CameraITS/tests/scene1_1/test_param_noise_reduction.py
@@ -143,58 +143,62 @@
     pylab.xticks(NR_MODES_LIST)
     matplotlib.pyplot.savefig('%s_plot_SNRs.png' % os.path.join(log_path, NAME))
 
-    assert nr_modes_reported == NR_MODES_LIST
+    if nr_modes_reported != NR_MODES_LIST:
+      raise AssertionError(f'{nr_modes_reported} != {NR_MODES_LIST}')
 
     for j in range(NUM_COLORS):
       # Higher SNR is better
       # Verify OFF is not better than FAST
-      e_msg = '%s OFF: %.3f, FAST: %.3f, TOL: %.3f' % (
-          COLORS[j], snrs[j][NR_MODES['OFF']], snrs[j][NR_MODES['FAST']],
-          SNR_TOLERANCE)
-      assert (snrs[j][NR_MODES['OFF']] < snrs[j][NR_MODES['FAST']] +
-              SNR_TOLERANCE), e_msg
+      if (snrs[j][NR_MODES['OFF']] >= snrs[j][NR_MODES['FAST']] +
+          SNR_TOLERANCE):
+        raise AssertionError(
+            f"{COLORS[j]} OFF: {snrs[j][NR_MODES['OFF']]:.3f}, "
+            f"FAST: {snrs[j][NR_MODES['FAST']]:.3f}, TOL: {SNR_TOLERANCE}")
 
       # Verify FAST is not better than HQ
-      e_msg = '%s FAST: %.3f, HQ: %.3f, TOL: %.3f' % (
-          COLORS[j], snrs[j][NR_MODES['FAST']], snrs[j][NR_MODES['HQ']],
-          SNR_TOLERANCE)
-      assert (snrs[j][NR_MODES['FAST']] < snrs[j][NR_MODES['HQ']] +
-              SNR_TOLERANCE), e_msg
+      if (snrs[j][NR_MODES['FAST']] >= snrs[j][NR_MODES['HQ']] +
+          SNR_TOLERANCE):
+        raise AssertionError(
+            f"{COLORS[j]} FAST: {snrs[j][NR_MODES['FAST']]:.3f}, "
+            f"HQ: {snrs[j][NR_MODES['HQ']]:.3f}, TOL: {SNR_TOLERANCE}")
 
       # Verify HQ is better than OFF
-      e_msg = '%s OFF: %.3f, HQ: %.3f' % (
-          COLORS[j], snrs[j][NR_MODES['OFF']], snrs[j][NR_MODES['HQ']])
-      assert snrs[j][NR_MODES['HQ']] > snrs[j][NR_MODES['OFF']], e_msg
+      if snrs[j][NR_MODES['HQ']] <= snrs[j][NR_MODES['OFF']]:
+        raise AssertionError(
+            f"{COLORS[j]} OFF: {snrs[j][NR_MODES['OFF']]:.3f}, "
+            f"HQ: {snrs[j][NR_MODES['HQ']]:.3f}")
 
       if camera_properties_utils.noise_reduction_mode(props, NR_MODES['MIN']):
         # Verify OFF is not better than MINIMAL
-        e_msg = '%s OFF: %.3f, MIN: %.3f, TOL: %.3f' % (
-            COLORS[j], snrs[j][NR_MODES['OFF']], snrs[j][NR_MODES['MIN']],
-            SNR_TOLERANCE)
-        assert (snrs[j][NR_MODES['OFF']] < snrs[j][NR_MODES['MIN']] +
-                SNR_TOLERANCE), e_msg
+        if not(snrs[j][NR_MODES['OFF']] < snrs[j][NR_MODES['MIN']] +
+               SNR_TOLERANCE):
+          raise AssertionError(
+              f"{COLORS[j]} OFF: {snrs[j][NR_MODES['OFF']]:.3f}, "
+              f"MIN: {snrs[j][NR_MODES['MIN']]:.3f}, TOL: {SNR_TOLERANCE}")
 
         # Verify MINIMAL is not better than HQ
-        e_msg = '%s MIN: %.3f, HQ: %.3f, TOL: %.3f' % (
-            COLORS[j], snrs[j][NR_MODES['MIN']], snrs[j][NR_MODES['HQ']],
-            SNR_TOLERANCE)
-        assert (snrs[j][NR_MODES['MIN']] < snrs[j][NR_MODES['HQ']] +
-                SNR_TOLERANCE), e_msg
+        if not (snrs[j][NR_MODES['MIN']] < snrs[j][NR_MODES['HQ']] +
+                SNR_TOLERANCE):
+          raise AssertionError(
+              f"{COLORS[j]} MIN: {snrs[j][NR_MODES['MIN']]:.3f}, "
+              f"HQ: {snrs[j][NR_MODES['HQ']]:.3f}, TOL: {SNR_TOLERANCE}")
 
+        # Verify ZSL is close to MINIMAL
         if camera_properties_utils.noise_reduction_mode(props, NR_MODES['ZSL']):
-          # Verify ZSL is close to MINIMAL
-          e_msg = '%s ZSL: %.3f, MIN: %.3f, TOL: %.3f' % (
-              COLORS[j], snrs[j][NR_MODES['ZSL']], snrs[j][NR_MODES['MIN']],
-              SNR_TOLERANCE)
-          assert np.isclose(snrs[j][NR_MODES['ZSL']], snrs[j][NR_MODES['MIN']],
-                            atol=SNR_TOLERANCE), e_msg
+          if not np.isclose(snrs[j][NR_MODES['ZSL']], snrs[j][NR_MODES['MIN']],
+                            atol=SNR_TOLERANCE):
+            raise AssertionError(
+                f"{COLORS[j]} ZSL: {snrs[j][NR_MODES['ZSL']]:.3f}, "
+                f"MIN: {snrs[j][NR_MODES['MIN']]:.3f}, TOL: {SNR_TOLERANCE}")
+
       elif camera_properties_utils.noise_reduction_mode(props, NR_MODES['ZSL']):
         # Verify ZSL is close to OFF
-        e_msg = '%s OFF: %.3f, ZSL: %.3f, TOL: %.3f' % (
-            COLORS[j], snrs[j][NR_MODES['OFF']], snrs[j][NR_MODES['ZSL']],
-            SNR_TOLERANCE)
-        assert np.isclose(snrs[j][NR_MODES['ZSL']], snrs[j][NR_MODES['OFF']],
-                          atol=SNR_TOLERANCE), e_msg
+        if not np.isclose(snrs[j][NR_MODES['ZSL']], snrs[j][NR_MODES['OFF']],
+                          atol=SNR_TOLERANCE):
+          raise AssertionError(
+              f"{COLORS[j]} OFF: {snrs[j][NR_MODES['OFF']]:3f}, "
+              f"ZSL: {snrs[j][NR_MODES['ZSL']]:3f}, TOL: {SNR_TOLERANCE}")
+
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_2/test_raw_burst_sensitivity.py b/apps/CameraITS/tests/scene1_2/test_raw_burst_sensitivity.py
index 4c6af25..4cc4546 100644
--- a/apps/CameraITS/tests/scene1_2/test_raw_burst_sensitivity.py
+++ b/apps/CameraITS/tests/scene1_2/test_raw_burst_sensitivity.py
@@ -77,9 +77,9 @@
           camera_properties_utils.per_frame_control(props) and
           not camera_properties_utils.mono_camera(props))
 
-      # Load chart for scene
+      # Load chart for scene (chart_distance=0 for no chart scaling)
       its_session_utils.load_scene(
-          cam, props, self.scene, self.tablet, self.chart_distance)
+          cam, props, self.scene, self.tablet, chart_distance=0)
 
       # Find sensitivity range and create capture requests
       sens_min, _ = props['android.sensor.info.sensitivityRange']
@@ -130,9 +130,10 @@
 
       # Asserts that each shot is noisier than previous
       for i in x[0:-1]:
-        e_msg = 'variances [i]: %.5f, [i+1]: %.5f, THRESH: %.2f' % (
-            variances[i], variances[i+1], _VAR_THRESH)
-        assert variances[i] < variances[i+1] / _VAR_THRESH, e_msg
+        if variances[i] >= variances[i+1] / _VAR_THRESH:
+          raise AssertionError(
+              f'variances [i]: {variances[i] :.5f}, [i+1]: '
+              f'{variances[i+1]:.5f}, THRESH: {_VAR_THRESH}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_2/test_raw_exposure.py b/apps/CameraITS/tests/scene1_2/test_raw_exposure.py
index 9b4afe0..5bd44e8 100644
--- a/apps/CameraITS/tests/scene1_2/test_raw_exposure.py
+++ b/apps/CameraITS/tests/scene1_2/test_raw_exposure.py
@@ -129,11 +129,14 @@
     allow_under_saturated = False
     # Check pixel means are increasing (with small tolerance)
     for ch, color in enumerate(COLORS):
-      e_msg = 'ISO=%d, %s, exp %3fms mean: %.2f, %s mean: %.2f, TOL=%.f%%' % (
-          sens, color, exps[i-1], mean[ch],
-          'black level' if i == 1 else 'exp_time %.3fms'%exps[i-2],
-          prev_mean[ch], IMG_DELTA_THRESH*100)
       if mean[ch] <= prev_mean[ch] * IMG_DELTA_THRESH:
+        e_msg = f'{color} not increasing with increased exp time! ISO: {sens}, '
+        if i == 1:
+          e_msg += f'black_level: {black_levels[ch]}, '
+        else:
+          e_msg += f'exp[i-1]: {exps[i-2]:.3f}ms, mean[i-1]: {prev_mean[ch]:.2f}, '
+        e_msg += (f'exp[i]: {exps[i-1]:.3f}ms, mean[i]: {mean[ch]}, '
+                  f'TOL: {IMG_DELTA_THRESH}')
         raise AssertionError(e_msg)
 
 
diff --git a/apps/CameraITS/tests/scene1_2/test_raw_sensitivity.py b/apps/CameraITS/tests/scene1_2/test_raw_sensitivity.py
index 985cf12..8c542ab 100644
--- a/apps/CameraITS/tests/scene1_2/test_raw_sensitivity.py
+++ b/apps/CameraITS/tests/scene1_2/test_raw_sensitivity.py
@@ -65,9 +65,9 @@
       name_with_log_path = os.path.join(self.log_path, NAME)
       camera_fov = float(cam.calc_camera_fov(props))
 
-      # Load chart for scene
+      # Load chart for scene (chart_distance=0 for no chart scaling)
       its_session_utils.load_scene(
-          cam, props, self.scene, self.tablet, self.chart_distance)
+          cam, props, self.scene, self.tablet, chart_distance=0)
 
       # Expose for the scene with min sensitivity
       sens_min, _ = props['android.sensor.info.sensitivityRange']
diff --git a/apps/CameraITS/tests/scene1_2/test_yuv_jpeg_all.py b/apps/CameraITS/tests/scene1_2/test_yuv_jpeg_all.py
index b1f1b8a..59ead98 100644
--- a/apps/CameraITS/tests/scene1_2/test_yuv_jpeg_all.py
+++ b/apps/CameraITS/tests/scene1_2/test_yuv_jpeg_all.py
@@ -51,22 +51,33 @@
   """
   out_surface = {'width': size[0], 'height': size[1], 'format': img_type}
   cap = cam.do_capture(req, out_surface)
+  logging.debug('e_cap: %d, s_cap: %d',
+                cap['metadata']['android.sensor.exposureTime'],
+                cap['metadata']['android.sensor.sensitivity'])
   if img_type == 'jpg':
-    assert cap['format'] == 'jpeg'
+    if cap['format'] != 'jpeg':
+      raise AssertionError(f"{cap['format']} != jpeg")
     img = image_processing_utils.decompress_jpeg_to_rgb_image(cap['data'])
   else:
-    assert cap['format'] == img_type
+    if cap['format'] != img_type:
+      raise AssertionError(f"{cap['format']} != {img_type}")
     img = image_processing_utils.convert_capture_to_rgb_image(cap)
-  assert cap['width'] == size[0]
-  assert cap['height'] == size[1]
+  if cap['width'] != size[0]:
+    raise AssertionError(f"{cap['width']} != {size[0]}")
+  if cap['height'] != size[1]:
+    raise AssertionError(f"{cap['height']} != {size[1]}")
 
   if debug:
     image_processing_utils.write_image(img, '%s_%s_w%d_h%d.jpg'%(
         os.path.join(log_path, NAME), img_type, size[0], size[1]))
+
   if img_type == 'jpg':
-    assert img.shape[0] == size[1]
-    assert img.shape[1] == size[0]
-    assert img.shape[2] == 3
+    if img.shape[0] != size[1]:
+      raise AssertionError(f'{img.shape[0]} != {size[1]}')
+    if img.shape[1] != size[0]:
+      raise AssertionError(f'{img.shape[1]} != {size[0]}')
+    if img.shape[2] != 3:
+      raise AssertionError(f'{img.shape[2]} != 3')
   patch = image_processing_utils.get_image_patch(
       img, PATCH_X, PATCH_Y, PATCH_W, PATCH_H)
   rgb = image_processing_utils.compute_image_means(patch)
@@ -100,6 +111,7 @@
       # should look the same (once converted by the image_processing_utils).
       e, s = target_exposure_utils.get_target_exposure_combos(
           log_path, cam)['midExposureTime']
+      logging.debug('e_req: %d, s_req: %d', e, s)
       req = capture_request_utils.manual_capture_request(s, e, 0.0, True, props)
 
       rgbs = []
@@ -128,13 +140,13 @@
       # Assert all captured images are similar in RBG space
       max_diff = 0
       for rgb_i in rgbs[1:]:
-        rms_diff = image_processing_utils.compute_image_rms_difference(
+        rms_diff = image_processing_utils.compute_image_rms_difference_1d(
             rgbs[0], rgb_i)  # use first capture as reference
         max_diff = max(max_diff, rms_diff)
       msg = 'Max RMS difference: %.4f' % max_diff
       logging.debug('%s', msg)
-      e_msg = msg + ' spec: %.3f' % THRESHOLD_MAX_RMS_DIFF
-      assert max_diff < THRESHOLD_MAX_RMS_DIFF, e_msg
+      if max_diff >= THRESHOLD_MAX_RMS_DIFF:
+        raise AssertionError(f'{msg} spec: {THRESHOLD_MAX_RMS_DIFF}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene1_2/test_yuv_plus_dng.py b/apps/CameraITS/tests/scene1_2/test_yuv_plus_dng.py
index c632fc9..57edfb9 100644
--- a/apps/CameraITS/tests/scene1_2/test_yuv_plus_dng.py
+++ b/apps/CameraITS/tests/scene1_2/test_yuv_plus_dng.py
@@ -56,8 +56,12 @@
       req = capture_request_utils.auto_capture_request()
       max_dng_size = capture_request_utils.get_available_output_sizes(
           'raw', props)[0]
-      w, h = capture_request_utils.get_available_output_sizes(
-          'yuv', props, MAX_IMG_SIZE, max_dng_size)[0]
+      if capture_request_utils.is_common_aspect_ratio(max_dng_size):
+        w, h = capture_request_utils.get_available_output_sizes(
+            'yuv', props, MAX_IMG_SIZE, max_dng_size)[0]
+      else:
+        w, h = capture_request_utils.get_available_output_sizes(
+            'yuv', props, max_size=MAX_IMG_SIZE)[0]
       out_surfaces = [{'format': 'dng'},
                       {'format': 'yuv', 'width': w, 'height': h}]
       cap_dng, cap_yuv = cam.do_capture(req, out_surfaces)
diff --git a/apps/CameraITS/tests/scene1_2/test_yuv_plus_jpeg.py b/apps/CameraITS/tests/scene1_2/test_yuv_plus_jpeg.py
index 6e242ef..be22003 100644
--- a/apps/CameraITS/tests/scene1_2/test_yuv_plus_jpeg.py
+++ b/apps/CameraITS/tests/scene1_2/test_yuv_plus_jpeg.py
@@ -78,8 +78,14 @@
       # Create requests
       max_jpeg_size = capture_request_utils.get_available_output_sizes(
           'jpeg', props)[0]
-      w, h = capture_request_utils.get_available_output_sizes(
-          'yuv', props, MAX_IMG_SIZE, max_jpeg_size)[0]
+      if capture_request_utils.is_common_aspect_ratio(max_jpeg_size):
+        w, h = capture_request_utils.get_available_output_sizes(
+            'yuv', props, MAX_IMG_SIZE, max_jpeg_size)[0]
+      else:
+        w, h = capture_request_utils.get_available_output_sizes(
+            'yuv', props, max_size=MAX_IMG_SIZE)[0]
+      logging.debug('YUV size: (%d, %d)', w, h)
+      logging.debug('JPEG size: %s', max_jpeg_size)
       fmt_yuv = {'format': 'yuv', 'width': w, 'height': h}
       fmt_jpg = {'format': 'jpeg'}
 
@@ -93,7 +99,7 @@
       rgb_means_yuv = compute_means_and_save(cap_yuv, 'yuv', log_path)
       rgb_means_jpg = compute_means_and_save(cap_jpg, 'jpg', log_path)
 
-      rms_diff = image_processing_utils.compute_image_rms_difference(
+      rms_diff = image_processing_utils.compute_image_rms_difference_1d(
           rgb_means_yuv, rgb_means_jpg)
       msg = f'RMS diff: {rms_diff:.4f}'
       logging.debug('%s', msg)
diff --git a/apps/CameraITS/tests/scene1_2/test_yuv_plus_raw.py b/apps/CameraITS/tests/scene1_2/test_yuv_plus_raw.py
index 305f418..177481c 100644
--- a/apps/CameraITS/tests/scene1_2/test_yuv_plus_raw.py
+++ b/apps/CameraITS/tests/scene1_2/test_yuv_plus_raw.py
@@ -70,8 +70,12 @@
 
       max_raw_size = capture_request_utils.get_available_output_sizes(
           'raw', props)[0]
-      w, h = capture_request_utils.get_available_output_sizes(
-          'yuv', props, MAX_IMG_SIZE, max_raw_size)[0]
+      if capture_request_utils.is_common_aspect_ratio(max_raw_size):
+        w, h = capture_request_utils.get_available_output_sizes(
+            'yuv', props, MAX_IMG_SIZE, max_raw_size)[0]
+      else:
+        w, h = capture_request_utils.get_available_output_sizes(
+            'yuv', props, max_size=MAX_IMG_SIZE)[0]
       out_surfaces = [{'format': 'raw'},
                       {'format': 'yuv', 'width': w, 'height': h}]
       cap_raw, cap_yuv = cam.do_capture(req, out_surfaces)
@@ -93,7 +97,7 @@
           img, PATCH_X, PATCH_Y, PATCH_W, PATCH_H)
       rgb_means_raw = image_processing_utils.compute_image_means(patch)
 
-      rms_diff = image_processing_utils.compute_image_rms_difference(
+      rms_diff = image_processing_utils.compute_image_rms_difference_1d(
           rgb_means_yuv, rgb_means_raw)
       msg = f'RMS diff: {rms_diff:.4f}'
       logging.debug('%s', msg)
diff --git a/apps/CameraITS/tests/scene1_2/test_yuv_plus_raw10.py b/apps/CameraITS/tests/scene1_2/test_yuv_plus_raw10.py
index ec88410..4c83123 100644
--- a/apps/CameraITS/tests/scene1_2/test_yuv_plus_raw10.py
+++ b/apps/CameraITS/tests/scene1_2/test_yuv_plus_raw10.py
@@ -70,8 +70,12 @@
 
       max_raw10_size = capture_request_utils.get_available_output_sizes(
           'raw10', props)[0]
-      w, h = capture_request_utils.get_available_output_sizes(
-          'yuv', props, MAX_IMG_SIZE, max_raw10_size)[0]
+      if capture_request_utils.is_common_aspect_ratio(max_raw10_size):
+        w, h = capture_request_utils.get_available_output_sizes(
+            'yuv', props, MAX_IMG_SIZE, max_raw10_size)[0]
+      else:
+        w, h = capture_request_utils.get_available_output_sizes(
+            'yuv', props, max_size=MAX_IMG_SIZE)[0]
       out_surfaces = [{'format': 'raw10'},
                       {'format': 'yuv', 'width': w, 'height': h}]
       cap_raw, cap_yuv = cam.do_capture(req, out_surfaces)
@@ -93,7 +97,7 @@
           img, PATCH_X, PATCH_Y, PATCH_W, PATCH_H)
       rgb_means_raw = image_processing_utils.compute_image_means(patch)
 
-      rms_diff = image_processing_utils.compute_image_rms_difference(
+      rms_diff = image_processing_utils.compute_image_rms_difference_1d(
           rgb_means_yuv, rgb_means_raw)
       msg = f'RMS diff: {rms_diff:.4f}'
       logging.debug('%s', msg)
diff --git a/apps/CameraITS/tests/scene1_2/test_yuv_plus_raw12.py b/apps/CameraITS/tests/scene1_2/test_yuv_plus_raw12.py
index a970de5..0c457c8 100644
--- a/apps/CameraITS/tests/scene1_2/test_yuv_plus_raw12.py
+++ b/apps/CameraITS/tests/scene1_2/test_yuv_plus_raw12.py
@@ -70,8 +70,12 @@
 
       max_raw12_size = capture_request_utils.get_available_output_sizes(
           'raw12', props)[0]
-      w, h = capture_request_utils.get_available_output_sizes(
-          'yuv', props, MAX_IMG_SIZE, max_raw12_size)[0]
+      if capture_request_utils.is_common_aspect_ratio(max_raw12_size):
+        w, h = capture_request_utils.get_available_output_sizes(
+            'yuv', props, MAX_IMG_SIZE, max_raw12_size)[0]
+      else:
+        w, h = capture_request_utils.get_available_output_sizes(
+            'yuv', props, max_size=MAX_IMG_SIZE)[0]
       out_surfaces = [{'format': 'raw12'},
                       {'format': 'yuv', 'width': w, 'height': h}]
       cap_raw, cap_yuv = cam.do_capture(req, out_surfaces)
@@ -93,7 +97,7 @@
           img, PATCH_X, PATCH_Y, PATCH_W, PATCH_H)
       rgb_means_raw = image_processing_utils.compute_image_means(patch)
 
-      rms_diff = image_processing_utils.compute_image_rms_difference(
+      rms_diff = image_processing_utils.compute_image_rms_difference_1d(
           rgb_means_yuv, rgb_means_raw)
       msg = f'RMS diff: {rms_diff:.4f}'
       logging.debug('%s', msg)
diff --git a/apps/CameraITS/tests/scene2_a/test_auto_flash.py b/apps/CameraITS/tests/scene2_a/test_auto_flash.py
new file mode 100644
index 0000000..c6d0633
--- /dev/null
+++ b/apps/CameraITS/tests/scene2_a/test_auto_flash.py
@@ -0,0 +1,177 @@
+# Copyright 2013 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.
+"""Verifies android.flash.mode parameters is applied when set."""
+
+
+import logging
+import os.path
+from mobly import test_runner
+
+import its_base_test
+import camera_properties_utils
+import capture_request_utils
+import lighting_control_utils
+import image_processing_utils
+import its_session_utils
+
+AE_MODES = {0: 'OFF', 1: 'ON', 2: 'ON_AUTO_FLASH', 3: 'ON_ALWAYS_FLASH',
+            4: 'ON_AUTO_FLASH_REDEYE', 5: 'ON_EXTERNAL_FLASH'}
+AE_STATES = {0: 'INACTIVE', 1: 'SEARCHING', 2: 'CONVERGED', 3: 'LOCKED',
+             4: 'FLASH_REQUIRED', 5: 'PRECAPTURE'}
+_FLASH_CHECK_FIRST_API_LEVEL = 32
+_GRAD_DELTA_ATOL = 100  # gradiant for tablets as screen aborbs energy
+_MEAN_DELTA_ATOL = 100  # mean used for reflective charts
+_NUM_FRAMES = 8
+_PATCH_H = 0.25  # center 25%
+_PATCH_W = 0.25
+_PATCH_X = 0.5 - _PATCH_W/2
+_PATCH_Y = 0.5 - _PATCH_H/2
+_TEST_NAME = os.path.splitext(os.path.basename(__file__))[0]
+VGA_W, VGA_H = 640, 480
+
+
+def take_captures(cam, auto_flash=False):
+  req = capture_request_utils.auto_capture_request()
+  if auto_flash:
+    req['android.control.aeMode'] = 2  # 'ON_AUTO_FLASH'
+  fmt = {'format': 'yuv', 'width': VGA_W, 'height': VGA_H}
+  return cam.do_capture([req]*_NUM_FRAMES, fmt)
+
+
+class AutoFlashTest(its_base_test.ItsBaseTest):
+  """Test that the android.flash.mode parameter is applied."""
+
+  def test_auto_flash(self):
+    logging.debug('AE_MODES: %s', str(AE_MODES))
+    logging.debug('AE_STATES: %s', str(AE_STATES))
+
+    with its_session_utils.ItsSession(
+        device_id=self.dut.serial,
+        camera_id=self.camera_id,
+        hidden_physical_id=self.hidden_physical_id) as cam:
+      props = cam.get_camera_properties()
+      props = cam.override_with_hidden_physical_camera_props(props)
+      test_name = os.path.join(self.log_path, _TEST_NAME)
+
+      # check SKIP conditions
+      first_api_level = its_session_utils.get_first_api_level(self.dut.serial)
+      camera_properties_utils.skip_unless(
+          camera_properties_utils.flash(props) and
+          first_api_level >= _FLASH_CHECK_FIRST_API_LEVEL)
+
+      # establish connection with lighting controller
+      arduino_serial_port = lighting_control_utils.lighting_control(
+          self.lighting_cntl, self.lighting_ch)
+
+      # turn OFF lights to darken scene
+      lighting_control_utils.set_lighting_state(
+          arduino_serial_port, self.lighting_ch, 'OFF')
+
+      # turn OFF tablet to darken scene
+      if self.tablet:
+        output = self.tablet.adb.shell('dumpsys display | grep mScreenState')
+        output_list = str(output.decode('utf-8')).strip().split(' ')
+        for val in output_list:
+          if 'ON' in val:
+            self.tablet.adb.shell(['input', 'keyevent', 'KEYCODE_POWER'])
+
+      no_flash_exp_x_iso = 0
+      no_flash_mean = 0
+      no_flash_grad = 0
+      flash_exp_x_iso = []
+      flash_means = []
+      flash_grads = []
+
+      # take captures with no flash as baseline: use last frame
+      logging.debug('Taking reference frame(s) with no flash.')
+      cam.do_3a(do_af=False)
+      cap = take_captures(cam)[_NUM_FRAMES-1]
+      metadata = cap['metadata']
+      exp = int(metadata['android.sensor.exposureTime'])
+      iso = int(metadata['android.sensor.sensitivity'])
+      logging.debug('No auto_flash ISO: %d, exp: %d ns', iso, exp)
+      logging.debug('AE_MODE (cap): %s',
+                    AE_MODES[metadata['android.control.aeMode']])
+      logging.debug('AE_STATE (cap): %s',
+                    AE_STATES[metadata['android.control.aeState']])
+      no_flash_exp_x_iso = exp * iso
+      y, _, _ = image_processing_utils.convert_capture_to_planes(
+          cap, props)
+      patch = image_processing_utils.get_image_patch(
+          y, _PATCH_X, _PATCH_Y, _PATCH_W, _PATCH_H)
+      no_flash_mean = image_processing_utils.compute_image_means(
+          patch)[0]*255
+      no_flash_grad = image_processing_utils.compute_image_max_gradients(
+          patch)[0]*255
+      image_processing_utils.write_image(y, f'{test_name}_no_flash_Y.jpg')
+
+      # log results
+      logging.debug('No flash exposure X ISO %d', no_flash_exp_x_iso)
+      logging.debug('No flash Y grad: %.4f', no_flash_grad)
+      logging.debug('No flash Y mean: %.4f', no_flash_mean)
+
+      # take captures with auto flash enabled
+      logging.debug('Taking frames with auto flash enabled.')
+      cam.do_3a(do_af=False, auto_flash=True)
+      caps = take_captures(cam, auto_flash=True)
+
+      # evaluate captured images
+      for i in range(_NUM_FRAMES):
+        logging.debug('frame # %d', i)
+        metadata = caps[i]['metadata']
+        exp = int(metadata['android.sensor.exposureTime'])
+        iso = int(metadata['android.sensor.sensitivity'])
+        logging.debug('ISO: %d, exp: %d ns', iso, exp)
+        if i == 0:
+          logging.debug('AE_MODE (cap): %s',
+                        AE_MODES[metadata['android.control.aeMode']])
+        ae_state = AE_STATES[metadata['android.control.aeState']]
+        logging.debug('AE_STATE (cap): %s', ae_state)
+        if ae_state != AE_STATES[4]:  # FLASH_REQUIRED
+          raise AssertionError('Scene not dark enough to trigger auto-flash. '
+                               'Check scene.')
+        flash_exp_x_iso.append(exp*iso)
+        y, _, _ = image_processing_utils.convert_capture_to_planes(
+            caps[i], props)
+        patch = image_processing_utils.get_image_patch(
+            y, _PATCH_X, _PATCH_Y, _PATCH_W, _PATCH_H)
+        flash_means.append(
+            image_processing_utils.compute_image_means(patch)[0]*255)
+        flash_grads.append(
+            image_processing_utils.compute_image_max_gradients(patch)[0]*255)
+
+        image_processing_utils.write_image(
+            y, f'{test_name}_auto_flash_Y_{i}.jpg')
+
+      # log results
+      logging.debug('Flash exposure X ISOs %s', str(flash_exp_x_iso))
+      logging.debug('Flash frames Y grads: %s', str(flash_grads))
+      logging.debug('Flash frames Y means: %s', str(flash_means))
+
+      # turn lights back ON
+      lighting_control_utils.set_lighting_state(
+          arduino_serial_port, self.lighting_ch, 'ON')
+
+      # assert correct behavior
+      grad_delta = max(flash_grads) - no_flash_grad
+      mean_delta = max(flash_means) - no_flash_mean
+      if not (grad_delta > _GRAD_DELTA_ATOL or
+              mean_delta > _MEAN_DELTA_ATOL):
+        raise AssertionError(
+            f'grad FLASH-OFF: {grad_delta:.3f}, ATOL: {_GRAD_DELTA_ATOL}, '
+            f'mean FLASH-OFF: {mean_delta:.3f}, ATOL: {_MEAN_DELTA_ATOL}')
+
+if __name__ == '__main__':
+  test_runner.main()
+
diff --git a/apps/CameraITS/tests/scene2_a/test_faces.py b/apps/CameraITS/tests/scene2_a/test_faces.py
deleted file mode 100644
index 220628d..0000000
--- a/apps/CameraITS/tests/scene2_a/test_faces.py
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 2014 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.
-"""Verifies faces are detected and landmarks in bounding boxes."""
-
-
-import logging
-import os.path
-from mobly import test_runner
-
-import its_base_test
-import camera_properties_utils
-import capture_request_utils
-import image_processing_utils
-import its_session_utils
-
-NAME = os.path.splitext(os.path.basename(__file__))[0]
-NUM_TEST_FRAMES = 20
-FD_MODE_OFF = 0
-FD_MODE_SIMPLE = 1
-FD_MODE_FULL = 2
-W, H = 640, 480
-
-
-def check_face_bounding_box(rect, aa_w, aa_h):
-  """Check that face bounding box is within the active array area."""
-  rect_t = rect['top']
-  rect_b = rect['bottom']
-  rect_l = rect['left']
-  rect_r = rect['right']
-  if rect_t > rect_b:
-    raise AssertionError(f'Face top > bottom! t: {rect_t}, b: {rect_b}')
-  if rect_l > rect_r:
-    raise AssertionError(f'Face left > right! l: {rect_l}, r: {rect_r}')
-
-  if not 0 <= rect_l <= aa_w:
-    raise AssertionError(f'Face l: {rect_l} outside of active W: 0,{aa_w}')
-  if not 0 <= rect_r <= aa_w:
-    raise AssertionError(f'Face r: {rect_r} outside of active W: 0,{aa_w}')
-  if not 0 <= rect_t <= aa_h:
-    raise AssertionError(f'Face t: {rect_t} outside active H: 0,{aa_h}')
-  if not 0 <= rect_b <= aa_h:
-    raise AssertionError(f'Face b: {rect_b} outside active H: 0,{aa_h}')
-
-
-def check_face_landmarks(face):
-  """Check that face landmarks fall within face bounding box."""
-  l, r = face['bounds']['left'], face['bounds']['right']
-  t, b = face['bounds']['top'], face['bounds']['bottom']
-  l_eye_x, l_eye_y = face['leftEye']['x'], face['leftEye']['y']
-  r_eye_x, r_eye_y = face['rightEye']['x'], face['rightEye']['y']
-  mouth_x, mouth_y = face['mouth']['x'], face['mouth']['y']
-  if not l <= l_eye_x <= r:
-    raise AssertionError(f'Face l: {l}, r: {r}, left eye x: {l_eye_x}')
-  if not t <= l_eye_y <= b:
-    raise AssertionError(f'Face t: {t}, b: {b}, left eye y: {l_eye_y}')
-  if not l <= r_eye_x <= r:
-    raise AssertionError(f'Face l: {l}, r: {r}, right eye x: {r_eye_x}')
-  if not t <= r_eye_y <= b:
-    raise AssertionError(f'Face t: {t}, b: {b}, right eye y: {r_eye_y}')
-  if not l <= mouth_x <= r:
-    raise AssertionError(f'Face l: {l}, r: {r}, mouth x: {mouth_x}')
-  if not t <= mouth_y <= b:
-    raise AssertionError(f'Face t: {t}, b: {b}, mouth y: {mouth_y}')
-
-
-class FacesTest(its_base_test.ItsBaseTest):
-  """Tests face detection algorithms.
-
-  Allows NUM_TEST_FRAMES for face detection algorithm to find all faces.
-  Tests OFF, SIMPLE, and FULL modes if available.
-    OFF --> no faces should be found.
-    SIMPLE --> face(s) should be found, but no landmarks.
-    FULL --> face(s) should be found and face landmarks reported.
-  """
-
-  def test_faces(self):
-    logging.debug('Starting %s', NAME)
-    with its_session_utils.ItsSession(
-        device_id=self.dut.serial,
-        camera_id=self.camera_id,
-        hidden_physical_id=self.hidden_physical_id) as cam:
-      props = cam.get_camera_properties()
-      props = cam.override_with_hidden_physical_camera_props(props)
-
-      # Load chart for scene.
-      its_session_utils.load_scene(
-          cam, props, self.scene, self.tablet, self.chart_distance)
-
-      camera_properties_utils.skip_unless(
-          camera_properties_utils.face_detect(props))
-      mono_camera = camera_properties_utils.mono_camera(props)
-      fd_modes = props['android.statistics.info.availableFaceDetectModes']
-      a = props['android.sensor.info.activeArraySize']
-      aw, ah = a['right'] - a['left'], a['bottom'] - a['top']
-      if camera_properties_utils.read_3a(props):
-        gain, exp, _, _, focus = cam.do_3a(
-            get_results=True, mono_camera=mono_camera)
-        logging.debug('iso = %d', gain)
-        logging.debug('exp = %.2fms', (exp * 1.0E-6))
-        if focus == 0.0:
-          logging.debug('fd = infinity')
-        else:
-          logging.debug('fd = %.2fcm', (1.0E2 / focus))
-      for fd_mode in fd_modes:
-        if not FD_MODE_OFF <= fd_mode <= FD_MODE_FULL:
-          raise AssertionError(f'fd_mode undefined: {fd_mode}')
-        req = capture_request_utils.auto_capture_request()
-        req['android.statistics.faceDetectMode'] = fd_mode
-        fmt = {'format': 'yuv', 'width': W, 'height': H}
-        caps = cam.do_capture([req] * NUM_TEST_FRAMES, fmt)
-        for i, cap in enumerate(caps):
-          fd_mode_md = cap['metadata']['android.statistics.faceDetectMode']
-          if fd_mode_md != fd_mode:
-            raise AssertionError('Metadata does not match request! '
-                                 f'Request: {fd_mode} metadata: {fd_mode_md}.')
-          faces = cap['metadata']['android.statistics.faces']
-
-          # 0 faces should be returned for OFF mode
-          if fd_mode == FD_MODE_OFF:
-            if faces:
-              raise AssertionError('Faces found in OFF mode.')
-            continue
-          # Save last frame.
-          if i == NUM_TEST_FRAMES - 1:
-            img = image_processing_utils.convert_capture_to_rgb_image(
-                cap, props=props)
-            img = image_processing_utils.rotate_img_per_argv(img)
-            img_name = '%s_fd_mode_%s.jpg' % (os.path.join(self.log_path,
-                                                           NAME), fd_mode)
-            image_processing_utils.write_image(img, img_name)
-            if not faces:
-              raise AssertionError(f'No face detected in mode {fd_mode}.')
-          if not faces:
-            continue
-
-          logging.debug('Frame %d face metadata:', i)
-          logging.debug('Faces: %s', faces)
-
-          face_scores = [face['score'] for face in faces]
-          face_rectangles = [face['bounds'] for face in faces]
-          for score in face_scores:
-            if not 1 <= score <= 100:
-              raise AssertionError(f'Face score not valid! score: {score}.')
-          # Face bounds should be within active array.
-          for j, rect in enumerate(face_rectangles):
-            logging.debug('Checking face rectangle %d', j)
-            check_face_bounding_box(rect, aw, ah)
-
-          # Face ID should be -1 for SIMPLE and unique for FULL
-          if fd_mode == FD_MODE_SIMPLE:
-            for face in faces:
-              if 'leftEye' in face or 'rightEye' in face:
-                raise AssertionError('Eyes not supported in FD_MODE_SIMPLE.')
-              if 'mouth' in face:
-                raise AssertionError('Mouth not supported in FD_MODE_SIMPLE.')
-              if face['id'] != -1:
-                raise AssertionError('face_id should be -1 in FD_MODE_SIMPLE.')
-          elif fd_mode == FD_MODE_FULL:
-            face_ids = [face['id'] for face in faces]
-            if len(face_ids) != len(set(face_ids)):
-              raise AssertionError('Same face detected more than 1x.')
-            # Face landmarks should be within face bounds
-            for k, face in enumerate(faces):
-              logging.debug('Checking landmarks in face %d: %s', k, str(face))
-              check_face_landmarks(face)
-
-if __name__ == '__main__':
-  test_runner.main()
diff --git a/apps/CameraITS/tests/scene2_a/test_num_faces.py b/apps/CameraITS/tests/scene2_a/test_num_faces.py
index 9cdca32..304b67b3 100644
--- a/apps/CameraITS/tests/scene2_a/test_num_faces.py
+++ b/apps/CameraITS/tests/scene2_a/test_num_faces.py
@@ -34,22 +34,90 @@
 W, H = 640, 480
 
 
-def draw_face_rectangles(img, faces, aw, ah):
+def check_face_bounding_box(rect, aw, ah, index):
+  """Checks face bounding box is within the active array area.
+
+  Args:
+    rect: dict; with face bounding box information
+    aw: int; active array width
+    ah: int; active array height
+    index: int to designate face number
+  """
+  logging.debug('Checking bounding box in face %d: %s', index, str(rect))
+  if (rect['top'] >= rect['bottom'] or
+      rect['left'] >= rect['right']):
+    raise AssertionError('Face coordinates incorrect! '
+                         f" t: {rect['top']}, b: {rect['bottom']}, "
+                         f" l: {rect['left']}, r: {rect['right']}")
+  if (not 0 <= rect['top'] <= ah or
+      not 0 <= rect['bottom'] <= ah):
+    raise AssertionError('Face top/bottom outside of image height! '
+                         f"t: {rect['top']}, b: {rect['bottom']}, "
+                         f"h: {ah}")
+  if (not 0 <= rect['left'] <= aw or
+      not 0 <= rect['right'] <= aw):
+    raise AssertionError('Face left/right outside of image width! '
+                         f"l: {rect['left']}, r: {rect['right']}, "
+                         f" w: {aw}")
+
+
+def check_face_landmarks(face, fd_mode, index):
+  """Checks face landmarks fall within face bounding box.
+
+  Face ID should be -1 for SIMPLE and unique for FULL
+  Args:
+    face: dict from face detection algorithm
+    fd_mode: int of face detection mode
+    index: int to designate face number
+  """
+  logging.debug('Checking landmarks in face %d: %s', index, str(face))
+  if fd_mode == FD_MODE_SIMPLE:
+    if 'leftEye' in face or 'rightEye' in face:
+      raise AssertionError('Eyes not supported in FD_MODE_SIMPLE.')
+    if 'mouth' in face:
+      raise AssertionError('Mouth not supported in FD_MODE_SIMPLE.')
+    if face['id'] != -1:
+      raise AssertionError('face_id should be -1 in FD_MODE_SIMPLE.')
+  elif fd_mode == FD_MODE_FULL:
+    l, r = face['bounds']['left'], face['bounds']['right']
+    t, b = face['bounds']['top'], face['bounds']['bottom']
+    l_eye_x, l_eye_y = face['leftEye']['x'], face['leftEye']['y']
+    r_eye_x, r_eye_y = face['rightEye']['x'], face['rightEye']['y']
+    mouth_x, mouth_y = face['mouth']['x'], face['mouth']['y']
+    if not l <= l_eye_x <= r:
+      raise AssertionError(f'Face l: {l}, r: {r}, left eye x: {l_eye_x}')
+    if not t <= l_eye_y <= b:
+      raise AssertionError(f'Face t: {t}, b: {b}, left eye y: {l_eye_y}')
+    if not l <= r_eye_x <= r:
+      raise AssertionError(f'Face l: {l}, r: {r}, right eye x: {r_eye_x}')
+    if not t <= r_eye_y <= b:
+      raise AssertionError(f'Face t: {t}, b: {b}, right eye y: {r_eye_y}')
+    if not l <= mouth_x <= r:
+      raise AssertionError(f'Face l: {l}, r: {r}, mouth x: {mouth_x}')
+    if not t <= mouth_y <= b:
+      raise AssertionError(f'Face t: {t}, b: {b}, mouth y: {mouth_y}')
+  else:
+    raise AssertionError(f'Unknown face detection mode: {fd_mode}.')
+
+
+def draw_face_rectangles(img, faces, crop):
   """Draw rectangles on top of image.
 
   Args:
     img:    image array
     faces:  list of dicts with face information
-    aw:     int; active array width
-    ah:     int; active array height
+    crop:   dict; crop region size with 'top, right, left, bottom' as keys
   Returns:
     img with face rectangles drawn on it
   """
+  cw, ch = crop['right'] - crop['left'], crop['bottom'] - crop['top']
+  logging.debug('crop region: %s', str(crop))
   for rect in [face['bounds'] for face in faces]:
-    top_left = (int(round(rect['left']*W/aw)),
-                int(round(rect['top']*H/ah)))
-    bot_rght = (int(round(rect['right']*W/aw)),
-                int(round(rect['bottom']*H/ah)))
+    logging.debug('rect: %s', str(rect))
+    top_left = (int(round((rect['left'] - crop['left']) * img.shape[1] / cw)),
+                int(round((rect['top'] - crop['top']) * img.shape[0] / ch)))
+    bot_rght = (int(round((rect['right'] - crop['left']) * img.shape[1] / cw)),
+                int(round((rect['bottom'] - crop['top']) * img.shape[0] / ch)))
     cv2.rectangle(img, top_left, bot_rght, (0, 1, 0), 2)
   return img
 
@@ -78,24 +146,31 @@
       fd_modes = props['android.statistics.info.availableFaceDetectModes']
       a = props['android.sensor.info.activeArraySize']
       aw, ah = a['right'] - a['left'], a['bottom'] - a['top']
+      logging.debug('active array size: %s', str(a))
+      file_name_stem = os.path.join(self.log_path, NAME)
 
       if camera_properties_utils.read_3a(props):
         _, _, _, _, _ = cam.do_3a(get_results=True, mono_camera=mono_camera)
 
       for fd_mode in fd_modes:
-        assert FD_MODE_OFF <= fd_mode <= FD_MODE_FULL
+        logging.debug('face detection mode: %d', fd_mode)
+        if not FD_MODE_OFF <= fd_mode <= FD_MODE_FULL:
+          raise AssertionError(f'FD mode {fd_mode} not in MODES! '
+                               f'OFF: {FD_MODE_OFF}, FULL: {FD_MODE_FULL}')
         req = capture_request_utils.auto_capture_request()
         req['android.statistics.faceDetectMode'] = fd_mode
         fmt = {'format': 'yuv', 'width': W, 'height': H}
         caps = cam.do_capture([req]*NUM_TEST_FRAMES, fmt)
         for i, cap in enumerate(caps):
-          md = cap['metadata']
-          assert md['android.statistics.faceDetectMode'] == fd_mode
-          faces = md['android.statistics.faces']
+          fd_mode_cap = cap['metadata']['android.statistics.faceDetectMode']
+          if fd_mode_cap != fd_mode:
+            raise AssertionError(f'metadata {fd_mode_cap} != req {fd_mode}')
 
+          faces = cap['metadata']['android.statistics.faces']
           # 0 faces should be returned for OFF mode
           if fd_mode == FD_MODE_OFF:
-            assert not faces
+            if faces:
+              raise AssertionError(f'Error: faces detected in OFF: {faces}')
             continue
           # Face detection could take several frames to warm up,
           # but should detect the correct number of faces in last frame
@@ -106,12 +181,14 @@
             logging.debug('Found %d face(s), expected %d.',
                           fnd_faces, NUM_FACES)
             # draw boxes around faces
-            img = draw_face_rectangles(img, faces, aw, ah)
+            crop_region = cap['metadata']['android.scaler.cropRegion']
+            img = draw_face_rectangles(img, faces, crop_region)
             # save image with rectangles
-            img_name = '%s_fd_mode_%s.jpg' % (os.path.join(self.log_path,
-                                                           NAME), fd_mode)
+            img_name = f'{file_name_stem}_fd_mode_{fd_mode}.jpg'
             image_processing_utils.write_image(img, img_name)
-            assert fnd_faces == NUM_FACES
+            if fnd_faces != NUM_FACES:
+              raise AssertionError('Wrong num of faces found! '
+                                   f'Found: {fnd_faces}, expected: {NUM_FACES}')
           if not faces:
             continue
 
@@ -121,16 +198,18 @@
           # Reasonable scores for faces
           face_scores = [face['score'] for face in faces]
           for score in face_scores:
-            assert 1 <= score <= 100
+            if not 1 <= score <= 100:
+              raise AssertionError(f'score not between [1:100]! {score}')
+
           # Face bounds should be within active array
           face_rectangles = [face['bounds'] for face in faces]
-          for rect in face_rectangles:
-            assert rect['top'] < rect['bottom']
-            assert rect['left'] < rect['right']
-            assert 0 <= rect['top'] <= ah
-            assert 0 <= rect['bottom'] <= ah
-            assert 0 <= rect['left'] <= aw
-            assert 0 <= rect['right'] <= aw
+          for j, rect in enumerate(face_rectangles):
+            check_face_bounding_box(rect, aw, ah, j)
+
+          # Face landmarks (if provided) are within face bounding box
+          for k, face in enumerate(faces):
+            check_face_landmarks(face, fd_mode, k)
+
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene2_b/test_yuv_jpeg_capture_sameness.py b/apps/CameraITS/tests/scene2_b/test_yuv_jpeg_capture_sameness.py
new file mode 100644
index 0000000..f5c5e68
--- /dev/null
+++ b/apps/CameraITS/tests/scene2_b/test_yuv_jpeg_capture_sameness.py
@@ -0,0 +1,87 @@
+# Copyright 2022 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.
+"""Verifies JPEG and YUV still capture images are pixel-wise matching."""
+
+
+import logging
+import os.path
+from mobly import test_runner
+
+import its_base_test
+import camera_properties_utils
+import capture_request_utils
+import image_processing_utils
+import its_session_utils
+import target_exposure_utils
+
+_MAX_IMG_SIZE = (1920, 1440)
+_NAME = os.path.splitext(os.path.basename(__file__))[0]
+_THRESHOLD_MAX_RMS_DIFF = 0.01
+_USE_CASE_STILL_CAPTURE = 2
+
+class YuvJpegCaptureSamenessTest(its_base_test.ItsBaseTest):
+  """Test capturing a single frame as both YUV and JPEG outputs."""
+
+  def test_yuv_jpeg_capture_sameness(self):
+    logging.debug('Starting %s', _NAME)
+    with its_session_utils.ItsSession(
+        device_id=self.dut.serial,
+        camera_id=self.camera_id,
+        hidden_physical_id=self.hidden_physical_id) as cam:
+      props = cam.get_camera_properties()
+      props = cam.override_with_hidden_physical_camera_props(props)
+      log_path = self.log_path
+
+      # check SKIP conditions
+      camera_properties_utils.skip_unless(
+          camera_properties_utils.stream_use_case(props))
+
+      # Load chart for scene
+      its_session_utils.load_scene(
+          cam, props, self.scene, self.tablet, self.chart_distance)
+
+      # Create requests
+      max_jpeg_size = capture_request_utils.get_available_output_sizes(
+          'jpeg', props)[0]
+      if capture_request_utils.is_common_aspect_ratio(max_jpeg_size):
+        w, h = capture_request_utils.get_available_output_sizes(
+            'yuv', props, _MAX_IMG_SIZE, max_jpeg_size)[0]
+      else:
+        w, h = capture_request_utils.get_available_output_sizes(
+            'yuv', props, max_size=_MAX_IMG_SIZE)[0]
+      fmt_yuv = {'format': 'yuv', 'width': w, 'height': h, 'useCase': _USE_CASE_STILL_CAPTURE}
+      fmt_jpg = {'format': 'jpeg', 'width': w, 'height': h, 'useCase': _USE_CASE_STILL_CAPTURE}
+      logging.debug('YUV & JPEG stream width: %d, height: %d', w, h)
+
+      cam.do_3a()
+      req = capture_request_utils.auto_capture_request()
+      req['android.jpeg.quality'] = 100
+
+      cap_yuv, cap_jpg = cam.do_capture(req, [fmt_yuv, fmt_jpg])
+      rgb_yuv = image_processing_utils.convert_capture_to_rgb_image(cap_yuv, True)
+      image_processing_utils.write_image(rgb_yuv,
+          '%s_%s.jpg' % (os.path.join(log_path, _NAME), 'yuv'))
+      rgb_jpg = image_processing_utils.convert_capture_to_rgb_image(cap_jpg, True)
+      image_processing_utils.write_image(rgb_jpg,
+          '%s_%s.jpg' % (os.path.join(log_path, _NAME), 'jpg'))
+
+      rms_diff = image_processing_utils.compute_image_rms_difference_3d(
+          rgb_yuv, rgb_jpg)
+      msg = f'RMS diff: {rms_diff:.4f}'
+      logging.debug('%s', msg)
+      if rms_diff >= _THRESHOLD_MAX_RMS_DIFF:
+        raise AssertionError(msg + f', spec: {_THRESHOLD_MAX_RMS_DIFF}')
+
+if __name__ == '__main__':
+  test_runner.main()
diff --git a/apps/CameraITS/tests/scene2_c/test_camera_launch_perf_class.py b/apps/CameraITS/tests/scene2_c/test_camera_launch_perf_class.py
index e1ed893..e7c7af8 100644
--- a/apps/CameraITS/tests/scene2_c/test_camera_launch_perf_class.py
+++ b/apps/CameraITS/tests/scene2_c/test_camera_launch_perf_class.py
@@ -22,13 +22,14 @@
 import its_base_test
 import its_session_utils
 
+# This must match MPC12_CAMERA_LAUNCH_THRESHOLD in ItsTestActivity.java
 CAMERA_LAUNCH_S_PERFORMANCE_CLASS_THRESHOLD = 600  # ms
 
 
 class CameraLaunchSPerfClassTest(its_base_test.ItsBaseTest):
   """Test camera launch latency for S performance class as specified in CDD.
 
-  [7.5/H-1-7] MUST have camera2 startup latency (open camera to first preview
+  [7.5/H-1-6] MUST have camera2 startup latency (open camera to first preview
   frame) < 600ms as measured by the CTS camera PerformanceTest under ITS
   lighting conditions (3000K) for both primary cameras.
   """
@@ -41,7 +42,7 @@
         camera_id=self.camera_id) as cam:
 
       camera_properties_utils.skip_unless(
-          cam.is_performance_class_primary_camera())
+          cam.is_primary_camera())
 
       # Load chart for scene.
       props = cam.get_camera_properties()
@@ -55,11 +56,17 @@
         camera_id=self.camera_id)
 
     launch_ms = cam.measure_camera_launch_ms()
-    if launch_ms >= CAMERA_LAUNCH_S_PERFORMANCE_CLASS_THRESHOLD:
-      raise AssertionError(f'camera launch time: {launch_ms} ms, THRESH: '
-                           f'{CAMERA_LAUNCH_S_PERFORMANCE_CLASS_THRESHOLD} ms')
-    else:
-      logging.debug('camera launch time: %.1f ms', launch_ms)
+
+    # Assert launch time if device claims performance class
+    if (cam.is_performance_class() and
+        launch_ms >= CAMERA_LAUNCH_S_PERFORMANCE_CLASS_THRESHOLD):
+      raise AssertionError(f'camera_launch_time_ms: {launch_ms}, THRESH: '
+                           f'{CAMERA_LAUNCH_S_PERFORMANCE_CLASS_THRESHOLD}')
+
+    # Log launch time, so that the corresponding MPC level can be written to
+    # report log. Text must match MPC12_CAMERA_LAUNCH_PATTERN in
+    # ItsTestActivity.java.
+    print(f'camera_launch_time_ms:{launch_ms}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene2_c/test_jpeg_capture_perf_class.py b/apps/CameraITS/tests/scene2_c/test_jpeg_capture_perf_class.py
index ba4867b..0eb76eb 100644
--- a/apps/CameraITS/tests/scene2_c/test_jpeg_capture_perf_class.py
+++ b/apps/CameraITS/tests/scene2_c/test_jpeg_capture_perf_class.py
@@ -22,13 +22,14 @@
 import its_base_test
 import its_session_utils
 
+# This must match MPC12_JPEG_CAPTURE_THRESHOLD in ItsTestActivity.java
 JPEG_CAPTURE_S_PERFORMANCE_CLASS_THRESHOLD = 1000  # ms
 
 
 class JpegCaptureSPerfClassTest(its_base_test.ItsBaseTest):
   """Test jpeg capture latency for S performance class as specified in CDD.
 
-  [7.5/H-1-6] MUST have camera2 JPEG capture latency < 1000ms for 1080p
+  [7.5/H-1-5] MUST have camera2 JPEG capture latency < 1000ms for 1080p
   resolution as measured by the CTS camera PerformanceTest under ITS lighting
   conditions (3000K) for both primary cameras.
   """
@@ -41,7 +42,7 @@
         camera_id=self.camera_id) as cam:
 
       camera_properties_utils.skip_unless(
-          cam.is_performance_class_primary_camera())
+          cam.is_primary_camera())
 
       # Load chart for scene.
       props = cam.get_camera_properties()
@@ -55,12 +56,18 @@
         camera_id=self.camera_id)
 
     jpeg_capture_ms = cam.measure_camera_1080p_jpeg_capture_ms()
-    if jpeg_capture_ms >= JPEG_CAPTURE_S_PERFORMANCE_CLASS_THRESHOLD:
-      raise AssertionError(f'1080p jpeg capture time: {jpeg_capture_ms} ms, '
+
+    # Assert jpeg capture time if device claims performance class
+    if (cam.is_performance_class() and
+        jpeg_capture_ms >= JPEG_CAPTURE_S_PERFORMANCE_CLASS_THRESHOLD):
+      raise AssertionError(f'1080p_jpeg_capture_time_ms: {jpeg_capture_ms}, '
                            f'THRESH: '
-                           f'{JPEG_CAPTURE_S_PERFORMANCE_CLASS_THRESHOLD} ms')
-    else:
-      logging.debug('1080p jpeg capture time: %.1f ms', jpeg_capture_ms)
+                           f'{JPEG_CAPTURE_S_PERFORMANCE_CLASS_THRESHOLD}')
+
+    # Log jpeg capture time so that the corresponding MPC level can be written
+    # to report log. Text must match MPC12_JPEG_CAPTURE_PATTERN in
+    # ItsTestActivity.java.
+    print(f'1080p_jpeg_capture_time_ms:{jpeg_capture_ms}')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene3/test_edge_enhancement.py b/apps/CameraITS/tests/scene3/test_edge_enhancement.py
index 9539971..c6a3bcb 100644
--- a/apps/CameraITS/tests/scene3/test_edge_enhancement.py
+++ b/apps/CameraITS/tests/scene3/test_edge_enhancement.py
@@ -94,7 +94,6 @@
         device_id=self.dut.serial,
         camera_id=self.camera_id,
         hidden_physical_id=self.hidden_physical_id) as cam:
-      chart_loc_arg = self.chart_loc_arg
       props = cam.get_camera_properties()
       props = cam.override_with_hidden_physical_camera_props(props)
 
@@ -109,8 +108,7 @@
           cam, props, self.scene, self.tablet, self.chart_distance)
 
       # Initialize chart class and locate chart in scene
-      chart = opencv_processing_utils.Chart(
-          cam, props, self.log_path, chart_loc=chart_loc_arg)
+      chart = opencv_processing_utils.Chart(cam, props, self.log_path)
 
       # Define format
       fmt = 'yuv'
@@ -141,24 +139,26 @@
                     str(sharpness_regular))
 
       logging.debug('Verify HQ is sharper than OFF')
-      e_msg = 'HQ: %.3f, OFF: %.3f' % (sharpness_regular[EDGE_MODES['HQ']],
-                                       sharpness_regular[EDGE_MODES['OFF']])
-      assert (sharpness_regular[EDGE_MODES['HQ']] >
-              sharpness_regular[EDGE_MODES['OFF']]), e_msg
+      if (sharpness_regular[EDGE_MODES['HQ']] <=
+          sharpness_regular[EDGE_MODES['OFF']]):
+        raise AssertionError(f"HQ: {sharpness_regular[EDGE_MODES['HQ']]:.3f}, "
+                             f"OFF: {sharpness_regular[EDGE_MODES['OFF']]:.3f}")
 
       logging.debug('Verify OFF is not sharper than FAST')
-      e_msg = 'FAST: %.3f, OFF: %.3f, RTOL: %.2f' % (
-          sharpness_regular[EDGE_MODES['FAST']],
-          sharpness_regular[EDGE_MODES['OFF']], SHARPNESS_RTOL)
-      assert (sharpness_regular[EDGE_MODES['FAST']] >
-              sharpness_regular[EDGE_MODES['OFF']]*(1.0-SHARPNESS_RTOL)), e_msg
+      if (sharpness_regular[EDGE_MODES['FAST']] <=
+          sharpness_regular[EDGE_MODES['OFF']]*(1.0-SHARPNESS_RTOL)):
+        raise AssertionError(
+            f"FAST: {sharpness_regular[EDGE_MODES['FAST']]:.3f}, "
+            f"OFF: {sharpness_regular[EDGE_MODES['OFF']]:.3f}, "
+            f"RTOL: {SHARPNESS_RTOL}")
 
       logging.debug('Verify FAST is not sharper than HQ')
-      e_msg = 'HQ: %.3f, FAST: %.3f, RTOL: %.2f' % (
-          sharpness_regular[EDGE_MODES['HQ']],
-          sharpness_regular[EDGE_MODES['FAST']], SHARPNESS_RTOL)
-      assert (sharpness_regular[EDGE_MODES['HQ']] >
-              sharpness_regular[EDGE_MODES['FAST']]*(1.0-SHARPNESS_RTOL)), e_msg
+      if (sharpness_regular[EDGE_MODES['HQ']] <=
+          sharpness_regular[EDGE_MODES['FAST']]*(1.0-SHARPNESS_RTOL)):
+        raise AssertionError(
+            f"HQ: {sharpness_regular[EDGE_MODES['HQ']]:.3f}, "
+            f"FAST: {sharpness_regular[EDGE_MODES['FAST']]:.3f}, "
+            f"RTOL: {SHARPNESS_RTOL}")
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene3/test_flip_mirror.py b/apps/CameraITS/tests/scene3/test_flip_mirror.py
index 679b740..31221a5 100644
--- a/apps/CameraITS/tests/scene3/test_flip_mirror.py
+++ b/apps/CameraITS/tests/scene3/test_flip_mirror.py
@@ -133,7 +133,6 @@
       props = cam.get_camera_properties()
       props = cam.override_with_hidden_physical_camera_props(props)
       debug = self.debug_mode
-      chart_loc_arg = self.chart_loc_arg
 
       # check SKIP conditions
       camera_properties_utils.skip_unless(
@@ -144,8 +143,7 @@
           cam, props, self.scene, self.tablet, self.chart_distance)
 
       # initialize chart class and locate chart in scene
-      chart = opencv_processing_utils.Chart(
-          cam, props, self.log_path, chart_loc=chart_loc_arg)
+      chart = opencv_processing_utils.Chart(cam, props, self.log_path)
       fmt = {'format': 'yuv', 'width': VGA_W, 'height': VGA_H}
 
       # test that image is not flipped, mirrored, or rotated
diff --git a/apps/CameraITS/tests/scene3/test_lens_movement_reporting.py b/apps/CameraITS/tests/scene3/test_lens_movement_reporting.py
index 3e638d6..930817c 100644
--- a/apps/CameraITS/tests/scene3/test_lens_movement_reporting.py
+++ b/apps/CameraITS/tests/scene3/test_lens_movement_reporting.py
@@ -105,7 +105,6 @@
         device_id=self.dut.serial,
         camera_id=self.camera_id,
         hidden_physical_id=self.hidden_physical_id) as cam:
-      chart_loc_arg = self.chart_loc_arg
       props = cam.get_camera_properties()
       props = cam.override_with_hidden_physical_camera_props(props)
 
@@ -120,8 +119,7 @@
           cam, props, self.scene, self.tablet, self.chart_distance)
 
       # Initialize chart class and locate chart in scene
-      chart = opencv_processing_utils.Chart(
-          cam, props, self.log_path, chart_loc=chart_loc_arg)
+      chart = opencv_processing_utils.Chart(cam, props, self.log_path)
 
       # Get proper sensitivity, exposure time, and focus distance with 3A.
       mono_camera = camera_properties_utils.mono_camera(props)
diff --git a/apps/CameraITS/tests/scene3/test_lens_position.py b/apps/CameraITS/tests/scene3/test_lens_position.py
deleted file mode 100644
index 09f74f0..0000000
--- a/apps/CameraITS/tests/scene3/test_lens_position.py
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 2016 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.
-"""Verifies android.lens.focusDistance for lens moving and stationary."""
-
-
-import logging
-import os
-from mobly import test_runner
-import numpy as np
-
-import its_base_test
-import camera_properties_utils
-import capture_request_utils
-import error_util
-import image_processing_utils
-import its_session_utils
-import opencv_processing_utils
-
-FRAME_ATOL_MS = 10  # ms
-LENS_MOVING_STATE = 1
-NAME = os.path.splitext(os.path.basename(__file__))[0]
-NSEC_TO_MSEC = 1.0E-6
-NUM_TRYS = 2
-NUM_STEPS = 6
-POSITION_RTOL = 0.1
-SHARPNESS_RTOL = 0.1
-VGA_W, VGA_H = 640, 480
-
-
-def assert_static_frames_behavior(d_stat):
-  """Assert locations/sharpness are correct in static frames."""
-  logging.debug('Asserting static lens locations/sharpness are similar')
-  for i in range(len(d_stat) // 2):
-    j = 2 * NUM_STEPS - 1 - i
-    rw_msg = 'fd_write: %.3f, fd_read: %.3f, RTOL: %.2f' % (
-        d_stat[i]['fd'], d_stat[i]['loc'], POSITION_RTOL)
-    fr_msg = 'loc_fwd[%d]: %.3f, loc_rev[%d]: %.3f, RTOL: %.2f' % (
-        i, d_stat[i]['loc'], j, d_stat[j]['loc'], POSITION_RTOL)
-    s_msg = 'sharpness_fwd: %.3f, sharpness_rev: %.3f, RTOL: %.2f' % (
-        d_stat[i]['sharpness'], d_stat[j]['sharpness'], SHARPNESS_RTOL)
-    assert np.isclose(d_stat[i]['loc'], d_stat[i]['fd'],
-                      rtol=POSITION_RTOL), rw_msg
-    assert np.isclose(d_stat[i]['loc'], d_stat[j]['loc'],
-                      rtol=POSITION_RTOL), fr_msg
-    assert np.isclose(d_stat[i]['sharpness'], d_stat[j]['sharpness'],
-                      rtol=SHARPNESS_RTOL), s_msg
-
-
-def assert_moving_frames_behavior(d_move, d_stat):
-  """Assert locations/sharpness are correct for consecutive moving frames."""
-  logging.debug('Asserting moving frames are consecutive')
-  times = [v['timestamp'] for v in d_move.values()]
-  diffs = np.gradient(times)
-  assert np.isclose(np.amin(diffs), np.amax(diffs),
-                    atol=FRAME_ATOL_MS), 'ATOL(ms): %.1f' % FRAME_ATOL_MS
-
-  logging.debug('Asserting moving lens locations/sharpness are similar')
-  for i in range(len(d_move)):
-    e_msg = 'static: %.3f, moving: %.3f, RTOL: %.2f' % (
-        d_stat[i]['loc'], d_move[i]['loc'], POSITION_RTOL)
-    assert np.isclose(d_stat[i]['loc'], d_move[i]['loc'],
-                      rtol=POSITION_RTOL), e_msg
-    if d_move[i]['lens_moving'] and i > 0:
-      e_msg = '%d sharpness[stat]: %.2f ' % (i-1, d_stat[i-1]['sharpness'])
-      e_msg += '%d sharpness[stat]: %.2f, [move]: %.2f, RTOL: %.1f' % (
-          i, d_stat[i]['sharpness'], d_move[i]['sharpness'], SHARPNESS_RTOL)
-      if d_stat[i]['sharpness'] > d_stat[i-1]['sharpness']:
-        assert (d_stat[i]['sharpness'] * (1.0 + SHARPNESS_RTOL) >
-                d_move[i]['sharpness'] > d_stat[i-1]['sharpness'] *
-                (1.0 - SHARPNESS_RTOL)), e_msg
-      else:
-        assert (d_stat[i-1]['sharpness'] * (1.0 + SHARPNESS_RTOL) >
-                d_move[i]['sharpness'] > d_stat[i]['sharpness'] *
-                (1.0 - SHARPNESS_RTOL)), e_msg
-    elif not d_move[i]['lens_moving']:
-      e_msg = '%d sharpness[stat]: %.2f, [move]: %.2f, RTOL: %.1f' % (
-          i, d_stat[i]['sharpness'], d_move[i]['sharpness'], SHARPNESS_RTOL)
-      assert np.isclose(d_stat[i]['sharpness'], d_move[i]['sharpness'],
-                        rtol=SHARPNESS_RTOL), e_msg
-    else:
-      raise error_util.Error('Lens is moving at frame 0!')
-
-
-def take_caps_and_return_data(cam, props, fmt, sens, exp, chart, log_path):
-  """Return fd, sharpness, lens state of the output images.
-
-  Args:
-    cam: An open device session
-    props: Properties of cam
-    fmt: Dict for capture format
-    sens: Sensitivity for 3A request as defined in android.sensor.sensitivity
-    exp: Exposure time for 3A request as defined in android.sensor.exposureTime
-    chart: Object with chart properties
-    log_path: Location to save images
-
-  Returns:
-    Dictionary of results for different focal distance captures with static
-    lens positions and moving lens positions: d_static, d_moving
-  """
-
-  # initialize variables and take data sets
-  data_static = {}
-  data_moving = {}
-  white_level = int(props['android.sensor.info.whiteLevel'])
-  min_fd = props['android.lens.info.minimumFocusDistance']
-  hyperfocal = props['android.lens.info.hyperfocalDistance']
-  # create forward + back list of focal distances
-  fds_f = np.arange(hyperfocal, min_fd, (min_fd-hyperfocal)/(NUM_STEPS-1))
-  fds_f = np.append(fds_f, min_fd)
-  fds_fb = list(fds_f) + list(reversed(fds_f))
-
-  # take static data set
-  for i, fd in enumerate(fds_fb):
-    req = capture_request_utils.manual_capture_request(sens, exp)
-    req['android.lens.focusDistance'] = fd
-    cap = image_processing_utils.stationary_lens_cap(cam, req, fmt)
-    data = {'fd': fds_fb[i]}
-    data['loc'] = cap['metadata']['android.lens.focusDistance']
-    y, _, _ = image_processing_utils.convert_capture_to_planes(cap, props)
-    chart.img = image_processing_utils.normalize_img(
-        image_processing_utils.get_image_patch(y, chart.xnorm, chart.ynorm,
-                                               chart.wnorm, chart.hnorm))
-    image_processing_utils.write_image(chart.img, '%s_stat_i=%d_chart.jpg' % (
-        os.path.join(log_path, NAME), i))
-    data['sharpness'] = white_level*image_processing_utils.compute_image_sharpness(
-        chart.img)
-    data_static[i] = data
-
-  # take moving data set
-  reqs = []
-  for i, fd in enumerate(fds_f):
-    reqs.append(capture_request_utils.manual_capture_request(sens, exp))
-    reqs[i]['android.lens.focusDistance'] = fd
-  caps = cam.do_capture(reqs, fmt)
-  for i, cap in enumerate(caps):
-    data = {'fd': fds_f[i]}
-    data['loc'] = cap['metadata']['android.lens.focusDistance']
-    data['lens_moving'] = (
-        cap['metadata']['android.lens.state'] == LENS_MOVING_STATE)
-    timestamp = cap['metadata']['android.sensor.timestamp'] * NSEC_TO_MSEC
-    if i == 0:
-      timestamp_init = timestamp
-    timestamp -= timestamp_init
-    data['timestamp'] = timestamp
-    y, _, _ = image_processing_utils.convert_capture_to_planes(cap, props)
-    y = image_processing_utils.rotate_img_per_argv(y)
-    chart.img = image_processing_utils.normalize_img(
-        image_processing_utils.get_image_patch(
-            y, chart.xnorm, chart.ynorm, chart.wnorm, chart.hnorm))
-    image_processing_utils.write_image(chart.img, '%s_move_i=%d_chart.jpg' % (
-        os.path.join(log_path, NAME), i))
-    data['sharpness'] = (
-        white_level * image_processing_utils.compute_image_sharpness(chart.img))
-    data_moving[i] = data
-  return data_static, data_moving
-
-
-class LensPositionReportingTest(its_base_test.ItsBaseTest):
-  """Test if focus position is properly reported for moving lenses."""
-
-  def test_lens_position_reporting(self):
-    logging.debug('Starting %s', NAME)
-    with its_session_utils.ItsSession(
-        device_id=self.dut.serial,
-        camera_id=self.camera_id,
-        hidden_physical_id=self.hidden_physical_id) as cam:
-      chart_loc_arg = self.chart_loc_arg
-      props = cam.get_camera_properties()
-      props = cam.override_with_hidden_physical_camera_props(props)
-      log_path = self.log_path
-
-      # Check skip conditions
-      camera_properties_utils.skip_unless(
-          not camera_properties_utils.fixed_focus(props) and
-          camera_properties_utils.read_3a(props) and
-          camera_properties_utils.lens_calibrated(props))
-
-      # Calculate camera_fov and load scaled image on tablet.
-      its_session_utils.load_scene(cam, props, self.scene, self.tablet,
-                                   self.chart_distance)
-
-      # Initialize chart class and locate chart in scene
-      chart = opencv_processing_utils.Chart(
-          cam, props, self.log_path, chart_loc=chart_loc_arg)
-
-      # Initialize capture format
-      fmt = {'format': 'yuv', 'width': VGA_W, 'height': VGA_H}
-
-      # Get proper sensitivity and exposure time with 3A
-      mono_camera = camera_properties_utils.mono_camera(props)
-      s, e, _, _, _ = cam.do_3a(get_results=True, mono_camera=mono_camera)
-
-      # Take caps and get sharpness for each focal distance
-      d_stat, d_move = take_caps_and_return_data(
-          cam, props, fmt, s, e, chart, log_path)
-
-      # Summarize info for log file and easier debug
-      logging.debug('Lens stationary')
-      for k in sorted(d_stat):
-        logging.debug(
-            'i: %d\tfd: %.3f\tlens location (diopters): %.3f \t'
-            'sharpness: %.1f', k, d_stat[k]['fd'], d_stat[k]['loc'],
-            d_stat[k]['sharpness'])
-      logging.debug('Lens moving')
-      for k in sorted(d_move):
-        logging.debug(
-            'i: %d\tfd: %.3f\tlens location (diopters): %.3f \t'
-            'sharpness: %.1f  \tlens_moving: %r \t'
-            'timestamp: %.1fms', k, d_move[k]['fd'], d_move[k]['loc'],
-            d_move[k]['sharpness'], d_move[k]['lens_moving'],
-            d_move[k]['timestamp'])
-
-      # assert reported location/sharpness is correct in static frames
-      assert_static_frames_behavior(d_stat)
-
-      # assert reported location/sharpness is correct in moving frames
-      assert_moving_frames_behavior(d_move, d_stat)
-
-
-if __name__ == '__main__':
-  test_runner.main()
diff --git a/apps/CameraITS/tests/scene3/test_reprocess_edge_enhancement.py b/apps/CameraITS/tests/scene3/test_reprocess_edge_enhancement.py
index b19ac1f..c5e9b19 100644
--- a/apps/CameraITS/tests/scene3/test_reprocess_edge_enhancement.py
+++ b/apps/CameraITS/tests/scene3/test_reprocess_edge_enhancement.py
@@ -16,6 +16,7 @@
 
 import logging
 import os
+import math
 import matplotlib
 from matplotlib import pylab
 from mobly import test_runner
@@ -44,25 +45,25 @@
                          f"OFF: {sharpness[EDGE_MODES['OFF']]:.5f}")
 
   logging.debug('Verify ZSL is similar to OFF')
-  e_msg = 'ZSL: %.5f, OFF: %.5f, RTOL: %.2f' % (
-      sharpness[EDGE_MODES['ZSL']], sharpness[EDGE_MODES['OFF']],
-      SHARPNESS_RTOL)
-  assert np.isclose(sharpness[EDGE_MODES['ZSL']], sharpness[EDGE_MODES['OFF']],
-                    SHARPNESS_RTOL), e_msg
+  if not math.isclose(sharpness[EDGE_MODES['ZSL']],
+                      sharpness[EDGE_MODES['OFF']], rel_tol=SHARPNESS_RTOL):
+    raise AssertionError(f"ZSL: {sharpness[EDGE_MODES['ZSL']]:.5f}, "
+                         f"OFF: {sharpness[EDGE_MODES['OFF']]:.5f}, "
+                         f'RTOL: {SHARPNESS_RTOL}')
 
   logging.debug('Verify OFF is not sharper than FAST')
-  e_msg = 'FAST: %.5f, OFF: %.5f, RTOL: %.2f' % (
-      sharpness[EDGE_MODES['FAST']], sharpness[EDGE_MODES['OFF']],
-      SHARPNESS_RTOL)
-  assert (sharpness[EDGE_MODES['FAST']] >
-          sharpness[EDGE_MODES['OFF']] * (1.0-SHARPNESS_RTOL)), e_msg
+  if (sharpness[EDGE_MODES['FAST']] <=
+      sharpness[EDGE_MODES['OFF']] * (1.0-SHARPNESS_RTOL)):
+    raise AssertionError(f"FAST: {sharpness[EDGE_MODES['FAST']]:.5f}, "
+                         f"OFF: {sharpness[EDGE_MODES['OFF']]:.5f}, "
+                         f'RTOL: {SHARPNESS_RTOL}')
 
   logging.debug('Verify FAST is not sharper than HQ')
-  e_msg = 'FAST: %.5f, HQ: %.5f, RTOL: %.2f' % (
-      sharpness[EDGE_MODES['FAST']], sharpness[EDGE_MODES['HQ']],
-      SHARPNESS_RTOL)
-  assert (sharpness[EDGE_MODES['HQ']] >
-          sharpness[EDGE_MODES['FAST']] * (1.0-SHARPNESS_RTOL)), e_msg
+  if (sharpness[EDGE_MODES['HQ']] <=
+      sharpness[EDGE_MODES['FAST']] * (1.0-SHARPNESS_RTOL)):
+    raise AssertionError(f"FAST: {sharpness[EDGE_MODES['FAST']]:.5f}, "
+                         f"HQ: {sharpness[EDGE_MODES['HQ']]:.5f}, "
+                         f'RTOL: {SHARPNESS_RTOL}')
 
 
 def do_capture_and_determine_sharpness(
@@ -139,7 +140,6 @@
         device_id=self.dut.serial,
         camera_id=self.camera_id,
         hidden_physical_id=self.hidden_physical_id) as cam:
-      chart_loc_arg = self.chart_loc_arg
       props = cam.get_camera_properties()
       props = cam.override_with_hidden_physical_camera_props(props)
       log_path = self.log_path
@@ -157,12 +157,11 @@
           cam, props, self.scene, self.tablet, self.chart_distance)
 
       # Initialize chart class and locate chart in scene
-      chart = opencv_processing_utils.Chart(
-          cam, props, self.log_path, chart_loc=chart_loc_arg)
+      chart = opencv_processing_utils.Chart(cam, props, self.log_path)
 
       # If reprocessing is supported, ZSL edge mode must be avaiable.
-      assert camera_properties_utils.edge_mode(
-          props, EDGE_MODES['ZSL']), 'ZSL android.edge.mode not available!'
+      if not camera_properties_utils.edge_mode(props, EDGE_MODES['ZSL']):
+        raise AssertionError('ZSL android.edge.mode not available!')
 
       reprocess_formats = []
       if camera_properties_utils.yuv_reprocess(props):
@@ -251,11 +250,13 @@
         hq_div_off_regular = (
             sharpness_regular[EDGE_MODES['HQ']] /
             sharpness_regular[EDGE_MODES['OFF']])
-        e_msg = 'HQ/OFF_reprocess: %.4f, HQ/OFF_reg: %.4f, RTOL: %.2f' % (
-            hq_div_off_reprocess, hq_div_off_regular, SHARPNESS_RTOL)
         logging.debug('Verify reprocess HQ ~= reg HQ relative to OFF')
-        assert np.isclose(hq_div_off_reprocess, hq_div_off_regular,
-                          SHARPNESS_RTOL), e_msg
+        if not math.isclose(hq_div_off_reprocess, hq_div_off_regular,
+                            rel_tol=SHARPNESS_RTOL):
+          raise AssertionError(f'HQ/OFF_reprocess: {hq_div_off_reprocess:.4f}, '
+                               f'HQ/OFF_reg: {hq_div_off_regular:.4f}, '
+                               f'RTOL: {SHARPNESS_RTOL}')
+
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene4/test_aspect_ratio_and_crop.py b/apps/CameraITS/tests/scene4/test_aspect_ratio_and_crop.py
index 1a43788..5f59a49 100644
--- a/apps/CameraITS/tests/scene4/test_aspect_ratio_and_crop.py
+++ b/apps/CameraITS/tests/scene4/test_aspect_ratio_and_crop.py
@@ -15,31 +15,21 @@
 
 
 import logging
-import math
 import os.path
 from mobly import test_runner
 import numpy as np
 
-import cv2
 import its_base_test
 import camera_properties_utils
 import capture_request_utils
 import image_processing_utils
+import image_fov_utils
 import its_session_utils
 import opencv_processing_utils
 
 _ANDROID11_API_LEVEL = 30
-_CIRCLE_COLOR = 0  # [0: black, 255: white].
-_CIRCLE_MIN_AREA = 0.01  # 1% of image size.
-_FOV_PERCENT_RTOL = 0.15  # Relative tolerance on circle FoV % to expected.
-_LARGE_SIZE = 2000  # Size of a large image (compared against max(w, h)).
 _NAME = os.path.splitext(os.path.basename(__file__))[0]
 _PREVIEW_SIZE = (1920, 1080)
-_THRESH_AR_L = 0.02  # Aspect ratio test threshold of large images.
-_THRESH_AR_S = 0.075  # Aspect ratio test threshold of mini images.
-_THRESH_CROP_L = 0.02  # Crop test threshold of large images.
-_THRESH_CROP_S = 0.075  # Crop test threshold of mini images.
-_THRESH_MIN_PIXEL = 4  # Crop test allowed offset.
 
 # Before API level 30, only resolutions with the following listed aspect ratio
 # are checked. Device launched after API level 30 will need to pass the test
@@ -149,259 +139,6 @@
   return False
 
 
-def _calc_expected_circle_image_ratio(ref_fov, img_w, img_h):
-  """Determine the circle image area ratio in percentage for a given image size.
-
-  Cropping happens either horizontally or vertically. In both cases crop results
-  in the visble area reduced by a ratio r (r < 1) and the circle will in turn
-  occupy ref_pct/r (percent) on the target image size.
-
-  Args:
-    ref_fov: dict with {fmt, % coverage, w, h, circle_w, circle_h}
-    img_w: the image width
-    img_h: the image height
-
-  Returns:
-    chk_percent: the expected circle image area ratio in percentage
-  """
-  ar_ref = ref_fov['w'] / ref_fov['h']
-  ar_target = img_w / img_h
-
-  r = ar_ref / ar_target
-  if r < 1.0:
-    r = 1.0 / r
-  return ref_fov['percent'] * r
-
-
-def _find_raw_fov_reference(cam, req, props, log_path):
-  """Determine the circle coverage of the image in RAW reference image.
-
-  Captures a full-frame RAW and uses its aspect ratio and circle center
-  location as ground truth for the other jpeg or yuv images.
-
-  The intrinsics and distortion coefficients are meant for full-sized RAW,
-  so convert_capture_to_rgb_image returns a 2x downsampled version, so resizes
-  RGB back to full size.
-
-  If the device supports lens distortion correction, applies the coefficients on
-  the RAW image so it can be compared to YUV/JPEG outputs which are subject
-  to the same correction via ISP.
-
-  Finds circle size and location for reference values in calculations for other
-  formats.
-
-  Args:
-    cam: camera object
-    req: camera request
-    props: camera properties
-    log_path: location to save data
-
-  Returns:
-    ref_fov: dict with [fmt, % coverage, w, h, circle_w, circle_h]
-    cc_ct_gt: circle center position relative to the center of image.
-    aspect_ratio_gt: aspect ratio of the detected circle in float.
-  """
-  logging.debug('Creating references for fov_coverage from RAW')
-  out_surface = {'format': 'raw'}
-  cap_raw = cam.do_capture(req, out_surface)
-  logging.debug('Captured RAW %dx%d', cap_raw['width'], cap_raw['height'])
-  img_raw = image_processing_utils.convert_capture_to_rgb_image(
-      cap_raw, props=props)
-  # Resize back up to full scale.
-  img_raw = cv2.resize(img_raw, (0, 0), fx=2.0, fy=2.0)
-
-  if (camera_properties_utils.distortion_correction(props) and
-      camera_properties_utils.intrinsic_calibration(props)):
-    logging.debug('Applying intrinsic calibration and distortion params')
-    fd = float(cap_raw['metadata']['android.lens.focalLength'])
-    k = camera_properties_utils.get_intrinsic_calibration(props, True, fd)
-    opencv_dist = camera_properties_utils.get_distortion_matrix(props)
-    k_new = cv2.getOptimalNewCameraMatrix(
-        k, opencv_dist, (img_raw.shape[1], img_raw.shape[0]), 0)[0]
-    scale = max(k_new[0][0] / k[0][0], k_new[1][1] / k[1][1])
-    if scale > 1:
-      k_new[0][0] = k[0][0] * scale
-      k_new[1][1] = k[1][1] * scale
-      img_raw = cv2.undistort(img_raw, k, opencv_dist, None, k_new)
-    else:
-      img_raw = cv2.undistort(img_raw, k, opencv_dist)
-
-  # Get image size.
-  size_raw = img_raw.shape
-  w_raw = size_raw[1]
-  h_raw = size_raw[0]
-  img_name = '%s_%s_w%d_h%d.png' % (
-      os.path.join(log_path, _NAME), 'raw', w_raw, h_raw)
-  image_processing_utils.write_image(img_raw, img_name, True)
-
-  # Find circle.
-  img_raw *= 255  # cv2 needs images between [0,255].
-  circle_raw = opencv_processing_utils.find_circle(
-      img_raw, img_name, _CIRCLE_MIN_AREA, _CIRCLE_COLOR)
-  opencv_processing_utils.append_circle_center_to_img(circle_raw, img_raw,
-                                                      img_name)
-
-  # Determine final return values.
-  aspect_ratio_gt = circle_raw['w'] / circle_raw['h']
-  cc_ct_gt = {'hori': circle_raw['x_offset'], 'vert': circle_raw['y_offset']}
-  raw_fov_percent = _calc_circle_image_ratio(circle_raw['r'], w_raw, h_raw)
-  ref_fov = {}
-  ref_fov['fmt'] = 'RAW'
-  ref_fov['percent'] = raw_fov_percent
-  ref_fov['w'] = w_raw
-  ref_fov['h'] = h_raw
-  ref_fov['circle_w'] = circle_raw['w']
-  ref_fov['circle_h'] = circle_raw['h']
-  logging.debug('Using RAW reference: %s', str(ref_fov))
-  return ref_fov, cc_ct_gt, aspect_ratio_gt
-
-
-def _find_jpeg_fov_reference(cam, req, props, log_path):
-  """Determine the circle coverage of the image in JPEG reference image.
-
-  Similar to _find_raw_fov_reference() and used when RAW is not available.
-
-  Args:
-    cam: camera object
-    req: camera request
-    props: camera properties
-    log_path: location to save data
-
-  Returns:
-    ref_fov: dict with [fmt, % coverage, w, h, circle_w, circle_h]
-    cc_ct_gt: circle center position relative to the center of image.
-  """
-  ref_fov = {}
-  fmt = capture_request_utils.get_largest_jpeg_format(props)
-  # Capture and determine circle area in image.
-  cap = cam.do_capture(req, fmt)
-  w = cap['width']
-  h = cap['height']
-
-  img = image_processing_utils.convert_capture_to_rgb_image(cap, props)
-  img *= 255  # cv2 works with [0,255] images.
-  logging.debug('Captured JPEG %dx%d', w, h)
-  img_name = '%s_jpeg_w%d_h%d.png' % (os.path.join(log_path, _NAME), w, h)
-  circle_jpg = opencv_processing_utils.find_circle(
-      img, img_name, _CIRCLE_MIN_AREA, _CIRCLE_COLOR)
-  opencv_processing_utils.append_circle_center_to_img(circle_jpg, img,
-                                                      img_name)
-
-  # Determine final return values.
-  cc_ct_gt = {'hori': circle_jpg['x_offset'], 'vert': circle_jpg['y_offset']}
-  fov_percent = _calc_circle_image_ratio(circle_jpg['r'], w, h)
-  ref_fov = {}
-  ref_fov['fmt'] = 'JPEG'
-  ref_fov['percent'] = fov_percent
-  ref_fov['w'] = w
-  ref_fov['h'] = h
-  ref_fov['circle_w'] = circle_jpg['w']
-  ref_fov['circle_h'] = circle_jpg['h']
-  logging.debug('Using JPEG reference: %s', str(ref_fov))
-  return ref_fov, cc_ct_gt
-
-
-def _calc_circle_image_ratio(radius, img_w, img_h):
-  """Calculate the percent of area the input circle covers in input image.
-
-  Args:
-    radius: radius of circle
-    img_w: int width of image
-    img_h: int height of image
-  Returns:
-    fov_percent: float % of image covered by circle
-  """
-  return 100 * math.pi * math.pow(radius, 2) / (img_w * img_h)
-
-
-def _check_fov(circle, ref_fov, w, h, first_api_level):
-  """Check the FoV for correct size."""
-  fov_percent = _calc_circle_image_ratio(circle['r'], w, h)
-  chk_percent = _calc_expected_circle_image_ratio(ref_fov, w, h)
-  chk_enabled = _is_checked_aspect_ratio(first_api_level, w, h)
-  if chk_enabled and not np.isclose(fov_percent, chk_percent,
-                                    rtol=_FOV_PERCENT_RTOL):
-    e_msg = 'FoV %%: %.2f, Ref FoV %%: %.2f, ' % (fov_percent, chk_percent)
-    e_msg += 'TOL=%.f%%, img: %dx%d, ref: %dx%d' % (
-        _FOV_PERCENT_RTOL*100, w, h, ref_fov['w'], ref_fov['h'])
-    return e_msg
-
-
-def _check_ar(circle, ar_gt, w, h, fmt_iter, fmt_cmpr):
-  """Check the aspect ratio of the circle.
-
-  size is the larger of w or h.
-  if size >= LARGE_SIZE: use THRESH_AR_L
-  elif size == 0 (extreme case): THRESH_AR_S
-  elif 0 < image size < LARGE_SIZE: scale between THRESH_AR_S & THRESH_AR_L
-
-  Args:
-    circle: dict with circle parameters
-    ar_gt: aspect ratio ground truth to compare against
-    w: width of image
-    h: height of image
-    fmt_iter: format of primary capture
-    fmt_cmpr: format of secondary capture
-
-  Returns:
-    error string if check fails
-  """
-  thresh_ar = max(_THRESH_AR_L, _THRESH_AR_S +
-                  max(w, h) * (_THRESH_AR_L-_THRESH_AR_S) / _LARGE_SIZE)
-  ar = circle['w'] / circle['h']
-  if not np.isclose(ar, ar_gt, atol=thresh_ar):
-    e_msg = (f'{fmt_iter} with {fmt_cmpr} {w}x{h}: aspect_ratio {ar:.3f}, '
-             f'thresh {thresh_ar:.3f}')
-    return e_msg
-
-
-def _check_crop(circle, cc_gt, w, h, fmt_iter, fmt_cmpr, crop_thresh_factor):
-  """Check cropping.
-
-  if size >= LARGE_SIZE: use thresh_crop_l
-  elif size == 0 (extreme case): thresh_crop_s
-  elif 0 < size < LARGE_SIZE: scale between thresh_crop_s & thresh_crop_l
-  Also allow at least THRESH_MIN_PIXEL to prevent threshold being too tight
-  for very small circle.
-
-  Args:
-    circle: dict of circle values
-    cc_gt: circle center {'hori', 'vert'}  ground truth (ref'd to img center)
-    w: width of image
-    h: height of image
-    fmt_iter: format of primary capture
-    fmt_cmpr: format of secondary capture
-    crop_thresh_factor: scaling factor for crop thresholds
-
-  Returns:
-    error string if check fails
-  """
-  thresh_crop_l = _THRESH_CROP_L * crop_thresh_factor
-  thresh_crop_s = _THRESH_CROP_S * crop_thresh_factor
-  thresh_crop_hori = max(
-      [thresh_crop_l,
-       thresh_crop_s + w * (thresh_crop_l - thresh_crop_s) / _LARGE_SIZE,
-       _THRESH_MIN_PIXEL / circle['w']])
-  thresh_crop_vert = max(
-      [thresh_crop_l,
-       thresh_crop_s + h * (thresh_crop_l - thresh_crop_s) / _LARGE_SIZE,
-       _THRESH_MIN_PIXEL / circle['h']])
-
-  if (not np.isclose(circle['x_offset'], cc_gt['hori'],
-                     atol=thresh_crop_hori) or
-      not np.isclose(circle['y_offset'], cc_gt['vert'],
-                     atol=thresh_crop_vert)):
-    valid_x_range = (cc_gt['hori'] - thresh_crop_hori,
-                     cc_gt['hori'] + thresh_crop_hori)
-    valid_y_range = (cc_gt['vert'] - thresh_crop_vert,
-                     cc_gt['vert'] + thresh_crop_vert)
-    e_msg = (f'{fmt_iter} with {fmt_cmpr} {w}x{h} '
-             f"offset X {circle['x_offset']:.3f}, Y {circle['y_offset']:.3f}, "
-             f'valid X range: {valid_x_range[0]:.3f} ~ {valid_x_range[1]:.3f}, '
-             f'valid Y range: {valid_y_range[0]:.3f} ~ {valid_y_range[1]:.3f}')
-    return e_msg
-
-
 class AspectRatioAndCropTest(its_base_test.ItsBaseTest):
   """Test aspect ratio/field of view/cropping for each tested fmt combinations.
 
@@ -499,12 +236,11 @@
       req = capture_request_utils.auto_capture_request()
 
       # If raw is available and main camera, use it as ground truth.
-      if raw_avlb and (fls_physical == fls_logical):
-        ref_fov, cc_ct_gt, aspect_ratio_gt = _find_raw_fov_reference(
-            cam, req, props, log_path)
-      else:
-        aspect_ratio_gt = 1.0  # Ground truth circle width/height ratio.
-        ref_fov, cc_ct_gt = _find_jpeg_fov_reference(cam, req, props, log_path)
+      ref_img_name_stem = f'{os.path.join(log_path, _NAME)}'
+      raw_bool = raw_avlb and (fls_physical == fls_logical)
+      ref_fov, cc_ct_gt, aspect_ratio_gt = (
+          image_fov_utils.find_fov_reference(
+              cam, req, props, raw_bool, ref_img_name_stem))
 
       run_crop_test = full_or_better and raw_avlb
       if run_crop_test:
@@ -545,30 +281,34 @@
           img_name = '%s_%s_with_%s_w%d_h%d.png' % (
               os.path.join(log_path, _NAME), fmt_iter, fmt_cmpr, w_iter, h_iter)
           circle = opencv_processing_utils.find_circle(
-              img, img_name, _CIRCLE_MIN_AREA, _CIRCLE_COLOR)
+              img, img_name, image_fov_utils.CIRCLE_MIN_AREA,
+              image_fov_utils.CIRCLE_COLOR)
           if debug:
             opencv_processing_utils.append_circle_center_to_img(circle, img,
                                                                 img_name)
 
           # Check pass/fail for fov coverage for all fmts in AR_CHECKED
           img /= 255  # image_processing_utils uses [0, 1].
-          fov_chk_msg = _check_fov(circle, ref_fov, w_iter, h_iter,
-                                   first_api_level)
-          if fov_chk_msg:
-            failed_fov.append(fov_chk_msg)
-            image_processing_utils.write_image(img, img_name, True)
+          if _is_checked_aspect_ratio(first_api_level, w_iter, h_iter):
+            fov_chk_msg = image_fov_utils.check_fov(
+                circle, ref_fov, w_iter, h_iter)
+            if fov_chk_msg:
+              failed_fov.append(fov_chk_msg)
+              image_processing_utils.write_image(img, img_name, True)
 
           # Check pass/fail for aspect ratio.
-          ar_chk_msg = _check_ar(
-              circle, aspect_ratio_gt, w_iter, h_iter, fmt_iter, fmt_cmpr)
+          ar_chk_msg = image_fov_utils.check_ar(
+              circle, aspect_ratio_gt, w_iter, h_iter,
+              f'{fmt_iter} with {fmt_cmpr}')
           if ar_chk_msg:
             failed_ar.append(ar_chk_msg)
             image_processing_utils.write_image(img, img_name, True)
 
           # Check pass/fail for crop.
           if run_crop_test:
-            crop_chk_msg = _check_crop(circle, cc_ct_gt, w_iter, h_iter,
-                                       fmt_iter, fmt_cmpr, crop_thresh_factor)
+            crop_chk_msg = image_fov_utils.check_crop(
+                circle, cc_ct_gt, w_iter, h_iter,
+                f'{fmt_iter} with {fmt_cmpr}', crop_thresh_factor)
             if crop_chk_msg:
               failed_crop.append(crop_chk_msg)
               image_processing_utils.write_image(img, img_name, True)
diff --git a/apps/CameraITS/tests/scene4/test_multi_camera_alignment.py b/apps/CameraITS/tests/scene4/test_multi_camera_alignment.py
index e88bfbf..13355b2 100644
--- a/apps/CameraITS/tests/scene4/test_multi_camera_alignment.py
+++ b/apps/CameraITS/tests/scene4/test_multi_camera_alignment.py
@@ -126,9 +126,9 @@
     else:
       logging.debug('Skipping camera. Not appropriate for test rig.')
 
-  e_msg = 'Error: started with 2+ cameras, reduced to <2. Wrong test rig?'
-  e_msg += '\ntest_ids: %s' % str(test_ids)
-  assert len(test_ids) >= 2, e_msg
+  if len(test_ids) < 2:
+    raise AssertionError('Error: started with 2+ cameras, reduced to <2 based '
+                         f'on FoVs. Wrong test rig? test_ids: {test_ids}')
   return test_ids[0:2]
 
 
@@ -562,9 +562,10 @@
       err_mm = np.linalg.norm(np.array([x_w[i_ref], y_w[i_ref]]) -
                               np.array([x_w[i_2nd], y_w[i_2nd]])) * M_TO_MM
       logging.debug('Center location err (mm): %.2f', err_mm)
-      msg = 'Center locations %s <-> %s too different!' % (i_ref, i_2nd)
-      msg += ' val=%.2f, ATOL=%.f mm' % (err_mm, ALIGN_TOL_MM)
-      assert err_mm < ALIGN_TOL_MM, msg
+      if err_mm > ALIGN_TOL_MM:
+        raise AssertionError(
+            f'Centers {i_ref} <-> {i_2nd} too different! '
+            f'val={err_mm:.2f}, ATOL={ALIGN_TOL_MM} mm')
 
       # Check projections back into pixel space
       for i in [i_ref, i_2nd]:
@@ -572,9 +573,9 @@
                              np.array([x_p[i], y_p[i]]).reshape(1, -1))
         logging.debug('Camera %s projection error (pixels): %.1f', i, err)
         tol = ALIGN_TOL * sensor_diag[i]
-        msg = 'Camera %s project location too different!' % i
-        msg += ' diff=%.2f, ATOL=%.2f pixels' % (err, tol)
-        assert err < tol, msg
+        if err >= tol:
+          raise AssertionError(f'Camera {i} project location too different! '
+                               f'diff={err:.2f}, ATOL={tol:.2f} pixels')
 
       # Check focal length and circle size if more than 1 focal length
       if len(fl) > 1:
@@ -584,11 +585,12 @@
                       fl[i_ref], fl[i_2nd])
         logging.debug('Pixel size (um); ref: %.2f, 2nd: %.2f',
                       pixel_sizes[i_ref], pixel_sizes[i_2nd])
-        msg = 'Circle size scales improperly! RTOL=%.1f\n' % CIRCLE_RTOL
-        msg += 'Metric: radius/focal_length*sensor_diag should be equal.'
-        assert np.isclose(circle[i_ref]['r']*pixel_sizes[i_ref]/fl[i_ref],
-                          circle[i_2nd]['r']*pixel_sizes[i_2nd]/fl[i_2nd],
-                          rtol=CIRCLE_RTOL), msg
+        if not math.isclose(circle[i_ref]['r']*pixel_sizes[i_ref]/fl[i_ref],
+                            circle[i_2nd]['r']*pixel_sizes[i_2nd]/fl[i_2nd],
+                            rel_tol=CIRCLE_RTOL):
+          raise AssertionError(
+              f'Circle size scales improperly! RTOL: {CIRCLE_RTOL} '
+              'Metric: radius*pixel_size/focal_length should be equal.')
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene4/test_video_aspect_ratio_and_crop.py b/apps/CameraITS/tests/scene4/test_video_aspect_ratio_and_crop.py
new file mode 100644
index 0000000..399aa05
--- /dev/null
+++ b/apps/CameraITS/tests/scene4/test_video_aspect_ratio_and_crop.py
@@ -0,0 +1,267 @@
+# Copyright 2022 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.
+"""Validate video aspect ratio, crop and FoV vs format."""
+
+import logging
+import os.path
+from mobly import test_runner
+
+import its_base_test
+import camera_properties_utils
+import its_session_utils
+import video_processing_utils
+import capture_request_utils
+import image_processing_utils
+import opencv_processing_utils
+import image_fov_utils
+
+_ANDROID13_API_LEVEL = 32
+_NAME = os.path.splitext(os.path.basename(__file__))[0]
+_VIDEO_RECORDING_DURATION_SECONDS = 3
+_FOV_PERCENT_RTOL = 0.15  # Relative tolerance on circle FoV % to expected.
+_AR_CHECKED_PRE_API_30 = ('4:3', '16:9', '18:9')
+_AR_DIFF_ATOL = 0.01
+
+
+def _print_failed_test_results(failed_ar, failed_fov, failed_crop,
+                               quality):
+  """Print failed test results."""
+  if failed_ar:
+    logging.error('Aspect ratio test summary for %s', quality)
+    logging.error('Images failed in the aspect ratio test:')
+    logging.error('Aspect ratio value: width / height')
+    for fa in failed_ar:
+      logging.error('%s', fa)
+
+  if failed_fov:
+    logging.error('FoV test summary for %s', quality)
+    logging.error('Images failed in the FoV test:')
+    for fov in failed_fov:
+      logging.error('%s', str(fov))
+
+  if failed_crop:
+    logging.error('Crop test summary for %s', quality)
+    logging.error('Images failed in the crop test:')
+    logging.error('Circle center (H x V) relative to the image center.')
+    for fc in failed_crop:
+      logging.error('%s', fc)
+
+
+class VideoAspectRatioAndCropTest(its_base_test.ItsBaseTest):
+  """Test aspect ratio/field of view/cropping for each tested fmt.
+
+    This test checks for:
+    1. Aspect ratio: images are not stretched
+    2. Crop: center of images is not shifted
+    3. FOV: images cropped to keep maximum possible FOV with only 1 dimension
+       (horizontal or veritical) cropped.
+
+  The test video is a black circle on a white background.
+
+  When RAW capture is available, set the height vs. width ratio of the circle in
+  the full-frame RAW as ground truth. In an ideal setup such ratio should be
+  very close to 1.0, but here we just use the value derived from full resolution
+  RAW as ground truth to account for the possibility that the chart is not well
+  positioned to be precisely parallel to image sensor plane.
+  The test then compares the ground truth ratio with the same ratio measured
+  on videos captued using different formats.
+
+  If RAW capture is unavailable, a full resolution JPEG image is used to setup
+  ground truth. In this case, the ground truth aspect ratio is defined as 1.0
+  and it is the tester's responsibility to make sure the test chart is
+  properly positioned so the detected circles indeed have aspect ratio close
+  to 1.0 assuming no bugs causing image stretched.
+
+  The aspect ratio test checks the aspect ratio of the detected circle and
+  it will fail if the aspect ratio differs too much from the ground truth
+  aspect ratio mentioned above.
+
+  The FOV test examines the ratio between the detected circle area and the
+  image size. When the aspect ratio of the test image is the same as the
+  ground truth image, the ratio should be very close to the ground truth
+  value. When the aspect ratio is different, the difference is factored in
+  per the expectation of the Camera2 API specification, which mandates the
+  FOV reduction from full sensor area must only occur in one dimension:
+  horizontally or vertically, and never both. For example, let's say a sensor
+  has a 16:10 full sensor FOV. For all 16:10 output images there should be no
+  FOV reduction on them. For 16:9 output images the FOV should be vertically
+  cropped by 9/10. For 4:3 output images the FOV should be cropped
+  horizontally instead and the ratio (r) can be calculated as follows:
+      (16 * r) / 10 = 4 / 3 => r = 40 / 48 = 0.8333
+  Say the circle is covering x percent of the 16:10 sensor on the full 16:10
+  FOV, and assume the circle in the center will never be cut in any output
+  sizes (this can be achieved by picking the right size and position of the
+  test circle), the from above cropping expectation we can derive on a 16:9
+  output image the circle will cover (x / 0.9) percent of the 16:9 image; on
+  a 4:3 output image the circle will cover (x / 0.8333) percent of the 4:3
+  image.
+
+  The crop test checks that the center of any output image remains aligned
+  with center of sensor's active area, no matter what kind of cropping or
+  scaling is applied. The test verifies that by checking the relative vector
+  from the image center to the center of detected circle remains unchanged.
+  The relative part is normalized by the detected circle size to account for
+  scaling effect.
+  """
+
+  def test_video_aspect_ratio_and_crop(self):
+    logging.debug('Starting %s', _NAME)
+    failed_ar = []  # Streams failed the aspect ratio test.
+    failed_crop = []  # Streams failed the crop test.
+    failed_fov = []  # Streams that fail FoV test.
+
+    with its_session_utils.ItsSession(
+        device_id=self.dut.serial,
+        camera_id=self.camera_id,
+        hidden_physical_id=self.hidden_physical_id) as cam:
+      props = cam.get_camera_properties()
+      fls_logical = props['android.lens.info.availableFocalLengths']
+      logging.debug('logical available focal lengths: %s', str(fls_logical))
+      props = cam.override_with_hidden_physical_camera_props(props)
+      fls_physical = props['android.lens.info.availableFocalLengths']
+      logging.debug('physical available focal lengths: %s', str(fls_physical))
+      # Check SKIP conditions.
+      first_api_level = its_session_utils.get_first_api_level(self.dut.serial)
+      camera_properties_utils.skip_unless(
+          first_api_level >= _ANDROID13_API_LEVEL)
+      its_session_utils.load_scene(cam, props, self.scene,
+                                   self.tablet, chart_distance=0)
+      supported_video_qualities = cam.get_supported_video_qualities(
+          self.camera_id)
+      logging.debug('Supported video qualities: %s', supported_video_qualities)
+
+      # Determine camera capabilities.
+      full_or_better = camera_properties_utils.full_or_better(props)
+      raw_avlb = camera_properties_utils.raw16(props)
+      fls_logical = props['android.lens.info.availableFocalLengths']
+      logging.debug('logical available focal lengths: %s', str(fls_logical))
+      fls_physical = props['android.lens.info.availableFocalLengths']
+      logging.debug('physical available focal lengths: %s',
+                    str(fls_physical))
+
+      req = capture_request_utils.auto_capture_request()
+      ref_img_name_stem = f'{os.path.join(self.log_path, _NAME)}'
+
+      if raw_avlb and (fls_physical == fls_logical):
+        logging.debug('RAW')
+        ref_fov, cc_ct_gt, aspect_ratio_gt = (
+            image_fov_utils.find_fov_reference(
+                cam, req, props, 'RAW', ref_img_name_stem))
+      else:
+        logging.debug('JPEG')
+        ref_fov, cc_ct_gt, aspect_ratio_gt = (
+            image_fov_utils.find_fov_reference(
+                cam, req, props, 'JPEG', ref_img_name_stem))
+
+      run_crop_test = full_or_better and raw_avlb
+
+      for quality_profile_id_pair in supported_video_qualities:
+        quality = quality_profile_id_pair.split(':')[0]
+        profile_id = quality_profile_id_pair.split(':')[-1]
+        # Check if we support testing this quality.
+        if quality in video_processing_utils.ITS_SUPPORTED_QUALITIES:
+          logging.debug('Testing video recording for quality: %s', quality)
+          video_recording_obj = cam.do_basic_recording(
+              profile_id, quality, _VIDEO_RECORDING_DURATION_SECONDS)
+          logging.debug('video_recording_obj: %s', video_recording_obj)
+          # TODO(ruchamk): Modify video recording object to send videoFrame
+          # width and height instead of videoSize to avoid string operation
+          # here.
+          video_size = video_recording_obj['videoSize']
+          width = int(video_size.split('x')[0])
+          height = int(video_size.split('x')[-1])
+
+          # Pull the video recording file from the device.
+          self.dut.adb.pull([video_recording_obj['recordedOutputPath'],
+                             self.log_path])
+          logging.debug('Recorded video is available at: %s',
+                        self.log_path)
+          mp4_file_name = video_recording_obj['recordedOutputPath'].split('/')[-1]
+          logging.debug('mp4_file_name: %s', mp4_file_name)
+
+          key_frame_files = []
+          key_frame_files = video_processing_utils.extract_key_frames_from_video(
+              self.log_path, mp4_file_name)
+          logging.debug('key_frame_files:%s', key_frame_files)
+
+          # Get the key frame file to process.
+          last_key_frame_file = video_processing_utils.get_key_frame_to_process(
+              key_frame_files)
+          logging.debug('last_key_frame: %s', last_key_frame_file)
+          last_key_frame_path = os.path.join(self.log_path, last_key_frame_file)
+
+          # Convert lastKeyFrame to numpy array
+          np_image = image_processing_utils.convert_image_to_numpy_array(
+              last_key_frame_path)
+          logging.debug('numpy image shape: %s', np_image.shape)
+
+          # Check fov
+          circle = opencv_processing_utils.find_circle(
+              np_image, ref_img_name_stem, image_fov_utils.CIRCLE_MIN_AREA,
+              image_fov_utils.CIRCLE_COLOR)
+
+          # Check pass/fail for fov coverage for all fmts in AR_CHECKED
+          fov_chk_msg = image_fov_utils.check_fov(
+              circle, ref_fov, width, height)
+          if fov_chk_msg:
+            img_name = '%s_%s_w%d_h%d_fov.png' % (
+                os.path.join(self.log_path, _NAME), quality, width, height)
+            fov_chk_quality_msg = f'Quality: {quality} {fov_chk_msg}'
+            failed_fov.append(fov_chk_quality_msg)
+            image_processing_utils.write_image(np_image/255, img_name, True)
+
+          # Check pass/fail for aspect ratio.
+          ar_chk_msg = image_fov_utils.check_ar(
+              circle, aspect_ratio_gt, width, height,
+              f'{quality}')
+          if ar_chk_msg:
+            img_name = '%s_%s_w%d_h%d_ar.png' % (
+                os.path.join(self.log_path, _NAME), quality, width, height)
+            failed_ar.append(ar_chk_msg)
+            image_processing_utils.write_image(np_image/255, img_name, True)
+
+          # Check pass/fail for crop.
+          if run_crop_test:
+            # Normalize the circle size to 1/4 of the image size, so that
+            # circle size won't affect the crop test result
+            crop_thresh_factor = ((min(ref_fov['w'], ref_fov['h']) / 4.0) /
+                                  max(ref_fov['circle_w'], ref_fov['circle_h']))
+            crop_chk_msg = image_fov_utils.check_crop(
+                circle, cc_ct_gt, width, height,
+                f'{quality}', crop_thresh_factor)
+            if crop_chk_msg:
+              crop_img_name = '%s_%s_w%d_h%d_crop.png' % (
+                  os.path.join(self.log_path, _NAME), quality, width, height)
+              opencv_processing_utils.append_circle_center_to_img(
+                  circle, np_image*255, crop_img_name)
+              failed_crop.append(crop_chk_msg)
+              image_processing_utils.write_image(np_image/255,
+                                                 crop_img_name, True)
+          else:
+            logging.debug('Crop test skipped')
+
+      # Print any failed test results.
+      _print_failed_test_results(failed_ar, failed_fov, failed_crop, quality)
+      e_msg = ''
+      if failed_ar:
+        e_msg = 'Aspect ratio '
+      if failed_fov:
+        e_msg += 'FoV '
+      if failed_crop:
+        e_msg += 'Crop '
+      if e_msg:
+        raise AssertionError(f'{e_msg}check failed.')
+
+if __name__ == '__main__':
+  test_runner.main()
diff --git a/apps/CameraITS/tests/scene6/test_zoom.py b/apps/CameraITS/tests/scene6/test_zoom.py
index 4457046..89cdae5 100644
--- a/apps/CameraITS/tests/scene6/test_zoom.py
+++ b/apps/CameraITS/tests/scene6/test_zoom.py
@@ -39,6 +39,7 @@
 NAME = os.path.splitext(os.path.basename(__file__))[0]
 NUM_STEPS = 10
 OFFSET_RTOL = 0.15
+OFFSET_RTOL_MIN_FD = 0.30
 RADIUS_RTOL = 0.10
 RADIUS_RTOL_MIN_FD = 0.15
 ZOOM_MAX_THRESH = 10.0
@@ -88,9 +89,9 @@
     # determine if minimum focus distance is less than rig depth
     if (math.isclose(min_fd, 0.0, rel_tol=1E-6) or  # fixed focus
         1.0/min_fd < chart_distance_m*MIN_FOCUS_DIST_TOL):
-      test_tols[focal_l] = RADIUS_RTOL
+      test_tols[focal_l] = (RADIUS_RTOL, OFFSET_RTOL)
     else:
-      test_tols[focal_l] = RADIUS_RTOL_MIN_FD
+      test_tols[focal_l] = (RADIUS_RTOL_MIN_FD, OFFSET_RTOL_MIN_FD)
       logging.debug('loosening RTOL for cam[%s]: '
                     'min focus distance too large.', i)
   # find intersection of formats for max common format
@@ -233,7 +234,7 @@
             cam, props, self.chart_distance, debug)
       else:
         fl = props['android.lens.info.availableFocalLengths'][0]
-        test_tols = {fl: RADIUS_RTOL}
+        test_tols = {fl: (RADIUS_RTOL, OFFSET_RTOL)}
         yuv_size = capture_request_utils.get_largest_yuv_format(props)
         size = [yuv_size['width'], yuv_size['height']]
       logging.debug('capture size: %s', str(size))
@@ -255,22 +256,30 @@
 
         # determine radius tolerance of capture
         cap_fl = cap['metadata']['android.lens.focalLength']
-        radius_tol = test_tols[cap_fl]
+        radius_tol, offset_tol = test_tols[cap_fl]
 
         # convert to [0, 255] images with unsigned integer
         img *= 255
         img = img.astype(np.uint8)
 
         # Find the center circle in img
-        circle = find_center_circle(
-            img, img_name, CIRCLE_COLOR,
-            min_area=MIN_AREA_RATIO * size[0] * size[1] * z * z,
-            debug=debug)
-        if circle_cropped(circle, size):
-          logging.debug('zoom %.2f is too large! Skip further captures', z)
-          break
+        try:
+          circle = find_center_circle(
+              img, img_name, CIRCLE_COLOR,
+              min_area=MIN_AREA_RATIO * size[0] * size[1] * z * z,
+              debug=debug)
+          if circle_cropped(circle, size):
+            logging.debug('zoom %.2f is too large! Skip further captures', z)
+            break
+        except AssertionError:
+          if z/z_list[0] >= ZOOM_MAX_THRESH:
+            break
+          else:
+            raise AssertionError(
+                f'No circle was detected for zoom ratio <= {ZOOM_MAX_THRESH}. '
+                'Please take pictures according to instructions carefully!')
         test_data[i] = {'z': z, 'circle': circle, 'r_tol': radius_tol,
-                        'fl': cap_fl}
+                        'o_tol': offset_tol, 'fl': cap_fl}
 
     # assert some range is tested before circles get too big
     zoom_max_thresh = ZOOM_MAX_THRESH
@@ -307,16 +316,16 @@
       # check relative offset against init vals w/ no focal length change
       if i == 0 or test_data[i-1]['fl'] != data['fl']:  # set init values
         z_init = float(data['z'])
-        offset_init = [data['circle'][0] - size[0]//2,
-                       data['circle'][1] - size[1]//2]
+        offset_init = [(data['circle'][0] - size[0] // 2),
+                       (data['circle'][1] - size[1] // 2)]
       else:  # check
         z_ratio = data['z'] / z_init
         offset_rel = (distance(offset_abs[0], offset_abs[1]) / z_ratio /
                       distance(offset_init[0], offset_init[1]))
         logging.debug('offset_rel: %.3f', offset_rel)
-        if not math.isclose(offset_rel, 1.0, rel_tol=OFFSET_RTOL):
-          raise AssertionError(f"zoom: {data['z']:.2f}, offset(rel): "
-                               f'{offset_rel:.4f}, RTOL: {OFFSET_RTOL}')
+        if not math.isclose(offset_rel, 1.0, rel_tol=data['o_tol']):
+          raise AssertionError(f"zoom: {data['z']:.2f}, offset(rel to 1): "
+                               f"{offset_rel:.4f}, RTOL: {data['o_tol']}")
 
 if __name__ == '__main__':
   test_runner.main()
diff --git a/apps/CameraITS/tests/scene_change/scene_change.png b/apps/CameraITS/tests/scene_change/scene_change.png
deleted file mode 100644
index b9554b3..0000000
--- a/apps/CameraITS/tests/scene_change/scene_change.png
+++ /dev/null
Binary files differ
diff --git a/apps/CameraITS/tests/scene_change/scene_change_0.5x_scaled.png b/apps/CameraITS/tests/scene_change/scene_change_0.5x_scaled.png
deleted file mode 100644
index 92e3444..0000000
--- a/apps/CameraITS/tests/scene_change/scene_change_0.5x_scaled.png
+++ /dev/null
Binary files differ
diff --git a/apps/CameraITS/tests/scene_change/scene_change_0.67x_scaled.png b/apps/CameraITS/tests/scene_change/scene_change_0.67x_scaled.png
deleted file mode 100644
index d8cca5c..0000000
--- a/apps/CameraITS/tests/scene_change/scene_change_0.67x_scaled.png
+++ /dev/null
Binary files differ
diff --git a/apps/CameraITS/tests/scene_change/test_scene_change.py b/apps/CameraITS/tests/scene_change/test_scene_change.py
deleted file mode 100644
index 9a8b262..0000000
--- a/apps/CameraITS/tests/scene_change/test_scene_change.py
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 2020 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.
-"""Verify that the android.control.afSceneChange asserted on scene change."""
-
-
-import logging
-import multiprocessing
-import os.path
-import time
-
-from mobly import test_runner
-
-import its_base_test
-import camera_properties_utils
-import capture_request_utils
-import image_processing_utils
-import its_session_utils
-import scene_change_utils
-
-_BRIGHT_CHANGE_TOL = 0.2
-_CONTINUOUS_PICTURE_MODE = 4
-_CONVERGED_3A = (2, 2, 2)  # (AE, AF, AWB)
-_DELAY_CAPTURE = 1.5  # Delay in first capture to sync events (sec).
-_DELAY_DISPLAY = 3.0  # Time when display turns OFF (sec).
-_FPS = 30  # Frames Per Second
-_M_TO_CM = 100
-_NAME = os.path.splitext(os.path.basename(__file__))[0]
-_NSEC_TO_MSEC = 1E-6
-_NUM_TRIES = 6
-_NUM_FRAMES = 50
-_PATCH_H = 0.1  # Center 10%.
-_PATCH_W = 0.1
-_PATCH_X = 0.5 - _PATCH_W/2
-_PATCH_Y = 0.5 - _PATCH_H/2
-_RGB_G_CH = 1
-_SCENE_CHANGE_FLAG_TRUE = 1
-_VALID_SCENE_CHANGE_VALS = (0, 1)
-_VGA_W, _VGA_H = 640, 480
-
-
-def find_3a_converged_frame(cap_data):
-  converged_frame = -1
-  for i, cap in enumerate(cap_data):
-    if cap['3a_state'] == _CONVERGED_3A:
-      converged_frame = i
-      break
-  logging.debug('Frame index where 3A converges: %d', converged_frame)
-  return converged_frame
-
-
-def determine_if_scene_changed(cap_data, converged_frame):
-  """Determine if the scene has changed during captures.
-
-  Args:
-    cap_data: Camera capture object.
-    converged_frame: Integer indicating when 3A converged.
-
-  Returns:
-    A 2-tuple of booleans where the first is for AF scene change flag asserted
-    and the second is for whether brightness in images changed.
-  """
-  scene_change_flag = False
-  bright_change_flag = False
-  start_frame_brightness = cap_data[0]['avg']
-  for i in range(converged_frame, len(cap_data)):
-    if cap_data[i]['avg'] <= (
-        start_frame_brightness * (1.0 - _BRIGHT_CHANGE_TOL)):
-      bright_change_flag = True
-    if cap_data[i]['flag'] == _SCENE_CHANGE_FLAG_TRUE:
-      scene_change_flag = True
-  return scene_change_flag, bright_change_flag
-
-
-def toggle_screen(tablet, delay=1):
-  """Sets the chart host screen display level .
-
-  Args:
-    tablet: Object for screen tablet.
-    delay: Float value for time delay. Default is 1 second.
-  """
-  t0 = time.time()
-  if delay >= 0:
-    time.sleep(delay)
-  else:
-    raise ValueError(f'Screen toggle time shifted to {delay} w/o scene change. '
-                     'Tablet does not appear to be toggling. Check setup.')
-  tablet.adb.shell('input keyevent KEYCODE_POWER')
-  t = time.time() - t0
-  logging.debug('Toggling display at %.3f.', t)
-
-
-def capture_frames(cam, delay, burst, log_path):
-  """Capture NUM_FRAMES frames and log metadata.
-
-  3A state information:
-    AE_STATES: {0: INACTIVE, 1: SEARCHING, 2: CONVERGED, 3: LOCKED,
-                4: FLASH_REQ, 5: PRECAPTURE}
-    AF_STATES: {0: INACTIVE, 1: PASSIVE_SCAN, 2: PASSIVE_FOCUSED,
-                3: ACTIVE_SCAN, 4: FOCUS_LOCKED, 5: NOT_FOCUSED_LOCKED,
-                6: PASSIVE_UNFOCUSED}
-    AWB_STATES: {0: INACTIVE, 1: SEARCHING, 2: CONVERGED, 3: LOCKED}
-
-  Args:
-    cam: Camera object.
-    delay: Float value for time delay in seconds.
-    burst: Integer number of burst index.
-    log_path: String location to save images.
-  Returns:
-    cap_data_list. List of dicts for each capture.
-  """
-  cap_data_list = []
-  req = capture_request_utils.auto_capture_request()
-  req['android.control.afMode'] = _CONTINUOUS_PICTURE_MODE
-  fmt = {'format': 'yuv', 'width': _VGA_W, 'height': _VGA_H}
-  t0 = time.time()
-  time.sleep(delay)
-  logging.debug('cap event start: %.6f', time.time() - t0)
-  caps = cam.do_capture([req]*_NUM_FRAMES, fmt)
-  logging.debug('cap event stop: %.6f', time.time() - t0)
-
-  # Extract frame metadata.
-  for i, cap in enumerate(caps):
-    cap_data = {}
-    exp = cap['metadata']['android.sensor.exposureTime'] * _NSEC_TO_MSEC
-    iso = cap['metadata']['android.sensor.sensitivity']
-    focal_length = cap['metadata']['android.lens.focalLength']
-    ae_state = cap['metadata']['android.control.aeState']
-    af_state = cap['metadata']['android.control.afState']
-    awb_state = cap['metadata']['android.control.awbState']
-    if focal_length:
-      fl_str = str(round(_M_TO_CM/focal_length, 2)) + 'cm'
-    else:
-      fl_str = 'infinity'
-    flag = cap['metadata']['android.control.afSceneChange']
-    if flag not in _VALID_SCENE_CHANGE_VALS:
-      raise AssertionError(f'afSceneChange not a valid value: {flag}.')
-    img = image_processing_utils.convert_capture_to_rgb_image(cap)
-    image_processing_utils.write_image(
-        img, '%s_%d_%d.jpg' % (os.path.join(log_path, _NAME), burst, i))
-    patch = image_processing_utils.get_image_patch(
-        img, _PATCH_X, _PATCH_Y, _PATCH_W, _PATCH_H)
-    green_avg = image_processing_utils.compute_image_means(patch)[_RGB_G_CH]
-    logging.debug(
-        '%d, iso: %d, exp: %.2fms, fd: %s, avg: %.3f, 3A: [%d,%d,%d], flag: %d',
-        i, iso, exp, fl_str, green_avg, ae_state, af_state, awb_state, flag)
-    cap_data['3a_state'] = (ae_state, af_state, awb_state)
-    cap_data['avg'] = green_avg
-    cap_data['flag'] = flag
-    cap_data_list.append(cap_data)
-  return cap_data_list
-
-
-class SceneChangeTest(its_base_test.ItsBaseTest):
-  """Tests that AF scene change detected metadata changes for scene change.
-
-  Confirm android.control.afSceneChangeDetected is asserted when scene changes.
-
-  Does continuous capture with face scene during scene change. With no scene
-  change, behavior should be similar to scene2_b/test_continuous_picture.
-  Scene change is modeled with scene tablet powered down during continuous
-  capture. If tablet does not exist, scene change can be modeled with hand wave
-  in front of camera.
-
-  Depending on scene brightness changes and scene change flag assertions during
-  test, adjust tablet timing to move scene change to appropriate timing for
-  test.
-  """
-
-  def test_scene_change(self):
-    logging.debug('Starting %s', _NAME)
-    with its_session_utils.ItsSession(
-        device_id=self.dut.serial,
-        camera_id=self.camera_id,
-        hidden_physical_id=self.hidden_physical_id) as cam:
-      props = cam.get_camera_properties()
-      props = cam.override_with_hidden_physical_camera_props(props)
-      log_path = self.log_path
-      tablet = self.tablet
-
-      # Check SKIP conditions.
-      camera_properties_utils.skip_unless(
-          camera_properties_utils.continuous_picture(props) and
-          camera_properties_utils.af_scene_change(props))
-
-      # Load chart for scene.
-      its_session_utils.load_scene(
-          cam, props, self.scene, tablet, self.chart_distance)
-
-      # Do captures with scene change.
-      tablet_level = int(self.tablet_screen_brightness)
-      logging.debug('Tablet brightness: %d', tablet_level)
-      scene_change_delay = _DELAY_DISPLAY
-      cam.do_3a()  # Do 3A up front to settle camera.
-      for burst in range(_NUM_TRIES):
-        logging.debug('burst number: %d', burst)
-        # Create scene change by turning off chart display & capture frames
-        if tablet:
-          multiprocessing.Process(name='p1', target=toggle_screen,
-                                  args=(tablet, scene_change_delay,)).start()
-        else:
-          print('Wave hand in front of camera to create scene change.')
-        cap_data = capture_frames(cam, _DELAY_CAPTURE, burst, log_path)
-
-        # Find frame where 3A converges and final brightness.
-        converged_frame = find_3a_converged_frame(cap_data)
-        converged_flag = True if converged_frame != -1 else False
-        bright_final = cap_data[_NUM_FRAMES - 1]['avg']
-
-        # Determine if scene changed.
-        scene_change_flag, bright_change_flag = determine_if_scene_changed(
-            cap_data, converged_frame)
-
-        # Adjust timing based on captured frames and scene change flags.
-        timing_adjustment = scene_change_utils.calc_timing_adjustment(
-            converged_flag, scene_change_flag, bright_change_flag, bright_final)
-        if timing_adjustment == scene_change_utils.SCENE_CHANGE_PASS_CODE:
-          break
-        elif timing_adjustment == scene_change_utils.SCENE_CHANGE_FAIL_CODE:
-          raise AssertionError('Test fails. Check logging.error.')
-        else:
-          if burst == _NUM_TRIES-1:  # FAIL out after NUM_TRIES.
-            raise AssertionError(f'No scene change in {_NUM_TRIES}x tries.')
-          else:
-            scene_change_delay += timing_adjustment / _FPS
-
-        if tablet:
-          logging.debug('Turning screen back ON.')
-          toggle_screen(tablet)
-
-
-if __name__ == '__main__':
-  test_runner.main()
diff --git a/apps/CameraITS/tests/sensor_fusion/test_multi_camera_frame_sync.py b/apps/CameraITS/tests/sensor_fusion/test_multi_camera_frame_sync.py
index 3afd554..93e4f11 100644
--- a/apps/CameraITS/tests/sensor_fusion/test_multi_camera_frame_sync.py
+++ b/apps/CameraITS/tests/sensor_fusion/test_multi_camera_frame_sync.py
@@ -37,11 +37,14 @@
 _ANGULAR_DIFF_THRESH_API30 = 10  # degrees
 _ANGULAR_DIFF_THRESH_CALIBRATED = 1.8  # degrees (180 deg / 1000 ms * 10 ms)
 _ANGULAR_MOVEMENT_THRESHOLD = 35  # degrees
+_ARDUINO_ANGLES = (0, 90)
+_ARDUINO_MOVE_TIME = 2  # seconds
+_ARDUINO_SERVO_SPEED = 20
 _FRAMES_WITH_SQUARES_MIN = 20  # min number of frames with angles extracted
 _NAME = os.path.basename(__file__).split('.')[0]
 _NUM_CAPTURES = 100
 _NUM_ROTATIONS = 10
-_ROT_INIT_WAIT_TIME = 2  # seconds
+_ROT_INIT_WAIT_TIME = 4  # seconds
 _CHART_DISTANCE_SF = 25  # cm
 _CM_TO_M = 1/100.0
 
@@ -175,7 +178,8 @@
     # Start camera rotation & sleep shortly to let rotations start
     p = multiprocessing.Process(
         target=sensor_fusion_utils.rotation_rig,
-        args=(rot_rig['cntl'], rot_rig['ch'], _NUM_ROTATIONS,))
+        args=(rot_rig['cntl'], rot_rig['ch'], _NUM_ROTATIONS,
+              _ARDUINO_ANGLES, _ARDUINO_SERVO_SPEED, _ARDUINO_MOVE_TIME,))
     p.start()
     time.sleep(_ROT_INIT_WAIT_TIME)
 
diff --git a/apps/CameraITS/tests/sensor_fusion/test_sensor_fusion.py b/apps/CameraITS/tests/sensor_fusion/test_sensor_fusion.py
index 4d5a36f..b9427c7 100644
--- a/apps/CameraITS/tests/sensor_fusion/test_sensor_fusion.py
+++ b/apps/CameraITS/tests/sensor_fusion/test_sensor_fusion.py
@@ -28,7 +28,6 @@
 import numpy as np
 import scipy.spatial
 
-import cv2
 import its_base_test
 import camera_properties_utils
 import capture_request_utils
@@ -37,31 +36,11 @@
 import sensor_fusion_utils
 
 _CAM_FRAME_RANGE_MAX = 9.0  # Seconds: max allowed camera frame range.
-_FEATURE_MARGIN = 0.20  # Only take feature points from center 20% so that
-                        # rotation measured has less rolling shutter effect.
-_FEATURE_PTS_MIN = 30  # Min number of feature pts to perform rotation analysis.
-# cv2.goodFeatures to track.
-# 'POSTMASK' is the measurement method in all previous versions of Android.
-# 'POSTMASK' finds best features on entire frame and then masks the features
-# to the vertical center FEATURE_MARGIN for the measurement.
-# 'PREMASK' is a new measurement that is used when FEATURE_PTS_MIN is not
-# found in frame. This finds the best 2*FEATURE_PTS_MIN in the FEATURE_MARGIN
-# part of the frame.
-_CV2_FEATURE_PARAMS_POSTMASK = dict(maxCorners=240,
-                                    qualityLevel=0.3,
-                                    minDistance=7,
-                                    blockSize=7)
-_CV2_FEATURE_PARAMS_PREMASK = dict(maxCorners=2*_FEATURE_PTS_MIN,
-                                   qualityLevel=0.3,
-                                   minDistance=7,
-                                   blockSize=7)
 _GYRO_SAMP_RATE_MIN = 100.0  # Samples/second: min gyro sample rate.
-_CV2_LK_PARAMS = dict(winSize=(15, 15),
-                      maxLevel=2,
-                      criteria=(cv2.TERM_CRITERIA_EPS | cv2.TERM_CRITERIA_COUNT,
-                                10, 0.03))  # cv2.calcOpticalFlowPyrLK params.
-
 _NAME = os.path.splitext(os.path.basename(__file__))[0]
+_ARDUINO_ANGLES = (0, 90)
+_ARDUINO_MOVE_TIME = 2
+_ARDUINO_SERVO_SPEED = 20
 _NUM_ROTATIONS = 10
 _START_FRAME = 1
 _FRAME_DELTA_TOL = 1.5  # 50% margin over nominal FPS of captures
@@ -76,9 +55,6 @@
 # PASS/FAIL thresholds.
 _CORR_DIST_THRESH_MAX = 0.005
 _OFFSET_MS_THRESH_MAX = 1  # mseconds
-_ROTATION_PER_FRAME_MIN = 0.001  # rads/s
-
-# PARAMs from S refactor.
 
 # Set maximum exposure time to reduce motion blur
 # blur = velocity * exp_time * N_pixels / FOV
@@ -88,7 +64,6 @@
 _GYRO_POST_WAIT_TIME = 0.2  # Seconds to wait to capture some extra gyro data.
 _IMG_SIZE_MAX = 640 * 480  # Maximum image size.
 _NUM_FRAMES_MAX = 300  # fps*test_length should be < this for smooth captures.
-_NUM_GYRO_PTS_TO_AVG = 20  # Number of gyroscope events to average.
 
 
 def _collect_data(cam, fps, w, h, test_length, rot_rig, chart_dist, log_path):
@@ -120,7 +95,8 @@
   # Start camera rotation.
   p = multiprocessing.Process(
       target=sensor_fusion_utils.rotation_rig,
-      args=(rot_rig['cntl'], rot_rig['ch'], _NUM_ROTATIONS,))
+      args=(rot_rig['cntl'], rot_rig['ch'], _NUM_ROTATIONS,
+            _ARDUINO_ANGLES, _ARDUINO_SERVO_SPEED, _ARDUINO_MOVE_TIME,))
   p.start()
 
   cam.start_sensor_events()
@@ -190,51 +166,6 @@
   return events, frames
 
 
-def _plot_gyro_events(gyro_events, log_path):
-  """Plot x, y, and z on the gyro events.
-
-  Samples are grouped into NUM_GYRO_PTS_TO_AVG groups and averaged to minimize
-  random spikes in data.
-
-  Args:
-    gyro_events: List of gyroscope events.
-    log_path: Text to location to save data.
-  """
-
-  nevents = (len(gyro_events) // _NUM_GYRO_PTS_TO_AVG) * _NUM_GYRO_PTS_TO_AVG
-  gyro_events = gyro_events[:nevents]
-  times = np.array([(e['time'] - gyro_events[0]['time']) * _NSEC_TO_SEC
-                    for e in gyro_events])
-  x = np.array([e['x'] for e in gyro_events])
-  y = np.array([e['y'] for e in gyro_events])
-  z = np.array([e['z'] for e in gyro_events])
-
-  # Group samples into size-N groups & average each together to minimize random
-  # spikes in data.
-  times = times[_NUM_GYRO_PTS_TO_AVG//2::_NUM_GYRO_PTS_TO_AVG]
-  x = x.reshape(nevents//_NUM_GYRO_PTS_TO_AVG, _NUM_GYRO_PTS_TO_AVG).mean(1)
-  y = y.reshape(nevents//_NUM_GYRO_PTS_TO_AVG, _NUM_GYRO_PTS_TO_AVG).mean(1)
-  z = z.reshape(nevents//_NUM_GYRO_PTS_TO_AVG, _NUM_GYRO_PTS_TO_AVG).mean(1)
-
-  pylab.figure(_NAME)
-  # x & y on same axes
-  pylab.subplot(2, 1, 1)
-  pylab.title(_NAME + ' (mean of %d pts)' % _NUM_GYRO_PTS_TO_AVG)
-  pylab.plot(times, x, 'r', label='x')
-  pylab.plot(times, y, 'g', label='y')
-  pylab.ylabel('gyro x & y movement (rads/s)')
-  pylab.legend()
-
-  # z on separate axes
-  pylab.subplot(2, 1, 2)
-  pylab.plot(times, z, 'b', label='z')
-  pylab.xlabel('time (seconds)')
-  pylab.ylabel('gyro z movement (rads/s)')
-  pylab.legend()
-  matplotlib.pyplot.savefig(
-      '%s_gyro_events.png' % (os.path.join(log_path, _NAME)))
-
-
 def _get_cam_times(cam_events, fps):
   """Get the camera frame times.
 
@@ -268,127 +199,6 @@
   return frame_times
 
 
-def _procrustes_rotation(x, y):
-  """Performs a Procrustes analysis to conform points in x to y.
-
-  Procrustes analysis determines a linear transformation (translation,
-  reflection, orthogonal rotation and scaling) of the points in y to best
-  conform them to the points in matrix x, using the sum of squared errors
-  as the metric for fit criterion.
-
-  Args:
-    x: Target coordinate matrix
-    y: Input coordinate matrix
-
-  Returns:
-    The rotation component of the transformation that maps x to y.
-  """
-  x0 = (x-x.mean(0)) / np.sqrt(((x-x.mean(0))**2.0).sum())
-  y0 = (y-y.mean(0)) / np.sqrt(((y-y.mean(0))**2.0).sum())
-  u, _, vt = np.linalg.svd(np.dot(x0.T, y0), full_matrices=False)
-  return np.dot(vt.T, u.T)
-
-
-def _get_cam_rotations(frames, facing, h, log_path):
-  """Get the rotations of the camera between each pair of frames.
-
-  Takes N frames and returns N-1 angular displacements corresponding to the
-  rotations between adjacent pairs of frames, in radians.
-  Only takes feature points from center so that rotation measured has less
-  rolling shutter effect.
-  Requires FEATURE_PTS_MIN to have enough data points for accurate measurements.
-  Uses FEATURE_PARAMS for cv2 to identify features in checkerboard images.
-  Ensures camera rotates enough.
-
-  Args:
-    frames: List of N images (as RGB numpy arrays).
-    facing: Direction camera is facing.
-    h: Pixel height of each frame.
-    log_path: Location for data.
-
-  Returns:
-    numpy array of N-1 camera rotation measurements (rad).
-  """
-  gframes = []
-  file_name_stem = os.path.join(log_path, _NAME)
-  for frame in frames:
-    frame = (frame * 255.0).astype(np.uint8)  # cv2 uses [0, 255]
-    gframes.append(cv2.cvtColor(frame, cv2.COLOR_RGB2GRAY))
-  num_frames = len(gframes)
-  logging.debug('num_frames: %d', num_frames)
-
-  # create mask
-  ymin = int(h * (1 - _FEATURE_MARGIN) / 2)
-  ymax = int(h * (1 + _FEATURE_MARGIN) / 2)
-  pre_mask = np.zeros_like(gframes[0])
-  pre_mask[ymin:ymax, :] = 255
-
-  for masking in ['post', 'pre']:  # Do post-masking (original) method 1st
-    logging.debug('Using %s masking method', masking)
-    rots = []
-    for i in range(1, num_frames):
-      j = i - 1
-      gframe0 = gframes[j]
-      gframe1 = gframes[i]
-      if masking == 'post':
-        p0 = cv2.goodFeaturesToTrack(
-            gframe0, mask=None, **_CV2_FEATURE_PARAMS_POSTMASK)
-        post_mask = (p0[:, 0, 1] >= ymin) & (p0[:, 0, 1] <= ymax)
-        p0_filtered = p0[post_mask]
-      else:
-        p0_filtered = cv2.goodFeaturesToTrack(
-            gframe0, mask=pre_mask, **_CV2_FEATURE_PARAMS_PREMASK)
-      num_features = len(p0_filtered)
-      if num_features < _FEATURE_PTS_MIN:
-        for pt in p0_filtered:
-          x, y = pt[0][0], pt[0][1]
-          cv2.circle(frames[j], (x, y), 3, (100, 255, 255), -1)
-        image_processing_utils.write_image(
-            frames[j], f'{file_name_stem}_features{j+_START_FRAME:03d}.png')
-        msg = (f'Not enough features in frame {j+_START_FRAME}. Need at least '
-               f'{_FEATURE_PTS_MIN} features, got {num_features}.')
-        if masking == 'pre':
-          raise AssertionError(msg)
-        else:
-          logging.debug(msg)
-          break
-      else:
-        logging.debug('Number of features in frame %s is %d',
-                      str(j+_START_FRAME).zfill(3), num_features)
-      p1, st, _ = cv2.calcOpticalFlowPyrLK(gframe0, gframe1, p0_filtered, None,
-                                           **_CV2_LK_PARAMS)
-      tform = _procrustes_rotation(p0_filtered[st == 1], p1[st == 1])
-      if facing == camera_properties_utils.LENS_FACING_BACK:
-        rot = -math.atan2(tform[0, 1], tform[0, 0])
-      elif facing == camera_properties_utils.LENS_FACING_FRONT:
-        rot = math.atan2(tform[0, 1], tform[0, 0])
-      else:
-        raise AssertionError(f'Unknown lens facing: {facing}.')
-      rots.append(rot)
-      if i == 1:
-        # Save debug visualization of features that are being
-        # tracked in the first frame.
-        frame = frames[j]
-        for x, y in p0_filtered[st == 1]:
-          cv2.circle(frame, (x, y), 3, (100, 255, 255), -1)
-        image_processing_utils.write_image(
-            frame, f'{file_name_stem}_features{j+_START_FRAME:03d}.png')
-    if i == num_frames-1:
-      logging.debug('Correct num of frames found: %d', i)
-      break  # exit if enough features in all frames
-  if i != num_frames-1:
-    raise AssertionError('Neither method found enough features in all frames')
-
-  rots = np.array(rots)
-  rot_per_frame_max = max(abs(rots))
-  logging.debug('Max rotation: %.4f radians', rot_per_frame_max)
-  if rot_per_frame_max < _ROTATION_PER_FRAME_MIN:
-    raise AssertionError(f'Device not moved enough: {rot_per_frame_max:.3f} '
-                         f'movement. THRESH: {_ROTATION_PER_FRAME_MIN}.')
-
-  return rots
-
-
 def _plot_best_shift(best, coeff, x, y, log_path):
   """Saves a plot the best offset, fit data and x,y data.
 
@@ -539,7 +349,7 @@
                                        rot_rig, chart_distance, log_path)
     logging.debug('Start frame: %d', _START_FRAME)
 
-    _plot_gyro_events(events['gyro'], log_path)
+    sensor_fusion_utils.plot_gyro_events(events['gyro'], _NAME, log_path)
 
     # Validity check on gyro/camera timestamps
     cam_times = _get_cam_times(
@@ -548,8 +358,9 @@
     self._assert_gyro_encompasses_camera(cam_times, gyro_times)
 
     # Compute cam rotation displacement(rads) between pairs of adjacent frames.
-    cam_rots = _get_cam_rotations(
-        frames[_START_FRAME:len(frames)], events['facing'], img_h, log_path)
+    cam_rots = sensor_fusion_utils.get_cam_rotations(
+        frames[_START_FRAME:len(frames)], events['facing'], img_h,
+        os.path.join(log_path, _NAME), _START_FRAME)
     logging.debug('cam_rots: %s', str(cam_rots))
     gyro_rots = sensor_fusion_utils.get_gyro_rotations(
         events['gyro'], cam_times)
diff --git a/apps/CameraITS/tools/dng_noise_model.py b/apps/CameraITS/tools/dng_noise_model.py
index 080c4e1..5392d1c 100644
--- a/apps/CameraITS/tools/dng_noise_model.py
+++ b/apps/CameraITS/tools/dng_noise_model.py
@@ -29,6 +29,10 @@
 import its_session_utils
 
 
+_ZOOM_RATIO = 1.0 # Zoom target to be used while running the model
+_REMOVE_OUTLIERS = False # When True, filters the variance to remove outliers
+_OUTLIE_MEDIAN_ABS_DEVS = 10 # Defines the number of Median Absolute Deviations
+                             # that consitutes acceptable data
 _BAYER_LIST = ('R', 'GR', 'GB', 'B')
 _BRACKET_MAX = 8  # Exposure bracketing range in stops
 _BRACKET_FACTOR = math.pow(2, _BRACKET_MAX)
@@ -143,6 +147,20 @@
   text_file.write('%s' % code)
   text_file.close()
 
+def outlier_removed_indices(data, deviations=3):
+  """Removes outliers using median absolute deviation and returns indices kept.
+
+  Args:
+      data:             list to remove outliers from
+      deviations:       number of deviations from median to keep
+  Returns:
+      keep_indices:     The indices of data which should be kept
+  """
+  std_dev = scipy.stats.median_abs_deviation(data, axis=None, scale=1)
+  med = np.median(data)
+  keep_indices = np.where(
+    np.logical_and(data>med-deviations*std_dev, data<med+deviations*std_dev))
+  return keep_indices
 
 class DngNoiseModel(its_base_test.ItsBaseTest):
   """Create DNG noise model.
@@ -214,6 +232,7 @@
           logging.info('exp %.3fms', round(exposure*1.0E-6, 3))
           req = capture_request_utils.manual_capture_request(iso_int, exposure,
                                                              f_dist)
+          req['android.control.zoomRatio'] = _ZOOM_RATIO
           fmt_raw = {'format': 'rawStats',
                      'gridWidth': _TILE_SIZE,
                      'gridHeight': _TILE_SIZE}
@@ -239,8 +258,21 @@
             logging.info('R planes means image size: %s', str(means[0].shape))
             logging.info('means min: %.3f, median: %.3f, max: %.3f',
                          np.min(means), np.median(means), np.max(means))
-            logging.info('vars_ min: %.4f, median: %.4f, max: %.4f',
-                         np.min(vars_), np.median(vars_), np.max(vars_))
+          logging.info('vars_ min: %.4f, median: %.4f, max: %.4f',
+                        np.min(vars_), np.median(vars_), np.max(vars_))
+
+          # If remove outliers is True, we will filter the variance data
+          if _REMOVE_OUTLIERS:
+            means_filtered = []
+            vars_filtered = []
+            for pidx in range(len(means)):
+              keep_indices = outlier_removed_indices(vars_[pidx],
+                                                    _OUTLIE_MEDIAN_ABS_DEVS)
+              means_filtered.append(means[pidx][keep_indices])
+              vars_filtered.append(vars_[pidx][keep_indices])
+
+            means = means_filtered
+            vars_ = vars_filtered
 
           s_read = cap['metadata']['android.sensor.sensitivity']
           if not 1.0 >= s_read/float(iso_int) >= _RTOL_EXP_GAIN:
diff --git a/apps/CameraITS/tools/run_all_tests.py b/apps/CameraITS/tools/run_all_tests.py
index 25bcece..d30c010 100644
--- a/apps/CameraITS/tools/run_all_tests.py
+++ b/apps/CameraITS/tools/run_all_tests.py
@@ -16,6 +16,7 @@
 import logging
 import os
 import os.path
+import re
 import subprocess
 import sys
 import tempfile
@@ -41,6 +42,7 @@
 RESULT_FAIL = 'FAIL'
 RESULT_NOT_EXECUTED = 'NOT_EXECUTED'
 RESULT_KEY = 'result'
+METRICS_KEY = 'mpc_metrics'
 SUMMARY_KEY = 'summary'
 RESULT_VALUES = {RESULT_PASS, RESULT_FAIL, RESULT_NOT_EXECUTED}
 ITS_TEST_ACTIVITY = 'com.android.cts.verifier/.camera.its.ItsTestActivity'
@@ -61,13 +63,13 @@
 _ALL_SCENES = [
     'scene0', 'scene1_1', 'scene1_2', 'scene2_a', 'scene2_b', 'scene2_c',
     'scene2_d', 'scene2_e', 'scene3', 'scene4', 'scene5', 'scene6',
-    'sensor_fusion', 'scene_change'
+    'sensor_fusion'
 ]
 
 # Scenes that can be automated through tablet display
 _AUTO_SCENES = [
     'scene0', 'scene1_1', 'scene1_2', 'scene2_a', 'scene2_b', 'scene2_c',
-    'scene2_d', 'scene2_e', 'scene3', 'scene4', 'scene6', 'scene_change'
+    'scene2_d', 'scene2_e', 'scene3', 'scene4', 'scene6'
 ]
 
 # Scenes that are logically grouped and can be called as group
@@ -101,7 +103,6 @@
                      'See tests/sensor_fusion/SensorFusion.pdf for detailed '
                      'instructions.\nNote that this test will be skipped '
                      'on devices not supporting REALTIME camera timestamp.',
-    'scene_change': 'The picture with 3 faces in tests/scene2_e/scene2_e.png',
 }
 
 
@@ -127,7 +128,6 @@
         'test_yuv_plus_raw',
     ],
     'scene2_a': [
-        'test_faces',
         'test_num_faces',
     ],
     'scene4': [
@@ -251,7 +251,7 @@
     config_file_contents: a dict read from config.yml
   """
   with open(CONFIG_FILE) as file:
-    config_file_contents = yaml.load(file, yaml.FullLoader)
+    config_file_contents = yaml.safe_load(file)
   return config_file_contents
 
 
@@ -290,9 +290,9 @@
       for device_dict in android_device_contents.get('AndroidDevice'):
         for _, label in device_dict.items():
           if label == 'tablet':
-            tablet_device_id = device_dict.get('serial')
+            tablet_device_id = str(device_dict.get('serial'))
           if label == 'dut':
-            dut_device_id = device_dict.get('serial')
+            dut_device_id = str(device_dict.get('serial'))
   if device == 'tablet':
     return tablet_device_id
   else:
@@ -416,7 +416,7 @@
     auto_scene_switch = True
   else:
     auto_scene_switch = False
-    logging.info('Manual testing: no tablet defined or testing scene5.')
+    logging.info('No tablet: manual, sensor_fusion, or scene5 testing.')
 
   for camera_id in camera_id_combos:
     test_params_content['camera'] = camera_id
@@ -456,6 +456,7 @@
     for s in per_camera_scenes:
       test_params_content['scene'] = s
       results[s]['TEST_STATUS'] = []
+      results[s][METRICS_KEY] = []
 
       # unit is millisecond for execution time record in CtsVerifier
       scene_start_time = int(round(time.time() * 1000))
@@ -507,13 +508,13 @@
         # Handle repeated test
         if 'tests/' in test:
           cmd = [
-              'python3',
+              'python',
               os.path.join(os.environ['CAMERA_ITS_TOP'], test), '-c',
               '%s' % new_yml_file_name
           ]
         else:
           cmd = [
-              'python3',
+              'python',
               os.path.join(os.environ['CAMERA_ITS_TOP'], 'tests', s, test),
               '-c',
               '%s' % new_yml_file_name
@@ -531,14 +532,28 @@
             test_failed = False
             test_skipped = False
             test_not_yet_mandated = False
-            line = file.read()
-            if 'Test skipped' in line:
+            test_mpc_req = ""
+            content = file.read()
+
+            # Find media performance class logging
+            lines = content.splitlines()
+            for one_line in lines:
+              # regular expression pattern must match
+              # MPC12_CAMERA_LAUNCH_PATTERN or MPC12_JPEG_CAPTURE_PATTERN in
+              # ItsTestActivity.java.
+              mpc_string_match = re.search(
+                  '^(1080p_jpeg_capture_time_ms:|camera_launch_time_ms:)', one_line)
+              if mpc_string_match:
+                test_mpc_req = one_line
+                break
+
+            if 'Test skipped' in content:
               return_string = 'SKIP '
               num_skip += 1
               test_skipped = True
               break
 
-            if 'Not yet mandated test' in line:
+            if 'Not yet mandated test' in content:
               return_string = 'FAIL*'
               num_not_mandated_fail += 1
               test_not_yet_mandated = True
@@ -551,7 +566,7 @@
 
             if test_code == 1 and not test_not_yet_mandated:
               return_string = 'FAIL '
-              if 'Problem with socket' in line and num_try != NUM_TRIES-1:
+              if 'Problem with socket' in content and num_try != NUM_TRIES-1:
                 logging.info('Retry %s/%s', s, test)
               else:
                 num_fail += 1
@@ -561,6 +576,8 @@
         logging.info('%s %s/%s', return_string, s, test)
         test_name = test.split('/')[-1].split('.')[0]
         results[s]['TEST_STATUS'].append({'test':test_name,'status':return_string.strip()})
+        if test_mpc_req:
+          results[s][METRICS_KEY].append(test_mpc_req)
         msg_short = '%s %s' % (return_string, test)
         scene_test_summary += msg_short + '\n'
 
diff --git a/apps/CameraITS/utils/camera_properties_utils.py b/apps/CameraITS/utils/camera_properties_utils.py
index 91e2c58..cbad164 100644
--- a/apps/CameraITS/utils/camera_properties_utils.py
+++ b/apps/CameraITS/utils/camera_properties_utils.py
@@ -580,6 +580,17 @@
   return 'android.request.availableCapabilities' in props and 4 in props[
       'android.request.availableCapabilities']
 
+def stream_use_case(props):
+  """Returns whether a device has stream use case capability.
+
+  Args:
+    props: Camera properties object.
+
+  Returns:
+     Boolean. True if the device has stream use case capability.
+  """
+  return 'android.request.availableCapabilities' in props and 19 in props[
+      'android.request.availableCapabilities']
 
 def intrinsic_calibration(props):
   """Returns whether a device supports android.lens.intrinsicCalibration.
diff --git a/apps/CameraITS/utils/capture_request_utils.py b/apps/CameraITS/utils/capture_request_utils.py
index 4d0ea32..2887925 100644
--- a/apps/CameraITS/utils/capture_request_utils.py
+++ b/apps/CameraITS/utils/capture_request_utils.py
@@ -17,6 +17,24 @@
 import math
 import unittest
 
+COMMON_IMG_ARS = (1.333, 1.778)
+COMMON_IMG_ARS_ATOL = 0.01
+
+
+def is_common_aspect_ratio(size):
+  """Returns if aspect ratio is a 4:3 or 16:9.
+
+  Args:
+    size: tuple of image (w, h)
+
+  Returns:
+    Boolean
+  """
+  for aspect_ratio in COMMON_IMG_ARS:
+    if math.isclose(size[0]/size[1], aspect_ratio, abs_tol=COMMON_IMG_ARS_ATOL):
+      return True
+  return False
+
 
 def auto_capture_request(linear_tonemap=False, props=None):
   """Returns a capture request with everything set to auto.
diff --git a/apps/CameraITS/utils/image_fov_utils.py b/apps/CameraITS/utils/image_fov_utils.py
new file mode 100644
index 0000000..8ac4ece
--- /dev/null
+++ b/apps/CameraITS/utils/image_fov_utils.py
@@ -0,0 +1,306 @@
+# Copyright 2022 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.
+"""Image Field-of-View utilities for aspect ratio, crop, and FoV tests."""
+
+
+import logging
+import math
+import unittest
+
+import cv2
+import camera_properties_utils
+import capture_request_utils
+import image_processing_utils
+import opencv_processing_utils
+
+CIRCLE_COLOR = 0  # [0: black, 255: white]
+CIRCLE_MIN_AREA = 0.01  # 1% of image size
+FOV_PERCENT_RTOL = 0.15  # Relative tolerance on circle FoV % to expected.
+LARGE_SIZE_IMAGE = 2000  # Size of a large image (compared against max(w, h))
+THRESH_AR_L = 0.02  # Aspect ratio test threshold of large images
+THRESH_AR_S = 0.075  # Aspect ratio test threshold of mini images
+THRESH_CROP_L = 0.02  # Crop test threshold of large images
+THRESH_CROP_S = 0.075  # Crop test threshold of mini images
+THRESH_MIN_PIXEL = 4  # Crop test allowed offset
+
+
+def check_fov(circle, ref_fov, w, h):
+  """Check the FoV for correct size."""
+  fov_percent = calc_circle_image_ratio(circle['r'], w, h)
+  chk_percent = calc_expected_circle_image_ratio(ref_fov, w, h)
+  if not math.isclose(fov_percent, chk_percent, rel_tol=FOV_PERCENT_RTOL):
+    e_msg = (f'FoV %: {fov_percent:.2f}, Ref FoV %: {chk_percent:.2f}, '
+             f'TOL={FOV_PERCENT_RTOL*100}%, img: {w}x{h}, ref: '
+             f"{ref_fov['w']}x{ref_fov['h']}")
+    return e_msg
+
+
+def check_ar(circle, ar_gt, w, h, e_msg_stem):
+  """Check the aspect ratio of the circle.
+
+  size is the larger of w or h.
+  if size >= LARGE_SIZE_IMAGE: use THRESH_AR_L
+  elif size == 0 (extreme case): THRESH_AR_S
+  elif 0 < image size < LARGE_SIZE_IMAGE: scale between THRESH_AR_S & AR_L
+
+  Args:
+    circle: dict with circle parameters
+    ar_gt: aspect ratio ground truth to compare against
+    w: width of image
+    h: height of image
+    e_msg_stem: customized string for error message
+
+  Returns:
+    error string if check fails
+  """
+  thresh_ar = max(THRESH_AR_L, THRESH_AR_S +
+                  max(w, h) * (THRESH_AR_L-THRESH_AR_S) / LARGE_SIZE_IMAGE)
+  ar = circle['w'] / circle['h']
+  if not math.isclose(ar, ar_gt, abs_tol=thresh_ar):
+    e_msg = (f'{e_msg_stem} {w}x{h}: aspect_ratio {ar:.3f}, '
+             f'thresh {thresh_ar:.3f}')
+    return e_msg
+
+
+def check_crop(circle, cc_gt, w, h, e_msg_stem, crop_thresh_factor):
+  """Check cropping.
+
+  if size >= LARGE_SIZE_IMAGE: use thresh_crop_l
+  elif size == 0 (extreme case): thresh_crop_s
+  elif 0 < size < LARGE_SIZE_IMAGE: scale between thresh_crop_s & thresh_crop_l
+  Also allow at least THRESH_MIN_PIXEL to prevent threshold being too tight
+  for very small circle.
+
+  Args:
+    circle: dict of circle values
+    cc_gt: circle center {'hori', 'vert'}  ground truth (ref'd to img center)
+    w: width of image
+    h: height of image
+    e_msg_stem: text to customize error message
+    crop_thresh_factor: scaling factor for crop thresholds
+
+  Returns:
+    error string if check fails
+  """
+  thresh_crop_l = THRESH_CROP_L * crop_thresh_factor
+  thresh_crop_s = THRESH_CROP_S * crop_thresh_factor
+  thresh_crop_hori = max(
+      [thresh_crop_l,
+       thresh_crop_s + w * (thresh_crop_l - thresh_crop_s) / LARGE_SIZE_IMAGE,
+       THRESH_MIN_PIXEL / circle['w']])
+  thresh_crop_vert = max(
+      [thresh_crop_l,
+       thresh_crop_s + h * (thresh_crop_l - thresh_crop_s) / LARGE_SIZE_IMAGE,
+       THRESH_MIN_PIXEL / circle['h']])
+
+  if (not math.isclose(circle['x_offset'], cc_gt['hori'],
+                       abs_tol=thresh_crop_hori) or
+      not math.isclose(circle['y_offset'], cc_gt['vert'],
+                       abs_tol=thresh_crop_vert)):
+    valid_x_range = (cc_gt['hori'] - thresh_crop_hori,
+                     cc_gt['hori'] + thresh_crop_hori)
+    valid_y_range = (cc_gt['vert'] - thresh_crop_vert,
+                     cc_gt['vert'] + thresh_crop_vert)
+    e_msg = (f'{e_msg_stem} {w}x{h} '
+             f"offset X {circle['x_offset']:.3f}, Y {circle['y_offset']:.3f}, "
+             f'valid X range: {valid_x_range[0]:.3f} ~ {valid_x_range[1]:.3f}, '
+             f'valid Y range: {valid_y_range[0]:.3f} ~ {valid_y_range[1]:.3f}')
+    return e_msg
+
+
+def calc_expected_circle_image_ratio(ref_fov, img_w, img_h):
+  """Determine the circle image area ratio in percentage for a given image size.
+
+  Cropping happens either horizontally or vertically. In both cases crop results
+  in the visble area reduced by a ratio r (r < 1) and the circle will in turn
+  occupy ref_pct/r (percent) on the target image size.
+
+  Args:
+    ref_fov: dict with {fmt, % coverage, w, h, circle_w, circle_h}
+    img_w: the image width
+    img_h: the image height
+
+  Returns:
+    chk_percent: the expected circle image area ratio in percentage
+  """
+  ar_ref = ref_fov['w'] / ref_fov['h']
+  ar_target = img_w / img_h
+
+  r = ar_ref / ar_target
+  if r < 1.0:
+    r = 1.0 / r
+  return ref_fov['percent'] * r
+
+
+def calc_circle_image_ratio(radius, img_w, img_h):
+  """Calculate the percent of area the input circle covers in input image.
+
+  Args:
+    radius: radius of circle
+    img_w: int width of image
+    img_h: int height of image
+  Returns:
+    fov_percent: float % of image covered by circle
+  """
+  return 100 * math.pi * math.pow(radius, 2) / (img_w * img_h)
+
+
+def find_fov_reference(cam, req, props, raw_bool, ref_img_name_stem):
+  """Determine the circle coverage of the image in reference image.
+
+  Captures a full-frame RAW or JPEG and uses its aspect ratio and circle center
+  location as ground truth for the other jpeg or yuv images.
+
+  The intrinsics and distortion coefficients are meant for full-sized RAW,
+  so convert_capture_to_rgb_image returns a 2x downsampled version, so resizes
+  RGB back to full size.
+
+  If the device supports lens distortion correction, applies the coefficients on
+  the RAW image so it can be compared to YUV/JPEG outputs which are subject
+  to the same correction via ISP.
+
+  Finds circle size and location for reference values in calculations for other
+  formats.
+
+  Args:
+    cam: camera object
+    req: camera request
+    props: camera properties
+    raw_bool: True if RAW available
+    ref_img_name_stem: test _NAME + location to save data
+
+  Returns:
+    ref_fov: dict with [fmt, % coverage, w, h, circle_w, circle_h]
+    cc_ct_gt: circle center position relative to the center of image.
+    aspect_ratio_gt: aspect ratio of the detected circle in float.
+  """
+  logging.debug('Creating references for fov_coverage')
+  if raw_bool:
+    logging.debug('Using RAW for reference')
+    fmt_type = 'RAW'
+    out_surface = {'format': 'raw'}
+    cap = cam.do_capture(req, out_surface)
+    logging.debug('Captured RAW %dx%d', cap['width'], cap['height'])
+    img = image_processing_utils.convert_capture_to_rgb_image(
+        cap, props=props)
+    # Resize back up to full scale.
+    img = cv2.resize(img, (0, 0), fx=2.0, fy=2.0)
+
+    if (camera_properties_utils.distortion_correction(props) and
+        camera_properties_utils.intrinsic_calibration(props)):
+      logging.debug('Applying intrinsic calibration and distortion params')
+      fd = float(cap['metadata']['android.lens.focalLength'])
+      k = camera_properties_utils.get_intrinsic_calibration(props, True, fd)
+      opencv_dist = camera_properties_utils.get_distortion_matrix(props)
+      k_new = cv2.getOptimalNewCameraMatrix(
+          k, opencv_dist, (img.shape[1], img.shape[0]), 0)[0]
+      scale = max(k_new[0][0] / k[0][0], k_new[1][1] / k[1][1])
+      if scale > 1:
+        k_new[0][0] = k[0][0] * scale
+        k_new[1][1] = k[1][1] * scale
+        img = cv2.undistort(img, k, opencv_dist, None, k_new)
+      else:
+        img = cv2.undistort(img, k, opencv_dist)
+    size = img.shape
+
+  else:
+    logging.debug('Using JPEG for reference')
+    fmt_type = 'JPEG'
+    ref_fov = {}
+    fmt = capture_request_utils.get_largest_jpeg_format(props)
+    cap = cam.do_capture(req, fmt)
+    logging.debug('Captured JPEG %dx%d', cap['width'], cap['height'])
+    img = image_processing_utils.convert_capture_to_rgb_image(cap, props)
+    size = (cap['height'], cap['width'])
+
+  # Get image size.
+  w = size[1]
+  h = size[0]
+  img_name = f'{ref_img_name_stem}_{fmt_type}_w{w}_h{h}.png'
+  image_processing_utils.write_image(img, img_name, True)
+
+  # Find circle.
+  img *= 255  # cv2 needs images between [0,255].
+  circle = opencv_processing_utils.find_circle(
+      img, img_name, CIRCLE_MIN_AREA, CIRCLE_COLOR)
+  opencv_processing_utils.append_circle_center_to_img(circle, img, img_name)
+
+  # Determine final return values.
+  if fmt_type == 'RAW':
+    aspect_ratio_gt = circle['w'] / circle['h']
+  else:
+    aspect_ratio_gt = 1.0
+  cc_ct_gt = {'hori': circle['x_offset'], 'vert': circle['y_offset']}
+  fov_percent = calc_circle_image_ratio(circle['r'], w, h)
+  ref_fov = {}
+  ref_fov['fmt'] = fmt_type
+  ref_fov['percent'] = fov_percent
+  ref_fov['w'] = w
+  ref_fov['h'] = h
+  ref_fov['circle_w'] = circle['w']
+  ref_fov['circle_h'] = circle['h']
+  logging.debug('Using %s reference: %s', fmt_type, str(ref_fov))
+  return ref_fov, cc_ct_gt, aspect_ratio_gt
+
+
+class ImageFovUtilsTest(unittest.TestCase):
+  """Unit tests for this module."""
+
+  def test_calc_expected_circle_image_ratio(self):
+    """Unit test for calc_expected_circle_image_ratio.
+
+    Test by using 5% area circle in VGA cropped to nHD format
+    """
+    ref_fov = {'w': 640, 'h': 480, 'percent': 5}
+    # nHD format cut down
+    img_w, img_h = 640, 360
+    nhd = calc_expected_circle_image_ratio(ref_fov, img_w, img_h)
+    self.assertTrue(math.isclose(nhd, 5*480/360, abs_tol=0.01))
+
+  def test_check_ar(self):
+    """Unit test for aspect ratio check."""
+    # Circle true
+    circle = {'w': 1, 'h': 1}
+    ar_gt = 1.0
+    w, h = 640, 480
+    e_msg_stem = 'check_ar_true'
+    e_msg = check_ar(circle, ar_gt, w, h, e_msg_stem)
+    self.assertIsNone(e_msg)
+
+    # Circle false
+    circle = {'w': 2, 'h': 1}
+    e_msg_stem = 'check_ar_false'
+    e_msg = check_ar(circle, ar_gt, w, h, e_msg_stem)
+    self.assertIn('check_ar_false', e_msg)
+
+  def test_check_crop(self):
+    """Unit test for crop check."""
+    # Crop true
+    circle = {'w': 100, 'h': 100, 'x_offset': 1, 'y_offset': 1}
+    cc_gt = {'hori': 1.0, 'vert': 1.0}
+    w, h = 640, 480
+    e_msg_stem = 'check_crop_true'
+    crop_thresh_factor = 1
+    e_msg = check_crop(circle, cc_gt, w, h, e_msg_stem, crop_thresh_factor)
+    self.assertIsNone(e_msg)
+
+    # Crop false
+    circle = {'w': 100, 'h': 100, 'x_offset': 2, 'y_offset': 1}
+    e_msg_stem = 'check_crop_false'
+    e_msg = check_crop(circle, cc_gt, w, h, e_msg_stem, crop_thresh_factor)
+    self.assertIn('check_crop_false', e_msg)
+
+if __name__ == '__main__':
+  unittest.main()
+
diff --git a/apps/CameraITS/utils/image_processing_utils.py b/apps/CameraITS/utils/image_processing_utils.py
index a364b53..3ebee72 100644
--- a/apps/CameraITS/utils/image_processing_utils.py
+++ b/apps/CameraITS/utils/image_processing_utils.py
@@ -45,18 +45,18 @@
 TEST_IMG_DIR = os.path.join(os.environ['CAMERA_ITS_TOP'], 'test_images')
 
 
-# pylint: disable=unused-argument
+def assert_props_is_not_none(props):
+  if not props:
+    raise AssertionError('props is None')
+
+
 def convert_capture_to_rgb_image(cap,
-                                 ccm_yuv_to_rgb=DEFAULT_YUV_TO_RGB_CCM,
-                                 yuv_off=DEFAULT_YUV_OFFSETS,
                                  props=None,
                                  apply_ccm_raw_to_rgb=True):
   """Convert a captured image object to a RGB image.
 
   Args:
      cap: A capture object as returned by its_session_utils.do_capture.
-     ccm_yuv_to_rgb: (Optional) the 3x3 CCM to convert from YUV to RGB.
-     yuv_off: (Optional) offsets to subtract from each of Y,U,V values.
      props: (Optional) camera properties object (of static values);
             required for processing raw images.
      apply_ccm_raw_to_rgb: (Optional) boolean to apply color correction matrix.
@@ -67,11 +67,11 @@
   w = cap['width']
   h = cap['height']
   if cap['format'] == 'raw10':
-    assert props is not None
+    assert_props_is_not_none(props)
     cap = unpack_raw10_capture(cap)
 
   if cap['format'] == 'raw12':
-    assert props is not None
+    assert_props_is_not_none(props)
     cap = unpack_raw12_capture(cap)
 
   if cap['format'] == 'yuv':
@@ -82,7 +82,7 @@
   elif cap['format'] == 'jpeg':
     return decompress_jpeg_to_rgb_image(cap['data'])
   elif cap['format'] == 'raw' or cap['format'] == 'rawStats':
-    assert props is not None
+    assert_props_is_not_none(props)
     r, gr, gb, b = convert_capture_to_planes(cap, props)
     return convert_raw_to_rgb_image(
         r, gr, gb, b, props, cap['metadata'], apply_ccm_raw_to_rgb)
@@ -245,6 +245,19 @@
   h = img.size[1]
   return numpy.array(img).reshape(h, w, 3) / 255.0
 
+def convert_image_to_numpy_array(image_path):
+  """
+  Converts an image at the path image_path to numpy array and returns the array.
+
+  Args:
+    image_path: file path
+  Returns:
+    numpy array
+  """
+  if not os.path.exists(image_path):
+    raise assertionError(f'{image_path} does not exist.')
+  image = Image.open(image_path)
+  return numpy.array(image)
 
 def convert_capture_to_planes(cap, props=None):
   """Convert a captured image object to separate image planes.
@@ -276,10 +289,10 @@
   w = cap['width']
   h = cap['height']
   if cap['format'] == 'raw10':
-    assert props is not None
+    assert_props_is_not_none(props)
     cap = unpack_raw10_capture(cap)
   if cap['format'] == 'raw12':
-    assert props is not None
+    assert_props_is_not_none(props)
     cap = unpack_raw12_capture(cap)
   if cap['format'] == 'yuv':
     y = cap['data'][0:w * h]
@@ -293,7 +306,7 @@
     return (rgb[::3].reshape(h, w, 1), rgb[1::3].reshape(h, w, 1),
             rgb[2::3].reshape(h, w, 1))
   elif cap['format'] == 'raw':
-    assert props is not None
+    assert_props_is_not_none(props)
     white_level = float(props['android.sensor.info.whiteLevel'])
     img = numpy.ndarray(
         shape=(h * w,), dtype='<u2', buffer=cap['data'][0:w * h * 2])
@@ -314,10 +327,14 @@
           'right'] - xcrop
       hcrop = props['android.sensor.info.preCorrectionActiveArraySize'][
           'bottom'] - ycrop
-      assert wfull >= wcrop >= 0
-      assert hfull >= hcrop >= 0
-      assert wfull - wcrop >= xcrop >= 0
-      assert hfull - hcrop >= ycrop >= 0
+      if not wfull >= wcrop >= 0:
+        raise AssertionError(f'wcrop: {wcrop} not in wfull: {wfull}')
+      if not  hfull >= hcrop >= 0:
+        raise AssertionError(f'hcrop: {hcrop} not in hfull: {hfull}')
+      if not wfull - wcrop >= xcrop >= 0:
+        raise AssertionError(f'xcrop: {xcrop} not in wfull-crop: {wfull-wcrop}')
+      if not hfull - hcrop >= ycrop >= 0:
+        raise AssertionError(f'ycrop: {ycrop} not in hfull-crop: {hfull-hcrop}')
       if w == wfull and h == hfull:
         # Crop needed; extract the center region.
         img = img[ycrop:ycrop + hcrop, xcrop:xcrop + wcrop]
@@ -339,7 +356,7 @@
     idxs = get_canonical_cfa_order(props)
     return [imgs[i] for i in idxs]
   elif cap['format'] == 'rawStats':
-    assert props is not None
+    assert_props_is_not_none(props)
     white_level = float(props['android.sensor.info.whiteLevel'])
     # pylint: disable=unused-variable
     mean_image, var_image = unpack_rawstats_capture(cap)
@@ -405,7 +422,7 @@
    RGB float-3 image array, with pixel values in [0.0, 1.0]
   """
     # Values required for the RAW to RGB conversion.
-  assert props is not None
+  assert_props_is_not_none(props)
   white_level = float(props['android.sensor.info.whiteLevel'])
   black_levels = props['android.sensor.blackLevelPattern']
   gains = cap_res['android.colorCorrection.gains']
@@ -613,7 +630,8 @@
     Tuple (mean_image var_image) of float-4 images, with non-normalized
     pixel values computed from the RAW16 images on the device
   """
-  assert cap['format'] == 'rawStats'
+  if cap['format'] != 'rawStats':
+    raise AssertionError(f"Unpack fmt != rawStats: {cap['format']}")
   w = cap['width']
   h = cap['height']
   img = numpy.ndarray(shape=(2 * h * w * 4,), dtype='<f', buffer=cap['data'])
@@ -691,7 +709,8 @@
     Larger value means the image is sharper.
   """
   chans = img.shape[2]
-  assert chans == 1 or chans == 3
+  if chans != 1 and chans != 3:
+    raise AssertionError(f'Not RGB or MONO image! depth: {chans}')
   if chans == 1:
     luma = img[:, :, 0]
   else:
@@ -741,7 +760,9 @@
   Returns:
     2-D grayscale image
   """
-  assert img.shape[2] == 3, 'Not an RGB image'
+  chans = img.shape[2]
+  if chans != 3:
+    raise AssertionError(f'Not an RGB image! Depth: {chans}')
   return 0.299*img[:, :, 0] + 0.587*img[:, :, 1] + 0.114*img[:, :, 2]
 
 
@@ -770,22 +791,6 @@
   return img_out
 
 
-def chart_located_per_argv(chart_loc_arg):
-  """Determine if chart already located outside of test.
-
-  If chart info provided, return location and size. If not, return None.
-  Args:
-   chart_loc_arg: chart_loc arg value.
-
-  Returns:
-    chart_loc:  float converted xnorm,ynorm,wnorm,hnorm,scale from argv
-    text.argv is of form 'chart_loc=0.45,0.45,0.1,0.1,1.0'
-  """
-  if chart_loc_arg:
-    return map(float, chart_loc_arg)
-  return None, None, None, None, None
-
-
 def stationary_lens_cap(cam, req, fmt):
   """Take up to NUM_TRYS caps and save the 1st one with lens stationary.
 
@@ -812,8 +817,8 @@
   return cap[NUM_FRAMES - 1]
 
 
-def compute_image_rms_difference(rgb_x, rgb_y):
-  """Calculate the RMS difference between 2 RBG images.
+def compute_image_rms_difference_1d(rgb_x, rgb_y):
+  """Calculate the RMS difference between 2 RBG images as 1D arrays.
 
   Args:
     rgb_x: image array
@@ -823,10 +828,37 @@
     rms_diff
   """
   len_rgb_x = len(rgb_x)
-  assert len(rgb_y) == len_rgb_x, 'The images have different number of planes.'
+  len_rgb_y = len(rgb_y)
+  if len_rgb_y != len_rgb_x:
+    raise AssertionError('RGB images have different number of planes! '
+                         f'x: {len_rgb_x}, y: {len_rgb_y}')
   return math.sqrt(sum([pow(rgb_x[i] - rgb_y[i], 2.0)
                         for i in range(len_rgb_x)]) / len_rgb_x)
 
+def compute_image_rms_difference_3d(rgb_x, rgb_y):
+  """Calculate the RMS difference between 2 RBG images as 3D arrays.
+
+  Args:
+    rgb_x: image array in the form of w * h * channels
+    rgb_y: image array in the form of w * h * channels
+
+  Returns:
+    rms_diff
+  """
+  shape_rgb_x = numpy.shape(rgb_x)
+  shape_rgb_y = numpy.shape(rgb_y)
+  if shape_rgb_y != shape_rgb_x:
+    raise AssertionError('RGB images have different number of planes! '
+                         f'x: {shape_rgb_x}, y: {shape_rgb_y}')
+  if len(shape_rgb_x) != 3:
+    raise AssertionError(f'RGB images dimension {len(shape_rgb_x)} is not 3!')
+
+  mean_square_sum = 0.0
+  for i in range(shape_rgb_x[0]):
+    for j in range(shape_rgb_x[1]):
+      for k in range(shape_rgb_x[2]):
+        mean_square_sum += pow(rgb_x[i][j][k] - rgb_y[i][j][k], 2.0);
+  return math.sqrt(mean_square_sum / (shape_rgb_x[0] * shape_rgb_x[1] * shape_rgb_x[2]))
 
 class ImageProcessingUtilsTest(unittest.TestCase):
   """Unit tests for this module."""
diff --git a/apps/CameraITS/utils/its_session_utils.py b/apps/CameraITS/utils/its_session_utils.py
index 10f5779..85ac686 100644
--- a/apps/CameraITS/utils/its_session_utils.py
+++ b/apps/CameraITS/utils/its_session_utils.py
@@ -452,6 +452,63 @@
     self.sock.settimeout(self.SOCK_TIMEOUT)
     return data['objValue']
 
+  def do_basic_recording(self, profile_id, quality, duration):
+    """Issue a recording request and read back the video recording object.
+
+    The recording will be done with the format specified in quality. These
+    quality levels correspond to the profiles listed in CamcorderProfile.
+    The duration is the time in seconds for which the video will be recorded.
+    The recorded object consists of a path on the device at which the
+    recorded video is saved.
+
+    Args:
+      profile_id: int; profile id corresponding to the quality level.
+      quality: Video recording quality such as High, Low, VGA.
+      duration: The time in seconds for which the video will be recorded.
+    Returns:
+      video_recorded_object: The recorded object returned from ItsService which
+      contains path at which the recording is saved on the device, quality of the
+      recorded video, video size of the recorded video, video frame rate.
+      Ex:
+      VideoRecordingObject: {
+        'tag': 'recordingResponse',
+        'objValue': {
+          'recordedOutputPath': '/storage/emulated/0/Android/data/com.android.cts.verifier'
+                                '/files/VideoITS/VID_20220324_080414_0_CIF_352x288.mp4',
+          'quality': 'CIF',
+          'videoFrameRate': 30,
+          'videoSize': '352x288'
+        }
+      }
+    """
+    cmd = {'cmdName': 'doBasicRecording', 'cameraId': self._camera_id,
+        'profileId': profile_id, 'quality': quality, 'recordingDuration': duration}
+    self.sock.send(json.dumps(cmd).encode() + '\n'.encode())
+    timeout = self.SOCK_TIMEOUT + self.EXTRA_SOCK_TIMEOUT
+    self.sock.settimeout(timeout)
+    data, _ = self.__read_response_from_socket()
+    if data['tag'] != 'recordingResponse':
+      raise error_util.CameraItsError(f'Invalid response for command: {cmd[cmdName]}')
+    logging.debug('VideoRecordingObject: %s' % data)
+    return data['objValue']
+
+  def get_supported_video_qualities(self, camera_id):
+    """Get all supported video qualities for this camera device.
+      Args:
+        camera_id: device id
+      Returns:
+        List of all supported video qualities and corresponding profileIds.
+        Ex: ['480:4', '1080:6', '2160:8', '720:5', 'CIF:3', 'HIGH:1', 'LOW:0', 'QCIF:2', 'QVGA:7']
+    """
+    cmd = {}
+    cmd['cmdName'] = 'getSupportedVideoQualities'
+    cmd['cameraId'] = camera_id
+    self.sock.send(json.dumps(cmd).encode() + '\n'.encode())
+    data, _ = self.__read_response_from_socket()
+    if data['tag'] != 'supportedVideoQualities':
+      raise error_util.CameraItsError('Invalid command response')
+    return data['strValue'].split(';')[:-1] # remove the last appended ';'
+
   def do_capture(self,
                  cap_request,
                  out_surfaces=None,
@@ -476,9 +533,11 @@
     "dng", "raw", "raw10", "raw12", "rawStats" or "y8". The default is a
     YUV420 frame ("yuv") corresponding to a full sensor frame.
 
-    Optionally the out_surfaces field can specify physical camera id(s) if
+    1. Optionally the out_surfaces field can specify physical camera id(s) if
     the current camera device is a logical multi-camera. The physical camera
     id must refer to a physical camera backing this logical camera device.
+    2. Optionally The output_surfaces field can also specify the use case(s) if
+    the current camera device has STREAM_USE_CASE capability.
 
     Note that one or more surfaces can be specified, allowing a capture to
     request images back in multiple formats (e.g.) raw+yuv, raw+jpeg,
@@ -879,6 +938,7 @@
             lock_awb=False,
             get_results=False,
             ev_comp=0,
+            auto_flash=False,
             mono_camera=False):
     """Perform a 3A operation on the device.
 
@@ -899,6 +959,7 @@
       lock_awb: Request AWB lock after convergence, and wait for it.
       get_results: Return the 3A results from this function.
       ev_comp: An EV compensation value to use when running AE.
+      auto_flash: AE control boolean to enable auto flash.
       mono_camera: Boolean for monochrome camera.
 
       Region format in args:
@@ -933,6 +994,8 @@
       cmd['awbLock'] = True
     if ev_comp != 0:
       cmd['evComp'] = ev_comp
+    if auto_flash:
+      cmd['autoFlash'] = True
     if self._hidden_physical_id:
       cmd['physicalId'] = self._hidden_physical_id
     self.sock.send(json.dumps(cmd).encode() + '\n'.encode())
@@ -1096,8 +1159,8 @@
                                       ' support')
     return data['strValue'] == 'true'
 
-  def is_performance_class_primary_camera(self):
-    """Query whether the camera device is an R or S performance class primary camera.
+  def is_primary_camera(self):
+    """Query whether the camera device is a primary rear/front camera.
 
     A primary rear/front facing camera is a camera device with the lowest
     camera Id for that facing.
@@ -1106,14 +1169,28 @@
       Boolean
     """
     cmd = {}
-    cmd['cmdName'] = 'isPerformanceClassPrimaryCamera'
+    cmd['cmdName'] = 'isPrimaryCamera'
     cmd['cameraId'] = self._camera_id
     self.sock.send(json.dumps(cmd).encode() + '\n'.encode())
 
     data, _ = self.__read_response_from_socket()
-    if data['tag'] != 'performanceClassPrimaryCamera':
-      raise error_util.CameraItsError('Failed to query performance class '
-                                      'primary camera')
+    if data['tag'] != 'primaryCamera':
+      raise error_util.CameraItsError('Failed to query primary camera')
+    return data['strValue'] == 'true'
+
+  def is_performance_class(self):
+    """Query whether the mobile device is an R or S performance class device.
+
+    Returns:
+      Boolean
+    """
+    cmd = {}
+    cmd['cmdName'] = 'isPerformanceClass'
+    self.sock.send(json.dumps(cmd).encode() + '\n'.encode())
+
+    data, _ = self.__read_response_from_socket()
+    if data['tag'] != 'performanceClass':
+      raise error_util.CameraItsError('Failed to query performance class')
     return data['strValue'] == 'true'
 
   def measure_camera_launch_ms(self):
@@ -1206,7 +1283,7 @@
   return caps[-1]
 
 
-def load_scene(cam, props, scene, tablet, chart_distance):
+def load_scene(cam, props, scene, tablet, chart_distance, lighting_check=True):
   """Load the scene for the camera based on the FOV.
 
   Args:
@@ -1215,6 +1292,7 @@
     scene: scene to be loaded
     tablet: tablet to load scene on
     chart_distance: distance to tablet
+    lighting_check: Boolean for lighting check enabled
   """
   if not tablet:
     logging.info('Manual run: no tablet to load scene on.')
@@ -1239,7 +1317,7 @@
           chart_distance,
           opencv_processing_utils.CHART_DISTANCE_WFOV, rtol=0.1) and
       float(camera_fov) > opencv_processing_utils.FOV_THRESH_WFOV)
-  if rfov_camera_in_rfov_box or wfov_camera_in_wfov_box:
+  if (rfov_camera_in_rfov_box or wfov_camera_in_wfov_box) and lighting_check:
     cam.do_3a()
     cap = cam.do_capture(
         capture_request_utils.auto_capture_request(), cam.CAP_YUV)
@@ -1247,12 +1325,14 @@
     validate_lighting(y_plane, scene)
 
 
-def validate_lighting(y_plane, scene):
+def validate_lighting(y_plane, scene, state='ON'):
   """Validates the lighting level in scene corners based on empirical values.
 
   Args:
     y_plane: Y plane of YUV image
     scene: scene name
+    state: string 'ON' or 'OFF'
+
   Returns:
     boolean True if lighting validated, else raise AssertionError
   """
@@ -1265,11 +1345,25 @@
         _VALIDATE_LIGHTING_PATCH_W, _VALIDATE_LIGHTING_PATCH_H)
     y_mean = image_processing_utils.compute_image_means(patch)[0]
     logging.debug('%s corner Y mean: %.3f', location, y_mean)
-    if y_mean > _VALIDATE_LIGHTING_THRESH:
-      logging.debug('Lights ON in test rig.')
-      return True
-  image_processing_utils.write_image(y_plane, f'validate_lighting_{scene}.jpg')
-  raise AssertionError('Lights OFF in test rig. Please turn ON and retry.')
+    if state == 'ON':
+      if y_mean > _VALIDATE_LIGHTING_THRESH:
+        logging.debug('Lights ON in test rig.')
+        return True
+      else:
+        image_processing_utils.write_image(
+            y_plane, f'validate_lighting_{scene}.jpg')
+        raise AssertionError('Lights OFF in test rig. Turn ON and retry.')
+    elif state == 'OFF':
+      if y_mean < _VALIDATE_LIGHTING_THRESH:
+        logging.debug('Lights OFF in test rig.')
+        return True
+      else:
+        image_processing_utils.write_image(
+            y_plane, f'validate_lighting_{scene}.jpg')
+        raise AssertionError('Lights ON in test rig. Turn OFF and retry.')
+    else:
+      raise AssertionError('Invalid lighting state string. '
+                           "Valid strings: 'ON', 'OFF'.")
 
 
 def get_build_sdk_version(device_id):
diff --git a/apps/CameraITS/utils/lighting_control_utils.py b/apps/CameraITS/utils/lighting_control_utils.py
new file mode 100644
index 0000000..a78c658
--- /dev/null
+++ b/apps/CameraITS/utils/lighting_control_utils.py
@@ -0,0 +1,100 @@
+# Copyright 2021 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.
+"""Utility functions for sensor_fusion hardware rig."""
+
+
+import logging
+import struct
+import time
+import sensor_fusion_utils
+
+# Constants for Arduino
+ARDUINO_BRIGHTNESS_MAX = 255
+ARDUINO_BRIGHTNESS_MIN = 0
+ARDUINO_LIGHT_START_BYTE = 254
+
+
+def set_light_brightness(ch, brightness, serial_port, delay=0):
+  """Turn on light to specified brightness.
+
+  Args:
+    ch: str; light to turn on in ARDUINO_VALID_CH
+    brightness: int value of brightness between 0 and 255.
+    serial_port: object; serial port
+    delay: int; time in seconds
+  """
+  if brightness < ARDUINO_BRIGHTNESS_MIN:
+    logging.debug('Brightness must be >= %d.', ARDUINO_BRIGHTNESS_MIN)
+    brightness = ARDUINO_BRIGHTNESS_MIN
+  elif brightness > ARDUINO_BRIGHTNESS_MAX:
+    logging.debug('Brightness must be <= %d.', ARDUINO_BRIGHTNESS_MAX)
+    brightness = ARDUINO_BRIGHTNESS_MAX
+
+  cmd = [struct.pack('B', i) for i in [
+      ARDUINO_LIGHT_START_BYTE, int(ch), brightness]]
+  sensor_fusion_utils.arduino_send_cmd(serial_port, cmd)
+  time.sleep(delay)
+
+
+def lighting_control(lighting_cntl, lighting_ch):
+  """Establish communication with lighting controller.
+
+  lighting_ch is hard wired and must be determined from physical setup.
+
+  First initialize the port and send a test string defined by ARDUINO_TEST_CMD
+  to establish communications.
+
+  Args:
+    lighting_cntl: str to identify 'arduino' controller.
+    lighting_ch: str to identify lighting channel number.
+  Returns:
+    serial port pointer
+  """
+
+  logging.debug('Controller: %s, ch: %s', lighting_cntl, lighting_ch)
+  if lighting_cntl.lower() == 'arduino':
+    # identify port
+    arduino_serial_port = sensor_fusion_utils.serial_port_def('arduino')
+
+    # send test cmd to Arduino until cmd returns properly
+    sensor_fusion_utils.establish_serial_comm(arduino_serial_port)
+
+    # return serial port
+    return arduino_serial_port
+
+  else:
+    logging.debug('No lighting control: need to control lights manually.')
+    return None
+
+
+def set_lighting_state(arduino_serial_port, lighting_ch, state):
+  """Turn lights ON in test rig.
+
+  Args:
+    arduino_serial_port: serial port object
+    lighting_ch: str for lighting channel
+    state: str 'ON/OFF'
+  """
+  if state == 'ON':
+    level = 255
+  elif state == 'OFF':
+    level = 0
+  else:
+    raise AssertionError(f'Lighting state not defined correctly: {state}')
+
+  if arduino_serial_port:
+    set_light_brightness(lighting_ch, level, arduino_serial_port, delay=1)
+  else:
+    _ = input(f'Turn {state} lights in rig and hit ENTER to continue.')
+
diff --git a/apps/CameraITS/utils/opencv_processing_utils.py b/apps/CameraITS/utils/opencv_processing_utils.py
index 8c6a3f7..d6f10b6 100644
--- a/apps/CameraITS/utils/opencv_processing_utils.py
+++ b/apps/CameraITS/utils/opencv_processing_utils.py
@@ -63,7 +63,7 @@
 SCALE_TELE25_IN_RFOV_BOX = 0.33
 
 SQUARE_AREA_MIN_REL = 0.05  # Minimum size for square relative to image area
-SQUARE_TOL = 0.1  # Square W vs H mismatch RTOL
+SQUARE_TOL = 0.05  # Square W vs H mismatch RTOL
 
 VGA_HEIGHT = 480
 VGA_WIDTH = 640
@@ -139,7 +139,6 @@
       cam,
       props,
       log_path,
-      chart_loc=None,
       chart_file=None,
       height=None,
       distance=None,
@@ -152,7 +151,6 @@
      cam: open ITS session
      props: camera properties object
      log_path: log path to store the captured images.
-     chart_loc: chart locator arg.
      chart_file: str; absolute path to png file of chart
      height: float; height in cm of displayed chart
      distance: float; distance in cm from camera of displayed chart
@@ -166,10 +164,7 @@
     self._scale_start = scale_start or CHART_SCALE_START
     self._scale_stop = scale_stop or CHART_SCALE_STOP
     self._scale_step = scale_step or CHART_SCALE_STEP
-    self.xnorm, self.ynorm, self.wnorm, self.hnorm, self.scale = (
-        image_processing_utils.chart_located_per_argv(chart_loc))
-    if not self.xnorm:
-      self.locate(cam, props, log_path)
+    self.locate(cam, props, log_path)
 
   def _set_scale_factors_to_one(self):
     """Set scale factors to 1.0 for skipped tests."""
diff --git a/apps/CameraITS/utils/scene_change_utils.py b/apps/CameraITS/utils/scene_change_utils.py
deleted file mode 100644
index fca397b..0000000
--- a/apps/CameraITS/utils/scene_change_utils.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2020 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.
-"""Utility functions for scene change test."""
-
-
-import logging
-import unittest
-
-_DARK_SCENE_THRESH = 0.2
-_FPS = 30  # Frames Per Second
-_FRAME_SHIFT_SMALL = 5  # Num of frames to shift if scene or brightness change.
-_FRAME_SHIFT_LARGE = 30  # Num of frames to shift if no change in capture.
-SCENE_CHANGE_FAIL_CODE = -1001
-SCENE_CHANGE_PASS_CODE = 1001
-
-
-def calc_timing_adjustment(converged, scene_change_flag,
-                           bright_change_flag, bright_final):
-  """Calculate timing adjustment based on converged frame and flags.
-
-  Args:
-    converged: Boolean on whether 3A converged or not.
-    scene_change_flag: Boolean for if afSceneChanged triggered.
-    bright_change_flag: Boolean for if image brightness changes.
-    bright_final: Float for average value of center patch of final frame.
-  Returns:
-    scene_change_timing_shift: Timing shift in frames.
-
-  Does timing adjustment based on input values from captured frames.
-    Truth table for 3A frame, Change flag, Bright flag, Last frame brightness
-      3, C, B, L
-      1, 1, 1, X --> PASS: 3A settled, scene and brightness change
-      1, 1, 0, X --> FAIL: 3A settled, scene change, but no brightness change
-      1, 0, 1, X --> shift FRAME_SHIFT_SMALL earlier
-      1, 0, 0, 1 --> shift FRAME_SHIFT_LARGE earlier
-      1, 0, 0, 0 --> shift FRAME_SHIFT_LARGE later
-      0, X, 1, X --> shift FRAME_SHIFT_SMALL later
-      0, X, 0, X --> FAIL: Check results of scene2/test_continuous_picture.
-    Note: these values have been found empirically for 4 different phone
-          models and 8 cameras. It is possible they may need to be tweaked as
-          more phone models become available.
-  """
-  if converged:  # 3A converges
-    if scene_change_flag:
-      if bright_change_flag:  # scene_change_flag & brightness change --> PASS
-        logging.debug('Scene & brightness change: PASS.')
-        return SCENE_CHANGE_PASS_CODE
-      else:  # scene_change_flag & no brightness change --> FAIL
-        scene_change_frame_shift = SCENE_CHANGE_FAIL_CODE
-        logging.error('Scene change, but no brightness change.')
-    else:  # No scene change flag: shift timing
-      if bright_change_flag:
-        scene_change_frame_shift = -1 * _FRAME_SHIFT_SMALL
-        logging.debug('No scene change flag, but brightness change.')
-      else:
-        logging.debug('No scene change flag, no brightness change.')
-        if bright_final < _DARK_SCENE_THRESH:
-          scene_change_frame_shift = _FRAME_SHIFT_LARGE
-          logging.debug('Scene dark entire capture.')
-        else:
-          scene_change_frame_shift = -1 * _FRAME_SHIFT_LARGE
-          logging.debug('Scene light entire capture.')
-  else:  # 3A does not converge.
-    if bright_change_flag:
-      scene_change_frame_shift = _FRAME_SHIFT_SMALL
-      logging.debug('3A does not converge, but brightness changes.')
-    else:
-      scene_change_frame_shift = SCENE_CHANGE_FAIL_CODE
-      logging.error('3A does not converge, and brightness does not change.')
-  if scene_change_frame_shift >= 0:
-    logging.debug('Shift +%d frames.', scene_change_frame_shift)
-  else:
-    logging.debug('Shift %d frames.', scene_change_frame_shift)
-  return scene_change_frame_shift
-
-
-class ItsSessionUtilsTests(unittest.TestCase):
-  """Unit tests for this module."""
-
-  def test_calc_timing_adjustment_shift(self):
-    results = {}
-    expected_results = {'1111': SCENE_CHANGE_PASS_CODE,
-                        '1110': SCENE_CHANGE_PASS_CODE,
-                        '1101': SCENE_CHANGE_FAIL_CODE,
-                        '1100': SCENE_CHANGE_FAIL_CODE,
-                        '1011': -1*_FRAME_SHIFT_SMALL,
-                        '1010': -1*_FRAME_SHIFT_SMALL,
-                        '1001': -1*_FRAME_SHIFT_LARGE,
-                        '1000': _FRAME_SHIFT_LARGE,
-                        '0111': _FRAME_SHIFT_SMALL,
-                        '0110': _FRAME_SHIFT_SMALL,
-                        '0101': SCENE_CHANGE_FAIL_CODE,
-                        '0100': SCENE_CHANGE_FAIL_CODE,
-                        '0011': _FRAME_SHIFT_SMALL,
-                        '0010': _FRAME_SHIFT_SMALL,
-                        '0001': SCENE_CHANGE_FAIL_CODE,
-                        '0000': SCENE_CHANGE_FAIL_CODE,
-                        }
-    converged_list = [1, 0]
-    scene_change_flag_list = [1, 0]
-    bright_change_flag_list = [1, 0]
-    bright_final_list = [1, 0]
-    for converged in converged_list:
-      for scene_flag in scene_change_flag_list:
-        for bright_flag in bright_change_flag_list:
-          for bright_final in bright_final_list:
-            key = f'{converged}{scene_flag}{bright_flag}{bright_final}'
-            results[key] = calc_timing_adjustment(converged, scene_flag,
-                                                  bright_flag, bright_final)
-    self.assertEqual(results, expected_results)
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/apps/CameraITS/utils/sensor_fusion_utils.py b/apps/CameraITS/utils/sensor_fusion_utils.py
index 59f5a60..35c21c4 100644
--- a/apps/CameraITS/utils/sensor_fusion_utils.py
+++ b/apps/CameraITS/utils/sensor_fusion_utils.py
@@ -17,23 +17,32 @@
 import bisect
 import codecs
 import logging
+import math
+import os
 import struct
 import time
 import unittest
 
+import cv2
+from matplotlib import pylab
+import matplotlib.pyplot
 import numpy as np
 import scipy.spatial
 import serial
 from serial.tools import list_ports
 
+import camera_properties_utils
+import image_processing_utils
+
 # Constants for Rotation Rig
 ARDUINO_ANGLE_MAX = 180.0  # degrees
-ARDUINO_ANGLES = [0]*5 +list(range(0, 90, 3)) + [90]*5 +list(range(90, -1, -3))
 ARDUINO_BAUDRATE = 9600
 ARDUINO_CMD_LENGTH = 3
 ARDUINO_CMD_TIME = 2.0 * ARDUINO_CMD_LENGTH / ARDUINO_BAUDRATE  # round trip
-ARDUINO_MOVE_TIME = 0.06 - ARDUINO_CMD_TIME  # seconds
 ARDUINO_PID = 0x0043
+ARDUINO_SERVO_SPEED_MAX = 255
+ARDUINO_SERVO_SPEED_MIN = 1
+ARDUINO_SPEED_START_BYTE = 253
 ARDUINO_START_BYTE = 255
 ARDUINO_START_NUM_TRYS = 3
 ARDUINO_TEST_CMD = (b'\x01', b'\x02', b'\x03')
@@ -53,6 +62,33 @@
 
 HS755HB_ANGLE_MAX = 202.0  # throw for rotation motor in degrees
 
+# From test_sensor_fusion
+_FEATURE_MARGIN = 0.20  # Only take feature points from center 20% so that
+                        # rotation measured has less rolling shutter effect.
+_FEATURE_PTS_MIN = 30  # Min number of feature pts to perform rotation analysis.
+# cv2.goodFeatures to track.
+# 'POSTMASK' is the measurement method in all previous versions of Android.
+# 'POSTMASK' finds best features on entire frame and then masks the features
+# to the vertical center FEATURE_MARGIN for the measurement.
+# 'PREMASK' is a new measurement that is used when FEATURE_PTS_MIN is not
+# found in frame. This finds the best 2*FEATURE_PTS_MIN in the FEATURE_MARGIN
+# part of the frame.
+_CV2_FEATURE_PARAMS_POSTMASK = dict(maxCorners=240,
+                                    qualityLevel=0.3,
+                                    minDistance=7,
+                                    blockSize=7)
+_CV2_FEATURE_PARAMS_PREMASK = dict(maxCorners=2*_FEATURE_PTS_MIN,
+                                   qualityLevel=0.3,
+                                   minDistance=7,
+                                   blockSize=7)
+_GYRO_SAMP_RATE_MIN = 100.0  # Samples/second: min gyro sample rate.
+_CV2_LK_PARAMS = dict(winSize=(15, 15),
+                      maxLevel=2,
+                      criteria=(cv2.TERM_CRITERIA_EPS | cv2.TERM_CRITERIA_COUNT,
+                                10, 0.03))  # cv2.calcOpticalFlowPyrLK params.
+_ROTATION_PER_FRAME_MIN = 0.001  # rads/s
+
+# unittest constants
 _COARSE_FIT_RANGE = 20  # Range area around coarse fit to do optimization.
 _CORR_TIME_OFFSET_MAX = 50  # ms max shift to try and match camera/gyro times.
 _CORR_TIME_OFFSET_STEP = 0.5  # ms step for shifts.
@@ -61,6 +97,9 @@
 _MSEC_TO_NSEC = 1000000
 _NSEC_TO_SEC = 1E-9
 _SEC_TO_NSEC = int(1/_NSEC_TO_SEC)
+_RADS_TO_DEGS = 180/math.pi
+
+_NUM_GYRO_PTS_TO_AVG = 20
 
 
 def serial_port_def(name):
@@ -172,14 +211,14 @@
           for x in cmd]
 
 
-def arduino_rotate_servo_to_angle(ch, angle, serial_port, delay=0):
+def arduino_rotate_servo_to_angle(ch, angle, serial_port, move_time):
   """Rotate servo to the specified angle.
 
   Args:
     ch: str; servo to rotate in ARDUINO_VALID_CH
     angle: int; servo angle to move to
     serial_port: object; serial port
-    delay: int; time in seconds
+    move_time: int; time in seconds
   """
   if angle < 0 or angle > ARDUINO_ANGLE_MAX:
     logging.debug('Angle must be between 0 and %d.', ARDUINO_ANGLE_MAX)
@@ -189,23 +228,26 @@
 
   cmd = [struct.pack('B', i) for i in [ARDUINO_START_BYTE, int(ch), angle]]
   arduino_send_cmd(serial_port, cmd)
-  time.sleep(delay)
+  time.sleep(move_time)
 
 
-def arduino_rotate_servo(ch, serial_port):
-  """Rotate servo between 0 --> 90 --> 0.
+def arduino_rotate_servo(ch, angles, move_time, serial_port):
+  """Rotate servo through 'angles'.
 
   Args:
     ch: str; servo to rotate
+    angles: list of ints; servo angles to move to
+    move_time: int; time required to allow for arduino movement
     serial_port: object; serial port
   """
-  for angle in ARDUINO_ANGLES:
+
+  for angle in angles:
     angle_norm = int(round(angle*ARDUINO_ANGLE_MAX/HS755HB_ANGLE_MAX, 0))
-    arduino_rotate_servo_to_angle(
-        ch, angle_norm, serial_port, ARDUINO_MOVE_TIME)
+    arduino_rotate_servo_to_angle(ch, angle_norm, serial_port, move_time)
 
 
-def rotation_rig(rotate_cntl, rotate_ch, num_rotations):
+def rotation_rig(rotate_cntl, rotate_ch, num_rotations, angles, servo_speed,
+                 move_time):
   """Rotate the phone n times using rotate_cntl and rotate_ch defined.
 
   rotate_ch is hard wired and must be determined from physical setup.
@@ -217,6 +259,9 @@
     rotate_cntl: str to identify as 'arduino' or 'canakit' controller.
     rotate_ch: str to identify rotation channel number.
     num_rotations: int number of rotations.
+    angles: list of ints; servo angle to move to.
+    servo_speed: int number of move speed between [1, 255].
+    move_time: int time required to allow for arduino movement.
   """
 
   logging.debug('Controller: %s, ch: %s', rotate_cntl, rotate_ch)
@@ -231,6 +276,9 @@
     logging.debug('Moving servo to origin')
     arduino_rotate_servo_to_angle(rotate_ch, 0, arduino_serial_port, 1)
 
+    # set servo speed
+    set_servo_speed(rotate_ch, servo_speed, arduino_serial_port, delay=0)
+
   elif rotate_cntl.lower() == 'canakit':
     canakit_serial_port = serial_port_def('Canakit')
 
@@ -241,11 +289,58 @@
   logging.debug('Rotating phone %dx', num_rotations)
   for _ in range(num_rotations):
     if rotate_cntl == 'arduino':
-      arduino_rotate_servo(rotate_ch, arduino_serial_port)
+      arduino_rotate_servo(rotate_ch, angles, move_time, arduino_serial_port)
     elif rotate_cntl == 'canakit':
       canakit_set_relay_channel_state(canakit_serial_port, rotate_ch, 'ON')
       canakit_set_relay_channel_state(canakit_serial_port, rotate_ch, 'OFF')
   logging.debug('Finished rotations')
+  if rotate_cntl == 'arduino':
+    logging.debug('Moving servo to origin')
+    arduino_rotate_servo_to_angle(rotate_ch, 0, arduino_serial_port, 1)
+
+
+def set_servo_speed(ch, servo_speed, serial_port, delay=0):
+  """Set servo to specified speed.
+
+  Args:
+    ch: str; servo to turn on in ARDUINO_VALID_CH
+    servo_speed: int; value of speed between 1 and 255
+    serial_port: object; serial port
+    delay: int; time in seconds
+  """
+  logging.debug('Servo speed: %d', servo_speed)
+  if servo_speed < ARDUINO_SERVO_SPEED_MIN:
+    logging.debug('Servo speed must be >= %d.', ARDUINO_SERVO_SPEED_MIN)
+    servo_speed = ARDUINO_SERVO_SPEED_MIN
+  elif servo_speed > ARDUINO_SERVO_SPEED_MAX:
+    logging.debug('Servo speed must be <= %d.', ARDUINO_SERVO_SPEED_MAX)
+    servo_speed = ARDUINO_SERVO_SPEED_MAX
+
+  cmd = [struct.pack('B', i) for i in [ARDUINO_SPEED_START_BYTE,
+                                       int(ch), servo_speed]]
+  arduino_send_cmd(serial_port, cmd)
+  time.sleep(delay)
+
+
+def calc_max_rotation_angle(rotations, sensor_type):
+  """Calculates the max angle of deflection from rotations.
+
+  Args:
+    rotations: numpy array of rotation per event
+    sensor_type: string 'Camera' or 'Gyro'
+
+  Returns:
+    maximum angle of rotation for the given rotations
+  """
+  rotations *= _RADS_TO_DEGS
+  rotations_sum = np.cumsum(rotations)
+  rotation_max = max(rotations_sum)
+  rotation_min = min(rotations_sum)
+  logging.debug('%s min: %.2f, max %.2f rotation (degrees)',
+                sensor_type, rotation_min, rotation_max)
+  logging.debug('%s max rotation: %.2f degrees',
+                sensor_type, (rotation_max-rotation_min))
+  return rotation_max-rotation_min
 
 
 def get_gyro_rotations(gyro_events, cam_times):
@@ -306,6 +401,126 @@
   return gyro_rots
 
 
+def procrustes_rotation(x, y):
+  """Performs a Procrustes analysis to conform points in x to y.
+
+  Procrustes analysis determines a linear transformation (translation,
+  reflection, orthogonal rotation and scaling) of the points in y to best
+  conform them to the points in matrix x, using the sum of squared errors
+  as the metric for fit criterion.
+
+  Args:
+    x: Target coordinate matrix
+    y: Input coordinate matrix
+
+  Returns:
+    The rotation component of the transformation that maps x to y.
+  """
+  x0 = (x-x.mean(0)) / np.sqrt(((x-x.mean(0))**2.0).sum())
+  y0 = (y-y.mean(0)) / np.sqrt(((y-y.mean(0))**2.0).sum())
+  u, _, vt = np.linalg.svd(np.dot(x0.T, y0), full_matrices=False)
+  return np.dot(vt.T, u.T)
+
+
+def get_cam_rotations(frames, facing, h, file_name_stem, start_frame):
+  """Get the rotations of the camera between each pair of frames.
+
+  Takes N frames and returns N-1 angular displacements corresponding to the
+  rotations between adjacent pairs of frames, in radians.
+  Only takes feature points from center so that rotation measured has less
+  rolling shutter effect.
+  Requires FEATURE_PTS_MIN to have enough data points for accurate measurements.
+  Uses FEATURE_PARAMS for cv2 to identify features in checkerboard images.
+  Ensures camera rotates enough.
+
+  Args:
+    frames: List of N images (as RGB numpy arrays).
+    facing: Direction camera is facing.
+    h: Pixel height of each frame.
+    file_name_stem: file name stem including location for data.
+    start_frame: int; index to start at
+
+  Returns:
+    numpy array of N-1 camera rotation measurements (rad).
+  """
+  gframes = []
+  for frame in frames:
+    frame = (frame * 255.0).astype(np.uint8)  # cv2 uses [0, 255]
+    gframes.append(cv2.cvtColor(frame, cv2.COLOR_RGB2GRAY))
+  num_frames = len(gframes)
+  logging.debug('num_frames: %d', num_frames)
+  # create mask
+  ymin = int(h * (1 - _FEATURE_MARGIN) / 2)
+  ymax = int(h * (1 + _FEATURE_MARGIN) / 2)
+  pre_mask = np.zeros_like(gframes[0])
+  pre_mask[ymin:ymax, :] = 255
+
+  for masking in ['post', 'pre']:  # Do post-masking (original) method 1st
+    logging.debug('Using %s masking method', masking)
+    rotations = []
+    for i in range(1, num_frames):
+      j = i - 1
+      gframe0 = gframes[j]
+      gframe1 = gframes[i]
+      if masking == 'post':
+        p0 = cv2.goodFeaturesToTrack(
+            gframe0, mask=None, **_CV2_FEATURE_PARAMS_POSTMASK)
+        post_mask = (p0[:, 0, 1] >= ymin) & (p0[:, 0, 1] <= ymax)
+        p0_filtered = p0[post_mask]
+      else:
+        p0_filtered = cv2.goodFeaturesToTrack(
+            gframe0, mask=pre_mask, **_CV2_FEATURE_PARAMS_PREMASK)
+      num_features = len(p0_filtered)
+      if num_features < _FEATURE_PTS_MIN:
+        for pt in np.rint(p0_filtered).astype(int):
+          x, y = pt[0][0], pt[0][1]
+          cv2.circle(frames[j], (x, y), 3, (100, 255, 255), -1)
+        image_processing_utils.write_image(
+            frames[j], f'{file_name_stem}_features{j+start_frame:03d}.png')
+        msg = (f'Not enough features in frame {j+start_frame}. Need at least '
+               f'{_FEATURE_PTS_MIN} features, got {num_features}.')
+        if masking == 'pre':
+          raise AssertionError(msg)
+        else:
+          logging.debug(msg)
+          break
+      else:
+        logging.debug('Number of features in frame %s is %d',
+                      str(j+start_frame).zfill(3), num_features)
+      p1, st, _ = cv2.calcOpticalFlowPyrLK(gframe0, gframe1, p0_filtered, None,
+                                           **_CV2_LK_PARAMS)
+      tform = procrustes_rotation(p0_filtered[st == 1], p1[st == 1])
+      if facing == camera_properties_utils.LENS_FACING_BACK:
+        rotation = -math.atan2(tform[0, 1], tform[0, 0])
+      elif facing == camera_properties_utils.LENS_FACING_FRONT:
+        rotation = math.atan2(tform[0, 1], tform[0, 0])
+      else:
+        raise AssertionError(f'Unknown lens facing: {facing}.')
+      rotations.append(rotation)
+      if i == 1:
+        # Save debug visualization of features that are being
+        # tracked in the first frame.
+        frame = frames[j]
+        for x, y in np.rint(p0_filtered[st == 1]).astype(int):
+          cv2.circle(frame, (x, y), 3, (100, 255, 255), -1)
+        image_processing_utils.write_image(
+            frame, f'{file_name_stem}_features{j+start_frame:03d}.png')
+    if i == num_frames-1:
+      logging.debug('Correct num of frames found: %d', i)
+      break  # exit if enough features in all frames
+  if i != num_frames-1:
+    raise AssertionError('Neither method found enough features in all frames')
+
+  rotations = np.array(rotations)
+  rot_per_frame_max = max(abs(rotations))
+  logging.debug('Max rotation in frame: %.2f degrees',
+                rot_per_frame_max*_RADS_TO_DEGS)
+  if rot_per_frame_max < _ROTATION_PER_FRAME_MIN:
+    raise AssertionError(f'Device not moved enough: {rot_per_frame_max:.3f} '
+                         f'movement. THRESH: {_ROTATION_PER_FRAME_MIN} rads.')
+  return rotations
+
+
 def get_best_alignment_offset(cam_times, cam_rots, gyro_events):
   """Find the best offset to align the camera and gyro motion traces.
 
@@ -367,6 +582,53 @@
   return exact_best_shift, fit_coeffs, shift_candidates, spatial_distances
 
 
+def plot_gyro_events(gyro_events, plot_name, log_path):
+  """Plot x, y, and z on the gyro events.
+
+  Samples are grouped into NUM_GYRO_PTS_TO_AVG groups and averaged to minimize
+  random spikes in data.
+
+  Args:
+    gyro_events: List of gyroscope events.
+    plot_name:  name of plot(s).
+    log_path: location to save data.
+  """
+
+  nevents = (len(gyro_events) // _NUM_GYRO_PTS_TO_AVG) * _NUM_GYRO_PTS_TO_AVG
+  gyro_events = gyro_events[:nevents]
+  times = np.array([(e['time'] - gyro_events[0]['time']) * _NSEC_TO_SEC
+                    for e in gyro_events])
+  x = np.array([e['x'] for e in gyro_events])
+  y = np.array([e['y'] for e in gyro_events])
+  z = np.array([e['z'] for e in gyro_events])
+
+  # Group samples into size-N groups & average each together to minimize random
+  # spikes in data.
+  times = times[_NUM_GYRO_PTS_TO_AVG//2::_NUM_GYRO_PTS_TO_AVG]
+  x = x.reshape(nevents//_NUM_GYRO_PTS_TO_AVG, _NUM_GYRO_PTS_TO_AVG).mean(1)
+  y = y.reshape(nevents//_NUM_GYRO_PTS_TO_AVG, _NUM_GYRO_PTS_TO_AVG).mean(1)
+  z = z.reshape(nevents//_NUM_GYRO_PTS_TO_AVG, _NUM_GYRO_PTS_TO_AVG).mean(1)
+
+  pylab.figure(plot_name)
+  # x & y on same axes
+  pylab.subplot(2, 1, 1)
+  pylab.title(f'{plot_name}(mean of {_NUM_GYRO_PTS_TO_AVG} pts)')
+  pylab.plot(times, x, 'r', label='x')
+  pylab.plot(times, y, 'g', label='y')
+  pylab.ylim([np.amin(z), np.amax(z)])
+  pylab.ylabel('gyro x,y movement (rads/s)')
+  pylab.legend()
+
+  # z on separate axes
+  pylab.subplot(2, 1, 2)
+  pylab.plot(times, z, 'b', label='z')
+  pylab.xlabel('time (seconds)')
+  pylab.ylabel('gyro z movement (rads/s)')
+  pylab.legend()
+  file_name = os.path.join(log_path, plot_name)
+  matplotlib.pyplot.savefig(f'{file_name}_gyro_events.png')
+
+
 class SensorFusionUtilsTests(unittest.TestCase):
   """Run a suite of unit tests on this module."""
 
diff --git a/apps/CameraITS/utils/target_exposure_utils.py b/apps/CameraITS/utils/target_exposure_utils.py
index 279b5ea..65e53ec 100644
--- a/apps/CameraITS/utils/target_exposure_utils.py
+++ b/apps/CameraITS/utils/target_exposure_utils.py
@@ -69,71 +69,71 @@
 
     # Combo 1: smallest legal exposure time.
     e1_expt = exp_time_range[0]
-    e1_sens = exposure / e1_expt
+    e1_sens = int(exposure / e1_expt)
     if e1_sens > sens_range[1]:
       e1_sens = sens_range[1]
-      e1_expt = exposure / e1_sens
-    e1_logging = (f'e1 exp: {e1_expt}, sens: {e1_sens}')
+      e1_expt = int(exposure / e1_sens)
+    e1_logging = (f'MinExp exp: {e1_expt}, sens: {e1_sens}')
     logging.debug('%s', e1_logging)
 
     # Combo 2: largest legal exposure time.
     e2_expt = exp_time_range[1]
-    e2_sens = exposure / e2_expt
+    e2_sens = int(exposure / e2_expt)
     if e2_sens < sens_range[0]:
       e2_sens = sens_range[0]
-      e2_expt = exposure / e2_sens
-    e2_logging = (f'e2 exp: {e2_expt}, sens: {e2_sens}')
+      e2_expt = int(exposure / e2_sens)
+    e2_logging = (f'MaxExp exp: {e2_expt}, sens: {e2_sens}')
     logging.debug('%s', e2_logging)
 
     # Combo 3: smallest legal sensitivity.
     e3_sens = sens_range[0]
-    e3_expt = exposure / e3_sens
+    e3_expt = int(exposure / e3_sens)
     if e3_expt > exp_time_range[1]:
       e3_expt = exp_time_range[1]
-      e3_sens = exposure / e3_expt
-    e3_logging = (f'e3 exp: {e3_expt}, sens: {e3_sens}')
+      e3_sens = int(exposure / e3_expt)
+    e3_logging = (f'MinISO exp: {e3_expt}, sens: {e3_sens}')
     logging.debug('%s', e3_logging)
 
     # Combo 4: largest legal sensitivity.
     e4_sens = sens_range[1]
-    e4_expt = exposure / e4_sens
+    e4_expt = int(exposure / e4_sens)
     if e4_expt < exp_time_range[0]:
       e4_expt = exp_time_range[0]
-      e4_sens = exposure / e4_expt
-    e4_logging = (f'e4 exp: {e4_expt}, sens: {e4_sens}')
+      e4_sens = int(exposure / e4_expt)
+    e4_logging = (f'MaxISO exp: {e4_expt}, sens: {e4_sens}')
     logging.debug('%s', e4_logging)
 
     # Combo 5: middle exposure time.
-    e5_expt = (exp_time_range[0] + exp_time_range[1]) / 2.0
-    e5_sens = exposure / e5_expt
+    e5_expt = int((exp_time_range[0] + exp_time_range[1]) / 2.0)
+    e5_sens = int(exposure / e5_expt)
     if e5_sens > sens_range[1]:
       e5_sens = sens_range[1]
-      e5_expt = exposure / e5_sens
+      e5_expt = int(exposure / e5_sens)
     if e5_sens < sens_range[0]:
       e5_sens = sens_range[0]
-      e5_expt = exposure / e5_sens
-    e5_logging = (f'e5 exp: {e5_expt}, sens: {e5_sens}')
+      e5_expt = int(exposure / e5_sens)
+    e5_logging = (f'MidExp exp: {e5_expt}, sens: {e5_sens}')
     logging.debug('%s', e5_logging)
 
     # Combo 6: middle sensitivity.
-    e6_sens = (sens_range[0] + sens_range[1]) / 2.0
-    e6_expt = exposure / e6_sens
+    e6_sens = int((sens_range[0] + sens_range[1]) / 2.0)
+    e6_expt = int(exposure / e6_sens)
     if e6_expt > exp_time_range[1]:
       e6_expt = exp_time_range[1]
-      e6_sens = exposure / e6_expt
+      e6_sens = int(exposure / e6_expt)
     if e6_expt < exp_time_range[0]:
       e6_expt = exp_time_range[0]
-      e6_sens = exposure / e6_expt
-    e6_logging = (f'e6 exp: {e6_expt}, sens: {e6_sens}')
+      e6_sens = int(exposure / e6_expt)
+    e6_logging = (f'MidISO exp: {e6_expt}, sens: {e6_sens}')
     logging.debug('%s', e6_logging)
 
     return {
-        'minExposureTime': (int(e1_expt), int(e1_sens)),
-        'maxExposureTime': (int(e2_expt), int(e2_sens)),
-        'minSensitivity': (int(e3_expt), int(e3_sens)),
-        'maxSensitivity': (int(e4_expt), int(e4_sens)),
-        'midExposureTime': (int(e5_expt), int(e5_sens)),
-        'midSensitivity': (int(e6_expt), int(e6_sens))
+        'minExposureTime': (e1_expt, e1_sens),
+        'maxExposureTime': (e2_expt, e2_sens),
+        'minSensitivity': (e3_expt, e3_sens),
+        'maxSensitivity': (e4_expt, e4_sens),
+        'midExposureTime': (e5_expt, e5_sens),
+        'midSensitivity': (e6_expt, e6_sens)
     }
 
 
diff --git a/apps/CameraITS/utils/video_processing_utils.py b/apps/CameraITS/utils/video_processing_utils.py
new file mode 100644
index 0000000..f862c59
--- /dev/null
+++ b/apps/CameraITS/utils/video_processing_utils.py
@@ -0,0 +1,95 @@
+# Copyright 2022 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.
+"""Utility functions for processing video recordings.
+"""
+# Each item in this list corresponds to quality levels defined per
+# CamcorderProfile. For Video ITS, we will currently test below qualities
+# only if supported by the camera device.
+import logging
+import os.path
+import subprocess
+import time
+
+
+ITS_SUPPORTED_QUALITIES = (
+    'HIGH',
+    '2160P',
+    '1080P',
+    '720P',
+    '480P',
+    'CIF',
+    'QCIF',
+    'QVGA',
+    'LOW',
+    'VGA'
+)
+
+
+def extract_key_frames_from_video(log_path, mp4_file_name):
+  """
+  Returns a list of extracted key frames.
+
+  Ffmpeg tool is used to extract key frames from the video at path
+  os.path.join(log_path, mp4_file_name).
+  The extracted key frames will have the name mp4_file_name with "_key_frame"
+  suffix to identify the frames for video of each quality.Since there can be
+  multiple key frames, each key frame image will be differentiated with it's
+  frame index.All the extracted key frames will be available in  jpeg format
+  at the same path as the video file.
+
+  Args:
+    log_path: path for video file directory
+    mp4_file_name: name of the file in mp4 format.
+    Ex: VID_20220325_050918_0_CIF_352x288.mp4
+  Returns:
+    key_frame_files: A list of paths for each key frame extracted from the
+    video.
+  """
+  ffmpeg_image_name = f"{mp4_file_name.split('.')[0]}_key_frame"
+  ffmpeg_image_file_path = os.path.join(log_path, ffmpeg_image_name + '_%02d.png')
+  cmd = ['ffmpeg',
+    '-skip_frame',
+    'nokey',
+    '-i',
+    os.path.join(log_path, mp4_file_name),
+    '-vsync',
+    'vfr',
+    '-frame_pts',
+    'true' ,
+    ffmpeg_image_file_path,
+  ]
+  logging.debug('Extracting key frames for: %s' % mp4_file_name)
+  output = subprocess.call(cmd)
+  arr = os.listdir(os.path.join(log_path))
+  key_frame_files = []
+  for file in arr:
+    if '.png' in file and not os.path.isdir(file) and ffmpeg_image_name in file:
+      key_frame_files.append(file)
+  return key_frame_files
+
+
+def get_key_frame_to_process(key_frame_files):
+  """
+  Returns the key frame file from the list of key_frame_files.
+
+  If the size of the list is 1 then the file in the list will be returned else
+  the file with highest frame_index will be returned for further processing.
+
+  Args:
+    key_frame_files: A list of key frame files.
+  Returns:
+    key_frame_file to be used for further processing.
+  """
+  key_frame_files.sort()
+  return key_frame_files[-1]
diff --git a/apps/CtsVerifier/Android.bp b/apps/CtsVerifier/Android.bp
index 628f234..ed16951 100644
--- a/apps/CtsVerifier/Android.bp
+++ b/apps/CtsVerifier/Android.bp
@@ -20,7 +20,7 @@
         "cts_apps_CtsVerifier_opencv_license",
         "Android-Apache-2.0",
         "cts_apps_CtsVerifier_fatcow_license",
-    ]
+    ],
 }
 
 license {
@@ -50,12 +50,9 @@
     srcs: ["src/com/android/cts/verifier/vr/MockVrListenerService.java"],
 }
 
-android_test {
-    name: "CtsVerifier",
+android_library {
+    name: "CtsVerifierLibT",
     defaults: ["cts_error_prone_rules_tests"],
-    additional_manifests: ["AndroidManifest-common.xml"],
-
-    compile_multilib: "both",
 
     srcs: [
         "src/**/*.java",
@@ -88,20 +85,13 @@
         "androidx.legacy_legacy-support-v4",
         "CtsForceStopHelper-constants",
         "ctsmediautil",
-        "DpmWrapper"
+        "DpmWrapper",
     ],
 
-    libs: ["telephony-common"] + ["android.test.runner.stubs"] + ["android.test.base.stubs"] + ["android.test.mock.stubs"] + ["android.car"] + ["voip-common"] + ["truth-prebuilt"],
+    libs: ["telephony-common"] + ["android.test.runner.stubs"] + ["android.test.base.stubs"] + ["android.test.mock.stubs"] + ["android.car-test-stubs"] + ["voip-common"] + ["truth-prebuilt"],
 
     platform_apis: true,
 
-    jni_libs: [
-        "libctsverifier_jni",
-        "libctsnativemidi_jni",
-        "libaudioloopback_jni",
-        "libmegaaudio_jni",
-    ],
-
     optimize: {
         proguard_flags_files: ["proguard.flags"],
     },
@@ -111,6 +101,24 @@
     },
 }
 
+android_test {
+    name: "CtsVerifier",
+    static_libs: [
+        "CtsVerifierLibT"
+    ],
+
+    compile_multilib: "both",
+
+    manifest: "AndroidManifest-verifierConfig.xml",
+
+    jni_libs: [
+        "libctsverifier_jni",
+        "libctsnativemidi_jni",
+        "libaudioloopback_jni",
+        "libmegaaudio_jni",
+    ],
+}
+
 // opencv library
 java_import {
     name: "ctsverifier-opencv",
@@ -162,6 +170,8 @@
 filegroup {
     name: "other_required_apps",
     srcs: [
+        ":CtsCarWatchdogCompanionApp",
+        ":CtsTileServiceApp",
         ":CtsVerifierUSBCompanion",
         ":CtsVpnFirewallAppApi23",
         ":CtsVpnFirewallAppApi24",
@@ -170,7 +180,7 @@
 }
 
 filegroup {
-    name: "apps_to_include",
+    name: "cts_apps_to_include",
     srcs: [
         ":pre_installed_apps",
         ":pre_installed_instant_app",
@@ -190,7 +200,7 @@
 genrule {
     name: "android-cts-verifier",
     srcs: [
-        ":apps_to_include",
+        ":cts_apps_to_include",
         ":CtsVerifier",
         ":camera-its",
     ],
@@ -199,7 +209,7 @@
         "merge_zips",
     ],
     out: ["android-cts-verifier.zip"],
-    cmd: "echo $(locations :apps_to_include) $(location :CtsVerifier) > $(genDir)/list &&" +
+    cmd: "echo $(locations :cts_apps_to_include) $(location :CtsVerifier) > $(genDir)/list &&" +
         " $(location soong_zip) -o $(genDir)/cts-verifier.zip -j -P android-cts-verifier -l $(genDir)/list &&" +
         " $(location merge_zips) $(out) $(genDir)/cts-verifier.zip $(location :camera-its)",
     dists: [
diff --git a/apps/CtsVerifier/AndroidManifest-common.xml b/apps/CtsVerifier/AndroidManifest-common.xml
deleted file mode 100644
index d14d8e2..0000000
--- a/apps/CtsVerifier/AndroidManifest-common.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2021 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.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.cts.verifier">
-
-    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="30"/>
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
-
-    <application android:networkSecurityConfig="@xml/network_security_config"
-                 android:label="@string/app_name"
-                 android:icon="@drawable/icon"
-                 android:debuggable="true"
-                 android:largeHeap="true"
-                 android:requestLegacyExternalStorage="true"
-                 android:allowBackup="false"
-                 android:theme="@android:style/Theme.DeviceDefault">
-
-        <meta-data android:name="android.telephony.HIDE_VOICEMAIL_SETTINGS_MENU"
-                   android:value="true"/>
-
-        <activity android:name=".TestListActivity" android:label="@string/app_name" />
-
-        <activity android:name=".ReportViewerActivity"
-                  android:configChanges="keyboardHidden|orientation|screenSize"
-                  android:label="@string/report_viewer" />
-    </application>
-
-    <queries>
-        <!-- Rotation Vector CV Crosscheck (RVCVXCheckTestActivity) relies on OpenCV Manager -->
-        <package android:name="org.opencv.engine" />
-    </queries>
-</manifest>
diff --git a/apps/CtsVerifier/AndroidManifest-verifierConfig.xml b/apps/CtsVerifier/AndroidManifest-verifierConfig.xml
new file mode 100644
index 0000000..88db3f4
--- /dev/null
+++ b/apps/CtsVerifier/AndroidManifest-verifierConfig.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.cts.verifier">
+
+<application>
+    <meta-data android:name="SuiteName" android:value="CTS_VERIFIER" />
+
+    <provider android:name=".TestResultsProvider"
+              android:authorities="com.android.cts.verifier.testresultsprovider"
+              android:grantUriPermissions="true"
+              android:exported="true"
+              android:enabled="true" />
+</application>
+</manifest>
diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index c4ee0e1..66c1d2f 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -48,8 +48,10 @@
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
     <uses-permission android:name="android.permission.REQUEST_PASSWORD_COMPLEXITY" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <uses-feature android:name="android.hardware.camera" android:required="false"/>
     <uses-feature android:name="android.hardware.camera.flash" android:required="false"/>
     <uses-feature android:name="android.hardware.sensor.accelerometer" android:required="false" />
@@ -76,6 +78,7 @@
     <uses-permission android:name="android.permission.USE_BIOMETRIC"/>
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATION_POLICY" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <uses-permission android:name="android.permission.READ_SMS"/>
     <uses-permission android:name="android.permission.READ_PHONE_NUMBERS"/>
@@ -86,6 +89,9 @@
     <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+
     <!-- Needed for CompaionDeviceAwakeTestActivity test. -->
     <uses-permission android:name="android.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE" />
 
@@ -97,15 +103,23 @@
     <!-- Needed for sensor tests -->
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
 
-    <application>
+    <!-- Needed for Wi-Fi Direct tests from T -->
+    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" />
 
-        <meta-data android:name="SuiteName" android:value="CTS_VERIFIER" />
+    <!-- READ_LOGS User Consent Test from T -->
+    <uses-permission android:name="android.permission.READ_LOGS" />
 
-        <provider android:name=".TestResultsProvider"
-                android:authorities="com.android.cts.verifier.testresultsprovider"
-                android:grantUriPermissions="true"
-                android:exported="true"
-                android:enabled="true" />
+    <application android:networkSecurityConfig="@xml/network_security_config"
+                 android:label="@string/app_name"
+                 android:icon="@drawable/icon"
+                 android:debuggable="true"
+                 android:largeHeap="true"
+                 android:requestLegacyExternalStorage="true"
+                 android:allowBackup="false"
+                 android:theme="@android:style/Theme.DeviceDefault">
+
+        <meta-data android:name="android.telephony.HIDE_VOICEMAIL_SETTINGS_MENU"
+                   android:value="true"/>
 
         <activity android:name=".admin.PolicySerializationTestActivity"
                 android:label="@string/da_policy_serialization_test"
@@ -187,6 +201,9 @@
             <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive:android.hardware.type.watch" />
             <meta-data android:name="display_mode"
                        android:value="multi_display_mode" />
+            <meta-data android:name="CddTest"
+                       android:value="2.2.4/8.3/H-1-1|2.3.4/8.3/T-1-1|2.4.4/8.3/W-SR|8.3/C-SR" />
+            <meta-data android:name="ApiTest" android:value="android.os.PowerManager#isPowerSaveMode" />
         </activity>
 
         <activity
@@ -201,6 +218,9 @@
             <meta-data android:name="test_category" android:value="@string/test_category_other" />
             <meta-data android:name="test_excluded_features" android:value="android.hardware.type.automotive:android.hardware.type.television" />
             <meta-data android:name="display_mode" android:value="multi_display_mode" />
+            <meta-data android:name="CddTest" android:value="8.3/C-1-6" />
+            <meta-data android:name="ApiTest"
+                       android:value="android.os.PowerManager#isIgnoringBatteryOptimizations|android.app.usage.UsageStatsManager#getAppStandbyBucket|android.provider.Settings#ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS|android.provider.Settings#ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
         </activity>
 
         <activity android:name=".forcestop.RecentTaskRemovalTestActivity"
@@ -217,6 +237,21 @@
                        android:value="multi_display_mode" />
         </activity>
 
+        <activity android:name=".clipboard.ClipboardPreviewTestActivity"
+                  android:label="@string/clipboard_preview_test"
+                  android:exported="true"
+                  android:configChanges="keyboardHidden|orientation|screenSize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.cts.intent.category.MANUAL_TEST" />
+            </intent-filter>
+            <meta-data android:name="test_category" android:value="@string/test_category_features" />
+            <meta-data android:name="test_excluded_features"
+                       android:value="android.hardware.type.watch:android.software.leanback:android.hardware.type.automotive" />
+            <meta-data android:name="display_mode"
+                       android:value="multi_display_mode" />
+        </activity>
+
         <activity android:name=".companion.CompanionDeviceTestActivity"
                   android:label="@string/companion_test"
                   android:exported="true"
@@ -1972,14 +2007,16 @@
             <meta-data android:name="test_excluded_features"
                     android:value="android.hardware.type.watch" />
             <meta-data android:name="display_mode" android:value="single_display_mode" />
+            <meta-data android:name="CddTest" android:value="5.7/C-1-1,C-1-2,C-1-3" />
         </activity>
 
         <activity android:name=".streamquality.PlayVideoActivity"
                 android:label="@string/streaming_video"
                 android:configChanges="keyboardHidden|orientation|screenSize"
                 android:screenOrientation="nosensor" >
-                <meta-data android:name="display_mode"
-                           android:value="multi_display_mode" />
+            <meta-data android:name="display_mode"
+                        android:value="multi_display_mode" />
+            <meta-data android:name="CddTest" android:value="5.7/C-1-1,C-1-2,C-1-3" />
         </activity>
 
         <!-- FeatureSummaryActivity is replaced by CTS SystemFeaturesTest
@@ -2912,6 +2949,7 @@
                     android:value="android.hardware.type.watch" />
             <meta-data android:name="display_mode"
                        android:value="multi_display_mode" />
+            <meta-data android:name="CddTest" android:value="7.7.1/H-1-1" />
         </activity>
 
         <activity android:name=".usb.accessory.AccessoryAttachmentHandler"
@@ -2941,6 +2979,9 @@
                     android:value="android.hardware.type.watch" />
             <meta-data android:name="display_mode"
                        android:value="multi_display_mode" />
+            <meta-data android:name="CddTest" android:value="7.7.2/C-1-1" />
+            <meta-data android:name="ApiTest"
+                       android:value="android.hardware.usb.UsbDeviceConnection#controlTransfer|android.hardware.usb.UsbDeviceConnection#bulkTransfer" />
         </activity>
 
         <activity android:name=".usb.mtp.MtpHostTestActivity" android:label="@string/mtp_host_test"
@@ -2955,6 +2996,7 @@
                        android:value="android.hardware.type.automotive:android.hardware.type.television" />
             <meta-data android:name="display_mode"
                        android:value="multi_display_mode" />
+            <meta-data android:name="CddTest" android:value="7.7.2/C-3-1" />
         </activity>
 
 <!-- Turned off Sensor Power Test in initial L release
@@ -2983,6 +3025,7 @@
             <meta-data android:name="test_required_features" android:value="android.hardware.wifi.direct" />
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="NonApiTest" android:value="Helper class. List test activities" />
         </activity>
 
         <activity android:name=".managedprovisioning.RecentsRedactionActivity"
@@ -3048,6 +3091,7 @@
                 <category android:name="android.cts.intent.category.MANUAL_TEST" />
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_notifications" />
+            <meta-data android:name="test_required_features" android:value="android.software.secure_lock_screen" />
             <meta-data android:name="test_excluded_features"
                        android:value="android.hardware.type.automotive" />
             <meta-data android:name="display_mode" android:value="multi_display_mode" />
@@ -3161,6 +3205,22 @@
                        android:value="multi_display_mode" />
         </activity>
 
+        <activity android:name=".notifications.MediaPlayerVerifierActivity"
+                  android:label="@string/media_controls_title"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.cts.intent.category.MANUAL_TEST" />
+            </intent-filter>
+
+            <meta-data android:name="test_category"
+                       android:value="@string/test_category_notifications" />
+            <meta-data android:name="test_excluded_features"
+                       android:value="android.hardware.type.watch:android.software.leanback:android.hardware.type.automotive" />
+            <meta-data android:name="display_mode"
+                       android:value="multi_display_mode" />
+        </activity>
+
         <service android:name=".notifications.MockListener"
           android:exported="true"
           android:label="@string/nls_service_name"
@@ -3169,7 +3229,7 @@
                 <action android:name="android.service.notification.NotificationListenerService" />
             </intent-filter>
             <meta-data android:name="android.service.notification.default_filter_types"
-                       android:value="alerting|silent" />
+                       android:value="conversations|alerting|silent" />
             <meta-data android:name="android.service.notification.disabled_filter_types"
                        android:value="ongoing" />
         </service>
@@ -3211,13 +3271,30 @@
             <meta-data android:name="test_required_configs" android:value="config_quick_settings_supported" />
             <meta-data android:name="display_mode"
                        android:value="multi_display_mode" />
+            <meta-data android:name="CddTest" android:value="3.13/C-1-1,C-1-2,C-1-3" />
+        </activity>
+
+        <activity android:name=".qstiles.TileServiceRequestVerifierActivity"
+                  android:exported="true"
+                  android:label="@string/tiles_request_test">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.cts.intent.category.MANUAL_TEST" />
+            </intent-filter>
+            <meta-data android:name="test_category" android:value="@string/test_category_tiles" />
+            <meta-data android:name="test_excluded_features"
+                       android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.watch:android.hardware.type.automotive" />
+            <meta-data android:name="test_required_configs" android:value="config_quick_settings_supported" />
+            <meta-data android:name="display_mode"
+                       android:value="multi_display_mode" />
+            <meta-data android:name="ApiTest" android:value="android.app.StatusBarManager#requestAddTileService" />
         </activity>
 
         <service android:name=".qstiles.MockTileService"
                  android:icon="@android:drawable/ic_dialog_alert"
                  android:label="@string/tile_service_name"
                  android:enabled="false"
-                  android:exported="true"
+                 android:exported="true"
                  android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE" />
@@ -3432,6 +3509,7 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="NonApiTest" android:value="Helper class. List test activities" />
         </activity>
 
         <activity android:name=".p2p.GoNegRequesterTestActivity"
@@ -3439,6 +3517,8 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="ApiTest"
+                    android:value="android.net.wifi.p2p.WifiP2pManager#connect|android.net.wifi.p2p.WifiP2pManager#discoverPeers" />
         </activity>
 
         <activity android:name=".p2p.GoNegResponderTestActivity"
@@ -3446,6 +3526,8 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="ApiTest"
+                    android:value="android.net.wifi.p2p.WifiP2pManager#discoverPeers" />
         </activity>
 
         <activity android:name=".p2p.P2pClientTestListActivity"
@@ -3453,6 +3535,7 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="NonApiTest" android:value="Helper class. List test activities" />
         </activity>
 
         <activity android:name=".p2p.P2pClientTestActivity"
@@ -3460,6 +3543,8 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="ApiTest"
+                    android:value="android.net.wifi.p2p.WifiP2pManager#connect|android.net.wifi.p2p.WifiP2pManager#discoverPeers" />
         </activity>
 
         <activity android:name=".p2p.GoTestActivity"
@@ -3467,6 +3552,8 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="ApiTest"
+                    android:value="android.net.wifi.p2p.WifiP2pManager#createGroup|android.net.wifi.p2p.WifiP2pManager#removeGroup" />
         </activity>
 
         <activity android:name=".p2p.P2pClientWithConfigTestListActivity"
@@ -3474,6 +3561,7 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="NonApiTest" android:value="Helper class. List test activities" />
         </activity>
 
         <activity android:name=".p2p.P2pClientWithConfig2gBandTestListActivity"
@@ -3481,6 +3569,7 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="NonApiTest" android:value="Helper class. List test activities" />
         </activity>
 
         <activity android:name=".p2p.P2pClientWithConfigFixedFrequencyTestListActivity"
@@ -3488,6 +3577,7 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="NonApiTest" android:value="Helper class. List test activities" />
         </activity>
 
         <activity android:name=".p2p.P2pClientWithConfigTestActivity"
@@ -3495,6 +3585,8 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="ApiTest"
+                    android:value="android.net.wifi.p2p.WifiP2pManager#connect|android.net.wifi.p2p.WifiP2pManager#discoverPeers" />
         </activity>
 
         <activity android:name=".p2p.P2pClientWithConfig2gBandTestActivity"
@@ -3502,6 +3594,8 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="ApiTest"
+                    android:value="android.net.wifi.p2p.WifiP2pManager#connect|android.net.wifi.p2p.WifiP2pManager#discoverPeers" />
         </activity>
 
         <activity android:name=".p2p.P2pClientWithConfigFixedFrequencyTestActivity"
@@ -3509,6 +3603,8 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="ApiTest"
+                    android:value="android.net.wifi.p2p.WifiP2pManager#connect|android.net.wifi.p2p.WifiP2pManager#discoverPeers" />
         </activity>
 
         <activity android:name=".p2p.GoWithConfigTestActivity"
@@ -3516,6 +3612,8 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="ApiTest"
+                    android:value="android.net.wifi.p2p.WifiP2pManager#createGroup|android.net.wifi.p2p.WifiP2pManager#removeGroup" />
         </activity>
 
         <activity android:name=".p2p.GoWithConfig2gBandTestActivity"
@@ -3523,6 +3621,8 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="ApiTest"
+                    android:value="android.net.wifi.p2p.WifiP2pManager#createGroup|android.net.wifi.p2p.WifiP2pManager#removeGroup" />
         </activity>
 
         <activity android:name=".p2p.GoWithConfigFixedFrequencyTestActivity"
@@ -3530,6 +3630,8 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="ApiTest"
+                    android:value="android.net.wifi.p2p.WifiP2pManager#createGroup|android.net.wifi.p2p.WifiP2pManager#removeGroup" />
         </activity>
 
         <activity android:name=".p2p.ServiceRequesterTestListActivity"
@@ -3537,6 +3639,7 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="NonApiTest" android:value="Helper class. List test activities" />
         </activity>
 
         <activity android:name=".p2p.ServiceRequesterTestActivity"
@@ -3544,6 +3647,8 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="ApiTest"
+                    android:value="android.net.wifi.p2p.WifiP2pManager#discoverServices|android.net.wifi.p2p.WifiP2pManager#addServiceRequest|android.net.wifi.p2p.WifiP2pManager#setUpnpServiceResponseListener|android.net.wifi.p2p.WifiP2pManager#setDnsSdResponseListeners|android.net.wifi.p2p.WifiP2pManager#removeServiceRequest|android.net.wifi.p2p.WifiP2pManager#clearServiceRequests" />
         </activity>
 
         <activity android:name=".p2p.ServiceResponderTestActivity"
@@ -3551,6 +3656,8 @@
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <meta-data android:name="display_mode"
                        android:value="single_display_mode" />
+            <meta-data android:name="ApiTest"
+                    android:value="android.net.wifi.p2p.WifiP2pManager#addLocalService" />
         </activity>
 
         <activity android:name=".wifiaware.DataPathOpenUnsolicitedPublishTestActivity"
@@ -3763,6 +3870,20 @@
                        android:value="single_display_mode" />
         </activity>
 
+        <activity android:name=".wifiaware.DataPathForceChannelSetupSubscribeTestActivity"
+                  android:label="@string/aware_data_path_force_channel_setup_subscribe"
+                  android:configChanges="keyboardHidden|orientation|screenSize" >
+            <meta-data android:name="display_mode"
+                       android:value="single_display_mode" />
+        </activity>
+
+        <activity android:name=".wifiaware.DataPathForceChannelSetupPublishTestActivity"
+                  android:label="@string/aware_data_path_force_channel_setup_publish"
+                  android:configChanges="keyboardHidden|orientation|screenSize" >
+            <meta-data android:name="display_mode"
+                       android:value="single_display_mode" />
+        </activity>
+
         <activity-alias android:name=".CtsVerifierActivity" android:label="@string/app_name"
                 android:exported="true"
                 android:targetActivity=".TestListActivity">
@@ -3802,16 +3923,18 @@
 
         <activity android:name=".deskclock.DeskClockTestsActivity"
                 android:exported="true"
-                  android:label="@string/deskclock_tests">
+                android:label="@string/deskclock_tests">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.cts.intent.category.MANUAL_TEST" />
             </intent-filter>
             <meta-data android:name="test_category" android:value="@string/test_category_deskclock" />
             <meta-data android:name="test_excluded_features"
-                    android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.automotive" />
+                       android:value="android.hardware.type.television:android.software.leanback:android.hardware.type.automotive" />
             <meta-data android:name="display_mode"
                        android:value="multi_display_mode" />
+            <meta-data android:name="ApiTest"
+                       android:value="android.provider.AlarmClock#ACTION_SHOW_ALARMS|android.provider.AlarmClock#ACTION_SET_ALARM|android.provider.AlarmClock#ACTION_SET_TIMER" />
         </activity>
 
 <!-- TODO: enable when not requiring to tap the screen and timeouts are tuned -->
@@ -4633,6 +4756,8 @@
             <intent-filter>
                 <action android:name="android.app.action.DEVICE_ADMIN_ENABLED" />
                 <action android:name="android.app.action.PROFILE_PROVISIONING_COMPLETE"/>
+                <!--  TODO(b/176993670): remove if DpmWrapperManagerWrapper goes away -->
+                <action android:name="com.android.bedstead.dpmwrapper.action.WRAPPED_MANAGER_CALL"/>
             </intent-filter>
         </receiver>
         <service android:name=".managedprovisioning.DeviceAdminTestReceiver$PrimaryUserService"
@@ -4762,6 +4887,8 @@
                        android:value="android.software.leanback" />
             <meta-data android:name="test_required_configs"
                        android:value="config_hdmi_source" />
+            <meta-data android:name="ApiTest"
+                       android:value="android.media.AudioTrack#isDirectPlaybackSupported" />
         </activity>
 
         <activity android:name=".tv.display.HotplugTestActivity"
@@ -5179,6 +5306,18 @@
             <meta-data android:name="display_mode" android:value="multi_display_mode" />
         </activity>
 
+        <activity android:name=".audio.AudioDescriptorActivity"
+                  android:exported="true"
+                  android:label="@string/audio_descriptor_test">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.cts.intent.category.MANUAL_TEST" />
+            </intent-filter>
+            <meta-data android:name="test_category" android:value="@string/test_category_audio" />
+            <meta-data android:name="display_mode" android:value="multi_display_mode" />
+            <meta-data android:name="ApiTest" android:value="android.media.AudioDescriptor#getStandard|android.media.AudioDescriptor#getDescriptor" />
+        </activity>
+
         <service android:name=".tv.MockTvInputService"
                 android:exported="true"
             android:permission="android.permission.BIND_TV_INPUT">
@@ -5323,6 +5462,9 @@
                        android:value="android.hardware.type.automotive"/>
             <meta-data android:name="display_mode"
                        android:value="multi_display_mode" />
+            <meta-data
+                android:name="ApiTest"
+                android:value="android.car.settings.CarSettings.Secure#KEY_PACKAGES_DISABLED_ON_RESOURCE_OVERUSE"/>
         </activity>
 
         <!-- 6DoF sensor test -->
@@ -5728,9 +5870,20 @@
             <meta-data android:name="CddTest" android:value="3.15/C-0-5" />
         </activity>
 
+        <activity android:name=".logcat.ReadLogsTestActivity"
+            android:exported="true"
+            android:label="@string/read_logs_text">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.cts.intent.category.MANUAL_TEST" />
+            </intent-filter>
+            <meta-data android:name="test_category" android:value="@string/test_category_logcat" />
+        </activity>
+
         <activity android:name=".displaycutout.DisplayCutoutTestActivity"
-                android:exported="true"
-                  android:label="@string/display_cutout_test">
+            android:theme="@android:style/Theme.Holo.NoActionBar.Fullscreen"
+            android:exported="true"
+            android:label="@string/display_cutout_test">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.cts.intent.category.MANUAL_TEST" />
@@ -5751,5 +5904,16 @@
             <meta-data android:name="display_mode"
                        android:value="multi_display_mode" />
         </activity>
+
+        <activity android:name=".TestListActivity" android:label="@string/app_name" />
+
+        <activity android:name=".ReportViewerActivity"
+                  android:configChanges="keyboardHidden|orientation|screenSize"
+                  android:label="@string/report_viewer" />
     </application>
+
+    <queries>
+        <!-- Rotation Vector CV Crosscheck (RVCVXCheckTestActivity) relies on OpenCV Manager -->
+        <package android:name="org.opencv.engine" />
+    </queries>
 </manifest>
diff --git a/apps/CtsVerifier/jni/audio_loopback/Android.bp b/apps/CtsVerifier/jni/audio_loopback/Android.bp
index 81a8a45..f3c0e98 100644
--- a/apps/CtsVerifier/jni/audio_loopback/Android.bp
+++ b/apps/CtsVerifier/jni/audio_loopback/Android.bp
@@ -6,10 +6,9 @@
     name: "libaudioloopback_jni",
     srcs: [
         "jni-bridge.cpp",
-        "NativeAudioAnalyzer.cpp"
+        "NativeAudioAnalyzer.cpp",
     ],
     include_dirs: [
-        "frameworks/av/media/ndk/include",
         "system/core/include/cutils",
         "cts/apps/CtsVerifier/jni/megaaudio/player",
         "cts/apps/CtsVerifier/jni/megaaudio/recorder",
diff --git a/apps/CtsVerifier/jni/midi/Android.bp b/apps/CtsVerifier/jni/midi/Android.bp
index 67ba782..1b5b3e3 100644
--- a/apps/CtsVerifier/jni/midi/Android.bp
+++ b/apps/CtsVerifier/jni/midi/Android.bp
@@ -26,11 +26,12 @@
     ],
     include_dirs: [
         "frameworks/base/media/native/midi/include",
-        "frameworks/av/media/ndk/include",
         "system/core/include/cutils",
     ],
-    header_libs: ["jni_headers"],
-    sdk_version: "current",
+    header_libs: [
+        "jni_headers",
+        "media_ndk_headers",
+    ],
     stl: "libc++_static",
     shared_libs: [
         "liblog",
diff --git a/apps/CtsVerifier/res/layout/audio_descriptor.xml b/apps/CtsVerifier/res/layout/audio_descriptor.xml
new file mode 100644
index 0000000..273157c
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/audio_descriptor.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        style="@style/RootLayoutPadding">
+
+    <CheckBox android:id="@+id/audioDescriptorHasHDMICheckBox"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:text="@string/audio_descriptor_has_hdmi_support"/>
+
+    <LinearLayout android:orientation="horizontal"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content">
+        <TextView
+                android:text="@string/audio_descriptor_HDMI_support_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="18sp"/>
+
+        <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:id="@+id/audioDescriptorHDMISupportLbl"
+                android:textSize="20sp"/>
+    </LinearLayout>
+
+    <TextView android:id="@+id/audioDescriptorTestStatusLbl"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:textSize="20sp"/>
+
+    <include layout="@layout/pass_fail_buttons"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/CtsVerifier/res/layout/audio_dev_notify.xml b/apps/CtsVerifier/res/layout/audio_dev_notify.xml
index 6fa178d..e8f49ce 100644
--- a/apps/CtsVerifier/res/layout/audio_dev_notify.xml
+++ b/apps/CtsVerifier/res/layout/audio_dev_notify.xml
@@ -38,12 +38,6 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:orientation="vertical">
-      <Button
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:id="@+id/audio_dev_notification_connect_clearmsgs_btn"
-          android:text="@string/audio_dev_notification_clearmsgs"/>
-
       <TextView
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
diff --git a/apps/CtsVerifier/res/layout/camera_fov_calibration_photo_capture.xml b/apps/CtsVerifier/res/layout/camera_fov_calibration_photo_capture.xml
index c142b15..0150ac5 100644
--- a/apps/CtsVerifier/res/layout/camera_fov_calibration_photo_capture.xml
+++ b/apps/CtsVerifier/res/layout/camera_fov_calibration_photo_capture.xml
@@ -4,7 +4,7 @@
     android:layout_height="match_parent"
     tools:context=".PhotoCaptureActivity" >
 
-    <SurfaceView
+    <TextureView
         android:id="@+id/camera_fov_camera_preview"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/apps/CtsVerifier/res/layout/clipboard_preview.xml b/apps/CtsVerifier/res/layout/clipboard_preview.xml
new file mode 100644
index 0000000..85f38c8
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/clipboard_preview.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/clipboard_preview_test_instructions"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="20dp"
+        android:text="@string/clipboard_preview_test_instructions"  />
+    <Button
+        android:id="@+id/clipboard_preview_test_copy"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginBottom="100dp"
+        android:layout_marginTop="30dp"
+        android:text="@string/clipboard_preview_test_copy_button"/>
+
+    <TableLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="50dp">
+            <View android:layout_weight="3"
+                  android:layout_height="50dp"/>
+            <Button android:layout_weight="1"
+                    android:id="@+id/clipboard_preview_test_b1"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:text="1"/>
+            <Button android:layout_weight="1"
+                    android:id="@+id/clipboard_preview_test_b2"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:text="2"/>
+            <Button android:layout_weight="1"
+                    android:id="@+id/clipboard_preview_test_b3"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:text="3"/>
+            <View android:layout_weight="3"
+                  android:layout_height="50dp"/>
+        </TableRow>
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="50dp">
+            <View android:layout_weight="3"
+                  android:layout_height="50dp"/>
+            <Button android:layout_weight="1"
+                    android:id="@+id/clipboard_preview_test_b4"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:text="4"/>
+            <Button android:layout_weight="1"
+                    android:id="@+id/clipboard_preview_test_b5"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:text="5"/>
+            <Button android:layout_weight="1"
+                    android:id="@+id/clipboard_preview_test_b6"
+                    android:layout_width="50dp"
+                    android:layout_height="50dp"
+                    android:text="6"/>
+            <View android:layout_weight="3"
+                  android:layout_height="50dp"/>
+        </TableRow>
+        <TableRow
+            android:layout_width="match_parent"
+            android:layout_height="50dp">
+            <View android:layout_weight="3"
+                  android:layout_height="match_parent"/>
+            <Button android:layout_weight="1"
+                    android:id="@+id/clipboard_preview_test_b7"
+                    android:layout_width="50dp"
+                    android:layout_height="match_parent"
+                    android:text="7"/>
+            <Button android:layout_weight="1"
+                    android:id="@+id/clipboard_preview_test_b8"
+                    android:layout_width="50dp"
+                    android:layout_height="match_parent"
+                    android:text="8"/>
+            <Button android:layout_weight="1"
+                    android:id="@+id/clipboard_preview_test_b9"
+                    android:layout_width="50dp"
+                    android:layout_height="match_parent"
+                    android:text="9"/>
+            <View android:layout_weight="3"
+                  android:layout_height="50dp"/>
+        </TableRow>
+    </TableLayout>
+    <Button
+        android:id="@+id/clipboard_preview_test_b0"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="0"/>
+    <include
+        android:id="@+id/clipboard_preview_test_pass_fail"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="invisible"
+        layout="@layout/pass_fail_buttons"/>
+</LinearLayout>
diff --git a/apps/CtsVerifier/res/layout/logcat_read_logs.xml b/apps/CtsVerifier/res/layout/logcat_read_logs.xml
new file mode 100644
index 0000000..ddc1847
--- /dev/null
+++ b/apps/CtsVerifier/res/layout/logcat_read_logs.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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
+  -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="10dip"
+>
+
+  <Button android:id="@+id/run_read_logs_btn"
+      android:text="@string/read_logs_text"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" />
+
+  <include android:layout_width="match_parent"
+      android:layout_height="wrap_content"
+      android:layout_alignParentBottom="true"
+      layout="@layout/pass_fail_buttons"
+  />
+
+</RelativeLayout>
+
diff --git a/apps/CtsVerifier/res/layout/tiles_item.xml b/apps/CtsVerifier/res/layout/tiles_item.xml
index f2adaa4..9496a70 100644
--- a/apps/CtsVerifier/res/layout/tiles_item.xml
+++ b/apps/CtsVerifier/res/layout/tiles_item.xml
@@ -38,10 +38,25 @@
         android:layout_alignParentTop="true"
         android:layout_toRightOf="@id/tiles_status"/>
 
+    <Button
+        android:id="@+id/tiles_action_request"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_toRightOf="@id/tiles_status"
+        android:layout_below="@id/tiles_instructions"
+        android:layout_alignParentRight="true"
+        android:layout_marginLeft="20dip"
+        android:layout_marginRight="20dip"
+        android:onClick="actionPressed"
+        android:text="Start request"
+        android:enabled="false"
+        />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/tiles_instructions"
+        android:layout_below="@id/tiles_action_request"
         android:layout_toRightOf="@id/tiles_status"
         android:layout_alignParentRight="true">
 
diff --git a/apps/CtsVerifier/res/layout/uap_attribs_panel.xml b/apps/CtsVerifier/res/layout/uap_attribs_panel.xml
index b9c5d3e..dd92d68 100644
--- a/apps/CtsVerifier/res/layout/uap_attribs_panel.xml
+++ b/apps/CtsVerifier/res/layout/uap_attribs_panel.xml
@@ -14,27 +14,92 @@
     <include layout="@layout/uap_profile_header"/>
 
     <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
 
         <TextView
-            android:text="@string/uapPeripheralProfileStatus"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
+                android:text="@string/uapPeripheralProfileAttributes"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
 
         <TextView
-            android:text="status"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/uap_attribsStatusTx"
-            android:paddingLeft="16dp"/>
-        </LinearLayout>
+                android:text="@string/audio_general_Input"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/usbaudio_results_text"/>
+        <TextView
+                android:text="----"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/uap_inChanMasksTx"/>
+
+        <TextView
+                android:text="----"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/uap_inPosMasksTx"/>
+
+        <TextView
+                android:text="----"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/uap_inEncodingsTx"/>
+
+        <TextView
+                android:text="----"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/uap_inRatesTx"/>
+
+        <TextView
+                android:text="@string/audio_general_Output"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+        <TextView
+                android:text="----"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/uap_outChanMasksTx"/>
+
+        <TextView
+                android:text="----"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/uap_outPosMasksTx"/>
+
+        <TextView
+                android:text="----"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/uap_outEncodingsTx"/>
+
+        <TextView
+                android:text="----"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/uap_outRatesTx"/>
+    </LinearLayout>
+
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+        <TextView
+                android:text="@string/audio_general_status"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+
+        <TextView
+                android:text="status"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:id="@+id/uap_attribsStatusTx"
+                android:paddingLeft="16dp"
+                android:textSize="18sp"/>
+    </LinearLayout>
 
     <include layout="@layout/pass_fail_buttons"/>
 </LinearLayout>
diff --git a/apps/CtsVerifier/res/values/strings.xml b/apps/CtsVerifier/res/values/strings.xml
index 907238b..dc3bed4 100644
--- a/apps/CtsVerifier/res/values/strings.xml
+++ b/apps/CtsVerifier/res/values/strings.xml
@@ -51,6 +51,7 @@
     <string name="test_category_tunnel">Tunnel Mode</string>
     <string name="test_category_tv">TV</string>
     <string name="test_category_instant_apps">Instant Apps</string>
+    <string name="test_category_logcat">Read Logs</string>
     <string name="test_category_display_cutout">DisplayCutout</string>
     <string name="test_category_other">Other</string>
     <string name="clear">Clear</string>
@@ -293,6 +294,19 @@
     </string>
     <string name="fs_force_stop_verification_pending">Verifying... Please wait.</string>
 
+    <!-- Strings for ClipboardPreviewText -->
+    <string name="clipboard_preview_test">Clipboard Preview Test</string>
+    <string name="clipboard_preview_test_info">
+        This test verifies that clipboard contents are visible to the user when copied.
+    </string>
+    <string name="clipboard_preview_test_instructions">
+        Press the \'Copy\' button to copy the secret code to the clipboard.
+        \n\nUse the clipboard preview UI, or the clipboard editor component to view the secret code.
+        \n\nEnter the secret code using the buttons below.
+    </string>
+    <string name="clipboard_preview_test_copy_button">Copy</string>
+
+
     <!-- Strings for BiometricTest -->
     <string name="biometric_test">Biometric Tests</string>
 
@@ -363,6 +377,10 @@
     <string name="biometric_test_set_user_authentication_credential_per_use_auth_with_biometric_strongbox">auth-per-use key with biometric (strongbox)</string>
     <string name="biometric_test_set_user_authentication_credential_duration_auth_with_biometric_strongbox">time-based key with biometric (strongbox)</string>
 
+    <!-- Strings for user consent for logs test -->
+    <string name="read_logs_text">User Consent for Device Logs Test</string>
+    <string name="read_logs_test_info">"This test verifies that user consent for per-use prompt is working properly.\nThe test assumes READ_LOGS permission is granted to the app.\nStart this test by clicking User Consent for Device Logs Test button.\nWhen the process becomes foreground, a user will see a prompt. Once a user clicks the prompt, users have an option to choose \"Only this time\" or \"Don\'t Allow\"."</string>
+
     <!-- Strings for lock bound keys test -->
     <string name="sec_lock_bound_key_test">Lock Bound Keys Test</string>
     <string name="sec_lock_bound_key_test_info">
@@ -2112,6 +2130,10 @@
         device was p2p device. Check the test case on the other device.</string>
     <string name="p2p_connection_error">
         Test failed.\n\nFailed to establish a p2p connection.</string>
+    <string name="p2p_connection_latency_error">
+        Test failed. \n\nConnection was expected to be established within %1$dms. But took=%2$dms.
+        \n\nPlease ensure that the Group Owner is ready on the other device before running
+        this test</string>
     <string name="p2p_detect_disconnection_error">
         Test failed.\n\nFailed to detect client disconnection.</string>
     <string name="p2p_disconnect_error">
@@ -2162,6 +2184,7 @@
     <string name="aware_dp_ib_open_solicited_accept_any">Data Path: Open: Solicited/Active: accept any peer</string>
     <string name="aware_dp_ib_passphrase_solicited_accept_any">Data Path: Passphrase: Solicited/Active: accept any peer</string>
     <string name="aware_dp_ib_pmk_solicited_accept_any">Data Path: PMK: Solicited/Active: accept any peer</string>
+    <string name="aware_dp_ib_force_channel_setup">Data Path: force channel setup</string>
     <string name="aware_discovery_ranging">Discovery with Ranging</string>
     <string name="aware_publish">Publish</string>
     <string name="aware_subscribe">Subscribe</string>
@@ -2252,6 +2275,10 @@
     <string name="aware_discovery_ranging_publish_info">The publisher is now ready.\n\nOn the other device: start the \'Discovery with Ranging\' / \'Subscribe\' test.</string>
     <string name="aware_discovery_ranging_subscribe">Discovery with Ranging: Subscribe</string>
 
+    <string name="aware_data_path_force_channel_setup_publish">Data Path: force channel setup Publish</string>
+    <string name="aware_data_path_force_channel_setup_publish_info">The publisher is now ready.\n\nOn the other device: start the \'Data Path: force channel setup\' / \'Subscribe\' test.</string>
+    <string name="aware_data_path_force_channel_setup_subscribe">Data Path: force channel setup Subscribe</string>
+
     <string name="camera_fov_calibration">Camera FOV Calibration</string>
     <string name="camera_fov_calibration_done">Done</string>
     <string name="camera_fov_general_settings">General settings</string>
@@ -2423,6 +2450,21 @@
         notifications, fully expand the notification display and verify that the \"Person A\"
         notification appears before the "\Non-Person Notification\".
         If this device does not support conversation notifications or does not group them together, press Pass.</string>
+    <string name="hun_display">If this device supports heads-up notifications,
+        verify that a notification just peeked on screen, displaying all of the following: small
+        icon, large icon, notification title, notification text, and two action buttons.
+        If this device does not support heads-up notifications, press Pass.</string>
+    <string name="action">Action %1$d</string>
+    <string name="media_controls_title">Media Controls Test</string>
+    <string name="media_controls_info">This test checks that media controls appear in the shade for
+        applications that post a media style notification.</string>
+    <string name="media_controls_visible">Pull down the notification shade and check that the media
+        controls from the CTS Verifier app are visible.
+    </string>
+    <string name="media_controls_output_switcher_chip">Pull down the notification shade and look at
+        the media controls for the CTS Verifier app.
+        Check that it contains an affordance to switch between available media routes.
+    </string>
     <string name="tile_service_name">Tile Service for CTS Verifier</string>
     <string name="tiles_test">Tile Service Test</string>
     <string name="tiles_info">This test checks that a Tile Service added by a third party
@@ -2435,6 +2477,46 @@
     <string name="tiles_in_customizer">Open Quick Settings and click the button to customize Quick
         Settings. Check that the Tile Service for CTS Verifier is available to be added</string>
     <string name="tiles_removing_tile">Check that Tile Service is disabled</string>
+    <string name="tile_request_service_name">Request Tile Service</string>
+    <string name="tile_request_helper_app_name">CtsTileServiceApp</string>
+    <string name="tiles_request_test">Tile Service Request Test</string>
+    <string name="tiles_request_info">This test checks that a request to add a TileService is
+    shown correctly to the user and the correct answer is relayed to the app.</string>
+    <string name="tiles_request_uninstall">This will verify that the helper app is not installed.
+    If that is correct, the test will pass automatically. If the app is installed, press the button
+    and you will be prompted for confirmation to uninstall the app.</string>
+    <string name="tiles_request_install">You should have received a helper app apk with this CTS
+    Verifier package. Its name is \"CtsTileServiceApp\". Install the test app, by running\n
+    \"adb install /path/to/CtsTileServiceApp.apk\".\n
+    Pass the test if the install was successful. Fail it otherwise.
+    </string>
+    <string name="tiles_request_install_verify">This will automatically verify that the helper app
+    is correctly installed.</string>
+    <string name="tiles_request_tile_not_present">Open Quick Settings and pass this test
+    if there are no tiles named %1$s in any page.</string>
+    <string name="tiles_request_dismissed">After pressing \"Start request\", a dialog will appear
+        requesting to add a quick settings tile. When it appears, dismiss it by tapping outside of
+        it, or going back.</string>
+    <string name="tiles_request_answer_no">After pressing \"Start request\", a dialog will appear
+        requesting to add a quick settings tile. When it appears, tap the option in the dialog to
+        not add the tile.</string>
+    <string name="tiles_request_correct_info">After pressing \"Start request\", a dialog will appear
+        requesting to add a quick settings tile. When it appears, verify the following information
+        in the dialog:\n
+  1. The name of the app requesting to add the tile is %1$s.\n
+  2. The label in the tile is %2$s.\n
+After verifying, tap the option in the dialog to not add the tile.\n
+When the buttons are enabled, pass this test if the information in the dialog was correct.
+    </string>
+    <string name="tiles_request_answer_yes">After pressing \"Start request\", a dialog will appear
+        requesting to add a quick settings tile. When it appears, tap the option in the dialog to
+        add the tile.
+    </string>
+    <string name="tiles_request_tile_present">Open Quick Settings and pass this test if a tile named
+        %1$s is visible in some page.
+    </string>
+    <string name="tiles_request_check_tile_already_added">Checking tile already added response
+    </string>
     <string name="vr_tests">VR Tests</string>
     <string name="test_category_vr">VR</string>
     <string name="vr_test_title">VR Listener Test</string>
@@ -3044,13 +3126,6 @@
 
     <string name="provisioning_tests_byod">BYOD Provisioning tests</string>
 
-    <string name="provisioning_tests_byod_custom_image"> Custom provisioning image </string>
-    <string name="provisioning_tests_byod_custom_image_info">
-        1. Please press the Go button to start the provisioning.\n
-        2. Press \"Accept and continue\" button to start work profile provisioning\n
-        3. Check that the CtsVerifier logo is displayed during provisioning\n
-        4. After successful provisioning, come back to this page. You might need to press a button on the final provisioning screen.
-    </string>
     <string name="provisioning_tests_byod_custom_terms">Custom terms</string>
     <string name="provisioning_tests_byod_custom_terms_instructions">
         1. Please press the Go button to start the provisioning.\n
@@ -3232,6 +3307,8 @@
     <string name="provisioning_byod_work_notification_instruction">
         Please press the Go button to trigger a notification.\n
         \n
+        If a permission is requested, grant it and press the Go button again.\n
+        \n
         Verify that the notification is badged (see sample badge below). Then mark this test accordingly.
     </string>
     <string name="provisioning_byod_notification_title">This is a notification</string>
@@ -3514,6 +3591,14 @@
     </string>
     <string name="provisioning_byod_uninstall_work_app_install_work_app">Install work app</string>
 
+    <string name="provisioning_byod_launch_work_tab">Launch work tab in launcher</string>
+    <string name="provisioning_byod_launch_work_tab_instruction">
+        This test verifies that the work tab (if tabs are supported) can be launched.\n
+        1. Press \"Go\".\n
+        2. If this device supports tabs, verify that you have landed on the work tab.\n
+        3. If this device doesn\'t support tabs, verify that you have landing on the all apps page .\n
+    </string>
+
     <string name="provisioning_byod_turn_off_work">Turn off work profile</string>
     <string name="provisioning_byod_turn_off_work_info">This test verifies device behaviors when turning off work profile.</string>
     <string name="provisioning_byod_turn_off_work_instructions">
@@ -3527,7 +3612,7 @@
     <string name="provisioning_byod_turn_off_work_prepare_notifications">Prepare a work notification</string>
     <string name="provisioning_byod_turn_off_work_prepare_notifications_instruction">
         This is a test setup step.\n
-        1. Press the go button to send a work notification.\n
+        1. Press the go button to send a work notification. (if a permission is requested, grant it and press the go button again). \n
         2. Verify that the notification is displayed and mark this test as passed.\n
         (Note: in the following test, you will be asked to verify the notification disappears after work profile is turned off.)
     </string>
@@ -4250,34 +4335,6 @@
     <string name="disallow_outgoing_beam">Disallow outgoing beam</string>
     <string name="disallow_outgoing_beam_action">Switching on android beam</string>
     <string name="disallow_remove_user">Disallow remove user</string>
-    <string name="check_new_user_disclaimer">Check new user disclaimer</string>
-    <string name="check_new_user_disclaimer_info">
-        Please do the following: \n\n
-        1. Check persistent notification for managed device \n\n
-        a). Open the notification UI, verify that there is a notification saying the device is managed.\n
-        b). Tap the notification\n
-        c). It should show a dialog explaining the device is managed and asking the user to accept \n
-        d). Don\'t accept initially and tap outside the dialog \n
-        e). Open the notification UI again, verify that the managed device notification is still shown \n
-        \n
-        f). Click \"Set Org\", and open the notification UI again, verify that the organization name
-        \"Foo, Inc\" is shown on the dialog \n
-        \n\n
-        2. Check adding account is restricted\n\n
-        a) Click \"Go\" to launch the \"Profiles &amp; accounts\" setting \n
-        b) navigate to \"Add account\" \n
-        \n
-        Expected: \n
-        - \"Add account\" is disabled \n
-        - Click the button will launch the new user disclaimer dialog\n
-        \n
-        c) Click accept button\n
-        \n
-        Expected: \n
-        - the screen will be dismissed \n
-        - \"Add account\" will be enabled\n
-        - Click the button will take user to the screen to add account \n
-    </string>
     <string name="device_owner_disallow_remove_user_info">
         Please press \'Create uninitialized user\' to create a user that is not set up. Then press the
         \'Set restriction\' button to set the user restriction.
@@ -4837,15 +4894,15 @@
     Setup activity must have been started.
     </string>
     <string name="tv_input_discover_test_tune_to_channel">
-    Select the \"Launch TV app\" button and tune to the \"Dummy\" channel from \"CTS Verifier\"
+    Select the \"Launch TV app\" button and tune to the \"Placeholder\" channel from \"CTS Verifier\"
     input. If necessary, configure the channel to be visible.
     </string>
     <string name="tv_input_discover_test_verify_tune">
     Tune command must be called.
     </string>
     <string name="tv_input_discover_test_verify_overlay_view">
-    Verify that the overlay appears and displays the text \"Overlay View Dummy Text\" when you tune
-    to the \"Dummy\" channel.
+    Verify that the overlay appears and displays the text \"Overlay View Placeholder Text\" when you tune
+    to the \"Placeholder\" channel.
     </string>
     <string name="tv_input_discover_test_verify_size_changed">
     Verify that video layout changes correctly according to the provided video track information,
@@ -4856,11 +4913,11 @@
     global search results.
     </string>
     <string name="tv_input_discover_test_go_to_epg">
-    Select the \"Launch EPG\" button and locate the \"Dummy\" channel.
+    Select the \"Launch EPG\" button and locate the \"Placeholder\" channel.
     </string>
     <string name="tv_input_discover_test_verify_epg">
-    Do you see the programs named \"Dummy Program\" and their descriptions
-    "Dummy Program Description" in the EPG?
+    Do you see the programs named \"Placeholder Program\" and their descriptions
+    "Placeholder Program Description" in the EPG?
     </string>
     <string name="tv_input_discover_test_trigger_setup">
     Select the \"Launch setup\" button and verify if the bundled TV app shows the list of installed
@@ -5054,7 +5111,7 @@
     </string>
     <string name="tv_mode_switching_test_mode_switch_step">Mode switch step</string>
 
-    <string name="overlay_view_text">Overlay View Dummy Text</string>
+    <string name="overlay_view_text">Overlay View Placeholder Text</string>
     <string name="custom_rating">Example of input app specific custom rating.</string>
 
     <!-- A list of fully-qualified test classes that should not be run. -->
@@ -5076,16 +5133,13 @@
     <string name="error_screen_pinning_couldnt_exit">Could not exit screen pinning through API.</string>
 
     <!--  Audio Devices Notifications Tests -->
+    <string name="audio_devices_notification_instructions">
+          Connect and disconnect a wired headset.
+          Note if the appropriate notification messages appear below.
+          The \"Pass\" button will be enabled if device connect and disconnect messages are received.
+    </string>
     <string name="audio_out_devices_notifications_test">Audio Output Devices Notifications Test</string>
-    <string name="audio_out_devices_notification_instructions">
-          Click the "Clear Messages" button then connect and disconnect a wired headset.
-          Note if the appropriate notification messages appear below.
-    </string>
     <string name="audio_in_devices_notifications_test">Audio Input Devices Notifications Test</string>
-    <string name="audio_in_devices_notification_instructions">
-          Click the "Clear Messages" button then connect and disconnect a microphone or wired headset.
-          Note if the appropriate notification messages appear below.
-    </string>
     <string name="audio_dev_notification_clearmsgs">Clear Messages</string>
     <string name="audio_dev_notification_connectMsg">CONNECT DETECTED</string>
     <string name="audio_dev_notification_disconnectMsg">DISCONNECT DETECTED</string>
@@ -5118,7 +5172,7 @@
     <string name="connectedPeripheral">Connected Peripheral</string>
     <string name="audio_uap_attribs_test">USB Audio Peripheral Attributes Test</string>
     <string name="audio_uap_notifications_test">USB Audio Peripheral Notifications Test</string>
-    <string name="uapPeripheralProfileStatus">Peripheral Profile Status</string>
+    <string name="uapPeripheralProfileAttributes">USB Audio Peripheral Attributes</string>
     <string name="audio_uap_play_test">USB Audio Peripheral Play Test</string>
     <string name="uapPlayTestInstructions">Connect the USB Audio Interface Peripheral and press the
         PLAY button below. Verify that a tone is correctly played.</string>
@@ -5278,6 +5332,12 @@
     <string name="audio_general_ok">Ok</string>
     <string name="audio_general_start">Start</string>
     <string name="audio_general_stop">Stop</string>
+    <string name="audio_general_status">Status</string>
+    <string name="audio_general_pass">PASS</string>
+    <string name="audio_general_fail">FAIL</string>
+
+    <string name="audio_general_Input">Input</string>
+    <string name="audio_general_Output">Output</string>
 
     <string name="audio_general_JavaApi">Java API</string>
     <string name="audio_general_NativeApi">Native API</string>
@@ -5770,11 +5830,24 @@
 
     <!-- USB Audio Peripheral Attributes Test -->
     <string name="usbaudio_attribs_test"> USB Audio Peripheral Attributes Test</string>
-    <string name="usbaudio_attribs_info">
-        This test requires that you have connected a mandated USB Audio Interface peripheral.
-        If the discovered attributes of the peripheral matches the known attributes of the
-        peripheral the test passes and the \"pass\" button will be enabled.
-       </string>
+
+    <string name="usbaudio_attribs_info">This test tests that the USB Audio HAL returns the
+        expected set of attributes for a well-known USB audio peripheral. See the
+        <a href="https://source.android.com/compatibility/cts/usb-audio#recommended-peripherals">
+            Mandated Peripherals
+        </a>
+        section of the <a href="https://source.android.com/compatibility/cts/usb-audio">
+            USB Audio CTS Verifier Tests
+        </a>.
+        for a list of supported USB audio peripherals.  The attributes of the supported
+        peripherals are stored in the app in a set of \"Peripheral Profiles\".\n\n
+        To execute the test:\n
+        1. Specify whether or not the DUT supports USB host mode (CDD 5.10 C-1-3). If not the test
+        simply passes.
+        2. Plug in a supported USB Audio Peripheral.\nThe peripheral\'s attributes will be
+        displayed along with the name of the associated profile. If the peripheral matches the
+        profile, the test passes. If not, the mismatches are displayed.
+    </string>
 
     <!-- USB Audio Peripheral Play Test -->
     <string name="usbaudio_play_test"> USB Audio Peripheral Play Test</string>
@@ -6250,13 +6323,15 @@
     <string name="uap_test_info">Info</string>
     <string name="uap_test_question">Does this device allow for the connection of a USB audio peripheral?\nNote: phones and tablets generally do, watches and automobiles generally do not.</string>
     <string name="uap_refmic_question">Does this device allow for the connection of a USB reference microphone?</string>
-    <string name="uap_mic_dlg_caption">USB Host Mode Audio Required</string>
-    <string name="uap_mic_dlg_text">This test requires a USB audio peripheral to be connected to the device.
-    If the device under test does not support USB Host Mode Audio (either because it does not have a
-    USB port, or USB Host Mode Audio has been removed from the OS) you can be granted a provisional
-    pass on this test by pressing the \"No\" button and indicating \"Test Pass\" at the bottom.\n
-    Note: Handheld devices supporting USB host mode MUST support USB audio class (CDD 7.7 .2/H-1-1)\n
-    Note: Devices declaring feature android.hardware.audio.pro MUST implement USB host mode (CDD 5.10 C-1-3) and if they omit a 4 conductor 3.5mm audio jack MUST support USB audio class (CDD 5.10 C-3-1)
+    <string name="uap_test_hostmode_info_caption">USB Host Mode Audio Required</string>
+    <string name="uap_test_hostmode_info_text">This test requires a USB audio peripheral be
+        connected to the device.
+    The DUT may not support USB Host Mode Audio, either because it does not have a
+    USB port, or USB Host Mode Audio has been removed from the OS. In this case, the test can be
+    passed by pressing the \"No\" button and indicating \"Test Pass\" at the bottom.
+    \n\nNote: Handheld devices supporting USB host mode MUST support USB audio class (CDD 7.7 .2/H-1-1)
+    \n\nNote: Devices declaring feature android.hardware.audio.pro MUST implement USB host mode (CDD 5.10 C-1-3).
+    Devices that omit a 4 conductor 3.5mm audio jack MUST support USB audio class (CDD 5.10 C-3-1).
     </string>
 
     <string name="refmic_test_no">No</string>
@@ -6306,4 +6381,45 @@
     <string name="handheld_or_tablet_text_before_test">Is this a handheld or tablet device?</string>
     <string name="handheld_or_tablet_yes">Yes</string>
     <string name="handheld_or_tablet_not_applicable">Not applicable</string>
+
+    <!-- AudioDescriptor Test -->
+    <string name="audio_descriptor_test">Audio Descriptor Test</string>
+    <string name="audio_descriptor_test_info">
+        This test tests if the reported AudioDescriptor is valid and necessary.\n
+        AudioDescriptor must only be used to report audio device capabilities that are not able to
+        describe by Android defined enums.\n
+        \nTo execute test:\n
+        1. Plug in HDMI cable if HDMI is supported on the device.\n
+        2. The test will execute automatically and verify the reported AudioDescriptor when the
+        activity is created and when audio device connection is changed.
+    </string>
+    <string name="audio_descriptor_HDMI_support_label">HDMI support:</string>
+    <string name="audio_descriptor_has_hdmi_support">Has HDMI support</string>
+    <string name="audio_descriptor_NA">N/A</string>
+    <string name="audio_descriptor_hdmi_pending">No HDMI detected. Pending&#8230;</string>
+    <string name="audio_descriptor_pass">Pass</string>
+    <string name="audio_descriptor_hdmi_not_reported">No HDMI device connected</string>
+    <string name="audio_descriptor_standard_none">Standard is none.</string>
+    <string name="audio_descriptor_is_null">Audio descriptor is null.</string>
+    <string name="audio_descriptor_unrecognized_standard">Standard %1$d is unrecognized.</string>
+    <string name="audio_descriptor_length_error">
+        The length of short audio descriptor is %1$d, but it is expected to be 3.
+    </string>
+    <string name="audio_descriptor_cannot_get_hal_version">Cannot get audio HAL version</string>
+    <string name="audio_descriptor_invalid_hal_version">Invalid audio HAL version %1$s</string>
+    <string name="audio_descriptor_format_code_should_not_be_reported">
+        Format with format code as %1$d(%2$s) should not be reported by AudioDescriptor.
+        Instead, it should be reported by Android defined enums.
+    </string>
+    <string name="audio_descriptor_format_extended_code_should_not_be_reported">
+        Format with format extended code as %1$d(%2$s) should not be reported by AudioDescriptor.
+        Instead, it should be reported by Android defined enums.
+    </string>
+    <string name="audio_descriptor_format_extended_code_is_not_used">
+        Format extended code as %1$d is not used.
+    </string>
+    <string name="audio_descriptor_hdmi_info_title">HDMI Support</string>
+    <string name="audio_descriptor_hdmi_message">
+        Please connect an HDMI peripheral to validate AudioDescriptor.
+    </string>
 </resources>
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/AbstractTestListActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/AbstractTestListActivity.java
index ab02210..0f352f5 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/AbstractTestListActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/AbstractTestListActivity.java
@@ -21,6 +21,7 @@
 import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.Window;
@@ -46,6 +47,8 @@
     // Whether test case was executed through automation.
     protected boolean mIsAutomated;
 
+    protected final String mTag = getClass().getSimpleName();
+
     protected void setTestListAdapter(TestListAdapter adapter) {
         mAdapter = adapter;
         setListAdapter(mAdapter);
@@ -128,6 +131,8 @@
     /** Override this in subclasses instead of onListItemClick */
     protected void handleItemClick(ListView listView, View view, int position, long id) {
         Intent intent = getIntent(position);
+        Log.i(mTag, "Launching activity with " + IntentDrivenTestActivity.toString(this, intent));
+
         startActivityForResult(intent, LAUNCH_TEST_REQUEST_CODE);
     }
 
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/IntentDrivenTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/IntentDrivenTestActivity.java
index cc072a1..a1c1a0e 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/IntentDrivenTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/IntentDrivenTestActivity.java
@@ -4,10 +4,12 @@
 
 import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
+import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -15,6 +17,11 @@
 import android.widget.Button;
 import android.widget.TextView;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
 /**
  *  A generic activity for intent based tests.
  *
@@ -28,32 +35,30 @@
  *  will dynamically create the intent when the button is clicked based on the test id and the
  *  button that was clicked.
  */
-public class IntentDrivenTestActivity extends PassFailButtons.Activity implements OnClickListener {
-    private static final String TAG = "IntentDrivenTestActivity";
+public final class IntentDrivenTestActivity extends PassFailButtons.Activity
+        implements OnClickListener {
+
+    private static final String TAG = IntentDrivenTestActivity.class.getSimpleName();
 
     public static final String EXTRA_ID = "id";
     public static final String EXTRA_TITLE = "title";
     public static final String EXTRA_INFO = "info";
     public static final String EXTRA_BUTTONS = "buttons";
 
+    private static final String[] REQUIRED_EXTRAS = {
+            EXTRA_ID, EXTRA_TITLE, EXTRA_INFO, EXTRA_BUTTONS
+    };
+
     private String mTestId;
     private ButtonInfo[] mButtonInfos;
 
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.intent_driven_test);
         setPassFailButtonClickListeners();
 
-        final Intent intent = getIntent();
-        if (!intent.hasExtra(EXTRA_ID)
-                || !intent.hasExtra(EXTRA_TITLE)
-                || !intent.hasExtra(EXTRA_INFO)
-                || !intent.hasExtra(EXTRA_BUTTONS)) {
-            throw new IllegalArgumentException(
-                    "Intent must have EXTRA_ID, EXTRA_TITLE, EXTRA_INFO & EXTRA_BUTTONS");
-        }
+        final Intent intent = checkAndGetIntent();
 
         mTestId = intent.getStringExtra(EXTRA_ID);
         setTitle(intent.getIntExtra(EXTRA_TITLE, -1));
@@ -130,7 +135,7 @@
         return mTestId;
     }
 
-    public static class TestInfo {
+    public static final class TestInfo {
         private final String mTestId;
         private final int mTitle;
         private final int mInfoText;
@@ -145,7 +150,7 @@
             if (buttons.length > 2) {
                 throw new RuntimeException("Too many buttons");
             }
-            mTestId = testId;
+            mTestId = nonEmpty("testId", testId);
             mTitle = title;
             mInfoText = infoText;
             mButtons = buttons;
@@ -168,7 +173,7 @@
         }
     }
 
-    public static class ButtonInfo implements Parcelable {
+    public static final class ButtonInfo implements Parcelable {
         private final int mButtonText;
         private final Intent[] mIntents;
         private final String mIntentFactoryClassName;
@@ -238,4 +243,57 @@
     public interface IntentFactory {
         Intent[] createIntents(String testId, int buttonText);
     }
+
+    public static Intent newIntent(Context context, String testId, int titleResId,
+            int infoResId, ButtonInfo[] buttons) {
+        Intent intent = new Intent(context, IntentDrivenTestActivity.class)
+                .putExtra(IntentDrivenTestActivity.EXTRA_ID, nonEmpty("testId", testId))
+                .putExtra(IntentDrivenTestActivity.EXTRA_TITLE, titleResId)
+                .putExtra(IntentDrivenTestActivity.EXTRA_INFO, infoResId)
+                .putExtra(IntentDrivenTestActivity.EXTRA_BUTTONS,
+                        Objects.requireNonNull(buttons, "buttons cannot be null"));
+        Log.d(TAG, "Added 4 required extras to  " + toString(context, intent));
+        return intent;
+    }
+
+    private static String nonEmpty(String name, String value) {
+        if (TextUtils.isEmpty(value)) {
+            throw new IllegalArgumentException(name + " cannot be null or empty: '" + value + "'");
+        }
+        return value;
+    }
+
+    private Intent checkAndGetIntent() {
+        Intent intent = getIntent();
+        List<String> missingExtras = new ArrayList<>();
+        for (String extra : REQUIRED_EXTRAS) {
+            if (!intent.hasExtra(extra)) {
+                missingExtras.add(extra);
+            }
+        }
+        if (!missingExtras.isEmpty()) {
+            throw new IllegalArgumentException(toString(this, intent) + ") is missing "
+                    + missingExtras.size() + " required extras: "
+                    + Arrays.toString(REQUIRED_EXTRAS));
+        }
+        return intent;
+    }
+
+    public static String toString(Context context, Intent intent) {
+        return new StringBuilder("Intent["
+                + "address=").append(System.identityHashCode(intent))
+                .append(", numberExtras=").append(intent.getExtras().size())
+                .append(", extraKeys=").append(new ArrayList<>(intent.getExtras().keySet()))
+                .append(", testId=")
+                .append(intent.hasExtra(EXTRA_ID) ? intent.getStringExtra(EXTRA_ID) : "N/A")
+                .append(", title=").append(intent.hasExtra(EXTRA_TITLE)
+                                ? context.getString(intent.getIntExtra(EXTRA_TITLE, -1))
+                                : "N/A")
+                .append(intent.hasExtra(EXTRA_INFO) ? ", has_info" : ", no_info")
+                .append(", numberButtons=").append(intent.hasExtra(EXTRA_BUTTONS)
+                                ? intent.getParcelableArrayExtra(EXTRA_BUTTONS).length
+                                : 0)
+                .append(", rawIntent=").append(intent)
+                .append(']').toString();
+    }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AnalogHeadsetAudioActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AnalogHeadsetAudioActivity.java
index 37921e0..fb3996c 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AnalogHeadsetAudioActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AnalogHeadsetAudioActivity.java
@@ -16,45 +16,36 @@
 
 package com.android.cts.verifier.audio;
 
-import com.android.compatibility.common.util.ReportLog;
-import com.android.compatibility.common.util.ResultType;
-import com.android.compatibility.common.util.ResultUnit;
+import static com.android.cts.verifier.TestListActivity.sCurrentDisplayMode;
+import static com.android.cts.verifier.TestListAdapter.setTestNameSuffix;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
-
 import android.graphics.Color;
-
 import android.media.AudioDeviceCallback;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
-
 import android.os.Bundle;
 import android.os.Handler;
-
 import android.util.Log;
-
 import android.view.KeyEvent;
 import android.view.View;
-
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
 import com.android.cts.verifier.PassFailButtons;
-import com.android.cts.verifier.R;  // needed to access resource in CTSVerifier project namespace.
+import com.android.cts.verifier.R;
 
-// MegaPlayer
 import org.hyphonate.megaaudio.player.AudioSourceProvider;
 import org.hyphonate.megaaudio.player.JavaPlayer;
 import org.hyphonate.megaaudio.player.PlayerBuilder;
 import org.hyphonate.megaaudio.player.sources.SinAudioSourceProvider;
 
-import static com.android.cts.verifier.TestListActivity.sCurrentDisplayMode;
-import static com.android.cts.verifier.TestListAdapter.setTestNameSuffix;
-
 public class AnalogHeadsetAudioActivity
         extends PassFailButtons.Activity
         implements View.OnClickListener {
@@ -381,32 +372,21 @@
     //
     @Override
     public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.headset_analog_port_yes:
-                reportHeadsetPort(true);
-                break;
-
-            case R.id.headset_analog_port_no:
-                reportHeadsetPort(false);
-                break;
-
-            case R.id.headset_analog_play:
-                startPlay();
-                break;
-
-            case R.id.headset_analog_stop:
-                stopPlay();
-                mPlaybackSuccessBtn.setEnabled(true);
-                mPlaybackFailBtn.setEnabled(true);
-                break;
-
-            case R.id.headset_analog_play_yes:
-                reportPlaybackStatus(true);
-                break;
-
-            case R.id.headset_analog_play_no:
-                reportPlaybackStatus(false);
-                break;
+        int id = view.getId();
+        if (id == R.id.headset_analog_port_yes) {
+            reportHeadsetPort(true);
+        } else if (id == R.id.headset_analog_port_no) {
+            reportHeadsetPort(false);
+        } else if (id == R.id.headset_analog_play) {
+            startPlay();
+        } else if (id == R.id.headset_analog_stop) {
+            stopPlay();
+            mPlaybackSuccessBtn.setEnabled(true);
+            mPlaybackFailBtn.setEnabled(true);
+        } else if (id == R.id.headset_analog_play_yes) {
+            reportPlaybackStatus(true);
+        } else if (id == R.id.headset_analog_play_no) {
+            reportPlaybackStatus(false);
         }
     }
 
@@ -423,14 +403,14 @@
             }
         }
 
-        reportHeadsetPort(mHeadsetDeviceInfo != null);
-
         getReportLog().addValue(
                 KEY_HEADSET_CONNECTED,
                 mHeadsetDeviceInfo != null ? 1 : 0,
                 ResultType.NEUTRAL,
                 ResultUnit.NONE);
 
+        reportHeadsetPort(mHeadsetDeviceInfo != null);
+
         showConnectedDevice();
     }
 
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioAEC.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioAEC.java
index 06340e3..6b9bf05 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioAEC.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioAEC.java
@@ -17,8 +17,11 @@
 package com.android.cts.verifier.audio;
 
 import android.content.Context;
-import android.media.*;
 import android.media.audiofx.AcousticEchoCanceler;
+import android.media.AudioManager;
+import android.media.AudioTrack;
+import android.media.AudioRecord;
+import android.media.MediaRecorder;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
@@ -26,130 +29,74 @@
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
+
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
-import com.android.cts.verifier.CtsVerifierReportLog;
-import com.android.cts.verifier.R;
+import com.android.cts.verifier.audio.soundio.SoundPlayerObject;
+import com.android.cts.verifier.audio.soundio.SoundRecorderObject;
 import com.android.cts.verifier.audio.wavelib.*;
+import com.android.cts.verifier.CtsVerifierReportLog;
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import static com.android.cts.verifier.TestListActivity.sCurrentDisplayMode;
+import static com.android.cts.verifier.TestListAdapter.setTestNameSuffix;
 
 public class AudioAEC extends AudioFrequencyActivity implements View.OnClickListener {
     private static final String TAG = "AudioAEC";
 
-    private static final int TEST_NONE = -1;
+    // Test State
     private static final int TEST_AEC = 0;
-    private static final int TEST_COUNT = 1;
-    private static final float MAX_VAL = (float)(1 << 15);
 
-    private int mCurrentTest = TEST_NONE;
+    // UI
     private LinearLayout mLinearLayout;
     private Button mButtonTest;
     private Button mButtonMandatoryYes;
     private Button mButtonMandatoryNo;
     private ProgressBar mProgress;
     private TextView mResultTest;
-    private boolean mTestAECPassed;
-    private SoundPlayerObject mSPlayer;
-    private SoundRecorderObject mSRecorder;
-    private AcousticEchoCanceler mAec;
 
-    private boolean mMandatory = true;
-
+    // Sound IO
     private final int mBlockSizeSamples = 4096;
     private final int mSamplingRate = 48000;
     private final int mSelectedRecordSource = MediaRecorder.AudioSource.VOICE_COMMUNICATION;
 
+    private SoundPlayerObject mSPlayer;
+    private SoundRecorderObject mSRecorder;
+
+    // Test Results
+    private boolean mMandatory = true;
+    private boolean mTestAECPassed;
+
     private final int TEST_DURATION_MS = 8000;
     private final int SHOT_FREQUENCY_MS = 200;
     private final int CORRELATION_DURATION_MS = TEST_DURATION_MS - 3000;
     private final int SHOT_COUNT_CORRELATION = CORRELATION_DURATION_MS/SHOT_FREQUENCY_MS;
     private final int SHOT_COUNT = TEST_DURATION_MS/SHOT_FREQUENCY_MS;
+
     private final float MIN_RMS_DB = -60.0f; //dB
     private final float MIN_RMS_VAL = (float)Math.pow(10,(MIN_RMS_DB/20));
 
     private final double TEST_THRESHOLD_AEC_ON = 0.5;
     private final double TEST_THRESHOLD_AEC_OFF = 0.6;
-    private RmsHelper mRMSRecorder1 = new RmsHelper(mBlockSizeSamples, SHOT_COUNT);
-    private RmsHelper mRMSRecorder2 = new RmsHelper(mBlockSizeSamples, SHOT_COUNT);
+    private RmsHelper mRMSRecorder1 =
+            new RmsHelper(mBlockSizeSamples, SHOT_COUNT, MIN_RMS_DB, MIN_RMS_VAL);
+    private RmsHelper mRMSRecorder2 =
+            new RmsHelper(mBlockSizeSamples, SHOT_COUNT, MIN_RMS_DB, MIN_RMS_VAL);
 
-    private RmsHelper mRMSPlayer1 = new RmsHelper(mBlockSizeSamples, SHOT_COUNT);
-    private RmsHelper mRMSPlayer2 = new RmsHelper(mBlockSizeSamples, SHOT_COUNT);
+    private RmsHelper mRMSPlayer1 =
+            new RmsHelper(mBlockSizeSamples, SHOT_COUNT, MIN_RMS_DB, MIN_RMS_VAL);
+    private RmsHelper mRMSPlayer2 =
+            new RmsHelper(mBlockSizeSamples, SHOT_COUNT, MIN_RMS_DB, MIN_RMS_VAL);
 
     private Thread mTestThread;
 
-    //RMS helpers
-    public class RmsHelper {
-        private double mRmsCurrent;
-        public int mBlockSize;
-        private int mShoutCount;
-        public boolean mRunning = false;
-
-        private short[] mAudioShortArray;
-
-        private DspBufferDouble mRmsSnapshots;
-        private int mShotIndex;
-
-        public RmsHelper(int blockSize, int shotCount) {
-            mBlockSize = blockSize;
-            mShoutCount = shotCount;
-            reset();
-        }
-
-        public void reset() {
-            mAudioShortArray = new short[mBlockSize];
-            mRmsSnapshots = new DspBufferDouble(mShoutCount);
-            mShotIndex = 0;
-            mRmsCurrent = 0;
-            mRunning = false;
-        }
-
-        public void captureShot() {
-            if (mShotIndex >= 0 && mShotIndex < mRmsSnapshots.getSize()) {
-                mRmsSnapshots.setValue(mShotIndex++, mRmsCurrent);
-            }
-        }
-
-        public void setRunning(boolean running) {
-            mRunning = running;
-        }
-
-        public double getRmsCurrent() {
-            return mRmsCurrent;
-        }
-
-        public DspBufferDouble getRmsSnapshots() {
-            return mRmsSnapshots;
-        }
-
-        public boolean updateRms(PipeShort pipe, int channelCount, int channel) {
-            if (mRunning) {
-                int samplesAvailable = pipe.availableToRead();
-                while (samplesAvailable >= mBlockSize) {
-                    pipe.read(mAudioShortArray, 0, mBlockSize);
-
-                    double rmsTempSum = 0;
-                    int count = 0;
-                    for (int i = channel; i < mBlockSize; i += channelCount) {
-                        float value = mAudioShortArray[i] / MAX_VAL;
-
-                        rmsTempSum += value * value;
-                        count++;
-                    }
-                    float rms = count > 0 ? (float)Math.sqrt(rmsTempSum / count) : 0f;
-                    if (rms < MIN_RMS_VAL) {
-                        rms = MIN_RMS_VAL;
-                    }
-
-                    double alpha = 0.9;
-                    double total_rms = rms * alpha + mRmsCurrent * (1.0f - alpha);
-                    mRmsCurrent = total_rms;
-
-                    samplesAvailable = pipe.availableToRead();
-                }
-                return true;
-            }
-            return false;
-        }
-    }
+    // ReportLog schema
+    private static final String SECTION_AEC = "aec_activity";
+    private static final String KEY_AEC_MANDATORY = "aec_mandatory";
+    private static final String KEY_AEC_MAX_WITH = "max_with_aec";
+    private static final String KEY_AEC_MAX_WITHOUT = "max_without_aec";
+    private static final String KEY_AEC_RESULT = "result_string";
 
     //compute Acoustic Coupling Factor
     private double computeAcousticCouplingFactor(DspBufferDouble buffRmsPlayer,
@@ -196,7 +143,7 @@
         super.onCreate(savedInstanceState);
         setContentView(R.layout.audio_aec_activity);
 
-        //
+        // "AEC Mandatory" Buttons
         mLinearLayout = (LinearLayout)findViewById(R.id.audio_aec_test_layout);
         mButtonMandatoryYes = (Button) findViewById(R.id.audio_aec_mandatory_yes);
         mButtonMandatoryYes.setOnClickListener(this);
@@ -204,16 +151,15 @@
         mButtonMandatoryNo.setOnClickListener(this);
         enableUILayout(mLinearLayout, false);
 
-        // Test
+        // Test Button
         mButtonTest = (Button) findViewById(R.id.audio_aec_button_test);
         mButtonTest.setOnClickListener(this);
         mProgress = (ProgressBar) findViewById(R.id.audio_aec_test_progress_bar);
         mResultTest = (TextView) findViewById(R.id.audio_aec_test_result);
 
-        showView(mProgress, false);
+        showProgressIndicator(false);
 
         mSPlayer = new SoundPlayerObject(false, mBlockSizeSamples) {
-
             @Override
             public void periodicNotification(AudioTrack track) {
                 int channelCount = getChannelCount();
@@ -233,37 +179,31 @@
 
         setPassFailButtonClickListeners();
         getPassButton().setEnabled(false);
-        setInfoResources(R.string.audio_aec_test,
-                R.string.audio_aec_info, -1);
+        setInfoResources(R.string.audio_aec_test, R.string.audio_aec_info, -1);
     }
 
-    private void showView(View v, boolean show) {
-        v.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
+    private void showProgressIndicator(boolean show) {
+        mProgress.setVisibility(show ? View.VISIBLE : View.INVISIBLE);
     }
 
     @Override
     public void onClick(View v) {
         int id = v.getId();
-        switch (id) {
-            case R.id.audio_aec_button_test:
-                startTest();
-                break;
-            case R.id.audio_aec_mandatory_no:
-                enableUILayout(mLinearLayout,false);
-                getPassButton().setEnabled(true);
-                mButtonMandatoryNo.setEnabled(false);
-                mButtonMandatoryYes.setEnabled(false);
-                mMandatory = false;
-                Log.v(TAG,"AEC marked as NOT mandatory");
-                break;
-            case R.id.audio_aec_mandatory_yes:
-                enableUILayout(mLinearLayout,true);
-                mButtonMandatoryNo.setEnabled(false);
-                mButtonMandatoryYes.setEnabled(false);
-                mMandatory = true;
-                Log.v(TAG,"AEC marked as mandatory");
-                break;
-
+        if (id == R.id.audio_aec_button_test) {
+            startTest();
+        } else if (id == R.id.audio_aec_mandatory_no) {
+            enableUILayout(mLinearLayout, false);
+            getPassButton().setEnabled(true);
+            mButtonMandatoryNo.setEnabled(false);
+            mButtonMandatoryYes.setEnabled(false);
+            mMandatory = false;
+            Log.v(TAG, "AEC marked as NOT mandatory");
+        } else if (id == R.id.audio_aec_mandatory_yes) {
+            enableUILayout(mLinearLayout, true);
+            mButtonMandatoryNo.setEnabled(false);
+            mButtonMandatoryYes.setEnabled(false);
+            mMandatory = true;
+            Log.v(TAG, "AEC marked as mandatory");
         }
     }
 
@@ -273,7 +213,11 @@
             Log.v(TAG,"test Thread already running.");
             return;
         }
+
         mTestThread = new Thread(new AudioTestRunner(TAG, TEST_AEC, mMessageHandler) {
+            // AcousticEchoCanceler
+            private AcousticEchoCanceler mAec;
+
             public void run() {
                 super.run();
 
@@ -489,28 +433,39 @@
                                   String msg) {
 
         CtsVerifierReportLog reportLog = getReportLog();
-        reportLog.addValue("AEC_mandatory",
+        reportLog.addValue(KEY_AEC_MANDATORY,
                 aecMandatory,
                 ResultType.NEUTRAL,
                 ResultUnit.NONE);
 
-        reportLog.addValue("max_with_AEC",
+        reportLog.addValue(KEY_AEC_MAX_WITH,
                 maxAEC,
                 ResultType.LOWER_BETTER,
                 ResultUnit.SCORE);
 
-        reportLog.addValue("max_without_AEC",
+        reportLog.addValue(KEY_AEC_MAX_WITHOUT,
                 maxNoAEC,
                 ResultType.HIGHER_BETTER,
                 ResultUnit.SCORE);
 
-        reportLog.addValue("result_string",
+        reportLog.addValue(KEY_AEC_RESULT,
                 msg,
                 ResultType.NEUTRAL,
                 ResultUnit.NONE);
     }
 
-    @Override // PassFailButtons
+    //
+    // PassFailButtons Overrides
+    //
+    @Override
+    public String getReportFileName() { return PassFailButtons.AUDIO_TESTS_REPORT_LOG_NAME; }
+
+    @Override
+    public final String getReportSectionName() {
+        return setTestNameSuffix(sCurrentDisplayMode, SECTION_AEC);
+    }
+
+    @Override
     public void recordTestResults() {
         getReportLog().submit();
     }
@@ -522,7 +477,7 @@
         public void testStarted(int testId, String str) {
             super.testStarted(testId, str);
             Log.v(TAG, "Test Started! " + testId + " str:"+str);
-            showView(mProgress, true);
+            showProgressIndicator(true);
             mTestAECPassed = false;
             getPassButton().setEnabled(false);
             mResultTest.setText("test in progress..");
@@ -539,7 +494,7 @@
         public void testEndedOk(int testId, String str) {
             super.testEndedOk(testId, str);
             Log.v(TAG, "Test EndedOk. " + testId + " str:"+str);
-            showView(mProgress, false);
+            showProgressIndicator(false);
             mResultTest.setText("test completed. " + str);
             if (mTestAECPassed) {
                 getPassButton().setEnabled(true);;
@@ -550,7 +505,7 @@
         public void testEndedError(int testId, String str) {
             super.testEndedError(testId, str);
             Log.v(TAG, "Test EndedError. " + testId + " str:"+str);
-            showView(mProgress, false);
+            showProgressIndicator(false);
             mResultTest.setText("test failed. " + str);
         }
     };
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioColdStartBaseActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioColdStartBaseActivity.java
index 0d06c48..66dc4a3 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioColdStartBaseActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioColdStartBaseActivity.java
@@ -169,36 +169,29 @@
     //
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.audioJavaApiBtn:
-                stopAudioTest();
-                updateTestStateButtons();
-                clearResults();
-                mAudioApi = BuilderBase.TYPE_JAVA;
-                break;
+        int id = v.getId();
+        if (id == R.id.audioJavaApiBtn) {
+            stopAudioTest();
+            updateTestStateButtons();
+            clearResults();
+            mAudioApi = BuilderBase.TYPE_JAVA;
+        } else if (id == R.id.audioNativeApiBtn) {
+            stopAudioTest();
+            updateTestStateButtons();
+            clearResults();
+            mAudioApi = BuilderBase.TYPE_OBOE;
+        } else if (id == R.id.coldstart_start_btn) {
+            startAudioTest();
 
-            case R.id.audioNativeApiBtn:
-                stopAudioTest();
-                updateTestStateButtons();
-                clearResults();
-                mAudioApi = BuilderBase.TYPE_OBOE;
-                break;
+            showAttributes();
+            showOpenTime();
+            showStartTime();
 
-            case R.id.coldstart_start_btn:
-                startAudioTest();
+            updateTestStateButtons();
+        } else if (id == R.id.coldstart_stop_btn) {
+            stopAudioTest();
 
-                showAttributes();
-                showOpenTime();
-                showStartTime();
-
-                updateTestStateButtons();
-                break;
-
-            case R.id.coldstart_stop_btn:
-                stopAudioTest();
-
-                updateTestStateButtons();
-                break;
+            updateTestStateButtons();
         }
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioDescriptorActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioDescriptorActivity.java
new file mode 100644
index 0000000..52164a5
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioDescriptorActivity.java
@@ -0,0 +1,429 @@
+/*
+ * Copyright (C) 2022 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.cts.verifier.audio;
+
+import android.app.AlertDialog;
+import android.content.DialogInterface;
+import android.media.AudioDescriptor;
+import android.media.AudioDeviceCallback;
+import android.media.AudioDeviceInfo;
+import android.media.AudioManager;
+import android.os.Bundle;
+import android.util.Log;
+import android.util.Pair;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.CheckBox;
+import android.widget.TextView;
+
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
+import com.android.cts.verifier.CtsVerifierReportLog;
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.TreeMap;
+
+/**
+ * AudioDescriptorActivity is used to test if the reported AudioDescriptor is valid and necessary.
+ * AudioDescriptor is introduced for the HAL to report the device capabilities that have formats
+ * unknown to Android. But it is also mandatory to report device capabilities using Android defined
+ * enums as long as it is possible so that the developers won't need to parse AudioDescriptor.
+ */
+public class AudioDescriptorActivity extends PassFailButtons.Activity {
+    private static final String TAG = "AudioDescriptorActivity";
+
+    // ReportLog Schema
+    private static final String KEY_CLAIMS_HDMI = "claims_hdmi";
+    private static final String KEY_HAL_VERSION = "audio_hal_version";
+    private static final String KEY_AUDIO_DESCRIPTOR = "audio_descriptor";
+
+    // Audio HAL type
+    private static final int HAL_TYPE_UNKNOWN = 0;
+    private static final int HAL_TYPE_HIDL = 1;
+
+    private static final int EXTENSION_FORMAT_CODE = 15;
+
+    // Description of not used format extended codes can be found at
+    // https://en.wikipedia.org/wiki/Extended_Display_Identification_Data.
+    private static final Set<Integer> NOT_USED_FORMAT_EXTENDED_CODES = new HashSet<Integer>() {{
+            add(1);
+            add(2);
+            add(3);
+        }};
+
+    // Description of short audio descriptor can be found at
+    // https://en.wikipedia.org/wiki/Extended_Display_Identification_Data.
+    // The collection is sorted decreasingly by HAL version.
+    private static final SortedMap<HalVersion, HalFormats> ALL_HAL_FORMATS =
+            new TreeMap<>(Collections.reverseOrder()) {{
+            // Formats defined by audio HAL v7.0 can be found at
+            // hardware/interfaces/audio/7.0/config/audio_policy_configuration.xsd
+            put(new HalVersion(HAL_TYPE_HIDL, 7 /*majorVersion*/, 0 /*minorVersion*/),
+                    new HalFormats(new HashMap<Integer, String>() {{
+                            put(2, "AC-3");
+                            put(4, "MP3");
+                            put(6, "AAC-LC");
+                            put(11, "DTS-HD");
+                            put(12, "Dolby TrueHD");
+                        }},
+                    new HashMap<Integer, String>() {{
+                            put(7, "DRA");
+                            // put(11, "MPEG-H"); MPEG-H is defined by Android but its capability
+                            // can only be reported by short audio descriptor.
+                            put(12, "AC-4");
+                        }}));
+        }};
+
+    private AudioManager mAudioManager;
+
+    private boolean mClaimsHDMI;
+    private AudioDeviceInfo mHDMIDeviceInfo;
+
+    private CheckBox mClaimsHDMICheckBox;
+    private TextView mHDMISupportLbl;
+
+    private OnBtnClickListener mClickListener = new OnBtnClickListener();
+
+    TextView mTestStatusLbl;
+
+    boolean mIsValidHal;
+    String mHalVersionStr;
+    String mInvalidHalErrorMsg;
+    HalFormats mHalFormats;
+
+    AudioDescriptor mLastTestedAudioDescriptor;
+
+    @Override
+    protected void onCreate(Bundle savedInstceState) {
+        super.onCreate(savedInstceState);
+        setContentView(R.layout.audio_descriptor);
+
+        mAudioManager = getSystemService(AudioManager.class);
+        mAudioManager.registerAudioDeviceCallback(new TestAudioDeviceCallback(), null);
+
+        mClaimsHDMICheckBox = (CheckBox) findViewById(R.id.audioDescriptorHasHDMICheckBox);
+        mClaimsHDMICheckBox.setOnClickListener(mClickListener);
+        mHDMISupportLbl = (TextView) findViewById(R.id.audioDescriptorHDMISupportLbl);
+        mTestStatusLbl = (TextView) findViewById(R.id.audioDescriptorTestStatusLbl);
+
+        setInfoResources(R.string.audio_descriptor_test, R.string.audio_descriptor_test_info, -1);
+        setPassFailButtonClickListeners();
+        detectHalVersion();
+        displayTestResult();
+    }
+
+    @Override
+    public void recordTestResults() {
+        CtsVerifierReportLog reportLog = getReportLog();
+
+        reportLog.addValue(
+                KEY_CLAIMS_HDMI,
+                mClaimsHDMI,
+                ResultType.NEUTRAL,
+                ResultUnit.NONE);
+        reportLog.addValue(
+                KEY_HAL_VERSION,
+                mHalVersionStr,
+                ResultType.NEUTRAL,
+                ResultUnit.NONE);
+        Log.i("flamme", "halVersion:" + mHalVersionStr);
+        reportLog.addValue(
+                KEY_AUDIO_DESCRIPTOR,
+                mLastTestedAudioDescriptor == null ? "" : mLastTestedAudioDescriptor.toString(),
+                ResultType.NEUTRAL,
+                ResultUnit.NONE);
+        Log.i("flamme", "desc:" + mLastTestedAudioDescriptor);
+
+        reportLog.submit();
+    }
+
+    private void detectHalVersion() {
+        try {
+            mHalVersionStr = mAudioManager.getHalVersion();
+            HalVersion halVersion = new HalVersion(mHalVersionStr);
+            if (!halVersion.isValid()) {
+                mIsValidHal = false;
+                mInvalidHalErrorMsg = getResources().getString(
+                        R.string.audio_descriptor_invalid_hal_version, mHalVersionStr);
+                return;
+            }
+            mHalFormats = getHalFormats(halVersion);
+            mIsValidHal = true;
+            mInvalidHalErrorMsg = "";
+        } catch (Exception e) {
+            mIsValidHal = false;
+            mInvalidHalErrorMsg = getResources().getString(
+                    R.string.audio_descriptor_cannot_get_hal_version);
+        }
+    }
+
+    private void detectHDMIDevice() {
+        mHDMIDeviceInfo = null;
+        AudioDeviceInfo[] deviceInfos = mAudioManager.getDevices(AudioManager.GET_DEVICES_ALL);
+        for (AudioDeviceInfo deviceInfo : deviceInfos) {
+            Log.i(TAG, "  " + deviceInfo.getProductName() + " type:" + deviceInfo.getType());
+            if (deviceInfo.isSink() && deviceInfo.getType() == AudioDeviceInfo.TYPE_HDMI) {
+                mHDMIDeviceInfo = deviceInfo;
+                break;
+            }
+        }
+
+        if (mHDMIDeviceInfo != null) {
+            mClaimsHDMICheckBox.setChecked(true);
+        }
+    }
+
+    protected void onDeviceConnectionChanged() {
+        detectHDMIDevice();
+        displayTestResult();
+    }
+
+    private class OnBtnClickListener implements OnClickListener {
+        @Override
+        public void onClick(View v) {
+            int id = v.getId();
+            if (id == R.id.audioDescriptorHasHDMICheckBox) {
+                Log.i(TAG, "HDMI check box is clicked");
+                if (mClaimsHDMICheckBox.isChecked()) {
+                    AlertDialog.Builder builder = new AlertDialog.Builder(
+                            v.getContext(), android.R.style.Theme_Material_Dialog_Alert);
+                    builder.setTitle(R.string.audio_descriptor_hdmi_info_title);
+                    builder.setMessage(R.string.audio_descriptor_hdmi_message);
+                    builder.setPositiveButton(android.R.string.yes,
+                            new DialogInterface.OnClickListener() {
+                                public void onClick(DialogInterface dialog, int which) {
+                                }
+                            });
+                    builder.setIcon(android.R.drawable.ic_dialog_alert);
+                    builder.show();
+
+                    mClaimsHDMI = true;
+                } else {
+                    mClaimsHDMI = false;
+                    mHDMISupportLbl.setText(R.string.audio_proaudio_NA);
+                }
+                detectHDMIDevice();
+                displayTestResult();
+            }
+        }
+    }
+
+    private void displayTestResult() {
+        if (mClaimsHDMI && mHDMIDeviceInfo == null) {
+            mHDMISupportLbl.setText(R.string.audio_descriptor_hdmi_pending);
+            getPassButton().setEnabled(false);
+            mTestStatusLbl.setText("");
+            return;
+        }
+        if (!mIsValidHal) {
+            getPassButton().setEnabled(false);
+            mTestStatusLbl.setText(mInvalidHalErrorMsg);
+            return;
+        }
+        Pair<Boolean, String> testResult = testAudioDescriptors();
+        getPassButton().setEnabled(testResult.first);
+        mTestStatusLbl.setText(testResult.second);
+    }
+
+    private Pair<Boolean, String> testAudioDescriptors() {
+        AudioDeviceInfo[] devices = mAudioManager.getDevices(AudioManager.GET_DEVICES_ALL);
+        for (AudioDeviceInfo device : devices) {
+            for (AudioDescriptor descriptor : device.getAudioDescriptors()) {
+                mLastTestedAudioDescriptor = descriptor;
+                Pair<Boolean, String> ret = isAudioDescriptorValid(descriptor);
+                if (!ret.first) {
+                    return ret;
+                }
+            }
+        }
+        return new Pair<>(true, getResources().getString(R.string.audio_descriptor_pass));
+    }
+
+    private Pair<Boolean, String> isAudioDescriptorValid(AudioDescriptor descriptor) {
+        if (descriptor.getStandard() == AudioDescriptor.STANDARD_NONE) {
+            return new Pair<>(
+                    false, getResources().getString(R.string.audio_descriptor_standard_none));
+        }
+        if (descriptor.getDescriptor() == null) {
+            return new Pair<>(
+                    false, getResources().getString(R.string.audio_descriptor_is_null));
+        }
+        switch (descriptor.getStandard()) {
+            case AudioDescriptor.STANDARD_EDID:
+                return verifyShortAudioDescriptor(descriptor.getDescriptor());
+            default:
+                return new Pair<>(false, getResources().getString(
+                        R.string.audio_descriptor_unrecognized_standard, descriptor.getStandard()));
+        }
+    }
+
+    /**
+     * Verify if short audio descriptor is valid and necessary. The length of short audio descriptor
+     * must be 3. Short audio descriptor is only needed when it can not be reported by Android
+     * defined enums.
+     *
+     * @param sad a byte array of short audio descriptor
+     * @return a pair where first object indicates if the short audio descriptor is valid and
+     *         necessary and the second object is the error message.
+     */
+    private Pair<Boolean, String> verifyShortAudioDescriptor(byte[] sad) {
+        if (sad.length != 3) {
+            return new Pair<>(false, getResources().getString(
+                    R.string.audio_descriptor_length_error, sad.length));
+        }
+
+        if (!mIsValidHal) {
+            return new Pair<>(false, mInvalidHalErrorMsg);
+        }
+
+        if (mHalFormats == null) {
+            Log.i(TAG, "No HAL formats found for v" + mHalVersionStr);
+            return new Pair<>(true, getResources().getString(R.string.audio_descriptor_pass));
+        }
+
+        // Parse according CTA-861-G, section 7.5.2.
+        final int formatCode = (sad[0] >> 3) & 0xf;
+        if (mHalFormats.getFormatCodes().containsKey(formatCode)) {
+            return new Pair<>(false, getResources().getString(
+                    R.string.audio_descriptor_format_code_should_not_be_reported,
+                    formatCode,
+                    mHalFormats.getFormatCodes().get(formatCode)));
+        } else if (formatCode == EXTENSION_FORMAT_CODE) {
+            final int formatExtendedCode = sad[2] >> 3;
+            if (mHalFormats.getExtendedFormatCodes().containsKey(formatExtendedCode)) {
+                return new Pair<>(false, getResources().getString(
+                        R.string.audio_descriptor_format_extended_code_should_not_be_reported,
+                        formatExtendedCode,
+                        mHalFormats.getExtendedFormatCodes().get(formatExtendedCode)));
+            } else if (NOT_USED_FORMAT_EXTENDED_CODES.contains(formatExtendedCode)) {
+                return new Pair<>(false, getResources().getString(
+                        R.string.audio_descriptor_format_extended_code_is_not_used,
+                        formatExtendedCode));
+            }
+        }
+        return new Pair<>(true, getResources().getString(R.string.audio_descriptor_pass));
+    }
+
+    static class HalVersion implements Comparable<HalVersion> {
+        private final int mHalType;
+        private final int mMajorVersion;
+        private final int mMinorVersion;
+
+        HalVersion(int halType, int majorVersion, int minorVersion) {
+            mHalType = halType;
+            mMajorVersion = majorVersion;
+            mMinorVersion = minorVersion;
+        }
+
+        HalVersion(String halVersion) {
+            int halType = HAL_TYPE_UNKNOWN;
+            int majorVersion = -1;
+            int minorVersion = -1;
+            if (halVersion != null) {
+                String[] versions = halVersion.split("\\.");
+                if (versions.length == 2) {
+                    try {
+                        majorVersion = Integer.parseInt(versions[0]);
+                        minorVersion = Integer.parseInt(versions[1]);
+                        halType = HAL_TYPE_HIDL;
+                    } catch (NumberFormatException e) {
+                        Log.e(TAG, "Unable to parse hal version: " + halVersion);
+                    }
+                }
+            }
+            mHalType = halType;
+            mMajorVersion = majorVersion;
+            mMinorVersion = minorVersion;
+        }
+
+        boolean isValid() {
+            return mHalType != HAL_TYPE_UNKNOWN;
+        }
+
+        /**
+         * Compare two HAL versions.
+         * @return 0 if the HAL version is the same as the other HAL version. Positive if the HAL
+         *         version is newer than the other HAL version. Negative if the HAL version is
+         *         older than the other version.
+         */
+        @Override
+        public int compareTo(HalVersion that) {
+            // Note that currently only HIDL hal here. New HAL type may be added in the future.
+            if (mMajorVersion > that.mMajorVersion) {
+                return 1;
+            } else if (mMajorVersion < that.mMajorVersion) {
+                return -1;
+            }
+            // Major version is the same one. Compare minor version.
+            return mMinorVersion > that.mMinorVersion ? 1
+                    : mMinorVersion < that.mMinorVersion ? -1 : 0;
+        }
+
+        @Override
+        public boolean equals(Object that) {
+            if (that == null) return false;
+            if (that == this) return true;
+            if (!(that instanceof HalVersion)) return false;
+            return this.compareTo((HalVersion) that) == 0;
+        }
+    }
+
+    private HalFormats getHalFormats(HalVersion halVersion) {
+        for (Map.Entry<HalVersion, HalFormats> entry : ALL_HAL_FORMATS.entrySet()) {
+            if (halVersion.compareTo(entry.getKey()) >= 0) {
+                return entry.getValue();
+            }
+        }
+        return null;
+    }
+
+    static class HalFormats {
+        private final Map<Integer, String> mFormatCodes;
+        private final Map<Integer, String> mExtendedFormatCodes;
+
+        HalFormats(Map<Integer, String> formatCodes,
+                   Map<Integer, String> extendedFormatCodes) {
+            mFormatCodes = formatCodes;
+            mExtendedFormatCodes = extendedFormatCodes;
+        }
+
+        Map<Integer, String> getFormatCodes() {
+            return mFormatCodes;
+        }
+
+        Map<Integer, String> getExtendedFormatCodes() {
+            return mExtendedFormatCodes;
+        }
+    }
+
+    private class TestAudioDeviceCallback extends AudioDeviceCallback {
+        public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
+            onDeviceConnectionChanged();
+        }
+
+        public void onAudioDevicesRemoved(AudioDeviceInfo[] removedDevices) {
+            onDeviceConnectionChanged();
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyActivity.java
index d3af563..d992e98 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyActivity.java
@@ -16,13 +16,6 @@
 
 package com.android.cts.verifier.audio;
 
-import com.android.cts.verifier.PassFailButtons;
-import com.android.cts.verifier.R;
-import com.android.cts.verifier.audio.wavelib.*;
-import com.android.compatibility.common.util.ReportLog;
-import com.android.compatibility.common.util.ResultType;
-import com.android.compatibility.common.util.ResultUnit;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.media.AudioDeviceCallback;
@@ -36,6 +29,11 @@
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
 /**
  * Audio Frequency Test base activity
  */
@@ -88,24 +86,19 @@
     private class OnBtnClickListener implements OnClickListener {
         @Override
         public void onClick(View v) {
-            switch (v.getId()) {
-                case R.id.refmic_tests_yes_btn:
-                    recordRefMicStatus(true);
-                    enableTestUI(true);
-                    // disable test button so that they will now run the test(s)
-                    getPassButton().setEnabled(false);
-                    break;
-
-                case R.id.refmic_tests_no_btn:
-                    recordRefMicStatus(false);
-                    enableTestUI(false);
-                    // Allow the user to "pass" the test.
-                    getPassButton().setEnabled(true);
-                    break;
-
-                case R.id.refmic_test_info_btn:
-                    showRefMicInfoDialog();
-                    break;
+            int id = v.getId();
+            if (id == R.id.refmic_tests_yes_btn) {
+                recordRefMicStatus(true);
+                enableTestUI(true);
+                // disable test button so that they will now run the test(s)
+                getPassButton().setEnabled(false);
+            } else if (id == R.id.refmic_tests_no_btn) {
+                recordRefMicStatus(false);
+                enableTestUI(false);
+                // Allow the user to "pass" the test.
+                getPassButton().setEnabled(true);
+            } else if (id == R.id.refmic_test_info_btn) {
+                showRefMicInfoDialog();
             }
         }
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyLineActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyLineActivity.java
index 22e2c7d..9b24039 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyLineActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyLineActivity.java
@@ -16,12 +16,6 @@
 
 package com.android.cts.verifier.audio;
 
-import com.android.cts.verifier.CtsVerifierReportLog;
-import com.android.cts.verifier.R;
-import com.android.cts.verifier.audio.wavelib.*;
-import com.android.compatibility.common.util.ResultType;
-import com.android.compatibility.common.util.ResultUnit;
-
 import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.media.MediaRecorder;
@@ -33,8 +27,21 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-import android.widget.TextView;
 import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
+import com.android.cts.verifier.audio.soundio.SoundPlayerObject;
+import com.android.cts.verifier.CtsVerifierReportLog;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.audio.wavelib.DspBufferComplex;
+import com.android.cts.verifier.audio.wavelib.DspBufferDouble;
+import com.android.cts.verifier.audio.wavelib.DspBufferMath;
+import com.android.cts.verifier.audio.wavelib.DspFftServer;
+import com.android.cts.verifier.audio.wavelib.DspWindow;
+import com.android.cts.verifier.audio.wavelib.PipeShort;
+import com.android.cts.verifier.audio.wavelib.VectorAverage;
 
 /**
  * Tests Audio Device roundtrip latency by using a loopback plug.
@@ -94,32 +101,28 @@
     private class OnBtnClickListener implements OnClickListener {
         @Override
         public void onClick(View v) {
-            switch (v.getId()) {
-                case R.id.audio_frequency_line_plug_ready_btn:
-                    Log.i(TAG, "audio loopback plug ready");
-                    //enable all the other views.
-                    enableLayout(R.id.audio_frequency_line_layout,true);
-                    setMaxLevel();
-                    testMaxLevel();
-                    break;
-                case R.id.audio_frequency_line_test_btn:
-                    Log.i(TAG, "audio loopback test");
-                    startAudioTest();
-                    break;
-                case R.id.audio_wired_yes:
-                    Log.i(TAG, "User confirms wired Port existence");
-                    mLoopbackPlugReady.setEnabled(true);
-                    recordHeasetPortFound(true);
-                    mWiredPortYes.setEnabled(false);
-                    mWiredPortNo.setEnabled(false);
-                    break;
-                case R.id.audio_wired_no:
-                    Log.i(TAG, "User denies wired Port existence");
-                    recordHeasetPortFound(false);
-                    getPassButton().setEnabled(true);
-                    mWiredPortYes.setEnabled(false);
-                    mWiredPortNo.setEnabled(false);
-                    break;
+            int id = v.getId();
+            if (id == R.id.audio_frequency_line_plug_ready_btn) {
+                Log.i(TAG, "audio loopback plug ready");
+                //enable all the other views.
+                enableLayout(R.id.audio_frequency_line_layout, true);
+                setMaxLevel();
+                testMaxLevel();
+            } else if (id == R.id.audio_frequency_line_test_btn) {
+                Log.i(TAG, "audio loopback test");
+                startAudioTest();
+            } else if (id == R.id.audio_wired_yes) {
+                Log.i(TAG, "User confirms wired Port existence");
+                mLoopbackPlugReady.setEnabled(true);
+                recordHeasetPortFound(true);
+                mWiredPortYes.setEnabled(false);
+                mWiredPortNo.setEnabled(false);
+            } else if (id == R.id.audio_wired_no) {
+                Log.i(TAG, "User denies wired Port existence");
+                recordHeasetPortFound(false);
+                getPassButton().setEnabled(true);
+                mWiredPortYes.setEnabled(false);
+                mWiredPortNo.setEnabled(false);
             }
         }
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyMicActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyMicActivity.java
index 72f5ae1..e066943 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyMicActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyMicActivity.java
@@ -16,35 +16,34 @@
 
 package com.android.cts.verifier.audio;
 
-import com.android.cts.verifier.R;
-
-import com.android.cts.verifier.CtsVerifierReportLog;
-import com.android.cts.verifier.audio.wavelib.*;
-import com.android.compatibility.common.util.ResultType;
-import com.android.compatibility.common.util.ResultUnit;
-
-import android.content.BroadcastReceiver;
-import android.content.Intent;
-import android.content.IntentFilter;
-
 import android.media.AudioFormat;
-import android.media.AudioTrack;
 import android.media.AudioRecord;
 import android.media.MediaRecorder;
-
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
-
 import android.util.Log;
-
 import android.view.View;
 import android.view.View.OnClickListener;
-
 import android.widget.Button;
-import android.widget.TextView;
 import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
+import com.android.cts.verifier.CtsVerifierReportLog;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.audio.wavelib.DspBufferComplex;
+import com.android.cts.verifier.audio.wavelib.DspBufferDouble;
+import com.android.cts.verifier.audio.wavelib.DspBufferMath;
+import com.android.cts.verifier.audio.wavelib.DspFftServer;
+import com.android.cts.verifier.audio.wavelib.DspWindow;
+import com.android.cts.verifier.audio.wavelib.PipeShort;
+import com.android.cts.verifier.audio.soundio.SoundPlayerObject;
+import com.android.cts.verifier.audio.wavelib.*;
+
+import com.android.cts.verifier.audio.wavelib.VectorAverage;
 
 /**
  * Tests Audio built in Microphone response using external speakers and USB reference microphone.
@@ -245,22 +244,16 @@
         @Override
         public void onClick(View v) {
             int id = v.getId();
-            switch (id) {
-            case R.id.frequency_mic_test_noise_btn:
+            if (id == R.id.frequency_mic_test_noise_btn) {
                 startTest(TEST_NOISE);
-                break;
-            case R.id.frequency_mic_play_noise_btn:
+            } else if (id == R.id.frequency_mic_play_noise_btn) {
                 playerToggleButton(id);
-                break;
-            case R.id.frequency_mic_test_usb_background_btn:
+            } else if (id == R.id.frequency_mic_test_usb_background_btn) {
                 startTest(TEST_USB_BACKGROUND);
-                break;
-            case R.id.frequency_mic_test_usb_noise_btn:
+            } else if (id == R.id.frequency_mic_test_usb_noise_btn) {
                 startTest(TEST_USB_NOISE);
-                break;
-            case R.id.frequency_mic_play_usb_noise_btn:
+            } else if (id == R.id.frequency_mic_play_usb_noise_btn) {
                 playerToggleButton(id);
-                break;
             }
         }
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencySpeakerActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencySpeakerActivity.java
index 3788048..0e63b6f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencySpeakerActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencySpeakerActivity.java
@@ -16,32 +16,32 @@
 
 package com.android.cts.verifier.audio;
 
-import com.android.cts.verifier.CtsVerifierReportLog;
-import com.android.cts.verifier.R;
-import com.android.cts.verifier.audio.wavelib.*;
-import com.android.compatibility.common.util.ResultType;
-import com.android.compatibility.common.util.ResultUnit;
-import android.content.BroadcastReceiver;
-import android.content.Intent;
-import android.content.IntentFilter;
-
 import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.media.MediaRecorder;
-
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.os.SystemClock;
-
 import android.util.Log;
-
 import android.view.View;
 import android.view.View.OnClickListener;
-
 import android.widget.Button;
-import android.widget.TextView;
 import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
+import com.android.cts.verifier.audio.soundio.SoundPlayerObject;
+import com.android.cts.verifier.CtsVerifierReportLog;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.audio.wavelib.DspBufferComplex;
+import com.android.cts.verifier.audio.wavelib.DspBufferDouble;
+import com.android.cts.verifier.audio.wavelib.DspBufferMath;
+import com.android.cts.verifier.audio.wavelib.DspFftServer;
+import com.android.cts.verifier.audio.wavelib.DspWindow;
+import com.android.cts.verifier.audio.wavelib.PipeShort;
+import com.android.cts.verifier.audio.wavelib.VectorAverage;
 
 /**
  * Tests Audio Device roundtrip latency by using a loopback plug.
@@ -103,15 +103,13 @@
     private class OnBtnClickListener implements OnClickListener {
         @Override
         public void onClick(View v) {
-            switch (v.getId()) {
-            case R.id.audio_frequency_speaker_mic_ready_btn:
+            int id = v.getId();
+            if (id == R.id.audio_frequency_speaker_mic_ready_btn) {
                 testUSB();
                 setMaxLevel();
                 testMaxLevel();
-                break;
-            case R.id.audio_frequency_speaker_test_btn:
+            } else if (id == R.id.audio_frequency_speaker_test_btn) {
                 startAudioTest();
-                break;
             }
         }
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyUnprocessedActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyUnprocessedActivity.java
index 5509501..ddadfff 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyUnprocessedActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyUnprocessedActivity.java
@@ -16,15 +16,8 @@
 
 package com.android.cts.verifier.audio;
 
-import com.android.cts.verifier.CtsVerifierReportLog;
-import com.android.cts.verifier.R;
-import com.android.cts.verifier.audio.wavelib.*;
-import com.android.compatibility.common.util.ResultType;
-import com.android.compatibility.common.util.ResultUnit;
-
 import android.media.AudioFormat;
 import android.media.AudioManager;
-import android.media.AudioTrack;
 import android.media.AudioRecord;
 import android.media.MediaRecorder;
 import android.os.Bundle;
@@ -35,8 +28,21 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-import android.widget.TextView;
 import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
+import com.android.cts.verifier.audio.soundio.SoundPlayerObject;
+import com.android.cts.verifier.CtsVerifierReportLog;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.audio.wavelib.DspBufferComplex;
+import com.android.cts.verifier.audio.wavelib.DspBufferDouble;
+import com.android.cts.verifier.audio.wavelib.DspBufferMath;
+import com.android.cts.verifier.audio.wavelib.DspFftServer;
+import com.android.cts.verifier.audio.wavelib.DspWindow;
+import com.android.cts.verifier.audio.wavelib.PipeShort;
+import com.android.cts.verifier.audio.wavelib.VectorAverage;
 
 /**
  * Tests Audio built in Microphone response for Unprocessed audio source feature.
@@ -220,7 +226,7 @@
 
         //Init bands for Mic test
         mBandSpecsMic[0] = new AudioBandSpecs(
-                5, 100,          /* frequency start,stop */
+                30, 100,          /* frequency start,stop */
                 20.0, -20.0,     /* start top,bottom value */
                 20.0, -20.0      /* stop top,bottom value */);
 
@@ -236,7 +242,7 @@
 
         //Init bands for Tone test
         mBandSpecsTone[0] = new AudioBandSpecs(
-                5, 900,          /* frequency start,stop */
+                30, 900,          /* frequency start,stop */
                 -10.0, -100.0,     /* start top,bottom value */
                 -10.0, -100.0      /* stop top,bottom value */);
 
@@ -252,7 +258,7 @@
 
       //Init bands for Background test
         mBandSpecsBack[0] = new AudioBandSpecs(
-                5, 100,          /* frequency start,stop */
+                30, 100,          /* frequency start,stop */
                 10.0, -120.0,     /* start top,bottom value */
                 -10.0, -120.0      /* stop top,bottom value */);
 
@@ -306,28 +312,20 @@
         @Override
         public void onClick(View v) {
             int id = v.getId();
-            switch (id) {
-            case R.id.unprocessed_test_tone_btn:
+            if (id == R.id.unprocessed_test_tone_btn) {
                 startTest(TEST_TONE);
-                break;
-            case R.id.unprocessed_play_tone_btn:
+            } else if (id == R.id.unprocessed_play_tone_btn) {
                 playerToggleButton(id, SOURCE_TONE);
-                break;
-            case R.id.unprocessed_test_noise_btn:
+            } else if (id == R.id.unprocessed_test_noise_btn) {
                 startTest(TEST_NOISE);
-                break;
-            case R.id.unprocessed_play_noise_btn:
+            } else if (id == R.id.unprocessed_play_noise_btn) {
                 playerToggleButton(id, SOURCE_NOISE);
-                break;
-            case R.id.unprocessed_test_usb_background_btn:
+            } else if (id == R.id.unprocessed_test_usb_background_btn) {
                 startTest(TEST_USB_BACKGROUND);
-                break;
-            case R.id.unprocessed_test_usb_noise_btn:
+            } else if (id == R.id.unprocessed_test_usb_noise_btn) {
                 startTest(TEST_USB_NOISE);
-                break;
-            case R.id.unprocessed_play_usb_noise_btn:
+            } else if (id == R.id.unprocessed_play_usb_noise_btn) {
                 playerToggleButton(id, SOURCE_NOISE);
-                break;
             }
         }
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyVoiceRecognitionActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyVoiceRecognitionActivity.java
index 5ed51e3..442f626 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyVoiceRecognitionActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioFrequencyVoiceRecognitionActivity.java
@@ -16,12 +16,6 @@
 
 package com.android.cts.verifier.audio;
 
-import com.android.cts.verifier.CtsVerifierReportLog;
-import com.android.cts.verifier.R;
-import com.android.cts.verifier.audio.wavelib.*;
-import com.android.compatibility.common.util.ResultType;
-import com.android.compatibility.common.util.ResultUnit;
-
 import android.media.AudioRecord;
 import android.media.MediaRecorder;
 import android.os.Bundle;
@@ -31,8 +25,21 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
-import android.widget.TextView;
 import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
+import com.android.cts.verifier.audio.soundio.SoundPlayerObject;
+import com.android.cts.verifier.audio.soundio.SoundRecorderObject;
+import com.android.cts.verifier.CtsVerifierReportLog;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.audio.wavelib.DspBufferComplex;
+import com.android.cts.verifier.audio.wavelib.DspBufferDouble;
+import com.android.cts.verifier.audio.wavelib.DspBufferMath;
+import com.android.cts.verifier.audio.wavelib.DspFftServer;
+import com.android.cts.verifier.audio.wavelib.DspWindow;
+import com.android.cts.verifier.audio.wavelib.VectorAverage;
 
 /**
  * Tests Audio built in Microphone response for Voice Recognition audio source feature.
@@ -349,28 +356,20 @@
         @Override
         public void onClick(View v) {
             int id = v.getId();
-            switch (id) {
-            case R.id.vr_button_test_tone:
+            if (id == R.id.vr_button_test_tone) {
                 startTest(TEST_TONE);
-                break;
-            case R.id.vr_button_play_tone:
+            } else if (id == R.id.vr_button_play_tone) {
                 playerToggleButton(id, SOURCE_TONE);
-                break;
-            case R.id.vr_button_test_noise:
+            } else if (id == R.id.vr_button_test_noise) {
                 startTest(TEST_NOISE);
-                break;
-            case R.id.vr_button_play_noise:
+            } else if (id == R.id.vr_button_play_noise) {
                 playerToggleButton(id, SOURCE_NOISE);
-                break;
-            case R.id.vr_button_test_usb_background:
+            } else if (id == R.id.vr_button_test_usb_background) {
                 startTest(TEST_USB_BACKGROUND);
-                break;
-            case R.id.vr_button_test_usb_noise:
+            } else if (id == R.id.vr_button_test_usb_noise) {
                 startTest(TEST_USB_NOISE);
-                break;
-            case R.id.vr_button_play_usb_noise:
+            } else if (id == R.id.vr_button_play_usb_noise) {
                 playerToggleButton(id, SOURCE_NOISE);
-                break;
             }
         }
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputDeviceNotificationsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputDeviceNotificationsActivity.java
index 64c2314..6a7d92e 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputDeviceNotificationsActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputDeviceNotificationsActivity.java
@@ -16,22 +16,16 @@
 
 package com.android.cts.verifier.audio;
 
-import com.android.cts.verifier.R;
-
 import android.content.Context;
-
 import android.media.AudioDeviceCallback;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
-
 import android.os.Bundle;
-
 import android.view.View;
-import android.view.View.OnClickListener;
-
-import android.widget.Button;
 import android.widget.TextView;
 
+import com.android.cts.verifier.R;
+
 /**
  * Tests Audio Device Connection events for output by prompting the user to insert/remove a
  * wired headset (or microphone) and noting the presence (or absence) of notifications.
@@ -41,13 +35,24 @@
 
     TextView mConnectView;
     TextView mDisconnectView;
-    Button mClearMsgsBtn;
+    TextView mInfoView;
+
+    boolean mHandledInitialAddedMessage = false;
+    boolean mConnectReceived = false;
+    boolean mDisconnectReceived = false;
 
     private class TestAudioDeviceCallback extends AudioDeviceCallback {
         public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
+            // we will get this message when we setup the handler, so ignore the first one.
+            if (!mHandledInitialAddedMessage) {
+                mHandledInitialAddedMessage = true;
+                return;
+            }
             if (addedDevices.length != 0) {
                 mConnectView.setText(
                     mContext.getResources().getString(R.string.audio_dev_notification_connectMsg));
+                mConnectReceived = true;
+                getPassButton().setEnabled(mConnectReceived && mDisconnectReceived);
             }
         }
 
@@ -56,35 +61,25 @@
                 mDisconnectView.setText(
                     mContext.getResources().getString(
                         R.string.audio_dev_notification_disconnectMsg));
+                mDisconnectReceived = true;
+                getPassButton().setEnabled(mConnectReceived && mDisconnectReceived);
             }
         }
     }
 
     @Override
-    protected void enableTestButtons(boolean enabled) {
-        // Nothing to do.
-    }
-
-    @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.audio_dev_notify);
 
         mContext = this;
 
-        mConnectView = (TextView)findViewById(R.id.audio_dev_notification_connect_msg);
-        mDisconnectView = (TextView)findViewById(R.id.audio_dev_notification_disconnect_msg);
+        mConnectView = (TextView) findViewById(R.id.audio_dev_notification_connect_msg);
+        mDisconnectView = (TextView) findViewById(R.id.audio_dev_notification_disconnect_msg);
 
-        ((TextView)findViewById(R.id.info_text)).setText(mContext.getResources().getString(
-                R.string.audio_in_devices_notification_instructions));
-
-        mClearMsgsBtn = (Button)findViewById(R.id.audio_dev_notification_connect_clearmsgs_btn);
-        mClearMsgsBtn.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                mConnectView.setText("");
-                mDisconnectView.setText("");
-            }
-        });
+        mInfoView = (TextView) findViewById(R.id.info_text);
+        mInfoView.setText(mContext.getResources().getString(
+                R.string.audio_devices_notification_instructions));
 
         AudioManager audioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE);
         audioManager.registerAudioDeviceCallback(new TestAudioDeviceCallback(), null);
@@ -94,4 +89,9 @@
 
         setPassFailButtonClickListeners();
     }
+
+    @Override
+    protected void enableTestButtons(boolean enabled) {
+        mInfoView.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
+    }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputRoutingNotificationsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputRoutingNotificationsActivity.java
index 4b2d213..5ee2525 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputRoutingNotificationsActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioInputRoutingNotificationsActivity.java
@@ -16,30 +16,22 @@
 
 package com.android.cts.verifier.audio;
 
-import com.android.cts.verifier.R;
-
 import android.content.Context;
-
-import android.media.AudioDeviceCallback;
 import android.media.AudioDeviceInfo;
-import android.media.AudioFormat;
-import android.media.AudioManager;
 import android.media.AudioRecord;
-
 import android.os.Bundle;
 import android.os.Handler;
-
 import android.util.Log;
-
 import android.view.View;
 import android.view.View.OnClickListener;
-
 import android.widget.Button;
 import android.widget.TextView;
 
-import org.hyphonate.megaaudio.recorder.RecorderBuilder;
-import org.hyphonate.megaaudio.recorder.Recorder;
+import com.android.cts.verifier.R;
+
 import org.hyphonate.megaaudio.recorder.JavaRecorder;
+import org.hyphonate.megaaudio.recorder.Recorder;
+import org.hyphonate.megaaudio.recorder.RecorderBuilder;
 import org.hyphonate.megaaudio.recorder.sinks.NopAudioSinkProvider;
 
 /*
@@ -50,10 +42,11 @@
 
     Button recordBtn;
     Button stopBtn;
+    TextView mInfoView;
 
     Context mContext;
 
-    int mNumRecordNotifications = 0;
+    int mNumRoutingNotifications;
 
     OnBtnClickListener mBtnClickListener = new OnBtnClickListener();
 
@@ -61,7 +54,12 @@
     static final int SAMPLE_RATE = 48000;
     int mNumFrames;
 
-    JavaRecorder mAudioRecorder;
+    private JavaRecorder mAudioRecorder;
+    private AudioRecordRoutingChangeListener mRouteChangeListener;
+    private boolean mIsRecording;
+
+    // ignore messages sent as a consequence of starting the player
+    private static final int NUM_IGNORE_MESSAGES = 2;
 
     private class OnBtnClickListener implements OnClickListener {
         @Override
@@ -70,28 +68,49 @@
                 return; // failed to create the recorder
             }
 
-            switch (v.getId()) {
-                case R.id.audio_routingnotification_recordBtn:
-                {
-                     mAudioRecorder.startStream();
-
-                    AudioRecord audioRecord = mAudioRecorder.getAudioRecord();
-                    audioRecord.addOnRoutingChangedListener(
-                            new AudioRecordRoutingChangeListener(), new Handler());
-
-                }
-                    break;
-
-                case R.id.audio_routingnotification_recordStopBtn:
-                    mAudioRecorder.stopStream();
-                    break;
+            if (v.getId() == R.id.audio_routingnotification_recordBtn) {
+                startRecording();
+            } else if (v.getId() == R.id.audio_routingnotification_recordStopBtn) {
+                stopRecording();
             }
         }
     }
 
+    private void startRecording() {
+        if (!mIsRecording) {
+            mNumRoutingNotifications = 0;
+
+            mAudioRecorder.startStream();
+
+            AudioRecord audioRecord = mAudioRecorder.getAudioRecord();
+            audioRecord.addOnRoutingChangedListener(mRouteChangeListener,
+                    new Handler());
+
+            mIsRecording = true;
+            enableRecordButtons(!mIsRecording, mIsRecording);
+        }
+    }
+
+    private void stopRecording() {
+        if (mIsRecording) {
+            mAudioRecorder.stopStream();
+
+            AudioRecord audioRecord = mAudioRecorder.getAudioRecord();
+            audioRecord.removeOnRoutingChangedListener(mRouteChangeListener);
+
+            mIsRecording = false;
+            enableRecordButtons(!mIsRecording, mIsRecording);
+        }
+    }
+
     private class AudioRecordRoutingChangeListener implements AudioRecord.OnRoutingChangedListener {
         public void onRoutingChanged(AudioRecord audioRecord) {
-            mNumRecordNotifications++;
+            // Starting recording triggers routing messages, so ignore the first one.
+            mNumRoutingNotifications++;
+            if (mNumRoutingNotifications <= NUM_IGNORE_MESSAGES) {
+                return;
+            }
+
             TextView textView =
                     (TextView)findViewById(R.id.audio_routingnotification_audioRecord_change);
             String msg = mContext.getResources().getString(
@@ -101,13 +120,20 @@
             int deviceType = routedDevice != null ? routedDevice.getType() : -1;
             textView.setText(msg + " - " +
                              deviceName + " [0x" + Integer.toHexString(deviceType) + "]" +
-                             " - " + mNumRecordNotifications);
+                             " - " + mNumRoutingNotifications);
+            getPassButton().setEnabled(true);
         }
     }
 
+    @Override
     protected void enableTestButtons(boolean enabled) {
-        recordBtn.setEnabled(enabled);
-        stopBtn.setEnabled(enabled);
+        enableRecordButtons(!mIsRecording, mIsRecording);
+        mInfoView.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
+    }
+
+    void enableRecordButtons(boolean enableRecord, boolean enableStop) {
+        recordBtn.setEnabled(enableRecord);
+        stopBtn.setEnabled(enableStop);
     }
 
     @Override
@@ -116,11 +142,15 @@
         setContentView(R.layout.audio_input_routingnotifications_test);
 
         Button btn;
-        recordBtn = (Button)findViewById(R.id.audio_routingnotification_recordBtn);
+        recordBtn = (Button) findViewById(R.id.audio_routingnotification_recordBtn);
         recordBtn.setOnClickListener(mBtnClickListener);
-        stopBtn = (Button)findViewById(R.id.audio_routingnotification_recordStopBtn);
+        stopBtn = (Button) findViewById(R.id.audio_routingnotification_recordStopBtn);
         stopBtn.setOnClickListener(mBtnClickListener);
 
+        enableRecordButtons(false, false);
+
+        mInfoView = (TextView) findViewById(R.id.info_text);
+
         mContext = this;
 
         // Setup Recorder
@@ -137,17 +167,18 @@
             Log.e(TAG, "Failed MegaRecorder build.");
         }
 
+        mRouteChangeListener = new AudioRecordRoutingChangeListener();
+        AudioRecord audioRecord = mAudioRecorder.getAudioRecord();
+        audioRecord.addOnRoutingChangedListener(mRouteChangeListener, new Handler());
+
         // "Honor System" buttons
         super.setup();
-
         setPassFailButtonClickListeners();
     }
 
     @Override
     public void onBackPressed () {
-        if (mAudioRecorder != null) {
-            mAudioRecorder.stopStream();
-        }
+        stopRecording();
         super.onBackPressed();
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioLoopbackLatencyActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioLoopbackLatencyActivity.java
index 8ee3446..a77fa32 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioLoopbackLatencyActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioLoopbackLatencyActivity.java
@@ -16,7 +16,9 @@
 
 package com.android.cts.verifier.audio;
 
-import android.app.AlertDialog;
+import static com.android.cts.verifier.TestListActivity.sCurrentDisplayMode;
+import static com.android.cts.verifier.TestListAdapter.setTestNameSuffix;
+
 import android.media.AudioDeviceCallback;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
@@ -27,7 +29,6 @@
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
-import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.SeekBar;
@@ -35,15 +36,12 @@
 
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
-import com.android.cts.verifier.audio.audiolib.AudioSystemFlags;
-import com.android.cts.verifier.audio.audiolib.StatUtils;
-import com.android.cts.verifier.audio.audiolib.AudioUtils;
 import com.android.cts.verifier.CtsVerifierReportLog;
 import com.android.cts.verifier.PassFailButtons;
 import com.android.cts.verifier.R;
-
-import static com.android.cts.verifier.TestListActivity.sCurrentDisplayMode;
-import static com.android.cts.verifier.TestListAdapter.setTestNameSuffix;
+import com.android.cts.verifier.audio.audiolib.AudioSystemFlags;
+import com.android.cts.verifier.audio.audiolib.AudioUtils;
+import com.android.cts.verifier.audio.audiolib.StatUtils;
 
 /**
  * CtsVerifier Audio Loopback Latency Test
@@ -683,11 +681,9 @@
     private class OnBtnClickListener implements OnClickListener {
         @Override
         public void onClick(View v) {
-            switch (v.getId()) {
-                case R.id.audio_loopback_test_btn:
-                    Log.i(TAG, "audio loopback test");
-                    startAudioTest(mMessageHandler);
-                    break;
+            if (v.getId() == R.id.audio_loopback_test_btn) {
+                Log.i(TAG, "audio loopback test");
+                startAudioTest(mMessageHandler);
             }
         }
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputDeviceNotificationsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputDeviceNotificationsActivity.java
index 0e4f6da..29b1234 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputDeviceNotificationsActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputDeviceNotificationsActivity.java
@@ -16,22 +16,16 @@
 
 package com.android.cts.verifier.audio;
 
-import com.android.cts.verifier.R;
-
 import android.content.Context;
-
 import android.media.AudioDeviceCallback;
 import android.media.AudioDeviceInfo;
 import android.media.AudioManager;
-
 import android.os.Bundle;
-
 import android.view.View;
-import android.view.View.OnClickListener;
-
-import android.widget.Button;
 import android.widget.TextView;
 
+import com.android.cts.verifier.R;
+
 /**
  * Tests Audio Device Connection events for output devices by prompting the user to
  * insert/remove a wired headset and noting the presence (or absence) of notifications.
@@ -41,13 +35,24 @@
 
     TextView mConnectView;
     TextView mDisconnectView;
-    Button mClearMsgsBtn;
+    TextView mInfoView;
+
+    boolean mHandledInitialAddedMessage = false;
+    boolean mConnectReceived = false;
+    boolean mDisconnectReceived = false;
 
     private class TestAudioDeviceCallback extends AudioDeviceCallback {
         public void onAudioDevicesAdded(AudioDeviceInfo[] addedDevices) {
+            // we will get this message when we setup the handler, so ignore the first one.
+            if (!mHandledInitialAddedMessage) {
+                mHandledInitialAddedMessage = true;
+                return;
+            }
             if (addedDevices.length != 0) {
                 mConnectView.setText(
                     mContext.getResources().getString(R.string.audio_dev_notification_connectMsg));
+                mConnectReceived = true;
+                getPassButton().setEnabled(mConnectReceived && mDisconnectReceived);
             }
         }
 
@@ -56,35 +61,25 @@
                 mDisconnectView.setText(
                     mContext.getResources().getString(
                         R.string.audio_dev_notification_disconnectMsg));
+                mDisconnectReceived = true;
+                getPassButton().setEnabled(mConnectReceived && mDisconnectReceived);
             }
         }
     }
 
     @Override
-    protected void enableTestButtons(boolean enabled) {
-        // Nothing to do.
-    }
-
-    @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.audio_dev_notify);
 
         mContext = this;
 
-        mConnectView = (TextView)findViewById(R.id.audio_dev_notification_connect_msg);
-        mDisconnectView = (TextView)findViewById(R.id.audio_dev_notification_disconnect_msg);
+        mConnectView = (TextView) findViewById(R.id.audio_dev_notification_connect_msg);
+        mDisconnectView = (TextView) findViewById(R.id.audio_dev_notification_disconnect_msg);
 
-        ((TextView)findViewById(R.id.info_text)).setText(mContext.getResources().getString(
-                R.string.audio_out_devices_notification_instructions));
-
-        mClearMsgsBtn = (Button)findViewById(R.id.audio_dev_notification_connect_clearmsgs_btn);
-        mClearMsgsBtn.setOnClickListener(new View.OnClickListener() {
-            public void onClick(View v) {
-                mConnectView.setText("");
-                mDisconnectView.setText("");
-            }
-        });
+        mInfoView = (TextView) findViewById(R.id.info_text);
+        mInfoView.setText(mContext.getResources().getString(
+                R.string.audio_devices_notification_instructions));
 
         AudioManager audioManager = (AudioManager)getSystemService(Context.AUDIO_SERVICE);
         audioManager.registerAudioDeviceCallback(new TestAudioDeviceCallback(), null);
@@ -94,4 +89,9 @@
 
         setPassFailButtonClickListeners();
     }
+
+    @Override
+    protected void enableTestButtons(boolean enabled) {
+        mInfoView.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
+    }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputRoutingNotificationsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputRoutingNotificationsActivity.java
index 62749c1..3838dbe 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputRoutingNotificationsActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioOutputRoutingNotificationsActivity.java
@@ -16,27 +16,19 @@
 
 package com.android.cts.verifier.audio;
 
-import com.android.cts.verifier.R;
-
 import android.content.Context;
-
-import android.media.AudioDeviceCallback;
 import android.media.AudioDeviceInfo;
-import android.media.AudioManager;
 import android.media.AudioTrack;
-
 import android.os.Bundle;
 import android.os.Handler;
-
 import android.util.Log;
-
 import android.view.View;
 import android.view.View.OnClickListener;
-
 import android.widget.Button;
 import android.widget.TextView;
 
-import org.hyphonate.megaaudio.player.AudioSource;
+import com.android.cts.verifier.R;
+
 import org.hyphonate.megaaudio.player.AudioSourceProvider;
 import org.hyphonate.megaaudio.player.JavaPlayer;
 import org.hyphonate.megaaudio.player.PlayerBuilder;
@@ -55,13 +47,21 @@
 
     Button playBtn;
     Button stopBtn;
+    TextView mInfoView;
+
+    int mNumRoutingNotifications;
 
     private OnBtnClickListener mBtnClickListener = new OnBtnClickListener();
 
-    int mNumTrackNotifications = 0;
+    // ignore messages sent as a consequence of starting the player
+    private static final int NUM_IGNORE_MESSAGES = 1;
 
     // Mega Player
-    JavaPlayer mAudioPlayer;
+    private JavaPlayer mAudioPlayer;
+    private AudioTrackRoutingChangeListener mRoutingChangeListener;
+    private boolean mIsPlaying;
+
+    private boolean mInitialRoutingMessageHandled;
 
     private class OnBtnClickListener implements OnClickListener {
         @Override
@@ -69,26 +69,52 @@
             if (mAudioPlayer == null) {
                 return; // failed to create the player
             }
-            switch (v.getId()) {
-                case R.id.audio_routingnotification_playBtn:
-                {
-                    mAudioPlayer.startStream();
-                    AudioTrack audioTrack = mAudioPlayer.getAudioTrack();
-                    audioTrack.addOnRoutingChangedListener(
-                            new AudioTrackRoutingChangeListener(), new Handler());
-                }
-                    break;
-
-                case R.id.audio_routingnotification_playStopBtn:
-                    mAudioPlayer.stopStream();
-                    break;
+            int id = v.getId();
+            if (id == R.id.audio_routingnotification_playBtn) {
+                startPlayback();
+            } else if (id == R.id.audio_routingnotification_playStopBtn) {
+                stopPlayback();
             }
         }
     }
 
+    private void startPlayback() {
+        if (!mIsPlaying) {
+            mNumRoutingNotifications = 0;
+
+            mAudioPlayer.startStream();
+
+            AudioTrack audioTrack = mAudioPlayer.getAudioTrack();
+            audioTrack.addOnRoutingChangedListener(mRoutingChangeListener,
+                    new Handler());
+
+            mIsPlaying = true;
+
+            enablePlayButtons(!mIsPlaying, mIsPlaying);
+        }
+    }
+
+    private void stopPlayback() {
+        if (mIsPlaying) {
+            mAudioPlayer.stopStream();
+
+            AudioTrack audioTrack = mAudioPlayer.getAudioTrack();
+            audioTrack.removeOnRoutingChangedListener(mRoutingChangeListener);
+
+            mIsPlaying = false;
+
+            enablePlayButtons(!mIsPlaying, mIsPlaying);
+        }
+    }
+
     private class AudioTrackRoutingChangeListener implements AudioTrack.OnRoutingChangedListener {
         public void onRoutingChanged(AudioTrack audioTrack) {
-            mNumTrackNotifications++;
+            // Starting playback triggers a messages, so ignore the first one.
+            mNumRoutingNotifications++;
+            if (mNumRoutingNotifications <= NUM_IGNORE_MESSAGES) {
+                return;
+            }
+
             TextView textView =
                 (TextView)findViewById(R.id.audio_routingnotification_audioTrack_change);
             String msg = mContext.getResources().getString(
@@ -98,14 +124,21 @@
             int deviceType = routedDevice != null ? routedDevice.getType() : -1;
             textView.setText(msg + " - " +
                              deviceName + " [0x" + Integer.toHexString(deviceType) + "]" +
-                             " - " + mNumTrackNotifications);
+                             " - " + mNumRoutingNotifications);
+            getPassButton().setEnabled(true);
         }
     }
 
     @Override
     protected void enableTestButtons(boolean enabled) {
-        playBtn.setEnabled(enabled);
-        stopBtn.setEnabled(enabled);
+        enablePlayButtons(!mIsPlaying, mIsPlaying);
+
+        mInfoView.setVisibility(enabled ? View.VISIBLE : View.INVISIBLE);
+    }
+
+    private void enablePlayButtons(boolean enablePlay, boolean enableStop) {
+        playBtn.setEnabled(enablePlay);
+        stopBtn.setEnabled(enableStop);
     }
 
     @Override
@@ -115,11 +148,15 @@
 
         mContext = this;
 
-        playBtn = (Button)findViewById(R.id.audio_routingnotification_playBtn);
+        playBtn = (Button) findViewById(R.id.audio_routingnotification_playBtn);
         playBtn.setOnClickListener(mBtnClickListener);
-        stopBtn = (Button)findViewById(R.id.audio_routingnotification_playStopBtn);
+        stopBtn = (Button) findViewById(R.id.audio_routingnotification_playStopBtn);
         stopBtn.setOnClickListener(mBtnClickListener);
 
+        enablePlayButtons(false, false);
+
+        mInfoView = (TextView) findViewById(R.id.info_text);
+
         // Setup Player
         //
         // Allocate the source provider for the sort of signal we want to play
@@ -139,17 +176,16 @@
             Log.e(TAG, "Failed MegaPlayer build.");
         }
 
+        mRoutingChangeListener = new AudioTrackRoutingChangeListener();
+
         // "Honor System" buttons
         super.setup();
-
         setPassFailButtonClickListeners();
     }
 
     @Override
     public void onBackPressed () {
-        if (mAudioPlayer != null) {
-            mAudioPlayer.stopStream();
-        }
+        stopPlayback();
         super.onBackPressed();
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioTap2ToneActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioTap2ToneActivity.java
index 04cfa7c..e3e01e4 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioTap2ToneActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioTap2ToneActivity.java
@@ -26,11 +26,11 @@
 
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
-import com.android.cts.verifier.audio.audiolib.StatUtils;
 import com.android.cts.verifier.CtsVerifierReportLog;
 import com.android.cts.verifier.PassFailButtons;
 import com.android.cts.verifier.R;
 import com.android.cts.verifier.audio.audiolib.CircularBufferFloat;
+import com.android.cts.verifier.audio.audiolib.StatUtils;
 import com.android.cts.verifier.audio.audiolib.TapLatencyAnalyser;
 import com.android.cts.verifier.audio.audiolib.WaveformView;
 import com.android.cts.verifier.audio.sources.BlipAudioSourceProvider;
@@ -406,32 +406,23 @@
     //
     @Override
     public void onClick(View v) {
-        switch (v.getId()) {
-            case R.id.tap2tone_startBtn:
-                startAudio();
-                break;
-
-            case R.id.tap2tone_stopBtn:
-                stopAudio();
-                break;
-
-            case R.id.audioJavaApiBtn:
-                stopAudio();
+        int id = v.getId();
+        if (id == R.id.tap2tone_startBtn) {
+            startAudio();
+        } else if (id == R.id.tap2tone_stopBtn) {
+            stopAudio();
+        } else if (id == R.id.audioJavaApiBtn) {
+            stopAudio();
+            clearResults();
+            mPlayerType = BuilderBase.TYPE_JAVA;
+            mActiveTestAPI = TEST_API_JAVA;
+        } else if (id == R.id.audioNativeApiBtn) {
+            stopAudio();
+            clearResults();
+            mPlayerType = BuilderBase.TYPE_OBOE | BuilderBase.SUB_TYPE_OBOE_AAUDIO;
+            mActiveTestAPI = TEST_API_NATIVE;
+        } else if (id == R.id.tap2tone_clearResults) {
                 clearResults();
-                mPlayerType = BuilderBase.TYPE_JAVA;
-                mActiveTestAPI = TEST_API_JAVA;
-                break;
-
-            case R.id.audioNativeApiBtn:
-                stopAudio();
-                clearResults();
-                mPlayerType = BuilderBase.TYPE_OBOE | BuilderBase.SUB_TYPE_OBOE_AAUDIO;
-                mActiveTestAPI = TEST_API_NATIVE;
-                break;
-
-            case R.id.tap2tone_clearResults:
-                clearResults();
-                break;
         }
     }
 
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioWiredDeviceBaseActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioWiredDeviceBaseActivity.java
index 2e308f2..4963453 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioWiredDeviceBaseActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/AudioWiredDeviceBaseActivity.java
@@ -16,31 +16,24 @@
 
 package com.android.cts.verifier.audio;
 
-import com.android.cts.verifier.PassFailButtons;
-import com.android.cts.verifier.R;
-
-import com.android.compatibility.common.util.ReportLog;
-import com.android.compatibility.common.util.ResultType;
-import com.android.compatibility.common.util.ResultUnit;
-
-import android.content.Context;
-
-import android.os.Bundle;
-import android.os.Handler;
-
 import android.util.Log;
-
 import android.view.View;
 import android.view.View.OnClickListener;
-
 import android.widget.Button;
 
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
 abstract class AudioWiredDeviceBaseActivity extends PassFailButtons.Activity {
     private static final String TAG = AudioWiredDeviceBaseActivity.class.getSimpleName();
 
     private OnBtnClickListener mBtnClickListener = new OnBtnClickListener();
 
-    abstract protected void enableTestButtons(boolean enabled);
+    protected void enableTestButtons(boolean enabled) {
+        // NOP by default
+    }
 
     private void recordWiredPortFound(boolean found) {
         getReportLog().addValue(
@@ -56,23 +49,24 @@
         ((Button)findViewById(R.id.audio_wired_yes)).setOnClickListener(mBtnClickListener);
 
         enableTestButtons(false);
+
+        getPassButton().setEnabled(false);
     }
 
     private class OnBtnClickListener implements OnClickListener {
         @Override
         public void onClick(View v) {
-            switch (v.getId()) {
-                case R.id.audio_wired_no:
-                    Log.i(TAG, "User denies wired device existence");
-                    enableTestButtons(false);
-                    recordWiredPortFound(false);
-                    break;
-
-                case R.id.audio_wired_yes:
-                    Log.i(TAG, "User confirms wired device existence");
-                    enableTestButtons(true);
-                    recordWiredPortFound(true);
-                    break;
+            int id = v.getId();
+            if (id == R.id.audio_wired_no) {
+                Log.i(TAG, "User denies wired device existence");
+                enableTestButtons(false);
+                recordWiredPortFound(false);
+                getPassButton().setEnabled(true);
+            } else if (id == R.id.audio_wired_yes) {
+                Log.i(TAG, "User confirms wired device existence");
+                enableTestButtons(true);
+                recordWiredPortFound(true);
+                getPassButton().setEnabled(false);
             }
         }
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/Common.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/Common.java
deleted file mode 100644
index df7460a..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/Common.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.android.cts.verifier.audio;
-
-import android.media.AudioManager;
-import android.media.AudioTrack;
-
-import java.util.ArrayList;
-import java.util.Random;
-
-/**
- * This class stores common constants and methods.
- */
-public class Common {
-
-  public static final int RECORDING_SAMPLE_RATE_HZ
-      = AudioRecordHelper.getInstance().getSampleRate();
-  public static final int PLAYING_SAMPLE_RATE_HZ
-      = AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC);
-
-  // Default constants.
-  public static final double PASSING_THRESHOLD_DB = -40.0;
-  public static final double PIP_DURATION_S = 0.004;
-  public static final double PAUSE_DURATION_S = 0.016;
-  public static final int PREFIX_NUM_CHIPS = 1023;
-  public static final int PREFIX_SAMPLES_PER_CHIP = 4;
-  public static final double PREFIX_LENGTH_S = 0.1;
-  public static final double PAUSE_BEFORE_PREFIX_DURATION_S = 0.5;
-  public static final double PAUSE_AFTER_PREFIX_DURATION_S = 0.4;
-  public static final double MIN_FREQUENCY_HZ = 500;
-  public static final double MAX_FREQUENCY_HZ = 21000;
-  public static final double FREQUENCY_STEP_HZ = 100;
-  public static final int SIGNAL_MIN_STRENGTH_DB_ABOVE_NOISE = 10;
-  public static final int REPETITIONS = 5;
-  public static final int NOISE_SAMPLES = 3;
-
-  public static final double[] FREQUENCIES_ORIGINAL = originalFrequencies();
-  public static final int PIP_NUM = FREQUENCIES_ORIGINAL.length;
-  public static final int[] ORDER = order();
-  public static final double[] FREQUENCIES = frequencies();
-
-  public static final double[] WINDOW_FOR_RECORDER =
-      hann(Util.toLength(PIP_DURATION_S, RECORDING_SAMPLE_RATE_HZ));
-  public static final double[] WINDOW_FOR_PLAYER =
-      hann(Util.toLength(PIP_DURATION_S, PLAYING_SAMPLE_RATE_HZ));
-
-  public static final double[] PREFIX_FOR_RECORDER = prefix(RECORDING_SAMPLE_RATE_HZ);
-  public static final double[] PREFIX_FOR_PLAYER = prefix(PLAYING_SAMPLE_RATE_HZ);
-
-  /**
-   * Get a Hann window.
-   */
-  private static double[] hann(int windowWidth) {
-    double[] envelopeArray = new double[windowWidth];
-    for (int i = 0; i < windowWidth; i++) {
-      envelopeArray[i] = 0.5
-          * (1 - Math.cos(2 * Math.PI * i / windowWidth));
-    }
-    return envelopeArray;
-  }
-
-  /**
-   * Get a maximum length sequence, used as prefix to indicate start of signal.
-   */
-  private static double[] prefix(int rate) {
-    double[] codeSequence = new double[PREFIX_NUM_CHIPS];
-    for (int i = 0; i < PREFIX_NUM_CHIPS; i++) {
-      if (i < 10) {
-        codeSequence[i] = 1;
-      } else {
-        codeSequence[i] = -codeSequence[i - 6] * codeSequence[i - 7]
-            * codeSequence[i - 9] * codeSequence[i - 10];
-      }
-    }
-    double[] prefixArray = new double[PREFIX_NUM_CHIPS * PREFIX_SAMPLES_PER_CHIP];
-    int offset = 0;
-    for (int i = 0; i < PREFIX_NUM_CHIPS; i++) {
-      double value = codeSequence[i];
-      for (int j = 0; j < PREFIX_SAMPLES_PER_CHIP; j++) {
-        prefixArray[offset + j] = value;
-      }
-      offset += PREFIX_SAMPLES_PER_CHIP;
-    }
-    int prefixLength = (int) Math.round(PREFIX_LENGTH_S * rate);
-    double[] samplePrefixArray = new double[prefixLength];
-    for (int i = 0; i < prefixLength; i++) {
-      double index = (double) i / prefixLength * (prefixArray.length - 1);
-      samplePrefixArray[i] = (1 - index + Math.floor(index)) * prefixArray[(int) Math.floor(index)]
-          + (1 + index - Math.ceil(index)) * prefixArray[(int) Math.ceil(index)];
-    }
-    return samplePrefixArray;
-  }
-
-  /**
-   * Returns array consists the frequencies of the test pips in the order that will be used in test.
-   */
-  private static double[] frequencies() {
-    double[] originalFrequencies = originalFrequencies();
-
-    double[] randomFrequencies = new double[Common.REPETITIONS * originalFrequencies.length];
-    for (int i = 0; i < REPETITIONS * originalFrequencies.length; i++) {
-      randomFrequencies[i] = originalFrequencies[ORDER[i] % originalFrequencies.length];
-    }
-
-    return randomFrequencies;
-  }
-
-  /**
-   * Returns array consists the frequencies of the test pips.
-   */
-  private static double[] originalFrequencies() {
-    ArrayList<Double> frequencies = new ArrayList<Double>();
-    double frequency = Common.MIN_FREQUENCY_HZ;
-    while (frequency <= Common.MAX_FREQUENCY_HZ) {
-      frequencies.add(new Double(frequency));
-      if ((frequency >= 18500) && (frequency < 20000)) {
-        frequency += Common.FREQUENCY_STEP_HZ;
-      } else {
-        frequency += Common.FREQUENCY_STEP_HZ * 10;
-      }
-    }
-    Double[] frequenciesArray = frequencies.toArray(new Double[frequencies.size()]);
-    double[] frequenciesPrimitiveArray = new double[frequenciesArray.length];
-    for (int i = 0; i < frequenciesArray.length; i++) {
-      frequenciesPrimitiveArray[i] = frequenciesArray[i];
-    }
-    return frequenciesPrimitiveArray;
-  }
-
-  /**
-   * Fisher-Yates shuffle.
-   */
-  private static int[] order() {
-    int[] order = new int[REPETITIONS * PIP_NUM];
-    long seed = 0;
-    Random generator = new Random(seed);
-    for (int i = 0; i < REPETITIONS * PIP_NUM; i++) {
-      int j = generator.nextInt(i + 1);
-      order[i] = order[j];
-      order[j] = i;
-    }
-    return order;
-  }
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/HifiUltrasoundSpeakerTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/HifiUltrasoundSpeakerTestActivity.java
index 01802a4..dcac83ab 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/HifiUltrasoundSpeakerTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/HifiUltrasoundSpeakerTestActivity.java
@@ -37,6 +37,10 @@
 import android.widget.TextView;
 import java.util.Arrays;
 
+import com.android.cts.verifier.audio.audiolib.AudioCommon;
+import com.android.cts.verifier.audio.soundio.SoundGenerator;
+import com.android.cts.verifier.audio.wavlib.WavAnalyzer;
+
 import com.androidplot.xy.PointLabelFormatter;
 import com.androidplot.xy.LineAndPointFormatter;
 import com.androidplot.xy.SimpleXYSeries;
@@ -181,11 +185,12 @@
               @Override
               public void run() {
                 Double recordingDuration_millis = new Double(1000 * (2.5
-                    + Common.PREFIX_LENGTH_S
-                    + Common.PAUSE_BEFORE_PREFIX_DURATION_S
-                    + Common.PAUSE_AFTER_PREFIX_DURATION_S
-                    + Common.PIP_NUM * (Common.PIP_DURATION_S + Common.PAUSE_DURATION_S)
-                    * Common.REPETITIONS));
+                    + AudioCommon.PREFIX_LENGTH_S
+                    + AudioCommon.PAUSE_BEFORE_PREFIX_DURATION_S
+                    + AudioCommon.PAUSE_AFTER_PREFIX_DURATION_S
+                    + AudioCommon.PIP_NUM
+                        * (AudioCommon.PIP_DURATION_S + AudioCommon.PAUSE_DURATION_S)
+                    * AudioCommon.REPETITIONS));
                 Log.d(TAG, "Recording for " + recordingDuration_millis + "ms");
                 try {
                   Thread.sleep(recordingDuration_millis.intValue());
@@ -262,17 +267,17 @@
     XYPlot plot = (XYPlot) popupView.findViewById(R.id.responseChart);
     plot.setDomainStep(XYStepMode.INCREMENT_BY_VAL, 2000);
 
-    Double[] frequencies = new Double[Common.PIP_NUM];
-    for (int i = 0; i < Common.PIP_NUM; i++) {
-      frequencies[i] = new Double(Common.FREQUENCIES_ORIGINAL[i]);
+    Double[] frequencies = new Double[AudioCommon.PIP_NUM];
+    for (int i = 0; i < AudioCommon.PIP_NUM; i++) {
+      frequencies[i] = new Double(AudioCommon.FREQUENCIES_ORIGINAL[i]);
     }
 
     if (wavAnalyzerTask != null) {
 
       double[][] power = wavAnalyzerTask.getPower();
-      for(int i = 0; i < Common.REPETITIONS; i++) {
-        Double[] powerWrap = new Double[Common.PIP_NUM];
-        for (int j = 0; j < Common.PIP_NUM; j++) {
+      for(int i = 0; i < AudioCommon.REPETITIONS; i++) {
+        Double[] powerWrap = new Double[AudioCommon.PIP_NUM];
+        for (int j = 0; j < AudioCommon.PIP_NUM; j++) {
           powerWrap[j] = new Double(10 * Math.log10(power[j][i]));
         }
         XYSeries series = new SimpleXYSeries(
@@ -287,8 +292,8 @@
       }
 
       double[] noiseDB = wavAnalyzerTask.getNoiseDB();
-      Double[] noiseDBWrap = new Double[Common.PIP_NUM];
-      for (int i = 0; i < Common.PIP_NUM; i++) {
+      Double[] noiseDBWrap = new Double[AudioCommon.PIP_NUM];
+      for (int i = 0; i < AudioCommon.PIP_NUM; i++) {
         noiseDBWrap[i] = new Double(noiseDB[i]);
       }
 
@@ -303,8 +308,8 @@
       plot.addSeries(noiseSeries, noiseSeriesFormat);
 
       double[] dB = wavAnalyzerTask.getDB();
-      Double[] dBWrap = new Double[Common.PIP_NUM];
-      for (int i = 0; i < Common.PIP_NUM; i++) {
+      Double[] dBWrap = new Double[AudioCommon.PIP_NUM];
+      for (int i = 0; i < AudioCommon.PIP_NUM; i++) {
         dBWrap[i] = new Double(dB[i]);
       }
 
@@ -318,7 +323,7 @@
           R.xml.ultrasound_line_formatter_median);
       plot.addSeries(series, seriesFormat);
 
-      Double[] passX = new Double[] {Common.MIN_FREQUENCY_HZ, Common.MAX_FREQUENCY_HZ};
+      Double[] passX = new Double[] {AudioCommon.MIN_FREQUENCY_HZ, AudioCommon.MAX_FREQUENCY_HZ};
       Double[] passY = new Double[] {wavAnalyzerTask.getThreshold(), wavAnalyzerTask.getThreshold()};
       XYSeries passSeries = new SimpleXYSeries(
           Arrays.asList(passX), Arrays.asList(passY), "passing");
@@ -334,7 +339,7 @@
    * Plays the generated pips.
    */
   private void play() {
-    play(SoundGenerator.getInstance().getByte(), Common.PLAYING_SAMPLE_RATE_HZ);
+    play(SoundGenerator.getInstance().getByte(), AudioCommon.PLAYING_SAMPLE_RATE_HZ);
   }
 
   /**
@@ -364,7 +369,7 @@
     WavAnalyzer wavAnalyzer;
 
     public WavAnalyzerTask(byte[] recording) {
-      wavAnalyzer = new WavAnalyzer(recording, Common.RECORDING_SAMPLE_RATE_HZ,
+      wavAnalyzer = new WavAnalyzer(recording, AudioCommon.RECORDING_SAMPLE_RATE_HZ,
           WavAnalyzerTask.this);
     }
 
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/HifiUltrasoundTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/HifiUltrasoundTestActivity.java
index f5e4271..3d5688d 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/HifiUltrasoundTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/HifiUltrasoundTestActivity.java
@@ -37,6 +37,10 @@
 import android.widget.TextView;
 import java.util.Arrays;
 
+import com.android.cts.verifier.audio.audiolib.AudioCommon;
+import com.android.cts.verifier.audio.soundio.SoundGenerator;
+import com.android.cts.verifier.audio.wavlib.WavAnalyzer;
+
 import com.androidplot.xy.PointLabelFormatter;
 import com.androidplot.xy.LineAndPointFormatter;
 import com.androidplot.xy.SimpleXYSeries;
@@ -161,11 +165,11 @@
               @Override
               public void run() {
                 Double recordingDuration_millis = new Double(1000 * (2.5
-                    + Common.PREFIX_LENGTH_S
-                    + Common.PAUSE_BEFORE_PREFIX_DURATION_S
-                    + Common.PAUSE_AFTER_PREFIX_DURATION_S
-                    + Common.PIP_NUM * (Common.PIP_DURATION_S + Common.PAUSE_DURATION_S)
-                    * Common.REPETITIONS));
+                    + AudioCommon.PREFIX_LENGTH_S
+                    + AudioCommon.PAUSE_BEFORE_PREFIX_DURATION_S
+                    + AudioCommon.PAUSE_AFTER_PREFIX_DURATION_S
+                    + AudioCommon.PIP_NUM * (AudioCommon.PIP_DURATION_S + AudioCommon.PAUSE_DURATION_S)
+                    * AudioCommon.REPETITIONS));
                 Log.d(TAG, "Recording for " + recordingDuration_millis + "ms");
                 try {
                   Thread.sleep(recordingDuration_millis.intValue());
@@ -221,18 +225,18 @@
     XYPlot plot = (XYPlot) popupView.findViewById(R.id.responseChart);
     plot.setDomainStep(XYStepMode.INCREMENT_BY_VAL, 2000);
 
-    Double[] frequencies = new Double[Common.PIP_NUM];
-    for (int i = 0; i < Common.PIP_NUM; i++) {
-      frequencies[i] = new Double(Common.FREQUENCIES_ORIGINAL[i]);
+    Double[] frequencies = new Double[AudioCommon.PIP_NUM];
+    for (int i = 0; i < AudioCommon.PIP_NUM; i++) {
+      frequencies[i] = new Double(AudioCommon.FREQUENCIES_ORIGINAL[i]);
     }
 
     if (wavAnalyzerTask != null && wavAnalyzerTask.getPower() != null &&
         wavAnalyzerTask.getNoiseDB() != null && wavAnalyzerTask.getDB() != null) {
 
       double[][] power = wavAnalyzerTask.getPower();
-      for(int i = 0; i < Common.REPETITIONS; i++) {
-        Double[] powerWrap = new Double[Common.PIP_NUM];
-        for (int j = 0; j < Common.PIP_NUM; j++) {
+      for(int i = 0; i < AudioCommon.REPETITIONS; i++) {
+        Double[] powerWrap = new Double[AudioCommon.PIP_NUM];
+        for (int j = 0; j < AudioCommon.PIP_NUM; j++) {
           powerWrap[j] = new Double(10 * Math.log10(power[j][i]));
         }
         XYSeries series = new SimpleXYSeries(
@@ -247,8 +251,8 @@
       }
 
       double[] noiseDB = wavAnalyzerTask.getNoiseDB();
-      Double[] noiseDBWrap = new Double[Common.PIP_NUM];
-      for (int i = 0; i < Common.PIP_NUM; i++) {
+      Double[] noiseDBWrap = new Double[AudioCommon.PIP_NUM];
+      for (int i = 0; i < AudioCommon.PIP_NUM; i++) {
         noiseDBWrap[i] = new Double(noiseDB[i]);
       }
 
@@ -263,8 +267,8 @@
       plot.addSeries(noiseSeries, noiseSeriesFormat);
 
       double[] dB = wavAnalyzerTask.getDB();
-      Double[] dBWrap = new Double[Common.PIP_NUM];
-      for (int i = 0; i < Common.PIP_NUM; i++) {
+      Double[] dBWrap = new Double[AudioCommon.PIP_NUM];
+      for (int i = 0; i < AudioCommon.PIP_NUM; i++) {
         dBWrap[i] = new Double(dB[i]);
       }
 
@@ -278,7 +282,7 @@
           R.xml.ultrasound_line_formatter_median);
       plot.addSeries(series, seriesFormat);
 
-      Double[] passX = new Double[] {Common.MIN_FREQUENCY_HZ, Common.MAX_FREQUENCY_HZ};
+      Double[] passX = new Double[] {AudioCommon.MIN_FREQUENCY_HZ, AudioCommon.MAX_FREQUENCY_HZ};
       Double[] passY = new Double[] {wavAnalyzerTask.getThreshold(), wavAnalyzerTask.getThreshold()};
       XYSeries passSeries = new SimpleXYSeries(
           Arrays.asList(passX), Arrays.asList(passY), "passing");
@@ -294,7 +298,7 @@
    * Plays the generated pips.
    */
   private void play() {
-    play(SoundGenerator.getInstance().getByte(), Common.PLAYING_SAMPLE_RATE_HZ);
+    play(SoundGenerator.getInstance().getByte(), AudioCommon.PLAYING_SAMPLE_RATE_HZ);
   }
 
   /**
@@ -324,7 +328,7 @@
     WavAnalyzer wavAnalyzer;
 
     public WavAnalyzerTask(byte[] recording) {
-      wavAnalyzer = new WavAnalyzer(recording, Common.RECORDING_SAMPLE_RATE_HZ,
+      wavAnalyzer = new WavAnalyzer(recording, AudioCommon.RECORDING_SAMPLE_RATE_HZ,
           WavAnalyzerTask.this);
     }
 
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/MidiTestActivityBase.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/MidiTestActivityBase.java
index 8c96da7..2f4ff7b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/MidiTestActivityBase.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/MidiTestActivityBase.java
@@ -19,9 +19,9 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
-import android.content.ServiceConnection;
 import android.media.midi.MidiDeviceInfo;
 import android.media.midi.MidiManager;
 import android.os.Bundle;
@@ -32,10 +32,9 @@
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.android.cts.verifier.audio.midilib.MidiIODevice;
 import com.android.cts.verifier.PassFailButtons;
-import com.android.cts.verifier.R;  // needed to access resource in CTSVerifier project namespace.
-
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.audio.midilib.MidiIODevice;
 import com.android.midi.VerifierMidiEchoService;
 
 import java.util.Timer;
@@ -321,20 +320,14 @@
     //
     @Override
     public void onClick(View view) {
-        switch (view.getId()) {
-        case R.id.midiTestUSBInterfaceBtn:
+        int id = view.getId();
+        if (id == R.id.midiTestUSBInterfaceBtn) {
             startWiredLoopbackTest();
-            break;
-
-        case R.id.midiTestVirtInterfaceBtn:
+        } else if (id == R.id.midiTestVirtInterfaceBtn) {
             startVirtualLoopbackTest();
-            break;
-
-        case R.id.midiTestBTInterfaceBtn:
+        } else if (id == R.id.midiTestBTInterfaceBtn) {
             startBTLoopbackTest();
-            break;
-
-        default:
+        } else {
             assert false : "Unhandled button click";
         }
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/ProAudioActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/ProAudioActivity.java
index 5ca2256..9665088 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/ProAudioActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/ProAudioActivity.java
@@ -16,8 +16,10 @@
 
 package com.android.cts.verifier.audio;
 
+import static com.android.cts.verifier.TestListActivity.sCurrentDisplayMode;
+import static com.android.cts.verifier.TestListAdapter.setTestNameSuffix;
+
 import android.app.AlertDialog;
-import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.media.AudioDeviceCallback;
@@ -32,13 +34,10 @@
 
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
-import com.android.cts.verifier.audio.audiolib.AudioSystemFlags;
 import com.android.cts.verifier.CtsVerifierReportLog;
 import com.android.cts.verifier.PassFailButtons;
 import com.android.cts.verifier.R;
-
-import static com.android.cts.verifier.TestListActivity.sCurrentDisplayMode;
-import static com.android.cts.verifier.TestListAdapter.setTestNameSuffix;
+import com.android.cts.verifier.audio.audiolib.AudioSystemFlags;
 
 public class ProAudioActivity
         extends PassFailButtons.Activity
@@ -298,30 +297,28 @@
 
     @Override
     public void onClick(View view) {
-        switch (view.getId()) {
-            case R.id.proAudioHasHDMICheckBox:
-                if (mClaimsHDMICheckBox.isChecked()) {
-                    AlertDialog.Builder builder = new AlertDialog.Builder(
-                            this, android.R.style.Theme_Material_Dialog_Alert);
-                    builder.setTitle(getResources().getString(R.string.proaudio_hdmi_infotitle));
-                    builder.setMessage(getResources().getString(R.string.proaudio_hdmi_message));
-                    builder.setPositiveButton(android.R.string.yes,
-                            new DialogInterface.OnClickListener() {
-                                public void onClick(DialogInterface dialog, int which) {
-                                }
-                            });
-                    builder.setIcon(android.R.drawable.ic_dialog_alert);
-                    builder.show();
+        if (view.getId() == R.id.proAudioHasHDMICheckBox) {
+            if (mClaimsHDMICheckBox.isChecked()) {
+                AlertDialog.Builder builder = new AlertDialog.Builder(
+                        this, android.R.style.Theme_Material_Dialog_Alert);
+                builder.setTitle(getResources().getString(R.string.proaudio_hdmi_infotitle));
+                builder.setMessage(getResources().getString(R.string.proaudio_hdmi_message));
+                builder.setPositiveButton(android.R.string.yes,
+                        new DialogInterface.OnClickListener() {
+                            public void onClick(DialogInterface dialog, int which) {
+                            }
+                        });
+                builder.setIcon(android.R.drawable.ic_dialog_alert);
+                builder.show();
 
-                    mClaimsHDMI = true;
-                    mHDMISupportLbl.setText(
-                            getResources().getString(R.string.audio_proaudio_hdmiPending));
-                } else {
-                    mClaimsHDMI = false;
-                    mHDMISupportLbl.setText(getResources().getString(R.string.audio_proaudio_NA));
-                }
-                displayTestResults();
-                break;
+                mClaimsHDMI = true;
+                mHDMISupportLbl.setText(
+                        getResources().getString(R.string.audio_proaudio_hdmiPending));
+            } else {
+                mClaimsHDMI = false;
+                mHDMISupportLbl.setText(getResources().getString(R.string.audio_proaudio_NA));
+            }
+            displayTestResults();
         }
     }
 
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/SoundGenerator.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/SoundGenerator.java
deleted file mode 100644
index 0ad9371..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/SoundGenerator.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.android.cts.verifier.audio;
-
-/**
- * Sound generator.
- */
-public class SoundGenerator {
-
-  private static SoundGenerator instance;
-
-  private final byte[] generatedSound;
-  private final double[] sample;
-
-  private SoundGenerator() {
-    // Initialize sample.
-    int pipNum = Common.PIP_NUM;
-    int prefixTotalLength = Util.toLength(Common.PREFIX_LENGTH_S, Common.PLAYING_SAMPLE_RATE_HZ)
-        + Util.toLength(Common.PAUSE_BEFORE_PREFIX_DURATION_S, Common.PLAYING_SAMPLE_RATE_HZ)
-        + Util.toLength(Common.PAUSE_AFTER_PREFIX_DURATION_S, Common.PLAYING_SAMPLE_RATE_HZ);
-    int repetitionLength = pipNum * Util.toLength(
-        Common.PIP_DURATION_S + Common.PAUSE_DURATION_S, Common.PLAYING_SAMPLE_RATE_HZ);
-    int sampleLength = prefixTotalLength + Common.REPETITIONS * repetitionLength;
-    sample = new double[sampleLength];
-
-    // Fill sample with prefix.
-    System.arraycopy(Common.PREFIX_FOR_PLAYER, 0, sample,
-        Util.toLength(Common.PAUSE_BEFORE_PREFIX_DURATION_S, Common.PLAYING_SAMPLE_RATE_HZ),
-        Common.PREFIX_FOR_PLAYER.length);
-
-    // Fill the sample.
-    for (int i = 0; i < pipNum * Common.REPETITIONS; i++) {
-      double[] pip = getPip(Common.WINDOW_FOR_PLAYER, Common.FREQUENCIES[i]);
-      System.arraycopy(pip, 0, sample,
-          prefixTotalLength + i * Util.toLength(
-              Common.PIP_DURATION_S + Common.PAUSE_DURATION_S, Common.PLAYING_SAMPLE_RATE_HZ),
-          pip.length);
-    }
-
-    // Convert sample to byte.
-    generatedSound = new byte[2 * sample.length];
-    int i = 0;
-    for (double dVal : sample) {
-      short val = (short) ((dVal * 32767));
-      generatedSound[i++] = (byte) (val & 0x00ff);
-      generatedSound[i++] = (byte) ((val & 0xff00) >>> 8);
-    }
-  }
-
-  public static SoundGenerator getInstance() {
-    if (instance == null) {
-      instance = new SoundGenerator();
-    }
-    return instance;
-  }
-
-  /**
-   * Gets a pip sample.
-   */
-  private static double[] getPip(double[] window, double frequency) {
-    int pipArrayLength = window.length;
-    double[] pipArray = new double[pipArrayLength];
-    double radPerSample = 2 * Math.PI / (Common.PLAYING_SAMPLE_RATE_HZ / frequency);
-    for (int i = 0; i < pipArrayLength; i++) {
-      pipArray[i] = window[i] * Math.sin(i * radPerSample);
-    }
-    return pipArray;
-  }
-
-  /**
-   * Get generated sound in byte[].
-   */
-  public byte[] getByte() {
-    return generatedSound;
-  }
-
-  /**
-   * Get sample in double[].
-   */
-  public double[] getSample() {
-    return sample;
-  }
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/SoundPlayerObject.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/SoundPlayerObject.java
deleted file mode 100644
index 0d93dbb..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/SoundPlayerObject.java
+++ /dev/null
@@ -1,632 +0,0 @@
-/*
- * Copyright (C) 2015 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.cts.verifier.audio;
-
-import android.content.Context;
-import android.media.AudioAttributes;
-import android.media.AudioFormat;
-import android.media.AudioManager;
-import android.media.AudioTrack;
-import android.media.MediaCodec;
-import android.media.MediaCodecList;
-import android.media.MediaExtractor;
-import android.media.MediaFormat;
-import android.media.MediaPlayer;
-import android.net.Uri;
-import android.util.Log;
-
-import com.android.cts.verifier.audio.wavelib.PipeShort;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-public class SoundPlayerObject implements Runnable, AudioTrack.OnPlaybackPositionUpdateListener {
-    private static final String LOGTAG = "SoundPlayerObject";
-
-    private static final int TIME_OUT_US = 5000;
-    private static final int DEFAULT_BLOCK_SIZE = 4096;
-
-    private MediaPlayer mMediaPlayer;
-    private boolean isInitialized = false;
-    private boolean isRunning = false;
-
-    private int bufferSize = 65536;
-    private PipeShort mDecoderPipe = new PipeShort(bufferSize);
-    public PipeShort mPipe = new PipeShort(65536);
-    private short[] mAudioShortArray;
-
-    private AudioTrack mAudioTrack;
-    private int mSamplingRate = 48000;
-    private int mChannelConfigOut = AudioFormat.CHANNEL_OUT_MONO;
-    private int mAudioFormat = AudioFormat.ENCODING_PCM_16BIT;
-    private int mMinPlayBufferSizeInBytes = 0;
-    private int mMinBufferSizeInSamples = 0;
-
-    private int mStreamType = AudioManager.STREAM_MUSIC;
-    private int mResId = -1;
-    private final boolean mUseMediaPlayer; //true: MediaPlayer, false: AudioTrack
-    private float mBalance = 0.5f; //0 left, 1 right
-
-    private Object mLock = new Object();
-    private MediaCodec mCodec = null;
-    private MediaExtractor mExtractor = null;
-    private int mInputAudioFormat;
-    private int mInputSampleRate;
-    private int mInputChannelCount;
-
-    private boolean mLooping = true;
-    private Context mContext = null;
-
-    private final int mBlockSizeSamples;
-
-    private Thread mPlaybackThread;
-
-    public SoundPlayerObject() {
-        mUseMediaPlayer = true;
-        mBlockSizeSamples = DEFAULT_BLOCK_SIZE;
-    }
-
-    public SoundPlayerObject(boolean useMediaPlayer, int blockSize) {
-        mUseMediaPlayer = useMediaPlayer;
-        mBlockSizeSamples = blockSize;
-    }
-
-    public int getCurrentResId() {
-        return mResId;
-    }
-
-    public int getStreamType () {
-        return mStreamType;
-    }
-
-    public int getChannelCount() {
-        return mInputChannelCount;
-    }
-
-    public void run() {
-        isRunning = true;
-        int decodeRounds = 0;
-        MediaCodec.BufferInfo buffInfo = new MediaCodec.BufferInfo();
-
-        while (isRunning) {
-            if (Thread.interrupted()) {
-                log("got thread interrupted!");
-                isRunning = false;
-                return;
-            }
-
-            if (mUseMediaPlayer) {
-                log("run . using media player");
-                try {
-                    Thread.sleep(10);
-                } catch (InterruptedException e) {
-                    e.printStackTrace();
-                }
-            } else {
-                if (isInitialized && !outputEosSignalled) {
-
-                    synchronized (mLock) {
-
-                        int bytesPerSample = getBytesPerSample(mInputAudioFormat);
-
-                        int valuesAvailable = mDecoderPipe.availableToRead();
-                        if (valuesAvailable > 0 && mAudioTrack != null) {
-                            int valuesOfInterest = valuesAvailable;
-                            if (mMinBufferSizeInSamples < valuesOfInterest) {
-                                valuesOfInterest = mMinBufferSizeInSamples;
-                            }
-                            mDecoderPipe.read(mAudioShortArray, 0, valuesOfInterest);
-                            //inject into output.
-                            mAudioTrack.write(mAudioShortArray, 0, valuesOfInterest);
-
-                            //delay
-                            int delayMs = (int)(1000.0f * valuesOfInterest /
-                                    (float)(mInputSampleRate * bytesPerSample *
-                                            mInputChannelCount));
-                            delayMs = Math.max(2, delayMs);
-
-                            try {
-                                Thread.sleep(delayMs);
-                            } catch (InterruptedException e) {
-                                e.printStackTrace();
-                            }
-                        } else {
-                            //read another block if possible
-
-                            decodeRounds++;
-                            if (!inputEosSignalled) {
-                                final int inputBufIndex = mCodec.dequeueInputBuffer(TIME_OUT_US);
-                                if (inputBufIndex >= 0) {
-                                    ByteBuffer encodedBuf = mCodec.getInputBuffer(inputBufIndex);
-                                    final int sampleSize =
-                                            mExtractor.readSampleData(encodedBuf, 0 /* offset */);
-                                    long presentationTimeUs = 0;
-                                    if (sampleSize < 0) {
-                                        inputEosSignalled = true;
-                                        log("[v] input EOS at decode round " + decodeRounds);
-
-                                    } else {
-                                        presentationTimeUs = mExtractor.getSampleTime();
-                                    }
-                                    mCodec.queueInputBuffer(inputBufIndex, 0/*offset*/,
-                                            inputEosSignalled ? 0 : sampleSize, presentationTimeUs,
-                                            (inputEosSignalled && !mLooping) ?
-                                                    MediaCodec.BUFFER_FLAG_END_OF_STREAM : 0);
-                                    if (!inputEosSignalled) {
-                                        mExtractor.advance();
-                                    }
-
-                                    if (inputEosSignalled && mLooping) {
-                                        log("looping is enabled. Rewinding");
-                                        mExtractor.seekTo(0, MediaExtractor.SEEK_TO_PREVIOUS_SYNC);
-                                        inputEosSignalled = false;
-                                    }
-                                } else {
-                                    log("[v] no input buffer available at decode round "
-                                            + decodeRounds);
-                                }
-                            } //!inputEosSignalled
-
-                            final int outputRes = mCodec.dequeueOutputBuffer(buffInfo, TIME_OUT_US);
-
-                            if (outputRes >= 0) {
-                                if (buffInfo.size > 0) {
-                                    final int outputBufIndex = outputRes;
-                                    final ByteBuffer decodedBuf =
-                                            mCodec.getOutputBuffer(outputBufIndex);
-
-                                    short sValue = 0; //scaled to 16 bits
-                                    int index = 0;
-                                    for (int i = 0; i < buffInfo.size && index <
-                                            mAudioShortArray.length; i += bytesPerSample) {
-                                        switch (mInputAudioFormat) {
-                                            case AudioFormat.ENCODING_PCM_FLOAT:
-                                                sValue = (short) (decodedBuf.getFloat(i) * 32768.0);
-                                                break;
-                                            case AudioFormat.ENCODING_PCM_16BIT:
-                                                sValue = (short) decodedBuf.getShort(i);
-                                                break;
-                                            case AudioFormat.ENCODING_PCM_8BIT:
-                                                sValue = (short) ((decodedBuf.getChar(i) - 128) *
-                                                        128);
-                                                break;
-                                        }
-                                        mAudioShortArray[index] = sValue;
-                                        index++;
-                                    }
-                                    mDecoderPipe.write(mAudioShortArray, 0, index);
-                                    mPipe.write(mAudioShortArray, 0, index);
-
-                                    mCodec.getOutputBuffer(outputBufIndex).position(0);
-                                    mCodec.releaseOutputBuffer(outputBufIndex,
-                                            false/*render to surface*/);
-                                    if ((buffInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) !=
-                                            0) {
-                                        outputEosSignalled = true;
-                                    }
-                                }
-                            } else if (outputRes == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
-                                log("[w] INFO_OUTPUT_FORMAT_CHANGED at decode round " +
-                                        decodeRounds);
-                                decodeRounds = 0;
-                            } else if (outputRes == MediaCodec.INFO_TRY_AGAIN_LATER) {
-                                log("[w] INFO_TRY_AGAIN_LATER at decode round " + decodeRounds);
-                                if (!mLooping) {
-                                    outputEosSignalled = true; //quit!
-                                }
-                            }
-                        }
-                    }
-
-                    if (outputEosSignalled) {
-                        log ("note: outputEosSignalled");
-                    }
-                }
-                else {
-                    try {
-                        Thread.sleep(10);
-                    } catch (InterruptedException e) {
-                        e.printStackTrace();
-                    }
-                }
-            }
-        }
-        log("done running thread");
-    }
-
-    public void setBalance(float balance) {
-        mBalance = balance;
-        if (mUseMediaPlayer) {
-            if (mMediaPlayer != null) {
-                float left = Math.min(2.0f * (1.0f - mBalance), 1.0f);
-                float right = Math.min(2.0f * mBalance, 1.0f);
-                mMediaPlayer.setVolume(left, right);
-                log(String.format("Setting balance to %f", mBalance));
-            }
-        }
-    }
-
-    public void setStreamType(int streamType) {
-        mStreamType = streamType;
-    }
-
-    public void rewind() {
-        if (mUseMediaPlayer) {
-            if (mMediaPlayer != null) {
-                mMediaPlayer.seekTo(0);
-            }
-        }
-    }
-
-    boolean inputEosSignalled = false;
-    boolean outputEosSignalled = false;
-
-    public void setSoundWithResId(Context context, int resId) {
-
-        setSoundWithResId(context, resId, true);
-    }
-
-    public void setSoundWithResId(Context context, int resId, boolean looping) {
-        log("setSoundWithResId " + resId + ", looping: " + looping);
-        mLooping = looping;
-        mContext = context;
-        if (mContext == null) {
-            log("Context can't be null");
-            return;
-        }
-
-        boolean playing = isPlaying();
-        if (playing) {
-            play(false);
-        }
-        //release player
-        releasePlayer();
-        isInitialized = false;
-
-        log("loading uri: " + resId);
-        mResId = resId;
-        Uri uri = Uri.parse("android.resource://com.android.cts.verifier/" + resId);
-        if (mUseMediaPlayer) {
-            mMediaPlayer = new MediaPlayer();
-            try {
-                log("opening resource with stream type: " + mStreamType);
-                mMediaPlayer.setAudioStreamType(mStreamType);
-                mMediaPlayer.setDataSource(mContext.getApplicationContext(),
-                        uri);
-                mMediaPlayer.prepare();
-            } catch (IOException e) {
-                e.printStackTrace();
-                log("Error: " + e.toString());
-            }
-            mMediaPlayer.setLooping(mLooping);
-            setBalance(mBalance);
-            isInitialized = true;
-
-        } else {
-            synchronized (mLock) {
-                //TODO: encapsulate MediaPlayer and AudioTrack related code into separate classes
-                // with common interface. Simplify locking code.
-                mDecoderPipe.flush();
-                mPipe.flush();
-
-                if (mCodec != null)
-                    mCodec = null;
-                try {
-                    mExtractor = new MediaExtractor();
-                    mExtractor.setDataSource(mContext.getApplicationContext(), uri, null);
-                    final int trackCount = mExtractor.getTrackCount();
-
-//                    log("Track count: " + trackCount);
-                    // find first audio track
-                    MediaFormat format = null;
-                    String mime = null;
-                    for (int i = 0; i < trackCount; i++) {
-                        format = mExtractor.getTrackFormat(i);
-                        mime = format.getString(MediaFormat.KEY_MIME);
-                        if (mime.startsWith("audio/")) {
-                            mExtractor.selectTrack(i);
-//                            log("found track " + i + " with MIME = " + mime);
-                            break;
-                        }
-                    }
-                    if (format == null) {
-                        log("found 0 audio tracks in " + uri);
-                    }
-                    MediaCodecList mclist = new MediaCodecList(MediaCodecList.ALL_CODECS);
-
-                    String myDecoderName = mclist.findDecoderForFormat(format);
-//                    log("my decoder name = " + myDecoderName);
-
-                    mCodec = MediaCodec.createByCodecName(myDecoderName);
-
-//                    log("[ok] about to configure codec with " + format);
-                    mCodec.configure(format, null /* surface */, null /* crypto */, 0 /* flags */);
-
-                    // prepare decoding
-                    mCodec.start();
-
-                    inputEosSignalled = false;
-                    outputEosSignalled = false;
-
-                    MediaFormat outputFormat = format;
-
-                    printAudioFormat(outputFormat);
-
-                    //int sampleRate
-                    mInputSampleRate = getMediaFormatInteger(outputFormat,
-                            MediaFormat.KEY_SAMPLE_RATE, 48000);
-                    //int channelCount
-                    mInputChannelCount = getMediaFormatInteger(outputFormat,
-                            MediaFormat.KEY_CHANNEL_COUNT, 1);
-
-                    mInputAudioFormat = getMediaFormatInteger(outputFormat,
-                            MediaFormat.KEY_PCM_ENCODING,
-                            AudioFormat.ENCODING_PCM_16BIT);
-
-                    int channelMask = channelMaskFromCount(mInputChannelCount);
-                    int buffSize = AudioTrack.getMinBufferSize(mInputSampleRate, channelMask,
-                            mInputAudioFormat);
-
-                    AudioAttributes.Builder aab = new AudioAttributes.Builder()
-                            .setLegacyStreamType(mStreamType);
-
-                    AudioFormat.Builder afb = new AudioFormat.Builder()
-                            .setEncoding(mInputAudioFormat)
-                            .setSampleRate(mInputSampleRate)
-                            .setChannelMask(channelMask);
-
-                    AudioTrack.Builder atb = new AudioTrack.Builder()
-                            .setAudioAttributes(aab.build())
-                            .setAudioFormat(afb.build())
-                            .setBufferSizeInBytes(buffSize)
-                            .setTransferMode(AudioTrack.MODE_STREAM);
-
-                    mAudioTrack = atb.build();
-
-                    mMinPlayBufferSizeInBytes = AudioTrack.getMinBufferSize(mInputSampleRate,
-                            mChannelConfigOut, mInputAudioFormat);
-
-                    mMinBufferSizeInSamples = mMinPlayBufferSizeInBytes / 2;
-                    mAudioShortArray = new short[mMinBufferSizeInSamples * 100];
-                    mAudioTrack.setPlaybackPositionUpdateListener(this);
-                    mAudioTrack.setPositionNotificationPeriod(mBlockSizeSamples);
-                    isInitialized = true;
-                } catch (IOException e) {
-                    e.printStackTrace();
-                    log("Error creating codec or extractor: " + e.toString());
-                }
-            }
-        } //mLock
-
-//        log("done preparing media player");
-        if (playing)
-            play(true); //start playing if it was playing before
-    }
-
-    public boolean isPlaying() {
-        boolean result = false;
-        if (mUseMediaPlayer) {
-            if (mMediaPlayer != null) {
-                result = mMediaPlayer.isPlaying();
-            }
-        } else {
-            synchronized (mLock) {
-                if (mAudioTrack != null) {
-                    result = mAudioTrack.getPlayState() == AudioTrack.PLAYSTATE_PLAYING;
-                }
-            }
-        }
-        return result;
-    }
-
-    public boolean isAlive() {
-        if (mUseMediaPlayer) {
-            return true;
-        }
-
-        synchronized (mLock) {
-            if (mPlaybackThread != null) {
-                return mPlaybackThread.isAlive();
-            }
-        }
-        return false;
-    }
-
-    public void start() {
-        if (!mUseMediaPlayer) {
-            synchronized (mLock) {
-                if (mPlaybackThread == null) {
-                    mPlaybackThread = new Thread(this);
-                    mPlaybackThread.setName("playbackThread");
-                    log("Created playback thread " + mPlaybackThread);
-                }
-
-                if (!mPlaybackThread.isAlive()) {
-                    mPlaybackThread.start();
-                    mPlaybackThread.setPriority(Thread.MAX_PRIORITY);
-                    log("Started playback thread " + mPlaybackThread);
-                }
-            }
-        }
-    }
-
-    public void play(boolean play) {
-        if (mUseMediaPlayer) {
-            if (mMediaPlayer != null) {
-                if (play) {
-                    mMediaPlayer.start();
-                } else {
-                    mMediaPlayer.pause();
-                }
-            }
-        } else {
-            synchronized (mLock) {
-                log(" called Play : " + play);
-                if (mAudioTrack != null && isInitialized) {
-                    if (play) {
-                        log("Play");
-                        mDecoderPipe.flush();
-                        mPipe.flush();
-                        mAudioTrack.play();
-                    } else {
-                        log("pause");
-                        mAudioTrack.pause();
-                        isRunning = false;
-                    }
-                }
-            }
-            start();
-        }
-    }
-
-    public void finish() {
-        play(false);
-        releasePlayer();
-    }
-
-    private void releasePlayer() {
-        if (mMediaPlayer != null) {
-            mMediaPlayer.stop();
-            mMediaPlayer.release();
-            mMediaPlayer = null;
-        }
-
-        isRunning = false;
-        synchronized (mLock) {
-            if (mAudioTrack != null) {
-                mAudioTrack.stop();
-                mAudioTrack.setPlaybackPositionUpdateListener(null);
-                mAudioTrack.release();
-                mAudioTrack = null;
-            }
-        }
-
-        log("Deleting playback thread " + mPlaybackThread);
-        Thread zeThread = mPlaybackThread;
-        mPlaybackThread = null;
-
-        if (zeThread != null) {
-            log("terminating zeThread...");
-            zeThread.interrupt();
-            try {
-                log("zeThread join...");
-                zeThread.join();
-            } catch (InterruptedException e) {
-                log("issue deleting playback thread " + e.toString());
-                zeThread.interrupt();
-            }
-        }
-        isInitialized = false;
-        log("Done deleting thread");
-
-    }
-
-    /*
-       Misc
-    */
-    private static void log(String msg) {
-        Log.v(LOGTAG, msg);
-    }
-
-    private final int getMediaFormatInteger(MediaFormat mf, String name, int defaultValue) {
-        try {
-            return mf.getInteger(name);
-        } catch (NullPointerException e) {
-            log("Warning: MediaFormat " + name +
-                " field does not exist. Using default " + defaultValue); /* no such field */
-        } catch (ClassCastException e) {
-            log("Warning: MediaFormat " + name +
-                    " field unexpected type"); /* field of different type */
-        }
-        return defaultValue;
-    }
-
-    public static int getBytesPerSample(int audioFormat) {
-        switch(audioFormat) {
-            case AudioFormat.ENCODING_PCM_16BIT:
-                return 2;
-            case AudioFormat.ENCODING_PCM_8BIT:
-                return 1;
-            case AudioFormat.ENCODING_PCM_FLOAT:
-                return 4;
-        }
-        return 0;
-    }
-
-    private void printAudioFormat(MediaFormat format) {
-        try {
-            log("channel mask = " + format.getInteger(MediaFormat.KEY_CHANNEL_MASK));
-        } catch (NullPointerException npe) {
-            log("channel mask unknown");
-        }
-        try {
-            log("channel count = " + format.getInteger(MediaFormat.KEY_CHANNEL_COUNT));
-        } catch (NullPointerException npe) {
-            log("channel count unknown");
-        }
-        try {
-            log("sample rate = " + format.getInteger(MediaFormat.KEY_SAMPLE_RATE));
-        } catch (NullPointerException npe) {
-            log("sample rate unknown");
-        }
-        try {
-            log("sample format = " + format.getInteger(MediaFormat.KEY_PCM_ENCODING));
-        } catch (NullPointerException npe) {
-            log("sample format unknown");
-        }
-    }
-
-    public static int channelMaskFromCount(int channelCount) {
-        switch(channelCount) {
-            case 1:
-                return AudioFormat.CHANNEL_OUT_MONO;
-            case 2:
-                return AudioFormat.CHANNEL_OUT_STEREO;
-            case 3:
-                return AudioFormat.CHANNEL_OUT_STEREO | AudioFormat.CHANNEL_OUT_FRONT_CENTER;
-            case 4:
-                return AudioFormat.CHANNEL_OUT_FRONT_LEFT |
-                        AudioFormat.CHANNEL_OUT_FRONT_RIGHT | AudioFormat.CHANNEL_OUT_BACK_LEFT |
-                        AudioFormat.CHANNEL_OUT_BACK_RIGHT;
-            case 5:
-                return AudioFormat.CHANNEL_OUT_FRONT_LEFT |
-                        AudioFormat.CHANNEL_OUT_FRONT_RIGHT | AudioFormat.CHANNEL_OUT_BACK_LEFT |
-                        AudioFormat.CHANNEL_OUT_BACK_RIGHT
-                        | AudioFormat.CHANNEL_OUT_FRONT_CENTER;
-            case 6:
-                return AudioFormat.CHANNEL_OUT_5POINT1;
-            default:
-                return 0;
-        }
-    }
-
-    public void periodicNotification(AudioTrack track) {
-    }
-
-    public void markerReached(AudioTrack track) {
-    }
-
-    @Override
-    public void onMarkerReached(AudioTrack track) {
-        markerReached(track);
-    }
-
-    @Override
-    public void onPeriodicNotification(AudioTrack track) {
-        periodicNotification(track);
-    }
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/SoundRecorderObject.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/SoundRecorderObject.java
deleted file mode 100644
index 8950ec5..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/SoundRecorderObject.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Copyright (C) 2019 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.cts.verifier.audio;
-
-import android.media.AudioFormat;
-import android.media.AudioRecord;
-import android.os.SystemClock;
-import android.util.Log;
-import com.android.cts.verifier.audio.wavelib.*;
-
-public class SoundRecorderObject implements Runnable,
-        AudioRecord.OnRecordPositionUpdateListener {
-    private static final String TAG = "SoundRecorderObject";
-
-    private AudioRecord mRecorder;
-    private int mMinRecordBufferSizeInSamples = 0;
-    private short[] mAudioShortArray;
-
-    private final int mBlockSizeSamples;
-    private final int mSamplingRate;
-    private final int mSelectedRecordSource;
-    private final int mChannelConfig = AudioFormat.CHANNEL_IN_MONO;
-    private final int mAudioFormat = AudioFormat.ENCODING_PCM_16BIT;
-    private final int mBytesPerSample = 2; //pcm int16
-    private Thread mRecordThread;
-
-    public PipeShort mPipe = new PipeShort(65536);
-
-    public SoundRecorderObject(int samplingRate, int blockSize, int recordingSource) {
-        mSamplingRate = samplingRate;
-        mBlockSizeSamples = blockSize;
-        mSelectedRecordSource = recordingSource;
-    }
-
-    public int getAudioSessionId() {
-        if (mRecorder != null) {
-            return mRecorder.getAudioSessionId();
-        }
-        return -1;
-    }
-
-    public void startRecording() {
-        boolean successful = initRecord();
-        if (successful) {
-            startRecordingForReal();
-        } else {
-            Log.v(TAG, "Recorder initialization error.");
-        }
-    }
-
-    private void startRecordingForReal() {
-        // start streaming
-        if (mRecordThread == null) {
-            mRecordThread = new Thread(this);
-            mRecordThread.setName("recordingThread");
-        }
-        if (!mRecordThread.isAlive()) {
-            mRecordThread.start();
-        }
-
-        mPipe.flush();
-
-//        long startTime = SystemClock.uptimeMillis();
-        mRecorder.startRecording();
-        if (mRecorder.getRecordingState() != AudioRecord.RECORDSTATE_RECORDING) {
-            stopRecording();
-            return;
-        }
-        // Log.v(TAG, "Start time: " + (long) (SystemClock.uptimeMillis() - startTime) + " ms");
-    }
-
-    public void stopRecording() {
-        //TODO: consider addin a lock to protect usage
-        stopRecordingForReal();
-    }
-
-    private void stopRecordingForReal() {
-        // stop streaming
-        Thread zeThread = mRecordThread;
-        mRecordThread = null;
-        if (zeThread != null) {
-            zeThread.interrupt();
-            try {
-                zeThread.join();
-            } catch(InterruptedException e) {
-                //restore interrupted status of recording thread
-                zeThread.interrupt();
-            }
-        }
-        // release recording resources
-        if (mRecorder != null) {
-            mRecorder.stop();
-            mRecorder.release();
-            mRecorder = null;
-        }
-    }
-
-    private boolean initRecord() {
-        int minRecordBuffSizeInBytes = AudioRecord.getMinBufferSize(mSamplingRate,
-                mChannelConfig, mAudioFormat);
-        Log.v(TAG,"FrequencyAnalyzer: min buff size = " + minRecordBuffSizeInBytes + " bytes");
-        if (minRecordBuffSizeInBytes <= 0) {
-            return false;
-        }
-
-        mMinRecordBufferSizeInSamples = minRecordBuffSizeInBytes / mBytesPerSample;
-        // allocate the byte array to read the audio data
-
-        mAudioShortArray = new short[mMinRecordBufferSizeInSamples];
-
-        Log.v(TAG, "Initiating record:");
-        Log.v(TAG, "using source " + mSelectedRecordSource);
-        Log.v(TAG, "at " + mSamplingRate + "Hz");
-
-        try {
-            mRecorder = new AudioRecord(mSelectedRecordSource, mSamplingRate,
-                    mChannelConfig, mAudioFormat,
-                    2 * minRecordBuffSizeInBytes /* double size for padding */);
-        } catch (IllegalArgumentException e) {
-            return false;
-        }
-        if (mRecorder.getState() != AudioRecord.STATE_INITIALIZED) {
-            mRecorder.release();
-            mRecorder = null;
-            return false;
-        }
-        mRecorder.setRecordPositionUpdateListener(this);
-        mRecorder.setPositionNotificationPeriod(mBlockSizeSamples / 2);
-        return true;
-    }
-
-    public void periodicNotification(AudioRecord recorder) {}
-    public void markerReached(AudioRecord track) {}
-
-     // ---------------------------------------------------------
-     // Implementation of AudioRecord.OnPeriodicNotificationListener
-     // --------------------
-    @Override
-    public void onPeriodicNotification(AudioRecord recorder) {
-        periodicNotification(recorder);
-    }
-
-    @Override
-    public void onMarkerReached(AudioRecord track) {
-        markerReached(track);
-    }
-
-    // ---------------------------------------------------------
-    // Implementation of Runnable for the audio recording + playback
-    // --------------------
-    public void run() {
-        Thread thisThread = Thread.currentThread();
-        while (!thisThread.isInterrupted()) {
-            // read from native recorder
-            int nSamplesRead = mRecorder.read(mAudioShortArray, 0, mMinRecordBufferSizeInSamples);
-            if (nSamplesRead > 0) {
-                mPipe.write(mAudioShortArray, 0, nSamplesRead);
-            }
-        }
-    }
-}
-
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralActivity.java
index 4d3e241..298a3bb 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralActivity.java
@@ -38,6 +38,9 @@
     private static final String TAG = "USBAudioPeripheralActivity";
     private static final boolean DEBUG = false;
 
+    // Host Mode Support
+    protected boolean mHasHostMode;
+
     // Profile
     protected ProfileManager mProfileManager = new ProfileManager();
     protected PeripheralProfile mSelectedProfile;
@@ -75,8 +78,8 @@
 
     private void showUAPInfoDialog() {
         new AlertDialog.Builder(this)
-                .setTitle(R.string.uap_mic_dlg_caption)
-                .setMessage(R.string.uap_mic_dlg_text)
+                .setTitle(R.string.uap_test_hostmode_info_caption)
+                .setMessage(R.string.uap_test_hostmode_info_text)
                 .setPositiveButton(R.string.audio_general_ok, null)
                 .show();
     }
@@ -84,24 +87,15 @@
     private class OnBtnClickListener implements OnClickListener {
         @Override
         public void onClick(View v) {
-            switch (v.getId()) {
-                case R.id.uap_tests_yes_btn:
-                    recordUSBAudioStatus(true);
-                    enableTestUI(true);
-                    // disable test button so that they will now run the test(s)
-                    getPassButton().setEnabled(false);
-                    break;
-
-                case R.id.uap_tests_no_btn:
-                    recordUSBAudioStatus(false);
-                    enableTestUI(false);
-                    // Allow the user to "pass" the test.
-                    getPassButton().setEnabled(true);
-                    break;
-
-                case R.id.uap_test_info_btn:
-                    showUAPInfoDialog();
-                    break;
+            int id = v.getId();
+            if (id == R.id.uap_tests_yes_btn) {
+                mHasHostMode = true;
+                setUsbAudioStatus(mHasHostMode);
+            } else if (id == R.id.uap_tests_no_btn) {
+                mHasHostMode = false;
+                setUsbAudioStatus(mHasHostMode);
+            } else if (id == R.id.uap_test_info_btn) {
+                showUAPInfoDialog();
             }
         }
     }
@@ -114,11 +108,14 @@
                 ResultUnit.NONE);
     }
 
-    //
-    // Overrides
-    //
-    void enableTestUI(boolean enable) {
+    protected void setUsbAudioStatus(boolean has) {
+        // ReportLog
+        recordUSBAudioStatus(has);
 
+        // UI & Pass/Fail status
+        getPassButton().setEnabled(!mHasHostMode);
+        findViewById(R.id.uap_tests_yes_btn).setEnabled(mHasHostMode);
+        findViewById(R.id.uap_tests_no_btn).setEnabled(!mHasHostMode);
     }
 
     public USBAudioPeripheralActivity(boolean mandatedRequired) {
@@ -213,7 +210,6 @@
         } else {
             mSelectedProfile = null;
         }
-
     }
 
     private class ConnectListener extends AudioDeviceCallback {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralAttributesActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralAttributesActivity.java
index 23ed91a..48b31a5 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralAttributesActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralAttributesActivity.java
@@ -16,22 +16,32 @@
 
 package com.android.cts.verifier.audio;
 
-import android.content.Context;
 import android.media.AudioDeviceInfo;
 import android.os.Bundle;
-import android.util.Log;
 import android.widget.TextView;
 
+import com.android.cts.verifier.audio.audiolib.AudioUtils;
 import com.android.cts.verifier.audio.peripheralprofile.ListsHelper;
 import com.android.cts.verifier.audio.peripheralprofile.PeripheralProfile;
-
 import com.android.cts.verifier.R;  // needed to access resource in CTSVerifier project namespace.
 
 public class USBAudioPeripheralAttributesActivity extends USBAudioPeripheralActivity {
     private static final String TAG = "USBAudioPeripheralAttributesActivity";
 
+    private TextView mInChanMasksTx;
+    private TextView mInPosMasksTx;
+    private TextView mInEncodingsTx;
+    private TextView mInRatesTx;
+
+    private TextView mOutChanMaskTx;
+    private TextView mOutPosMasksTx;
+    private TextView mOutEncodingsTx;
+    private TextView mOutRatesTx;
+
     private TextView mTestStatusTx;
 
+    private static final String NA_STRING = "----";
+
     public USBAudioPeripheralAttributesActivity() {
         super(true); // Mandated peripheral is required
     }
@@ -43,7 +53,17 @@
 
         connectPeripheralStatusWidgets();
 
-        mTestStatusTx = (TextView)findViewById(R.id.uap_attribsStatusTx);
+        mInChanMasksTx = (TextView) findViewById(R.id.uap_inChanMasksTx);
+        mInPosMasksTx = (TextView) findViewById(R.id.uap_inPosMasksTx);
+        mInEncodingsTx = (TextView) findViewById(R.id.uap_inEncodingsTx);
+        mInRatesTx = (TextView) findViewById(R.id.uap_inRatesTx);
+
+        mOutChanMaskTx = (TextView) findViewById(R.id.uap_outChanMasksTx);
+        mOutPosMasksTx = (TextView) findViewById(R.id.uap_outPosMasksTx);
+        mOutEncodingsTx = (TextView) findViewById(R.id.uap_outEncodingsTx);
+        mOutRatesTx = (TextView) findViewById(R.id.uap_outRatesTx);
+
+        mTestStatusTx = (TextView) findViewById(R.id.uap_attribsStatusTx);
 
         setPassFailButtonClickListeners();
         setInfoResources(R.string.usbaudio_attribs_test, R.string.usbaudio_attribs_info, -1);
@@ -54,7 +74,108 @@
     //
     // USBAudioPeripheralActivity
     //
+    @Override
+    protected void setUsbAudioStatus(boolean supportsUsbAudio) {
+        super.setUsbAudioStatus(supportsUsbAudio);
+        if (!supportsUsbAudio) {
+            mTestStatusTx.setText("Pass - No USB Host Mode Support.");
+        }
+    }
+
+    // Helpers
+    private void formatChannelIndexMasks(int[] masks, TextView tx) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("  index:");
+        for (int mask : masks) {
+            sb.append(AudioUtils.channelIndexMaskToString(mask));
+            sb.append(" ");
+        }
+        tx.setText(sb.toString());
+    }
+
+    private void formatChannelPositionMasks(int[] masks, boolean isInput, TextView tx) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("  pos:");
+        for (int mask : masks) {
+            if (isInput) {
+                sb.append(AudioUtils.channelInPositionMaskToString(mask));
+            } else {
+                sb.append(AudioUtils.channelOutPositionMaskToString(mask));
+            }
+            sb.append(" ");
+        }
+        tx.setText(sb.toString());
+    }
+
+    private void formatEncodings(int[] encodings, TextView tx) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("  encodings:");
+        for (int encoding : encodings) {
+            sb.append(AudioUtils.encodingToString(encoding));
+            sb.append(" ");
+        }
+        tx.setText(sb.toString());
+    }
+
+    private static void formatRates(int[] rates, TextView tx) {
+        StringBuilder sb = new StringBuilder();
+        sb.append("  rates:");
+        for (int rate : rates) {
+            sb.append(rate);
+            sb.append(" ");
+        }
+        tx.setText(sb.toString());
+    }
+
+    private void updateConnectedPeripheralAttribs() {
+        StringBuilder sb;
+
+        // input
+        if (mInputDevInfo != null) {
+            // Channel Index Masks
+            formatChannelIndexMasks(mInputDevInfo.getChannelIndexMasks(), mInChanMasksTx);
+
+            // Channel Position Masks
+            formatChannelPositionMasks(mInputDevInfo.getChannelMasks(), true, mInPosMasksTx);
+
+            // encodings
+            formatEncodings(mInputDevInfo.getEncodings(), mInEncodingsTx);
+
+            // rates
+            formatRates(mInputDevInfo.getSampleRates(), mInRatesTx);
+        } else {
+            // No input
+            mInChanMasksTx.setText(NA_STRING);
+            mInPosMasksTx.setText(NA_STRING);
+            mInEncodingsTx.setText(NA_STRING);
+            mInRatesTx.setText(NA_STRING);
+        }
+
+        // output
+        if (mOutputDevInfo != null) {
+            // Channel Index Masks
+            formatChannelIndexMasks(mOutputDevInfo.getChannelIndexMasks(), mOutChanMaskTx);
+
+            // Channel Position Masks
+            formatChannelPositionMasks(
+                    mOutputDevInfo.getChannelMasks(), false, mOutPosMasksTx);
+
+            // encodings
+            formatEncodings(mOutputDevInfo.getEncodings(), mOutEncodingsTx);
+
+            // rates
+            formatRates(mOutputDevInfo.getSampleRates(), mOutRatesTx);
+        } else {
+            mOutChanMaskTx.setText(NA_STRING);
+            mOutPosMasksTx.setText(NA_STRING);
+            mOutEncodingsTx.setText(NA_STRING);
+            mOutRatesTx.setText(NA_STRING);
+        }
+    }
+
     public void updateConnectStatus() {
+        updateConnectedPeripheralAttribs();
+
         boolean outPass = false;
         boolean inPass = false;
         if (mIsPeripheralAttached && mSelectedProfile != null) {
@@ -192,6 +313,11 @@
                 inPass = true;
             }
 
+            if (outPass && inPass) {
+                metaSb.append(getResources().getString(R.string.audio_general_pass));
+            } else {
+                metaSb.append(getResources().getString(R.string.audio_general_fail));
+            }
             mTestStatusTx.setText(metaSb.toString());
         } else {
             mTestStatusTx.setText("No Peripheral or No Matching Profile.");
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayActivity.java
index 4ae5ec3..d7dc702 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralPlayActivity.java
@@ -21,8 +21,7 @@
 import android.view.View;
 import android.widget.Button;
 
-import com.android.cts.verifier.audio.peripheralprofile.PeripheralProfile;
-import com.android.cts.verifier.R;  // needed to access resource in CTSVerifier project namespace.
+import com.android.cts.verifier.R;
 
 public class USBAudioPeripheralPlayActivity extends USBAudioPeripheralPlayerActivity {
     private static final String TAG = "USBAudioPeripheralPlayActivity";
@@ -69,8 +68,7 @@
     public class LocalClickListener implements View.OnClickListener {
         @Override
         public void onClick(View view) {
-            switch (view.getId()) {
-            case R.id.uap_playPlayBtn:
+            if (view.getId() == R.id.uap_playPlayBtn) {
                 Log.i(TAG, "Play Button Pressed");
                 if (!isPlaying()) {
                     startPlay();
@@ -79,7 +77,6 @@
                     stopPlay();
                     mPlayBtn.setText(getString(R.string.audio_uap_play_playBtn));
                 }
-                break;
             }
         }
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java
index 880013f..db22157 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBAudioPeripheralRecordActivity.java
@@ -23,20 +23,17 @@
 import android.widget.Button;
 import android.widget.Toast;
 
+import com.android.cts.verifier.R;
 import com.android.cts.verifier.audio.audiolib.AudioSystemParams;
 import com.android.cts.verifier.audio.audiolib.WaveScopeView;
 
-// MegaAudio imports
 import org.hyphonate.megaaudio.common.BuilderBase;
 import org.hyphonate.megaaudio.common.StreamBase;
 import org.hyphonate.megaaudio.duplex.DuplexAudioManager;
 import org.hyphonate.megaaudio.player.sources.SinAudioSourceProvider;
-import org.hyphonate.megaaudio.recorder.RecorderBuilder;
 import org.hyphonate.megaaudio.recorder.sinks.AppCallback;
 import org.hyphonate.megaaudio.recorder.sinks.AppCallbackAudioSinkProvider;
 
-import com.android.cts.verifier.R;  // needed to access resource in CTSVerifier project namespace.
-
 public class USBAudioPeripheralRecordActivity extends USBAudioPeripheralActivity {
     private static final String TAG = "USBAudioPeripheralRecordActivity";
 
@@ -163,8 +160,7 @@
         @Override
         public void onClick(View view) {
             int id = view.getId();
-            switch (id) {
-            case R.id.uap_recordRecordBtn:
+            if (id == R.id.uap_recordRecordBtn) {
                 if (!isRecording()) {
                     if (startRecording(false)) {
                         mRecordBtn.setText(getString(R.string.audio_uap_record_stopBtn));
@@ -175,9 +171,7 @@
                     mRecordBtn.setText(getString(R.string.audio_uap_record_recordBtn));
                     mRecordLoopbackBtn.setEnabled(true);
                 }
-                break;
-
-            case R.id.uap_recordRecordLoopBtn:
+            } else if (id == R.id.uap_recordRecordLoopBtn) {
                 if (!isRecording()) {
                     if (startRecording(true)) {
                         mRecordLoopbackBtn.setText(getString(R.string.audio_uap_record_stopBtn));
@@ -189,7 +183,6 @@
                         getString(R.string.audio_uap_record_recordLoopbackBtn));
                     mRecordBtn.setEnabled(true);
                 }
-                break;
             }
         }
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBRestrictRecordAActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBRestrictRecordAActivity.java
index ddaef32..aa60972 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBRestrictRecordAActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/USBRestrictRecordAActivity.java
@@ -16,7 +16,7 @@
 
 package com.android.cts.verifier.audio;
 
-import android.app.Activity;
+import android.Manifest;
 import android.app.PendingIntent;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -26,19 +26,18 @@
 import android.content.pm.PackageManager;
 import android.hardware.usb.UsbDevice;
 import android.hardware.usb.UsbManager;
-import android.Manifest;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
 import java.util.Collection;
 import java.util.HashMap;
 
-import com.android.cts.verifier.PassFailButtons;
-import com.android.cts.verifier.R;  // needed to access resource in CTSVerifier project namespace.
-
 /*
  * This tests the USB Restrict Record functionality for the explicit USB device open case
  *   (case "A").
@@ -113,10 +112,8 @@
         @Override
         public void onClick(View view) {
             int id = view.getId();
-            switch (id) {
-                case R.id.test_button:
-                    connectUSB(mContext);
-                    break;
+            if (id == R.id.test_button) {
+                connectUSB(mContext);
             }
         }
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/WavAnalyzer.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/WavAnalyzer.java
deleted file mode 100644
index b75c40b..0000000
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/WavAnalyzer.java
+++ /dev/null
@@ -1,263 +0,0 @@
-package com.android.cts.verifier.audio;
-
-import org.apache.commons.math.complex.Complex;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-/**
- * Class contains the analysis to calculate frequency response.
- */
-public class WavAnalyzer {
-  private final Listener listener;
-  private final int sampleRate;  // Recording sampling rate.
-  private double[] data;  // Whole recording data.
-  private double[] dB;  // Average response
-  private double[][] power;  // power of each trial
-  private double[] noiseDB;  // background noise
-  private double[][] noisePower;
-  private double threshold;  // threshold of passing, drop off compared to 2000 kHz
-  private boolean result = false;  // result of the test
-
-  /**
-   * Constructor of WavAnalyzer.
-   */
-  public WavAnalyzer(byte[] byteData, int sampleRate, Listener listener) {
-    this.listener = listener;
-    this.sampleRate = sampleRate;
-
-    short[] shortData = new short[byteData.length >> 1];
-    ByteBuffer.wrap(byteData).order(ByteOrder.LITTLE_ENDIAN).asShortBuffer().get(shortData);
-    this.data = Util.toDouble(shortData);
-    for (int i = 0; i < data.length; i++) {
-      data[i] = data[i] / Short.MAX_VALUE;
-    }
-  }
-
-  /**
-   * Do the analysis. Returns true if passing, false if failing.
-   */
-  public boolean doWork() {
-    if (isClipped()) {
-      return false;
-    }
-    // Calculating the pip strength.
-    listener.sendMessage("Calculating... Please wait...\n");
-    try {
-      dB = measurePipStrength();
-    } catch (IndexOutOfBoundsException e) {
-      listener.sendMessage("WARNING: May have missed the prefix."
-          + " Turn up the volume of the playback device or move to a quieter location.\n");
-      return false;
-    }
-    if (!isConsistent()) {
-      return false;
-    }
-    result = responsePassesHifiTest(dB);
-    return result;
-  }
-
-  /**
-   * Check if the recording is clipped.
-   */
-  boolean isClipped() {
-    for (int i = 1; i < data.length; i++) {
-      if ((Math.abs(data[i]) >= Short.MAX_VALUE) && (Math.abs(data[i - 1]) >= Short.MAX_VALUE)) {
-        listener.sendMessage("WARNING: Data is clipped."
-            + " Turn down the volume of the playback device and redo the procedure.\n");
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Check if the result is consistant across trials.
-   */
-  boolean isConsistent() {
-    double[] coeffOfVar = new double[Common.PIP_NUM];
-    for (int i = 0; i < Common.PIP_NUM; i++) {
-      double[] powerAtFreq = new double[Common.REPETITIONS];
-      for (int j = 0; j < Common.REPETITIONS; j++) {
-        powerAtFreq[j] = power[i][j];
-      }
-      coeffOfVar[i] = Util.std(powerAtFreq) / Util.mean(powerAtFreq);
-    }
-    if (Util.mean(coeffOfVar) > 1.0) {
-      listener.sendMessage("WARNING: Inconsistent result across trials."
-          + " Turn up the volume of the playback device or move to a quieter location.\n");
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Determine test pass/fail using the frequency response. Package visible for unit testing.
-   */
-  boolean responsePassesHifiTest(double[] dB) {
-    for (int i = 0; i < dB.length; i++) {
-      // Precautionary; NaN should not happen.
-      if (Double.isNaN(dB[i])) {
-        listener.sendMessage(
-            "WARNING: Unexpected NaN in result. Redo the test.\n");
-        return false;
-      }
-    }
-
-    if (Util.mean(dB) - Util.mean(noiseDB) < Common.SIGNAL_MIN_STRENGTH_DB_ABOVE_NOISE) {
-      listener.sendMessage("WARNING: Signal is too weak or background noise is too strong."
-          + " Turn up the volume of the playback device or move to a quieter location.\n");
-      return false;
-    }
-
-    int indexOf2000Hz = Util.findClosest(Common.FREQUENCIES_ORIGINAL, 2000.0);
-    threshold = dB[indexOf2000Hz] + Common.PASSING_THRESHOLD_DB;
-    int indexOf18500Hz = Util.findClosest(Common.FREQUENCIES_ORIGINAL, 18500.0);
-    int indexOf20000Hz = Util.findClosest(Common.FREQUENCIES_ORIGINAL, 20000.0);
-    double[] responseInRange = new double[indexOf20000Hz - indexOf18500Hz];
-    System.arraycopy(dB, indexOf18500Hz, responseInRange, 0, responseInRange.length);
-    if (Util.mean(responseInRange) < threshold) {
-      listener.sendMessage(
-          "WARNING: Failed. Retry with different orientations or report failed.\n");
-      return false;
-    }
-    return true;
-  }
-
-  /**
-   * Calculate the Fourier Coefficient at the pip frequency to calculate the frequency response.
-   * Package visible for unit testing.
-   */
-  double[] measurePipStrength() {
-    listener.sendMessage("Aligning data... Please wait...\n");
-    final int dataStartI = alignData();
-    final int prefixTotalLength = dataStartI
-        + Util.toLength(Common.PREFIX_LENGTH_S + Common.PAUSE_AFTER_PREFIX_DURATION_S, sampleRate);
-    listener.sendMessage("Done.\n");
-    listener.sendMessage("Prefix starts at " + (double) dataStartI / sampleRate + " s \n");
-    if (dataStartI > Math.round(sampleRate * (Common.PREFIX_LENGTH_S
-            + Common.PAUSE_BEFORE_PREFIX_DURATION_S + Common.PAUSE_AFTER_PREFIX_DURATION_S))) {
-      listener.sendMessage("WARNING: Unexpected prefix start time. May have missed the prefix.\n"
-          + "PLAY button should be pressed on the playback device within one second"
-          + " after RECORD is pressed on the recording device.\n"
-          + "If this happens repeatedly,"
-          + " turn up the volume of the playback device or move to a quieter location.\n");
-    }
-
-    listener.sendMessage("Analyzing noise strength... Please wait...\n");
-    noisePower = new double[Common.PIP_NUM][Common.NOISE_SAMPLES];
-    noiseDB = new double[Common.PIP_NUM];
-    for (int s = 0; s < Common.NOISE_SAMPLES; s++) {
-      double[] noisePoints = new double[Common.WINDOW_FOR_RECORDER.length];
-      System.arraycopy(data, dataStartI - (s + 1) * noisePoints.length - 1,
-          noisePoints, 0, noisePoints.length);
-      for (int j = 0; j < noisePoints.length; j++) {
-        noisePoints[j] = noisePoints[j] * Common.WINDOW_FOR_RECORDER[j];
-      }
-      for (int i = 0; i < Common.PIP_NUM; i++) {
-        double freq = Common.FREQUENCIES_ORIGINAL[i];
-        Complex fourierCoeff = new Complex(0, 0);
-        final Complex rotator = new Complex(0,
-            -2.0 * Math.PI * freq / sampleRate).exp();
-        Complex phasor = new Complex(1, 0);
-        for (int j = 0; j < noisePoints.length; j++) {
-          fourierCoeff = fourierCoeff.add(phasor.multiply(noisePoints[j]));
-          phasor = phasor.multiply(rotator);
-        }
-        fourierCoeff = fourierCoeff.multiply(1.0 / noisePoints.length);
-        noisePower[i][s] = fourierCoeff.multiply(fourierCoeff.conjugate()).abs();
-      }
-    }
-    for (int i = 0; i < Common.PIP_NUM; i++) {
-      double meanNoisePower = 0;
-      for (int j = 0; j < Common.NOISE_SAMPLES; j++) {
-        meanNoisePower += noisePower[i][j];
-      }
-      meanNoisePower /= Common.NOISE_SAMPLES;
-      noiseDB[i] = 10 * Math.log10(meanNoisePower);
-    }
-
-    listener.sendMessage("Analyzing pips... Please wait...\n");
-    power = new double[Common.PIP_NUM][Common.REPETITIONS];
-    for (int i = 0; i < Common.PIP_NUM * Common.REPETITIONS; i++) {
-      if (i % Common.PIP_NUM == 0) {
-        listener.sendMessage("#" + (i / Common.PIP_NUM + 1) + "\n");
-      }
-
-      int pipExpectedStartI;
-      pipExpectedStartI = prefixTotalLength
-          + Util.toLength(i * (Common.PIP_DURATION_S + Common.PAUSE_DURATION_S), sampleRate);
-      // Cut out the data points for the current pip.
-      double[] pipPoints = new double[Common.WINDOW_FOR_RECORDER.length];
-      System.arraycopy(data, pipExpectedStartI, pipPoints, 0, pipPoints.length);
-      for (int j = 0; j < Common.WINDOW_FOR_RECORDER.length; j++) {
-        pipPoints[j] = pipPoints[j] * Common.WINDOW_FOR_RECORDER[j];
-      }
-      Complex fourierCoeff = new Complex(0, 0);
-      final Complex rotator = new Complex(0,
-          -2.0 * Math.PI * Common.FREQUENCIES[i] / sampleRate).exp();
-      Complex phasor = new Complex(1, 0);
-      for (int j = 0; j < pipPoints.length; j++) {
-        fourierCoeff = fourierCoeff.add(phasor.multiply(pipPoints[j]));
-        phasor = phasor.multiply(rotator);
-      }
-      fourierCoeff = fourierCoeff.multiply(1.0 / pipPoints.length);
-      int j = Common.ORDER[i];
-      power[j % Common.PIP_NUM][j / Common.PIP_NUM] =
-          fourierCoeff.multiply(fourierCoeff.conjugate()).abs();
-    }
-
-    // Calculate median of trials.
-    double[] dB = new double[Common.PIP_NUM];
-    for (int i = 0; i < Common.PIP_NUM; i++) {
-      dB[i] = 10 * Math.log10(Util.median(power[i]));
-    }
-    return dB;
-  }
-
-  /**
-   * Align data using prefix. Package visible for unit testing.
-   */
-  int alignData() {
-    // Zeropadding samples to add in the correlation to avoid FFT wraparound.
-    final int zeroPad = Util.toLength(Common.PREFIX_LENGTH_S, Common.RECORDING_SAMPLE_RATE_HZ) - 1;
-    int fftSize = Util.nextPowerOfTwo((int) Math.round(sampleRate * (Common.PREFIX_LENGTH_S
-            + Common.PAUSE_BEFORE_PREFIX_DURATION_S + Common.PAUSE_AFTER_PREFIX_DURATION_S + 0.5))
-        + zeroPad);
-
-    double[] dataCut = new double[fftSize - zeroPad];
-    System.arraycopy(data, 0, dataCut, 0, fftSize - zeroPad);
-    double[] xCorrDataPrefix = Util.computeCrossCorrelation(
-        Util.padZeros(Util.toComplex(dataCut), fftSize),
-        Util.padZeros(Util.toComplex(Common.PREFIX_FOR_RECORDER), fftSize));
-    return Util.findMaxIndex(xCorrDataPrefix);
-  }
-
-  double[] getDB() {
-    return dB;
-  }
-
-  double[][] getPower() {
-    return power;
-  }
-
-  double[] getNoiseDB() {
-    return noiseDB;
-  }
-
-  double getThreshold() {
-    return threshold;
-  }
-
-  boolean getResult() {
-    return result;
-  }
-
-  /**
-   * An interface for listening a message publishing the progress of the analyzer.
-   */
-  public interface Listener {
-
-    void sendMessage(String message);
-  }
-}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioCommon.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioCommon.java
new file mode 100644
index 0000000..ba5e39b2
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioCommon.java
@@ -0,0 +1,145 @@
+package com.android.cts.verifier.audio.audiolib;
+
+import android.media.AudioManager;
+import android.media.AudioTrack;
+
+import com.android.cts.verifier.audio.AudioRecordHelper;
+import com.android.cts.verifier.audio.Util;
+
+import java.util.ArrayList;
+import java.util.Random;
+
+/**
+ * This class stores common constants and methods.
+ */
+public class AudioCommon {
+
+  public static final int RECORDING_SAMPLE_RATE_HZ
+      = AudioRecordHelper.getInstance().getSampleRate();
+  public static final int PLAYING_SAMPLE_RATE_HZ
+      = AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC);
+
+  // Default constants.
+  public static final double PASSING_THRESHOLD_DB = -40.0;
+  public static final double PIP_DURATION_S = 0.004;
+  public static final double PAUSE_DURATION_S = 0.016;
+  public static final int PREFIX_NUM_CHIPS = 1023;
+  public static final int PREFIX_SAMPLES_PER_CHIP = 4;
+  public static final double PREFIX_LENGTH_S = 0.1;
+  public static final double PAUSE_BEFORE_PREFIX_DURATION_S = 0.5;
+  public static final double PAUSE_AFTER_PREFIX_DURATION_S = 0.4;
+  public static final double MIN_FREQUENCY_HZ = 500;
+  public static final double MAX_FREQUENCY_HZ = 21000;
+  public static final double FREQUENCY_STEP_HZ = 100;
+  public static final int SIGNAL_MIN_STRENGTH_DB_ABOVE_NOISE = 10;
+  public static final int REPETITIONS = 5;
+  public static final int NOISE_SAMPLES = 3;
+
+  public static final double[] FREQUENCIES_ORIGINAL = originalFrequencies();
+  public static final int PIP_NUM = FREQUENCIES_ORIGINAL.length;
+  public static final int[] ORDER = order();
+  public static final double[] FREQUENCIES = frequencies();
+
+  public static final double[] WINDOW_FOR_RECORDER =
+      hann(Util.toLength(PIP_DURATION_S, RECORDING_SAMPLE_RATE_HZ));
+  public static final double[] WINDOW_FOR_PLAYER =
+      hann(Util.toLength(PIP_DURATION_S, PLAYING_SAMPLE_RATE_HZ));
+
+  public static final double[] PREFIX_FOR_RECORDER = prefix(RECORDING_SAMPLE_RATE_HZ);
+  public static final double[] PREFIX_FOR_PLAYER = prefix(PLAYING_SAMPLE_RATE_HZ);
+
+  /**
+   * Get a Hann window.
+   */
+  private static double[] hann(int windowWidth) {
+    double[] envelopeArray = new double[windowWidth];
+    for (int i = 0; i < windowWidth; i++) {
+      envelopeArray[i] = 0.5
+          * (1 - Math.cos(2 * Math.PI * i / windowWidth));
+    }
+    return envelopeArray;
+  }
+
+  /**
+   * Get a maximum length sequence, used as prefix to indicate start of signal.
+   */
+  private static double[] prefix(int rate) {
+    double[] codeSequence = new double[PREFIX_NUM_CHIPS];
+    for (int i = 0; i < PREFIX_NUM_CHIPS; i++) {
+      if (i < 10) {
+        codeSequence[i] = 1;
+      } else {
+        codeSequence[i] = -codeSequence[i - 6] * codeSequence[i - 7]
+            * codeSequence[i - 9] * codeSequence[i - 10];
+      }
+    }
+    double[] prefixArray = new double[PREFIX_NUM_CHIPS * PREFIX_SAMPLES_PER_CHIP];
+    int offset = 0;
+    for (int i = 0; i < PREFIX_NUM_CHIPS; i++) {
+      double value = codeSequence[i];
+      for (int j = 0; j < PREFIX_SAMPLES_PER_CHIP; j++) {
+        prefixArray[offset + j] = value;
+      }
+      offset += PREFIX_SAMPLES_PER_CHIP;
+    }
+    int prefixLength = (int) Math.round(PREFIX_LENGTH_S * rate);
+    double[] samplePrefixArray = new double[prefixLength];
+    for (int i = 0; i < prefixLength; i++) {
+      double index = (double) i / prefixLength * (prefixArray.length - 1);
+      samplePrefixArray[i] = (1 - index + Math.floor(index)) * prefixArray[(int) Math.floor(index)]
+          + (1 + index - Math.ceil(index)) * prefixArray[(int) Math.ceil(index)];
+    }
+    return samplePrefixArray;
+  }
+
+  /**
+   * Returns array consists the frequencies of the test pips in the order that will be used in test.
+   */
+  private static double[] frequencies() {
+    double[] originalFrequencies = originalFrequencies();
+
+    double[] randomFrequencies = new double[AudioCommon.REPETITIONS * originalFrequencies.length];
+    for (int i = 0; i < REPETITIONS * originalFrequencies.length; i++) {
+      randomFrequencies[i] = originalFrequencies[ORDER[i] % originalFrequencies.length];
+    }
+
+    return randomFrequencies;
+  }
+
+  /**
+   * Returns array consists the frequencies of the test pips.
+   */
+  private static double[] originalFrequencies() {
+    ArrayList<Double> frequencies = new ArrayList<Double>();
+    double frequency = AudioCommon.MIN_FREQUENCY_HZ;
+    while (frequency <= AudioCommon.MAX_FREQUENCY_HZ) {
+      frequencies.add(new Double(frequency));
+      if ((frequency >= 18500) && (frequency < 20000)) {
+        frequency += AudioCommon.FREQUENCY_STEP_HZ;
+      } else {
+        frequency += AudioCommon.FREQUENCY_STEP_HZ * 10;
+      }
+    }
+    Double[] frequenciesArray = frequencies.toArray(new Double[frequencies.size()]);
+    double[] frequenciesPrimitiveArray = new double[frequenciesArray.length];
+    for (int i = 0; i < frequenciesArray.length; i++) {
+      frequenciesPrimitiveArray[i] = frequenciesArray[i];
+    }
+    return frequenciesPrimitiveArray;
+  }
+
+  /**
+   * Fisher-Yates shuffle.
+   */
+  private static int[] order() {
+    int[] order = new int[REPETITIONS * PIP_NUM];
+    long seed = 0;
+    Random generator = new Random(seed);
+    for (int i = 0; i < REPETITIONS * PIP_NUM; i++) {
+      int j = generator.nextInt(i + 1);
+      order[i] = order[j];
+      order[j] = i;
+    }
+    return order;
+  }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioUtils.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioUtils.java
index 97f6a85..06ea61f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioUtils.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/audiolib/AudioUtils.java
@@ -19,7 +19,8 @@
 import android.media.AudioFormat;
 import android.media.AudioRecord;
 import android.media.AudioTrack;
-import android.util.Log;
+
+import java.util.HashMap;
 
 // TODO - This functionality probably exists in the framework function. Remove this and
 //    use that instead.
@@ -84,4 +85,140 @@
 
     public static native boolean isMMapSupported();
     public static native boolean isMMapExclusiveSupported();
+
+    /*
+     * Channel Mask Utilities
+     */
+    private static final HashMap<Integer, String> sEncodingStrings =
+            new HashMap<Integer, String>();
+    /**
+     * A table of strings corresponding to output channel position masks
+     */
+    private static final HashMap<Integer, String> sOutChanPosStrings =
+            new HashMap<Integer, String>();
+
+    /**
+     * A table of strings corresponding to output channel position masks
+     */
+    private static final HashMap<Integer, String> sInChanPosStrings =
+            new HashMap<Integer, String>();
+
+    static void initOutChanPositionStrings() {
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_INVALID, "CHANNEL_INVALID");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_DEFAULT, "CHANNEL_OUT_DEFAULT");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_FRONT_LEFT,
+                "CHANNEL_OUT_MONO"/*"CHANNEL_OUT_FRONT_LEFT"*/);
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_FRONT_RIGHT, "CHANNEL_OUT_FRONT_RIGHT");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_FRONT_CENTER, "CHANNEL_OUT_FRONT_CENTER");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_LOW_FREQUENCY, "CHANNEL_OUT_LOW_FREQUENCY");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_BACK_LEFT, "CHANNEL_OUT_BACK_LEFT");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_BACK_RIGHT, "CHANNEL_OUT_BACK_RIGHT");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_FRONT_LEFT_OF_CENTER,
+                "CHANNEL_OUT_FRONT_LEFT_OF_CENTER");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_FRONT_RIGHT_OF_CENTER,
+                "CHANNEL_OUT_FRONT_RIGHT_OF_CENTER");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_BACK_CENTER, "CHANNEL_OUT_BACK_CENTER");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_SIDE_LEFT, "CHANNEL_OUT_SIDE_LEFT");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_SIDE_RIGHT, "CHANNEL_OUT_SIDE_RIGHT");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_STEREO, "CHANNEL_OUT_STEREO");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_QUAD, "CHANNEL_OUT_QUAD");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_SURROUND, "CHANNEL_OUT_SURROUND");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_5POINT1, "CHANNEL_OUT_5POINT1");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_7POINT1, "CHANNEL_OUT_7POINT1");
+        sOutChanPosStrings.put(AudioFormat.CHANNEL_OUT_7POINT1_SURROUND,
+                "CHANNEL_OUT_7POINT1_SURROUND");
+    }
+
+    static void initInChanPositionStrings() {
+        sInChanPosStrings.put(AudioFormat.CHANNEL_INVALID, "CHANNEL_INVALID");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_DEFAULT, "CHANNEL_IN_DEFAULT");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_LEFT, "CHANNEL_IN_LEFT");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_RIGHT, "CHANNEL_IN_RIGHT");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_MONO, "CHANNEL_IN_MONO"/*CHANNEL_IN_FRONT*/);
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_BACK, "CHANNEL_IN_BACK");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_LEFT_PROCESSED, "CHANNEL_IN_LEFT_PROCESSED");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_RIGHT_PROCESSED, "CHANNEL_IN_RIGHT_PROCESSED");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_FRONT_PROCESSED, "CHANNEL_IN_FRONT_PROCESSED");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_BACK_PROCESSED, "CHANNEL_IN_BACK_PROCESSED");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_PRESSURE, "CHANNEL_IN_PRESSURE");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_X_AXIS, "CHANNEL_IN_X_AXIS");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_Y_AXIS, "CHANNEL_IN_Y_AXIS");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_Z_AXIS, "CHANNEL_IN_Z_AXIS");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_VOICE_UPLINK, "CHANNEL_IN_VOICE_UPLINK");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_VOICE_DNLINK, "CHANNEL_IN_VOICE_DNLINK");
+        sInChanPosStrings.put(AudioFormat.CHANNEL_IN_STEREO, "CHANNEL_IN_STEREO");
+    }
+
+    static void initEncodingStrings() {
+        sEncodingStrings.put(AudioFormat.ENCODING_INVALID, "ENCODING_INVALID");
+        sEncodingStrings.put(AudioFormat.ENCODING_DEFAULT, "ENCODING_DEFAULT");
+        sEncodingStrings.put(AudioFormat.ENCODING_PCM_16BIT, "ENCODING_PCM_16BIT");
+        sEncodingStrings.put(AudioFormat.ENCODING_PCM_8BIT, "ENCODING_PCM_8BIT");
+        sEncodingStrings.put(AudioFormat.ENCODING_PCM_FLOAT, "ENCODING_PCM_FLOAT");
+        sEncodingStrings.put(AudioFormat.ENCODING_AC3, "ENCODING_AC3");
+        sEncodingStrings.put(AudioFormat.ENCODING_E_AC3, "ENCODING_E_AC3");
+        sEncodingStrings.put(AudioFormat.ENCODING_DTS, "ENCODING_DTS");
+        sEncodingStrings.put(AudioFormat.ENCODING_DTS_HD, "ENCODING_DTS_HD");
+        sEncodingStrings.put(AudioFormat.ENCODING_MP3, "ENCODING_MP3");
+        sEncodingStrings.put(AudioFormat.ENCODING_AAC_LC, "ENCODING_AAC_LC");
+        sEncodingStrings.put(AudioFormat.ENCODING_AAC_HE_V1, "ENCODING_AAC_HE_V1");
+        sEncodingStrings.put(AudioFormat.ENCODING_AAC_HE_V2, "ENCODING_AAC_HE_V2");
+        sEncodingStrings.put(AudioFormat.ENCODING_IEC61937, "ENCODING_IEC61937");
+        sEncodingStrings.put(AudioFormat.ENCODING_DOLBY_TRUEHD, "ENCODING_DOLBY_TRUEHD");
+        sEncodingStrings.put(AudioFormat.ENCODING_AAC_ELD, "ENCODING_AAC_ELD");
+        sEncodingStrings.put(AudioFormat.ENCODING_AAC_XHE, "ENCODING_AAC_XHE");
+        sEncodingStrings.put(AudioFormat.ENCODING_AC4, "ENCODING_AC4");
+        sEncodingStrings.put(AudioFormat.ENCODING_E_AC3_JOC, "ENCODING_E_AC3_JOC");
+        sEncodingStrings.put(AudioFormat.ENCODING_DOLBY_MAT, "ENCODING_DOLBY_MAT");
+        sEncodingStrings.put(AudioFormat.ENCODING_OPUS, "ENCODING_OPUS");
+        sEncodingStrings.put(AudioFormat.ENCODING_PCM_24BIT_PACKED, "ENCODING_PCM_24BIT_PACKED");
+        sEncodingStrings.put(AudioFormat.ENCODING_PCM_32BIT, "ENCODING_PCM_32BIT");
+        sEncodingStrings.put(AudioFormat.ENCODING_MPEGH_BL_L3, "ENCODING_MPEGH_BL_L3");
+        sEncodingStrings.put(AudioFormat.ENCODING_MPEGH_BL_L4, "ENCODING_MPEGH_BL_L4");
+        sEncodingStrings.put(AudioFormat.ENCODING_MPEGH_LC_L3, "ENCODING_MPEGH_LC_L3");
+        sEncodingStrings.put(AudioFormat.ENCODING_MPEGH_LC_L4, "ENCODING_MPEGH_LC_L4");
+        sEncodingStrings.put(AudioFormat.ENCODING_DTS_UHD, "ENCODING_DTS_UHD");
+        sEncodingStrings.put(AudioFormat.ENCODING_DRA, "ENCODING_DRA");
+    }
+
+    static {
+        initOutChanPositionStrings();
+        initInChanPositionStrings();
+        initEncodingStrings();
+    }
+
+    /**
+     * @param channelMask An OUTPUT Positional Channel Mask
+     * @return A human-readable string corresponding to the specified channel mask
+     */
+    public static String channelOutPositionMaskToString(int channelMask) {
+        String maskString = sOutChanPosStrings.get(channelMask);
+        return maskString != null ? maskString : ("0x" + Integer.toHexString(channelMask));
+    }
+
+    /**
+     * @param channelMask An INPUT Positional Channel Mask
+     * @return A human-readable string corresponding to the specified channel mask
+     */
+    public static String channelInPositionMaskToString(int channelMask) {
+        String maskString = sInChanPosStrings.get(channelMask);
+        return maskString != null ? maskString : ("0x" + Integer.toHexString(channelMask));
+    }
+
+    /**
+     * @param channelMask An INDEX Channel Mask
+     * @return A human-readable string corresponding to the specified channel mask
+     */
+    public static String channelIndexMaskToString(int channelMask) {
+        return "0x" + Integer.toHexString(channelMask);
+    }
+
+    /**
+     * @param encoding An audio encoding constant
+     * @return A human-readable string corresponding to the specified encoding value
+     */
+    public static String encodingToString(int encoding) {
+        String encodingString = sEncodingStrings.get(encoding);
+        return encodingString != null ? encodingString : ("0x" + Integer.toHexString(encoding));
+    }
 }
\ No newline at end of file
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/ProfileManager.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/ProfileManager.java
index 85db63f..26bd67f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/ProfileManager.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/peripheralprofile/ProfileManager.java
@@ -16,22 +16,9 @@
 
 package com.android.cts.verifier.audio.peripheralprofile;
 
-import android.os.Environment;
 import androidx.annotation.Nullable;
-import android.util.Log;
-import android.util.Xml;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.DefaultHandler;
 
 import java.io.ByteArrayInputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -40,6 +27,12 @@
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+
 public class ProfileManager {
     private static final String TAG = "ProfileManager";
     private static final boolean DEBUG = false;
@@ -73,12 +66,12 @@
                 "<InputDevInfo ChanCounts=\"1,2\" ChanPosMasks=\"12,16\" ChanIndexMasks=\"1,3\" Encodings=\"21,4\" SampleRates=\"44100,48000,88200,96000\"/>" +
             "</PeripheralProfile>" +
             "<PeripheralProfile ProfileName=\"Behringer UMC204HD\" ProfileDescription=\"Behringer UMC204HD\" ProductName=\"USB-Audio - UMC204HD 192k\">" +
-                "<OutputDevInfo ChanCounts=\"2,3,4\" ChanPosMasks=\"12\" ChanIndexMasks=\"3,7,15\" Encodings=\"22,4\" SampleRates=\"44100,48000,88200,96000,176400,192000\"/>" +
+                "<OutputDevInfo ChanCounts=\"2,3,4\" ChanPosMasks=\"12\" ChanIndexMasks=\"3,7,15\" Encodings=\"22,4,2\" SampleRates=\"44100,48000,88200,96000,176400,192000\"/>" +
                 "<InputDevInfo ChanCounts=\"1,2\" ChanPosMasks=\"16,12\" ChanIndexMasks=\"1,3\" Encodings=\"22,4\" SampleRates=\"44100,48000,88200,96000,176400,192000\"/>" +
             "</PeripheralProfile>" +
             "<PeripheralProfile ProfileName=\"Roland Rubix24\" ProfileDescription=\"Roland Rubix24\" ProductName=\"USB-Audio - Rubix24\">" +
-                "<OutputDevInfo ChanCounts=\"2,3,4\" ChanPosMasks=\"12\" ChanIndexMasks=\"3,7,15\" Encodings=\"4\" SampleRates=\"44100,48000,96000,192000\"/>" +
-                "<InputDevInfo ChanCounts=\"1,2\" ChanPosMasks=\"12,16\" ChanIndexMasks=\"1,3\" Encodings=\"4\" SampleRates=\"44100,48000,96000,192000\"/>" +
+                "<OutputDevInfo ChanCounts=\"2,3,4\" ChanPosMasks=\"12\" ChanIndexMasks=\"3,7,15\" Encodings=\"22,4\" SampleRates=\"44100,48000,96000,192000\"/>" +
+                "<InputDevInfo ChanCounts=\"1,2\" ChanPosMasks=\"12,16\" ChanIndexMasks=\"1,3\" Encodings=\"22,4\" SampleRates=\"44100,48000,96000,192000\"/>" +
             "</PeripheralProfile>" +
             "<PeripheralProfile ProfileName=\"Pixel USB-C Dongle + Wired Analog Headset\" ProfileDescription=\"Reference USB Dongle\" ProductName=\"USB-Audio - USB-C to 3.5mm-Headphone Adapte\">" +
                 "<OutputDevInfo ChanCounts=\"2\" ChanPosMasks=\"12\" ChanIndexMasks=\"3\" Encodings=\"21,4\" SampleRates=\"48000\" />" +
@@ -100,6 +93,11 @@
                 "<InputDevInfo ChanCounts=\"1,2\" ChanPosMasks=\"12,16\" ChanIndexMasks=\"1\" Encodings=\"2\" SampleRates=\"48000\" />"+
                 "<ButtonInfo HasBtnA=\"1\" HasBtnB=\"1\" HasBtnC=\"1\" />" +
             "</PeripheralProfile>" +
+            "<PeripheralProfile ProfileName=\"Vantec\" ProfileDescription=\"Vantec 7.1 USB Interface\" ProductName=\"USB-Audio - USB Sound Device\">" +
+                "<OutputDevInfo ChanCounts=\"2,3,4,5,6,7,8\" ChanPosMasks=\"12\" ChanIndexMasks=\"3,7,15,31,63,127,255\" Encodings=\"2\" SampleRates=\"48000,96000,44100\" />" +
+                "<InputDevInfo ChanCounts=\"1,2\" ChanPosMasks=\"16,12\" ChanIndexMasks=\"1,3\" Encodings=\"2\" SampleRates=\"48000,44100\" />" +
+                "<ButtonInfo HasBtnA=\"1\" HasBtnB=\"1\" HasBtnC=\"1\" />" +
+            "</PeripheralProfile>" +
         "</ProfileList>";
 
     // XML Tags and Attributes
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/soundio/SoundGenerator.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/soundio/SoundGenerator.java
new file mode 100644
index 0000000..3ea5790
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/soundio/SoundGenerator.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2021 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.cts.verifier.audio.soundio;
+
+import com.android.cts.verifier.audio.audiolib.AudioCommon;
+import com.android.cts.verifier.audio.Util;
+
+/**
+ * Sound generator.
+ */
+public class SoundGenerator {
+
+  private static SoundGenerator instance;
+
+  private final byte[] generatedSound;
+  private final double[] sample;
+
+  private SoundGenerator() {
+    // Initialize sample.
+    int pipNum = AudioCommon.PIP_NUM;
+    int prefixTotalLength =
+          Util.toLength(AudioCommon.PREFIX_LENGTH_S, AudioCommon.PLAYING_SAMPLE_RATE_HZ)
+        + Util.toLength(AudioCommon.PAUSE_BEFORE_PREFIX_DURATION_S,
+                    AudioCommon.PLAYING_SAMPLE_RATE_HZ)
+        + Util.toLength(AudioCommon.PAUSE_AFTER_PREFIX_DURATION_S,
+                    AudioCommon.PLAYING_SAMPLE_RATE_HZ);
+    int repetitionLength = pipNum * Util.toLength(
+        AudioCommon.PIP_DURATION_S + AudioCommon.PAUSE_DURATION_S,
+            AudioCommon.PLAYING_SAMPLE_RATE_HZ);
+    int sampleLength = prefixTotalLength + AudioCommon.REPETITIONS * repetitionLength;
+    sample = new double[sampleLength];
+
+    // Fill sample with prefix.
+    System.arraycopy(AudioCommon.PREFIX_FOR_PLAYER, 0, sample,
+        Util.toLength(AudioCommon.PAUSE_BEFORE_PREFIX_DURATION_S,
+                AudioCommon.PLAYING_SAMPLE_RATE_HZ),
+        AudioCommon.PREFIX_FOR_PLAYER.length);
+
+    // Fill the sample.
+    for (int i = 0; i < pipNum * AudioCommon.REPETITIONS; i++) {
+      double[] pip = getPip(AudioCommon.WINDOW_FOR_PLAYER, AudioCommon.FREQUENCIES[i]);
+      System.arraycopy(pip, 0, sample,
+          prefixTotalLength + i * Util.toLength(
+              AudioCommon.PIP_DURATION_S + AudioCommon.PAUSE_DURATION_S,
+                  AudioCommon.PLAYING_SAMPLE_RATE_HZ),
+          pip.length);
+    }
+
+    // Convert sample to byte.
+    generatedSound = new byte[2 * sample.length];
+    int i = 0;
+    for (double dVal : sample) {
+      short val = (short) ((dVal * 32767));
+      generatedSound[i++] = (byte) (val & 0x00ff);
+      generatedSound[i++] = (byte) ((val & 0xff00) >>> 8);
+    }
+  }
+
+  public static SoundGenerator getInstance() {
+    if (instance == null) {
+      instance = new SoundGenerator();
+    }
+    return instance;
+  }
+
+  /**
+   * Gets a pip sample.
+   */
+  private static double[] getPip(double[] window, double frequency) {
+    int pipArrayLength = window.length;
+    double[] pipArray = new double[pipArrayLength];
+    double radPerSample = 2 * Math.PI / (AudioCommon.PLAYING_SAMPLE_RATE_HZ / frequency);
+    for (int i = 0; i < pipArrayLength; i++) {
+      pipArray[i] = window[i] * Math.sin(i * radPerSample);
+    }
+    return pipArray;
+  }
+
+  /**
+   * Get generated sound in byte[].
+   */
+  public byte[] getByte() {
+    return generatedSound;
+  }
+
+  /**
+   * Get sample in double[].
+   */
+  public double[] getSample() {
+    return sample;
+  }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/soundio/SoundPlayerObject.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/soundio/SoundPlayerObject.java
new file mode 100644
index 0000000..156460b
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/soundio/SoundPlayerObject.java
@@ -0,0 +1,632 @@
+/*
+ * Copyright (C) 2015 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.cts.verifier.audio.soundio;
+
+import android.content.Context;
+import android.media.AudioAttributes;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioTrack;
+import android.media.MediaCodec;
+import android.media.MediaCodecList;
+import android.media.MediaExtractor;
+import android.media.MediaFormat;
+import android.media.MediaPlayer;
+import android.net.Uri;
+import android.util.Log;
+
+import com.android.cts.verifier.audio.wavelib.PipeShort;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+
+public class SoundPlayerObject implements Runnable, AudioTrack.OnPlaybackPositionUpdateListener {
+    private static final String LOGTAG = "SoundPlayerObject";
+
+    private static final int TIME_OUT_US = 5000;
+    private static final int DEFAULT_BLOCK_SIZE = 4096;
+
+    private MediaPlayer mMediaPlayer;
+    private boolean isInitialized = false;
+    private boolean isRunning = false;
+
+    private int bufferSize = 65536;
+    private PipeShort mDecoderPipe = new PipeShort(bufferSize);
+    public PipeShort mPipe = new PipeShort(65536);
+    private short[] mAudioShortArray;
+
+    private AudioTrack mAudioTrack;
+    private int mSamplingRate = 48000;
+    private int mChannelConfigOut = AudioFormat.CHANNEL_OUT_MONO;
+    private int mAudioFormat = AudioFormat.ENCODING_PCM_16BIT;
+    private int mMinPlayBufferSizeInBytes = 0;
+    private int mMinBufferSizeInSamples = 0;
+
+    private int mStreamType = AudioManager.STREAM_MUSIC;
+    private int mResId = -1;
+    private final boolean mUseMediaPlayer; //true: MediaPlayer, false: AudioTrack
+    private float mBalance = 0.5f; //0 left, 1 right
+
+    private Object mLock = new Object();
+    private MediaCodec mCodec = null;
+    private MediaExtractor mExtractor = null;
+    private int mInputAudioFormat;
+    private int mInputSampleRate;
+    private int mInputChannelCount;
+
+    private boolean mLooping = true;
+    private Context mContext = null;
+
+    private final int mBlockSizeSamples;
+
+    private Thread mPlaybackThread;
+
+    public SoundPlayerObject() {
+        mUseMediaPlayer = true;
+        mBlockSizeSamples = DEFAULT_BLOCK_SIZE;
+    }
+
+    public SoundPlayerObject(boolean useMediaPlayer, int blockSize) {
+        mUseMediaPlayer = useMediaPlayer;
+        mBlockSizeSamples = blockSize;
+    }
+
+    public int getCurrentResId() {
+        return mResId;
+    }
+
+    public int getStreamType () {
+        return mStreamType;
+    }
+
+    public int getChannelCount() {
+        return mInputChannelCount;
+    }
+
+    public void run() {
+        isRunning = true;
+        int decodeRounds = 0;
+        MediaCodec.BufferInfo buffInfo = new MediaCodec.BufferInfo();
+
+        while (isRunning) {
+            if (Thread.interrupted()) {
+                log("got thread interrupted!");
+                isRunning = false;
+                return;
+            }
+
+            if (mUseMediaPlayer) {
+                log("run . using media player");
+                try {
+                    Thread.sleep(10);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            } else {
+                if (isInitialized && !outputEosSignalled) {
+
+                    synchronized (mLock) {
+
+                        int bytesPerSample = getBytesPerSample(mInputAudioFormat);
+
+                        int valuesAvailable = mDecoderPipe.availableToRead();
+                        if (valuesAvailable > 0 && mAudioTrack != null) {
+                            int valuesOfInterest = valuesAvailable;
+                            if (mMinBufferSizeInSamples < valuesOfInterest) {
+                                valuesOfInterest = mMinBufferSizeInSamples;
+                            }
+                            mDecoderPipe.read(mAudioShortArray, 0, valuesOfInterest);
+                            //inject into output.
+                            mAudioTrack.write(mAudioShortArray, 0, valuesOfInterest);
+
+                            //delay
+                            int delayMs = (int)(1000.0f * valuesOfInterest /
+                                    (float)(mInputSampleRate * bytesPerSample *
+                                            mInputChannelCount));
+                            delayMs = Math.max(2, delayMs);
+
+                            try {
+                                Thread.sleep(delayMs);
+                            } catch (InterruptedException e) {
+                                e.printStackTrace();
+                            }
+                        } else {
+                            //read another block if possible
+
+                            decodeRounds++;
+                            if (!inputEosSignalled) {
+                                final int inputBufIndex = mCodec.dequeueInputBuffer(TIME_OUT_US);
+                                if (inputBufIndex >= 0) {
+                                    ByteBuffer encodedBuf = mCodec.getInputBuffer(inputBufIndex);
+                                    final int sampleSize =
+                                            mExtractor.readSampleData(encodedBuf, 0 /* offset */);
+                                    long presentationTimeUs = 0;
+                                    if (sampleSize < 0) {
+                                        inputEosSignalled = true;
+                                        log("[v] input EOS at decode round " + decodeRounds);
+
+                                    } else {
+                                        presentationTimeUs = mExtractor.getSampleTime();
+                                    }
+                                    mCodec.queueInputBuffer(inputBufIndex, 0/*offset*/,
+                                            inputEosSignalled ? 0 : sampleSize, presentationTimeUs,
+                                            (inputEosSignalled && !mLooping) ?
+                                                    MediaCodec.BUFFER_FLAG_END_OF_STREAM : 0);
+                                    if (!inputEosSignalled) {
+                                        mExtractor.advance();
+                                    }
+
+                                    if (inputEosSignalled && mLooping) {
+                                        log("looping is enabled. Rewinding");
+                                        mExtractor.seekTo(0, MediaExtractor.SEEK_TO_PREVIOUS_SYNC);
+                                        inputEosSignalled = false;
+                                    }
+                                } else {
+                                    log("[v] no input buffer available at decode round "
+                                            + decodeRounds);
+                                }
+                            } //!inputEosSignalled
+
+                            final int outputRes = mCodec.dequeueOutputBuffer(buffInfo, TIME_OUT_US);
+
+                            if (outputRes >= 0) {
+                                if (buffInfo.size > 0) {
+                                    final int outputBufIndex = outputRes;
+                                    final ByteBuffer decodedBuf =
+                                            mCodec.getOutputBuffer(outputBufIndex);
+
+                                    short sValue = 0; //scaled to 16 bits
+                                    int index = 0;
+                                    for (int i = 0; i < buffInfo.size && index <
+                                            mAudioShortArray.length; i += bytesPerSample) {
+                                        switch (mInputAudioFormat) {
+                                            case AudioFormat.ENCODING_PCM_FLOAT:
+                                                sValue = (short) (decodedBuf.getFloat(i) * 32768.0);
+                                                break;
+                                            case AudioFormat.ENCODING_PCM_16BIT:
+                                                sValue = (short) decodedBuf.getShort(i);
+                                                break;
+                                            case AudioFormat.ENCODING_PCM_8BIT:
+                                                sValue = (short) ((decodedBuf.getChar(i) - 128) *
+                                                        128);
+                                                break;
+                                        }
+                                        mAudioShortArray[index] = sValue;
+                                        index++;
+                                    }
+                                    mDecoderPipe.write(mAudioShortArray, 0, index);
+                                    mPipe.write(mAudioShortArray, 0, index);
+
+                                    mCodec.getOutputBuffer(outputBufIndex).position(0);
+                                    mCodec.releaseOutputBuffer(outputBufIndex,
+                                            false/*render to surface*/);
+                                    if ((buffInfo.flags & MediaCodec.BUFFER_FLAG_END_OF_STREAM) !=
+                                            0) {
+                                        outputEosSignalled = true;
+                                    }
+                                }
+                            } else if (outputRes == MediaCodec.INFO_OUTPUT_FORMAT_CHANGED) {
+                                log("[w] INFO_OUTPUT_FORMAT_CHANGED at decode round " +
+                                        decodeRounds);
+                                decodeRounds = 0;
+                            } else if (outputRes == MediaCodec.INFO_TRY_AGAIN_LATER) {
+                                log("[w] INFO_TRY_AGAIN_LATER at decode round " + decodeRounds);
+                                if (!mLooping) {
+                                    outputEosSignalled = true; //quit!
+                                }
+                            }
+                        }
+                    }
+
+                    if (outputEosSignalled) {
+                        log ("note: outputEosSignalled");
+                    }
+                }
+                else {
+                    try {
+                        Thread.sleep(10);
+                    } catch (InterruptedException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+        log("done running thread");
+    }
+
+    public void setBalance(float balance) {
+        mBalance = balance;
+        if (mUseMediaPlayer) {
+            if (mMediaPlayer != null) {
+                float left = Math.min(2.0f * (1.0f - mBalance), 1.0f);
+                float right = Math.min(2.0f * mBalance, 1.0f);
+                mMediaPlayer.setVolume(left, right);
+                log(String.format("Setting balance to %f", mBalance));
+            }
+        }
+    }
+
+    public void setStreamType(int streamType) {
+        mStreamType = streamType;
+    }
+
+    public void rewind() {
+        if (mUseMediaPlayer) {
+            if (mMediaPlayer != null) {
+                mMediaPlayer.seekTo(0);
+            }
+        }
+    }
+
+    boolean inputEosSignalled = false;
+    boolean outputEosSignalled = false;
+
+    public void setSoundWithResId(Context context, int resId) {
+
+        setSoundWithResId(context, resId, true);
+    }
+
+    public void setSoundWithResId(Context context, int resId, boolean looping) {
+        log("setSoundWithResId " + resId + ", looping: " + looping);
+        mLooping = looping;
+        mContext = context;
+        if (mContext == null) {
+            log("Context can't be null");
+            return;
+        }
+
+        boolean playing = isPlaying();
+        if (playing) {
+            play(false);
+        }
+        //release player
+        releasePlayer();
+        isInitialized = false;
+
+        log("loading uri: " + resId);
+        mResId = resId;
+        Uri uri = Uri.parse("android.resource://com.android.cts.verifier/" + resId);
+        if (mUseMediaPlayer) {
+            mMediaPlayer = new MediaPlayer();
+            try {
+                log("opening resource with stream type: " + mStreamType);
+                mMediaPlayer.setAudioStreamType(mStreamType);
+                mMediaPlayer.setDataSource(mContext.getApplicationContext(),
+                        uri);
+                mMediaPlayer.prepare();
+            } catch (IOException e) {
+                e.printStackTrace();
+                log("Error: " + e.toString());
+            }
+            mMediaPlayer.setLooping(mLooping);
+            setBalance(mBalance);
+            isInitialized = true;
+
+        } else {
+            synchronized (mLock) {
+                //TODO: encapsulate MediaPlayer and AudioTrack related code into separate classes
+                // with common interface. Simplify locking code.
+                mDecoderPipe.flush();
+                mPipe.flush();
+
+                if (mCodec != null)
+                    mCodec = null;
+                try {
+                    mExtractor = new MediaExtractor();
+                    mExtractor.setDataSource(mContext.getApplicationContext(), uri, null);
+                    final int trackCount = mExtractor.getTrackCount();
+
+//                    log("Track count: " + trackCount);
+                    // find first audio track
+                    MediaFormat format = null;
+                    String mime = null;
+                    for (int i = 0; i < trackCount; i++) {
+                        format = mExtractor.getTrackFormat(i);
+                        mime = format.getString(MediaFormat.KEY_MIME);
+                        if (mime.startsWith("audio/")) {
+                            mExtractor.selectTrack(i);
+//                            log("found track " + i + " with MIME = " + mime);
+                            break;
+                        }
+                    }
+                    if (format == null) {
+                        log("found 0 audio tracks in " + uri);
+                    }
+                    MediaCodecList mclist = new MediaCodecList(MediaCodecList.ALL_CODECS);
+
+                    String myDecoderName = mclist.findDecoderForFormat(format);
+//                    log("my decoder name = " + myDecoderName);
+
+                    mCodec = MediaCodec.createByCodecName(myDecoderName);
+
+//                    log("[ok] about to configure codec with " + format);
+                    mCodec.configure(format, null /* surface */, null /* crypto */, 0 /* flags */);
+
+                    // prepare decoding
+                    mCodec.start();
+
+                    inputEosSignalled = false;
+                    outputEosSignalled = false;
+
+                    MediaFormat outputFormat = format;
+
+                    printAudioFormat(outputFormat);
+
+                    //int sampleRate
+                    mInputSampleRate = getMediaFormatInteger(outputFormat,
+                            MediaFormat.KEY_SAMPLE_RATE, 48000);
+                    //int channelCount
+                    mInputChannelCount = getMediaFormatInteger(outputFormat,
+                            MediaFormat.KEY_CHANNEL_COUNT, 1);
+
+                    mInputAudioFormat = getMediaFormatInteger(outputFormat,
+                            MediaFormat.KEY_PCM_ENCODING,
+                            AudioFormat.ENCODING_PCM_16BIT);
+
+                    int channelMask = channelMaskFromCount(mInputChannelCount);
+                    int buffSize = AudioTrack.getMinBufferSize(mInputSampleRate, channelMask,
+                            mInputAudioFormat);
+
+                    AudioAttributes.Builder aab = new AudioAttributes.Builder()
+                            .setLegacyStreamType(mStreamType);
+
+                    AudioFormat.Builder afb = new AudioFormat.Builder()
+                            .setEncoding(mInputAudioFormat)
+                            .setSampleRate(mInputSampleRate)
+                            .setChannelMask(channelMask);
+
+                    AudioTrack.Builder atb = new AudioTrack.Builder()
+                            .setAudioAttributes(aab.build())
+                            .setAudioFormat(afb.build())
+                            .setBufferSizeInBytes(buffSize)
+                            .setTransferMode(AudioTrack.MODE_STREAM);
+
+                    mAudioTrack = atb.build();
+
+                    mMinPlayBufferSizeInBytes = AudioTrack.getMinBufferSize(mInputSampleRate,
+                            mChannelConfigOut, mInputAudioFormat);
+
+                    mMinBufferSizeInSamples = mMinPlayBufferSizeInBytes / 2;
+                    mAudioShortArray = new short[mMinBufferSizeInSamples * 100];
+                    mAudioTrack.setPlaybackPositionUpdateListener(this);
+                    mAudioTrack.setPositionNotificationPeriod(mBlockSizeSamples);
+                    isInitialized = true;
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    log("Error creating codec or extractor: " + e.toString());
+                }
+            }
+        } //mLock
+
+//        log("done preparing media player");
+        if (playing)
+            play(true); //start playing if it was playing before
+    }
+
+    public boolean isPlaying() {
+        boolean result = false;
+        if (mUseMediaPlayer) {
+            if (mMediaPlayer != null) {
+                result = mMediaPlayer.isPlaying();
+            }
+        } else {
+            synchronized (mLock) {
+                if (mAudioTrack != null) {
+                    result = mAudioTrack.getPlayState() == AudioTrack.PLAYSTATE_PLAYING;
+                }
+            }
+        }
+        return result;
+    }
+
+    public boolean isAlive() {
+        if (mUseMediaPlayer) {
+            return true;
+        }
+
+        synchronized (mLock) {
+            if (mPlaybackThread != null) {
+                return mPlaybackThread.isAlive();
+            }
+        }
+        return false;
+    }
+
+    public void start() {
+        if (!mUseMediaPlayer) {
+            synchronized (mLock) {
+                if (mPlaybackThread == null) {
+                    mPlaybackThread = new Thread(this);
+                    mPlaybackThread.setName("playbackThread");
+                    log("Created playback thread " + mPlaybackThread);
+                }
+
+                if (!mPlaybackThread.isAlive()) {
+                    mPlaybackThread.start();
+                    mPlaybackThread.setPriority(Thread.MAX_PRIORITY);
+                    log("Started playback thread " + mPlaybackThread);
+                }
+            }
+        }
+    }
+
+    public void play(boolean play) {
+        if (mUseMediaPlayer) {
+            if (mMediaPlayer != null) {
+                if (play) {
+                    mMediaPlayer.start();
+                } else {
+                    mMediaPlayer.pause();
+                }
+            }
+        } else {
+            synchronized (mLock) {
+                log(" called Play : " + play);
+                if (mAudioTrack != null && isInitialized) {
+                    if (play) {
+                        log("Play");
+                        mDecoderPipe.flush();
+                        mPipe.flush();
+                        mAudioTrack.play();
+                    } else {
+                        log("pause");
+                        mAudioTrack.pause();
+                        isRunning = false;
+                    }
+                }
+            }
+            start();
+        }
+    }
+
+    public void finish() {
+        play(false);
+        releasePlayer();
+    }
+
+    private void releasePlayer() {
+        if (mMediaPlayer != null) {
+            mMediaPlayer.stop();
+            mMediaPlayer.release();
+            mMediaPlayer = null;
+        }
+
+        isRunning = false;
+        synchronized (mLock) {
+            if (mAudioTrack != null) {
+                mAudioTrack.stop();
+                mAudioTrack.setPlaybackPositionUpdateListener(null);
+                mAudioTrack.release();
+                mAudioTrack = null;
+            }
+        }
+
+        log("Deleting playback thread " + mPlaybackThread);
+        Thread zeThread = mPlaybackThread;
+        mPlaybackThread = null;
+
+        if (zeThread != null) {
+            log("terminating zeThread...");
+            zeThread.interrupt();
+            try {
+                log("zeThread join...");
+                zeThread.join();
+            } catch (InterruptedException e) {
+                log("issue deleting playback thread " + e.toString());
+                zeThread.interrupt();
+            }
+        }
+        isInitialized = false;
+        log("Done deleting thread");
+
+    }
+
+    /*
+       Misc
+    */
+    private static void log(String msg) {
+        Log.v(LOGTAG, msg);
+    }
+
+    private final int getMediaFormatInteger(MediaFormat mf, String name, int defaultValue) {
+        try {
+            return mf.getInteger(name);
+        } catch (NullPointerException e) {
+            log("Warning: MediaFormat " + name +
+                " field does not exist. Using default " + defaultValue); /* no such field */
+        } catch (ClassCastException e) {
+            log("Warning: MediaFormat " + name +
+                    " field unexpected type"); /* field of different type */
+        }
+        return defaultValue;
+    }
+
+    public static int getBytesPerSample(int audioFormat) {
+        switch(audioFormat) {
+            case AudioFormat.ENCODING_PCM_16BIT:
+                return 2;
+            case AudioFormat.ENCODING_PCM_8BIT:
+                return 1;
+            case AudioFormat.ENCODING_PCM_FLOAT:
+                return 4;
+        }
+        return 0;
+    }
+
+    private void printAudioFormat(MediaFormat format) {
+        try {
+            log("channel mask = " + format.getInteger(MediaFormat.KEY_CHANNEL_MASK));
+        } catch (NullPointerException npe) {
+            log("channel mask unknown");
+        }
+        try {
+            log("channel count = " + format.getInteger(MediaFormat.KEY_CHANNEL_COUNT));
+        } catch (NullPointerException npe) {
+            log("channel count unknown");
+        }
+        try {
+            log("sample rate = " + format.getInteger(MediaFormat.KEY_SAMPLE_RATE));
+        } catch (NullPointerException npe) {
+            log("sample rate unknown");
+        }
+        try {
+            log("sample format = " + format.getInteger(MediaFormat.KEY_PCM_ENCODING));
+        } catch (NullPointerException npe) {
+            log("sample format unknown");
+        }
+    }
+
+    public static int channelMaskFromCount(int channelCount) {
+        switch(channelCount) {
+            case 1:
+                return AudioFormat.CHANNEL_OUT_MONO;
+            case 2:
+                return AudioFormat.CHANNEL_OUT_STEREO;
+            case 3:
+                return AudioFormat.CHANNEL_OUT_STEREO | AudioFormat.CHANNEL_OUT_FRONT_CENTER;
+            case 4:
+                return AudioFormat.CHANNEL_OUT_FRONT_LEFT |
+                        AudioFormat.CHANNEL_OUT_FRONT_RIGHT | AudioFormat.CHANNEL_OUT_BACK_LEFT |
+                        AudioFormat.CHANNEL_OUT_BACK_RIGHT;
+            case 5:
+                return AudioFormat.CHANNEL_OUT_FRONT_LEFT |
+                        AudioFormat.CHANNEL_OUT_FRONT_RIGHT | AudioFormat.CHANNEL_OUT_BACK_LEFT |
+                        AudioFormat.CHANNEL_OUT_BACK_RIGHT
+                        | AudioFormat.CHANNEL_OUT_FRONT_CENTER;
+            case 6:
+                return AudioFormat.CHANNEL_OUT_5POINT1;
+            default:
+                return 0;
+        }
+    }
+
+    public void periodicNotification(AudioTrack track) {
+    }
+
+    public void markerReached(AudioTrack track) {
+    }
+
+    @Override
+    public void onMarkerReached(AudioTrack track) {
+        markerReached(track);
+    }
+
+    @Override
+    public void onPeriodicNotification(AudioTrack track) {
+        periodicNotification(track);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/soundio/SoundRecorderObject.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/soundio/SoundRecorderObject.java
new file mode 100644
index 0000000..d83a5dd
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/soundio/SoundRecorderObject.java
@@ -0,0 +1,176 @@
+/*
+ * Copyright (C) 2019 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.cts.verifier.audio.soundio;
+
+import android.media.AudioFormat;
+import android.media.AudioRecord;
+import android.os.SystemClock;
+import android.util.Log;
+import com.android.cts.verifier.audio.wavelib.*;
+
+public class SoundRecorderObject implements Runnable,
+        AudioRecord.OnRecordPositionUpdateListener {
+    private static final String TAG = "SoundRecorderObject";
+
+    private AudioRecord mRecorder;
+    private int mMinRecordBufferSizeInSamples = 0;
+    private short[] mAudioShortArray;
+
+    private final int mBlockSizeSamples;
+    private final int mSamplingRate;
+    private final int mSelectedRecordSource;
+    private final int mChannelConfig = AudioFormat.CHANNEL_IN_MONO;
+    private final int mAudioFormat = AudioFormat.ENCODING_PCM_16BIT;
+    private final int mBytesPerSample = 2; //pcm int16
+    private Thread mRecordThread;
+
+    public PipeShort mPipe = new PipeShort(65536);
+
+    public SoundRecorderObject(int samplingRate, int blockSize, int recordingSource) {
+        mSamplingRate = samplingRate;
+        mBlockSizeSamples = blockSize;
+        mSelectedRecordSource = recordingSource;
+    }
+
+    public int getAudioSessionId() {
+        if (mRecorder != null) {
+            return mRecorder.getAudioSessionId();
+        }
+        return -1;
+    }
+
+    public void startRecording() {
+        boolean successful = initRecord();
+        if (successful) {
+            startRecordingForReal();
+        } else {
+            Log.v(TAG, "Recorder initialization error.");
+        }
+    }
+
+    private void startRecordingForReal() {
+        // start streaming
+        if (mRecordThread == null) {
+            mRecordThread = new Thread(this);
+            mRecordThread.setName("recordingThread");
+        }
+        if (!mRecordThread.isAlive()) {
+            mRecordThread.start();
+        }
+
+        mPipe.flush();
+
+//        long startTime = SystemClock.uptimeMillis();
+        mRecorder.startRecording();
+        if (mRecorder.getRecordingState() != AudioRecord.RECORDSTATE_RECORDING) {
+            stopRecording();
+            return;
+        }
+        // Log.v(TAG, "Start time: " + (long) (SystemClock.uptimeMillis() - startTime) + " ms");
+    }
+
+    public void stopRecording() {
+        //TODO: consider addin a lock to protect usage
+        stopRecordingForReal();
+    }
+
+    private void stopRecordingForReal() {
+        // stop streaming
+        Thread zeThread = mRecordThread;
+        mRecordThread = null;
+        if (zeThread != null) {
+            zeThread.interrupt();
+            try {
+                zeThread.join();
+            } catch(InterruptedException e) {
+                //restore interrupted status of recording thread
+                zeThread.interrupt();
+            }
+        }
+        // release recording resources
+        if (mRecorder != null) {
+            mRecorder.stop();
+            mRecorder.release();
+            mRecorder = null;
+        }
+    }
+
+    private boolean initRecord() {
+        int minRecordBuffSizeInBytes = AudioRecord.getMinBufferSize(mSamplingRate,
+                mChannelConfig, mAudioFormat);
+        Log.v(TAG,"FrequencyAnalyzer: min buff size = " + minRecordBuffSizeInBytes + " bytes");
+        if (minRecordBuffSizeInBytes <= 0) {
+            return false;
+        }
+
+        mMinRecordBufferSizeInSamples = minRecordBuffSizeInBytes / mBytesPerSample;
+        // allocate the byte array to read the audio data
+
+        mAudioShortArray = new short[mMinRecordBufferSizeInSamples];
+
+        Log.v(TAG, "Initiating record:");
+        Log.v(TAG, "using source " + mSelectedRecordSource);
+        Log.v(TAG, "at " + mSamplingRate + "Hz");
+
+        try {
+            mRecorder = new AudioRecord(mSelectedRecordSource, mSamplingRate,
+                    mChannelConfig, mAudioFormat,
+                    2 * minRecordBuffSizeInBytes /* double size for padding */);
+        } catch (IllegalArgumentException e) {
+            return false;
+        }
+        if (mRecorder.getState() != AudioRecord.STATE_INITIALIZED) {
+            mRecorder.release();
+            mRecorder = null;
+            return false;
+        }
+        mRecorder.setRecordPositionUpdateListener(this);
+        mRecorder.setPositionNotificationPeriod(mBlockSizeSamples / 2);
+        return true;
+    }
+
+    public void periodicNotification(AudioRecord recorder) {}
+    public void markerReached(AudioRecord track) {}
+
+     // ---------------------------------------------------------
+     // Implementation of AudioRecord.OnPeriodicNotificationListener
+     // --------------------
+    @Override
+    public void onPeriodicNotification(AudioRecord recorder) {
+        periodicNotification(recorder);
+    }
+
+    @Override
+    public void onMarkerReached(AudioRecord track) {
+        markerReached(track);
+    }
+
+    // ---------------------------------------------------------
+    // Implementation of Runnable for the audio recording + playback
+    // --------------------
+    public void run() {
+        Thread thisThread = Thread.currentThread();
+        while (!thisThread.isInterrupted()) {
+            // read from native recorder
+            int nSamplesRead = mRecorder.read(mAudioShortArray, 0, mMinRecordBufferSizeInSamples);
+            if (nSamplesRead > 0) {
+                mPipe.write(mAudioShortArray, 0, nSamplesRead);
+            }
+        }
+    }
+}
+
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/wavelib/RmsHelper.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/wavelib/RmsHelper.java
new file mode 100644
index 0000000..71d3ec1
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/wavelib/RmsHelper.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2021 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.cts.verifier.audio.wavelib;
+
+public class RmsHelper {
+    private double mRmsCurrent;
+    public int mBlockSize;
+    private int mShoutCount;
+    public boolean mRunning = false;
+
+    private short[] mAudioShortArray;
+
+    private DspBufferDouble mRmsSnapshots;
+    private int mShotIndex;
+
+    private final float mMinRmsDb;
+    private final float mMinRmsVal;
+
+    private static final float MAX_VAL = (float)(1 << 15);
+
+    public RmsHelper(int blockSize, int shotCount, float minRmsDb, float minRmsVal) {
+        mBlockSize = blockSize;
+        mShoutCount = shotCount;
+        mMinRmsDb = minRmsDb;
+        mMinRmsVal = minRmsVal;
+
+        reset();
+    }
+
+    public void reset() {
+        mAudioShortArray = new short[mBlockSize];
+        mRmsSnapshots = new DspBufferDouble(mShoutCount);
+        mShotIndex = 0;
+        mRmsCurrent = 0;
+        mRunning = false;
+    }
+
+    public void captureShot() {
+        if (mShotIndex >= 0 && mShotIndex < mRmsSnapshots.getSize()) {
+            mRmsSnapshots.setValue(mShotIndex++, mRmsCurrent);
+        }
+    }
+
+    public void setRunning(boolean running) {
+        mRunning = running;
+    }
+
+    public double getRmsCurrent() {
+        return mRmsCurrent;
+    }
+
+    public DspBufferDouble getRmsSnapshots() {
+        return mRmsSnapshots;
+    }
+
+    public boolean updateRms(PipeShort pipe, int channelCount, int channel) {
+        if (mRunning) {
+            int samplesAvailable = pipe.availableToRead();
+            while (samplesAvailable >= mBlockSize) {
+                pipe.read(mAudioShortArray, 0, mBlockSize);
+
+                double rmsTempSum = 0;
+                int count = 0;
+                for (int i = channel; i < mBlockSize; i += channelCount) {
+                    float value = mAudioShortArray[i] / MAX_VAL;
+
+                    rmsTempSum += value * value;
+                    count++;
+                }
+                float rms = count > 0 ? (float)Math.sqrt(rmsTempSum / count) : 0f;
+                if (rms < mMinRmsVal) {
+                    rms = mMinRmsVal;
+                }
+
+                double alpha = 0.9;
+                double total_rms = rms * alpha + mRmsCurrent * (1.0f - alpha);
+                mRmsCurrent = total_rms;
+
+                samplesAvailable = pipe.availableToRead();
+            }
+            return true;
+        }
+        return false;
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/audio/wavelib/WavAnalyzer.java b/apps/CtsVerifier/src/com/android/cts/verifier/audio/wavelib/WavAnalyzer.java
new file mode 100644
index 0000000..6fdccb4
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/audio/wavelib/WavAnalyzer.java
@@ -0,0 +1,283 @@
+/*
+ * Copyright (C) 2021 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.cts.verifier.audio.wavlib;
+
+import com.android.cts.verifier.audio.audiolib.AudioCommon;
+import com.android.cts.verifier.audio.Util;
+
+import org.apache.commons.math.complex.Complex;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+/**
+ * Class contains the analysis to calculate frequency response.
+ */
+public class WavAnalyzer {
+  private final Listener listener;
+  private final int sampleRate;  // Recording sampling rate.
+  private double[] data;  // Whole recording data.
+  private double[] dB;  // Average response
+  private double[][] power;  // power of each trial
+  private double[] noiseDB;  // background noise
+  private double[][] noisePower;
+  private double threshold;  // threshold of passing, drop off compared to 2000 kHz
+  private boolean result = false;  // result of the test
+
+  /**
+   * Constructor of WavAnalyzer.
+   */
+  public WavAnalyzer(byte[] byteData, int sampleRate, Listener listener) {
+    this.listener = listener;
+    this.sampleRate = sampleRate;
+
+    short[] shortData = new short[byteData.length >> 1];
+    ByteBuffer.wrap(byteData).order(ByteOrder.LITTLE_ENDIAN).asShortBuffer().get(shortData);
+    this.data = Util.toDouble(shortData);
+    for (int i = 0; i < data.length; i++) {
+      data[i] = data[i] / Short.MAX_VALUE;
+    }
+  }
+
+  /**
+   * Do the analysis. Returns true if passing, false if failing.
+   */
+  public boolean doWork() {
+    if (isClipped()) {
+      return false;
+    }
+    // Calculating the pip strength.
+    listener.sendMessage("Calculating... Please wait...\n");
+    try {
+      dB = measurePipStrength();
+    } catch (IndexOutOfBoundsException e) {
+      listener.sendMessage("WARNING: May have missed the prefix."
+          + " Turn up the volume of the playback device or move to a quieter location.\n");
+      return false;
+    }
+    if (!isConsistent()) {
+      return false;
+    }
+    result = responsePassesHifiTest(dB);
+    return result;
+  }
+
+  /**
+   * Check if the recording is clipped.
+   */
+  public boolean isClipped() {
+    for (int i = 1; i < data.length; i++) {
+      if ((Math.abs(data[i]) >= Short.MAX_VALUE) && (Math.abs(data[i - 1]) >= Short.MAX_VALUE)) {
+        listener.sendMessage("WARNING: Data is clipped."
+            + " Turn down the volume of the playback device and redo the procedure.\n");
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Check if the result is consistant across trials.
+   */
+  public boolean isConsistent() {
+    double[] coeffOfVar = new double[AudioCommon.PIP_NUM];
+    for (int i = 0; i < AudioCommon.PIP_NUM; i++) {
+      double[] powerAtFreq = new double[AudioCommon.REPETITIONS];
+      for (int j = 0; j < AudioCommon.REPETITIONS; j++) {
+        powerAtFreq[j] = power[i][j];
+      }
+      coeffOfVar[i] = Util.std(powerAtFreq) / Util.mean(powerAtFreq);
+    }
+    if (Util.mean(coeffOfVar) > 1.0) {
+      listener.sendMessage("WARNING: Inconsistent result across trials."
+          + " Turn up the volume of the playback device or move to a quieter location.\n");
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Determine test pass/fail using the frequency response. Package visible for unit testing.
+   */
+  public boolean responsePassesHifiTest(double[] dB) {
+    for (int i = 0; i < dB.length; i++) {
+      // Precautionary; NaN should not happen.
+      if (Double.isNaN(dB[i])) {
+        listener.sendMessage(
+            "WARNING: Unexpected NaN in result. Redo the test.\n");
+        return false;
+      }
+    }
+
+    if (Util.mean(dB) - Util.mean(noiseDB) < AudioCommon.SIGNAL_MIN_STRENGTH_DB_ABOVE_NOISE) {
+      listener.sendMessage("WARNING: Signal is too weak or background noise is too strong."
+          + " Turn up the volume of the playback device or move to a quieter location.\n");
+      return false;
+    }
+
+    int indexOf2000Hz = Util.findClosest(AudioCommon.FREQUENCIES_ORIGINAL, 2000.0);
+    threshold = dB[indexOf2000Hz] + AudioCommon.PASSING_THRESHOLD_DB;
+    int indexOf18500Hz = Util.findClosest(AudioCommon.FREQUENCIES_ORIGINAL, 18500.0);
+    int indexOf20000Hz = Util.findClosest(AudioCommon.FREQUENCIES_ORIGINAL, 20000.0);
+    double[] responseInRange = new double[indexOf20000Hz - indexOf18500Hz];
+    System.arraycopy(dB, indexOf18500Hz, responseInRange, 0, responseInRange.length);
+    if (Util.mean(responseInRange) < threshold) {
+      listener.sendMessage(
+          "WARNING: Failed. Retry with different orientations or report failed.\n");
+      return false;
+    }
+    return true;
+  }
+
+  /**
+   * Calculate the Fourier Coefficient at the pip frequency to calculate the frequency response.
+   * Package visible for unit testing.
+   */
+  public double[] measurePipStrength() {
+    listener.sendMessage("Aligning data... Please wait...\n");
+    final int dataStartI = alignData();
+    final int prefixTotalLength = dataStartI
+        + Util.toLength(AudioCommon.PREFIX_LENGTH_S + AudioCommon.PAUSE_AFTER_PREFIX_DURATION_S, sampleRate);
+    listener.sendMessage("Done.\n");
+    listener.sendMessage("Prefix starts at " + (double) dataStartI / sampleRate + " s \n");
+    if (dataStartI > Math.round(sampleRate * (AudioCommon.PREFIX_LENGTH_S
+            + AudioCommon.PAUSE_BEFORE_PREFIX_DURATION_S + AudioCommon.PAUSE_AFTER_PREFIX_DURATION_S))) {
+      listener.sendMessage("WARNING: Unexpected prefix start time. May have missed the prefix.\n"
+          + "PLAY button should be pressed on the playback device within one second"
+          + " after RECORD is pressed on the recording device.\n"
+          + "If this happens repeatedly,"
+          + " turn up the volume of the playback device or move to a quieter location.\n");
+    }
+
+    listener.sendMessage("Analyzing noise strength... Please wait...\n");
+    noisePower = new double[AudioCommon.PIP_NUM][AudioCommon.NOISE_SAMPLES];
+    noiseDB = new double[AudioCommon.PIP_NUM];
+    for (int s = 0; s < AudioCommon.NOISE_SAMPLES; s++) {
+      double[] noisePoints = new double[AudioCommon.WINDOW_FOR_RECORDER.length];
+      System.arraycopy(data, dataStartI - (s + 1) * noisePoints.length - 1,
+          noisePoints, 0, noisePoints.length);
+      for (int j = 0; j < noisePoints.length; j++) {
+        noisePoints[j] = noisePoints[j] * AudioCommon.WINDOW_FOR_RECORDER[j];
+      }
+      for (int i = 0; i < AudioCommon.PIP_NUM; i++) {
+        double freq = AudioCommon.FREQUENCIES_ORIGINAL[i];
+        Complex fourierCoeff = new Complex(0, 0);
+        final Complex rotator = new Complex(0,
+            -2.0 * Math.PI * freq / sampleRate).exp();
+        Complex phasor = new Complex(1, 0);
+        for (int j = 0; j < noisePoints.length; j++) {
+          fourierCoeff = fourierCoeff.add(phasor.multiply(noisePoints[j]));
+          phasor = phasor.multiply(rotator);
+        }
+        fourierCoeff = fourierCoeff.multiply(1.0 / noisePoints.length);
+        noisePower[i][s] = fourierCoeff.multiply(fourierCoeff.conjugate()).abs();
+      }
+    }
+    for (int i = 0; i < AudioCommon.PIP_NUM; i++) {
+      double meanNoisePower = 0;
+      for (int j = 0; j < AudioCommon.NOISE_SAMPLES; j++) {
+        meanNoisePower += noisePower[i][j];
+      }
+      meanNoisePower /= AudioCommon.NOISE_SAMPLES;
+      noiseDB[i] = 10 * Math.log10(meanNoisePower);
+    }
+
+    listener.sendMessage("Analyzing pips... Please wait...\n");
+    power = new double[AudioCommon.PIP_NUM][AudioCommon.REPETITIONS];
+    for (int i = 0; i < AudioCommon.PIP_NUM * AudioCommon.REPETITIONS; i++) {
+      if (i % AudioCommon.PIP_NUM == 0) {
+        listener.sendMessage("#" + (i / AudioCommon.PIP_NUM + 1) + "\n");
+      }
+
+      int pipExpectedStartI;
+      pipExpectedStartI = prefixTotalLength
+          + Util.toLength(i * (AudioCommon.PIP_DURATION_S + AudioCommon.PAUSE_DURATION_S), sampleRate);
+      // Cut out the data points for the current pip.
+      double[] pipPoints = new double[AudioCommon.WINDOW_FOR_RECORDER.length];
+      System.arraycopy(data, pipExpectedStartI, pipPoints, 0, pipPoints.length);
+      for (int j = 0; j < AudioCommon.WINDOW_FOR_RECORDER.length; j++) {
+        pipPoints[j] = pipPoints[j] * AudioCommon.WINDOW_FOR_RECORDER[j];
+      }
+      Complex fourierCoeff = new Complex(0, 0);
+      final Complex rotator = new Complex(0,
+          -2.0 * Math.PI * AudioCommon.FREQUENCIES[i] / sampleRate).exp();
+      Complex phasor = new Complex(1, 0);
+      for (int j = 0; j < pipPoints.length; j++) {
+        fourierCoeff = fourierCoeff.add(phasor.multiply(pipPoints[j]));
+        phasor = phasor.multiply(rotator);
+      }
+      fourierCoeff = fourierCoeff.multiply(1.0 / pipPoints.length);
+      int j = AudioCommon.ORDER[i];
+      power[j % AudioCommon.PIP_NUM][j / AudioCommon.PIP_NUM] =
+          fourierCoeff.multiply(fourierCoeff.conjugate()).abs();
+    }
+
+    // Calculate median of trials.
+    double[] dB = new double[AudioCommon.PIP_NUM];
+    for (int i = 0; i < AudioCommon.PIP_NUM; i++) {
+      dB[i] = 10 * Math.log10(Util.median(power[i]));
+    }
+    return dB;
+  }
+
+  /**
+   * Align data using prefix. Package visible for unit testing.
+   */
+  public int alignData() {
+    // Zeropadding samples to add in the correlation to avoid FFT wraparound.
+    final int zeroPad =
+            Util.toLength(AudioCommon.PREFIX_LENGTH_S, AudioCommon.RECORDING_SAMPLE_RATE_HZ) - 1;
+    int fftSize = Util.nextPowerOfTwo((int) Math.round(sampleRate * (AudioCommon.PREFIX_LENGTH_S
+              + AudioCommon.PAUSE_BEFORE_PREFIX_DURATION_S
+              + AudioCommon.PAUSE_AFTER_PREFIX_DURATION_S + 0.5))
+        + zeroPad);
+
+    double[] dataCut = new double[fftSize - zeroPad];
+    System.arraycopy(data, 0, dataCut, 0, fftSize - zeroPad);
+    double[] xCorrDataPrefix = Util.computeCrossCorrelation(
+        Util.padZeros(Util.toComplex(dataCut), fftSize),
+        Util.padZeros(Util.toComplex(AudioCommon.PREFIX_FOR_RECORDER), fftSize));
+    return Util.findMaxIndex(xCorrDataPrefix);
+  }
+
+  public double[] getDB() {
+    return dB;
+  }
+
+  public double[][] getPower() {
+    return power;
+  }
+
+  public double[] getNoiseDB() {
+    return noiseDB;
+  }
+
+  public double getThreshold() {
+    return threshold;
+  }
+
+  public boolean getResult() {
+    return result;
+  }
+
+  /**
+   * An interface for listening a message publishing the progress of the analyzer.
+   */
+  public interface Listener {
+
+    void sendMessage(String message);
+  }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleClientTestBaseActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleClientTestBaseActivity.java
index 7cdf1d3..051909d 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleClientTestBaseActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleClientTestBaseActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.cts.verifier.bluetooth;
 
+import static com.android.compatibility.common.util.ShellIdentityUtils.invokeWithShellPermissions;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -31,6 +33,7 @@
 import android.util.Log;
 import android.widget.ListView;
 
+
 import com.android.cts.verifier.PassFailButtons;
 import com.android.cts.verifier.R;
 
@@ -476,12 +479,8 @@
             if (intent.getAction().equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
                 int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1);
                 if (state == BluetoothAdapter.STATE_OFF) {
-                    mHandler.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            mAdapter.enable();
-                        }
-                    }, BT_ON_DELAY);
+                    mHandler.postDelayed(() ->
+                            invokeWithShellPermissions(() -> mAdapter.enable()), BT_ON_DELAY);
                 } else if (state == BluetoothAdapter.STATE_ON) {
                     mIsSwitching = false;
                     unregisterReceiver(this);
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleConnectionPriorityClientBaseActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleConnectionPriorityClientBaseActivity.java
index 9119aae..bb27137 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleConnectionPriorityClientBaseActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleConnectionPriorityClientBaseActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.cts.verifier.bluetooth;
 
+import static com.android.compatibility.common.util.ShellIdentityUtils.invokeWithShellPermissions;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -253,12 +255,8 @@
             if (intent.getAction().equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
                 int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1);
                 if (state == BluetoothAdapter.STATE_OFF) {
-                    mHandler.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            mAdapter.enable();
-                        }
-                    }, BT_ON_DELAY);
+                    mHandler.postDelayed(() ->
+                            invokeWithShellPermissions(() -> mAdapter.enable()), BT_ON_DELAY);
                 } else if (state == BluetoothAdapter.STATE_ON) {
                     mIsSwitching = false;
                     unregisterReceiver(this);
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleEncryptedClientBaseActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleEncryptedClientBaseActivity.java
index 38cad0f..ad4e39f 100755
--- a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleEncryptedClientBaseActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BleEncryptedClientBaseActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.cts.verifier.bluetooth;
 
+import static com.android.compatibility.common.util.ShellIdentityUtils.invokeWithShellPermissions;
+
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -283,12 +285,8 @@
             if (intent.getAction().equals(BluetoothAdapter.ACTION_STATE_CHANGED)) {
                 int state = intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1);
                 if (state == BluetoothAdapter.STATE_OFF) {
-                    mHandler.postDelayed(new Runnable() {
-                        @Override
-                        public void run() {
-                            mAdapter.enable();
-                        }
-                    }, BT_ON_DELAY);
+                    mHandler.postDelayed(() ->
+                            invokeWithShellPermissions(() -> mAdapter.enable()), BT_ON_DELAY);
                 } else if (state == BluetoothAdapter.STATE_ON) {
                     mIsSwitching = false;
                     unregisterReceiver(this);
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BtAdapterUtils.java b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BtAdapterUtils.java
index 1576d34..e795afc 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BtAdapterUtils.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/bluetooth/BtAdapterUtils.java
@@ -16,6 +16,8 @@
 
 package com.android.cts.verifier.bluetooth;
 
+import static com.android.compatibility.common.util.ShellIdentityUtils.invokeWithShellPermissions;
+
 import android.bluetooth.BluetoothAdapter;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -96,7 +98,7 @@
 
         if (bluetoothAdapter.isEnabled()) return true;
 
-        bluetoothAdapter.enable();
+        invokeWithShellPermissions(() -> bluetoothAdapter.enable());
         sAdapterStateEnablingLock.lock();
         try {
             // Wait for the Adapter to be enabled
@@ -125,7 +127,7 @@
 
         if (bluetoothAdapter.getState() == BluetoothAdapter.STATE_OFF) return true;
 
-        bluetoothAdapter.disable();
+        invokeWithShellPermissions(() -> bluetoothAdapter.disable());
         sAdapterStateDisablingLock.lock();
         try {
             // Wait for the Adapter to be disabled
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
index 6c8c501..406a305 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/fov/PhotoCaptureActivity.java
@@ -23,6 +23,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.graphics.Color;
+import android.graphics.SurfaceTexture;
 import android.hardware.Camera;
 import android.hardware.Camera.PictureCallback;
 import android.hardware.Camera.ShutterCallback;
@@ -34,8 +35,7 @@
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
 import android.view.Surface;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
+import android.view.TextureView;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.AdapterView;
@@ -59,22 +59,24 @@
  * An activity for showing the camera preview and taking a picture.
  */
 public class PhotoCaptureActivity extends Activity
-        implements PictureCallback, SurfaceHolder.Callback {
+        implements PictureCallback, TextureView.SurfaceTextureListener {
     private static final String TAG = PhotoCaptureActivity.class.getSimpleName();
     private static final int FOV_REQUEST_CODE = 1006;
     private static final String PICTURE_FILENAME = "photo.jpg";
     private static float mReportedFovDegrees = 0;
     private float mReportedFovPrePictureTaken = -1;
 
-    private SurfaceView mPreview;
-    private SurfaceHolder mSurfaceHolder;
+    private TextureView mPreviewView;
+    private SurfaceTexture mPreviewTexture;
+    private int mPreviewTexWidth;
+    private int mPreviewTexHeight;
+
     private Spinner mResolutionSpinner;
     private List<SelectableResolution> mSupportedResolutions;
     private ArrayAdapter<SelectableResolution> mAdapter;
 
     private SelectableResolution mSelectedResolution;
     private Camera mCamera;
-    private Size mSurfaceSize;
     private boolean mCameraInitialized = false;
     private boolean mPreviewActive = false;
     private boolean mTakingPicture = false;
@@ -114,12 +116,8 @@
             }
         }
 
-        mPreview = (SurfaceView) findViewById(R.id.camera_fov_camera_preview);
-        mSurfaceHolder = mPreview.getHolder();
-        mSurfaceHolder.addCallback(this);
-
-        // This is required for older versions of Android hardware.
-        mSurfaceHolder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
+        mPreviewView = (TextureView) findViewById(R.id.camera_fov_camera_preview);
+        mPreviewView.setSurfaceTextureListener(this);
 
         TextView textView = (TextView) findViewById(R.id.camera_fov_tap_to_take_photo);
         textView.setTextColor(Color.WHITE);
@@ -365,20 +363,27 @@
     }
 
     @Override
-    public void surfaceChanged(
-            SurfaceHolder holder, int format, int width, int height) {
-        mSurfaceSize = new Size(width, height);
+    public void onSurfaceTextureAvailable(SurfaceTexture surface,
+            int width, int height) {
+        mPreviewTexture = surface;
+        mPreviewTexWidth = width;
+        mPreviewTexHeight = height;
         initializeCamera();
     }
 
     @Override
-    public void surfaceCreated(SurfaceHolder holder) {
-        // Nothing to do.
+    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {
+        // Ignored, Camera does all the work for us
     }
 
     @Override
-    public void surfaceDestroyed(SurfaceHolder holder) {
-        // Nothing to do.
+    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+        return true;
+    }
+
+    @Override
+    public void onSurfaceTextureUpdated(SurfaceTexture surface) {
+        // Invoked every time there's a new Camera preview frame
     }
 
     private void showNextDialogToChoosePreviewSize() {
@@ -432,14 +437,14 @@
     }
 
     private void initializeCamera(boolean startPreviewAfterInit) {
-        if (mCamera == null || mSurfaceHolder.getSurface() == null) {
+        if (mCamera == null || mPreviewTexture == null) {
             return;
         }
 
         try {
-            mCamera.setPreviewDisplay(mSurfaceHolder);
+            mCamera.setPreviewTexture(mPreviewTexture);
         } catch (Throwable t) {
-            Log.e(TAG, "Could not set preview display", t);
+            Log.e(TAG, "Could not set preview texture", t);
             Toast.makeText(this, t.getMessage(), Toast.LENGTH_LONG).show();
             return;
         }
@@ -452,13 +457,13 @@
         Size selectedPreviewSize = null;
         if (mPreviewSizes != null) {
             selectedPreviewSize = mPreviewSizes[mSelectedResolution.cameraId];
-        } else if (mSurfaceSize != null) {
+        } else {
             if (mPreviewOrientation == 0 || mPreviewOrientation == 180) {
                 selectedPreviewSize = getBestPreviewSize(
-                        mSurfaceSize.width, mSurfaceSize.height, params);
+                        mPreviewTexWidth, mPreviewTexHeight, params);
             } else {
                 selectedPreviewSize = getBestPreviewSize(
-                        mSurfaceSize.height, mSurfaceSize.width, params);
+                        mPreviewTexHeight, mPreviewTexWidth, params);
             }
         }
 
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/intents/CameraIntentsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/intents/CameraIntentsActivity.java
index 7eae01c..924912f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/intents/CameraIntentsActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/intents/CameraIntentsActivity.java
@@ -15,8 +15,11 @@
  */
 package com.android.cts.verifier.camera.intents;
 
+import static android.media.MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO;
+import static android.media.MediaMetadataRetriever.METADATA_KEY_LOCATION;
+
+import android.Manifest;
 import android.app.job.JobInfo;
-import android.app.job.JobParameters;
 import android.app.job.JobScheduler;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
@@ -24,7 +27,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
-import android.content.pm.PermissionInfo;
 import android.hardware.Camera;
 import android.media.ExifInterface;
 import android.media.MediaMetadataRetriever;
@@ -39,24 +41,20 @@
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.TextView;
-import androidx.core.content.FileProvider;
-import android.Manifest;
+import android.widget.Toast;
 
-import com.android.cts.verifier.camera.intents.CameraContentJobService;
+import androidx.core.content.FileProvider;
+
 import com.android.cts.verifier.PassFailButtons;
 import com.android.cts.verifier.R;
 import com.android.cts.verifier.TestResult;
-import android.widget.Toast;
-
-import static android.media.MediaMetadataRetriever.METADATA_KEY_HAS_VIDEO;
-import static android.media.MediaMetadataRetriever.METADATA_KEY_LOCATION;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.TreeSet;
-import java.util.Date;
 import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TreeSet;
 
 /**
  * Tests for manual verification of uri trigger and camera intents being fired.
@@ -518,7 +516,11 @@
               mediaRetriever.extractMetadata(METADATA_KEY_HAS_VIDEO) +
               " METADATA_KEY_LOCATION: " +
               mediaRetriever.extractMetadata(METADATA_KEY_LOCATION));
-        mediaRetriever.release();
+        try {
+            mediaRetriever.release();
+        } catch (IOException e) {
+            // We ignore errors occurred while releasing the MediaMetadataRetriever.
+        }
         /* successful, unless we get the URI trigger back at some point later on. */
         mActionSuccess = true;
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsService.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsService.java
index 63d9687..caeec91 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsService.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsService.java
@@ -46,6 +46,8 @@
 import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
 import android.media.AudioAttributes;
+import android.media.CamcorderProfile;
+import android.media.MediaRecorder;
 import android.media.Image;
 import android.media.ImageReader;
 import android.media.ImageWriter;
@@ -88,6 +90,7 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
@@ -100,8 +103,10 @@
 import java.nio.FloatBuffer;
 import java.nio.charset.Charset;
 import java.security.MessageDigest;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -150,8 +155,6 @@
 
     // Performance class R version number
     private static final int PERFORMANCE_CLASS_R = Build.VERSION_CODES.R;
-    // Performance class S version number
-    private static final int PERFORMANCE_CLASS_S = Build.VERSION_CODES.R + 1;
 
     public static final int SERVERPORT = 6000;
 
@@ -167,6 +170,7 @@
     public static final String TRIGGER_AF_KEY = "af";
     public static final String VIB_PATTERN_KEY = "pattern";
     public static final String EVCOMP_KEY = "evComp";
+    public static final String AUTO_FLASH_KEY = "autoFlash";
     public static final String AUDIO_RESTRICTION_MODE_KEY = "mode";
 
     private CameraManager mCameraManager = null;
@@ -178,6 +182,7 @@
     private CameraCaptureSession mSession = null;
     private ImageReader[] mOutputImageReaders = null;
     private SparseArray<String> mPhysicalStreamMap = new SparseArray<String>();
+    private SparseArray<Long> mStreamUseCaseMap = new SparseArray<Long>();
     private ImageReader mInputImageReader = null;
     private CameraCharacteristics mCameraCharacteristics = null;
     private HashMap<String, CameraCharacteristics> mPhysicalCameraChars =
@@ -218,6 +223,9 @@
     private int mCaptureStatsGridWidth;
     private int mCaptureStatsGridHeight;
     private CaptureResult mCaptureResults[] = null;
+    private MediaRecorder mMediaRecorder;
+    private Surface mRecordSurface;
+    private CaptureRequest.Builder mCaptureRequestBuilder;
 
     private volatile ConditionVariable mInterlock3A = new ConditionVariable(true);
 
@@ -237,6 +245,21 @@
         public float values[];
     }
 
+    class VideoRecordingObject {
+        public String recordedOutputPath;
+        public String quality;
+        public Size videoSize;
+        public int videoFrameRate;
+
+        public VideoRecordingObject(String recordedOutputPath,
+                String quality, Size videoSize, int videoFrameRate) {
+            this.recordedOutputPath = recordedOutputPath;
+            this.quality = quality;
+            this.videoSize = videoSize;
+            this.videoFrameRate = videoFrameRate;
+        }
+    }
+
     // For capturing motion sensor traces.
     private SensorManager mSensorManager = null;
     private Sensor mAccelSensor = null;
@@ -737,15 +760,26 @@
                     doCheckStreamCombination(cmdObj);
                 } else if ("isCameraPrivacyModeSupported".equals(cmdObj.getString("cmdName"))) {
                     doCheckCameraPrivacyModeSupport();
-                } else if ("isPerformanceClassPrimaryCamera".equals(cmdObj.getString("cmdName"))) {
+                } else if ("isPrimaryCamera".equals(cmdObj.getString("cmdName"))) {
                     String cameraId = cmdObj.getString("cameraId");
-                    doCheckPerformanceClassPrimaryCamera(cameraId);
+                    doCheckPrimaryCamera(cameraId);
+                } else if ("isPerformanceClass".equals(cmdObj.getString("cmdName"))) {
+                    doCheckPerformanceClass();
                 } else if ("measureCameraLaunchMs".equals(cmdObj.getString("cmdName"))) {
                     String cameraId = cmdObj.getString("cameraId");
                     doMeasureCameraLaunchMs(cameraId);
                 } else if ("measureCamera1080pJpegCaptureMs".equals(cmdObj.getString("cmdName"))) {
                     String cameraId = cmdObj.getString("cameraId");
                     doMeasureCamera1080pJpegCaptureMs(cameraId);
+                } else if ("getSupportedVideoQualities".equals(cmdObj.getString("cmdName"))) {
+                    String cameraId = cmdObj.getString("cameraId");
+                    doGetSupportedVideoQualities(cameraId);
+                } else if ("doBasicRecording".equals(cmdObj.getString("cmdName"))) {
+                    String cameraId = cmdObj.getString("cameraId");
+                    int profileId = cmdObj.getInt("profileId");
+                    String quality = cmdObj.getString("quality");
+                    int recordingDuration = cmdObj.getInt("recordingDuration");
+                    doBasicRecording(cameraId, profileId, quality, recordingDuration);
                 } else {
                     throw new ItsException("Unknown command: " + cmd);
                 }
@@ -846,6 +880,20 @@
             }
         }
 
+        public void sendVideoRecordingObject(VideoRecordingObject obj)
+                throws ItsException {
+            try {
+                JSONObject videoJson = new JSONObject();
+                videoJson.put("recordedOutputPath", obj.recordedOutputPath);
+                videoJson.put("quality", obj.quality);
+                videoJson.put("videoFrameRate", obj.videoFrameRate);
+                videoJson.put("videoSize", obj.videoSize);
+                sendResponse("recordingResponse", null, videoJson, null);
+            } catch (org.json.JSONException e) {
+                throw new ItsException("JSON error: ", e);
+            }
+        }
+
         public void sendResponseCaptureResult(CameraCharacteristics props,
                                               CaptureRequest request,
                                               TotalCaptureResult result,
@@ -1054,6 +1102,9 @@
                 if (mPhysicalStreamMap.get(i) != null) {
                     config.setPhysicalCameraId(mPhysicalStreamMap.get(i));
                 }
+                if (mStreamUseCaseMap.get(i) != null) {
+                    config.setStreamUseCase(mStreamUseCaseMap.get(i));
+                }
                 outputConfigs.add(config);
             }
 
@@ -1082,10 +1133,7 @@
                 hasPrivacySupport ? "true" : "false");
     }
 
-    private void doCheckPerformanceClassPrimaryCamera(String cameraId) throws ItsException {
-        boolean  isPerfClass = (Build.VERSION.MEDIA_PERFORMANCE_CLASS == PERFORMANCE_CLASS_S
-                || Build.VERSION.MEDIA_PERFORMANCE_CLASS == PERFORMANCE_CLASS_R);
-
+    private void doCheckPrimaryCamera(String cameraId) throws ItsException {
         if (mItsCameraIdList == null) {
             mItsCameraIdList = ItsUtils.getItsCompatibleCameraIds(mCameraManager);
         }
@@ -1116,8 +1164,15 @@
             throw new ItsException("Failed to get camera characteristics", e);
         }
 
-        mSocketRunnableObj.sendResponse("performanceClassPrimaryCamera",
-                (isPerfClass && isPrimaryCamera) ? "true" : "false");
+        mSocketRunnableObj.sendResponse("primaryCamera",
+                isPrimaryCamera ? "true" : "false");
+    }
+
+    private void doCheckPerformanceClass() throws ItsException {
+        boolean  isPerfClass = (Build.VERSION.MEDIA_PERFORMANCE_CLASS >= PERFORMANCE_CLASS_R);
+
+        mSocketRunnableObj.sendResponse("performanceClass",
+                isPerfClass ? "true" : "false");
     }
 
     private double invokeCameraPerformanceTest(Class testClass, String testName,
@@ -1289,6 +1344,12 @@
                 Logt.i(TAG, String.format("Running 3A with AE exposure compensation value: %d", evComp));
             }
 
+            // Auto flash can be specified as part of AE convergence.
+            boolean autoFlash = params.optBoolean(AUTO_FLASH_KEY, false);
+            if (autoFlash == true) {
+                Logt.i(TAG, String.format("Running with auto flash mode."));
+            }
+
             // By default, AE and AF both get triggered, but the user can optionally override this.
             // Also, AF won't get triggered if the lens is fixed-focus.
             boolean doAE = true;
@@ -1362,8 +1423,6 @@
                         req.set(CaptureRequest.CONTROL_MODE, CaptureRequest.CONTROL_MODE_AUTO);
                         req.set(CaptureRequest.CONTROL_CAPTURE_INTENT,
                                 CaptureRequest.CONTROL_CAPTURE_INTENT_PREVIEW);
-                        req.set(CaptureRequest.CONTROL_AE_MODE,
-                                CaptureRequest.CONTROL_AE_MODE_ON);
                         req.set(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION, 0);
                         req.set(CaptureRequest.CONTROL_AE_LOCK, false);
                         req.set(CaptureRequest.CONTROL_AE_REGIONS, regionAE);
@@ -1382,6 +1441,14 @@
                             req.set(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION, evComp);
                         }
 
+                        if (autoFlash == false) {
+                            req.set(CaptureRequest.CONTROL_AE_MODE,
+                                    CaptureRequest.CONTROL_AE_MODE_ON);
+                        } else {
+                            req.set(CaptureRequest.CONTROL_AE_MODE,
+                                    CaptureRequest.CONTROL_AE_MODE_ON_AUTO_FLASH);
+                        }
+
                         if (mConvergedAE && mNeedsLockedAE) {
                             req.set(CaptureRequest.CONTROL_AE_LOCK, true);
                         }
@@ -1492,6 +1559,7 @@
         int outputFormats[];
         int numSurfaces = 0;
         mPhysicalStreamMap.clear();
+        mStreamUseCaseMap.clear();
 
         if (jsonOutputSpecs != null) {
             try {
@@ -1581,6 +1649,9 @@
                     }
 
                     outputSizes[i] = new Size(width, height);
+                    if (!surfaceObj.isNull("useCase")) {
+                        mStreamUseCaseMap.put(i, surfaceObj.optLong("useCase"));
+                    }
                 }
             } catch (org.json.JSONException e) {
                 throw new ItsException("JSON error", e);
@@ -1629,6 +1700,155 @@
         }
     }
 
+    private void doGetSupportedVideoQualities(String id) throws ItsException {
+        int cameraId = Integer.parseInt(id);
+        StringBuilder profiles = new StringBuilder();
+        appendSupportProfile(profiles, "480P", CamcorderProfile.QUALITY_480P, cameraId);
+        appendSupportProfile(profiles, "1080P", CamcorderProfile.QUALITY_1080P, cameraId);
+        appendSupportProfile(profiles, "2160P", CamcorderProfile.QUALITY_2160P, cameraId);
+        appendSupportProfile(profiles, "2k", CamcorderProfile.QUALITY_2K, cameraId);
+        appendSupportProfile(profiles, "4KDCI", CamcorderProfile.QUALITY_4KDCI, cameraId);
+        appendSupportProfile(profiles, "720P", CamcorderProfile.QUALITY_720P, cameraId);
+        appendSupportProfile(profiles, "8KUHD", CamcorderProfile.QUALITY_8KUHD, cameraId);
+        appendSupportProfile(profiles, "CIF", CamcorderProfile.QUALITY_CIF, cameraId);
+        appendSupportProfile(profiles, "HIGH", CamcorderProfile.QUALITY_HIGH, cameraId);
+        appendSupportProfile(profiles, "LOW", CamcorderProfile.QUALITY_LOW, cameraId);
+        appendSupportProfile(profiles, "QCIF", CamcorderProfile.QUALITY_QCIF, cameraId);
+        appendSupportProfile(profiles, "QHD", CamcorderProfile.QUALITY_QHD, cameraId);
+        appendSupportProfile(profiles, "QVGA", CamcorderProfile.QUALITY_QVGA, cameraId);
+        appendSupportProfile(profiles, "VGA", CamcorderProfile.QUALITY_VGA,cameraId);
+        mSocketRunnableObj.sendResponse("supportedVideoQualities", profiles.toString());
+    }
+
+    private void appendSupportProfile(StringBuilder profiles, String name, int profile,
+            int cameraId) {
+        if (CamcorderProfile.hasProfile(cameraId, profile)) {
+            profiles.append(name).append(':').append(profile).append(';');
+        }
+    }
+
+    private void doBasicRecording(String cameraId, int profileId, String quality,
+            int recordingDuration) throws ItsException {
+        int cameraDeviceId = Integer.parseInt(cameraId);
+        mMediaRecorder = new MediaRecorder();
+        CamcorderProfile camcorderProfile = getCamcorderProfile(cameraDeviceId, profileId);
+        assert(camcorderProfile != null);
+        Size videoSize = new Size(camcorderProfile.videoFrameWidth,
+                camcorderProfile.videoFrameHeight);
+        String outputFilePath = getOutputMediaFile(cameraDeviceId, videoSize, quality);
+        assert(outputFilePath != null);
+        Log.i(TAG, "Video recording outputFilePath:"+ outputFilePath);
+        setupMediaRecorderWithProfile(cameraDeviceId, camcorderProfile, outputFilePath);
+        // Prepare MediaRecorder
+        try {
+            mMediaRecorder.prepare();
+        } catch (IOException e) {
+            throw new ItsException("Error preparing the MediaRecorder.");
+        }
+
+        mRecordSurface = mMediaRecorder.getSurface();
+        // Configure and create capture session.
+        try {
+            configureAndCreateCaptureSession(mRecordSurface);
+        } catch (android.hardware.camera2.CameraAccessException e) {
+            throw new ItsException("Access error: ", e);
+        }
+        // Start Recording
+        if (mMediaRecorder != null) {
+            Log.i(TAG, "Now recording video for quality: " + quality + " profile id: " +
+                profileId + " cameraId: " + cameraDeviceId + " size: " + videoSize);
+            mMediaRecorder.start();
+            try {
+                Thread.sleep(recordingDuration*1000); // recordingDuration is in seconds
+            } catch (InterruptedException e) {
+                throw new ItsException("Unexpected InterruptedException: ", e);
+            }
+            // Stop MediaRecorder
+            mMediaRecorder.stop();
+            mSession.close();
+            mMediaRecorder.reset();
+            mMediaRecorder.release();
+            mMediaRecorder = null;
+            if (mRecordSurface != null) {
+                mRecordSurface.release();
+                mRecordSurface = null;
+            }
+        }
+
+        Log.i(TAG, "Recording Done for quality: " + quality);
+
+        // Send VideoRecordingObject for further processing.
+        VideoRecordingObject obj = new VideoRecordingObject(outputFilePath,
+                quality, videoSize, camcorderProfile.videoFrameRate);
+        mSocketRunnableObj.sendVideoRecordingObject(obj);
+    }
+
+    private void configureAndCreateCaptureSession(Surface recordSurface)
+            throws CameraAccessException{
+        assert(recordSurface != null);
+        // Create capture request builder
+        mCaptureRequestBuilder = mCamera.createCaptureRequest(CameraDevice.TEMPLATE_RECORD);
+        mCaptureRequestBuilder.addTarget(recordSurface);
+        // Create capture session
+        mCamera.createCaptureSession(Arrays.asList(recordSurface),
+            new CameraCaptureSession.StateCallback() {
+                @Override
+                public void onConfigured(CameraCaptureSession session) {
+                    mSession = session;
+                    try {
+                        mSession.setRepeatingRequest(mCaptureRequestBuilder.build(), null, null);
+                    } catch (CameraAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+
+                @Override
+                public void onConfigureFailed(CameraCaptureSession session) {
+                    Log.i(TAG, "CameraCaptureSession configuration failed.");
+                }
+            }, mCameraHandler);
+    }
+
+    // Returns the default camcorder profile for the given camera at the given quality level
+    // Each CamcorderProfile has duration, quality, fileFormat, videoCodec, videoBitRate,
+    // videoFrameRate,videoWidth, videoHeight, audioCodec, audioBitRate, audioSampleRate
+    // and audioChannels.
+    private CamcorderProfile getCamcorderProfile(int cameraId, int profileId) {
+        CamcorderProfile camcorderProfile = CamcorderProfile.get(cameraId, profileId);
+        return camcorderProfile;
+    }
+
+    // This method should be called before preparing MediaRecorder.
+    // Set video and audio source should be done before setting the CamcorderProfile.
+    // Output file path should be set after setting the CamcorderProfile.
+    // These events should always be done in this particular order.
+    private void setupMediaRecorderWithProfile(int cameraId, CamcorderProfile camcorderProfile,
+            String outputFilePath) {
+        mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.SURFACE);
+        mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.DEFAULT);
+        mMediaRecorder.setProfile(camcorderProfile);
+        mMediaRecorder.setOutputFile(outputFilePath);
+    }
+
+    private String getOutputMediaFile(int cameraId, Size videoSize, String quality ) {
+        // All the video recordings will be available in VideoITS directory on device.
+        File mediaStorageDir = new File(getExternalFilesDir(null), "VideoITS");
+        if (mediaStorageDir == null) {
+            Log.e(TAG, "Failed to retrieve external files directory.");
+            return null;
+        }
+        if (!mediaStorageDir.exists()) {
+            if (!mediaStorageDir.mkdirs()) {
+                Log.d(TAG, "Failed to create media storage directory.");
+                return null;
+            }
+        }
+        String timestamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
+        File mediaFile = new File(mediaStorageDir.getPath() + File.separator +
+            "VID_" + timestamp + '_' + cameraId + '_' + quality + '_' + videoSize);
+        return mediaFile + ".mp4";
+    }
+
     private void doCapture(JSONObject params) throws ItsException {
         try {
             // Parse the JSON to get the list of capture requests.
@@ -1669,6 +1889,9 @@
                     if (mPhysicalStreamMap.get(i) != null) {
                         config.setPhysicalCameraId(mPhysicalStreamMap.get(i));
                     }
+                    if (mStreamUseCaseMap.get(i) != null) {
+                        config.setStreamUseCase(mStreamUseCaseMap.get(i));
+                    }
                     outputConfigs.add(config);
                 }
                 mCamera.createCaptureSessionByOutputConfigurations(outputConfigs,
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsTestActivity.java
index 08cd8b2..0f75511 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/camera/its/ItsTestActivity.java
@@ -41,6 +41,9 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import java.io.BufferedReader;
 import java.io.FileReader;
 import java.io.FileNotFoundException;
@@ -77,6 +80,17 @@
             Arrays.asList(new String[] {RESULT_PASS, RESULT_FAIL, RESULT_NOT_EXECUTED}));
     private static final int MAX_SUMMARY_LEN = 200;
 
+    private static final int MPC12_CAMERA_LAUNCH_THRESHOLD = 600; // ms
+    private static final int MPC12_JPEG_CAPTURE_THRESHOLD = 1000; // ms
+
+    private static final String MPC_TESTS_REPORT_LOG_NAME = "MediaPerformanceClassLogs";
+    private static final String MPC_TESTS_REPORT_LOG_SECTION = "CameraIts";
+
+    private static final Pattern MPC12_CAMERA_LAUNCH_PATTERN =
+            Pattern.compile("camera_launch_time_ms:(\\d+(\\.\\d+)?)");
+    private static final Pattern MPC12_JPEG_CAPTURE_PATTERN =
+            Pattern.compile("1080p_jpeg_capture_time_ms:(\\d+(\\.\\d+)?)");
+
     private final ResultReceiver mResultsReceiver = new ResultReceiver();
     private boolean mReceiverRegistered = false;
 
@@ -97,7 +111,6 @@
             add("scene4");
             add("scene5");
             add("scene6");
-            add("scene_change");
             add("sensor_fusion");
         }};
     // This must match scenes of SUB_CAMERA_TESTS in tools/run_all_tests.py
@@ -116,6 +129,10 @@
     private final HashMap<ResultKey, Boolean> mExecutedScenes = new HashMap<>();
     // map camera id to ITS summary report path
     private final HashMap<ResultKey, String> mSummaryMap = new HashMap<>();
+    // All primary cameras for which MPC level test has run
+    private Set<ResultKey> mExecutedMpcTests = null;
+    // Map primary camera id to MPC level
+    private final HashMap<String, Integer> mMpcLevelMap = new HashMap<>();
 
     final class ResultKey {
         public final String cameraId;
@@ -213,7 +230,6 @@
 
                     // Update test execution results
                     for (String scene : scenes) {
-                        HashMap<String, String> executedTests = new HashMap<>();
                         JSONObject sceneResult = jsonResults.getJSONObject(scene);
                         Log.v(TAG, sceneResult.toString());
                         String result = sceneResult.getString("result");
@@ -241,6 +257,22 @@
                                 mSummaryMap.put(key, summary);
                             }
                         } // do nothing for NOT_EXECUTED scenes
+
+                        if (sceneResult.isNull("mpc_metrics")) {
+                            continue;
+                        }
+                        // Update MPC level
+                        JSONArray metrics = sceneResult.getJSONArray("mpc_metrics");
+                        for (int i = 0; i < metrics.length(); i++) {
+                            String mpcResult = metrics.getString(i);
+                            if (!matchMpcResult(cameraId, mpcResult, MPC12_CAMERA_LAUNCH_PATTERN,
+                                    "2.2.7.2/7.5/H-1-6", MPC12_CAMERA_LAUNCH_THRESHOLD) &&
+                                    !matchMpcResult(cameraId, mpcResult, MPC12_JPEG_CAPTURE_PATTERN,
+                                    "2.2.7.2/7.5/H-1-5", MPC12_JPEG_CAPTURE_THRESHOLD)) {
+                                Log.e(TAG, "Error parsing MPC result string:" + mpcResult);
+                                return;
+                            }
+                        }
                     }
                 } catch (org.json.JSONException e) {
                     Log.e(TAG, "Error reading json result string:" + results , e);
@@ -249,6 +281,7 @@
 
                 // Set summary if all scenes reported
                 if (mSummaryMap.keySet().containsAll(mAllScenes)) {
+                    // Save test summary
                     StringBuilder summary = new StringBuilder();
                     for (String path : mSummaryMap.values()) {
                         appendFileContentToSummary(summary, path);
@@ -260,6 +293,17 @@
                             summary.toString(), 1.0, ResultType.NEUTRAL, ResultUnit.NONE);
                 }
 
+                //  Save MPC info once both front primary and rear primary data are collected.
+                if (mExecutedMpcTests.size() == 4) {
+                    ItsTestActivity.this.getReportLog().addValue(
+                            "Version", "0.0.1", ResultType.NEUTRAL, ResultUnit.NONE);
+                    for (Map.Entry<String, Integer> entry : mMpcLevelMap.entrySet()) {
+                        ItsTestActivity.this.getReportLog().addValue(entry.getKey(),
+                                entry.getValue(), ResultType.NEUTRAL, ResultUnit.NONE);
+                    }
+                    ItsTestActivity.this.getReportLog().submit();
+                }
+
                 // Display current progress
                 StringBuilder progress = new StringBuilder();
                 for (ResultKey k : mAllScenes) {
@@ -321,6 +365,29 @@
                 }
             }
         }
+
+        private boolean matchMpcResult(String cameraId, String mpcResult, Pattern pattern,
+                String reqNum, float threshold) {
+            Matcher matcher = pattern.matcher(mpcResult);
+            boolean match = matcher.matches();
+
+            if (match) {
+                // Store test result
+                ItsTestActivity.this.getReportLog().addValue("Cam" + cameraId,
+                        mpcResult, ResultType.NEUTRAL, ResultUnit.NONE);
+
+                float latency = Float.parseFloat(matcher.group(1));
+                int mpcLevel = latency < threshold ? 31 : 0;
+                mExecutedMpcTests.add(new ResultKey(cameraId, reqNum));
+
+                if (mMpcLevelMap.containsKey(reqNum)) {
+                    mpcLevel = Math.min(mpcLevel, mMpcLevelMap.get(reqNum));
+                }
+                mMpcLevelMap.put(reqNum, mpcLevel);
+            }
+
+            return match;
+        }
     }
 
     @Override
@@ -388,6 +455,9 @@
                 testTitle(cam, scene),
                 testId(cam, scene)));
             }
+            if (mExecutedMpcTests == null) {
+                mExecutedMpcTests = new TreeSet<>(mComparator);
+            }
             Log.d(TAG,"Total combinations to test on this device:" + mAllScenes.size());
         }
     }
@@ -427,4 +497,14 @@
         setInfoResources(R.string.camera_its_test, R.string.camera_its_test_info, -1);
         setPassFailButtonClickListeners();
     }
+
+    @Override
+    public String getReportFileName() {
+        return MPC_TESTS_REPORT_LOG_NAME;
+    }
+
+    @Override
+    public String getReportSectionName() {
+        return MPC_TESTS_REPORT_LOG_SECTION;
+    }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/car/GarageModeChecker.java b/apps/CtsVerifier/src/com/android/cts/verifier/car/GarageModeChecker.java
index a7f742f..06e5ea3 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/car/GarageModeChecker.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/car/GarageModeChecker.java
@@ -29,11 +29,11 @@
 import android.os.Handler;
 import android.os.Message;
 import android.os.PersistableBundle;
+import android.provider.Settings;
 import android.util.Log;
 import android.util.SparseArray;
 
 import java.lang.ref.WeakReference;
-import java.util.List;
 
 public final class GarageModeChecker extends JobService {
     private static final String TAG = GarageModeChecker.class.getSimpleName();
@@ -45,6 +45,7 @@
     static final String PREFS_TERMINATION = "termination-time";
     static final String PREFS_JOB_UPDATE = "job-update-time";
     static final String PREFS_HAD_CONNECTIVITY = "had-connectivity";
+    static final String PREFS_START_BOOT_COUNT = "start-boot-count";
 
     static final int SECONDS_PER_ITERATION = 10;
     static final int MS_PER_ITERATION = SECONDS_PER_ITERATION * 1000;
@@ -172,6 +173,17 @@
         return true;
     }
 
+    static int getBootCount(Context context) {
+        int bootCount = 0;
+        try {
+            bootCount = Settings.Global.getInt(context.getContentResolver(),
+                    Settings.Global.BOOT_COUNT);
+        } catch (Settings.SettingNotFoundException e) {
+            Log.e(TAG, "Could not get Settings.Global.BOOT_COUNT: ", e);
+        }
+        return bootCount;
+    }
+
     private final class GarageModeCheckerTask extends AsyncTask<Void, Void, Boolean> {
         private final WeakReference<Handler> mHandler;
         private final JobParameters mJobParameter;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/car/GarageModeTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/car/GarageModeTestActivity.java
index ac13ba2..a4a2930 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/car/GarageModeTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/car/GarageModeTestActivity.java
@@ -90,6 +90,8 @@
             editor.putLong(GarageModeChecker.PREFS_GARAGE_MODE_END, 0);
             editor.putLong(GarageModeChecker.PREFS_TERMINATION, 0);
             editor.putBoolean(GarageModeChecker.PREFS_HAD_CONNECTIVITY, false);
+            editor.putLong(GarageModeChecker.PREFS_START_BOOT_COUNT,
+                    GarageModeChecker.getBootCount(context));
             editor.commit();
 
             GarageModeChecker.scheduleAnIdleJob(context, NUM_SECONDS_DURATION);
@@ -131,6 +133,8 @@
         long termination = prefs.getLong(GarageModeChecker.PREFS_TERMINATION, 0);
         long jobUpdate = prefs.getLong(GarageModeChecker.PREFS_JOB_UPDATE, 0);
         boolean hadConnectivity = prefs.getBoolean(GarageModeChecker.PREFS_HAD_CONNECTIVITY, false);
+        long startBootCount = prefs.getLong(GarageModeChecker.PREFS_START_BOOT_COUNT, 0);
+        long currentBootCount = GarageModeChecker.getBootCount(context);
 
         boolean testPassed = false;
         if (initiateTime == 0) {
@@ -185,6 +189,12 @@
                     (hadConnectivity ? "" : "not "),
                     dateTime.format(initiateTime), dateTime.format(garageModeStart),
                     dateTime.format(termination));
+        }  else if ((garageModeStart > 0 && garageModeEnd == 0)
+                                        && (currentBootCount - startBootCount > 0)) {
+            resultsString = "Test failed.\n\n"
+                    + "Garage Mode started, but system restarted before it completed.\n\n"
+                    + dateTime.format(initiateTime) + " -- Test was enabled\n"
+                    + dateTime.format(garageModeStart) + " -- Garage mode started";
         } else if (now < jobUpdate + GarageModeChecker.MS_PER_ITERATION * 2) {
             resultsString = "Garage Mode started and test is running.\n\n"
                     + dateTime.format(initiateTime) + " -- Test was enabled\n"
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/car/GearSelectionTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/car/GearSelectionTestActivity.java
index c926d1a..558c411 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/car/GearSelectionTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/car/GearSelectionTestActivity.java
@@ -43,7 +43,6 @@
     private static final long TEST_TIMEOUT_MINUTES = 10;
 
     private List<Integer> mSupportedGears;
-    private Integer mGearsAchievedCount = 0;
     private TextView mExpectedGearSelectionTextView;
     private TextView mCurrentGearSelectionTextView;
     private CarPropertyManager mCarPropertyManager;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/clipboard/ClipboardPreviewTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/clipboard/ClipboardPreviewTestActivity.java
new file mode 100644
index 0000000..3587e6f
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/clipboard/ClipboardPreviewTestActivity.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2022 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.cts.verifier.clipboard;
+
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import java.util.concurrent.ThreadLocalRandom;
+
+
+/**
+ * A CTS Verifier test case for validating the user-visible clipboard preview.
+ *
+ * This test assumes bluetooth is turned on and the device is already paired with a second device.
+ * Note: the second device need not be an Android device; it could be a laptop or desktop.
+ */
+public class ClipboardPreviewTestActivity extends PassFailButtons.Activity {
+
+    /**
+     * The content of the test file being transferred.
+     */
+    private static final String TEST_STRING = "Sample Test String";
+    /**
+     * The name of the test file being transferred.
+     */
+    private final int[] mSecretCode = new int[4];
+    private final int[] mSecretGuess = new int[4];
+    private final int[] mButtons = {
+            R.id.clipboard_preview_test_b0,
+            R.id.clipboard_preview_test_b1,
+            R.id.clipboard_preview_test_b2,
+            R.id.clipboard_preview_test_b3,
+            R.id.clipboard_preview_test_b4,
+            R.id.clipboard_preview_test_b5,
+            R.id.clipboard_preview_test_b6,
+            R.id.clipboard_preview_test_b7,
+            R.id.clipboard_preview_test_b8,
+            R.id.clipboard_preview_test_b9
+    };
+    private int mGuessIndex = 0;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Setup the UI.
+        setContentView(R.layout.clipboard_preview);
+        setPassFailButtonClickListeners();
+        setInfoResources(R.string.clipboard_preview_test, R.string.clipboard_preview_test_info, -1);
+        // Get the share button and attach the listener.
+        Button copyButton = findViewById(R.id.clipboard_preview_test_copy);
+        copyButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                generateAndCopySecret();
+            }
+        });
+        disableKeypad();
+    }
+
+    private void generateAndCopySecret() {
+        String s = "";
+        resetState();
+        for (int i = 0; i < mSecretCode.length; ++i) {
+            mSecretCode[i] = ThreadLocalRandom.current().nextInt(0, 10);
+            s += mSecretCode[i];
+        }
+        ClipboardManager cm = this.getSystemService(ClipboardManager.class);
+        cm.setPrimaryClip(ClipData.newPlainText("Secret", s));
+        enableKeypad();
+    }
+
+    private void enableKeypad() {
+        for (int i = 0; i < mButtons.length; ++i) {
+            Button numButton = findViewById(mButtons[i]);
+            numButton.setBackgroundColor(Color.GREEN);
+            int finalI = i;
+            numButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    buttonClicked(finalI);
+                }
+            });
+        }
+    }
+
+    private void disableKeypad() {
+        for (int i = 0; i < mButtons.length; ++i) {
+            Button numButton = findViewById(mButtons[i]);
+            numButton.setOnClickListener(null);
+            numButton.setBackgroundColor(Color.LTGRAY);
+        }
+    }
+
+    private void resetState() {
+        for (int i = 0; i < mSecretGuess.length; ++i) {
+            mSecretGuess[i] = -1;
+        }
+        mGuessIndex = 0;
+        View v = findViewById(R.id.clipboard_preview_test_pass_fail);
+        findViewById(R.id.clipboard_preview_test_pass_fail).setVisibility(View.INVISIBLE);
+        findViewById(R.id.fail_button).setVisibility(View.VISIBLE);
+        findViewById(R.id.pass_button).setVisibility(View.VISIBLE);
+    }
+
+    private void buttonClicked(int i) {
+        if (mGuessIndex < mSecretGuess.length) {
+            mSecretGuess[mGuessIndex] = i;
+            ++mGuessIndex;
+        }
+        checkSolution();
+    }
+
+    private void checkSolution() {
+        boolean testPassed = true;
+        if (mGuessIndex == mSecretGuess.length) {
+            for (int i = 0; i < mSecretGuess.length && i < mSecretCode.length; ++i) {
+                if (mSecretGuess[i] != mSecretCode[i]) {
+                    testPassed = false;
+                }
+            }
+            markPassed(testPassed);
+            disableKeypad();
+        }
+    }
+
+    private void markPassed(boolean passed) {
+        findViewById(R.id.clipboard_preview_test_pass_fail).setVisibility(View.VISIBLE);
+        if (passed) {
+            findViewById(R.id.fail_button).setVisibility(View.INVISIBLE);
+        } else {
+            findViewById(R.id.pass_button).setVisibility(View.INVISIBLE);
+        }
+
+    }
+
+
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/deskclock/DeskClockTestsActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/deskclock/DeskClockTestsActivity.java
index aaea279..2cafd94 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/deskclock/DeskClockTestsActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/deskclock/DeskClockTestsActivity.java
@@ -6,15 +6,16 @@
 import android.database.DataSetObserver;
 import android.os.Bundle;
 import android.provider.AlarmClock;
+import android.util.Log;
 
 import com.android.cts.verifier.ArrayTestListAdapter;
 import com.android.cts.verifier.IntentDrivenTestActivity;
-import com.android.cts.verifier.PassFailButtons;
-import com.android.cts.verifier.R;
-import com.android.cts.verifier.TestListAdapter.TestListItem;
 import com.android.cts.verifier.IntentDrivenTestActivity.ButtonInfo;
 import com.android.cts.verifier.IntentDrivenTestActivity.IntentFactory;
 import com.android.cts.verifier.IntentDrivenTestActivity.TestInfo;
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.TestListAdapter.TestListItem;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -24,6 +25,8 @@
  */
 public class DeskClockTestsActivity extends PassFailButtons.TestListActivity {
 
+    private static final String TAG = DeskClockTestsActivity.class.getSimpleName();
+
     private static final String SHOW_ALARMS_TEST = "SHOW_ALARMS";
     public static final String SET_ALARM_WITH_UI_TEST = "SET_ALARM_WITH_UI";
     public static final String START_ALARM_TEST = "START_ALARM";
@@ -153,15 +156,13 @@
 
     private void addTests(ArrayTestListAdapter adapter, TestInfo[] tests) {
         for (TestInfo info : tests) {
-
-            final int title = info.getTitle();
-            adapter.add(TestListItem.newTest(this, title, info.getTestId(),
-            new Intent(this, IntentDrivenTestActivity.class)
-                    .putExtra(IntentDrivenTestActivity.EXTRA_ID, info.getTestId())
-                    .putExtra(IntentDrivenTestActivity.EXTRA_TITLE, title)
-                    .putExtra(IntentDrivenTestActivity.EXTRA_INFO, info.getInfoText())
-                    .putExtra(IntentDrivenTestActivity.EXTRA_BUTTONS, info.getButtons()),
-                    null));
+            int title = info.getTitle();
+            String testId = info.getTestId();
+            Intent intent = IntentDrivenTestActivity.newIntent(this, testId, title,
+                    info.getInfoText(), info.getButtons());
+            Log.d(TAG, "Adding test with " + IntentDrivenTestActivity.toString(this, intent));
+            adapter.add(TestListItem.newTest(this, title, testId, intent,
+                    /* applicableFeatures= */ null));
         }
     }
 
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/displaycutout/DisplayCutoutTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/displaycutout/DisplayCutoutTestActivity.java
index d0459ec..2543db2 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/displaycutout/DisplayCutoutTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/displaycutout/DisplayCutoutTestActivity.java
@@ -17,6 +17,7 @@
 package com.android.cts.verifier.displaycutout;
 
 import android.graphics.Color;
+import android.graphics.Insets;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.view.DisplayCutout;
@@ -73,11 +74,13 @@
         setPassFailButtonClickListeners();
         // only enable pass button when all test buttons are clicked.
         getPassButton().setEnabled(false);
-        getWindow().getDecorView().setOnApplyWindowInsetsListener((v, insets) -> {
-                updateButtons(insets.getDisplayCutout());
-                return insets;
-            });
 
+        getWindow().getDecorView().setOnApplyWindowInsetsListener((v, insets) -> {
+            insets = new WindowInsets.Builder(insets).setInsets(
+                    WindowInsets.Type.displayCutout(), Insets.NONE).build();
+            updateButtons(insets.getDisplayCutout());
+            return v.onApplyWindowInsets(insets);
+        });
     }
 
     public void updateButtons(DisplayCutout cutout) {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureUtil.java b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureUtil.java
index f6b179c..e7bced9 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureUtil.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/features/FeatureUtil.java
@@ -80,13 +80,6 @@
     }
 
     /**
-     * Checks whether the device requires new user disclaimer acknowledgement for managed user.
-     */
-    public static boolean isNewManagerUserDisclaimerRequired(Context context) {
-        return isAutomotive(context);
-    }
-
-    /**
      * Checks whether the device supports file transfer.
      */
     public static boolean isUsbFileTransferSupported(Context context) {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/logcat/ReadLogsTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/logcat/ReadLogsTestActivity.java
new file mode 100644
index 0000000..c04e888
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/logcat/ReadLogsTestActivity.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2022 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.cts.verifier.logcat;
+
+import static org.junit.Assert.assertTrue;
+
+import android.app.ActivityManager;
+import android.content.Context;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+
+import com.android.cts.verifier.PassFailButtons;
+import com.android.cts.verifier.R;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * A read_logs CTS Verifier test case for testing user consent for log data access.
+ *
+ * This test generates a per-use prompt when the requester is foreground.
+ * If the requester is background, the log data access is denied.
+ */
+public class ReadLogsTestActivity extends PassFailButtons.Activity {
+
+    /**
+     * The name of the APP to test
+     */
+    private static final String TAG = "ReadLogsTestActivity";
+
+    private static final String PERMISSION = "android.permission.READ_LOGS";
+
+    private static final int NUM_OF_LINES = 10;
+
+    private static Context sContext;
+    private static ActivityManager sActivityManager;
+
+    private static String sAppPackageName;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        sContext = this;
+        sActivityManager = sContext.getSystemService(ActivityManager.class);
+        sAppPackageName = sContext.getPackageName();
+
+        // Setup the UI.
+        setContentView(R.layout.logcat_read_logs);
+        setPassFailButtonClickListeners();
+        setInfoResources(R.string.read_logs_text, R.string.read_logs_test_info, -1);
+
+        // Get the run test button and attach the listener.
+        Button runBtn = (Button) findViewById(R.id.run_read_logs_btn);
+        runBtn.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                try {
+                    // Dump the logcat most recent 10 lines before the compile command,
+                    // and check if there are logs about compiling the test package.
+                    File logcatFile = File.createTempFile("logcat", ".txt");
+                    logcatFile.deleteOnExit();
+                    ProcessBuilder pb = new ProcessBuilder(Arrays.asList("logcat", "-b", "system",
+                            "-t", "10"));
+                    pb.redirectOutput(logcatFile);
+                    Process proc = pb.start();
+                    proc.waitFor();
+
+                    List<String> logcat = Files.readAllLines(logcatFile.toPath());
+                    int numOfLines = logcat.size();
+                    assertTrue("Number of lines is equal to 10",
+                            numOfLines == NUM_OF_LINES);
+                } catch (Exception e) {
+                    Log.e(TAG, "User Consent Testing failed");
+                }
+            }
+        });
+
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
index 5b55009..d23d43b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodFlowTestActivity.java
@@ -16,6 +16,8 @@
 
 package com.android.cts.verifier.managedprovisioning;
 
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
 import android.app.KeyguardManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ActivityNotFoundException;
@@ -317,7 +319,7 @@
                 R.drawable.ic_corp_icon);
 
         Intent workStatusIcon = new Intent(WorkStatusTestActivity.ACTION_WORK_STATUS_ICON);
-        workStatusIcon.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        workStatusIcon.setFlags(FLAG_ACTIVITY_NEW_TASK);
         mWorkStatusBarIconTest = new DialogTestListItemWithIcon(this,
                 R.string.provisioning_byod_work_status_icon,
                 "BYOD_WorkStatusBarIconTest",
@@ -480,7 +482,7 @@
                 R.string.provisioning_byod_recents,
                 RecentsRedactionActivity.class.getName(),
                 new Intent(RecentsRedactionActivity.ACTION_RECENTS).setFlags(
-                        Intent.FLAG_ACTIVITY_NEW_TASK),
+                        FLAG_ACTIVITY_NEW_TASK),
                 null);
 
         mOrganizationInfoTest = TestListItem.newTest(this,
@@ -724,6 +726,12 @@
                 "BYOD_UninstallWorkApp",
                 R.string.provisioning_byod_uninstall_work_app_instruction,
                 createInstallWorkProfileAppIntent()));
+
+        adapter.add(new DialogTestListItem(this,
+                R.string.provisioning_byod_launch_work_tab,
+                "BYOD_LaunchWorkTab",
+                R.string.provisioning_byod_launch_work_tab_instruction,
+                createLaunchWorkTabIntent()));
     }
 
     private Intent createInstallWorkProfileAppIntent() {
@@ -733,6 +741,13 @@
                 .putExtra(ByodHelperActivity.EXTRA_PARAMETER_1, HELPER_APP_PATH);
     }
 
+    private Intent createLaunchWorkTabIntent() {
+        return new Intent(Intent.ACTION_SHOW_WORK_APPS)
+                .addCategory(Intent.CATEGORY_HOME)
+                .addCategory(Intent.CATEGORY_LAUNCHER_APP)
+                .addFlags(FLAG_ACTIVITY_NEW_TASK);
+    }
+
     // Return whether the intent can be resolved in the current profile
     private boolean canResolveIntent(Intent intent) {
         return intent.resolveActivity(getPackageManager()) != null;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodHelperActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodHelperActivity.java
index e67fd85..10010cb 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodHelperActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodHelperActivity.java
@@ -16,6 +16,7 @@
 
 package com.android.cts.verifier.managedprovisioning;
 
+import static android.Manifest.permission.POST_NOTIFICATIONS;
 import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES;
 import static android.os.UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES_GLOBALLY;
 
@@ -165,6 +166,7 @@
     private static final int REQUEST_VIDEO_CAPTURE_WITH_EXTRA_OUTPUT = 4;
     private static final int REQUEST_VIDEO_CAPTURE_WITHOUT_EXTRA_OUTPUT = 5;
     private static final int REQUEST_AUDIO_CAPTURE = 6;
+    private static final int REQUEST_POST_NOTIFICATIONS = 7;
 
     private static final String ORIGINAL_RESTRICTIONS_NAME = "original restrictions";
 
@@ -188,13 +190,24 @@
     private ArrayList<File> mTempFiles = new ArrayList<File>();
 
     private Handler mMainThreadHandler;
+    private int mNextNotificationVisibility;
 
     private void showNotification(int visibility) {
+        mNextNotificationVisibility = visibility;
+
+        if (hasPostNotificationsPermission()) {
+            showNotificationInner();
+        } else {
+            requestPostNotificationsPermission(REQUEST_POST_NOTIFICATIONS);
+        }
+    }
+
+    private void showNotificationInner() {
         final Notification notification = new Notification.Builder(this, NOTIFICATION_CHANNEL_ID)
                 .setSmallIcon(R.drawable.icon)
                 .setContentTitle(getString(R.string.provisioning_byod_notification_title))
                 .setContentText(getString(R.string.provisioning_byod_notification_title))
-                .setVisibility(visibility)
+                .setVisibility(mNextNotificationVisibility)
                 .setAutoCancel(true)
                 .setPublicVersion(createPublicVersionNotification())
                 .build();
@@ -597,10 +610,22 @@
                 requestCode);
     }
 
+    private boolean hasPostNotificationsPermission() {
+        return ContextCompat.checkSelfPermission(this, POST_NOTIFICATIONS)
+                == PackageManager.PERMISSION_GRANTED;
+    }
+
+    private void requestPostNotificationsPermission(int requestCode) {
+        ActivityCompat.requestPermissions(this,
+                new String[]{Manifest.permission.POST_NOTIFICATIONS},
+                requestCode);
+    }
+
     /**
      * Launch the right test based on the request code, after validating the right permission
      * has been granted.
      */
+    @Override
     public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
             @NonNull int[] grants) {
         // Test that the right permission was granted.
@@ -616,6 +641,14 @@
                     return;
                 }
                 break;
+            case REQUEST_POST_NOTIFICATIONS:
+                if (!permissions[0].equals(POST_NOTIFICATIONS)
+                        || grants[0] != PackageManager.PERMISSION_GRANTED) {
+                    Log.e(TAG, "The test needs notifications permission.");
+                    finish();
+                    return;
+                }
+                break;
         }
 
         // Execute the right test.
@@ -627,6 +660,9 @@
             case EXECUTE_VIDEO_CAPTURE_WITHOUT_EXTRA_TEST:
                 startCaptureVideoActivity(requestCode);
                 break;
+            case REQUEST_POST_NOTIFICATIONS:
+                showNotificationInner();
+                break;
             default:
                 Log.e(TAG, "Unknown action.");
                 finish();
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodProvisioningTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodProvisioningTestActivity.java
index 3242893..b299f67 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodProvisioningTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ByodProvisioningTestActivity.java
@@ -22,7 +22,6 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.PersistableBundle;
 
 import com.android.cts.verifier.ArrayTestListAdapter;
 import com.android.cts.verifier.IntentDrivenTestActivity.ButtonInfo;
@@ -38,10 +37,6 @@
 
         final ArrayTestListAdapter adapter = new ArrayTestListAdapter(this);
 
-        adapter.add(Utils.createInteractiveTestItem(this, "BYOD_CustomImage",
-                        R.string.provisioning_tests_byod_custom_image,
-                        R.string.provisioning_tests_byod_custom_image_info,
-                        new ButtonInfo(R.string.go_button_text, getTestLogoIntent())));
         adapter.add(Utils.createInteractiveTestItem(this, "BYOD_CustomTerms",
                 R.string.provisioning_tests_byod_custom_terms,
                 R.string.provisioning_tests_byod_custom_terms_instructions,
@@ -88,19 +83,6 @@
                         new Bundle[] { bundle });
     }
 
-    /**
-     * Create intent with uri and wiping the work profile immediately after provisioning
-     */
-    private Intent getTestLogoIntent() {
-        PersistableBundle bundle = new PersistableBundle();
-        bundle.putBoolean(DeviceAdminTestReceiver.KEY_BUNDLE_WIPE_IMMEDIATELY, true);
-        return new Intent(this, ProvisioningStartingActivity.class)
-                .putExtra(DevicePolicyManager.EXTRA_PROVISIONING_LOGO_URI,
-                        getResourceUri(R.drawable.icon))
-                .putExtra(DevicePolicyManager.EXTRA_PROVISIONING_SKIP_ENCRYPTION, true)
-                .putExtra(DevicePolicyManager.EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE, bundle);
-    }
-
     private Uri getResourceUri(int resId) {
         return new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
                 .authority(getPackageName())
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CommandReceiverActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CommandReceiverActivity.java
index 257d6df..007afd4 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CommandReceiverActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/CommandReceiverActivity.java
@@ -126,7 +126,6 @@
     public static final String COMMAND_ENABLE_USB_DATA_SIGNALING = "enable-usb-data-signaling";
     public static final String COMMAND_SET_REQUIRED_PASSWORD_COMPLEXITY =
             "set-required-password-complexity";
-    public static final String COMMAND_CHECK_NEW_USER_DISCLAIMER = "check-new-user-disclaimer";
 
     public static final String EXTRA_USER_RESTRICTION =
             "com.android.cts.verifier.managedprovisioning.extra.USER_RESTRICTION";
@@ -383,11 +382,29 @@
                     uninstallHelperPackage();
                 } break;
                 case COMMAND_SET_PERMISSION_GRANT_STATE: {
-                    Log.d(TAG, "Granting permission using " + mDpm);
-                    mDpm.setPermissionGrantState(mAdmin, getPackageName(),
-                            intent.getStringExtra(EXTRA_PERMISSION),
-                            intent.getIntExtra(EXTRA_GRANT_STATE,
-                                    DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT));
+                    String pkgName = getPackageName();
+                    String permission = intent.getStringExtra(EXTRA_PERMISSION);
+                    int grantState = intent.getIntExtra(EXTRA_GRANT_STATE,
+                            DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT);
+                    String action;
+                    switch (grantState) {
+                        case DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED:
+                            action = "Granting " + permission;
+                            break;
+                        case DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED:
+                            action = "Denying " + permission;
+                            break;
+                        case DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT:
+                            action = "Setting " + permission + " to default state";
+                            break;
+                        default:
+                            action = "Setting grantState of " + permission + " to " + grantState;
+                    }
+                    Log.d(TAG, action + " to " + pkgName + " using " + mDpm);
+                    int stateBefore = mDpm.getPermissionGrantState(mAdmin, pkgName, permission);
+                    mDpm.setPermissionGrantState(mAdmin, pkgName, permission, grantState);
+                    int stateAfter = mDpm.getPermissionGrantState(mAdmin, pkgName, permission);
+                    Log.d(TAG, "Grant state: before=" + stateBefore + ", after=" + stateAfter);
                 } break;
                 case COMMAND_ADD_PERSISTENT_PREFERRED_ACTIVITIES: {
                     final ComponentName componentName =
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/IntentFiltersTestHelper.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/IntentFiltersTestHelper.java
index 70aaab5..4d03ec4 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/IntentFiltersTestHelper.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/IntentFiltersTestHelper.java
@@ -16,34 +16,27 @@
 
 package com.android.cts.verifier.managedprovisioning;
 
-import android.app.Activity;
-import android.app.admin.DevicePolicyManager;
 import android.app.DownloadManager;
-import android.content.ComponentName;
+import android.app.admin.DevicePolicyManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.media.audiofx.AudioEffect;
 import android.net.Uri;
 import android.nfc.cardemulation.CardEmulation;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Environment;
-import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.AlarmClock;
 import android.provider.CalendarContract.Events;
 import android.provider.MediaStore;
 import android.provider.Settings;
-import android.speech.RecognizerIntent;
 import android.util.Log;
-import android.widget.Toast;
 
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -161,7 +154,7 @@
         PackageManager pm = mContext.getPackageManager();
 
         if (pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
-                && pm.hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) {
+                && pm.hasSystemFeature(PackageManager.FEATURE_TELECOM)) {
             forwardedIntentsFromManaged.addAll(Arrays.asList(
                     new Intent("android.intent.action.CALL_EMERGENCY").setData(
                             Uri.parse("tel:123")),
@@ -206,7 +199,7 @@
         }
 
         if (pm.hasSystemFeature(PackageManager.FEATURE_CAMERA)) {
-            forwardedIntentsFromManaged.addAll(Arrays.asList(
+            forwardingOptionalIntentsFromManaged.addAll(Arrays.asList(
                     new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
                     new Intent(MediaStore.ACTION_VIDEO_CAPTURE),
                     new Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA),
@@ -228,7 +221,8 @@
         }
 
         if (pm.hasSystemFeature(PackageManager.FEATURE_MICROPHONE)) {
-            forwardedIntentsFromManaged.add(new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION));
+            forwardingOptionalIntentsFromManaged.add(
+                    new Intent(MediaStore.Audio.Media.RECORD_SOUND_ACTION));
         }
 
         if (pm.hasSystemFeature(PackageManager.FEATURE_LOCATION)) {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ManagedUserPositiveTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ManagedUserPositiveTestActivity.java
index 6ddcf71..14ab277 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ManagedUserPositiveTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/ManagedUserPositiveTestActivity.java
@@ -55,7 +55,6 @@
     private static final String DISABLE_KEYGUARD_TEST_ID = "DISABLE_KEYGUARD";
     private static final String POLICY_TRANSPARENCY_TEST_ID = "POLICY_TRANSPARENCY";
     private static final String DISALLOW_REMOVE_USER_TEST_ID = "DISALLOW_REMOVE_USER";
-    private static final String CHECK_NEW_USER_DISCLAIMER_TEST_ID = "CHECK_NEW_UESR_DISCLAIMER";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -112,19 +111,6 @@
     }
 
     private void addTestsToAdapter(final ArrayTestListAdapter adapter) {
-        // Check managed user's new user disclaimer
-        if (FeatureUtil.isNewManagerUserDisclaimerRequired(this)) {
-            adapter.add(createInteractiveTestItem(this, CHECK_NEW_USER_DISCLAIMER_TEST_ID,
-                    R.string.check_new_user_disclaimer,
-                    R.string.check_new_user_disclaimer_info,
-                    new ButtonInfo[]{
-                            new ButtonInfo(
-                                    R.string.device_owner_settings_go,
-                                    new Intent(Settings.ACTION_USER_SETTINGS)),
-                            new ButtonInfo(R.string.enterprise_privacy_set_organization,
-                                    createSetOrganizationNameIntent())}));
-        }
-
         adapter.add(createTestItem(this, CHECK_AFFILIATED_PROFILE_OWNER_TEST_ID,
                 R.string.managed_user_check_managed_user_test,
                 new Intent(ACTION_CHECK_AFFILIATED_PROFILE_OWNER)
@@ -199,8 +185,10 @@
         adapter.add(createTestItem(this, POLICY_TRANSPARENCY_TEST_ID,
                 R.string.device_profile_owner_policy_transparency_test,
                 policyTransparencyTestIntent));
+
     }
 
+
     static TestListItem createTestItem(Activity activity, String id, int titleRes,
             Intent intent) {
         intent.putExtra(EXTRA_TEST_ID, id);
@@ -212,9 +200,4 @@
         // general test for that. TODO: add a test API to do a real check for status bar support.
         return !getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH);
     }
-
-    private Intent createSetOrganizationNameIntent() {
-        return new Intent(CommandReceiverActivity.COMMAND_SET_ORGANIZATION_NAME)
-                .putExtra(CommandReceiverActivity.EXTRA_ORGANIZATION_NAME, "Foo, Inc.");
-    }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PermissionLockdownTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PermissionLockdownTestActivity.java
index 3b0bc38..8bd51b9 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PermissionLockdownTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PermissionLockdownTestActivity.java
@@ -187,16 +187,12 @@
     @Override
     public void onCheckedChanged(RadioGroup radioGroup, int checkedId) {
         int permissionGrantState = -1;
-        switch (checkedId) {
-            case R.id.permission_allow: {
-                permissionGrantState = DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED;
-            } break;
-            case R.id.permission_default: {
-                permissionGrantState = DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT;
-            } break;
-            case R.id.permission_deny: {
-                permissionGrantState = DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED;
-            } break;
+        if (checkedId == R.id.permission_allow) {
+            permissionGrantState = DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED;
+        } else if (checkedId == R.id.permission_default) {
+            permissionGrantState = DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT;
+        } else if (checkedId == R.id.permission_deny) {
+            permissionGrantState = DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED;
         }
         mDevicePolicyManager.setPermissionGrantState(mAdmin, PERMISSION_APP_PACKAGE,
                 CONTACTS_PERMISSIONS[0], permissionGrantState);
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestActivity.java
index 9317dca1..2c6c3e7 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/PolicyTransparencyTestActivity.java
@@ -174,21 +174,17 @@
     }
 
     private void updateWidget(int widgetId) {
-        switch (widgetId) {
-            case R.id.switch_widget: {
-                Switch switchWidget = (Switch) findViewById(R.id.switch_widget);
-                switchWidget.setOnCheckedChangeListener(this);
-                switchWidget.setVisibility(View.VISIBLE);
-            } break;
-            case R.id.edit_text_widget: {
-                findViewById(R.id.edit_text_widget).setVisibility(View.VISIBLE);
-                Button updateButton = (Button) findViewById(R.id.update_button);
-                updateButton.setOnClickListener(this);
-                updateButton.setVisibility(View.VISIBLE);
-            } break;
-            default: {
-                throw new IllegalArgumentException("Unknown widgetId: " + widgetId);
-            }
+        if (widgetId == R.id.switch_widget) {
+            Switch switchWidget = (Switch) findViewById(R.id.switch_widget);
+            switchWidget.setOnCheckedChangeListener(this);
+            switchWidget.setVisibility(View.VISIBLE);
+        } else if (widgetId == R.id.edit_text_widget) {
+            findViewById(R.id.edit_text_widget).setVisibility(View.VISIBLE);
+            Button updateButton = (Button) findViewById(R.id.update_button);
+            updateButton.setOnClickListener(this);
+            updateButton.setVisibility(View.VISIBLE);
+        } else {
+            throw new IllegalArgumentException("Unknown widgetId: " + widgetId);
         }
     }
 
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/RecentsRedactionActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/RecentsRedactionActivity.java
index 189248d..257aac2 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/RecentsRedactionActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/RecentsRedactionActivity.java
@@ -57,15 +57,13 @@
     // Default listener will use setResult(), which won't work due to activity being in a new task.
     private View.OnClickListener clickListener = target -> {
         final int resultCode;
-        switch (target.getId()) {
-            case R.id.pass_button:
-                resultCode = TestResult.TEST_RESULT_PASSED;
-                break;
-            case R.id.fail_button:
-                resultCode = TestResult.TEST_RESULT_FAILED;
-                break;
-            default:
-                throw new IllegalArgumentException("Unknown id: " + target.getId());
+        int id = target.getId();
+        if (id == R.id.pass_button) {
+            resultCode = TestResult.TEST_RESULT_PASSED;
+        } else if (id == R.id.fail_button) {
+            resultCode = TestResult.TEST_RESULT_FAILED;
+        } else {
+            throw new IllegalArgumentException("Unknown id: " + target.getId());
         }
         Intent resultIntent = TestResult.createResult(RecentsRedactionActivity.this, resultCode,
                 getTestId(), getTestDetails(), getReportLog(), getHistoryCollection());
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/SetSupportMessageActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/SetSupportMessageActivity.java
index e116b41..5dce891 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/SetSupportMessageActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/SetSupportMessageActivity.java
@@ -69,19 +69,17 @@
     @Override
     public void onClick(View view) {
         String message = null;
-        switch (view.getId()) {
-            case R.id.set_default_message: {
-                message = getString(TYPE_SHORT_MSG.equals(mType)
-                        ? R.string.policy_transparency_default_short_msg
-                        : R.string.policy_transparency_default_long_msg);
-            } break;
-            case R.id.set_message: {
-                message = mSupportMessage.getText().toString();
-            } break;
-            case R.id.clear_message: {
-                message = null;
-            } break;
+        int id = view.getId();
+        if (id == R.id.set_default_message) {
+            message = getString(TYPE_SHORT_MSG.equals(mType)
+                    ? R.string.policy_transparency_default_short_msg
+                    : R.string.policy_transparency_default_long_msg);
+        } else if (id == R.id.set_message) {
+            message = mSupportMessage.getText().toString();
+        } else if (id == R.id.clear_message) {
+            message = null;
         }
+
         if (TYPE_SHORT_MSG.equals(mType)) {
             mDpm.setShortSupportMessage(mAdmin, message);
         } else {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/WifiLockdownTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/WifiLockdownTestActivity.java
index 2f26028..d26fc62 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/WifiLockdownTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/managedprovisioning/WifiLockdownTestActivity.java
@@ -159,16 +159,12 @@
     }
 
     private int convertKeyManagement(int radioButtonId) {
-        switch (radioButtonId) {
-            case NONE: {
-                return SECURITY_TYPE_NONE;
-            }
-            case WPA: {
-                return SECURITY_TYPE_WPA;
-            }
-            case WEP: {
-                return SECURITY_TYPE_WEP;
-            }
+        if (radioButtonId == NONE) {
+            return SECURITY_TYPE_NONE;
+        } else if (radioButtonId == WPA) {
+            return SECURITY_TYPE_WPA;
+        } else if (radioButtonId == WEP) {
+            return SECURITY_TYPE_WEP;
         }
         return SECURITY_TYPE_NONE;
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/InteractiveVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/InteractiveVerifierActivity.java
index 7a37a0b..bbbb472 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/InteractiveVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/InteractiveVerifierActivity.java
@@ -36,6 +36,8 @@
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 
 import com.android.cts.verifier.PassFailButtons;
@@ -53,6 +55,7 @@
     private static final String TAG = "InteractiveVerifier";
     private static final String STATE = "state";
     private static final String STATUS = "status";
+    private static final String SCROLLY = "scrolly";
     private static LinkedBlockingQueue<String> sDeletedQueue = new LinkedBlockingQueue<String>();
     protected static final String LISTENER_PATH = "com.android.cts.verifier/" +
             "com.android.cts.verifier.notifications.MockListener";
@@ -79,7 +82,8 @@
     protected String mPackageString;
 
     private LayoutInflater mInflater;
-    private ViewGroup mItemList;
+    private LinearLayout mItemList;
+    private ScrollView mScrollView;
     private List<InteractiveTestCase> mTestList;
     private Iterator<InteractiveTestCase> mTestOrder;
 
@@ -107,6 +111,7 @@
             if (view == null) {
                 view = inflate(parent);
             }
+            view.setTag(this.getClass().getSimpleName());
             return view;
         }
 
@@ -157,6 +162,7 @@
         super.onCreate(savedState);
         int savedStateIndex = (savedState == null) ? 0 : savedState.getInt(STATE, 0);
         int savedStatus = (savedState == null) ? SETUP : savedState.getInt(STATUS, SETUP);
+        int scrollY = (savedState == null) ? 0 : savedState.getInt(SCROLLY, 0);
         Log.i(TAG, "restored state(" + savedStateIndex + "}, status(" + savedStatus + ")");
         mContext = this;
         mRunner = this;
@@ -164,7 +170,8 @@
         mPackageManager = getPackageManager();
         mInflater = getLayoutInflater();
         View view = mInflater.inflate(R.layout.nls_main, null);
-        mItemList = (ViewGroup) view.findViewById(R.id.nls_test_items);
+        mScrollView = view.findViewById(R.id.nls_test_scroller);
+        mItemList = view.findViewById(R.id.nls_test_items);
         mHandler = mItemList;
         mTestList = new ArrayList<>();
         mTestList.addAll(createTestItems());
@@ -175,8 +182,12 @@
         for (int i = 0; i < savedStateIndex; i++) {
             mCurrentTest = mTestOrder.next();
             mCurrentTest.status = PASS;
+            markItem(mCurrentTest);
         }
         mCurrentTest = mTestOrder.next();
+
+        mScrollView.post(() -> mScrollView.smoothScrollTo(0, scrollY));
+
         mCurrentTest.status = savedStatus;
 
         setContentView(view);
@@ -192,6 +203,7 @@
         outState.putInt(STATE, stateIndex);
         final int status = mCurrentTest == null ? SETUP : mCurrentTest.status;
         outState.putInt(STATUS, status);
+        outState.putInt(SCROLLY, mScrollView.getScrollY());
         Log.i(TAG, "saved state(" + stateIndex + "), status(" + status + ")");
     }
 
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/MediaPlayerVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/MediaPlayerVerifierActivity.java
new file mode 100644
index 0000000..c2208d4
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/MediaPlayerVerifierActivity.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2022 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.cts.verifier.notifications;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.media.MediaMetadata;
+import android.media.session.MediaSession;
+import android.media.session.PlaybackState;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.cts.verifier.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tests for media player shown in shade when media style notification is posted.
+ */
+public class MediaPlayerVerifierActivity extends InteractiveVerifierActivity {
+
+    // Media session info
+    private static final String SESSION_KEY = "Session";
+    private static final String SESSION_TITLE = "Song";
+    private static final String SESSION_ARTIST = "Artist";
+    private static final long SESSION_DURATION = 60000L;
+
+    // MediaStyle notification info
+    private static final String TITLE = "Media-style Notification";
+    private static final String TEXT = "Notification for a test media session";
+    private static final String CHANNEL_ID = "MediaPlayerVerifierActivity";
+
+    private MediaSession mSession;
+    private NotificationManager mManager;
+    private Notification.Builder mBuilder;
+
+    @Override
+    public List<InteractiveTestCase> createTestItems() {
+        List<InteractiveTestCase> cases = new ArrayList<>();
+        cases.add(new MediaPlayerTestCase(R.string.media_controls_visible));
+        cases.add(new MediaPlayerTestCase(R.string.media_controls_output_switcher_chip));
+        return cases;
+    }
+
+    @Override
+    public int getInstructionsResource() {
+        return R.string.media_controls_info;
+    }
+
+    @Override
+    public int getTitleResource() {
+        return R.string.media_controls_title;
+    }
+
+    private class MediaPlayerTestCase extends InteractiveTestCase {
+        private final int mDescriptionResId;
+
+        MediaPlayerTestCase(int resId) {
+            mDescriptionResId = resId;
+        }
+
+        @Override
+        protected void setUp() {
+            postMediaStyleNotification();
+            status = READY;
+        }
+
+        @Override
+        protected void tearDown() {
+            cancelMediaStyleNotification();
+        }
+
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createPassFailItem(parent, mDescriptionResId);
+        }
+
+        @Override
+        protected void test() {
+            status = WAIT_FOR_USER;
+            next();
+        }
+    }
+
+    private void postMediaStyleNotification() {
+        mManager = this.getSystemService(NotificationManager.class);
+        mSession = new MediaSession(this, SESSION_KEY);
+
+        // Create a solid color bitmap to use as album art in media metadata
+        Bitmap bitmap = Bitmap.createBitmap(300, 300, Bitmap.Config.ARGB_8888);
+        new Canvas(bitmap).drawColor(Color.GREEN);
+
+        // Set up media session with metadata and playback state
+        mSession.setMetadata(new MediaMetadata.Builder()
+                .putString(MediaMetadata.METADATA_KEY_ARTIST, SESSION_ARTIST)
+                .putString(MediaMetadata.METADATA_KEY_TITLE, SESSION_TITLE)
+                .putLong(MediaMetadata.METADATA_KEY_DURATION, SESSION_DURATION)
+                .putBitmap(MediaMetadata.METADATA_KEY_ALBUM_ART, bitmap)
+                .build());
+        mSession.setPlaybackState(new PlaybackState.Builder()
+                .setState(PlaybackState.STATE_PAUSED, 6000L, 1f)
+                .setActions(PlaybackState.ACTION_SEEK_TO
+                        | PlaybackState.ACTION_PLAY
+                        | PlaybackState.ACTION_PAUSE
+                        | PlaybackState.ACTION_SKIP_TO_PREVIOUS
+                        | PlaybackState.ACTION_SKIP_TO_NEXT)
+                .addCustomAction("rewind", "rewind", android.R.drawable.ic_media_rew)
+                .addCustomAction("fast forward", "fast forward", android.R.drawable.ic_media_ff)
+                .build());
+
+        // Set up notification builder
+        NotificationChannel channel = new NotificationChannel(CHANNEL_ID, CHANNEL_ID,
+                NotificationManager.IMPORTANCE_LOW);
+        mManager.createNotificationChannel(channel);
+        mBuilder = new Notification.Builder(this, CHANNEL_ID)
+                .setContentTitle(TITLE).setContentText(TEXT)
+                .setSmallIcon(R.drawable.ic_android)
+                .setStyle(new Notification.MediaStyle()
+                        .setShowActionsInCompactView(1, 2, 3)
+                        .setMediaSession(mSession.getSessionToken()))
+                .setColor(Color.BLUE)
+                .setColorized(true)
+                .addAction(android.R.drawable.ic_media_rew, "rewind", null)
+                .addAction(android.R.drawable.ic_media_previous, "previous track", null)
+                .addAction(android.R.drawable.ic_media_play, "play", null)
+                .addAction(android.R.drawable.ic_media_next, "next track", null)
+                .addAction(android.R.drawable.ic_media_ff, "fast forward", null);
+
+        mSession.setActive(true);
+        mManager.notify(1, mBuilder.build());
+    }
+
+    private void cancelMediaStyleNotification() {
+        if (mSession != null) {
+            mSession.release();
+            mSession = null;
+        }
+        if (mManager != null) {
+            mManager.cancelAll();
+            mManager.deleteNotificationChannel(CHANNEL_ID);
+            mManager = null;
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/NotificationListenerVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/NotificationListenerVerifierActivity.java
index 0ffd259..54df8b7 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/notifications/NotificationListenerVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/notifications/NotificationListenerVerifierActivity.java
@@ -39,6 +39,7 @@
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
+import android.app.PendingIntent;
 import android.app.Person;
 import android.content.Context;
 import android.content.Intent;
@@ -122,6 +123,14 @@
         tests.add(new IsEnabledTest());
         tests.add(new ServiceStartedTest());
         tests.add(new NotificationReceivedTest());
+        /*
+        // TODO (b/200701618): re-enable tests if conditions in 3.8.3.1 change to MUST
+        if (!isAutomotive) {
+            tests.add(new SendUserToChangeFilter());
+            tests.add(new AskIfFilterChanged());
+            tests.add(new NotificationTypeFilterTest());
+            tests.add(new ResetChangeFilter());
+        }*/
         tests.add(new LongMessageTest());
         tests.add(new DataIntactTest());
         tests.add(new AudiblyAlertedTest());
@@ -133,9 +142,6 @@
         tests.add(new SnoozeNotificationForTimeCancelTest());
         tests.add(new GetSnoozedNotificationTest());
         tests.add(new EnableHintsTest());
-        if (!isAutomotive) {
-            tests.add(new LockscreenVisibilityTest());
-        }
         tests.add(new ReceiveAppBlockNoticeTest());
         tests.add(new ReceiveAppUnblockNoticeTest());
         if (!isAutomotive) {
@@ -146,6 +152,7 @@
         tests.add(new RequestBindTest());
         tests.add(new MessageBundleTest());
         tests.add(new ConversationOrderingTest());
+        tests.add(new HunDisplayTest());
         tests.add(new EnableHintsTest());
         tests.add(new IsDisabledTest());
         tests.add(new ServiceStoppedTest());
@@ -500,85 +507,6 @@
     }
 
     /**
-     * Creates a notification channel. Sends the user to settings to disallow the channel from
-     * showing on the lockscreen. Sends a notification, checks the lockscreen setting in the
-     * ranking object.
-     */
-    protected class LockscreenVisibilityTest extends InteractiveTestCase {
-        private int mRetries = 3;
-        private View mView;
-        @Override
-        protected View inflate(ViewGroup parent) {
-            mView = createNlsSettingsItem(parent, R.string.nls_visibility);
-            Button button = mView.findViewById(R.id.nls_action_button);
-            button.setEnabled(false);
-            return mView;
-        }
-
-        @Override
-        protected void setUp() {
-            createChannels();
-            status = READY;
-            Button button = mView.findViewById(R.id.nls_action_button);
-            button.setEnabled(true);
-        }
-
-        @Override
-        boolean autoStart() {
-            return true;
-        }
-
-        @Override
-        protected void test() {
-            NotificationChannel channel = mNm.getNotificationChannel(NOTIFICATION_CHANNEL_ID);
-            if (channel.getLockscreenVisibility() == VISIBILITY_PRIVATE) {
-                if (mRetries == 3) {
-                    sendNotifications();
-                }
-
-                NotificationListenerService.Ranking rank =
-                        new NotificationListenerService.Ranking();
-                StatusBarNotification sbn = MockListener.getInstance().getPosted(mTag1);
-                if (sbn != null) {
-                    MockListener.getInstance().getCurrentRanking().getRanking(sbn.getKey(), rank);
-                    if (rank.getLockscreenVisibilityOverride() == VISIBILITY_PRIVATE) {
-                        status = PASS;
-                    } else {
-                        logFail("Actual visibility:" + rank.getLockscreenVisibilityOverride());
-                        status = FAIL;
-                    }
-                } else {
-                    if (mRetries > 0) {
-                        mRetries--;
-                        status = RETEST;
-                    } else {
-                        logFail("Notification wasn't posted");
-                        status = FAIL;
-                    }
-                }
-
-            } else {
-                // user hasn't jumped to settings  yet
-                status = WAIT_FOR_USER;
-            }
-
-            next();
-        }
-
-        protected void tearDown() {
-            MockListener.getInstance().resetData();
-            deleteChannels();
-        }
-
-        @Override
-        protected Intent getIntent() {
-            return new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
-                    .putExtra(EXTRA_APP_PACKAGE, mContext.getPackageName())
-                    .putExtra(EXTRA_CHANNEL_ID, NOTIFICATION_CHANNEL_ID);
-        }
-    }
-
-    /**
      * Sends the user to settings to block the app. Waits to receive the broadcast that the app was
      * blocked, and confirms that the broadcast contains the correct extras.
      */
@@ -1694,6 +1622,114 @@
         }
     }
 
+    /**
+     * Tests that heads-up notifications appear with the view, resources, and actions provided
+     * in Notification.Builder.
+     */
+    private class HunDisplayTest extends InteractiveTestCase {
+
+        @Override
+        protected void setUp() {
+            createChannels();
+            sendNotifications();
+            status = READY;
+        }
+
+        @Override
+        protected void tearDown() {
+            mNm.cancelAll();
+            deleteChannels();
+            delay();
+        }
+
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createPassFailItem(parent, R.string.hun_display);
+        }
+
+        private void sendNotifications() {
+            mTag1 = UUID.randomUUID().toString();
+            mId1 = NOTIFICATION_ID + 1;
+
+            Notification n1 = new Notification.Builder(mContext, NOISY_NOTIFICATION_CHANNEL_ID)
+                    .setContentTitle("HunDisplayTest")
+                    .setContentText(mTag1)
+                    .setSmallIcon(R.drawable.ic_stat_alice)
+                    .setLargeIcon(Icon.createWithResource(mContext, R.drawable.test_pass_gradient))
+                    .addAction(generateAction(1))
+                    .addAction(generateAction(2))
+                    .build();
+            mNm.notify(mTag1, mId1, n1);
+        }
+
+        private Notification.Action generateAction(int num) {
+            PendingIntent pi = PendingIntent.getActivity(mContext, num,
+                    new Intent(Settings.ACTION_ALL_APPS_NOTIFICATION_SETTINGS),
+                    PendingIntent.FLAG_IMMUTABLE);
+            return new Notification.Action.Builder(
+                    Icon.createWithResource(mContext, R.drawable.ic_android),
+                    mContext.getString(R.string.action, num), pi)
+                    .build();
+        }
+
+        @Override
+        boolean autoStart() {
+            return true;
+        }
+
+        @Override
+        protected void test() {
+            status = WAIT_FOR_USER;
+            next();
+        }
+    }
+
+    /**
+     * Sends the user to settings filter out silent notifications for this notification listener.
+     * Sends silent and not silent notifs and makes sure only the non silent is received
+     */
+    private class NotificationTypeFilterTest extends InteractiveTestCase {
+        int mRetries = 3;
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.nls_filter_test);
+
+        }
+
+        @Override
+        protected void setUp() {
+            createChannels();
+            sendNotifications();
+            sendNoisyNotification();
+            status = READY;
+        }
+
+        @Override
+        protected void tearDown() {
+            mNm.cancelAll();
+            MockListener.getInstance().resetData();
+            deleteChannels();
+        }
+
+        @Override
+        protected void test() {
+            if (MockListener.getInstance().getPosted(mTag4) == null) {
+                Log.d(TAG, "Could not find " + mTag4);
+                if (--mRetries > 0) {
+                    sleep(100);
+                    status = RETEST;
+                } else {
+                    status = FAIL;
+                }
+            } else if (MockListener.getInstance().getPosted(mTag2) != null) {
+                logFail("Found" + mTag2);
+                status = FAIL;
+            } else {
+                status = PASS;
+            }
+        }
+    }
+
     protected class SendUserToChangeFilter extends InteractiveTestCase {
         @Override
         protected View inflate(ViewGroup parent) {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/p2p/RequesterTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/p2p/RequesterTestActivity.java
index 542fb36..f3e2680 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/p2p/RequesterTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/p2p/RequesterTestActivity.java
@@ -15,10 +15,6 @@
  */
 package com.android.cts.verifier.p2p;
 
-import java.util.Collection;
-import java.util.Timer;
-import java.util.TimerTask;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -40,6 +36,10 @@
 import com.android.cts.verifier.p2p.testcase.TestCase;
 import com.android.cts.verifier.p2p.testcase.TestCase.TestCaseListener;
 
+import java.util.Collection;
+import java.util.Timer;
+import java.util.TimerTask;
+
 /**
  * A base class for requester test activity.
  *
@@ -135,8 +135,8 @@
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
+    protected void onStart() {
+        super.onStart();
         /*
          * If the target device is NOT set, search targets and show
          * the target device list on the dialog.
@@ -152,8 +152,8 @@
     }
 
     @Override
-    protected void onPause() {
-        super.onPause();
+    protected void onStop() {
+        super.onStop();
         if (mTimer != null) {
             mTimer.cancel();
             mTimer = null;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/p2p/ResponderTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/p2p/ResponderTestActivity.java
index 39f0bf8..405d4be 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/p2p/ResponderTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/p2p/ResponderTestActivity.java
@@ -101,8 +101,8 @@
     }
 
     @Override
-    protected void onResume() {
-        super.onResume();
+    protected void onStart() {
+        super.onStart();
         mTestCase.start(this);
         registerReceiver(mReceiver, mIntentFilter);
         mP2pMgr.requestDeviceInfo(mChannel, wifiP2pDevice -> {
@@ -119,8 +119,8 @@
     }
 
     @Override
-    protected void onPause() {
-        super.onPause();
+    protected void onStop() {
+        super.onStop();
         mTestCase.stop();
         unregisterReceiver(mReceiver);
     }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/p2p/testcase/ConnectReqTestCase.java b/apps/CtsVerifier/src/com/android/cts/verifier/p2p/testcase/ConnectReqTestCase.java
index 20ce5ac..f25209b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/p2p/testcase/ConnectReqTestCase.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/p2p/testcase/ConnectReqTestCase.java
@@ -187,21 +187,11 @@
      * @throws InterruptedException
      */
     protected boolean connectTest(WifiP2pConfig config) throws InterruptedException {
-        notifyTestMsg(R.string.p2p_searching_target);
-
-        /*
-         * Search target device and check its capability.
-         */
         ActionListenerTest actionListener = new ActionListenerTest();
-        mP2pMgr.discoverPeers(mChannel, actionListener);
-        if (!actionListener.check(ActionListenerTest.SUCCESS, TIMEOUT)) {
-            mReason = mContext.getString(R.string.p2p_discover_peers_error);
-            return false;
-        }
-
         /*
          * Try to connect the target device.
          */
+        long startTime = System.currentTimeMillis();
         mP2pMgr.connect(mChannel, config, actionListener);
         if (!actionListener.check(ActionListenerTest.SUCCESS, TIMEOUT)) {
             mReason = mContext.getString(R.string.p2p_connect_error);
@@ -224,6 +214,13 @@
         WifiP2pGroup group = mReceiverTest.getWifiP2pGroup();
         if (group != null) {
             if (!group.isGroupOwner()) {
+                long endTime = System.currentTimeMillis();
+                long connectionLatency = endTime - startTime;
+                if (connectionLatency > MAXIMUM_EXPECTED_CONNECTION_LATENCY_WITH_CONFIG_MS) {
+                    mReason = mContext.getString(R.string.p2p_connection_latency_error,
+                            MAXIMUM_EXPECTED_CONNECTION_LATENCY_WITH_CONFIG_MS, connectionLatency);
+                    return false;
+                }
                 setTargetAddress(group.getOwner().deviceAddress);
             } else {
                 mReason = mContext.getString(R.string.p2p_connection_error);
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/p2p/testcase/TestCase.java b/apps/CtsVerifier/src/com/android/cts/verifier/p2p/testcase/TestCase.java
index 7f608c5..2117419 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/p2p/testcase/TestCase.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/p2p/testcase/TestCase.java
@@ -44,6 +44,7 @@
 
     protected static final int TIMEOUT = 25000;
     protected static final int TIMEOUT_FOR_USER_ACTION = 60000;
+    protected static final int MAXIMUM_EXPECTED_CONNECTION_LATENCY_WITH_CONFIG_MS = 1500;
     protected static final int SUCCESS = 0;
 
     protected Context mContext;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/InteractiveVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/InteractiveVerifierActivity.java
index 5de1d8d..44f2f28 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/InteractiveVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/InteractiveVerifierActivity.java
@@ -40,9 +40,6 @@
     private static final String TAG = "InteractiveVerifier";
     private static final String STATE = "state";
     private static final String STATUS = "status";
-    protected static final String TILE_PATH = "com.android.cts.verifier/" +
-            "com.android.cts.verifier.qstiles.MockTileService";
-    protected static final ComponentName TILE_NAME = ComponentName.unflattenFromString(TILE_PATH);
     protected static final int SETUP = 0;
     protected static final int READY = 1;
     protected static final int RETEST = 2;
@@ -66,10 +63,13 @@
     protected boolean setTileState(boolean enabled) {
         int state = enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
                 : PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
-        mPackageManager.setComponentEnabledSetting(TILE_NAME, state, PackageManager.DONT_KILL_APP);
-        return mPackageManager.getComponentEnabledSetting(TILE_NAME) == state;
+        mPackageManager.setComponentEnabledSetting(
+                getTileComponentName(), state, PackageManager.DONT_KILL_APP);
+        return mPackageManager.getComponentEnabledSetting(getTileComponentName()) == state;
     }
 
+    protected abstract ComponentName getTileComponentName();
+
     protected abstract class InteractiveTestCase {
         protected boolean mUserVerified;
         protected int status;
@@ -82,6 +82,8 @@
             if (view == null) {
                 view = inflate(parent);
             }
+            View requestAction = view.requireViewById(R.id.tiles_action_request);
+            requestAction.setVisibility(showRequestAction() ? View.VISIBLE : View.GONE);
             return view;
         }
 
@@ -131,6 +133,14 @@
                     ((message == null) ? "" : ": " + message), e);
         }
 
+        protected boolean showRequestAction() {
+            return false;
+        }
+
+        protected void requestAction() {
+
+        }
+
     }
 
     protected abstract int getTitleResource();
@@ -205,8 +215,6 @@
         }
         View item = test.view;
         ImageView status = (ImageView) item.findViewById(R.id.tiles_status);
-        View buttonPass = item.findViewById(R.id.tiles_action_pass);
-        View buttonFail = item.findViewById(R.id.tiles_action_fail);
         switch (test.status) {
             case WAIT_FOR_USER:
                 status.setImageResource(R.drawable.fs_warning);
@@ -216,32 +224,35 @@
             case READY:
             case RETEST:
                 status.setImageResource(R.drawable.fs_clock);
-                buttonPass.setEnabled(true);
-                buttonPass.setClickable(true);
-                buttonFail.setEnabled(true);
-                buttonFail.setClickable(true);
+                setButtonsState(item, true);
                 break;
 
             case FAIL:
                 status.setImageResource(R.drawable.fs_error);
-                buttonFail.setClickable(false);
-                buttonFail.setEnabled(false);
-                buttonPass.setClickable(false);
-                buttonPass.setEnabled(false);
+                setButtonsState(item, false);
                 break;
 
             case PASS:
                 status.setImageResource(R.drawable.fs_good);
-                buttonFail.setClickable(false);
-                buttonFail.setEnabled(false);
-                buttonPass.setClickable(false);
-                buttonPass.setEnabled(false);
+                setButtonsState(item, false);
                 break;
 
         }
         status.invalidate();
     }
 
+    private void setButtonsState(View parent, boolean enabledAndClickable) {
+        View buttonPass = parent.findViewById(R.id.tiles_action_pass);
+        View buttonFail = parent.findViewById(R.id.tiles_action_fail);
+        View buttonRequest = parent.findViewById(R.id.tiles_action_request);
+
+        buttonPass.setEnabled(enabledAndClickable);
+        buttonPass.setClickable(enabledAndClickable);
+        buttonFail.setEnabled(enabledAndClickable);
+        buttonFail.setClickable(enabledAndClickable);
+        buttonRequest.setEnabled(enabledAndClickable);
+        buttonRequest.setClickable(enabledAndClickable);
+    }
 
     protected View createUserPassFail(ViewGroup parent, int messageId,
             Object... messageFormatArgs) {
@@ -368,19 +379,20 @@
 
     public void actionPressed(View v) {
         if (mCurrentTest != null) {
-            switch (v.getId()) {
-                case R.id.tiles_action_pass:
-                    mCurrentTest.status = PASS;
-                    mCurrentTest.mUserVerified = true;
-                    next();
-                    break;
-                case R.id.tiles_action_fail:
-                    mCurrentTest.status = FAIL;
-                    mCurrentTest.mUserVerified = true;
-                    next();
-                    break;
-                default:
-                    break;
+            int id = v.getId();
+            if (id == R.id.tiles_action_pass) {
+                mCurrentTest.status = PASS;
+                mCurrentTest.mUserVerified = true;
+                next();
+            } else if (id == R.id.tiles_action_fail) {
+                mCurrentTest.status = FAIL;
+                mCurrentTest.mUserVerified = true;
+                next();
+            } else if (id == R.id.tiles_action_request) {
+                mCurrentTest.status = WAIT_FOR_USER;
+                v.setEnabled(false);
+                mHandler.post(mCurrentTest::requestAction);
+                next();
             }
         }
     }
@@ -393,4 +405,10 @@
         Log.e(TAG, message, stackTrace);
     }
 
+    protected void setPassFailButtonsEnabledState(boolean enabled) {
+        View currentView = mCurrentTest.view;
+        currentView.requireViewById(R.id.tiles_action_pass).setEnabled(enabled);
+        currentView.requireViewById(R.id.tiles_action_fail).setEnabled(enabled);
+    }
+
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/OWNERS b/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/OWNERS
index cbc5f31..db047da 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/OWNERS
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/OWNERS
@@ -1,3 +1,4 @@
 # Bug component: 78930
 juliacr@google.com
-kozynski@google.com
\ No newline at end of file
+kozynski@google.com
+evanlaird@google.com
\ No newline at end of file
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/TileServiceRequestVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/TileServiceRequestVerifierActivity.java
new file mode 100644
index 0000000..ddaab1b
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/TileServiceRequestVerifierActivity.java
@@ -0,0 +1,415 @@
+/*
+ * Copyright (C) 2021 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.cts.verifier.qstiles;
+
+import android.app.PendingIntent;
+import android.app.StatusBarManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.PackageInstaller;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.cts.verifier.R;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+
+public class TileServiceRequestVerifierActivity extends InteractiveVerifierActivity {
+
+    private static final String TAG = "TileServiceRequestVerifierActivity";
+
+    private static final String ACTION_REMOVE_PACKAGE =
+            "com.android.cts.verifier.qstiles.ACTION_REMOVE_PACKAGE";
+
+    private CharSequence mTileLabel;
+    private static int sNextResultCode = 1000;
+    private static final String HELPER_PACKAGE_NAME = "com.android.cts.tileserviceapp";
+    private static final String HELPER_ACTIVITY_NAME = ".TileRequestActivity";
+    private static final String HELPER_TILE_NAME = ".RequestTileService";
+    private static final ComponentName HELPER_ACTIVITY_COMPONENT =
+            ComponentName.createRelative(HELPER_PACKAGE_NAME, HELPER_ACTIVITY_NAME);
+    private static final Intent INTENT = new Intent().setComponent(HELPER_ACTIVITY_COMPONENT);
+
+    // Keep track of activity started codes to handle results.
+    private final Map<Integer, Consumer<Integer>> mResultRegistry = new HashMap<>();
+
+    @Override
+    protected boolean setTileState(boolean enabled) {
+        // This tile is always enabled as long as the package is installed.
+        return true;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedState) {
+        mTileLabel = getString(R.string.tile_request_service_name);
+        super.onCreate(savedState);
+    }
+
+    private void registerForResult(Consumer<Integer> consumer) {
+        int code = sNextResultCode++;
+        mResultRegistry.put(code, consumer);
+        startActivityForResult(INTENT, code);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        mResultRegistry.get(requestCode).accept(resultCode);
+    }
+
+    private boolean isHelperAppInstalled() {
+        return getPackageManager().resolveActivity(INTENT, 0) != null;
+    }
+
+    @Override
+    protected ComponentName getTileComponentName() {
+        return ComponentName.createRelative(HELPER_PACKAGE_NAME, HELPER_TILE_NAME);
+    }
+
+    @Override
+    protected int getTitleResource() {
+        return R.string.tiles_request_test;
+    }
+
+    @Override
+    protected int getInstructionsResource() {
+        return R.string.tiles_request_info;
+    }
+
+    @Override
+    protected List<InteractiveTestCase> createTestItems() {
+        ArrayList<InteractiveTestCase> list = new ArrayList<>();
+        list.add(new UninstallPackage());
+        list.add(new InstallPackage());
+        list.add(new InstallPackageVerify());
+        list.add(new TileNotPresent());
+        list.add(new RequestAddTileDismiss());
+        list.add(new RequestAddTileAnswerNo());
+        list.add(new RequestAddTileCorrectInfo());
+        list.add(new RequestAddTileAnswerYes());
+        list.add(new TilePresentAfterRequest());
+        list.add(new RequestAddTileAlreadyAdded());
+        list.add(new UninstallPackage());
+        return list;
+    }
+
+    // Tests
+    private class UninstallPackage extends InteractiveTestCase {
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.tiles_request_uninstall);
+        }
+
+        @Override
+        boolean autoStart() {
+            return true;
+        }
+
+        @Override
+        protected boolean showRequestAction() {
+            return true;
+        }
+
+        private BroadcastReceiver registerReceiver() {
+            BroadcastReceiver br = new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    int result = intent.getIntExtra(PackageInstaller.EXTRA_STATUS,
+                            PackageInstaller.STATUS_SUCCESS);
+                    if (result == PackageInstaller.STATUS_PENDING_USER_ACTION) {
+                        startActivity(intent.getParcelableExtra(Intent.EXTRA_INTENT));
+                        return;
+                    }
+                    context.unregisterReceiver(this);
+                    if (!isHelperAppInstalled()) {
+                        status = PASS;
+                    } else {
+                        setFailed("Helper App still installed");
+                    }
+                    next();
+                }
+            };
+            mContext.registerReceiver(br, new IntentFilter(ACTION_REMOVE_PACKAGE));
+            return br;
+        }
+
+        @Override
+        protected void requestAction() {
+            PackageInstaller packageInstaller = getPackageManager().getPackageInstaller();
+            Log.i(TAG,
+                    "Uninstalling package " + HELPER_PACKAGE_NAME + " using " + packageInstaller);
+            BroadcastReceiver br = registerReceiver();
+            try {
+                PendingIntent pi = PendingIntent.getBroadcast(mContext, /* requestCode */ 0,
+                        new Intent(ACTION_REMOVE_PACKAGE), PendingIntent.FLAG_MUTABLE);
+                packageInstaller.uninstall(HELPER_ACTIVITY_COMPONENT.getPackageName(),
+                        pi.getIntentSender());
+                status = WAIT_FOR_USER;
+            } catch (IllegalArgumentException e) {
+                mContext.unregisterReceiver(br);
+                status = PASS;
+            }
+        }
+
+        @Override
+        protected void test() {
+            if (status == READY) {
+                if (!isHelperAppInstalled()) {
+                    status = PASS;
+                } else {
+                    status = WAIT_FOR_USER;
+                }
+                next();
+            }
+        }
+    }
+
+    private class InstallPackage extends InteractiveTestCase {
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createUserPassFail(parent, R.string.tiles_request_install);
+        }
+
+        @Override
+        boolean autoStart() {
+            return true;
+        }
+
+        @Override
+        protected void test() {
+            status = WAIT_FOR_USER;
+            next();
+        }
+    }
+
+    private class InstallPackageVerify extends InteractiveTestCase {
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.tiles_request_install_verify);
+        }
+
+        @Override
+        boolean autoStart() {
+            return true;
+        }
+
+        @Override
+        protected void test() {
+            if (isHelperAppInstalled()) {
+                status = PASS;
+            } else {
+                setFailed("Helper app not properly installed");
+            }
+            next();
+        }
+    }
+
+    private class TileNotPresent extends InteractiveTestCase {
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createUserPassFail(parent, R.string.tiles_request_tile_not_present, mTileLabel);
+        }
+
+        @Override
+        protected void test() {
+            status = WAIT_FOR_USER;
+            next();
+        }
+    }
+
+    private class RequestAddTileDismiss extends InteractiveTestCase {
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.tiles_request_dismissed);
+        }
+
+        @Override
+        protected boolean showRequestAction() {
+            return true;
+        }
+
+        @Override
+        protected void requestAction() {
+            registerForResult(
+                    integer -> {
+                        if (integer.equals(
+                                StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_NOT_ADDED)) {
+                            status = PASS;
+                        } else {
+                            setFailed("Request called back with result: " + integer);
+                        }
+                        next();
+                    }
+            );
+        }
+
+        @Override
+        protected void test() {
+            status = WAIT_FOR_USER;
+            next();
+        }
+    }
+
+    private class RequestAddTileAnswerNo extends InteractiveTestCase {
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.tiles_request_answer_no);
+        }
+
+        @Override
+        protected boolean showRequestAction() {
+            return true;
+        }
+
+        @Override
+        protected void requestAction() {
+            registerForResult(
+                    integer -> {
+                        if (integer.equals(
+                                StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_NOT_ADDED)) {
+                            status = PASS;
+                        } else {
+                            setFailed("Request called back with result: " + integer);
+                        }
+                        next();
+                    }
+            );
+        }
+
+        @Override
+        protected void test() {
+            status = WAIT_FOR_USER;
+            next();
+        }
+    }
+
+    private class RequestAddTileCorrectInfo extends InteractiveTestCase {
+
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createUserPassFail(parent, R.string.tiles_request_correct_info,
+                    mContext.getString(R.string.tile_request_helper_app_name),
+                    mTileLabel);
+        }
+
+        @Override
+        protected boolean showRequestAction() {
+            return true;
+        }
+
+        @Override
+        protected void requestAction() {
+            registerForResult(
+                    integer -> {
+                        if (integer.equals(
+                                StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_NOT_ADDED)) {
+                            status = WAIT_FOR_USER;
+                            setPassFailButtonsEnabledState(true);
+                        } else {
+                            setFailed("Request called back with result: " + integer);
+                        }
+                        next();
+                    }
+            );
+        }
+
+        @Override
+        protected void test() {
+            status = WAIT_FOR_USER;
+            setPassFailButtonsEnabledState(false);
+            next();
+        }
+    }
+
+    private class RequestAddTileAnswerYes extends InteractiveTestCase {
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.tiles_request_answer_yes);
+        }
+
+        @Override
+        protected boolean showRequestAction() {
+            return true;
+        }
+
+        @Override
+        protected void requestAction() {
+            registerForResult(
+                    integer -> {
+                        if (integer.equals(StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_ADDED)) {
+                            status = PASS;
+                        } else {
+                            setFailed("Request called back with result: " + integer);
+                        }
+                        next();
+                    }
+            );
+        }
+
+        @Override
+        protected void test() {
+            status = WAIT_FOR_USER;
+            next();
+        }
+    }
+
+    private class TilePresentAfterRequest extends InteractiveTestCase {
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createUserPassFail(parent, R.string.tiles_request_tile_present, mTileLabel);
+        }
+
+        @Override
+        protected void test() {
+            status = WAIT_FOR_USER;
+            next();
+        }
+    }
+
+    private class RequestAddTileAlreadyAdded extends InteractiveTestCase {
+        @Override
+        protected View inflate(ViewGroup parent) {
+            return createAutoItem(parent, R.string.tiles_request_check_tile_already_added);
+        }
+
+        @Override
+        protected void test() {
+            registerForResult(
+                    integer -> {
+                        if (integer.equals(
+                                StatusBarManager.TILE_ADD_REQUEST_RESULT_TILE_ALREADY_ADDED)) {
+                            status = PASS;
+                        } else {
+                            setFailed("Request called back with result: " + integer);
+                        }
+                        next();
+                    }
+            );
+            status = READY_AFTER_LONG_DELAY;
+            next();
+        }
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/TileServiceVerifierActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/TileServiceVerifierActivity.java
index a65156c..3071b65 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/TileServiceVerifierActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/qstiles/TileServiceVerifierActivity.java
@@ -16,6 +16,7 @@
 
 package com.android.cts.verifier.qstiles;
 
+import android.content.ComponentName;
 import android.view.View;
 import android.view.ViewGroup;
 
@@ -37,6 +38,13 @@
     }
 
     @Override
+    protected ComponentName getTileComponentName() {
+        String tilePath = "com.android.cts.verifier/"
+                + "com.android.cts.verifier.qstiles.MockTileService";
+        return ComponentName.unflattenFromString(tilePath);
+    }
+
+    @Override
     protected List<InteractiveTestCase> createTestItems() {
         ArrayList<InteractiveTestCase> list = new ArrayList<>();
         list.add(new SettingUpTile());
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DeviceSuspendTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DeviceSuspendTestActivity.java
index 9bad7af..cb18251 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DeviceSuspendTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/DeviceSuspendTestActivity.java
@@ -1,18 +1,6 @@
 package com.android.cts.verifier.sensors;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-import com.android.cts.verifier.R;
-import com.android.cts.verifier.sensors.base.SensorCtsVerifierTestActivity;
-import com.android.cts.verifier.sensors.helpers.SensorTestScreenManipulator;
-
 import android.app.AlarmManager;
-import android.app.IntentService;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -23,33 +11,26 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.hardware.Sensor;
-import android.hardware.SensorEvent;
-import android.hardware.SensorEventListener;
 import android.hardware.SensorManager;
-import android.hardware.TriggerEvent;
-import android.hardware.TriggerEventListener;
-import android.hardware.cts.helpers.MovementDetectorHelper;
-import android.hardware.cts.helpers.SensorStats;
-import android.hardware.cts.helpers.SensorStats;
+import android.hardware.cts.helpers.SensorNotSupportedException;
 import android.hardware.cts.helpers.SensorTestStateNotSupportedException;
 import android.hardware.cts.helpers.TestSensorEnvironment;
-import android.hardware.cts.helpers.TestSensorEvent;
-import android.hardware.cts.helpers.TestSensorEventListener;
-import android.hardware.cts.helpers.TestSensorManager;
 import android.hardware.cts.helpers.sensoroperations.TestSensorOperation;
-import android.hardware.cts.helpers.SensorNotSupportedException;
 import android.hardware.cts.helpers.sensorverification.BatchArrivalVerification;
 import android.hardware.cts.helpers.sensorverification.TimestampClockSourceVerification;
 import android.os.IBinder;
 import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 import android.util.Log;
-import android.view.MotionEvent;
-import android.view.View;
 
-import junit.framework.Assert;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.sensors.base.SensorCtsVerifierTestActivity;
+import com.android.cts.verifier.sensors.helpers.SensorTestScreenManipulator;
+
+import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 public class DeviceSuspendTestActivity
             extends SensorCtsVerifierTestActivity {
@@ -474,17 +455,10 @@
 
 
         public String runAPWakeUpByAlarmNonWakeSensor(Sensor sensor, int maxReportLatencyUs)
-            throws  Throwable {
+                throws Throwable {
             verifyBatchingSupport(sensor);
 
-            int samplingPeriodUs = sensor.getMaxDelay();
-            if (samplingPeriodUs == 0 || samplingPeriodUs > 200000) {
-                // If maxDelay is not defined, set the value for 5 Hz.
-                samplingPeriodUs = 200000;
-            }
-
-            long fifoBasedReportLatencyUs = maxBatchingPeriod(sensor, samplingPeriodUs);
-            verifyBatchingPeriod(fifoBasedReportLatencyUs);
+            int samplingPeriodUs = sensor.getMinDelay();
 
             TestSensorEnvironment environment = new TestSensorEnvironment(
                     this,
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/base/BaseSensorTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/base/BaseSensorTestActivity.java
index 4e1c149..91b05af 100755
--- a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/base/BaseSensorTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/base/BaseSensorTestActivity.java
@@ -593,17 +593,14 @@
      */
     private void setNextButtonText(int waitMessageResId) {
         int nextButtonText;
-        switch (waitMessageResId) {
-            case R.string.snsr_wait_to_retry:
-                nextButtonText = R.string.fail_and_next_button_text;
-                break;
-            case R.string.snsr_wait_to_finish:
-                nextButtonText = R.string.finish_button_text;
-                break;
-            default:
+        if (waitMessageResId == R.string.snsr_wait_to_retry) {
+            nextButtonText = R.string.fail_and_next_button_text;
+        } else if (waitMessageResId == R.string.snsr_wait_to_finish) {
+            nextButtonText = R.string.finish_button_text;
+        } else {
                 nextButtonText = R.string.next_button_text;
-                break;
         }
+
         runOnUiThread(new Runnable() {
             @Override
             public void run() {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Activities/TestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Activities/TestActivity.java
index 9ca5f2c..4b3902b 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Activities/TestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/sensors/sixdof/Activities/TestActivity.java
@@ -15,6 +15,22 @@
  */
 package com.android.cts.verifier.sensors.sixdof.Activities;
 
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Fragment;
+import android.app.FragmentManager;
+import android.app.FragmentTransaction;
+import android.content.Intent;
+import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Display;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.Surface;
+
 import com.android.cts.verifier.R;
 import com.android.cts.verifier.sensors.sixdof.Activities.StartActivity.ResultCode;
 import com.android.cts.verifier.sensors.sixdof.Fragments.AccuracyFragment;
@@ -26,8 +42,6 @@
 import com.android.cts.verifier.sensors.sixdof.Interfaces.BaseUiListener;
 import com.android.cts.verifier.sensors.sixdof.Interfaces.ComplexMovementListener;
 import com.android.cts.verifier.sensors.sixdof.Interfaces.RobustnessListener;
-import com.android.cts.verifier.sensors.sixdof.Utils.ReportExporter;
-import com.android.cts.verifier.sensors.sixdof.Utils.TestReport;
 import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointAreaCoveredException;
 import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointDistanceException;
 import com.android.cts.verifier.sensors.sixdof.Utils.Exceptions.WaypointRingNotEnteredException;
@@ -37,23 +51,9 @@
 import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.RotationData;
 import com.android.cts.verifier.sensors.sixdof.Utils.Path.PathUtilityClasses.Waypoint;
 import com.android.cts.verifier.sensors.sixdof.Utils.PoseProvider.PoseProvider;
+import com.android.cts.verifier.sensors.sixdof.Utils.ReportExporter;
 import com.android.cts.verifier.sensors.sixdof.Utils.ResultObjects.ResultObject;
-
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.res.Configuration;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.app.Fragment;
-import android.app.FragmentManager;
-import android.app.FragmentTransaction;
-import android.app.AlertDialog;
-import android.app.Activity;
-import android.util.Log;
-import android.view.Display;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.Surface;
+import com.android.cts.verifier.sensors.sixdof.Utils.TestReport;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -203,27 +203,25 @@
         // Handle action bar item clicks here.
         int id = item.getItemId();
 
-        switch (id) {
-            case R.id.action_save_results:
-                saveResults();
-                return true;
-            case R.id.action_xml:
-                AlertDialog.Builder builder = new AlertDialog.Builder(this);
+        if (id == R.id.action_save_results) {
+            saveResults();
+            return true;
+        } else if (id == R.id.action_xml) {
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
 
-                try {
-                    builder.setMessage(mDataFragment.getTestReport().getContents())
-                            .setTitle(R.string.results)
-                            .setPositiveButton(R.string.got_it, null);
-                } catch (IOException e) {
-                    Log.e(TAG, e.toString());
-                }
+            try {
+                builder.setMessage(mDataFragment.getTestReport().getContents())
+                        .setTitle(R.string.results)
+                        .setPositiveButton(R.string.got_it, null);
+            } catch (IOException e) {
+                Log.e(TAG, e.toString());
+            }
 
-                AlertDialog dialog = builder.create();
-                dialog.show();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
+            AlertDialog dialog = builder.create();
+            dialog.show();
+            return true;
         }
+        return super.onOptionsItemSelected(item);
     }
 
     public void saveResults() {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/tv/MockTvInputSetupActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/tv/MockTvInputSetupActivity.java
index 43ed7da..130e61d 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/tv/MockTvInputSetupActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/tv/MockTvInputSetupActivity.java
@@ -39,10 +39,10 @@
     private static final String TAG = "MockTvInputSetupActivity";
 
     /* package-private */ static final String CHANNEL_NUMBER = "999-0";
-    /* package-private */ static final String CHANNEL_NAME = "Dummy";
+    /* package-private */ static final String CHANNEL_NAME = "Placeholder";
 
-    /* package-private */ static final String PROGRAM_TITLE = "Dummy Program";
-    /* package-private */ static final String PROGRAM_DESCRIPTION = "Dummy Program Description";
+    /* package-private */ static final String PROGRAM_TITLE = "Placeholder Program";
+    /* package-private */ static final String PROGRAM_DESCRIPTION = "Placeholder Program Description";
 
     /* package-private */ static final String APP_LINK_TEST_KEY = "app_link_test_key";
     /* package-private */ static final String APP_LINK_TEST_VALUE = "app_link_test_value";
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifi/testcase/NetworkSuggestionTestCase.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifi/testcase/NetworkSuggestionTestCase.java
index 5b19e7b..9451c60 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifi/testcase/NetworkSuggestionTestCase.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifi/testcase/NetworkSuggestionTestCase.java
@@ -68,7 +68,7 @@
     private static final int CAPABILITIES_CHANGED_FOR_METERED_TIMEOUT_MS = 80_000;
 
     private final Object mLock = new Object();
-    private final ScheduledExecutorService mExecutorService;
+    private static ScheduledExecutorService sExecutorService;
     private final WifiNetworkSuggestion.Builder mNetworkSuggestionBuilder =
             new WifiNetworkSuggestion.Builder();
 
@@ -101,7 +101,6 @@
             boolean setRequiresAppInteraction, boolean simulateConnectionFailure,
             boolean setMeteredPostConnection) {
         super(context);
-        mExecutorService = Executors.newSingleThreadScheduledExecutor();
         mSetBssid = setBssid;
         mSetRequiresAppInteraction = setRequiresAppInteraction;
         mSimulateConnectionFailure = simulateConnectionFailure;
@@ -299,7 +298,7 @@
 
         // Step: Trigger scans periodically to trigger network selection quicker.
         if (DBG) Log.v(TAG, "Triggering scan periodically");
-        mExecutorService.scheduleAtFixedRate(() -> {
+        sExecutorService.scheduleAtFixedRate(() -> {
             if (!mWifiManager.startScan()) {
                 Log.w(TAG, "Failed to trigger scan");
             }
@@ -459,12 +458,13 @@
     @Override
     protected void setUp() {
         super.setUp();
+        sExecutorService = Executors.newSingleThreadScheduledExecutor();
         mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
     }
 
     @Override
     protected void tearDown() {
-        mExecutorService.shutdownNow();
+        sExecutorService.shutdownNow();
         if (mBroadcastReceiver != null) {
             mContext.unregisterReceiver(mBroadcastReceiver);
         }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/CallbackUtils.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/CallbackUtils.java
index 68c741e..be10d7a 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/CallbackUtils.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/CallbackUtils.java
@@ -24,6 +24,7 @@
 import android.net.wifi.aware.IdentityChangedListener;
 import android.net.wifi.aware.PeerHandle;
 import android.net.wifi.aware.PublishDiscoverySession;
+import android.net.wifi.aware.ServiceDiscoveryInfo;
 import android.net.wifi.aware.SubscribeDiscoverySession;
 import android.net.wifi.aware.WifiAwareSession;
 import android.net.wifi.rtt.RangingResult;
@@ -190,6 +191,8 @@
             public List<byte[]> matchFilter;
             public int messageId;
             public int distanceMm;
+            public int cipherSuite;
+            public byte[] scid;
         }
 
         private CountDownLatch mBlocker = null;
@@ -325,6 +328,17 @@
         }
 
         @Override
+        public void onServiceDiscovered(ServiceDiscoveryInfo info) {
+            CallbackData callbackData = new CallbackData(ON_SERVICE_DISCOVERED);
+            callbackData.peerHandle = info.getPeerHandle();
+            callbackData.serviceSpecificInfo = info.getServiceSpecificInfo();
+            callbackData.matchFilter = info.getMatchFilters();
+            callbackData.cipherSuite = info.getPeerCipherSuite();
+            callbackData.scid = info.getScid();
+            processCallback(callbackData);
+        }
+
+        @Override
         public void onServiceDiscoveredWithinRange(PeerHandle peerHandle,
                 byte[] serviceSpecificInfo,
                 List<byte[]> matchFilter, int distanceMm) {
@@ -337,6 +351,18 @@
         }
 
         @Override
+        public void onServiceDiscoveredWithinRange(ServiceDiscoveryInfo info, int distanceMm) {
+            CallbackData callbackData = new CallbackData(ON_SERVICE_DISCOVERED_WITH_RANGE);
+            callbackData.peerHandle = info.getPeerHandle();
+            callbackData.serviceSpecificInfo = info.getServiceSpecificInfo();
+            callbackData.matchFilter = info.getMatchFilters();
+            callbackData.cipherSuite = info.getPeerCipherSuite();
+            callbackData.scid = info.getScid();
+            callbackData.distanceMm = distanceMm;
+            processCallback(callbackData);
+        }
+
+        @Override
         public void onMessageSendSucceeded(int messageId) {
             CallbackData callbackData = new CallbackData(ON_MESSAGE_SEND_SUCCEEDED);
             callbackData.messageId = messageId;
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathForceChannelSetupPublishTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathForceChannelSetupPublishTestActivity.java
new file mode 100644
index 0000000..2d53ad1
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathForceChannelSetupPublishTestActivity.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2022 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.cts.verifier.wifiaware;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import com.android.cts.verifier.R;
+import com.android.cts.verifier.wifiaware.testcase.DataPathInBandTestCase;
+
+/**
+ * Test activity for data-path, in-band and force channel setup on publish
+ */
+public class DataPathForceChannelSetupPublishTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
+                /* isPublish */ true, /* isUnsolicited */ true, /* usePmk */ true,
+                /* acceptAny */ false, /* forceChannel */ true);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setInfoResources(R.string.aware_data_path_force_channel_setup_publish,
+                R.string.aware_data_path_force_channel_setup_publish_info, 0);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathForceChannelSetupSubscribeTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathForceChannelSetupSubscribeTestActivity.java
new file mode 100644
index 0000000..502abc8
--- /dev/null
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathForceChannelSetupSubscribeTestActivity.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 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.cts.verifier.wifiaware;
+
+import android.content.Context;
+
+import com.android.cts.verifier.wifiaware.testcase.DataPathInBandTestCase;
+
+/**
+ * Test activity for data-path, in-band and force channel setup on Subscribe
+ */
+public class DataPathForceChannelSetupSubscribeTestActivity extends BaseTestActivity {
+    @Override
+    protected BaseTestCase getTestCase(Context context) {
+        return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
+                /* isPublish */ false, /* isUnsolicited */ true, /* usePmk */ true,
+                /* acceptAny */ false, /* forceChannel */ true);
+    }
+}
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenActiveSubscribeAcceptAnyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenActiveSubscribeAcceptAnyTestActivity.java
index e81528e..682bfcf 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenActiveSubscribeAcceptAnyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenActiveSubscribeAcceptAnyTestActivity.java
@@ -27,6 +27,7 @@
     @Override
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ true, /* isPublish */ false,
-                /* isUnsolicited */ false, /* usePmk */ false, /* acceptAny */ false);
+                /* isUnsolicited */ false, /* usePmk */ false, /* acceptAny */ false,
+                /* forceChannel */false);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenActiveSubscribeTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenActiveSubscribeTestActivity.java
index 888c4cb..15f9d35 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenActiveSubscribeTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenActiveSubscribeTestActivity.java
@@ -27,6 +27,7 @@
     @Override
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ true, /* isPublish */ false,
-                /* isUnsolicited */ false, /* usePmk */ false, /* acceptAny */ false);
+                /* isUnsolicited */ false, /* usePmk */ false, /* acceptAny */ false,
+                /* forceChannel */false);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenPassiveSubscribeAcceptAnyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenPassiveSubscribeAcceptAnyTestActivity.java
index b25c3ef..21a2cb3 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenPassiveSubscribeAcceptAnyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenPassiveSubscribeAcceptAnyTestActivity.java
@@ -27,6 +27,7 @@
     @Override
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ true, /* isPublish */ false,
-                /* isUnsolicited */ true, /* usePmk */ false, /* acceptAny */ false);
+                /* isUnsolicited */ true, /* usePmk */ false, /* acceptAny */ false,
+                /* forceChannel */false);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenPassiveSubscribeTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenPassiveSubscribeTestActivity.java
index 9bfd9d1..5f5145e 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenPassiveSubscribeTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenPassiveSubscribeTestActivity.java
@@ -27,6 +27,7 @@
     @Override
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ true, /* isPublish */ false,
-                /* isUnsolicited */ true, /* usePmk */ false, /* acceptAny */ false);
+                /* isUnsolicited */ true, /* usePmk */ false, /* acceptAny */ false,
+                /* forceChannel */false);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenSolicitedPublishAcceptAnyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenSolicitedPublishAcceptAnyTestActivity.java
index 0888e5e..b07d3a0 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenSolicitedPublishAcceptAnyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenSolicitedPublishAcceptAnyTestActivity.java
@@ -29,7 +29,8 @@
     @Override
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ true, /* isPublish */ true,
-                /* isUnsolicited */ false, /* usePmk */ false, /* acceptAny */ true);
+                /* isUnsolicited */ false, /* usePmk */ false, /* acceptAny */ true,
+                /* forceChannel */false);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenSolicitedPublishTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenSolicitedPublishTestActivity.java
index 2bd5313..e80bf67 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenSolicitedPublishTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenSolicitedPublishTestActivity.java
@@ -29,7 +29,8 @@
     @Override
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ true, /* isPublish */ true,
-                /* isUnsolicited */ false, /* usePmk */ false, /* acceptAny */ false);
+                /* isUnsolicited */ false, /* usePmk */ false, /* acceptAny */ false,
+                /* forceChannel */false);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenUnsolicitedPublishAcceptAnyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenUnsolicitedPublishAcceptAnyTestActivity.java
index ed9e17a..25d7153 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenUnsolicitedPublishAcceptAnyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenUnsolicitedPublishAcceptAnyTestActivity.java
@@ -29,7 +29,8 @@
     @Override
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ true, /* isPublish */ true,
-                /* isUnsolicited */ true, /* usePmk */ false, /* acceptAny */ true);
+                /* isUnsolicited */ true, /* usePmk */ false, /* acceptAny */ true,
+                /* forceChannel */false);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenUnsolicitedPublishTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenUnsolicitedPublishTestActivity.java
index 6d7e8ca..06ac548 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenUnsolicitedPublishTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathOpenUnsolicitedPublishTestActivity.java
@@ -29,7 +29,8 @@
     @Override
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ true, /* isPublish */ true,
-                /* isUnsolicited */ true, /* usePmk */ false, /* acceptAny */ false);
+                /* isUnsolicited */ true, /* usePmk */ false, /* acceptAny */ false,
+                /* forceChannel */false);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseActiveSubscribeAcceptAnyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseActiveSubscribeAcceptAnyTestActivity.java
index 62275ec..b166faf 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseActiveSubscribeAcceptAnyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseActiveSubscribeAcceptAnyTestActivity.java
@@ -28,6 +28,6 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ false, /* isUnsolicited */ false, /* usePmk */ false,
-                /* acceptAny */ false);
+                /* acceptAny */ false, /* forceChannel */false);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseActiveSubscribeTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseActiveSubscribeTestActivity.java
index e5f77e9..86a86b9 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseActiveSubscribeTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseActiveSubscribeTestActivity.java
@@ -28,6 +28,6 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ false, /* isUnsolicited */ false, /* usePmk */ false,
-                /* acceptAny */ false);
+                /* acceptAny */ false, /* forceChannel */false);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphrasePassiveSubscribeAcceptAnyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphrasePassiveSubscribeAcceptAnyTestActivity.java
index 88ea2bb..24df500 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphrasePassiveSubscribeAcceptAnyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphrasePassiveSubscribeAcceptAnyTestActivity.java
@@ -28,6 +28,6 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ false, /* isUnsolicited */ true, /* usePmk */ false,
-                /* acceptAny */ false);
+                /* acceptAny */ false, /* forceChannel */false);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphrasePassiveSubscribeTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphrasePassiveSubscribeTestActivity.java
index 46413c3..f0f7b44 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphrasePassiveSubscribeTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphrasePassiveSubscribeTestActivity.java
@@ -28,6 +28,6 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ false, /* isUnsolicited */ true, /* usePmk */ false,
-                /* acceptAny */ false);
+                /* acceptAny */ false, /* forceChannel */false);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseSolicitedPublishAcceptAnyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseSolicitedPublishAcceptAnyTestActivity.java
index 2a24d85..188cfbd 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseSolicitedPublishAcceptAnyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseSolicitedPublishAcceptAnyTestActivity.java
@@ -30,7 +30,7 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ true, /* isUnsolicited */ false, /* usePmk */ false,
-                /* acceptAny */ true);
+                /* acceptAny */ true, /* forceChannel */false);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseSolicitedPublishTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseSolicitedPublishTestActivity.java
index 9c06b5d..114862d 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseSolicitedPublishTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseSolicitedPublishTestActivity.java
@@ -30,7 +30,7 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ true, /* isUnsolicited */ false, /* usePmk */ false,
-                /* acceptAny */ false);
+                /* acceptAny */ false, /* forceChannel */false);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseUnsolicitedPublishAcceptAnyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseUnsolicitedPublishAcceptAnyTestActivity.java
index 2616357..5ba364a0 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseUnsolicitedPublishAcceptAnyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseUnsolicitedPublishAcceptAnyTestActivity.java
@@ -30,7 +30,7 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ true, /* isUnsolicited */ true, /* usePmk */ false,
-                /* acceptAny */ true);
+                /* acceptAny */ true, /* forceChannel */false);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseUnsolicitedPublishTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseUnsolicitedPublishTestActivity.java
index 601f75b..1f5666f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseUnsolicitedPublishTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPassphraseUnsolicitedPublishTestActivity.java
@@ -30,7 +30,7 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ true, /* isUnsolicited */ true, /* usePmk */ false,
-                /* acceptAny */ false);
+                /* acceptAny */ false, /* forceChannel */false);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkActiveSubscribeAcceptAnyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkActiveSubscribeAcceptAnyTestActivity.java
index 136b296..0c8c494 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkActiveSubscribeAcceptAnyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkActiveSubscribeAcceptAnyTestActivity.java
@@ -28,6 +28,6 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ false, /* isUnsolicited */ false, /* usePmk */ true,
-                /* acceptAny */ false);
+                /* acceptAny */ false, /* forceChannel */false);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkActiveSubscribeTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkActiveSubscribeTestActivity.java
index 11c1e64..1fc76fc 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkActiveSubscribeTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkActiveSubscribeTestActivity.java
@@ -28,6 +28,6 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ false, /* isUnsolicited */ false, /* usePmk */ true,
-                /* acceptAny */ false);
+                /* acceptAny */ false, /* forceChannel */false);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkPassiveSubscribeAcceptAnyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkPassiveSubscribeAcceptAnyTestActivity.java
index 44cab45..b158720 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkPassiveSubscribeAcceptAnyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkPassiveSubscribeAcceptAnyTestActivity.java
@@ -28,6 +28,6 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ false, /* isUnsolicited */ true, /* usePmk */ true,
-                /* acceptAny */ false);
+                /* acceptAny */ false, /* forceChannel */false);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkPassiveSubscribeTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkPassiveSubscribeTestActivity.java
index 28f6c76..8cabd8f 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkPassiveSubscribeTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkPassiveSubscribeTestActivity.java
@@ -28,6 +28,6 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ false, /* isUnsolicited */ true, /* usePmk */ true,
-                /* acceptAny */ false);
+                /* acceptAny */ false, /* forceChannel */false);
     }
 }
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkSolicitedPublishAcceptAnyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkSolicitedPublishAcceptAnyTestActivity.java
index 69cdfd2..fc23c42 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkSolicitedPublishAcceptAnyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkSolicitedPublishAcceptAnyTestActivity.java
@@ -30,7 +30,7 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ true, /* isUnsolicited */ false, /* usePmk */ true,
-                /* acceptAny */ true);
+                /* acceptAny */ true, /* forceChannel */false);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkSolicitedPublishTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkSolicitedPublishTestActivity.java
index e0c0f29..d01fdbb 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkSolicitedPublishTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkSolicitedPublishTestActivity.java
@@ -30,7 +30,7 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ true, /* isUnsolicited */ false, /* usePmk */ true,
-                /* acceptAny */ false);
+                /* acceptAny */ false, /* forceChannel */false);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkUnsolicitedPublishAcceptAnyTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkUnsolicitedPublishAcceptAnyTestActivity.java
index 4c557e95..e4fc753 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkUnsolicitedPublishAcceptAnyTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkUnsolicitedPublishAcceptAnyTestActivity.java
@@ -30,7 +30,7 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ true, /* isUnsolicited */ true, /* usePmk */ true,
-                /* acceptAny */ true);
+                /* acceptAny */ true, /* forceChannel */false);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkUnsolicitedPublishTestActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkUnsolicitedPublishTestActivity.java
index a9154ec..68267eb 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkUnsolicitedPublishTestActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/DataPathPmkUnsolicitedPublishTestActivity.java
@@ -30,7 +30,7 @@
     protected BaseTestCase getTestCase(Context context) {
         return new DataPathInBandTestCase(context, /* isSecurityOpen */ false,
                 /* isPublish */ true, /* isUnsolicited */ true, /* usePmk */ true,
-                /* acceptAny */ false);
+                /* acceptAny */ false, /* forceChannel */false);
     }
 
     @Override
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/TestListActivity.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/TestListActivity.java
index b1b62bf..1e81992 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/TestListActivity.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/TestListActivity.java
@@ -232,6 +232,21 @@
                     R.string.aware_subscribe,
                     DataPathPmkActiveSubscribeAcceptAnyTestActivity.class.getName(),
                     new Intent(this, DataPathPmkActiveSubscribeAcceptAnyTestActivity.class), null));
+
+            if (mWifiAwareManager.isSetChannelOnDataPathSupported()) {
+                adapter.add(TestListAdapter.TestListItem.newCategory(this,
+                        R.string.aware_dp_ib_force_channel_setup));
+                adapter.add(TestListAdapter.TestListItem.newTest(this,
+                        R.string.aware_publish,
+                        DataPathForceChannelSetupPublishTestActivity.class.getName(),
+                        new Intent(this, DataPathForceChannelSetupPublishTestActivity.class),
+                        null));
+                adapter.add(TestListAdapter.TestListItem.newTest(this,
+                        R.string.aware_subscribe,
+                        DataPathForceChannelSetupSubscribeTestActivity.class.getName(),
+                        new Intent(this, DataPathForceChannelSetupSubscribeTestActivity.class),
+                        null));
+            }
         }
 
         adapter.registerDataSetObserver(new DataSetObserver() {
diff --git a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathInBandTestCase.java b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathInBandTestCase.java
index 737234a..06194fe 100644
--- a/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathInBandTestCase.java
+++ b/apps/CtsVerifier/src/com/android/cts/verifier/wifiaware/testcase/DataPathInBandTestCase.java
@@ -23,7 +23,10 @@
 import android.net.Network;
 import android.net.NetworkCapabilities;
 import android.net.NetworkRequest;
+import android.net.wifi.aware.Characteristics;
 import android.net.wifi.aware.PublishDiscoverySession;
+import android.net.wifi.aware.WifiAwareChannelInfo;
+import android.net.wifi.aware.WifiAwareDataPathSecurityConfig;
 import android.net.wifi.aware.WifiAwareNetworkInfo;
 import android.net.wifi.aware.WifiAwareNetworkSpecifier;
 import android.util.Log;
@@ -84,10 +87,13 @@
     private static final byte[] MSG_CLIENT_TO_SERVER = "GET SOME BYTES".getBytes();
     private static final byte[] MSG_SERVER_TO_CLIENT = "PUT SOME OTHER BYTES".getBytes();
 
+    private static final int CHANNEL_IN_MHZ = 2412;
+
     private boolean mIsSecurityOpen;
     private boolean mUsePmk;
     private boolean mIsPublish;
     private boolean mIsAcceptAny;
+    private boolean mForceChannel;
     private Thread mClientServerThread;
     private ConnectivityManager mCm;
     private CallbackUtils.NetworkCb mNetworkCb;
@@ -95,13 +101,14 @@
     private static int sSDKLevel = android.os.Build.VERSION.SDK_INT;
 
     public DataPathInBandTestCase(Context context, boolean isSecurityOpen, boolean isPublish,
-            boolean isUnsolicited, boolean usePmk, boolean acceptAny) {
+            boolean isUnsolicited, boolean usePmk, boolean acceptAny, boolean forceChannel) {
         super(context, isUnsolicited, false);
 
         mIsSecurityOpen = isSecurityOpen;
         mUsePmk = usePmk;
         mIsPublish = isPublish;
         mIsAcceptAny = acceptAny;
+        mForceChannel = forceChannel;
     }
 
     @Override
@@ -177,11 +184,28 @@
                 new WifiAwareNetworkSpecifier.Builder(mWifiAwareDiscoverySession, mPeerHandle);
         if (!mIsSecurityOpen) {
             if (mUsePmk) {
-                nsBuilder.setPmk(PMK);
+                nsBuilder.setDataPathSecurityConfig(
+                        new WifiAwareDataPathSecurityConfig
+                                .Builder(Characteristics.WIFI_AWARE_CIPHER_SUITE_NCS_SK_128)
+                                .setPmk(PMK)
+                                .build());
             } else {
                 nsBuilder.setPskPassphrase(PASSPHRASE);
             }
+            if (nsBuilder.build().getWifiAwareDataPathSecurityConfig() == null) {
+                Log.e(TAG, "executeTestSubscriber: no security config for secure request");
+                return false;
+            }
         }
+        if (mForceChannel) {
+            nsBuilder.setChannelFrequencyMhz(CHANNEL_IN_MHZ, true);
+            WifiAwareNetworkSpecifier ns = nsBuilder.build();
+            if (ns.getChannelFrequencyMhz() != CHANNEL_IN_MHZ || !ns.isChannelRequired()) {
+                Log.e(TAG, "executeTestSubscriber: channel configure for data-path is not match");
+                return false;
+            }
+        }
+
         NetworkRequest nr = new NetworkRequest.Builder().addTransportType(
                 NetworkCapabilities.TRANSPORT_WIFI_AWARE).setNetworkSpecifier(
                 nsBuilder.build()).build();
@@ -214,14 +238,40 @@
         mListener.onTestMsgReceived(mContext.getString(R.string.aware_status_network_success));
         if (DBG) Log.d(TAG, "executeTestSubscriber: network request granted - AVAILABLE");
 
-        if (!mIsSecurityOpen) {
-            if (!(info.second.getTransportInfo() instanceof WifiAwareNetworkInfo)) {
+        if (!(info.second.getTransportInfo() instanceof WifiAwareNetworkInfo)) {
+            setFailureReason(mContext.getString(R.string.aware_status_network_failed));
+            Log.e(TAG, "executeTestSubscriber: did not get WifiAwareNetworkInfo from peer!?");
+            return false;
+        }
+        WifiAwareNetworkInfo peerAwareInfo =
+                (WifiAwareNetworkInfo) info.second.getTransportInfo();
+        StringBuilder builder = new StringBuilder();
+        for (WifiAwareChannelInfo channelInfo : peerAwareInfo.getChannelInfoList()) {
+            builder.append(channelInfo.toString());
+        }
+        if (DBG) Log.d(TAG, "executeTestSubscriber: channelInfo:" + builder.toString());
+
+        if (mForceChannel) {
+            if (peerAwareInfo.getChannelInfoList().size() != 1) {
                 setFailureReason(mContext.getString(R.string.aware_status_network_failed));
-                Log.e(TAG, "executeTestSubscriber: did not get WifiAwareNetworkInfo from peer!?");
+                Log.e(TAG, "executeTestSubscriber: number of channel info is incorrect");
                 return false;
             }
-            WifiAwareNetworkInfo peerAwareInfo =
-                    (WifiAwareNetworkInfo) info.second.getTransportInfo();
+            WifiAwareChannelInfo channelInfo = peerAwareInfo.getChannelInfoList().get(0);
+            if (channelInfo.getChannelFrequencyMhz() != CHANNEL_IN_MHZ) {
+                setFailureReason(mContext.getString(R.string.aware_status_network_failed));
+                Log.e(TAG, "executeTestSubscriber: channel freq is not match the request");
+                return false;
+            }
+            if (DBG) {
+                Log.d(TAG, "executeTestSubscriber: ChannelFreqInMhz="
+                        + channelInfo.getChannelFrequencyMhz()
+                        + " ChannelBandWidth=" + channelInfo.getChannelBandwidth()
+                        + " NumSpatialStreams=" + channelInfo.getSpatialStreamCount());
+            }
+        }
+
+        if (!mIsSecurityOpen) {
             Inet6Address peerIpv6 = peerAwareInfo.getPeerIpv6Addr();
             int peerPort = peerAwareInfo.getPort();
             int peerTransportProtocol = peerAwareInfo.getTransportProtocol();
@@ -385,6 +435,14 @@
             }
             nsBuilder.setPort(port).setTransportProtocol(6); // 6 == TCP
         }
+        if (mForceChannel) {
+            nsBuilder.setChannelFrequencyMhz(CHANNEL_IN_MHZ, true);
+            WifiAwareNetworkSpecifier ns = nsBuilder.build();
+            if (ns.getChannelFrequencyMhz() != CHANNEL_IN_MHZ || !ns.isChannelRequired()) {
+                Log.e(TAG, "executeTestSubscriber: channel configure for data-path is not match");
+                return false;
+            }
+        }
         NetworkRequest nr = new NetworkRequest.Builder().addTransportType(
                 NetworkCapabilities.TRANSPORT_WIFI_AWARE).setNetworkSpecifier(
                 nsBuilder.build()).build();
diff --git a/apps/TileServiceApp/Android.bp b/apps/TileServiceApp/Android.bp
new file mode 100644
index 0000000..55038f3
--- /dev/null
+++ b/apps/TileServiceApp/Android.bp
@@ -0,0 +1,24 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsTileServiceApp",
+    srcs: ["src/**/*.java"],
+    sdk_version: "current",
+    min_sdk_version: "31",
+}
diff --git a/apps/TileServiceApp/AndroidManifest.xml b/apps/TileServiceApp/AndroidManifest.xml
new file mode 100644
index 0000000..be693b1
--- /dev/null
+++ b/apps/TileServiceApp/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2021 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.cts.tileserviceapp">
+
+    <uses-sdk android:minSdkVersion="31"/>
+
+    <application android:label="CtsTileServiceApp"
+         android:icon="@android:drawable/ic_dialog_alert">
+        <activity android:name=".TileRequestActivity"
+             android:exported="true">
+        </activity>
+
+        <service android:name=".RequestTileService"
+                 android:icon="@android:drawable/ic_dialog_alert"
+                 android:label="@string/tile_request_service_name"
+                 android:exported="true"
+                 android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE" />
+            </intent-filter>
+        </service>
+    </application>
+</manifest>
diff --git a/apps/TileServiceApp/OWNERS b/apps/TileServiceApp/OWNERS
new file mode 100644
index 0000000..3ae17a9
--- /dev/null
+++ b/apps/TileServiceApp/OWNERS
@@ -0,0 +1 @@
+include /apps/CtsVerifier/src/com/android/cts/verifier/qstiles/OWNERS
\ No newline at end of file
diff --git a/apps/TileServiceApp/res/values/strings.xml b/apps/TileServiceApp/res/values/strings.xml
new file mode 100755
index 0000000..79ef54e
--- /dev/null
+++ b/apps/TileServiceApp/res/values/strings.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="tile_request_service_name">Request Tile Service</string>
+</resources>
diff --git a/apps/TileServiceApp/src/com/android/cts/tileserviceapp/RequestTileService.java b/apps/TileServiceApp/src/com/android/cts/tileserviceapp/RequestTileService.java
new file mode 100644
index 0000000..6000c7b
--- /dev/null
+++ b/apps/TileServiceApp/src/com/android/cts/tileserviceapp/RequestTileService.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2021 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.cts.tileserviceapp;
+
+import android.service.quicksettings.TileService;
+
+/** TileService for test */
+public class RequestTileService extends TileService {
+}
diff --git a/apps/TileServiceApp/src/com/android/cts/tileserviceapp/TileRequestActivity.java b/apps/TileServiceApp/src/com/android/cts/tileserviceapp/TileRequestActivity.java
new file mode 100644
index 0000000..08f7806
--- /dev/null
+++ b/apps/TileServiceApp/src/com/android/cts/tileserviceapp/TileRequestActivity.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2021 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.cts.tileserviceapp;
+
+import android.app.Activity;
+import android.app.StatusBarManager;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.graphics.drawable.Icon;
+import android.os.Bundle;
+import android.util.Log;
+
+/**
+ * A simple activity that requests permissions and returns the result.
+ */
+public final class TileRequestActivity extends Activity {
+
+    private static final String TAG = "TileRequestActivity";
+    private String mTileLabel;
+    private StatusBarManager mStatusBarManager;
+    private Icon mIcon;
+
+    private ComponentName getTileComponentName() {
+        return new ComponentName(this, RequestTileService.class);
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mTileLabel = getString(R.string.tile_request_service_name);
+        mStatusBarManager = getSystemService(StatusBarManager.class);
+        mIcon = Icon.createWithResource(this, android.R.drawable.ic_dialog_alert);
+
+        final Intent received = getIntent();
+        Log.d(TAG, "Started with " + received);
+        requestTile();
+    }
+
+    private void requestTile() {
+        mStatusBarManager.requestAddTileService(
+                getTileComponentName(),
+                mTileLabel,
+                mIcon,
+                getMainExecutor(),
+                integer -> {
+                    setResult(integer);
+                    finish();
+                }
+        );
+    }
+}
diff --git a/apps/VpnApp/Android.bp b/apps/VpnApp/Android.bp
index 898f4bd..a6ee6e4 100644
--- a/apps/VpnApp/Android.bp
+++ b/apps/VpnApp/Android.bp
@@ -28,6 +28,7 @@
     defaults: ["CtsVpnAppDefaults"],
     manifest: "api23/AndroidManifest.xml",
     test_suites: [
+        "arcts",
         "cts",
         "general-tests",
     ],
@@ -38,6 +39,7 @@
     defaults: ["CtsVpnAppDefaults"],
     manifest: "api24/AndroidManifest.xml",
     test_suites: [
+        "arcts",
         "cts",
         "general-tests",
     ],
@@ -48,6 +50,7 @@
     defaults: ["CtsVpnAppDefaults"],
     manifest: "latest/AndroidManifest.xml",
     test_suites: [
+        "arcts",
         "cts",
         "general-tests",
     ],
@@ -58,6 +61,7 @@
     defaults: ["CtsVpnAppDefaults"],
     manifest: "notalwayson/AndroidManifest.xml",
     test_suites: [
+        "arcts",
         "cts",
         "general-tests",
     ],
diff --git a/apps/VpnApp/latest/AndroidManifest.xml b/apps/VpnApp/latest/AndroidManifest.xml
index 76c5e35..959ceda7 100644
--- a/apps/VpnApp/latest/AndroidManifest.xml
+++ b/apps/VpnApp/latest/AndroidManifest.xml
@@ -26,6 +26,7 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <action android:name="com.android.cts.vpnfirewall.action.CONNECT_AND_FINISH"/>
+                <action android:name="com.android.cts.vpnfirewall.action.DISCONNECT_AND_FINISH"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
diff --git a/build/device_info_package.mk b/build/device_info_package.mk
index 6afa622..d901a7a 100644
--- a/build/device_info_package.mk
+++ b/build/device_info_package.mk
@@ -34,6 +34,8 @@
   $(DEVICE_INFO_PACKAGE).GenericDeviceInfo \
   $(DEVICE_INFO_PACKAGE).GlesStubActivity \
   $(DEVICE_INFO_PACKAGE).GraphicsDeviceInfo \
+  $(DEVICE_INFO_PACKAGE).HapticsDeviceInfo \
+  $(DEVICE_INFO_PACKAGE).InputDeviceInfo \
   $(DEVICE_INFO_PACKAGE).LocaleDeviceInfo \
   $(DEVICE_INFO_PACKAGE).MediaDeviceInfo \
   $(DEVICE_INFO_PACKAGE).MemoryDeviceInfo \
diff --git a/common/device-side/bedstead/activitycontext/src/main/java/com/android/activitycontext/ActivityContext.java b/common/device-side/bedstead/activitycontext/src/main/java/com/android/activitycontext/ActivityContext.java
index d892597..a77ad9b 100644
--- a/common/device-side/bedstead/activitycontext/src/main/java/com/android/activitycontext/ActivityContext.java
+++ b/common/device-side/bedstead/activitycontext/src/main/java/com/android/activitycontext/ActivityContext.java
@@ -30,6 +30,7 @@
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.exceptions.NeneException;
 import com.android.bedstead.nene.users.UserReference;
+import com.android.compatibility.common.util.BlockingCallback;
 import com.android.compatibility.common.util.ShellIdentityUtils.QuadFunction;
 import com.android.compatibility.common.util.ShellIdentityUtils.TriFunction;
 
@@ -47,15 +48,61 @@
  */
 public class ActivityContext extends Activity {
 
+    /** Stores the request code, result code, and intent of an activity result. */
+    public static final class ActivityResult {
+        private final int mRequestCode;
+        private final int mResultCode;
+        private final Intent mIntent;
+
+        public ActivityResult(int requestCode, int resultCode, Intent intent) {
+            mRequestCode = requestCode;
+            mResultCode = resultCode;
+            mIntent = intent;
+        }
+
+        public int getRequestCode() {
+            return mRequestCode;
+        }
+
+        public int getResultCode() {
+            return mResultCode;
+        }
+
+        public Intent getIntent() {
+            return mIntent;
+        }
+    }
+
+    private static final class BlockingCallbackImpl extends BlockingCallback<ActivityResult> {
+        public void set(ActivityResult result) {
+            callbackTriggered(result);
+        }
+    }
+
     private static final String LOG_TAG = "ActivityContext";
     private static final Context sContext =
             InstrumentationRegistry.getInstrumentation().getContext();
 
-    private static Function<Activity, ?> sRunnable;
+    private static Function<ActivityContext, ?> sRunnable;
+    private static ActivityContext sActivityContext;
     private static @Nullable Object sReturnValue;
     private static @Nullable Object sThrowValue;
     private static CountDownLatch sLatch;
 
+    private static BlockingCallbackImpl sGetActivityCallback = new BlockingCallbackImpl();
+
+    /**
+     * Blocks the current thread until a result is set by an activity started by this activity, then
+     * returns that result.
+     */
+    public ActivityResult blockForActivityResult() throws InterruptedException {
+        try {
+            return sGetActivityCallback.await();
+        } finally {
+            sGetActivityCallback = new BlockingCallbackImpl();
+        }
+    }
+
     /**
      * Run some code using an Activity {@link Context}.
      *
@@ -68,7 +115,123 @@
      * <p>This method will block until the callback has been executed. It will return the same value
      * as returned by the callback.
      */
-    public static <E> E getWithContext(Function<Activity, E> runnable) throws InterruptedException {
+    public static <E> E getWithContext(Function<ActivityContext, E> runnable)
+            throws InterruptedException {
+        return getWithContextInternal(runnable, null);
+    }
+
+    /**
+     * As {@link #getWithContext(Function)}, and also accepts a callback {@code blocking} will be
+     * called before returning, so it can block the thread until some condition is met.
+     */
+    public static <E> E getWithContext(Function<ActivityContext, E> runnable,
+            Consumer<ActivityContext> blocking)
+            throws InterruptedException {
+        return getWithContextInternal(runnable, blocking);
+    }
+
+    /** {@link #getWithContext(Function)} which does not return a value. */
+    public static void runWithContext(Consumer<ActivityContext> runnable)
+            throws InterruptedException {
+        getWithContext((inContext) -> {
+            runnable.accept(inContext);
+            return null;
+        });
+    }
+
+    /**
+     * {@link #getWithContext(Function, Consumer)} which does not return a value, and also accepts a
+     * callback {@code blocking} will be called before returning, so it can block the thread until
+     * some condition is met.
+     */
+    public static void runWithContext(Consumer<ActivityContext> runnable,
+            Consumer<ActivityContext> blocking) throws InterruptedException {
+        getWithContext((inContext) -> {
+            runnable.accept(inContext);
+            return null;
+        }, blocking);
+    }
+
+    /** {@link #getWithContext(Function)} with an additional argument. */
+    public static <E, F> F getWithContext(E arg1,
+            BiFunction<ActivityContext, E, F> runnable) throws InterruptedException {
+        return getWithContext((inContext) -> runnable.apply(inContext, arg1));
+    }
+
+    /**
+     * {@link #getWithContext(Function, Consumer)} with an additional argument, and also accepts a
+     * callback {@code blocking} will be called before returning, so it can block the thread until
+     * some condition is met.
+     */
+    public static <E, F> F getWithContext(E arg1,
+            BiFunction<ActivityContext, E, F> runnable,
+            Consumer<ActivityContext> blocking) throws InterruptedException {
+        return getWithContext((inContext) -> runnable.apply(inContext, arg1), blocking);
+    }
+
+    /**
+     * {@link #getWithContext(Function)} which takes an additional argument and does not
+     * return a value.
+     */
+    public static <E> void runWithContext(E arg1, BiConsumer<ActivityContext, E> runnable)
+            throws InterruptedException {
+        getWithContext((inContext) -> {
+            runnable.accept(inContext, arg1);
+            return null;
+        });
+    }
+
+    /**
+     * {@link #getWithContext(Function, Consumer)} which takes an additional argument and does not
+     * return a value, and also accepts a callback {@code blocking} will be called before returning,
+     * so it can block the thread until some condition is met.
+     */
+    public static <E> void runWithContext(E arg1, BiConsumer<ActivityContext, E> runnable,
+            Consumer<ActivityContext> blocking)
+            throws InterruptedException {
+        getWithContext((inContext) -> {
+            runnable.accept(inContext, arg1);
+            return null;
+        }, blocking);
+    }
+
+    /** {@link #getWithContext(Function)} with two additional arguments. */
+    public static <E, F, G> G getWithContext(E arg1, F arg2,
+            TriFunction<ActivityContext, E, F, G> runnable) throws InterruptedException {
+        return getWithContext((inContext) -> runnable.apply(inContext, arg1, arg2));
+    }
+
+    /**
+     * {@link #getWithContext(Function, Consumer)} with two additional arguments, and also accepts a
+     * callback {@code blocking} will be called before returning, so it can block the thread until
+     * some condition is met.
+     */
+    public static <E, F, G> G getWithContext(E arg1, F arg2,
+            TriFunction<ActivityContext, E, F, G> runnable,
+            Consumer<ActivityContext> blocking) throws InterruptedException {
+        return getWithContext((inContext) -> runnable.apply(inContext, arg1, arg2), blocking);
+    }
+
+    /** {@link #getWithContext(Function)} with three additional arguments. */
+    public static <E, F, G, H> H getWithContext(E arg1, F arg2, G arg3,
+            QuadFunction<ActivityContext, E, F, G, H> runnable) throws InterruptedException {
+        return getWithContext((inContext) -> runnable.apply(inContext, arg1, arg2, arg3));
+    }
+
+    /**
+     * {@link #getWithContext(Function, Consumer)} with three additional arguments, and also accepts
+     * a callback {@code blocking} will be called before returning, so it can block the thread until
+     * some condition is met.
+     */
+    public static <E, F, G, H> H getWithContext(E arg1, F arg2, G arg3,
+            QuadFunction<ActivityContext, E, F, G, H> runnable,
+            Consumer<ActivityContext> blocking) throws InterruptedException {
+        return getWithContext((inContext) -> runnable.apply(inContext, arg1, arg2, arg3), blocking);
+    }
+
+    private static <E> E getWithContextInternal(Function<ActivityContext, E> runnable,
+            @Nullable Consumer<ActivityContext> blocking)
+            throws InterruptedException {
         if (runnable == null) {
             throw new NullPointerException();
         }
@@ -105,8 +268,13 @@
                         + " complete.");
             }
 
+            if (blocking != null) {
+                blocking.accept(sActivityContext);
+            }
+
             synchronized (ActivityContext.class) {
                 sRunnable = null;
+                sActivityContext = null;
 
                 if (sThrowValue != null) {
                     if (sThrowValue instanceof RuntimeException) {
@@ -127,42 +295,11 @@
         }
     }
 
-    /** {@link #getWithContext(Function)} which does not return a value. */
-    public static void runWithContext(Consumer<Activity> runnable) throws InterruptedException {
-        getWithContext((inContext) -> {runnable.accept(inContext); return null; });
-    }
-
-    /** {@link #getWithContext(Function)} with an additional argument. */
-    public static <E, F> F getWithContext(E arg1,
-            BiFunction<Activity, E, F> runnable) throws InterruptedException {
-        return getWithContext((inContext) -> runnable.apply(inContext, arg1));
-    }
-
-    /**
-     * {@link #getWithContext(Function)} which takes an additional argument and does not
-     * return a value.
-     */
-    public static <E> void runWithContext(E arg1, BiConsumer<Activity, E> runnable)
-            throws InterruptedException {
-        getWithContext((inContext) -> {runnable.accept(inContext, arg1); return null; });
-    }
-
-    /** {@link #getWithContext(Function)} with two additional arguments. */
-    public static <E, F, G> G getWithContext(E arg1, F arg2,
-            TriFunction<Activity, E, F, G> runnable) throws InterruptedException {
-        return getWithContext((inContext) -> runnable.apply(inContext, arg1, arg2));
-    }
-
-    /** {@link #getWithContext(Function)} with three additional arguments. */
-    public static <E, F, G, H> H getWithContext(E arg1, F arg2, G arg3,
-            QuadFunction<Activity, E, F, G, H> runnable) throws InterruptedException {
-        return getWithContext((inContext) -> runnable.apply(inContext, arg1, arg2, arg3));
-    }
-
     @Override
     protected void onResume() {
         super.onResume();
         synchronized (ActivityContext.class) {
+            sActivityContext = this;
             if (sRunnable == null) {
                 Log.e(LOG_TAG, "Launched ActivityContext without runnable");
             } else {
@@ -175,4 +312,10 @@
             }
         }
     }
+
+    @Override
+    // TODO(b/198280332): Remove this temporary solution to set return values for methods
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        sGetActivityCallback.set(new ActivityResult(requestCode, resultCode, data));
+    }
 }
diff --git a/common/device-side/bedstead/activitycontext/src/test/java/com/android/activitycontext/ActivityContextTest.java b/common/device-side/bedstead/activitycontext/src/test/java/com/android/activitycontext/ActivityContextTest.java
index cf765b7..961923a 100644
--- a/common/device-side/bedstead/activitycontext/src/test/java/com/android/activitycontext/ActivityContextTest.java
+++ b/common/device-side/bedstead/activitycontext/src/test/java/com/android/activitycontext/ActivityContextTest.java
@@ -20,8 +20,6 @@
 
 import static org.testng.Assert.assertThrows;
 
-import android.app.Activity;
-
 import com.android.activitycontext.annotations.RunWhenInstrumentingOtherApp;
 import com.android.compatibility.common.util.BlockingCallback;
 
@@ -138,9 +136,9 @@
     }
 
     private static final class BlockingActivityConsumer extends BlockingCallback<Boolean> implements
-            Consumer<Activity> {
+            Consumer<ActivityContext> {
         @Override
-        public void accept(Activity activity) {
+        public void accept(ActivityContext activity) {
             callbackTriggered(activity != null);
         }
     }
@@ -156,9 +154,9 @@
     }
 
     private static final class BlockingActivityBiConsumerChecksActivity
-            extends BlockingCallback<Boolean> implements BiConsumer<Activity, String> {
+            extends BlockingCallback<Boolean> implements BiConsumer<ActivityContext, String> {
         @Override
-        public void accept(Activity activity, String s) {
+        public void accept(ActivityContext activity, String s) {
             callbackTriggered(activity != null);
         }
     }
@@ -199,9 +197,9 @@
     }
 
     private static final class BlockingActivityBiConsumerReturnsFirstArgument
-            extends BlockingCallback<String> implements BiConsumer<Activity, String> {
+            extends BlockingCallback<String> implements BiConsumer<ActivityContext, String> {
         @Override
-        public void accept(Activity activity, String s) {
+        public void accept(ActivityContext activity, String s) {
             callbackTriggered(s);
         }
     }
diff --git a/common/device-side/bedstead/deviceadminapp/src/main/AndroidManifest.xml b/common/device-side/bedstead/deviceadminapp/src/main/AndroidManifest.xml
index 35b0796..c880395 100644
--- a/common/device-side/bedstead/deviceadminapp/src/main/AndroidManifest.xml
+++ b/common/device-side/bedstead/deviceadminapp/src/main/AndroidManifest.xml
@@ -19,7 +19,7 @@
           package="com.android.bedstead.deviceadminapp"
           android:targetSandboxVersion="2">
 
-    <application android:testOnly="true">
+    <application>
         <receiver android:name="com.android.eventlib.premade.EventLibDeviceAdminReceiver"
                   android:permission="android.permission.BIND_DEVICE_ADMIN"
                   android:exported="true">
@@ -29,5 +29,27 @@
                 <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
             </intent-filter>
         </receiver>
+
+        <receiver android:name="com.android.eventlib.premade.EventLibDelegatedAdminReceiver"
+                  android:permission="android.permission.BIND_DEVICE_ADMIN"
+                  android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.app.action.CHOOSE_PRIVATE_KEY_ALIAS"/>
+                <action android:name="android.app.action.NETWORK_LOGS_AVAILABLE"/>
+                <action android:name="android.app.action.SECURITY_LOGS_AVAILABLE"/>
+            </intent-filter>
+        </receiver>
+
+        <receiver android:name="com.android.eventlib.premade.EventLibDelegatedAdminReceiver"
+                  android:permission="android.permission.BIND_DEVICE_ADMIN"
+                  android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.app.action.CHOOSE_PRIVATE_KEY_ALIAS"/>
+                <action android:name="android.app.action.NETWORK_LOGS_AVAILABLE"/>
+                <action android:name="android.app.action.SECURITY_LOGS_AVAILABLE"/>
+            </intent-filter>
+        </receiver>
     </application>
 </manifest>
diff --git a/common/device-side/bedstead/deviceadminapp/src/main/java/com/android/bedstead/deviceadminapp/DeviceAdminApp.java b/common/device-side/bedstead/deviceadminapp/src/main/java/com/android/bedstead/deviceadminapp/DeviceAdminApp.java
index 4312217..acfe7f9 100644
--- a/common/device-side/bedstead/deviceadminapp/src/main/java/com/android/bedstead/deviceadminapp/DeviceAdminApp.java
+++ b/common/device-side/bedstead/deviceadminapp/src/main/java/com/android/bedstead/deviceadminapp/DeviceAdminApp.java
@@ -16,10 +16,12 @@
 
 package com.android.bedstead.deviceadminapp;
 
+import android.app.admin.DelegatedAdminReceiver;
 import android.app.admin.DeviceAdminReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 
+import com.android.eventlib.premade.EventLibDelegatedAdminReceiver;
 import com.android.eventlib.premade.EventLibDeviceAdminReceiver;
 
 /**
@@ -32,4 +34,10 @@
         return new ComponentName(
                 context.getPackageName(), EventLibDeviceAdminReceiver.class.getName());
     }
+
+    /** Get the {@link ComponentName} for the {@link DelegatedAdminReceiver} subclass. */
+    public static ComponentName delegatedAdminComponentName(Context context) {
+        return new ComponentName(
+                context.getPackageName(), EventLibDelegatedAdminReceiver.class.getName());
+    }
 }
diff --git a/common/device-side/bedstead/dpmwrapper/src/main/java/com/android/bedstead/dpmwrapper/DevicePolicyManagerWrapper.java b/common/device-side/bedstead/dpmwrapper/src/main/java/com/android/bedstead/dpmwrapper/DevicePolicyManagerWrapper.java
index 9e3a9b1..3890095 100644
--- a/common/device-side/bedstead/dpmwrapper/src/main/java/com/android/bedstead/dpmwrapper/DevicePolicyManagerWrapper.java
+++ b/common/device-side/bedstead/dpmwrapper/src/main/java/com/android/bedstead/dpmwrapper/DevicePolicyManagerWrapper.java
@@ -269,11 +269,6 @@
             // Used by BlockUninstallDelegateTest
             doAnswer(answer).when(spy).isUninstallBlocked(any(), any());
 
-            // Used by CertInstallDelegateTest
-            doAnswer(answer).when(spy).hasCaCertInstalled(any(), any());
-            doAnswer(answer).when(spy).getInstalledCaCerts(any());
-            doAnswer(answer).when(spy).installKeyPair(any(), any(), any(), any());
-
             // Used By DelegationTest
             doAnswer(answer).when(spy).getDelegatePackages(any(), any());
 
diff --git a/common/device-side/bedstead/dpmwrapper/src/main/java/com/android/bedstead/dpmwrapper/IpcBroadcastReceiver.java b/common/device-side/bedstead/dpmwrapper/src/main/java/com/android/bedstead/dpmwrapper/IpcBroadcastReceiver.java
index b2d51f8..3f8b590 100644
--- a/common/device-side/bedstead/dpmwrapper/src/main/java/com/android/bedstead/dpmwrapper/IpcBroadcastReceiver.java
+++ b/common/device-side/bedstead/dpmwrapper/src/main/java/com/android/bedstead/dpmwrapper/IpcBroadcastReceiver.java
@@ -32,6 +32,10 @@
    <pre><code>
    <receiver android:name="com.android.bedstead.dpmwrapper.IpcBroadcastReceiver"
              android:exported="true">
+     <intent-filter>
+       <action android:name="com.android.bedstead.dpmwrapper.action.WRAPPED_MANAGER_CALL"/>
+     </intent-filter>
+   </receiver>
    </code></pre>
  */
 // TODO(b/176993670): remove when DpmWrapper IPC mechanism changes
diff --git a/common/device-side/bedstead/dpmwrapper/src/main/java/com/android/bedstead/dpmwrapper/TestAppSystemServiceFactory.java b/common/device-side/bedstead/dpmwrapper/src/main/java/com/android/bedstead/dpmwrapper/TestAppSystemServiceFactory.java
index 218610ea..f1fbf40 100644
--- a/common/device-side/bedstead/dpmwrapper/src/main/java/com/android/bedstead/dpmwrapper/TestAppSystemServiceFactory.java
+++ b/common/device-side/bedstead/dpmwrapper/src/main/java/com/android/bedstead/dpmwrapper/TestAppSystemServiceFactory.java
@@ -317,7 +317,8 @@
                 case RESULT_NOT_SENT_TO_ANY_RECEIVER:
                     fail("Didn't receive result from ordered broadcast - did you override "
                             + receiverClassName + ".onReceive() to call "
-                            + "DeviceOwnerHelper.runManagerMethod()?");
+                            + "DeviceOwnerHelper.runManagerMethod()? Did you add "
+                            + ACTION_WRAPPED_MANAGER_CALL + " to its intent filter / manifest?");
                     return null;
                 default:
                     fail("Received invalid result for method %s: %s", methodName, result);
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/Events.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/Events.java
index e2a4c84..cbc83a4 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/Events.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/Events.java
@@ -38,7 +38,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /** Event store for the current package. */
-class Events {
+final class Events {
 
     private static final String TAG = "EventLibEvents";
     private static final String EVENT_LOG_FILE_NAME = "Events";
@@ -87,28 +87,30 @@
     }
 
     private void loadEventsFromFile() {
-        mEventList.clear();
-        Instant now = Instant.now();
-        Deque<Event> eventQueue = new ArrayDeque<>();
-        try (FileInputStream fileInputStream = mContext.openFileInput(EVENT_LOG_FILE_NAME)) {
-            Event event = readEvent(fileInputStream);
+        synchronized (mEventList) {
+            mEventList.clear();
+            Instant now = Instant.now();
+            Deque<Event> eventQueue = new ArrayDeque<>();
+            try (FileInputStream fileInputStream = mContext.openFileInput(EVENT_LOG_FILE_NAME)) {
+                Event event = readEvent(fileInputStream);
 
-            while (event != null) {
-                // I'm not sure if we need this
-                if (event.mTimestamp.plus(MAX_LOG_AGE).isAfter(now)) {
-                    eventQueue.addFirst(event);
+                while (event != null) {
+                    // I'm not sure if we need this
+                    if (event.mTimestamp.plus(MAX_LOG_AGE).isAfter(now)) {
+                        eventQueue.addFirst(event);
+                    }
+                    event = readEvent(fileInputStream);
                 }
-                event = readEvent(fileInputStream);
-            }
 
-            for (Event e : eventQueue) {
-                mEventList.addFirst(e);
+                for (Event e : eventQueue) {
+                    mEventList.addFirst(e);
+                }
+            } catch (FileNotFoundException e) {
+                // Ignore this exception as if there's no file there's nothing to load
+                Log.i(TAG, "No existing event file");
+            } catch (IOException e) {
+                Log.e(TAG, "Error when loading events from file", e);
             }
-        } catch (FileNotFoundException e) {
-            // Ignore this exception as if there's no file there's nothing to load
-            Log.i(TAG, "No existing event file");
-        } catch (IOException e) {
-            Log.e(TAG, "Error when loading events from file", e);
         }
     }
 
@@ -163,13 +165,17 @@
 
     /** Get all logged events. */
     public Queue<Event> getEvents() {
-            return mEventList;
+        return mEventList;
     }
 
     /** Register an {@link EventListener} to be called when a new {@link Event} is logged. */
-    public void registerEventListener(EventListener listener) {
-        synchronized (mEventListeners) {
-            mEventListeners.add(listener);
+    public Queue<Event> registerEventListener(EventListener listener) {
+        synchronized (mEventList) {
+            synchronized (mEventListeners) {
+                mEventListeners.add(listener);
+
+                return getEvents();
+            }
         }
     }
 
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/LocalEventQuerier.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/LocalEventQuerier.java
index 1b51899..c1be192 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/LocalEventQuerier.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/LocalEventQuerier.java
@@ -36,8 +36,7 @@
     LocalEventQuerier(Context context, EventLogsQuery<E, F> eventLogsQuery) {
         mEventLogsQuery = eventLogsQuery;
         mEvents = Events.getInstance(context, /* needsHistory= */ true);
-        mFetchedEvents = new LinkedBlockingDeque<>(mEvents.getEvents());
-        mEvents.registerEventListener(this);
+        mFetchedEvents = new LinkedBlockingDeque<>(mEvents.registerEventListener(this));
     }
 
     @Override
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityCreatedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityCreatedEvent.java
index 77b14e1..93adf48 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityCreatedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityCreatedEvent.java
@@ -29,6 +29,8 @@
 import com.android.queryable.queries.ActivityQuery;
 import com.android.queryable.queries.ActivityQueryHelper;
 import com.android.queryable.queries.BundleQueryHelper;
+import com.android.queryable.queries.IntegerQuery;
+import com.android.queryable.queries.IntegerQueryHelper;
 import com.android.queryable.queries.PersistableBundleQuery;
 import com.android.queryable.queries.PersistableBundleQueryHelper;
 import com.android.queryable.util.SerializableParcelWrapper;
@@ -57,6 +59,7 @@
                 new BundleQueryHelper<>(this);
         PersistableBundleQueryHelper<ActivityCreatedEventQuery> mPersistentState =
                 new PersistableBundleQueryHelper<>(this);
+        IntegerQuery<ActivityCreatedEventQuery> mTaskId = new IntegerQueryHelper<>(this);
 
         private ActivityCreatedEventQuery(String packageName) {
             super(ActivityCreatedEvent.class, packageName);
@@ -87,6 +90,12 @@
             return mActivity;
         }
 
+        /** Query {@code taskId}. */
+        @CheckResult
+        public IntegerQuery<ActivityCreatedEventQuery> whereTaskId() {
+            return mTaskId;
+        }
+
         @Override
         protected boolean filter(ActivityCreatedEvent event) {
             if (!mSavedInstanceState.matches(event.mSavedInstanceState)) {
@@ -98,6 +107,9 @@
             if (!mActivity.matches(event.mActivity)) {
                 return false;
             }
+            if (!mTaskId.matches(event.mTaskId)) {
+                return false;
+            }
             return true;
         }
 
@@ -107,6 +119,7 @@
                     .field("savedInstanceState", mSavedInstanceState)
                     .field("persistentState", mPersistentState)
                     .field("activity", mActivity)
+                    .field("taskId", mTaskId)
                     .toString();
         }
     }
@@ -120,7 +133,8 @@
     public static final class ActivityCreatedEventLogger extends EventLogger<ActivityCreatedEvent> {
         private ActivityCreatedEventLogger(Activity activity, android.content.pm.ActivityInfo activityInfo, Bundle savedInstanceState) {
             super(activity, new ActivityCreatedEvent());
-            mEvent.mSavedInstanceState = new SerializableParcelWrapper<>(savedInstanceState);
+            setSavedInstanceState(savedInstanceState);
+            setTaskId(activity.getTaskId());
             setActivity(activityInfo);
         }
 
@@ -141,11 +155,18 @@
             mEvent.mPersistentState = new SerializableParcelWrapper<>(persistentState);
             return this;
         }
+
+        /** Sets the task ID for the activity. */
+        public ActivityCreatedEventLogger setTaskId(int taskId) {
+            mEvent.mTaskId = taskId;
+            return this;
+        }
     }
 
     protected SerializableParcelWrapper<Bundle> mSavedInstanceState;
     protected SerializableParcelWrapper<PersistableBundle> mPersistentState;
     protected ActivityInfo mActivity;
+    protected int mTaskId;
 
     /**
      * The {@code savedInstanceState} {@link Bundle} passed into
@@ -175,12 +196,18 @@
         return mActivity;
     }
 
+    /** The Task ID of the Activity. */
+    public int taskId() {
+        return mTaskId;
+    }
+
     @Override
     public String toString() {
         return "ActivityCreatedEvent{"
                 + " savedInstanceState=" + savedInstanceState()
                 + ", persistentState=" + persistentState()
                 + ", activity=" + mActivity
+                + ", taskId=" + mTaskId
                 + ", packageName='" + mPackageName + "'"
                 + ", timestamp=" + mTimestamp
                 + "}";
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityDestroyedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityDestroyedEvent.java
index 8f79655..74e4782 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityDestroyedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityDestroyedEvent.java
@@ -26,6 +26,8 @@
 import com.android.queryable.info.ActivityInfo;
 import com.android.queryable.queries.ActivityQuery;
 import com.android.queryable.queries.ActivityQueryHelper;
+import com.android.queryable.queries.IntegerQuery;
+import com.android.queryable.queries.IntegerQueryHelper;
 
 /**
  * Event logged when {@link Activity#onDestroy()} is called.
@@ -47,6 +49,7 @@
 
         ActivityQueryHelper<ActivityDestroyedEventQuery> mActivity =
                 new ActivityQueryHelper<>(this);
+        IntegerQuery<ActivityDestroyedEventQuery> mTaskId = new IntegerQueryHelper<>(this);
 
         private ActivityDestroyedEventQuery(String packageName) {
             super(ActivityDestroyedEvent.class, packageName);
@@ -58,11 +61,20 @@
             return mActivity;
         }
 
+        /** Query {@code taskId}. */
+        @CheckResult
+        public IntegerQuery<ActivityDestroyedEventQuery> whereTaskId() {
+            return mTaskId;
+        }
+
         @Override
         protected boolean filter(ActivityDestroyedEvent event) {
             if (!mActivity.matches(event.mActivity)) {
                 return false;
             }
+            if (!mTaskId.matches(event.mTaskId)) {
+                return false;
+            }
             return true;
         }
 
@@ -70,6 +82,7 @@
         public String describeQuery(String fieldName) {
             return toStringBuilder(ActivityDestroyedEvent.class, this)
                     .field("activity", mActivity)
+                    .field("taskId", mTaskId)
                     .toString();
         }
     }
@@ -85,6 +98,7 @@
         private ActivityDestroyedEventLogger(Activity activity, android.content.pm.ActivityInfo activityInfo) {
             super(activity, new ActivityDestroyedEvent());
             setActivity(activityInfo);
+            setTaskId(activity.getTaskId());
         }
 
         /** Sets the {@link Activity} being destroyed. */
@@ -92,19 +106,32 @@
             mEvent.mActivity = ActivityInfo.builder(activity).build();
             return this;
         }
+
+        /** Sets the task ID for the activity. */
+        public ActivityDestroyedEventLogger setTaskId(int taskId) {
+            mEvent.mTaskId = taskId;
+            return this;
+        }
     }
 
     protected ActivityInfo mActivity;
+    protected int mTaskId;
 
     /** Information about the {@link Activity} destroyed. */
     public ActivityInfo activity() {
         return mActivity;
     }
 
+    /** The Task ID of the Activity. */
+    public int taskId() {
+        return mTaskId;
+    }
+
     @Override
     public String toString() {
         return "ActivityDestroyedEvent{"
                 + ", activity=" + mActivity
+                + ", taskId=" + mTaskId
                 + ", packageName='" + mPackageName + "'"
                 + ", timestamp=" + mTimestamp
                 + "}";
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityEvents.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityEvents.java
index 3b16eb39..9da4a70 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityEvents.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityEvents.java
@@ -16,8 +16,12 @@
 
 package com.android.eventlib.events.activities;
 
+import android.content.ComponentName;
+
+import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.activities.Activity;
 import com.android.bedstead.nene.activities.NeneActivity;
+import com.android.bedstead.nene.users.UserReference;
 
 /**
  * Quick access to event queries about activities.
@@ -33,6 +37,16 @@
         return new ActivityEventsImpl(activity.activity());
     }
 
+    /** Access events for activity on the instrumented user. */
+    static ActivityEvents forActivity(ComponentName componentName) {
+        return forActivity(componentName, TestApis.users().instrumented());
+    }
+
+    /** Access events for activity. */
+    static ActivityEvents forActivity(ComponentName componentName, UserReference user) {
+        return new ActivityEventsImpl(componentName, user.userHandle());
+    }
+
     /**
      * Query for when an activity is created.
      *
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityEventsImpl.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityEventsImpl.java
index 1baef2f..ca070df 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityEventsImpl.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityEventsImpl.java
@@ -16,77 +16,82 @@
 
 package com.android.eventlib.events.activities;
 
+import android.content.ComponentName;
+import android.os.UserHandle;
+
 import com.android.bedstead.nene.activities.NeneActivity;
 
 /** Default implementation of {@link ActivityEvents}. */
 public final class ActivityEventsImpl implements ActivityEvents {
-    private final NeneActivity mActivity;
+    private final ComponentName mComponentName;
+    private final UserHandle mUser;
 
     ActivityEventsImpl(NeneActivity activity) {
-        mActivity = activity;
+        mComponentName = activity.getComponentName();
+        mUser = activity.getUser();
+    }
+
+    ActivityEventsImpl(ComponentName componentName, UserHandle user) {
+        mComponentName = componentName;
+        mUser = user;
     }
 
     @Override
     public ActivityCreatedEvent.ActivityCreatedEventQuery activityCreated() {
-        return ActivityCreatedEvent.queryPackage(
-                mActivity.getComponentName().getPackageName())
+        return ActivityCreatedEvent.queryPackage(mComponentName.getPackageName())
                 .whereActivity().activityClass().className().isEqualTo(
-                        mActivity.getComponentName().getClassName())
-                .onUser(mActivity.getUser());
+                        mComponentName.getClassName())
+                .onUser(mUser);
     }
 
     @Override
     public ActivityDestroyedEvent.ActivityDestroyedEventQuery activityDestroyed() {
-        return ActivityDestroyedEvent.queryPackage(
-                mActivity.getComponentName().getPackageName())
+        return ActivityDestroyedEvent.queryPackage(mComponentName.getPackageName())
                 .whereActivity().activityClass().className().isEqualTo(
-                        mActivity.getComponentName().getClassName())
-                .onUser(mActivity.getUser());
+                        mComponentName.getClassName())
+                .onUser(mUser);
     }
 
     @Override
     public ActivityPausedEvent.ActivityPausedEventQuery activityPaused() {
-        return ActivityPausedEvent.queryPackage(
-                mActivity.getComponentName().getPackageName())
+        return ActivityPausedEvent.queryPackage(mComponentName.getPackageName())
                 .whereActivity().activityClass().className().isEqualTo(
-                        mActivity.getComponentName().getClassName())
-                .onUser(mActivity.getUser());
+                        mComponentName.getClassName())
+                .onUser(mUser);
     }
 
     @Override
     public ActivityRestartedEvent.ActivityRestartedEventQuery activityRestarted() {
-        return ActivityRestartedEvent.queryPackage(
-                mActivity.getComponentName().getPackageName())
+        return ActivityRestartedEvent.queryPackage(mComponentName.getPackageName())
                 .whereActivity().activityClass().className().isEqualTo(
-                        mActivity.getComponentName().getClassName())
-                .onUser(mActivity.getUser());
+                        mComponentName.getClassName())
+                .onUser(mUser);
     }
 
     @Override
     public ActivityResumedEvent.ActivityResumedEventQuery activityResumed() {
-        return ActivityResumedEvent.queryPackage(
-                mActivity.getComponentName().getPackageName())
+        return ActivityResumedEvent.queryPackage(mComponentName.getPackageName())
                 .whereActivity().activityClass().className().isEqualTo(
-                        mActivity.getComponentName().getClassName())
-                .onUser(mActivity.getUser());
+                        mComponentName.getClassName())
+                .onUser(mUser);
     }
 
     @Override
     public ActivityStartedEvent.ActivityStartedEventQuery activityStarted() {
         return ActivityStartedEvent.queryPackage(
-                mActivity.getComponentName().getPackageName())
+                mComponentName.getPackageName())
                 .whereActivity().activityClass().className().isEqualTo(
-                        mActivity.getComponentName().getClassName())
-                .onUser(mActivity.getUser());
+                        mComponentName.getClassName())
+                .onUser(mUser);
     }
 
     @Override
     public ActivityStoppedEvent.ActivityStoppedEventQuery activityStopped() {
         return ActivityStoppedEvent.queryPackage(
-                mActivity.getComponentName().getPackageName())
+                mComponentName.getPackageName())
                 .whereActivity().activityClass().className().isEqualTo(
-                        mActivity.getComponentName().getClassName())
-                .onUser(mActivity.getUser());
+                        mComponentName.getClassName())
+                .onUser(mUser);
     }
 
 }
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityPausedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityPausedEvent.java
index 22b5afd..3b9e09c 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityPausedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityPausedEvent.java
@@ -26,6 +26,8 @@
 import com.android.queryable.info.ActivityInfo;
 import com.android.queryable.queries.ActivityQuery;
 import com.android.queryable.queries.ActivityQueryHelper;
+import com.android.queryable.queries.IntegerQuery;
+import com.android.queryable.queries.IntegerQueryHelper;
 
 /**
  * Event logged when {@link Activity#onPause()} is called.
@@ -47,6 +49,7 @@
 
         ActivityQueryHelper<ActivityPausedEventQuery> mActivity =
                 new ActivityQueryHelper<>(this);
+        IntegerQuery<ActivityPausedEventQuery> mTaskId = new IntegerQueryHelper<>(this);
 
         private ActivityPausedEventQuery(String packageName) {
             super(ActivityPausedEvent.class, packageName);
@@ -58,11 +61,20 @@
             return mActivity;
         }
 
+        /** Query {@code taskId}. */
+        @CheckResult
+        public IntegerQuery<ActivityPausedEventQuery> whereTaskId() {
+            return mTaskId;
+        }
+
         @Override
         protected boolean filter(ActivityPausedEvent event) {
             if (!mActivity.matches(event.mActivity)) {
                 return false;
             }
+            if (!mTaskId.matches(event.mTaskId)) {
+                return false;
+            }
             return true;
         }
 
@@ -70,6 +82,7 @@
         public String describeQuery(String fieldName) {
             return toStringBuilder(ActivityPausedEvent.class, this)
                     .field("activity", mActivity)
+                    .field("taskId", mTaskId)
                     .toString();
         }
     }
@@ -85,6 +98,7 @@
         private ActivityPausedEventLogger(Activity activity, android.content.pm.ActivityInfo activityInfo) {
             super(activity, new ActivityPausedEvent());
             setActivity(activityInfo);
+            setTaskId(activity.getTaskId());
         }
 
         /** Sets the {@link Activity} being destroyed. */
@@ -92,19 +106,32 @@
             mEvent.mActivity = ActivityInfo.builder(activity).build();
             return this;
         }
+
+        /** Sets the task ID for the activity. */
+        public ActivityPausedEventLogger setTaskId(int taskId) {
+            mEvent.mTaskId = taskId;
+            return this;
+        }
     }
 
     protected ActivityInfo mActivity;
+    protected int mTaskId;
 
     /** Information about the {@link Activity} destroyed. */
     public ActivityInfo activity() {
         return mActivity;
     }
 
+    /** The Task ID of the Activity. */
+    public int taskId() {
+        return mTaskId;
+    }
+
     @Override
     public String toString() {
         return "ActivityPausedEvent{"
                 + ", activity=" + mActivity
+                + ", taskId=" + mTaskId
                 + ", packageName='" + mPackageName + "'"
                 + ", timestamp=" + mTimestamp
                 + "}";
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityRestartedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityRestartedEvent.java
index a6b9418..4de4cae 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityRestartedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityRestartedEvent.java
@@ -26,6 +26,8 @@
 import com.android.queryable.info.ActivityInfo;
 import com.android.queryable.queries.ActivityQuery;
 import com.android.queryable.queries.ActivityQueryHelper;
+import com.android.queryable.queries.IntegerQuery;
+import com.android.queryable.queries.IntegerQueryHelper;
 
 /**
  * Event logged when {@link Activity#onRestart()} is called.
@@ -47,6 +49,7 @@
 
         ActivityQueryHelper<ActivityRestartedEventQuery> mActivity =
                 new ActivityQueryHelper<>(this);
+        IntegerQuery<ActivityRestartedEventQuery> mTaskId = new IntegerQueryHelper<>(this);
 
         private ActivityRestartedEventQuery(String packageName) {
             super(ActivityRestartedEvent.class, packageName);
@@ -58,11 +61,20 @@
             return mActivity;
         }
 
+        /** Query {@code taskId}. */
+        @CheckResult
+        public IntegerQuery<ActivityRestartedEventQuery> whereTaskId() {
+            return mTaskId;
+        }
+
         @Override
         protected boolean filter(ActivityRestartedEvent event) {
             if (!mActivity.matches(event.mActivity)) {
                 return false;
             }
+            if (!mTaskId.matches(event.mTaskId)) {
+                return false;
+            }
             return true;
         }
 
@@ -70,6 +82,7 @@
         public String describeQuery(String fieldName) {
             return toStringBuilder(ActivityRestartedEvent.class, this)
                     .field("activity", mActivity)
+                    .field("taskId", mTaskId)
                     .toString();
         }
     }
@@ -85,26 +98,40 @@
         private ActivityRestartedEventLogger(Activity activity, android.content.pm.ActivityInfo activityInfo) {
             super(activity, new ActivityRestartedEvent());
             setActivity(activityInfo);
+            setTaskId(activity.getTaskId());
         }
 
-        /** Sets the {@link Activity} being destroyed. */
+        /** Sets the {@link Activity} being restarted. */
         public ActivityRestartedEventLogger setActivity(android.content.pm.ActivityInfo activity) {
             mEvent.mActivity = ActivityInfo.builder(activity).build();
             return this;
         }
+
+        /** Sets the task ID for the activity. */
+        public ActivityRestartedEventLogger setTaskId(int taskId) {
+            mEvent.mTaskId = taskId;
+            return this;
+        }
     }
 
     protected ActivityInfo mActivity;
+    protected int mTaskId;
 
     /** Information about the {@link Activity} destroyed. */
     public ActivityInfo activity() {
         return mActivity;
     }
 
+    /** The Task ID of the Activity. */
+    public int taskId() {
+        return mTaskId;
+    }
+
     @Override
     public String toString() {
         return "ActivityRestartedEvent{"
                 + ", activity=" + mActivity
+                + ", taskId=" + mTaskId
                 + ", packageName='" + mPackageName + "'"
                 + ", timestamp=" + mTimestamp
                 + "}";
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityResumedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityResumedEvent.java
index ce57340..04de811 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityResumedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityResumedEvent.java
@@ -26,6 +26,8 @@
 import com.android.queryable.info.ActivityInfo;
 import com.android.queryable.queries.ActivityQuery;
 import com.android.queryable.queries.ActivityQueryHelper;
+import com.android.queryable.queries.IntegerQuery;
+import com.android.queryable.queries.IntegerQueryHelper;
 
 /**
  * Event logged when {@link Activity#onResume()}} is called.
@@ -47,6 +49,7 @@
 
         ActivityQueryHelper<ActivityResumedEventQuery> mActivity =
                 new ActivityQueryHelper<>(this);
+        IntegerQuery<ActivityResumedEventQuery> mTaskId = new IntegerQueryHelper<>(this);
 
         private ActivityResumedEventQuery(String packageName) {
             super(ActivityResumedEvent.class, packageName);
@@ -58,11 +61,20 @@
             return mActivity;
         }
 
+        /** Query {@code taskId}. */
+        @CheckResult
+        public IntegerQuery<ActivityResumedEventQuery> whereTaskId() {
+            return mTaskId;
+        }
+
         @Override
         protected boolean filter(ActivityResumedEvent event) {
             if (!mActivity.matches(event.mActivity)) {
                 return false;
             }
+            if (!mTaskId.matches(event.mTaskId)) {
+                return false;
+            }
             return true;
         }
 
@@ -70,6 +82,7 @@
         public String describeQuery(String fieldName) {
             return toStringBuilder(ActivityResumedEvent.class, this)
                     .field("activity", mActivity)
+                    .field("taskId", mTaskId)
                     .toString();
         }
     }
@@ -85,26 +98,40 @@
         private ActivityResumedEventLogger(Activity activity, android.content.pm.ActivityInfo activityInfo) {
             super(activity, new ActivityResumedEvent());
             setActivity(activityInfo);
+            setTaskId(activity.getTaskId());
         }
 
-        /** Sets the {@link Activity} being destroyed. */
+        /** Sets the {@link Activity} being resumed. */
         public ActivityResumedEventLogger setActivity(android.content.pm.ActivityInfo activity) {
             mEvent.mActivity = ActivityInfo.builder(activity).build();
             return this;
         }
+
+        /** Sets the task ID for the activity. */
+        public ActivityResumedEventLogger setTaskId(int taskId) {
+            mEvent.mTaskId = taskId;
+            return this;
+        }
     }
 
     protected ActivityInfo mActivity;
+    protected int mTaskId;
 
     /** Information about the {@link Activity} destroyed. */
     public ActivityInfo activity() {
         return mActivity;
     }
 
+    /** The Task ID of the Activity. */
+    public int taskId() {
+        return mTaskId;
+    }
+
     @Override
     public String toString() {
         return "ActivityResumedEvent{"
                 + ", activity=" + mActivity
+                + ", taskId=" + mTaskId
                 + ", packageName='" + mPackageName + "'"
                 + ", timestamp=" + mTimestamp
                 + "}";
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStartedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStartedEvent.java
index a6cb5be..d2adac1 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStartedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStartedEvent.java
@@ -26,6 +26,8 @@
 import com.android.queryable.info.ActivityInfo;
 import com.android.queryable.queries.ActivityQuery;
 import com.android.queryable.queries.ActivityQueryHelper;
+import com.android.queryable.queries.IntegerQuery;
+import com.android.queryable.queries.IntegerQueryHelper;
 
 /**
  * Event logged when {@link Activity#onStart()} is called.
@@ -46,6 +48,7 @@
         private static final long serialVersionUID = 1;
 
         ActivityQueryHelper<ActivityStartedEventQuery> mActivity = new ActivityQueryHelper<>(this);
+        IntegerQuery<ActivityStartedEventQuery> mTaskId = new IntegerQueryHelper<>(this);
 
         private ActivityStartedEventQuery(String packageName) {
             super(ActivityStartedEvent.class, packageName);
@@ -57,11 +60,20 @@
             return mActivity;
         }
 
+        /** Query {@code taskId}. */
+        @CheckResult
+        public IntegerQuery<ActivityStartedEventQuery> whereTaskId() {
+            return mTaskId;
+        }
+
         @Override
         protected boolean filter(ActivityStartedEvent event) {
             if (!mActivity.matches(event.mActivity)) {
                 return false;
             }
+            if (!mTaskId.matches(event.mTaskId)) {
+                return false;
+            }
             return true;
         }
 
@@ -69,6 +81,7 @@
         public String describeQuery(String fieldName) {
             return toStringBuilder(ActivityStartedEvent.class, this)
                     .field("activity", mActivity)
+                    .field("taskId", mTaskId)
                     .toString();
         }
     }
@@ -83,6 +96,7 @@
         private ActivityStartedEventLogger(Activity activity, android.content.pm.ActivityInfo activityInfo) {
             super(activity, new ActivityStartedEvent());
             setActivity(activityInfo);
+            setTaskId(activity.getTaskId());
         }
 
         /** Sets the {@link Activity} being started. */
@@ -91,19 +105,32 @@
             mEvent.mActivity = ActivityInfo.builder(activity).build();
             return this;
         }
+
+        /** Sets the task ID for the activity. */
+        public ActivityStartedEventLogger setTaskId(int taskId) {
+            mEvent.mTaskId = taskId;
+            return this;
+        }
     }
 
     protected ActivityInfo mActivity;
+    protected int mTaskId;
 
     /** Information about the {@link Activity} started. */
     public ActivityInfo activity() {
         return mActivity;
     }
 
+    /** The Task ID of the Activity. */
+    public int taskId() {
+        return mTaskId;
+    }
+
     @Override
     public String toString() {
         return "ActivityStartedEvent{"
                 + ", activity=" + mActivity
+                + ", taskId=" + mTaskId
                 + ", packageName='" + mPackageName + "'"
                 + ", timestamp=" + mTimestamp
                 + "}";
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStoppedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStoppedEvent.java
index cd9630c..9fba837 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStoppedEvent.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/activities/ActivityStoppedEvent.java
@@ -26,6 +26,8 @@
 import com.android.queryable.info.ActivityInfo;
 import com.android.queryable.queries.ActivityQuery;
 import com.android.queryable.queries.ActivityQueryHelper;
+import com.android.queryable.queries.IntegerQuery;
+import com.android.queryable.queries.IntegerQueryHelper;
 
 /**
  * Event logged when {@link Activity#onStop()} is called.
@@ -46,6 +48,7 @@
         private static final long serialVersionUID = 1;
 
         ActivityQueryHelper<ActivityStoppedEventQuery> mActivity = new ActivityQueryHelper<>(this);
+        IntegerQuery<ActivityStoppedEventQuery> mTaskId = new IntegerQueryHelper<>(this);
 
         private ActivityStoppedEventQuery(String packageName) {
             super(ActivityStoppedEvent.class, packageName);
@@ -57,11 +60,20 @@
             return mActivity;
         }
 
+        /** Query {@code taskId}. */
+        @CheckResult
+        public IntegerQuery<ActivityStoppedEventQuery> whereTaskId() {
+            return mTaskId;
+        }
+
         @Override
         protected boolean filter(ActivityStoppedEvent event) {
             if (!mActivity.matches(event.mActivity)) {
                 return false;
             }
+            if (!mTaskId.matches(event.mTaskId)) {
+                return false;
+            }
             return true;
         }
 
@@ -69,6 +81,7 @@
         public String describeQuery(String fieldName) {
             return toStringBuilder(ActivityStoppedEvent.class, this)
                     .field("activity", mActivity)
+                    .field("taskId", mTaskId)
                     .toString();
         }
     }
@@ -83,6 +96,7 @@
         private ActivityStoppedEventLogger(Activity activity, android.content.pm.ActivityInfo activityInfo) {
             super(activity, new ActivityStoppedEvent());
             setActivity(activityInfo);
+            setTaskId(activity.getTaskId());
         }
 
         /** Sets the {@link Activity} being stopped. */
@@ -90,19 +104,32 @@
             mEvent.mActivity = ActivityInfo.builder(activity).build();
             return this;
         }
+
+        /** Sets the task ID for the activity. */
+        public ActivityStoppedEventLogger setTaskId(int taskId) {
+            mEvent.mTaskId = taskId;
+            return this;
+        }
     }
 
     protected ActivityInfo mActivity;
+    protected int mTaskId;
 
     /** Information about the {@link Activity} stopped. */
     public ActivityInfo activity() {
         return mActivity;
     }
 
+    /** The Task ID of the Activity. */
+    public int taskId() {
+        return mTaskId;
+    }
+
     @Override
     public String toString() {
         return "ActivityStoppedEvent{"
                 + ", activity=" + mActivity
+                + ", taskId=" + mTaskId
                 + ", packageName='" + mPackageName + "'"
                 + ", timestamp=" + mTimestamp
                 + "}";
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminChoosePrivateKeyAliasEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminChoosePrivateKeyAliasEvent.java
new file mode 100644
index 0000000..31d4fcd
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminChoosePrivateKeyAliasEvent.java
@@ -0,0 +1,271 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.delegatedadminreceivers;
+
+import android.app.admin.DelegatedAdminReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.DelegatedAdminReceiverInfo;
+import com.android.queryable.queries.DelegatedAdminReceiverQuery;
+import com.android.queryable.queries.DelegatedAdminReceiverQueryHelper;
+import com.android.queryable.queries.IntegerQuery;
+import com.android.queryable.queries.IntegerQueryHelper;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.queries.StringQuery;
+import com.android.queryable.queries.StringQueryHelper;
+import com.android.queryable.queries.UriQuery;
+import com.android.queryable.queries.UriQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
+
+/**
+ * Event logged when
+ * {@link DelegatedAdminReceiver#onChoosePrivateKeyAlias(Context, Intent, int, Uri, String)} is
+ * called.
+ */
+public final class DelegatedAdminChoosePrivateKeyAliasEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+
+    /** Begins a query for {@link DelegatedAdminChoosePrivateKeyAliasEvent} events. */
+    public static DelegatedAdminChoosePrivateKeyAliasEventQuery queryPackage(String packageName) {
+        return new DelegatedAdminChoosePrivateKeyAliasEventQuery(packageName);
+    }
+
+    /** {@link EventLogsQuery} for {@link DelegatedAdminChoosePrivateKeyAliasEvent}. */
+    public static final class DelegatedAdminChoosePrivateKeyAliasEventQuery
+            extends EventLogsQuery<DelegatedAdminChoosePrivateKeyAliasEvent,
+            DelegatedAdminChoosePrivateKeyAliasEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        DelegatedAdminReceiverQueryHelper<DelegatedAdminChoosePrivateKeyAliasEventQuery> mDelegatedAdminReceiver =
+                new DelegatedAdminReceiverQueryHelper<>(this);
+        IntentQueryHelper<DelegatedAdminChoosePrivateKeyAliasEventQuery> mIntent =
+                new IntentQueryHelper<>(this);
+        IntegerQueryHelper<DelegatedAdminChoosePrivateKeyAliasEventQuery> mUid =
+                new IntegerQueryHelper<>(this);
+        UriQueryHelper<DelegatedAdminChoosePrivateKeyAliasEventQuery> mUri =
+                new UriQueryHelper<>(this);
+        StringQueryHelper<DelegatedAdminChoosePrivateKeyAliasEventQuery> mAlias =
+                new StringQueryHelper<>(this);
+
+        private DelegatedAdminChoosePrivateKeyAliasEventQuery(String packageName) {
+            super(DelegatedAdminChoosePrivateKeyAliasEvent.class, packageName);
+        }
+
+        /**
+         * Queries {@link Intent} passed into
+         * {@link DelegatedAdminReceiver#onChoosePrivateKeyAlias(Context, Intent, int, Uri, String).
+         */
+        @CheckResult
+        public IntentQueryHelper<DelegatedAdminChoosePrivateKeyAliasEventQuery> whereIntent() {
+            return mIntent;
+        }
+
+        /** Queries {@link DelegatedAdminReceiver}. */
+        @CheckResult
+        public DelegatedAdminReceiverQuery<DelegatedAdminChoosePrivateKeyAliasEventQuery> whereDelegatedAdminReceiver() {
+            return mDelegatedAdminReceiver;
+        }
+
+        /** Query {@code uid}. */
+        @CheckResult
+        public IntegerQuery<DelegatedAdminChoosePrivateKeyAliasEventQuery> whereUid() {
+            return mUid;
+        }
+
+        /** Queries {@link Uri}. */
+        @CheckResult
+        public UriQuery<DelegatedAdminChoosePrivateKeyAliasEventQuery> whereUri() {
+            return mUri;
+        }
+
+        /** Query {@code alias}. */
+        @CheckResult
+        public StringQuery<DelegatedAdminChoosePrivateKeyAliasEventQuery> whereAlias() {
+            return mAlias;
+        }
+
+        @Override
+        protected boolean filter(DelegatedAdminChoosePrivateKeyAliasEvent event) {
+            if (!mIntent.matches(event.mIntent)) {
+                return false;
+            }
+            if (!mDelegatedAdminReceiver.matches(event.mDelegatedAdminReceiver)) {
+                return false;
+            }
+            if (!mUid.matches(event.mUid)) {
+                return false;
+            }
+            if (!mUri.matches(event.mUri)) {
+                return false;
+            }
+            if (!mAlias.matches(event.mAlias)) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(DelegatedAdminChoosePrivateKeyAliasEvent.class, this)
+                    .field("intent", mIntent)
+                    .field("delegatedAdminReceiver", mDelegatedAdminReceiver)
+                    .field("uid", mUid)
+                    .field("uri", mUri)
+                    .field("alias", mAlias)
+                    .toString();
+        }
+    }
+
+    /** Begins logging a {@link DelegatedAdminChoosePrivateKeyAliasEvent}. */
+    public static DelegatedAdminChoosePrivateKeyAliasEventLogger logger(
+            DelegatedAdminReceiver delegatedAdminReceiver, Context context,
+            Intent intent, int uid, Uri uri, String alias) {
+        return new DelegatedAdminChoosePrivateKeyAliasEventLogger(
+                delegatedAdminReceiver, context, intent, uid, uri, alias);
+    }
+
+    /** {@link EventLogger} for {@link DelegatedAdminChoosePrivateKeyAliasEvent}. */
+    public static final class DelegatedAdminChoosePrivateKeyAliasEventLogger
+            extends EventLogger<DelegatedAdminChoosePrivateKeyAliasEvent> {
+        private DelegatedAdminChoosePrivateKeyAliasEventLogger(
+                DelegatedAdminReceiver delegatedAdminReceiver, Context context, Intent intent,
+                int uid, Uri uri, String alias) {
+            super(context, new DelegatedAdminChoosePrivateKeyAliasEvent());
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            mEvent.mUid = uid;
+            mEvent.mUri = new SerializableParcelWrapper<>(uri);
+            mEvent.mAlias = alias;
+            setDelegatedAdminReceiver(delegatedAdminReceiver);
+        }
+
+        /** Sets the {@link DelegatedAdminReceiver} which received this event. */
+        public DelegatedAdminChoosePrivateKeyAliasEventLogger setDelegatedAdminReceiver(
+                DelegatedAdminReceiver delegatedAdminReceiver) {
+            mEvent.mDelegatedAdminReceiver = new DelegatedAdminReceiverInfo(delegatedAdminReceiver);
+            return this;
+        }
+
+        /** Sets the {@link DelegatedAdminReceiver} which received this event. */
+        public DelegatedAdminChoosePrivateKeyAliasEventLogger setDelegatedAdminReceiver(
+                Class<? extends DelegatedAdminReceiver> delegatedAdminReceiverClass) {
+            mEvent.mDelegatedAdminReceiver = new DelegatedAdminReceiverInfo(delegatedAdminReceiverClass);
+            return this;
+        }
+
+        /** Sets the {@link DelegatedAdminReceiver} which received this event. */
+        public DelegatedAdminChoosePrivateKeyAliasEventLogger setDelegatedAdminReceiver(
+                String delegatedAdminReceiverClassName) {
+            mEvent.mDelegatedAdminReceiver = new DelegatedAdminReceiverInfo(delegatedAdminReceiverClassName);
+            return this;
+        }
+
+        /** Sets the {@link Intent} which was received. */
+        public DelegatedAdminChoosePrivateKeyAliasEventLogger setIntent(Intent intent) {
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            return this;
+        }
+
+        /** Sets the {@code uid} which was received. */
+        public DelegatedAdminChoosePrivateKeyAliasEventLogger setUid(int uid) {
+            mEvent.mUid = uid;
+            return this;
+        }
+
+        /** Sets the {@link Uri} which was received. */
+        public DelegatedAdminChoosePrivateKeyAliasEventLogger setUri(Uri uri) {
+            mEvent.mUri = new SerializableParcelWrapper<>(uri);
+            return this;
+        }
+
+        /** Sets the {@code alias} which was received. */
+        public DelegatedAdminChoosePrivateKeyAliasEventLogger setAlias(String alias) {
+            mEvent.mAlias = alias;
+            return this;
+        }
+    }
+
+    protected SerializableParcelWrapper<Intent> mIntent;
+    protected DelegatedAdminReceiverInfo mDelegatedAdminReceiver;
+    protected int mUid;
+    protected SerializableParcelWrapper<Uri> mUri;
+    protected String mAlias;
+
+    /**
+     * The {@link Intent} passed into
+     * {@link DelegatedAdminReceiver#onChoosePrivateKeyAlias(Context, Intent, int, Uri, String)
+     */
+    public Intent intent() {
+        if (mIntent == null) {
+            return null;
+        }
+        return mIntent.get();
+    }
+
+    /** Information about the {@link DelegatedAdminReceiver} which received the intent. */
+    public DelegatedAdminReceiverInfo delegatedAdminReceiver() {
+        return mDelegatedAdminReceiver;
+    }
+
+    /**
+     * The {@code uid} passed into
+     * {@link DelegatedAdminReceiver#onChoosePrivateKeyAlias(Context, Intent, int, Uri, String)
+     */
+    public int uid() {
+        return mUid;
+    }
+
+    /**
+     * The {@link Uri} passed into
+     * {@link DelegatedAdminReceiver#onChoosePrivateKeyAlias(Context, Intent, int, Uri, String)
+     */
+    public Uri uri() {
+        if (mUri == null) {
+            return null;
+        }
+        return mUri.get();
+    }
+
+    /**
+     * The {@code alias} passed into
+     * {@link DelegatedAdminReceiver#onChoosePrivateKeyAlias(Context, Intent, int, Uri, String)
+     */
+    public String alias() {
+        return mAlias;
+    }
+
+    @Override
+    public String toString() {
+        return "DelegatedAdminChoosePrivateKeyAliasEvent{"
+                + " intent=" + intent()
+                + ", uid=" + mUid
+                + ", uri=" + uri()
+                + ", alias=" + mAlias
+                + ", delegatedAdminReceiver=" + mDelegatedAdminReceiver
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminNetworkLogsAvailableEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminNetworkLogsAvailableEvent.java
new file mode 100644
index 0000000..39b61d3
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminNetworkLogsAvailableEvent.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.deviceadminreceivers;
+
+import android.app.admin.DelegatedAdminReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.DelegatedAdminReceiverInfo;
+import com.android.queryable.queries.DelegatedAdminReceiverQuery;
+import com.android.queryable.queries.DelegatedAdminReceiverQueryHelper;
+import com.android.queryable.queries.IntegerQueryHelper;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.queries.LongQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
+
+/**
+ * Event logged when {@link DelegatedAdminReceiver#onNetworkLogsAvailable(Context, Intent, long,
+ * int)}
+ * is called.
+ */
+public final class DelegatedAdminNetworkLogsAvailableEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+    protected SerializableParcelWrapper<Intent> mIntent;
+    protected DelegatedAdminReceiverInfo mDelegatedAdminReceiver;
+    protected long mBatchToken;
+    protected int mNetworkLogsCount;
+
+    /** Begins a query for {@link DelegatedAdminNetworkLogsAvailableEvent} events. */
+    public static DelegatedAdminNetworkLogsAvailableEventQuery queryPackage(String packageName) {
+        return new DelegatedAdminNetworkLogsAvailableEventQuery(packageName);
+    }
+
+    /** Begins logging a {@link DelegatedAdminNetworkLogsAvailableEvent}. */
+    public static DelegatedAdminNetworkLogsAvailableEventLogger logger(
+            DelegatedAdminReceiver delegatedAdminReceiver, Context context, Intent intent,
+            long batchToken, int networkLogsCount) {
+        return new DelegatedAdminNetworkLogsAvailableEventLogger(
+                delegatedAdminReceiver, context, intent, batchToken, networkLogsCount);
+    }
+
+    /**
+     * The {@link Intent} passed into
+     * {@link DelegatedAdminReceiver#onNetworkLogsAvailable(Context, Intent, long, int)}.
+     */
+    public Intent intent() {
+        if (mIntent == null) {
+            return null;
+        }
+        return mIntent.get();
+    }
+
+    /** Information about the {@link DelegatedAdminReceiver} which received the intent. */
+    public DelegatedAdminReceiverInfo delegatedAdminReceiver() {
+        return mDelegatedAdminReceiver;
+    }
+
+    /**
+     * The {@code batchToken} passed into
+     * {@link DelegatedAdminReceiver#onNetworkLogsAvailable(Context, Intent, long, int)}.
+     */
+    public long batchToken() {
+        return mBatchToken;
+    }
+
+    /**
+     * The {@code networkLogsCount} passed into
+     * {@link DelegatedAdminReceiver#onNetworkLogsAvailable(Context, Intent, long, int)}.
+     */
+    public int networkLogsCount() {
+        return mNetworkLogsCount;
+    }
+
+    @Override
+    public String toString() {
+        return "DelegatedAdminNetworkLogsAvailableEvent{"
+                + " intent=" + intent()
+                + ", batchToken=" + mBatchToken
+                + ", networkLogsCount=" + mNetworkLogsCount
+                + ", delegatedAdminReceiver=" + mDelegatedAdminReceiver
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+
+    /** {@link EventLogsQuery} for {@link DelegatedAdminNetworkLogsAvailableEvent}. */
+    public static final class DelegatedAdminNetworkLogsAvailableEventQuery
+            extends EventLogsQuery<DelegatedAdminNetworkLogsAvailableEvent,
+            DelegatedAdminNetworkLogsAvailableEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        DelegatedAdminReceiverQueryHelper<DelegatedAdminNetworkLogsAvailableEventQuery>
+                mDelegatedAdminReceiver =
+                new DelegatedAdminReceiverQueryHelper<>(this);
+        IntentQueryHelper<DelegatedAdminNetworkLogsAvailableEventQuery> mIntent =
+                new IntentQueryHelper<>(this);
+        LongQueryHelper<DelegatedAdminNetworkLogsAvailableEventQuery> mBatchToken =
+                new LongQueryHelper<>(this);
+        IntegerQueryHelper<DelegatedAdminNetworkLogsAvailableEventQuery> mNetworkLogsCount =
+                new IntegerQueryHelper<>(this);
+
+        private DelegatedAdminNetworkLogsAvailableEventQuery(String packageName) {
+            super(DelegatedAdminNetworkLogsAvailableEvent.class, packageName);
+        }
+
+        /**
+         * Queries {@link Intent} passed into
+         * {@link DelegatedAdminReceiver#onNetworkLogsAvailable(Context, Intent, long, int)}.
+         */
+        @CheckResult
+        public IntentQueryHelper<DelegatedAdminNetworkLogsAvailableEventQuery> whereIntent() {
+            return mIntent;
+        }
+
+        /** Queries {@link DelegatedAdminReceiver}. */
+        @CheckResult
+        public DelegatedAdminReceiverQuery<DelegatedAdminNetworkLogsAvailableEventQuery> whereDelegatedAdminReceiver() {
+            return mDelegatedAdminReceiver;
+        }
+
+        /**
+         * Query {@code batchToken} passed into
+         * {@link DelegatedAdminReceiver#onNetworkLogsAvailable(Context, Intent, long, int)}.
+         */
+        @CheckResult
+        public LongQueryHelper<DelegatedAdminNetworkLogsAvailableEventQuery> whereBatchToken() {
+            return mBatchToken;
+        }
+
+        /**
+         * Query {@code networkLogsCount} passed into
+         * {@link DelegatedAdminReceiver#onNetworkLogsAvailable(Context, Intent, long, int)}.
+         */
+        @CheckResult
+        public IntegerQueryHelper<DelegatedAdminNetworkLogsAvailableEventQuery> whereNetworkLogsCount() {
+            return mNetworkLogsCount;
+        }
+
+        @Override
+        protected boolean filter(DelegatedAdminNetworkLogsAvailableEvent event) {
+            if (!mIntent.matches(event.mIntent)) {
+                return false;
+            }
+            if (!mDelegatedAdminReceiver.matches(event.mDelegatedAdminReceiver)) {
+                return false;
+            }
+            if (!mBatchToken.matches(event.mBatchToken)) {
+                return false;
+            }
+            return mNetworkLogsCount.matches(event.mNetworkLogsCount);
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(DelegatedAdminNetworkLogsAvailableEvent.class, this)
+                    .field("intent", mIntent)
+                    .field("delegatedAdminReceiver", mDelegatedAdminReceiver)
+                    .field("batchToken", mBatchToken)
+                    .field("networkLogsCount", mNetworkLogsCount)
+                    .toString();
+        }
+    }
+
+    /** {@link EventLogger} for {@link DelegatedAdminNetworkLogsAvailableEvent}. */
+    public static final class DelegatedAdminNetworkLogsAvailableEventLogger
+            extends EventLogger<DelegatedAdminNetworkLogsAvailableEvent> {
+        private DelegatedAdminNetworkLogsAvailableEventLogger(
+                DelegatedAdminReceiver delegatedAdminReceiver, Context context, Intent intent,
+                long batchToken, int networkLogsCount) {
+            super(context, new DelegatedAdminNetworkLogsAvailableEvent());
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            mEvent.mBatchToken = batchToken;
+            mEvent.mNetworkLogsCount = networkLogsCount;
+            setDelegatedAdminReceiver(delegatedAdminReceiver);
+        }
+
+        /** Sets the {@link DelegatedAdminReceiver} which received this event. */
+        public DelegatedAdminNetworkLogsAvailableEventLogger setDelegatedAdminReceiver(
+                DelegatedAdminReceiver delegatedAdminReceiver) {
+            mEvent.mDelegatedAdminReceiver = new DelegatedAdminReceiverInfo(delegatedAdminReceiver);
+            return this;
+        }
+
+        /** Sets the {@link DelegatedAdminReceiver} which received this event. */
+        public DelegatedAdminNetworkLogsAvailableEventLogger setDelegatedAdminReceiver(
+                Class<? extends DelegatedAdminReceiver> delegatedAdminReceiverClass) {
+            mEvent.mDelegatedAdminReceiver = new DelegatedAdminReceiverInfo(
+                    delegatedAdminReceiverClass);
+            return this;
+        }
+
+        /** Sets the {@link DelegatedAdminReceiver} which received this event. */
+        public DelegatedAdminNetworkLogsAvailableEventLogger setDelegatedAdminReceiver(
+                String delegatedAdminReceiverClassName) {
+            mEvent.mDelegatedAdminReceiver = new DelegatedAdminReceiverInfo(
+                    delegatedAdminReceiverClassName);
+            return this;
+        }
+
+        /** Sets the {@link Intent} which was received. */
+        public DelegatedAdminNetworkLogsAvailableEventLogger setIntent(Intent intent) {
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            return this;
+        }
+
+        /** Sets the {@code batchToken} which was received. */
+        public DelegatedAdminNetworkLogsAvailableEventLogger setBatchToken(long batchToken) {
+            mEvent.mBatchToken = batchToken;
+            return this;
+        }
+
+        /** Sets the {@code networkLogsCount} which was received. */
+        public DelegatedAdminNetworkLogsAvailableEventLogger setNetworkLogsCount(
+                int networkLogsCount) {
+            mEvent.mNetworkLogsCount = networkLogsCount;
+            return this;
+        }
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminReceiverEvents.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminReceiverEvents.java
new file mode 100644
index 0000000..9bb0552
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminReceiverEvents.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.delegatedadminreceivers;
+
+import android.app.admin.DeviceAdminReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminChoosePrivateKeyAliasEvent.DelegatedAdminChoosePrivateKeyAliasEventQuery;
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminSecurityLogsAvailableEvent.DelegatedAdminSecurityLogsAvailableEventQuery;
+import com.android.eventlib.events.deviceadminreceivers.DelegatedAdminNetworkLogsAvailableEvent.DelegatedAdminNetworkLogsAvailableEventQuery;
+
+/**
+ * Quick access to event queries about device admin receivers.
+ */
+public interface DelegatedAdminReceiverEvents {
+
+    /**
+     * Query for when {@link DeviceAdminReceiver#onChoosePrivateKeyAlias(Context, Intent, int, Uri, String)}
+     * is called on a device admin receiver.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    DelegatedAdminChoosePrivateKeyAliasEventQuery delegateChoosePrivateKeyAlias();
+
+    /**
+     * Query for when {@link DeviceAdminReceiver#onNetworkLogsAvailable(Context, Intent, long, int)}
+     * is called on a device admin receiver.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    DelegatedAdminNetworkLogsAvailableEventQuery delegateNetworkLogsAvailable();
+
+    /**
+     * Query for when {@link DeviceAdminReceiver#onSecurityLogsAvailable(Context, Intent)} is called
+     * on a device admin receiver.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    DelegatedAdminSecurityLogsAvailableEventQuery delegateSecurityLogsAvailable();
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminSecurityLogsAvailableEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminSecurityLogsAvailableEvent.java
new file mode 100644
index 0000000..fa6689d
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminSecurityLogsAvailableEvent.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.delegatedadminreceivers;
+
+import android.app.admin.DelegatedAdminReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.DelegatedAdminReceiverInfo;
+import com.android.queryable.queries.DelegatedAdminReceiverQuery;
+import com.android.queryable.queries.DelegatedAdminReceiverQueryHelper;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
+
+/**
+ * Event logged when {@link DelegatedAdminReceiver#onSecurityLogsAvailable(Context, Intent)}
+ * is called.
+ */
+public final class DelegatedAdminSecurityLogsAvailableEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+    protected SerializableParcelWrapper<Intent> mIntent;
+    protected DelegatedAdminReceiverInfo mDelegatedAdminReceiver;
+
+    /** Begins a query for {@link DelegatedAdminSecurityLogsAvailableEvent} events. */
+    public static DelegatedAdminSecurityLogsAvailableEventQuery queryPackage(String packageName) {
+        return new DelegatedAdminSecurityLogsAvailableEventQuery(packageName);
+    }
+
+    /** Begins logging a {@link DelegatedAdminSecurityLogsAvailableEvent}. */
+    public static DelegatedAdminSecurityLogsAvailableEventLogger logger(
+            DelegatedAdminReceiver delegatedAdminReceiver, Context context, Intent intent) {
+        return new DelegatedAdminSecurityLogsAvailableEventLogger(delegatedAdminReceiver, context,
+                intent);
+    }
+
+    /**
+     * The {@link Intent} passed into
+     * {@link DelegatedAdminReceiver#onSecurityLogsAvailable(Context, Intent)}.
+     */
+    public Intent intent() {
+        if (mIntent == null) {
+            return null;
+        }
+        return mIntent.get();
+    }
+
+    /** Information about the {@link DelegatedAdminReceiver} which received the intent. */
+    public DelegatedAdminReceiverInfo delegatedAdminReceiver() {
+        return mDelegatedAdminReceiver;
+    }
+
+    @Override
+    public String toString() {
+        return "DelegatedAdminSecurityLogsAvailableEvent{"
+                + " intent=" + intent()
+                + ", delegatedAdminReceiver=" + mDelegatedAdminReceiver
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+
+    /** {@link EventLogsQuery} for {@link DelegatedAdminSecurityLogsAvailableEvent}. */
+    public static final class DelegatedAdminSecurityLogsAvailableEventQuery
+            extends EventLogsQuery<DelegatedAdminSecurityLogsAvailableEvent,
+            DelegatedAdminSecurityLogsAvailableEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        DelegatedAdminReceiverQueryHelper<DelegatedAdminSecurityLogsAvailableEventQuery>
+                mDelegatedAdminReceiver =
+                new DelegatedAdminReceiverQueryHelper<>(this);
+        IntentQueryHelper<DelegatedAdminSecurityLogsAvailableEventQuery> mIntent =
+                new IntentQueryHelper<>(this);
+
+        private DelegatedAdminSecurityLogsAvailableEventQuery(String packageName) {
+            super(DelegatedAdminSecurityLogsAvailableEvent.class, packageName);
+        }
+
+        /**
+         * Queries {@link Intent} passed into
+         * {@link DelegatedAdminReceiver#onSecurityLogsAvailable(Context, Intent)}.
+         */
+        @CheckResult
+        public IntentQueryHelper<DelegatedAdminSecurityLogsAvailableEventQuery> whereIntent() {
+            return mIntent;
+        }
+
+        /** Queries {@link DelegatedAdminReceiver}. */
+        @CheckResult
+        public DelegatedAdminReceiverQuery<DelegatedAdminSecurityLogsAvailableEventQuery> whereDelegatedAdminReceiver() {
+            return mDelegatedAdminReceiver;
+        }
+
+        @Override
+        protected boolean filter(DelegatedAdminSecurityLogsAvailableEvent event) {
+            if (!mIntent.matches(event.mIntent)) {
+                return false;
+            }
+            return mDelegatedAdminReceiver.matches(event.mDelegatedAdminReceiver);
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(DelegatedAdminSecurityLogsAvailableEvent.class, this)
+                    .field("intent", mIntent)
+                    .field("delegatedAdminReceiver", mDelegatedAdminReceiver)
+                    .toString();
+        }
+    }
+
+    /** {@link EventLogger} for {@link DelegatedAdminSecurityLogsAvailableEvent}. */
+    public static final class DelegatedAdminSecurityLogsAvailableEventLogger
+            extends EventLogger<DelegatedAdminSecurityLogsAvailableEvent> {
+        private DelegatedAdminSecurityLogsAvailableEventLogger(
+                DelegatedAdminReceiver delegatedAdminReceiver, Context context, Intent intent) {
+            super(context, new DelegatedAdminSecurityLogsAvailableEvent());
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            setDelegatedAdminReceiver(delegatedAdminReceiver);
+        }
+
+        /** Sets the {@link DelegatedAdminReceiver} which received this event. */
+        public DelegatedAdminSecurityLogsAvailableEventLogger setDelegatedAdminReceiver(
+                DelegatedAdminReceiver delegatedAdminReceiver) {
+            mEvent.mDelegatedAdminReceiver = new DelegatedAdminReceiverInfo(delegatedAdminReceiver);
+            return this;
+        }
+
+        /** Sets the {@link DelegatedAdminReceiver} which received this event. */
+        public DelegatedAdminSecurityLogsAvailableEventLogger setDelegatedAdminReceiver(
+                Class<? extends DelegatedAdminReceiver> delegatedAdminReceiverClass) {
+            mEvent.mDelegatedAdminReceiver = new DelegatedAdminReceiverInfo(
+                    delegatedAdminReceiverClass);
+            return this;
+        }
+
+        /** Sets the {@link DelegatedAdminReceiver} which received this event. */
+        public DelegatedAdminSecurityLogsAvailableEventLogger setDelegatedAdminReceiver(
+                String delegatedAdminReceiverClassName) {
+            mEvent.mDelegatedAdminReceiver = new DelegatedAdminReceiverInfo(
+                    delegatedAdminReceiverClassName);
+            return this;
+        }
+
+        /** Sets the {@link Intent} which was received. */
+        public DelegatedAdminSecurityLogsAvailableEventLogger setIntent(Intent intent) {
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            return this;
+        }
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceBoundEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceBoundEvent.java
new file mode 100644
index 0000000..c56c3f8
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceBoundEvent.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+import android.app.Service;
+import android.content.Intent;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.ServiceInfo;
+import com.android.queryable.queries.IntentQuery;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.queries.ServiceQuery;
+import com.android.queryable.queries.ServiceQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
+
+/**
+ * Event logged when {@link Service#onBind(Intent)}
+ */
+public class ServiceBoundEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+
+    /** Begins a query for {@link ServiceBoundEvent} events. */
+    public static ServiceBoundEventQuery queryPackage(String packageName) {
+        return new ServiceBoundEventQuery(packageName);
+    }
+
+    /** {@link EventLogsQuery} for {@link ServiceBoundEvent}. */
+    public static final class ServiceBoundEventQuery
+            extends EventLogsQuery<ServiceBoundEvent, ServiceBoundEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        ServiceQueryHelper<ServiceBoundEventQuery> mService = new ServiceQueryHelper<>(this);
+        IntentQueryHelper<ServiceBoundEventQuery> mIntent = new IntentQueryHelper<>(this);
+
+        private ServiceBoundEventQuery(String packageName) {
+            super(ServiceBoundEvent.class, packageName);
+        }
+
+        /**
+         * Query {@link Intent} passed into {@link Service#onBind(Intent)}.
+         */
+        @CheckResult
+        public IntentQuery<ServiceBoundEventQuery> whereIntent() {
+            return mIntent;
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public ServiceQuery<ServiceBoundEvent.ServiceBoundEventQuery> whereService() {
+            return mService;
+        }
+
+        @Override
+        protected boolean filter(ServiceBoundEvent event) {
+            if (!mIntent.matches(event.mIntent)) {
+                return false;
+            }
+            if (!mService.matches(event.mService)) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(ServiceBoundEvent.class, this)
+                    .field("intent", mIntent)
+                    .field("service", mService)
+                    .toString();
+        }
+    }
+
+
+    /** Begins logging a {@link ServiceBoundEvent}. */
+    public static ServiceBoundEventLogger logger(Service service,
+            String serviceName, Intent intent) {
+        return new ServiceBoundEventLogger(service, serviceName, intent);
+    }
+
+    /** {@link EventLogger} for {@link ServiceBoundEvent}. */
+    public static final class ServiceBoundEventLogger extends EventLogger<ServiceBoundEvent> {
+
+        // TODO(b/214187100) Use ServiceInfo here instead of a String to identify the service.
+        private ServiceBoundEventLogger(Service service, String serviceName,
+                Intent intent) {
+            super(service, new ServiceBoundEvent());
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            setService(serviceName);
+        }
+
+        /** Sets the {@link Service} which received this event. */
+        public ServiceBoundEventLogger setService(String serviceName) {
+            mEvent.mService = ServiceInfo.builder()
+                    .serviceClass(serviceName)
+                    .build();
+            return this;
+        }
+
+        /** Sets the {@link Intent} which was used to bind to the service. */
+        public ServiceBoundEventLogger setIntent(Intent intent) {
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            return this;
+        }
+
+    }
+
+    protected ServiceInfo mService;
+    protected SerializableParcelWrapper<Intent> mIntent;
+
+    /**
+     * The {@link Intent} passed into {@link Service#onBind(Intent)}.
+     */
+    public Intent intent() {
+        if (mIntent == null) {
+            return null;
+        }
+        return mIntent.get();
+    }
+
+    /** Information about the {@link Service} which received the intent. */
+    public ServiceInfo service() {
+        return mService;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceBoundEvent{"
+                + " intent=" + intent()
+                + ", service=" + mService
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceConfigurationChangedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceConfigurationChangedEvent.java
new file mode 100644
index 0000000..ffb2f2a
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceConfigurationChangedEvent.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+import android.app.Service;
+import android.content.res.Configuration;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.ServiceInfo;
+import com.android.queryable.queries.ServiceQuery;
+import com.android.queryable.queries.ServiceQueryHelper;
+
+/**
+ * Event logged when {@link Service#onConfigurationChanged(Configuration)}
+ */
+public class ServiceConfigurationChangedEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+
+    /** Begins a query for {@link ServiceConfigurationChangedEvent} events. */
+    public static ServiceConfigurationChangedEvent.ServiceConfigurationChangedEventQuery
+            queryPackage(String packageName) {
+        return new ServiceConfigurationChangedEvent
+                .ServiceConfigurationChangedEventQuery(packageName);
+    }
+
+    /** {@link EventLogsQuery} for {@link ServiceConfigurationChangedEvent}. */
+    public static final class ServiceConfigurationChangedEventQuery
+            extends EventLogsQuery<ServiceConfigurationChangedEvent,
+            ServiceConfigurationChangedEvent.ServiceConfigurationChangedEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        ServiceQueryHelper<ServiceConfigurationChangedEvent.ServiceConfigurationChangedEventQuery>
+                mService = new ServiceQueryHelper<>(this);
+
+        private ServiceConfigurationChangedEventQuery(String packageName) {
+            super(ServiceConfigurationChangedEvent.class, packageName);
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public ServiceQuery<ServiceConfigurationChangedEventQuery> whereService() {
+            return mService;
+        }
+
+        @Override
+        protected boolean filter(ServiceConfigurationChangedEvent event) {
+            if (!mService.matches(event.mService)) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(ServiceConfigurationChangedEvent.class, this)
+                    .field("service", mService)
+                    .toString();
+        }
+    }
+
+
+    /** Begins logging a {@link ServiceConfigurationChangedEvent}. */
+    public static ServiceConfigurationChangedEvent.ServiceConfigurationChangedEventLogger logger(
+            Service service, String serviceName,
+            Configuration configuration) {
+        return new ServiceConfigurationChangedEvent.ServiceConfigurationChangedEventLogger(
+                service, serviceName, configuration);
+    }
+
+    /** {@link EventLogger} for {@link ServiceConfigurationChangedEvent}. */
+    public static final class ServiceConfigurationChangedEventLogger extends
+            EventLogger<ServiceConfigurationChangedEvent> {
+
+        private ServiceConfigurationChangedEventLogger(Service service,
+                String serviceName,
+                Configuration configuration) {
+            super(service, new ServiceConfigurationChangedEvent());
+            mEvent.mConfiguration = configuration;
+            setService(serviceName);
+        }
+
+        /** Sets the {@link Service} which received this event. */
+        public ServiceConfigurationChangedEvent.ServiceConfigurationChangedEventLogger setService(
+                String serviceName) {
+            mEvent.mService = ServiceInfo.builder()
+                    .serviceClass(serviceName)
+                    .build();
+            return this;
+        }
+
+        /** Sets the {@link Configuration} */
+        public ServiceConfigurationChangedEvent.ServiceConfigurationChangedEventLogger
+                setConfiguration(Configuration configuration) {
+            mEvent.mConfiguration = configuration;
+            return this;
+        }
+
+    }
+
+    protected ServiceInfo mService;
+    protected Configuration mConfiguration;
+
+    /**
+     * The {@link Configuration} passed into {@link Service#onConfigurationChanged(Configuration)}.
+     */
+    public Configuration configuration() {
+        return mConfiguration;
+    }
+
+    /** Information about the {@link Service} which received the configuration. */
+    public ServiceInfo service() {
+        return mService;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceConfigurationChangedEvent{"
+                + " configuration=" + configuration()
+                + ", service=" + mService
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceCreatedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceCreatedEvent.java
new file mode 100644
index 0000000..52326f0
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceCreatedEvent.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+import android.app.Service;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.ServiceInfo;
+import com.android.queryable.queries.ServiceQuery;
+import com.android.queryable.queries.ServiceQueryHelper;
+
+/**
+ * Event logged when {@link Service#onCreate()}
+ */
+public class ServiceCreatedEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+
+    /** Begins a query for {@link ServiceCreatedEvent} events. */
+    public static ServiceCreatedEvent.ServiceCreatedEventQuery queryPackage(String packageName) {
+        return new ServiceCreatedEvent.ServiceCreatedEventQuery(packageName);
+    }
+
+    /** {@link EventLogsQuery} for {@link ServiceCreatedEvent}. */
+    public static final class ServiceCreatedEventQuery
+            extends EventLogsQuery<ServiceCreatedEvent,
+            ServiceCreatedEvent.ServiceCreatedEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        ServiceQueryHelper<ServiceCreatedEvent.ServiceCreatedEventQuery> mService =
+                new ServiceQueryHelper<>(this);
+
+        private ServiceCreatedEventQuery(String packageName) {
+            super(ServiceCreatedEvent.class, packageName);
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public ServiceQuery<ServiceCreatedEvent.ServiceCreatedEventQuery> whereService() {
+            return mService;
+        }
+
+        @Override
+        protected boolean filter(ServiceCreatedEvent event) {
+            if (!mService.matches(event.mService)) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(ServiceCreatedEvent.class, this)
+                    .field("service", mService)
+                    .toString();
+        }
+    }
+
+
+    /** Begins logging a {@link ServiceCreatedEvent}. */
+    public static ServiceCreatedEvent.ServiceCreatedEventLogger logger(Service service,
+            String serviceName) {
+        return new ServiceCreatedEvent.ServiceCreatedEventLogger(service, serviceName);
+    }
+
+    /** {@link EventLogger} for {@link ServiceCreatedEvent}. */
+    public static final class ServiceCreatedEventLogger extends EventLogger<ServiceCreatedEvent> {
+
+        // TODO(b/214187100) Use ServiceInfo here instead of a String to identify the service.
+        private ServiceCreatedEventLogger(Service service,
+                String serviceName) {
+            super(service, new ServiceCreatedEvent());
+            setService(serviceName);
+        }
+
+        /** Sets the {@link Service} which received this event. */
+        public ServiceCreatedEvent.ServiceCreatedEventLogger setService(
+                String serviceName) {
+            mEvent.mService = ServiceInfo.builder()
+                    .serviceClass(serviceName)
+                    .build();
+            return this;
+        }
+
+    }
+
+    protected ServiceInfo mService;
+
+    /** Information about the {@link Service} which received the intent. */
+    public ServiceInfo service() {
+        return mService;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceCreatedEvent{"
+                + ", service=" + mService
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceDestroyedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceDestroyedEvent.java
new file mode 100644
index 0000000..e716779
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceDestroyedEvent.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+import android.app.Service;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.ServiceInfo;
+import com.android.queryable.queries.ServiceQuery;
+import com.android.queryable.queries.ServiceQueryHelper;
+
+/**
+ * Event logged when {@link Service#onDestroy()}
+ */
+public class ServiceDestroyedEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+
+    /** Begins a query for {@link ServiceDestroyedEvent} events. */
+    public static ServiceDestroyedEventQuery queryPackage(String packageName) {
+        return new ServiceDestroyedEventQuery(packageName);
+    }
+
+    /** {@link EventLogsQuery} for {@link ServiceDestroyedEvent}. */
+    public static final class ServiceDestroyedEventQuery
+            extends EventLogsQuery<ServiceDestroyedEvent, ServiceDestroyedEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        ServiceQueryHelper<ServiceDestroyedEventQuery> mService = new ServiceQueryHelper<>(this);
+
+        private ServiceDestroyedEventQuery(String packageName) {
+            super(ServiceDestroyedEvent.class, packageName);
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public ServiceQuery<ServiceDestroyedEventQuery> whereService() {
+            return mService;
+        }
+
+        @Override
+        protected boolean filter(ServiceDestroyedEvent event) {
+            if (!mService.matches(event.mService)) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(ServiceDestroyedEvent.class, this)
+                    .field("service", mService)
+                    .toString();
+        }
+    }
+
+
+    /** Begins logging a {@link ServiceDestroyedEvent}. */
+    public static ServiceDestroyedEventLogger logger(Service service,
+            String serviceName) {
+        return new ServiceDestroyedEventLogger(service, serviceName);
+    }
+
+    /** {@link EventLogger} for {@link ServiceDestroyedEvent}. */
+    public static final class ServiceDestroyedEventLogger extends
+            EventLogger<ServiceDestroyedEvent> {
+
+        // TODO(b/214187100) Use ServiceInfo here instead of a String to identify the service.
+        private ServiceDestroyedEventLogger(Service service,
+                String serviceName) {
+            super(service, new ServiceDestroyedEvent());
+            setService(serviceName);
+        }
+
+        /** Sets the {@link Service} which received this event. */
+        public ServiceDestroyedEventLogger setService(String serviceName) {
+            mEvent.mService = ServiceInfo.builder()
+                    .serviceClass(serviceName)
+                    .build();
+            return this;
+        }
+
+    }
+
+    protected ServiceInfo mService;
+
+    /** Information about the {@link Service} which received the intent. */
+    public ServiceInfo service() {
+        return mService;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceDestroyedEvent{"
+                + ", service=" + mService
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceEvents.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceEvents.java
new file mode 100644
index 0000000..504398e
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceEvents.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+/**
+ * Quick access to event queries about services.
+ */
+public interface ServiceEvents {
+
+    /**
+     * Query for when an service is created.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    ServiceCreatedEvent.ServiceCreatedEventQuery serviceCreated();
+
+
+    /**
+     * Query for when an service is started.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    ServiceStartedEvent.ServiceStartedEventQuery serviceStarted();
+
+    /**
+     * Query for when an service is destroyed.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    ServiceDestroyedEvent.ServiceDestroyedEventQuery serviceDestroyed();
+
+    /**
+     * Query for when an service's configuration is changed.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    ServiceConfigurationChangedEvent.ServiceConfigurationChangedEventQuery
+            serviceConfigurationChanged();
+
+    /**
+     * Query for when an service has low memory.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    ServiceLowMemoryEvent.ServiceLowMemoryEventQuery serviceLowMemory();
+
+    /**
+     * Query for when an service has it's memory trimmed.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    ServiceMemoryTrimmedEvent.ServiceMemoryTrimmedEventQuery serviceMemoryTrimmed();
+
+    /**
+     * Query for when an service is bound.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    ServiceBoundEvent.ServiceBoundEventQuery serviceBound();
+
+    /**
+     * Query for when an service is unbound.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    ServiceUnboundEvent.ServiceUnboundEventQuery serviceUnbound();
+
+    /**
+     * Query for when an service is re-bound.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    ServiceReboundEvent.ServiceReboundEventQuery serviceRebound();
+
+    /**
+     * Query for when an service has a task removed.
+     *
+     * <p>Additional filters can be added to the returned object.
+     *
+     * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
+     */
+    ServiceTaskRemovedEvent.ServiceTaskRemovedEventQuery serviceTaskRemoved();
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceLowMemoryEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceLowMemoryEvent.java
new file mode 100644
index 0000000..2959365
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceLowMemoryEvent.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+import android.app.Service;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.ServiceInfo;
+import com.android.queryable.queries.ServiceQuery;
+import com.android.queryable.queries.ServiceQueryHelper;
+
+/**
+ * Event logged when {@link Service#onLowMemory()}
+ */
+public class ServiceLowMemoryEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+
+    /** Begins a query for {@link ServiceLowMemoryEvent} events. */
+    public static ServiceLowMemoryEvent.ServiceLowMemoryEventQuery queryPackage(
+            String packageName) {
+        return new ServiceLowMemoryEvent.ServiceLowMemoryEventQuery(packageName);
+    }
+
+    /** {@link EventLogsQuery} for {@link ServiceLowMemoryEvent}. */
+    public static final class ServiceLowMemoryEventQuery
+            extends EventLogsQuery<ServiceLowMemoryEvent,
+            ServiceLowMemoryEvent.ServiceLowMemoryEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        ServiceQueryHelper<ServiceLowMemoryEvent.ServiceLowMemoryEventQuery> mService =
+                new ServiceQueryHelper<>(this);
+
+        private ServiceLowMemoryEventQuery(String packageName) {
+            super(ServiceLowMemoryEvent.class, packageName);
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public ServiceQuery<ServiceLowMemoryEvent.ServiceLowMemoryEventQuery> whereService() {
+            return mService;
+        }
+
+        @Override
+        protected boolean filter(ServiceLowMemoryEvent event) {
+            if (!mService.matches(event.mService)) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(ServiceLowMemoryEvent.class, this)
+                    .field("service", mService)
+                    .toString();
+        }
+    }
+
+
+    /** Begins logging a {@link ServiceLowMemoryEvent}. */
+    public static ServiceLowMemoryEvent.ServiceLowMemoryEventLogger logger(Service service,
+            String serviceName) {
+        return new ServiceLowMemoryEvent.ServiceLowMemoryEventLogger(service, serviceName);
+    }
+
+    /** {@link EventLogger} for {@link ServiceLowMemoryEvent}. */
+    public static final class ServiceLowMemoryEventLogger extends
+            EventLogger<ServiceLowMemoryEvent> {
+        private ServiceLowMemoryEventLogger(Service service,
+                String serviceName) {
+            super(service, new ServiceLowMemoryEvent());
+            setService(serviceName);
+        }
+
+        /** Sets the {@link Service} which received this event. */
+        public ServiceLowMemoryEvent.ServiceLowMemoryEventLogger setService(
+                String serviceName) {
+            mEvent.mService = ServiceInfo.builder()
+                    .serviceClass(serviceName)
+                    .build();
+            return this;
+        }
+
+    }
+
+    protected ServiceInfo mService;
+
+    /** Information about the {@link Service} which received the intent. */
+    public ServiceInfo service() {
+        return mService;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceLowMemoryEvent{"
+                + ", service=" + mService
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceMemoryTrimmedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceMemoryTrimmedEvent.java
new file mode 100644
index 0000000..9bb40cb
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceMemoryTrimmedEvent.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+import android.app.Service;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.ServiceInfo;
+import com.android.queryable.queries.IntegerQueryHelper;
+import com.android.queryable.queries.ServiceQuery;
+import com.android.queryable.queries.ServiceQueryHelper;
+
+/**
+ * Event logged when {@link Service#onTrimMemory(int)}
+ */
+public class ServiceMemoryTrimmedEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+
+    /** Begins a query for {@link ServiceMemoryTrimmedEvent} events. */
+    public static ServiceMemoryTrimmedEventQuery queryPackage(String packageName) {
+        return new ServiceMemoryTrimmedEventQuery(packageName);
+    }
+
+    /** {@link EventLogsQuery} for {@link ServiceMemoryTrimmedEvent}. */
+    public static final class ServiceMemoryTrimmedEventQuery extends
+            EventLogsQuery<ServiceMemoryTrimmedEvent,
+            ServiceMemoryTrimmedEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        ServiceQueryHelper<ServiceMemoryTrimmedEventQuery> mService =
+                new ServiceQueryHelper<>(this);
+        IntegerQueryHelper<ServiceMemoryTrimmedEventQuery> mLevel = new IntegerQueryHelper<>(this);
+
+        private ServiceMemoryTrimmedEventQuery(String packageName) {
+            super(ServiceMemoryTrimmedEvent.class, packageName);
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public ServiceQuery<ServiceMemoryTrimmedEventQuery> whereService() {
+            return mService;
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public IntegerQueryHelper<ServiceMemoryTrimmedEventQuery> whereLevel() {
+            return mLevel;
+        }
+
+        @Override
+        protected boolean filter(ServiceMemoryTrimmedEvent event) {
+            if (!mLevel.matches(event.mLevel)) {
+                return false;
+            }
+            if (!mService.matches(event.mService)) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(ServiceMemoryTrimmedEvent.class, this)
+                    .field("level", mLevel)
+                    .field("service", mService)
+                    .toString();
+        }
+    }
+
+
+    /** Begins logging a {@link ServiceMemoryTrimmedEvent}. */
+    public static ServiceMemoryTrimmedEventLogger logger(Service service,
+            String serviceName, int level) {
+        return new ServiceMemoryTrimmedEventLogger(service, serviceName, level);
+    }
+
+    /** {@link EventLogger} for {@link ServiceMemoryTrimmedEvent}. */
+    public static final class ServiceMemoryTrimmedEventLogger extends
+            EventLogger<ServiceMemoryTrimmedEvent> {
+        private ServiceMemoryTrimmedEventLogger(Service service,
+                String serviceName, int level) {
+            super(service, new ServiceMemoryTrimmedEvent());
+            mEvent.mLevel = level;
+            setService(serviceName);
+        }
+
+        /** Sets the {@link Service} which received this event. */
+        public ServiceMemoryTrimmedEventLogger setService(
+                String serviceName) {
+            mEvent.mService = ServiceInfo.builder()
+                    .serviceClass(serviceName)
+                    .build();
+            return this;
+        }
+
+        /** Sets the level. */
+        public ServiceMemoryTrimmedEventLogger setLevel(int level) {
+            mEvent.mLevel = level;
+            return this;
+        }
+
+    }
+
+    protected ServiceInfo mService;
+    protected int mLevel;
+
+    /**
+     * The level passed into {@link Service#onTrimMemory(int)}.
+     */
+    public int level() {
+        return mLevel;
+    }
+
+    /** Information about the {@link Service} which received the intent. */
+    public ServiceInfo service() {
+        return mService;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceMemoryTrimmedEvent{"
+                + ", service=" + mService
+                + ", level=" + mLevel
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceReboundEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceReboundEvent.java
new file mode 100644
index 0000000..6893493
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceReboundEvent.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+import android.app.Service;
+import android.content.Intent;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.ServiceInfo;
+import com.android.queryable.queries.IntentQuery;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.queries.ServiceQuery;
+import com.android.queryable.queries.ServiceQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
+
+/**
+ * Event logged when {@link Service#onRebind(Intent)}
+ */
+public class ServiceReboundEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+
+    /** Begins a query for {@link ServiceReboundEvent} events. */
+    public static ServiceReboundEvent.ServiceReboundEventQuery queryPackage(String packageName) {
+        return new ServiceReboundEvent.ServiceReboundEventQuery(packageName);
+    }
+
+    /** {@link EventLogsQuery} for {@link ServiceReboundEvent}. */
+    public static final class ServiceReboundEventQuery
+            extends EventLogsQuery<ServiceReboundEvent,
+            ServiceReboundEvent.ServiceReboundEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        ServiceQueryHelper<ServiceReboundEvent.ServiceReboundEventQuery> mService =
+                new ServiceQueryHelper<>(this);
+        IntentQueryHelper<ServiceReboundEvent.ServiceReboundEventQuery> mIntent =
+                new IntentQueryHelper<>(this);
+
+        private ServiceReboundEventQuery(String packageName) {
+            super(ServiceReboundEvent.class, packageName);
+        }
+
+        /**
+         * Query {@link Intent} passed into {@link Service#onRebind(Intent)}.
+         */
+        @CheckResult
+        public IntentQuery<ServiceReboundEvent.ServiceReboundEventQuery> whereIntent() {
+            return mIntent;
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public ServiceQuery<ServiceReboundEvent.ServiceReboundEventQuery> whereService() {
+            return mService;
+        }
+
+        @Override
+        protected boolean filter(ServiceReboundEvent event) {
+            if (!mIntent.matches(event.mIntent)) {
+                return false;
+            }
+            if (!mService.matches(event.mService)) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(ServiceReboundEvent.class, this)
+                    .field("intent", mIntent)
+                    .field("service", mService)
+                    .toString();
+        }
+    }
+
+
+    /** Begins logging a {@link ServiceReboundEvent}. */
+    public static ServiceReboundEvent.ServiceReboundEventLogger logger(Service service,
+            String serviceName, Intent intent) {
+        return new ServiceReboundEvent.ServiceReboundEventLogger(service, serviceName, intent);
+    }
+
+    /** {@link EventLogger} for {@link ServiceReboundEvent}. */
+    public static final class ServiceReboundEventLogger extends EventLogger<ServiceReboundEvent> {
+
+        private ServiceReboundEventLogger(Service service,
+                String serviceName,
+                Intent intent) {
+            super(service, new ServiceReboundEvent());
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            setService(serviceName);
+        }
+
+        /** Sets the {@link Service} which received this event. */
+        public ServiceReboundEvent.ServiceReboundEventLogger setService(
+                String serviceName) {
+            mEvent.mService = ServiceInfo.builder()
+                    .serviceClass(serviceName)
+                    .build();
+            return this;
+        }
+
+        /** Sets the {@link Intent} that was used to bind to the service. */
+        public ServiceReboundEvent.ServiceReboundEventLogger setIntent(Intent intent) {
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            return this;
+        }
+
+    }
+
+    protected ServiceInfo mService;
+    protected SerializableParcelWrapper<Intent> mIntent;
+
+    /**
+     * The {@link Intent} passed into {@link Service#onRebind(Intent)}.
+     */
+    public Intent intent() {
+        if (mIntent == null) {
+            return null;
+        }
+        return mIntent.get();
+    }
+
+    /** Information about the {@link Service} which received the intent. */
+    public ServiceInfo service() {
+        return mService;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceReboundEvent{"
+                + " intent=" + intent()
+                + ", service=" + mService
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceStartedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceStartedEvent.java
new file mode 100644
index 0000000..b2fe5b5
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceStartedEvent.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+import android.app.Service;
+import android.content.Intent;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.ServiceInfo;
+import com.android.queryable.queries.IntegerQueryHelper;
+import com.android.queryable.queries.IntentQuery;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.queries.ServiceQuery;
+import com.android.queryable.queries.ServiceQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
+
+/**
+ * Event logged when {@link Service#onStartCommand(Intent, int, int)}
+ */
+public class ServiceStartedEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+
+    /** Begins a query for {@link ServiceStartedEvent} events. */
+    public static ServiceStartedEventQuery queryPackage(String packageName) {
+        return new ServiceStartedEventQuery(packageName);
+    }
+
+    /** {@link EventLogsQuery} for {@link ServiceStartedEvent}. */
+    public static final class ServiceStartedEventQuery extends EventLogsQuery<ServiceStartedEvent,
+            ServiceStartedEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        ServiceQueryHelper<ServiceStartedEventQuery> mService = new ServiceQueryHelper<>(this);
+        IntentQueryHelper<ServiceStartedEventQuery> mIntent = new IntentQueryHelper<>(this);
+        IntegerQueryHelper<ServiceStartedEventQuery> mFlags = new IntegerQueryHelper<>(this);
+        IntegerQueryHelper<ServiceStartedEventQuery> mStartId = new IntegerQueryHelper<>(this);
+
+        private ServiceStartedEventQuery(String packageName) {
+            super(ServiceStartedEvent.class, packageName);
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public ServiceQuery<ServiceStartedEventQuery> whereService() {
+            return mService;
+        }
+
+        /**
+         * Query {@link Intent} passed into {@link Service#onBind(Intent)}.
+         */
+        @CheckResult
+        public IntentQuery<ServiceStartedEventQuery> whereIntent() {
+            return mIntent;
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public IntegerQueryHelper<ServiceStartedEventQuery> whereFlags() {
+            return mFlags;
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public IntegerQueryHelper<ServiceStartedEventQuery> whereStartId() {
+            return mStartId;
+        }
+
+        @Override
+        protected boolean filter(ServiceStartedEvent event) {
+            if (!mFlags.matches(event.mFlags)) {
+                return false;
+            }
+            if (!mStartId.matches(event.mStartId)) {
+                return false;
+            }
+            if (!mIntent.matches(event.mIntent)) {
+                return false;
+            }
+            if (!mService.matches(event.mService)) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(ServiceStartedEvent.class, this)
+                    .field("flags", mFlags)
+                    .field("startId", mStartId)
+                    .field("intent", mIntent)
+                    .field("service", mService)
+                    .toString();
+        }
+    }
+
+
+    /** Begins logging a {@link ServiceStartedEvent}. */
+    public static ServiceStartedEventLogger logger(Service service,
+            String serviceName, Intent intent, int flags, int startId) {
+        return new ServiceStartedEventLogger(service, serviceName, intent, flags, startId);
+    }
+
+    /** {@link EventLogger} for {@link ServiceStartedEvent}. */
+    public static final class ServiceStartedEventLogger extends EventLogger<ServiceStartedEvent> {
+
+        // TODO(b/214187100) Use ServiceInfo here instead of a String to identify the service.
+        private ServiceStartedEventLogger(Service service,
+                String serviceName, Intent intent, int flags, int startId) {
+            super(service, new ServiceStartedEvent());
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            mEvent.mFlags = flags;
+            mEvent.mStartId = startId;
+            setService(serviceName);
+        }
+
+        /** Sets the {@link Service} which received this event. */
+        public ServiceStartedEventLogger setService(String serviceName) {
+            mEvent.mService = ServiceInfo.builder()
+                    .serviceClass(serviceName)
+                    .build();
+            return this;
+        }
+
+        /** Sets the {@link Intent} supplied to {@link android.content.Context#startService}. */
+        public ServiceStartedEventLogger setIntent(Intent intent) {
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            return this;
+        }
+
+        /** Sets the flags used for the start request of this service. */
+        public ServiceStartedEventLogger setFlags(int flags) {
+            mEvent.mFlags = flags;
+            return this;
+        }
+
+        /** Sets the startId. */
+        public ServiceStartedEventLogger setStartId(int startId) {
+            mEvent.mStartId = startId;
+            return this;
+        }
+
+    }
+
+    protected ServiceInfo mService;
+    protected SerializableParcelWrapper<Intent> mIntent;
+    protected int mFlags;
+    protected int mStartId;
+
+    /**
+     * The {@link Intent} passed into {@link Service#onStartCommand(Intent, int, int)}.
+     */
+    public Intent intent() {
+        if (mIntent == null) {
+            return null;
+        }
+        return mIntent.get();
+    }
+
+    /**
+     * The flags passed into {@link Service#onStartCommand(Intent, int, int)}.
+     */
+    public int flags() {
+        return mFlags;
+    }
+
+    /**
+     * The startId passed into {@link Service#onStartCommand(Intent, int, int)}.
+     */
+    public int startId() {
+        return mStartId;
+    }
+
+    /** Information about the {@link Service} which received the intent. */
+    public ServiceInfo service() {
+        return mService;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceStartedEvent{"
+                + ", service=" + mService
+                + ", flags=" + mFlags
+                + ", startId=" + mStartId
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceTaskRemovedEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceTaskRemovedEvent.java
new file mode 100644
index 0000000..d4eda85
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceTaskRemovedEvent.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+import android.app.Service;
+import android.content.Intent;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.ServiceInfo;
+import com.android.queryable.queries.IntentQuery;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.queries.ServiceQuery;
+import com.android.queryable.queries.ServiceQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
+
+/**
+ * Event logged when {@link Service#onTaskRemoved(Intent)}
+ */
+public class ServiceTaskRemovedEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+
+    /** Begins a query for {@link ServiceTaskRemovedEvent} events. */
+    public static ServiceTaskRemovedEvent.ServiceTaskRemovedEventQuery queryPackage(
+            String packageName) {
+        return new ServiceTaskRemovedEvent.ServiceTaskRemovedEventQuery(packageName);
+    }
+
+    /** {@link EventLogsQuery} for {@link ServiceTaskRemovedEvent}. */
+    public static final class ServiceTaskRemovedEventQuery
+            extends EventLogsQuery<ServiceTaskRemovedEvent,
+            ServiceTaskRemovedEvent.ServiceTaskRemovedEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        ServiceQueryHelper<ServiceTaskRemovedEvent.ServiceTaskRemovedEventQuery> mService =
+                new ServiceQueryHelper<>(this);
+        IntentQueryHelper<ServiceTaskRemovedEvent.ServiceTaskRemovedEventQuery> mIntent =
+                new IntentQueryHelper<>(this);
+
+        private ServiceTaskRemovedEventQuery(String packageName) {
+            super(ServiceTaskRemovedEvent.class, packageName);
+        }
+
+        /**
+         * Query {@link Intent} passed into {@link Service#onTaskRemoved(Intent)}.
+         */
+        @CheckResult
+        public IntentQuery<ServiceTaskRemovedEvent.ServiceTaskRemovedEventQuery> whereIntent() {
+            return mIntent;
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public ServiceQuery<ServiceTaskRemovedEvent.ServiceTaskRemovedEventQuery> whereService() {
+            return mService;
+        }
+
+        @Override
+        protected boolean filter(ServiceTaskRemovedEvent event) {
+            if (!mIntent.matches(event.mIntent)) {
+                return false;
+            }
+            if (!mService.matches(event.mService)) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(ServiceTaskRemovedEvent.class, this)
+                    .field("intent", mIntent)
+                    .field("service", mService)
+                    .toString();
+        }
+    }
+
+
+    /** Begins logging a {@link ServiceTaskRemovedEvent}. */
+    public static ServiceTaskRemovedEvent.ServiceTaskRemovedEventLogger logger(Service service,
+            String serviceName, Intent intent) {
+        return new ServiceTaskRemovedEvent.ServiceTaskRemovedEventLogger(service, serviceName,
+                intent);
+    }
+
+    /** {@link EventLogger} for {@link ServiceTaskRemovedEvent}. */
+    public static final class ServiceTaskRemovedEventLogger extends
+            EventLogger<ServiceTaskRemovedEvent> {
+
+        private ServiceTaskRemovedEventLogger(Service service,
+                String serviceName,
+                Intent intent) {
+            super(service, new ServiceTaskRemovedEvent());
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            setService(serviceName);
+        }
+
+        /** Sets the {@link Service} which received this event. */
+        public ServiceTaskRemovedEvent.ServiceTaskRemovedEventLogger setService(
+                String serviceName) {
+            mEvent.mService = ServiceInfo.builder()
+                    .serviceClass(serviceName)
+                    .build();
+            return this;
+        }
+
+        /** Sets the {@link Intent} that was used to bind to the service. */
+        public ServiceTaskRemovedEvent.ServiceTaskRemovedEventLogger setIntent(Intent intent) {
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            return this;
+        }
+
+    }
+
+    protected ServiceInfo mService;
+    protected SerializableParcelWrapper<Intent> mIntent;
+
+    /**
+     * The {@link Intent} passed into {@link Service#onTaskRemoved(Intent)}.
+     */
+    public Intent intent() {
+        if (mIntent == null) {
+            return null;
+        }
+        return mIntent.get();
+    }
+
+    /** Information about the {@link Service} which received the intent. */
+    public ServiceInfo service() {
+        return mService;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceTaskRemovedEvent{"
+                + " intent=" + intent()
+                + ", service=" + mService
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceUnboundEvent.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceUnboundEvent.java
new file mode 100644
index 0000000..907b653
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/events/services/ServiceUnboundEvent.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+import android.app.Service;
+import android.content.Intent;
+
+import androidx.annotation.CheckResult;
+
+import com.android.eventlib.Event;
+import com.android.eventlib.EventLogger;
+import com.android.eventlib.EventLogsQuery;
+import com.android.queryable.info.ServiceInfo;
+import com.android.queryable.queries.IntentQuery;
+import com.android.queryable.queries.IntentQueryHelper;
+import com.android.queryable.queries.ServiceQuery;
+import com.android.queryable.queries.ServiceQueryHelper;
+import com.android.queryable.util.SerializableParcelWrapper;
+
+/**
+ * Event logged when {@link Service#onUnbind(Intent)}
+ */
+public class ServiceUnboundEvent extends Event {
+
+    private static final long serialVersionUID = 1;
+
+    /** Begins a query for {@link ServiceUnboundEvent} events. */
+    public static ServiceUnboundEventQuery queryPackage(String packageName) {
+        return new ServiceUnboundEventQuery(packageName);
+    }
+
+    /** {@link EventLogsQuery} for {@link ServiceUnboundEvent}. */
+    public static final class ServiceUnboundEventQuery
+            extends EventLogsQuery<ServiceUnboundEvent,
+            ServiceUnboundEvent.ServiceUnboundEventQuery> {
+
+        private static final long serialVersionUID = 1;
+
+        ServiceQueryHelper<ServiceUnboundEvent.ServiceUnboundEventQuery> mService =
+                new ServiceQueryHelper<>(this);
+        IntentQueryHelper<ServiceUnboundEvent.ServiceUnboundEventQuery> mIntent =
+                new IntentQueryHelper<>(this);
+
+        private ServiceUnboundEventQuery(String packageName) {
+            super(ServiceUnboundEvent.class, packageName);
+        }
+
+        /**
+         * Query {@link Intent} passed into {@link Service#onUnbind(Intent)}.
+         */
+        @CheckResult
+        public IntentQuery<ServiceUnboundEventQuery> whereIntent() {
+            return mIntent;
+        }
+
+        /** Query {@link Service}. */
+        @CheckResult
+        public ServiceQuery<ServiceUnboundEventQuery> whereService() {
+            return mService;
+        }
+
+        @Override
+        protected boolean filter(ServiceUnboundEvent event) {
+            if (!mIntent.matches(event.mIntent)) {
+                return false;
+            }
+            if (!mService.matches(event.mService)) {
+                return false;
+            }
+            return true;
+        }
+
+        @Override
+        public String describeQuery(String fieldName) {
+            return toStringBuilder(ServiceUnboundEvent.class, this)
+                    .field("intent", mIntent)
+                    .field("service", mService)
+                    .toString();
+        }
+    }
+
+
+    /** Begins logging a {@link ServiceUnboundEvent}. */
+    public static ServiceUnboundEventLogger logger(Service service,
+            String serviceName, Intent intent) {
+        return new ServiceUnboundEventLogger(service, serviceName, intent);
+    }
+
+    /** {@link EventLogger} for {@link ServiceUnboundEvent}. */
+    public static final class ServiceUnboundEventLogger extends EventLogger<ServiceUnboundEvent> {
+
+        // TODO(b/214187100) Use ServiceInfo here instead of a String to identify the service.
+        private ServiceUnboundEventLogger(Service service,
+                String serviceName,
+                Intent intent) {
+            super(service, new ServiceUnboundEvent());
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            setService(serviceName);
+        }
+
+        /** Sets the {@link Service} which received this event. */
+        public ServiceUnboundEventLogger setService(String serviceName) {
+            mEvent.mService = ServiceInfo.builder()
+                    .serviceClass(serviceName)
+                    .build();
+            return this;
+        }
+
+        /** Sets the {@link Intent} that was used to bind to the service. */
+        public ServiceUnboundEventLogger setIntent(Intent intent) {
+            mEvent.mIntent = new SerializableParcelWrapper<>(intent);
+            return this;
+        }
+
+    }
+
+    protected ServiceInfo mService;
+    protected SerializableParcelWrapper<Intent> mIntent;
+
+    /**
+     * The {@link Intent} passed into {@link Service#onUnbind(Intent)}.
+     */
+    public Intent intent() {
+        if (mIntent == null) {
+            return null;
+        }
+        return mIntent.get();
+    }
+
+    /** Information about the {@link Service} which received the intent. */
+    public ServiceInfo service() {
+        return mService;
+    }
+
+    @Override
+    public String toString() {
+        return "ServiceUnboundEvent{"
+                + " intent=" + intent()
+                + ", service=" + mService
+                + ", packageName='" + mPackageName + "'"
+                + ", timestamp=" + mTimestamp
+                + "}";
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibAppComponentFactory.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibAppComponentFactory.java
index ed2bcd9..7cdfabc 100644
--- a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibAppComponentFactory.java
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibAppComponentFactory.java
@@ -18,6 +18,7 @@
 
 import android.app.Activity;
 import android.app.AppComponentFactory;
+import android.app.Service;
 import android.content.BroadcastReceiver;
 import android.content.Intent;
 import android.util.Log;
@@ -53,6 +54,26 @@
         try {
             return super.instantiateReceiver(classLoader, className, intent);
         } catch (ClassNotFoundException e) {
+            if (className.endsWith("DeviceAdminReceiver")) {
+                Log.d(LOG_TAG, "Broadcast Receiver class (" + className
+                        + ") not found, routing to TestAppDeviceAdminReceiver");
+                EventLibDeviceAdminReceiver receiver = (EventLibDeviceAdminReceiver)
+                        super.instantiateReceiver(
+                                classLoader, EventLibDeviceAdminReceiver.class.getName(),
+                                intent);
+                receiver.setOverrideDeviceAdminReceiverClassName(className);
+                return receiver;
+            } else if (className.endsWith("DelegatedAdminReceiver")) {
+                Log.d(LOG_TAG, "Broadcast Receiver class (" + className
+                        + ") not found, routing to EventLibDelegatedAdminReceiver");
+                EventLibDelegatedAdminReceiver receiver = (EventLibDelegatedAdminReceiver)
+                        super.instantiateReceiver(
+                                classLoader, EventLibDelegatedAdminReceiver.class.getName(),
+                                intent);
+                receiver.setOverrideDelegatedAdminReceiverClassName(className);
+                return receiver;
+            }
+
             Log.d(LOG_TAG, "Broadcast Receiver class (" + className
                     + ") not found, routing to EventLibBroadcastReceiver");
 
@@ -63,4 +84,21 @@
             return receiver;
         }
     }
+
+    @Override
+    public Service instantiateService(ClassLoader classLoader, String className, Intent intent)
+            throws InstantiationException, IllegalAccessException, ClassNotFoundException {
+        try {
+            return super.instantiateService(classLoader, className, intent);
+        } catch (ClassNotFoundException e) {
+            Log.d(LOG_TAG, "Service class (" + className
+                    + ") not found, routing to EventLibService");
+
+            EventLibService service = (EventLibService)
+                    super.instantiateService(
+                            classLoader, EventLibService.class.getName(), intent);
+            service.setOverrideServiceClassName(className);
+            return service;
+        }
+    }
 }
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibDelegatedAdminReceiver.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibDelegatedAdminReceiver.java
new file mode 100644
index 0000000..891819d
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibDelegatedAdminReceiver.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2022 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.eventlib.premade;
+
+import android.app.admin.DelegatedAdminReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminChoosePrivateKeyAliasEvent;
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminChoosePrivateKeyAliasEvent.DelegatedAdminChoosePrivateKeyAliasEventLogger;
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminSecurityLogsAvailableEvent;
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminSecurityLogsAvailableEvent.DelegatedAdminSecurityLogsAvailableEventLogger;
+import com.android.eventlib.events.deviceadminreceivers.DelegatedAdminNetworkLogsAvailableEvent;
+import com.android.eventlib.events.deviceadminreceivers.DelegatedAdminNetworkLogsAvailableEvent.DelegatedAdminNetworkLogsAvailableEventLogger;
+
+/**
+ * {@link DelegatedAdminReceiver} which logs all callbacks using EventLib.
+ */
+@SuppressWarnings("NewApi")
+public class EventLibDelegatedAdminReceiver extends DelegatedAdminReceiver {
+
+    private String mOverrideDelegatedAdminReceiverClassName;
+
+    public void setOverrideDelegatedAdminReceiverClassName(
+            String overrideDelegatedAdminReceiverClassName) {
+        mOverrideDelegatedAdminReceiverClassName = overrideDelegatedAdminReceiverClassName;
+    }
+
+    /**
+     * Get the class name for this {@link DelegatedAdminReceiver}.
+     *
+     * <p>This will account for the name being overridden.
+     */
+    public String className() {
+        if (mOverrideDelegatedAdminReceiverClassName != null) {
+            return mOverrideDelegatedAdminReceiverClassName;
+        } else {
+            return EventLibDelegatedAdminReceiver.class.getName();
+        }
+    }
+
+    @Override
+    public String onChoosePrivateKeyAlias(Context context, Intent intent, int uid, Uri uri,
+            String alias) {
+        DelegatedAdminChoosePrivateKeyAliasEventLogger logger =
+                DelegatedAdminChoosePrivateKeyAliasEvent
+                        .logger(this, context, intent, uid, uri, alias);
+
+        if (mOverrideDelegatedAdminReceiverClassName != null) {
+            logger.setDelegatedAdminReceiver(mOverrideDelegatedAdminReceiverClassName);
+        }
+
+        logger.log();
+
+        // TODO(b/198280332) Allow TestApp to return values for methods.
+        if (uri == null) {
+            return null;
+        }
+        return uri.getQueryParameter("alias");
+    }
+
+    @Override
+    public void onNetworkLogsAvailable(Context context, Intent intent, long batchToken,
+            int networkLogsCount) {
+        DelegatedAdminNetworkLogsAvailableEventLogger logger =
+                DelegatedAdminNetworkLogsAvailableEvent
+                        .logger(this, context, intent, batchToken, networkLogsCount);
+
+        if (mOverrideDelegatedAdminReceiverClassName != null) {
+            logger.setDelegatedAdminReceiver(mOverrideDelegatedAdminReceiverClassName);
+        }
+
+        logger.log();
+    }
+
+    @Override
+    public void onSecurityLogsAvailable(Context context, Intent intent) {
+        DelegatedAdminSecurityLogsAvailableEventLogger logger =
+                DelegatedAdminSecurityLogsAvailableEvent.logger(this, context, intent);
+
+        if (mOverrideDelegatedAdminReceiverClassName != null) {
+            logger.setDelegatedAdminReceiver(mOverrideDelegatedAdminReceiverClassName);
+        }
+
+        logger.log();
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibService.java b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibService.java
new file mode 100644
index 0000000..a443790
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/main/java/com/android/eventlib/premade/EventLibService.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2021 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.eventlib.premade;
+
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Binder;
+import android.os.IBinder;
+
+import com.android.eventlib.events.services.ServiceBoundEvent;
+import com.android.eventlib.events.services.ServiceConfigurationChangedEvent;
+import com.android.eventlib.events.services.ServiceCreatedEvent;
+import com.android.eventlib.events.services.ServiceDestroyedEvent;
+import com.android.eventlib.events.services.ServiceLowMemoryEvent;
+import com.android.eventlib.events.services.ServiceMemoryTrimmedEvent;
+import com.android.eventlib.events.services.ServiceReboundEvent;
+import com.android.eventlib.events.services.ServiceStartedEvent;
+import com.android.eventlib.events.services.ServiceTaskRemovedEvent;
+import com.android.eventlib.events.services.ServiceUnboundEvent;
+
+/**
+ * An {@link Service} which logs events for all lifecycle events.
+ */
+public class EventLibService extends Service {
+
+    private String mOverrideServiceClassName;
+    private final IBinder mBinder = new Binder();
+
+    public void setOverrideServiceClassName(String overrideServiceClassName) {
+        mOverrideServiceClassName = overrideServiceClassName;
+    }
+
+    /**
+     * Gets the class name of this service.
+     *
+     * <p>If the class name has been overridden, that will be returned instead.
+     */
+    public String getClassName() {
+        if (mOverrideServiceClassName != null) {
+            return mOverrideServiceClassName;
+        }
+
+        return EventLibService.class.getName();
+    }
+
+    public ComponentName getComponentName() {
+        return new ComponentName(getApplication().getPackageName(), getClassName());
+    }
+
+    @Override
+    public void onCreate() {
+        ServiceCreatedEvent.logger(this, getClassName()).log();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        ServiceStartedEvent.logger(this, getClassName(), intent, flags, startId).log();
+        return super.onStartCommand(intent, flags, startId);
+    }
+
+    @Override
+    public void onDestroy() {
+        ServiceDestroyedEvent.logger(this, getClassName()).log();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        ServiceConfigurationChangedEvent.logger(this, getClassName(), newConfig).log();
+    }
+
+    @Override
+    public void onLowMemory() {
+        ServiceLowMemoryEvent.logger(this, getClassName()).log();
+    }
+
+    @Override
+    public void onTrimMemory(int level) {
+        ServiceMemoryTrimmedEvent.logger(this, getClassName(), level).log();
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        ServiceBoundEvent.logger(this, getClassName(), intent).log();
+        return mBinder;
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        ServiceUnboundEvent.logger(this, getClassName(), intent).log();
+        return super.onUnbind(intent);
+    }
+
+    @Override
+    public void onRebind(Intent intent) {
+        ServiceReboundEvent.logger(this, getClassName(), intent).log();
+    }
+
+    @Override
+    public void onTaskRemoved(Intent rootIntent) {
+        ServiceTaskRemovedEvent.logger(this, getClassName(), rootIntent).log();
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/test/AndroidManifest.xml b/common/device-side/bedstead/eventlib/src/test/AndroidManifest.xml
index 68b4c3d..a626be8 100644
--- a/common/device-side/bedstead/eventlib/src/test/AndroidManifest.xml
+++ b/common/device-side/bedstead/eventlib/src/test/AndroidManifest.xml
@@ -52,6 +52,21 @@
             </intent-filter>
         </receiver>
 
+        <receiver android:name="com.android.eventlib.premade.EventLibDelegatedAdminReceiver"
+                  android:permission="android.permission.BIND_DEVICE_ADMIN"
+                  android:exported="true">
+
+            <intent-filter>
+                <action android:name="android.app.action.CHOOSE_PRIVATE_KEY_ALIAS"/>
+                <action android:name="android.app.action.NETWORK_LOGS_AVAILABLE"/>
+                <action android:name="android.app.action.SECURITY_LOGS_AVAILABLE"/>
+            </intent-filter>
+        </receiver>
+
+        <service android:name="com.android.eventlib.premade.EventLibService"
+                 android:exported="true" />
+        <service android:name="com.android.generatedEventLibService" />
+
     </application>
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
                      android:targetPackage="com.android.eventlib.test"
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/CustomEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/CustomEventTest.java
index 50c5bea..28c0e2d 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/CustomEventTest.java
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/CustomEventTest.java
@@ -116,7 +116,7 @@
                 .whereTag().isEqualTo("TAG");
 
         assertThat(customEvent.describeQuery(FIELD_NAME))
-                .isEqualTo("{type=CustomEvent, packageName=PACKAGE, tag=TAG}");
+                .isEqualTo("{type=CustomEvent, packageName=PACKAGE, tag=\"TAG\"}");
     }
 
     @Test
@@ -135,6 +135,6 @@
                 .whereData().isEqualTo("DATA");
 
         assertThat(customEvent.describeQuery(FIELD_NAME))
-                .isEqualTo("{type=CustomEvent, packageName=PACKAGE, tag=TAG, data=DATA}");
+                .isEqualTo("{type=CustomEvent, packageName=PACKAGE, tag=\"TAG\", data=DATA}");
     }
 }
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityCreatedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityCreatedEventTest.java
index 712b927..a4fe177 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityCreatedEventTest.java
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityCreatedEventTest.java
@@ -39,6 +39,8 @@
     private static final String STRING_KEY = "Key";
     private static final String STRING_VALUE = "Value";
     private static final String DIFFERENT_STRING_VALUE = "Value2";
+    private static final int TASK_ID = 1;
+    private static final int DIFFERENT_TASK_ID = 2;
 
     private final Bundle mSavedInstanceState = new Bundle();
     private final PersistableBundle mPersistentState = new PersistableBundle();
@@ -157,4 +159,36 @@
         assertThat(eventLogs.poll().activity().className()).isEqualTo(ACTIVITY_CLASS_NAME);
     }
 
+    @Test
+    public void whereTaskId_works() throws Exception {
+        ActivityContext.runWithContext((activity) ->
+                ActivityCreatedEvent.logger(activity, ACTIVITY_INFO, mSavedInstanceState)
+                        .setTaskId(TASK_ID)
+                        .log());
+
+        EventLogs<ActivityCreatedEvent> eventLogs =
+                ActivityCreatedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
+    @Test
+    public void whereTaskId_skipsNonMatching() throws Exception {
+        ActivityContext.runWithContext((activity) -> {
+            ActivityCreatedEvent.logger(activity, ACTIVITY_INFO, mSavedInstanceState)
+                    .setTaskId(DIFFERENT_TASK_ID)
+                    .log();
+            ActivityCreatedEvent.logger(activity, ACTIVITY_INFO, mSavedInstanceState)
+                    .setTaskId(TASK_ID)
+                    .log();
+        });
+
+        EventLogs<ActivityCreatedEvent> eventLogs =
+                ActivityCreatedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
 }
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityDestroyedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityDestroyedEventTest.java
index 853451c..fe01b4c 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityDestroyedEventTest.java
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityDestroyedEventTest.java
@@ -34,6 +34,8 @@
 public final class ActivityDestroyedEventTest {
 
     private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final int TASK_ID = 1;
+    private static final int DIFFERENT_TASK_ID = 2;
 
     private static final String ACTIVITY_CLASS_NAME = ActivityContext.class.getName();
     private static final ActivityInfo ACTIVITY_INFO = new ActivityInfo();
@@ -75,4 +77,36 @@
         assertThat(eventLogs.poll().activity().className()).isEqualTo(ACTIVITY_CLASS_NAME);
     }
 
+    @Test
+    public void whereTaskId_works() throws Exception {
+        ActivityContext.runWithContext((activity) ->
+                ActivityDestroyedEvent.logger(activity, ACTIVITY_INFO)
+                        .setTaskId(TASK_ID)
+                        .log());
+
+        EventLogs<ActivityDestroyedEvent> eventLogs =
+                ActivityDestroyedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
+    @Test
+    public void whereTaskId_skipsNonMatching() throws Exception {
+        ActivityContext.runWithContext((activity) -> {
+            ActivityDestroyedEvent.logger(activity, ACTIVITY_INFO)
+                    .setTaskId(DIFFERENT_TASK_ID)
+                    .log();
+            ActivityDestroyedEvent.logger(activity, ACTIVITY_INFO)
+                    .setTaskId(TASK_ID)
+                    .log();
+        });
+
+        EventLogs<ActivityDestroyedEvent> eventLogs =
+                ActivityDestroyedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
 }
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityPausedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityPausedEventTest.java
index 84208d9..a041c31 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityPausedEventTest.java
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityPausedEventTest.java
@@ -34,6 +34,8 @@
 public final class ActivityPausedEventTest {
 
     private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final int TASK_ID = 1;
+    private static final int DIFFERENT_TASK_ID = 2;
 
     private static final String ACTIVITY_CLASS_NAME = ActivityContext.class.getName();
     private static final ActivityInfo ACTIVITY_INFO = new ActivityInfo();
@@ -75,4 +77,36 @@
         assertThat(eventLogs.poll().activity().className()).isEqualTo(ACTIVITY_CLASS_NAME);
     }
 
+    @Test
+    public void whereTaskId_works() throws Exception {
+        ActivityContext.runWithContext((activity) ->
+                ActivityPausedEvent.logger(activity, ACTIVITY_INFO)
+                        .setTaskId(TASK_ID)
+                        .log());
+
+        EventLogs<ActivityPausedEvent> eventLogs =
+                ActivityPausedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
+    @Test
+    public void whereTaskId_skipsNonMatching() throws Exception {
+        ActivityContext.runWithContext((activity) -> {
+            ActivityPausedEvent.logger(activity, ACTIVITY_INFO)
+                    .setTaskId(DIFFERENT_TASK_ID)
+                    .log();
+            ActivityPausedEvent.logger(activity, ACTIVITY_INFO)
+                    .setTaskId(TASK_ID)
+                    .log();
+        });
+
+        EventLogs<ActivityPausedEvent> eventLogs =
+                ActivityPausedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
 }
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityRestartedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityRestartedEventTest.java
index 6961ead..caf81c4 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityRestartedEventTest.java
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityRestartedEventTest.java
@@ -34,6 +34,8 @@
 public final class ActivityRestartedEventTest {
 
     private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final int TASK_ID = 1;
+    private static final int DIFFERENT_TASK_ID = 2;
 
     private static final String ACTIVITY_CLASS_NAME = ActivityContext.class.getName();
     private static final ActivityInfo ACTIVITY_INFO = new ActivityInfo();
@@ -75,4 +77,36 @@
         assertThat(eventLogs.poll().activity().className()).isEqualTo(ACTIVITY_CLASS_NAME);
     }
 
+    @Test
+    public void whereTaskId_works() throws Exception {
+        ActivityContext.runWithContext((activity) ->
+                ActivityRestartedEvent.logger(activity, ACTIVITY_INFO)
+                        .setTaskId(TASK_ID)
+                        .log());
+
+        EventLogs<ActivityRestartedEvent> eventLogs =
+                ActivityRestartedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
+    @Test
+    public void whereTaskId_skipsNonMatching() throws Exception {
+        ActivityContext.runWithContext((activity) -> {
+            ActivityRestartedEvent.logger(activity, ACTIVITY_INFO)
+                    .setTaskId(DIFFERENT_TASK_ID)
+                    .log();
+            ActivityRestartedEvent.logger(activity, ACTIVITY_INFO)
+                    .setTaskId(TASK_ID)
+                    .log();
+        });
+
+        EventLogs<ActivityRestartedEvent> eventLogs =
+                ActivityRestartedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
 }
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityResumedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityResumedEventTest.java
index a718405..1a7fb34 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityResumedEventTest.java
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityResumedEventTest.java
@@ -34,6 +34,8 @@
 public final class ActivityResumedEventTest {
 
     private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final int TASK_ID = 1;
+    private static final int DIFFERENT_TASK_ID = 2;
 
     private static final String ACTIVITY_CLASS_NAME = ActivityContext.class.getName();
     private static final ActivityInfo ACTIVITY_INFO = new ActivityInfo();
@@ -75,4 +77,36 @@
         assertThat(eventLogs.poll().activity().className()).isEqualTo(ACTIVITY_CLASS_NAME);
     }
 
+    @Test
+    public void whereTaskId_works() throws Exception {
+        ActivityContext.runWithContext((activity) ->
+                ActivityResumedEvent.logger(activity, ACTIVITY_INFO)
+                        .setTaskId(TASK_ID)
+                        .log());
+
+        EventLogs<ActivityResumedEvent> eventLogs =
+                ActivityResumedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
+    @Test
+    public void whereTaskId_skipsNonMatching() throws Exception {
+        ActivityContext.runWithContext((activity) -> {
+            ActivityResumedEvent.logger(activity, ACTIVITY_INFO)
+                    .setTaskId(DIFFERENT_TASK_ID)
+                    .log();
+            ActivityResumedEvent.logger(activity, ACTIVITY_INFO)
+                    .setTaskId(TASK_ID)
+                    .log();
+        });
+
+        EventLogs<ActivityResumedEvent> eventLogs =
+                ActivityResumedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
 }
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityStartedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityStartedEventTest.java
index 715fe17..a48f123 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityStartedEventTest.java
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityStartedEventTest.java
@@ -34,6 +34,8 @@
 public final class ActivityStartedEventTest {
 
     private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final int TASK_ID = 1;
+    private static final int DIFFERENT_TASK_ID = 2;
 
     private static final String ACTIVITY_CLASS_NAME = ActivityContext.class.getName();
     private static final ActivityInfo ACTIVITY_INFO = new ActivityInfo();
@@ -75,4 +77,36 @@
         assertThat(eventLogs.poll().activity().className()).isEqualTo(ACTIVITY_CLASS_NAME);
     }
 
+    @Test
+    public void whereTaskId_works() throws Exception {
+        ActivityContext.runWithContext((activity) ->
+                ActivityStartedEvent.logger(activity, ACTIVITY_INFO)
+                        .setTaskId(TASK_ID)
+                        .log());
+
+        EventLogs<ActivityStartedEvent> eventLogs =
+                ActivityStartedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
+    @Test
+    public void whereTaskId_skipsNonMatching() throws Exception {
+        ActivityContext.runWithContext((activity) -> {
+            ActivityStartedEvent.logger(activity, ACTIVITY_INFO)
+                    .setTaskId(DIFFERENT_TASK_ID)
+                    .log();
+            ActivityStartedEvent.logger(activity, ACTIVITY_INFO)
+                    .setTaskId(TASK_ID)
+                    .log();
+        });
+
+        EventLogs<ActivityStartedEvent> eventLogs =
+                ActivityStartedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
 }
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityStoppedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityStoppedEventTest.java
index c326b7c..260db30 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityStoppedEventTest.java
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/activities/ActivityStoppedEventTest.java
@@ -34,6 +34,8 @@
 public final class ActivityStoppedEventTest {
 
     private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final int TASK_ID = 1;
+    private static final int DIFFERENT_TASK_ID = 2;
 
     private static final String ACTIVITY_CLASS_NAME = ActivityContext.class.getName();
     private static final ActivityInfo ACTIVITY_INFO = new ActivityInfo();
@@ -75,4 +77,36 @@
         assertThat(eventLogs.poll().activity().className()).isEqualTo(ACTIVITY_CLASS_NAME);
     }
 
+    @Test
+    public void whereTaskId_works() throws Exception {
+        ActivityContext.runWithContext((activity) ->
+                ActivityStoppedEvent.logger(activity, ACTIVITY_INFO)
+                        .setTaskId(TASK_ID)
+                        .log());
+
+        EventLogs<ActivityStoppedEvent> eventLogs =
+                ActivityStoppedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
+    @Test
+    public void whereTaskId_skipsNonMatching() throws Exception {
+        ActivityContext.runWithContext((activity) -> {
+            ActivityStoppedEvent.logger(activity, ACTIVITY_INFO)
+                    .setTaskId(DIFFERENT_TASK_ID)
+                    .log();
+            ActivityStoppedEvent.logger(activity, ACTIVITY_INFO)
+                    .setTaskId(TASK_ID)
+                    .log();
+        });
+
+        EventLogs<ActivityStoppedEvent> eventLogs =
+                ActivityStoppedEvent.queryPackage(sContext.getPackageName())
+                        .whereTaskId().isEqualTo(TASK_ID);
+
+        assertThat(eventLogs.poll().taskId()).isEqualTo(TASK_ID);
+    }
+
 }
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminNetworkLogsAvailableEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminNetworkLogsAvailableEventTest.java
new file mode 100644
index 0000000..dc6c057
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminNetworkLogsAvailableEventTest.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.delegatedadminreceivers;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.admin.DelegatedAdminReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.bedstead.nene.TestApis;
+import com.android.eventlib.EventLogs;
+import com.android.eventlib.events.deviceadminreceivers.DelegatedAdminNetworkLogsAvailableEvent;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public final class DelegatedAdminNetworkLogsAvailableEventTest {
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final String STRING_VALUE = "Value";
+    private static final String DIFFERENT_STRING_VALUE = "Value2";
+    private static final Intent INTENT = new Intent();
+
+    private static final String DEFAULT_DEVICE_ADMIN_RECEIVER_CLASS_NAME =
+            TestDelegatedAdminReceiver.class.getName();
+    private static final String CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME =
+            "customDelegatedAdminReceiver";
+    private static final String DIFFERENT_CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME =
+            "customDelegatedAdminReceiver2";
+    private static final DelegatedAdminReceiver DEVICE_ADMIN_RECEIVER = new TestDelegatedAdminReceiver();
+    private static final long BATCH_TOKEN = 1;
+    private static final long DIFFERENT_BATCH_TOKEN = 2;
+    private static final int NETWORK_LOGS_COUNT = 1;
+    private static final int DIFFERENT_NETWORK_LOGS_COUNT = 2;
+
+    private static class TestDelegatedAdminReceiver extends DelegatedAdminReceiver {
+    }
+
+    @Before
+    public void setUp() {
+        EventLogs.resetLogs();
+    }
+
+    @Test
+    public void whereIntent_works() {
+        Intent intent = new Intent(STRING_VALUE);
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                DEVICE_ADMIN_RECEIVER, sContext, intent, BATCH_TOKEN, NETWORK_LOGS_COUNT).log();
+
+        EventLogs<DelegatedAdminNetworkLogsAvailableEvent> eventLogs =
+                DelegatedAdminNetworkLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereIntent().action().isEqualTo(STRING_VALUE);
+
+        assertThat(eventLogs.poll().intent()).isEqualTo(intent);
+    }
+
+    @Test
+    public void whereIntent_skipsNonMatching() {
+        Intent intent = new Intent(STRING_VALUE);
+        Intent differentIntent = new Intent();
+        differentIntent.setAction(DIFFERENT_STRING_VALUE);
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                DEVICE_ADMIN_RECEIVER, sContext, differentIntent, BATCH_TOKEN, NETWORK_LOGS_COUNT).log();
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                DEVICE_ADMIN_RECEIVER, sContext, intent, BATCH_TOKEN, NETWORK_LOGS_COUNT).log();
+
+        EventLogs<DelegatedAdminNetworkLogsAvailableEvent> eventLogs =
+                DelegatedAdminNetworkLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereIntent().action().isEqualTo(STRING_VALUE);
+
+        assertThat(eventLogs.poll().intent()).isEqualTo(intent);
+    }
+
+    @Test
+    public void whereDelegatedAdminReceiver_customValueOnLogger_works() {
+        DelegatedAdminNetworkLogsAvailableEvent.logger(DEVICE_ADMIN_RECEIVER, sContext, INTENT, BATCH_TOKEN, NETWORK_LOGS_COUNT)
+                .setDelegatedAdminReceiver(CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME)
+                .log();
+
+        EventLogs<DelegatedAdminNetworkLogsAvailableEvent> eventLogs =
+                DelegatedAdminNetworkLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereDelegatedAdminReceiver().broadcastReceiver().receiverClass().className().isEqualTo(
+                                CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+
+        assertThat(eventLogs.poll().delegatedAdminReceiver().className()).isEqualTo(
+                CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+    }
+
+    @Test
+    public void whereDelegatedAdminReceiver_customValueOnLogger_skipsNonMatching() {
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                        DEVICE_ADMIN_RECEIVER, sContext, INTENT, BATCH_TOKEN, NETWORK_LOGS_COUNT)
+                .setDelegatedAdminReceiver(DIFFERENT_CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME)
+                .log();
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                        DEVICE_ADMIN_RECEIVER, sContext, INTENT, BATCH_TOKEN, NETWORK_LOGS_COUNT)
+                .setDelegatedAdminReceiver(CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME)
+                .log();
+
+        EventLogs<DelegatedAdminNetworkLogsAvailableEvent> eventLogs =
+                DelegatedAdminNetworkLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereDelegatedAdminReceiver().broadcastReceiver().receiverClass().className().isEqualTo(
+                                CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+
+        assertThat(eventLogs.poll().delegatedAdminReceiver().className()).isEqualTo(
+                CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+    }
+
+    @Test
+    public void whereDelegatedAdminReceiver_defaultValue_works() {
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                DEVICE_ADMIN_RECEIVER, sContext, INTENT, BATCH_TOKEN, NETWORK_LOGS_COUNT).log();
+
+        EventLogs<DelegatedAdminNetworkLogsAvailableEvent> eventLogs =
+                DelegatedAdminNetworkLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereDelegatedAdminReceiver().broadcastReceiver().receiverClass().className()
+                        .isEqualTo(DEFAULT_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+
+        assertThat(eventLogs.poll().delegatedAdminReceiver().className())
+                .isEqualTo(DEFAULT_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+    }
+
+    @Test
+    public void whereDelegatedAdminReceiver_defaultValue_skipsNonMatching() {
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                        DEVICE_ADMIN_RECEIVER, sContext, INTENT, BATCH_TOKEN, NETWORK_LOGS_COUNT)
+                .setDelegatedAdminReceiver(CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME)
+                .log();
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                        DEVICE_ADMIN_RECEIVER, sContext, INTENT, BATCH_TOKEN, NETWORK_LOGS_COUNT)
+                .log();
+
+        EventLogs<DelegatedAdminNetworkLogsAvailableEvent> eventLogs =
+                DelegatedAdminNetworkLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereDelegatedAdminReceiver().broadcastReceiver().receiverClass().className()
+                        .isEqualTo(DEFAULT_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+
+        assertThat(eventLogs.poll().delegatedAdminReceiver().className())
+                .isEqualTo(DEFAULT_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+    }
+
+    @Test
+    public void whereBatchToken_works() {
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                DEVICE_ADMIN_RECEIVER, sContext, INTENT, BATCH_TOKEN, NETWORK_LOGS_COUNT).log();
+
+        EventLogs<DelegatedAdminNetworkLogsAvailableEvent> eventLogs =
+                DelegatedAdminNetworkLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereBatchToken().isEqualTo(BATCH_TOKEN);
+
+        assertThat(eventLogs.poll().batchToken()).isEqualTo(BATCH_TOKEN);
+    }
+
+    @Test
+    public void whereBatchToken_skipsNonMatching() {
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                DEVICE_ADMIN_RECEIVER, sContext, INTENT, DIFFERENT_BATCH_TOKEN, NETWORK_LOGS_COUNT).log();
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                DEVICE_ADMIN_RECEIVER, sContext, INTENT, BATCH_TOKEN, NETWORK_LOGS_COUNT).log();
+
+        EventLogs<DelegatedAdminNetworkLogsAvailableEvent> eventLogs =
+                DelegatedAdminNetworkLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereBatchToken().isEqualTo(BATCH_TOKEN);
+
+        assertThat(eventLogs.poll().batchToken()).isEqualTo(BATCH_TOKEN);
+    }
+
+    @Test
+    public void whereNetworkLogsCount_works() {
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                DEVICE_ADMIN_RECEIVER, sContext, INTENT, BATCH_TOKEN, NETWORK_LOGS_COUNT).log();
+
+        EventLogs<DelegatedAdminNetworkLogsAvailableEvent> eventLogs =
+                DelegatedAdminNetworkLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereNetworkLogsCount().isEqualTo(NETWORK_LOGS_COUNT);
+
+        assertThat(eventLogs.poll().networkLogsCount()).isEqualTo(NETWORK_LOGS_COUNT);
+    }
+
+    @Test
+    public void whereNetworkLogsCount_skipsNonMatching() {
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                DEVICE_ADMIN_RECEIVER, sContext, INTENT, BATCH_TOKEN, DIFFERENT_NETWORK_LOGS_COUNT).log();
+        DelegatedAdminNetworkLogsAvailableEvent.logger(
+                DEVICE_ADMIN_RECEIVER, sContext, INTENT, BATCH_TOKEN, NETWORK_LOGS_COUNT).log();
+
+        EventLogs<DelegatedAdminNetworkLogsAvailableEvent> eventLogs =
+                DelegatedAdminNetworkLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereNetworkLogsCount().isEqualTo(NETWORK_LOGS_COUNT);
+
+        assertThat(eventLogs.poll().networkLogsCount()).isEqualTo(NETWORK_LOGS_COUNT);
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminSecurityLogsAvailableEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminSecurityLogsAvailableEventTest.java
new file mode 100644
index 0000000..42a5565
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/delegatedadminreceivers/DelegatedAdminSecurityLogsAvailableEventTest.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.delegatedadminreceivers;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.admin.DelegatedAdminReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.bedstead.nene.TestApis;
+import com.android.eventlib.EventLogs;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public final class DelegatedAdminSecurityLogsAvailableEventTest {
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final String STRING_VALUE = "Value";
+    private static final String DIFFERENT_STRING_VALUE = "Value2";
+    private static final Intent INTENT = new Intent();
+
+    private static final String DEFAULT_DEVICE_ADMIN_RECEIVER_CLASS_NAME =
+            TestDelegatedAdminReceiver.class.getName();
+    private static final String CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME =
+            "customDelegatedAdminReceiver";
+    private static final String DIFFERENT_CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME =
+            "customDelegatedAdminReceiver2";
+    private static final DelegatedAdminReceiver DEVICE_ADMIN_RECEIVER = new TestDelegatedAdminReceiver();
+
+    private static class TestDelegatedAdminReceiver extends DelegatedAdminReceiver {
+    }
+
+    @Before
+    public void setUp() {
+        EventLogs.resetLogs();
+    }
+
+    @Test
+    public void whereIntent_works() {
+        Intent intent = new Intent(STRING_VALUE);
+        DelegatedAdminSecurityLogsAvailableEvent.logger(DEVICE_ADMIN_RECEIVER, sContext, intent).log();
+
+        EventLogs<DelegatedAdminSecurityLogsAvailableEvent> eventLogs =
+                DelegatedAdminSecurityLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereIntent().action().isEqualTo(STRING_VALUE);
+
+        assertThat(eventLogs.poll().intent()).isEqualTo(intent);
+    }
+
+    @Test
+    public void whereIntent_skipsNonMatching() {
+        Intent intent = new Intent(STRING_VALUE);
+        Intent differentIntent = new Intent();
+        differentIntent.setAction(DIFFERENT_STRING_VALUE);
+        DelegatedAdminSecurityLogsAvailableEvent.logger(
+                DEVICE_ADMIN_RECEIVER, sContext, differentIntent).log();
+        DelegatedAdminSecurityLogsAvailableEvent.logger(DEVICE_ADMIN_RECEIVER, sContext, intent).log();
+
+        EventLogs<DelegatedAdminSecurityLogsAvailableEvent> eventLogs =
+                DelegatedAdminSecurityLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereIntent().action().isEqualTo(STRING_VALUE);
+
+        assertThat(eventLogs.poll().intent()).isEqualTo(intent);
+    }
+
+    @Test
+    public void whereDelegatedAdminReceiver_customValueOnLogger_works() {
+        DelegatedAdminSecurityLogsAvailableEvent.logger(DEVICE_ADMIN_RECEIVER, sContext, INTENT)
+                .setDelegatedAdminReceiver(CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME)
+                .log();
+
+        EventLogs<DelegatedAdminSecurityLogsAvailableEvent> eventLogs =
+                DelegatedAdminSecurityLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereDelegatedAdminReceiver().broadcastReceiver().receiverClass().className()
+                        .isEqualTo(CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+
+        assertThat(eventLogs.poll().delegatedAdminReceiver().className()).isEqualTo(
+                CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+    }
+
+    @Test
+    public void whereDelegatedAdminReceiver_customValueOnLogger_skipsNonMatching() {
+        DelegatedAdminSecurityLogsAvailableEvent.logger(DEVICE_ADMIN_RECEIVER, sContext, INTENT)
+                .setDelegatedAdminReceiver(DIFFERENT_CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME)
+                .log();
+        DelegatedAdminSecurityLogsAvailableEvent.logger(DEVICE_ADMIN_RECEIVER, sContext, INTENT)
+                .setDelegatedAdminReceiver(CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME)
+                .log();
+
+        EventLogs<DelegatedAdminSecurityLogsAvailableEvent> eventLogs =
+                DelegatedAdminSecurityLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereDelegatedAdminReceiver().broadcastReceiver().receiverClass().className()
+                        .isEqualTo(CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+
+        assertThat(eventLogs.poll().delegatedAdminReceiver().className()).isEqualTo(
+                CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+    }
+
+    @Test
+    public void whereDelegatedAdminReceiver_defaultValue_works() {
+        DelegatedAdminSecurityLogsAvailableEvent.logger(DEVICE_ADMIN_RECEIVER, sContext, INTENT).log();
+
+        EventLogs<DelegatedAdminSecurityLogsAvailableEvent> eventLogs =
+                DelegatedAdminSecurityLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereDelegatedAdminReceiver().broadcastReceiver().receiverClass().className()
+                        .isEqualTo(DEFAULT_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+
+        assertThat(eventLogs.poll().delegatedAdminReceiver().className())
+                .isEqualTo(DEFAULT_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+    }
+
+    @Test
+    public void whereDelegatedAdminReceiver_defaultValue_skipsNonMatching() {
+        DelegatedAdminSecurityLogsAvailableEvent.logger(DEVICE_ADMIN_RECEIVER, sContext, INTENT)
+                .setDelegatedAdminReceiver(CUSTOM_DEVICE_ADMIN_RECEIVER_CLASS_NAME)
+                .log();
+        DelegatedAdminSecurityLogsAvailableEvent.logger(DEVICE_ADMIN_RECEIVER, sContext, INTENT)
+                .log();
+
+        EventLogs<DelegatedAdminSecurityLogsAvailableEvent> eventLogs =
+                DelegatedAdminSecurityLogsAvailableEvent.queryPackage(sContext.getPackageName())
+                        .whereDelegatedAdminReceiver().broadcastReceiver().receiverClass().className()
+                        .isEqualTo(DEFAULT_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+
+        assertThat(eventLogs.poll().delegatedAdminReceiver().className())
+                .isEqualTo(DEFAULT_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+    }
+}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceBoundEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceBoundEventTest.java
new file mode 100644
index 0000000..fdee0ba
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceBoundEventTest.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
+//@RunWith(JUnit4.class)
+public class ServiceBoundEventTest {}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceConfigurationChangedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceConfigurationChangedEventTest.java
new file mode 100644
index 0000000..a51c57b
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceConfigurationChangedEventTest.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
+//@RunWith(JUnit4.class)
+public class ServiceConfigurationChangedEventTest {}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceCreatedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceCreatedEventTest.java
new file mode 100644
index 0000000..406fa9c
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceCreatedEventTest.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
+//@RunWith(JUnit4.class)
+public class ServiceCreatedEventTest {
+}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceDestroyedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceDestroyedEventTest.java
new file mode 100644
index 0000000..f5e7cd6
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceDestroyedEventTest.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
+//@RunWith(JUnit4.class)
+public class ServiceDestroyedEventTest {
+}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceLowMemoryEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceLowMemoryEventTest.java
new file mode 100644
index 0000000..edd15e8
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceLowMemoryEventTest.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
+//@RunWith(JUnit4.class)
+public class ServiceLowMemoryEventTest {}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceMemoryTrimmedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceMemoryTrimmedEventTest.java
new file mode 100644
index 0000000..c633e3e
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceMemoryTrimmedEventTest.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
+//@RunWith(JUnit4.class)
+public class ServiceMemoryTrimmedEventTest {}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceReboundEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceReboundEventTest.java
new file mode 100644
index 0000000..0c09f39
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceReboundEventTest.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
+//@RunWith(JUnit4.class)
+public class ServiceReboundEventTest {}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceStartedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceStartedEventTest.java
new file mode 100644
index 0000000..a2c5517
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceStartedEventTest.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
+//@RunWith(JUnit4.class)
+public class ServiceStartedEventTest {
+}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceTaskRemovedEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceTaskRemovedEventTest.java
new file mode 100644
index 0000000..878a41a
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceTaskRemovedEventTest.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
+//@RunWith(JUnit4.class)
+public class ServiceTaskRemovedEventTest {}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceUnboundEventTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceUnboundEventTest.java
new file mode 100644
index 0000000..0a92061
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/events/services/ServiceUnboundEventTest.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021 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.eventlib.events.services;
+
+//TODO(b/204770471) Currently unable to create these tests without an instrumented service.
+//@RunWith(JUnit4.class)
+public class ServiceUnboundEventTest {
+}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibAppComponentFactoryTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibAppComponentFactoryTest.java
index b8f688d..250a705 100644
--- a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibAppComponentFactoryTest.java
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibAppComponentFactoryTest.java
@@ -26,6 +26,7 @@
 import com.android.eventlib.EventLogs;
 import com.android.eventlib.events.activities.ActivityCreatedEvent;
 import com.android.eventlib.events.broadcastreceivers.BroadcastReceivedEvent;
+import com.android.eventlib.events.services.ServiceCreatedEvent;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,6 +50,10 @@
     private static final String GENERATED_BROADCAST_RECEIVER_ACTION =
             "com.android.eventlib.GENERATED_BROADCAST_RECEIVER";
 
+    // This must exist as a <service> in AndroidManifest.xml
+    private static final String GENERATED_SERVICE_CLASS_NAME =
+            "com.android.generatedEventLibService";
+
     private static final Context sContext =
             TestApis.context().instrumentedContext();
 
@@ -79,4 +84,21 @@
         assertThat(eventLogs.poll()).isNotNull();
     }
 
+    @Test
+    public void startService_serviceDoesNotExist_startsLoggingService() {
+        Intent intent = new Intent();
+        intent.setComponent(new ComponentName(sContext.getPackageName(),
+                GENERATED_SERVICE_CLASS_NAME));
+
+        sContext.startService(intent);
+
+        EventLogs<ServiceCreatedEvent> eventLogs =
+                ServiceCreatedEvent.queryPackage(sContext.getPackageName())
+                        .whereService().serviceClass().className()
+                            .isEqualTo(GENERATED_SERVICE_CLASS_NAME);
+        assertThat(eventLogs.poll()).isNotNull();
+
+        sContext.stopService(intent);
+    }
+
 }
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibDelegatedAdminReceiverTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibDelegatedAdminReceiverTest.java
new file mode 100644
index 0000000..5959f15
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibDelegatedAdminReceiverTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2021 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.eventlib.premade;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.nene.TestApis;
+import com.android.eventlib.EventLogs;
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminChoosePrivateKeyAliasEvent;
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminSecurityLogsAvailableEvent;
+import com.android.eventlib.events.deviceadminreceivers.DelegatedAdminNetworkLogsAvailableEvent;
+
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public class EventLibDelegatedAdminReceiverTest {
+
+    @ClassRule @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final Intent sIntent = new Intent();
+    private static final int UID = 1;
+    private static final Uri URI = Uri.parse("http://uri");
+    private static final String ALIAS = "alias";
+    private static final long BATCH_TOKEN = 1;
+    private static final int NETWORK_LOGS_COUNT = 1;
+
+    @Before
+    public void setUp() {
+        EventLogs.resetLogs();
+    }
+
+    @Test
+    public void choosePrivateKeyAlias_logsChoosePrivateKeyAliasEvent() {
+        EventLibDelegatedAdminReceiver receiver = new EventLibDelegatedAdminReceiver();
+
+        receiver.onChoosePrivateKeyAlias(sContext, sIntent, UID, URI, ALIAS);
+
+        EventLogs<DelegatedAdminChoosePrivateKeyAliasEvent> eventLogs =
+                DelegatedAdminChoosePrivateKeyAliasEvent.queryPackage(sContext.getPackageName());
+        assertThat(eventLogs.poll().intent()).isEqualTo(sIntent);
+    }
+
+    @Test
+    public void securityLogsAvailable_logsSecurityLogsAvailableEvent() {
+        EventLibDelegatedAdminReceiver receiver = new EventLibDelegatedAdminReceiver();
+
+        receiver.onSecurityLogsAvailable(sContext, sIntent);
+
+        EventLogs<DelegatedAdminSecurityLogsAvailableEvent> eventLogs =
+                DelegatedAdminSecurityLogsAvailableEvent.queryPackage(sContext.getPackageName());
+        assertThat(eventLogs.poll().intent()).isEqualTo(sIntent);
+    }
+
+    @Test
+    public void networkLogsAvailable_logsNetworksLogsAvailableEvent() {
+        EventLibDelegatedAdminReceiver receiver = new EventLibDelegatedAdminReceiver();
+
+        receiver.onNetworkLogsAvailable(sContext, sIntent, BATCH_TOKEN, NETWORK_LOGS_COUNT);
+
+        EventLogs<DelegatedAdminNetworkLogsAvailableEvent> eventLogs =
+                DelegatedAdminNetworkLogsAvailableEvent.queryPackage(sContext.getPackageName());
+        assertThat(eventLogs.poll().intent()).isEqualTo(sIntent);
+    }
+
+}
diff --git a/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibServiceTest.java b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibServiceTest.java
new file mode 100644
index 0000000..ad7a577
--- /dev/null
+++ b/common/device-side/bedstead/eventlib/src/test/java/com/android/eventlib/premade/EventLibServiceTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2021 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.eventlib.premade;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.bedstead.nene.TestApis;
+import com.android.eventlib.EventLogs;
+import com.android.eventlib.events.services.ServiceCreatedEvent;
+
+import org.junit.Before;
+import org.junit.Test;
+
+//TODO(b/204770471) Currently unable to create tests for most events without an instrumented
+// service.
+public class EventLibServiceTest {
+
+    // This must exist as a <service> in AndroidManifest.xml
+    private static final String GENERATED_SERVICE_CLASS_NAME =
+            "com.android.generatedEventLibService";
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+
+    @Before
+    public void setUp() {
+        EventLogs.resetLogs();
+    }
+
+    @Test
+    public void launchEventLibService_logsServiceCreatedEvent() {
+        Intent intent = new Intent();
+        intent.setPackage(sContext.getPackageName());
+        intent.setClassName(sContext.getPackageName(), EventLibService.class.getName());
+        sContext.startService(intent);
+
+        EventLogs<ServiceCreatedEvent> eventLogs = ServiceCreatedEvent
+                .queryPackage(sContext.getPackageName())
+                .whereService().serviceClass().isSameClassAs(EventLibService.class);
+        assertThat(eventLogs.poll()).isNotNull();
+    }
+
+    @Test
+    public void launchEventLibService_withGeneratedServiceClass_logsServiceCreatedEventWithCorrectClassName() {
+        Intent intent = new Intent();
+        intent.setPackage(sContext.getPackageName());
+        intent.setClassName(sContext.getPackageName(), GENERATED_SERVICE_CLASS_NAME);
+        sContext.startService(intent);
+
+        EventLogs<ServiceCreatedEvent> eventLogs = ServiceCreatedEvent
+                .queryPackage(sContext.getPackageName())
+                .whereService().serviceClass().className().isEqualTo(GENERATED_SERVICE_CLASS_NAME);
+        assertThat(eventLogs.poll()).isNotNull();
+
+        sContext.stopService(intent);
+    }
+}
diff --git a/common/device-side/bedstead/harrier/Android.bp b/common/device-side/bedstead/harrier/Android.bp
index e3f6715..53c09da 100644
--- a/common/device-side/bedstead/harrier/Android.bp
+++ b/common/device-side/bedstead/harrier/Android.bp
@@ -16,6 +16,40 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+java_library_host {
+    name: "HarrierCommon",
+    srcs: [
+        "common/src/main/java/**/*.java",
+    ],
+
+    static_libs: [
+        "junit",
+        "auto_value_annotations",
+        "guava",
+        "NeneCommon"
+    ],
+
+    plugins: ["auto_annotation_plugin"]
+}
+
+android_library {
+    name: "HarrierCommonAndroid",
+    srcs: [
+        "common/src/main/java/**/*.java",
+    ],
+
+    static_libs: [
+        "junit",
+        "auto_value_annotations",
+        "guava",
+        "NeneCommonAndroid"
+    ],
+
+    manifest: "src/main/AndroidManifest.xml",
+    min_sdk_version: "27",
+    plugins: ["auto_annotation_plugin"]
+}
+
 android_library {
     name: "Harrier",
     sdk_version: "test_current",
@@ -27,6 +61,7 @@
     static_libs: [
         "Nene",
         "RemoteDPC",
+        "HarrierCommonAndroid",
         "compatibility-device-util-axt",
         "androidx.test.ext.junit",
         "auto_value_annotations"
@@ -34,7 +69,6 @@
 
     manifest: "src/main/AndroidManifest.xml",
     min_sdk_version: "27",
-    plugins: ["auto_annotation_plugin"],
 }
 
 android_test {
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/BedsteadFrameworkMethod.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/BedsteadFrameworkMethod.java
new file mode 100644
index 0000000..2d5c108
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/BedsteadFrameworkMethod.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier;
+
+import com.google.common.base.Objects;
+
+import org.junit.runners.model.FrameworkMethod;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+/**
+ * {@link FrameworkMethod} subclass which allows modifying the test name and annotations.
+ */
+public final class BedsteadFrameworkMethod extends FrameworkMethod {
+
+    private final Annotation mParameterizedAnnotation;
+    private final Map<Class<? extends Annotation>, Annotation> mAnnotationsMap =
+            new HashMap<>();
+    private Annotation[] mAnnotations;
+
+    public BedsteadFrameworkMethod(Method method) {
+        this(method, /* parameterizedAnnotation= */ null);
+    }
+
+    public BedsteadFrameworkMethod(Method method,
+            @Nullable Annotation parameterizedAnnotation) {
+        super(method);
+        mParameterizedAnnotation = parameterizedAnnotation;
+
+        calculateAnnotations();
+    }
+
+    private void calculateAnnotations() {
+        List<Annotation> annotations =
+                new ArrayList<>(Arrays.asList(getDeclaringClass().getAnnotations()));
+        annotations.sort(BedsteadJUnit4::annotationSorter);
+
+        annotations.addAll(Arrays.stream(getMethod().getAnnotations())
+                .sorted(BedsteadJUnit4::annotationSorter)
+                .collect(Collectors.toList()));
+
+        BedsteadJUnit4.parseEnterpriseAnnotations(annotations);
+        BedsteadJUnit4.parsePermissionAnnotations(annotations);
+        BedsteadJUnit4.parseUserAnnotations(annotations);
+
+        BedsteadJUnit4.resolveRecursiveAnnotations(annotations, mParameterizedAnnotation);
+
+        mAnnotations = annotations.toArray(new Annotation[0]);
+        for (Annotation annotation : annotations) {
+            if (annotation instanceof DynamicParameterizedAnnotation) {
+                continue; // don't return this
+            }
+            mAnnotationsMap.put(annotation.annotationType(), annotation);
+        }
+    }
+
+    @Override
+    public String getName() {
+        if (mParameterizedAnnotation == null) {
+            return super.getName();
+        }
+        return super.getName() + "[" + BedsteadJUnit4.getParameterName(mParameterizedAnnotation)
+                + "]";
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (!super.equals(obj)) {
+            return false;
+        }
+
+        if (!(obj instanceof BedsteadFrameworkMethod)) {
+            return false;
+        }
+
+        BedsteadFrameworkMethod other = (BedsteadFrameworkMethod) obj;
+
+        return Objects.equal(mParameterizedAnnotation, other.mParameterizedAnnotation);
+    }
+
+    @Override
+    public Annotation[] getAnnotations() {
+        return mAnnotations;
+    }
+
+    @Override
+    public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
+        return (T) mAnnotationsMap.get(annotationType);
+    }
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/BedsteadJUnit4.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/BedsteadJUnit4.java
new file mode 100644
index 0000000..5744b20
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/BedsteadJUnit4.java
@@ -0,0 +1,761 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.CrossUserTest;
+import com.android.bedstead.harrier.annotations.EnsureDoesNotHavePermission;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.EnsureHasSecondaryUser;
+import com.android.bedstead.harrier.annotations.EnsureHasTvProfile;
+import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile;
+import com.android.bedstead.harrier.annotations.EnumTestParameter;
+import com.android.bedstead.harrier.annotations.IntTestParameter;
+import com.android.bedstead.harrier.annotations.OtherUser;
+import com.android.bedstead.harrier.annotations.PermissionTest;
+import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
+import com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser;
+import com.android.bedstead.harrier.annotations.RequireRunOnSystemUser;
+import com.android.bedstead.harrier.annotations.RequireRunOnTvProfile;
+import com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile;
+import com.android.bedstead.harrier.annotations.StringTestParameter;
+import com.android.bedstead.harrier.annotations.UserPair;
+import com.android.bedstead.harrier.annotations.UserTest;
+import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyDoesNotApplyTest;
+import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeNone;
+import com.android.bedstead.nene.annotations.Nullable;
+import com.android.bedstead.nene.exceptions.NeneException;
+
+import com.google.auto.value.AutoAnnotation;
+
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.TestClass;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Parameter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * A JUnit test runner for use with Bedstead.
+ */
+public final class BedsteadJUnit4 extends BlockJUnit4ClassRunner {
+
+    private static final String BEDSTEAD_PACKAGE_NAME = "com.android.bedstead";
+
+    @AutoAnnotation
+    private static EnsureHasPermission ensureHasPermission(String[] value) {
+        return new AutoAnnotation_BedsteadJUnit4_ensureHasPermission(value);
+    }
+
+    @AutoAnnotation
+    private static EnsureDoesNotHavePermission ensureDoesNotHavePermission(String[] value) {
+        return new AutoAnnotation_BedsteadJUnit4_ensureDoesNotHavePermission(value);
+    }
+
+    @AutoAnnotation
+    private static RequireRunOnSystemUser requireRunOnSystemUser() {
+        return new AutoAnnotation_BedsteadJUnit4_requireRunOnSystemUser();
+    }
+
+    @AutoAnnotation
+    private static RequireRunOnPrimaryUser requireRunOnPrimaryUser() {
+        return new AutoAnnotation_BedsteadJUnit4_requireRunOnPrimaryUser();
+    }
+
+    @AutoAnnotation
+    private static RequireRunOnSecondaryUser requireRunOnSecondaryUser() {
+        return new AutoAnnotation_BedsteadJUnit4_requireRunOnSecondaryUser();
+    }
+
+    @AutoAnnotation
+    private static RequireRunOnWorkProfile requireRunOnWorkProfile() {
+        return new AutoAnnotation_BedsteadJUnit4_requireRunOnWorkProfile();
+    }
+
+    @AutoAnnotation
+    private static RequireRunOnTvProfile requireRunOnTvProfile() {
+        return new AutoAnnotation_BedsteadJUnit4_requireRunOnTvProfile();
+    }
+
+    @AutoAnnotation
+    private static EnsureHasSecondaryUser ensureHasSecondaryUser() {
+        return new AutoAnnotation_BedsteadJUnit4_ensureHasSecondaryUser();
+    }
+
+    @AutoAnnotation
+    private static EnsureHasWorkProfile ensureHasWorkProfile() {
+        return new AutoAnnotation_BedsteadJUnit4_ensureHasWorkProfile();
+    }
+
+    @AutoAnnotation
+    private static EnsureHasTvProfile ensureHasTvProfile() {
+        return new AutoAnnotation_BedsteadJUnit4_ensureHasTvProfile();
+    }
+
+    @AutoAnnotation
+    private static OtherUser otherUser(UserType value) {
+        return new AutoAnnotation_BedsteadJUnit4_otherUser(value);
+    }
+
+    // These are annotations which are not included indirectly
+    private static final Set<String> sIgnoredAnnotationPackages = new HashSet<>();
+
+    static {
+        sIgnoredAnnotationPackages.add("java.lang.annotation");
+        sIgnoredAnnotationPackages.add("com.android.bedstead.harrier.annotations.meta");
+        sIgnoredAnnotationPackages.add("kotlin.*");
+        sIgnoredAnnotationPackages.add("org.junit");
+    }
+
+    static int annotationSorter(Annotation a, Annotation b) {
+        return getAnnotationWeight(a) - getAnnotationWeight(b);
+    }
+
+    private static int getAnnotationWeight(Annotation annotation) {
+        if (annotation instanceof DynamicParameterizedAnnotation) {
+            // Special case, not important
+            return AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
+        }
+
+        if (!annotation.annotationType().getPackage().getName().startsWith(BEDSTEAD_PACKAGE_NAME)) {
+            return AnnotationRunPrecedence.FIRST;
+        }
+
+        try {
+            return (int) annotation.annotationType().getMethod("weight").invoke(annotation);
+        } catch (NoSuchMethodException e) {
+            // Default to PRECEDENCE_NOT_IMPORTANT if no weight is found on the annotation.
+            return AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
+        } catch (IllegalAccessException | InvocationTargetException e) {
+            throw new NeneException("Failed to invoke weight on this annotation: " + annotation, e);
+        }
+    }
+
+    static String getParameterName(Annotation annotation) {
+        if (annotation instanceof DynamicParameterizedAnnotation) {
+            return ((DynamicParameterizedAnnotation) annotation).name();
+        }
+        return annotation.annotationType().getSimpleName();
+    }
+
+    /**
+     * Resolve annotations recursively.
+     *
+     * @param parameterizedAnnotation The class of the parameterized annotation to expand, if any
+     */
+    public static void resolveRecursiveAnnotations(List<Annotation> annotations,
+            @Nullable Annotation parameterizedAnnotation) {
+        int index = 0;
+        while (index < annotations.size()) {
+            Annotation annotation = annotations.get(index);
+            annotations.remove(index);
+            List<Annotation> replacementAnnotations =
+                    getReplacementAnnotations(annotation, parameterizedAnnotation);
+            replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
+            annotations.addAll(index, replacementAnnotations);
+            index += replacementAnnotations.size();
+        }
+    }
+
+    private static boolean isParameterizedAnnotation(Annotation annotation) {
+        if (annotation instanceof DynamicParameterizedAnnotation) {
+            return true;
+        }
+
+        return annotation.annotationType().getAnnotation(ParameterizedAnnotation.class) != null;
+    }
+
+    private static Annotation[] getIndirectAnnotations(Annotation annotation) {
+        if (annotation instanceof DynamicParameterizedAnnotation) {
+            return ((DynamicParameterizedAnnotation) annotation).annotations();
+        }
+        return annotation.annotationType().getAnnotations();
+    }
+
+    private static boolean isRepeatingAnnotation(Annotation annotation) {
+        if (annotation instanceof DynamicParameterizedAnnotation) {
+            return false;
+        }
+
+        return annotation.annotationType().getAnnotation(RepeatingAnnotation.class) != null;
+    }
+
+    private static List<Annotation> getReplacementAnnotations(Annotation annotation,
+            @Nullable Annotation parameterizedAnnotation) {
+        List<Annotation> replacementAnnotations = new ArrayList<>();
+
+        if (isRepeatingAnnotation(annotation)) {
+            try {
+                Annotation[] annotations =
+                        (Annotation[]) annotation.annotationType()
+                                .getMethod("value").invoke(annotation);
+                Collections.addAll(replacementAnnotations, annotations);
+                return replacementAnnotations;
+            } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
+                throw new NeneException("Error expanding repeated annotations", e);
+            }
+        }
+
+        if (isParameterizedAnnotation(annotation) && !annotation.equals(parameterizedAnnotation)) {
+            return replacementAnnotations;
+        }
+
+        for (Annotation indirectAnnotation : getIndirectAnnotations(annotation)) {
+            if (shouldSkipAnnotation(annotation)) {
+                continue;
+            }
+
+            replacementAnnotations.addAll(getReplacementAnnotations(
+                    indirectAnnotation, parameterizedAnnotation));
+        }
+
+        if (!(annotation instanceof DynamicParameterizedAnnotation)) {
+            // We drop the fake annotation once it's replaced
+            replacementAnnotations.add(annotation);
+        }
+
+        return replacementAnnotations;
+    }
+
+    private static boolean shouldSkipAnnotation(Annotation annotation) {
+        if (annotation instanceof DynamicParameterizedAnnotation) {
+            return false;
+        }
+
+        String annotationPackage = annotation.annotationType().getPackage().getName();
+
+        for (String ignoredPackage : sIgnoredAnnotationPackages) {
+            if (ignoredPackage.endsWith(".*")) {
+                if (annotationPackage.startsWith(
+                        ignoredPackage.substring(0, ignoredPackage.length() - 2))) {
+                    return true;
+                }
+            } else if (annotationPackage.equals(ignoredPackage)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    public BedsteadJUnit4(Class<?> testClass) throws InitializationError {
+        super(testClass);
+    }
+
+    private boolean annotationShouldBeSkipped(Annotation annotation) {
+        if (annotation instanceof DynamicParameterizedAnnotation) {
+            return false;
+        }
+
+        return annotation.annotationType().equals(IncludeNone.class);
+    }
+
+    private static List<FrameworkMethod> getBasicTests(TestClass testClass) {
+        Set<FrameworkMethod> methods = new HashSet<>();
+
+        methods.addAll(testClass.getAnnotatedMethods(Test.class));
+        methods.addAll(testClass.getAnnotatedMethods(PolicyAppliesTest.class));
+        methods.addAll(testClass.getAnnotatedMethods(PolicyDoesNotApplyTest.class));
+        methods.addAll(testClass.getAnnotatedMethods(CanSetPolicyTest.class));
+        methods.addAll(testClass.getAnnotatedMethods(CannotSetPolicyTest.class));
+        methods.addAll(testClass.getAnnotatedMethods(UserTest.class));
+        methods.addAll(testClass.getAnnotatedMethods(CrossUserTest.class));
+        methods.addAll(testClass.getAnnotatedMethods(PermissionTest.class));
+
+        return new ArrayList<>(methods);
+    }
+
+    @Override
+    protected List<FrameworkMethod> computeTestMethods() {
+        List<FrameworkMethod> basicTests = getBasicTests(getTestClass());
+        List<FrameworkMethod> modifiedTests = new ArrayList<>();
+
+        for (FrameworkMethod m : basicTests) {
+            Set<Annotation> parameterizedAnnotations = getParameterizedAnnotations(m);
+
+            if (parameterizedAnnotations.isEmpty()) {
+                // Unparameterized, just add the original
+                modifiedTests.add(new BedsteadFrameworkMethod(m.getMethod()));
+            }
+
+            for (Annotation annotation : parameterizedAnnotations) {
+                if (annotationShouldBeSkipped(annotation)) {
+                    // Special case - does not generate a run
+                    continue;
+                }
+                modifiedTests.add(
+                        new BedsteadFrameworkMethod(m.getMethod(), annotation));
+            }
+        }
+
+        modifiedTests = generateGeneralParameterisationMethods(modifiedTests);
+
+        sortMethodsByBedsteadAnnotations(modifiedTests);
+
+        return modifiedTests;
+    }
+
+    private static List<FrameworkMethod> generateGeneralParameterisationMethods(
+            List<FrameworkMethod> modifiedTests) {
+        return modifiedTests.stream()
+                .flatMap(BedsteadJUnit4::generateGeneralParameterisationMethods)
+                .collect(Collectors.toList());
+    }
+
+    private static Stream<FrameworkMethod> generateGeneralParameterisationMethods(
+            FrameworkMethod method) {
+        Stream<FrameworkMethod> expandedMethods = Stream.of(method);
+        if (method.getMethod().getParameterCount() == 0) {
+            return expandedMethods;
+        }
+
+        for (Parameter parameter : method.getMethod().getParameters()) {
+            List<Annotation> annotations = new ArrayList<>(
+                    Arrays.asList(parameter.getAnnotations()));
+            resolveRecursiveAnnotations(annotations, /* parameterizedAnnotation= */ null);
+
+            boolean hasParameterised = false;
+
+            for (Annotation annotation : annotations) {
+                if (annotation instanceof StringTestParameter) {
+                    if (hasParameterised) {
+                        throw new IllegalStateException(
+                                "Each parameter can only have a single parameterised annotation");
+                    }
+                    hasParameterised = true;
+
+                    StringTestParameter stringTestParameter = (StringTestParameter) annotation;
+
+                    expandedMethods = expandedMethods.flatMap(
+                            i -> applyStringTestParameter(i, stringTestParameter));
+                } else if (annotation instanceof IntTestParameter) {
+                    if (hasParameterised) {
+                        throw new IllegalStateException(
+                                "Each parameter can only have a single parameterised annotation");
+                    }
+                    hasParameterised = true;
+
+                    IntTestParameter intTestParameter = (IntTestParameter) annotation;
+
+                    expandedMethods = expandedMethods.flatMap(
+                            i -> applyIntTestParameter(i, intTestParameter));
+                } else if (annotation instanceof EnumTestParameter) {
+                    if (hasParameterised) {
+                        throw new IllegalStateException(
+                                "Each parameter can only have a single parameterised annotation");
+                    }
+                    hasParameterised = true;
+
+                    EnumTestParameter enumTestParameter = (EnumTestParameter) annotation;
+
+                    expandedMethods = expandedMethods.flatMap(
+                            i -> applyEnumTestParameter(i, enumTestParameter));
+                }
+            }
+
+            if (!hasParameterised) {
+                throw new IllegalStateException(
+                        "Parameter " + parameter + " must be annotated as parameterised");
+            }
+        }
+
+        return expandedMethods;
+    }
+
+    private static Stream<FrameworkMethod> applyStringTestParameter(FrameworkMethod frameworkMethod,
+            StringTestParameter stringTestParameter) {
+        return Stream.of(stringTestParameter.value()).map(
+                (i) -> new FrameworkMethodWithParameter(frameworkMethod, i)
+        );
+    }
+
+    private static Stream<FrameworkMethod> applyIntTestParameter(FrameworkMethod frameworkMethod,
+            IntTestParameter intTestParameter) {
+        return Arrays.stream(intTestParameter.value()).mapToObj(
+                (i) -> new FrameworkMethodWithParameter(frameworkMethod, i)
+        );
+    }
+
+    private static Stream<FrameworkMethod> applyEnumTestParameter(FrameworkMethod frameworkMethod,
+            EnumTestParameter enumTestParameter) {
+        return Arrays.stream(enumTestParameter.value().getEnumConstants()).map(
+                (i) -> new FrameworkMethodWithParameter(frameworkMethod, i)
+        );
+    }
+
+    /**
+     * Sort methods so that methods with identical bedstead annotations are together.
+     *
+     * <p>This will also ensure that all tests methods which are not annotated for bedstead will
+     * run before any tests which are annotated.
+     */
+    private void sortMethodsByBedsteadAnnotations(List<FrameworkMethod> modifiedTests) {
+        List<Annotation> bedsteadAnnotationsSortedByMostCommon =
+                bedsteadAnnotationsSortedByMostCommon(modifiedTests);
+
+        modifiedTests.sort((o1, o2) -> {
+            for (Annotation annotation : bedsteadAnnotationsSortedByMostCommon) {
+                boolean o1HasAnnotation = o1.getAnnotation(annotation.annotationType()) != null;
+                boolean o2HasAnnotation = o2.getAnnotation(annotation.annotationType()) != null;
+
+                if (o1HasAnnotation && !o2HasAnnotation) {
+                    // o1 goes to the end
+                    return 1;
+                } else if (o2HasAnnotation && !o1HasAnnotation) {
+                    return -1;
+                }
+            }
+            return 0;
+        });
+    }
+
+    private List<Annotation> bedsteadAnnotationsSortedByMostCommon(List<FrameworkMethod> methods) {
+        Map<Annotation, Integer> annotationCounts = countAnnotations(methods);
+        List<Annotation> annotations = new ArrayList<>(annotationCounts.keySet());
+
+        annotations.removeIf(
+                annotation ->
+                        !annotation.annotationType()
+                                .getCanonicalName().contains(BEDSTEAD_PACKAGE_NAME));
+
+        annotations.sort(Comparator.comparingInt(annotationCounts::get));
+        Collections.reverse(annotations);
+
+        return annotations;
+    }
+
+    private Map<Annotation, Integer> countAnnotations(List<FrameworkMethod> methods) {
+        Map<Annotation, Integer> annotationCounts = new HashMap<>();
+
+        for (FrameworkMethod method : methods) {
+            for (Annotation annotation : method.getAnnotations()) {
+                annotationCounts.put(
+                        annotation, annotationCounts.getOrDefault(annotation, 0) + 1);
+            }
+        }
+
+        return annotationCounts;
+    }
+
+    private Set<Annotation> getParameterizedAnnotations(FrameworkMethod method) {
+        Set<Annotation> parameterizedAnnotations = new HashSet<>();
+        List<Annotation> annotations = new ArrayList<>(Arrays.asList(method.getAnnotations()));
+
+        parseEnterpriseAnnotations(annotations);
+        parsePermissionAnnotations(annotations);
+        parseUserAnnotations(annotations);
+
+        for (Annotation annotation : annotations) {
+            if (isParameterizedAnnotation(annotation)) {
+                parameterizedAnnotations.add(annotation);
+            }
+        }
+
+        return parameterizedAnnotations;
+    }
+
+    /**
+     * Parse enterprise-specific annotations.
+     *
+     * <p>To be used before general annotation processing.
+     */
+    static void parseEnterpriseAnnotations(List<Annotation> annotations) {
+        int index = 0;
+        while (index < annotations.size()) {
+            Annotation annotation = annotations.get(index);
+            if (annotation instanceof PolicyAppliesTest) {
+                annotations.remove(index);
+                Class<?> policy = ((PolicyAppliesTest) annotation).policy();
+
+                EnterprisePolicy enterprisePolicy =
+                        policy.getAnnotation(EnterprisePolicy.class);
+                List<Annotation> replacementAnnotations =
+                        Policy.policyAppliesStates(policy.getName(), enterprisePolicy);
+                replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
+
+                annotations.addAll(index, replacementAnnotations);
+                index += replacementAnnotations.size();
+            } else if (annotation instanceof PolicyDoesNotApplyTest) {
+                annotations.remove(index);
+                Class<?> policy = ((PolicyDoesNotApplyTest) annotation).policy();
+
+                EnterprisePolicy enterprisePolicy =
+                        policy.getAnnotation(EnterprisePolicy.class);
+                List<Annotation> replacementAnnotations =
+                        Policy.policyDoesNotApplyStates(policy.getName(), enterprisePolicy);
+                replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
+
+                annotations.addAll(index, replacementAnnotations);
+                index += replacementAnnotations.size();
+            } else if (annotation instanceof CannotSetPolicyTest) {
+                annotations.remove(index);
+                Class<?> policy = ((CannotSetPolicyTest) annotation).policy();
+
+                EnterprisePolicy enterprisePolicy =
+                        policy.getAnnotation(EnterprisePolicy.class);
+                List<Annotation> replacementAnnotations =
+                        Policy.cannotSetPolicyStates(policy.getName(), enterprisePolicy,
+                                ((CannotSetPolicyTest) annotation).includeDeviceAdminStates(),
+                                ((CannotSetPolicyTest) annotation).includeNonDeviceAdminStates());
+                replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
+
+                annotations.addAll(index, replacementAnnotations);
+                index += replacementAnnotations.size();
+            } else if (annotation instanceof CanSetPolicyTest) {
+                annotations.remove(index);
+                Class<?> policy = ((CanSetPolicyTest) annotation).policy();
+                boolean singleTestOnly = ((CanSetPolicyTest) annotation).singleTestOnly();
+
+                EnterprisePolicy enterprisePolicy =
+                        policy.getAnnotation(EnterprisePolicy.class);
+                List<Annotation> replacementAnnotations =
+                        Policy.canSetPolicyStates(
+                                policy.getName(), enterprisePolicy, singleTestOnly);
+                replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
+
+                annotations.addAll(index, replacementAnnotations);
+                index += replacementAnnotations.size();
+            } else {
+                index++;
+            }
+        }
+    }
+
+    /**
+     * Parse @PermissionTest annotations.
+     *
+     * <p>To be used before general annotation processing.
+     */
+    static void parsePermissionAnnotations(List<Annotation> annotations) {
+        int index = 0;
+        while (index < annotations.size()) {
+            Annotation annotation = annotations.get(index);
+            if (annotation instanceof PermissionTest) {
+                annotations.remove(index);
+
+                List<Annotation> replacementAnnotations = generatePermissionAnnotations(
+                        ((PermissionTest) annotation).value());
+                replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
+
+                annotations.addAll(index, replacementAnnotations);
+                index += replacementAnnotations.size();
+            } else {
+                index++;
+            }
+        }
+    }
+
+    private static List<Annotation> generatePermissionAnnotations(String[] permissions) {
+        Set<String> allPermissions = new HashSet<>(Arrays.asList(permissions));
+        List<Annotation> replacementAnnotations = new ArrayList<>();
+
+        for (String permission : permissions) {
+            allPermissions.remove(permission);
+            replacementAnnotations.add(
+                    new DynamicParameterizedAnnotation(
+                            permission,
+                            new Annotation[]{
+                                    ensureHasPermission(new String[]{permission}),
+                                    ensureDoesNotHavePermission(allPermissions.toArray(new String[]{}))
+                            }));
+            allPermissions.add(permission);
+        }
+
+        return replacementAnnotations;
+    }
+
+    /**
+     * Parse @UserTest and @CrossUserTest annotations.
+     *
+     * <p>To be used before general annotation processing.
+     */
+    static void parseUserAnnotations(List<Annotation> annotations) {
+        int index = 0;
+        while (index < annotations.size()) {
+            Annotation annotation = annotations.get(index);
+            if (annotation instanceof UserTest) {
+                annotations.remove(index);
+
+                List<Annotation> replacementAnnotations = generateUserAnnotations(
+                        ((UserTest) annotation).value());
+                replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
+
+                annotations.addAll(index, replacementAnnotations);
+                index += replacementAnnotations.size();
+            } else if (annotation instanceof CrossUserTest) {
+                annotations.remove(index);
+
+                CrossUserTest crossUserTestAnnotation = (CrossUserTest) annotation;
+                List<Annotation> replacementAnnotations = generateCrossUserAnnotations(
+                        crossUserTestAnnotation.value());
+                replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
+
+                annotations.addAll(index, replacementAnnotations);
+                index += replacementAnnotations.size();
+            } else {
+                index++;
+            }
+        }
+    }
+
+    private static List<Annotation> generateUserAnnotations(UserType[] userTypes) {
+        List<Annotation> replacementAnnotations = new ArrayList<>();
+
+        for (UserType userType : userTypes) {
+            Annotation runOnUserAnnotation = getRunOnAnnotation(userType, "@UserTest");
+            replacementAnnotations.add(
+                    new DynamicParameterizedAnnotation(
+                            userType.name(),
+                            new Annotation[]{runOnUserAnnotation}));
+        }
+
+        return replacementAnnotations;
+    }
+
+    private static List<Annotation> generateCrossUserAnnotations(UserPair[] userPairs) {
+        List<Annotation> replacementAnnotations = new ArrayList<>();
+
+        for (UserPair userPair : userPairs) {
+            Annotation[] annotations = new Annotation[]{
+                    getRunOnAnnotation(userPair.from(), "@CrossUserTest"),
+                    otherUser(userPair.to())
+            };
+            if (userPair.from() != userPair.to()) {
+                Annotation hasUserAnnotation =
+                        getHasUserAnnotation(userPair.to(), "@CrossUserTest");
+                if (hasUserAnnotation != null) {
+                    annotations = new Annotation[]{
+                            annotations[0],
+                            annotations[1],
+                            hasUserAnnotation};
+                }
+            }
+
+            replacementAnnotations.add(
+                    new DynamicParameterizedAnnotation(
+                            userPair.from().name() + "_to_" + userPair.to().name(),
+                            annotations));
+        }
+
+        return replacementAnnotations;
+    }
+
+    private static Annotation getRunOnAnnotation(UserType userType, String annotationName) {
+        switch (userType) {
+            case SYSTEM_USER:
+                return requireRunOnSystemUser();
+            case PRIMARY_USER:
+                return requireRunOnPrimaryUser();
+            case SECONDARY_USER:
+                return requireRunOnSecondaryUser();
+            case WORK_PROFILE:
+                return requireRunOnWorkProfile();
+            case TV_PROFILE:
+                return requireRunOnTvProfile();
+            default:
+                throw new IllegalStateException(
+                        "UserType " + userType + " is not compatible with " + annotationName);
+        }
+    }
+
+    private static Annotation getHasUserAnnotation(UserType userType, String annotationName) {
+        switch (userType) {
+            case SYSTEM_USER:
+                return null; // We always have a system user
+            case PRIMARY_USER:
+                return null; // We assume we always have a primary user (this may change)
+            case SECONDARY_USER:
+                return ensureHasSecondaryUser();
+            case WORK_PROFILE:
+                return ensureHasWorkProfile();
+            case TV_PROFILE:
+                return ensureHasTvProfile();
+            default:
+                throw new IllegalStateException(
+                        "UserType " + userType + " is not compatible with " + annotationName);
+        }
+    }
+
+    @Override
+    protected List<TestRule> classRules() {
+        List<TestRule> rules = super.classRules();
+
+        for (TestRule rule : rules) {
+            if (rule instanceof HarrierRule) {
+                HarrierRule harrierRule = (HarrierRule) rule;
+
+                harrierRule.setSkipTestTeardown(true);
+                harrierRule.setUsingBedsteadJUnit4(true);
+
+                break;
+            }
+        }
+
+        return rules;
+    }
+
+    /**
+     * True if the test is running in debug mode.
+     *
+     * <p>This will result in additional debugging information being added which would otherwise
+     * be dropped to improve test performance.
+     *
+     * <p>To enable this, pass the "bedstead-debug" instrumentation arg as "true"
+     */
+    public static boolean isDebug() {
+        try {
+            Class instrumentationRegistryClass = Class.forName(
+                        "androidx.test.platform.app.InstrumentationRegistry");
+
+            Object arguments = instrumentationRegistryClass.getMethod("getArguments")
+                    .invoke(null);
+            return Boolean.parseBoolean((String) arguments.getClass()
+                    .getMethod("getString", String.class, String.class)
+                    .invoke(arguments, "bedstead-debug", "false"));
+        } catch (ClassNotFoundException e) {
+            return false; // Must be on the host so can't access debug information
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            throw new IllegalStateException("Error getting isDebug", e);
+        }
+    }
+
+    @Override
+    protected void validateTestMethods(List<Throwable> errors) {
+        // We do allow arguments - they will fail validation later on if not properly annotated
+    }
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/Defaults.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/Defaults.java
new file mode 100644
index 0000000..13320bc
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/Defaults.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier;
+
+/** Default values used across Harrier. */
+public final class Defaults {
+
+    private Defaults() {
+
+    }
+
+    /**
+     * The password to be used in tests.
+     *
+     * The infrastructure will use this password when a password exists and is required.
+     */
+    public static final String DEFAULT_PASSWORD = "1234";
+
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DynamicParameterizedAnnotation.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/DynamicParameterizedAnnotation.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DynamicParameterizedAnnotation.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/DynamicParameterizedAnnotation.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/FrameworkMethodWithParameter.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/FrameworkMethodWithParameter.java
new file mode 100644
index 0000000..4056890
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/FrameworkMethodWithParameter.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier;
+
+import org.junit.runners.model.FrameworkMethod;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.List;
+
+/**
+ * A {@link FrameworkMethod} which forwards calls to a wrapped {@link FrameworkMethod} except
+ * that it injects a parameter and adds the parameter to the name.
+ */
+public final class FrameworkMethodWithParameter extends FrameworkMethod {
+
+    private final FrameworkMethod mWrappedFrameworkMethod;
+    private final Object mInjectedParam;
+
+    public FrameworkMethodWithParameter(FrameworkMethod frameworkMethod, Object injectedParam) {
+        super(frameworkMethod.getMethod());
+        mWrappedFrameworkMethod = frameworkMethod;
+        mInjectedParam = injectedParam;
+    }
+
+    @Override
+    public boolean isStatic() {
+        if (mWrappedFrameworkMethod == null) {
+            return super.isStatic();
+        }
+        return mWrappedFrameworkMethod.isStatic();
+    }
+
+    @Override
+    public boolean isPublic() {
+        if (mWrappedFrameworkMethod == null) {
+            return super.isPublic();
+        }
+        return mWrappedFrameworkMethod.isPublic();
+    }
+
+    @Override
+    public Method getMethod() {
+        return mWrappedFrameworkMethod.getMethod();
+    }
+
+    @Override
+    public Object invokeExplosively(Object target, Object... params) throws Throwable {
+        Object[] allParams = params;
+        if (mInjectedParam != null) {
+            allParams = new Object[1 + params.length];
+            allParams[0] = mInjectedParam;
+            System.arraycopy(params, 0, allParams, 1, params.length);
+        }
+
+        return mWrappedFrameworkMethod.invokeExplosively(target, allParams);
+    }
+
+    @Override
+    public String getName() {
+        if (mInjectedParam != null) {
+            return mWrappedFrameworkMethod.getName() + "[" + mInjectedParam + "]";
+        }
+        return mWrappedFrameworkMethod.getName();
+    }
+
+    @Override
+    public void validatePublicVoidNoArg(boolean isStatic, List<Throwable> errors) {
+        mWrappedFrameworkMethod.validatePublicVoidNoArg(isStatic, errors);
+    }
+
+    @Override
+    public void validatePublicVoid(boolean isStatic, List<Throwable> errors) {
+        mWrappedFrameworkMethod.validatePublicVoid(isStatic, errors);
+    }
+
+    @Override
+    public Class<?> getReturnType() {
+        return mWrappedFrameworkMethod.getReturnType();
+    }
+
+    @Override
+    public Class<?> getType() {
+        return mWrappedFrameworkMethod.getType();
+    }
+
+    @Override
+    public Class<?> getDeclaringClass() {
+        return mWrappedFrameworkMethod.getDeclaringClass();
+    }
+
+    @Override
+    public void validateNoTypeParametersOnArgs(List<Throwable> errors) {
+        mWrappedFrameworkMethod.validateNoTypeParametersOnArgs(errors);
+    }
+
+    @Override
+    public boolean isShadowedBy(FrameworkMethod other) {
+        return mWrappedFrameworkMethod.isShadowedBy(other);
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        return mWrappedFrameworkMethod.equals(obj);
+    }
+
+    @Override
+    public int hashCode() {
+        return mWrappedFrameworkMethod.hashCode();
+    }
+
+    @Override
+    public boolean producesType(Type type) {
+        return mWrappedFrameworkMethod.producesType(type);
+    }
+
+    @Override
+    public Annotation[] getAnnotations() {
+        return mWrappedFrameworkMethod.getAnnotations();
+    }
+
+    @Override
+    public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
+        return mWrappedFrameworkMethod.getAnnotation(annotationType);
+    }
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/HarrierRule.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/HarrierRule.java
new file mode 100644
index 0000000..35bc955
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/HarrierRule.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier;
+
+import org.junit.rules.TestRule;
+
+/** A @Rule used on device by Harrier. */
+public abstract class HarrierRule implements TestRule {
+    /** Set that we should skip tearing down between tests. */
+    abstract void setSkipTestTeardown(boolean skipTestTeardown);
+    /** Set that we are using the BedsteadJUnit4 test runner. */
+    abstract void setUsingBedsteadJUnit4(boolean usingBedsteadJUnit4);
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/OptionalBoolean.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/OptionalBoolean.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/OptionalBoolean.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/OptionalBoolean.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/Policy.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/Policy.java
new file mode 100644
index 0000000..133bf8a
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/Policy.java
@@ -0,0 +1,694 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_AFFILIATED_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_AFFILIATED_PROFILE_OWNER_PROFILE;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_IN_BACKGROUND;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_AFFILIATED_OTHER_USERS;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_PARENT;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_UNAFFILIATED_OTHER_USERS;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.DO_NOT_APPLY_TO_POLICY_DOES_NOT_APPLY_TESTS;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.NO;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_APP_RESTRICTIONS;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_BLOCK_UNINSTALL;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_CERT_INSTALL;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_CERT_SELECTION;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_ENABLE_SYSTEM_APP;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_INSTALL_EXISTING_PACKAGE;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_KEEP_UNINSTALLED_PACKAGES;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_NETWORK_LOGGING;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_PACKAGE_ACCESS;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_PERMISSION_GRANT;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_SECURITY_LOGGING;
+
+import com.android.bedstead.harrier.annotations.EnsureTestAppHasAppOp;
+import com.android.bedstead.harrier.annotations.EnsureTestAppHasPermission;
+import com.android.bedstead.harrier.annotations.EnsureTestAppInstalled;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDelegate;
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.AppOp;
+import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeNone;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnAffiliatedDeviceOwnerSecondaryUser;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnAffiliatedProfileOwnerSecondaryUser;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnBackgroundDeviceOwnerUser;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnDeviceOwnerUser;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnParentOfCorporateOwnedProfileOwner;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnParentOfProfileOwnerUsingParentInstance;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnProfileOwnerPrimaryUser;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnProfileOwnerProfileWithNoDeviceOwner;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnUnaffiliatedDeviceOwnerSecondaryUser;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnUnaffiliatedProfileOwnerSecondaryUser;
+
+import com.google.auto.value.AutoAnnotation;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * Utility class for enterprise policy tests.
+ */
+public final class Policy {
+
+    // TODO(b/219750042): If we leave over appops and permissions then the delegate will have them
+    private static final String DELEGATE_PACKAGE_NAME = "com.android.Delegate";
+
+    // Delegate scopes to be used for a "CannotSet" state. All delegate scopes except the ones which
+    // should allow use of the API will be granted
+    private static final ImmutableSet<String> ALL_DELEGATE_SCOPES = ImmutableSet.of(
+            DELEGATION_CERT_INSTALL,
+            DELEGATION_APP_RESTRICTIONS,
+            DELEGATION_BLOCK_UNINSTALL,
+            DELEGATION_PERMISSION_GRANT,
+            DELEGATION_PACKAGE_ACCESS,
+            DELEGATION_ENABLE_SYSTEM_APP,
+            DELEGATION_INSTALL_EXISTING_PACKAGE,
+            DELEGATION_KEEP_UNINSTALLED_PACKAGES,
+            DELEGATION_NETWORK_LOGGING,
+            DELEGATION_CERT_SELECTION,
+            DELEGATION_SECURITY_LOGGING
+    );
+
+    // This is a map containing all Include* annotations and the flags which lead to them
+    // This is not validated - every state must have a single APPLIED_BY annotation
+    private static final ImmutableMap<Integer, Function<EnterprisePolicy, Set<Annotation>>>
+            STATE_ANNOTATIONS =
+            ImmutableMap.<Integer, Function<EnterprisePolicy, Set<Annotation>>>builder()
+                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER, singleAnnotation(includeRunOnDeviceOwnerUser()))
+                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnDeviceOwnerUser(), /* isPrimary= */ true))
+                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | APPLIES_IN_BACKGROUND, singleAnnotation(includeRunOnBackgroundDeviceOwnerUser()))
+                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | APPLIES_IN_BACKGROUND | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnBackgroundDeviceOwnerUser(), /* isPrimary= */ true))
+
+                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_UNAFFILIATED_OTHER_USERS, singleAnnotation(includeRunOnNonAffiliatedDeviceOwnerSecondaryUser()))
+                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_UNAFFILIATED_OTHER_USERS | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnNonAffiliatedDeviceOwnerSecondaryUser(), /* isPrimary= */ true))
+                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_AFFILIATED_OTHER_USERS, singleAnnotation(includeRunOnAffiliatedDeviceOwnerSecondaryUser()))
+                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_AFFILIATED_OTHER_USERS | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnAffiliatedDeviceOwnerSecondaryUser(), /* isPrimary= */ true))
+
+                    .put(APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER | APPLIES_TO_OWN_USER, singleAnnotation(includeRunOnAffiliatedProfileOwnerSecondaryUser()))
+                    .put(APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnAffiliatedProfileOwnerSecondaryUser(), /* isPrimary= */ true))
+                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER | APPLIES_TO_OWN_USER, singleAnnotation(includeRunOnUnaffiliatedProfileOwnerSecondaryUser()))
+                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnUnaffiliatedProfileOwnerSecondaryUser(), /* isPrimary= */ true))
+                    .put(APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO | APPLIES_TO_OWN_USER, singleAnnotation(includeRunOnProfileOwnerPrimaryUser()))
+                    .put(APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnProfileOwnerPrimaryUser(), /* isPrimary= */ true))
+
+                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE | APPLIES_TO_OWN_USER, singleAnnotation(includeRunOnProfileOwnerProfileWithNoDeviceOwner()))
+                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnProfileOwnerProfileWithNoDeviceOwner(), /* isPrimary= */ true))
+                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE | APPLIES_TO_PARENT, singleAnnotation(includeRunOnParentOfProfileOwnerWithNoDeviceOwner()))
+                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE | APPLIES_TO_PARENT | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnParentOfProfileOwnerWithNoDeviceOwner(), /* isPrimary= */ true))
+
+                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE | APPLIES_TO_UNAFFILIATED_OTHER_USERS, singleAnnotation(includeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile()))
+                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE | APPLIES_TO_UNAFFILIATED_OTHER_USERS | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile(), /* isPrimary= */ true))
+
+                    .put(APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER | APPLIES_TO_OWN_USER, singleAnnotation(includeRunOnParentOfProfileOwnerUsingParentInstance()))
+
+                    .build();
+    // This must contain one key for every APPLIED_BY that is being used, and maps to the
+    // "default" for testing that DPC type
+    // in general this will be a state which runs on the same user as the dpc.
+    private static final ImmutableMap<Integer, Function<EnterprisePolicy, Set<Annotation>>>
+            DPC_STATE_ANNOTATIONS_BASE =
+            ImmutableMap.<Integer, Function<EnterprisePolicy, Set<Annotation>>>builder()
+                    .put(APPLIED_BY_DEVICE_OWNER, (flags) -> hasFlag(flags.dpc(), APPLIED_BY_DEVICE_OWNER | APPLIES_IN_BACKGROUND) ? ImmutableSet.of(includeRunOnBackgroundDeviceOwnerUser()) : ImmutableSet.of(includeRunOnDeviceOwnerUser()))
+                    .put(APPLIED_BY_AFFILIATED_PROFILE_OWNER, singleAnnotation(includeRunOnAffiliatedProfileOwnerSecondaryUser()))
+                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER, singleAnnotation(includeRunOnProfileOwnerPrimaryUser()))
+                    .put(APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO, singleAnnotation(includeRunOnProfileOwnerPrimaryUser()))
+                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE, singleAnnotation(includeRunOnProfileOwnerProfileWithNoDeviceOwner()))
+                    .build();
+    private static final Map<Integer, Function<EnterprisePolicy, Set<Annotation>>>
+            DPC_STATE_ANNOTATIONS = DPC_STATE_ANNOTATIONS_BASE.entrySet().stream()
+            .collect(Collectors.toMap(Map.Entry::getKey, Policy::addGeneratedStates));
+    private static final int APPLIED_BY_FLAGS =
+            APPLIED_BY_DEVICE_OWNER | APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE
+                    | APPLIED_BY_AFFILIATED_PROFILE_OWNER_PROFILE
+                    | APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER
+                    | APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER
+                    | APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER;
+    private static final Map<Function<EnterprisePolicy, Set<Annotation>>, Set<Integer>>
+            ANNOTATIONS_MAP = calculateAnnotationsMap(STATE_ANNOTATIONS);
+
+    private Policy() {
+
+    }
+
+    @AutoAnnotation
+    private static EnsureTestAppInstalled ensureTestAppInstalled(
+            String packageName, UserType onUser, boolean isPrimary) {
+        return new AutoAnnotation_Policy_ensureTestAppInstalled(packageName, onUser, isPrimary);
+    }
+
+    @AutoAnnotation
+    private static EnsureTestAppHasPermission ensureTestAppHasPermission(String[] value) {
+        return new AutoAnnotation_Policy_ensureTestAppHasPermission(value);
+    }
+
+    @AutoAnnotation
+    private static EnsureTestAppHasAppOp ensureTestAppHasAppOp(String[] value) {
+        return new AutoAnnotation_Policy_ensureTestAppHasAppOp(value);
+    }
+
+    @AutoAnnotation
+    private static IncludeNone includeNone() {
+        return new AutoAnnotation_Policy_includeNone();
+    }
+
+    @AutoAnnotation
+    private static IncludeRunOnDeviceOwnerUser includeRunOnDeviceOwnerUser() {
+        return new AutoAnnotation_Policy_includeRunOnDeviceOwnerUser();
+    }
+
+    @AutoAnnotation
+    private static IncludeRunOnUnaffiliatedDeviceOwnerSecondaryUser includeRunOnNonAffiliatedDeviceOwnerSecondaryUser() {
+        return new AutoAnnotation_Policy_includeRunOnNonAffiliatedDeviceOwnerSecondaryUser();
+    }
+
+    @AutoAnnotation
+    private static IncludeRunOnAffiliatedDeviceOwnerSecondaryUser includeRunOnAffiliatedDeviceOwnerSecondaryUser() {
+        return new AutoAnnotation_Policy_includeRunOnAffiliatedDeviceOwnerSecondaryUser();
+    }
+
+    @AutoAnnotation
+    private static IncludeRunOnAffiliatedProfileOwnerSecondaryUser includeRunOnAffiliatedProfileOwnerSecondaryUser() {
+        return new AutoAnnotation_Policy_includeRunOnAffiliatedProfileOwnerSecondaryUser();
+    }
+
+    @AutoAnnotation
+    private static IncludeRunOnUnaffiliatedProfileOwnerSecondaryUser includeRunOnUnaffiliatedProfileOwnerSecondaryUser() {
+        return new AutoAnnotation_Policy_includeRunOnUnaffiliatedProfileOwnerSecondaryUser();
+    }
+
+    @AutoAnnotation
+    private static IncludeRunOnProfileOwnerProfileWithNoDeviceOwner includeRunOnProfileOwnerProfileWithNoDeviceOwner() {
+        return new AutoAnnotation_Policy_includeRunOnProfileOwnerProfileWithNoDeviceOwner();
+    }
+
+    @AutoAnnotation
+    private static IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile includeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile() {
+        return new AutoAnnotation_Policy_includeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile();
+    }
+
+    @AutoAnnotation
+    private static IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner includeRunOnParentOfProfileOwnerWithNoDeviceOwner() {
+        return new AutoAnnotation_Policy_includeRunOnParentOfProfileOwnerWithNoDeviceOwner();
+    }
+
+    @AutoAnnotation
+    private static IncludeRunOnParentOfCorporateOwnedProfileOwner includeRunOnParentOfCorporateOwnedProfileOwner() {
+        return new AutoAnnotation_Policy_includeRunOnParentOfCorporateOwnedProfileOwner();
+    }
+
+    @AutoAnnotation
+    private static IncludeRunOnProfileOwnerPrimaryUser includeRunOnProfileOwnerPrimaryUser() {
+        return new AutoAnnotation_Policy_includeRunOnProfileOwnerPrimaryUser();
+    }
+
+    @AutoAnnotation
+    private static IncludeRunOnBackgroundDeviceOwnerUser includeRunOnBackgroundDeviceOwnerUser() {
+        return new AutoAnnotation_Policy_includeRunOnBackgroundDeviceOwnerUser();
+    }
+
+    @AutoAnnotation
+    private static EnsureHasDelegate ensureHasDelegate(EnsureHasDelegate.AdminType admin,
+            String[] scopes, boolean isPrimary) {
+        return new AutoAnnotation_Policy_ensureHasDelegate(admin, scopes, isPrimary);
+    }
+
+    @AutoAnnotation
+    private static IncludeRunOnParentOfProfileOwnerUsingParentInstance includeRunOnParentOfProfileOwnerUsingParentInstance() {
+        return new AutoAnnotation_Policy_includeRunOnParentOfProfileOwnerUsingParentInstance();
+    }
+
+    private static Function<EnterprisePolicy, Set<Annotation>> singleAnnotation(
+            Annotation annotation) {
+        return (i) -> ImmutableSet.of(annotation);
+    }
+
+    private static Function<EnterprisePolicy, Set<Annotation>> generateDelegateAnnotation(
+            Annotation annotation, boolean isPrimary) {
+        return (policy) -> {
+            Annotation[] existingAnnotations = annotation.annotationType().getAnnotations();
+            return Arrays.stream(policy.delegatedScopes())
+                    .map(scope -> {
+                        Annotation[] newAnnotations = Arrays.copyOf(existingAnnotations,
+                                existingAnnotations.length + 1);
+                        newAnnotations[newAnnotations.length - 1] = ensureHasDelegate(
+                                EnsureHasDelegate.AdminType.PRIMARY, new String[]{scope},
+                                isPrimary);
+
+                        return new DynamicParameterizedAnnotation(
+                                annotation.annotationType().getSimpleName() + "Delegate:" + scope,
+                                newAnnotations);
+                    }).collect(Collectors.toSet());
+        };
+    }
+
+    private static Map<Function<EnterprisePolicy, Set<Annotation>>, Set<Integer>> calculateAnnotationsMap(
+            Map<Integer, Function<EnterprisePolicy, Set<Annotation>>> annotations) {
+        Map<Function<EnterprisePolicy, Set<Annotation>>, Set<Integer>> b = new HashMap<>();
+
+        for (Map.Entry<Integer, Function<EnterprisePolicy, Set<Annotation>>> i :
+                annotations.entrySet()) {
+            if (!b.containsKey(i.getValue())) {
+                b.put(i.getValue(), new HashSet<>());
+            }
+
+            b.get(i.getValue()).add(i.getKey());
+        }
+
+        return b;
+    }
+
+    private static Function<EnterprisePolicy, Set<Annotation>> addGeneratedStates(
+            ImmutableMap.Entry<Integer, Function<EnterprisePolicy, Set<Annotation>>> entry) {
+        return (policy) -> {
+            if (hasFlag(policy.dpc(), entry.getKey() | CAN_BE_DELEGATED)) {
+                Set<Annotation> results = new HashSet<>(entry.getValue().apply(policy));
+                results.addAll(results.stream().flatMap(
+                        t -> generateDelegateAnnotation(t, /* isPrimary= */ true).apply(
+                                policy).stream())
+                        .collect(Collectors.toSet()));
+
+                return results;
+            }
+
+            return entry.getValue().apply(policy);
+        };
+    }
+
+    /**
+     * Get parameterized test runs for the given policy.
+     *
+     * <p>These are states which should be run where the policy is able to be applied.
+     */
+    public static List<Annotation> policyAppliesStates(String policyName,
+            EnterprisePolicy enterprisePolicy) {
+        Set<Annotation> annotations = new HashSet<>();
+
+        validateFlags(policyName, enterprisePolicy.dpc());
+
+        for (Map.Entry<Function<EnterprisePolicy, Set<Annotation>>, Set<Integer>> annotation :
+                ANNOTATIONS_MAP.entrySet()) {
+            if (policyWillApply(enterprisePolicy.dpc(), annotation.getValue())) {
+                annotations.addAll(annotation.getKey().apply(enterprisePolicy));
+            }
+        }
+
+        for (AppOp appOp : enterprisePolicy.appOps()) {
+            // TODO(b/219750042): Currently we only test that app ops apply to the current user
+            Annotation[] withAppOpAnnotations = new Annotation[]{
+                    ensureTestAppInstalled(DELEGATE_PACKAGE_NAME,
+                            UserType.INSTRUMENTED_USER, /* isPrimary= */ true),
+                    ensureTestAppHasAppOp(new String[]{appOp.appliedWith()})
+            };
+            annotations.add(
+                    new DynamicParameterizedAnnotation(
+                            "AppOp:" + appOp.appliedWith(), withAppOpAnnotations));
+        }
+
+        removeShadowingAnnotations(annotations);
+
+        if (annotations.isEmpty()) {
+            // Don't run the original test unparameterized
+            annotations.add(includeNone());
+        }
+
+        return new ArrayList<>(annotations);
+    }
+
+    private static boolean policyWillApply(int[] policyFlags, Set<Integer> annotationFlags) {
+        for (int annotationFlag : annotationFlags) {
+            if (hasFlag(policyFlags, annotationFlag)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean policyWillNotApply(int[] policyFlags, Set<Integer> annotationFlags) {
+        for (int annotationFlag : annotationFlags) {
+            if (hasFlag(annotationFlag,
+                    DO_NOT_APPLY_TO_POLICY_DOES_NOT_APPLY_TESTS, /* nonMatchingFlag= */ NO)) {
+                return false; // We don't support using this annotation for PolicyDoesNotApply tests
+            }
+
+            int appliedByFlag = APPLIED_BY_FLAGS & annotationFlag;
+            int otherFlags = annotationFlag ^ appliedByFlag; // remove the appliedByFlag
+            if (hasFlag(policyFlags, /* matchingFlag= */ appliedByFlag, /* nonMatchingFlag= */
+                    otherFlags)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get parameterized test runs for the given policy.
+     *
+     * <p>These are states which should be run where the policy is not able to be applied.
+     */
+    public static List<Annotation> policyDoesNotApplyStates(String policyName,
+            EnterprisePolicy enterprisePolicy) {
+        Set<Annotation> annotations = new HashSet<>();
+
+        validateFlags(policyName, enterprisePolicy.dpc());
+
+        for (Map.Entry<Function<EnterprisePolicy, Set<Annotation>>, Set<Integer>> annotation :
+                ANNOTATIONS_MAP.entrySet()) {
+            if (policyWillNotApply(enterprisePolicy.dpc(), annotation.getValue())) {
+                annotations.addAll(annotation.getKey().apply(enterprisePolicy));
+            }
+        }
+
+        removeShadowedAnnotations(annotations);
+
+        if (annotations.isEmpty()) {
+            // Don't run the original test unparameterized
+            annotations.add(includeNone());
+        }
+
+        return new ArrayList<>(annotations);
+    }
+
+    /**
+     * Get parameterized test runs where the policy cannot be set for the given policy.
+     */
+    public static List<Annotation> cannotSetPolicyStates(String policyName,
+            EnterprisePolicy enterprisePolicy, boolean includeDeviceAdminStates,
+            boolean includeNonDeviceAdminStates) {
+        Set<Annotation> annotations = new HashSet<>();
+
+        validateFlags(policyName, enterprisePolicy.dpc());
+
+        if (includeDeviceAdminStates) {
+            int allFlags = 0;
+            for (int p : enterprisePolicy.dpc()) {
+                allFlags = allFlags | p;
+            }
+
+            for (Map.Entry<Integer, Function<EnterprisePolicy, Set<Annotation>>> appliedByFlag :
+                    DPC_STATE_ANNOTATIONS.entrySet()) {
+                if ((appliedByFlag.getKey() & allFlags) == 0) {
+                    annotations.addAll(appliedByFlag.getValue().apply(enterprisePolicy));
+                }
+            }
+        }
+
+        if (includeNonDeviceAdminStates) {
+            Set<String> validScopes = ImmutableSet.copyOf(enterprisePolicy.delegatedScopes());
+            String[] scopes = ALL_DELEGATE_SCOPES.stream()
+                    .filter(i -> !validScopes.contains(i))
+                    .toArray(String[]::new);
+            Annotation[] existingAnnotations = IncludeRunOnDeviceOwnerUser.class.getAnnotations();
+
+            if (BedsteadJUnit4.isDebug()) {
+                // Add a non-DPC with no delegate scopes
+                Annotation[] newAnnotations = Arrays.copyOf(existingAnnotations,
+                        existingAnnotations.length + 1);
+                newAnnotations[newAnnotations.length - 1] = ensureHasDelegate(
+                        EnsureHasDelegate.AdminType.PRIMARY, new String[]{},
+                        /* isPrimary= */ true);
+                annotations.add(
+                        new DynamicParameterizedAnnotation("DelegateWithNoScopes", newAnnotations));
+
+                for (String scope : scopes) {
+                    newAnnotations = Arrays.copyOf(existingAnnotations,
+                            existingAnnotations.length + 1);
+                    newAnnotations[newAnnotations.length - 1] = ensureHasDelegate(
+                            EnsureHasDelegate.AdminType.PRIMARY, new String[]{scope},
+                            /* isPrimary= */ true);
+                    annotations.add(
+                            new DynamicParameterizedAnnotation("DelegateWithScope:" + scope, newAnnotations));
+                }
+            } else {
+                Annotation[] newAnnotations = Arrays.copyOf(existingAnnotations,
+                        existingAnnotations.length + 1);
+                newAnnotations[newAnnotations.length - 1] = ensureHasDelegate(
+                        EnsureHasDelegate.AdminType.PRIMARY, scopes, /* isPrimary= */ true);
+                annotations.add(
+                        new DynamicParameterizedAnnotation("DelegateWithoutValidScope", newAnnotations));
+            }
+        }
+
+        removeShadowedAnnotations(annotations);
+
+        if (annotations.isEmpty()) {
+            // Don't run the original test unparameterized
+            annotations.add(includeNone());
+        }
+
+        return new ArrayList<>(annotations);
+    }
+
+    /**
+     * Get state annotations where the policy can be set for the given policy.
+     */
+    public static List<Annotation> canSetPolicyStates(
+            String policyName, EnterprisePolicy enterprisePolicy, boolean singleTestOnly) {
+        Set<Annotation> annotations = new HashSet<>();
+
+        validateFlags(policyName, enterprisePolicy.dpc());
+
+        int allFlags = 0;
+        for (int p : enterprisePolicy.dpc()) {
+            allFlags = allFlags | p;
+        }
+
+        for (Map.Entry<Integer, Function<EnterprisePolicy, Set<Annotation>>> appliedByFlag :
+                DPC_STATE_ANNOTATIONS.entrySet()) {
+            if ((appliedByFlag.getKey() & allFlags) == appliedByFlag.getKey()) {
+                annotations.addAll(appliedByFlag.getValue().apply(enterprisePolicy));
+            }
+        }
+
+        if (annotations.isEmpty()) {
+            // Don't run the original test unparameterized
+            annotations.add(includeNone());
+        }
+
+        for (AppOp appOp : enterprisePolicy.appOps()) {
+            // TODO(b/219750042): Currently we only test that app ops can be set as the primary user
+            Annotation[] withAppOpAnnotations = new Annotation[]{
+                    ensureTestAppInstalled(
+                            DELEGATE_PACKAGE_NAME, UserType.INSTRUMENTED_USER,
+                            /* isPrimary= */ true),
+                    ensureTestAppHasAppOp(new String[]{appOp.appliedWith()})
+            };
+            annotations.add(
+                    new DynamicParameterizedAnnotation(
+                            "AppOp:" + appOp.appliedWith(), withAppOpAnnotations));
+        }
+
+
+        List<Annotation> annotationList = new ArrayList<>(annotations);
+
+        removeShadowingAnnotations(annotations);
+
+        if (singleTestOnly) {
+            // We select one annotation in an arbitrary but deterministic way
+            annotationList.sort(Comparator.comparing(
+                    a -> a instanceof DynamicParameterizedAnnotation
+                            ? "DynamicParameterizedAnnotation" : a.annotationType().getName()));
+
+            // We don't want a delegate to be the representative test
+            Annotation firstAnnotation = annotationList.stream()
+                    .filter(i -> !(i instanceof  DynamicParameterizedAnnotation))
+                    .findFirst().get();
+            annotationList.clear();
+            annotationList.add(firstAnnotation);
+        }
+
+        return annotationList;
+    }
+
+    private static void validateFlags(String policyName, int[] values) {
+        int usedAppliedByFlags = 0;
+
+        for (int value : values) {
+            validateFlags(policyName, value);
+            int newUsedAppliedByFlags = usedAppliedByFlags | (value & APPLIED_BY_FLAGS);
+            if (newUsedAppliedByFlags == usedAppliedByFlags) {
+                throw new IllegalStateException(
+                        "Cannot have more than one policy flag APPLIED by the same component. "
+                                + "Error in policy " + policyName);
+            }
+            usedAppliedByFlags = newUsedAppliedByFlags;
+        }
+    }
+
+    private static void validateFlags(String policyName, int value) {
+        int matchingAppliedByFlags = APPLIED_BY_FLAGS & value;
+
+        if (matchingAppliedByFlags == 0) {
+            throw new IllegalStateException(
+                    "All policy flags must specify 1 APPLIED_BY flag. Policy " + policyName
+                            + " did not.");
+        }
+    }
+
+    private static boolean hasFlag(int[] values, int matchingFlag) {
+        return hasFlag(values, matchingFlag, /* nonMatchingFlag= */ NO);
+    }
+
+    private static boolean hasFlag(int[] values, int matchingFlag, int nonMatchingFlag) {
+        for (int value : values) {
+            if (hasFlag(value, matchingFlag, nonMatchingFlag)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean hasFlag(int value, int matchingFlag, int nonMatchingFlag) {
+        if (!((value & matchingFlag) == matchingFlag)) {
+            return false;
+        }
+
+        if (nonMatchingFlag != NO) {
+            return (value & nonMatchingFlag) != nonMatchingFlag;
+        }
+
+        return true;
+    }
+
+    /**
+     * Remove entries from {@code annotations} which are shadowed by another entry
+     * in {@code annotatipns} (directly or indirectly).
+     */
+    private static void removeShadowedAnnotations(Set<Annotation> annotations) {
+        Set<Class<? extends Annotation>> shadowedAnnotations = new HashSet<>();
+        for (Annotation annotation : annotations) {
+            if (annotation instanceof DynamicParameterizedAnnotation) {
+                continue; // Doesn't shadow anything
+            }
+
+            ParameterizedAnnotation parameterizedAnnotation =
+                    annotation.annotationType().getAnnotation(ParameterizedAnnotation.class);
+
+            if (parameterizedAnnotation == null) {
+                continue; // Not parameterized
+            }
+
+            for (Class<? extends Annotation> shadowedAnnotationClass
+                    : parameterizedAnnotation.shadows()) {
+                addShadowed(shadowedAnnotations, shadowedAnnotationClass);
+            }
+        }
+
+        annotations.removeIf(a -> shadowedAnnotations.contains(a.annotationType()));
+    }
+
+    private static void addShadowed(Set<Class<? extends Annotation>> shadowedAnnotations,
+            Class<? extends Annotation> annotationClass) {
+        shadowedAnnotations.add(annotationClass);
+        ParameterizedAnnotation parameterizedAnnotation =
+                annotationClass.getAnnotation(ParameterizedAnnotation.class);
+
+        if (parameterizedAnnotation == null) {
+            return;
+        }
+
+        for (Class<? extends Annotation> shadowedAnnotationClass
+                : parameterizedAnnotation.shadows()) {
+            addShadowed(shadowedAnnotations, shadowedAnnotationClass);
+        }
+    }
+
+    // This maps classes to classes which shadow them - we just need to ensure it contains all
+    // annotation classes we encounter
+    private static Map<Class<? extends Annotation>, Set<Class<? extends Annotation>>>
+            sReverseShadowMap = new HashMap<>();
+
+    /**
+     * Remove entries from {@code annotations} which are shadowing another entry
+     * in {@code annotatipns} (directly or indirectly).
+     */
+    private static void removeShadowingAnnotations(Set<Annotation> annotations) {
+        for (Annotation annotation : annotations) {
+            recordInReverseShadowMap(annotation);
+        }
+
+        Set<Class<? extends Annotation>> shadowingAnnotations = new HashSet<>();
+
+        for (Annotation annotation : annotations) {
+            shadowingAnnotations.addAll(
+                    sReverseShadowMap.getOrDefault(annotation.annotationType(), Set.of()));
+        }
+
+        annotations.removeIf(a -> shadowingAnnotations.contains(a.annotationType()));
+    }
+
+    private static void recordInReverseShadowMap(Annotation annotation) {
+        if (annotation instanceof DynamicParameterizedAnnotation) {
+            return; // Not shadowed by anything
+        }
+
+        ParameterizedAnnotation parameterizedAnnotation =
+                annotation.annotationType().getAnnotation(ParameterizedAnnotation.class);
+
+        if (parameterizedAnnotation == null) {
+            return; // Not parameterized
+        }
+
+        if (parameterizedAnnotation.shadows().length == 0) {
+            return; // Doesn't shadow anything
+        }
+
+        recordShadowedInReverseShadowMap(annotation.annotationType(), parameterizedAnnotation);
+    }
+
+    private static void recordShadowedInReverseShadowMap(Class<? extends Annotation> annotation,
+            ParameterizedAnnotation parameterizedAnnotation) {
+        for (Class<? extends Annotation> shadowedAnnotation : parameterizedAnnotation.shadows()) {
+            ParameterizedAnnotation shadowedParameterizedAnnotation =
+                    shadowedAnnotation.getAnnotation(ParameterizedAnnotation.class);
+
+            if (shadowedParameterizedAnnotation == null) {
+                continue; // Not parameterized
+            }
+
+            if (!sReverseShadowMap.containsKey(shadowedAnnotation)) {
+                sReverseShadowMap.put(shadowedAnnotation, new HashSet<>());
+            }
+
+            sReverseShadowMap.get(shadowedAnnotation).add(annotation);
+
+            recordShadowedInReverseShadowMap(annotation, shadowedParameterizedAnnotation);
+        }
+    }
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/UserType.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/UserType.java
new file mode 100644
index 0000000..369acfb
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/UserType.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier;
+
+public enum UserType {
+    /** Only to be used with annotations. */
+    ANY,
+    SYSTEM_USER,
+    INSTRUMENTED_USER,
+    PRIMARY_USER,
+    SECONDARY_USER,
+    WORK_PROFILE,
+    CURRENT_USER,
+    TV_PROFILE,
+    DPC_USER;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/AfterClass.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/AfterClass.java
new file mode 100644
index 0000000..3bb6449
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/AfterClass.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Replacement for {@link org.junit.AfterClass} for use by classes which use {@code Devicestate}.
+ *
+ * <p>Methods annotated {@link AfterClass} must be public, static, must return {@code void}, and
+ * must take no arguments.
+ *
+ * <p>The annotated method will be called after all tests, once per class.
+ *
+ * <p>The state prior to calling this method is not guaranteed, as test methods may have changed the
+ * state. If any class-level annotation assumptions are violated this method will not be run.
+ *
+ * <p>If there are multiple methods annotated {@code @AfterClass} there is no guarantee as to the
+ * order they will be executed.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface AfterClass {
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/AnnotationRunPrecedence.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/AnnotationRunPrecedence.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/AnnotationRunPrecedence.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/AnnotationRunPrecedence.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/BeforeClass.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/BeforeClass.java
new file mode 100644
index 0000000..f6de30a
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/BeforeClass.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Replacement for {@link org.junit.BeforeClass} for use by classes which use {@code Devicestate}.
+ *
+ * <p>Methods annotated {@link BeforeClass} must be public, static, must return {@code void}, and
+ * must take no arguments.
+ *
+ * <p>The annotated method will be called before any tests, once per class. Class-level Bedstead
+ * annotations will be processed before running the method, and if any assumptions are violated the
+ * method will not be run.
+ *
+ * <p>If there are multiple methods annotated {@code @BeforeClass} there is no guarantee as to the
+ * order they will be executed.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface BeforeClass {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/CrossUserTest.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/CrossUserTest.java
new file mode 100644
index 0000000..c60a631
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/CrossUserTest.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
+
+import com.android.bedstead.harrier.annotations.meta.RequiresBedsteadJUnit4;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A test which runs on multiple pairs of users.
+ *
+ * <p>You can access the {@code to} part of the pair using {@code DeviceState#otherUser}.
+ */
+// TODO(b/217858437): Enable indirect usage
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@RequiresBedsteadJUnit4
+public @interface CrossUserTest {
+    UserPair[] value() default {};
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default PRECEDENCE_NOT_IMPORTANT;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureBluetoothDisabled.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureBluetoothDisabled.java
new file mode 100644
index 0000000..8f60cea
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureBluetoothDisabled.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method requires a bluetooth to be disabled.
+ *
+ * <p>You can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnsureBluetoothDisabled {
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default LATE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureBluetoothEnabled.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureBluetoothEnabled.java
new file mode 100644
index 0000000..3c259b2
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureBluetoothEnabled.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method requires a bluetooth to be enabled.
+ *
+ * <p>You can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnsureBluetoothEnabled {
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default LATE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureCanGetPermission.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureCanGetPermission.java
new file mode 100644
index 0000000..ba75e8c
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureCanGetPermission.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Ensure that the given permission is grantable before running the test.
+ *
+ * <p>This is equivalent to {@link EnsureHasPermission} but does not actually grant the permission.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(EnsureCanGetPermissionGroup.class)
+public @interface EnsureCanGetPermission {
+    String[] value();
+
+    /** The minimum version where this permission is required. */
+    int minVersion() default 0;
+
+    /** The maximum version where this permission is required. */
+    int maxVersion() default Integer.MAX_VALUE;
+
+    FailureMode failureMode() default FailureMode.FAIL;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureCanGetPermissionGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureCanGetPermissionGroup.java
new file mode 100644
index 0000000..b54dda4
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureCanGetPermissionGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface EnsureCanGetPermissionGroup {
+    EnsureCanGetPermission[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureDoesNotHaveAppOp.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureDoesNotHaveAppOp.java
new file mode 100644
index 0000000..e33b12c
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureDoesNotHaveAppOp.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Ensure that the given appOp state is ignored before running the test.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(EnsureDoesNotHaveAppOpGroup.class)
+public @interface EnsureDoesNotHaveAppOp {
+    String value();
+
+    FailureMode failureMode() default FailureMode.FAIL;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureDoesNotHaveAppOpGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureDoesNotHaveAppOpGroup.java
new file mode 100644
index 0000000..a9274b2
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureDoesNotHaveAppOpGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface EnsureDoesNotHaveAppOpGroup {
+    EnsureDoesNotHaveAppOp[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureDoesNotHavePermission.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureDoesNotHavePermission.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureDoesNotHavePermission.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureDoesNotHavePermission.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasAppOp.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasAppOp.java
new file mode 100644
index 0000000..0e09af5
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasAppOp.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Ensure that the given appOp state is allowed before running the test.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(EnsureHasAppOpGroup.class)
+public @interface EnsureHasAppOp {
+    String value();
+
+    FailureMode failureMode() default FailureMode.FAIL;
+
+    /** The minimum version where this appOp is required. */
+    int minVersion() default 0;
+
+    /** The maximum version where this appOp is required. */
+    int maxVersion() default Integer.MAX_VALUE;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasAppOpGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasAppOpGroup.java
new file mode 100644
index 0000000..f4aa890
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasAppOpGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface EnsureHasAppOpGroup {
+    EnsureHasAppOp[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoSecondaryUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoSecondaryUser.java
new file mode 100644
index 0000000..7e65661f
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoSecondaryUser.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.annotations.meta.EnsureHasNoUserAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run on a device which has no secondary user that is not the
+ * instrumented user.
+ *
+ * <p>Your test configuration may be configured so that this test is only run on a device which
+ * has no secondary user that is not the current user. Otherwise, you can use {@code Devicestate}
+ * to ensure that the device enters the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@EnsureHasNoUserAnnotation("android.os.usertype.full.SECONDARY")
+public @interface EnsureHasNoSecondaryUser {
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoTvProfile.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoTvProfile.java
new file mode 100644
index 0000000..890ffd6
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoTvProfile.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.UserType.INSTRUMENTED_USER;
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.UserType;
+import com.android.bedstead.harrier.annotations.meta.EnsureHasNoProfileAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run on a user which has no Tv profile.
+ *
+ * <p>Your test configuration may be configured so that this test is only run on a user which has
+ * no Tv profile. Otherwise, you can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@EnsureHasNoProfileAnnotation("com.android.tv.profile")
+public @interface EnsureHasNoTvProfile {
+    /** Which user type the tv profile should not be attached to. */
+    UserType forUser() default INSTRUMENTED_USER;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoWorkProfile.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoWorkProfile.java
new file mode 100644
index 0000000..f0ef680
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoWorkProfile.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.UserType.INSTRUMENTED_USER;
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.UserType;
+import com.android.bedstead.harrier.annotations.meta.EnsureHasNoProfileAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run on a user which does not have a work profile.
+ *
+ * <p>Your test configuration may be configured so that this test is only run on a user which has
+ * no work profile. Otherwise, you can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@EnsureHasNoProfileAnnotation("android.os.usertype.profile.MANAGED")
+@RequireFeature("android.software.managed_users")
+public @interface EnsureHasNoWorkProfile {
+    /** Which user type the work profile should not be attached to. */
+    UserType forUser() default INSTRUMENTED_USER;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasPermission.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasPermission.java
new file mode 100644
index 0000000..2578c40
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasPermission.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Ensure that the given permission is granted before running the test.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(EnsureHasPermissionGroup.class)
+public @interface EnsureHasPermission {
+    String[] value();
+
+    FailureMode failureMode() default FailureMode.FAIL;
+
+    /** The minimum version where this permission is required. */
+    int minVersion() default 0;
+
+    /** The maximum version where this permission is required. */
+    int maxVersion() default Integer.MAX_VALUE;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasPermissionGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasPermissionGroup.java
new file mode 100644
index 0000000..80f2ab8
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasPermissionGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface EnsureHasPermissionGroup {
+    EnsureHasPermission[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasSecondaryUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasSecondaryUser.java
new file mode 100644
index 0000000..e62d6e8
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasSecondaryUser.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.OptionalBoolean.ANY;
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.OptionalBoolean;
+import com.android.bedstead.harrier.annotations.meta.EnsureHasUserAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run on a device which has a secondary user.
+ *
+ * <p>Your test configuration may be configured so that this test is only run on a device which
+ * has a secondary user that is not the current user. Otherwise, you can use {@code Devicestate}
+ * to ensure that the device enters the correct state for the method. If there is not already a
+ * secondary user on the device, and the device does not support creating additional users, then
+ * the test will be skipped.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@EnsureHasUserAnnotation("android.os.usertype.full.SECONDARY")
+public @interface EnsureHasSecondaryUser {
+    /** Whether the instrumented test app should be installed in the secondary user. */
+    OptionalBoolean installInstrumentedApp() default ANY;
+
+    /**
+     * Should we ensure that we are switched to the given user
+     */
+    OptionalBoolean switchedToUser() default ANY;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasTvProfile.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasTvProfile.java
new file mode 100644
index 0000000..d1ceb7c
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasTvProfile.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.OptionalBoolean.ANY;
+import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
+import static com.android.bedstead.harrier.UserType.INSTRUMENTED_USER;
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.OptionalBoolean;
+import com.android.bedstead.harrier.UserType;
+import com.android.bedstead.harrier.annotations.meta.EnsureHasProfileAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run on a user which has a Tv profile.
+ *
+ * <p>Your test configuration may be configured so that this test is only run on a user which has
+ * a Tv profile. Otherwise, you can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@EnsureHasProfileAnnotation("com.android.tv.profile")
+public @interface EnsureHasTvProfile {
+    /** Which user type the tv profile should be attached to. */
+    UserType forUser() default INSTRUMENTED_USER;
+
+    /** Whether the instrumented test app should be installed in the tv profile. */
+    OptionalBoolean installInstrumentedApp() default TRUE;
+
+    /**
+     * Should we ensure that we are switched to the parent of the profile.
+     */
+    OptionalBoolean switchedToParentUser() default ANY;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasWorkProfile.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasWorkProfile.java
new file mode 100644
index 0000000..ee838d0
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasWorkProfile.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.OptionalBoolean.ANY;
+import static com.android.bedstead.harrier.UserType.PRIMARY_USER;
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.OptionalBoolean;
+import com.android.bedstead.harrier.UserType;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDeviceOwner;
+import com.android.bedstead.harrier.annotations.meta.EnsureHasProfileAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run on a user which has a work profile.
+ *
+ * <p>Use of this annotation implies
+ * {@code RequireFeature("android.software.managed_users", SKIP)}.
+ *
+ * <p>Your test configuration may be configured so that this test is only run on a user which has
+ * a work profile. Otherwise, you can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@EnsureHasProfileAnnotation(value = "android.os.usertype.profile.MANAGED", hasProfileOwner = true)
+@RequireFeature("android.software.managed_users")
+@EnsureHasNoDeviceOwner // TODO: This should only apply on Android R+
+public @interface EnsureHasWorkProfile {
+    /** Which user type the work profile should be attached to. */
+    UserType forUser() default PRIMARY_USER; // Currently only the primary user is supported
+
+    /** Whether the instrumented test app should be installed in the work profile. */
+    OptionalBoolean installInstrumentedApp() default ANY;
+
+    /**
+     * Whether the profile owner's DPC should be returned by calls to {@code Devicestate#dpc()}.
+     *
+     * <p>Only one device policy controller per test should be marked as primary.
+     */
+    boolean dpcIsPrimary() default false;
+
+    /**
+     * If true, uses the {@code DevicePolicyManager#getParentProfileInstance(ComponentName)}
+     * instance of the dpc when calling to .dpc()
+     *
+     * <p>Only used if {@link #dpcIsPrimary()} is true.
+     */
+    boolean useParentInstanceOfDpc() default false;
+
+    /**
+     * Should we ensure that we are switched to the parent of the profile.
+     */
+    OptionalBoolean switchedToParentUser() default ANY;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsurePackageNotInstalled.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsurePackageNotInstalled.java
new file mode 100644
index 0000000..065eb94
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsurePackageNotInstalled.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.UserType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run only when a given package is not installed.
+ *
+ * <p>You can guarantee that these methods do not run on devices with the package by
+ * using {@code DeviceState}.
+ *
+ * <p>Tests annotated with this will attempt to remove the package if it exists, or otherwise fail.
+ * If you'd rather skip or fail tests immediately without attempting to remove see
+ * {@link RequirePackageNotInstalled}.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(EnsurePackageNotInstalledGroup.class)
+public @interface EnsurePackageNotInstalled {
+    String value();
+    UserType onUser() default UserType.INSTRUMENTED_USER;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsurePackageNotInstalledGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsurePackageNotInstalledGroup.java
new file mode 100644
index 0000000..12332f9
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsurePackageNotInstalledGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface EnsurePackageNotInstalledGroup {
+    EnsurePackageNotInstalled[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsurePasswordNotSet.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsurePasswordNotSet.java
new file mode 100644
index 0000000..2f27297
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsurePasswordNotSet.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.UserType.INSTRUMENTED_USER;
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import com.android.bedstead.harrier.UserType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method requires no password be set on the given user.
+ *
+ * <p>You can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnsurePasswordNotSet {
+
+    /** The user who must not have a password. */
+    UserType forUser() default INSTRUMENTED_USER;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsurePasswordSet.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsurePasswordSet.java
new file mode 100644
index 0000000..eada01c
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsurePasswordSet.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.Defaults.DEFAULT_PASSWORD;
+import static com.android.bedstead.harrier.UserType.INSTRUMENTED_USER;
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.UserType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method requires a password be set on the given user.
+ *
+ * <p>You can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnsurePasswordSet {
+
+    /** The user who must have a password. */
+    UserType forUser() default INSTRUMENTED_USER;
+
+    /** The password to set. Defaults to {@code Devicestate#DEFAULT_PASSWORD}. */
+    String password() default DEFAULT_PASSWORD;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureScreenIsOn.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureScreenIsOn.java
new file mode 100644
index 0000000..10eb715
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureScreenIsOn.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method requires the screen to be on.
+ *
+ * <p>You can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnsureScreenIsOn {
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppHasAppOp.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppHasAppOp.java
new file mode 100644
index 0000000..98213c0
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppHasAppOp.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.EnsureTestAppInstalled.DEFAULT_TEST_APP_KEY;
+import static com.android.bedstead.harrier.annotations.EnsureTestAppInstalled.ENSURE_TEST_APP_INSTALLED_WEIGHT;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Ensure that the given app op is granted to the test app before running the test.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(EnsureTestAppHasAppOpGroup.class)
+public @interface EnsureTestAppHasAppOp {
+    String[] value();
+
+    String testAppKey() default DEFAULT_TEST_APP_KEY;
+
+    /** The minimum version where this appOp is required. */
+    int minVersion() default 0;
+
+    /** The maximum version where this appOp is required. */
+    int maxVersion() default Integer.MAX_VALUE;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default ENSURE_TEST_APP_INSTALLED_WEIGHT + 1;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppHasAppOpGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppHasAppOpGroup.java
new file mode 100644
index 0000000..5cc8576
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppHasAppOpGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.EnsureTestAppInstalled.ENSURE_TEST_APP_INSTALLED_WEIGHT;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface EnsureTestAppHasAppOpGroup {
+    EnsureTestAppHasAppOp[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default ENSURE_TEST_APP_INSTALLED_WEIGHT + 1;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppHasPermission.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppHasPermission.java
new file mode 100644
index 0000000..de1b127
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppHasPermission.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.EnsureTestAppInstalled.DEFAULT_TEST_APP_KEY;
+import static com.android.bedstead.harrier.annotations.EnsureTestAppInstalled.ENSURE_TEST_APP_INSTALLED_WEIGHT;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Ensure that the given permission is granted to the test app before running the test.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(EnsureTestAppHasPermissionGroup.class)
+public @interface EnsureTestAppHasPermission {
+    String[] value();
+
+    String testAppKey() default DEFAULT_TEST_APP_KEY;
+
+    /** The minimum version where this permission is required. */
+    int minVersion() default 0;
+
+    /** The maximum version where this permission is required. */
+    int maxVersion() default Integer.MAX_VALUE;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default ENSURE_TEST_APP_INSTALLED_WEIGHT + 1;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppHasPermissionGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppHasPermissionGroup.java
new file mode 100644
index 0000000..38623a0
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppHasPermissionGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.EnsureTestAppInstalled.ENSURE_TEST_APP_INSTALLED_WEIGHT;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface EnsureTestAppHasPermissionGroup {
+    EnsureTestAppHasPermission[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default ENSURE_TEST_APP_INSTALLED_WEIGHT + 1;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppInstalled.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppInstalled.java
new file mode 100644
index 0000000..b65b273
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppInstalled.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.UserType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test requires the given test app to be installed on the given user.
+ *
+ * <p>You should use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method. You can use {@code Devicestate#delegate()} to interact with
+ * the delegate.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(EnsureTestAppInstalledGroup.class)
+public @interface EnsureTestAppInstalled {
+
+    int ENSURE_TEST_APP_INSTALLED_WEIGHT = MIDDLE;
+
+    String DEFAULT_TEST_APP_KEY = "testApp";
+
+    /** A key which uniquely identifies the test app for the test. */
+    String key() default DEFAULT_TEST_APP_KEY;
+
+    /** The package name of the testapp. */
+    String packageName();
+
+    /** The user the testApp should be installed on. */
+    UserType onUser() default UserType.INSTRUMENTED_USER;
+
+    /**
+     * Whether this testApp should be returned by calls to {@code DeviceState#policyManager()}.
+     *
+     * <p>Only one policy manager per test should be marked as primary.
+     */
+    boolean isPrimary() default false;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default ENSURE_TEST_APP_INSTALLED_WEIGHT;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppInstalledGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppInstalledGroup.java
new file mode 100644
index 0000000..6fa8945
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnsureTestAppInstalledGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.EnsureTestAppInstalled.ENSURE_TEST_APP_INSTALLED_WEIGHT;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface EnsureTestAppInstalledGroup {
+    EnsureTestAppInstalled[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default ENSURE_TEST_APP_INSTALLED_WEIGHT;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnumTestParameter.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnumTestParameter.java
new file mode 100644
index 0000000..03705ee
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/EnumTestParameter.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark a parameter as being parameterised with the given values.
+ *
+ * <p>You must be using the {@link BedsteadJUnit4} test runner to use this annotation.
+ */
+@Target({ElementType.ANNOTATION_TYPE, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnumTestParameter {
+    /** The type of the enum. */
+    Class<? extends Enum<?>> value();
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/FailureMode.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/FailureMode.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/FailureMode.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/FailureMode.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/IntTestParameter.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/IntTestParameter.java
new file mode 100644
index 0000000..dca3d37
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/IntTestParameter.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark an {@code int} parameter as being parameterised with the given values.
+ *
+ * <p>You must be using the {@link BedsteadJUnit4} test runner to use this annotation.
+ */
+@Target({ElementType.ANNOTATION_TYPE, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface IntTestParameter {
+    int[] value();
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/NotificationsTest.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/NotificationsTest.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/NotificationsTest.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/NotificationsTest.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/OtherUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/OtherUser.java
new file mode 100644
index 0000000..5929666
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/OtherUser.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+
+import com.android.bedstead.harrier.UserType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a particular user type is the "other" user.
+ *
+ * <p>This user can then be accessed using {@code DeviceState#otherUser}.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface OtherUser {
+
+    UserType value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default MIDDLE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/PermissionTest.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/PermissionTest.java
new file mode 100644
index 0000000..ae39834
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/PermissionTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
+
+import com.android.bedstead.harrier.annotations.meta.RequiresBedsteadJUnit4;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark a test as testing something that can be done with one of multiple permissions.
+ *
+ * <p>This will generate one test for each permission, and each run will have only one of the
+ * specified permissions.
+ *
+ * <p>This requires the use of the {@code BedsteadJUnit4} test runner.
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@RequiresBedsteadJUnit4
+public @interface PermissionTest {
+    /**
+     * The permissions which enable the functionality being tested.
+     *
+     * <p>This is used to calculate which states are required to be tested.
+     */
+    String[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default PRECEDENCE_NOT_IMPORTANT;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/Postsubmit.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/Postsubmit.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/Postsubmit.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/Postsubmit.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RemoveAfterVersion.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RemoveAfterVersion.java
new file mode 100644
index 0000000..597d2a6
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RemoveAfterVersion.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.annotations;
+
+/** Mark that a test should be removed after a certain Android Version is no longer supported. */
+public @interface RemoveAfterVersion {
+    int value();
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireAospBuild.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireAospBuild.java
new file mode 100644
index 0000000..6c9c008
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireAospBuild.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+import static com.android.bedstead.harrier.annotations.RequireAospBuild.GMS_CORE_PACKAGE;
+import static com.android.bedstead.harrier.annotations.RequireAospBuild.GSF_PACKAGE;
+import static com.android.bedstead.harrier.annotations.RequireAospBuild.PLAY_STORE_PACKAGE;
+
+import com.android.bedstead.harrier.UserType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RequirePackageNotInstalled(value = GMS_CORE_PACKAGE, onUser = UserType.ANY)
+@RequirePackageNotInstalled(value = PLAY_STORE_PACKAGE, onUser = UserType.ANY)
+@RequirePackageNotInstalled(value = GSF_PACKAGE, onUser = UserType.ANY)
+public @interface RequireAospBuild {
+    String GMS_CORE_PACKAGE = "com.google.android.gms";
+    String PLAY_STORE_PACKAGE = "com.android.vending";
+    String GSF_PACKAGE = "com.google.android.gsf";
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireCnGmsBuild.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireCnGmsBuild.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireCnGmsBuild.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireCnGmsBuild.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireDoesNotHaveFeature.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireDoesNotHaveFeature.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireDoesNotHaveFeature.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireDoesNotHaveFeature.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireDoesNotHaveFeatureGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireDoesNotHaveFeatureGroup.java
new file mode 100644
index 0000000..aa10607
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireDoesNotHaveFeatureGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface RequireDoesNotHaveFeatureGroup {
+    RequireDoesNotHaveFeature[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireFeature.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireFeature.java
new file mode 100644
index 0000000..5a588d4
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireFeature.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run only when the device has a given feature.
+ *
+ * <p>You can guarantee that these methods do not run on devices lacking the feature by
+ * using {@code DeviceState}.
+ *
+ * <p>By default the test will be skipped if the feature is not available. If you'd rather the test
+ * fail then use {@code failureMode = FailureMode.FAIL}.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(RequireFeatureGroup.class)
+public @interface RequireFeature {
+    String value();
+    FailureMode failureMode() default FailureMode.SKIP;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireFeatureGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireFeatureGroup.java
new file mode 100644
index 0000000..02e2002
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireFeatureGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface RequireFeatureGroup {
+    RequireFeature[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireGmsBuild.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireGmsBuild.java
new file mode 100644
index 0000000..86323c0
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireGmsBuild.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+import static com.android.bedstead.harrier.annotations.RequireAospBuild.GMS_CORE_PACKAGE;
+import static com.android.bedstead.harrier.annotations.RequireAospBuild.GSF_PACKAGE;
+import static com.android.bedstead.harrier.annotations.RequireAospBuild.PLAY_STORE_PACKAGE;
+
+import com.android.bedstead.harrier.UserType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RequirePackageInstalled(value = GMS_CORE_PACKAGE, onUser = UserType.ANY)
+@RequirePackageInstalled(value = PLAY_STORE_PACKAGE, onUser = UserType.ANY)
+@RequirePackageInstalled(value = GSF_PACKAGE, onUser = UserType.ANY)
+public @interface RequireGmsBuild {
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireHeadlessSystemUserMode.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireHeadlessSystemUserMode.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireHeadlessSystemUserMode.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireHeadlessSystemUserMode.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireLowRamDevice.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireLowRamDevice.java
new file mode 100644
index 0000000..5fb415f
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireLowRamDevice.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to indicate that a test requires a low ram device.
+ *
+ * <p>This can be enforced by using {@code Devicestate}.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RequireLowRamDevice {
+    String reason();
+    FailureMode failureMode() default FailureMode.SKIP;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireNotCnGmsBuild.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireNotCnGmsBuild.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireNotCnGmsBuild.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireNotCnGmsBuild.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireNotHeadlessSystemUserMode.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireNotHeadlessSystemUserMode.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireNotHeadlessSystemUserMode.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireNotHeadlessSystemUserMode.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireNotLowRamDevice.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireNotLowRamDevice.java
new file mode 100644
index 0000000..5041014
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireNotLowRamDevice.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to indicate that a test does not run on low ram devices.
+ *
+ * <p>This can be enforced by using {@code Devicestate}.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RequireNotLowRamDevice {
+    String reason();
+    FailureMode failureMode() default FailureMode.SKIP;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageInstalled.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageInstalled.java
new file mode 100644
index 0000000..e46881e
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageInstalled.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import com.android.bedstead.harrier.UserType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run only when a given package is installed.
+ *
+ * <p>You can guarantee that these methods do not run on devices lacking the package by
+ * using {@code DeviceState}.
+ *
+ * <p>By default the test will be skipped if the package is not available. If you'd rather the test
+ * fail then use {@code failureMode = FailureMode.FAIL}.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(RequirePackageInstalledGroup.class)
+public @interface RequirePackageInstalled {
+    String value();
+    UserType onUser() default UserType.INSTRUMENTED_USER;
+    FailureMode failureMode() default FailureMode.SKIP;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageInstalledGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageInstalledGroup.java
new file mode 100644
index 0000000..25390e8
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageInstalledGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface RequirePackageInstalledGroup {
+    RequirePackageInstalled[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageNotInstalled.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageNotInstalled.java
new file mode 100644
index 0000000..d4a42f5
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageNotInstalled.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import com.android.bedstead.harrier.UserType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run only when a given package is not installed.
+ *
+ * <p>You can guarantee that these methods do not run on devices with the package by
+ * using {@code DeviceState}.
+ *
+ * <p>By default the test will be skipped if the package is available. If you'd rather the test
+ * fail then use {@code failureMode = FailureMode.FAIL}. If you'd like to uninstall the package if
+ * it is installed, see {@link EnsurePackageNotInstalled}.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(RequirePackageNotInstalledGroup.class)
+public @interface RequirePackageNotInstalled {
+    String value();
+    UserType onUser() default UserType.INSTRUMENTED_USER;
+    FailureMode failureMode() default FailureMode.SKIP;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageNotInstalledGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageNotInstalledGroup.java
new file mode 100644
index 0000000..f44b7cf
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageNotInstalledGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface RequirePackageNotInstalledGroup {
+    RequirePackageNotInstalled[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunNotOnSecondaryUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunNotOnSecondaryUser.java
new file mode 100644
index 0000000..5e84335
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunNotOnSecondaryUser.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run on a non-secondary user.
+ *
+ * <p>Your test configuration should be such that this test is only run where a non-secondary user
+ * is created and the test is being run on that user.
+ *
+ * <p>Optionally, you can guarantee that these methods do not run on a secondary user by
+ * using {@code Devicestate}.
+ *
+ * <p>This annotation by default opts a test into multi-user presubmit. New tests should also be
+ * annotated {@link Postsubmit} until they are shown to meet the multi-user presubmit
+ * requirements.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+// To ensure that the test doesn't run on the secondary user we require that the test run on
+// the primary user to ensure consistent behaviour.
+@RequireRunOnPrimaryUser
+public @interface RequireRunNotOnSecondaryUser {
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnPrimaryUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnPrimaryUser.java
new file mode 100644
index 0000000..3f937af
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnPrimaryUser.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import com.android.bedstead.harrier.OptionalBoolean;
+import com.android.bedstead.harrier.annotations.meta.RequireRunOnUserAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run on the primary user.
+ *
+ * <p>Your test configuration should be such that this test is only run on the primary user
+ *
+ * <p>Optionally, you can guarantee that these methods do not run outside of the primary
+ * user by using {@code Devicestate}.
+ *
+ * <p>Note that in practice this requires that the test runs on the system user, but excludes
+ * headless system users. To mark that a test should run on the system user, including headless
+ * system users, see {@link RequireRunOnSystemUser}.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RequireRunOnUserAnnotation("android.os.usertype.full.SYSTEM")
+public @interface RequireRunOnPrimaryUser {
+    /**
+     * Should we ensure that we are switched to the given user
+     */
+    OptionalBoolean switchedToUser() default TRUE;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnSecondaryUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnSecondaryUser.java
new file mode 100644
index 0000000..08734ea
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnSecondaryUser.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import com.android.bedstead.harrier.OptionalBoolean;
+import com.android.bedstead.harrier.annotations.meta.RequireRunOnUserAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run on a secondary user.
+ *
+ * <p>Your test configuration should be such that this test is only run where a secondary user is
+ * created and the test is being run on that user.
+ *
+ * <p>Optionally, you can guarantee that these methods do not run outside of a secondary user by
+ * using {@code Devicestate}.
+ *
+ * <p>This annotation by default opts a test into multi-user presubmit. New tests should also be
+ * annotated {@link Postsubmit} until they are shown to meet the multi-user presubmit
+ * requirements.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RequireRunOnUserAnnotation("android.os.usertype.full.SECONDARY")
+public @interface RequireRunOnSecondaryUser {
+    /**
+     * Should we ensure that we are switched to the given user
+     */
+    OptionalBoolean switchedToUser() default TRUE;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnSystemUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnSystemUser.java
new file mode 100644
index 0000000..03321ce
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnSystemUser.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import com.android.bedstead.harrier.OptionalBoolean;
+import com.android.bedstead.harrier.annotations.meta.RequireRunOnUserAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run on the system user.
+ *
+ * <p>Your test configuration should be such that this test is only run on the system user
+ *
+ * <p>Optionally, you can guarantee that these methods do not run outside of the system
+ * user by using {@code Devicestate}.
+ *
+ * <p>Note that this requires that the test runs on the system user, including headless system
+ * users. To mark that a test should run on the primary user, excluding headless
+ * system users, see {@link RequireRunOnPrimaryUser}.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RequireRunOnUserAnnotation(
+        {"android.os.usertype.full.SYSTEM", "android.os.usertype.system.HEADLESS"})
+public @interface RequireRunOnSystemUser {
+    /**
+     * Should we ensure that we are switched to the given user
+     */
+    OptionalBoolean switchedToUser() default TRUE;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnTvProfile.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnTvProfile.java
new file mode 100644
index 0000000..b5ab38c
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnTvProfile.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.OptionalBoolean.ANY;
+import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import com.android.bedstead.harrier.OptionalBoolean;
+import com.android.bedstead.harrier.annotations.meta.RequireRunOnProfileAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run within a Tv profile.
+ *
+ * <p>Your test configuration should be such that this test is only run where a Tv profile is
+ * created and the test is being run within that user.
+ *
+ * <p>Optionally, you can guarantee that these methods do not run outside of a Tv
+ * profile by using {@code Devicestate}.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RequireRunOnProfileAnnotation("com.android.tv.profile")
+public @interface RequireRunOnTvProfile {
+    OptionalBoolean installInstrumentedAppInParent() default ANY;
+
+    /**
+     * Should we ensure that we are switched to the parent of the profile.
+     */
+    OptionalBoolean switchedToParentUser() default TRUE;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnWorkProfile.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnWorkProfile.java
new file mode 100644
index 0000000..b811fff
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnWorkProfile.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.OptionalBoolean.ANY;
+import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+import static com.android.bedstead.nene.packages.CommonPackages.FEATURE_DEVICE_ADMIN;
+
+import com.android.bedstead.harrier.OptionalBoolean;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasProfileOwner;
+import com.android.bedstead.harrier.annotations.meta.RequireRunOnProfileAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should run within a work profile.
+ *
+ * <p>Your test configuration should be such that this test is only run where a work profile is
+ * created and the test is being run within that user.
+ *
+ * <p>Optionally, you can guarantee that these methods do not run outside of a work
+ * profile by using {@code Devicestate}.
+ *
+ * <p>This annotation by default opts a test into multi-user presubmit. New tests should also be
+ * annotated {@link Postsubmit} until they are shown to meet the multi-user presubmit requirements.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RequireRunOnProfileAnnotation(value = "android.os.usertype.profile.MANAGED",
+        hasProfileOwner = true)
+@EnsureHasProfileOwner
+@RequireFeature(FEATURE_DEVICE_ADMIN)
+public @interface RequireRunOnWorkProfile {
+    OptionalBoolean installInstrumentedAppInParent() default ANY;
+
+    /**
+     * Whether the profile owner's DPC should be returned by calls to {@code Devicestate#dpc()}.
+     *
+     * <p>Only one device policy controller per test should be marked as primary.
+     */
+    boolean dpcIsPrimary() default false;
+
+    /**
+     * Affiliation ids to be set for the profile owner.
+     */
+    String[] affiliationIds() default {};
+
+    /**
+     * Should we ensure that we are switched to the parent of the profile.
+     */
+    OptionalBoolean switchedToParentUser() default TRUE;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireSdkVersion.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireSdkVersion.java
new file mode 100644
index 0000000..75cbed0
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireSdkVersion.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should only run on specified sdk versions.
+ *
+ * <p>Your test configuration may be configured so that this test is only run on a device with the
+ * given version. Otherwise, you can use {@code Devicestate} to ensure that the test is
+ * not run when the sdk version is not correct.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RequireSdkVersion {
+    int min() default 1;
+    int max() default Integer.MAX_VALUE;
+    String reason() default "";
+    FailureMode failureMode() default FailureMode.SKIP;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireTargetSdkVersion.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireTargetSdkVersion.java
new file mode 100644
index 0000000..81bd147
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireTargetSdkVersion.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should only run in an apk targeting the specified sdk version.
+ *
+ * <p>Your test configuration may be configured so that this test is only run in an apk with the
+ * given version. Otherwise, you can use {@code Devicestate} to ensure that the test is
+ * not run when the target sdk version is not correct.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RequireTargetSdkVersion {
+    int min() default 1;
+    int max() default Integer.MAX_VALUE;
+    FailureMode failureMode() default FailureMode.SKIP;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireUserSupported.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireUserSupported.java
new file mode 100644
index 0000000..4663a15
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireUserSupported.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test method should only run if a particular user type is supported
+ *
+ * <p>Your test configuration may be configured so that this test is only run on a user which
+ * supports the user types. Otherwise, you can use {@code Devicestate} to ensure that the test is
+ * not run when the user type is not supported.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@Repeatable(RequireUserSupportedGroup.class)
+public @interface RequireUserSupported {
+    String value();
+    FailureMode failureMode() default FailureMode.SKIP;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireUserSupportedGroup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireUserSupportedGroup.java
new file mode 100644
index 0000000..e1d6d2f
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequireUserSupportedGroup.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
+
+import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RepeatingAnnotation
+public @interface RequireUserSupportedGroup {
+    RequireUserSupported[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default EARLY;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequiresNonGrantablePermission.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequiresNonGrantablePermission.java
new file mode 100644
index 0000000..e75903c
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/RequiresNonGrantablePermission.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test is not in CTS only because it requires a permission that cannot be granted in
+ * CTS.
+ *
+ * <p>This has no impact on running tests, and is just for information for future maintainers.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RequiresNonGrantablePermission {
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/SlowApiTest.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/SlowApiTest.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/SlowApiTest.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/SlowApiTest.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/StringTestParameter.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/StringTestParameter.java
new file mode 100644
index 0000000..cbf7bdb
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/StringTestParameter.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark a {@link String} parameter as being parameterised with the given values.
+ *
+ * <p>You must be using the {@link BedsteadJUnit4} test runner to use this annotation.
+ */
+@Target({ElementType.ANNOTATION_TYPE, ElementType.PARAMETER})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface StringTestParameter {
+    String[] value();
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/TestTag.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/TestTag.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/TestTag.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/TestTag.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/TestTags.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/TestTags.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/TestTags.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/TestTags.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/UserPair.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/UserPair.java
new file mode 100644
index 0000000..e436878
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/UserPair.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.annotations;
+
+import com.android.bedstead.harrier.UserType;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A pair of users, for use with {@link CrossUserTest}.
+ */
+@Target({})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface UserPair {
+    UserType from();
+    UserType to();
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/UserTest.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/UserTest.java
new file mode 100644
index 0000000..1d721fe
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/UserTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.annotations;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
+
+import com.android.bedstead.harrier.UserType;
+import com.android.bedstead.harrier.annotations.meta.RequiresBedsteadJUnit4;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * A test which runs on multiple users.
+ */
+// TODO(b/217858437): Enable indirect usage
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@RequiresBedsteadJUnit4
+public @interface UserTest {
+    UserType[] value();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default PRECEDENCE_NOT_IMPORTANT;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/CanSetPolicyTest.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/CanSetPolicyTest.java
new file mode 100644
index 0000000..87c539d
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/CanSetPolicyTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.meta.RequiresBedsteadJUnit4;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark a test as testing the states where a policy is allowed to be applied.
+ *
+ * <p>This will generate parameterized runs for all matching states. Tests will only be run on
+ * the same user as the DPC. If you wish to test that a policy applies across all relevant states,
+ * use {@link PolicyAppliesTest}.
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@RequiresBedsteadJUnit4
+public @interface CanSetPolicyTest {
+    /**
+     * The policy being tested.
+     *
+     * <p>This is used to calculate which states are required to be tested.
+     */
+    Class<?> policy();
+
+    /**
+     * If true, this test will only be run in a single state.
+     *
+     * <p>This is useful for tests of invalid inputs, where running in multiple states is unlikely
+     * to add meaningful coverage.
+     *
+     * By default, all states where the policy can be set will be included.
+     */
+    boolean singleTestOnly() default false;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default PRECEDENCE_NOT_IMPORTANT;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/CannotSetPolicyTest.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/CannotSetPolicyTest.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/CannotSetPolicyTest.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/CannotSetPolicyTest.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDelegate.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDelegate.java
new file mode 100644
index 0000000..89b4c8f
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDelegate.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test requires that the given admin delegates the given scope to a test app.
+ *
+ * <p>You should use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method. You can use {@code Devicestate#delegate()} to interact with
+ * the delegate.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnsureHasDelegate {
+
+    int ENSURE_HAS_DELEGATE_WEIGHT = DO_PO_WEIGHT + 1; // Should run after setting DO/PO
+
+    enum AdminType {
+        DEVICE_OWNER,
+        PROFILE_OWNER,
+        PRIMARY
+    }
+
+    /**
+     * The admin that should delegate this scope.
+     *
+     * <p>If this is set to {@link AdminType#PRIMARY} and {@link #isPrimary()} is true, then the
+     * delegate will replace the primary dpc as primary without error.
+     */
+    AdminType admin();
+
+    /** The scope being delegated. */
+    String[] scopes();
+
+    /**
+     * Whether this delegate should be returned by calls to {@code Devicestate#policyManager()}.
+     *
+     * <p>Only one policy manager per test should be marked as primary.
+     */
+    boolean isPrimary() default false;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default ENSURE_HAS_DELEGATE_WEIGHT;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDeviceOwner.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDeviceOwner.java
new file mode 100644
index 0000000..2626900c
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDeviceOwner.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
+import static com.android.bedstead.nene.packages.CommonPackages.FEATURE_DEVICE_ADMIN;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.FailureMode;
+import com.android.bedstead.harrier.annotations.RequireFeature;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test requires that a device owner is available on the device.
+ *
+ * <p>Your test configuration may be configured so that this test is only run on a device which has
+ * a device owner. Otherwise, you can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method. If using {@code Devicestate}, you can use
+ * {@code Devicestate#deviceOwner()} to interact with the device owner.
+ *
+ * <p>When running on a device with a headless system user, enforcing this with {@code Devicestate}
+ * will also result in the profile owner of the current user being set to the same device policy
+ * controller.
+ *
+ * <p>If {@code Devicestate} is required to set the device owner (because there isn't one already)
+ * then all users and accounts may be removed from the device.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RequireFeature(FEATURE_DEVICE_ADMIN)
+public @interface EnsureHasDeviceOwner {
+
+    int DO_PO_WEIGHT = MIDDLE;
+
+     /** Behaviour if the device owner cannot be set. */
+    FailureMode failureMode() default FailureMode.FAIL;
+
+    /**
+     * Whether this DPC should be returned by calls to {@code Devicestate#dpc()} or
+     * {@code Devicestate#policyManager()}}.
+     *
+     * <p>Only one policy manager per test should be marked as primary.
+     */
+    boolean isPrimary() default false;
+
+    /**
+     * Affiliation ids to be set for the device owner.
+     */
+    String[] affiliationIds() default {};
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default DO_PO_WEIGHT;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDelegate.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDelegate.java
new file mode 100644
index 0000000..224d89a
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDelegate.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDelegate.ENSURE_HAS_DELEGATE_WEIGHT;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test requires that the given admin does not delegate the given scope to a test app.
+ *
+ * <p>You should use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnsureHasNoDelegate {
+
+    enum AdminType {
+        DEVICE_OWNER,
+        PROFILE_OWNER,
+        PRIMARY,
+        ANY
+    }
+
+
+    /**
+     * The admin that should not delegate this scope.
+     *
+     * <p>Defaults to any admin
+     *
+     * <p>If this is set to {@link AdminType#PRIMARY} and {@link #isPrimary()} is true, then the
+     * delegate will replace the primary dpc as primary without error.
+     */
+    AdminType admin() default AdminType.ANY;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default ENSURE_HAS_DELEGATE_WEIGHT + 1; // Should run after setting delegate
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDeviceOwner.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDeviceOwner.java
new file mode 100644
index 0000000..d7f1598
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDeviceOwner.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test requires that there is no device owner on the device.
+ *
+ * <p>Your test configuration may be configured so that this test is only run on a device which has
+ * no device owner. Otherwise, you can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnsureHasNoDeviceOwner {
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default DO_PO_WEIGHT;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDpc.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDpc.java
new file mode 100644
index 0000000..c222c75
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDpc.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.EnsureHasNoWorkProfile;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test requires that there is no dpc on the device.
+ *
+ * <p>This checks that there is no device owner, the current user has no work profiles, and the
+ * current user has no profile owner.
+ *
+ * <p>Your test configuration may be configured so that this test is only run on a device which has
+ * no dpc. Otherwise, you can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@EnsureHasNoDeviceOwner
+@EnsureHasNoWorkProfile
+@EnsureHasNoProfileOwner
+public @interface EnsureHasNoDpc {
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default DO_PO_WEIGHT;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoProfileOwner.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoProfileOwner.java
new file mode 100644
index 0000000..eed2788
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoProfileOwner.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
+
+import static com.android.bedstead.harrier.UserType.INSTRUMENTED_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
+
+import com.android.bedstead.harrier.UserType;
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test requires that there is no profile owner on the given user.
+ *
+ * <p>You can use {@code Devicestate} to ensure that the device enters the correct state for the
+ * method.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnsureHasNoProfileOwner {
+    /** Which user type the profile owner should not be attached to. */
+    UserType onUser() default INSTRUMENTED_USER;
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default DO_PO_WEIGHT;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasProfileOwner.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasProfileOwner.java
new file mode 100644
index 0000000..4f3144e
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasProfileOwner.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
+
+import static com.android.bedstead.harrier.UserType.INSTRUMENTED_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
+import static com.android.bedstead.nene.packages.CommonPackages.FEATURE_DEVICE_ADMIN;
+
+import com.android.bedstead.harrier.UserType;
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.RequireFeature;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark that a test requires that a profile owner is set.
+ *
+ * <p>You can use {@code Devicestate} to ensure that the device enters
+ * the correct state for the method. If using {@code Devicestate}, you can use
+ * {@code Devicestate#profileOwner()} to interact with the profile owner.
+ */
+@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@RequireFeature(FEATURE_DEVICE_ADMIN)
+public @interface EnsureHasProfileOwner {
+    /** Which user type the work profile should be attached to. */
+    UserType onUser() default INSTRUMENTED_USER;
+
+    /**
+     * Whether this DPC should be returned by calls to {@code Devicestate#dpc()} or
+     * {@code Devicestate#policyManager()}}.
+     *
+     * <p>Only one policy manager per test should be marked as primary.
+     */
+    boolean isPrimary() default false;
+
+    /**
+     * If true, uses the {@code DevicePolicyManager#getParentProfileInstance(ComponentName)}
+     * instance of the dpc when calling to .dpc()
+     *
+     * <p>Only used if {@link #isPrimary()} is true.
+     */
+    boolean useParentInstance() default false;
+
+    /**
+     * Affiliation ids to be set for the profile owner.
+     */
+    String[] affiliationIds() default {};
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default DO_PO_WEIGHT;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnterprisePolicy.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnterprisePolicy.java
new file mode 100644
index 0000000..21e2e138
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnterprisePolicy.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Used to annotate an enterprise policy for use with {@link PolicyDoesNotApplyTest} and
+ * {@link PolicyAppliesTest}.
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface EnterprisePolicy {
+
+    /**
+     * An enterprise policy which can be controlled using permissions.
+     */
+    @interface Permission {
+        /** The permission required to exercise the policy. */
+        String appliedWith();
+        /** Flags indicating who the policy applies to when applied in this way. */
+        int appliesTo();
+        /** Additional modifiers. */
+        int modifiers() default NO;
+    }
+
+    /**
+     * An enterprise policy which can be controlled user app ops.
+     */
+    @interface AppOp {
+        /** The AppOp required to exercise the policy. */
+        String appliedWith();
+        /** Flags indicating who the policy applies to when applied in this way. */
+        int appliesTo();
+        /** Additional modifiers. */
+        int modifiers() default NO;
+    }
+
+    /** A policy that cannot be applied. */
+    int NO = 0;
+
+    /** A policy which applies to the user of the package which applied the policy. */
+    int APPLIES_TO_OWN_USER = 1;
+    /** A policy which applies to unaffiliated other users. */
+    int APPLIES_TO_UNAFFILIATED_OTHER_USERS = 1 << 1;
+    /** A policy which applies to affiliated other users. */
+    int APPLIES_TO_AFFILIATED_OTHER_USERS = 1 << 2;
+    /** A policy which applies to unaffiliated profiles of the user of the package which applied the policy. */
+    int APPLIES_TO_UNAFFILIATED_CHILD_PROFILES = 1 << 3;
+    /** A policy which applies to affiliated profiles of the user of the package which applied the policy. */
+    int APPLIES_TO_AFFILIATED_CHILD_PROFILES = 1 << 4;
+    /** A policy that applies to the parent of the profile of the package which applied the policy. */
+    int APPLIES_TO_PARENT = 1 << 5;
+
+    /** A policy that applies to affiliated or unaffiliate profiles of the package which applied the policy. */
+    int APPLIES_TO_CHILD_PROFILES =
+            APPLIES_TO_UNAFFILIATED_CHILD_PROFILES | APPLIES_TO_AFFILIATED_CHILD_PROFILES;
+    /** A policy that applies to affiliated or unaffiliated other users. */
+    int APPLIES_TO_OTHER_USERS =
+            APPLIES_TO_UNAFFILIATED_OTHER_USERS | APPLIES_TO_AFFILIATED_OTHER_USERS;
+
+    /** A policy that applies to all users on the device. */
+    int APPLIES_GLOBALLY = APPLIES_TO_OWN_USER | APPLIES_TO_OTHER_USERS | APPLIES_TO_CHILD_PROFILES;
+
+
+    // Applied by
+
+    /** A policy that can be applied by a device owner. */
+    int APPLIED_BY_DEVICE_OWNER = 1 << 6;
+    /** A policy that can be applied by a profile owner of an unaffiliated profile. */
+    int APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE = 1 << 7;
+    /** A policy that can be applied by a profile owner of an affiliated profile */
+    int APPLIED_BY_AFFILIATED_PROFILE_OWNER_PROFILE = 1 << 8;
+    /** A policy that can be applied by a profile owner of a cope profile */
+    int APPLIED_BY_COPE_PROFILE_OWNER = 1 << 9;
+
+    /** A policy that can be applied by a profile owner of an affiliated or unaffiliated profile.
+     * This does not include cope profiles. */
+    int APPLIED_BY_PROFILE_OWNER_PROFILE =
+            APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE
+                    | APPLIED_BY_AFFILIATED_PROFILE_OWNER_PROFILE;
+    /**
+     * A policy that can be applied by a Profile Owner for a User (not Profile) with no Device
+     * Owner.
+     */
+    int APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO = 1 << 10;
+    /**
+     * A policy that can be applied by an unaffiliated Profile Owner for a User (not Profile) with
+     * a Device Owner.
+     */
+    int APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER_WITH_DO = 1 << 11;
+    /** A policy that can be applied by a profile owner of an unaffiliated user. */
+    int APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER =
+            APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO
+                    | APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER_WITH_DO;
+    /** A policy that can be applied by a profile owner of an affiliated user. */
+    int APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER = 1 << 12;
+    /** A policy that can be applied by an affiliated or unaffiliated profile owner on a User (not Profile). */
+    int APPLIED_BY_PROFILE_OWNER_USER =
+            APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER | APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER;
+    /** A policy that can be applied by an affiliated profile owner on a user or profile. */
+    int APPLIED_BY_AFFILIATED_PROFILE_OWNER = APPLIED_BY_AFFILIATED_PROFILE_OWNER_PROFILE | APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER;
+    /** A policy that can be applied by a profile owner, affiliate or unaffiliated, running on a user or profile. */
+    int APPLIED_BY_PROFILE_OWNER =
+            APPLIED_BY_PROFILE_OWNER_PROFILE
+            | APPLIED_BY_PROFILE_OWNER_USER;
+
+    int APPLIED_BY_PARENT_INSTANCE_OF_NON_COPE_PROFILE_OWNER_PROFILE = 1 << 13;
+    int APPLIED_BY_PARENT_INSTANCE_OF_COPE_PROFILE_OWNER_PROFILE = 1 << 14;
+
+    int APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER_PROFILE =
+            APPLIED_BY_PARENT_INSTANCE_OF_NON_COPE_PROFILE_OWNER_PROFILE | APPLIED_BY_PARENT_INSTANCE_OF_COPE_PROFILE_OWNER_PROFILE;
+
+    int APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER_USER = 1 << 15;
+
+    int APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER =
+            APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER_USER
+                    | APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER_PROFILE;
+
+    // Modifiers
+    /** Internal use only. Do not use */
+    // This is to be used to mark specific annotations as not generating PolicyDoesNotApply tests
+    int DO_NOT_APPLY_TO_POLICY_DOES_NOT_APPLY_TESTS = 1 << 16;
+
+    /**
+     * A policy which applies even when the user is not in the foreground.
+     *
+     * <p>Note that lacking this flag does not mean a policy does not apply - to indicate that use
+     * {@link DOES_NOT_APPLY_IN_BACKGROUND}. */
+    int APPLIES_IN_BACKGROUND = 1 << 17 | (DO_NOT_APPLY_TO_POLICY_DOES_NOT_APPLY_TESTS);
+    /**
+     * A policy which does not apply when the user is not in the foreground.
+     *
+     * <p>At present this does not generate any additional tests but may do in future.
+     *
+     * <p>Note that lacking this flag does not mean a policy does apply - to indicate that use
+     * {@link APPLIES_IN_BACKGROUND}. */
+    int DOES_NOT_APPLY_IN_BACKGROUND = 1 << 18;
+
+
+    /**
+     * A policy which can be applied by a delegate.
+     *
+     * See {@link #delegatedScopes()} for the scopes which enable this.
+     */
+    int CAN_BE_DELEGATED = 1 << 19;
+
+    /** Flags indicating DPC states which can set the policy. */
+    int[] dpc() default {};
+
+    /**
+     * {@link Permission} indicating which permissions can control the policy.
+     *
+     * <p>Note that this currently does not generate any additional tests but may do in future.
+     */
+    Permission[] permissions() default {};
+
+    /**
+     * {@link AppOp} indicating which AppOps can control the policy.
+     *
+     * <p>Note that this currently does not generate any additional tests but may do in future.
+     */
+    AppOp[] appOps() default {};
+
+    /**
+     * Which delegated scopes can control the policy.
+     *
+     * <p>This applies to {@link #dpc()} entries with the {@link #CAN_BE_DELEGATED} flag.
+     */
+    String[] delegatedScopes() default {};
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/PolicyAppliesTest.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/PolicyAppliesTest.java
new file mode 100644
index 0000000..fff4e1e
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/PolicyAppliesTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.meta.RequiresBedsteadJUnit4;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark a test as testing the states where a policy is applied (by a Device Owner or Profile Owner)
+ * and it should apply to the user the test is running on.
+ *
+ * <p>This will generated parameterized runs for all matching states.
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@RequiresBedsteadJUnit4
+public @interface PolicyAppliesTest {
+    /**
+     * The policy being tested.
+     *
+     * <p>This is used to calculate which states are required to be tested.
+     */
+    Class<?> policy();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default PRECEDENCE_NOT_IMPORTANT;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/PolicyDoesNotApplyTest.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/PolicyDoesNotApplyTest.java
new file mode 100644
index 0000000..718ec7f
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/enterprise/PolicyDoesNotApplyTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.meta.RequiresBedsteadJUnit4;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark a test as testing the states where a policy is applied (by a Device Owner or Profile Owner)
+ * and it should not apply to the user the test is running on.
+ *
+ * <p>This will generate parameterized runs for all matching states.
+ */
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+@RequiresBedsteadJUnit4
+public @interface PolicyDoesNotApplyTest {
+    /**
+     * The policy being tested.
+     *
+     * <p>This is used to calculate which states are required to be tested.
+     */
+    Class<?> policy();
+
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default PRECEDENCE_NOT_IMPORTANT;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoProfile.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoProfile.java
new file mode 100644
index 0000000..05a8fda
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoProfile.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.meta;
+
+import static com.android.bedstead.harrier.UserType.INSTRUMENTED_USER;
+
+import com.android.bedstead.harrier.UserType;
+
+import java.lang.annotation.Target;
+
+/**
+ * This annotation should not be used directly. It exists as a template for annotations which
+ * ensure that a given user does not have a specific profile type.
+ */
+@Target({})
+public @interface EnsureHasNoProfile {
+    UserType forUser() default INSTRUMENTED_USER;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoProfileAnnotation.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoProfileAnnotation.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoProfileAnnotation.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoProfileAnnotation.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoUser.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoUser.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoUser.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoUserAnnotation.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoUserAnnotation.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoUserAnnotation.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoUserAnnotation.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasProfile.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasProfile.java
new file mode 100644
index 0000000..48f7688
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasProfile.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.meta;
+
+import static com.android.bedstead.harrier.OptionalBoolean.ANY;
+import static com.android.bedstead.harrier.UserType.INSTRUMENTED_USER;
+
+import com.android.bedstead.harrier.OptionalBoolean;
+import com.android.bedstead.harrier.UserType;
+
+import java.lang.annotation.Target;
+
+/**
+ * This annotation should not be used directly. It exists as a template for annotations which
+ * ensure that a given user has a specific profile type.
+ */
+@Target({})
+public @interface EnsureHasProfile {
+    /** Which user type the profile should be attached to. */
+    UserType forUser() default INSTRUMENTED_USER;
+
+    /** Whether the test app should be installed in the profile. */
+    boolean installTestApp() default true;
+
+    /**
+     * Whether the profile owner's DPC should be returned by calls to {@code Devicestate#dpc()}.
+     *
+     * <p>Only one device policy controller per test should be marked as primary.
+     */
+    // NOTE: This field is only required if hasProfileOwner=true
+    boolean dpcIsPrimary() default false;
+
+    /**
+     * Should we ensure that we are switched to the parent of the profile.
+     */
+    OptionalBoolean switchedToParentUser() default ANY;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasProfileAnnotation.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasProfileAnnotation.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasProfileAnnotation.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasProfileAnnotation.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasUser.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasUser.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasUser.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasUserAnnotation.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasUserAnnotation.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasUserAnnotation.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasUserAnnotation.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/ParameterizedAnnotation.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/ParameterizedAnnotation.java
new file mode 100644
index 0000000..14e0784
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/ParameterizedAnnotation.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.meta;
+
+import java.lang.annotation.Annotation;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Mark a Harrier annotation as being Parameterized.
+ *
+ * <p>There will be a separate run generated for the annotated method for each
+ * {@link ParameterizedAnnotation} annotation. The test will be named methodName[paramName].
+ *
+ * <p>If any {@link ParameterizedAnnotation} annotations are applied to a test, then the basic
+ * un-parameterized test will not be run.
+ */
+@Target(ElementType.ANNOTATION_TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@RequiresBedsteadJUnit4
+public @interface ParameterizedAnnotation {
+
+    /**
+     * Other parameterized annotations which are less powerful versions of this one.
+     *
+     * <p>For example, if this annotation represents a permission, and there is another annotation
+     * representing a permission which allows a subset of this one, then this annotation may shadow
+     * that one.
+     *
+     * <p>This will mean that these annotations will never be used together - one will be removed
+     * depending on whether the test requires the most powerful or least powerful state.
+     *
+     * <p>This should not be used if you want to explicitly test the state represented by each
+     * annotation.
+     */
+    Class<? extends Annotation>[] shadows() default {};
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RepeatingAnnotation.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RepeatingAnnotation.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RepeatingAnnotation.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RepeatingAnnotation.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnProfile.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnProfile.java
new file mode 100644
index 0000000..ce10411
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnProfile.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.meta;
+
+import static com.android.bedstead.harrier.OptionalBoolean.ANY;
+import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
+
+import com.android.bedstead.harrier.OptionalBoolean;
+
+import java.lang.annotation.Target;
+
+/**
+ * This annotation should not be used directly. It exists as a template for annotations which
+ * ensure that a test runs on a given profile type.
+ */
+@Target({})
+public @interface RequireRunOnProfile {
+    OptionalBoolean installInstrumentedAppInParent() default ANY;
+
+    /**
+     * Whether the profile owner's DPC should be returned by calls to {@code Devicestate#dpc()}.
+     *
+     * <p>Only one device policy controller per test should be marked as primary.
+     */
+    // NOTE: This field is only required if hasProfileOwner=true
+    boolean dpcIsPrimary() default false;
+
+    /**
+     * Affiliation ids to be set for the profile owner.
+     */
+    // NOTE: This field is only required if hasProfileOwner=true
+    String[] affiliationIds() default {};
+
+    /**
+     * Should we ensure that we are switched to the parent of the profile.
+     */
+    OptionalBoolean switchedToParentUser() default TRUE;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnProfileAnnotation.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnProfileAnnotation.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnProfileAnnotation.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnProfileAnnotation.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnUser.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnUser.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnUser.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnUserAnnotation.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnUserAnnotation.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnUserAnnotation.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnUserAnnotation.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RequiresBedsteadJUnit4.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RequiresBedsteadJUnit4.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RequiresBedsteadJUnit4.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/meta/RequiresBedsteadJUnit4.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeNone.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeNone.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeNone.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeNone.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnAffiliatedDeviceOwnerSecondaryUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnAffiliatedDeviceOwnerSecondaryUser.java
new file mode 100644
index 0000000..71ad1e5
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnAffiliatedDeviceOwnerSecondaryUser.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasProfileOwner;
+import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Parameterize a test so that it runs on a affiliated secondary user on a device with a
+ * Device Owner.
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@ParameterizedAnnotation(shadows = IncludeRunOnUnaffiliatedDeviceOwnerSecondaryUser.class)
+@RequireRunOnSecondaryUser
+@EnsureHasDeviceOwner(isPrimary = true, affiliationIds = "affiliated")
+@EnsureHasProfileOwner(affiliationIds = "affiliated")
+public @interface IncludeRunOnAffiliatedDeviceOwnerSecondaryUser {
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default LATE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnAffiliatedProfileOwnerSecondaryUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnAffiliatedProfileOwnerSecondaryUser.java
new file mode 100644
index 0000000..acc620a
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnAffiliatedProfileOwnerSecondaryUser.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasProfileOwner;
+import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Parameterize a test so that it runs on a affiliated secondary user on a device with a
+ * Device Owner - with the profile owner set as primary.
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@ParameterizedAnnotation(shadows = IncludeRunOnUnaffiliatedProfileOwnerSecondaryUser.class)
+@RequireRunOnSecondaryUser
+@EnsureHasDeviceOwner(affiliationIds = "affiliated")
+@EnsureHasProfileOwner(affiliationIds = "affiliated", isPrimary = true)
+public @interface IncludeRunOnAffiliatedProfileOwnerSecondaryUser {
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default LATE;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnBackgroundDeviceOwnerUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnBackgroundDeviceOwnerUser.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnBackgroundDeviceOwnerUser.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnBackgroundDeviceOwnerUser.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnDeviceOwnerUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnDeviceOwnerUser.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnDeviceOwnerUser.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnDeviceOwnerUser.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfCorporateOwnedProfileOwner.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfCorporateOwnedProfileOwner.java
new file mode 100644
index 0000000..548c99b
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfCorporateOwnedProfileOwner.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
+import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Parameterize a test so that it runs on the parent of a corporate-owned profile owner.
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@ParameterizedAnnotation(shadows = IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner.class)
+@RequireRunOnPrimaryUser
+// TODO(scottjonathan): Add annotation to create corporate-owned profile
+public @interface IncludeRunOnParentOfCorporateOwnedProfileOwner {
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default LATE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfProfileOwnerUsingParentInstance.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfProfileOwnerUsingParentInstance.java
new file mode 100644
index 0000000..d70b32a
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfProfileOwnerUsingParentInstance.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile;
+import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDeviceOwner;
+import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Parameterize a test so that it runs on the parent of a profile owner and .dpc() relates to the
+ * parent instance of the dpc in the profile.
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@ParameterizedAnnotation
+@RequireRunOnPrimaryUser
+@EnsureHasNoDeviceOwner
+@EnsureHasWorkProfile(dpcIsPrimary = true, useParentInstanceOfDpc = true)
+public @interface IncludeRunOnParentOfProfileOwnerUsingParentInstance {
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default LATE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner.java
new file mode 100644
index 0000000..34a9d2a
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile;
+import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDeviceOwner;
+import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Parameterize a test so that it runs on the parent of a profile owner.
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@ParameterizedAnnotation(shadows = IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile.class)
+@RequireRunOnPrimaryUser
+@EnsureHasNoDeviceOwner
+@EnsureHasWorkProfile(dpcIsPrimary = true)
+public @interface IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner {
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default LATE;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnPrimaryUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnPrimaryUser.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnPrimaryUser.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnPrimaryUser.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnProfileOwnerPrimaryUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnProfileOwnerPrimaryUser.java
new file mode 100644
index 0000000..96c73abb
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnProfileOwnerPrimaryUser.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDeviceOwner;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasProfileOwner;
+import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Parameterize a test so that it runs on the primary user
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@ParameterizedAnnotation
+// Explicitly primary user which excludes headless users as this isn't a valid mode on headless
+@RequireRunOnPrimaryUser
+@EnsureHasNoDeviceOwner
+@EnsureHasProfileOwner(isPrimary = true)
+public @interface IncludeRunOnProfileOwnerPrimaryUser {
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default LATE;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnProfileOwnerProfileWithNoDeviceOwner.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnProfileOwnerProfileWithNoDeviceOwner.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnProfileOwnerProfileWithNoDeviceOwner.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnProfileOwnerProfileWithNoDeviceOwner.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnSecondaryUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnSecondaryUser.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnSecondaryUser.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnSecondaryUser.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile.java
new file mode 100644
index 0000000..a243839
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
+
+import com.android.bedstead.harrier.UserType;
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile;
+import com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser;
+import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Parameterize a test so that it runs on a device which has a primary and work profile, but runs
+ * the test on a secondary user which is in a different profile group.
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@ParameterizedAnnotation
+@RequireRunOnSecondaryUser
+@EnsureHasWorkProfile(forUser = UserType.PRIMARY_USER, dpcIsPrimary = true)
+public @interface IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile {
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default LATE;
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnUnaffiliatedDeviceOwnerSecondaryUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnUnaffiliatedDeviceOwnerSecondaryUser.java
new file mode 100644
index 0000000..bb96ce1
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnUnaffiliatedDeviceOwnerSecondaryUser.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
+
+import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
+
+import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
+import com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
+import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Parameterize a test so that it runs on a non-affiliated secondary user on a device with a
+ * Device Owner.
+ */
+@Target({ElementType.METHOD, ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+@ParameterizedAnnotation
+@RequireRunOnSecondaryUser
+@EnsureHasDeviceOwner(isPrimary = true, affiliationIds = {})
+public @interface IncludeRunOnUnaffiliatedDeviceOwnerSecondaryUser {
+    /**
+     * Weight sets the order that annotations will be resolved.
+     *
+     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
+     *
+     * <p>If there is an order requirement between annotations, ensure that the weight of the
+     * annotation which must be resolved first is lower than the one which must be resolved later.
+     *
+     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
+     */
+    int weight() default LATE;
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnUnaffiliatedProfileOwnerSecondaryUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnUnaffiliatedProfileOwnerSecondaryUser.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnUnaffiliatedProfileOwnerSecondaryUser.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnUnaffiliatedProfileOwnerSecondaryUser.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/AccountManagement.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/AccountManagement.java
new file mode 100644
index 0000000..833fdc9
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/AccountManagement.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for account management tests.
+ *
+ * <p>This is used by {@code
+ * DevicePolicyManager#setAccountManagementDisabled(ComponentName, String, boolean)} and
+ * {@code DevicePolicyManager#getAccountTypesWithManagementDisabled()}.
+ */
+@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER)
+public final class AccountManagement {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/ApplicationRestrictions.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/ApplicationRestrictions.java
new file mode 100644
index 0000000..19b7f78
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/ApplicationRestrictions.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_IN_BACKGROUND;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_APP_RESTRICTIONS;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for application restrictions.
+ *
+ * <p>This is used by methods such as
+ * {@code DevicePolicyManager#setApplicationRestrictions(ComponentName, String, Bundle)} and
+ * {@code DevicePolicyManager#getApplicationRestrictions(ComponentName, String)}.
+ */
+@EnterprisePolicy(
+        dpc = {
+            APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | APPLIES_IN_BACKGROUND | CAN_BE_DELEGATED,
+            APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED},
+        delegatedScopes = DELEGATION_APP_RESTRICTIONS
+        )
+public final class ApplicationRestrictions {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/ApplicationRestrictionsManagingPackage.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/ApplicationRestrictionsManagingPackage.java
new file mode 100644
index 0000000..b41ac24
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/ApplicationRestrictionsManagingPackage.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_IN_BACKGROUND;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for application restrictions.
+ *
+ * <p>This is used by the method
+ * {@code DevicePolicyManager#setApplicationRestrictionsManagingPackage(ComponentName, String, Bundle)}
+ */
+@EnterprisePolicy(
+        dpc = {
+                APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | APPLIES_IN_BACKGROUND,
+                APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER})
+public final class ApplicationRestrictionsManagingPackage {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/AutoTimeRequired.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/AutoTimeRequired.java
new file mode 100644
index 0000000..2362e0c
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/AutoTimeRequired.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_GLOBALLY;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for Auto Time Required.
+ *
+ * <p>This is used by the method
+ * {@code DevicePolicyManager#setAutoTimeRequired(ComponentName, boolean)}
+ */
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_GLOBALLY})
+public final class AutoTimeRequired {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/Backup.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/Backup.java
new file mode 100644
index 0000000..914736c
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/Backup.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_PROFILE;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for backup.
+ *
+ * <p>This is used by the method
+ * {@code DevicePolicyManager#setBackupServiceEnabled(ComponentName, boolean)}
+ */
+@EnterprisePolicy(
+        dpc = {
+                APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER_PROFILE
+                        | APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO | APPLIES_TO_OWN_USER})
+public final class Backup {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/BlockUninstall.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/BlockUninstall.java
new file mode 100644
index 0000000..a74583e
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/BlockUninstall.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_BLOCK_UNINSTALL;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for setting uninstall blocked.
+ *
+ * <p>This is used by methods such as
+ * {@code DevicePolicyManager#setUninstallBlocked(ComponentName, String, boolean)} and
+ * {@code DevicePolicyManager#isUninstallBlocked(ComponentName)}.
+ */
+@EnterprisePolicy(
+        dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER
+                | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED,
+        delegatedScopes = DELEGATION_BLOCK_UNINSTALL
+)
+public final class BlockUninstall {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/Bluetooth.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/Bluetooth.java
new file mode 100644
index 0000000..ef154fd
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/Bluetooth.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policies around enabling/disabling bluetooth
+ *
+ * <p>This is used by methods such as
+ * {@code BluetoothAdapter#enable() and
+ * {@code BluetoothAdapter#disable()}.
+ */
+// TODO(b/220306133): Behaviour is unpredictable when applying to other users
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER})
+public final class Bluetooth {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/CaCertManagement.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/CaCertManagement.java
new file mode 100644
index 0000000..9ee26ea
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/CaCertManagement.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_CERT_INSTALL;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policies around installing/uninstalling CaCerts
+ *
+ * <p>This is used by methods such as
+ * {@code DevicePolicyManager#installCaCert(ComponentName, byte[])} and
+ * {@code DevicePolicyManager#uninstallCaCert(ComponentName, byte[])}.
+ */
+@EnterprisePolicy(
+        dpc = {
+                APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER
+                        | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED},
+        delegatedScopes = DELEGATION_CERT_INSTALL)
+public final class CaCertManagement {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/CameraPolicy.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/CameraPolicy.java
new file mode 100644
index 0000000..5e2eeff
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/CameraPolicy.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_PROFILE;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_GLOBALLY;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for application restrictions.
+ *
+ * <p>This is used by methods such as
+ * {@code DevicePolicyManager#setCameraDisabled(ComponentName, boolean)} and
+ * {@code DevicePolicyManager#getCameraDisabled(ComponentName)}.
+ */
+// TODO(b/201753989):  Update the profileOwner flag once the behaviour of setCameraDisabled
+//  is properly defined on secondary user POs.
+@EnterprisePolicy(dpc = {
+        APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO | APPLIES_GLOBALLY,
+        APPLIED_BY_PROFILE_OWNER_PROFILE | APPLIES_TO_OWN_USER
+})
+public class CameraPolicy {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/CreateAndManageUser.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/CreateAndManageUser.java
new file mode 100644
index 0000000..098a20d
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/CreateAndManageUser.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for create and manage user.
+ *
+ * <p>This is used by methods such as {@code DevicePolicyManager#createAndManageUser(
+ * ComponentName, String, ComponentName, PersistableBundle, int)}.
+ */
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER})
+public final class CreateAndManageUser {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/DefaultSmsApplication.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/DefaultSmsApplication.java
new file mode 100644
index 0000000..2f1494f
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/DefaultSmsApplication.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for set default SMS application test.
+ *
+ * <p>This is used by {@code DevicePolicyManager#setDefaultSmsApplication(ComponentName, String)}.
+ */
+@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER)
+public final class DefaultSmsApplication {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/Delegation.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/Delegation.java
new file mode 100644
index 0000000..4512f48
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/Delegation.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for general admin delegation that doesn't have additional scope-specific constraints on
+ * the admin type. Specific delegations with these constraints have their own policies.
+ *
+ * <p>This is used for methods such as {@code
+ * DevicePolicyManager#setDelegatedScopes(ComponentName, String, List)}.
+ */
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER})
+public final class Delegation {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/DeprecatedResetPassword.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/DeprecatedResetPassword.java
new file mode 100644
index 0000000..a3fc08a
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/DeprecatedResetPassword.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for {@code DevicePolicyManager#resetPassword(String, int)}.
+ */
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER})
+public final class DeprecatedResetPassword {
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/DisallowNetworkReset.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/DisallowNetworkReset.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/DisallowNetworkReset.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/DisallowNetworkReset.java
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/DisallowPrivateDnsConfig.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/DisallowPrivateDnsConfig.java
similarity index 100%
rename from common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/DisallowPrivateDnsConfig.java
rename to common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/DisallowPrivateDnsConfig.java
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/EnableSystemApp.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/EnableSystemApp.java
new file mode 100644
index 0000000..3d0943c
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/EnableSystemApp.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_ENABLE_SYSTEM_APP;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for enabling system apps.
+ *
+ * <p>See {@code DevicePolicyManager#enableSystemApp(ComponentName, String)} for more
+ * detail.
+ */
+@EnterprisePolicy(dpc = {
+        APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER
+                | APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED},
+        delegatedScopes = DELEGATION_ENABLE_SYSTEM_APP)
+public final class EnableSystemApp {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/EnrollmentSpecificId.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/EnrollmentSpecificId.java
new file mode 100644
index 0000000..c054f49
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/EnrollmentSpecificId.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for testing enrollment specific ID.
+ * See {@code DevicePolicyManager#getEnrollmentSpecificId()} for more detail.
+ */
+@EnterprisePolicy(dpc = {
+        APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER,
+        APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER
+})
+public final class EnrollmentSpecificId {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/HideApplication.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/HideApplication.java
new file mode 100644
index 0000000..5abed15
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/HideApplication.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_PACKAGE_ACCESS;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for hiding applications.
+ * See {@code DevicePolicyManager#setApplicationHidden(ComponentName, String, boolean)} for more
+ * detail.
+ */
+@EnterprisePolicy(dpc = {
+        APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER
+                | APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED},
+        delegatedScopes = DELEGATION_PACKAGE_ACCESS)
+public final class HideApplication {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/KeyManagement.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/KeyManagement.java
new file mode 100644
index 0000000..67227242
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/KeyManagement.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_CERT_INSTALL;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policies around key management
+ *
+ * <p>This is used by methods such as
+ * {@code DevicePolicyManager#installKeyPair(ComponentName, PrivateKey, Certificate, String)} and
+ * {@code DevicePolicyManager#removeKeyPair(ComponentName, String)}.
+ */
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER,
+        APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED},
+        delegatedScopes = DELEGATION_CERT_INSTALL)
+public final class KeyManagement {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/KeySelection.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/KeySelection.java
new file mode 100644
index 0000000..8024d8d
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/KeySelection.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_CERT_SELECTION;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policies around key selection
+ *
+ * <p>This is used by methods such as
+ * {@code DevicePolicyManager#getKeyPairGrants}
+ */
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER,
+        APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED},
+        delegatedScopes = DELEGATION_CERT_SELECTION)
+public final class KeySelection {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/LockNow.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/LockNow.java
new file mode 100644
index 0000000..823cf8e
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/LockNow.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.nene.permissions.CommonPermissions.LOCK_DEVICE;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for {@code DevicePolicyManager#lockNow()}.
+ */
+// This is not applied by profile owner as the behaviour is different with a unified challenge
+@EnterprisePolicy(dpc =
+        APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER | APPLIES_TO_OWN_USER,
+        permissions =
+        @EnterprisePolicy.Permission(appliedWith = LOCK_DEVICE, appliesTo = APPLIES_TO_OWN_USER))
+public final class LockNow {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/LockTask.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/LockTask.java
new file mode 100644
index 0000000..057824c
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/LockTask.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_AFFILIATED_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policies around Lock Task mode
+ * (https://developer.android.com/work/dpc/dedicated-devices/lock-task-mode).
+ *
+ * <p>This is used by methods such as
+ * {@code DevicePolicyManager#setLockTaskFeatures(ComponentName, int)} and
+ * {@code DevicePolicyManager#setLockTaskPackages(ComponentName, String[])}.
+ */
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER,
+                    APPLIED_BY_AFFILIATED_PROFILE_OWNER | APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO | APPLIES_TO_OWN_USER})
+public final class LockTask {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/LockscreenPolicyWithUnifiedChallenge.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/LockscreenPolicyWithUnifiedChallenge.java
new file mode 100644
index 0000000..7325df1
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/LockscreenPolicyWithUnifiedChallenge.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_PARENT;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Lockscreen policies, e.g. password quality, length, history length, attempts before wipe.
+ * Parent profile is affected only when work profile has unified challenge (i.e. no separate lock),
+ * which is why this policy has to be specific to this case.
+ *
+ * <p>This is used by methods such as
+ * {@code DevicePolicyManager#setPasswordQuality(ComponentName, int)}
+ */
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER,
+        APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER | APPLIES_TO_PARENT})
+public class LockscreenPolicyWithUnifiedChallenge {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/LostMode.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/LostMode.java
new file mode 100644
index 0000000..7ade805
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/LostMode.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_COPE_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policies around lost mode on organization-owned devices.
+ *
+ * <p>This is used by {@code DevicePolicyManager#sendLostModeLocationUpdate}.
+ */
+@EnterprisePolicy(dpc = {
+        APPLIED_BY_DEVICE_OWNER | APPLIED_BY_COPE_PROFILE_OWNER | APPLIES_TO_OWN_USER})
+public final class LostMode {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/NearbyAppStreamingPolicy.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/NearbyAppStreamingPolicy.java
new file mode 100644
index 0000000..8ba8f6c
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/NearbyAppStreamingPolicy.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for controlling nearby app streaming.
+ *
+ * <p>Users of this policy are
+ * {@link android.app.admin.DevicePolicyManager#setNearbyAppStreamingPolicy(int)}}.
+ */
+@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER)
+public class NearbyAppStreamingPolicy {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/NearbyNotificationStreamingPolicy.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/NearbyNotificationStreamingPolicy.java
new file mode 100644
index 0000000..af4b435
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/NearbyNotificationStreamingPolicy.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for controlling nearby app streaming.
+ *
+ * <p>Users of this policy are
+ * {@link android.app.admin.DevicePolicyManager#setNearbyNotificationStreamingPolicy(int)}.
+ */
+@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER)
+public class NearbyNotificationStreamingPolicy {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/NetworkLogging.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/NetworkLogging.java
new file mode 100644
index 0000000..986c4dd
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/NetworkLogging.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_PROFILE;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_NETWORK_LOGGING;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for retrieving network logs.
+ */
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER_PROFILE
+        | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED},
+        delegatedScopes = DELEGATION_NETWORK_LOGGING)
+public final class NetworkLogging {
+    // There's a special case where for DO if there is an unaffiliated
+    // user on the device a SecurityException will be thrown. For now we deal with this by
+    // not having any PolicyDoesNotApplyTest
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/NetworkLoggingDelegation.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/NetworkLoggingDelegation.java
new file mode 100644
index 0000000..8b5b2bd
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/NetworkLoggingDelegation.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_PROFILE;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for network logging delegation.
+ *
+ * <p>This is used for methods such as {@code
+ * DevicePolicyManager#setDelegatedScopes(ComponentName, String, List)} with scope {@code
+ * DevicePolicyManager#DELEGATION_NETWORK_LOGGING}.
+ */
+@EnterprisePolicy(dpc = {
+        APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER_PROFILE | APPLIES_TO_OWN_USER})
+public final class NetworkLoggingDelegation {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/PermittedAccessibilityServices.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/PermittedAccessibilityServices.java
new file mode 100644
index 0000000..98f0eb8
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/PermittedAccessibilityServices.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for setting permitted accessibility services.
+ *
+ * <p>See {@code DevicePolicyManager#setPermittedAccessibilityServices(ComponentName, List<String>)}
+ * for more detail.
+ */
+@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER)
+public class PermittedAccessibilityServices {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/PreferentialNetworkService.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/PreferentialNetworkService.java
new file mode 100644
index 0000000..707e1de
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/PreferentialNetworkService.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for testing preferential network service.
+ * See {@code DevicePolicyManager#setPreferentialNetworkServiceEnabled(boolean)} for more detail.
+ */
+@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER
+        | APPLIES_TO_OWN_USER)
+public final class PreferentialNetworkService {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/ResetPasswordWithToken.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/ResetPasswordWithToken.java
new file mode 100644
index 0000000..0d1a832
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/ResetPasswordWithToken.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policies around resetting a new device password
+ *
+ * <p>This is used by methods such as
+ * {@code DevicePolicyManager#resetPasswordWithToken(ComponentName, String, byte[], int)}
+ */
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER,
+        APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER})
+public class ResetPasswordWithToken {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/ScreenCaptureDisabled.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/ScreenCaptureDisabled.java
new file mode 100644
index 0000000..8cdb1b0
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/ScreenCaptureDisabled.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PARENT_INSTANCE_OF_COPE_PROFILE_OWNER_PROFILE;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for disabling screen capture.
+ *
+ * <p>Users of this policy are
+ * {@code DevicePolicyManager#setScreenCaptureDisabled(ComponentName, boolean)}.
+ */
+@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER
+        | APPLIED_BY_PARENT_INSTANCE_OF_COPE_PROFILE_OWNER_PROFILE | APPLIES_TO_OWN_USER)
+public final class ScreenCaptureDisabled {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SecurityLoggingDelegation.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SecurityLoggingDelegation.java
new file mode 100644
index 0000000..7dfcf6f
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SecurityLoggingDelegation.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for security logging delegation.
+ *
+ * <p>This is used for methods such as {@code
+ * DevicePolicyManager#setDelegatedScopes(ComponentName, String, List)} with scope {@code
+ * DevicePolicyManager#DELEGATION_SECURITY_LOGGING}.
+ */
+// TODO(b/198774281): COPE profile POs can call this too, but we need to add the flag.
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER})
+public final class SecurityLoggingDelegation {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetDeviceOwnerSecureSetting.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetDeviceOwnerSecureSetting.java
new file mode 100644
index 0000000..cabe1d4
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetDeviceOwnerSecureSetting.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for setting secure setting.
+ *
+ * <p>This is used by the method
+ * {@code DevicePolicyManager#setSecureSetting(ComponentName, String, String)} with settings only
+ * usable by device owner.
+ */
+@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER})
+public final class SetDeviceOwnerSecureSetting {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetGlobalSetting.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetGlobalSetting.java
new file mode 100644
index 0000000..73d165f
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetGlobalSetting.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_GLOBALLY;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for setting global setting.
+ *
+ * <p>This is used by the method
+ * {@code DevicePolicyManager#setGlobalSetting(ComponentName, String, String)}
+ */
+@EnterprisePolicy(
+        dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_GLOBALLY})
+public final class SetGlobalSetting {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetPermissionGrantState.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetPermissionGrantState.java
new file mode 100644
index 0000000..7fe01ac
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetPermissionGrantState.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_PERMISSION_GRANT;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policies around setting the grant state of a basic permission.
+ *
+ * <p>This is used by
+ * {@code DevicePolicyManager#setPermissionGrantState(ComponentName, String, String, int)} when
+ * granting permissions not covered by other policies.
+ */
+@EnterprisePolicy(
+        dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED,
+        delegatedScopes = DELEGATION_PERMISSION_GRANT)
+public final class SetPermissionGrantState {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetPermittedInputMethods.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetPermittedInputMethods.java
new file mode 100644
index 0000000..28d4695
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetPermittedInputMethods.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policies around setting permitted input methods
+ *
+ * <p>This is used by
+ * {@code DevicePolicyManager#setPermittedInputMethods(ComponentName, List<String>)}.
+ */
+@EnterprisePolicy(
+        dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER)
+public final class SetPermittedInputMethods {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetSecureSetting.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetSecureSetting.java
new file mode 100644
index 0000000..f9c4ac8
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetSecureSetting.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for setting secure setting.
+ *
+ * <p>This is used by the method
+ * {@code DevicePolicyManager#setSecureSetting(ComponentName, String, String)}
+ */
+@EnterprisePolicy(
+        dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER,
+               APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER})
+public final class SetSecureSetting {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetSensorPermissionGranted.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetSensorPermissionGranted.java
new file mode 100644
index 0000000..b69851e
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetSensorPermissionGranted.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policies around setting the grant state of a sensor permission.
+ *
+ * <p>This is used by
+ * {@code DevicePolicyManager#setPermissionGrantState(ComponentName, String, String, int)} when
+ * granting sensor permissions.
+ */
+@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER)
+public final class SetSensorPermissionGranted {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetSmsPermissionGranted.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetSmsPermissionGranted.java
new file mode 100644
index 0000000..b4d2a03
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SetSmsPermissionGranted.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_PERMISSION_GRANT;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policies around setting the grant state of a SMS related permission.
+ *
+ * <p>This is used by
+ * {@code DevicePolicyManager#setPermissionGrantState(ComponentName, String, String, int)} when
+ * granting sms-related permissions.
+ */
+// TODO(198311372): Check if APPLIED_BY_PROFILE_OWNER_USER is expected
+@EnterprisePolicy(
+        dpc = APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | APPLIED_BY_PROFILE_OWNER_USER | CAN_BE_DELEGATED,
+        delegatedScopes = DELEGATION_PERMISSION_GRANT)
+public final class SetSmsPermissionGranted {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SupportMessage.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SupportMessage.java
new file mode 100644
index 0000000..7f16f55
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SupportMessage.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for long and short support messages.
+ *
+ * <p>Users of this policy are {@code DevicePolicyManager#setLongSupportMessage(ComponentName,
+ * CharSequence)}, {@code DevicePolicyManager#setShortSupportMessage(ComponentName, CharSequence)},
+ * {@code DevicePolicyManager#getLongSupportMessage(ComponentName)} and {@code
+ * DevicePolicyManager#getShortSupportMessage(ComponentName)}.
+ */
+@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER)
+public final class SupportMessage {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SuspendPackage.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SuspendPackage.java
new file mode 100644
index 0000000..324848f
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/SuspendPackage.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
+import static com.android.bedstead.nene.devicepolicy.CommonDevicePolicy.DELEGATION_PACKAGE_ACCESS;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for hiding applications.
+ * See {@code DevicePolicyManager#setPackagesSuspended(ComponentName, String[], boolean)} for more
+ * detail.
+ */
+@EnterprisePolicy(dpc = {
+        APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER
+                | APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED},
+        delegatedScopes = DELEGATION_PACKAGE_ACCESS)
+public final class SuspendPackage {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/UserControlDisabledPackages.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/UserControlDisabledPackages.java
new file mode 100644
index 0000000..c47db87
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/UserControlDisabledPackages.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_GLOBALLY;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for user control disabled packages.
+ *
+ * <p>This is used by methods such as
+ * {@code DevicePolicyManager#setUserControlDisabledPackages(ComponentName, List)} and
+ * {@code DevicePolicyManager#getUserControlDisabledPackages(ComponentName)}.
+ */
+@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIES_GLOBALLY)
+public final class UserControlDisabledPackages {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/WifiMinimumSecurity.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/WifiMinimumSecurity.java
new file mode 100644
index 0000000..6f15bc9
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/WifiMinimumSecurity.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_COPE_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_GLOBALLY;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for Wi-Fi minimum security.
+ *
+ * <p>Users of this policy are {@code DevicePolicyManager#setMinimumRequiredWifiSecurityLevel(int)}
+ * and {@code DevicePolicyManager#getMinimumRequiredWifiSecurityLevel()}.
+ */
+@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_COPE_PROFILE_OWNER | APPLIES_GLOBALLY)
+public class WifiMinimumSecurity {
+}
diff --git a/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/WifiSsidRestriction.java b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/WifiSsidRestriction.java
new file mode 100644
index 0000000..f88bd38
--- /dev/null
+++ b/common/device-side/bedstead/harrier/common/src/main/java/com/android/bedstead/harrier/policies/WifiSsidRestriction.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 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.bedstead.harrier.policies;
+
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_COPE_PROFILE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
+import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_GLOBALLY;
+
+import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
+
+/**
+ * Policy for Wi-Fi minimum security.
+ *
+ * <p>Users of this policy are {@code DevicePolicyManager#setWifiSsidPolicy(WifiSsidPolicy)}
+ * and {@code DevicePolicyManager#getWifiSsidPolicy()}.
+ */
+@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_COPE_PROFILE_OWNER | APPLIES_GLOBALLY)
+public class WifiSsidRestriction {
+}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/BedsteadJUnit4.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/BedsteadJUnit4.java
deleted file mode 100644
index 7ffabbe..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/BedsteadJUnit4.java
+++ /dev/null
@@ -1,489 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier;
-
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-import com.android.bedstead.harrier.annotations.enterprise.NegativePolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
-import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
-import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeNone;
-import com.android.bedstead.nene.exceptions.NeneException;
-
-import com.google.common.base.Objects;
-
-import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
-import org.junit.runners.model.TestClass;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-/**
- * A JUnit test runner for use with Bedstead.
- */
-public final class BedsteadJUnit4 extends BlockJUnit4ClassRunner {
-
-    private static final String BEDSTEAD_PACKAGE_NAME = "com.android.bedstead";
-
-    // These are annotations which are not included indirectly
-    private static final Set<String> sIgnoredAnnotationPackages = new HashSet<>();
-    static {
-        sIgnoredAnnotationPackages.add("java.lang.annotation");
-        sIgnoredAnnotationPackages.add("com.android.bedstead.harrier.annotations.meta");
-        sIgnoredAnnotationPackages.add("kotlin.*");
-        sIgnoredAnnotationPackages.add("org.junit");
-    }
-
-    private static int annotationSorter(Annotation a, Annotation b) {
-        return getAnnotationWeight(a) - getAnnotationWeight(b);
-    }
-
-    private static int getAnnotationWeight(Annotation annotation) {
-        if (annotation instanceof DynamicParameterizedAnnotation) {
-            // Special case, not important
-            return AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
-        }
-
-        if (!annotation.annotationType().getPackage().getName().startsWith(BEDSTEAD_PACKAGE_NAME)) {
-            return AnnotationRunPrecedence.FIRST;
-        }
-
-        try {
-            return (int) annotation.annotationType().getMethod("weight").invoke(annotation);
-        } catch (NoSuchMethodException e) {
-            // Default to PRECEDENCE_NOT_IMPORTANT if no weight is found on the annotation.
-            return AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
-        } catch (IllegalAccessException | InvocationTargetException e) {
-            throw new NeneException("Failed to invoke weight on this annotation: " + annotation, e);
-        }
-    }
-
-    /**
-     * {@link FrameworkMethod} subclass which allows modifying the test name and annotations.
-     */
-    public static final class BedsteadFrameworkMethod extends FrameworkMethod {
-
-        private final Annotation mParameterizedAnnotation;
-        private final Map<Class<? extends Annotation>, Annotation> mAnnotationsMap =
-                new HashMap<>();
-        private Annotation[] mAnnotations;
-
-        public BedsteadFrameworkMethod(Method method) {
-            this(method, /* parameterizedAnnotation= */ null);
-        }
-
-        public BedsteadFrameworkMethod(Method method, Annotation parameterizedAnnotation) {
-            super(method);
-            mParameterizedAnnotation = parameterizedAnnotation;
-
-            calculateAnnotations();
-        }
-
-        private void calculateAnnotations() {
-            List<Annotation> annotations =
-                    new ArrayList<>(Arrays.asList(getDeclaringClass().getAnnotations()));
-            annotations.sort(BedsteadJUnit4::annotationSorter);
-
-            annotations.addAll(Arrays.stream(getMethod().getAnnotations())
-                    .sorted(BedsteadJUnit4::annotationSorter)
-                    .collect(Collectors.toList()));
-
-            parseEnterpriseAnnotations(annotations);
-
-            resolveRecursiveAnnotations(annotations, mParameterizedAnnotation);
-
-            this.mAnnotations = annotations.toArray(new Annotation[0]);
-            for (Annotation annotation : annotations) {
-                if (annotation instanceof DynamicParameterizedAnnotation) {
-                    continue; // don't return this
-                }
-                mAnnotationsMap.put(annotation.annotationType(), annotation);
-            }
-        }
-
-        @Override
-        public String getName() {
-            if (mParameterizedAnnotation == null) {
-                return super.getName();
-            }
-            return super.getName() + "[" + getParameterName(mParameterizedAnnotation) + "]";
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            if (!super.equals(obj)) {
-                return false;
-            }
-
-            if (!(obj instanceof BedsteadFrameworkMethod)) {
-                return false;
-            }
-
-            BedsteadFrameworkMethod other = (BedsteadFrameworkMethod) obj;
-
-            return Objects.equal(mParameterizedAnnotation, other.mParameterizedAnnotation);
-        }
-
-        @Override
-        public Annotation[] getAnnotations() {
-            return mAnnotations;
-        }
-
-        @Override
-        public <T extends Annotation> T getAnnotation(Class<T> annotationType) {
-            return (T) mAnnotationsMap.get(annotationType);
-        }
-    }
-
-    private static String getParameterName(Annotation annotation) {
-        if (annotation instanceof DynamicParameterizedAnnotation) {
-            return ((DynamicParameterizedAnnotation) annotation).name();
-        }
-        return annotation.annotationType().getSimpleName();
-    }
-
-    /**
-     * Resolve annotations recursively.
-     *
-     * @param parameterizedAnnotation The class of the parameterized annotation to expand, if any
-     */
-    public static void resolveRecursiveAnnotations(List<Annotation> annotations,
-            @Nullable Annotation parameterizedAnnotation) {
-        int index = 0;
-        while (index < annotations.size()) {
-            Annotation annotation = annotations.get(index);
-            annotations.remove(index);
-            List<Annotation> replacementAnnotations =
-                    getReplacementAnnotations(annotation, parameterizedAnnotation);
-            replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
-            annotations.addAll(index, replacementAnnotations);
-            index += replacementAnnotations.size();
-        }
-    }
-
-    private static boolean isParameterizedAnnotation(Annotation annotation) {
-        if (annotation instanceof DynamicParameterizedAnnotation) {
-            return true;
-        }
-
-        return annotation.annotationType().getAnnotation(ParameterizedAnnotation.class) != null;
-    }
-
-    private static Annotation[] getIndirectAnnotations(Annotation annotation) {
-        if (annotation instanceof DynamicParameterizedAnnotation) {
-            return ((DynamicParameterizedAnnotation) annotation).annotations();
-        }
-        return annotation.annotationType().getAnnotations();
-    }
-
-    private static boolean isRepeatingAnnotation(Annotation annotation) {
-        if (annotation instanceof DynamicParameterizedAnnotation) {
-            return false;
-        }
-
-        return annotation.annotationType().getAnnotation(RepeatingAnnotation.class) != null;
-    }
-
-    private static List<Annotation> getReplacementAnnotations(Annotation annotation,
-            @Nullable Annotation parameterizedAnnotation) {
-        List<Annotation> replacementAnnotations = new ArrayList<>();
-
-        if (isRepeatingAnnotation(annotation)) {
-            try {
-                Annotation[] annotations =
-                        (Annotation[]) annotation.annotationType()
-                                .getMethod("value").invoke(annotation);
-                Collections.addAll(replacementAnnotations, annotations);
-                return replacementAnnotations;
-            } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
-                throw new NeneException("Error expanding repeated annotations", e);
-            }
-        }
-
-        if (isParameterizedAnnotation(annotation) && !annotation.equals(parameterizedAnnotation)) {
-            return replacementAnnotations;
-        }
-
-        for (Annotation indirectAnnotation : getIndirectAnnotations(annotation)) {
-            if (shouldSkipAnnotation(annotation)) {
-                continue;
-            }
-
-            replacementAnnotations.addAll(getReplacementAnnotations(
-                    indirectAnnotation, parameterizedAnnotation));
-        }
-
-        if (!(annotation instanceof DynamicParameterizedAnnotation)) {
-            // We drop the fake annotation once it's replaced
-            replacementAnnotations.add(annotation);
-        }
-
-        return replacementAnnotations;
-    }
-
-    private static boolean shouldSkipAnnotation(Annotation annotation) {
-        if (annotation instanceof DynamicParameterizedAnnotation) {
-            return false;
-        }
-
-        String annotationPackage = annotation.annotationType().getPackage().getName();
-
-        for (String ignoredPackage : sIgnoredAnnotationPackages) {
-            if (ignoredPackage.endsWith(".*")) {
-                if (annotationPackage.startsWith(
-                    ignoredPackage.substring(0, ignoredPackage.length() - 2))) {
-                    return true;
-                }
-            } else if (annotationPackage.equals(ignoredPackage)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public BedsteadJUnit4(Class<?> testClass) throws InitializationError {
-        super(testClass);
-    }
-
-    private boolean annotationShouldBeSkipped(Annotation annotation) {
-        if (annotation instanceof DynamicParameterizedAnnotation) {
-            return false;
-        }
-
-        return annotation.annotationType().equals(IncludeNone.class);
-    }
-
-    @Override
-    protected List<FrameworkMethod> computeTestMethods() {
-        TestClass testClass = getTestClass();
-
-        List<FrameworkMethod> basicTests = testClass.getAnnotatedMethods(Test.class);
-        List<FrameworkMethod> modifiedTests = new ArrayList<>();
-
-        for (FrameworkMethod m : basicTests) {
-            Set<Annotation> parameterizedAnnotations = getParameterizedAnnotations(m);
-
-            if (parameterizedAnnotations.isEmpty()) {
-                // Unparameterized, just add the original
-                modifiedTests.add(new BedsteadFrameworkMethod(m.getMethod()));
-            }
-
-            for (Annotation annotation : parameterizedAnnotations) {
-                if (annotationShouldBeSkipped(annotation)) {
-                    // Special case - does not generate a run
-                    continue;
-                }
-                modifiedTests.add(
-                        new BedsteadFrameworkMethod(m.getMethod(), annotation));
-            }
-        }
-
-        sortMethodsByBedsteadAnnotations(modifiedTests);
-
-        return modifiedTests;
-    }
-
-    /**
-     * Sort methods so that methods with identical bedstead annotations are together.
-     *
-     * <p>This will also ensure that all tests methods which are not annotated for bedstead will
-     * run before any tests which are annotated.
-     */
-    private void sortMethodsByBedsteadAnnotations(List<FrameworkMethod> modifiedTests) {
-        List<Annotation> bedsteadAnnotationsSortedByMostCommon =
-                bedsteadAnnotationsSortedByMostCommon(modifiedTests);
-
-        modifiedTests.sort((o1, o2) -> {
-            for (Annotation annotation : bedsteadAnnotationsSortedByMostCommon) {
-                boolean o1HasAnnotation = o1.getAnnotation(annotation.annotationType()) != null;
-                boolean o2HasAnnotation = o2.getAnnotation(annotation.annotationType()) != null;
-
-                if (o1HasAnnotation && !o2HasAnnotation) {
-                    // o1 goes to the end
-                    return 1;
-                } else if (o2HasAnnotation && !o1HasAnnotation) {
-                    return -1;
-                }
-            }
-            return 0;
-        });
-    }
-
-    private List<Annotation> bedsteadAnnotationsSortedByMostCommon(List<FrameworkMethod> methods) {
-        Map<Annotation, Integer> annotationCounts = countAnnotations(methods);
-        List<Annotation> annotations = new ArrayList<>(annotationCounts.keySet());
-
-        annotations.removeIf(
-                annotation ->
-                        !annotation.annotationType()
-                                .getCanonicalName().contains(BEDSTEAD_PACKAGE_NAME));
-
-        annotations.sort(Comparator.comparingInt(annotationCounts::get));
-        Collections.reverse(annotations);
-
-        return annotations;
-    }
-
-    private Map<Annotation, Integer> countAnnotations(List<FrameworkMethod> methods) {
-        Map<Annotation, Integer> annotationCounts = new HashMap<>();
-
-        for (FrameworkMethod method : methods) {
-            for (Annotation annotation : method.getAnnotations()) {
-                annotationCounts.put(
-                        annotation, annotationCounts.getOrDefault(annotation, 0) + 1);
-            }
-        }
-
-        return annotationCounts;
-    }
-
-    private Set<Annotation> getParameterizedAnnotations(FrameworkMethod method) {
-        Set<Annotation> parameterizedAnnotations = new HashSet<>();
-        List<Annotation> annotations = new ArrayList<>(Arrays.asList(method.getAnnotations()));
-
-        // TODO(scottjonathan): We're doing this twice... does it matter?
-        parseEnterpriseAnnotations(annotations);
-
-        for (Annotation annotation : annotations) {
-            if (isParameterizedAnnotation(annotation)) {
-                parameterizedAnnotations.add(annotation);
-            }
-        }
-
-        return parameterizedAnnotations;
-    }
-
-    /**
-     * Parse enterprise-specific annotations.
-     *
-     * <p>To be used before general annotation processing.
-     */
-    private static void parseEnterpriseAnnotations(List<Annotation> annotations) {
-        int index = 0;
-        while (index < annotations.size()) {
-            Annotation annotation = annotations.get(index);
-            if (annotation instanceof PositivePolicyTest) {
-                annotations.remove(index);
-                Class<?> policy = ((PositivePolicyTest) annotation).policy();
-
-                EnterprisePolicy enterprisePolicy =
-                        policy.getAnnotation(EnterprisePolicy.class);
-                List<Annotation> replacementAnnotations =
-                        Policy.positiveStates(policy.getName(), enterprisePolicy);
-                replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
-
-                annotations.addAll(index, replacementAnnotations);
-                index += replacementAnnotations.size();
-            } else if (annotation instanceof NegativePolicyTest) {
-                annotations.remove(index);
-                Class<?> policy = ((NegativePolicyTest) annotation).policy();
-
-                EnterprisePolicy enterprisePolicy =
-                        policy.getAnnotation(EnterprisePolicy.class);
-                List<Annotation> replacementAnnotations =
-                        Policy.negativeStates(policy.getName(), enterprisePolicy);
-                replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
-
-                annotations.addAll(index, replacementAnnotations);
-                index += replacementAnnotations.size();
-            } else if (annotation instanceof CannotSetPolicyTest) {
-                annotations.remove(index);
-                Class<?> policy = ((CannotSetPolicyTest) annotation).policy();
-
-                EnterprisePolicy enterprisePolicy =
-                        policy.getAnnotation(EnterprisePolicy.class);
-                List<Annotation> replacementAnnotations =
-                        Policy.cannotSetPolicyStates(policy.getName(), enterprisePolicy, ((CannotSetPolicyTest) annotation).includeDeviceAdminStates(), ((CannotSetPolicyTest) annotation).includeNonDeviceAdminStates());
-                replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
-
-                annotations.addAll(index, replacementAnnotations);
-                index += replacementAnnotations.size();
-            } else if (annotation instanceof CanSetPolicyTest) {
-                annotations.remove(index);
-                Class<?> policy = ((CanSetPolicyTest) annotation).policy();
-                boolean singleTestOnly = ((CanSetPolicyTest) annotation).singleTestOnly();
-
-                EnterprisePolicy enterprisePolicy =
-                        policy.getAnnotation(EnterprisePolicy.class);
-                List<Annotation> replacementAnnotations =
-                        Policy.canSetPolicyStates(
-                                policy.getName(), enterprisePolicy, singleTestOnly);
-                replacementAnnotations.sort(BedsteadJUnit4::annotationSorter);
-
-                annotations.addAll(index, replacementAnnotations);
-                index += replacementAnnotations.size();
-            } else {
-                index++;
-            }
-        }
-    }
-
-    @Override
-    protected List<TestRule> classRules() {
-        List<TestRule> rules = super.classRules();
-
-        for (TestRule rule : rules) {
-            if (rule instanceof DeviceState) {
-                DeviceState deviceState = (DeviceState) rule;
-
-                deviceState.setSkipTestTeardown(true);
-                deviceState.setUsingBedsteadJUnit4(true);
-
-                break;
-            }
-        }
-
-        return rules;
-    }
-
-    /**
-     * True if the test is running in debug mode.
-     *
-     * <p>This will result in additional debugging information being added which would otherwise
-     * be dropped to improve test performance.
-     *
-     * <p>To enable this, pass the "bedstead-debug" instrumentation arg as "true"
-     */
-    public static boolean isDebug() {
-        Bundle arguments = InstrumentationRegistry.getArguments();
-        return Boolean.parseBoolean(arguments.getString("bedstead-debug", "false"));
-    }
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java
index 75cf62b..203dc68 100644
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java
+++ b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/DeviceState.java
@@ -19,8 +19,10 @@
 import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
 import static android.app.ActivityManager.STOP_USER_ON_SWITCH_DEFAULT;
 import static android.app.ActivityManager.STOP_USER_ON_SWITCH_FALSE;
+import static android.os.Build.VERSION.SDK_INT;
 
-import static com.android.bedstead.nene.permissions.Permissions.NOTIFY_PENDING_SYSTEM_UPDATE;
+import static com.android.bedstead.harrier.Defaults.DEFAULT_PASSWORD;
+import static com.android.bedstead.harrier.annotations.EnsureTestAppInstalled.DEFAULT_TEST_APP_KEY;
 import static com.android.bedstead.nene.users.UserType.MANAGED_PROFILE_TYPE_NAME;
 import static com.android.bedstead.nene.users.UserType.SECONDARY_USER_TYPE_NAME;
 import static com.android.bedstead.nene.utils.Versions.meetsSdkVersionRequirements;
@@ -36,21 +38,31 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
-import android.os.Bundle;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
-import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.bedstead.harrier.annotations.AfterClass;
 import com.android.bedstead.harrier.annotations.BeforeClass;
+import com.android.bedstead.harrier.annotations.EnsureBluetoothDisabled;
+import com.android.bedstead.harrier.annotations.EnsureBluetoothEnabled;
+import com.android.bedstead.harrier.annotations.EnsureCanGetPermission;
+import com.android.bedstead.harrier.annotations.EnsureDoesNotHaveAppOp;
 import com.android.bedstead.harrier.annotations.EnsureDoesNotHavePermission;
+import com.android.bedstead.harrier.annotations.EnsureHasAppOp;
 import com.android.bedstead.harrier.annotations.EnsureHasPermission;
 import com.android.bedstead.harrier.annotations.EnsurePackageNotInstalled;
+import com.android.bedstead.harrier.annotations.EnsurePasswordNotSet;
+import com.android.bedstead.harrier.annotations.EnsurePasswordSet;
+import com.android.bedstead.harrier.annotations.EnsureScreenIsOn;
+import com.android.bedstead.harrier.annotations.EnsureTestAppHasAppOp;
+import com.android.bedstead.harrier.annotations.EnsureTestAppHasPermission;
+import com.android.bedstead.harrier.annotations.EnsureTestAppInstalled;
 import com.android.bedstead.harrier.annotations.FailureMode;
+import com.android.bedstead.harrier.annotations.OtherUser;
 import com.android.bedstead.harrier.annotations.RequireDoesNotHaveFeature;
 import com.android.bedstead.harrier.annotations.RequireFeature;
-import com.android.bedstead.harrier.annotations.RequireGmsInstrumentation;
 import com.android.bedstead.harrier.annotations.RequireHeadlessSystemUserMode;
 import com.android.bedstead.harrier.annotations.RequireLowRamDevice;
 import com.android.bedstead.harrier.annotations.RequireNotHeadlessSystemUserMode;
@@ -58,6 +70,7 @@
 import com.android.bedstead.harrier.annotations.RequirePackageInstalled;
 import com.android.bedstead.harrier.annotations.RequirePackageNotInstalled;
 import com.android.bedstead.harrier.annotations.RequireSdkVersion;
+import com.android.bedstead.harrier.annotations.RequireTargetSdkVersion;
 import com.android.bedstead.harrier.annotations.RequireUserSupported;
 import com.android.bedstead.harrier.annotations.TestTag;
 import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDelegate;
@@ -80,7 +93,9 @@
 import com.android.bedstead.nene.devicepolicy.ProfileOwner;
 import com.android.bedstead.nene.exceptions.AdbException;
 import com.android.bedstead.nene.exceptions.NeneException;
+import com.android.bedstead.nene.logging.Logger;
 import com.android.bedstead.nene.packages.Package;
+import com.android.bedstead.nene.permissions.PermissionContext;
 import com.android.bedstead.nene.permissions.PermissionContextImpl;
 import com.android.bedstead.nene.users.UserBuilder;
 import com.android.bedstead.nene.users.UserReference;
@@ -89,9 +104,12 @@
 import com.android.bedstead.nene.utils.Versions;
 import com.android.bedstead.remotedpc.RemoteDelegate;
 import com.android.bedstead.remotedpc.RemoteDpc;
+import com.android.bedstead.remotedpc.RemoteDpcUsingParentInstance;
 import com.android.bedstead.remotedpc.RemotePolicyManager;
+import com.android.bedstead.remotedpc.RemoteTestApp;
 import com.android.bedstead.testapp.TestApp;
 import com.android.bedstead.testapp.TestAppInstance;
+import com.android.bedstead.testapp.TestAppProvider;
 import com.android.compatibility.common.util.BlockingBroadcastReceiver;
 import com.android.eventlib.EventLogs;
 
@@ -100,7 +118,6 @@
 import junit.framework.AssertionFailedError;
 
 import org.junit.AssumptionViolatedException;
-import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.FrameworkMethod;
 import org.junit.runners.model.Statement;
@@ -110,6 +127,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -120,6 +138,12 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.function.Function;
 
 
@@ -134,9 +158,8 @@
  *
  * {@code assumeTrue} will be used, so tests which do not meet preconditions will be skipped.
  */
-public final class DeviceState implements TestRule {
+public final class DeviceState extends HarrierRule {
 
-    private static final String GMS_PKG = "com.google.android.gms";
     private static final ComponentName REMOTE_DPC_COMPONENT_NAME = RemoteDpc.DPC_COMPONENT_NAME;
 
     private static final String SWITCHED_TO_USER = "switchedToUser";
@@ -145,12 +168,15 @@
     public static final String FOR_USER = "forUser";
     public static final String DPC_IS_PRIMARY = "dpcIsPrimary";
     public static final String AFFILIATION_IDS = "affiliationIds";
+    private static final String USE_PARENT_INSTANCE_OF_DPC = "useParentInstanceOfDpc";
 
     private final Context mContext = ApplicationProvider.getApplicationContext();
     private static final String SKIP_TEST_TEARDOWN_KEY = "skip-test-teardown";
     private static final String SKIP_CLASS_TEARDOWN_KEY = "skip-class-teardown";
     private static final String SKIP_TESTS_REASON_KEY = "skip-tests-reason";
     private static final String MIN_SDK_VERSION_KEY = "min-sdk-version";
+    private static final String PERMISSIONS_INSTRUMENTATION_PACKAGE_KEY =
+            "permission-instrumentation-package";
     private boolean mSkipTestTeardown;
     private boolean mSkipClassTeardown;
     private boolean mSkipTests;
@@ -159,523 +185,768 @@
     private String mSkipTestsReason;
     private String mFailTestsReason;
     // The minimum version supported by tests, defaults to current version
-    private final int mMinSdkVersion;
+    private int mMinSdkVersion;
     private int mMinSdkVersionCurrentTest;
+    private @Nullable String mPermissionsInstrumentationPackage;
+    private final Set<String> mPermissionsInstrumentationPackagePermissions = new HashSet<>();
 
-    // Marks if the conditions for requiring running under GMS instrumentation have been set
-    // if not - we assume the test should never run under GMS instrumentation
-    private boolean mHasRequireGmsInstrumentation = false;
+    // Marks if the conditions for requiring running under permission instrumentation have been set
+    // if not - we assume the test should never run under permission instrumentation
+    // This is only used if a permission instrumentation package is set
+    private boolean mHasRequirePermissionInstrumentation = false;
 
     private static final String TV_PROFILE_TYPE_NAME = "com.android.tv.profile";
 
+    // We are allowed 11 minutes before the entire test run fails
+    private static final Duration MAX_TEST_DURATION = Duration.ofMinutes(10);
+    private final ExecutorService mTestExecutor = Executors.newSingleThreadExecutor();
+    private Thread mTestThread;
+
+    private final Logger mLogger = Logger.forInstance(this);
+
     public DeviceState() {
-        Bundle arguments = InstrumentationRegistry.getArguments();
-        mSkipTestTeardown = Boolean.parseBoolean(
-                arguments.getString(SKIP_TEST_TEARDOWN_KEY, "false"));
-        mSkipClassTeardown = Boolean.parseBoolean(
-                arguments.getString(SKIP_CLASS_TEARDOWN_KEY, "false"));
-        mSkipTestsReason = arguments.getString(SKIP_TESTS_REASON_KEY, "");
-        mSkipTests = !mSkipTestsReason.isEmpty();
-        mMinSdkVersion = arguments.getInt(MIN_SDK_VERSION_KEY, Build.VERSION.SDK_INT);
+        mLogger.constructor(() -> {
+            Future<Thread> testThreadFuture = mTestExecutor.submit(Thread::currentThread);
+
+            mSkipTestTeardown = TestApis.instrumentation().arguments().getBoolean(SKIP_TEST_TEARDOWN_KEY, false);
+            mSkipClassTeardown = TestApis.instrumentation().arguments().getBoolean(SKIP_CLASS_TEARDOWN_KEY, false);
+
+            mSkipTestsReason = TestApis.instrumentation().arguments().getString(SKIP_TESTS_REASON_KEY, "");
+            mSkipTests = !mSkipTestsReason.isEmpty();
+            mMinSdkVersion = TestApis.instrumentation().arguments().getInt(MIN_SDK_VERSION_KEY, SDK_INT);
+            mPermissionsInstrumentationPackage = TestApis.instrumentation().arguments().getString(PERMISSIONS_INSTRUMENTATION_PACKAGE_KEY);
+            if (mPermissionsInstrumentationPackage != null) {
+                mPermissionsInstrumentationPackagePermissions.addAll(
+                        TestApis.packages().find(mPermissionsInstrumentationPackage)
+                                .requestedPermissions());
+            }
+
+            try {
+                mTestThread = testThreadFuture.get();
+            } catch (InterruptedException | ExecutionException e) {
+                throw new AssertionError(
+                        "Error setting up DeviceState. Interrupted getting test thread", e);
+            }
+        });
     }
 
+    @Override
     void setSkipTestTeardown(boolean skipTestTeardown) {
-        mSkipTestTeardown = skipTestTeardown;
+        mLogger.method("setSkipTestTeardown", skipTestTeardown, () -> {
+            mSkipTestTeardown = skipTestTeardown;
+        });
     }
 
+    @Override
     void setUsingBedsteadJUnit4(boolean usingBedsteadJUnit4) {
-        mUsingBedsteadJUnit4 = usingBedsteadJUnit4;
+        mLogger.method("setUsingBedsteadJUnit4", usingBedsteadJUnit4, () -> {
+            mUsingBedsteadJUnit4 = usingBedsteadJUnit4;
+        });
     }
 
-    @Override public Statement apply(final Statement base,
-            final Description description) {
-
-        if (description.isTest()) {
-            return applyTest(base, description);
-        } else if (description.isSuite()) {
-            return applySuite(base, description);
-        }
-        throw new IllegalStateException("Unknown description type: " + description);
+    @Override
+    public Statement apply(Statement base, Description description) {
+        return mLogger.method("apply", base, description, () -> {
+            if (description.isTest()) {
+                return applyTest(base, description);
+            } else if (description.isSuite()) {
+                return applySuite(base, description);
+            }
+            throw new IllegalStateException("Unknown description type: " + description);
+        });
     }
 
     private Statement applyTest(Statement base, Description description) {
-        return new Statement() {
-            @Override public void evaluate() throws Throwable {
-                PermissionContextImpl permissionContext = null;
+        return mLogger.method("applyTest", base, description, () -> {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    Future<Throwable> future = mTestExecutor.submit(() -> {
+                        try {
+                            executeTest(base, description);
+                            return null;
+                        } catch (Throwable e) {
+                            return e;
+                        }
+                    });
 
-                try {
-                    Log.d(LOG_TAG, "Preparing state for test " + description.getMethodName());
+                    try {
+                        Throwable t = future.get(MAX_TEST_DURATION.getSeconds(), TimeUnit.SECONDS);
+                        if (t != null) {
+                            if (t instanceof AssertionError
+                                    || t instanceof AssumptionViolatedException) {
+                                throw t;
+                            } else {
+                                // We wrap the failure in an AssertionError so it doesn't crash
+                                throw new AssertionError("Exception while executing test", t);
+                            }
+                        }
+                    } catch (TimeoutException e) {
+                        StackTraceElement[] stack = mTestThread.getStackTrace();
+                        future.cancel(true);
 
-                    Tags.clearTags();
-                    Tags.addTag(Tags.USES_DEVICESTATE);
-                    assumeFalse(mSkipTestsReason, mSkipTests);
-                    assertFalse(mFailTestsReason, mFailTests);
-
-                    // Ensure that tests only see events from the current test
-                    EventLogs.resetLogs();
-
-                    mMinSdkVersionCurrentTest = mMinSdkVersion;
-                    List<Annotation> annotations = getAnnotations(description);
-                    permissionContext = applyAnnotations(annotations);
-
-                    Log.d(LOG_TAG,
-                            "Finished preparing state for test " + description.getMethodName());
-
-                    base.evaluate();
-                } finally {
-                    Log.d(LOG_TAG,
-                            "Tearing down state for test " + description.getMethodName());
-
-                    if (permissionContext != null) {
-                        permissionContext.close();
+                        AssertionError assertionError = new AssertionError(
+                                "Timed out executing test " + description.getDisplayName());
+                        assertionError.setStackTrace(stack);
+                        throw assertionError;
                     }
-
-                    teardownNonShareableState();
-                    if (!mSkipTestTeardown) {
-                        teardownShareableState();
-                    }
-                    Log.d(LOG_TAG,
-                            "Finished tearing down state for test "
-                                    + description.getMethodName());
                 }
-            }};
+            };
+        });
     }
 
-    private PermissionContextImpl applyAnnotations(List<Annotation> annotations)
+    private void executeTest(Statement base, Description description) throws Throwable {
+        mLogger.method(Throwable.class, "executeTest", base, description, () -> {
+            PermissionContextImpl permissionContext = null;
+
+            String testName = description.getMethodName();
+
+            try {
+                Log.d(LOG_TAG, "Preparing state for test " + testName);
+
+                testApps().snapshot();
+                Tags.clearTags();
+                Tags.addTag(Tags.USES_DEVICESTATE);
+                assumeFalse(mSkipTestsReason, mSkipTests);
+                assertFalse(mFailTestsReason, mFailTests);
+
+                // Ensure that tests only see events from the current test
+                EventLogs.resetLogs();
+
+                mMinSdkVersionCurrentTest = mMinSdkVersion;
+                List<Annotation> annotations = getAnnotations(description);
+                permissionContext = applyAnnotations(annotations, /* isTest= */ true);
+
+                Log.d(LOG_TAG, "Finished preparing state for test " + testName);
+
+                base.evaluate();
+            } finally {
+                Log.d(LOG_TAG, "Tearing down state for test " + testName);
+
+                if (permissionContext != null) {
+                    permissionContext.close();
+                }
+
+                teardownNonShareableState();
+                if (!mSkipTestTeardown) {
+                    teardownShareableState();
+                }
+                Log.d(LOG_TAG, "Finished tearing down state for test " + testName);
+            }
+        });
+    }
+
+    private PermissionContextImpl applyAnnotations(List<Annotation> annotations, boolean isTest)
             throws Throwable {
-        PermissionContextImpl permissionContext = null;
-        for (Annotation annotation : annotations) {
-            Log.i(LOG_TAG, "Applying annotation " + annotation);
+        return mLogger.method(Throwable.class, "applyAnnotations", annotations, isTest, () -> {
+            PermissionContextImpl permissionContext = null;
+            Log.i(LOG_TAG, "Applying annotations: " + annotations);
+            for (Annotation annotation : annotations) {
+                Log.i(LOG_TAG, "Applying annotation " + annotation);
 
-            Class<? extends Annotation> annotationType = annotation.annotationType();
+                Class<? extends Annotation> annotationType = annotation.annotationType();
 
-            EnsureHasNoProfileAnnotation ensureHasNoProfileAnnotation =
-                    annotationType.getAnnotation(EnsureHasNoProfileAnnotation.class);
-            if (ensureHasNoProfileAnnotation != null) {
-                UserType userType = (UserType) annotation.annotationType()
-                        .getMethod(FOR_USER).invoke(annotation);
-                ensureHasNoProfile(ensureHasNoProfileAnnotation.value(), userType);
-                continue;
-            }
+                EnsureHasNoProfileAnnotation ensureHasNoProfileAnnotation =
+                        annotationType.getAnnotation(EnsureHasNoProfileAnnotation.class);
+                if (ensureHasNoProfileAnnotation != null) {
+                    UserType userType = (UserType) annotation.annotationType()
+                            .getMethod(FOR_USER).invoke(annotation);
+                    ensureHasNoProfile(ensureHasNoProfileAnnotation.value(), userType);
+                    continue;
+                }
 
-            EnsureHasProfileAnnotation ensureHasProfileAnnotation =
-                    annotationType.getAnnotation(EnsureHasProfileAnnotation.class);
-            if (ensureHasProfileAnnotation != null) {
-                UserType forUser = (UserType) annotation.annotationType()
-                        .getMethod(FOR_USER).invoke(annotation);
-                OptionalBoolean installInstrumentedApp = (OptionalBoolean)
-                        annotation.annotationType()
-                                .getMethod(INSTALL_INSTRUMENTED_APP).invoke(annotation);
-
-                boolean dpcIsPrimary = false;
-                if (ensureHasProfileAnnotation.hasProfileOwner()) {
-                    dpcIsPrimary = (boolean)
+                EnsureHasProfileAnnotation ensureHasProfileAnnotation =
+                        annotationType.getAnnotation(EnsureHasProfileAnnotation.class);
+                if (ensureHasProfileAnnotation != null) {
+                    UserType forUser = (UserType) annotation.annotationType()
+                            .getMethod(FOR_USER).invoke(annotation);
+                    OptionalBoolean installInstrumentedApp = (OptionalBoolean)
                             annotation.annotationType()
-                                    .getMethod(DPC_IS_PRIMARY).invoke(annotation);
-                }
+                                    .getMethod(INSTALL_INSTRUMENTED_APP).invoke(annotation);
 
-                OptionalBoolean switchedToParentUser = (OptionalBoolean)
-                        annotation.annotationType()
-                                .getMethod(SWITCHED_TO_PARENT_USER).invoke(annotation);
+                    boolean dpcIsPrimary = false;
+                    boolean useParentInstance = false;
+                    if (ensureHasProfileAnnotation.hasProfileOwner()) {
+                        dpcIsPrimary = (boolean)
+                                annotation.annotationType()
+                                        .getMethod(DPC_IS_PRIMARY).invoke(annotation);
 
-                ensureHasProfile(
-                        ensureHasProfileAnnotation.value(), installInstrumentedApp,
-                        forUser, ensureHasProfileAnnotation.hasProfileOwner(),
-                        dpcIsPrimary, switchedToParentUser);
-                continue;
-            }
+                        if (dpcIsPrimary) {
+                            useParentInstance = (boolean)
+                                    annotation.annotationType()
+                                            .getMethod(USE_PARENT_INSTANCE_OF_DPC).invoke(
+                                                    annotation);
 
-            EnsureHasNoUserAnnotation ensureHasNoUserAnnotation =
-                    annotationType.getAnnotation(EnsureHasNoUserAnnotation.class);
-            if (ensureHasNoUserAnnotation != null) {
-                ensureHasNoUser(ensureHasNoUserAnnotation.value());
-                continue;
-            }
-
-            EnsureHasUserAnnotation ensureHasUserAnnotation =
-                    annotationType.getAnnotation(EnsureHasUserAnnotation.class);
-            if (ensureHasUserAnnotation != null) {
-                OptionalBoolean installInstrumentedApp = (OptionalBoolean)
-                        annotation.annotationType()
-                                .getMethod(INSTALL_INSTRUMENTED_APP).invoke(annotation);
-                OptionalBoolean switchedToUser = (OptionalBoolean)
-                        annotation.annotationType()
-                                .getMethod(SWITCHED_TO_USER).invoke(annotation);
-                ensureHasUser(
-                        ensureHasUserAnnotation.value(), installInstrumentedApp, switchedToUser);
-                continue;
-            }
-
-            RequireRunOnUserAnnotation requireRunOnUserAnnotation =
-                    annotationType.getAnnotation(RequireRunOnUserAnnotation.class);
-            if (requireRunOnUserAnnotation != null) {
-                OptionalBoolean switchedToUser = (OptionalBoolean)
-                        annotation.annotationType()
-                                .getMethod(SWITCHED_TO_USER).invoke(annotation);
-                requireRunOnUser(requireRunOnUserAnnotation.value(), switchedToUser);
-                continue;
-            }
-
-            if (annotation instanceof TestTag) {
-                TestTag testTagAnnotation = (TestTag) annotation;
-                Tags.addTag(testTagAnnotation.value());
-            }
-
-            RequireRunOnProfileAnnotation requireRunOnProfileAnnotation =
-                    annotationType.getAnnotation(RequireRunOnProfileAnnotation.class);
-            if (requireRunOnProfileAnnotation != null) {
-                OptionalBoolean installInstrumentedAppInParent = (OptionalBoolean)
-                        annotation.annotationType()
-                                .getMethod("installInstrumentedAppInParent")
-                                .invoke(annotation);
-
-                OptionalBoolean switchedToParentUser = (OptionalBoolean)
-                        annotation.annotationType()
-                                .getMethod(SWITCHED_TO_PARENT_USER).invoke(annotation);
-
-
-                boolean dpcIsPrimary = false;
-                Set<String> affiliationIds = null;
-                if (requireRunOnProfileAnnotation.hasProfileOwner()) {
-                    dpcIsPrimary = (boolean)
-                            annotation.annotationType()
-                                    .getMethod(DPC_IS_PRIMARY).invoke(annotation);
-                    affiliationIds = new HashSet<>(Arrays.asList((String[])
-                            annotation.annotationType()
-                                    .getMethod(AFFILIATION_IDS).invoke(annotation)));
-                }
-
-                requireRunOnProfile(requireRunOnProfileAnnotation.value(),
-                        installInstrumentedAppInParent,
-                        requireRunOnProfileAnnotation.hasProfileOwner(),
-                        dpcIsPrimary, switchedToParentUser, affiliationIds);
-                continue;
-            }
-
-            if (annotation instanceof EnsureHasDelegate) {
-                EnsureHasDelegate ensureHasDelegateAnnotation =
-                        (EnsureHasDelegate) annotation;
-                ensureHasDelegate(
-                        ensureHasDelegateAnnotation.admin(),
-                        Arrays.asList(ensureHasDelegateAnnotation.scopes()),
-                        ensureHasDelegateAnnotation.isPrimary());
-                continue;
-            }
-
-
-            if (annotation instanceof EnsureHasDeviceOwner) {
-                EnsureHasDeviceOwner ensureHasDeviceOwnerAnnotation =
-                        (EnsureHasDeviceOwner) annotation;
-                ensureHasDeviceOwner(ensureHasDeviceOwnerAnnotation.failureMode(),
-                        ensureHasDeviceOwnerAnnotation.isPrimary(),
-                        new HashSet<>(
-                                Arrays.asList(ensureHasDeviceOwnerAnnotation.affiliationIds())));
-                continue;
-            }
-
-            if (annotation instanceof EnsureHasNoDelegate) {
-                EnsureHasNoDelegate ensureHasNoDelegateAnnotation =
-                        (EnsureHasNoDelegate) annotation;
-                ensureHasNoDelegate(ensureHasNoDelegateAnnotation.admin());
-                continue;
-            }
-
-            if (annotation instanceof EnsureHasNoDeviceOwner) {
-                ensureHasNoDeviceOwner();
-                continue;
-            }
-
-            if (annotation instanceof RequireFeature) {
-                RequireFeature requireFeatureAnnotation = (RequireFeature) annotation;
-                requireFeature(
-                        requireFeatureAnnotation.value(),
-                        requireFeatureAnnotation.failureMode());
-                continue;
-            }
-
-            if (annotation instanceof RequireDoesNotHaveFeature) {
-                RequireDoesNotHaveFeature requireDoesNotHaveFeatureAnnotation =
-                        (RequireDoesNotHaveFeature) annotation;
-                requireDoesNotHaveFeature(
-                        requireDoesNotHaveFeatureAnnotation.value(),
-                        requireDoesNotHaveFeatureAnnotation.failureMode());
-                continue;
-            }
-
-            if (annotation instanceof EnsureHasProfileOwner) {
-                EnsureHasProfileOwner ensureHasProfileOwnerAnnotation =
-                        (EnsureHasProfileOwner) annotation;
-                ensureHasProfileOwner(ensureHasProfileOwnerAnnotation.onUser(),
-                        ensureHasProfileOwnerAnnotation.isPrimary(),
-                        new HashSet<>(Arrays.asList(ensureHasProfileOwnerAnnotation.affiliationIds())));
-                continue;
-            }
-
-            if (annotationType.equals(EnsureHasNoProfileOwner.class)) {
-                EnsureHasNoProfileOwner ensureHasNoProfileOwnerAnnotation =
-                        (EnsureHasNoProfileOwner) annotation;
-                ensureHasNoProfileOwner(ensureHasNoProfileOwnerAnnotation.onUser());
-                continue;
-            }
-
-            if (annotation instanceof RequireUserSupported) {
-                RequireUserSupported requireUserSupportedAnnotation =
-                        (RequireUserSupported) annotation;
-                requireUserSupported(
-                        requireUserSupportedAnnotation.value(),
-                        requireUserSupportedAnnotation.failureMode());
-                continue;
-            }
-
-            if (annotation instanceof RequireGmsInstrumentation) {
-                RequireGmsInstrumentation requireGmsInstrumentationAnnotation =
-                        (RequireGmsInstrumentation) annotation;
-                requireGmsInstrumentation(requireGmsInstrumentationAnnotation.min(),
-                        requireGmsInstrumentationAnnotation.max());
-                continue;
-            }
-
-            if (annotation instanceof RequireLowRamDevice) {
-                RequireLowRamDevice requireLowRamDeviceAnnotation =
-                        (RequireLowRamDevice) annotation;
-                requireLowRamDevice(requireLowRamDeviceAnnotation.reason(),
-                        requireLowRamDeviceAnnotation.failureMode());
-                continue;
-            }
-
-            if (annotation instanceof RequireNotLowRamDevice) {
-                RequireNotLowRamDevice requireNotLowRamDeviceAnnotation =
-                        (RequireNotLowRamDevice) annotation;
-                requireNotLowRamDevice(requireNotLowRamDeviceAnnotation.reason(),
-                        requireNotLowRamDeviceAnnotation.failureMode());
-                continue;
-            }
-
-            if (annotation instanceof RequireSdkVersion) {
-                RequireSdkVersion requireSdkVersionAnnotation =
-                        (RequireSdkVersion) annotation;
-
-                if (requireSdkVersionAnnotation.reason().isEmpty()) {
-                    requireSdkVersion(
-                            requireSdkVersionAnnotation.min(),
-                            requireSdkVersionAnnotation.max(),
-                            requireSdkVersionAnnotation.failureMode());
-                } else {
-                    requireSdkVersion(
-                            requireSdkVersionAnnotation.min(),
-                            requireSdkVersionAnnotation.max(),
-                            requireSdkVersionAnnotation.failureMode(),
-                            requireSdkVersionAnnotation.reason());
-                }
-
-                continue;
-            }
-
-            if (annotation instanceof RequirePackageInstalled) {
-                RequirePackageInstalled requirePackageInstalledAnnotation =
-                        (RequirePackageInstalled) annotation;
-                requirePackageInstalled(
-                        requirePackageInstalledAnnotation.value(),
-                        requirePackageInstalledAnnotation.onUser(),
-                        requirePackageInstalledAnnotation.failureMode());
-                continue;
-            }
-
-            if (annotation instanceof RequirePackageNotInstalled) {
-                RequirePackageNotInstalled requirePackageNotInstalledAnnotation =
-                        (RequirePackageNotInstalled) annotation;
-                requirePackageNotInstalled(
-                        requirePackageNotInstalledAnnotation.value(),
-                        requirePackageNotInstalledAnnotation.onUser(),
-                        requirePackageNotInstalledAnnotation.failureMode()
-                );
-                continue;
-            }
-
-            if (annotation instanceof EnsurePackageNotInstalled) {
-                EnsurePackageNotInstalled ensurePackageNotInstalledAnnotation =
-                        (EnsurePackageNotInstalled) annotation;
-                ensurePackageNotInstalled(
-                        ensurePackageNotInstalledAnnotation.value(),
-                        ensurePackageNotInstalledAnnotation.onUser()
-                );
-                continue;
-            }
-
-            if (annotation instanceof RequireNotHeadlessSystemUserMode) {
-                requireNotHeadlessSystemUserMode();
-                continue;
-            }
-
-            if (annotation instanceof RequireHeadlessSystemUserMode) {
-                requireHeadlessSystemUserMode();
-                continue;
-            }
-
-            if (annotation instanceof EnsureHasPermission) {
-                EnsureHasPermission ensureHasPermissionAnnotation =
-                        (EnsureHasPermission) annotation;
-
-                for (String permission : ensureHasPermissionAnnotation.value()) {
-                    ensureCanGetPermission(permission);
-                }
-
-                try {
-                    if (permissionContext == null) {
-                        permissionContext = TestApis.permissions().withPermission(
-                                ensureHasPermissionAnnotation.value());
-                    } else {
-                        permissionContext = permissionContext.withPermission(
-                                ensureHasPermissionAnnotation.value());
+                        }
                     }
-                } catch (NeneException e) {
-                    failOrSkip("Error getting permission: " + e,
-                            ensureHasPermissionAnnotation.failureMode());
+
+                    OptionalBoolean switchedToParentUser = (OptionalBoolean)
+                            annotation.annotationType()
+                                    .getMethod(SWITCHED_TO_PARENT_USER).invoke(annotation);
+
+                    ensureHasProfile(
+                            ensureHasProfileAnnotation.value(), installInstrumentedApp,
+                            forUser, ensureHasProfileAnnotation.hasProfileOwner(),
+                            dpcIsPrimary, useParentInstance, switchedToParentUser);
+                    continue;
                 }
-                continue;
-            }
 
-            if (annotation instanceof EnsureDoesNotHavePermission) {
-                EnsureDoesNotHavePermission ensureDoesNotHavePermission =
-                        (EnsureDoesNotHavePermission) annotation;
+                EnsureHasNoUserAnnotation ensureHasNoUserAnnotation =
+                        annotationType.getAnnotation(EnsureHasNoUserAnnotation.class);
+                if (ensureHasNoUserAnnotation != null) {
+                    ensureHasNoUser(ensureHasNoUserAnnotation.value());
+                    continue;
+                }
 
-                try {
-                    if (permissionContext == null) {
-                        permissionContext = TestApis.permissions().withoutPermission(
-                                ensureDoesNotHavePermission.value());
-                    } else {
-                        permissionContext = permissionContext.withoutPermission(
-                                ensureDoesNotHavePermission.value());
+                EnsureHasUserAnnotation ensureHasUserAnnotation =
+                        annotationType.getAnnotation(EnsureHasUserAnnotation.class);
+                if (ensureHasUserAnnotation != null) {
+                    OptionalBoolean installInstrumentedApp = (OptionalBoolean)
+                            annotation.annotationType()
+                                    .getMethod(INSTALL_INSTRUMENTED_APP).invoke(annotation);
+                    OptionalBoolean switchedToUser = (OptionalBoolean)
+                            annotation.annotationType()
+                                    .getMethod(SWITCHED_TO_USER).invoke(annotation);
+                    ensureHasUser(
+                            ensureHasUserAnnotation.value(), installInstrumentedApp,
+                            switchedToUser);
+                    continue;
+                }
+
+                RequireRunOnUserAnnotation requireRunOnUserAnnotation =
+                        annotationType.getAnnotation(RequireRunOnUserAnnotation.class);
+                if (requireRunOnUserAnnotation != null) {
+                    OptionalBoolean switchedToUser = (OptionalBoolean)
+                            annotation.annotationType()
+                                    .getMethod(SWITCHED_TO_USER).invoke(annotation);
+                    requireRunOnUser(requireRunOnUserAnnotation.value(), switchedToUser);
+                    continue;
+                }
+
+                if (annotation instanceof TestTag) {
+                    TestTag testTagAnnotation = (TestTag) annotation;
+                    Tags.addTag(testTagAnnotation.value());
+                }
+
+                RequireRunOnProfileAnnotation requireRunOnProfileAnnotation =
+                        annotationType.getAnnotation(RequireRunOnProfileAnnotation.class);
+                if (requireRunOnProfileAnnotation != null) {
+                    OptionalBoolean installInstrumentedAppInParent = (OptionalBoolean)
+                            annotation.annotationType()
+                                    .getMethod("installInstrumentedAppInParent")
+                                    .invoke(annotation);
+
+                    OptionalBoolean switchedToParentUser = (OptionalBoolean)
+                            annotation.annotationType()
+                                    .getMethod(SWITCHED_TO_PARENT_USER).invoke(annotation);
+
+
+                    boolean dpcIsPrimary = false;
+                    Set<String> affiliationIds = null;
+                    if (requireRunOnProfileAnnotation.hasProfileOwner()) {
+                        dpcIsPrimary = (boolean)
+                                annotation.annotationType()
+                                        .getMethod(DPC_IS_PRIMARY).invoke(annotation);
+                        affiliationIds = new HashSet<>(Arrays.asList((String[])
+                                annotation.annotationType()
+                                        .getMethod(AFFILIATION_IDS).invoke(annotation)));
                     }
-                } catch (NeneException e) {
-                    failOrSkip("Error denying permission: " + e,
-                            ensureDoesNotHavePermission.failureMode());
+
+                    requireRunOnProfile(requireRunOnProfileAnnotation.value(),
+                            installInstrumentedAppInParent,
+                            requireRunOnProfileAnnotation.hasProfileOwner(),
+                            dpcIsPrimary, /* useParentInstance= */ false,
+                            switchedToParentUser, affiliationIds);
+                    continue;
                 }
-                continue;
+
+                if (annotation instanceof EnsureTestAppInstalled) {
+                    EnsureTestAppInstalled ensureTestAppInstalledAnnotation =
+                            (EnsureTestAppInstalled) annotation;
+                    ensureTestAppInstalled(
+                            ensureTestAppInstalledAnnotation.key(),
+                            ensureTestAppInstalledAnnotation.packageName(),
+                            ensureTestAppInstalledAnnotation.onUser(),
+                            ensureTestAppInstalledAnnotation.isPrimary()
+                    );
+                    continue;
+                }
+
+                if (annotation instanceof EnsureTestAppHasPermission) {
+                    EnsureTestAppHasPermission ensureTestAppHasPermissionAnnotation =
+                            (EnsureTestAppHasPermission) annotation;
+                    ensureTestAppHasPermission(
+                            ensureTestAppHasPermissionAnnotation.testAppKey(),
+                            ensureTestAppHasPermissionAnnotation.value(),
+                            ensureTestAppHasPermissionAnnotation.minVersion(),
+                            ensureTestAppHasPermissionAnnotation.maxVersion()
+                    );
+                    continue;
+                }
+
+                if (annotation instanceof EnsureTestAppHasAppOp) {
+                    EnsureTestAppHasAppOp ensureTestAppHasAppOpAnnotation =
+                            (EnsureTestAppHasAppOp) annotation;
+                    ensureTestAppHasAppOp(
+                            ensureTestAppHasAppOpAnnotation.testAppKey(),
+                            ensureTestAppHasAppOpAnnotation.value(),
+                            ensureTestAppHasAppOpAnnotation.minVersion(),
+                            ensureTestAppHasAppOpAnnotation.maxVersion()
+                    );
+                    continue;
+                }
+
+                if (annotation instanceof EnsureHasDelegate) {
+                    EnsureHasDelegate ensureHasDelegateAnnotation =
+                            (EnsureHasDelegate) annotation;
+                    ensureHasDelegate(
+                            ensureHasDelegateAnnotation.admin(),
+                            Arrays.asList(ensureHasDelegateAnnotation.scopes()),
+                            ensureHasDelegateAnnotation.isPrimary());
+                    continue;
+                }
+
+
+                if (annotation instanceof EnsureHasDeviceOwner) {
+                    EnsureHasDeviceOwner ensureHasDeviceOwnerAnnotation =
+                            (EnsureHasDeviceOwner) annotation;
+                    ensureHasDeviceOwner(ensureHasDeviceOwnerAnnotation.failureMode(),
+                            ensureHasDeviceOwnerAnnotation.isPrimary(),
+                            new HashSet<>(
+                                    Arrays.asList(
+                                            ensureHasDeviceOwnerAnnotation.affiliationIds())));
+                    continue;
+                }
+
+                if (annotation instanceof EnsureHasNoDelegate) {
+                    EnsureHasNoDelegate ensureHasNoDelegateAnnotation =
+                            (EnsureHasNoDelegate) annotation;
+                    ensureHasNoDelegate(ensureHasNoDelegateAnnotation.admin());
+                    continue;
+                }
+
+                if (annotation instanceof EnsureHasNoDeviceOwner) {
+                    ensureHasNoDeviceOwner();
+                    continue;
+                }
+
+                if (annotation instanceof RequireFeature) {
+                    RequireFeature requireFeatureAnnotation = (RequireFeature) annotation;
+                    requireFeature(
+                            requireFeatureAnnotation.value(),
+                            requireFeatureAnnotation.failureMode());
+                    continue;
+                }
+
+                if (annotation instanceof RequireDoesNotHaveFeature) {
+                    RequireDoesNotHaveFeature requireDoesNotHaveFeatureAnnotation =
+                            (RequireDoesNotHaveFeature) annotation;
+                    requireDoesNotHaveFeature(
+                            requireDoesNotHaveFeatureAnnotation.value(),
+                            requireDoesNotHaveFeatureAnnotation.failureMode());
+                    continue;
+                }
+
+                if (annotation instanceof EnsureHasProfileOwner) {
+                    EnsureHasProfileOwner ensureHasProfileOwnerAnnotation =
+                            (EnsureHasProfileOwner) annotation;
+                    ensureHasProfileOwner(ensureHasProfileOwnerAnnotation.onUser(),
+                            ensureHasProfileOwnerAnnotation.isPrimary(),
+                            ensureHasProfileOwnerAnnotation.useParentInstance(),
+                            new HashSet<>(Arrays.asList(
+                                    ensureHasProfileOwnerAnnotation.affiliationIds())));
+                    continue;
+                }
+
+                if (annotationType.equals(EnsureHasNoProfileOwner.class)) {
+                    EnsureHasNoProfileOwner ensureHasNoProfileOwnerAnnotation =
+                            (EnsureHasNoProfileOwner) annotation;
+                    ensureHasNoProfileOwner(ensureHasNoProfileOwnerAnnotation.onUser());
+                    continue;
+                }
+
+                if (annotation instanceof RequireUserSupported) {
+                    RequireUserSupported requireUserSupportedAnnotation =
+                            (RequireUserSupported) annotation;
+                    requireUserSupported(
+                            requireUserSupportedAnnotation.value(),
+                            requireUserSupportedAnnotation.failureMode());
+                    continue;
+                }
+
+                if (annotation instanceof RequireLowRamDevice) {
+                    RequireLowRamDevice requireLowRamDeviceAnnotation =
+                            (RequireLowRamDevice) annotation;
+                    requireLowRamDevice(requireLowRamDeviceAnnotation.reason(),
+                            requireLowRamDeviceAnnotation.failureMode());
+                    continue;
+                }
+
+                if (annotation instanceof RequireNotLowRamDevice) {
+                    RequireNotLowRamDevice requireNotLowRamDeviceAnnotation =
+                            (RequireNotLowRamDevice) annotation;
+                    requireNotLowRamDevice(requireNotLowRamDeviceAnnotation.reason(),
+                            requireNotLowRamDeviceAnnotation.failureMode());
+                    continue;
+                }
+
+                if (annotation instanceof RequireTargetSdkVersion) {
+                    RequireTargetSdkVersion requireTargetSdkVersionAnnotation =
+                            (RequireTargetSdkVersion) annotation;
+
+                    requireTargetSdkVersion(
+                            requireTargetSdkVersionAnnotation.min(),
+                            requireTargetSdkVersionAnnotation.max(),
+                            requireTargetSdkVersionAnnotation.failureMode());
+
+                    continue;
+                }
+
+                if (annotation instanceof RequireSdkVersion) {
+                    RequireSdkVersion requireSdkVersionAnnotation =
+                            (RequireSdkVersion) annotation;
+
+                    if (requireSdkVersionAnnotation.reason().isEmpty()) {
+                        requireSdkVersion(
+                                requireSdkVersionAnnotation.min(),
+                                requireSdkVersionAnnotation.max(),
+                                requireSdkVersionAnnotation.failureMode());
+                    } else {
+                        requireSdkVersion(
+                                requireSdkVersionAnnotation.min(),
+                                requireSdkVersionAnnotation.max(),
+                                requireSdkVersionAnnotation.failureMode(),
+                                requireSdkVersionAnnotation.reason());
+                    }
+
+                    continue;
+                }
+
+                if (annotation instanceof RequirePackageInstalled) {
+                    RequirePackageInstalled requirePackageInstalledAnnotation =
+                            (RequirePackageInstalled) annotation;
+                    requirePackageInstalled(
+                            requirePackageInstalledAnnotation.value(),
+                            requirePackageInstalledAnnotation.onUser(),
+                            requirePackageInstalledAnnotation.failureMode());
+                    continue;
+                }
+
+                if (annotation instanceof RequirePackageNotInstalled) {
+                    RequirePackageNotInstalled requirePackageNotInstalledAnnotation =
+                            (RequirePackageNotInstalled) annotation;
+                    requirePackageNotInstalled(
+                            requirePackageNotInstalledAnnotation.value(),
+                            requirePackageNotInstalledAnnotation.onUser(),
+                            requirePackageNotInstalledAnnotation.failureMode()
+                    );
+                    continue;
+                }
+
+                if (annotation instanceof EnsurePackageNotInstalled) {
+                    EnsurePackageNotInstalled ensurePackageNotInstalledAnnotation =
+                            (EnsurePackageNotInstalled) annotation;
+                    ensurePackageNotInstalled(
+                            ensurePackageNotInstalledAnnotation.value(),
+                            ensurePackageNotInstalledAnnotation.onUser()
+                    );
+                    continue;
+                }
+
+                if (annotation instanceof RequireNotHeadlessSystemUserMode) {
+                    requireNotHeadlessSystemUserMode();
+                    continue;
+                }
+
+                if (annotation instanceof RequireHeadlessSystemUserMode) {
+                    requireHeadlessSystemUserMode();
+                    continue;
+                }
+
+                if (annotation instanceof EnsureCanGetPermission) {
+                    EnsureCanGetPermission ensureCanGetPermissionAnnotation =
+                            (EnsureCanGetPermission) annotation;
+
+                    if (!meetsSdkVersionRequirements(
+                            ensureCanGetPermissionAnnotation.minVersion(),
+                            ensureCanGetPermissionAnnotation.maxVersion())) {
+                        Log.d(LOG_TAG,
+                                "Version " + SDK_INT + " does not need to get permissions "
+                                        + Arrays.toString(
+                                        ensureCanGetPermissionAnnotation.value()));
+                        continue;
+                    }
+
+                    for (String permission : ensureCanGetPermissionAnnotation.value()) {
+                        ensureCanGetPermission(permission);
+                    }
+                    continue;
+                }
+
+                if (annotation instanceof EnsureHasAppOp) {
+                    EnsureHasAppOp ensureHasAppOpAnnotation = (EnsureHasAppOp) annotation;
+
+                    if (!meetsSdkVersionRequirements(
+                            ensureHasAppOpAnnotation.minVersion(),
+                            ensureHasAppOpAnnotation.maxVersion())) {
+                        Log.d(LOG_TAG,
+                                "Version " + SDK_INT + " does not need to get appOp "
+                                        + ensureHasAppOpAnnotation.value());
+                        continue;
+                    }
+
+                    try {
+                        if (permissionContext == null) {
+                            permissionContext = TestApis.permissions().withAppOp(
+                                    ensureHasAppOpAnnotation.value());
+                        } else {
+                            permissionContext = permissionContext.withAppOp(
+                                    ensureHasAppOpAnnotation.value());
+                        }
+                    } catch (NeneException e) {
+                        failOrSkip("Error getting appOp: " + e,
+                                ensureHasAppOpAnnotation.failureMode());
+                    }
+                    continue;
+                }
+
+                if (annotation instanceof EnsureDoesNotHaveAppOp) {
+                    EnsureDoesNotHaveAppOp ensureDoesNotHaveAppOpAnnotation =
+                            (EnsureDoesNotHaveAppOp) annotation;
+
+                    try {
+                        if (permissionContext == null) {
+                            permissionContext = TestApis.permissions().withoutAppOp(
+                                    ensureDoesNotHaveAppOpAnnotation.value());
+                        } else {
+                            permissionContext = permissionContext.withoutAppOp(
+                                    ensureDoesNotHaveAppOpAnnotation.value());
+                        }
+                    } catch (NeneException e) {
+                        failOrSkip("Error denying appOp: " + e,
+                                ensureDoesNotHaveAppOpAnnotation.failureMode());
+                    }
+                    continue;
+                }
+
+                if (annotation instanceof EnsureHasPermission) {
+                    EnsureHasPermission ensureHasPermissionAnnotation =
+                            (EnsureHasPermission) annotation;
+
+                    if (!meetsSdkVersionRequirements(
+                            ensureHasPermissionAnnotation.minVersion(),
+                            ensureHasPermissionAnnotation.maxVersion())) {
+                        Log.d(LOG_TAG,
+                                "Version " + SDK_INT + " does not need to get permission "
+                                        + Arrays.toString(ensureHasPermissionAnnotation.value()));
+                        continue;
+                    }
+
+                    for (String permission : ensureHasPermissionAnnotation.value()) {
+                        ensureCanGetPermission(permission);
+                    }
+
+                    try {
+                        if (permissionContext == null) {
+                            permissionContext = TestApis.permissions().withPermission(
+                                    ensureHasPermissionAnnotation.value());
+                        } else {
+                            permissionContext = permissionContext.withPermission(
+                                    ensureHasPermissionAnnotation.value());
+                        }
+                    } catch (NeneException e) {
+                        failOrSkip("Error getting permission: " + e,
+                                ensureHasPermissionAnnotation.failureMode());
+                    }
+                    continue;
+                }
+
+                if (annotation instanceof EnsureDoesNotHavePermission) {
+                    EnsureDoesNotHavePermission ensureDoesNotHavePermission =
+                            (EnsureDoesNotHavePermission) annotation;
+
+                    try {
+                        if (permissionContext == null) {
+                            permissionContext = TestApis.permissions().withoutPermission(
+                                    ensureDoesNotHavePermission.value());
+                        } else {
+                            permissionContext = permissionContext.withoutPermission(
+                                    ensureDoesNotHavePermission.value());
+                        }
+                    } catch (NeneException e) {
+                        failOrSkip("Error denying permission: " + e,
+                                ensureDoesNotHavePermission.failureMode());
+                    }
+                    continue;
+                }
+
+                if (annotation instanceof EnsureScreenIsOn) {
+                    ensureScreenIsOn();
+                    continue;
+                }
+
+                if (annotation instanceof EnsurePasswordSet) {
+                    EnsurePasswordSet ensurePasswordSetAnnotation =
+                            (EnsurePasswordSet) annotation;
+                    ensurePasswordSet(
+                            ensurePasswordSetAnnotation.forUser(),
+                            ensurePasswordSetAnnotation.password());
+                    continue;
+                }
+
+                if (annotation instanceof EnsurePasswordNotSet) {
+                    EnsurePasswordNotSet ensurePasswordNotSetAnnotation =
+                            (EnsurePasswordNotSet) annotation;
+                    ensurePasswordNotSet(ensurePasswordNotSetAnnotation.forUser());
+                    continue;
+                }
+
+                if (annotation instanceof OtherUser) {
+                    OtherUser otherUserAnnotation = (OtherUser) annotation;
+                    mOtherUserType = otherUserAnnotation.value();
+                    continue;
+                }
+
+                if (annotation instanceof EnsureBluetoothEnabled) {
+                    ensureBluetoothEnabled();
+                    continue;
+                }
+
+                if (annotation instanceof EnsureBluetoothDisabled) {
+                    ensureBluetoothDisabled();
+                    continue;
+                }
             }
-        }
 
-        requireSdkVersion(/* min= */ mMinSdkVersionCurrentTest,
-                /* max= */ Integer.MAX_VALUE, FailureMode.SKIP);
+            requireSdkVersion(/* min= */ mMinSdkVersionCurrentTest,
+                    /* max= */ Integer.MAX_VALUE, FailureMode.SKIP);
 
-        if (!mHasRequireGmsInstrumentation) {
-            // TODO(scottjonathan): Only enforce if we've configured GMS Instrumentation
-            requireNoGmsInstrumentation();
-        }
+            if (isTest && mPermissionsInstrumentationPackage != null
+                    && !mHasRequirePermissionInstrumentation) {
+                requireNoPermissionsInstrumentation("No reason to use instrumentation");
+            }
 
-        return permissionContext;
+            return permissionContext;
+        });
     }
 
     private List<Annotation> getAnnotations(Description description) {
-        if (mUsingBedsteadJUnit4 && description.isTest()) {
-            // The annotations are already exploded for tests
-            return new ArrayList<>(description.getAnnotations());
-        }
+        return mLogger.method("getAnnotations", description, () -> {
+            if (mUsingBedsteadJUnit4 && description.isTest()) {
+                // The annotations are already exploded for tests
+                return new ArrayList<>(description.getAnnotations());
+            }
 
-        // Otherwise we should build a new collection by recursively gathering annotations
-        // if we find any which don't work without the runner we should error and fail the test
-        List<Annotation> annotations = new ArrayList<>();
+            // Otherwise we should build a new collection by recursively gathering annotations
+            // if we find any which don't work without the runner we should error and fail the test
+            List<Annotation> annotations = new ArrayList<>();
 
-        if (description.isTest()) {
-            annotations =
-                    new ArrayList<>(Arrays.asList(description.getTestClass().getAnnotations()));
-        }
+            if (description.isTest()) {
+                annotations =
+                        new ArrayList<>(Arrays.asList(description.getTestClass().getAnnotations()));
+            }
 
-        annotations.addAll(description.getAnnotations());
+            annotations.addAll(description.getAnnotations());
 
-        checkAnnotations(annotations);
+            checkAnnotations(annotations);
 
-        BedsteadJUnit4.resolveRecursiveAnnotations(annotations,
-                /* parameterizedAnnotation= */ null);
+            BedsteadJUnit4.resolveRecursiveAnnotations(annotations,
+                    /* parameterizedAnnotation= */ null);
 
-        checkAnnotations(annotations);
+            checkAnnotations(annotations);
 
-        return annotations;
+            return annotations;
+        });
     }
 
     private void checkAnnotations(Collection<Annotation> annotations) {
-        for (Annotation annotation : annotations) {
-            if (annotation.annotationType().getAnnotation(RequiresBedsteadJUnit4.class) != null
-                    || annotation.annotationType().getAnnotation(
-                            ParameterizedAnnotation.class) != null) {
-                throw new AssertionFailedError("Test is annotated "
-                        + annotation.annotationType().getSimpleName()
-                        + " which requires using the BedsteadJUnit4 test runner");
+        mLogger.method("checkAnnotations", annotations, () -> {
+            for (Annotation annotation : annotations) {
+                if (annotation.annotationType().getAnnotation(RequiresBedsteadJUnit4.class) != null
+                        || annotation.annotationType().getAnnotation(
+                        ParameterizedAnnotation.class) != null) {
+                    throw new AssertionFailedError("Test is annotated "
+                            + annotation.annotationType().getSimpleName()
+                            + " which requires using the BedsteadJUnit4 test runner");
+                }
             }
-        }
+        });
     }
 
     private Statement applySuite(Statement base, Description description) {
-        return new Statement() {
-            @Override
-            public void evaluate() throws Throwable {
-                checkValidAnnotations(description);
+        return mLogger.method("applySuite", base, description, () -> {
+            return new Statement() {
+                @Override
+                public void evaluate() throws Throwable {
+                    checkValidAnnotations(description);
 
-                TestClass testClass = new TestClass(description.getTestClass());
+                    TestClass testClass = new TestClass(description.getTestClass());
 
-                PermissionContextImpl permissionContext = null;
+                    PermissionContextImpl permissionContext = null;
 
-                if (mSkipTests || mFailTests) {
-                    Log.d(LOG_TAG, "Skipping suite setup and teardown due to skipTests: "
-                            + mSkipTests + ", failTests: " + mFailTests);
-                    base.evaluate();
-                    return;
-                }
+                    if (mSkipTests || mFailTests) {
+                        Log.d(LOG_TAG, "Skipping suite setup and teardown due to skipTests: "
+                                + mSkipTests + ", failTests: " + mFailTests);
+                        base.evaluate();
+                        return;
+                    }
 
-                Log.d(LOG_TAG, "Preparing state for suite " + description.getClassName());
+                    Log.d(LOG_TAG, "Preparing state for suite " + description.getClassName());
 
-                Tags.clearTags();
-                Tags.addTag(Tags.USES_DEVICESTATE);
-                if (TestApis.packages().instrumented().isInstantApp()) {
-                    Tags.addTag(Tags.INSTANT_APP);
-                }
-
-                try {
-                    TestApis.users().setStopBgUsersOnSwitch(STOP_USER_ON_SWITCH_FALSE);
+                    Tags.clearTags();
+                    Tags.addTag(Tags.USES_DEVICESTATE);
+                    if (TestApis.packages().instrumented().isInstantApp()) {
+                        Tags.addTag(Tags.INSTANT_APP);
+                    }
 
                     try {
-                        List<Annotation> annotations =
-                                new ArrayList<>(getAnnotations(description));
-                        permissionContext = applyAnnotations(annotations);
-                    } catch (AssumptionViolatedException e) {
-                        Log.i(LOG_TAG, "Assumption failed during class setup", e);
-                        mSkipTests = true;
-                        mSkipTestsReason = e.getMessage();
-                    } catch (AssertionError e) {
-                        Log.i(LOG_TAG, "Assertion failed during class setup", e);
-                        mFailTests = true;
-                        mFailTestsReason = e.getMessage();
+                        TestApis.users().setStopBgUsersOnSwitch(STOP_USER_ON_SWITCH_FALSE);
+
+                        try {
+                            List<Annotation> annotations =
+                                    new ArrayList<>(getAnnotations(description));
+                            permissionContext = applyAnnotations(annotations, /* isTest= */ false);
+                        } catch (AssumptionViolatedException e) {
+                            Log.i(LOG_TAG, "Assumption failed during class setup", e);
+                            mSkipTests = true;
+                            mSkipTestsReason = e.getMessage();
+                        } catch (AssertionError e) {
+                            Log.i(LOG_TAG, "Assertion failed during class setup", e);
+                            mFailTests = true;
+                            mFailTestsReason = e.getMessage();
+                        }
+
+                        Log.d(LOG_TAG,
+                                "Finished preparing state for suite "
+                                        + description.getClassName());
+
+                        if (!mSkipTests && !mFailTests) {
+                            // Tests may be skipped during the class setup
+                            runAnnotatedMethods(testClass, BeforeClass.class);
+                        }
+
+                        base.evaluate();
+                    } finally {
+                        runAnnotatedMethods(testClass, AfterClass.class);
+
+                        if (permissionContext != null) {
+                            permissionContext.close();
+                        }
+
+                        if (!mSkipClassTeardown) {
+                            teardownShareableState();
+                        }
+
+                        TestApis.users().setStopBgUsersOnSwitch(STOP_USER_ON_SWITCH_DEFAULT);
                     }
-
-                    Log.d(LOG_TAG,
-                            "Finished preparing state for suite "
-                                    + description.getClassName());
-
-                    if (!mSkipTests && !mFailTests) {
-                        // Tests may be skipped during the class setup
-                        runAnnotatedMethods(testClass, BeforeClass.class);
-                    }
-
-                    base.evaluate();
-                } finally {
-                    runAnnotatedMethods(testClass, AfterClass.class);
-
-                    if (permissionContext != null) {
-                        permissionContext.close();
-                    }
-
-                    if (!mSkipClassTeardown) {
-                        teardownShareableState();
-                    }
-
-                    TestApis.users().setStopBgUsersOnSwitch(STOP_USER_ON_SWITCH_DEFAULT);
                 }
-            }
-        };
+            };
+        });
     }
 
     private static final Map<Class<? extends Annotation>, Class<? extends Annotation>>
             BANNED_ANNOTATIONS_TO_REPLACEMENTS = getBannedAnnotationsToReplacements();
+
     private static Map<
             Class<? extends Annotation>,
             Class<? extends Annotation>> getBannedAnnotationsToReplacements() {
@@ -688,208 +959,243 @@
     }
 
     private void checkValidAnnotations(Description classDescription) {
-        for (Method method : classDescription.getTestClass().getMethods()) {
-            for (Map.Entry<
-                    Class<? extends Annotation>,
-                    Class<? extends Annotation>> bannedAnnotation
-                    : BANNED_ANNOTATIONS_TO_REPLACEMENTS.entrySet()) {
-                if (method.isAnnotationPresent(bannedAnnotation.getKey())) {
-                    throw new IllegalStateException("Do not use "
-                            + bannedAnnotation.getKey().getCanonicalName()
-                            + " when using DeviceState, replace with "
-                            + bannedAnnotation.getValue().getCanonicalName());
+        mLogger.method("checkValidAnnotations", classDescription, () -> {
+            for (Method method : classDescription.getTestClass().getMethods()) {
+                for (Map.Entry<
+                        Class<? extends Annotation>,
+                        Class<? extends Annotation>> bannedAnnotation
+                        : BANNED_ANNOTATIONS_TO_REPLACEMENTS.entrySet()) {
+                    if (method.isAnnotationPresent(bannedAnnotation.getKey())) {
+                        throw new IllegalStateException("Do not use "
+                                + bannedAnnotation.getKey().getCanonicalName()
+                                + " when using DeviceState, replace with "
+                                + bannedAnnotation.getValue().getCanonicalName());
+                    }
+                }
+
+                if (method.getAnnotation(BeforeClass.class) != null
+                        || method.getAnnotation(AfterClass.class) != null) {
+                    checkPublicStaticVoidNoArgs(method);
                 }
             }
-
-            if (method.getAnnotation(BeforeClass.class) != null
-                    || method.getAnnotation(AfterClass.class) != null) {
-                checkPublicStaticVoidNoArgs(method);
-            }
-        }
+        });
     }
 
     private void checkPublicStaticVoidNoArgs(Method method) {
-        if (method.getParameterTypes().length > 0) {
-            throw new IllegalStateException(
-                    "Method " + method.getName() + " should have no parameters");
-        }
-        if (method.getReturnType() != Void.TYPE) {
-            throw new IllegalStateException("Method " + method.getName() + "() should be void");
-        }
-        if (!Modifier.isStatic(method.getModifiers())) {
-            throw new IllegalStateException("Method " + method.getName() + "() should be static");
-        }
-        if (!Modifier.isPublic(method.getModifiers())) {
-            throw new IllegalStateException("Method " + method.getName() + "() should be public");
-        }
+        mLogger.method("checkPublicStaticVoidNoArgs", method, () -> {
+            if (method.getParameterTypes().length > 0) {
+                throw new IllegalStateException(
+                        "Method " + method.getName() + " should have no parameters");
+            }
+            if (method.getReturnType() != Void.TYPE) {
+                throw new IllegalStateException("Method " + method.getName() + "() should be void");
+            }
+            if (!Modifier.isStatic(method.getModifiers())) {
+                throw new IllegalStateException(
+                        "Method " + method.getName() + "() should be static");
+            }
+            if (!Modifier.isPublic(method.getModifiers())) {
+                throw new IllegalStateException(
+                        "Method " + method.getName() + "() should be public");
+            }
+        });
     }
 
     private void runAnnotatedMethods(
             TestClass testClass, Class<? extends Annotation> annotation) throws Throwable {
-
-        List<FrameworkMethod> methods = new ArrayList<>(testClass.getAnnotatedMethods(annotation));
-        Collections.reverse(methods);
-        for (FrameworkMethod method : methods) {
-            try {
-                method.invokeExplosively(testClass.getJavaClass());
-            } catch (InvocationTargetException e) {
-                throw e.getCause();
+        mLogger.method(Throwable.class, "runAnnotatedMethods", testClass, annotation, () -> {
+            List<FrameworkMethod> methods = new ArrayList<>(
+                    testClass.getAnnotatedMethods(annotation));
+            Collections.reverse(methods);
+            for (FrameworkMethod method : methods) {
+                try {
+                    method.invokeExplosively(testClass.getJavaClass());
+                } catch (InvocationTargetException e) {
+                    throw e.getCause();
+                }
             }
-        }
+        });
     }
 
     private void requireRunOnUser(String[] userTypes, OptionalBoolean switchedToUser) {
-        UserReference instrumentedUser = TestApis.users().instrumented();
+        mLogger.method("requireRunOnUser", userTypes, switchedToUser, () -> {
+            UserReference instrumentedUser = TestApis.users().instrumented();
 
-        assumeTrue("This test only runs on users of type " + Arrays.toString(userTypes),
-                Arrays.stream(userTypes).anyMatch(i -> i.equals(instrumentedUser.type().name())));
+            assumeTrue("This test only runs on users of type " + Arrays.toString(userTypes),
+                    Arrays.stream(userTypes).anyMatch(
+                            i -> i.equals(instrumentedUser.type().name())));
 
-        mUsers.put(instrumentedUser.type(), instrumentedUser);
+            mUsers.put(instrumentedUser.type(), instrumentedUser);
 
-        ensureSwitchedToUser(switchedToUser, instrumentedUser);
+            ensureSwitchedToUser(switchedToUser, instrumentedUser);
+        });
     }
 
     private void requireRunOnProfile(String userType,
             OptionalBoolean installInstrumentedAppInParent,
-            boolean hasProfileOwner, boolean dpcIsPrimary,
+            boolean hasProfileOwner, boolean dpcIsPrimary, boolean useParentInstance,
             OptionalBoolean switchedToParentUser, Set<String> affiliationIds) {
-        UserReference instrumentedUser = TestApis.users().instrumented();
+        mLogger.method("requireRunOnProfile", userType, installInstrumentedAppInParent,
+                hasProfileOwner, dpcIsPrimary, useParentInstance, switchedToParentUser,
+                affiliationIds, () -> {
+                    UserReference instrumentedUser = TestApis.users().instrumented();
 
-        assumeTrue("This test only runs on users of type " + userType,
-                instrumentedUser.type().name().equals(userType));
+                    assumeTrue("This test only runs on users of type " + userType,
+                            instrumentedUser.type().name().equals(userType));
 
-        if (!mProfiles.containsKey(instrumentedUser.type())) {
-            mProfiles.put(instrumentedUser.type(), new HashMap<>());
-        }
+                    if (!mProfiles.containsKey(instrumentedUser.type())) {
+                        mProfiles.put(instrumentedUser.type(), new HashMap<>());
+                    }
 
-        mProfiles.get(instrumentedUser.type()).put(instrumentedUser.parent(), instrumentedUser);
+                    mProfiles.get(instrumentedUser.type()).put(instrumentedUser.parent(),
+                            instrumentedUser);
 
-        if (installInstrumentedAppInParent.equals(OptionalBoolean.TRUE)) {
-            TestApis.packages().find(sContext.getPackageName()).installExisting(
-                    instrumentedUser.parent());
-        } else if (installInstrumentedAppInParent.equals(OptionalBoolean.FALSE)) {
-            TestApis.packages().find(sContext.getPackageName()).uninstall(
-                    instrumentedUser.parent());
-        }
+                    if (installInstrumentedAppInParent.equals(OptionalBoolean.TRUE)) {
+                        TestApis.packages().find(sContext.getPackageName()).installExisting(
+                                instrumentedUser.parent());
+                    } else if (installInstrumentedAppInParent.equals(OptionalBoolean.FALSE)) {
+                        TestApis.packages().find(sContext.getPackageName()).uninstall(
+                                instrumentedUser.parent());
+                    }
 
-        if (hasProfileOwner) {
-            ensureHasProfileOwner(instrumentedUser, dpcIsPrimary, affiliationIds);
-        } else {
-            ensureHasNoProfileOwner(instrumentedUser);
-        }
+                    if (hasProfileOwner) {
+                        ensureHasProfileOwner(
+                                instrumentedUser, dpcIsPrimary, useParentInstance, affiliationIds);
+                    } else {
+                        ensureHasNoProfileOwner(instrumentedUser);
+                    }
 
-        ensureSwitchedToUser(switchedToParentUser, instrumentedUser.parent());
+                    ensureSwitchedToUser(switchedToParentUser, instrumentedUser.parent());
+                });
     }
 
     private void ensureSwitchedToUser(OptionalBoolean switchedtoUser, UserReference user) {
-        if (switchedtoUser.equals(OptionalBoolean.TRUE)) {
-            switchToUser(user);
-        } else if (switchedtoUser.equals(OptionalBoolean.FALSE)) {
-            switchFromUser(user);
-        }
+        mLogger.method("ensureSwitchedToUser", switchedtoUser, user, () -> {
+            if (switchedtoUser.equals(OptionalBoolean.TRUE)) {
+                switchToUser(user);
+            } else if (switchedtoUser.equals(OptionalBoolean.FALSE)) {
+                switchFromUser(user);
+            }
+        });
     }
 
     private void requireFeature(String feature, FailureMode failureMode) {
-        checkFailOrSkip("Device must have feature " + feature,
-                TestApis.packages().features().contains(feature), failureMode);
+        mLogger.method("requireFeature", feature, failureMode, () -> {
+            checkFailOrSkip("Device must have feature " + feature,
+                    TestApis.packages().features().contains(feature), failureMode);
+        });
     }
 
     private void requireDoesNotHaveFeature(String feature, FailureMode failureMode) {
-        checkFailOrSkip("Device must not have feature " + feature,
-                !TestApis.packages().features().contains(feature), failureMode);
+        mLogger.method("requireDoesNotHaveFeature", feature, failureMode, () -> {
+            checkFailOrSkip("Device must not have feature " + feature,
+                    !TestApis.packages().features().contains(feature), failureMode);
+        });
     }
 
-    private void requireNoGmsInstrumentation() {
-        boolean instrumentingGms =
-                TestApis.context().instrumentedContext().getPackageName().equals(GMS_PKG);
+    private void requireNoPermissionsInstrumentation(String reason) {
+        mLogger.method("requireNoPermissionsInstrumentation", reason, () -> {
+            boolean instrumentingPermissions =
+                    TestApis.context()
+                            .instrumentedContext().getPackageName()
+                            .equals(mPermissionsInstrumentationPackage);
 
-        checkFailOrSkip(
-                "This test never runs using gms instrumentation",
-                !instrumentingGms,
-                FailureMode.SKIP
-        );
+            checkFailOrSkip(
+                    "This test never runs using permissions instrumentation on this version"
+                            + " of Android: " + reason,
+                    !instrumentingPermissions,
+                    FailureMode.SKIP
+            );
+        });
     }
 
-    private void requireGmsInstrumentation(int min, int max) {
-        mHasRequireGmsInstrumentation = true;
-        boolean instrumentingGms =
-                TestApis.context().instrumentedContext().getPackageName().equals(GMS_PKG);
+    private void requirePermissionsInstrumentation(String reason) {
+        mLogger.method("requirePermissionsInstrumentation", reason, () -> {
+            mHasRequirePermissionInstrumentation = true;
+            boolean instrumentingPermissions =
+                    TestApis.context()
+                            .instrumentedContext().getPackageName()
+                            .equals(mPermissionsInstrumentationPackage);
 
-        if (meetsSdkVersionRequirements(min, max)) {
             checkFailOrSkip(
-                    "For SDK versions between " + min +  " and " + max
-                            + " (inclusive), this test only runs when using gms instrumentation",
-                    instrumentingGms,
+                    "This test only runs when using permissions instrumentation on this"
+                            + " version of Android: " + reason,
+                    instrumentingPermissions,
                     FailureMode.SKIP
             );
-        } else {
+        });
+    }
+
+    private void requireTargetSdkVersion(
+            int min, int max, FailureMode failureMode) {
+        mLogger.method("requireTargetSdkVersion", min, max, failureMode, () -> {
+            int targetSdkVersion = TestApis.packages().instrumented().targetSdkVersion();
+
             checkFailOrSkip(
-                    "For SDK versions between " + min +  " and " + max
-                            + " (inclusive), this test only runs when not using gms "
-                            + "instrumentation",
-                    !instrumentingGms,
-                    FailureMode.SKIP
+                    "TargetSdkVersion must be between " + min + " and " + max
+                            + " (inclusive) (version is " + targetSdkVersion + ")",
+                    min <= targetSdkVersion && max >= targetSdkVersion,
+                    failureMode
             );
-        }
+        });
     }
 
     private void requireSdkVersion(int min, int max, FailureMode failureMode) {
-        requireSdkVersion(min, max, failureMode,
-                "Sdk version must be between " + min +  " and " + max + " (inclusive)");
+        mLogger.method("requireSdkVersion", min, max, failureMode, () -> {
+            requireSdkVersion(min, max, failureMode,
+                    "Sdk version must be between " + min + " and " + max + " (inclusive)");
+        });
     }
 
     private void requireSdkVersion(
             int min, int max, FailureMode failureMode, String failureMessage) {
-        mMinSdkVersionCurrentTest = min;
-        checkFailOrSkip(
-                failureMessage + " (version is " + Build.VERSION.SDK_INT + ")",
-                meetsSdkVersionRequirements(min, max),
-                failureMode
-        );
+        mLogger.method("requireSdkVersion", min, max, failureMode, failureMessage, () -> {
+            mMinSdkVersionCurrentTest = min;
+            checkFailOrSkip(
+                    failureMessage + " (version is " + SDK_INT + ")",
+                    meetsSdkVersionRequirements(min, max),
+                    failureMode
+            );
+        });
     }
 
     private com.android.bedstead.nene.users.UserType requireUserSupported(
             String userType, FailureMode failureMode) {
-        com.android.bedstead.nene.users.UserType resolvedUserType =
-                TestApis.users().supportedType(userType);
+        return mLogger.method("requireUserSupported", userType, failureMode, () -> {
+            com.android.bedstead.nene.users.UserType resolvedUserType =
+                    TestApis.users().supportedType(userType);
 
-        checkFailOrSkip(
-                "Device must support user type " + userType
-                + " only supports: " + TestApis.users().supportedTypes(),
-                resolvedUserType != null, failureMode);
+            checkFailOrSkip(
+                    "Device must support user type " + userType
+                            + " only supports: " + TestApis.users().supportedTypes(),
+                    resolvedUserType != null, failureMode);
 
-        return resolvedUserType;
+            return resolvedUserType;
+        });
     }
 
     private void checkFailOrSkip(String message, boolean value, FailureMode failureMode) {
-        if (failureMode.equals(FailureMode.FAIL)) {
-            assertWithMessage(message).that(value).isTrue();
-        } else if (failureMode.equals(FailureMode.SKIP)) {
-            assumeTrue(message, value);
-        } else {
-            throw new IllegalStateException("Unknown failure mode: " + failureMode);
-        }
+        mLogger.method("checkFailOrSkip", message, value, failureMode, () -> {
+            if (failureMode.equals(FailureMode.FAIL)) {
+                assertWithMessage(message).that(value).isTrue();
+            } else if (failureMode.equals(FailureMode.SKIP)) {
+                assumeTrue(message, value);
+            } else {
+                throw new IllegalStateException("Unknown failure mode: " + failureMode);
+            }
+        });
     }
 
     private void failOrSkip(String message, FailureMode failureMode) {
-        if (failureMode.equals(FailureMode.FAIL)) {
-            throw new AssertionError(message);
-        } else if (failureMode.equals(FailureMode.SKIP)) {
-            throw new AssumptionViolatedException(message);
-        } else {
-            throw new IllegalStateException("Unknown failure mode: " + failureMode);
-        }
-    }
-
-    public enum UserType {
-        /** Only to be used with annotations. */
-        ANY,
-        SYSTEM_USER,
-        CURRENT_USER,
-        PRIMARY_USER,
-        SECONDARY_USER,
-        WORK_PROFILE,
-        TV_PROFILE,
+        mLogger.method("failOrSkip", message, failureMode, () -> {
+            if (failureMode.equals(FailureMode.FAIL)) {
+                throw new AssertionError(message);
+            } else if (failureMode.equals(FailureMode.SKIP)) {
+                throw new AssumptionViolatedException(message);
+            } else {
+                throw new IllegalStateException("Unknown failure mode: " + failureMode);
+            }
+        });
     }
 
     private static final String LOG_TAG = "DeviceState";
@@ -902,18 +1208,24 @@
             mProfiles = new HashMap<>();
     private DevicePolicyController mDeviceOwner;
     private Map<UserReference, DevicePolicyController> mProfileOwners = new HashMap<>();
+    private RemotePolicyManager mDelegateDpc;
     private RemotePolicyManager mPrimaryPolicyManager;
+    private UserType mOtherUserType;
 
     private final List<UserReference> mCreatedUsers = new ArrayList<>();
     private final List<UserBuilder> mRemovedUsers = new ArrayList<>();
+    private final List<UserReference> mUsersSetPasswords = new ArrayList<>();
     private final List<BlockingBroadcastReceiver> mRegisteredBroadcastReceivers = new ArrayList<>();
     private boolean mHasChangedDeviceOwner = false;
     private DevicePolicyController mOriginalDeviceOwner;
     private Map<UserReference, DevicePolicyController> mChangedProfileOwners = new HashMap<>();
     private UserReference mOriginalSwitchedUser;
+    private Boolean mOriginalBluetoothEnabled;
+    private TestAppProvider mTestAppProvider = new TestAppProvider();
+    private Map<String, TestAppInstance> mTestApps = new HashMap<>();
 
     /**
-     * Get the {@link UserReference} of the work profile for the current user.
+     * Get the {@link UserReference} of the work profile for the primary user.
      *
      * <p>If the current user is a work profile, then the current user will be returned.
      *
@@ -923,7 +1235,10 @@
      * @throws IllegalStateException if there is no harrier-managed work profile
      */
     public UserReference workProfile() {
-        return workProfile(/* forUser= */ UserType.CURRENT_USER);
+        return mLogger.method("workProfile", () -> {
+            // Work profiles are currently only supported on the primary user
+            return workProfile(/* forUser= */ UserType.PRIMARY_USER);
+        });
     }
 
     /**
@@ -935,7 +1250,9 @@
      * @throws IllegalStateException if there is no harrier-managed work profile for the given user
      */
     public UserReference workProfile(UserType forUser) {
-        return workProfile(resolveUserTypeToUser(forUser));
+        return mLogger.method("workProfile", forUser, () -> {
+            return workProfile(resolveUserTypeToUser(forUser));
+        });
     }
 
     /**
@@ -947,7 +1264,9 @@
      * @throws IllegalStateException if there is no harrier-managed work profile for the given user
      */
     public UserReference workProfile(UserReference forUser) {
-        return profile(MANAGED_PROFILE_TYPE_NAME, forUser);
+        return mLogger.method("workProfile", forUser, () -> {
+            return profile(MANAGED_PROFILE_TYPE_NAME, forUser);
+        });
     }
 
     /**
@@ -959,7 +1278,9 @@
      * @throws IllegalStateException if there is no harrier-managed profile for the given user
      */
     public UserReference profile(String profileType, UserType forUser) {
-        return profile(profileType, resolveUserTypeToUser(forUser));
+        return mLogger.method("profile", profileType, forUser, () -> {
+            return profile(profileType, resolveUserTypeToUser(forUser));
+        });
     }
 
     /**
@@ -974,7 +1295,9 @@
      * @throws IllegalStateException if there is no harrier-managed profile
      */
     public UserReference profile(String profileType) {
-        return profile(profileType, /* forUser= */ UserType.CURRENT_USER);
+        return mLogger.method("profile", profileType, () -> {
+            return profile(profileType, /* forUser= */ UserType.INSTRUMENTED_USER);
+        });
     }
 
     /**
@@ -986,15 +1309,17 @@
      * @throws IllegalStateException if there is no harrier-managed profile for the given user
      */
     public UserReference profile(String profileType, UserReference forUser) {
-        com.android.bedstead.nene.users.UserType resolvedUserType =
-                TestApis.users().supportedType(profileType);
+        return mLogger.method("profile", profileType, forUser, () -> {
+            com.android.bedstead.nene.users.UserType resolvedUserType =
+                    TestApis.users().supportedType(profileType);
 
-        if (resolvedUserType == null) {
-            throw new IllegalStateException("Can not have a profile of type " + profileType
-                    + " as they are not supported on this device");
-        }
+            if (resolvedUserType == null) {
+                throw new IllegalStateException("Can not have a profile of type " + profileType
+                        + " as they are not supported on this device");
+            }
 
-        return profile(resolvedUserType, forUser);
+            return profile(resolvedUserType, forUser);
+        });
     }
 
     /**
@@ -1007,26 +1332,29 @@
      */
     public UserReference profile(
             com.android.bedstead.nene.users.UserType userType, UserReference forUser) {
-        if (userType == null || forUser == null) {
-            throw new NullPointerException();
-        }
-
-        if (!mProfiles.containsKey(userType) || !mProfiles.get(userType).containsKey(forUser)) {
-            UserReference parentUser = TestApis.users().instrumented().parent();
-
-            if (parentUser != null) {
-                if (mProfiles.containsKey(userType)
-                        && mProfiles.get(userType).containsKey(parentUser)) {
-                    return mProfiles.get(userType).get(parentUser);
-                }
+        return mLogger.method("profile", userType, forUser, () -> {
+            if (userType == null || forUser == null) {
+                throw new NullPointerException();
             }
 
-            throw new IllegalStateException(
-                    "No harrier-managed profile of type " + userType + ". This method should only"
-                            + " be used when Harrier has been used to create the profile.");
-        }
+            if (!mProfiles.containsKey(userType) || !mProfiles.get(userType).containsKey(forUser)) {
+                UserReference parentUser = TestApis.users().instrumented().parent();
 
-        return mProfiles.get(userType).get(forUser);
+                if (parentUser != null) {
+                    if (mProfiles.containsKey(userType)
+                            && mProfiles.get(userType).containsKey(parentUser)) {
+                        return mProfiles.get(userType).get(parentUser);
+                    }
+                }
+
+                throw new IllegalStateException(
+                        "No harrier-managed profile of type " + userType
+                                + ". This method should only"
+                                + " be used when Harrier has been used to create the profile.");
+            }
+
+            return mProfiles.get(userType).get(forUser);
+        });
     }
 
     /**
@@ -1038,7 +1366,8 @@
      * @throws IllegalStateException if there is no harrier-managed tv profile
      */
     public UserReference tvProfile() {
-        return tvProfile(/* forUser= */ UserType.CURRENT_USER);
+        return mLogger.method("tvProfile", () ->
+                tvProfile(/* forUser= */ UserType.INSTRUMENTED_USER));
     }
 
     /**
@@ -1050,7 +1379,8 @@
      * @throws IllegalStateException if there is no harrier-managed tv profile
      */
     public UserReference tvProfile(UserType forUser) {
-        return tvProfile(resolveUserTypeToUser(forUser));
+        return mLogger.method("tvProfile", forUser, () ->
+                tvProfile(resolveUserTypeToUser(forUser)));
     }
 
     /**
@@ -1062,16 +1392,18 @@
      * @throws IllegalStateException if there is no harrier-managed tv profile
      */
     public UserReference tvProfile(UserReference forUser) {
-        return profile(TV_PROFILE_TYPE_NAME, forUser);
+        return mLogger.method("tvProfile", forUser, () ->
+                profile(TV_PROFILE_TYPE_NAME, forUser));
     }
 
     /**
      * Get the user ID of the first human user on the device.
      */
     public UserReference primaryUser() {
-        return TestApis.users().all()
-                .stream().filter(UserReference::isPrimary).findFirst()
-                .orElseThrow(IllegalStateException::new);
+        return mLogger.method("primaryUser", () ->
+                TestApis.users().all()
+                        .stream().filter(UserReference::isPrimary).findFirst()
+                        .orElseThrow(IllegalStateException::new));
     }
 
     /**
@@ -1083,7 +1415,22 @@
      * @throws IllegalStateException if there is no harrier-managed secondary user
      */
     public UserReference secondaryUser() {
-        return user(SECONDARY_USER_TYPE_NAME);
+        return mLogger.method("secondaryUser", () -> user(SECONDARY_USER_TYPE_NAME));
+    }
+
+    /**
+     * Get the user marked as "other" by use of the {@code @OtherUser} annotation.
+     *
+     * @throws IllegalStateException if there is no "other" user
+     */
+    public UserReference otherUser() {
+        return mLogger.method("otherUser", () -> {
+            if (mOtherUserType == null) {
+                throw new IllegalStateException("No other user specified. Use @OtherUser");
+            }
+
+            return resolveUserTypeToUser(mOtherUserType);
+        });
     }
 
     /**
@@ -1095,15 +1442,17 @@
      * @throws IllegalStateException if there is no harrier-managed user of the correct type
      */
     public UserReference user(String userType) {
-        com.android.bedstead.nene.users.UserType resolvedUserType =
-                TestApis.users().supportedType(userType);
+        return mLogger.method("user", userType, () -> {
+            com.android.bedstead.nene.users.UserType resolvedUserType =
+                    TestApis.users().supportedType(userType);
 
-        if (resolvedUserType == null) {
-            throw new IllegalStateException("Can not have a user of type " + userType
-                    + " as they are not supported on this device");
-        }
+            if (resolvedUserType == null) {
+                throw new IllegalStateException("Can not have a user of type " + userType
+                        + " as they are not supported on this device");
+            }
 
-        return user(resolvedUserType);
+            return user(resolvedUserType);
+        });
     }
 
     /**
@@ -1115,17 +1464,20 @@
      * @throws IllegalStateException if there is no harrier-managed user of the correct type
      */
     public UserReference user(com.android.bedstead.nene.users.UserType userType) {
-        if (userType == null) {
-            throw new NullPointerException();
-        }
+        return mLogger.method("user", userType, () -> {
+            if (userType == null) {
+                throw new NullPointerException();
+            }
 
-        if (!mUsers.containsKey(userType)) {
-            throw new IllegalStateException(
-                    "No harrier-managed user of type " + userType + ". This method should only be"
-                            + "used when Harrier has been used to create the user.");
-        }
+            if (!mUsers.containsKey(userType)) {
+                throw new IllegalStateException(
+                        "No harrier-managed user of type " + userType
+                                + ". This method should only be"
+                                + "used when Harrier has been used to create the user.");
+            }
 
-        return mUsers.get(userType);
+            return mUsers.get(userType);
+        });
     }
 
     private UserReference ensureHasProfile(
@@ -1134,134 +1486,154 @@
             UserType forUser,
             boolean hasProfileOwner,
             boolean profileOwnerIsPrimary,
+            boolean useParentInstance,
             OptionalBoolean switchedToParentUser) {
-        com.android.bedstead.nene.users.UserType resolvedUserType =
-                requireUserSupported(profileType, FailureMode.SKIP);
+        return mLogger.method("ensureHasProfile", profileType, installInstrumentedApp,
+                forUser, hasProfileOwner, profileOwnerIsPrimary, useParentInstance,
+                switchedToParentUser, () -> {
+                    com.android.bedstead.nene.users.UserType resolvedUserType =
+                            requireUserSupported(profileType, FailureMode.SKIP);
 
-        UserReference forUserReference = resolveUserTypeToUser(forUser);
+                    UserReference forUserReference = resolveUserTypeToUser(forUser);
 
-        UserReference profile =
-                TestApis.users().findProfileOfType(resolvedUserType, forUserReference);
-        if (profile == null) {
-            if (profileType.equals(MANAGED_PROFILE_TYPE_NAME)) {
-                // DO + work profile isn't a valid state
-                ensureHasNoDeviceOwner();
-            }
+                    UserReference profile =
+                            TestApis.users().findProfileOfType(resolvedUserType, forUserReference);
+                    if (profile == null) {
+                        if (profileType.equals(MANAGED_PROFILE_TYPE_NAME)) {
+                            // DO + work profile isn't a valid state
+                            ensureHasNoDeviceOwner();
+                        }
 
-            profile = createProfile(resolvedUserType, forUserReference);
-        }
+                        profile = createProfile(resolvedUserType, forUserReference);
+                    }
 
-        profile.start();
+                    profile.start();
 
-        if (installInstrumentedApp.equals(OptionalBoolean.TRUE)) {
-            TestApis.packages().find(sContext.getPackageName()).installExisting(profile);
-        } else if (installInstrumentedApp.equals(OptionalBoolean.FALSE)) {
-            TestApis.packages().find(sContext.getPackageName()).uninstall(profile);
-        }
+                    if (installInstrumentedApp.equals(OptionalBoolean.TRUE)) {
+                        TestApis.packages().find(sContext.getPackageName()).installExisting(
+                                profile);
+                    } else if (installInstrumentedApp.equals(OptionalBoolean.FALSE)) {
+                        TestApis.packages().find(sContext.getPackageName()).uninstall(profile);
+                    }
 
-        if (!mProfiles.containsKey(resolvedUserType)) {
-            mProfiles.put(resolvedUserType, new HashMap<>());
-        }
+                    if (!mProfiles.containsKey(resolvedUserType)) {
+                        mProfiles.put(resolvedUserType, new HashMap<>());
+                    }
 
-        mProfiles.get(resolvedUserType).put(forUserReference, profile);
+                    mProfiles.get(resolvedUserType).put(forUserReference, profile);
 
-        if (hasProfileOwner) {
-            ensureHasProfileOwner(profile, profileOwnerIsPrimary, /* affiliationIds= */ null);
-        }
+                    if (hasProfileOwner) {
+                        ensureHasProfileOwner(
+                                profile, profileOwnerIsPrimary,
+                                useParentInstance, /* affiliationIds= */
+                                null);
+                    }
 
-        ensureSwitchedToUser(switchedToParentUser, forUserReference);
+                    ensureSwitchedToUser(switchedToParentUser, forUserReference);
 
-        return profile;
+                    return profile;
+                });
     }
 
     private void ensureHasNoProfile(String profileType, UserType forUser) {
-        UserReference forUserReference = resolveUserTypeToUser(forUser);
-        com.android.bedstead.nene.users.UserType resolvedProfileType =
-                TestApis.users().supportedType(profileType);
+        mLogger.method("ensureHasNoProfile", profileType, forUser, () -> {
+            UserReference forUserReference = resolveUserTypeToUser(forUser);
+            com.android.bedstead.nene.users.UserType resolvedProfileType =
+                    TestApis.users().supportedType(profileType);
 
-        if (resolvedProfileType == null) {
-            // These profile types don't exist so there can't be any
-            return;
-        }
+            if (resolvedProfileType == null) {
+                // These profile types don't exist so there can't be any
+                return;
+            }
 
-        UserReference profile =
-                TestApis.users().findProfileOfType(
-                        resolvedProfileType,
-                        forUserReference);
-        if (profile != null) {
-            removeAndRecordUser(profile);
-        }
+            UserReference profile =
+                    TestApis.users().findProfileOfType(
+                            resolvedProfileType,
+                            forUserReference);
+            if (profile != null) {
+                removeAndRecordUser(profile);
+            }
+        });
     }
 
     private void ensureHasUser(
             String userType, OptionalBoolean installInstrumentedApp,
             OptionalBoolean switchedToUser) {
-        com.android.bedstead.nene.users.UserType resolvedUserType =
-                requireUserSupported(userType, FailureMode.SKIP);
+        mLogger.method("ensureHasUser", userType, installInstrumentedApp, switchedToUser, () -> {
+            com.android.bedstead.nene.users.UserType resolvedUserType =
+                    requireUserSupported(userType, FailureMode.SKIP);
 
-        Collection<UserReference> users = TestApis.users().findUsersOfType(resolvedUserType);
+            Collection<UserReference> users = TestApis.users().findUsersOfType(resolvedUserType);
 
-        UserReference user = users.isEmpty() ? createUser(resolvedUserType)
-                : users.iterator().next();
+            UserReference user = users.isEmpty() ? createUser(resolvedUserType)
+                    : users.iterator().next();
 
-        user.start();
+            user.start();
 
-        if (installInstrumentedApp.equals(OptionalBoolean.TRUE)) {
-            TestApis.packages().find(sContext.getPackageName()).installExisting(user);
-        } else if (installInstrumentedApp.equals(OptionalBoolean.FALSE)) {
-            TestApis.packages().find(sContext.getPackageName()).uninstall(user);
-        }
+            if (installInstrumentedApp.equals(OptionalBoolean.TRUE)) {
+                TestApis.packages().find(sContext.getPackageName()).installExisting(user);
+            } else if (installInstrumentedApp.equals(OptionalBoolean.FALSE)) {
+                TestApis.packages().find(sContext.getPackageName()).uninstall(user);
+            }
 
-        ensureSwitchedToUser(switchedToUser, user);
+            ensureSwitchedToUser(switchedToUser, user);
 
-        mUsers.put(resolvedUserType, user);
+            mUsers.put(resolvedUserType, user);
+        });
     }
 
     /**
      * Ensure that there is no user of the given type.
      */
     private void ensureHasNoUser(String userType) {
-        com.android.bedstead.nene.users.UserType resolvedUserType =
-                TestApis.users().supportedType(userType);
+        mLogger.method("ensureHasNoUser", userType, () -> {
+            com.android.bedstead.nene.users.UserType resolvedUserType =
+                    TestApis.users().supportedType(userType);
 
-        if (resolvedUserType == null) {
-            // These user types don't exist so there can't be any
-            return;
-        }
-
-        for (UserReference secondaryUser : TestApis.users().findUsersOfType(resolvedUserType)) {
-            if (secondaryUser.equals(TestApis.users().instrumented())) {
-                throw new AssumptionViolatedException(
-                        "This test only runs on devices without a "
-                                + userType + " user. But the instrumented user is " + userType);
+            if (resolvedUserType == null) {
+                // These user types don't exist so there can't be any
+                return;
             }
-            removeAndRecordUser(secondaryUser);
-        }
+
+            for (UserReference secondaryUser : TestApis.users().findUsersOfType(resolvedUserType)) {
+                if (secondaryUser.equals(TestApis.users().instrumented())) {
+                    throw new AssumptionViolatedException(
+                            "This test only runs on devices without a "
+                                    + userType + " user. But the instrumented user is " + userType);
+                }
+                removeAndRecordUser(secondaryUser);
+            }
+        });
     }
 
     private void removeAndRecordUser(UserReference userReference) {
-        if (userReference == null) {
-            return; // Nothing to remove
-        }
+        mLogger.method("removeAndRecordUser", userReference, () -> {
+            if (userReference == null) {
+                return; // Nothing to remove
+            }
 
-        switchFromUser(userReference);
+            switchFromUser(userReference);
 
-        if (!mCreatedUsers.remove(userReference)) {
-            mRemovedUsers.add(TestApis.users().createUser()
-                    .name(userReference.name())
-                    .type(userReference.type())
-                    .parent(userReference.parent()));
-        }
+            if (!mCreatedUsers.remove(userReference)) {
+                mRemovedUsers.add(TestApis.users().createUser()
+                        .name(userReference.name())
+                        .type(userReference.type())
+                        .parent(userReference.parent()));
+            }
 
-        userReference.remove();
+            userReference.remove();
+        });
     }
 
     public void requireCanSupportAdditionalUser() {
-        int maxUsers = getMaxNumberOfUsersSupported();
-        int currentUsers = TestApis.users().all().size();
+        mLogger.method("requireCanSupportadditionalUser", () -> {
+            int maxUsers = getMaxNumberOfUsersSupported();
+            int currentUsers = TestApis.users().all().size();
 
-        assumeTrue("The device does not have space for an additional user (" + currentUsers +
-                " current users, " + maxUsers + " max users)", currentUsers + 1 <= maxUsers);
+            assumeTrue("The device does not have space for an additional user ("
+                            + currentUsers + " current users, " + maxUsers + " max users)",
+                    currentUsers + 1 <= maxUsers);
+        });
     }
 
     /**
@@ -1269,7 +1641,8 @@
      * test has run.
      */
     public BlockingBroadcastReceiver registerBroadcastReceiver(String action) {
-        return registerBroadcastReceiver(action, /* checker= */ null);
+        return mLogger.method("registerBroadcastReceiver", action, () ->
+                registerBroadcastReceiver(action, /* checker= */ null));
     }
 
     /**
@@ -1278,399 +1651,596 @@
      */
     public BlockingBroadcastReceiver registerBroadcastReceiver(
             String action, Function<Intent, Boolean> checker) {
-        BlockingBroadcastReceiver broadcastReceiver =
-                new BlockingBroadcastReceiver(mContext, action, checker);
-        broadcastReceiver.register();
-        mRegisteredBroadcastReceivers.add(broadcastReceiver);
+        return mLogger.method("registerBroadcastReceiver", action, checker, () -> {
+            BlockingBroadcastReceiver broadcastReceiver =
+                    new BlockingBroadcastReceiver(mContext, action, checker);
+            broadcastReceiver.register();
+            mRegisteredBroadcastReceivers.add(broadcastReceiver);
 
-        return broadcastReceiver;
+            return broadcastReceiver;
+        });
+    }
+
+    /**
+     * Create and register a {@link BlockingBroadcastReceiver} which will be unregistered after the
+     * test has run.
+     */
+    public BlockingBroadcastReceiver registerBroadcastReceiverForUser(
+            UserReference user, String action) {
+        return mLogger.method("registerBroadcastReceiverForUser", user, action,
+                () -> registerBroadcastReceiverForUser(user, action, /* checker= */ null));
+    }
+
+    /**
+     * Create and register a {@link BlockingBroadcastReceiver} which will be unregistered after the
+     * test has run.
+     */
+    public BlockingBroadcastReceiver registerBroadcastReceiverForUser(
+            UserReference user, String action, Function<Intent, Boolean> checker) {
+        return mLogger.method("registerBroadcastReceiverForUser", user, action, checker, () -> {
+            try (PermissionContext p =
+                         TestApis.permissions().withPermission(INTERACT_ACROSS_USERS_FULL)) {
+                BlockingBroadcastReceiver broadcastReceiver =
+                        new BlockingBroadcastReceiver(
+                                TestApis.context().androidContextAsUser(user), action, checker);
+                broadcastReceiver.register();
+                mRegisteredBroadcastReceivers.add(broadcastReceiver);
+
+                return broadcastReceiver;
+            }
+        });
+    }
+
+    /**
+     * Create and register a {@link BlockingBroadcastReceiver} which will be unregistered after the
+     * test has run.
+     */
+    public BlockingBroadcastReceiver registerBroadcastReceiverForAllUsers(String action) {
+        return mLogger.method("registerBroadcastReceiverForAllUsers", action,
+                () -> registerBroadcastReceiverForAllUsers(action, /* checker= */ null));
+    }
+
+    /**
+     * Create and register a {@link BlockingBroadcastReceiver} which will be unregistered after the
+     * test has run.
+     */
+    public BlockingBroadcastReceiver registerBroadcastReceiverForAllUsers(
+            String action, Function<Intent, Boolean> checker) {
+        return mLogger.method("registerBroadcastReceiverForAllUsers", () -> {
+            try (PermissionContext p =
+                         TestApis.permissions().withPermission(INTERACT_ACROSS_USERS_FULL)) {
+                BlockingBroadcastReceiver broadcastReceiver =
+                        new BlockingBroadcastReceiver(mContext, action, checker);
+                broadcastReceiver.registerForAllUsers();
+
+                mRegisteredBroadcastReceivers.add(broadcastReceiver);
+
+                return broadcastReceiver;
+            }
+        });
     }
 
     private UserReference resolveUserTypeToUser(UserType userType) {
-        switch (userType) {
-            case SYSTEM_USER:
-                return TestApis.users().system();
-            case CURRENT_USER:
-                return TestApis.users().instrumented();
-            case PRIMARY_USER:
-                return primaryUser();
-            case SECONDARY_USER:
-                return secondaryUser();
-            case WORK_PROFILE:
-                return workProfile();
-            case TV_PROFILE:
-                return tvProfile();
-            case ANY:
-                throw new IllegalStateException("ANY UserType can not be used here");
-            default:
-                throw new IllegalArgumentException("Unknown user type " + userType);
-        }
+        return mLogger.method("resolveUserTypeToUser", userType, () -> {
+            switch (userType) {
+                case SYSTEM_USER:
+                    return TestApis.users().system();
+                case INSTRUMENTED_USER:
+                    return TestApis.users().instrumented();
+                case CURRENT_USER:
+                    return TestApis.users().current();
+                case PRIMARY_USER:
+                    return primaryUser();
+                case SECONDARY_USER:
+                    return secondaryUser();
+                case WORK_PROFILE:
+                    return workProfile();
+                case TV_PROFILE:
+                    return tvProfile();
+                case DPC_USER:
+                    return dpc().user();
+                case ANY:
+                    throw new IllegalStateException("ANY UserType can not be used here");
+                default:
+                    throw new IllegalArgumentException("Unknown user type " + userType);
+            }
+        });
     }
 
     private void teardownNonShareableState() {
-        mProfiles.clear();
-        mUsers.clear();
+        mLogger.method("teardownNonShareableState", () -> {
+            mProfiles.clear();
+            mUsers.clear();
 
-        for (BlockingBroadcastReceiver broadcastReceiver : mRegisteredBroadcastReceivers) {
-            broadcastReceiver.unregisterQuietly();
-        }
-        mRegisteredBroadcastReceivers.clear();
-        mPrimaryPolicyManager = null;
+            for (BlockingBroadcastReceiver broadcastReceiver : mRegisteredBroadcastReceivers) {
+                broadcastReceiver.unregisterQuietly();
+            }
+            mRegisteredBroadcastReceivers.clear();
+            mDelegateDpc = null;
+            mPrimaryPolicyManager = null;
+            mOtherUserType = null;
+            mTestApps.clear();
+
+            mTestAppProvider.restore();
+        });
     }
 
     private Set<TestAppInstance> mInstalledTestApps = new HashSet<>();
     private Set<TestAppInstance> mUninstalledTestApps = new HashSet<>();
 
     private void teardownShareableState() {
-        if (mOriginalSwitchedUser != null) {
-            if (!mOriginalSwitchedUser.exists()) {
-                Log.d(LOG_TAG, "Could not switch back to original user "
-                        + mOriginalSwitchedUser
-                        + " as it does not exist. Switching to initial instead.");
-                TestApis.users().initial().switchTo();
-            } else {
-                mOriginalSwitchedUser.switchTo();
-            }
-            mOriginalSwitchedUser = null;
-        }
-
-        if (mHasChangedDeviceOwner) {
-            if (mOriginalDeviceOwner == null) {
-                if (mDeviceOwner != null) {
-                    mDeviceOwner.remove();
+        mLogger.method("teardownShareableState", () -> {
+            if (mOriginalSwitchedUser != null) {
+                if (!mOriginalSwitchedUser.exists()) {
+                    Log.d(LOG_TAG, "Could not switch back to original user "
+                            + mOriginalSwitchedUser
+                            + " as it does not exist. Switching to initial instead.");
+                    TestApis.users().initial().switchTo();
+                } else {
+                    mOriginalSwitchedUser.switchTo();
                 }
-            } else if (!mOriginalDeviceOwner.equals(mDeviceOwner)) {
-                mDeviceOwner.remove();
-                TestApis.devicePolicy().setDeviceOwner(
-                        mOriginalDeviceOwner.componentName());
-            }
-            mHasChangedDeviceOwner = false;
-            mOriginalDeviceOwner = null;
-        }
-
-        for (Map.Entry<UserReference, DevicePolicyController> originalProfileOwner :
-                mChangedProfileOwners.entrySet()) {
-
-            ProfileOwner currentProfileOwner =
-                    TestApis.devicePolicy().getProfileOwner(originalProfileOwner.getKey());
-
-            if (Objects.equal(currentProfileOwner, originalProfileOwner.getValue())) {
-                continue; // No need to restore
+                mOriginalSwitchedUser = null;
             }
 
-            if (currentProfileOwner != null) {
-                currentProfileOwner.remove();
+            if (mHasChangedDeviceOwner) {
+                if (mOriginalDeviceOwner == null) {
+                    if (mDeviceOwner != null) {
+                        mDeviceOwner.remove();
+                    }
+                } else if (!mOriginalDeviceOwner.equals(mDeviceOwner)) {
+                    if (mDeviceOwner != null) {
+                        mDeviceOwner.remove();
+                    }
+                    TestApis.devicePolicy().setDeviceOwner(
+                            mOriginalDeviceOwner.componentName());
+                }
+                mHasChangedDeviceOwner = false;
+                mOriginalDeviceOwner = null;
             }
 
-            if (originalProfileOwner.getValue() != null) {
-                TestApis.devicePolicy().setProfileOwner(originalProfileOwner.getKey(),
-                        originalProfileOwner.getValue().componentName());
+            for (Map.Entry<UserReference, DevicePolicyController> originalProfileOwner :
+                    mChangedProfileOwners.entrySet()) {
+
+                ProfileOwner currentProfileOwner =
+                        TestApis.devicePolicy().getProfileOwner(originalProfileOwner.getKey());
+
+                if (Objects.equal(currentProfileOwner, originalProfileOwner.getValue())) {
+                    continue; // No need to restore
+                }
+
+                if (currentProfileOwner != null) {
+                    currentProfileOwner.remove();
+                }
+
+                if (originalProfileOwner.getValue() != null) {
+                    TestApis.devicePolicy().setProfileOwner(originalProfileOwner.getKey(),
+                            originalProfileOwner.getValue().componentName());
+                }
             }
-        }
-        mChangedProfileOwners.clear();
+            mChangedProfileOwners.clear();
 
-        for (UserReference user : mCreatedUsers) {
-            user.remove();
-        }
+            for (UserReference user : mUsersSetPasswords) {
+                if (mCreatedUsers.contains(user)) {
+                    continue; // Will be removed anyway
+                }
+                user.clearPassword();
+            }
 
-        mCreatedUsers.clear();
+            mUsersSetPasswords.clear();
 
-        for (UserBuilder userBuilder : mRemovedUsers) {
-            userBuilder.create();
-        }
+            for (UserReference user : mCreatedUsers) {
+                user.remove();
+            }
 
-        mRemovedUsers.clear();
+            mCreatedUsers.clear();
 
-        for (TestAppInstance installedTestApp : mInstalledTestApps) {
-            installedTestApp.uninstall();
-        }
-        mInstalledTestApps.clear();
+            for (UserBuilder userBuilder : mRemovedUsers) {
+                userBuilder.create();
+            }
 
-        for (TestAppInstance uninstalledTestApp : mUninstalledTestApps) {
-            uninstalledTestApp.testApp().install(uninstalledTestApp.user());
-        }
-        mUninstalledTestApps.clear();
+            mRemovedUsers.clear();
+
+            for (TestAppInstance installedTestApp : mInstalledTestApps) {
+                installedTestApp.uninstall();
+            }
+            mInstalledTestApps.clear();
+
+            for (TestAppInstance uninstalledTestApp : mUninstalledTestApps) {
+                uninstalledTestApp.testApp().install(uninstalledTestApp.user());
+            }
+            mUninstalledTestApps.clear();
+
+            if (mOriginalBluetoothEnabled != null) {
+                TestApis.bluetooth().setEnabled(mOriginalBluetoothEnabled);
+                mOriginalBluetoothEnabled = null;
+            }
+        });
     }
 
     private UserReference createProfile(
             com.android.bedstead.nene.users.UserType profileType, UserReference parent) {
-        requireCanSupportAdditionalUser();
-        try {
-            UserReference user = TestApis.users().createUser()
-                    .parent(parent)
-                    .type(profileType)
-                    .createAndStart();
-            mCreatedUsers.add(user);
-            return user;
-        } catch (NeneException e) {
-            throw new IllegalStateException("Error creating profile of type " + profileType, e);
-        }
+        return mLogger.method("createProfile", profileType, parent, () -> {
+            requireCanSupportAdditionalUser();
+            try {
+                UserReference user = TestApis.users().createUser()
+                        .parent(parent)
+                        .type(profileType)
+                        .createAndStart();
+                mCreatedUsers.add(user);
+                return user;
+            } catch (NeneException e) {
+                throw new IllegalStateException("Error creating profile of type " + profileType, e);
+            }
+        });
     }
 
     private UserReference createUser(com.android.bedstead.nene.users.UserType userType) {
-        requireCanSupportAdditionalUser();
-        try {
-            UserReference user = TestApis.users().createUser()
-                    .type(userType)
-                    .createAndStart();
-            mCreatedUsers.add(user);
-            return user;
-        } catch (NeneException e) {
-            throw new IllegalStateException("Error creating user of type " + userType, e);
-        }
+        return mLogger.method("createUser", userType, () -> {
+            requireCanSupportAdditionalUser();
+            try {
+                UserReference user = TestApis.users().createUser()
+                        .type(userType)
+                        .createAndStart();
+                mCreatedUsers.add(user);
+                return user;
+            } catch (NeneException e) {
+                throw new IllegalStateException("Error creating user of type " + userType, e);
+            }
+        });
     }
 
     private int getMaxNumberOfUsersSupported() {
-        try {
-            return ShellCommand.builder("pm get-max-users")
-                    .validate((output) -> output.startsWith("Maximum supported users:"))
-                    .executeAndParseOutput(
-                            (output) -> Integer.parseInt(output.split(": ", 2)[1].trim()));
-        } catch (AdbException e) {
-            throw new IllegalStateException("Invalid command output", e);
-        }
+        return mLogger.method("getMaxNumberOfUsersSupported", () -> {
+            try {
+                return ShellCommand.builder("pm get-max-users")
+                        .validate((output) -> output.startsWith("Maximum supported users:"))
+                        .executeAndParseOutput(
+                                (output) -> Integer.parseInt(output.split(": ", 2)[1]
+                                        .trim()));
+            } catch (AdbException e) {
+                throw new IllegalStateException("Invalid command output", e);
+            }
+        });
     }
 
     private void ensureHasDelegate(
             EnsureHasDelegate.AdminType adminType, List<String> scopes, boolean isPrimary) {
-        RemotePolicyManager dpc = getDeviceAdmin(adminType);
+        mLogger.method("ensureHasDelegate", adminType, scopes, isPrimary, () -> {
+            RemotePolicyManager dpc = getDeviceAdmin(adminType);
 
+            boolean specifiesAdminType = adminType != EnsureHasDelegate.AdminType.PRIMARY;
+            boolean currentPrimaryPolicyManagerIsNotDelegator =
+                    !Objects.equal(mPrimaryPolicyManager, dpc);
 
-        boolean specifiesAdminType = adminType != EnsureHasDelegate.AdminType.PRIMARY;
-        boolean currentPrimaryPolicyManagerIsNotDelegator = mPrimaryPolicyManager != dpc;
+            if (isPrimary && mPrimaryPolicyManager != null
+                    && (specifiesAdminType || currentPrimaryPolicyManagerIsNotDelegator)) {
+                throw new IllegalStateException(
+                        "Only one DPC can be marked as primary per test (current primary is "
+                                + mPrimaryPolicyManager + ")");
+            }
 
-        if (isPrimary && mPrimaryPolicyManager != null
-                && (specifiesAdminType || currentPrimaryPolicyManagerIsNotDelegator)) {
-            throw new IllegalStateException(
-                    "Only one DPC can be marked as primary per test (current primary is "
-                            + mPrimaryPolicyManager + ")");
-        }
+            if (!dpc.user().equals(TestApis.users().instrumented())) {
+                // INTERACT_ACROSS_USERS_FULL is required for RemoteDPC
+                ensureCanGetPermission(INTERACT_ACROSS_USERS_FULL);
+            }
 
-        if (!dpc.user().equals(TestApis.users().instrumented())) {
-            // INTERACT_ACROSS_USERS_FULL is required for RemoteDPC
-            ensureCanGetPermission(INTERACT_ACROSS_USERS_FULL);
-        }
+            ensureTestAppInstalled(RemoteDelegate.sTestApp, dpc.user());
+            RemoteDelegate delegate = new RemoteDelegate(RemoteDelegate.sTestApp, dpc().user());
+            dpc.devicePolicyManager().setDelegatedScopes(
+                    dpc.componentName(), delegate.packageName(), scopes);
 
-        ensureTestAppInstalled(RemoteDelegate.sTestApp, dpc.user());
-        RemoteDelegate delegate = new RemoteDelegate(RemoteDelegate.sTestApp, dpc().user());
-        dpc.devicePolicyManager().setDelegatedScopes(
-                dpc.componentName(), delegate.packageName(), scopes);
-
-        if (isPrimary) {
-            mPrimaryPolicyManager = delegate;
-        }
+            if (isPrimary) {
+                mDelegateDpc = dpc;
+                mPrimaryPolicyManager = delegate;
+            }
+        });
     }
 
     private void ensureHasNoDelegate(EnsureHasNoDelegate.AdminType adminType) {
-        if (adminType == EnsureHasNoDelegate.AdminType.ANY) {
-            for (UserReference user : TestApis.users().all()) {
-                ensureTestAppNotInstalled(RemoteDelegate.sTestApp, user);
+        mLogger.method("ensureHasNoDelegate", adminType, () -> {
+            if (adminType == EnsureHasNoDelegate.AdminType.ANY) {
+                for (UserReference user : TestApis.users().all()) {
+                    ensureTestAppNotInstalled(RemoteDelegate.sTestApp, user);
+                }
+                return;
             }
-            return;
-        }
-        RemotePolicyManager dpc =
-                adminType == EnsureHasNoDelegate.AdminType.PRIMARY ? mPrimaryPolicyManager
-                : adminType == EnsureHasNoDelegate.AdminType.DEVICE_OWNER ? deviceOwner()
-                : adminType == EnsureHasNoDelegate.AdminType.PROFILE_OWNER ? profileOwner() : null;
-        if (dpc == null) {
-            throw new IllegalStateException("Unknown Admin Type " + adminType);
-        }
+            RemotePolicyManager dpc =
+                    adminType == EnsureHasNoDelegate.AdminType.PRIMARY ? mPrimaryPolicyManager
+                            : adminType == EnsureHasNoDelegate.AdminType.DEVICE_OWNER
+                                    ? deviceOwner()
+                                    : adminType == EnsureHasNoDelegate.AdminType.PROFILE_OWNER
+                                            ? profileOwner() : null;
+            if (dpc == null) {
+                throw new IllegalStateException("Unknown Admin Type " + adminType);
+            }
 
-        ensureTestAppNotInstalled(RemoteDelegate.sTestApp, dpc.user());
+            ensureTestAppNotInstalled(RemoteDelegate.sTestApp, dpc.user());
+        });
+    }
+
+    private void ensureTestAppInstalled(
+            String key, String packageName, UserType onUser, boolean isPrimary) {
+        mLogger.method("ensureTestAppInstalled", key, packageName, onUser, isPrimary, () -> {
+            TestApp testApp = mTestAppProvider.query()
+                    .wherePackageName().isEqualTo(packageName)
+                    .get();
+
+            TestAppInstance testAppInstance = ensureTestAppInstalled(
+                    testApp, resolveUserTypeToUser(onUser));
+
+            mTestApps.put(key, testAppInstance);
+
+            if (isPrimary) {
+                if (mPrimaryPolicyManager != null) {
+                    throw new IllegalStateException(
+                            "Only one DPC can be marked as primary per test (current primary is "
+                                    + mPrimaryPolicyManager + ")");
+                }
+
+                mPrimaryPolicyManager = new RemoteTestApp(testAppInstance);
+            }
+        });
+    }
+
+    private void ensureTestAppHasPermission(
+            String testAppKey, String[] permissions, int minVersion, int maxVersion) {
+        mLogger.method("ensureTestAppHasPermission", testAppKey, permissions, minVersion,
+                maxVersion, () -> {
+                    checkTestAppExistsWithKey(testAppKey);
+
+                    mTestApps.get(testAppKey).permissions()
+                            .withPermissionOnVersionBetween(minVersion, maxVersion, permissions);
+                });
+    }
+
+    private void ensureTestAppHasAppOp(
+            String testAppKey, String[] appOps, int minVersion, int maxVersion) {
+        mLogger.method("ensureTestAppHasAppOp", testAppKey, appOps, minVersion, maxVersion, () -> {
+            checkTestAppExistsWithKey(testAppKey);
+
+            mTestApps.get(testAppKey).permissions()
+                    .withAppOpOnVersionBetween(minVersion, maxVersion, appOps);
+        });
+    }
+
+    private void checkTestAppExistsWithKey(String testAppKey) {
+        if (!mTestApps.containsKey(testAppKey)) {
+            throw new NeneException(
+                    "No testapp with key " + testAppKey + ". Use @EnsureTestAppInstalled."
+                            + "Valid Test apps: " + mTestApps);
+        }
     }
 
     private RemotePolicyManager getDeviceAdmin(EnsureHasDelegate.AdminType adminType) {
-        switch (adminType) {
-            case DEVICE_OWNER:
-                return deviceOwner();
-            case PROFILE_OWNER:
-                return profileOwner();
-            case PRIMARY:
-                return dpc();
-            default:
-                throw new IllegalStateException("Unknown device admin type " + adminType);
-        }
+        return mLogger.method("getDeviceAdmin", adminType, () -> {
+            switch (adminType) {
+                case DEVICE_OWNER:
+                    return deviceOwner();
+                case PROFILE_OWNER:
+                    return profileOwner();
+                case PRIMARY:
+                    return dpc();
+                default:
+                    throw new IllegalStateException("Unknown device admin type " + adminType);
+            }
+        });
     }
 
-    private void ensureTestAppInstalled(TestApp testApp, UserReference user) {
-        if (TestApis.packages().find(testApp.packageName()).installedOnUser(user)) {
-            return;
-        }
+    private TestAppInstance ensureTestAppInstalled(TestApp testApp, UserReference user) {
+        return mLogger.method("ensureTestAppInstalled", testApp, user, () -> {
+            Package pkg = TestApis.packages().find(testApp.packageName());
+            if (pkg != null && TestApis.packages().find(testApp.packageName()).installedOnUser(
+                    user)) {
+                return testApp.instance(user);
+            }
 
-        mInstalledTestApps.add(testApp.install(user));
+            TestAppInstance testAppInstance = testApp.install(user);
+            mInstalledTestApps.add(testAppInstance);
+            return testAppInstance;
+        });
     }
 
     private void ensureTestAppNotInstalled(TestApp testApp, UserReference user) {
-        if (!TestApis.packages().find(testApp.packageName()).installedOnUser(user)) {
-            return;
-        }
+        mLogger.method("ensureTestAppNotInstalled", testApp, user, () -> {
+            Package pkg = TestApis.packages().find(testApp.packageName());
+            if (pkg == null || !TestApis.packages().find(testApp.packageName()).installedOnUser(
+                    user)) {
+                return;
+            }
 
-        TestAppInstance instance = testApp.instance(user);
+            TestAppInstance instance = testApp.instance(user);
 
-        if (mInstalledTestApps.contains(instance)) {
-            mInstalledTestApps.remove(instance);
-        } else {
-            mUninstalledTestApps.add(instance);
-        }
+            if (mInstalledTestApps.contains(instance)) {
+                mInstalledTestApps.remove(instance);
+            } else {
+                mUninstalledTestApps.add(instance);
+            }
 
-        testApp.uninstall(user);
+            testApp.uninstall(user);
+        });
     }
 
     private void ensureHasDeviceOwner(FailureMode failureMode, boolean isPrimary,
             Set<String> affiliationIds) {
-        // TODO(scottjonathan): Should support non-remotedpc device owner (default to remotedpc)
+        mLogger.method("ensureHasDeviceOwner", failureMode, isPrimary, affiliationIds, () -> {
+            // TODO(scottjonathan): Should support non-remotedpc device owner (default to remotedpc)
 
-        UserReference userReference = TestApis.users().system();
+            UserReference userReference = TestApis.users().system();
 
-        if (isPrimary && mPrimaryPolicyManager != null && !userReference.equals(
-                mPrimaryPolicyManager.user())) {
-            throw new IllegalStateException(
-                    "Only one DPC can be marked as primary per test (current primary is "
-                            + mPrimaryPolicyManager + ")");
-        }
-        if (!userReference.equals(TestApis.users().instrumented())) {
-            // INTERACT_ACROSS_USERS_FULL is required for RemoteDPC
-            ensureCanGetPermission(INTERACT_ACROSS_USERS_FULL);
-        }
-
-        DeviceOwner currentDeviceOwner = TestApis.devicePolicy().getDeviceOwner();
-
-        if (currentDeviceOwner != null
-                && currentDeviceOwner.componentName().equals(RemoteDpc.DPC_COMPONENT_NAME)) {
-            mDeviceOwner = currentDeviceOwner;
-        } else {
-            UserReference instrumentedUser = TestApis.users().instrumented();
-
-            if (!Versions.meetsMinimumSdkVersionRequirement(Build.VERSION_CODES.S)) {
-                // Prior to S we can't set device owner if there are other users on the device
-
-                if (instrumentedUser.id() != 0) {
-                    // If we're not on the system user we can't reach the required state
-                    throw new AssumptionViolatedException(
-                            "Can't set Device Owner when running on non-system-user"
-                                    + " on this version of Android");
-                }
-
-                for (UserReference u : TestApis.users().all()) {
-                    if (u.equals(instrumentedUser)) {
-                        // Can't remove the user we're running on
-                        continue;
-                    }
-                    try {
-                        removeAndRecordUser(u);
-                    } catch (NeneException e) {
-                        failOrSkip(
-                                "Error removing user to prepare for DeviceOwner: " + e.toString(),
-                                failureMode);
-                    }
-                }
+            if (isPrimary && mPrimaryPolicyManager != null && !userReference.equals(
+                    mPrimaryPolicyManager.user())) {
+                throw new IllegalStateException(
+                        "Only one DPC can be marked as primary per test (current primary is "
+                                + mPrimaryPolicyManager + ")");
+            }
+            if (!userReference.equals(TestApis.users().instrumented())) {
+                // INTERACT_ACROSS_USERS_FULL is required for RemoteDPC
+                ensureCanGetPermission(INTERACT_ACROSS_USERS_FULL);
             }
 
-            // TODO(scottjonathan): Remove accounts
-            ensureHasNoProfileOwner(userReference);
+            DeviceOwner currentDeviceOwner = TestApis.devicePolicy().getDeviceOwner();
 
-            if (!mHasChangedDeviceOwner) {
-                mOriginalDeviceOwner = currentDeviceOwner;
-                mHasChangedDeviceOwner = true;
+            if (currentDeviceOwner != null
+                    && currentDeviceOwner.componentName().equals(RemoteDpc.DPC_COMPONENT_NAME)) {
+                mDeviceOwner = currentDeviceOwner;
+            } else {
+                UserReference instrumentedUser = TestApis.users().instrumented();
+
+                if (!Versions.meetsMinimumSdkVersionRequirement(Build.VERSION_CODES.S)) {
+                    // Prior to S we can't set device owner if there are other users on the device
+
+                    if (instrumentedUser.id() != 0) {
+                        // If we're not on the system user we can't reach the required state
+                        throw new AssumptionViolatedException(
+                                "Can't set Device Owner when running on non-system-user"
+                                        + " on this version of Android");
+                    }
+
+                    for (UserReference u : TestApis.users().all()) {
+                        if (u.equals(instrumentedUser)) {
+                            // Can't remove the user we're running on
+                            continue;
+                        }
+                        try {
+                            removeAndRecordUser(u);
+                        } catch (NeneException e) {
+                            failOrSkip(
+                                    "Error removing user to prepare for DeviceOwner: "
+                                            + e.toString(),
+                                    failureMode);
+                        }
+                    }
+                }
+
+                // TODO(scottjonathan): Remove accounts
+                ensureHasNoProfileOwner(userReference);
+
+                if (!mHasChangedDeviceOwner) {
+                    mOriginalDeviceOwner = currentDeviceOwner;
+                    mHasChangedDeviceOwner = true;
+                }
+
+                mDeviceOwner = RemoteDpc.setAsDeviceOwner().devicePolicyController();
             }
 
-            mDeviceOwner = RemoteDpc.setAsDeviceOwner().devicePolicyController();
-        }
+            if (isPrimary) {
+                mPrimaryPolicyManager = RemoteDpc.forDevicePolicyController(mDeviceOwner);
+            }
 
-        if (isPrimary) {
-            mPrimaryPolicyManager = RemoteDpc.forDevicePolicyController(mDeviceOwner);
-        }
-        
-        RemoteDpc.forDevicePolicyController(mDeviceOwner)
-                .devicePolicyManager()
-                .setAffiliationIds(REMOTE_DPC_COMPONENT_NAME, affiliationIds);
+            RemoteDpc.forDevicePolicyController(mDeviceOwner)
+                    .devicePolicyManager()
+                    .setAffiliationIds(REMOTE_DPC_COMPONENT_NAME, affiliationIds);
+        });
     }
 
-    private void ensureHasProfileOwner(UserType onUser, boolean isPrimary, Set<String> affiliationIds) {
-        // TODO(scottjonathan): Should support non-remotedpc profile owner (default to remotedpc)
-        UserReference user = resolveUserTypeToUser(onUser);
-        ensureHasProfileOwner(user, isPrimary, affiliationIds);
+    private void ensureHasProfileOwner(UserType onUser, boolean isPrimary,
+            boolean useParentInstance, Set<String> affiliationIds) {
+        mLogger.method("ensureHasProfileOwner",
+                onUser, isPrimary, useParentInstance, affiliationIds, () -> {
+                    // TODO(scottjonathan): Should support non-remotedpc profile owner
+                    //  (default to remotedpc)
+                    UserReference user = resolveUserTypeToUser(onUser);
+                    ensureHasProfileOwner(user, isPrimary, useParentInstance, affiliationIds);
+                });
     }
 
     private void ensureHasProfileOwner(
-            UserReference user, boolean isPrimary, Set<String> affiliationIds) {
-        if (isPrimary && mPrimaryPolicyManager != null
-                && !user.equals(mPrimaryPolicyManager.user())) {
-            throw new IllegalStateException("Only one DPC can be marked as primary per test");
-        }
+            UserReference user, boolean isPrimary, boolean useParentInstance,
+            Set<String> affiliationIds) {
+        mLogger.method("ensureHasProfileOwner", user, isPrimary, useParentInstance,
+                affiliationIds, () -> {
+                    if (isPrimary && mPrimaryPolicyManager != null
+                            && !user.equals(mPrimaryPolicyManager.user())) {
+                        throw new IllegalStateException(
+                                "Only one DPC can be marked as primary per test");
+                    }
 
-        if (!user.equals(TestApis.users().instrumented())) {
-            // INTERACT_ACROSS_USERS_FULL is required for RemoteDPC
-            ensureCanGetPermission(INTERACT_ACROSS_USERS_FULL);
-        }
+                    if (!user.equals(TestApis.users().instrumented())) {
+                        // INTERACT_ACROSS_USERS_FULL is required for RemoteDPC
+                        ensureCanGetPermission(INTERACT_ACROSS_USERS_FULL);
+                    }
 
-        ProfileOwner currentProfileOwner = TestApis.devicePolicy().getProfileOwner(user);
-        DeviceOwner currentDeviceOwner = TestApis.devicePolicy().getDeviceOwner();
+                    ProfileOwner currentProfileOwner = TestApis.devicePolicy().getProfileOwner(
+                            user);
+                    DeviceOwner currentDeviceOwner = TestApis.devicePolicy().getDeviceOwner();
 
-        if (currentDeviceOwner != null && currentDeviceOwner.user().equals(user)) {
-            // Can't have DO and PO on the same user
-            ensureHasNoDeviceOwner();
-        }
+                    if (currentDeviceOwner != null && currentDeviceOwner.user().equals(user)) {
+                        // Can't have DO and PO on the same user
+                        ensureHasNoDeviceOwner();
+                    }
 
-        if (currentProfileOwner != null
-                && currentProfileOwner.componentName().equals(
-                RemoteDpc.DPC_COMPONENT_NAME)) {
-            mProfileOwners.put(user, currentProfileOwner);
-        } else {
+                    if (currentProfileOwner != null && currentProfileOwner.componentName()
+                            .equals(RemoteDpc.DPC_COMPONENT_NAME)) {
+                        mProfileOwners.put(user, currentProfileOwner);
+                    } else {
+                        if (!mChangedProfileOwners.containsKey(user)) {
+                            mChangedProfileOwners.put(user, currentProfileOwner);
+                        }
+
+                        mProfileOwners.put(user,
+                                RemoteDpc.setAsProfileOwner(user).devicePolicyController());
+                    }
+
+                    if (isPrimary) {
+                        if (useParentInstance) {
+                            mPrimaryPolicyManager = new RemoteDpcUsingParentInstance(
+                                    RemoteDpc.forDevicePolicyController(
+                                            mProfileOwners.get(user)).devicePolicyController());
+                        } else {
+                            mPrimaryPolicyManager =
+                                    RemoteDpc.forDevicePolicyController(mProfileOwners.get(user));
+                        }
+                    }
+
+                    if (affiliationIds != null) {
+                        RemoteDpc profileOwner = profileOwner(user);
+                        profileOwner.devicePolicyManager()
+                                .setAffiliationIds(REMOTE_DPC_COMPONENT_NAME, affiliationIds);
+                    }
+                });
+    }
+
+    private void ensureHasNoDeviceOwner() {
+        mLogger.method("ensureHasNoDeviceOwner", () -> {
+            DeviceOwner deviceOwner = TestApis.devicePolicy().getDeviceOwner();
+
+            if (deviceOwner == null) {
+                return;
+            }
+
+            if (!mHasChangedDeviceOwner) {
+                mOriginalDeviceOwner = deviceOwner;
+                mHasChangedDeviceOwner = true;
+            }
+
+            mDeviceOwner = null;
+            deviceOwner.remove();
+        });
+    }
+
+    private void ensureHasNoProfileOwner(UserType onUser) {
+        mLogger.method("ensureHasNoProfileOwner", onUser, () -> {
+            UserReference user = resolveUserTypeToUser(onUser);
+
+            ensureHasNoProfileOwner(user);
+        });
+    }
+
+    private void ensureHasNoProfileOwner(UserReference user) {
+        mLogger.method("ensureHasNoProfileOwner", user, () -> {
+            ProfileOwner currentProfileOwner = TestApis.devicePolicy().getProfileOwner(user);
+
+            if (currentProfileOwner == null) {
+                return;
+            }
+
             if (!mChangedProfileOwners.containsKey(user)) {
                 mChangedProfileOwners.put(user, currentProfileOwner);
             }
 
-            mProfileOwners.put(user, RemoteDpc.setAsProfileOwner(user).devicePolicyController());
-        }
-
-        if (isPrimary) {
-            mPrimaryPolicyManager = RemoteDpc.forDevicePolicyController(mProfileOwners.get(user));
-        }
-
-        if (affiliationIds != null) {
-            RemoteDpc profileOwner = profileOwner(user);
-            profileOwner.devicePolicyManager()
-                    .setAffiliationIds(REMOTE_DPC_COMPONENT_NAME, affiliationIds);
-        }
-    }
-
-    private void ensureHasNoDeviceOwner() {
-        DeviceOwner deviceOwner = TestApis.devicePolicy().getDeviceOwner();
-
-        if (deviceOwner == null) {
-            return;
-        }
-
-        if (!mHasChangedDeviceOwner) {
-            mOriginalDeviceOwner = deviceOwner;
-            mHasChangedDeviceOwner = true;
-        }
-
-        mDeviceOwner = null;
-        deviceOwner.remove();
-    }
-
-    private void ensureHasNoProfileOwner(UserType onUser) {
-        UserReference user = resolveUserTypeToUser(onUser);
-
-        ensureHasNoProfileOwner(user);
-    }
-
-    private void ensureHasNoProfileOwner(UserReference user) {
-
-        ProfileOwner currentProfileOwner = TestApis.devicePolicy().getProfileOwner(user);
-
-        if (currentProfileOwner == null) {
-            return;
-        }
-
-        if (!mChangedProfileOwners.containsKey(user)) {
-            mChangedProfileOwners.put(user, currentProfileOwner);
-        }
-
-        TestApis.devicePolicy().getProfileOwner(user).remove();
-        mProfileOwners.remove(user);
+            TestApis.devicePolicy().getProfileOwner(user).remove();
+            mProfileOwners.remove(user);
+        });
     }
 
     /**
@@ -1681,16 +2251,19 @@
      * <p>If the device owner is not a RemoteDPC then an exception will be thrown
      */
     public RemoteDpc deviceOwner() {
-        if (mDeviceOwner == null) {
-            throw new IllegalStateException("No Harrier-managed device owner. This method should "
-                    + "only be used when Harrier was used to set the Device Owner.");
-        }
-        if (!mDeviceOwner.componentName().equals(REMOTE_DPC_COMPONENT_NAME)) {
-            throw new IllegalStateException("The device owner is not a RemoteDPC."
-                    + " You must use Nene to query for this device owner.");
-        }
+        return mLogger.method("deviceOwner", () -> {
+            if (mDeviceOwner == null) {
+                throw new IllegalStateException(
+                        "No Harrier-managed device owner. This method should "
+                                + "only be used when Harrier was used to set the Device Owner.");
+            }
+            if (!mDeviceOwner.componentName().equals(REMOTE_DPC_COMPONENT_NAME)) {
+                throw new IllegalStateException("The device owner is not a RemoteDPC."
+                        + " You must use Nene to query for this device owner.");
+            }
 
-        return RemoteDpc.forDevicePolicyController(mDeviceOwner);
+            return RemoteDpc.forDevicePolicyController(mDeviceOwner);
+        });
     }
 
     /**
@@ -1701,7 +2274,9 @@
      * <p>If the profile owner is not a RemoteDPC then an exception will be thrown.
      */
     public RemoteDpc profileOwner() {
-        return profileOwner(UserType.CURRENT_USER);
+        return mLogger.method("profileOwner", () -> {
+            return profileOwner(UserType.INSTRUMENTED_USER);
+        });
     }
 
     /**
@@ -1712,11 +2287,13 @@
      * <p>If the profile owner is not a RemoteDPC then an exception will be thrown.
      */
     public RemoteDpc profileOwner(UserType onUser) {
-        if (onUser == null) {
-            throw new NullPointerException();
-        }
+        return mLogger.method("profileOwner", onUser, () -> {
+            if (onUser == null) {
+                throw new NullPointerException();
+            }
 
-        return profileOwner(resolveUserTypeToUser(onUser));
+            return profileOwner(resolveUserTypeToUser(onUser));
+        });
     }
 
     /**
@@ -1727,70 +2304,95 @@
      * <p>If the profile owner is not a RemoteDPC then an exception will be thrown.
      */
     public RemoteDpc profileOwner(UserReference onUser) {
-        if (onUser == null) {
-            throw new NullPointerException();
-        }
+        return mLogger.method("profileOwner", onUser, () -> {
+            if (onUser == null) {
+                throw new NullPointerException();
+            }
 
-        if (!mProfileOwners.containsKey(onUser)) {
-            throw new IllegalStateException("No Harrier-managed profile owner. This method should "
-                    + "only be used when Harrier was used to set the Profile Owner.");
-        }
+            if (!mProfileOwners.containsKey(onUser)) {
+                throw new IllegalStateException(
+                        "No Harrier-managed profile owner. This method should "
+                                + "only be used when Harrier was used to set the Profile Owner.");
+            }
 
-        DevicePolicyController profileOwner = mProfileOwners.get(onUser);
+            DevicePolicyController profileOwner = mProfileOwners.get(onUser);
 
-        if (!profileOwner.componentName().equals(REMOTE_DPC_COMPONENT_NAME)) {
-            throw new IllegalStateException("The profile owner is not a RemoteDPC."
-                    + " You must use Nene to query for this profile owner.");
-        }
+            if (!profileOwner.componentName().equals(REMOTE_DPC_COMPONENT_NAME)) {
+                throw new IllegalStateException("The profile owner is not a RemoteDPC."
+                        + " You must use Nene to query for this profile owner.");
+            }
 
-        return RemoteDpc.forDevicePolicyController(profileOwner);
+            return RemoteDpc.forDevicePolicyController(profileOwner);
+        });
     }
 
     private void requirePackageInstalled(
             String packageName, UserType forUser, FailureMode failureMode) {
+        mLogger.method("requirePackageInstalled", packageName, forUser, failureMode, () -> {
+            Package pkg = TestApis.packages().find(packageName);
 
-        Package pkg = TestApis.packages().find(packageName);
-
-        if (forUser.equals(UserType.ANY)) {
-            checkFailOrSkip(
-                    packageName + " is required to be installed",
-                    !pkg.installedOnUsers().isEmpty(),
-                    failureMode);
-        } else {
-            checkFailOrSkip(
-                    packageName + " is required to be installed for " + forUser,
-                    pkg.installedOnUser(resolveUserTypeToUser(forUser)),
-                    failureMode);
-        }
+            if (forUser.equals(UserType.ANY)) {
+                checkFailOrSkip(
+                        packageName + " is required to be installed",
+                        !pkg.installedOnUsers().isEmpty(),
+                        failureMode);
+            } else {
+                checkFailOrSkip(
+                        packageName + " is required to be installed for " + forUser,
+                        pkg.installedOnUser(resolveUserTypeToUser(forUser)),
+                        failureMode);
+            }
+        });
     }
 
     private void requirePackageNotInstalled(
             String packageName, UserType forUser, FailureMode failureMode) {
-        Package pkg = TestApis.packages().find(packageName);
+        mLogger.method("requirePackageNotInstalled", packageName, forUser,
+                failureMode, () -> {
+                    Package pkg = TestApis.packages().find(packageName);
 
-        if (forUser.equals(UserType.ANY)) {
-            checkFailOrSkip(
-                    packageName + " is required to be not installed",
-                    pkg.installedOnUsers().isEmpty(),
-                    failureMode);
-        } else {
-            checkFailOrSkip(
-                    packageName + " is required to be not installed for " + forUser,
-                    !pkg.installedOnUser(resolveUserTypeToUser(forUser)),
-                    failureMode);
-        }
+                    if (forUser.equals(UserType.ANY)) {
+                        checkFailOrSkip(
+                                packageName + " is required to be not installed",
+                                pkg.installedOnUsers().isEmpty(),
+                                failureMode);
+                    } else {
+                        checkFailOrSkip(
+                                packageName + " is required to be not installed for " + forUser,
+                                !pkg.installedOnUser(resolveUserTypeToUser(forUser)),
+                                failureMode);
+                    }
+                });
     }
 
     private void ensurePackageNotInstalled(
             String packageName, UserType forUser) {
-        Package pkg = TestApis.packages().find(packageName);
+        mLogger.method("ensurePackageNotInstalled", packageName, forUser, () -> {
+            Package pkg = TestApis.packages().find(packageName);
 
-        if (forUser.equals(UserType.ANY)) {
-            pkg.uninstallFromAllUsers();
-        } else {
-            UserReference user = resolveUserTypeToUser(forUser);
-            pkg.uninstall(user);
-        }
+            if (forUser.equals(UserType.ANY)) {
+                pkg.uninstallFromAllUsers();
+            } else {
+                UserReference user = resolveUserTypeToUser(forUser);
+                pkg.uninstall(user);
+            }
+        });
+    }
+
+    /**
+     * Behaves like {@link #dpc()} except that when running on a delegate, this will return
+     * the delegating DPC not the delegate.
+     */
+    public RemotePolicyManager dpcOnly() {
+        return mLogger.method("dpcOnly", () -> {
+            if (mPrimaryPolicyManager != null) {
+                if (mPrimaryPolicyManager.isDelegate()) {
+                    return mDelegateDpc;
+                }
+            }
+
+            return dpc();
+        });
     }
 
     /**
@@ -1808,107 +2410,243 @@
      * <p>If the profile owner or device owner is not a RemoteDPC then an exception will be thrown.
      */
     public RemotePolicyManager dpc() {
-        if (mPrimaryPolicyManager != null) {
-            return mPrimaryPolicyManager;
-        }
-
-        if (mProfileOwners.containsKey(TestApis.users().instrumented())) {
-            DevicePolicyController profileOwner =
-                    mProfileOwners.get(TestApis.users().instrumented());
-
-
-            if (profileOwner.componentName().equals(REMOTE_DPC_COMPONENT_NAME)) {
-                return RemoteDpc.forDevicePolicyController(profileOwner);
-            }
-        }
-
-        if (mDeviceOwner != null) {
-            if (mDeviceOwner.componentName().equals(REMOTE_DPC_COMPONENT_NAME)) {
-                return RemoteDpc.forDevicePolicyController(mDeviceOwner);
+        return mLogger.method("dpc", () -> {
+            if (mPrimaryPolicyManager != null) {
+                return mPrimaryPolicyManager;
             }
 
-        }
+            if (mProfileOwners.containsKey(TestApis.users().instrumented())) {
+                DevicePolicyController profileOwner =
+                        mProfileOwners.get(TestApis.users().instrumented());
 
-        throw new IllegalStateException("No Harrier-managed profile owner or device owner.");
+
+                if (profileOwner.componentName().equals(REMOTE_DPC_COMPONENT_NAME)) {
+                    return RemoteDpc.forDevicePolicyController(profileOwner);
+                }
+            }
+
+            if (mDeviceOwner != null) {
+                if (mDeviceOwner.componentName().equals(REMOTE_DPC_COMPONENT_NAME)) {
+                    return RemoteDpc.forDevicePolicyController(mDeviceOwner);
+                }
+
+            }
+
+            throw new IllegalStateException("No Harrier-managed profile owner or device owner.");
+        });
+    }
+
+    /**
+     * Get a {@link TestAppProvider} which is cleared between tests.
+     *
+     * <p>Note that you must still manage the test apps manually. To have the infrastructure
+     * automatically remove test apps use the {@link EnsureTestAppInstalled} annotation.
+     */
+    public TestAppProvider testApps() {
+        return mLogger.method("testApps", () -> {
+            return mTestAppProvider;
+        });
+    }
+
+    /**
+     * Get a test app installed with @EnsureTestAppInstalled with no key.
+     */
+    public TestAppInstance testApp() {
+        return mLogger.method("testApp", () -> {
+            return testApp(DEFAULT_TEST_APP_KEY);
+        });
+    }
+
+    /**
+     * Get a test app installed with `@EnsureTestAppInstalled` with the given key.
+     */
+    public TestAppInstance testApp(String key) {
+        return mLogger.method("testApp", key, () -> {
+            if (!mTestApps.containsKey(key)) {
+                throw new NeneException("No testapp with given key. Use @EnsureTestAppInstalled");
+            }
+
+            return mTestApps.get(key);
+        });
     }
 
     private void ensureCanGetPermission(String permission) {
-        // TODO(scottjonathan): Apply gms permission switches automatically rather than hard-coding
-        // TODO(scottjonathan): Add a config to only enforce gms permission when needed
-        if (permission.equals(NOTIFY_PENDING_SYSTEM_UPDATE)) {
-            requireGmsInstrumentation(1, Build.VERSION_CODES.R);
-        }
-        // TODO(scottjonathan): Apply version-specific constraints automatically
-        if (permission.equals(INTERACT_ACROSS_USERS_FULL)) {
-            requireSdkVersion(
-                    Build.VERSION_CODES.Q, Integer.MAX_VALUE, FailureMode.SKIP,
-                    "This test requires INTERACT_ACROSS_USERS_FULL which can only be used on Q+");
-        }
+        mLogger.method("ensureCanGetPermission", permission, () -> {
+            if (mPermissionsInstrumentationPackage == null) {
+                // We just need to check if we can get it generally
+
+                if (TestApis.permissions().usablePermissions().contains(permission)) {
+                    return;
+                }
+
+                if (TestApis.packages().instrumented().isInstantApp()) {
+                    // Instant Apps aren't able to know the permissions of shell so we can't know
+                    // if we
+                    // can adopt it - we'll assume we can adopt and log
+                    Log.i(LOG_TAG,
+                            "Assuming we can get permission " + permission
+                                    + " as running on instant app");
+                    return;
+                }
+
+                TestApis.permissions().throwPermissionException(
+                        "Can not get required permission", permission);
+            }
+
+            if (TestApis.permissions().adoptablePermissions().contains(permission)) {
+                requireNoPermissionsInstrumentation("Requires permission " + permission);
+            } else if (mPermissionsInstrumentationPackagePermissions.contains(permission)) {
+                requirePermissionsInstrumentation("Requires permission " + permission);
+            } else {
+                // Can't get permission at all - error (including the permissions for both)
+                TestApis.permissions().throwPermissionException(
+                        "Can not get permission " + permission + " including by instrumenting "
+                                + mPermissionsInstrumentationPackage
+                                + "\n " + mPermissionsInstrumentationPackage + " permissions: "
+                                + mPermissionsInstrumentationPackagePermissions,
+                        permission
+                );
+            }
+        });
     }
 
     private void switchToUser(UserReference user) {
-        UserReference currentUser = TestApis.users().current();
-        if (!currentUser.equals(user)) {
-            if (mOriginalSwitchedUser == null) {
-                mOriginalSwitchedUser = currentUser;
+        mLogger.method("switchToUser", user, () -> {
+            UserReference currentUser = TestApis.users().current();
+            if (!currentUser.equals(user)) {
+                if (mOriginalSwitchedUser == null) {
+                    mOriginalSwitchedUser = currentUser;
+                }
+                user.switchTo();
             }
-            user.switchTo();
-        }
+        });
     }
 
     private void switchFromUser(UserReference user) {
-        UserReference currentUser = TestApis.users().current();
-        if (!currentUser.equals(user)) {
-            return;
-        }
-
-        // We need to find a different user to switch to
-        // full users only, starting with lowest ID
-        List<UserReference> users = new ArrayList<>(TestApis.users().all());
-        users.sort(Comparator.comparingInt(UserReference::id));
-
-        for (UserReference otherUser : users) {
-            if (otherUser.equals(user)) {
-                continue;
+        mLogger.method("switchFromUser", user, () -> {
+            UserReference currentUser = TestApis.users().current();
+            if (!currentUser.equals(user)) {
+                return;
             }
 
-            if (otherUser.parent() != null) {
-                continue;
+            // We need to find a different user to switch to
+            // full users only, starting with lowest ID
+            List<UserReference> users = new ArrayList<>(TestApis.users().all());
+            users.sort(Comparator.comparingInt(UserReference::id));
+
+            for (UserReference otherUser : users) {
+                if (otherUser.equals(user)) {
+                    continue;
+                }
+
+                if (otherUser.parent() != null) {
+                    continue;
+                }
+
+                switchToUser(otherUser);
+                return;
             }
 
-            switchToUser(otherUser);
-            return;
-        }
-
-        // There are no users to switch to so we'll create one
-        ensureHasUser(SECONDARY_USER_TYPE_NAME,
-                /* installInstrumentedApp= */ OptionalBoolean.ANY,
-                /* switchedToUser= */ OptionalBoolean.TRUE);
+            // There are no users to switch to so we'll create one
+            ensureHasUser(SECONDARY_USER_TYPE_NAME,
+                    /* installInstrumentedApp= */ OptionalBoolean.ANY,
+                    /* switchedToUser= */ OptionalBoolean.TRUE);
+        });
     }
 
     private void requireNotHeadlessSystemUserMode() {
-        assumeFalse("This test is not supported on headless system user devices",
-                TestApis.users().isHeadlessSystemUserMode());
+        mLogger.method("requireNotHeadlessSystemUserMode", () -> {
+            assumeFalse("This test is not supported on headless system user devices",
+                    TestApis.users().isHeadlessSystemUserMode());
+        });
     }
 
     private void requireHeadlessSystemUserMode() {
-        assumeTrue("This test is only supported on headless system user devices",
-                TestApis.users().isHeadlessSystemUserMode());
+        mLogger.method("requireHeadlessSystemUserMode", () -> {
+            assumeTrue("This test is only supported on headless system user devices",
+                    TestApis.users().isHeadlessSystemUserMode());
+        });
     }
 
     private void requireLowRamDevice(String reason, FailureMode failureMode) {
-        checkFailOrSkip(reason,
-                TestApis.context().instrumentedContext()
-                        .getSystemService(ActivityManager.class)
-                        .isLowRamDevice(),
-                failureMode);
+        mLogger.method("requireLowRamDevice", reason, failureMode, () -> {
+            checkFailOrSkip(reason,
+                    TestApis.context().instrumentedContext()
+                            .getSystemService(ActivityManager.class)
+                            .isLowRamDevice(),
+                    failureMode);
+        });
     }
 
     private void requireNotLowRamDevice(String reason, FailureMode failureMode) {
-        checkFailOrSkip(reason,
-                !TestApis.context().instrumentedContext()
-                        .getSystemService(ActivityManager.class)
-                        .isLowRamDevice(),
-                failureMode);
+        mLogger.method("requireNotLowRamDevice", reason, failureMode, () -> {
+            checkFailOrSkip(reason,
+                    !TestApis.context().instrumentedContext()
+                            .getSystemService(ActivityManager.class)
+                            .isLowRamDevice(),
+                    failureMode);
+        });
+    }
+
+    private void ensureScreenIsOn() {
+        mLogger.method("ensureScreenIsOn", () -> {
+            TestApis.device().wakeUp();
+        });
+    }
+
+    private void ensurePasswordSet(UserType forUser, String password) {
+        mLogger.method("ensurePasswordSet", forUser, password, () -> {
+            UserReference user = resolveUserTypeToUser(forUser);
+
+            if (user.hasPassword()) {
+                return;
+            }
+
+            try {
+                user.setPassword(password);
+            } catch (NeneException e) {
+                throw new AssertionError("Require password set but error when setting "
+                        + "password on user " + user, e);
+            }
+            mUsersSetPasswords.add(user);
+        });
+    }
+
+    private void ensurePasswordNotSet(UserType forUser) {
+        mLogger.method("ensurePasswordNotSet", forUser, () -> {
+            UserReference user = resolveUserTypeToUser(forUser);
+
+            if (!user.hasPassword()) {
+                return;
+            }
+
+            try {
+                user.clearPassword(DEFAULT_PASSWORD);
+            } catch (NeneException e
+            ) {
+                throw new AssertionError(
+                        "Test requires user " + user + " does not have a password. "
+                                + "Password is set and is not DEFAULT_PASSWORD.");
+            }
+            mUsersSetPasswords.remove(user);
+        });
+    }
+
+    private void ensureBluetoothEnabled() {
+        mLogger.method("ensureBluetoothEnabled", () -> {
+            if (mOriginalBluetoothEnabled == null) {
+                mOriginalBluetoothEnabled = TestApis.bluetooth().isEnabled();
+            }
+            TestApis.bluetooth().setEnabled(true);
+        });
+    }
+
+    private void ensureBluetoothDisabled() {
+        mLogger.method("ensureBluetoothDisabled", () -> {
+            if (mOriginalBluetoothEnabled == null) {
+                mOriginalBluetoothEnabled = TestApis.bluetooth().isEnabled();
+            }
+            TestApis.bluetooth().setEnabled(false);
+        });
     }
 }
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/Policy.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/Policy.java
deleted file mode 100644
index e01c8f1..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/Policy.java
+++ /dev/null
@@ -1,519 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier;
-
-import static android.app.admin.DevicePolicyManager.DELEGATION_APP_RESTRICTIONS;
-import static android.app.admin.DevicePolicyManager.DELEGATION_BLOCK_UNINSTALL;
-import static android.app.admin.DevicePolicyManager.DELEGATION_CERT_INSTALL;
-import static android.app.admin.DevicePolicyManager.DELEGATION_CERT_SELECTION;
-import static android.app.admin.DevicePolicyManager.DELEGATION_ENABLE_SYSTEM_APP;
-import static android.app.admin.DevicePolicyManager.DELEGATION_INSTALL_EXISTING_PACKAGE;
-import static android.app.admin.DevicePolicyManager.DELEGATION_KEEP_UNINSTALLED_PACKAGES;
-import static android.app.admin.DevicePolicyManager.DELEGATION_NETWORK_LOGGING;
-import static android.app.admin.DevicePolicyManager.DELEGATION_PACKAGE_ACCESS;
-import static android.app.admin.DevicePolicyManager.DELEGATION_PERMISSION_GRANT;
-import static android.app.admin.DevicePolicyManager.DELEGATION_SECURITY_LOGGING;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_AFFILIATED_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_AFFILIATED_PROFILE_OWNER_PROFILE;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_IN_BACKGROUND;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_AFFILIATED_OTHER_USERS;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_PARENT;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_UNAFFILIATED_OTHER_USERS;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.DO_NOT_APPLY_TO_NEGATIVE_TESTS;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.NO;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDelegate;
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeNone;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnAffiliatedDeviceOwnerSecondaryUser;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnAffiliatedProfileOwnerSecondaryUser;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnBackgroundDeviceOwnerUser;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnDeviceOwnerUser;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnNonAffiliatedDeviceOwnerSecondaryUser;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnParentOfCorporateOwnedProfileOwner;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnProfileOwnerPrimaryUser;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnProfileOwnerProfileWithNoDeviceOwner;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnUnaffiliatedProfileOwnerSecondaryUser;
-
-import com.google.auto.value.AutoAnnotation;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-
-import java.lang.annotation.Annotation;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.function.Function;
-import java.util.stream.Collectors;
-
-/**
- * Utility class for enterprise policy tests.
- */
-public final class Policy {
-
-    // Delegate scopes to be used for a "CannotSet" state. All delegate scopes except the ones which
-    // should allow use of the API will be granted
-    private static final ImmutableSet<String> ALL_DELEGATE_SCOPES = ImmutableSet.of(
-            DELEGATION_CERT_INSTALL,
-            DELEGATION_APP_RESTRICTIONS,
-            DELEGATION_BLOCK_UNINSTALL,
-            DELEGATION_PERMISSION_GRANT,
-            DELEGATION_PACKAGE_ACCESS,
-            DELEGATION_ENABLE_SYSTEM_APP,
-            DELEGATION_INSTALL_EXISTING_PACKAGE,
-            DELEGATION_KEEP_UNINSTALLED_PACKAGES,
-            DELEGATION_NETWORK_LOGGING,
-            DELEGATION_CERT_SELECTION,
-            DELEGATION_SECURITY_LOGGING
-    );
-
-    // This is a map containing all Include* annotations and the flags which lead to them
-    // This is not validated - every state must have a single APPLIED_BY annotation
-    private static final ImmutableMap<Integer, Function<EnterprisePolicy, Set<Annotation>>>
-            STATE_ANNOTATIONS =
-            ImmutableMap.<Integer, Function<EnterprisePolicy, Set<Annotation>>>builder()
-                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER, singleAnnotation(includeRunOnDeviceOwnerUser()))
-                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnDeviceOwnerUser(), /* isPrimary= */ true))
-                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | APPLIES_IN_BACKGROUND, singleAnnotation(includeRunOnBackgroundDeviceOwnerUser()))
-                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | APPLIES_IN_BACKGROUND | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnBackgroundDeviceOwnerUser(), /* isPrimary= */ true))
-
-                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_UNAFFILIATED_OTHER_USERS, singleAnnotation(includeRunOnNonAffiliatedDeviceOwnerSecondaryUser()))
-                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_UNAFFILIATED_OTHER_USERS | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnNonAffiliatedDeviceOwnerSecondaryUser(), /* isPrimary= */ true))
-                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_AFFILIATED_OTHER_USERS, singleAnnotation(includeRunOnAffiliatedDeviceOwnerSecondaryUser()))
-                    .put(APPLIED_BY_DEVICE_OWNER | APPLIES_TO_AFFILIATED_OTHER_USERS | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnAffiliatedDeviceOwnerSecondaryUser(), /* isPrimary= */ true))
-
-                    .put(APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER | APPLIES_TO_OWN_USER, singleAnnotation(includeRunOnAffiliatedProfileOwnerSecondaryUser()))
-                    .put(APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnAffiliatedProfileOwnerSecondaryUser(), /* isPrimary= */ true))
-                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER | APPLIES_TO_OWN_USER, singleAnnotation(includeRunOnUnaffiliatedProfileOwnerSecondaryUser()))
-                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnUnaffiliatedProfileOwnerSecondaryUser(), /* isPrimary= */ true))
-                    .put(APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO | APPLIES_TO_OWN_USER, singleAnnotation(includeRunOnProfileOwnerPrimaryUser()))
-                    .put(APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnProfileOwnerPrimaryUser(), /* isPrimary= */ true))
-
-                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE | APPLIES_TO_OWN_USER, singleAnnotation(includeRunOnProfileOwnerProfileWithNoDeviceOwner()))
-                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnProfileOwnerProfileWithNoDeviceOwner(), /* isPrimary= */ true))
-                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE | APPLIES_TO_PARENT, singleAnnotation(includeRunOnParentOfProfileOwnerWithNoDeviceOwner()))
-                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE | APPLIES_TO_PARENT | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnParentOfProfileOwnerWithNoDeviceOwner(), /* isPrimary= */ true))
-
-                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE | APPLIES_TO_UNAFFILIATED_OTHER_USERS, singleAnnotation(includeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile()))
-                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE | APPLIES_TO_UNAFFILIATED_OTHER_USERS | CAN_BE_DELEGATED, generateDelegateAnnotation(includeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile(), /* isPrimary= */ true))
-                    .build();
-    // This must contain one key for every APPLIED_BY that is being used, and maps to the
-    // "default" for testing that DPC type
-    // in general this will be a state which runs on the same user as the dpc.
-    private static final ImmutableMap<Integer, Function<EnterprisePolicy, Set<Annotation>>>
-            DPC_STATE_ANNOTATIONS_BASE =
-            ImmutableMap.<Integer, Function<EnterprisePolicy, Set<Annotation>>>builder()
-                    .put(APPLIED_BY_DEVICE_OWNER, (flags) -> hasFlag(flags.dpc(), APPLIED_BY_DEVICE_OWNER | APPLIES_IN_BACKGROUND) ? ImmutableSet.of(includeRunOnBackgroundDeviceOwnerUser()) : ImmutableSet.of(includeRunOnDeviceOwnerUser()))
-                    .put(APPLIED_BY_AFFILIATED_PROFILE_OWNER, singleAnnotation(includeRunOnAffiliatedProfileOwnerSecondaryUser()))
-                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER, singleAnnotation(includeRunOnProfileOwnerPrimaryUser()))
-                    .put(APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO, singleAnnotation(includeRunOnProfileOwnerPrimaryUser()))
-                    .put(APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE, singleAnnotation(includeRunOnProfileOwnerProfileWithNoDeviceOwner()))
-                    .build();
-    private static final Map<Integer, Function<EnterprisePolicy, Set<Annotation>>>
-            DPC_STATE_ANNOTATIONS = DPC_STATE_ANNOTATIONS_BASE.entrySet().stream()
-            .collect(Collectors.toMap(Map.Entry::getKey, Policy::addGeneratedStates));
-    private static final int APPLIED_BY_FLAGS =
-            APPLIED_BY_DEVICE_OWNER | APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE
-                    | APPLIED_BY_AFFILIATED_PROFILE_OWNER_PROFILE
-                    | APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER
-                    | APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER;
-    private static final Map<Function<EnterprisePolicy, Set<Annotation>>, Set<Integer>>
-            ANNOTATIONS_MAP = calculateAnnotationsMap(STATE_ANNOTATIONS);
-
-    private Policy() {
-
-    }
-
-    @AutoAnnotation
-    private static IncludeNone includeNone() {
-        return new AutoAnnotation_Policy_includeNone();
-    }
-
-    @AutoAnnotation
-    private static IncludeRunOnDeviceOwnerUser includeRunOnDeviceOwnerUser() {
-        return new AutoAnnotation_Policy_includeRunOnDeviceOwnerUser();
-    }
-
-    @AutoAnnotation
-    private static IncludeRunOnNonAffiliatedDeviceOwnerSecondaryUser includeRunOnNonAffiliatedDeviceOwnerSecondaryUser() {
-        return new AutoAnnotation_Policy_includeRunOnNonAffiliatedDeviceOwnerSecondaryUser();
-    }
-
-    @AutoAnnotation
-    private static IncludeRunOnAffiliatedDeviceOwnerSecondaryUser includeRunOnAffiliatedDeviceOwnerSecondaryUser() {
-        return new AutoAnnotation_Policy_includeRunOnAffiliatedDeviceOwnerSecondaryUser();
-    }
-
-    @AutoAnnotation
-    private static IncludeRunOnAffiliatedProfileOwnerSecondaryUser includeRunOnAffiliatedProfileOwnerSecondaryUser() {
-        return new AutoAnnotation_Policy_includeRunOnAffiliatedProfileOwnerSecondaryUser();
-    }
-
-    @AutoAnnotation
-    private static IncludeRunOnUnaffiliatedProfileOwnerSecondaryUser includeRunOnUnaffiliatedProfileOwnerSecondaryUser() {
-        return new AutoAnnotation_Policy_includeRunOnUnaffiliatedProfileOwnerSecondaryUser();
-    }
-
-    @AutoAnnotation
-    private static IncludeRunOnProfileOwnerProfileWithNoDeviceOwner includeRunOnProfileOwnerProfileWithNoDeviceOwner() {
-        return new AutoAnnotation_Policy_includeRunOnProfileOwnerProfileWithNoDeviceOwner();
-    }
-
-    @AutoAnnotation
-    private static IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile includeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile() {
-        return new AutoAnnotation_Policy_includeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile();
-    }
-
-    @AutoAnnotation
-    private static IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner includeRunOnParentOfProfileOwnerWithNoDeviceOwner() {
-        return new AutoAnnotation_Policy_includeRunOnParentOfProfileOwnerWithNoDeviceOwner();
-    }
-
-    @AutoAnnotation
-    private static IncludeRunOnParentOfCorporateOwnedProfileOwner includeRunOnParentOfCorporateOwnedProfileOwner() {
-        return new AutoAnnotation_Policy_includeRunOnParentOfCorporateOwnedProfileOwner();
-    }
-
-    @AutoAnnotation
-    private static IncludeRunOnProfileOwnerPrimaryUser includeRunOnProfileOwnerPrimaryUser() {
-        return new AutoAnnotation_Policy_includeRunOnProfileOwnerPrimaryUser();
-    }
-
-    @AutoAnnotation
-    private static IncludeRunOnBackgroundDeviceOwnerUser includeRunOnBackgroundDeviceOwnerUser() {
-        return new AutoAnnotation_Policy_includeRunOnBackgroundDeviceOwnerUser();
-    }
-
-    @AutoAnnotation
-    private static EnsureHasDelegate ensureHasDelegate(EnsureHasDelegate.AdminType admin,
-            String[] scopes, boolean isPrimary) {
-        return new AutoAnnotation_Policy_ensureHasDelegate(admin, scopes, isPrimary);
-    }
-
-    private static Function<EnterprisePolicy, Set<Annotation>> singleAnnotation(
-            Annotation annotation) {
-        return (i) -> ImmutableSet.of(annotation);
-    }
-
-    private static Function<EnterprisePolicy, Set<Annotation>> generateDelegateAnnotation(
-            Annotation annotation, boolean isPrimary) {
-        return (policy) -> {
-            Annotation[] existingAnnotations = annotation.annotationType().getAnnotations();
-            return Arrays.stream(policy.delegatedScopes())
-                    .map(scope -> {
-                        Annotation[] newAnnotations = Arrays.copyOf(existingAnnotations,
-                                existingAnnotations.length + 1);
-                        newAnnotations[newAnnotations.length - 1] = ensureHasDelegate(
-                                EnsureHasDelegate.AdminType.PRIMARY, new String[]{scope},
-                                isPrimary);
-
-                        return new DynamicParameterizedAnnotation(
-                                annotation.annotationType().getSimpleName() + "Delegate:" + scope,
-                                newAnnotations);
-                    }).collect(Collectors.toSet());
-        };
-    }
-
-    private static Map<Function<EnterprisePolicy, Set<Annotation>>, Set<Integer>> calculateAnnotationsMap(
-            Map<Integer, Function<EnterprisePolicy, Set<Annotation>>> annotations) {
-        Map<Function<EnterprisePolicy, Set<Annotation>>, Set<Integer>> b = new HashMap<>();
-
-        for (Map.Entry<Integer, Function<EnterprisePolicy, Set<Annotation>>> i :
-                annotations.entrySet()) {
-            if (!b.containsKey(i.getValue())) {
-                b.put(i.getValue(), new HashSet<>());
-            }
-
-            b.get(i.getValue()).add(i.getKey());
-        }
-
-        return b;
-    }
-
-    private static Function<EnterprisePolicy, Set<Annotation>> addGeneratedStates(
-            ImmutableMap.Entry<Integer, Function<EnterprisePolicy, Set<Annotation>>> entry) {
-        return (policy) -> {
-            if (hasFlag(policy.dpc(), entry.getKey() | CAN_BE_DELEGATED)) {
-                Set<Annotation> results = new HashSet<>(entry.getValue().apply(policy));
-                results.addAll(results.stream().flatMap(
-                        t -> generateDelegateAnnotation(t, /* isPrimary= */ true).apply(
-                                policy).stream())
-                        .collect(Collectors.toSet()));
-
-                return results;
-            }
-
-            return entry.getValue().apply(policy);
-        };
-    }
-
-
-    /**
-     * Get parameterized test runs for the given policy.
-     *
-     * <p>These are states which should be run where the policy is able to be applied.
-     */
-    public static List<Annotation> positiveStates(String policyName,
-            EnterprisePolicy enterprisePolicy) {
-        Set<Annotation> annotations = new HashSet<>();
-
-        validateFlags(policyName, enterprisePolicy.dpc());
-
-        for (Map.Entry<Function<EnterprisePolicy, Set<Annotation>>, Set<Integer>> annotation :
-                ANNOTATIONS_MAP.entrySet()) {
-            if (isPositive(enterprisePolicy.dpc(), annotation.getValue())) {
-                annotations.addAll(annotation.getKey().apply(enterprisePolicy));
-            }
-        }
-
-        if (annotations.isEmpty()) {
-            // Don't run the original test unparameterized
-            annotations.add(includeNone());
-        }
-
-        return new ArrayList<>(annotations);
-    }
-
-    private static boolean isPositive(int[] policyFlags, Set<Integer> annotationFlags) {
-        for (int annotationFlag : annotationFlags) {
-            if (hasFlag(policyFlags, annotationFlag)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static boolean isNegative(int[] policyFlags, Set<Integer> annotationFlags) {
-        for (int annotationFlag : annotationFlags) {
-            if (hasFlag(annotationFlag, DO_NOT_APPLY_TO_NEGATIVE_TESTS, /* nonMatchingFlag= */
-                    NO)) {
-                return false; // We don't support using this annotation for negative tests
-            }
-
-            int appliedByFlag = APPLIED_BY_FLAGS & annotationFlag;
-            int otherFlags = annotationFlag ^ appliedByFlag; // remove the appliedByFlag
-            if (hasFlag(policyFlags, /* matchingFlag= */ appliedByFlag, /* nonMatchingFlag= */
-                    otherFlags)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Get negative parameterized test runs for the given policy.
-     *
-     * <p>These are states which should be run where the policy is not able to be applied.
-     */
-    public static List<Annotation> negativeStates(String policyName,
-            EnterprisePolicy enterprisePolicy) {
-        Set<Annotation> annotations = new HashSet<>();
-
-        validateFlags(policyName, enterprisePolicy.dpc());
-
-        for (Map.Entry<Function<EnterprisePolicy, Set<Annotation>>, Set<Integer>> annotation :
-                ANNOTATIONS_MAP.entrySet()) {
-            if (isNegative(enterprisePolicy.dpc(), annotation.getValue())) {
-                annotations.addAll(annotation.getKey().apply(enterprisePolicy));
-            }
-        }
-
-        if (annotations.isEmpty()) {
-            // Don't run the original test unparameterized
-            annotations.add(includeNone());
-        }
-
-        return new ArrayList<>(annotations);
-    }
-
-    /**
-     * Get parameterized test runs where the policy cannot be set for the given policy.
-     */
-    public static List<Annotation> cannotSetPolicyStates(String policyName,
-            EnterprisePolicy enterprisePolicy, boolean includeDeviceAdminStates,
-            boolean includeNonDeviceAdminStates) {
-        Set<Annotation> annotations = new HashSet<>();
-
-        validateFlags(policyName, enterprisePolicy.dpc());
-
-        if (includeDeviceAdminStates) {
-            int allFlags = 0;
-            for (int p : enterprisePolicy.dpc()) {
-                allFlags = allFlags | p;
-            }
-
-            for (Map.Entry<Integer, Function<EnterprisePolicy, Set<Annotation>>> appliedByFlag :
-                    DPC_STATE_ANNOTATIONS.entrySet()) {
-                if ((appliedByFlag.getKey() & allFlags) == 0) {
-                    annotations.addAll(appliedByFlag.getValue().apply(enterprisePolicy));
-                }
-            }
-        }
-
-        if (includeNonDeviceAdminStates) {
-            Set<String> validScopes = ImmutableSet.copyOf(enterprisePolicy.delegatedScopes());
-            String[] scopes = ALL_DELEGATE_SCOPES.stream()
-                    .filter(i -> !validScopes.contains(i))
-                    .toArray(String[]::new);
-            Annotation[] existingAnnotations = IncludeRunOnDeviceOwnerUser.class.getAnnotations();
-
-            if (BedsteadJUnit4.isDebug()) {
-                // Add a non-DPC with no delegate scopes
-                Annotation[] newAnnotations = Arrays.copyOf(existingAnnotations,
-                        existingAnnotations.length + 1);
-                newAnnotations[newAnnotations.length - 1] = ensureHasDelegate(
-                        EnsureHasDelegate.AdminType.PRIMARY, new String[]{}, /* isPrimary= */ true);
-                annotations.add(
-                        new DynamicParameterizedAnnotation("DelegateWithNoScopes", newAnnotations));
-
-                for (String scope : scopes) {
-                    newAnnotations = Arrays.copyOf(existingAnnotations,
-                            existingAnnotations.length + 1);
-                    newAnnotations[newAnnotations.length - 1] = ensureHasDelegate(
-                            EnsureHasDelegate.AdminType.PRIMARY, new String[]{scope}, /* isPrimary= */ true);
-                    annotations.add(
-                            new DynamicParameterizedAnnotation("DelegateWithScope:" + scope, newAnnotations));
-                }
-            } else {
-                Annotation[] newAnnotations = Arrays.copyOf(existingAnnotations,
-                        existingAnnotations.length + 1);
-                newAnnotations[newAnnotations.length - 1] = ensureHasDelegate(
-                        EnsureHasDelegate.AdminType.PRIMARY, scopes, /* isPrimary= */ true);
-                annotations.add(
-                        new DynamicParameterizedAnnotation("DelegateWithoutValidScope", newAnnotations));
-            }
-        }
-
-        if (annotations.isEmpty()) {
-            // Don't run the original test unparameterized
-            annotations.add(includeNone());
-        }
-
-        return new ArrayList<>(annotations);
-    }
-
-    /**
-     * Get state annotations where the policy can be set for the given policy.
-     */
-    public static List<Annotation> canSetPolicyStates(
-            String policyName, EnterprisePolicy enterprisePolicy, boolean singleTestOnly) {
-        Set<Annotation> annotations = new HashSet<>();
-
-        validateFlags(policyName, enterprisePolicy.dpc());
-
-        int allFlags = 0;
-        for (int p : enterprisePolicy.dpc()) {
-            allFlags = allFlags | p;
-        }
-
-        for (Map.Entry<Integer, Function<EnterprisePolicy, Set<Annotation>>> appliedByFlag :
-                DPC_STATE_ANNOTATIONS.entrySet()) {
-            if ((appliedByFlag.getKey() & allFlags) == appliedByFlag.getKey()) {
-                annotations.addAll(appliedByFlag.getValue().apply(enterprisePolicy));
-            }
-        }
-
-        if (annotations.isEmpty()) {
-            // Don't run the original test unparameterized
-            annotations.add(includeNone());
-        }
-
-        List<Annotation> annotationList = new ArrayList<>(annotations);
-
-        if (singleTestOnly) {
-            // We select one annotation in an arbitrary but deterministic way
-            annotationList.sort(Comparator.comparing(
-                    a -> a instanceof DynamicParameterizedAnnotation
-                            ? "DynamicParameterizedAnnotation" : a.annotationType().getName()));
-
-            // We don't want a delegate to be the representative test
-            Annotation firstAnnotation = annotationList.stream()
-                    .filter(i -> !(i instanceof  DynamicParameterizedAnnotation))
-                    .findFirst().get();
-            annotationList.clear();
-            annotationList.add(firstAnnotation);
-        }
-
-        return annotationList;
-    }
-
-    private static void validateFlags(String policyName, int[] values) {
-        int usedAppliedByFlags = 0;
-
-        for (int value : values) {
-            validateFlags(policyName, value);
-            int newUsedAppliedByFlags = usedAppliedByFlags | (value & APPLIED_BY_FLAGS);
-            if (newUsedAppliedByFlags == usedAppliedByFlags) {
-                throw new IllegalStateException(
-                        "Cannot have more than one policy flag APPLIED by the same component. "
-                                + "Error in policy " + policyName);
-            }
-            usedAppliedByFlags = newUsedAppliedByFlags;
-        }
-    }
-
-    private static void validateFlags(String policyName, int value) {
-        int matchingAppliedByFlags = APPLIED_BY_FLAGS & value;
-
-        if (matchingAppliedByFlags == 0) {
-            throw new IllegalStateException(
-                    "All policy flags must specify 1 APPLIED_BY flag. Policy " + policyName
-                            + " did not.");
-        }
-    }
-
-    private static boolean hasFlag(int[] values, int matchingFlag) {
-        return hasFlag(values, matchingFlag, /* nonMatchingFlag= */ NO);
-    }
-
-    private static boolean hasFlag(int[] values, int matchingFlag, int nonMatchingFlag) {
-        for (int value : values) {
-            if (hasFlag(value, matchingFlag, nonMatchingFlag)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static boolean hasFlag(int value, int matchingFlag, int nonMatchingFlag) {
-        if (!((value & matchingFlag) == matchingFlag)) {
-            return false;
-        }
-
-        if (nonMatchingFlag != NO) {
-            return (value & nonMatchingFlag) != nonMatchingFlag;
-        }
-
-        return true;
-    }
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/AfterClass.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/AfterClass.java
deleted file mode 100644
index 1241503..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/AfterClass.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Replacement for {@link org.junit.AfterClass} for use by classes which use {@link DeviceState}.
- *
- * <p>Methods annotated {@link AfterClass} must be public, static, must return {@code void}, and
- * must take no arguments.
- *
- * <p>The annotated method will be called after all tests, once per class.
- *
- * <p>The state prior to calling this method is not guaranteed, as test methods may have changed the
- * state. If any class-level annotation assumptions are violated this method will not be run.
- *
- * <p>If there are multiple methods annotated {@code @AfterClass} there is no guarantee as to the
- * order they will be executed.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface AfterClass {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/BeforeClass.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/BeforeClass.java
deleted file mode 100644
index 5f76ba6..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/BeforeClass.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Replacement for {@link org.junit.BeforeClass} for use by classes which use {@link DeviceState}.
- *
- * <p>Methods annotated {@link BeforeClass} must be public, static, must return {@code void}, and
- * must take no arguments.
- *
- * <p>The annotated method will be called before any tests, once per class. Class-level Bedstead
- * annotations will be processed before running the method, and if any assumptions are violated the
- * method will not be run.
- *
- * <p>If there are multiple methods annotated {@code @BeforeClass} there is no guarantee as to the
- * order they will be executed.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-public @interface BeforeClass {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoSecondaryUser.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoSecondaryUser.java
deleted file mode 100644
index 3cb8104..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoSecondaryUser.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.meta.EnsureHasNoUserAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run on a device which has no secondary user that is not the
- * instrumented user.
- *
- * <p>Your test configuration may be configured so that this test is only run on a device which
- * has no secondary user that is not the current user. Otherwise, you can use {@link DeviceState}
- * to ensure that the device enters the correct state for the method.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@EnsureHasNoUserAnnotation("android.os.usertype.full.SECONDARY")
-public @interface EnsureHasNoSecondaryUser {
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default MIDDLE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoTvProfile.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoTvProfile.java
deleted file mode 100644
index 50dac4d..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoTvProfile.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.DeviceState.UserType.CURRENT_USER;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.meta.EnsureHasNoProfileAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run on a user which has no Tv profile.
- *
- * <p>Your test configuration may be configured so that this test is only run on a user which has
- * no Tv profile. Otherwise, you can use {@link DeviceState} to ensure that the device enters
- * the correct state for the method.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@EnsureHasNoProfileAnnotation("com.android.tv.profile")
-public @interface EnsureHasNoTvProfile {
-    /** Which user type the tv profile should not be attached to. */
-    DeviceState.UserType forUser() default CURRENT_USER;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default MIDDLE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoWorkProfile.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoWorkProfile.java
deleted file mode 100644
index bec8a6b..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasNoWorkProfile.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.DeviceState.UserType.CURRENT_USER;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.meta.EnsureHasNoProfileAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run on a user which does not have a work profile.
- *
- * <p>Your test configuration may be configured so that this test is only run on a user which has
- * no work profile. Otherwise, you can use {@link DeviceState} to ensure that the device enters
- * the correct state for the method.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@EnsureHasNoProfileAnnotation("android.os.usertype.profile.MANAGED")
-@RequireFeature("android.software.managed_users")
-public @interface EnsureHasNoWorkProfile {
-    /** Which user type the work profile should not be attached to. */
-    DeviceState.UserType forUser() default CURRENT_USER;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default MIDDLE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasPermission.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasPermission.java
deleted file mode 100644
index 7f7928b..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasPermission.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Ensure that the given permission is granted before running the test.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EnsureHasPermission {
-    String[] value();
-
-    FailureMode failureMode() default FailureMode.FAIL;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default MIDDLE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasSecondaryUser.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasSecondaryUser.java
deleted file mode 100644
index 186d86b..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasSecondaryUser.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.OptionalBoolean.ANY;
-import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.OptionalBoolean;
-import com.android.bedstead.harrier.annotations.meta.EnsureHasUserAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run on a device which has a secondary user.
- *
- * <p>Your test configuration may be configured so that this test is only run on a device which
- * has a secondary user that is not the current user. Otherwise, you can use {@link DeviceState}
- * to ensure that the device enters the correct state for the method. If there is not already a
- * secondary user on the device, and the device does not support creating additional users, then
- * the test will be skipped.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@EnsureHasUserAnnotation("android.os.usertype.full.SECONDARY")
-public @interface EnsureHasSecondaryUser {
-    /** Whether the instrumented test app should be installed in the secondary user. */
-    OptionalBoolean installInstrumentedApp() default TRUE;
-
-    /**
-     * Should we ensure that we are switched to the given user
-     */
-    OptionalBoolean switchedToUser() default ANY;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default MIDDLE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasTvProfile.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasTvProfile.java
deleted file mode 100644
index 35f3283..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasTvProfile.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.DeviceState.UserType.CURRENT_USER;
-import static com.android.bedstead.harrier.OptionalBoolean.ANY;
-import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.OptionalBoolean;
-import com.android.bedstead.harrier.annotations.meta.EnsureHasProfileAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run on a user which has a Tv profile.
- *
- * <p>Your test configuration may be configured so that this test is only run on a user which has
- * a Tv profile. Otherwise, you can use {@link DeviceState} to ensure that the device enters
- * the correct state for the method.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@EnsureHasProfileAnnotation("com.android.tv.profile")
-public @interface EnsureHasTvProfile {
-    /** Which user type the tv profile should be attached to. */
-    DeviceState.UserType forUser() default CURRENT_USER;
-
-    /** Whether the instrumented test app should be installed in the tv profile. */
-    OptionalBoolean installInstrumentedApp() default TRUE;
-
-    /**
-     * Should we ensure that we are switched to the parent of the profile.
-     */
-    OptionalBoolean switchedToParentUser() default ANY;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default MIDDLE;
-}
\ No newline at end of file
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasWorkProfile.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasWorkProfile.java
deleted file mode 100644
index 892b7f4..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsureHasWorkProfile.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.DeviceState.UserType.CURRENT_USER;
-import static com.android.bedstead.harrier.OptionalBoolean.ANY;
-import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.OptionalBoolean;
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDeviceOwner;
-import com.android.bedstead.harrier.annotations.meta.EnsureHasProfileAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run on a user which has a work profile.
- *
- * <p>Use of this annotation implies
- * {@code RequireFeature("android.software.managed_users", SKIP)}.
- *
- * <p>Your test configuration may be configured so that this test is only run on a user which has
- * a work profile. Otherwise, you can use {@link DeviceState} to ensure that the device enters
- * the correct state for the method.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@EnsureHasProfileAnnotation(value = "android.os.usertype.profile.MANAGED", hasProfileOwner = true)
-@RequireFeature("android.software.managed_users")
-@EnsureHasNoDeviceOwner // TODO: This should only apply on Android R+
-public @interface EnsureHasWorkProfile {
-    /** Which user type the work profile should be attached to. */
-    DeviceState.UserType forUser() default CURRENT_USER;
-
-    /** Whether the instrumented test app should be installed in the work profile. */
-    OptionalBoolean installInstrumentedApp() default TRUE;
-
-    /**
-     * Whether the profile owner's DPC should be returned by calls to {@link DeviceState#dpc()}.
-     *
-     * <p>Only one device policy controller per test should be marked as primary.
-     */
-    boolean dpcIsPrimary() default false;
-
-    /**
-     * Should we ensure that we are switched to the parent of the profile.
-     */
-    OptionalBoolean switchedToParentUser() default ANY;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default MIDDLE;
-}
\ No newline at end of file
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsurePackageNotInstalled.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsurePackageNotInstalled.java
deleted file mode 100644
index 9ce07a7..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsurePackageNotInstalled.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run only when a given package is not installed.
- *
- * <p>You can guarantee that these methods do not run on devices with the package by
- * using {@code DeviceState}.
- *
- * <p>Tests annotated with this will attempt to remove the package if it exists, or otherwise fail.
- * If you'd rather skip or fail tests immediately without attempting to remove see
- * {@link RequirePackageNotInstalled}.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Repeatable(EnsurePackagesNotInstalled.class)
-public @interface EnsurePackageNotInstalled {
-    String value();
-    DeviceState.UserType onUser() default DeviceState.UserType.CURRENT_USER;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default MIDDLE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsurePackagesNotInstalled.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsurePackagesNotInstalled.java
deleted file mode 100644
index 8913e05..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/EnsurePackagesNotInstalled.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
-
-import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RepeatingAnnotation
-public @interface EnsurePackagesNotInstalled {
-    EnsurePackageNotInstalled[] value();
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default MIDDLE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireAospBuild.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireAospBuild.java
deleted file mode 100644
index 830fa10..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireAospBuild.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-import static com.android.bedstead.harrier.annotations.RequireAospBuild.GMS_CORE_PACKAGE;
-import static com.android.bedstead.harrier.annotations.RequireAospBuild.GSF_PACKAGE;
-import static com.android.bedstead.harrier.annotations.RequireAospBuild.PLAY_STORE_PACKAGE;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RequirePackageNotInstalled(value = GMS_CORE_PACKAGE, onUser = DeviceState.UserType.ANY)
-@RequirePackageNotInstalled(value = PLAY_STORE_PACKAGE, onUser = DeviceState.UserType.ANY)
-@RequirePackageNotInstalled(value = GSF_PACKAGE, onUser = DeviceState.UserType.ANY)
-public @interface RequireAospBuild {
-    String GMS_CORE_PACKAGE = "com.google.android.gms";
-    String PLAY_STORE_PACKAGE = "com.android.vending";
-    String GSF_PACKAGE = "com.google.android.gsf";
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireDoesNotHaveFeatures.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireDoesNotHaveFeatures.java
deleted file mode 100644
index bbef533..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireDoesNotHaveFeatures.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RepeatingAnnotation
-public @interface RequireDoesNotHaveFeatures {
-    RequireDoesNotHaveFeature[] value();
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
\ No newline at end of file
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireFeature.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireFeature.java
deleted file mode 100644
index 98db494..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireFeature.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run only when the device has a given feature.
- *
- * <p>You can guarantee that these methods do not run on devices lacking the feature by
- * using {@code DeviceState}.
- *
- * <p>By default the test will be skipped if the feature is not available. If you'd rather the test
- * fail then use {@code failureMode = FailureMode.FAIL}.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Repeatable(RequireFeatures.class)
-public @interface RequireFeature {
-    String value();
-    FailureMode failureMode() default FailureMode.SKIP;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireFeatures.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireFeatures.java
deleted file mode 100644
index a949d6e..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireFeatures.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RepeatingAnnotation
-public @interface RequireFeatures {
-    RequireFeature[] value();
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireGmsBuild.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireGmsBuild.java
deleted file mode 100644
index 48e7984..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireGmsBuild.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-import static com.android.bedstead.harrier.annotations.RequireAospBuild.GMS_CORE_PACKAGE;
-import static com.android.bedstead.harrier.annotations.RequireAospBuild.GSF_PACKAGE;
-import static com.android.bedstead.harrier.annotations.RequireAospBuild.PLAY_STORE_PACKAGE;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RequirePackageInstalled(value = GMS_CORE_PACKAGE, onUser = DeviceState.UserType.ANY)
-@RequirePackageInstalled(value = PLAY_STORE_PACKAGE, onUser = DeviceState.UserType.ANY)
-@RequirePackageInstalled(value = GSF_PACKAGE, onUser = DeviceState.UserType.ANY)
-public @interface RequireGmsBuild {
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireGmsInstrumentation.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireGmsInstrumentation.java
deleted file mode 100644
index 44cbeff..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireGmsInstrumentation.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should be run using GMS Instrumentation for certain versions.
- *
- * <p>This will apply {@link RequireSdkVersion} to ensure that on the given versions, this test
- * only runs when the instrumented package is `com.google.android.gms`. It will also skip the test
- * if it is run with gms instrumentation on a version which does not require it.
- *
- * <p>This allows for two test configurations to be set up, one which instruments GMS and one
- * which does not - and both pointed at the same test sources.
- *
- * <p>Your test configuration may be configured so that this test is only run on a device with the
- * given state. Otherwise, you can use {@link DeviceState} to ensure that the test is
- * not run when the sdk version is not correct.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface RequireGmsInstrumentation {
-    int min() default 1;
-    int max() default Integer.MAX_VALUE;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireLowRamDevice.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireLowRamDevice.java
deleted file mode 100644
index 257cc2f..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireLowRamDevice.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to indicate that a test requires a low ram device.
- *
- * <p>This can be enforced by using {@link DeviceState}.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface RequireLowRamDevice {
-    String reason();
-    FailureMode failureMode() default FailureMode.SKIP;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireNotLowRamDevice.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireNotLowRamDevice.java
deleted file mode 100644
index 8d90920..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireNotLowRamDevice.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to indicate that a test does not run on low ram devices.
- *
- * <p>This can be enforced by using {@link DeviceState}.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface RequireNotLowRamDevice {
-    String reason();
-    FailureMode failureMode() default FailureMode.SKIP;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageInstalled.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageInstalled.java
deleted file mode 100644
index e2f3196..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageInstalled.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run only when a given package is installed.
- *
- * <p>You can guarantee that these methods do not run on devices lacking the package by
- * using {@code DeviceState}.
- *
- * <p>By default the test will be skipped if the package is not available. If you'd rather the test
- * fail then use {@code failureMode = FailureMode.FAIL}.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Repeatable(RequirePackagesInstalled.class)
-public @interface RequirePackageInstalled {
-    String value();
-    DeviceState.UserType onUser() default DeviceState.UserType.CURRENT_USER;
-    FailureMode failureMode() default FailureMode.SKIP;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageNotInstalled.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageNotInstalled.java
deleted file mode 100644
index 36375c1..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequirePackageNotInstalled.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run only when a given package is not installed.
- *
- * <p>You can guarantee that these methods do not run on devices with the package by
- * using {@code DeviceState}.
- *
- * <p>By default the test will be skipped if the package is available. If you'd rather the test
- * fail then use {@code failureMode = FailureMode.FAIL}. If you'd like to uninstall the package if
- * it is installed, see {@link EnsurePackageNotInstalled}.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Repeatable(RequirePackagesNotInstalled.class)
-public @interface RequirePackageNotInstalled {
-    String value();
-    DeviceState.UserType onUser() default DeviceState.UserType.CURRENT_USER;
-    FailureMode failureMode() default FailureMode.SKIP;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequirePackagesInstalled.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequirePackagesInstalled.java
deleted file mode 100644
index 6030303..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequirePackagesInstalled.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RepeatingAnnotation
-public @interface RequirePackagesInstalled {
-    RequirePackageInstalled[] value();
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequirePackagesNotInstalled.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequirePackagesNotInstalled.java
deleted file mode 100644
index f38ea63..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequirePackagesNotInstalled.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RepeatingAnnotation
-public @interface RequirePackagesNotInstalled {
-    RequirePackageNotInstalled[] value();
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunNotOnSecondaryUser.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunNotOnSecondaryUser.java
deleted file mode 100644
index 446bb85..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunNotOnSecondaryUser.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run on a non-secondary user.
- *
- * <p>Your test configuration should be such that this test is only run where a non-secondary user
- * is created and the test is being run on that user.
- *
- * <p>Optionally, you can guarantee that these methods do not run on a secondary user by
- * using {@link DeviceState}.
- *
- * <p>This annotation by default opts a test into multi-user presubmit. New tests should also be
- * annotated {@link Postsubmit} until they are shown to meet the multi-user presubmit
- * requirements.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-// To ensure that the test doesn't run on the secondary user we require that the test run on
-// the primary user to ensure consistent behaviour.
-@RequireRunOnPrimaryUser
-public @interface RequireRunNotOnSecondaryUser {
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnPrimaryUser.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnPrimaryUser.java
deleted file mode 100644
index a58eb28..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnPrimaryUser.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.OptionalBoolean;
-import com.android.bedstead.harrier.annotations.meta.RequireRunOnUserAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run on the primary user.
- *
- * <p>Your test configuration should be such that this test is only run on the primary user
- *
- * <p>Optionally, you can guarantee that these methods do not run outside of the primary
- * user by using {@link DeviceState}.
- *
- * <p>Note that in practice this requires that the test runs on the system user, but excludes
- * headless system users. To mark that a test should run on the system user, including headless
- * system users, see {@link RequireRunOnSystemUser}.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RequireRunOnUserAnnotation("android.os.usertype.full.SYSTEM")
-public @interface RequireRunOnPrimaryUser {
-    /**
-     * Should we ensure that we are switched to the given user
-     */
-    OptionalBoolean switchedToUser() default TRUE;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
\ No newline at end of file
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnSecondaryUser.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnSecondaryUser.java
deleted file mode 100644
index b3df118..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnSecondaryUser.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.OptionalBoolean;
-import com.android.bedstead.harrier.annotations.meta.RequireRunOnUserAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run on a secondary user.
- *
- * <p>Your test configuration should be such that this test is only run where a secondary user is
- * created and the test is being run on that user.
- *
- * <p>Optionally, you can guarantee that these methods do not run outside of a secondary user by
- * using {@link DeviceState}.
- *
- * <p>This annotation by default opts a test into multi-user presubmit. New tests should also be
- * annotated {@link Postsubmit} until they are shown to meet the multi-user presubmit
- * requirements.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RequireRunOnUserAnnotation("android.os.usertype.full.SECONDARY")
-public @interface RequireRunOnSecondaryUser {
-    /**
-     * Should we ensure that we are switched to the given user
-     */
-    OptionalBoolean switchedToUser() default TRUE;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnSystemUser.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnSystemUser.java
deleted file mode 100644
index 52c927e..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnSystemUser.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.OptionalBoolean;
-import com.android.bedstead.harrier.annotations.meta.RequireRunOnUserAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run on the system user.
- *
- * <p>Your test configuration should be such that this test is only run on the system user
- *
- * <p>Optionally, you can guarantee that these methods do not run outside of the system
- * user by using {@link DeviceState}.
- *
- * <p>Note that this requires that the test runs on the system user, including headless system
- * users. To mark that a test should run on the primary user, excluding headless
- * system users, see {@link RequireRunOnPrimaryUser}.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RequireRunOnUserAnnotation(
-        {"android.os.usertype.full.SYSTEM", "android.os.usertype.system.HEADLESS"})
-public @interface RequireRunOnSystemUser {
-    /**
-     * Should we ensure that we are switched to the given user
-     */
-    OptionalBoolean switchedToUser() default TRUE;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnTvProfile.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnTvProfile.java
deleted file mode 100644
index c2daad9..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnTvProfile.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.OptionalBoolean.ANY;
-import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.OptionalBoolean;
-import com.android.bedstead.harrier.annotations.meta.RequireRunOnProfileAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run within a Tv profile.
- *
- * <p>Your test configuration should be such that this test is only run where a Tv profile is
- * created and the test is being run within that user.
- *
- * <p>Optionally, you can guarantee that these methods do not run outside of a Tv
- * profile by using {@link DeviceState}.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RequireRunOnProfileAnnotation("com.android.tv.profile")
-public @interface RequireRunOnTvProfile {
-    OptionalBoolean installInstrumentedAppInParent() default ANY;
-
-    /**
-     * Should we ensure that we are switched to the parent of the profile.
-     */
-    OptionalBoolean switchedToParentUser() default TRUE;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
\ No newline at end of file
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnWorkProfile.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnWorkProfile.java
deleted file mode 100644
index b06a909..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireRunOnWorkProfile.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static android.content.pm.PackageManager.FEATURE_DEVICE_ADMIN;
-
-import static com.android.bedstead.harrier.OptionalBoolean.ANY;
-import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.OptionalBoolean;
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasProfileOwner;
-import com.android.bedstead.harrier.annotations.meta.RequireRunOnProfileAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should run within a work profile.
- *
- * <p>Your test configuration should be such that this test is only run where a work profile is
- * created and the test is being run within that user.
- *
- * <p>Optionally, you can guarantee that these methods do not run outside of a work
- * profile by using {@link DeviceState}.
- *
- * <p>This annotation by default opts a test into multi-user presubmit. New tests should also be
- * annotated {@link Postsubmit} until they are shown to meet the multi-user presubmit requirements.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RequireRunOnProfileAnnotation(value = "android.os.usertype.profile.MANAGED", hasProfileOwner = true)
-@EnsureHasProfileOwner
-@RequireFeature(FEATURE_DEVICE_ADMIN)
-public @interface RequireRunOnWorkProfile {
-    OptionalBoolean installInstrumentedAppInParent() default ANY;
-
-    /**
-     * Whether the profile owner's DPC should be returned by calls to {@link DeviceState#dpc()}.
-     *
-     * <p>Only one device policy controller per test should be marked as primary.
-     */
-    boolean dpcIsPrimary() default false;
-
-    /**
-     * Affiliation ids to be set for the profile owner.
-     */
-    String[] affiliationIds() default {};
-
-    /**
-     * Should we ensure that we are switched to the parent of the profile.
-     */
-    OptionalBoolean switchedToParentUser() default TRUE;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
\ No newline at end of file
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireSdkVersion.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireSdkVersion.java
deleted file mode 100644
index 8a272e9..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireSdkVersion.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should only run on specified sdk versions.
- *
- * <p>Your test configuration may be configured so that this test is only run on a device with the
- * given version. Otherwise, you can use {@link DeviceState} to ensure that the test is
- * not run when the sdk version is not correct.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface RequireSdkVersion {
-    int min() default 1;
-    int max() default Integer.MAX_VALUE;
-    String reason() default "";
-    FailureMode failureMode() default FailureMode.SKIP;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireUserSupported.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireUserSupported.java
deleted file mode 100644
index 325447c..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireUserSupported.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Repeatable;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test method should only run if a particular user type is supported
- *
- * <p>Your test configuration may be configured so that this test is only run on a user which
- * supports the user types. Otherwise, you can use {@link DeviceState} to ensure that the test is
- * not run when the user type is not supported.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@Repeatable(RequireUsersSupported.class)
-public @interface RequireUserSupported {
-    String value();
-    FailureMode failureMode() default FailureMode.SKIP;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireUsersSupported.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireUsersSupported.java
deleted file mode 100644
index 77102d3..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/RequireUsersSupported.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.EARLY;
-
-import com.android.bedstead.harrier.annotations.meta.RepeatingAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RepeatingAnnotation
-public @interface RequireUsersSupported {
-    RequireUserSupported[] value();
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default EARLY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/CanSetPolicyTest.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/CanSetPolicyTest.java
deleted file mode 100644
index f94fd62..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/CanSetPolicyTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
-
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.meta.RequiresBedsteadJUnit4;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark a test as testing the states where a policy is allowed to be applied.
- *
- * <p>This will generate parameterized runs for all matching states. Tests will only be run on
- * the same user as the DPC. If you wish to test that a policy applies across all relevant states,
- * use {@link PositivePolicyTest}.
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@RequiresBedsteadJUnit4
-public @interface CanSetPolicyTest {
-    /**
-     * The policy being tested.
-     *
-     * <p>This is used to calculate which states are required to be tested.
-     */
-    Class<?> policy();
-
-    /**
-     * If true, this test will only be run in a single state.
-     *
-     * <p>This is useful for tests of invalid inputs, where running in multiple states is unlikely
-     * to add meaningful coverage.
-     *
-     * By default, all states where the policy can be set will be included.
-     */
-    boolean singleTestOnly() default false;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default PRECEDENCE_NOT_IMPORTANT;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDelegate.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDelegate.java
deleted file mode 100644
index c581561..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDelegate.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test requires that the given admin delegates the given scope to a test app.
- *
- * <p>You should use {@link DeviceState} to ensure that the device enters
- * the correct state for the method. You can use {@link DeviceState#delegate()} to interact with
- * the delegate.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EnsureHasDelegate {
-
-    int ENSURE_HAS_DELEGATE_WEIGHT = DO_PO_WEIGHT + 1; // Should run after setting DO/PO
-
-    enum AdminType {
-        DEVICE_OWNER,
-        PROFILE_OWNER,
-        PRIMARY
-    }
-
-    /**
-     * The admin that should delegate this scope.
-     *
-     * <p>If this is set to {@link AdminType#PRIMARY} and {@link #isPrimary()} is true, then the
-     * delegate will replace the primary dpc as primary without error.
-     */
-    AdminType admin();
-
-    /** The scope being delegated. */
-    String[] scopes();
-
-    /**
-     * Whether this delegate should be returned by calls to {@link DeviceState#policyManager()}.
-     *
-     * <p>Only one policy manager per test should be marked as primary.
-     */
-    boolean isPrimary() default false;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default ENSURE_HAS_DELEGATE_WEIGHT;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDeviceOwner.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDeviceOwner.java
deleted file mode 100644
index 2fdfc9d..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasDeviceOwner.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
-
-import static android.content.pm.PackageManager.FEATURE_DEVICE_ADMIN;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.MIDDLE;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.FailureMode;
-import com.android.bedstead.harrier.annotations.RequireFeature;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test requires that a device owner is available on the device.
- *
- * <p>Your test configuration may be configured so that this test is only run on a device which has
- * a device owner. Otherwise, you can use {@link DeviceState} to ensure that the device enters
- * the correct state for the method. If using {@link DeviceState}, you can use
- * {@link DeviceState#deviceOwner()} to interact with the device owner.
- *
- * <p>When running on a device with a headless system user, enforcing this with {@link DeviceState}
- * will also result in the profile owner of the current user being set to the same device policy
- * controller.
- *
- * <p>If {@link DeviceState} is required to set the device owner (because there isn't one already)
- * then all users and accounts may be removed from the device.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RequireFeature(FEATURE_DEVICE_ADMIN)
-public @interface EnsureHasDeviceOwner {
-
-    int DO_PO_WEIGHT = MIDDLE;
-
-     /** Behaviour if the device owner cannot be set. */
-    FailureMode failureMode() default FailureMode.FAIL;
-
-    /**
-     * Whether this DPC should be returned by calls to {@link DeviceState#dpc()} or
-     * {@link DeviceState#policyManager()}}.
-     *
-     * <p>Only one policy manager per test should be marked as primary.
-     */
-    boolean isPrimary() default false;
-
-    /**
-     * Affiliation ids to be set for the device owner.
-     */
-    String[] affiliationIds() default {};
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default DO_PO_WEIGHT;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDelegate.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDelegate.java
deleted file mode 100644
index c0516f3..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDelegate.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDelegate.ENSURE_HAS_DELEGATE_WEIGHT;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test requires that the given admin does not delegate the given scope to a test app.
- *
- * <p>You should use {@link DeviceState} to ensure that the device enters
- * the correct state for the method.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EnsureHasNoDelegate {
-
-    enum AdminType {
-        DEVICE_OWNER,
-        PROFILE_OWNER,
-        PRIMARY,
-        ANY
-    }
-
-
-    /**
-     * The admin that should not delegate this scope.
-     *
-     * <p>Defaults to any admin
-     *
-     * <p>If this is set to {@link AdminType#PRIMARY} and {@link #isPrimary()} is true, then the
-     * delegate will replace the primary dpc as primary without error.
-     */
-    AdminType admin() default AdminType.ANY;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default ENSURE_HAS_DELEGATE_WEIGHT + 1; // Should run after setting delegate
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDeviceOwner.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDeviceOwner.java
deleted file mode 100644
index 307b554..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDeviceOwner.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test requires that there is no device owner on the device.
- *
- * <p>Your test configuration may be configured so that this test is only run on a device which has
- * no device owner. Otherwise, you can use {@link DeviceState} to ensure that the device enters
- * the correct state for the method.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EnsureHasNoDeviceOwner {
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default DO_PO_WEIGHT;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDpc.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDpc.java
deleted file mode 100644
index c97fd7f..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoDpc.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.EnsureHasNoWorkProfile;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test requires that there is no dpc on the device.
- *
- * <p>This checks that there is no device owner, the current user has no work profiles, and the
- * current user has no profile owner.
- *
- * <p>Your test configuration may be configured so that this test is only run on a device which has
- * no dpc. Otherwise, you can use {@link DeviceState} to ensure that the device enters
- * the correct state for the method.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@EnsureHasNoDeviceOwner
-@EnsureHasNoWorkProfile
-@EnsureHasNoProfileOwner
-public @interface EnsureHasNoDpc {
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default DO_PO_WEIGHT;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoProfileOwner.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoProfileOwner.java
deleted file mode 100644
index 561da3c..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasNoProfileOwner.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
-
-import static com.android.bedstead.harrier.DeviceState.UserType.CURRENT_USER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test requires that there is no profile owner on the given user.
- *
- * <p>You can use {@link DeviceState} to ensure that the device enters the correct state for the
- * method.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EnsureHasNoProfileOwner {
-    /** Which user type the profile owner should not be attached to. */
-    DeviceState.UserType onUser() default CURRENT_USER;
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default DO_PO_WEIGHT;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasProfileOwner.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasProfileOwner.java
deleted file mode 100644
index a408a4d..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnsureHasProfileOwner.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
-
-import static android.content.pm.PackageManager.FEATURE_DEVICE_ADMIN;
-
-import static com.android.bedstead.harrier.DeviceState.UserType.CURRENT_USER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner.DO_PO_WEIGHT;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.RequireFeature;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark that a test requires that a profile owner is set.
- *
- * <p>You can use {@link DeviceState} to ensure that the device enters
- * the correct state for the method. If using {@link DeviceState}, you can use
- * {@link DeviceState#profileOwner()} to interact with the profile owner.
- */
-@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@RequireFeature(FEATURE_DEVICE_ADMIN)
-public @interface EnsureHasProfileOwner {
-    /** Which user type the work profile should be attached to. */
-    DeviceState.UserType onUser() default CURRENT_USER;
-
-    /**
-     * Whether this DPC should be returned by calls to {@link DeviceState#dpc()} or
-     * {@link DeviceState#policyManager()}}.
-     *
-     * <p>Only one policy manager per test should be marked as primary.
-     */
-    boolean isPrimary() default false;
-
-    /**
-     * Affiliation ids to be set for the profile owner.
-     */
-    String[] affiliationIds() default {};
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default DO_PO_WEIGHT;
-}
\ No newline at end of file
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnterprisePolicy.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnterprisePolicy.java
deleted file mode 100644
index 9b3c16a..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/EnterprisePolicy.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Used to annotate an enterprise policy for use with {@link NegativePolicyTest} and
- * {@link PositivePolicyTest}.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface EnterprisePolicy {
-
-    /**
-     * An enterprise policy which can be controlled using permissions.
-     */
-    @interface Permission {
-        /** The permission required to exercise the policy. */
-        String appliedWith();
-        /** Flags indicating who the policy applies to when applied in this way. */
-        int appliesTo();
-        /** Additional modifiers. */
-        int modifiers() default NO;
-    }
-
-    /**
-     * An enterprise policy which can be controlled user app ops.
-     */
-    @interface AppOp {
-        /** The AppOp required to exercise the policy. */
-        String appliedWith();
-        /** Flags indicating who the policy applies to when applied in this way. */
-        int appliesTo();
-        /** Additional modifiers. */
-        int modifiers() default NO;
-    }
-
-    /**
-     * An enterprise policy which can be controlled by an app with a particular delegated scope.
-     */
-    @interface DelegatedScope {
-         /** The delegated scope required to exercise the policy. */
-        String scope();
-        /** Flags indicating who the policy applies to when applied in this way. */
-        int appliesTo();
-        /** Additional modifiers. */
-        int modifiers() default NO;
-    }
-
-    /** A policy that cannot be applied. */
-    int NO = 0;
-
-    /** A policy which applies to the user of the package which applied the policy. */
-    int APPLIES_TO_OWN_USER = 1;
-    /** A policy which applies to unaffiliated other users. */
-    int APPLIES_TO_UNAFFILIATED_OTHER_USERS = 1 << 1;
-    /** A policy which applies to affiliated other users. */
-    int APPLIES_TO_AFFILIATED_OTHER_USERS = 1 << 2;
-    /** A policy which applies to unaffiliated profiles of the user of the package which applied the policy. */
-    int APPLIES_TO_UNAFFILIATED_CHILD_PROFILES = 1 << 3;
-    /** A policy which applies to affiliated profiles of the user of the package which applied the policy. */
-    int APPLIES_TO_AFFILIATED_CHILD_PROFILES = 1 << 4;
-    /** A policy that applies to the parent of the profile of the package which applied the policy. */
-    int APPLIES_TO_PARENT = 1 << 5;
-
-    /** A policy that applies to affiliated or unaffiliate profiles of the package which applied the policy. */
-    int APPLIES_TO_CHILD_PROFILES =
-            APPLIES_TO_UNAFFILIATED_CHILD_PROFILES | APPLIES_TO_AFFILIATED_CHILD_PROFILES;
-    /** A policy that applies to affiliated or unaffiliated other users. */
-    int APPLIES_TO_OTHER_USERS =
-            APPLIES_TO_UNAFFILIATED_OTHER_USERS | APPLIES_TO_AFFILIATED_OTHER_USERS;
-
-    /** A policy that applies to all users on the device. */
-    int APPLIES_GLOBALLY = APPLIES_TO_OWN_USER | APPLIES_TO_OTHER_USERS | APPLIES_TO_CHILD_PROFILES;
-
-
-    // Applied by
-
-    /** A policy that can be applied by a device owner. */
-    int APPLIED_BY_DEVICE_OWNER = 1 << 6;
-    /** A policy that can be applied by a profile owner of an unaffiliated profile. */
-    int APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE = 1 << 7;
-    /** A policy that can be applied by a profile owner of an affiliated profile */
-    int APPLIED_BY_AFFILIATED_PROFILE_OWNER_PROFILE = 1 << 8;
-    /** A policy that can be applied by a profile owner of a cope profile */
-    int APPLIED_BY_COPE_PROFILE_OWNER = 1 << 9;
-
-    /** A policy that can be applied by a profile owner of an affiliated or unaffiliated profile.
-     * This does not include cope profiles. */
-    int APPLIED_BY_PROFILE_OWNER_PROFILE =
-            APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_PROFILE
-                    | APPLIED_BY_AFFILIATED_PROFILE_OWNER_PROFILE;
-    /**
-     * A policy that can be applied by a Profile Owner for a User (not Profile) with no Device
-     * Owner.
-     */
-    int APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO = 1 << 10;
-    /**
-     * A policy that can be applied by an unaffiliated Profile Owner for a User (not Profile) with
-     * a Device Owner.
-     */
-    int APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER_WITH_DO = 1 << 11;
-    /** A policy that can be applied by a profile owner of an unaffiliated user. */
-    int APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER =
-            APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO
-                    | APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER_WITH_DO;
-    /** A policy that can be applied by a profile owner of an affiliated user. */
-    int APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER = 1 << 12;
-    /** A policy that can be applied by an affiliated or unaffiliated profile owner on a User (not Profile). */
-    int APPLIED_BY_PROFILE_OWNER_USER =
-            APPLIED_BY_UNAFFILIATED_PROFILE_OWNER_USER | APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER;
-    /** A policy that can be applied by an affiliated profile owner on a user or profile. */
-    int APPLIED_BY_AFFILIATED_PROFILE_OWNER = APPLIED_BY_AFFILIATED_PROFILE_OWNER_PROFILE | APPLIED_BY_AFFILIATED_PROFILE_OWNER_USER;
-    /** A policy that can be applied by a profile owner, affiliate or unaffiliated, running on a user or profile. */
-    int APPLIED_BY_PROFILE_OWNER =
-            APPLIED_BY_PROFILE_OWNER_PROFILE
-            | APPLIED_BY_PROFILE_OWNER_USER;
-
-    int APPLIED_BY_PARENT_INSTANCE_OF_NON_COPE_PROFILE_OWNER_PROFILE = 1 << 13;
-    int APPLIED_BY_PARENT_INSTANCE_OF_COPE_PROFILE_OWNER_PROFILE = 1 << 14;
-
-    int APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER_PROFILE =
-            APPLIED_BY_PARENT_INSTANCE_OF_NON_COPE_PROFILE_OWNER_PROFILE | APPLIED_BY_PARENT_INSTANCE_OF_COPE_PROFILE_OWNER_PROFILE;
-
-    int APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER_USER = 1 << 15;
-
-    int APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER =
-            APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER_USER
-                    | APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER_PROFILE;
-
-    // Modifiers
-    /** Internal use only. Do not use */
-    // This is to be used to mark specific annotations as not generating negative tests
-    int DO_NOT_APPLY_TO_NEGATIVE_TESTS = 1 << 16;
-
-    /**
-     * A policy which applies even when the user is not in the foreground.
-     *
-     * <p>Note that lacking this flag does not mean a policy does not apply - to indicate that use
-     * {@link DOES_NOT_APPLY_IN_BACKGROUND}. */
-    int APPLIES_IN_BACKGROUND = 1 << 17 | (DO_NOT_APPLY_TO_NEGATIVE_TESTS);
-    /**
-     * A policy which does not apply when the user is not in the foreground.
-     *
-     * <p>At present this does not generate any additional tests but may do in future.
-     *
-     * <p>Note that lacking this flag does not mean a policy does apply - to indicate that use
-     * {@link APPLIES_IN_BACKGROUND}. */
-    int DOES_NOT_APPLY_IN_BACKGROUND = 1 << 18;
-
-
-    /**
-     * A policy which can be applied by a delegate.
-     *
-     * See {@link #delegatedScopes()} for the scopes which enable this.
-     */
-    int CAN_BE_DELEGATED = 1 << 19;
-
-    /** Flags indicating DPC states which can set the policy. */
-    int[] dpc() default {};
-
-    /**
-     * {@link Permission} indicating which permissions can control the policy.
-     *
-     * <p>Note that this currently does not generate any additional tests but may do in future.
-     */
-    Permission[] permissions() default {};
-
-    /**
-     * {@link AppOp} indicating which AppOps can control the policy.
-     *
-     * <p>Note that this currently does not generate any additional tests but may do in future.
-     */
-    AppOp[] appOps() default {};
-
-    /**
-     * {@link DelegatedScope} indicating which delegated scopes can control the policy.
-     *
-     * <p>This applies to {@link #dpc()} entries with the {@link #CAN_BE_DELEGATED} flag.
-     */
-    String[] delegatedScopes() default {};
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/NegativePolicyTest.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/NegativePolicyTest.java
deleted file mode 100644
index 4dfdace..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/NegativePolicyTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
-
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.meta.RequiresBedsteadJUnit4;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark a test as testing the states where a policy is applied (by a Device Owner or Profile Owner)
- * and it should not apply to the user the test is running on.
- *
- * <p>This will generate parameterized runs for all matching states.
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@RequiresBedsteadJUnit4
-public @interface NegativePolicyTest {
-    /**
-     * The policy being tested.
-     *
-     * <p>This is used to calculate which states are required to be tested.
-     */
-    Class<?> policy();
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default PRECEDENCE_NOT_IMPORTANT;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/PositivePolicyTest.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/PositivePolicyTest.java
deleted file mode 100644
index 32a0626..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/enterprise/PositivePolicyTest.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.enterprise;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.PRECEDENCE_NOT_IMPORTANT;
-
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.meta.RequiresBedsteadJUnit4;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark a test as testing the states where a policy is applied (by a Device Owner or Profile Owner)
- * and it should apply to the user the test is running on.
- *
- * <p>This will generated parameterized runs for all matching states.
- */
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-@RequiresBedsteadJUnit4
-public @interface PositivePolicyTest {
-    /**
-     * The policy being tested.
-     *
-     * <p>This is used to calculate which states are required to be tested.
-     */
-    Class<?> policy();
-
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default PRECEDENCE_NOT_IMPORTANT;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoProfile.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoProfile.java
deleted file mode 100644
index fdd78f0..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasNoProfile.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.meta;
-
-import static com.android.bedstead.harrier.DeviceState.UserType.CURRENT_USER;
-
-import com.android.bedstead.harrier.DeviceState;
-
-import java.lang.annotation.Target;
-
-/**
- * This annotation should not be used directly. It exists as a template for annotations which
- * ensure that a given user does not have a specific profile type.
- */
-@Target({})
-public @interface EnsureHasNoProfile {
-    DeviceState.UserType forUser() default CURRENT_USER;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasProfile.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasProfile.java
deleted file mode 100644
index b9b3e08..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/EnsureHasProfile.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.meta;
-
-import static com.android.bedstead.harrier.DeviceState.UserType.CURRENT_USER;
-import static com.android.bedstead.harrier.OptionalBoolean.ANY;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.OptionalBoolean;
-
-import java.lang.annotation.Target;
-
-/**
- * This annotation should not be used directly. It exists as a template for annotations which
- * ensure that a given user has a specific profile type.
- */
-@Target({})
-public @interface EnsureHasProfile {
-    /** Which user type the profile should be attached to. */
-    DeviceState.UserType forUser() default CURRENT_USER;
-
-    /** Whether the test app should be installed in the profile. */
-    boolean installTestApp() default true;
-
-    /**
-     * Whether the profile owner's DPC should be returned by calls to {@link DeviceState#dpc()}.
-     *
-     * <p>Only one device policy controller per test should be marked as primary.
-     */
-    // NOTE: This field is only required if hasProfileOwner=true
-    boolean dpcIsPrimary() default false;
-
-    /**
-     * Should we ensure that we are switched to the parent of the profile.
-     */
-    OptionalBoolean switchedToParentUser() default ANY;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/ParameterizedAnnotation.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/ParameterizedAnnotation.java
deleted file mode 100644
index bab40ca..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/ParameterizedAnnotation.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.meta;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Mark a Harrier annotation as being Parameterized.
- *
- * <p>There will be a separate run generated for the annotated method for each
- * {@link ParameterizedAnnotation} annotation. The test will be named methodName[paramName].
- *
- * <p>If any {@link ParameterizedAnnotation} annotations are applied to a test, then the basic
- * un-parameterized test will not be run.
- */
-@Target(ElementType.ANNOTATION_TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@RequiresBedsteadJUnit4
-public @interface ParameterizedAnnotation {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnProfile.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnProfile.java
deleted file mode 100644
index 6bc4087..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/meta/RequireRunOnProfile.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.meta;
-
-import static com.android.bedstead.harrier.OptionalBoolean.ANY;
-import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.OptionalBoolean;
-
-import java.lang.annotation.Target;
-
-/**
- * This annotation should not be used directly. It exists as a template for annotations which
- * ensure that a test runs on a given profile type.
- */
-@Target({})
-public @interface RequireRunOnProfile {
-    OptionalBoolean installInstrumentedAppInParent() default ANY;
-
-    /**
-     * Whether the profile owner's DPC should be returned by calls to {@link DeviceState#dpc()}.
-     *
-     * <p>Only one device policy controller per test should be marked as primary.
-     */
-    // NOTE: This field is only required if hasProfileOwner=true
-    boolean dpcIsPrimary() default false;
-
-    /**
-     * Affiliation ids to be set for the profile owner.
-     */
-    // NOTE: This field is only required if hasProfileOwner=true
-    String[] affiliationIds() default {};
-
-    /**
-     * Should we ensure that we are switched to the parent of the profile.
-     */
-    OptionalBoolean switchedToParentUser() default TRUE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnAffiliatedDeviceOwnerSecondaryUser.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnAffiliatedDeviceOwnerSecondaryUser.java
deleted file mode 100644
index 284d7d2..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnAffiliatedDeviceOwnerSecondaryUser.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
-
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser;
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasProfileOwner;
-import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Parameterize a test so that it runs on a affiliated secondary user on a device with a
- * Device Owner.
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@ParameterizedAnnotation
-@RequireRunOnSecondaryUser
-@EnsureHasDeviceOwner(isPrimary = true, affiliationIds = "affiliated")
-@EnsureHasProfileOwner(affiliationIds = "affiliated")
-public @interface IncludeRunOnAffiliatedDeviceOwnerSecondaryUser {
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default LATE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnAffiliatedProfileOwnerSecondaryUser.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnAffiliatedProfileOwnerSecondaryUser.java
deleted file mode 100644
index 08637b8..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnAffiliatedProfileOwnerSecondaryUser.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
-
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser;
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasProfileOwner;
-import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Parameterize a test so that it runs on a affiliated secondary user on a device with a
- * Device Owner - with the profile owner set as primary.
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@ParameterizedAnnotation
-@RequireRunOnSecondaryUser
-@EnsureHasDeviceOwner(affiliationIds = "affiliated")
-@EnsureHasProfileOwner(affiliationIds = "affiliated", isPrimary = true)
-public @interface IncludeRunOnAffiliatedProfileOwnerSecondaryUser {
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default LATE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnNonAffiliatedDeviceOwnerSecondaryUser.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnNonAffiliatedDeviceOwnerSecondaryUser.java
deleted file mode 100644
index 75c047e..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnNonAffiliatedDeviceOwnerSecondaryUser.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
-
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser;
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
-import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Parameterize a test so that it runs on a non-affiliated secondary user on a device with a
- * Device Owner.
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@ParameterizedAnnotation
-@RequireRunOnSecondaryUser
-@EnsureHasDeviceOwner(isPrimary = true, affiliationIds = {})
-public @interface IncludeRunOnNonAffiliatedDeviceOwnerSecondaryUser {
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default LATE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfCorporateOwnedProfileOwner.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfCorporateOwnedProfileOwner.java
deleted file mode 100644
index 61c5f19..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfCorporateOwnedProfileOwner.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
-
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
-import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Parameterize a test so that it runs on the parent of a corporate-owned profile owner.
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@ParameterizedAnnotation
-@RequireRunOnPrimaryUser
-// TODO(scottjonathan): Add annotation to create corporate-owned profile
-public @interface IncludeRunOnParentOfCorporateOwnedProfileOwner {
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default LATE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner.java
deleted file mode 100644
index 1ed3c33..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
-
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile;
-import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDeviceOwner;
-import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Parameterize a test so that it runs on the parent of a profile owner.
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@ParameterizedAnnotation
-@RequireRunOnPrimaryUser
-@EnsureHasNoDeviceOwner
-@EnsureHasWorkProfile(dpcIsPrimary = true)
-public @interface IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner {
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default LATE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnProfileOwnerPrimaryUser.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnProfileOwnerPrimaryUser.java
deleted file mode 100644
index 17b5240..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnProfileOwnerPrimaryUser.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
-
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDeviceOwner;
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasProfileOwner;
-import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Parameterize a test so that it runs on the primary user
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@ParameterizedAnnotation
-// Explicitly primary user which excludes headless users as this isn't a valid mode on headless
-@RequireRunOnPrimaryUser
-@EnsureHasNoDeviceOwner
-@EnsureHasProfileOwner(isPrimary = true)
-public @interface IncludeRunOnProfileOwnerPrimaryUser {
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default LATE;
-}
\ No newline at end of file
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile.java
deleted file mode 100644
index 303e123..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/annotations/parameterized/IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.annotations.parameterized;
-
-import static com.android.bedstead.harrier.annotations.AnnotationRunPrecedence.LATE;
-
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.AnnotationRunPrecedence;
-import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile;
-import com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser;
-import com.android.bedstead.harrier.annotations.meta.ParameterizedAnnotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Parameterize a test so that it runs on a device which has a primary and work profile, but runs
- * the test on a secondary user which is in a different profile group.
- */
-@Target({ElementType.METHOD, ElementType.TYPE})
-@Retention(RetentionPolicy.RUNTIME)
-@ParameterizedAnnotation
-@RequireRunOnSecondaryUser
-@EnsureHasWorkProfile(forUser = DeviceState.UserType.PRIMARY_USER, dpcIsPrimary = true)
-public @interface IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile {
-    /**
-     * Weight sets the order that annotations will be resolved.
-     *
-     * <p>Annotations with a lower weight will be resolved before annotations with a higher weight.
-     *
-     * <p>If there is an order requirement between annotations, ensure that the weight of the
-     * annotation which must be resolved first is lower than the one which must be resolved later.
-     *
-     * <p>Weight can be set to a {@link AnnotationRunPrecedence} constant, or to any {@link int}.
-     */
-    int weight() default LATE;
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/AccountManagement.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/AccountManagement.java
deleted file mode 100644
index 375ef7c..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/AccountManagement.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policy for account management tests.
- *
- * <p>This is used by {@link
- * DevicePolicyManager#setAccountManagementDisabled(ComponentName, String, boolean)} and
- * {@link DevicePolicyManager#getAccountTypesWithManagementDisabled()}.
- */
-@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER)
-public final class AccountManagement {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/ApplicationRestrictions.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/ApplicationRestrictions.java
deleted file mode 100644
index 9e30dad..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/ApplicationRestrictions.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static android.app.admin.DevicePolicyManager.DELEGATION_APP_RESTRICTIONS;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_IN_BACKGROUND;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.os.Bundle;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policy for application restrictions.
- *
- * <p>This is used by methods such as
- * {@link DevicePolicyManager#setApplicationRestrictions(ComponentName, String, Bundle)} and
- * {@link DevicePolicyManager#getApplicationRestrictions(ComponentName, String)}.
- */
-@EnterprisePolicy(
-        dpc = {
-            APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | APPLIES_IN_BACKGROUND | CAN_BE_DELEGATED,
-            APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED},
-        delegatedScopes = DELEGATION_APP_RESTRICTIONS
-        )
-public final class ApplicationRestrictions {
-}
\ No newline at end of file
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/ApplicationRestrictionsManagingPackage.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/ApplicationRestrictionsManagingPackage.java
deleted file mode 100644
index 379b071..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/ApplicationRestrictionsManagingPackage.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_IN_BACKGROUND;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.os.Bundle;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policy for application restrictions.
- *
- * <p>This is used by the method
- * {@link DevicePolicyManager#setApplicationRestrictionsManagingPackage(ComponentName, String, Bundle)}
- */
-@EnterprisePolicy(
-        dpc = {
-                APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | APPLIES_IN_BACKGROUND,
-                APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER})
-public final class ApplicationRestrictionsManagingPackage {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/CaCertManagement.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/CaCertManagement.java
deleted file mode 100644
index 4a6d384..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/CaCertManagement.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policies around installing/uninstalling CaCerts
- *
- * <p>This is used by methods such as
- * {@link DevicePolicyManager#installCaCert(ComponentName, byte[])} and
- * {@link DevicePolicyManager#uninstallCaCert(ComponentName, byte[])}.
- */
-@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER})
-public final class CaCertManagement {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/CameraPolicy.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/CameraPolicy.java
deleted file mode 100644
index 4309473..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/CameraPolicy.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_PROFILE;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_GLOBALLY;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policy for application restrictions.
- *
- * <p>This is used by methods such as
- * {@link DevicePolicyManager#setCameraDisabled(ComponentName, boolean)} and
- * {@link DevicePolicyManager#getCameraDisabled(ComponentName)}.
- */
-// TODO(b/201753989):  Update the profileOwner flag once the behaviour of setCameraDisabled
-//  is properly defined on secondary user POs.
-@EnterprisePolicy(dpc = {
-        APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO | APPLIES_GLOBALLY,
-        APPLIED_BY_PROFILE_OWNER_PROFILE | APPLIES_TO_OWN_USER
-})
-public class CameraPolicy {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/CreateAndManageUser.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/CreateAndManageUser.java
deleted file mode 100644
index c1c62c1..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/CreateAndManageUser.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.os.PersistableBundle;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policy for create and manage user.
- *
- * <p>This is used by methods such as {@link DevicePolicyManager#createAndManageUser(
- * ComponentName, String, ComponentName, PersistableBundle, int)}.
- */
-@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER})
-public final class CreateAndManageUser {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/DefaultSmsApplication.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/DefaultSmsApplication.java
deleted file mode 100644
index c7d8f80..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/DefaultSmsApplication.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policy for set default SMS application test.
- *
- * <p>This is used by {@link DevicePolicyManager#setDefaultSmsApplication(ComponentName, String)}.
- */
-@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER)
-public final class DefaultSmsApplication {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/Delegation.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/Delegation.java
deleted file mode 100644
index 5bcde92..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/Delegation.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-import java.util.List;
-
-/**
- * Policy for general admin delegation that doesn't have additional scope-specific constraints on
- * the admin type. Specific delegations with these constraints have their own policies.
- *
- * <p>This is used for methods such as {@link
- * DevicePolicyManager#setDelegatedScopes(ComponentName, String, List)}.
- */
-@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER})
-public final class Delegation {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/EnrollmentSpecificId.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/EnrollmentSpecificId.java
deleted file mode 100644
index 2311c5e..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/EnrollmentSpecificId.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policy for testing enrollment specific ID.
- * See {@link DevicePolicyManager#getEnrollmentSpecificId()} for more detail.
- */
-@EnterprisePolicy(dpc = {
-        APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER,
-        APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER
-})
-public final class EnrollmentSpecificId {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/KeyManagement.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/KeyManagement.java
deleted file mode 100644
index 9d409e6..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/KeyManagement.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-import java.security.PrivateKey;
-import java.security.cert.Certificate;
-
-/**
- * Policies around key management
- *
- * <p>This is used by methods such as
- * {@link DevicePolicyManager#installKeyPair(ComponentName, PrivateKey, Certificate, String)} and
- * {@link DevicePolicyManager#removeKeyPair(ComponentName, String)}.
- */
-@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER,
-        APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER})
-public final class KeyManagement {
-}
\ No newline at end of file
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/LockTask.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/LockTask.java
deleted file mode 100644
index a4e8124..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/LockTask.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_AFFILIATED_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policies around Lock Task mode
- * (https://developer.android.com/work/dpc/dedicated-devices/lock-task-mode).
- *
- * <p>This is used by methods such as
- * {@link DevicePolicyManager#setLockTaskFeatures(ComponentName, int)} and
- * {@link DevicePolicyManager#setLockTaskPackages(ComponentName, String[])}.
- */
-@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER,
-                    APPLIED_BY_AFFILIATED_PROFILE_OWNER | APPLIED_BY_PROFILE_OWNER_USER_WITH_NO_DO | APPLIES_TO_OWN_USER})
-public final class LockTask {
-}
\ No newline at end of file
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/LockscreenPolicyWithUnifiedChallenge.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/LockscreenPolicyWithUnifiedChallenge.java
deleted file mode 100644
index 7a49b82..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/LockscreenPolicyWithUnifiedChallenge.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_PARENT;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Lockscreen policies, e.g. password quality, length, history length, attempts before wipe.
- * Parent profile is affected only when work profile has unified challenge (i.e. no separate lock),
- * which is why this policy has to be specific to this case.
- *
- * <p>This is used by methods such as
- * {@link DevicePolicyManager#setPasswordQuality(ComponentName, int)}
- */
-@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER,
-        APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER | APPLIES_TO_PARENT})
-public class LockscreenPolicyWithUnifiedChallenge {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/NetworkLoggingDelegation.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/NetworkLoggingDelegation.java
deleted file mode 100644
index ae4dfcd..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/NetworkLoggingDelegation.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_PROFILE;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-import java.util.List;
-
-/**
- * Policy for network logging delegation.
- *
- * <p>This is used for methods such as {@link
- * DevicePolicyManager#setDelegatedScopes(ComponentName, String, List)} with scope {@link
- * DevicePolicyManager#DELEGATION_NETWORK_LOGGING}.
- */
-@EnterprisePolicy(dpc = {
-        APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER_PROFILE | APPLIES_TO_OWN_USER})
-public final class NetworkLoggingDelegation {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/PreferentialNetworkService.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/PreferentialNetworkService.java
deleted file mode 100644
index 45185a9..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/PreferentialNetworkService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_PROFILE;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policy for testing preferential network service.
- * See {@link DevicePolicyManager#setPreferentialNetworkServiceEnabled(boolean)} for more detail.
- */
-@EnterprisePolicy(dpc = APPLIED_BY_PROFILE_OWNER_PROFILE | APPLIES_TO_OWN_USER)
-public final class PreferentialNetworkService {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/ResetPasswordWithToken.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/ResetPasswordWithToken.java
deleted file mode 100644
index 82a30a8..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/ResetPasswordWithToken.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policies around resetting a new device password
- *
- * <p>This is used by methods such as
- * {@link DevicePolicyManager#resetPasswordWithToken(ComponentName, String, byte[], int)}
- */
-@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER,
-        APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER})
-public class ResetPasswordWithToken {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/ScreenCaptureDisabled.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/ScreenCaptureDisabled.java
deleted file mode 100644
index e165663..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/ScreenCaptureDisabled.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policy for disabling screen capture.
- *
- * <p>Users of this policy are
- * {@link DevicePolicyManager#setScreenCaptureDisabled(ComponentName, boolean)}.
- */
-@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER
-        | APPLIED_BY_PARENT_INSTANCE_OF_PROFILE_OWNER | APPLIES_TO_OWN_USER)
-public final class ScreenCaptureDisabled {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SecurityLoggingDelegation.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SecurityLoggingDelegation.java
deleted file mode 100644
index b8f7617..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SecurityLoggingDelegation.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-import java.util.List;
-
-/**
- * Policy for security logging delegation.
- *
- * <p>This is used for methods such as {@link
- * DevicePolicyManager#setDelegatedScopes(ComponentName, String, List)} with scope {@link
- * DevicePolicyManager#DELEGATION_SECURITY_LOGGING}.
- */
-// TODO(b/198774281): COPE profile POs can call this too, but we need to add the flag.
-@EnterprisePolicy(dpc = {APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER})
-public final class SecurityLoggingDelegation {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SetPermissionGrantState.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SetPermissionGrantState.java
deleted file mode 100644
index bc3861a..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SetPermissionGrantState.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static android.app.admin.DevicePolicyManager.DELEGATION_PERMISSION_GRANT;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policies around setting the grant state of a basic permission.
- *
- * <p>This is used by
- * {@link DevicePolicyManager#setPermissionGrantState(ComponentName, String, String, int)} when
- * granting permissions not covered by other policies.
- */
-@EnterprisePolicy(
-        dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER | CAN_BE_DELEGATED,
-        delegatedScopes = DELEGATION_PERMISSION_GRANT)
-public final class SetPermissionGrantState {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SetSensorPermissionGranted.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SetSensorPermissionGranted.java
deleted file mode 100644
index 9e1e832..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SetSensorPermissionGranted.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policies around setting the grant state of a sensor permission.
- *
- * <p>This is used by
- * {@link DevicePolicyManager#setPermissionGrantState(ComponentName, String, String, int)} when
- * granting sensor permissions.
- */
-@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER)
-public final class SetSensorPermissionGranted {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SetSmsPermissionGranted.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SetSmsPermissionGranted.java
deleted file mode 100644
index fac7dcd..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SetSmsPermissionGranted.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static android.app.admin.DevicePolicyManager.DELEGATION_PERMISSION_GRANT;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER_USER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.CAN_BE_DELEGATED;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policies around setting the grant state of a SMS related permission.
- *
- * <p>This is used by
- * {@link DevicePolicyManager#setPermissionGrantState(ComponentName, String, String, int)} when
- * granting sms-related permissions.
- */
-// TODO(198311372): Check if APPLIED_BY_PROFILE_OWNER_USER is expected
-@EnterprisePolicy(
-        dpc = APPLIED_BY_DEVICE_OWNER | APPLIES_TO_OWN_USER | APPLIED_BY_PROFILE_OWNER_USER | CAN_BE_DELEGATED,
-        delegatedScopes = DELEGATION_PERMISSION_GRANT)
-public final class SetSmsPermissionGranted {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SupportMessage.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SupportMessage.java
deleted file mode 100644
index b963290..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/SupportMessage.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_PROFILE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_TO_OWN_USER;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-/**
- * Policy for long and short support messages.
- *
- * <p>Users of this policy are {@link DevicePolicyManager#setLongSupportMessage(ComponentName,
- * CharSequence)}, {@link DevicePolicyManager#setShortSupportMessage(ComponentName, CharSequence)},
- * {@link DevicePolicyManager#getLongSupportMessage(ComponentName)} and {@link
- * DevicePolicyManager#getShortSupportMessage(ComponentName)}.
- */
-@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIED_BY_PROFILE_OWNER | APPLIES_TO_OWN_USER)
-public final class SupportMessage {
-}
diff --git a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/UserControlDisabledPackages.java b/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/UserControlDisabledPackages.java
deleted file mode 100644
index 2adaf92..0000000
--- a/common/device-side/bedstead/harrier/src/main/java/com/android/bedstead/harrier/policies/UserControlDisabledPackages.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.harrier.policies;
-
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIED_BY_DEVICE_OWNER;
-import static com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy.APPLIES_GLOBALLY;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-
-import com.android.bedstead.harrier.annotations.enterprise.EnterprisePolicy;
-
-import java.util.List;
-
-/**
- * Policy for user control disabled packages.
- *
- * <p>This is used by methods such as
- * {@link DevicePolicyManager#setUserControlDisabledPackages(ComponentName, List)} and
- * {@link DevicePolicyManager#getUserControlDisabledPackages(ComponentName)}.
- */
-@EnterprisePolicy(dpc = APPLIED_BY_DEVICE_OWNER | APPLIES_GLOBALLY)
-public final class UserControlDisabledPackages {
-}
diff --git a/common/device-side/bedstead/harrier/src/test/java/com/android/bedstead/harrier/BedsteadJUnit4Test.java b/common/device-side/bedstead/harrier/src/test/java/com/android/bedstead/harrier/BedsteadJUnit4Test.java
new file mode 100644
index 0000000..29f7758
--- /dev/null
+++ b/common/device-side/bedstead/harrier/src/test/java/com/android/bedstead/harrier/BedsteadJUnit4Test.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2021 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.bedstead.harrier;
+
+import static com.android.bedstead.harrier.UserType.PRIMARY_USER;
+import static com.android.bedstead.harrier.UserType.WORK_PROFILE;
+import static com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_PROFILES;
+import static com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_USERS;
+import static com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_USERS_FULL;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.bedstead.harrier.annotations.AfterClass;
+import com.android.bedstead.harrier.annotations.CrossUserTest;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.EnumTestParameter;
+import com.android.bedstead.harrier.annotations.IntTestParameter;
+import com.android.bedstead.harrier.annotations.PermissionTest;
+import com.android.bedstead.harrier.annotations.StringTestParameter;
+import com.android.bedstead.harrier.annotations.UserPair;
+import com.android.bedstead.harrier.annotations.UserTest;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnDeviceOwnerUser;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnProfileOwnerPrimaryUser;
+import com.android.bedstead.nene.TestApis;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@RunWith(BedsteadJUnit4.class)
+public class BedsteadJUnit4Test {
+
+    @ClassRule @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    @StringTestParameter({"A", "B"})
+    @Retention(RetentionPolicy.RUNTIME)
+    private @interface TwoValuesStringTestParameter {
+
+    }
+
+    private enum EnumWithThreeValues {
+        ONE, TWO, THREE
+    }
+
+    private static int sSimpleParameterizedCalls = 0;
+    private static int sMultipleSimpleParameterizedCalls = 0;
+    private static int sBedsteadParameterizedCalls = 0;
+    private static int sBedsteadPlusSimpleParameterizedCalls = 0;
+    private static int sIndirectParameterizedCalls = 0;
+    private static int sIntParameterizedCalls = 0;
+    private static int sEnumParameterizedCalls = 0;
+
+    @AfterClass
+    public static void afterClass() {
+        assertThat(sSimpleParameterizedCalls).isEqualTo(2);
+        assertThat(sMultipleSimpleParameterizedCalls).isEqualTo(4);
+        assertThat(sBedsteadParameterizedCalls).isEqualTo(2);
+        assertThat(sBedsteadPlusSimpleParameterizedCalls).isEqualTo(4);
+        assertThat(sIndirectParameterizedCalls).isEqualTo(2);
+        assertThat(sIntParameterizedCalls).isEqualTo(2);
+        assertThat(sEnumParameterizedCalls).isEqualTo(3);
+    }
+
+    @Test
+    @IncludeRunOnDeviceOwnerUser
+    @IncludeRunOnProfileOwnerPrimaryUser
+    public void bedsteadParameterized() {
+        sBedsteadParameterizedCalls += 1;
+    }
+
+    @Test
+    @IncludeRunOnDeviceOwnerUser
+    @IncludeRunOnProfileOwnerPrimaryUser
+    public void bedsteadPlusSimpleParameterized(@StringTestParameter({"A", "B"}) String argument) {
+        sBedsteadPlusSimpleParameterizedCalls += 1;
+    }
+
+    @Test
+    public void simpleParameterized(@StringTestParameter({"A", "B"}) String argument) {
+        sSimpleParameterizedCalls += 1;
+    }
+
+    @Test
+    public void multipleSimpleParameterized(
+            @StringTestParameter({"A", "B"}) String argument1,
+            @StringTestParameter({"C", "D"}) String argument2) {
+        sMultipleSimpleParameterizedCalls += 1;
+    }
+
+    @Test
+    public void indirectParameterized(@TwoValuesStringTestParameter String argument) {
+        sIndirectParameterizedCalls += 1;
+    }
+
+    @Test
+    public void intParameterized(@IntTestParameter({1, 2}) int argument) {
+        sIntParameterizedCalls += 1;
+    }
+
+    @Test
+    public void enumParameterized(
+            @EnumTestParameter(EnumWithThreeValues.class) EnumWithThreeValues argument) {
+        sEnumParameterizedCalls += 1;
+    }
+
+    @PermissionTest({INTERACT_ACROSS_PROFILES, INTERACT_ACROSS_USERS})
+    @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL)
+    @Test
+    public void permissionTestAnnotation_generatesRunsWithOnePermissionOrOther() {
+        assertThat(TestApis.permissions().hasPermission(INTERACT_ACROSS_USERS_FULL)).isTrue();
+        if (TestApis.permissions().hasPermission(INTERACT_ACROSS_PROFILES)) {
+            assertThat(TestApis.permissions().hasPermission(INTERACT_ACROSS_USERS)).isFalse();
+        } else {
+            assertThat(TestApis.permissions().hasPermission(INTERACT_ACROSS_USERS)).isTrue();
+        }
+    }
+
+    @UserTest({UserType.PRIMARY_USER, UserType.WORK_PROFILE})
+    @Test
+    public void userTestAnnotation_isRunningOnCorrectUsers() {
+        if (!TestApis.users().instrumented().equals(sDeviceState.primaryUser())) {
+            assertThat(TestApis.users().instrumented()).isEqualTo(sDeviceState.workProfile());
+        }
+    }
+
+    @CrossUserTest({
+            @UserPair(from = PRIMARY_USER, to = WORK_PROFILE),
+            @UserPair(from = WORK_PROFILE, to = PRIMARY_USER),
+    })
+    @Test
+    public void crossUserTestAnnotation_isRunningWithCorrectUserPairs() {
+        if (TestApis.users().instrumented().equals(sDeviceState.primaryUser())) {
+            assertThat(sDeviceState.otherUser()).isEqualTo(sDeviceState.workProfile());
+        } else {
+            assertThat(TestApis.users().instrumented()).isEqualTo(sDeviceState.workProfile());
+            assertThat(sDeviceState.otherUser()).isEqualTo(sDeviceState.primaryUser());
+        }
+    }
+}
diff --git a/common/device-side/bedstead/harrier/src/test/java/com/android/bedstead/harrier/DeviceStateTest.java b/common/device-side/bedstead/harrier/src/test/java/com/android/bedstead/harrier/DeviceStateTest.java
index ba3c2ef..a5ec109 100644
--- a/common/device-side/bedstead/harrier/src/test/java/com/android/bedstead/harrier/DeviceStateTest.java
+++ b/common/device-side/bedstead/harrier/src/test/java/com/android/bedstead/harrier/DeviceStateTest.java
@@ -18,19 +18,24 @@
 
 import static android.Manifest.permission.INTERACT_ACROSS_PROFILES;
 import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
+import static android.app.AppOpsManager.OPSTR_FINE_LOCATION;
+import static android.app.AppOpsManager.OPSTR_START_FOREGROUND;
 import static android.app.admin.DevicePolicyManager.DELEGATION_APP_RESTRICTIONS;
 import static android.app.admin.DevicePolicyManager.DELEGATION_CERT_INSTALL;
 import static android.content.pm.PackageManager.PERMISSION_DENIED;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 
-import static com.android.bedstead.harrier.DeviceState.UserType.ANY;
-import static com.android.bedstead.harrier.DeviceState.UserType.PRIMARY_USER;
 import static com.android.bedstead.harrier.OptionalBoolean.FALSE;
 import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
+import static com.android.bedstead.harrier.UserType.ANY;
+import static com.android.bedstead.harrier.UserType.PRIMARY_USER;
+import static com.android.bedstead.harrier.UserType.SECONDARY_USER;
 import static com.android.bedstead.harrier.annotations.RequireAospBuild.GMS_CORE_PACKAGE;
 import static com.android.bedstead.harrier.annotations.RequireCnGmsBuild.CHINA_GOOGLE_SERVICES_FEATURE;
 import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDelegate.AdminType.DEVICE_OWNER;
 import static com.android.bedstead.harrier.annotations.enterprise.EnsureHasDelegate.AdminType.PRIMARY;
+import static com.android.bedstead.nene.appops.AppOpsMode.ALLOWED;
+import static com.android.bedstead.nene.permissions.CommonPermissions.READ_CONTACTS;
 import static com.android.bedstead.nene.users.UserType.MANAGED_PROFILE_TYPE_NAME;
 import static com.android.bedstead.nene.users.UserType.SECONDARY_USER_TYPE_NAME;
 import static com.android.bedstead.nene.users.UserType.SYSTEM_USER_TYPE_NAME;
@@ -40,11 +45,17 @@
 import static org.testng.Assert.assertThrows;
 
 import android.app.ActivityManager;
+import android.app.admin.DevicePolicyManager;
+import android.content.PermissionChecker;
 import android.os.Build;
 import android.os.Bundle;
 import android.platform.test.annotations.AppModeFull;
 
+import com.android.bedstead.harrier.annotations.EnsureBluetoothDisabled;
+import com.android.bedstead.harrier.annotations.EnsureBluetoothEnabled;
+import com.android.bedstead.harrier.annotations.EnsureDoesNotHaveAppOp;
 import com.android.bedstead.harrier.annotations.EnsureDoesNotHavePermission;
+import com.android.bedstead.harrier.annotations.EnsureHasAppOp;
 import com.android.bedstead.harrier.annotations.EnsureHasNoSecondaryUser;
 import com.android.bedstead.harrier.annotations.EnsureHasNoTvProfile;
 import com.android.bedstead.harrier.annotations.EnsureHasNoWorkProfile;
@@ -53,6 +64,12 @@
 import com.android.bedstead.harrier.annotations.EnsureHasTvProfile;
 import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile;
 import com.android.bedstead.harrier.annotations.EnsurePackageNotInstalled;
+import com.android.bedstead.harrier.annotations.EnsurePasswordNotSet;
+import com.android.bedstead.harrier.annotations.EnsureScreenIsOn;
+import com.android.bedstead.harrier.annotations.EnsureTestAppHasAppOp;
+import com.android.bedstead.harrier.annotations.EnsureTestAppHasPermission;
+import com.android.bedstead.harrier.annotations.EnsureTestAppInstalled;
+import com.android.bedstead.harrier.annotations.OtherUser;
 import com.android.bedstead.harrier.annotations.RequireAospBuild;
 import com.android.bedstead.harrier.annotations.RequireCnGmsBuild;
 import com.android.bedstead.harrier.annotations.RequireDoesNotHaveFeature;
@@ -81,16 +98,21 @@
 import com.android.bedstead.harrier.annotations.enterprise.EnsureHasProfileOwner;
 import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnBackgroundDeviceOwnerUser;
 import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnDeviceOwnerUser;
-import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnNonAffiliatedDeviceOwnerSecondaryUser;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnParentOfProfileOwnerUsingParentInstance;
 import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnParentOfProfileOwnerWithNoDeviceOwner;
 import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnProfileOwnerProfileWithNoDeviceOwner;
 import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnSecondaryUserInDifferentProfileGroupToProfileOwnerProfile;
+import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnUnaffiliatedDeviceOwnerSecondaryUser;
 import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.exceptions.NeneException;
 import com.android.bedstead.nene.packages.Package;
 import com.android.bedstead.nene.users.UserReference;
 import com.android.bedstead.nene.utils.Tags;
 import com.android.bedstead.remotedpc.RemoteDelegate;
 import com.android.bedstead.remotedpc.RemoteDpc;
+import com.android.bedstead.testapp.NotFoundException;
+import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppInstance;
 
 import org.junit.ClassRule;
 import org.junit.Ignore;
@@ -105,11 +127,26 @@
     @Rule
     public static final DeviceState sDeviceState = new DeviceState();
 
+    private static final String APP_OP = OPSTR_FINE_LOCATION;
+
     private static final String TV_PROFILE_TYPE_NAME = "com.android.tv.profile";
 
     private static final String TEST_PERMISSION_1 = INTERACT_ACROSS_PROFILES;
     private static final String TEST_PERMISSION_2 = INTERACT_ACROSS_USERS_FULL;
 
+    private static final DevicePolicyManager sLocalDevicePolicyManager =
+            TestApis.context().instrumentedContext().getSystemService(DevicePolicyManager.class);
+
+    // Expects that this package name matches an actual test app
+    private static final String TEST_APP_PACKAGE_NAME = "com.android.bedstead.testapp.LockTaskApp";
+    private static final String TEST_APP_PACKAGE_NAME2 = "com.android.bedstead.testapp.SmsApp";
+    private static final String TEST_APP_USED_IN_FIELD_NAME =
+            "com.android.bedstead.testapp.NotEmptyTestApp";
+    private static final TestApp sTestApp = sDeviceState.testApps().query()
+            .wherePackageName().isEqualTo(TEST_APP_USED_IN_FIELD_NAME).get();
+
+    private static final long TIMEOUT = 4000000;
+
     @Test
     @EnsureHasWorkProfile
     public void workProfile_workProfileProvided_returnsWorkProfile() {
@@ -359,14 +396,14 @@
     }
 
     @EnsureHasSecondaryUser
-    @EnsureHasProfileOwner(onUser = DeviceState.UserType.SECONDARY_USER)
+    @EnsureHasProfileOwner(onUser = UserType.SECONDARY_USER)
     public void ensureHasProfileOwnerAnnotation_otherUser_setsProfileOwner() {
         assertThat(TestApis.devicePolicy().getProfileOwner(sDeviceState.secondaryUser()))
                 .isNotNull();
     }
 
     @EnsureHasSecondaryUser
-    @EnsureHasNoProfileOwner(onUser = DeviceState.UserType.SECONDARY_USER)
+    @EnsureHasNoProfileOwner(onUser = UserType.SECONDARY_USER)
     public void ensureHasNoProfileOwnerAnnotation_otherUser_profileOwnerIsNotSet() {
         assertThat(TestApis.devicePolicy().getProfileOwner(sDeviceState.secondaryUser())).isNull();
     }
@@ -385,14 +422,14 @@
     }
 
     @EnsureHasSecondaryUser
-    @EnsureHasProfileOwner(onUser = DeviceState.UserType.SECONDARY_USER)
+    @EnsureHasProfileOwner(onUser = UserType.SECONDARY_USER)
     public void profileOwner_otherUser_profileOwnerIsSet_returnsProfileOwner() {
         assertThat(sDeviceState.profileOwner(sDeviceState.secondaryUser())).isNotNull();
     }
 
     @Test
     @EnsureHasSecondaryUser
-    @EnsureHasNoProfileOwner(onUser = DeviceState.UserType.SECONDARY_USER)
+    @EnsureHasNoProfileOwner(onUser = UserType.SECONDARY_USER)
     public void profileOwner_otherUser_profileOwnerIsNotSet_throwsException() {
         assertThrows(IllegalStateException.class, sDeviceState::profileOwner);
     }
@@ -400,7 +437,7 @@
     @Test
     public void profileOwner_userType_onUserIsNull_throwsException() {
         assertThrows(NullPointerException.class,
-                () -> sDeviceState.profileOwner((DeviceState.UserType) null));
+                () -> sDeviceState.profileOwner((UserType) null));
     }
 
     @Test
@@ -438,7 +475,7 @@
     }
 
     @Test
-    @IncludeRunOnNonAffiliatedDeviceOwnerSecondaryUser
+    @IncludeRunOnUnaffiliatedDeviceOwnerSecondaryUser
     public void includeRunOnNonAffiliatedDeviceOwnerSecondaryUserAnnotation_isRunningOnNonAffiliatedDeviceOwnerSecondaryUser() {
         assertThat(TestApis.devicePolicy().getDeviceOwner().user())
                 .isNotEqualTo(TestApis.users().instrumented());
@@ -775,4 +812,166 @@
     public void ensureHasDelegateAnnotation_primaryAdminAndReplace_dpcReturnsDelegate() {
         assertThat(sDeviceState.dpc()).isInstanceOf(RemoteDelegate.class);
     }
+
+    @Test
+    @EnsureScreenIsOn
+    public void ensureScreenIsOnAnnotation_screenIsOn() {
+        assertThat(TestApis.device().isScreenOn()).isTrue();
+    }
+
+    @Test
+    @EnsurePasswordNotSet
+    public void requirePasswordNotSetAnnotation_passwordNotSet() {
+        assertThat(TestApis.users().instrumented().hasPassword()).isFalse();
+    }
+
+    @Test
+    @IncludeRunOnParentOfProfileOwnerUsingParentInstance
+    public void includeRunOnParentOfProfileOwnerUsingProfileInstanceAnnotation_runningOnParentOfProfile() {
+        assertThat(sDeviceState.workProfile().parent()).isEqualTo(TestApis.users().instrumented());
+    }
+
+    @Test
+    @IncludeRunOnParentOfProfileOwnerUsingParentInstance
+    public void includeRunOnParentOfProfileOwnerUsingProfileInstanceAnnotation_dpcIsOnProfile() {
+        assertThat(sDeviceState.dpc().user()).isEqualTo(sDeviceState.workProfile());
+    }
+
+    @Test
+    @IncludeRunOnParentOfProfileOwnerUsingParentInstance
+    public void includeRunOnParentOfProfileOwnerUsingProfileInstanceAnnotation_devicePolicyManagerAffectsParent() {
+        long previousRequiredStrongAuthTimeout =
+                sLocalDevicePolicyManager.getRequiredStrongAuthTimeout(/* admin= */ null);
+        try {
+            sDeviceState.dpc().devicePolicyManager()
+                    .setRequiredStrongAuthTimeout(sDeviceState.dpc().componentName(), TIMEOUT);
+
+            assertThat(sLocalDevicePolicyManager
+                    .getRequiredStrongAuthTimeout(/* admin= */ null)).isEqualTo(TIMEOUT);
+        } finally {
+            sDeviceState.dpc().devicePolicyManager()
+                    .setRequiredStrongAuthTimeout(
+                            sDeviceState.dpc().componentName(), previousRequiredStrongAuthTimeout);
+        }
+    }
+
+    @Test
+    @EnsureHasSecondaryUser
+    @OtherUser(SECONDARY_USER)
+    public void otherUserAnnotation_otherUserReturnsCorrectType() {
+        assertThat(sDeviceState.otherUser()).isEqualTo(sDeviceState.secondaryUser());
+    }
+
+    @Test
+    public void otherUser_noOtherUserSpecified_throwsException() {
+        assertThrows(IllegalStateException.class, () -> sDeviceState.otherUser());
+    }
+
+    @Test
+    @EnsureBluetoothEnabled
+    public void ensureBluetoothEnabledAnnotation_bluetoothIsEnabled() {
+        assertThat(TestApis.bluetooth().isEnabled()).isTrue();
+    }
+
+    @Test
+    @EnsureBluetoothDisabled
+    public void ensureBluetoothDisabledAnnotation_bluetoothIsDisabled() {
+        assertThat(TestApis.bluetooth().isEnabled()).isFalse();
+    }
+
+    @EnsureHasAppOp(APP_OP)
+    public void ensureHasAppOpAnnotation_appOpIsAllowed() {
+        assertThat(TestApis.permissions().hasAppOpAllowed(APP_OP)).isTrue();
+    }
+
+    @Test
+    @EnsureDoesNotHaveAppOp(APP_OP)
+    public void ensureDoesNotHaveAppOpAnnotation_appOpIsNotAllowed() {
+        assertThat(TestApis.permissions().hasAppOpAllowed(APP_OP)).isFalse();
+    }
+
+    // We run this test twice to ensure that teardown doesn't change behaviour
+    @Test
+    public void testApps_testAppsAreAvailableToMultipleTests_1() {
+        assertThat(sDeviceState.testApps().query()
+                .wherePackageName().isEqualTo(TEST_APP_PACKAGE_NAME).get()).isNotNull();
+    }
+
+    @Test
+    public void testApps_testAppsAreAvailableToMultipleTests_2() {
+        assertThat(sDeviceState.testApps().query()
+                .wherePackageName().isEqualTo(TEST_APP_PACKAGE_NAME).get()).isNotNull();
+    }
+
+    // We run this test twice to ensure that teardown doesn't change behaviour
+    @Test
+    public void testApps_staticTestAppsAreNotReleased_1() {
+        assertThrows(NotFoundException.class, () -> sDeviceState.testApps().query()
+                .wherePackageName().isEqualTo(TEST_APP_USED_IN_FIELD_NAME).get());
+    }
+
+    @Test
+    public void testApps_staticTestAppsAreNotReleased_2() {
+        assertThrows(NotFoundException.class, () -> sDeviceState.testApps().query()
+                .wherePackageName().isEqualTo(TEST_APP_USED_IN_FIELD_NAME).get());
+    }
+
+    @EnsureTestAppInstalled(packageName = TEST_APP_PACKAGE_NAME)
+    @Test
+    public void ensureTestAppInstalledAnnotation_testAppIsInstalled() {
+        assertThat(TestApis.packages().find(TEST_APP_PACKAGE_NAME).installedOnUser()).isTrue();
+    }
+
+    @EnsureHasSecondaryUser
+    @EnsureTestAppInstalled(packageName = TEST_APP_PACKAGE_NAME, onUser = SECONDARY_USER)
+    @Test
+    public void ensureTestAppInstalledAnnotation_testAppIsInstalledOnCorrectUser() {
+        assertThat(TestApis.packages().find(TEST_APP_PACKAGE_NAME)
+                .installedOnUser(sDeviceState.secondaryUser())).isTrue();
+    }
+
+    @EnsureTestAppInstalled(packageName = TEST_APP_PACKAGE_NAME)
+    @Test
+    public void testApp_returnsTestApp() {
+        assertThat(sDeviceState.testApp().packageName()).isEqualTo(TEST_APP_PACKAGE_NAME);
+    }
+
+    @Test
+    public void testApp_noHarrierManagedTestApp_throwsException() {
+        try (TestAppInstance testApp = sDeviceState.testApps().any().install()) {
+            assertThrows(NeneException.class, sDeviceState::testApp);
+        }
+    }
+
+    @EnsureTestAppInstalled(key = "testApp1", packageName = TEST_APP_PACKAGE_NAME)
+    @EnsureTestAppInstalled(key = "testApp2", packageName = TEST_APP_PACKAGE_NAME2)
+    @Test
+    public void testApp_withKey_returnsCorrectTestApp() {
+        assertThat(sDeviceState.testApp("testApp1").packageName())
+                .isEqualTo(TEST_APP_PACKAGE_NAME);
+        assertThat(sDeviceState.testApp("testApp2").packageName())
+                .isEqualTo(TEST_APP_PACKAGE_NAME2);
+    }
+
+    @EnsureTestAppInstalled(packageName = TEST_APP_PACKAGE_NAME, isPrimary = true)
+    @Test
+    public void dpc_primaryTestApp_returnsTestApp() {
+        assertThat(sDeviceState.dpc().packageName()).isEqualTo(TEST_APP_PACKAGE_NAME);
+    }
+
+    @EnsureTestAppInstalled(packageName = TEST_APP_PACKAGE_NAME)
+    @EnsureTestAppHasPermission(READ_CONTACTS)
+    @Test
+    public void ensureTestAppHasPermissionAnnotation_testAppHasPermission() {
+        assertThat(sDeviceState.testApp().context().checkSelfPermission(
+                READ_CONTACTS)).isEqualTo(PermissionChecker.PERMISSION_GRANTED);
+    }
+
+    @EnsureTestAppInstalled(packageName = TEST_APP_PACKAGE_NAME)
+    @EnsureTestAppHasAppOp(OPSTR_START_FOREGROUND)
+    @Test
+    public void ensureTestAppHasAppOpAnnotation_testAppHasAppOp() {
+        assertThat(sDeviceState.testApp()
+                .testApp().pkg().appOps().get(OPSTR_START_FOREGROUND)).isEqualTo(ALLOWED);
+    }
 }
diff --git a/common/device-side/bedstead/metricsrecorder/src/main/java/com/android/bedstead/metricsrecorder/EnterpriseMetricInfo.java b/common/device-side/bedstead/metricsrecorder/src/main/java/com/android/bedstead/metricsrecorder/EnterpriseMetricInfo.java
index 5584ed4..46cc3fb 100644
--- a/common/device-side/bedstead/metricsrecorder/src/main/java/com/android/bedstead/metricsrecorder/EnterpriseMetricInfo.java
+++ b/common/device-side/bedstead/metricsrecorder/src/main/java/com/android/bedstead/metricsrecorder/EnterpriseMetricInfo.java
@@ -27,6 +27,7 @@
     private final int mType;
     private final boolean mBoolean;
     private final List<String> mStrings;
+    private final int mInteger;
 
     EnterpriseMetricInfo(AtomsProto.DevicePolicyEvent event) {
         mAdminPackageName = event.adminPackageName;
@@ -34,24 +35,34 @@
         mBoolean = event.booleanValue;
         mStrings = (event.stringListValue == null) ? new ArrayList<>() : Arrays.asList(
                 event.stringListValue.stringValue);
+        mInteger = event.integerValue;
     }
 
+    /** Admin package name. */
     public String adminPackageName() {
         return mAdminPackageName;
     }
 
+    /** Type of metric. */
     public int type() {
         return mType;
     }
 
+    /** Arbitrary boolean value. */
     public boolean Boolean() {
         return mBoolean;
     }
 
+    /** Arbitrary list of strings. */
     public List<String> strings() {
         return mStrings;
     }
 
+    /** Arbitrary integer value. */
+    public int integer() {
+        return mInteger;
+    }
+
     @Override
     public String toString() {
         return "EnterpriseMetricInfo{"
@@ -59,6 +70,7 @@
                 + ", type=" + mType
                 + ", boolean=" + mBoolean
                 + ", strings=" + mStrings
+                + ", integer=" + mInteger
                 + "}";
     }
 }
diff --git a/common/device-side/bedstead/metricsrecorder/src/main/java/com/android/bedstead/metricsrecorder/MetricQueryBuilder.java b/common/device-side/bedstead/metricsrecorder/src/main/java/com/android/bedstead/metricsrecorder/MetricQueryBuilder.java
index 215a513..2f682cd 100644
--- a/common/device-side/bedstead/metricsrecorder/src/main/java/com/android/bedstead/metricsrecorder/MetricQueryBuilder.java
+++ b/common/device-side/bedstead/metricsrecorder/src/main/java/com/android/bedstead/metricsrecorder/MetricQueryBuilder.java
@@ -43,11 +43,14 @@
             new BooleanQueryHelper<>(this);
     private final ListQueryHelper<MetricQueryBuilder, String, StringQuery<?>> mStringsQuery =
             new ListQueryHelper<>(this);
+    private final IntegerQueryHelper<MetricQueryBuilder> mIntegerQuery =
+            new IntegerQueryHelper<>(this);
 
     MetricQueryBuilder(EnterpriseMetricsRecorder recorder) {
         mRecorder = recorder;
     }
 
+    /** Query for {@link EnterpriseMetricInfo#type()}. */
     public IntegerQuery<MetricQueryBuilder> whereType() {
         if (hasStartedFetchingResults) {
             throw new IllegalStateException("Cannot modify query after fetching results");
@@ -55,6 +58,7 @@
         return mTypeQuery;
     }
 
+    /** Query for {@link EnterpriseMetricInfo#adminPackageName()}. */
     public StringQuery<MetricQueryBuilder> whereAdminPackageName() {
         if (hasStartedFetchingResults) {
             throw new IllegalStateException("Cannot modify query after fetching results");
@@ -62,6 +66,7 @@
         return mAdminPackageNameQuery;
     }
 
+    /** Query for {@link EnterpriseMetricInfo#Boolean()}. */
     public BooleanQuery<MetricQueryBuilder> whereBoolean() {
         if (hasStartedFetchingResults) {
             throw new IllegalStateException("Cannot modify query after fetching results");
@@ -69,6 +74,14 @@
         return mBooleanQuery;
     }
 
+    /** Query for {@link EnterpriseMetricInfo#integer()}. */
+    public IntegerQuery<MetricQueryBuilder> whereInteger() {
+        if (hasStartedFetchingResults) {
+            throw new IllegalStateException("Cannot modify query after fetching results");
+        }
+        return mIntegerQuery;
+    }
+
     public ListQueryHelper<MetricQueryBuilder, String, StringQuery<?>> whereStrings() {
         if (hasStartedFetchingResults) {
             throw new IllegalStateException("Cannot modify query after fetching results");
@@ -134,15 +147,18 @@
         return mAdminPackageNameQuery.matches(metric.adminPackageName())
                 && mTypeQuery.matches(metric.type())
                 && mBooleanQuery.matches(metric.Boolean())
-                && mStringsQuery.matches(metric.strings());
+                && mStringsQuery.matches(metric.strings())
+                && mIntegerQuery.matches(metric.integer());
     }
 
     @Override
     public String describeQuery(String fieldName) {
         return "{" + Queryable.joinQueryStrings(
                 mAdminPackageNameQuery.describeQuery("adminPackageName"),
-                        mBooleanQuery.describeQuery("boolean"),
-                        mStringsQuery.describeQuery("strings")
+                mTypeQuery.describeQuery("type"),
+                mBooleanQuery.describeQuery("boolean"),
+                mStringsQuery.describeQuery("strings"),
+                mIntegerQuery.describeQuery("integer")
         ) + "}";
     }
 
diff --git a/common/device-side/bedstead/nene/Android.bp b/common/device-side/bedstead/nene/Android.bp
index 21809bb..7ca45b7 100644
--- a/common/device-side/bedstead/nene/Android.bp
+++ b/common/device-side/bedstead/nene/Android.bp
@@ -2,6 +2,22 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+java_library_host {
+    name: "NeneCommon",
+    srcs: [
+        "common/src/main/java/**/*.java"
+    ],
+}
+
+android_library {
+    name: "NeneCommonAndroid",
+    srcs: [
+        "common/src/main/java/**/*.java"
+    ],
+    manifest: "src/main/AndroidManifestInternal.xml",
+    min_sdk_version: "27"
+}
+
 // TODO(b/203507664): Remove NeneInternal once we no longer need QUERY_ALL_PACKAGES to install
 android_library {
     name: "NeneInternal",
@@ -14,6 +30,7 @@
         "compatibility-device-util-axt",
         "guava",
         "Queryable",
+        "NeneCommonAndroid",
         "RemoteFrameworkClasses"
     ],
     min_sdk_version: "27"
@@ -30,6 +47,7 @@
         "compatibility-device-util-axt",
         "guava",
         "Queryable",
+        "NeneCommonAndroid",
         "RemoteFrameworkClasses"
     ],
     min_sdk_version: "27"
diff --git a/common/device-side/bedstead/nene/AndroidTest.xml b/common/device-side/bedstead/nene/AndroidTest.xml
index f7a5151..c5601fa 100644
--- a/common/device-side/bedstead/nene/AndroidTest.xml
+++ b/common/device-side/bedstead/nene/AndroidTest.xml
@@ -15,6 +15,8 @@
   ~ limitations under the License.
   -->
 <configuration description="Config for Nene test cases">
+    <option name="config-descriptor:metadata" key="parameter" value="multiuser" />
+    <target_preparer class="com.android.tradefed.targetprep.RunOnSystemUserTargetPreparer"/>
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="NeneTest.apk" />
@@ -24,6 +26,8 @@
         <option name="push" value="NeneTestApp1.apk->/data/local/tmp/NeneTestApp1.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="exclude-annotation" value="com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile" />
+        <option name="exclude-annotation" value="com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser" />
         <option name="package" value="com.android.bedstead.nene.test" />
     </test>
 </configuration>
\ No newline at end of file
diff --git a/common/device-side/bedstead/nene/common/AndroidManifest.xml b/common/device-side/bedstead/nene/common/AndroidManifest.xml
new file mode 100644
index 0000000..3ba12e1
--- /dev/null
+++ b/common/device-side/bedstead/nene/common/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.bedstead.nene.common">
+    <uses-sdk android:minSdkVersion="27" />
+    <application>
+    </application>
+</manifest>
diff --git a/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/annotations/Nullable.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/annotations/Nullable.java
new file mode 100644
index 0000000..fb3ce77
--- /dev/null
+++ b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/annotations/Nullable.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 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.bedstead.nene.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a value may be Null.
+ *
+ * <p>This can be used on host or device side code.
+ */
+@Target({ElementType.LOCAL_VARIABLE, ElementType.FIELD, ElementType.PARAMETER})
+@Retention(RetentionPolicy.SOURCE)
+public @interface Nullable {
+}
diff --git a/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/appops/AppOpsMode.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/appops/AppOpsMode.java
new file mode 100644
index 0000000..9e78c0c
--- /dev/null
+++ b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/appops/AppOpsMode.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.appops;
+
+/** Valid modes for an AppOp. */
+public enum AppOpsMode {
+    ALLOWED(/* MODE_ALLOWED */ 0),
+    IGNORED(/* MODE_IGNORED */ 1),
+    ERRORED(/* MODE_ERRORED */ 2),
+    DEFAULT(/* MODE_DEFAULT */ 3),
+    FOREGROUND(/* MODE_FOREGROUND */ 4);
+
+    // Values from AppOpsManager
+    private static final int MODE_ALLOWED = 0;
+    private static final int MODE_IGNORED = 1;
+    private static final int MODE_ERRORED = 2;
+    private static final int MODE_DEFAULT = 3;
+    private static final int MODE_FOREGROUND = 4;
+
+    final int mValue;
+
+    /** The {@code AppOpsManager} equivalent value. */
+    public int value() {
+        return mValue;
+    }
+
+    AppOpsMode(int value) {
+        this.mValue = value;
+    }
+
+    static AppOpsMode forValue(int value) {
+        switch (value) {
+            case MODE_ALLOWED:
+                return ALLOWED;
+            case MODE_IGNORED:
+                return IGNORED;
+            case MODE_ERRORED:
+                return ERRORED;
+            case MODE_DEFAULT:
+                return DEFAULT;
+            case MODE_FOREGROUND:
+                return FOREGROUND;
+            default:
+                throw new IllegalStateException("Unknown AppOpsMode");
+        }
+    }
+}
diff --git a/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/appops/CommonAppOps.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/appops/CommonAppOps.java
new file mode 100644
index 0000000..b4109fa
--- /dev/null
+++ b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/appops/CommonAppOps.java
@@ -0,0 +1,277 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.appops;
+
+/** AppOp helper methods common to host an device. */
+public class CommonAppOps {
+
+    CommonAppOps() {
+
+    }
+
+    /** See {@code AppOpsManager#OPSTR_COARSE_LOCATION}. */
+    public static final String OPSTR_COARSE_LOCATION = "android:coarse_location";
+    /** See {@code AppOpsManager#OPSTR_FINE_LOCATION}. */
+    public static final String OPSTR_FINE_LOCATION = "android:fine_location";
+    /** See {@code AppOpsManager#OPSTR_MONITOR_LOCATION}. */
+    public static final String OPSTR_MONITOR_LOCATION = "android:monitor_location";
+    /** See {@code AppOpsManager#OPSTR_MONITOR_HIGH_POWER_LOCATION}. */
+    public static final String OPSTR_MONITOR_HIGH_POWER_LOCATION =
+            "android:monitor_location_high_power";
+    /** See {@code AppOpsManager#OPSTR_GET_USAGE_STATS}. */
+    public static final String OPSTR_GET_USAGE_STATS = "android:get_usage_stats";
+    /** See {@code AppOpsManager#OPSTR_ACTIVATE_VPN}. */
+    public static final String OPSTR_ACTIVATE_VPN = "android:activate_vpn";
+    /** See {@code AppOpsManager#OPSTR_READ_CONTACTS}. */
+    public static final String OPSTR_READ_CONTACTS = "android:read_contacts";
+    /** See {@code AppOpsManager#OPSTR_WRITE_CONTACTS}. */
+    public static final String OPSTR_WRITE_CONTACTS = "android:write_contacts";
+    /** See {@code AppOpsManager#OPSTR_READ_CALL_LOG}. */
+    public static final String OPSTR_READ_CALL_LOG = "android:read_call_log";
+    /** See {@code AppOpsManager#OPSTR_WRITE_CALL_LOG}. */
+    public static final String OPSTR_WRITE_CALL_LOG = "android:write_call_log";
+    /** See {@code AppOpsManager#OPSTR_READ_CALENDAR}. */
+    public static final String OPSTR_READ_CALENDAR = "android:read_calendar";
+    /** See {@code AppOpsManager#OPSTR_WRITE_CALENDAR}. */
+    public static final String OPSTR_WRITE_CALENDAR = "android:write_calendar";
+    /** See {@code AppOpsManager#OPSTR_CALL_PHONE}. */
+    public static final String OPSTR_CALL_PHONE = "android:call_phone";
+    /** See {@code AppOpsManager#OPSTR_READ_SMS}. */
+    public static final String OPSTR_READ_SMS = "android:read_sms";
+    /** See {@code AppOpsManager#OPSTR_RECEIVE_SMS}. */
+    public static final String OPSTR_RECEIVE_SMS = "android:receive_sms";
+    /** See {@code AppOpsManager#OPSTR_RECEIVE_MMS}. */
+    public static final String OPSTR_RECEIVE_MMS = "android:receive_mms";
+    /** See {@code AppOpsManager#OPSTR_RECEIVE_WAP_PUSH}. */
+    public static final String OPSTR_RECEIVE_WAP_PUSH = "android:receive_wap_push";
+    /** See {@code AppOpsManager#OPSTR_SEND_SMS}. */
+    public static final String OPSTR_SEND_SMS = "android:send_sms";
+    /** See {@code AppOpsManager#OPSTR_CAMERA}. */
+    public static final String OPSTR_CAMERA = "android:camera";
+    /** See {@code AppOpsManager#OPSTR_RECORD_AUDIO}. */
+    public static final String OPSTR_RECORD_AUDIO = "android:record_audio";
+    /** See {@code AppOpsManager#OPSTR_READ_PHONE_STATE}. */
+    public static final String OPSTR_READ_PHONE_STATE = "android:read_phone_state";
+    /** See {@code AppOpsManager#OPSTR_ADD_VOICEMAIL}. */
+    public static final String OPSTR_ADD_VOICEMAIL = "android:add_voicemail";
+    /** See {@code AppOpsManager#OPSTR_USE_SIP}. */
+    public static final String OPSTR_USE_SIP = "android:use_sip";
+    /** See {@code AppOpsManager#OPSTR_PROCESS_OUTGOING_CALLS}. */
+    public static final String OPSTR_PROCESS_OUTGOING_CALLS = "android:process_outgoing_calls";
+    /** See {@code AppOpsManager#OPSTR_USE_FINGERPRINT}. */
+    public static final String OPSTR_USE_FINGERPRINT = "android:use_fingerprint";
+    /** See {@code AppOpsManager#OPSTR_BODY_SENSORS}. */
+    public static final String OPSTR_BODY_SENSORS = "android:body_sensors";
+    /** See {@code AppOpsManager#OPSTR_READ_CELL_BROADCASTS}. */
+    public static final String OPSTR_READ_CELL_BROADCASTS = "android:read_cell_broadcasts";
+    /** See {@code AppOpsManager#OPSTR_MOCK_LOCATION}. */
+    public static final String OPSTR_MOCK_LOCATION = "android:mock_location";
+    /** See {@code AppOpsManager#OPSTR_READ_EXTERNAL_STORAGE}. */
+    public static final String OPSTR_READ_EXTERNAL_STORAGE = "android:read_external_storage";
+    /** See {@code AppOpsManager#OPSTR_WRITE_EXTERNAL_STORAGE}. */
+    public static final String OPSTR_WRITE_EXTERNAL_STORAGE = "android:write_external_storage";
+    /** See {@code AppOpsManager#OPSTR_SYSTEM_ALERT_WINDOW}. */
+    public static final String OPSTR_SYSTEM_ALERT_WINDOW = "android:system_alert_window";
+    /** See {@code AppOpsManager#OPSTR_WRITE_SETTINGS}. */
+    public static final String OPSTR_WRITE_SETTINGS = "android:write_settings";
+    /** See {@code AppOpsManager#OPSTR_GET_ACCOUNTS}. */
+    public static final String OPSTR_GET_ACCOUNTS = "android:get_accounts";
+    /** See {@code AppOpsManager#OPSTR_READ_PHONE_NUMBERS}. */
+    public static final String OPSTR_READ_PHONE_NUMBERS = "android:read_phone_numbers";
+    /** See {@code AppOpsManager#OPSTR_PICTURE_IN_PICTURE}. */
+    public static final String OPSTR_PICTURE_IN_PICTURE = "android:picture_in_picture";
+    /** See {@code AppOpsManager#OPSTR_INSTANT_APP_START_FOREGROUND}. */
+    public static final String OPSTR_INSTANT_APP_START_FOREGROUND =
+            "android:instant_app_start_foreground";
+    /** See {@code AppOpsManager#OPSTR_ANSWER_PHONE_CALLS}. */
+    public static final String OPSTR_ANSWER_PHONE_CALLS = "android:answer_phone_calls";
+    /** See {@code AppOpsManager#OPSTR_ACCEPT_HANDOVER}. */
+    public static final String OPSTR_ACCEPT_HANDOVER = "android:accept_handover";
+    /** See {@code AppOpsManager#OPSTR_GPS}. */
+    public static final String OPSTR_GPS = "android:gps";
+    /** See {@code AppOpsManager#OPSTR_VIBRATE}. */
+    public static final String OPSTR_VIBRATE = "android:vibrate";
+    /** See {@code AppOpsManager#OPSTR_WIFI_SCAN}. */
+    public static final String OPSTR_WIFI_SCAN = "android:wifi_scan";
+    /** See {@code AppOpsManager#OPSTR_POST_NOTIFICATION}. */
+    public static final String OPSTR_POST_NOTIFICATION = "android:post_notification";
+    /** See {@code AppOpsManager#OPSTR_NEIGHBORING_CELLS}. */
+    public static final String OPSTR_NEIGHBORING_CELLS = "android:neighboring_cells";
+    /** See {@code AppOpsManager#OPSTR_WRITE_SMS}. */
+    public static final String OPSTR_WRITE_SMS = "android:write_sms";
+    /** See {@code AppOpsManager#OPSTR_RECEIVE_EMERGENCY_BROADCAST}. */
+    public static final String OPSTR_RECEIVE_EMERGENCY_BROADCAST =
+            "android:receive_emergency_broadcast";
+    /** See {@code AppOpsManager#OPSTR_READ_ICC_SMS}. */
+    public static final String OPSTR_READ_ICC_SMS = "android:read_icc_sms";
+    /** See {@code AppOpsManager#OPSTR_WRITE_ICC_SMS}. */
+    public static final String OPSTR_WRITE_ICC_SMS = "android:write_icc_sms";
+    /** See {@code AppOpsManager#OPSTR_ACCESS_NOTIFICATIONS}. */
+    public static final String OPSTR_ACCESS_NOTIFICATIONS = "android:access_notifications";
+    /** See {@code AppOpsManager#OPSTR_PLAY_AUDIO}. */
+    public static final String OPSTR_PLAY_AUDIO = "android:play_audio";
+    /** See {@code AppOpsManager#OPSTR_READ_CLIPBOARD}. */
+    public static final String OPSTR_READ_CLIPBOARD = "android:read_clipboard";
+    /** See {@code AppOpsManager#OPSTR_WRITE_CLIPBOARD}. */
+    public static final String OPSTR_WRITE_CLIPBOARD = "android:write_clipboard";
+    /** See {@code AppOpsManager#OPSTR_TAKE_MEDIA_BUTTONS}. */
+    public static final String OPSTR_TAKE_MEDIA_BUTTONS = "android:take_media_buttons";
+    /** See {@code AppOpsManager#OPSTR_TAKE_AUDIO_FOCUS}. */
+    public static final String OPSTR_TAKE_AUDIO_FOCUS = "android:take_audio_focus";
+    /** See {@code AppOpsManager#OPSTR_AUDIO_MASTER_VOLUME}. */
+    public static final String OPSTR_AUDIO_MASTER_VOLUME = "android:audio_master_volume";
+    /** See {@code AppOpsManager#OPSTR_AUDIO_VOICE_VOLUME}. */
+    public static final String OPSTR_AUDIO_VOICE_VOLUME = "android:audio_voice_volume";
+    /** See {@code AppOpsManager#OPSTR_AUDIO_RING_VOLUME}. */
+    public static final String OPSTR_AUDIO_RING_VOLUME = "android:audio_ring_volume";
+    /** See {@code AppOpsManager#OPSTR_AUDIO_MEDIA_VOLUME}. */
+    public static final String OPSTR_AUDIO_MEDIA_VOLUME = "android:audio_media_volume";
+    /** See {@code AppOpsManager#OPSTR_AUDIO_ALARM_VOLUME}. */
+    public static final String OPSTR_AUDIO_ALARM_VOLUME = "android:audio_alarm_volume";
+    /** See {@code AppOpsManager#OPSTR_AUDIO_NOTIFICATION_VOLUME}. */
+    public static final String OPSTR_AUDIO_NOTIFICATION_VOLUME =
+            "android:audio_notification_volume";
+    /** See {@code AppOpsManager#OPSTR_AUDIO_BLUETOOTH_VOLUME}. */
+    public static final String OPSTR_AUDIO_BLUETOOTH_VOLUME = "android:audio_bluetooth_volume";
+    /** See {@code AppOpsManager#OPSTR_WAKE_LOCK}. */
+    public static final String OPSTR_WAKE_LOCK = "android:wake_lock";
+    /** See {@code AppOpsManager#OPSTR_MUTE_MICROPHONE}. */
+    public static final String OPSTR_MUTE_MICROPHONE = "android:mute_microphone";
+    /** See {@code AppOpsManager#OPSTR_TOAST_WINDOW}. */
+    public static final String OPSTR_TOAST_WINDOW = "android:toast_window";
+    /** See {@code AppOpsManager#OPSTR_PROJECT_MEDIA}. */
+    public static final String OPSTR_PROJECT_MEDIA = "android:project_media";
+    /** See {@code AppOpsManager#OPSTR_WRITE_WALLPAPER}. */
+    public static final String OPSTR_WRITE_WALLPAPER = "android:write_wallpaper";
+    /** See {@code AppOpsManager#OPSTR_ASSIST_STRUCTURE}. */
+    public static final String OPSTR_ASSIST_STRUCTURE = "android:assist_structure";
+    /** See {@code AppOpsManager#OPSTR_ASSIST_SCREENSHOT}. */
+    public static final String OPSTR_ASSIST_SCREENSHOT = "android:assist_screenshot";
+    /** See {@code AppOpsManager#OPSTR_TURN_SCREEN_ON}. */
+    public static final String OPSTR_TURN_SCREEN_ON = "android:turn_screen_on";
+    /** See {@code AppOpsManager#OPSTR_RUN_IN_BACKGROUND}. */
+    public static final String OPSTR_RUN_IN_BACKGROUND = "android:run_in_background";
+    /** See {@code AppOpsManager#OPSTR_AUDIO_ACCESSIBILITY_VOLUME}. */
+    public static final String OPSTR_AUDIO_ACCESSIBILITY_VOLUME =
+            "android:audio_accessibility_volume";
+    /** See {@code AppOpsManager#OPSTR_REQUEST_INSTALL_PACKAGES}. */
+    public static final String OPSTR_REQUEST_INSTALL_PACKAGES = "android:request_install_packages";
+    /** See {@code AppOpsManager#OPSTR_RUN_ANY_IN_BACKGROUND}. */
+    public static final String OPSTR_RUN_ANY_IN_BACKGROUND = "android:run_any_in_background";
+    /** See {@code AppOpsManager#OPSTR_CHANGE_WIFI_STATE}. */
+    public static final String OPSTR_CHANGE_WIFI_STATE = "android:change_wifi_state";
+    /** See {@code AppOpsManager#OPSTR_REQUEST_DELETE_PACKAGES}. */
+    public static final String OPSTR_REQUEST_DELETE_PACKAGES = "android:request_delete_packages";
+    /** See {@code AppOpsManager#OPSTR_BIND_ACCESSIBILITY_SERVICE}. */
+    public static final String OPSTR_BIND_ACCESSIBILITY_SERVICE =
+            "android:bind_accessibility_service";
+    /** See {@code AppOpsManager#OPSTR_MANAGE_IPSEC_TUNNELS}. */
+    public static final String OPSTR_MANAGE_IPSEC_TUNNELS = "android:manage_ipsec_tunnels";
+    /** See {@code AppOpsManager#OPSTR_START_FOREGROUND}. */
+    public static final String OPSTR_START_FOREGROUND = "android:start_foreground";
+    /** See {@code AppOpsManager#OPSTR_BLUETOOTH_SCAN}. */
+    public static final String OPSTR_BLUETOOTH_SCAN = "android:bluetooth_scan";
+    /** See {@code AppOpsManager#OPSTR_BLUETOOTH_CONNECT}. */
+    public static final String OPSTR_BLUETOOTH_CONNECT = "android:bluetooth_connect";
+    /** See {@code AppOpsManager#OPSTR_BLUETOOTH_ADVERTISE}. */
+    public static final String OPSTR_BLUETOOTH_ADVERTISE = "android:bluetooth_advertise";
+    /** See {@code AppOpsManager#OPSTR_USE_BIOMETRIC}. */
+    public static final String OPSTR_USE_BIOMETRIC = "android:use_biometric";
+    /** See {@code AppOpsManager#OPSTR_ACTIVITY_RECOGNITION}. */
+    public static final String OPSTR_ACTIVITY_RECOGNITION = "android:activity_recognition";
+    /** See {@code AppOpsManager#OPSTR_SMS_FINANCIAL_TRANSACTIONS}. */
+    public static final String OPSTR_SMS_FINANCIAL_TRANSACTIONS =
+            "android:sms_financial_transactions";
+    /** See {@code AppOpsManager#OPSTR_READ_MEDIA_AUDIO}. */
+    public static final String OPSTR_READ_MEDIA_AUDIO = "android:read_media_audio";
+    /** See {@code AppOpsManager#OPSTR_WRITE_MEDIA_AUDIO}. */
+    public static final String OPSTR_WRITE_MEDIA_AUDIO = "android:write_media_audio";
+    /** See {@code AppOpsManager#OPSTR_READ_MEDIA_VIDEO}. */
+    public static final String OPSTR_READ_MEDIA_VIDEO = "android:read_media_video";
+    /** See {@code AppOpsManager#OPSTR_WRITE_MEDIA_VIDEO}. */
+    public static final String OPSTR_WRITE_MEDIA_VIDEO = "android:write_media_video";
+    /** See {@code AppOpsManager#OPSTR_READ_MEDIA_IMAGES}. */
+    public static final String OPSTR_READ_MEDIA_IMAGES = "android:read_media_images";
+    /** See {@code AppOpsManager#OPSTR_WRITE_MEDIA_IMAGES}. */
+    public static final String OPSTR_WRITE_MEDIA_IMAGES = "android:write_media_images";
+    /** See {@code AppOpsManager#OPSTR_LEGACY_STORAGE}. */
+    public static final String OPSTR_LEGACY_STORAGE = "android:legacy_storage";
+    /** See {@code AppOpsManager#OPSTR_ACCESS_MEDIA_LOCATION}. */
+    public static final String OPSTR_ACCESS_MEDIA_LOCATION = "android:access_media_location";
+    /** See {@code AppOpsManager#OPSTR_ACCESS_ACCESSIBILITY}. */
+    public static final String OPSTR_ACCESS_ACCESSIBILITY = "android:access_accessibility";
+    /** See {@code AppOpsManager#OPSTR_READ_DEVICE_IDENTIFIERS}. */
+    public static final String OPSTR_READ_DEVICE_IDENTIFIERS = "android:read_device_identifiers";
+    /** See {@code AppOpsManager#OPSTR_QUERY_ALL_PACKAGES}. */
+    public static final String OPSTR_QUERY_ALL_PACKAGES = "android:query_all_packages";
+    /** See {@code AppOpsManager#OPSTR_MANAGE_EXTERNAL_STORAGE}. */
+    public static final String OPSTR_MANAGE_EXTERNAL_STORAGE = "android:manage_external_storage";
+    /** See {@code AppOpsManager#OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED}. */
+    public static final String OPSTR_AUTO_REVOKE_PERMISSIONS_IF_UNUSED =
+            "android:auto_revoke_permissions_if_unused";
+    /** See {@code AppOpsManager#OPSTR_AUTO_REVOKE_MANAGED_BY_INSTALLER}. */
+    public static final String OPSTR_AUTO_REVOKE_MANAGED_BY_INSTALLER =
+            "android:auto_revoke_managed_by_installer";
+    /** See {@code AppOpsManager#OPSTR_INTERACT_ACROSS_PROFILES}. */
+    public static final String OPSTR_INTERACT_ACROSS_PROFILES = "android:interact_across_profiles";
+    /** See {@code AppOpsManager#OPSTR_ACTIVATE_PLATFORM_VPN}. */
+    public static final String OPSTR_ACTIVATE_PLATFORM_VPN = "android:activate_platform_vpn";
+    /** See {@code AppOpsManager#OPSTR_LOADER_USAGE_STATS}. */
+    public static final String OPSTR_LOADER_USAGE_STATS = "android:loader_usage_stats";
+    /** See {@code AppOpsManager#OPSTR_MANAGE_ONGOING_CALLS}. */
+    public static final String OPSTR_MANAGE_ONGOING_CALLS = "android:manage_ongoing_calls";
+    /** See {@code AppOpsManager#OPSTR_NO_ISOLATED_STORAGE}. */
+    public static final String OPSTR_NO_ISOLATED_STORAGE = "android:no_isolated_storage";
+    /** See {@code AppOpsManager#OPSTR_PHONE_CALL_MICROPHONE}. */
+    public static final String OPSTR_PHONE_CALL_MICROPHONE = "android:phone_call_microphone";
+    /** See {@code AppOpsManager#OPSTR_PHONE_CALL_CAMERA}. */
+    public static final String OPSTR_PHONE_CALL_CAMERA = "android:phone_call_camera";
+    /** See {@code AppOpsManager#OPSTR_RECORD_AUDIO_HOTWORD}. */
+    public static final String OPSTR_RECORD_AUDIO_HOTWORD = "android:record_audio_hotword";
+    /** See {@code AppOpsManager#OPSTR_MANAGE_CREDENTIALS}. */
+    public static final String OPSTR_MANAGE_CREDENTIALS = "android:manage_credentials";
+    /** See {@code AppOpsManager#OPSTR_USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER}. */
+    public static final String OPSTR_USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER =
+            "android:use_icc_auth_with_device_identifier";
+    /** See {@code AppOpsManager#OPSTR_RECORD_AUDIO_OUTPUT}. */
+    public static final String OPSTR_RECORD_AUDIO_OUTPUT = "android:record_audio_output";
+    /** See {@code AppOpsManager#OPSTR_SCHEDULE_EXACT_ALARM}. */
+    public static final String OPSTR_SCHEDULE_EXACT_ALARM = "android:schedule_exact_alarm";
+    /** See {@code AppOpsManager#OPSTR_FINE_LOCATION_SOURCE}. */
+    public static final String OPSTR_FINE_LOCATION_SOURCE = "android:fine_location_source";
+    /** See {@code AppOpsManager#OPSTR_COARSE_LOCATION_SOURCE}. */
+    public static final String OPSTR_COARSE_LOCATION_SOURCE = "android:coarse_location_source";
+    /** See {@code AppOpsManager#OPSTR_MANAGE_MEDIA}. */
+    public static final String OPSTR_MANAGE_MEDIA = "android:manage_media";
+    /** See {@code AppOpsManager#OPSTR_UWB_RANGING}. */
+    public static final String OPSTR_UWB_RANGING = "android:uwb_ranging";
+    /** See {@code AppOpsManager#OPSTR_NEARBY_WIFI_DEVICES}. */
+    public static final String OPSTR_NEARBY_WIFI_DEVICES = "android:nearby_wifi_devices";
+    /** See {@code AppOpsManager#OPSTR_ACTIVITY_RECOGNITION_SOURCE}. */
+    public static final String OPSTR_ACTIVITY_RECOGNITION_SOURCE =
+            "android:activity_recognition_source";
+    /** See {@code AppOpsManager#OPSTR_RECORD_INCOMING_PHONE_AUDIO}. */
+    public static final String OPSTR_RECORD_INCOMING_PHONE_AUDIO =
+            "android:record_incoming_phone_audio";
+    /** See {@code AppOpsManager#OPSTR_ESTABLISH_VPN_SERVICE}. */
+    public static final String OPSTR_ESTABLISH_VPN_SERVICE = "android:establish_vpn_service";
+    /** See {@code AppOpsManager#OPSTR_ESTABLISH_VPN_MANAGER}. */
+    public static final String OPSTR_ESTABLISH_VPN_MANAGER = "android:establish_vpn_manager";
+    /** See {@code AppOpsManager#OPSTR_ACCESS_RESTRICTED_SETTINGS}. */
+    public static final String OPSTR_ACCESS_RESTRICTED_SETTINGS =
+            "android:access_restricted_settings";
+}
diff --git a/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/devicepolicy/CommonDevicePolicy.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/devicepolicy/CommonDevicePolicy.java
new file mode 100644
index 0000000..5927775
--- /dev/null
+++ b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/devicepolicy/CommonDevicePolicy.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2021 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.bedstead.nene.devicepolicy;
+
+/** Device Policy helper methods common to host and device. */
+public class CommonDevicePolicy {
+    CommonDevicePolicy() {
+
+    }
+
+    /** See {@code DevicePolicyManager#DELEGATION_CERT_INSTALL}. */
+    public static final String DELEGATION_CERT_INSTALL = "delegation-cert-install";
+
+    /** See {@code DevicePolicyManager#DELEGATION_APP_RESTRICTIONS}. */
+    public static final String DELEGATION_APP_RESTRICTIONS = "delegation-app-restrictions";
+
+    /** See {@code DevicePolicyManager#DELEGATION_BLOCK_UNINSTALL}. */
+    public static final String DELEGATION_BLOCK_UNINSTALL = "delegation-block-uninstall";
+
+    /** See {@code DevicePolicyManager#DELEGATION_PERMISSION_GRANT}. */
+    public static final String DELEGATION_PERMISSION_GRANT = "delegation-permission-grant";
+
+    /** See {@code DevicePolicyManager#DELEGATION_PACKAGE_ACCESS}. */
+    public static final String DELEGATION_PACKAGE_ACCESS = "delegation-package-access";
+
+    /** See {@code DevicePolicyManager#DELEGATION_ENABLE_SYSTEM_APP}. */
+    public static final String DELEGATION_ENABLE_SYSTEM_APP = "delegation-enable-system-app";
+
+    /** See {@code DevicePolicyManager#DELEGATION_INSTALL_EXISTING_PACKAGE}. */
+    public static final String DELEGATION_INSTALL_EXISTING_PACKAGE =
+            "delegation-install-existing-package";
+
+    /** See {@code DevicePolicyManager#DELEGATION_KEEP_UNINSTALLED_PACKAGES}. */
+    public static final String DELEGATION_KEEP_UNINSTALLED_PACKAGES =
+            "delegation-keep-uninstalled-packages";
+
+    /** See {@code DevicePolicyManager#DELEGATION_NETWORK_LOGGING}. */
+    public static final String DELEGATION_NETWORK_LOGGING = "delegation-network-logging";
+
+    /** See {@code DevicePolicyManager#DELEGATION_CERT_SELECTION}. */
+    public static final String DELEGATION_CERT_SELECTION = "delegation-cert-selection";
+
+    /** See {@code DevicePolicyManager#DELEGATION_SECURITY_LOGGING}. */
+    public static final String DELEGATION_SECURITY_LOGGING = "delegation-security-logging";
+}
diff --git a/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/exceptions/AdbException.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/exceptions/AdbException.java
new file mode 100644
index 0000000..a3845f9
--- /dev/null
+++ b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/exceptions/AdbException.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2021 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.bedstead.nene.exceptions;
+
+import com.android.bedstead.nene.annotations.Nullable;
+
+/**
+ * An exception that gets thrown when interacting with Adb.
+ */
+public class AdbException extends Exception {
+
+    private final String mCommand;
+    private final @Nullable String mOutput;
+    private final @Nullable String mErr;
+
+    public AdbException(String message, String command, String output) {
+        this(message, command, output, /* err= */ (String) null);
+    }
+
+    public AdbException(String message, String command, String output, String err) {
+        super(message);
+        if (command == null) {
+            throw new NullPointerException();
+        }
+        this.mCommand = command;
+        this.mOutput = output;
+        this.mErr = err;
+    }
+
+    public AdbException(String message, String command, Throwable cause) {
+        this(message, command, /* output= */ null, cause);
+    }
+
+    public AdbException(String message, String command, String output, Throwable cause) {
+        super(message, cause);
+        if (command == null) {
+            throw new NullPointerException();
+        }
+        this.mCommand = command;
+        this.mOutput = output;
+        this.mErr = null;
+    }
+
+    public String command() {
+        return mCommand;
+    }
+
+    public String output() {
+        return mOutput;
+    }
+
+    public String error() {
+        return mErr;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder stringBuilder = new StringBuilder(super.toString());
+
+        stringBuilder.append("[command=\"").append(mCommand).append("\"");
+        if (mOutput != null) {
+            stringBuilder.append(", output=\"").append(mOutput).append("\"");
+        }
+        if (mErr != null) {
+            stringBuilder.append(", err=\"").append(mErr).append("\"");
+        }
+        stringBuilder.append("]");
+
+        return stringBuilder.toString();
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/exceptions/AdbParseException.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/exceptions/AdbParseException.java
similarity index 100%
rename from common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/exceptions/AdbParseException.java
rename to common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/exceptions/AdbParseException.java
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/exceptions/NeneException.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/exceptions/NeneException.java
similarity index 100%
rename from common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/exceptions/NeneException.java
rename to common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/exceptions/NeneException.java
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/exceptions/PollValueFailedException.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/exceptions/PollValueFailedException.java
similarity index 100%
rename from common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/exceptions/PollValueFailedException.java
rename to common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/exceptions/PollValueFailedException.java
diff --git a/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/logging/CommonLogger.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/logging/CommonLogger.java
new file mode 100644
index 0000000..7bf2a5e
--- /dev/null
+++ b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/logging/CommonLogger.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.logging;
+
+import java.util.function.Supplier;
+
+/**
+ * Methods used for logging.
+ */
+public interface CommonLogger {
+
+    interface RunnableThrows<T extends Throwable> {
+        void run() throws T;
+    }
+
+    interface SupplierThrows<V, T extends Throwable> {
+        V get() throws T;
+    }
+
+    void constructor(Runnable method);
+    void constructor(Object... args);
+    void constructor(Object arg1, Runnable method);
+    void constructor(Object arg1, Object arg2, Runnable method);
+    void constructor(Object arg1, Object arg2, Object arg3, Runnable method);
+    void constructor(Object arg1, Object arg2, Object arg3, Object arg4, Runnable method);
+    void constructor(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Runnable method);
+    void constructor(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Runnable method);
+    void constructor(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Runnable method);
+
+    void method(String name, Runnable method);
+    void method(String name, Object arg1, Runnable method);
+    void method(String name, Object arg1, Object arg2, Runnable method);
+    void method(String name, Object arg1, Object arg2, Object arg3, Runnable method);
+    void method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Runnable method);
+    void method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Runnable method);
+    void method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Runnable method);
+    void method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Runnable method);
+
+    <T extends Throwable> void method(Class<T> throwableClass, String name, RunnableThrows<T> method) throws T;
+    <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1, RunnableThrows<T> method) throws T;
+    <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1, Object arg2, RunnableThrows<T> method) throws T;
+    <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1, Object arg2, Object arg3, RunnableThrows<T> method) throws T;
+    <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1, Object arg2, Object arg3, Object arg4, RunnableThrows<T> method) throws T;
+    <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, RunnableThrows<T> method) throws T;
+    <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, RunnableThrows<T> method) throws T;
+    <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, RunnableThrows<T> method) throws T;
+
+    <R> R method(String name, Supplier<R> method);
+    <R> R method(String name, Object arg1, Supplier<R> method);
+    <R> R method(String name, Object arg1, Object arg2, Supplier<R> method);
+    <R> R method(String name, Object arg1, Object arg2, Object arg3, Supplier<R> method);
+    <R> R method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Supplier<R> method);
+    <R> R method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Supplier<R> method);
+    <R> R method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Supplier<R> method);
+    <R> R method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, Supplier<R> method);
+
+    <T extends Throwable, R> R method(Class<T> throwableClass, String name, SupplierThrows<R, T> method) throws T;
+    <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1, SupplierThrows<R, T> method) throws T;
+    <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1, Object arg2, SupplierThrows<R, T> method) throws T;
+    <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1, Object arg2, Object arg3, SupplierThrows<R, T> method) throws T;
+    <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1, Object arg2, Object arg3, Object arg4, SupplierThrows<R, T> method) throws T;
+    <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, SupplierThrows<R, T> method) throws T;
+    <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, SupplierThrows<R, T> method) throws T;
+    <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7, SupplierThrows<R, T> method) throws T;
+}
diff --git a/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/packages/CommonPackages.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/packages/CommonPackages.java
new file mode 100644
index 0000000..6a6f622
--- /dev/null
+++ b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/packages/CommonPackages.java
@@ -0,0 +1,505 @@
+/*
+ * Copyright (C) 2021 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.bedstead.nene.packages;
+
+/** Packages helper methods common to host and device. */
+public class CommonPackages {
+    CommonPackages() {}
+
+    /** See {@code PackageManager#FEATURE_AUDIO_LOW_LATENCY}. */
+    public static final String FEATURE_AUDIO_LOW_LATENCY = "android.hardware.audio.low_latency";
+
+    /** See {@code PackageManager#FEATURE_AUDIO_OUTPUT}. */
+    public static final String FEATURE_AUDIO_OUTPUT = "android.hardware.audio.output";
+
+    /** See {@code PackageManager#FEATURE_AUDIO_PRO}. */
+    public static final String FEATURE_AUDIO_PRO = "android.hardware.audio.pro";
+
+    /** See {@code PackageManager#FEATURE_BLUETOOTH}. */
+    public static final String FEATURE_BLUETOOTH = "android.hardware.bluetooth";
+
+    /** See {@code PackageManager#FEATURE_BLUETOOTH_LE}. */
+    public static final String FEATURE_BLUETOOTH_LE = "android.hardware.bluetooth_le";
+
+    /** See {@code PackageManager#FEATURE_CAMERA}. */
+    public static final String FEATURE_CAMERA = "android.hardware.camera";
+
+    /** See {@code PackageManager#FEATURE_CAMERA_AUTOFOCUS}. */
+    public static final String FEATURE_CAMERA_AUTOFOCUS = "android.hardware.camera.autofocus";
+
+    /** See {@code PackageManager#FEATURE_CAMERA_ANY}. */
+    public static final String FEATURE_CAMERA_ANY = "android.hardware.camera.any";
+
+    /** See {@code PackageManager#FEATURE_CAMERA_EXTERNAL}. */
+    public static final String FEATURE_CAMERA_EXTERNAL = "android.hardware.camera.external";
+
+    /** See {@code PackageManager#FEATURE_CAMERA_FLASH}. */
+    public static final String FEATURE_CAMERA_FLASH = "android.hardware.camera.flash";
+
+    /** See {@code PackageManager#FEATURE_CAMERA_FRONT}. */
+    public static final String FEATURE_CAMERA_FRONT = "android.hardware.camera.front";
+
+    /** See {@code PackageManager#FEATURE_CAMERA_LEVEL_FULL}. */
+    public static final String FEATURE_CAMERA_LEVEL_FULL = "android.hardware.camera.level.full";
+
+    /** See {@code PackageManager#FEATURE_CAMERA_CAPABILITY_MANUAL_SENSOR}. */
+    public static final String FEATURE_CAMERA_CAPABILITY_MANUAL_SENSOR =
+            "android.hardware.camera.capability.manual_sensor";
+
+    /** See {@code PackageManager#FEATURE_CAMERA_CAPABILITY_MANUAL_POST_PROCESSING}. */
+    public static final String FEATURE_CAMERA_CAPABILITY_MANUAL_POST_PROCESSING =
+            "android.hardware.camera.capability.manual_post_processing";
+
+    /** See {@code PackageManager#FEATURE_CAMERA_CAPABILITY_RAW}. */
+    public static final String FEATURE_CAMERA_CAPABILITY_RAW =
+            "android.hardware.camera.capability.raw";
+
+    /** See {@code PackageManager#FEATURE_CAMERA_AR}. */
+    public static final String FEATURE_CAMERA_AR =
+            "android.hardware.camera.ar";
+
+    /** See {@code PackageManager#FEATURE_CAMERA_CONCURRENT}. */
+    public static final String FEATURE_CAMERA_CONCURRENT = "android.hardware.camera.concurrent";
+
+    /** See {@code PackageManager#FEATURE_CONSUMER_IR}. */
+    public static final String FEATURE_CONSUMER_IR = "android.hardware.consumerir";
+
+    /** See {@code PackageManager#FEATURE_CONTEXT_HUB}. */
+    public static final String FEATURE_CONTEXT_HUB = "android.hardware.context_hub";
+
+    /** See {@code PackageManager#FEATURE_CTS}. */
+    public static final String FEATURE_CTS = "android.software.cts";
+
+    /** See {@code PackageManager#FEATURE_CAR_TEMPLATES_HOST}. */
+    public static final String FEATURE_CAR_TEMPLATES_HOST =
+            "android.software.car.templates_host";
+
+    /** See {@code PackageManager#FEATURE_IDENTITY_CREDENTIAL_HARDWARE}. */
+    public static final String FEATURE_IDENTITY_CREDENTIAL_HARDWARE =
+            "android.hardware.identity_credential";
+
+    /** See {@code PackageManager#FEATURE_IDENTITY_CREDENTIAL_HARDWARE_DIRECT_ACCESS}. */
+    public static final String FEATURE_IDENTITY_CREDENTIAL_HARDWARE_DIRECT_ACCESS =
+            "android.hardware.identity_credential_direct_access";
+
+    /** See {@code PackageManager#FEATURE_LOCATION}. */
+    public static final String FEATURE_LOCATION = "android.hardware.location";
+
+    /** See {@code PackageManager#FEATURE_LOCATION_GPS}. */
+    public static final String FEATURE_LOCATION_GPS = "android.hardware.location.gps";
+
+    /** See {@code PackageManager#FEATURE_LOCATION_NETWORK}. */
+    public static final String FEATURE_LOCATION_NETWORK = "android.hardware.location.network";
+
+    /** See {@code PackageManager#FEATURE_FELICA}. */
+    public static final String FEATURE_FELICA = "android.hardware.felica";
+
+    /** See {@code PackageManager#FEATURE_RAM_LOW}. */
+    public static final String FEATURE_RAM_LOW = "android.hardware.ram.low";
+
+    /** See {@code PackageManager#FEATURE_RAM_NORMAL}. */
+    public static final String FEATURE_RAM_NORMAL = "android.hardware.ram.normal";
+
+    /** See {@code PackageManager#FEATURE_MICROPHONE}. */
+    public static final String FEATURE_MICROPHONE = "android.hardware.microphone";
+
+    /** See {@code PackageManager#FEATURE_NFC}. */
+    public static final String FEATURE_NFC = "android.hardware.nfc";
+
+    /** See {@code PackageManager#FEATURE_NFC_HCE}. */
+    public static final String FEATURE_NFC_HCE = "android.hardware.nfc.hce";
+
+    /** See {@code PackageManager#FEATURE_NFC_HOST_CARD_EMULATION}. */
+    public static final String FEATURE_NFC_HOST_CARD_EMULATION = "android.hardware.nfc.hce";
+
+    /** See {@code PackageManager#FEATURE_NFC_HOST_CARD_EMULATION_NFCF}. */
+    public static final String FEATURE_NFC_HOST_CARD_EMULATION_NFCF = "android.hardware.nfc.hcef";
+
+    /** See {@code PackageManager#FEATURE_NFC_OFF_HOST_CARD_EMULATION_UICC}. */
+    public static final String FEATURE_NFC_OFF_HOST_CARD_EMULATION_UICC =
+            "android.hardware.nfc.uicc";
+
+    /** See {@code PackageManager#FEATURE_NFC_OFF_HOST_CARD_EMULATION_ESE}. */
+    public static final String FEATURE_NFC_OFF_HOST_CARD_EMULATION_ESE = "android.hardware.nfc.ese";
+
+    /** See {@code PackageManager#FEATURE_NFC_BEAM}. */
+    public static final String FEATURE_NFC_BEAM = "android.sofware.nfc.beam";
+
+    /** See {@code PackageManager#FEATURE_NFC_ANY}. */
+    public static final String FEATURE_NFC_ANY = "android.hardware.nfc.any";
+
+    /** See {@code PackageManager#FEATURE_SE_OMAPI_UICC}. */
+    public static final String FEATURE_SE_OMAPI_UICC = "android.hardware.se.omapi.uicc";
+
+    /** See {@code PackageManager#FEATURE_SE_OMAPI_ESE}. */
+    public static final String FEATURE_SE_OMAPI_ESE = "android.hardware.se.omapi.ese";
+
+    /** See {@code PackageManager#FEATURE_SE_OMAPI_SD}. */
+    public static final String FEATURE_SE_OMAPI_SD = "android.hardware.se.omapi.sd";
+
+    /** See {@code PackageManager#FEATURE_SECURITY_MODEL_COMPATIBLE}. */
+    public static final String FEATURE_SECURITY_MODEL_COMPATIBLE =
+            "android.hardware.security.model.compatible";
+
+    /** See {@code PackageManager#FEATURE_OPENGLES_EXTENSION_PACK}. */
+    public static final String FEATURE_OPENGLES_EXTENSION_PACK = "android.hardware.opengles.aep";
+
+    /** See {@code PackageManager#FEATURE_VULKAN_HARDWARE_LEVEL}. */
+    public static final String FEATURE_VULKAN_HARDWARE_LEVEL = "android.hardware.vulkan.level";
+
+    /** See {@code PackageManager#FEATURE_VULKAN_HARDWARE_COMPUTE}. */
+    public static final String FEATURE_VULKAN_HARDWARE_COMPUTE = "android.hardware.vulkan.compute";
+
+    /** See {@code PackageManager#FEATURE_VULKAN_HARDWARE_VERSION}. */
+    public static final String FEATURE_VULKAN_HARDWARE_VERSION = "android.hardware.vulkan.version";
+
+    /** See {@code PackageManager#FEATURE_VULKAN_DEQP_LEVEL}. */
+    public static final String FEATURE_VULKAN_DEQP_LEVEL = "android.software.vulkan.deqp.level";
+
+    /** See {@code PackageManager#FEATURE_OPENGLES_DEQP_LEVEL}. */
+    public static final String FEATURE_OPENGLES_DEQP_LEVEL = "android.software.opengles.deqp.level";
+
+    /** See {@code PackageManager#FEATURE_BROADCAST_RADIO}. */
+    public static final String FEATURE_BROADCAST_RADIO = "android.hardware.broadcastradio";
+
+    /** See {@code PackageManager#FEATURE_SECURE_LOCK_SCREEN}. */
+    public static final String FEATURE_SECURE_LOCK_SCREEN = "android.software.secure_lock_screen";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_ACCELEROMETER}. */
+    public static final String FEATURE_SENSOR_ACCELEROMETER = "android.hardware.sensor.accelerometer";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_BAROMETER}. */
+    public static final String FEATURE_SENSOR_BAROMETER = "android.hardware.sensor.barometer";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_COMPASS}. */
+    public static final String FEATURE_SENSOR_COMPASS = "android.hardware.sensor.compass";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_GYROSCOPE}. */
+    public static final String FEATURE_SENSOR_GYROSCOPE = "android.hardware.sensor.gyroscope";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_LIGHT}. */
+    public static final String FEATURE_SENSOR_LIGHT = "android.hardware.sensor.light";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_PROXIMITY}. */
+    public static final String FEATURE_SENSOR_PROXIMITY = "android.hardware.sensor.proximity";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_STEP_COUNTER}. */
+    public static final String FEATURE_SENSOR_STEP_COUNTER = "android.hardware.sensor.stepcounter";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_STEP_DETECTOR}. */
+    public static final String FEATURE_SENSOR_STEP_DETECTOR = "android.hardware.sensor.stepdetector";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_HEART_RATE}. */
+    public static final String FEATURE_SENSOR_HEART_RATE = "android.hardware.sensor.heartrate";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_HEART_RATE_ECG}. */
+    public static final String FEATURE_SENSOR_HEART_RATE_ECG =
+            "android.hardware.sensor.heartrate.ecg";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_RELATIVE_HUMIDITY}. */
+    public static final String FEATURE_SENSOR_RELATIVE_HUMIDITY =
+            "android.hardware.sensor.relative_humidity";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_AMBIENT_TEMPERATURE}. */
+    public static final String FEATURE_SENSOR_AMBIENT_TEMPERATURE =
+            "android.hardware.sensor.ambient_temperature";
+
+    /** See {@code PackageManager#FEATURE_SENSOR_HINGE_ANGLE}. */
+    public static final String FEATURE_SENSOR_HINGE_ANGLE = "android.hardware.sensor.hinge_angle";
+
+    /** See {@code PackageManager#FEATURE_HIFI_SENSORS}. */
+    public static final String FEATURE_HIFI_SENSORS =
+            "android.hardware.sensor.hifi_sensors";
+
+    /** See {@code PackageManager#FEATURE_ASSIST_GESTURE}. */
+    public static final String FEATURE_ASSIST_GESTURE = "android.hardware.sensor.assist";
+
+    /** See {@code PackageManager#FEATURE_TELEPHONY}. */
+    public static final String FEATURE_TELEPHONY = "android.hardware.telephony";
+
+    /** See {@code PackageManager#FEATURE_TELEPHONY_CDMA}. */
+    public static final String FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma";
+
+    /** See {@code PackageManager#FEATURE_TELEPHONY_GSM}. */
+    public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";
+
+    /** See {@code PackageManager#FEATURE_TELEPHONY_CARRIERLOCK}. */
+    public static final String FEATURE_TELEPHONY_CARRIERLOCK =
+            "android.hardware.telephony.carrierlock";
+
+    /** See {@code PackageManager#FEATURE_TELEPHONY_EUICC}. */
+    public static final String FEATURE_TELEPHONY_EUICC = "android.hardware.telephony.euicc";
+
+    /** See {@code PackageManager#FEATURE_TELEPHONY_MBMS}. */
+    public static final String FEATURE_TELEPHONY_MBMS = "android.hardware.telephony.mbms";
+
+    /** See {@code PackageManager#FEATURE_TELEPHONY_IMS}. */
+    public static final String FEATURE_TELEPHONY_IMS = "android.hardware.telephony.ims";
+
+    /** See {@code PackageManager#FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION}. */
+    public static final String FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION =
+            "android.hardware.telephony.ims.singlereg";
+
+    /** See {@code PackageManager#FEATURE_UWB}. */
+    public static final String FEATURE_UWB = "android.hardware.uwb";
+
+    /** See {@code PackageManager#FEATURE_USB_HOST}. */
+    public static final String FEATURE_USB_HOST = "android.hardware.usb.host";
+
+    /** See {@code PackageManager#FEATURE_USB_ACCESSORY}. */
+    public static final String FEATURE_USB_ACCESSORY = "android.hardware.usb.accessory";
+
+    /** See {@code PackageManager#FEATURE_SIP}. */
+    public static final String FEATURE_SIP = "android.software.sip";
+
+    /** See {@code PackageManager#FEATURE_SIP_VOIP}. */
+    public static final String FEATURE_SIP_VOIP = "android.software.sip.voip";
+
+    /** See {@code PackageManager#FEATURE_CONNECTION_SERVICE}. */
+    public static final String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";
+
+    /** See {@code PackageManager#FEATURE_TOUCHSCREEN}. */
+    public static final String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";
+
+    /** See {@code PackageManager#FEATURE_TOUCHSCREEN_MULTITOUCH}. */
+    public static final String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch";
+
+    /** See {@code PackageManager#FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT}. */
+    public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_DISTINCT = "android.hardware.touchscreen.multitouch.distinct";
+
+    /** See {@code PackageManager#FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND}. */
+    public static final String FEATURE_TOUCHSCREEN_MULTITOUCH_JAZZHAND = "android.hardware.touchscreen.multitouch.jazzhand";
+
+    /** See {@code PackageManager#FEATURE_FAKETOUCH}. */
+    public static final String FEATURE_FAKETOUCH = "android.hardware.faketouch";
+
+    /** See {@code PackageManager#FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT}. */
+    public static final String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";
+
+    /** See {@code PackageManager#FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND}. */
+    public static final String FEATURE_FAKETOUCH_MULTITOUCH_JAZZHAND = "android.hardware.faketouch.multitouch.jazzhand";
+
+    /** See {@code PackageManager#FEATURE_FINGERPRINT}. */
+    public static final String FEATURE_FINGERPRINT = "android.hardware.fingerprint";
+
+    /** See {@code PackageManager#FEATURE_FACE}. */
+    public static final String FEATURE_FACE = "android.hardware.biometrics.face";
+
+    /** See {@code PackageManager#FEATURE_IRIS}. */
+    public static final String FEATURE_IRIS = "android.hardware.biometrics.iris";
+
+    /** See {@code PackageManager#FEATURE_SCREEN_PORTRAIT}. */
+    public static final String FEATURE_SCREEN_PORTRAIT = "android.hardware.screen.portrait";
+
+    /** See {@code PackageManager#FEATURE_SCREEN_LANDSCAPE}. */
+    public static final String FEATURE_SCREEN_LANDSCAPE = "android.hardware.screen.landscape";
+
+    /** See {@code PackageManager#FEATURE_LIVE_WALLPAPER}. */
+    public static final String FEATURE_LIVE_WALLPAPER = "android.software.live_wallpaper";
+
+    /** See {@code PackageManager#FEATURE_APP_WIDGETS}. */
+    public static final String FEATURE_APP_WIDGETS = "android.software.app_widgets";
+
+    /** See {@code PackageManager#FEATURE_CANT_SAVE_STATE}. */
+    public static final String FEATURE_CANT_SAVE_STATE = "android.software.cant_save_state";
+
+    /** See {@code PackageManager#FEATURE_GAME_SERVICE}. */
+    public static final String FEATURE_GAME_SERVICE = "android.software.game_service";
+
+    /** See {@code PackageManager#FEATURE_VOICE_RECOGNIZERS}. */
+    public static final String FEATURE_VOICE_RECOGNIZERS = "android.software.voice_recognizers";
+
+    /** See {@code PackageManager#FEATURE_HOME_SCREEN}. */
+    public static final String FEATURE_HOME_SCREEN = "android.software.home_screen";
+
+    /** See {@code PackageManager#FEATURE_INPUT_METHODS}. */
+    public static final String FEATURE_INPUT_METHODS = "android.software.input_methods";
+
+    /** See {@code PackageManager#FEATURE_DEVICE_ADMIN}. */
+    public static final String FEATURE_DEVICE_ADMIN = "android.software.device_admin";
+
+    /** See {@code PackageManager#FEATURE_LEANBACK}. */
+    public static final String FEATURE_LEANBACK = "android.software.leanback";
+
+    /** See {@code PackageManager#FEATURE_LEANBACK_ONLY}. */
+    public static final String FEATURE_LEANBACK_ONLY = "android.software.leanback_only";
+
+    /** See {@code PackageManager#FEATURE_LIVE_TV}. */
+    public static final String FEATURE_LIVE_TV = "android.software.live_tv";
+
+    /** See {@code PackageManager#FEATURE_WIFI}. */
+    public static final String FEATURE_WIFI = "android.hardware.wifi";
+
+    /** See {@code PackageManager#FEATURE_WIFI_DIRECT}. */
+    public static final String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";
+
+    /** See {@code PackageManager#FEATURE_WIFI_AWARE}. */
+    public static final String FEATURE_WIFI_AWARE = "android.hardware.wifi.aware";
+
+    /** See {@code PackageManager#FEATURE_WIFI_PASSPOINT}. */
+    public static final String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";
+
+    /** See {@code PackageManager#FEATURE_WIFI_RTT}. */
+    public static final String FEATURE_WIFI_RTT = "android.hardware.wifi.rtt";
+
+    /** See {@code PackageManager#FEATURE_LOWPAN}. */
+    public static final String FEATURE_LOWPAN = "android.hardware.lowpan";
+
+    /** See {@code PackageManager#FEATURE_AUTOMOTIVE}. */
+    public static final String FEATURE_AUTOMOTIVE = "android.hardware.type.automotive";
+
+    /** See {@code PackageManager#FEATURE_TELEVISION}. */
+    public static final String FEATURE_TELEVISION = "android.hardware.type.television";
+
+    /** See {@code PackageManager#FEATURE_WATCH}. */
+    public static final String FEATURE_WATCH = "android.hardware.type.watch";
+
+    /** See {@code PackageManager#FEATURE_EMBEDDED}. */
+    public static final String FEATURE_EMBEDDED = "android.hardware.type.embedded";
+
+    /** See {@code PackageManager#FEATURE_PC}. */
+    public static final String FEATURE_PC = "android.hardware.type.pc";
+
+    /** See {@code PackageManager#FEATURE_PRINTING}. */
+    public static final String FEATURE_PRINTING = "android.software.print";
+
+    /** See {@code PackageManager#FEATURE_COMPANION_DEVICE_SETUP}. */
+    public static final String FEATURE_COMPANION_DEVICE_SETUP =
+            "android.software.companion_device_setup";
+
+    /** See {@code PackageManager#FEATURE_BACKUP}. */
+    public static final String FEATURE_BACKUP = "android.software.backup";
+
+    /** See {@code PackageManager#FEATURE_FREEFORM_WINDOW_MANAGEMENT}. */
+    public static final String FEATURE_FREEFORM_WINDOW_MANAGEMENT =
+            "android.software.freeform_window_management";
+
+    /** See {@code PackageManager#FEATURE_PICTURE_IN_PICTURE}. */
+    public static final String FEATURE_PICTURE_IN_PICTURE = "android.software.picture_in_picture";
+
+    /** See {@code PackageManager#FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS}. */
+    public static final String FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS =
+            "android.software.activities_on_secondary_displays";
+
+    /** See {@code PackageManager#FEATURE_MANAGED_USERS}. */
+    public static final String FEATURE_MANAGED_USERS = "android.software.managed_users";
+
+    /** See {@code PackageManager#FEATURE_MANAGED_PROFILES}. */
+    public static final String FEATURE_MANAGED_PROFILES = "android.software.managed_users";
+
+    /** See {@code PackageManager#FEATURE_NEARBY}. */
+    public static final String FEATURE_NEARBY = "android.software.nearby";
+
+    /** See {@code PackageManager#FEATURE_VERIFIED_BOOT}. */
+    public static final String FEATURE_VERIFIED_BOOT = "android.software.verified_boot";
+
+    /** See {@code PackageManager#FEATURE_SECURELY_REMOVES_USERS}. */
+    public static final String FEATURE_SECURELY_REMOVES_USERS =
+            "android.software.securely_removes_users";
+
+    /** See {@code PackageManager#FEATURE_FILE_BASED_ENCRYPTION}. */
+    public static final String FEATURE_FILE_BASED_ENCRYPTION =
+            "android.software.file_based_encryption";
+
+    /** See {@code PackageManager#FEATURE_ADOPTABLE_STORAGE}. */
+    public static final String FEATURE_ADOPTABLE_STORAGE =
+            "android.software.adoptable_storage";
+
+    /** See {@code PackageManager#FEATURE_WEBVIEW}. */
+    public static final String FEATURE_WEBVIEW = "android.software.webview";
+
+    /** See {@code PackageManager#FEATURE_ETHERNET}. */
+    public static final String FEATURE_ETHERNET = "android.hardware.ethernet";
+
+    /** See {@code PackageManager#FEATURE_HDMI_CEC}. */
+    public static final String FEATURE_HDMI_CEC = "android.hardware.hdmi.cec";
+
+    /** See {@code PackageManager#FEATURE_GAMEPAD}. */
+    public static final String FEATURE_GAMEPAD = "android.hardware.gamepad";
+
+    /** See {@code PackageManager#FEATURE_MIDI}. */
+    public static final String FEATURE_MIDI = "android.software.midi";
+
+    /** See {@code PackageManager#FEATURE_VR_MODE}. */
+    public static final String FEATURE_VR_MODE = "android.software.vr.mode";
+
+    /** See {@code PackageManager#FEATURE_VR_MODE_HIGH_PERFORMANCE}. */
+    public static final String FEATURE_VR_MODE_HIGH_PERFORMANCE
+            = "android.hardware.vr.high_performance";
+
+    /** See {@code PackageManager#FEATURE_AUTOFILL}. */
+    public static final String FEATURE_AUTOFILL = "android.software.autofill";
+
+    /** See {@code PackageManager#FEATURE_VR_HEADTRACKING}. */
+    public static final String FEATURE_VR_HEADTRACKING = "android.hardware.vr.headtracking";
+
+    /** See {@code PackageManager#FEATURE_HARDWARE_KEYSTORE}. */
+    public static final String FEATURE_HARDWARE_KEYSTORE = "android.hardware.hardware_keystore";
+
+    /** See {@code PackageManager#FEATURE_STRONGBOX_KEYSTORE}. */
+    public static final String FEATURE_STRONGBOX_KEYSTORE =
+            "android.hardware.strongbox_keystore";
+
+    /** See {@code PackageManager#FEATURE_SLICES_DISABLED}. */
+    public static final String FEATURE_SLICES_DISABLED = "android.software.slices_disabled";
+
+    /** See {@code PackageManager#FEATURE_DEVICE_UNIQUE_ATTESTATION}. */
+    public static final String FEATURE_DEVICE_UNIQUE_ATTESTATION =
+            "android.hardware.device_unique_attestation";
+
+    /** See {@code PackageManager#FEATURE_DEVICE_ID_ATTESTATION}. */
+    public static final String FEATURE_DEVICE_ID_ATTESTATION =
+            "android.software.device_id_attestation";
+
+    /** See {@code PackageManager#FEATURE_IPSEC_TUNNELS}. */
+    public static final String FEATURE_IPSEC_TUNNELS = "android.software.ipsec_tunnels";
+
+    /** See {@code PackageManager#FEATURE_CONTROLS}. */
+    public static final String FEATURE_CONTROLS = "android.software.controls";
+
+    /** See {@code PackageManager#FEATURE_REBOOT_ESCROW}. */
+    public static final String FEATURE_REBOOT_ESCROW = "android.hardware.reboot_escrow";
+
+    /** See {@code PackageManager#FEATURE_INCREMENTAL_DELIVERY}. */
+    public static final String FEATURE_INCREMENTAL_DELIVERY =
+            "android.software.incremental_delivery";
+
+    /** See {@code PackageManager#FEATURE_TUNER}. */
+    public static final String FEATURE_TUNER = "android.hardware.tv.tuner";
+
+    /** See {@code PackageManager#FEATURE_APP_ENUMERATION}. */
+    public static final String FEATURE_APP_ENUMERATION = "android.software.app_enumeration";
+
+    /** See {@code PackageManager#FEATURE_KEYSTORE_SINGLE_USE_KEY}. */
+    public static final String FEATURE_KEYSTORE_SINGLE_USE_KEY =
+            "android.hardware.keystore.single_use_key";
+
+    /** See {@code PackageManager#FEATURE_KEYSTORE_LIMITED_USE_KEY}. */
+    public static final String FEATURE_KEYSTORE_LIMITED_USE_KEY =
+            "android.hardware.keystore.limited_use_key";
+
+    /** See {@code PackageManager#FEATURE_KEYSTORE_APP_ATTEST_KEY}. */
+    public static final String FEATURE_KEYSTORE_APP_ATTEST_KEY =
+            "android.hardware.keystore.app_attest_key";
+
+    /** See {@code PackageManager#FEATURE_APP_COMPAT_OVERRIDES}. */
+    public static final String FEATURE_APP_COMPAT_OVERRIDES =
+            "android.software.app_compat_overrides";
+
+    /** See {@code PackageManager#FEATURE_COMMUNAL_MODE}. */
+    public static final String FEATURE_COMMUNAL_MODE = "android.software.communal_mode";
+}
diff --git a/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/permissions/CommonPermissions.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/permissions/CommonPermissions.java
new file mode 100644
index 0000000..36465a9
--- /dev/null
+++ b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/permissions/CommonPermissions.java
@@ -0,0 +1,1850 @@
+/*
+ * Copyright (C) 2021 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.bedstead.nene.permissions;
+
+/** Permissions helper methods common to host and device. */
+public class CommonPermissions {
+
+    CommonPermissions() {
+
+    }
+
+    /** See {@code Manifest#READ_CONTACTS} */
+    public static final String READ_CONTACTS = "android.permission.READ_CONTACTS";
+
+    /** See {@code Manifest#WRITE_CONTACTS} */
+    public static final String WRITE_CONTACTS = "android.permission.WRITE_CONTACTS";
+
+    /** See {@code Manifest#SET_DEFAULT_ACCOUNT_FOR_CONTACTS} */
+    public static final String SET_DEFAULT_ACCOUNT_FOR_CONTACTS =
+            "android.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS";
+
+    /** See {@code Manifest#READ_CALENDAR} */
+    public static final String READ_CALENDAR = "android.permission.READ_CALENDAR";
+
+    /** See {@code Manifest#WRITE_CALENDAR} */
+    public static final String WRITE_CALENDAR = "android.permission.WRITE_CALENDAR";
+
+    /** See {@code Manifest#ACCESS_MESSAGES_ON_ICC} */
+    public static final String ACCESS_MESSAGES_ON_ICC = "android.permission"
+            + ".ACCESS_MESSAGES_ON_ICC";
+
+    /** See {@code Manifest#SEND_SMS} */
+    public static final String SEND_SMS = "android.permission.SEND_SMS";
+
+    /** See {@code Manifest#RECEIVE_SMS} */
+    public static final String RECEIVE_SMS = "android.permission.RECEIVE_SMS";
+
+    /** See {@code Manifest#READ_SMS} */
+    public static final String READ_SMS = "android.permission.READ_SMS";
+
+    /** See {@code Manifest#RECEIVE_WAP_PUSH} */
+    public static final String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";
+
+    /** See {@code Manifest#RECEIVE_MMS} */
+    public static final String RECEIVE_MMS = "android.permission.RECEIVE_MMS";
+
+    /** See {@code Manifest#BIND_CELL_BROADCAST_SERVICE} */
+    public static final String BIND_CELL_BROADCAST_SERVICE = "android.permission"
+            + ".BIND_CELL_BROADCAST_SERVICE";
+
+    /** See {@code Manifest#READ_CELL_BROADCASTS} */
+    public static final String READ_CELL_BROADCASTS = "android.permission.READ_CELL_BROADCASTS";
+
+    /** See {@code Manifest#WRITE_EXTERNAL_STORAGE} */
+    public static final String WRITE_EXTERNAL_STORAGE = "android.permission.WRITE_EXTERNAL_STORAGE";
+
+    /** See {@code Manifest#ACCESS_MEDIA_LOCATION} */
+    public static final String ACCESS_MEDIA_LOCATION = "android.permission.ACCESS_MEDIA_LOCATION";
+
+    /** See {@code Manifest#WRITE_OBB} */
+    public static final String WRITE_OBB = "android.permission.WRITE_OBB";
+
+    /** See {@code Manifest#MANAGE_EXTERNAL_STORAGE} */
+    public static final String MANAGE_EXTERNAL_STORAGE = "android.permission"
+            + ".MANAGE_EXTERNAL_STORAGE";
+
+    /** See {@code Manifest#MANAGE_MEDIA} */
+    public static final String MANAGE_MEDIA = "android.permission.MANAGE_MEDIA";
+
+    /** See {@code Manifest#ACCESS_FINE_LOCATION} */
+    public static final String ACCESS_FINE_LOCATION = "android.permission.ACCESS_FINE_LOCATION";
+
+    /** See {@code Manifest#ACCESS_COARSE_LOCATION} */
+    public static final String ACCESS_COARSE_LOCATION = "android.permission.ACCESS_COARSE_LOCATION";
+
+    /** See {@code Manifest#ACCESS_BACKGROUND_LOCATION} */
+    public static final String ACCESS_BACKGROUND_LOCATION =
+            "android.permission.ACCESS_BACKGROUND_LOCATION";
+
+    /** See {@code Manifest#ACCESS_IMS_CALL_SERVICE} */
+    public static final String ACCESS_IMS_CALL_SERVICE = "android.permission"
+            + ".ACCESS_IMS_CALL_SERVICE";
+
+    /** See {@code Manifest#PERFORM_IMS_SINGLE_REGISTRATION} */
+    public static final String PERFORM_IMS_SINGLE_REGISTRATION = "android.permission"
+            + ".PERFORM_IMS_SINGLE_REGISTRATION";
+
+    /** See {@code Manifest#READ_CALL_LOG} */
+    public static final String READ_CALL_LOG = "android.permission.READ_CALL_LOG";
+
+    /** See {@code Manifest#PROCESS_OUTGOING_CALLS} */
+    public static final String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";
+
+    /** See {@code Manifest#READ_PHONE_STATE} */
+    public static final String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE";
+
+    /** See {@code Manifest#READ_BASIC_PHONE_STATE} */
+    public static final String READ_BASIC_PHONE_STATE = "android.permission.READ_BASIC_PHONE_STATE";
+
+    /** See {@code Manifest#READ_PHONE_NUMBERS} */
+    public static final String READ_PHONE_NUMBERS = "android.permission.READ_PHONE_NUMBERS";
+
+    /** See {@code Manifest#CALL_PHONE} */
+    public static final String CALL_PHONE = "android.permission.CALL_PHONE";
+
+    /** See {@code Manifest#ADD_VOICEMAIL} */
+    public static final String ADD_VOICEMAIL = "com.android.voicemail.permission.ADD_VOICEMAIL";
+
+    /** See {@code Manifest#USE_SIP} */
+    public static final String USE_SIP = "android.permission.USE_SIP";
+
+    /** See {@code Manifest#ANSWER_PHONE_CALLS} */
+    public static final String ANSWER_PHONE_CALLS = "android.permission.ANSWER_PHONE_CALLS";
+
+    /** See {@code Manifest#MANAGE_OWN_CALLS} */
+    public static final String MANAGE_OWN_CALLS = "android.permission.MANAGE_OWN_CALLS";
+
+    /** See {@code Manifest#CALL_COMPANION_APP} */
+    public static final String CALL_COMPANION_APP = "android.permission.CALL_COMPANION_APP";
+
+    /** See {@code Manifest#EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS} */
+    public static final String EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS = "android.permission"
+            + ".EXEMPT_FROM_AUDIO_RECORD_RESTRICTIONS";
+
+    /** See {@code Manifest#ACCEPT_HANDOVER} */
+    public static final String ACCEPT_HANDOVER = "android.permission.ACCEPT_HANDOVER";
+
+    /** See {@code Manifest#RECORD_AUDIO} */
+    public static final String RECORD_AUDIO = "android.permission.RECORD_AUDIO";
+
+    /** See {@code Manifest#RECORD_BACKGROUND_AUDIO} */
+    public static final String RECORD_BACKGROUND_AUDIO =
+            "android.permission.RECORD_BACKGROUND_AUDIO";
+
+    /** See {@code Manifest#ACTIVITY_RECOGNITION} */
+    public static final String ACTIVITY_RECOGNITION = "android.permission.ACTIVITY_RECOGNITION";
+
+    /** See {@code Manifest#ACCESS_UCE_PRESENCE_SERVICE} */
+    public static final String ACCESS_UCE_PRESENCE_SERVICE =
+            "android.permission.ACCESS_UCE_PRESENCE_SERVICE";
+
+    /** See {@code Manifest#ACCESS_UCE_OPTIONS_SERVICE} */
+    public static final String ACCESS_UCE_OPTIONS_SERVICE =
+            "android.permission.ACCESS_UCE_OPTIONS_SERVICE";
+
+    /** See {@code Manifest#CAMERA} */
+    public static final String CAMERA = "android.permission.CAMERA";
+
+    /** See {@code Manifest#BACKGROUND_CAMERA} */
+    public static final String BACKGROUND_CAMERA = "android.permission.BACKGROUND_CAMERA";
+
+    /** See {@code Manifest#SYSTEM_CAMERA} */
+    public static final String SYSTEM_CAMERA = "android.permission.SYSTEM_CAMERA";
+
+    /** See {@code Manifest#CAMERA_OPEN_CLOSE_LISTENER} */
+    public static final String CAMERA_OPEN_CLOSE_LISTENER = "android.permission"
+            + ".CAMERA_OPEN_CLOSE_LISTENER";
+
+    /** See {@code Manifest#HIGH_SAMPLING_RATE_SENSORS} */
+    public static final String HIGH_SAMPLING_RATE_SENSORS =
+            "android.permission.HIGH_SAMPLING_RATE_SENSORS";
+
+    /** See {@code Manifest#BODY_SENSORS} */
+    public static final String BODY_SENSORS = "android.permission.BODY_SENSORS";
+
+    /** See {@code Manifest#USE_FINGERPRINT} */
+    public static final String USE_FINGERPRINT = "android.permission.USE_FINGERPRINT";
+
+    /** See {@code Manifest#USE_BIOMETRIC} */
+    public static final String USE_BIOMETRIC = "android.permission.USE_BIOMETRIC";
+
+    /** See {@code Manifest#POST_NOTIFICATIONS} */
+    public static final String POST_NOTIFICATIONS = "android.permission.POST_NOTIFICATIONS";
+
+    /** See {@code Manifest#READ_PROFILE} */
+    public static final String READ_PROFILE = "android.permission.READ_PROFILE";
+
+    /** See {@code Manifest#WRITE_PROFILE} */
+    public static final String WRITE_PROFILE = "android.permission.WRITE_PROFILE";
+
+    /** See {@code Manifest#READ_SOCIAL_STREAM} */
+    public static final String READ_SOCIAL_STREAM = "android.permission.READ_SOCIAL_STREAM";
+
+    /** See {@code Manifest#WRITE_SOCIAL_STREAM} */
+    public static final String WRITE_SOCIAL_STREAM = "android.permission.WRITE_SOCIAL_STREAM";
+
+    /** See {@code Manifest#READ_USER_DICTIONARY} */
+    public static final String READ_USER_DICTIONARY = "android.permission.READ_USER_DICTIONARY";
+
+    /** See {@code Manifest#WRITE_USER_DICTIONARY} */
+    public static final String WRITE_USER_DICTIONARY = "android.permission.WRITE_USER_DICTIONARY";
+
+    /** See {@code Manifest#WRITE_SMS} */
+    public static final String WRITE_SMS = "android.permission.WRITE_SMS";
+
+    /** See {@code Manifest#READ_HISTORY_BOOKMARKS} */
+    public static final String READ_HISTORY_BOOKMARKS =
+            "com.android.browser.permission.READ_HISTORY_BOOKMARKS";
+
+    /** See {@code Manifest#WRITE_HISTORY_BOOKMARKS} */
+    public static final String WRITE_HISTORY_BOOKMARKS =
+            "com.android.browser.permission.WRITE_HISTORY_BOOKMARKS";
+
+    /** See {@code Manifest#AUTHENTICATE_ACCOUNTS} */
+    public static final String AUTHENTICATE_ACCOUNTS = "android.permission.AUTHENTICATE_ACCOUNTS";
+
+    /** See {@code Manifest#MANAGE_ACCOUNTS} */
+    public static final String MANAGE_ACCOUNTS = "android.permission.MANAGE_ACCOUNTS";
+
+    /** See {@code Manifest#USE_CREDENTIALS} */
+    public static final String USE_CREDENTIALS = "android.permission.USE_CREDENTIALS";
+
+    /** See {@code Manifest#SUBSCRIBED_FEEDS_READ} */
+    public static final String SUBSCRIBED_FEEDS_READ = "android.permission.SUBSCRIBED_FEEDS_READ";
+
+    /** See {@code Manifest#SUBSCRIBED_FEEDS_WRITE} */
+    public static final String SUBSCRIBED_FEEDS_WRITE = "android.permission"
+            + ".SUBSCRIBED_FEEDS_WRITE";
+
+    /** See {@code Manifest#FLASHLIGHT} */
+    public static final String FLASHLIGHT = "android.permission.FLASHLIGHT";
+
+    /** See {@code Manifest#SEND_RESPOND_VIA_MESSAGE} */
+    public static final String SEND_RESPOND_VIA_MESSAGE =
+            "android.permission.SEND_RESPOND_VIA_MESSAGE";
+
+    /** See {@code Manifest#SEND_SMS_NO_CONFIRMATION} */
+    public static final String SEND_SMS_NO_CONFIRMATION = "android.permission"
+            + ".SEND_SMS_NO_CONFIRMATION";
+
+    /** See {@code Manifest#CARRIER_FILTER_SMS} */
+    public static final String CARRIER_FILTER_SMS = "android.permission.CARRIER_FILTER_SMS";
+
+    /** See {@code Manifest#RECEIVE_EMERGENCY_BROADCAST} */
+    public static final String RECEIVE_EMERGENCY_BROADCAST =
+            "android.permission.RECEIVE_EMERGENCY_BROADCAST";
+
+    /** See {@code Manifest#RECEIVE_BLUETOOTH_MAP} */
+    public static final String RECEIVE_BLUETOOTH_MAP = "android.permission.RECEIVE_BLUETOOTH_MAP";
+
+    /** See {@code Manifest#MODIFY_CELL_BROADCASTS} */
+    public static final String MODIFY_CELL_BROADCASTS =
+            "android.permission.MODIFY_CELL_BROADCASTS";
+
+    /** See {@code Manifest#SET_ALARM} */
+    public static final String SET_ALARM = "com.android.alarm.permission.SET_ALARM";
+
+    /** See {@code Manifest#WRITE_VOICEMAIL} */
+    public static final String WRITE_VOICEMAIL = "com.android.voicemail.permission.WRITE_VOICEMAIL";
+
+    /** See {@code Manifest#READ_VOICEMAIL} */
+    public static final String READ_VOICEMAIL = "com.android.voicemail.permission.READ_VOICEMAIL";
+    /** See {@code Manifest#ACCESS_LOCATION_EXTRA_COMMANDS} */
+    public static final String ACCESS_LOCATION_EXTRA_COMMANDS = "android.permission"
+            + ".ACCESS_LOCATION_EXTRA_COMMANDS";
+    /** See {@code Manifest#INSTALL_LOCATION_PROVIDER} */
+    public static final String INSTALL_LOCATION_PROVIDER = "android.permission"
+            + ".INSTALL_LOCATION_PROVIDER";
+    /** See {@code Manifest#INSTALL_LOCATION_TIME_ZONE_PROVIDER_SERVICE} */
+    public static final String INSTALL_LOCATION_TIME_ZONE_PROVIDER_SERVICE = "android"
+            + ".permission.INSTALL_LOCATION_TIME_ZONE_PROVIDER_SERVICE";
+    /** See {@code Manifest#BIND_TIME_ZONE_PROVIDER_SERVICE} */
+    public static final String BIND_TIME_ZONE_PROVIDER_SERVICE =
+            "android.permission.BIND_TIME_ZONE_PROVIDER_SERVICE";
+    /** See {@code Manifest#HDMI_CEC} */
+    public static final String HDMI_CEC = "android.permission.HDMI_CEC";
+    /** See {@code Manifest#LOCATION_HARDWARE} */
+    public static final String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";
+    /** See {@code Manifest#ACCESS_CONTEXT_HUB} */
+    public static final String ACCESS_CONTEXT_HUB = "android.permission.ACCESS_CONTEXT_HUB";
+    /** See {@code Manifest#ACCESS_MOCK_LOCATION} */
+    public static final String ACCESS_MOCK_LOCATION = "android.permission.ACCESS_MOCK_LOCATION";
+    /** See {@code Manifest#AUTOMOTIVE_GNSS_CONTROLS} */
+    public static final String AUTOMOTIVE_GNSS_CONTROLS =
+            "android.permission.AUTOMOTIVE_GNSS_CONTROLS";
+    /** See {@code Manifest#INTERNET} */
+    public static final String INTERNET = "android.permission.INTERNET";
+    /** See {@code Manifest#ACCESS_NETWORK_STATE} */
+    public static final String ACCESS_NETWORK_STATE = "android.permission.ACCESS_NETWORK_STATE";
+    /** See {@code Manifest#ACCESS_WIFI_STATE} */
+    public static final String ACCESS_WIFI_STATE = "android.permission.ACCESS_WIFI_STATE";
+    /** See {@code Manifest#CHANGE_WIFI_STATE} */
+    public static final String CHANGE_WIFI_STATE = "android.permission.CHANGE_WIFI_STATE";
+    /** See {@code Manifest#MANAGE_WIFI_AUTO_JOIN} */
+    public static final String MANAGE_WIFI_AUTO_JOIN = "android.permission.MANAGE_WIFI_AUTO_JOIN";
+    /** See {@code Manifest#MANAGE_IPSEC_TUNNELS} */
+    public static final String MANAGE_IPSEC_TUNNELS = "android.permission.MANAGE_IPSEC_TUNNELS";
+    /** See {@code Manifest#MANAGE_TEST_NETWORKS} */
+    public static final String MANAGE_TEST_NETWORKS = "android.permission.MANAGE_TEST_NETWORKS";
+    /** See {@code Manifest#READ_WIFI_CREDENTIAL} */
+    public static final String READ_WIFI_CREDENTIAL = "android.permission.READ_WIFI_CREDENTIAL";
+    /** See {@code Manifest#TETHER_PRIVILEGED} */
+    public static final String TETHER_PRIVILEGED = "android.permission.TETHER_PRIVILEGED";
+    /** See {@code Manifest#RECEIVE_WIFI_CREDENTIAL_CHANGE} */
+    public static final String RECEIVE_WIFI_CREDENTIAL_CHANGE = "android.permission"
+            + ".RECEIVE_WIFI_CREDENTIAL_CHANGE";
+    /** See {@code Manifest#OVERRIDE_WIFI_CONFIG} */
+    public static final String OVERRIDE_WIFI_CONFIG = "android.permission.OVERRIDE_WIFI_CONFIG";
+    /** See {@code Manifest#SCORE_NETWORKS} */
+    public static final String SCORE_NETWORKS = "android.permission.SCORE_NETWORKS";
+    /** See {@code Manifest#REQUEST_NETWORK_SCORES} */
+    public static final String REQUEST_NETWORK_SCORES = "android.permission.REQUEST_NETWORK_SCORES";
+    /** See {@code Manifest#RESTART_WIFI_SUBSYSTEM} */
+    public static final String RESTART_WIFI_SUBSYSTEM = "android.permission"
+            + ".RESTART_WIFI_SUBSYSTEM";
+    /** See {@code Manifest#NETWORK_AIRPLANE_MODE} */
+    public static final String NETWORK_AIRPLANE_MODE = "android.permission.NETWORK_AIRPLANE_MODE";
+    /** See {@code Manifest#NETWORK_STACK} */
+    public static final String NETWORK_STACK = "android.permission.NETWORK_STACK";
+    /** See {@code Manifest#OBSERVE_NETWORK_POLICY} */
+    public static final String OBSERVE_NETWORK_POLICY = "android.permission"
+            + ".OBSERVE_NETWORK_POLICY";
+    /** See {@code Manifest#NETWORK_FACTORY} */
+    public static final String NETWORK_FACTORY = "android.permission.NETWORK_FACTORY";
+    /** See {@code Manifest#NETWORK_STATS_PROVIDER} */
+    public static final String NETWORK_STATS_PROVIDER = "android.permission.NETWORK_STATS_PROVIDER";
+    /** See {@code Manifest#NETWORK_SETTINGS} */
+    public static final String NETWORK_SETTINGS = "android.permission.NETWORK_SETTINGS";
+    /** See {@code Manifest#RADIO_SCAN_WITHOUT_LOCATION} */
+    public static final String RADIO_SCAN_WITHOUT_LOCATION =
+            "android.permission.RADIO_SCAN_WITHOUT_LOCATION";
+    /** See {@code Manifest#NETWORK_SETUP_WIZARD} */
+    public static final String NETWORK_SETUP_WIZARD = "android.permission.NETWORK_SETUP_WIZARD";
+    /** See {@code Manifest#NETWORK_MANAGED_PROVISIONING} */
+    public static final String NETWORK_MANAGED_PROVISIONING = "android.permission"
+            + ".NETWORK_MANAGED_PROVISIONING";
+    /** See {@code Manifest#NETWORK_CARRIER_PROVISIONING} */
+    public static final String NETWORK_CARRIER_PROVISIONING =
+            "android.permission.NETWORK_CARRIER_PROVISIONING";
+    /** See {@code Manifest#ACCESS_LOWPAN_STATE} */
+    public static final String ACCESS_LOWPAN_STATE = "android.permission.ACCESS_LOWPAN_STATE";
+    /** See {@code Manifest#CHANGE_LOWPAN_STATE} */
+    public static final String CHANGE_LOWPAN_STATE = "android.permission.CHANGE_LOWPAN_STATE";
+    /** See {@code Manifest#READ_LOWPAN_CREDENTIAL} */
+    public static final String READ_LOWPAN_CREDENTIAL = "android.permission.READ_LOWPAN_CREDENTIAL";
+    /** See {@code Manifest#MANAGE_LOWPAN_INTERFACES} */
+    public static final String MANAGE_LOWPAN_INTERFACES = "android.permission"
+            + ".MANAGE_LOWPAN_INTERFACES";
+    /** See {@code Manifest#NETWORK_BYPASS_PRIVATE_DNS} */
+    public static final String NETWORK_BYPASS_PRIVATE_DNS =
+            "android.permission.NETWORK_BYPASS_PRIVATE_DNS";
+    /** See {@code Manifest#WIFI_SET_DEVICE_MOBILITY_STATE} */
+    public static final String WIFI_SET_DEVICE_MOBILITY_STATE =
+            "android.permission.WIFI_SET_DEVICE_MOBILITY_STATE";
+    /** See {@code Manifest#WIFI_UPDATE_USABILITY_STATS_SCORE} */
+    public static final String WIFI_UPDATE_USABILITY_STATS_SCORE = "android.permission"
+            + ".WIFI_UPDATE_USABILITY_STATS_SCORE";
+    /** See {@code Manifest#WIFI_UPDATE_COEX_UNSAFE_CHANNELS} */
+    public static final String WIFI_UPDATE_COEX_UNSAFE_CHANNELS = "android.permission"
+            + ".WIFI_UPDATE_COEX_UNSAFE_CHANNELS";
+    /** See {@code Manifest#WIFI_ACCESS_COEX_UNSAFE_CHANNELS} */
+    public static final String WIFI_ACCESS_COEX_UNSAFE_CHANNELS = "android.permission"
+            + ".WIFI_ACCESS_COEX_UNSAFE_CHANNELS";
+    /** See {@code Manifest#MANAGE_WIFI_COUNTRY_CODE} */
+    public static final String MANAGE_WIFI_COUNTRY_CODE =
+            "android.permission.MANAGE_WIFI_COUNTRY_CODE";
+    /** See {@code Manifest#CONTROL_OEM_PAID_NETWORK_PREFERENCE} */
+    public static final String CONTROL_OEM_PAID_NETWORK_PREFERENCE =
+            "android.permission.CONTROL_OEM_PAID_NETWORK_PREFERENCE";
+    /** See {@code Manifest#BLUETOOTH} */
+    public static final String BLUETOOTH = "android.permission.BLUETOOTH";
+    /** See {@code Manifest#BLUETOOTH_SCAN} */
+    public static final String BLUETOOTH_SCAN = "android.permission.BLUETOOTH_SCAN";
+    /** See {@code Manifest#BLUETOOTH_CONNECT} */
+    public static final String BLUETOOTH_CONNECT = "android.permission.BLUETOOTH_CONNECT";
+    /** See {@code Manifest#BLUETOOTH_ADVERTISE} */
+    public static final String BLUETOOTH_ADVERTISE = "android.permission.BLUETOOTH_ADVERTISE";
+    /** See {@code Manifest#UWB_RANGING} */
+    public static final String UWB_RANGING = "android.permission.UWB_RANGING";
+    /** See {@code Manifest#NEARBY_WIFI_DEVICES} */
+    public static final String NEARBY_WIFI_DEVICES = "android.permission.NEARBY_WIFI_DEVICES";
+    /** See {@code Manifest#SUSPEND_APPS} */
+    public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS";
+    /** See {@code Manifest#BLUETOOTH_ADMIN} */
+    public static final String BLUETOOTH_ADMIN = "android.permission.BLUETOOTH_ADMIN";
+    /** See {@code Manifest#BLUETOOTH_PRIVILEGED} */
+    public static final String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED";
+    /** See {@code Manifest#BLUETOOTH_MAP} */
+    public static final String BLUETOOTH_MAP = "android.permission.BLUETOOTH_MAP";
+    /** See {@code Manifest#BLUETOOTH_STACK} */
+    public static final String BLUETOOTH_STACK = "android.permission.BLUETOOTH_STACK";
+    /** See {@code Manifest#VIRTUAL_INPUT_DEVICE} */
+    public static final String VIRTUAL_INPUT_DEVICE = "android.permission.VIRTUAL_INPUT_DEVICE";
+    /** See {@code Manifest#NFC} */
+    public static final String NFC = "android.permission.NFC";
+    /** See {@code Manifest#NFC_TRANSACTION_EVENT} */
+    public static final String NFC_TRANSACTION_EVENT = "android.permission.NFC_TRANSACTION_EVENT";
+    /** See {@code Manifest#NFC_PREFERRED_PAYMENT_INFO} */
+    public static final String NFC_PREFERRED_PAYMENT_INFO =
+            "android.permission.NFC_PREFERRED_PAYMENT_INFO";
+    /** See {@code Manifest#NFC_SET_CONTROLLER_ALWAYS_ON} */
+    public static final String NFC_SET_CONTROLLER_ALWAYS_ON = "android.permission"
+            + ".NFC_SET_CONTROLLER_ALWAYS_ON";
+    /** See {@code Manifest#SECURE_ELEMENT_PRIVILEGED_OPERATION} */
+    public static final String SECURE_ELEMENT_PRIVILEGED_OPERATION = "android.permission"
+            + ".SECURE_ELEMENT_PRIVILEGED_OPERATION";
+    /** See {@code Manifest#CONNECTIVITY_INTERNAL} */
+    public static final String CONNECTIVITY_INTERNAL = "android.permission.CONNECTIVITY_INTERNAL";
+    /** See {@code Manifest#CONNECTIVITY_USE_RESTRICTED_NETWORKS} */
+    public static final String CONNECTIVITY_USE_RESTRICTED_NETWORKS =
+            "android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS";
+    /** See {@code Manifest#NETWORK_SIGNAL_STRENGTH_WAKEUP} */
+    public static final String NETWORK_SIGNAL_STRENGTH_WAKEUP =
+            "android.permission.NETWORK_SIGNAL_STRENGTH_WAKEUP";
+    /** See {@code Manifest#PACKET_KEEPALIVE_OFFLOAD} */
+    public static final String PACKET_KEEPALIVE_OFFLOAD =
+            "android.permission.PACKET_KEEPALIVE_OFFLOAD";
+    /** See {@code Manifest#RECEIVE_DATA_ACTIVITY_CHANGE} */
+    public static final String RECEIVE_DATA_ACTIVITY_CHANGE =
+            "android.permission.RECEIVE_DATA_ACTIVITY_CHANGE";
+    /** See {@code Manifest#LOOP_RADIO} */
+    public static final String LOOP_RADIO = "android.permission.LOOP_RADIO";
+    /** See {@code Manifest#NFC_HANDOVER_STATUS} */
+    public static final String NFC_HANDOVER_STATUS = "android.permission.NFC_HANDOVER_STATUS";
+    /** See {@code Manifest#MANAGE_BLUETOOTH_WHEN_WIRELESS_CONSENT_REQUIRED} */
+    public static final String MANAGE_BLUETOOTH_WHEN_WIRELESS_CONSENT_REQUIRED =
+            "android.permission.MANAGE_BLUETOOTH_WHEN_WIRELESS_CONSENT_REQUIRED";
+    /** See {@code Manifest#ENABLE_TEST_HARNESS_MODE} */
+    public static final String ENABLE_TEST_HARNESS_MODE =
+            "android.permission.ENABLE_TEST_HARNESS_MODE";
+    /** See {@code Manifest#GET_ACCOUNTS} */
+    public static final String GET_ACCOUNTS = "android.permission.GET_ACCOUNTS";
+    /** See {@code Manifest#ACCOUNT_MANAGER} */
+    public static final String ACCOUNT_MANAGER = "android.permission.ACCOUNT_MANAGER";
+    /** See {@code Manifest#CHANGE_WIFI_MULTICAST_STATE} */
+    public static final String CHANGE_WIFI_MULTICAST_STATE = "android.permission"
+            + ".CHANGE_WIFI_MULTICAST_STATE";
+    /** See {@code Manifest#VIBRATE} */
+    public static final String VIBRATE = "android.permission.VIBRATE";
+    /** See {@code Manifest#VIBRATE_ALWAYS_ON} */
+    public static final String VIBRATE_ALWAYS_ON = "android.permission.VIBRATE_ALWAYS_ON";
+    /** See {@code Manifest#ACCESS_VIBRATOR_STATE} */
+    public static final String ACCESS_VIBRATOR_STATE = "android.permission.ACCESS_VIBRATOR_STATE";
+    /** See {@code Manifest#WAKE_LOCK} */
+    public static final String WAKE_LOCK = "android.permission.WAKE_LOCK";
+    /** See {@code Manifest#TRANSMIT_IR} */
+    public static final String TRANSMIT_IR = "android.permission.TRANSMIT_IR";
+    /** See {@code Manifest#MODIFY_AUDIO_SETTINGS} */
+    public static final String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";
+    /** See {@code Manifest#MANAGE_FACTORY_RESET_PROTECTION} */
+    public static final String MANAGE_FACTORY_RESET_PROTECTION = "android.permission"
+            + ".MANAGE_FACTORY_RESET_PROTECTION";
+    /** See {@code Manifest#MANAGE_USB} */
+    public static final String MANAGE_USB = "android.permission.MANAGE_USB";
+    /** See {@code Manifest#MANAGE_DEBUGGING} */
+    public static final String MANAGE_DEBUGGING = "android.permission.MANAGE_DEBUGGING";
+    /** See {@code Manifest#ACCESS_MTP} */
+    public static final String ACCESS_MTP = "android.permission.ACCESS_MTP";
+    /** See {@code Manifest#HARDWARE_TEST} */
+    public static final String HARDWARE_TEST = "android.permission.HARDWARE_TEST";
+    /** See {@code Manifest#MANAGE_DYNAMIC_SYSTEM} */
+    public static final String MANAGE_DYNAMIC_SYSTEM = "android.permission.MANAGE_DYNAMIC_SYSTEM";
+    /** See {@code Manifest#INSTALL_DYNAMIC_SYSTEM} */
+    public static final String INSTALL_DYNAMIC_SYSTEM = "android.permission"
+            + ".INSTALL_DYNAMIC_SYSTEM";
+    /** See {@code Manifest#ACCESS_BROADCAST_RADIO} */
+    public static final String ACCESS_BROADCAST_RADIO = "android.permission"
+            + ".ACCESS_BROADCAST_RADIO";
+    /** See {@code Manifest#ACCESS_FM_RADIO} */
+    public static final String ACCESS_FM_RADIO = "android.permission.ACCESS_FM_RADIO";
+    /** See {@code Manifest#NET_ADMIN} */
+    public static final String NET_ADMIN = "android.permission.NET_ADMIN";
+    /** See {@code Manifest#REMOTE_AUDIO_PLAYBACK} */
+    public static final String REMOTE_AUDIO_PLAYBACK = "android.permission.REMOTE_AUDIO_PLAYBACK";
+    /** See {@code Manifest#TV_INPUT_HARDWARE} */
+    public static final String TV_INPUT_HARDWARE = "android.permission.TV_INPUT_HARDWARE";
+    /** See {@code Manifest#CAPTURE_TV_INPUT} */
+    public static final String CAPTURE_TV_INPUT = "android.permission.CAPTURE_TV_INPUT";
+    /** See {@code Manifest#DVB_DEVICE} */
+    public static final String DVB_DEVICE = "android.permission.DVB_DEVICE";
+    /** See {@code Manifest#MANAGE_CARRIER_OEM_UNLOCK_STATE} */
+    public static final String MANAGE_CARRIER_OEM_UNLOCK_STATE = "android.permission"
+            + ".MANAGE_CARRIER_OEM_UNLOCK_STATE";
+    /** See {@code Manifest#MANAGE_USER_OEM_UNLOCK_STATE} */
+    public static final String MANAGE_USER_OEM_UNLOCK_STATE = "android.permission"
+            + ".MANAGE_USER_OEM_UNLOCK_STATE";
+    /** See {@code Manifest#READ_OEM_UNLOCK_STATE} */
+    public static final String READ_OEM_UNLOCK_STATE = "android.permission.READ_OEM_UNLOCK_STATE";
+    /** See {@code Manifest#OEM_UNLOCK_STATE} */
+    public static final String OEM_UNLOCK_STATE = "android.permission.OEM_UNLOCK_STATE";
+    /** See {@code Manifest#ACCESS_PDB_STATE} */
+    public static final String ACCESS_PDB_STATE = "android.permission.ACCESS_PDB_STATE";
+    /** See {@code Manifest#TEST_BLACKLISTED_PASSWORD} */
+    public static final String TEST_BLACKLISTED_PASSWORD =
+            "android.permission.TEST_BLACKLISTED_PASSWORD";
+    /** See {@code Manifest#NOTIFY_PENDING_SYSTEM_UPDATE} */
+    public static final String NOTIFY_PENDING_SYSTEM_UPDATE =
+            "android.permission.NOTIFY_PENDING_SYSTEM_UPDATE";
+    /** See {@code Manifest#CAMERA_DISABLE_TRANSMIT_LED} */
+    public static final String CAMERA_DISABLE_TRANSMIT_LED =
+            "android.permission.CAMERA_DISABLE_TRANSMIT_LED";
+    /** See {@code Manifest#CAMERA_SEND_SYSTEM_EVENTS} */
+    public static final String CAMERA_SEND_SYSTEM_EVENTS =
+            "android.permission.CAMERA_SEND_SYSTEM_EVENTS";
+    /** See {@code Manifest#CAMERA_INJECT_EXTERNAL_CAMERA} */
+    public static final String CAMERA_INJECT_EXTERNAL_CAMERA =
+            "android.permission.CAMERA_INJECT_EXTERNAL_CAMERA";
+    /** See {@code Manifest#GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS} */
+    public static final String GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS = "android"
+            + ".permission.GRANT_RUNTIME_PERMISSIONS_TO_TELEPHONY_DEFAULTS";
+    /** See {@code Manifest#MODIFY_PHONE_STATE} */
+    public static final String MODIFY_PHONE_STATE = "android.permission.MODIFY_PHONE_STATE";
+    /** See {@code Manifest#READ_PRECISE_PHONE_STATE} */
+    public static final String READ_PRECISE_PHONE_STATE =
+            "android.permission.READ_PRECISE_PHONE_STATE";
+    /** See {@code Manifest#READ_PRIVILEGED_PHONE_STATE} */
+    public static final String READ_PRIVILEGED_PHONE_STATE = "android.permission"
+            + ".READ_PRIVILEGED_PHONE_STATE";
+    /** See {@code Manifest#USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER} */
+    public static final String USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER =
+            "android.permission.USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER";
+    /** See {@code Manifest#READ_ACTIVE_EMERGENCY_SESSION} */
+    public static final String READ_ACTIVE_EMERGENCY_SESSION = "android.permission"
+            + ".READ_ACTIVE_EMERGENCY_SESSION";
+    /** See {@code Manifest#LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH} */
+    public static final String LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH = "android.permission"
+            + ".LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH";
+    /** See {@code Manifest#REGISTER_SIM_SUBSCRIPTION} */
+    public static final String REGISTER_SIM_SUBSCRIPTION =
+            "android.permission.REGISTER_SIM_SUBSCRIPTION";
+    /** See {@code Manifest#REGISTER_CALL_PROVIDER} */
+    public static final String REGISTER_CALL_PROVIDER = "android.permission"
+            + ".REGISTER_CALL_PROVIDER";
+    /** See {@code Manifest#REGISTER_CONNECTION_MANAGER} */
+    public static final String REGISTER_CONNECTION_MANAGER =
+            "android.permission.REGISTER_CONNECTION_MANAGER";
+    /** See {@code Manifest#BIND_INCALL_SERVICE} */
+    public static final String BIND_INCALL_SERVICE = "android.permission.BIND_INCALL_SERVICE";
+    /** See {@code Manifest#MANAGE_ONGOING_CALLS} */
+    public static final String MANAGE_ONGOING_CALLS = "android.permission.MANAGE_ONGOING_CALLS";
+    /** See {@code Manifest#NETWORK_SCAN} */
+    public static final String NETWORK_SCAN = "android.permission.NETWORK_SCAN";
+    /** See {@code Manifest#BIND_VISUAL_VOICEMAIL_SERVICE} */
+    public static final String BIND_VISUAL_VOICEMAIL_SERVICE = "android.permission"
+            + ".BIND_VISUAL_VOICEMAIL_SERVICE";
+    /** See {@code Manifest#BIND_SCREENING_SERVICE} */
+    public static final String BIND_SCREENING_SERVICE = "android.permission.BIND_SCREENING_SERVICE";
+    /** See {@code Manifest#BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE} */
+    public static final String BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE =
+            "android.permission.BIND_PHONE_ACCOUNT_SUGGESTION_SERVICE";
+    /** See {@code Manifest#BIND_CALL_DIAGNOSTIC_SERVICE} */
+    public static final String BIND_CALL_DIAGNOSTIC_SERVICE = "android.permission"
+            + ".BIND_CALL_DIAGNOSTIC_SERVICE";
+    /** See {@code Manifest#BIND_CALL_REDIRECTION_SERVICE} */
+    public static final String BIND_CALL_REDIRECTION_SERVICE =
+            "android.permission.BIND_CALL_REDIRECTION_SERVICE";
+    /** See {@code Manifest#BIND_CONNECTION_SERVICE} */
+    public static final String BIND_CONNECTION_SERVICE =
+            "android.permission.BIND_CONNECTION_SERVICE";
+    /** See {@code Manifest#BIND_TELECOM_CONNECTION_SERVICE} */
+    public static final String BIND_TELECOM_CONNECTION_SERVICE = "android.permission"
+            + ".BIND_TELECOM_CONNECTION_SERVICE";
+    /** See {@code Manifest#CONTROL_INCALL_EXPERIENCE} */
+    public static final String CONTROL_INCALL_EXPERIENCE = "android.permission"
+            + ".CONTROL_INCALL_EXPERIENCE";
+    /** See {@code Manifest#RECEIVE_STK_COMMANDS} */
+    public static final String RECEIVE_STK_COMMANDS = "android.permission.RECEIVE_STK_COMMANDS";
+    /** See {@code Manifest#SEND_EMBMS_INTENTS} */
+    public static final String SEND_EMBMS_INTENTS = "android.permission.SEND_EMBMS_INTENTS";
+    /** See {@code Manifest#MANAGE_SENSORS} */
+    public static final String MANAGE_SENSORS = "android.permission.MANAGE_SENSORS";
+    /** See {@code Manifest#BIND_IMS_SERVICE} */
+    public static final String BIND_IMS_SERVICE = "android.permission.BIND_IMS_SERVICE";
+    /** See {@code Manifest#BIND_TELEPHONY_DATA_SERVICE} */
+    public static final String BIND_TELEPHONY_DATA_SERVICE =
+            "android.permission.BIND_TELEPHONY_DATA_SERVICE";
+    /** See {@code Manifest#BIND_TELEPHONY_NETWORK_SERVICE} */
+    public static final String BIND_TELEPHONY_NETWORK_SERVICE =
+            "android.permission.BIND_TELEPHONY_NETWORK_SERVICE";
+    /** See {@code Manifest#WRITE_EMBEDDED_SUBSCRIPTIONS} */
+    public static final String WRITE_EMBEDDED_SUBSCRIPTIONS = "android.permission"
+            + ".WRITE_EMBEDDED_SUBSCRIPTIONS";
+    /** See {@code Manifest#BIND_EUICC_SERVICE} */
+    public static final String BIND_EUICC_SERVICE = "android.permission.BIND_EUICC_SERVICE";
+    /** See {@code Manifest#READ_CARRIER_APP_INFO} */
+    public static final String READ_CARRIER_APP_INFO = "android.permission.READ_CARRIER_APP_INFO";
+    /** See {@code Manifest#BIND_GBA_SERVICE} */
+    public static final String BIND_GBA_SERVICE = "android.permission.BIND_GBA_SERVICE";
+    /** See {@code Manifest#ACCESS_RCS_USER_CAPABILITY_EXCHANGE} */
+    public static final String ACCESS_RCS_USER_CAPABILITY_EXCHANGE =
+            "android.permission.ACCESS_RCS_USER_CAPABILITY_EXCHANGE";
+    /** See {@code Manifest#WRITE_MEDIA_STORAGE} */
+    public static final String WRITE_MEDIA_STORAGE = "android.permission.WRITE_MEDIA_STORAGE";
+    /** See {@code Manifest#MANAGE_DOCUMENTS} */
+    public static final String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";
+    /** See {@code Manifest#CACHE_CONTENT} */
+    public static final String CACHE_CONTENT = "android.permission.CACHE_CONTENT";
+    /** See {@code Manifest#ALLOCATE_AGGRESSIVE} */
+    public static final String ALLOCATE_AGGRESSIVE = "android.permission.ALLOCATE_AGGRESSIVE";
+    /** See {@code Manifest#USE_RESERVED_DISK} */
+    public static final String USE_RESERVED_DISK = "android.permission.USE_RESERVED_DISK";
+    /** See {@code Manifest#DISABLE_KEYGUARD} */
+    public static final String DISABLE_KEYGUARD = "android.permission.DISABLE_KEYGUARD";
+    /** See {@code Manifest#REQUEST_PASSWORD_COMPLEXITY} */
+    public static final String REQUEST_PASSWORD_COMPLEXITY =
+            "android.permission.REQUEST_PASSWORD_COMPLEXITY";
+    /** See {@code Manifest#GET_TASKS} */
+    public static final String GET_TASKS = "android.permission.GET_TASKS";
+    /** See {@code Manifest#REAL_GET_TASKS} */
+    public static final String REAL_GET_TASKS = "android.permission.REAL_GET_TASKS";
+    /** See {@code Manifest#START_TASKS_FROM_RECENTS} */
+    public static final String START_TASKS_FROM_RECENTS =
+            "android.permission.START_TASKS_FROM_RECENTS";
+    /** See {@code Manifest#INTERACT_ACROSS_USERS} */
+    public static final String INTERACT_ACROSS_USERS = "android.permission.INTERACT_ACROSS_USERS";
+    /** See {@code Manifest#INTERACT_ACROSS_USERS_FULL} */
+    public static final String INTERACT_ACROSS_USERS_FULL =
+            "android.permission.INTERACT_ACROSS_USERS_FULL";
+    /** See {@code Manifest#START_CROSS_PROFILE_ACTIVITIES} */
+    public static final String START_CROSS_PROFILE_ACTIVITIES =
+            "android.permission.START_CROSS_PROFILE_ACTIVITIES";
+    /** See {@code Manifest#INTERACT_ACROSS_PROFILES} */
+    public static final String INTERACT_ACROSS_PROFILES = "android.permission"
+            + ".INTERACT_ACROSS_PROFILES";
+    /** See {@code Manifest#CONFIGURE_INTERACT_ACROSS_PROFILES} */
+    public static final String CONFIGURE_INTERACT_ACROSS_PROFILES =
+            "android.permission.CONFIGURE_INTERACT_ACROSS_PROFILES";
+    /** See {@code Manifest#MANAGE_USERS} */
+    public static final String MANAGE_USERS = "android.permission.MANAGE_USERS";
+    /** See {@code Manifest#CREATE_USERS} */
+    public static final String CREATE_USERS = "android.permission.CREATE_USERS";
+    /** See {@code Manifest#QUERY_USERS} */
+    public static final String QUERY_USERS = "android.permission.QUERY_USERS";
+    /** See {@code Manifest#ACCESS_BLOBS_ACROSS_USERS} */
+    public static final String ACCESS_BLOBS_ACROSS_USERS = "android.permission"
+            + ".ACCESS_BLOBS_ACROSS_USERS";
+    /** See {@code Manifest#MANAGE_PROFILE_AND_DEVICE_OWNERS} */
+    public static final String MANAGE_PROFILE_AND_DEVICE_OWNERS = "android.permission"
+            + ".MANAGE_PROFILE_AND_DEVICE_OWNERS";
+    /** See {@code Manifest#QUERY_ADMIN_POLICY} */
+    public static final String QUERY_ADMIN_POLICY = "android.permission.QUERY_ADMIN_POLICY";
+    /** See {@code Manifest#CLEAR_FREEZE_PERIOD} */
+    public static final String CLEAR_FREEZE_PERIOD = "android.permission.CLEAR_FREEZE_PERIOD";
+    /** See {@code Manifest#FORCE_DEVICE_POLICY_MANAGER_LOGS} */
+    public static final String FORCE_DEVICE_POLICY_MANAGER_LOGS = "android.permission"
+            + ".FORCE_DEVICE_POLICY_MANAGER_LOGS";
+    /** See {@code Manifest#GET_DETAILED_TASKS} */
+    public static final String GET_DETAILED_TASKS = "android.permission.GET_DETAILED_TASKS";
+    /** See {@code Manifest#REORDER_TASKS} */
+    public static final String REORDER_TASKS = "android.permission.REORDER_TASKS";
+    /** See {@code Manifest#REMOVE_TASKS} */
+    public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS";
+    /** See {@code Manifest#MANAGE_ACTIVITY_STACKS} */
+    public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";
+    /** See {@code Manifest#MANAGE_ACTIVITY_TASKS} */
+    public static final String MANAGE_ACTIVITY_TASKS = "android.permission.MANAGE_ACTIVITY_TASKS";
+    /** See {@code Manifest#ACTIVITY_EMBEDDING} */
+    public static final String ACTIVITY_EMBEDDING = "android.permission.ACTIVITY_EMBEDDING";
+    /** See {@code Manifest#START_ANY_ACTIVITY} */
+    public static final String START_ANY_ACTIVITY = "android.permission.START_ANY_ACTIVITY";
+    /** See {@code Manifest#START_ACTIVITIES_FROM_BACKGROUND} */
+    public static final String START_ACTIVITIES_FROM_BACKGROUND = "android.permission"
+            + ".START_ACTIVITIES_FROM_BACKGROUND";
+    /** See {@code Manifest#START_FOREGROUND_SERVICES_FROM_BACKGROUND} */
+    public static final String START_FOREGROUND_SERVICES_FROM_BACKGROUND = "android.permission"
+            + ".START_FOREGROUND_SERVICES_FROM_BACKGROUND";
+    /** See {@code Manifest#SEND_SHOW_SUSPENDED_APP_DETAILS} */
+    public static final String SEND_SHOW_SUSPENDED_APP_DETAILS = "android.permission"
+            + ".SEND_SHOW_SUSPENDED_APP_DETAILS";
+    /** See {@code Manifest#START_ACTIVITY_AS_CALLER} */
+    public static final String START_ACTIVITY_AS_CALLER = "android.permission"
+            + ".START_ACTIVITY_AS_CALLER";
+    /** See {@code Manifest#RESTART_PACKAGES} */
+    public static final String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES";
+    /** See {@code Manifest#GET_PROCESS_STATE_AND_OOM_SCORE} */
+    public static final String GET_PROCESS_STATE_AND_OOM_SCORE =
+            "android.permission.GET_PROCESS_STATE_AND_OOM_SCORE";
+    /** See {@code Manifest#GET_INTENT_SENDER_INTENT} */
+    public static final String GET_INTENT_SENDER_INTENT =
+            "android.permission.GET_INTENT_SENDER_INTENT";
+    /** See {@code Manifest#SYSTEM_ALERT_WINDOW} */
+    public static final String SYSTEM_ALERT_WINDOW = "android.permission.SYSTEM_ALERT_WINDOW";
+    /** See {@code Manifest#SYSTEM_APPLICATION_OVERLAY} */
+    public static final String SYSTEM_APPLICATION_OVERLAY =
+            "android.permission.SYSTEM_APPLICATION_OVERLAY";
+    /** See {@code Manifest#RUN_IN_BACKGROUND} */
+    public static final String RUN_IN_BACKGROUND = "android.permission.RUN_IN_BACKGROUND";
+    /** See {@code Manifest#USE_DATA_IN_BACKGROUND} */
+    public static final String USE_DATA_IN_BACKGROUND = "android.permission"
+            + ".USE_DATA_IN_BACKGROUND";
+    /** See {@code Manifest#SET_DISPLAY_OFFSET} */
+    public static final String SET_DISPLAY_OFFSET = "android.permission.SET_DISPLAY_OFFSET";
+    /** See {@code Manifest#REQUEST_COMPANION_RUN_IN_BACKGROUND} */
+    public static final String REQUEST_COMPANION_RUN_IN_BACKGROUND = "android.permission"
+            + ".REQUEST_COMPANION_RUN_IN_BACKGROUND";
+    /** See {@code Manifest#REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND} */
+    public static final String REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND =
+            "android.permission.REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND";
+    /** See {@code Manifest#REQUEST_COMPANION_USE_DATA_IN_BACKGROUND} */
+    public static final String REQUEST_COMPANION_USE_DATA_IN_BACKGROUND = "android.permission"
+            + ".REQUEST_COMPANION_USE_DATA_IN_BACKGROUND";
+    /** See {@code Manifest#REQUEST_COMPANION_PROFILE_WATCH} */
+    public static final String REQUEST_COMPANION_PROFILE_WATCH =
+            "android.permission.REQUEST_COMPANION_PROFILE_WATCH";
+    /** See {@code Manifest#REQUEST_COMPANION_PROFILE_APP_STREAMING} */
+    public static final String REQUEST_COMPANION_PROFILE_APP_STREAMING = "android.permission"
+            + ".REQUEST_COMPANION_PROFILE_APP_STREAMING";
+    /** See {@code Manifest#REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION} */
+    public static final String REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION =
+            "android.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION";
+    /** See {@code Manifest#REQUEST_COMPANION_SELF_MANAGED} */
+    public static final String REQUEST_COMPANION_SELF_MANAGED = "android.permission"
+            + ".REQUEST_COMPANION_SELF_MANAGED";
+    /** See {@code Manifest#COMPANION_APPROVE_WIFI_CONNECTIONS} */
+    public static final String COMPANION_APPROVE_WIFI_CONNECTIONS = "android.permission"
+            + ".COMPANION_APPROVE_WIFI_CONNECTIONS";
+    /** See {@code Manifest#READ_PROJECTION_STATE} */
+    public static final String READ_PROJECTION_STATE = "android.permission.READ_PROJECTION_STATE";
+    /** See {@code Manifest#TOGGLE_AUTOMOTIVE_PROJECTION} */
+    public static final String TOGGLE_AUTOMOTIVE_PROJECTION =
+            "android.permission.TOGGLE_AUTOMOTIVE_PROJECTION";
+    /** See {@code Manifest#HIDE_OVERLAY_WINDOWS} */
+    public static final String HIDE_OVERLAY_WINDOWS = "android.permission.HIDE_OVERLAY_WINDOWS";
+    /** See {@code Manifest#SET_WALLPAPER} */
+    public static final String SET_WALLPAPER = "android.permission.SET_WALLPAPER";
+    /** See {@code Manifest#SET_WALLPAPER_HINTS} */
+    public static final String SET_WALLPAPER_HINTS = "android.permission.SET_WALLPAPER_HINTS";
+    /** See {@code Manifest#READ_WALLPAPER_INTERNAL} */
+    public static final String READ_WALLPAPER_INTERNAL = "android.permission"
+            + ".READ_WALLPAPER_INTERNAL";
+    /** See {@code Manifest#SET_TIME} */
+    public static final String SET_TIME = "android.permission.SET_TIME";
+    /** See {@code Manifest#SET_TIME_ZONE} */
+    public static final String SET_TIME_ZONE = "android.permission.SET_TIME_ZONE";
+    /** See {@code Manifest#SUGGEST_TELEPHONY_TIME_AND_ZONE} */
+    public static final String SUGGEST_TELEPHONY_TIME_AND_ZONE =
+            "android.permission.SUGGEST_TELEPHONY_TIME_AND_ZONE";
+    /** See {@code Manifest#SUGGEST_MANUAL_TIME_AND_ZONE} */
+    public static final String SUGGEST_MANUAL_TIME_AND_ZONE = "android.permission"
+            + ".SUGGEST_MANUAL_TIME_AND_ZONE";
+    /** See {@code Manifest#SUGGEST_EXTERNAL_TIME} */
+    public static final String SUGGEST_EXTERNAL_TIME = "android.permission.SUGGEST_EXTERNAL_TIME";
+    /** See {@code Manifest#MANAGE_TIME_AND_ZONE_DETECTION} */
+    public static final String MANAGE_TIME_AND_ZONE_DETECTION = "android.permission"
+            + ".MANAGE_TIME_AND_ZONE_DETECTION";
+    /** See {@code Manifest#EXPAND_STATUS_BAR} */
+    public static final String EXPAND_STATUS_BAR = "android.permission.EXPAND_STATUS_BAR";
+    /** See {@code Manifest#INSTALL_SHORTCUT} */
+    public static final String INSTALL_SHORTCUT = "com.android.launcher.permission"
+            + ".INSTALL_SHORTCUT";
+    /** See {@code Manifest#READ_SYNC_SETTINGS} */
+    public static final String READ_SYNC_SETTINGS = "android.permission.READ_SYNC_SETTINGS";
+    /** See {@code Manifest#WRITE_SYNC_SETTINGS} */
+    public static final String WRITE_SYNC_SETTINGS = "android.permission.WRITE_SYNC_SETTINGS";
+    /** See {@code Manifest#READ_SYNC_STATS} */
+    public static final String READ_SYNC_STATS = "android.permission.READ_SYNC_STATS";
+    /** See {@code Manifest#SET_SCREEN_COMPATIBILITY} */
+    public static final String SET_SCREEN_COMPATIBILITY = "android.permission"
+            + ".SET_SCREEN_COMPATIBILITY";
+    /** See {@code Manifest#CHANGE_CONFIGURATION} */
+    public static final String CHANGE_CONFIGURATION = "android.permission.CHANGE_CONFIGURATION";
+    /** See {@code Manifest#WRITE_GSERVICES} */
+    public static final String WRITE_GSERVICES = "android.permission.WRITE_GSERVICES";
+    /** See {@code Manifest#WRITE_DEVICE_CONFIG} */
+    public static final String WRITE_DEVICE_CONFIG = "android.permission.WRITE_DEVICE_CONFIG";
+    /** See {@code Manifest#READ_DEVICE_CONFIG} */
+    public static final String READ_DEVICE_CONFIG = "android.permission.READ_DEVICE_CONFIG";
+    /** See {@code Manifest#READ_APP_SPECIFIC_LOCALES} */
+    public static final String READ_APP_SPECIFIC_LOCALES =
+            "android.permission.READ_APP_SPECIFIC_LOCALES";
+    /** See {@code Manifest#MONITOR_DEVICE_CONFIG_ACCESS} */
+    public static final String MONITOR_DEVICE_CONFIG_ACCESS =
+            "android.permission.MONITOR_DEVICE_CONFIG_ACCESS";
+    /** See {@code Manifest#FORCE_STOP_PACKAGES} */
+    public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES";
+    /** See {@code Manifest#RETRIEVE_WINDOW_CONTENT} */
+    public static final String RETRIEVE_WINDOW_CONTENT =
+            "android.permission.RETRIEVE_WINDOW_CONTENT";
+    /** See {@code Manifest#SET_ANIMATION_SCALE} */
+    public static final String SET_ANIMATION_SCALE = "android.permission.SET_ANIMATION_SCALE";
+    /** See {@code Manifest#PERSISTENT_ACTIVITY} */
+    public static final String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";
+    /** See {@code Manifest#GET_PACKAGE_SIZE} */
+    public static final String GET_PACKAGE_SIZE = "android.permission.GET_PACKAGE_SIZE";
+    /** See {@code Manifest#RECEIVE_BOOT_COMPLETED} */
+    public static final String RECEIVE_BOOT_COMPLETED = "android.permission.RECEIVE_BOOT_COMPLETED";
+    /** See {@code Manifest#BROADCAST_STICKY} */
+    public static final String BROADCAST_STICKY = "android.permission.BROADCAST_STICKY";
+    /** See {@code Manifest#MOUNT_UNMOUNT_FILESYSTEMS} */
+    public static final String MOUNT_UNMOUNT_FILESYSTEMS = "android.permission"
+            + ".MOUNT_UNMOUNT_FILESYSTEMS";
+    /** See {@code Manifest#MOUNT_FORMAT_FILESYSTEMS} */
+    public static final String MOUNT_FORMAT_FILESYSTEMS = "android.permission"
+            + ".MOUNT_FORMAT_FILESYSTEMS";
+    /** See {@code Manifest#STORAGE_INTERNAL} */
+    public static final String STORAGE_INTERNAL = "android.permission.STORAGE_INTERNAL";
+    /** See {@code Manifest#ASEC_ACCESS} */
+    public static final String ASEC_ACCESS = "android.permission.ASEC_ACCESS";
+    /** See {@code Manifest#ASEC_CREATE} */
+    public static final String ASEC_CREATE = "android.permission.ASEC_CREATE";
+    /** See {@code Manifest#ASEC_DESTROY} */
+    public static final String ASEC_DESTROY = "android.permission.ASEC_DESTROY";
+    /** See {@code Manifest#ASEC_MOUNT_UNMOUNT} */
+    public static final String ASEC_MOUNT_UNMOUNT = "android.permission.ASEC_MOUNT_UNMOUNT";
+    /** See {@code Manifest#ASEC_RENAME} */
+    public static final String ASEC_RENAME = "android.permission.ASEC_RENAME";
+    /** See {@code Manifest#WRITE_APN_SETTINGS} */
+    public static final String WRITE_APN_SETTINGS = "android.permission.WRITE_APN_SETTINGS";
+    /** See {@code Manifest#CHANGE_NETWORK_STATE} */
+    public static final String CHANGE_NETWORK_STATE = "android.permission.CHANGE_NETWORK_STATE";
+    /** See {@code Manifest#CLEAR_APP_CACHE} */
+    public static final String CLEAR_APP_CACHE = "android.permission.CLEAR_APP_CACHE";
+    /** See {@code Manifest#ALLOW_ANY_CODEC_FOR_PLAYBACK} */
+    public static final String ALLOW_ANY_CODEC_FOR_PLAYBACK = "android.permission"
+            + ".ALLOW_ANY_CODEC_FOR_PLAYBACK";
+    /** See {@code Manifest#MANAGE_CA_CERTIFICATES} */
+    public static final String MANAGE_CA_CERTIFICATES = "android.permission"
+            + ".MANAGE_CA_CERTIFICATES";
+    /** See {@code Manifest#RECOVERY} */
+    public static final String RECOVERY = "android.permission.RECOVERY";
+    /** See {@code Manifest#BIND_RESUME_ON_REBOOT_SERVICE} */
+    public static final String BIND_RESUME_ON_REBOOT_SERVICE = "android.permission"
+            + ".BIND_RESUME_ON_REBOOT_SERVICE";
+    /** See {@code Manifest#READ_SYSTEM_UPDATE_INFO} */
+    public static final String READ_SYSTEM_UPDATE_INFO = "android.permission"
+            + ".READ_SYSTEM_UPDATE_INFO";
+    /** See {@code Manifest#BIND_JOB_SERVICE} */
+    public static final String BIND_JOB_SERVICE = "android.permission.BIND_JOB_SERVICE";
+    /** See {@code Manifest#UPDATE_CONFIG} */
+    public static final String UPDATE_CONFIG = "android.permission.UPDATE_CONFIG";
+    /** See {@code Manifest#QUERY_TIME_ZONE_RULES} */
+    public static final String QUERY_TIME_ZONE_RULES = "android.permission.QUERY_TIME_ZONE_RULES";
+    /** See {@code Manifest#UPDATE_TIME_ZONE_RULES} */
+    public static final String UPDATE_TIME_ZONE_RULES = "android.permission"
+            + ".UPDATE_TIME_ZONE_RULES";
+    /** See {@code Manifest#TRIGGER_TIME_ZONE_RULES_CHECK} */
+    public static final String TRIGGER_TIME_ZONE_RULES_CHECK = "android.permission"
+            + ".TRIGGER_TIME_ZONE_RULES_CHECK";
+    /** See {@code Manifest#RESET_SHORTCUT_MANAGER_THROTTLING} */
+    public static final String RESET_SHORTCUT_MANAGER_THROTTLING =
+            "android.permission.RESET_SHORTCUT_MANAGER_THROTTLING";
+    /** See {@code Manifest#BIND_NETWORK_RECOMMENDATION_SERVICE} */
+    public static final String BIND_NETWORK_RECOMMENDATION_SERVICE =
+            "android.permission.BIND_NETWORK_RECOMMENDATION_SERVICE";
+    /** See {@code Manifest#MANAGE_CREDENTIAL_MANAGEMENT_APP} */
+    public static final String MANAGE_CREDENTIAL_MANAGEMENT_APP = "android.permission"
+            + ".MANAGE_CREDENTIAL_MANAGEMENT_APP";
+    /** See {@code Manifest#UPDATE_FONTS} */
+    public static final String UPDATE_FONTS = "android.permission.UPDATE_FONTS";
+    /** See {@code Manifest#USE_ATTESTATION_VERIFICATION_SERVICE} */
+    public static final String USE_ATTESTATION_VERIFICATION_SERVICE =
+            "android.permission.USE_ATTESTATION_VERIFICATION_SERVICE";
+    /** See {@code Manifest#VERIFY_ATTESTATION} */
+    public static final String VERIFY_ATTESTATION = "android.permission.VERIFY_ATTESTATION";
+    /** See {@code Manifest#BIND_ATTESTATION_VERIFICATION_SERVICE} */
+    public static final String BIND_ATTESTATION_VERIFICATION_SERVICE = "android.permission"
+            + ".BIND_ATTESTATION_VERIFICATION_SERVICE";
+    /** See {@code Manifest#WRITE_SECURE_SETTINGS} */
+    public static final String WRITE_SECURE_SETTINGS = "android.permission.WRITE_SECURE_SETTINGS";
+    /** See {@code Manifest#DUMP} */
+    public static final String DUMP = "android.permission.DUMP";
+    /** See {@code Manifest#CONTROL_UI_TRACING} */
+    public static final String CONTROL_UI_TRACING = "android.permission.CONTROL_UI_TRACING";
+    /** See {@code Manifest#READ_LOGS} */
+    public static final String READ_LOGS = "android.permission.READ_LOGS";
+    /** See {@code Manifest#SET_DEBUG_APP} */
+    public static final String SET_DEBUG_APP = "android.permission.SET_DEBUG_APP";
+    /** See {@code Manifest#SET_PROCESS_LIMIT} */
+    public static final String SET_PROCESS_LIMIT = "android.permission.SET_PROCESS_LIMIT";
+    /** See {@code Manifest#SET_ALWAYS_FINISH} */
+    public static final String SET_ALWAYS_FINISH = "android.permission.SET_ALWAYS_FINISH";
+    /** See {@code Manifest#SIGNAL_PERSISTENT_PROCESSES} */
+    public static final String SIGNAL_PERSISTENT_PROCESSES =
+            "android.permission.SIGNAL_PERSISTENT_PROCESSES";
+    /** See {@code Manifest#APPROVE_INCIDENT_REPORTS} */
+    public static final String APPROVE_INCIDENT_REPORTS =
+            "android.permission.APPROVE_INCIDENT_REPORTS";
+    /** See {@code Manifest#REQUEST_INCIDENT_REPORT_APPROVAL} */
+    public static final String REQUEST_INCIDENT_REPORT_APPROVAL = "android.permission"
+            + ".REQUEST_INCIDENT_REPORT_APPROVAL";
+    /** See {@code Manifest#GET_ACCOUNTS_PRIVILEGED} */
+    public static final String GET_ACCOUNTS_PRIVILEGED = "android.permission"
+            + ".GET_ACCOUNTS_PRIVILEGED";
+    /** See {@code Manifest#GET_PASSWORD} */
+    public static final String GET_PASSWORD = "android.permission.GET_PASSWORD";
+    /** See {@code Manifest#DIAGNOSTIC} */
+    public static final String DIAGNOSTIC = "android.permission.DIAGNOSTIC";
+    /** See {@code Manifest#STATUS_BAR} */
+    public static final String STATUS_BAR = "android.permission.STATUS_BAR";
+    /** See {@code Manifest#TRIGGER_SHELL_BUGREPORT} */
+    public static final String TRIGGER_SHELL_BUGREPORT = "android.permission"
+            + ".TRIGGER_SHELL_BUGREPORT";
+    /** See {@code Manifest#TRIGGER_SHELL_PROFCOLLECT_UPLOAD} */
+    public static final String TRIGGER_SHELL_PROFCOLLECT_UPLOAD = "android.permission"
+            + ".TRIGGER_SHELL_PROFCOLLECT_UPLOAD";
+    /** See {@code Manifest#STATUS_BAR_SERVICE} */
+    public static final String STATUS_BAR_SERVICE = "android.permission.STATUS_BAR_SERVICE";
+    /** See {@code Manifest#BIND_QUICK_SETTINGS_TILE} */
+    public static final String BIND_QUICK_SETTINGS_TILE =
+            "android.permission.BIND_QUICK_SETTINGS_TILE";
+    /** See {@code Manifest#BIND_CONTROLS} */
+    public static final String BIND_CONTROLS = "android.permission.BIND_CONTROLS";
+    /** See {@code Manifest#FORCE_BACK} */
+    public static final String FORCE_BACK = "android.permission.FORCE_BACK";
+    /** See {@code Manifest#UPDATE_DEVICE_STATS} */
+    public static final String UPDATE_DEVICE_STATS = "android.permission.UPDATE_DEVICE_STATS";
+    /** See {@code Manifest#GET_APP_OPS_STATS} */
+    public static final String GET_APP_OPS_STATS = "android.permission.GET_APP_OPS_STATS";
+    /** See {@code Manifest#GET_HISTORICAL_APP_OPS_STATS} */
+    public static final String GET_HISTORICAL_APP_OPS_STATS = "android.permission"
+            + ".GET_HISTORICAL_APP_OPS_STATS";
+    /** See {@code Manifest#UPDATE_APP_OPS_STATS} */
+    public static final String UPDATE_APP_OPS_STATS = "android.permission.UPDATE_APP_OPS_STATS";
+    /** See {@code Manifest#MANAGE_APP_OPS_RESTRICTIONS} */
+    public static final String MANAGE_APP_OPS_RESTRICTIONS = "android.permission"
+            + ".MANAGE_APP_OPS_RESTRICTIONS";
+    /** See {@code Manifest#MANAGE_APP_OPS_MODES} */
+    public static final String MANAGE_APP_OPS_MODES = "android.permission.MANAGE_APP_OPS_MODES";
+    /** See {@code Manifest#INTERNAL_SYSTEM_WINDOW} */
+    public static final String INTERNAL_SYSTEM_WINDOW = "android.permission"
+            + ".INTERNAL_SYSTEM_WINDOW";
+    /** See {@code Manifest#UNLIMITED_TOASTS} */
+    public static final String UNLIMITED_TOASTS = "android.permission.UNLIMITED_TOASTS";
+    /** See {@code Manifest#HIDE_NON_SYSTEM_OVERLAY_WINDOWS} */
+    public static final String HIDE_NON_SYSTEM_OVERLAY_WINDOWS =
+            "android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS";
+    /** See {@code Manifest#MANAGE_APP_TOKENS} */
+    public static final String MANAGE_APP_TOKENS = "android.permission.MANAGE_APP_TOKENS";
+    /** See {@code Manifest#REGISTER_WINDOW_MANAGER_LISTENERS} */
+    public static final String REGISTER_WINDOW_MANAGER_LISTENERS = "android.permission"
+            + ".REGISTER_WINDOW_MANAGER_LISTENERS";
+    /** See {@code Manifest#FREEZE_SCREEN} */
+    public static final String FREEZE_SCREEN = "android.permission.FREEZE_SCREEN";
+    /** See {@code Manifest#INJECT_EVENTS} */
+    public static final String INJECT_EVENTS = "android.permission.INJECT_EVENTS";
+    /** See {@code Manifest#FILTER_EVENTS} */
+    public static final String FILTER_EVENTS = "android.permission.FILTER_EVENTS";
+    /** See {@code Manifest#RETRIEVE_WINDOW_TOKEN} */
+    public static final String RETRIEVE_WINDOW_TOKEN = "android.permission.RETRIEVE_WINDOW_TOKEN";
+    /** See {@code Manifest#MODIFY_ACCESSIBILITY_DATA} */
+    public static final String MODIFY_ACCESSIBILITY_DATA =
+            "android.permission.MODIFY_ACCESSIBILITY_DATA";
+    /** See {@code Manifest#ACT_AS_PACKAGE_FOR_ACCESSIBILITY} */
+    public static final String ACT_AS_PACKAGE_FOR_ACCESSIBILITY = "android.permission"
+            + ".ACT_AS_PACKAGE_FOR_ACCESSIBILITY";
+    /** See {@code Manifest#CHANGE_ACCESSIBILITY_VOLUME} */
+    public static final String CHANGE_ACCESSIBILITY_VOLUME =
+            "android.permission.CHANGE_ACCESSIBILITY_VOLUME";
+    /** See {@code Manifest#FRAME_STATS} */
+    public static final String FRAME_STATS = "android.permission.FRAME_STATS";
+    /** See {@code Manifest#TEMPORARY_ENABLE_ACCESSIBILITY} */
+    public static final String TEMPORARY_ENABLE_ACCESSIBILITY = "android.permission"
+            + ".TEMPORARY_ENABLE_ACCESSIBILITY";
+    /** See {@code Manifest#OPEN_ACCESSIBILITY_DETAILS_SETTINGS} */
+    public static final String OPEN_ACCESSIBILITY_DETAILS_SETTINGS = "android.permission"
+            + ".OPEN_ACCESSIBILITY_DETAILS_SETTINGS";
+    /** See {@code Manifest#SET_ACTIVITY_WATCHER} */
+    public static final String SET_ACTIVITY_WATCHER = "android.permission.SET_ACTIVITY_WATCHER";
+    /** See {@code Manifest#SHUTDOWN} */
+    public static final String SHUTDOWN = "android.permission.SHUTDOWN";
+    /** See {@code Manifest#STOP_APP_SWITCHES} */
+    public static final String STOP_APP_SWITCHES = "android.permission.STOP_APP_SWITCHES";
+    /** See {@code Manifest#GET_TOP_ACTIVITY_INFO} */
+    public static final String GET_TOP_ACTIVITY_INFO = "android.permission.GET_TOP_ACTIVITY_INFO";
+    /** See {@code Manifest#READ_INPUT_STATE} */
+    public static final String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";
+    /** See {@code Manifest#BIND_INPUT_METHOD} */
+    public static final String BIND_INPUT_METHOD = "android.permission.BIND_INPUT_METHOD";
+    /** See {@code Manifest#BIND_MIDI_DEVICE_SERVICE} */
+    public static final String BIND_MIDI_DEVICE_SERVICE = "android.permission"
+            + ".BIND_MIDI_DEVICE_SERVICE";
+    /** See {@code Manifest#BIND_ACCESSIBILITY_SERVICE} */
+    public static final String BIND_ACCESSIBILITY_SERVICE =
+            "android.permission.BIND_ACCESSIBILITY_SERVICE";
+    /** See {@code Manifest#BIND_PRINT_SERVICE} */
+    public static final String BIND_PRINT_SERVICE = "android.permission.BIND_PRINT_SERVICE";
+    /** See {@code Manifest#BIND_PRINT_RECOMMENDATION_SERVICE} */
+    public static final String BIND_PRINT_RECOMMENDATION_SERVICE = "android.permission.BIND_PRINT_RECOMMENDATION_SERVICE";
+    /** See {@code Manifest#READ_PRINT_SERVICES} */
+    public static final String READ_PRINT_SERVICES = "android.permission.READ_PRINT_SERVICES";
+    /** See {@code Manifest#READ_PRINT_SERVICE_RECOMMENDATIONS} */
+    public static final String READ_PRINT_SERVICE_RECOMMENDATIONS = "android.permission"
+            + ".READ_PRINT_SERVICE_RECOMMENDATIONS";
+    /** See {@code Manifest#BIND_NFC_SERVICE} */
+    public static final String BIND_NFC_SERVICE = "android.permission.BIND_NFC_SERVICE";
+    /** See {@code Manifest#BIND_QUICK_ACCESS_WALLET_SERVICE} */
+    public static final String BIND_QUICK_ACCESS_WALLET_SERVICE =
+            "android.permission.BIND_QUICK_ACCESS_WALLET_SERVICE";
+    /** See {@code Manifest#BIND_PRINT_SPOOLER_SERVICE} */
+    public static final String BIND_PRINT_SPOOLER_SERVICE = "android.permission"
+            + ".BIND_PRINT_SPOOLER_SERVICE";
+    /** See {@code Manifest#BIND_COMPANION_DEVICE_MANAGER_SERVICE} */
+    public static final String BIND_COMPANION_DEVICE_MANAGER_SERVICE =
+            "android.permission.BIND_COMPANION_DEVICE_MANAGER_SERVICE";
+    /** See {@code Manifest#BIND_COMPANION_DEVICE_SERVICE} */
+    public static final String BIND_COMPANION_DEVICE_SERVICE = "android.permission"
+            + ".BIND_COMPANION_DEVICE_SERVICE";
+    /** See {@code Manifest#BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE} */
+    public static final String BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE = "android.permission"
+            + ".BIND_RUNTIME_PERMISSION_PRESENTER_SERVICE";
+    /** See {@code Manifest#BIND_TEXT_SERVICE} */
+    public static final String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
+    /** See {@code Manifest#BIND_ATTENTION_SERVICE} */
+    public static final String BIND_ATTENTION_SERVICE = "android.permission"
+            + ".BIND_ATTENTION_SERVICE";
+    /** See {@code Manifest#BIND_ROTATION_RESOLVER_SERVICE} */
+    public static final String BIND_ROTATION_RESOLVER_SERVICE = "android.permission"
+            + ".BIND_ROTATION_RESOLVER_SERVICE";
+    /** See {@code Manifest#BIND_VPN_SERVICE} */
+    public static final String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE";
+    /** See {@code Manifest#BIND_WALLPAPER} */
+    public static final String BIND_WALLPAPER = "android.permission.BIND_WALLPAPER";
+    /** See {@code Manifest#BIND_GAME_SERVICE} */
+    public static final String BIND_GAME_SERVICE = "android.permission.BIND_GAME_SERVICE";
+    /** See {@code Manifest#BIND_VOICE_INTERACTION} */
+    public static final String BIND_VOICE_INTERACTION = "android.permission"
+            + ".BIND_VOICE_INTERACTION";
+    /** See {@code Manifest#BIND_HOTWORD_DETECTION_SERVICE} */
+    public static final String BIND_HOTWORD_DETECTION_SERVICE = "android.permission"
+            + ".BIND_HOTWORD_DETECTION_SERVICE";
+    /** See {@code Manifest#MANAGE_HOTWORD_DETECTION} */
+    public static final String MANAGE_HOTWORD_DETECTION = "android.permission"
+            + ".MANAGE_HOTWORD_DETECTION";
+    /** See {@code Manifest#BIND_AUTOFILL_SERVICE} */
+    public static final String BIND_AUTOFILL_SERVICE = "android.permission.BIND_AUTOFILL_SERVICE";
+    /** See {@code Manifest#BIND_AUTOFILL} */
+    public static final String BIND_AUTOFILL = "android.permission.BIND_AUTOFILL";
+    /** See {@code Manifest#BIND_AUTOFILL_FIELD_CLASSIFICATION_SERVICE} */
+    public static final String BIND_AUTOFILL_FIELD_CLASSIFICATION_SERVICE = "android.permission"
+            + ".BIND_AUTOFILL_FIELD_CLASSIFICATION_SERVICE";
+    /** See {@code Manifest#BIND_INLINE_SUGGESTION_RENDER_SERVICE} */
+    public static final String BIND_INLINE_SUGGESTION_RENDER_SERVICE =
+            "android.permission.BIND_INLINE_SUGGESTION_RENDER_SERVICE";
+    /** See {@code Manifest#BIND_TEXTCLASSIFIER_SERVICE} */
+    public static final String BIND_TEXTCLASSIFIER_SERVICE =
+            "android.permission.BIND_TEXTCLASSIFIER_SERVICE";
+    /** See {@code Manifest#BIND_CONTENT_CAPTURE_SERVICE} */
+    public static final String BIND_CONTENT_CAPTURE_SERVICE = "android.permission"
+            + ".BIND_CONTENT_CAPTURE_SERVICE";
+    /** See {@code Manifest#BIND_TRANSLATION_SERVICE} */
+    public static final String BIND_TRANSLATION_SERVICE =
+            "android.permission.BIND_TRANSLATION_SERVICE";
+    /** See {@code Manifest#MANAGE_UI_TRANSLATION} */
+    public static final String MANAGE_UI_TRANSLATION =  "android.permission.MANAGE_UI_TRANSLATION";
+    /** See {@code Manifest#BIND_CONTENT_SUGGESTIONS_SERVICE} */
+    public static final String BIND_CONTENT_SUGGESTIONS_SERVICE = "android.permission"
+            + ".BIND_CONTENT_SUGGESTIONS_SERVICE";
+    /** See {@code Manifest#BIND_MUSIC_RECOGNITION_SERVICE} */
+    public static final String BIND_MUSIC_RECOGNITION_SERVICE =
+            "android.permission.BIND_MUSIC_RECOGNITION_SERVICE";
+    /** See {@code Manifest#BIND_AUGMENTED_AUTOFILL_SERVICE} */
+    public static final String BIND_AUGMENTED_AUTOFILL_SERVICE = "android.permission"
+            + ".BIND_AUGMENTED_AUTOFILL_SERVICE";
+    /** See {@code Manifest#MANAGE_VOICE_KEYPHRASES} */
+    public static final String MANAGE_VOICE_KEYPHRASES = "android.permission"
+            + ".MANAGE_VOICE_KEYPHRASES";
+    /** See {@code Manifest#KEYPHRASE_ENROLLMENT_APPLICATION} */
+    public static final String KEYPHRASE_ENROLLMENT_APPLICATION =
+            "android.permission.KEYPHRASE_ENROLLMENT_APPLICATION";
+    /** See {@code Manifest#BIND_REMOTE_DISPLAY} */
+    public static final String BIND_REMOTE_DISPLAY = "android.permission.BIND_REMOTE_DISPLAY";
+    /** See {@code Manifest#BIND_TV_INPUT} */
+    public static final String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";
+    /** See {@code Manifest#BIND_TV_REMOTE_SERVICE} */
+    public static final String BIND_TV_REMOTE_SERVICE = "android.permission"
+            + ".BIND_TV_REMOTE_SERVICE";
+    /** See {@code Manifest#TV_VIRTUAL_REMOTE_CONTROLLER} */
+    public static final String TV_VIRTUAL_REMOTE_CONTROLLER = "android.permission"
+            + ".TV_VIRTUAL_REMOTE_CONTROLLER";
+    /** See {@code Manifest#CHANGE_HDMI_CEC_ACTIVE_SOURCE} */
+    public static final String CHANGE_HDMI_CEC_ACTIVE_SOURCE = "android.permission"
+            + ".CHANGE_HDMI_CEC_ACTIVE_SOURCE";
+    /** See {@code Manifest#MODIFY_PARENTAL_CONTROLS} */
+    public static final String MODIFY_PARENTAL_CONTROLS = "android.permission"
+            + ".MODIFY_PARENTAL_CONTROLS";
+    /** See {@code Manifest#READ_CONTENT_RATING_SYSTEMS} */
+    public static final String READ_CONTENT_RATING_SYSTEMS = "android.permission"
+            + ".READ_CONTENT_RATING_SYSTEMS";
+    /** See {@code Manifest#NOTIFY_TV_INPUTS} */
+    public static final String NOTIFY_TV_INPUTS = "android.permission.NOTIFY_TV_INPUTS";
+    /** See {@code Manifest#TUNER_RESOURCE_ACCESS} */
+    public static final String TUNER_RESOURCE_ACCESS = "android.permission.TUNER_RESOURCE_ACCESS";
+    /** See {@code Manifest#MEDIA_RESOURCE_OVERRIDE_PID} */
+    public static final String MEDIA_RESOURCE_OVERRIDE_PID = "android.permission"
+            + ".MEDIA_RESOURCE_OVERRIDE_PID";
+    /** See {@code Manifest#REGISTER_MEDIA_RESOURCE_OBSERVER} */
+    public static final String REGISTER_MEDIA_RESOURCE_OBSERVER = "android.permission"
+            + ".REGISTER_MEDIA_RESOURCE_OBSERVER";
+    /** See {@code Manifest#BIND_ROUTE_PROVIDER} */
+    public static final String BIND_ROUTE_PROVIDER = "android.permission.BIND_ROUTE_PROVIDER";
+    /** See {@code Manifest#BIND_DEVICE_ADMIN} */
+    public static final String BIND_DEVICE_ADMIN = "android.permission.BIND_DEVICE_ADMIN";
+    /** See {@code Manifest#MANAGE_DEVICE_ADMINS} */
+    public static final String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS";
+    /** See {@code Manifest#RESET_PASSWORD} */
+    public static final String RESET_PASSWORD = "android.permission.RESET_PASSWORD";
+    /** See {@code Manifest#LOCK_DEVICE} */
+    public static final String LOCK_DEVICE = "android.permission.LOCK_DEVICE";
+    /** See {@code Manifest#SET_ORIENTATION} */
+    public static final String SET_ORIENTATION = "android.permission.SET_ORIENTATION";
+    /** See {@code Manifest#SET_POINTER_SPEED} */
+    public static final String SET_POINTER_SPEED = "android.permission.SET_POINTER_SPEED";
+    /** See {@code Manifest#SET_INPUT_CALIBRATION} */
+    public static final String SET_INPUT_CALIBRATION = "android.permission.SET_INPUT_CALIBRATION";
+    /** See {@code Manifest#SET_KEYBOARD_LAYOUT} */
+    public static final String SET_KEYBOARD_LAYOUT = "android.permission.SET_KEYBOARD_LAYOUT";
+    /** See {@code Manifest#SCHEDULE_PRIORITIZED_ALARM} */
+    public static final String SCHEDULE_PRIORITIZED_ALARM =
+            "android.permission.SCHEDULE_PRIORITIZED_ALARM";
+    /** See {@code Manifest#SCHEDULE_EXACT_ALARM} */
+    public static final String SCHEDULE_EXACT_ALARM = "android.permission.SCHEDULE_EXACT_ALARM";
+    /** See {@code Manifest#TABLET_MODE} */
+    public static final String TABLET_MODE = "android.permission.TABLET_MODE";
+    /** See {@code Manifest#REQUEST_INSTALL_PACKAGES} */
+    public static final String REQUEST_INSTALL_PACKAGES = "android.permission"
+            + ".REQUEST_INSTALL_PACKAGES";
+    /** See {@code Manifest#REQUEST_DELETE_PACKAGES} */
+    public static final String REQUEST_DELETE_PACKAGES = "android.permission"
+            + ".REQUEST_DELETE_PACKAGES";
+    /** See {@code Manifest#INSTALL_PACKAGES} */
+    public static final String INSTALL_PACKAGES = "android.permission.INSTALL_PACKAGES";
+    /** See {@code Manifest#INSTALL_SELF_UPDATES} */
+    public static final String INSTALL_SELF_UPDATES = "android.permission.INSTALL_SELF_UPDATES";
+    /** See {@code Manifest#INSTALL_PACKAGE_UPDATES} */
+    public static final String INSTALL_PACKAGE_UPDATES = "android.permission"
+            + ".INSTALL_PACKAGE_UPDATES";
+    /** See {@code Manifest#INSTALL_EXISTING_PACKAGES} */
+    public static final String INSTALL_EXISTING_PACKAGES = "com.android.permission"
+            + ".INSTALL_EXISTING_PACKAGES";
+    /** See {@code Manifest#USE_INSTALLER_V2} */
+    public static final String USE_INSTALLER_V2 = "com.android.permission.USE_INSTALLER_V2";
+    /** See {@code Manifest#INSTALL_TEST_ONLY_PACKAGE} */
+    public static final String INSTALL_TEST_ONLY_PACKAGE = "android.permission"
+            + ".INSTALL_TEST_ONLY_PACKAGE";
+    /** See {@code Manifest#INSTALL_DPC_PACKAGES} */
+    public static final String INSTALL_DPC_PACKAGES = "android.permission.INSTALL_DPC_PACKAGES";
+    /** See {@code Manifest#USE_SYSTEM_DATA_LOADERS} */
+    public static final String USE_SYSTEM_DATA_LOADERS = "com.android.permission"
+            + ".USE_SYSTEM_DATA_LOADERS";
+    /** See {@code Manifest#CLEAR_APP_USER_DATA} */
+    public static final String CLEAR_APP_USER_DATA = "android.permission.CLEAR_APP_USER_DATA";
+    /** See {@code Manifest#GET_APP_GRANTED_URI_PERMISSIONS} */
+    public static final String GET_APP_GRANTED_URI_PERMISSIONS = "android.permission"
+            + ".GET_APP_GRANTED_URI_PERMISSIONS";
+    /** See {@code Manifest#CLEAR_APP_GRANTED_URI_PERMISSIONS} */
+    public static final String CLEAR_APP_GRANTED_URI_PERMISSIONS =
+            "android.permission.CLEAR_APP_GRANTED_URI_PERMISSIONS";
+    /** See {@code Manifest#MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS} */
+    public static final String MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS =
+            "android.permission.MANAGE_SCOPED_ACCESS_DIRECTORY_PERMISSIONS";
+    /** See {@code Manifest#FORCE_PERSISTABLE_URI_PERMISSIONS} */
+    public static final String FORCE_PERSISTABLE_URI_PERMISSIONS = "android.permission"
+            + ".FORCE_PERSISTABLE_URI_PERMISSIONS";
+    /** See {@code Manifest#DELETE_CACHE_FILES} */
+    public static final String DELETE_CACHE_FILES = "android.permission.DELETE_CACHE_FILES";
+    /** See {@code Manifest#INTERNAL_DELETE_CACHE_FILES} */
+    public static final String INTERNAL_DELETE_CACHE_FILES =
+            "android.permission.INTERNAL_DELETE_CACHE_FILES";
+    /** See {@code Manifest#DELETE_PACKAGES} */
+    public static final String DELETE_PACKAGES = "android.permission.DELETE_PACKAGES";
+    /** See {@code Manifest#MOVE_PACKAGE} */
+    public static final String MOVE_PACKAGE = "android.permission.MOVE_PACKAGE";
+    /** See {@code Manifest#KEEP_UNINSTALLED_PACKAGES} */
+    public static final String KEEP_UNINSTALLED_PACKAGES =
+            "android.permission.KEEP_UNINSTALLED_PACKAGES";
+    /** See {@code Manifest#CHANGE_COMPONENT_ENABLED_STATE} */
+    public static final String CHANGE_COMPONENT_ENABLED_STATE =
+            "android.permission.CHANGE_COMPONENT_ENABLED_STATE";
+    /** See {@code Manifest#GRANT_RUNTIME_PERMISSIONS} */
+    public static final String GRANT_RUNTIME_PERMISSIONS =
+            "android.permission.GRANT_RUNTIME_PERMISSIONS";
+    /** See {@code Manifest#INSTALL_GRANT_RUNTIME_PERMISSIONS} */
+    public static final String INSTALL_GRANT_RUNTIME_PERMISSIONS = "android.permission"
+            + ".INSTALL_GRANT_RUNTIME_PERMISSIONS";
+    /** See {@code Manifest#REVOKE_RUNTIME_PERMISSIONS} */
+    public static final String REVOKE_RUNTIME_PERMISSIONS = "android.permission"
+            + ".REVOKE_RUNTIME_PERMISSIONS";
+    /** See {@code Manifest#GET_RUNTIME_PERMISSIONS} */
+    public static final String GET_RUNTIME_PERMISSIONS = "android.permission"
+            + ".GET_RUNTIME_PERMISSIONS";
+    /** See {@code Manifest#RESTORE_RUNTIME_PERMISSIONS} */
+    public static final String RESTORE_RUNTIME_PERMISSIONS = "android.permission"
+            + ".RESTORE_RUNTIME_PERMISSIONS";
+    /** See {@code Manifest#ADJUST_RUNTIME_PERMISSIONS_POLICY} */
+    public static final String ADJUST_RUNTIME_PERMISSIONS_POLICY = "android.permission"
+            + ".ADJUST_RUNTIME_PERMISSIONS_POLICY";
+    /** See {@code Manifest#UPGRADE_RUNTIME_PERMISSIONS} */
+    public static final String UPGRADE_RUNTIME_PERMISSIONS =
+            "android.permission.UPGRADE_RUNTIME_PERMISSIONS";
+    /** See {@code Manifest#WHITELIST_RESTRICTED_PERMISSIONS} */
+    public static final String WHITELIST_RESTRICTED_PERMISSIONS = "android.permission"
+            + ".WHITELIST_RESTRICTED_PERMISSIONS";
+    /** See {@code Manifest#WHITELIST_AUTO_REVOKE_PERMISSIONS} */
+    public static final String WHITELIST_AUTO_REVOKE_PERMISSIONS = "android.permission"
+            + ".WHITELIST_AUTO_REVOKE_PERMISSIONS";
+    /** See {@code Manifest#OBSERVE_GRANT_REVOKE_PERMISSIONS} */
+    public static final String OBSERVE_GRANT_REVOKE_PERMISSIONS =
+            "android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS";
+    /** See {@code Manifest#MANAGE_ONE_TIME_PERMISSION_SESSIONS} */
+    public static final String MANAGE_ONE_TIME_PERMISSION_SESSIONS =
+            "android.permission.MANAGE_ONE_TIME_PERMISSION_SESSIONS";
+    /** See {@code Manifest#MANAGE_ROLE_HOLDERS} */
+    public static final String MANAGE_ROLE_HOLDERS = "android.permission.MANAGE_ROLE_HOLDERS";
+    /** See {@code Manifest#BYPASS_ROLE_QUALIFICATION} */
+    public static final String BYPASS_ROLE_QUALIFICATION = "android.permission"
+            + ".BYPASS_ROLE_QUALIFICATION";
+    /** See {@code Manifest#OBSERVE_ROLE_HOLDERS} */
+    public static final String OBSERVE_ROLE_HOLDERS = "android.permission.OBSERVE_ROLE_HOLDERS";
+    /** See {@code Manifest#MANAGE_COMPANION_DEVICES} */
+    public static final String MANAGE_COMPANION_DEVICES =
+            "android.permission.MANAGE_COMPANION_DEVICES";
+    /** See {@code Manifest#REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE} */
+    public static final String REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE =
+            "android.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE";
+    /** See {@code Manifest#DELIVER_COMPANION_MESSAGES} */
+    public static final String DELIVER_COMPANION_MESSAGES = "android.permission"
+            + ".DELIVER_COMPANION_MESSAGES";
+    /** See {@code Manifest#ACCESS_SURFACE_FLINGER} */
+    public static final String ACCESS_SURFACE_FLINGER = "android.permission.ACCESS_SURFACE_FLINGER";
+    /** See {@code Manifest#ROTATE_SURFACE_FLINGER} */
+    public static final String ROTATE_SURFACE_FLINGER = "android.permission"
+            + ".ROTATE_SURFACE_FLINGER";
+    /** See {@code Manifest#READ_FRAME_BUFFER} */
+    public static final String READ_FRAME_BUFFER = "android.permission.READ_FRAME_BUFFER";
+    /** See {@code Manifest#ACCESS_INPUT_FLINGER} */
+    public static final String ACCESS_INPUT_FLINGER = "android.permission.ACCESS_INPUT_FLINGER";
+    /** See {@code Manifest#DISABLE_INPUT_DEVICE} */
+    public static final String DISABLE_INPUT_DEVICE = "android.permission.DISABLE_INPUT_DEVICE";
+    /** See {@code Manifest#CONFIGURE_WIFI_DISPLAY} */
+    public static final String CONFIGURE_WIFI_DISPLAY =
+            "android.permission.CONFIGURE_WIFI_DISPLAY";
+    /** See {@code Manifest#CONTROL_WIFI_DISPLAY} */
+    public static final String CONTROL_WIFI_DISPLAY = "android.permission.CONTROL_WIFI_DISPLAY";
+    /** See {@code Manifest#CONFIGURE_DISPLAY_COLOR_MODE} */
+    public static final String CONFIGURE_DISPLAY_COLOR_MODE =
+            "android.permission.CONFIGURE_DISPLAY_COLOR_MODE";
+    /** See {@code Manifest#CONTROL_DEVICE_LIGHTS} */
+    public static final String CONTROL_DEVICE_LIGHTS = "android.permission.CONTROL_DEVICE_LIGHTS";
+    /** See {@code Manifest#CONTROL_DISPLAY_SATURATION} */
+    public static final String CONTROL_DISPLAY_SATURATION = "android.permission"
+            + ".CONTROL_DISPLAY_SATURATION";
+    /** See {@code Manifest#CONTROL_DISPLAY_COLOR_TRANSFORMS} */
+    public static final String CONTROL_DISPLAY_COLOR_TRANSFORMS =
+            "android.permission.CONTROL_DISPLAY_COLOR_TRANSFORMS";
+    /** See {@code Manifest#BRIGHTNESS_SLIDER_USAGE} */
+    public static final String BRIGHTNESS_SLIDER_USAGE = "android.permission"
+            + ".BRIGHTNESS_SLIDER_USAGE";
+    /** See {@code Manifest#ACCESS_AMBIENT_LIGHT_STATS} */
+    public static final String ACCESS_AMBIENT_LIGHT_STATS =
+            "android.permission.ACCESS_AMBIENT_LIGHT_STATS";
+    /** See {@code Manifest#CONFIGURE_DISPLAY_BRIGHTNESS} */
+    public static final String CONFIGURE_DISPLAY_BRIGHTNESS =
+            "android.permission.CONFIGURE_DISPLAY_BRIGHTNESS";
+    /** See {@code Manifest#CONTROL_DISPLAY_BRIGHTNESS} */
+    public static final String CONTROL_DISPLAY_BRIGHTNESS = "android.permission"
+            + ".CONTROL_DISPLAY_BRIGHTNESS";
+    /** See {@code Manifest#OVERRIDE_DISPLAY_MODE_REQUESTS} */
+    public static final String OVERRIDE_DISPLAY_MODE_REQUESTS = "android.permission"
+            + ".OVERRIDE_DISPLAY_MODE_REQUESTS";
+    /** See {@code Manifest#MODIFY_REFRESH_RATE_SWITCHING_TYPE} */
+    public static final String MODIFY_REFRESH_RATE_SWITCHING_TYPE =
+            "android.permission.MODIFY_REFRESH_RATE_SWITCHING_TYPE";
+    /** See {@code Manifest#CONTROL_VPN} */
+    public static final String CONTROL_VPN = "android.permission.CONTROL_VPN";
+    /** See {@code Manifest#CONTROL_ALWAYS_ON_VPN} */
+    public static final String CONTROL_ALWAYS_ON_VPN = "android.permission.CONTROL_ALWAYS_ON_VPN";
+    /** See {@code Manifest#CAPTURE_TUNER_AUDIO_INPUT} */
+    public static final String CAPTURE_TUNER_AUDIO_INPUT =
+            "android.permission.CAPTURE_TUNER_AUDIO_INPUT";
+    /** See {@code Manifest#CAPTURE_AUDIO_OUTPUT} */
+    public static final String CAPTURE_AUDIO_OUTPUT = "android.permission.CAPTURE_AUDIO_OUTPUT";
+    /** See {@code Manifest#CAPTURE_MEDIA_OUTPUT} */
+    public static final String CAPTURE_MEDIA_OUTPUT = "android.permission.CAPTURE_MEDIA_OUTPUT";
+    /** See {@code Manifest#CAPTURE_VOICE_COMMUNICATION_OUTPUT} */
+    public static final String CAPTURE_VOICE_COMMUNICATION_OUTPUT = "android.permission"
+            + ".CAPTURE_VOICE_COMMUNICATION_OUTPUT";
+    /** See {@code Manifest#CAPTURE_AUDIO_HOTWORD} */
+    public static final String CAPTURE_AUDIO_HOTWORD = "android.permission.CAPTURE_AUDIO_HOTWORD";
+    /** See {@code Manifest#SOUNDTRIGGER_DELEGATE_IDENTITY} */
+    public static final String SOUNDTRIGGER_DELEGATE_IDENTITY =
+            "android.permission.SOUNDTRIGGER_DELEGATE_IDENTITY";
+    /** See {@code Manifest#MODIFY_AUDIO_ROUTING} */
+    public static final String MODIFY_AUDIO_ROUTING = "android.permission.MODIFY_AUDIO_ROUTING";
+    /** See {@code Manifest#CALL_AUDIO_INTERCEPTION} */
+    public static final String CALL_AUDIO_INTERCEPTION =
+            "android.permission.CALL_AUDIO_INTERCEPTION";
+    /** See {@code Manifest#QUERY_AUDIO_STATE} */
+    public static final String QUERY_AUDIO_STATE = "android.permission.QUERY_AUDIO_STATE";
+    /** See {@code Manifest#MODIFY_DEFAULT_AUDIO_EFFECTS} */
+    public static final String MODIFY_DEFAULT_AUDIO_EFFECTS = "android.permission"
+            + ".MODIFY_DEFAULT_AUDIO_EFFECTS";
+    /** See {@code Manifest#DISABLE_SYSTEM_SOUND_EFFECTS} */
+    public static final String DISABLE_SYSTEM_SOUND_EFFECTS = "android.permission"
+            + ".DISABLE_SYSTEM_SOUND_EFFECTS";
+    /** See {@code Manifest#REMOTE_DISPLAY_PROVIDER} */
+    public static final String REMOTE_DISPLAY_PROVIDER =
+            "android.permission.REMOTE_DISPLAY_PROVIDER";
+    /** See {@code Manifest#CAPTURE_SECURE_VIDEO_OUTPUT} */
+    public static final String CAPTURE_SECURE_VIDEO_OUTPUT =
+            "android.permission.CAPTURE_SECURE_VIDEO_OUTPUT";
+    /** See {@code Manifest#MEDIA_CONTENT_CONTROL} */
+    public static final String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL";
+    /** See {@code Manifest#SET_VOLUME_KEY_LONG_PRESS_LISTENER} */
+    public static final String SET_VOLUME_KEY_LONG_PRESS_LISTENER =
+            "android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER";
+    /** See {@code Manifest#SET_MEDIA_KEY_LISTENER} */
+    public static final String SET_MEDIA_KEY_LISTENER = "android.permission"
+            + ".SET_MEDIA_KEY_LISTENER";
+    /** See {@code Manifest#BRICK} */
+    public static final String BRICK = "android.permission.BRICK";
+    /** See {@code Manifest#REBOOT} */
+    public static final String REBOOT = "android.permission.REBOOT";
+    /** See {@code Manifest#DEVICE_POWER} */
+    public static final String DEVICE_POWER = "android.permission.DEVICE_POWER";
+    /** See {@code Manifest#POWER_SAVER} */
+    public static final String POWER_SAVER = "android.permission.POWER_SAVER";
+    /** See {@code Manifest#BATTERY_PREDICTION} */
+    public static final String BATTERY_PREDICTION = "android.permission.BATTERY_PREDICTION";
+    /** See {@code Manifest#USER_ACTIVITY} */
+    public static final String USER_ACTIVITY = "android.permission.USER_ACTIVITY";
+    /** See {@code Manifest#NET_TUNNELING} */
+    public static final String NET_TUNNELING = "android.permission.NET_TUNNELING";
+    /** See {@code Manifest#FACTORY_TEST} */
+    public static final String FACTORY_TEST = "android.permission.FACTORY_TEST";
+    /** See {@code Manifest#BROADCAST_CLOSE_SYSTEM_DIALOGS} */
+    public static final String BROADCAST_CLOSE_SYSTEM_DIALOGS =
+            "android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS";
+    /** See {@code Manifest#BROADCAST_PACKAGE_REMOVED} */
+    public static final String BROADCAST_PACKAGE_REMOVED =
+            "android.permission.BROADCAST_PACKAGE_REMOVED";
+    /** See {@code Manifest#BROADCAST_SMS} */
+    public static final String BROADCAST_SMS = "android.permission.BROADCAST_SMS";
+    /** See {@code Manifest#BROADCAST_WAP_PUSH} */
+    public static final String BROADCAST_WAP_PUSH = "android.permission.BROADCAST_WAP_PUSH";
+    /** See {@code Manifest#BROADCAST_NETWORK_PRIVILEGED} */
+    public static final String BROADCAST_NETWORK_PRIVILEGED = "android.permission"
+            + ".BROADCAST_NETWORK_PRIVILEGED";
+    /** See {@code Manifest#MASTER_CLEAR} */
+    public static final String MASTER_CLEAR = "android.permission.MASTER_CLEAR";
+    /** See {@code Manifest#CALL_PRIVILEGED} */
+    public static final String CALL_PRIVILEGED = "android.permission.CALL_PRIVILEGED";
+    /** See {@code Manifest#PERFORM_CDMA_PROVISIONING} */
+    public static final String PERFORM_CDMA_PROVISIONING =
+            "android.permission.PERFORM_CDMA_PROVISIONING";
+    /** See {@code Manifest#PERFORM_SIM_ACTIVATION} */
+    public static final String PERFORM_SIM_ACTIVATION = "android.permission.PERFORM_SIM_ACTIVATION";
+    /** See {@code Manifest#CONTROL_LOCATION_UPDATES} */
+    public static final String CONTROL_LOCATION_UPDATES =
+            "android.permission.CONTROL_LOCATION_UPDATES";
+    /** See {@code Manifest#ACCESS_CHECKIN_PROPERTIES} */
+    public static final String ACCESS_CHECKIN_PROPERTIES = "android.permission"
+            + ".ACCESS_CHECKIN_PROPERTIES";
+    /** See {@code Manifest#PACKAGE_USAGE_STATS} */
+    public static final String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS";
+    /** See {@code Manifest#LOADER_USAGE_STATS} */
+    public static final String LOADER_USAGE_STATS = "android.permission.LOADER_USAGE_STATS";
+    /** See {@code Manifest#OBSERVE_APP_USAGE} */
+    public static final String OBSERVE_APP_USAGE = "android.permission.OBSERVE_APP_USAGE";
+    /** See {@code Manifest#CHANGE_APP_IDLE_STATE} */
+    public static final String CHANGE_APP_IDLE_STATE = "android.permission.CHANGE_APP_IDLE_STATE";
+    /** See {@code Manifest#CHANGE_APP_LAUNCH_TIME_ESTIMATE} */
+    public static final String CHANGE_APP_LAUNCH_TIME_ESTIMATE =
+            "android.permission.CHANGE_APP_LAUNCH_TIME_ESTIMATE";
+    /** See {@code Manifest#CHANGE_DEVICE_IDLE_TEMP_WHITELIST} */
+    public static final String CHANGE_DEVICE_IDLE_TEMP_WHITELIST =
+            "android.permission.CHANGE_DEVICE_IDLE_TEMP_WHITELIST";
+    /** See {@code Manifest#REQUEST_IGNORE_BATTERY_OPTIMIZATIONS} */
+    public static final String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS =
+            "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS";
+    /** See {@code Manifest#BATTERY_STATS} */
+    public static final String BATTERY_STATS = "android.permission.BATTERY_STATS";
+    /** See {@code Manifest#STATSCOMPANION} */
+    public static final String STATSCOMPANION = "android.permission.STATSCOMPANION";
+    /** See {@code Manifest#REGISTER_STATS_PULL_ATOM} */
+    public static final String REGISTER_STATS_PULL_ATOM = "android.permission"
+            + ".REGISTER_STATS_PULL_ATOM";
+    /** See {@code Manifest#BACKUP} */
+    public static final String BACKUP = "android.permission.BACKUP";
+    /** See {@code Manifest#MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE} */
+    public static final String MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE = "android.permission"
+            + ".MODIFY_SETTINGS_OVERRIDEABLE_BY_RESTORE";
+    /** See {@code Manifest#RECOVER_KEYSTORE} */
+    public static final String RECOVER_KEYSTORE = "android.permission.RECOVER_KEYSTORE";
+    /** See {@code Manifest#CONFIRM_FULL_BACKUP} */
+    public static final String CONFIRM_FULL_BACKUP = "android.permission.CONFIRM_FULL_BACKUP";
+    /** See {@code Manifest#BIND_REMOTEVIEWS} */
+    public static final String BIND_REMOTEVIEWS = "android.permission.BIND_REMOTEVIEWS";
+    /** See {@code Manifest#BIND_APPWIDGET} */
+    public static final String BIND_APPWIDGET = "android.permission.BIND_APPWIDGET";
+    /** See {@code Manifest#MANAGE_SLICE_PERMISSIONS} */
+    public static final String MANAGE_SLICE_PERMISSIONS =
+            "android.permission.MANAGE_SLICE_PERMISSIONS";
+    /** See {@code Manifest#BIND_KEYGUARD_APPWIDGET} */
+    public static final String BIND_KEYGUARD_APPWIDGET = "android.permission"
+            + ".BIND_KEYGUARD_APPWIDGET";
+    /** See {@code Manifest#MODIFY_APPWIDGET_BIND_PERMISSIONS} */
+    public static final String MODIFY_APPWIDGET_BIND_PERMISSIONS =
+            "android.permission.MODIFY_APPWIDGET_BIND_PERMISSIONS";
+    /** See {@code Manifest#CHANGE_BACKGROUND_DATA_SETTING} */
+    public static final String CHANGE_BACKGROUND_DATA_SETTING =
+            "android.permission.CHANGE_BACKGROUND_DATA_SETTING";
+    /** See {@code Manifest#GLOBAL_SEARCH} */
+    public static final String GLOBAL_SEARCH = "android.permission.GLOBAL_SEARCH";
+    /** See {@code Manifest#GLOBAL_SEARCH_CONTROL} */
+    public static final String GLOBAL_SEARCH_CONTROL = "android.permission.GLOBAL_SEARCH_CONTROL";
+    /** See {@code Manifest#READ_SEARCH_INDEXABLES} */
+    public static final String READ_SEARCH_INDEXABLES = "android.permission"
+            + ".READ_SEARCH_INDEXABLES";
+    /** See {@code Manifest#BIND_SETTINGS_SUGGESTIONS_SERVICE} */
+    public static final String BIND_SETTINGS_SUGGESTIONS_SERVICE = "android.permission"
+            + ".BIND_SETTINGS_SUGGESTIONS_SERVICE";
+    /** See {@code Manifest#WRITE_SETTINGS_HOMEPAGE_DATA} */
+    public static final String WRITE_SETTINGS_HOMEPAGE_DATA = "android.permission"
+            + ".WRITE_SETTINGS_HOMEPAGE_DATA";
+    /** See {@code Manifest#LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK} */
+    public static final String LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK = "android.permission"
+            + ".LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK";
+    /** See {@code Manifest#ALLOW_PLACE_IN_MULTI_PANE_SETTINGS} */
+    public static final String ALLOW_PLACE_IN_MULTI_PANE_SETTINGS =
+            "android.permission.ALLOW_PLACE_IN_MULTI_PANE_SETTINGS";
+    /** See {@code Manifest#SET_WALLPAPER_COMPONENT} */
+    public static final String SET_WALLPAPER_COMPONENT = "android.permission"
+            + ".SET_WALLPAPER_COMPONENT";
+    /** See {@code Manifest#READ_DREAM_STATE} */
+    public static final String READ_DREAM_STATE = "android.permission.READ_DREAM_STATE";
+    /** See {@code Manifest#WRITE_DREAM_STATE} */
+    public static final String WRITE_DREAM_STATE = "android.permission.WRITE_DREAM_STATE";
+    /** See {@code Manifest#READ_DREAM_SUPPRESSION} */
+    public static final String READ_DREAM_SUPPRESSION = "android.permission"
+            + ".READ_DREAM_SUPPRESSION";
+    /** See {@code Manifest#ACCESS_CACHE_FILESYSTEM} */
+    public static final String ACCESS_CACHE_FILESYSTEM = "android.permission"
+            + ".ACCESS_CACHE_FILESYSTEM";
+    /** See {@code Manifest#COPY_PROTECTED_DATA} */
+    public static final String COPY_PROTECTED_DATA = "android.permission.COPY_PROTECTED_DATA";
+    /** See {@code Manifest#CRYPT_KEEPER} */
+    public static final String CRYPT_KEEPER = "android.permission.CRYPT_KEEPER";
+    /** See {@code Manifest#READ_NETWORK_USAGE_HISTORY} */
+    public static final String READ_NETWORK_USAGE_HISTORY =
+            "android.permission.READ_NETWORK_USAGE_HISTORY";
+    /** See {@code Manifest#MANAGE_NETWORK_POLICY} */
+    public static final String MANAGE_NETWORK_POLICY = "android.permission.MANAGE_NETWORK_POLICY";
+    /** See {@code Manifest#MODIFY_NETWORK_ACCOUNTING} */
+    public static final String MODIFY_NETWORK_ACCOUNTING =
+            "android.permission.MODIFY_NETWORK_ACCOUNTING";
+    /** See {@code Manifest#MANAGE_SUBSCRIPTION_PLANS} */
+    public static final String MANAGE_SUBSCRIPTION_PLANS = "android.permission"
+            + ".MANAGE_SUBSCRIPTION_PLANS";
+    /** See {@code Manifest#C2D_MESSAGE} */
+    public static final String C2D_MESSAGE = "android.intent.category.MASTER_CLEAR.permission"
+            + ".C2D_MESSAGE";
+    /** See {@code Manifest#PACKAGE_VERIFICATION_AGENT} */
+    public static final String PACKAGE_VERIFICATION_AGENT =
+            "android.permission.PACKAGE_VERIFICATION_AGENT";
+    /** See {@code Manifest#BIND_PACKAGE_VERIFIER} */
+    public static final String BIND_PACKAGE_VERIFIER = "android.permission.BIND_PACKAGE_VERIFIER";
+    /** See {@code Manifest#PACKAGE_ROLLBACK_AGENT} */
+    public static final String PACKAGE_ROLLBACK_AGENT = "android.permission.PACKAGE_ROLLBACK_AGENT";
+    /** See {@code Manifest#MANAGE_ROLLBACKS} */
+    public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";
+    /** See {@code Manifest#TEST_MANAGE_ROLLBACKS} */
+    public static final String TEST_MANAGE_ROLLBACKS = "android.permission.TEST_MANAGE_ROLLBACKS";
+    /** See {@code Manifest#SET_HARMFUL_APP_WARNINGS} */
+    public static final String SET_HARMFUL_APP_WARNINGS =
+            "android.permission.SET_HARMFUL_APP_WARNINGS";
+    /** See {@code Manifest#INTENT_FILTER_VERIFICATION_AGENT} */
+    public static final String INTENT_FILTER_VERIFICATION_AGENT =
+            "android.permission.INTENT_FILTER_VERIFICATION_AGENT";
+    /** See {@code Manifest#BIND_INTENT_FILTER_VERIFIER} */
+    public static final String BIND_INTENT_FILTER_VERIFIER = "android.permission"
+            + ".BIND_INTENT_FILTER_VERIFIER";
+    /** See {@code Manifest#DOMAIN_VERIFICATION_AGENT} */
+    public static final String DOMAIN_VERIFICATION_AGENT = "android.permission"
+            + ".DOMAIN_VERIFICATION_AGENT";
+    /** See {@code Manifest#BIND_DOMAIN_VERIFICATION_AGENT} */
+    public static final String BIND_DOMAIN_VERIFICATION_AGENT =
+            "android.permission.BIND_DOMAIN_VERIFICATION_AGENT";
+    /** See {@code Manifest#UPDATE_DOMAIN_VERIFICATION_USER_SELECTION} */
+    public static final String UPDATE_DOMAIN_VERIFICATION_USER_SELECTION =
+            "android.permission.UPDATE_DOMAIN_VERIFICATION_USER_SELECTION";
+    /** See {@code Manifest#SERIAL_PORT} */
+    public static final String SERIAL_PORT = "android.permission.SERIAL_PORT";
+    /** See {@code Manifest#ACCESS_CONTENT_PROVIDERS_EXTERNALLY} */
+    public static final String ACCESS_CONTENT_PROVIDERS_EXTERNALLY = "android.permission"
+            + ".ACCESS_CONTENT_PROVIDERS_EXTERNALLY";
+    /** See {@code Manifest#UPDATE_LOCK} */
+    public static final String UPDATE_LOCK = "android.permission.UPDATE_LOCK";
+    /** See {@code Manifest#REQUEST_NOTIFICATION_ASSISTANT_SERVICE} */
+    public static final String REQUEST_NOTIFICATION_ASSISTANT_SERVICE = "android.permission"
+            + ".REQUEST_NOTIFICATION_ASSISTANT_SERVICE";
+    /** See {@code Manifest#ACCESS_NOTIFICATIONS} */
+    public static final String ACCESS_NOTIFICATIONS = "android.permission.ACCESS_NOTIFICATIONS";
+    /** See {@code Manifest#ACCESS_NOTIFICATION_POLICY} */
+    public static final String ACCESS_NOTIFICATION_POLICY =
+            "android.permission.ACCESS_NOTIFICATION_POLICY";
+    /** See {@code Manifest#MANAGE_NOTIFICATIONS} */
+    public static final String MANAGE_NOTIFICATIONS = "android.permission.MANAGE_NOTIFICATIONS";
+    /** See {@code Manifest#MANAGE_NOTIFICATION_LISTENERS} */
+    public static final String MANAGE_NOTIFICATION_LISTENERS =
+            "android.permission.MANAGE_NOTIFICATION_LISTENERS";
+    /** See {@code Manifest#USE_COLORIZED_NOTIFICATIONS} */
+    public static final String USE_COLORIZED_NOTIFICATIONS =
+            "android.permission.USE_COLORIZED_NOTIFICATIONS";
+    /** See {@code Manifest#ACCESS_KEYGUARD_SECURE_STORAGE} */
+    public static final String ACCESS_KEYGUARD_SECURE_STORAGE = "android.permission"
+            + ".ACCESS_KEYGUARD_SECURE_STORAGE";
+    /** See {@code Manifest#SET_INITIAL_LOCK} */
+    public static final String SET_INITIAL_LOCK = "android.permission.SET_INITIAL_LOCK";
+    /** See {@code Manifest#SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS} */
+    public static final String SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS =
+            "android.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS";
+    /** See {@code Manifest#MANAGE_FINGERPRINT} */
+    public static final String MANAGE_FINGERPRINT = "android.permission.MANAGE_FINGERPRINT";
+    /** See {@code Manifest#RESET_FINGERPRINT_LOCKOUT} */
+    public static final String RESET_FINGERPRINT_LOCKOUT = "android.permission"
+            + ".RESET_FINGERPRINT_LOCKOUT";
+    /** See {@code Manifest#TEST_BIOMETRIC} */
+    public static final String TEST_BIOMETRIC = "android.permission.TEST_BIOMETRIC";
+    /** See {@code Manifest#MANAGE_BIOMETRIC} */
+    public static final String MANAGE_BIOMETRIC = "android.permission.MANAGE_BIOMETRIC";
+    /** See {@code Manifest#USE_BIOMETRIC_INTERNAL} */
+    public static final String USE_BIOMETRIC_INTERNAL = "android.permission"
+            + ".USE_BIOMETRIC_INTERNAL";
+    /** See {@code Manifest#MANAGE_BIOMETRIC_DIALOG} */
+    public static final String MANAGE_BIOMETRIC_DIALOG =
+            "android.permission.MANAGE_BIOMETRIC_DIALOG";
+    /** See {@code Manifest#CONTROL_KEYGUARD} */
+    public static final String CONTROL_KEYGUARD = "android.permission.CONTROL_KEYGUARD";
+    /** See {@code Manifest#CONTROL_KEYGUARD_SECURE_NOTIFICATIONS} */
+    public static final String CONTROL_KEYGUARD_SECURE_NOTIFICATIONS = "android.permission"
+            + ".CONTROL_KEYGUARD_SECURE_NOTIFICATIONS";
+    /** See {@code Manifest#TRUST_LISTENER} */
+    public static final String TRUST_LISTENER = "android.permission.TRUST_LISTENER";
+    /** See {@code Manifest#PROVIDE_TRUST_AGENT} */
+    public static final String PROVIDE_TRUST_AGENT = "android.permission.PROVIDE_TRUST_AGENT";
+    /** See {@code Manifest#SHOW_KEYGUARD_MESSAGE} */
+    public static final String SHOW_KEYGUARD_MESSAGE = "android.permission.SHOW_KEYGUARD_MESSAGE";
+    /** See {@code Manifest#LAUNCH_TRUST_AGENT_SETTINGS} */
+    public static final String LAUNCH_TRUST_AGENT_SETTINGS = "android.permission"
+            + ".LAUNCH_TRUST_AGENT_SETTINGS";
+    /** See {@code Manifest#BIND_TRUST_AGENT} */
+    public static final String BIND_TRUST_AGENT = "android.permission.BIND_TRUST_AGENT";
+    /** See {@code Manifest#BIND_NOTIFICATION_LISTENER_SERVICE} */
+    public static final String BIND_NOTIFICATION_LISTENER_SERVICE =
+            "android.permission.BIND_NOTIFICATION_LISTENER_SERVICE";
+    /** See {@code Manifest#BIND_NOTIFICATION_ASSISTANT_SERVICE} */
+    public static final String BIND_NOTIFICATION_ASSISTANT_SERVICE =
+            "android.permission.BIND_NOTIFICATION_ASSISTANT_SERVICE";
+    /** See {@code Manifest#BIND_CHOOSER_TARGET_SERVICE} */
+    public static final String BIND_CHOOSER_TARGET_SERVICE =
+            "android.permission.BIND_CHOOSER_TARGET_SERVICE";
+    /** See {@code Manifest#PROVIDE_RESOLVER_RANKER_SERVICE} */
+    public static final String PROVIDE_RESOLVER_RANKER_SERVICE = "android.permission"
+            + ".PROVIDE_RESOLVER_RANKER_SERVICE";
+    /** See {@code Manifest#BIND_RESOLVER_RANKER_SERVICE} */
+    public static final String BIND_RESOLVER_RANKER_SERVICE =
+            "android.permission.BIND_RESOLVER_RANKER_SERVICE";
+    /** See {@code Manifest#BIND_CONDITION_PROVIDER_SERVICE} */
+    public static final String BIND_CONDITION_PROVIDER_SERVICE =
+            "android.permission.BIND_CONDITION_PROVIDER_SERVICE";
+    /** See {@code Manifest#BIND_DREAM_SERVICE} */
+    public static final String BIND_DREAM_SERVICE = "android.permission.BIND_DREAM_SERVICE";
+    /** See {@code Manifest#BIND_CACHE_QUOTA_SERVICE} */
+    public static final String BIND_CACHE_QUOTA_SERVICE = "android.permission"
+            + ".BIND_CACHE_QUOTA_SERVICE";
+    /** See {@code Manifest#INVOKE_CARRIER_SETUP} */
+    public static final String INVOKE_CARRIER_SETUP = "android.permission.INVOKE_CARRIER_SETUP";
+    /** See {@code Manifest#ACCESS_NETWORK_CONDITIONS} */
+    public static final String ACCESS_NETWORK_CONDITIONS =
+            "android.permission.ACCESS_NETWORK_CONDITIONS";
+    /** See {@code Manifest#ACCESS_DRM_CERTIFICATES} */
+    public static final String ACCESS_DRM_CERTIFICATES =
+            "android.permission.ACCESS_DRM_CERTIFICATES";
+    /** See {@code Manifest#MANAGE_MEDIA_PROJECTION} */
+    public static final String MANAGE_MEDIA_PROJECTION =
+            "android.permission.MANAGE_MEDIA_PROJECTION";
+    /** See {@code Manifest#READ_INSTALL_SESSIONS} */
+    public static final String READ_INSTALL_SESSIONS = "android.permission.READ_INSTALL_SESSIONS";
+    /** See {@code Manifest#REMOVE_DRM_CERTIFICATES} */
+    public static final String REMOVE_DRM_CERTIFICATES = "android.permission"
+            + ".REMOVE_DRM_CERTIFICATES";
+    /** See {@code Manifest#BIND_CARRIER_MESSAGING_SERVICE} */
+    public static final String BIND_CARRIER_MESSAGING_SERVICE =
+            "android.permission.BIND_CARRIER_MESSAGING_SERVICE";
+    /** See {@code Manifest#ACCESS_VOICE_INTERACTION_SERVICE} */
+    public static final String ACCESS_VOICE_INTERACTION_SERVICE =
+            "android.permission.ACCESS_VOICE_INTERACTION_SERVICE";
+    /** See {@code Manifest#BIND_CARRIER_SERVICES} */
+    public static final String BIND_CARRIER_SERVICES = "android.permission.BIND_CARRIER_SERVICES";
+    /** See {@code Manifest#START_VIEW_PERMISSION_USAGE} */
+    public static final String START_VIEW_PERMISSION_USAGE = "android.permission"
+            + ".START_VIEW_PERMISSION_USAGE";
+    /** See {@code Manifest#QUERY_DO_NOT_ASK_CREDENTIALS_ON_BOOT} */
+    public static final String QUERY_DO_NOT_ASK_CREDENTIALS_ON_BOOT = "android.permission"
+            + ".QUERY_DO_NOT_ASK_CREDENTIALS_ON_BOOT";
+    /** See {@code Manifest#KILL_UID} */
+    public static final String KILL_UID = "android.permission.KILL_UID";
+    /** See {@code Manifest#LOCAL_MAC_ADDRESS} */
+    public static final String LOCAL_MAC_ADDRESS = "android.permission.LOCAL_MAC_ADDRESS";
+    /** See {@code Manifest#PEERS_MAC_ADDRESS} */
+    public static final String PEERS_MAC_ADDRESS = "android.permission.PEERS_MAC_ADDRESS";
+    /** See {@code Manifest#DISPATCH_NFC_MESSAGE} */
+    public static final String DISPATCH_NFC_MESSAGE = "android.permission.DISPATCH_NFC_MESSAGE";
+    /** See {@code Manifest#MODIFY_DAY_NIGHT_MODE} */
+    public static final String MODIFY_DAY_NIGHT_MODE = "android.permission.MODIFY_DAY_NIGHT_MODE";
+    /** See {@code Manifest#ENTER_CAR_MODE_PRIORITIZED} */
+    public static final String ENTER_CAR_MODE_PRIORITIZED = "android.permission"
+            + ".ENTER_CAR_MODE_PRIORITIZED";
+    /** See {@code Manifest#HANDLE_CAR_MODE_CHANGES} */
+    public static final String HANDLE_CAR_MODE_CHANGES = "android.permission"
+            + ".HANDLE_CAR_MODE_CHANGES";
+    /** See {@code Manifest#SEND_CATEGORY_CAR_NOTIFICATIONS} */
+    public static final String SEND_CATEGORY_CAR_NOTIFICATIONS =
+            "android.permission.SEND_CATEGORY_CAR_NOTIFICATIONS";
+    /** See {@code Manifest#ACCESS_INSTANT_APPS} */
+    public static final String ACCESS_INSTANT_APPS = "android.permission.ACCESS_INSTANT_APPS";
+    /** See {@code Manifest#VIEW_INSTANT_APPS} */
+    public static final String VIEW_INSTANT_APPS = "android.permission.VIEW_INSTANT_APPS";
+    /** See {@code Manifest#WRITE_COMMUNAL_STATE} */
+    public static final String WRITE_COMMUNAL_STATE = "android.permission.WRITE_COMMUNAL_STATE";
+    /** See {@code Manifest#READ_COMMUNAL_STATE} */
+    public static final String READ_COMMUNAL_STATE = "android.permission.READ_COMMUNAL_STATE";
+    /** See {@code Manifest#MANAGE_BIND_INSTANT_SERVICE} */
+    public static final String MANAGE_BIND_INSTANT_SERVICE =
+            "android.permission.MANAGE_BIND_INSTANT_SERVICE";
+    /** See {@code Manifest#RECEIVE_MEDIA_RESOURCE_USAGE} */
+    public static final String RECEIVE_MEDIA_RESOURCE_USAGE = "android.permission.RECEIVE_MEDIA_RESOURCE_USAGE";
+    /** See {@code Manifest#MANAGE_SOUND_TRIGGER} */
+    public static final String MANAGE_SOUND_TRIGGER = "android.permission.MANAGE_SOUND_TRIGGER";
+    /** See {@code Manifest#SOUND_TRIGGER_RUN_IN_BATTERY_SAVER} */
+    public static final String SOUND_TRIGGER_RUN_IN_BATTERY_SAVER = "android.permission"
+            + ".SOUND_TRIGGER_RUN_IN_BATTERY_SAVER";
+    /** See {@code Manifest#BIND_SOUND_TRIGGER_DETECTION_SERVICE} */
+    public static final String BIND_SOUND_TRIGGER_DETECTION_SERVICE = "android.permission"
+            + ".BIND_SOUND_TRIGGER_DETECTION_SERVICE";
+    /** See {@code Manifest#DISPATCH_PROVISIONING_MESSAGE} */
+    public static final String DISPATCH_PROVISIONING_MESSAGE = "android.permission"
+            + ".DISPATCH_PROVISIONING_MESSAGE";
+    /** See {@code Manifest#READ_BLOCKED_NUMBERS} */
+    public static final String READ_BLOCKED_NUMBERS = "android.permission.READ_BLOCKED_NUMBERS";
+    /** See {@code Manifest#WRITE_BLOCKED_NUMBERS} */
+    public static final String WRITE_BLOCKED_NUMBERS = "android.permission.WRITE_BLOCKED_NUMBERS";
+    /** See {@code Manifest#BIND_VR_LISTENER_SERVICE} */
+    public static final String BIND_VR_LISTENER_SERVICE = "android.permission"
+            + ".BIND_VR_LISTENER_SERVICE";
+    /** See {@code Manifest#RESTRICTED_VR_ACCESS} */
+    public static final String RESTRICTED_VR_ACCESS = "android.permission.RESTRICTED_VR_ACCESS";
+    /** See {@code Manifest#ACCESS_VR_MANAGER} */
+    public static final String ACCESS_VR_MANAGER = "android.permission.ACCESS_VR_MANAGER";
+    /** See {@code Manifest#ACCESS_VR_STATE} */
+    public static final String ACCESS_VR_STATE = "android.permission.ACCESS_VR_STATE";
+    /** See {@code Manifest#UPDATE_LOCK_TASK_PACKAGES} */
+    public static final String UPDATE_LOCK_TASK_PACKAGES =
+            "android.permission.UPDATE_LOCK_TASK_PACKAGES";
+    /** See {@code Manifest#SUBSTITUTE_NOTIFICATION_APP_NAME} */
+    public static final String SUBSTITUTE_NOTIFICATION_APP_NAME = "android.permission"
+            + ".SUBSTITUTE_NOTIFICATION_APP_NAME";
+    /** See {@code Manifest#NOTIFICATION_DURING_SETUP} */
+    public static final String NOTIFICATION_DURING_SETUP =
+            "android.permission.NOTIFICATION_DURING_SETUP";
+    /** See {@code Manifest#MANAGE_AUTO_FILL} */
+    public static final String MANAGE_AUTO_FILL = "android.permission.MANAGE_AUTO_FILL";
+    /** See {@code Manifest#MANAGE_CONTENT_CAPTURE} */
+    public static final String MANAGE_CONTENT_CAPTURE = "android.permission.MANAGE_CONTENT_CAPTURE";
+    /** See {@code Manifest#MANAGE_ROTATION_RESOLVER} */
+    public static final String MANAGE_ROTATION_RESOLVER = "android.permission"
+            + ".MANAGE_ROTATION_RESOLVER";
+    /** See {@code Manifest#MANAGE_MUSIC_RECOGNITION} */
+    public static final String MANAGE_MUSIC_RECOGNITION =
+            "android.permission.MANAGE_MUSIC_RECOGNITION";
+    /** See {@code Manifest#MANAGE_SPEECH_RECOGNITION} */
+    public static final String MANAGE_SPEECH_RECOGNITION =
+            "android.permission.MANAGE_SPEECH_RECOGNITION";
+    /** See {@code Manifest#MANAGE_CONTENT_SUGGESTIONS} */
+    public static final String MANAGE_CONTENT_SUGGESTIONS = "android.permission"
+            + ".MANAGE_CONTENT_SUGGESTIONS";
+    /** See {@code Manifest#MANAGE_APP_PREDICTIONS} */
+    public static final String MANAGE_APP_PREDICTIONS = "android.permission.MANAGE_APP_PREDICTIONS";
+    /** See {@code Manifest#MANAGE_SEARCH_UI} */
+    public static final String MANAGE_SEARCH_UI = "android.permission.MANAGE_SEARCH_UI";
+    /** See {@code Manifest#MANAGE_SMARTSPACE} */
+    public static final String MANAGE_SMARTSPACE = "android.permission.MANAGE_SMARTSPACE";
+    /** See {@code Manifest#MODIFY_THEME_OVERLAY} */
+    public static final String MODIFY_THEME_OVERLAY = "android.permission.MODIFY_THEME_OVERLAY";
+    /** See {@code Manifest#INSTANT_APP_FOREGROUND_SERVICE} */
+    public static final String INSTANT_APP_FOREGROUND_SERVICE =
+            "android.permission.INSTANT_APP_FOREGROUND_SERVICE";
+    /** See {@code Manifest#FOREGROUND_SERVICE} */
+    public static final String FOREGROUND_SERVICE = "android.permission.FOREGROUND_SERVICE";
+    /** See {@code Manifest#ACCESS_SHORTCUTS} */
+    public static final String ACCESS_SHORTCUTS = "android.permission.ACCESS_SHORTCUTS";
+    /** See {@code Manifest#UNLIMITED_SHORTCUTS_API_CALLS} */
+    public static final String UNLIMITED_SHORTCUTS_API_CALLS =
+            "android.permission.UNLIMITED_SHORTCUTS_API_CALLS";
+    /** See {@code Manifest#READ_RUNTIME_PROFILES} */
+    public static final String READ_RUNTIME_PROFILES = "android.permission.READ_RUNTIME_PROFILES";
+    /** See {@code Manifest#MANAGE_AUDIO_POLICY} */
+    public static final String MANAGE_AUDIO_POLICY = "android.permission.MANAGE_AUDIO_POLICY";
+    /** See {@code Manifest#MODIFY_QUIET_MODE} */
+    public static final String MODIFY_QUIET_MODE = "android.permission.MODIFY_QUIET_MODE";
+    /** See {@code Manifest#MANAGE_CAMERA} */
+    public static final String MANAGE_CAMERA = "android.permission.MANAGE_CAMERA";
+    /** See {@code Manifest#CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS} */
+    public static final String CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS =
+            "android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS";
+    /** See {@code Manifest#WATCH_APPOPS} */
+    public static final String WATCH_APPOPS = "android.permission.WATCH_APPOPS";
+    /** See {@code Manifest#DISABLE_HIDDEN_API_CHECKS} */
+    public static final String DISABLE_HIDDEN_API_CHECKS =
+            "android.permission.DISABLE_HIDDEN_API_CHECKS";
+    /** See {@code Manifest#MONITOR_DEFAULT_SMS_PACKAGE} */
+    public static final String MONITOR_DEFAULT_SMS_PACKAGE =
+            "android.permission.MONITOR_DEFAULT_SMS_PACKAGE";
+    /** See {@code Manifest#BIND_CARRIER_MESSAGING_CLIENT_SERVICE} */
+    public static final String BIND_CARRIER_MESSAGING_CLIENT_SERVICE =
+            "android.permission.BIND_CARRIER_MESSAGING_CLIENT_SERVICE";
+    /** See {@code Manifest#BIND_EXPLICIT_HEALTH_CHECK_SERVICE} */
+    public static final String BIND_EXPLICIT_HEALTH_CHECK_SERVICE =
+            "android.permission.BIND_EXPLICIT_HEALTH_CHECK_SERVICE";
+    /** See {@code Manifest#BIND_EXTERNAL_STORAGE_SERVICE} */
+    public static final String BIND_EXTERNAL_STORAGE_SERVICE = "android.permission"
+            + ".BIND_EXTERNAL_STORAGE_SERVICE";
+    /** See {@code Manifest#MANAGE_APPOPS} */
+    public static final String MANAGE_APPOPS = "android.permission.MANAGE_APPOPS";
+    /** See {@code Manifest#READ_CLIPBOARD_IN_BACKGROUND} */
+    public static final String READ_CLIPBOARD_IN_BACKGROUND = "android.permission"
+            + ".READ_CLIPBOARD_IN_BACKGROUND";
+    /** See {@code Manifest#MANAGE_ACCESSIBILITY} */
+    public static final String MANAGE_ACCESSIBILITY = "android.permission.MANAGE_ACCESSIBILITY";
+    /** See {@code Manifest#GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS} */
+    public static final String GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS =
+            "android.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS";
+    /** See {@code Manifest#MARK_DEVICE_ORGANIZATION_OWNED} */
+    public static final String MARK_DEVICE_ORGANIZATION_OWNED = "android.permission"
+            + ".MARK_DEVICE_ORGANIZATION_OWNED";
+    /** See {@code Manifest#SMS_FINANCIAL_TRANSACTIONS} */
+    public static final String SMS_FINANCIAL_TRANSACTIONS =
+            "android.permission.SMS_FINANCIAL_TRANSACTIONS";
+    /** See {@code Manifest#USE_FULL_SCREEN_INTENT} */
+    public static final String USE_FULL_SCREEN_INTENT = "android.permission.USE_FULL_SCREEN_INTENT";
+    /** See {@code Manifest#SEND_DEVICE_CUSTOMIZATION_READY} */
+    public static final String SEND_DEVICE_CUSTOMIZATION_READY =
+            "android.permission.SEND_DEVICE_CUSTOMIZATION_READY";
+    /** See {@code Manifest#RECEIVE_DEVICE_CUSTOMIZATION_READY} */
+    public static final String RECEIVE_DEVICE_CUSTOMIZATION_READY =
+            "android.permission.RECEIVE_DEVICE_CUSTOMIZATION_READY";
+    /** See {@code Manifest#AMBIENT_WALLPAPER} */
+    public static final String AMBIENT_WALLPAPER = "android.permission.AMBIENT_WALLPAPER";
+    /** See {@code Manifest#MANAGE_SENSOR_PRIVACY} */
+    public static final String MANAGE_SENSOR_PRIVACY = "android.permission.MANAGE_SENSOR_PRIVACY";
+    /** See {@code Manifest#OBSERVE_SENSOR_PRIVACY} */
+    public static final String OBSERVE_SENSOR_PRIVACY = "android.permission.OBSERVE_SENSOR_PRIVACY";
+    /** See {@code Manifest#REVIEW_ACCESSIBILITY_SERVICES} */
+    public static final String REVIEW_ACCESSIBILITY_SERVICES =
+            "android.permission.REVIEW_ACCESSIBILITY_SERVICES";
+    /** See {@code Manifest#SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON} */
+    public static final String SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON =
+            "android.permission.SUBSTITUTE_SHARE_TARGET_APP_NAME_AND_ICON";
+    /** See {@code Manifest#ACCESS_SHARED_LIBRARIES} */
+    public static final String ACCESS_SHARED_LIBRARIES =
+            "android.permission.ACCESS_SHARED_LIBRARIES";
+    /** See {@code Manifest#LOG_COMPAT_CHANGE} */
+    public static final String LOG_COMPAT_CHANGE = "android.permission.LOG_COMPAT_CHANGE";
+    /** See {@code Manifest#READ_COMPAT_CHANGE_CONFIG} */
+    public static final String READ_COMPAT_CHANGE_CONFIG =
+            "android.permission.READ_COMPAT_CHANGE_CONFIG";
+    /** See {@code Manifest#OVERRIDE_COMPAT_CHANGE_CONFIG} */
+    public static final String OVERRIDE_COMPAT_CHANGE_CONFIG =
+            "android.permission.OVERRIDE_COMPAT_CHANGE_CONFIG";
+    /** See {@code Manifest#OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD} */
+    public static final String OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD =
+            "android.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD";
+    /** See {@code Manifest#MONITOR_INPUT} */
+    public static final String MONITOR_INPUT = "android.permission.MONITOR_INPUT";
+    /** See {@code Manifest#ASSOCIATE_INPUT_DEVICE_TO_DISPLAY} */
+    public static final String ASSOCIATE_INPUT_DEVICE_TO_DISPLAY =
+            "android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY";
+    /** See {@code Manifest#QUERY_ALL_PACKAGES} */
+    public static final String QUERY_ALL_PACKAGES = "android.permission.QUERY_ALL_PACKAGES";
+    /** See {@code Manifest#PEEK_DROPBOX_DATA} */
+    public static final String PEEK_DROPBOX_DATA = "android.permission.PEEK_DROPBOX_DATA";
+    /** See {@code Manifest#ACCESS_TV_TUNER} */
+    public static final String ACCESS_TV_TUNER = "android.permission.ACCESS_TV_TUNER";
+    /** See {@code Manifest#ACCESS_TV_DESCRAMBLER} */
+    public static final String ACCESS_TV_DESCRAMBLER = "android.permission.ACCESS_TV_DESCRAMBLER";
+    /** See {@code Manifest#ACCESS_TV_SHARED_FILTER} */
+    public static final String ACCESS_TV_SHARED_FILTER =
+            "android.permission.ACCESS_TV_SHARED_FILTER";
+    /** See {@code Manifest#ADD_TRUSTED_DISPLAY} */
+    public static final String ADD_TRUSTED_DISPLAY = "android.permission.ADD_TRUSTED_DISPLAY";
+    /** See {@code Manifest#ADD_ALWAYS_UNLOCKED_DISPLAY} */
+    public static final String ADD_ALWAYS_UNLOCKED_DISPLAY =
+            "android.permission.ADD_ALWAYS_UNLOCKED_DISPLAY";
+    /** See {@code Manifest#ACCESS_LOCUS_ID_USAGE_STATS} */
+    public static final String ACCESS_LOCUS_ID_USAGE_STATS =
+            "android.permission.ACCESS_LOCUS_ID_USAGE_STATS";
+    /** See {@code Manifest#MANAGE_APP_HIBERNATION} */
+    public static final String MANAGE_APP_HIBERNATION = "android.permission.MANAGE_APP_HIBERNATION";
+    /** See {@code Manifest#RESET_APP_ERRORS} */
+    public static final String RESET_APP_ERRORS = "android.permission.RESET_APP_ERRORS";
+    /** See {@code Manifest#INPUT_CONSUMER} */
+    public static final String INPUT_CONSUMER = "android.permission.INPUT_CONSUMER";
+    /** See {@code Manifest#CONTROL_DEVICE_STATE} */
+    public static final String CONTROL_DEVICE_STATE = "android.permission.CONTROL_DEVICE_STATE";
+    /** See {@code Manifest#BIND_DISPLAY_HASHING_SERVICE} */
+    public static final String BIND_DISPLAY_HASHING_SERVICE =
+            "android.permission.BIND_DISPLAY_HASHING_SERVICE";
+    /** See {@code Manifest#MANAGE_TOAST_RATE_LIMITING} */
+    public static final String MANAGE_TOAST_RATE_LIMITING =
+            "android.permission.MANAGE_TOAST_RATE_LIMITING";
+    /** See {@code Manifest#MANAGE_GAME_MODE} */
+    public static final String MANAGE_GAME_MODE = "android.permission.MANAGE_GAME_MODE";
+    /** See {@code Manifest#SIGNAL_REBOOT_READINESS} */
+    public static final String SIGNAL_REBOOT_READINESS =
+            "android.permission.SIGNAL_REBOOT_READINESS";
+    /** See {@code Manifest#GET_PEOPLE_TILE_PREVIEW} */
+    public static final String GET_PEOPLE_TILE_PREVIEW =
+            "android.permission.GET_PEOPLE_TILE_PREVIEW";
+    /** See {@code Manifest#READ_PEOPLE_DATA} */
+    public static final String READ_PEOPLE_DATA = "android.permission.READ_PEOPLE_DATA";
+    /** See {@code Manifest#RENOUNCE_PERMISSIONS} */
+    public static final String RENOUNCE_PERMISSIONS = "android.permission.RENOUNCE_PERMISSIONS";
+    /** See {@code Manifest#READ_NEARBY_STREAMING_POLICY} */
+    public static final String READ_NEARBY_STREAMING_POLICY =
+            "android.permission.READ_NEARBY_STREAMING_POLICY";
+    /** See {@code Manifest#SET_CLIP_SOURCE} */
+    public static final String SET_CLIP_SOURCE = "android.permission.SET_CLIP_SOURCE";
+    /** See {@code Manifest#ACCESS_TUNED_INFO} */
+    public static final String ACCESS_TUNED_INFO = "android.permission.ACCESS_TUNED_INFO";
+    /** See {@code Manifest#UPDATE_PACKAGES_WITHOUT_USER_ACTION} */
+    public static final String UPDATE_PACKAGES_WITHOUT_USER_ACTION =
+            "android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION";
+    /** See {@code Manifest#CAPTURE_BLACKOUT_CONTENT} */
+    public static final String CAPTURE_BLACKOUT_CONTENT =
+            "android.permission.CAPTURE_BLACKOUT_CONTENT";
+    /** See {@code Manifest#READ_GLOBAL_APP_SEARCH_DATA} */
+    public static final String READ_GLOBAL_APP_SEARCH_DATA =
+            "android.permission.READ_GLOBAL_APP_SEARCH_DATA";
+    /** See {@code Manifest#CREATE_VIRTUAL_DEVICE} */
+    public static final String CREATE_VIRTUAL_DEVICE = "android.permission.CREATE_VIRTUAL_DEVICE";
+    /** See {@code Manifest#SEND_SAFETY_CENTER_UPDATE} */
+    public static final String SEND_SAFETY_CENTER_UPDATE =
+            "android.permission.SEND_SAFETY_CENTER_UPDATE";
+    /** See {@code Manifest#TRIGGER_LOST_MODE} */
+    public static final String TRIGGER_LOST_MODE = "android.permission.TRIGGER_LOST_MODE";
+}
\ No newline at end of file
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Tags.java b/common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/utils/Tags.java
similarity index 100%
rename from common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Tags.java
rename to common/device-side/bedstead/nene/common/src/main/java/com/android/bedstead/nene/utils/Tags.java
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/TestApis.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/TestApis.java
index ecc04e3..f560755 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/TestApis.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/TestApis.java
@@ -16,13 +16,20 @@
 
 package com.android.bedstead.nene;
 
+import com.android.bedstead.nene.accessibility.Accessibility;
 import com.android.bedstead.nene.activities.Activities;
 import com.android.bedstead.nene.annotations.Experimental;
+import com.android.bedstead.nene.bluetooth.Bluetooth;
 import com.android.bedstead.nene.context.Context;
+import com.android.bedstead.nene.device.Device;
 import com.android.bedstead.nene.devicepolicy.DevicePolicy;
+import com.android.bedstead.nene.inputmethods.InputMethods;
+import com.android.bedstead.nene.instrumentation.Instrumentation;
+import com.android.bedstead.nene.location.Locations;
 import com.android.bedstead.nene.notifications.Notifications;
 import com.android.bedstead.nene.packages.Packages;
 import com.android.bedstead.nene.permissions.Permissions;
+import com.android.bedstead.nene.roles.Roles;
 import com.android.bedstead.nene.settings.Settings;
 import com.android.bedstead.nene.systemproperties.SystemProperties;
 import com.android.bedstead.nene.users.Users;
@@ -77,6 +84,47 @@
         return Notifications.sInstance;
     }
 
+    /** Access Test APIs related to the device. */
+    public static Device device() {
+        return Device.sInstance;
+    }
+
+    /** Access Test APIs related to location. */
+    @Experimental
+    public static Locations location() {
+        return Locations.sInstance;
+    }
+
+    /** Access Test APIs related to accessibility. */
+    @Experimental
+    public static Accessibility accessibility() {
+        return Accessibility.sInstance;
+    }
+
+    /** Access Test APIs related to bluetooth. */
+    @Experimental
+    public static Bluetooth bluetooth() {
+        return Bluetooth.sInstance;
+    }
+
+    /** Access Test APIs related to input methods. */
+    @Experimental
+    public static InputMethods inputMethods() {
+        return InputMethods.sInstance;
+    }
+
+    /** Access Test APIs related to instrumentation. */
+    @Experimental
+    public static Instrumentation instrumentation() {
+        return Instrumentation.sInstance;
+    }
+
+    /** Access Test APIs related to roles. */
+    @Experimental
+    public static Roles roles() {
+        return Roles.sInstance;
+    }
+
     /** @deprecated Use statically */
     @Deprecated()
     public TestApis() {
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/accessibility/Accessibility.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/accessibility/Accessibility.java
new file mode 100644
index 0000000..1df7804
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/accessibility/Accessibility.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.accessibility;
+
+import static android.accessibilityservice.AccessibilityServiceInfo.FEEDBACK_ALL_MASK;
+
+import android.view.accessibility.AccessibilityManager;
+
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.annotations.Experimental;
+import com.android.bedstead.nene.logging.Logger;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/** Test APIs related to accessibility. */
+@Experimental
+public final class Accessibility {
+
+    public static final Accessibility sInstance = new Accessibility();
+
+    private static final AccessibilityManager sAccessibilityManager =
+            TestApis.context().instrumentedContext().getSystemService(AccessibilityManager.class);
+
+    private final Logger mLogger = Logger.forInstance(this);
+
+    private Accessibility() {
+        mLogger.constructor();
+    }
+
+    /**
+     * Get installed accessibility services.
+     *
+     * <p>See {@link AccessibilityManager#getInstalledAccessibilityServiceList()}.
+     */
+    public Set<AccessibilityService> installedAccessibilityServices() {
+        return mLogger.method("installedAccessibilityServices", () ->
+                sAccessibilityManager
+                        .getInstalledAccessibilityServiceList().stream()
+                        .map(AccessibilityService::new)
+                        .collect(Collectors.toSet()));
+    }
+
+    /**
+     * Get enabled accessibility services.
+     *
+     * <p>See {@link AccessibilityManager#getEnabledAccessibilityServiceList(int)}.
+     */
+    public Set<AccessibilityService> enabledAccessibilityServices() {
+        return mLogger.method("enabledAccessibilityServices", () ->
+                sAccessibilityManager
+                        .getEnabledAccessibilityServiceList(FEEDBACK_ALL_MASK)
+                        .stream().map(AccessibilityService::new)
+                        .collect(Collectors.toSet()));
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/accessibility/AccessibilityService.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/accessibility/AccessibilityService.java
new file mode 100644
index 0000000..e85b7a5
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/accessibility/AccessibilityService.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.accessibility;
+
+import android.accessibilityservice.AccessibilityServiceInfo;
+
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.logging.Logger;
+import com.android.bedstead.nene.packages.Package;
+
+/**
+ * An accessibility service.
+ */
+public final class AccessibilityService {
+
+    private AccessibilityServiceInfo mServiceInfo;
+    private final Logger mLogger = Logger.forInstance(this);
+
+    AccessibilityService(AccessibilityServiceInfo serviceInfo) {
+        mLogger.constructor(serviceInfo, () -> {
+            mServiceInfo = serviceInfo;
+        });
+    }
+
+    /** The package of the accessibility service. */
+    public Package pkg() {
+        return mLogger.method("pkg", () ->
+                TestApis.packages().find(mServiceInfo.getResolveInfo().serviceInfo.packageName));
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/appops/AppOps.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/appops/AppOps.java
index ee9927f..691b986 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/appops/AppOps.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/appops/AppOps.java
@@ -18,7 +18,7 @@
 
 import static android.os.Build.VERSION_CODES.Q;
 
-import static com.android.bedstead.nene.permissions.Permissions.MANAGE_APP_OPS_MODES;
+import static com.android.bedstead.nene.permissions.CommonPermissions.MANAGE_APP_OPS_MODES;
 
 import android.annotation.TargetApi;
 import android.app.AppOpsManager;
@@ -27,44 +27,13 @@
 import com.android.bedstead.nene.annotations.Experimental;
 import com.android.bedstead.nene.packages.Package;
 import com.android.bedstead.nene.permissions.PermissionContext;
+import com.android.bedstead.nene.users.UserReference;
 import com.android.bedstead.nene.utils.Versions;
 
 @Experimental
 /** Manage AppOps for a package. */
 public final class AppOps {
 
-    /** Valid modes for an AppOp. */
-    public enum AppOpsMode {
-        ALLOWED(AppOpsManager.MODE_ALLOWED),
-        IGNORED(AppOpsManager.MODE_IGNORED),
-        ERRORED(AppOpsManager.MODE_ERRORED),
-        DEFAULT(AppOpsManager.MODE_DEFAULT),
-        FOREGROUND(AppOpsManager.MODE_FOREGROUND);
-
-        final int mValue;
-
-        AppOpsMode(int value) {
-            this.mValue = value;
-        }
-
-        static AppOpsMode forValue(int value) {
-            switch (value) {
-                case AppOpsManager.MODE_ALLOWED:
-                    return ALLOWED;
-                case AppOpsManager.MODE_IGNORED:
-                    return IGNORED;
-                case AppOpsManager.MODE_ERRORED:
-                    return ERRORED;
-                case AppOpsManager.MODE_DEFAULT:
-                    return DEFAULT;
-                case AppOpsManager.MODE_FOREGROUND:
-                    return FOREGROUND;
-                default:
-                    throw new IllegalStateException("Unknown AppOpsMode");
-            }
-        }
-    }
-
     private static final AppOpsManager sAppOpsManager =
             TestApis.context().instrumentedContext().getSystemService(AppOpsManager.class);
     private final Package mPackage;
@@ -75,8 +44,14 @@
 
     /** Set an AppOp for the given package. */
     public void set(String appOpName, AppOpsMode mode) {
+        set(TestApis.users().instrumented(), appOpName, mode);
+    }
+
+    /** Set an AppOp for the given package. */
+    public void set(UserReference user, String appOpName, AppOpsMode mode) {
         try (PermissionContext p = TestApis.permissions().withPermission(MANAGE_APP_OPS_MODES)) {
-            sAppOpsManager.setMode(appOpName, mPackage.uid(), mPackage.packageName(), mode.mValue);
+            sAppOpsManager.setMode(appOpName, mPackage.uid(user),
+                    mPackage.packageName(), mode.mValue);
         }
     }
 
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/bluetooth/Bluetooth.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/bluetooth/Bluetooth.java
new file mode 100644
index 0000000..aeabf3d
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/bluetooth/Bluetooth.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.bluetooth;
+
+import static android.os.Build.VERSION_CODES.R;
+
+import static com.android.bedstead.nene.permissions.CommonPermissions.BLUETOOTH;
+import static com.android.bedstead.nene.permissions.CommonPermissions.BLUETOOTH_CONNECT;
+import static com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_USERS_FULL;
+import static com.android.bedstead.nene.permissions.CommonPermissions.NETWORK_SETTINGS;
+import static com.android.bedstead.nene.utils.Versions.T;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothManager;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.logging.Logger;
+import com.android.bedstead.nene.permissions.PermissionContext;
+import com.android.bedstead.nene.utils.Poll;
+import com.android.compatibility.common.util.BlockingBroadcastReceiver;
+
+/** Test APIs related to bluetooth. */
+public final class Bluetooth {
+
+    public static final Bluetooth sInstance = new Bluetooth();
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final BluetoothManager sBluetoothManager =
+            sContext.getSystemService(BluetoothManager.class);
+    private static final BluetoothAdapter sBluetoothAdapter = sBluetoothManager.getAdapter();
+
+    private final Logger mLogger = Logger.forInstance(this);
+
+    private Bluetooth() {
+        mLogger.constructor();
+    }
+
+    /** Enable or disable bluetooth on the device. */
+    public void setEnabled(boolean enabled) {
+        mLogger.method("setEnabled", enabled, () -> {
+            if (isEnabled() == enabled) {
+                return;
+            }
+
+            if (enabled) {
+                enable();
+            } else {
+                disable();
+            }
+        });
+    }
+
+    private void enable() {
+        mLogger.method("enable", () -> {
+            try (PermissionContext p =
+                         TestApis.permissions()
+                                 .withPermission(BLUETOOTH_CONNECT, INTERACT_ACROSS_USERS_FULL)
+                                 .withPermissionOnVersionAtLeast(T, NETWORK_SETTINGS)) {
+                BlockingBroadcastReceiver r = BlockingBroadcastReceiver.create(
+                        sContext,
+                        BluetoothAdapter.ACTION_STATE_CHANGED,
+                        this::isStateEnabled).register();
+
+                try {
+                    assertThat(sBluetoothAdapter.enable()).isTrue();
+
+                    r.awaitForBroadcast();
+                    Poll.forValue("Bluetooth Enabled", this::isEnabled)
+                            .toBeEqualTo(true)
+                            .errorOnFail()
+                            .await();
+                } finally {
+                    r.unregisterQuietly();
+                }
+            }
+        });
+    }
+
+    private void disable() {
+        mLogger.method("disable", () -> {
+            try (PermissionContext p =
+                         TestApis.permissions()
+                                 .withPermission(BLUETOOTH_CONNECT, INTERACT_ACROSS_USERS_FULL)
+                                 .withPermissionOnVersionAtLeast(T, NETWORK_SETTINGS)) {
+                BlockingBroadcastReceiver r = BlockingBroadcastReceiver.create(
+                        sContext,
+                        BluetoothAdapter.ACTION_STATE_CHANGED,
+                        this::isStateDisabled).register();
+
+                try {
+                    assertThat(sBluetoothAdapter.disable()).isTrue();
+
+                    r.awaitForBroadcast();
+                    Poll.forValue("Bluetooth Enabled", this::isEnabled)
+                            .toBeEqualTo(false)
+                            .errorOnFail()
+                            .await();
+                } finally {
+                    r.unregisterQuietly();
+                }
+            }
+        });
+    }
+
+    /** {@code true} if bluetooth is enabled. */
+    public boolean isEnabled() {
+        return mLogger.method("isEnabled", () -> {
+            try (PermissionContext p =
+                         TestApis.permissions().withPermissionOnVersionAtMost(R, BLUETOOTH)) {
+                return sBluetoothAdapter.isEnabled();
+            }
+        });
+    }
+
+    private boolean isStateEnabled(Intent intent) {
+        return mLogger.method("isStateEnabled", intent, () ->
+                intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1)
+                        == BluetoothAdapter.STATE_ON);
+    }
+
+    private boolean isStateDisabled(Intent intent) {
+        return mLogger.method("isStateDisabled", intent, () ->
+                intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1)
+                        == BluetoothAdapter.STATE_OFF);
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/device/Device.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/device/Device.java
new file mode 100644
index 0000000..b2530e8
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/device/Device.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2021 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.bedstead.nene.device;
+
+import android.os.RemoteException;
+import android.support.test.uiautomator.UiDevice;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.bedstead.nene.exceptions.AdbException;
+import com.android.bedstead.nene.exceptions.NeneException;
+import com.android.bedstead.nene.utils.Poll;
+import com.android.bedstead.nene.utils.ShellCommand;
+
+/** Helper methods related to the device. */
+public final class Device {
+    public static final Device sInstance = new Device();
+    private static final UiDevice sDevice =
+            UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+
+    private Device() {
+
+    }
+
+    /**
+     * Turn the screen on.
+     */
+    public void wakeUp() {
+        try {
+            ShellCommand.builder("input keyevent")
+                    .addOperand("KEYCODE_WAKEUP")
+                    .validate(String::isEmpty)
+                    .execute();
+        } catch (AdbException e) {
+            throw new NeneException("Error waking up device", e);
+        }
+
+        Poll.forValue("isScreenOn", this::isScreenOn)
+                .toBeEqualTo(true)
+                .errorOnFail()
+                .await();
+    }
+
+    /**
+     * True if the screen is on.
+     */
+    public boolean isScreenOn() {
+        try {
+            return sDevice.isScreenOn();
+        } catch (RemoteException e) {
+            throw new NeneException("Error getting isScreenOn", e);
+        }
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/devicepolicy/DeviceOwner.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/devicepolicy/DeviceOwner.java
index ae3d100..b88c054 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/devicepolicy/DeviceOwner.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/devicepolicy/DeviceOwner.java
@@ -16,10 +16,18 @@
 
 package com.android.bedstead.nene.devicepolicy;
 
-import static com.android.bedstead.nene.permissions.Permissions.MANAGE_PROFILE_AND_DEVICE_OWNERS;
+import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
 
+import static com.android.bedstead.nene.permissions.CommonPermissions.MANAGE_PROFILE_AND_DEVICE_OWNERS;
+import static com.android.compatibility.common.util.enterprise.DeviceAdminReceiverUtils.ACTION_DISABLE_SELF;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
 import android.os.Build;
 
 import com.android.bedstead.nene.TestApis;
@@ -28,16 +36,24 @@
 import com.android.bedstead.nene.packages.Package;
 import com.android.bedstead.nene.permissions.PermissionContext;
 import com.android.bedstead.nene.users.UserReference;
+import com.android.bedstead.nene.utils.Poll;
+import com.android.bedstead.nene.utils.Retry;
 import com.android.bedstead.nene.utils.ShellCommand;
 import com.android.bedstead.nene.utils.ShellCommandUtils;
 import com.android.bedstead.nene.utils.Versions;
+import com.android.compatibility.common.util.BlockingBroadcastReceiver;
 
+import java.time.Duration;
 import java.util.Objects;
 
 /**
  * A reference to a Device Owner.
  */
 public final class DeviceOwner extends DevicePolicyController {
+
+    private static final String TEST_APP_APP_COMPONENT_FACTORY =
+            "com.android.bedstead.testapp.TestAppAppComponentFactory";
+
     DeviceOwner(UserReference user,
             Package pkg,
             ComponentName componentName) {
@@ -57,7 +73,8 @@
 
     @Override
     public void remove() {
-        if (!Versions.meetsMinimumSdkVersionRequirement(Build.VERSION_CODES.S)) {
+        if (!Versions.meetsMinimumSdkVersionRequirement(Build.VERSION_CODES.S)
+                || TestApis.packages().instrumented().isInstantApp()) {
             removePreS();
             return;
         }
@@ -69,7 +86,18 @@
         try (PermissionContext p =
                      TestApis.permissions().withPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)) {
             devicePolicyManager.forceRemoveActiveAdmin(mComponentName, mUser.id());
+        } catch (SecurityException e) {
+            if (e.getMessage().contains("Attempt to remove non-test admin")
+                    && TEST_APP_APP_COMPONENT_FACTORY.equals(mPackage.appComponentFactory())) {
+                removeTestApp();
+            } else {
+                throw e;
+            }
         }
+
+        Poll.forValue("Device Owner", () -> TestApis.devicePolicy().getDeviceOwner())
+                .toBeNull()
+                .errorOnFail().await();
     }
 
     private void removePreS() {
@@ -79,10 +107,52 @@
                     .validate(ShellCommandUtils::startsWithSuccess)
                     .execute();
         } catch (AdbException e) {
-            throw new NeneException("Error removing device owner " + this, e);
+            if (mPackage.appComponentFactory().equals(TEST_APP_APP_COMPONENT_FACTORY)
+                    && user().parent() == null) {
+                // We can't see why it failed so we'll try the test app version
+                removeTestApp();
+            } else {
+                throw new NeneException("Error removing device owner " + this, e);
+            }
         }
     }
 
+    private void removeTestApp() {
+        // Special case for removing TestApp DPCs - this works even when not testOnly
+        Intent intent = new Intent(ACTION_DISABLE_SELF);
+        intent.setComponent(new ComponentName(pkg().packageName(),
+                "com.android.bedstead.testapp.TestAppBroadcastController"));
+        Context context = TestApis.context().androidContextAsUser(mUser);
+
+        try (PermissionContext p =
+                     TestApis.permissions().withPermission(INTERACT_ACROSS_USERS_FULL)) {
+            // If the profile isn't ready then the broadcast won't be sent and the profile owner
+            // will not be removed. So we can retry until the broadcast has been dealt with.
+            Retry.logic(() -> {
+                BlockingBroadcastReceiver b = new BlockingBroadcastReceiver(
+                        TestApis.context().instrumentedContext());
+
+                context.sendOrderedBroadcast(
+                        intent, /* receiverPermission= */ null, b, /* scheduler= */
+                        null, /* initialCode= */
+                        Activity.RESULT_CANCELED, /* initialData= */ null, /* initialExtras= */
+                        null);
+
+                b.awaitForBroadcastOrFail(Duration.ofSeconds(30).toMillis());
+                assertThat(b.getResultCode()).isEqualTo(Activity.RESULT_OK);
+            }).timeout(Duration.ofMinutes(5)).runAndWrapException();
+
+            DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
+
+            Poll.forValue(() -> dpm.isRemovingAdmin(mComponentName, mUser.id()))
+                    .toNotBeEqualTo(true)
+                    .timeout(Duration.ofMinutes(5))
+                    .errorOnFail()
+                    .await();
+        }
+
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof DeviceOwner)) {
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/devicepolicy/DevicePolicy.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/devicepolicy/DevicePolicy.java
index 2d8d21d..10b8077 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/devicepolicy/DevicePolicy.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/devicepolicy/DevicePolicy.java
@@ -21,10 +21,17 @@
 import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
 import static android.os.Build.VERSION.SDK_INT;
 
-import static com.android.bedstead.nene.permissions.Permissions.MANAGE_DEVICE_ADMINS;
-import static com.android.bedstead.nene.permissions.Permissions.MANAGE_PROFILE_AND_DEVICE_OWNERS;
+import static com.android.bedstead.nene.permissions.CommonPermissions.FORCE_DEVICE_POLICY_MANAGER_LOGS;
+import static com.android.bedstead.nene.permissions.CommonPermissions.MANAGE_DEVICE_ADMINS;
+import static com.android.bedstead.nene.permissions.CommonPermissions.MANAGE_PROFILE_AND_DEVICE_OWNERS;
+import static com.android.bedstead.nene.permissions.CommonPermissions.MANAGE_ROLE_HOLDERS;
+import static com.android.bedstead.nene.utils.Versions.T;
 
+import static org.junit.Assert.fail;
+
+import android.annotation.TargetApi;
 import android.app.admin.DevicePolicyManager;
+import android.app.role.RoleManager;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.PackageManager;
@@ -42,14 +49,15 @@
 import com.android.bedstead.nene.packages.Package;
 import com.android.bedstead.nene.permissions.PermissionContext;
 import com.android.bedstead.nene.users.UserReference;
+import com.android.bedstead.nene.utils.Poll;
+import com.android.bedstead.nene.utils.Retry;
 import com.android.bedstead.nene.utils.ShellCommand;
 import com.android.bedstead.nene.utils.ShellCommandUtils;
 import com.android.bedstead.nene.utils.Versions;
-import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.BlockingCallback;
 
-import java.util.Arrays;
+import java.time.Duration;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -64,8 +72,6 @@
 
     private static final String LOG_TAG = "DevicePolicy";
 
-    private static final String USER_SETUP_COMPLETE_KEY = "user_setup_complete";
-
     private final AdbDevicePolicyParser mParser;
 
     private DeviceOwner mCachedDeviceOwner;
@@ -91,44 +97,41 @@
         // TODO(b/187925230): If it fails, we check for terminal failure states - and if not
         //  we retry because if the profile owner was recently removed, it can take some time
         //  to be allowed to set it again
-        retryIfNotTerminal(
-                () -> command.executeOrThrowNeneException("Could not set profile owner for user "
-                        + user + " component " + profileOwnerComponent),
-                () -> checkForTerminalProfileOwnerFailures(user, profileOwnerComponent),
-                NeneException.class);
+        try {
+            Retry.logic(command::execute)
+                    .terminalException((ex) -> {
+                        if (!Versions.meetsMinimumSdkVersionRequirement(Build.VERSION_CODES.S)) {
+                            return false; // Just retry on old versions as we don't have stderr
+                        }
+                        if (ex instanceof AdbException) {
+                            String error = ((AdbException) ex).error();
+                            if (error.contains("is being removed")) {
+                                return false;
+                            }
+                        }
+
+                        // Assume all other errors are terminal
+                        return true;
+                    })
+                    .timeout(Duration.ofMinutes(5))
+                    .run();
+        } catch (Throwable e) {
+            throw new NeneException("Could not set profile owner for user "
+                    + user + " component " + profileOwnerComponent, e);
+        }
+
+        Poll.forValue("Profile Owner", () -> TestApis.devicePolicy().getProfileOwner(user))
+                .toNotBeNull()
+                .errorOnFail()
+                .await();
+
         return new ProfileOwner(user,
                 TestApis.packages().find(
                         profileOwnerComponent.getPackageName()), profileOwnerComponent);
     }
 
-    private void checkForTerminalProfileOwnerFailures(
-            UserReference user, ComponentName profileOwnerComponent) {
-        ProfileOwner profileOwner = getProfileOwner(user);
-        if (profileOwner != null) {
-            // TODO(scottjonathan): Should we actually fail here if the component name is the
-            //  same?
-
-            throw new NeneException(
-                    "Could not set profile owner for user " + user
-                            + " as a profile owner is already set: " + profileOwner);
-        }
-
-        Package pkg = TestApis.packages().find(
-                profileOwnerComponent.getPackageName());
-        if (!TestApis.packages().installedForUser(user).contains(pkg)) {
-            throw new NeneException(
-                    "Could not set profile owner for user " + user
-                            + " as the package " + pkg + " is not installed");
-        }
-
-        if (!componentCanBeSetAsDeviceAdmin(profileOwnerComponent, user)) {
-            throw new NeneException("Could not set profile owner for user "
-                    + user + " as component " + profileOwnerComponent + " is not valid");
-        }
-    }
-
     /**
-     * Get the profile owner for the instrumented user..
+     * Get the profile owner for the instrumented user.
      */
     public ProfileOwner getProfileOwner() {
         return getProfileOwner(TestApis.users().instrumented());
@@ -162,41 +165,47 @@
                         .getSystemService(DevicePolicyManager.class);
         UserReference user = TestApis.users().system();
 
-        boolean dpmUserSetupComplete = getUserSetupComplete(user);
+        boolean dpmUserSetupComplete = user.getSetupComplete();
         Boolean currentUserSetupComplete = null;
 
         try {
-            setUserSetupComplete(user, false);
+            user.setSetupComplete(false);
 
             try (PermissionContext p =
                          TestApis.permissions().withPermission(
                                  MANAGE_PROFILE_AND_DEVICE_OWNERS, MANAGE_DEVICE_ADMINS,
                                  INTERACT_ACROSS_USERS_FULL, INTERACT_ACROSS_USERS, CREATE_USERS)) {
-                devicePolicyManager.setActiveAdmin(deviceOwnerComponent,
-                        /* refreshing= */ true, user.id());
 
                 // TODO(b/187925230): If it fails, we check for terminal failure states - and if not
                 //  we retry because if the DO/PO was recently removed, it can take some time
                 //  to be allowed to set it again
-                retryIfNotTerminal(
-                        () -> setDeviceOwnerOnly(devicePolicyManager,
-                                deviceOwnerComponent, "Nene", user.id()),
-                        () -> checkForTerminalDeviceOwnerFailures(
-                                user, deviceOwnerComponent, /* allowAdditionalUsers= */ true),
-                        NeneException.class);
-            } catch (IllegalArgumentException | IllegalStateException | SecurityException e) {
+                Retry.logic(() -> {
+                            devicePolicyManager.setActiveAdmin(deviceOwnerComponent,
+                                    /* refreshing= */ true, user.id());
+                            setDeviceOwnerOnly(devicePolicyManager,
+                                    deviceOwnerComponent, "Nene", user.id());
+                }).terminalException((e) -> checkForTerminalDeviceOwnerFailures(
+                        user, deviceOwnerComponent, /* allowAdditionalUsers= */ true))
+                        .timeout(Duration.ofMinutes(5))
+                        .run();
+            } catch (Throwable e) {
                 throw new NeneException("Error setting device owner", e);
             }
         } finally {
-            setUserSetupComplete(user, dpmUserSetupComplete);
+            user.setSetupComplete(dpmUserSetupComplete);
             if (currentUserSetupComplete != null) {
-                setUserSetupComplete(TestApis.users().current(), currentUserSetupComplete);
+                TestApis.users().current().setSetupComplete(currentUserSetupComplete);
             }
         }
 
         Package deviceOwnerPackage = TestApis.packages().find(
                 deviceOwnerComponent.getPackageName());
 
+        Poll.forValue("Device Owner", () -> TestApis.devicePolicy().getDeviceOwner())
+                .toNotBeNull()
+                .errorOnFail()
+                .await();
+
         return new DeviceOwner(user, deviceOwnerPackage, deviceOwnerComponent);
     }
 
@@ -230,64 +239,6 @@
         }
     }
 
-    /**
-     * Runs {@code operation}. If it fails, runs {@code terminalCheck} and then retries
-     * {@code operation} until it does not fail or for a maximum of 30 seconds.
-     *
-     * <p>The {@code operation} is considered to be successful if it does not throw an exception
-     */
-    private void retryIfNotTerminal(
-            Runnable operation, Runnable terminalCheck,
-            Class<? extends RuntimeException>... exceptions) {
-        Set<Class<? extends RuntimeException>> exceptionSet =
-                new HashSet<>(Arrays.asList(exceptions));
-        try {
-            operation.run();
-        } catch (RuntimeException e) {
-            if (!exceptionSet.contains(e.getClass())) {
-                throw e;
-            }
-
-            terminalCheck.run();
-
-            try {
-                PollingCheck.waitFor(() -> {
-                    try {
-                        operation.run();
-                        return true;
-                    } catch (RuntimeException e2) {
-                        if (!exceptionSet.contains(e2.getClass())) {
-                            throw e2;
-                        }
-                        return false;
-                    }
-                });
-            } catch (AssertionError e3) {
-                operation.run();
-            }
-        }
-    }
-
-
-    private void setUserSetupComplete(UserReference user, boolean complete) {
-        DevicePolicyManager devicePolicyManager =
-                TestApis.context().androidContextAsUser(user)
-                        .getSystemService(DevicePolicyManager.class);
-        TestApis.settings().secure().putInt(user, USER_SETUP_COMPLETE_KEY, complete ? 1 : 0);
-        try (PermissionContext p =
-                     TestApis.permissions().withPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)) {
-            devicePolicyManager.forceUpdateUserSetupComplete(user.id());
-        }
-    }
-
-    private boolean getUserSetupComplete(UserReference user) {
-        try (PermissionContext p = TestApis.permissions().withPermission(CREATE_USERS)) {
-            return
-                    TestApis.settings().secure()
-                            .getInt(user, USER_SETUP_COMPLETE_KEY, /* def= */ 0) == 1;
-        }
-    }
-
     private DeviceOwner setDeviceOwnerPreS(ComponentName deviceOwnerComponent) {
         UserReference user = TestApis.users().system();
 
@@ -298,18 +249,23 @@
         // TODO(b/187925230): If it fails, we check for terminal failure states - and if not
         //  we retry because if the device owner was recently removed, it can take some time
         //  to be allowed to set it again
-        retryIfNotTerminal(
-                () -> command.executeOrThrowNeneException("Could not set device owner for user "
-                        + user + " component " + deviceOwnerComponent),
-                () -> checkForTerminalDeviceOwnerFailures(
-                    user, deviceOwnerComponent, /* allowAdditionalUsers= */ false));
+
+        try {
+            Retry.logic(command::execute)
+                .terminalException((e) -> checkForTerminalDeviceOwnerFailures(
+                            user, deviceOwnerComponent, /* allowAdditionalUsers= */ false))
+                    .timeout(Duration.ofMinutes(5))
+                    .run();
+        } catch (Throwable e) {
+            throw new NeneException("Error setting device owner", e);
+        }
 
         return new DeviceOwner(user,
                 TestApis.packages().find(
                         deviceOwnerComponent.getPackageName()), deviceOwnerComponent);
     }
 
-    private void checkForTerminalDeviceOwnerFailures(
+    private boolean checkForTerminalDeviceOwnerFailures(
             UserReference user, ComponentName deviceOwnerComponent, boolean allowAdditionalUsers) {
         DeviceOwner deviceOwner = getDeviceOwner();
         if (deviceOwner != null) {
@@ -344,6 +300,8 @@
 
         }
         // TODO(scottjonathan): Check accounts
+
+        return false;
     }
 
     private boolean componentCanBeSetAsDeviceAdmin(ComponentName component, UserReference user) {
@@ -406,4 +364,98 @@
                     .getPolicyExemptApps();
         }
     }
+
+    @Experimental
+    public void forceNetworkLogs() {
+        try (PermissionContext p = TestApis.permissions().withPermission(FORCE_DEVICE_POLICY_MANAGER_LOGS)) {
+            long throttle = TestApis.context()
+                    .instrumentedContext()
+                    .getSystemService(DevicePolicyManager.class)
+                    .forceNetworkLogs();
+
+            if (throttle == -1) {
+                throw new NeneException("Error forcing network logs: returned -1");
+            }
+            if (throttle == 0) {
+                return;
+            }
+            try {
+                Thread.sleep(throttle);
+            } catch (InterruptedException e) {
+                throw new NeneException("Error waiting for network log throttle", e);
+            }
+
+            forceNetworkLogs();
+        }
+    }
+
+    /**
+     * Sets the provided {@code packageName} as a device policy management role holder.
+     */
+    @TargetApi(Build.VERSION_CODES.TIRAMISU)
+    @Experimental
+    public void setDevicePolicyManagementRoleHolder(String packageName)
+            throws InterruptedException {
+        if (!Versions.meetsMinimumSdkVersionRequirement(T)) {
+            return;
+        }
+        try (PermissionContext p = TestApis.permissions().withPermission(
+                MANAGE_ROLE_HOLDERS)) {
+            DefaultBlockingCallback blockingCallback = new DefaultBlockingCallback();
+            RoleManager roleManager = TestApis.context().instrumentedContext()
+                    .getSystemService(RoleManager.class);
+            TestApis.roles().setBypassingRoleQualification(true);
+            roleManager.addRoleHolderAsUser(
+                    RoleManager.ROLE_DEVICE_POLICY_MANAGEMENT,
+                    packageName,
+                    /* flags= */ 0,
+                    TestApis.context().instrumentationContext().getUser(),
+                    TestApis.context().instrumentedContext().getMainExecutor(),
+                    blockingCallback::triggerCallback);
+
+            boolean success = blockingCallback.await();
+            if (!success) {
+                fail("Could not set role holder of "
+                        + RoleManager.ROLE_DEVICE_POLICY_MANAGEMENT + ".");
+            }
+        }
+    }
+
+    /**
+     * Unsets the provided {@code packageName} as a device policy management role holder.
+     */
+    @TargetApi(Build.VERSION_CODES.TIRAMISU)
+    @Experimental
+    public void unsetDevicePolicyManagementRoleHolder(String packageName)
+            throws InterruptedException {
+        if (!Versions.meetsMinimumSdkVersionRequirement(T)) {
+            return;
+        }
+        try (PermissionContext p = TestApis.permissions().withPermission(
+                MANAGE_ROLE_HOLDERS)) {
+            DefaultBlockingCallback blockingCallback = new DefaultBlockingCallback();
+            RoleManager roleManager = TestApis.context().instrumentedContext()
+                    .getSystemService(RoleManager.class);
+            roleManager.removeRoleHolderAsUser(
+                    RoleManager.ROLE_DEVICE_POLICY_MANAGEMENT,
+                    packageName,
+                    /* flags= */ 0,
+                    TestApis.context().instrumentationContext().getUser(),
+                    TestApis.context().instrumentedContext().getMainExecutor(),
+                    blockingCallback::triggerCallback);
+            TestApis.roles().setBypassingRoleQualification(false);
+
+            boolean success = blockingCallback.await();
+            if (!success) {
+                fail("Failed to clear the role holder of "
+                        + RoleManager.ROLE_DEVICE_POLICY_MANAGEMENT + ".");
+            }
+        }
+    }
+
+    private static class DefaultBlockingCallback extends BlockingCallback<Boolean> {
+        public void triggerCallback(Boolean success) {
+            callbackTriggered(success);
+        }
+    }
 }
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/devicepolicy/ProfileOwner.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/devicepolicy/ProfileOwner.java
index e475d25..ce73f43 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/devicepolicy/ProfileOwner.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/devicepolicy/ProfileOwner.java
@@ -16,10 +16,18 @@
 
 package com.android.bedstead.nene.devicepolicy;
 
-import static com.android.bedstead.nene.permissions.Permissions.MANAGE_PROFILE_AND_DEVICE_OWNERS;
+import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
 
+import static com.android.bedstead.nene.permissions.CommonPermissions.MANAGE_PROFILE_AND_DEVICE_OWNERS;
+import static com.android.compatibility.common.util.enterprise.DeviceAdminReceiverUtils.ACTION_DISABLE_SELF;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.Activity;
 import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
 import android.os.Build;
 
 import com.android.bedstead.nene.TestApis;
@@ -28,10 +36,14 @@
 import com.android.bedstead.nene.packages.Package;
 import com.android.bedstead.nene.permissions.PermissionContext;
 import com.android.bedstead.nene.users.UserReference;
+import com.android.bedstead.nene.utils.Poll;
+import com.android.bedstead.nene.utils.Retry;
 import com.android.bedstead.nene.utils.ShellCommand;
 import com.android.bedstead.nene.utils.ShellCommandUtils;
 import com.android.bedstead.nene.utils.Versions;
+import com.android.compatibility.common.util.BlockingBroadcastReceiver;
 
+import java.time.Duration;
 import java.util.Objects;
 
 /**
@@ -39,6 +51,9 @@
  */
 public final class ProfileOwner extends DevicePolicyController {
 
+    private static final String TEST_APP_APP_COMPONENT_FACTORY =
+            "com.android.bedstead.testapp.TestAppAppComponentFactory";
+
     ProfileOwner(UserReference user,
             Package pkg,
             ComponentName componentName) {
@@ -60,7 +75,20 @@
         try (PermissionContext p =
                      TestApis.permissions().withPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)) {
             devicePolicyManager.forceRemoveActiveAdmin(mComponentName, mUser.id());
+        } catch (SecurityException e) {
+            if (e.getMessage().contains("Attempt to remove non-test admin")
+                    && mPackage.appComponentFactory().equals(TEST_APP_APP_COMPONENT_FACTORY)
+                    && user().parent() == null) {
+                removeTestApp();
+            } else {
+                throw e;
+            }
         }
+
+        Poll.forValue("Profile Owner",
+                () -> TestApis.devicePolicy().getProfileOwner(mUser))
+                .toBeNull()
+                .errorOnFail().await();
     }
 
     private void removePreS() {
@@ -70,10 +98,53 @@
                     .validate(ShellCommandUtils::startsWithSuccess)
                     .execute();
         } catch (AdbException e) {
-            throw new NeneException("Error removing profile owner " + this, e);
+            if (mPackage.appComponentFactory().equals(TEST_APP_APP_COMPONENT_FACTORY)
+                    && user().parent() == null) {
+                // We can't see why it failed so we'll try the test app version
+                removeTestApp();
+            } else {
+                throw new NeneException("Error removing profile owner " + this, e);
+            }
         }
     }
 
+    private void removeTestApp() {
+        // Special case for removing TestApp DPCs - this works even when not testOnly
+        // but not on profiles
+        Intent intent = new Intent(ACTION_DISABLE_SELF);
+        intent.setComponent(new ComponentName(pkg().packageName(),
+                "com.android.bedstead.testapp.TestAppBroadcastController"));
+        Context context = TestApis.context().androidContextAsUser(mUser);
+
+        try (PermissionContext p =
+                     TestApis.permissions().withPermission(INTERACT_ACROSS_USERS_FULL)) {
+            // If the profile isn't ready then the broadcast won't be sent and the profile owner
+            // will not be removed. So we can retry until the broadcast has been dealt with.
+            Retry.logic(() -> {
+                BlockingBroadcastReceiver b = new BlockingBroadcastReceiver(
+                        TestApis.context().instrumentedContext());
+
+                context.sendOrderedBroadcast(
+                        intent, /* receiverPermission= */ null, b, /* scheduler= */
+                        null, /* initialCode= */
+                        Activity.RESULT_CANCELED, /* initialData= */ null, /* initialExtras= */
+                        null);
+
+                b.awaitForBroadcastOrFail(Duration.ofSeconds(30).toMillis());
+                assertThat(b.getResultCode()).isEqualTo(Activity.RESULT_OK);
+            }).timeout(Duration.ofMinutes(5)).runAndWrapException();
+
+            DevicePolicyManager dpm = context.getSystemService(DevicePolicyManager.class);
+
+            Poll.forValue(() -> dpm.isRemovingAdmin(mComponentName, mUser.id()))
+                    .toNotBeEqualTo(true)
+                    .timeout(Duration.ofMinutes(5))
+                    .errorOnFail()
+                    .await();
+        }
+
+    }
+
     @Override
     public String toString() {
         StringBuilder stringBuilder = new StringBuilder("ProfileOwner{");
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/exceptions/AdbException.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/exceptions/AdbException.java
deleted file mode 100644
index ca3ef6d..0000000
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/exceptions/AdbException.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2021 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.bedstead.nene.exceptions;
-
-import androidx.annotation.Nullable;
-
-/**
- * An exception that gets thrown when interacting with Adb.
- */
-public class AdbException extends Exception {
-
-    private final String mCommand;
-    private final @Nullable String mOutput;
-    private final @Nullable String mErr;
-
-    public AdbException(String message, String command, String output) {
-        this(message, command, output, /* err= */ (String) null);
-    }
-
-    public AdbException(String message, String command, String output, String err) {
-        super(message);
-        if (command == null) {
-            throw new NullPointerException();
-        }
-        this.mCommand = command;
-        this.mOutput = output;
-        this.mErr = err;
-    }
-
-    public AdbException(String message, String command, Throwable cause) {
-        this(message, command, /* output= */ null, cause);
-    }
-
-    public AdbException(String message, String command, String output, Throwable cause) {
-        super(message, cause);
-        if (command == null) {
-            throw new NullPointerException();
-        }
-        this.mCommand = command;
-        this.mOutput = output;
-        this.mErr = null;
-    }
-
-    public String command() {
-        return mCommand;
-    }
-
-    public String output() {
-        return mOutput;
-    }
-
-    public String error() {
-        return mErr;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder stringBuilder = new StringBuilder(super.toString());
-
-        stringBuilder.append("[command=\"").append(mCommand).append("\"");
-        if (mOutput != null) {
-            stringBuilder.append(", output=\"").append(mOutput).append("\"");
-        }
-        if (mErr != null) {
-            stringBuilder.append(", err=\"").append(mErr).append("\"");
-        }
-        stringBuilder.append("]");
-
-        return stringBuilder.toString();
-    }
-}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/inputmethods/InputMethod.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/inputmethods/InputMethod.java
new file mode 100644
index 0000000..38dcf21
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/inputmethods/InputMethod.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.inputmethods;
+
+import android.view.inputmethod.InputMethodInfo;
+
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.packages.Package;
+
+/** Represent an input method. */
+public final class InputMethod {
+
+    private final InputMethodInfo mInputMethodInfo;
+
+    InputMethod(InputMethodInfo inputMethodInfo) {
+        mInputMethodInfo = inputMethodInfo;
+    }
+
+    /** The package of the input method. */
+    public Package pkg() {
+        return TestApis.packages().find(mInputMethodInfo.getPackageName());
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/inputmethods/InputMethods.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/inputmethods/InputMethods.java
new file mode 100644
index 0000000..ed271fe
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/inputmethods/InputMethods.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.inputmethods;
+
+import android.view.inputmethod.InputMethodManager;
+
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.annotations.Experimental;
+
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/** Test APIs related to input methods. */
+@Experimental
+public final class InputMethods {
+    public static final InputMethods sInstance = new InputMethods();
+
+    private static final InputMethodManager sInputMethodManager =
+            TestApis.context().instrumentedContext().getSystemService(InputMethodManager.class);
+
+    private InputMethods() {
+
+    }
+
+    /** Get installed IMEs. */
+    public Set<InputMethod> installedInputMethods() {
+        return sInputMethodManager.getInputMethodList()
+                .stream()
+                .map(InputMethod::new)
+                .collect(Collectors.toSet());
+    }
+
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/instrumentation/Arguments.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/instrumentation/Arguments.java
new file mode 100644
index 0000000..8a4578a
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/instrumentation/Arguments.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.instrumentation;
+
+import android.os.Bundle;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+/** Access to Instrumentation Arguments. */
+public final class Arguments {
+
+    public static final Arguments sInstance = new Arguments();
+
+    private final Bundle mArguments = InstrumentationRegistry.getArguments();
+
+    private Arguments() {
+    }
+
+    /** Gets int instrumentation arg. */
+    public int getInt(String key) {
+        return mArguments.getInt(key);
+    }
+
+    /** Gets int instrumentation arg. */
+    public int getInt(String key, int defaultValue) {
+        return mArguments.getInt(key, defaultValue);
+    }
+
+    /** Gets boolean instrumentation arg. */
+    public boolean getBoolean(String key) {
+        return mArguments.getBoolean(key);
+    }
+
+    /** Gets boolean instrumentation arg. */
+    public boolean getBoolean(String key, boolean defaultValue) {
+        return mArguments.getBoolean(key, defaultValue);
+    }
+
+    /** Gets string instrumentation arg. */
+    public String getString(String key) {
+        return mArguments.getString(key);
+    }
+
+    /** Gets string instrumentation arg. */
+    public String getString(String key, String defaultValue) {
+        return mArguments.getString(key, defaultValue);
+    }
+
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/instrumentation/Instrumentation.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/instrumentation/Instrumentation.java
new file mode 100644
index 0000000..1a0d4d1
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/instrumentation/Instrumentation.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.instrumentation;
+
+/** Test APIs related to Instrumentation. */
+public final class Instrumentation {
+    public static final Instrumentation sInstance = new Instrumentation();
+
+    private Instrumentation() {
+
+    }
+
+    /** Interact with instrumentation arguments. */
+    public Arguments arguments() {
+        return Arguments.sInstance;
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/location/LocationProvider.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/location/LocationProvider.java
new file mode 100644
index 0000000..7bddceb
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/location/LocationProvider.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.location;
+
+import static com.android.bedstead.nene.appops.AppOpsMode.DEFAULT;
+import static com.android.bedstead.nene.appops.CommonAppOps.OPSTR_MOCK_LOCATION;
+
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.location.Criteria;
+import android.location.Location;
+import android.location.LocationManager;
+import android.os.SystemClock;
+
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.permissions.PermissionContext;
+
+/** A test location provider on the device. */
+public final class LocationProvider implements AutoCloseable {
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final LocationManager sLocationManager = sContext.getSystemService(
+            LocationManager.class);
+    private final String sProviderName;
+
+    LocationProvider(String provider) {
+        this.sProviderName = provider;
+        addTestProvider();
+        enableTestProvider();
+    }
+
+    @Override
+    public void close() {
+        removeTestProvider();
+        clearTestProviderLocation();
+    }
+
+    private void addTestProvider() {
+        try (PermissionContext p = TestApis.permissions().withAppOp(OPSTR_MOCK_LOCATION)) {
+            sLocationManager.addTestProvider(sProviderName,
+                    /* requiresNetwork= */ true,
+                    /* requiresSatellite= */ false,
+                    /* requiresCell= */ true,
+                    /* hasMonetaryCost= */ false,
+                    /* supportsAltitude= */ false,
+                    /* supportsSpeed= */ false,
+                    /* supportsBearing= */ false,
+                    Criteria.POWER_MEDIUM,
+                    Criteria.ACCURACY_COARSE);
+        }
+    }
+
+    private void enableTestProvider() {
+        sLocationManager.setTestProviderEnabled(sProviderName, /* enabled= */true);
+    }
+
+    private void removeTestProvider() {
+        sLocationManager.removeTestProvider(sProviderName);
+        TestApis.packages().instrumented().appOps().set(AppOpsManager.OPSTR_MOCK_LOCATION, DEFAULT);
+    }
+
+    private void clearTestProviderLocation() {
+        // This is a work-around for removing the test provider's location.
+        // There is no LocationManager test API to do this.
+        TestApis.location().setLocationEnabled(false);
+        TestApis.location().setLocationEnabled(true);
+    }
+
+    public void setLocation(double latitude, double longitude, float accuracy) {
+        sLocationManager.setTestProviderLocation(sProviderName,
+                createLocation(sProviderName, latitude, longitude, accuracy));
+    }
+
+    private static Location createLocation(String provider, double latitude, double longitude,
+            float accuracy) {
+        Location location = new Location(provider);
+        location.setLatitude(latitude);
+        location.setLongitude(longitude);
+        location.setAccuracy(accuracy);
+        location.setTime(System.currentTimeMillis());
+        location.setElapsedRealtimeNanos(SystemClock.elapsedRealtimeNanos());
+        return location;
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/location/Locations.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/location/Locations.java
new file mode 100644
index 0000000..3cd2258
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/location/Locations.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.location;
+
+import static android.Manifest.permission.WRITE_SECURE_SETTINGS;
+
+import android.content.Context;
+import android.location.LocationManager;
+
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.permissions.PermissionContext;
+import com.android.compatibility.common.util.BlockingCallback;
+
+import java.util.function.Consumer;
+
+/** Helper methods related to the location of the device. */
+public final class Locations {
+
+    private static final String DEFAULT_TEST_PROVIDER = "test_provider";
+    private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final LocationManager sLocationManager = sContext.getSystemService(
+            LocationManager.class);
+
+    public static final Locations sInstance = new Locations();
+
+    private Locations() {
+    }
+
+    public LocationProvider addLocationProvider(String providerName) {
+        return new LocationProvider(providerName);
+    }
+
+    /**
+     * Add a default location provider with the name "test_provider".
+     */
+    public LocationProvider addLocationProvider() {
+        return new LocationProvider(DEFAULT_TEST_PROVIDER);
+    }
+
+    /**
+     * Set location enabled or disabled for the instrumented user
+     */
+    public void setLocationEnabled(boolean enabled) {
+        try (PermissionContext p = TestApis.permissions().withPermission(
+                WRITE_SECURE_SETTINGS)) {
+            sLocationManager.setLocationEnabledForUser(enabled,
+                    TestApis.users().instrumented().userHandle());
+        }
+    }
+
+    public static class BlockingLostModeLocationUpdateCallback extends
+            BlockingCallback<Boolean> implements Consumer<Boolean> {
+        @Override
+        public void accept(Boolean result) {
+            callbackTriggered(result);
+        }
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/logging/AdbLogger.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/logging/AdbLogger.java
new file mode 100644
index 0000000..fa15935
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/logging/AdbLogger.java
@@ -0,0 +1,359 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.logging;
+
+import android.util.Log;
+
+import java.util.Arrays;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+/**
+ * {@link Logger} which passes all logs to ADB.
+ */
+public final class AdbLogger implements Logger {
+
+    public static final String KEY = "ADB";
+
+    private final String mTag;
+
+    AdbLogger(Object instance) {
+        mTag = "NNL_" + instance.getClass().getCanonicalName() + "@"
+                + Integer.toHexString(instance.hashCode());
+    }
+
+    @Override
+    public void constructor(Runnable method) {
+        constructor(method, new Object[]{});
+    }
+
+    @Override
+    public void constructor(Object... args) {
+        constructor(() -> {}, args);
+    }
+
+    @Override
+    public void constructor(Object arg1, Runnable method) {
+        constructor(method, arg1);
+    }
+
+    @Override
+    public void constructor(Object arg1, Object arg2, Runnable method) {
+        constructor(method, arg1, arg2);
+    }
+
+    @Override
+    public void constructor(Object arg1, Object arg2, Object arg3, Runnable method) {
+        constructor(method, arg1, arg2, arg3);
+    }
+
+    @Override
+    public void constructor(Object arg1, Object arg2, Object arg3, Object arg4, Runnable method) {
+        constructor(method, arg1, arg2, arg3, arg4);
+    }
+
+    @Override
+    public void constructor(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+            Runnable method) {
+        constructor(method, arg1, arg2, arg3, arg4, arg5);
+    }
+
+    @Override
+    public void constructor(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+            Object arg6, Runnable method) {
+        constructor(method, arg1, arg2, arg3, arg4, arg5, arg6);
+    }
+
+    @Override
+    public void constructor(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+            Object arg6, Object arg7, Runnable method) {
+        constructor(method, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    }
+
+    private void constructor(Runnable method, Object... args) {
+        begin("constructor", args);
+        try {
+            method.run();
+            end();
+        } catch (Throwable t) {
+            exception(t);
+            throw t;
+        }
+    }
+
+    @Override
+    public void method(String name, Runnable method) {
+        method(method, name);
+    }
+
+    @Override
+    public void method(String name, Object arg1, Runnable method) {
+        method(method, name, arg1);
+    }
+
+    @Override
+    public void method(String name, Object arg1, Object arg2, Runnable method) {
+        method(method, name, arg1, arg2);
+    }
+
+    @Override
+    public void method(String name, Object arg1, Object arg2, Object arg3, Runnable method) {
+        method(method, name, arg1, arg2, arg3);
+    }
+
+    @Override
+    public void method(String name, Object arg1, Object arg2, Object arg3, Object arg4,
+            Runnable method) {
+        method(method, name, arg1, arg2, arg3, arg4);
+    }
+
+    @Override
+    public void method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+            Runnable method) {
+        method(method, name, arg1, arg2, arg3, arg4, arg5);
+    }
+
+    @Override
+    public void method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+            Object arg6, Runnable method) {
+        method(method, name, arg1, arg2, arg3, arg4, arg5, arg6);
+    }
+
+    @Override
+    public void method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+            Object arg6, Object arg7, Runnable method) {
+        method(method, name, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name,
+            RunnableThrows<T> method) throws T {
+        method(method, name);
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            RunnableThrows<T> method) throws T {
+        method(method, name, arg1);
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, RunnableThrows<T> method) throws T {
+        method(method, name, arg1, arg2);
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, RunnableThrows<T> method) throws T {
+        method(method, name, arg1, arg2, arg3);
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, RunnableThrows<T> method) throws T {
+        method(method, name, arg1, arg2, arg3, arg4);
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, Object arg5, RunnableThrows<T> method) throws T {
+        method(method, name, arg1, arg2, arg3, arg4, arg5);
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, Object arg5, Object arg6,
+            RunnableThrows<T> method) throws T {
+        method(method, name, arg1, arg2, arg3, arg4, arg5, arg6);
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+            RunnableThrows<T> method) throws T {
+        method(method, name, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    }
+
+    private void method(Runnable method, String name, Object... args) {
+        begin(name, args);
+        try {
+            method.run();
+            end();
+        } catch (Throwable t) {
+            exception(t);
+            throw t;
+        }
+    }
+
+    private <T extends Throwable> void method(
+            RunnableThrows<T> method, String name, Object... args) throws T {
+        begin(name, args);
+        try {
+            method.run();
+            end();
+        } catch (Throwable t) {
+            exception(t);
+            throw t;
+        }
+    }
+
+    @Override
+    public <R> R method(String name, Supplier<R> method) {
+        return method(method, name);
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Supplier<R> method) {
+        return method(method, name, arg1);
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Object arg2, Supplier<R> method) {
+        return method(method, name, arg1, arg2);
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Object arg2, Object arg3, Supplier<R> method) {
+        return method(method, name, arg1, arg2, arg3);
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Object arg2, Object arg3, Object arg4,
+            Supplier<R> method) {
+        return method(method, name, arg1, arg2, arg3, arg4);
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Object arg2, Object arg3, Object arg4,
+            Object arg5, Supplier<R> method) {
+        return method(method, name, arg1, arg2, arg3, arg4, arg5);
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Object arg2, Object arg3, Object arg4,
+            Object arg5, Object arg6, Supplier<R> method) {
+        return method(method, name, arg1, arg2, arg3, arg4, arg5, arg6);
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Object arg2, Object arg3, Object arg4,
+            Object arg5, Object arg6, Object arg7, Supplier<R> method) {
+        return method(method, name, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name,
+            SupplierThrows<R, T> method) throws T {
+        return method(method, name);
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            SupplierThrows<R, T> method) throws T {
+        return method(method, name, arg1);
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, SupplierThrows<R, T> method) throws T {
+        return method(method, name, arg1, arg2);
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, SupplierThrows<R, T> method) throws T {
+        return method(method, name, arg1, arg2, arg3);
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, SupplierThrows<R, T> method) throws T {
+        return method(method, name, arg1, arg2, arg3, arg4);
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, Object arg5, SupplierThrows<R, T> method)
+            throws T {
+        return method(method, name, arg1, arg2, arg3, arg4, arg5);
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, Object arg5, Object arg6,
+            SupplierThrows<R, T> method) throws T {
+        return method(method, name, arg1, arg2, arg3, arg4, arg5, arg6);
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+            SupplierThrows<R, T> method) throws T {
+        return method(method, name, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
+    }
+
+    private <R> R method(Supplier<R> method, String name, Object... args) {
+        begin(name, args);
+        try {
+            R value = method.get();
+            end(value);
+            return value;
+        } catch (Throwable t) {
+            exception(t);
+            throw t;
+        }
+    }
+
+    private <R, T extends Throwable> R method(
+            SupplierThrows<R, T> method, String name, Object... args) throws T {
+        begin(name, args);
+        try {
+            R value = method.get();
+            end(value);
+            return value;
+        } catch (Throwable t) {
+            exception(t);
+            throw t;
+        }
+    }
+
+    private void begin(String title, Object... args) {
+        Log.i(mTag, "BEGIN " + title + formatArgs(args));
+    }
+
+    private void exception(Throwable t) {
+        Log.i(mTag, "END EXCEPTION ("  + t + ")");
+    }
+
+    private void end(Object ret) {
+        Log.i(mTag, "END ("  + ret + ")");
+    }
+
+    private void end() {
+        Log.i(mTag, "END");
+    }
+
+    private String formatArgs(Object[] args) {
+        if (args.length == 0) {
+            return "";
+        }
+
+        return " (" + Arrays.stream(args).map(Object::toString)
+                .collect(Collectors.joining(", ")) + ")";
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/logging/Logger.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/logging/Logger.java
new file mode 100644
index 0000000..44a5df3e
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/logging/Logger.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.logging;
+
+import com.android.bedstead.nene.TestApis;
+
+import java.util.function.Function;
+
+/**
+ * Logger used for tests and test infrastructure.
+ *
+ * <p>By default, logs will be dropped silently.
+ *
+ * <p>To change this, pass the LOGGING instrumentation argument.
+ *
+ * <p>E.g. {@code -- --instrumentation-arg LOGGING ADB} to log to ADB.
+ */
+public interface Logger extends CommonLogger {
+
+    /**
+     * The key to use to pass in the type of logger to use.
+     *
+     * <p>Defaults to silently dropping logs.
+     */
+    String LOGGER_KEY = "LOGGER";
+
+    Function<Object, Logger> LOG_CONSTRUCTOR =
+            TestApis.instrumentation().arguments().getString(LOGGER_KEY, "")
+                    .equals(AdbLogger.KEY) ? AdbLogger::new : (object) -> VoidLogger.sInstance;
+
+    /** Create a {@link Logger} for the given object. */
+    static Logger forInstance(Object object) {
+        return LOG_CONSTRUCTOR.apply(object);
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/logging/VoidLogger.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/logging/VoidLogger.java
new file mode 100644
index 0000000..53ff8a0
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/logging/VoidLogger.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.logging;
+
+import java.util.function.Supplier;
+
+/**
+ * {@link Logger} which drops all logs.
+ */
+public final class VoidLogger implements Logger {
+
+    public static final VoidLogger sInstance = new VoidLogger();
+
+    private VoidLogger() {
+
+    }
+
+    @Override
+    public void constructor(Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void constructor(Object... args) {
+
+    }
+
+    @Override
+    public void constructor(Object arg1, Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void constructor(Object arg1, Object arg2, Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void constructor(Object arg1, Object arg2, Object arg3, Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void constructor(Object arg1, Object arg2, Object arg3, Object arg4, Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void constructor(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+            Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void constructor(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+            Object arg6, Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void constructor(Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+            Object arg6, Object arg7, Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void method(String name, Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void method(String name, Object arg1, Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void method(String name, Object arg1, Object arg2, Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void method(String name, Object arg1, Object arg2, Object arg3, Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void method(String name, Object arg1, Object arg2, Object arg3, Object arg4,
+            Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+            Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+            Object arg6, Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public void method(String name, Object arg1, Object arg2, Object arg3, Object arg4, Object arg5,
+            Object arg6, Object arg7, Runnable method) {
+        method.run();
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name,
+            RunnableThrows<T> method) throws T {
+        method.run();
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            RunnableThrows<T> method) throws T {
+        method.run();
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, RunnableThrows<T> method) throws T {
+        method.run();
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, RunnableThrows<T> method) throws T {
+        method.run();
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, RunnableThrows<T> method) throws T {
+        method.run();
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, Object arg5, RunnableThrows<T> method) throws T {
+        method.run();
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, Object arg5, Object arg6,
+            RunnableThrows<T> method) throws T {
+        method.run();
+    }
+
+    @Override
+    public <T extends Throwable> void method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+            RunnableThrows<T> method) throws T {
+        method.run();
+    }
+
+    @Override
+    public <R> R method(String name, Supplier<R> method) {
+        return method.get();
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Supplier<R> method) {
+        return method.get();
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Object arg2, Supplier<R> method) {
+        return method.get();
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Object arg2, Object arg3, Supplier<R> method) {
+        return method.get();
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Object arg2, Object arg3, Object arg4,
+            Supplier<R> method) {
+        return method.get();
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Object arg2, Object arg3, Object arg4,
+            Object arg5, Supplier<R> method) {
+        return method.get();
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Object arg2, Object arg3, Object arg4,
+            Object arg5, Object arg6, Supplier<R> method) {
+        return method.get();
+    }
+
+    @Override
+    public <R> R method(String name, Object arg1, Object arg2, Object arg3, Object arg4,
+            Object arg5, Object arg6, Object arg7, Supplier<R> method) {
+        return method.get();
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name,
+            SupplierThrows<R, T> method) throws T {
+        return method.get();
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            SupplierThrows<R, T> method) throws T {
+        return method.get();
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, SupplierThrows<R, T> method) throws T {
+        return method.get();
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, SupplierThrows<R, T> method) throws T {
+        return method.get();
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, SupplierThrows<R, T> method) throws T {
+        return method.get();
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, Object arg5, SupplierThrows<R, T> method)
+            throws T {
+        return method.get();
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, Object arg5, Object arg6,
+            SupplierThrows<R, T> method) throws T {
+        return method.get();
+    }
+
+    @Override
+    public <T extends Throwable, R> R method(Class<T> throwableClass, String name, Object arg1,
+            Object arg2, Object arg3, Object arg4, Object arg5, Object arg6, Object arg7,
+            SupplierThrows<R, T> method) throws T {
+        return method.get();
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/packages/Package.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/packages/Package.java
index 3b76374..b386646 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/packages/Package.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/packages/Package.java
@@ -26,11 +26,13 @@
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS;
 import static android.content.pm.PermissionInfo.PROTECTION_FLAG_DEVELOPMENT;
+import static android.os.Build.VERSION_CODES.P;
 import static android.os.Build.VERSION_CODES.S;
 import static android.os.Process.myUid;
 
 import static com.google.common.truth.Truth.assertWithMessage;
 
+import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.content.Intent;
 import android.content.IntentFilter;
@@ -79,6 +81,13 @@
 
     private final String mPackageName;
 
+    /**
+     * Constructs a new {@link Package} from the provided {@code packageName}.
+     */
+    public static Package of(String packageName) {
+        return new Package(packageName);
+    }
+
     Package(String packageName) {
         mPackageName = packageName;
     }
@@ -393,7 +402,7 @@
         }
     }
 
-    private void checkCanGrantOrRevokePermission(UserReference user, String permission) {
+    void checkCanGrantOrRevokePermission(UserReference user, String permission) {
         if (!installedOnUser(user)) {
             throw new NeneException("Attempting to grant " + permission + " to " + this
                     + " on user " + user + ". But it is not installed");
@@ -781,18 +790,18 @@
         return Packages.parseDumpsys().mPackages.containsKey(mPackageName);
     }
 
+    /** Get the targetSdkVersion for the package. */
+    @Experimental
+    public int targetSdkVersion() {
+        return applicationInfoFromAnyUserOrError(/* flags= */ 0).targetSdkVersion;
+    }
+
     /**
      * {@code true} if the package is installed in the device's system image.
      */
     @Experimental
     public boolean hasSystemFlag() {
-        ApplicationInfo appInfo = applicationInfoFromAnyUser(/* flags= */ 0);
-
-        if (appInfo == null) {
-            throw new NeneException("Package not installed: " + this);
-        }
-
-        return (appInfo.flags & FLAG_SYSTEM) > 0;
+        return (applicationInfoFromAnyUserOrError(/* flags= */ 0).flags & FLAG_SYSTEM) > 0;
     }
 
     @Experimental
@@ -800,6 +809,22 @@
         return sPackageManager.isInstantApp(mPackageName);
     }
 
+    /** Get the AppComponentFactory for the package. */
+    @Experimental
+    @Nullable
+    @TargetApi(P)
+    public String appComponentFactory() {
+        return applicationInfoFromAnyUserOrError(/* flags= */ 0).appComponentFactory;
+    }
+
+    private ApplicationInfo applicationInfoFromAnyUserOrError(int flags) {
+        ApplicationInfo appInfo = applicationInfoFromAnyUser(flags);
+        if (appInfo == null) {
+            throw new NeneException("Package not installed: " + this);
+        }
+        return appInfo;
+    }
+
     /**
      * Gets the shared user id of the package.
      */
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/packages/ProcessReference.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/packages/ProcessReference.java
index 5a42583..f499ac6 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/packages/ProcessReference.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/packages/ProcessReference.java
@@ -17,7 +17,11 @@
 package com.android.bedstead.nene.packages;
 
 import com.android.bedstead.nene.annotations.Experimental;
+import com.android.bedstead.nene.exceptions.NeneException;
 import com.android.bedstead.nene.users.UserReference;
+import com.android.bedstead.nene.utils.Poll;
+
+import java.util.Set;
 
 @Experimental
 public final class ProcessReference {
@@ -65,7 +69,39 @@
         return mUser;
     }
 
-    // TODO(b/203758521): Add support for killing processes
+    /**
+     * Kill this process.
+     */
+    public void kill() {
+        // Removing a permission kills the process, so we can grant then remove an arbitrary
+        // permission
+        String permission = getGrantablePermission();
+
+        if (mPackage.hasPermission(mUser, permission)) {
+            mPackage.denyPermission(mUser, permission);
+            mPackage.grantPermission(mUser, permission);
+        } else {
+            mPackage.grantPermission(mUser, permission);
+            mPackage.denyPermission(mUser, permission);
+        }
+
+        Poll.forValue("process", () -> mPackage.runningProcess(mUser))
+                .toBeNull()
+                .await();
+    }
+
+    private String getGrantablePermission() {
+        Set<String> permissions = mPackage.requestedPermissions();
+        for (String permission : permissions) {
+            try {
+                mPackage.checkCanGrantOrRevokePermission(mUser, permission);
+                return permission;
+            } catch (NeneException e) {
+                // If we can't grant it we'll check the next one
+            }
+        }
+        throw new NeneException("No grantable permission for package " + mPackage);
+    }
 
     @Override
     public int hashCode() {
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/PermissionContextImpl.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/PermissionContextImpl.java
index 2336fd0..cdf7992 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/PermissionContextImpl.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/PermissionContextImpl.java
@@ -27,10 +27,12 @@
 /**
  * Default implementation of {@link PermissionContext}
  */
-public final class PermissionContextImpl implements PermissionContext {
+public final class PermissionContextImpl implements PermissionContextModifier {
     private final Permissions mPermissions;
     private final Set<String> mGrantedPermissions = new HashSet<>();
     private final Set<String> mDeniedPermissions = new HashSet<>();
+    private final Set<String> mGrantedAppOps = new HashSet<>();
+    private final Set<String> mDeniedAppOps = new HashSet<>();
 
     PermissionContextImpl(Permissions permissions) {
         mPermissions = permissions;
@@ -44,9 +46,18 @@
         return mDeniedPermissions;
     }
 
+    Set<String> grantedAppOps() {
+        return mGrantedAppOps;
+    }
+
+    Set<String> deniedAppOps() {
+        return mDeniedAppOps;
+    }
+
     /**
      * See {@link Permissions#withPermission(String...)}
      */
+    @Override
     public PermissionContextImpl withPermission(String... permissions) {
         for (String permission : permissions) {
             if (mDeniedPermissions.contains(permission)) {
@@ -66,20 +77,36 @@
     /**
      * See {@link Permissions#withPermissionOnVersion(int, String...)}
      */
+    @Override
     public PermissionContextImpl withPermissionOnVersion(int sdkVersion, String... permissions) {
-        if (Versions.meetsSdkVersionRequirements(sdkVersion, sdkVersion)) {
-            return withPermission(permissions);
-        }
-
-        return this;
+        return withPermissionOnVersionBetween(sdkVersion, sdkVersion, permissions);
     }
 
     /**
      * See {@link Permissions#withPermissionOnVersionAtLeast(int, String...)}
      */
+    @Override
     public PermissionContextImpl withPermissionOnVersionAtLeast(
             int sdkVersion, String... permissions) {
-        if (Versions.meetsMinimumSdkVersionRequirement(sdkVersion)) {
+        return withPermissionOnVersionBetween(sdkVersion, Versions.ANY, permissions);
+    }
+
+    /**
+     * See {@link Permissions#withPermissionOnVersionAtMost(int, String...)}
+     */
+    @Override
+    public PermissionContextImpl withPermissionOnVersionAtMost(
+            int sdkVersion, String... permissions) {
+        return withPermissionOnVersionBetween(Versions.ANY, sdkVersion, permissions);
+    }
+
+    /**
+     * See {@link Permissions#withPermissionOnVersionBetween(int, String...)}
+     */
+    @Override
+    public PermissionContextImpl withPermissionOnVersionBetween(
+            int minSdkVersion, int maxSdkVersion, String... permissions) {
+        if (Versions.meetsSdkVersionRequirements(minSdkVersion, maxSdkVersion)) {
             return withPermission(permissions);
         }
 
@@ -89,6 +116,7 @@
     /**
      * See {@link Permissions#withoutPermission(String...)}
      */
+    @Override
     public PermissionContextImpl withoutPermission(String... permissions) {
         for (String permission : permissions) {
             if (mGrantedPermissions.contains(permission)) {
@@ -110,6 +138,83 @@
         return this;
     }
 
+    /**
+     * See {@link Permissions#withAppOp(String...)}
+     */
+    @Override
+    public PermissionContextImpl withAppOp(String... appOps) {
+        for (String appOp : appOps) {
+            if (mDeniedAppOps.contains(appOp)) {
+                mPermissions.clearPermissions();
+                throw new NeneException(
+                        appOp + " cannot be required to be both granted and denied");
+            }
+        }
+
+        mGrantedAppOps.addAll(Arrays.asList(appOps));
+
+        mPermissions.applyPermissions();
+
+        return this;
+    }
+
+    /**
+     * See {@link Permissions#withAppOpOnVersion(int, String...)}
+     */
+    @Override
+    public PermissionContextImpl withAppOpOnVersion(int sdkVersion, String... appOps) {
+        return withAppOpOnVersionBetween(sdkVersion, sdkVersion, appOps);
+    }
+
+    /**
+     * See {@link Permissions#withAppOpOnVersionAtMost(int, String...)}
+     */
+    @Override
+    public PermissionContextImpl withAppOpOnVersionAtMost(int sdkVersion, String... appOps) {
+        return withAppOpOnVersionBetween(Versions.ANY, sdkVersion, appOps);
+    }
+
+    /**
+     * See {@link Permissions#withAppOpOnVersionAtLeast(int, String...)}
+     */
+    @Override
+    public PermissionContextImpl withAppOpOnVersionAtLeast(int sdkVersion, String... appOps) {
+        return withAppOpOnVersionBetween(sdkVersion, Versions.ANY, appOps);
+    }
+
+    /**
+     * See {@link Permissions#withAppOpOnVersionBetween(int, String...)}
+     */
+    @Override
+    public PermissionContextImpl withAppOpOnVersionBetween(
+            int minSdkVersion, int maxSdkVersion, String... appOps) {
+        if (Versions.meetsSdkVersionRequirements(minSdkVersion, maxSdkVersion)) {
+            return withAppOp(appOps);
+        }
+
+        return this;
+    }
+
+    /**
+     * See {@link Permissions#withoutAppOp(String...)}.
+     */
+    @Override
+    public PermissionContextImpl withoutAppOp(String... appOps) {
+        for (String appOp : appOps) {
+            if (mGrantedAppOps.contains(appOp)) {
+                mPermissions.clearPermissions();
+                throw new NeneException(
+                        appOp + " cannot be required to be both granted and denied");
+            }
+        }
+
+        mDeniedAppOps.addAll(Arrays.asList(appOps));
+
+        mPermissions.applyPermissions();
+
+        return this;
+    }
+
     @Override
     public void close() {
         Permissions.sInstance.undoPermission(this);
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/PermissionContextModifier.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/PermissionContextModifier.java
new file mode 100644
index 0000000..48a4a5b
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/PermissionContextModifier.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.permissions;
+
+/** Methods available by classes which modify permission contexts. */
+public interface PermissionContextModifier extends PermissionContext, PermissionsController {
+
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/Permissions.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/Permissions.java
index fa797bb..c120aa4 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/Permissions.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/Permissions.java
@@ -18,6 +18,9 @@
 
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 
+import static com.android.bedstead.nene.permissions.CommonPermissions.MANAGE_APP_OPS_MODES;
+
+import android.app.AppOpsManager;
 import android.app.UiAutomation;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -26,6 +29,7 @@
 import android.util.Log;
 
 import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.appops.AppOpsMode;
 import com.android.bedstead.nene.exceptions.NeneException;
 import com.android.bedstead.nene.packages.Package;
 import com.android.bedstead.nene.users.UserReference;
@@ -40,20 +44,17 @@
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
 
 /** Permission manager for tests. */
 public final class Permissions {
 
-    public static final String MANAGE_PROFILE_AND_DEVICE_OWNERS =
-            "android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS";
-    public static final String MANAGE_DEVICE_ADMINS = "android.permission.MANAGE_DEVICE_ADMINS";
-    public static final String NOTIFY_PENDING_SYSTEM_UPDATE =
-            "android.permission.NOTIFY_PENDING_SYSTEM_UPDATE";
-    public static final String MANAGE_APP_OPS_MODES = "android.permission.MANAGE_APP_OPS_MODES";
     public static final AtomicBoolean sIgnorePermissions = new AtomicBoolean(false);
     private static final String LOG_TAG = "Permissions";
     private static final Context sContext = TestApis.context().instrumentedContext();
     private static final PackageManager sPackageManager = sContext.getPackageManager();
+    private static final AppOpsManager sAppOpsManager =
+            TestApis.context().instrumentedContext().getSystemService(AppOpsManager.class);
     private static final Package sInstrumentedPackage =
             TestApis.packages().find(sContext.getPackageName());
     private static final UserReference sUser = TestApis.users().instrumented();
@@ -152,6 +153,52 @@
 
     /**
      * Enter a {@link PermissionContext} where the given permissions are granted only when running
+     * on the given version or below.
+     *
+     * <p>If the permissions cannot be granted, and are not already granted, an exception will be
+     * thrown.
+     *
+     * <p>If the version does not match, the permission context will not change.
+     */
+    public PermissionContextImpl withPermissionOnVersionAtMost(
+            int maxSdkVersion, String... permissions) {
+        if (mPermissionContexts.isEmpty()) {
+            recordExistingPermissions();
+        }
+
+        PermissionContextImpl permissionContext = new PermissionContextImpl(this);
+        mPermissionContexts.add(permissionContext);
+
+        permissionContext.withPermissionOnVersionAtMost(maxSdkVersion, permissions);
+
+        return permissionContext;
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given permissions are granted only when running
+     * on the range of versions given (inclusive).
+     *
+     * <p>If the permissions cannot be granted, and are not already granted, an exception will be
+     * thrown.
+     *
+     * <p>If the version does not match, the permission context will not change.
+     */
+    public PermissionContextImpl withPermissionOnVersionBetween(
+            int minSdkVersion, int maxSdkVersion, String... permissions) {
+        if (mPermissionContexts.isEmpty()) {
+            recordExistingPermissions();
+        }
+
+        PermissionContextImpl permissionContext = new PermissionContextImpl(this);
+        mPermissionContexts.add(permissionContext);
+
+        permissionContext.withPermissionOnVersionBetween(minSdkVersion, maxSdkVersion, permissions);
+
+        return permissionContext;
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given permissions are granted only when running
      * on the given version.
      *
      * <p>If the permissions cannot be granted, and are not already granted, an exception will be
@@ -173,6 +220,150 @@
     }
 
     /**
+     * Enter a {@link PermissionContext} where the given appOps are granted.
+     *
+     * <p>If the appOps cannot be granted, and are not already granted, an exception will be
+     * thrown.
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = mTestApis.permissions().withAppOps(APP_OP1, APP_OP2) {
+     * // Code which needs the app ops goes here
+     * }
+     * }
+     */
+    public PermissionContextImpl withAppOp(String... appOps) {
+        if (mPermissionContexts.isEmpty()) {
+            recordExistingPermissions();
+        }
+
+        PermissionContextImpl permissionContext = new PermissionContextImpl(this);
+        mPermissionContexts.add(permissionContext);
+
+        permissionContext.withAppOp(appOps);
+
+        return permissionContext;
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given appOps are granted.
+     *
+     * <p>If the appOps cannot be granted, and are not already granted, an exception will be
+     * thrown.
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = mTestApis.permissions().withAppOps(APP_OP1, APP_OP2) {
+     * // Code which needs the app ops goes here
+     * }
+     * }
+     *
+     * <p>If the version does not match the appOp will not be granted.
+     */
+    public PermissionContextImpl withAppOpOnVersion(int sdkVersion, String... appOps) {
+        if (mPermissionContexts.isEmpty()) {
+            recordExistingPermissions();
+        }
+
+        PermissionContextImpl permissionContext = new PermissionContextImpl(this);
+        mPermissionContexts.add(permissionContext);
+
+        permissionContext.withAppOpOnVersion(sdkVersion, appOps);
+
+        return permissionContext;
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given appOps are granted.
+     *
+     * <p>If the appOps cannot be granted, and are not already granted, an exception will be
+     * thrown.
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = mTestApis.permissions().withAppOps(APP_OP1, APP_OP2) {
+     * // Code which needs the app ops goes here
+     * }
+     * }
+     *
+     * <p>If the version does not match the appOp will not be granted.
+     */
+    public PermissionContextImpl withAppOpOnVersionAtLeast(int sdkVersion, String... appOps) {
+        if (mPermissionContexts.isEmpty()) {
+            recordExistingPermissions();
+        }
+
+        PermissionContextImpl permissionContext = new PermissionContextImpl(this);
+        mPermissionContexts.add(permissionContext);
+
+        permissionContext.withAppOpOnVersionAtLeast(sdkVersion, appOps);
+
+        return permissionContext;
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given appOps are granted.
+     *
+     * <p>If the appOps cannot be granted, and are not already granted, an exception will be
+     * thrown.
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = mTestApis.permissions().withAppOps(APP_OP1, APP_OP2) {
+     * // Code which needs the app ops goes here
+     * }
+     * }
+     *
+     * <p>If the version does not match the appOp will not be granted.
+     */
+    public PermissionContextImpl withAppOpOnVersionAtMost(int sdkVersion, String... appOps) {
+        if (mPermissionContexts.isEmpty()) {
+            recordExistingPermissions();
+        }
+
+        PermissionContextImpl permissionContext = new PermissionContextImpl(this);
+        mPermissionContexts.add(permissionContext);
+
+        permissionContext.withAppOpOnVersionAtMost(sdkVersion, appOps);
+
+        return permissionContext;
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given appOps are granted.
+     *
+     * <p>If the appOps cannot be granted, and are not already granted, an exception will be
+     * thrown.
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = mTestApis.permissions().withAppOps(APP_OP1, APP_OP2) {
+     * // Code which needs the app ops goes here
+     * }
+     * }
+     *
+     * <p>If the version does not match the appOp will not be granted.
+     */
+    public PermissionContextImpl withAppOpOnVersionBetween(
+            int minSdkVersion, int maxSdkVersion, String... appOps) {
+        if (mPermissionContexts.isEmpty()) {
+            recordExistingPermissions();
+        }
+
+        PermissionContextImpl permissionContext = new PermissionContextImpl(this);
+        mPermissionContexts.add(permissionContext);
+
+        permissionContext.withAppOpOnVersionBetween(minSdkVersion, maxSdkVersion, appOps);
+
+        return permissionContext;
+    }
+
+    /**
      * Enter a {@link PermissionContext} where the given permissions are not granted.
      *
      * <p>If the permissions cannot be denied, and are not already denied, an exception will be
@@ -183,7 +374,7 @@
      *
      * try (PermissionContext p =
      * mTestApis.permissions().withoutPermission(PERMISSION1, PERMISSION2) {
-     * // Code which needs the permissions goes here
+     * // Code which needs the permissions to be denied goes here
      * }
      */
     public PermissionContextImpl withoutPermission(String... permissions) {
@@ -199,6 +390,34 @@
         return permissionContext;
     }
 
+    /**
+     * Enter a {@link PermissionContext} where the given appOps are not granted.
+     *
+     * <p>If the appOps cannot be denied, and are not already denied, an exception will be
+     * thrown.
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p =
+     * mTestApis.permissions().withoutappOp(APP_OP1, APP_OP2) {
+     * // Code which needs the appOp to be denied goes here
+     * }
+     * }
+     */
+    public PermissionContextImpl withoutAppOp(String... appOps) {
+        if (mPermissionContexts.isEmpty()) {
+            recordExistingPermissions();
+        }
+
+        PermissionContextImpl permissionContext = new PermissionContextImpl(this);
+        mPermissionContexts.add(permissionContext);
+
+        permissionContext.withoutAppOp(appOps);
+
+        return permissionContext;
+    }
+
     void undoPermission(PermissionContext permissionContext) {
         mPermissionContexts.remove(permissionContext);
         applyPermissions();
@@ -228,6 +447,8 @@
         }
         Set<String> grantedPermissions = new HashSet<>();
         Set<String> deniedPermissions = new HashSet<>();
+        Set<String> grantedAppOps = new HashSet<>();
+        Set<String> deniedAppOps = new HashSet<>();
 
         synchronized (mPermissionContexts) {
             for (PermissionContextImpl permissionContext : mPermissionContexts) {
@@ -240,6 +461,16 @@
                     grantedPermissions.remove(permission);
                     deniedPermissions.add(permission);
                 }
+
+                for (String appOp : permissionContext.grantedAppOps()) {
+                    grantedAppOps.add(appOp);
+                    deniedAppOps.remove(appOp);
+                }
+
+                for (String appOp : permissionContext.deniedAppOps()) {
+                    grantedAppOps.remove(appOp);
+                    deniedAppOps.add(appOp);
+                }
             }
         }
 
@@ -250,7 +481,7 @@
 
         Set<String> adoptedShellPermissions = new HashSet<>();
         for (String permission : grantedPermissions) {
-            checkCanGrantOnAllSupportedVersions(permission, sUser);
+            checkCanGrantOnAllSupportedVersions(permission);
 
             Log.d(LOG_TAG, "Trying to grant " + permission);
             if (sInstrumentedPackage.hasPermission(sUser, permission)) {
@@ -269,7 +500,7 @@
                 removePermissionContextsUntilCanApply();
 
                 throwPermissionException("PermissionContext requires granting "
-                        + permission + " but cannot.", permission, sUser);
+                        + permission + " but cannot.", permission);
             }
         }
 
@@ -284,10 +515,36 @@
             } else { // We can't deny a permission to ourselves
                 removePermissionContextsUntilCanApply();
                 throwPermissionException("PermissionContext requires denying "
-                        + permission + " but cannot.", permission, sUser);
+                        + permission + " but cannot.", permission);
             }
         }
 
+        Package appOpPackage = adoptedShellPermissions.isEmpty()
+                ? sInstrumentedPackage : sShellPackage;
+
+        // Filter so we get just the appOps which require a state that they are not currently in
+        Set<String> filteredGrantedAppOps = grantedAppOps.stream()
+                .filter(o -> appOpPackage.appOps().get(o) != AppOpsMode.ALLOWED)
+                .collect(Collectors.toSet());
+        Set<String> filteredDeniedAppOps = deniedAppOps.stream()
+                .filter(o -> appOpPackage.appOps().get(o) != AppOpsMode.IGNORED)
+                .collect(Collectors.toSet());
+
+        if (!filteredGrantedAppOps.isEmpty() || !filteredDeniedAppOps.isEmpty()) {
+            // We need MANAGE_APP_OPS_MODES to change app op permissions - but don't want to
+            // infinite loop so won't use .appOps().set()
+            ShellCommandUtils.uiAutomation().adoptShellPermissionIdentity(MANAGE_APP_OPS_MODES);
+            for (String appOp : filteredGrantedAppOps) {
+                sAppOpsManager.setMode(appOp, appOpPackage.uid(sUser),
+                        appOpPackage.packageName(), AppOpsMode.ALLOWED.value());
+            }
+            for (String appOp : filteredDeniedAppOps) {
+                sAppOpsManager.setMode(appOp, appOpPackage.uid(sUser),
+                        appOpPackage.packageName(), AppOpsMode.IGNORED.value());
+            }
+            ShellCommandUtils.uiAutomation().dropShellPermissionIdentity();
+        }
+
         if (!adoptedShellPermissions.isEmpty()) {
             Log.d(LOG_TAG, "Adopting " + adoptedShellPermissions);
             ShellCommandUtils.uiAutomation().adoptShellPermissionIdentity(
@@ -296,7 +553,7 @@
     }
 
     private void checkCanGrantOnAllSupportedVersions(
-            String permission, UserReference user) {
+            String permission) {
         if (sCheckedGrantPermissions.contains(permission)) {
             return;
         }
@@ -310,7 +567,7 @@
                             + "possible add it to"
                             + "com.android.bedstead.nene.permissions"
                             + ".Permissions#EXEMPT_SHELL_PERMISSIONS",
-                    permission, user);
+                    permission);
         }
 
         sCheckedGrantPermissions.add(permission);
@@ -325,8 +582,11 @@
         sCheckedDenyPermissions.add(permission);
     }
 
-    private void throwPermissionException(
-            String message, String permission, UserReference user) {
+    /**
+     * Throw an exception including permission contextual information.
+     */
+    public void throwPermissionException(
+            String message, String permission) {
         String protectionLevel = "Permission not found";
         try {
             protectionLevel = Integer.toString(sPackageManager.getPermissionInfo(
@@ -335,7 +595,7 @@
             Log.e(LOG_TAG, "Permission not found", e);
         }
 
-        throw new NeneException(message + "\n\nRunning On User: " + user
+        throw new NeneException(message + "\n\nRunning On User: " + sUser
                 + "\nPermission: " + permission
                 + "\nPermission protection level: " + protectionLevel
                 + "\nPermission state: " + sContext.checkSelfPermission(permission)
@@ -354,6 +614,13 @@
     }
 
     /**
+     * Returns all of the permissions which can be adopted.
+     */
+    public Set<String> adoptablePermissions() {
+        return mShellPermissions;
+    }
+
+    /**
      * Returns all of the permissions which are currently able to be used.
      */
     public Set<String> usablePermissions() {
@@ -411,4 +678,20 @@
 
         mExistingPermissions = null;
     }
+
+    /** True if the current process has the given permission. */
+    public boolean hasPermission(String permission) {
+        return sContext.checkSelfPermission(permission) == PERMISSION_GRANTED;
+    }
+
+    /** True if the current process has the given appOp set to ALLOWED. */
+    public boolean hasAppOpAllowed(String appOp) {
+        Package appOpPackage = sInstrumentedPackage;
+        if (!ShellCommandUtils.uiAutomation().getAdoptedShellPermissions().isEmpty()) {
+            // We care about the shell package
+            appOpPackage = sShellPackage;
+        }
+
+        return appOpPackage.appOps().get(appOp) == AppOpsMode.ALLOWED;
+    }
 }
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/PermissionsController.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/PermissionsController.java
new file mode 100644
index 0000000..fd08a3d
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/permissions/PermissionsController.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.permissions;
+
+/** Methods available to classes which maintain permission contexts. */
+public interface PermissionsController {
+    /** Enter a permission context with the given permissions. */
+    PermissionContext withPermission(String... permissions);
+    /** Enter a permission context with the given permissions only when on a matching version. */
+    PermissionContext withPermissionOnVersion(int sdkVersion, String... permissions);
+    /** Enter a permission context with the given permissions only when on a matching version. */
+    PermissionContext withPermissionOnVersionAtLeast(int minSdkVersion, String... permissions);
+    /** Enter a permission context with the given permissions only when on a matching version. */
+    PermissionContext withPermissionOnVersionAtMost(int maxSdkVersion, String... permissions);
+    /** Enter a permission context with the given permissions only when on a matching version. */
+    PermissionContext withPermissionOnVersionBetween(
+            int minSdkVersion, int maxSdkVersion, String... permissions);
+    /** Enter a permission context without the given permissions. */
+    PermissionContext withoutPermission(String... permissions);
+
+    /** Enter a permission context with the given app op. */
+    PermissionContext withAppOp(String... appOps);
+    /** Enter a permission context with the given app op only when on a matching version. */
+    PermissionContext withAppOpOnVersion(int sdkVersion, String... appOps);
+    /** Enter a permission context with the given app op only when on a matching version. */
+    PermissionContext withAppOpOnVersionAtLeast(int minSdkVersion, String... appOps);
+    /** Enter a permission context with the given app op only when on a matching version. */
+    PermissionContext withAppOpOnVersionAtMost(int maxSdkVersion, String... appOps);
+    /** Enter a permission context with the given app op only when on a matching version. */
+    PermissionContext withAppOpOnVersionBetween(
+            int minSdkVersion, int maxSdkVersion, String... appOps);
+    /** Enter a permission context without the given app op. */
+    PermissionContext withoutAppOp(String... appOps);
+}
+
+
+
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/roles/Roles.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/roles/Roles.java
new file mode 100644
index 0000000..0126e86
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/roles/Roles.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.roles;
+
+import static com.android.bedstead.nene.permissions.CommonPermissions.BYPASS_ROLE_QUALIFICATION;
+import static com.android.bedstead.nene.utils.Versions.T;
+
+import android.annotation.TargetApi;
+import android.app.role.RoleManager;
+import android.content.Context;
+import android.os.Build;
+
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.annotations.Experimental;
+import com.android.bedstead.nene.permissions.PermissionContext;
+import com.android.bedstead.nene.utils.Versions;
+
+/** Test APIs related to roles. */
+@TargetApi(Build.VERSION_CODES.TIRAMISU)
+public class Roles {
+    public static final Roles sInstance = new Roles();
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+
+    private Roles() {}
+
+    /**
+     * @see RoleManager#setBypassingRoleQualification(boolean)
+     */
+    @Experimental
+    public void setBypassingRoleQualification(boolean bypassingRoleQualification) {
+        if (!Versions.meetsMinimumSdkVersionRequirement(T)) {
+            return;
+        }
+        try (PermissionContext p = TestApis.permissions().withPermission(
+                BYPASS_ROLE_QUALIFICATION)) {
+            sContext.getSystemService(RoleManager.class)
+                    .setBypassingRoleQualification(bypassingRoleQualification);
+        }
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/settings/SecureSettings.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/settings/SecureSettings.java
index b33b402..b1c5891 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/settings/SecureSettings.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/settings/SecureSettings.java
@@ -175,6 +175,138 @@
     }
 
     /**
+     * See {@link Settings.Secure#putString(ContentResolver, String, String)}
+     */
+    @RequiresApi(Build.VERSION_CODES.S)
+    public void putString(ContentResolver contentResolver, String key, String value) {
+        Versions.requireMinimumVersion(Build.VERSION_CODES.S);
+        try (PermissionContext p = sTestApis.permissions().withPermission(
+                INTERACT_ACROSS_USERS_FULL, WRITE_SECURE_SETTINGS)) {
+            Settings.Secure.putString(contentResolver, key, value);
+        }
+    }
+
+    /**
+     * Put String to secure settings for the given {@link UserReference}.
+     *
+     * <p>If the user is not the instrumented user, this will only succeed when running on Android S
+     * and above.
+     *
+     * <p>See {@link #putString(ContentResolver, String, String)}
+     */
+    @SuppressLint("NewApi")
+    public void putString(UserReference user, String key, String value) {
+        if (user.equals(sTestApis.users().instrumented())) {
+            putString(key, value);
+            return;
+        }
+
+        putString(sTestApis.context().androidContextAsUser(user).getContentResolver(), key, value);
+    }
+
+    /**
+     * Put String to secure settings for the instrumented user.
+     *
+     * <p>See {@link #putString(ContentResolver, String, String)}
+     */
+    public void putString(String key, String value) {
+        try (PermissionContext p = sTestApis.permissions().withPermission(
+                WRITE_SECURE_SETTINGS)) {
+            Settings.Secure.putString(
+                    sTestApis.context().instrumentedContext().getContentResolver(), key, value);
+        }
+    }
+
+    /**
+     * See {@link Settings.Secure#getString(ContentResolver, String)}
+     */
+    @RequiresApi(Build.VERSION_CODES.S)
+    public String getString(ContentResolver contentResolver, String key) {
+        Versions.requireMinimumVersion(Build.VERSION_CODES.S);
+        try (PermissionContext p =
+                     sTestApis.permissions().withPermission(INTERACT_ACROSS_USERS_FULL)) {
+            return getStringInner(contentResolver, key);
+        }
+    }
+
+    /**
+     * See {@link Settings.Secure#getString(ContentResolver, String)}.
+     *
+     * <p>If the value is null, the {@code defaultValue} will be returned.
+     */
+    @RequiresApi(Build.VERSION_CODES.S)
+    public String getString(ContentResolver contentResolver, String key, String defaultValue) {
+        Versions.requireMinimumVersion(Build.VERSION_CODES.S);
+        try (PermissionContext p =
+                     sTestApis.permissions().withPermission(INTERACT_ACROSS_USERS_FULL)) {
+            return getStringInner(contentResolver, key, defaultValue);
+        }
+    }
+
+    private String getStringInner(ContentResolver contentResolver, String key) {
+        return Settings.Secure.getString(contentResolver, key);
+    }
+
+    private String getStringInner(
+            ContentResolver contentResolver, String key, String defaultValue) {
+        String s = getStringInner(contentResolver, key);
+        return s == null ? defaultValue : s;
+    }
+
+    /**
+     * Get String from secure settings for the given {@link UserReference}.
+     *
+     * <p>If the user is not the instrumented user, this will only succeed when running on Android S
+     * and above.
+     *
+     * <p>See {@link #getString(ContentResolver, String)}
+     */
+    @SuppressLint("NewApi")
+    public String getString(UserReference user, String key) {
+        if (user.equals(sTestApis.users().instrumented())) {
+            return getString(key);
+        }
+        return getString(sTestApis.context().androidContextAsUser(user).getContentResolver(), key);
+    }
+
+    /**
+     * Get String from secure settings for the given {@link UserReference}, or the default value.
+     *
+     * <p>If the user is not the instrumented user, this will only succeed when running on Android S
+     * and above.
+     *
+     * <p>See {@link #getString(ContentResolver, String, String)}
+     */
+    @SuppressLint("NewApi")
+    public String getString(UserReference user, String key, String defaultValue) {
+        if (user.equals(sTestApis.users().instrumented())) {
+            return getString(key, defaultValue);
+        }
+        return getString(
+                sTestApis.context().androidContextAsUser(user).getContentResolver(),
+                key, defaultValue);
+    }
+
+    /**
+     * Get String from secure settings for the instrumented user.
+     *
+     * <p>See {@link #getString(ContentResolver, String)}
+     */
+    public String getString(String key) {
+        return getStringInner(sTestApis.context().instrumentedContext().getContentResolver(), key);
+    }
+
+    /**
+     * Get String from secure settings for the instrumented user, or the default value.
+     *
+     * <p>See {@link #getString(ContentResolver, String)}
+     */
+    public String getString(String key, String defaultValue) {
+        return getStringInner(
+                sTestApis.context().instrumentedContext().getContentResolver(), key, defaultValue);
+    }
+
+    /**
      * Reset all secure settings set by this package.
      *
      * See {@link Settings.Secure#resetToDefaults(ContentResolver, String)}.
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/users/UserBuilder.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/users/UserBuilder.java
index 31e2685..c10efed 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/users/UserBuilder.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/users/UserBuilder.java
@@ -25,6 +25,7 @@
 import androidx.annotation.CheckResult;
 import androidx.annotation.Nullable;
 
+import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.exceptions.AdbException;
 import com.android.bedstead.nene.exceptions.NeneException;
 import com.android.bedstead.nene.utils.ShellCommand;
@@ -138,7 +139,7 @@
                     commandBuilder.validate(ShellCommandUtils::startsWithSuccess)
                             .executeAndParseOutput(
                                     (output) -> Integer.parseInt(output.split("id ")[1].trim()));
-            return new UserReference(userId);
+            return TestApis.users().find(userId);
         } catch (AdbException e) {
             throw new NeneException("Could not create user " + this, e);
         }
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/users/UserReference.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/users/UserReference.java
index aa9343f..2faed73 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/users/UserReference.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/users/UserReference.java
@@ -19,11 +19,19 @@
 import static android.Manifest.permission.CREATE_USERS;
 import static android.Manifest.permission.INTERACT_ACROSS_USERS;
 import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
+import static android.content.Intent.ACTION_MANAGED_PROFILE_AVAILABLE;
+import static android.content.Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE;
+import static android.os.Build.VERSION_CODES.P;
 import static android.os.Build.VERSION_CODES.R;
 import static android.os.Build.VERSION_CODES.S;
 
+import static com.android.bedstead.nene.permissions.CommonPermissions.MANAGE_PROFILE_AND_DEVICE_OWNERS;
+import static com.android.bedstead.nene.permissions.CommonPermissions.MODIFY_QUIET_MODE;
 import static com.android.bedstead.nene.users.Users.users;
 
+import android.annotation.TargetApi;
+import android.app.KeyguardManager;
+import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 import android.content.pm.UserInfo;
 import android.os.UserHandle;
@@ -33,6 +41,7 @@
 import androidx.annotation.Nullable;
 
 import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.annotations.Experimental;
 import com.android.bedstead.nene.exceptions.AdbException;
 import com.android.bedstead.nene.exceptions.NeneException;
 import com.android.bedstead.nene.permissions.PermissionContext;
@@ -60,6 +69,8 @@
 
     private static final String LOG_TAG = "UserReference";
 
+    private static final String USER_SETUP_COMPLETE_KEY = "user_setup_complete";
+
     private final int mId;
 
     private final UserManager mUserManager;
@@ -70,6 +81,14 @@
     private Boolean mIsPrimary;
     private boolean mParentCached = false;
     private UserReference mParent;
+    private @Nullable String mPassword;
+
+    /**
+     * Returns a {@link UserReference} equivalent to the passed {@code userHandle}.
+     */
+    public static UserReference of(UserHandle userHandle) {
+        return TestApis.users().find(userHandle.getIdentifier());
+    }
 
     UserReference(int id) {
         mId = id;
@@ -255,13 +274,16 @@
                             .getSystemService(UserManager.class)
                             .getUserName();
                 }
-                if (mName.equals("")) {
+                if (mName == null || mName.equals("")) {
                     if (!exists()) {
                         mName = null;
                         throw new NeneException("User does not exist " + this);
                     }
                 }
             }
+            if (mName == null) {
+                mName = "";
+            }
         }
 
         return mName;
@@ -371,6 +393,140 @@
         return users().anyMatch(ui -> ui.id == id());
     }
 
+    /**
+     * Sets the value of {@code user_setup_complete} in secure settings to {@code complete}.
+     */
+    @Experimental
+    public void setSetupComplete(boolean complete) {
+        if (!Versions.meetsMinimumSdkVersionRequirement(S)) {
+            return;
+        }
+        DevicePolicyManager devicePolicyManager =
+                TestApis.context().androidContextAsUser(this)
+                        .getSystemService(DevicePolicyManager.class);
+        TestApis.settings().secure().putInt(
+                /* user= */ this, USER_SETUP_COMPLETE_KEY, complete ? 1 : 0);
+        try (PermissionContext p =
+                     TestApis.permissions().withPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)) {
+            devicePolicyManager.forceUpdateUserSetupComplete(id());
+        }
+    }
+
+    /**
+     * Gets the value of {@code user_setup_complete} from secure settings.
+     */
+    @Experimental
+    public boolean getSetupComplete() {
+        try (PermissionContext p = TestApis.permissions().withPermission(CREATE_USERS)) {
+            return TestApis.settings().secure()
+                    .getInt(/*user= */ this, USER_SETUP_COMPLETE_KEY, /* def= */ 0) == 1;
+        }
+    }
+
+    /**
+     * True if the user has a password.
+     */
+    public boolean hasPassword() {
+        return TestApis.context().androidContextAsUser(this)
+                .getSystemService(KeyguardManager.class).isDeviceSecure();
+    }
+
+    /**
+     * Set a password for the user.
+     */
+    public void setPassword(String password) {
+        try {
+            ShellCommand.builder("cmd lock_settings")
+                    .addOperand("set-password")
+                    .addOperand(password)
+                    .addOption("--user", mId)
+                    .validate(s -> s.startsWith("Password set to "))
+                    .execute();
+        } catch (AdbException e) {
+            throw new NeneException("Error setting password", e);
+        }
+        mPassword = password;
+    }
+
+    /**
+     * Clear the password for the user, using the password that was last set using Nene.
+     */
+    public void clearPassword() {
+        if (mPassword == null) {
+            throw new NeneException(
+                    "clearPassword() can only be called when setPassword was used to set the"
+                            + " password");
+        }
+        clearPassword(mPassword);
+    }
+
+    /**
+     * Clear the password for the user.
+     */
+    public void clearPassword(String password) {
+
+        try {
+            ShellCommand.builder("cmd lock_settings")
+                    .addOperand("clear")
+                    .addOption("--old", password)
+                    .addOption("--user", mId)
+                    .validate(s -> s.startsWith("Lock credential cleared"))
+                    .execute();
+        } catch (AdbException e) {
+            if (e.output().contains("user has no password")) {
+                // No password anyway, fine
+                mPassword = null;
+                return;
+            }
+            throw new NeneException("Error clearing password", e);
+        }
+
+        mPassword = null;
+    }
+
+    /**
+     * Returns the password for this user if that password was set using Nene.
+     *
+     *
+     * <p>If there is no password, or the password was not set using Nene, then this will
+     * return {@code null}.
+     */
+    public @Nullable String password() {
+        return mPassword;
+    }
+
+    /**
+     * Sets quiet mode to {@code enabled}. This will only work for managed profiles with no
+     * credentials set.
+     *
+     * @return {@code false} if user's credential is needed in order to turn off quiet mode,
+     *         {@code true} otherwise.
+     */
+    @TargetApi(P)
+    @Experimental
+    public boolean setQuietMode(boolean enabled) {
+        if (!Versions.meetsMinimumSdkVersionRequirement(P)) {
+            return false;
+        }
+        try (PermissionContext p = TestApis.permissions().withPermission(MODIFY_QUIET_MODE)) {
+            BlockingBroadcastReceiver r = BlockingBroadcastReceiver.create(
+                            TestApis.context().instrumentedContext(),
+                            enabled
+                                    ? ACTION_MANAGED_PROFILE_UNAVAILABLE
+                                    : ACTION_MANAGED_PROFILE_AVAILABLE)
+                    .register();
+            try {
+                if (mUserManager.requestQuietModeEnabled(enabled, userHandle())) {
+                    r.awaitForBroadcast();
+                    return true;
+                }
+                return false;
+            } finally {
+                r.unregisterQuietly();
+            }
+        }
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (!(obj instanceof UserReference)) {
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/users/Users.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/users/Users.java
index 8813a46..cf0891a 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/users/Users.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/users/Users.java
@@ -58,6 +58,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -73,6 +74,7 @@
     private final AdbUserParser mParser;
     private static final UserManager sUserManager =
             TestApis.context().instrumentedContext().getSystemService(UserManager.class);
+    private Map<Integer, UserReference> mUsers = new ConcurrentHashMap<>();
 
     public static final Users sInstance = new Users();
 
@@ -89,7 +91,7 @@
         }
 
         return users().map(
-                ui -> new UserReference(ui.id)
+                ui -> find(ui.id)
         ).collect(Collectors.toSet());
     }
 
@@ -152,12 +154,15 @@
 
     /** Get a {@link UserReference} by {@code id}. */
     public UserReference find(int id) {
-        return new UserReference(id);
+        if (!mUsers.containsKey(id)) {
+            mUsers.put(id, new UserReference(id));
+        }
+        return mUsers.get(id);
     }
 
     /** Get a {@link UserReference} by {@code userHandle}. */
     public UserReference find(UserHandle userHandle) {
-        return new UserReference(userHandle.getIdentifier());
+        return find(userHandle.getIdentifier());
     }
 
     /** Get all supported {@link UserType}s. */
@@ -328,7 +333,7 @@
             id++;
         }
 
-        return new UserReference(id);
+        return find(id);
     }
 
     private void fillCache() {
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Poll.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Poll.java
index d687ab9..6592463 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Poll.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Poll.java
@@ -60,7 +60,7 @@
     private static final String LOG_TAG = Poll.class.getName();
 
     private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(30);
-    private static final long SLEEP_MILLIS = 200;
+    private static final long SLEEP_MILLIS = 200; // TODO(b/223768343): Allow configuring
     private final String mValueName;
     private final ValueSupplier<E> mSupplier;
     private ValueChecker<E> mChecker = (v) -> true;
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Retry.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Retry.java
index cb44d26..8038795 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Retry.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Retry.java
@@ -16,6 +16,8 @@
 
 package com.android.bedstead.nene.utils;
 
+import android.util.Log;
+
 import com.android.bedstead.nene.exceptions.NeneException;
 import com.android.bedstead.nene.exceptions.PollValueFailedException;
 
@@ -35,6 +37,8 @@
  */
 public final class Retry<E> {
 
+    private static final String LOG_TAG = "Retry";
+
     private final Poll<E> mPoll;
 
     /**
@@ -86,6 +90,7 @@
             return mPoll.await();
         } catch (PollValueFailedException e) {
             // We know there will be an exception cause because we aren't validating the value
+            Log.e(LOG_TAG, "Failure in retries", e);
             throw e.getCause();
         }
     }
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/ShellCommand.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/ShellCommand.java
index 7818bcc..4c686d6 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/ShellCommand.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/ShellCommand.java
@@ -59,7 +59,6 @@
     }
 
     public static final class Builder {
-        private String mLinuxUser;
         private final StringBuilder commandBuilder;
         @Nullable
         private byte[] mStdInBytes = null;
@@ -129,9 +128,6 @@
          * Build the full command including all options and operands.
          */
         public String build() {
-            if (mLinuxUser != null) {
-                return "su " + mLinuxUser + " " + commandBuilder.toString();
-            }
             return commandBuilder.toString();
         }
 
diff --git a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Versions.java b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Versions.java
index 4feb6b6..8444cb2 100644
--- a/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Versions.java
+++ b/common/device-side/bedstead/nene/src/main/java/com/android/bedstead/nene/utils/Versions.java
@@ -16,10 +16,14 @@
 
 package com.android.bedstead.nene.utils;
 
+import static android.os.Build.VERSION.CODENAME;
+
 import static com.android.compatibility.common.util.VersionCodes.CUR_DEVELOPMENT;
 import static com.android.compatibility.common.util.VersionCodes.R;
 
 import android.os.Build;
+import android.os.Build.VERSION;
+import android.util.Log;
 
 import com.google.common.collect.ImmutableSet;
 
@@ -28,12 +32,15 @@
 /** SDK Version checks. */
 public final class Versions {
 
+    private static final String TAG = "Versions";
+
     public static final int T = CUR_DEVELOPMENT;
 
     /** Any version. */
     public static final int ANY = -1;
 
-    private static final ImmutableSet<String> DEVELOPMENT_CODENAMES = ImmutableSet.of("Sv2", "T");
+    private static final ImmutableSet<String> DEVELOPMENT_CODENAMES =
+            ImmutableSet.of("Sv2", "T", "Tiramisu");
 
     private Versions() {
 
@@ -90,20 +97,38 @@
     public static boolean meetsSdkVersionRequirements(int min, int max) {
         if (min != ANY) {
             if (min == Build.VERSION_CODES.CUR_DEVELOPMENT) {
-                if (!DEVELOPMENT_CODENAMES.contains(Build.VERSION.CODENAME)) {
+                if (!DEVELOPMENT_CODENAMES.contains(CODENAME)) {
+                    Log.e(TAG, "meetsSdkVersionRequirements(" + min + "," + max
+                            + "): false1 (Current: " + CODENAME + ", sdk: "
+                            + VERSION.SDK_INT + ")");
                     return false;
                 }
             } else if (min > Build.VERSION.SDK_INT) {
+                Log.e(TAG, "meetsSdkVersionRequirements(" + min + ","
+                        + max + "): false2 (Current: " + CODENAME + ", sdk: "
+                        + VERSION.SDK_INT + ")");
                 return false;
             }
         }
 
-        if (max != ANY
-                && max != Build.VERSION_CODES.CUR_DEVELOPMENT
-                && max < Build.VERSION.SDK_INT) {
-            return false;
+        if (max != ANY && max != Integer.MAX_VALUE
+                && max != Build.VERSION_CODES.CUR_DEVELOPMENT) {
+            if (max < Build.VERSION.SDK_INT) {
+                Log.e(TAG, "meetsSdkVersionRequirements(" + min + ","
+                        + max + "): false3 (Current: " + CODENAME + ", sdk: "
+                        + VERSION.SDK_INT + ")");
+                return false;
+            }
+            if (DEVELOPMENT_CODENAMES.contains(CODENAME)) {
+                Log.e(TAG, "meetsSdkVersionRequirements(" + min + ","
+                        + max + "): false4 (Current: " + CODENAME + ", sdk: "
+                        + VERSION.SDK_INT + ")");
+                return false;
+            }
         }
 
+        Log.e(TAG, "meetsSdkVersionRequirements(" + min + "," + max
+                + "): true (Current: " + CODENAME + ", sdk: " + VERSION.SDK_INT + ")");
         return true;
     }
 
@@ -112,6 +137,6 @@
      */
     public static boolean isDevelopmentVersion() {
         return Build.VERSION.SDK_INT == Build.VERSION_CODES.CUR_DEVELOPMENT
-                && DEVELOPMENT_CODENAMES.contains(Build.VERSION.CODENAME);
+                && DEVELOPMENT_CODENAMES.contains(CODENAME);
     }
 }
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/bluetooth/BluetoothTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/bluetooth/BluetoothTest.java
new file mode 100644
index 0000000..e1449ac
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/bluetooth/BluetoothTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2022 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.bedstead.nene.bluetooth;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureBluetoothDisabled;
+import com.android.bedstead.harrier.annotations.EnsureBluetoothEnabled;
+import com.android.bedstead.nene.TestApis;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public class BluetoothTest {
+
+    @ClassRule @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    @Test
+    @EnsureBluetoothDisabled
+    public void enable_bluetoothIsEnabled() throws Exception {
+        TestApis.bluetooth().setEnabled(true);
+
+        assertThat(TestApis.bluetooth().isEnabled()).isTrue();
+    }
+
+    @Test
+    @EnsureBluetoothEnabled
+    public void enable_bluetoothIsDisabled() {
+        TestApis.bluetooth().setEnabled(false);
+
+        assertThat(TestApis.bluetooth().isEnabled()).isFalse();
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/device/DeviceTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/device/DeviceTest.java
new file mode 100644
index 0000000..a660beb
--- /dev/null
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/device/DeviceTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2021 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.bedstead.nene.device;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.nene.TestApis;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public final class DeviceTest {
+
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    @Test
+    public void wakeUp_screenTurnsOn() {
+        TestApis.device().wakeUp();
+
+        assertThat(TestApis.device().isScreenOn()).isTrue();
+    }
+}
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/devicepolicy/DeviceOwnerTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/devicepolicy/DeviceOwnerTest.java
index 91932c1..f19cc7a 100644
--- a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/devicepolicy/DeviceOwnerTest.java
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/devicepolicy/DeviceOwnerTest.java
@@ -23,8 +23,11 @@
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDpc;
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.remotedpc.RemoteDpc;
+import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppInstance;
 
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -40,6 +43,14 @@
     public static DeviceState sDeviceState = new DeviceState();
 
     private static final ComponentName DPC_COMPONENT_NAME = RemoteDpc.DPC_COMPONENT_NAME;
+    private static final TestApp sNonTestOnlyDpc = sDeviceState.testApps().query()
+            .whereIsDeviceAdmin().isTrue()
+            .whereTestOnly().isFalse()
+            .get();
+    private static final ComponentName NON_TEST_ONLY_DPC_COMPONENT_NAME = new ComponentName(
+            sNonTestOnlyDpc.packageName(),
+            "com.android.bedstead.testapp.DeviceAdminTestApp.DeviceAdminReceiver"
+    );
 
     private DeviceOwner mDeviceOwner;
 
@@ -69,4 +80,18 @@
 
         assertThat(TestApis.devicePolicy().getDeviceOwner()).isNull();
     }
+
+
+    @Test
+    @EnsureHasNoDpc
+    public void remove_nonTestOnlyDpc_removesDeviceOwner() {
+        try (TestAppInstance dpc = sNonTestOnlyDpc.install()) {
+            DeviceOwner deviceOwner = TestApis.devicePolicy()
+                    .setDeviceOwner(NON_TEST_ONLY_DPC_COMPONENT_NAME);
+
+            deviceOwner.remove();
+
+            assertThat(TestApis.devicePolicy().getDeviceOwner()).isNull();
+        }
+    }
 }
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/devicepolicy/DevicePolicyTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/devicepolicy/DevicePolicyTest.java
index ad1c096..f34980e 100644
--- a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/devicepolicy/DevicePolicyTest.java
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/devicepolicy/DevicePolicyTest.java
@@ -40,7 +40,6 @@
 import com.android.bedstead.nene.users.UserType;
 import com.android.bedstead.nene.utils.Versions;
 import com.android.bedstead.testapp.TestApp;
-import com.android.bedstead.testapp.TestAppProvider;
 import com.android.eventlib.premade.EventLibDeviceAdminReceiver;
 
 import org.junit.ClassRule;
@@ -74,7 +73,7 @@
 
     @BeforeClass
     public static void setupClass() {
-        sTestApp = new TestAppProvider().query()
+        sTestApp = sDeviceState.testApps().query()
                 .wherePackageName().isEqualTo(DEVICE_ADMIN_TESTAPP_PACKAGE_NAME)
                 .get();
 
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/devicepolicy/ProfileOwnerTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/devicepolicy/ProfileOwnerTest.java
index 0bb85a0..9598e70 100644
--- a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/devicepolicy/ProfileOwnerTest.java
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/devicepolicy/ProfileOwnerTest.java
@@ -22,11 +22,16 @@
 
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureHasSecondaryUser;
+import com.android.bedstead.harrier.annotations.RequireRunNotOnSecondaryUser;
+import com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDpc;
 import com.android.bedstead.harrier.annotations.enterprise.EnsureHasProfileOwner;
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.users.UserReference;
 import com.android.bedstead.remotedpc.RemoteDpc;
 import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppInstance;
 
 import org.junit.Before;
 import org.junit.ClassRule;
@@ -37,47 +42,89 @@
 @RunWith(BedsteadJUnit4.class)
 public class ProfileOwnerTest {
 
-    private static final ComponentName DPC_COMPONENT_NAME = RemoteDpc.DPC_COMPONENT_NAME;
-    private static UserReference sProfile;
-    private static TestApp sTestApp;
-    private static DevicePolicyController sProfileOwner;
-
     @ClassRule @Rule
     public static final DeviceState sDeviceState = new DeviceState();
 
+    private static final ComponentName DPC_COMPONENT_NAME = RemoteDpc.DPC_COMPONENT_NAME;
+    private static final TestApp sNonTestOnlyDpc = sDeviceState.testApps().query()
+            .whereIsDeviceAdmin().isTrue()
+            .whereTestOnly().isFalse()
+            .get();
+    private static final ComponentName NON_TEST_ONLY_DPC_COMPONENT_NAME = new ComponentName(
+            sNonTestOnlyDpc.packageName(),
+            "com.android.bedstead.testapp.DeviceAdminTestApp.DeviceAdminReceiver"
+    );
+
+    private static UserReference sProfile;
+
     @Before
     public void setUp() {
         sProfile = TestApis.users().instrumented();
-        sTestApp = sDeviceState.dpc().testApp();
-        sProfileOwner = sDeviceState.profileOwner().devicePolicyController();
     }
 
     @Test
     @EnsureHasProfileOwner
     public void user_returnsUser() {
-        assertThat(sProfileOwner.user()).isEqualTo(sProfile);
+        assertThat(sDeviceState.profileOwner().devicePolicyController().user()).isEqualTo(sProfile);
     }
 
     @Test
     @EnsureHasProfileOwner
     public void pkg_returnsPackage() {
-        assertThat(sProfileOwner.pkg()).isEqualTo(sTestApp.pkg());
+        assertThat(sDeviceState.profileOwner().devicePolicyController().pkg()).isNotNull();
     }
 
     @Test
     @EnsureHasProfileOwner
     public void componentName_returnsComponentName() {
-        assertThat(sProfileOwner.componentName()).isEqualTo(DPC_COMPONENT_NAME);
+        assertThat(sDeviceState.profileOwner().devicePolicyController().componentName())
+                .isEqualTo(DPC_COMPONENT_NAME);
     }
 
     @Test
     @EnsureHasProfileOwner
     public void remove_removesProfileOwner() {
-        sProfileOwner.remove();
+        sDeviceState.profileOwner().devicePolicyController().remove();
         try {
             assertThat(TestApis.devicePolicy().getProfileOwner(sProfile)).isNull();
         } finally {
-            sProfileOwner = TestApis.devicePolicy().setProfileOwner(sProfile, DPC_COMPONENT_NAME);
+            TestApis.devicePolicy().setProfileOwner(sProfile, DPC_COMPONENT_NAME);
         }
     }
+
+    @Test
+    @EnsureHasNoDpc
+    public void remove_nonTestOnlyDpc_removesProfileOwner() {
+        try (TestAppInstance dpc = sNonTestOnlyDpc.install()) {
+            ProfileOwner profileOwner = TestApis.devicePolicy().setProfileOwner(
+                    TestApis.users().instrumented(), NON_TEST_ONLY_DPC_COMPONENT_NAME);
+
+            profileOwner.remove();
+
+            assertThat(TestApis.devicePolicy().getProfileOwner()).isNull();
+        }
+    }
+
+    @Test
+    @EnsureHasSecondaryUser
+    @RequireRunNotOnSecondaryUser
+    public void remove_onOtherUser_removesProfileOwner() {
+        try (TestAppInstance dpc = sNonTestOnlyDpc.install(sDeviceState.secondaryUser())) {
+            ProfileOwner profileOwner = TestApis.devicePolicy().setProfileOwner(
+                    sDeviceState.secondaryUser(), NON_TEST_ONLY_DPC_COMPONENT_NAME);
+
+            profileOwner.remove();
+
+            assertThat(TestApis.devicePolicy().getProfileOwner(sDeviceState.secondaryUser()))
+                    .isNull();
+        }
+    }
+
+    @Test
+    @RequireRunOnWorkProfile
+    public void remove_onWorkProfile_testDpc_removesProfileOwner() {
+        TestApis.devicePolicy().getProfileOwner().remove();
+
+        assertThat(TestApis.devicePolicy().getProfileOwner()).isNull();
+    }
 }
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/notifications/NotificationsTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/notifications/NotificationsTest.java
index 1d662fe..0b09802 100644
--- a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/notifications/NotificationsTest.java
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/notifications/NotificationsTest.java
@@ -16,6 +16,8 @@
 
 package com.android.bedstead.nene.notifications;
 
+import static android.Manifest.permission.POST_NOTIFICATIONS;
+
 import static com.android.bedstead.nene.notifications.NotificationListenerQuerySubject.assertThat;
 import static com.android.bedstead.nene.notifications.Notifications.LISTENER_COMPONENT;
 
@@ -32,6 +34,7 @@
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.exceptions.NeneException;
+import com.android.bedstead.nene.permissions.PermissionContext;
 import com.android.bedstead.nene.users.UserReference;
 
 import org.junit.ClassRule;
@@ -101,16 +104,18 @@
     }
 
     private void createNotification() {
-        String channelId = "notifications";
-        sNotificationManager.createNotificationChannel(new NotificationChannel(channelId,
-                "notifications",
-                NotificationChannel.USER_LOCKED_IMPORTANCE));
+        try (PermissionContext p = TestApis.permissions().withPermission(POST_NOTIFICATIONS)) {
+            String channelId = "notifications";
+            sNotificationManager.createNotificationChannel(new NotificationChannel(channelId,
+                    "notifications",
+                    NotificationChannel.USER_LOCKED_IMPORTANCE));
 
-        Notification.Builder notificationBuilder =
-                new Notification.Builder(TestApis.context().instrumentedContext(), channelId)
-                .setSmallIcon(R.drawable.sym_def_app_icon);
+            Notification.Builder notificationBuilder =
+                    new Notification.Builder(TestApis.context().instrumentedContext(), channelId)
+                    .setSmallIcon(R.drawable.sym_def_app_icon);
 
-        sNotificationManager.notify(1, notificationBuilder.build());
+            sNotificationManager.notify(1, notificationBuilder.build());
+        }
     }
 
 }
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/packages/PackageTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/packages/PackageTest.java
index bf2e881..eb5a0cb 100644
--- a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/packages/PackageTest.java
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/packages/PackageTest.java
@@ -38,7 +38,6 @@
 import com.android.bedstead.nene.users.UserReference;
 import com.android.bedstead.testapp.TestApp;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
 import com.android.queryable.queries.StringQuery;
 
 import org.junit.ClassRule;
@@ -48,7 +47,6 @@
 import org.junit.runner.RunWith;
 
 import java.io.File;
-import java.util.UUID;
 
 @RunWith(BedsteadJUnit4.class)
 public class PackageTest {
@@ -75,16 +73,14 @@
             "android.permission.INTERACT_ACROSS_USERS";
     private static final String NON_EXISTING_PERMISSION = "aPermissionThatDoesntExist";
     private static final String USER_SPECIFIC_PERMISSION = "android.permission.READ_CONTACTS";
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-    private static final TestApp sTestApp = sTestAppProvider.query()
+    private static final TestApp sTestApp = sDeviceState.testApps().query()
             .wherePermissions().contains(
                     StringQuery.string().isEqualTo(USER_SPECIFIC_PERMISSION),
                     StringQuery.string().isEqualTo(DECLARED_RUNTIME_PERMISSION),
                     StringQuery.string().isEqualTo(INSTALL_PERMISSION)
             ).get();
-    // TODO(b/202705721): Fix issue with file name conflicts and go with a fixed name
     private static final File sTestAppApkFile = new File(
-            Environment.getExternalStorageDirectory(), UUID.randomUUID() + ".apk");
+            Environment.getExternalStorageDirectory(), "testApp.apk");
 
     @BeforeClass
     public static void setupClass() throws Exception {
@@ -118,6 +114,11 @@
     }
 
     @Test
+    public void of_returnsPackageWithCorrectPackageName() {
+        assertThat(Package.of(PACKAGE_NAME).packageName()).isEqualTo(PACKAGE_NAME);
+    }
+
+    @Test
     @EnsureHasSecondaryUser
     @RequireRunNotOnSecondaryUser
     public void installExisting_alreadyInstalled_installsInUser() {
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/packages/PackagesTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/packages/PackagesTest.java
index a9f5c73..ea58007 100644
--- a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/packages/PackagesTest.java
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/packages/PackagesTest.java
@@ -18,11 +18,16 @@
 
 import static android.os.Build.VERSION_CODES.S;
 
+import static com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_USERS_FULL;
+import static com.android.queryable.queries.ActivityQuery.activity;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.junit.Assume.assumeTrue;
 import static org.testng.Assert.assertThrows;
 
+import android.content.Intent;
+
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.EnsureHasSecondaryUser;
@@ -31,11 +36,13 @@
 import com.android.bedstead.harrier.annotations.RequireSdkVersion;
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.exceptions.NeneException;
+import com.android.bedstead.nene.permissions.PermissionContext;
 import com.android.bedstead.nene.users.UserReference;
+import com.android.bedstead.nene.utils.Poll;
 import com.android.bedstead.nene.utils.Versions;
 import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppActivityReference;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
 import com.android.compatibility.common.util.FileUtils;
 
 import org.junit.ClassRule;
@@ -62,8 +69,10 @@
     private static final File NON_EXISTING_APK_FILE =
             new File("/data/local/tmp/ThisApkDoesNotExist.apk");
     private static final byte[] TEST_APP_BYTES = loadBytes(TEST_APP_APK_FILE);
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-    private static final TestApp sTestApp = sTestAppProvider.any();
+    private static final TestApp sTestApp = sDeviceState.testApps().query()
+            .whereActivities().contains(
+                    activity().exported().isTrue()
+            ).get();
     private final UserReference mUser = TestApis.users().instrumented();
     private final Package mExistingPackage =
             TestApis.packages().find("com.android.providers.telephony");
@@ -406,4 +415,53 @@
             TestApis.packages().keepUninstalledPackages().clear();
         }
     }
+
+    @Test
+    public void kill_killsProcess() {
+        try (TestAppInstance testApp = sTestApp.install()) {
+            // Start an activity so the process exists
+            TestAppActivityReference activity = testApp.activities().query()
+                    .whereActivity().exported().isTrue()
+                    .get();
+            Intent intent = new Intent();
+            intent.setComponent(activity.component().componentName());
+            TestApis.context().instrumentedContext().startActivity(intent);
+            Poll.forValue("process", () -> sTestApp.pkg().runningProcess())
+                    .toNotBeNull()
+                    .await();
+
+            sTestApp.pkg().runningProcess().kill();
+
+            assertThat(sTestApp.pkg().runningProcess()).isNull();
+        }
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    public void kill_doesNotKillProcessInOtherUser() {
+        try (TestAppInstance primaryTestApp = sTestApp.install();
+            TestAppInstance workTestApp = sTestApp.install(sDeviceState.workProfile())) {
+            // Start an activity so the process exists
+            TestAppActivityReference activity = primaryTestApp.activities().query()
+                    .whereActivity().exported().isTrue()
+                    .get();
+            Intent intent = new Intent();
+            intent.setComponent(activity.component().componentName());
+            TestApis.context().instrumentedContext().startActivity(intent);
+            try (PermissionContext p =
+                         TestApis.permissions().withPermission(INTERACT_ACROSS_USERS_FULL)) {
+                TestApis.context().instrumentedContext().startActivityAsUser(
+                        intent, sDeviceState.workProfile().userHandle());
+            }
+            Poll.forValue("process",
+                    () -> sTestApp.pkg().runningProcess(sDeviceState.workProfile()))
+                    .toNotBeNull()
+                    .await();
+
+            sTestApp.pkg().runningProcess().kill();
+
+            assertThat(sTestApp.pkg().runningProcess(sDeviceState.workProfile())).isNotNull();
+        }
+    }
 }
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/permissions/PermissionsTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/permissions/PermissionsTest.java
index 9b071e1..65c846e 100644
--- a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/permissions/PermissionsTest.java
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/permissions/PermissionsTest.java
@@ -16,6 +16,7 @@
 
 package com.android.bedstead.nene.permissions;
 
+import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
 import static android.Manifest.permission.MANAGE_EXTERNAL_STORAGE;
 import static android.content.pm.PackageManager.PERMISSION_DENIED;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
@@ -24,6 +25,8 @@
 import static android.os.Build.VERSION_CODES.R;
 import static android.os.Build.VERSION_CODES.S;
 
+import static com.android.bedstead.nene.appops.CommonAppOps.OPSTR_FINE_LOCATION;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.testng.Assert.assertThrows;
@@ -32,6 +35,10 @@
 
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureDoesNotHaveAppOp;
+import com.android.bedstead.harrier.annotations.EnsureDoesNotHavePermission;
+import com.android.bedstead.harrier.annotations.EnsureHasAppOp;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
 import com.android.bedstead.harrier.annotations.RequireSdkVersion;
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.exceptions.NeneException;
@@ -48,6 +55,7 @@
     @ClassRule @Rule
     public static final DeviceState sDeviceState = new DeviceState();
 
+    private static final String APP_OP = OPSTR_FINE_LOCATION;
     private static final String PERMISSION_HELD_BY_SHELL =
             "android.permission.INTERACT_ACROSS_PROFILES";
     private static final String DIFFERENT_PERMISSION_HELD_BY_SHELL =
@@ -250,4 +258,61 @@
                     .isNotEqualTo(PERMISSION_GRANTED);
         }
     }
+
+    @Test
+    @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL)
+    public void hasPermission_permissionIsGranted_returnsTrue() {
+        assertThat(TestApis.permissions().hasPermission(INTERACT_ACROSS_USERS_FULL)).isTrue();
+    }
+
+    @Test
+    @EnsureDoesNotHavePermission(INTERACT_ACROSS_USERS_FULL)
+    public void hasPermission_permissionIsNotGranted_returnsFalse() {
+        assertThat(TestApis.permissions().hasPermission(INTERACT_ACROSS_USERS_FULL)).isFalse();
+    }
+
+    @Test
+    public void withAppOp_appOpIsGranted() {
+        try (PermissionContext p = TestApis.permissions().withAppOp(APP_OP)) {
+            assertThat(TestApis.permissions().hasAppOpAllowed(APP_OP)).isTrue();
+        }
+    }
+
+    @Test
+    public void withoutAppOp_appOpIsNotGranted() {
+        try (PermissionContext p = TestApis.permissions().withoutAppOp(APP_OP)) {
+            assertThat(TestApis.permissions().hasAppOpAllowed(APP_OP)).isFalse();
+        }
+    }
+
+    @Test
+    public void withAppOpAndPermission_hasBoth() {
+        try (PermissionContext p = TestApis.permissions().withAppOp(APP_OP)
+                .withPermission(INTERACT_ACROSS_USERS_FULL)) {
+            assertThat(TestApis.permissions().hasAppOpAllowed(APP_OP)).isTrue();
+            assertThat(TestApis.permissions().hasPermission(INTERACT_ACROSS_USERS_FULL)).isTrue();
+        }
+    }
+
+    @Test
+    public void withoutAppOpAndWithPermission_hasPermissionButNotAppOp() {
+        try (PermissionContext p = TestApis.permissions().withoutAppOp(APP_OP)
+                .withPermission(INTERACT_ACROSS_USERS_FULL)) {
+            assertThat(TestApis.permissions().hasAppOpAllowed(APP_OP)).isFalse();
+            assertThat(TestApis.permissions().hasPermission(INTERACT_ACROSS_USERS_FULL)).isTrue();
+        }
+    }
+
+    @Test
+    @EnsureHasAppOp(APP_OP)
+    public void hasAppOpAllowed_appOpAllowed_isTrue() {
+        assertThat(TestApis.permissions().hasAppOpAllowed(APP_OP)).isTrue();
+    }
+
+    @Test
+    @EnsureDoesNotHaveAppOp(APP_OP)
+    public void hasAppOpAllowed_appOpNotAllowed_isFalse() {
+        assertThat(TestApis.permissions().hasAppOpAllowed(APP_OP)).isFalse();
+    }
+
 }
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/settings/SecureSettingsTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/settings/SecureSettingsTest.java
index 7a2d164..ae7dcef 100644
--- a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/settings/SecureSettingsTest.java
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/settings/SecureSettingsTest.java
@@ -52,6 +52,7 @@
     private static final String KEY = "key";
     private static final String INVALID_KEY = "noKey";
     private static final int INT_VALUE = 123;
+    private static final String STRING_VALUE = "String";
 
     @After
     public void resetSecureSettings() {
@@ -207,6 +208,153 @@
         });
     }
 
+    @Test
+    public void putString_putsStringIntoSecureSettingsOnInstrumentedUser() throws Exception {
+        TestApis.settings().secure().putString(KEY, STRING_VALUE);
+
+        assertThat(android.provider.Settings.Secure.getString(sContext.getContentResolver(), KEY))
+                .isEqualTo(STRING_VALUE);
+    }
+
+    @Test
+    @RequireSdkVersion(min = Build.VERSION_CODES.S)
+    public void putStringWithContentResolver_putsStringIntoSecureSettings() throws Exception {
+        TestApis.settings().secure().putString(sContext.getContentResolver(), KEY, STRING_VALUE);
+
+        assertThat(android.provider.Settings.Secure.getString(sContext.getContentResolver(), KEY))
+                .isEqualTo(STRING_VALUE);
+    }
+
+    @RequireSdkVersion(max = Build.VERSION_CODES.R)
+    public void putStringWithContentResolver_preS_throwsException() throws Exception {
+        assertThrows(UnsupportedOperationException.class, () ->
+                TestApis.settings().secure().putString(
+                        sContext.getContentResolver(), KEY, STRING_VALUE));
+    }
+
+    @Test
+    public void putStringWithUser_instrumentedUser_putsStringIntoSecureSettings() throws Exception {
+        TestApis.settings().secure().putString(TestApis.users().instrumented(), KEY, STRING_VALUE);
+
+        assertThat(android.provider.Settings.Secure.getString(sContext.getContentResolver(), KEY))
+                .isEqualTo(STRING_VALUE);
+    }
+
+    @Test
+    @EnsureHasSecondaryUser
+    @RequireSdkVersion(min = Build.VERSION_CODES.S)
+    public void putStringWithUser_differentUser_putsStringIntoSecureSettings() throws Exception {
+        TestApis.settings().secure().putString(sDeviceState.secondaryUser(), KEY, STRING_VALUE);
+
+        try (PermissionContext p =
+                     TestApis.permissions().withPermission(INTERACT_ACROSS_USERS_FULL)) {
+            assertThat(android.provider.Settings.Secure.getString(
+                    TestApis.context().androidContextAsUser(sDeviceState.secondaryUser())
+                            .getContentResolver(), KEY)).isEqualTo(STRING_VALUE);
+        }
+    }
+
+    @Test
+    @EnsureHasSecondaryUser
+    @RequireSdkVersion(max = Build.VERSION_CODES.R)
+    public void putStringWithUser_differentUser_preS_throwsException() throws Exception {
+        assertThrows(UnsupportedOperationException.class, () ->
+                TestApis.settings().secure()
+                        .putString(sDeviceState.secondaryUser(), KEY, STRING_VALUE));
+    }
+
+    @Test
+    public void getString_getsStringFromSecureSettingsOnInstrumentedUser() {
+        TestApis.settings().secure().putString(KEY, STRING_VALUE);
+
+        assertThat(TestApis.settings().secure().getString(KEY)).isEqualTo(STRING_VALUE);
+    }
+
+    @Test
+    public void getString_invalidKey_returnsNull() {
+        assertThat(TestApis.settings().secure().getString(INVALID_KEY)).isNull();
+    }
+
+    @Test
+    public void getString_invalidKey_withDefault_returnsDefault() {
+        assertThat(TestApis.settings().secure().getString(INVALID_KEY, STRING_VALUE)).isEqualTo(
+                STRING_VALUE);
+    }
+
+    @Test
+    @RequireSdkVersion(min = Build.VERSION_CODES.S)
+    public void getStringWithContentResolver_getsStringFromSecureSettings() {
+        TestApis.settings().secure().putString(
+                TestApis.context().instrumentedContext().getContentResolver(), KEY, STRING_VALUE);
+
+        assertThat(TestApis.settings().secure().getString(
+                TestApis.context().instrumentedContext().getContentResolver(), KEY))
+                .isEqualTo(STRING_VALUE);
+    }
+
+    @Test
+    @RequireSdkVersion(max = Build.VERSION_CODES.R)
+    public void getStringWithContentResolver_preS_throwsException() {
+        assertThrows(UnsupportedOperationException.class, () -> TestApis.settings().secure()
+                .getString(
+                        TestApis.context().instrumentedContext().getContentResolver(), KEY));
+    }
+
+    @Test
+    @RequireSdkVersion(min = Build.VERSION_CODES.S)
+    public void getStringWithContentResolver_invalidKey_returnsNull() {
+        assertThat(TestApis.settings().secure().getString(
+                        TestApis.context().instrumentedContext().getContentResolver(),
+                        INVALID_KEY)).isNull();
+    }
+
+    @Test
+    @RequireSdkVersion(min = Build.VERSION_CODES.S)
+    public void getStringWithContentResolver_invalidKey_withDefault_returnsDefault() {
+        assertThat(TestApis.settings().secure().getString(
+                TestApis.context().instrumentedContext().getContentResolver(),
+                INVALID_KEY, STRING_VALUE)).isEqualTo(STRING_VALUE);
+    }
+
+    @Test
+    public void getStringWithUser_instrumentedUser_getsStringFromSecureSettings() {
+        TestApis.settings().secure().putString(KEY, STRING_VALUE);
+
+        assertThat(TestApis.settings().secure().getString(TestApis.users().instrumented(), KEY))
+                .isEqualTo(STRING_VALUE);
+    }
+
+    @Test
+    public void getStringWithUser_invalidKey_returnsNull() {
+        assertThat(TestApis.settings().secure().getString(
+                        TestApis.users().instrumented(), INVALID_KEY)).isNull();
+    }
+
+    @Test
+    public void getStringWithUser_invalidKey_withDefault_returnsDefault() {
+        assertThat(TestApis.settings().secure().getString(
+                TestApis.users().instrumented(), INVALID_KEY, STRING_VALUE))
+                .isEqualTo(STRING_VALUE);
+    }
+
+    @Test
+    @EnsureHasSecondaryUser
+    @RequireSdkVersion(min = Build.VERSION_CODES.S)
+    public void getStringWithUser_differentUser_getsStringFromSecureSettings() {
+        TestApis.settings().secure().putString(sDeviceState.secondaryUser(), KEY, STRING_VALUE);
+
+        assertThat(TestApis.settings().secure().getString(
+                sDeviceState.secondaryUser(), KEY)).isEqualTo(STRING_VALUE);
+    }
+
+    @Test
+    @EnsureHasSecondaryUser
+    @RequireSdkVersion(max = Build.VERSION_CODES.R)
+    public void getStringWithUser_differentUser_preS_throwsException() {
+        assertThrows(UnsupportedOperationException.class, () -> {
+            TestApis.settings().secure().putString(sDeviceState.secondaryUser(), KEY, STRING_VALUE);
+        });
+    }
 
     // TODO(b/201319369): this requires a system user but should not
     @RequireRunOnSystemUser
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/users/UserReferenceTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/users/UserReferenceTest.java
index 4fbae6a..87c67c5 100644
--- a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/users/UserReferenceTest.java
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/users/UserReferenceTest.java
@@ -28,6 +28,7 @@
 
 import android.content.Context;
 import android.os.Process;
+import android.os.UserHandle;
 import android.os.UserManager;
 
 import com.android.bedstead.harrier.BedsteadJUnit4;
@@ -35,6 +36,7 @@
 import com.android.bedstead.harrier.annotations.EnsureHasPermission;
 import com.android.bedstead.harrier.annotations.EnsureHasSecondaryUser;
 import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile;
+import com.android.bedstead.harrier.annotations.EnsurePasswordNotSet;
 import com.android.bedstead.harrier.annotations.RequireRunNotOnSecondaryUser;
 import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
 import com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile;
@@ -51,17 +53,22 @@
 public class UserReferenceTest {
     private static final int NON_EXISTING_USER_ID = 10000;
     private static final int USER_ID = NON_EXISTING_USER_ID;
-    private static final String USER_NAME = "userName";
+    public static final UserHandle USER_HANDLE = new UserHandle(USER_ID);
     private static final String TEST_ACTIVITY_NAME = "com.android.bedstead.nene.test.Activity";
-    private static final int SERIAL_NO = 1000;
-    private static final UserType USER_TYPE = new UserType(new UserType.MutableUserType());
     private static final Context sContext = TestApis.context().instrumentedContext();
     private static final UserManager sUserManager = sContext.getSystemService(UserManager.class);
+    private static final String PASSWORD = "1234";
+    private static final String DIFFERENT_PASSWORD = "2345";
 
     @ClassRule @Rule
     public static final DeviceState sDeviceState = new DeviceState();
 
     @Test
+    public void of_returnsUserReferenceWithValidId() {
+        assertThat(UserReference.of(USER_HANDLE)).isEqualTo(USER_ID);
+    }
+
+    @Test
     public void id_returnsId() {
         assertThat(TestApis.users().find(USER_ID).id()).isEqualTo(USER_ID);
     }
@@ -331,4 +338,59 @@
 
         assertThat(TestApis.users().all()).hasSize(numUsers);
     }
+
+    @Test
+    @EnsurePasswordNotSet
+    public void setPassword_hasPassword() {
+        try {
+            TestApis.users().instrumented().setPassword(PASSWORD);
+
+            assertThat(TestApis.users().instrumented().hasPassword()).isTrue();
+        } finally {
+            TestApis.users().instrumented().clearPassword(PASSWORD);
+        }
+    }
+
+    @Test
+    @EnsurePasswordNotSet
+    public void clearPassword_doesNotHavePassword() {
+        TestApis.users().instrumented().setPassword(PASSWORD);
+        TestApis.users().instrumented().clearPassword(PASSWORD);
+
+        assertThat(TestApis.users().instrumented().hasPassword()).isFalse();
+    }
+
+    @Test
+    @EnsurePasswordNotSet
+    public void clearPassword_doesNotHavePassword_doesNothing() {
+        TestApis.users().instrumented().clearPassword(PASSWORD);
+
+        assertThat(TestApis.users().instrumented().hasPassword()).isFalse();
+    }
+
+    @Test
+    @EnsurePasswordNotSet
+    public void clearPassword_incorrectOldPassword_throwsException() {
+        try {
+            TestApis.users().instrumented().setPassword(PASSWORD);
+
+            assertThrows(NeneException.class,
+                    () -> TestApis.users().instrumented().clearPassword(DIFFERENT_PASSWORD));
+        } finally {
+            TestApis.users().instrumented().clearPassword(PASSWORD);
+        }
+    }
+
+    @Test
+    @EnsurePasswordNotSet
+    public void setPassword_alreadyHasPassword_throwsException() {
+        try {
+            TestApis.users().instrumented().setPassword(PASSWORD);
+
+            assertThrows(NeneException.class,
+                    () -> TestApis.users().instrumented().setPassword(DIFFERENT_PASSWORD));
+        } finally {
+            TestApis.users().instrumented().clearPassword(PASSWORD);
+        }
+    }
 }
diff --git a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/users/UsersTest.java b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/users/UsersTest.java
index 1769a01..d166477 100644
--- a/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/users/UsersTest.java
+++ b/common/device-side/bedstead/nene/src/test/java/com/android/bedstead/nene/users/UsersTest.java
@@ -21,8 +21,8 @@
 import static android.app.ActivityManager.STOP_USER_ON_SWITCH_TRUE;
 import static android.os.Build.VERSION.SDK_INT;
 
-import static com.android.bedstead.harrier.DeviceState.UserType.SYSTEM_USER;
 import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
+import static com.android.bedstead.harrier.UserType.SYSTEM_USER;
 import static com.android.bedstead.nene.users.UserType.MANAGED_PROFILE_TYPE_NAME;
 import static com.android.bedstead.nene.users.UserType.SECONDARY_USER_TYPE_NAME;
 import static com.android.bedstead.nene.users.UserType.SYSTEM_USER_TYPE_NAME;
diff --git a/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/Queryable.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/Queryable.java
index 15df572..aea1a1a 100644
--- a/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/Queryable.java
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/Queryable.java
@@ -16,8 +16,6 @@
 
 package com.android.queryable;
 
-import androidx.annotation.Nullable;
-
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.stream.Collectors;
@@ -28,9 +26,9 @@
      *
      * <p>For example, if {@code fieldName} was age, we might generate "age > 5, age < 10"
      */
-    @Nullable
     String describeQuery(String fieldName);
 
+
     /**
      * Join sub-parts of a query for use in {@link #describeQuery(String)}.
      *
diff --git a/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/DelegatedAdminReceiverInfo.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/DelegatedAdminReceiverInfo.java
new file mode 100644
index 0000000..f4f78e7
--- /dev/null
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/info/DelegatedAdminReceiverInfo.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2021 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.queryable.info;
+
+import android.app.admin.DelegatedAdminReceiver;
+
+/**
+ * Wrapper for information about a {@link DelegatedAdminReceiver}.
+ *
+ * <p>This is used instead of {@link DelegatedAdminReceiver} so that it can be easily serialized.
+ */
+@SuppressWarnings("NewApi")
+public class DelegatedAdminReceiverInfo extends BroadcastReceiverInfo {
+    public DelegatedAdminReceiverInfo(DelegatedAdminReceiver delegatedAdminReceiver) {
+        super(delegatedAdminReceiver);
+    }
+
+    public DelegatedAdminReceiverInfo(
+            Class<? extends DelegatedAdminReceiver> delegatedAdminReceiverClass) {
+        super(delegatedAdminReceiverClass);
+    }
+
+    public DelegatedAdminReceiverInfo(String delegatedAdminReceiverClassName) {
+        super(delegatedAdminReceiverClassName);
+    }
+
+    @Override
+    public String toString() {
+        return "DelegatedAdminReceiver{"
+                + "broadcastReceiver=" + super.toString()
+                + "}";
+    }
+}
diff --git a/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/DelegatedAdminReceiverQuery.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/DelegatedAdminReceiverQuery.java
new file mode 100644
index 0000000..0e5098b
--- /dev/null
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/DelegatedAdminReceiverQuery.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2021 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.queryable.queries;
+
+import android.app.admin.DelegatedAdminReceiver;
+
+import com.android.queryable.Queryable;
+import com.android.queryable.info.DelegatedAdminReceiverInfo;
+
+/** Query for a {@link DelegatedAdminReceiver}. */
+public interface DelegatedAdminReceiverQuery<E extends Queryable>
+        extends Query<DelegatedAdminReceiverInfo>  {
+
+    static DelegatedAdminReceiverQuery<DelegatedAdminReceiverQuery<?>> delegatedAdminReceiver() {
+        return new DelegatedAdminReceiverQueryHelper<>();
+    }
+
+    BroadcastReceiverQuery<E> broadcastReceiver();
+}
diff --git a/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/DelegatedAdminReceiverQueryHelper.java b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/DelegatedAdminReceiverQueryHelper.java
new file mode 100644
index 0000000..befdc77
--- /dev/null
+++ b/common/device-side/bedstead/queryable/src/main/java/com/android/queryable/queries/DelegatedAdminReceiverQueryHelper.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2021 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.queryable.queries;
+
+import com.android.queryable.Queryable;
+import com.android.queryable.info.DelegatedAdminReceiverInfo;
+
+/** Implementation of {@link DelegatedAdminReceiverQuery}. */
+public final class DelegatedAdminReceiverQueryHelper<E extends Queryable>
+        implements DelegatedAdminReceiverQuery<E> {
+
+    private final E mQuery;
+    private final BroadcastReceiverQueryHelper<E> mBroadcastReceiverQueryHelper;
+
+    DelegatedAdminReceiverQueryHelper() {
+        mQuery = (E) this;
+        mBroadcastReceiverQueryHelper = new BroadcastReceiverQueryHelper<>(mQuery);
+    }
+
+    public DelegatedAdminReceiverQueryHelper(E query) {
+        mQuery = query;
+        mBroadcastReceiverQueryHelper = new BroadcastReceiverQueryHelper<>(query);
+    }
+
+    @Override
+    public BroadcastReceiverQuery<E> broadcastReceiver() {
+        return mBroadcastReceiverQueryHelper;
+    }
+
+    /** {@code true} if all filters are met by {@code value}. */
+    @Override
+    public boolean matches(DelegatedAdminReceiverInfo value) {
+        return mBroadcastReceiverQueryHelper.matches(value);
+    }
+
+    @Override
+    public String describeQuery(String fieldName) {
+        return Queryable.joinQueryStrings(
+                mBroadcastReceiverQueryHelper.describeQuery(fieldName + ".broadcastReceiver")
+        );
+    }
+}
diff --git a/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/DelegatedAdminReceiverInfoTest.java b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/DelegatedAdminReceiverInfoTest.java
new file mode 100644
index 0000000..3e34752
--- /dev/null
+++ b/common/device-side/bedstead/queryable/src/test/java/com/android/queryable/info/DelegatedAdminReceiverInfoTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2021 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.queryable.info;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.admin.DelegatedAdminReceiver;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class DelegatedAdminReceiverInfoTest {
+
+    private static final Class<? extends DelegatedAdminReceiver> TEST_DEVICE_ADMIN_RECEIVER_CLASS =
+            DelegatedAdminReceiver.class;
+    private static final String TEST_DEVICE_ADMIN_RECEIVER_CLASS_NAME =
+            DelegatedAdminReceiver.class.getName();
+    private static final String TEST_DEVICE_ADMIN_RECEIVER_SIMPLE_NAME =
+            DelegatedAdminReceiver.class.getSimpleName();
+    private static final DelegatedAdminReceiver TEST_DEVICE_ADMIN_RECEIVER_INSTANCE =
+            new DelegatedAdminReceiver();
+
+    @Test
+    public void classConstructor_setsClassName() {
+        DelegatedAdminReceiverInfo delegatedAdminReceiverInfo = new DelegatedAdminReceiverInfo(
+                TEST_DEVICE_ADMIN_RECEIVER_CLASS);
+
+        assertThat(delegatedAdminReceiverInfo.className())
+                .isEqualTo(TEST_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+    }
+
+    @Test
+    public void instanceConstructor_setsClassName() {
+        DelegatedAdminReceiverInfo delegatedAdminReceiverInfo = new DelegatedAdminReceiverInfo(
+                TEST_DEVICE_ADMIN_RECEIVER_INSTANCE);
+
+        assertThat(delegatedAdminReceiverInfo.className())
+                .isEqualTo(TEST_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+    }
+
+    @Test
+    public void stringConstructor_setsClassName() {
+        DelegatedAdminReceiverInfo delegatedAdminReceiverInfo = new DelegatedAdminReceiverInfo(
+                TEST_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+
+        assertThat(delegatedAdminReceiverInfo.className())
+                .isEqualTo(TEST_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+    }
+
+    @Test
+    public void simpleName_getsSimpleName() {
+        DelegatedAdminReceiverInfo delegatedAdminReceiverInfo = new DelegatedAdminReceiverInfo(
+                TEST_DEVICE_ADMIN_RECEIVER_CLASS_NAME);
+
+        assertThat(delegatedAdminReceiverInfo.simpleName())
+                .isEqualTo(TEST_DEVICE_ADMIN_RECEIVER_SIMPLE_NAME);
+    }
+}
diff --git a/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDelegate.java b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDelegate.java
index 714208f..cd968fe 100644
--- a/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDelegate.java
+++ b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDelegate.java
@@ -43,4 +43,9 @@
     public ComponentName componentName() {
         return null;
     }
+
+    @Override
+    public boolean isDelegate() {
+        return true;
+    }
 }
diff --git a/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDpc.java b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDpc.java
index 01519a0..a504ee9 100644
--- a/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDpc.java
+++ b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDpc.java
@@ -35,7 +35,7 @@
 import com.android.bedstead.testapp.TestAppProvider;
 
 /** Entry point to RemoteDPC. */
-public final class RemoteDpc extends RemotePolicyManager {
+public class RemoteDpc extends RemotePolicyManager {
 
     public static final ComponentName DPC_COMPONENT_NAME = new ComponentName(
             "com.android.RemoteDPC",
@@ -43,7 +43,7 @@
     );
 
     private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-    private static final TestApp sTestApp = sTestAppProvider.query()
+    public static final TestApp REMOTE_DPC_TEST_APP = sTestAppProvider.query()
             .wherePackageName().isEqualTo(DPC_COMPONENT_NAME.getPackageName())
             .get();
 
@@ -226,13 +226,14 @@
     }
 
     private static void ensureInstalled(UserReference user) {
-        sTestApp.install(user);
+        REMOTE_DPC_TEST_APP.install(user);
     }
 
     private final DevicePolicyController mDevicePolicyController;
 
-    private RemoteDpc(DevicePolicyController devicePolicyController) {
-        super(sTestApp, devicePolicyController == null ? null : devicePolicyController.user());
+    RemoteDpc(DevicePolicyController devicePolicyController) {
+        super(REMOTE_DPC_TEST_APP, devicePolicyController == null ? null
+                : devicePolicyController.user());
         mDevicePolicyController = devicePolicyController;
     }
 
diff --git a/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDpcUsingParentInstance.java b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDpcUsingParentInstance.java
new file mode 100644
index 0000000..0dd4e18
--- /dev/null
+++ b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteDpcUsingParentInstance.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 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.bedstead.remotedpc;
+
+import android.app.admin.DevicePolicyManager;
+import android.app.admin.RemoteDevicePolicyManager;
+import android.content.ComponentName;
+
+import com.android.bedstead.nene.devicepolicy.DevicePolicyController;
+
+/**
+ * Version of {@link RemoteDpc} which returns the result of calling
+ * {@link DevicePolicyManager#getParentProfileInstance(ComponentName)} when calling
+ * {@link #devicePolicyManager()}.
+ */
+public final class RemoteDpcUsingParentInstance extends RemoteDpc {
+
+    public RemoteDpcUsingParentInstance(
+            DevicePolicyController devicePolicyController) {
+        super(devicePolicyController);
+    }
+
+    @Override
+    public RemoteDevicePolicyManager devicePolicyManager() {
+        return super.devicePolicyManager().getParentProfileInstance(componentName());
+    }
+}
diff --git a/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemotePolicyManager.java b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemotePolicyManager.java
index 8532ef3..0287d5e 100644
--- a/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemotePolicyManager.java
+++ b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemotePolicyManager.java
@@ -38,4 +38,11 @@
      */
     @Nullable
     public abstract ComponentName componentName();
+
+    /**
+     * Is this an app which has been delegated to?
+     */
+    public boolean isDelegate() {
+        return false;
+    }
 }
diff --git a/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteTestApp.java b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteTestApp.java
new file mode 100644
index 0000000..b1116fc
--- /dev/null
+++ b/common/device-side/bedstead/remotedpc/src/main/java/com/android/bedstead/remotedpc/RemoteTestApp.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2022 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.bedstead.remotedpc;
+
+import android.content.ComponentName;
+
+import androidx.annotation.Nullable;
+
+import com.android.bedstead.testapp.TestAppInstance;
+
+/** {@link RemotePolicyManager} which wraps an existing {@link TestAppInstance}. */
+public class RemoteTestApp extends RemotePolicyManager {
+
+    public RemoteTestApp(TestAppInstance testAppInstance) {
+        super(testAppInstance.testApp(), testAppInstance.user());
+    }
+
+    @Nullable
+    @Override
+    public ComponentName componentName() {
+        return null;
+    }
+}
diff --git a/common/device-side/bedstead/remotedpc/src/test/java/com/android/bedstead/remotedpc/RemoteDpcTest.java b/common/device-side/bedstead/remotedpc/src/test/java/com/android/bedstead/remotedpc/RemoteDpcTest.java
index 5722fb6..c61d6d2 100644
--- a/common/device-side/bedstead/remotedpc/src/test/java/com/android/bedstead/remotedpc/RemoteDpcTest.java
+++ b/common/device-side/bedstead/remotedpc/src/test/java/com/android/bedstead/remotedpc/RemoteDpcTest.java
@@ -45,7 +45,6 @@
 import com.android.bedstead.nene.users.UserReference;
 import com.android.bedstead.nene.users.UserType;
 import com.android.bedstead.testapp.TestApp;
-import com.android.bedstead.testapp.TestAppProvider;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
@@ -64,7 +63,10 @@
     @ClassRule @Rule
     public static DeviceState sDeviceState = new DeviceState();
 
-    private static TestApp sNonRemoteDpcTestApp;
+    private static TestApp sNonRemoteDpcTestApp = sDeviceState.testApps().query()
+    // TODO(180478924): Query by feature not package name
+                .wherePackageName().isEqualTo(DEVICE_ADMIN_TESTAPP_PACKAGE_NAME)
+                .get();
     private static final UserReference sUser = TestApis.users().instrumented();
     private static final UserReference NON_EXISTING_USER_REFERENCE =
             TestApis.users().find(99999);
@@ -73,11 +75,6 @@
 
     @BeforeClass
     public static void setupClass() {
-        sNonRemoteDpcTestApp = new TestAppProvider().query()
-                // TODO(180478924): Query by feature not package name
-                .wherePackageName().isEqualTo(DEVICE_ADMIN_TESTAPP_PACKAGE_NAME)
-                .get();
-
         sNonRemoteDpcTestApp.install();
         sNonRemoteDpcTestApp.install(TestApis.users().system());
     }
diff --git a/common/device-side/bedstead/remoteframeworkclasses/src/processor/main/java/com/android/bedstead/remoteframeworkclasses/processor/Apis.java b/common/device-side/bedstead/remoteframeworkclasses/src/processor/main/java/com/android/bedstead/remoteframeworkclasses/processor/Apis.java
index 0a6bafb..b1444df 100644
--- a/common/device-side/bedstead/remoteframeworkclasses/src/processor/main/java/com/android/bedstead/remoteframeworkclasses/processor/Apis.java
+++ b/common/device-side/bedstead/remoteframeworkclasses/src/processor/main/java/com/android/bedstead/remoteframeworkclasses/processor/Apis.java
@@ -40,7 +40,7 @@
 public final class Apis {
 
     private static final String[] API_FILES =
-            {"current.txt", "test-current.txt", "wifi-current.txt"};
+            {"current.txt", "test-current.txt", "wifi-current.txt", "bluetooth-current.txt"};
 
     private static final Map<String, String> API_TXTS = initialiseApiTxts();
     private static final Map<String, Apis> sPackageToApi = new HashMap<>();
@@ -137,7 +137,11 @@
             try {
                 // Strip "method" and semicolon
                 methodLine = methodLine.substring(7, methodLine.length() - 1);
-                methodSignatures.add(MethodSignature.forApiString(methodLine, types, elements));
+                MethodSignature signature =
+                        MethodSignature.forApiString(methodLine, types, elements);
+                if (signature != null) {
+                    methodSignatures.add(signature);
+                }
             } catch (RuntimeException e) {
                 throw new IllegalStateException("Error parsing method " + line, e);
             }
diff --git a/common/device-side/bedstead/remoteframeworkclasses/src/processor/main/java/com/android/bedstead/remoteframeworkclasses/processor/MethodSignature.java b/common/device-side/bedstead/remoteframeworkclasses/src/processor/main/java/com/android/bedstead/remoteframeworkclasses/processor/MethodSignature.java
index aa10a8c..0735b68 100644
--- a/common/device-side/bedstead/remoteframeworkclasses/src/processor/main/java/com/android/bedstead/remoteframeworkclasses/processor/MethodSignature.java
+++ b/common/device-side/bedstead/remoteframeworkclasses/src/processor/main/java/com/android/bedstead/remoteframeworkclasses/processor/MethodSignature.java
@@ -70,7 +70,8 @@
     /**
      * Create a {@link MethodSignature} for the given string from an API file.
      */
-    public static MethodSignature forApiString(String string, Types types, Elements elements) {
+    public static /* @Nullable */ MethodSignature forApiString(
+            String string, Types types, Elements elements) {
         // Strip annotations
         string = string.replaceAll("@\\w+?\\(.+?\\) ", "");
         string = string.replaceAll("@.+? ", "");
@@ -93,6 +94,11 @@
             parts = string.split(" ", 2);
         }
 
+        if (string.startsWith("<")) {
+            // This includes type arguments, for now we ignore this method
+            return null;
+        }
+
         returnType = typeForString(parts[0], types, elements);
 
         string = parts[1];
diff --git a/common/device-side/bedstead/remoteframeworkclasses/src/processor/main/java/com/android/bedstead/remoteframeworkclasses/processor/Processor.java b/common/device-side/bedstead/remoteframeworkclasses/src/processor/main/java/com/android/bedstead/remoteframeworkclasses/processor/Processor.java
index 465ceb6..c8f07a8 100644
--- a/common/device-side/bedstead/remoteframeworkclasses/src/processor/main/java/com/android/bedstead/remoteframeworkclasses/processor/Processor.java
+++ b/common/device-side/bedstead/remoteframeworkclasses/src/processor/main/java/com/android/bedstead/remoteframeworkclasses/processor/Processor.java
@@ -38,6 +38,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -59,8 +60,10 @@
  *
  * <p>This is started by including the {@link RemoteFrameworkClasses} annotation.
  *
- * <p>For each entry in {@code FRAMEWORK_CLASSES} this will generate an interface including all public
- * and test APIs with the {@code CrossUser} annotation. This interface will be named the same as the
+ * <p>For each entry in {@code FRAMEWORK_CLASSES} this will generate an interface including all
+ * public
+ * and test APIs with the {@code CrossUser} annotation. This interface will be named the same as
+ * the
  * framework class except with a prefix of "Remote", and will be in the same package.
  *
  * <p>This will also generate an implementation of the interface which takes an instance of the
@@ -84,7 +87,9 @@
             "android.app.Activity",
             "android.content.Context",
             "android.content.ContentResolver",
-            "android.security.KeyChain"
+            "android.security.KeyChain",
+            "android.bluetooth.BluetoothManager",
+            "android.bluetooth.BluetoothAdapter"
     };
 
     private static final String PARENT_PROFILE_INSTANCE =
@@ -92,6 +97,10 @@
                     + ".content.ComponentName)";
     private static final String GET_CONTENT_RESOLVER =
             "public android.content.ContentResolver getContentResolver()";
+    private static final String GET_ADAPTER =
+            "public android.bluetooth.BluetoothAdapter getAdapter()";
+    private static final String GET_DEFAULT_ADAPTER =
+            "public static android.bluetooth.BluetoothAdapter getDefaultAdapter()";
 
     private static final Set<String> BLOCKLISTED_METHODS = ImmutableSet.of(
             // DevicePolicyManager
@@ -108,7 +117,38 @@
                     + ".Uri, java.util.concurrent.Executor, android.app.admin.DevicePolicyManager"
                     + ".InstallSystemUpdateCallback)",
 
-            // WifiManager
+            // Uses Drawable
+            "public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull "
+                    + "String, @NonNull java.util.concurrent.Callable<"
+                    + "android.graphics.drawable.Drawable>)",
+            "public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull "
+                    + "String, @NonNull java.util.concurrent.Callable<"
+                    + "android.graphics.drawable.Drawable>)",
+            "public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull "
+                    + "String, @NonNull String, @NonNull java.util.concurrent.Callable<"
+                    + "android.graphics.drawable.Drawable>)",
+            "public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, "
+                    + "@NonNull String, int, @NonNull java.util.concurrent.Callable<"
+                    + "android.graphics.drawable.Drawable>)",
+            "public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, "
+                    + "@NonNull String, @NonNull String, int, @NonNull "
+                    + "java.util.concurrent.Callable<android.graphics.drawable.Drawable>)",
+            "public android.graphics.drawable.Drawable getDrawable(@NonNull String, "
+                    + "@NonNull String, "
+                    + "@NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>)",
+            "public android.graphics.drawable.Drawable getDrawable(@NonNull String, "
+                    + "@NonNull String, @NonNull String, @NonNull "
+                    + "java.util.function.Supplier<android.graphics.drawable.Drawable>)",
+            "public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, "
+                    + "@NonNull String, int, @NonNull "
+                    + "java.util.function.Supplier<android.graphics.drawable.Drawable>)",
+            "public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, "
+                    + "@NonNull String, @NonNull String, int, @NonNull "
+                    + "java.util.function.Supplier<android.graphics.drawable.Drawable>)",
+
+
+
+    // WifiManager
 
             // Uses Executor
             "public void addSuggestionConnectionStatusListener(java.util.concurrent.Executor, "
@@ -122,6 +162,14 @@
                     + ".wifi.WifiManager.ScanResultsCallback)",
             "public void registerSubsystemRestartTrackingCallback(java.util.concurrent.Executor, "
                     + "android.net.wifi.WifiManager.SubsystemRestartTrackingCallback)",
+            "public void reportCreateInterfaceImpact(int, boolean, "
+                    + "@NonNull java.util.concurrent.Executor, @NonNull "
+                    + "java.util.function.BiConsumer<java.lang.Boolean,java.util.Set<"
+                    + "android.net.wifi.WifiManager.InterfaceCreationImpact>>)",
+            "public void queryAutojoinGlobal(@NonNull java.util.concurrent.Executor, "
+                    + "@NonNull java.util.function.Consumer<java.lang.Boolean>)",
+
+
             // Uses WpsCallback
             "public void cancelWps(android.net.wifi.WifiManager.WpsCallback)",
             // Uses MulticastLock
@@ -223,6 +271,85 @@
                     + ".PackageManager.OnChecksumsReadyListener) throws java.security.cert"
                     + ".CertificateEncodingException, android.content.pm.PackageManager"
                     + ".NameNotFoundException",
+            // Uses ComponentInfoFlags
+            "public android.content.pm.ActivityInfo getActivityInfo(@NonNull android.content"
+                    + ".ComponentName, @NonNull android.content.pm.PackageManager"
+                    + ".ComponentInfoFlags) throws android.content.pm.PackageManager"
+                    + ".NameNotFoundException",
+            "public android.content.pm.ProviderInfo getProviderInfo(@NonNull android.content"
+                    + ".ComponentName, @NonNull android.content.pm.PackageManager"
+                    + ".ComponentInfoFlags) throws android.content.pm.PackageManager"
+                    + ".NameNotFoundException",
+            "public android.content.pm.ActivityInfo getReceiverInfo(@NonNull android.content"
+                    + ".ComponentName, @NonNull android.content.pm.PackageManager"
+                    + ".ComponentInfoFlags) throws android.content.pm.PackageManager"
+                    + ".NameNotFoundException",
+            "public android.content.pm.ServiceInfo getServiceInfo(@NonNull android.content"
+                    + ".ComponentName, @NonNull android.content.pm.PackageManager"
+                    + ".ComponentInfoFlags) throws android.content.pm.PackageManager"
+                    + ".NameNotFoundException",
+            "public java.util.List<android.content.pm.ProviderInfo> queryContentProviders"
+                    + "(@Nullable String, int, @NonNull android.content.pm.PackageManager"
+                    + ".ComponentInfoFlags)",
+            "public android.content.pm.ProviderInfo resolveContentProvider(@NonNull String, "
+                    + "@NonNull android.content.pm.PackageManager.ComponentInfoFlags)",
+
+            // Uses ApplicationInfoFlags
+            "public android.content.pm.ApplicationInfo getApplicationInfo(@NonNull String, "
+                    + "@NonNull android.content.pm.PackageManager.ApplicationInfoFlags) throws "
+                    + "android.content.pm.PackageManager.NameNotFoundException",
+            "public java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications"
+                    + "(@NonNull android.content.pm.PackageManager.ApplicationInfoFlags)",
+            "public java.util.List<android.content.pm.ApplicationInfo> "
+                    + "getInstalledApplicationsAsUser(@NonNull android.content.pm.PackageManager"
+                    + ".ApplicationInfoFlags, int)",
+            // Uses PackageInfoFlags
+            "public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(@NonNull "
+                    + "android.content.pm.PackageManager.PackageInfoFlags)",
+            "public android.content.pm.PackageInfo getPackageArchiveInfo(@NonNull String, "
+                    + "@NonNull android.content.pm.PackageManager.PackageInfoFlags)",
+            "public int[] getPackageGids(@NonNull String, @NonNull android.content.pm"
+                    + ".PackageManager.PackageInfoFlags) throws android.content.pm.PackageManager"
+                    + ".NameNotFoundException",
+            "public android.content.pm.PackageInfo getPackageInfo(@NonNull String, @NonNull "
+                    + "android.content.pm.PackageManager.PackageInfoFlags) throws android.content"
+                    + ".pm.PackageManager.NameNotFoundException",
+            "public android.content.pm.PackageInfo getPackageInfo(@NonNull android.content.pm"
+                    + ".VersionedPackage, @NonNull android.content.pm.PackageManager"
+                    + ".PackageInfoFlags) throws android.content.pm.PackageManager"
+                    + ".NameNotFoundException",
+            "public int getPackageUid(@NonNull String, @NonNull android.content.pm.PackageManager"
+                    + ".PackageInfoFlags) throws android.content.pm.PackageManager"
+                    + ".NameNotFoundException",
+            "public java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions"
+                    + "(@NonNull String[], @NonNull android.content.pm.PackageManager"
+                    + ".PackageInfoFlags)",
+            "public java.util.List<android.content.pm.SharedLibraryInfo> getSharedLibraries"
+                    + "(@NonNull android.content.pm.PackageManager.PackageInfoFlags)",
+
+            // Uses ResolveInfoFlags
+            "public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers"
+                    + "(@NonNull android.content.Intent, @NonNull android.content.pm"
+                    + ".PackageManager.ResolveInfoFlags)",
+            "public java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(@NonNull"
+                    + " android.content.Intent, @NonNull android.content.pm.PackageManager"
+                    + ".ResolveInfoFlags)",
+
+            "public java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions"
+                    + "(@Nullable android.content.ComponentName, @Nullable java.util.List<android"
+                    + ".content.Intent>, @NonNull android.content.Intent, @NonNull android"
+                    + ".content.pm.PackageManager.ResolveInfoFlags)",
+            "public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders"
+                    + "(@NonNull android.content.Intent, @NonNull android.content.pm"
+                    + ".PackageManager.ResolveInfoFlags)",
+            "public java.util.List<android.content.pm.ResolveInfo> queryIntentServices(@NonNull "
+                    + "android.content.Intent, @NonNull android.content.pm.PackageManager"
+                    + ".ResolveInfoFlags)",
+            "public android.content.pm.ResolveInfo resolveActivity(@NonNull android.content"
+                    + ".Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags)",
+            "public android.content.pm.ResolveInfo resolveService(@NonNull android.content"
+                    + ".Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags)",
+
 
             // CrossProfileApps
 
@@ -245,9 +372,9 @@
 
             //Uses Drawable
             "public android.graphics.drawable.Drawable getShortcutBadgedIconDrawable("
-            + "android.content.pm.ShortcutInfo, int)",
+                    + "android.content.pm.ShortcutInfo, int)",
             "public android.graphics.drawable.Drawable getShortcutIconDrawable("
-            + "android.content.pm.ShortcutInfo, int)",
+                    + "android.content.pm.ShortcutInfo, int)",
 
             //Uses Executor
             "public void registerPackageInstallerSessionCallback("
@@ -276,32 +403,78 @@
             // AccountManager
 
             // Uses Activity
-            "public android.accounts.AccountManagerFuture<android.os.Bundle> finishSession(android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<android.os.Bundle> editProperties(String, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android.accounts.Account, String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthTokenByFeatures(String, String, String[], android.app.Activity, android.os.Bundle, android.os.Bundle, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<android.os.Bundle> startAddAccountSession(String, String, String[], android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<android.os.Bundle> startUpdateCredentialsSession(android.accounts.Account, String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<android.os.Bundle> updateCredentials(android.accounts.Account, String, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<android.os.Bundle> confirmCredentials(android.accounts.Account, android.os.Bundle, android.app.Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.os.Bundle> finishSession"
+                    + "(android.os.Bundle, android.app.Activity, android.accounts"
+                    + ".AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.os.Bundle> editProperties"
+                    + "(String, android.app.Activity, android.accounts"
+                    + ".AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android"
+                    + ".accounts.Account, String, android.os.Bundle, android.app.Activity, "
+                    + "android.accounts.AccountManagerCallback<android.os.Bundle>, android.os"
+                    + ".Handler)",
+            "public android.accounts.AccountManagerFuture<android.os.Bundle> "
+                    + "getAuthTokenByFeatures(String, String, String[], android.app.Activity, "
+                    + "android.os.Bundle, android.os.Bundle, android.accounts"
+                    + ".AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.os.Bundle> "
+                    + "startAddAccountSession(String, String, String[], android.os.Bundle, "
+                    + "android.app.Activity, android.accounts.AccountManagerCallback<android.os"
+                    + ".Bundle>, android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.os.Bundle> "
+                    + "startUpdateCredentialsSession(android.accounts.Account, String, android.os"
+                    + ".Bundle, android.app.Activity, android.accounts"
+                    + ".AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.os.Bundle> updateCredentials"
+                    + "(android.accounts.Account, String, android.os.Bundle, android.app"
+                    + ".Activity, android.accounts.AccountManagerCallback<android.os.Bundle>, "
+                    + "android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.os.Bundle> confirmCredentials"
+                    + "(android.accounts.Account, android.os.Bundle, android.app.Activity, "
+                    + "android.accounts.AccountManagerCallback<android.os.Bundle>, android.os"
+                    + ".Handler)",
 
             // Uses OnAccountsUpdateListener
-            "public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean)",
-            "public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, android.os.Handler, boolean, String[])",
-            "public void removeOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener)",
+            "public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, "
+                    + "android.os.Handler, boolean)",
+            "public void addOnAccountsUpdatedListener(android.accounts.OnAccountsUpdateListener, "
+                    + "android.os.Handler, boolean, String[])",
+            "public void removeOnAccountsUpdatedListener(android.accounts"
+                    + ".OnAccountsUpdateListener)",
 
             // Uses AccountManagerCallback
-            "public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android.accounts.Account, String, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android.accounts.Account, String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android.accounts.Account, String, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android.accounts.Account, String, android.os.Bundle, boolean, android.accounts.AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
-            "public android.os.Bundle hasFeatures(android.accounts.Account, String[], android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler)",
-            "public android.os.Bundle isCredentialsUpdateSuggested(android.accounts.Account, String, android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<android.accounts.Account[]> getAccountsByTypeAndFeatures(String, String[], android.accounts.AccountManagerCallback<android.accounts.Account[]>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<java.lang.Boolean> hasFeatures(android.accounts.Account, String[], android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler)",
-            "public android.os.Bundle isCredentialsUpdateSuggested(android.accounts.AccountAuthenticatorResponse, android.accounts.Account, String) throws android.accounts.NetworkErrorException",
-            "public android.accounts.AccountManagerFuture<java.lang.Boolean> isCredentialsUpdateSuggested(android.accounts.Account, String, android.accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler)",
-            "public android.accounts.AccountManagerFuture<android.accounts.Account> renameAccount(android.accounts.Account, @Size(min=1) String, android.accounts.AccountManagerCallback<android.accounts.Account>, android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android"
+                    + ".accounts.Account, String, boolean, android.accounts"
+                    + ".AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android"
+                    + ".accounts.Account, String, android.os.Bundle, boolean, android.accounts"
+                    + ".AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android"
+                    + ".accounts.Account, String, boolean, android.accounts"
+                    + ".AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.os.Bundle> getAuthToken(android"
+                    + ".accounts.Account, String, android.os.Bundle, boolean, android.accounts"
+                    + ".AccountManagerCallback<android.os.Bundle>, android.os.Handler)",
+            "public android.os.Bundle hasFeatures(android.accounts.Account, String[], android"
+                    + ".accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler)",
+            "public android.os.Bundle isCredentialsUpdateSuggested(android.accounts.Account, "
+                    + "String, android.accounts.AccountManagerCallback<java.lang.Boolean>, "
+                    + "android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.accounts.Account[]> "
+                    + "getAccountsByTypeAndFeatures(String, String[], android.accounts"
+                    + ".AccountManagerCallback<android.accounts.Account[]>, android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<java.lang.Boolean> hasFeatures(android"
+                    + ".accounts.Account, String[], android.accounts.AccountManagerCallback<java"
+                    + ".lang.Boolean>, android.os.Handler)",
+            "public android.os.Bundle isCredentialsUpdateSuggested(android.accounts"
+                    + ".AccountAuthenticatorResponse, android.accounts.Account, String) throws "
+                    + "android.accounts.NetworkErrorException",
+            "public android.accounts.AccountManagerFuture<java.lang.Boolean> "
+                    + "isCredentialsUpdateSuggested(android.accounts.Account, String, android"
+                    + ".accounts.AccountManagerCallback<java.lang.Boolean>, android.os.Handler)",
+            "public android.accounts.AccountManagerFuture<android.accounts.Account> renameAccount"
+                    + "(android.accounts.Account, @Size(min=1) String, android.accounts"
+                    + ".AccountManagerCallback<android.accounts.Account>, android.os.Handler)",
 
             // Uses android.accounts.AccountManager
             "public static android.accounts.AccountManager get(android.content.Context)",
@@ -312,9 +485,13 @@
             "public void addContentView(android.view.View, android.view.ViewGroup.LayoutParams)",
             "@Nullable public android.view.View getCurrentFocus()",
             "@Nullable public android.view.View onCreatePanelView(int)",
-            "@Nullable public android.view.View onCreateView(@NonNull String, @NonNull android.content.Context, @NonNull android.util.AttributeSet)",
-            "@Nullable public android.view.View onCreateView(@Nullable android.view.View, @NonNull String, @NonNull android.content.Context, @NonNull android.util.AttributeSet)",
-            "public boolean onPreparePanel(int, @Nullable android.view.View, @NonNull android.view.Menu)",
+            "@Nullable public android.view.View onCreateView(@NonNull String, @NonNull android"
+                    + ".content.Context, @NonNull android.util.AttributeSet)",
+            "@Nullable public android.view.View onCreateView(@Nullable android.view.View, "
+                    + "@NonNull String, @NonNull android.content.Context, @NonNull android.util"
+                    + ".AttributeSet)",
+            "public boolean onPreparePanel(int, @Nullable android.view.View, @NonNull android"
+                    + ".view.Menu)",
             "public void openContextMenu(android.view.View)",
             "public void registerForContextMenu(android.view.View)",
             "public void setContentView(android.view.View)",
@@ -322,19 +499,34 @@
             "public void unregisterForContextMenu(android.view.View)",
 
             // Uses java.io.FileDescriptor
-            "public void dump(@NonNull String, @Nullable java.io.FileDescriptor, @NonNull java.io.PrintWriter, @Nullable String[])",
+            "public void dump(@NonNull String, @Nullable java.io.FileDescriptor, @NonNull java.io"
+                    + ".PrintWriter, @Nullable String[])",
+            "public void dumpInternal(@NonNull String, @Nullable java.io.FileDescriptor, @NonNull "
+                    + "java.io.PrintWriter, @Nullable String[])",
+
+            // Uses android.window.OnBackInvokedDispatcher
+            "public android.window.OnBackInvokedDispatcher getOnBackInvokedDispatcher()",
 
             // Uses android.app.Activity
             "@Deprecated public void finishActivityFromChild(@NonNull android.app.Activity, int)",
             "@Deprecated public void finishFromChild(android.app.Activity)",
             "public final android.app.Activity getParent()",
-            "@Deprecated public boolean navigateUpToFromChild(android.app.Activity, android.content.Intent)",
+            "@Deprecated public boolean navigateUpToFromChild(android.app.Activity, android"
+                    + ".content.Intent)",
             "protected void onChildTitleChanged(android.app.Activity, CharSequence)",
             "@Deprecated public boolean onNavigateUpFromChild(android.app.Activity)",
-            "@Deprecated public void startActivityFromChild(@NonNull android.app.Activity, @RequiresPermission android.content.Intent, int)",
-            "@Deprecated public void startActivityFromChild(@NonNull android.app.Activity, @RequiresPermission android.content.Intent, int, @Nullable android.os.Bundle)",
-            "@Deprecated public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int) throws android.content.IntentSender.SendIntentException",
-            "@Deprecated public void startIntentSenderFromChild(android.app.Activity, android.content.IntentSender, int, android.content.Intent, int, int, int, @Nullable android.os.Bundle) throws android.content.IntentSender.SendIntentException",
+            "@Deprecated public void startActivityFromChild(@NonNull android.app.Activity, "
+                    + "@RequiresPermission android.content.Intent, int)",
+            "@Deprecated public void startActivityFromChild(@NonNull android.app.Activity, "
+                    + "@RequiresPermission android.content.Intent, int, @Nullable android.os"
+                    + ".Bundle)",
+            "@Deprecated public void startIntentSenderFromChild(android.app.Activity, android"
+                    + ".content.IntentSender, int, android.content.Intent, int, int, int) throws "
+                    + "android.content.IntentSender.SendIntentException",
+            "@Deprecated public void startIntentSenderFromChild(android.app.Activity, android"
+                    + ".content.IntentSender, int, android.content.Intent, int, int, int, "
+                    + "@Nullable android.os.Bundle) throws android.content.IntentSender"
+                    + ".SendIntentException",
 
             // Uses android.app.ActionBar
             "@Nullable public android.app.ActionBar getActionBar()",
@@ -344,8 +536,11 @@
 
             // Uses android.app.Fragment
             "@Deprecated public void onAttachFragment(android.app.Fragment)",
-            "@Deprecated public void startActivityFromFragment(@NonNull android.app.Fragment, @RequiresPermission android.content.Intent, int)",
-            "@Deprecated public void startActivityFromFragment(@NonNull android.app.Fragment, @RequiresPermission android.content.Intent, int, @Nullable android.os.Bundle)",
+            "@Deprecated public void startActivityFromFragment(@NonNull android.app.Fragment, "
+                    + "@RequiresPermission android.content.Intent, int)",
+            "@Deprecated public void startActivityFromFragment(@NonNull android.app.Fragment, "
+                    + "@RequiresPermission android.content.Intent, int, @Nullable android.os"
+                    + ".Bundle)",
 
             // Uses android.app.FragmentManager
             "@Deprecated public android.app.FragmentManager getFragmentManager()",
@@ -392,17 +587,22 @@
             "public android.view.WindowManager getWindowManager()",
 
             // Uses android.database.Cursor
-            "@Deprecated public final android.database.Cursor managedQuery(android.net.Uri, String[], String, String[], String)",
+            "@Deprecated public final android.database.Cursor managedQuery(android.net.Uri, "
+                    + "String[], String, String[], String)",
             "@Deprecated public void startManagingCursor(android.database.Cursor)",
             "@Deprecated public void stopManagingCursor(android.database.Cursor)",
 
             // Uses android.view.ActionMode
             "@CallSuper public void onActionModeFinished(android.view.ActionMode)",
             "@CallSuper public void onActionModeStarted(android.view.ActionMode)",
-            "@Nullable public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback)",
-            "@Nullable public android.view.ActionMode onWindowStartingActionMode(android.view.ActionMode.Callback, int)",
-            "@Nullable public android.view.ActionMode startActionMode(android.view.ActionMode.Callback)",
-            "@Nullable public android.view.ActionMode startActionMode(android.view.ActionMode.Callback, int)",
+            "@Nullable public android.view.ActionMode onWindowStartingActionMode(android.view"
+                    + ".ActionMode.Callback)",
+            "@Nullable public android.view.ActionMode onWindowStartingActionMode(android.view"
+                    + ".ActionMode.Callback, int)",
+            "@Nullable public android.view.ActionMode startActionMode(android.view.ActionMode"
+                    + ".Callback)",
+            "@Nullable public android.view.ActionMode startActionMode(android.view.ActionMode"
+                    + ".Callback, int)",
 
             // Uses android.view.MenuItem
             "public boolean onContextItemSelected(@NonNull android.view.MenuItem)",
@@ -411,13 +611,16 @@
             "public boolean onOptionsItemSelected(@NonNull android.view.MenuItem)",
 
             // Uses android.view.ContextMenu
-            "public void onCreateContextMenu(android.view.ContextMenu, android.view.View, android.view.ContextMenu.ContextMenuInfo)",
+            "public void onCreateContextMenu(android.view.ContextMenu, android.view.View, android"
+                    + ".view.ContextMenu.ContextMenuInfo)",
 
             // Uses android.app.Dialog
             "@Deprecated protected android.app.Dialog onCreateDialog(int)",
-            "@Deprecated @Nullable protected android.app.Dialog onCreateDialog(int, android.os.Bundle)",
+            "@Deprecated @Nullable protected android.app.Dialog onCreateDialog(int, android.os"
+                    + ".Bundle)",
             "@Deprecated protected void onPrepareDialog(int, android.app.Dialog)",
-            "@Deprecated protected void onPrepareDialog(int, android.app.Dialog, android.os.Bundle)",
+            "@Deprecated protected void onPrepareDialog(int, android.app.Dialog, android.os"
+                    + ".Bundle)",
 
             // Uses android.app.TaskStackBuilder
             "public void onCreateNavigateUpTaskStack(android.app.TaskStackBuilder)",
@@ -431,19 +634,29 @@
             "public void onPanelClosed(int, @NonNull android.view.Menu)",
             "public boolean onPrepareOptionsMenu(android.view.Menu)",
 
+            // Uses android.util.Dumpable
+            "public boolean addDumpable(@NonNull android.util.Dumpable)",
+            "public boolean removeDumpable(@NonNull android.util.Dumpable)",
+
             // Uses android.graphics.Canvas
-            "@Deprecated public boolean onCreateThumbnail(android.graphics.Bitmap, android.graphics.Canvas)",
+            "@Deprecated public boolean onCreateThumbnail(android.graphics.Bitmap, android"
+                    + ".graphics.Canvas)",
 
             // Uses android.os.CancellationSignal
-            "public void onGetDirectActions(@NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<java.util.List<android.app.DirectAction>>)",
-            "public void onPerformDirectAction(@NonNull String, @NonNull android.os.Bundle, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<android.os.Bundle>)",
+            "public void onGetDirectActions(@NonNull android.os.CancellationSignal, @NonNull java"
+                    + ".util.function.Consumer<java.util.List<android.app.DirectAction>>)",
+            "public void onPerformDirectAction(@NonNull String, @NonNull android.os.Bundle, "
+                    + "@NonNull android.os.CancellationSignal, @NonNull java.util.function"
+                    + ".Consumer<android.os.Bundle>)",
 
             // Uses android.view.SearchEvent
             "public boolean onSearchRequested(@Nullable android.view.SearchEvent)",
 
             // Uses android.app.Application.ActivityLifecycleCallbacks
-            "public void registerActivityLifecycleCallbacks(@NonNull android.app.Application.ActivityLifecycleCallbacks)",
-            "public void unregisterActivityLifecycleCallbacks(@NonNull android.app.Application.ActivityLifecycleCallbacks)",
+            "public void registerActivityLifecycleCallbacks(@NonNull android.app.Application"
+                    + ".ActivityLifecycleCallbacks)",
+            "public void unregisterActivityLifecycleCallbacks(@NonNull android.app.Application"
+                    + ".ActivityLifecycleCallbacks)",
 
             // Uses Runnable
             "public final void runOnUiThread(Runnable)",
@@ -467,30 +680,45 @@
             "public abstract Object getSystemService(@NonNull String)",
 
             // ContextThemeWrapper
-            "protected void onApplyThemeResource(android.content.res.Resources.Theme, int, boolean)",
+            "protected void onApplyThemeResource(android.content.res.Resources.Theme, int, "
+                    + "boolean)",
 
             // Context
 
             // Uses java.util.concurrent.Executor
-            "public boolean bindIsolatedService(@NonNull @RequiresPermission android.content.Intent, int, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.content.ServiceConnection)",
-            "public boolean bindService(@NonNull @RequiresPermission android.content.Intent, int, @NonNull java.util.concurrent.Executor, @NonNull android.content.ServiceConnection)",
+            "public boolean bindIsolatedService(@NonNull @RequiresPermission android.content"
+                    + ".Intent, int, @NonNull String, @NonNull java.util.concurrent.Executor, "
+                    + "@NonNull android.content.ServiceConnection)",
+            "public boolean bindService(@NonNull @RequiresPermission android.content.Intent, int,"
+                    + " @NonNull java.util.concurrent.Executor, @NonNull android.content"
+                    + ".ServiceConnection)",
 
             // Uses android.content.ServiceConnection
-            "public abstract boolean bindService(@RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, int)",
-            "public boolean bindServiceAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, int, @NonNull android.os.UserHandle)",
+            "public abstract boolean bindService(@RequiresPermission android.content.Intent, "
+                    + "@NonNull android.content.ServiceConnection, int)",
+            "public boolean bindServiceAsUser(@NonNull @RequiresPermission android.content"
+                    + ".Intent, @NonNull android.content.ServiceConnection, int, @NonNull android"
+                    + ".os.UserHandle)",
             "public abstract void unbindService(@NonNull android.content.ServiceConnection)",
             "public void updateServiceGroup(@NonNull android.content.ServiceConnection, int, int)",
 
             // Uses android.content.Context
             "@NonNull public android.content.Context createAttributionContext(@Nullable String)",
-            "public abstract android.content.Context createConfigurationContext(@NonNull android.content.res.Configuration)",
-            "@NonNull public android.content.Context createContext(@NonNull android.content.ContextParams)",
-            "public abstract android.content.Context createContextForSplit(String) throws android.content.pm.PackageManager.NameNotFoundException",
+            "public abstract android.content.Context createConfigurationContext(@NonNull android"
+                    + ".content.res.Configuration)",
+            "@NonNull public android.content.Context createContext(@NonNull android.content"
+                    + ".ContextParams)",
+            "public abstract android.content.Context createContextForSplit(String) throws android"
+                    + ".content.pm.PackageManager.NameNotFoundException",
             "public abstract android.content.Context createDeviceProtectedStorageContext()",
-            "@DisplayContext public abstract android.content.Context createDisplayContext(@NonNull android.view.Display)",
-            "public abstract android.content.Context createPackageContext(String, int) throws android.content.pm.PackageManager.NameNotFoundException",
-            "@NonNull @UiContext public android.content.Context createWindowContext(int, @Nullable android.os.Bundle)",
-            "@NonNull @UiContext public android.content.Context createWindowContext(@NonNull android.view.Display, int, @Nullable android.os.Bundle)",
+            "@DisplayContext public abstract android.content.Context createDisplayContext"
+                    + "(@NonNull android.view.Display)",
+            "public abstract android.content.Context createPackageContext(String, int) throws "
+                    + "android.content.pm.PackageManager.NameNotFoundException",
+            "@NonNull @UiContext public android.content.Context createWindowContext(int, "
+                    + "@Nullable android.os.Bundle)",
+            "@NonNull @UiContext public android.content.Context createWindowContext(@NonNull "
+                    + "android.view.Display, int, @Nullable android.os.Bundle)",
             "public abstract android.content.Context getApplicationContext()",
 
             // Uses android.content.res.AssetManager
@@ -503,7 +731,8 @@
             "@Nullable public android.view.Display getDisplay()",
 
             // Uses android.graphics.drawable.Drawable
-            "@Nullable public final android.graphics.drawable.Drawable getDrawable(@DrawableRes int)",
+            "@Nullable public final android.graphics.drawable.Drawable getDrawable(@DrawableRes "
+                    + "int)",
             "@Deprecated public abstract android.graphics.drawable.Drawable getWallpaper()",
             "@Deprecated public abstract android.graphics.drawable.Drawable peekWallpaper()",
 
@@ -529,39 +758,70 @@
             "public abstract android.content.res.Resources.Theme getTheme()",
 
             // Uses android.content.res.TypedArray
-            "@NonNull public final android.content.res.TypedArray obtainStyledAttributes(@NonNull @StyleableRes int[])",
-            "@NonNull public final android.content.res.TypedArray obtainStyledAttributes(@StyleRes int, @NonNull @StyleableRes int[]) throws android.content.res.Resources.NotFoundException",
-            "@NonNull public final android.content.res.TypedArray obtainStyledAttributes(@Nullable android.util.AttributeSet, @NonNull @StyleableRes int[])",
-            "@NonNull public final android.content.res.TypedArray obtainStyledAttributes(@Nullable android.util.AttributeSet, @NonNull @StyleableRes int[], @AttrRes int, @StyleRes int)",
+            "@NonNull public final android.content.res.TypedArray obtainStyledAttributes(@NonNull"
+                    + " @StyleableRes int[])",
+            "@NonNull public final android.content.res.TypedArray obtainStyledAttributes"
+                    + "(@StyleRes int, @NonNull @StyleableRes int[]) throws android.content.res"
+                    + ".Resources.NotFoundException",
+            "@NonNull public final android.content.res.TypedArray obtainStyledAttributes"
+                    + "(@Nullable android.util.AttributeSet, @NonNull @StyleableRes int[])",
+            "@NonNull public final android.content.res.TypedArray obtainStyledAttributes"
+                    + "(@Nullable android.util.AttributeSet, @NonNull @StyleableRes int[], "
+                    + "@AttrRes int, @StyleRes int)",
 
             // Uses java.io.FileInputStream
-            "public abstract java.io.FileInputStream openFileInput(String) throws java.io.FileNotFoundException",
+            "public abstract java.io.FileInputStream openFileInput(String) throws java.io"
+                    + ".FileNotFoundException",
 
             // Uses java.io.FileOutputStream
-            "public abstract java.io.FileOutputStream openFileOutput(String, int) throws java.io.FileNotFoundException",
+            "public abstract java.io.FileOutputStream openFileOutput(String, int) throws java.io"
+                    + ".FileNotFoundException",
 
             // Uses android.database.sqlite.SQLiteDatabase
-            "public abstract android.database.sqlite.SQLiteDatabase openOrCreateDatabase(String, int, android.database.sqlite.SQLiteDatabase.CursorFactory)",
-            "public abstract android.database.sqlite.SQLiteDatabase openOrCreateDatabase(String, int, android.database.sqlite.SQLiteDatabase.CursorFactory, @Nullable android.database.DatabaseErrorHandler)",
+            "public abstract android.database.sqlite.SQLiteDatabase openOrCreateDatabase(String, "
+                    + "int, android.database.sqlite.SQLiteDatabase.CursorFactory)",
+            "public abstract android.database.sqlite.SQLiteDatabase openOrCreateDatabase(String, "
+                    + "int, android.database.sqlite.SQLiteDatabase.CursorFactory, @Nullable "
+                    + "android.database.DatabaseErrorHandler)",
 
             // Uses android.content.ComponentCallbacks
             "public void registerComponentCallbacks(android.content.ComponentCallbacks)",
             "public void unregisterComponentCallbacks(android.content.ComponentCallbacks)",
 
             // Uses android.content.BroadcastReceiver
-            "@Nullable public abstract android.content.Intent registerReceiver(@Nullable android.content.BroadcastReceiver, android.content.IntentFilter)",
-            "@Nullable public abstract android.content.Intent registerReceiver(@Nullable android.content.BroadcastReceiver, android.content.IntentFilter, int)",
-            "@Nullable public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler)",
-            "@Nullable public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler, int)",
-            "public abstract void sendOrderedBroadcast(@NonNull @RequiresPermission android.content.Intent, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle)",
-            "public void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, @Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle)",
-            "public abstract void sendOrderedBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, @Nullable String, android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle)",
-            "public abstract void sendStickyOrderedBroadcast(@RequiresPermission android.content.Intent, android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle)",
-            "public abstract void sendStickyOrderedBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle, android.content.BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle)",
+            "@Nullable public abstract android.content.Intent registerReceiver(@Nullable android"
+                    + ".content.BroadcastReceiver, android.content.IntentFilter)",
+            "@Nullable public abstract android.content.Intent registerReceiver(@Nullable android"
+                    + ".content.BroadcastReceiver, android.content.IntentFilter, int)",
+            "@Nullable public abstract android.content.Intent registerReceiver(android.content"
+                    + ".BroadcastReceiver, android.content.IntentFilter, @Nullable String, "
+                    + "@Nullable android.os.Handler)",
+            "@Nullable public abstract android.content.Intent registerReceiver(android.content"
+                    + ".BroadcastReceiver, android.content.IntentFilter, @Nullable String, "
+                    + "@Nullable android.os.Handler, int)",
+            "public abstract void sendOrderedBroadcast(@NonNull @RequiresPermission android"
+                    + ".content.Intent, @Nullable String, @Nullable android.content"
+                    + ".BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, "
+                    + "@Nullable android.os.Bundle)",
+            "public void sendOrderedBroadcast(@NonNull android.content.Intent, @Nullable String, "
+                    + "@Nullable String, @Nullable android.content.BroadcastReceiver, @Nullable "
+                    + "android.os.Handler, int, @Nullable String, @Nullable android.os.Bundle)",
+            "public abstract void sendOrderedBroadcastAsUser(@RequiresPermission android.content"
+                    + ".Intent, android.os.UserHandle, @Nullable String, android.content"
+                    + ".BroadcastReceiver, @Nullable android.os.Handler, int, @Nullable String, "
+                    + "@Nullable android.os.Bundle)",
+            "public abstract void sendStickyOrderedBroadcast(@RequiresPermission android.content"
+                    + ".Intent, android.content.BroadcastReceiver, @Nullable android.os.Handler, "
+                    + "int, @Nullable String, @Nullable android.os.Bundle)",
+            "public abstract void sendStickyOrderedBroadcastAsUser(@RequiresPermission android"
+                    + ".content.Intent, android.os.UserHandle, android.content.BroadcastReceiver,"
+                    + " @Nullable android.os.Handler, int, @Nullable String, @Nullable android.os"
+                    + ".Bundle)",
             "public abstract void unregisterReceiver(android.content.BroadcastReceiver)",
 
             // Uses java.io.InputStream
-            "@Deprecated public abstract void setWallpaper(java.io.InputStream) throws java.io.IOException",
+            "@Deprecated public abstract void setWallpaper(java.io.InputStream) throws java.io"
+                    + ".IOException",
 
 
             // Doesn't make sense as it requires an actual Context
@@ -575,60 +835,129 @@
             "public static void removeStatusChangeListener(Object)",
 
             // Uses android.content.ContentProviderClient
-            "@Nullable public final android.content.ContentProviderClient acquireContentProviderClient(@NonNull android.net.Uri)",
-            "@Nullable public final android.content.ContentProviderClient acquireContentProviderClient(@NonNull String)",
-            "@Nullable public final android.content.ContentProviderClient acquireUnstableContentProviderClient(@NonNull android.net.Uri)",
-            "@Nullable public final android.content.ContentProviderClient acquireUnstableContentProviderClient(@NonNull String)",
+            "@Nullable public final android.content.ContentProviderClient "
+                    + "acquireContentProviderClient(@NonNull android.net.Uri)",
+            "@Nullable public final android.content.ContentProviderClient "
+                    + "acquireContentProviderClient(@NonNull String)",
+            "@Nullable public final android.content.ContentProviderClient "
+                    + "acquireUnstableContentProviderClient(@NonNull android.net.Uri)",
+            "@Nullable public final android.content.ContentProviderClient "
+                    + "acquireUnstableContentProviderClient(@NonNull String)",
 
             // Uses android.content.ContentResolver.MimeTypeInfo
-            "@NonNull public final android.content.ContentResolver.MimeTypeInfo getTypeInfo(@NonNull String)",
+            "@NonNull public final android.content.ContentResolver.MimeTypeInfo getTypeInfo"
+                    + "(@NonNull String)",
 
             // Uses android.util.Size
-            "@NonNull public android.graphics.Bitmap loadThumbnail(@NonNull android.net.Uri, @NonNull android.util.Size, @Nullable android.os.CancellationSignal) throws java.io.IOException",
+            "@NonNull public android.graphics.Bitmap loadThumbnail(@NonNull android.net.Uri, "
+                    + "@NonNull android.util.Size, @Nullable android.os.CancellationSignal) "
+                    + "throws java.io.IOException",
 
             // Uses android.database.ContentObserver
-            "public void notifyChange(@NonNull android.net.Uri, @Nullable android.database.ContentObserver)",
-            "@Deprecated public void notifyChange(@NonNull android.net.Uri, @Nullable android.database.ContentObserver, boolean)",
-            "public void notifyChange(@NonNull android.net.Uri, @Nullable android.database.ContentObserver, int)",
-            "public void notifyChange(@NonNull java.util.Collection<android.net.Uri>, @Nullable android.database.ContentObserver, int)",
-            "public final void registerContentObserver(@NonNull android.net.Uri, boolean, @NonNull android.database.ContentObserver)",
-            "public final void unregisterContentObserver(@NonNull android.database.ContentObserver)",
+            "public void notifyChange(@NonNull android.net.Uri, @Nullable android.database"
+                    + ".ContentObserver)",
+            "@Deprecated public void notifyChange(@NonNull android.net.Uri, @Nullable android"
+                    + ".database.ContentObserver, boolean)",
+            "public void notifyChange(@NonNull android.net.Uri, @Nullable android.database"
+                    + ".ContentObserver, int)",
+            "public void notifyChange(@NonNull java.util.Collection<android.net.Uri>, @Nullable "
+                    + "android.database.ContentObserver, int)",
+            "public final void registerContentObserver(@NonNull android.net.Uri, boolean, "
+                    + "@NonNull android.database.ContentObserver)",
+            "public final void unregisterContentObserver(@NonNull android.database"
+                    + ".ContentObserver)",
 
             // Uses android.os.CancellationSignal
-            "@Nullable public final android.content.res.AssetFileDescriptor openAssetFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException",
-            "@Nullable public final android.content.res.AssetFileDescriptor openAssetFileDescriptor(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException",
-            "@Nullable public final android.os.ParcelFileDescriptor openFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException",
-            "@Nullable public final android.os.ParcelFileDescriptor openFileDescriptor(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException",
-            "@Nullable public final android.content.res.AssetFileDescriptor openTypedAssetFile(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException",
-            "@Nullable public final android.content.res.AssetFileDescriptor openTypedAssetFileDescriptor(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) throws java.io.FileNotFoundException",
-            "public final boolean refresh(@NonNull android.net.Uri, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal)",
+            "@Nullable public final android.content.res.AssetFileDescriptor openAssetFile"
+                    + "(@NonNull android.net.Uri, @NonNull String, @Nullable android.os"
+                    + ".CancellationSignal) throws java.io.FileNotFoundException",
+            "@Nullable public final android.content.res.AssetFileDescriptor "
+                    + "openAssetFileDescriptor(@NonNull android.net.Uri, @NonNull String, "
+                    + "@Nullable android.os.CancellationSignal) throws java.io"
+                    + ".FileNotFoundException",
+            "@Nullable public final android.os.ParcelFileDescriptor openFile(@NonNull android.net"
+                    + ".Uri, @NonNull String, @Nullable android.os.CancellationSignal) throws "
+                    + "java.io.FileNotFoundException",
+            "@Nullable public final android.os.ParcelFileDescriptor openFileDescriptor(@NonNull "
+                    + "android.net.Uri, @NonNull String, @Nullable android.os.CancellationSignal)"
+                    + " throws java.io.FileNotFoundException",
+            "@Nullable public final android.content.res.AssetFileDescriptor openTypedAssetFile"
+                    + "(@NonNull android.net.Uri, @NonNull String, @Nullable android.os.Bundle, "
+                    + "@Nullable android.os.CancellationSignal) throws java.io"
+                    + ".FileNotFoundException",
+            "@Nullable public final android.content.res.AssetFileDescriptor "
+                    + "openTypedAssetFileDescriptor(@NonNull android.net.Uri, @NonNull String, "
+                    + "@Nullable android.os.Bundle, @Nullable android.os.CancellationSignal) "
+                    + "throws java.io.FileNotFoundException",
+            "public final boolean refresh(@NonNull android.net.Uri, @Nullable android.os.Bundle, "
+                    + "@Nullable android.os.CancellationSignal)",
 
             // Uses java.io.InputStream
-            "@Nullable public final java.io.InputStream openInputStream(@NonNull android.net.Uri) throws java.io.FileNotFoundException",
+            "@Nullable public final java.io.InputStream openInputStream(@NonNull android.net.Uri)"
+                    + " throws java.io.FileNotFoundException",
 
             // Uses java.io.OutputStream
-            "@Nullable public final java.io.OutputStream openOutputStream(@NonNull android.net.Uri) throws java.io.FileNotFoundException",
-            "@Nullable public final java.io.OutputStream openOutputStream(@NonNull android.net.Uri, @NonNull String) throws java.io.FileNotFoundException",
+            "@Nullable public final java.io.OutputStream openOutputStream(@NonNull android.net"
+                    + ".Uri) throws java.io.FileNotFoundException",
+            "@Nullable public final java.io.OutputStream openOutputStream(@NonNull android.net"
+                    + ".Uri, @NonNull String) throws java.io.FileNotFoundException",
 
             // Uses android.database.Cursor
-            "@Nullable public final android.database.Cursor query(@NonNull @RequiresPermission.Read android.net.Uri, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String)",
-            "@Nullable public final android.database.Cursor query(@NonNull @RequiresPermission.Read android.net.Uri, @Nullable String[], @Nullable String, @Nullable String[], @Nullable String, @Nullable android.os.CancellationSignal)",
-            "@Nullable public final android.database.Cursor query(@NonNull @RequiresPermission.Read android.net.Uri, @Nullable String[], @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal)",
+            "@Nullable public final android.database.Cursor query(@NonNull @RequiresPermission"
+                    + ".Read android.net.Uri, @Nullable String[], @Nullable String, @Nullable "
+                    + "String[], @Nullable String)",
+            "@Nullable public final android.database.Cursor query(@NonNull @RequiresPermission"
+                    + ".Read android.net.Uri, @Nullable String[], @Nullable String, @Nullable "
+                    + "String[], @Nullable String, @Nullable android.os.CancellationSignal)",
+            "@Nullable public final android.database.Cursor query(@NonNull @RequiresPermission"
+                    + ".Read android.net.Uri, @Nullable String[], @Nullable android.os.Bundle, "
+                    + "@Nullable android.os.CancellationSignal)",
 
             // Uses android.content.ContentResolver
-            "@NonNull public static android.content.ContentResolver wrap(@NonNull android.content.ContentProvider)",
-            "@NonNull public static android.content.ContentResolver wrap(@NonNull android.content.ContentProviderClient)",
+            "@NonNull public static android.content.ContentResolver wrap(@NonNull android.content"
+                    + ".ContentProvider)",
+            "@NonNull public static android.content.ContentResolver wrap(@NonNull android.content"
+                    + ".ContentProviderClient)",
 
 
             // KeyChain
 
             // Uses android.app.Activity
-            "public static void choosePrivateKeyAlias(@NonNull android.app.Activity, @NonNull android.security.KeyChainAliasCallback, @Nullable String[], @Nullable java.security.Principal[], @Nullable String, int, @Nullable String)",
-            "public static void choosePrivateKeyAlias(@NonNull android.app.Activity, @NonNull android.security.KeyChainAliasCallback, @Nullable String[], @Nullable java.security.Principal[], @Nullable android.net.Uri, @Nullable String)"
+            "public static void choosePrivateKeyAlias(@NonNull android.app.Activity, @NonNull "
+                    + "android.security.KeyChainAliasCallback, @Nullable String[], @Nullable java"
+                    + ".security.Principal[], @Nullable String, int, @Nullable String)",
+            "public static void choosePrivateKeyAlias(@NonNull android.app.Activity, @NonNull "
+                    + "android.security.KeyChainAliasCallback, @Nullable String[], @Nullable java"
+                    + ".security.Principal[], @Nullable android.net.Uri, @Nullable String)",
 
+            // BluetoothAdapter
 
+            // Uses android.bluetooth.BluetoothProfile
+            "public void closeProfileProxy(int, android.bluetooth.BluetoothProfile)",
+            "public boolean getProfileProxy(android.content.Context, android.bluetooth"
+                    + ".BluetoothProfile.ServiceListener, int)",
 
+            // Uses android.bluetooth.le.BluetoothLeAdvertiser
+            "public android.bluetooth.le.BluetoothLeAdvertiser getBluetoothLeAdvertiser()",
 
+            // Uses android.bluetooth.le.BluetoothLeScanner
+            "public android.bluetooth.le.BluetoothLeScanner getBluetoothLeScanner()",
+
+            // Uses android.bluetooth.BluetoothAdapter.LeScanCallback
+            "public boolean startLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback)",
+            "public boolean startLeScan(java.util.UUID[], android.bluetooth.BluetoothAdapter.LeScanCallback)",
+            "public void stopLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback)",
+
+            // Uses android.bluetooth.BluetoothServerSocket
+            "public android.bluetooth.BluetoothServerSocket listenUsingInsecureL2capChannel() throws java.io.IOException",
+            "public android.bluetooth.BluetoothServerSocket listenUsingInsecureRfcommWithServiceRecord(String, java.util.UUID) throws java.io.IOException",
+            "public android.bluetooth.BluetoothServerSocket listenUsingL2capChannel() throws java.io.IOException",
+            "public android.bluetooth.BluetoothServerSocket listenUsingRfcommWithServiceRecord(String, java.util.UUID) throws java.io.IOException",
+
+            // BluetoothManager
+
+            // Uses android.bluetooth.BluetoothGattServer
+            "public android.bluetooth.BluetoothGattServer openGattServer(android.content.Context, android.bluetooth.BluetoothGattServerCallback)"
     );
 
     private static final ClassName NULL_PARCELABLE_REMOTE_DEVICE_POLICY_MANAGER_CLASSNAME =
@@ -637,8 +966,12 @@
     private static final ClassName NULL_PARCELABLE_REMOTE_CONTENT_RESOLVER_CLASSNAME =
             ClassName.get("com.android.bedstead.remoteframeworkclasses",
                     "NullParcelableRemoteContentResolver");
+    private static final ClassName NULL_PARCELABLE_REMOTE_BLUETOOTH_ADAPTER_CLASSNAME =
+            ClassName.get("com.android.bedstead.remoteframeworkclasses",
+                    "NullParcelableRemoteBluetoothAdapter");
 
-    // TODO(b/205562849): These only support passing null, which is fine for existing tests but will be misleading
+    // TODO(b/205562849): These only support passing null, which is fine for existing tests but
+    //  will be misleading
     private static final ClassName NULL_PARCELABLE_ACTIVITY_CLASSNAME =
             ClassName.get("com.android.bedstead.remoteframeworkclasses",
                     "NullParcelableActivity");
@@ -666,8 +999,17 @@
             RoundEnvironment roundEnv) {
         if (!roundEnv.getElementsAnnotatedWith(RemoteFrameworkClasses.class).isEmpty()) {
             Set<MethodSignature> blocklistedMethodSignatures = BLOCKLISTED_METHODS.stream()
-                    .map(m -> MethodSignature.forApiString(
-                            m, processingEnv.getTypeUtils(), processingEnv.getElementUtils()))
+                    .map(m -> {
+                        try {
+                            return MethodSignature.forApiString(
+                                    m, processingEnv.getTypeUtils(),
+                                    processingEnv.getElementUtils());
+                        } catch (Exception e) {
+                            System.out.println("Error parsing blocklistedMethod " + m + ": " + e);
+                            return null;
+                        }
+                    })
+                    .filter(Objects::nonNull)
                     .collect(Collectors.toSet());
 
             for (String systemService : FRAMEWORK_CLASSES) {
@@ -686,6 +1028,7 @@
     private void generateWrappers() {
         generateWrapper(NULL_PARCELABLE_REMOTE_DEVICE_POLICY_MANAGER_CLASSNAME);
         generateWrapper(NULL_PARCELABLE_REMOTE_CONTENT_RESOLVER_CLASSNAME);
+        generateWrapper(NULL_PARCELABLE_REMOTE_BLUETOOTH_ADAPTER_CLASSNAME);
         generateWrapper(NULL_PARCELABLE_ACTIVITY_CLASSNAME);
         generateWrapper(NULL_PARCELABLE_ACCOUNT_MANAGER_CALLBACK_CLASSNAME);
         generateWrapper(NULL_HANDLER_CALLBACK_CLASSNAME);
@@ -723,7 +1066,7 @@
             Set<MethodSignature> blocklistedMethodSignatures,
             Elements elements) {
         Set<ExecutableElement> methods = filterMethods(getMethods(frameworkClass,
-                processingEnv.getElementUtils()),
+                        processingEnv.getElementUtils()),
                 Apis.forClass(frameworkClass.getQualifiedName().toString(),
                         processingEnv.getTypeUtils(), processingEnv.getElementUtils()), elements)
                 .stream()
@@ -748,12 +1091,22 @@
         MethodSignature getContentResolverSignature =
                 MethodSignature.forApiString(GET_CONTENT_RESOLVER, processingEnv.getTypeUtils(),
                         processingEnv.getElementUtils());
+        MethodSignature getAdapterSignature =
+                MethodSignature.forApiString(GET_ADAPTER, processingEnv.getTypeUtils(),
+                        processingEnv.getElementUtils());
+        MethodSignature getDefaultAdapterSignature =
+                MethodSignature.forApiString(GET_DEFAULT_ADAPTER, processingEnv.getTypeUtils(),
+                        processingEnv.getElementUtils());
 
         Map<MethodSignature, ClassName> signatureReturnOverrides = new HashMap<>();
         signatureReturnOverrides.put(parentProfileInstanceSignature,
                 ClassName.get("android.app.admin", "RemoteDevicePolicyManager"));
         signatureReturnOverrides.put(getContentResolverSignature,
                 ClassName.get("android.content", "RemoteContentResolver"));
+        signatureReturnOverrides.put(getAdapterSignature,
+                ClassName.get("android.bluetooth", "RemoteBluetoothAdapter"));
+        signatureReturnOverrides.put(getDefaultAdapterSignature,
+                ClassName.get("android.bluetooth", "RemoteBluetoothAdapter"));
 
         String packageName = frameworkClass.getEnclosingElement().toString();
         ClassName className = ClassName.get(packageName,
@@ -772,8 +1125,14 @@
 
 
         classBuilder.addAnnotation(AnnotationSpec.builder(CrossUser.class)
-                .addMember("parcelableWrappers", "{$T.class, $T.class, $T.class, $T.class, $T.class}",
-                        NULL_PARCELABLE_REMOTE_DEVICE_POLICY_MANAGER_CLASSNAME, NULL_PARCELABLE_REMOTE_CONTENT_RESOLVER_CLASSNAME, NULL_PARCELABLE_ACTIVITY_CLASSNAME, NULL_PARCELABLE_ACCOUNT_MANAGER_CALLBACK_CLASSNAME, NULL_HANDLER_CALLBACK_CLASSNAME)
+                .addMember("parcelableWrappers",
+                        "{$T.class, $T.class, $T.class, $T.class, $T.class, $T.class}",
+                        NULL_PARCELABLE_REMOTE_DEVICE_POLICY_MANAGER_CLASSNAME,
+                        NULL_PARCELABLE_REMOTE_CONTENT_RESOLVER_CLASSNAME,
+                        NULL_PARCELABLE_REMOTE_BLUETOOTH_ADAPTER_CLASSNAME,
+                        NULL_PARCELABLE_ACTIVITY_CLASSNAME,
+                        NULL_PARCELABLE_ACCOUNT_MANAGER_CALLBACK_CLASSNAME,
+                        NULL_HANDLER_CALLBACK_CLASSNAME)
                 .addMember("futureWrappers", "$T.class",
                         ACCOUNT_MANAGE_FUTURE_WRAPPER_CLASSNAME)
                 .build());
@@ -825,8 +1184,14 @@
                 TypeSpec.classBuilder(className).addModifiers(Modifier.FINAL, Modifier.PUBLIC);
 
         classBuilder.addAnnotation(AnnotationSpec.builder(CrossUser.class)
-                .addMember("parcelableWrappers", "{$T.class, $T.class, $T.class, $T.class, $T.class}",
-                        NULL_PARCELABLE_REMOTE_DEVICE_POLICY_MANAGER_CLASSNAME, NULL_PARCELABLE_REMOTE_CONTENT_RESOLVER_CLASSNAME, NULL_PARCELABLE_ACTIVITY_CLASSNAME, NULL_PARCELABLE_ACCOUNT_MANAGER_CALLBACK_CLASSNAME, NULL_HANDLER_CALLBACK_CLASSNAME)
+                .addMember("parcelableWrappers",
+                        "{$T.class, $T.class, $T.class, $T.class, $T.class, $T.class}",
+                        NULL_PARCELABLE_REMOTE_DEVICE_POLICY_MANAGER_CLASSNAME,
+                        NULL_PARCELABLE_REMOTE_CONTENT_RESOLVER_CLASSNAME,
+                        NULL_PARCELABLE_REMOTE_BLUETOOTH_ADAPTER_CLASSNAME,
+                        NULL_PARCELABLE_ACTIVITY_CLASSNAME,
+                        NULL_PARCELABLE_ACCOUNT_MANAGER_CALLBACK_CLASSNAME,
+                        NULL_HANDLER_CALLBACK_CLASSNAME)
                 .build());
 
         classBuilder.addField(ClassName.get(frameworkClass),
@@ -904,12 +1269,22 @@
         MethodSignature getContentResolverSignature =
                 MethodSignature.forApiString(GET_CONTENT_RESOLVER, processingEnv.getTypeUtils(),
                         processingEnv.getElementUtils());
+        MethodSignature getAdapterSignature =
+                MethodSignature.forApiString(GET_ADAPTER, processingEnv.getTypeUtils(),
+                        processingEnv.getElementUtils());
+        MethodSignature getDefaultAdapterSignature =
+                MethodSignature.forApiString(GET_DEFAULT_ADAPTER, processingEnv.getTypeUtils(),
+                        processingEnv.getElementUtils());
 
         Map<MethodSignature, ClassName> signatureReturnOverrides = new HashMap<>();
         signatureReturnOverrides.put(parentProfileInstanceSignature,
                 ClassName.get("android.app.admin", "RemoteDevicePolicyManager"));
         signatureReturnOverrides.put(getContentResolverSignature,
                 ClassName.get("android.content", "RemoteContentResolver"));
+        signatureReturnOverrides.put(getAdapterSignature,
+                ClassName.get("android.bluetooth", "RemoteBluetoothAdapter"));
+        signatureReturnOverrides.put(getDefaultAdapterSignature,
+                ClassName.get("android.bluetooth", "RemoteBluetoothAdapter"));
 
         String packageName = frameworkClass.getEnclosingElement().toString();
         ClassName interfaceClassName = ClassName.get(packageName,
@@ -918,7 +1293,7 @@
                 "Remote" + frameworkClass.getSimpleName().toString() + "Impl");
         TypeSpec.Builder classBuilder =
                 TypeSpec.classBuilder(
-                        className)
+                                className)
                         .addSuperinterface(interfaceClassName)
                         .addModifiers(Modifier.PUBLIC);
 
@@ -969,9 +1344,12 @@
             if (signatureReturnOverrides.containsKey(signature)) {
                 methodBuilder.returns(signatureReturnOverrides.get(signature));
                 methodBuilder.addStatement(
-                        "return new $TImpl($L.$L($L))",
+                        "$TImpl ret = new $TImpl($L.$L($L))",
+                        signatureReturnOverrides.get(signature),
                         signatureReturnOverrides.get(signature), frameworkClassName,
                         method.getSimpleName(), String.join(", ", paramNames));
+                // We assume all replacements are null-only
+                methodBuilder.addStatement("return null");
             } else if (method.getReturnType().getKind().equals(TypeKind.VOID)) {
                 methodBuilder.addStatement(
                         "$L.$L($L)",
@@ -1049,6 +1427,6 @@
     private String methodHash(ExecutableElement method) {
         return method.getSimpleName() + "(" + method.getParameters().stream()
                 .map(p -> p.asType().toString()).collect(
-                Collectors.joining(",")) + ")";
+                        Collectors.joining(",")) + ")";
     }
 }
diff --git a/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/bluetooth-current.txt b/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/bluetooth-current.txt
new file mode 100644
index 0000000..cf4c4b1
--- /dev/null
+++ b/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/bluetooth-current.txt
@@ -0,0 +1,1399 @@
+// Signature format: 2.0
+package android.bluetooth {
+
+  public final class BluetoothA2dp implements android.bluetooth.BluetoothProfile {
+    method public void finalize();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(android.bluetooth.BluetoothDevice);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isA2dpPlaying(android.bluetooth.BluetoothDevice);
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_PLAYING_STATE_CHANGED = "android.bluetooth.a2dp.profile.action.PLAYING_STATE_CHANGED";
+    field public static final int STATE_NOT_PLAYING = 11; // 0xb
+    field public static final int STATE_PLAYING = 10; // 0xa
+  }
+
+  public final class BluetoothAdapter {
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public boolean cancelDiscovery();
+    method public static boolean checkBluetoothAddress(String);
+    method public void closeProfileProxy(int, android.bluetooth.BluetoothProfile);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean disable();
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean enable();
+    method public String getAddress();
+    method public android.bluetooth.le.BluetoothLeAdvertiser getBluetoothLeAdvertiser();
+    method public android.bluetooth.le.BluetoothLeScanner getBluetoothLeScanner();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.Set<android.bluetooth.BluetoothDevice> getBondedDevices();
+    method @Deprecated public static android.bluetooth.BluetoothAdapter getDefaultAdapter();
+    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public java.time.Duration getDiscoverableTimeout();
+    method public int getLeMaximumAdvertisingDataLength();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getMaxConnectedAudioDevices();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public String getName();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getProfileConnectionState(int);
+    method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int);
+    method public android.bluetooth.BluetoothDevice getRemoteDevice(String);
+    method public android.bluetooth.BluetoothDevice getRemoteDevice(byte[]);
+    method @NonNull public android.bluetooth.BluetoothDevice getRemoteLeDevice(@NonNull String, int);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public int getScanMode();
+    method public int getState();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public boolean isDiscovering();
+    method public boolean isEnabled();
+    method public boolean isLe2MPhySupported();
+    method public int isLeAudioBroadcastAssistantSupported();
+    method public int isLeAudioBroadcastSourceSupported();
+    method public int isLeAudioSupported();
+    method public boolean isLeCodedPhySupported();
+    method public boolean isLeExtendedAdvertisingSupported();
+    method public boolean isLePeriodicAdvertisingSupported();
+    method public boolean isMultipleAdvertisementSupported();
+    method public boolean isOffloadedFilteringSupported();
+    method public boolean isOffloadedScanBatchingSupported();
+    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothServerSocket listenUsingInsecureL2capChannel() throws java.io.IOException;
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothServerSocket listenUsingInsecureRfcommWithServiceRecord(String, java.util.UUID) throws java.io.IOException;
+    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothServerSocket listenUsingL2capChannel() throws java.io.IOException;
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothServerSocket listenUsingRfcommWithServiceRecord(String, java.util.UUID) throws java.io.IOException;
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean setName(String);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public boolean startDiscovery();
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public boolean startLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public boolean startLeScan(java.util.UUID[], android.bluetooth.BluetoothAdapter.LeScanCallback);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void stopLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback);
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.adapter.action.CONNECTION_STATE_CHANGED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public static final String ACTION_DISCOVERY_FINISHED = "android.bluetooth.adapter.action.DISCOVERY_FINISHED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public static final String ACTION_DISCOVERY_STARTED = "android.bluetooth.adapter.action.DISCOVERY_STARTED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_LOCAL_NAME_CHANGED = "android.bluetooth.adapter.action.LOCAL_NAME_CHANGED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public static final String ACTION_REQUEST_DISCOVERABLE = "android.bluetooth.adapter.action.REQUEST_DISCOVERABLE";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_REQUEST_ENABLE = "android.bluetooth.adapter.action.REQUEST_ENABLE";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public static final String ACTION_SCAN_MODE_CHANGED = "android.bluetooth.adapter.action.SCAN_MODE_CHANGED";
+    field public static final String ACTION_STATE_CHANGED = "android.bluetooth.adapter.action.STATE_CHANGED";
+    field public static final int ERROR = -2147483648; // 0x80000000
+    field public static final String EXTRA_CONNECTION_STATE = "android.bluetooth.adapter.extra.CONNECTION_STATE";
+    field public static final String EXTRA_DISCOVERABLE_DURATION = "android.bluetooth.adapter.extra.DISCOVERABLE_DURATION";
+    field public static final String EXTRA_LOCAL_NAME = "android.bluetooth.adapter.extra.LOCAL_NAME";
+    field public static final String EXTRA_PREVIOUS_CONNECTION_STATE = "android.bluetooth.adapter.extra.PREVIOUS_CONNECTION_STATE";
+    field public static final String EXTRA_PREVIOUS_SCAN_MODE = "android.bluetooth.adapter.extra.PREVIOUS_SCAN_MODE";
+    field public static final String EXTRA_PREVIOUS_STATE = "android.bluetooth.adapter.extra.PREVIOUS_STATE";
+    field public static final String EXTRA_SCAN_MODE = "android.bluetooth.adapter.extra.SCAN_MODE";
+    field public static final String EXTRA_STATE = "android.bluetooth.adapter.extra.STATE";
+    field public static final int SCAN_MODE_CONNECTABLE = 21; // 0x15
+    field public static final int SCAN_MODE_CONNECTABLE_DISCOVERABLE = 23; // 0x17
+    field public static final int SCAN_MODE_NONE = 20; // 0x14
+    field public static final int STATE_CONNECTED = 2; // 0x2
+    field public static final int STATE_CONNECTING = 1; // 0x1
+    field public static final int STATE_DISCONNECTED = 0; // 0x0
+    field public static final int STATE_DISCONNECTING = 3; // 0x3
+    field public static final int STATE_OFF = 10; // 0xa
+    field public static final int STATE_ON = 12; // 0xc
+    field public static final int STATE_TURNING_OFF = 13; // 0xd
+    field public static final int STATE_TURNING_ON = 11; // 0xb
+  }
+
+  public static interface BluetoothAdapter.LeScanCallback {
+    method public void onLeScan(android.bluetooth.BluetoothDevice, int, byte[]);
+  }
+
+  public class BluetoothAssignedNumbers {
+    field public static final int AAMP_OF_AMERICA = 190; // 0xbe
+    field public static final int ACCEL_SEMICONDUCTOR = 74; // 0x4a
+    field public static final int ACE_SENSOR = 188; // 0xbc
+    field public static final int ADIDAS = 195; // 0xc3
+    field public static final int ADVANCED_PANMOBIL_SYSTEMS = 145; // 0x91
+    field public static final int AIROHA_TECHNOLOGY = 148; // 0x94
+    field public static final int ALCATEL = 36; // 0x24
+    field public static final int ALPWISE = 154; // 0x9a
+    field public static final int AMICCOM_ELECTRONICS = 192; // 0xc0
+    field public static final int APLIX = 189; // 0xbd
+    field public static final int APPLE = 76; // 0x4c
+    field public static final int APT_LICENSING = 79; // 0x4f
+    field public static final int ARCHOS = 207; // 0xcf
+    field public static final int ARP_DEVICES = 168; // 0xa8
+    field public static final int ATHEROS_COMMUNICATIONS = 69; // 0x45
+    field public static final int ATMEL = 19; // 0x13
+    field public static final int AUSTCO_COMMUNICATION_SYSTEMS = 213; // 0xd5
+    field public static final int AUTONET_MOBILE = 127; // 0x7f
+    field public static final int AVAGO = 78; // 0x4e
+    field public static final int AVM_BERLIN = 31; // 0x1f
+    field public static final int A_AND_D_ENGINEERING = 105; // 0x69
+    field public static final int A_AND_R_CAMBRIDGE = 124; // 0x7c
+    field public static final int BANDSPEED = 32; // 0x20
+    field public static final int BAND_XI_INTERNATIONAL = 100; // 0x64
+    field public static final int BDE_TECHNOLOGY = 180; // 0xb4
+    field public static final int BEATS_ELECTRONICS = 204; // 0xcc
+    field public static final int BEAUTIFUL_ENTERPRISE = 108; // 0x6c
+    field public static final int BEKEY = 178; // 0xb2
+    field public static final int BELKIN_INTERNATIONAL = 92; // 0x5c
+    field public static final int BINAURIC = 203; // 0xcb
+    field public static final int BIOSENTRONICS = 219; // 0xdb
+    field public static final int BLUEGIGA = 71; // 0x47
+    field public static final int BLUERADIOS = 133; // 0x85
+    field public static final int BLUETOOTH_SIG = 63; // 0x3f
+    field public static final int BLUETREK_TECHNOLOGIES = 151; // 0x97
+    field public static final int BOSE = 158; // 0x9e
+    field public static final int BRIARTEK = 109; // 0x6d
+    field public static final int BROADCOM = 15; // 0xf
+    field public static final int CAEN_RFID = 170; // 0xaa
+    field public static final int CAMBRIDGE_SILICON_RADIO = 10; // 0xa
+    field public static final int CATC = 52; // 0x34
+    field public static final int CINETIX = 175; // 0xaf
+    field public static final int CLARINOX_TECHNOLOGIES = 179; // 0xb3
+    field public static final int COLORFY = 156; // 0x9c
+    field public static final int COMMIL = 51; // 0x33
+    field public static final int CONEXANT_SYSTEMS = 28; // 0x1c
+    field public static final int CONNECTBLUE = 113; // 0x71
+    field public static final int CONTINENTAL_AUTOMOTIVE = 75; // 0x4b
+    field public static final int CONWISE_TECHNOLOGY = 66; // 0x42
+    field public static final int CREATIVE_TECHNOLOGY = 118; // 0x76
+    field public static final int C_TECHNOLOGIES = 38; // 0x26
+    field public static final int DANLERS = 225; // 0xe1
+    field public static final int DELORME_PUBLISHING_COMPANY = 128; // 0x80
+    field public static final int DEXCOM = 208; // 0xd0
+    field public static final int DIALOG_SEMICONDUCTOR = 210; // 0xd2
+    field public static final int DIGIANSWER = 12; // 0xc
+    field public static final int ECLIPSE = 53; // 0x35
+    field public static final int ECOTEST = 136; // 0x88
+    field public static final int ELGATO_SYSTEMS = 206; // 0xce
+    field public static final int EM_MICROELECTRONIC_MARIN = 90; // 0x5a
+    field public static final int EQUINOX_AG = 134; // 0x86
+    field public static final int ERICSSON_TECHNOLOGY = 0; // 0x0
+    field public static final int EVLUMA = 201; // 0xc9
+    field public static final int FREE2MOVE = 83; // 0x53
+    field public static final int FUNAI_ELECTRIC = 144; // 0x90
+    field public static final int GARMIN_INTERNATIONAL = 135; // 0x87
+    field public static final int GCT_SEMICONDUCTOR = 45; // 0x2d
+    field public static final int GELO = 200; // 0xc8
+    field public static final int GENEQ = 194; // 0xc2
+    field public static final int GENERAL_MOTORS = 104; // 0x68
+    field public static final int GENNUM = 59; // 0x3b
+    field public static final int GEOFORCE = 157; // 0x9d
+    field public static final int GIBSON_GUITARS = 98; // 0x62
+    field public static final int GN_NETCOM = 103; // 0x67
+    field public static final int GN_RESOUND = 137; // 0x89
+    field public static final int GOOGLE = 224; // 0xe0
+    field public static final int GREEN_THROTTLE_GAMES = 172; // 0xac
+    field public static final int GROUP_SENSE = 115; // 0x73
+    field public static final int HANLYNN_TECHNOLOGIES = 123; // 0x7b
+    field public static final int HARMAN_INTERNATIONAL = 87; // 0x57
+    field public static final int HEWLETT_PACKARD = 101; // 0x65
+    field public static final int HITACHI = 41; // 0x29
+    field public static final int HOSIDEN = 221; // 0xdd
+    field public static final int IBM = 3; // 0x3
+    field public static final int INFINEON_TECHNOLOGIES = 9; // 0x9
+    field public static final int INGENIEUR_SYSTEMGRUPPE_ZAHN = 171; // 0xab
+    field public static final int INTEGRATED_SILICON_SOLUTION = 65; // 0x41
+    field public static final int INTEGRATED_SYSTEM_SOLUTION = 57; // 0x39
+    field public static final int INTEL = 2; // 0x2
+    field public static final int INVENTEL = 30; // 0x1e
+    field public static final int IPEXTREME = 61; // 0x3d
+    field public static final int I_TECH_DYNAMIC_GLOBAL_DISTRIBUTION = 153; // 0x99
+    field public static final int JAWBONE = 138; // 0x8a
+    field public static final int JIANGSU_TOPPOWER_AUTOMOTIVE_ELECTRONICS = 155; // 0x9b
+    field public static final int JOHNSON_CONTROLS = 185; // 0xb9
+    field public static final int J_AND_M = 82; // 0x52
+    field public static final int KAWANTECH = 212; // 0xd4
+    field public static final int KC_TECHNOLOGY = 22; // 0x16
+    field public static final int KENSINGTON_COMPUTER_PRODUCTS_GROUP = 160; // 0xa0
+    field public static final int LAIRD_TECHNOLOGIES = 119; // 0x77
+    field public static final int LESSWIRE = 121; // 0x79
+    field public static final int LG_ELECTRONICS = 196; // 0xc4
+    field public static final int LINAK = 164; // 0xa4
+    field public static final int LUCENT = 7; // 0x7
+    field public static final int LUDUS_HELSINKI = 132; // 0x84
+    field public static final int MACRONIX = 44; // 0x2c
+    field public static final int MAGNETI_MARELLI = 169; // 0xa9
+    field public static final int MANSELLA = 33; // 0x21
+    field public static final int MARVELL = 72; // 0x48
+    field public static final int MATSUSHITA_ELECTRIC = 58; // 0x3a
+    field public static final int MC10 = 202; // 0xca
+    field public static final int MEDIATEK = 70; // 0x46
+    field public static final int MESO_INTERNATIONAL = 182; // 0xb6
+    field public static final int META_WATCH = 163; // 0xa3
+    field public static final int MEWTEL_TECHNOLOGY = 47; // 0x2f
+    field public static final int MICOMMAND = 99; // 0x63
+    field public static final int MICROCHIP_TECHNOLOGY = 205; // 0xcd
+    field public static final int MICROSOFT = 6; // 0x6
+    field public static final int MINDTREE = 106; // 0x6a
+    field public static final int MISFIT_WEARABLES = 223; // 0xdf
+    field public static final int MITEL_SEMICONDUCTOR = 16; // 0x10
+    field public static final int MITSUBISHI_ELECTRIC = 20; // 0x14
+    field public static final int MOBILIAN_CORPORATION = 55; // 0x37
+    field public static final int MONSTER = 112; // 0x70
+    field public static final int MOTOROLA = 8; // 0x8
+    field public static final int MSTAR_SEMICONDUCTOR = 122; // 0x7a
+    field public static final int MUZIK = 222; // 0xde
+    field public static final int NEC = 34; // 0x22
+    field public static final int NEC_LIGHTING = 149; // 0x95
+    field public static final int NEWLOGIC = 23; // 0x17
+    field public static final int NIKE = 120; // 0x78
+    field public static final int NINE_SOLUTIONS = 102; // 0x66
+    field public static final int NOKIA_MOBILE_PHONES = 1; // 0x1
+    field public static final int NORDIC_SEMICONDUCTOR = 89; // 0x59
+    field public static final int NORWOOD_SYSTEMS = 46; // 0x2e
+    field public static final int ODM_TECHNOLOGY = 150; // 0x96
+    field public static final int OMEGAWAVE = 174; // 0xae
+    field public static final int ONSET_COMPUTER = 197; // 0xc5
+    field public static final int OPEN_INTERFACE = 39; // 0x27
+    field public static final int OTL_DYNAMICS = 165; // 0xa5
+    field public static final int PANDA_OCEAN = 166; // 0xa6
+    field public static final int PARROT = 67; // 0x43
+    field public static final int PARTHUS_TECHNOLOGIES = 14; // 0xe
+    field public static final int PASSIF_SEMICONDUCTOR = 176; // 0xb0
+    field public static final int PETER_SYSTEMTECHNIK = 173; // 0xad
+    field public static final int PHILIPS_SEMICONDUCTORS = 37; // 0x25
+    field public static final int PLANTRONICS = 85; // 0x55
+    field public static final int POLAR_ELECTRO = 107; // 0x6b
+    field public static final int POLAR_ELECTRO_EUROPE = 209; // 0xd1
+    field public static final int PROCTER_AND_GAMBLE = 220; // 0xdc
+    field public static final int QUALCOMM = 29; // 0x1d
+    field public static final int QUALCOMM_CONNECTED_EXPERIENCES = 216; // 0xd8
+    field public static final int QUALCOMM_INNOVATION_CENTER = 184; // 0xb8
+    field public static final int QUALCOMM_LABS = 140; // 0x8c
+    field public static final int QUALCOMM_TECHNOLOGIES = 215; // 0xd7
+    field public static final int QUINTIC = 142; // 0x8e
+    field public static final int QUUPPA = 199; // 0xc7
+    field public static final int RALINK_TECHNOLOGY = 91; // 0x5b
+    field public static final int RDA_MICROELECTRONICS = 97; // 0x61
+    field public static final int REALTEK_SEMICONDUCTOR = 93; // 0x5d
+    field public static final int RED_M = 50; // 0x32
+    field public static final int RENESAS_TECHNOLOGY = 54; // 0x36
+    field public static final int RESEARCH_IN_MOTION = 60; // 0x3c
+    field public static final int RF_MICRO_DEVICES = 40; // 0x28
+    field public static final int RIVIERAWAVES = 96; // 0x60
+    field public static final int ROHDE_AND_SCHWARZ = 25; // 0x19
+    field public static final int RTX_TELECOM = 21; // 0x15
+    field public static final int SAMSUNG_ELECTRONICS = 117; // 0x75
+    field public static final int SARIS_CYCLING_GROUP = 177; // 0xb1
+    field public static final int SEERS_TECHNOLOGY = 125; // 0x7d
+    field public static final int SEIKO_EPSON = 64; // 0x40
+    field public static final int SELFLY = 198; // 0xc6
+    field public static final int SEMILINK = 226; // 0xe2
+    field public static final int SENNHEISER_COMMUNICATIONS = 130; // 0x82
+    field public static final int SHANGHAI_SUPER_SMART_ELECTRONICS = 114; // 0x72
+    field public static final int SHENZHEN_EXCELSECU_DATA_TECHNOLOGY = 193; // 0xc1
+    field public static final int SIGNIA_TECHNOLOGIES = 27; // 0x1b
+    field public static final int SILICON_WAVE = 11; // 0xb
+    field public static final int SIRF_TECHNOLOGY = 80; // 0x50
+    field public static final int SOCKET_MOBILE = 68; // 0x44
+    field public static final int SONY_ERICSSON = 86; // 0x56
+    field public static final int SOUND_ID = 111; // 0x6f
+    field public static final int SPORTS_TRACKING_TECHNOLOGIES = 126; // 0x7e
+    field public static final int SR_MEDIZINELEKTRONIK = 161; // 0xa1
+    field public static final int STACCATO_COMMUNICATIONS = 77; // 0x4d
+    field public static final int STALMART_TECHNOLOGY = 191; // 0xbf
+    field public static final int STARKEY_LABORATORIES = 186; // 0xba
+    field public static final int STOLLMAN_E_PLUS_V = 143; // 0x8f
+    field public static final int STONESTREET_ONE = 94; // 0x5e
+    field public static final int ST_MICROELECTRONICS = 48; // 0x30
+    field public static final int SUMMIT_DATA_COMMUNICATIONS = 110; // 0x6e
+    field public static final int SUUNTO = 159; // 0x9f
+    field public static final int SWIRL_NETWORKS = 181; // 0xb5
+    field public static final int SYMBOL_TECHNOLOGIES = 42; // 0x2a
+    field public static final int SYNOPSYS = 49; // 0x31
+    field public static final int SYSTEMS_AND_CHIPS = 62; // 0x3e
+    field public static final int S_POWER_ELECTRONICS = 187; // 0xbb
+    field public static final int TAIXINGBANG_TECHNOLOGY = 211; // 0xd3
+    field public static final int TENOVIS = 43; // 0x2b
+    field public static final int TERAX = 56; // 0x38
+    field public static final int TEXAS_INSTRUMENTS = 13; // 0xd
+    field public static final int THINKOPTICS = 146; // 0x92
+    field public static final int THREECOM = 5; // 0x5
+    field public static final int THREE_DIJOY = 84; // 0x54
+    field public static final int THREE_DSP = 73; // 0x49
+    field public static final int TIMEKEEPING_SYSTEMS = 131; // 0x83
+    field public static final int TIMEX_GROUP_USA = 214; // 0xd6
+    field public static final int TOPCORN_POSITIONING_SYSTEMS = 139; // 0x8b
+    field public static final int TOSHIBA = 4; // 0x4
+    field public static final int TRANSILICA = 24; // 0x18
+    field public static final int TRELAB = 183; // 0xb7
+    field public static final int TTPCOM = 26; // 0x1a
+    field public static final int TXTR = 218; // 0xda
+    field public static final int TZERO_TECHNOLOGIES = 81; // 0x51
+    field public static final int UNIVERSAL_ELECTRONICS = 147; // 0x93
+    field public static final int VERTU = 162; // 0xa2
+    field public static final int VISTEON = 167; // 0xa7
+    field public static final int VIZIO = 88; // 0x58
+    field public static final int VOYETRA_TURTLE_BEACH = 217; // 0xd9
+    field public static final int WAVEPLUS_TECHNOLOGY = 35; // 0x23
+    field public static final int WICENTRIC = 95; // 0x5f
+    field public static final int WIDCOMM = 17; // 0x11
+    field public static final int WUXI_VIMICRO = 129; // 0x81
+    field public static final int ZEEVO = 18; // 0x12
+    field public static final int ZER01_TV = 152; // 0x98
+    field public static final int ZOMM = 116; // 0x74
+    field public static final int ZSCAN_SOFTWARE = 141; // 0x8d
+  }
+
+  public final class BluetoothClass implements android.os.Parcelable {
+    method public int describeContents();
+    method public boolean doesClassMatch(int);
+    method public int getDeviceClass();
+    method public int getMajorDeviceClass();
+    method public boolean hasService(int);
+    method public void writeToParcel(android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothClass> CREATOR;
+    field public static final int PROFILE_A2DP = 1; // 0x1
+    field public static final int PROFILE_HEADSET = 0; // 0x0
+    field public static final int PROFILE_HID = 3; // 0x3
+  }
+
+  public static class BluetoothClass.Device {
+    ctor public BluetoothClass.Device();
+    field public static final int AUDIO_VIDEO_CAMCORDER = 1076; // 0x434
+    field public static final int AUDIO_VIDEO_CAR_AUDIO = 1056; // 0x420
+    field public static final int AUDIO_VIDEO_HANDSFREE = 1032; // 0x408
+    field public static final int AUDIO_VIDEO_HEADPHONES = 1048; // 0x418
+    field public static final int AUDIO_VIDEO_HIFI_AUDIO = 1064; // 0x428
+    field public static final int AUDIO_VIDEO_LOUDSPEAKER = 1044; // 0x414
+    field public static final int AUDIO_VIDEO_MICROPHONE = 1040; // 0x410
+    field public static final int AUDIO_VIDEO_PORTABLE_AUDIO = 1052; // 0x41c
+    field public static final int AUDIO_VIDEO_SET_TOP_BOX = 1060; // 0x424
+    field public static final int AUDIO_VIDEO_UNCATEGORIZED = 1024; // 0x400
+    field public static final int AUDIO_VIDEO_VCR = 1068; // 0x42c
+    field public static final int AUDIO_VIDEO_VIDEO_CAMERA = 1072; // 0x430
+    field public static final int AUDIO_VIDEO_VIDEO_CONFERENCING = 1088; // 0x440
+    field public static final int AUDIO_VIDEO_VIDEO_DISPLAY_AND_LOUDSPEAKER = 1084; // 0x43c
+    field public static final int AUDIO_VIDEO_VIDEO_GAMING_TOY = 1096; // 0x448
+    field public static final int AUDIO_VIDEO_VIDEO_MONITOR = 1080; // 0x438
+    field public static final int AUDIO_VIDEO_WEARABLE_HEADSET = 1028; // 0x404
+    field public static final int COMPUTER_DESKTOP = 260; // 0x104
+    field public static final int COMPUTER_HANDHELD_PC_PDA = 272; // 0x110
+    field public static final int COMPUTER_LAPTOP = 268; // 0x10c
+    field public static final int COMPUTER_PALM_SIZE_PC_PDA = 276; // 0x114
+    field public static final int COMPUTER_SERVER = 264; // 0x108
+    field public static final int COMPUTER_UNCATEGORIZED = 256; // 0x100
+    field public static final int COMPUTER_WEARABLE = 280; // 0x118
+    field public static final int HEALTH_BLOOD_PRESSURE = 2308; // 0x904
+    field public static final int HEALTH_DATA_DISPLAY = 2332; // 0x91c
+    field public static final int HEALTH_GLUCOSE = 2320; // 0x910
+    field public static final int HEALTH_PULSE_OXIMETER = 2324; // 0x914
+    field public static final int HEALTH_PULSE_RATE = 2328; // 0x918
+    field public static final int HEALTH_THERMOMETER = 2312; // 0x908
+    field public static final int HEALTH_UNCATEGORIZED = 2304; // 0x900
+    field public static final int HEALTH_WEIGHING = 2316; // 0x90c
+    field public static final int PERIPHERAL_KEYBOARD = 1344; // 0x540
+    field public static final int PERIPHERAL_KEYBOARD_POINTING = 1472; // 0x5c0
+    field public static final int PERIPHERAL_NON_KEYBOARD_NON_POINTING = 1280; // 0x500
+    field public static final int PERIPHERAL_POINTING = 1408; // 0x580
+    field public static final int PHONE_CELLULAR = 516; // 0x204
+    field public static final int PHONE_CORDLESS = 520; // 0x208
+    field public static final int PHONE_ISDN = 532; // 0x214
+    field public static final int PHONE_MODEM_OR_GATEWAY = 528; // 0x210
+    field public static final int PHONE_SMART = 524; // 0x20c
+    field public static final int PHONE_UNCATEGORIZED = 512; // 0x200
+    field public static final int TOY_CONTROLLER = 2064; // 0x810
+    field public static final int TOY_DOLL_ACTION_FIGURE = 2060; // 0x80c
+    field public static final int TOY_GAME = 2068; // 0x814
+    field public static final int TOY_ROBOT = 2052; // 0x804
+    field public static final int TOY_UNCATEGORIZED = 2048; // 0x800
+    field public static final int TOY_VEHICLE = 2056; // 0x808
+    field public static final int WEARABLE_GLASSES = 1812; // 0x714
+    field public static final int WEARABLE_HELMET = 1808; // 0x710
+    field public static final int WEARABLE_JACKET = 1804; // 0x70c
+    field public static final int WEARABLE_PAGER = 1800; // 0x708
+    field public static final int WEARABLE_UNCATEGORIZED = 1792; // 0x700
+    field public static final int WEARABLE_WRIST_WATCH = 1796; // 0x704
+  }
+
+  public static class BluetoothClass.Device.Major {
+    ctor public BluetoothClass.Device.Major();
+    field public static final int AUDIO_VIDEO = 1024; // 0x400
+    field public static final int COMPUTER = 256; // 0x100
+    field public static final int HEALTH = 2304; // 0x900
+    field public static final int IMAGING = 1536; // 0x600
+    field public static final int MISC = 0; // 0x0
+    field public static final int NETWORKING = 768; // 0x300
+    field public static final int PERIPHERAL = 1280; // 0x500
+    field public static final int PHONE = 512; // 0x200
+    field public static final int TOY = 2048; // 0x800
+    field public static final int UNCATEGORIZED = 7936; // 0x1f00
+    field public static final int WEARABLE = 1792; // 0x700
+  }
+
+  public static final class BluetoothClass.Service {
+    ctor public BluetoothClass.Service();
+    field public static final int AUDIO = 2097152; // 0x200000
+    field public static final int CAPTURE = 524288; // 0x80000
+    field public static final int INFORMATION = 8388608; // 0x800000
+    field public static final int LE_AUDIO = 16384; // 0x4000
+    field public static final int LIMITED_DISCOVERABILITY = 8192; // 0x2000
+    field public static final int NETWORKING = 131072; // 0x20000
+    field public static final int OBJECT_TRANSFER = 1048576; // 0x100000
+    field public static final int POSITIONING = 65536; // 0x10000
+    field public static final int RENDER = 262144; // 0x40000
+    field public static final int TELEPHONY = 4194304; // 0x400000
+  }
+
+  public final class BluetoothCodecConfig implements android.os.Parcelable {
+    method public int describeContents();
+    method public int getBitsPerSample();
+    method public int getChannelMode();
+    method public int getCodecPriority();
+    method public long getCodecSpecific1();
+    method public long getCodecSpecific2();
+    method public long getCodecSpecific3();
+    method public long getCodecSpecific4();
+    method public int getCodecType();
+    method public int getSampleRate();
+    method public boolean isMandatoryCodec();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final int BITS_PER_SAMPLE_16 = 1; // 0x1
+    field public static final int BITS_PER_SAMPLE_24 = 2; // 0x2
+    field public static final int BITS_PER_SAMPLE_32 = 4; // 0x4
+    field public static final int BITS_PER_SAMPLE_NONE = 0; // 0x0
+    field public static final int CHANNEL_MODE_MONO = 1; // 0x1
+    field public static final int CHANNEL_MODE_NONE = 0; // 0x0
+    field public static final int CHANNEL_MODE_STEREO = 2; // 0x2
+    field public static final int CODEC_PRIORITY_DEFAULT = 0; // 0x0
+    field public static final int CODEC_PRIORITY_DISABLED = -1; // 0xffffffff
+    field public static final int CODEC_PRIORITY_HIGHEST = 1000000; // 0xf4240
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothCodecConfig> CREATOR;
+    field public static final int SAMPLE_RATE_176400 = 16; // 0x10
+    field public static final int SAMPLE_RATE_192000 = 32; // 0x20
+    field public static final int SAMPLE_RATE_44100 = 1; // 0x1
+    field public static final int SAMPLE_RATE_48000 = 2; // 0x2
+    field public static final int SAMPLE_RATE_88200 = 4; // 0x4
+    field public static final int SAMPLE_RATE_96000 = 8; // 0x8
+    field public static final int SAMPLE_RATE_NONE = 0; // 0x0
+    field public static final int SOURCE_CODEC_TYPE_AAC = 1; // 0x1
+    field public static final int SOURCE_CODEC_TYPE_APTX = 2; // 0x2
+    field public static final int SOURCE_CODEC_TYPE_APTX_HD = 3; // 0x3
+    field public static final int SOURCE_CODEC_TYPE_INVALID = 1000000; // 0xf4240
+    field public static final int SOURCE_CODEC_TYPE_LC3 = 5; // 0x5
+    field public static final int SOURCE_CODEC_TYPE_LDAC = 4; // 0x4
+    field public static final int SOURCE_CODEC_TYPE_SBC = 0; // 0x0
+  }
+
+  public static final class BluetoothCodecConfig.Builder {
+    ctor public BluetoothCodecConfig.Builder();
+    method @NonNull public android.bluetooth.BluetoothCodecConfig build();
+    method @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setBitsPerSample(int);
+    method @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setChannelMode(int);
+    method @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setCodecPriority(int);
+    method @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setCodecSpecific1(long);
+    method @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setCodecSpecific2(long);
+    method @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setCodecSpecific3(long);
+    method @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setCodecSpecific4(long);
+    method @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setCodecType(int);
+    method @NonNull public android.bluetooth.BluetoothCodecConfig.Builder setSampleRate(int);
+  }
+
+  public final class BluetoothCodecStatus implements android.os.Parcelable {
+    method public int describeContents();
+    method @Nullable public android.bluetooth.BluetoothCodecConfig getCodecConfig();
+    method @NonNull public java.util.List<android.bluetooth.BluetoothCodecConfig> getCodecsLocalCapabilities();
+    method @NonNull public java.util.List<android.bluetooth.BluetoothCodecConfig> getCodecsSelectableCapabilities();
+    method public boolean isCodecConfigSelectable(@Nullable android.bluetooth.BluetoothCodecConfig);
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothCodecStatus> CREATOR;
+    field public static final String EXTRA_CODEC_STATUS = "android.bluetooth.extra.CODEC_STATUS";
+  }
+
+  public static final class BluetoothCodecStatus.Builder {
+    ctor public BluetoothCodecStatus.Builder();
+    method @NonNull public android.bluetooth.BluetoothCodecStatus build();
+    method @NonNull public android.bluetooth.BluetoothCodecStatus.Builder setCodecConfig(@NonNull android.bluetooth.BluetoothCodecConfig);
+    method @NonNull public android.bluetooth.BluetoothCodecStatus.Builder setCodecsLocalCapabilities(@NonNull java.util.List<android.bluetooth.BluetoothCodecConfig>);
+    method @NonNull public android.bluetooth.BluetoothCodecStatus.Builder setCodecsSelectableCapabilities(@NonNull java.util.List<android.bluetooth.BluetoothCodecConfig>);
+  }
+
+  public final class BluetoothCsipSetCoordinator implements java.lang.AutoCloseable android.bluetooth.BluetoothProfile {
+    method public void close();
+    method protected void finalize();
+    method @NonNull public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+    method public int getConnectionState(@Nullable android.bluetooth.BluetoothDevice);
+    method @NonNull public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CSIS_CONNECTION_STATE_CHANGED = "android.bluetooth.action.CSIS_CONNECTION_STATE_CHANGED";
+  }
+
+  public final class BluetoothDevice implements android.os.Parcelable {
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int, int);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int, int, android.os.Handler);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean createBond();
+    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothSocket createInsecureL2capChannel(int) throws java.io.IOException;
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothSocket createInsecureRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;
+    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothSocket createL2capChannel(int) throws java.io.IOException;
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothSocket createRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;
+    method public int describeContents();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean fetchUuidsWithSdp();
+    method public String getAddress();
+    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public String getAlias();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothClass getBluetoothClass();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getBondState();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public String getName();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getType();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.os.ParcelUuid[] getUuids();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int setAlias(@Nullable String);
+    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setPairingConfirmation(boolean);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean setPin(byte[]);
+    method public void writeToParcel(android.os.Parcel, int);
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_ACL_CONNECTED = "android.bluetooth.device.action.ACL_CONNECTED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_ACL_DISCONNECTED = "android.bluetooth.device.action.ACL_DISCONNECTED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_ACL_DISCONNECT_REQUESTED = "android.bluetooth.device.action.ACL_DISCONNECT_REQUESTED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_ALIAS_CHANGED = "android.bluetooth.device.action.ALIAS_CHANGED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_BOND_STATE_CHANGED = "android.bluetooth.device.action.BOND_STATE_CHANGED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CLASS_CHANGED = "android.bluetooth.device.action.CLASS_CHANGED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public static final String ACTION_FOUND = "android.bluetooth.device.action.FOUND";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_NAME_CHANGED = "android.bluetooth.device.action.NAME_CHANGED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_PAIRING_REQUEST = "android.bluetooth.device.action.PAIRING_REQUEST";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_UUID = "android.bluetooth.device.action.UUID";
+    field public static final int ADDRESS_TYPE_PUBLIC = 0; // 0x0
+    field public static final int ADDRESS_TYPE_RANDOM = 1; // 0x1
+    field public static final int ADDRESS_TYPE_UNKNOWN = 65535; // 0xffff
+    field public static final int BOND_BONDED = 12; // 0xc
+    field public static final int BOND_BONDING = 11; // 0xb
+    field public static final int BOND_NONE = 10; // 0xa
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothDevice> CREATOR;
+    field public static final int DEVICE_TYPE_CLASSIC = 1; // 0x1
+    field public static final int DEVICE_TYPE_DUAL = 3; // 0x3
+    field public static final int DEVICE_TYPE_LE = 2; // 0x2
+    field public static final int DEVICE_TYPE_UNKNOWN = 0; // 0x0
+    field public static final int ERROR = -2147483648; // 0x80000000
+    field public static final String EXTRA_BOND_STATE = "android.bluetooth.device.extra.BOND_STATE";
+    field public static final String EXTRA_CLASS = "android.bluetooth.device.extra.CLASS";
+    field public static final String EXTRA_DEVICE = "android.bluetooth.device.extra.DEVICE";
+    field public static final String EXTRA_IS_COORDINATED_SET_MEMBER = "android.bluetooth.extra.IS_COORDINATED_SET_MEMBER";
+    field public static final String EXTRA_NAME = "android.bluetooth.device.extra.NAME";
+    field public static final String EXTRA_PAIRING_KEY = "android.bluetooth.device.extra.PAIRING_KEY";
+    field public static final String EXTRA_PAIRING_VARIANT = "android.bluetooth.device.extra.PAIRING_VARIANT";
+    field public static final String EXTRA_PREVIOUS_BOND_STATE = "android.bluetooth.device.extra.PREVIOUS_BOND_STATE";
+    field public static final String EXTRA_RSSI = "android.bluetooth.device.extra.RSSI";
+    field public static final String EXTRA_TRANSPORT = "android.bluetooth.device.extra.TRANSPORT";
+    field public static final String EXTRA_UUID = "android.bluetooth.device.extra.UUID";
+    field public static final int PAIRING_VARIANT_PASSKEY_CONFIRMATION = 2; // 0x2
+    field public static final int PAIRING_VARIANT_PIN = 0; // 0x0
+    field public static final int PHY_LE_1M = 1; // 0x1
+    field public static final int PHY_LE_1M_MASK = 1; // 0x1
+    field public static final int PHY_LE_2M = 2; // 0x2
+    field public static final int PHY_LE_2M_MASK = 2; // 0x2
+    field public static final int PHY_LE_CODED = 3; // 0x3
+    field public static final int PHY_LE_CODED_MASK = 4; // 0x4
+    field public static final int PHY_OPTION_NO_PREFERRED = 0; // 0x0
+    field public static final int PHY_OPTION_S2 = 1; // 0x1
+    field public static final int PHY_OPTION_S8 = 2; // 0x2
+    field public static final int TRANSPORT_AUTO = 0; // 0x0
+    field public static final int TRANSPORT_BREDR = 1; // 0x1
+    field public static final int TRANSPORT_LE = 2; // 0x2
+  }
+
+  public final class BluetoothGatt implements android.bluetooth.BluetoothProfile {
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void abortReliableWrite();
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void abortReliableWrite(android.bluetooth.BluetoothDevice);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean beginReliableWrite();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void close();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean connect();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void disconnect();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean discoverServices();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean executeReliableWrite();
+    method @Deprecated public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+    method @Deprecated public int getConnectionState(android.bluetooth.BluetoothDevice);
+    method public android.bluetooth.BluetoothDevice getDevice();
+    method @Deprecated public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+    method public android.bluetooth.BluetoothGattService getService(java.util.UUID);
+    method public java.util.List<android.bluetooth.BluetoothGattService> getServices();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean readCharacteristic(android.bluetooth.BluetoothGattCharacteristic);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean readDescriptor(android.bluetooth.BluetoothGattDescriptor);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void readPhy();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean readRemoteRssi();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean requestConnectionPriority(int);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean requestMtu(int);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean setCharacteristicNotification(android.bluetooth.BluetoothGattCharacteristic, boolean);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void setPreferredPhy(int, int, int);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean writeCharacteristic(android.bluetooth.BluetoothGattCharacteristic);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int writeCharacteristic(@NonNull android.bluetooth.BluetoothGattCharacteristic, @NonNull byte[], int);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean writeDescriptor(android.bluetooth.BluetoothGattDescriptor);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int writeDescriptor(@NonNull android.bluetooth.BluetoothGattDescriptor, @NonNull byte[]);
+    field public static final int CONNECTION_PRIORITY_BALANCED = 0; // 0x0
+    field public static final int CONNECTION_PRIORITY_HIGH = 1; // 0x1
+    field public static final int CONNECTION_PRIORITY_LOW_POWER = 2; // 0x2
+    field public static final int GATT_CONNECTION_CONGESTED = 143; // 0x8f
+    field public static final int GATT_FAILURE = 257; // 0x101
+    field public static final int GATT_INSUFFICIENT_AUTHENTICATION = 5; // 0x5
+    field public static final int GATT_INSUFFICIENT_AUTHORIZATION = 8; // 0x8
+    field public static final int GATT_INSUFFICIENT_ENCRYPTION = 15; // 0xf
+    field public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 13; // 0xd
+    field public static final int GATT_INVALID_OFFSET = 7; // 0x7
+    field public static final int GATT_READ_NOT_PERMITTED = 2; // 0x2
+    field public static final int GATT_REQUEST_NOT_SUPPORTED = 6; // 0x6
+    field public static final int GATT_SUCCESS = 0; // 0x0
+    field public static final int GATT_WRITE_NOT_PERMITTED = 3; // 0x3
+  }
+
+  public abstract class BluetoothGattCallback {
+    ctor public BluetoothGattCallback();
+    method @Deprecated public void onCharacteristicChanged(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic);
+    method public void onCharacteristicChanged(@NonNull android.bluetooth.BluetoothGatt, @NonNull android.bluetooth.BluetoothGattCharacteristic, @NonNull byte[]);
+    method @Deprecated public void onCharacteristicRead(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic, int);
+    method public void onCharacteristicRead(@NonNull android.bluetooth.BluetoothGatt, @NonNull android.bluetooth.BluetoothGattCharacteristic, @NonNull byte[], int);
+    method public void onCharacteristicWrite(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic, int);
+    method public void onConnectionStateChange(android.bluetooth.BluetoothGatt, int, int);
+    method @Deprecated public void onDescriptorRead(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattDescriptor, int);
+    method public void onDescriptorRead(@NonNull android.bluetooth.BluetoothGatt, @NonNull android.bluetooth.BluetoothGattDescriptor, int, @NonNull byte[]);
+    method public void onDescriptorWrite(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattDescriptor, int);
+    method public void onMtuChanged(android.bluetooth.BluetoothGatt, int, int);
+    method public void onPhyRead(android.bluetooth.BluetoothGatt, int, int, int);
+    method public void onPhyUpdate(android.bluetooth.BluetoothGatt, int, int, int);
+    method public void onReadRemoteRssi(android.bluetooth.BluetoothGatt, int, int);
+    method public void onReliableWriteCompleted(android.bluetooth.BluetoothGatt, int);
+    method public void onServiceChanged(@NonNull android.bluetooth.BluetoothGatt);
+    method public void onServicesDiscovered(android.bluetooth.BluetoothGatt, int);
+  }
+
+  public class BluetoothGattCharacteristic implements android.os.Parcelable {
+    ctor public BluetoothGattCharacteristic(java.util.UUID, int, int);
+    method public boolean addDescriptor(android.bluetooth.BluetoothGattDescriptor);
+    method public int describeContents();
+    method public android.bluetooth.BluetoothGattDescriptor getDescriptor(java.util.UUID);
+    method public java.util.List<android.bluetooth.BluetoothGattDescriptor> getDescriptors();
+    method @Deprecated public Float getFloatValue(int, int);
+    method public int getInstanceId();
+    method @Deprecated public Integer getIntValue(int, int);
+    method public int getPermissions();
+    method public int getProperties();
+    method public android.bluetooth.BluetoothGattService getService();
+    method @Deprecated public String getStringValue(int);
+    method public java.util.UUID getUuid();
+    method @Deprecated public byte[] getValue();
+    method public int getWriteType();
+    method @Deprecated public boolean setValue(byte[]);
+    method @Deprecated public boolean setValue(int, int, int);
+    method @Deprecated public boolean setValue(int, int, int, int);
+    method @Deprecated public boolean setValue(String);
+    method public void setWriteType(int);
+    method public void writeToParcel(android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattCharacteristic> CREATOR;
+    field public static final int FORMAT_FLOAT = 52; // 0x34
+    field public static final int FORMAT_SFLOAT = 50; // 0x32
+    field public static final int FORMAT_SINT16 = 34; // 0x22
+    field public static final int FORMAT_SINT32 = 36; // 0x24
+    field public static final int FORMAT_SINT8 = 33; // 0x21
+    field public static final int FORMAT_UINT16 = 18; // 0x12
+    field public static final int FORMAT_UINT32 = 20; // 0x14
+    field public static final int FORMAT_UINT8 = 17; // 0x11
+    field public static final int PERMISSION_READ = 1; // 0x1
+    field public static final int PERMISSION_READ_ENCRYPTED = 2; // 0x2
+    field public static final int PERMISSION_READ_ENCRYPTED_MITM = 4; // 0x4
+    field public static final int PERMISSION_WRITE = 16; // 0x10
+    field public static final int PERMISSION_WRITE_ENCRYPTED = 32; // 0x20
+    field public static final int PERMISSION_WRITE_ENCRYPTED_MITM = 64; // 0x40
+    field public static final int PERMISSION_WRITE_SIGNED = 128; // 0x80
+    field public static final int PERMISSION_WRITE_SIGNED_MITM = 256; // 0x100
+    field public static final int PROPERTY_BROADCAST = 1; // 0x1
+    field public static final int PROPERTY_EXTENDED_PROPS = 128; // 0x80
+    field public static final int PROPERTY_INDICATE = 32; // 0x20
+    field public static final int PROPERTY_NOTIFY = 16; // 0x10
+    field public static final int PROPERTY_READ = 2; // 0x2
+    field public static final int PROPERTY_SIGNED_WRITE = 64; // 0x40
+    field public static final int PROPERTY_WRITE = 8; // 0x8
+    field public static final int PROPERTY_WRITE_NO_RESPONSE = 4; // 0x4
+    field public static final int WRITE_TYPE_DEFAULT = 2; // 0x2
+    field public static final int WRITE_TYPE_NO_RESPONSE = 1; // 0x1
+    field public static final int WRITE_TYPE_SIGNED = 4; // 0x4
+    field protected java.util.List<android.bluetooth.BluetoothGattDescriptor> mDescriptors;
+  }
+
+  public class BluetoothGattDescriptor implements android.os.Parcelable {
+    ctor public BluetoothGattDescriptor(java.util.UUID, int);
+    method public int describeContents();
+    method public android.bluetooth.BluetoothGattCharacteristic getCharacteristic();
+    method public int getPermissions();
+    method public java.util.UUID getUuid();
+    method @Deprecated public byte[] getValue();
+    method @Deprecated public boolean setValue(byte[]);
+    method public void writeToParcel(android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattDescriptor> CREATOR;
+    field public static final byte[] DISABLE_NOTIFICATION_VALUE;
+    field public static final byte[] ENABLE_INDICATION_VALUE;
+    field public static final byte[] ENABLE_NOTIFICATION_VALUE;
+    field public static final int PERMISSION_READ = 1; // 0x1
+    field public static final int PERMISSION_READ_ENCRYPTED = 2; // 0x2
+    field public static final int PERMISSION_READ_ENCRYPTED_MITM = 4; // 0x4
+    field public static final int PERMISSION_WRITE = 16; // 0x10
+    field public static final int PERMISSION_WRITE_ENCRYPTED = 32; // 0x20
+    field public static final int PERMISSION_WRITE_ENCRYPTED_MITM = 64; // 0x40
+    field public static final int PERMISSION_WRITE_SIGNED = 128; // 0x80
+    field public static final int PERMISSION_WRITE_SIGNED_MITM = 256; // 0x100
+  }
+
+  public final class BluetoothGattServer implements android.bluetooth.BluetoothProfile {
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean addService(android.bluetooth.BluetoothGattService);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void cancelConnection(android.bluetooth.BluetoothDevice);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void clearServices();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void close();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean connect(android.bluetooth.BluetoothDevice, boolean);
+    method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+    method public int getConnectionState(android.bluetooth.BluetoothDevice);
+    method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+    method public android.bluetooth.BluetoothGattService getService(java.util.UUID);
+    method public java.util.List<android.bluetooth.BluetoothGattService> getServices();
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean notifyCharacteristicChanged(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothGattCharacteristic, boolean);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int notifyCharacteristicChanged(@NonNull android.bluetooth.BluetoothDevice, @NonNull android.bluetooth.BluetoothGattCharacteristic, boolean, @NonNull byte[]);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void readPhy(android.bluetooth.BluetoothDevice);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean removeService(android.bluetooth.BluetoothGattService);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean sendResponse(android.bluetooth.BluetoothDevice, int, int, int, byte[]);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void setPreferredPhy(android.bluetooth.BluetoothDevice, int, int, int);
+  }
+
+  public abstract class BluetoothGattServerCallback {
+    ctor public BluetoothGattServerCallback();
+    method public void onCharacteristicReadRequest(android.bluetooth.BluetoothDevice, int, int, android.bluetooth.BluetoothGattCharacteristic);
+    method public void onCharacteristicWriteRequest(android.bluetooth.BluetoothDevice, int, android.bluetooth.BluetoothGattCharacteristic, boolean, boolean, int, byte[]);
+    method public void onConnectionStateChange(android.bluetooth.BluetoothDevice, int, int);
+    method public void onDescriptorReadRequest(android.bluetooth.BluetoothDevice, int, int, android.bluetooth.BluetoothGattDescriptor);
+    method public void onDescriptorWriteRequest(android.bluetooth.BluetoothDevice, int, android.bluetooth.BluetoothGattDescriptor, boolean, boolean, int, byte[]);
+    method public void onExecuteWrite(android.bluetooth.BluetoothDevice, int, boolean);
+    method public void onMtuChanged(android.bluetooth.BluetoothDevice, int);
+    method public void onNotificationSent(android.bluetooth.BluetoothDevice, int);
+    method public void onPhyRead(android.bluetooth.BluetoothDevice, int, int, int);
+    method public void onPhyUpdate(android.bluetooth.BluetoothDevice, int, int, int);
+    method public void onServiceAdded(int, android.bluetooth.BluetoothGattService);
+  }
+
+  public class BluetoothGattService implements android.os.Parcelable {
+    ctor public BluetoothGattService(java.util.UUID, int);
+    method public boolean addCharacteristic(android.bluetooth.BluetoothGattCharacteristic);
+    method public boolean addService(android.bluetooth.BluetoothGattService);
+    method public int describeContents();
+    method public android.bluetooth.BluetoothGattCharacteristic getCharacteristic(java.util.UUID);
+    method public java.util.List<android.bluetooth.BluetoothGattCharacteristic> getCharacteristics();
+    method public java.util.List<android.bluetooth.BluetoothGattService> getIncludedServices();
+    method public int getInstanceId();
+    method public int getType();
+    method public java.util.UUID getUuid();
+    method public void writeToParcel(android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattService> CREATOR;
+    field public static final int SERVICE_TYPE_PRIMARY = 0; // 0x0
+    field public static final int SERVICE_TYPE_SECONDARY = 1; // 0x1
+    field protected java.util.List<android.bluetooth.BluetoothGattCharacteristic> mCharacteristics;
+    field protected java.util.List<android.bluetooth.BluetoothGattService> mIncludedServices;
+  }
+
+  public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile {
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(android.bluetooth.BluetoothDevice);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isAudioConnected(android.bluetooth.BluetoothDevice);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isNoiseReductionSupported(@NonNull android.bluetooth.BluetoothDevice);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isVoiceRecognitionSupported(@NonNull android.bluetooth.BluetoothDevice);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean sendVendorSpecificResultCode(android.bluetooth.BluetoothDevice, String, String);
+    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean startVoiceRecognition(android.bluetooth.BluetoothDevice);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean stopVoiceRecognition(android.bluetooth.BluetoothDevice);
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_AUDIO_STATE_CHANGED = "android.bluetooth.headset.profile.action.AUDIO_STATE_CHANGED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.headset.profile.action.CONNECTION_STATE_CHANGED";
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_VENDOR_SPECIFIC_HEADSET_EVENT = "android.bluetooth.headset.action.VENDOR_SPECIFIC_HEADSET_EVENT";
+    field public static final int AT_CMD_TYPE_ACTION = 4; // 0x4
+    field public static final int AT_CMD_TYPE_BASIC = 3; // 0x3
+    field public static final int AT_CMD_TYPE_READ = 0; // 0x0
+    field public static final int AT_CMD_TYPE_SET = 2; // 0x2
+    field public static final int AT_CMD_TYPE_TEST = 1; // 0x1
+    field public static final String EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS = "android.bluetooth.headset.extra.VENDOR_SPECIFIC_HEADSET_EVENT_ARGS";
+    field public static final String EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD = "android.bluetooth.headset.extra.VENDOR_SPECIFIC_HEADSET_EVENT_CMD";
+    field public static final String EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD_TYPE = "android.bluetooth.headset.extra.VENDOR_SPECIFIC_HEADSET_EVENT_CMD_TYPE";
+    field public static final int STATE_AUDIO_CONNECTED = 12; // 0xc
+    field public static final int STATE_AUDIO_CONNECTING = 11; // 0xb
+    field public static final int STATE_AUDIO_DISCONNECTED = 10; // 0xa
+    field public static final String VENDOR_RESULT_CODE_COMMAND_ANDROID = "+ANDROID";
+    field public static final String VENDOR_SPECIFIC_HEADSET_EVENT_COMPANY_ID_CATEGORY = "android.bluetooth.headset.intent.category.companyid";
+  }
+
+  @Deprecated public final class BluetoothHealth implements android.bluetooth.BluetoothProfile {
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean connectChannelToSource(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean disconnectChannel(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration, int);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(android.bluetooth.BluetoothDevice);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.os.ParcelFileDescriptor getMainChannelFd(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean registerSinkAppConfiguration(String, int, android.bluetooth.BluetoothHealthCallback);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean unregisterAppConfiguration(android.bluetooth.BluetoothHealthAppConfiguration);
+    field @Deprecated public static final int APP_CONFIG_REGISTRATION_FAILURE = 1; // 0x1
+    field @Deprecated public static final int APP_CONFIG_REGISTRATION_SUCCESS = 0; // 0x0
+    field @Deprecated public static final int APP_CONFIG_UNREGISTRATION_FAILURE = 3; // 0x3
+    field @Deprecated public static final int APP_CONFIG_UNREGISTRATION_SUCCESS = 2; // 0x2
+    field @Deprecated public static final int CHANNEL_TYPE_RELIABLE = 10; // 0xa
+    field @Deprecated public static final int CHANNEL_TYPE_STREAMING = 11; // 0xb
+    field @Deprecated public static final int SINK_ROLE = 2; // 0x2
+    field @Deprecated public static final int SOURCE_ROLE = 1; // 0x1
+    field @Deprecated public static final int STATE_CHANNEL_CONNECTED = 2; // 0x2
+    field @Deprecated public static final int STATE_CHANNEL_CONNECTING = 1; // 0x1
+    field @Deprecated public static final int STATE_CHANNEL_DISCONNECTED = 0; // 0x0
+    field @Deprecated public static final int STATE_CHANNEL_DISCONNECTING = 3; // 0x3
+  }
+
+  @Deprecated public final class BluetoothHealthAppConfiguration implements android.os.Parcelable {
+    method @Deprecated public int describeContents();
+    method @Deprecated public int getDataType();
+    method @Deprecated public String getName();
+    method @Deprecated public int getRole();
+    method @Deprecated public void writeToParcel(android.os.Parcel, int);
+    field @Deprecated @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothHealthAppConfiguration> CREATOR;
+  }
+
+  @Deprecated public abstract class BluetoothHealthCallback {
+    ctor @Deprecated public BluetoothHealthCallback();
+    method @Deprecated @BinderThread public void onHealthAppConfigurationStatusChange(android.bluetooth.BluetoothHealthAppConfiguration, int);
+    method @Deprecated @BinderThread public void onHealthChannelStateChange(android.bluetooth.BluetoothHealthAppConfiguration, android.bluetooth.BluetoothDevice, int, int, android.os.ParcelFileDescriptor, int);
+  }
+
+  public final class BluetoothHearingAid implements android.bluetooth.BluetoothProfile {
+    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);
+    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.hearingaid.profile.action.CONNECTION_STATE_CHANGED";
+  }
+
+  public final class BluetoothHidDevice implements android.bluetooth.BluetoothProfile {
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean connect(android.bluetooth.BluetoothDevice);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean disconnect(android.bluetooth.BluetoothDevice);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(android.bluetooth.BluetoothDevice);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean registerApp(android.bluetooth.BluetoothHidDeviceAppSdpSettings, android.bluetooth.BluetoothHidDeviceAppQosSettings, android.bluetooth.BluetoothHidDeviceAppQosSettings, java.util.concurrent.Executor, android.bluetooth.BluetoothHidDevice.Callback);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean replyReport(android.bluetooth.BluetoothDevice, byte, byte, byte[]);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean reportError(android.bluetooth.BluetoothDevice, byte);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean sendReport(android.bluetooth.BluetoothDevice, int, byte[]);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean unregisterApp();
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.hiddevice.profile.action.CONNECTION_STATE_CHANGED";
+    field public static final byte ERROR_RSP_INVALID_PARAM = 4; // 0x4
+    field public static final byte ERROR_RSP_INVALID_RPT_ID = 2; // 0x2
+    field public static final byte ERROR_RSP_NOT_READY = 1; // 0x1
+    field public static final byte ERROR_RSP_SUCCESS = 0; // 0x0
+    field public static final byte ERROR_RSP_UNKNOWN = 14; // 0xe
+    field public static final byte ERROR_RSP_UNSUPPORTED_REQ = 3; // 0x3
+    field public static final byte PROTOCOL_BOOT_MODE = 0; // 0x0
+    field public static final byte PROTOCOL_REPORT_MODE = 1; // 0x1
+    field public static final byte REPORT_TYPE_FEATURE = 3; // 0x3
+    field public static final byte REPORT_TYPE_INPUT = 1; // 0x1
+    field public static final byte REPORT_TYPE_OUTPUT = 2; // 0x2
+    field public static final byte SUBCLASS1_COMBO = -64; // 0xffffffc0
+    field public static final byte SUBCLASS1_KEYBOARD = 64; // 0x40
+    field public static final byte SUBCLASS1_MOUSE = -128; // 0xffffff80
+    field public static final byte SUBCLASS1_NONE = 0; // 0x0
+    field public static final byte SUBCLASS2_CARD_READER = 6; // 0x6
+    field public static final byte SUBCLASS2_DIGITIZER_TABLET = 5; // 0x5
+    field public static final byte SUBCLASS2_GAMEPAD = 2; // 0x2
+    field public static final byte SUBCLASS2_JOYSTICK = 1; // 0x1
+    field public static final byte SUBCLASS2_REMOTE_CONTROL = 3; // 0x3
+    field public static final byte SUBCLASS2_SENSING_DEVICE = 4; // 0x4
+    field public static final byte SUBCLASS2_UNCATEGORIZED = 0; // 0x0
+  }
+
+  public abstract static class BluetoothHidDevice.Callback {
+    ctor public BluetoothHidDevice.Callback();
+    method public void onAppStatusChanged(android.bluetooth.BluetoothDevice, boolean);
+    method public void onConnectionStateChanged(android.bluetooth.BluetoothDevice, int);
+    method public void onGetReport(android.bluetooth.BluetoothDevice, byte, byte, int);
+    method public void onInterruptData(android.bluetooth.BluetoothDevice, byte, byte[]);
+    method public void onSetProtocol(android.bluetooth.BluetoothDevice, byte);
+    method public void onSetReport(android.bluetooth.BluetoothDevice, byte, byte, byte[]);
+    method public void onVirtualCableUnplug(android.bluetooth.BluetoothDevice);
+  }
+
+  public final class BluetoothHidDeviceAppQosSettings implements android.os.Parcelable {
+    ctor public BluetoothHidDeviceAppQosSettings(int, int, int, int, int, int);
+    method public int describeContents();
+    method public int getDelayVariation();
+    method public int getLatency();
+    method public int getPeakBandwidth();
+    method public int getServiceType();
+    method public int getTokenBucketSize();
+    method public int getTokenRate();
+    method public void writeToParcel(android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothHidDeviceAppQosSettings> CREATOR;
+    field public static final int MAX = -1; // 0xffffffff
+    field public static final int SERVICE_BEST_EFFORT = 1; // 0x1
+    field public static final int SERVICE_GUARANTEED = 2; // 0x2
+    field public static final int SERVICE_NO_TRAFFIC = 0; // 0x0
+  }
+
+  public final class BluetoothHidDeviceAppSdpSettings implements android.os.Parcelable {
+    ctor public BluetoothHidDeviceAppSdpSettings(String, String, String, byte, byte[]);
+    method public int describeContents();
+    method public String getDescription();
+    method public byte[] getDescriptors();
+    method public String getName();
+    method public String getProvider();
+    method public byte getSubclass();
+    method public void writeToParcel(android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothHidDeviceAppSdpSettings> CREATOR;
+  }
+
+  public final class BluetoothLeAudio implements java.lang.AutoCloseable android.bluetooth.BluetoothProfile {
+    method public void close();
+    method protected void finalize();
+    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothDevice getConnectedGroupLeadDevice(int);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);
+    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getGroupId(@NonNull android.bluetooth.BluetoothDevice);
+    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_LE_AUDIO_CONNECTION_STATE_CHANGED = "android.bluetooth.action.LE_AUDIO_CONNECTION_STATE_CHANGED";
+    field public static final int GROUP_ID_INVALID = -1; // 0xffffffff
+  }
+
+  public final class BluetoothLeAudioCodecConfig implements android.os.Parcelable {
+    method public int describeContents();
+    method public int getBitsPerSample();
+    method public int getChannelCount();
+    method @NonNull public String getCodecName();
+    method public int getCodecPriority();
+    method public int getCodecType();
+    method public int getFrameDuration();
+    method public int getMaxOctetsPerFrame();
+    method public int getMinOctetsPerFrame();
+    method public int getOctetsPerFrame();
+    method public int getSampleRate();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field public static final int BITS_PER_SAMPLE_16 = 1; // 0x1
+    field public static final int BITS_PER_SAMPLE_24 = 2; // 0x2
+    field public static final int BITS_PER_SAMPLE_32 = 8; // 0x8
+    field public static final int BITS_PER_SAMPLE_NONE = 0; // 0x0
+    field public static final int CHANNEL_COUNT_1 = 1; // 0x1
+    field public static final int CHANNEL_COUNT_2 = 2; // 0x2
+    field public static final int CHANNEL_COUNT_NONE = 0; // 0x0
+    field public static final int CODEC_PRIORITY_DEFAULT = 0; // 0x0
+    field public static final int CODEC_PRIORITY_DISABLED = -1; // 0xffffffff
+    field public static final int CODEC_PRIORITY_HIGHEST = 1000000; // 0xf4240
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothLeAudioCodecConfig> CREATOR;
+    field public static final int FRAME_DURATION_10000 = 2; // 0x2
+    field public static final int FRAME_DURATION_7500 = 1; // 0x1
+    field public static final int FRAME_DURATION_NONE = 0; // 0x0
+    field public static final int SAMPLE_RATE_16000 = 4; // 0x4
+    field public static final int SAMPLE_RATE_24000 = 16; // 0x10
+    field public static final int SAMPLE_RATE_32000 = 32; // 0x20
+    field public static final int SAMPLE_RATE_44100 = 64; // 0x40
+    field public static final int SAMPLE_RATE_48000 = 128; // 0x80
+    field public static final int SAMPLE_RATE_8000 = 1; // 0x1
+    field public static final int SAMPLE_RATE_NONE = 0; // 0x0
+    field public static final int SOURCE_CODEC_TYPE_INVALID = 1000000; // 0xf4240
+    field public static final int SOURCE_CODEC_TYPE_LC3 = 0; // 0x0
+  }
+
+  public static final class BluetoothLeAudioCodecConfig.Builder {
+    ctor public BluetoothLeAudioCodecConfig.Builder();
+    ctor public BluetoothLeAudioCodecConfig.Builder(@NonNull android.bluetooth.BluetoothLeAudioCodecConfig);
+    method @NonNull public android.bluetooth.BluetoothLeAudioCodecConfig build();
+    method @NonNull public android.bluetooth.BluetoothLeAudioCodecConfig.Builder setBitsPerSample(int);
+    method @NonNull public android.bluetooth.BluetoothLeAudioCodecConfig.Builder setChannelCount(int);
+    method @NonNull public android.bluetooth.BluetoothLeAudioCodecConfig.Builder setCodecPriority(int);
+    method @NonNull public android.bluetooth.BluetoothLeAudioCodecConfig.Builder setCodecType(int);
+    method @NonNull public android.bluetooth.BluetoothLeAudioCodecConfig.Builder setFrameDuration(int);
+    method @NonNull public android.bluetooth.BluetoothLeAudioCodecConfig.Builder setMaxOctetsPerFrame(int);
+    method @NonNull public android.bluetooth.BluetoothLeAudioCodecConfig.Builder setMinOctetsPerFrame(int);
+    method @NonNull public android.bluetooth.BluetoothLeAudioCodecConfig.Builder setOctetsPerFrame(int);
+    method @NonNull public android.bluetooth.BluetoothLeAudioCodecConfig.Builder setSampleRate(int);
+  }
+
+  public final class BluetoothLeAudioCodecStatus implements android.os.Parcelable {
+    ctor public BluetoothLeAudioCodecStatus(@Nullable android.bluetooth.BluetoothLeAudioCodecConfig, @Nullable android.bluetooth.BluetoothLeAudioCodecConfig, @NonNull java.util.List<android.bluetooth.BluetoothLeAudioCodecConfig>, @NonNull java.util.List<android.bluetooth.BluetoothLeAudioCodecConfig>, @NonNull java.util.List<android.bluetooth.BluetoothLeAudioCodecConfig>, @NonNull java.util.List<android.bluetooth.BluetoothLeAudioCodecConfig>);
+    method public int describeContents();
+    method @Nullable public android.bluetooth.BluetoothLeAudioCodecConfig getInputCodecConfig();
+    method @NonNull public java.util.List<android.bluetooth.BluetoothLeAudioCodecConfig> getInputCodecLocalCapabilities();
+    method @NonNull public java.util.List<android.bluetooth.BluetoothLeAudioCodecConfig> getInputCodecSelectableCapabilities();
+    method @Nullable public android.bluetooth.BluetoothLeAudioCodecConfig getOutputCodecConfig();
+    method @NonNull public java.util.List<android.bluetooth.BluetoothLeAudioCodecConfig> getOutputCodecLocalCapabilities();
+    method @NonNull public java.util.List<android.bluetooth.BluetoothLeAudioCodecConfig> getOutputCodecSelectableCapabilities();
+    method public boolean isInputCodecConfigSelectable(@Nullable android.bluetooth.BluetoothLeAudioCodecConfig);
+    method public boolean isOutputCodecConfigSelectable(@Nullable android.bluetooth.BluetoothLeAudioCodecConfig);
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothLeAudioCodecStatus> CREATOR;
+    field public static final String EXTRA_LE_AUDIO_CODEC_STATUS = "android.bluetooth.extra.LE_AUDIO_CODEC_STATUS";
+  }
+
+  public final class BluetoothManager {
+    method public android.bluetooth.BluetoothAdapter getAdapter();
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices(int);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(android.bluetooth.BluetoothDevice, int);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int, int[]);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothGattServer openGattServer(android.content.Context, android.bluetooth.BluetoothGattServerCallback);
+  }
+
+  public interface BluetoothProfile {
+    method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
+    method public int getConnectionState(android.bluetooth.BluetoothDevice);
+    method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
+    field public static final int A2DP = 2; // 0x2
+    field public static final int CSIP_SET_COORDINATOR = 25; // 0x19
+    field public static final String EXTRA_PREVIOUS_STATE = "android.bluetooth.profile.extra.PREVIOUS_STATE";
+    field public static final String EXTRA_STATE = "android.bluetooth.profile.extra.STATE";
+    field public static final int GATT = 7; // 0x7
+    field public static final int GATT_SERVER = 8; // 0x8
+    field public static final int HAP_CLIENT = 28; // 0x1c
+    field public static final int HEADSET = 1; // 0x1
+    field @Deprecated public static final int HEALTH = 3; // 0x3
+    field public static final int HEARING_AID = 21; // 0x15
+    field public static final int HID_DEVICE = 19; // 0x13
+    field public static final int LE_AUDIO = 22; // 0x16
+    field public static final int SAP = 10; // 0xa
+    field public static final int STATE_CONNECTED = 2; // 0x2
+    field public static final int STATE_CONNECTING = 1; // 0x1
+    field public static final int STATE_DISCONNECTED = 0; // 0x0
+    field public static final int STATE_DISCONNECTING = 3; // 0x3
+  }
+
+  public static interface BluetoothProfile.ServiceListener {
+    method public void onServiceConnected(int, android.bluetooth.BluetoothProfile);
+    method public void onServiceDisconnected(int);
+  }
+
+  public final class BluetoothServerSocket implements java.io.Closeable {
+    method public android.bluetooth.BluetoothSocket accept() throws java.io.IOException;
+    method public android.bluetooth.BluetoothSocket accept(int) throws java.io.IOException;
+    method public void close() throws java.io.IOException;
+    method public int getPsm();
+  }
+
+  public final class BluetoothSocket implements java.io.Closeable {
+    method public void close() throws java.io.IOException;
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void connect() throws java.io.IOException;
+    method public int getConnectionType();
+    method public java.io.InputStream getInputStream() throws java.io.IOException;
+    method public int getMaxReceivePacketSize();
+    method public int getMaxTransmitPacketSize();
+    method public java.io.OutputStream getOutputStream() throws java.io.IOException;
+    method public android.bluetooth.BluetoothDevice getRemoteDevice();
+    method public boolean isConnected();
+    field public static final int TYPE_L2CAP = 3; // 0x3
+    field public static final int TYPE_RFCOMM = 1; // 0x1
+    field public static final int TYPE_SCO = 2; // 0x2
+  }
+
+  public final class BluetoothStatusCodes {
+    field public static final int ERROR_BLUETOOTH_NOT_ALLOWED = 2; // 0x2
+    field public static final int ERROR_BLUETOOTH_NOT_ENABLED = 1; // 0x1
+    field public static final int ERROR_DEVICE_NOT_BONDED = 3; // 0x3
+    field public static final int ERROR_GATT_WRITE_NOT_ALLOWED = 200; // 0xc8
+    field public static final int ERROR_GATT_WRITE_REQUEST_BUSY = 201; // 0xc9
+    field public static final int ERROR_MISSING_BLUETOOTH_CONNECT_PERMISSION = 6; // 0x6
+    field public static final int ERROR_MISSING_BLUETOOTH_PRIVILEGED_PERMISSION = 8; // 0x8
+    field public static final int ERROR_PROFILE_SERVICE_NOT_BOUND = 9; // 0x9
+    field public static final int ERROR_UNKNOWN = 2147483647; // 0x7fffffff
+    field public static final int FEATURE_NOT_SUPPORTED = 11; // 0xb
+    field public static final int FEATURE_SUPPORTED = 10; // 0xa
+    field public static final int SUCCESS = 0; // 0x0
+  }
+
+}
+
+package android.bluetooth.le {
+
+  public abstract class AdvertiseCallback {
+    ctor public AdvertiseCallback();
+    method public void onStartFailure(int);
+    method public void onStartSuccess(android.bluetooth.le.AdvertiseSettings);
+    field public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3; // 0x3
+    field public static final int ADVERTISE_FAILED_DATA_TOO_LARGE = 1; // 0x1
+    field public static final int ADVERTISE_FAILED_FEATURE_UNSUPPORTED = 5; // 0x5
+    field public static final int ADVERTISE_FAILED_INTERNAL_ERROR = 4; // 0x4
+    field public static final int ADVERTISE_FAILED_TOO_MANY_ADVERTISERS = 2; // 0x2
+  }
+
+  public final class AdvertiseData implements android.os.Parcelable {
+    method public int describeContents();
+    method public boolean getIncludeDeviceName();
+    method public boolean getIncludeTxPowerLevel();
+    method public android.util.SparseArray<byte[]> getManufacturerSpecificData();
+    method public java.util.Map<android.os.ParcelUuid,byte[]> getServiceData();
+    method @NonNull public java.util.List<android.os.ParcelUuid> getServiceSolicitationUuids();
+    method public java.util.List<android.os.ParcelUuid> getServiceUuids();
+    method @NonNull public java.util.List<android.bluetooth.le.TransportDiscoveryData> getTransportDiscoveryData();
+    method public void writeToParcel(android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertiseData> CREATOR;
+  }
+
+  public static final class AdvertiseData.Builder {
+    ctor public AdvertiseData.Builder();
+    method public android.bluetooth.le.AdvertiseData.Builder addManufacturerData(int, byte[]);
+    method public android.bluetooth.le.AdvertiseData.Builder addServiceData(android.os.ParcelUuid, byte[]);
+    method @NonNull public android.bluetooth.le.AdvertiseData.Builder addServiceSolicitationUuid(@NonNull android.os.ParcelUuid);
+    method public android.bluetooth.le.AdvertiseData.Builder addServiceUuid(android.os.ParcelUuid);
+    method @NonNull public android.bluetooth.le.AdvertiseData.Builder addTransportDiscoveryData(@NonNull android.bluetooth.le.TransportDiscoveryData);
+    method public android.bluetooth.le.AdvertiseData build();
+    method public android.bluetooth.le.AdvertiseData.Builder setIncludeDeviceName(boolean);
+    method public android.bluetooth.le.AdvertiseData.Builder setIncludeTxPowerLevel(boolean);
+  }
+
+  public final class AdvertiseSettings implements android.os.Parcelable {
+    method public int describeContents();
+    method public int getMode();
+    method public int getTimeout();
+    method public int getTxPowerLevel();
+    method public boolean isConnectable();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final int ADVERTISE_MODE_BALANCED = 1; // 0x1
+    field public static final int ADVERTISE_MODE_LOW_LATENCY = 2; // 0x2
+    field public static final int ADVERTISE_MODE_LOW_POWER = 0; // 0x0
+    field public static final int ADVERTISE_TX_POWER_HIGH = 3; // 0x3
+    field public static final int ADVERTISE_TX_POWER_LOW = 1; // 0x1
+    field public static final int ADVERTISE_TX_POWER_MEDIUM = 2; // 0x2
+    field public static final int ADVERTISE_TX_POWER_ULTRA_LOW = 0; // 0x0
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertiseSettings> CREATOR;
+  }
+
+  public static final class AdvertiseSettings.Builder {
+    ctor public AdvertiseSettings.Builder();
+    method public android.bluetooth.le.AdvertiseSettings build();
+    method public android.bluetooth.le.AdvertiseSettings.Builder setAdvertiseMode(int);
+    method public android.bluetooth.le.AdvertiseSettings.Builder setConnectable(boolean);
+    method public android.bluetooth.le.AdvertiseSettings.Builder setTimeout(int);
+    method public android.bluetooth.le.AdvertiseSettings.Builder setTxPowerLevel(int);
+  }
+
+  public final class AdvertisingSet {
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void enableAdvertising(boolean, int, int);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setAdvertisingData(android.bluetooth.le.AdvertiseData);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setAdvertisingParameters(android.bluetooth.le.AdvertisingSetParameters);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setPeriodicAdvertisingData(android.bluetooth.le.AdvertiseData);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setPeriodicAdvertisingEnabled(boolean);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setScanResponseData(android.bluetooth.le.AdvertiseData);
+  }
+
+  public abstract class AdvertisingSetCallback {
+    ctor public AdvertisingSetCallback();
+    method public void onAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
+    method public void onAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int);
+    method public void onAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int, int);
+    method public void onAdvertisingSetStarted(android.bluetooth.le.AdvertisingSet, int, int);
+    method public void onAdvertisingSetStopped(android.bluetooth.le.AdvertisingSet);
+    method public void onPeriodicAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
+    method public void onPeriodicAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int);
+    method public void onPeriodicAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int);
+    method public void onScanResponseDataSet(android.bluetooth.le.AdvertisingSet, int);
+    field public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3; // 0x3
+    field public static final int ADVERTISE_FAILED_DATA_TOO_LARGE = 1; // 0x1
+    field public static final int ADVERTISE_FAILED_FEATURE_UNSUPPORTED = 5; // 0x5
+    field public static final int ADVERTISE_FAILED_INTERNAL_ERROR = 4; // 0x4
+    field public static final int ADVERTISE_FAILED_TOO_MANY_ADVERTISERS = 2; // 0x2
+    field public static final int ADVERTISE_SUCCESS = 0; // 0x0
+  }
+
+  public final class AdvertisingSetParameters implements android.os.Parcelable {
+    method public int describeContents();
+    method public int getInterval();
+    method public int getPrimaryPhy();
+    method public int getSecondaryPhy();
+    method public int getTxPowerLevel();
+    method public boolean includeTxPower();
+    method public boolean isAnonymous();
+    method public boolean isConnectable();
+    method public boolean isLegacy();
+    method public boolean isScannable();
+    method public void writeToParcel(android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertisingSetParameters> CREATOR;
+    field public static final int INTERVAL_HIGH = 1600; // 0x640
+    field public static final int INTERVAL_LOW = 160; // 0xa0
+    field public static final int INTERVAL_MAX = 16777215; // 0xffffff
+    field public static final int INTERVAL_MEDIUM = 400; // 0x190
+    field public static final int INTERVAL_MIN = 160; // 0xa0
+    field public static final int TX_POWER_HIGH = 1; // 0x1
+    field public static final int TX_POWER_LOW = -15; // 0xfffffff1
+    field public static final int TX_POWER_MAX = 1; // 0x1
+    field public static final int TX_POWER_MEDIUM = -7; // 0xfffffff9
+    field public static final int TX_POWER_MIN = -127; // 0xffffff81
+    field public static final int TX_POWER_ULTRA_LOW = -21; // 0xffffffeb
+  }
+
+  public static final class AdvertisingSetParameters.Builder {
+    ctor public AdvertisingSetParameters.Builder();
+    method public android.bluetooth.le.AdvertisingSetParameters build();
+    method public android.bluetooth.le.AdvertisingSetParameters.Builder setAnonymous(boolean);
+    method public android.bluetooth.le.AdvertisingSetParameters.Builder setConnectable(boolean);
+    method public android.bluetooth.le.AdvertisingSetParameters.Builder setIncludeTxPower(boolean);
+    method public android.bluetooth.le.AdvertisingSetParameters.Builder setInterval(int);
+    method public android.bluetooth.le.AdvertisingSetParameters.Builder setLegacyMode(boolean);
+    method public android.bluetooth.le.AdvertisingSetParameters.Builder setPrimaryPhy(int);
+    method public android.bluetooth.le.AdvertisingSetParameters.Builder setScannable(boolean);
+    method public android.bluetooth.le.AdvertisingSetParameters.Builder setSecondaryPhy(int);
+    method public android.bluetooth.le.AdvertisingSetParameters.Builder setTxPowerLevel(int);
+  }
+
+  public final class BluetoothLeAdvertiser {
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertisingSetCallback);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertisingSetCallback, android.os.Handler);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, int, int, android.bluetooth.le.AdvertisingSetCallback);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, int, int, android.bluetooth.le.AdvertisingSetCallback, android.os.Handler);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void stopAdvertising(android.bluetooth.le.AdvertiseCallback);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void stopAdvertisingSet(android.bluetooth.le.AdvertisingSetCallback);
+  }
+
+  public final class BluetoothLeScanner {
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void flushPendingScanResults(android.bluetooth.le.ScanCallback);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void startScan(android.bluetooth.le.ScanCallback);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void startScan(java.util.List<android.bluetooth.le.ScanFilter>, android.bluetooth.le.ScanSettings, android.bluetooth.le.ScanCallback);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public int startScan(@Nullable java.util.List<android.bluetooth.le.ScanFilter>, @Nullable android.bluetooth.le.ScanSettings, @NonNull android.app.PendingIntent);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void stopScan(android.bluetooth.le.ScanCallback);
+    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void stopScan(android.app.PendingIntent);
+    field public static final String EXTRA_CALLBACK_TYPE = "android.bluetooth.le.extra.CALLBACK_TYPE";
+    field public static final String EXTRA_ERROR_CODE = "android.bluetooth.le.extra.ERROR_CODE";
+    field public static final String EXTRA_LIST_SCAN_RESULT = "android.bluetooth.le.extra.LIST_SCAN_RESULT";
+  }
+
+  public final class PeriodicAdvertisingParameters implements android.os.Parcelable {
+    method public int describeContents();
+    method public boolean getIncludeTxPower();
+    method public int getInterval();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final android.os.Parcelable.Creator<android.bluetooth.le.PeriodicAdvertisingParameters> CREATOR;
+  }
+
+  public static final class PeriodicAdvertisingParameters.Builder {
+    ctor public PeriodicAdvertisingParameters.Builder();
+    method public android.bluetooth.le.PeriodicAdvertisingParameters build();
+    method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setIncludeTxPower(boolean);
+    method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setInterval(int);
+  }
+
+  public abstract class ScanCallback {
+    ctor public ScanCallback();
+    method public void onBatchScanResults(java.util.List<android.bluetooth.le.ScanResult>);
+    method public void onScanFailed(int);
+    method public void onScanResult(int, android.bluetooth.le.ScanResult);
+    field public static final int SCAN_FAILED_ALREADY_STARTED = 1; // 0x1
+    field public static final int SCAN_FAILED_APPLICATION_REGISTRATION_FAILED = 2; // 0x2
+    field public static final int SCAN_FAILED_FEATURE_UNSUPPORTED = 4; // 0x4
+    field public static final int SCAN_FAILED_INTERNAL_ERROR = 3; // 0x3
+    field public static final int SCAN_FAILED_OUT_OF_HARDWARE_RESOURCES = 5; // 0x5
+    field public static final int SCAN_FAILED_SCANNING_TOO_FREQUENTLY = 6; // 0x6
+  }
+
+  public final class ScanFilter implements android.os.Parcelable {
+    method public int describeContents();
+    method @Nullable public byte[] getAdvertisingData();
+    method @Nullable public byte[] getAdvertisingDataMask();
+    method public int getAdvertisingDataType();
+    method @Nullable public String getDeviceAddress();
+    method @Nullable public String getDeviceName();
+    method @Nullable public byte[] getManufacturerData();
+    method @Nullable public byte[] getManufacturerDataMask();
+    method public int getManufacturerId();
+    method @Nullable public byte[] getServiceData();
+    method @Nullable public byte[] getServiceDataMask();
+    method @Nullable public android.os.ParcelUuid getServiceDataUuid();
+    method @Nullable public android.os.ParcelUuid getServiceSolicitationUuid();
+    method @Nullable public android.os.ParcelUuid getServiceSolicitationUuidMask();
+    method @Nullable public android.os.ParcelUuid getServiceUuid();
+    method @Nullable public android.os.ParcelUuid getServiceUuidMask();
+    method public boolean matches(android.bluetooth.le.ScanResult);
+    method public void writeToParcel(android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.ScanFilter> CREATOR;
+  }
+
+  public static final class ScanFilter.Builder {
+    ctor public ScanFilter.Builder();
+    method public android.bluetooth.le.ScanFilter build();
+    method @NonNull public android.bluetooth.le.ScanFilter.Builder setAdvertisingDataWithType(int, @Nullable byte[], @Nullable byte[]);
+    method public android.bluetooth.le.ScanFilter.Builder setDeviceAddress(String);
+    method public android.bluetooth.le.ScanFilter.Builder setDeviceName(String);
+    method public android.bluetooth.le.ScanFilter.Builder setManufacturerData(int, byte[]);
+    method public android.bluetooth.le.ScanFilter.Builder setManufacturerData(int, byte[], byte[]);
+    method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[]);
+    method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[], byte[]);
+    method @NonNull public android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid(@Nullable android.os.ParcelUuid);
+    method @NonNull public android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid(@Nullable android.os.ParcelUuid, @Nullable android.os.ParcelUuid);
+    method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid);
+    method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid, android.os.ParcelUuid);
+  }
+
+  public final class ScanRecord {
+    method public int getAdvertiseFlags();
+    method @NonNull public java.util.Map<java.lang.Integer,byte[]> getAdvertisingDataMap();
+    method public byte[] getBytes();
+    method @Nullable public String getDeviceName();
+    method public android.util.SparseArray<byte[]> getManufacturerSpecificData();
+    method @Nullable public byte[] getManufacturerSpecificData(int);
+    method public java.util.Map<android.os.ParcelUuid,byte[]> getServiceData();
+    method @Nullable public byte[] getServiceData(android.os.ParcelUuid);
+    method @NonNull public java.util.List<android.os.ParcelUuid> getServiceSolicitationUuids();
+    method public java.util.List<android.os.ParcelUuid> getServiceUuids();
+    method public int getTxPowerLevel();
+  }
+
+  public final class ScanResult implements android.os.Parcelable {
+    ctor @Deprecated public ScanResult(android.bluetooth.BluetoothDevice, android.bluetooth.le.ScanRecord, int, long);
+    ctor public ScanResult(android.bluetooth.BluetoothDevice, int, int, int, int, int, int, int, android.bluetooth.le.ScanRecord, long);
+    method public int describeContents();
+    method public int getAdvertisingSid();
+    method public int getDataStatus();
+    method public android.bluetooth.BluetoothDevice getDevice();
+    method public int getPeriodicAdvertisingInterval();
+    method public int getPrimaryPhy();
+    method public int getRssi();
+    method @Nullable public android.bluetooth.le.ScanRecord getScanRecord();
+    method public int getSecondaryPhy();
+    method public long getTimestampNanos();
+    method public int getTxPower();
+    method public boolean isConnectable();
+    method public boolean isLegacy();
+    method public void writeToParcel(android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.ScanResult> CREATOR;
+    field public static final int DATA_COMPLETE = 0; // 0x0
+    field public static final int DATA_TRUNCATED = 2; // 0x2
+    field public static final int PERIODIC_INTERVAL_NOT_PRESENT = 0; // 0x0
+    field public static final int PHY_UNUSED = 0; // 0x0
+    field public static final int SID_NOT_PRESENT = 255; // 0xff
+    field public static final int TX_POWER_NOT_PRESENT = 127; // 0x7f
+  }
+
+  public final class ScanSettings implements android.os.Parcelable {
+    method public int describeContents();
+    method public int getCallbackType();
+    method public boolean getLegacy();
+    method public int getPhy();
+    method public long getReportDelayMillis();
+    method public int getScanMode();
+    method public int getScanResultType();
+    method public void writeToParcel(android.os.Parcel, int);
+    field public static final int CALLBACK_TYPE_ALL_MATCHES = 1; // 0x1
+    field public static final int CALLBACK_TYPE_FIRST_MATCH = 2; // 0x2
+    field public static final int CALLBACK_TYPE_MATCH_LOST = 4; // 0x4
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.ScanSettings> CREATOR;
+    field public static final int MATCH_MODE_AGGRESSIVE = 1; // 0x1
+    field public static final int MATCH_MODE_STICKY = 2; // 0x2
+    field public static final int MATCH_NUM_FEW_ADVERTISEMENT = 2; // 0x2
+    field public static final int MATCH_NUM_MAX_ADVERTISEMENT = 3; // 0x3
+    field public static final int MATCH_NUM_ONE_ADVERTISEMENT = 1; // 0x1
+    field public static final int PHY_LE_ALL_SUPPORTED = 255; // 0xff
+    field public static final int SCAN_MODE_BALANCED = 1; // 0x1
+    field public static final int SCAN_MODE_LOW_LATENCY = 2; // 0x2
+    field public static final int SCAN_MODE_LOW_POWER = 0; // 0x0
+    field public static final int SCAN_MODE_OPPORTUNISTIC = -1; // 0xffffffff
+  }
+
+  public static final class ScanSettings.Builder {
+    ctor public ScanSettings.Builder();
+    method public android.bluetooth.le.ScanSettings build();
+    method public android.bluetooth.le.ScanSettings.Builder setCallbackType(int);
+    method public android.bluetooth.le.ScanSettings.Builder setLegacy(boolean);
+    method public android.bluetooth.le.ScanSettings.Builder setMatchMode(int);
+    method public android.bluetooth.le.ScanSettings.Builder setNumOfMatches(int);
+    method public android.bluetooth.le.ScanSettings.Builder setPhy(int);
+    method public android.bluetooth.le.ScanSettings.Builder setReportDelay(long);
+    method public android.bluetooth.le.ScanSettings.Builder setScanMode(int);
+  }
+
+  public final class TransportBlock implements android.os.Parcelable {
+    ctor public TransportBlock(int, int, int, @Nullable byte[]);
+    method public int describeContents();
+    method public int getOrgId();
+    method public int getTdsFlags();
+    method @Nullable public byte[] getTransportData();
+    method public int getTransportDataLength();
+    method @Nullable public byte[] toByteArray();
+    method public int totalBytes();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.TransportBlock> CREATOR;
+  }
+
+  public final class TransportDiscoveryData implements android.os.Parcelable {
+    ctor public TransportDiscoveryData(int, @NonNull java.util.List<android.bluetooth.le.TransportBlock>);
+    ctor public TransportDiscoveryData(@NonNull byte[]);
+    method public int describeContents();
+    method @NonNull public java.util.List<android.bluetooth.le.TransportBlock> getTransportBlocks();
+    method public int getTransportDataType();
+    method @Nullable public byte[] toByteArray();
+    method public int totalBytes();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.TransportDiscoveryData> CREATOR;
+  }
+
+}
+
diff --git a/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/current.txt b/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/current.txt
index adabda3..064d998 100644
--- a/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/current.txt
+++ b/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/current.txt
@@ -8,6 +8,9 @@
   public static final class Manifest.permission {
     ctor public Manifest.permission();
     field public static final String ACCEPT_HANDOVER = "android.permission.ACCEPT_HANDOVER";
+    field public static final String ACCESS_ADSERVICES_ATTRIBUTION = "android.permission.ACCESS_ADSERVICES_ATTRIBUTION";
+    field public static final String ACCESS_ADSERVICES_CUSTOM_AUDIENCES = "android.permission.ACCESS_ADSERVICES_CUSTOM_AUDIENCES";
+    field public static final String ACCESS_ADSERVICES_TOPICS = "android.permission.ACCESS_ADSERVICES_TOPICS";
     field public static final String ACCESS_BACKGROUND_LOCATION = "android.permission.ACCESS_BACKGROUND_LOCATION";
     field public static final String ACCESS_BLOBS_ACROSS_USERS = "android.permission.ACCESS_BLOBS_ACROSS_USERS";
     field public static final String ACCESS_CHECKIN_PROPERTIES = "android.permission.ACCESS_CHECKIN_PROPERTIES";
@@ -49,6 +52,7 @@
     field public static final String BIND_TELECOM_CONNECTION_SERVICE = "android.permission.BIND_TELECOM_CONNECTION_SERVICE";
     field public static final String BIND_TEXT_SERVICE = "android.permission.BIND_TEXT_SERVICE";
     field public static final String BIND_TV_INPUT = "android.permission.BIND_TV_INPUT";
+    field public static final String BIND_TV_INTERACTIVE_APP = "android.permission.BIND_TV_INTERACTIVE_APP";
     field public static final String BIND_VISUAL_VOICEMAIL_SERVICE = "android.permission.BIND_VISUAL_VOICEMAIL_SERVICE";
     field public static final String BIND_VOICE_INTERACTION = "android.permission.BIND_VOICE_INTERACTION";
     field public static final String BIND_VPN_SERVICE = "android.permission.BIND_VPN_SERVICE";
@@ -61,6 +65,7 @@
     field public static final String BLUETOOTH_PRIVILEGED = "android.permission.BLUETOOTH_PRIVILEGED";
     field public static final String BLUETOOTH_SCAN = "android.permission.BLUETOOTH_SCAN";
     field public static final String BODY_SENSORS = "android.permission.BODY_SENSORS";
+    field public static final String BODY_SENSORS_BACKGROUND = "android.permission.BODY_SENSORS_BACKGROUND";
     field public static final String BROADCAST_PACKAGE_REMOVED = "android.permission.BROADCAST_PACKAGE_REMOVED";
     field public static final String BROADCAST_SMS = "android.permission.BROADCAST_SMS";
     field public static final String BROADCAST_STICKY = "android.permission.BROADCAST_STICKY";
@@ -79,6 +84,7 @@
     field public static final String CONTROL_LOCATION_UPDATES = "android.permission.CONTROL_LOCATION_UPDATES";
     field public static final String DELETE_CACHE_FILES = "android.permission.DELETE_CACHE_FILES";
     field public static final String DELETE_PACKAGES = "android.permission.DELETE_PACKAGES";
+    field public static final String DELIVER_COMPANION_MESSAGES = "android.permission.DELIVER_COMPANION_MESSAGES";
     field public static final String DIAGNOSTIC = "android.permission.DIAGNOSTIC";
     field public static final String DISABLE_KEYGUARD = "android.permission.DISABLE_KEYGUARD";
     field public static final String DUMP = "android.permission.DUMP";
@@ -99,6 +105,7 @@
     field public static final String INTERACT_ACROSS_PROFILES = "android.permission.INTERACT_ACROSS_PROFILES";
     field public static final String INTERNET = "android.permission.INTERNET";
     field public static final String KILL_BACKGROUND_PROCESSES = "android.permission.KILL_BACKGROUND_PROCESSES";
+    field public static final String LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK = "android.permission.LAUNCH_MULTI_PANE_SETTINGS_DEEP_LINK";
     field public static final String LOADER_USAGE_STATS = "android.permission.LOADER_USAGE_STATS";
     field public static final String LOCATION_HARDWARE = "android.permission.LOCATION_HARDWARE";
     field public static final String MANAGE_DOCUMENTS = "android.permission.MANAGE_DOCUMENTS";
@@ -106,25 +113,38 @@
     field public static final String MANAGE_MEDIA = "android.permission.MANAGE_MEDIA";
     field public static final String MANAGE_ONGOING_CALLS = "android.permission.MANAGE_ONGOING_CALLS";
     field public static final String MANAGE_OWN_CALLS = "android.permission.MANAGE_OWN_CALLS";
+    field @Deprecated public static final String MANAGE_WIFI_AUTO_JOIN = "android.permission.MANAGE_WIFI_AUTO_JOIN";
+    field public static final String MANAGE_WIFI_INTERFACES = "android.permission.MANAGE_WIFI_INTERFACES";
+    field public static final String MANAGE_WIFI_NETWORK_SELECTION = "android.permission.MANAGE_WIFI_NETWORK_SELECTION";
     field public static final String MASTER_CLEAR = "android.permission.MASTER_CLEAR";
     field public static final String MEDIA_CONTENT_CONTROL = "android.permission.MEDIA_CONTENT_CONTROL";
     field public static final String MODIFY_AUDIO_SETTINGS = "android.permission.MODIFY_AUDIO_SETTINGS";
     field public static final String MODIFY_PHONE_STATE = "android.permission.MODIFY_PHONE_STATE";
     field public static final String MOUNT_FORMAT_FILESYSTEMS = "android.permission.MOUNT_FORMAT_FILESYSTEMS";
     field public static final String MOUNT_UNMOUNT_FILESYSTEMS = "android.permission.MOUNT_UNMOUNT_FILESYSTEMS";
+    field public static final String NEARBY_WIFI_DEVICES = "android.permission.NEARBY_WIFI_DEVICES";
     field public static final String NFC = "android.permission.NFC";
     field public static final String NFC_PREFERRED_PAYMENT_INFO = "android.permission.NFC_PREFERRED_PAYMENT_INFO";
     field public static final String NFC_TRANSACTION_EVENT = "android.permission.NFC_TRANSACTION_EVENT";
+    field public static final String OVERRIDE_WIFI_CONFIG = "android.permission.OVERRIDE_WIFI_CONFIG";
     field public static final String PACKAGE_USAGE_STATS = "android.permission.PACKAGE_USAGE_STATS";
     field @Deprecated public static final String PERSISTENT_ACTIVITY = "android.permission.PERSISTENT_ACTIVITY";
+    field public static final String POST_NOTIFICATIONS = "android.permission.POST_NOTIFICATIONS";
     field @Deprecated public static final String PROCESS_OUTGOING_CALLS = "android.permission.PROCESS_OUTGOING_CALLS";
     field public static final String QUERY_ALL_PACKAGES = "android.permission.QUERY_ALL_PACKAGES";
+    field public static final String READ_ASSISTANT_APP_SEARCH_DATA = "android.permission.READ_ASSISTANT_APP_SEARCH_DATA";
+    field public static final String READ_BASIC_PHONE_STATE = "android.permission.READ_BASIC_PHONE_STATE";
     field public static final String READ_CALENDAR = "android.permission.READ_CALENDAR";
     field public static final String READ_CALL_LOG = "android.permission.READ_CALL_LOG";
     field public static final String READ_CONTACTS = "android.permission.READ_CONTACTS";
     field public static final String READ_EXTERNAL_STORAGE = "android.permission.READ_EXTERNAL_STORAGE";
+    field public static final String READ_HOME_APP_SEARCH_DATA = "android.permission.READ_HOME_APP_SEARCH_DATA";
     field @Deprecated public static final String READ_INPUT_STATE = "android.permission.READ_INPUT_STATE";
     field public static final String READ_LOGS = "android.permission.READ_LOGS";
+    field public static final String READ_MEDIA_AUDIO = "android.permission.READ_MEDIA_AUDIO";
+    field public static final String READ_MEDIA_IMAGES = "android.permission.READ_MEDIA_IMAGES";
+    field public static final String READ_MEDIA_VIDEO = "android.permission.READ_MEDIA_VIDEO";
+    field public static final String READ_NEARBY_STREAMING_POLICY = "android.permission.READ_NEARBY_STREAMING_POLICY";
     field public static final String READ_PHONE_NUMBERS = "android.permission.READ_PHONE_NUMBERS";
     field public static final String READ_PHONE_STATE = "android.permission.READ_PHONE_STATE";
     field public static final String READ_PRECISE_PHONE_STATE = "android.permission.READ_PRECISE_PHONE_STATE";
@@ -139,8 +159,12 @@
     field public static final String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH";
     field public static final String RECORD_AUDIO = "android.permission.RECORD_AUDIO";
     field public static final String REORDER_TASKS = "android.permission.REORDER_TASKS";
+    field public static final String REQUEST_COMPANION_PROFILE_APP_STREAMING = "android.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING";
+    field public static final String REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION = "android.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION";
+    field public static final String REQUEST_COMPANION_PROFILE_COMPUTER = "android.permission.REQUEST_COMPANION_PROFILE_COMPUTER";
     field public static final String REQUEST_COMPANION_PROFILE_WATCH = "android.permission.REQUEST_COMPANION_PROFILE_WATCH";
     field public static final String REQUEST_COMPANION_RUN_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND";
+    field public static final String REQUEST_COMPANION_SELF_MANAGED = "android.permission.REQUEST_COMPANION_SELF_MANAGED";
     field public static final String REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND = "android.permission.REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND";
     field public static final String REQUEST_COMPANION_USE_DATA_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND";
     field public static final String REQUEST_DELETE_PACKAGES = "android.permission.REQUEST_DELETE_PACKAGES";
@@ -165,14 +189,17 @@
     field public static final String SIGNAL_PERSISTENT_PROCESSES = "android.permission.SIGNAL_PERSISTENT_PROCESSES";
     field @Deprecated public static final String SMS_FINANCIAL_TRANSACTIONS = "android.permission.SMS_FINANCIAL_TRANSACTIONS";
     field public static final String START_FOREGROUND_SERVICES_FROM_BACKGROUND = "android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND";
+    field public static final String START_VIEW_APP_FEATURES = "android.permission.START_VIEW_APP_FEATURES";
     field public static final String START_VIEW_PERMISSION_USAGE = "android.permission.START_VIEW_PERMISSION_USAGE";
     field public static final String STATUS_BAR = "android.permission.STATUS_BAR";
+    field public static final String SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE = "android.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE";
     field public static final String SYSTEM_ALERT_WINDOW = "android.permission.SYSTEM_ALERT_WINDOW";
     field public static final String TRANSMIT_IR = "android.permission.TRANSMIT_IR";
     field public static final String UNINSTALL_SHORTCUT = "com.android.launcher.permission.UNINSTALL_SHORTCUT";
     field public static final String UPDATE_DEVICE_STATS = "android.permission.UPDATE_DEVICE_STATS";
     field public static final String UPDATE_PACKAGES_WITHOUT_USER_ACTION = "android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION";
     field public static final String USE_BIOMETRIC = "android.permission.USE_BIOMETRIC";
+    field public static final String USE_EXACT_ALARM = "android.permission.USE_EXACT_ALARM";
     field @Deprecated public static final String USE_FINGERPRINT = "android.permission.USE_FINGERPRINT";
     field public static final String USE_FULL_SCREEN_INTENT = "android.permission.USE_FULL_SCREEN_INTENT";
     field public static final String USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER = "android.permission.USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER";
@@ -202,7 +229,10 @@
     field public static final String LOCATION = "android.permission-group.LOCATION";
     field public static final String MICROPHONE = "android.permission-group.MICROPHONE";
     field public static final String NEARBY_DEVICES = "android.permission-group.NEARBY_DEVICES";
+    field public static final String NOTIFICATIONS = "android.permission-group.NOTIFICATIONS";
     field public static final String PHONE = "android.permission-group.PHONE";
+    field public static final String READ_MEDIA_AURAL = "android.permission-group.READ_MEDIA_AURAL";
+    field public static final String READ_MEDIA_VISUAL = "android.permission-group.READ_MEDIA_VISUAL";
     field public static final String SENSORS = "android.permission-group.SENSORS";
     field public static final String SMS = "android.permission-group.SMS";
     field public static final String STORAGE = "android.permission-group.STORAGE";
@@ -309,11 +339,15 @@
     field public static final int allowClearUserData = 16842757; // 0x1010005
     field public static final int allowClickWhenDisabled = 16844312; // 0x1010618
     field public static final int allowEmbedded = 16843765; // 0x10103f5
+    field public static final int allowGameAngleDriver;
+    field public static final int allowGameDownscaling;
+    field public static final int allowGameFpsOverride;
     field public static final int allowNativeHeapPointerTagging = 16844306; // 0x1010612
     field public static final int allowParallelSyncs = 16843570; // 0x1010332
     field public static final int allowSingleTap = 16843353; // 0x1010259
     field public static final int allowTaskReparenting = 16843268; // 0x1010204
     field public static final int allowUndo = 16843999; // 0x10104df
+    field public static final int allowUntrustedActivityEmbedding;
     field public static final int alpha = 16843551; // 0x101031f
     field public static final int alphabeticModifiers = 16844110; // 0x101054e
     field public static final int alphabeticShortcut = 16843235; // 0x10101e3
@@ -344,6 +378,7 @@
     field public static final int authorities = 16842776; // 0x1010018
     field public static final int autoAdvanceViewId = 16843535; // 0x101030f
     field public static final int autoCompleteTextViewStyle = 16842859; // 0x101006b
+    field public static final int autoHandwritingEnabled;
     field public static final int autoLink = 16842928; // 0x10100b0
     field public static final int autoMirrored = 16843754; // 0x10103ea
     field public static final int autoRemoveFromRecents = 16843847; // 0x1010447
@@ -405,6 +440,7 @@
     field public static final int calendarViewShown = 16843596; // 0x101034c
     field public static final int calendarViewStyle = 16843613; // 0x101035d
     field public static final int canControlMagnification = 16844039; // 0x1010507
+    field public static final int canDisplayOnRemoteDevices;
     field public static final int canPauseRecording = 16844314; // 0x101061a
     field public static final int canPerformGestures = 16844045; // 0x101050d
     field public static final int canRecord = 16844060; // 0x101051c
@@ -599,6 +635,7 @@
     field public static final int elevation = 16843840; // 0x1010440
     field public static final int ellipsize = 16842923; // 0x10100ab
     field public static final int ems = 16843096; // 0x1010158
+    field public static final int enableOnBackInvokedCallback;
     field public static final int enableVrMode = 16844069; // 0x1010525
     field public static final int enabled = 16842766; // 0x101000e
     field public static final int end = 16843996; // 0x10104dc
@@ -710,6 +747,10 @@
     field public static final int freezesText = 16843116; // 0x101016c
     field public static final int fromAlpha = 16843210; // 0x10101ca
     field public static final int fromDegrees = 16843187; // 0x10101b3
+    field public static final int fromExtendBottom;
+    field public static final int fromExtendLeft;
+    field public static final int fromExtendRight;
+    field public static final int fromExtendTop;
     field public static final int fromId = 16843850; // 0x101044a
     field public static final int fromScene = 16843741; // 0x10103dd
     field public static final int fromXDelta = 16843206; // 0x10101c6
@@ -813,6 +854,7 @@
     field public static final int indicatorRight = 16843022; // 0x101010e
     field public static final int indicatorStart = 16843729; // 0x10103d1
     field public static final int inflatedId = 16842995; // 0x10100f3
+    field public static final int inheritKeyStoreKeys;
     field public static final int inheritShowWhenLocked = 16844188; // 0x101059c
     field public static final int initOrder = 16842778; // 0x101001a
     field public static final int initialKeyguardLayout = 16843714; // 0x10103c2
@@ -829,6 +871,7 @@
     field public static final int installLocation = 16843447; // 0x10102b7
     field public static final int interactiveUiTimeout = 16844181; // 0x1010595
     field public static final int interpolator = 16843073; // 0x1010141
+    field public static final int intro;
     field public static final int isAccessibilityTool = 16844353; // 0x1010641
     field public static final int isAlwaysSyncable = 16843571; // 0x1010333
     field public static final int isAsciiCapable = 16843753; // 0x10103e9
@@ -841,7 +884,7 @@
     field @Deprecated public static final int isModifier = 16843334; // 0x1010246
     field @Deprecated public static final int isRepeatable = 16843336; // 0x1010248
     field public static final int isScrollContainer = 16843342; // 0x101024e
-    field public static final int isSplitRequired = 16844177; // 0x1010591
+    field @Deprecated public static final int isSplitRequired = 16844177; // 0x1010591
     field public static final int isStatic = 16844122; // 0x101055a
     field @Deprecated public static final int isSticky = 16843335; // 0x1010247
     field public static final int isolatedProcess = 16843689; // 0x10103a9
@@ -871,6 +914,7 @@
     field public static final int keyboardNavigationCluster = 16844096; // 0x1010540
     field public static final int keycode = 16842949; // 0x10100c5
     field public static final int killAfterRestore = 16843420; // 0x101029c
+    field public static final int knownActivityEmbeddingCerts;
     field public static final int knownCerts = 16844330; // 0x101062a
     field public static final int lStar = 16844359; // 0x1010647
     field public static final int label = 16842753; // 0x1010001
@@ -938,6 +982,8 @@
     field public static final int left = 16843181; // 0x10101ad
     field public static final int letterSpacing = 16843958; // 0x10104b6
     field public static final int level = 16844032; // 0x1010500
+    field public static final int lineBreakStyle;
+    field public static final int lineBreakWordStyle;
     field public static final int lineHeight = 16844159; // 0x101057f
     field public static final int lineSpacingExtra = 16843287; // 0x1010217
     field public static final int lineSpacingMultiplier = 16843288; // 0x1010218
@@ -961,6 +1007,7 @@
     field public static final int listSeparatorTextViewStyle = 16843272; // 0x1010208
     field public static final int listViewStyle = 16842868; // 0x1010074
     field public static final int listViewWhiteStyle = 16842869; // 0x1010075
+    field public static final int localeConfig;
     field public static final int lockTaskMode = 16844013; // 0x10104ed
     field public static final int logo = 16843454; // 0x10102be
     field public static final int logoDescription = 16844009; // 0x10104e9
@@ -1119,6 +1166,7 @@
     field public static final int popupWindowStyle = 16842870; // 0x1010076
     field public static final int port = 16842793; // 0x1010029
     field public static final int positiveButtonText = 16843253; // 0x10101f5
+    field public static final int preferKeepClear;
     field public static final int preferMinimalPostProcessing = 16844300; // 0x101060c
     field public static final int preferenceCategoryStyle = 16842892; // 0x101008c
     field public static final int preferenceFragmentStyle = 16844038; // 0x1010506
@@ -1194,8 +1242,10 @@
     field public static final int requiredFeature = 16844116; // 0x1010554
     field public static final int requiredForAllUsers = 16843728; // 0x10103d0
     field public static final int requiredNotFeature = 16844117; // 0x1010555
+    field public static final int requiredSplitTypes;
     field public static final int requiresFadingEdge = 16843685; // 0x10103a5
     field public static final int requiresSmallestWidthDp = 16843620; // 0x1010364
+    field public static final int resetEnabledSettingsOnAppDataCleared;
     field public static final int resizeClip = 16843983; // 0x10104cf
     field public static final int resizeMode = 16843619; // 0x1010363
     field public static final int resizeable = 16843405; // 0x101028d
@@ -1291,13 +1341,17 @@
     field public static final int shareInterpolator = 16843195; // 0x10101bb
     field @Deprecated public static final int sharedUserId = 16842763; // 0x101000b
     field @Deprecated public static final int sharedUserLabel = 16843361; // 0x1010261
+    field public static final int sharedUserMaxSdkVersion;
     field public static final int shell = 16844180; // 0x1010594
     field public static final int shortcutDisabledMessage = 16844075; // 0x101052b
     field public static final int shortcutId = 16844072; // 0x1010528
     field public static final int shortcutLongLabel = 16844074; // 0x101052a
     field public static final int shortcutShortLabel = 16844073; // 0x1010529
     field public static final int shouldDisableView = 16843246; // 0x10101ee
+    field public static final int shouldUseDefaultUnfoldTransition = 16844364; // 0x101064c
     field public static final int showAsAction = 16843481; // 0x10102d9
+    field public static final int showBackground;
+    field public static final int showClockAndComplications;
     field public static final int showDefault = 16843258; // 0x10101fa
     field public static final int showDividers = 16843561; // 0x1010329
     field public static final int showForAllUsers = 16844015; // 0x10104ef
@@ -1328,6 +1382,7 @@
     field public static final int splitMotionEvents = 16843503; // 0x10102ef
     field public static final int splitName = 16844105; // 0x1010549
     field public static final int splitTrack = 16843852; // 0x101044c
+    field public static final int splitTypes;
     field public static final int spotShadowAlpha = 16843967; // 0x10104bf
     field public static final int src = 16843033; // 0x1010119
     field public static final int ssp = 16843747; // 0x10103e3
@@ -1398,13 +1453,18 @@
     field public static final int summaryColumn = 16843426; // 0x10102a2
     field public static final int summaryOff = 16843248; // 0x10101f0
     field public static final int summaryOn = 16843247; // 0x10101ef
+    field public static final int supportedTypes;
     field public static final int supportsAssist = 16844016; // 0x10104f0
+    field public static final int supportsBatteryGameMode;
     field public static final int supportsInlineSuggestions = 16844301; // 0x101060d
+    field public static final int supportsInlineSuggestionsWithTouchExploration;
     field public static final int supportsLaunchVoiceAssistFromKeyguard = 16844017; // 0x10104f1
     field public static final int supportsLocalInteraction = 16844047; // 0x101050f
     field public static final int supportsMultipleDisplays = 16844182; // 0x1010596
+    field public static final int supportsPerformanceGameMode;
     field public static final int supportsPictureInPicture = 16844023; // 0x10104f7
     field public static final int supportsRtl = 16843695; // 0x10103af
+    field public static final int supportsStylusHandwriting;
     field public static final int supportsSwitchingToNextInputMethod = 16843755; // 0x10103eb
     field public static final int supportsUploading = 16843419; // 0x101029b
     field public static final int suppressesSpellChecker = 16844355; // 0x1010643
@@ -1523,6 +1583,7 @@
     field public static final int tileMode = 16843265; // 0x1010201
     field public static final int tileModeX = 16843895; // 0x1010477
     field public static final int tileModeY = 16843896; // 0x1010478
+    field public static final int tileService;
     field public static final int timePickerDialogTheme = 16843934; // 0x101049e
     field public static final int timePickerMode = 16843956; // 0x10104b4
     field public static final int timePickerStyle = 16843933; // 0x101049d
@@ -1541,6 +1602,10 @@
     field public static final int titleTextStyle = 16843512; // 0x10102f8
     field public static final int toAlpha = 16843211; // 0x10101cb
     field public static final int toDegrees = 16843188; // 0x10101b4
+    field public static final int toExtendBottom;
+    field public static final int toExtendLeft;
+    field public static final int toExtendRight;
+    field public static final int toExtendTop;
     field public static final int toId = 16843849; // 0x1010449
     field public static final int toScene = 16843742; // 0x10103de
     field public static final int toXDelta = 16843207; // 0x10101c7
@@ -1591,6 +1656,7 @@
     field public static final int useEmbeddedDex = 16844190; // 0x101059e
     field public static final int useIntrinsicSizeAsMinimum = 16843536; // 0x1010310
     field public static final int useLevel = 16843167; // 0x101019f
+    field public static final int useTargetActivityForQuickAccess;
     field public static final int userVisible = 16843409; // 0x1010291
     field public static final int usesCleartextTraffic = 16844012; // 0x10104ec
     field public static final int usesPermissionFlags = 16844356; // 0x1010644
@@ -1692,6 +1758,7 @@
     field public static final int windowSplashScreenAnimatedIcon = 16844333; // 0x101062d
     field public static final int windowSplashScreenAnimationDuration = 16844334; // 0x101062e
     field public static final int windowSplashScreenBackground = 16844332; // 0x101062c
+    field public static final int windowSplashScreenBehavior;
     field public static final int windowSplashScreenBrandingImage = 16844335; // 0x101062f
     field public static final int windowSplashScreenIconBackgroundColor = 16844336; // 0x1010630
     field @Deprecated public static final int windowSplashscreenContent = 16844132; // 0x1010564
@@ -2012,6 +2079,9 @@
   public static final class R.id {
     ctor public R.id();
     field public static final int accessibilityActionContextClick = 16908348; // 0x102003c
+    field public static final int accessibilityActionDragCancel = 16908375; // 0x1020057
+    field public static final int accessibilityActionDragDrop = 16908374; // 0x1020056
+    field public static final int accessibilityActionDragStart = 16908373; // 0x1020055
     field public static final int accessibilityActionHideTooltip = 16908357; // 0x1020045
     field public static final int accessibilityActionImeEnter = 16908372; // 0x1020054
     field public static final int accessibilityActionMoveWindow = 16908354; // 0x1020042
@@ -2027,6 +2097,7 @@
     field public static final int accessibilityActionScrollUp = 16908344; // 0x1020038
     field public static final int accessibilityActionSetProgress = 16908349; // 0x102003d
     field public static final int accessibilityActionShowOnScreen = 16908342; // 0x1020036
+    field public static final int accessibilityActionShowTextSuggestions;
     field public static final int accessibilityActionShowTooltip = 16908356; // 0x1020044
     field public static final int accessibilitySystemActionBack = 16908363; // 0x102004b
     field public static final int accessibilitySystemActionHome = 16908364; // 0x102004c
@@ -2062,6 +2133,8 @@
     field public static final int icon_frame = 16908350; // 0x102003e
     field public static final int input = 16908297; // 0x1020009
     field public static final int inputArea = 16908318; // 0x102001e
+    field public static final int inputExtractAccessories;
+    field public static final int inputExtractAction;
     field public static final int inputExtractEditText = 16908325; // 0x1020025
     field @Deprecated public static final int keyboardView = 16908326; // 0x1020026
     field public static final int list = 16908298; // 0x102000a
@@ -2233,6 +2306,7 @@
     field public static final int TextAppearance = 16973886; // 0x103003e
     field public static final int TextAppearance_DeviceDefault = 16974253; // 0x10301ad
     field public static final int TextAppearance_DeviceDefault_DialogWindowTitle = 16974264; // 0x10301b8
+    field public static final int TextAppearance_DeviceDefault_Headline;
     field public static final int TextAppearance_DeviceDefault_Inverse = 16974254; // 0x10301ae
     field public static final int TextAppearance_DeviceDefault_Large = 16974255; // 0x10301af
     field public static final int TextAppearance_DeviceDefault_Large_Inverse = 16974256; // 0x10301b0
@@ -2977,6 +3051,7 @@
   }
 
   public final class AccessibilityGestureEvent implements android.os.Parcelable {
+    ctor public AccessibilityGestureEvent(int, int, @NonNull java.util.List<android.view.MotionEvent>);
     method public int describeContents();
     method @NonNull public static String gestureIdToString(int);
     method public int getDisplayId();
@@ -2988,21 +3063,29 @@
 
   public abstract class AccessibilityService extends android.app.Service {
     ctor public AccessibilityService();
+    method public boolean clearCache();
+    method public boolean clearCachedSubtree(@NonNull android.view.accessibility.AccessibilityNodeInfo);
     method public final void disableSelf();
     method public final boolean dispatchGesture(@NonNull android.accessibilityservice.GestureDescription, @Nullable android.accessibilityservice.AccessibilityService.GestureResultCallback, @Nullable android.os.Handler);
     method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
     method @NonNull public final android.accessibilityservice.AccessibilityButtonController getAccessibilityButtonController();
     method @NonNull public final android.accessibilityservice.AccessibilityButtonController getAccessibilityButtonController(int);
     method @NonNull @RequiresPermission(android.Manifest.permission.USE_FINGERPRINT) public final android.accessibilityservice.FingerprintGestureController getFingerprintGestureController();
+    method @Nullable public final android.accessibilityservice.InputMethod getInputMethod();
     method @NonNull public final android.accessibilityservice.AccessibilityService.MagnificationController getMagnificationController();
     method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
+    method @Nullable public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow(int);
     method public final android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();
     method @NonNull public final android.accessibilityservice.AccessibilityService.SoftKeyboardController getSoftKeyboardController();
     method @NonNull public final java.util.List<android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction> getSystemActions();
+    method @NonNull public final android.accessibilityservice.TouchInteractionController getTouchInteractionController(int);
     method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();
     method @NonNull public final android.util.SparseArray<java.util.List<android.view.accessibility.AccessibilityWindowInfo>> getWindowsOnAllDisplays();
+    method public boolean isCacheEnabled();
+    method public boolean isNodeInCache(@NonNull android.view.accessibility.AccessibilityNodeInfo);
     method public abstract void onAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
     method public final android.os.IBinder onBind(android.content.Intent);
+    method @NonNull public android.accessibilityservice.InputMethod onCreateInputMethod();
     method @Deprecated protected boolean onGesture(int);
     method public boolean onGesture(@NonNull android.accessibilityservice.AccessibilityGestureEvent);
     method public abstract void onInterrupt();
@@ -3011,6 +3094,8 @@
     method public void onSystemActionsChanged();
     method public final boolean performGlobalAction(int);
     method public void setAccessibilityFocusAppearance(int, @ColorInt int);
+    method public void setAnimationScale(float);
+    method public boolean setCacheEnabled(boolean);
     method public void setGestureDetectionPassthroughRegion(int, @NonNull android.graphics.Region);
     method public final void setServiceInfo(android.accessibilityservice.AccessibilityServiceInfo);
     method public void setTouchExplorationPassthroughRegion(int, @NonNull android.graphics.Region);
@@ -3071,6 +3156,11 @@
     field public static final int GLOBAL_ACTION_ACCESSIBILITY_SHORTCUT = 13; // 0xd
     field public static final int GLOBAL_ACTION_BACK = 1; // 0x1
     field public static final int GLOBAL_ACTION_DISMISS_NOTIFICATION_SHADE = 15; // 0xf
+    field public static final int GLOBAL_ACTION_DPAD_CENTER = 20; // 0x14
+    field public static final int GLOBAL_ACTION_DPAD_DOWN = 17; // 0x11
+    field public static final int GLOBAL_ACTION_DPAD_LEFT = 18; // 0x12
+    field public static final int GLOBAL_ACTION_DPAD_RIGHT = 19; // 0x13
+    field public static final int GLOBAL_ACTION_DPAD_UP = 16; // 0x10
     field public static final int GLOBAL_ACTION_HOME = 2; // 0x2
     field public static final int GLOBAL_ACTION_KEYCODE_HEADSETHOOK = 10; // 0xa
     field public static final int GLOBAL_ACTION_LOCK_SCREEN = 8; // 0x8
@@ -3096,18 +3186,23 @@
   public static final class AccessibilityService.MagnificationController {
     method public void addListener(@NonNull android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener);
     method public void addListener(@NonNull android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener, @Nullable android.os.Handler);
-    method public float getCenterX();
-    method public float getCenterY();
-    method @NonNull public android.graphics.Region getMagnificationRegion();
-    method public float getScale();
+    method @Deprecated public float getCenterX();
+    method @Deprecated public float getCenterY();
+    method @NonNull public android.graphics.Region getCurrentMagnificationRegion();
+    method @Nullable public android.accessibilityservice.MagnificationConfig getMagnificationConfig();
+    method @Deprecated @NonNull public android.graphics.Region getMagnificationRegion();
+    method @Deprecated public float getScale();
     method public boolean removeListener(@NonNull android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener);
     method public boolean reset(boolean);
-    method public boolean setCenter(float, float, boolean);
-    method public boolean setScale(float, boolean);
+    method public boolean resetCurrentMagnification(boolean);
+    method @Deprecated public boolean setCenter(float, float, boolean);
+    method public boolean setMagnificationConfig(@NonNull android.accessibilityservice.MagnificationConfig, boolean);
+    method @Deprecated public boolean setScale(float, boolean);
   }
 
   public static interface AccessibilityService.MagnificationController.OnMagnificationChangedListener {
-    method public void onMagnificationChanged(@NonNull android.accessibilityservice.AccessibilityService.MagnificationController, @NonNull android.graphics.Region, float, float, float);
+    method @Deprecated public void onMagnificationChanged(@NonNull android.accessibilityservice.AccessibilityService.MagnificationController, @NonNull android.graphics.Region, float, float, float);
+    method public default void onMagnificationChanged(@NonNull android.accessibilityservice.AccessibilityService.MagnificationController, @NonNull android.graphics.Region, @NonNull android.accessibilityservice.MagnificationConfig);
   }
 
   public static final class AccessibilityService.ScreenshotResult {
@@ -3121,8 +3216,12 @@
     method public void addOnShowModeChangedListener(@NonNull android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener, @Nullable android.os.Handler);
     method public int getShowMode();
     method public boolean removeOnShowModeChangedListener(@NonNull android.accessibilityservice.AccessibilityService.SoftKeyboardController.OnShowModeChangedListener);
+    method @CheckResult public int setInputMethodEnabled(@NonNull String, boolean) throws java.lang.SecurityException;
     method public boolean setShowMode(int);
     method public boolean switchToInputMethod(@NonNull String);
+    field public static final int ENABLE_IME_FAIL_BY_ADMIN = 1; // 0x1
+    field public static final int ENABLE_IME_FAIL_UNKNOWN = 2; // 0x2
+    field public static final int ENABLE_IME_SUCCESS = 0; // 0x0
   }
 
   public static interface AccessibilityService.SoftKeyboardController.OnShowModeChangedListener {
@@ -3148,8 +3247,10 @@
     method public int getNonInteractiveUiTimeoutMillis();
     method public android.content.pm.ResolveInfo getResolveInfo();
     method public String getSettingsActivityName();
+    method @Nullable public String getTileServiceName();
     method public boolean isAccessibilityTool();
     method public String loadDescription(android.content.pm.PackageManager);
+    method @Nullable public CharSequence loadIntro(@NonNull android.content.pm.PackageManager);
     method public CharSequence loadSummary(android.content.pm.PackageManager);
     method public void setInteractiveUiTimeoutMillis(@IntRange(from=0) int);
     method public void setNonInteractiveUiTimeoutMillis(@IntRange(from=0) int);
@@ -3173,6 +3274,7 @@
     field public static final int FEEDBACK_VISUAL = 8; // 0x8
     field public static final int FLAG_ENABLE_ACCESSIBILITY_VOLUME = 128; // 0x80
     field public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 2; // 0x2
+    field public static final int FLAG_INPUT_METHOD_EDITOR = 32768; // 0x8000
     field public static final int FLAG_REPORT_VIEW_IDS = 16; // 0x10
     field public static final int FLAG_REQUEST_2_FINGER_PASSTHROUGH = 8192; // 0x2000
     field public static final int FLAG_REQUEST_ACCESSIBILITY_BUTTON = 256; // 0x100
@@ -3233,6 +3335,75 @@
     method public boolean willContinue();
   }
 
+  public class InputMethod {
+    ctor public InputMethod(@NonNull android.accessibilityservice.AccessibilityService);
+    method @Nullable public final android.accessibilityservice.InputMethod.AccessibilityInputConnection getCurrentInputConnection();
+    method @Nullable public final android.view.inputmethod.EditorInfo getCurrentInputEditorInfo();
+    method public final boolean getCurrentInputStarted();
+    method public void onFinishInput();
+    method public void onStartInput(@NonNull android.view.inputmethod.EditorInfo, boolean);
+    method public void onUpdateSelection(int, int, int, int, int, int);
+  }
+
+  public final class InputMethod.AccessibilityInputConnection {
+    method public void clearMetaKeyStates(int);
+    method public void commitText(@NonNull CharSequence, int, @Nullable android.view.inputmethod.TextAttribute);
+    method public void deleteSurroundingText(int, int);
+    method public int getCursorCapsMode(int);
+    method @Nullable public android.view.inputmethod.SurroundingText getSurroundingText(@IntRange(from=0) int, @IntRange(from=0) int, int);
+    method public void performContextMenuAction(int);
+    method public void performEditorAction(int);
+    method public void sendKeyEvent(@NonNull android.view.KeyEvent);
+    method public void setSelection(int, int);
+  }
+
+  public final class MagnificationConfig implements android.os.Parcelable {
+    method public int describeContents();
+    method public float getCenterX();
+    method public float getCenterY();
+    method public int getMode();
+    method public float getScale();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.accessibilityservice.MagnificationConfig> CREATOR;
+    field public static final int MAGNIFICATION_MODE_DEFAULT = 0; // 0x0
+    field public static final int MAGNIFICATION_MODE_FULLSCREEN = 1; // 0x1
+    field public static final int MAGNIFICATION_MODE_WINDOW = 2; // 0x2
+  }
+
+  public static final class MagnificationConfig.Builder {
+    ctor public MagnificationConfig.Builder();
+    method @NonNull public android.accessibilityservice.MagnificationConfig build();
+    method @NonNull public android.accessibilityservice.MagnificationConfig.Builder setCenterX(float);
+    method @NonNull public android.accessibilityservice.MagnificationConfig.Builder setCenterY(float);
+    method @NonNull public android.accessibilityservice.MagnificationConfig.Builder setMode(int);
+    method @NonNull public android.accessibilityservice.MagnificationConfig.Builder setScale(@FloatRange(from=1.0f, to=8.0f) float);
+  }
+
+  public final class TouchInteractionController {
+    method public int getDisplayId();
+    method public int getMaxPointerCount();
+    method public int getState();
+    method public void performClick();
+    method public void performLongClickAndStartDrag();
+    method public void registerCallback(@Nullable java.util.concurrent.Executor, @NonNull android.accessibilityservice.TouchInteractionController.Callback);
+    method public void requestDelegating();
+    method public void requestDragging(int);
+    method public void requestTouchExploration();
+    method @NonNull public static String stateToString(int);
+    method public void unregisterAllCallbacks();
+    method public boolean unregisterCallback(@NonNull android.accessibilityservice.TouchInteractionController.Callback);
+    field public static final int STATE_CLEAR = 0; // 0x0
+    field public static final int STATE_DELEGATING = 4; // 0x4
+    field public static final int STATE_DRAGGING = 3; // 0x3
+    field public static final int STATE_TOUCH_EXPLORING = 2; // 0x2
+    field public static final int STATE_TOUCH_INTERACTING = 1; // 0x1
+  }
+
+  public static interface TouchInteractionController.Callback {
+    method public void onMotionEvent(@NonNull android.view.MotionEvent);
+    method public void onStateChanged(int);
+  }
+
 }
 
 package android.accounts {
@@ -3466,17 +3637,17 @@
   }
 
   public static interface Animator.AnimatorListener {
-    method public void onAnimationCancel(android.animation.Animator);
-    method public default void onAnimationEnd(android.animation.Animator, boolean);
-    method public void onAnimationEnd(android.animation.Animator);
-    method public void onAnimationRepeat(android.animation.Animator);
-    method public default void onAnimationStart(android.animation.Animator, boolean);
-    method public void onAnimationStart(android.animation.Animator);
+    method public void onAnimationCancel(@NonNull android.animation.Animator);
+    method public default void onAnimationEnd(@NonNull android.animation.Animator, boolean);
+    method public void onAnimationEnd(@NonNull android.animation.Animator);
+    method public void onAnimationRepeat(@NonNull android.animation.Animator);
+    method public default void onAnimationStart(@NonNull android.animation.Animator, boolean);
+    method public void onAnimationStart(@NonNull android.animation.Animator);
   }
 
   public static interface Animator.AnimatorPauseListener {
-    method public void onAnimationPause(android.animation.Animator);
-    method public void onAnimationResume(android.animation.Animator);
+    method public void onAnimationPause(@NonNull android.animation.Animator);
+    method public void onAnimationResume(@NonNull android.animation.Animator);
   }
 
   public class AnimatorInflater {
@@ -3730,6 +3901,7 @@
     method public Object getAnimatedValue(String);
     method public long getCurrentPlayTime();
     method public long getDuration();
+    method @FloatRange(from=0) public static float getDurationScale();
     method public static long getFrameDelay();
     method public int getRepeatCount();
     method public int getRepeatMode();
@@ -3741,6 +3913,7 @@
     method public static android.animation.ValueAnimator ofInt(int...);
     method public static android.animation.ValueAnimator ofObject(android.animation.TypeEvaluator, java.lang.Object...);
     method public static android.animation.ValueAnimator ofPropertyValuesHolder(android.animation.PropertyValuesHolder...);
+    method public static boolean registerDurationScaleChangeListener(@NonNull android.animation.ValueAnimator.DurationScaleChangeListener);
     method public void removeAllUpdateListeners();
     method public void removeUpdateListener(android.animation.ValueAnimator.AnimatorUpdateListener);
     method public void reverse();
@@ -3757,13 +3930,18 @@
     method public void setRepeatMode(int);
     method public void setStartDelay(long);
     method public void setValues(android.animation.PropertyValuesHolder...);
+    method public static boolean unregisterDurationScaleChangeListener(@NonNull android.animation.ValueAnimator.DurationScaleChangeListener);
     field public static final int INFINITE = -1; // 0xffffffff
     field public static final int RESTART = 1; // 0x1
     field public static final int REVERSE = 2; // 0x2
   }
 
   public static interface ValueAnimator.AnimatorUpdateListener {
-    method public void onAnimationUpdate(android.animation.ValueAnimator);
+    method public void onAnimationUpdate(@NonNull android.animation.ValueAnimator);
+  }
+
+  public static interface ValueAnimator.DurationScaleChangeListener {
+    method public void onChanged(@FloatRange(from=0) float);
   }
 
 }
@@ -3901,7 +4079,7 @@
     method @Deprecated public void onTabUnselected(android.app.ActionBar.Tab, android.app.FragmentTransaction);
   }
 
-  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback {
+  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.window.OnBackInvokedDispatcherOwner android.view.View.OnCreateContextMenuListener android.view.Window.Callback {
     ctor public Activity();
     method public void addContentView(android.view.View, android.view.ViewGroup.LayoutParams);
     method public void closeContextMenu();
@@ -3918,6 +4096,7 @@
     method public void dump(@NonNull String, @Nullable java.io.FileDescriptor, @NonNull java.io.PrintWriter, @Nullable String[]);
     method @Deprecated public void enterPictureInPictureMode();
     method public boolean enterPictureInPictureMode(@NonNull android.app.PictureInPictureParams);
+    method public <T extends android.view.View> T findViewById(@IdRes int);
     method public void finish();
     method public void finishActivity(int);
     method @Deprecated public void finishActivityFromChild(@NonNull android.app.Activity, int);
@@ -3943,6 +4122,7 @@
     method public int getMaxNumPictureInPictureActions();
     method public final android.media.session.MediaController getMediaController();
     method @NonNull public android.view.MenuInflater getMenuInflater();
+    method @NonNull public android.window.OnBackInvokedDispatcher getOnBackInvokedDispatcher();
     method public final android.app.Activity getParent();
     method @Nullable public android.content.Intent getParentActivityIntent();
     method public android.content.SharedPreferences getPreferences(int);
@@ -4069,6 +4249,7 @@
     method public void openContextMenu(android.view.View);
     method public void openOptionsMenu();
     method public void overridePendingTransition(int, int);
+    method public void overridePendingTransition(int, int, int);
     method public void postponeEnterTransition();
     method public void recreate();
     method public void registerActivityLifecycleCallbacks(@NonNull android.app.Application.ActivityLifecycleCallbacks);
@@ -4081,6 +4262,7 @@
     method public final void requestShowKeyboardShortcuts();
     method @Deprecated public boolean requestVisibleBehind(boolean);
     method public final boolean requestWindowFeature(int);
+    method @NonNull public final <T extends android.view.View> T requireViewById(@IdRes int);
     method public final void runOnUiThread(Runnable);
     method public void setActionBar(@Nullable android.widget.Toolbar);
     method public void setContentTransitionManager(android.transition.TransitionManager);
@@ -4105,10 +4287,12 @@
     method @Deprecated public final void setProgressBarIndeterminate(boolean);
     method @Deprecated public final void setProgressBarIndeterminateVisibility(boolean);
     method @Deprecated public final void setProgressBarVisibility(boolean);
+    method public void setRecentsScreenshotEnabled(boolean);
     method public void setRequestedOrientation(int);
     method public final void setResult(int);
     method public final void setResult(int, android.content.Intent);
     method @Deprecated public final void setSecondaryProgress(int);
+    method public void setShouldDockBigOverlays(boolean);
     method public void setShowWhenLocked(boolean);
     method public void setTaskDescription(android.app.ActivityManager.TaskDescription);
     method public void setTitle(CharSequence);
@@ -4119,6 +4303,7 @@
     method public void setVisible(boolean);
     method public final void setVolumeControlStream(int);
     method public void setVrModeEnabled(boolean, @NonNull android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
+    method public boolean shouldDockBigOverlays();
     method public boolean shouldShowRequestPermissionRationale(@NonNull String);
     method public boolean shouldUpRecreateTask(android.content.Intent);
     method public boolean showAssist(android.os.Bundle);
@@ -4367,9 +4552,13 @@
     method @Nullable public android.graphics.Rect getLaunchBounds();
     method public int getLaunchDisplayId();
     method public boolean getLockTaskMode();
+    method public int getSplashScreenStyle();
+    method public boolean isPendingIntentBackgroundActivityLaunchAllowed();
     method public static android.app.ActivityOptions makeBasic();
     method public static android.app.ActivityOptions makeClipRevealAnimation(android.view.View, int, int, int, int);
     method public static android.app.ActivityOptions makeCustomAnimation(android.content.Context, int, int);
+    method @NonNull public static android.app.ActivityOptions makeCustomAnimation(@NonNull android.content.Context, int, int, int);
+    method @NonNull public static android.app.ActivityOptions makeLaunchIntoPip(@NonNull android.app.PictureInPictureParams);
     method public static android.app.ActivityOptions makeScaleUpAnimation(android.view.View, int, int, int, int);
     method public static android.app.ActivityOptions makeSceneTransitionAnimation(android.app.Activity, android.view.View, String);
     method @java.lang.SafeVarargs public static android.app.ActivityOptions makeSceneTransitionAnimation(android.app.Activity, android.util.Pair<android.view.View,java.lang.String>...);
@@ -4380,6 +4569,8 @@
     method public android.app.ActivityOptions setLaunchBounds(@Nullable android.graphics.Rect);
     method public android.app.ActivityOptions setLaunchDisplayId(int);
     method public android.app.ActivityOptions setLockTaskEnabled(boolean);
+    method public void setPendingIntentBackgroundActivityLaunchAllowed(boolean);
+    method @NonNull public android.app.ActivityOptions setSplashScreenStyle(int);
     method public android.os.Bundle toBundle();
     method public void update(android.app.ActivityOptions);
     field public static final String EXTRA_USAGE_TIME_REPORT = "android.activity.usage_time";
@@ -4742,6 +4933,7 @@
     field public static final int REASON_DEPENDENCY_DIED = 12; // 0xc
     field public static final int REASON_EXCESSIVE_RESOURCE_USAGE = 9; // 0x9
     field public static final int REASON_EXIT_SELF = 1; // 0x1
+    field public static final int REASON_FREEZER = 14; // 0xe
     field public static final int REASON_INITIALIZATION_FAILURE = 7; // 0x7
     field public static final int REASON_LOW_MEMORY = 3; // 0x3
     field public static final int REASON_OTHER = 13; // 0xd
@@ -4817,7 +5009,7 @@
     method public void onDateSet(android.widget.DatePicker, int, int, int);
   }
 
-  public class Dialog implements android.content.DialogInterface android.view.KeyEvent.Callback android.view.View.OnCreateContextMenuListener android.view.Window.Callback {
+  public class Dialog implements android.content.DialogInterface android.view.KeyEvent.Callback android.window.OnBackInvokedDispatcherOwner android.view.View.OnCreateContextMenuListener android.view.Window.Callback {
     ctor public Dialog(@NonNull @UiContext android.content.Context);
     ctor public Dialog(@NonNull @UiContext android.content.Context, @StyleRes int);
     ctor protected Dialog(@NonNull @UiContext android.content.Context, boolean, @Nullable android.content.DialogInterface.OnCancelListener);
@@ -4837,6 +5029,7 @@
     method @NonNull @UiContext public final android.content.Context getContext();
     method @Nullable public android.view.View getCurrentFocus();
     method @NonNull public android.view.LayoutInflater getLayoutInflater();
+    method @NonNull public android.window.OnBackInvokedDispatcher getOnBackInvokedDispatcher();
     method @Nullable public final android.app.Activity getOwnerActivity();
     method @Nullable public final android.view.SearchEvent getSearchEvent();
     method public final int getVolumeControlStream();
@@ -5365,12 +5558,30 @@
 
   public final class GameManager {
     method public int getGameMode();
+    method public void setGameState(@NonNull android.app.GameState);
     field public static final int GAME_MODE_BATTERY = 3; // 0x3
     field public static final int GAME_MODE_PERFORMANCE = 2; // 0x2
     field public static final int GAME_MODE_STANDARD = 1; // 0x1
     field public static final int GAME_MODE_UNSUPPORTED = 0; // 0x0
   }
 
+  public final class GameState implements android.os.Parcelable {
+    ctor public GameState(boolean, int);
+    ctor public GameState(boolean, int, int, int);
+    method public int describeContents();
+    method public int getLabel();
+    method public int getMode();
+    method public int getQuality();
+    method public boolean isLoading();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.app.GameState> CREATOR;
+    field public static final int MODE_CONTENT = 4; // 0x4
+    field public static final int MODE_GAMEPLAY_INTERRUPTIBLE = 2; // 0x2
+    field public static final int MODE_GAMEPLAY_UNINTERRUPTIBLE = 3; // 0x3
+    field public static final int MODE_NONE = 1; // 0x1
+    field public static final int MODE_UNKNOWN = 0; // 0x0
+  }
+
   public class Instrumentation {
     ctor public Instrumentation();
     method public android.os.TestLooperManager acquireLooperManager(android.os.Looper);
@@ -5419,6 +5630,7 @@
     method public boolean onException(Object, Throwable);
     method public void onStart();
     method public void removeMonitor(android.app.Instrumentation.ActivityMonitor);
+    method public void resetInTouchMode();
     method public void runOnMainSync(Runnable);
     method public void sendCharacterSync(int);
     method public void sendKeyDownUpSync(int);
@@ -5474,6 +5686,7 @@
   }
 
   public class KeyguardManager {
+    method @RequiresPermission(android.Manifest.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE) public void addKeyguardLockedStateListener(@NonNull java.util.concurrent.Executor, @NonNull android.app.KeyguardManager.KeyguardLockedStateListener);
     method @Deprecated public android.content.Intent createConfirmDeviceCredentialIntent(CharSequence, CharSequence);
     method @Deprecated @RequiresPermission(android.Manifest.permission.DISABLE_KEYGUARD) public void exitKeyguardSecurely(android.app.KeyguardManager.OnKeyguardExitResult);
     method @Deprecated public boolean inKeyguardRestrictedInputMode();
@@ -5482,6 +5695,7 @@
     method public boolean isKeyguardLocked();
     method public boolean isKeyguardSecure();
     method @Deprecated public android.app.KeyguardManager.KeyguardLock newKeyguardLock(String);
+    method @RequiresPermission(android.Manifest.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE) public void removeKeyguardLockedStateListener(@NonNull android.app.KeyguardManager.KeyguardLockedStateListener);
     method public void requestDismissKeyguard(@NonNull android.app.Activity, @Nullable android.app.KeyguardManager.KeyguardDismissCallback);
   }
 
@@ -5497,6 +5711,10 @@
     method @Deprecated @RequiresPermission(android.Manifest.permission.DISABLE_KEYGUARD) public void reenableKeyguard();
   }
 
+  @java.lang.FunctionalInterface public static interface KeyguardManager.KeyguardLockedStateListener {
+    method public void onKeyguardLockedStateChanged(boolean);
+  }
+
   @Deprecated public static interface KeyguardManager.OnKeyguardExitResult {
     method @Deprecated public void onKeyguardExitResult(boolean);
   }
@@ -5583,6 +5801,24 @@
     method @Deprecated public android.view.Window startActivity(String, android.content.Intent);
   }
 
+  public class LocaleConfig {
+    ctor public LocaleConfig(@NonNull android.content.Context);
+    method public int getStatus();
+    method @Nullable public android.os.LocaleList getSupportedLocales();
+    field public static final int STATUS_NOT_SPECIFIED = 1; // 0x1
+    field public static final int STATUS_PARSING_FAILED = 2; // 0x2
+    field public static final int STATUS_SUCCESS = 0; // 0x0
+    field public static final String TAG_LOCALE = "locale";
+    field public static final String TAG_LOCALE_CONFIG = "locale-config";
+  }
+
+  public class LocaleManager {
+    method @NonNull public android.os.LocaleList getApplicationLocales();
+    method @NonNull @RequiresPermission(value="android.permission.READ_APP_SPECIFIC_LOCALES", conditional=true) public android.os.LocaleList getApplicationLocales(@NonNull String);
+    method @NonNull public android.os.LocaleList getSystemLocales();
+    method public void setApplicationLocales(@NonNull android.os.LocaleList);
+  }
+
   public class MediaRouteActionProvider extends android.view.ActionProvider {
     ctor public MediaRouteActionProvider(android.content.Context);
     method public android.view.View onCreateActionView();
@@ -6168,10 +6404,12 @@
     method public long[] getVibrationPattern();
     method public boolean hasUserSetImportance();
     method public boolean hasUserSetSound();
+    method public boolean isBlockable();
     method public boolean isConversation();
     method public boolean isDemoted();
     method public boolean isImportantConversation();
     method public void setAllowBubbles(boolean);
+    method public void setBlockable(boolean);
     method public void setBypassDnd(boolean);
     method public void setConversationId(@NonNull String, @NonNull String);
     method public void setDescription(String);
@@ -6244,6 +6482,7 @@
     method public android.app.NotificationManager.Policy getNotificationPolicy();
     method public boolean isNotificationListenerAccessGranted(android.content.ComponentName);
     method public boolean isNotificationPolicyAccessGranted();
+    method @WorkerThread public boolean matchesCallFilter(@NonNull android.net.Uri);
     method public void notify(int, android.app.Notification);
     method public void notify(String, int, android.app.Notification);
     method public void notifyAsPackage(@NonNull String, @Nullable String, int, @NonNull android.app.Notification);
@@ -6407,18 +6646,32 @@
 
   public final class PictureInPictureParams implements android.os.Parcelable {
     method public int describeContents();
+    method @NonNull public java.util.List<android.app.RemoteAction> getActions();
+    method @Nullable public android.util.Rational getAspectRatio();
+    method @Nullable public android.app.RemoteAction getCloseAction();
+    method @Nullable public android.util.Rational getExpandedAspectRatio();
+    method @Nullable public android.graphics.Rect getSourceRectHint();
+    method @Nullable public CharSequence getSubtitle();
+    method @Nullable public CharSequence getTitle();
+    method public boolean isAutoEnterEnabled();
+    method public boolean isSeamlessResizeEnabled();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.app.PictureInPictureParams> CREATOR;
   }
 
   public static class PictureInPictureParams.Builder {
     ctor public PictureInPictureParams.Builder();
+    ctor public PictureInPictureParams.Builder(@NonNull android.app.PictureInPictureParams);
     method public android.app.PictureInPictureParams build();
     method public android.app.PictureInPictureParams.Builder setActions(java.util.List<android.app.RemoteAction>);
     method public android.app.PictureInPictureParams.Builder setAspectRatio(android.util.Rational);
     method @NonNull public android.app.PictureInPictureParams.Builder setAutoEnterEnabled(boolean);
+    method @NonNull public android.app.PictureInPictureParams.Builder setCloseAction(@Nullable android.app.RemoteAction);
+    method @NonNull public android.app.PictureInPictureParams.Builder setExpandedAspectRatio(@Nullable android.util.Rational);
     method @NonNull public android.app.PictureInPictureParams.Builder setSeamlessResizeEnabled(boolean);
     method public android.app.PictureInPictureParams.Builder setSourceRectHint(android.graphics.Rect);
+    method @NonNull public android.app.PictureInPictureParams.Builder setSubtitle(@Nullable CharSequence);
+    method @NonNull public android.app.PictureInPictureParams.Builder setTitle(@Nullable CharSequence);
   }
 
   public final class PictureInPictureUiState implements android.os.Parcelable {
@@ -6650,7 +6903,7 @@
     method public boolean onUnbind(android.content.Intent);
     method public final void startForeground(int, android.app.Notification);
     method public final void startForeground(int, @NonNull android.app.Notification, int);
-    method public final void stopForeground(boolean);
+    method @Deprecated public final void stopForeground(boolean);
     method public final void stopForeground(int);
     method public final void stopSelf();
     method public final void stopSelf(int);
@@ -6663,6 +6916,7 @@
     field public static final int START_STICKY = 1; // 0x1
     field public static final int START_STICKY_COMPATIBILITY = 0; // 0x0
     field public static final int STOP_FOREGROUND_DETACH = 2; // 0x2
+    field @Deprecated public static final int STOP_FOREGROUND_LEGACY = 0; // 0x0
     field public static final int STOP_FOREGROUND_REMOVE = 1; // 0x1
   }
 
@@ -6685,6 +6939,16 @@
   }
 
   public class StatusBarManager {
+    method public void requestAddTileService(@NonNull android.content.ComponentName, @NonNull CharSequence, @NonNull android.graphics.drawable.Icon, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
+    field public static final int TILE_ADD_REQUEST_ERROR_APP_NOT_IN_FOREGROUND = 1004; // 0x3ec
+    field public static final int TILE_ADD_REQUEST_ERROR_BAD_COMPONENT = 1002; // 0x3ea
+    field public static final int TILE_ADD_REQUEST_ERROR_MISMATCHED_PACKAGE = 1000; // 0x3e8
+    field public static final int TILE_ADD_REQUEST_ERROR_NOT_CURRENT_USER = 1003; // 0x3eb
+    field public static final int TILE_ADD_REQUEST_ERROR_NO_STATUS_BAR_SERVICE = 1005; // 0x3ed
+    field public static final int TILE_ADD_REQUEST_ERROR_REQUEST_IN_PROGRESS = 1001; // 0x3e9
+    field public static final int TILE_ADD_REQUEST_RESULT_TILE_ADDED = 2; // 0x2
+    field public static final int TILE_ADD_REQUEST_RESULT_TILE_ALREADY_ADDED = 1; // 0x1
+    field public static final int TILE_ADD_REQUEST_RESULT_TILE_NOT_ADDED = 0; // 0x0
   }
 
   public final class SyncNotedAppOp implements android.os.Parcelable {
@@ -6705,6 +6969,7 @@
   }
 
   public class TaskInfo {
+    method public boolean isVisible();
     field @Nullable public android.content.ComponentName baseActivity;
     field @NonNull public android.content.Intent baseIntent;
     field public boolean isRunning;
@@ -6746,7 +7011,7 @@
   public final class UiAutomation {
     method public void adoptShellPermissionIdentity();
     method public void adoptShellPermissionIdentity(@Nullable java.lang.String...);
-    method public void clearWindowAnimationFrameStats();
+    method @Deprecated public void clearWindowAnimationFrameStats();
     method public boolean clearWindowContentFrameStats(int);
     method public void dropShellPermissionIdentity();
     method public android.view.accessibility.AccessibilityEvent executeAndWaitForEvent(Runnable, android.app.UiAutomation.AccessibilityEventFilter, long) throws java.util.concurrent.TimeoutException;
@@ -6755,7 +7020,7 @@
     method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
     method public android.view.accessibility.AccessibilityNodeInfo getRootInActiveWindow();
     method public android.accessibilityservice.AccessibilityServiceInfo getServiceInfo();
-    method public android.view.WindowAnimationFrameStats getWindowAnimationFrameStats();
+    method @Deprecated public android.view.WindowAnimationFrameStats getWindowAnimationFrameStats();
     method public android.view.WindowContentFrameStats getWindowContentFrameStats(int);
     method public java.util.List<android.view.accessibility.AccessibilityWindowInfo> getWindows();
     method @NonNull public android.util.SparseArray<java.util.List<android.view.accessibility.AccessibilityWindowInfo>> getWindowsOnAllDisplays();
@@ -6765,6 +7030,7 @@
     method public boolean performGlobalAction(int);
     method public void revokeRuntimePermission(String, String);
     method public void revokeRuntimePermissionAsUser(String, String, android.os.UserHandle);
+    method public void setAnimationScale(float);
     method public void setOnAccessibilityEventListener(android.app.UiAutomation.OnAccessibilityEventListener);
     method public boolean setRotation(int);
     method public void setRunAsMonkey(boolean);
@@ -6816,6 +7082,7 @@
   public final class VoiceInteractor {
     method public android.app.VoiceInteractor.Request getActiveRequest(String);
     method public android.app.VoiceInteractor.Request[] getActiveRequests();
+    method @NonNull public String getPackageName();
     method public boolean isDestroyed();
     method public void notifyDirectActionsChanged();
     method public boolean registerOnDestroyedCallback(@NonNull java.util.concurrent.Executor, @NonNull Runnable);
@@ -6920,6 +7187,7 @@
     method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
     method public CharSequence loadLabel(android.content.pm.PackageManager);
     method public android.graphics.drawable.Drawable loadThumbnail(android.content.pm.PackageManager);
+    method public boolean shouldUseDefaultUnfoldTransition();
     method public boolean supportsMultipleDisplays();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.app.WallpaperInfo> CREATOR;
@@ -6978,7 +7246,7 @@
   }
 
   public static interface WallpaperManager.OnColorsChangedListener {
-    method public void onColorsChanged(android.app.WallpaperColors, int);
+    method public void onColorsChanged(@Nullable android.app.WallpaperColors, int);
   }
 
   public interface ZygotePreload {
@@ -7139,6 +7407,13 @@
     method @Nullable public java.util.List<java.lang.String> getDelegatePackages(@NonNull android.content.ComponentName, @NonNull String);
     method @NonNull public java.util.List<java.lang.String> getDelegatedScopes(@Nullable android.content.ComponentName, @NonNull String);
     method public CharSequence getDeviceOwnerLockScreenInfo();
+    method @Nullable public String getDevicePolicyManagementRoleHolderPackage();
+    method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>);
+    method @Nullable public android.graphics.drawable.Drawable getDrawable(@NonNull String, @NonNull String, @NonNull String, @NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>);
+    method @Nullable public android.graphics.drawable.Icon getDrawableAsIcon(@NonNull String, @NonNull String, @NonNull String, @Nullable android.graphics.drawable.Icon);
+    method @Nullable public android.graphics.drawable.Icon getDrawableAsIcon(@NonNull String, @NonNull String, @Nullable android.graphics.drawable.Icon);
+    method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, int, @NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>);
+    method @Nullable public android.graphics.drawable.Drawable getDrawableForDensity(@NonNull String, @NonNull String, @NonNull String, int, @NonNull java.util.function.Supplier<android.graphics.drawable.Drawable>);
     method public CharSequence getEndUserSessionMessage(@NonNull android.content.ComponentName);
     method @NonNull public String getEnrollmentSpecificId();
     method @Nullable public android.app.admin.FactoryResetProtectionPolicy getFactoryResetProtectionPolicy(@Nullable android.content.ComponentName);
@@ -7155,8 +7430,9 @@
     method public int getMaximumFailedPasswordsForWipe(@Nullable android.content.ComponentName);
     method public long getMaximumTimeToLock(@Nullable android.content.ComponentName);
     method @NonNull public java.util.List<java.lang.String> getMeteredDataDisabledPackages(@NonNull android.content.ComponentName);
-    method public int getNearbyAppStreamingPolicy();
-    method public int getNearbyNotificationStreamingPolicy();
+    method public int getMinimumRequiredWifiSecurityLevel();
+    method @RequiresPermission(value=android.Manifest.permission.READ_NEARBY_STREAMING_POLICY, conditional=true) public int getNearbyAppStreamingPolicy();
+    method @RequiresPermission(value=android.Manifest.permission.READ_NEARBY_STREAMING_POLICY, conditional=true) public int getNearbyNotificationStreamingPolicy();
     method @Deprecated @ColorInt public int getOrganizationColor(@NonNull android.content.ComponentName);
     method @Nullable public CharSequence getOrganizationName(@NonNull android.content.ComponentName);
     method public java.util.List<android.telephony.data.ApnSetting> getOverrideApns(@NonNull android.content.ComponentName);
@@ -7181,6 +7457,7 @@
     method @Nullable public java.util.List<java.lang.String> getPermittedCrossProfileNotificationListeners(@NonNull android.content.ComponentName);
     method @Nullable public java.util.List<java.lang.String> getPermittedInputMethods(@NonNull android.content.ComponentName);
     method public int getPersonalAppsSuspendedReasons(@NonNull android.content.ComponentName);
+    method @NonNull public java.util.List<android.app.admin.PreferentialNetworkServiceConfig> getPreferentialNetworkServiceConfigs();
     method public int getRequiredPasswordComplexity();
     method public long getRequiredStrongAuthTimeout(@Nullable android.content.ComponentName);
     method public boolean getScreenCaptureDisabled(@Nullable android.content.ComponentName);
@@ -7195,6 +7472,7 @@
     method @NonNull public java.util.List<java.lang.String> getUserControlDisabledPackages(@NonNull android.content.ComponentName);
     method @NonNull public android.os.Bundle getUserRestrictions(@NonNull android.content.ComponentName);
     method @Nullable public String getWifiMacAddress(@NonNull android.content.ComponentName);
+    method @Nullable public android.app.admin.WifiSsidPolicy getWifiSsidPolicy();
     method public boolean grantKeyPairToApp(@Nullable android.content.ComponentName, @NonNull String, @NonNull String);
     method public boolean grantKeyPairToWifiAuth(@NonNull String);
     method public boolean hasCaCertInstalled(@Nullable android.content.ComponentName, byte[]);
@@ -7299,6 +7577,7 @@
     method public void setMaximumFailedPasswordsForWipe(@NonNull android.content.ComponentName, int);
     method public void setMaximumTimeToLock(@NonNull android.content.ComponentName, long);
     method @NonNull public java.util.List<java.lang.String> setMeteredDataDisabledPackages(@NonNull android.content.ComponentName, @NonNull java.util.List<java.lang.String>);
+    method public void setMinimumRequiredWifiSecurityLevel(int);
     method public void setNearbyAppStreamingPolicy(int);
     method public void setNearbyNotificationStreamingPolicy(int);
     method public void setNetworkLoggingEnabled(@Nullable android.content.ComponentName, boolean);
@@ -7323,6 +7602,7 @@
     method public boolean setPermittedCrossProfileNotificationListeners(@NonNull android.content.ComponentName, @Nullable java.util.List<java.lang.String>);
     method public boolean setPermittedInputMethods(@NonNull android.content.ComponentName, java.util.List<java.lang.String>);
     method public void setPersonalAppsSuspended(@NonNull android.content.ComponentName, boolean);
+    method public void setPreferentialNetworkServiceConfigs(@NonNull java.util.List<android.app.admin.PreferentialNetworkServiceConfig>);
     method public void setPreferentialNetworkServiceEnabled(boolean);
     method public void setProfileEnabled(@NonNull android.content.ComponentName);
     method public void setProfileName(@NonNull android.content.ComponentName, String);
@@ -7347,6 +7627,7 @@
     method public void setUsbDataSignalingEnabled(boolean);
     method public void setUserControlDisabledPackages(@NonNull android.content.ComponentName, @NonNull java.util.List<java.lang.String>);
     method public void setUserIcon(@NonNull android.content.ComponentName, android.graphics.Bitmap);
+    method public void setWifiSsidPolicy(@Nullable android.app.admin.WifiSsidPolicy);
     method public int startUserInBackground(@NonNull android.content.ComponentName, @NonNull android.os.UserHandle);
     method public int stopUser(@NonNull android.content.ComponentName, @NonNull android.os.UserHandle);
     method public boolean switchUser(@NonNull android.content.ComponentName, @Nullable android.os.UserHandle);
@@ -7362,6 +7643,7 @@
     field public static final String ACTION_CHECK_POLICY_COMPLIANCE = "android.app.action.CHECK_POLICY_COMPLIANCE";
     field public static final String ACTION_DEVICE_ADMIN_SERVICE = "android.app.action.DEVICE_ADMIN_SERVICE";
     field public static final String ACTION_DEVICE_OWNER_CHANGED = "android.app.action.DEVICE_OWNER_CHANGED";
+    field public static final String ACTION_DEVICE_POLICY_RESOURCE_UPDATED = "android.app.action.DEVICE_POLICY_RESOURCE_UPDATED";
     field public static final String ACTION_GET_PROVISIONING_MODE = "android.app.action.GET_PROVISIONING_MODE";
     field public static final String ACTION_MANAGED_PROFILE_PROVISIONED = "android.app.action.MANAGED_PROFILE_PROVISIONED";
     field public static final String ACTION_PROFILE_OWNER_CHANGED = "android.app.action.PROFILE_OWNER_CHANGED";
@@ -7397,6 +7679,7 @@
     field public static final String EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE = "android.app.extra.PROVISIONING_ACCOUNT_TO_MIGRATE";
     field public static final String EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE = "android.app.extra.PROVISIONING_ADMIN_EXTRAS_BUNDLE";
     field public static final String EXTRA_PROVISIONING_ALLOWED_PROVISIONING_MODES = "android.app.extra.PROVISIONING_ALLOWED_PROVISIONING_MODES";
+    field public static final String EXTRA_PROVISIONING_ALLOW_OFFLINE = "android.app.extra.PROVISIONING_ALLOW_OFFLINE";
     field public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME = "android.app.extra.PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME";
     field public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE = "android.app.extra.PROVISIONING_DEVICE_ADMIN_MINIMUM_VERSION_CODE";
     field public static final String EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM = "android.app.extra.PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM";
@@ -7410,14 +7693,16 @@
     field @Deprecated public static final String EXTRA_PROVISIONING_EMAIL_ADDRESS = "android.app.extra.PROVISIONING_EMAIL_ADDRESS";
     field public static final String EXTRA_PROVISIONING_IMEI = "android.app.extra.PROVISIONING_IMEI";
     field public static final String EXTRA_PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION = "android.app.extra.PROVISIONING_KEEP_ACCOUNT_ON_MIGRATION";
+    field public static final String EXTRA_PROVISIONING_KEEP_SCREEN_ON = "android.app.extra.PROVISIONING_KEEP_SCREEN_ON";
     field public static final String EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED = "android.app.extra.PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED";
     field public static final String EXTRA_PROVISIONING_LOCALE = "android.app.extra.PROVISIONING_LOCALE";
     field public static final String EXTRA_PROVISIONING_LOCAL_TIME = "android.app.extra.PROVISIONING_LOCAL_TIME";
-    field public static final String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI";
+    field @Deprecated public static final String EXTRA_PROVISIONING_LOGO_URI = "android.app.extra.PROVISIONING_LOGO_URI";
     field @Deprecated public static final String EXTRA_PROVISIONING_MAIN_COLOR = "android.app.extra.PROVISIONING_MAIN_COLOR";
     field public static final String EXTRA_PROVISIONING_MODE = "android.app.extra.PROVISIONING_MODE";
     field public static final String EXTRA_PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT = "android.app.extra.PROVISIONING_SENSORS_PERMISSION_GRANT_OPT_OUT";
     field public static final String EXTRA_PROVISIONING_SERIAL_NUMBER = "android.app.extra.PROVISIONING_SERIAL_NUMBER";
+    field public static final String EXTRA_PROVISIONING_SHOULD_LAUNCH_RESULT_INTENT = "android.app.extra.PROVISIONING_SHOULD_LAUNCH_RESULT_INTENT";
     field public static final String EXTRA_PROVISIONING_SKIP_EDUCATION_SCREENS = "android.app.extra.PROVISIONING_SKIP_EDUCATION_SCREENS";
     field public static final String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION";
     field @Deprecated public static final String EXTRA_PROVISIONING_SKIP_USER_CONSENT = "android.app.extra.PROVISIONING_SKIP_USER_CONSENT";
@@ -7437,6 +7722,11 @@
     field public static final String EXTRA_PROVISIONING_WIFI_SECURITY_TYPE = "android.app.extra.PROVISIONING_WIFI_SECURITY_TYPE";
     field public static final String EXTRA_PROVISIONING_WIFI_SSID = "android.app.extra.PROVISIONING_WIFI_SSID";
     field public static final String EXTRA_PROVISIONING_WIFI_USER_CERTIFICATE = "android.app.extra.PROVISIONING_WIFI_USER_CERTIFICATE";
+    field public static final String EXTRA_RESOURCE_IDS = "android.app.extra.RESOURCE_IDS";
+    field public static final String EXTRA_RESOURCE_TYPE = "android.app.extra.RESOURCE_TYPE";
+    field public static final int EXTRA_RESOURCE_TYPE_DRAWABLE = 1; // 0x1
+    field public static final int EXTRA_RESOURCE_TYPE_STRING = 2; // 0x2
+    field public static final String EXTRA_RESULT_LAUNCH_INTENT = "android.app.extra.RESULT_LAUNCH_INTENT";
     field public static final int FLAG_EVICT_CREDENTIAL_ENCRYPTION_KEY = 1; // 0x1
     field public static final int FLAG_MANAGED_CAN_ACCESS_PARENT = 2; // 0x2
     field public static final int FLAG_PARENT_CAN_ACCESS_MANAGED = 1; // 0x1
@@ -7453,7 +7743,7 @@
     field public static final int KEYGUARD_DISABLE_FEATURES_NONE = 0; // 0x0
     field public static final int KEYGUARD_DISABLE_FINGERPRINT = 32; // 0x20
     field public static final int KEYGUARD_DISABLE_IRIS = 256; // 0x100
-    field public static final int KEYGUARD_DISABLE_REMOTE_INPUT = 64; // 0x40
+    field @Deprecated public static final int KEYGUARD_DISABLE_REMOTE_INPUT = 64; // 0x40
     field public static final int KEYGUARD_DISABLE_SECURE_CAMERA = 2; // 0x2
     field public static final int KEYGUARD_DISABLE_SECURE_NOTIFICATIONS = 4; // 0x4
     field public static final int KEYGUARD_DISABLE_TRUST_AGENTS = 16; // 0x10
@@ -7511,6 +7801,10 @@
     field public static final int RESET_PASSWORD_DO_NOT_ASK_CREDENTIALS_ON_BOOT = 2; // 0x2
     field public static final int RESET_PASSWORD_REQUIRE_ENTRY = 1; // 0x1
     field public static final int SKIP_SETUP_WIZARD = 1; // 0x1
+    field public static final int WIFI_SECURITY_ENTERPRISE_192 = 3; // 0x3
+    field public static final int WIFI_SECURITY_ENTERPRISE_EAP = 2; // 0x2
+    field public static final int WIFI_SECURITY_OPEN = 0; // 0x0
+    field public static final int WIFI_SECURITY_PERSONAL = 1; // 0x1
     field public static final int WIPE_EUICC = 4; // 0x4
     field public static final int WIPE_EXTERNAL_STORAGE = 1; // 0x1
     field public static final int WIPE_RESET_PROTECTION_DATA = 2; // 0x2
@@ -7531,6 +7825,34 @@
     method public void onApplicationUserDataCleared(String, boolean);
   }
 
+  public final class DevicePolicyResources {
+  }
+
+  public static final class DevicePolicyResources.Drawables {
+    field public static final String UNDEFINED = "UNDEFINED";
+    field public static final String WORK_PROFILE_ICON = "WORK_PROFILE_ICON";
+    field public static final String WORK_PROFILE_ICON_BADGE = "WORK_PROFILE_ICON_BADGE";
+    field public static final String WORK_PROFILE_OFF_ICON = "WORK_PROFILE_OFF_ICON";
+    field public static final String WORK_PROFILE_USER_ICON = "WORK_PROFILE_USER_ICON";
+  }
+
+  public static final class DevicePolicyResources.Drawables.Source {
+    field public static final String HOME_WIDGET = "HOME_WIDGET";
+    field public static final String LAUNCHER_OFF_BUTTON = "LAUNCHER_OFF_BUTTON";
+    field public static final String NOTIFICATION = "NOTIFICATION";
+    field public static final String PROFILE_SWITCH_ANIMATION = "PROFILE_SWITCH_ANIMATION";
+    field public static final String QUICK_SETTINGS = "QUICK_SETTINGS";
+    field public static final String STATUS_BAR = "STATUS_BAR";
+    field public static final String UNDEFINED = "UNDEFINED";
+  }
+
+  public static final class DevicePolicyResources.Drawables.Style {
+    field public static final String DEFAULT = "DEFAULT";
+    field public static final String OUTLINE = "OUTLINE";
+    field public static final String SOLID_COLORED = "SOLID_COLORED";
+    field public static final String SOLID_NOT_COLORED = "SOLID_NOT_COLORED";
+  }
+
   public final class DnsEvent extends android.app.admin.NetworkEvent implements android.os.Parcelable {
     method public String getHostname();
     method public java.util.List<java.net.InetAddress> getInetAddresses();
@@ -7568,6 +7890,32 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.NetworkEvent> CREATOR;
   }
 
+  public final class PreferentialNetworkServiceConfig implements android.os.Parcelable {
+    method public int describeContents();
+    method @NonNull public int[] getExcludedUids();
+    method @NonNull public int[] getIncludedUids();
+    method public int getNetworkId();
+    method public boolean isEnabled();
+    method public boolean isFallbackToDefaultConnectionAllowed();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.PreferentialNetworkServiceConfig> CREATOR;
+    field public static final int PREFERENTIAL_NETWORK_ID_1 = 1; // 0x1
+    field public static final int PREFERENTIAL_NETWORK_ID_2 = 2; // 0x2
+    field public static final int PREFERENTIAL_NETWORK_ID_3 = 3; // 0x3
+    field public static final int PREFERENTIAL_NETWORK_ID_4 = 4; // 0x4
+    field public static final int PREFERENTIAL_NETWORK_ID_5 = 5; // 0x5
+  }
+
+  public static final class PreferentialNetworkServiceConfig.Builder {
+    ctor public PreferentialNetworkServiceConfig.Builder();
+    method @NonNull public android.app.admin.PreferentialNetworkServiceConfig build();
+    method @NonNull public android.app.admin.PreferentialNetworkServiceConfig.Builder setEnabled(boolean);
+    method @NonNull public android.app.admin.PreferentialNetworkServiceConfig.Builder setExcludedUids(@NonNull int[]);
+    method @NonNull public android.app.admin.PreferentialNetworkServiceConfig.Builder setFallbackToDefaultConnectionAllowed(boolean);
+    method @NonNull public android.app.admin.PreferentialNetworkServiceConfig.Builder setIncludedUids(@NonNull int[]);
+    method @NonNull public android.app.admin.PreferentialNetworkServiceConfig.Builder setNetworkId(int);
+  }
+
   public class SecurityLog {
     ctor public SecurityLog();
     field public static final int LEVEL_ERROR = 3; // 0x3
@@ -7576,6 +7924,8 @@
     field public static final int TAG_ADB_SHELL_CMD = 210002; // 0x33452
     field public static final int TAG_ADB_SHELL_INTERACTIVE = 210001; // 0x33451
     field public static final int TAG_APP_PROCESS_START = 210005; // 0x33455
+    field public static final int TAG_BLUETOOTH_CONNECTION = 210039; // 0x33477
+    field public static final int TAG_BLUETOOTH_DISCONNECTION = 210040; // 0x33478
     field public static final int TAG_CAMERA_POLICY_SET = 210034; // 0x33472
     field public static final int TAG_CERT_AUTHORITY_INSTALLED = 210029; // 0x3346d
     field public static final int TAG_CERT_AUTHORITY_REMOVED = 210030; // 0x3346e
@@ -7598,6 +7948,7 @@
     field public static final int TAG_MEDIA_UNMOUNT = 210014; // 0x3345e
     field public static final int TAG_OS_SHUTDOWN = 210010; // 0x3345a
     field public static final int TAG_OS_STARTUP = 210009; // 0x33459
+    field public static final int TAG_PASSWORD_CHANGED = 210036; // 0x33474
     field public static final int TAG_PASSWORD_COMPLEXITY_REQUIRED = 210035; // 0x33473
     field public static final int TAG_PASSWORD_COMPLEXITY_SET = 210017; // 0x33461
     field public static final int TAG_PASSWORD_EXPIRATION_SET = 210016; // 0x33460
@@ -7607,6 +7958,8 @@
     field public static final int TAG_SYNC_SEND_FILE = 210004; // 0x33454
     field public static final int TAG_USER_RESTRICTION_ADDED = 210027; // 0x3346b
     field public static final int TAG_USER_RESTRICTION_REMOVED = 210028; // 0x3346c
+    field public static final int TAG_WIFI_CONNECTION = 210037; // 0x33475
+    field public static final int TAG_WIFI_DISCONNECTION = 210038; // 0x33476
     field public static final int TAG_WIPE_FAILURE = 210023; // 0x33467
   }
 
@@ -7669,6 +8022,17 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.UnsafeStateException> CREATOR;
   }
 
+  public final class WifiSsidPolicy implements android.os.Parcelable {
+    ctor public WifiSsidPolicy(int, @NonNull java.util.Set<android.net.wifi.WifiSsid>);
+    method public int describeContents();
+    method public int getPolicyType();
+    method @NonNull public java.util.Set<android.net.wifi.WifiSsid> getSsids();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.WifiSsidPolicy> CREATOR;
+    field public static final int WIFI_SSID_POLICY_TYPE_ALLOWLIST = 0; // 0x0
+    field public static final int WIFI_SSID_POLICY_TYPE_DENYLIST = 1; // 0x1
+  }
+
 }
 
 package android.app.assist {
@@ -7935,7 +8299,9 @@
     method public static final long getMinFlexMillis();
     method public long getMinLatencyMillis();
     method public static final long getMinPeriodMillis();
+    method public long getMinimumNetworkChunkBytes();
     method @Deprecated public int getNetworkType();
+    method public int getPriority();
     method @Nullable public android.net.NetworkRequest getRequiredNetwork();
     method @NonNull public android.content.ComponentName getService();
     method @NonNull public android.os.Bundle getTransientExtras();
@@ -7964,6 +8330,11 @@
     field public static final int NETWORK_TYPE_NONE = 0; // 0x0
     field public static final int NETWORK_TYPE_NOT_ROAMING = 3; // 0x3
     field public static final int NETWORK_TYPE_UNMETERED = 2; // 0x2
+    field public static final int PRIORITY_DEFAULT = 300; // 0x12c
+    field public static final int PRIORITY_HIGH = 400; // 0x190
+    field public static final int PRIORITY_LOW = 200; // 0xc8
+    field public static final int PRIORITY_MAX = 500; // 0x1f4
+    field public static final int PRIORITY_MIN = 100; // 0x64
   }
 
   public static final class JobInfo.Builder {
@@ -7977,11 +8348,13 @@
     method public android.app.job.JobInfo.Builder setExtras(@NonNull android.os.PersistableBundle);
     method @Deprecated public android.app.job.JobInfo.Builder setImportantWhileForeground(boolean);
     method public android.app.job.JobInfo.Builder setMinimumLatency(long);
+    method @NonNull public android.app.job.JobInfo.Builder setMinimumNetworkChunkBytes(long);
     method public android.app.job.JobInfo.Builder setOverrideDeadline(long);
     method public android.app.job.JobInfo.Builder setPeriodic(long);
     method public android.app.job.JobInfo.Builder setPeriodic(long, long);
     method @RequiresPermission(android.Manifest.permission.RECEIVE_BOOT_COMPLETED) public android.app.job.JobInfo.Builder setPersisted(boolean);
     method public android.app.job.JobInfo.Builder setPrefetch(boolean);
+    method @NonNull public android.app.job.JobInfo.Builder setPriority(int);
     method public android.app.job.JobInfo.Builder setRequiredNetwork(@Nullable android.net.NetworkRequest);
     method public android.app.job.JobInfo.Builder setRequiredNetworkType(int);
     method public android.app.job.JobInfo.Builder setRequiresBatteryNotLow(boolean);
@@ -8029,6 +8402,7 @@
     field public static final int STOP_REASON_CONSTRAINT_DEVICE_IDLE = 8; // 0x8
     field public static final int STOP_REASON_CONSTRAINT_STORAGE_NOT_LOW = 9; // 0x9
     field public static final int STOP_REASON_DEVICE_STATE = 4; // 0x4
+    field public static final int STOP_REASON_ESTIMATED_APP_LAUNCH_TIME_CHANGED = 15; // 0xf
     field public static final int STOP_REASON_PREEMPT = 2; // 0x2
     field public static final int STOP_REASON_QUOTA = 10; // 0xa
     field public static final int STOP_REASON_SYSTEM_PROCESSING = 14; // 0xe
@@ -8069,11 +8443,13 @@
   public final class JobWorkItem implements android.os.Parcelable {
     ctor public JobWorkItem(android.content.Intent);
     ctor public JobWorkItem(android.content.Intent, long, long);
+    ctor public JobWorkItem(@Nullable android.content.Intent, long, long, long);
     method public int describeContents();
     method public int getDeliveryCount();
     method public long getEstimatedNetworkDownloadBytes();
     method public long getEstimatedNetworkUploadBytes();
     method public android.content.Intent getIntent();
+    method public long getMinimumNetworkChunkBytes();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.app.job.JobWorkItem> CREATOR;
   }
@@ -8307,62 +8683,6 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.app.usage.ExternalStorageStats> CREATOR;
   }
 
-  public final class NetworkStats implements java.lang.AutoCloseable {
-    method public void close();
-    method public boolean getNextBucket(android.app.usage.NetworkStats.Bucket);
-    method public boolean hasNextBucket();
-  }
-
-  public static class NetworkStats.Bucket {
-    ctor public NetworkStats.Bucket();
-    method public int getDefaultNetworkStatus();
-    method public long getEndTimeStamp();
-    method public int getMetered();
-    method public int getRoaming();
-    method public long getRxBytes();
-    method public long getRxPackets();
-    method public long getStartTimeStamp();
-    method public int getState();
-    method public int getTag();
-    method public long getTxBytes();
-    method public long getTxPackets();
-    method public int getUid();
-    field public static final int DEFAULT_NETWORK_ALL = -1; // 0xffffffff
-    field public static final int DEFAULT_NETWORK_NO = 1; // 0x1
-    field public static final int DEFAULT_NETWORK_YES = 2; // 0x2
-    field public static final int METERED_ALL = -1; // 0xffffffff
-    field public static final int METERED_NO = 1; // 0x1
-    field public static final int METERED_YES = 2; // 0x2
-    field public static final int ROAMING_ALL = -1; // 0xffffffff
-    field public static final int ROAMING_NO = 1; // 0x1
-    field public static final int ROAMING_YES = 2; // 0x2
-    field public static final int STATE_ALL = -1; // 0xffffffff
-    field public static final int STATE_DEFAULT = 1; // 0x1
-    field public static final int STATE_FOREGROUND = 2; // 0x2
-    field public static final int TAG_NONE = 0; // 0x0
-    field public static final int UID_ALL = -1; // 0xffffffff
-    field public static final int UID_REMOVED = -4; // 0xfffffffc
-    field public static final int UID_TETHERING = -5; // 0xfffffffb
-  }
-
-  public class NetworkStatsManager {
-    method @WorkerThread public android.app.usage.NetworkStats queryDetails(int, String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
-    method @WorkerThread public android.app.usage.NetworkStats queryDetailsForUid(int, String, long, long, int) throws java.lang.SecurityException;
-    method @WorkerThread public android.app.usage.NetworkStats queryDetailsForUidTag(int, String, long, long, int, int) throws java.lang.SecurityException;
-    method @WorkerThread public android.app.usage.NetworkStats queryDetailsForUidTagState(int, String, long, long, int, int, int) throws java.lang.SecurityException;
-    method @WorkerThread public android.app.usage.NetworkStats querySummary(int, String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
-    method @WorkerThread public android.app.usage.NetworkStats.Bucket querySummaryForDevice(int, String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
-    method @WorkerThread public android.app.usage.NetworkStats.Bucket querySummaryForUser(int, String, long, long) throws android.os.RemoteException, java.lang.SecurityException;
-    method public void registerUsageCallback(int, String, long, android.app.usage.NetworkStatsManager.UsageCallback);
-    method public void registerUsageCallback(int, String, long, android.app.usage.NetworkStatsManager.UsageCallback, @Nullable android.os.Handler);
-    method public void unregisterUsageCallback(android.app.usage.NetworkStatsManager.UsageCallback);
-  }
-
-  public abstract static class NetworkStatsManager.UsageCallback {
-    ctor public NetworkStatsManager.UsageCallback();
-    method public abstract void onThresholdReached(int, String);
-  }
-
   public final class StorageStats implements android.os.Parcelable {
     method public int describeContents();
     method public long getAppBytes();
@@ -8612,1188 +8932,30 @@
 
 }
 
-package android.bluetooth {
-
-  public final class BluetoothA2dp implements android.bluetooth.BluetoothProfile {
-    method public void finalize();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(android.bluetooth.BluetoothDevice);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isA2dpPlaying(android.bluetooth.BluetoothDevice);
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_PLAYING_STATE_CHANGED = "android.bluetooth.a2dp.profile.action.PLAYING_STATE_CHANGED";
-    field public static final int STATE_NOT_PLAYING = 11; // 0xb
-    field public static final int STATE_PLAYING = 10; // 0xa
-  }
-
-  public final class BluetoothAdapter {
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public boolean cancelDiscovery();
-    method public static boolean checkBluetoothAddress(String);
-    method public void closeProfileProxy(int, android.bluetooth.BluetoothProfile);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean disable();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean enable();
-    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, "android.permission.LOCAL_MAC_ADDRESS"}) public String getAddress();
-    method public android.bluetooth.le.BluetoothLeAdvertiser getBluetoothLeAdvertiser();
-    method public android.bluetooth.le.BluetoothLeScanner getBluetoothLeScanner();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.Set<android.bluetooth.BluetoothDevice> getBondedDevices();
-    method @Deprecated public static android.bluetooth.BluetoothAdapter getDefaultAdapter();
-    method public int getLeMaximumAdvertisingDataLength();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public String getName();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getProfileConnectionState(int);
-    method public boolean getProfileProxy(android.content.Context, android.bluetooth.BluetoothProfile.ServiceListener, int);
-    method public android.bluetooth.BluetoothDevice getRemoteDevice(String);
-    method public android.bluetooth.BluetoothDevice getRemoteDevice(byte[]);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public int getScanMode();
-    method public int getState();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public boolean isDiscovering();
-    method public boolean isEnabled();
-    method public boolean isLe2MPhySupported();
-    method public boolean isLeCodedPhySupported();
-    method public boolean isLeExtendedAdvertisingSupported();
-    method public boolean isLePeriodicAdvertisingSupported();
-    method public boolean isMultipleAdvertisementSupported();
-    method public boolean isOffloadedFilteringSupported();
-    method public boolean isOffloadedScanBatchingSupported();
-    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothServerSocket listenUsingInsecureL2capChannel() throws java.io.IOException;
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothServerSocket listenUsingInsecureRfcommWithServiceRecord(String, java.util.UUID) throws java.io.IOException;
-    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothServerSocket listenUsingL2capChannel() throws java.io.IOException;
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothServerSocket listenUsingRfcommWithServiceRecord(String, java.util.UUID) throws java.io.IOException;
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean setName(String);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public boolean startDiscovery();
-    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public boolean startLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback);
-    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public boolean startLeScan(java.util.UUID[], android.bluetooth.BluetoothAdapter.LeScanCallback);
-    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void stopLeScan(android.bluetooth.BluetoothAdapter.LeScanCallback);
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.adapter.action.CONNECTION_STATE_CHANGED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public static final String ACTION_DISCOVERY_FINISHED = "android.bluetooth.adapter.action.DISCOVERY_FINISHED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public static final String ACTION_DISCOVERY_STARTED = "android.bluetooth.adapter.action.DISCOVERY_STARTED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_LOCAL_NAME_CHANGED = "android.bluetooth.adapter.action.LOCAL_NAME_CHANGED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public static final String ACTION_REQUEST_DISCOVERABLE = "android.bluetooth.adapter.action.REQUEST_DISCOVERABLE";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_REQUEST_ENABLE = "android.bluetooth.adapter.action.REQUEST_ENABLE";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public static final String ACTION_SCAN_MODE_CHANGED = "android.bluetooth.adapter.action.SCAN_MODE_CHANGED";
-    field public static final String ACTION_STATE_CHANGED = "android.bluetooth.adapter.action.STATE_CHANGED";
-    field public static final int ERROR = -2147483648; // 0x80000000
-    field public static final String EXTRA_CONNECTION_STATE = "android.bluetooth.adapter.extra.CONNECTION_STATE";
-    field public static final String EXTRA_DISCOVERABLE_DURATION = "android.bluetooth.adapter.extra.DISCOVERABLE_DURATION";
-    field public static final String EXTRA_LOCAL_NAME = "android.bluetooth.adapter.extra.LOCAL_NAME";
-    field public static final String EXTRA_PREVIOUS_CONNECTION_STATE = "android.bluetooth.adapter.extra.PREVIOUS_CONNECTION_STATE";
-    field public static final String EXTRA_PREVIOUS_SCAN_MODE = "android.bluetooth.adapter.extra.PREVIOUS_SCAN_MODE";
-    field public static final String EXTRA_PREVIOUS_STATE = "android.bluetooth.adapter.extra.PREVIOUS_STATE";
-    field public static final String EXTRA_SCAN_MODE = "android.bluetooth.adapter.extra.SCAN_MODE";
-    field public static final String EXTRA_STATE = "android.bluetooth.adapter.extra.STATE";
-    field public static final int SCAN_MODE_CONNECTABLE = 21; // 0x15
-    field public static final int SCAN_MODE_CONNECTABLE_DISCOVERABLE = 23; // 0x17
-    field public static final int SCAN_MODE_NONE = 20; // 0x14
-    field public static final int STATE_CONNECTED = 2; // 0x2
-    field public static final int STATE_CONNECTING = 1; // 0x1
-    field public static final int STATE_DISCONNECTED = 0; // 0x0
-    field public static final int STATE_DISCONNECTING = 3; // 0x3
-    field public static final int STATE_OFF = 10; // 0xa
-    field public static final int STATE_ON = 12; // 0xc
-    field public static final int STATE_TURNING_OFF = 13; // 0xd
-    field public static final int STATE_TURNING_ON = 11; // 0xb
-  }
-
-  public static interface BluetoothAdapter.LeScanCallback {
-    method public void onLeScan(android.bluetooth.BluetoothDevice, int, byte[]);
-  }
-
-  public class BluetoothAssignedNumbers {
-    field public static final int AAMP_OF_AMERICA = 190; // 0xbe
-    field public static final int ACCEL_SEMICONDUCTOR = 74; // 0x4a
-    field public static final int ACE_SENSOR = 188; // 0xbc
-    field public static final int ADIDAS = 195; // 0xc3
-    field public static final int ADVANCED_PANMOBIL_SYSTEMS = 145; // 0x91
-    field public static final int AIROHA_TECHNOLOGY = 148; // 0x94
-    field public static final int ALCATEL = 36; // 0x24
-    field public static final int ALPWISE = 154; // 0x9a
-    field public static final int AMICCOM_ELECTRONICS = 192; // 0xc0
-    field public static final int APLIX = 189; // 0xbd
-    field public static final int APPLE = 76; // 0x4c
-    field public static final int APT_LICENSING = 79; // 0x4f
-    field public static final int ARCHOS = 207; // 0xcf
-    field public static final int ARP_DEVICES = 168; // 0xa8
-    field public static final int ATHEROS_COMMUNICATIONS = 69; // 0x45
-    field public static final int ATMEL = 19; // 0x13
-    field public static final int AUSTCO_COMMUNICATION_SYSTEMS = 213; // 0xd5
-    field public static final int AUTONET_MOBILE = 127; // 0x7f
-    field public static final int AVAGO = 78; // 0x4e
-    field public static final int AVM_BERLIN = 31; // 0x1f
-    field public static final int A_AND_D_ENGINEERING = 105; // 0x69
-    field public static final int A_AND_R_CAMBRIDGE = 124; // 0x7c
-    field public static final int BANDSPEED = 32; // 0x20
-    field public static final int BAND_XI_INTERNATIONAL = 100; // 0x64
-    field public static final int BDE_TECHNOLOGY = 180; // 0xb4
-    field public static final int BEATS_ELECTRONICS = 204; // 0xcc
-    field public static final int BEAUTIFUL_ENTERPRISE = 108; // 0x6c
-    field public static final int BEKEY = 178; // 0xb2
-    field public static final int BELKIN_INTERNATIONAL = 92; // 0x5c
-    field public static final int BINAURIC = 203; // 0xcb
-    field public static final int BIOSENTRONICS = 219; // 0xdb
-    field public static final int BLUEGIGA = 71; // 0x47
-    field public static final int BLUERADIOS = 133; // 0x85
-    field public static final int BLUETOOTH_SIG = 63; // 0x3f
-    field public static final int BLUETREK_TECHNOLOGIES = 151; // 0x97
-    field public static final int BOSE = 158; // 0x9e
-    field public static final int BRIARTEK = 109; // 0x6d
-    field public static final int BROADCOM = 15; // 0xf
-    field public static final int CAEN_RFID = 170; // 0xaa
-    field public static final int CAMBRIDGE_SILICON_RADIO = 10; // 0xa
-    field public static final int CATC = 52; // 0x34
-    field public static final int CINETIX = 175; // 0xaf
-    field public static final int CLARINOX_TECHNOLOGIES = 179; // 0xb3
-    field public static final int COLORFY = 156; // 0x9c
-    field public static final int COMMIL = 51; // 0x33
-    field public static final int CONEXANT_SYSTEMS = 28; // 0x1c
-    field public static final int CONNECTBLUE = 113; // 0x71
-    field public static final int CONTINENTAL_AUTOMOTIVE = 75; // 0x4b
-    field public static final int CONWISE_TECHNOLOGY = 66; // 0x42
-    field public static final int CREATIVE_TECHNOLOGY = 118; // 0x76
-    field public static final int C_TECHNOLOGIES = 38; // 0x26
-    field public static final int DANLERS = 225; // 0xe1
-    field public static final int DELORME_PUBLISHING_COMPANY = 128; // 0x80
-    field public static final int DEXCOM = 208; // 0xd0
-    field public static final int DIALOG_SEMICONDUCTOR = 210; // 0xd2
-    field public static final int DIGIANSWER = 12; // 0xc
-    field public static final int ECLIPSE = 53; // 0x35
-    field public static final int ECOTEST = 136; // 0x88
-    field public static final int ELGATO_SYSTEMS = 206; // 0xce
-    field public static final int EM_MICROELECTRONIC_MARIN = 90; // 0x5a
-    field public static final int EQUINOX_AG = 134; // 0x86
-    field public static final int ERICSSON_TECHNOLOGY = 0; // 0x0
-    field public static final int EVLUMA = 201; // 0xc9
-    field public static final int FREE2MOVE = 83; // 0x53
-    field public static final int FUNAI_ELECTRIC = 144; // 0x90
-    field public static final int GARMIN_INTERNATIONAL = 135; // 0x87
-    field public static final int GCT_SEMICONDUCTOR = 45; // 0x2d
-    field public static final int GELO = 200; // 0xc8
-    field public static final int GENEQ = 194; // 0xc2
-    field public static final int GENERAL_MOTORS = 104; // 0x68
-    field public static final int GENNUM = 59; // 0x3b
-    field public static final int GEOFORCE = 157; // 0x9d
-    field public static final int GIBSON_GUITARS = 98; // 0x62
-    field public static final int GN_NETCOM = 103; // 0x67
-    field public static final int GN_RESOUND = 137; // 0x89
-    field public static final int GOOGLE = 224; // 0xe0
-    field public static final int GREEN_THROTTLE_GAMES = 172; // 0xac
-    field public static final int GROUP_SENSE = 115; // 0x73
-    field public static final int HANLYNN_TECHNOLOGIES = 123; // 0x7b
-    field public static final int HARMAN_INTERNATIONAL = 87; // 0x57
-    field public static final int HEWLETT_PACKARD = 101; // 0x65
-    field public static final int HITACHI = 41; // 0x29
-    field public static final int HOSIDEN = 221; // 0xdd
-    field public static final int IBM = 3; // 0x3
-    field public static final int INFINEON_TECHNOLOGIES = 9; // 0x9
-    field public static final int INGENIEUR_SYSTEMGRUPPE_ZAHN = 171; // 0xab
-    field public static final int INTEGRATED_SILICON_SOLUTION = 65; // 0x41
-    field public static final int INTEGRATED_SYSTEM_SOLUTION = 57; // 0x39
-    field public static final int INTEL = 2; // 0x2
-    field public static final int INVENTEL = 30; // 0x1e
-    field public static final int IPEXTREME = 61; // 0x3d
-    field public static final int I_TECH_DYNAMIC_GLOBAL_DISTRIBUTION = 153; // 0x99
-    field public static final int JAWBONE = 138; // 0x8a
-    field public static final int JIANGSU_TOPPOWER_AUTOMOTIVE_ELECTRONICS = 155; // 0x9b
-    field public static final int JOHNSON_CONTROLS = 185; // 0xb9
-    field public static final int J_AND_M = 82; // 0x52
-    field public static final int KAWANTECH = 212; // 0xd4
-    field public static final int KC_TECHNOLOGY = 22; // 0x16
-    field public static final int KENSINGTON_COMPUTER_PRODUCTS_GROUP = 160; // 0xa0
-    field public static final int LAIRD_TECHNOLOGIES = 119; // 0x77
-    field public static final int LESSWIRE = 121; // 0x79
-    field public static final int LG_ELECTRONICS = 196; // 0xc4
-    field public static final int LINAK = 164; // 0xa4
-    field public static final int LUCENT = 7; // 0x7
-    field public static final int LUDUS_HELSINKI = 132; // 0x84
-    field public static final int MACRONIX = 44; // 0x2c
-    field public static final int MAGNETI_MARELLI = 169; // 0xa9
-    field public static final int MANSELLA = 33; // 0x21
-    field public static final int MARVELL = 72; // 0x48
-    field public static final int MATSUSHITA_ELECTRIC = 58; // 0x3a
-    field public static final int MC10 = 202; // 0xca
-    field public static final int MEDIATEK = 70; // 0x46
-    field public static final int MESO_INTERNATIONAL = 182; // 0xb6
-    field public static final int META_WATCH = 163; // 0xa3
-    field public static final int MEWTEL_TECHNOLOGY = 47; // 0x2f
-    field public static final int MICOMMAND = 99; // 0x63
-    field public static final int MICROCHIP_TECHNOLOGY = 205; // 0xcd
-    field public static final int MICROSOFT = 6; // 0x6
-    field public static final int MINDTREE = 106; // 0x6a
-    field public static final int MISFIT_WEARABLES = 223; // 0xdf
-    field public static final int MITEL_SEMICONDUCTOR = 16; // 0x10
-    field public static final int MITSUBISHI_ELECTRIC = 20; // 0x14
-    field public static final int MOBILIAN_CORPORATION = 55; // 0x37
-    field public static final int MONSTER = 112; // 0x70
-    field public static final int MOTOROLA = 8; // 0x8
-    field public static final int MSTAR_SEMICONDUCTOR = 122; // 0x7a
-    field public static final int MUZIK = 222; // 0xde
-    field public static final int NEC = 34; // 0x22
-    field public static final int NEC_LIGHTING = 149; // 0x95
-    field public static final int NEWLOGIC = 23; // 0x17
-    field public static final int NIKE = 120; // 0x78
-    field public static final int NINE_SOLUTIONS = 102; // 0x66
-    field public static final int NOKIA_MOBILE_PHONES = 1; // 0x1
-    field public static final int NORDIC_SEMICONDUCTOR = 89; // 0x59
-    field public static final int NORWOOD_SYSTEMS = 46; // 0x2e
-    field public static final int ODM_TECHNOLOGY = 150; // 0x96
-    field public static final int OMEGAWAVE = 174; // 0xae
-    field public static final int ONSET_COMPUTER = 197; // 0xc5
-    field public static final int OPEN_INTERFACE = 39; // 0x27
-    field public static final int OTL_DYNAMICS = 165; // 0xa5
-    field public static final int PANDA_OCEAN = 166; // 0xa6
-    field public static final int PARROT = 67; // 0x43
-    field public static final int PARTHUS_TECHNOLOGIES = 14; // 0xe
-    field public static final int PASSIF_SEMICONDUCTOR = 176; // 0xb0
-    field public static final int PETER_SYSTEMTECHNIK = 173; // 0xad
-    field public static final int PHILIPS_SEMICONDUCTORS = 37; // 0x25
-    field public static final int PLANTRONICS = 85; // 0x55
-    field public static final int POLAR_ELECTRO = 107; // 0x6b
-    field public static final int POLAR_ELECTRO_EUROPE = 209; // 0xd1
-    field public static final int PROCTER_AND_GAMBLE = 220; // 0xdc
-    field public static final int QUALCOMM = 29; // 0x1d
-    field public static final int QUALCOMM_CONNECTED_EXPERIENCES = 216; // 0xd8
-    field public static final int QUALCOMM_INNOVATION_CENTER = 184; // 0xb8
-    field public static final int QUALCOMM_LABS = 140; // 0x8c
-    field public static final int QUALCOMM_TECHNOLOGIES = 215; // 0xd7
-    field public static final int QUINTIC = 142; // 0x8e
-    field public static final int QUUPPA = 199; // 0xc7
-    field public static final int RALINK_TECHNOLOGY = 91; // 0x5b
-    field public static final int RDA_MICROELECTRONICS = 97; // 0x61
-    field public static final int REALTEK_SEMICONDUCTOR = 93; // 0x5d
-    field public static final int RED_M = 50; // 0x32
-    field public static final int RENESAS_TECHNOLOGY = 54; // 0x36
-    field public static final int RESEARCH_IN_MOTION = 60; // 0x3c
-    field public static final int RF_MICRO_DEVICES = 40; // 0x28
-    field public static final int RIVIERAWAVES = 96; // 0x60
-    field public static final int ROHDE_AND_SCHWARZ = 25; // 0x19
-    field public static final int RTX_TELECOM = 21; // 0x15
-    field public static final int SAMSUNG_ELECTRONICS = 117; // 0x75
-    field public static final int SARIS_CYCLING_GROUP = 177; // 0xb1
-    field public static final int SEERS_TECHNOLOGY = 125; // 0x7d
-    field public static final int SEIKO_EPSON = 64; // 0x40
-    field public static final int SELFLY = 198; // 0xc6
-    field public static final int SEMILINK = 226; // 0xe2
-    field public static final int SENNHEISER_COMMUNICATIONS = 130; // 0x82
-    field public static final int SHANGHAI_SUPER_SMART_ELECTRONICS = 114; // 0x72
-    field public static final int SHENZHEN_EXCELSECU_DATA_TECHNOLOGY = 193; // 0xc1
-    field public static final int SIGNIA_TECHNOLOGIES = 27; // 0x1b
-    field public static final int SILICON_WAVE = 11; // 0xb
-    field public static final int SIRF_TECHNOLOGY = 80; // 0x50
-    field public static final int SOCKET_MOBILE = 68; // 0x44
-    field public static final int SONY_ERICSSON = 86; // 0x56
-    field public static final int SOUND_ID = 111; // 0x6f
-    field public static final int SPORTS_TRACKING_TECHNOLOGIES = 126; // 0x7e
-    field public static final int SR_MEDIZINELEKTRONIK = 161; // 0xa1
-    field public static final int STACCATO_COMMUNICATIONS = 77; // 0x4d
-    field public static final int STALMART_TECHNOLOGY = 191; // 0xbf
-    field public static final int STARKEY_LABORATORIES = 186; // 0xba
-    field public static final int STOLLMAN_E_PLUS_V = 143; // 0x8f
-    field public static final int STONESTREET_ONE = 94; // 0x5e
-    field public static final int ST_MICROELECTRONICS = 48; // 0x30
-    field public static final int SUMMIT_DATA_COMMUNICATIONS = 110; // 0x6e
-    field public static final int SUUNTO = 159; // 0x9f
-    field public static final int SWIRL_NETWORKS = 181; // 0xb5
-    field public static final int SYMBOL_TECHNOLOGIES = 42; // 0x2a
-    field public static final int SYNOPSYS = 49; // 0x31
-    field public static final int SYSTEMS_AND_CHIPS = 62; // 0x3e
-    field public static final int S_POWER_ELECTRONICS = 187; // 0xbb
-    field public static final int TAIXINGBANG_TECHNOLOGY = 211; // 0xd3
-    field public static final int TENOVIS = 43; // 0x2b
-    field public static final int TERAX = 56; // 0x38
-    field public static final int TEXAS_INSTRUMENTS = 13; // 0xd
-    field public static final int THINKOPTICS = 146; // 0x92
-    field public static final int THREECOM = 5; // 0x5
-    field public static final int THREE_DIJOY = 84; // 0x54
-    field public static final int THREE_DSP = 73; // 0x49
-    field public static final int TIMEKEEPING_SYSTEMS = 131; // 0x83
-    field public static final int TIMEX_GROUP_USA = 214; // 0xd6
-    field public static final int TOPCORN_POSITIONING_SYSTEMS = 139; // 0x8b
-    field public static final int TOSHIBA = 4; // 0x4
-    field public static final int TRANSILICA = 24; // 0x18
-    field public static final int TRELAB = 183; // 0xb7
-    field public static final int TTPCOM = 26; // 0x1a
-    field public static final int TXTR = 218; // 0xda
-    field public static final int TZERO_TECHNOLOGIES = 81; // 0x51
-    field public static final int UNIVERSAL_ELECTRONICS = 147; // 0x93
-    field public static final int VERTU = 162; // 0xa2
-    field public static final int VISTEON = 167; // 0xa7
-    field public static final int VIZIO = 88; // 0x58
-    field public static final int VOYETRA_TURTLE_BEACH = 217; // 0xd9
-    field public static final int WAVEPLUS_TECHNOLOGY = 35; // 0x23
-    field public static final int WICENTRIC = 95; // 0x5f
-    field public static final int WIDCOMM = 17; // 0x11
-    field public static final int WUXI_VIMICRO = 129; // 0x81
-    field public static final int ZEEVO = 18; // 0x12
-    field public static final int ZER01_TV = 152; // 0x98
-    field public static final int ZOMM = 116; // 0x74
-    field public static final int ZSCAN_SOFTWARE = 141; // 0x8d
-  }
-
-  public final class BluetoothClass implements android.os.Parcelable {
-    method public int describeContents();
-    method public int getDeviceClass();
-    method public int getMajorDeviceClass();
-    method public boolean hasService(int);
-    method public void writeToParcel(android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothClass> CREATOR;
-  }
-
-  public static class BluetoothClass.Device {
-    ctor public BluetoothClass.Device();
-    field public static final int AUDIO_VIDEO_CAMCORDER = 1076; // 0x434
-    field public static final int AUDIO_VIDEO_CAR_AUDIO = 1056; // 0x420
-    field public static final int AUDIO_VIDEO_HANDSFREE = 1032; // 0x408
-    field public static final int AUDIO_VIDEO_HEADPHONES = 1048; // 0x418
-    field public static final int AUDIO_VIDEO_HIFI_AUDIO = 1064; // 0x428
-    field public static final int AUDIO_VIDEO_LOUDSPEAKER = 1044; // 0x414
-    field public static final int AUDIO_VIDEO_MICROPHONE = 1040; // 0x410
-    field public static final int AUDIO_VIDEO_PORTABLE_AUDIO = 1052; // 0x41c
-    field public static final int AUDIO_VIDEO_SET_TOP_BOX = 1060; // 0x424
-    field public static final int AUDIO_VIDEO_UNCATEGORIZED = 1024; // 0x400
-    field public static final int AUDIO_VIDEO_VCR = 1068; // 0x42c
-    field public static final int AUDIO_VIDEO_VIDEO_CAMERA = 1072; // 0x430
-    field public static final int AUDIO_VIDEO_VIDEO_CONFERENCING = 1088; // 0x440
-    field public static final int AUDIO_VIDEO_VIDEO_DISPLAY_AND_LOUDSPEAKER = 1084; // 0x43c
-    field public static final int AUDIO_VIDEO_VIDEO_GAMING_TOY = 1096; // 0x448
-    field public static final int AUDIO_VIDEO_VIDEO_MONITOR = 1080; // 0x438
-    field public static final int AUDIO_VIDEO_WEARABLE_HEADSET = 1028; // 0x404
-    field public static final int COMPUTER_DESKTOP = 260; // 0x104
-    field public static final int COMPUTER_HANDHELD_PC_PDA = 272; // 0x110
-    field public static final int COMPUTER_LAPTOP = 268; // 0x10c
-    field public static final int COMPUTER_PALM_SIZE_PC_PDA = 276; // 0x114
-    field public static final int COMPUTER_SERVER = 264; // 0x108
-    field public static final int COMPUTER_UNCATEGORIZED = 256; // 0x100
-    field public static final int COMPUTER_WEARABLE = 280; // 0x118
-    field public static final int HEALTH_BLOOD_PRESSURE = 2308; // 0x904
-    field public static final int HEALTH_DATA_DISPLAY = 2332; // 0x91c
-    field public static final int HEALTH_GLUCOSE = 2320; // 0x910
-    field public static final int HEALTH_PULSE_OXIMETER = 2324; // 0x914
-    field public static final int HEALTH_PULSE_RATE = 2328; // 0x918
-    field public static final int HEALTH_THERMOMETER = 2312; // 0x908
-    field public static final int HEALTH_UNCATEGORIZED = 2304; // 0x900
-    field public static final int HEALTH_WEIGHING = 2316; // 0x90c
-    field public static final int PHONE_CELLULAR = 516; // 0x204
-    field public static final int PHONE_CORDLESS = 520; // 0x208
-    field public static final int PHONE_ISDN = 532; // 0x214
-    field public static final int PHONE_MODEM_OR_GATEWAY = 528; // 0x210
-    field public static final int PHONE_SMART = 524; // 0x20c
-    field public static final int PHONE_UNCATEGORIZED = 512; // 0x200
-    field public static final int TOY_CONTROLLER = 2064; // 0x810
-    field public static final int TOY_DOLL_ACTION_FIGURE = 2060; // 0x80c
-    field public static final int TOY_GAME = 2068; // 0x814
-    field public static final int TOY_ROBOT = 2052; // 0x804
-    field public static final int TOY_UNCATEGORIZED = 2048; // 0x800
-    field public static final int TOY_VEHICLE = 2056; // 0x808
-    field public static final int WEARABLE_GLASSES = 1812; // 0x714
-    field public static final int WEARABLE_HELMET = 1808; // 0x710
-    field public static final int WEARABLE_JACKET = 1804; // 0x70c
-    field public static final int WEARABLE_PAGER = 1800; // 0x708
-    field public static final int WEARABLE_UNCATEGORIZED = 1792; // 0x700
-    field public static final int WEARABLE_WRIST_WATCH = 1796; // 0x704
-  }
-
-  public static class BluetoothClass.Device.Major {
-    ctor public BluetoothClass.Device.Major();
-    field public static final int AUDIO_VIDEO = 1024; // 0x400
-    field public static final int COMPUTER = 256; // 0x100
-    field public static final int HEALTH = 2304; // 0x900
-    field public static final int IMAGING = 1536; // 0x600
-    field public static final int MISC = 0; // 0x0
-    field public static final int NETWORKING = 768; // 0x300
-    field public static final int PERIPHERAL = 1280; // 0x500
-    field public static final int PHONE = 512; // 0x200
-    field public static final int TOY = 2048; // 0x800
-    field public static final int UNCATEGORIZED = 7936; // 0x1f00
-    field public static final int WEARABLE = 1792; // 0x700
-  }
-
-  public static final class BluetoothClass.Service {
-    ctor public BluetoothClass.Service();
-    field public static final int AUDIO = 2097152; // 0x200000
-    field public static final int CAPTURE = 524288; // 0x80000
-    field public static final int INFORMATION = 8388608; // 0x800000
-    field public static final int LIMITED_DISCOVERABILITY = 8192; // 0x2000
-    field public static final int NETWORKING = 131072; // 0x20000
-    field public static final int OBJECT_TRANSFER = 1048576; // 0x100000
-    field public static final int POSITIONING = 65536; // 0x10000
-    field public static final int RENDER = 262144; // 0x40000
-    field public static final int TELEPHONY = 4194304; // 0x400000
-  }
-
-  public final class BluetoothDevice implements android.os.Parcelable {
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int, int);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothGatt connectGatt(android.content.Context, boolean, android.bluetooth.BluetoothGattCallback, int, int, android.os.Handler);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean createBond();
-    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothSocket createInsecureL2capChannel(int) throws java.io.IOException;
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothSocket createInsecureRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;
-    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothSocket createL2capChannel(int) throws java.io.IOException;
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothSocket createRfcommSocketToServiceRecord(java.util.UUID) throws java.io.IOException;
-    method public int describeContents();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean fetchUuidsWithSdp();
-    method public String getAddress();
-    method @Nullable @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public String getAlias();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothClass getBluetoothClass();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getBondState();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public String getName();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getType();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.os.ParcelUuid[] getUuids();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int setAlias(@Nullable String);
-    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.BLUETOOTH_PRIVILEGED}) public boolean setPairingConfirmation(boolean);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean setPin(byte[]);
-    method public void writeToParcel(android.os.Parcel, int);
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_ACL_CONNECTED = "android.bluetooth.device.action.ACL_CONNECTED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_ACL_DISCONNECTED = "android.bluetooth.device.action.ACL_DISCONNECTED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_ACL_DISCONNECT_REQUESTED = "android.bluetooth.device.action.ACL_DISCONNECT_REQUESTED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_ALIAS_CHANGED = "android.bluetooth.device.action.ALIAS_CHANGED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_BOND_STATE_CHANGED = "android.bluetooth.device.action.BOND_STATE_CHANGED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CLASS_CHANGED = "android.bluetooth.device.action.CLASS_CHANGED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public static final String ACTION_FOUND = "android.bluetooth.device.action.FOUND";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_NAME_CHANGED = "android.bluetooth.device.action.NAME_CHANGED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_PAIRING_REQUEST = "android.bluetooth.device.action.PAIRING_REQUEST";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_UUID = "android.bluetooth.device.action.UUID";
-    field public static final int ADDRESS_TYPE_PUBLIC = 0; // 0x0
-    field public static final int ADDRESS_TYPE_RANDOM = 1; // 0x1
-    field public static final int BOND_BONDED = 12; // 0xc
-    field public static final int BOND_BONDING = 11; // 0xb
-    field public static final int BOND_NONE = 10; // 0xa
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothDevice> CREATOR;
-    field public static final int DEVICE_TYPE_CLASSIC = 1; // 0x1
-    field public static final int DEVICE_TYPE_DUAL = 3; // 0x3
-    field public static final int DEVICE_TYPE_LE = 2; // 0x2
-    field public static final int DEVICE_TYPE_UNKNOWN = 0; // 0x0
-    field public static final int ERROR = -2147483648; // 0x80000000
-    field public static final String EXTRA_BOND_STATE = "android.bluetooth.device.extra.BOND_STATE";
-    field public static final String EXTRA_CLASS = "android.bluetooth.device.extra.CLASS";
-    field public static final String EXTRA_DEVICE = "android.bluetooth.device.extra.DEVICE";
-    field public static final String EXTRA_NAME = "android.bluetooth.device.extra.NAME";
-    field public static final String EXTRA_PAIRING_KEY = "android.bluetooth.device.extra.PAIRING_KEY";
-    field public static final String EXTRA_PAIRING_VARIANT = "android.bluetooth.device.extra.PAIRING_VARIANT";
-    field public static final String EXTRA_PREVIOUS_BOND_STATE = "android.bluetooth.device.extra.PREVIOUS_BOND_STATE";
-    field public static final String EXTRA_RSSI = "android.bluetooth.device.extra.RSSI";
-    field public static final String EXTRA_UUID = "android.bluetooth.device.extra.UUID";
-    field public static final int PAIRING_VARIANT_PASSKEY_CONFIRMATION = 2; // 0x2
-    field public static final int PAIRING_VARIANT_PIN = 0; // 0x0
-    field public static final int PHY_LE_1M = 1; // 0x1
-    field public static final int PHY_LE_1M_MASK = 1; // 0x1
-    field public static final int PHY_LE_2M = 2; // 0x2
-    field public static final int PHY_LE_2M_MASK = 2; // 0x2
-    field public static final int PHY_LE_CODED = 3; // 0x3
-    field public static final int PHY_LE_CODED_MASK = 4; // 0x4
-    field public static final int PHY_OPTION_NO_PREFERRED = 0; // 0x0
-    field public static final int PHY_OPTION_S2 = 1; // 0x1
-    field public static final int PHY_OPTION_S8 = 2; // 0x2
-    field public static final int TRANSPORT_AUTO = 0; // 0x0
-    field public static final int TRANSPORT_BREDR = 1; // 0x1
-    field public static final int TRANSPORT_LE = 2; // 0x2
-  }
-
-  public final class BluetoothGatt implements android.bluetooth.BluetoothProfile {
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void abortReliableWrite();
-    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void abortReliableWrite(android.bluetooth.BluetoothDevice);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean beginReliableWrite();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void close();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean connect();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void disconnect();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean discoverServices();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean executeReliableWrite();
-    method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
-    method public int getConnectionState(android.bluetooth.BluetoothDevice);
-    method public android.bluetooth.BluetoothDevice getDevice();
-    method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
-    method public android.bluetooth.BluetoothGattService getService(java.util.UUID);
-    method public java.util.List<android.bluetooth.BluetoothGattService> getServices();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean readCharacteristic(android.bluetooth.BluetoothGattCharacteristic);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean readDescriptor(android.bluetooth.BluetoothGattDescriptor);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void readPhy();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean readRemoteRssi();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean requestConnectionPriority(int);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean requestMtu(int);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean setCharacteristicNotification(android.bluetooth.BluetoothGattCharacteristic, boolean);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void setPreferredPhy(int, int, int);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean writeCharacteristic(android.bluetooth.BluetoothGattCharacteristic);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean writeDescriptor(android.bluetooth.BluetoothGattDescriptor);
-    field public static final int CONNECTION_PRIORITY_BALANCED = 0; // 0x0
-    field public static final int CONNECTION_PRIORITY_HIGH = 1; // 0x1
-    field public static final int CONNECTION_PRIORITY_LOW_POWER = 2; // 0x2
-    field public static final int GATT_CONNECTION_CONGESTED = 143; // 0x8f
-    field public static final int GATT_FAILURE = 257; // 0x101
-    field public static final int GATT_INSUFFICIENT_AUTHENTICATION = 5; // 0x5
-    field public static final int GATT_INSUFFICIENT_ENCRYPTION = 15; // 0xf
-    field public static final int GATT_INVALID_ATTRIBUTE_LENGTH = 13; // 0xd
-    field public static final int GATT_INVALID_OFFSET = 7; // 0x7
-    field public static final int GATT_READ_NOT_PERMITTED = 2; // 0x2
-    field public static final int GATT_REQUEST_NOT_SUPPORTED = 6; // 0x6
-    field public static final int GATT_SUCCESS = 0; // 0x0
-    field public static final int GATT_WRITE_NOT_PERMITTED = 3; // 0x3
-  }
-
-  public abstract class BluetoothGattCallback {
-    ctor public BluetoothGattCallback();
-    method public void onCharacteristicChanged(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic);
-    method public void onCharacteristicRead(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic, int);
-    method public void onCharacteristicWrite(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattCharacteristic, int);
-    method public void onConnectionStateChange(android.bluetooth.BluetoothGatt, int, int);
-    method public void onDescriptorRead(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattDescriptor, int);
-    method public void onDescriptorWrite(android.bluetooth.BluetoothGatt, android.bluetooth.BluetoothGattDescriptor, int);
-    method public void onMtuChanged(android.bluetooth.BluetoothGatt, int, int);
-    method public void onPhyRead(android.bluetooth.BluetoothGatt, int, int, int);
-    method public void onPhyUpdate(android.bluetooth.BluetoothGatt, int, int, int);
-    method public void onReadRemoteRssi(android.bluetooth.BluetoothGatt, int, int);
-    method public void onReliableWriteCompleted(android.bluetooth.BluetoothGatt, int);
-    method public void onServiceChanged(@NonNull android.bluetooth.BluetoothGatt);
-    method public void onServicesDiscovered(android.bluetooth.BluetoothGatt, int);
-  }
-
-  public class BluetoothGattCharacteristic implements android.os.Parcelable {
-    ctor public BluetoothGattCharacteristic(java.util.UUID, int, int);
-    method public boolean addDescriptor(android.bluetooth.BluetoothGattDescriptor);
-    method public int describeContents();
-    method public android.bluetooth.BluetoothGattDescriptor getDescriptor(java.util.UUID);
-    method public java.util.List<android.bluetooth.BluetoothGattDescriptor> getDescriptors();
-    method public Float getFloatValue(int, int);
-    method public int getInstanceId();
-    method public Integer getIntValue(int, int);
-    method public int getPermissions();
-    method public int getProperties();
-    method public android.bluetooth.BluetoothGattService getService();
-    method public String getStringValue(int);
-    method public java.util.UUID getUuid();
-    method public byte[] getValue();
-    method public int getWriteType();
-    method public boolean setValue(byte[]);
-    method public boolean setValue(int, int, int);
-    method public boolean setValue(int, int, int, int);
-    method public boolean setValue(String);
-    method public void setWriteType(int);
-    method public void writeToParcel(android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattCharacteristic> CREATOR;
-    field public static final int FORMAT_FLOAT = 52; // 0x34
-    field public static final int FORMAT_SFLOAT = 50; // 0x32
-    field public static final int FORMAT_SINT16 = 34; // 0x22
-    field public static final int FORMAT_SINT32 = 36; // 0x24
-    field public static final int FORMAT_SINT8 = 33; // 0x21
-    field public static final int FORMAT_UINT16 = 18; // 0x12
-    field public static final int FORMAT_UINT32 = 20; // 0x14
-    field public static final int FORMAT_UINT8 = 17; // 0x11
-    field public static final int PERMISSION_READ = 1; // 0x1
-    field public static final int PERMISSION_READ_ENCRYPTED = 2; // 0x2
-    field public static final int PERMISSION_READ_ENCRYPTED_MITM = 4; // 0x4
-    field public static final int PERMISSION_WRITE = 16; // 0x10
-    field public static final int PERMISSION_WRITE_ENCRYPTED = 32; // 0x20
-    field public static final int PERMISSION_WRITE_ENCRYPTED_MITM = 64; // 0x40
-    field public static final int PERMISSION_WRITE_SIGNED = 128; // 0x80
-    field public static final int PERMISSION_WRITE_SIGNED_MITM = 256; // 0x100
-    field public static final int PROPERTY_BROADCAST = 1; // 0x1
-    field public static final int PROPERTY_EXTENDED_PROPS = 128; // 0x80
-    field public static final int PROPERTY_INDICATE = 32; // 0x20
-    field public static final int PROPERTY_NOTIFY = 16; // 0x10
-    field public static final int PROPERTY_READ = 2; // 0x2
-    field public static final int PROPERTY_SIGNED_WRITE = 64; // 0x40
-    field public static final int PROPERTY_WRITE = 8; // 0x8
-    field public static final int PROPERTY_WRITE_NO_RESPONSE = 4; // 0x4
-    field public static final int WRITE_TYPE_DEFAULT = 2; // 0x2
-    field public static final int WRITE_TYPE_NO_RESPONSE = 1; // 0x1
-    field public static final int WRITE_TYPE_SIGNED = 4; // 0x4
-    field protected java.util.List<android.bluetooth.BluetoothGattDescriptor> mDescriptors;
-  }
-
-  public class BluetoothGattDescriptor implements android.os.Parcelable {
-    ctor public BluetoothGattDescriptor(java.util.UUID, int);
-    method public int describeContents();
-    method public android.bluetooth.BluetoothGattCharacteristic getCharacteristic();
-    method public int getPermissions();
-    method public java.util.UUID getUuid();
-    method public byte[] getValue();
-    method public boolean setValue(byte[]);
-    method public void writeToParcel(android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattDescriptor> CREATOR;
-    field public static final byte[] DISABLE_NOTIFICATION_VALUE;
-    field public static final byte[] ENABLE_INDICATION_VALUE;
-    field public static final byte[] ENABLE_NOTIFICATION_VALUE;
-    field public static final int PERMISSION_READ = 1; // 0x1
-    field public static final int PERMISSION_READ_ENCRYPTED = 2; // 0x2
-    field public static final int PERMISSION_READ_ENCRYPTED_MITM = 4; // 0x4
-    field public static final int PERMISSION_WRITE = 16; // 0x10
-    field public static final int PERMISSION_WRITE_ENCRYPTED = 32; // 0x20
-    field public static final int PERMISSION_WRITE_ENCRYPTED_MITM = 64; // 0x40
-    field public static final int PERMISSION_WRITE_SIGNED = 128; // 0x80
-    field public static final int PERMISSION_WRITE_SIGNED_MITM = 256; // 0x100
-  }
-
-  public final class BluetoothGattServer implements android.bluetooth.BluetoothProfile {
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean addService(android.bluetooth.BluetoothGattService);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void cancelConnection(android.bluetooth.BluetoothDevice);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void clearServices();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void close();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean connect(android.bluetooth.BluetoothDevice, boolean);
-    method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
-    method public int getConnectionState(android.bluetooth.BluetoothDevice);
-    method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
-    method public android.bluetooth.BluetoothGattService getService(java.util.UUID);
-    method public java.util.List<android.bluetooth.BluetoothGattService> getServices();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean notifyCharacteristicChanged(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothGattCharacteristic, boolean);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void readPhy(android.bluetooth.BluetoothDevice);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean removeService(android.bluetooth.BluetoothGattService);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean sendResponse(android.bluetooth.BluetoothDevice, int, int, int, byte[]);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void setPreferredPhy(android.bluetooth.BluetoothDevice, int, int, int);
-  }
-
-  public abstract class BluetoothGattServerCallback {
-    ctor public BluetoothGattServerCallback();
-    method public void onCharacteristicReadRequest(android.bluetooth.BluetoothDevice, int, int, android.bluetooth.BluetoothGattCharacteristic);
-    method public void onCharacteristicWriteRequest(android.bluetooth.BluetoothDevice, int, android.bluetooth.BluetoothGattCharacteristic, boolean, boolean, int, byte[]);
-    method public void onConnectionStateChange(android.bluetooth.BluetoothDevice, int, int);
-    method public void onDescriptorReadRequest(android.bluetooth.BluetoothDevice, int, int, android.bluetooth.BluetoothGattDescriptor);
-    method public void onDescriptorWriteRequest(android.bluetooth.BluetoothDevice, int, android.bluetooth.BluetoothGattDescriptor, boolean, boolean, int, byte[]);
-    method public void onExecuteWrite(android.bluetooth.BluetoothDevice, int, boolean);
-    method public void onMtuChanged(android.bluetooth.BluetoothDevice, int);
-    method public void onNotificationSent(android.bluetooth.BluetoothDevice, int);
-    method public void onPhyRead(android.bluetooth.BluetoothDevice, int, int, int);
-    method public void onPhyUpdate(android.bluetooth.BluetoothDevice, int, int, int);
-    method public void onServiceAdded(int, android.bluetooth.BluetoothGattService);
-  }
-
-  public class BluetoothGattService implements android.os.Parcelable {
-    ctor public BluetoothGattService(java.util.UUID, int);
-    method public boolean addCharacteristic(android.bluetooth.BluetoothGattCharacteristic);
-    method public boolean addService(android.bluetooth.BluetoothGattService);
-    method public int describeContents();
-    method public android.bluetooth.BluetoothGattCharacteristic getCharacteristic(java.util.UUID);
-    method public java.util.List<android.bluetooth.BluetoothGattCharacteristic> getCharacteristics();
-    method public java.util.List<android.bluetooth.BluetoothGattService> getIncludedServices();
-    method public int getInstanceId();
-    method public int getType();
-    method public java.util.UUID getUuid();
-    method public void writeToParcel(android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattService> CREATOR;
-    field public static final int SERVICE_TYPE_PRIMARY = 0; // 0x0
-    field public static final int SERVICE_TYPE_SECONDARY = 1; // 0x1
-    field protected java.util.List<android.bluetooth.BluetoothGattCharacteristic> mCharacteristics;
-    field protected java.util.List<android.bluetooth.BluetoothGattService> mIncludedServices;
-  }
-
-  public final class BluetoothHeadset implements android.bluetooth.BluetoothProfile {
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(android.bluetooth.BluetoothDevice);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isAudioConnected(android.bluetooth.BluetoothDevice);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isNoiseReductionSupported(@NonNull android.bluetooth.BluetoothDevice);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean isVoiceRecognitionSupported(@NonNull android.bluetooth.BluetoothDevice);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean sendVendorSpecificResultCode(android.bluetooth.BluetoothDevice, String, String);
-    method @RequiresPermission(allOf={android.Manifest.permission.BLUETOOTH_CONNECT, android.Manifest.permission.MODIFY_PHONE_STATE}) public boolean startVoiceRecognition(android.bluetooth.BluetoothDevice);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean stopVoiceRecognition(android.bluetooth.BluetoothDevice);
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_AUDIO_STATE_CHANGED = "android.bluetooth.headset.profile.action.AUDIO_STATE_CHANGED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.headset.profile.action.CONNECTION_STATE_CHANGED";
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_VENDOR_SPECIFIC_HEADSET_EVENT = "android.bluetooth.headset.action.VENDOR_SPECIFIC_HEADSET_EVENT";
-    field public static final int AT_CMD_TYPE_ACTION = 4; // 0x4
-    field public static final int AT_CMD_TYPE_BASIC = 3; // 0x3
-    field public static final int AT_CMD_TYPE_READ = 0; // 0x0
-    field public static final int AT_CMD_TYPE_SET = 2; // 0x2
-    field public static final int AT_CMD_TYPE_TEST = 1; // 0x1
-    field public static final String EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS = "android.bluetooth.headset.extra.VENDOR_SPECIFIC_HEADSET_EVENT_ARGS";
-    field public static final String EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD = "android.bluetooth.headset.extra.VENDOR_SPECIFIC_HEADSET_EVENT_CMD";
-    field public static final String EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD_TYPE = "android.bluetooth.headset.extra.VENDOR_SPECIFIC_HEADSET_EVENT_CMD_TYPE";
-    field public static final int STATE_AUDIO_CONNECTED = 12; // 0xc
-    field public static final int STATE_AUDIO_CONNECTING = 11; // 0xb
-    field public static final int STATE_AUDIO_DISCONNECTED = 10; // 0xa
-    field public static final String VENDOR_RESULT_CODE_COMMAND_ANDROID = "+ANDROID";
-    field public static final String VENDOR_SPECIFIC_HEADSET_EVENT_COMPANY_ID_CATEGORY = "android.bluetooth.headset.intent.category.companyid";
-  }
-
-  @Deprecated public final class BluetoothHealth implements android.bluetooth.BluetoothProfile {
-    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean connectChannelToSource(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration);
-    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean disconnectChannel(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration, int);
-    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
-    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(android.bluetooth.BluetoothDevice);
-    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
-    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.os.ParcelFileDescriptor getMainChannelFd(android.bluetooth.BluetoothDevice, android.bluetooth.BluetoothHealthAppConfiguration);
-    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean registerSinkAppConfiguration(String, int, android.bluetooth.BluetoothHealthCallback);
-    method @Deprecated @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean unregisterAppConfiguration(android.bluetooth.BluetoothHealthAppConfiguration);
-    field @Deprecated public static final int APP_CONFIG_REGISTRATION_FAILURE = 1; // 0x1
-    field @Deprecated public static final int APP_CONFIG_REGISTRATION_SUCCESS = 0; // 0x0
-    field @Deprecated public static final int APP_CONFIG_UNREGISTRATION_FAILURE = 3; // 0x3
-    field @Deprecated public static final int APP_CONFIG_UNREGISTRATION_SUCCESS = 2; // 0x2
-    field @Deprecated public static final int CHANNEL_TYPE_RELIABLE = 10; // 0xa
-    field @Deprecated public static final int CHANNEL_TYPE_STREAMING = 11; // 0xb
-    field @Deprecated public static final int SINK_ROLE = 2; // 0x2
-    field @Deprecated public static final int SOURCE_ROLE = 1; // 0x1
-    field @Deprecated public static final int STATE_CHANNEL_CONNECTED = 2; // 0x2
-    field @Deprecated public static final int STATE_CHANNEL_CONNECTING = 1; // 0x1
-    field @Deprecated public static final int STATE_CHANNEL_DISCONNECTED = 0; // 0x0
-    field @Deprecated public static final int STATE_CHANNEL_DISCONNECTING = 3; // 0x3
-  }
-
-  @Deprecated public final class BluetoothHealthAppConfiguration implements android.os.Parcelable {
-    method @Deprecated public int describeContents();
-    method @Deprecated public int getDataType();
-    method @Deprecated public String getName();
-    method @Deprecated public int getRole();
-    method @Deprecated public void writeToParcel(android.os.Parcel, int);
-    field @Deprecated @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothHealthAppConfiguration> CREATOR;
-  }
-
-  @Deprecated public abstract class BluetoothHealthCallback {
-    ctor @Deprecated public BluetoothHealthCallback();
-    method @Deprecated @BinderThread public void onHealthAppConfigurationStatusChange(android.bluetooth.BluetoothHealthAppConfiguration, int);
-    method @Deprecated @BinderThread public void onHealthChannelStateChange(android.bluetooth.BluetoothHealthAppConfiguration, android.bluetooth.BluetoothDevice, int, int, android.os.ParcelFileDescriptor, int);
-  }
-
-  public final class BluetoothHearingAid implements android.bluetooth.BluetoothProfile {
-    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);
-    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.hearingaid.profile.action.CONNECTION_STATE_CHANGED";
-  }
-
-  public final class BluetoothHidDevice implements android.bluetooth.BluetoothProfile {
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean connect(android.bluetooth.BluetoothDevice);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean disconnect(android.bluetooth.BluetoothDevice);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(android.bluetooth.BluetoothDevice);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean registerApp(android.bluetooth.BluetoothHidDeviceAppSdpSettings, android.bluetooth.BluetoothHidDeviceAppQosSettings, android.bluetooth.BluetoothHidDeviceAppQosSettings, java.util.concurrent.Executor, android.bluetooth.BluetoothHidDevice.Callback);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean replyReport(android.bluetooth.BluetoothDevice, byte, byte, byte[]);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean reportError(android.bluetooth.BluetoothDevice, byte);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean sendReport(android.bluetooth.BluetoothDevice, int, byte[]);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public boolean unregisterApp();
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_CONNECTION_STATE_CHANGED = "android.bluetooth.hiddevice.profile.action.CONNECTION_STATE_CHANGED";
-    field public static final byte ERROR_RSP_INVALID_PARAM = 4; // 0x4
-    field public static final byte ERROR_RSP_INVALID_RPT_ID = 2; // 0x2
-    field public static final byte ERROR_RSP_NOT_READY = 1; // 0x1
-    field public static final byte ERROR_RSP_SUCCESS = 0; // 0x0
-    field public static final byte ERROR_RSP_UNKNOWN = 14; // 0xe
-    field public static final byte ERROR_RSP_UNSUPPORTED_REQ = 3; // 0x3
-    field public static final byte PROTOCOL_BOOT_MODE = 0; // 0x0
-    field public static final byte PROTOCOL_REPORT_MODE = 1; // 0x1
-    field public static final byte REPORT_TYPE_FEATURE = 3; // 0x3
-    field public static final byte REPORT_TYPE_INPUT = 1; // 0x1
-    field public static final byte REPORT_TYPE_OUTPUT = 2; // 0x2
-    field public static final byte SUBCLASS1_COMBO = -64; // 0xffffffc0
-    field public static final byte SUBCLASS1_KEYBOARD = 64; // 0x40
-    field public static final byte SUBCLASS1_MOUSE = -128; // 0xffffff80
-    field public static final byte SUBCLASS1_NONE = 0; // 0x0
-    field public static final byte SUBCLASS2_CARD_READER = 6; // 0x6
-    field public static final byte SUBCLASS2_DIGITIZER_TABLET = 5; // 0x5
-    field public static final byte SUBCLASS2_GAMEPAD = 2; // 0x2
-    field public static final byte SUBCLASS2_JOYSTICK = 1; // 0x1
-    field public static final byte SUBCLASS2_REMOTE_CONTROL = 3; // 0x3
-    field public static final byte SUBCLASS2_SENSING_DEVICE = 4; // 0x4
-    field public static final byte SUBCLASS2_UNCATEGORIZED = 0; // 0x0
-  }
-
-  public abstract static class BluetoothHidDevice.Callback {
-    ctor public BluetoothHidDevice.Callback();
-    method public void onAppStatusChanged(android.bluetooth.BluetoothDevice, boolean);
-    method public void onConnectionStateChanged(android.bluetooth.BluetoothDevice, int);
-    method public void onGetReport(android.bluetooth.BluetoothDevice, byte, byte, int);
-    method public void onInterruptData(android.bluetooth.BluetoothDevice, byte, byte[]);
-    method public void onSetProtocol(android.bluetooth.BluetoothDevice, byte);
-    method public void onSetReport(android.bluetooth.BluetoothDevice, byte, byte, byte[]);
-    method public void onVirtualCableUnplug(android.bluetooth.BluetoothDevice);
-  }
-
-  public final class BluetoothHidDeviceAppQosSettings implements android.os.Parcelable {
-    ctor public BluetoothHidDeviceAppQosSettings(int, int, int, int, int, int);
-    method public int describeContents();
-    method public int getDelayVariation();
-    method public int getLatency();
-    method public int getPeakBandwidth();
-    method public int getServiceType();
-    method public int getTokenBucketSize();
-    method public int getTokenRate();
-    method public void writeToParcel(android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothHidDeviceAppQosSettings> CREATOR;
-    field public static final int MAX = -1; // 0xffffffff
-    field public static final int SERVICE_BEST_EFFORT = 1; // 0x1
-    field public static final int SERVICE_GUARANTEED = 2; // 0x2
-    field public static final int SERVICE_NO_TRAFFIC = 0; // 0x0
-  }
-
-  public final class BluetoothHidDeviceAppSdpSettings implements android.os.Parcelable {
-    ctor public BluetoothHidDeviceAppSdpSettings(String, String, String, byte, byte[]);
-    method public int describeContents();
-    method public String getDescription();
-    method public byte[] getDescriptors();
-    method public String getName();
-    method public String getProvider();
-    method public byte getSubclass();
-    method public void writeToParcel(android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothHidDeviceAppSdpSettings> CREATOR;
-  }
-
-  public final class BluetoothLeAudio implements java.lang.AutoCloseable android.bluetooth.BluetoothProfile {
-    method public void close();
-    method protected void finalize();
-    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(@NonNull android.bluetooth.BluetoothDevice);
-    method @NonNull @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(@NonNull int[]);
-    field @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public static final String ACTION_LE_AUDIO_CONNECTION_STATE_CHANGED = "android.bluetooth.action.LE_AUDIO_CONNECTION_STATE_CHANGED";
-  }
-
-  public final class BluetoothManager {
-    method public android.bluetooth.BluetoothAdapter getAdapter();
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices(int);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public int getConnectionState(android.bluetooth.BluetoothDevice, int);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int, int[]);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public android.bluetooth.BluetoothGattServer openGattServer(android.content.Context, android.bluetooth.BluetoothGattServerCallback);
-  }
-
-  public interface BluetoothProfile {
-    method public java.util.List<android.bluetooth.BluetoothDevice> getConnectedDevices();
-    method public int getConnectionState(android.bluetooth.BluetoothDevice);
-    method public java.util.List<android.bluetooth.BluetoothDevice> getDevicesMatchingConnectionStates(int[]);
-    field public static final int A2DP = 2; // 0x2
-    field public static final String EXTRA_PREVIOUS_STATE = "android.bluetooth.profile.extra.PREVIOUS_STATE";
-    field public static final String EXTRA_STATE = "android.bluetooth.profile.extra.STATE";
-    field public static final int GATT = 7; // 0x7
-    field public static final int GATT_SERVER = 8; // 0x8
-    field public static final int HEADSET = 1; // 0x1
-    field @Deprecated public static final int HEALTH = 3; // 0x3
-    field public static final int HEARING_AID = 21; // 0x15
-    field public static final int HID_DEVICE = 19; // 0x13
-    field public static final int SAP = 10; // 0xa
-    field public static final int STATE_CONNECTED = 2; // 0x2
-    field public static final int STATE_CONNECTING = 1; // 0x1
-    field public static final int STATE_DISCONNECTED = 0; // 0x0
-    field public static final int STATE_DISCONNECTING = 3; // 0x3
-  }
-
-  public static interface BluetoothProfile.ServiceListener {
-    method public void onServiceConnected(int, android.bluetooth.BluetoothProfile);
-    method public void onServiceDisconnected(int);
-  }
-
-  public final class BluetoothServerSocket implements java.io.Closeable {
-    method public android.bluetooth.BluetoothSocket accept() throws java.io.IOException;
-    method public android.bluetooth.BluetoothSocket accept(int) throws java.io.IOException;
-    method public void close() throws java.io.IOException;
-    method public int getPsm();
-  }
-
-  public final class BluetoothSocket implements java.io.Closeable {
-    method public void close() throws java.io.IOException;
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_CONNECT) public void connect() throws java.io.IOException;
-    method public int getConnectionType();
-    method public java.io.InputStream getInputStream() throws java.io.IOException;
-    method public int getMaxReceivePacketSize();
-    method public int getMaxTransmitPacketSize();
-    method public java.io.OutputStream getOutputStream() throws java.io.IOException;
-    method public android.bluetooth.BluetoothDevice getRemoteDevice();
-    method public boolean isConnected();
-    field public static final int TYPE_L2CAP = 3; // 0x3
-    field public static final int TYPE_RFCOMM = 1; // 0x1
-    field public static final int TYPE_SCO = 2; // 0x2
-  }
-
-  public final class BluetoothStatusCodes {
-    field public static final int ERROR_BLUETOOTH_NOT_ALLOWED = 2; // 0x2
-    field public static final int ERROR_BLUETOOTH_NOT_ENABLED = 1; // 0x1
-    field public static final int ERROR_DEVICE_NOT_BONDED = 3; // 0x3
-    field public static final int ERROR_MISSING_BLUETOOTH_CONNECT_PERMISSION = 6; // 0x6
-    field public static final int ERROR_UNKNOWN = 2147483647; // 0x7fffffff
-    field public static final int SUCCESS = 0; // 0x0
-  }
-
-}
-
-package android.bluetooth.le {
-
-  public abstract class AdvertiseCallback {
-    ctor public AdvertiseCallback();
-    method public void onStartFailure(int);
-    method public void onStartSuccess(android.bluetooth.le.AdvertiseSettings);
-    field public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3; // 0x3
-    field public static final int ADVERTISE_FAILED_DATA_TOO_LARGE = 1; // 0x1
-    field public static final int ADVERTISE_FAILED_FEATURE_UNSUPPORTED = 5; // 0x5
-    field public static final int ADVERTISE_FAILED_INTERNAL_ERROR = 4; // 0x4
-    field public static final int ADVERTISE_FAILED_TOO_MANY_ADVERTISERS = 2; // 0x2
-  }
-
-  public final class AdvertiseData implements android.os.Parcelable {
-    method public int describeContents();
-    method public boolean getIncludeDeviceName();
-    method public boolean getIncludeTxPowerLevel();
-    method public android.util.SparseArray<byte[]> getManufacturerSpecificData();
-    method public java.util.Map<android.os.ParcelUuid,byte[]> getServiceData();
-    method @NonNull public java.util.List<android.os.ParcelUuid> getServiceSolicitationUuids();
-    method public java.util.List<android.os.ParcelUuid> getServiceUuids();
-    method public void writeToParcel(android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertiseData> CREATOR;
-  }
-
-  public static final class AdvertiseData.Builder {
-    ctor public AdvertiseData.Builder();
-    method public android.bluetooth.le.AdvertiseData.Builder addManufacturerData(int, byte[]);
-    method public android.bluetooth.le.AdvertiseData.Builder addServiceData(android.os.ParcelUuid, byte[]);
-    method @NonNull public android.bluetooth.le.AdvertiseData.Builder addServiceSolicitationUuid(@NonNull android.os.ParcelUuid);
-    method public android.bluetooth.le.AdvertiseData.Builder addServiceUuid(android.os.ParcelUuid);
-    method public android.bluetooth.le.AdvertiseData build();
-    method public android.bluetooth.le.AdvertiseData.Builder setIncludeDeviceName(boolean);
-    method public android.bluetooth.le.AdvertiseData.Builder setIncludeTxPowerLevel(boolean);
-  }
-
-  public final class AdvertiseSettings implements android.os.Parcelable {
-    method public int describeContents();
-    method public int getMode();
-    method public int getTimeout();
-    method public int getTxPowerLevel();
-    method public boolean isConnectable();
-    method public void writeToParcel(android.os.Parcel, int);
-    field public static final int ADVERTISE_MODE_BALANCED = 1; // 0x1
-    field public static final int ADVERTISE_MODE_LOW_LATENCY = 2; // 0x2
-    field public static final int ADVERTISE_MODE_LOW_POWER = 0; // 0x0
-    field public static final int ADVERTISE_TX_POWER_HIGH = 3; // 0x3
-    field public static final int ADVERTISE_TX_POWER_LOW = 1; // 0x1
-    field public static final int ADVERTISE_TX_POWER_MEDIUM = 2; // 0x2
-    field public static final int ADVERTISE_TX_POWER_ULTRA_LOW = 0; // 0x0
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertiseSettings> CREATOR;
-  }
-
-  public static final class AdvertiseSettings.Builder {
-    ctor public AdvertiseSettings.Builder();
-    method public android.bluetooth.le.AdvertiseSettings build();
-    method public android.bluetooth.le.AdvertiseSettings.Builder setAdvertiseMode(int);
-    method public android.bluetooth.le.AdvertiseSettings.Builder setConnectable(boolean);
-    method public android.bluetooth.le.AdvertiseSettings.Builder setTimeout(int);
-    method public android.bluetooth.le.AdvertiseSettings.Builder setTxPowerLevel(int);
-  }
-
-  public final class AdvertisingSet {
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void enableAdvertising(boolean, int, int);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setAdvertisingData(android.bluetooth.le.AdvertiseData);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setAdvertisingParameters(android.bluetooth.le.AdvertisingSetParameters);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setPeriodicAdvertisingData(android.bluetooth.le.AdvertiseData);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setPeriodicAdvertisingEnabled(boolean);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void setScanResponseData(android.bluetooth.le.AdvertiseData);
-  }
-
-  public abstract class AdvertisingSetCallback {
-    ctor public AdvertisingSetCallback();
-    method public void onAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
-    method public void onAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int);
-    method public void onAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int, int);
-    method public void onAdvertisingSetStarted(android.bluetooth.le.AdvertisingSet, int, int);
-    method public void onAdvertisingSetStopped(android.bluetooth.le.AdvertisingSet);
-    method public void onPeriodicAdvertisingDataSet(android.bluetooth.le.AdvertisingSet, int);
-    method public void onPeriodicAdvertisingEnabled(android.bluetooth.le.AdvertisingSet, boolean, int);
-    method public void onPeriodicAdvertisingParametersUpdated(android.bluetooth.le.AdvertisingSet, int);
-    method public void onScanResponseDataSet(android.bluetooth.le.AdvertisingSet, int);
-    field public static final int ADVERTISE_FAILED_ALREADY_STARTED = 3; // 0x3
-    field public static final int ADVERTISE_FAILED_DATA_TOO_LARGE = 1; // 0x1
-    field public static final int ADVERTISE_FAILED_FEATURE_UNSUPPORTED = 5; // 0x5
-    field public static final int ADVERTISE_FAILED_INTERNAL_ERROR = 4; // 0x4
-    field public static final int ADVERTISE_FAILED_TOO_MANY_ADVERTISERS = 2; // 0x2
-    field public static final int ADVERTISE_SUCCESS = 0; // 0x0
-  }
-
-  public final class AdvertisingSetParameters implements android.os.Parcelable {
-    method public int describeContents();
-    method public int getInterval();
-    method public int getPrimaryPhy();
-    method public int getSecondaryPhy();
-    method public int getTxPowerLevel();
-    method public boolean includeTxPower();
-    method public boolean isAnonymous();
-    method public boolean isConnectable();
-    method public boolean isLegacy();
-    method public boolean isScannable();
-    method public void writeToParcel(android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.AdvertisingSetParameters> CREATOR;
-    field public static final int INTERVAL_HIGH = 1600; // 0x640
-    field public static final int INTERVAL_LOW = 160; // 0xa0
-    field public static final int INTERVAL_MAX = 16777215; // 0xffffff
-    field public static final int INTERVAL_MEDIUM = 400; // 0x190
-    field public static final int INTERVAL_MIN = 160; // 0xa0
-    field public static final int TX_POWER_HIGH = 1; // 0x1
-    field public static final int TX_POWER_LOW = -15; // 0xfffffff1
-    field public static final int TX_POWER_MAX = 1; // 0x1
-    field public static final int TX_POWER_MEDIUM = -7; // 0xfffffff9
-    field public static final int TX_POWER_MIN = -127; // 0xffffff81
-    field public static final int TX_POWER_ULTRA_LOW = -21; // 0xffffffeb
-  }
-
-  public static final class AdvertisingSetParameters.Builder {
-    ctor public AdvertisingSetParameters.Builder();
-    method public android.bluetooth.le.AdvertisingSetParameters build();
-    method public android.bluetooth.le.AdvertisingSetParameters.Builder setAnonymous(boolean);
-    method public android.bluetooth.le.AdvertisingSetParameters.Builder setConnectable(boolean);
-    method public android.bluetooth.le.AdvertisingSetParameters.Builder setIncludeTxPower(boolean);
-    method public android.bluetooth.le.AdvertisingSetParameters.Builder setInterval(int);
-    method public android.bluetooth.le.AdvertisingSetParameters.Builder setLegacyMode(boolean);
-    method public android.bluetooth.le.AdvertisingSetParameters.Builder setPrimaryPhy(int);
-    method public android.bluetooth.le.AdvertisingSetParameters.Builder setScannable(boolean);
-    method public android.bluetooth.le.AdvertisingSetParameters.Builder setSecondaryPhy(int);
-    method public android.bluetooth.le.AdvertisingSetParameters.Builder setTxPowerLevel(int);
-  }
-
-  public final class BluetoothLeAdvertiser {
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void startAdvertising(android.bluetooth.le.AdvertiseSettings, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseCallback);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertisingSetCallback);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertisingSetCallback, android.os.Handler);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, int, int, android.bluetooth.le.AdvertisingSetCallback);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void startAdvertisingSet(android.bluetooth.le.AdvertisingSetParameters, android.bluetooth.le.AdvertiseData, android.bluetooth.le.AdvertiseData, android.bluetooth.le.PeriodicAdvertisingParameters, android.bluetooth.le.AdvertiseData, int, int, android.bluetooth.le.AdvertisingSetCallback, android.os.Handler);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void stopAdvertising(android.bluetooth.le.AdvertiseCallback);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_ADVERTISE) public void stopAdvertisingSet(android.bluetooth.le.AdvertisingSetCallback);
-  }
-
-  public final class BluetoothLeScanner {
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void flushPendingScanResults(android.bluetooth.le.ScanCallback);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void startScan(android.bluetooth.le.ScanCallback);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void startScan(java.util.List<android.bluetooth.le.ScanFilter>, android.bluetooth.le.ScanSettings, android.bluetooth.le.ScanCallback);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public int startScan(@Nullable java.util.List<android.bluetooth.le.ScanFilter>, @Nullable android.bluetooth.le.ScanSettings, @NonNull android.app.PendingIntent);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void stopScan(android.bluetooth.le.ScanCallback);
-    method @RequiresPermission(android.Manifest.permission.BLUETOOTH_SCAN) public void stopScan(android.app.PendingIntent);
-    field public static final String EXTRA_CALLBACK_TYPE = "android.bluetooth.le.extra.CALLBACK_TYPE";
-    field public static final String EXTRA_ERROR_CODE = "android.bluetooth.le.extra.ERROR_CODE";
-    field public static final String EXTRA_LIST_SCAN_RESULT = "android.bluetooth.le.extra.LIST_SCAN_RESULT";
-  }
-
-  public final class PeriodicAdvertisingParameters implements android.os.Parcelable {
-    method public int describeContents();
-    method public boolean getIncludeTxPower();
-    method public int getInterval();
-    method public void writeToParcel(android.os.Parcel, int);
-    field public static final android.os.Parcelable.Creator<android.bluetooth.le.PeriodicAdvertisingParameters> CREATOR;
-  }
-
-  public static final class PeriodicAdvertisingParameters.Builder {
-    ctor public PeriodicAdvertisingParameters.Builder();
-    method public android.bluetooth.le.PeriodicAdvertisingParameters build();
-    method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setIncludeTxPower(boolean);
-    method public android.bluetooth.le.PeriodicAdvertisingParameters.Builder setInterval(int);
-  }
-
-  public abstract class ScanCallback {
-    ctor public ScanCallback();
-    method public void onBatchScanResults(java.util.List<android.bluetooth.le.ScanResult>);
-    method public void onScanFailed(int);
-    method public void onScanResult(int, android.bluetooth.le.ScanResult);
-    field public static final int SCAN_FAILED_ALREADY_STARTED = 1; // 0x1
-    field public static final int SCAN_FAILED_APPLICATION_REGISTRATION_FAILED = 2; // 0x2
-    field public static final int SCAN_FAILED_FEATURE_UNSUPPORTED = 4; // 0x4
-    field public static final int SCAN_FAILED_INTERNAL_ERROR = 3; // 0x3
-  }
-
-  public final class ScanFilter implements android.os.Parcelable {
-    method public int describeContents();
-    method @Nullable public String getDeviceAddress();
-    method @Nullable public String getDeviceName();
-    method @Nullable public byte[] getManufacturerData();
-    method @Nullable public byte[] getManufacturerDataMask();
-    method public int getManufacturerId();
-    method @Nullable public byte[] getServiceData();
-    method @Nullable public byte[] getServiceDataMask();
-    method @Nullable public android.os.ParcelUuid getServiceDataUuid();
-    method @Nullable public android.os.ParcelUuid getServiceSolicitationUuid();
-    method @Nullable public android.os.ParcelUuid getServiceSolicitationUuidMask();
-    method @Nullable public android.os.ParcelUuid getServiceUuid();
-    method @Nullable public android.os.ParcelUuid getServiceUuidMask();
-    method public boolean matches(android.bluetooth.le.ScanResult);
-    method public void writeToParcel(android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.ScanFilter> CREATOR;
-  }
-
-  public static final class ScanFilter.Builder {
-    ctor public ScanFilter.Builder();
-    method public android.bluetooth.le.ScanFilter build();
-    method public android.bluetooth.le.ScanFilter.Builder setDeviceAddress(String);
-    method public android.bluetooth.le.ScanFilter.Builder setDeviceName(String);
-    method public android.bluetooth.le.ScanFilter.Builder setManufacturerData(int, byte[]);
-    method public android.bluetooth.le.ScanFilter.Builder setManufacturerData(int, byte[], byte[]);
-    method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[]);
-    method public android.bluetooth.le.ScanFilter.Builder setServiceData(android.os.ParcelUuid, byte[], byte[]);
-    method @NonNull public android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid(@Nullable android.os.ParcelUuid);
-    method @NonNull public android.bluetooth.le.ScanFilter.Builder setServiceSolicitationUuid(@Nullable android.os.ParcelUuid, @Nullable android.os.ParcelUuid);
-    method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid);
-    method public android.bluetooth.le.ScanFilter.Builder setServiceUuid(android.os.ParcelUuid, android.os.ParcelUuid);
-  }
-
-  public final class ScanRecord {
-    method public int getAdvertiseFlags();
-    method public byte[] getBytes();
-    method @Nullable public String getDeviceName();
-    method public android.util.SparseArray<byte[]> getManufacturerSpecificData();
-    method @Nullable public byte[] getManufacturerSpecificData(int);
-    method public java.util.Map<android.os.ParcelUuid,byte[]> getServiceData();
-    method @Nullable public byte[] getServiceData(android.os.ParcelUuid);
-    method @NonNull public java.util.List<android.os.ParcelUuid> getServiceSolicitationUuids();
-    method public java.util.List<android.os.ParcelUuid> getServiceUuids();
-    method public int getTxPowerLevel();
-  }
-
-  public final class ScanResult implements android.os.Parcelable {
-    ctor @Deprecated public ScanResult(android.bluetooth.BluetoothDevice, android.bluetooth.le.ScanRecord, int, long);
-    ctor public ScanResult(android.bluetooth.BluetoothDevice, int, int, int, int, int, int, int, android.bluetooth.le.ScanRecord, long);
-    method public int describeContents();
-    method public int getAdvertisingSid();
-    method public int getDataStatus();
-    method public android.bluetooth.BluetoothDevice getDevice();
-    method public int getPeriodicAdvertisingInterval();
-    method public int getPrimaryPhy();
-    method public int getRssi();
-    method @Nullable public android.bluetooth.le.ScanRecord getScanRecord();
-    method public int getSecondaryPhy();
-    method public long getTimestampNanos();
-    method public int getTxPower();
-    method public boolean isConnectable();
-    method public boolean isLegacy();
-    method public void writeToParcel(android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.ScanResult> CREATOR;
-    field public static final int DATA_COMPLETE = 0; // 0x0
-    field public static final int DATA_TRUNCATED = 2; // 0x2
-    field public static final int PERIODIC_INTERVAL_NOT_PRESENT = 0; // 0x0
-    field public static final int PHY_UNUSED = 0; // 0x0
-    field public static final int SID_NOT_PRESENT = 255; // 0xff
-    field public static final int TX_POWER_NOT_PRESENT = 127; // 0x7f
-  }
-
-  public final class ScanSettings implements android.os.Parcelable {
-    method public int describeContents();
-    method public int getCallbackType();
-    method public boolean getLegacy();
-    method public int getPhy();
-    method public long getReportDelayMillis();
-    method public int getScanMode();
-    method public int getScanResultType();
-    method public void writeToParcel(android.os.Parcel, int);
-    field public static final int CALLBACK_TYPE_ALL_MATCHES = 1; // 0x1
-    field public static final int CALLBACK_TYPE_FIRST_MATCH = 2; // 0x2
-    field public static final int CALLBACK_TYPE_MATCH_LOST = 4; // 0x4
-    field @NonNull public static final android.os.Parcelable.Creator<android.bluetooth.le.ScanSettings> CREATOR;
-    field public static final int MATCH_MODE_AGGRESSIVE = 1; // 0x1
-    field public static final int MATCH_MODE_STICKY = 2; // 0x2
-    field public static final int MATCH_NUM_FEW_ADVERTISEMENT = 2; // 0x2
-    field public static final int MATCH_NUM_MAX_ADVERTISEMENT = 3; // 0x3
-    field public static final int MATCH_NUM_ONE_ADVERTISEMENT = 1; // 0x1
-    field public static final int PHY_LE_ALL_SUPPORTED = 255; // 0xff
-    field public static final int SCAN_MODE_BALANCED = 1; // 0x1
-    field public static final int SCAN_MODE_LOW_LATENCY = 2; // 0x2
-    field public static final int SCAN_MODE_LOW_POWER = 0; // 0x0
-    field public static final int SCAN_MODE_OPPORTUNISTIC = -1; // 0xffffffff
-  }
-
-  public static final class ScanSettings.Builder {
-    ctor public ScanSettings.Builder();
-    method public android.bluetooth.le.ScanSettings build();
-    method public android.bluetooth.le.ScanSettings.Builder setCallbackType(int);
-    method public android.bluetooth.le.ScanSettings.Builder setLegacy(boolean);
-    method public android.bluetooth.le.ScanSettings.Builder setMatchMode(int);
-    method public android.bluetooth.le.ScanSettings.Builder setNumOfMatches(int);
-    method public android.bluetooth.le.ScanSettings.Builder setPhy(int);
-    method public android.bluetooth.le.ScanSettings.Builder setReportDelay(long);
-    method public android.bluetooth.le.ScanSettings.Builder setScanMode(int);
-  }
-
-}
-
 package android.companion {
 
+  public final class AssociationInfo implements android.os.Parcelable {
+    method public int describeContents();
+    method @Nullable public android.net.MacAddress getDeviceMacAddress();
+    method @Nullable public String getDeviceProfile();
+    method @Nullable public CharSequence getDisplayName();
+    method public int getId();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.companion.AssociationInfo> CREATOR;
+  }
+
   public final class AssociationRequest implements android.os.Parcelable {
     method public int describeContents();
+    method @Nullable public String getDeviceProfile();
+    method @Nullable public CharSequence getDisplayName();
+    method public boolean isForceConfirmation();
+    method public boolean isSelfManaged();
+    method public boolean isSingleDevice();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.companion.AssociationRequest> CREATOR;
+    field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING) public static final String DEVICE_PROFILE_APP_STREAMING = "android.app.role.COMPANION_DEVICE_APP_STREAMING";
+    field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION) public static final String DEVICE_PROFILE_AUTOMOTIVE_PROJECTION = "android.app.role.SYSTEM_AUTOMOTIVE_PROJECTION";
+    field @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_PROFILE_COMPUTER) public static final String DEVICE_PROFILE_COMPUTER = "android.app.role.COMPANION_DEVICE_COMPUTER";
     field public static final String DEVICE_PROFILE_WATCH = "android.app.role.COMPANION_DEVICE_WATCH";
   }
 
@@ -9802,6 +8964,9 @@
     method @NonNull public android.companion.AssociationRequest.Builder addDeviceFilter(@Nullable android.companion.DeviceFilter<?>);
     method @NonNull public android.companion.AssociationRequest build();
     method @NonNull public android.companion.AssociationRequest.Builder setDeviceProfile(@NonNull String);
+    method @NonNull public android.companion.AssociationRequest.Builder setDisplayName(@NonNull CharSequence);
+    method @NonNull @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_SELF_MANAGED) public android.companion.AssociationRequest.Builder setForceConfirmation(boolean);
+    method @NonNull @RequiresPermission(android.Manifest.permission.REQUEST_COMPANION_SELF_MANAGED) public android.companion.AssociationRequest.Builder setSelfManaged(boolean);
     method @NonNull public android.companion.AssociationRequest.Builder setSingleDevice(boolean);
   }
 
@@ -9837,27 +9002,35 @@
   }
 
   public final class CompanionDeviceManager {
-    method @RequiresPermission(value=android.Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH, conditional=true) public void associate(@NonNull android.companion.AssociationRequest, @NonNull android.companion.CompanionDeviceManager.Callback, @Nullable android.os.Handler);
-    method public void disassociate(@NonNull String);
-    method @NonNull public java.util.List<java.lang.String> getAssociations();
-    method public boolean hasNotificationAccess(android.content.ComponentName);
+    method @RequiresPermission(anyOf={android.Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH, android.Manifest.permission.REQUEST_COMPANION_PROFILE_COMPUTER, android.Manifest.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING, android.Manifest.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION}, conditional=true) public void associate(@NonNull android.companion.AssociationRequest, @NonNull android.companion.CompanionDeviceManager.Callback, @Nullable android.os.Handler);
+    method @RequiresPermission(anyOf={android.Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH, android.Manifest.permission.REQUEST_COMPANION_PROFILE_COMPUTER, android.Manifest.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING, android.Manifest.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION}, conditional=true) public void associate(@NonNull android.companion.AssociationRequest, @NonNull java.util.concurrent.Executor, @NonNull android.companion.CompanionDeviceManager.Callback);
+    method @Deprecated public void disassociate(@NonNull String);
+    method public void disassociate(int);
+    method @Deprecated @NonNull public java.util.List<java.lang.String> getAssociations();
+    method @NonNull public java.util.List<android.companion.AssociationInfo> getMyAssociations();
+    method @Deprecated public boolean hasNotificationAccess(android.content.ComponentName);
     method public void requestNotificationAccess(android.content.ComponentName);
     method @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void startObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;
     method @RequiresPermission(android.Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) public void stopObservingDevicePresence(@NonNull String) throws android.companion.DeviceNotAssociatedException;
-    field public static final String EXTRA_DEVICE = "android.companion.extra.DEVICE";
+    field public static final String EXTRA_ASSOCIATION = "android.companion.extra.ASSOCIATION";
+    field @Deprecated public static final String EXTRA_DEVICE = "android.companion.extra.DEVICE";
   }
 
   public abstract static class CompanionDeviceManager.Callback {
     ctor public CompanionDeviceManager.Callback();
-    method public abstract void onDeviceFound(android.content.IntentSender);
-    method public abstract void onFailure(CharSequence);
+    method public void onAssociationCreated(@NonNull android.companion.AssociationInfo);
+    method public void onAssociationPending(@NonNull android.content.IntentSender);
+    method @Deprecated public void onDeviceFound(@NonNull android.content.IntentSender);
+    method public abstract void onFailure(@Nullable CharSequence);
   }
 
   public abstract class CompanionDeviceService extends android.app.Service {
     ctor public CompanionDeviceService();
     method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
-    method @MainThread public abstract void onDeviceAppeared(@NonNull String);
-    method @MainThread public abstract void onDeviceDisappeared(@NonNull String);
+    method @Deprecated @MainThread public void onDeviceAppeared(@NonNull String);
+    method @MainThread public void onDeviceAppeared(@NonNull android.companion.AssociationInfo);
+    method @Deprecated @MainThread public void onDeviceDisappeared(@NonNull String);
+    method @MainThread public void onDeviceDisappeared(@NonNull android.companion.AssociationInfo);
     field public static final String SERVICE_INTERFACE = "android.companion.CompanionDeviceService";
   }
 
@@ -9953,12 +9126,14 @@
     method @Nullable public String getPackageName();
     method public int getUid();
     method public boolean isTrusted(@NonNull android.content.Context);
+    method @NonNull public static android.content.AttributionSource myAttributionSource();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.content.AttributionSource> CREATOR;
   }
 
   public static final class AttributionSource.Builder {
     ctor public AttributionSource.Builder(int);
+    ctor public AttributionSource.Builder(@NonNull android.content.AttributionSource);
     method @NonNull public android.content.AttributionSource build();
     method @NonNull public android.content.AttributionSource.Builder setAttributionTag(@Nullable String);
     method @NonNull public android.content.AttributionSource.Builder setNext(@Nullable android.content.AttributionSource);
@@ -10460,7 +9635,7 @@
     method public boolean bindIsolatedService(@NonNull @RequiresPermission android.content.Intent, int, @NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.content.ServiceConnection);
     method public abstract boolean bindService(@RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, int);
     method public boolean bindService(@NonNull @RequiresPermission android.content.Intent, int, @NonNull java.util.concurrent.Executor, @NonNull android.content.ServiceConnection);
-    method @RequiresPermission(anyOf={"android.permission.INTERACT_ACROSS_USERS", android.Manifest.permission.INTERACT_ACROSS_PROFILES}) public boolean bindServiceAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, int, @NonNull android.os.UserHandle);
+    method @RequiresPermission(anyOf={"android.permission.INTERACT_ACROSS_USERS", "android.permission.INTERACT_ACROSS_USERS_FULL", android.Manifest.permission.INTERACT_ACROSS_PROFILES}, conditional=true) public boolean bindServiceAsUser(@NonNull @RequiresPermission android.content.Intent, @NonNull android.content.ServiceConnection, int, @NonNull android.os.UserHandle);
     method @CheckResult(suggest="#enforceCallingOrSelfPermission(String,String)") public abstract int checkCallingOrSelfPermission(@NonNull String);
     method @CheckResult(suggest="#enforceCallingOrSelfUriPermission(Uri,int,String)") public abstract int checkCallingOrSelfUriPermission(android.net.Uri, int);
     method @NonNull public int[] checkCallingOrSelfUriPermissions(@NonNull java.util.List<android.net.Uri>, int);
@@ -10533,6 +9708,7 @@
     method @NonNull public final String getString(@StringRes int);
     method @NonNull public final String getString(@StringRes int, java.lang.Object...);
     method public abstract Object getSystemService(@NonNull String);
+    method public final <T> T getSystemService(@NonNull Class<T>);
     method @Nullable public abstract String getSystemServiceName(@NonNull Class<?>);
     method @NonNull public final CharSequence getText(@StringRes int);
     method public abstract android.content.res.Resources.Theme getTheme();
@@ -10561,6 +9737,8 @@
     method @Nullable public abstract android.content.Intent registerReceiver(android.content.BroadcastReceiver, android.content.IntentFilter, @Nullable String, @Nullable android.os.Handler, int);
     method @Deprecated @RequiresPermission(android.Manifest.permission.BROADCAST_STICKY) public abstract void removeStickyBroadcast(@RequiresPermission android.content.Intent);
     method @Deprecated @RequiresPermission(allOf={"android.permission.INTERACT_ACROSS_USERS", android.Manifest.permission.BROADCAST_STICKY}) public abstract void removeStickyBroadcastAsUser(@RequiresPermission android.content.Intent, android.os.UserHandle);
+    method public void revokeSelfPermissionOnKill(@NonNull String);
+    method public void revokeSelfPermissionsOnKill(@NonNull java.util.Collection<java.lang.String>);
     method public abstract void revokeUriPermission(android.net.Uri, int);
     method public abstract void revokeUriPermission(String, android.net.Uri, int);
     method public abstract void sendBroadcast(@RequiresPermission android.content.Intent);
@@ -10648,6 +9826,7 @@
     field public static final String KEYGUARD_SERVICE = "keyguard";
     field public static final String LAUNCHER_APPS_SERVICE = "launcherapps";
     field @UiContext public static final String LAYOUT_INFLATER_SERVICE = "layout_inflater";
+    field public static final String LOCALE_SERVICE = "locale";
     field public static final String LOCATION_SERVICE = "location";
     field public static final String MEDIA_COMMUNICATION_SERVICE = "media_communication";
     field public static final String MEDIA_METRICS_SERVICE = "media_metrics";
@@ -10670,12 +9849,15 @@
     field public static final String PERFORMANCE_HINT_SERVICE = "performance_hint";
     field public static final String POWER_SERVICE = "power";
     field public static final String PRINT_SERVICE = "print";
+    field public static final int RECEIVER_EXPORTED = 2; // 0x2
+    field public static final int RECEIVER_NOT_EXPORTED = 4; // 0x4
     field public static final int RECEIVER_VISIBLE_TO_INSTANT_APPS = 1; // 0x1
     field public static final String RESTRICTIONS_SERVICE = "restrictions";
     field public static final String ROLE_SERVICE = "role";
     field public static final String SEARCH_SERVICE = "search";
     field public static final String SENSOR_SERVICE = "sensor";
     field public static final String SHORTCUT_SERVICE = "shortcut";
+    field public static final String STATUS_BAR_SERVICE = "statusbar";
     field public static final String STORAGE_SERVICE = "storage";
     field public static final String STORAGE_STATS_SERVICE = "storagestats";
     field public static final String SYSTEM_HEALTH_SERVICE = "systemhealth";
@@ -10686,6 +9868,7 @@
     field public static final String TEXT_CLASSIFICATION_SERVICE = "textclassification";
     field public static final String TEXT_SERVICES_MANAGER_SERVICE = "textservices";
     field public static final String TV_INPUT_SERVICE = "tv_input";
+    field public static final String TV_INTERACTIVE_APP_SERVICE = "tv_interactive_app";
     field public static final String UI_MODE_SERVICE = "uimode";
     field public static final String USAGE_STATS_SERVICE = "usagestats";
     field public static final String USB_SERVICE = "usb";
@@ -10943,12 +10126,16 @@
     method @Nullable public long[] getLongArrayExtra(String);
     method public long getLongExtra(String, long);
     method @Nullable public String getPackage();
-    method @Nullable public android.os.Parcelable[] getParcelableArrayExtra(String);
-    method @Nullable public <T extends android.os.Parcelable> java.util.ArrayList<T> getParcelableArrayListExtra(String);
-    method @Nullable public <T extends android.os.Parcelable> T getParcelableExtra(String);
+    method @Deprecated @Nullable public android.os.Parcelable[] getParcelableArrayExtra(String);
+    method @Nullable public <T> T[] getParcelableArrayExtra(@Nullable String, @NonNull Class<T>);
+    method @Deprecated @Nullable public <T extends android.os.Parcelable> java.util.ArrayList<T> getParcelableArrayListExtra(String);
+    method @Nullable public <T> java.util.ArrayList<T> getParcelableArrayListExtra(@Nullable String, @NonNull Class<? extends T>);
+    method @Deprecated @Nullable public <T extends android.os.Parcelable> T getParcelableExtra(String);
+    method @Nullable public <T> T getParcelableExtra(@Nullable String, @NonNull Class<T>);
     method @Nullable public String getScheme();
     method @Nullable public android.content.Intent getSelector();
-    method @Nullable public java.io.Serializable getSerializableExtra(String);
+    method @Deprecated @Nullable public java.io.Serializable getSerializableExtra(String);
+    method @Nullable public <T extends java.io.Serializable> T getSerializableExtra(@Nullable String, @NonNull Class<T>);
     method @Nullable public short[] getShortArrayExtra(String);
     method public short getShortExtra(String, short);
     method @Nullable public android.graphics.Rect getSourceBounds();
@@ -11030,6 +10217,7 @@
     field public static final String ACTION_AIRPLANE_MODE_CHANGED = "android.intent.action.AIRPLANE_MODE";
     field public static final String ACTION_ALL_APPS = "android.intent.action.ALL_APPS";
     field public static final String ACTION_ANSWER = "android.intent.action.ANSWER";
+    field public static final String ACTION_APPLICATION_LOCALE_CHANGED = "android.intent.action.APPLICATION_LOCALE_CHANGED";
     field public static final String ACTION_APPLICATION_PREFERENCES = "android.intent.action.APPLICATION_PREFERENCES";
     field public static final String ACTION_APPLICATION_RESTRICTIONS_CHANGED = "android.intent.action.APPLICATION_RESTRICTIONS_CHANGED";
     field public static final String ACTION_APP_ERROR = "android.intent.action.APP_ERROR";
@@ -11132,6 +10320,7 @@
     field public static final String ACTION_QUICK_VIEW = "android.intent.action.QUICK_VIEW";
     field public static final String ACTION_REBOOT = "android.intent.action.REBOOT";
     field public static final String ACTION_RUN = "android.intent.action.RUN";
+    field public static final String ACTION_SAFETY_CENTER = "android.intent.action.SAFETY_CENTER";
     field public static final String ACTION_SCREEN_OFF = "android.intent.action.SCREEN_OFF";
     field public static final String ACTION_SCREEN_ON = "android.intent.action.SCREEN_ON";
     field public static final String ACTION_SEARCH = "android.intent.action.SEARCH";
@@ -11141,6 +10330,7 @@
     field public static final String ACTION_SEND_MULTIPLE = "android.intent.action.SEND_MULTIPLE";
     field public static final String ACTION_SET_WALLPAPER = "android.intent.action.SET_WALLPAPER";
     field public static final String ACTION_SHOW_APP_INFO = "android.intent.action.SHOW_APP_INFO";
+    field public static final String ACTION_SHOW_WORK_APPS = "android.intent.action.SHOW_WORK_APPS";
     field public static final String ACTION_SHUTDOWN = "android.intent.action.ACTION_SHUTDOWN";
     field public static final String ACTION_SYNC = "android.intent.action.SYNC";
     field public static final String ACTION_SYSTEM_TUTORIAL = "android.intent.action.SYSTEM_TUTORIAL";
@@ -11172,11 +10362,13 @@
     field public static final String CATEGORY_APP_CONTACTS = "android.intent.category.APP_CONTACTS";
     field public static final String CATEGORY_APP_EMAIL = "android.intent.category.APP_EMAIL";
     field public static final String CATEGORY_APP_FILES = "android.intent.category.APP_FILES";
+    field public static final String CATEGORY_APP_FITNESS = "android.intent.category.APP_FITNESS";
     field public static final String CATEGORY_APP_GALLERY = "android.intent.category.APP_GALLERY";
     field public static final String CATEGORY_APP_MAPS = "android.intent.category.APP_MAPS";
     field public static final String CATEGORY_APP_MARKET = "android.intent.category.APP_MARKET";
     field public static final String CATEGORY_APP_MESSAGING = "android.intent.category.APP_MESSAGING";
     field public static final String CATEGORY_APP_MUSIC = "android.intent.category.APP_MUSIC";
+    field public static final String CATEGORY_APP_WEATHER = "android.intent.category.APP_WEATHER";
     field public static final String CATEGORY_BROWSABLE = "android.intent.category.BROWSABLE";
     field public static final String CATEGORY_CAR_DOCK = "android.intent.category.CAR_DOCK";
     field public static final String CATEGORY_CAR_MODE = "android.intent.category.CAR_MODE";
@@ -11248,14 +10440,17 @@
     field public static final String EXTRA_INSTALLER_PACKAGE_NAME = "android.intent.extra.INSTALLER_PACKAGE_NAME";
     field public static final String EXTRA_INTENT = "android.intent.extra.INTENT";
     field public static final String EXTRA_KEY_EVENT = "android.intent.extra.KEY_EVENT";
+    field public static final String EXTRA_LOCALE_LIST = "android.intent.extra.LOCALE_LIST";
     field public static final String EXTRA_LOCAL_ONLY = "android.intent.extra.LOCAL_ONLY";
     field public static final String EXTRA_LOCUS_ID = "android.intent.extra.LOCUS_ID";
     field public static final String EXTRA_MIME_TYPES = "android.intent.extra.MIME_TYPES";
+    field public static final String EXTRA_NEW_UID = "android.intent.extra.NEW_UID";
     field public static final String EXTRA_NOT_UNKNOWN_SOURCE = "android.intent.extra.NOT_UNKNOWN_SOURCE";
     field public static final String EXTRA_ORIGINATING_URI = "android.intent.extra.ORIGINATING_URI";
     field public static final String EXTRA_PACKAGE_NAME = "android.intent.extra.PACKAGE_NAME";
     field public static final String EXTRA_PERMISSION_GROUP_NAME = "android.intent.extra.PERMISSION_GROUP_NAME";
     field public static final String EXTRA_PHONE_NUMBER = "android.intent.extra.PHONE_NUMBER";
+    field public static final String EXTRA_PREVIOUS_UID = "android.intent.extra.PREVIOUS_UID";
     field public static final String EXTRA_PROCESS_TEXT = "android.intent.extra.PROCESS_TEXT";
     field public static final String EXTRA_PROCESS_TEXT_READONLY = "android.intent.extra.PROCESS_TEXT_READONLY";
     field public static final String EXTRA_QUICK_VIEW_FEATURES = "android.intent.extra.QUICK_VIEW_FEATURES";
@@ -11287,6 +10482,7 @@
     field public static final String EXTRA_TIMEZONE = "time-zone";
     field public static final String EXTRA_TITLE = "android.intent.extra.TITLE";
     field public static final String EXTRA_UID = "android.intent.extra.UID";
+    field public static final String EXTRA_UID_CHANGING = "android.intent.extra.UID_CHANGING";
     field public static final String EXTRA_USER = "android.intent.extra.USER";
     field public static final String EXTRA_USER_INITIATED = "android.intent.extra.USER_INITIATED";
     field public static final int FILL_IN_ACTION = 1; // 0x1
@@ -11369,6 +10565,8 @@
     method public final void addDataScheme(String);
     method public final void addDataSchemeSpecificPart(String, int);
     method public final void addDataType(String) throws android.content.IntentFilter.MalformedMimeTypeException;
+    method @NonNull public java.util.function.Predicate<android.content.Intent> asPredicate();
+    method @NonNull public java.util.function.Predicate<android.content.Intent> asPredicateWithTypeResolution(@NonNull android.content.ContentResolver);
     method public final java.util.Iterator<android.content.IntentFilter.AuthorityEntry> authoritiesIterator();
     method public final java.util.Iterator<java.lang.String> categoriesIterator();
     method public final int countActions();
@@ -11818,6 +11016,7 @@
     ctor public ActivityInfo(android.content.pm.ActivityInfo);
     method public int describeContents();
     method public void dump(android.util.Printer, String);
+    method @NonNull public java.util.Set<java.lang.String> getKnownActivityEmbeddingCerts();
     method public final int getThemeResource();
     field public static final int COLOR_MODE_DEFAULT = 0; // 0x0
     field public static final int COLOR_MODE_HDR = 2; // 0x2
@@ -11845,6 +11044,7 @@
     field public static final int DOCUMENT_LAUNCH_NEVER = 3; // 0x3
     field public static final int DOCUMENT_LAUNCH_NONE = 0; // 0x0
     field public static final int FLAG_ALLOW_TASK_REPARENTING = 64; // 0x40
+    field public static final int FLAG_ALLOW_UNTRUSTED_ACTIVITY_EMBEDDING = 268435456; // 0x10000000
     field public static final int FLAG_ALWAYS_RETAIN_TASK_STATE = 8; // 0x8
     field public static final int FLAG_AUTO_REMOVE_FROM_RECENTS = 8192; // 0x2000
     field public static final int FLAG_CLEAR_TASK_ON_LAUNCH = 4; // 0x4
@@ -11934,6 +11134,7 @@
     method public void dump(android.util.Printer, String);
     method public static CharSequence getCategoryTitle(android.content.Context, int);
     method public int getGwpAsanMode();
+    method @NonNull public java.util.Set<java.lang.String> getKnownActivityEmbeddingCerts();
     method public int getMemtagMode();
     method public int getNativeHeapZeroInitialized();
     method public int getRequestRawExternalStorageAccess();
@@ -12114,6 +11315,7 @@
     method @RequiresPermission(anyOf={android.Manifest.permission.INTERACT_ACROSS_PROFILES, "android.permission.INTERACT_ACROSS_USERS"}) public void startActivity(@NonNull android.content.Intent, @NonNull android.os.UserHandle, @Nullable android.app.Activity);
     method @RequiresPermission(anyOf={android.Manifest.permission.INTERACT_ACROSS_PROFILES, "android.permission.INTERACT_ACROSS_USERS"}) public void startActivity(@NonNull android.content.Intent, @NonNull android.os.UserHandle, @Nullable android.app.Activity, @Nullable android.os.Bundle);
     method public void startMainActivity(@NonNull android.content.ComponentName, @NonNull android.os.UserHandle);
+    method public void startMainActivity(@NonNull android.content.ComponentName, @NonNull android.os.UserHandle, @Nullable android.app.Activity, @Nullable android.os.Bundle);
     field public static final String ACTION_CAN_INTERACT_ACROSS_PROFILES_CHANGED = "android.content.pm.action.CAN_INTERACT_ACROSS_PROFILES_CHANGED";
   }
 
@@ -12147,6 +11349,7 @@
     method @Nullable public android.content.pm.SigningInfo getInitiatingPackageSigningInfo();
     method @Nullable public String getInstallingPackageName();
     method @Nullable public String getOriginatingPackageName();
+    method public int getPackageSource();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.InstallSourceInfo> CREATOR;
   }
@@ -12354,6 +11557,11 @@
     field public static final String EXTRA_STATUS = "android.content.pm.extra.STATUS";
     field public static final String EXTRA_STATUS_MESSAGE = "android.content.pm.extra.STATUS_MESSAGE";
     field public static final String EXTRA_STORAGE_PATH = "android.content.pm.extra.STORAGE_PATH";
+    field public static final int PACKAGE_SOURCE_DOWNLOADED_FILE = 4; // 0x4
+    field public static final int PACKAGE_SOURCE_LOCAL_FILE = 3; // 0x3
+    field public static final int PACKAGE_SOURCE_OTHER = 1; // 0x1
+    field public static final int PACKAGE_SOURCE_STORE = 2; // 0x2
+    field public static final int PACKAGE_SOURCE_UNSPECIFIED = 0; // 0x0
     field public static final int STATUS_FAILURE = 1; // 0x1
     field public static final int STATUS_FAILURE_ABORTED = 3; // 0x3
     field public static final int STATUS_FAILURE_BLOCKED = 2; // 0x2
@@ -12380,6 +11588,7 @@
     method @NonNull public java.io.OutputStream openWrite(@NonNull String, long, long) throws java.io.IOException;
     method public void removeChildSessionId(int);
     method public void removeSplit(@NonNull String) throws java.io.IOException;
+    method public void requestChecksums(@NonNull String, int, @NonNull java.util.List<java.security.cert.Certificate>, @NonNull java.util.concurrent.Executor, @NonNull android.content.pm.PackageManager.OnChecksumsReadyListener) throws java.security.cert.CertificateEncodingException, java.io.FileNotFoundException;
     method @Deprecated public void setChecksums(@NonNull String, @NonNull java.util.List<android.content.pm.Checksum>, @Nullable byte[]) throws java.io.IOException;
     method public void setStagingProgress(float);
     method public void transfer(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -12409,6 +11618,7 @@
     method public int getMode();
     method public int getOriginatingUid();
     method @Nullable public android.net.Uri getOriginatingUri();
+    method public int getPackageSource();
     method public int getParentSessionId();
     method public float getProgress();
     method @Nullable public android.net.Uri getReferrerUri();
@@ -12432,11 +11642,16 @@
     method public void writeToParcel(android.os.Parcel, int);
     field public static final android.os.Parcelable.Creator<android.content.pm.PackageInstaller.SessionInfo> CREATOR;
     field public static final int INVALID_ID = -1; // 0xffffffff
-    field public static final int STAGED_SESSION_ACTIVATION_FAILED = 2; // 0x2
-    field public static final int STAGED_SESSION_CONFLICT = 4; // 0x4
-    field public static final int STAGED_SESSION_NO_ERROR = 0; // 0x0
-    field public static final int STAGED_SESSION_UNKNOWN = 3; // 0x3
-    field public static final int STAGED_SESSION_VERIFICATION_FAILED = 1; // 0x1
+    field public static final int SESSION_ACTIVATION_FAILED = 2; // 0x2
+    field public static final int SESSION_CONFLICT = 4; // 0x4
+    field public static final int SESSION_NO_ERROR = 0; // 0x0
+    field public static final int SESSION_UNKNOWN_ERROR = 3; // 0x3
+    field public static final int SESSION_VERIFICATION_FAILED = 1; // 0x1
+    field @Deprecated public static final int STAGED_SESSION_ACTIVATION_FAILED = 2; // 0x2
+    field @Deprecated public static final int STAGED_SESSION_CONFLICT = 4; // 0x4
+    field @Deprecated public static final int STAGED_SESSION_NO_ERROR = 0; // 0x0
+    field @Deprecated public static final int STAGED_SESSION_UNKNOWN = 3; // 0x3
+    field @Deprecated public static final int STAGED_SESSION_VERIFICATION_FAILED = 1; // 0x1
   }
 
   public static class PackageInstaller.SessionParams implements android.os.Parcelable {
@@ -12452,6 +11667,7 @@
     method public void setMultiPackage();
     method public void setOriginatingUid(int);
     method public void setOriginatingUri(@Nullable android.net.Uri);
+    method public void setPackageSource(int);
     method public void setReferrerUri(@Nullable android.net.Uri);
     method public void setRequireUserAction(int);
     method public void setSize(long);
@@ -12501,6 +11717,7 @@
     method public abstract boolean addPermissionAsync(@NonNull android.content.pm.PermissionInfo);
     method @Deprecated public abstract void addPreferredActivity(@NonNull android.content.IntentFilter, int, @Nullable android.content.ComponentName[], @NonNull android.content.ComponentName);
     method @RequiresPermission(value="android.permission.WHITELIST_RESTRICTED_PERMISSIONS", conditional=true) public boolean addWhitelistedRestrictedPermission(@NonNull String, @NonNull String, int);
+    method public boolean canPackageQuery(@NonNull String, @NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
     method public abstract boolean canRequestPackageInstalls();
     method public abstract String[] canonicalToCurrentPackageNames(@NonNull String[]);
     method @CheckResult public abstract int checkPermission(@NonNull String, @NonNull String);
@@ -12514,7 +11731,8 @@
     method @Nullable public abstract android.graphics.drawable.Drawable getActivityBanner(@NonNull android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
     method @NonNull public abstract android.graphics.drawable.Drawable getActivityIcon(@NonNull android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
     method @NonNull public abstract android.graphics.drawable.Drawable getActivityIcon(@NonNull android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
-    method @NonNull public abstract android.content.pm.ActivityInfo getActivityInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @Deprecated @NonNull public abstract android.content.pm.ActivityInfo getActivityInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @NonNull public android.content.pm.ActivityInfo getActivityInfo(@NonNull android.content.ComponentName, @NonNull android.content.pm.PackageManager.ComponentInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException;
     method @Nullable public abstract android.graphics.drawable.Drawable getActivityLogo(@NonNull android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
     method @Nullable public abstract android.graphics.drawable.Drawable getActivityLogo(@NonNull android.content.Intent) throws android.content.pm.PackageManager.NameNotFoundException;
     method @NonNull public abstract java.util.List<android.content.pm.PermissionGroupInfo> getAllPermissionGroups(int);
@@ -12523,7 +11741,8 @@
     method public abstract int getApplicationEnabledSetting(@NonNull String);
     method @NonNull public abstract android.graphics.drawable.Drawable getApplicationIcon(@NonNull android.content.pm.ApplicationInfo);
     method @NonNull public abstract android.graphics.drawable.Drawable getApplicationIcon(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
-    method @NonNull public abstract android.content.pm.ApplicationInfo getApplicationInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @Deprecated @NonNull public abstract android.content.pm.ApplicationInfo getApplicationInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @NonNull public android.content.pm.ApplicationInfo getApplicationInfo(@NonNull String, @NonNull android.content.pm.PackageManager.ApplicationInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException;
     method @NonNull public abstract CharSequence getApplicationLabel(@NonNull android.content.pm.ApplicationInfo);
     method @Nullable public abstract android.graphics.drawable.Drawable getApplicationLogo(@NonNull android.content.pm.ApplicationInfo);
     method @Nullable public abstract android.graphics.drawable.Drawable getApplicationLogo(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
@@ -12534,27 +11753,36 @@
     method @Nullable public abstract android.graphics.drawable.Drawable getDrawable(@NonNull String, @DrawableRes int, @Nullable android.content.pm.ApplicationInfo);
     method public void getGroupOfPlatformPermission(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.String>);
     method @NonNull public android.content.pm.InstallSourceInfo getInstallSourceInfo(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
-    method @NonNull public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int);
+    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(int);
+    method @NonNull public java.util.List<android.content.pm.ApplicationInfo> getInstalledApplications(@NonNull android.content.pm.PackageManager.ApplicationInfoFlags);
     method @NonNull public java.util.List<android.content.pm.ModuleInfo> getInstalledModules(int);
-    method @NonNull public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
+    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.PackageInfo> getInstalledPackages(int);
+    method @NonNull public java.util.List<android.content.pm.PackageInfo> getInstalledPackages(@NonNull android.content.pm.PackageManager.PackageInfoFlags);
     method @Deprecated @Nullable public abstract String getInstallerPackageName(@NonNull String);
     method @NonNull public abstract byte[] getInstantAppCookie();
     method public abstract int getInstantAppCookieMaxBytes();
     method @NonNull public abstract android.content.pm.InstrumentationInfo getInstrumentationInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
     method @Nullable public abstract android.content.Intent getLaunchIntentForPackage(@NonNull String);
+    method @NonNull public android.content.IntentSender getLaunchIntentSenderForPackage(@NonNull String);
     method @Nullable public abstract android.content.Intent getLeanbackLaunchIntentForPackage(@NonNull String);
     method @NonNull public java.util.Set<java.lang.String> getMimeGroup(@NonNull String);
     method @NonNull public android.content.pm.ModuleInfo getModuleInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException;
     method @Nullable public abstract String getNameForUid(int);
-    method @Nullable public android.content.pm.PackageInfo getPackageArchiveInfo(@NonNull String, int);
+    method @Deprecated @Nullable public android.content.pm.PackageInfo getPackageArchiveInfo(@NonNull String, int);
+    method @Nullable public android.content.pm.PackageInfo getPackageArchiveInfo(@NonNull String, @NonNull android.content.pm.PackageManager.PackageInfoFlags);
     method public abstract int[] getPackageGids(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public abstract int[] getPackageGids(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public abstract android.content.pm.PackageInfo getPackageInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method public abstract android.content.pm.PackageInfo getPackageInfo(@NonNull android.content.pm.VersionedPackage, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @Deprecated public abstract int[] getPackageGids(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @Nullable public int[] getPackageGids(@NonNull String, @NonNull android.content.pm.PackageManager.PackageInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @Deprecated public abstract android.content.pm.PackageInfo getPackageInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @NonNull public android.content.pm.PackageInfo getPackageInfo(@NonNull String, @NonNull android.content.pm.PackageManager.PackageInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @Deprecated public abstract android.content.pm.PackageInfo getPackageInfo(@NonNull android.content.pm.VersionedPackage, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @NonNull public android.content.pm.PackageInfo getPackageInfo(@NonNull android.content.pm.VersionedPackage, @NonNull android.content.pm.PackageManager.PackageInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException;
     method @NonNull public abstract android.content.pm.PackageInstaller getPackageInstaller();
-    method public abstract int getPackageUid(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @Deprecated public abstract int getPackageUid(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method public int getPackageUid(@NonNull String, @NonNull android.content.pm.PackageManager.PackageInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException;
     method @Nullable public abstract String[] getPackagesForUid(int);
-    method @NonNull public abstract java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(@NonNull String[], int);
+    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(@NonNull String[], int);
+    method @NonNull public java.util.List<android.content.pm.PackageInfo> getPackagesHoldingPermissions(@NonNull String[], @NonNull android.content.pm.PackageManager.PackageInfoFlags);
     method @NonNull public abstract android.content.pm.PermissionGroupInfo getPermissionGroupInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException;
     method public abstract android.content.pm.PermissionInfo getPermissionInfo(@NonNull String, int) throws android.content.pm.PackageManager.NameNotFoundException;
     method public void getPlatformPermissionsForGroup(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<java.lang.String>>);
@@ -12562,14 +11790,18 @@
     method @Deprecated @NonNull public abstract java.util.List<android.content.pm.PackageInfo> getPreferredPackages(int);
     method @NonNull public android.content.pm.PackageManager.Property getProperty(@NonNull String, @NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
     method @NonNull public android.content.pm.PackageManager.Property getProperty(@NonNull String, @NonNull android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
-    method @NonNull public abstract android.content.pm.ProviderInfo getProviderInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method @NonNull public abstract android.content.pm.ActivityInfo getReceiverInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @Deprecated @NonNull public abstract android.content.pm.ProviderInfo getProviderInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @NonNull public android.content.pm.ProviderInfo getProviderInfo(@NonNull android.content.ComponentName, @NonNull android.content.pm.PackageManager.ComponentInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @Deprecated @NonNull public abstract android.content.pm.ActivityInfo getReceiverInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @NonNull public android.content.pm.ActivityInfo getReceiverInfo(@NonNull android.content.ComponentName, @NonNull android.content.pm.PackageManager.ComponentInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException;
     method @NonNull public abstract android.content.res.Resources getResourcesForActivity(@NonNull android.content.ComponentName) throws android.content.pm.PackageManager.NameNotFoundException;
     method @NonNull public abstract android.content.res.Resources getResourcesForApplication(@NonNull android.content.pm.ApplicationInfo) throws android.content.pm.PackageManager.NameNotFoundException;
     method @NonNull public android.content.res.Resources getResourcesForApplication(@NonNull android.content.pm.ApplicationInfo, @Nullable android.content.res.Configuration) throws android.content.pm.PackageManager.NameNotFoundException;
     method @NonNull public abstract android.content.res.Resources getResourcesForApplication(@NonNull String) throws android.content.pm.PackageManager.NameNotFoundException;
-    method @NonNull public abstract android.content.pm.ServiceInfo getServiceInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
-    method @NonNull public abstract java.util.List<android.content.pm.SharedLibraryInfo> getSharedLibraries(int);
+    method @Deprecated @NonNull public abstract android.content.pm.ServiceInfo getServiceInfo(@NonNull android.content.ComponentName, int) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @NonNull public android.content.pm.ServiceInfo getServiceInfo(@NonNull android.content.ComponentName, @NonNull android.content.pm.PackageManager.ComponentInfoFlags) throws android.content.pm.PackageManager.NameNotFoundException;
+    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.SharedLibraryInfo> getSharedLibraries(int);
+    method @NonNull public java.util.List<android.content.pm.SharedLibraryInfo> getSharedLibraries(@NonNull android.content.pm.PackageManager.PackageInfoFlags);
     method @Nullable public android.os.Bundle getSuspendedPackageAppExtras();
     method public boolean getSyntheticAppDetailsActivityEnabled(@NonNull String);
     method @NonNull public abstract android.content.pm.FeatureInfo[] getSystemAvailableFeatures();
@@ -12597,13 +11829,19 @@
     method public abstract boolean isSafeMode();
     method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryActivityProperty(@NonNull String);
     method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryApplicationProperty(@NonNull String);
-    method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(@NonNull android.content.Intent, int);
-    method @NonNull public abstract java.util.List<android.content.pm.ProviderInfo> queryContentProviders(@Nullable String, int, int);
+    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(@NonNull android.content.Intent, int);
+    method @NonNull public java.util.List<android.content.pm.ResolveInfo> queryBroadcastReceivers(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags);
+    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ProviderInfo> queryContentProviders(@Nullable String, int, int);
+    method @NonNull public java.util.List<android.content.pm.ProviderInfo> queryContentProviders(@Nullable String, int, @NonNull android.content.pm.PackageManager.ComponentInfoFlags);
     method @NonNull public abstract java.util.List<android.content.pm.InstrumentationInfo> queryInstrumentation(@NonNull String, int);
-    method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(@NonNull android.content.Intent, int);
-    method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(@Nullable android.content.ComponentName, @Nullable android.content.Intent[], @NonNull android.content.Intent, int);
-    method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(@NonNull android.content.Intent, int);
-    method @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentServices(@NonNull android.content.Intent, int);
+    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(@NonNull android.content.Intent, int);
+    method @NonNull public java.util.List<android.content.pm.ResolveInfo> queryIntentActivities(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags);
+    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(@Nullable android.content.ComponentName, @Nullable android.content.Intent[], @NonNull android.content.Intent, int);
+    method @NonNull public java.util.List<android.content.pm.ResolveInfo> queryIntentActivityOptions(@Nullable android.content.ComponentName, @Nullable java.util.List<android.content.Intent>, @NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags);
+    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(@NonNull android.content.Intent, int);
+    method @NonNull public java.util.List<android.content.pm.ResolveInfo> queryIntentContentProviders(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags);
+    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ResolveInfo> queryIntentServices(@NonNull android.content.Intent, int);
+    method @NonNull public java.util.List<android.content.pm.ResolveInfo> queryIntentServices(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags);
     method @NonNull public abstract java.util.List<android.content.pm.PermissionInfo> queryPermissionsByGroup(@Nullable String, int) throws android.content.pm.PackageManager.NameNotFoundException;
     method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryProviderProperty(@NonNull String);
     method @NonNull public java.util.List<android.content.pm.PackageManager.Property> queryReceiverProperty(@NonNull String);
@@ -12612,13 +11850,17 @@
     method public abstract void removePermission(@NonNull String);
     method @RequiresPermission(value="android.permission.WHITELIST_RESTRICTED_PERMISSIONS", conditional=true) public boolean removeWhitelistedRestrictedPermission(@NonNull String, @NonNull String, int);
     method public void requestChecksums(@NonNull String, boolean, int, @NonNull java.util.List<java.security.cert.Certificate>, @NonNull android.content.pm.PackageManager.OnChecksumsReadyListener) throws java.security.cert.CertificateEncodingException, android.content.pm.PackageManager.NameNotFoundException;
-    method @Nullable public abstract android.content.pm.ResolveInfo resolveActivity(@NonNull android.content.Intent, int);
-    method @Nullable public abstract android.content.pm.ProviderInfo resolveContentProvider(@NonNull String, int);
-    method @Nullable public abstract android.content.pm.ResolveInfo resolveService(@NonNull android.content.Intent, int);
+    method @Deprecated @Nullable public abstract android.content.pm.ResolveInfo resolveActivity(@NonNull android.content.Intent, int);
+    method @Nullable public android.content.pm.ResolveInfo resolveActivity(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags);
+    method @Deprecated @Nullable public abstract android.content.pm.ProviderInfo resolveContentProvider(@NonNull String, int);
+    method @Nullable public android.content.pm.ProviderInfo resolveContentProvider(@NonNull String, @NonNull android.content.pm.PackageManager.ComponentInfoFlags);
+    method @Deprecated @Nullable public abstract android.content.pm.ResolveInfo resolveService(@NonNull android.content.Intent, int);
+    method @Nullable public android.content.pm.ResolveInfo resolveService(@NonNull android.content.Intent, @NonNull android.content.pm.PackageManager.ResolveInfoFlags);
     method public abstract void setApplicationCategoryHint(@NonNull String, int);
     method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public abstract void setApplicationEnabledSetting(@NonNull String, int, int);
     method @RequiresPermission(value="android.permission.WHITELIST_AUTO_REVOKE_PERMISSIONS", conditional=true) public boolean setAutoRevokeWhitelisted(@NonNull String, boolean);
     method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public abstract void setComponentEnabledSetting(@NonNull android.content.ComponentName, int, int);
+    method @RequiresPermission(value=android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE, conditional=true) public void setComponentEnabledSettings(@NonNull java.util.List<android.content.pm.PackageManager.ComponentEnabledSetting>);
     method public abstract void setInstallerPackageName(@NonNull String, @Nullable String);
     method public void setMimeGroup(@NonNull String, @NonNull java.util.Set<java.lang.String>);
     method public abstract void updateInstantAppCookie(@Nullable byte[]);
@@ -12657,12 +11899,13 @@
     field public static final String FEATURE_CAMERA_LEVEL_FULL = "android.hardware.camera.level.full";
     field public static final String FEATURE_CANT_SAVE_STATE = "android.software.cant_save_state";
     field public static final String FEATURE_COMPANION_DEVICE_SETUP = "android.software.companion_device_setup";
-    field public static final String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";
+    field @Deprecated public static final String FEATURE_CONNECTION_SERVICE = "android.software.connectionservice";
     field public static final String FEATURE_CONSUMER_IR = "android.hardware.consumerir";
     field public static final String FEATURE_CONTROLS = "android.software.controls";
     field public static final String FEATURE_DEVICE_ADMIN = "android.software.device_admin";
     field public static final String FEATURE_EMBEDDED = "android.hardware.type.embedded";
     field public static final String FEATURE_ETHERNET = "android.hardware.ethernet";
+    field public static final String FEATURE_EXPANDED_PICTURE_IN_PICTURE = "android.software.expanded_picture_in_picture";
     field public static final String FEATURE_FACE = "android.hardware.biometrics.face";
     field public static final String FEATURE_FAKETOUCH = "android.hardware.faketouch";
     field public static final String FEATURE_FAKETOUCH_MULTITOUCH_DISTINCT = "android.hardware.faketouch.multitouch.distinct";
@@ -12710,10 +11953,16 @@
     field public static final String FEATURE_SECURE_LOCK_SCREEN = "android.software.secure_lock_screen";
     field public static final String FEATURE_SECURITY_MODEL_COMPATIBLE = "android.hardware.security.model.compatible";
     field public static final String FEATURE_SENSOR_ACCELEROMETER = "android.hardware.sensor.accelerometer";
+    field public static final String FEATURE_SENSOR_ACCELEROMETER_LIMITED_AXES = "android.hardware.sensor.accelerometer_limited_axes";
+    field public static final String FEATURE_SENSOR_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED = "android.hardware.sensor.accelerometer_limited_axes_uncalibrated";
     field public static final String FEATURE_SENSOR_AMBIENT_TEMPERATURE = "android.hardware.sensor.ambient_temperature";
     field public static final String FEATURE_SENSOR_BAROMETER = "android.hardware.sensor.barometer";
     field public static final String FEATURE_SENSOR_COMPASS = "android.hardware.sensor.compass";
+    field public static final String FEATURE_SENSOR_DYNAMIC_HEAD_TRACKER = "android.hardware.sensor.dynamic.head_tracker";
     field public static final String FEATURE_SENSOR_GYROSCOPE = "android.hardware.sensor.gyroscope";
+    field public static final String FEATURE_SENSOR_GYROSCOPE_LIMITED_AXES = "android.hardware.sensor.gyroscope_limited_axes";
+    field public static final String FEATURE_SENSOR_GYROSCOPE_LIMITED_AXES_UNCALIBRATED = "android.hardware.sensor.gyroscope_limited_axes_uncalibrated";
+    field public static final String FEATURE_SENSOR_HEADING = "android.hardware.sensor.heading";
     field public static final String FEATURE_SENSOR_HEART_RATE = "android.hardware.sensor.heartrate";
     field public static final String FEATURE_SENSOR_HEART_RATE_ECG = "android.hardware.sensor.heartrate.ecg";
     field public static final String FEATURE_SENSOR_HINGE_ANGLE = "android.hardware.sensor.hinge_angle";
@@ -12728,12 +11977,19 @@
     field public static final String FEATURE_SIP = "android.software.sip";
     field public static final String FEATURE_SIP_VOIP = "android.software.sip.voip";
     field public static final String FEATURE_STRONGBOX_KEYSTORE = "android.hardware.strongbox_keystore";
+    field public static final String FEATURE_TELECOM = "android.software.telecom";
     field public static final String FEATURE_TELEPHONY = "android.hardware.telephony";
+    field public static final String FEATURE_TELEPHONY_CALLING = "android.hardware.telephony.calling";
     field public static final String FEATURE_TELEPHONY_CDMA = "android.hardware.telephony.cdma";
+    field public static final String FEATURE_TELEPHONY_DATA = "android.hardware.telephony.data";
     field public static final String FEATURE_TELEPHONY_EUICC = "android.hardware.telephony.euicc";
+    field public static final String FEATURE_TELEPHONY_EUICC_MEP = "android.hardware.telephony.euicc.mep";
     field public static final String FEATURE_TELEPHONY_GSM = "android.hardware.telephony.gsm";
     field public static final String FEATURE_TELEPHONY_IMS = "android.hardware.telephony.ims";
     field public static final String FEATURE_TELEPHONY_MBMS = "android.hardware.telephony.mbms";
+    field public static final String FEATURE_TELEPHONY_MESSAGING = "android.hardware.telephony.messaging";
+    field public static final String FEATURE_TELEPHONY_RADIO_ACCESS = "android.hardware.telephony.radio.access";
+    field public static final String FEATURE_TELEPHONY_SUBSCRIPTION = "android.hardware.telephony.subscription";
     field @Deprecated public static final String FEATURE_TELEVISION = "android.hardware.type.television";
     field public static final String FEATURE_TOUCHSCREEN = "android.hardware.touchscreen";
     field public static final String FEATURE_TOUCHSCREEN_MULTITOUCH = "android.hardware.touchscreen.multitouch";
@@ -12756,6 +12012,7 @@
     field public static final String FEATURE_WIFI_DIRECT = "android.hardware.wifi.direct";
     field public static final String FEATURE_WIFI_PASSPOINT = "android.hardware.wifi.passpoint";
     field public static final String FEATURE_WIFI_RTT = "android.hardware.wifi.rtt";
+    field public static final String FEATURE_WINDOW_MAGNIFICATION = "android.software.window_magnification";
     field public static final int FLAG_PERMISSION_WHITELIST_INSTALLER = 2; // 0x2
     field public static final int FLAG_PERMISSION_WHITELIST_SYSTEM = 1; // 0x1
     field public static final int FLAG_PERMISSION_WHITELIST_UPGRADE = 4; // 0x4
@@ -12815,6 +12072,26 @@
     field public static final int VERSION_CODE_HIGHEST = -1; // 0xffffffff
   }
 
+  public static final class PackageManager.ApplicationInfoFlags {
+    method public long getValue();
+    method @NonNull public static android.content.pm.PackageManager.ApplicationInfoFlags of(long);
+  }
+
+  public static final class PackageManager.ComponentEnabledSetting implements android.os.Parcelable {
+    ctor public PackageManager.ComponentEnabledSetting(@NonNull android.content.ComponentName, int, int);
+    method public int describeContents();
+    method @Nullable public android.content.ComponentName getComponentName();
+    method public int getEnabledFlags();
+    method public int getEnabledState();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.PackageManager.ComponentEnabledSetting> CREATOR;
+  }
+
+  public static final class PackageManager.ComponentInfoFlags {
+    method public long getValue();
+    method @NonNull public static android.content.pm.PackageManager.ComponentInfoFlags of(long);
+  }
+
   public static class PackageManager.NameNotFoundException extends android.util.AndroidException {
     ctor public PackageManager.NameNotFoundException();
     ctor public PackageManager.NameNotFoundException(String);
@@ -12824,6 +12101,11 @@
     method public void onChecksumsReady(@NonNull java.util.List<android.content.pm.ApkChecksum>);
   }
 
+  public static final class PackageManager.PackageInfoFlags {
+    method public long getValue();
+    method @NonNull public static android.content.pm.PackageManager.PackageInfoFlags of(long);
+  }
+
   public static final class PackageManager.Property implements android.os.Parcelable {
     method public int describeContents();
     method public boolean getBoolean();
@@ -12843,6 +12125,11 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.PackageManager.Property> CREATOR;
   }
 
+  public static final class PackageManager.ResolveInfoFlags {
+    method public long getValue();
+    method @NonNull public static android.content.pm.PackageManager.ResolveInfoFlags of(long);
+  }
+
   @Deprecated public class PackageStats implements android.os.Parcelable {
     ctor @Deprecated public PackageStats(String);
     ctor @Deprecated public PackageStats(android.os.Parcel);
@@ -13010,13 +12297,16 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.SharedLibraryInfo> CREATOR;
     field public static final int TYPE_BUILTIN = 0; // 0x0
     field public static final int TYPE_DYNAMIC = 1; // 0x1
+    field public static final int TYPE_SDK_PACKAGE = 3; // 0x3
     field public static final int TYPE_STATIC = 2; // 0x2
     field public static final int VERSION_UNDEFINED = -1; // 0xffffffff
   }
 
   public final class ShortcutInfo implements android.os.Parcelable {
+    method @NonNull public static android.content.pm.ShortcutInfo createFromGenericDocument(@NonNull android.content.Context, @NonNull android.app.appsearch.GenericDocument);
     method public int describeContents();
     method @Nullable public android.content.ComponentName getActivity();
+    method @NonNull public java.util.List<java.lang.String> getCapabilityParameterValues(@NonNull String, @NonNull String);
     method @Nullable public java.util.Set<java.lang.String> getCategories();
     method @Nullable public CharSequence getDisabledMessage();
     method public int getDisabledReason();
@@ -13031,12 +12321,14 @@
     method public int getRank();
     method @Nullable public CharSequence getShortLabel();
     method public android.os.UserHandle getUserHandle();
+    method public boolean hasCapability(@NonNull String);
     method public boolean hasKeyFieldsOnly();
     method public boolean isCached();
     method public boolean isDeclaredInManifest();
     method public boolean isDynamic();
     method public boolean isEnabled();
     method public boolean isImmutable();
+    method public boolean isIncludedIn(int);
     method public boolean isPinned();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.content.pm.ShortcutInfo> CREATOR;
@@ -13049,14 +12341,17 @@
     field public static final int DISABLED_REASON_UNKNOWN = 3; // 0x3
     field public static final int DISABLED_REASON_VERSION_LOWER = 100; // 0x64
     field public static final String SHORTCUT_CATEGORY_CONVERSATION = "android.shortcut.conversation";
+    field public static final int SURFACE_LAUNCHER = 1; // 0x1
   }
 
   public static class ShortcutInfo.Builder {
     ctor public ShortcutInfo.Builder(android.content.Context, String);
+    method @NonNull public android.content.pm.ShortcutInfo.Builder addCapabilityBinding(@NonNull String, @Nullable String, @Nullable java.util.List<java.lang.String>);
     method @NonNull public android.content.pm.ShortcutInfo build();
     method @NonNull public android.content.pm.ShortcutInfo.Builder setActivity(@NonNull android.content.ComponentName);
     method @NonNull public android.content.pm.ShortcutInfo.Builder setCategories(java.util.Set<java.lang.String>);
     method @NonNull public android.content.pm.ShortcutInfo.Builder setDisabledMessage(@NonNull CharSequence);
+    method @NonNull public android.content.pm.ShortcutInfo.Builder setExcludedFromSurfaces(int);
     method @NonNull public android.content.pm.ShortcutInfo.Builder setExtras(@NonNull android.os.PersistableBundle);
     method @NonNull public android.content.pm.ShortcutInfo.Builder setIcon(android.graphics.drawable.Icon);
     method @NonNull public android.content.pm.ShortcutInfo.Builder setIntent(@NonNull android.content.Intent);
@@ -13231,6 +12526,7 @@
     method public int describeContents();
     method public int diff(android.content.res.Configuration);
     method public boolean equals(android.content.res.Configuration);
+    method @NonNull public static android.content.res.Configuration generateDelta(@NonNull android.content.res.Configuration, @NonNull android.content.res.Configuration);
     method public int getLayoutDirection();
     method @NonNull public android.os.LocaleList getLocales();
     method public boolean isLayoutSizeAtLeast(int);
@@ -13384,7 +12680,7 @@
     method public float getFloat(@DimenRes int);
     method @NonNull public android.graphics.Typeface getFont(@FontRes int) throws android.content.res.Resources.NotFoundException;
     method public float getFraction(@FractionRes int, int, int);
-    method public int getIdentifier(String, String, String);
+    method @Discouraged(message="Use of this function is discouraged because resource reflection makes it harder to perform build optimizations and compile-time verification of code. It is much more efficient to retrieve resources by identifier (e.g. `R.foo.bar`) than by name (e.g. `getIdentifier(\"bar\", \"foo\", null)`).") public int getIdentifier(String, String, String);
     method @NonNull public int[] getIntArray(@ArrayRes int) throws android.content.res.Resources.NotFoundException;
     method public int getInteger(@IntegerRes int) throws android.content.res.Resources.NotFoundException;
     method @NonNull public android.content.res.XmlResourceParser getLayout(@LayoutRes int) throws android.content.res.Resources.NotFoundException;
@@ -13404,7 +12700,7 @@
     method public CharSequence getText(@StringRes int, CharSequence);
     method @NonNull public CharSequence[] getTextArray(@ArrayRes int) throws android.content.res.Resources.NotFoundException;
     method public void getValue(@AnyRes int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
-    method public void getValue(String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
+    method @Discouraged(message="Use of this function is discouraged because it makes internal calls to `getIdentifier()`, which uses resource reflection. Reflection makes it harder to perform build optimizations and compile-time verification of code. It is much more efficient to retrieve resource values by identifier (e.g. `getValue(R.foo.bar, outValue, true)`) than by name (e.g. `getValue(\"foo\", outvalue, true)`).") public void getValue(String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
     method public void getValueForDensity(@AnyRes int, int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
     method @NonNull public android.content.res.XmlResourceParser getXml(@XmlRes int) throws android.content.res.Resources.NotFoundException;
     method public final android.content.res.Resources.Theme newTheme();
@@ -13729,6 +13025,10 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.database.CursorWindow> CREATOR;
   }
 
+  public class CursorWindowAllocationException extends java.lang.RuntimeException {
+    ctor public CursorWindowAllocationException(@NonNull String);
+  }
+
   public class CursorWrapper implements android.database.Cursor {
     ctor public CursorWrapper(android.database.Cursor);
     method public void close();
@@ -14072,11 +13372,21 @@
     field public static final int CONFLICT_ROLLBACK = 1; // 0x1
     field public static final int CREATE_IF_NECESSARY = 268435456; // 0x10000000
     field public static final int ENABLE_WRITE_AHEAD_LOGGING = 536870912; // 0x20000000
+    field public static final String JOURNAL_MODE_DELETE = "DELETE";
+    field public static final String JOURNAL_MODE_MEMORY = "MEMORY";
+    field public static final String JOURNAL_MODE_OFF = "OFF";
+    field public static final String JOURNAL_MODE_PERSIST = "PERSIST";
+    field public static final String JOURNAL_MODE_TRUNCATE = "TRUNCATE";
+    field public static final String JOURNAL_MODE_WAL = "WAL";
     field public static final int MAX_SQL_CACHE_SIZE = 100; // 0x64
     field public static final int NO_LOCALIZED_COLLATORS = 16; // 0x10
     field public static final int OPEN_READONLY = 1; // 0x1
     field public static final int OPEN_READWRITE = 0; // 0x0
     field public static final int SQLITE_MAX_LIKE_PATTERN_LENGTH = 50000; // 0xc350
+    field public static final String SYNC_MODE_EXTRA = "EXTRA";
+    field public static final String SYNC_MODE_FULL = "FULL";
+    field public static final String SYNC_MODE_NORMAL = "NORMAL";
+    field public static final String SYNC_MODE_OFF = "OFF";
   }
 
   public static interface SQLiteDatabase.CursorFactory {
@@ -14750,6 +14060,7 @@
     enum_constant @Deprecated public static final android.graphics.Bitmap.Config ARGB_4444;
     enum_constant public static final android.graphics.Bitmap.Config ARGB_8888;
     enum_constant public static final android.graphics.Bitmap.Config HARDWARE;
+    enum_constant public static final android.graphics.Bitmap.Config RGBA_1010102;
     enum_constant public static final android.graphics.Bitmap.Config RGBA_F16;
     enum_constant public static final android.graphics.Bitmap.Config RGB_565;
   }
@@ -14814,6 +14125,11 @@
 
   public class BitmapShader extends android.graphics.Shader {
     ctor public BitmapShader(@NonNull android.graphics.Bitmap, @NonNull android.graphics.Shader.TileMode, @NonNull android.graphics.Shader.TileMode);
+    method public int getFilterMode();
+    method public void setFilterMode(int);
+    field public static final int FILTER_MODE_DEFAULT = 0; // 0x0
+    field public static final int FILTER_MODE_LINEAR = 2; // 0x2
+    field public static final int FILTER_MODE_NEAREST = 1; // 0x1
   }
 
   public enum BlendMode {
@@ -14956,7 +14272,7 @@
     method public void drawTextRun(@NonNull android.graphics.text.MeasuredText, int, int, int, int, float, float, boolean, @NonNull android.graphics.Paint);
     method public void drawVertices(@NonNull android.graphics.Canvas.VertexMode, int, @NonNull float[], int, @Nullable float[], int, @Nullable int[], int, @Nullable short[], int, int, @NonNull android.graphics.Paint);
     method public void enableZ();
-    method public boolean getClipBounds(@Nullable android.graphics.Rect);
+    method public boolean getClipBounds(@NonNull android.graphics.Rect);
     method @NonNull public final android.graphics.Rect getClipBounds();
     method public int getDensity();
     method @Nullable public android.graphics.DrawFilter getDrawFilter();
@@ -15104,6 +14420,8 @@
     method @NonNull @Size(min=3) public abstract float[] fromXyz(@NonNull @Size(min=3) float[]);
     method @NonNull public static android.graphics.ColorSpace get(@NonNull android.graphics.ColorSpace.Named);
     method @IntRange(from=1, to=4) public int getComponentCount();
+    method public int getDataSpace();
+    method @Nullable public static android.graphics.ColorSpace getFromDataSpace(int);
     method @IntRange(from=android.graphics.ColorSpace.MIN_ID, to=android.graphics.ColorSpace.MAX_ID) public int getId();
     method public abstract float getMaxValue(@IntRange(from=0, to=3) int);
     method public abstract float getMinValue(@IntRange(from=0, to=3) int);
@@ -15251,9 +14569,11 @@
     method public void clearContent();
     method @NonNull public android.graphics.HardwareRenderer.FrameRenderRequest createRenderRequest();
     method public void destroy();
+    method public static boolean isDrawingEnabled();
     method public boolean isOpaque();
     method public void notifyFramePending();
     method public void setContentRoot(@Nullable android.graphics.RenderNode);
+    method public static void setDrawingEnabled(boolean);
     method public void setLightSourceAlpha(@FloatRange(from=0.0f, to=1.0f) float, @FloatRange(from=0.0f, to=1.0f) float);
     method public void setLightSourceGeometry(float, float, float, float);
     method public void setName(@NonNull String);
@@ -15569,6 +14889,8 @@
     method public String getFontFeatureSettings();
     method public float getFontMetrics(android.graphics.Paint.FontMetrics);
     method public android.graphics.Paint.FontMetrics getFontMetrics();
+    method public void getFontMetricsInt(@NonNull CharSequence, @IntRange(from=0) int, @IntRange(from=0) int, @IntRange(from=0) int, @IntRange(from=0) int, boolean, @NonNull android.graphics.Paint.FontMetricsInt);
+    method public void getFontMetricsInt(@NonNull char[], @IntRange(from=0) int, @IntRange(from=0) int, @IntRange(from=0) int, @IntRange(from=0) int, boolean, @NonNull android.graphics.Paint.FontMetricsInt);
     method public int getFontMetricsInt(android.graphics.Paint.FontMetricsInt);
     method public android.graphics.Paint.FontMetricsInt getFontMetricsInt();
     method public float getFontSpacing();
@@ -16128,6 +15450,7 @@
     method @NonNull public static android.graphics.RenderEffect createColorFilterEffect(@NonNull android.graphics.ColorFilter);
     method @NonNull public static android.graphics.RenderEffect createOffsetEffect(float, float);
     method @NonNull public static android.graphics.RenderEffect createOffsetEffect(float, float, @NonNull android.graphics.RenderEffect);
+    method @NonNull public static android.graphics.RenderEffect createRuntimeShaderEffect(@NonNull android.graphics.RuntimeShader, @NonNull String);
     method @NonNull public static android.graphics.RenderEffect createShaderEffect(@NonNull android.graphics.Shader);
   }
 
@@ -16203,6 +15526,25 @@
     method public boolean setUseCompositingLayer(boolean, @Nullable android.graphics.Paint);
   }
 
+  public class RuntimeShader extends android.graphics.Shader {
+    ctor public RuntimeShader(@NonNull String);
+    method public void setColorUniform(@NonNull String, @ColorInt int);
+    method public void setColorUniform(@NonNull String, @ColorLong long);
+    method public void setColorUniform(@NonNull String, @NonNull android.graphics.Color);
+    method public void setFloatUniform(@NonNull String, float);
+    method public void setFloatUniform(@NonNull String, float, float);
+    method public void setFloatUniform(@NonNull String, float, float, float);
+    method public void setFloatUniform(@NonNull String, float, float, float, float);
+    method public void setFloatUniform(@NonNull String, @NonNull float[]);
+    method public void setInputBuffer(@NonNull String, @NonNull android.graphics.BitmapShader);
+    method public void setInputShader(@NonNull String, @NonNull android.graphics.Shader);
+    method public void setIntUniform(@NonNull String, int);
+    method public void setIntUniform(@NonNull String, int, int);
+    method public void setIntUniform(@NonNull String, int, int, int);
+    method public void setIntUniform(@NonNull String, int, int, int, int);
+    method public void setIntUniform(@NonNull String, @NonNull int[]);
+  }
+
   public class Shader {
     ctor @Deprecated public Shader();
     method public boolean getLocalMatrix(@NonNull android.graphics.Matrix);
@@ -16226,6 +15568,7 @@
     ctor public SurfaceTexture(boolean);
     method public void attachToGLContext(int);
     method public void detachFromGLContext();
+    method public int getDataSpace();
     method public long getTimestamp();
     method public void getTransformMatrix(float[]);
     method public boolean isReleased();
@@ -16319,11 +15662,13 @@
 
   public class AdaptiveIconDrawable extends android.graphics.drawable.Drawable implements android.graphics.drawable.Drawable.Callback {
     ctor public AdaptiveIconDrawable(android.graphics.drawable.Drawable, android.graphics.drawable.Drawable);
+    ctor public AdaptiveIconDrawable(@Nullable android.graphics.drawable.Drawable, @Nullable android.graphics.drawable.Drawable, @Nullable android.graphics.drawable.Drawable);
     method public void draw(android.graphics.Canvas);
     method public android.graphics.drawable.Drawable getBackground();
     method public static float getExtraInsetFraction();
     method public android.graphics.drawable.Drawable getForeground();
     method public android.graphics.Path getIconMask();
+    method @Nullable public android.graphics.drawable.Drawable getMonochrome();
     method public int getOpacity();
     method public void invalidateDrawable(@NonNull android.graphics.drawable.Drawable);
     method public void scheduleDrawable(@NonNull android.graphics.drawable.Drawable, @NonNull Runnable, long);
@@ -16480,9 +15825,9 @@
     method public final void copyBounds(@NonNull android.graphics.Rect);
     method @NonNull public final android.graphics.Rect copyBounds();
     method @Nullable public static android.graphics.drawable.Drawable createFromPath(String);
-    method public static android.graphics.drawable.Drawable createFromResourceStream(android.content.res.Resources, android.util.TypedValue, java.io.InputStream, String);
+    method @Nullable public static android.graphics.drawable.Drawable createFromResourceStream(@Nullable android.content.res.Resources, @Nullable android.util.TypedValue, @Nullable java.io.InputStream, @Nullable String);
     method @Deprecated @Nullable public static android.graphics.drawable.Drawable createFromResourceStream(@Nullable android.content.res.Resources, @Nullable android.util.TypedValue, @Nullable java.io.InputStream, @Nullable String, @Nullable android.graphics.BitmapFactory.Options);
-    method public static android.graphics.drawable.Drawable createFromStream(java.io.InputStream, String);
+    method @Nullable public static android.graphics.drawable.Drawable createFromStream(@Nullable java.io.InputStream, @Nullable String);
     method @NonNull public static android.graphics.drawable.Drawable createFromXml(@NonNull android.content.res.Resources, @NonNull org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
     method @NonNull public static android.graphics.drawable.Drawable createFromXml(@NonNull android.content.res.Resources, @NonNull org.xmlpull.v1.XmlPullParser, @Nullable android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
     method @NonNull public static android.graphics.drawable.Drawable createFromXmlInner(@NonNull android.content.res.Resources, @NonNull org.xmlpull.v1.XmlPullParser, @NonNull android.util.AttributeSet) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
@@ -16520,10 +15865,10 @@
     method public final boolean isVisible();
     method public void jumpToCurrentState();
     method @NonNull public android.graphics.drawable.Drawable mutate();
-    method protected void onBoundsChange(android.graphics.Rect);
+    method protected void onBoundsChange(@NonNull android.graphics.Rect);
     method public boolean onLayoutDirectionChanged(int);
     method protected boolean onLevelChange(int);
-    method protected boolean onStateChange(int[]);
+    method protected boolean onStateChange(@NonNull int[]);
     method public static int resolveOpacity(int, int);
     method public void scheduleSelf(@NonNull Runnable, long);
     method public abstract void setAlpha(@IntRange(from=0, to=255) int);
@@ -16684,27 +16029,27 @@
   }
 
   public final class Icon implements android.os.Parcelable {
-    method public static android.graphics.drawable.Icon createWithAdaptiveBitmap(android.graphics.Bitmap);
+    method @NonNull public static android.graphics.drawable.Icon createWithAdaptiveBitmap(android.graphics.Bitmap);
     method @NonNull public static android.graphics.drawable.Icon createWithAdaptiveBitmapContentUri(@NonNull String);
     method @NonNull public static android.graphics.drawable.Icon createWithAdaptiveBitmapContentUri(@NonNull android.net.Uri);
-    method public static android.graphics.drawable.Icon createWithBitmap(android.graphics.Bitmap);
-    method public static android.graphics.drawable.Icon createWithContentUri(String);
-    method public static android.graphics.drawable.Icon createWithContentUri(android.net.Uri);
-    method public static android.graphics.drawable.Icon createWithData(byte[], int, int);
-    method public static android.graphics.drawable.Icon createWithFilePath(String);
-    method public static android.graphics.drawable.Icon createWithResource(android.content.Context, @DrawableRes int);
-    method public static android.graphics.drawable.Icon createWithResource(String, @DrawableRes int);
+    method @NonNull public static android.graphics.drawable.Icon createWithBitmap(android.graphics.Bitmap);
+    method @NonNull public static android.graphics.drawable.Icon createWithContentUri(String);
+    method @NonNull public static android.graphics.drawable.Icon createWithContentUri(android.net.Uri);
+    method @NonNull public static android.graphics.drawable.Icon createWithData(byte[], int, int);
+    method @NonNull public static android.graphics.drawable.Icon createWithFilePath(String);
+    method @NonNull public static android.graphics.drawable.Icon createWithResource(android.content.Context, @DrawableRes int);
+    method @NonNull public static android.graphics.drawable.Icon createWithResource(String, @DrawableRes int);
     method public int describeContents();
     method @DrawableRes public int getResId();
     method @NonNull public String getResPackage();
     method public int getType();
     method @NonNull public android.net.Uri getUri();
-    method public android.graphics.drawable.Drawable loadDrawable(android.content.Context);
-    method public void loadDrawableAsync(android.content.Context, android.os.Message);
-    method public void loadDrawableAsync(android.content.Context, android.graphics.drawable.Icon.OnDrawableLoadedListener, android.os.Handler);
-    method public android.graphics.drawable.Icon setTint(@ColorInt int);
+    method @Nullable public android.graphics.drawable.Drawable loadDrawable(android.content.Context);
+    method public void loadDrawableAsync(@NonNull android.content.Context, @NonNull android.os.Message);
+    method public void loadDrawableAsync(@NonNull android.content.Context, android.graphics.drawable.Icon.OnDrawableLoadedListener, android.os.Handler);
+    method @NonNull public android.graphics.drawable.Icon setTint(@ColorInt int);
     method @NonNull public android.graphics.drawable.Icon setTintBlendMode(@NonNull android.graphics.BlendMode);
-    method public android.graphics.drawable.Icon setTintList(android.content.res.ColorStateList);
+    method @NonNull public android.graphics.drawable.Icon setTintList(android.content.res.ColorStateList);
     method @NonNull public android.graphics.drawable.Icon setTintMode(@NonNull android.graphics.PorterDuff.Mode);
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.graphics.drawable.Icon> CREATOR;
@@ -17077,6 +16422,24 @@
 
 package android.graphics.text {
 
+  public final class LineBreakConfig {
+    method public int getLineBreakStyle();
+    method public int getLineBreakWordStyle();
+    field public static final int LINE_BREAK_STYLE_LOOSE = 1; // 0x1
+    field public static final int LINE_BREAK_STYLE_NONE = 0; // 0x0
+    field public static final int LINE_BREAK_STYLE_NORMAL = 2; // 0x2
+    field public static final int LINE_BREAK_STYLE_STRICT = 3; // 0x3
+    field public static final int LINE_BREAK_WORD_STYLE_NONE = 0; // 0x0
+    field public static final int LINE_BREAK_WORD_STYLE_PHRASE = 1; // 0x1
+  }
+
+  public static final class LineBreakConfig.Builder {
+    ctor public LineBreakConfig.Builder();
+    method @NonNull public android.graphics.text.LineBreakConfig build();
+    method @NonNull public android.graphics.text.LineBreakConfig.Builder setLineBreakStyle(int);
+    method @NonNull public android.graphics.text.LineBreakConfig.Builder setLineBreakWordStyle(int);
+  }
+
   public class LineBreaker {
     method @NonNull public android.graphics.text.LineBreaker.Result computeLineBreaks(@NonNull android.graphics.text.MeasuredText, @NonNull android.graphics.text.LineBreaker.ParagraphConstraints, @IntRange(from=0) int);
     field public static final int BREAK_STRATEGY_BALANCED = 2; // 0x2
@@ -17124,6 +16487,7 @@
   public class MeasuredText {
     method public void getBounds(@IntRange(from=0) int, @IntRange(from=0) int, @NonNull android.graphics.Rect);
     method @FloatRange(from=0.0f) @Px public float getCharWidthAt(@IntRange(from=0) int);
+    method public void getFontMetricsInt(@IntRange(from=0) int, @IntRange(from=0) int, @NonNull android.graphics.Paint.FontMetricsInt);
     method @FloatRange(from=0.0) @Px public float getWidth(@IntRange(from=0) int, @IntRange(from=0) int);
   }
 
@@ -17132,9 +16496,14 @@
     ctor public MeasuredText.Builder(@NonNull android.graphics.text.MeasuredText);
     method @NonNull public android.graphics.text.MeasuredText.Builder appendReplacementRun(@NonNull android.graphics.Paint, @IntRange(from=0) int, @FloatRange(from=0) @Px float);
     method @NonNull public android.graphics.text.MeasuredText.Builder appendStyleRun(@NonNull android.graphics.Paint, @IntRange(from=0) int, boolean);
+    method @NonNull public android.graphics.text.MeasuredText.Builder appendStyleRun(@NonNull android.graphics.Paint, @Nullable android.graphics.text.LineBreakConfig, @IntRange(from=0) int, boolean);
     method @NonNull public android.graphics.text.MeasuredText build();
-    method @NonNull public android.graphics.text.MeasuredText.Builder setComputeHyphenation(boolean);
+    method @Deprecated @NonNull public android.graphics.text.MeasuredText.Builder setComputeHyphenation(boolean);
+    method @NonNull public android.graphics.text.MeasuredText.Builder setComputeHyphenation(int);
     method @NonNull public android.graphics.text.MeasuredText.Builder setComputeLayout(boolean);
+    field public static final int HYPHENATION_MODE_FAST = 2; // 0x2
+    field public static final int HYPHENATION_MODE_NONE = 0; // 0x0
+    field public static final int HYPHENATION_MODE_NORMAL = 1; // 0x1
   }
 
   public final class PositionedGlyphs {
@@ -17437,6 +16806,52 @@
     method public int getMinFrequency();
   }
 
+  public final class DataSpace {
+    method public static int getRange(int);
+    method public static int getStandard(int);
+    method public static int getTransfer(int);
+    method public static int pack(int, int, int);
+    field public static final int DATASPACE_ADOBE_RGB = 151715840; // 0x90b0000
+    field public static final int DATASPACE_BT2020 = 147193856; // 0x8c60000
+    field public static final int DATASPACE_BT2020_PQ = 163971072; // 0x9c60000
+    field public static final int DATASPACE_BT601_525 = 281280512; // 0x10c40000
+    field public static final int DATASPACE_BT601_625 = 281149440; // 0x10c20000
+    field public static final int DATASPACE_BT709 = 281083904; // 0x10c10000
+    field public static final int DATASPACE_DCI_P3 = 155844608; // 0x94a0000
+    field public static final int DATASPACE_DISPLAY_P3 = 143261696; // 0x88a0000
+    field public static final int DATASPACE_JFIF = 146931712; // 0x8c20000
+    field public static final int DATASPACE_SCRGB = 411107328; // 0x18810000
+    field public static final int DATASPACE_SCRGB_LINEAR = 406913024; // 0x18410000
+    field public static final int DATASPACE_SRGB = 142671872; // 0x8810000
+    field public static final int DATASPACE_SRGB_LINEAR = 138477568; // 0x8410000
+    field public static final int DATASPACE_UNKNOWN = 0; // 0x0
+    field public static final int RANGE_EXTENDED = 402653184; // 0x18000000
+    field public static final int RANGE_FULL = 134217728; // 0x8000000
+    field public static final int RANGE_LIMITED = 268435456; // 0x10000000
+    field public static final int RANGE_UNSPECIFIED = 0; // 0x0
+    field public static final int STANDARD_ADOBE_RGB = 720896; // 0xb0000
+    field public static final int STANDARD_BT2020 = 393216; // 0x60000
+    field public static final int STANDARD_BT2020_CONSTANT_LUMINANCE = 458752; // 0x70000
+    field public static final int STANDARD_BT470M = 524288; // 0x80000
+    field public static final int STANDARD_BT601_525 = 262144; // 0x40000
+    field public static final int STANDARD_BT601_525_UNADJUSTED = 327680; // 0x50000
+    field public static final int STANDARD_BT601_625 = 131072; // 0x20000
+    field public static final int STANDARD_BT601_625_UNADJUSTED = 196608; // 0x30000
+    field public static final int STANDARD_BT709 = 65536; // 0x10000
+    field public static final int STANDARD_DCI_P3 = 655360; // 0xa0000
+    field public static final int STANDARD_FILM = 589824; // 0x90000
+    field public static final int STANDARD_UNSPECIFIED = 0; // 0x0
+    field public static final int TRANSFER_GAMMA2_2 = 16777216; // 0x1000000
+    field public static final int TRANSFER_GAMMA2_6 = 20971520; // 0x1400000
+    field public static final int TRANSFER_GAMMA2_8 = 25165824; // 0x1800000
+    field public static final int TRANSFER_HLG = 33554432; // 0x2000000
+    field public static final int TRANSFER_LINEAR = 4194304; // 0x400000
+    field public static final int TRANSFER_SMPTE_170M = 12582912; // 0xc00000
+    field public static final int TRANSFER_SRGB = 8388608; // 0x800000
+    field public static final int TRANSFER_ST2084 = 29360128; // 0x1c00000
+    field public static final int TRANSFER_UNSPECIFIED = 0; // 0x0
+  }
+
   public class GeomagneticField {
     ctor public GeomagneticField(float, float, float, long);
     method public float getDeclination();
@@ -17474,10 +16889,12 @@
     field public static final int RGB_565 = 4; // 0x4
     field public static final int RGB_888 = 3; // 0x3
     field public static final int S_UI8 = 53; // 0x35
+    field public static final long USAGE_COMPOSER_OVERLAY = 2048L; // 0x800L
     field public static final long USAGE_CPU_READ_OFTEN = 3L; // 0x3L
     field public static final long USAGE_CPU_READ_RARELY = 2L; // 0x2L
     field public static final long USAGE_CPU_WRITE_OFTEN = 48L; // 0x30L
     field public static final long USAGE_CPU_WRITE_RARELY = 32L; // 0x20L
+    field public static final long USAGE_FRONT_BUFFER = 4294967296L; // 0x100000000L
     field public static final long USAGE_GPU_COLOR_OUTPUT = 512L; // 0x200L
     field public static final long USAGE_GPU_CUBE_MAP = 33554432L; // 0x2000000L
     field public static final long USAGE_GPU_DATA_BUFFER = 16777216L; // 0x1000000L
@@ -17487,6 +16904,7 @@
     field public static final long USAGE_SENSOR_DIRECT_DATA = 8388608L; // 0x800000L
     field public static final long USAGE_VIDEO_ENCODE = 65536L; // 0x10000L
     field public static final int YCBCR_420_888 = 35; // 0x23
+    field public static final int YCBCR_P010 = 54; // 0x36
   }
 
   public final class Sensor {
@@ -17514,13 +16932,19 @@
     field public static final int REPORTING_MODE_ON_CHANGE = 1; // 0x1
     field public static final int REPORTING_MODE_SPECIAL_TRIGGER = 3; // 0x3
     field public static final String STRING_TYPE_ACCELEROMETER = "android.sensor.accelerometer";
+    field public static final String STRING_TYPE_ACCELEROMETER_LIMITED_AXES = "android.sensor.accelerometer_limited_axes";
+    field public static final String STRING_TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED = "android.sensor.accelerometer_limited_axes_uncalibrated";
     field public static final String STRING_TYPE_ACCELEROMETER_UNCALIBRATED = "android.sensor.accelerometer_uncalibrated";
     field public static final String STRING_TYPE_AMBIENT_TEMPERATURE = "android.sensor.ambient_temperature";
     field public static final String STRING_TYPE_GAME_ROTATION_VECTOR = "android.sensor.game_rotation_vector";
     field public static final String STRING_TYPE_GEOMAGNETIC_ROTATION_VECTOR = "android.sensor.geomagnetic_rotation_vector";
     field public static final String STRING_TYPE_GRAVITY = "android.sensor.gravity";
     field public static final String STRING_TYPE_GYROSCOPE = "android.sensor.gyroscope";
+    field public static final String STRING_TYPE_GYROSCOPE_LIMITED_AXES = "android.sensor.gyroscope_limited_axes";
+    field public static final String STRING_TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED = "android.sensor.gyroscope_limited_axes_uncalibrated";
     field public static final String STRING_TYPE_GYROSCOPE_UNCALIBRATED = "android.sensor.gyroscope_uncalibrated";
+    field public static final String STRING_TYPE_HEADING = "android.sensor.heading";
+    field public static final String STRING_TYPE_HEAD_TRACKER = "android.sensor.head_tracker";
     field public static final String STRING_TYPE_HEART_BEAT = "android.sensor.heart_beat";
     field public static final String STRING_TYPE_HEART_RATE = "android.sensor.heart_rate";
     field public static final String STRING_TYPE_HINGE_ANGLE = "android.sensor.hinge_angle";
@@ -17542,6 +16966,8 @@
     field public static final String STRING_TYPE_STEP_DETECTOR = "android.sensor.step_detector";
     field @Deprecated public static final String STRING_TYPE_TEMPERATURE = "android.sensor.temperature";
     field public static final int TYPE_ACCELEROMETER = 1; // 0x1
+    field public static final int TYPE_ACCELEROMETER_LIMITED_AXES = 38; // 0x26
+    field public static final int TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED = 40; // 0x28
     field public static final int TYPE_ACCELEROMETER_UNCALIBRATED = 35; // 0x23
     field public static final int TYPE_ALL = -1; // 0xffffffff
     field public static final int TYPE_AMBIENT_TEMPERATURE = 13; // 0xd
@@ -17550,7 +16976,11 @@
     field public static final int TYPE_GEOMAGNETIC_ROTATION_VECTOR = 20; // 0x14
     field public static final int TYPE_GRAVITY = 9; // 0x9
     field public static final int TYPE_GYROSCOPE = 4; // 0x4
+    field public static final int TYPE_GYROSCOPE_LIMITED_AXES = 39; // 0x27
+    field public static final int TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED = 41; // 0x29
     field public static final int TYPE_GYROSCOPE_UNCALIBRATED = 16; // 0x10
+    field public static final int TYPE_HEADING = 42; // 0x2a
+    field public static final int TYPE_HEAD_TRACKER = 37; // 0x25
     field public static final int TYPE_HEART_BEAT = 31; // 0x1f
     field public static final int TYPE_HEART_RATE = 21; // 0x15
     field public static final int TYPE_HINGE_ANGLE = 36; // 0x24
@@ -17602,6 +17032,7 @@
 
   public class SensorEvent {
     field public int accuracy;
+    field public boolean firstEventAfterDiscontinuity;
     field public android.hardware.Sensor sensor;
     field public long timestamp;
     field public final float[] values;
@@ -17730,6 +17161,9 @@
 
   public final class SensorPrivacyManager {
     method public boolean supportsSensorToggle(int);
+    method public boolean supportsSensorToggle(int, int);
+    field public static final int TOGGLE_TYPE_HARDWARE = 2; // 0x2
+    field public static final int TOGGLE_TYPE_SOFTWARE = 1; // 0x1
   }
 
   public static class SensorPrivacyManager.Sensors {
@@ -17737,6 +17171,19 @@
     field public static final int MICROPHONE = 1; // 0x1
   }
 
+  public final class SyncFence implements java.lang.AutoCloseable android.os.Parcelable {
+    method public boolean await(@NonNull java.time.Duration);
+    method public boolean awaitForever();
+    method public void close();
+    method public int describeContents();
+    method public long getSignalTime();
+    method public boolean isValid();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.hardware.SyncFence> CREATOR;
+    field public static final long SIGNAL_TIME_INVALID = -1L; // 0xffffffffffffffffL
+    field public static final long SIGNAL_TIME_PENDING = 9223372036854775807L; // 0x7fffffffffffffffL
+  }
+
   public final class TriggerEvent {
     field public android.hardware.Sensor sensor;
     field public long timestamp;
@@ -17836,10 +17283,12 @@
     ctor public BiometricPrompt.CryptoObject(@NonNull java.security.Signature);
     ctor public BiometricPrompt.CryptoObject(@NonNull javax.crypto.Cipher);
     ctor public BiometricPrompt.CryptoObject(@NonNull javax.crypto.Mac);
-    ctor public BiometricPrompt.CryptoObject(@NonNull android.security.identity.IdentityCredential);
+    ctor @Deprecated public BiometricPrompt.CryptoObject(@NonNull android.security.identity.IdentityCredential);
+    ctor public BiometricPrompt.CryptoObject(@NonNull android.security.identity.PresentationSession);
     method public javax.crypto.Cipher getCipher();
-    method @Nullable public android.security.identity.IdentityCredential getIdentityCredential();
+    method @Deprecated @Nullable public android.security.identity.IdentityCredential getIdentityCredential();
     method public javax.crypto.Mac getMac();
+    method @Nullable public android.security.identity.PresentationSession getPresentationSession();
     method public java.security.Signature getSignature();
   }
 
@@ -17915,6 +17364,8 @@
     method @NonNull public java.util.List<android.hardware.camera2.CameraCharacteristics.Key<?>> getKeysNeedingPermission();
     method @NonNull public java.util.Set<java.lang.String> getPhysicalCameraIds();
     method @Nullable public android.hardware.camera2.params.RecommendedStreamConfigurationMap getRecommendedStreamConfigurationMap(int);
+    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> AUTOMOTIVE_LENS_FACING;
+    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> AUTOMOTIVE_LOCATION;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AE_AVAILABLE_ANTIBANDING_MODES;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> CONTROL_AE_AVAILABLE_MODES;
@@ -17939,7 +17390,10 @@
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> DISTORTION_CORRECTION_AVAILABLE_MODES;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> EDGE_AVAILABLE_EDGE_MODES;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Boolean> FLASH_INFO_AVAILABLE;
+    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> FLASH_INFO_STRENGTH_DEFAULT_LEVEL;
+    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> FLASH_INFO_STRENGTH_MAXIMUM_LEVEL;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES;
+    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.DeviceStateSensorOrientationMap> INFO_DEVICE_STATE_SENSOR_ORIENTATION_MAP;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> INFO_SUPPORTED_HARDWARE_LEVEL;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.String> INFO_VERSION;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Size[]> JPEG_AVAILABLE_THUMBNAIL_SIZES;
@@ -17963,19 +17417,25 @@
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REPROCESS_MAX_CAPTURE_STALL;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> REQUEST_AVAILABLE_CAPABILITIES;
+    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.DynamicRangeProfiles> REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_MAX_NUM_INPUT_STREAMS;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_MAX_NUM_OUTPUT_PROC;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_MAX_NUM_OUTPUT_PROC_STALLING;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_MAX_NUM_OUTPUT_RAW;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> REQUEST_PARTIAL_RESULT_COUNT;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Byte> REQUEST_PIPELINE_MAX_DEPTH;
+    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Long> REQUEST_RECOMMENDED_TEN_BIT_DYNAMIC_RANGE_PROFILE;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Float> SCALER_AVAILABLE_MAX_DIGITAL_ZOOM;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<int[]> SCALER_AVAILABLE_ROTATE_AND_CROP_MODES;
+    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<long[]> SCALER_AVAILABLE_STREAM_USE_CASES;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<java.lang.Integer> SCALER_CROPPING_TYPE;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.util.Size> SCALER_DEFAULT_SECURE_IMAGE_SIZE;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.MandatoryStreamCombination[]> SCALER_MANDATORY_CONCURRENT_STREAM_COMBINATIONS;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.MandatoryStreamCombination[]> SCALER_MANDATORY_MAXIMUM_RESOLUTION_STREAM_COMBINATIONS;
+    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.MandatoryStreamCombination[]> SCALER_MANDATORY_PREVIEW_STABILIZATION_OUTPUT_STREAM_COMBINATIONS;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.MandatoryStreamCombination[]> SCALER_MANDATORY_STREAM_COMBINATIONS;
+    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.MandatoryStreamCombination[]> SCALER_MANDATORY_TEN_BIT_OUTPUT_STREAM_COMBINATIONS;
+    field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.MandatoryStreamCombination[]> SCALER_MANDATORY_USE_CASE_STREAM_COMBINATIONS;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.MultiResolutionStreamConfigurationMap> SCALER_MULTI_RESOLUTION_STREAM_CONFIGURATION_MAP;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.StreamConfigurationMap> SCALER_STREAM_CONFIGURATION_MAP;
     field @NonNull public static final android.hardware.camera2.CameraCharacteristics.Key<android.hardware.camera2.params.StreamConfigurationMap> SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION;
@@ -18069,13 +17529,16 @@
   }
 
   public final class CameraExtensionCharacteristics {
+    method @NonNull public java.util.Set<android.hardware.camera2.CaptureRequest.Key> getAvailableCaptureRequestKeys(int);
+    method @NonNull public java.util.Set<android.hardware.camera2.CaptureResult.Key> getAvailableCaptureResultKeys(int);
     method @Nullable public android.util.Range<java.lang.Long> getEstimatedCaptureLatencyRangeMillis(int, @NonNull android.util.Size, int);
     method @NonNull public <T> java.util.List<android.util.Size> getExtensionSupportedSizes(int, @NonNull Class<T>);
     method @NonNull public java.util.List<android.util.Size> getExtensionSupportedSizes(int, int);
     method @NonNull public java.util.List<java.lang.Integer> getSupportedExtensions();
     field public static final int EXTENSION_AUTOMATIC = 0; // 0x0
-    field public static final int EXTENSION_BEAUTY = 1; // 0x1
+    field @Deprecated public static final int EXTENSION_BEAUTY = 1; // 0x1
     field public static final int EXTENSION_BOKEH = 2; // 0x2
+    field public static final int EXTENSION_FACE_RETOUCH = 1; // 0x1
     field public static final int EXTENSION_HDR = 3; // 0x3
     field public static final int EXTENSION_NIGHT = 4; // 0x4
   }
@@ -18092,6 +17555,7 @@
     ctor public CameraExtensionSession.ExtensionCaptureCallback();
     method public void onCaptureFailed(@NonNull android.hardware.camera2.CameraExtensionSession, @NonNull android.hardware.camera2.CaptureRequest);
     method public void onCaptureProcessStarted(@NonNull android.hardware.camera2.CameraExtensionSession, @NonNull android.hardware.camera2.CaptureRequest);
+    method public void onCaptureResultAvailable(@NonNull android.hardware.camera2.CameraExtensionSession, @NonNull android.hardware.camera2.CaptureRequest, @NonNull android.hardware.camera2.TotalCaptureResult);
     method public void onCaptureSequenceAborted(@NonNull android.hardware.camera2.CameraExtensionSession, int);
     method public void onCaptureSequenceCompleted(@NonNull android.hardware.camera2.CameraExtensionSession, int);
     method public void onCaptureStarted(@NonNull android.hardware.camera2.CameraExtensionSession, @NonNull android.hardware.camera2.CaptureRequest, long);
@@ -18109,6 +17573,7 @@
     method @NonNull public android.hardware.camera2.CameraExtensionCharacteristics getCameraExtensionCharacteristics(@NonNull String) throws android.hardware.camera2.CameraAccessException;
     method @NonNull public String[] getCameraIdList() throws android.hardware.camera2.CameraAccessException;
     method @NonNull public java.util.Set<java.util.Set<java.lang.String>> getConcurrentCameraIds() throws android.hardware.camera2.CameraAccessException;
+    method public int getTorchStrengthLevel(@NonNull String) throws android.hardware.camera2.CameraAccessException;
     method @RequiresPermission(android.Manifest.permission.CAMERA) public boolean isConcurrentSessionConfigurationSupported(@NonNull java.util.Map<java.lang.String,android.hardware.camera2.params.SessionConfiguration>) throws android.hardware.camera2.CameraAccessException;
     method @RequiresPermission(android.Manifest.permission.CAMERA) public void openCamera(@NonNull String, @NonNull android.hardware.camera2.CameraDevice.StateCallback, @Nullable android.os.Handler) throws android.hardware.camera2.CameraAccessException;
     method @RequiresPermission(android.Manifest.permission.CAMERA) public void openCamera(@NonNull String, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraDevice.StateCallback) throws android.hardware.camera2.CameraAccessException;
@@ -18117,6 +17582,7 @@
     method public void registerTorchCallback(@NonNull android.hardware.camera2.CameraManager.TorchCallback, @Nullable android.os.Handler);
     method public void registerTorchCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraManager.TorchCallback);
     method public void setTorchMode(@NonNull String, boolean) throws android.hardware.camera2.CameraAccessException;
+    method public void turnOnTorchWithStrengthLevel(@NonNull String, int) throws android.hardware.camera2.CameraAccessException;
     method public void unregisterAvailabilityCallback(@NonNull android.hardware.camera2.CameraManager.AvailabilityCallback);
     method public void unregisterTorchCallback(@NonNull android.hardware.camera2.CameraManager.TorchCallback);
   }
@@ -18134,10 +17600,37 @@
     ctor public CameraManager.TorchCallback();
     method public void onTorchModeChanged(@NonNull String, boolean);
     method public void onTorchModeUnavailable(@NonNull String);
+    method public void onTorchStrengthLevelChanged(@NonNull String, int);
   }
 
   public abstract class CameraMetadata<TKey> {
     method @NonNull public java.util.List<TKey> getKeys();
+    field public static final int AUTOMOTIVE_LENS_FACING_EXTERIOR_FRONT = 1; // 0x1
+    field public static final int AUTOMOTIVE_LENS_FACING_EXTERIOR_LEFT = 3; // 0x3
+    field public static final int AUTOMOTIVE_LENS_FACING_EXTERIOR_OTHER = 0; // 0x0
+    field public static final int AUTOMOTIVE_LENS_FACING_EXTERIOR_REAR = 2; // 0x2
+    field public static final int AUTOMOTIVE_LENS_FACING_EXTERIOR_RIGHT = 4; // 0x4
+    field public static final int AUTOMOTIVE_LENS_FACING_INTERIOR_OTHER = 5; // 0x5
+    field public static final int AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_1_CENTER = 7; // 0x7
+    field public static final int AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_1_LEFT = 6; // 0x6
+    field public static final int AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_1_RIGHT = 8; // 0x8
+    field public static final int AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_2_CENTER = 10; // 0xa
+    field public static final int AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_2_LEFT = 9; // 0x9
+    field public static final int AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_2_RIGHT = 11; // 0xb
+    field public static final int AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_3_CENTER = 13; // 0xd
+    field public static final int AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_3_LEFT = 12; // 0xc
+    field public static final int AUTOMOTIVE_LENS_FACING_INTERIOR_SEAT_ROW_3_RIGHT = 14; // 0xe
+    field public static final int AUTOMOTIVE_LOCATION_EXTERIOR_FRONT = 2; // 0x2
+    field public static final int AUTOMOTIVE_LOCATION_EXTERIOR_LEFT = 4; // 0x4
+    field public static final int AUTOMOTIVE_LOCATION_EXTERIOR_OTHER = 1; // 0x1
+    field public static final int AUTOMOTIVE_LOCATION_EXTERIOR_REAR = 3; // 0x3
+    field public static final int AUTOMOTIVE_LOCATION_EXTERIOR_RIGHT = 5; // 0x5
+    field public static final int AUTOMOTIVE_LOCATION_EXTRA_FRONT = 7; // 0x7
+    field public static final int AUTOMOTIVE_LOCATION_EXTRA_LEFT = 9; // 0x9
+    field public static final int AUTOMOTIVE_LOCATION_EXTRA_OTHER = 6; // 0x6
+    field public static final int AUTOMOTIVE_LOCATION_EXTRA_REAR = 8; // 0x8
+    field public static final int AUTOMOTIVE_LOCATION_EXTRA_RIGHT = 10; // 0xa
+    field public static final int AUTOMOTIVE_LOCATION_INTERIOR = 0; // 0x0
     field public static final int COLOR_CORRECTION_ABERRATION_MODE_FAST = 1; // 0x1
     field public static final int COLOR_CORRECTION_ABERRATION_MODE_HIGH_QUALITY = 2; // 0x2
     field public static final int COLOR_CORRECTION_ABERRATION_MODE_OFF = 0; // 0x0
@@ -18240,6 +17733,7 @@
     field public static final int CONTROL_SCENE_MODE_THEATRE = 7; // 0x7
     field public static final int CONTROL_VIDEO_STABILIZATION_MODE_OFF = 0; // 0x0
     field public static final int CONTROL_VIDEO_STABILIZATION_MODE_ON = 1; // 0x1
+    field public static final int CONTROL_VIDEO_STABILIZATION_MODE_PREVIEW_STABILIZATION = 2; // 0x2
     field public static final int DISTORTION_CORRECTION_MODE_FAST = 1; // 0x1
     field public static final int DISTORTION_CORRECTION_MODE_HIGH_QUALITY = 2; // 0x2
     field public static final int DISTORTION_CORRECTION_MODE_OFF = 0; // 0x0
@@ -18271,6 +17765,7 @@
     field public static final int LENS_INFO_FOCUS_DISTANCE_CALIBRATION_UNCALIBRATED = 0; // 0x0
     field public static final int LENS_OPTICAL_STABILIZATION_MODE_OFF = 0; // 0x0
     field public static final int LENS_OPTICAL_STABILIZATION_MODE_ON = 1; // 0x1
+    field public static final int LENS_POSE_REFERENCE_AUTOMOTIVE = 3; // 0x3
     field public static final int LENS_POSE_REFERENCE_GYROSCOPE = 1; // 0x1
     field public static final int LENS_POSE_REFERENCE_PRIMARY_CAMERA = 0; // 0x0
     field public static final int LENS_POSE_REFERENCE_UNDEFINED = 2; // 0x2
@@ -18287,6 +17782,7 @@
     field public static final int REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE = 6; // 0x6
     field public static final int REQUEST_AVAILABLE_CAPABILITIES_CONSTRAINED_HIGH_SPEED_VIDEO = 9; // 0x9
     field public static final int REQUEST_AVAILABLE_CAPABILITIES_DEPTH_OUTPUT = 8; // 0x8
+    field public static final int REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT = 18; // 0x12
     field public static final int REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA = 11; // 0xb
     field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING = 2; // 0x2
     field public static final int REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR = 1; // 0x1
@@ -18298,9 +17794,16 @@
     field public static final int REQUEST_AVAILABLE_CAPABILITIES_READ_SENSOR_SETTINGS = 5; // 0x5
     field public static final int REQUEST_AVAILABLE_CAPABILITIES_REMOSAIC_REPROCESSING = 17; // 0x11
     field public static final int REQUEST_AVAILABLE_CAPABILITIES_SECURE_IMAGE_DATA = 13; // 0xd
+    field public static final int REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE = 19; // 0x13
     field public static final int REQUEST_AVAILABLE_CAPABILITIES_SYSTEM_CAMERA = 14; // 0xe
     field public static final int REQUEST_AVAILABLE_CAPABILITIES_ULTRA_HIGH_RESOLUTION_SENSOR = 16; // 0x10
     field public static final int REQUEST_AVAILABLE_CAPABILITIES_YUV_REPROCESSING = 7; // 0x7
+    field public static final int SCALER_AVAILABLE_STREAM_USE_CASES_DEFAULT = 0; // 0x0
+    field public static final int SCALER_AVAILABLE_STREAM_USE_CASES_PREVIEW = 1; // 0x1
+    field public static final int SCALER_AVAILABLE_STREAM_USE_CASES_PREVIEW_VIDEO_STILL = 4; // 0x4
+    field public static final int SCALER_AVAILABLE_STREAM_USE_CASES_STILL_CAPTURE = 2; // 0x2
+    field public static final int SCALER_AVAILABLE_STREAM_USE_CASES_VIDEO_CALL = 5; // 0x5
+    field public static final int SCALER_AVAILABLE_STREAM_USE_CASES_VIDEO_RECORD = 3; // 0x3
     field public static final int SCALER_CROPPING_TYPE_CENTER_ONLY = 0; // 0x0
     field public static final int SCALER_CROPPING_TYPE_FREEFORM = 1; // 0x1
     field public static final int SCALER_ROTATE_AND_CROP_180 = 2; // 0x2
@@ -18634,6 +18137,32 @@
     method public android.util.Rational getElement(int, int);
   }
 
+  public final class DeviceStateSensorOrientationMap {
+    method public int getSensorOrientation(long);
+    field public static final long FOLDED = 4L; // 0x4L
+    field public static final long NORMAL = 0L; // 0x0L
+  }
+
+  public final class DynamicRangeProfiles {
+    ctor public DynamicRangeProfiles(@NonNull long[]);
+    method @NonNull public java.util.Set<java.lang.Long> getProfileCaptureRequestConstraints(long);
+    method @NonNull public java.util.Set<java.lang.Long> getSupportedProfiles();
+    method public boolean isExtraLatencyPresent(long);
+    field public static final long DOLBY_VISION_10B_HDR_OEM = 64L; // 0x40L
+    field public static final long DOLBY_VISION_10B_HDR_OEM_PO = 128L; // 0x80L
+    field public static final long DOLBY_VISION_10B_HDR_REF = 16L; // 0x10L
+    field public static final long DOLBY_VISION_10B_HDR_REF_PO = 32L; // 0x20L
+    field public static final long DOLBY_VISION_8B_HDR_OEM = 1024L; // 0x400L
+    field public static final long DOLBY_VISION_8B_HDR_OEM_PO = 2048L; // 0x800L
+    field public static final long DOLBY_VISION_8B_HDR_REF = 256L; // 0x100L
+    field public static final long DOLBY_VISION_8B_HDR_REF_PO = 512L; // 0x200L
+    field public static final long HDR10 = 4L; // 0x4L
+    field public static final long HDR10_PLUS = 8L; // 0x8L
+    field public static final long HLG10 = 2L; // 0x2L
+    field public static final long PUBLIC_MAX = 4096L; // 0x1000L
+    field public static final long STANDARD = 1L; // 0x1L
+  }
+
   public final class ExtensionSessionConfiguration {
     ctor public ExtensionSessionConfiguration(int, @NonNull java.util.List<android.hardware.camera2.params.OutputConfiguration>, @NonNull java.util.concurrent.Executor, @NonNull android.hardware.camera2.CameraExtensionSession.StateCallback);
     method @NonNull public java.util.concurrent.Executor getExecutor();
@@ -18680,8 +18209,11 @@
   }
 
   public static final class MandatoryStreamCombination.MandatoryStreamInformation {
+    method public int get10BitFormat();
     method @NonNull public java.util.List<android.util.Size> getAvailableSizes();
     method public int getFormat();
+    method public long getStreamUseCase();
+    method public boolean is10BitCapable();
     method public boolean isInput();
     method public boolean isMaximumSize();
     method public boolean isUltraHighResolution();
@@ -18735,16 +18267,33 @@
     method @NonNull public static java.util.Collection<android.hardware.camera2.params.OutputConfiguration> createInstancesForMultiResolutionOutput(@NonNull android.hardware.camera2.MultiResolutionImageReader);
     method public int describeContents();
     method public void enableSurfaceSharing();
+    method public long getDynamicRangeProfile();
     method public int getMaxSharedSurfaceCount();
+    method public int getMirrorMode();
+    method public long getStreamUseCase();
     method @Nullable public android.view.Surface getSurface();
     method public int getSurfaceGroupId();
     method @NonNull public java.util.List<android.view.Surface> getSurfaces();
+    method public int getTimestampBase();
     method public void removeSensorPixelModeUsed(int);
     method public void removeSurface(@NonNull android.view.Surface);
+    method public void setDynamicRangeProfile(long);
+    method public void setMirrorMode(int);
     method public void setPhysicalCameraId(@Nullable String);
+    method public void setStreamUseCase(long);
+    method public void setTimestampBase(int);
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.hardware.camera2.params.OutputConfiguration> CREATOR;
+    field public static final int MIRROR_MODE_AUTO = 0; // 0x0
+    field public static final int MIRROR_MODE_H = 2; // 0x2
+    field public static final int MIRROR_MODE_NONE = 1; // 0x1
+    field public static final int MIRROR_MODE_V = 3; // 0x3
     field public static final int SURFACE_GROUP_ID_NONE = -1; // 0xffffffff
+    field public static final int TIMESTAMP_BASE_CHOREOGRAPHER_SYNCED = 4; // 0x4
+    field public static final int TIMESTAMP_BASE_DEFAULT = 0; // 0x0
+    field public static final int TIMESTAMP_BASE_MONOTONIC = 2; // 0x2
+    field public static final int TIMESTAMP_BASE_REALTIME = 3; // 0x3
+    field public static final int TIMESTAMP_BASE_SENSOR = 1; // 0x1
   }
 
   public final class RecommendedStreamConfigurationMap {
@@ -18766,6 +18315,7 @@
     method @Nullable public java.util.Set<java.lang.Integer> getValidOutputFormatsForInput(int);
     method public boolean isOutputSupportedFor(int);
     method public boolean isOutputSupportedFor(@NonNull android.view.Surface);
+    field public static final int USECASE_10BIT_OUTPUT = 8; // 0x8
     field public static final int USECASE_LOW_LATENCY_SNAPSHOT = 6; // 0x6
     field public static final int USECASE_PREVIEW = 0; // 0x0
     field public static final int USECASE_RAW = 5; // 0x5
@@ -18864,8 +18414,8 @@
   }
 
   public final class DisplayManager {
-    method public android.hardware.display.VirtualDisplay createVirtualDisplay(@NonNull String, int, int, int, @Nullable android.view.Surface, int);
-    method public android.hardware.display.VirtualDisplay createVirtualDisplay(@NonNull String, int, int, int, @Nullable android.view.Surface, int, @Nullable android.hardware.display.VirtualDisplay.Callback, @Nullable android.os.Handler);
+    method public android.hardware.display.VirtualDisplay createVirtualDisplay(@NonNull String, @IntRange(from=1) int, @IntRange(from=1) int, @IntRange(from=1) int, @Nullable android.view.Surface, int);
+    method public android.hardware.display.VirtualDisplay createVirtualDisplay(@NonNull String, @IntRange(from=1) int, @IntRange(from=1) int, @IntRange(from=1) int, @Nullable android.view.Surface, int, @Nullable android.hardware.display.VirtualDisplay.Callback, @Nullable android.os.Handler);
     method public android.view.Display getDisplay(int);
     method public android.view.Display[] getDisplays();
     method public android.view.Display[] getDisplays(String);
@@ -19204,7 +18754,6 @@
   public abstract class AbstractInputMethodService extends android.app.Service implements android.view.KeyEvent.Callback {
     ctor public AbstractInputMethodService();
     method public android.view.KeyEvent.DispatcherState getKeyDispatcherState();
-    method public final boolean isUiContext();
     method public final android.os.IBinder onBind(android.content.Intent);
     method public abstract android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodImpl onCreateInputMethodInterface();
     method public abstract android.inputmethodservice.AbstractInputMethodService.AbstractInputMethodSessionImpl onCreateInputMethodSessionInterface();
@@ -19243,6 +18792,7 @@
   @UiContext public class InputMethodService extends android.inputmethodservice.AbstractInputMethodService {
     ctor public InputMethodService();
     method @Deprecated public boolean enableHardwareAcceleration();
+    method public final void finishStylusHandwriting();
     method public int getBackDisposition();
     method public int getCandidatesHiddenVisibility();
     method public android.view.inputmethod.InputBinding getCurrentInputBinding();
@@ -19252,6 +18802,7 @@
     method @Deprecated public int getInputMethodWindowRecommendedHeight();
     method public android.view.LayoutInflater getLayoutInflater();
     method public int getMaxWidth();
+    method @Nullable public final android.view.Window getStylusHandwritingWindow();
     method public CharSequence getTextForImeAction(int);
     method public android.app.Dialog getWindow();
     method public void hideStatusIcon();
@@ -19282,16 +18833,20 @@
     method public void onFinishCandidatesView(boolean);
     method public void onFinishInput();
     method public void onFinishInputView(boolean);
+    method public void onFinishStylusHandwriting();
     method public void onInitializeInterface();
     method public boolean onInlineSuggestionsResponse(@NonNull android.view.inputmethod.InlineSuggestionsResponse);
     method public boolean onKeyDown(int, android.view.KeyEvent);
     method public boolean onKeyLongPress(int, android.view.KeyEvent);
     method public boolean onKeyMultiple(int, int, android.view.KeyEvent);
     method public boolean onKeyUp(int, android.view.KeyEvent);
+    method public void onPrepareStylusHandwriting();
     method public boolean onShowInputRequested(int, boolean);
     method public void onStartCandidatesView(android.view.inputmethod.EditorInfo, boolean);
     method public void onStartInput(android.view.inputmethod.EditorInfo, boolean);
     method public void onStartInputView(android.view.inputmethod.EditorInfo, boolean);
+    method public boolean onStartStylusHandwriting();
+    method public void onStylusHandwritingMotionEvent(@NonNull android.view.MotionEvent);
     method public void onUnbindInput();
     method @Deprecated public void onUpdateCursor(android.graphics.Rect);
     method public void onUpdateCursorAnchorInfo(android.view.inputmethod.CursorAnchorInfo);
@@ -19572,14 +19127,22 @@
   }
 
   public final class Geocoder {
-    ctor public Geocoder(android.content.Context, java.util.Locale);
-    ctor public Geocoder(android.content.Context);
-    method public java.util.List<android.location.Address> getFromLocation(double, double, int) throws java.io.IOException;
-    method public java.util.List<android.location.Address> getFromLocationName(String, int) throws java.io.IOException;
-    method public java.util.List<android.location.Address> getFromLocationName(String, int, double, double, double, double) throws java.io.IOException;
+    ctor public Geocoder(@NonNull android.content.Context);
+    ctor public Geocoder(@NonNull android.content.Context, @NonNull java.util.Locale);
+    method @Deprecated @Nullable public java.util.List<android.location.Address> getFromLocation(@FloatRange(from=-90.0, to=90.0) double, @FloatRange(from=-180.0, to=180.0) double, @IntRange int) throws java.io.IOException;
+    method public void getFromLocation(@FloatRange(from=-90.0, to=90.0) double, @FloatRange(from=-180.0, to=180.0) double, @IntRange int, @NonNull android.location.Geocoder.GeocodeListener);
+    method @Deprecated @Nullable public java.util.List<android.location.Address> getFromLocationName(@NonNull String, @IntRange int) throws java.io.IOException;
+    method public void getFromLocationName(@NonNull String, @IntRange int, @NonNull android.location.Geocoder.GeocodeListener);
+    method @Deprecated @Nullable public java.util.List<android.location.Address> getFromLocationName(@NonNull String, @IntRange int, @FloatRange(from=-90.0, to=90.0) double, @FloatRange(from=-180.0, to=180.0) double, @FloatRange(from=-90.0, to=90.0) double, @FloatRange(from=-180.0, to=180.0) double) throws java.io.IOException;
+    method public void getFromLocationName(@NonNull String, @IntRange int, @FloatRange(from=-90.0, to=90.0) double, @FloatRange(from=-180.0, to=180.0) double, @FloatRange(from=-90.0, to=90.0) double, @FloatRange(from=-180.0, to=180.0) double, @NonNull android.location.Geocoder.GeocodeListener);
     method public static boolean isPresent();
   }
 
+  public static interface Geocoder.GeocodeListener {
+    method public default void onError(@Nullable String);
+    method public void onGeocode(@NonNull java.util.List<android.location.Address>);
+  }
+
   public final class GnssAntennaInfo implements android.os.Parcelable {
     method public int describeContents();
     method @FloatRange(from=0.0f) public double getCarrierFrequencyMHz();
@@ -19629,6 +19192,24 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.location.GnssAntennaInfo.SphericalCorrections> CREATOR;
   }
 
+  public final class GnssAutomaticGainControl implements android.os.Parcelable {
+    method public int describeContents();
+    method @IntRange(from=0) public long getCarrierFrequencyHz();
+    method public int getConstellationType();
+    method @FloatRange(from=0xffffd8f0, to=10000) public double getLevelDb();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.location.GnssAutomaticGainControl> CREATOR;
+  }
+
+  public static final class GnssAutomaticGainControl.Builder {
+    ctor public GnssAutomaticGainControl.Builder();
+    ctor public GnssAutomaticGainControl.Builder(@NonNull android.location.GnssAutomaticGainControl);
+    method @NonNull public android.location.GnssAutomaticGainControl build();
+    method @NonNull public android.location.GnssAutomaticGainControl.Builder setCarrierFrequencyHz(@IntRange(from=0) long);
+    method @NonNull public android.location.GnssAutomaticGainControl.Builder setConstellationType(int);
+    method @NonNull public android.location.GnssAutomaticGainControl.Builder setLevelDb(@FloatRange(from=0xffffd8f0, to=10000) double);
+  }
+
   public final class GnssCapabilities implements android.os.Parcelable {
     method public int describeContents();
     method public boolean hasAntennaInfo();
@@ -19685,7 +19266,7 @@
     method public double getAccumulatedDeltaRangeMeters();
     method public int getAccumulatedDeltaRangeState();
     method public double getAccumulatedDeltaRangeUncertaintyMeters();
-    method public double getAutomaticGainControlLevelDb();
+    method @Deprecated public double getAutomaticGainControlLevelDb();
     method @FloatRange(from=0, to=63) public double getBasebandCn0DbHz();
     method @Deprecated public long getCarrierCycles();
     method public float getCarrierFrequencyHz();
@@ -19707,7 +19288,7 @@
     method public int getState();
     method public int getSvid();
     method public double getTimeOffsetNanos();
-    method public boolean hasAutomaticGainControlLevelDb();
+    method @Deprecated public boolean hasAutomaticGainControlLevelDb();
     method public boolean hasBasebandCn0DbHz();
     method @Deprecated public boolean hasCarrierCycles();
     method public boolean hasCarrierFrequencyHz();
@@ -19752,6 +19333,7 @@
 
   public final class GnssMeasurementRequest implements android.os.Parcelable {
     method public int describeContents();
+    method @IntRange(from=0) public int getIntervalMillis();
     method public boolean isFullTracking();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.location.GnssMeasurementRequest> CREATOR;
@@ -19762,16 +19344,27 @@
     ctor public GnssMeasurementRequest.Builder(@NonNull android.location.GnssMeasurementRequest);
     method @NonNull public android.location.GnssMeasurementRequest build();
     method @NonNull public android.location.GnssMeasurementRequest.Builder setFullTracking(boolean);
+    method @NonNull public android.location.GnssMeasurementRequest.Builder setIntervalMillis(@IntRange(from=0) int);
   }
 
   public final class GnssMeasurementsEvent implements android.os.Parcelable {
     method public int describeContents();
     method @NonNull public android.location.GnssClock getClock();
+    method @NonNull public java.util.Collection<android.location.GnssAutomaticGainControl> getGnssAutomaticGainControls();
     method @NonNull public java.util.Collection<android.location.GnssMeasurement> getMeasurements();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.location.GnssMeasurementsEvent> CREATOR;
   }
 
+  public static final class GnssMeasurementsEvent.Builder {
+    ctor public GnssMeasurementsEvent.Builder();
+    ctor public GnssMeasurementsEvent.Builder(@NonNull android.location.GnssMeasurementsEvent);
+    method @NonNull public android.location.GnssMeasurementsEvent build();
+    method @NonNull public android.location.GnssMeasurementsEvent.Builder setClock(@NonNull android.location.GnssClock);
+    method @NonNull public android.location.GnssMeasurementsEvent.Builder setGnssAutomaticGainControls(@NonNull java.util.Collection<android.location.GnssAutomaticGainControl>);
+    method @NonNull public android.location.GnssMeasurementsEvent.Builder setMeasurements(@NonNull java.util.Collection<android.location.GnssMeasurement>);
+  }
+
   public abstract static class GnssMeasurementsEvent.Callback {
     ctor public GnssMeasurementsEvent.Callback();
     method public void onGnssMeasurementsReceived(android.location.GnssMeasurementsEvent);
@@ -19893,29 +19486,32 @@
   }
 
   public class Location implements android.os.Parcelable {
-    ctor public Location(String);
-    ctor public Location(android.location.Location);
-    method public float bearingTo(android.location.Location);
-    method public static String convert(double, int);
-    method public static double convert(String);
+    ctor public Location(@Nullable String);
+    ctor public Location(@NonNull android.location.Location);
+    method public float bearingTo(@NonNull android.location.Location);
+    method @NonNull public static String convert(@FloatRange double, int);
+    method @FloatRange public static double convert(@NonNull String);
     method public int describeContents();
-    method public static void distanceBetween(double, double, double, double, float[]);
-    method public float distanceTo(android.location.Location);
-    method public void dump(android.util.Printer, String);
-    method public float getAccuracy();
-    method public double getAltitude();
-    method public float getBearing();
-    method public float getBearingAccuracyDegrees();
-    method public long getElapsedRealtimeNanos();
-    method public double getElapsedRealtimeUncertaintyNanos();
-    method public android.os.Bundle getExtras();
-    method public double getLatitude();
-    method public double getLongitude();
-    method public String getProvider();
-    method public float getSpeed();
-    method public float getSpeedAccuracyMetersPerSecond();
-    method public long getTime();
-    method public float getVerticalAccuracyMeters();
+    method public static void distanceBetween(@FloatRange(from=-90.0, to=90.0) double, @FloatRange(from=-180.0, to=180.0) double, @FloatRange(from=-90.0, to=90.0) double, @FloatRange(from=-180.0, to=180.0) double, float[]);
+    method @FloatRange(from=0.0) public float distanceTo(@NonNull android.location.Location);
+    method @Deprecated public void dump(@NonNull android.util.Printer, @Nullable String);
+    method @FloatRange(from=0.0) public float getAccuracy();
+    method @FloatRange public double getAltitude();
+    method @FloatRange(from=0.0, to=360.0, toInclusive=false) public float getBearing();
+    method @FloatRange(from=0.0) public float getBearingAccuracyDegrees();
+    method @IntRange(from=0) public long getElapsedRealtimeAgeMillis();
+    method public long getElapsedRealtimeAgeMillis(@IntRange(from=0) long);
+    method @IntRange(from=0) public long getElapsedRealtimeMillis();
+    method @IntRange(from=0) public long getElapsedRealtimeNanos();
+    method @FloatRange(from=0.0) public double getElapsedRealtimeUncertaintyNanos();
+    method @Nullable public android.os.Bundle getExtras();
+    method @FloatRange(from=-90.0, to=90.0) public double getLatitude();
+    method @FloatRange(from=-180.0, to=180.0) public double getLongitude();
+    method @Nullable public String getProvider();
+    method @FloatRange(from=0.0) public float getSpeed();
+    method @FloatRange(from=0.0) public float getSpeedAccuracyMetersPerSecond();
+    method @IntRange(from=0) public long getTime();
+    method @FloatRange(from=0.0) public float getVerticalAccuracyMeters();
     method public boolean hasAccuracy();
     method public boolean hasAltitude();
     method public boolean hasBearing();
@@ -19924,30 +19520,35 @@
     method public boolean hasSpeed();
     method public boolean hasSpeedAccuracy();
     method public boolean hasVerticalAccuracy();
+    method public boolean isComplete();
     method @Deprecated public boolean isFromMockProvider();
     method public boolean isMock();
-    method @Deprecated public void removeAccuracy();
-    method @Deprecated public void removeAltitude();
-    method @Deprecated public void removeBearing();
-    method @Deprecated public void removeSpeed();
+    method public void removeAccuracy();
+    method public void removeAltitude();
+    method public void removeBearing();
+    method public void removeBearingAccuracy();
+    method public void removeElapsedRealtimeUncertaintyNanos();
+    method public void removeSpeed();
+    method public void removeSpeedAccuracy();
+    method public void removeVerticalAccuracy();
     method public void reset();
-    method public void set(android.location.Location);
-    method public void setAccuracy(float);
-    method public void setAltitude(double);
-    method public void setBearing(float);
-    method public void setBearingAccuracyDegrees(float);
-    method public void setElapsedRealtimeNanos(long);
-    method public void setElapsedRealtimeUncertaintyNanos(double);
+    method public void set(@NonNull android.location.Location);
+    method public void setAccuracy(@FloatRange(from=0.0) float);
+    method public void setAltitude(@FloatRange double);
+    method public void setBearing(@FloatRange(fromInclusive=false, toInclusive=false) float);
+    method public void setBearingAccuracyDegrees(@FloatRange(from=0.0) float);
+    method public void setElapsedRealtimeNanos(@IntRange(from=0) long);
+    method public void setElapsedRealtimeUncertaintyNanos(@FloatRange(from=0.0) double);
     method public void setExtras(@Nullable android.os.Bundle);
-    method public void setLatitude(double);
-    method public void setLongitude(double);
+    method public void setLatitude(@FloatRange(from=-90.0, to=90.0) double);
+    method public void setLongitude(@FloatRange(from=-180.0, to=180.0) double);
     method public void setMock(boolean);
-    method public void setProvider(String);
-    method public void setSpeed(float);
-    method public void setSpeedAccuracyMetersPerSecond(float);
-    method public void setTime(long);
-    method public void setVerticalAccuracyMeters(float);
-    method public void writeToParcel(android.os.Parcel, int);
+    method public void setProvider(@Nullable String);
+    method public void setSpeed(@FloatRange(from=0.0) float);
+    method public void setSpeedAccuracyMetersPerSecond(@FloatRange(from=0.0) float);
+    method public void setTime(@IntRange(from=0) long);
+    method public void setVerticalAccuracyMeters(@FloatRange(from=0.0) float);
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.location.Location> CREATOR;
     field public static final int FORMAT_DEGREES = 0; // 0x0
     field public static final int FORMAT_MINUTES = 1; // 0x1
@@ -20175,8 +19776,10 @@
     method public int getAllowedCapturePolicy();
     method public int getContentType();
     method public int getFlags();
+    method public int getSpatializationBehavior();
     method public int getUsage();
     method public int getVolumeControlStream();
+    method public boolean isContentSpatialized();
     method public void writeToParcel(android.os.Parcel, int);
     field public static final int ALLOW_CAPTURE_BY_ALL = 1; // 0x1
     field public static final int ALLOW_CAPTURE_BY_NONE = 3; // 0x3
@@ -20190,6 +19793,8 @@
     field public static final int FLAG_AUDIBILITY_ENFORCED = 1; // 0x1
     field public static final int FLAG_HW_AV_SYNC = 16; // 0x10
     field @Deprecated public static final int FLAG_LOW_LATENCY = 256; // 0x100
+    field public static final int SPATIALIZATION_BEHAVIOR_AUTO = 0; // 0x0
+    field public static final int SPATIALIZATION_BEHAVIOR_NEVER = 1; // 0x1
     field public static final int USAGE_ALARM = 4; // 0x4
     field public static final int USAGE_ASSISTANCE_ACCESSIBILITY = 11; // 0xb
     field public static final int USAGE_ASSISTANCE_NAVIGATION_GUIDANCE = 12; // 0xc
@@ -20198,9 +19803,9 @@
     field public static final int USAGE_GAME = 14; // 0xe
     field public static final int USAGE_MEDIA = 1; // 0x1
     field public static final int USAGE_NOTIFICATION = 5; // 0x5
-    field public static final int USAGE_NOTIFICATION_COMMUNICATION_DELAYED = 9; // 0x9
-    field public static final int USAGE_NOTIFICATION_COMMUNICATION_INSTANT = 8; // 0x8
-    field public static final int USAGE_NOTIFICATION_COMMUNICATION_REQUEST = 7; // 0x7
+    field @Deprecated public static final int USAGE_NOTIFICATION_COMMUNICATION_DELAYED = 9; // 0x9
+    field @Deprecated public static final int USAGE_NOTIFICATION_COMMUNICATION_INSTANT = 8; // 0x8
+    field @Deprecated public static final int USAGE_NOTIFICATION_COMMUNICATION_REQUEST = 7; // 0x7
     field public static final int USAGE_NOTIFICATION_EVENT = 10; // 0xa
     field public static final int USAGE_NOTIFICATION_RINGTONE = 6; // 0x6
     field public static final int USAGE_UNKNOWN = 0; // 0x0
@@ -20216,14 +19821,19 @@
     method public android.media.AudioAttributes.Builder setContentType(int);
     method public android.media.AudioAttributes.Builder setFlags(int);
     method @NonNull public android.media.AudioAttributes.Builder setHapticChannelsMuted(boolean);
+    method @NonNull public android.media.AudioAttributes.Builder setIsContentSpatialized(boolean);
     method public android.media.AudioAttributes.Builder setLegacyStreamType(int);
+    method @NonNull public android.media.AudioAttributes.Builder setSpatializationBehavior(int);
     method public android.media.AudioAttributes.Builder setUsage(int);
   }
 
-  public class AudioDescriptor {
+  public class AudioDescriptor implements android.os.Parcelable {
+    method public int describeContents();
     method @NonNull public byte[] getDescriptor();
     method public int getEncapsulationType();
     method public int getStandard();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.AudioDescriptor> CREATOR;
     field public static final int STANDARD_EDID = 1; // 0x1
     field public static final int STANDARD_NONE = 0; // 0x0
   }
@@ -20251,6 +19861,7 @@
     method public boolean isSink();
     method public boolean isSource();
     field public static final int TYPE_AUX_LINE = 19; // 0x13
+    field public static final int TYPE_BLE_BROADCAST = 30; // 0x1e
     field public static final int TYPE_BLE_HEADSET = 26; // 0x1a
     field public static final int TYPE_BLE_SPEAKER = 27; // 0x1b
     field public static final int TYPE_BLUETOOTH_A2DP = 8; // 0x8
@@ -20333,24 +19944,45 @@
     field public static final int CHANNEL_IN_Y_AXIS = 4096; // 0x1000
     field public static final int CHANNEL_IN_Z_AXIS = 8192; // 0x2000
     field public static final int CHANNEL_OUT_5POINT1 = 252; // 0xfc
+    field public static final int CHANNEL_OUT_5POINT1POINT2 = 3145980; // 0x3000fc
+    field public static final int CHANNEL_OUT_5POINT1POINT4 = 737532; // 0xb40fc
     field @Deprecated public static final int CHANNEL_OUT_7POINT1 = 1020; // 0x3fc
+    field public static final int CHANNEL_OUT_7POINT1POINT2 = 3152124; // 0x3018fc
+    field public static final int CHANNEL_OUT_7POINT1POINT4 = 743676; // 0xb58fc
     field public static final int CHANNEL_OUT_7POINT1_SURROUND = 6396; // 0x18fc
+    field public static final int CHANNEL_OUT_9POINT1POINT4 = 202070268; // 0xc0b58fc
+    field public static final int CHANNEL_OUT_9POINT1POINT6 = 205215996; // 0xc3b58fc
     field public static final int CHANNEL_OUT_BACK_CENTER = 1024; // 0x400
     field public static final int CHANNEL_OUT_BACK_LEFT = 64; // 0x40
     field public static final int CHANNEL_OUT_BACK_RIGHT = 128; // 0x80
+    field public static final int CHANNEL_OUT_BOTTOM_FRONT_CENTER = 8388608; // 0x800000
+    field public static final int CHANNEL_OUT_BOTTOM_FRONT_LEFT = 4194304; // 0x400000
+    field public static final int CHANNEL_OUT_BOTTOM_FRONT_RIGHT = 16777216; // 0x1000000
     field public static final int CHANNEL_OUT_DEFAULT = 1; // 0x1
     field public static final int CHANNEL_OUT_FRONT_CENTER = 16; // 0x10
     field public static final int CHANNEL_OUT_FRONT_LEFT = 4; // 0x4
     field public static final int CHANNEL_OUT_FRONT_LEFT_OF_CENTER = 256; // 0x100
     field public static final int CHANNEL_OUT_FRONT_RIGHT = 8; // 0x8
     field public static final int CHANNEL_OUT_FRONT_RIGHT_OF_CENTER = 512; // 0x200
+    field public static final int CHANNEL_OUT_FRONT_WIDE_LEFT = 67108864; // 0x4000000
+    field public static final int CHANNEL_OUT_FRONT_WIDE_RIGHT = 134217728; // 0x8000000
     field public static final int CHANNEL_OUT_LOW_FREQUENCY = 32; // 0x20
+    field public static final int CHANNEL_OUT_LOW_FREQUENCY_2 = 33554432; // 0x2000000
     field public static final int CHANNEL_OUT_MONO = 4; // 0x4
     field public static final int CHANNEL_OUT_QUAD = 204; // 0xcc
     field public static final int CHANNEL_OUT_SIDE_LEFT = 2048; // 0x800
     field public static final int CHANNEL_OUT_SIDE_RIGHT = 4096; // 0x1000
     field public static final int CHANNEL_OUT_STEREO = 12; // 0xc
     field public static final int CHANNEL_OUT_SURROUND = 1052; // 0x41c
+    field public static final int CHANNEL_OUT_TOP_BACK_CENTER = 262144; // 0x40000
+    field public static final int CHANNEL_OUT_TOP_BACK_LEFT = 131072; // 0x20000
+    field public static final int CHANNEL_OUT_TOP_BACK_RIGHT = 524288; // 0x80000
+    field public static final int CHANNEL_OUT_TOP_CENTER = 8192; // 0x2000
+    field public static final int CHANNEL_OUT_TOP_FRONT_CENTER = 32768; // 0x8000
+    field public static final int CHANNEL_OUT_TOP_FRONT_LEFT = 16384; // 0x4000
+    field public static final int CHANNEL_OUT_TOP_FRONT_RIGHT = 65536; // 0x10000
+    field public static final int CHANNEL_OUT_TOP_SIDE_LEFT = 1048576; // 0x100000
+    field public static final int CHANNEL_OUT_TOP_SIDE_RIGHT = 2097152; // 0x200000
     field @NonNull public static final android.os.Parcelable.Creator<android.media.AudioFormat> CREATOR;
     field public static final int ENCODING_AAC_ELD = 15; // 0xf
     field public static final int ENCODING_AAC_HE_V1 = 11; // 0xb
@@ -20408,18 +20040,22 @@
     method @NonNull public java.util.List<android.media.AudioPlaybackConfiguration> getActivePlaybackConfigurations();
     method @NonNull public java.util.List<android.media.AudioRecordingConfiguration> getActiveRecordingConfigurations();
     method public int getAllowedCapturePolicy();
+    method @NonNull public java.util.List<android.media.AudioDeviceInfo> getAudioDevicesForAttributes(@NonNull android.media.AudioAttributes);
     method public int getAudioHwSyncForSession(int);
     method @NonNull public java.util.List<android.media.AudioDeviceInfo> getAvailableCommunicationDevices();
     method @Nullable public android.media.AudioDeviceInfo getCommunicationDevice();
     method public android.media.AudioDeviceInfo[] getDevices(int);
+    method public static int getDirectPlaybackSupport(@NonNull android.media.AudioFormat, @NonNull android.media.AudioAttributes);
+    method @NonNull public java.util.List<android.media.AudioProfile> getDirectProfilesForAttributes(@NonNull android.media.AudioAttributes);
     method public int getEncodedSurroundMode();
     method public java.util.List<android.media.MicrophoneInfo> getMicrophones() throws java.io.IOException;
     method public int getMode();
     method public String getParameters(String);
-    method public static int getPlaybackOffloadSupport(@NonNull android.media.AudioFormat, @NonNull android.media.AudioAttributes);
+    method @Deprecated public static int getPlaybackOffloadSupport(@NonNull android.media.AudioFormat, @NonNull android.media.AudioAttributes);
     method public String getProperty(String);
     method public int getRingerMode();
     method @Deprecated public int getRouting(int);
+    method @NonNull public android.media.Spatializer getSpatializer();
     method public int getStreamMaxVolume(int);
     method public int getStreamMinVolume(int);
     method public int getStreamVolume(int);
@@ -20433,6 +20069,7 @@
     method public boolean isMicrophoneMute();
     method public boolean isMusicActive();
     method public static boolean isOffloadedPlaybackSupported(@NonNull android.media.AudioFormat, @NonNull android.media.AudioAttributes);
+    method public boolean isRampingRingerEnabled();
     method public boolean isSpeakerphoneOn();
     method public boolean isStreamMute(int);
     method public boolean isSurroundFormatEnabled(int);
@@ -20505,6 +20142,10 @@
     field public static final int AUDIOFOCUS_REQUEST_FAILED = 0; // 0x0
     field public static final int AUDIOFOCUS_REQUEST_GRANTED = 1; // 0x1
     field public static final int AUDIO_SESSION_ID_GENERATE = 0; // 0x0
+    field public static final int DIRECT_PLAYBACK_BITSTREAM_SUPPORTED = 4; // 0x4
+    field public static final int DIRECT_PLAYBACK_NOT_SUPPORTED = 0; // 0x0
+    field public static final int DIRECT_PLAYBACK_OFFLOAD_GAPLESS_SUPPORTED = 3; // 0x3
+    field public static final int DIRECT_PLAYBACK_OFFLOAD_SUPPORTED = 1; // 0x1
     field public static final int ENCODED_SURROUND_OUTPUT_ALWAYS = 2; // 0x2
     field public static final int ENCODED_SURROUND_OUTPUT_AUTO = 0; // 0x0
     field public static final int ENCODED_SURROUND_OUTPUT_MANUAL = 3; // 0x3
@@ -20539,7 +20180,9 @@
     field public static final int GET_DEVICES_ALL = 3; // 0x3
     field public static final int GET_DEVICES_INPUTS = 1; // 0x1
     field public static final int GET_DEVICES_OUTPUTS = 2; // 0x2
+    field public static final int MODE_CALL_REDIRECT = 5; // 0x5
     field public static final int MODE_CALL_SCREENING = 4; // 0x4
+    field public static final int MODE_COMMUNICATION_REDIRECT = 6; // 0x6
     field public static final int MODE_CURRENT = -1; // 0xffffffff
     field public static final int MODE_INVALID = -2; // 0xfffffffe
     field public static final int MODE_IN_CALL = 2; // 0x2
@@ -20706,14 +20349,17 @@
     method @NonNull public android.media.AudioPresentation.Builder setProgramId(int);
   }
 
-  public class AudioProfile {
+  public class AudioProfile implements android.os.Parcelable {
+    method public int describeContents();
     method @NonNull public int[] getChannelIndexMasks();
     method @NonNull public int[] getChannelMasks();
     method public int getEncapsulationType();
     method public int getFormat();
     method @NonNull public int[] getSampleRates();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
     field public static final int AUDIO_ENCAPSULATION_TYPE_IEC61937 = 1; // 0x1
     field public static final int AUDIO_ENCAPSULATION_TYPE_NONE = 0; // 0x0
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.AudioProfile> CREATOR;
   }
 
   public class AudioRecord implements android.media.AudioRecordingMonitor android.media.AudioRouting android.media.MicrophoneDirection {
@@ -20893,7 +20539,7 @@
     method public int getStreamType();
     method public boolean getTimestamp(android.media.AudioTimestamp);
     method public int getUnderrunCount();
-    method public static boolean isDirectPlaybackSupported(@NonNull android.media.AudioFormat, @NonNull android.media.AudioAttributes);
+    method @Deprecated public static boolean isDirectPlaybackSupported(@NonNull android.media.AudioFormat, @NonNull android.media.AudioAttributes);
     method public boolean isOffloadedPlayback();
     method public void pause() throws java.lang.IllegalStateException;
     method public void play() throws java.lang.IllegalStateException;
@@ -21104,13 +20750,24 @@
   }
 
   public static final class EncoderProfiles.VideoProfile {
+    method public int getBitDepth();
     method public int getBitrate();
+    method public int getChromaSubsampling();
     method public int getCodec();
     method public int getFrameRate();
+    method public int getHdrFormat();
     method public int getHeight();
     method @NonNull public String getMediaType();
     method public int getProfile();
     method public int getWidth();
+    field public static final int HDR_DOLBY_VISION = 4; // 0x4
+    field public static final int HDR_HDR10 = 2; // 0x2
+    field public static final int HDR_HDR10PLUS = 3; // 0x3
+    field public static final int HDR_HLG = 1; // 0x1
+    field public static final int HDR_NONE = 0; // 0x0
+    field public static final int YUV_420 = 0; // 0x0
+    field public static final int YUV_422 = 1; // 0x1
+    field public static final int YUV_444 = 2; // 0x2
   }
 
   public class ExifInterface {
@@ -21317,6 +20974,8 @@
   public abstract class Image implements java.lang.AutoCloseable {
     method public abstract void close();
     method public android.graphics.Rect getCropRect();
+    method public int getDataSpace();
+    method @NonNull public android.hardware.SyncFence getFence() throws java.io.IOException;
     method public abstract int getFormat();
     method @Nullable public android.hardware.HardwareBuffer getHardwareBuffer();
     method public abstract int getHeight();
@@ -21324,6 +20983,8 @@
     method public abstract long getTimestamp();
     method public abstract int getWidth();
     method public void setCropRect(android.graphics.Rect);
+    method public void setDataSpace(int);
+    method public void setFence(@NonNull android.hardware.SyncFence) throws java.io.IOException;
     method public void setTimestamp(long);
   }
 
@@ -21338,16 +20999,29 @@
     method public android.media.Image acquireNextImage();
     method public void close();
     method public void discardFreeBuffers();
+    method public int getDataSpace();
+    method public int getHardwareBufferFormat();
     method public int getHeight();
     method public int getImageFormat();
     method public int getMaxImages();
     method public android.view.Surface getSurface();
+    method public long getUsage();
     method public int getWidth();
     method @NonNull public static android.media.ImageReader newInstance(@IntRange(from=1) int, @IntRange(from=1) int, int, @IntRange(from=1) int);
     method @NonNull public static android.media.ImageReader newInstance(@IntRange(from=1) int, @IntRange(from=1) int, int, @IntRange(from=1) int, long);
     method public void setOnImageAvailableListener(android.media.ImageReader.OnImageAvailableListener, android.os.Handler);
   }
 
+  public static final class ImageReader.Builder {
+    ctor public ImageReader.Builder(@IntRange(from=1) int, @IntRange(from=1) int);
+    method @NonNull public android.media.ImageReader build();
+    method @NonNull public android.media.ImageReader.Builder setDefaultDataSpace(int);
+    method @NonNull public android.media.ImageReader.Builder setDefaultHardwareBufferFormat(int);
+    method @NonNull public android.media.ImageReader.Builder setImageFormat(int);
+    method @NonNull public android.media.ImageReader.Builder setMaxImages(int);
+    method @NonNull public android.media.ImageReader.Builder setUsage(long);
+  }
+
   public static interface ImageReader.OnImageAvailableListener {
     method public void onImageAvailable(android.media.ImageReader);
   }
@@ -21355,14 +21029,30 @@
   public class ImageWriter implements java.lang.AutoCloseable {
     method public void close();
     method public android.media.Image dequeueInputImage();
+    method public int getDataSpace();
     method public int getFormat();
+    method public int getHardwareBufferFormat();
+    method public int getHeight();
     method public int getMaxImages();
+    method public long getUsage();
+    method public int getWidth();
     method @NonNull public static android.media.ImageWriter newInstance(@NonNull android.view.Surface, @IntRange(from=1) int);
     method @NonNull public static android.media.ImageWriter newInstance(@NonNull android.view.Surface, @IntRange(from=1) int, int);
     method public void queueInputImage(android.media.Image);
     method public void setOnImageReleasedListener(android.media.ImageWriter.OnImageReleasedListener, android.os.Handler);
   }
 
+  public static final class ImageWriter.Builder {
+    ctor public ImageWriter.Builder(@NonNull android.view.Surface);
+    method @NonNull public android.media.ImageWriter build();
+    method @NonNull public android.media.ImageWriter.Builder setDataSpace(int);
+    method @NonNull public android.media.ImageWriter.Builder setHardwareBufferFormat(int);
+    method @NonNull public android.media.ImageWriter.Builder setImageFormat(int);
+    method @NonNull public android.media.ImageWriter.Builder setMaxImages(@IntRange(from=1) int);
+    method @NonNull public android.media.ImageWriter.Builder setUsage(long);
+    method @NonNull public android.media.ImageWriter.Builder setWidthAndHeight(@IntRange(from=1) int, @IntRange(from=1) int);
+  }
+
   public static interface ImageWriter.OnImageReleasedListener {
     method public void onImageReleased(android.media.ImageWriter);
   }
@@ -21399,6 +21089,7 @@
   public class MediaActionSound {
     ctor public MediaActionSound();
     method public void load(int);
+    method public static boolean mustPlayShutterSound();
     method public void play(int);
     method public void release();
     field public static final int FOCUS_COMPLETE = 1; // 0x1
@@ -21734,9 +21425,11 @@
     field public static final int COLOR_Format24bitBGR888 = 12; // 0xc
     field @Deprecated public static final int COLOR_Format24bitRGB888 = 11; // 0xb
     field @Deprecated public static final int COLOR_Format25bitARGB1888 = 14; // 0xe
+    field public static final int COLOR_Format32bitABGR2101010 = 2130750114; // 0x7f00aaa2
     field public static final int COLOR_Format32bitABGR8888 = 2130747392; // 0x7f00a000
     field @Deprecated public static final int COLOR_Format32bitARGB8888 = 16; // 0x10
     field @Deprecated public static final int COLOR_Format32bitBGRA8888 = 15; // 0xf
+    field public static final int COLOR_Format64bitABGRFloat = 2130710294; // 0x7f000f16
     field @Deprecated public static final int COLOR_Format8bitRGB332 = 2; // 0x2
     field @Deprecated public static final int COLOR_FormatCbYCrY = 27; // 0x1b
     field @Deprecated public static final int COLOR_FormatCrYCbY = 28; // 0x1c
@@ -21769,11 +21462,14 @@
     field @Deprecated public static final int COLOR_FormatYUV422SemiPlanar = 24; // 0x18
     field public static final int COLOR_FormatYUV444Flexible = 2135181448; // 0x7f444888
     field @Deprecated public static final int COLOR_FormatYUV444Interleaved = 29; // 0x1d
+    field public static final int COLOR_FormatYUVP010 = 54; // 0x36
     field @Deprecated public static final int COLOR_QCOM_FormatYUV420SemiPlanar = 2141391872; // 0x7fa30c00
     field @Deprecated public static final int COLOR_TI_FormatYUV420PackedSemiPlanar = 2130706688; // 0x7f000100
     field public static final String FEATURE_AdaptivePlayback = "adaptive-playback";
     field public static final String FEATURE_DynamicTimestamp = "dynamic-timestamp";
+    field public static final String FEATURE_EncodingStatistics = "encoding-statistics";
     field public static final String FEATURE_FrameParsing = "frame-parsing";
+    field public static final String FEATURE_HdrEditing = "hdr-editing";
     field public static final String FEATURE_IntraRefresh = "intra-refresh";
     field public static final String FEATURE_LowLatency = "low-latency";
     field public static final String FEATURE_MultipleFrames = "multiple-frames";
@@ -21856,11 +21552,14 @@
     field public static final int AVCProfileHigh422 = 32; // 0x20
     field public static final int AVCProfileHigh444 = 64; // 0x40
     field public static final int AVCProfileMain = 2; // 0x2
+    field public static final int DolbyVisionLevel8k30 = 1024; // 0x400
+    field public static final int DolbyVisionLevel8k60 = 2048; // 0x800
     field public static final int DolbyVisionLevelFhd24 = 4; // 0x4
     field public static final int DolbyVisionLevelFhd30 = 8; // 0x8
     field public static final int DolbyVisionLevelFhd60 = 16; // 0x10
     field public static final int DolbyVisionLevelHd24 = 1; // 0x1
     field public static final int DolbyVisionLevelHd30 = 2; // 0x2
+    field public static final int DolbyVisionLevelUhd120 = 512; // 0x200
     field public static final int DolbyVisionLevelUhd24 = 32; // 0x20
     field public static final int DolbyVisionLevelUhd30 = 64; // 0x40
     field public static final int DolbyVisionLevelUhd48 = 128; // 0x80
@@ -22159,9 +21858,9 @@
     method @NonNull public byte[] getPropertyByteArray(String);
     method @NonNull public String getPropertyString(@NonNull String);
     method @NonNull public android.media.MediaDrm.ProvisionRequest getProvisionRequest();
-    method @NonNull public byte[] getSecureStop(@NonNull byte[]);
-    method @NonNull public java.util.List<byte[]> getSecureStopIds();
-    method @NonNull public java.util.List<byte[]> getSecureStops();
+    method @Deprecated @NonNull public byte[] getSecureStop(@NonNull byte[]);
+    method @Deprecated @NonNull public java.util.List<byte[]> getSecureStopIds();
+    method @Deprecated @NonNull public java.util.List<byte[]> getSecureStops();
     method @android.media.MediaDrm.SecurityLevel public int getSecurityLevel(@NonNull byte[]);
     method @NonNull public static java.util.List<java.util.UUID> getSupportedCryptoSchemes();
     method public static boolean isCryptoSchemeSupported(@NonNull java.util.UUID);
@@ -22174,11 +21873,11 @@
     method @NonNull public java.util.HashMap<java.lang.String,java.lang.String> queryKeyStatus(@NonNull byte[]);
     method @Deprecated public void release();
     method @Deprecated public void releaseAllSecureStops();
-    method public void releaseSecureStops(@NonNull byte[]);
-    method public void removeAllSecureStops();
+    method @Deprecated public void releaseSecureStops(@NonNull byte[]);
+    method @Deprecated public void removeAllSecureStops();
     method public void removeKeys(@NonNull byte[]);
     method public void removeOfflineLicense(@NonNull byte[]);
-    method public void removeSecureStop(@NonNull byte[]);
+    method @Deprecated public void removeSecureStop(@NonNull byte[]);
     method public boolean requiresSecureDecoder(@NonNull String);
     method public boolean requiresSecureDecoder(@NonNull String, @android.media.MediaDrm.SecurityLevel int);
     method public void restoreKeys(@NonNull byte[], @NonNull byte[]);
@@ -22420,7 +22119,7 @@
     method public void setDataSource(@NonNull java.io.FileDescriptor) throws java.io.IOException;
     method public void setDataSource(@NonNull java.io.FileDescriptor, long, long) throws java.io.IOException;
     method public void setLogSessionId(@NonNull android.media.metrics.LogSessionId);
-    method public void setMediaCas(@NonNull android.media.MediaCas);
+    method @Deprecated public void setMediaCas(@NonNull android.media.MediaCas);
     method public void unselectTrack(int);
     field public static final int SAMPLE_FLAG_ENCRYPTED = 2; // 0x2
     field public static final int SAMPLE_FLAG_PARTIAL_FRAME = 4; // 0x4
@@ -22492,7 +22191,7 @@
     field public static final String KEY_AAC_DRC_OUTPUT_LOUDNESS = "aac-drc-output-loudness";
     field public static final String KEY_AAC_DRC_TARGET_REFERENCE_LEVEL = "aac-target-ref-level";
     field public static final String KEY_AAC_ENCODED_TARGET_LEVEL = "aac-encoded-target-level";
-    field public static final String KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT = "aac-max-output-channel_count";
+    field @Deprecated public static final String KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT = "aac-max-output-channel_count";
     field public static final String KEY_AAC_PROFILE = "aac-profile";
     field public static final String KEY_AAC_SBR_MODE = "aac-sbr-mode";
     field public static final String KEY_ALLOW_FRAME_DROP = "allow-frame-drop";
@@ -22537,6 +22236,7 @@
     field public static final String KEY_MAX_FPS_TO_ENCODER = "max-fps-to-encoder";
     field public static final String KEY_MAX_HEIGHT = "max-height";
     field public static final String KEY_MAX_INPUT_SIZE = "max-input-size";
+    field public static final String KEY_MAX_OUTPUT_CHANNEL_COUNT = "max-output-channel-count";
     field public static final String KEY_MAX_PTS_GAP_TO_ENCODER = "max-pts-gap-to-encoder";
     field public static final String KEY_MAX_WIDTH = "max-width";
     field public static final String KEY_MIME = "mime";
@@ -22546,6 +22246,7 @@
     field public static final String KEY_OPERATING_RATE = "operating-rate";
     field public static final String KEY_OUTPUT_REORDER_DEPTH = "output-reorder-depth";
     field public static final String KEY_PCM_ENCODING = "pcm-encoding";
+    field public static final String KEY_PICTURE_TYPE = "picture-type";
     field public static final String KEY_PIXEL_ASPECT_RATIO_HEIGHT = "sar-height";
     field public static final String KEY_PIXEL_ASPECT_RATIO_WIDTH = "sar-width";
     field public static final String KEY_PREPEND_HEADER_TO_SYNC_FRAMES = "prepend-sps-pps-to-idr-frames";
@@ -22563,6 +22264,8 @@
     field public static final String KEY_TILE_HEIGHT = "tile-height";
     field public static final String KEY_TILE_WIDTH = "tile-width";
     field public static final String KEY_TRACK_ID = "track-id";
+    field public static final String KEY_VIDEO_ENCODING_STATISTICS_LEVEL = "video-encoding-statistics-level";
+    field public static final String KEY_VIDEO_QP_AVERAGE = "video-qp-average";
     field public static final String KEY_VIDEO_QP_B_MAX = "video-qp-b-max";
     field public static final String KEY_VIDEO_QP_B_MIN = "video-qp-b-min";
     field public static final String KEY_VIDEO_QP_I_MAX = "video-qp-i-max";
@@ -22573,16 +22276,32 @@
     field public static final String KEY_VIDEO_QP_P_MIN = "video-qp-p-min";
     field public static final String KEY_WIDTH = "width";
     field public static final String MIMETYPE_AUDIO_AAC = "audio/mp4a-latm";
+    field public static final String MIMETYPE_AUDIO_AAC_ELD = "audio/mp4a.40.39";
+    field public static final String MIMETYPE_AUDIO_AAC_HE_V1 = "audio/mp4a.40.05";
+    field public static final String MIMETYPE_AUDIO_AAC_HE_V2 = "audio/mp4a.40.29";
+    field public static final String MIMETYPE_AUDIO_AAC_LC = "audio/mp4a.40.02";
+    field public static final String MIMETYPE_AUDIO_AAC_XHE = "audio/mp4a.40.42";
     field public static final String MIMETYPE_AUDIO_AC3 = "audio/ac3";
     field public static final String MIMETYPE_AUDIO_AC4 = "audio/ac4";
     field public static final String MIMETYPE_AUDIO_AMR_NB = "audio/3gpp";
     field public static final String MIMETYPE_AUDIO_AMR_WB = "audio/amr-wb";
+    field public static final String MIMETYPE_AUDIO_DOLBY_MAT = "audio/vnd.dolby.mat";
+    field public static final String MIMETYPE_AUDIO_DOLBY_TRUEHD = "audio/vnd.dolby.mlp";
+    field public static final String MIMETYPE_AUDIO_DRA = "audio/vnd.dra";
+    field public static final String MIMETYPE_AUDIO_DTS = "audio/vnd.dts";
+    field public static final String MIMETYPE_AUDIO_DTS_HD = "audio/vnd.dts.hd";
+    field public static final String MIMETYPE_AUDIO_DTS_UHD = "audio/vnd.dts.uhd";
     field public static final String MIMETYPE_AUDIO_EAC3 = "audio/eac3";
     field public static final String MIMETYPE_AUDIO_EAC3_JOC = "audio/eac3-joc";
     field public static final String MIMETYPE_AUDIO_FLAC = "audio/flac";
     field public static final String MIMETYPE_AUDIO_G711_ALAW = "audio/g711-alaw";
     field public static final String MIMETYPE_AUDIO_G711_MLAW = "audio/g711-mlaw";
+    field public static final String MIMETYPE_AUDIO_IEC61937 = "audio/x-iec61937";
     field public static final String MIMETYPE_AUDIO_MPEG = "audio/mpeg";
+    field public static final String MIMETYPE_AUDIO_MPEGH_BL_L3 = "audio/mhm1.03";
+    field public static final String MIMETYPE_AUDIO_MPEGH_BL_L4 = "audio/mhm1.04";
+    field public static final String MIMETYPE_AUDIO_MPEGH_LC_L3 = "audio/mhm1.0d";
+    field public static final String MIMETYPE_AUDIO_MPEGH_LC_L4 = "audio/mhm1.0e";
     field public static final String MIMETYPE_AUDIO_MPEGH_MHA1 = "audio/mha1";
     field public static final String MIMETYPE_AUDIO_MPEGH_MHM1 = "audio/mhm1";
     field public static final String MIMETYPE_AUDIO_MSGSM = "audio/gsm";
@@ -22607,12 +22326,18 @@
     field public static final String MIMETYPE_VIDEO_SCRAMBLED = "video/scrambled";
     field public static final String MIMETYPE_VIDEO_VP8 = "video/x-vnd.on2.vp8";
     field public static final String MIMETYPE_VIDEO_VP9 = "video/x-vnd.on2.vp9";
+    field public static final int PICTURE_TYPE_B = 3; // 0x3
+    field public static final int PICTURE_TYPE_I = 1; // 0x1
+    field public static final int PICTURE_TYPE_P = 2; // 0x2
+    field public static final int PICTURE_TYPE_UNKNOWN = 0; // 0x0
     field public static final int TYPE_BYTE_BUFFER = 5; // 0x5
     field public static final int TYPE_FLOAT = 3; // 0x3
     field public static final int TYPE_INTEGER = 1; // 0x1
     field public static final int TYPE_LONG = 2; // 0x2
     field public static final int TYPE_NULL = 0; // 0x0
     field public static final int TYPE_STRING = 4; // 0x4
+    field public static final int VIDEO_ENCODING_STATISTICS_LEVEL_1 = 1; // 0x1
+    field public static final int VIDEO_ENCODING_STATISTICS_LEVEL_NONE = 0; // 0x0
   }
 
   public final class MediaMetadata implements android.os.Parcelable {
@@ -22693,7 +22418,7 @@
 
   public class MediaMetadataRetriever implements java.lang.AutoCloseable {
     ctor public MediaMetadataRetriever();
-    method public void close();
+    method public void close() throws java.io.IOException;
     method @Nullable public String extractMetadata(int);
     method @Nullable public byte[] getEmbeddedPicture();
     method @Nullable public android.graphics.Bitmap getFrameAtIndex(int, @NonNull android.media.MediaMetadataRetriever.BitmapParams);
@@ -22710,7 +22435,7 @@
     method @Nullable public android.graphics.Bitmap getPrimaryImage();
     method @Nullable public android.graphics.Bitmap getScaledFrameAtTime(long, int, @IntRange(from=1) int, @IntRange(from=1) int);
     method @Nullable public android.graphics.Bitmap getScaledFrameAtTime(long, int, @IntRange(from=1) int, @IntRange(from=1) int, @NonNull android.media.MediaMetadataRetriever.BitmapParams);
-    method public void release();
+    method public void release() throws java.io.IOException;
     method public void setDataSource(String) throws java.lang.IllegalArgumentException;
     method public void setDataSource(String, java.util.Map<java.lang.String,java.lang.String>) throws java.lang.IllegalArgumentException;
     method public void setDataSource(java.io.FileDescriptor, long, long) throws java.lang.IllegalArgumentException;
@@ -23153,12 +22878,15 @@
   }
 
   public final class MediaRecorder.VideoEncoder {
+    field public static final int AV1 = 8; // 0x8
     field public static final int DEFAULT = 0; // 0x0
+    field public static final int DOLBY_VISION = 7; // 0x7
     field public static final int H263 = 1; // 0x1
     field public static final int H264 = 2; // 0x2
     field public static final int HEVC = 5; // 0x5
     field public static final int MPEG_4_SP = 3; // 0x3
     field public static final int VP8 = 4; // 0x4
+    field public static final int VP9 = 6; // 0x6
   }
 
   public final class MediaRecorder.VideoSource {
@@ -23171,6 +22899,7 @@
     method public int describeContents();
     method @Nullable public String getClientPackageName();
     method public int getConnectionState();
+    method @NonNull public java.util.Set<java.lang.String> getDeduplicationIds();
     method @Nullable public CharSequence getDescription();
     method @Nullable public android.os.Bundle getExtras();
     method @NonNull public java.util.List<java.lang.String> getFeatures();
@@ -23204,6 +22933,7 @@
     method @NonNull public android.media.MediaRoute2Info.Builder clearFeatures();
     method @NonNull public android.media.MediaRoute2Info.Builder setClientPackageName(@Nullable String);
     method @NonNull public android.media.MediaRoute2Info.Builder setConnectionState(int);
+    method @NonNull public android.media.MediaRoute2Info.Builder setDeduplicationIds(@NonNull java.util.Set<java.lang.String>);
     method @NonNull public android.media.MediaRoute2Info.Builder setDescription(@Nullable CharSequence);
     method @NonNull public android.media.MediaRoute2Info.Builder setExtras(@Nullable android.os.Bundle);
     method @NonNull public android.media.MediaRoute2Info.Builder setIconUri(@Nullable android.net.Uri);
@@ -23701,6 +23431,7 @@
     method public static android.net.Uri getValidRingtoneUri(android.content.Context);
     method public boolean hasHapticChannels(int);
     method public static boolean hasHapticChannels(@NonNull android.net.Uri);
+    method public static boolean hasHapticChannels(@NonNull android.content.Context, @NonNull android.net.Uri);
     method public int inferStreamType();
     method public static boolean isDefault(android.net.Uri);
     method @Nullable public static android.content.res.AssetFileDescriptor openDefaultRingtoneUri(@NonNull android.content.Context, @NonNull android.net.Uri) throws java.io.FileNotFoundException;
@@ -23729,8 +23460,11 @@
 
   public final class RouteDiscoveryPreference implements android.os.Parcelable {
     method public int describeContents();
+    method @NonNull public java.util.List<java.lang.String> getAllowedPackages();
+    method @NonNull public java.util.List<java.lang.String> getDeduplicationPackageOrder();
     method @NonNull public java.util.List<java.lang.String> getPreferredFeatures();
     method public boolean shouldPerformActiveScan();
+    method public boolean shouldRemoveDuplicates();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.media.RouteDiscoveryPreference> CREATOR;
   }
@@ -23739,6 +23473,8 @@
     ctor public RouteDiscoveryPreference.Builder(@NonNull java.util.List<java.lang.String>, boolean);
     ctor public RouteDiscoveryPreference.Builder(@NonNull android.media.RouteDiscoveryPreference);
     method @NonNull public android.media.RouteDiscoveryPreference build();
+    method @NonNull public android.media.RouteDiscoveryPreference.Builder setAllowedPackages(@NonNull java.util.List<java.lang.String>);
+    method @NonNull public android.media.RouteDiscoveryPreference.Builder setDeduplicationPackageOrder(@NonNull java.util.List<java.lang.String>);
     method @NonNull public android.media.RouteDiscoveryPreference.Builder setPreferredFeatures(@NonNull java.util.List<java.lang.String>);
     method @NonNull public android.media.RouteDiscoveryPreference.Builder setShouldPerformActiveScan(boolean);
   }
@@ -23816,6 +23552,30 @@
     method public void onLoadComplete(android.media.SoundPool, int, int);
   }
 
+  public class Spatializer {
+    method public void addOnHeadTrackerAvailableListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.Spatializer.OnHeadTrackerAvailableListener);
+    method public void addOnSpatializerStateChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.Spatializer.OnSpatializerStateChangedListener);
+    method public boolean canBeSpatialized(@NonNull android.media.AudioAttributes, @NonNull android.media.AudioFormat);
+    method public int getImmersiveAudioLevel();
+    method public boolean isAvailable();
+    method public boolean isEnabled();
+    method public boolean isHeadTrackerAvailable();
+    method public void removeOnHeadTrackerAvailableListener(@NonNull android.media.Spatializer.OnHeadTrackerAvailableListener);
+    method public void removeOnSpatializerStateChangedListener(@NonNull android.media.Spatializer.OnSpatializerStateChangedListener);
+    field public static final int SPATIALIZER_IMMERSIVE_LEVEL_MULTICHANNEL = 1; // 0x1
+    field public static final int SPATIALIZER_IMMERSIVE_LEVEL_NONE = 0; // 0x0
+    field public static final int SPATIALIZER_IMMERSIVE_LEVEL_OTHER = -1; // 0xffffffff
+  }
+
+  public static interface Spatializer.OnHeadTrackerAvailableListener {
+    method public void onHeadTrackerAvailableChanged(@NonNull android.media.Spatializer, boolean);
+  }
+
+  public static interface Spatializer.OnSpatializerStateChangedListener {
+    method public void onSpatializerAvailableChanged(@NonNull android.media.Spatializer, boolean);
+    method public void onSpatializerEnabledChanged(@NonNull android.media.Spatializer, boolean);
+  }
+
   public final class SubtitleData {
     ctor public SubtitleData(int, long, long, @NonNull byte[]);
     method @NonNull public byte[] getData();
@@ -24680,6 +24440,17 @@
 
 package android.media.metrics {
 
+  public final class BundleSession implements java.lang.AutoCloseable {
+    method public void close();
+    method @NonNull public android.media.metrics.LogSessionId getSessionId();
+    method public void reportBundleMetrics(@NonNull android.os.PersistableBundle);
+  }
+
+  public final class EditingSession implements java.lang.AutoCloseable {
+    method public void close();
+    method @NonNull public android.media.metrics.LogSessionId getSessionId();
+  }
+
   public abstract class Event {
     method @NonNull public android.os.Bundle getMetricsBundle();
     method @IntRange(from=0xffffffff) public long getTimeSinceCreatedMillis();
@@ -24691,8 +24462,11 @@
   }
 
   public final class MediaMetricsManager {
+    method @NonNull public android.media.metrics.BundleSession createBundleSession();
+    method @NonNull public android.media.metrics.EditingSession createEditingSession();
     method @NonNull public android.media.metrics.PlaybackSession createPlaybackSession();
     method @NonNull public android.media.metrics.RecordingSession createRecordingSession();
+    method @NonNull public android.media.metrics.TranscodingSession createTranscodingSession();
     field public static final long INVALID_TIMESTAMP = -1L; // 0xffffffffffffffffL
   }
 
@@ -24940,6 +24714,11 @@
     method @NonNull public android.media.metrics.TrackChangeEvent.Builder setWidth(@IntRange(from=0xffffffff, to=java.lang.Integer.MAX_VALUE) int);
   }
 
+  public final class TranscodingSession implements java.lang.AutoCloseable {
+    method public void close();
+    method @NonNull public android.media.metrics.LogSessionId getSessionId();
+  }
+
 }
 
 package android.media.midi {
@@ -24958,6 +24737,7 @@
 
   public final class MidiDeviceInfo implements android.os.Parcelable {
     method public int describeContents();
+    method public int getDefaultProtocol();
     method public int getId();
     method public int getInputPortCount();
     method public int getOutputPortCount();
@@ -24974,6 +24754,14 @@
     field public static final String PROPERTY_SERIAL_NUMBER = "serial_number";
     field public static final String PROPERTY_USB_DEVICE = "usb_device";
     field public static final String PROPERTY_VERSION = "version";
+    field public static final int PROTOCOL_UMP_MIDI_1_0_UP_TO_128_BITS = 3; // 0x3
+    field public static final int PROTOCOL_UMP_MIDI_1_0_UP_TO_128_BITS_AND_JRTS = 4; // 0x4
+    field public static final int PROTOCOL_UMP_MIDI_1_0_UP_TO_64_BITS = 1; // 0x1
+    field public static final int PROTOCOL_UMP_MIDI_1_0_UP_TO_64_BITS_AND_JRTS = 2; // 0x2
+    field public static final int PROTOCOL_UMP_MIDI_2_0 = 17; // 0x11
+    field public static final int PROTOCOL_UMP_MIDI_2_0_AND_JRTS = 18; // 0x12
+    field public static final int PROTOCOL_UMP_USE_MIDI_CI = 0; // 0x0
+    field public static final int PROTOCOL_UNKNOWN = -1; // 0xffffffff
     field public static final int TYPE_BLUETOOTH = 3; // 0x3
     field public static final int TYPE_USB = 1; // 0x1
     field public static final int TYPE_VIRTUAL = 2; // 0x2
@@ -25014,11 +24802,15 @@
   }
 
   public final class MidiManager {
-    method public android.media.midi.MidiDeviceInfo[] getDevices();
+    method @Deprecated public android.media.midi.MidiDeviceInfo[] getDevices();
+    method @NonNull public java.util.Set<android.media.midi.MidiDeviceInfo> getDevicesForTransport(int);
     method public void openBluetoothDevice(android.bluetooth.BluetoothDevice, android.media.midi.MidiManager.OnDeviceOpenedListener, android.os.Handler);
     method public void openDevice(android.media.midi.MidiDeviceInfo, android.media.midi.MidiManager.OnDeviceOpenedListener, android.os.Handler);
-    method public void registerDeviceCallback(android.media.midi.MidiManager.DeviceCallback, android.os.Handler);
+    method @Deprecated public void registerDeviceCallback(android.media.midi.MidiManager.DeviceCallback, android.os.Handler);
+    method public void registerDeviceCallback(int, @NonNull java.util.concurrent.Executor, @NonNull android.media.midi.MidiManager.DeviceCallback);
     method public void unregisterDeviceCallback(android.media.midi.MidiManager.DeviceCallback);
+    field public static final int TRANSPORT_MIDI_BYTE_STREAM = 1; // 0x1
+    field public static final int TRANSPORT_UNIVERSAL_MIDI_PACKETS = 2; // 0x2
   }
 
   public static class MidiManager.DeviceCallback {
@@ -25229,13 +25021,17 @@
   public final class MediaSessionManager {
     method public void addOnActiveSessionsChangedListener(@NonNull android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, @Nullable android.content.ComponentName);
     method public void addOnActiveSessionsChangedListener(@NonNull android.media.session.MediaSessionManager.OnActiveSessionsChangedListener, @Nullable android.content.ComponentName, @Nullable android.os.Handler);
+    method public void addOnMediaKeyEventSessionChangedListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.session.MediaSessionManager.OnMediaKeyEventSessionChangedListener);
     method public void addOnSession2TokensChangedListener(@NonNull android.media.session.MediaSessionManager.OnSession2TokensChangedListener);
     method public void addOnSession2TokensChangedListener(@NonNull android.media.session.MediaSessionManager.OnSession2TokensChangedListener, @NonNull android.os.Handler);
     method @NonNull public java.util.List<android.media.session.MediaController> getActiveSessions(@Nullable android.content.ComponentName);
+    method @Nullable public android.media.session.MediaSession.Token getMediaKeyEventSession();
+    method @NonNull public String getMediaKeyEventSessionPackageName();
     method @NonNull public java.util.List<android.media.Session2Token> getSession2Tokens();
     method public boolean isTrustedForMediaControl(@NonNull android.media.session.MediaSessionManager.RemoteUserInfo);
     method @Deprecated public void notifySession2Created(@NonNull android.media.Session2Token);
     method public void removeOnActiveSessionsChangedListener(@NonNull android.media.session.MediaSessionManager.OnActiveSessionsChangedListener);
+    method public void removeOnMediaKeyEventSessionChangedListener(@NonNull android.media.session.MediaSessionManager.OnMediaKeyEventSessionChangedListener);
     method public void removeOnSession2TokensChangedListener(@NonNull android.media.session.MediaSessionManager.OnSession2TokensChangedListener);
   }
 
@@ -25243,6 +25039,10 @@
     method public void onActiveSessionsChanged(@Nullable java.util.List<android.media.session.MediaController>);
   }
 
+  public static interface MediaSessionManager.OnMediaKeyEventSessionChangedListener {
+    method public void onMediaKeyEventSessionChanged(@NonNull String, @Nullable android.media.session.MediaSession.Token);
+  }
+
   public static interface MediaSessionManager.OnSession2TokensChangedListener {
     method public void onSession2TokensChanged(@NonNull java.util.List<android.media.Session2Token>);
   }
@@ -25338,6 +25138,202 @@
 
 package android.media.tv {
 
+  public final class AdRequest implements android.os.Parcelable {
+    ctor public AdRequest(int, int, @Nullable android.os.ParcelFileDescriptor, long, long, long, @Nullable String, @NonNull android.os.Bundle);
+    method public int describeContents();
+    method public long getEchoIntervalMillis();
+    method @Nullable public android.os.ParcelFileDescriptor getFileDescriptor();
+    method public int getId();
+    method @Nullable public String getMediaFileType();
+    method @NonNull public android.os.Bundle getMetadata();
+    method public int getRequestType();
+    method public long getStartTimeMillis();
+    method public long getStopTimeMillis();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.AdRequest> CREATOR;
+    field public static final int REQUEST_TYPE_START = 1; // 0x1
+    field public static final int REQUEST_TYPE_STOP = 2; // 0x2
+  }
+
+  public final class AdResponse implements android.os.Parcelable {
+    ctor public AdResponse(int, int, long);
+    method public int describeContents();
+    method public long getElapsedTimeMillis();
+    method public int getId();
+    method public int getResponseType();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.AdResponse> CREATOR;
+    field public static final int RESPONSE_TYPE_ERROR = 4; // 0x4
+    field public static final int RESPONSE_TYPE_FINISHED = 2; // 0x2
+    field public static final int RESPONSE_TYPE_PLAYING = 1; // 0x1
+    field public static final int RESPONSE_TYPE_STOPPED = 3; // 0x3
+  }
+
+  public final class AitInfo implements android.os.Parcelable {
+    ctor public AitInfo(int, int);
+    method public int describeContents();
+    method public int getType();
+    method public int getVersion();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.AitInfo> CREATOR;
+  }
+
+  public abstract class BroadcastInfoRequest implements android.os.Parcelable {
+    method public int describeContents();
+    method public int getOption();
+    method public int getRequestId();
+    method public int getType();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.BroadcastInfoRequest> CREATOR;
+    field public static final int REQUEST_OPTION_AUTO_UPDATE = 1; // 0x1
+    field public static final int REQUEST_OPTION_REPEAT = 0; // 0x0
+  }
+
+  public abstract class BroadcastInfoResponse implements android.os.Parcelable {
+    method public int describeContents();
+    method public int getRequestId();
+    method public int getResponseResult();
+    method public int getSequence();
+    method public int getType();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.BroadcastInfoResponse> CREATOR;
+    field public static final int RESPONSE_RESULT_CANCEL = 3; // 0x3
+    field public static final int RESPONSE_RESULT_ERROR = 1; // 0x1
+    field public static final int RESPONSE_RESULT_OK = 2; // 0x2
+  }
+
+  public final class CommandRequest extends android.media.tv.BroadcastInfoRequest implements android.os.Parcelable {
+    ctor public CommandRequest(int, int, @NonNull String, @NonNull String, @NonNull String, @NonNull String);
+    method @NonNull public String getArgumentType();
+    method @NonNull public String getArguments();
+    method @NonNull public String getName();
+    method @NonNull public String getNamespace();
+    field public static final String ARGUMENT_TYPE_JSON = "json";
+    field public static final String ARGUMENT_TYPE_XML = "xml";
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.CommandRequest> CREATOR;
+  }
+
+  public final class CommandResponse extends android.media.tv.BroadcastInfoResponse implements android.os.Parcelable {
+    ctor public CommandResponse(int, int, int, @Nullable String, @NonNull String);
+    method @Nullable public String getResponse();
+    method @NonNull public String getResponseType();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.CommandResponse> CREATOR;
+    field public static final String RESPONSE_TYPE_JSON = "json";
+    field public static final String RESPONSE_TYPE_XML = "xml";
+  }
+
+  public final class DsmccRequest extends android.media.tv.BroadcastInfoRequest implements android.os.Parcelable {
+    ctor public DsmccRequest(int, int, @NonNull android.net.Uri);
+    method @NonNull public android.net.Uri getUri();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.DsmccRequest> CREATOR;
+  }
+
+  public final class DsmccResponse extends android.media.tv.BroadcastInfoResponse implements android.os.Parcelable {
+    ctor public DsmccResponse(int, int, int, @Nullable android.os.ParcelFileDescriptor);
+    ctor public DsmccResponse(int, int, int, boolean, @Nullable java.util.List<java.lang.String>);
+    ctor public DsmccResponse(int, int, int, @Nullable int[], @Nullable String[]);
+    method @NonNull public String getBiopMessageType();
+    method @NonNull public java.util.List<java.lang.String> getChildList();
+    method @NonNull public android.os.ParcelFileDescriptor getFile();
+    method @NonNull public int[] getStreamEventIds();
+    method @NonNull public String[] getStreamEventNames();
+    field public static final String BIOP_MESSAGE_TYPE_DIRECTORY = "directory";
+    field public static final String BIOP_MESSAGE_TYPE_FILE = "file";
+    field public static final String BIOP_MESSAGE_TYPE_SERVICE_GATEWAY = "service_gateway";
+    field public static final String BIOP_MESSAGE_TYPE_STREAM = "stream";
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.DsmccResponse> CREATOR;
+  }
+
+  public final class PesRequest extends android.media.tv.BroadcastInfoRequest implements android.os.Parcelable {
+    ctor public PesRequest(int, int, int, int);
+    method public int getStreamId();
+    method public int getTsPid();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.PesRequest> CREATOR;
+  }
+
+  public final class PesResponse extends android.media.tv.BroadcastInfoResponse implements android.os.Parcelable {
+    ctor public PesResponse(int, int, int, @Nullable String);
+    method @Nullable public String getSharedFilterToken();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.PesResponse> CREATOR;
+  }
+
+  public final class SectionRequest extends android.media.tv.BroadcastInfoRequest implements android.os.Parcelable {
+    ctor public SectionRequest(int, int, int, int, int);
+    method public int getTableId();
+    method public int getTsPid();
+    method public int getVersion();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.SectionRequest> CREATOR;
+  }
+
+  public final class SectionResponse extends android.media.tv.BroadcastInfoResponse implements android.os.Parcelable {
+    ctor public SectionResponse(int, int, int, int, int, @Nullable android.os.Bundle);
+    method @NonNull public android.os.Bundle getSessionData();
+    method public int getSessionId();
+    method public int getVersion();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.SectionResponse> CREATOR;
+  }
+
+  public final class StreamEventRequest extends android.media.tv.BroadcastInfoRequest implements android.os.Parcelable {
+    ctor public StreamEventRequest(int, int, @NonNull android.net.Uri, @NonNull String);
+    method @NonNull public String getEventName();
+    method @NonNull public android.net.Uri getTargetUri();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.StreamEventRequest> CREATOR;
+  }
+
+  public final class StreamEventResponse extends android.media.tv.BroadcastInfoResponse implements android.os.Parcelable {
+    ctor public StreamEventResponse(int, int, int, int, long, @Nullable byte[]);
+    method @Nullable public byte[] getData();
+    method public int getEventId();
+    method public long getNptMillis();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.StreamEventResponse> CREATOR;
+  }
+
+  public final class TableRequest extends android.media.tv.BroadcastInfoRequest implements android.os.Parcelable {
+    ctor public TableRequest(int, int, int, int, int);
+    method public int getTableId();
+    method public int getTableName();
+    method public int getVersion();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.TableRequest> CREATOR;
+    field public static final int TABLE_NAME_PAT = 0; // 0x0
+    field public static final int TABLE_NAME_PMT = 1; // 0x1
+  }
+
+  public final class TableResponse extends android.media.tv.BroadcastInfoResponse implements android.os.Parcelable {
+    ctor public TableResponse(int, int, int, @Nullable android.net.Uri, int, int);
+    method public int getSize();
+    method @Nullable public android.net.Uri getTableUri();
+    method public int getVersion();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.TableResponse> CREATOR;
+  }
+
+  public final class TimelineRequest extends android.media.tv.BroadcastInfoRequest implements android.os.Parcelable {
+    ctor public TimelineRequest(int, int, int);
+    method public int getIntervalMillis();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.TimelineRequest> CREATOR;
+  }
+
+  public final class TimelineResponse extends android.media.tv.BroadcastInfoResponse implements android.os.Parcelable {
+    ctor public TimelineResponse(int, int, int, @Nullable String, int, int, long, long);
+    method @Nullable public android.net.Uri getSelector();
+    method public long getTicks();
+    method public int getUnitsPerSecond();
+    method public int getUnitsPerTick();
+    method public long getWallClock();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.TimelineResponse> CREATOR;
+  }
+
+  public final class TsRequest extends android.media.tv.BroadcastInfoRequest implements android.os.Parcelable {
+    ctor public TsRequest(int, int, int);
+    method public int getTsPid();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.TsRequest> CREATOR;
+  }
+
+  public final class TsResponse extends android.media.tv.BroadcastInfoResponse implements android.os.Parcelable {
+    ctor public TsResponse(int, int, int, @Nullable String);
+    method @Nullable public String getSharedFilterToken();
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.TsResponse> CREATOR;
+  }
+
   public final class TvContentRating {
     method public boolean contains(@NonNull android.media.tv.TvContentRating);
     method public static android.media.tv.TvContentRating createRating(String, String, String, java.lang.String...);
@@ -25496,6 +25492,7 @@
     field public static final String COLUMN_CONTENT_ID = "content_id";
     field public static final String COLUMN_CONTENT_RATING = "content_rating";
     field public static final String COLUMN_DURATION_MILLIS = "duration_millis";
+    field public static final String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
     field public static final String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";
     field public static final String COLUMN_EPISODE_TITLE = "episode_title";
     field public static final String COLUMN_INTENT_URI = "intent_uri";
@@ -25526,6 +25523,7 @@
     field public static final String COLUMN_SHORT_DESCRIPTION = "short_description";
     field public static final String COLUMN_SPLIT_ID = "split_id";
     field public static final String COLUMN_STARTING_PRICE = "starting_price";
+    field public static final String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
     field public static final String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";
     field public static final String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
     field public static final String COLUMN_TITLE = "title";
@@ -25579,11 +25577,14 @@
     field public static final String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
     field public static final String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
     field public static final String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
+    field public static final String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";
     field public static final String COLUMN_LONG_DESCRIPTION = "long_description";
+    field public static final String COLUMN_MULTI_SERIES_ID = "multi_series_id";
     field public static final String COLUMN_POSTER_ART_URI = "poster_art_uri";
     field public static final String COLUMN_RECORDING_PROHIBITED = "recording_prohibited";
     field public static final String COLUMN_REVIEW_RATING = "review_rating";
     field public static final String COLUMN_REVIEW_RATING_STYLE = "review_rating_style";
+    field public static final String COLUMN_SCRAMBLED = "scrambled";
     field public static final String COLUMN_SEARCHABLE = "searchable";
     field public static final String COLUMN_SEASON_DISPLAY_NUMBER = "season_display_number";
     field @Deprecated public static final String COLUMN_SEASON_NUMBER = "season_number";
@@ -25643,7 +25644,9 @@
     field public static final String COLUMN_INTERNAL_PROVIDER_FLAG2 = "internal_provider_flag2";
     field public static final String COLUMN_INTERNAL_PROVIDER_FLAG3 = "internal_provider_flag3";
     field public static final String COLUMN_INTERNAL_PROVIDER_FLAG4 = "internal_provider_flag4";
+    field public static final String COLUMN_INTERNAL_PROVIDER_ID = "internal_provider_id";
     field public static final String COLUMN_LONG_DESCRIPTION = "long_description";
+    field public static final String COLUMN_MULTI_SERIES_ID = "multi_series_id";
     field public static final String COLUMN_POSTER_ART_URI = "poster_art_uri";
     field public static final String COLUMN_RECORDING_DATA_BYTES = "recording_data_bytes";
     field public static final String COLUMN_RECORDING_DATA_URI = "recording_data_uri";
@@ -25688,6 +25691,7 @@
     field public static final String COLUMN_CONTENT_ID = "content_id";
     field public static final String COLUMN_CONTENT_RATING = "content_rating";
     field public static final String COLUMN_DURATION_MILLIS = "duration_millis";
+    field public static final String COLUMN_END_TIME_UTC_MILLIS = "end_time_utc_millis";
     field public static final String COLUMN_EPISODE_DISPLAY_NUMBER = "episode_display_number";
     field public static final String COLUMN_EPISODE_TITLE = "episode_title";
     field public static final String COLUMN_INTENT_URI = "intent_uri";
@@ -25719,6 +25723,7 @@
     field public static final String COLUMN_SHORT_DESCRIPTION = "short_description";
     field public static final String COLUMN_SPLIT_ID = "split_id";
     field public static final String COLUMN_STARTING_PRICE = "starting_price";
+    field public static final String COLUMN_START_TIME_UTC_MILLIS = "start_time_utc_millis";
     field public static final String COLUMN_THUMBNAIL_ASPECT_RATIO = "poster_thumbnail_aspect_ratio";
     field public static final String COLUMN_THUMBNAIL_URI = "thumbnail_uri";
     field public static final String COLUMN_TITLE = "title";
@@ -25815,6 +25820,14 @@
     field public static final String ACTION_QUERY_CONTENT_RATING_SYSTEMS = "android.media.tv.action.QUERY_CONTENT_RATING_SYSTEMS";
     field public static final String ACTION_SETUP_INPUTS = "android.media.tv.action.SETUP_INPUTS";
     field public static final String ACTION_VIEW_RECORDING_SCHEDULES = "android.media.tv.action.VIEW_RECORDING_SCHEDULES";
+    field public static final int BROADCAST_INFO_STREAM_EVENT = 5; // 0x5
+    field public static final int BROADCAST_INFO_TYPE_COMMAND = 7; // 0x7
+    field public static final int BROADCAST_INFO_TYPE_DSMCC = 6; // 0x6
+    field public static final int BROADCAST_INFO_TYPE_PES = 4; // 0x4
+    field public static final int BROADCAST_INFO_TYPE_SECTION = 3; // 0x3
+    field public static final int BROADCAST_INFO_TYPE_TABLE = 2; // 0x2
+    field public static final int BROADCAST_INFO_TYPE_TIMELINE = 8; // 0x8
+    field public static final int BROADCAST_INFO_TYPE_TS = 1; // 0x1
     field public static final int INPUT_STATE_CONNECTED = 0; // 0x0
     field public static final int INPUT_STATE_CONNECTED_STANDBY = 1; // 0x1
     field public static final int INPUT_STATE_DISCONNECTED = 2; // 0x2
@@ -25822,6 +25835,9 @@
     field public static final int RECORDING_ERROR_INSUFFICIENT_SPACE = 1; // 0x1
     field public static final int RECORDING_ERROR_RESOURCE_BUSY = 2; // 0x2
     field public static final int RECORDING_ERROR_UNKNOWN = 0; // 0x0
+    field public static final int SIGNAL_STRENGTH_LOST = 1; // 0x1
+    field public static final int SIGNAL_STRENGTH_STRONG = 3; // 0x3
+    field public static final int SIGNAL_STRENGTH_WEAK = 2; // 0x2
     field public static final long TIME_SHIFT_INVALID_TIME = -9223372036854775808L; // 0x8000000000000000L
     field public static final int TIME_SHIFT_STATUS_AVAILABLE = 3; // 0x3
     field public static final int TIME_SHIFT_STATUS_UNAVAILABLE = 2; // 0x2
@@ -25899,12 +25915,17 @@
   public abstract static class TvInputService.Session implements android.view.KeyEvent.Callback {
     ctor public TvInputService.Session(android.content.Context);
     method public void layoutSurface(int, int, int, int);
+    method public void notifyAdResponse(@NonNull android.media.tv.AdResponse);
+    method public void notifyAitInfoUpdated(@NonNull android.media.tv.AitInfo);
+    method public void notifyBroadcastInfoResponse(@NonNull android.media.tv.BroadcastInfoResponse);
     method public void notifyChannelRetuned(android.net.Uri);
     method public void notifyContentAllowed();
     method public void notifyContentBlocked(@NonNull android.media.tv.TvContentRating);
+    method public void notifySignalStrength(int);
     method public void notifyTimeShiftStatusChanged(int);
     method public void notifyTrackSelected(int, String);
     method public void notifyTracksChanged(java.util.List<android.media.tv.TvTrackInfo>);
+    method public void notifyTuned(@NonNull android.net.Uri);
     method public void notifyVideoAvailable();
     method public void notifyVideoUnavailable(int);
     method public void onAppPrivateCommand(@NonNull String, android.os.Bundle);
@@ -25916,8 +25937,12 @@
     method public boolean onKeyUp(int, android.view.KeyEvent);
     method public void onOverlayViewSizeChanged(int, int);
     method public abstract void onRelease();
+    method public void onRemoveBroadcastInfo(int);
+    method public void onRequestAd(@NonNull android.media.tv.AdRequest);
+    method public void onRequestBroadcastInfo(@NonNull android.media.tv.BroadcastInfoRequest);
     method public boolean onSelectTrack(int, @Nullable String);
     method public abstract void onSetCaptionEnabled(boolean);
+    method public void onSetInteractiveAppNotificationEnabled(boolean);
     method public abstract void onSetStreamVolume(@FloatRange(from=0.0, to=1.0) float);
     method public abstract boolean onSetSurface(@Nullable android.view.Surface);
     method public void onSurfaceChanged(int, int, int);
@@ -26019,6 +26044,7 @@
     method public void sendAppPrivateCommand(@NonNull String, android.os.Bundle);
     method public void setCallback(@Nullable android.media.tv.TvView.TvInputCallback);
     method public void setCaptionEnabled(boolean);
+    method public void setInteractiveAppNotificationEnabled(boolean);
     method public void setOnUnhandledInputEventListener(android.media.tv.TvView.OnUnhandledInputEventListener);
     method public void setStreamVolume(@FloatRange(from=0.0, to=1.0) float);
     method public void setTimeShiftPositionCallback(@Nullable android.media.tv.TvView.TimeShiftPositionCallback);
@@ -26045,14 +26071,17 @@
 
   public abstract static class TvView.TvInputCallback {
     ctor public TvView.TvInputCallback();
+    method public void onAitInfoUpdated(@NonNull String, @NonNull android.media.tv.AitInfo);
     method public void onChannelRetuned(String, android.net.Uri);
     method public void onConnectionFailed(String);
     method public void onContentAllowed(String);
     method public void onContentBlocked(String, android.media.tv.TvContentRating);
     method public void onDisconnected(String);
+    method public void onSignalStrength(@NonNull String, int);
     method public void onTimeShiftStatusChanged(String, int);
     method public void onTrackSelected(String, int, String);
     method public void onTracksChanged(String, java.util.List<android.media.tv.TvTrackInfo>);
+    method public void onTuned(@NonNull String, @NonNull android.net.Uri);
     method public void onVideoAvailable(String);
     method public void onVideoSizeChanged(String, int, int);
     method public void onVideoUnavailable(String, int);
@@ -26060,6 +26089,223 @@
 
 }
 
+package android.media.tv.interactive {
+
+  public final class AppLinkInfo implements android.os.Parcelable {
+    method public int describeContents();
+    method @NonNull public String getClassName();
+    method @NonNull public String getPackageName();
+    method @Nullable public String getUriHost();
+    method @Nullable public String getUriPrefix();
+    method @Nullable public String getUriScheme();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.interactive.AppLinkInfo> CREATOR;
+  }
+
+  public static final class AppLinkInfo.Builder {
+    ctor public AppLinkInfo.Builder(@NonNull String, @NonNull String);
+    method @NonNull public android.media.tv.interactive.AppLinkInfo build();
+    method @NonNull public android.media.tv.interactive.AppLinkInfo.Builder setUriHost(@NonNull String);
+    method @NonNull public android.media.tv.interactive.AppLinkInfo.Builder setUriPrefix(@NonNull String);
+    method @NonNull public android.media.tv.interactive.AppLinkInfo.Builder setUriScheme(@NonNull String);
+  }
+
+  public final class TvInteractiveAppManager {
+    method @NonNull public java.util.List<android.media.tv.interactive.TvInteractiveAppServiceInfo> getTvInteractiveAppServiceList();
+    method public void prepare(@NonNull String, int);
+    method public void registerAppLinkInfo(@NonNull String, @NonNull android.media.tv.interactive.AppLinkInfo);
+    method public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppManager.TvInteractiveAppCallback);
+    method public void sendAppLinkCommand(@NonNull String, @NonNull android.os.Bundle);
+    method public void unregisterAppLinkInfo(@NonNull String, @NonNull android.media.tv.interactive.AppLinkInfo);
+    method public void unregisterCallback(@NonNull android.media.tv.interactive.TvInteractiveAppManager.TvInteractiveAppCallback);
+    field public static final String ACTION_APP_LINK_COMMAND = "android.media.tv.interactive.action.APP_LINK_COMMAND";
+    field public static final String APP_LINK_KEY_BACK_URI = "back_uri";
+    field public static final String APP_LINK_KEY_CLASS_NAME = "class_name";
+    field public static final String APP_LINK_KEY_COMMAND_TYPE = "command_type";
+    field public static final String APP_LINK_KEY_PACKAGE_NAME = "package_name";
+    field public static final String APP_LINK_KEY_SERVICE_ID = "service_id";
+    field public static final int ERROR_BLOCKED = 5; // 0x5
+    field public static final int ERROR_ENCRYPTED = 6; // 0x6
+    field public static final int ERROR_NONE = 0; // 0x0
+    field public static final int ERROR_NOT_SUPPORTED = 2; // 0x2
+    field public static final int ERROR_RESOURCE_UNAVAILABLE = 4; // 0x4
+    field public static final int ERROR_UNKNOWN = 1; // 0x1
+    field public static final int ERROR_UNKNOWN_CHANNEL = 7; // 0x7
+    field public static final int ERROR_WEAK_SIGNAL = 3; // 0x3
+    field public static final String INTENT_KEY_BI_INTERACTIVE_APP_TYPE = "bi_interactive_app_type";
+    field public static final String INTENT_KEY_BI_INTERACTIVE_APP_URI = "bi_interactive_app_uri";
+    field public static final String INTENT_KEY_CHANNEL_URI = "channel_uri";
+    field public static final String INTENT_KEY_COMMAND_TYPE = "command_type";
+    field public static final String INTENT_KEY_INTERACTIVE_APP_SERVICE_ID = "interactive_app_id";
+    field public static final String INTENT_KEY_TV_INPUT_ID = "tv_input_id";
+    field public static final int INTERACTIVE_APP_STATE_ERROR = 3; // 0x3
+    field public static final int INTERACTIVE_APP_STATE_RUNNING = 2; // 0x2
+    field public static final int INTERACTIVE_APP_STATE_STOPPED = 1; // 0x1
+    field public static final int SERVICE_STATE_ERROR = 4; // 0x4
+    field public static final int SERVICE_STATE_PREPARING = 2; // 0x2
+    field public static final int SERVICE_STATE_READY = 3; // 0x3
+    field public static final int SERVICE_STATE_UNREALIZED = 1; // 0x1
+    field public static final int TELETEXT_APP_STATE_ERROR = 3; // 0x3
+    field public static final int TELETEXT_APP_STATE_HIDE = 2; // 0x2
+    field public static final int TELETEXT_APP_STATE_SHOW = 1; // 0x1
+  }
+
+  public abstract static class TvInteractiveAppManager.TvInteractiveAppCallback {
+    ctor public TvInteractiveAppManager.TvInteractiveAppCallback();
+    method public void onInteractiveAppServiceAdded(@NonNull String);
+    method public void onInteractiveAppServiceRemoved(@NonNull String);
+    method public void onInteractiveAppServiceUpdated(@NonNull String);
+    method public void onTvInteractiveAppServiceStateChanged(@NonNull String, int, int, int);
+  }
+
+  public abstract class TvInteractiveAppService extends android.app.Service {
+    ctor public TvInteractiveAppService();
+    method public final void notifyStateChanged(int, int, int);
+    method public void onAppLinkCommand(@NonNull android.os.Bundle);
+    method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
+    method @Nullable public abstract android.media.tv.interactive.TvInteractiveAppService.Session onCreateSession(@NonNull String, int);
+    method public abstract void onPrepare(int);
+    method public void onRegisterAppLinkInfo(@NonNull android.media.tv.interactive.AppLinkInfo);
+    method public void onUnregisterAppLinkInfo(@NonNull android.media.tv.interactive.AppLinkInfo);
+    field public static final String COMMAND_PARAMETER_KEY_CHANGE_CHANNEL_QUIETLY = "command_change_channel_quietly";
+    field public static final String COMMAND_PARAMETER_KEY_CHANNEL_URI = "command_channel_uri";
+    field public static final String COMMAND_PARAMETER_KEY_INPUT_ID = "command_input_id";
+    field public static final String COMMAND_PARAMETER_KEY_TRACK_ID = "command_track_id";
+    field public static final String COMMAND_PARAMETER_KEY_TRACK_TYPE = "command_track_type";
+    field public static final String COMMAND_PARAMETER_KEY_VOLUME = "command_volume";
+    field public static final String PLAYBACK_COMMAND_TYPE_SELECT_TRACK = "select_track";
+    field public static final String PLAYBACK_COMMAND_TYPE_SET_STREAM_VOLUME = "set_stream_volume";
+    field public static final String PLAYBACK_COMMAND_TYPE_STOP = "stop";
+    field public static final String PLAYBACK_COMMAND_TYPE_TUNE = "tune";
+    field public static final String PLAYBACK_COMMAND_TYPE_TUNE_NEXT = "tune_next";
+    field public static final String PLAYBACK_COMMAND_TYPE_TUNE_PREV = "tune_previous";
+    field public static final String SERVICE_INTERFACE = "android.media.tv.interactive.TvInteractiveAppService";
+    field public static final String SERVICE_META_DATA = "android.media.tv.interactive.app";
+  }
+
+  public abstract static class TvInteractiveAppService.Session implements android.view.KeyEvent.Callback {
+    ctor public TvInteractiveAppService.Session(@NonNull android.content.Context);
+    method @CallSuper public void layoutSurface(int, int, int, int);
+    method @CallSuper public final void notifyBiInteractiveAppCreated(@NonNull android.net.Uri, @Nullable String);
+    method @CallSuper public void notifySessionStateChanged(int, int);
+    method @CallSuper public final void notifyTeletextAppStateChanged(int);
+    method public void onAdResponse(@NonNull android.media.tv.AdResponse);
+    method public void onBroadcastInfoResponse(@NonNull android.media.tv.BroadcastInfoResponse);
+    method public void onContentAllowed();
+    method public void onContentBlocked(@NonNull android.media.tv.TvContentRating);
+    method public void onCreateBiInteractiveApp(@NonNull android.net.Uri, @Nullable android.os.Bundle);
+    method @Nullable public android.view.View onCreateMediaView();
+    method public void onCurrentChannelLcn(int);
+    method public void onCurrentChannelUri(@Nullable android.net.Uri);
+    method public void onCurrentTvInputId(@Nullable String);
+    method public void onDestroyBiInteractiveApp(@NonNull String);
+    method public boolean onGenericMotionEvent(@NonNull android.view.MotionEvent);
+    method public boolean onKeyDown(int, @NonNull android.view.KeyEvent);
+    method public boolean onKeyLongPress(int, @NonNull android.view.KeyEvent);
+    method public boolean onKeyMultiple(int, int, @NonNull android.view.KeyEvent);
+    method public boolean onKeyUp(int, @NonNull android.view.KeyEvent);
+    method public void onMediaViewSizeChanged(int, int);
+    method public abstract void onRelease();
+    method public void onResetInteractiveApp();
+    method public abstract boolean onSetSurface(@Nullable android.view.Surface);
+    method public void onSetTeletextAppEnabled(boolean);
+    method public void onSignalStrength(int);
+    method public void onSigningResult(@NonNull String, @NonNull byte[]);
+    method public void onStartInteractiveApp();
+    method public void onStopInteractiveApp();
+    method public void onStreamVolume(float);
+    method public void onSurfaceChanged(int, int, int);
+    method public boolean onTouchEvent(@NonNull android.view.MotionEvent);
+    method public void onTrackInfoList(@NonNull java.util.List<android.media.tv.TvTrackInfo>);
+    method public void onTrackSelected(int, @NonNull String);
+    method public boolean onTrackballEvent(@NonNull android.view.MotionEvent);
+    method public void onTracksChanged(@NonNull java.util.List<android.media.tv.TvTrackInfo>);
+    method public void onTuned(@NonNull android.net.Uri);
+    method public void onVideoAvailable();
+    method public void onVideoUnavailable(int);
+    method @CallSuper public void removeBroadcastInfo(int);
+    method @CallSuper public void requestAd(@NonNull android.media.tv.AdRequest);
+    method @CallSuper public void requestBroadcastInfo(@NonNull android.media.tv.BroadcastInfoRequest);
+    method @CallSuper public void requestCurrentChannelLcn();
+    method @CallSuper public void requestCurrentChannelUri();
+    method @CallSuper public void requestCurrentTvInputId();
+    method @CallSuper public void requestSigning(@NonNull String, @NonNull String, @NonNull String, @NonNull byte[]);
+    method @CallSuper public void requestStreamVolume();
+    method @CallSuper public void requestTrackInfoList();
+    method @CallSuper public void sendPlaybackCommandRequest(@NonNull String, @Nullable android.os.Bundle);
+    method @CallSuper public void setMediaViewEnabled(boolean);
+    method @CallSuper public void setVideoBounds(@NonNull android.graphics.Rect);
+  }
+
+  public final class TvInteractiveAppServiceInfo implements android.os.Parcelable {
+    ctor public TvInteractiveAppServiceInfo(@NonNull android.content.Context, @NonNull android.content.ComponentName);
+    method public int describeContents();
+    method @NonNull public String getId();
+    method @Nullable public android.content.pm.ServiceInfo getServiceInfo();
+    method @NonNull public int getSupportedTypes();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.media.tv.interactive.TvInteractiveAppServiceInfo> CREATOR;
+    field public static final int INTERACTIVE_APP_TYPE_ATSC = 2; // 0x2
+    field public static final int INTERACTIVE_APP_TYPE_GINGA = 4; // 0x4
+    field public static final int INTERACTIVE_APP_TYPE_HBBTV = 1; // 0x1
+  }
+
+  public class TvInteractiveAppView extends android.view.ViewGroup {
+    ctor public TvInteractiveAppView(@NonNull android.content.Context);
+    ctor public TvInteractiveAppView(@NonNull android.content.Context, @Nullable android.util.AttributeSet);
+    ctor public TvInteractiveAppView(@NonNull android.content.Context, @Nullable android.util.AttributeSet, int);
+    method public void clearCallback();
+    method public void clearOnUnhandledInputEventListener();
+    method public void createBiInteractiveApp(@NonNull android.net.Uri, @Nullable android.os.Bundle);
+    method public void destroyBiInteractiveApp(@NonNull String);
+    method public boolean dispatchUnhandledInputEvent(@NonNull android.view.InputEvent);
+    method public void onAttachedToWindow();
+    method public void onDetachedFromWindow();
+    method public void onLayout(boolean, int, int, int, int);
+    method public void onMeasure(int, int);
+    method public boolean onUnhandledInputEvent(@NonNull android.view.InputEvent);
+    method public void onVisibilityChanged(@NonNull android.view.View, int);
+    method public void prepareInteractiveApp(@NonNull String, int);
+    method public void reset();
+    method public void resetInteractiveApp();
+    method public void sendCurrentChannelLcn(int);
+    method public void sendCurrentChannelUri(@Nullable android.net.Uri);
+    method public void sendCurrentTvInputId(@Nullable String);
+    method public void sendSigningResult(@NonNull String, @NonNull byte[]);
+    method public void sendStreamVolume(float);
+    method public void sendTrackInfoList(@Nullable java.util.List<android.media.tv.TvTrackInfo>);
+    method public void setCallback(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppView.TvInteractiveAppCallback);
+    method public void setOnUnhandledInputEventListener(@NonNull java.util.concurrent.Executor, @NonNull android.media.tv.interactive.TvInteractiveAppView.OnUnhandledInputEventListener);
+    method public void setTeletextAppEnabled(boolean);
+    method public int setTvView(@Nullable android.media.tv.TvView);
+    method public void startInteractiveApp();
+    method public void stopInteractiveApp();
+    field public static final String BI_INTERACTIVE_APP_KEY_ALIAS = "alias";
+    field public static final String BI_INTERACTIVE_APP_KEY_CERTIFICATE = "certificate";
+    field public static final String BI_INTERACTIVE_APP_KEY_PRIVATE_KEY = "private_key";
+  }
+
+  public static interface TvInteractiveAppView.OnUnhandledInputEventListener {
+    method public boolean onUnhandledInputEvent(@NonNull android.view.InputEvent);
+  }
+
+  public abstract static class TvInteractiveAppView.TvInteractiveAppCallback {
+    ctor public TvInteractiveAppView.TvInteractiveAppCallback();
+    method public void onBiInteractiveAppCreated(@NonNull String, @NonNull android.net.Uri, @Nullable String);
+    method public void onPlaybackCommandRequest(@NonNull String, @NonNull String, @NonNull android.os.Bundle);
+    method public void onRequestCurrentChannelLcn(@NonNull String);
+    method public void onRequestCurrentChannelUri(@NonNull String);
+    method public void onRequestCurrentTvInputId(@NonNull String);
+    method public void onRequestSigning(@NonNull String, @NonNull String, @NonNull String, @NonNull String, @NonNull byte[]);
+    method public void onRequestStreamVolume(@NonNull String);
+    method public void onRequestTrackInfoList(@NonNull String);
+    method public void onSetVideoBounds(@NonNull String, @NonNull android.graphics.Rect);
+    method public void onStateChanged(@NonNull String, int, int);
+    method public void onTeletextAppStateChanged(@NonNull String, int);
+  }
+
+}
+
 package android.mtp {
 
   public final class MtpConstants {
@@ -26327,84 +26573,18 @@
 
   public static final class Ikev2VpnProfile.Builder {
     ctor public Ikev2VpnProfile.Builder(@NonNull String, @NonNull String);
+    ctor public Ikev2VpnProfile.Builder(@NonNull android.net.ipsec.ike.IkeTunnelConnectionParams);
     method @NonNull public android.net.Ikev2VpnProfile build();
     method @NonNull public android.net.Ikev2VpnProfile.Builder setAllowedAlgorithms(@NonNull java.util.List<java.lang.String>);
     method @NonNull public android.net.Ikev2VpnProfile.Builder setAuthDigitalSignature(@NonNull java.security.cert.X509Certificate, @NonNull java.security.PrivateKey, @Nullable java.security.cert.X509Certificate);
     method @NonNull public android.net.Ikev2VpnProfile.Builder setAuthPsk(@NonNull byte[]);
     method @NonNull public android.net.Ikev2VpnProfile.Builder setAuthUsernamePassword(@NonNull String, @NonNull String, @Nullable java.security.cert.X509Certificate);
     method @NonNull public android.net.Ikev2VpnProfile.Builder setBypassable(boolean);
+    method @NonNull public android.net.Ikev2VpnProfile.Builder setLocalRoutesExcluded(boolean);
     method @NonNull public android.net.Ikev2VpnProfile.Builder setMaxMtu(int);
     method @NonNull public android.net.Ikev2VpnProfile.Builder setMetered(boolean);
     method @NonNull public android.net.Ikev2VpnProfile.Builder setProxy(@Nullable android.net.ProxyInfo);
-  }
-
-  public final class IpSecAlgorithm implements android.os.Parcelable {
-    ctor public IpSecAlgorithm(@NonNull String, @NonNull byte[]);
-    ctor public IpSecAlgorithm(@NonNull String, @NonNull byte[], int);
-    method public int describeContents();
-    method @NonNull public byte[] getKey();
-    method @NonNull public String getName();
-    method @NonNull public static java.util.Set<java.lang.String> getSupportedAlgorithms();
-    method public int getTruncationLengthBits();
-    method public void writeToParcel(android.os.Parcel, int);
-    field public static final String AUTH_AES_CMAC = "cmac(aes)";
-    field public static final String AUTH_AES_XCBC = "xcbc(aes)";
-    field public static final String AUTH_CRYPT_AES_GCM = "rfc4106(gcm(aes))";
-    field public static final String AUTH_CRYPT_CHACHA20_POLY1305 = "rfc7539esp(chacha20,poly1305)";
-    field public static final String AUTH_HMAC_MD5 = "hmac(md5)";
-    field public static final String AUTH_HMAC_SHA1 = "hmac(sha1)";
-    field public static final String AUTH_HMAC_SHA256 = "hmac(sha256)";
-    field public static final String AUTH_HMAC_SHA384 = "hmac(sha384)";
-    field public static final String AUTH_HMAC_SHA512 = "hmac(sha512)";
-    field @NonNull public static final android.os.Parcelable.Creator<android.net.IpSecAlgorithm> CREATOR;
-    field public static final String CRYPT_AES_CBC = "cbc(aes)";
-    field public static final String CRYPT_AES_CTR = "rfc3686(ctr(aes))";
-  }
-
-  public final class IpSecManager {
-    method @NonNull public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(@NonNull java.net.InetAddress) throws android.net.IpSecManager.ResourceUnavailableException;
-    method @NonNull public android.net.IpSecManager.SecurityParameterIndex allocateSecurityParameterIndex(@NonNull java.net.InetAddress, int) throws android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;
-    method public void applyTransportModeTransform(@NonNull java.net.Socket, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;
-    method public void applyTransportModeTransform(@NonNull java.net.DatagramSocket, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;
-    method public void applyTransportModeTransform(@NonNull java.io.FileDescriptor, int, @NonNull android.net.IpSecTransform) throws java.io.IOException;
-    method @NonNull public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket(int) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
-    method @NonNull public android.net.IpSecManager.UdpEncapsulationSocket openUdpEncapsulationSocket() throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException;
-    method public void removeTransportModeTransforms(@NonNull java.net.Socket) throws java.io.IOException;
-    method public void removeTransportModeTransforms(@NonNull java.net.DatagramSocket) throws java.io.IOException;
-    method public void removeTransportModeTransforms(@NonNull java.io.FileDescriptor) throws java.io.IOException;
-    field public static final int DIRECTION_IN = 0; // 0x0
-    field public static final int DIRECTION_OUT = 1; // 0x1
-  }
-
-  public static final class IpSecManager.ResourceUnavailableException extends android.util.AndroidException {
-  }
-
-  public static final class IpSecManager.SecurityParameterIndex implements java.lang.AutoCloseable {
-    method public void close();
-    method public int getSpi();
-  }
-
-  public static final class IpSecManager.SpiUnavailableException extends android.util.AndroidException {
-    method public int getSpi();
-  }
-
-  public static final class IpSecManager.UdpEncapsulationSocket implements java.lang.AutoCloseable {
-    method public void close() throws java.io.IOException;
-    method public java.io.FileDescriptor getFileDescriptor();
-    method public int getPort();
-  }
-
-  public final class IpSecTransform implements java.lang.AutoCloseable {
-    method public void close();
-  }
-
-  public static class IpSecTransform.Builder {
-    ctor public IpSecTransform.Builder(@NonNull android.content.Context);
-    method @NonNull public android.net.IpSecTransform buildTransportModeTransform(@NonNull java.net.InetAddress, @NonNull android.net.IpSecManager.SecurityParameterIndex) throws java.io.IOException, android.net.IpSecManager.ResourceUnavailableException, android.net.IpSecManager.SpiUnavailableException;
-    method @NonNull public android.net.IpSecTransform.Builder setAuthenticatedEncryption(@NonNull android.net.IpSecAlgorithm);
-    method @NonNull public android.net.IpSecTransform.Builder setAuthentication(@NonNull android.net.IpSecAlgorithm);
-    method @NonNull public android.net.IpSecTransform.Builder setEncryption(@NonNull android.net.IpSecAlgorithm);
-    method @NonNull public android.net.IpSecTransform.Builder setIpv4Encapsulation(@NonNull android.net.IpSecManager.UdpEncapsulationSocket, int);
+    method @NonNull public android.net.Ikev2VpnProfile.Builder setRequiresInternetValidation(boolean);
   }
 
   public class LocalServerSocket implements java.io.Closeable {
@@ -26478,8 +26658,10 @@
   }
 
   public abstract class PlatformVpnProfile {
+    method public final boolean areLocalRoutesExcluded();
     method public final int getType();
     method @NonNull public final String getTypeString();
+    method public final boolean isInternetValidationRequired();
     field public static final int TYPE_IKEV2_IPSEC_PSK = 7; // 0x7
     field public static final int TYPE_IKEV2_IPSEC_RSA = 8; // 0x8
     field public static final int TYPE_IKEV2_IPSEC_USER_PASS = 6; // 0x6
@@ -26532,50 +26714,6 @@
     method @NonNull public android.net.TelephonyNetworkSpecifier.Builder setSubscriptionId(int);
   }
 
-  public class TrafficStats {
-    ctor public TrafficStats();
-    method public static void clearThreadStatsTag();
-    method public static void clearThreadStatsUid();
-    method public static int getAndSetThreadStatsTag(int);
-    method public static long getMobileRxBytes();
-    method public static long getMobileRxPackets();
-    method public static long getMobileTxBytes();
-    method public static long getMobileTxPackets();
-    method public static long getRxBytes(@NonNull String);
-    method public static long getRxPackets(@NonNull String);
-    method public static int getThreadStatsTag();
-    method public static int getThreadStatsUid();
-    method public static long getTotalRxBytes();
-    method public static long getTotalRxPackets();
-    method public static long getTotalTxBytes();
-    method public static long getTotalTxPackets();
-    method public static long getTxBytes(@NonNull String);
-    method public static long getTxPackets(@NonNull String);
-    method public static long getUidRxBytes(int);
-    method public static long getUidRxPackets(int);
-    method @Deprecated public static long getUidTcpRxBytes(int);
-    method @Deprecated public static long getUidTcpRxSegments(int);
-    method @Deprecated public static long getUidTcpTxBytes(int);
-    method @Deprecated public static long getUidTcpTxSegments(int);
-    method public static long getUidTxBytes(int);
-    method public static long getUidTxPackets(int);
-    method @Deprecated public static long getUidUdpRxBytes(int);
-    method @Deprecated public static long getUidUdpRxPackets(int);
-    method @Deprecated public static long getUidUdpTxBytes(int);
-    method @Deprecated public static long getUidUdpTxPackets(int);
-    method public static void incrementOperationCount(int);
-    method public static void incrementOperationCount(int, int);
-    method public static void setThreadStatsTag(int);
-    method public static void setThreadStatsUid(int);
-    method public static void tagDatagramSocket(java.net.DatagramSocket) throws java.net.SocketException;
-    method public static void tagFileDescriptor(java.io.FileDescriptor) throws java.io.IOException;
-    method public static void tagSocket(java.net.Socket) throws java.net.SocketException;
-    method public static void untagDatagramSocket(java.net.DatagramSocket) throws java.net.SocketException;
-    method public static void untagFileDescriptor(java.io.FileDescriptor) throws java.io.IOException;
-    method public static void untagSocket(java.net.Socket) throws java.net.SocketException;
-    field public static final int UNSUPPORTED = -1; // 0xffffffff
-  }
-
   public abstract class Uri implements java.lang.Comparable<android.net.Uri> android.os.Parcelable {
     method public abstract android.net.Uri.Builder buildUpon();
     method public int compareTo(android.net.Uri);
@@ -26714,8 +26852,26 @@
   public class VpnManager {
     method public void deleteProvisionedVpnProfile();
     method @Nullable public android.content.Intent provisionVpnProfile(@NonNull android.net.PlatformVpnProfile);
-    method public void startProvisionedVpnProfile();
+    method @Deprecated public void startProvisionedVpnProfile();
+    method @NonNull public String startProvisionedVpnProfileSession();
     method public void stopProvisionedVpnProfile();
+    field public static final String ACTION_VPN_MANAGER_EVENT = "android.net.action.VPN_MANAGER_EVENT";
+    field public static final String CATEGORY_EVENT_DEACTIVATED_BY_USER = "android.net.category.EVENT_DEACTIVATED_BY_USER";
+    field public static final String CATEGORY_EVENT_IKE_ERROR = "android.net.category.EVENT_IKE_ERROR";
+    field public static final String CATEGORY_EVENT_NETWORK_ERROR = "android.net.category.EVENT_NETWORK_ERROR";
+    field public static final int ERROR_CLASS_NOT_RECOVERABLE = 1; // 0x1
+    field public static final int ERROR_CLASS_RECOVERABLE = 2; // 0x2
+    field public static final int ERROR_CODE_NETWORK_IO = 3; // 0x3
+    field public static final int ERROR_CODE_NETWORK_LOST = 2; // 0x2
+    field public static final int ERROR_CODE_NETWORK_PROTOCOL_TIMEOUT = 1; // 0x1
+    field public static final int ERROR_CODE_NETWORK_UNKNOWN_HOST = 0; // 0x0
+    field public static final String EXTRA_ERROR_CLASS = "android.net.extra.ERROR_CLASS";
+    field public static final String EXTRA_ERROR_CODE = "android.net.extra.ERROR_CODE";
+    field public static final String EXTRA_SESSION_KEY = "android.net.extra.SESSION_KEY";
+    field public static final String EXTRA_TIMESTAMP_MILLIS = "android.net.extra.TIMESTAMP_MILLIS";
+    field public static final String EXTRA_UNDERLYING_LINK_PROPERTIES = "android.net.extra.UNDERLYING_LINK_PROPERTIES";
+    field public static final String EXTRA_UNDERLYING_NETWORK = "android.net.extra.UNDERLYING_NETWORK";
+    field public static final String EXTRA_UNDERLYING_NETWORK_CAPABILITIES = "android.net.extra.UNDERLYING_NETWORK_CAPABILITIES";
   }
 
   public class VpnService extends android.app.Service {
@@ -26742,11 +26898,13 @@
     method @NonNull public android.net.VpnService.Builder addDnsServer(@NonNull java.net.InetAddress);
     method @NonNull public android.net.VpnService.Builder addDnsServer(@NonNull String);
     method @NonNull public android.net.VpnService.Builder addRoute(@NonNull java.net.InetAddress, int);
+    method @NonNull public android.net.VpnService.Builder addRoute(@NonNull android.net.IpPrefix);
     method @NonNull public android.net.VpnService.Builder addRoute(@NonNull String, int);
     method @NonNull public android.net.VpnService.Builder addSearchDomain(@NonNull String);
     method @NonNull public android.net.VpnService.Builder allowBypass();
     method @NonNull public android.net.VpnService.Builder allowFamily(int);
     method @Nullable public android.os.ParcelFileDescriptor establish();
+    method @NonNull public android.net.VpnService.Builder excludeRoute(@NonNull android.net.IpPrefix);
     method @NonNull public android.net.VpnService.Builder setBlocking(boolean);
     method @NonNull public android.net.VpnService.Builder setConfigureIntent(@NonNull android.app.PendingIntent);
     method @NonNull public android.net.VpnService.Builder setHttpProxy(@NonNull android.net.ProxyInfo);
@@ -26826,65 +26984,6 @@
 
 }
 
-package android.net.nsd {
-
-  public final class NsdManager {
-    method public void discoverServices(String, int, android.net.nsd.NsdManager.DiscoveryListener);
-    method public void registerService(android.net.nsd.NsdServiceInfo, int, android.net.nsd.NsdManager.RegistrationListener);
-    method public void resolveService(android.net.nsd.NsdServiceInfo, android.net.nsd.NsdManager.ResolveListener);
-    method public void stopServiceDiscovery(android.net.nsd.NsdManager.DiscoveryListener);
-    method public void unregisterService(android.net.nsd.NsdManager.RegistrationListener);
-    field public static final String ACTION_NSD_STATE_CHANGED = "android.net.nsd.STATE_CHANGED";
-    field public static final String EXTRA_NSD_STATE = "nsd_state";
-    field public static final int FAILURE_ALREADY_ACTIVE = 3; // 0x3
-    field public static final int FAILURE_INTERNAL_ERROR = 0; // 0x0
-    field public static final int FAILURE_MAX_LIMIT = 4; // 0x4
-    field public static final int NSD_STATE_DISABLED = 1; // 0x1
-    field public static final int NSD_STATE_ENABLED = 2; // 0x2
-    field public static final int PROTOCOL_DNS_SD = 1; // 0x1
-  }
-
-  public static interface NsdManager.DiscoveryListener {
-    method public void onDiscoveryStarted(String);
-    method public void onDiscoveryStopped(String);
-    method public void onServiceFound(android.net.nsd.NsdServiceInfo);
-    method public void onServiceLost(android.net.nsd.NsdServiceInfo);
-    method public void onStartDiscoveryFailed(String, int);
-    method public void onStopDiscoveryFailed(String, int);
-  }
-
-  public static interface NsdManager.RegistrationListener {
-    method public void onRegistrationFailed(android.net.nsd.NsdServiceInfo, int);
-    method public void onServiceRegistered(android.net.nsd.NsdServiceInfo);
-    method public void onServiceUnregistered(android.net.nsd.NsdServiceInfo);
-    method public void onUnregistrationFailed(android.net.nsd.NsdServiceInfo, int);
-  }
-
-  public static interface NsdManager.ResolveListener {
-    method public void onResolveFailed(android.net.nsd.NsdServiceInfo, int);
-    method public void onServiceResolved(android.net.nsd.NsdServiceInfo);
-  }
-
-  public final class NsdServiceInfo implements android.os.Parcelable {
-    ctor public NsdServiceInfo();
-    method public int describeContents();
-    method public java.util.Map<java.lang.String,byte[]> getAttributes();
-    method public java.net.InetAddress getHost();
-    method public int getPort();
-    method public String getServiceName();
-    method public String getServiceType();
-    method public void removeAttribute(String);
-    method public void setAttribute(String, String);
-    method public void setHost(java.net.InetAddress);
-    method public void setPort(int);
-    method public void setServiceName(String);
-    method public void setServiceType(String);
-    method public void writeToParcel(android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.net.nsd.NsdServiceInfo> CREATOR;
-  }
-
-}
-
 package android.net.rtp {
 
   @Deprecated public class AudioCodec {
@@ -27123,6 +27222,25 @@
 
 package android.net.vcn {
 
+  public final class VcnCellUnderlyingNetworkTemplate extends android.net.vcn.VcnUnderlyingNetworkTemplate {
+    method @NonNull public java.util.Set<java.lang.String> getOperatorPlmnIds();
+    method public int getOpportunistic();
+    method public int getRoaming();
+    method @NonNull public java.util.Set<java.lang.Integer> getSimSpecificCarrierIds();
+  }
+
+  public static final class VcnCellUnderlyingNetworkTemplate.Builder {
+    ctor public VcnCellUnderlyingNetworkTemplate.Builder();
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate build();
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setMetered(int);
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setMinDownstreamBandwidthKbps(int, int);
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setMinUpstreamBandwidthKbps(int, int);
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setOperatorPlmnIds(@NonNull java.util.Set<java.lang.String>);
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setOpportunistic(int);
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setRoaming(int);
+    method @NonNull public android.net.vcn.VcnCellUnderlyingNetworkTemplate.Builder setSimSpecificCarrierIds(@NonNull java.util.Set<java.lang.Integer>);
+  }
+
   public final class VcnConfig implements android.os.Parcelable {
     method public int describeContents();
     method @NonNull public java.util.Set<android.net.vcn.VcnGatewayConnectionConfig> getGatewayConnectionConfigs();
@@ -27141,6 +27259,7 @@
     method @NonNull public String getGatewayConnectionName();
     method @IntRange(from=0x500) public int getMaxMtu();
     method @NonNull public long[] getRetryIntervalsMillis();
+    method @NonNull public java.util.List<android.net.vcn.VcnUnderlyingNetworkTemplate> getVcnUnderlyingNetworkPriorities();
   }
 
   public static final class VcnGatewayConnectionConfig.Builder {
@@ -27150,6 +27269,7 @@
     method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder removeExposedCapability(int);
     method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setMaxMtu(@IntRange(from=0x500) int);
     method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setRetryIntervalsMillis(@NonNull long[]);
+    method @NonNull public android.net.vcn.VcnGatewayConnectionConfig.Builder setVcnUnderlyingNetworkPriorities(@NonNull java.util.List<android.net.vcn.VcnUnderlyingNetworkTemplate>);
   }
 
   public class VcnManager {
@@ -27173,6 +27293,30 @@
     method public abstract void onStatusChanged(int);
   }
 
+  public abstract class VcnUnderlyingNetworkTemplate {
+    method public int getMetered();
+    method public int getMinEntryDownstreamBandwidthKbps();
+    method public int getMinEntryUpstreamBandwidthKbps();
+    method public int getMinExitDownstreamBandwidthKbps();
+    method public int getMinExitUpstreamBandwidthKbps();
+    field public static final int MATCH_ANY = 0; // 0x0
+    field public static final int MATCH_FORBIDDEN = 2; // 0x2
+    field public static final int MATCH_REQUIRED = 1; // 0x1
+  }
+
+  public final class VcnWifiUnderlyingNetworkTemplate extends android.net.vcn.VcnUnderlyingNetworkTemplate {
+    method @NonNull public java.util.Set<java.lang.String> getSsids();
+  }
+
+  public static final class VcnWifiUnderlyingNetworkTemplate.Builder {
+    ctor public VcnWifiUnderlyingNetworkTemplate.Builder();
+    method @NonNull public android.net.vcn.VcnWifiUnderlyingNetworkTemplate build();
+    method @NonNull public android.net.vcn.VcnWifiUnderlyingNetworkTemplate.Builder setMetered(int);
+    method @NonNull public android.net.vcn.VcnWifiUnderlyingNetworkTemplate.Builder setMinDownstreamBandwidthKbps(int, int);
+    method @NonNull public android.net.vcn.VcnWifiUnderlyingNetworkTemplate.Builder setMinUpstreamBandwidthKbps(int, int);
+    method @NonNull public android.net.vcn.VcnWifiUnderlyingNetworkTemplate.Builder setSsids(@NonNull java.util.Set<java.lang.String>);
+  }
+
 }
 
 package android.nfc {
@@ -27799,12 +27943,17 @@
 
   public class EGLExt {
     ctor public EGLExt();
+    method @NonNull public static android.hardware.SyncFence eglDupNativeFenceFDANDROID(@NonNull android.opengl.EGLDisplay, @NonNull android.opengl.EGLSync);
     method public static boolean eglPresentationTimeANDROID(android.opengl.EGLDisplay, android.opengl.EGLSurface, long);
     field public static final int EGL_CONTEXT_FLAGS_KHR = 12540; // 0x30fc
     field public static final int EGL_CONTEXT_MAJOR_VERSION_KHR = 12440; // 0x3098
     field public static final int EGL_CONTEXT_MINOR_VERSION_KHR = 12539; // 0x30fb
+    field public static final int EGL_NO_NATIVE_FENCE_FD_ANDROID = -1; // 0xffffffff
     field public static final int EGL_OPENGL_ES3_BIT_KHR = 64; // 0x40
     field public static final int EGL_RECORDABLE_ANDROID = 12610; // 0x3142
+    field public static final int EGL_SYNC_NATIVE_FENCE_ANDROID = 12612; // 0x3144
+    field public static final int EGL_SYNC_NATIVE_FENCE_FD_ANDROID = 12613; // 0x3145
+    field public static final int EGL_SYNC_NATIVE_FENCE_SIGNALED_ANDROID = 12614; // 0x3146
   }
 
   public class EGLImage extends android.opengl.EGLObjectHandle {
@@ -30583,7 +30732,7 @@
   public class BaseBundle {
     method public void clear();
     method public boolean containsKey(String);
-    method @Nullable public Object get(String);
+    method @Deprecated @Nullable public Object get(String);
     method public boolean getBoolean(String);
     method public boolean getBoolean(String, boolean);
     method @Nullable public boolean[] getBooleanArray(@Nullable String);
@@ -30631,6 +30780,7 @@
     field public static final int BATTERY_HEALTH_UNKNOWN = 1; // 0x1
     field public static final int BATTERY_HEALTH_UNSPECIFIED_FAILURE = 6; // 0x6
     field public static final int BATTERY_PLUGGED_AC = 1; // 0x1
+    field public static final int BATTERY_PLUGGED_DOCK = 8; // 0x8
     field public static final int BATTERY_PLUGGED_USB = 2; // 0x2
     field public static final int BATTERY_PLUGGED_WIRELESS = 4; // 0x4
     field public static final int BATTERY_PROPERTY_CAPACITY = 4; // 0x4
@@ -30755,6 +30905,7 @@
     field public static final int PREVIEW_SDK_INT;
     field public static final String RELEASE;
     field @NonNull public static final String RELEASE_OR_CODENAME;
+    field @NonNull public static final String RELEASE_OR_PREVIEW_DISPLAY;
     field @Deprecated public static final String SDK;
     field public static final int SDK_INT;
     field public static final String SECURITY_PATCH;
@@ -30794,6 +30945,8 @@
     field public static final int Q = 29; // 0x1d
     field public static final int R = 30; // 0x1e
     field public static final int S = 31; // 0x1f
+    field public static final int S_V2 = 32; // 0x20
+    field public static final int TIRAMISU = 10000; // 0x2710
   }
 
   public final class Bundle extends android.os.BaseBundle implements java.lang.Cloneable android.os.Parcelable {
@@ -30822,16 +30975,21 @@
     method public float getFloat(String, float);
     method @Nullable public float[] getFloatArray(@Nullable String);
     method @Nullable public java.util.ArrayList<java.lang.Integer> getIntegerArrayList(@Nullable String);
-    method @Nullable public <T extends android.os.Parcelable> T getParcelable(@Nullable String);
-    method @Nullable public android.os.Parcelable[] getParcelableArray(@Nullable String);
-    method @Nullable public <T extends android.os.Parcelable> java.util.ArrayList<T> getParcelableArrayList(@Nullable String);
-    method @Nullable public java.io.Serializable getSerializable(@Nullable String);
+    method @Deprecated @Nullable public <T extends android.os.Parcelable> T getParcelable(@Nullable String);
+    method @Nullable public <T> T getParcelable(@Nullable String, @NonNull Class<T>);
+    method @Deprecated @Nullable public android.os.Parcelable[] getParcelableArray(@Nullable String);
+    method @Nullable public <T> T[] getParcelableArray(@Nullable String, @NonNull Class<T>);
+    method @Deprecated @Nullable public <T extends android.os.Parcelable> java.util.ArrayList<T> getParcelableArrayList(@Nullable String);
+    method @Nullable public <T> java.util.ArrayList<T> getParcelableArrayList(@Nullable String, @NonNull Class<? extends T>);
+    method @Deprecated @Nullable public java.io.Serializable getSerializable(@Nullable String);
+    method @Nullable public <T extends java.io.Serializable> T getSerializable(@Nullable String, @NonNull Class<T>);
     method public short getShort(String);
     method public short getShort(String, short);
     method @Nullable public short[] getShortArray(@Nullable String);
     method @Nullable public android.util.Size getSize(@Nullable String);
     method @Nullable public android.util.SizeF getSizeF(@Nullable String);
-    method @Nullable public <T extends android.os.Parcelable> android.util.SparseArray<T> getSparseParcelableArray(@Nullable String);
+    method @Deprecated @Nullable public <T extends android.os.Parcelable> android.util.SparseArray<T> getSparseParcelableArray(@Nullable String);
+    method @Nullable public <T> android.util.SparseArray<T> getSparseParcelableArray(@Nullable String, @NonNull Class<? extends T>);
     method @Nullable public java.util.ArrayList<java.lang.String> getStringArrayList(@Nullable String);
     method public boolean hasFileDescriptors();
     method public void putAll(android.os.Bundle);
@@ -31266,6 +31424,7 @@
     method @IntRange(from=0xffffffff) public int indexOf(java.util.Locale);
     method public boolean isEmpty();
     method public static boolean isPseudoLocale(@Nullable android.icu.util.ULocale);
+    method public static boolean matchesLanguageAndScript(@NonNull java.util.Locale, @NonNull java.util.Locale);
     method public static void setDefault(@NonNull @Size(min=1) android.os.LocaleList);
     method @IntRange(from=0) public int size();
     method @NonNull public String toLanguageTags();
@@ -31387,8 +31546,13 @@
     method @Nullable public byte[] createByteArray();
     method @Nullable public char[] createCharArray();
     method @Nullable public double[] createDoubleArray();
+    method @Nullable public <T> T createFixedArray(@NonNull Class<T>, @NonNull int...);
+    method @Nullable public <T, S extends android.os.IInterface> T createFixedArray(@NonNull Class<T>, @NonNull java.util.function.Function<android.os.IBinder,S>, @NonNull int...);
+    method @Nullable public <T, S extends android.os.Parcelable> T createFixedArray(@NonNull Class<T>, @NonNull android.os.Parcelable.Creator<S>, @NonNull int...);
     method @Nullable public float[] createFloatArray();
     method @Nullable public int[] createIntArray();
+    method @Nullable public <T extends android.os.IInterface> T[] createInterfaceArray(@NonNull java.util.function.IntFunction<T[]>, @NonNull java.util.function.Function<android.os.IBinder,T>);
+    method @Nullable public <T extends android.os.IInterface> java.util.ArrayList<T> createInterfaceArrayList(@NonNull java.util.function.Function<android.os.IBinder,T>);
     method @Nullable public long[] createLongArray();
     method @Nullable public String[] createStringArray();
     method @Nullable public java.util.ArrayList<java.lang.String> createStringArrayList();
@@ -31401,13 +31565,19 @@
     method public int dataPosition();
     method public int dataSize();
     method public void enforceInterface(@NonNull String);
+    method public void enforceNoDataAvail();
     method public boolean hasFileDescriptors();
+    method public boolean hasFileDescriptors(int, int);
     method public byte[] marshall();
     method @NonNull public static android.os.Parcel obtain();
-    method @Nullable public Object[] readArray(@Nullable ClassLoader);
-    method @Nullable public java.util.ArrayList readArrayList(@Nullable ClassLoader);
+    method @NonNull public static android.os.Parcel obtain(@NonNull android.os.IBinder);
+    method @Deprecated @Nullable public Object[] readArray(@Nullable ClassLoader);
+    method @Nullable public <T> T[] readArray(@Nullable ClassLoader, @NonNull Class<T>);
+    method @Deprecated @Nullable public java.util.ArrayList readArrayList(@Nullable ClassLoader);
+    method @Nullable public <T> java.util.ArrayList<T> readArrayList(@Nullable ClassLoader, @NonNull Class<? extends T>);
     method public void readBinderArray(@NonNull android.os.IBinder[]);
     method public void readBinderList(@NonNull java.util.List<android.os.IBinder>);
+    method @Nullable public byte[] readBlob();
     method public boolean readBoolean();
     method public void readBooleanArray(@NonNull boolean[]);
     method @Nullable public android.os.Bundle readBundle();
@@ -31420,25 +31590,39 @@
     method public void readException();
     method public void readException(int, String);
     method public android.os.ParcelFileDescriptor readFileDescriptor();
+    method public <T> void readFixedArray(@NonNull T);
+    method public <T, S extends android.os.IInterface> void readFixedArray(@NonNull T, @NonNull java.util.function.Function<android.os.IBinder,S>);
+    method public <T, S extends android.os.Parcelable> void readFixedArray(@NonNull T, @NonNull android.os.Parcelable.Creator<S>);
     method public float readFloat();
     method public void readFloatArray(@NonNull float[]);
-    method @Nullable public java.util.HashMap readHashMap(@Nullable ClassLoader);
+    method @Deprecated @Nullable public java.util.HashMap readHashMap(@Nullable ClassLoader);
+    method @Nullable public <K, V> java.util.HashMap<K,V> readHashMap(@Nullable ClassLoader, @NonNull Class<? extends K>, @NonNull Class<? extends V>);
     method public int readInt();
     method public void readIntArray(@NonNull int[]);
-    method public void readList(@NonNull java.util.List, @Nullable ClassLoader);
+    method public <T extends android.os.IInterface> void readInterfaceArray(@NonNull T[], @NonNull java.util.function.Function<android.os.IBinder,T>);
+    method public <T extends android.os.IInterface> void readInterfaceList(@NonNull java.util.List<T>, @NonNull java.util.function.Function<android.os.IBinder,T>);
+    method @Deprecated public void readList(@NonNull java.util.List, @Nullable ClassLoader);
+    method public <T> void readList(@NonNull java.util.List<? super T>, @Nullable ClassLoader, @NonNull Class<T>);
     method public long readLong();
     method public void readLongArray(@NonNull long[]);
-    method public void readMap(@NonNull java.util.Map, @Nullable ClassLoader);
-    method @Nullable public <T extends android.os.Parcelable> T readParcelable(@Nullable ClassLoader);
-    method @Nullable public android.os.Parcelable[] readParcelableArray(@Nullable ClassLoader);
-    method @Nullable public android.os.Parcelable.Creator<?> readParcelableCreator(@Nullable ClassLoader);
-    method @NonNull public <T extends android.os.Parcelable> java.util.List<T> readParcelableList(@NonNull java.util.List<T>, @Nullable ClassLoader);
+    method @Deprecated public void readMap(@NonNull java.util.Map, @Nullable ClassLoader);
+    method public <K, V> void readMap(@NonNull java.util.Map<? super K,? super V>, @Nullable ClassLoader, @NonNull Class<K>, @NonNull Class<V>);
+    method @Deprecated @Nullable public <T extends android.os.Parcelable> T readParcelable(@Nullable ClassLoader);
+    method @Nullable public <T> T readParcelable(@Nullable ClassLoader, @NonNull Class<T>);
+    method @Deprecated @Nullable public android.os.Parcelable[] readParcelableArray(@Nullable ClassLoader);
+    method @Nullable public <T> T[] readParcelableArray(@Nullable ClassLoader, @NonNull Class<T>);
+    method @Deprecated @Nullable public android.os.Parcelable.Creator<?> readParcelableCreator(@Nullable ClassLoader);
+    method @Nullable public <T> android.os.Parcelable.Creator<T> readParcelableCreator(@Nullable ClassLoader, @NonNull Class<T>);
+    method @Deprecated @NonNull public <T extends android.os.Parcelable> java.util.List<T> readParcelableList(@NonNull java.util.List<T>, @Nullable ClassLoader);
+    method @NonNull public <T> java.util.List<T> readParcelableList(@NonNull java.util.List<T>, @Nullable ClassLoader, @NonNull Class<? extends T>);
     method @Nullable public android.os.PersistableBundle readPersistableBundle();
     method @Nullable public android.os.PersistableBundle readPersistableBundle(@Nullable ClassLoader);
-    method @Nullable public java.io.Serializable readSerializable();
+    method @Deprecated @Nullable public java.io.Serializable readSerializable();
+    method @Nullable public <T> T readSerializable(@Nullable ClassLoader, @NonNull Class<T>);
     method @NonNull public android.util.Size readSize();
     method @NonNull public android.util.SizeF readSizeF();
-    method @Nullable public <T> android.util.SparseArray<T> readSparseArray(@Nullable ClassLoader);
+    method @Deprecated @Nullable public <T> android.util.SparseArray<T> readSparseArray(@Nullable ClassLoader);
+    method @Nullable public <T> android.util.SparseArray<T> readSparseArray(@Nullable ClassLoader, @NonNull Class<? extends T>);
     method @Nullable public android.util.SparseBooleanArray readSparseBooleanArray();
     method @Nullable public String readString();
     method public void readStringArray(@NonNull String[]);
@@ -31452,10 +31636,13 @@
     method public void setDataCapacity(int);
     method public void setDataPosition(int);
     method public void setDataSize(int);
+    method public void setPropagateAllowBlocking();
     method public void unmarshall(@NonNull byte[], int, int);
     method public void writeArray(@Nullable Object[]);
     method public void writeBinderArray(@Nullable android.os.IBinder[]);
     method public void writeBinderList(@Nullable java.util.List<android.os.IBinder>);
+    method public void writeBlob(@Nullable byte[]);
+    method public void writeBlob(@Nullable byte[], int, int);
     method public void writeBoolean(boolean);
     method public void writeBooleanArray(@Nullable boolean[]);
     method public void writeBundle(@Nullable android.os.Bundle);
@@ -31467,10 +31654,13 @@
     method public void writeDoubleArray(@Nullable double[]);
     method public void writeException(@NonNull Exception);
     method public void writeFileDescriptor(@NonNull java.io.FileDescriptor);
+    method public <T> void writeFixedArray(@Nullable T, int, @NonNull int...);
     method public void writeFloat(float);
     method public void writeFloatArray(@Nullable float[]);
     method public void writeInt(int);
     method public void writeIntArray(@Nullable int[]);
+    method public <T extends android.os.IInterface> void writeInterfaceArray(@Nullable T[]);
+    method public <T extends android.os.IInterface> void writeInterfaceList(@Nullable java.util.List<T>);
     method public void writeInterfaceToken(@NonNull String);
     method public void writeList(@Nullable java.util.List);
     method public void writeLong(long);
@@ -31570,7 +31760,7 @@
 
   public interface Parcelable {
     method public int describeContents();
-    method public void writeToParcel(android.os.Parcel, int);
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
     field public static final int CONTENTS_FILE_DESCRIPTOR = 1; // 0x1
     field public static final int PARCELABLE_WRITE_RETURN_VALUE = 1; // 0x1
   }
@@ -31636,8 +31826,10 @@
     method public float getThermalHeadroom(@IntRange(from=0, to=60) int);
     method public boolean isBatteryDischargePredictionPersonalized();
     method public boolean isDeviceIdleMode();
+    method public boolean isDeviceLightIdleMode();
     method public boolean isIgnoringBatteryOptimizations(String);
     method public boolean isInteractive();
+    method public boolean isLowPowerStandbyEnabled();
     method public boolean isPowerSaveMode();
     method public boolean isRebootingUserspaceSupported();
     method @Deprecated public boolean isScreenOn();
@@ -31646,8 +31838,10 @@
     method public android.os.PowerManager.WakeLock newWakeLock(int, String);
     method @RequiresPermission(android.Manifest.permission.REBOOT) public void reboot(@Nullable String);
     method public void removeThermalStatusListener(@NonNull android.os.PowerManager.OnThermalStatusChangedListener);
-    field public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000
+    field @Deprecated public static final int ACQUIRE_CAUSES_WAKEUP = 268435456; // 0x10000000
     field public static final String ACTION_DEVICE_IDLE_MODE_CHANGED = "android.os.action.DEVICE_IDLE_MODE_CHANGED";
+    field public static final String ACTION_DEVICE_LIGHT_IDLE_MODE_CHANGED = "android.os.action.LIGHT_DEVICE_IDLE_MODE_CHANGED";
+    field public static final String ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED = "android.os.action.LOW_POWER_STANDBY_ENABLED_CHANGED";
     field public static final String ACTION_POWER_SAVE_MODE_CHANGED = "android.os.action.POWER_SAVE_MODE_CHANGED";
     field @Deprecated public static final int FULL_WAKE_LOCK = 26; // 0x1a
     field public static final int LOCATION_MODE_ALL_DISABLED_WHEN_SCREEN_OFF = 2; // 0x2
@@ -31681,23 +31875,32 @@
     method public void release();
     method public void release(int);
     method public void setReferenceCounted(boolean);
+    method public void setStateListener(@NonNull java.util.concurrent.Executor, @Nullable android.os.PowerManager.WakeLockStateListener);
     method public void setWorkSource(android.os.WorkSource);
   }
 
+  public static interface PowerManager.WakeLockStateListener {
+    method public void onStateChanged(boolean);
+  }
+
   public class Process {
     ctor public Process();
     method public static final long getElapsedCpuTime();
     method public static final int[] getExclusiveCores();
     method public static final int getGidForName(String);
-    method public static final long getStartElapsedRealtime();
-    method public static final long getStartUptimeMillis();
+    method public static long getStartElapsedRealtime();
+    method public static long getStartRequestedElapsedRealtime();
+    method public static long getStartRequestedUptimeMillis();
+    method public static long getStartUptimeMillis();
     method public static final int getThreadPriority(int) throws java.lang.IllegalArgumentException;
     method public static final int getUidForName(String);
     method public static final boolean is64Bit();
     method public static boolean isApplicationUid(int);
     method public static final boolean isIsolated();
+    method public static final boolean isSdkSandbox();
     method public static final void killProcess(int);
     method public static final int myPid();
+    method @NonNull public static String myProcessName();
     method public static final int myTid();
     method public static final int myUid();
     method public static android.os.UserHandle myUserHandle();
@@ -31787,6 +31990,7 @@
     method public void close();
     method @NonNull public static android.os.SharedMemory create(@Nullable String, int) throws android.system.ErrnoException;
     method public int describeContents();
+    method @NonNull public static android.os.SharedMemory fromFileDescriptor(@NonNull android.os.ParcelFileDescriptor);
     method public int getSize();
     method @NonNull public java.nio.ByteBuffer map(int, int, int) throws android.system.ErrnoException;
     method @NonNull public java.nio.ByteBuffer mapReadOnly() throws android.system.ErrnoException;
@@ -31898,6 +32102,7 @@
 
   public final class SystemClock {
     method @NonNull public static java.time.Clock currentGnssTimeClock();
+    method @NonNull public static java.time.Clock currentNetworkTimeClock();
     method public static long currentThreadTimeMillis();
     method public static long elapsedRealtime();
     method public static long elapsedRealtimeNanos();
@@ -31959,7 +32164,7 @@
     method @RequiresPermission(anyOf={"android.permission.MANAGE_USERS", "android.permission.CREATE_USERS"}) public int getUserCount();
     method public long getUserCreationTime(android.os.UserHandle);
     method public android.os.UserHandle getUserForSerialNumber(long);
-    method @NonNull @RequiresPermission(anyOf={"android.permission.MANAGE_USERS", android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED, "android.permission.CREATE_USERS"}, conditional=true) public String getUserName();
+    method @NonNull @RequiresPermission(anyOf={"android.permission.MANAGE_USERS", "android.permission.CREATE_USERS", "android.permission.QUERY_USERS", android.Manifest.permission.GET_ACCOUNTS_PRIVILEGED}) public String getUserName();
     method public java.util.List<android.os.UserHandle> getUserProfiles();
     method public android.os.Bundle getUserRestrictions();
     method @RequiresPermission(anyOf={"android.permission.MANAGE_USERS", "android.permission.INTERACT_ACROSS_USERS"}, conditional=true) public android.os.Bundle getUserRestrictions(android.os.UserHandle);
@@ -31967,6 +32172,7 @@
     method public boolean isDemoUser();
     method public static boolean isHeadlessSystemUserMode();
     method public boolean isManagedProfile();
+    method public boolean isProfile();
     method public boolean isQuietModeEnabled(android.os.UserHandle);
     method public boolean isSystemUser();
     method public boolean isUserAGoat();
@@ -31985,6 +32191,7 @@
     field public static final String ALLOW_PARENT_PROFILE_APP_LINKING = "allow_parent_profile_app_linking";
     field @Deprecated public static final String DISALLOW_ADD_MANAGED_PROFILE = "no_add_managed_profile";
     field public static final String DISALLOW_ADD_USER = "no_add_user";
+    field public static final String DISALLOW_ADD_WIFI_CONFIG = "no_add_wifi_config";
     field public static final String DISALLOW_ADJUST_VOLUME = "no_adjust_volume";
     field public static final String DISALLOW_AIRPLANE_MODE = "no_airplane_mode";
     field public static final String DISALLOW_AMBIENT_DISPLAY = "no_ambient_display";
@@ -31993,6 +32200,7 @@
     field public static final String DISALLOW_BLUETOOTH = "no_bluetooth";
     field public static final String DISALLOW_BLUETOOTH_SHARING = "no_bluetooth_sharing";
     field public static final String DISALLOW_CAMERA_TOGGLE = "disallow_camera_toggle";
+    field public static final String DISALLOW_CHANGE_WIFI_STATE = "no_change_wifi_state";
     field public static final String DISALLOW_CONFIG_BLUETOOTH = "no_config_bluetooth";
     field public static final String DISALLOW_CONFIG_BRIGHTNESS = "no_config_brightness";
     field public static final String DISALLOW_CONFIG_CELL_BROADCASTS = "no_config_cell_broadcasts";
@@ -32031,6 +32239,7 @@
     field public static final String DISALLOW_SET_WALLPAPER = "no_set_wallpaper";
     field public static final String DISALLOW_SHARE_INTO_MANAGED_PROFILE = "no_sharing_into_profile";
     field public static final String DISALLOW_SHARE_LOCATION = "no_share_location";
+    field public static final String DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI = "no_sharing_admin_configured_wifi";
     field public static final String DISALLOW_SMS = "no_sms";
     field public static final String DISALLOW_SYSTEM_ERROR_DIALOGS = "no_system_error_dialogs";
     field public static final String DISALLOW_UNIFIED_PASSWORD = "no_unified_password";
@@ -32038,6 +32247,8 @@
     field public static final String DISALLOW_UNMUTE_MICROPHONE = "no_unmute_microphone";
     field public static final String DISALLOW_USB_FILE_TRANSFER = "no_usb_file_transfer";
     field public static final String DISALLOW_USER_SWITCH = "no_user_switch";
+    field public static final String DISALLOW_WIFI_DIRECT = "no_wifi_direct";
+    field public static final String DISALLOW_WIFI_TETHERING = "no_wifi_tethering";
     field public static final String ENSURE_VERIFY_APPS = "ensure_verify_apps";
     field public static final String KEY_RESTRICTIONS_PENDING = "restrictions_pending";
     field public static final int QUIET_MODE_DISABLE_ONLY_IF_CREDENTIAL_NOT_REQUIRED = 1; // 0x1
@@ -32057,6 +32268,7 @@
   }
 
   public final class VibrationAttributes implements android.os.Parcelable {
+    method @NonNull public static android.os.VibrationAttributes createForUsage(int);
     method public int describeContents();
     method public int getFlags();
     method public int getUsage();
@@ -32065,13 +32277,16 @@
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.os.VibrationAttributes> CREATOR;
     field public static final int FLAG_BYPASS_INTERRUPTION_POLICY = 1; // 0x1
+    field public static final int USAGE_ACCESSIBILITY = 66; // 0x42
     field public static final int USAGE_ALARM = 17; // 0x11
     field public static final int USAGE_CLASS_ALARM = 1; // 0x1
     field public static final int USAGE_CLASS_FEEDBACK = 2; // 0x2
     field public static final int USAGE_CLASS_MASK = 15; // 0xf
+    field public static final int USAGE_CLASS_MEDIA = 3; // 0x3
     field public static final int USAGE_CLASS_UNKNOWN = 0; // 0x0
     field public static final int USAGE_COMMUNICATION_REQUEST = 65; // 0x41
     field public static final int USAGE_HARDWARE_FEEDBACK = 50; // 0x32
+    field public static final int USAGE_MEDIA = 19; // 0x13
     field public static final int USAGE_NOTIFICATION = 49; // 0x31
     field public static final int USAGE_PHYSICAL_EMULATION = 34; // 0x22
     field public static final int USAGE_RINGTONE = 33; // 0x21
@@ -32082,6 +32297,7 @@
   public static final class VibrationAttributes.Builder {
     ctor public VibrationAttributes.Builder();
     ctor public VibrationAttributes.Builder(@Nullable android.os.VibrationAttributes);
+    ctor public VibrationAttributes.Builder(@NonNull android.media.AudioAttributes);
     method @NonNull public android.os.VibrationAttributes build();
     method @NonNull public android.os.VibrationAttributes.Builder setFlags(int, int);
     method @NonNull public android.os.VibrationAttributes.Builder setUsage(int);
@@ -32094,6 +32310,9 @@
     method public static android.os.VibrationEffect createWaveform(long[], int[], int);
     method public int describeContents();
     method @NonNull public static android.os.VibrationEffect.Composition startComposition();
+    method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform();
+    method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform(@NonNull android.os.VibrationEffect.VibrationParameter);
+    method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform(@NonNull android.os.VibrationEffect.VibrationParameter, @NonNull android.os.VibrationEffect.VibrationParameter);
     field @NonNull public static final android.os.Parcelable.Creator<android.os.VibrationEffect> CREATOR;
     field public static final int DEFAULT_AMPLITUDE = -1; // 0xffffffff
     field public static final int EFFECT_CLICK = 0; // 0x0
@@ -32103,10 +32322,13 @@
   }
 
   public static final class VibrationEffect.Composition {
+    method @NonNull public android.os.VibrationEffect.Composition addEffect(@NonNull android.os.VibrationEffect);
+    method @NonNull public android.os.VibrationEffect.Composition addOffDuration(@NonNull java.time.Duration);
     method @NonNull public android.os.VibrationEffect.Composition addPrimitive(int);
     method @NonNull public android.os.VibrationEffect.Composition addPrimitive(int, @FloatRange(from=0.0f, to=1.0f) float);
     method @NonNull public android.os.VibrationEffect.Composition addPrimitive(int, @FloatRange(from=0.0f, to=1.0f) float, @IntRange(from=0) int);
     method @NonNull public android.os.VibrationEffect compose();
+    method @NonNull public android.os.VibrationEffect.Composition repeatEffectIndefinitely(@NonNull android.os.VibrationEffect);
     field public static final int PRIMITIVE_CLICK = 1; // 0x1
     field public static final int PRIMITIVE_LOW_TICK = 8; // 0x8
     field public static final int PRIMITIVE_QUICK_FALL = 6; // 0x6
@@ -32117,22 +32339,42 @@
     field public static final int PRIMITIVE_TICK = 7; // 0x7
   }
 
+  public static final class VibrationEffect.Composition.UnreachableAfterRepeatingIndefinitelyException extends java.lang.IllegalStateException {
+  }
+
+  public static class VibrationEffect.VibrationParameter {
+    method @NonNull public static android.os.VibrationEffect.VibrationParameter targetAmplitude(@FloatRange(from=0, to=1) float);
+    method @NonNull public static android.os.VibrationEffect.VibrationParameter targetFrequency(@FloatRange(from=1) float);
+  }
+
+  public static final class VibrationEffect.WaveformBuilder {
+    method @NonNull public android.os.VibrationEffect.WaveformBuilder addSustain(@NonNull java.time.Duration);
+    method @NonNull public android.os.VibrationEffect.WaveformBuilder addTransition(@NonNull java.time.Duration, @NonNull android.os.VibrationEffect.VibrationParameter);
+    method @NonNull public android.os.VibrationEffect.WaveformBuilder addTransition(@NonNull java.time.Duration, @NonNull android.os.VibrationEffect.VibrationParameter, @NonNull android.os.VibrationEffect.VibrationParameter);
+    method @NonNull public android.os.VibrationEffect build();
+  }
+
   public abstract class Vibrator {
     method public final int areAllEffectsSupported(@NonNull int...);
     method public final boolean areAllPrimitivesSupported(@NonNull int...);
     method @NonNull public int[] areEffectsSupported(@NonNull int...);
     method @NonNull public boolean[] arePrimitivesSupported(@NonNull int...);
     method @RequiresPermission(android.Manifest.permission.VIBRATE) public abstract void cancel();
+    method @Nullable public android.os.vibrator.VibratorFrequencyProfile getFrequencyProfile();
     method public int getId();
     method @NonNull public int[] getPrimitiveDurations(@NonNull int...);
+    method public float getQFactor();
+    method public float getResonantFrequency();
     method public abstract boolean hasAmplitudeControl();
+    method public boolean hasFrequencyControl();
     method public abstract boolean hasVibrator();
     method @Deprecated @RequiresPermission(android.Manifest.permission.VIBRATE) public void vibrate(long);
     method @Deprecated @RequiresPermission(android.Manifest.permission.VIBRATE) public void vibrate(long, android.media.AudioAttributes);
     method @Deprecated @RequiresPermission(android.Manifest.permission.VIBRATE) public void vibrate(long[], int);
     method @Deprecated @RequiresPermission(android.Manifest.permission.VIBRATE) public void vibrate(long[], int, android.media.AudioAttributes);
     method @RequiresPermission(android.Manifest.permission.VIBRATE) public void vibrate(android.os.VibrationEffect);
-    method @RequiresPermission(android.Manifest.permission.VIBRATE) public void vibrate(android.os.VibrationEffect, android.media.AudioAttributes);
+    method @Deprecated @RequiresPermission(android.Manifest.permission.VIBRATE) public void vibrate(android.os.VibrationEffect, android.media.AudioAttributes);
+    method @RequiresPermission(android.Manifest.permission.VIBRATE) public void vibrate(@NonNull android.os.VibrationEffect, @NonNull android.os.VibrationAttributes);
     field public static final int VIBRATION_EFFECT_SUPPORT_NO = 2; // 0x2
     field public static final int VIBRATION_EFFECT_SUPPORT_UNKNOWN = 0; // 0x0
     field public static final int VIBRATION_EFFECT_SUPPORT_YES = 1; // 0x1
@@ -32330,6 +32572,7 @@
     method @Nullable public android.os.storage.StorageVolume getStorageVolume(@NonNull java.io.File);
     method @NonNull public android.os.storage.StorageVolume getStorageVolume(@NonNull android.net.Uri);
     method @NonNull public java.util.List<android.os.storage.StorageVolume> getStorageVolumes();
+    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_EXTERNAL_STORAGE) public java.util.List<android.os.storage.StorageVolume> getStorageVolumesIncludingSharedProfiles();
     method @NonNull public java.util.UUID getUuidForPath(@NonNull java.io.File) throws java.io.IOException;
     method public boolean isAllocationSupported(@NonNull java.io.FileDescriptor);
     method public boolean isCacheBehaviorGroup(java.io.File) throws java.io.IOException;
@@ -32363,6 +32606,7 @@
     method public String getDescription(android.content.Context);
     method @Nullable public java.io.File getDirectory();
     method @Nullable public String getMediaStoreVolumeName();
+    method @NonNull public android.os.UserHandle getOwner();
     method public String getState();
     method @Nullable public java.util.UUID getStorageUuid();
     method @Nullable public String getUuid();
@@ -32450,6 +32694,17 @@
 
 }
 
+package android.os.vibrator {
+
+  public final class VibratorFrequencyProfile {
+    method public float getMaxAmplitudeMeasurementInterval();
+    method @FloatRange(from=0, to=1) @NonNull public float[] getMaxAmplitudeMeasurements();
+    method public float getMaxFrequency();
+    method public float getMinFrequency();
+  }
+
+}
+
 package android.preference {
 
   @Deprecated public class CheckBoxPreference extends android.preference.TwoStatePreference {
@@ -33693,6 +33948,7 @@
     field public static final int PRESENTATION_ALLOWED = 1; // 0x1
     field public static final int PRESENTATION_PAYPHONE = 4; // 0x4
     field public static final int PRESENTATION_RESTRICTED = 2; // 0x2
+    field public static final int PRESENTATION_UNAVAILABLE = 5; // 0x5
     field public static final int PRESENTATION_UNKNOWN = 3; // 0x3
     field public static final String PRIORITY = "priority";
     field public static final int PRIORITY_NORMAL = 0; // 0x0
@@ -34786,6 +35042,8 @@
   }
 
   public static final class ContactsContract.Settings implements android.provider.ContactsContract.SettingsColumns {
+    method @Nullable public static android.accounts.Account getDefaultAccount(@NonNull android.content.ContentResolver);
+    field public static final String ACTION_SET_DEFAULT_ACCOUNT = "android.provider.action.SET_DEFAULT_ACCOUNT";
     field public static final String CONTENT_ITEM_TYPE = "vnd.android.cursor.item/setting";
     field public static final String CONTENT_TYPE = "vnd.android.cursor.dir/setting";
     field public static final android.net.Uri CONTENT_URI;
@@ -35115,10 +35373,12 @@
     field public static final String ACTION_ACCESSIBILITY_SETTINGS = "android.settings.ACCESSIBILITY_SETTINGS";
     field public static final String ACTION_ADD_ACCOUNT = "android.settings.ADD_ACCOUNT_SETTINGS";
     field public static final String ACTION_AIRPLANE_MODE_SETTINGS = "android.settings.AIRPLANE_MODE_SETTINGS";
+    field public static final String ACTION_ALL_APPS_NOTIFICATION_SETTINGS = "android.settings.ALL_APPS_NOTIFICATION_SETTINGS";
     field public static final String ACTION_APN_SETTINGS = "android.settings.APN_SETTINGS";
     field public static final String ACTION_APPLICATION_DETAILS_SETTINGS = "android.settings.APPLICATION_DETAILS_SETTINGS";
     field public static final String ACTION_APPLICATION_DEVELOPMENT_SETTINGS = "android.settings.APPLICATION_DEVELOPMENT_SETTINGS";
     field public static final String ACTION_APPLICATION_SETTINGS = "android.settings.APPLICATION_SETTINGS";
+    field public static final String ACTION_APP_LOCALE_SETTINGS = "android.settings.APP_LOCALE_SETTINGS";
     field public static final String ACTION_APP_NOTIFICATION_BUBBLE_SETTINGS = "android.settings.APP_NOTIFICATION_BUBBLE_SETTINGS";
     field public static final String ACTION_APP_NOTIFICATION_SETTINGS = "android.settings.APP_NOTIFICATION_SETTINGS";
     field public static final String ACTION_APP_OPEN_BY_DEFAULT_SETTINGS = "android.settings.APP_OPEN_BY_DEFAULT_SETTINGS";
@@ -35155,6 +35415,7 @@
     field public static final String ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION = "android.settings.MANAGE_APP_ALL_FILES_ACCESS_PERMISSION";
     field public static final String ACTION_MANAGE_DEFAULT_APPS_SETTINGS = "android.settings.MANAGE_DEFAULT_APPS_SETTINGS";
     field public static final String ACTION_MANAGE_OVERLAY_PERMISSION = "android.settings.action.MANAGE_OVERLAY_PERMISSION";
+    field public static final String ACTION_MANAGE_SUPERVISOR_RESTRICTED_SETTING = "android.settings.MANAGE_SUPERVISOR_RESTRICTED_SETTING";
     field public static final String ACTION_MANAGE_UNKNOWN_APP_SOURCES = "android.settings.MANAGE_UNKNOWN_APP_SOURCES";
     field public static final String ACTION_MANAGE_WRITE_SETTINGS = "android.settings.action.MANAGE_WRITE_SETTINGS";
     field public static final String ACTION_MEMORY_CARD_SETTINGS = "android.settings.MEMORY_CARD_SETTINGS";
@@ -35179,6 +35440,7 @@
     field public static final String ACTION_SEARCH_SETTINGS = "android.search.action.SEARCH_SETTINGS";
     field public static final String ACTION_SECURITY_SETTINGS = "android.settings.SECURITY_SETTINGS";
     field public static final String ACTION_SETTINGS = "android.settings.SETTINGS";
+    field public static final String ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY = "android.settings.SETTINGS_EMBED_DEEP_LINK_ACTIVITY";
     field public static final String ACTION_SHOW_REGULATORY_INFO = "android.settings.SHOW_REGULATORY_INFO";
     field public static final String ACTION_SHOW_WORK_POLICY_INFO = "android.settings.SHOW_WORK_POLICY_INFO";
     field public static final String ACTION_SOUND_SETTINGS = "android.settings.SOUND_SETTINGS";
@@ -35219,11 +35481,16 @@
     field public static final String EXTRA_EASY_CONNECT_ERROR_CODE = "android.provider.extra.EASY_CONNECT_ERROR_CODE";
     field public static final String EXTRA_INPUT_METHOD_ID = "input_method_id";
     field public static final String EXTRA_NOTIFICATION_LISTENER_COMPONENT_NAME = "android.provider.extra.NOTIFICATION_LISTENER_COMPONENT_NAME";
+    field public static final String EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY = "android.provider.extra.SETTINGS_EMBEDDED_DEEP_LINK_HIGHLIGHT_MENU_KEY";
+    field public static final String EXTRA_SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI = "android.provider.extra.SETTINGS_EMBEDDED_DEEP_LINK_INTENT_URI";
     field public static final String EXTRA_SUB_ID = "android.provider.extra.SUB_ID";
+    field public static final String EXTRA_SUPERVISOR_RESTRICTED_SETTING_KEY = "android.provider.extra.SUPERVISOR_RESTRICTED_SETTING_KEY";
     field public static final String EXTRA_WIFI_NETWORK_LIST = "android.provider.extra.WIFI_NETWORK_LIST";
     field public static final String EXTRA_WIFI_NETWORK_RESULT_LIST = "android.provider.extra.WIFI_NETWORK_RESULT_LIST";
     field public static final String INTENT_CATEGORY_USAGE_ACCESS_CONFIG = "android.intent.category.USAGE_ACCESS_CONFIG";
     field public static final String METADATA_USAGE_ACCESS_REASON = "android.settings.metadata.USAGE_ACCESS_REASON";
+    field public static final int SUPERVISOR_VERIFICATION_SETTING_BIOMETRICS = 1; // 0x1
+    field public static final int SUPERVISOR_VERIFICATION_SETTING_UNKNOWN = 0; // 0x0
   }
 
   public static final class Settings.Global extends android.provider.Settings.NameValueTable {
@@ -35245,7 +35512,7 @@
     field public static final String AIRPLANE_MODE_RADIOS = "airplane_mode_radios";
     field public static final String ALWAYS_FINISH_ACTIVITIES = "always_finish_activities";
     field public static final String ANIMATOR_DURATION_SCALE = "animator_duration_scale";
-    field public static final String APPLY_RAMPING_RINGER = "apply_ramping_ringer";
+    field @Deprecated public static final String APPLY_RAMPING_RINGER = "apply_ramping_ringer";
     field public static final String AUTO_TIME = "auto_time";
     field public static final String AUTO_TIME_ZONE = "auto_time_zone";
     field public static final String BLUETOOTH_ON = "bluetooth_on";
@@ -35435,7 +35702,7 @@
     field public static final String DTMF_TONE_WHEN_DIALING = "dtmf_tone";
     field public static final String END_BUTTON_BEHAVIOR = "end_button_behavior";
     field public static final String FONT_SCALE = "font_scale";
-    field public static final String HAPTIC_FEEDBACK_ENABLED = "haptic_feedback_enabled";
+    field @Deprecated public static final String HAPTIC_FEEDBACK_ENABLED = "haptic_feedback_enabled";
     field @Deprecated public static final String HTTP_PROXY = "http_proxy";
     field @Deprecated public static final String INSTALL_NON_MARKET_APPS = "install_non_market_apps";
     field @Deprecated public static final String LOCATION_PROVIDERS_ALLOWED = "location_providers_allowed";
@@ -35479,7 +35746,7 @@
     field public static final String USER_ROTATION = "user_rotation";
     field @Deprecated public static final String USE_GOOGLE_MAIL = "use_google_mail";
     field public static final String VIBRATE_ON = "vibrate_on";
-    field public static final String VIBRATE_WHEN_RINGING = "vibrate_when_ringing";
+    field @Deprecated public static final String VIBRATE_WHEN_RINGING = "vibrate_when_ringing";
     field @Deprecated public static final String WAIT_FOR_DEBUGGER = "wait_for_debugger";
     field @Deprecated public static final String WALLPAPER_ACTIVITY = "wallpaper_activity";
     field @Deprecated public static final String WIFI_MAX_DHCP_RETRY_COUNT = "wifi_max_dhcp_retry_count";
@@ -37278,6 +37545,28 @@
     method @Deprecated @NonNull public android.security.KeyPairGeneratorSpec.Builder setSubject(@NonNull javax.security.auth.x500.X500Principal);
   }
 
+  public class KeyStoreException extends java.lang.Exception {
+    method public int getNumericErrorCode();
+    method public boolean isSystemError();
+    method public boolean isTransientFailure();
+    method public boolean requiresUserAuthentication();
+    field public static final int ERROR_ATTESTATION_CHALLENGE_TOO_LARGE = 9; // 0x9
+    field public static final int ERROR_ID_ATTESTATION_FAILURE = 8; // 0x8
+    field public static final int ERROR_INCORRECT_USAGE = 13; // 0xd
+    field public static final int ERROR_INTERNAL_SYSTEM_ERROR = 4; // 0x4
+    field public static final int ERROR_KEYMINT_FAILURE = 10; // 0xa
+    field public static final int ERROR_KEYSTORE_FAILURE = 11; // 0xb
+    field public static final int ERROR_KEYSTORE_UNINITIALIZED = 3; // 0x3
+    field public static final int ERROR_KEY_CORRUPTED = 7; // 0x7
+    field public static final int ERROR_KEY_DOES_NOT_EXIST = 6; // 0x6
+    field public static final int ERROR_KEY_NOT_TEMPORALLY_VALID = 14; // 0xe
+    field public static final int ERROR_KEY_OPERATION_EXPIRED = 15; // 0xf
+    field public static final int ERROR_OTHER = 1; // 0x1
+    field public static final int ERROR_PERMISSION_DENIED = 5; // 0x5
+    field public static final int ERROR_UNIMPLEMENTED = 12; // 0xc
+    field public static final int ERROR_USER_AUTHENTICATION_REQUIRED = 2; // 0x2
+  }
+
   @Deprecated public final class KeyStoreParameter implements java.security.KeyStore.ProtectionParameter {
     method @Deprecated public boolean isEncryptionRequired();
   }
@@ -37324,6 +37613,51 @@
     ctor public CipherSuiteNotSupportedException(@NonNull String, @NonNull Throwable);
   }
 
+  public class CredentialDataRequest {
+    method @NonNull public java.util.Map<java.lang.String,java.util.Collection<java.lang.String>> getDeviceSignedEntriesToRequest();
+    method @NonNull public java.util.Map<java.lang.String,java.util.Collection<java.lang.String>> getIssuerSignedEntriesToRequest();
+    method @Nullable public byte[] getReaderSignature();
+    method @Nullable public byte[] getRequestMessage();
+    method public boolean isAllowUsingExhaustedKeys();
+    method public boolean isAllowUsingExpiredKeys();
+    method public boolean isIncrementUseCount();
+  }
+
+  public static final class CredentialDataRequest.Builder {
+    ctor public CredentialDataRequest.Builder();
+    method @NonNull public android.security.identity.CredentialDataRequest build();
+    method @NonNull public android.security.identity.CredentialDataRequest.Builder setAllowUsingExhaustedKeys(boolean);
+    method @NonNull public android.security.identity.CredentialDataRequest.Builder setAllowUsingExpiredKeys(boolean);
+    method @NonNull public android.security.identity.CredentialDataRequest.Builder setDeviceSignedEntriesToRequest(@NonNull java.util.Map<java.lang.String,java.util.Collection<java.lang.String>>);
+    method @NonNull public android.security.identity.CredentialDataRequest.Builder setIncrementUseCount(boolean);
+    method @NonNull public android.security.identity.CredentialDataRequest.Builder setIssuerSignedEntriesToRequest(@NonNull java.util.Map<java.lang.String,java.util.Collection<java.lang.String>>);
+    method @NonNull public android.security.identity.CredentialDataRequest.Builder setReaderSignature(@NonNull byte[]);
+    method @NonNull public android.security.identity.CredentialDataRequest.Builder setRequestMessage(@NonNull byte[]);
+  }
+
+  public abstract class CredentialDataResult {
+    method @Nullable public abstract byte[] getDeviceMac();
+    method @NonNull public abstract byte[] getDeviceNameSpaces();
+    method @NonNull public abstract android.security.identity.CredentialDataResult.Entries getDeviceSignedEntries();
+    method @NonNull public abstract android.security.identity.CredentialDataResult.Entries getIssuerSignedEntries();
+    method @NonNull public abstract byte[] getStaticAuthenticationData();
+  }
+
+  public static interface CredentialDataResult.Entries {
+    method @Nullable public byte[] getEntry(@NonNull String, @NonNull String);
+    method @NonNull public java.util.Collection<java.lang.String> getEntryNames(@NonNull String);
+    method @NonNull public java.util.Collection<java.lang.String> getNamespaces();
+    method @NonNull public java.util.Collection<java.lang.String> getRetrievedEntryNames(@NonNull String);
+    method public int getStatus(@NonNull String, @NonNull String);
+    field public static final int STATUS_NOT_IN_REQUEST_MESSAGE = 3; // 0x3
+    field public static final int STATUS_NOT_REQUESTED = 2; // 0x2
+    field public static final int STATUS_NO_ACCESS_CONTROL_PROFILES = 6; // 0x6
+    field public static final int STATUS_NO_SUCH_ENTRY = 1; // 0x1
+    field public static final int STATUS_OK = 0; // 0x0
+    field public static final int STATUS_READER_AUTHENTICATION_FAILED = 5; // 0x5
+    field public static final int STATUS_USER_AUTHENTICATION_FAILED = 4; // 0x4
+  }
+
   public class DocTypeNotSupportedException extends android.security.identity.IdentityCredentialException {
     ctor public DocTypeNotSupportedException(@NonNull String);
     ctor public DocTypeNotSupportedException(@NonNull String, @NonNull Throwable);
@@ -37335,19 +37669,19 @@
   }
 
   public abstract class IdentityCredential {
-    method @NonNull public abstract java.security.KeyPair createEphemeralKeyPair();
-    method @NonNull public abstract byte[] decryptMessageFromReader(@NonNull byte[]) throws android.security.identity.MessageDecryptionException;
+    method @Deprecated @NonNull public abstract java.security.KeyPair createEphemeralKeyPair();
+    method @Deprecated @NonNull public abstract byte[] decryptMessageFromReader(@NonNull byte[]) throws android.security.identity.MessageDecryptionException;
     method @NonNull public byte[] delete(@NonNull byte[]);
-    method @NonNull public abstract byte[] encryptMessageToReader(@NonNull byte[]);
+    method @Deprecated @NonNull public abstract byte[] encryptMessageToReader(@NonNull byte[]);
     method @NonNull public abstract java.util.Collection<java.security.cert.X509Certificate> getAuthKeysNeedingCertification();
     method @NonNull public abstract int[] getAuthenticationDataUsageCount();
     method @NonNull public abstract java.util.Collection<java.security.cert.X509Certificate> getCredentialKeyCertificateChain();
-    method @NonNull public abstract android.security.identity.ResultData getEntries(@Nullable byte[], @NonNull java.util.Map<java.lang.String,java.util.Collection<java.lang.String>>, @Nullable byte[], @Nullable byte[]) throws android.security.identity.EphemeralPublicKeyNotFoundException, android.security.identity.InvalidReaderSignatureException, android.security.identity.InvalidRequestMessageException, android.security.identity.NoAuthenticationKeyAvailableException, android.security.identity.SessionTranscriptMismatchException;
+    method @Deprecated @NonNull public abstract android.security.identity.ResultData getEntries(@Nullable byte[], @NonNull java.util.Map<java.lang.String,java.util.Collection<java.lang.String>>, @Nullable byte[], @Nullable byte[]) throws android.security.identity.EphemeralPublicKeyNotFoundException, android.security.identity.InvalidReaderSignatureException, android.security.identity.InvalidRequestMessageException, android.security.identity.NoAuthenticationKeyAvailableException, android.security.identity.SessionTranscriptMismatchException;
     method @NonNull public byte[] proveOwnership(@NonNull byte[]);
-    method public abstract void setAllowUsingExhaustedKeys(boolean);
-    method public void setAllowUsingExpiredKeys(boolean);
+    method @Deprecated public abstract void setAllowUsingExhaustedKeys(boolean);
+    method @Deprecated public void setAllowUsingExpiredKeys(boolean);
     method public abstract void setAvailableAuthenticationKeys(int, int);
-    method public abstract void setReaderEphemeralPublicKey(@NonNull java.security.PublicKey) throws java.security.InvalidKeyException;
+    method @Deprecated public abstract void setReaderEphemeralPublicKey(@NonNull java.security.PublicKey) throws java.security.InvalidKeyException;
     method @Deprecated public abstract void storeStaticAuthenticationData(@NonNull java.security.cert.X509Certificate, @NonNull byte[]) throws android.security.identity.UnknownAuthenticationKeyException;
     method public void storeStaticAuthenticationData(@NonNull java.security.cert.X509Certificate, @NonNull java.time.Instant, @NonNull byte[]) throws android.security.identity.UnknownAuthenticationKeyException;
     method @NonNull public byte[] update(@NonNull android.security.identity.PersonalizationData);
@@ -37360,6 +37694,7 @@
 
   public abstract class IdentityCredentialStore {
     method @NonNull public abstract android.security.identity.WritableIdentityCredential createCredential(@NonNull String, @NonNull String) throws android.security.identity.AlreadyPersonalizedException, android.security.identity.DocTypeNotSupportedException;
+    method @NonNull public android.security.identity.PresentationSession createPresentationSession(int) throws android.security.identity.CipherSuiteNotSupportedException;
     method @Deprecated @Nullable public abstract byte[] deleteCredentialByName(@NonNull String);
     method @Nullable public abstract android.security.identity.IdentityCredential getCredentialByName(@NonNull String, int) throws android.security.identity.CipherSuiteNotSupportedException;
     method @Nullable public static android.security.identity.IdentityCredentialStore getDirectAccessInstance(@NonNull android.content.Context);
@@ -37398,22 +37733,29 @@
     method @NonNull public android.security.identity.PersonalizationData.Builder putEntry(@NonNull String, @NonNull String, @NonNull java.util.Collection<android.security.identity.AccessControlProfileId>, @NonNull byte[]);
   }
 
-  public abstract class ResultData {
-    method @NonNull public abstract byte[] getAuthenticatedData();
-    method @Nullable public abstract byte[] getEntry(@NonNull String, @NonNull String);
-    method @Nullable public abstract java.util.Collection<java.lang.String> getEntryNames(@NonNull String);
-    method @Nullable public abstract byte[] getMessageAuthenticationCode();
-    method @NonNull public abstract java.util.Collection<java.lang.String> getNamespaces();
-    method @Nullable public abstract java.util.Collection<java.lang.String> getRetrievedEntryNames(@NonNull String);
-    method @NonNull public abstract byte[] getStaticAuthenticationData();
-    method public abstract int getStatus(@NonNull String, @NonNull String);
-    field public static final int STATUS_NOT_IN_REQUEST_MESSAGE = 3; // 0x3
-    field public static final int STATUS_NOT_REQUESTED = 2; // 0x2
-    field public static final int STATUS_NO_ACCESS_CONTROL_PROFILES = 6; // 0x6
-    field public static final int STATUS_NO_SUCH_ENTRY = 1; // 0x1
-    field public static final int STATUS_OK = 0; // 0x0
-    field public static final int STATUS_READER_AUTHENTICATION_FAILED = 5; // 0x5
-    field public static final int STATUS_USER_AUTHENTICATION_FAILED = 4; // 0x4
+  public abstract class PresentationSession {
+    method @Nullable public abstract android.security.identity.CredentialDataResult getCredentialData(@NonNull String, @NonNull android.security.identity.CredentialDataRequest) throws android.security.identity.EphemeralPublicKeyNotFoundException, android.security.identity.InvalidReaderSignatureException, android.security.identity.InvalidRequestMessageException, android.security.identity.NoAuthenticationKeyAvailableException;
+    method @NonNull public abstract java.security.KeyPair getEphemeralKeyPair();
+    method public abstract void setReaderEphemeralPublicKey(@NonNull java.security.PublicKey) throws java.security.InvalidKeyException;
+    method public abstract void setSessionTranscript(@NonNull byte[]);
+  }
+
+  @Deprecated public abstract class ResultData {
+    method @Deprecated @NonNull public abstract byte[] getAuthenticatedData();
+    method @Deprecated @Nullable public abstract byte[] getEntry(@NonNull String, @NonNull String);
+    method @Deprecated @Nullable public abstract java.util.Collection<java.lang.String> getEntryNames(@NonNull String);
+    method @Deprecated @Nullable public abstract byte[] getMessageAuthenticationCode();
+    method @Deprecated @NonNull public abstract java.util.Collection<java.lang.String> getNamespaces();
+    method @Deprecated @Nullable public abstract java.util.Collection<java.lang.String> getRetrievedEntryNames(@NonNull String);
+    method @Deprecated @NonNull public abstract byte[] getStaticAuthenticationData();
+    method @Deprecated public abstract int getStatus(@NonNull String, @NonNull String);
+    field @Deprecated public static final int STATUS_NOT_IN_REQUEST_MESSAGE = 3; // 0x3
+    field @Deprecated public static final int STATUS_NOT_REQUESTED = 2; // 0x2
+    field @Deprecated public static final int STATUS_NO_ACCESS_CONTROL_PROFILES = 6; // 0x6
+    field @Deprecated public static final int STATUS_NO_SUCH_ENTRY = 1; // 0x1
+    field @Deprecated public static final int STATUS_OK = 0; // 0x0
+    field @Deprecated public static final int STATUS_READER_AUTHENTICATION_FAILED = 5; // 0x5
+    field @Deprecated public static final int STATUS_USER_AUTHENTICATION_FAILED = 4; // 0x4
   }
 
   public class SessionTranscriptMismatchException extends android.security.identity.IdentityCredentialException {
@@ -37692,6 +38034,7 @@
     method public abstract void onFillRequest(@NonNull android.service.autofill.FillRequest, @NonNull android.os.CancellationSignal, @NonNull android.service.autofill.FillCallback);
     method public abstract void onSaveRequest(@NonNull android.service.autofill.SaveRequest, @NonNull android.service.autofill.SaveCallback);
     method public void onSavedDatasetsInfoRequest(@NonNull android.service.autofill.SavedDatasetsInfoCallback);
+    field public static final String EXTRA_FILL_RESPONSE = "android.service.autofill.extra.FILL_RESPONSE";
     field public static final String SERVICE_INTERFACE = "android.service.autofill.AutofillService";
     field public static final String SERVICE_META_DATA = "android.autofill";
   }
@@ -37742,21 +38085,23 @@
   }
 
   public static final class Dataset.Builder {
-    ctor public Dataset.Builder(@NonNull android.widget.RemoteViews);
+    ctor @Deprecated public Dataset.Builder(@NonNull android.widget.RemoteViews);
+    ctor public Dataset.Builder(@NonNull android.service.autofill.Presentations);
     ctor public Dataset.Builder();
     method @NonNull public android.service.autofill.Dataset build();
     method @NonNull public android.service.autofill.Dataset.Builder setAuthentication(@Nullable android.content.IntentSender);
+    method @NonNull public android.service.autofill.Dataset.Builder setField(@NonNull android.view.autofill.AutofillId, @Nullable android.service.autofill.Field);
     method @NonNull public android.service.autofill.Dataset.Builder setId(@Nullable String);
-    method @NonNull public android.service.autofill.Dataset.Builder setInlinePresentation(@NonNull android.service.autofill.InlinePresentation);
-    method @NonNull public android.service.autofill.Dataset.Builder setInlinePresentation(@NonNull android.service.autofill.InlinePresentation, @NonNull android.service.autofill.InlinePresentation);
-    method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue);
-    method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @NonNull android.widget.RemoteViews);
-    method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern);
-    method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.widget.RemoteViews);
-    method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @NonNull android.widget.RemoteViews, @NonNull android.service.autofill.InlinePresentation);
-    method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @NonNull android.widget.RemoteViews, @NonNull android.service.autofill.InlinePresentation, @NonNull android.service.autofill.InlinePresentation);
-    method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.widget.RemoteViews, @NonNull android.service.autofill.InlinePresentation);
-    method @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.widget.RemoteViews, @NonNull android.service.autofill.InlinePresentation, @NonNull android.service.autofill.InlinePresentation);
+    method @Deprecated @NonNull public android.service.autofill.Dataset.Builder setInlinePresentation(@NonNull android.service.autofill.InlinePresentation);
+    method @Deprecated @NonNull public android.service.autofill.Dataset.Builder setInlinePresentation(@NonNull android.service.autofill.InlinePresentation, @NonNull android.service.autofill.InlinePresentation);
+    method @Deprecated @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue);
+    method @Deprecated @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @NonNull android.widget.RemoteViews);
+    method @Deprecated @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern);
+    method @Deprecated @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.widget.RemoteViews);
+    method @Deprecated @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @NonNull android.widget.RemoteViews, @NonNull android.service.autofill.InlinePresentation);
+    method @Deprecated @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @NonNull android.widget.RemoteViews, @NonNull android.service.autofill.InlinePresentation, @NonNull android.service.autofill.InlinePresentation);
+    method @Deprecated @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.widget.RemoteViews, @NonNull android.service.autofill.InlinePresentation);
+    method @Deprecated @NonNull public android.service.autofill.Dataset.Builder setValue(@NonNull android.view.autofill.AutofillId, @Nullable android.view.autofill.AutofillValue, @Nullable java.util.regex.Pattern, @NonNull android.widget.RemoteViews, @NonNull android.service.autofill.InlinePresentation, @NonNull android.service.autofill.InlinePresentation);
   }
 
   public final class DateTransformation implements android.os.Parcelable android.service.autofill.Transformation {
@@ -37773,6 +38118,20 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.service.autofill.DateValueSanitizer> CREATOR;
   }
 
+  public final class Field {
+    method @Nullable public java.util.regex.Pattern getFilter();
+    method @Nullable public android.service.autofill.Presentations getPresentations();
+    method @Nullable public android.view.autofill.AutofillValue getValue();
+  }
+
+  public static final class Field.Builder {
+    ctor public Field.Builder();
+    method @NonNull public android.service.autofill.Field build();
+    method @NonNull public android.service.autofill.Field.Builder setFilter(@Nullable java.util.regex.Pattern);
+    method @NonNull public android.service.autofill.Field.Builder setPresentations(@NonNull android.service.autofill.Presentations);
+    method @NonNull public android.service.autofill.Field.Builder setValue(@NonNull android.view.autofill.AutofillValue);
+  }
+
   public final class FieldClassification {
     method @NonNull public java.util.List<android.service.autofill.FieldClassification.Match> getMatches();
   }
@@ -37832,6 +38191,7 @@
   public final class FillRequest implements android.os.Parcelable {
     method public int describeContents();
     method @Nullable public android.os.Bundle getClientState();
+    method @Nullable public android.content.IntentSender getDelayedFillIntentSender();
     method @NonNull public java.util.List<android.service.autofill.FillContext> getFillContexts();
     method public int getFlags();
     method public int getId();
@@ -37846,6 +38206,7 @@
     method public int describeContents();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.service.autofill.FillResponse> CREATOR;
+    field public static final int FLAG_DELAY_FILL = 4; // 0x4
     field public static final int FLAG_DISABLE_ACTIVITY_ONLY = 2; // 0x2
     field public static final int FLAG_TRACK_CONTEXT_COMMITED = 1; // 0x1
   }
@@ -37855,11 +38216,14 @@
     method @NonNull public android.service.autofill.FillResponse.Builder addDataset(@Nullable android.service.autofill.Dataset);
     method @NonNull public android.service.autofill.FillResponse build();
     method @NonNull public android.service.autofill.FillResponse.Builder disableAutofill(long);
-    method @NonNull public android.service.autofill.FillResponse.Builder setAuthentication(@NonNull android.view.autofill.AutofillId[], @Nullable android.content.IntentSender, @Nullable android.widget.RemoteViews);
-    method @NonNull public android.service.autofill.FillResponse.Builder setAuthentication(@NonNull android.view.autofill.AutofillId[], @Nullable android.content.IntentSender, @Nullable android.widget.RemoteViews, @Nullable android.service.autofill.InlinePresentation);
-    method @NonNull public android.service.autofill.FillResponse.Builder setAuthentication(@NonNull android.view.autofill.AutofillId[], @Nullable android.content.IntentSender, @Nullable android.widget.RemoteViews, @Nullable android.service.autofill.InlinePresentation, @Nullable android.service.autofill.InlinePresentation);
+    method @Deprecated @NonNull public android.service.autofill.FillResponse.Builder setAuthentication(@NonNull android.view.autofill.AutofillId[], @Nullable android.content.IntentSender, @Nullable android.widget.RemoteViews);
+    method @Deprecated @NonNull public android.service.autofill.FillResponse.Builder setAuthentication(@NonNull android.view.autofill.AutofillId[], @Nullable android.content.IntentSender, @Nullable android.widget.RemoteViews, @Nullable android.service.autofill.InlinePresentation);
+    method @Deprecated @NonNull public android.service.autofill.FillResponse.Builder setAuthentication(@NonNull android.view.autofill.AutofillId[], @Nullable android.content.IntentSender, @Nullable android.widget.RemoteViews, @Nullable android.service.autofill.InlinePresentation, @Nullable android.service.autofill.InlinePresentation);
+    method @NonNull public android.service.autofill.FillResponse.Builder setAuthentication(@NonNull android.view.autofill.AutofillId[], @Nullable android.content.IntentSender, @Nullable android.service.autofill.Presentations);
     method @NonNull public android.service.autofill.FillResponse.Builder setClientState(@Nullable android.os.Bundle);
+    method @NonNull public android.service.autofill.FillResponse.Builder setDialogHeader(@NonNull android.widget.RemoteViews);
     method @NonNull public android.service.autofill.FillResponse.Builder setFieldClassificationIds(@NonNull android.view.autofill.AutofillId...);
+    method @NonNull public android.service.autofill.FillResponse.Builder setFillDialogTriggerIds(@NonNull android.view.autofill.AutofillId...);
     method @NonNull public android.service.autofill.FillResponse.Builder setFlags(int);
     method @NonNull public android.service.autofill.FillResponse.Builder setFooter(@NonNull android.widget.RemoteViews);
     method @NonNull public android.service.autofill.FillResponse.Builder setHeader(@NonNull android.widget.RemoteViews);
@@ -37904,6 +38268,22 @@
   public interface OnClickAction {
   }
 
+  public final class Presentations {
+    method @Nullable public android.widget.RemoteViews getDialogPresentation();
+    method @Nullable public android.service.autofill.InlinePresentation getInlinePresentation();
+    method @Nullable public android.service.autofill.InlinePresentation getInlineTooltipPresentation();
+    method @Nullable public android.widget.RemoteViews getMenuPresentation();
+  }
+
+  public static final class Presentations.Builder {
+    ctor public Presentations.Builder();
+    method @NonNull public android.service.autofill.Presentations build();
+    method @NonNull public android.service.autofill.Presentations.Builder setDialogPresentation(@NonNull android.widget.RemoteViews);
+    method @NonNull public android.service.autofill.Presentations.Builder setInlinePresentation(@NonNull android.service.autofill.InlinePresentation);
+    method @NonNull public android.service.autofill.Presentations.Builder setInlineTooltipPresentation(@NonNull android.service.autofill.InlinePresentation);
+    method @NonNull public android.service.autofill.Presentations.Builder setMenuPresentation(@NonNull android.widget.RemoteViews);
+  }
+
   public final class RegexValidator implements android.os.Parcelable android.service.autofill.Validator {
     ctor public RegexValidator(@NonNull android.view.autofill.AutofillId, @NonNull java.util.regex.Pattern);
     method public int describeContents();
@@ -38112,9 +38492,11 @@
 
   public abstract class CarrierService extends android.app.Service {
     ctor public CarrierService();
-    method public final void notifyCarrierNetworkChange(boolean);
+    method @Deprecated public final void notifyCarrierNetworkChange(boolean);
+    method public final void notifyCarrierNetworkChange(int, boolean);
     method @CallSuper public android.os.IBinder onBind(android.content.Intent);
-    method public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier);
+    method @Deprecated public abstract android.os.PersistableBundle onLoadConfig(android.service.carrier.CarrierIdentifier);
+    method @Nullable public android.os.PersistableBundle onLoadConfig(int, @Nullable android.service.carrier.CarrierIdentifier);
     field public static final String CARRIER_SERVICE_INTERFACE = "android.service.carrier.CarrierService";
   }
 
@@ -38169,6 +38551,7 @@
     method @NonNull public CharSequence getSubtitle();
     method @NonNull public CharSequence getTitle();
     method @Nullable public CharSequence getZone();
+    method public boolean isAuthRequired();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.service.controls.Control> CREATOR;
     field public static final int STATUS_DISABLED = 4; // 0x4
@@ -38183,6 +38566,7 @@
     ctor public Control.StatefulBuilder(@NonNull android.service.controls.Control);
     method @NonNull public android.service.controls.Control build();
     method @NonNull public android.service.controls.Control.StatefulBuilder setAppIntent(@NonNull android.app.PendingIntent);
+    method @NonNull public android.service.controls.Control.StatefulBuilder setAuthRequired(boolean);
     method @NonNull public android.service.controls.Control.StatefulBuilder setControlId(@NonNull String);
     method @NonNull public android.service.controls.Control.StatefulBuilder setControlTemplate(@NonNull android.service.controls.templates.ControlTemplate);
     method @NonNull public android.service.controls.Control.StatefulBuilder setCustomColor(@Nullable android.content.res.ColorStateList);
@@ -38625,6 +39009,7 @@
     field public static final int NOTIFICATION_CHANNEL_OR_GROUP_UPDATED = 2; // 0x2
     field public static final int REASON_APP_CANCEL = 8; // 0x8
     field public static final int REASON_APP_CANCEL_ALL = 9; // 0x9
+    field public static final int REASON_ASSISTANT_CANCEL = 22; // 0x16
     field public static final int REASON_CANCEL = 2; // 0x2
     field public static final int REASON_CANCEL_ALL = 3; // 0x3
     field public static final int REASON_CHANNEL_BANNED = 17; // 0x11
@@ -38812,6 +39197,7 @@
 
   public abstract class QuickAccessWalletService extends android.app.Service {
     ctor public QuickAccessWalletService();
+    method @Nullable public android.app.PendingIntent getTargetActivityPendingIntent();
     method @Nullable public android.os.IBinder onBind(@NonNull android.content.Intent);
     method public abstract void onWalletCardSelected(@NonNull android.service.quickaccesswallet.SelectWalletCardRequest);
     method public abstract void onWalletCardsRequested(@NonNull android.service.quickaccesswallet.GetWalletCardsRequest, @NonNull android.service.quickaccesswallet.GetWalletCardsCallback);
@@ -38944,6 +39330,13 @@
 
 package android.service.voice {
 
+  public final class VisibleActivityInfo implements android.os.Parcelable {
+    method public int describeContents();
+    method @NonNull public android.service.voice.VoiceInteractionSession.ActivityId getActivityId();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.service.voice.VisibleActivityInfo> CREATOR;
+  }
+
   public class VoiceInteractionService extends android.app.Service {
     ctor public VoiceInteractionService();
     method public int getDisabledShowContext();
@@ -39005,6 +39398,7 @@
     method public void onTaskStarted(android.content.Intent, int);
     method public void onTrimMemory(int);
     method public final void performDirectAction(@NonNull android.app.DirectAction, @Nullable android.os.Bundle, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<android.os.Bundle>);
+    method public final void registerVisibleActivityCallback(@NonNull java.util.concurrent.Executor, @NonNull android.service.voice.VoiceInteractionSession.VisibleActivityCallback);
     method public final void requestDirectActions(@NonNull android.service.voice.VoiceInteractionSession.ActivityId, @Nullable android.os.CancellationSignal, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<android.app.DirectAction>>);
     method public void setContentView(android.view.View);
     method public void setDisabledShowContext(int);
@@ -39014,6 +39408,7 @@
     method public void show(android.os.Bundle, int);
     method public void startAssistantActivity(android.content.Intent);
     method public void startVoiceActivity(android.content.Intent);
+    method public final void unregisterVisibleActivityCallback(@NonNull android.service.voice.VoiceInteractionSession.VisibleActivityCallback);
     field public static final int SHOW_SOURCE_ACTIVITY = 16; // 0x10
     field public static final int SHOW_SOURCE_APPLICATION = 8; // 0x8
     field public static final int SHOW_SOURCE_ASSIST_GESTURE = 4; // 0x4
@@ -39087,6 +39482,11 @@
     method public boolean isActive();
   }
 
+  public static interface VoiceInteractionSession.VisibleActivityCallback {
+    method public default void onInvisible(@NonNull android.service.voice.VoiceInteractionSession.ActivityId);
+    method public default void onVisible(@NonNull android.service.voice.VisibleActivityInfo);
+  }
+
   public abstract class VoiceInteractionSessionService extends android.app.Service {
     ctor public VoiceInteractionSessionService();
     method public android.os.IBinder onBind(android.content.Intent);
@@ -39152,6 +39552,7 @@
   public interface RecognitionListener {
     method public void onBeginningOfSpeech();
     method public void onBufferReceived(byte[]);
+    method public default void onEndOfSegmentedSession();
     method public void onEndOfSpeech();
     method public void onError(int);
     method public void onEvent(int, android.os.Bundle);
@@ -39159,14 +39560,17 @@
     method public void onReadyForSpeech(android.os.Bundle);
     method public void onResults(android.os.Bundle);
     method public void onRmsChanged(float);
+    method public default void onSegmentResults(@NonNull android.os.Bundle);
   }
 
   public abstract class RecognitionService extends android.app.Service {
     ctor public RecognitionService();
     method public final android.os.IBinder onBind(android.content.Intent);
     method protected abstract void onCancel(android.speech.RecognitionService.Callback);
+    method public void onCheckRecognitionSupport(@NonNull android.content.Intent, @NonNull android.speech.RecognitionService.SupportCallback);
     method protected abstract void onStartListening(android.content.Intent, android.speech.RecognitionService.Callback);
     method protected abstract void onStopListening(android.speech.RecognitionService.Callback);
+    method public void onTriggerModelDownload(@NonNull android.content.Intent);
     field public static final String SERVICE_INTERFACE = "android.speech.RecognitionService";
     field public static final String SERVICE_META_DATA = "android.speech";
   }
@@ -39174,6 +39578,7 @@
   public class RecognitionService.Callback {
     method public void beginningOfSpeech() throws android.os.RemoteException;
     method public void bufferReceived(byte[]) throws android.os.RemoteException;
+    method public void endOfSegmentedSession() throws android.os.RemoteException;
     method public void endOfSpeech() throws android.os.RemoteException;
     method public void error(int) throws android.os.RemoteException;
     method @NonNull public android.content.AttributionSource getCallingAttributionSource();
@@ -39182,6 +39587,37 @@
     method public void readyForSpeech(android.os.Bundle) throws android.os.RemoteException;
     method public void results(android.os.Bundle) throws android.os.RemoteException;
     method public void rmsChanged(float) throws android.os.RemoteException;
+    method public void segmentResults(@NonNull android.os.Bundle) throws android.os.RemoteException;
+  }
+
+  public static class RecognitionService.SupportCallback {
+    method public void onError(int);
+    method public void onSupportResult(@NonNull android.speech.RecognitionSupport);
+  }
+
+  public final class RecognitionSupport implements android.os.Parcelable {
+    method public int describeContents();
+    method @NonNull public java.util.List<java.lang.String> getInstalledLanguages();
+    method @NonNull public java.util.List<java.lang.String> getPendingLanguages();
+    method @NonNull public java.util.List<java.lang.String> getSupportedLanguages();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.speech.RecognitionSupport> CREATOR;
+  }
+
+  public static final class RecognitionSupport.Builder {
+    ctor public RecognitionSupport.Builder();
+    method @NonNull public android.speech.RecognitionSupport.Builder addInstalledLanguage(@NonNull String);
+    method @NonNull public android.speech.RecognitionSupport.Builder addPendingLanguage(@NonNull String);
+    method @NonNull public android.speech.RecognitionSupport.Builder addSupportedLanguage(@NonNull String);
+    method @NonNull public android.speech.RecognitionSupport build();
+    method @NonNull public android.speech.RecognitionSupport.Builder setInstalledLanguages(@NonNull java.util.List<java.lang.String>);
+    method @NonNull public android.speech.RecognitionSupport.Builder setPendingLanguages(@NonNull java.util.List<java.lang.String>);
+    method @NonNull public android.speech.RecognitionSupport.Builder setSupportedLanguages(@NonNull java.util.List<java.lang.String>);
+  }
+
+  public interface RecognitionSupportCallback {
+    method public void onError(int);
+    method public void onSupportResult(@NonNull android.speech.RecognitionSupport);
   }
 
   public class RecognizerIntent {
@@ -39191,12 +39627,21 @@
     field public static final String ACTION_VOICE_SEARCH_HANDS_FREE = "android.speech.action.VOICE_SEARCH_HANDS_FREE";
     field public static final String ACTION_WEB_SEARCH = "android.speech.action.WEB_SEARCH";
     field public static final String DETAILS_META_DATA = "android.speech.DETAILS";
-    field public static final String EXTRA_AUDIO_INJECT_SOURCE = "android.speech.extra.AUDIO_INJECT_SOURCE";
+    field @Deprecated public static final String EXTRA_AUDIO_INJECT_SOURCE = "android.speech.extra.AUDIO_INJECT_SOURCE";
+    field public static final String EXTRA_AUDIO_SOURCE = "android.speech.extra.AUDIO_SOURCE";
+    field public static final String EXTRA_AUDIO_SOURCE_CHANNEL_COUNT = "android.speech.extra.AUDIO_SOURCE_CHANNEL_COUNT";
+    field public static final String EXTRA_AUDIO_SOURCE_ENCODING = "android.speech.extra.AUDIO_SOURCE_ENCODING";
+    field public static final String EXTRA_AUDIO_SOURCE_SAMPLING_RATE = "android.speech.extra.AUDIO_SOURCE_SAMPLING_RATE";
+    field public static final String EXTRA_BIASING_STRINGS = "android.speech.extra.BIASING_STRINGS";
     field public static final String EXTRA_CALLING_PACKAGE = "calling_package";
     field public static final String EXTRA_CONFIDENCE_SCORES = "android.speech.extra.CONFIDENCE_SCORES";
+    field public static final String EXTRA_ENABLE_BIASING_DEVICE_CONTEXT = "android.speech.extra.ENABLE_BIASING_DEVICE_CONTEXT";
+    field public static final String EXTRA_ENABLE_FORMATTING = "android.speech.extra.ENABLE_FORMATTING";
+    field public static final String EXTRA_HIDE_PARTIAL_TRAILING_PUNCTUATION = "android.speech.extra.HIDE_PARTIAL_TRAILING_PUNCTUATION";
     field public static final String EXTRA_LANGUAGE = "android.speech.extra.LANGUAGE";
     field public static final String EXTRA_LANGUAGE_MODEL = "android.speech.extra.LANGUAGE_MODEL";
     field public static final String EXTRA_LANGUAGE_PREFERENCE = "android.speech.extra.LANGUAGE_PREFERENCE";
+    field public static final String EXTRA_MASK_OFFENSIVE_WORDS = "android.speech.extra.MASK_OFFENSIVE_WORDS";
     field public static final String EXTRA_MAX_RESULTS = "android.speech.extra.MAX_RESULTS";
     field public static final String EXTRA_ONLY_RETURN_LANGUAGE_PREFERENCE = "android.speech.extra.ONLY_RETURN_LANGUAGE_PREFERENCE";
     field public static final String EXTRA_ORIGIN = "android.speech.extra.ORIGIN";
@@ -39207,11 +39652,14 @@
     field public static final String EXTRA_RESULTS_PENDINGINTENT = "android.speech.extra.RESULTS_PENDINGINTENT";
     field public static final String EXTRA_RESULTS_PENDINGINTENT_BUNDLE = "android.speech.extra.RESULTS_PENDINGINTENT_BUNDLE";
     field public static final String EXTRA_SECURE = "android.speech.extras.EXTRA_SECURE";
+    field public static final String EXTRA_SEGMENTED_SESSION = "android.speech.extra.SEGMENTED_SESSION";
     field public static final String EXTRA_SPEECH_INPUT_COMPLETE_SILENCE_LENGTH_MILLIS = "android.speech.extras.SPEECH_INPUT_COMPLETE_SILENCE_LENGTH_MILLIS";
     field public static final String EXTRA_SPEECH_INPUT_MINIMUM_LENGTH_MILLIS = "android.speech.extras.SPEECH_INPUT_MINIMUM_LENGTH_MILLIS";
     field public static final String EXTRA_SPEECH_INPUT_POSSIBLY_COMPLETE_SILENCE_LENGTH_MILLIS = "android.speech.extras.SPEECH_INPUT_POSSIBLY_COMPLETE_SILENCE_LENGTH_MILLIS";
     field public static final String EXTRA_SUPPORTED_LANGUAGES = "android.speech.extra.SUPPORTED_LANGUAGES";
     field public static final String EXTRA_WEB_SEARCH_ONLY = "android.speech.extra.WEB_SEARCH_ONLY";
+    field public static final String FORMATTING_OPTIMIZE_LATENCY = "latency";
+    field public static final String FORMATTING_OPTIMIZE_QUALITY = "quality";
     field public static final String LANGUAGE_MODEL_FREE_FORM = "free_form";
     field public static final String LANGUAGE_MODEL_WEB_SEARCH = "web_search";
     field public static final int RESULT_AUDIO_ERROR = 5; // 0x5
@@ -39233,6 +39681,7 @@
 
   public class SpeechRecognizer {
     method @MainThread public void cancel();
+    method public void checkRecognitionSupport(@NonNull android.content.Intent, @NonNull java.util.concurrent.Executor, @NonNull android.speech.RecognitionSupportCallback);
     method @MainThread @NonNull public static android.speech.SpeechRecognizer createOnDeviceSpeechRecognizer(@NonNull android.content.Context);
     method @MainThread public static android.speech.SpeechRecognizer createSpeechRecognizer(android.content.Context);
     method @MainThread public static android.speech.SpeechRecognizer createSpeechRecognizer(android.content.Context, android.content.ComponentName);
@@ -39242,8 +39691,10 @@
     method @MainThread public void setRecognitionListener(android.speech.RecognitionListener);
     method @MainThread public void startListening(android.content.Intent);
     method @MainThread public void stopListening();
+    method public void triggerModelDownload(@NonNull android.content.Intent);
     field public static final String CONFIDENCE_SCORES = "confidence_scores";
     field public static final int ERROR_AUDIO = 3; // 0x3
+    field public static final int ERROR_CANNOT_CHECK_SUPPORT = 14; // 0xe
     field public static final int ERROR_CLIENT = 5; // 0x5
     field public static final int ERROR_INSUFFICIENT_PERMISSIONS = 9; // 0x9
     field public static final int ERROR_LANGUAGE_NOT_SUPPORTED = 12; // 0xc
@@ -39581,6 +40032,7 @@
     field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
     field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4
     field public static final int CAPABILITY_MUTE = 64; // 0x40
+    field public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 268435456; // 0x10000000
     field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
     field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
     field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
@@ -39646,6 +40098,7 @@
     method public final void cancelCall();
     method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
     method public abstract void onPlaceCall(@NonNull android.net.Uri, @NonNull android.telecom.PhoneAccountHandle, boolean);
+    method public void onRedirectionTimeout();
     method public final boolean onUnbind(@NonNull android.content.Intent);
     method public final void placeCallUnmodified();
     method public final void redirectCall(@NonNull android.net.Uri, @NonNull android.telecom.PhoneAccountHandle, boolean);
@@ -39866,6 +40319,7 @@
     field public static final int CAPABILITY_MANAGE_CONFERENCE = 128; // 0x80
     field public static final int CAPABILITY_MERGE_CONFERENCE = 4; // 0x4
     field public static final int CAPABILITY_MUTE = 64; // 0x40
+    field public static final int CAPABILITY_REMOTE_PARTY_SUPPORTS_RTT = 536870912; // 0x20000000
     field public static final int CAPABILITY_RESPOND_VIA_TEXT = 32; // 0x20
     field public static final int CAPABILITY_SEPARATE_FROM_CONFERENCE = 4096; // 0x1000
     field public static final int CAPABILITY_SUPPORTS_VT_LOCAL_BIDIRECTIONAL = 768; // 0x300
@@ -39897,6 +40351,7 @@
     field public static final String EXTRA_CHILD_ADDRESS = "android.telecom.extra.CHILD_ADDRESS";
     field public static final String EXTRA_IS_RTT_AUDIO_PRESENT = "android.telecom.extra.IS_RTT_AUDIO_PRESENT";
     field public static final String EXTRA_LAST_FORWARDED_NUMBER = "android.telecom.extra.LAST_FORWARDED_NUMBER";
+    field public static final String EXTRA_LAST_KNOWN_CELL_IDENTITY = "android.telecom.extra.LAST_KNOWN_CELL_IDENTITY";
     field public static final String EXTRA_SIP_INVITE = "android.telecom.extra.SIP_INVITE";
     field public static final int PROPERTY_ASSISTED_DIALING = 512; // 0x200
     field public static final int PROPERTY_CROSS_SIM = 8192; // 0x2000
@@ -40134,8 +40589,10 @@
     field public static final int CAPABILITY_SELF_MANAGED = 2048; // 0x800
     field public static final int CAPABILITY_SIM_SUBSCRIPTION = 4; // 0x4
     field public static final int CAPABILITY_SUPPORTS_VIDEO_CALLING = 1024; // 0x400
+    field public static final int CAPABILITY_SUPPORTS_VOICE_CALLING_INDICATIONS = 65536; // 0x10000
     field public static final int CAPABILITY_VIDEO_CALLING = 8; // 0x8
     field public static final int CAPABILITY_VIDEO_CALLING_RELIES_ON_PRESENCE = 256; // 0x100
+    field public static final int CAPABILITY_VOICE_CALLING_AVAILABLE = 131072; // 0x20000
     field @NonNull public static final android.os.Parcelable.Creator<android.telecom.PhoneAccount> CREATOR;
     field public static final String EXTRA_ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE = "android.telecom.extra.ADD_SELF_MANAGED_CALLS_TO_INCALLSERVICE";
     field public static final String EXTRA_ALWAYS_USE_VOIP_AUDIO_MODE = "android.telecom.extra.ALWAYS_USE_VOIP_AUDIO_MODE";
@@ -40332,9 +40789,10 @@
     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telecom.PhoneAccountHandle> getCallCapablePhoneAccounts();
     method public String getDefaultDialerPackage();
     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.telecom.PhoneAccountHandle getDefaultOutgoingPhoneAccount(String);
-    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_SMS, android.Manifest.permission.READ_PHONE_NUMBERS}, conditional=true) public String getLine1Number(android.telecom.PhoneAccountHandle);
+    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_SMS, android.Manifest.permission.READ_PHONE_NUMBERS}, conditional=true) public String getLine1Number(android.telecom.PhoneAccountHandle);
+    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_OWN_CALLS) public java.util.List<android.telecom.PhoneAccountHandle> getOwnSelfManagedPhoneAccounts();
     method public android.telecom.PhoneAccount getPhoneAccount(android.telecom.PhoneAccountHandle);
-    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telecom.PhoneAccountHandle> getSelfManagedPhoneAccounts();
+    method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telecom.PhoneAccountHandle> getSelfManagedPhoneAccounts();
     method public android.telecom.PhoneAccountHandle getSimCallManager();
     method @Nullable public android.telecom.PhoneAccountHandle getSimCallManagerForSubscription(int);
     method @Nullable public String getSystemDialerPackage();
@@ -40411,6 +40869,7 @@
     field public static final int PRESENTATION_ALLOWED = 1; // 0x1
     field public static final int PRESENTATION_PAYPHONE = 4; // 0x4
     field public static final int PRESENTATION_RESTRICTED = 2; // 0x2
+    field public static final int PRESENTATION_UNAVAILABLE = 5; // 0x5
     field public static final int PRESENTATION_UNKNOWN = 3; // 0x3
     field public static final int PRIORITY_NORMAL = 0; // 0x0
     field public static final int PRIORITY_URGENT = 1; // 0x1
@@ -40644,6 +41103,7 @@
     method @NonNull public java.util.List<java.lang.Integer> getBands();
     method @NonNull public java.util.List<java.lang.String> getMccMncs();
     method public int getPriority();
+    method @NonNull public java.util.List<android.telephony.RadioAccessSpecifier> getRadioAccessSpecifiers();
     method public int getSubId();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.telephony.AvailableNetworkInfo> CREATOR;
@@ -40652,6 +41112,14 @@
     field public static final int PRIORITY_MED = 2; // 0x2
   }
 
+  public static final class AvailableNetworkInfo.Builder {
+    ctor public AvailableNetworkInfo.Builder(int);
+    method @NonNull public android.telephony.AvailableNetworkInfo build();
+    method @NonNull public android.telephony.AvailableNetworkInfo.Builder setMccMncs(@NonNull java.util.List<java.lang.String>);
+    method @NonNull public android.telephony.AvailableNetworkInfo.Builder setPriority(int);
+    method @NonNull public android.telephony.AvailableNetworkInfo.Builder setRadioAccessSpecifiers(@NonNull java.util.List<android.telephony.RadioAccessSpecifier>);
+  }
+
   public final class BarringInfo implements android.os.Parcelable {
     method public int describeContents();
     method @NonNull public android.telephony.BarringInfo.BarringServiceInfo getBarringServiceInfo(int);
@@ -40685,11 +41153,11 @@
   }
 
   public class CarrierConfigManager {
-    method @Nullable public android.os.PersistableBundle getConfig();
-    method @Nullable public android.os.PersistableBundle getConfigByComponentForSubId(@NonNull String, int);
-    method @Nullable public android.os.PersistableBundle getConfigForSubId(int);
+    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.os.PersistableBundle getConfig();
+    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.os.PersistableBundle getConfigByComponentForSubId(@NonNull String, int);
+    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public android.os.PersistableBundle getConfigForSubId(int);
     method public static boolean isConfigForIdentifiedCarrier(android.os.PersistableBundle);
-    method public void notifyConfigChangedForSubId(int);
+    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void notifyConfigChangedForSubId(int);
     field public static final String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED";
     field public static final int CARRIER_NR_AVAILABILITY_NSA = 1; // 0x1
     field public static final int CARRIER_NR_AVAILABILITY_SA = 2; // 0x2
@@ -40760,14 +41228,16 @@
     field public static final String KEY_CARRIER_RCS_PROVISIONING_REQUIRED_BOOL = "carrier_rcs_provisioning_required_bool";
     field public static final String KEY_CARRIER_SETTINGS_ACTIVITY_COMPONENT_NAME_STRING = "carrier_settings_activity_component_name_string";
     field public static final String KEY_CARRIER_SETTINGS_ENABLE_BOOL = "carrier_settings_enable_bool";
+    field public static final String KEY_CARRIER_SUPPORTS_OPP_DATA_AUTO_PROVISIONING_BOOL = "carrier_supports_opp_data_auto_provisioning_bool";
     field public static final String KEY_CARRIER_SUPPORTS_SS_OVER_UT_BOOL = "carrier_supports_ss_over_ut_bool";
+    field public static final String KEY_CARRIER_SUPPORTS_TETHERING_BOOL = "carrier_supports_tethering_bool";
     field public static final String KEY_CARRIER_USE_IMS_FIRST_FOR_EMERGENCY_BOOL = "carrier_use_ims_first_for_emergency_bool";
     field public static final String KEY_CARRIER_USSD_METHOD_INT = "carrier_ussd_method_int";
-    field public static final String KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL = "carrier_ut_provisioning_required_bool";
+    field @Deprecated public static final String KEY_CARRIER_UT_PROVISIONING_REQUIRED_BOOL = "carrier_ut_provisioning_required_bool";
     field public static final String KEY_CARRIER_VOLTE_AVAILABLE_BOOL = "carrier_volte_available_bool";
     field public static final String KEY_CARRIER_VOLTE_OVERRIDE_WFC_PROVISIONING_BOOL = "carrier_volte_override_wfc_provisioning_bool";
-    field public static final String KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool";
-    field public static final String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_bool";
+    field @Deprecated public static final String KEY_CARRIER_VOLTE_PROVISIONED_BOOL = "carrier_volte_provisioned_bool";
+    field @Deprecated public static final String KEY_CARRIER_VOLTE_PROVISIONING_REQUIRED_BOOL = "carrier_volte_provisioning_required_bool";
     field public static final String KEY_CARRIER_VOLTE_TTY_SUPPORTED_BOOL = "carrier_volte_tty_supported_bool";
     field public static final String KEY_CARRIER_VT_AVAILABLE_BOOL = "carrier_vt_available_bool";
     field @Deprecated public static final String KEY_CARRIER_VVM_PACKAGE_NAME_STRING = "carrier_vvm_package_name_string";
@@ -40779,6 +41249,7 @@
     field public static final String KEY_CDMA_NONROAMING_NETWORKS_STRING_ARRAY = "cdma_nonroaming_networks_string_array";
     field public static final String KEY_CDMA_ROAMING_MODE_INT = "cdma_roaming_mode_int";
     field public static final String KEY_CDMA_ROAMING_NETWORKS_STRING_ARRAY = "cdma_roaming_networks_string_array";
+    field public static final String KEY_CELLULAR_USAGE_SETTING_INT = "cellular_usage_setting_int";
     field public static final String KEY_CHECK_PRICING_WITH_CARRIER_FOR_DATA_ROAMING_BOOL = "check_pricing_with_carrier_data_roaming_bool";
     field public static final String KEY_CI_ACTION_ON_SYS_UPDATE_BOOL = "ci_action_on_sys_update_bool";
     field public static final String KEY_CI_ACTION_ON_SYS_UPDATE_EXTRA_STRING = "ci_action_on_sys_update_extra_string";
@@ -40818,9 +41289,12 @@
     field public static final String KEY_EDITABLE_WFC_ROAMING_MODE_BOOL = "editable_wfc_roaming_mode_bool";
     field public static final String KEY_EMERGENCY_NOTIFICATION_DELAY_INT = "emergency_notification_delay_int";
     field public static final String KEY_EMERGENCY_NUMBER_PREFIX_STRING_ARRAY = "emergency_number_prefix_string_array";
+    field public static final String KEY_ENABLE_CROSS_SIM_CALLING_ON_OPPORTUNISTIC_DATA_BOOL = "enable_cross_sim_calling_on_opportunistic_data_bool";
     field public static final String KEY_ENABLE_DIALER_KEY_VIBRATION_BOOL = "enable_dialer_key_vibration_bool";
     field public static final String KEY_ENHANCED_4G_LTE_ON_BY_DEFAULT_BOOL = "enhanced_4g_lte_on_by_default_bool";
     field public static final String KEY_ENHANCED_4G_LTE_TITLE_VARIANT_INT = "enhanced_4g_lte_title_variant_int";
+    field public static final String KEY_ESIM_DOWNLOAD_RETRY_BACKOFF_TIMER_SEC_INT = "esim_download_retry_backoff_timer_sec_int";
+    field public static final String KEY_ESIM_MAX_DOWNLOAD_RETRY_ATTEMPTS_INT = "esim_max_download_retry_attempts_int";
     field public static final String KEY_FORCE_HOME_NETWORK_BOOL = "force_home_network_bool";
     field public static final String KEY_GSM_DTMF_TONE_DELAY_INT = "gsm_dtmf_tone_delay_int";
     field public static final String KEY_GSM_NONROAMING_NETWORKS_STRING_ARRAY = "gsm_nonroaming_networks_string_array";
@@ -40841,6 +41315,7 @@
     field public static final String KEY_IMS_CONFERENCE_SIZE_LIMIT_INT = "ims_conference_size_limit_int";
     field public static final String KEY_IMS_DTMF_TONE_DELAY_INT = "ims_dtmf_tone_delay_int";
     field public static final String KEY_IS_IMS_CONFERENCE_SIZE_ENFORCED_BOOL = "is_ims_conference_size_enforced_bool";
+    field public static final String KEY_IS_OPPORTUNISTIC_SUBSCRIPTION_BOOL = "is_opportunistic_subscription_bool";
     field public static final String KEY_LTE_ENABLED_BOOL = "lte_enabled_bool";
     field public static final String KEY_LTE_RSRQ_THRESHOLDS_INT_ARRAY = "lte_rsrq_thresholds_int_array";
     field public static final String KEY_LTE_RSSNR_THRESHOLDS_INT_ARRAY = "lte_rssnr_thresholds_int_array";
@@ -40923,7 +41398,9 @@
     field public static final String KEY_SHOW_WFC_LOCATION_PRIVACY_POLICY_BOOL = "show_wfc_location_privacy_policy_bool";
     field public static final String KEY_SIMPLIFIED_NETWORK_SETTINGS_BOOL = "simplified_network_settings_bool";
     field public static final String KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL = "sim_network_unlock_allow_dismiss_bool";
+    field public static final String KEY_SMDP_SERVER_ADDRESS_STRING = "smdp_server_address_string";
     field public static final String KEY_SMS_REQUIRES_DESTINATION_NUMBER_CONVERSION_BOOL = "sms_requires_destination_number_conversion_bool";
+    field public static final String KEY_SUBSCRIPTION_GROUP_UUID_STRING = "subscription_group_uuid_string";
     field public static final String KEY_SUPPORTS_CALL_COMPOSER_BOOL = "supports_call_composer_bool";
     field public static final String KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_DTMF_BOOL = "supports_device_to_device_communication_using_dtmf_bool";
     field public static final String KEY_SUPPORTS_DEVICE_TO_DEVICE_COMMUNICATION_USING_RTP_BOOL = "supports_device_to_device_communication_using_rtp_bool";
@@ -40967,6 +41444,7 @@
     field public static final String KEY_WFC_EMERGENCY_ADDRESS_CARRIER_APP_STRING = "wfc_emergency_address_carrier_app_string";
     field public static final String KEY_WORLD_MODE_ENABLED_BOOL = "world_mode_enabled_bool";
     field public static final String KEY_WORLD_PHONE_BOOL = "world_phone_bool";
+    field public static final String REMOVE_GROUP_UUID_STRING = "00000000-0000-0000-0000-000000000000";
     field public static final int SERVICE_CLASS_NONE = 0; // 0x0
     field public static final int SERVICE_CLASS_VOICE = 1; // 0x1
     field public static final int USSD_OVER_CS_ONLY = 2; // 0x2
@@ -40984,21 +41462,112 @@
     field public static final String PROTOCOL_IPV6 = "IPV6";
   }
 
+  public static final class CarrierConfigManager.Bsf {
+    field public static final String KEY_BSF_SERVER_FQDN_STRING = "bsf.bsf_server_fqdn_string";
+    field public static final String KEY_BSF_SERVER_PORT_INT = "bsf.bsf_server_port_int";
+    field public static final String KEY_BSF_TRANSPORT_TYPE_INT = "bsf.bsf_transport_type_int";
+    field public static final String KEY_PREFIX = "bsf.";
+  }
+
   public static final class CarrierConfigManager.Gps {
     field public static final String KEY_PERSIST_LPP_MODE_BOOL = "gps.persist_lpp_mode_bool";
     field public static final String KEY_PREFIX = "gps.";
   }
 
   public static final class CarrierConfigManager.Ims {
+    field public static final int E911_RTCP_INACTIVITY_ON_CONNECTED = 3; // 0x3
+    field public static final int E911_RTP_INACTIVITY_ON_CONNECTED = 4; // 0x4
+    field public static final int GEOLOCATION_PIDF_FOR_EMERGENCY_ON_CELLULAR = 4; // 0x4
+    field public static final int GEOLOCATION_PIDF_FOR_EMERGENCY_ON_WIFI = 2; // 0x2
+    field public static final int GEOLOCATION_PIDF_FOR_NON_EMERGENCY_ON_CELLULAR = 3; // 0x3
+    field public static final int GEOLOCATION_PIDF_FOR_NON_EMERGENCY_ON_WIFI = 1; // 0x1
+    field public static final int IPSEC_AUTHENTICATION_ALGORITHM_HMAC_MD5 = 0; // 0x0
+    field public static final int IPSEC_AUTHENTICATION_ALGORITHM_HMAC_SHA1 = 1; // 0x1
+    field public static final int IPSEC_ENCRYPTION_ALGORITHM_AES_CBC = 2; // 0x2
+    field public static final int IPSEC_ENCRYPTION_ALGORITHM_DES_EDE3_CBC = 1; // 0x1
+    field public static final int IPSEC_ENCRYPTION_ALGORITHM_NULL = 0; // 0x0
+    field public static final String KEY_CAPABILITY_TYPE_CALL_COMPOSER_INT_ARRAY = "ims.capability_type_call_composer_int_array";
+    field public static final String KEY_CAPABILITY_TYPE_OPTIONS_UCE_INT_ARRAY = "ims.capability_type_options_uce_int_array";
+    field public static final String KEY_CAPABILITY_TYPE_PRESENCE_UCE_INT_ARRAY = "ims.capability_type_presence_uce_int_array";
+    field public static final String KEY_CAPABILITY_TYPE_SMS_INT_ARRAY = "ims.capability_type_sms_int_array";
+    field public static final String KEY_CAPABILITY_TYPE_UT_INT_ARRAY = "ims.capability_type_ut_int_array";
+    field public static final String KEY_CAPABILITY_TYPE_VIDEO_INT_ARRAY = "ims.capability_type_video_int_array";
+    field public static final String KEY_CAPABILITY_TYPE_VOICE_INT_ARRAY = "ims.capability_type_voice_int_array";
     field public static final String KEY_ENABLE_PRESENCE_CAPABILITY_EXCHANGE_BOOL = "ims.enable_presence_capability_exchange_bool";
     field public static final String KEY_ENABLE_PRESENCE_GROUP_SUBSCRIBE_BOOL = "ims.enable_presence_group_subscribe_bool";
     field public static final String KEY_ENABLE_PRESENCE_PUBLISH_BOOL = "ims.enable_presence_publish_bool";
+    field public static final String KEY_GEOLOCATION_PIDF_IN_SIP_INVITE_SUPPORT_INT_ARRAY = "ims.geolocation_pidf_in_sip_invite_support_int_array";
+    field public static final String KEY_GEOLOCATION_PIDF_IN_SIP_REGISTER_SUPPORT_INT_ARRAY = "ims.geolocation_pidf_in_sip_register_support_int_array";
+    field public static final String KEY_GRUU_ENABLED_BOOL = "ims.gruu_enabled_bool";
+    field public static final String KEY_IMS_PDN_ENABLED_IN_NO_VOPS_SUPPORT_INT_ARRAY = "ims.ims_pdn_enabled_in_no_vops_support_int_array";
     field public static final String KEY_IMS_SINGLE_REGISTRATION_REQUIRED_BOOL = "ims.ims_single_registration_required_bool";
+    field public static final String KEY_IMS_USER_AGENT_STRING = "ims.ims_user_agent_string";
+    field public static final String KEY_IPSEC_AUTHENTICATION_ALGORITHMS_INT_ARRAY = "ims.ipsec_authentication_algorithms_int_array";
+    field public static final String KEY_IPSEC_ENCRYPTION_ALGORITHMS_INT_ARRAY = "ims.ipsec_encryption_algorithms_int_array";
+    field public static final String KEY_IPV4_SIP_MTU_SIZE_CELLULAR_INT = "ims.ipv4_sip_mtu_size_cellular_int";
+    field public static final String KEY_IPV6_SIP_MTU_SIZE_CELLULAR_INT = "ims.ipv6_sip_mtu_size_cellular_int";
+    field public static final String KEY_KEEP_PDN_UP_IN_NO_VOPS_BOOL = "ims.keep_pdn_up_in_no_vops_bool";
+    field public static final String KEY_MMTEL_REQUIRES_PROVISIONING_BUNDLE = "ims.mmtel_requires_provisioning_bundle";
     field public static final String KEY_NON_RCS_CAPABILITIES_CACHE_EXPIRATION_SEC_INT = "ims.non_rcs_capabilities_cache_expiration_sec_int";
+    field public static final String KEY_PHONE_CONTEXT_DOMAIN_NAME_STRING = "ims.phone_context_domain_name_string";
     field public static final String KEY_PREFIX = "ims.";
     field public static final String KEY_RCS_BULK_CAPABILITY_EXCHANGE_BOOL = "ims.rcs_bulk_capability_exchange_bool";
     field public static final String KEY_RCS_FEATURE_TAG_ALLOWED_STRING_ARRAY = "ims.rcs_feature_tag_allowed_string_array";
+    field public static final String KEY_RCS_REQUIRES_PROVISIONING_BUNDLE = "ims.rcs_requires_provisioning_bundle";
+    field public static final String KEY_REGISTRATION_EVENT_PACKAGE_SUPPORTED_BOOL = "ims.registration_event_package_supported_bool";
+    field public static final String KEY_REGISTRATION_EXPIRY_TIMER_SEC_INT = "ims.registration_expiry_timer_sec_int";
+    field public static final String KEY_REGISTRATION_RETRY_BASE_TIMER_MILLIS_INT = "ims.registration_retry_base_timer_millis_int";
+    field public static final String KEY_REGISTRATION_RETRY_MAX_TIMER_MILLIS_INT = "ims.registration_retry_max_timer_millis_int";
+    field public static final String KEY_REGISTRATION_SUBSCRIBE_EXPIRY_TIMER_SEC_INT = "ims.registration_subscribe_expiry_timer_sec_int";
+    field public static final String KEY_REQUEST_URI_TYPE_INT = "ims.request_uri_type_int";
+    field public static final String KEY_SIP_OVER_IPSEC_ENABLED_BOOL = "ims.sip_over_ipsec_enabled_bool";
+    field public static final String KEY_SIP_PREFERRED_TRANSPORT_INT = "ims.sip_preferred_transport_int";
+    field public static final String KEY_SIP_SERVER_PORT_NUMBER_INT = "ims.sip_server_port_number_int";
+    field public static final String KEY_SIP_TIMER_B_MILLIS_INT = "ims.sip_timer_b_millis_int";
+    field public static final String KEY_SIP_TIMER_C_MILLIS_INT = "ims.sip_timer_c_millis_int";
+    field public static final String KEY_SIP_TIMER_D_MILLIS_INT = "ims.sip_timer_d_millis_int";
+    field public static final String KEY_SIP_TIMER_F_MILLIS_INT = "ims.sip_timer_f_millis_int";
+    field public static final String KEY_SIP_TIMER_H_MILLIS_INT = "ims.sip_timer_h_millis_int";
+    field public static final String KEY_SIP_TIMER_J_MILLIS_INT = "ims.sip_timer_j_millis_int";
+    field public static final String KEY_SIP_TIMER_T1_MILLIS_INT = "ims.sip_timer_t1_millis_int";
+    field public static final String KEY_SIP_TIMER_T2_MILLIS_INT = "ims.sip_timer_t2_millis_int";
+    field public static final String KEY_SIP_TIMER_T4_MILLIS_INT = "ims.sip_timer_t4_millis_int";
+    field public static final String KEY_SUPPORTED_RATS_INT_ARRAY = "ims.supported_rats_int_array";
+    field public static final String KEY_USE_SIP_URI_FOR_PRESENCE_SUBSCRIBE_BOOL = "ims.use_sip_uri_for_presence_subscribe_bool";
     field public static final String KEY_WIFI_OFF_DEFERRING_TIME_MILLIS_INT = "ims.wifi_off_deferring_time_millis_int";
+    field public static final int NETWORK_TYPE_HOME = 0; // 0x0
+    field public static final int NETWORK_TYPE_ROAMING = 1; // 0x1
+    field public static final int PREFERRED_TRANSPORT_DYNAMIC_UDP_TCP = 2; // 0x2
+    field public static final int PREFERRED_TRANSPORT_TCP = 1; // 0x1
+    field public static final int PREFERRED_TRANSPORT_TLS = 3; // 0x3
+    field public static final int PREFERRED_TRANSPORT_UDP = 0; // 0x0
+    field public static final int REQUEST_URI_FORMAT_SIP = 1; // 0x1
+    field public static final int REQUEST_URI_FORMAT_TEL = 0; // 0x0
+    field public static final int RTCP_INACTIVITY_ON_CONNECTED = 1; // 0x1
+    field public static final int RTCP_INACTIVITY_ON_HOLD = 0; // 0x0
+    field public static final int RTP_INACTIVITY_ON_CONNECTED = 2; // 0x2
+  }
+
+  public static final class CarrierConfigManager.ImsEmergency {
+    field public static final String KEY_EMERGENCY_CALLBACK_MODE_SUPPORTED_BOOL = "imsemergency.emergency_callback_mode_supported_bool";
+    field public static final String KEY_EMERGENCY_OVER_IMS_SUPPORTED_RATS_INT_ARRAY = "imsemergency.emergency_over_ims_supported_rats_int_array";
+    field public static final String KEY_EMERGENCY_QOS_PRECONDITION_SUPPORTED_BOOL = "imsemergency.emergency_qos_precondition_supported_bool";
+    field public static final String KEY_EMERGENCY_REGISTRATION_TIMER_MILLIS_INT = "imsemergency.emergency_registration_timer_millis_int";
+    field public static final String KEY_PREFIX = "imsemergency.";
+    field public static final String KEY_REFRESH_GEOLOCATION_TIMEOUT_MILLIS_INT = "imsemergency.refresh_geolocation_timeout_millis_int";
+    field public static final String KEY_RETRY_EMERGENCY_ON_IMS_PDN_BOOL = "imsemergency.retry_emergency_on_ims_pdn_bool";
+  }
+
+  public static final class CarrierConfigManager.ImsRtt {
+    field public static final String KEY_PREFIX = "imsrtt.";
+    field public static final String KEY_RED_PAYLOAD_TYPE_INT = "imsrtt.red_payload_type_int";
+    field public static final String KEY_T140_PAYLOAD_TYPE_INT = "imsrtt.t140_payload_type_int";
+    field public static final String KEY_TEXT_AS_BANDWIDTH_KBPS_INT = "imsrtt.text_as_bandwidth_kbps_int";
+    field public static final String KEY_TEXT_CODEC_CAPABILITY_PAYLOAD_TYPES_BUNDLE = "imsrtt.text_codec_capability_payload_types_bundle";
+    field public static final String KEY_TEXT_ON_DEFAULT_BEARER_SUPPORTED_BOOL = "imsrtt.text_on_default_bearer_supported_bool";
+    field public static final String KEY_TEXT_QOS_PRECONDITION_SUPPORTED_BOOL = "imsrtt.text_qos_precondition_supported_bool";
+    field public static final String KEY_TEXT_RR_BANDWIDTH_BPS_INT = "imsrtt.text_rr_bandwidth_bps_int";
+    field public static final String KEY_TEXT_RS_BANDWIDTH_BPS_INT = "imsrtt.text_rs_bandwidth_bps_int";
   }
 
   public static final class CarrierConfigManager.ImsServiceEntitlement {
@@ -41009,6 +41578,172 @@
     field public static final String KEY_SHOW_VOWIFI_WEBVIEW_BOOL = "imsserviceentitlement.show_vowifi_webview_bool";
   }
 
+  public static final class CarrierConfigManager.ImsSms {
+    field public static final String KEY_PREFIX = "imssms.";
+    field public static final String KEY_SMS_CSFB_RETRY_ON_FAILURE_BOOL = "imssms.sms_csfb_retry_on_failure_bool";
+    field public static final String KEY_SMS_OVER_IMS_FORMAT_INT = "imssms.sms_over_ims_format_int";
+    field public static final String KEY_SMS_OVER_IMS_SUPPORTED_BOOL = "imssms.sms_over_ims_supported_bool";
+    field public static final String KEY_SMS_OVER_IMS_SUPPORTED_RATS_INT_ARRAY = "imssms.sms_over_ims_supported_rats_int_array";
+    field public static final int SMS_FORMAT_3GPP = 0; // 0x0
+    field public static final int SMS_FORMAT_3GPP2 = 1; // 0x1
+  }
+
+  public static final class CarrierConfigManager.ImsSs {
+    field public static final String KEY_NETWORK_INITIATED_USSD_OVER_IMS_SUPPORTED_BOOL = "imsss.network_initiated_ussd_over_ims_supported_bool";
+    field public static final String KEY_PREFIX = "imsss.";
+    field public static final String KEY_USE_CSFB_ON_XCAP_OVER_UT_FAILURE_BOOL = "imsss.use_csfb_on_xcap_over_ut_failure_bool";
+    field public static final String KEY_UT_AS_SERVER_FQDN_STRING = "imsss.ut_as_server_fqdn_string";
+    field public static final String KEY_UT_AS_SERVER_PORT_INT = "imsss.ut_as_server_port_int";
+    field public static final String KEY_UT_IPTYPE_HOME_INT = "imsss.ut_iptype_home_int";
+    field public static final String KEY_UT_IPTYPE_ROAMING_INT = "imsss.ut_iptype_roaming_int";
+    field public static final String KEY_UT_REQUIRES_IMS_REGISTRATION_BOOL = "imsss.ut_requires_ims_registration_bool";
+    field public static final String KEY_UT_SERVER_BASED_SERVICES_INT_ARRAY = "imsss.ut_server_based_services_int_array";
+    field public static final String KEY_UT_SUPPORTED_WHEN_PS_DATA_OFF_BOOL = "imsss.ut_supported_when_ps_data_off_bool";
+    field public static final String KEY_UT_SUPPORTED_WHEN_ROAMING_BOOL = "imsss.ut_supported_when_roaming_bool";
+    field public static final String KEY_UT_TERMINAL_BASED_SERVICES_INT_ARRAY = "imsss.ut_terminal_based_services_int_array";
+    field public static final String KEY_UT_TRANSPORT_TYPE_INT = "imsss.ut_transport_type_int";
+    field public static final String KEY_XCAP_OVER_UT_SUPPORTED_RATS_INT_ARRAY = "imsss.xcap_over_ut_supported_rats_int_array";
+    field public static final int SUPPLEMENTARY_SERVICE_CB_ACR = 20; // 0x14
+    field public static final int SUPPLEMENTARY_SERVICE_CB_ALL = 12; // 0xc
+    field public static final int SUPPLEMENTARY_SERVICE_CB_BAIC = 18; // 0x12
+    field public static final int SUPPLEMENTARY_SERVICE_CB_BAOC = 14; // 0xe
+    field public static final int SUPPLEMENTARY_SERVICE_CB_BIC_ROAM = 19; // 0x13
+    field public static final int SUPPLEMENTARY_SERVICE_CB_BIL = 21; // 0x15
+    field public static final int SUPPLEMENTARY_SERVICE_CB_BOIC = 15; // 0xf
+    field public static final int SUPPLEMENTARY_SERVICE_CB_BOIC_EXHC = 16; // 0x10
+    field public static final int SUPPLEMENTARY_SERVICE_CB_IBS = 17; // 0x11
+    field public static final int SUPPLEMENTARY_SERVICE_CB_OBS = 13; // 0xd
+    field public static final int SUPPLEMENTARY_SERVICE_CF_ALL = 1; // 0x1
+    field public static final int SUPPLEMENTARY_SERVICE_CF_ALL_CONDITONAL_FORWARDING = 3; // 0x3
+    field public static final int SUPPLEMENTARY_SERVICE_CF_CFB = 4; // 0x4
+    field public static final int SUPPLEMENTARY_SERVICE_CF_CFNL = 7; // 0x7
+    field public static final int SUPPLEMENTARY_SERVICE_CF_CFNRC = 6; // 0x6
+    field public static final int SUPPLEMENTARY_SERVICE_CF_CFNRY = 5; // 0x5
+    field public static final int SUPPLEMENTARY_SERVICE_CF_CFU = 2; // 0x2
+    field public static final int SUPPLEMENTARY_SERVICE_CW = 0; // 0x0
+    field public static final int SUPPLEMENTARY_SERVICE_IDENTIFICATION_OIP = 8; // 0x8
+    field public static final int SUPPLEMENTARY_SERVICE_IDENTIFICATION_OIR = 10; // 0xa
+    field public static final int SUPPLEMENTARY_SERVICE_IDENTIFICATION_TIP = 9; // 0x9
+    field public static final int SUPPLEMENTARY_SERVICE_IDENTIFICATION_TIR = 11; // 0xb
+  }
+
+  public static final class CarrierConfigManager.ImsVoice {
+    field public static final int ALERTING_SRVCC_SUPPORT = 1; // 0x1
+    field public static final int BANDWIDTH_EFFICIENT = 0; // 0x0
+    field public static final int BASIC_SRVCC_SUPPORT = 0; // 0x0
+    field public static final int CONFERENCE_SUBSCRIBE_TYPE_IN_DIALOG = 0; // 0x0
+    field public static final int CONFERENCE_SUBSCRIBE_TYPE_OUT_OF_DIALOG = 1; // 0x1
+    field public static final int EVS_ENCODED_BW_TYPE_FB = 3; // 0x3
+    field public static final int EVS_ENCODED_BW_TYPE_NB = 0; // 0x0
+    field public static final int EVS_ENCODED_BW_TYPE_NB_WB = 4; // 0x4
+    field public static final int EVS_ENCODED_BW_TYPE_NB_WB_SWB = 5; // 0x5
+    field public static final int EVS_ENCODED_BW_TYPE_NB_WB_SWB_FB = 6; // 0x6
+    field public static final int EVS_ENCODED_BW_TYPE_SWB = 2; // 0x2
+    field public static final int EVS_ENCODED_BW_TYPE_WB = 1; // 0x1
+    field public static final int EVS_ENCODED_BW_TYPE_WB_SWB = 7; // 0x7
+    field public static final int EVS_ENCODED_BW_TYPE_WB_SWB_FB = 8; // 0x8
+    field public static final int EVS_OPERATIONAL_MODE_AMRWB_IO = 1; // 0x1
+    field public static final int EVS_OPERATIONAL_MODE_PRIMARY = 0; // 0x0
+    field public static final int EVS_PRIMARY_MODE_BITRATE_128_0_KBPS = 11; // 0xb
+    field public static final int EVS_PRIMARY_MODE_BITRATE_13_2_KBPS = 4; // 0x4
+    field public static final int EVS_PRIMARY_MODE_BITRATE_16_4_KBPS = 5; // 0x5
+    field public static final int EVS_PRIMARY_MODE_BITRATE_24_4_KBPS = 6; // 0x6
+    field public static final int EVS_PRIMARY_MODE_BITRATE_32_0_KBPS = 7; // 0x7
+    field public static final int EVS_PRIMARY_MODE_BITRATE_48_0_KBPS = 8; // 0x8
+    field public static final int EVS_PRIMARY_MODE_BITRATE_5_9_KBPS = 0; // 0x0
+    field public static final int EVS_PRIMARY_MODE_BITRATE_64_0_KBPS = 9; // 0x9
+    field public static final int EVS_PRIMARY_MODE_BITRATE_7_2_KBPS = 1; // 0x1
+    field public static final int EVS_PRIMARY_MODE_BITRATE_8_0_KBPS = 2; // 0x2
+    field public static final int EVS_PRIMARY_MODE_BITRATE_96_0_KBPS = 10; // 0xa
+    field public static final int EVS_PRIMARY_MODE_BITRATE_9_6_KBPS = 3; // 0x3
+    field public static final String KEY_AMRNB_PAYLOAD_DESCRIPTION_BUNDLE = "imsvoice.amrnb_payload_description_bundle";
+    field public static final String KEY_AMRNB_PAYLOAD_TYPE_INT_ARRAY = "imsvoice.amrnb_payload_type_int_array";
+    field public static final String KEY_AMRWB_PAYLOAD_DESCRIPTION_BUNDLE = "imsvoice.amrwb_payload_description_bundle";
+    field public static final String KEY_AMRWB_PAYLOAD_TYPE_INT_ARRAY = "imsvoice.amrwb_payload_type_int_array";
+    field public static final String KEY_AMR_CODEC_ATTRIBUTE_MODESET_INT_ARRAY = "imsvoice.amr_codec_attribute_modeset_int_array";
+    field public static final String KEY_AMR_CODEC_ATTRIBUTE_PAYLOAD_FORMAT_INT = "imsvoice.amr_codec_attribute_payload_format_int";
+    field public static final String KEY_AUDIO_AS_BANDWIDTH_KBPS_INT = "imsvoice.audio_as_bandwidth_kbps_int";
+    field public static final String KEY_AUDIO_CODEC_CAPABILITY_PAYLOAD_TYPES_BUNDLE = "imsvoice.audio_codec_capability_payload_types_bundle";
+    field public static final String KEY_AUDIO_INACTIVITY_CALL_END_REASONS_INT_ARRAY = "imsvoice.audio_inactivity_call_end_reasons_int_array";
+    field public static final String KEY_AUDIO_RR_BANDWIDTH_BPS_INT = "imsvoice.audio_rr_bandwidth_bps_int";
+    field public static final String KEY_AUDIO_RS_BANDWIDTH_BPS_INT = "imsvoice.audio_rs_bandwidth_bps_int";
+    field public static final String KEY_AUDIO_RTCP_INACTIVITY_TIMER_MILLIS_INT = "imsvoice.audio_rtcp_inactivity_timer_millis_int";
+    field public static final String KEY_AUDIO_RTP_INACTIVITY_TIMER_MILLIS_INT = "imsvoice.audio_rtp_inactivity_timer_millis_int";
+    field public static final String KEY_CARRIER_VOLTE_ROAMING_AVAILABLE_BOOL = "imsvoice.carrier_volte_roaming_available_bool";
+    field public static final String KEY_CODEC_ATTRIBUTE_MODE_CHANGE_CAPABILITY_INT = "imsvoice.codec_attribute_mode_change_capability_int";
+    field public static final String KEY_CODEC_ATTRIBUTE_MODE_CHANGE_NEIGHBOR_INT = "imsvoice.codec_attribute_mode_change_neighbor_int";
+    field public static final String KEY_CODEC_ATTRIBUTE_MODE_CHANGE_PERIOD_INT = "imsvoice.codec_attribute_mode_change_period_int";
+    field public static final String KEY_CONFERENCE_FACTORY_URI_STRING = "imsvoice.conference_factory_uri_string";
+    field public static final String KEY_CONFERENCE_SUBSCRIBE_TYPE_INT = "imsvoice.conference_subscribe_type_int";
+    field public static final String KEY_DEDICATED_BEARER_WAIT_TIMER_MILLIS_INT = "imsvoice.dedicated_bearer_wait_timer_millis_int";
+    field public static final String KEY_DTMFNB_PAYLOAD_TYPE_INT_ARRAY = "imsvoice.dtmfnb_payload_type_int_array";
+    field public static final String KEY_DTMFWB_PAYLOAD_TYPE_INT_ARRAY = "imsvoice.dtmfwb_payload_type_int_array";
+    field public static final String KEY_EVS_CODEC_ATTRIBUTE_BANDWIDTH_INT = "imsvoice.evs_codec_attribute_bandwidth_int";
+    field public static final String KEY_EVS_CODEC_ATTRIBUTE_BITRATE_INT_ARRAY = "imsvoice.evs_codec_attribute_bitrate_int_array";
+    field public static final String KEY_EVS_CODEC_ATTRIBUTE_CHANNELS_INT = "imsvoice.evs_codec_attribute_channels_int";
+    field public static final String KEY_EVS_CODEC_ATTRIBUTE_CH_AW_RECV_INT = "imsvoice.evs_codec_attribute_ch_aw_recv_int";
+    field public static final String KEY_EVS_CODEC_ATTRIBUTE_CMR_INT = "imsvoice.codec_attribute_cmr_int";
+    field public static final String KEY_EVS_CODEC_ATTRIBUTE_DTX_BOOL = "imsvoice.evs_codec_attribute_dtx_bool";
+    field public static final String KEY_EVS_CODEC_ATTRIBUTE_DTX_RECV_BOOL = "imsvoice.evs_codec_attribute_dtx_recv_bool";
+    field public static final String KEY_EVS_CODEC_ATTRIBUTE_HF_ONLY_INT = "imsvoice.evs_codec_attribute_hf_only_int";
+    field public static final String KEY_EVS_CODEC_ATTRIBUTE_MODE_SWITCH_INT = "imsvoice.evs_codec_attribute_mode_switch_int";
+    field public static final String KEY_EVS_PAYLOAD_DESCRIPTION_BUNDLE = "imsvoice.evs_payload_description_bundle";
+    field public static final String KEY_EVS_PAYLOAD_TYPE_INT_ARRAY = "imsvoice.evs_payload_type_int_array";
+    field public static final String KEY_INCLUDE_CALLER_ID_SERVICE_CODES_IN_SIP_INVITE_BOOL = "imsvoice.include_caller_id_service_codes_in_sip_invite_bool";
+    field public static final String KEY_MINIMUM_SESSION_EXPIRES_TIMER_SEC_INT = "imsvoice.minimum_session_expires_timer_sec_int";
+    field public static final String KEY_MO_CALL_REQUEST_TIMEOUT_MILLIS_INT = "imsvoice.mo_call_request_timeout_millis_int";
+    field public static final String KEY_MULTIENDPOINT_SUPPORTED_BOOL = "imsvoice.multiendpoint_supported_bool";
+    field public static final String KEY_OIP_SOURCE_FROM_HEADER_BOOL = "imsvoice.oip_source_from_header_bool";
+    field public static final String KEY_PRACK_SUPPORTED_FOR_18X_BOOL = "imsvoice.prack_supported_for_18x_bool";
+    field public static final String KEY_PREFIX = "imsvoice.";
+    field public static final String KEY_RINGBACK_TIMER_MILLIS_INT = "imsvoice.ringback_timer_millis_int";
+    field public static final String KEY_RINGING_TIMER_MILLIS_INT = "imsvoice.ringing_timer_millis_int";
+    field public static final String KEY_SESSION_EXPIRES_TIMER_SEC_INT = "imsvoice.session_expires_timer_sec_int";
+    field public static final String KEY_SESSION_PRIVACY_TYPE_INT = "imsvoice.session_privacy_type_int";
+    field public static final String KEY_SESSION_REFRESHER_TYPE_INT = "imsvoice.session_refresher_type_int";
+    field public static final String KEY_SESSION_REFRESH_METHOD_INT = "imsvoice.session_refresh_method_int";
+    field public static final String KEY_SESSION_TIMER_SUPPORTED_BOOL = "imsvoice.session_timer_supported_bool";
+    field public static final String KEY_SRVCC_TYPE_INT_ARRAY = "imsvoice.srvcc_type_int_array";
+    field public static final String KEY_VOICE_ON_DEFAULT_BEARER_SUPPORTED_BOOL = "imsvoice.voice_on_default_bearer_supported_bool";
+    field public static final String KEY_VOICE_QOS_PRECONDITION_SUPPORTED_BOOL = "imsvoice.voice_qos_precondition_supported_bool";
+    field public static final int MIDCALL_SRVCC_SUPPORT = 3; // 0x3
+    field public static final int OCTET_ALIGNED = 1; // 0x1
+    field public static final int PREALERTING_SRVCC_SUPPORT = 2; // 0x2
+    field public static final int SESSION_PRIVACY_TYPE_HEADER = 0; // 0x0
+    field public static final int SESSION_PRIVACY_TYPE_ID = 2; // 0x2
+    field public static final int SESSION_PRIVACY_TYPE_NONE = 1; // 0x1
+    field public static final int SESSION_REFRESHER_TYPE_UAC = 1; // 0x1
+    field public static final int SESSION_REFRESHER_TYPE_UAS = 2; // 0x2
+    field public static final int SESSION_REFRESHER_TYPE_UNKNOWN = 0; // 0x0
+    field public static final int SESSION_REFRESH_METHOD_INVITE = 0; // 0x0
+    field public static final int SESSION_REFRESH_METHOD_UPDATE_PREFERRED = 1; // 0x1
+  }
+
+  public static final class CarrierConfigManager.ImsVt {
+    field public static final String KEY_H264_PAYLOAD_DESCRIPTION_BUNDLE = "imsvt.h264_payload_description_bundle";
+    field public static final String KEY_H264_PAYLOAD_TYPE_INT_ARRAY = "imsvt.h264_payload_type_int_array";
+    field public static final String KEY_H264_VIDEO_CODEC_ATTRIBUTE_PROFILE_LEVEL_ID_STRING = "imsvt.h264_video_codec_attribute_profile_level_id_string";
+    field public static final String KEY_PREFIX = "imsvt.";
+    field public static final String KEY_VIDEO_AS_BANDWIDTH_KBPS_INT = "imsvt.video_as_bandwidth_kbps_int";
+    field public static final String KEY_VIDEO_CODEC_ATTRIBUTE_FRAME_RATE_INT = "imsvt.video_codec_attribute_frame_rate_int";
+    field public static final String KEY_VIDEO_CODEC_ATTRIBUTE_PACKETIZATION_MODE_INT = "imsvt.video_codec_attribute_packetization_mode_int";
+    field public static final String KEY_VIDEO_CODEC_ATTRIBUTE_RESOLUTION_INT_ARRAY = "imsvt.video_codec_attribute_resolution_int_array";
+    field public static final String KEY_VIDEO_CODEC_CAPABILITY_PAYLOAD_TYPES_BUNDLE = "imsvt.video_codec_capability_payload_types_bundle";
+    field public static final String KEY_VIDEO_ON_DEFAULT_BEARER_SUPPORTED_BOOL = "imsvt.video_on_default_bearer_supported_bool";
+    field public static final String KEY_VIDEO_QOS_PRECONDITION_SUPPORTED_BOOL = "imsvt.video_qos_precondition_supported_bool";
+    field public static final String KEY_VIDEO_RR_BANDWIDTH_BPS_INT = "imsvt.video_rr_bandwidth_bps_int";
+    field public static final String KEY_VIDEO_RS_BANDWIDTH_BPS_INT = "imsvt.video_rs_bandwidth_bps_int";
+    field public static final String KEY_VIDEO_RTCP_INACTIVITY_TIMER_MILLIS_INT = "imsvt.video_rtcp_inactivity_timer_millis_int";
+    field public static final String KEY_VIDEO_RTP_DSCP_INT = "imsvt.video_rtp_dscp_int";
+    field public static final String KEY_VIDEO_RTP_INACTIVITY_TIMER_MILLIS_INT = "imsvt.video_rtp_inactivity_timer_millis_int";
+  }
+
+  public static final class CarrierConfigManager.ImsWfc {
+    field public static final String KEY_EMERGENCY_CALL_OVER_EMERGENCY_PDN_BOOL = "imswfc.emergency_call_over_emergency_pdn_bool";
+    field public static final String KEY_PIDF_SHORT_CODE_STRING_ARRAY = "imswfc.pidf_short_code_string_array";
+    field public static final String KEY_PREFIX = "imswfc.";
+  }
+
   public static final class CarrierConfigManager.Iwlan {
     field public static final int AUTHENTICATION_METHOD_CERT = 1; // 0x1
     field public static final int AUTHENTICATION_METHOD_EAP_ONLY = 0; // 0x0
@@ -41016,6 +41751,7 @@
     field public static final int EPDG_ADDRESS_PCO = 2; // 0x2
     field public static final int EPDG_ADDRESS_PLMN = 1; // 0x1
     field public static final int EPDG_ADDRESS_STATIC = 0; // 0x0
+    field public static final int EPDG_ADDRESS_VISITED_COUNTRY = 4; // 0x4
     field public static final int ID_TYPE_FQDN = 2; // 0x2
     field public static final int ID_TYPE_KEY_ID = 11; // 0xb
     field public static final int ID_TYPE_RFC822_ADDR = 3; // 0x3
@@ -41047,6 +41783,7 @@
     field public static final String KEY_SUPPORTED_IKE_SESSION_ENCRYPTION_ALGORITHMS_INT_ARRAY = "iwlan.supported_ike_session_encryption_algorithms_int_array";
     field public static final String KEY_SUPPORTED_INTEGRITY_ALGORITHMS_INT_ARRAY = "iwlan.supported_integrity_algorithms_int_array";
     field public static final String KEY_SUPPORTED_PRF_ALGORITHMS_INT_ARRAY = "iwlan.supported_prf_algorithms_int_array";
+    field public static final String KEY_SUPPORTS_EAP_AKA_FAST_REAUTH_BOOL = "iwlan.supports_eap_aka_fast_reauth_bool";
   }
 
   public abstract class CellIdentity implements android.os.Parcelable {
@@ -42072,16 +42809,16 @@
     ctor @Deprecated public ServiceState(android.os.Parcel);
     method protected void copyFrom(android.telephony.ServiceState);
     method public int describeContents();
-    method public int getCdmaNetworkId();
-    method public int getCdmaSystemId();
+    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public int getCdmaNetworkId();
+    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public int getCdmaSystemId();
     method public int[] getCellBandwidths();
     method public int getChannelNumber();
     method public int getDuplexMode();
     method public boolean getIsManualSelection();
     method @NonNull public java.util.List<android.telephony.NetworkRegistrationInfo> getNetworkRegistrationInfoList();
-    method public String getOperatorAlphaLong();
-    method public String getOperatorAlphaShort();
-    method public String getOperatorNumeric();
+    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public String getOperatorAlphaLong();
+    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public String getOperatorAlphaShort();
+    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public String getOperatorNumeric();
     method public boolean getRoaming();
     method public int getState();
     method public boolean isSearching();
@@ -42226,8 +42963,11 @@
     field public static final String MMS_CONFIG_UA_PROF_URL = "uaProfUrl";
     field public static final String MMS_CONFIG_USER_AGENT = "userAgent";
     field public static final int MMS_ERROR_CONFIGURATION_ERROR = 7; // 0x7
+    field public static final int MMS_ERROR_DATA_DISABLED = 11; // 0xb
     field public static final int MMS_ERROR_HTTP_FAILURE = 4; // 0x4
+    field public static final int MMS_ERROR_INACTIVE_SUBSCRIPTION = 10; // 0xa
     field public static final int MMS_ERROR_INVALID_APN = 2; // 0x2
+    field public static final int MMS_ERROR_INVALID_SUBSCRIPTION_ID = 9; // 0x9
     field public static final int MMS_ERROR_IO_ERROR = 5; // 0x5
     field public static final int MMS_ERROR_NO_DATA_NETWORK = 8; // 0x8
     field public static final int MMS_ERROR_RETRY = 6; // 0x6
@@ -42273,6 +43013,7 @@
     field public static final int RESULT_RIL_BLOCKED_DUE_TO_CALL = 123; // 0x7b
     field public static final int RESULT_RIL_CANCELLED = 119; // 0x77
     field public static final int RESULT_RIL_ENCODING_ERR = 109; // 0x6d
+    field public static final int RESULT_RIL_GENERIC_ERROR = 124; // 0x7c
     field public static final int RESULT_RIL_INTERNAL_ERR = 113; // 0x71
     field public static final int RESULT_RIL_INVALID_ARGUMENTS = 104; // 0x68
     field public static final int RESULT_RIL_INVALID_MODEM_STATE = 115; // 0x73
@@ -42346,6 +43087,7 @@
     field public static final int ENCODING_16BIT = 3; // 0x3
     field public static final int ENCODING_7BIT = 1; // 0x1
     field public static final int ENCODING_8BIT = 2; // 0x2
+    field public static final int ENCODING_KSC5601 = 4; // 0x4
     field public static final int ENCODING_UNKNOWN = 0; // 0x0
     field public static final String FORMAT_3GPP = "3gpp";
     field public static final String FORMAT_3GPP2 = "3gpp2";
@@ -42384,10 +43126,12 @@
     method @Nullable public String getMccString();
     method @Deprecated public int getMnc();
     method @Nullable public String getMncString();
-    method public String getNumber();
+    method @Deprecated public String getNumber();
+    method public int getPortIndex();
     method public int getSimSlotIndex();
     method public int getSubscriptionId();
     method public int getSubscriptionType();
+    method public int getUsageSetting();
     method public boolean isEmbedded();
     method public boolean isOpportunistic();
     method public void writeToParcel(android.os.Parcel, int);
@@ -42417,6 +43161,8 @@
     method @NonNull public java.util.List<android.net.Uri> getDeviceToDeviceStatusSharingContacts(int);
     method public int getDeviceToDeviceStatusSharingPreference(int);
     method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telephony.SubscriptionInfo> getOpportunisticSubscriptions();
+    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_NUMBERS, "android.permission.READ_PRIVILEGED_PHONE_STATE", "carrier privileges"}) public String getPhoneNumber(int, int);
+    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_NUMBERS, "android.permission.READ_PRIVILEGED_PHONE_STATE", "carrier privileges"}) public String getPhoneNumber(int);
     method public static int getSlotIndex(int);
     method @Nullable public int[] getSubscriptionIds(int);
     method @NonNull public java.util.List<android.telephony.SubscriptionPlan> getSubscriptionPlans(int);
@@ -42428,6 +43174,7 @@
     method public void removeOnOpportunisticSubscriptionsChangedListener(@NonNull android.telephony.SubscriptionManager.OnOpportunisticSubscriptionsChangedListener);
     method public void removeOnSubscriptionsChangedListener(android.telephony.SubscriptionManager.OnSubscriptionsChangedListener);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void removeSubscriptionsFromGroup(@NonNull java.util.List<java.lang.Integer>, @NonNull android.os.ParcelUuid);
+    method @RequiresPermission("carrier privileges") public void setCarrierPhoneNumber(int, @NonNull String);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDeviceToDeviceStatusSharingContacts(int, @NonNull java.util.List<android.net.Uri>);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDeviceToDeviceStatusSharingPreference(int, int);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setOpportunistic(boolean, int);
@@ -42435,7 +43182,8 @@
     method public void setSubscriptionOverrideCongested(int, boolean, @NonNull int[], long);
     method public void setSubscriptionOverrideUnmetered(int, boolean, long);
     method public void setSubscriptionOverrideUnmetered(int, boolean, @NonNull int[], long);
-    method public void setSubscriptionPlans(int, @NonNull java.util.List<android.telephony.SubscriptionPlan>);
+    method @Deprecated public void setSubscriptionPlans(int, @NonNull java.util.List<android.telephony.SubscriptionPlan>);
+    method public void setSubscriptionPlans(int, @NonNull java.util.List<android.telephony.SubscriptionPlan>, long);
     method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void switchToSubscription(int, @NonNull android.app.PendingIntent);
     field public static final String ACTION_DEFAULT_SMS_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SMS_SUBSCRIPTION_CHANGED";
     field public static final String ACTION_DEFAULT_SUBSCRIPTION_CHANGED = "android.telephony.action.DEFAULT_SUBSCRIPTION_CHANGED";
@@ -42454,8 +43202,15 @@
     field public static final String EXTRA_SUBSCRIPTION_INDEX = "android.telephony.extra.SUBSCRIPTION_INDEX";
     field public static final int INVALID_SIM_SLOT_INDEX = -1; // 0xffffffff
     field public static final int INVALID_SUBSCRIPTION_ID = -1; // 0xffffffff
+    field public static final int PHONE_NUMBER_SOURCE_CARRIER = 2; // 0x2
+    field public static final int PHONE_NUMBER_SOURCE_IMS = 3; // 0x3
+    field public static final int PHONE_NUMBER_SOURCE_UICC = 1; // 0x1
     field public static final int SUBSCRIPTION_TYPE_LOCAL_SIM = 0; // 0x0
     field public static final int SUBSCRIPTION_TYPE_REMOTE_SIM = 1; // 0x1
+    field public static final int USAGE_SETTING_DATA_CENTRIC = 2; // 0x2
+    field public static final int USAGE_SETTING_DEFAULT = 0; // 0x0
+    field public static final int USAGE_SETTING_UNKNOWN = -1; // 0xffffffff
+    field public static final int USAGE_SETTING_VOICE_CENTRIC = 1; // 0x1
   }
 
   public static class SubscriptionManager.OnOpportunisticSubscriptionsChangedListener {
@@ -42611,6 +43366,7 @@
     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean doesSwitchMultiSimConfigTriggerReboot();
     method public int getActiveModemCount();
     method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public java.util.List<android.telephony.CellInfo> getAllCellInfo();
+    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public long getAllowedNetworkTypesForReason(int);
     method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public int getCallComposerStatus();
     method @Deprecated @RequiresPermission(value=android.Manifest.permission.READ_PHONE_STATE, conditional=true) public int getCallState();
     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getCallStateForSubscription();
@@ -42619,11 +43375,11 @@
     method public int getCarrierIdFromSimMccMnc();
     method @Deprecated @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public android.telephony.CellLocation getCellLocation();
     method public int getDataActivity();
-    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getDataNetworkType();
+    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public int getDataNetworkType();
     method public int getDataState();
     method @Deprecated @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getDeviceId();
     method @Deprecated @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getDeviceId(int);
-    method @Nullable @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getDeviceSoftwareVersion();
+    method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public String getDeviceSoftwareVersion();
     method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>> getEmergencyNumberList();
     method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.Map<java.lang.Integer,java.util.List<android.telephony.emergency.EmergencyNumber>> getEmergencyNumberList(int);
     method @NonNull @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<java.lang.String> getEquivalentHomePlmns();
@@ -42632,7 +43388,7 @@
     method public String getIccAuthentication(int, int, String);
     method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getImei();
     method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public String getImei(int);
-    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_SMS, android.Manifest.permission.READ_PHONE_NUMBERS}) public String getLine1Number();
+    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_SMS, android.Manifest.permission.READ_PHONE_NUMBERS}) public String getLine1Number();
     method @NonNull @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public String getManualNetworkSelectionPlmn();
     method @Nullable public String getManufacturerCode();
     method @Nullable public String getManufacturerCode(int);
@@ -42655,6 +43411,7 @@
     method public int getPhoneType();
     method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PHONE_STATE}) public int getPreferredOpportunisticDataSubscription();
     method @Nullable @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public android.telephony.ServiceState getServiceState();
+    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.ACCESS_COARSE_LOCATION}) public android.telephony.ServiceState getServiceState(boolean, boolean);
     method @Nullable public android.telephony.SignalStrength getSignalStrength();
     method public int getSimCarrierId();
     method @Nullable public CharSequence getSimCarrierIdName();
@@ -42670,32 +43427,33 @@
     method public int getSubscriptionId();
     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getSubscriptionId(@NonNull android.telecom.PhoneAccountHandle);
     method public int getSupportedModemCount();
+    method @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public long getSupportedRadioAccessFamily();
     method @Nullable public String getTypeAllocationCode();
     method @Nullable public String getTypeAllocationCode(int);
     method @NonNull @RequiresPermission("android.permission.READ_PRIVILEGED_PHONE_STATE") public java.util.List<android.telephony.UiccCardInfo> getUiccCardsInfo();
     method @Nullable @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVisualVoicemailPackageName();
     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVoiceMailAlphaTag();
     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getVoiceMailNumber();
-    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int getVoiceNetworkType();
+    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public int getVoiceNetworkType();
     method @Nullable public android.net.Uri getVoicemailRingtoneUri(android.telecom.PhoneAccountHandle);
     method public boolean hasCarrierPrivileges();
     method public boolean hasIccCard();
-    method @Deprecated public boolean iccCloseLogicalChannel(int);
-    method @Deprecated public byte[] iccExchangeSimIO(int, int, int, int, int, String);
+    method public boolean iccCloseLogicalChannel(int);
+    method public byte[] iccExchangeSimIO(int, int, int, int, int, String);
     method @Deprecated public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(String);
-    method @Deprecated public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(String, int);
-    method @Deprecated public String iccTransmitApduBasicChannel(int, int, int, int, int, String);
-    method @Deprecated public String iccTransmitApduLogicalChannel(int, int, int, int, int, int, String);
+    method public android.telephony.IccOpenLogicalChannelResponse iccOpenLogicalChannel(String, int);
+    method public String iccTransmitApduBasicChannel(int, int, int, int, int, String);
+    method public String iccTransmitApduLogicalChannel(int, int, int, int, int, int, String);
     method public boolean isConcurrentVoiceAndDataSupported();
     method public boolean isDataCapable();
-    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isDataConnectionAllowed();
-    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataEnabled();
-    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataEnabledForReason(int);
-    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE}) public boolean isDataRoamingEnabled();
+    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_BASIC_PHONE_STATE}) public boolean isDataConnectionAllowed();
+    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public boolean isDataEnabled();
+    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public boolean isDataEnabledForReason(int);
+    method @RequiresPermission(anyOf={android.Manifest.permission.ACCESS_NETWORK_STATE, android.Manifest.permission.READ_PHONE_STATE, android.Manifest.permission.READ_BASIC_PHONE_STATE}) public boolean isDataRoamingEnabled();
     method public boolean isEmergencyNumber(@NonNull String);
     method public boolean isHearingAidCompatibilitySupported();
     method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isManualNetworkSelectionAllowed();
-    method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isModemEnabledForSlot(int);
+    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public boolean isModemEnabledForSlot(int);
     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public int isMultiSimSupported();
     method public boolean isNetworkRoaming();
     method public boolean isRadioInterfaceCapabilitySupported(@NonNull String);
@@ -42706,18 +43464,22 @@
     method public boolean isVoicemailVibrationEnabled(android.telecom.PhoneAccountHandle);
     method public boolean isWorldPhone();
     method @Deprecated public void listen(android.telephony.PhoneStateListener, int);
+    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void rebootModem();
     method public void registerTelephonyCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyCallback);
+    method public void registerTelephonyCallback(boolean, boolean, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyCallback);
     method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestCellInfoUpdate(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyManager.CellInfoCallback);
     method @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(android.telephony.NetworkScanRequest, java.util.concurrent.Executor, android.telephony.TelephonyScanManager.NetworkScanCallback);
+    method @Nullable @RequiresPermission(allOf={android.Manifest.permission.MODIFY_PHONE_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public android.telephony.NetworkScan requestNetworkScan(boolean, @NonNull android.telephony.NetworkScanRequest, @NonNull java.util.concurrent.Executor, @NonNull android.telephony.TelephonyScanManager.NetworkScanCallback);
     method public void sendDialerSpecialCode(String);
-    method @Deprecated public String sendEnvelopeWithStatus(String);
+    method public String sendEnvelopeWithStatus(String);
     method @RequiresPermission(android.Manifest.permission.CALL_PHONE) public void sendUssdRequest(String, android.telephony.TelephonyManager.UssdResponseCallback, android.os.Handler);
     method public void sendVisualVoicemailSms(String, int, String, android.app.PendingIntent);
+    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setAllowedNetworkTypesForReason(int, long);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setCallComposerStatus(int);
     method @Deprecated @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabled(boolean);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setDataEnabledForReason(int, boolean);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public int setForbiddenPlmns(@NonNull java.util.List<java.lang.String>);
-    method public boolean setLine1NumberForDisplay(String, String);
+    method @Deprecated public boolean setLine1NumberForDisplay(String, String);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void setNetworkSelectionModeAutomatic();
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setNetworkSelectionModeManual(String, boolean);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public boolean setNetworkSelectionModeManual(@NonNull String, boolean, int);
@@ -42749,6 +43511,8 @@
     field public static final String ACTION_SHOW_VOICEMAIL_NOTIFICATION = "android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";
     field public static final String ACTION_SUBSCRIPTION_CARRIER_IDENTITY_CHANGED = "android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED";
     field public static final String ACTION_SUBSCRIPTION_SPECIFIC_CARRIER_IDENTITY_CHANGED = "android.telephony.action.SUBSCRIPTION_SPECIFIC_CARRIER_IDENTITY_CHANGED";
+    field public static final int ALLOWED_NETWORK_TYPES_REASON_CARRIER = 2; // 0x2
+    field public static final int ALLOWED_NETWORK_TYPES_REASON_USER = 0; // 0x0
     field public static final int APPTYPE_CSIM = 4; // 0x4
     field public static final int APPTYPE_ISIM = 5; // 0x5
     field public static final int APPTYPE_RUIM = 3; // 0x3
@@ -42777,11 +43541,15 @@
     field public static final int DATA_DISCONNECTED = 0; // 0x0
     field public static final int DATA_DISCONNECTING = 4; // 0x4
     field public static final int DATA_ENABLED_REASON_CARRIER = 2; // 0x2
+    field public static final int DATA_ENABLED_REASON_OVERRIDE = 4; // 0x4
     field public static final int DATA_ENABLED_REASON_POLICY = 1; // 0x1
     field public static final int DATA_ENABLED_REASON_THERMAL = 3; // 0x3
+    field public static final int DATA_ENABLED_REASON_UNKNOWN = -1; // 0xffffffff
     field public static final int DATA_ENABLED_REASON_USER = 0; // 0x0
+    field public static final int DATA_HANDOVER_IN_PROGRESS = 5; // 0x5
     field public static final int DATA_SUSPENDED = 3; // 0x3
     field public static final int DATA_UNKNOWN = -1; // 0xffffffff
+    field public static final int DEFAULT_PORT_INDEX = 0; // 0x0
     field public static final int ERI_FLASH = 2; // 0x2
     field public static final int ERI_OFF = 1; // 0x1
     field public static final int ERI_ON = 0; // 0x0
@@ -42819,6 +43587,26 @@
     field public static final int NETWORK_SELECTION_MODE_MANUAL = 2; // 0x2
     field public static final int NETWORK_SELECTION_MODE_UNKNOWN = 0; // 0x0
     field public static final int NETWORK_TYPE_1xRTT = 7; // 0x7
+    field public static final long NETWORK_TYPE_BITMASK_1xRTT = 64L; // 0x40L
+    field public static final long NETWORK_TYPE_BITMASK_CDMA = 8L; // 0x8L
+    field public static final long NETWORK_TYPE_BITMASK_EDGE = 2L; // 0x2L
+    field public static final long NETWORK_TYPE_BITMASK_EHRPD = 8192L; // 0x2000L
+    field public static final long NETWORK_TYPE_BITMASK_EVDO_0 = 16L; // 0x10L
+    field public static final long NETWORK_TYPE_BITMASK_EVDO_A = 32L; // 0x20L
+    field public static final long NETWORK_TYPE_BITMASK_EVDO_B = 2048L; // 0x800L
+    field public static final long NETWORK_TYPE_BITMASK_GPRS = 1L; // 0x1L
+    field public static final long NETWORK_TYPE_BITMASK_GSM = 32768L; // 0x8000L
+    field public static final long NETWORK_TYPE_BITMASK_HSDPA = 128L; // 0x80L
+    field public static final long NETWORK_TYPE_BITMASK_HSPA = 512L; // 0x200L
+    field public static final long NETWORK_TYPE_BITMASK_HSPAP = 16384L; // 0x4000L
+    field public static final long NETWORK_TYPE_BITMASK_HSUPA = 256L; // 0x100L
+    field public static final long NETWORK_TYPE_BITMASK_IWLAN = 131072L; // 0x20000L
+    field public static final long NETWORK_TYPE_BITMASK_LTE = 4096L; // 0x1000L
+    field public static final long NETWORK_TYPE_BITMASK_LTE_CA = 262144L; // 0x40000L
+    field public static final long NETWORK_TYPE_BITMASK_NR = 524288L; // 0x80000L
+    field public static final long NETWORK_TYPE_BITMASK_TD_SCDMA = 65536L; // 0x10000L
+    field public static final long NETWORK_TYPE_BITMASK_UMTS = 4L; // 0x4L
+    field public static final long NETWORK_TYPE_BITMASK_UNKNOWN = 0L; // 0x0L
     field public static final int NETWORK_TYPE_CDMA = 4; // 0x4
     field public static final int NETWORK_TYPE_EDGE = 2; // 0x2
     field public static final int NETWORK_TYPE_EHRPD = 14; // 0xe
@@ -42928,14 +43716,28 @@
     method public int describeContents();
     method public int getCardId();
     method @Nullable public String getEid();
-    method @Nullable public String getIccId();
-    method public int getSlotIndex();
+    method @Deprecated @Nullable public String getIccId();
+    method public int getPhysicalSlotIndex();
+    method @NonNull public java.util.Collection<android.telephony.UiccPortInfo> getPorts();
+    method @Deprecated public int getSlotIndex();
     method public boolean isEuicc();
+    method public boolean isMultipleEnabledProfilesSupported();
     method public boolean isRemovable();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.telephony.UiccCardInfo> CREATOR;
   }
 
+  public final class UiccPortInfo implements android.os.Parcelable {
+    method public int describeContents();
+    method @Nullable public String getIccId();
+    method @IntRange(from=0) public int getLogicalSlotIndex();
+    method @IntRange(from=0) public int getPortIndex();
+    method public boolean isActive();
+    method public void writeToParcel(@Nullable android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.telephony.UiccPortInfo> CREATOR;
+    field public static final String ICCID_REDACTED = "FFFFFFFFFFFFFFFFFFFF";
+  }
+
   public abstract class VisualVoicemailService extends android.app.Service {
     ctor public VisualVoicemailService();
     method public android.os.IBinder onBind(android.content.Intent);
@@ -43014,10 +43816,13 @@
     method public String getMmsProxyAddressAsString();
     method public int getMmsProxyPort();
     method public android.net.Uri getMmsc();
+    method public int getMtuV4();
+    method public int getMtuV6();
     method public int getMvnoType();
     method public int getNetworkTypeBitmask();
     method public String getOperatorNumeric();
     method public String getPassword();
+    method public int getProfileId();
     method public int getProtocol();
     method @Deprecated public java.net.InetAddress getProxyAddress();
     method public String getProxyAddressAsString();
@@ -43025,6 +43830,7 @@
     method public int getRoamingProtocol();
     method public String getUser();
     method public boolean isEnabled();
+    method public boolean isPersistent();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field public static final int AUTH_TYPE_CHAP = 2; // 0x2
     field public static final int AUTH_TYPE_NONE = 0; // 0x0
@@ -43046,6 +43852,7 @@
     field public static final int TYPE_DEFAULT = 17; // 0x11
     field public static final int TYPE_DUN = 8; // 0x8
     field public static final int TYPE_EMERGENCY = 512; // 0x200
+    field public static final int TYPE_ENTERPRISE = 16384; // 0x4000
     field public static final int TYPE_FOTA = 32; // 0x20
     field public static final int TYPE_HIPRI = 16; // 0x10
     field public static final int TYPE_IA = 256; // 0x100
@@ -43070,10 +43877,14 @@
     method @NonNull public android.telephony.data.ApnSetting.Builder setMmsProxyAddress(@Nullable String);
     method @NonNull public android.telephony.data.ApnSetting.Builder setMmsProxyPort(int);
     method @NonNull public android.telephony.data.ApnSetting.Builder setMmsc(@Nullable android.net.Uri);
+    method @NonNull public android.telephony.data.ApnSetting.Builder setMtuV4(int);
+    method @NonNull public android.telephony.data.ApnSetting.Builder setMtuV6(int);
     method @NonNull public android.telephony.data.ApnSetting.Builder setMvnoType(int);
     method @NonNull public android.telephony.data.ApnSetting.Builder setNetworkTypeBitmask(int);
     method @NonNull public android.telephony.data.ApnSetting.Builder setOperatorNumeric(@Nullable String);
     method @NonNull public android.telephony.data.ApnSetting.Builder setPassword(@Nullable String);
+    method @NonNull public android.telephony.data.ApnSetting.Builder setPersistent(boolean);
+    method @NonNull public android.telephony.data.ApnSetting.Builder setProfileId(int);
     method @NonNull public android.telephony.data.ApnSetting.Builder setProtocol(int);
     method @Deprecated public android.telephony.data.ApnSetting.Builder setProxyAddress(java.net.InetAddress);
     method @NonNull public android.telephony.data.ApnSetting.Builder setProxyAddress(@Nullable String);
@@ -43236,8 +44047,10 @@
     method @Nullable public String getEid();
     method @Nullable public android.telephony.euicc.EuiccInfo getEuiccInfo();
     method public boolean isEnabled();
+    method public boolean isSimPortAvailable(int);
     method public void startResolutionActivity(android.app.Activity, int, android.content.Intent, android.app.PendingIntent) throws android.content.IntentSender.SendIntentException;
     method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void switchToSubscription(int, android.app.PendingIntent);
+    method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void switchToSubscription(int, int, @NonNull android.app.PendingIntent);
     method @RequiresPermission("android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS") public void updateSubscriptionNickname(int, @Nullable String, @NonNull android.app.PendingIntent);
     field public static final String ACTION_MANAGE_EMBEDDED_SUBSCRIPTIONS = "android.telephony.euicc.action.MANAGE_EMBEDDED_SUBSCRIPTIONS";
     field public static final String ACTION_NOTIFY_CARRIER_SETUP_INCOMPLETE = "android.telephony.euicc.action.NOTIFY_CARRIER_SETUP_INCOMPLETE";
@@ -43256,6 +44069,7 @@
     field public static final int ERROR_INSTALL_PROFILE = 10009; // 0x2719
     field public static final int ERROR_INVALID_ACTIVATION_CODE = 10001; // 0x2711
     field public static final int ERROR_INVALID_CONFIRMATION_CODE = 10002; // 0x2712
+    field public static final int ERROR_INVALID_PORT = 10017; // 0x2721
     field public static final int ERROR_INVALID_RESPONSE = 10015; // 0x271f
     field public static final int ERROR_NO_PROFILES_AVAILABLE = 10013; // 0x271d
     field public static final int ERROR_OPERATION_BUSY = 10016; // 0x2720
@@ -43385,6 +44199,7 @@
   public class ImsManager {
     method @NonNull public android.telephony.ims.ImsMmTelManager getImsMmTelManager(int);
     method @NonNull public android.telephony.ims.ImsRcsManager getImsRcsManager(int);
+    method @NonNull public android.telephony.ims.ProvisioningManager getProvisioningManager(int);
     field public static final String ACTION_WFC_IMS_REGISTRATION_ERROR = "android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR";
     field public static final String EXTRA_WFC_REGISTRATION_FAILURE_MESSAGE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_MESSAGE";
     field public static final String EXTRA_WFC_REGISTRATION_FAILURE_TITLE = "android.telephony.ims.extra.WFC_REGISTRATION_FAILURE_TITLE";
@@ -43401,8 +44216,10 @@
     method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isVoWiFiSettingEnabled();
     method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public boolean isVtSettingEnabled();
     method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RegistrationManager.RegistrationCallback) throws android.telephony.ims.ImsException;
+    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE"}) public void registerImsStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsStateCallback) throws android.telephony.ims.ImsException;
     method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public void registerMmTelCapabilityCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsMmTelManager.CapabilityCallback) throws android.telephony.ims.ImsException;
     method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.RegistrationManager.RegistrationCallback);
+    method public void unregisterImsStateCallback(@NonNull android.telephony.ims.ImsStateCallback);
     method @RequiresPermission(anyOf={"android.permission.READ_PRIVILEGED_PHONE_STATE", android.Manifest.permission.READ_PRECISE_PHONE_STATE}) public void unregisterMmTelCapabilityCallback(@NonNull android.telephony.ims.ImsMmTelManager.CapabilityCallback);
     field public static final int WIFI_MODE_CELLULAR_PREFERRED = 1; // 0x1
     field public static final int WIFI_MODE_WIFI_ONLY = 0; // 0x0
@@ -43419,7 +44236,9 @@
     method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void getRegistrationTransportType(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Integer>);
     method @NonNull public android.telephony.ims.RcsUceAdapter getUceAdapter();
     method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void registerImsRegistrationCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.RegistrationManager.RegistrationCallback) throws android.telephony.ims.ImsException;
+    method @RequiresPermission(anyOf={android.Manifest.permission.READ_PRECISE_PHONE_STATE, "android.permission.READ_PRIVILEGED_PHONE_STATE", "android.permission.ACCESS_RCS_USER_CAPABILITY_EXCHANGE"}) public void registerImsStateCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ImsStateCallback) throws android.telephony.ims.ImsException;
     method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void unregisterImsRegistrationCallback(@NonNull android.telephony.ims.RegistrationManager.RegistrationCallback);
+    method public void unregisterImsStateCallback(@NonNull android.telephony.ims.ImsStateCallback);
     field public static final String ACTION_SHOW_CAPABILITY_DISCOVERY_OPT_IN = "android.telephony.ims.action.SHOW_CAPABILITY_DISCOVERY_OPT_IN";
   }
 
@@ -43618,6 +44437,36 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.telephony.ims.ImsRegistrationAttributes> CREATOR;
   }
 
+  public abstract class ImsStateCallback {
+    ctor public ImsStateCallback();
+    method public abstract void onAvailable();
+    method public abstract void onError();
+    method public abstract void onUnavailable(int);
+    field public static final int REASON_IMS_SERVICE_DISCONNECTED = 3; // 0x3
+    field public static final int REASON_IMS_SERVICE_NOT_READY = 6; // 0x6
+    field public static final int REASON_NO_IMS_SERVICE_CONFIGURED = 4; // 0x4
+    field public static final int REASON_SUBSCRIPTION_INACTIVE = 5; // 0x5
+    field public static final int REASON_UNKNOWN_PERMANENT_ERROR = 2; // 0x2
+    field public static final int REASON_UNKNOWN_TEMPORARY_ERROR = 1; // 0x1
+  }
+
+  public class ProvisioningManager {
+    method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) @WorkerThread public boolean getProvisioningStatusForCapability(int, int);
+    method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) @WorkerThread public boolean getRcsProvisioningStatusForCapability(int, int);
+    method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public boolean isProvisioningRequiredForCapability(int, int);
+    method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public boolean isRcsProvisioningRequiredForCapability(int, int);
+    method @RequiresPermission(android.Manifest.permission.READ_PRECISE_PHONE_STATE) public void registerFeatureProvisioningChangedCallback(@NonNull java.util.concurrent.Executor, @NonNull android.telephony.ims.ProvisioningManager.FeatureProvisioningCallback) throws android.telephony.ims.ImsException;
+    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setProvisioningStatusForCapability(int, int, boolean);
+    method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) @WorkerThread public void setRcsProvisioningStatusForCapability(int, int, boolean);
+    method public void unregisterFeatureProvisioningChangedCallback(@NonNull android.telephony.ims.ProvisioningManager.FeatureProvisioningCallback);
+  }
+
+  public static class ProvisioningManager.FeatureProvisioningCallback {
+    ctor public ProvisioningManager.FeatureProvisioningCallback();
+    method public void onFeatureProvisioningChanged(int, int, boolean);
+    method public void onRcsFeatureProvisioningChanged(int, int, boolean);
+  }
+
   public class RcsUceAdapter {
     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public boolean isUceSettingEnabled() throws android.telephony.ims.ImsException;
   }
@@ -43658,6 +44507,27 @@
     field public static final int CAPABILITY_TYPE_VOICE = 1; // 0x1
   }
 
+  public class RcsFeature {
+  }
+
+  public static class RcsFeature.RcsImsCapabilities {
+    field public static final int CAPABILITY_TYPE_NONE = 0; // 0x0
+    field public static final int CAPABILITY_TYPE_OPTIONS_UCE = 1; // 0x1
+    field public static final int CAPABILITY_TYPE_PRESENCE_UCE = 2; // 0x2
+  }
+
+}
+
+package android.telephony.ims.stub {
+
+  public class ImsRegistrationImplBase {
+    field public static final int REGISTRATION_TECH_CROSS_SIM = 2; // 0x2
+    field public static final int REGISTRATION_TECH_IWLAN = 1; // 0x1
+    field public static final int REGISTRATION_TECH_LTE = 0; // 0x0
+    field public static final int REGISTRATION_TECH_NONE = -1; // 0xffffffff
+    field public static final int REGISTRATION_TECH_NR = 3; // 0x3
+  }
+
 }
 
 package android.telephony.mbms {
@@ -43916,6 +44786,7 @@
   public class BoringLayout extends android.text.Layout implements android.text.TextUtils.EllipsizeCallback {
     ctor public BoringLayout(CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean);
     ctor public BoringLayout(CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int);
+    ctor public BoringLayout(@NonNull CharSequence, @NonNull android.text.TextPaint, @IntRange(from=0) int, @NonNull android.text.Layout.Alignment, float, float, @NonNull android.text.BoringLayout.Metrics, boolean, @NonNull android.text.TextUtils.TruncateAt, @IntRange(from=0) int, boolean);
     method public void ellipsized(int, int);
     method public int getBottomPadding();
     method public int getEllipsisCount(int);
@@ -43930,9 +44801,12 @@
     method public int getTopPadding();
     method public static android.text.BoringLayout.Metrics isBoring(CharSequence, android.text.TextPaint);
     method public static android.text.BoringLayout.Metrics isBoring(CharSequence, android.text.TextPaint, android.text.BoringLayout.Metrics);
+    method @Nullable public static android.text.BoringLayout.Metrics isBoring(@NonNull CharSequence, @NonNull android.text.TextPaint, @NonNull android.text.TextDirectionHeuristic, boolean, @Nullable android.text.BoringLayout.Metrics);
     method public static android.text.BoringLayout make(CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean);
     method public static android.text.BoringLayout make(CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int);
+    method @NonNull public static android.text.BoringLayout make(@NonNull CharSequence, @NonNull android.text.TextPaint, @IntRange(from=0) int, @NonNull android.text.Layout.Alignment, @NonNull android.text.BoringLayout.Metrics, boolean, @NonNull android.text.TextUtils.TruncateAt, @IntRange(from=0) int, boolean);
     method public android.text.BoringLayout replaceOrMake(CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean);
+    method @NonNull public android.text.BoringLayout replaceOrMake(@NonNull CharSequence, @NonNull android.text.TextPaint, @IntRange(from=0) int, @NonNull android.text.Layout.Alignment, @NonNull android.text.BoringLayout.Metrics, boolean, @NonNull android.text.TextUtils.TruncateAt, @IntRange(from=0) int, boolean);
     method public android.text.BoringLayout replaceOrMake(CharSequence, android.text.TextPaint, int, android.text.Layout.Alignment, float, float, android.text.BoringLayout.Metrics, boolean, android.text.TextUtils.TruncateAt, int);
   }
 
@@ -44072,6 +44946,7 @@
     field public static final int TYPE_TEXT_FLAG_CAP_CHARACTERS = 4096; // 0x1000
     field public static final int TYPE_TEXT_FLAG_CAP_SENTENCES = 16384; // 0x4000
     field public static final int TYPE_TEXT_FLAG_CAP_WORDS = 8192; // 0x2000
+    field public static final int TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS = 1048576; // 0x100000
     field public static final int TYPE_TEXT_FLAG_IME_MULTI_LINE = 262144; // 0x40000
     field public static final int TYPE_TEXT_FLAG_MULTI_LINE = 131072; // 0x20000
     field public static final int TYPE_TEXT_FLAG_NO_SUGGESTIONS = 524288; // 0x80000
@@ -44140,6 +45015,7 @@
     method public abstract int getTopPadding();
     method public final int getWidth();
     method public final void increaseWidthTo(int);
+    method public boolean isFallbackLineSpacingEnabled();
     method public boolean isRtlCharAt(int);
     method protected final boolean isSpanned();
     field public static final int BREAK_STRATEGY_BALANCED = 2; // 0x2
@@ -44150,8 +45026,10 @@
     field public static final int DIR_LEFT_TO_RIGHT = 1; // 0x1
     field public static final int DIR_RIGHT_TO_LEFT = -1; // 0xffffffff
     field public static final int HYPHENATION_FREQUENCY_FULL = 2; // 0x2
+    field public static final int HYPHENATION_FREQUENCY_FULL_FAST = 4; // 0x4
     field public static final int HYPHENATION_FREQUENCY_NONE = 0; // 0x0
     field public static final int HYPHENATION_FREQUENCY_NORMAL = 1; // 0x1
+    field public static final int HYPHENATION_FREQUENCY_NORMAL_FAST = 3; // 0x3
     field public static final int JUSTIFICATION_MODE_INTER_WORD = 1; // 0x1
     field public static final int JUSTIFICATION_MODE_NONE = 0; // 0x0
   }
@@ -44206,6 +45084,7 @@
     method public char charAt(int);
     method public static android.text.PrecomputedText create(@NonNull CharSequence, @NonNull android.text.PrecomputedText.Params);
     method public void getBounds(@IntRange(from=0) int, @IntRange(from=0) int, @NonNull android.graphics.Rect);
+    method public void getFontMetricsInt(@IntRange(from=0) int, @IntRange(from=0) int, @NonNull android.graphics.Paint.FontMetricsInt);
     method @IntRange(from=0) public int getParagraphCount();
     method @IntRange(from=0) public int getParagraphEnd(@IntRange(from=0) int);
     method @IntRange(from=0) public int getParagraphStart(@IntRange(from=0) int);
@@ -44225,6 +45104,7 @@
   public static final class PrecomputedText.Params {
     method public int getBreakStrategy();
     method public int getHyphenationFrequency();
+    method @NonNull public android.graphics.text.LineBreakConfig getLineBreakConfig();
     method @NonNull public android.text.TextDirectionHeuristic getTextDirection();
     method @NonNull public android.text.TextPaint getTextPaint();
   }
@@ -44235,6 +45115,7 @@
     method @NonNull public android.text.PrecomputedText.Params build();
     method public android.text.PrecomputedText.Params.Builder setBreakStrategy(int);
     method public android.text.PrecomputedText.Params.Builder setHyphenationFrequency(int);
+    method @NonNull public android.text.PrecomputedText.Params.Builder setLineBreakConfig(@NonNull android.graphics.text.LineBreakConfig);
     method public android.text.PrecomputedText.Params.Builder setTextDirection(@NonNull android.text.TextDirectionHeuristic);
   }
 
@@ -44395,6 +45276,7 @@
     method @NonNull public android.text.StaticLayout.Builder setIncludePad(boolean);
     method @NonNull public android.text.StaticLayout.Builder setIndents(@Nullable int[], @Nullable int[]);
     method @NonNull public android.text.StaticLayout.Builder setJustificationMode(int);
+    method @NonNull public android.text.StaticLayout.Builder setLineBreakConfig(@NonNull android.graphics.text.LineBreakConfig);
     method @NonNull public android.text.StaticLayout.Builder setLineSpacing(float, @FloatRange(from=0.0) float);
     method @NonNull public android.text.StaticLayout.Builder setMaxLines(@IntRange(from=0) int);
     method public android.text.StaticLayout.Builder setText(CharSequence);
@@ -45199,8 +46081,10 @@
 
   public class StyleSpan extends android.text.style.MetricAffectingSpan implements android.text.ParcelableSpan {
     ctor public StyleSpan(int);
+    ctor public StyleSpan(int, int);
     ctor public StyleSpan(@NonNull android.os.Parcel);
     method public int describeContents();
+    method public int getFontWeightAdjustment();
     method public int getSpanTypeId();
     method public int getStyle();
     method public void updateDrawState(android.text.TextPaint);
@@ -45218,6 +46102,17 @@
     method public void writeToParcel(android.os.Parcel, int);
   }
 
+  public final class SuggestionRangeSpan extends android.text.style.CharacterStyle implements android.text.ParcelableSpan {
+    ctor public SuggestionRangeSpan();
+    method public int describeContents();
+    method public int getBackgroundColor();
+    method public int getSpanTypeId();
+    method public void setBackgroundColor(int);
+    method public void updateDrawState(@NonNull android.text.TextPaint);
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.text.style.SuggestionRangeSpan> CREATOR;
+  }
+
   public class SuggestionSpan extends android.text.style.CharacterStyle implements android.text.ParcelableSpan {
     ctor public SuggestionSpan(android.content.Context, String[], int);
     ctor public SuggestionSpan(java.util.Locale, String[], int);
@@ -45569,7 +46464,7 @@
     method public static final boolean addLinks(@NonNull android.text.Spannable, @NonNull java.util.regex.Pattern, @Nullable String, @Nullable android.text.util.Linkify.MatchFilter, @Nullable android.text.util.Linkify.TransformFilter);
     method public static final boolean addLinks(@NonNull android.text.Spannable, @NonNull java.util.regex.Pattern, @Nullable String, @Nullable String[], @Nullable android.text.util.Linkify.MatchFilter, @Nullable android.text.util.Linkify.TransformFilter);
     method public static final boolean addLinks(@NonNull android.text.Spannable, @NonNull java.util.regex.Pattern, @Nullable String, @Nullable String[], @Nullable android.text.util.Linkify.MatchFilter, @Nullable android.text.util.Linkify.TransformFilter, @Nullable java.util.function.Function<java.lang.String,android.text.style.URLSpan>);
-    field public static final int ALL = 15; // 0xf
+    field @Deprecated public static final int ALL = 15; // 0xf
     field public static final int EMAIL_ADDRESSES = 2; // 0x2
     field @Deprecated public static final int MAP_ADDRESSES = 8; // 0x8
     field public static final int PHONE_NUMBERS = 4; // 0x4
@@ -45955,6 +46850,7 @@
     method public boolean contains(Object);
     method public boolean containsAll(java.util.Collection<?>);
     method public void ensureCapacity(int);
+    method public void forEach(java.util.function.Consumer<? super E>);
     method public int indexOf(Object);
     method public boolean isEmpty();
     method public java.util.Iterator<E> iterator();
@@ -46094,6 +46990,16 @@
     field public float ydpi;
   }
 
+  public interface Dumpable {
+    method public void dump(@NonNull java.io.PrintWriter, @Nullable String[]);
+    method @NonNull public default String getDumpableName();
+  }
+
+  public interface DumpableContainer {
+    method public boolean addDumpable(@NonNull android.util.Dumpable);
+    method public boolean removeDumpable(@NonNull android.util.Dumpable);
+  }
+
   public class EventLog {
     method public static int getTagCode(String);
     method public static String getTagName(int);
@@ -46817,16 +47723,16 @@
   }
 
   public abstract class ActionProvider {
-    ctor public ActionProvider(android.content.Context);
+    ctor public ActionProvider(@NonNull android.content.Context);
     method public boolean hasSubMenu();
     method public boolean isVisible();
-    method @Deprecated public abstract android.view.View onCreateActionView();
-    method public android.view.View onCreateActionView(android.view.MenuItem);
+    method @Deprecated @NonNull public abstract android.view.View onCreateActionView();
+    method @NonNull public android.view.View onCreateActionView(@NonNull android.view.MenuItem);
     method public boolean onPerformDefaultAction();
-    method public void onPrepareSubMenu(android.view.SubMenu);
+    method public void onPrepareSubMenu(@NonNull android.view.SubMenu);
     method public boolean overridesItemVisibility();
     method public void refreshVisibility();
-    method public void setVisibilityListener(android.view.ActionProvider.VisibilityListener);
+    method public void setVisibilityListener(@Nullable android.view.ActionProvider.VisibilityListener);
   }
 
   public static interface ActionProvider.VisibilityListener {
@@ -46834,21 +47740,47 @@
   }
 
   @UiThread public interface AttachedSurfaceControl {
+    method public default void addOnBufferTransformHintChangedListener(@NonNull android.view.AttachedSurfaceControl.OnBufferTransformHintChangedListener);
     method public boolean applyTransactionOnDraw(@NonNull android.view.SurfaceControl.Transaction);
     method @Nullable public android.view.SurfaceControl.Transaction buildReparentTransaction(@NonNull android.view.SurfaceControl);
+    method public default int getBufferTransformHint();
+    method public default void removeOnBufferTransformHintChangedListener(@NonNull android.view.AttachedSurfaceControl.OnBufferTransformHintChangedListener);
+    method public default void setTouchableRegion(@Nullable android.graphics.Region);
+  }
+
+  @UiThread public static interface AttachedSurfaceControl.OnBufferTransformHintChangedListener {
+    method public void onBufferTransformHintChanged(int);
   }
 
   public final class Choreographer {
     method public static android.view.Choreographer getInstance();
     method public void postFrameCallback(android.view.Choreographer.FrameCallback);
     method public void postFrameCallbackDelayed(android.view.Choreographer.FrameCallback, long);
+    method public void postVsyncCallback(@NonNull android.view.Choreographer.VsyncCallback);
     method public void removeFrameCallback(android.view.Choreographer.FrameCallback);
+    method public void removeVsyncCallback(@Nullable android.view.Choreographer.VsyncCallback);
   }
 
   public static interface Choreographer.FrameCallback {
     method public void doFrame(long);
   }
 
+  public static class Choreographer.FrameData {
+    method public long getFrameTimeNanos();
+    method @NonNull public android.view.Choreographer.FrameTimeline[] getFrameTimelines();
+    method @NonNull public android.view.Choreographer.FrameTimeline getPreferredFrameTimeline();
+  }
+
+  public static class Choreographer.FrameTimeline {
+    method public long getDeadlineNanos();
+    method public long getExpectedPresentationTimeNanos();
+    method public long getVsyncId();
+  }
+
+  public static interface Choreographer.VsyncCallback {
+    method public void onVsync(@NonNull android.view.Choreographer.FrameData);
+  }
+
   public interface CollapsibleActionView {
     method public void onActionViewCollapsed();
     method public void onActionViewExpanded();
@@ -46994,6 +47926,18 @@
     method @NonNull public android.graphics.Insets getWaterfallInsets();
   }
 
+  public static final class DisplayCutout.Builder {
+    ctor public DisplayCutout.Builder();
+    method @NonNull public android.view.DisplayCutout build();
+    method @NonNull public android.view.DisplayCutout.Builder setBoundingRectBottom(@NonNull android.graphics.Rect);
+    method @NonNull public android.view.DisplayCutout.Builder setBoundingRectLeft(@NonNull android.graphics.Rect);
+    method @NonNull public android.view.DisplayCutout.Builder setBoundingRectRight(@NonNull android.graphics.Rect);
+    method @NonNull public android.view.DisplayCutout.Builder setBoundingRectTop(@NonNull android.graphics.Rect);
+    method @NonNull public android.view.DisplayCutout.Builder setCutoutPath(@NonNull android.graphics.Path);
+    method @NonNull public android.view.DisplayCutout.Builder setSafeInsets(@NonNull android.graphics.Insets);
+    method @NonNull public android.view.DisplayCutout.Builder setWaterfallInsets(@NonNull android.graphics.Insets);
+  }
+
   public final class DragAndDropPermissions implements android.os.Parcelable {
     method public int describeContents();
     method public void release();
@@ -47058,60 +48002,60 @@
   }
 
   public class GestureDetector {
-    ctor @Deprecated public GestureDetector(android.view.GestureDetector.OnGestureListener, android.os.Handler);
-    ctor @Deprecated public GestureDetector(android.view.GestureDetector.OnGestureListener);
-    ctor public GestureDetector(@UiContext android.content.Context, android.view.GestureDetector.OnGestureListener);
-    ctor public GestureDetector(@UiContext android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler);
-    ctor public GestureDetector(@UiContext android.content.Context, android.view.GestureDetector.OnGestureListener, android.os.Handler, boolean);
+    ctor @Deprecated public GestureDetector(@NonNull android.view.GestureDetector.OnGestureListener, @Nullable android.os.Handler);
+    ctor @Deprecated public GestureDetector(@NonNull android.view.GestureDetector.OnGestureListener);
+    ctor public GestureDetector(@Nullable @UiContext android.content.Context, @NonNull android.view.GestureDetector.OnGestureListener);
+    ctor public GestureDetector(@Nullable @UiContext android.content.Context, @NonNull android.view.GestureDetector.OnGestureListener, @Nullable android.os.Handler);
+    ctor public GestureDetector(@Nullable @UiContext android.content.Context, @NonNull android.view.GestureDetector.OnGestureListener, @Nullable android.os.Handler, boolean);
     method public boolean isLongpressEnabled();
-    method public boolean onGenericMotionEvent(android.view.MotionEvent);
-    method public boolean onTouchEvent(android.view.MotionEvent);
-    method public void setContextClickListener(android.view.GestureDetector.OnContextClickListener);
+    method public boolean onGenericMotionEvent(@NonNull android.view.MotionEvent);
+    method public boolean onTouchEvent(@NonNull android.view.MotionEvent);
+    method public void setContextClickListener(@Nullable android.view.GestureDetector.OnContextClickListener);
     method public void setIsLongpressEnabled(boolean);
-    method public void setOnDoubleTapListener(android.view.GestureDetector.OnDoubleTapListener);
+    method public void setOnDoubleTapListener(@Nullable android.view.GestureDetector.OnDoubleTapListener);
   }
 
   public static interface GestureDetector.OnContextClickListener {
-    method public boolean onContextClick(android.view.MotionEvent);
+    method public boolean onContextClick(@NonNull android.view.MotionEvent);
   }
 
   public static interface GestureDetector.OnDoubleTapListener {
-    method public boolean onDoubleTap(android.view.MotionEvent);
-    method public boolean onDoubleTapEvent(android.view.MotionEvent);
-    method public boolean onSingleTapConfirmed(android.view.MotionEvent);
+    method public boolean onDoubleTap(@NonNull android.view.MotionEvent);
+    method public boolean onDoubleTapEvent(@NonNull android.view.MotionEvent);
+    method public boolean onSingleTapConfirmed(@NonNull android.view.MotionEvent);
   }
 
   public static interface GestureDetector.OnGestureListener {
-    method public boolean onDown(android.view.MotionEvent);
-    method public boolean onFling(android.view.MotionEvent, android.view.MotionEvent, float, float);
-    method public void onLongPress(android.view.MotionEvent);
-    method public boolean onScroll(android.view.MotionEvent, android.view.MotionEvent, float, float);
-    method public void onShowPress(android.view.MotionEvent);
-    method public boolean onSingleTapUp(android.view.MotionEvent);
+    method public boolean onDown(@NonNull android.view.MotionEvent);
+    method public boolean onFling(@NonNull android.view.MotionEvent, @NonNull android.view.MotionEvent, float, float);
+    method public void onLongPress(@NonNull android.view.MotionEvent);
+    method public boolean onScroll(@NonNull android.view.MotionEvent, @NonNull android.view.MotionEvent, float, float);
+    method public void onShowPress(@NonNull android.view.MotionEvent);
+    method public boolean onSingleTapUp(@NonNull android.view.MotionEvent);
   }
 
   public static class GestureDetector.SimpleOnGestureListener implements android.view.GestureDetector.OnContextClickListener android.view.GestureDetector.OnDoubleTapListener android.view.GestureDetector.OnGestureListener {
     ctor public GestureDetector.SimpleOnGestureListener();
-    method public boolean onContextClick(android.view.MotionEvent);
-    method public boolean onDoubleTap(android.view.MotionEvent);
-    method public boolean onDoubleTapEvent(android.view.MotionEvent);
-    method public boolean onDown(android.view.MotionEvent);
-    method public boolean onFling(android.view.MotionEvent, android.view.MotionEvent, float, float);
-    method public void onLongPress(android.view.MotionEvent);
-    method public boolean onScroll(android.view.MotionEvent, android.view.MotionEvent, float, float);
-    method public void onShowPress(android.view.MotionEvent);
-    method public boolean onSingleTapConfirmed(android.view.MotionEvent);
-    method public boolean onSingleTapUp(android.view.MotionEvent);
+    method public boolean onContextClick(@NonNull android.view.MotionEvent);
+    method public boolean onDoubleTap(@NonNull android.view.MotionEvent);
+    method public boolean onDoubleTapEvent(@NonNull android.view.MotionEvent);
+    method public boolean onDown(@NonNull android.view.MotionEvent);
+    method public boolean onFling(@NonNull android.view.MotionEvent, @NonNull android.view.MotionEvent, float, float);
+    method public void onLongPress(@NonNull android.view.MotionEvent);
+    method public boolean onScroll(@NonNull android.view.MotionEvent, @NonNull android.view.MotionEvent, float, float);
+    method public void onShowPress(@NonNull android.view.MotionEvent);
+    method public boolean onSingleTapConfirmed(@NonNull android.view.MotionEvent);
+    method public boolean onSingleTapUp(@NonNull android.view.MotionEvent);
   }
 
   public class Gravity {
     ctor public Gravity();
     method public static void apply(int, int, int, android.graphics.Rect, android.graphics.Rect);
-    method public static void apply(int, int, int, android.graphics.Rect, android.graphics.Rect, int);
-    method public static void apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect);
-    method public static void apply(int, int, int, android.graphics.Rect, int, int, android.graphics.Rect, int);
-    method public static void applyDisplay(int, android.graphics.Rect, android.graphics.Rect);
-    method public static void applyDisplay(int, android.graphics.Rect, android.graphics.Rect, int);
+    method public static void apply(int, int, int, @NonNull android.graphics.Rect, @NonNull android.graphics.Rect, int);
+    method public static void apply(int, int, int, @NonNull android.graphics.Rect, int, int, @NonNull android.graphics.Rect);
+    method public static void apply(int, int, int, @NonNull android.graphics.Rect, int, int, @NonNull android.graphics.Rect, int);
+    method public static void applyDisplay(int, @NonNull android.graphics.Rect, @NonNull android.graphics.Rect);
+    method public static void applyDisplay(int, @NonNull android.graphics.Rect, @NonNull android.graphics.Rect, int);
     method public static int getAbsoluteGravity(int, int);
     method public static boolean isHorizontal(int);
     method public static boolean isVertical(int);
@@ -47148,7 +48092,7 @@
     field public static final int CLOCK_TICK = 4; // 0x4
     field public static final int CONFIRM = 16; // 0x10
     field public static final int CONTEXT_CLICK = 6; // 0x6
-    field public static final int FLAG_IGNORE_GLOBAL_SETTING = 2; // 0x2
+    field @Deprecated public static final int FLAG_IGNORE_GLOBAL_SETTING = 2; // 0x2
     field public static final int FLAG_IGNORE_VIEW_SETTING = 1; // 0x1
     field public static final int GESTURE_END = 13; // 0xd
     field public static final int GESTURE_START = 12; // 0xc
@@ -47178,6 +48122,7 @@
     method public static int[] getDeviceIds();
     method public int getId();
     method public android.view.KeyCharacterMap getKeyCharacterMap();
+    method public int getKeyCodeForKeyLocation(int);
     method public int getKeyboardType();
     method @NonNull public android.hardware.lights.LightsManager getLightsManager();
     method public android.view.InputDevice.MotionRange getMotionRange(int);
@@ -47471,6 +48416,10 @@
     field public static final int KEYCODE_CUT = 277; // 0x115
     field public static final int KEYCODE_D = 32; // 0x20
     field public static final int KEYCODE_DEL = 67; // 0x43
+    field public static final int KEYCODE_DEMO_APP_1 = 301; // 0x12d
+    field public static final int KEYCODE_DEMO_APP_2 = 302; // 0x12e
+    field public static final int KEYCODE_DEMO_APP_3 = 303; // 0x12f
+    field public static final int KEYCODE_DEMO_APP_4 = 304; // 0x130
     field public static final int KEYCODE_DPAD_CENTER = 23; // 0x17
     field public static final int KEYCODE_DPAD_DOWN = 20; // 0x14
     field public static final int KEYCODE_DPAD_DOWN_LEFT = 269; // 0x10d
@@ -47502,6 +48451,10 @@
     field public static final int KEYCODE_F7 = 137; // 0x89
     field public static final int KEYCODE_F8 = 138; // 0x8a
     field public static final int KEYCODE_F9 = 139; // 0x8b
+    field public static final int KEYCODE_FEATURED_APP_1 = 297; // 0x129
+    field public static final int KEYCODE_FEATURED_APP_2 = 298; // 0x12a
+    field public static final int KEYCODE_FEATURED_APP_3 = 299; // 0x12b
+    field public static final int KEYCODE_FEATURED_APP_4 = 300; // 0x12c
     field public static final int KEYCODE_FOCUS = 80; // 0x50
     field public static final int KEYCODE_FORWARD = 125; // 0x7d
     field public static final int KEYCODE_FORWARD_DEL = 112; // 0x70
@@ -47667,6 +48620,14 @@
     field public static final int KEYCODE_U = 49; // 0x31
     field public static final int KEYCODE_UNKNOWN = 0; // 0x0
     field public static final int KEYCODE_V = 50; // 0x32
+    field public static final int KEYCODE_VIDEO_APP_1 = 289; // 0x121
+    field public static final int KEYCODE_VIDEO_APP_2 = 290; // 0x122
+    field public static final int KEYCODE_VIDEO_APP_3 = 291; // 0x123
+    field public static final int KEYCODE_VIDEO_APP_4 = 292; // 0x124
+    field public static final int KEYCODE_VIDEO_APP_5 = 293; // 0x125
+    field public static final int KEYCODE_VIDEO_APP_6 = 294; // 0x126
+    field public static final int KEYCODE_VIDEO_APP_7 = 295; // 0x127
+    field public static final int KEYCODE_VIDEO_APP_8 = 296; // 0x128
     field public static final int KEYCODE_VOICE_ASSIST = 231; // 0xe7
     field public static final int KEYCODE_VOLUME_DOWN = 25; // 0x19
     field public static final int KEYCODE_VOLUME_MUTE = 164; // 0xa4
@@ -47826,60 +48787,60 @@
   public interface MenuItem {
     method public boolean collapseActionView();
     method public boolean expandActionView();
-    method public android.view.ActionProvider getActionProvider();
-    method public android.view.View getActionView();
+    method @Nullable public android.view.ActionProvider getActionProvider();
+    method @Nullable public android.view.View getActionView();
     method public default int getAlphabeticModifiers();
     method public char getAlphabeticShortcut();
-    method public default CharSequence getContentDescription();
+    method @Nullable public default CharSequence getContentDescription();
     method public int getGroupId();
-    method public android.graphics.drawable.Drawable getIcon();
+    method @Nullable public android.graphics.drawable.Drawable getIcon();
     method @Nullable public default android.graphics.BlendMode getIconTintBlendMode();
     method @Nullable public default android.content.res.ColorStateList getIconTintList();
     method @Nullable public default android.graphics.PorterDuff.Mode getIconTintMode();
-    method public android.content.Intent getIntent();
+    method @Nullable public android.content.Intent getIntent();
     method public int getItemId();
-    method public android.view.ContextMenu.ContextMenuInfo getMenuInfo();
+    method @Nullable public android.view.ContextMenu.ContextMenuInfo getMenuInfo();
     method public default int getNumericModifiers();
     method public char getNumericShortcut();
     method public int getOrder();
-    method public android.view.SubMenu getSubMenu();
-    method public CharSequence getTitle();
-    method public CharSequence getTitleCondensed();
-    method public default CharSequence getTooltipText();
+    method @Nullable public android.view.SubMenu getSubMenu();
+    method @Nullable public CharSequence getTitle();
+    method @Nullable public CharSequence getTitleCondensed();
+    method @Nullable public default CharSequence getTooltipText();
     method public boolean hasSubMenu();
     method public boolean isActionViewExpanded();
     method public boolean isCheckable();
     method public boolean isChecked();
     method public boolean isEnabled();
     method public boolean isVisible();
-    method public android.view.MenuItem setActionProvider(android.view.ActionProvider);
-    method public android.view.MenuItem setActionView(android.view.View);
-    method public android.view.MenuItem setActionView(@LayoutRes int);
-    method public android.view.MenuItem setAlphabeticShortcut(char);
-    method public default android.view.MenuItem setAlphabeticShortcut(char, int);
-    method public android.view.MenuItem setCheckable(boolean);
-    method public android.view.MenuItem setChecked(boolean);
-    method public default android.view.MenuItem setContentDescription(CharSequence);
-    method public android.view.MenuItem setEnabled(boolean);
-    method public android.view.MenuItem setIcon(android.graphics.drawable.Drawable);
-    method public android.view.MenuItem setIcon(@DrawableRes int);
+    method @NonNull public android.view.MenuItem setActionProvider(@Nullable android.view.ActionProvider);
+    method @NonNull public android.view.MenuItem setActionView(@Nullable android.view.View);
+    method @NonNull public android.view.MenuItem setActionView(@LayoutRes int);
+    method @NonNull public android.view.MenuItem setAlphabeticShortcut(char);
+    method @NonNull public default android.view.MenuItem setAlphabeticShortcut(char, int);
+    method @NonNull public android.view.MenuItem setCheckable(boolean);
+    method @NonNull public android.view.MenuItem setChecked(boolean);
+    method @NonNull public default android.view.MenuItem setContentDescription(@Nullable CharSequence);
+    method @NonNull public android.view.MenuItem setEnabled(boolean);
+    method @NonNull public android.view.MenuItem setIcon(@Nullable android.graphics.drawable.Drawable);
+    method @NonNull public android.view.MenuItem setIcon(@DrawableRes int);
     method @NonNull public default android.view.MenuItem setIconTintBlendMode(@Nullable android.graphics.BlendMode);
-    method public default android.view.MenuItem setIconTintList(@Nullable android.content.res.ColorStateList);
+    method @NonNull public default android.view.MenuItem setIconTintList(@Nullable android.content.res.ColorStateList);
     method @NonNull public default android.view.MenuItem setIconTintMode(@Nullable android.graphics.PorterDuff.Mode);
-    method public android.view.MenuItem setIntent(android.content.Intent);
-    method public android.view.MenuItem setNumericShortcut(char);
-    method public default android.view.MenuItem setNumericShortcut(char, int);
-    method public android.view.MenuItem setOnActionExpandListener(android.view.MenuItem.OnActionExpandListener);
-    method public android.view.MenuItem setOnMenuItemClickListener(android.view.MenuItem.OnMenuItemClickListener);
-    method public android.view.MenuItem setShortcut(char, char);
-    method public default android.view.MenuItem setShortcut(char, char, int, int);
+    method @NonNull public android.view.MenuItem setIntent(@Nullable android.content.Intent);
+    method @NonNull public android.view.MenuItem setNumericShortcut(char);
+    method @NonNull public default android.view.MenuItem setNumericShortcut(char, int);
+    method @NonNull public android.view.MenuItem setOnActionExpandListener(@Nullable android.view.MenuItem.OnActionExpandListener);
+    method @NonNull public android.view.MenuItem setOnMenuItemClickListener(@Nullable android.view.MenuItem.OnMenuItemClickListener);
+    method @NonNull public android.view.MenuItem setShortcut(char, char);
+    method @NonNull public default android.view.MenuItem setShortcut(char, char, int, int);
     method public void setShowAsAction(int);
-    method public android.view.MenuItem setShowAsActionFlags(int);
-    method public android.view.MenuItem setTitle(CharSequence);
-    method public android.view.MenuItem setTitle(@StringRes int);
-    method public android.view.MenuItem setTitleCondensed(CharSequence);
-    method public default android.view.MenuItem setTooltipText(CharSequence);
-    method public android.view.MenuItem setVisible(boolean);
+    method @NonNull public android.view.MenuItem setShowAsActionFlags(int);
+    method @NonNull public android.view.MenuItem setTitle(@Nullable CharSequence);
+    method @NonNull public android.view.MenuItem setTitle(@StringRes int);
+    method @NonNull public android.view.MenuItem setTitleCondensed(@Nullable CharSequence);
+    method @NonNull public default android.view.MenuItem setTooltipText(@Nullable CharSequence);
+    method @NonNull public android.view.MenuItem setVisible(boolean);
     field public static final int SHOW_AS_ACTION_ALWAYS = 2; // 0x2
     field public static final int SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW = 8; // 0x8
     field public static final int SHOW_AS_ACTION_IF_ROOM = 1; // 0x1
@@ -47888,12 +48849,12 @@
   }
 
   public static interface MenuItem.OnActionExpandListener {
-    method public boolean onMenuItemActionCollapse(android.view.MenuItem);
-    method public boolean onMenuItemActionExpand(android.view.MenuItem);
+    method public boolean onMenuItemActionCollapse(@NonNull android.view.MenuItem);
+    method public boolean onMenuItemActionExpand(@NonNull android.view.MenuItem);
   }
 
   public static interface MenuItem.OnMenuItemClickListener {
-    method public boolean onMenuItemClick(android.view.MenuItem);
+    method public boolean onMenuItemClick(@NonNull android.view.MenuItem);
   }
 
   public final class MotionEvent extends android.view.InputEvent implements android.os.Parcelable {
@@ -48070,6 +49031,7 @@
     field public static final int EDGE_LEFT = 4; // 0x4
     field public static final int EDGE_RIGHT = 8; // 0x8
     field public static final int EDGE_TOP = 1; // 0x1
+    field public static final int FLAG_CANCELED = 32; // 0x20
     field public static final int FLAG_WINDOW_IS_OBSCURED = 1; // 0x1
     field public static final int FLAG_WINDOW_IS_PARTIALLY_OBSCURED = 2; // 0x2
     field public static final int INVALID_POINTER_ID = -1; // 0xffffffff
@@ -48152,10 +49114,10 @@
   }
 
   public final class PointerIcon implements android.os.Parcelable {
-    method public static android.view.PointerIcon create(@NonNull android.graphics.Bitmap, float, float);
+    method @NonNull public static android.view.PointerIcon create(@NonNull android.graphics.Bitmap, float, float);
     method public int describeContents();
-    method public static android.view.PointerIcon getSystemIcon(@NonNull android.content.Context, int);
-    method public static android.view.PointerIcon load(@NonNull android.content.res.Resources, @XmlRes int);
+    method @NonNull public static android.view.PointerIcon getSystemIcon(@NonNull android.content.Context, int);
+    method @NonNull public static android.view.PointerIcon load(@NonNull android.content.res.Resources, @XmlRes int);
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.view.PointerIcon> CREATOR;
     field public static final int TYPE_ALIAS = 1010; // 0x3f2
@@ -48198,8 +49160,8 @@
   }
 
   public class ScaleGestureDetector {
-    ctor public ScaleGestureDetector(android.content.Context, android.view.ScaleGestureDetector.OnScaleGestureListener);
-    ctor public ScaleGestureDetector(android.content.Context, android.view.ScaleGestureDetector.OnScaleGestureListener, android.os.Handler);
+    ctor public ScaleGestureDetector(@NonNull android.content.Context, @NonNull android.view.ScaleGestureDetector.OnScaleGestureListener);
+    ctor public ScaleGestureDetector(@NonNull android.content.Context, @NonNull android.view.ScaleGestureDetector.OnScaleGestureListener, @Nullable android.os.Handler);
     method public float getCurrentSpan();
     method public float getCurrentSpanX();
     method public float getCurrentSpanY();
@@ -48214,22 +49176,22 @@
     method public boolean isInProgress();
     method public boolean isQuickScaleEnabled();
     method public boolean isStylusScaleEnabled();
-    method public boolean onTouchEvent(android.view.MotionEvent);
+    method public boolean onTouchEvent(@NonNull android.view.MotionEvent);
     method public void setQuickScaleEnabled(boolean);
     method public void setStylusScaleEnabled(boolean);
   }
 
   public static interface ScaleGestureDetector.OnScaleGestureListener {
-    method public boolean onScale(android.view.ScaleGestureDetector);
-    method public boolean onScaleBegin(android.view.ScaleGestureDetector);
-    method public void onScaleEnd(android.view.ScaleGestureDetector);
+    method public boolean onScale(@NonNull android.view.ScaleGestureDetector);
+    method public boolean onScaleBegin(@NonNull android.view.ScaleGestureDetector);
+    method public void onScaleEnd(@NonNull android.view.ScaleGestureDetector);
   }
 
   public static class ScaleGestureDetector.SimpleOnScaleGestureListener implements android.view.ScaleGestureDetector.OnScaleGestureListener {
     ctor public ScaleGestureDetector.SimpleOnScaleGestureListener();
-    method public boolean onScale(android.view.ScaleGestureDetector);
-    method public boolean onScaleBegin(android.view.ScaleGestureDetector);
-    method public void onScaleEnd(android.view.ScaleGestureDetector);
+    method public boolean onScale(@NonNull android.view.ScaleGestureDetector);
+    method public boolean onScaleBegin(@NonNull android.view.ScaleGestureDetector);
+    method public void onScaleEnd(@NonNull android.view.ScaleGestureDetector);
   }
 
   @UiThread public interface ScrollCaptureCallback {
@@ -48325,6 +49287,12 @@
     method public void readFromParcel(android.os.Parcel);
     method public void release();
     method public void writeToParcel(android.os.Parcel, int);
+    field public static final int BUFFER_TRANSFORM_IDENTITY = 0; // 0x0
+    field public static final int BUFFER_TRANSFORM_MIRROR_HORIZONTAL = 1; // 0x1
+    field public static final int BUFFER_TRANSFORM_MIRROR_VERTICAL = 2; // 0x2
+    field public static final int BUFFER_TRANSFORM_ROTATE_180 = 3; // 0x3
+    field public static final int BUFFER_TRANSFORM_ROTATE_270 = 7; // 0x7
+    field public static final int BUFFER_TRANSFORM_ROTATE_90 = 4; // 0x4
     field @NonNull public static final android.os.Parcelable.Creator<android.view.SurfaceControl> CREATOR;
   }
 
@@ -48333,6 +49301,7 @@
     method @NonNull public android.view.SurfaceControl build();
     method @NonNull public android.view.SurfaceControl.Builder setBufferSize(@IntRange(from=0) int, @IntRange(from=0) int);
     method @NonNull public android.view.SurfaceControl.Builder setFormat(int);
+    method @NonNull public android.view.SurfaceControl.Builder setHidden(boolean);
     method @NonNull public android.view.SurfaceControl.Builder setName(@NonNull String);
     method @NonNull public android.view.SurfaceControl.Builder setOpaque(boolean);
     method @NonNull public android.view.SurfaceControl.Builder setParent(@Nullable android.view.SurfaceControl);
@@ -48340,22 +49309,36 @@
 
   public static class SurfaceControl.Transaction implements java.io.Closeable android.os.Parcelable {
     ctor public SurfaceControl.Transaction();
+    method @NonNull public android.view.SurfaceControl.Transaction addTransactionCommittedListener(@NonNull java.util.concurrent.Executor, @NonNull android.view.SurfaceControl.TransactionCommittedListener);
     method public void apply();
     method public void close();
     method public int describeContents();
     method @NonNull public android.view.SurfaceControl.Transaction merge(@NonNull android.view.SurfaceControl.Transaction);
     method @NonNull public android.view.SurfaceControl.Transaction reparent(@NonNull android.view.SurfaceControl, @Nullable android.view.SurfaceControl);
     method @NonNull public android.view.SurfaceControl.Transaction setAlpha(@NonNull android.view.SurfaceControl, @FloatRange(from=0.0, to=1.0) float);
+    method @NonNull public android.view.SurfaceControl.Transaction setBuffer(@NonNull android.view.SurfaceControl, @Nullable android.hardware.HardwareBuffer);
+    method @NonNull public android.view.SurfaceControl.Transaction setBuffer(@NonNull android.view.SurfaceControl, @Nullable android.hardware.HardwareBuffer, @Nullable android.hardware.SyncFence);
     method @NonNull public android.view.SurfaceControl.Transaction setBufferSize(@NonNull android.view.SurfaceControl, @IntRange(from=0) int, @IntRange(from=0) int);
+    method @NonNull public android.view.SurfaceControl.Transaction setBufferTransform(@NonNull android.view.SurfaceControl, int);
+    method @NonNull public android.view.SurfaceControl.Transaction setCrop(@NonNull android.view.SurfaceControl, @Nullable android.graphics.Rect);
+    method @NonNull public android.view.SurfaceControl.Transaction setDamageRegion(@NonNull android.view.SurfaceControl, @Nullable android.graphics.Region);
+    method @NonNull public android.view.SurfaceControl.Transaction setDataSpace(@NonNull android.view.SurfaceControl, int);
     method @NonNull public android.view.SurfaceControl.Transaction setFrameRate(@NonNull android.view.SurfaceControl, @FloatRange(from=0.0) float, int);
     method @NonNull public android.view.SurfaceControl.Transaction setFrameRate(@NonNull android.view.SurfaceControl, @FloatRange(from=0.0) float, int, int);
-    method @NonNull public android.view.SurfaceControl.Transaction setGeometry(@NonNull android.view.SurfaceControl, @Nullable android.graphics.Rect, @Nullable android.graphics.Rect, int);
+    method @Deprecated @NonNull public android.view.SurfaceControl.Transaction setGeometry(@NonNull android.view.SurfaceControl, @Nullable android.graphics.Rect, @Nullable android.graphics.Rect, int);
     method @NonNull public android.view.SurfaceControl.Transaction setLayer(@NonNull android.view.SurfaceControl, @IntRange(from=java.lang.Integer.MIN_VALUE, to=java.lang.Integer.MAX_VALUE) int);
+    method @NonNull public android.view.SurfaceControl.Transaction setOpaque(@NonNull android.view.SurfaceControl, boolean);
+    method @NonNull public android.view.SurfaceControl.Transaction setPosition(@NonNull android.view.SurfaceControl, float, float);
+    method @NonNull public android.view.SurfaceControl.Transaction setScale(@NonNull android.view.SurfaceControl, float, float);
     method @NonNull public android.view.SurfaceControl.Transaction setVisibility(@NonNull android.view.SurfaceControl, boolean);
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.view.SurfaceControl.Transaction> CREATOR;
   }
 
+  public static interface SurfaceControl.TransactionCommittedListener {
+    method public void onTransactionCommitted();
+  }
+
   public class SurfaceControlViewHost {
     ctor public SurfaceControlViewHost(@NonNull android.content.Context, @NonNull android.view.Display, @Nullable android.os.IBinder);
     method @Nullable public android.view.SurfaceControlViewHost.SurfacePackage getSurfacePackage();
@@ -48368,6 +49351,8 @@
   public static final class SurfaceControlViewHost.SurfacePackage implements android.os.Parcelable {
     ctor public SurfaceControlViewHost.SurfacePackage(@NonNull android.view.SurfaceControlViewHost.SurfacePackage);
     method public int describeContents();
+    method public void notifyConfigurationChanged(@NonNull android.content.res.Configuration);
+    method public void notifyDetachedFromWindow();
     method public void release();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.view.SurfaceControlViewHost.SurfacePackage> CREATOR;
@@ -48579,7 +49564,7 @@
     method public boolean dispatchKeyShortcutEvent(android.view.KeyEvent);
     method public boolean dispatchNestedFling(float, float, boolean);
     method public boolean dispatchNestedPreFling(float, float);
-    method public boolean dispatchNestedPrePerformAccessibilityAction(int, android.os.Bundle);
+    method public boolean dispatchNestedPrePerformAccessibilityAction(int, @Nullable android.os.Bundle);
     method public boolean dispatchNestedPreScroll(int, int, @Nullable @Size(2) int[], @Nullable @Size(2) int[]);
     method public boolean dispatchNestedScroll(int, int, int, int, @Nullable @Size(2) int[]);
     method public void dispatchPointerCaptureChanged(boolean);
@@ -48732,6 +49717,7 @@
     method public float getPivotX();
     method public float getPivotY();
     method public android.view.PointerIcon getPointerIcon();
+    method @NonNull public final java.util.List<android.graphics.Rect> getPreferKeepClearRects();
     method @Nullable public String[] getReceiveContentMimeTypes();
     method public android.content.res.Resources getResources();
     method public final boolean getRevealOnFocusHint();
@@ -48817,6 +49803,7 @@
     method public boolean isAccessibilityHeading();
     method public boolean isActivated();
     method public boolean isAttachedToWindow();
+    method public boolean isAutoHandwritingEnabled();
     method public boolean isClickable();
     method public boolean isContextClickable();
     method public boolean isDirty();
@@ -48849,6 +49836,7 @@
     method protected boolean isPaddingOffsetRequired();
     method public boolean isPaddingRelative();
     method public boolean isPivotSet();
+    method public final boolean isPreferKeepClear();
     method public boolean isPressed();
     method public boolean isSaveEnabled();
     method public boolean isSaveFromParentEnabled();
@@ -48937,7 +49925,7 @@
     method @Deprecated public void onWindowSystemUiVisibilityChanged(int);
     method protected void onWindowVisibilityChanged(int);
     method protected boolean overScrollBy(int, int, int, int, int, int, int, int, boolean);
-    method public boolean performAccessibilityAction(int, android.os.Bundle);
+    method public boolean performAccessibilityAction(int, @Nullable android.os.Bundle);
     method public boolean performClick();
     method public boolean performContextClick(float, float);
     method public boolean performContextClick();
@@ -48999,6 +49987,7 @@
     method public void setAlpha(@FloatRange(from=0.0, to=1.0) float);
     method public void setAnimation(android.view.animation.Animation);
     method public void setAnimationMatrix(@Nullable android.graphics.Matrix);
+    method public void setAutoHandwritingEnabled(boolean);
     method public void setAutofillHints(@Nullable java.lang.String...);
     method public void setAutofillId(@Nullable android.view.autofill.AutofillId);
     method public void setBackground(android.graphics.drawable.Drawable);
@@ -49091,6 +50080,8 @@
     method public void setPivotX(float);
     method public void setPivotY(float);
     method public void setPointerIcon(android.view.PointerIcon);
+    method public final void setPreferKeepClear(boolean);
+    method public final void setPreferKeepClearRects(@NonNull java.util.List<android.graphics.Rect>);
     method public void setPressed(boolean);
     method public void setRenderEffect(@Nullable android.graphics.RenderEffect);
     method public final void setRevealOnFocusHint(boolean);
@@ -49187,6 +50178,7 @@
     field public static final int AUTOFILL_TYPE_NONE = 0; // 0x0
     field public static final int AUTOFILL_TYPE_TEXT = 1; // 0x1
     field public static final int AUTOFILL_TYPE_TOGGLE = 2; // 0x2
+    field public static final int DRAG_FLAG_ACCESSIBILITY_ACTION = 1024; // 0x400
     field public static final int DRAG_FLAG_GLOBAL = 256; // 0x100
     field public static final int DRAG_FLAG_GLOBAL_PERSISTABLE_URI_PERMISSION = 64; // 0x40
     field public static final int DRAG_FLAG_GLOBAL_PREFIX_URI_PERMISSION = 128; // 0x80
@@ -49344,15 +50336,15 @@
   public static class View.AccessibilityDelegate {
     ctor public View.AccessibilityDelegate();
     method public void addExtraDataToAccessibilityNodeInfo(@NonNull android.view.View, @NonNull android.view.accessibility.AccessibilityNodeInfo, @NonNull String, @Nullable android.os.Bundle);
-    method public boolean dispatchPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
-    method public android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider(android.view.View);
-    method public void onInitializeAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
-    method public void onInitializeAccessibilityNodeInfo(android.view.View, android.view.accessibility.AccessibilityNodeInfo);
-    method public void onPopulateAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
-    method public boolean onRequestSendAccessibilityEvent(android.view.ViewGroup, android.view.View, android.view.accessibility.AccessibilityEvent);
-    method public boolean performAccessibilityAction(android.view.View, int, android.os.Bundle);
-    method public void sendAccessibilityEvent(android.view.View, int);
-    method public void sendAccessibilityEventUnchecked(android.view.View, android.view.accessibility.AccessibilityEvent);
+    method public boolean dispatchPopulateAccessibilityEvent(@NonNull android.view.View, @NonNull android.view.accessibility.AccessibilityEvent);
+    method @Nullable public android.view.accessibility.AccessibilityNodeProvider getAccessibilityNodeProvider(@NonNull android.view.View);
+    method public void onInitializeAccessibilityEvent(@NonNull android.view.View, @NonNull android.view.accessibility.AccessibilityEvent);
+    method public void onInitializeAccessibilityNodeInfo(@NonNull android.view.View, @NonNull android.view.accessibility.AccessibilityNodeInfo);
+    method public void onPopulateAccessibilityEvent(@NonNull android.view.View, @NonNull android.view.accessibility.AccessibilityEvent);
+    method public boolean onRequestSendAccessibilityEvent(@NonNull android.view.ViewGroup, @NonNull android.view.View, @NonNull android.view.accessibility.AccessibilityEvent);
+    method public boolean performAccessibilityAction(@NonNull android.view.View, int, @Nullable android.os.Bundle);
+    method public void sendAccessibilityEvent(@NonNull android.view.View, int);
+    method public void sendAccessibilityEventUnchecked(@NonNull android.view.View, @NonNull android.view.accessibility.AccessibilityEvent);
   }
 
   public static class View.BaseSavedState extends android.view.AbsSavedState {
@@ -49382,12 +50374,12 @@
   }
 
   public static interface View.OnApplyWindowInsetsListener {
-    method public android.view.WindowInsets onApplyWindowInsets(android.view.View, android.view.WindowInsets);
+    method @NonNull public android.view.WindowInsets onApplyWindowInsets(@NonNull android.view.View, @NonNull android.view.WindowInsets);
   }
 
   public static interface View.OnAttachStateChangeListener {
-    method public void onViewAttachedToWindow(android.view.View);
-    method public void onViewDetachedFromWindow(android.view.View);
+    method public void onViewAttachedToWindow(@NonNull android.view.View);
+    method public void onViewDetachedFromWindow(@NonNull android.view.View);
   }
 
   public static interface View.OnCapturedPointerListener {
@@ -49456,7 +50448,7 @@
 
   public class ViewConfiguration {
     ctor @Deprecated public ViewConfiguration();
-    method public static android.view.ViewConfiguration get(@UiContext android.content.Context);
+    method public static android.view.ViewConfiguration get(@NonNull @UiContext android.content.Context);
     method @Deprecated @FloatRange(from=1.0) public static float getAmbiguousGestureMultiplier();
     method public static long getDefaultActionModeHideDuration();
     method public static int getDoubleTapTimeout();
@@ -49775,8 +50767,8 @@
     method public boolean canResolveLayoutDirection();
     method public boolean canResolveTextAlignment();
     method public boolean canResolveTextDirection();
-    method public void childDrawableStateChanged(android.view.View);
-    method public void childHasTransientStateChanged(android.view.View, boolean);
+    method public void childDrawableStateChanged(@NonNull android.view.View);
+    method public void childHasTransientStateChanged(@NonNull android.view.View, boolean);
     method public void clearChildFocus(android.view.View);
     method public void createContextMenu(android.view.ContextMenu);
     method public android.view.View focusSearch(android.view.View, int);
@@ -49794,23 +50786,23 @@
     method public boolean isTextAlignmentResolved();
     method public boolean isTextDirectionResolved();
     method public android.view.View keyboardNavigationClusterSearch(android.view.View, int);
-    method public void notifySubtreeAccessibilityStateChanged(android.view.View, @NonNull android.view.View, int);
+    method public void notifySubtreeAccessibilityStateChanged(@NonNull android.view.View, @NonNull android.view.View, int);
     method public default void onDescendantInvalidated(@NonNull android.view.View, @NonNull android.view.View);
-    method public boolean onNestedFling(android.view.View, float, float, boolean);
-    method public boolean onNestedPreFling(android.view.View, float, float);
-    method public boolean onNestedPrePerformAccessibilityAction(android.view.View, int, android.os.Bundle);
-    method public void onNestedPreScroll(android.view.View, int, int, int[]);
-    method public void onNestedScroll(android.view.View, int, int, int, int);
-    method public void onNestedScrollAccepted(android.view.View, android.view.View, int);
-    method public boolean onStartNestedScroll(android.view.View, android.view.View, int);
-    method public void onStopNestedScroll(android.view.View);
+    method public boolean onNestedFling(@NonNull android.view.View, float, float, boolean);
+    method public boolean onNestedPreFling(@NonNull android.view.View, float, float);
+    method public boolean onNestedPrePerformAccessibilityAction(@NonNull android.view.View, int, @Nullable android.os.Bundle);
+    method public void onNestedPreScroll(@NonNull android.view.View, int, int, @NonNull int[]);
+    method public void onNestedScroll(@NonNull android.view.View, int, int, int, int);
+    method public void onNestedScrollAccepted(@NonNull android.view.View, @NonNull android.view.View, int);
+    method public boolean onStartNestedScroll(@NonNull android.view.View, @NonNull android.view.View, int);
+    method public void onStopNestedScroll(@NonNull android.view.View);
     method public void recomputeViewAttributes(android.view.View);
     method public void requestChildFocus(android.view.View, android.view.View);
-    method public boolean requestChildRectangleOnScreen(android.view.View, android.graphics.Rect, boolean);
+    method public boolean requestChildRectangleOnScreen(@NonNull android.view.View, android.graphics.Rect, boolean);
     method public void requestDisallowInterceptTouchEvent(boolean);
     method public void requestFitSystemWindows();
     method public void requestLayout();
-    method public boolean requestSendAccessibilityEvent(android.view.View, android.view.accessibility.AccessibilityEvent);
+    method public boolean requestSendAccessibilityEvent(@NonNull android.view.View, android.view.accessibility.AccessibilityEvent);
     method public void requestTransparentRegion(android.view.View);
     method public boolean showContextMenuForChild(android.view.View);
     method public boolean showContextMenuForChild(android.view.View, float, float);
@@ -49819,43 +50811,43 @@
   }
 
   public class ViewPropertyAnimator {
-    method public android.view.ViewPropertyAnimator alpha(@FloatRange(from=0.0f, to=1.0f) float);
-    method public android.view.ViewPropertyAnimator alphaBy(float);
+    method @NonNull public android.view.ViewPropertyAnimator alpha(@FloatRange(from=0.0f, to=1.0f) float);
+    method @NonNull public android.view.ViewPropertyAnimator alphaBy(float);
     method public void cancel();
     method public long getDuration();
-    method public android.animation.TimeInterpolator getInterpolator();
+    method @Nullable public android.animation.TimeInterpolator getInterpolator();
     method public long getStartDelay();
-    method public android.view.ViewPropertyAnimator rotation(float);
-    method public android.view.ViewPropertyAnimator rotationBy(float);
-    method public android.view.ViewPropertyAnimator rotationX(float);
-    method public android.view.ViewPropertyAnimator rotationXBy(float);
-    method public android.view.ViewPropertyAnimator rotationY(float);
-    method public android.view.ViewPropertyAnimator rotationYBy(float);
-    method public android.view.ViewPropertyAnimator scaleX(float);
-    method public android.view.ViewPropertyAnimator scaleXBy(float);
-    method public android.view.ViewPropertyAnimator scaleY(float);
-    method public android.view.ViewPropertyAnimator scaleYBy(float);
-    method public android.view.ViewPropertyAnimator setDuration(long);
-    method public android.view.ViewPropertyAnimator setInterpolator(android.animation.TimeInterpolator);
-    method public android.view.ViewPropertyAnimator setListener(android.animation.Animator.AnimatorListener);
-    method public android.view.ViewPropertyAnimator setStartDelay(long);
-    method public android.view.ViewPropertyAnimator setUpdateListener(android.animation.ValueAnimator.AnimatorUpdateListener);
+    method @NonNull public android.view.ViewPropertyAnimator rotation(float);
+    method @NonNull public android.view.ViewPropertyAnimator rotationBy(float);
+    method @NonNull public android.view.ViewPropertyAnimator rotationX(float);
+    method @NonNull public android.view.ViewPropertyAnimator rotationXBy(float);
+    method @NonNull public android.view.ViewPropertyAnimator rotationY(float);
+    method @NonNull public android.view.ViewPropertyAnimator rotationYBy(float);
+    method @NonNull public android.view.ViewPropertyAnimator scaleX(float);
+    method @NonNull public android.view.ViewPropertyAnimator scaleXBy(float);
+    method @NonNull public android.view.ViewPropertyAnimator scaleY(float);
+    method @NonNull public android.view.ViewPropertyAnimator scaleYBy(float);
+    method @NonNull public android.view.ViewPropertyAnimator setDuration(long);
+    method @NonNull public android.view.ViewPropertyAnimator setInterpolator(android.animation.TimeInterpolator);
+    method @NonNull public android.view.ViewPropertyAnimator setListener(@Nullable android.animation.Animator.AnimatorListener);
+    method @NonNull public android.view.ViewPropertyAnimator setStartDelay(long);
+    method @NonNull public android.view.ViewPropertyAnimator setUpdateListener(@Nullable android.animation.ValueAnimator.AnimatorUpdateListener);
     method public void start();
-    method public android.view.ViewPropertyAnimator translationX(float);
-    method public android.view.ViewPropertyAnimator translationXBy(float);
-    method public android.view.ViewPropertyAnimator translationY(float);
-    method public android.view.ViewPropertyAnimator translationYBy(float);
-    method public android.view.ViewPropertyAnimator translationZ(float);
-    method public android.view.ViewPropertyAnimator translationZBy(float);
-    method public android.view.ViewPropertyAnimator withEndAction(Runnable);
-    method public android.view.ViewPropertyAnimator withLayer();
-    method public android.view.ViewPropertyAnimator withStartAction(Runnable);
-    method public android.view.ViewPropertyAnimator x(float);
-    method public android.view.ViewPropertyAnimator xBy(float);
-    method public android.view.ViewPropertyAnimator y(float);
-    method public android.view.ViewPropertyAnimator yBy(float);
-    method public android.view.ViewPropertyAnimator z(float);
-    method public android.view.ViewPropertyAnimator zBy(float);
+    method @NonNull public android.view.ViewPropertyAnimator translationX(float);
+    method @NonNull public android.view.ViewPropertyAnimator translationXBy(float);
+    method @NonNull public android.view.ViewPropertyAnimator translationY(float);
+    method @NonNull public android.view.ViewPropertyAnimator translationYBy(float);
+    method @NonNull public android.view.ViewPropertyAnimator translationZ(float);
+    method @NonNull public android.view.ViewPropertyAnimator translationZBy(float);
+    method @NonNull public android.view.ViewPropertyAnimator withEndAction(Runnable);
+    method @NonNull public android.view.ViewPropertyAnimator withLayer();
+    method @NonNull public android.view.ViewPropertyAnimator withStartAction(Runnable);
+    method @NonNull public android.view.ViewPropertyAnimator x(float);
+    method @NonNull public android.view.ViewPropertyAnimator xBy(float);
+    method @NonNull public android.view.ViewPropertyAnimator y(float);
+    method @NonNull public android.view.ViewPropertyAnimator yBy(float);
+    method @NonNull public android.view.ViewPropertyAnimator z(float);
+    method @NonNull public android.view.ViewPropertyAnimator zBy(float);
   }
 
   public abstract class ViewStructure {
@@ -50600,19 +51592,24 @@
     method public CharSequence getPackageName();
     method public android.view.accessibility.AccessibilityRecord getRecord(int);
     method public int getRecordCount();
+    method public int getSpeechStateChangeTypes();
     method public int getWindowChanges();
     method public void initFromParcel(android.os.Parcel);
-    method public static android.view.accessibility.AccessibilityEvent obtain(int);
-    method public static android.view.accessibility.AccessibilityEvent obtain(android.view.accessibility.AccessibilityEvent);
-    method public static android.view.accessibility.AccessibilityEvent obtain();
+    method @Deprecated public static android.view.accessibility.AccessibilityEvent obtain(int);
+    method @Deprecated public static android.view.accessibility.AccessibilityEvent obtain(android.view.accessibility.AccessibilityEvent);
+    method @Deprecated public static android.view.accessibility.AccessibilityEvent obtain();
     method public void setAction(int);
     method public void setContentChangeTypes(int);
     method public void setEventTime(long);
     method public void setEventType(int);
     method public void setMovementGranularity(int);
     method public void setPackageName(CharSequence);
+    method public void setSpeechStateChangeTypes(int);
     method public void writeToParcel(android.os.Parcel, int);
     field public static final int CONTENT_CHANGE_TYPE_CONTENT_DESCRIPTION = 4; // 0x4
+    field public static final int CONTENT_CHANGE_TYPE_DRAG_CANCELLED = 512; // 0x200
+    field public static final int CONTENT_CHANGE_TYPE_DRAG_DROPPED = 256; // 0x100
+    field public static final int CONTENT_CHANGE_TYPE_DRAG_STARTED = 128; // 0x80
     field public static final int CONTENT_CHANGE_TYPE_PANE_APPEARED = 16; // 0x10
     field public static final int CONTENT_CHANGE_TYPE_PANE_DISAPPEARED = 32; // 0x20
     field public static final int CONTENT_CHANGE_TYPE_PANE_TITLE = 8; // 0x8
@@ -50623,12 +51620,17 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityEvent> CREATOR;
     field public static final int INVALID_POSITION = -1; // 0xffffffff
     field @Deprecated public static final int MAX_TEXT_LENGTH = 500; // 0x1f4
+    field public static final int SPEECH_STATE_LISTENING_END = 8; // 0x8
+    field public static final int SPEECH_STATE_LISTENING_START = 4; // 0x4
+    field public static final int SPEECH_STATE_SPEAKING_END = 2; // 0x2
+    field public static final int SPEECH_STATE_SPEAKING_START = 1; // 0x1
     field public static final int TYPES_ALL_MASK = -1; // 0xffffffff
     field public static final int TYPE_ANNOUNCEMENT = 16384; // 0x4000
     field public static final int TYPE_ASSIST_READING_CONTEXT = 16777216; // 0x1000000
     field public static final int TYPE_GESTURE_DETECTION_END = 524288; // 0x80000
     field public static final int TYPE_GESTURE_DETECTION_START = 262144; // 0x40000
     field public static final int TYPE_NOTIFICATION_STATE_CHANGED = 64; // 0x40
+    field public static final int TYPE_SPEECH_STATE_CHANGE = 33554432; // 0x2000000
     field public static final int TYPE_TOUCH_EXPLORATION_GESTURE_END = 1024; // 0x400
     field public static final int TYPE_TOUCH_EXPLORATION_GESTURE_START = 512; // 0x200
     field public static final int TYPE_TOUCH_INTERACTION_END = 2097152; // 0x200000
@@ -50669,8 +51671,11 @@
 
   public final class AccessibilityManager {
     method public void addAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer);
+    method public void addAccessibilityServicesStateChangeListener(@NonNull java.util.concurrent.Executor, @NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener);
+    method public void addAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener);
     method public boolean addAccessibilityStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);
     method public void addAccessibilityStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener, @Nullable android.os.Handler);
+    method public void addAudioDescriptionRequestedChangeListener(@NonNull java.util.concurrent.Executor, @NonNull android.view.accessibility.AccessibilityManager.AudioDescriptionRequestedChangeListener);
     method public boolean addTouchExplorationStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener);
     method public void addTouchExplorationStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener, @Nullable android.os.Handler);
     method @ColorInt public int getAccessibilityFocusColor();
@@ -50681,10 +51686,13 @@
     method public int getRecommendedTimeoutMillis(int, int);
     method public void interrupt();
     method public static boolean isAccessibilityButtonSupported();
+    method public boolean isAudioDescriptionRequested();
     method public boolean isEnabled();
     method public boolean isTouchExplorationEnabled();
     method public void removeAccessibilityRequestPreparer(android.view.accessibility.AccessibilityRequestPreparer);
+    method public boolean removeAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener);
     method public boolean removeAccessibilityStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener);
+    method public boolean removeAudioDescriptionRequestedChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AudioDescriptionRequestedChangeListener);
     method public boolean removeTouchExplorationStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener);
     method public void sendAccessibilityEvent(android.view.accessibility.AccessibilityEvent);
     field public static final int FLAG_CONTENT_CONTROLS = 4; // 0x4
@@ -50692,10 +51700,18 @@
     field public static final int FLAG_CONTENT_TEXT = 2; // 0x2
   }
 
+  public static interface AccessibilityManager.AccessibilityServicesStateChangeListener {
+    method public void onAccessibilityServicesStateChanged(@NonNull android.view.accessibility.AccessibilityManager);
+  }
+
   public static interface AccessibilityManager.AccessibilityStateChangeListener {
     method public void onAccessibilityStateChanged(boolean);
   }
 
+  public static interface AccessibilityManager.AudioDescriptionRequestedChangeListener {
+    method public void onAudioDescriptionRequestedChanged(boolean);
+  }
+
   public static interface AccessibilityManager.TouchExplorationStateChangeListener {
     method public void onTouchExplorationStateChanged(boolean);
   }
@@ -50721,6 +51737,7 @@
     method @Deprecated public void getBoundsInParent(android.graphics.Rect);
     method public void getBoundsInScreen(android.graphics.Rect);
     method public android.view.accessibility.AccessibilityNodeInfo getChild(int);
+    method @Nullable public android.view.accessibility.AccessibilityNodeInfo getChild(int, int);
     method public int getChildCount();
     method public CharSequence getClassName();
     method public android.view.accessibility.AccessibilityNodeInfo.CollectionInfo getCollectionInfo();
@@ -50740,6 +51757,7 @@
     method public CharSequence getPackageName();
     method @Nullable public CharSequence getPaneTitle();
     method public android.view.accessibility.AccessibilityNodeInfo getParent();
+    method @Nullable public android.view.accessibility.AccessibilityNodeInfo getParent(int);
     method public android.view.accessibility.AccessibilityNodeInfo.RangeInfo getRangeInfo();
     method @Nullable public CharSequence getStateDescription();
     method public CharSequence getText();
@@ -50749,6 +51767,7 @@
     method @Nullable public android.view.accessibility.AccessibilityNodeInfo.TouchDelegateInfo getTouchDelegateInfo();
     method public android.view.accessibility.AccessibilityNodeInfo getTraversalAfter();
     method public android.view.accessibility.AccessibilityNodeInfo getTraversalBefore();
+    method @Nullable public String getUniqueId();
     method public String getViewIdResourceName();
     method public android.view.accessibility.AccessibilityWindowInfo getWindow();
     method public int getWindowId();
@@ -50773,14 +51792,15 @@
     method public boolean isSelected();
     method public boolean isShowingHintText();
     method public boolean isTextEntryKey();
+    method public boolean isTextSelectable();
     method public boolean isVisibleToUser();
-    method public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View);
-    method public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View, int);
-    method public static android.view.accessibility.AccessibilityNodeInfo obtain();
-    method public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.accessibility.AccessibilityNodeInfo);
+    method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View);
+    method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.View, int);
+    method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo obtain();
+    method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo obtain(android.view.accessibility.AccessibilityNodeInfo);
     method public boolean performAction(int);
     method public boolean performAction(int, android.os.Bundle);
-    method public void recycle();
+    method @Deprecated public void recycle();
     method public boolean refresh();
     method public boolean refreshWithExtraData(String, android.os.Bundle);
     method @Deprecated public void removeAction(int);
@@ -50836,6 +51856,7 @@
     method public void setStateDescription(@Nullable CharSequence);
     method public void setText(CharSequence);
     method public void setTextEntryKey(boolean);
+    method public void setTextSelectable(boolean);
     method public void setTextSelection(int, int);
     method public void setTooltipText(@Nullable CharSequence);
     method public void setTouchDelegateInfo(@NonNull android.view.accessibility.AccessibilityNodeInfo.TouchDelegateInfo);
@@ -50843,6 +51864,7 @@
     method public void setTraversalAfter(android.view.View, int);
     method public void setTraversalBefore(android.view.View);
     method public void setTraversalBefore(android.view.View, int);
+    method public void setUniqueId(@Nullable String);
     method public void setViewIdResourceName(String);
     method public void setVisibleToUser(boolean);
     method public void writeToParcel(android.os.Parcel, int);
@@ -50886,8 +51908,15 @@
     field public static final int EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_MAX_LENGTH = 20000; // 0x4e20
     field public static final String EXTRA_DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_ARG_START_INDEX";
     field public static final String EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY = "android.view.accessibility.extra.DATA_TEXT_CHARACTER_LOCATION_KEY";
+    field public static final int FLAG_PREFETCH_ANCESTORS = 1; // 0x1
+    field public static final int FLAG_PREFETCH_DESCENDANTS_BREADTH_FIRST = 16; // 0x10
+    field public static final int FLAG_PREFETCH_DESCENDANTS_DEPTH_FIRST = 8; // 0x8
+    field public static final int FLAG_PREFETCH_DESCENDANTS_HYBRID = 4; // 0x4
+    field public static final int FLAG_PREFETCH_SIBLINGS = 2; // 0x2
+    field public static final int FLAG_PREFETCH_UNINTERRUPTIBLE = 32; // 0x20
     field public static final int FOCUS_ACCESSIBILITY = 2; // 0x2
     field public static final int FOCUS_INPUT = 1; // 0x1
+    field public static final int MAX_NUMBER_OF_PREFETCHED_NODES = 50; // 0x32
     field public static final int MOVEMENT_GRANULARITY_CHARACTER = 1; // 0x1
     field public static final int MOVEMENT_GRANULARITY_LINE = 4; // 0x4
     field public static final int MOVEMENT_GRANULARITY_PAGE = 16; // 0x10
@@ -50911,6 +51940,9 @@
     field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_COPY;
     field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_CUT;
     field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_DISMISS;
+    field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_DRAG_CANCEL;
+    field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_DRAG_DROP;
+    field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_DRAG_START;
     field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_EXPAND;
     field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_FOCUS;
     field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_HIDE_TOOLTIP;
@@ -50939,6 +51971,7 @@
     field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_SELECTION;
     field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SET_TEXT;
     field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_ON_SCREEN;
+    field @NonNull public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_TEXT_SUGGESTIONS;
     field public static final android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction ACTION_SHOW_TOOLTIP;
     field @NonNull public static final android.os.Parcelable.Creator<android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction> CREATOR;
   }
@@ -50950,8 +51983,8 @@
     method public int getRowCount();
     method public int getSelectionMode();
     method public boolean isHierarchical();
-    method public static android.view.accessibility.AccessibilityNodeInfo.CollectionInfo obtain(int, int, boolean);
-    method public static android.view.accessibility.AccessibilityNodeInfo.CollectionInfo obtain(int, int, boolean, int);
+    method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.CollectionInfo obtain(int, int, boolean);
+    method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.CollectionInfo obtain(int, int, boolean, int);
     field public static final int SELECTION_MODE_MULTIPLE = 2; // 0x2
     field public static final int SELECTION_MODE_NONE = 0; // 0x0
     field public static final int SELECTION_MODE_SINGLE = 1; // 0x1
@@ -50962,12 +51995,28 @@
     ctor public AccessibilityNodeInfo.CollectionItemInfo(int, int, int, int, boolean, boolean);
     method public int getColumnIndex();
     method public int getColumnSpan();
+    method @Nullable public String getColumnTitle();
     method public int getRowIndex();
     method public int getRowSpan();
+    method @Nullable public String getRowTitle();
     method @Deprecated public boolean isHeading();
     method public boolean isSelected();
-    method public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean);
-    method public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean, boolean);
+    method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean);
+    method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(int, int, int, int, boolean, boolean);
+    method @Deprecated @NonNull public static android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo obtain(@Nullable String, int, int, @Nullable String, int, int, boolean, boolean);
+  }
+
+  public static final class AccessibilityNodeInfo.CollectionItemInfo.Builder {
+    ctor public AccessibilityNodeInfo.CollectionItemInfo.Builder();
+    method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo build();
+    method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo.Builder setColumnIndex(int);
+    method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo.Builder setColumnSpan(int);
+    method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo.Builder setColumnTitle(@Nullable String);
+    method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo.Builder setHeading(boolean);
+    method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo.Builder setRowIndex(int);
+    method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo.Builder setRowSpan(int);
+    method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo.Builder setRowTitle(@Nullable String);
+    method @NonNull public android.view.accessibility.AccessibilityNodeInfo.CollectionItemInfo.Builder setSelected(boolean);
   }
 
   public static final class AccessibilityNodeInfo.ExtraRenderingInfo {
@@ -50982,7 +52031,7 @@
     method public float getMax();
     method public float getMin();
     method public int getType();
-    method public static android.view.accessibility.AccessibilityNodeInfo.RangeInfo obtain(int, float, float, float);
+    method @Deprecated public static android.view.accessibility.AccessibilityNodeInfo.RangeInfo obtain(int, float, float, float);
     field public static final int RANGE_TYPE_FLOAT = 1; // 0x1
     field public static final int RANGE_TYPE_INT = 0; // 0x0
     field public static final int RANGE_TYPE_PERCENT = 2; // 0x2
@@ -51001,10 +52050,10 @@
   public abstract class AccessibilityNodeProvider {
     ctor public AccessibilityNodeProvider();
     method public void addExtraDataToAccessibilityNodeInfo(int, android.view.accessibility.AccessibilityNodeInfo, String, android.os.Bundle);
-    method public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo(int);
-    method public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByText(String, int);
-    method public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
-    method public boolean performAction(int, int, android.os.Bundle);
+    method @Nullable public android.view.accessibility.AccessibilityNodeInfo createAccessibilityNodeInfo(int);
+    method @Nullable public java.util.List<android.view.accessibility.AccessibilityNodeInfo> findAccessibilityNodeInfosByText(String, int);
+    method @Nullable public android.view.accessibility.AccessibilityNodeInfo findFocus(int);
+    method public boolean performAction(int, int, @Nullable android.os.Bundle);
     field public static final int HOST_VIEW_ID = -1; // 0xffffffff
   }
 
@@ -51012,22 +52061,24 @@
     ctor public AccessibilityRecord();
     ctor public AccessibilityRecord(@NonNull android.view.accessibility.AccessibilityRecord);
     method public int getAddedCount();
-    method public CharSequence getBeforeText();
-    method public CharSequence getClassName();
-    method public CharSequence getContentDescription();
+    method @Nullable public CharSequence getBeforeText();
+    method @Nullable public CharSequence getClassName();
+    method @Nullable public CharSequence getContentDescription();
     method public int getCurrentItemIndex();
+    method public int getDisplayId();
     method public int getFromIndex();
     method public int getItemCount();
     method public int getMaxScrollX();
     method public int getMaxScrollY();
-    method public android.os.Parcelable getParcelableData();
+    method @Nullable public android.os.Parcelable getParcelableData();
     method public int getRemovedCount();
     method public int getScrollDeltaX();
     method public int getScrollDeltaY();
     method public int getScrollX();
     method public int getScrollY();
-    method public android.view.accessibility.AccessibilityNodeInfo getSource();
-    method public java.util.List<java.lang.CharSequence> getText();
+    method @Nullable public android.view.accessibility.AccessibilityNodeInfo getSource();
+    method @Nullable public android.view.accessibility.AccessibilityNodeInfo getSource(int);
+    method @NonNull public java.util.List<java.lang.CharSequence> getText();
     method public int getToIndex();
     method public int getWindowId();
     method public boolean isChecked();
@@ -51035,14 +52086,14 @@
     method public boolean isFullScreen();
     method public boolean isPassword();
     method public boolean isScrollable();
-    method public static android.view.accessibility.AccessibilityRecord obtain(android.view.accessibility.AccessibilityRecord);
-    method public static android.view.accessibility.AccessibilityRecord obtain();
-    method public void recycle();
+    method @Deprecated @NonNull public static android.view.accessibility.AccessibilityRecord obtain(@NonNull android.view.accessibility.AccessibilityRecord);
+    method @Deprecated @NonNull public static android.view.accessibility.AccessibilityRecord obtain();
+    method @Deprecated public void recycle();
     method public void setAddedCount(int);
-    method public void setBeforeText(CharSequence);
+    method public void setBeforeText(@Nullable CharSequence);
     method public void setChecked(boolean);
-    method public void setClassName(CharSequence);
-    method public void setContentDescription(CharSequence);
+    method public void setClassName(@Nullable CharSequence);
+    method public void setContentDescription(@Nullable CharSequence);
     method public void setCurrentItemIndex(int);
     method public void setEnabled(boolean);
     method public void setFromIndex(int);
@@ -51050,7 +52101,7 @@
     method public void setItemCount(int);
     method public void setMaxScrollX(int);
     method public void setMaxScrollY(int);
-    method public void setParcelableData(android.os.Parcelable);
+    method public void setParcelableData(@Nullable android.os.Parcelable);
     method public void setPassword(boolean);
     method public void setRemovedCount(int);
     method public void setScrollDeltaX(int);
@@ -51058,7 +52109,7 @@
     method public void setScrollX(int);
     method public void setScrollY(int);
     method public void setScrollable(boolean);
-    method public void setSource(android.view.View);
+    method public void setSource(@Nullable android.view.View);
     method public void setSource(@Nullable android.view.View, int);
     method public void setToIndex(int);
   }
@@ -51084,6 +52135,7 @@
     method public android.view.accessibility.AccessibilityWindowInfo getParent();
     method public void getRegionInScreen(@NonNull android.graphics.Region);
     method public android.view.accessibility.AccessibilityNodeInfo getRoot();
+    method @Nullable public android.view.accessibility.AccessibilityNodeInfo getRoot(int);
     method @Nullable public CharSequence getTitle();
     method public int getType();
     method public boolean isAccessibilityFocused();
@@ -51098,6 +52150,7 @@
     field public static final int TYPE_ACCESSIBILITY_OVERLAY = 4; // 0x4
     field public static final int TYPE_APPLICATION = 1; // 0x1
     field public static final int TYPE_INPUT_METHOD = 2; // 0x2
+    field public static final int TYPE_MAGNIFICATION_OVERLAY = 6; // 0x6
     field public static final int TYPE_SPLIT_SCREEN_DIVIDER = 5; // 0x5
     field public static final int TYPE_SYSTEM = 3; // 0x3
   }
@@ -51107,7 +52160,10 @@
     method public final float getFontScale();
     method @Nullable public final java.util.Locale getLocale();
     method @NonNull public android.view.accessibility.CaptioningManager.CaptionStyle getUserStyle();
+    method public boolean isCallCaptioningEnabled();
     method public final boolean isEnabled();
+    method public final boolean isSystemAudioCaptioningEnabled();
+    method public final boolean isSystemAudioCaptioningUiEnabled();
     method public void removeCaptioningChangeListener(@NonNull android.view.accessibility.CaptioningManager.CaptioningChangeListener);
   }
 
@@ -51136,6 +52192,8 @@
     method public void onEnabledChanged(boolean);
     method public void onFontScaleChanged(float);
     method public void onLocaleChanged(@Nullable java.util.Locale);
+    method public void onSystemAudioCaptioningChanged(boolean);
+    method public void onSystemAudioCaptioningUiChanged(boolean);
     method public void onUserStyleChanged(@NonNull android.view.accessibility.CaptioningManager.CaptionStyle);
   }
 
@@ -51178,6 +52236,7 @@
     method public int getRepeatCount();
     method public int getRepeatMode();
     method protected float getScaleFactor();
+    method public boolean getShowBackground();
     method public long getStartOffset();
     method public long getStartTime();
     method public boolean getTransformation(long, android.view.animation.Transformation);
@@ -51203,6 +52262,7 @@
     method public void setInterpolator(android.view.animation.Interpolator);
     method public void setRepeatCount(int);
     method public void setRepeatMode(int);
+    method public void setShowBackground(boolean);
     method public void setStartOffset(long);
     method public void setStartTime(long);
     method public void setZAdjustment(int);
@@ -51373,7 +52433,7 @@
   }
 
   public class PathInterpolator extends android.view.animation.BaseInterpolator {
-    ctor public PathInterpolator(android.graphics.Path);
+    ctor public PathInterpolator(@NonNull android.graphics.Path);
     ctor public PathInterpolator(float, float);
     ctor public PathInterpolator(float, float, float, float);
     ctor public PathInterpolator(android.content.Context, android.util.AttributeSet);
@@ -51432,6 +52492,7 @@
 
   public final class AutofillManager {
     method public void cancel();
+    method public void clearAutofillRequestCallback();
     method public void commit();
     method public void disableAutofillServices();
     method @Nullable public android.content.ComponentName getAutofillServiceComponentName();
@@ -51457,7 +52518,10 @@
     method public void registerCallback(@Nullable android.view.autofill.AutofillManager.AutofillCallback);
     method public void requestAutofill(@NonNull android.view.View);
     method public void requestAutofill(@NonNull android.view.View, int, @NonNull android.graphics.Rect);
+    method public void setAutofillRequestCallback(@NonNull java.util.concurrent.Executor, @NonNull android.view.autofill.AutofillRequestCallback);
     method public void setUserData(@Nullable android.service.autofill.UserData);
+    method public boolean showAutofillDialog(@NonNull android.view.View);
+    method public boolean showAutofillDialog(@NonNull android.view.View, int);
     method public void unregisterCallback(@Nullable android.view.autofill.AutofillManager.AutofillCallback);
     field public static final String EXTRA_ASSIST_STRUCTURE = "android.view.autofill.extra.ASSIST_STRUCTURE";
     field public static final String EXTRA_AUTHENTICATION_RESULT = "android.view.autofill.extra.AUTHENTICATION_RESULT";
@@ -51475,6 +52539,10 @@
     field public static final int EVENT_INPUT_UNAVAILABLE = 3; // 0x3
   }
 
+  public interface AutofillRequestCallback {
+    method public void onFillRequest(@Nullable android.view.inputmethod.InlineSuggestionsRequest, @NonNull android.os.CancellationSignal, @NonNull android.service.autofill.FillCallback);
+  }
+
   public final class AutofillValue implements android.os.Parcelable {
     method public int describeContents();
     method public static android.view.autofill.AutofillValue forDate(long);
@@ -51702,6 +52770,7 @@
     method public int getCharacterBoundsFlags(int);
     method public CharSequence getComposingText();
     method public int getComposingTextStart();
+    method @Nullable public android.view.inputmethod.EditorBoundsInfo getEditorBoundsInfo();
     method public float getInsertionMarkerBaseline();
     method public float getInsertionMarkerBottom();
     method public int getInsertionMarkerFlags();
@@ -51723,11 +52792,27 @@
     method public android.view.inputmethod.CursorAnchorInfo build();
     method public void reset();
     method public android.view.inputmethod.CursorAnchorInfo.Builder setComposingText(int, CharSequence);
+    method @NonNull public android.view.inputmethod.CursorAnchorInfo.Builder setEditorBoundsInfo(@Nullable android.view.inputmethod.EditorBoundsInfo);
     method public android.view.inputmethod.CursorAnchorInfo.Builder setInsertionMarkerLocation(float, float, float, float, int);
     method public android.view.inputmethod.CursorAnchorInfo.Builder setMatrix(android.graphics.Matrix);
     method public android.view.inputmethod.CursorAnchorInfo.Builder setSelectionRange(int, int);
   }
 
+  public final class EditorBoundsInfo implements android.os.Parcelable {
+    method public int describeContents();
+    method @Nullable public android.graphics.RectF getEditorBounds();
+    method @Nullable public android.graphics.RectF getHandwritingBounds();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.EditorBoundsInfo> CREATOR;
+  }
+
+  public static final class EditorBoundsInfo.Builder {
+    ctor public EditorBoundsInfo.Builder();
+    method @NonNull public android.view.inputmethod.EditorBoundsInfo build();
+    method @NonNull public android.view.inputmethod.EditorBoundsInfo.Builder setEditorBounds(@Nullable android.graphics.RectF);
+    method @NonNull public android.view.inputmethod.EditorBoundsInfo.Builder setHandwritingBounds(@Nullable android.graphics.RectF);
+  }
+
   public class EditorInfo implements android.text.InputType android.os.Parcelable {
     ctor public EditorInfo();
     method public int describeContents();
@@ -51845,10 +52930,12 @@
     ctor public InlineSuggestionsRequest.Builder(@NonNull java.util.List<android.widget.inline.InlinePresentationSpec>);
     method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder addInlinePresentationSpecs(@NonNull android.widget.inline.InlinePresentationSpec);
     method @NonNull public android.view.inputmethod.InlineSuggestionsRequest build();
+    method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setClientSupported(boolean);
     method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setExtras(@NonNull android.os.Bundle);
     method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setInlinePresentationSpecs(@NonNull java.util.List<android.widget.inline.InlinePresentationSpec>);
     method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setInlineTooltipPresentationSpec(@NonNull android.widget.inline.InlinePresentationSpec);
     method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setMaxSuggestionCount(int);
+    method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setServiceSupported(boolean);
     method @NonNull public android.view.inputmethod.InlineSuggestionsRequest.Builder setSupportedLocales(@NonNull android.os.LocaleList);
   }
 
@@ -51879,13 +52966,14 @@
     method public boolean commitContent(@NonNull android.view.inputmethod.InputContentInfo, int, @Nullable android.os.Bundle);
     method public boolean commitCorrection(android.view.inputmethod.CorrectionInfo);
     method public boolean commitText(CharSequence, int);
+    method public default boolean commitText(@NonNull CharSequence, int, @Nullable android.view.inputmethod.TextAttribute);
     method public boolean deleteSurroundingText(int, int);
     method public boolean deleteSurroundingTextInCodePoints(int, int);
     method public boolean endBatchEdit();
     method public boolean finishComposingText();
     method public int getCursorCapsMode(int);
     method public android.view.inputmethod.ExtractedText getExtractedText(android.view.inputmethod.ExtractedTextRequest, int);
-    method public android.os.Handler getHandler();
+    method @Nullable public android.os.Handler getHandler();
     method public CharSequence getSelectedText(int);
     method @Nullable public default android.view.inputmethod.SurroundingText getSurroundingText(@IntRange(from=0) int, @IntRange(from=0) int, int);
     method @Nullable public CharSequence getTextAfterCursor(@IntRange(from=0) int, int);
@@ -51896,11 +52984,18 @@
     method public default boolean performSpellCheck();
     method public boolean reportFullscreenMode(boolean);
     method public boolean requestCursorUpdates(int);
+    method public default boolean requestCursorUpdates(int, int);
     method public boolean sendKeyEvent(android.view.KeyEvent);
     method public boolean setComposingRegion(int, int);
+    method public default boolean setComposingRegion(int, int, @Nullable android.view.inputmethod.TextAttribute);
     method public boolean setComposingText(CharSequence, int);
+    method public default boolean setComposingText(@NonNull CharSequence, int, @Nullable android.view.inputmethod.TextAttribute);
     method public default boolean setImeConsumesInput(boolean);
     method public boolean setSelection(int, int);
+    method @Nullable public default android.view.inputmethod.TextSnapshot takeSnapshot();
+    field public static final int CURSOR_UPDATE_FILTER_CHARACTER_BOUNDS = 8; // 0x8
+    field public static final int CURSOR_UPDATE_FILTER_EDITOR_BOUNDS = 4; // 0x4
+    field public static final int CURSOR_UPDATE_FILTER_INSERTION_MARKER = 16; // 0x10
     field public static final int CURSOR_UPDATE_IMMEDIATE = 1; // 0x1
     field public static final int CURSOR_UPDATE_MONITOR = 2; // 0x2
     field public static final int GET_EXTRACTED_TEXT_MONITOR = 1; // 0x1
@@ -51992,6 +53087,7 @@
     method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);
     method public CharSequence loadLabel(android.content.pm.PackageManager);
     method public boolean shouldShowInInputMethodPicker();
+    method public boolean supportsStylusHandwriting();
     method public boolean suppressesSpellChecker();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.InputMethodInfo> CREATOR;
@@ -52010,6 +53106,7 @@
     method public boolean hideSoftInputFromWindow(android.os.IBinder, int);
     method public boolean hideSoftInputFromWindow(android.os.IBinder, int, android.os.ResultReceiver);
     method @Deprecated public void hideStatusIcon(android.os.IBinder);
+    method public void invalidateInput(@NonNull android.view.View);
     method public boolean isAcceptingText();
     method public boolean isActive(android.view.View);
     method public boolean isActive();
@@ -52029,6 +53126,7 @@
     method public boolean showSoftInput(android.view.View, int, android.os.ResultReceiver);
     method @Deprecated public void showSoftInputFromInputMethod(android.os.IBinder, int);
     method @Deprecated public void showStatusIcon(android.os.IBinder, String, @DrawableRes int);
+    method public void startStylusHandwriting(@NonNull android.view.View);
     method @Deprecated public boolean switchToLastInputMethod(android.os.IBinder);
     method @Deprecated public boolean switchToNextInputMethod(android.os.IBinder, boolean);
     method @Deprecated public void toggleSoftInput(int, int);
@@ -52044,7 +53142,7 @@
     field public static final int RESULT_SHOWN = 2; // 0x2
     field public static final int RESULT_UNCHANGED_HIDDEN = 1; // 0x1
     field public static final int RESULT_UNCHANGED_SHOWN = 0; // 0x0
-    field public static final int SHOW_FORCED = 2; // 0x2
+    field @Deprecated public static final int SHOW_FORCED = 2; // 0x2
     field public static final int SHOW_IMPLICIT = 1; // 0x1
   }
 
@@ -52113,6 +53211,31 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.SurroundingText> CREATOR;
   }
 
+  public final class TextAttribute implements android.os.Parcelable {
+    method public int describeContents();
+    method @NonNull public android.os.PersistableBundle getExtras();
+    method @NonNull public java.util.List<java.lang.String> getTextConversionSuggestions();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.view.inputmethod.TextAttribute> CREATOR;
+  }
+
+  public static final class TextAttribute.Builder {
+    ctor public TextAttribute.Builder();
+    method @NonNull public android.view.inputmethod.TextAttribute build();
+    method @NonNull public android.view.inputmethod.TextAttribute.Builder setExtras(@NonNull android.os.PersistableBundle);
+    method @NonNull public android.view.inputmethod.TextAttribute.Builder setTextConversionSuggestions(@NonNull java.util.List<java.lang.String>);
+  }
+
+  public final class TextSnapshot {
+    ctor public TextSnapshot(@NonNull android.view.inputmethod.SurroundingText, @IntRange(from=0xffffffff) int, @IntRange(from=0xffffffff) int, int);
+    method @IntRange(from=0xffffffff) public int getCompositionEnd();
+    method @IntRange(from=0xffffffff) public int getCompositionStart();
+    method public int getCursorCapsMode();
+    method @IntRange(from=0xffffffff) public int getSelectionEnd();
+    method @IntRange(from=0xffffffff) public int getSelectionStart();
+    method @NonNull public android.view.inputmethod.SurroundingText getSurroundingText();
+  }
+
 }
 
 package android.view.inspector {
@@ -53275,7 +54398,6 @@
     method public void onPermissionRequest(android.webkit.PermissionRequest);
     method public void onPermissionRequestCanceled(android.webkit.PermissionRequest);
     method public void onProgressChanged(android.webkit.WebView, int);
-    method @Deprecated public void onReachedMaxAppCacheSize(long, long, android.webkit.WebStorage.QuotaUpdater);
     method public void onReceivedIcon(android.webkit.WebView, android.graphics.Bitmap);
     method public void onReceivedTitle(android.webkit.WebView, String);
     method public void onReceivedTouchIconUrl(android.webkit.WebView, String, boolean);
@@ -53400,7 +54522,7 @@
     method public abstract boolean getDomStorageEnabled();
     method public abstract String getFantasyFontFamily();
     method public abstract String getFixedFontFamily();
-    method public int getForceDark();
+    method @Deprecated public int getForceDark();
     method public abstract boolean getJavaScriptCanOpenWindowsAutomatically();
     method public abstract boolean getJavaScriptEnabled();
     method public abstract android.webkit.WebSettings.LayoutAlgorithm getLayoutAlgorithm();
@@ -53423,13 +54545,12 @@
     method public abstract int getTextZoom();
     method public abstract boolean getUseWideViewPort();
     method public abstract String getUserAgentString();
+    method public boolean isAlgorithmicDarkeningAllowed();
+    method public void setAlgorithmicDarkeningAllowed(boolean);
     method public abstract void setAllowContentAccess(boolean);
     method public abstract void setAllowFileAccess(boolean);
     method @Deprecated public abstract void setAllowFileAccessFromFileURLs(boolean);
     method @Deprecated public abstract void setAllowUniversalAccessFromFileURLs(boolean);
-    method @Deprecated public abstract void setAppCacheEnabled(boolean);
-    method @Deprecated public abstract void setAppCacheMaxSize(long);
-    method @Deprecated public abstract void setAppCachePath(String);
     method public abstract void setBlockNetworkImage(boolean);
     method public abstract void setBlockNetworkLoads(boolean);
     method public abstract void setBuiltInZoomControls(boolean);
@@ -53447,7 +54568,7 @@
     method @Deprecated public abstract void setEnableSmoothTransition(boolean);
     method public abstract void setFantasyFontFamily(String);
     method public abstract void setFixedFontFamily(String);
-    method public void setForceDark(int);
+    method @Deprecated public void setForceDark(int);
     method @Deprecated public abstract void setGeolocationDatabasePath(String);
     method public abstract void setGeolocationEnabled(boolean);
     method public abstract void setJavaScriptCanOpenWindowsAutomatically(boolean);
@@ -53478,9 +54599,9 @@
     method public abstract void setUserAgentString(@Nullable String);
     method public abstract boolean supportMultipleWindows();
     method public abstract boolean supportZoom();
-    field public static final int FORCE_DARK_AUTO = 1; // 0x1
-    field public static final int FORCE_DARK_OFF = 0; // 0x0
-    field public static final int FORCE_DARK_ON = 2; // 0x2
+    field @Deprecated public static final int FORCE_DARK_AUTO = 1; // 0x1
+    field @Deprecated public static final int FORCE_DARK_OFF = 0; // 0x0
+    field @Deprecated public static final int FORCE_DARK_ON = 2; // 0x2
     field public static final int LOAD_CACHE_ELSE_NETWORK = 1; // 0x1
     field public static final int LOAD_CACHE_ONLY = 3; // 0x3
     field public static final int LOAD_DEFAULT = -1; // 0xffffffff
@@ -53824,6 +54945,7 @@
     method protected boolean isInFilterMode();
     method public boolean isItemChecked(int);
     method public boolean isScrollingCacheEnabled();
+    method public boolean isSelectedChildViewEnabled();
     method public boolean isSmoothScrollbarEnabled();
     method public boolean isStackFromBottom();
     method public boolean isTextFilterEnabled();
@@ -53859,6 +54981,7 @@
     method public void setRemoteViewsAdapter(android.content.Intent);
     method public void setScrollIndicators(android.view.View, android.view.View);
     method public void setScrollingCacheEnabled(boolean);
+    method public void setSelectedChildViewEnabled(boolean);
     method public void setSelectionFromTop(int, int);
     method public void setSelector(@DrawableRes int);
     method public void setSelector(android.graphics.drawable.Drawable);
@@ -55643,8 +56766,8 @@
     method public void setViewOutlinePreferredRadiusDimen(@IdRes int, @DimenRes int);
     method public void setViewPadding(@IdRes int, @Px int, @Px int, @Px int, @Px int);
     method public void setViewVisibility(@IdRes int, int);
-    method public void showNext(@IdRes int);
-    method public void showPrevious(@IdRes int);
+    method @Deprecated public void showNext(@IdRes int);
+    method @Deprecated public void showPrevious(@IdRes int);
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.widget.RemoteViews> CREATOR;
     field public static final String EXTRA_CHECKED = "android.widget.extra.CHECKED";
@@ -56271,6 +57394,8 @@
     method public final android.text.Layout getLayout();
     method public float getLetterSpacing();
     method public int getLineBounds(int, android.graphics.Rect);
+    method public int getLineBreakStyle();
+    method public int getLineBreakWordStyle();
     method public int getLineCount();
     method public int getLineHeight();
     method public float getLineSpacingExtra();
@@ -56398,6 +57523,8 @@
     method public void setKeyListener(android.text.method.KeyListener);
     method public void setLastBaselineToBottomHeight(@IntRange(from=0) @Px int);
     method public void setLetterSpacing(float);
+    method public void setLineBreakStyle(int);
+    method public void setLineBreakWordStyle(int);
     method public void setLineHeight(@IntRange(from=0) @Px int);
     method public void setLineSpacing(float, float);
     method public void setLines(int);
@@ -56802,10 +57929,27 @@
 
 package android.window {
 
+  public interface OnBackInvokedCallback {
+    method public default void onBackInvoked();
+  }
+
+  public interface OnBackInvokedDispatcher {
+    method public void registerOnBackInvokedCallback(@NonNull android.window.OnBackInvokedCallback, @IntRange(from=0) int);
+    method public void unregisterOnBackInvokedCallback(@NonNull android.window.OnBackInvokedCallback);
+    field public static final int PRIORITY_DEFAULT = 0; // 0x0
+    field public static final int PRIORITY_OVERLAY = 1000000; // 0xf4240
+  }
+
+  public interface OnBackInvokedDispatcherOwner {
+    method @NonNull public android.window.OnBackInvokedDispatcher getOnBackInvokedDispatcher();
+  }
+
   public interface SplashScreen {
     method public void clearOnExitAnimationListener();
     method public void setOnExitAnimationListener(@NonNull android.window.SplashScreen.OnExitAnimationListener);
     method public void setSplashScreenTheme(@StyleRes int);
+    field public static final int SPLASH_SCREEN_STYLE_ICON = 1; // 0x1
+    field public static final int SPLASH_SCREEN_STYLE_SOLID_COLOR = 0; // 0x0
   }
 
   public static interface SplashScreen.OnExitAnimationListener {
diff --git a/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/test-current.txt b/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/test-current.txt
index 2eafa93..d984abe 100644
--- a/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/test-current.txt
+++ b/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/test-current.txt
@@ -19,6 +19,7 @@
     field public static final String FORCE_STOP_PACKAGES = "android.permission.FORCE_STOP_PACKAGES";
     field public static final String INSTALL_TEST_ONLY_PACKAGE = "android.permission.INSTALL_TEST_ONLY_PACKAGE";
     field public static final String KEEP_UNINSTALLED_PACKAGES = "android.permission.KEEP_UNINSTALLED_PACKAGES";
+    field public static final String MAKE_UID_VISIBLE = "android.permission.MAKE_UID_VISIBLE";
     field @Deprecated public static final String MANAGE_ACTIVITY_STACKS = "android.permission.MANAGE_ACTIVITY_STACKS";
     field public static final String MANAGE_ACTIVITY_TASKS = "android.permission.MANAGE_ACTIVITY_TASKS";
     field public static final String MANAGE_CRATES = "android.permission.MANAGE_CRATES";
@@ -26,6 +27,7 @@
     field public static final String MANAGE_ROLLBACKS = "android.permission.MANAGE_ROLLBACKS";
     field public static final String MANAGE_TOAST_RATE_LIMITING = "android.permission.MANAGE_TOAST_RATE_LIMITING";
     field public static final String MODIFY_REFRESH_RATE_SWITCHING_TYPE = "android.permission.MODIFY_REFRESH_RATE_SWITCHING_TYPE";
+    field public static final String MODIFY_USER_PREFERRED_DISPLAY_MODE = "android.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE";
     field public static final String NETWORK_SETTINGS = "android.permission.NETWORK_SETTINGS";
     field public static final String NETWORK_STACK = "android.permission.NETWORK_STACK";
     field public static final String OVERRIDE_DISPLAY_MODE_REQUESTS = "android.permission.OVERRIDE_DISPLAY_MODE_REQUESTS";
@@ -35,7 +37,10 @@
     field public static final String RECORD_BACKGROUND_AUDIO = "android.permission.RECORD_BACKGROUND_AUDIO";
     field public static final String REMOVE_TASKS = "android.permission.REMOVE_TASKS";
     field public static final String RESET_APP_ERRORS = "android.permission.RESET_APP_ERRORS";
+    field public static final String REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL = "android.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL";
     field public static final String SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS = "android.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS";
+    field public static final String SET_GAME_SERVICE = "android.permission.SET_GAME_SERVICE";
+    field public static final String SET_KEYBOARD_LAYOUT = "android.permission.SET_KEYBOARD_LAYOUT";
     field public static final String START_TASKS_FROM_RECENTS = "android.permission.START_TASKS_FROM_RECENTS";
     field public static final String SUSPEND_APPS = "android.permission.SUSPEND_APPS";
     field public static final String TEST_BIOMETRIC = "android.permission.TEST_BIOMETRIC";
@@ -57,12 +62,14 @@
   public static final class R.bool {
     field public static final int config_assistantOnTopOfDream = 17891333; // 0x1110005
     field public static final int config_perDisplayFocusEnabled = 17891332; // 0x1110004
+    field public static final int config_preventImeStartupUnlessTextEditor;
     field public static final int config_remoteInsetsControllerControlsSystemBars = 17891334; // 0x1110006
   }
 
   public static final class R.string {
     field public static final int config_defaultAssistant = 17039393; // 0x1040021
     field public static final int config_defaultDialer = 17039395; // 0x1040023
+    field public static final int config_systemAutomotiveCalendarSyncManager;
     field public static final int config_systemAutomotiveCluster = 17039400; // 0x1040028
     field public static final int config_systemAutomotiveProjection = 17039401; // 0x1040029
     field public static final int config_systemGallery = 17039399; // 0x1040027
@@ -89,16 +96,19 @@
 package android.animation {
 
   public class ValueAnimator extends android.animation.Animator {
-    method public static float getDurationScale();
-    method public static void setDurationScale(float);
+    method @MainThread public static void setDurationScale(@FloatRange(from=0) float);
   }
 
 }
 
 package android.app {
 
-  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.view.View.OnCreateContextMenuListener android.view.Window.Callback {
+  @UiContext public class Activity extends android.view.ContextThemeWrapper implements android.content.ComponentCallbacks2 android.view.KeyEvent.Callback android.view.LayoutInflater.Factory2 android.window.OnBackInvokedDispatcherOwner android.view.View.OnCreateContextMenuListener android.view.Window.Callback {
+    method public final boolean addDumpable(@NonNull android.util.Dumpable);
+    method public void dumpInternal(@NonNull String, @Nullable java.io.FileDescriptor, @NonNull java.io.PrintWriter, @Nullable String[]);
     method public void onMovedToDisplay(int, android.content.res.Configuration);
+    field public static final String DUMP_ARG_DUMP_DUMPABLE = "--dump-dumpable";
+    field public static final String DUMP_ARG_LIST_DUMPABLES = "--list-dumpables";
   }
 
   public class ActivityManager {
@@ -113,6 +123,7 @@
     method @RequiresPermission(android.Manifest.permission.RESET_APP_ERRORS) public void resetAppErrors();
     method public static void resumeAppSwitches() throws android.os.RemoteException;
     method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public void scheduleApplicationInfoChanged(java.util.List<java.lang.String>, int);
+    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public void setStopUserOnSwitch(int);
     method @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public boolean stopUser(int, boolean);
     method @RequiresPermission(android.Manifest.permission.CHANGE_CONFIGURATION) public boolean updateMccMncConfiguration(@NonNull String, @NonNull String);
     method @RequiresPermission(android.Manifest.permission.DUMP) public void waitForBroadcastIdle();
@@ -127,6 +138,9 @@
     field public static final int PROCESS_CAPABILITY_NONE = 0; // 0x0
     field public static final int PROCESS_STATE_FOREGROUND_SERVICE = 4; // 0x4
     field public static final int PROCESS_STATE_TOP = 2; // 0x2
+    field public static final int STOP_USER_ON_SWITCH_DEFAULT = -1; // 0xffffffff
+    field public static final int STOP_USER_ON_SWITCH_FALSE = 0; // 0x0
+    field public static final int STOP_USER_ON_SWITCH_TRUE = 1; // 0x1
   }
 
   public static class ActivityManager.RunningAppProcessInfo implements android.os.Parcelable {
@@ -140,11 +154,12 @@
   }
 
   public class ActivityOptions {
-    method @NonNull public static android.app.ActivityOptions makeCustomAnimation(@NonNull android.content.Context, int, int, @Nullable android.os.Handler, @Nullable android.app.ActivityOptions.OnAnimationStartedListener, @Nullable android.app.ActivityOptions.OnAnimationFinishedListener);
+    method public boolean isEligibleForLegacyPermissionPrompt();
+    method @NonNull public static android.app.ActivityOptions makeCustomAnimation(@NonNull android.content.Context, int, int, int, @Nullable android.os.Handler, @Nullable android.app.ActivityOptions.OnAnimationStartedListener, @Nullable android.app.ActivityOptions.OnAnimationFinishedListener);
     method @NonNull @RequiresPermission(android.Manifest.permission.START_TASKS_FROM_RECENTS) public static android.app.ActivityOptions makeCustomTaskAnimation(@NonNull android.content.Context, int, int, @Nullable android.os.Handler, @Nullable android.app.ActivityOptions.OnAnimationStartedListener, @Nullable android.app.ActivityOptions.OnAnimationFinishedListener);
+    method public void setEligibleForLegacyPermissionPrompt(boolean);
     method public static void setExitTransitionTimeout(long);
     method public void setLaunchActivityType(int);
-    method public void setLaunchTaskId(int);
     method public void setLaunchWindowingMode(int);
     method public void setLaunchedFromBubble(boolean);
     method public void setTaskAlwaysOnTop(boolean);
@@ -242,12 +257,15 @@
 
   public class BroadcastOptions {
     ctor public BroadcastOptions(@NonNull android.os.Bundle);
-    method public int getMaxManifestReceiverApiLevel();
+    method @Deprecated public int getMaxManifestReceiverApiLevel();
     method public long getTemporaryAppAllowlistDuration();
     method @Nullable public String getTemporaryAppAllowlistReason();
     method public int getTemporaryAppAllowlistReasonCode();
     method public int getTemporaryAppAllowlistType();
-    method public void setMaxManifestReceiverApiLevel(int);
+    method @Deprecated public void setMaxManifestReceiverApiLevel(int);
+    method public boolean testRequireCompatChange(int);
+    field public static final long CHANGE_ALWAYS_DISABLED = 210856463L; // 0xc916a0fL
+    field public static final long CHANGE_ALWAYS_ENABLED = 209888056L; // 0xc82a338L
   }
 
   public class DownloadManager {
@@ -255,14 +273,20 @@
   }
 
   public class DreamManager {
+    method public boolean areDreamsSupported();
     method @RequiresPermission(android.Manifest.permission.READ_DREAM_STATE) public boolean isDreaming();
-    method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void setActiveDream(@NonNull android.content.ComponentName);
+    method public boolean isScreensaverEnabled();
+    method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void setActiveDream(@Nullable android.content.ComponentName);
+    method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void setDreamOverlay(@Nullable android.content.ComponentName);
+    method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setScreensaverEnabled(boolean);
     method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void startDream(@NonNull android.content.ComponentName);
     method @RequiresPermission(android.Manifest.permission.WRITE_DREAM_STATE) public void stopDream();
   }
 
   public final class GameManager {
-    method @RequiresPermission("android.permission.MANAGE_GAME_MODE") public void setGameMode(@NonNull String, int);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_GAME_MODE) public int getGameMode(@NonNull String);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_GAME_MODE) public boolean isAngleEnabled(@NonNull String);
+    method public void setGameServiceProvider(@Nullable String);
   }
 
   public abstract class HomeVisibilityListener {
@@ -275,13 +299,19 @@
     method @RequiresPermission(anyOf={android.Manifest.permission.SET_AND_VERIFY_LOCKSCREEN_CREDENTIALS, "android.permission.ACCESS_KEYGUARD_SECURE_STORAGE"}) public boolean setLock(int, @Nullable byte[], int, @Nullable byte[]);
   }
 
+  public class LocaleManager {
+    method public void setSystemLocales(@NonNull android.os.LocaleList);
+  }
+
   public class Notification implements android.os.Parcelable {
     method public boolean shouldShowForegroundImmediately();
+    field public static final String EXTRA_MEDIA_REMOTE_DEVICE = "android.mediaRemoteDevice";
+    field public static final String EXTRA_MEDIA_REMOTE_ICON = "android.mediaRemoteIcon";
+    field public static final String EXTRA_MEDIA_REMOTE_INTENT = "android.mediaRemoteIntent";
   }
 
   public final class NotificationChannel implements android.os.Parcelable {
     method public int getOriginalImportance();
-    method public boolean isBlockable();
     method public boolean isImportanceLockedByCriticalDeviceFunction();
     method public boolean isImportanceLockedByOEM();
     method public void lockFields(int);
@@ -303,33 +333,66 @@
 
   public class NotificationManager {
     method public void allowAssistantAdjustment(String);
+    method public void cleanUpCallersAfter(long);
     method public void disallowAssistantAdjustment(String);
     method public android.content.ComponentName getEffectsSuppressor();
     method public boolean isNotificationPolicyAccessGrantedForPackage(@NonNull String);
-    method public boolean matchesCallFilter(android.os.Bundle);
     method @RequiresPermission(android.Manifest.permission.MANAGE_NOTIFICATION_LISTENERS) public void setNotificationListenerAccessGranted(@NonNull android.content.ComponentName, boolean, boolean);
     method @RequiresPermission(android.Manifest.permission.MANAGE_TOAST_RATE_LIMITING) public void setToastRateLimitingEnabled(boolean);
     method public void updateNotificationChannel(@NonNull String, int, @NonNull android.app.NotificationChannel);
   }
 
   public final class PendingIntent implements android.os.Parcelable {
+    method public boolean addCancelListener(@NonNull java.util.concurrent.Executor, @NonNull android.app.PendingIntent.CancelListener);
     method @RequiresPermission("android.permission.GET_INTENT_SENDER_INTENT") public boolean intentFilterEquals(@Nullable android.app.PendingIntent);
     method @NonNull @RequiresPermission("android.permission.GET_INTENT_SENDER_INTENT") public java.util.List<android.content.pm.ResolveInfo> queryIntentComponents(int);
+    method public void removeCancelListener(@NonNull android.app.PendingIntent.CancelListener);
     field @Deprecated public static final int FLAG_MUTABLE_UNAUDITED = 33554432; // 0x2000000
   }
 
+  public static interface PendingIntent.CancelListener {
+    method public void onCanceled(@NonNull android.app.PendingIntent);
+  }
+
   public final class PictureInPictureParams implements android.os.Parcelable {
-    method public java.util.List<android.app.RemoteAction> getActions();
-    method public float getAspectRatio();
-    method public android.graphics.Rect getSourceRectHint();
-    method public boolean isSeamlessResizeEnabled();
+    method public float getAspectRatioFloat();
+    method public float getExpandedAspectRatioFloat();
   }
 
   public final class PictureInPictureUiState implements android.os.Parcelable {
     ctor public PictureInPictureUiState(boolean);
   }
 
+  public class PropertyInvalidatedCache<Query, Result> {
+    ctor public PropertyInvalidatedCache(int, @NonNull String, @NonNull String, @NonNull String, @NonNull android.app.PropertyInvalidatedCache.QueryHandler<Query,Result>);
+    method @NonNull public static String createPropertyName(@NonNull String, @NonNull String);
+    method public void disableForCurrentProcess();
+    method public static void disableForCurrentProcess(@NonNull String);
+    method public static void disableForTestMode();
+    method public final void disableInstance();
+    method public final void disableSystemWide();
+    method public final void forgetDisableLocal();
+    method public boolean getDisabledState();
+    method public void invalidateCache();
+    method public static void invalidateCache(@NonNull String, @NonNull String);
+    method public final boolean isDisabled();
+    method @Nullable public Result query(@NonNull Query);
+    method public static void setTestMode(boolean);
+    method public void testPropertyName();
+    field public static final String MODULE_BLUETOOTH = "bluetooth";
+    field public static final String MODULE_SYSTEM = "system_server";
+    field public static final String MODULE_TELEPHONY = "telephony";
+    field public static final String MODULE_TEST = "test";
+  }
+
+  public abstract static class PropertyInvalidatedCache.QueryHandler<Q, R> {
+    ctor public PropertyInvalidatedCache.QueryHandler();
+    method @Nullable public abstract R apply(@NonNull Q);
+    method public boolean shouldBypassCache(@NonNull Q);
+  }
+
   public class StatusBarManager {
+    method public void cancelRequestAddTile(@NonNull String);
     method public void clickNotification(@Nullable String, int, int, boolean);
     method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void collapsePanels();
     method public void expandNotificationsPanel();
@@ -339,6 +402,10 @@
     method @RequiresPermission(android.Manifest.permission.STATUS_BAR) public void togglePanel();
   }
 
+  public static final class StatusBarManager.DisableInfo {
+    method public boolean isRotationSuggestionDisabled();
+  }
+
   public final class SyncNotedAppOp implements android.os.Parcelable {
     ctor public SyncNotedAppOp(int, @IntRange(from=0L) int, @Nullable String, @NonNull String);
   }
@@ -350,6 +417,7 @@
     method @Nullable public android.app.PictureInPictureParams getPictureInPictureParams();
     method @NonNull public android.window.WindowContainerToken getToken();
     method public boolean hasParentTask();
+    method public boolean shouldDockBigOverlays();
   }
 
   public class TimePickerDialog extends android.app.AlertDialog implements android.content.DialogInterface.OnClickListener android.widget.TimePicker.OnTimeChangedListener {
@@ -424,48 +492,38 @@
 package android.app.admin {
 
   public class DevicePolicyManager {
-    method public int checkProvisioningPreCondition(@Nullable String, @NonNull String);
+    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public void acknowledgeNewUserDisclaimer();
+    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void clearOrganizationId();
     method @RequiresPermission(android.Manifest.permission.CLEAR_FREEZE_PERIOD) public void clearSystemUpdatePolicyFreezePeriodRecord();
-    method @Nullable public android.os.UserHandle createAndProvisionManagedProfile(@NonNull android.app.admin.ManagedProfileProvisioningParams) throws android.app.admin.ProvisioningException;
     method @RequiresPermission(android.Manifest.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS) public long forceNetworkLogs();
-    method @RequiresPermission("android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS") public void forceRemoveActiveAdmin(@NonNull android.content.ComponentName, int);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void forceRemoveActiveAdmin(@NonNull android.content.ComponentName, int);
     method @RequiresPermission(android.Manifest.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS) public long forceSecurityLogs();
     method public void forceUpdateUserSetupComplete(int);
     method @NonNull public java.util.Set<java.lang.String> getDefaultCrossProfilePackages();
+    method public int getDeviceOwnerType(@NonNull android.content.ComponentName);
     method @NonNull public java.util.Set<java.lang.String> getDisallowedSystemApps(@NonNull android.content.ComponentName, int, @NonNull String);
     method public long getLastBugReportRequestTime();
     method public long getLastNetworkLogRetrievalTime();
     method public long getLastSecurityLogRetrievalTime();
     method public java.util.List<java.lang.String> getOwnerInstalledCaCerts(@NonNull android.os.UserHandle);
-    method @NonNull @RequiresPermission("android.permission.MANAGE_DEVICE_ADMINS") public java.util.Set<java.lang.String> getPolicyExemptApps();
+    method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public java.util.Set<java.lang.String> getPolicyExemptApps();
     method public boolean isCurrentInputMethodSetByOwner();
     method public boolean isFactoryResetProtectionPolicySupported();
-    method @RequiresPermission(anyOf={"android.permission.MARK_DEVICE_ORGANIZATION_OWNED", "android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS"}, conditional=true) public void markProfileOwnerOnOrganizationOwnedDevice(@NonNull android.content.ComponentName);
+    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.INTERACT_ACROSS_USERS}) public boolean isNewUserDisclaimerAcknowledged();
+    method public boolean isRemovingAdmin(@NonNull android.content.ComponentName, int);
+    method @RequiresPermission(anyOf={android.Manifest.permission.MARK_DEVICE_ORGANIZATION_OWNED, android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS}, conditional=true) public void markProfileOwnerOnOrganizationOwnedDevice(@NonNull android.content.ComponentName);
     method @NonNull public static String operationSafetyReasonToString(int);
     method @NonNull public static String operationToString(int);
-    method @RequiresPermission("android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS") public void provisionFullyManagedDevice(@NonNull android.app.admin.FullyManagedDeviceProvisioningParams) throws android.app.admin.ProvisioningException;
-    method @RequiresPermission("android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS") public void resetDefaultCrossProfileIntentFilters(int);
-    method @RequiresPermission(allOf={"android.permission.MANAGE_DEVICE_ADMINS", android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public void setActiveAdmin(@NonNull android.content.ComponentName, boolean, int);
-    method @RequiresPermission("android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS") public boolean setDeviceOwner(@NonNull android.content.ComponentName, @Nullable String, int);
-    method @RequiresPermission("android.permission.MANAGE_DEVICE_ADMINS") public void setNextOperationSafety(int, int);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public void resetDefaultCrossProfileIntentFilters(int);
+    method @RequiresPermission(allOf={android.Manifest.permission.MANAGE_DEVICE_ADMINS, android.Manifest.permission.INTERACT_ACROSS_USERS_FULL}) public void setActiveAdmin(@NonNull android.content.ComponentName, boolean, int);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public boolean setDeviceOwner(@NonNull android.content.ComponentName, @Nullable String, int);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS) public boolean setDeviceOwnerOnly(@NonNull android.content.ComponentName, @Nullable String, int);
+    method public void setDeviceOwnerType(@NonNull android.content.ComponentName, int);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_DEVICE_ADMINS) public void setNextOperationSafety(int, int);
     field public static final String ACTION_DATA_SHARING_RESTRICTION_APPLIED = "android.app.action.DATA_SHARING_RESTRICTION_APPLIED";
     field public static final String ACTION_DEVICE_POLICY_CONSTANTS_CHANGED = "android.app.action.DEVICE_POLICY_CONSTANTS_CHANGED";
-    field public static final int CODE_ACCOUNTS_NOT_EMPTY = 6; // 0x6
-    field public static final int CODE_CANNOT_ADD_MANAGED_PROFILE = 11; // 0xb
-    field public static final int CODE_DEVICE_ADMIN_NOT_SUPPORTED = 13; // 0xd
-    field public static final int CODE_HAS_DEVICE_OWNER = 1; // 0x1
-    field public static final int CODE_HAS_PAIRED = 8; // 0x8
-    field public static final int CODE_MANAGED_USERS_NOT_SUPPORTED = 9; // 0x9
-    field public static final int CODE_NONSYSTEM_USER_EXISTS = 5; // 0x5
-    field public static final int CODE_NOT_SYSTEM_USER = 7; // 0x7
-    field @Deprecated public static final int CODE_NOT_SYSTEM_USER_SPLIT = 12; // 0xc
-    field public static final int CODE_OK = 0; // 0x0
-    field public static final int CODE_PROVISIONING_NOT_ALLOWED_FOR_NON_DEVELOPER_USERS = 15; // 0xf
-    field @Deprecated public static final int CODE_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER = 14; // 0xe
-    field public static final int CODE_SYSTEM_USER = 10; // 0xa
-    field public static final int CODE_USER_HAS_PROFILE_OWNER = 2; // 0x2
-    field public static final int CODE_USER_NOT_RUNNING = 3; // 0x3
-    field public static final int CODE_USER_SETUP_COMPLETED = 4; // 0x4
+    field public static final int DEVICE_OWNER_TYPE_DEFAULT = 0; // 0x0
+    field public static final int DEVICE_OWNER_TYPE_FINANCED = 1; // 0x1
     field public static final int OPERATION_CLEAR_APPLICATION_USER_DATA = 23; // 0x17
     field public static final int OPERATION_CREATE_AND_MANAGE_USER = 5; // 0x5
     field public static final int OPERATION_INSTALL_CA_CERT = 24; // 0x18
@@ -507,66 +565,7 @@
     field public static final int OPERATION_SWITCH_USER = 2; // 0x2
     field public static final int OPERATION_UNINSTALL_CA_CERT = 40; // 0x28
     field public static final int OPERATION_WIPE_DATA = 8; // 0x8
-    field public static final int PROVISIONING_RESULT_ADMIN_PACKAGE_INSTALLATION_FAILED = 3; // 0x3
-    field public static final int PROVISIONING_RESULT_PRE_CONDITION_FAILED = 1; // 0x1
-    field public static final int PROVISIONING_RESULT_PROFILE_CREATION_FAILED = 2; // 0x2
-    field public static final int PROVISIONING_RESULT_REMOVE_NON_REQUIRED_APPS_FAILED = 6; // 0x6
-    field public static final int PROVISIONING_RESULT_SETTING_PROFILE_OWNER_FAILED = 4; // 0x4
-    field public static final int PROVISIONING_RESULT_SET_DEVICE_OWNER_FAILED = 7; // 0x7
-    field public static final int PROVISIONING_RESULT_STARTING_PROFILE_FAILED = 5; // 0x5
-  }
-
-  public final class FullyManagedDeviceProvisioningParams implements android.os.Parcelable {
-    method public boolean canDeviceOwnerGrantSensorsPermissions();
-    method public int describeContents();
-    method @NonNull public android.content.ComponentName getDeviceAdminComponentName();
-    method public long getLocalTime();
-    method @Nullable public java.util.Locale getLocale();
-    method @NonNull public String getOwnerName();
-    method @Nullable public String getTimeZone();
-    method public boolean isLeaveAllSystemAppsEnabled();
-    method public void logParams(@NonNull String);
-    method public void writeToParcel(@NonNull android.os.Parcel, @Nullable int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.FullyManagedDeviceProvisioningParams> CREATOR;
-  }
-
-  public static final class FullyManagedDeviceProvisioningParams.Builder {
-    ctor public FullyManagedDeviceProvisioningParams.Builder(@NonNull android.content.ComponentName, @NonNull String);
-    method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams build();
-    method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setDeviceOwnerCanGrantSensorsPermissions(boolean);
-    method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setLeaveAllSystemAppsEnabled(boolean);
-    method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setLocalTime(long);
-    method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setLocale(@Nullable java.util.Locale);
-    method @NonNull public android.app.admin.FullyManagedDeviceProvisioningParams.Builder setTimeZone(@Nullable String);
-  }
-
-  public final class ManagedProfileProvisioningParams implements android.os.Parcelable {
-    method public int describeContents();
-    method @Nullable public android.accounts.Account getAccountToMigrate();
-    method @NonNull public String getOwnerName();
-    method @NonNull public android.content.ComponentName getProfileAdminComponentName();
-    method @Nullable public String getProfileName();
-    method public boolean isKeepAccountMigrated();
-    method public boolean isLeaveAllSystemAppsEnabled();
-    method public boolean isOrganizationOwnedProvisioning();
-    method public void logParams(@NonNull String);
-    method public void writeToParcel(@NonNull android.os.Parcel, @Nullable int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.app.admin.ManagedProfileProvisioningParams> CREATOR;
-  }
-
-  public static final class ManagedProfileProvisioningParams.Builder {
-    ctor public ManagedProfileProvisioningParams.Builder(@NonNull android.content.ComponentName, @NonNull String);
-    method @NonNull public android.app.admin.ManagedProfileProvisioningParams build();
-    method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setAccountToMigrate(@Nullable android.accounts.Account);
-    method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setKeepAccountMigrated(boolean);
-    method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setLeaveAllSystemAppsEnabled(boolean);
-    method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setOrganizationOwnedProvisioning(boolean);
-    method @NonNull public android.app.admin.ManagedProfileProvisioningParams.Builder setProfileName(@Nullable String);
-  }
-
-  public class ProvisioningException extends android.util.AndroidException {
-    ctor public ProvisioningException(@NonNull Exception, int);
-    method public int getProvisioningResult();
+    field @Deprecated public static final int STATUS_SPLIT_SYSTEM_USER_DEVICE_SYSTEM_USER = 14; // 0xe
   }
 
   public static final class SecurityLog.SecurityEvent implements android.os.Parcelable {
@@ -582,9 +581,13 @@
 
 package android.app.assist {
 
-  public class ActivityId {
+  public final class ActivityId implements android.os.Parcelable {
+    ctor public ActivityId(int, @Nullable android.os.IBinder);
+    method public int describeContents();
     method public int getTaskId();
     method @Nullable public android.os.IBinder getToken();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.app.assist.ActivityId> CREATOR;
   }
 
 }
@@ -609,6 +612,14 @@
 
 }
 
+package android.app.cloudsearch {
+
+  public static final class SearchRequest.Builder {
+    method @NonNull public android.app.cloudsearch.SearchRequest.Builder setCallerPackageName(@NonNull String);
+  }
+
+}
+
 package android.app.contentsuggestions {
 
   public final class ContentSuggestionsManager {
@@ -629,10 +640,6 @@
 
 package android.app.usage {
 
-  public class NetworkStatsManager {
-    method public void setPollForce(boolean);
-  }
-
   public class StorageStatsManager {
     method public boolean isQuotaSupported(@NonNull java.util.UUID);
     method public boolean isReservedSupported(@NonNull java.util.UUID);
@@ -669,10 +676,10 @@
 
 }
 
-package android.bluetooth {
+package android.companion {
 
-  public final class BluetoothClass implements android.os.Parcelable {
-    method public int getClassOfDevice();
+  public abstract class CompanionDeviceService extends android.app.Service {
+    method public void onBindCompanionDeviceService(@NonNull android.content.Intent);
   }
 
 }
@@ -683,6 +690,7 @@
     ctor public AttributionSource(int, @Nullable String, @Nullable String);
     ctor public AttributionSource(int, @Nullable String, @Nullable String, @NonNull android.os.IBinder);
     ctor public AttributionSource(int, @Nullable String, @Nullable String, @Nullable java.util.Set<java.lang.String>, @Nullable android.content.AttributionSource);
+    method public void enforceCallingPid();
   }
 
   public final class AutofillOptions implements android.os.Parcelable {
@@ -741,6 +749,7 @@
     field public static final String FONT_SERVICE = "font";
     field public static final String POWER_EXEMPTION_SERVICE = "power_exemption";
     field @Deprecated public static final String POWER_WHITELIST_MANAGER = "power_whitelist";
+    field @Deprecated public static final int RECEIVER_EXPORTED_UNAUDITED = 2; // 0x2
     field public static final String TEST_NETWORK_SERVICE = "test_network";
   }
 
@@ -780,6 +789,7 @@
     field public static final float OVERRIDE_MIN_ASPECT_RATIO_LARGE_VALUE = 1.7777778f;
     field public static final long OVERRIDE_MIN_ASPECT_RATIO_MEDIUM = 180326845L; // 0xabf91bdL
     field public static final float OVERRIDE_MIN_ASPECT_RATIO_MEDIUM_VALUE = 1.5f;
+    field public static final long OVERRIDE_MIN_ASPECT_RATIO_PORTRAIT_ONLY = 203647190L; // 0xc2368d6L
     field public static final int RESIZE_MODE_RESIZEABLE = 2; // 0x2
   }
 
@@ -809,16 +819,20 @@
     method @Nullable public String getDefaultTextClassifierPackageName();
     method @RequiresPermission(android.Manifest.permission.INJECT_EVENTS) public android.os.IBinder getHoldLockToken();
     method public abstract int getInstallReason(@NonNull String, @NonNull android.os.UserHandle);
-    method @NonNull public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(int, int);
+    method @Deprecated @NonNull public abstract java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(int, int);
+    method @NonNull public java.util.List<android.content.pm.ApplicationInfo> getInstalledApplicationsAsUser(@NonNull android.content.pm.PackageManager.ApplicationInfoFlags, int);
     method @Nullable public abstract String[] getNamesForUids(int[]);
     method @NonNull public String getPermissionControllerPackageName();
+    method @NonNull public String getSdkSandboxPackageName();
     method @NonNull public abstract String getServicesSystemSharedLibraryPackageName();
     method @NonNull public abstract String getSharedSystemSharedLibraryPackageName();
     method @Nullable public String getSystemTextClassifierPackageName();
     method @Nullable public String getWellbeingPackageName();
     method public void holdLock(android.os.IBinder, int);
+    method @RequiresPermission(android.Manifest.permission.MAKE_UID_VISIBLE) public void makeUidVisible(int, int);
     method @RequiresPermission(android.Manifest.permission.KEEP_UNINSTALLED_PACKAGES) public void setKeepUninstalledPackages(@NonNull java.util.List<java.lang.String>);
     field public static final String FEATURE_ADOPTABLE_STORAGE = "android.software.adoptable_storage";
+    field public static final String FEATURE_COMMUNAL_MODE = "android.software.communal_mode";
     field public static final String FEATURE_FILE_BASED_ENCRYPTION = "android.software.file_based_encryption";
     field public static final String FEATURE_HDMI_CEC = "android.hardware.hdmi.cec";
     field public static final int FLAG_PERMISSION_REVOKE_WHEN_REQUESTED = 128; // 0x80
@@ -995,7 +1009,7 @@
 package android.graphics {
 
   public final class ImageDecoder implements java.lang.AutoCloseable {
-    method @AnyThread @NonNull public static android.graphics.ImageDecoder.Source createSource(android.content.res.Resources, java.io.InputStream, int);
+    method @AnyThread @NonNull public static android.graphics.ImageDecoder.Source createSource(android.content.res.Resources, @NonNull java.io.InputStream, int);
   }
 
   public final class Rect implements android.os.Parcelable {
@@ -1051,13 +1065,13 @@
 
   public final class SensorPrivacyManager {
     method @RequiresPermission(android.Manifest.permission.MANAGE_SENSOR_PRIVACY) public void setSensorPrivacy(int, int, boolean);
-    method @RequiresPermission(android.Manifest.permission.MANAGE_SENSOR_PRIVACY) public void setSensorPrivacyForProfileGroup(int, int, boolean);
   }
 
   public static class SensorPrivacyManager.Sources {
     field public static final int DIALOG = 3; // 0x3
     field public static final int OTHER = 5; // 0x5
     field public static final int QS_TILE = 1; // 0x1
+    field public static final int SAFETY_CENTER = 6; // 0x6
     field public static final int SETTINGS = 2; // 0x2
     field public static final int SHELL = 4; // 0x4
   }
@@ -1133,10 +1147,10 @@
 package android.hardware.devicestate {
 
   public final class DeviceStateManager {
-    method @RequiresPermission(android.Manifest.permission.CONTROL_DEVICE_STATE) public void cancelRequest(@NonNull android.hardware.devicestate.DeviceStateRequest);
+    method @RequiresPermission(value=android.Manifest.permission.CONTROL_DEVICE_STATE, conditional=true) public void cancelStateRequest();
     method @NonNull public int[] getSupportedStates();
     method public void registerCallback(@NonNull java.util.concurrent.Executor, @NonNull android.hardware.devicestate.DeviceStateManager.DeviceStateCallback);
-    method @RequiresPermission(android.Manifest.permission.CONTROL_DEVICE_STATE) public void requestState(@NonNull android.hardware.devicestate.DeviceStateRequest, @Nullable java.util.concurrent.Executor, @Nullable android.hardware.devicestate.DeviceStateRequest.Callback);
+    method @RequiresPermission(value=android.Manifest.permission.CONTROL_DEVICE_STATE, conditional=true) public void requestState(@NonNull android.hardware.devicestate.DeviceStateRequest, @Nullable java.util.concurrent.Executor, @Nullable android.hardware.devicestate.DeviceStateRequest.Callback);
     method public void unregisterCallback(@NonNull android.hardware.devicestate.DeviceStateManager.DeviceStateCallback);
     field public static final int MAXIMUM_DEVICE_STATE = 255; // 0xff
     field public static final int MINIMUM_DEVICE_STATE = 0; // 0x0
@@ -1179,9 +1193,12 @@
 
   public final class DisplayManager {
     method public boolean areUserDisabledHdrTypesAllowed();
+    method @RequiresPermission(android.Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE) public void clearGlobalUserPreferredDisplayMode();
+    method @Nullable public android.view.Display.Mode getGlobalUserPreferredDisplayMode();
     method @NonNull public int[] getUserDisabledHdrTypes();
     method public boolean isMinimalPostProcessingRequested(int);
     method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setAreUserDisabledHdrTypesAllowed(boolean);
+    method @RequiresPermission(android.Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE) public void setGlobalUserPreferredDisplayMode(@NonNull android.view.Display.Mode);
     method @RequiresPermission(android.Manifest.permission.MODIFY_REFRESH_RATE_SWITCHING_TYPE) public void setRefreshRateSwitchingType(int);
     method @RequiresPermission(android.Manifest.permission.OVERRIDE_DISPLAY_MODE_REQUESTS) public void setShouldAlwaysRespectAppRequestedMode(boolean);
     method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setUserDisabledHdrTypes(@NonNull int[]);
@@ -1190,7 +1207,6 @@
     field public static final int SWITCHING_TYPE_NONE = 0; // 0x0
     field public static final int SWITCHING_TYPE_WITHIN_GROUPS = 1; // 0x1
     field public static final int VIRTUAL_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS = 512; // 0x200
-    field public static final int VIRTUAL_DISPLAY_FLAG_TRUSTED = 1024; // 0x400
   }
 
 }
@@ -1218,9 +1234,23 @@
 
 package android.hardware.input {
 
+  public final class InputDeviceIdentifier implements android.os.Parcelable {
+    ctor public InputDeviceIdentifier(@NonNull String, int, int);
+    method public int describeContents();
+    method @NonNull public String getDescriptor();
+    method public int getProductId();
+    method public int getVendorId();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.hardware.input.InputDeviceIdentifier> CREATOR;
+  }
+
   public final class InputManager {
     method public int getBlockUntrustedTouchesMode(@NonNull android.content.Context);
+    method @Nullable public String getCurrentKeyboardLayoutForInputDevice(@NonNull android.hardware.input.InputDeviceIdentifier);
+    method @NonNull public java.util.List<java.lang.String> getKeyboardLayoutDescriptorsForInputDevice(@NonNull android.view.InputDevice);
+    method @RequiresPermission(android.Manifest.permission.SET_KEYBOARD_LAYOUT) public void removeKeyboardLayoutForInputDevice(@NonNull android.hardware.input.InputDeviceIdentifier, @NonNull String);
     method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setBlockUntrustedTouchesMode(@NonNull android.content.Context, int);
+    method @RequiresPermission(android.Manifest.permission.SET_KEYBOARD_LAYOUT) public void setCurrentKeyboardLayoutForInputDevice(@NonNull android.hardware.input.InputDeviceIdentifier, @NonNull String);
     method @RequiresPermission(android.Manifest.permission.WRITE_SECURE_SETTINGS) public void setMaximumObscuringOpacityForTouch(@FloatRange(from=0, to=1) float);
     field public static final long BLOCK_UNTRUSTED_TOUCHES = 158002302L; // 0x96aec7eL
   }
@@ -1265,6 +1295,10 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.hardware.soundtrigger.KeyphraseMetadata> CREATOR;
   }
 
+  public static final class SoundTrigger.KeyphraseRecognitionExtra implements android.os.Parcelable {
+    ctor public SoundTrigger.KeyphraseRecognitionExtra(int, int, int);
+  }
+
   public static final class SoundTrigger.ModelParamRange implements android.os.Parcelable {
     ctor public SoundTrigger.ModelParamRange(int, int);
   }
@@ -1348,7 +1382,7 @@
     method public void setAccumulatedDeltaRangeMeters(double);
     method public void setAccumulatedDeltaRangeState(int);
     method public void setAccumulatedDeltaRangeUncertaintyMeters(double);
-    method public void setAutomaticGainControlLevelInDb(double);
+    method @Deprecated public void setAutomaticGainControlLevelInDb(double);
     method public void setBasebandCn0DbHz(double);
     method @Deprecated public void setCarrierCycles(long);
     method public void setCarrierFrequencyHz(float);
@@ -1375,10 +1409,6 @@
     field public static final int ADR_STATE_ALL = 31; // 0x1f
   }
 
-  public final class GnssMeasurementsEvent implements android.os.Parcelable {
-    ctor public GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]);
-  }
-
   public final class GnssNavigationMessage implements android.os.Parcelable {
     ctor public GnssNavigationMessage();
     method public void reset();
@@ -1403,6 +1433,7 @@
 package android.media {
 
   public final class AudioAttributes implements android.os.Parcelable {
+    method public static int[] getSdkUsages();
     method @NonNull public static String usageToXsdString(int);
     method public static int xsdStringToUsage(@NonNull String);
   }
@@ -1425,12 +1456,21 @@
 
   public class AudioManager {
     method @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public int abandonAudioFocusForTest(@NonNull android.media.AudioFocusRequest, @NonNull String);
+    method @NonNull @RequiresPermission(android.Manifest.permission.CALL_AUDIO_INTERCEPTION) public android.media.AudioRecord getCallDownlinkExtractionAudioRecord(@NonNull android.media.AudioFormat);
+    method @NonNull @RequiresPermission(android.Manifest.permission.CALL_AUDIO_INTERCEPTION) public android.media.AudioTrack getCallUplinkInjectionAudioTrack(@NonNull android.media.AudioFormat);
     method @Nullable public static android.media.AudioDeviceInfo getDeviceInfoFromType(int);
     method @IntRange(from=0) @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public long getFadeOutDurationOnFocusLossMillis(@NonNull android.media.AudioAttributes);
+    method @Nullable public static String getHalVersion();
+    method public static final int[] getPublicStreamTypes();
+    method @NonNull public java.util.List<java.lang.Integer> getReportedSurroundFormats();
+    method public int getStreamMinVolumeInt(int);
     method @NonNull public java.util.Map<java.lang.Integer,java.lang.Boolean> getSurroundFormats();
     method public boolean hasRegisteredDynamicPolicy();
     method @RequiresPermission(anyOf={android.Manifest.permission.MODIFY_AUDIO_ROUTING, android.Manifest.permission.QUERY_AUDIO_STATE}) public boolean isFullVolumeDevice();
+    method @RequiresPermission(android.Manifest.permission.CALL_AUDIO_INTERCEPTION) public boolean isPstnCallAudioInterceptable();
     method @RequiresPermission("android.permission.QUERY_AUDIO_STATE") public int requestAudioFocusForTest(@NonNull android.media.AudioFocusRequest, @NonNull String, int, int);
+    method public void setRampingRingerEnabled(boolean);
+    method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_ROUTING) public void setTestDeviceConnectionState(@NonNull android.media.AudioDeviceAttributes, boolean);
   }
 
   public static final class AudioRecord.MetricsConstants {
@@ -1451,9 +1491,13 @@
     method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS) public static float getMasterBalance();
     method public static final int getNumStreamTypes();
     method @RequiresPermission(android.Manifest.permission.MODIFY_AUDIO_SETTINGS) public static int setMasterBalance(float);
+    method @NonNull public static String streamToString(int);
     field public static final int DEVICE_ROLE_DISABLED = 2; // 0x2
     field public static final int DEVICE_ROLE_NONE = 0; // 0x0
     field public static final int DEVICE_ROLE_PREFERRED = 1; // 0x1
+    field public static final int DIRECT_BITSTREAM_SUPPORTED = 4; // 0x4
+    field public static final int DIRECT_OFFLOAD_GAPLESS_SUPPORTED = 3; // 0x3
+    field public static final int DIRECT_OFFLOAD_SUPPORTED = 1; // 0x1
     field public static final int OFFLOAD_GAPLESS_SUPPORTED = 2; // 0x2
     field public static final int OFFLOAD_SUPPORTED = 1; // 0x1
     field public static final int STREAM_DEFAULT = -1; // 0xffffffff
@@ -1548,6 +1592,13 @@
     method @NonNull public android.media.audiopolicy.AudioPolicy.Builder setIsTestFocusPolicy(boolean);
   }
 
+  public final class AudioProductStrategy implements android.os.Parcelable {
+    method @NonNull public static android.media.AudioAttributes getDefaultAttributes();
+    method public int getLegacyStreamTypeForAudioAttributes(@NonNull android.media.AudioAttributes);
+    method public int getVolumeGroupIdForAudioAttributes(@NonNull android.media.AudioAttributes);
+    method public int getVolumeGroupIdForLegacyStreamType(int);
+  }
+
 }
 
 package android.media.metrics {
@@ -1580,14 +1631,6 @@
 
 package android.net {
 
-  public class EthernetManager {
-    method public void setIncludeTestInterfaces(boolean);
-  }
-
-  public final class IpSecManager {
-    field public static final int INVALID_SECURITY_PARAMETER_INDEX = 0; // 0x0
-  }
-
   public class NetworkPolicyManager {
     method public boolean getRestrictBackground();
     method @RequiresPermission(android.Manifest.permission.OBSERVE_NETWORK_POLICY) public boolean isUidNetworkingBlocked(int, boolean);
@@ -1604,13 +1647,6 @@
     method @Nullable public byte[] getWatchlistConfigHash();
   }
 
-  public class TrafficStats {
-    method public static long getLoopbackRxBytes();
-    method public static long getLoopbackRxPackets();
-    method public static long getLoopbackTxBytes();
-    method public static long getLoopbackTxPackets();
-  }
-
 }
 
 package android.os {
@@ -1685,11 +1721,28 @@
     method @NonNull public static byte[] digest(@NonNull java.io.InputStream, @NonNull String) throws java.io.IOException, java.security.NoSuchAlgorithmException;
   }
 
+  public class IpcDataCache<Query, Result> extends android.app.PropertyInvalidatedCache<Query,Result> {
+    ctor public IpcDataCache(int, @NonNull String, @NonNull String, @NonNull String, @NonNull android.os.IpcDataCache.QueryHandler<Query,Result>);
+    method public static void disableForCurrentProcess(@NonNull String);
+    method public static void invalidateCache(@NonNull String, @NonNull String);
+    field public static final String MODULE_BLUETOOTH = "bluetooth";
+    field public static final String MODULE_SYSTEM = "system_server";
+    field public static final String MODULE_TEST = "test";
+  }
+
+  public abstract static class IpcDataCache.QueryHandler<Q, R> extends android.app.PropertyInvalidatedCache.QueryHandler<Q,R> {
+    ctor public IpcDataCache.QueryHandler();
+  }
+
   public final class MessageQueue {
     method public int postSyncBarrier();
     method public void removeSyncBarrier(int);
   }
 
+  public final class NewUserResponse {
+    ctor public NewUserResponse(@Nullable android.os.UserHandle, int);
+  }
+
   public final class PackageTagsList implements android.os.Parcelable {
     method public boolean contains(@NonNull String, @Nullable String);
     method public boolean contains(@NonNull android.os.PackageTagsList);
@@ -1714,8 +1767,11 @@
 
   public final class Parcel {
     method public boolean allowSquashing();
+    method public int getFlags();
     method public int readExceptionCode();
     method public void restoreAllowSquashing(boolean);
+    field public static final int FLAG_IS_REPLY_FROM_BLOCKING_ALLOWED_OBJECT = 1; // 0x1
+    field public static final int FLAG_PROPAGATE_ALLOW_BLOCKING = 2; // 0x2
   }
 
   public class ParcelFileDescriptor implements java.io.Closeable android.os.Parcelable {
@@ -1723,17 +1779,23 @@
   }
 
   public final class PowerManager {
+    method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_LOW_POWER_STANDBY, android.Manifest.permission.DEVICE_POWER}) public void forceLowPowerStandbyActive(boolean);
     field public static final String ACTION_ENHANCED_DISCHARGE_PREDICTION_CHANGED = "android.os.action.ENHANCED_DISCHARGE_PREDICTION_CHANGED";
+    field @RequiresPermission(android.Manifest.permission.DEVICE_POWER) public static final int SYSTEM_WAKELOCK = -2147483648; // 0x80000000
   }
 
   public class Process {
+    method public static final int getAppUidForSdkSandboxUid(int);
     method public static final int getThreadScheduler(int) throws java.lang.IllegalArgumentException;
+    method public static final boolean isSdkSandboxUid(int);
+    method public static final int toSdkSandboxUid(int);
     field public static final int FIRST_APP_ZYGOTE_ISOLATED_UID = 90000; // 0x15f90
     field public static final int FIRST_ISOLATED_UID = 99000; // 0x182b8
     field public static final int LAST_APP_ZYGOTE_ISOLATED_UID = 98999; // 0x182b7
     field public static final int LAST_ISOLATED_UID = 99999; // 0x1869f
     field public static final int NFC_UID = 1027; // 0x403
     field public static final int NUM_UIDS_PER_APP_ZYGOTE = 100; // 0x64
+    field public static final int SDK_SANDBOX_VIRTUAL_UID = 1090; // 0x442
   }
 
   public final class StrictMode {
@@ -1787,7 +1849,7 @@
     method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createRestrictedProfile(@Nullable String);
     method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public android.content.pm.UserInfo createUser(@Nullable String, @NonNull String, int);
     method @Nullable @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.Set<java.lang.String> getPreInstallableSystemPackages(@NonNull String);
-    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public String getUserType();
+    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS, android.Manifest.permission.QUERY_USERS}) public String getUserType();
     method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public java.util.List<android.content.pm.UserInfo> getUsers(boolean, boolean, boolean);
     method @RequiresPermission(anyOf={android.Manifest.permission.MANAGE_USERS, android.Manifest.permission.CREATE_USERS}) public boolean hasBaseUserRestriction(@NonNull String, @NonNull android.os.UserHandle);
     method public static boolean isGuestUserEphemeral();
@@ -1799,16 +1861,11 @@
     method public int getAudioUsage();
   }
 
-  public static final class VibrationAttributes.Builder {
-    ctor public VibrationAttributes.Builder(@NonNull android.media.AudioAttributes, @Nullable android.os.VibrationEffect);
-  }
-
   public abstract class VibrationEffect implements android.os.Parcelable {
     method public static android.os.VibrationEffect get(int);
     method public static android.os.VibrationEffect get(int, boolean);
     method @Nullable public static android.os.VibrationEffect get(android.net.Uri, android.content.Context);
     method public abstract long getDuration();
-    method @NonNull public static android.os.VibrationEffect.WaveformBuilder startWaveform();
     field public static final int EFFECT_POP = 4; // 0x4
     field public static final int EFFECT_STRENGTH_LIGHT = 0; // 0x0
     field public static final int EFFECT_STRENGTH_MEDIUM = 1; // 0x1
@@ -1819,29 +1876,19 @@
   }
 
   public static final class VibrationEffect.Composed extends android.os.VibrationEffect {
-    method @NonNull public android.os.VibrationEffect.Composed applyEffectStrength(int);
     method public long getDuration();
     method public int getRepeatIndex();
     method @NonNull public java.util.List<android.os.vibrator.VibrationEffectSegment> getSegments();
-    method @NonNull public android.os.VibrationEffect.Composed resolve(int);
-    method @NonNull public android.os.VibrationEffect.Composed scale(float);
-    method public void validate();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.os.VibrationEffect.Composed> CREATOR;
   }
 
-  public static final class VibrationEffect.Composition {
-    method @NonNull public android.os.VibrationEffect.Composition addEffect(@NonNull android.os.VibrationEffect);
-    method @NonNull public android.os.VibrationEffect.Composition addEffect(@NonNull android.os.VibrationEffect, @IntRange(from=0) int);
-  }
-
-  public static final class VibrationEffect.WaveformBuilder {
-    method @NonNull public android.os.VibrationEffect.WaveformBuilder addRamp(@FloatRange(from=0.0f, to=1.0f) float, @IntRange(from=0) int);
-    method @NonNull public android.os.VibrationEffect.WaveformBuilder addRamp(@FloatRange(from=0.0f, to=1.0f) float, @FloatRange(from=-1.0F, to=1.0f) float, @IntRange(from=0) int);
-    method @NonNull public android.os.VibrationEffect.WaveformBuilder addStep(@FloatRange(from=0.0f, to=1.0f) float, @IntRange(from=0) int);
-    method @NonNull public android.os.VibrationEffect.WaveformBuilder addStep(@FloatRange(from=0.0f, to=1.0f) float, @FloatRange(from=-1.0F, to=1.0f) float, @IntRange(from=0) int);
-    method @NonNull public android.os.VibrationEffect build();
-    method @NonNull public android.os.VibrationEffect build(int);
+  public abstract class Vibrator {
+    method public int getDefaultVibrationIntensity(int);
+    field public static final int VIBRATION_INTENSITY_HIGH = 3; // 0x3
+    field public static final int VIBRATION_INTENSITY_LOW = 1; // 0x1
+    field public static final int VIBRATION_INTENSITY_MEDIUM = 2; // 0x2
+    field public static final int VIBRATION_INTENSITY_OFF = 0; // 0x0
   }
 
   public class VintfObject {
@@ -1941,10 +1988,15 @@
   }
 
   public class StorageManager {
+    method public long computeStorageCacheBytes(@NonNull java.io.File);
     method @NonNull public static java.util.UUID convert(@NonNull String);
     method @NonNull public static String convert(@NonNull java.util.UUID);
+    method @Nullable public String getCloudMediaProvider();
     method public boolean isAppIoBlocked(@NonNull java.util.UUID, int, int, int);
     method public static boolean isUserKeyUnlocked(int);
+    field public static final String CACHE_RESERVE_PERCENT_HIGH_KEY = "cache_reserve_percent_high";
+    field public static final String CACHE_RESERVE_PERCENT_LOW_KEY = "cache_reserve_percent_low";
+    field public static final String STORAGE_THRESHOLD_PERCENT_HIGH_KEY = "storage_threshold_percent_high";
   }
 
   public final class StorageVolume implements android.os.Parcelable {
@@ -1973,72 +2025,47 @@
 package android.os.vibrator {
 
   public final class PrebakedSegment extends android.os.vibrator.VibrationEffectSegment {
-    method @NonNull public android.os.vibrator.PrebakedSegment applyEffectStrength(int);
     method public int describeContents();
     method public long getDuration();
     method public int getEffectId();
     method public int getEffectStrength();
-    method public boolean hasNonZeroAmplitude();
-    method @NonNull public android.os.vibrator.PrebakedSegment resolve(int);
-    method @NonNull public android.os.vibrator.PrebakedSegment scale(float);
     method public boolean shouldFallback();
-    method public void validate();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.os.vibrator.PrebakedSegment> CREATOR;
   }
 
   public final class PrimitiveSegment extends android.os.vibrator.VibrationEffectSegment {
-    method @NonNull public android.os.vibrator.PrimitiveSegment applyEffectStrength(int);
     method public int describeContents();
     method public int getDelay();
     method public long getDuration();
     method public int getPrimitiveId();
     method public float getScale();
-    method public boolean hasNonZeroAmplitude();
-    method @NonNull public android.os.vibrator.PrimitiveSegment resolve(int);
-    method @NonNull public android.os.vibrator.PrimitiveSegment scale(float);
-    method public void validate();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.os.vibrator.PrimitiveSegment> CREATOR;
   }
 
   public final class RampSegment extends android.os.vibrator.VibrationEffectSegment {
-    method @NonNull public android.os.vibrator.RampSegment applyEffectStrength(int);
     method public int describeContents();
     method public long getDuration();
     method public float getEndAmplitude();
-    method public float getEndFrequency();
+    method public float getEndFrequencyHz();
     method public float getStartAmplitude();
-    method public float getStartFrequency();
-    method public boolean hasNonZeroAmplitude();
-    method @NonNull public android.os.vibrator.RampSegment resolve(int);
-    method @NonNull public android.os.vibrator.RampSegment scale(float);
-    method public void validate();
+    method public float getStartFrequencyHz();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.os.vibrator.RampSegment> CREATOR;
   }
 
   public final class StepSegment extends android.os.vibrator.VibrationEffectSegment {
-    method @NonNull public android.os.vibrator.StepSegment applyEffectStrength(int);
     method public int describeContents();
     method public float getAmplitude();
     method public long getDuration();
-    method public float getFrequency();
-    method public boolean hasNonZeroAmplitude();
-    method @NonNull public android.os.vibrator.StepSegment resolve(int);
-    method @NonNull public android.os.vibrator.StepSegment scale(float);
-    method public void validate();
+    method public float getFrequencyHz();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.os.vibrator.StepSegment> CREATOR;
   }
 
   public abstract class VibrationEffectSegment implements android.os.Parcelable {
-    method @NonNull public abstract <T extends android.os.vibrator.VibrationEffectSegment> T applyEffectStrength(int);
     method public abstract long getDuration();
-    method public abstract boolean hasNonZeroAmplitude();
-    method @NonNull public abstract <T extends android.os.vibrator.VibrationEffectSegment> T resolve(int);
-    method @NonNull public abstract <T extends android.os.vibrator.VibrationEffectSegment> T scale(float);
-    method public abstract void validate();
     field @NonNull public static final android.os.Parcelable.Creator<android.os.vibrator.VibrationEffectSegment> CREATOR;
   }
 
@@ -2046,17 +2073,6 @@
 
 package android.permission {
 
-  public final class PermGroupUsage {
-    ctor public PermGroupUsage(@NonNull String, int, @NonNull String, long, boolean, boolean, @Nullable CharSequence);
-    method @Nullable public CharSequence getAttribution();
-    method public long getLastAccess();
-    method @NonNull public String getPackageName();
-    method @NonNull public String getPermGroupName();
-    method public int getUid();
-    method public boolean isActive();
-    method public boolean isPhoneCall();
-  }
-
   public final class PermissionControllerManager {
     method @RequiresPermission(android.Manifest.permission.GET_RUNTIME_PERMISSIONS) public void countPermissionApps(@NonNull java.util.List<java.lang.String>, int, @NonNull android.permission.PermissionControllerManager.OnCountPermissionAppsResultCallback, @Nullable android.os.Handler);
     method @RequiresPermission(android.Manifest.permission.GET_RUNTIME_PERMISSIONS) public void getAppPermissions(@NonNull String, @NonNull android.permission.PermissionControllerManager.OnGetAppPermissionResultCallback, @Nullable android.os.Handler);
@@ -2072,9 +2088,10 @@
   }
 
   public final class PermissionManager {
-    method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.permission.PermGroupUsage> getIndicatorAppOpUsageData();
-    method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.permission.PermGroupUsage> getIndicatorAppOpUsageData(boolean);
+    method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.permission.PermissionGroupUsage> getIndicatorAppOpUsageData();
+    method @NonNull @RequiresPermission(android.Manifest.permission.GET_APP_OPS_STATS) public java.util.List<android.permission.PermissionGroupUsage> getIndicatorAppOpUsageData(boolean);
     method @NonNull public android.content.AttributionSource registerAttributionSource(@NonNull android.content.AttributionSource);
+    method @RequiresPermission(android.Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL) public void revokePostNotificationPermissionWithoutKillForTest(@NonNull String, int);
   }
 
 }
@@ -2112,7 +2129,7 @@
   }
 
   public static final class ContactsContract.CommonDataKinds.Phone implements android.provider.ContactsContract.CommonDataKinds.CommonColumns android.provider.ContactsContract.DataColumnsWithJoins {
-    field public static final android.net.Uri ENTERPRISE_CONTENT_URI;
+    field @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS) public static final android.net.Uri ENTERPRISE_CONTENT_URI;
   }
 
   public static final class ContactsContract.PinnedPositions {
@@ -2130,6 +2147,7 @@
     field public static final String NAMESPACE_CONSTRAIN_DISPLAY_APIS = "constrain_display_apis";
     field public static final String NAMESPACE_DEVICE_IDLE = "device_idle";
     field public static final String NAMESPACE_JOB_SCHEDULER = "jobscheduler";
+    field public static final String NAMESPACE_SELECTION_TOOLBAR = "selection_toolbar";
   }
 
   public final class Settings {
@@ -2154,8 +2172,12 @@
     field @Deprecated public static final String NOTIFICATION_BUBBLES = "notification_bubbles";
     field public static final String OVERLAY_DISPLAY_DEVICES = "overlay_display_devices";
     field public static final String SHOW_FIRST_CRASH_DIALOG = "show_first_crash_dialog";
+    field public static final String STYLUS_HANDWRITING_ENABLED = "stylus_handwriting_enabled";
     field public static final String USER_DISABLED_HDR_FORMATS = "user_disabled_hdr_formats";
-    field public static final String USE_OPEN_WIFI_PACKAGE = "use_open_wifi_package";
+    field public static final String USER_PREFERRED_REFRESH_RATE = "user_preferred_refresh_rate";
+    field public static final String USER_PREFERRED_RESOLUTION_HEIGHT = "user_preferred_resolution_height";
+    field public static final String USER_PREFERRED_RESOLUTION_WIDTH = "user_preferred_resolution_width";
+    field @Deprecated public static final String USE_OPEN_WIFI_PACKAGE = "use_open_wifi_package";
   }
 
   public static final class Settings.Secure extends android.provider.Settings.NameValueTable {
@@ -2201,8 +2223,8 @@
   }
 
   public class KeyStoreException extends java.lang.Exception {
-    ctor public KeyStoreException(int, String);
     method public int getErrorCode();
+    method public static boolean hasFailureInfoForError(int);
   }
 
 }
@@ -2337,6 +2359,20 @@
 
 }
 
+package android.service.dreams {
+
+  public abstract class DreamOverlayService extends android.app.Service {
+    ctor public DreamOverlayService();
+    method @Nullable public final CharSequence getDreamLabel();
+    method public final boolean isPreviewMode();
+    method @Nullable public final android.os.IBinder onBind(@NonNull android.content.Intent);
+    method public abstract void onStartDream(@NonNull android.view.WindowManager.LayoutParams);
+    method public final void requestExit();
+    method public final boolean shouldShowComplications();
+  }
+
+}
+
 package android.service.notification {
 
   @Deprecated public abstract class ConditionProviderService extends android.app.Service {
@@ -2356,12 +2392,14 @@
     method public void disconnect();
     method public void getWalletCards(@NonNull android.service.quickaccesswallet.GetWalletCardsRequest, @NonNull android.service.quickaccesswallet.QuickAccessWalletClient.OnWalletCardsRetrievedCallback);
     method public void getWalletCards(@NonNull java.util.concurrent.Executor, @NonNull android.service.quickaccesswallet.GetWalletCardsRequest, @NonNull android.service.quickaccesswallet.QuickAccessWalletClient.OnWalletCardsRetrievedCallback);
+    method public void getWalletPendingIntent(@NonNull java.util.concurrent.Executor, @NonNull android.service.quickaccesswallet.QuickAccessWalletClient.WalletPendingIntentCallback);
     method public boolean isWalletFeatureAvailable();
     method public boolean isWalletFeatureAvailableWhenDeviceLocked();
     method public boolean isWalletServiceAvailable();
     method public void notifyWalletDismissed();
     method public void removeWalletServiceEventListener(@NonNull android.service.quickaccesswallet.QuickAccessWalletClient.WalletServiceEventListener);
     method public void selectWalletCard(@NonNull android.service.quickaccesswallet.SelectWalletCardRequest);
+    method public boolean useTargetActivityForQuickAccess();
   }
 
   public static interface QuickAccessWalletClient.OnWalletCardsRetrievedCallback {
@@ -2369,6 +2407,10 @@
     method public void onWalletCardsRetrieved(@NonNull android.service.quickaccesswallet.GetWalletCardsResponse);
   }
 
+  public static interface QuickAccessWalletClient.WalletPendingIntentCallback {
+    method public void onWalletPendingIntentRetrieved(@Nullable android.app.PendingIntent);
+  }
+
   public static interface QuickAccessWalletClient.WalletServiceEventListener {
     method public void onWalletServiceEvent(@NonNull android.service.quickaccesswallet.WalletServiceEvent);
   }
@@ -2389,6 +2431,23 @@
     method @RequiresPermission(allOf={android.Manifest.permission.RECORD_AUDIO, android.Manifest.permission.CAPTURE_AUDIO_HOTWORD}) public void triggerHardwareRecognitionEventForTest(int, int, boolean, int, int, int, boolean, @NonNull android.media.AudioFormat, @Nullable byte[]);
   }
 
+  public static final class AlwaysOnHotwordDetector.EventPayload.Builder {
+    ctor public AlwaysOnHotwordDetector.EventPayload.Builder();
+    method @NonNull public android.service.voice.AlwaysOnHotwordDetector.EventPayload build();
+    method @NonNull public android.service.voice.AlwaysOnHotwordDetector.EventPayload.Builder setAudioStream(@NonNull android.os.ParcelFileDescriptor);
+    method @NonNull public android.service.voice.AlwaysOnHotwordDetector.EventPayload.Builder setCaptureAudioFormat(@NonNull android.media.AudioFormat);
+    method @NonNull public android.service.voice.AlwaysOnHotwordDetector.EventPayload.Builder setCaptureAvailable(boolean);
+    method @NonNull public android.service.voice.AlwaysOnHotwordDetector.EventPayload.Builder setCaptureSession(int);
+    method @NonNull public android.service.voice.AlwaysOnHotwordDetector.EventPayload.Builder setData(@NonNull byte[]);
+    method @NonNull public android.service.voice.AlwaysOnHotwordDetector.EventPayload.Builder setDataFormat(int);
+    method @NonNull public android.service.voice.AlwaysOnHotwordDetector.EventPayload.Builder setHotwordDetectedResult(@NonNull android.service.voice.HotwordDetectedResult);
+    method @NonNull public android.service.voice.AlwaysOnHotwordDetector.EventPayload.Builder setKeyphraseRecognitionExtras(@NonNull java.util.List<android.hardware.soundtrigger.SoundTrigger.KeyphraseRecognitionExtra>);
+  }
+
+  public final class VisibleActivityInfo implements android.os.Parcelable {
+    ctor public VisibleActivityInfo(int, @NonNull android.os.IBinder);
+  }
+
 }
 
 package android.service.watchdog {
@@ -2505,11 +2564,11 @@
     method @NonNull public java.util.List<android.telephony.data.ApnSetting> getDevicePolicyOverrideApns(@NonNull android.content.Context);
     method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public String getLine1AlphaTag();
     method public android.util.Pair<java.lang.Integer,java.lang.Integer> getRadioHalVersion();
-    method @RequiresPermission(android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE) public long getSupportedRadioAccessFamily();
     method public boolean modifyDevicePolicyOverrideApn(@NonNull android.content.Context, int, @NonNull android.telephony.data.ApnSetting);
     method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void refreshUiccProfile();
     method @Deprecated public void setCarrierTestOverride(String, String, String, String, String, String, String);
     method public void setCarrierTestOverride(String, String, String, String, String, String, String, String, String);
+    method @RequiresPermission(android.Manifest.permission.BIND_TELECOM_CONNECTION_SERVICE) public void setVoiceServiceStateOverride(boolean);
     field public static final int UNKNOWN_CARRIER_ID_LIST_VERSION = -1; // 0xffffffff
   }
 
@@ -2722,10 +2781,15 @@
   }
 
   public final class Display {
+    method @RequiresPermission(android.Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE) public void clearUserPreferredDisplayMode();
+    method @NonNull public android.view.Display.Mode getDefaultMode();
     method @NonNull public int[] getReportedHdrTypes();
     method @NonNull public android.graphics.ColorSpace[] getSupportedWideColorGamut();
+    method @Nullable public android.view.Display.Mode getSystemPreferredDisplayMode();
     method public int getType();
+    method @Nullable public android.view.Display.Mode getUserPreferredDisplayMode();
     method public boolean hasAccess(int);
+    method @RequiresPermission(android.Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE) public void setUserPreferredDisplayMode(@NonNull android.view.Display.Mode);
     field public static final int FLAG_TRUSTED = 128; // 0x80
     field public static final int TYPE_EXTERNAL = 2; // 0x2
     field public static final int TYPE_INTERNAL = 1; // 0x1
@@ -2735,6 +2799,18 @@
     field public static final int TYPE_WIFI = 3; // 0x3
   }
 
+  public static final class Display.Mode implements android.os.Parcelable {
+    ctor public Display.Mode(int, int, float);
+    method public boolean matches(int, int, float);
+  }
+
+  public static final class Display.Mode.Builder {
+    ctor public Display.Mode.Builder();
+    method @NonNull public android.view.Display.Mode build();
+    method @NonNull public android.view.Display.Mode.Builder setRefreshRate(float);
+    method @NonNull public android.view.Display.Mode.Builder setResolution(int, int);
+  }
+
   public class FocusFinder {
     method public static void sort(android.view.View[], int, int, android.view.ViewGroup, boolean);
   }
@@ -2742,13 +2818,14 @@
   public final class InputDevice implements android.os.Parcelable {
     method @RequiresPermission("android.permission.DISABLE_INPUT_DEVICE") public void disable();
     method @RequiresPermission("android.permission.DISABLE_INPUT_DEVICE") public void enable();
+    method @NonNull public android.hardware.input.InputDeviceIdentifier getIdentifier();
   }
 
   public class KeyEvent extends android.view.InputEvent implements android.os.Parcelable {
     method public static String actionToString(int);
     method public final void setDisplayId(int);
     field public static final int FLAG_IS_ACCESSIBILITY_EVENT = 2048; // 0x800
-    field public static final int LAST_KEYCODE = 288; // 0x120
+    field public static final int LAST_KEYCODE = 304; // 0x130
   }
 
   public final class KeyboardShortcutGroup implements android.os.Parcelable {
@@ -2774,11 +2851,9 @@
 
   public final class SurfaceControl implements android.os.Parcelable {
     ctor public SurfaceControl(@NonNull android.view.SurfaceControl, @NonNull String);
-    method public static long acquireFrameRateFlexibilityToken();
     method @NonNull public static android.os.IBinder getInternalDisplayToken();
     method public boolean isSameSurface(@NonNull android.view.SurfaceControl);
     method public static void overrideHdrTypes(@NonNull android.os.IBinder, @NonNull int[]);
-    method public static void releaseFrameRateFlexibilityToken(long);
   }
 
   public class SurfaceControlViewHost {
@@ -2811,6 +2886,7 @@
     method public static int getHoverTooltipHideTimeout();
     method public static int getHoverTooltipShowTimeout();
     method public static int getLongPressTooltipHideTimeout();
+    method public int getPreferKeepClearForFocusDelay();
   }
 
   public class ViewDebug {
@@ -2831,6 +2907,7 @@
     method public default void setShouldShowSystemDecors(int, boolean);
     method public default void setShouldShowWithInsecureKeyguard(int, boolean);
     method public default boolean shouldShowSystemDecors(int);
+    method @Nullable public default android.graphics.Bitmap snapshotTaskForRecents(@IntRange(from=0) int);
     field public static final int DISPLAY_IME_POLICY_FALLBACK_DISPLAY = 1; // 0x1
     field public static final int DISPLAY_IME_POLICY_HIDE = 2; // 0x2
     field public static final int DISPLAY_IME_POLICY_LOCAL = 0; // 0x0
@@ -2840,6 +2917,7 @@
     method @Nullable public final android.os.IBinder getWindowContextToken();
     method public final void setWindowContextToken(@NonNull android.os.IBinder);
     field public static final int ACCESSIBILITY_TITLE_CHANGED = 33554432; // 0x2000000
+    field public static final int FLAG_SLIPPERY = 536870912; // 0x20000000
     field public static final int PRIVATE_FLAG_NO_MOVE_ANIMATION = 64; // 0x40
     field public CharSequence accessibilityTitle;
     field public int privateFlags;
@@ -2850,20 +2928,13 @@
 package android.view.accessibility {
 
   public final class AccessibilityManager {
-    method public void addAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener, @Nullable android.os.Handler);
     method @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ACCESSIBILITY) public java.util.List<java.lang.String> getAccessibilityShortcutTargets(int);
-    method public void removeAccessibilityServicesStateChangeListener(@NonNull android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener);
-  }
-
-  public static interface AccessibilityManager.AccessibilityServicesStateChangeListener {
-    method public void onAccessibilityServicesStateChanged(android.view.accessibility.AccessibilityManager);
   }
 
   public class AccessibilityNodeInfo implements android.os.Parcelable {
     method public void addChild(@NonNull android.os.IBinder);
     method public long getSourceNodeId();
     method public void setLeashedParent(@Nullable android.os.IBinder, int);
-    method public static void setNumInstancesInUseCounter(java.util.concurrent.atomic.AtomicInteger);
     method public void writeToParcelNoRecycle(android.os.Parcel, int);
   }
 
@@ -2871,6 +2942,10 @@
     method public long getAccessibilityIdForRegion(@NonNull android.graphics.Region);
   }
 
+  public class AccessibilityRecord {
+    method public void setDisplayId(int);
+  }
+
   public final class AccessibilityWindowInfo implements android.os.Parcelable {
     method public static void setNumInstancesInUseCounter(java.util.concurrent.atomic.AtomicInteger);
   }
@@ -2899,6 +2974,8 @@
   }
 
   public final class AutofillManager {
+    field public static final String DEVICE_CONFIG_AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES = "compat_mode_allowed_packages";
+    field public static final String DEVICE_CONFIG_AUTOFILL_DIALOG_ENABLED = "autofill_dialog_enabled";
     field public static final String DEVICE_CONFIG_AUTOFILL_SMART_SUGGESTION_SUPPORTED_MODES = "smart_suggestion_supported_modes";
     field public static final int FLAG_SMART_SUGGESTION_OFF = 0; // 0x0
     field public static final int FLAG_SMART_SUGGESTION_SYSTEM = 1; // 0x1
@@ -2919,6 +2996,7 @@
     field public static final String DEVICE_CONFIG_PROPERTY_MAX_BUFFER_SIZE = "max_buffer_size";
     field public static final String DEVICE_CONFIG_PROPERTY_SERVICE_EXPLICITLY_ENABLED = "service_explicitly_enabled";
     field public static final String DEVICE_CONFIG_PROPERTY_TEXT_CHANGE_FLUSH_FREQUENCY = "text_change_flush_frequency";
+    field public static final String DUMPABLE_NAME = "ContentCaptureManager";
     field public static final int LOGGING_LEVEL_DEBUG = 1; // 0x1
     field public static final int LOGGING_LEVEL_OFF = 0; // 0x0
     field public static final int LOGGING_LEVEL_VERBOSE = 2; // 0x2
@@ -3020,6 +3098,7 @@
     method @NonNull @RequiresPermission(android.Manifest.permission.INTERACT_ACROSS_USERS_FULL) public java.util.List<android.view.inputmethod.InputMethodInfo> getInputMethodListAsUser(int);
     method public boolean hasActiveInputConnection(@Nullable android.view.View);
     method public boolean isInputMethodPickerShown();
+    field public static final long CLEAR_SHOW_FORCED_FLAG_WHEN_LEAVING = 214016041L; // 0xcc1a029L
   }
 
 }
@@ -3180,16 +3259,12 @@
     field public static final int FEATURE_WINDOW_TOKENS = 2; // 0x2
   }
 
-  public final class SplashScreenView extends android.widget.FrameLayout {
-    method @Nullable public android.view.View getBrandingView();
-    method @ColorInt public int getIconBackgroundColor();
+  public interface OnBackInvokedDispatcher {
+    field public static final long DISPATCH_BACK_INVOCATION_AHEAD_OF_TIME = 195946584L; // 0xbade858L
   }
 
-  public final class StartingWindowInfo implements android.os.Parcelable {
-    ctor public StartingWindowInfo();
-    method public int describeContents();
-    method public void writeToParcel(@NonNull android.os.Parcel, int);
-    field @NonNull public static final android.os.Parcelable.Creator<android.window.StartingWindowInfo> CREATOR;
+  public final class SplashScreenView extends android.widget.FrameLayout {
+    method @Nullable public android.view.View getBrandingView();
   }
 
   public final class TaskAppearedInfo implements android.os.Parcelable {
@@ -3201,9 +3276,57 @@
     field @NonNull public static final android.os.Parcelable.Creator<android.window.TaskAppearedInfo> CREATOR;
   }
 
+  public final class TaskFragmentCreationParams implements android.os.Parcelable {
+    method @NonNull public android.os.IBinder getFragmentToken();
+    method @NonNull public android.graphics.Rect getInitialBounds();
+    method @NonNull public android.window.TaskFragmentOrganizerToken getOrganizer();
+    method @NonNull public android.os.IBinder getOwnerToken();
+    method public int getWindowingMode();
+    field @NonNull public static final android.os.Parcelable.Creator<android.window.TaskFragmentCreationParams> CREATOR;
+  }
+
+  public static final class TaskFragmentCreationParams.Builder {
+    ctor public TaskFragmentCreationParams.Builder(@NonNull android.window.TaskFragmentOrganizerToken, @NonNull android.os.IBinder, @NonNull android.os.IBinder);
+    method @NonNull public android.window.TaskFragmentCreationParams build();
+    method @NonNull public android.window.TaskFragmentCreationParams.Builder setInitialBounds(@NonNull android.graphics.Rect);
+    method @NonNull public android.window.TaskFragmentCreationParams.Builder setWindowingMode(int);
+  }
+
+  public final class TaskFragmentInfo implements android.os.Parcelable {
+    method public boolean equalsForTaskFragmentOrganizer(@Nullable android.window.TaskFragmentInfo);
+    method @NonNull public java.util.List<android.os.IBinder> getActivities();
+    method @NonNull public android.content.res.Configuration getConfiguration();
+    method @NonNull public android.os.IBinder getFragmentToken();
+    method @NonNull public android.graphics.Point getPositionInParent();
+    method public int getRunningActivityCount();
+    method @NonNull public android.window.WindowContainerToken getToken();
+    method public int getWindowingMode();
+    method public boolean hasRunningActivity();
+    method public boolean isEmpty();
+    method public boolean isTaskClearedForReuse();
+    method public boolean isVisible();
+    field @NonNull public static final android.os.Parcelable.Creator<android.window.TaskFragmentInfo> CREATOR;
+  }
+
+  public class TaskFragmentOrganizer extends android.window.WindowOrganizer {
+    ctor public TaskFragmentOrganizer(@NonNull java.util.concurrent.Executor);
+    method @NonNull public java.util.concurrent.Executor getExecutor();
+    method @NonNull public android.window.TaskFragmentOrganizerToken getOrganizerToken();
+    method public void onTaskFragmentAppeared(@NonNull android.window.TaskFragmentInfo);
+    method public void onTaskFragmentError(@NonNull android.os.IBinder, @NonNull Throwable);
+    method public void onTaskFragmentInfoChanged(@NonNull android.window.TaskFragmentInfo);
+    method public void onTaskFragmentParentInfoChanged(@NonNull android.os.IBinder, @NonNull android.content.res.Configuration);
+    method public void onTaskFragmentVanished(@NonNull android.window.TaskFragmentInfo);
+    method @CallSuper public void registerOrganizer();
+    method @CallSuper public void unregisterOrganizer();
+  }
+
+  public final class TaskFragmentOrganizerToken implements android.os.Parcelable {
+    field @NonNull public static final android.os.Parcelable.Creator<android.window.TaskFragmentOrganizerToken> CREATOR;
+  }
+
   public class TaskOrganizer extends android.window.WindowOrganizer {
     ctor public TaskOrganizer();
-    method @BinderThread public void addStartingWindow(@NonNull android.window.StartingWindowInfo, @NonNull android.os.IBinder);
     method @BinderThread public void copySplashScreenView(int);
     method @Nullable @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void createRootTask(int, int, @Nullable android.os.IBinder);
     method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public boolean deleteRootTask(@NonNull android.window.WindowContainerToken);
@@ -3216,7 +3339,6 @@
     method @BinderThread public void onTaskInfoChanged(@NonNull android.app.ActivityManager.RunningTaskInfo);
     method @BinderThread public void onTaskVanished(@NonNull android.app.ActivityManager.RunningTaskInfo);
     method @CallSuper @NonNull @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public java.util.List<android.window.TaskAppearedInfo> registerOrganizer();
-    method @BinderThread public void removeStartingWindow(int, @Nullable android.view.SurfaceControl, @Nullable android.graphics.Rect, boolean);
     method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void setInterceptBackPressedOnTaskRoot(@NonNull android.window.WindowContainerToken, boolean);
     method @CallSuper @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void unregisterOrganizer();
   }
@@ -3229,26 +3351,42 @@
 
   public final class WindowContainerTransaction implements android.os.Parcelable {
     ctor public WindowContainerTransaction();
+    method @NonNull public android.window.WindowContainerTransaction createTaskFragment(@NonNull android.window.TaskFragmentCreationParams);
+    method @NonNull public android.window.WindowContainerTransaction deleteTaskFragment(@NonNull android.window.WindowContainerToken);
     method public int describeContents();
     method @NonNull public android.window.WindowContainerTransaction reorder(@NonNull android.window.WindowContainerToken, boolean);
     method @NonNull public android.window.WindowContainerTransaction reparent(@NonNull android.window.WindowContainerToken, @Nullable android.window.WindowContainerToken, boolean);
+    method @NonNull public android.window.WindowContainerTransaction reparentActivityToTaskFragment(@NonNull android.os.IBinder, @NonNull android.os.IBinder);
+    method @NonNull public android.window.WindowContainerTransaction reparentChildren(@NonNull android.window.WindowContainerToken, @Nullable android.window.WindowContainerToken);
     method @NonNull public android.window.WindowContainerTransaction reparentTasks(@Nullable android.window.WindowContainerToken, @Nullable android.window.WindowContainerToken, @Nullable int[], @Nullable int[], boolean);
     method @NonNull public android.window.WindowContainerTransaction scheduleFinishEnterPip(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);
     method @NonNull public android.window.WindowContainerTransaction setActivityWindowingMode(@NonNull android.window.WindowContainerToken, int);
-    method @NonNull public android.window.WindowContainerTransaction setAdjacentRoots(@NonNull android.window.WindowContainerToken, @NonNull android.window.WindowContainerToken);
+    method @NonNull public android.window.WindowContainerTransaction setAdjacentRoots(@NonNull android.window.WindowContainerToken, @NonNull android.window.WindowContainerToken, boolean);
+    method @NonNull public android.window.WindowContainerTransaction setAdjacentTaskFragments(@NonNull android.os.IBinder, @Nullable android.os.IBinder, @Nullable android.window.WindowContainerTransaction.TaskFragmentAdjacentParams);
     method @NonNull public android.window.WindowContainerTransaction setAppBounds(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);
     method @NonNull public android.window.WindowContainerTransaction setBounds(@NonNull android.window.WindowContainerToken, @NonNull android.graphics.Rect);
     method @NonNull public android.window.WindowContainerTransaction setBoundsChangeTransaction(@NonNull android.window.WindowContainerToken, @NonNull android.view.SurfaceControl.Transaction);
+    method @NonNull public android.window.WindowContainerTransaction setErrorCallbackToken(@NonNull android.os.IBinder);
     method @NonNull public android.window.WindowContainerTransaction setFocusable(@NonNull android.window.WindowContainerToken, boolean);
     method @NonNull public android.window.WindowContainerTransaction setHidden(@NonNull android.window.WindowContainerToken, boolean);
     method @NonNull public android.window.WindowContainerTransaction setLaunchRoot(@NonNull android.window.WindowContainerToken, @Nullable int[], @Nullable int[]);
     method @NonNull public android.window.WindowContainerTransaction setScreenSizeDp(@NonNull android.window.WindowContainerToken, int, int);
     method @NonNull public android.window.WindowContainerTransaction setSmallestScreenWidthDp(@NonNull android.window.WindowContainerToken, int);
     method @NonNull public android.window.WindowContainerTransaction setWindowingMode(@NonNull android.window.WindowContainerToken, int);
+    method @NonNull public android.window.WindowContainerTransaction startActivityInTaskFragment(@NonNull android.os.IBinder, @NonNull android.os.IBinder, @NonNull android.content.Intent, @Nullable android.os.Bundle);
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.window.WindowContainerTransaction> CREATOR;
   }
 
+  public static class WindowContainerTransaction.TaskFragmentAdjacentParams {
+    ctor public WindowContainerTransaction.TaskFragmentAdjacentParams();
+    ctor public WindowContainerTransaction.TaskFragmentAdjacentParams(@NonNull android.os.Bundle);
+    method public void setShouldDelayPrimaryLastActivityRemoval(boolean);
+    method public void setShouldDelaySecondaryLastActivityRemoval(boolean);
+    method public boolean shouldDelayPrimaryLastActivityRemoval();
+    method public boolean shouldDelaySecondaryLastActivityRemoval();
+  }
+
   public abstract class WindowContainerTransactionCallback {
     ctor public WindowContainerTransactionCallback();
     method public abstract void onTransactionReady(int, @NonNull android.view.SurfaceControl.Transaction);
@@ -3256,15 +3394,15 @@
 
   public class WindowOrganizer {
     ctor public WindowOrganizer();
-    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public int applySyncTransaction(@NonNull android.window.WindowContainerTransaction, @NonNull android.window.WindowContainerTransactionCallback);
-    method @RequiresPermission(android.Manifest.permission.MANAGE_ACTIVITY_TASKS) public void applyTransaction(@NonNull android.window.WindowContainerTransaction);
+    method @RequiresPermission(value=android.Manifest.permission.MANAGE_ACTIVITY_TASKS, conditional=true) public int applySyncTransaction(@NonNull android.window.WindowContainerTransaction, @NonNull android.window.WindowContainerTransactionCallback);
+    method @RequiresPermission(value=android.Manifest.permission.MANAGE_ACTIVITY_TASKS, conditional=true) public void applyTransaction(@NonNull android.window.WindowContainerTransaction);
   }
 
   @UiContext public abstract class WindowProviderService extends android.app.Service {
     ctor public WindowProviderService();
     method public final void attachToWindowToken(@NonNull android.os.IBinder);
     method @NonNull public int getInitialDisplayId();
-    method @Nullable public android.os.Bundle getWindowContextOptions();
+    method @CallSuper @Nullable public android.os.Bundle getWindowContextOptions();
     method public abstract int getWindowType();
   }
 
diff --git a/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/wifi-current.txt b/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/wifi-current.txt
index c5d9c2f..dbd7877 100644
--- a/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/wifi-current.txt
+++ b/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/apis/wifi-current.txt
@@ -18,13 +18,36 @@
     field public static final int EASY_CONNECT_EVENT_FAILURE_URI_GENERATION = -13; // 0xfffffff3
   }
 
+  public final class MloLink implements android.os.Parcelable {
+    ctor public MloLink();
+    method public int describeContents();
+    method @Nullable public android.net.MacAddress getApMacAddress();
+    method public int getBand();
+    method @IntRange(from=1) public int getChannel();
+    method @IntRange(from=android.net.wifi.MloLink.INVALID_MLO_LINK_ID, to=0xf) public int getLinkId();
+    method @Nullable public android.net.MacAddress getStaMacAddress();
+    method public int getState();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.MloLink> CREATOR;
+    field public static final int INVALID_MLO_LINK_ID = -1; // 0xffffffff
+    field public static final int MLO_LINK_STATE_ACTIVE = 3; // 0x3
+    field public static final int MLO_LINK_STATE_IDLE = 2; // 0x2
+    field public static final int MLO_LINK_STATE_INVALID = 0; // 0x0
+    field public static final int MLO_LINK_STATE_UNASSOCIATED = 1; // 0x1
+  }
+
   public final class ScanResult implements android.os.Parcelable {
     ctor public ScanResult(@NonNull android.net.wifi.ScanResult);
     ctor public ScanResult();
     method public static int convertChannelToFrequencyMhzIfSupported(int, int);
     method public static int convertFrequencyMhzToChannelIfSupported(int);
     method public int describeContents();
+    method @NonNull public java.util.List<android.net.wifi.MloLink> getAffiliatedMloLinks();
+    method @Nullable public android.net.MacAddress getApMldMacAddress();
+    method @IntRange(from=android.net.wifi.MloLink.INVALID_MLO_LINK_ID, to=0xf) public int getApMloLinkId();
     method @NonNull public java.util.List<android.net.wifi.ScanResult.InformationElement> getInformationElements();
+    method @NonNull public int[] getSecurityTypes();
+    method @Nullable public android.net.wifi.WifiSsid getWifiSsid();
     method public int getWifiStandard();
     method public boolean is80211mcResponder();
     method public boolean isPasspointNetwork();
@@ -32,11 +55,17 @@
     field public String BSSID;
     field public static final int CHANNEL_WIDTH_160MHZ = 3; // 0x3
     field public static final int CHANNEL_WIDTH_20MHZ = 0; // 0x0
+    field public static final int CHANNEL_WIDTH_320MHZ = 5; // 0x5
     field public static final int CHANNEL_WIDTH_40MHZ = 1; // 0x1
     field public static final int CHANNEL_WIDTH_80MHZ = 2; // 0x2
     field public static final int CHANNEL_WIDTH_80MHZ_PLUS_MHZ = 4; // 0x4
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.ScanResult> CREATOR;
-    field public String SSID;
+    field public static final int PREAMBLE_EHT = 4; // 0x4
+    field public static final int PREAMBLE_HE = 3; // 0x3
+    field public static final int PREAMBLE_HT = 1; // 0x1
+    field public static final int PREAMBLE_LEGACY = 0; // 0x0
+    field public static final int PREAMBLE_VHT = 2; // 0x2
+    field @Deprecated public String SSID;
     field public static final int UNSPECIFIED = -1; // 0xffffffff
     field public static final int WIFI_BAND_24_GHZ = 1; // 0x1
     field public static final int WIFI_BAND_5_GHZ = 2; // 0x2
@@ -45,6 +74,7 @@
     field public static final int WIFI_STANDARD_11AC = 5; // 0x5
     field public static final int WIFI_STANDARD_11AD = 7; // 0x7
     field public static final int WIFI_STANDARD_11AX = 6; // 0x6
+    field public static final int WIFI_STANDARD_11BE = 8; // 0x8
     field public static final int WIFI_STANDARD_11N = 4; // 0x4
     field public static final int WIFI_STANDARD_LEGACY = 1; // 0x1
     field public static final int WIFI_STANDARD_UNKNOWN = 0; // 0x0
@@ -60,6 +90,7 @@
   }
 
   public static class ScanResult.InformationElement implements android.os.Parcelable {
+    ctor public ScanResult.InformationElement(int, int, @NonNull byte[]);
     ctor public ScanResult.InformationElement(@NonNull android.net.wifi.ScanResult.InformationElement);
     method public int describeContents();
     method @NonNull public java.nio.ByteBuffer getBytes();
@@ -74,12 +105,15 @@
     method @Nullable public android.net.MacAddress getBssid();
     method @Nullable public String getPassphrase();
     method public int getSecurityType();
-    method @Nullable public String getSsid();
+    method @Deprecated @Nullable public String getSsid();
+    method @Nullable public android.net.wifi.WifiSsid getWifiSsid();
     method public boolean isHiddenSsid();
     method public void writeToParcel(@NonNull android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.SoftApConfiguration> CREATOR;
     field public static final int SECURITY_TYPE_OPEN = 0; // 0x0
     field public static final int SECURITY_TYPE_WPA2_PSK = 1; // 0x1
+    field public static final int SECURITY_TYPE_WPA3_OWE = 5; // 0x5
+    field public static final int SECURITY_TYPE_WPA3_OWE_TRANSITION = 4; // 0x4
     field public static final int SECURITY_TYPE_WPA3_SAE = 3; // 0x3
     field public static final int SECURITY_TYPE_WPA3_SAE_TRANSITION = 2; // 0x2
   }
@@ -109,13 +143,22 @@
     method public int describeContents();
     method @Deprecated public android.net.ProxyInfo getHttpProxy();
     method @Deprecated @NonNull public String getKey();
+    method @Deprecated public int getMacRandomizationSetting();
     method @Deprecated @NonNull public android.net.MacAddress getRandomizedMacAddress();
+    method @Deprecated public boolean isDppConfigurator();
     method @Deprecated public boolean isPasspoint();
     method @Deprecated public void setHttpProxy(android.net.ProxyInfo);
+    method @Deprecated public void setIpConfiguration(@Nullable android.net.IpConfiguration);
+    method @Deprecated public void setMacRandomizationSetting(int);
     method @Deprecated public void setSecurityParams(int);
     method public void writeToParcel(android.os.Parcel, int);
     field @Deprecated public String BSSID;
     field @Deprecated public String FQDN;
+    field @Deprecated public static final int RANDOMIZATION_AUTO = 3; // 0x3
+    field @Deprecated public static final int RANDOMIZATION_NONE = 0; // 0x0
+    field @Deprecated public static final int RANDOMIZATION_NON_PERSISTENT = 2; // 0x2
+    field @Deprecated public static final int RANDOMIZATION_PERSISTENT = 1; // 0x1
+    field @Deprecated public static final int SECURITY_TYPE_DPP = 13; // 0xd
     field @Deprecated public static final int SECURITY_TYPE_EAP = 3; // 0x3
     field @Deprecated public static final int SECURITY_TYPE_EAP_SUITE_B = 5; // 0x5
     field @Deprecated public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE = 9; // 0x9
@@ -217,6 +260,7 @@
     ctor public WifiEnterpriseConfig();
     ctor public WifiEnterpriseConfig(android.net.wifi.WifiEnterpriseConfig);
     method public int describeContents();
+    method public void enableTrustOnFirstUse(boolean);
     method public String getAltSubjectMatch();
     method public String getAnonymousIdentity();
     method @Nullable public java.security.cert.X509Certificate getCaCertificate();
@@ -234,9 +278,11 @@
     method public String getPlmn();
     method public String getRealm();
     method @Deprecated public String getSubjectMatch();
+    method public boolean hasCaCertificate();
     method public boolean isAuthenticationSimBased();
     method public boolean isEapMethodServerCertUsed();
     method public boolean isServerCertValidationEnabled();
+    method public boolean isTrustOnFirstUseEnabled();
     method public void setAltSubjectMatch(String);
     method public void setAnonymousIdentity(String);
     method public void setCaCertificate(@Nullable java.security.cert.X509Certificate);
@@ -289,6 +335,9 @@
 
   public class WifiInfo implements android.os.Parcelable android.net.TransportInfo {
     method public int describeContents();
+    method @NonNull public java.util.List<android.net.wifi.MloLink> getAffiliatedMloLinks();
+    method @Nullable public android.net.MacAddress getApMldMacAddress();
+    method @IntRange(from=android.net.wifi.MloLink.INVALID_MLO_LINK_ID, to=0xf) public int getApMloLinkId();
     method public String getBSSID();
     method public int getCurrentSecurityType();
     method public static android.net.NetworkInfo.DetailedState getDetailedStateOf(android.net.wifi.SupplicantState);
@@ -297,7 +346,7 @@
     method @Nullable public java.util.List<android.net.wifi.ScanResult.InformationElement> getInformationElements();
     method @Deprecated public int getIpAddress();
     method public int getLinkSpeed();
-    method @RequiresPermission(allOf={android.Manifest.permission.LOCAL_MAC_ADDRESS, android.Manifest.permission.ACCESS_FINE_LOCATION}) public String getMacAddress();
+    method public String getMacAddress();
     method public int getMaxSupportedRxLinkSpeedMbps();
     method public int getMaxSupportedTxLinkSpeedMbps();
     method public int getNetworkId();
@@ -310,11 +359,13 @@
     method public android.net.wifi.SupplicantState getSupplicantState();
     method @IntRange(from=0xffffffff) public int getTxLinkSpeedMbps();
     method public int getWifiStandard();
+    method public boolean isRestricted();
     method @NonNull public android.net.wifi.WifiInfo makeCopy(long);
     method public void writeToParcel(android.os.Parcel, int);
     field public static final String FREQUENCY_UNITS = "MHz";
     field public static final String LINK_SPEED_UNITS = "Mbps";
     field public static final int LINK_SPEED_UNKNOWN = -1; // 0xffffffff
+    field public static final int SECURITY_TYPE_DPP = 13; // 0xd
     field public static final int SECURITY_TYPE_EAP = 3; // 0x3
     field public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE = 9; // 0x9
     field public static final int SECURITY_TYPE_EAP_WPA3_ENTERPRISE_192_BIT = 5; // 0x5
@@ -343,11 +394,12 @@
 
   public class WifiManager {
     method @Deprecated public int addNetwork(android.net.wifi.WifiConfiguration);
-    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_MANAGED_PROVISIONING}) public android.net.wifi.WifiManager.AddNetworkResult addNetworkPrivileged(@NonNull android.net.wifi.WifiConfiguration);
+    method @NonNull @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_STACK, android.Manifest.permission.NETWORK_SETUP_WIZARD, android.Manifest.permission.NETWORK_MANAGED_PROVISIONING}, conditional=true) public android.net.wifi.WifiManager.AddNetworkResult addNetworkPrivileged(@NonNull android.net.wifi.WifiConfiguration);
     method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public int addNetworkSuggestions(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>);
     method public void addOrUpdatePasspointConfiguration(android.net.wifi.hotspot2.PasspointConfiguration);
     method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public void addSuggestionConnectionStatusListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SuggestionConnectionStatusListener);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void addSuggestionUserApprovalStatusListener(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SuggestionUserApprovalStatusListener);
+    method public void allowAutojoinGlobal(boolean);
     method @Deprecated public static int calculateSignalLevel(int, int);
     method @IntRange(from=0) public int calculateSignalLevel(int);
     method @Deprecated public void cancelWps(android.net.wifi.WifiManager.WpsCallback);
@@ -358,16 +410,17 @@
     method @Deprecated public boolean disableNetwork(int);
     method @Deprecated public boolean disconnect();
     method @Deprecated public boolean enableNetwork(int, boolean);
-    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_MANAGED_PROVISIONING, android.Manifest.permission.NETWORK_CARRIER_PROVISIONING}) public void flushPasspointAnqpCache();
+    method @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_MANAGED_PROVISIONING, android.Manifest.permission.NETWORK_CARRIER_PROVISIONING}, conditional=true) public void flushPasspointAnqpCache();
     method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public java.util.List<android.net.wifi.WifiConfiguration> getCallerConfiguredNetworks();
     method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.ACCESS_WIFI_STATE}) public java.util.List<android.net.wifi.WifiConfiguration> getConfiguredNetworks();
-    method @Deprecated public android.net.wifi.WifiInfo getConnectionInfo();
+    method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public android.net.wifi.WifiInfo getConnectionInfo();
     method @Deprecated public android.net.DhcpInfo getDhcpInfo();
     method public int getMaxNumberOfNetworkSuggestionsPerApp();
     method @IntRange(from=0) public int getMaxSignalLevel();
     method @NonNull @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public java.util.List<android.net.wifi.WifiNetworkSuggestion> getNetworkSuggestions();
-    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_SETUP_WIZARD}) public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
-    method public java.util.List<android.net.wifi.ScanResult> getScanResults();
+    method @Deprecated public java.util.List<android.net.wifi.hotspot2.PasspointConfiguration> getPasspointConfigurations();
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public java.util.List<android.net.wifi.ScanResult> getScanResults();
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public int getStaConcurrencyForMultiInternetMode();
     method public int getWifiState();
     method public boolean is24GHzBandSupported();
     method public boolean is5GHzBandSupported();
@@ -378,6 +431,7 @@
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isCarrierNetworkOffloadEnabled(int, boolean);
     method public boolean isDecoratedIdentitySupported();
     method @Deprecated public boolean isDeviceToApRttSupported();
+    method public boolean isEasyConnectDppAkmSupported();
     method public boolean isEasyConnectEnrolleeResponderModeSupported();
     method public boolean isEasyConnectSupported();
     method public boolean isEnhancedOpenSupported();
@@ -391,37 +445,45 @@
     method public boolean isStaApConcurrencySupported();
     method public boolean isStaBridgedApConcurrencySupported();
     method public boolean isStaConcurrencyForLocalOnlyConnectionsSupported();
+    method public boolean isStaConcurrencyForMultiInternetSupported();
     method public boolean isTdlsSupported();
+    method public boolean isTrustOnFirstUseSupported();
     method public boolean isWapiSupported();
     method public boolean isWifiDisplayR2Supported();
     method public boolean isWifiEnabled();
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isWifiPasspointEnabled();
     method public boolean isWifiStandardSupported(int);
     method public boolean isWpa3SaeH2eSupported();
     method public boolean isWpa3SaePublicKeySupported();
     method public boolean isWpa3SaeSupported();
     method public boolean isWpa3SuiteBSupported();
     method @Deprecated public boolean pingSupplicant();
+    method public void queryAutojoinGlobal(@NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.lang.Boolean>);
     method @Deprecated public boolean reassociate();
     method @Deprecated public boolean reconnect();
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void registerScanResultsCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.ScanResultsCallback);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void registerSubsystemRestartTrackingCallback(@NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.WifiManager.SubsystemRestartTrackingCallback);
     method @Deprecated public boolean removeNetwork(int);
     method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public int removeNetworkSuggestions(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>);
+    method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public int removeNetworkSuggestions(@NonNull java.util.List<android.net.wifi.WifiNetworkSuggestion>, int);
     method @RequiresPermission(android.Manifest.permission.CHANGE_WIFI_STATE) public boolean removeNonCallerConfiguredNetworks();
-    method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.NETWORK_SETTINGS, android.Manifest.permission.NETWORK_CARRIER_PROVISIONING}) public void removePasspointConfiguration(String);
+    method @Deprecated public void removePasspointConfiguration(String);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void removeSuggestionConnectionStatusListener(@NonNull android.net.wifi.WifiManager.SuggestionConnectionStatusListener);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void removeSuggestionUserApprovalStatusListener(@NonNull android.net.wifi.WifiManager.SuggestionUserApprovalStatusListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.MANAGE_WIFI_INTERFACES, android.Manifest.permission.ACCESS_WIFI_STATE}) public void reportCreateInterfaceImpact(int, boolean, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.BiConsumer<java.lang.Boolean,java.util.Set<android.net.wifi.WifiManager.InterfaceCreationImpact>>);
     method @Deprecated public boolean saveConfiguration();
     method public void setTdlsEnabled(java.net.InetAddress, boolean);
     method public void setTdlsEnabledWithMacAddress(String, boolean);
     method @Deprecated public boolean setWifiEnabled(boolean);
-    method @RequiresPermission(allOf={android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION}) public void startLocalOnlyHotspot(android.net.wifi.WifiManager.LocalOnlyHotspotCallback, @Nullable android.os.Handler);
+    method @RequiresPermission(allOf={android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.NEARBY_WIFI_DEVICES}, conditional=true) public void startLocalOnlyHotspot(android.net.wifi.WifiManager.LocalOnlyHotspotCallback, @Nullable android.os.Handler);
     method @Deprecated public boolean startScan();
     method @Deprecated public void startWps(android.net.wifi.WpsInfo, android.net.wifi.WifiManager.WpsCallback);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void unregisterScanResultsCallback(@NonNull android.net.wifi.WifiManager.ScanResultsCallback);
     method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public void unregisterSubsystemRestartTrackingCallback(@NonNull android.net.wifi.WifiManager.SubsystemRestartTrackingCallback);
     method @Deprecated public int updateNetwork(android.net.wifi.WifiConfiguration);
     field public static final String ACTION_PICK_WIFI_NETWORK = "android.net.wifi.PICK_WIFI_NETWORK";
+    field public static final int ACTION_REMOVE_SUGGESTION_DISCONNECT = 2; // 0x2
+    field public static final int ACTION_REMOVE_SUGGESTION_LINGER = 1; // 0x1
     field public static final String ACTION_REQUEST_SCAN_ALWAYS_AVAILABLE = "android.net.wifi.action.REQUEST_SCAN_ALWAYS_AVAILABLE";
     field public static final String ACTION_WIFI_NETWORK_SUGGESTION_POST_CONNECTION = "android.net.wifi.action.WIFI_NETWORK_SUGGESTION_POST_CONNECTION";
     field public static final String ACTION_WIFI_SCAN_AVAILABILITY_CHANGED = "android.net.wifi.action.WIFI_SCAN_AVAILABILITY_CHANGED";
@@ -449,6 +511,7 @@
     field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_APP_DISALLOWED = 2; // 0x2
     field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_INTERNAL = 1; // 0x1
     field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_REMOVE_INVALID = 5; // 0x5
+    field public static final int STATUS_NETWORK_SUGGESTIONS_ERROR_RESTRICTED_BY_ADMIN = 8; // 0x8
     field public static final int STATUS_NETWORK_SUGGESTIONS_SUCCESS = 0; // 0x0
     field public static final int STATUS_SUGGESTION_APPROVAL_APPROVED_BY_CARRIER_PRIVILEGE = 4; // 0x4
     field public static final int STATUS_SUGGESTION_APPROVAL_APPROVED_BY_USER = 2; // 0x2
@@ -462,10 +525,17 @@
     field @Deprecated public static final String SUPPLICANT_CONNECTION_CHANGE_ACTION = "android.net.wifi.supplicant.CONNECTION_CHANGE";
     field @Deprecated public static final String SUPPLICANT_STATE_CHANGED_ACTION = "android.net.wifi.supplicant.STATE_CHANGE";
     field public static final String UNKNOWN_SSID = "<unknown ssid>";
+    field public static final int WIFI_INTERFACE_TYPE_AP = 1; // 0x1
+    field public static final int WIFI_INTERFACE_TYPE_AWARE = 2; // 0x2
+    field public static final int WIFI_INTERFACE_TYPE_DIRECT = 3; // 0x3
+    field public static final int WIFI_INTERFACE_TYPE_STA = 0; // 0x0
     field @Deprecated public static final int WIFI_MODE_FULL = 1; // 0x1
     field public static final int WIFI_MODE_FULL_HIGH_PERF = 3; // 0x3
     field public static final int WIFI_MODE_FULL_LOW_LATENCY = 4; // 0x4
     field @Deprecated public static final int WIFI_MODE_SCAN_ONLY = 2; // 0x2
+    field public static final int WIFI_MULTI_INTERNET_MODE_DBS_AP = 1; // 0x1
+    field public static final int WIFI_MULTI_INTERNET_MODE_DISABLED = 0; // 0x0
+    field public static final int WIFI_MULTI_INTERNET_MODE_MULTI_AP = 2; // 0x2
     field public static final String WIFI_STATE_CHANGED_ACTION = "android.net.wifi.WIFI_STATE_CHANGED";
     field public static final int WIFI_STATE_DISABLED = 1; // 0x1
     field public static final int WIFI_STATE_DISABLING = 0; // 0x0
@@ -499,6 +569,12 @@
     field public final int statusCode;
   }
 
+  public static class WifiManager.InterfaceCreationImpact {
+    ctor public WifiManager.InterfaceCreationImpact(int, @NonNull java.util.Set<java.lang.String>);
+    method public int getInterfaceType();
+    method @NonNull public java.util.Set<java.lang.String> getPackages();
+  }
+
   public static class WifiManager.LocalOnlyHotspotCallback {
     ctor public WifiManager.LocalOnlyHotspotCallback();
     method public void onFailed(int);
@@ -586,12 +662,15 @@
     method public int describeContents();
     method @Nullable public android.net.MacAddress getBssid();
     method @Nullable public android.net.wifi.WifiEnterpriseConfig getEnterpriseConfig();
+    method public int getMacRandomizationSetting();
     method @Nullable public String getPassphrase();
     method @Nullable public android.net.wifi.hotspot2.PasspointConfiguration getPasspointConfig();
     method @IntRange(from=0) public int getPriority();
     method @IntRange(from=0) public int getPriorityGroup();
     method @Nullable public String getSsid();
+    method @Nullable public android.os.ParcelUuid getSubscriptionGroup();
     method public int getSubscriptionId();
+    method @Nullable public android.net.wifi.WifiSsid getWifiSsid();
     method public boolean isAppInteractionRequired();
     method public boolean isCarrierMerged();
     method public boolean isCredentialSharedWithUser();
@@ -599,6 +678,7 @@
     method public boolean isHiddenSsid();
     method public boolean isInitialAutojoinEnabled();
     method public boolean isMetered();
+    method public boolean isRestricted();
     method public boolean isUntrusted();
     method public boolean isUserInteractionRequired();
     method public void writeToParcel(android.os.Parcel, int);
@@ -624,11 +704,14 @@
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setPasspointConfig(@NonNull android.net.wifi.hotspot2.PasspointConfiguration);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setPriority(@IntRange(from=0) int);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setPriorityGroup(@IntRange(from=0) int);
+    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setRestricted(boolean);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setSsid(@NonNull String);
+    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setSubscriptionGroup(@NonNull android.os.ParcelUuid);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setSubscriptionId(int);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setUntrusted(boolean);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWapiEnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWapiPassphrase(@NonNull String);
+    method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWifiSsid(@NonNull android.net.wifi.WifiSsid);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa2EnterpriseConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa2Passphrase(@NonNull String);
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa3Enterprise192BitModeConfig(@NonNull android.net.wifi.WifiEnterpriseConfig);
@@ -637,6 +720,14 @@
     method @NonNull public android.net.wifi.WifiNetworkSuggestion.Builder setWpa3Passphrase(@NonNull String);
   }
 
+  public final class WifiSsid implements android.os.Parcelable {
+    method public int describeContents();
+    method @NonNull public static android.net.wifi.WifiSsid fromBytes(@Nullable byte[]);
+    method @NonNull public byte[] getBytes();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.WifiSsid> CREATOR;
+  }
+
   public class WpsInfo implements android.os.Parcelable {
     ctor public WpsInfo();
     ctor public WpsInfo(android.net.wifi.WpsInfo);
@@ -661,6 +752,7 @@
     ctor public AttachCallback();
     method public void onAttachFailed();
     method public void onAttached(android.net.wifi.aware.WifiAwareSession);
+    method public void onAwareSessionTerminated();
   }
 
   public final class AwareResources implements android.os.Parcelable {
@@ -678,12 +770,19 @@
     method public int getMaxMatchFilterLength();
     method public int getMaxServiceNameLength();
     method public int getMaxServiceSpecificInfoLength();
+    method @IntRange(from=1) public int getNumberOfSupportedDataInterfaces();
+    method @IntRange(from=1) public int getNumberOfSupportedDataPaths();
+    method @IntRange(from=1) public int getNumberOfSupportedPublishSessions();
+    method @IntRange(from=1) public int getNumberOfSupportedSubscribeSessions();
     method public int getSupportedCipherSuites();
     method public boolean isInstantCommunicationModeSupported();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.Characteristics> CREATOR;
+    field public static final int WIFI_AWARE_CIPHER_SUITE_NCS_PK_128 = 4; // 0x4
+    field public static final int WIFI_AWARE_CIPHER_SUITE_NCS_PK_256 = 8; // 0x8
     field public static final int WIFI_AWARE_CIPHER_SUITE_NCS_SK_128 = 1; // 0x1
     field public static final int WIFI_AWARE_CIPHER_SUITE_NCS_SK_256 = 2; // 0x2
+    field public static final int WIFI_AWARE_CIPHER_SUITE_NONE = 0; // 0x0
   }
 
   public class DiscoverySession implements java.lang.AutoCloseable {
@@ -700,7 +799,9 @@
     method public void onMessageSendSucceeded(int);
     method public void onPublishStarted(@NonNull android.net.wifi.aware.PublishDiscoverySession);
     method public void onServiceDiscovered(android.net.wifi.aware.PeerHandle, byte[], java.util.List<byte[]>);
+    method public void onServiceDiscovered(@NonNull android.net.wifi.aware.ServiceDiscoveryInfo);
     method public void onServiceDiscoveredWithinRange(android.net.wifi.aware.PeerHandle, byte[], java.util.List<byte[]>, int);
+    method public void onServiceDiscoveredWithinRange(@NonNull android.net.wifi.aware.ServiceDiscoveryInfo, int);
     method public void onServiceLost(@NonNull android.net.wifi.aware.PeerHandle, int);
     method public void onSessionConfigFailed();
     method public void onSessionConfigUpdated();
@@ -725,6 +826,9 @@
 
   public final class PublishConfig implements android.os.Parcelable {
     method public int describeContents();
+    method public int getInstantCommunicationBand();
+    method @Nullable public android.net.wifi.aware.WifiAwareDataPathSecurityConfig getSecurityConfig();
+    method public boolean isInstantCommunicationModeEnabled();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.PublishConfig> CREATOR;
     field public static final int PUBLISH_TYPE_SOLICITED = 1; // 0x1
@@ -734,6 +838,8 @@
   public static final class PublishConfig.Builder {
     ctor public PublishConfig.Builder();
     method public android.net.wifi.aware.PublishConfig build();
+    method @NonNull public android.net.wifi.aware.PublishConfig.Builder setDataPathSecurityConfig(@NonNull android.net.wifi.aware.WifiAwareDataPathSecurityConfig);
+    method @NonNull public android.net.wifi.aware.PublishConfig.Builder setInstantCommunicationModeEnabled(boolean, int);
     method public android.net.wifi.aware.PublishConfig.Builder setMatchFilter(@Nullable java.util.List<byte[]>);
     method public android.net.wifi.aware.PublishConfig.Builder setPublishType(int);
     method public android.net.wifi.aware.PublishConfig.Builder setRangingEnabled(boolean);
@@ -747,8 +853,18 @@
     method public void updatePublish(@NonNull android.net.wifi.aware.PublishConfig);
   }
 
+  public final class ServiceDiscoveryInfo {
+    method @NonNull public java.util.List<byte[]> getMatchFilters();
+    method public int getPeerCipherSuite();
+    method @NonNull public android.net.wifi.aware.PeerHandle getPeerHandle();
+    method @Nullable public byte[] getScid();
+    method @Nullable public byte[] getServiceSpecificInfo();
+  }
+
   public final class SubscribeConfig implements android.os.Parcelable {
     method public int describeContents();
+    method public int getInstantCommunicationBand();
+    method public boolean isInstantCommunicationModeEnabled();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.SubscribeConfig> CREATOR;
     field public static final int SUBSCRIBE_TYPE_ACTIVE = 1; // 0x1
@@ -758,6 +874,7 @@
   public static final class SubscribeConfig.Builder {
     ctor public SubscribeConfig.Builder();
     method public android.net.wifi.aware.SubscribeConfig build();
+    method @NonNull public android.net.wifi.aware.SubscribeConfig.Builder setInstantCommunicationModeEnabled(boolean, int);
     method public android.net.wifi.aware.SubscribeConfig.Builder setMatchFilter(@Nullable java.util.List<byte[]>);
     method public android.net.wifi.aware.SubscribeConfig.Builder setMaxDistanceMm(int);
     method public android.net.wifi.aware.SubscribeConfig.Builder setMinDistanceMm(int);
@@ -772,15 +889,45 @@
     method public void updateSubscribe(@NonNull android.net.wifi.aware.SubscribeConfig);
   }
 
+  public final class WifiAwareChannelInfo implements android.os.Parcelable {
+    method public int describeContents();
+    method @IntRange(from=0) public int getChannelBandwidth();
+    method @IntRange(from=0) public int getChannelFrequencyMhz();
+    method @IntRange(from=0) public int getSpatialStreamCount();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.WifiAwareChannelInfo> CREATOR;
+  }
+
+  public final class WifiAwareDataPathSecurityConfig implements android.os.Parcelable {
+    method public int describeContents();
+    method public int getCipherSuite();
+    method @Nullable public byte[] getPmk();
+    method @Nullable public byte[] getPmkId();
+    method @Nullable public String getPskPassphrase();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.WifiAwareDataPathSecurityConfig> CREATOR;
+  }
+
+  public static final class WifiAwareDataPathSecurityConfig.Builder {
+    ctor public WifiAwareDataPathSecurityConfig.Builder(int);
+    method @NonNull public android.net.wifi.aware.WifiAwareDataPathSecurityConfig build();
+    method @NonNull public android.net.wifi.aware.WifiAwareDataPathSecurityConfig.Builder setPmk(@NonNull byte[]);
+    method @NonNull public android.net.wifi.aware.WifiAwareDataPathSecurityConfig.Builder setPmkId(@NonNull byte[]);
+    method @NonNull public android.net.wifi.aware.WifiAwareDataPathSecurityConfig.Builder setPskPassphrase(@NonNull String);
+  }
+
   public class WifiAwareManager {
-    method public void attach(@NonNull android.net.wifi.aware.AttachCallback, @Nullable android.os.Handler);
-    method public void attach(@NonNull android.net.wifi.aware.AttachCallback, @NonNull android.net.wifi.aware.IdentityChangedListener, @Nullable android.os.Handler);
-    method @Nullable public android.net.wifi.aware.AwareResources getAvailableAwareResources();
-    method @Nullable public android.net.wifi.aware.Characteristics getCharacteristics();
-    method public boolean isAvailable();
-    method public boolean isDeviceAttached();
-    method public boolean isInstantCommunicationModeEnabled();
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_STATE}) public void attach(@NonNull android.net.wifi.aware.AttachCallback, @Nullable android.os.Handler);
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.NEARBY_WIFI_DEVICES}, conditional=true) public void attach(@NonNull android.net.wifi.aware.AttachCallback, @NonNull android.net.wifi.aware.IdentityChangedListener, @Nullable android.os.Handler);
+    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.aware.AwareResources getAvailableAwareResources();
+    method @Nullable @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public android.net.wifi.aware.Characteristics getCharacteristics();
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isAvailable();
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isDeviceAttached();
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isInstantCommunicationModeEnabled();
+    method @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public boolean isSetChannelOnDataPathSupported();
+    field @RequiresPermission(android.Manifest.permission.ACCESS_WIFI_STATE) public static final String ACTION_WIFI_AWARE_RESOURCE_CHANGED = "android.net.wifi.aware.action.WIFI_AWARE_RESOURCE_CHANGED";
     field public static final String ACTION_WIFI_AWARE_STATE_CHANGED = "android.net.wifi.aware.action.WIFI_AWARE_STATE_CHANGED";
+    field public static final String EXTRA_AWARE_RESOURCES = "android.net.wifi.aware.extra.AWARE_RESOURCES";
     field public static final int WIFI_AWARE_DATA_PATH_ROLE_INITIATOR = 0; // 0x0
     field public static final int WIFI_AWARE_DATA_PATH_ROLE_RESPONDER = 1; // 0x1
     field public static final int WIFI_AWARE_DISCOVERY_LOST_REASON_PEER_NOT_VISIBLE = 1; // 0x1
@@ -789,6 +936,7 @@
 
   public final class WifiAwareNetworkInfo implements android.os.Parcelable android.net.TransportInfo {
     method public int describeContents();
+    method @NonNull public java.util.List<android.net.wifi.aware.WifiAwareChannelInfo> getChannelInfoList();
     method @Nullable public java.net.Inet6Address getPeerIpv6Addr();
     method public int getPort();
     method public int getTransportProtocol();
@@ -798,6 +946,9 @@
 
   public final class WifiAwareNetworkSpecifier extends android.net.NetworkSpecifier implements android.os.Parcelable {
     method public int describeContents();
+    method @IntRange(from=0) public int getChannelFrequencyMhz();
+    method @Nullable public android.net.wifi.aware.WifiAwareDataPathSecurityConfig getWifiAwareDataPathSecurityConfig();
+    method public boolean isChannelRequired();
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.aware.WifiAwareNetworkSpecifier> CREATOR;
   }
@@ -806,6 +957,8 @@
     ctor public WifiAwareNetworkSpecifier.Builder(@NonNull android.net.wifi.aware.DiscoverySession, @NonNull android.net.wifi.aware.PeerHandle);
     ctor public WifiAwareNetworkSpecifier.Builder(@NonNull android.net.wifi.aware.PublishDiscoverySession);
     method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier build();
+    method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setChannelFrequencyMhz(@IntRange(from=0) int, boolean);
+    method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setDataPathSecurityConfig(@NonNull android.net.wifi.aware.WifiAwareDataPathSecurityConfig);
     method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setPmk(@NonNull byte[]);
     method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setPort(@IntRange(from=0, to=65535) int);
     method @NonNull public android.net.wifi.aware.WifiAwareNetworkSpecifier.Builder setPskPassphrase(@NonNull String);
@@ -816,8 +969,8 @@
     method public void close();
     method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierOpen(int, @NonNull byte[]);
     method @Deprecated public android.net.NetworkSpecifier createNetworkSpecifierPassphrase(int, @NonNull byte[], @NonNull String);
-    method public void publish(@NonNull android.net.wifi.aware.PublishConfig, @NonNull android.net.wifi.aware.DiscoverySessionCallback, @Nullable android.os.Handler);
-    method public void subscribe(@NonNull android.net.wifi.aware.SubscribeConfig, @NonNull android.net.wifi.aware.DiscoverySessionCallback, @Nullable android.os.Handler);
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.NEARBY_WIFI_DEVICES}, conditional=true) public void publish(@NonNull android.net.wifi.aware.PublishConfig, @NonNull android.net.wifi.aware.DiscoverySessionCallback, @Nullable android.os.Handler);
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.NEARBY_WIFI_DEVICES}, conditional=true) public void subscribe(@NonNull android.net.wifi.aware.SubscribeConfig, @NonNull android.net.wifi.aware.DiscoverySessionCallback, @Nullable android.os.Handler);
   }
 
 }
@@ -841,6 +994,7 @@
     method public void setCredential(android.net.wifi.hotspot2.pps.Credential);
     method public void setDecoratedIdentityPrefix(@Nullable String);
     method public void setHomeSp(android.net.wifi.hotspot2.pps.HomeSp);
+    method public void setSubscriptionExpirationTimeInMillis(long);
     method public void writeToParcel(android.os.Parcel, int);
     field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.hotspot2.PasspointConfiguration> CREATOR;
   }
@@ -979,6 +1133,7 @@
     ctor public WifiP2pDevice();
     ctor public WifiP2pDevice(android.net.wifi.p2p.WifiP2pDevice);
     method public int describeContents();
+    method @NonNull public java.util.List<android.net.wifi.ScanResult.InformationElement> getVendorElements();
     method @Nullable public android.net.wifi.p2p.WifiP2pWfdInfo getWfdInfo();
     method public boolean isGroupOwner();
     method public boolean isServiceDiscoveryCapable();
@@ -1040,36 +1195,56 @@
   }
 
   public class WifiP2pManager {
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void addLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void addExternalApprover(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.MacAddress, @NonNull android.net.wifi.p2p.WifiP2pManager.ExternalApproverRequestListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void addLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void addServiceRequest(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceRequest, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void cancelConnect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void clearLocalServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void clearServiceRequests(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void connect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pConfig, android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void createGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void createGroup(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pConfig, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void discoverPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void discoverServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void connect(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pConfig, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void createGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void createGroup(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pConfig, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverPeersOnSocialChannels(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverPeersOnSpecificFrequency(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void discoverServices(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method public static int getP2pMaxAllowedVendorElementsLengthBytes();
     method public android.net.wifi.p2p.WifiP2pManager.Channel initialize(android.content.Context, android.os.Looper, android.net.wifi.p2p.WifiP2pManager.ChannelListener);
+    method public boolean isChannelConstrainedDiscoverySupported();
+    method public boolean isGroupClientRemovalSupported();
+    method public boolean isSetVendorElementsSupported();
+    method public void removeClient(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.MacAddress, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void removeExternalApprover(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.MacAddress, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void removeGroup(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void removeLocalService(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceInfo, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void removeServiceRequest(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.nsd.WifiP2pServiceRequest, android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void requestConnectionInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ConnectionInfoListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestDeviceInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.DeviceInfoListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void requestDeviceInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.DeviceInfoListener);
     method public void requestDiscoveryState(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.DiscoveryStateListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestGroupInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.GroupInfoListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void requestGroupInfo(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.GroupInfoListener);
     method public void requestNetworkInfo(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.NetworkInfoListener);
     method public void requestP2pState(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.wifi.p2p.WifiP2pManager.P2pStateListener);
-    method @RequiresPermission(android.Manifest.permission.ACCESS_FINE_LOCATION) public void requestPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.PeerListListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void requestPeers(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.PeerListListener);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void setConnectionRequestResult(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.MacAddress, int, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(android.Manifest.permission.MANAGE_WIFI_NETWORK_SELECTION) public void setConnectionRequestResult(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull android.net.MacAddress, int, @Nullable String, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void setDnsSdResponseListeners(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.DnsSdServiceResponseListener, android.net.wifi.p2p.WifiP2pManager.DnsSdTxtRecordListener);
     method public void setServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ServiceResponseListener);
     method public void setUpnpServiceResponseListener(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.UpnpServiceResponseListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.OVERRIDE_WIFI_CONFIG}) public void setVendorElements(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @NonNull java.util.List<android.net.wifi.ScanResult.InformationElement>, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method @RequiresPermission(allOf={android.Manifest.permission.NEARBY_WIFI_DEVICES, android.Manifest.permission.ACCESS_FINE_LOCATION}, conditional=true) public void startListening(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    method public void stopListening(@NonNull android.net.wifi.p2p.WifiP2pManager.Channel, @Nullable android.net.wifi.p2p.WifiP2pManager.ActionListener);
     method public void stopPeerDiscovery(android.net.wifi.p2p.WifiP2pManager.Channel, android.net.wifi.p2p.WifiP2pManager.ActionListener);
+    field public static final String ACTION_WIFI_P2P_REQUEST_RESPONSE_CHANGED = "android.net.wifi.p2p.action.WIFI_P2P_REQUEST_RESPONSE_CHANGED";
     field public static final int BUSY = 2; // 0x2
+    field public static final int CONNECTION_REQUEST_ACCEPT = 0; // 0x0
+    field public static final int CONNECTION_REQUEST_DEFER_SHOW_PIN_TO_SERVICE = 3; // 0x3
+    field public static final int CONNECTION_REQUEST_DEFER_TO_SERVICE = 2; // 0x2
+    field public static final int CONNECTION_REQUEST_REJECT = 1; // 0x1
     field public static final int ERROR = 0; // 0x0
     field public static final String EXTRA_DISCOVERY_STATE = "discoveryState";
     field public static final String EXTRA_NETWORK_INFO = "networkInfo";
     field public static final String EXTRA_P2P_DEVICE_LIST = "wifiP2pDeviceList";
+    field public static final String EXTRA_REQUEST_RESPONSE = "android.net.wifi.p2p.extra.REQUEST_RESPONSE";
     field public static final String EXTRA_WIFI_P2P_DEVICE = "wifiP2pDevice";
     field public static final String EXTRA_WIFI_P2P_GROUP = "p2pGroupInfo";
     field public static final String EXTRA_WIFI_P2P_INFO = "wifiP2pInfo";
@@ -1120,6 +1295,20 @@
     method public void onDnsSdTxtRecordAvailable(String, java.util.Map<java.lang.String,java.lang.String>, android.net.wifi.p2p.WifiP2pDevice);
   }
 
+  public static interface WifiP2pManager.ExternalApproverRequestListener {
+    method public void onAttached(@NonNull android.net.MacAddress);
+    method public void onConnectionRequested(int, @NonNull android.net.wifi.p2p.WifiP2pConfig, @NonNull android.net.wifi.p2p.WifiP2pDevice);
+    method public void onDetached(@NonNull android.net.MacAddress, int);
+    method public void onPinGenerated(@NonNull android.net.MacAddress, @NonNull String);
+    field public static final int APPROVER_DETACH_REASON_CLOSE = 3; // 0x3
+    field public static final int APPROVER_DETACH_REASON_FAILURE = 1; // 0x1
+    field public static final int APPROVER_DETACH_REASON_REMOVE = 0; // 0x0
+    field public static final int APPROVER_DETACH_REASON_REPLACE = 2; // 0x2
+    field public static final int REQUEST_TYPE_INVITATION = 1; // 0x1
+    field public static final int REQUEST_TYPE_JOIN = 2; // 0x2
+    field public static final int REQUEST_TYPE_NEGOTIATION = 0; // 0x0
+  }
+
   public static interface WifiP2pManager.GroupInfoListener {
     method public void onGroupInfoAvailable(android.net.wifi.p2p.WifiP2pGroup);
   }
@@ -1282,10 +1471,12 @@
 
   public static final class RangingRequest.Builder {
     ctor public RangingRequest.Builder();
-    method public android.net.wifi.rtt.RangingRequest.Builder addAccessPoint(@NonNull android.net.wifi.ScanResult);
-    method public android.net.wifi.rtt.RangingRequest.Builder addAccessPoints(@NonNull java.util.List<android.net.wifi.ScanResult>);
+    method @NonNull public android.net.wifi.rtt.RangingRequest.Builder addAccessPoint(@NonNull android.net.wifi.ScanResult);
+    method @NonNull public android.net.wifi.rtt.RangingRequest.Builder addAccessPoints(@NonNull java.util.List<android.net.wifi.ScanResult>);
     method @NonNull public android.net.wifi.rtt.RangingRequest.Builder addNon80211mcCapableAccessPoint(@NonNull android.net.wifi.ScanResult);
     method @NonNull public android.net.wifi.rtt.RangingRequest.Builder addNon80211mcCapableAccessPoints(@NonNull java.util.List<android.net.wifi.ScanResult>);
+    method @NonNull public android.net.wifi.rtt.RangingRequest.Builder addResponder(@NonNull android.net.wifi.rtt.ResponderConfig);
+    method @NonNull public android.net.wifi.rtt.RangingRequest.Builder addResponders(@NonNull java.util.List<android.net.wifi.rtt.ResponderConfig>);
     method public android.net.wifi.rtt.RangingRequest.Builder addWifiAwarePeer(@NonNull android.net.MacAddress);
     method public android.net.wifi.rtt.RangingRequest.Builder addWifiAwarePeer(@NonNull android.net.wifi.aware.PeerHandle);
     method public android.net.wifi.rtt.RangingRequest build();
@@ -1320,6 +1511,32 @@
     field public static final int STATUS_CODE_FAIL_RTT_NOT_AVAILABLE = 2; // 0x2
   }
 
+  public final class ResponderConfig implements android.os.Parcelable {
+    method public int describeContents();
+    method @NonNull public static android.net.wifi.rtt.ResponderConfig fromScanResult(@NonNull android.net.wifi.ScanResult);
+    method @IntRange(from=0) public int getCenterFreq0Mhz();
+    method @IntRange(from=0) public int getCenterFreq1Mhz();
+    method public int getChannelWidth();
+    method @IntRange(from=0) public int getFrequencyMhz();
+    method @Nullable public android.net.MacAddress getMacAddress();
+    method public int getPreamble();
+    method public boolean is80211mcSupported();
+    method public void writeToParcel(@NonNull android.os.Parcel, int);
+    field @NonNull public static final android.os.Parcelable.Creator<android.net.wifi.rtt.ResponderConfig> CREATOR;
+  }
+
+  public static final class ResponderConfig.Builder {
+    ctor public ResponderConfig.Builder();
+    method @NonNull public android.net.wifi.rtt.ResponderConfig build();
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder set80211mcSupported(boolean);
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setCenterFreq0Mhz(@IntRange(from=0) int);
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setCenterFreq1Mhz(@IntRange(from=0) int);
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setChannelWidth(int);
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setFrequencyMhz(@IntRange(from=0) int);
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setMacAddress(@NonNull android.net.MacAddress);
+    method @NonNull public android.net.wifi.rtt.ResponderConfig.Builder setPreamble(int);
+  }
+
   public final class ResponderLocation implements android.os.Parcelable {
     method public int describeContents();
     method public double getAltitude();
@@ -1362,7 +1579,7 @@
 
   public class WifiRttManager {
     method public boolean isAvailable();
-    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_WIFI_STATE}) public void startRanging(@NonNull android.net.wifi.rtt.RangingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.rtt.RangingResultCallback);
+    method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_WIFI_STATE, android.Manifest.permission.NEARBY_WIFI_DEVICES}) public void startRanging(@NonNull android.net.wifi.rtt.RangingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.rtt.RangingResultCallback);
     field public static final String ACTION_WIFI_RTT_STATE_CHANGED = "android.net.wifi.rtt.action.WIFI_RTT_STATE_CHANGED";
   }
 
diff --git a/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/parcelablewrappers/NullParcelableRemoteBluetoothAdapter.java.txt b/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/parcelablewrappers/NullParcelableRemoteBluetoothAdapter.java.txt
new file mode 100644
index 0000000..bf769f6
--- /dev/null
+++ b/common/device-side/bedstead/remoteframeworkclasses/src/processor/res/parcelablewrappers/NullParcelableRemoteBluetoothAdapter.java.txt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2021 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.bedstead.remoteframeworkclasses;
+
+import android.bluetooth.RemoteBluetoothAdapter;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.google.android.enterprise.connectedapps.annotations.CustomParcelableWrapper;
+import com.google.android.enterprise.connectedapps.internal.Bundler;
+import com.google.android.enterprise.connectedapps.internal.BundlerType;
+
+/**
+ * This parcelable wrapper just passes null to callers.
+ *
+ * <p>It is not functional and only enables use of {@link RemoteBluetoothAdapter} for clients
+ * which do not need to actually use the {@link RemoteBluetoothAdapter} param or return value.
+ */
+@CustomParcelableWrapper(originalType = RemoteBluetoothAdapter.class)
+public final class NullParcelableRemoteBluetoothAdapter implements Parcelable {
+
+    /**
+     * Create a wrapper for a given {@link RemoteBluetoothAdapter}.
+     */
+    public static <F> NullParcelableRemoteBluetoothAdapter of(
+            Bundler bundler, BundlerType type,
+            RemoteBluetoothAdapter remoteBluetoothAdapter) {
+        return new NullParcelableRemoteBluetoothAdapter();
+    }
+
+    private NullParcelableRemoteBluetoothAdapter() {
+    }
+
+    public RemoteBluetoothAdapter get() {
+        return null;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @SuppressWarnings("rawtypes")
+    public static final Creator<NullParcelableRemoteBluetoothAdapter> CREATOR =
+            new Creator<NullParcelableRemoteBluetoothAdapter>() {
+                @Override
+                public NullParcelableRemoteBluetoothAdapter createFromParcel(Parcel in) {
+                    return new NullParcelableRemoteBluetoothAdapter();
+                }
+
+                @Override
+                public NullParcelableRemoteBluetoothAdapter[] newArray(int size) {
+                    return new NullParcelableRemoteBluetoothAdapter[size];
+                }
+            };
+}
\ No newline at end of file
diff --git a/common/device-side/bedstead/remoteframeworkclasses/update-apis.sh b/common/device-side/bedstead/remoteframeworkclasses/update-apis.sh
index 04ec558..e345f5d 100755
--- a/common/device-side/bedstead/remoteframeworkclasses/update-apis.sh
+++ b/common/device-side/bedstead/remoteframeworkclasses/update-apis.sh
@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
-cp ../../../../../packages/modules/Wifi/framework/api/current.txt src/processor/res/wifi-current.txt
-cp ../../../../../frameworks/base/core/api/current.txt src/processor/res/current.txt
-cp ../../../../../frameworks/base/core/api/test-current.txt src/processor/res/test-current.txt
\ No newline at end of file
+cp ../../../../../packages/modules/Bluetooth/framework/api/current.txt src/processor/res/apis/bluetooth-current.txt
+cp ../../../../../packages/modules/Wifi/framework/api/current.txt src/processor/res/apis/wifi-current.txt
+cp ../../../../../frameworks/base/core/api/current.txt src/processor/res/apis/current.txt
+cp ../../../../../frameworks/base/core/api/test-current.txt src/processor/res/apis/test-current.txt
\ No newline at end of file
diff --git a/common/device-side/bedstead/testapp/Android.bp b/common/device-side/bedstead/testapp/Android.bp
index bf92e97..ba7f5f8 100644
--- a/common/device-side/bedstead/testapp/Android.bp
+++ b/common/device-side/bedstead/testapp/Android.bp
@@ -99,18 +99,19 @@
 
 java_genrule {
     name: "TestApp_Apps",
-    srcs: [":EmptyTestApp", ":EmptyTestApp2", ":DeviceAdminTestApp", ":LockTaskApp", ":DelegateTestApp", ":RemoteDPCTestApp", ":SmsApp", ":AccountManagementApp"],
+    srcs: [":EmptyTestApp", ":NotEmptyTestApp", ":DeviceAdminTestApp", ":LockTaskApp", ":DelegateTestApp", ":RemoteDPCTestApp", ":SmsApp", ":AccountManagementApp", ":RoleHolderApp"],
     out: ["TestApp_Apps.res.zip"],
     tools: ["soong_zip", "index_testapps", "aapt2"],
     cmd: "mkdir -p $(genDir)/res/raw"
          + " && cp $(location :EmptyTestApp) $(genDir)/res/raw"
-         + " && cp $(location :EmptyTestApp2) $(genDir)/res/raw"
+         + " && cp $(location :NotEmptyTestApp) $(genDir)/res/raw"
          + " && cp $(location :DeviceAdminTestApp) $(genDir)/res/raw"
          + " && cp $(location :LockTaskApp) $(genDir)/res/raw"
          + " && cp $(location :DelegateTestApp) $(genDir)/res/raw"
          + " && cp $(location :RemoteDPCTestApp) $(genDir)/res/raw"
          + " && cp $(location :SmsApp) $(genDir)/res/raw"
          + " && cp $(location :AccountManagementApp) $(genDir)/res/raw"
+         + " && cp $(location :RoleHolderApp) $(genDir)/res/raw"
          + " && $(location index_testapps) --directory $(genDir)/res/raw --aapt2 $(location aapt2)"
          + " && $(location soong_zip) -o $(out) -C $(genDir)/res -D $(genDir)/res/raw"
 }
@@ -125,11 +126,12 @@
 }
 
 android_test_helper_app {
-    name: "EmptyTestApp2",
+    name: "NotEmptyTestApp",
     static_libs: [
         "TestApp_TestApps"
     ],
-    manifest: "manifests/EmptyTestApp2Manifest.xml",
+    manifest: "manifests/NotEmptyTestAppManifest.xml",
+    additional_manifests: ["CommonManifest.xml"],
     min_sdk_version: "28"
 }
 
@@ -140,6 +142,7 @@
         "DeviceAdminApp"
     ],
     manifest: "manifests/DeviceAdminManifest.xml",
+    additional_manifests: ["CommonManifest.xml"],
     min_sdk_version: "28"
 }
 
@@ -149,6 +152,7 @@
         "TestApp_TestApps"
     ],
     manifest: "manifests/LockTaskAppManifest.xml",
+    additional_manifests: ["CommonManifest.xml"],
     min_sdk_version: "28"
 }
 
@@ -158,6 +162,7 @@
         "TestApp_TestApps"
     ],
     manifest: "manifests/DelegateManifest.xml",
+    additional_manifests: ["CommonManifest.xml"],
     min_sdk_version: "28"
 }
 
@@ -168,6 +173,7 @@
         "DeviceAdminApp"
     ],
     manifest: "manifests/RemoteDPCManifest.xml",
+    additional_manifests: ["CommonManifest.xml"],
     min_sdk_version: "28"
 }
 
@@ -177,6 +183,7 @@
         "TestApp_TestApps"
     ],
     manifest: "manifests/SmsAppManifest.xml",
+    additional_manifests: ["CommonManifest.xml"],
     min_sdk_version: "28"
 }
 
@@ -187,6 +194,17 @@
     ],
     resource_dirs: ["src/testapps/main/res/accountmanagement"],
     manifest: "manifests/AccountManagementManifest.xml",
+    additional_manifests: ["CommonManifest.xml"],
+    min_sdk_version: "28"
+}
+
+android_test_helper_app {
+    name: "RoleHolderApp",
+    static_libs: [
+        "TestApp_TestApps"
+    ],
+    manifest: "manifests/RoleHolderAppManifest.xml",
+    additional_manifests: ["CommonManifest.xml"],
     min_sdk_version: "28"
 }
 
diff --git a/common/device-side/bedstead/testapp/CommonManifest.xml b/common/device-side/bedstead/testapp/CommonManifest.xml
new file mode 100644
index 0000000..9786960
--- /dev/null
+++ b/common/device-side/bedstead/testapp/CommonManifest.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.TestApp" android:targetSandboxVersion="2">
+
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES" />
+
+    <uses-permission android:name="android.permission.UPDATE_PACKAGES_WITHOUT_USER_ACTION" />
+    <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
+    <uses-permission android:name="android.permission.READ_CALENDAR" />
+    <uses-permission android:name="android.permission.WRITE_CALENDAR" />
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+    <uses-permission android:name="android.permission.READ_SMS" />
+    <uses-permission android:name="android.permission.RECEIVE_WAP_PUSH" />
+    <uses-permission android:name="android.permission.RECEIVE_MMS" />
+    <uses-permission android:name="android.permission.READ_CELL_BROADCASTS" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.READ_CALL_LOG" />
+    <uses-permission android:name="android.permission.WRITE_CALL_LOG" />
+    <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_BASIC_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
+    <uses-permission android:name="android.permission.USE_SIP" />
+    <uses-permission android:name="android.permission.ANSWER_PHONE_CALLS" />
+    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
+    <uses-permission android:name="android.permission.CALL_COMPANION_APP" />
+    <uses-permission android:name="android.permission.ACCEPT_HANDOVER" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS" />
+    <uses-permission android:name="android.permission.BODY_SENSORS" />
+    <uses-permission android:name="android.permission.BODY_SENSORS_BACKGROUND" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.READ_PROFILE" />
+    <uses-permission android:name="android.permission.WRITE_PROFILE" />
+    <uses-permission android:name="android.permission.READ_SOCIAL_STREAM" />
+    <uses-permission android:name="android.permission.WRITE_SOCIAL_STREAM" />
+    <uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
+    <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />
+    <uses-permission android:name="android.permission.WRITE_SMS" />
+    <uses-permission android:name="com.android.browser.permission.READ_HISTORY_BOOKMARKS" />
+    <uses-permission android:name="com.android.browser.permission.WRITE_HISTORY_BOOKMARKS" />
+    <uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
+    <uses-permission android:name="android.permission.USE_CREDENTIALS" />
+    <uses-permission android:name="android.permission.SUBSCRIBED_FEEDS_READ" />
+    <uses-permission android:name="android.permission.SUBSCRIBED_FEEDS_WRITE" />
+    <uses-permission android:name="android.permission.FLASHLIGHT" />
+    <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
+    <uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE" />
+    <uses-permission android:name="android.permission.UWB_RANGING" />
+    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.NFC" />
+    <uses-permission android:name="android.permission.NFC_TRANSACTION_EVENT" />
+    <uses-permission android:name="android.permission.NFC_PREFERRED_PAYMENT_INFO" />
+    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    <uses-permission android:name="android.permission.TRANSMIT_IR" />
+    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_EMBEDDED_SUBSCRIPTIONS" />
+    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
+    <uses-permission android:name="android.permission.REQUEST_PASSWORD_COMPLEXITY" />
+    <uses-permission android:name="android.permission.GET_TASKS" />
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+    <uses-permission android:name="android.permission.ACCESS_BLOBS_ACROSS_USERS" />
+    <uses-permission android:name="android.permission.REORDER_TASKS" />
+    <uses-permission android:name="android.permission.START_FOREGROUND_SERVICES_FROM_BACKGROUND" />
+    <uses-permission android:name="android.permission.RESTART_PACKAGES" />
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
+    <uses-permission android:name="android.permission.GET_PROCESS_STATE_AND_OOM_SCORE" />
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND" />
+    <uses-permission android:name="android.permission.REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND" />
+    <uses-permission android:name="android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND" />
+    <uses-permission android:name="android.permission.REQUEST_COMPANION_PROFILE_WATCH" />
+    <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER" />
+    <uses-permission android:name="android.permission.SET_WALLPAPER_HINTS" />
+    <uses-permission android:name="android.permission.EXPAND_STATUS_BAR" />
+    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT" />
+    <uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT" />
+    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS" />
+    <uses-permission android:name="android.permission.READ_SYNC_STATS" />
+    <uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
+    <uses-permission android:name="android.permission.SET_ANIMATION_SCALE" />
+    <uses-permission android:name="android.permission.PERSISTENT_ACTIVITY" />
+    <uses-permission android:name="android.permission.GET_PACKAGE_SIZE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
+    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
+    <uses-permission android:name="android.permission.DUMP" />
+    <uses-permission android:name="android.permission.CONTROL_UI_TRACING" />
+    <uses-permission android:name="android.permission.READ_LOGS" />
+    <uses-permission android:name="android.permission.SET_DEBUG_APP" />
+    <uses-permission android:name="android.permission.SET_PROCESS_LIMIT" />
+    <uses-permission android:name="android.permission.SET_ALWAYS_FINISH" />
+    <uses-permission android:name="android.permission.SIGNAL_PERSISTENT_PROCESSES" />
+    <uses-permission android:name="android.permission.GET_APP_OPS_STATS" />
+    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM" />
+    <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
+    <uses-permission android:name="android.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE" />
+    <uses-permission android:name="android.permission.DELIVER_COMPANION_MESSAGES" />
+    <uses-permission android:name="android.permission.BRIGHTNESS_SLIDER_USAGE" />
+    <uses-permission android:name="android.permission.ACCESS_AMBIENT_LIGHT_STATS" />
+    <uses-permission android:name="android.permission.CONFIGURE_DISPLAY_BRIGHTNESS" />
+    <uses-permission android:name="android.permission.SET_VOLUME_KEY_LONG_PRESS_LISTENER" />
+    <uses-permission android:name="android.permission.SET_MEDIA_KEY_LISTENER" />
+    <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
+    <uses-permission android:name="android.permission.BATTERY_STATS" />
+    <uses-permission android:name="android.permission.READ_INSTALL_SESSIONS" />
+    <uses-permission android:name="android.permission.INSTANT_APP_FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.MODIFY_QUIET_MODE" />
+    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <uses-permission android:name="android.permission.READ_NEARBY_STREAMING_POLICY" />
+
+    <application
+        android:appComponentFactory="com.android.bedstead.testapp.TestAppAppComponentFactory">
+
+        <activity android:name="android.testapp.MainActivity" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.testapp.activity" android:exported="true" />
+
+        <activity android:name="android.testapp.CrossProfileSharingActivity"
+                  android:exported="true">
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="com.android.testapp.SOME_ACTION"/>
+            </intent-filter>
+            <!-- Catch ACTION_PICK in case there is no other app handing it-->
+            <intent-filter>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.intent.action.PICK"/>
+            </intent-filter>
+        </activity>
+
+        <receiver android:name="com.android.bedstead.testapp.TestAppBroadcastController"
+                  android:exported="true" />
+    </application>
+    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28"/>
+</manifest>
diff --git a/common/device-side/bedstead/testapp/manifests/AccountManagementManifest.xml b/common/device-side/bedstead/testapp/manifests/AccountManagementManifest.xml
index 09256e5..2d7bc40 100644
--- a/common/device-side/bedstead/testapp/manifests/AccountManagementManifest.xml
+++ b/common/device-side/bedstead/testapp/manifests/AccountManagementManifest.xml
@@ -20,7 +20,6 @@
           package="com.android.bedstead.testapp.AccountManagementApp">
 
     <application
-        android:appComponentFactory="com.android.bedstead.testapp.TestAppAppComponentFactory"
         android:testOnly="true">
 
         <service android:name=".TestAppAccountAuthenticatorService" android:exported="true">
diff --git a/common/device-side/bedstead/testapp/manifests/DelegateManifest.xml b/common/device-side/bedstead/testapp/manifests/DelegateManifest.xml
index 5bd3772..2dbab47 100644
--- a/common/device-side/bedstead/testapp/manifests/DelegateManifest.xml
+++ b/common/device-side/bedstead/testapp/manifests/DelegateManifest.xml
@@ -18,13 +18,19 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.Delegate" android:targetSandboxVersion="2">
-
-    <application
-        android:appComponentFactory="com.android.bedstead.testapp.TestAppAppComponentFactory">
-
+    <application>
         <!-- Don't allow this test app to be returned by queries unless filtered by package name -->
         <meta-data android:name="testapp-package-query-only" android:value="true" />
 
+        <receiver android:name="com.android.bedstead.testapp.BaseTestAppDelegatedAdminReceiver"
+                  android:permission="android.permission.BIND_DEVICE_ADMIN"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.app.action.CHOOSE_PRIVATE_KEY_ALIAS"/>
+                <action android:name="android.app.action.NETWORK_LOGS_AVAILABLE"/>
+                <action android:name="android.app.action.SECURITY_LOGS_AVAILABLE"/>
+            </intent-filter>
+        </receiver>
     </application>
     <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28"/>
 </manifest>
\ No newline at end of file
diff --git a/common/device-side/bedstead/testapp/manifests/DeviceAdminManifest.xml b/common/device-side/bedstead/testapp/manifests/DeviceAdminManifest.xml
index 018de06..4ac4d4a 100644
--- a/common/device-side/bedstead/testapp/manifests/DeviceAdminManifest.xml
+++ b/common/device-side/bedstead/testapp/manifests/DeviceAdminManifest.xml
@@ -18,12 +18,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.bedstead.testapp.DeviceAdminTestApp">
-    <application
-        android:appComponentFactory="com.android.bedstead.testapp.TestAppAppComponentFactory"
-        android:testOnly="true">
-
-        <activity android:name="android.testapp.activity" android:exported="true" />
-
+    <application android:appComponentFactory="com.android.bedstead.testapp.TestAppAppComponentFactory">
         <receiver android:name=".DeviceAdminReceiver"
                   android:permission="android.permission.BIND_DEVICE_ADMIN"
                   android:exported="true">
diff --git a/common/device-side/bedstead/testapp/manifests/EmptyTestApp2Manifest.xml b/common/device-side/bedstead/testapp/manifests/EmptyTestApp2Manifest.xml
deleted file mode 100644
index 778d8d0..0000000
--- a/common/device-side/bedstead/testapp/manifests/EmptyTestApp2Manifest.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (C) 2021 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.
-  -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.bedstead.testapp.EmptyTestApp2">
-
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-
-    <application
-        android:appComponentFactory="com.android.bedstead.testapp.TestAppAppComponentFactory">
-
-        <activity android:name="android.testapp.activity" android:exported="true" />
-
-        <activity android:name="android.testapp.CrossProfileSharingActivity"
-                  android:exported="true">
-            <intent-filter>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <action android:name="com.android.testapp.SOME_ACTION"/>
-            </intent-filter>
-            <!-- Catch ACTION_PICK in case there is no other app handing it-->
-            <intent-filter>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <action android:name="android.intent.action.PICK"/>
-            </intent-filter>
-        </activity>
-    </application>
-    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28"/>
-</manifest>
diff --git a/common/device-side/bedstead/testapp/manifests/EmptyTestAppManifest.xml b/common/device-side/bedstead/testapp/manifests/EmptyTestAppManifest.xml
index ed0290f..1edf39d 100644
--- a/common/device-side/bedstead/testapp/manifests/EmptyTestAppManifest.xml
+++ b/common/device-side/bedstead/testapp/manifests/EmptyTestAppManifest.xml
@@ -18,20 +18,6 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.bedstead.testapp.EmptyTestApp">
-
-    <uses-permission android:name="android.permission.READ_SMS" />
-    <uses-permission android:name="android.permission.BODY_SENSORS" />
-    <uses-permission android:name="android.permission.ACTIVITY_RECOGNITION" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_CALENDAR" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-
-    <application
-        android:appComponentFactory="com.android.bedstead.testapp.TestAppAppComponentFactory">
-        <meta-data android:name="test-metadata-key" android:value="test-metadata-value" />
+    <application>
     </application>
-    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28"/>
 </manifest>
diff --git a/common/device-side/bedstead/testapp/manifests/LockTaskAppManifest.xml b/common/device-side/bedstead/testapp/manifests/LockTaskAppManifest.xml
index 09685225..ff8ea1c5 100644
--- a/common/device-side/bedstead/testapp/manifests/LockTaskAppManifest.xml
+++ b/common/device-side/bedstead/testapp/manifests/LockTaskAppManifest.xml
@@ -19,7 +19,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.bedstead.testapp.LockTaskApp">
     <application
-        android:appComponentFactory="com.android.bedstead.testapp.TestAppAppComponentFactory"
         android:testOnly="true">
 
         <activity android:name="android.testapp.ifwhitelistedactivity" android:lockTaskMode="if_whitelisted" android:exported="true" />
diff --git a/common/device-side/bedstead/testapp/manifests/NotEmptyTestAppManifest.xml b/common/device-side/bedstead/testapp/manifests/NotEmptyTestAppManifest.xml
new file mode 100644
index 0000000..2eee159
--- /dev/null
+++ b/common/device-side/bedstead/testapp/manifests/NotEmptyTestAppManifest.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.bedstead.testapp.NotEmptyTestApp">
+
+    <application>
+        <meta-data android:name="test-metadata-key" android:value="test-metadata-value" />
+    </application>
+    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28"/>
+</manifest>
diff --git a/common/device-side/bedstead/testapp/manifests/RemoteDPCManifest.xml b/common/device-side/bedstead/testapp/manifests/RemoteDPCManifest.xml
index 395b5a5..f107562 100644
--- a/common/device-side/bedstead/testapp/manifests/RemoteDPCManifest.xml
+++ b/common/device-side/bedstead/testapp/manifests/RemoteDPCManifest.xml
@@ -18,9 +18,6 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.RemoteDPC" android:targetSandboxVersion="2">
-
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES" />
-
     <application
         android:appComponentFactory="com.android.bedstead.testapp.TestAppAppComponentFactory"
         android:testOnly="true">
@@ -37,7 +34,6 @@
                 <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
             </intent-filter>
         </receiver>
-
     </application>
     <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28"/>
 </manifest>
\ No newline at end of file
diff --git a/common/device-side/bedstead/testapp/manifests/RoleHolderAppManifest.xml b/common/device-side/bedstead/testapp/manifests/RoleHolderAppManifest.xml
new file mode 100644
index 0000000..74cb855
--- /dev/null
+++ b/common/device-side/bedstead/testapp/manifests/RoleHolderAppManifest.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.bedstead.testapp.RoleHolderTestApp">
+    <application android:appComponentFactory="com.android.bedstead.testapp.TestAppAppComponentFactory">
+        <!-- Activity that filters the trusted source provisioning intent action  -->
+        <activity android:name=".RoleHolderTrustedSourceActivity"
+                  android:exported="true"
+                  android:permission="android.permission.LAUNCH_DEVICE_MANAGER_SETUP">
+            <intent-filter>
+                <action android:name="android.app.action.ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- Activity that filters the managed profile provisioning intent action  -->
+        <activity android:name=".RoleHolderManagedProfileActivity"
+                  android:exported="true"
+                  android:permission="android.permission.LAUNCH_DEVICE_MANAGER_SETUP">
+            <intent-filter>
+                <action android:name="android.app.action.ROLE_HOLDER_PROVISION_MANAGED_PROFILE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- Activity that filters the provisioning finalization intent action  -->
+        <activity android:name=".RoleHolderFinalizationActivity"
+                  android:exported="true"
+                  android:permission="android.permission.LAUNCH_DEVICE_MANAGER_SETUP">
+            <intent-filter>
+                <action android:name="android.app.action.ROLE_HOLDER_PROVISION_FINALIZATION"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- Receiver for when a managed profile becomes available/unavailable/removed  -->
+        <receiver android:name=".ProfileStatusChangedReceiver"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MANAGED_PROFILE_UNAVAILABLE"/>
+                <action android:name="android.intent.action.MANAGED_PROFILE_AVAILABLE"/>
+                <action android:name="android.intent.action.MANAGED_PROFILE_REMOVED"/>
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
diff --git a/common/device-side/bedstead/testapp/manifests/SmsAppManifest.xml b/common/device-side/bedstead/testapp/manifests/SmsAppManifest.xml
index 2cbde3c..e68722c 100644
--- a/common/device-side/bedstead/testapp/manifests/SmsAppManifest.xml
+++ b/common/device-side/bedstead/testapp/manifests/SmsAppManifest.xml
@@ -18,11 +18,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.bedstead.testapp.SmsApp">
-
-    <uses-permission android:name="android.permission.READ_SMS"/>
-
     <application
-        android:appComponentFactory="com.android.bedstead.testapp.TestAppAppComponentFactory"
         android:testOnly="true">
 
         <!-- BroadcastReceiver that listens for incoming SMS messages -->
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestApp.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestApp.java
index ac75967..75c4e59390 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestApp.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestApp.java
@@ -44,7 +44,7 @@
 public final class TestApp {
     // Must be instrumentation context to access resources
     private static final Context sContext = TestApis.context().instrumentationContext();
-    private final TestAppDetails mDetails;
+    final TestAppDetails mDetails;
 
     TestApp(TestAppDetails details) {
         if (details == null) {
@@ -143,9 +143,18 @@
         return new TestAppInstance(this, user);
     }
 
-    private byte[] apkBytes() {
-        try (InputStream inputStream =
-                     sContext.getResources().openRawResource(mDetails.mResourceIdentifier)) {
+    /**
+     * Returns an {@link InputStream} of the apk for this app.
+     */
+    public InputStream apkStream() {
+        return sContext.getResources().openRawResource(mDetails.mResourceIdentifier);
+    }
+
+    /**
+     * Returns a byte array of the apk for this app.
+     */
+    public byte[] apkBytes() {
+        try (InputStream inputStream = apkStream()) {
             return readInputStreamFully(inputStream);
         } catch (IOException e) {
             throw new NeneException("Error when reading TestApp bytes", e);
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivities.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivities.java
index d95def6..4e0abaf 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivities.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivities.java
@@ -16,14 +16,11 @@
 
 package com.android.bedstead.testapp;
 
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-
-import com.android.bedstead.nene.TestApis;
 import com.android.queryable.info.ActivityInfo;
 
 import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * Entry point to activity querying.
@@ -48,24 +45,10 @@
             return mActivities;
         }
 
-        mActivities = new HashSet<>();
-
-        PackageManager p = TestApis.context().instrumentedContext().getPackageManager();
-        try {
-            PackageInfo packageInfo = p.getPackageInfo(
-                    mInstance.packageName(), /* flags= */ PackageManager.GET_ACTIVITIES);
-            for (android.content.pm.ActivityInfo activityInfo : packageInfo.activities) {
-                if (activityInfo.name.startsWith("androidx")) {
-                    // Special case: androidx adds non-logging activities
-                    continue;
-                }
-                mActivities.add(com.android.queryable.info.ActivityInfo.builder(
-                        activityInfo).build());
-            }
-        } catch (PackageManager.NameNotFoundException e) {
-            throw new IllegalStateException("Cannot query activities if app is not installed");
-        }
-
+        mActivities = new HashSet<>(
+                mInstance.testApp().mDetails.mActivities.stream().filter(
+                        m -> !m.className().startsWith("androidx")).collect(
+                Collectors.toSet()));
         return mActivities;
     }
 
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java
index 761dec6..d58d98e 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppActivitiesQueryBuilder.java
@@ -17,6 +17,7 @@
 package com.android.bedstead.testapp;
 
 import android.content.ComponentName;
+import android.util.Log;
 
 import com.android.bedstead.nene.TestApis;
 import com.android.queryable.Queryable;
@@ -60,7 +61,9 @@
             }
         }
 
-        throw new IllegalStateException("No matching unused activity for query");
+        throw new IllegalStateException(
+                "No matching unused activity for query. Found activities: "
+                        + mTestAppActivities.activities());
     }
 
     @Override
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppEvents.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppEvents.java
index 2a925dd..3c45313 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppEvents.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppEvents.java
@@ -26,33 +26,66 @@
 import com.android.eventlib.events.activities.ActivityStoppedEvent;
 import com.android.eventlib.events.broadcastreceivers.BroadcastReceivedEvent;
 import com.android.eventlib.events.broadcastreceivers.BroadcastReceiverEvents;
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminChoosePrivateKeyAliasEvent;
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminChoosePrivateKeyAliasEvent.DelegatedAdminChoosePrivateKeyAliasEventQuery;
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminReceiverEvents;
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminSecurityLogsAvailableEvent;
+import com.android.eventlib.events.delegatedadminreceivers.DelegatedAdminSecurityLogsAvailableEvent.DelegatedAdminSecurityLogsAvailableEventQuery;
+import com.android.eventlib.events.deviceadminreceivers.DelegatedAdminNetworkLogsAvailableEvent;
+import com.android.eventlib.events.deviceadminreceivers.DelegatedAdminNetworkLogsAvailableEvent.DelegatedAdminNetworkLogsAvailableEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminBugreportFailedEvent;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminBugreportSharedEvent;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminBugreportSharingDeclinedEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminBugreportSharingDeclinedEvent.DeviceAdminBugreportSharingDeclinedEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminChoosePrivateKeyAliasEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminChoosePrivateKeyAliasEvent.DeviceAdminChoosePrivateKeyAliasEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminDisableRequestedEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminDisableRequestedEvent.DeviceAdminDisableRequestedEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminDisabledEvent;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminEnabledEvent;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminLockTaskModeEnteringEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminLockTaskModeEnteringEvent.DeviceAdminLockTaskModeEnteringEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminLockTaskModeExitingEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminLockTaskModeExitingEvent.DeviceAdminLockTaskModeExitingEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminNetworkLogsAvailableEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminNetworkLogsAvailableEvent.DeviceAdminNetworkLogsAvailableEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminOperationSafetyStateChangedEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminOperationSafetyStateChangedEvent.DeviceAdminOperationSafetyStateChangedEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminPasswordChangedEvent;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminPasswordExpiringEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminPasswordExpiringEvent.DeviceAdminPasswordExpiringEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminPasswordFailedEvent;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminPasswordSucceededEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminPasswordSucceededEvent.DeviceAdminPasswordSucceededEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminProfileProvisioningCompleteEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminProfileProvisioningCompleteEvent.DeviceAdminProfileProvisioningCompleteEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminReadyForUserInitializationEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminReadyForUserInitializationEvent.DeviceAdminReadyForUserInitializationEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminReceiverEvents;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminSecurityLogsAvailableEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminSecurityLogsAvailableEvent.DeviceAdminSecurityLogsAvailableEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminSystemUpdatePendingEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminSystemUpdatePendingEvent.DeviceAdminSystemUpdatePendingEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminTransferAffiliatedProfileOwnershipCompleteEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminTransferAffiliatedProfileOwnershipCompleteEvent.DeviceAdminTransferAffiliatedProfileOwnershipCompleteEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminTransferOwnershipCompleteEvent;
+import com.android.eventlib.events.deviceadminreceivers.DeviceAdminTransferOwnershipCompleteEvent.DeviceAdminTransferOwnershipCompleteEventQuery;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminUserAddedEvent;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminUserRemovedEvent;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminUserStartedEvent;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminUserStoppedEvent;
 import com.android.eventlib.events.deviceadminreceivers.DeviceAdminUserSwitchedEvent;
+import com.android.eventlib.events.services.ServiceBoundEvent;
+import com.android.eventlib.events.services.ServiceConfigurationChangedEvent;
+import com.android.eventlib.events.services.ServiceCreatedEvent;
+import com.android.eventlib.events.services.ServiceDestroyedEvent;
+import com.android.eventlib.events.services.ServiceEvents;
+import com.android.eventlib.events.services.ServiceLowMemoryEvent;
+import com.android.eventlib.events.services.ServiceMemoryTrimmedEvent;
+import com.android.eventlib.events.services.ServiceReboundEvent;
+import com.android.eventlib.events.services.ServiceStartedEvent;
+import com.android.eventlib.events.services.ServiceTaskRemovedEvent;
+import com.android.eventlib.events.services.ServiceUnboundEvent;
 
 /**
  * Quick access to events on this test app.
@@ -62,7 +95,7 @@
  * <p>{@code #poll} can be used to fetch results, and the result can be asserted on.
  */
 public class TestAppEvents implements ActivityEvents, BroadcastReceiverEvents,
-        DeviceAdminReceiverEvents {
+        DeviceAdminReceiverEvents, DelegatedAdminReceiverEvents, ServiceEvents {
 
     private final TestAppInstance mTestApp;
 
@@ -141,14 +174,14 @@
     }
 
     @Override
-    public DeviceAdminBugreportSharingDeclinedEvent.DeviceAdminBugreportSharingDeclinedEventQuery bugReportSharingDeclined() {
+    public DeviceAdminBugreportSharingDeclinedEventQuery bugReportSharingDeclined() {
         return DeviceAdminBugreportSharingDeclinedEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
     }
 
     @Override
-    public DeviceAdminChoosePrivateKeyAliasEvent.DeviceAdminChoosePrivateKeyAliasEventQuery choosePrivateKeyAlias() {
+    public DeviceAdminChoosePrivateKeyAliasEventQuery choosePrivateKeyAlias() {
         return DeviceAdminChoosePrivateKeyAliasEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
@@ -162,7 +195,7 @@
     }
 
     @Override
-    public DeviceAdminDisableRequestedEvent.DeviceAdminDisableRequestedEventQuery deviceAdminDisableRequested() {
+    public DeviceAdminDisableRequestedEventQuery deviceAdminDisableRequested() {
         return DeviceAdminDisableRequestedEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
@@ -176,28 +209,28 @@
     }
 
     @Override
-    public DeviceAdminLockTaskModeEnteringEvent.DeviceAdminLockTaskModeEnteringEventQuery lockTaskModeEntering() {
+    public DeviceAdminLockTaskModeEnteringEventQuery lockTaskModeEntering() {
         return DeviceAdminLockTaskModeEnteringEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
     }
 
     @Override
-    public DeviceAdminLockTaskModeExitingEvent.DeviceAdminLockTaskModeExitingEventQuery lockTaskModeExiting() {
+    public DeviceAdminLockTaskModeExitingEventQuery lockTaskModeExiting() {
         return DeviceAdminLockTaskModeExitingEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
     }
 
     @Override
-    public DeviceAdminNetworkLogsAvailableEvent.DeviceAdminNetworkLogsAvailableEventQuery networkLogsAvailable() {
+    public DeviceAdminNetworkLogsAvailableEventQuery networkLogsAvailable() {
         return DeviceAdminNetworkLogsAvailableEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
     }
 
     @Override
-    public DeviceAdminOperationSafetyStateChangedEvent.DeviceAdminOperationSafetyStateChangedEventQuery operationSafetyStateChanged() {
+    public DeviceAdminOperationSafetyStateChangedEventQuery operationSafetyStateChanged() {
         return DeviceAdminOperationSafetyStateChangedEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
@@ -211,7 +244,7 @@
     }
 
     @Override
-    public DeviceAdminPasswordExpiringEvent.DeviceAdminPasswordExpiringEventQuery passwordExpiring() {
+    public DeviceAdminPasswordExpiringEventQuery passwordExpiring() {
         return DeviceAdminPasswordExpiringEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
@@ -225,49 +258,49 @@
     }
 
     @Override
-    public DeviceAdminPasswordSucceededEvent.DeviceAdminPasswordSucceededEventQuery passwordSucceeded() {
+    public DeviceAdminPasswordSucceededEventQuery passwordSucceeded() {
         return DeviceAdminPasswordSucceededEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
     }
 
     @Override
-    public DeviceAdminProfileProvisioningCompleteEvent.DeviceAdminProfileProvisioningCompleteEventQuery profileProvisioningComplete() {
+    public DeviceAdminProfileProvisioningCompleteEventQuery profileProvisioningComplete() {
         return DeviceAdminProfileProvisioningCompleteEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
     }
 
     @Override
-    public DeviceAdminReadyForUserInitializationEvent.DeviceAdminReadyForUserInitializationEventQuery readyForUserInitialization() {
+    public DeviceAdminReadyForUserInitializationEventQuery readyForUserInitialization() {
         return DeviceAdminReadyForUserInitializationEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
     }
 
     @Override
-    public DeviceAdminSecurityLogsAvailableEvent.DeviceAdminSecurityLogsAvailableEventQuery securityLogsAvailable() {
+    public DeviceAdminSecurityLogsAvailableEventQuery securityLogsAvailable() {
         return DeviceAdminSecurityLogsAvailableEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
     }
 
     @Override
-    public DeviceAdminSystemUpdatePendingEvent.DeviceAdminSystemUpdatePendingEventQuery systemUpdatePending() {
+    public DeviceAdminSystemUpdatePendingEventQuery systemUpdatePending() {
         return DeviceAdminSystemUpdatePendingEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
     }
 
     @Override
-    public DeviceAdminTransferAffiliatedProfileOwnershipCompleteEvent.DeviceAdminTransferAffiliatedProfileOwnershipCompleteEventQuery transferAffiliatedProfileOwnershipComplete() {
+    public DeviceAdminTransferAffiliatedProfileOwnershipCompleteEventQuery transferAffiliatedProfileOwnershipComplete() {
         return DeviceAdminTransferAffiliatedProfileOwnershipCompleteEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
     }
 
     @Override
-    public DeviceAdminTransferOwnershipCompleteEvent.DeviceAdminTransferOwnershipCompleteEventQuery transferOwnershipComplete() {
+    public DeviceAdminTransferOwnershipCompleteEventQuery transferOwnershipComplete() {
         return DeviceAdminTransferOwnershipCompleteEvent.queryPackage(
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
@@ -307,4 +340,96 @@
                 mTestApp.packageName())
                 .onUser(mTestApp.user());
     }
+
+    @Override
+    public ServiceCreatedEvent.ServiceCreatedEventQuery serviceCreated() {
+        return ServiceCreatedEvent.queryPackage(
+                mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
+
+    @Override
+    public ServiceStartedEvent.ServiceStartedEventQuery serviceStarted() {
+        return ServiceStartedEvent.queryPackage(
+                mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
+
+    @Override
+    public ServiceDestroyedEvent.ServiceDestroyedEventQuery serviceDestroyed() {
+        return ServiceDestroyedEvent.queryPackage(
+                mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
+
+    @Override
+    public ServiceConfigurationChangedEvent.ServiceConfigurationChangedEventQuery
+            serviceConfigurationChanged() {
+        return ServiceConfigurationChangedEvent.queryPackage(
+                mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
+
+    @Override
+    public ServiceLowMemoryEvent.ServiceLowMemoryEventQuery serviceLowMemory() {
+        return ServiceLowMemoryEvent.queryPackage(
+                mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
+
+    @Override
+    public ServiceMemoryTrimmedEvent.ServiceMemoryTrimmedEventQuery serviceMemoryTrimmed() {
+        return ServiceMemoryTrimmedEvent.queryPackage(
+                mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
+
+    @Override
+    public ServiceBoundEvent.ServiceBoundEventQuery serviceBound() {
+        return ServiceBoundEvent.queryPackage(
+                mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
+
+    @Override
+    public ServiceUnboundEvent.ServiceUnboundEventQuery serviceUnbound() {
+        return ServiceUnboundEvent.queryPackage(
+                mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
+
+    @Override
+    public ServiceReboundEvent.ServiceReboundEventQuery serviceRebound() {
+        return ServiceReboundEvent.queryPackage(
+                mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
+
+    @Override
+    public ServiceTaskRemovedEvent.ServiceTaskRemovedEventQuery serviceTaskRemoved() {
+        return ServiceTaskRemovedEvent.queryPackage(
+                mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
+
+    @Override
+    public DelegatedAdminChoosePrivateKeyAliasEventQuery delegateChoosePrivateKeyAlias() {
+        return DelegatedAdminChoosePrivateKeyAliasEvent.queryPackage(
+                mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
+
+    @Override
+    public DelegatedAdminNetworkLogsAvailableEventQuery delegateNetworkLogsAvailable() {
+        return DelegatedAdminNetworkLogsAvailableEvent.queryPackage(
+                        mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
+
+    @Override
+    public DelegatedAdminSecurityLogsAvailableEventQuery delegateSecurityLogsAvailable() {
+        return DelegatedAdminSecurityLogsAvailableEvent.queryPackage(
+                        mTestApp.testApp().packageName())
+                .onUser(mTestApp.user());
+    }
 }
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstance.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstance.java
index 68cf755..3fe77b6 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstance.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstance.java
@@ -22,6 +22,9 @@
 import android.app.admin.DevicePolicyManager;
 import android.app.admin.RemoteDevicePolicyManager;
 import android.app.admin.RemoteDevicePolicyManagerWrapper;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.RemoteBluetoothManager;
+import android.bluetooth.RemoteBluetoothManagerWrapper;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.IntentFilter;
@@ -49,6 +52,7 @@
 import android.security.RemoteKeyChainWrapper;
 
 import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.exceptions.NeneException;
 import com.android.bedstead.nene.packages.ProcessReference;
 import com.android.bedstead.nene.users.UserReference;
 
@@ -77,6 +81,8 @@
     private final ProfileTestAppController mTestAppController;
     private final TestAppActivities mTestAppActivities;
     private boolean mKeepAliveManually = false;
+    private final TestAppInstancePermissions mTestAppInstancePermissions =
+            new TestAppInstancePermissions(this);
 
     /**
      * Use {@link TestApp#install} or {@link TestApp#instance} to get an instance of
@@ -150,19 +156,30 @@
      * will have the same effect as calling {@link #keepAlive()}.
      */
     public void registerReceiver(IntentFilter intentFilter) {
+        registerReceiver(intentFilter, 0);
+    }
+
+    /**
+     * See {@link registerReceiver(IntentFilter)}.
+     */
+    public void registerReceiver(IntentFilter intentFilter, int flags) {
         if (mRegisteredBroadcastReceivers.containsKey(intentFilter)) {
             return;
         }
 
         long receiverId = UUID.randomUUID().getMostSignificantBits();
-        registerReceiver(intentFilter, receiverId);
+        registerReceiver(intentFilter, receiverId, flags);
         keepAlive(/* manualKeepAlive= */ false);
     }
 
     private void registerReceiver(IntentFilter intentFilter, long receiverId) {
+        registerReceiver(intentFilter, receiverId, 0);
+    }
+
+    private void registerReceiver(IntentFilter intentFilter, long receiverId, int flags) {
         try {
             mConnector.connect();
-            mTestAppController.other().registerReceiver(receiverId, intentFilter);
+            mTestAppController.other().registerReceiver(receiverId, intentFilter, flags);
             mRegisteredBroadcastReceivers.put(intentFilter, receiverId);
         } catch (UnavailableProfileException e) {
             throw new IllegalStateException("Could not connect to test app", e);
@@ -234,26 +251,25 @@
         return this;
     }
 
-    // TODO(b/203758521): Restore functionality of killing process
-//    /**
-//     * Immediately force stops the app.
-//     *
-//     * <p>This will also stop keeping the target app alive (see {@link #stopKeepAlive()}.
-//     */
-//    public TestAppInstance stop() {
-//        stopKeepAlive();
-//
-//        ProcessReference process = mTestApp.pkg().runningProcess(mUser);
-//        if (process != null) {
-//            try {
-//                process.kill();
-//            } catch (NeneException e) {
-//                throw new NeneException("Error killing process... process is " + process(), e);
-//            }
-//        }
-//
-//        return this;
-//    }
+    /**
+     * Immediately force stops the app.
+     *
+     * <p>This will also stop keeping the target app alive (see {@link #stopKeepAlive()}.
+     */
+    public TestAppInstance stop() {
+        stopKeepAlive();
+
+        ProcessReference process = mTestApp.pkg().runningProcess(mUser);
+        if (process != null) {
+            try {
+                process.kill();
+            } catch (NeneException e) {
+                throw new NeneException("Error killing process... process is " + process(), e);
+            }
+        }
+
+        return this;
+    }
 
     /**
      * Gets the {@link ProcessReference} of the app, if any.
@@ -374,6 +390,22 @@
         return new RemoteKeyChainWrapper(mConnector);
     }
 
+    /**
+     * Access the {@link BluetoothManager} using this test app.
+     *
+     * <p>Almost all methods are available. Those that are not will be missing from the interface.
+     */
+    public RemoteBluetoothManager bluetoothManager() {
+        return new RemoteBluetoothManagerWrapper(mConnector);
+    }
+
+    /**
+     * Access permissions for this test app.
+     */
+    public TestAppInstancePermissions permissions() {
+        return mTestAppInstancePermissions;
+    }
+
     @Override
     public String toString() {
         return "TestAppInstance{"
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstancePermissions.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstancePermissions.java
new file mode 100644
index 0000000..1e3115a
--- /dev/null
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppInstancePermissions.java
@@ -0,0 +1,418 @@
+/*
+ * Copyright (C) 2021 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.bedstead.testapp;
+
+import com.android.bedstead.nene.appops.AppOpsMode;
+import com.android.bedstead.nene.permissions.PermissionContext;
+import com.android.bedstead.nene.permissions.PermissionsController;
+import com.android.bedstead.nene.utils.Versions;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * Permissions management for a test app instance.
+ */
+public final class TestAppInstancePermissions implements PermissionsController {
+
+    private final List<TestAppPermissionContext> mPermissionContexts =
+            Collections.synchronizedList(new ArrayList<>());
+    private final TestAppInstance mTestAppInstance;
+
+    TestAppInstancePermissions(TestAppInstance testAppInstance) {
+        mTestAppInstance = testAppInstance;
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given permissions are granted to the test app.
+     *
+     * <p>The permission will only be granted for calls made by the test app.
+     *
+     * <p>If the permissions cannot be granted, and are not already granted, an exception will be
+     * thrown.
+     *
+     * <p>Note that only runtime and development permissions can be granted to test apps.
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = testApp.permissions().withPermission(PERMISSION1, PERMISSION2) {
+     * // Code which needs the permissions goes here
+     * }
+     * }
+     */
+    @Override
+    public TestAppPermissionContext withPermission(String... permissions) {
+        TestAppPermissionContext context =
+                new TestAppPermissionContext(this);
+        mPermissionContexts.add(context);
+        context.withPermission(permissions);
+
+        return context;
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given permissions are granted to the test app.
+     *
+     * <p>The permission will only be granted for calls made by the test app.
+     *
+     * <p>If the permissions cannot be granted, and are not already granted, an exception will be
+     * thrown.
+     *
+     * <p>Note that only runtime and development permissions can be granted to test apps.
+     *
+     * <p>The permission will only be granted on the given version.
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = testApp.permissions()
+     *     .withPermissionOnVersion(R, PERMISSION1, PERMISSION2) {
+     * // Code which needs the permissions goes here
+     * }
+     * }
+     */
+    @Override
+    public TestAppPermissionContext withPermissionOnVersion(int sdkVersion, String... permissions) {
+        return withPermissionOnVersionBetween(sdkVersion, sdkVersion, permissions);
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given permissions are granted to the test app.
+     *
+     * <p>The permission will only be granted for calls made by the test app.
+     *
+     * <p>If the permissions cannot be granted, and are not already granted, an exception will be
+     * thrown.
+     *
+     * <p>Note that only runtime and development permissions can be granted to test apps.
+     *
+     * <p>The permission will only be granted on the given version or higher.
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = testApp.permissions()
+     *     .withPermissionOnVersionAtLest(R, PERMISSION1, PERMISSION2) {
+     * // Code which needs the permissions goes here
+     * }
+     * }
+     */
+    @Override
+    public TestAppPermissionContext withPermissionOnVersionAtLeast(
+            int minSdkVersion, String... permissions) {
+        return withPermissionOnVersionBetween(minSdkVersion, Versions.ANY, permissions);
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given permissions are granted to the test app.
+     *
+     * <p>The permission will only be granted for calls made by the test app.
+     *
+     * <p>If the permissions cannot be granted, and are not already granted, an exception will be
+     * thrown.
+     *
+     * <p>Note that only runtime and development permissions can be granted to test apps.
+     *
+     * <p>The permission will only be granted on the given version or lower
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = testApp.permissions()
+     *     .withPermissionOnVersionAtMost(R, PERMISSION1, PERMISSION2) {
+     * // Code which needs the permissions goes here
+     * }
+     * }
+     */
+    @Override
+    public TestAppPermissionContext withPermissionOnVersionAtMost(
+            int maxSdkVersion, String... permissions) {
+        return withPermissionOnVersionBetween(Versions.ANY, maxSdkVersion, permissions);
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given permissions are granted to the test app.
+     *
+     * <p>The permission will only be granted for calls made by the test app.
+     *
+     * <p>If the permissions cannot be granted, and are not already granted, an exception will be
+     * thrown.
+     *
+     * <p>Note that only runtime and development permissions can be granted to test apps.
+     *
+     * <p>The permission will only be granted on versions between those given (inclusive).
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = testApp.permissions()
+     *     .withPermissionOnVersionBetween(R, T, PERMISSION1, PERMISSION2) {
+     * // Code which needs the permissions goes here
+     * }
+     * }
+     */
+    @Override
+    public TestAppPermissionContext withPermissionOnVersionBetween(
+            int minSdkVersion, int maxSdkVersion, String... permissions) {
+        TestAppPermissionContext context =
+                new TestAppPermissionContext(this);
+        mPermissionContexts.add(context);
+        context.withPermissionOnVersionBetween(minSdkVersion, maxSdkVersion, permissions);
+
+        return context;
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given permissions are not granted to the test
+     * app.
+     *
+     * <p>The permission will only guarantee to not be granted for calls made by the test app.
+     *
+     * <p>If the permissions cannot be denied an exception will be thrown.
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = testApp.permissions()
+     *     .withoutPermission(PERMISSION1, PERMISSION2) {
+     * // Code which needs the permissions goes here
+     * }
+     * }
+     */
+    @Override
+    public TestAppPermissionContext withoutPermission(String... permissions) {
+        TestAppPermissionContext context =
+                new TestAppPermissionContext(this);
+        mPermissionContexts.add(context);
+        context.withoutPermission(permissions);
+
+        return context;
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given app op are granted to the test
+     * app.
+     *
+     * <p>The app op will only guarantee to be granted for calls made by the test app.
+     *
+     * <p>If the app op cannot be granted an exception will be thrown.
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = testApp.permissions()
+     *     .withAppOp(APP_OP1, APP_OP2) {
+     * // Code which needs the app op goes here
+     * }
+     * }
+     */
+    @Override
+    public TestAppPermissionContext withAppOp(String... appOps) {
+        TestAppPermissionContext context =
+                new TestAppPermissionContext(this);
+        mPermissionContexts.add(context);
+        context.withAppOp(appOps);
+
+        return context;
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given app op are granted to the test
+     * app.
+     *
+     * <p>The app op will only guarantee to be granted for calls made by the test app.
+     *
+     * <p>If the app op cannot be granted an exception will be thrown.
+     *
+     * <p>The app op will only be granted on the version given
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = testApp.permissions()
+     *     .withAppOpOnVersion(R, APP_OP1, APP_OP2) {
+     * // Code which needs the app op goes here
+     * }
+     * }
+     */
+    @Override
+    public TestAppPermissionContext withAppOpOnVersion(int sdkVersion, String... appOps) {
+        return withAppOpOnVersionBetween(sdkVersion, sdkVersion, appOps);
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given app op are granted to the test
+     * app.
+     *
+     * <p>The app op will only guarantee to be granted for calls made by the test app.
+     *
+     * <p>If the app op cannot be granted an exception will be thrown.
+     *
+     * <p>The app op will only be granted on the version given and above
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = testApp.permissions()
+     *     .withAppOpOnVersionAtLeast(R, APP_OP1, APP_OP2) {
+     * // Code which needs the app op goes here
+     * }
+     * }
+     */
+    @Override
+    public TestAppPermissionContext withAppOpOnVersionAtLeast(int minSdkVersion, String... appOps) {
+        return withAppOpOnVersionBetween(minSdkVersion, Versions.ANY, appOps);
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given app op are granted to the test
+     * app.
+     *
+     * <p>The app op will only guarantee to be granted for calls made by the test app.
+     *
+     * <p>If the app op cannot be granted an exception will be thrown.
+     *
+     * <p>The app op will only be granted on the version given and below
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = testApp.permissions()
+     *     .withAppOpOnVersionAtMost(S, APP_OP1, APP_OP2) {
+     * // Code which needs the app op goes here
+     * }
+     * }
+     */
+    @Override
+    public TestAppPermissionContext withAppOpOnVersionAtMost(int maxSdkVersion, String... appOps) {
+        return withAppOpOnVersionBetween(Versions.ANY, maxSdkVersion, appOps);
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given app op are granted to the test
+     * app.
+     *
+     * <p>The app op will only guarantee to be granted for calls made by the test app.
+     *
+     * <p>If the app op cannot be granted an exception will be thrown.
+     *
+     * <p>The app op will only be granted on versions between the min and max (inclusive)
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = testApp.permissions()
+     *     .withAppOpOnVersionBetween(R, S, APP_OP1, APP_OP2) {
+     * // Code which needs the app op goes here
+     * }
+     * }
+     */
+    @Override
+    public TestAppPermissionContext withAppOpOnVersionBetween(
+            int minSdkVersion, int maxSdkVersion, String... appOps) {
+        TestAppPermissionContext context =
+                new TestAppPermissionContext(this);
+        mPermissionContexts.add(context);
+        context.withAppOpOnVersionBetween(minSdkVersion, maxSdkVersion, appOps);
+
+        return context;
+    }
+
+    /**
+     * Enter a {@link PermissionContext} where the given app op are not granted to the test
+     * app.
+     *
+     * <p>The app op will only guarantee to not be granted for calls made by the test app.
+     *
+     * <p>If the app op cannot be denied an exception will be thrown.
+     *
+     * <p>Recommended usage:
+     * {@code
+     *
+     * try (PermissionContext p = testApp.permissions()
+     *     .withoutAppOp(APP_OP1, APP_OP2) {
+     * // Code which needs to not have the app op goes here
+     * }
+     * }
+     */
+    @Override
+    public TestAppPermissionContext withoutAppOp(String... appOps) {
+        TestAppPermissionContext context = new TestAppPermissionContext(this);
+        mPermissionContexts.add(context);
+        context.withoutAppOp(appOps);
+
+        return context;
+    }
+
+    void applyPermissions() {
+        Set<String> grantedPermissions = new HashSet<>();
+        Set<String> deniedPermissions = new HashSet<>();
+        Set<String> grantedAppOps = new HashSet<>();
+        Set<String> deniedAppOps = new HashSet<>();
+        synchronized (mPermissionContexts) {
+            for (TestAppPermissionContext permissionContext : mPermissionContexts) {
+                for (String permission : permissionContext.grantedPermissions()) {
+                    grantedPermissions.add(permission);
+                    deniedPermissions.remove(permission);
+                }
+
+                for (String permission : permissionContext.deniedPermissions()) {
+                    grantedPermissions.remove(permission);
+                    deniedPermissions.add(permission);
+                }
+
+                for (String appOp : permissionContext.grantedAppOps()) {
+                    grantedAppOps.add(appOp);
+                    deniedAppOps.remove(appOp);
+                }
+
+                for (String appOp : permissionContext.deniedAppOps()) {
+                    grantedAppOps.remove(appOp);
+                    deniedAppOps.add(appOp);
+                }
+            }
+        }
+
+        for (String permission : grantedPermissions) {
+            mTestAppInstance.testApp().pkg().grantPermission(mTestAppInstance.user(), permission);
+        }
+        for (String permission : deniedPermissions) {
+            mTestAppInstance.testApp().pkg().denyPermission(mTestAppInstance.user(), permission);
+        }
+        for (String appOp : grantedAppOps) {
+            mTestAppInstance.testApp().pkg().appOps().set(
+                    mTestAppInstance.user(), appOp, AppOpsMode.ALLOWED);
+        }
+        for (String appOp : deniedAppOps) {
+            mTestAppInstance.testApp().pkg().appOps().set(
+                    mTestAppInstance.user(), appOp, AppOpsMode.IGNORED);
+        }
+    }
+
+    void undoPermission(TestAppPermissionContext permissionContext) {
+        mPermissionContexts.remove(permissionContext);
+        applyPermissions();
+    }
+
+    void clearPermissions() {
+        mPermissionContexts.clear();
+        applyPermissions();
+    }
+}
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppPermissionContext.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppPermissionContext.java
new file mode 100644
index 0000000..002afa6
--- /dev/null
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppPermissionContext.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright (C) 2022 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.bedstead.testapp;
+
+import com.android.bedstead.nene.exceptions.NeneException;
+import com.android.bedstead.nene.permissions.PermissionContext;
+import com.android.bedstead.nene.permissions.PermissionContextModifier;
+import com.android.bedstead.nene.utils.Versions;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * Collection of required permissions to be granted or denied to a test app.
+ *
+ * <p>Once the permissions are no longer required, {@link #close()} should be called.
+ *
+ * <p>It is recommended that this be used as part of a try-with-resource block
+ */
+public class TestAppPermissionContext implements PermissionContextModifier {
+    private final TestAppInstancePermissions mTestAppInstancePermissions;
+    private final Set<String> mGrantedPermissions = new HashSet<>();
+    private final Set<String> mDeniedPermissions = new HashSet<>();
+    private final Set<String> mGrantedAppOps = new HashSet<>();
+    private final Set<String> mDeniedAppOps = new HashSet<>();
+
+    TestAppPermissionContext(TestAppInstancePermissions testAppInstancePermissions) {
+        mTestAppInstancePermissions = testAppInstancePermissions;
+    }
+
+    /**
+     * See {@link TestAppInstancePermissions#withPermission(String...)}
+     */
+    @Override
+    public TestAppPermissionContext withPermission(String... permissions) {
+        for (String permission : permissions) {
+            if (mDeniedPermissions.contains(permission)) {
+                mTestAppInstancePermissions.clearPermissions();
+                throw new NeneException(
+                        permission + " cannot be required to be both granted and denied");
+            }
+        }
+
+        mGrantedPermissions.addAll(Arrays.asList(permissions));
+
+        mTestAppInstancePermissions.applyPermissions();
+        return this;
+    }
+
+    /**
+     * See {@link TestAppInstancePermissions#withPermissionOnVersion(int, String...)}
+     */
+    @Override
+    public TestAppPermissionContext withPermissionOnVersion(int sdkVersion, String... permissions) {
+        return withPermissionOnVersionBetween(sdkVersion, sdkVersion, permissions);
+    }
+
+    /**
+     * See {@link TestAppInstancePermissions#withPermissionOnVersionAtLeast(int, String...)}
+     */
+    @Override
+    public TestAppPermissionContext withPermissionOnVersionAtLeast(
+            int minSdkVersion, String... permissions) {
+        return withPermissionOnVersionBetween(minSdkVersion, Versions.ANY, permissions);
+    }
+
+    /**
+     * See {@link TestAppInstancePermissions#withPermissionOnVersionAtMost(int, String...)}
+     */
+    @Override
+    public TestAppPermissionContext withPermissionOnVersionAtMost(
+            int maxSdkVersion, String... permissions) {
+        return withPermissionOnVersionBetween(Versions.ANY, maxSdkVersion, permissions);
+    }
+
+    /**
+     * See {@link TestAppInstancePermissions#withPermissionOnVersionBetween(int, int, String...)}
+     */
+    @Override
+    public TestAppPermissionContext withPermissionOnVersionBetween(
+            int minSdkVersion, int maxSdkVersion, String... permissions) {
+        if (Versions.meetsSdkVersionRequirements(minSdkVersion, maxSdkVersion)) {
+            return withPermission(permissions);
+        }
+
+        return this;
+    }
+
+    /**
+     * See {@link TestAppInstancePermissions#withoutPermission(String...)}
+     */
+    @Override
+    public TestAppPermissionContext withoutPermission(String... permissions) {
+        for (String permission : permissions) {
+            if (mGrantedPermissions.contains(permission)) {
+                mTestAppInstancePermissions.clearPermissions();
+                throw new NeneException(
+                        permission + " cannot be required to be both granted and denied");
+            }
+        }
+
+        mDeniedPermissions.addAll(Arrays.asList(permissions));
+
+        mTestAppInstancePermissions.applyPermissions();
+        return this;
+    }
+
+    /**
+     * See {@link TestAppInstancePermissions#withAppOp(String...)}
+     */
+    @Override
+    public TestAppPermissionContext withAppOp(String... appOps) {
+        for (String appOp : appOps) {
+            if (mDeniedAppOps.contains(appOp)) {
+                mTestAppInstancePermissions.clearPermissions();
+                throw new NeneException(
+                        appOp + " cannot be required to be both granted and denied");
+            }
+        }
+        mGrantedAppOps.addAll(Arrays.asList(appOps));
+
+        mTestAppInstancePermissions.applyPermissions();
+        return this;
+    }
+
+    /**
+     * See {@link TestAppInstancePermissions#withAppOpOnVersion(int, String...)}
+     */
+    @Override
+    public PermissionContext withAppOpOnVersion(int sdkVersion, String... appOps) {
+        return withAppOpOnVersionBetween(sdkVersion, sdkVersion, appOps);
+    }
+
+    /**
+     * See {@link TestAppInstancePermissions#withAppOpOnVersionAtLeast(int, String...)}
+     */
+    @Override
+    public PermissionContext withAppOpOnVersionAtLeast(int minSdkVersion, String... appOps) {
+        return withAppOpOnVersionBetween(minSdkVersion, Versions.ANY, appOps);
+    }
+
+    /**
+     * See {@link TestAppInstancePermissions#withAppOpOnVersionAtMost(int, String...)}
+     */
+    @Override
+    public PermissionContext withAppOpOnVersionAtMost(int maxSdkVersion, String... appOps) {
+        return withAppOpOnVersionBetween(Versions.ANY, maxSdkVersion, appOps);
+    }
+
+    /**
+     * See {@link TestAppInstancePermissions#withAppOpOnVersionBetween(int, int, String...)}
+     */
+    @Override
+    public PermissionContext withAppOpOnVersionBetween(
+            int minSdkVersion, int maxSdkVersion, String... appOps) {
+        if (Versions.meetsSdkVersionRequirements(minSdkVersion, maxSdkVersion)) {
+            return withAppOp(appOps);
+        }
+
+        return this;
+    }
+
+    /**
+     * See {@link TestAppInstancePermissions#withoutAppOp(String...)}
+     */
+    @Override
+    public TestAppPermissionContext withoutAppOp(String... appOps) {
+        for (String appOp : appOps) {
+            if (mGrantedAppOps.contains(appOp)) {
+                mTestAppInstancePermissions.clearPermissions();
+                throw new NeneException(
+                        appOp + " cannot be required to be both granted and denied");
+            }
+        }
+
+        mDeniedAppOps.addAll(Arrays.asList(appOps));
+
+        mTestAppInstancePermissions.applyPermissions();
+        return this;
+    }
+
+    /**
+     * Returns the set of permissions granted in this context.
+     */
+    public Set<String> grantedPermissions() {
+        return mGrantedPermissions;
+    }
+
+    /**
+     * Returns the set of permissions denied in this context.
+     */
+    public Set<String> deniedPermissions() {
+        return mDeniedPermissions;
+    }
+
+    /**
+     * Returns the set of appOps granted in this context.
+     */
+    public Set<String> grantedAppOps() {
+        return mGrantedAppOps;
+    }
+
+    /**
+     * Returns the set of appOps denied in this context.
+     */
+    public Set<String> deniedAppOps() {
+        return mDeniedAppOps;
+    }
+
+    @Override
+    public void close() {
+        mTestAppInstancePermissions.undoPermission(this);
+    }
+}
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppProvider.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppProvider.java
index 0ce0d8e..a3b4095 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppProvider.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppProvider.java
@@ -40,6 +40,11 @@
 
     private boolean mTestAppsInitialised = false;
     private final Set<TestAppDetails> mTestApps = new HashSet<>();
+    private Set<TestAppDetails> mTestAppsSnapshot = null;
+
+    public TestAppProvider() {
+        initTestApps();
+    }
 
     /** Begin a query for a {@link TestApp}. */
     public TestAppQueryBuilder query() {
@@ -54,11 +59,26 @@
     }
 
     Set<TestAppDetails> testApps() {
-        initTestApps();
-        Log.d(TAG, "testApps(): returning " + mTestApps.size() + " apps (" + mTestApps + ")");
         return mTestApps;
     }
 
+    /** Save the state of the provider, to be reset by {@link #restore()}. */
+    public void snapshot() {
+        mTestAppsSnapshot = new HashSet<>(mTestApps);
+        mTestAppsSnapshot = new HashSet<>(mTestApps);
+    }
+
+    /**
+     * Restore the state of the provider to that recorded by {@link #snapshot()}.
+     */
+    public void restore() {
+        if (mTestAppsSnapshot == null) {
+            throw new IllegalStateException("You must call snapshot() before restore()");
+        }
+        mTestApps.clear();
+        mTestApps.addAll(mTestAppsSnapshot);
+    }
+
     private void initTestApps() {
         if (mTestAppsInitialised) {
             return;
diff --git a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppQueryBuilder.java b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppQueryBuilder.java
index 5afc802..b6e2531 100644
--- a/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppQueryBuilder.java
+++ b/common/device-side/bedstead/testapp/src/library/main/java/com/android/bedstead/testapp/TestAppQueryBuilder.java
@@ -48,6 +48,7 @@
             new SetQueryHelper<>(this);
     SetQueryHelper<TestAppQueryBuilder, ServiceInfo, ServiceQuery<?>> mServices =
             new SetQueryHelper<>(this);
+    BooleanQueryHelper<TestAppQueryBuilder> mIsDeviceAdmin = new BooleanQueryHelper<>(this);
     StringQueryHelper<TestAppQueryBuilder> mSharedUserId = new StringQueryHelper<>(this);
 
     TestAppQueryBuilder(TestAppProvider provider) {
@@ -111,6 +112,13 @@
     }
 
     /**
+     * Query for an app which is a device admin.
+     */
+    public BooleanQuery<TestAppQueryBuilder> whereIsDeviceAdmin() {
+        return mIsDeviceAdmin;
+    }
+
+    /**
      * Query for a {@link TestApp} by its sharedUserId;
      */
     public StringQuery<TestAppQueryBuilder> whereSharedUserId() {
@@ -194,6 +202,13 @@
             return false;
         }
 
+        // TODO(b/198419895): Actually query for the correct receiver + metadata
+        boolean isDeviceAdmin = details.mApp.getPackageName().equals(
+                "com.android.bedstead.testapp.DeviceAdminTestApp");
+        if (!BooleanQueryHelper.matches(mIsDeviceAdmin, isDeviceAdmin)) {
+            return false;
+        }
+
         if (mSharedUserId.isEmpty()) {
             if (details.sharedUserId() != null) {
                 return false;
@@ -226,7 +241,8 @@
                 mServices.describeQuery("services"),
                 mPermissions.describeQuery("permissions"),
                 mSharedUserId.describeQuery("sharedUserId"),
-                mTestOnly.describeQuery("testOnly")
+                mTestOnly.describeQuery("testOnly"),
+                mIsDeviceAdmin.describeQuery("isDeviceAdmin")
         ) + "}";
     }
 }
diff --git a/common/device-side/bedstead/testapp/src/processor/main/java/com/android/bedstead/testapp/processor/Processor.java b/common/device-side/bedstead/testapp/src/processor/main/java/com/android/bedstead/testapp/processor/Processor.java
index 03fbceb..2ffa4b2 100644
--- a/common/device-side/bedstead/testapp/src/processor/main/java/com/android/bedstead/testapp/processor/Processor.java
+++ b/common/device-side/bedstead/testapp/src/processor/main/java/com/android/bedstead/testapp/processor/Processor.java
@@ -44,6 +44,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.RoundEnvironment;
@@ -134,6 +135,9 @@
     private static final ClassName REMOTE_CONTENT_RESOLVER_WRAPPER_CLASSNAME =
             ClassName.get("android.content",
                     "RemoteContentResolverWrapper");
+    private static final ClassName REMOTE_BLUETOOTH_ADAPTER_WRAPPER_CLASSNAME =
+            ClassName.get("android.bluetooth",
+                    "RemoteBluetoothAdapterWrapper");
 
     /**
      * Extract classes provided in an annotation.
@@ -305,13 +309,24 @@
             } else if (method.getReturnType().toString().equals(
                     "android.content.RemoteContentResolver")
                     && method.getSimpleName().contentEquals("getContentResolver")) {
-                // Special case, we want to return a contnet resolver, but still call through to
+                // Special case, we want to return a content resolver, but still call through to
                 // the other side for exceptions, etc.
                 logicLambda.addStatement(
                         "mProfileClass.other().$L($L)",
                         method.getSimpleName(), String.join(", ", params));
                 logicLambda.addStatement("return new $T(mConnector)",
                         REMOTE_CONTENT_RESOLVER_WRAPPER_CLASSNAME);
+            } else if (method.getReturnType().toString().equals(
+                    "android.bluetooth.RemoteBluetoothAdapter")
+                    && (method.getSimpleName().contentEquals("getAdapter")
+                    || method.getSimpleName().contentEquals("getDefaultAdapter"))) {
+                // Special case, we want to return a bluetooth adapter, but still call through to
+                // the other side for exceptions, etc.
+                logicLambda.addStatement(
+                        "mProfileClass.other().$L($L)",
+                        method.getSimpleName(), String.join(", ", params));
+                logicLambda.addStatement("return new $T(mConnector)",
+                        REMOTE_BLUETOOTH_ADAPTER_WRAPPER_CLASSNAME);
             } else if (method.getReturnType().getKind().equals(TypeKind.VOID)) {
                 logicLambda.addStatement("mProfileClass.other().$L($L)", method.getSimpleName(),
                         String.join(", ", params));
@@ -321,10 +336,17 @@
             }
             logicLambda.unindent().add("}");
 
+            String terminalExceptionCode = Stream.concat(
+                            Stream.of(CodeBlock.of("e instanceof $T",
+                                    PROFILE_RUNTIME_EXCEPTION_CLASSNAME)),
+                            method.getThrownTypes().stream().map(
+                                    t -> CodeBlock.of("e instanceof $T", t)))
+                    .map(CodeBlock::toString).collect(Collectors.joining(" || "));
+
             CodeBlock runLogic = CodeBlock.of(
-                    "$1T.logic($2L).terminalException(e -> e instanceof $3T).run()",
+                    "$1T.logic($2L).terminalException(e -> $3L).run()",
                     RETRY_CLASSNAME,
-                    logicLambda.build().toString(), PROFILE_RUNTIME_EXCEPTION_CLASSNAME);
+                    logicLambda.build().toString(), terminalExceptionCode);
 
             methodBuilder.beginControlFlow("try");
 
@@ -431,10 +453,17 @@
             }
             logicLambda.unindent().add("}");
 
+            String terminalExceptionCode = Stream.concat(
+                            Stream.of(CodeBlock.of("e instanceof $T",
+                                    PROFILE_RUNTIME_EXCEPTION_CLASSNAME)),
+                            method.getThrownTypes().stream().map(
+                                    t -> CodeBlock.of("e instanceof $T", t)))
+                    .map(CodeBlock::toString).collect(Collectors.joining(" || "));
+
             CodeBlock runLogic = CodeBlock.of(
-                    "$1T.logic($2L).terminalException(e -> e instanceof $3T).run()",
+                    "$1T.logic($2L).terminalException(e -> $3L).run()",
                     RETRY_CLASSNAME,
-                    logicLambda.build().toString(), PROFILE_RUNTIME_EXCEPTION_CLASSNAME);
+                    logicLambda.build().toString(), terminalExceptionCode);
 
             methodBuilder.beginControlFlow("try");
 
@@ -581,10 +610,17 @@
             }
             logicLambda.unindent().add("}");
 
+            String terminalExceptionCode = Stream.concat(
+                            Stream.of(CodeBlock.of("e instanceof $T",
+                                    PROFILE_RUNTIME_EXCEPTION_CLASSNAME)),
+                            method.getThrownTypes().stream().map(
+                                    t -> CodeBlock.of("e instanceof $T", t)))
+                    .map(CodeBlock::toString).collect(Collectors.joining(" || "));
+
             CodeBlock runLogic = CodeBlock.of(
-                    "$1T.logic($2L).terminalException(e -> e instanceof $3T).run()",
+                    "$1T.logic($2L).terminalException(e -> $3L).run()",
                     RETRY_CLASSNAME,
-                    logicLambda.build().toString(), PROFILE_RUNTIME_EXCEPTION_CLASSNAME);
+                    logicLambda.build().toString(), terminalExceptionCode);
 
             methodBuilder.beginControlFlow("try");
 
diff --git a/common/device-side/bedstead/testapp/src/test/AndroidManifest.xml b/common/device-side/bedstead/testapp/src/test/AndroidManifest.xml
index 9920d90..6788155 100644
--- a/common/device-side/bedstead/testapp/src/test/AndroidManifest.xml
+++ b/common/device-side/bedstead/testapp/src/test/AndroidManifest.xml
@@ -32,6 +32,8 @@
                 <action android:name="com.android.testapp.GENERATED_BROADCAST_RECEIVER"/>
             </intent-filter>
         </receiver>
+
+        <service android:name="com.android.GeneratedTestAppService" />
     </application>
     <uses-sdk android:minSdkVersion="27" android:targetSdkVersion="27"/>
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
diff --git a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppActivitiesTest.java b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppActivitiesTest.java
index b185295..5bf6e63 100644
--- a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppActivitiesTest.java
+++ b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppActivitiesTest.java
@@ -44,8 +44,7 @@
     private static final String EXISTING_ACTIVITY = "android.testapp.activity";
     private static final String NON_EXISTING_ACTIVITY = "non.existing.activity";
 
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-    private static final TestApp sTestApp = sTestAppProvider.query()
+    private static final TestApp sTestApp = sDeviceState.testApps().query()
             .whereActivities().contains(
                     activity().activityClass().className().isEqualTo(EXISTING_ACTIVITY)
             ).whereActivities().doesNotContain(
diff --git a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppActivityReferenceTest.java b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppActivityReferenceTest.java
index 4a524f3..e3bf84e 100644
--- a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppActivityReferenceTest.java
+++ b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppActivityReferenceTest.java
@@ -27,7 +27,6 @@
 import com.android.bedstead.nene.activities.Activity;
 import com.android.bedstead.nene.users.UserReference;
 
-import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -41,19 +40,12 @@
     @ClassRule @Rule
     public static final DeviceState sDeviceState = new DeviceState();
 
-    private TestAppProvider mTestAppProvider;
-
-    @Before
-    public void setup() {
-        mTestAppProvider = new TestAppProvider();
-    }
-
     @Test
     @IncludeRunOnPrimaryUser
     @IncludeRunOnSecondaryUser
     @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
     public void start_activityIsStarted() {
-        TestApp testApp = mTestAppProvider.query().whereActivities().isNotEmpty().get();
+        TestApp testApp = sDeviceState.testApps().query().whereActivities().isNotEmpty().get();
         try (TestAppInstance testAppInstance = testApp.install(sUser)) {
             Activity<TestAppActivity> activity = testAppInstance.activities().any().start();
 
@@ -64,7 +56,7 @@
 
     @Test
     public void remote_executes() {
-        TestApp testApp = mTestAppProvider.query().whereActivities().isNotEmpty().get();
+        TestApp testApp = sDeviceState.testApps().query().whereActivities().isNotEmpty().get();
         try (TestAppInstance testAppInstance = testApp.install(sUser)) {
             Activity<TestAppActivity> activity = testAppInstance.activities().any().start();
 
diff --git a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppAppComponentFactoryTest.java b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppAppComponentFactoryTest.java
index bbfc2f4..3d11f4e 100644
--- a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppAppComponentFactoryTest.java
+++ b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppAppComponentFactoryTest.java
@@ -28,6 +28,7 @@
 import com.android.bedstead.nene.TestApis;
 import com.android.eventlib.events.activities.ActivityCreatedEvent;
 import com.android.eventlib.events.broadcastreceivers.BroadcastReceivedEvent;
+import com.android.eventlib.events.services.ServiceCreatedEvent;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -51,6 +52,10 @@
     private static final String GENERATED_BROADCAST_RECEIVER_ACTION =
             "com.android.testapp.GENERATED_BROADCAST_RECEIVER";
 
+    // This must exist as a <service> in AndroidManifest.xml
+    private static final String GENERATED_SERVICE_CLASS_NAME =
+            "com.android.GeneratedTestAppService";
+
     private static final Context sContext =
             TestApis.context().instrumentedContext();
 
@@ -79,4 +84,17 @@
                 .whereBroadcastReceiver().receiverClass().className()
                 .isEqualTo(GENERATED_RECEIVER_CLASS_NAME)).eventOccurred();
     }
+
+    @Test
+    public void startService_serviceDoesNotExist_startsLoggingService() {
+        Intent intent = new Intent();
+        intent.setComponent(new ComponentName(sContext.getPackageName(),
+                GENERATED_SERVICE_CLASS_NAME));
+
+        sContext.startService(intent);
+
+        assertThat(ServiceCreatedEvent.queryPackage(sContext.getPackageName())
+                        .whereService().serviceClass().className()
+                            .isEqualTo(GENERATED_SERVICE_CLASS_NAME)).eventOccurred();
+    }
 }
diff --git a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppInstanceTest.java b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppInstanceTest.java
index 45fcd98..d347bc7 100644
--- a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppInstanceTest.java
+++ b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppInstanceTest.java
@@ -16,10 +16,15 @@
 
 package com.android.bedstead.testapp;
 
+import static android.app.AppOpsManager.OPSTR_START_FOREGROUND;
 import static android.app.admin.DevicePolicyManager.OPERATION_SAFETY_REASON_DRIVING_DISTRACTION;
+import static android.content.PermissionChecker.PERMISSION_GRANTED;
 import static android.os.Build.VERSION_CODES.Q;
 import static android.os.Build.VERSION_CODES.S;
 
+import static com.android.bedstead.nene.appops.AppOpsMode.ALLOWED;
+import static com.android.bedstead.nene.permissions.CommonPermissions.BLUETOOTH_CONNECT;
+import static com.android.bedstead.nene.permissions.CommonPermissions.READ_CONTACTS;
 import static com.android.eventlib.truth.EventLogsSubject.assertThat;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -35,6 +40,7 @@
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.RequireSdkVersion;
 import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.permissions.PermissionContext;
 import com.android.bedstead.nene.users.UserReference;
 import com.android.bedstead.nene.utils.Poll;
 import com.android.eventlib.EventLogs;
@@ -58,10 +64,10 @@
     private static final Context sContext = TestApis.context().instrumentedContext();
     private static final UserReference sUser = TestApis.users().instrumented();
 
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-    private static final TestApp sTestApp = sTestAppProvider.query()
+    private static final TestApp sTestApp = sDeviceState.testApps().query()
             .whereActivities().isNotEmpty()
             .get();
+    private static final TestApp sTestApp2 = sDeviceState.testApps().any();
 
     private static final String INTENT_ACTION = "com.android.bedstead.testapp.test_action";
     private static final IntentFilter INTENT_FILTER = new IntentFilter(INTENT_ACTION);
@@ -70,7 +76,6 @@
     private static final IntentFilter INTENT_FILTER_2 = new IntentFilter(INTENT_ACTION_2);
     private static final Intent INTENT_2 = new Intent(INTENT_ACTION_2);
     private static final Duration SHORT_TIMEOUT = Duration.ofSeconds(5);
-    private TestAppProvider mTestAppProvider;
 
     @Test
     public void user_returnsUserReference() {
@@ -139,25 +144,23 @@
     // unbounded amount of time
 
     @Test
-    @Ignore("b/203758521 need to re-add support for killing processes")
     public void stop_processIsNotRunning() {
         try (TestAppInstance testAppInstance = sTestApp.install()) {
             testAppInstance.activities().any().start();
 
-//            testAppInstance.stop();
+            testAppInstance.stop();
 
             assertThat(sTestApp.pkg().runningProcesses()).isEmpty();
         }
     }
 
     @Test
-    @Ignore("b/203758521 need to re-add support for killing processes")
     public void stop_previouslyCalledKeepAlive_processDoesNotRestart() {
         try (TestAppInstance testAppInstance = sTestApp.install()) {
             testAppInstance.activities().any().start();
             testAppInstance.keepAlive();
 
-//            testAppInstance.stop();
+            testAppInstance.stop();
 
             assertThat(sTestApp.pkg().runningProcesses()).isEmpty();
         }
@@ -394,4 +397,90 @@
             assertThat(testAppInstance.keyChain().isKeyAlgorithmSupported("A")).isFalse();
         }
     }
+
+    @Test
+    public void bluetoothManager_returnsUsableInstance() {
+        try (TestAppInstance testAppInstance = sTestApp.install();
+            PermissionContext p = testAppInstance.permissions().withPermission(BLUETOOTH_CONNECT)) {
+            assertThat(testAppInstance.bluetoothManager().getConnectedDevices(/* profile= */ 7))
+                    .isEmpty();
+        }
+    }
+
+    @Test
+    public void bluetoothManager_getAdapter_returnsUsableInstance() {
+        try (TestAppInstance testAppInstance = sTestApp.install()) {
+            // No exception
+            testAppInstance.bluetoothManager().getAdapter().isEnabled();
+        }
+    }
+
+    @Test
+    public void permissions_withPermission_permissionStateAppliesToCallsToTestApp() {
+        try (TestAppInstance testApp = sTestApp.install();
+             PermissionContext p = testApp.permissions().withPermission(READ_CONTACTS)) {
+            assertThat(testApp.context().checkSelfPermission(
+                    READ_CONTACTS)).isEqualTo(PERMISSION_GRANTED);
+        }
+    }
+
+    @Test
+    public void permissions_withPermission_permissionStateDoesNotApplyToOtherTestApps() {
+        try (TestAppInstance testApp = sTestApp.install();
+             TestAppInstance testApp2 = sTestApp2.install();
+             PermissionContext p = testApp.permissions().withPermission(READ_CONTACTS)) {
+            assertThat(testApp2.context().checkSelfPermission(
+                    READ_CONTACTS)).isNotEqualTo(PERMISSION_GRANTED);
+        }
+    }
+
+    @Test
+    public void permissions_withPermission_permissionStateDoesNotApplyToInstrumentedApp() {
+        try (TestAppInstance testApp = sTestApp.install();
+             PermissionContext p = testApp.permissions().withPermission(READ_CONTACTS)) {
+            assertThat(sContext.checkSelfPermission(
+                    READ_CONTACTS)).isNotEqualTo(PERMISSION_GRANTED);
+        }
+    }
+
+    @Test
+    public void permissions_withPermission_permissionStateDoesNotApplyToInstrumentedAppAfterCall() {
+        try (TestAppInstance testApp = sTestApp.install();
+             PermissionContext p = testApp.permissions().withPermission(READ_CONTACTS)) {
+            testApp.context().checkSelfPermission(READ_CONTACTS);
+
+            assertThat(sContext.checkSelfPermission(
+                    READ_CONTACTS)).isNotEqualTo(PERMISSION_GRANTED);
+        }
+    }
+
+    @Test
+    public void permissions_withPermission_instrumentedPermissionStateDoesNotAffectTestApp() {
+        try (TestAppInstance testApp = sTestApp.install();
+             PermissionContext p = TestApis.permissions().withoutPermission(READ_CONTACTS);
+             PermissionContext p2 = testApp.permissions().withPermission(READ_CONTACTS)) {
+            assertThat(sContext.checkSelfPermission(
+                    READ_CONTACTS)).isNotEqualTo(PERMISSION_GRANTED);
+            assertThat(testApp.context().checkSelfPermission(
+                    READ_CONTACTS)).isEqualTo(PERMISSION_GRANTED);
+        }
+    }
+
+    @Test
+    public void permissions_withAppOp_appOpIsAllowedForTestApp() {
+        try (TestAppInstance testApp = sTestApp.install();
+             PermissionContext p = testApp.permissions().withAppOp(OPSTR_START_FOREGROUND)) {
+
+            assertThat(sTestApp.pkg().appOps().get(OPSTR_START_FOREGROUND)).isEqualTo(ALLOWED);
+        }
+    }
+
+    @Test
+    public void permissions_withoutAppOp_appOpIsNotAllowedForTestApp() {
+        try (TestAppInstance testApp = sTestApp.install();
+             PermissionContext p = testApp.permissions().withAppOp(OPSTR_START_FOREGROUND);
+             PermissionContext p2 = testApp.permissions().withoutAppOp(OPSTR_START_FOREGROUND)) {
+            assertThat(sTestApp.pkg().appOps().get(OPSTR_START_FOREGROUND)).isNotEqualTo(ALLOWED);
+        }
+    }
 }
diff --git a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppProviderTest.java b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppProviderTest.java
index bc270b4..56c6f34 100644
--- a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppProviderTest.java
+++ b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppProviderTest.java
@@ -103,6 +103,34 @@
     }
 
     @Test
+    public void query_afterRestore_returnsTestAppAgain() {
+        mTestAppProvider.snapshot();
+        mTestAppProvider.query().wherePackageName().isEqualTo(EXISTING_PACKAGENAME).get();
+
+        mTestAppProvider.restore();
+
+        assertThat(mTestAppProvider.query().wherePackageName()
+                .isEqualTo(EXISTING_PACKAGENAME).get()).isNotNull();
+    }
+
+    @Test
+    public void query_afterRestoreWithAppAlreadyUsed_doesNotReturnTestAppAgain() {
+        mTestAppProvider.query().wherePackageName().isEqualTo(EXISTING_PACKAGENAME).get();
+        mTestAppProvider.snapshot();
+
+        mTestAppProvider.restore();
+
+        TestAppQueryBuilder query =
+                mTestAppProvider.query().wherePackageName().isEqualTo(EXISTING_PACKAGENAME);
+        assertThrows(NotFoundException.class, query::get);
+    }
+
+    @Test
+    public void restore_noSnapshot_throwsException() {
+        assertThrows(IllegalStateException.class, mTestAppProvider::restore);
+    }
+
+    @Test
     public void any_doesNotReturnPackageQueryOnlyTestApps() {
         Set<String> testAppPackageNames = new HashSet<>();
 
@@ -234,6 +262,26 @@
     }
 
     @Test
+    public void query_isDeviceAdmin_returnsMatching() {
+        TestApp testApp = mTestAppProvider.query()
+                .whereIsDeviceAdmin().isTrue()
+                .get();
+
+        assertThat(testApp.packageName()).isEqualTo(
+                "com.android.bedstead.testapp.DeviceAdminTestApp");
+    }
+
+    @Test
+    public void query_isNotDeviceAdmin_returnsMatching() {
+        TestApp testApp = mTestAppProvider.query()
+                .whereIsDeviceAdmin().isFalse()
+                .get();
+
+        assertThat(testApp.packageName()).isNotEqualTo(
+                "com.android.bedstead.testapp.DeviceAdminTestApp");
+    }
+
+    @Test
     public void query_doesNotSpecifySharedUserId_sharedUserIdIsNull() {
         TestApp testApp = mTestAppProvider.query()
                 .get();
diff --git a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppTest.java b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppTest.java
index f9e8e34..4f496ca 100644
--- a/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppTest.java
+++ b/common/device-side/bedstead/testapp/src/test/java/com/android/bedstead/testapp/TestAppTest.java
@@ -30,7 +30,6 @@
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.users.UserReference;
 
-import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -50,23 +49,16 @@
     private static final UserHandle sNonExistingUserHandle = sNonExistingUser.userHandle();
     private static final Context sContext = TestApis.context().instrumentedContext();
 
-    private TestAppProvider mTestAppProvider;
-
-    @Before
-    public void setup() {
-        mTestAppProvider = new TestAppProvider();
-    }
-
     @Test
     public void reference_returnsNeneReference() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         assertThat(testApp.pkg()).isEqualTo(TestApis.packages().find(testApp.packageName()));
     }
 
     @Test
     public void install_noUserSpecified_installsInInstrumentedUser() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         testApp.install();
 
@@ -79,7 +71,7 @@
 
     @Test
     public void install_userReference_installs() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         testApp.install(sUser);
 
@@ -92,7 +84,7 @@
 
     @Test
     public void install_userReference_returnsReferenceToInstance() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         try {
             TestAppInstance testAppInstance = testApp.install(sUser);
@@ -106,7 +98,7 @@
 
     @Test
     public void install_userHandle_installs() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         testApp.install(sUserHandle);
 
@@ -119,7 +111,7 @@
 
     @Test
     public void install_userHandle_returnsReferenceToInstance() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         try {
             TestAppInstance testAppInstance = testApp.install(sUserHandle);
@@ -133,21 +125,21 @@
 
     @Test
     public void install_nullUserReference_throwsException() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         assertThrows(NullPointerException.class, () -> testApp.install((UserReference) null));
     }
 
     @Test
     public void install_nullUserHandle_throwsException() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         assertThrows(NullPointerException.class, () -> testApp.install((UserHandle) null));
     }
 
     @Test
     public void instance_userHandle_instanceIsNotInstalled_stillReturnsInstance() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         TestAppInstance testAppInstance = testApp.instance(sUserHandle);
 
@@ -157,7 +149,7 @@
 
     @Test
     public void instance_userReference_instanceIsNotInstalled_stillReturnsInstance() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         TestAppInstance testAppInstance = testApp.instance(sNonExistingUserHandle);
 
@@ -167,7 +159,7 @@
 
     @Test
     public void instance_userHandle_nonExistingUser_stillReturnsInstance() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         TestAppInstance testAppInstance = testApp.instance(sUserHandle);
 
@@ -177,14 +169,14 @@
 
     @Test
     public void instance_nullUserHandle_throwsException() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         assertThrows(NullPointerException.class, () -> testApp.instance((UserHandle) null));
     }
 
     @Test
     public void instance_userReference_nonExistingUser_stillReturnsInstance() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         TestAppInstance testAppInstance = testApp.instance(sNonExistingUser);
 
@@ -194,42 +186,42 @@
 
     @Test
     public void instance_nullUserReference_throwsException() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         assertThrows(NullPointerException.class, () -> testApp.instance((UserReference) null));
     }
 
     @Test
     public void uninstall_nullUserReference_throwsException() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         assertThrows(NullPointerException.class, () -> testApp.uninstall((UserReference) null));
     }
 
     @Test
     public void uninstall_nullUserHandle_throwsException() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         assertThrows(NullPointerException.class, () -> testApp.uninstall((UserHandle) null));
     }
 
     @Test
     public void uninstall_userReference_nonExistingUser_doesNothing() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         testApp.uninstall(sNonExistingUser);
     }
 
     @Test
     public void uninstall_userHandle_nonExistingUser_doesNothing() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         testApp.uninstall(sNonExistingUserHandle);
     }
 
     @Test
     public void uninstall_userReference_notInstalled_doesNothing() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
         testApp.uninstall(sUser);
 
         testApp.uninstall(sUser);
@@ -237,7 +229,7 @@
 
     @Test
     public void uninstall_userHandle_notInstalled_doesNothing() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
         testApp.uninstall(sUser);
 
         testApp.uninstall(sUserHandle);
@@ -245,7 +237,7 @@
 
     @Test
     public void uninstall_noUserSpecified_uninstallsFromInstrumentedUser() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
         testApp.install(sUser);
 
         testApp.uninstall();
@@ -255,7 +247,7 @@
 
     @Test
     public void uninstall_userHandle_uninstalls() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
         testApp.install(sUser);
 
         testApp.uninstall(sUserHandle);
@@ -265,7 +257,7 @@
 
     @Test
     public void uninstall_userReference_uninstalls() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
         testApp.install(sUser);
 
         testApp.uninstall(sUser);
@@ -275,7 +267,7 @@
 
     @Test
     public void writeApkFile_writesFile() throws Exception {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
         File filesDir = sContext.getExternalFilesDir(/* type= */ null);
         File outputFile = new File(filesDir, "test.apk");
         outputFile.delete();
@@ -292,7 +284,7 @@
     @Test
     @EnsureHasDeviceOwner
     public void install_repeated_hasRemoteDpcDeviceOwner_doesNotFailVerification() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
         try (TestAppInstance t = testApp.install()) {
             // Intentionally empty
         }
@@ -304,7 +296,7 @@
     @Test
     @EnsureHasWorkProfile(dpcIsPrimary = true)
     public void install_repeated_hasRemoteDpcWorkProfile_doesNotFailVerification() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
 
         // The first install can be into the parent or the work profile and it will succeed
         try (TestAppInstance t = testApp.install()) {
@@ -320,7 +312,7 @@
     @Test
     @EnsureHasWorkProfile
     public void install_repeated_hasRemoteDpcWorkProfile_installsInParent_doesNotFailVerification() {
-        TestApp testApp = mTestAppProvider.any();
+        TestApp testApp = sDeviceState.testApps().any();
         try (TestAppInstance t = testApp.install()) {
             // Intentionally empty
         }
diff --git a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppActivity.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppActivity.java
index fef0895..cc7960f 100644
--- a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppActivity.java
+++ b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppActivity.java
@@ -31,6 +31,8 @@
  */
 public class BaseTestAppActivity extends EventLibActivity {
 
+    public static final String ACTIVITY_RESULT_KEY = "ACTIVITY_RESULT";
+
     private static Map<String, BaseTestAppActivity> sActivities = new WeakHashMap<>();
 
     /**
@@ -57,6 +59,8 @@
             sActivities.put(getClassName(), this);
         }
         super.onCreate(savedInstanceState);
+
+        forwardIntentResult();
     }
 
     @Override
@@ -65,6 +69,8 @@
             sActivities.put(getClassName(), this);
         }
         super.onCreate(savedInstanceState, persistentState);
+
+        forwardIntentResult();
     }
 
     @Override
@@ -96,4 +102,14 @@
     protected void onDestroy() {
         super.onDestroy();
     }
+
+    // TODO(b/198280332): Remove this temporary solution to set return values for methods
+    private void forwardIntentResult() {
+        int result = getIntent().getIntExtra(ACTIVITY_RESULT_KEY, -1);
+
+        if (result != -1) {
+            setResult(result);
+            finish();
+        }
+    }
 }
diff --git a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppDelegatedAdminReceiver.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppDelegatedAdminReceiver.java
new file mode 100644
index 0000000..2e3de42
--- /dev/null
+++ b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/BaseTestAppDelegatedAdminReceiver.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2021 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.bedstead.testapp;
+
+import android.app.admin.DelegatedAdminReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+
+import com.android.eventlib.premade.EventLibDelegatedAdminReceiver;
+
+/**
+ * Implementation of {@link DelegatedAdminReceiver} which logs events in response to callbacks and
+ * supports TestApp Features.
+ */
+public class BaseTestAppDelegatedAdminReceiver extends EventLibDelegatedAdminReceiver {
+    @Override
+    public String onChoosePrivateKeyAlias(Context context, Intent intent, int uid, Uri uri,
+            String alias) {
+        return super.onChoosePrivateKeyAlias(context, intent, uid, uri, alias);
+    }
+
+    @Override
+    public void onNetworkLogsAvailable(Context context, Intent intent, long batchToken,
+            int networkLogsCount) {
+        super.onNetworkLogsAvailable(context, intent, batchToken, networkLogsCount);
+    }
+
+    @Override
+    public void onSecurityLogsAvailable(Context context, Intent intent) {
+        super.onSecurityLogsAvailable(context, intent);
+    }
+}
diff --git a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAccountAuthenticatorService.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAccountAuthenticatorService.java
index 8ab57f3..9583703 100644
--- a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAccountAuthenticatorService.java
+++ b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAccountAuthenticatorService.java
@@ -20,13 +20,15 @@
 import android.content.Intent;
 import android.os.IBinder;
 
-// TODO(b/199143717): Create EventLibService
+import com.android.eventlib.premade.EventLibService;
+
 /**
  * A single-purpose {@link Service} to allow test apps to act as account authenticators.
  */
-public final class TestAppAccountAuthenticatorService extends Service {
+public final class TestAppAccountAuthenticatorService extends EventLibService {
     @Override
     public IBinder onBind(Intent intent) {
+        super.onBind(intent);
         return TestAppAccountAuthenticator.getAuthenticator(this).getIBinder();
     }
 }
diff --git a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAppComponentFactory.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAppComponentFactory.java
index 2fc307f..3d8e256 100644
--- a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAppComponentFactory.java
+++ b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppAppComponentFactory.java
@@ -21,6 +21,8 @@
 import android.app.AppComponentFactory;
 import android.app.Service;
 import android.app.admin.DevicePolicyManager;
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothManager;
 import android.content.BroadcastReceiver;
 import android.content.ContentResolver;
 import android.content.Context;
@@ -36,6 +38,7 @@
 
 import com.android.bedstead.testapp.processor.annotations.FrameworkClass;
 import com.android.bedstead.testapp.processor.annotations.TestAppReceiver;
+import com.android.eventlib.premade.EventLibService;
 
 /**
  * An {@link AppComponentFactory} which redirects invalid class names to premade TestApp classes.
@@ -52,6 +55,8 @@
                 @FrameworkClass(frameworkClass = AccountManager.class, constructor = "context.getSystemService(android.accounts.AccountManager.class)"),
                 @FrameworkClass(frameworkClass = Context.class, constructor = "context"),
                 @FrameworkClass(frameworkClass = ContentResolver.class, constructor = "context.getContentResolver()"),
+                @FrameworkClass(frameworkClass = BluetoothManager.class, constructor = "context.getSystemService(android.bluetooth.BluetoothManager.class)"),
+                @FrameworkClass(frameworkClass = BluetoothAdapter.class, constructor = "context.getSystemService(android.bluetooth.BluetoothManager.class).getAdapter()"),
                 @FrameworkClass(frameworkClass = KeyChain.class, constructor = "null") // KeyChain can not be instantiated - all calls are static
         }
 )
@@ -83,7 +88,6 @@
         try {
             return super.instantiateReceiver(classLoader, className, intent);
         } catch (ClassNotFoundException e) {
-
             if (className.endsWith("DeviceAdminReceiver")) {
                 Log.d(LOG_TAG, "Broadcast Receiver class (" + className
                         + ") not found, routing to TestAppDeviceAdminReceiver");
@@ -93,6 +97,15 @@
                                 intent);
                 receiver.setOverrideDeviceAdminReceiverClassName(className);
                 return receiver;
+            } else if (className.endsWith("DelegatedAdminReceiver")) {
+                Log.d(LOG_TAG, "Broadcast Receiver class (" + className
+                        + ") not found, routing to TestAppDelegatedAdminReceiver");
+                BaseTestAppDelegatedAdminReceiver receiver = (BaseTestAppDelegatedAdminReceiver)
+                        super.instantiateReceiver(
+                                classLoader, BaseTestAppDelegatedAdminReceiver.class.getName(),
+                                intent);
+                receiver.setOverrideDelegatedAdminReceiverClassName(className);
+                return receiver;
             }
 
             Log.d(LOG_TAG, "Broadcast Receiver class (" + className
@@ -118,9 +131,15 @@
                         classLoader,
                         TestAppAccountAuthenticatorService.class.getName(),
                         intent);
-            } else {
-                throw e;
             }
+
+            Log.d(LOG_TAG,
+                    "Service class (" + className + ") not found, routing to EventLibService");
+            EventLibService service =
+                    (EventLibService) super.instantiateService(
+                            classLoader, EventLibService.class.getName(), intent);
+            service.setOverrideServiceClassName(className);
+            return service;
         }
     }
 }
diff --git a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppBroadcastController.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppBroadcastController.java
new file mode 100644
index 0000000..554567c
--- /dev/null
+++ b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppBroadcastController.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2021 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.bedstead.testapp;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.compatibility.common.util.enterprise.DeviceAdminReceiverUtils;
+
+/**
+ * {@link BroadcastReceiver} allowing for simple control of test apps using broadcasts.
+ */
+public final class TestAppBroadcastController extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        setResultCode(Activity.RESULT_OK);
+        if (DeviceAdminReceiverUtils.disableSelf(context, intent)) return;
+    }
+}
diff --git a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppController.java b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppController.java
index 06c5c1e..08113b0 100644
--- a/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppController.java
+++ b/common/device-side/bedstead/testapp/src/testapps/main/java/com/android/bedstead/testapp/TestAppController.java
@@ -39,10 +39,19 @@
      */
     @CrossUser
     public void registerReceiver(Context context, long receiverId, IntentFilter intentFilter) {
+        registerReceiver(context, receiverId, intentFilter, 0);
+    }
+
+    /**
+     * See {@link registerReceiver(Context, long, IntentFilter)}.
+     */
+    @CrossUser
+    public void registerReceiver(Context context, long receiverId, IntentFilter intentFilter,
+            int flags) {
         BaseTestAppBroadcastReceiver broadcastReceiver = new BaseTestAppBroadcastReceiver();
         sBroadcastReceivers.put(receiverId, broadcastReceiver);
 
-        context.registerReceiver(broadcastReceiver, intentFilter);
+        context.registerReceiver(broadcastReceiver, intentFilter, flags);
     }
 
     /**
diff --git a/common/device-side/device-info/Android.bp b/common/device-side/device-info/Android.bp
index 881a95a..a3e618b 100644
--- a/common/device-side/device-info/Android.bp
+++ b/common/device-side/device-info/Android.bp
@@ -19,7 +19,10 @@
 java_library {
     name: "compatibility-device-info",
 
-    srcs: ["src/**/*.java"],
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.kt",
+    ],
 
     static_libs: [
         "androidx.test.rules",
diff --git a/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/HapticsDeviceInfo.java b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/HapticsDeviceInfo.java
new file mode 100644
index 0000000..93f3c80
--- /dev/null
+++ b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/HapticsDeviceInfo.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2019 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.compatibility.common.deviceinfo;
+
+import android.content.res.Resources;
+import android.media.AudioManager;
+import android.media.audiofx.HapticGenerator;
+import android.os.Build;
+import android.os.VibrationEffect;
+import android.os.Vibrator;
+import android.os.VibratorManager;
+import android.os.vibrator.VibratorFrequencyProfile;
+
+import com.android.compatibility.common.util.DeviceInfoStore;
+
+import java.util.Objects;
+
+/**
+ * Haptics device info collector.
+ */
+public final class HapticsDeviceInfo extends DeviceInfo {
+
+    private static final String LOG_TAG = "HapticsDeviceInfo";
+    private static final String ANONYMOUS_GROUP_NAME = null;  // marker for within array
+
+    // Scan a few IDs above the current top one.
+    private static final int MAX_EFFECT_ID = VibrationEffect.EFFECT_TEXTURE_TICK + 10;
+    private static final int MAX_PRIMITIVE_ID = VibrationEffect.Composition.PRIMITIVE_LOW_TICK + 10;
+
+    @Override
+    protected void collectDeviceInfo(DeviceInfoStore store) throws Exception {
+        collectVibratorInfo(store, "system_vibrator",
+                getContext().getSystemService(Vibrator.class));
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            VibratorManager manager = getContext().getSystemService(VibratorManager.class);
+            store.startArray("manager_vibrators");
+            for (int id : manager.getVibratorIds()) {
+                collectVibratorInfo(store, ANONYMOUS_GROUP_NAME, manager.getVibrator(id));
+            }
+            store.endArray();
+        }
+
+        collectHapticsDeviceConfig(store);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            store.addResult("audio_manager_is_haptic_playback_supported",
+                    getContext().getSystemService(AudioManager.class).isHapticPlaybackSupported());
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            store.addResult("haptic_generator_is_available", HapticGenerator.isAvailable());
+        }
+    }
+
+    /**
+     * Collect info for a vibrator into a group. If the group is part of an array, the groupName
+     * should be {@code ANONYMOUS_GROUP_NAME}.
+     */
+    private void collectVibratorInfo(DeviceInfoStore store, String groupName, Vibrator vibrator)
+            throws Exception {
+        Objects.requireNonNull(vibrator);
+        if (Objects.equals(groupName, ANONYMOUS_GROUP_NAME)) {
+            store.startGroup();  // Within an array.
+        } else {
+            store.startGroup(groupName);
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+            store.addResult("has_vibrator", vibrator.hasVibrator());
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            store.addResult("has_amplitude_control", vibrator.hasAmplitudeControl());
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+            collectEffectsSupport(store, vibrator);
+            collectPrimitivesSupport(store, vibrator);
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            store.addResult("vibrator_id", vibrator.getId());
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            store.addResult("has_frequency_control", vibrator.hasFrequencyControl());
+            store.addResult("q_factor", vibrator.getQFactor());
+            store.addResult("resonant_frequency", vibrator.getResonantFrequency());
+            VibratorFrequencyProfile frequencyProfile = vibrator.getFrequencyProfile();
+            if (frequencyProfile != null) {
+                store.startGroup("frequency_profile");
+                store.addResult("min_frequency", frequencyProfile.getMinFrequency());
+                store.addResult("max_frequency", frequencyProfile.getMaxFrequency());
+                store.addResult("max_amplitude_measurement_interval",
+                        frequencyProfile.getMaxAmplitudeMeasurementInterval());
+                store.addArrayResult("max_amplitude_measurements",
+                        frequencyProfile.getMaxAmplitudeMeasurements());
+                store.endGroup();
+            }
+        }
+        store.endGroup();
+    }
+
+    private void collectEffectsSupport(DeviceInfoStore store, Vibrator vibrator) throws Exception {
+        // Effectively checks whether the HAL declares effect support or not.
+        store.addResult("effect_support_returns_unknown",
+                vibrator.areAllEffectsSupported(VibrationEffect.EFFECT_CLICK)
+                        == Vibrator.VIBRATION_EFFECT_SUPPORT_UNKNOWN);
+        int[] effectsToCheck = new int[MAX_EFFECT_ID + 1];
+        for (int i = 0; i < effectsToCheck.length; ++i) {
+            effectsToCheck[i] = i;
+        }
+        int[] results = vibrator.areEffectsSupported(effectsToCheck);
+        store.startArray("supported_effects");
+        for (int i = 0; i < results.length; ++i) {
+            if (results[i] == Vibrator.VIBRATION_EFFECT_SUPPORT_YES) {
+                store.startGroup();
+                store.addResult("effect_id", i);
+                store.endGroup();
+            }
+        }
+        store.endArray();
+    }
+
+    private void collectPrimitivesSupport(DeviceInfoStore store, Vibrator vibrator)
+            throws Exception {
+        int[] primitivesToCheck = new int[MAX_PRIMITIVE_ID + 1];
+        for (int i = 0; i < primitivesToCheck.length; ++i) {
+            primitivesToCheck[i] = i;
+        }
+        boolean[] results = vibrator.arePrimitivesSupported(primitivesToCheck);
+        int[] durations = null;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+            durations = vibrator.getPrimitiveDurations(primitivesToCheck);
+        }
+        store.startArray("supported_primitives");
+        for (int i = 0; i < results.length; ++i) {
+            if (results[i]) {
+                store.startGroup();
+                store.addResult("primitive_id", i);
+                if (durations != null) {
+                    store.addResult("duration_ms", durations[i]);
+                }
+                store.endGroup();
+            }
+        }
+        store.endArray();
+    }
+
+    private void collectHapticsDeviceConfig(DeviceInfoStore store) throws Exception {
+        store.startGroup("haptics_device_config");
+        collectConfigInt(store, "default_haptic_feedback_intensity",
+                "config_defaultHapticFeedbackIntensity");
+        collectConfigInt(store, "default_notification_vibration_intensity",
+                "config_defaultNotificationVibrationIntensity");
+        collectConfigInt(store, "default_ring_vibration_intensity",
+                "config_defaultRingVibrationIntensity");
+        collectConfigInt(store, "default_alarm_vibration_intensity",
+                "config_defaultAlarmVibrationIntensity");
+        collectConfigInt(store, "default_media_vibration_intensity",
+                "config_defaultMediaVibrationIntensity");
+        collectConfigInt(store, "default_vibration_amplitude",
+                "config_defaultVibrationAmplitude");
+        collectConfigDimension(store, "haptic_channel_max_vibration_amplitude",
+                "config_hapticChannelMaxVibrationAmplitude");
+        collectConfigArraySize(store, "ringtone_effect_uris_array_size",
+                "config_ringtoneEffectUris");
+        store.endGroup();
+    }
+
+    private void collectConfigInt(DeviceInfoStore store, String resultName, String configName)
+            throws Exception {
+        Resources res = getContext().getResources();
+        int resId = res.getIdentifier(configName, "integer", "android");
+        try {
+            store.addResult(resultName, res.getInteger(resId));
+        } catch (Resources.NotFoundException e) {
+        }
+    }
+
+    private void collectConfigDimension(DeviceInfoStore store, String resultName, String configName)
+            throws Exception {
+        Resources res = getContext().getResources();
+        int resId = res.getIdentifier(configName, "dimen", "android");
+        try {
+            store.addResult(resultName, res.getFloat(resId));
+        } catch (Resources.NotFoundException e) {
+        }
+    }
+
+    private void collectConfigArraySize(DeviceInfoStore store, String resultName, String configName)
+            throws Exception {
+        Resources res = getContext().getResources();
+        int resId = res.getIdentifier(configName, "array", "android");
+        try {
+            store.addResult(resultName, res.getStringArray(resId).length);
+        } catch (Resources.NotFoundException e) {
+        }
+    }
+}
diff --git a/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/InputDeviceInfo.kt b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/InputDeviceInfo.kt
new file mode 100644
index 0000000..2d109ba
--- /dev/null
+++ b/common/device-side/device-info/src/com/android/compatibility/common/deviceinfo/InputDeviceInfo.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2022 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.compatibility.common.deviceinfo
+
+import android.content.Context
+
+import androidx.test.core.app.ApplicationProvider
+
+import com.android.compatibility.common.util.DeviceConfigStateManager
+import com.android.compatibility.common.util.DeviceInfoStore
+
+/**
+ * Input device info collector.
+ * Clarification: this collects input-related properties on the Android device under test.
+ * The name "InputDeviceInfo" should not be read as "InputDevice" "Info", but rather
+ * as "Input" "Device Info".
+ */
+public final class InputDeviceInfo : DeviceInfo() {
+    private val LOG_TAG = "InputDeviceInfo"
+
+    override fun collectDeviceInfo(store: DeviceInfoStore) {
+        collectInputInfo(store, "input")
+    }
+
+    private fun readDeviceConfig(namespace: String, name: String): String {
+        val context: Context = ApplicationProvider.getApplicationContext()
+        val stateManager = DeviceConfigStateManager(context, namespace, name)
+        return stateManager.get()!!
+    }
+
+    /**
+     * Collect info for input into a group.
+     */
+    private fun collectInputInfo(store: DeviceInfoStore, groupName: String) {
+        store.startGroup(groupName)
+
+        val palmRejectionValue = readDeviceConfig("input_native_boot", "palm_rejection_enabled")
+        val palmRejectionEnabled = palmRejectionValue == "1" || palmRejectionValue == "true"
+        store.addResult("palm_rejection_enabled", palmRejectionEnabled)
+
+        store.endGroup()
+    }
+}
diff --git a/common/device-side/util-axt/Android.bp b/common/device-side/util-axt/Android.bp
index 5357ce5..11f851b 100644
--- a/common/device-side/util-axt/Android.bp
+++ b/common/device-side/util-axt/Android.bp
@@ -49,6 +49,5 @@
     name: "compatibility-device-util-nodeps",
     srcs: [
          "src/com/android/compatibility/common/util/IBinderParcelable.java",
-         "src/com/android/compatibility/common/util/ImeAwareEditText.java",
     ],
 }
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/BaseDefaultPermissionGrantPolicyTest.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/BaseDefaultPermissionGrantPolicyTest.java
index 1766380..41a38d4 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/BaseDefaultPermissionGrantPolicyTest.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/BaseDefaultPermissionGrantPolicyTest.java
@@ -112,6 +112,12 @@
             addSplitFromNonDangerousPermissions(packagesToVerify, pregrantUidStates);
         }
 
+        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)
+                || ApiLevelUtil.codenameStartsWith("T")) {
+            addImplicitlyGrantedPermission(Manifest.permission.POST_NOTIFICATIONS,
+                    Build.VERSION_CODES.TIRAMISU, packagesToVerify, pregrantUidStates);
+        }
+
         // Add exceptions
         addExceptionsDefaultPermissions(packagesToVerify, runtimePermNames, pregrantUidStates);
 
@@ -514,6 +520,37 @@
         }
     }
 
+    /**
+     * Add a permission which is granted, if it is implicitly added to a package
+     * @param permissionToAdd The permission to be added
+     * @param targetSdk The targetSDK below which the permission is added in
+     * @param packageInfos The packageInfos to be checked
+     * @param outUidStates The state to be modified
+     */
+    public static void addImplicitlyGrantedPermission(String permissionToAdd, int targetSdk,
+            Map<String, PackageInfo> packageInfos, SparseArray<UidState> outUidStates) {
+        for (PackageInfo pkg : packageInfos.values()) {
+            if (pkg.applicationInfo.targetSdkVersion >= targetSdk) {
+                continue;
+            }
+            for (String perm: pkg.requestedPermissions) {
+                if (perm.equals(permissionToAdd)) {
+                    int uid = pkg.applicationInfo.uid;
+                    UidState uidState = outUidStates.get(uid);
+                    if (uidState != null
+                            && uidState.grantedPermissions.containsKey(permissionToAdd)) {
+                        // permission is already granted. Don't override the grant-state.
+                        continue;
+                    }
+
+                    appendPackagePregrantedPerms(pkg, "permission " + permissionToAdd
+                                    + " is granted to pre-" + targetSdk + " apps", false,
+                            Collections.singleton(permissionToAdd), outUidStates);
+                }
+            }
+        }
+    }
+
     public static void appendPackagePregrantedPerms(PackageInfo packageInfo, String reason,
             boolean fixed, Set<String> pregrantedPerms, SparseArray<UidState> outUidStates) {
         final int uid = packageInfo.applicationInfo.uid;
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/BlockingBroadcastReceiver.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/BlockingBroadcastReceiver.java
index 6d44391..8532384 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/BlockingBroadcastReceiver.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/BlockingBroadcastReceiver.java
@@ -19,11 +19,10 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import androidx.annotation.Nullable;
 import android.util.Log;
 
-import java.util.ArrayList;
-import java.util.List;
+import androidx.annotation.Nullable;
+
 import java.util.Set;
 import java.util.concurrent.ArrayBlockingQueue;
 import java.util.concurrent.BlockingQueue;
@@ -56,7 +55,9 @@
  *     // Code which should be executed after broadcast is received
  * </pre>
  *
- * If the broadcast is not receiver an exception will be thrown.
+ * If the broadcast is not received an exception will be thrown. Note that if an exception is thrown
+ * within the try block which results in the broadcast not being sent, then that exception will be
+ * hidden by the not-received exception.
  */
 public class BlockingBroadcastReceiver extends BroadcastReceiver implements AutoCloseable {
     private static final String TAG = "BlockingBroadcast";
@@ -78,25 +79,33 @@
         return create(context, intentFilter, /* checker= */ null);
     }
 
-    public static BlockingBroadcastReceiver create(Context context, String expectedAction, Function<Intent, Boolean> checker) {
+    public static BlockingBroadcastReceiver create(Context context, String expectedAction,
+            Function<Intent, Boolean> checker) {
         return create(context, new IntentFilter(expectedAction), checker);
     }
 
-    public static BlockingBroadcastReceiver create(Context context, IntentFilter intentFilter, Function<Intent, Boolean> checker) {
+    public static BlockingBroadcastReceiver create(Context context, IntentFilter intentFilter,
+            Function<Intent, Boolean> checker) {
         return create(context, Set.of(intentFilter), checker);
     }
 
-    public static BlockingBroadcastReceiver create(Context context, Set<IntentFilter> intentFilters) {
+    public static BlockingBroadcastReceiver create(Context context,
+            Set<IntentFilter> intentFilters) {
         return create(context, intentFilters, /* checker= */ null);
     }
 
-    public static BlockingBroadcastReceiver create(Context context, Set<IntentFilter> intentFilters, Function<Intent, Boolean> checker) {
+    public static BlockingBroadcastReceiver create(Context context, Set<IntentFilter> intentFilters,
+            Function<Intent, Boolean> checker) {
         BlockingBroadcastReceiver blockingBroadcastReceiver =
                 new BlockingBroadcastReceiver(context, intentFilters, checker);
 
         return blockingBroadcastReceiver;
     }
 
+    public BlockingBroadcastReceiver(Context context) {
+        this(context, Set.of());
+    }
+
     public BlockingBroadcastReceiver(Context context, String expectedAction) {
         this(context, new IntentFilter(expectedAction));
     }
@@ -143,7 +152,8 @@
 
     public BlockingBroadcastReceiver register() {
         for (IntentFilter intentFilter : mIntentFilters) {
-            mContext.registerReceiver(this, intentFilter);
+            mContext.registerReceiver(this, intentFilter,
+                    Context.RECEIVER_EXPORTED_UNAUDITED);
         }
 
         return this;
@@ -153,7 +163,8 @@
         for (IntentFilter intentFilter : mIntentFilters) {
             mContext.registerReceiverForAllUsers(
                     this, intentFilter, /* broadcastPermission= */ null,
-                    /* scheduler= */ null);
+                    /* scheduler= */ null,
+                    Context.RECEIVER_EXPORTED_UNAUDITED);
         }
 
         return this;
@@ -173,7 +184,8 @@
      * Wait until the broadcast and return the received broadcast intent. {@code null} is returned
      * if no broadcast with expected action is received within 60 seconds.
      */
-    public @Nullable Intent awaitForBroadcast() {
+    public @Nullable
+    Intent awaitForBroadcast() {
         return awaitForBroadcast(DEFAULT_TIMEOUT_SECONDS * 1000);
     }
 
@@ -193,7 +205,8 @@
      * Wait until the broadcast and return the received broadcast intent. {@code null} is returned
      * if no broadcast with expected action is received within the given timeout.
      */
-    public @Nullable Intent awaitForBroadcast(long timeoutMillis) {
+    public @Nullable
+    Intent awaitForBroadcast(long timeoutMillis) {
         if (mReceivedIntent != null) {
             return mReceivedIntent;
         }
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/BroadcastMessenger.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/BroadcastMessenger.java
new file mode 100644
index 0000000..a5a12a4
--- /dev/null
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/BroadcastMessenger.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2021 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.compatibility.common.util;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Parcelable;
+import android.os.SystemClock;
+import android.util.Log;
+
+import androidx.annotation.GuardedBy;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.Objects;
+
+/**
+ * Provides a one-way communication mechanism using a Parcelable as a payload, via broadcasts.
+ *
+ * Use {@link #send(Context, String, Parcelable)} to send a message.
+ * Use {@link Receiver} to receive a message.
+ *
+ * Pick a unique "suffix" for your test, and use it with both the sender and receiver, in order
+ * to avoid "cross-talks" between different tests. (if they ever run at the same time.)
+ */
+public final class BroadcastMessenger {
+    private static final String TAG = "BroadcastMessenger";
+
+    private static final String ACTION_MESSAGE =
+            "com.android.compatibility.common.util.BroadcastMessenger.ACTION_MESSAGE_";
+    private static final String ACTION_PING =
+            "com.android.compatibility.common.util.BroadcastMessenger.ACTION_PING_";
+    private static final String EXTRA_MESSAGE =
+            "com.android.compatibility.common.util.BroadcastMessenger.EXTRA_MESSAGE";
+
+    /**
+     * We need to drop messages that were sent before the receiver was created. We keep
+     * track of the message send time in this extra.
+     */
+    private static final String EXTRA_SENT_TIME =
+            "com.android.compatibility.common.util.BroadcastMessenger.EXTRA_SENT_TIME";
+
+    public static final int DEFAULT_TIMEOUT_MS = 10_000;
+
+    private static long getCurrentTime() {
+        return SystemClock.uptimeMillis();
+    }
+
+    private static void sendBroadcast(@NonNull Intent i, @NonNull Context context,
+            @NonNull String broadcastSuffix, @Nullable String receiverPackage) {
+        i.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        i.setPackage(receiverPackage);
+        i.putExtra(EXTRA_SENT_TIME, getCurrentTime());
+
+        context.sendBroadcast(i);
+    }
+
+    /** Send a message to the {@link Receiver} expecting a given "suffix". */
+    public static <T extends Parcelable> void send(@NonNull Context context,
+            @NonNull String broadcastSuffix, @NonNull T message) {
+        final Intent i = new Intent(ACTION_MESSAGE + Objects.requireNonNull(broadcastSuffix));
+        i.putExtra(EXTRA_MESSAGE, Objects.requireNonNull(message));
+
+        Log.i(TAG, "Sending: " + message);
+        sendBroadcast(i, context, broadcastSuffix, /*receiverPackage=*/ null);
+    }
+
+    private static void sendPing(@NonNull Context context, @NonNull String broadcastSuffix,
+            @NonNull String receiverPackage) {
+        final Intent i = new Intent(ACTION_PING + Objects.requireNonNull(broadcastSuffix));
+
+        Log.i(TAG, "Sending a ping");
+        sendBroadcast(i, context, broadcastSuffix, receiverPackage);
+    }
+
+    /**
+     * Receive messages sent with {@link #send}. Note it'll ignore all the messages that were
+     * sent before instantiated.
+     *
+     * @param <T> the class that encapsulates the message.
+     */
+    public static final class Receiver<T extends Parcelable> implements AutoCloseable {
+        private final Context mContext;
+        private final String mBroadcastSuffix;
+        private final HandlerThread mReceiverThread = new HandlerThread(TAG);
+        private final Handler mReceiverHandler;
+
+        @GuardedBy("mMessages")
+        private final ArrayList<T> mMessages = new ArrayList<>();
+        private final long mCreatedTime = getCurrentTime();
+        private boolean mRegistered;
+
+        private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                // Log.d(TAG, "Received intent: " + intent);
+                if (intent.getAction().equals(ACTION_MESSAGE + mBroadcastSuffix)
+                        || intent.getAction().equals(ACTION_PING + mBroadcastSuffix)) {
+                    // OK
+                } else {
+                    throw new RuntimeException("Unknown broadcast received: " + intent);
+                }
+                if (intent.getLongExtra(EXTRA_SENT_TIME, 0) < mCreatedTime) {
+                    Log.i(TAG, "Dropping stale broadcast: " + intent);
+                    return;
+                }
+
+                // Note for a PING, the message will be null.
+                final T message = intent.getParcelableExtra(EXTRA_MESSAGE);
+                if (message != null) {
+                    Log.i(TAG, "Received: " + message);
+                }
+
+                synchronized (mMessages) {
+                    mMessages.add(message);
+                    mMessages.notifyAll();
+                }
+            }
+        };
+
+        /**
+         * Constructor.
+         */
+        public Receiver(@NonNull Context context, @NonNull String broadcastSuffix) {
+            mContext = context;
+            mBroadcastSuffix = Objects.requireNonNull(broadcastSuffix);
+
+            mReceiverThread.start();
+            mReceiverHandler = new Handler(mReceiverThread.getLooper());
+
+            final IntentFilter fi = new IntentFilter(ACTION_MESSAGE + mBroadcastSuffix);
+            fi.addAction(ACTION_PING + mBroadcastSuffix);
+
+            context.registerReceiver(mReceiver, fi, /* permission=*/ null,
+                    mReceiverHandler, Context.RECEIVER_EXPORTED);
+            mRegistered = true;
+        }
+
+        @Override
+        public void close() {
+            if (mRegistered) {
+                mContext.unregisterReceiver(mReceiver);
+                mReceiverThread.quit();
+                mRegistered = false;
+            }
+        }
+
+        /**
+         * Receive the next message with a 10 second timeout.
+         */
+        @NonNull
+        public T waitForNextMessage() {
+            return waitForNextMessage(DEFAULT_TIMEOUT_MS);
+        }
+
+        /**
+         * Receive the next message.
+         */
+        @NonNull
+        public T waitForNextMessage(long timeoutMillis) {
+            final T message = waitForNextMessageOrPing(timeoutMillis);
+            if (message == null) {
+                throw new RuntimeException("Received unexpected ACTION_PING");
+            }
+            return message;
+        }
+
+        /**
+         * Internal method, either return the next message, or null when a PING broadcast
+         * is received.
+         */
+        @Nullable
+        private T waitForNextMessageOrPing(long timeoutMillis) {
+            final long timeout = System.currentTimeMillis() + timeoutMillis;
+            synchronized (mMessages) {
+                while (mMessages.size() == 0) {
+                    final long wait = timeout - System.currentTimeMillis();
+                    if (wait <= 0) {
+                        throw new RuntimeException("Timeout waiting for the next message");
+                    }
+                    try {
+                        mMessages.wait(wait);
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                }
+                return mMessages.remove(0);
+            }
+        }
+
+        /**
+         * Ensure that no further messages have been received.
+         *
+         * Call it before {@link #close()}.
+         */
+        public void ensureNoMoreMessages() {
+            // If there's a message already in mMessages, then we know it'll fail, so we don't
+            // need to send a ping.
+            // OTOH, even if there's no message enqueued, there may be broadcasts already enqueued,
+            // so we send a "ping" message,
+            synchronized (mMessages) {
+                if (mMessages.size() == 0) {
+                    // Send a ping to myself.
+                    sendPing(mContext, mBroadcastSuffix, mContext.getPackageName());
+                }
+            }
+
+            final T m = waitForNextMessageOrPing(DEFAULT_TIMEOUT_MS);
+            if (m == null) {
+                return; // Okay. Ping will deliver a null message.
+            }
+            throw new RuntimeException("No more messages expected, but received: " + m);
+        }
+    }
+}
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/CallbackAsserter.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/CallbackAsserter.java
index e722fb2..9c27e23 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/CallbackAsserter.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/CallbackAsserter.java
@@ -101,7 +101,8 @@
                     mLatch.countDown();
                 }
             };
-            InstrumentationRegistry.getContext().registerReceiver(mReceiver, filter);
+            InstrumentationRegistry.getContext().registerReceiver(mReceiver, filter,
+                    Context.RECEIVER_EXPORTED_UNAUDITED);
         }
 
         @Override
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/GestureNavRule.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/GestureNavRule.java
new file mode 100644
index 0000000..9c363d2
--- /dev/null
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/GestureNavRule.java
@@ -0,0 +1,252 @@
+/*
+ * Copyright (C) 2022 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.compatibility.common.util;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.app.Instrumentation;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
+import android.support.test.uiautomator.Until;
+import android.util.ArrayMap;
+
+import androidx.test.InstrumentationRegistry;
+
+import org.junit.rules.ExternalResource;
+
+import java.util.Map;
+
+/**
+ * Test rule to enable gesture navigation on the device.
+ */
+public class GestureNavRule extends ExternalResource {
+    private static final String SETTINGS_PACKAGE_NAME = "com.android.settings";
+    private static final String NAV_BAR_INTERACTION_MODE_RES_NAME = "config_navBarInteractionMode";
+    private static final int NAV_BAR_INTERACTION_MODE_GESTURAL = 2;
+
+    /** Most application's res id must be larger than 0x7f000000 */
+    public static final int MIN_APPLICATION_RES_ID = 0x7f000000;
+    public static final String SETTINGS_CLASS =
+            SETTINGS_PACKAGE_NAME + ".Settings$SystemDashboardActivity";
+
+    private final Map<String, Boolean> mSystemGestureOptionsMap = new ArrayMap<>();
+    private final Context mTargetContext;
+    private final UiDevice mDevice;
+
+    // Bounds for actions like swipe and click.
+    private String mEdgeToEdgeNavigationTitle;
+    private String mSystemNavigationTitle;
+    private String mGesturePreferenceTitle;
+    private boolean mConfiguredInSettings;
+
+    @Override
+    protected void before() throws Throwable {
+        if (!isGestureMode()) {
+            enableGestureNav();
+        }
+        assumeGestureNavigationMode();
+    }
+
+    @Override
+    protected void after() {
+        disableGestureNav();
+    }
+
+    /**
+     * Initialize all options in System Gesture.
+     */
+    public GestureNavRule() {
+        @SuppressWarnings("deprecation")
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        mDevice = UiDevice.getInstance(instrumentation);
+        mTargetContext = instrumentation.getTargetContext();
+        PackageManager packageManager = mTargetContext.getPackageManager();
+        Resources res;
+        try {
+            res = packageManager.getResourcesForApplication(SETTINGS_PACKAGE_NAME);
+        } catch (PackageManager.NameNotFoundException e) {
+            return;
+        }
+        if (res == null) {
+            return;
+        }
+
+        mEdgeToEdgeNavigationTitle = getSettingsString(res, "edge_to_edge_navigation_title");
+        mGesturePreferenceTitle = getSettingsString(res, "gesture_preference_title");
+        mSystemNavigationTitle = getSettingsString(res, "system_navigation_title");
+
+        String text = getSettingsString(res, "edge_to_edge_navigation_title");
+        if (text != null) {
+            mSystemGestureOptionsMap.put(text, false);
+        }
+        text = getSettingsString(res, "swipe_up_to_switch_apps_title");
+        if (text != null) {
+            mSystemGestureOptionsMap.put(text, false);
+        }
+        text = getSettingsString(res, "legacy_navigation_title");
+        if (text != null) {
+            mSystemGestureOptionsMap.put(text, false);
+        }
+
+        mConfiguredInSettings = false;
+    }
+
+    @SuppressWarnings("BooleanMethodIsAlwaysInverted")
+    private boolean hasSystemGestureFeature() {
+        final PackageManager pm = mTargetContext.getPackageManager();
+
+        // No bars on embedded devices.
+        // No bars on TVs and watches.
+        return !(pm.hasSystemFeature(PackageManager.FEATURE_WATCH)
+                || pm.hasSystemFeature(PackageManager.FEATURE_EMBEDDED)
+                || pm.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
+                || pm.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE));
+    }
+
+
+    private UiObject2 findSystemNavigationObject(String text, boolean addCheckSelector) {
+        BySelector widgetFrameSelector = By.res("android", "widget_frame");
+        BySelector checkboxSelector = By.checkable(true);
+        if (addCheckSelector) {
+            checkboxSelector = checkboxSelector.checked(true);
+        }
+        BySelector textSelector = By.text(text);
+        BySelector targetSelector = By.hasChild(widgetFrameSelector).hasDescendant(textSelector)
+                .hasDescendant(checkboxSelector);
+
+        return mDevice.findObject(targetSelector);
+    }
+
+    private boolean launchToSettingsSystemGesture() {
+
+        // Open the Settings app as close as possible to the gesture Fragment
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        ComponentName settingComponent = new ComponentName(SETTINGS_PACKAGE_NAME, SETTINGS_CLASS);
+        intent.setComponent(settingComponent);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        mTargetContext.startActivity(intent);
+
+        // Wait for the app to appear
+        mDevice.wait(Until.hasObject(By.pkg("com.android.settings").depth(0)),
+                5000);
+        mDevice.wait(Until.hasObject(By.text(mGesturePreferenceTitle)), 5000);
+        if (mDevice.findObject(By.text(mGesturePreferenceTitle)) == null) {
+            return false;
+        }
+        mDevice.findObject(By.text(mGesturePreferenceTitle)).click();
+        mDevice.wait(Until.hasObject(By.text(mSystemNavigationTitle)), 5000);
+        if (mDevice.findObject(By.text(mSystemNavigationTitle)) == null) {
+            return false;
+        }
+        mDevice.findObject(By.text(mSystemNavigationTitle)).click();
+        mDevice.wait(Until.hasObject(By.text(mEdgeToEdgeNavigationTitle)), 5000);
+
+        return mDevice.hasObject(By.text(mEdgeToEdgeNavigationTitle));
+    }
+
+    private void leaveSettings() {
+        mDevice.pressBack(); /* Back to Gesture */
+        mDevice.waitForIdle();
+        mDevice.pressBack(); /* Back to System */
+        mDevice.waitForIdle();
+        mDevice.pressBack(); /* back to Settings */
+        mDevice.waitForIdle();
+        mDevice.pressBack(); /* Back to Home */
+        mDevice.waitForIdle();
+
+        mDevice.pressHome(); /* double confirm back to home */
+        mDevice.waitForIdle();
+    }
+
+    private void enableGestureNav() {
+        if (!hasSystemGestureFeature()) {
+            return;
+        }
+
+        // Set up the gesture navigation by enabling it via the Settings app
+        boolean isOperatedSettingsToExpectedOption = launchToSettingsSystemGesture();
+        if (isOperatedSettingsToExpectedOption) {
+            for (Map.Entry<String, Boolean> entry : mSystemGestureOptionsMap.entrySet()) {
+                UiObject2 uiObject2 = findSystemNavigationObject(entry.getKey(), true);
+                entry.setValue(uiObject2 != null);
+            }
+            UiObject2 edgeToEdgeObj = mDevice.findObject(By.text(mEdgeToEdgeNavigationTitle));
+            if (edgeToEdgeObj != null) {
+                edgeToEdgeObj.click();
+                mConfiguredInSettings = true;
+            }
+        }
+        mDevice.waitForIdle();
+        leaveSettings();
+
+        mDevice.pressHome();
+        mDevice.waitForIdle();
+
+        mDevice.waitForIdle();
+    }
+
+    /**
+     * Restore the original configured value for the system gesture by operating Settings.
+     */
+    private void disableGestureNav() {
+        if (!hasSystemGestureFeature()) {
+            return;
+        }
+
+        if (mConfiguredInSettings) {
+            launchToSettingsSystemGesture();
+            for (Map.Entry<String, Boolean> entry : mSystemGestureOptionsMap.entrySet()) {
+                if (entry.getValue()) {
+                    UiObject2 navigationObject = findSystemNavigationObject(entry.getKey(), false);
+                    if (navigationObject != null) {
+                        navigationObject.click();
+                    }
+                }
+            }
+            leaveSettings();
+        }
+    }
+
+    private void assumeGestureNavigationMode() {
+        boolean isGestureMode = isGestureMode();
+        assumeTrue("Gesture navigation required", isGestureMode);
+    }
+
+    private boolean isGestureMode() {
+        // TODO: b/153032202 consider the CTS on GSI case.
+        Resources res = mTargetContext.getResources();
+        int naviModeId = res.getIdentifier(NAV_BAR_INTERACTION_MODE_RES_NAME, "integer", "android");
+        int naviMode = res.getInteger(naviModeId);
+        return naviMode == NAV_BAR_INTERACTION_MODE_GESTURAL;
+    }
+
+    private static String getSettingsString(Resources res, String strResName) {
+        int resIdString = res.getIdentifier(strResName, "string", SETTINGS_PACKAGE_NAME);
+        if (resIdString <= MIN_APPLICATION_RES_ID) {
+            return null;
+        }
+
+        return res.getString(resIdString);
+    }
+}
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/ImeAwareEditText.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/ImeAwareEditText.java
deleted file mode 100644
index f28d085..0000000
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/ImeAwareEditText.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2017 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.compatibility.common.util;
-
-import android.content.Context;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.InputConnection;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.EditText;
-
-public class ImeAwareEditText extends EditText {
-    private boolean mHasPendingShowSoftInputRequest;
-    final Runnable mRunShowSoftInputIfNecessary = () -> showSoftInputIfNecessary();
-
-    public ImeAwareEditText(Context context) {
-        super(context, null);
-    }
-
-    public ImeAwareEditText(Context context, AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public ImeAwareEditText(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-    }
-
-    public ImeAwareEditText(Context context, AttributeSet attrs, int defStyleAttr,
-            int defStyleRes) {
-        super(context, attrs, defStyleAttr, defStyleRes);
-    }
-
-    /**
-     * This method is called back by the system when the system is about to establish a connection
-     * to the current input method.
-     *
-     * <p>This is a good and reliable signal to schedule a pending task to call
-     * {@link InputMethodManager#showSoftInput(View, int)}.</p>
-     *
-     * @param editorInfo context about the text input field.
-     * @return {@link InputConnection} to be passed to the input method.
-     */
-    @Override
-    public InputConnection onCreateInputConnection(EditorInfo editorInfo) {
-        final InputConnection ic = super.onCreateInputConnection(editorInfo);
-        if (mHasPendingShowSoftInputRequest) {
-            removeCallbacks(mRunShowSoftInputIfNecessary);
-            post(mRunShowSoftInputIfNecessary);
-        }
-        return ic;
-    }
-
-    private void showSoftInputIfNecessary() {
-        if (mHasPendingShowSoftInputRequest) {
-            final InputMethodManager imm =
-                    getContext().getSystemService(InputMethodManager.class);
-            imm.showSoftInput(this, 0);
-            mHasPendingShowSoftInputRequest = false;
-        }
-    }
-
-    public void scheduleShowSoftInput() {
-        final InputMethodManager imm = getContext().getSystemService(InputMethodManager.class);
-        if (imm.hasActiveInputConnection(this)) {
-            // This means that ImeAwareEditText is already connected to the IME.
-            // InputMethodManager#showSoftInput() is guaranteed to pass client-side focus check.
-            mHasPendingShowSoftInputRequest = false;
-            removeCallbacks(mRunShowSoftInputIfNecessary);
-            imm.showSoftInput(this, 0);
-            return;
-        }
-
-        // Otherwise, InputMethodManager#showSoftInput() should be deferred after
-        // onCreateInputConnection().
-        mHasPendingShowSoftInputRequest = true;
-    }
-}
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/PropertyUtil.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/PropertyUtil.java
index 4125ede..3ca979d 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/PropertyUtil.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/PropertyUtil.java
@@ -268,4 +268,33 @@
             }
         }
     }
+
+    /** Retrieves a map of prop to value for all props with the given prefix */
+    public static Map<String, String> getPropertiesWithPrefix(String prefix) {
+        Map<String, String> result = new HashMap<>();
+        Pattern pattern = Pattern.compile("\\[(.*)\\]: \\[(.*)\\]");
+        Scanner scanner = null;
+        try {
+            Process process = new ProcessBuilder("getprop").start();
+            scanner = new Scanner(process.getInputStream());
+            while (scanner.hasNextLine()) {
+                String line = scanner.nextLine().trim();
+                Matcher matcher = pattern.matcher(line);
+                if (matcher.find()) {
+                    String prop = matcher.group(1);
+                    String value = matcher.group(2);
+                    if (prop.startsWith(prefix)) {
+                        result.put(prop, value);
+                    }
+                }
+            }
+            return result;
+        } catch (IOException e) {
+            return result;
+        } finally {
+            if (scanner != null) {
+                scanner.close();
+            }
+        }
+    }
 }
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/UiAutomatorUtils.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/UiAutomatorUtils.java
index 639c871..3f42e32 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/UiAutomatorUtils.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/UiAutomatorUtils.java
@@ -27,8 +27,10 @@
 import android.support.test.uiautomator.UiScrollable;
 import android.support.test.uiautomator.UiSelector;
 import android.support.test.uiautomator.Until;
+import android.util.TypedValue;
 
 import androidx.test.InstrumentationRegistry;
+import androidx.test.core.app.ApplicationProvider;
 
 import java.util.regex.Pattern;
 
@@ -38,6 +40,9 @@
     /** Default swipe deadzone percentage. See {@link UiScrollable}. */
     private static final double DEFAULT_SWIPE_DEADZONE_PCT = 0.1;
 
+    /** Minimum view height accepted (before needing to scroll more). */
+    private static final float MIN_VIEW_HEIGHT_DP = 8;
+
     private static Pattern sCollapsingToolbarResPattern =
             Pattern.compile(".*:id/collapsing_toolbar");
 
@@ -64,6 +69,11 @@
         return waitFindObjectOrNull(selector, 20_000);
     }
 
+    private static int convertDpToPx(float dp) {
+        return Math.round(TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp,
+                ApplicationProvider.getApplicationContext().getResources().getDisplayMetrics()));
+    }
+
     public static UiObject2 waitFindObjectOrNull(BySelector selector, long timeoutMs)
             throws UiObjectNotFoundException {
         UiObject2 view = null;
@@ -73,10 +83,12 @@
         boolean wasScrolledUpAlready = false;
         boolean scrolledPastCollapsibleToolbar = false;
 
+        final int minViewHeightPx = convertDpToPx(MIN_VIEW_HEIGHT_DP);
+
         while (view == null && start + timeoutMs > System.currentTimeMillis()) {
             view = getUiDevice().wait(Until.findObject(selector), 1000);
 
-            if (view == null) {
+            if (view == null || view.getVisibleBounds().height() < minViewHeightPx) {
                 final double deadZone = !(FeatureUtil.isWatch() || FeatureUtil.isTV())
                         ? 0.25 : DEFAULT_SWIPE_DEADZONE_PCT;
                 UiScrollable scrollable = new UiScrollable(new UiSelector().scrollable(true));
@@ -98,9 +110,15 @@
                     } else {
                         Rect boundsBeforeScroll = scrollable.getBounds();
                         boolean scrollAtStartOrEnd = !scrollable.scrollForward();
-                        Rect boundsAfterScroll = scrollable.getBounds();
-                        isAtEnd = scrollAtStartOrEnd && boundsBeforeScroll.equals(
-                                boundsAfterScroll);
+                        // The scrollable view may no longer be scrollable after the toolbar is
+                        // collapsed.
+                        if (scrollable.exists()) {
+                            Rect boundsAfterScroll = scrollable.getBounds();
+                            isAtEnd = scrollAtStartOrEnd && boundsBeforeScroll.equals(
+                                    boundsAfterScroll);
+                        } else {
+                            isAtEnd = scrollAtStartOrEnd;
+                        }
                     }
                 } else {
                     // There might be a collapsing toolbar, but no scrollable view. Try to collapse
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java
index b6473b6..60d7535 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/devicepolicy/provisioning/SilentProvisioningTestManager.java
@@ -163,7 +163,8 @@
         }
 
         public void register() {
-            mContext.registerReceiver(this, new IntentFilter(mAction));
+            mContext.registerReceiver(this, new IntentFilter(mAction),
+                    Context.RECEIVER_EXPORTED_UNAUDITED);
         }
 
         public boolean await() throws InterruptedException {
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/enterprise/DeviceAdminReceiverUtils.java b/common/device-side/util-axt/src/com/android/compatibility/common/util/enterprise/DeviceAdminReceiverUtils.java
index d1d7dcb..c0c434e 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/enterprise/DeviceAdminReceiverUtils.java
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/enterprise/DeviceAdminReceiverUtils.java
@@ -29,7 +29,7 @@
     private static final String TAG = DeviceAdminReceiverUtils.class.getSimpleName();
     private static final boolean DEBUG = false;
 
-    private static final String ACTION_DISABLE_SELF = "disable_self";
+    public static final String ACTION_DISABLE_SELF = "disable_self";
 
     /**
      * Disables itself as profile / owner upon receiving a {@value #ACTION_DISABLE_SELF} intent.
diff --git a/common/device-side/util-axt/src/com/android/compatibility/common/util/enterprise/OWNERS b/common/device-side/util-axt/src/com/android/compatibility/common/util/enterprise/OWNERS
index cf88726..19b6194 100644
--- a/common/device-side/util-axt/src/com/android/compatibility/common/util/enterprise/OWNERS
+++ b/common/device-side/util-axt/src/com/android/compatibility/common/util/enterprise/OWNERS
@@ -1,2 +1,2 @@
 # Bug template url: https://b.corp.google.com/issues/new?component=100560&template=63204
-file:platform/frameworks/base:/core/java/android/app/admin/EnterprisePlatform_OWNERS
\ No newline at end of file
+file:platform/frameworks/base:/core/java/android/app/admin/EnterprisePlatform_OWNERS
diff --git a/hostsidetests/adbmanager/src/android/adbmanager/cts/AdbManagerHostDeviceTest.java b/hostsidetests/adbmanager/src/android/adbmanager/cts/AdbManagerHostDeviceTest.java
index 474d518..291c65a 100644
--- a/hostsidetests/adbmanager/src/android/adbmanager/cts/AdbManagerHostDeviceTest.java
+++ b/hostsidetests/adbmanager/src/android/adbmanager/cts/AdbManagerHostDeviceTest.java
@@ -31,6 +31,7 @@
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class AdbManagerHostDeviceTest extends BaseHostJUnit4Test {
     private static final String FEATURE_WIFI = "android.hardware.wifi";
+    private static final String FEATURE_ETHERNET = "android.hardware.ethernet";
     private static final String FEATURE_CAMERA_ANY = "android.hardware.camera.any";
 
     private boolean hasFeature(String feature) throws Exception {
@@ -38,10 +39,15 @@
         return Boolean.parseBoolean(result.getStdout().trim());
     }
 
+    // The following testing case is for AdbService.java#isAdbWifiSupported which has expanded
+    // its support to Ethernet to provide wider coverage for ATV devices.
+    // We didn't rename the API `isAdbWifiSupported` since it's being referenced in multiple
+    // different places. But the following test case has been renamed to reflect the expanded
+    // coverage.
     @Test
     @CddTest(requirement="6.1/C-1-1")
-    public void test_isadbWifiSupported() throws Exception {
-        boolean expected = hasFeature(FEATURE_WIFI);
+    public void test_isadbNetworkSupported() throws Exception {
+        boolean expected = hasFeature(FEATURE_WIFI) || hasFeature(FEATURE_ETHERNET);
 
         CommandResult result = getDevice().executeShellV2Command("cmd adb is-wifi-supported");
 
@@ -49,10 +55,16 @@
         Assert.assertEquals(expected, Boolean.parseBoolean(result.getStdout().trim()));
     }
 
+    // The following testing case is for AdbService.java#isAdbWifiQrSupported which has expanded
+    // its support to Ethernet to provide wider coverage for ATV devices.
+    // We didn't rename the API `isAdbWifiQrSupported` since it's being referenced in multiple
+    // different places. But the following test case has been renamed to reflect the expanded
+    // coverage.
     @Test
     @CddTest(requirement="6.1/C-1-2")
-    public void test_isadbWifiQrSupported() throws Exception {
-        boolean expected = hasFeature(FEATURE_WIFI) && hasFeature(FEATURE_CAMERA_ANY);
+    public void test_isadbNetworkQrSupported() throws Exception {
+        boolean expected = (hasFeature(FEATURE_WIFI) || hasFeature(FEATURE_ETHERNET)) &&
+            hasFeature(FEATURE_CAMERA_ANY);
 
         CommandResult result = getDevice().executeShellV2Command("cmd adb is-wifi-qr-supported");
 
diff --git a/hostsidetests/angle/app/common/src/com/android/angleIntegrationTest/common/GlesView.java b/hostsidetests/angle/app/common/src/com/android/angleIntegrationTest/common/GlesView.java
index f1c053f..eb7bf3b 100644
--- a/hostsidetests/angle/app/common/src/com/android/angleIntegrationTest/common/GlesView.java
+++ b/hostsidetests/angle/app/common/src/com/android/angleIntegrationTest/common/GlesView.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.angleIntegrationTest.common;
+package com.android.angleintegrationtest.common;
 
 import static javax.microedition.khronos.egl.EGL10.EGL_STENCIL_SIZE;
 
@@ -23,6 +23,7 @@
 import android.opengl.GLES20;
 import android.os.Build.VERSION_CODES;
 import android.util.Log;
+
 import javax.microedition.khronos.egl.EGL10;
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.egl.EGLContext;
diff --git a/hostsidetests/angle/app/driverTest/AndroidManifest.xml b/hostsidetests/angle/app/driverTest/AndroidManifest.xml
index 73392df..6fe6704 100755
--- a/hostsidetests/angle/app/driverTest/AndroidManifest.xml
+++ b/hostsidetests/angle/app/driverTest/AndroidManifest.xml
@@ -16,13 +16,13 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     package="com.android.angleIntegrationTest.driverTest"
+     package="com.android.angleintegrationtest.drivertest"
      android:targetSandboxVersion="2">
 
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner"/>
 
-        <activity android:name="com.android.angleIntegrationTest.common.AngleIntegrationTestActivity"
+        <activity android:name="com.android.angleintegrationtest.common.AngleIntegrationTestActivity"
              android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -32,6 +32,6 @@
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-         android:targetPackage="com.android.angleIntegrationTest.driverTest"/>
+         android:targetPackage="com.android.angleintegrationtest.drivertest"/>
 
 </manifest>
diff --git a/hostsidetests/angle/app/driverTest/src/com/android/angleIntegrationTest/driverTest/AngleDriverTestActivity.java b/hostsidetests/angle/app/driverTest/src/com/android/angleIntegrationTest/driverTest/AngleDriverTestActivity.java
index 450461a..6eb169b 100644
--- a/hostsidetests/angle/app/driverTest/src/com/android/angleIntegrationTest/driverTest/AngleDriverTestActivity.java
+++ b/hostsidetests/angle/app/driverTest/src/com/android/angleIntegrationTest/driverTest/AngleDriverTestActivity.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.angleIntegrationTest.driverTest;
+package com.android.angleintegrationtest.drivertest;
 
 import static org.junit.Assert.fail;
 
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.angleIntegrationTest.common.GlesView;
+import com.android.angleintegrationtest.common.GlesView;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -46,7 +46,6 @@
 
     @Test
     public void testUseDefaultDriver() throws Exception {
-        // The rules file does not enable ANGLE for this app
         validateDeveloperOption(false);
     }
 
diff --git a/hostsidetests/angle/app/driverTestSecondary/AndroidManifest.xml b/hostsidetests/angle/app/driverTestSecondary/AndroidManifest.xml
index e88a8c3..70dcec4 100755
--- a/hostsidetests/angle/app/driverTestSecondary/AndroidManifest.xml
+++ b/hostsidetests/angle/app/driverTestSecondary/AndroidManifest.xml
@@ -16,13 +16,13 @@
  -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     package="com.android.angleIntegrationTest.driverTestSecondary"
+     package="com.android.angleintegrationtest.drivertestsecondary"
      android:targetSandboxVersion="2">
 
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner"/>
 
-        <activity android:name="com.android.angleIntegrationTest.common.AngleIntegrationTestActivity"
+        <activity android:name="com.android.angleintegrationtest.common.AngleIntegrationTestActivity"
              android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -32,6 +32,6 @@
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-         android:targetPackage="com.android.angleIntegrationTest.driverTestSecondary"/>
+         android:targetPackage="com.android.angleintegrationtest.drivertestsecondary"/>
 
 </manifest>
diff --git a/hostsidetests/angle/app/driverTestSecondary/src/com/android/angleIntegrationTest/driverTestSecondary/AngleDriverTestActivity.java b/hostsidetests/angle/app/driverTestSecondary/src/com/android/angleIntegrationTest/driverTestSecondary/AngleDriverTestActivity.java
index 7b25c39..b855f6b 100644
--- a/hostsidetests/angle/app/driverTestSecondary/src/com/android/angleIntegrationTest/driverTestSecondary/AngleDriverTestActivity.java
+++ b/hostsidetests/angle/app/driverTestSecondary/src/com/android/angleIntegrationTest/driverTestSecondary/AngleDriverTestActivity.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.angleIntegrationTest.driverTestSecondary;
+package com.android.angleintegrationtest.drivertestsecondary;
 
 import static org.junit.Assert.fail;
 
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.angleIntegrationTest.common.GlesView;
+import com.android.angleintegrationtest.common.GlesView;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -46,7 +46,6 @@
 
     @Test
     public void testUseDefaultDriver() throws Exception {
-        // The rules file does not enable ANGLE for this app
         validateDeveloperOption(false);
     }
 
diff --git a/hostsidetests/angle/app/gameDriverTest/Android.bp b/hostsidetests/angle/app/gameDriverTest/Android.bp
new file mode 100644
index 0000000..749f8cf
--- /dev/null
+++ b/hostsidetests/angle/app/gameDriverTest/Android.bp
@@ -0,0 +1,36 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsAngleGameDriverTestCases",
+    defaults: ["cts_support_defaults"],
+    srcs: [
+        "src/**/*.java",
+    ],
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    compile_multilib: "both",
+    static_libs: [
+        "ctstestrunner-axt",
+        "androidx.test.rules",
+        "AngleIntegrationTestCommon",
+    ],
+}
diff --git a/hostsidetests/angle/app/gameDriverTest/AndroidManifest.xml b/hostsidetests/angle/app/gameDriverTest/AndroidManifest.xml
new file mode 100755
index 0000000..7b6b10a
--- /dev/null
+++ b/hostsidetests/angle/app/gameDriverTest/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+# Copyright (C) 2021 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.angleintegrationtest.gamedrivertest"
+     android:targetSandboxVersion="2">
+
+    <application android:debuggable="true"
+                 android:appCategory="game">
+        <uses-library android:name="android.test.runner"/>
+
+        <activity android:name="com.android.angleintegrationtest.common.AngleIntegrationTestActivity"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+         android:targetPackage="com.android.angleintegrationtest.gamedrivertest"/>
+
+</manifest>
diff --git a/hostsidetests/angle/app/gameDriverTest/src/com/android/angleIntegrationTest/gameDriverTest/AngleDriverTestActivity.java b/hostsidetests/angle/app/gameDriverTest/src/com/android/angleIntegrationTest/gameDriverTest/AngleDriverTestActivity.java
new file mode 100644
index 0000000..cec4d2a
--- /dev/null
+++ b/hostsidetests/angle/app/gameDriverTest/src/com/android/angleIntegrationTest/gameDriverTest/AngleDriverTestActivity.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2021 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.angleintegrationtest.gamedrivertest;
+
+import static org.junit.Assert.fail;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.angleintegrationtest.common.GlesView;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class AngleDriverTestActivity {
+
+    private final String mTAG = this.getClass().getSimpleName();
+
+    private void validateDeveloperOption(boolean angleEnabled) throws Exception {
+        GlesView glesView = new GlesView();
+
+        if (!glesView.validateDeveloperOption(angleEnabled)) {
+            if (angleEnabled) {
+                String renderer = glesView.getRenderer();
+                fail("Failure - ANGLE was not loaded: '" + renderer + "'");
+            } else {
+                String renderer = glesView.getRenderer();
+                fail("Failure - ANGLE was loaded: '" + renderer + "'");
+            }
+        }
+    }
+
+    @Test
+    public void testUseDefaultDriver() throws Exception {
+        validateDeveloperOption(false);
+    }
+
+    @Test
+    public void testUseAngleDriver() throws Exception {
+        validateDeveloperOption(true);
+    }
+
+    @Test
+    public void testUseNativeDriver() throws Exception {
+        validateDeveloperOption(false);
+    }
+}
diff --git a/hostsidetests/angle/src/android/angle/cts/CtsAngleCommon.java b/hostsidetests/angle/src/android/angle/cts/CtsAngleCommon.java
index ba33966..0580d3a 100644
--- a/hostsidetests/angle/src/android/angle/cts/CtsAngleCommon.java
+++ b/hostsidetests/angle/src/android/angle/cts/CtsAngleCommon.java
@@ -36,23 +36,20 @@
     // System Properties
     static final String PROPERTY_TEMP_RULES_FILE = "debug.angle.rules";
 
-    // Rules File
-    static final String DEVICE_TEMP_RULES_FILE_DIRECTORY = "/data/local/tmp";
-    static final String DEVICE_TEMP_RULES_FILE_FILENAME = "a4a_rules.json";
-    static final String DEVICE_TEMP_RULES_FILE_PATH =
-            DEVICE_TEMP_RULES_FILE_DIRECTORY + "/" + DEVICE_TEMP_RULES_FILE_FILENAME;
-
     // ANGLE
     static final String ANGLE_PACKAGE_NAME = "com.android.angle";
-    static final String ANGLE_DRIVER_TEST_PKG = "com.android.angleIntegrationTest.driverTest";
+    static final String ANGLE_DRIVER_TEST_PKG = "com.android.angleintegrationtest.drivertest";
     static final String ANGLE_DRIVER_TEST_SEC_PKG =
-            "com.android.angleIntegrationTest.driverTestSecondary";
+            "com.android.angleintegrationtest.drivertestsecondary";
+    static final String ANGLE_GAME_DRIVER_TEST_PKG =
+            "com.android.angleintegrationtest.gamedrivertest";
     static final String ANGLE_DRIVER_TEST_CLASS = "AngleDriverTestActivity";
     static final String ANGLE_DRIVER_TEST_DEFAULT_METHOD = "testUseDefaultDriver";
     static final String ANGLE_DRIVER_TEST_ANGLE_METHOD = "testUseAngleDriver";
     static final String ANGLE_DRIVER_TEST_NATIVE_METHOD = "testUseNativeDriver";
     static final String ANGLE_DRIVER_TEST_APP = "CtsAngleDriverTestCases.apk";
     static final String ANGLE_DRIVER_TEST_SEC_APP = "CtsAngleDriverTestCasesSecondary.apk";
+    static final String ANGLE_GAME_DRIVER_TEST_APP = "CtsAngleGameDriverTestCases.apk";
     static final String ANGLE_DUMPSYS_GPU_TEST_PKG =
             "com.android.angleintegrationtest.dumpsysgputest";
     static final String ANGLE_DUMPSYS_GPU_TEST_CLASS = "AngleDumpsysGpuTestActivity";
@@ -145,6 +142,26 @@
         device.executeShellCommand("setprop " + property + " " + value);
     }
 
+    static void setGameModeBatteryConfig(ITestDevice device, String packageName, boolean useAngle)
+            throws Exception {
+        device.executeShellCommand("device_config put game_overlay " + packageName
+                + " mode=3,useAngle=" + Boolean.toString(useAngle));
+    }
+
+    static void setGameModeStandardConfig(ITestDevice device, String packageName, boolean useAngle)
+            throws Exception {
+        device.executeShellCommand("device_config put game_overlay " + packageName
+                + " mode=1,useAngle=" + Boolean.toString(useAngle));
+    }
+
+    static void setGameModeBattery(ITestDevice device, String packageName) throws Exception {
+        device.executeShellCommand("cmd game mode battery " + packageName);
+    }
+
+    static void setGameModeStandard(ITestDevice device, String packageName) throws Exception {
+        device.executeShellCommand("cmd game mode standard " + packageName);
+    }
+
     /**
      * Find and parse the `dumpsys gpu` output for the specified package.
      *
diff --git a/hostsidetests/angle/src/android/angle/cts/CtsAngleDeveloperOptionHostTest.java b/hostsidetests/angle/src/android/angle/cts/CtsAngleDeveloperOptionHostTest.java
index 790db4d..98f81b9 100644
--- a/hostsidetests/angle/src/android/angle/cts/CtsAngleDeveloperOptionHostTest.java
+++ b/hostsidetests/angle/src/android/angle/cts/CtsAngleDeveloperOptionHostTest.java
@@ -88,6 +88,7 @@
 
         stopPackage(getDevice(), ANGLE_DRIVER_TEST_PKG);
         stopPackage(getDevice(), ANGLE_DRIVER_TEST_SEC_PKG);
+        stopPackage(getDevice(), ANGLE_GAME_DRIVER_TEST_PKG);
     }
 
     @After
@@ -354,6 +355,98 @@
     }
 
     /**
+     * Test ANGLE is loaded when the Battery Game Mode includes 'useAngle=true'.
+     */
+    @Test
+    public void testGameModeBatteryUseAngleDriver() throws Exception {
+        Assume.assumeTrue(isAngleInstalled(getDevice()));
+        Assume.assumeFalse(isNativeDriverAngle(getDevice()));
+
+        installApp(ANGLE_GAME_DRIVER_TEST_APP);
+
+        setGameModeBatteryConfig(getDevice(), ANGLE_GAME_DRIVER_TEST_PKG, true);
+        setGameModeBattery(getDevice(), ANGLE_GAME_DRIVER_TEST_PKG);
+
+        runDeviceTests(ANGLE_GAME_DRIVER_TEST_PKG,
+                ANGLE_GAME_DRIVER_TEST_PKG + "." + ANGLE_DRIVER_TEST_CLASS,
+                ANGLE_DRIVER_TEST_ANGLE_METHOD);
+    }
+
+    /**
+     * Test ANGLE is loaded when the Standard Game Mode includes 'useAngle=true'.
+     */
+    @Test
+    public void testGameModeStandardUseAngleDriver() throws Exception {
+        Assume.assumeTrue(isAngleInstalled(getDevice()));
+        Assume.assumeFalse(isNativeDriverAngle(getDevice()));
+
+        installApp(ANGLE_GAME_DRIVER_TEST_APP);
+
+        setGameModeStandardConfig(getDevice(), ANGLE_GAME_DRIVER_TEST_PKG, true);
+        setGameModeStandard(getDevice(), ANGLE_GAME_DRIVER_TEST_PKG);
+
+        runDeviceTests(ANGLE_GAME_DRIVER_TEST_PKG,
+                ANGLE_GAME_DRIVER_TEST_PKG + "." + ANGLE_DRIVER_TEST_CLASS,
+                ANGLE_DRIVER_TEST_ANGLE_METHOD);
+    }
+
+    /**
+     * Test setting the Game Mode to use ANGLE ('useAngle=true') and then overriding that to use the
+     * native driver with the Global.Settings loads the native driver.
+     */
+    @Test
+    public void testGameModeBatteryUseAngleOverrideWithNative() throws Exception {
+        Assume.assumeTrue(isAngleInstalled(getDevice()));
+        Assume.assumeFalse(isNativeDriverAngle(getDevice()));
+
+        installApp(ANGLE_GAME_DRIVER_TEST_APP);
+
+        // Set Game Mode to use ANGLE and verify ANGLE is loaded.
+        setGameModeBatteryConfig(getDevice(), ANGLE_GAME_DRIVER_TEST_PKG, true);
+        setGameModeBattery(getDevice(), ANGLE_GAME_DRIVER_TEST_PKG);
+
+        runDeviceTests(ANGLE_GAME_DRIVER_TEST_PKG,
+                ANGLE_GAME_DRIVER_TEST_PKG + "." + ANGLE_DRIVER_TEST_CLASS,
+                ANGLE_DRIVER_TEST_ANGLE_METHOD);
+
+        // Set Global.Settings to use the native driver and verify the native driver is loaded.
+        setAndValidateAngleDevOptionPkgDriver(ANGLE_GAME_DRIVER_TEST_PKG,
+                sDriverGlobalSettingMap.get(OpenGlDriverChoice.NATIVE));
+
+        runDeviceTests(ANGLE_GAME_DRIVER_TEST_PKG,
+                ANGLE_GAME_DRIVER_TEST_PKG + "." + ANGLE_DRIVER_TEST_CLASS,
+                ANGLE_DRIVER_TEST_NATIVE_METHOD);
+    }
+
+    /**
+     * Test setting the Game Mode to not use ANGLE ('useAngle=false') and then overriding that to
+     * use ANGLE with the Global.Settings loads ANGLE.
+     */
+    @Test
+    public void testGameModeBatteryDontUseAngleOverrideWithAngle() throws Exception {
+        Assume.assumeTrue(isAngleInstalled(getDevice()));
+        Assume.assumeFalse(isNativeDriverAngle(getDevice()));
+
+        installApp(ANGLE_GAME_DRIVER_TEST_APP);
+
+        // Set Game Mode to *not* use ANGLE and verify the native driver is loaded.
+        setGameModeBatteryConfig(getDevice(), ANGLE_GAME_DRIVER_TEST_PKG, false);
+        setGameModeBattery(getDevice(), ANGLE_GAME_DRIVER_TEST_PKG);
+
+        runDeviceTests(ANGLE_GAME_DRIVER_TEST_PKG,
+                ANGLE_GAME_DRIVER_TEST_PKG + "." + ANGLE_DRIVER_TEST_CLASS,
+                ANGLE_DRIVER_TEST_NATIVE_METHOD);
+
+        // Set Global.Settings to use ANGLE and verify ANGLE is loaded.
+        setAndValidateAngleDevOptionPkgDriver(ANGLE_GAME_DRIVER_TEST_PKG,
+                sDriverGlobalSettingMap.get(OpenGlDriverChoice.ANGLE));
+
+        runDeviceTests(ANGLE_GAME_DRIVER_TEST_PKG,
+                ANGLE_GAME_DRIVER_TEST_PKG + "." + ANGLE_DRIVER_TEST_CLASS,
+                ANGLE_DRIVER_TEST_ANGLE_METHOD);
+    }
+
+    /**
      * Test that the `dumpsys gpu` correctly indicates `angleInUse = 1` when ANGLE is enabled.
      */
     @Test
diff --git a/hostsidetests/appcloning/Android.bp b/hostsidetests/appcloning/Android.bp
new file mode 100644
index 0000000..8dbc55b
--- /dev/null
+++ b/hostsidetests/appcloning/Android.bp
@@ -0,0 +1,42 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_test_host {
+    name: "CtsAppCloningHostTest",
+    srcs: [
+        "hostside/src/**/AppCloningHostTest.java",
+        "hostside/src/**/BaseHostTestCase.java",
+        "hostside/src/**/AppCloningBaseHostTest.java",
+    ],
+    libs: [
+        "cts-tradefed",
+        "tradefed",
+        "testng",
+    ],
+    static_libs: ["modules-utils-build-testing"],
+    // tag this module as a cts test artifact
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
+    test_config: "AndroidTestAppCloning.xml",
+    data: [
+        ":CtsAppCloningTestApp",
+    ],
+}
diff --git a/hostsidetests/appcloning/AndroidTestAppCloning.xml b/hostsidetests/appcloning/AndroidTestAppCloning.xml
new file mode 100644
index 0000000..eb03bc1
--- /dev/null
+++ b/hostsidetests/appcloning/AndroidTestAppCloning.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+<configuration description="Test for App cloning support with clone user profiles">
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <!-- Clone user profile is meant to exist only alongside a real system user.
+    It does not exist for a headless system user, or a secondary user -->
+    <option name="config-descriptor:metadata" key="parameter" value="not_secondary_user" />
+    <test class="com.android.tradefed.testtype.HostTest" >
+        <option name="class" value="com.android.cts.appcloning.AppCloningHostTest" />
+    </test>
+
+    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+        <option name="mainline-module-package-name" value="com.google.android.mediaprovider" />
+    </object>
+</configuration>
diff --git a/hostsidetests/appcloning/OWNERS b/hostsidetests/appcloning/OWNERS
new file mode 100644
index 0000000..a632c0c0
--- /dev/null
+++ b/hostsidetests/appcloning/OWNERS
@@ -0,0 +1,6 @@
+# Bug component: 1029024
+saumyap@google.com
+maco@google.com
+sailendrabathi@google.com
+dagarhimanshu@google.com
+sarup@google.com
diff --git a/hostsidetests/appcloning/TEST_MAPPING b/hostsidetests/appcloning/TEST_MAPPING
new file mode 100644
index 0000000..f512df9
--- /dev/null
+++ b/hostsidetests/appcloning/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsAppCloningHostTest"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/hostsidetests/appcloning/hostside/src/com/android/cts/appcloning/AppCloningBaseHostTest.java b/hostsidetests/appcloning/hostside/src/com/android/cts/appcloning/AppCloningBaseHostTest.java
new file mode 100644
index 0000000..f1777fc
--- /dev/null
+++ b/hostsidetests/appcloning/hostside/src/com/android/cts/appcloning/AppCloningBaseHostTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2022 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.cts.appcloning;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tradefed.testtype.junit4.DeviceTestRunOptions;
+import com.android.tradefed.util.CommandResult;
+
+import java.util.Map;
+
+import javax.annotation.Nonnull;
+
+public class AppCloningBaseHostTest extends BaseHostTestCase {
+
+    protected static final String APP_A_PACKAGE = "com.android.cts.appcloningtestapp";
+    protected static final String APP_A = "CtsAppCloningTestApp.apk";
+
+    private static final String TEST_CLASS_A = APP_A_PACKAGE + ".AppCloningDeviceTest";
+    private static final long DEFAULT_INSTRUMENTATION_TIMEOUT_MS = 600_000; // 10min
+
+    protected static final String CONTENT_PROVIDER_URL =
+            "content://android.tradefed.contentprovider";
+    protected static final String MEDIA_PROVIDER_URL = "content://media";
+
+    public String mCloneUserId;
+
+    private void createAndStartCloneUser() throws Exception {
+        // create clone user
+        String output = executeShellCommand(
+                "pm create-user --profileOf 0 --user-type android.os.usertype.profile.CLONE "
+                        + "testUser");
+        mCloneUserId = output.substring(output.lastIndexOf(' ') + 1).replaceAll("[^0-9]",
+                "");
+        assertThat(mCloneUserId).isNotEmpty();
+
+        CommandResult out = executeShellV2Command("am start-user -w %s", mCloneUserId);
+        assertThat(isSuccessful(out)).isTrue();
+    }
+
+    public void baseHostSetup() throws Exception {
+        setDevice();
+
+        assumeFalse("Device is in headless system user mode", isHeadlessSystemUserMode());
+        assumeTrue(isAtLeastS());
+        assumeFalse("Device uses sdcardfs", usesSdcardFs());
+
+        createAndStartCloneUser();
+    }
+
+    public void baseHostTeardown() throws Exception {
+        if (isHeadlessSystemUserMode() || !isAtLeastS() || usesSdcardFs()) return;
+
+        // remove the clone user
+        executeShellCommand("pm remove-user %s", mCloneUserId);
+    }
+
+    protected CommandResult runContentProviderCommand(String commandType, String userId,
+            String provider, String relativePath, String... args) throws Exception {
+        String fullUri = provider + relativePath;
+        return executeShellV2Command("content %s --user %s --uri %s %s",
+                commandType, userId, fullUri, String.join(" ", args));
+    }
+
+    protected boolean usesSdcardFs() throws Exception {
+        CommandResult out = executeShellV2Command("cat /proc/mounts");
+        assertThat(isSuccessful(out)).isTrue();
+        for (String line : out.getStdout().split("\n")) {
+            String[] split = line.split(" ");
+            if (split.length >= 3 && split[2].equals("sdcardfs")) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    protected void runDeviceTestAsUserInPkgA(@Nonnull String testMethod, int userId,
+            @Nonnull Map<String, String> args) throws Exception {
+        DeviceTestRunOptions deviceTestRunOptions = new DeviceTestRunOptions(APP_A_PACKAGE)
+                .setTestClassName(TEST_CLASS_A)
+                .setTestMethodName(testMethod)
+                .setMaxInstrumentationTimeoutMs(DEFAULT_INSTRUMENTATION_TIMEOUT_MS)
+                .setUserId(userId);
+        for (Map.Entry<String, String> entry : args.entrySet()) {
+            deviceTestRunOptions.addInstrumentationArg(entry.getKey(), entry.getValue());
+        }
+
+        assertWithMessage(testMethod + " failed").that(
+                runDeviceTests(deviceTestRunOptions)).isTrue();
+    }
+}
diff --git a/hostsidetests/appcloning/hostside/src/com/android/cts/appcloning/AppCloningHostTest.java b/hostsidetests/appcloning/hostside/src/com/android/cts/appcloning/AppCloningHostTest.java
new file mode 100644
index 0000000..f2c63cd
--- /dev/null
+++ b/hostsidetests/appcloning/hostside/src/com/android/cts/appcloning/AppCloningHostTest.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright (C) 2022 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.cts.appcloning;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.platform.test.annotations.AppModeFull;
+
+import com.android.tradefed.device.contentprovider.ContentProviderHandler;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.util.CommandResult;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Runs the AppCloning tests.
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+@AppModeFull
+public class AppCloningHostTest extends AppCloningBaseHostTest {
+
+    private static final int CLONE_PROFILE_DIRECTORY_CREATION_TIMEOUT_MS = 20000;
+    private static final int CLONE_PROFILE_MEDIA_PROVIDER_OPERATION_TIMEOUT_MS = 30000;
+    private static final int CONTENT_PROVIDER_SETUP_TIMEOUT_MS = 50000;
+
+    private static final String IMAGE_NAME_TO_BE_CREATED_KEY = "imageNameToBeCreated";
+    private static final String IMAGE_NAME_TO_BE_DISPLAYED_KEY = "imageNameToBeDisplayed";
+    private static final String IMAGE_NAME_TO_BE_VERIFIED_IN_OWNER_PROFILE_KEY =
+            "imageNameToBeVerifiedInOwnerProfile";
+    private static final String IMAGE_NAME_TO_BE_VERIFIED_IN_CLONE_PROFILE_KEY =
+            "imageNameToBeVerifiedInCloneProfile";
+    private static final String CLONE_USER_ID = "cloneUserId";
+    private static final String MEDIA_PROVIDER_IMAGES_PATH = "/external/images/media/";
+    private static final String CONTENT_PROVIDER_SETUP_FAILURE =
+            "ContentProviderHandler Setup Failure";
+    private ContentProviderHandler mContentProviderHandler;
+
+    private void contentProviderHandlerSetup() throws Exception {
+        mContentProviderHandler = new ContentProviderHandler(mDevice);
+        eventually(() -> mContentProviderHandler.setUp(), CONTENT_PROVIDER_SETUP_TIMEOUT_MS,
+                CONTENT_PROVIDER_SETUP_FAILURE);
+    }
+
+    @Before
+    public void setup() throws Exception {
+        super.baseHostSetup();
+    }
+
+    private void contentProviderHandlerTearDown() throws Exception {
+        if (mContentProviderHandler != null) {
+            mContentProviderHandler.tearDown();
+        }
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        super.baseHostTeardown();
+    }
+
+    @Test
+    public void testCreateCloneUserFile() throws Exception {
+        try {
+            contentProviderHandlerSetup();
+
+            // createCloneUserFile Test Logic
+            createCloneUserFileTest();
+        } finally {
+
+            contentProviderHandlerTearDown();
+        }
+    }
+
+    private void createCloneUserFileTest() throws Exception {
+        CommandResult out;
+
+        // Check that the clone user directories exist
+        eventually(() -> {
+            // Wait for finish.
+            assertThat(isSuccessful(
+                    runContentProviderCommand("query", mCloneUserId,
+                            CONTENT_PROVIDER_URL, "/sdcard", ""))).isTrue();
+        }, CLONE_PROFILE_DIRECTORY_CREATION_TIMEOUT_MS);
+
+        // Create a file on the clone user storage
+        out = executeShellV2Command("touch /sdcard/testFile.txt");
+        assertThat(isSuccessful(out)).isTrue();
+        eventually(() -> {
+            // Wait for finish.
+            assertThat(isSuccessful(
+                    runContentProviderCommand("write", mCloneUserId,
+                            CONTENT_PROVIDER_URL, "/sdcard/testFile.txt",
+                            "< /sdcard/testFile.txt"))).isTrue();
+        }, CLONE_PROFILE_DIRECTORY_CREATION_TIMEOUT_MS);
+
+        // Check that the above created file exists on the clone user storage
+        out = runContentProviderCommand("query", mCloneUserId,
+                CONTENT_PROVIDER_URL, "/sdcard/testFile.txt", "");
+        assertThat(isSuccessful(out)).isTrue();
+
+        // Cleanup the created file
+        out = runContentProviderCommand("delete", mCloneUserId,
+                CONTENT_PROVIDER_URL, "/sdcard/testFile.txt", "");
+        assertThat(isSuccessful(out)).isTrue();
+    }
+
+    /**
+     * Once the clone profile is removed, the storage directory is deleted and the media provider
+     * should be cleaned of any media files associated with clone profile.
+     * This test ensures that with removal of clone profile there are no stale reference in
+     * media provider for media files related to clone profile.
+     * @throws Exception
+     */
+    @Test
+    public void testRemoveClonedProfileMediaProviderCleanup() throws Exception {
+        CommandResult out;
+        String cloneProfileImage = "cloneProfileImage.png";
+
+        // Inserting blank image in clone profile
+        eventually(() -> {
+            assertThat(isSuccessful(
+                    runContentProviderCommand("insert", mCloneUserId,
+                            MEDIA_PROVIDER_URL, MEDIA_PROVIDER_IMAGES_PATH,
+                            String.format("--bind _data:s:/storage/emulated/%s/Pictures/%s",
+                                    mCloneUserId, cloneProfileImage),
+                            String.format("--bind _user_id:s:%s", mCloneUserId)))).isTrue();
+        }, CLONE_PROFILE_MEDIA_PROVIDER_OPERATION_TIMEOUT_MS);
+
+        //Ensuring that image is added to media provider
+        out = runContentProviderCommand("query", mCloneUserId,
+                MEDIA_PROVIDER_URL, MEDIA_PROVIDER_IMAGES_PATH,
+                "--projection _id",
+                String.format("--where \"_display_name=\\'%s\\'\"", cloneProfileImage));
+        assertThat(isSuccessful(out)).isTrue();
+        assertThat(out.getStdout()).doesNotContain("No result found.");
+
+        //Removing the clone profile
+        eventually(() -> {
+            assertThat(isSuccessful(executeShellV2Command("pm remove-user %s", mCloneUserId)))
+                    .isTrue();
+        }, CLONE_PROFILE_MEDIA_PROVIDER_OPERATION_TIMEOUT_MS);
+
+        //Checking that added image should not be available in share media provider
+        try {
+            eventually(() -> {
+                CommandResult queryResult = runContentProviderCommand("query",
+                        String.valueOf(getCurrentUserId()),
+                        MEDIA_PROVIDER_URL, MEDIA_PROVIDER_IMAGES_PATH,
+                        "--projection _id",
+                        String.format("--where \"_display_name=\\'%s\\'\"", cloneProfileImage));
+                assertThat(isSuccessful(queryResult)).isTrue();
+                assertThat(queryResult.getStdout()).contains("No result found.");
+            }, CLONE_PROFILE_MEDIA_PROVIDER_OPERATION_TIMEOUT_MS);
+        } catch (Exception exception) {
+            //If the image is available i.e. test have failed, delete the added user
+            runContentProviderCommand("delete", String.valueOf(getCurrentUserId()),
+                    MEDIA_PROVIDER_URL, MEDIA_PROVIDER_IMAGES_PATH,
+                    String.format("--where \"_display_name=\\'%s\\'\"", cloneProfileImage));
+            throw exception;
+        }
+    }
+
+    @Test
+    public void testPrivateAppDataDirectoryForCloneUser() throws Exception {
+        // Install the app in clone user space
+        installPackage(APP_A, "--user " + Integer.valueOf(mCloneUserId));
+
+        eventually(() -> {
+            // Wait for finish.
+            assertThat(isPackageInstalled(APP_A_PACKAGE, mCloneUserId)).isTrue();
+        }, CLONE_PROFILE_DIRECTORY_CREATION_TIMEOUT_MS);
+    }
+
+    @Test
+    public void testCrossUserMediaAccess() throws Exception {
+        // Install the app in both the user spaces
+        installPackage(APP_A, "--user all");
+
+        int currentUserId = getCurrentUserId();
+
+        // Run save image test in owner user space
+        Map<String, String> ownerArgs = new HashMap<>();
+        ownerArgs.put(IMAGE_NAME_TO_BE_DISPLAYED_KEY, "WeirdOwnerProfileImage");
+        ownerArgs.put(IMAGE_NAME_TO_BE_CREATED_KEY, "owner_profile_image");
+
+        runDeviceTestAsUserInPkgA("testMediaStoreManager_writeImageToSharedStorage",
+                currentUserId, ownerArgs);
+
+        // Run save image test in clone user space
+        Map<String, String> cloneArgs = new HashMap<>();
+        cloneArgs.put(IMAGE_NAME_TO_BE_DISPLAYED_KEY, "WeirdCloneProfileImage");
+        cloneArgs.put(IMAGE_NAME_TO_BE_CREATED_KEY, "clone_profile_image");
+
+        runDeviceTestAsUserInPkgA("testMediaStoreManager_writeImageToSharedStorage",
+                Integer.valueOf(mCloneUserId), cloneArgs);
+
+        // Run cross user access test
+        Map<String, String> args = new HashMap<>();
+        args.put(IMAGE_NAME_TO_BE_VERIFIED_IN_OWNER_PROFILE_KEY, "WeirdOwnerProfileImage");
+        args.put(IMAGE_NAME_TO_BE_VERIFIED_IN_CLONE_PROFILE_KEY, "WeirdCloneProfileImage");
+        args.put(CLONE_USER_ID, mCloneUserId);
+
+        // From owner user space
+        runDeviceTestAsUserInPkgA(
+                "testMediaStoreManager_verifyCrossUserImagesInSharedStorage", currentUserId, args);
+
+        // From clone user space
+        runDeviceTestAsUserInPkgA(
+                "testMediaStoreManager_verifyCrossUserImagesInSharedStorage",
+                Integer.valueOf(mCloneUserId), args);
+    }
+
+    @Test
+    public void testGetStorageVolumesIncludingSharedProfiles() throws Exception {
+        assumeTrue(isAtLeastT());
+        int currentUserId = getCurrentUserId();
+
+        // Install the app in owner user space
+        installPackage(APP_A, "--user " + currentUserId);
+
+        Map<String, String> args = new HashMap<>();
+        args.put(CLONE_USER_ID, mCloneUserId);
+        runDeviceTestAsUserInPkgA("testStorageManager_verifyInclusionOfSharedProfileVolumes",
+                currentUserId, args);
+    }
+}
diff --git a/hostsidetests/appcloning/hostside/src/com/android/cts/appcloning/BaseHostTestCase.java b/hostsidetests/appcloning/hostside/src/com/android/cts/appcloning/BaseHostTestCase.java
new file mode 100644
index 0000000..fdea67b
--- /dev/null
+++ b/hostsidetests/appcloning/hostside/src/com/android/cts/appcloning/BaseHostTestCase.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2022 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.cts.appcloning;
+
+import com.android.modules.utils.build.testing.DeviceSdkLevel;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.device.NativeDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+import com.android.tradefed.util.CommandResult;
+import com.android.tradefed.util.CommandStatus;
+
+import java.util.function.BooleanSupplier;
+
+
+abstract class BaseHostTestCase extends BaseHostJUnit4Test {
+    private int mCurrentUserId = NativeDevice.INVALID_USER_ID;
+    private static final String ERROR_MESSAGE_TAG = "[ERROR]";
+    protected ITestDevice mDevice = null;
+
+    protected void setDevice() {
+        mDevice = getDevice();
+    }
+
+    protected String executeShellCommand(String cmd, Object... args) throws Exception {
+        return mDevice.executeShellCommand(String.format(cmd, args));
+    }
+
+    protected CommandResult executeShellV2Command(String cmd, Object... args) throws Exception {
+        return mDevice.executeShellV2Command(String.format(cmd, args));
+    }
+
+    protected boolean isPackageInstalled(String packageName, String userId) throws Exception {
+        return mDevice.isPackageInstalled(packageName, userId);
+    }
+
+    // TODO (b/174775905) remove after exposing the check from ITestDevice.
+    protected boolean isHeadlessSystemUserMode() throws DeviceNotAvailableException {
+        String result = mDevice
+                .executeShellCommand("getprop ro.fw.mu.headless_system_user").trim();
+        return "true".equalsIgnoreCase(result);
+    }
+
+    protected boolean isAtLeastS() throws DeviceNotAvailableException {
+        DeviceSdkLevel deviceSdkLevel = new DeviceSdkLevel(mDevice);
+        return deviceSdkLevel.isDeviceAtLeastS();
+    }
+
+    protected boolean isAtLeastT() throws DeviceNotAvailableException {
+        DeviceSdkLevel deviceSdkLevel = new DeviceSdkLevel(mDevice);
+        return deviceSdkLevel.isDeviceAtLeastT();
+    }
+
+    protected static void throwExceptionIfTimeout(long start, long timeoutMillis, Throwable e) {
+        if (System.currentTimeMillis() - start < timeoutMillis) {
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ignored) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected static void eventually(ThrowingRunnable r, long timeoutMillis) {
+        long start = System.currentTimeMillis();
+
+        while (true) {
+            try {
+                r.run();
+                return;
+            } catch (Throwable e) {
+                throwExceptionIfTimeout(start, timeoutMillis, e);
+            }
+        }
+    }
+
+    protected static void eventually(ThrowingBooleanSupplier booleanSupplier,
+            long timeoutMillis, String failureMessage) {
+        long start = System.currentTimeMillis();
+
+        while (true) {
+            try {
+                if (booleanSupplier.getAsBoolean()) {
+                    return;
+                }
+
+                throw new RuntimeException(failureMessage);
+            } catch (Throwable e) {
+                throwExceptionIfTimeout(start, timeoutMillis, e);
+            }
+        }
+    }
+
+    protected int getCurrentUserId() throws Exception {
+        setCurrentUserId();
+
+        return mCurrentUserId;
+    }
+
+    protected boolean isSuccessful(CommandResult result) {
+        if (!CommandStatus.SUCCESS.equals(result.getStatus())) {
+            return false;
+        }
+        String stdout = result.getStdout();
+        if (stdout.contains(ERROR_MESSAGE_TAG)) {
+            return false;
+        }
+        String stderr = result.getStderr();
+        return (stderr == null || stderr.trim().isEmpty());
+    }
+
+    private void setCurrentUserId() throws Exception {
+        if (mCurrentUserId != NativeDevice.INVALID_USER_ID) return;
+
+        mCurrentUserId = mDevice.getCurrentUser();
+        CLog.i("Current user: %d");
+    }
+
+    protected interface ThrowingRunnable {
+        /**
+         * Similar to {@link Runnable#run} but has {@code throws Exception}.
+         */
+        void run() throws Exception;
+    }
+
+    protected interface ThrowingBooleanSupplier {
+        /**
+         * Similar to {@link BooleanSupplier#getAsBoolean} but has {@code throws Exception}.
+         */
+        boolean getAsBoolean() throws Exception;
+    }
+}
diff --git a/hostsidetests/appcloning/test-apps/AppCloningTestApp/Android.bp b/hostsidetests/appcloning/test-apps/AppCloningTestApp/Android.bp
new file mode 100644
index 0000000..ef10a81
--- /dev/null
+++ b/hostsidetests/appcloning/test-apps/AppCloningTestApp/Android.bp
@@ -0,0 +1,29 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsAppCloningTestApp",
+    defaults: ["cts_defaults"],
+    static_libs: [
+        "cts-install-lib",
+    ],
+    srcs: ["src/**/*.java"],
+    sdk_version: "test_current",
+    target_sdk_version: "current",
+    min_sdk_version: "30",
+}
diff --git a/hostsidetests/appcloning/test-apps/AppCloningTestApp/AndroidManifest.xml b/hostsidetests/appcloning/test-apps/AppCloningTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..07d78a0
--- /dev/null
+++ b/hostsidetests/appcloning/test-apps/AppCloningTestApp/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.cts.appcloningtestapp"
+          android:versionCode="1"
+          android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="30" />
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="com.android.cts.appcloningtestapp" />
+
+</manifest>
\ No newline at end of file
diff --git a/hostsidetests/appcloning/test-apps/AppCloningTestApp/res/values/strings.xml b/hostsidetests/appcloning/test-apps/AppCloningTestApp/res/values/strings.xml
new file mode 100644
index 0000000..c4737df
--- /dev/null
+++ b/hostsidetests/appcloning/test-apps/AppCloningTestApp/res/values/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+           xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name">AppCloningTestApp CTS</string>
+</resources>
\ No newline at end of file
diff --git a/hostsidetests/appcloning/test-apps/AppCloningTestApp/src/com/android/cts/appcloningtestapp/AppCloningDeviceTest.java b/hostsidetests/appcloning/test-apps/AppCloningTestApp/src/com/android/cts/appcloningtestapp/AppCloningDeviceTest.java
new file mode 100644
index 0000000..37c7b2d
--- /dev/null
+++ b/hostsidetests/appcloning/test-apps/AppCloningTestApp/src/com/android/cts/appcloningtestapp/AppCloningDeviceTest.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (C) 2022 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.cts.appcloningtestapp;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.Manifest;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.os.Bundle;
+import android.os.storage.StorageManager;
+import android.os.storage.StorageVolume;
+import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+
+import com.android.cts.install.lib.InstallUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.util.List;
+
+@RunWith(JUnit4.class)
+public class AppCloningDeviceTest {
+    private static final String EMPTY_STRING = "";
+    private static final String TAG = "AppCloningDeviceTest";
+
+    private Context mContext;
+    private StorageManager mStorageManager;
+
+    @Before
+    public void setUp() throws Exception {
+        mContext = InstrumentationRegistry.getContext();
+        mStorageManager = mContext.getSystemService(StorageManager.class);
+
+        // Adopts common permission to read and write to shared storage
+        InstallUtils.adoptShellPermissionIdentity(
+                Manifest.permission.READ_EXTERNAL_STORAGE,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                Manifest.permission.MANAGE_EXTERNAL_STORAGE);
+    }
+
+    @After
+    public void tearDown() {
+        // Drops adopted shell permissions
+        InstallUtils.dropShellPermissionIdentity();
+    }
+
+    private String getTestArgumentValueForGivenKey(String testArgumentKey) {
+        final Bundle testArguments = InstrumentationRegistry.getArguments();
+        String testArgumentValue = testArguments.getString(testArgumentKey, EMPTY_STRING);
+
+        return testArgumentValue;
+    }
+
+    private String getImageNameToBeDisplayed() {
+        return getTestArgumentValueForGivenKey("imageNameToBeDisplayed");
+    }
+
+    private String getImageNameToBeCreated() {
+        return getTestArgumentValueForGivenKey("imageNameToBeCreated");
+    }
+
+    private String getImageNameToBeVerifiedInOwnerProfile() {
+        return getTestArgumentValueForGivenKey("imageNameToBeVerifiedInOwnerProfile");
+    }
+
+    private String getImageNameToBeVerifiedInCloneProfile() {
+        return getTestArgumentValueForGivenKey("imageNameToBeVerifiedInCloneProfile");
+    }
+
+    private String getCloneUserId() {
+        return getTestArgumentValueForGivenKey("cloneUserId");
+    }
+
+    @Test
+    public void testMediaStoreManager_verifyCrossUserImagesInSharedStorage() throws Exception {
+        // This method will be called only after writing images in owner and clone profile
+        String imageNameToBeVerifiedInOwnerProfile = getImageNameToBeVerifiedInOwnerProfile();
+        String imageNameToBeVerifiedInCloneProfile = getImageNameToBeVerifiedInCloneProfile();
+
+        List<Image> imageList = MediaStoreReadOperation.getImageFilesFromMediaStore(mContext);
+        boolean verifiedImageInOwnerProfile = false;
+        boolean verifiedImageInCloneProfile = false;
+
+        for (Image image: imageList) {
+
+            // Eg: Data: /storage/emulated/<user_id>/Pictures/<imageName>.jpg
+            // user_id will be 0 for owner
+            if (!verifiedImageInOwnerProfile && image.getData().contains("/emulated/0/")
+                    && image.getDisplayName().startsWith(imageNameToBeVerifiedInOwnerProfile)) {
+                verifiedImageInOwnerProfile = true;
+                continue;
+            }
+
+            if (!verifiedImageInCloneProfile && image.getData().contains("/emulated/"
+                    + getCloneUserId() + "/")
+                    && image.getDisplayName().startsWith(imageNameToBeVerifiedInCloneProfile)) {
+                verifiedImageInCloneProfile = true;
+            }
+        }
+
+        assertThat(verifiedImageInOwnerProfile && verifiedImageInCloneProfile).isTrue();
+    }
+
+    @Test
+    public void testMediaStoreManager_writeImageToSharedStorage() throws Exception {
+        String imageNameToBeCreated = getImageNameToBeCreated();
+
+        int color = 0x00000000;
+        if (imageNameToBeCreated.equalsIgnoreCase("clone_profile_image")) {
+            // Blue represents clone profile image
+            color = Color.BLUE;
+        } else if (imageNameToBeCreated.equalsIgnoreCase("owner_profile_image")) {
+            // Green represents owner profile image
+            color = Color.GREEN;
+        }
+
+        Bitmap bitmap = createImage(1000, 1000, color);
+
+        assertThat(MediaStoreWriteOperation.createImageFileToMediaStore(mContext,
+                getImageNameToBeDisplayed(), bitmap)).isTrue();
+    }
+
+    /**
+     * Creates a bitmap unicolor image with the given width, height and color
+     * @param width
+     * @param height
+     * @param color
+     * @return A bitmap unicolor image with the given width and height
+     */
+    public static Bitmap createImage(int width, int height, int color) {
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        Paint paint = new Paint();
+        paint.setColor(color);
+        canvas.drawRect(0F, 0F, (float) width, (float) height, paint);
+        return bitmap;
+    }
+
+    @Test
+    public void testStorageManager_verifyInclusionOfSharedProfileVolumes() throws Exception {
+        int cloneUserId = -1;
+        try {
+            cloneUserId = Integer.valueOf(getCloneUserId());
+        } catch (NumberFormatException exception) {
+            Log.d(TAG, "Failed to get clone user ID - " + exception.getMessage());
+        }
+        assertThat(cloneUserId).isNotEqualTo(-1);
+        List<StorageVolume> volumeList = mStorageManager.getStorageVolumes();
+        List<StorageVolume> volumeListIncludingShared =
+                mStorageManager.getStorageVolumesIncludingSharedProfiles();
+
+        // should contain all volumes of volumeList
+        assertThat(volumeListIncludingShared.containsAll(volumeList)).isTrue();
+
+        // remove volumes that belong to owner profile
+        volumeListIncludingShared.removeAll(volumeList);
+
+        // remaining volumes should belong to the clone user.
+        for (StorageVolume vol : volumeListIncludingShared) {
+            assertThat(vol.getOwner().getIdentifier()).isEqualTo(cloneUserId);
+        }
+    }
+}
diff --git a/hostsidetests/appcloning/test-apps/AppCloningTestApp/src/com/android/cts/appcloningtestapp/Image.java b/hostsidetests/appcloning/test-apps/AppCloningTestApp/src/com/android/cts/appcloningtestapp/Image.java
new file mode 100644
index 0000000..ec03995
--- /dev/null
+++ b/hostsidetests/appcloning/test-apps/AppCloningTestApp/src/com/android/cts/appcloningtestapp/Image.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2022 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.cts.appcloningtestapp;
+
+// Container for information about each image
+public class Image {
+
+    // This tells the exact location of the image along with its display name
+    // e.g. /storage/emulated/<user_id>/Pictures/<imageDisplayName>
+    private final String mData;
+
+    // This shows the display name of the image in the shared storage
+    private final String mDisplayName;
+
+    public Image(String data, String displayName) {
+        mData = data;
+        mDisplayName = displayName;
+    }
+
+    public String getData() {
+        return mData;
+    }
+
+    public String getDisplayName() {
+        return mDisplayName;
+    }
+}
diff --git a/hostsidetests/appcloning/test-apps/AppCloningTestApp/src/com/android/cts/appcloningtestapp/MediaStoreReadOperation.java b/hostsidetests/appcloning/test-apps/AppCloningTestApp/src/com/android/cts/appcloningtestapp/MediaStoreReadOperation.java
new file mode 100644
index 0000000..af6270e
--- /dev/null
+++ b/hostsidetests/appcloning/test-apps/AppCloningTestApp/src/com/android/cts/appcloningtestapp/MediaStoreReadOperation.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2022 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.cts.appcloningtestapp;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.MediaStore;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MediaStoreReadOperation {
+
+    private static final String TAG = "MediaStoreReadOperation";
+    private static final int ANDROID_Q = 29;
+
+    // Need READ_EXTERNAL_STORAGE permission if accessing image files that your app didn't create.
+    public static List<Image> getImageFilesFromMediaStore(Context context) {
+        List<Image> imageList = new ArrayList<>();
+
+        Uri collection = MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL);
+
+        String[] projection = new String[] {
+                MediaStore.Images.Media.DATA,
+                MediaStore.Images.Media.DISPLAY_NAME,
+        };
+
+        String sortOrder = MediaStore.Images.Media.DISPLAY_NAME + " ASC";
+
+        try (Cursor cursor = context.getContentResolver().query(collection, projection,
+                null, null, sortOrder)) {
+            // Cache column indices.
+            int dataColumn = cursor.getColumnIndexOrThrow(MediaStore.Images.Media.DATA);
+            int displayNameColumn = cursor.getColumnIndexOrThrow(MediaStore.Images.Media
+                    .DISPLAY_NAME);
+
+            while (cursor.moveToNext()) {
+                // Get values of columns for a given image.
+                String data = cursor.getString(dataColumn);
+                String displayName = cursor.getString(displayNameColumn);
+
+                /*
+                 Stores column values in a local object that represents
+                 the media file.
+                 */
+                imageList.add(new Image(data, displayName));
+            }
+        }
+
+        return imageList;
+    }
+}
diff --git a/hostsidetests/appcloning/test-apps/AppCloningTestApp/src/com/android/cts/appcloningtestapp/MediaStoreWriteOperation.java b/hostsidetests/appcloning/test-apps/AppCloningTestApp/src/com/android/cts/appcloningtestapp/MediaStoreWriteOperation.java
new file mode 100644
index 0000000..33e14966
--- /dev/null
+++ b/hostsidetests/appcloning/test-apps/AppCloningTestApp/src/com/android/cts/appcloningtestapp/MediaStoreWriteOperation.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2022 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.cts.appcloningtestapp;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.net.Uri;
+import android.os.Build;
+import android.provider.MediaStore;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Calendar;
+
+public class MediaStoreWriteOperation {
+
+    private static final String TAG = "MediaStoreWriteOperation";
+    private static final int ANDROID_Q = 29;
+
+    // Write an image to primary external storage using MediaStore API
+    public static boolean createImageFileToMediaStore(Context context, String displayName,
+            Bitmap bitmap) {
+
+        /*
+           1. Find all media files on the primary external storage device
+           2. Build.VERSION_CODES.Q = 29
+        */
+        Uri imageCollection = (Build.VERSION.SDK_INT >= ANDROID_Q)
+                ? MediaStore.Images.Media.getContentUri(MediaStore.VOLUME_EXTERNAL_PRIMARY) :
+                MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+
+        // Publish a new image
+        ContentValues newImageDetails = new ContentValues();
+        newImageDetails.put(MediaStore.Images.Media.DISPLAY_NAME,
+                displayName + "_" + Calendar.getInstance().getTime() + ".jpg");
+        newImageDetails.put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg");
+        newImageDetails.put(MediaStore.Images.Media.WIDTH, bitmap.getWidth());
+        newImageDetails.put(MediaStore.Images.Media.HEIGHT, bitmap.getHeight());
+
+        // Add a specific media item
+        ContentResolver resolver = context.getContentResolver();
+
+        try {
+            // Keeps a handle to the new image's URI in case we need to modify it later
+            Uri newImageUri = resolver.insert(imageCollection, newImageDetails);
+
+            if (newImageUri == null) {
+                throw new IOException("Couldn't create MediaStore entry");
+            }
+
+            // Now you got the URI of an image, finally save it in the MediaStore
+            OutputStream outputStream = resolver.openOutputStream(newImageUri);
+            if (!bitmap.compress(Bitmap.CompressFormat.JPEG, 95, outputStream)) {
+                throw new IOException("Couldn't save bitmap");
+            }
+
+            outputStream.flush();
+            outputStream.close();
+            return true;
+        } catch (IOException exception) {
+            exception.printStackTrace();
+            return false;
+        }
+    }
+}
diff --git a/hostsidetests/appcompat/compatchanges/app/src/com/android/cts/appcompat/compatchanges/CompatChangesTest.java b/hostsidetests/appcompat/compatchanges/app/src/com/android/cts/appcompat/compatchanges/CompatChangesTest.java
index 3212c99..cd852ea 100644
--- a/hostsidetests/appcompat/compatchanges/app/src/com/android/cts/appcompat/compatchanges/CompatChangesTest.java
+++ b/hostsidetests/appcompat/compatchanges/app/src/com/android/cts/appcompat/compatchanges/CompatChangesTest.java
@@ -17,6 +17,7 @@
 package com.android.cts.appcompat.compatchanges;
 
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertThrows;
 
 import android.Manifest;
@@ -34,6 +35,9 @@
 import org.junit.runner.RunWith;
 
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Tests for the {@link android.app.compat.CompatChanges} SystemApi.
@@ -46,160 +50,199 @@
  */
 @RunWith(AndroidJUnit4.class)
 public final class CompatChangesTest {
-  private static final long CTS_SYSTEM_API_CHANGEID = 149391281L;
-  private static final long CTS_SYSTEM_API_OVERRIDABLE_CHANGEID = 174043039L;
-  private static final long UNKNOWN_CHANGEID = 123L;
+    private static final long CTS_SYSTEM_API_CHANGEID = 149391281L;
+    private static final long CTS_SYSTEM_API_OVERRIDABLE_CHANGEID = 174043039L;
+    private static final long UNKNOWN_CHANGEID = 123L;
 
-  private static final String OVERRIDE_PACKAGE = "com.android.cts.appcompat.preinstalloverride";
+    private static final String OVERRIDE_PACKAGE = "com.android.cts.appcompat.preinstalloverride";
+    private static final String OVERRIDE_PACKAGE2 = "com.android.cts.appcompat.preinstalloverride2";
 
-  @Before
-  public void setUp() {
-    InstrumentationRegistry.getInstrumentation().getUiAutomation()
-      .adoptShellPermissionIdentity(Manifest.permission.LOG_COMPAT_CHANGE,
-                                    Manifest.permission.READ_COMPAT_CHANGE_CONFIG,
-                                    Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD,
-                                    Manifest.permission.INTERACT_ACROSS_USERS_FULL);
-  }
+    @Before
+    public void setUp() {
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .adoptShellPermissionIdentity(Manifest.permission.LOG_COMPAT_CHANGE,
+                        Manifest.permission.READ_COMPAT_CHANGE_CONFIG,
+                        Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG_ON_RELEASE_BUILD,
+                        Manifest.permission.INTERACT_ACROSS_USERS_FULL);
+    }
 
-  @After
-  public void tearDown() {
-    InstrumentationRegistry.getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
-  }
+    @After
+    public void tearDown() {
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .dropShellPermissionIdentity();
+    }
 
-  /* Test run by CompatChangesSystemApiTest.testIsChangeEnabled */
-  @Test
-  public void isChangeEnabled_changeEnabled() {
-    assertThat(CompatChanges.isChangeEnabled(CTS_SYSTEM_API_CHANGEID)).isTrue();
-  }
+    /* Test run by CompatChangesSystemApiTest.testIsChangeEnabled */
+    @Test
+    public void isChangeEnabled_changeEnabled() {
+        assertThat(CompatChanges.isChangeEnabled(CTS_SYSTEM_API_CHANGEID)).isTrue();
+    }
 
-  /* Test run by CompatChangesSystemApiTest.testIsChangeEnabledPackageName */
-  @Test
-  public void isChangeEnabledPackageName_changeEnabled() {
-    Context context = InstrumentationRegistry.getTargetContext();
-    assertThat(CompatChanges.isChangeEnabled(CTS_SYSTEM_API_CHANGEID, context.getPackageName(),
-            context.getUser())).isTrue();
-  }
+    /* Test run by CompatChangesSystemApiTest.testIsChangeEnabledPackageName */
+    @Test
+    public void isChangeEnabledPackageName_changeEnabled() {
+        Context context = InstrumentationRegistry.getTargetContext();
+        assertThat(CompatChanges.isChangeEnabled(CTS_SYSTEM_API_CHANGEID, context.getPackageName(),
+                context.getUser())).isTrue();
+    }
 
-  /* Test run by CompatChangesSystemApiTest.testIsChangeEnabledUid */
-  @Test
-  public void isChangeEnabledUid_changeEnabled() {
-    assertThat(CompatChanges.isChangeEnabled(CTS_SYSTEM_API_CHANGEID, Process.myUid())).isTrue();
-  }
+    /* Test run by CompatChangesSystemApiTest.testIsChangeEnabledUid */
+    @Test
+    public void isChangeEnabledUid_changeEnabled() {
+        assertThat(
+                CompatChanges.isChangeEnabled(CTS_SYSTEM_API_CHANGEID, Process.myUid())).isTrue();
+    }
 
-  /* Test run by CompatChangesSystemApiTest.testIsChangeDisabled */
-  @Test
-  public void isChangeEnabled_changeDisabled() {
-    assertThat(CompatChanges.isChangeEnabled(CTS_SYSTEM_API_CHANGEID)).isFalse();
-  }
+    /* Test run by CompatChangesSystemApiTest.testIsChangeDisabled */
+    @Test
+    public void isChangeEnabled_changeDisabled() {
+        assertThat(CompatChanges.isChangeEnabled(CTS_SYSTEM_API_CHANGEID)).isFalse();
+    }
 
-  /* Test run by CompatChangesSystemApiTest.testIsChangeDisabledPackageName */
-  @Test
-  public void isChangeEnabledPackageName_changeDisabled() {
-    Context context = InstrumentationRegistry.getTargetContext();
-    assertThat(CompatChanges.isChangeEnabled(CTS_SYSTEM_API_CHANGEID, context.getPackageName(),
-            context.getUser())).isFalse();
-  }
+    /* Test run by CompatChangesSystemApiTest.testIsChangeDisabledPackageName */
+    @Test
+    public void isChangeEnabledPackageName_changeDisabled() {
+        Context context = InstrumentationRegistry.getTargetContext();
+        assertThat(CompatChanges.isChangeEnabled(CTS_SYSTEM_API_CHANGEID, context.getPackageName(),
+                context.getUser())).isFalse();
+    }
 
-  /* Test run by CompatChangesSystemApiTest.testIsChangeDisabledUid */
-  @Test
-  public void isChangeEnabledUid_changeDisabled() {
-    assertThat(CompatChanges.isChangeEnabled(CTS_SYSTEM_API_CHANGEID, Process.myUid())).isFalse();
-  }
+    /* Test run by CompatChangesSystemApiTest.testIsChangeDisabledUid */
+    @Test
+    public void isChangeEnabledUid_changeDisabled() {
+        assertThat(
+                CompatChanges.isChangeEnabled(CTS_SYSTEM_API_CHANGEID, Process.myUid())).isFalse();
+    }
 
-  @Test
-  public void putPackageOverrides_securityExceptionForNonOverridableChangeId() {
-    SecurityException e = assertThrows(SecurityException.class,
-            () -> CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
-                    Collections.singletonMap(CTS_SYSTEM_API_CHANGEID,
-                    new PackageOverride.Builder().setEnabled(true).build())));
-    assertThat(e).hasMessageThat().contains("marked as Overridable");
-  }
+    @Test
+    public void putPackageOverrides_securityExceptionForNonOverridableChangeId() {
+        SecurityException e = assertThrows(SecurityException.class,
+                () -> CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
+                        Collections.singletonMap(CTS_SYSTEM_API_CHANGEID,
+                                new PackageOverride.Builder().setEnabled(true).build())));
+        assertThat(e).hasMessageThat().contains("marked as Overridable");
+    }
 
-  @Test
-  public void putPackageOverrides_doesNothingIfChangeIsUnknown() {
-    CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
-            Collections.singletonMap(UNKNOWN_CHANGEID,
-                    new PackageOverride.Builder().setEnabled(true).build()));
-  }
+    @Test
+    public void putPackageOverrides_doesNothingIfChangeIsUnknown() {
+        CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
+                Collections.singletonMap(UNKNOWN_CHANGEID,
+                        new PackageOverride.Builder().setEnabled(true).build()));
+    }
 
-  @Test
-  public void putPackageOverrides_success() {
-    CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
-            Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
-                    new PackageOverride.Builder().setEnabled(true).build()));
-  }
+    @Test
+    public void putPackageOverrides_success() {
+        CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
+                Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
+                        new PackageOverride.Builder().setEnabled(true).build()));
+    }
 
-  @Test
-  public void putPackageOverrides_fromVersion2() {
-    CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
-            Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
-                    new PackageOverride.Builder().setMinVersionCode(2).setEnabled(true).build()));
-  }
+    @Test
+    public void putPackageOverrides_fromVersion2() {
+        CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
+                Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
+                        new PackageOverride.Builder().setMinVersionCode(2).setEnabled(
+                                true).build()));
+    }
 
-  @Test
-  public void putPackageOverrides_untilVersion1() {
-    CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
-            Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
-                    new PackageOverride.Builder().setMaxVersionCode(1).setEnabled(true).build()));
-  }
+    @Test
+    public void putPackageOverrides_untilVersion1() {
+        CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
+                Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
+                        new PackageOverride.Builder().setMaxVersionCode(1).setEnabled(
+                                true).build()));
+    }
 
-  @Test
-  public void putPackageOverrides_securityExceptionForNotHoldingPermission() {
-    // Adopt the normal override permission that doesn't allow to clear overrides on release builds
-    InstrumentationRegistry.getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
-    InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
-            Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG);
+    @Test
+    public void putPackageOverrides_securityExceptionForNotHoldingPermission() {
+        // Adopt the normal override permission that doesn't allow to clear overrides on release
+        // builds
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .dropShellPermissionIdentity();
+        InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
+                Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG);
 
-    SecurityException e = assertThrows(SecurityException.class,
-            () -> CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
-                    Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
-                            new PackageOverride.Builder().setEnabled(true).build())));
-    assertThat(e).hasMessageThat().contains("Cannot override compat change");
-  }
+        SecurityException e = assertThrows(SecurityException.class,
+                () -> CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
+                        Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
+                                new PackageOverride.Builder().setEnabled(true).build())));
+        assertThat(e).hasMessageThat().contains("Cannot override compat change");
+    }
 
-  @Test
-  public void removePackageOverrides_securityExceptionForNonOverridableChangeId() {
-    SecurityException e = assertThrows(SecurityException.class,
-            () -> CompatChanges.removePackageOverrides(OVERRIDE_PACKAGE,
-                    Collections.singleton(CTS_SYSTEM_API_CHANGEID)));
-    assertThat(e).hasMessageThat().contains("marked as Overridable");
-  }
+    @Test
+    public void putAllPackageOverrides_success() {
+        Map<String, Map<Long, PackageOverride>> packageNameToOverrides = new HashMap<>();
+        packageNameToOverrides.put(OVERRIDE_PACKAGE,
+                Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
+                        new PackageOverride.Builder().setEnabled(true).build()));
+        packageNameToOverrides.put(OVERRIDE_PACKAGE2,
+                Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
+                        new PackageOverride.Builder().setEnabled(true).build()));
+        CompatChanges.putAllPackageOverrides(packageNameToOverrides);
+    }
 
-  @Test
-  public void removePackageOverrides_doesNothingIfOverrideNotPresent() {
-    CompatChanges.removePackageOverrides(OVERRIDE_PACKAGE,
-            Collections.singleton(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID));
-  }
+    @Test
+    public void removePackageOverrides_securityExceptionForNonOverridableChangeId() {
+        SecurityException e = assertThrows(SecurityException.class,
+                () -> CompatChanges.removePackageOverrides(OVERRIDE_PACKAGE,
+                        Collections.singleton(CTS_SYSTEM_API_CHANGEID)));
+        assertThat(e).hasMessageThat().contains("marked as Overridable");
+    }
 
-  @Test
-  public void removePackageOverrides_doesNothingIfChangeIsUnknown() {
-    CompatChanges.removePackageOverrides(OVERRIDE_PACKAGE,
-            Collections.singleton(UNKNOWN_CHANGEID));
-  }
+    @Test
+    public void removePackageOverrides_doesNothingIfOverrideNotPresent() {
+        CompatChanges.removePackageOverrides(OVERRIDE_PACKAGE,
+                Collections.singleton(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID));
+    }
 
-  @Test
-  public void removePackageOverrides_overridePresentSuccess() {
-    CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
-            Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
-                    new PackageOverride.Builder().setEnabled(true).build()));
-    CompatChanges.removePackageOverrides(OVERRIDE_PACKAGE,
-            Collections.singleton(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID));
-  }
+    @Test
+    public void removePackageOverrides_doesNothingIfChangeIsUnknown() {
+        CompatChanges.removePackageOverrides(OVERRIDE_PACKAGE,
+                Collections.singleton(UNKNOWN_CHANGEID));
+    }
 
-  @Test
-  public void removePackageOverrides_securityExceptionForNotHoldingPermission() {
-    CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
-            Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
-                    new PackageOverride.Builder().setEnabled(true).build()));
+    @Test
+    public void removePackageOverrides_overridePresentSuccess() {
+        CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
+                Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
+                        new PackageOverride.Builder().setEnabled(true).build()));
+        CompatChanges.removePackageOverrides(OVERRIDE_PACKAGE,
+                Collections.singleton(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID));
+    }
 
-    // Adopt the normal override permission that doesn't allow to clear overrides on release builds
-    InstrumentationRegistry.getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
-    InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
-            Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG);
+    @Test
+    public void removePackageOverrides_securityExceptionForNotHoldingPermission() {
+        CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
+                Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
+                        new PackageOverride.Builder().setEnabled(true).build()));
 
-    SecurityException e = assertThrows(SecurityException.class,
-            () -> CompatChanges.removePackageOverrides(OVERRIDE_PACKAGE,
-                    Collections.singleton(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID)));
-    assertThat(e).hasMessageThat().contains("Cannot override compat change");
-  }
+        // Adopt the normal override permission that doesn't allow to clear overrides on release
+        // builds
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .dropShellPermissionIdentity();
+        InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
+                Manifest.permission.OVERRIDE_COMPAT_CHANGE_CONFIG);
+
+        SecurityException e = assertThrows(SecurityException.class,
+                () -> CompatChanges.removePackageOverrides(OVERRIDE_PACKAGE,
+                        Collections.singleton(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID)));
+        assertThat(e).hasMessageThat().contains("Cannot override compat change");
+    }
+
+    @Test
+    public void removeAllPackageOverrides_overridePresentSuccess() {
+        CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE,
+                Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
+                        new PackageOverride.Builder().setEnabled(true).build()));
+        CompatChanges.putPackageOverrides(OVERRIDE_PACKAGE2,
+                Collections.singletonMap(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID,
+                        new PackageOverride.Builder().setEnabled(true).build()));
+
+        Map<String, Set<Long>> packageNameToOverridesToRemove = new HashMap<>();
+        packageNameToOverridesToRemove.put(OVERRIDE_PACKAGE,
+                Collections.singleton(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID));
+        packageNameToOverridesToRemove.put(OVERRIDE_PACKAGE2,
+                Collections.singleton(CTS_SYSTEM_API_OVERRIDABLE_CHANGEID));
+        CompatChanges.removeAllPackageOverrides(packageNameToOverridesToRemove);
+    }
 }
diff --git a/hostsidetests/appcompat/compatchanges/preInstallOverrideApps/Android.bp b/hostsidetests/appcompat/compatchanges/preInstallOverrideApps/Android.bp
index 0353cb7..9d2b53e 100644
--- a/hostsidetests/appcompat/compatchanges/preInstallOverrideApps/Android.bp
+++ b/hostsidetests/appcompat/compatchanges/preInstallOverrideApps/Android.bp
@@ -79,3 +79,17 @@
         "general-tests",
     ],
 }
+
+android_test_helper_app {
+    name: "appcompat_preinstall_override2_versioncode1_release",
+    defaults: ["cts_defaults"],
+    sdk_version: "current",
+    static_libs: ["pre_install_override_lib"],
+    manifest: "AndroidManifest_2_versioncode1_release.xml",
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+}
diff --git a/hostsidetests/appcompat/compatchanges/preInstallOverrideApps/AndroidManifest_2_versioncode1_release.xml b/hostsidetests/appcompat/compatchanges/preInstallOverrideApps/AndroidManifest_2_versioncode1_release.xml
new file mode 100644
index 0000000..15a89c7
--- /dev/null
+++ b/hostsidetests/appcompat/compatchanges/preInstallOverrideApps/AndroidManifest_2_versioncode1_release.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.cts.appcompat.preinstalloverride2"
+          android:versionCode="1">
+    <uses-sdk android:targetSdkVersion="30"/>
+    <application android:debuggable="false">
+        <activity android:name=".Empty" android:exported="true" />
+    </application>
+</manifest>
diff --git a/hostsidetests/appcompat/compatchanges/preInstallOverrideApps/src/com/android/cts/appcompat/preinstalloverride2/EmptyActivity.java b/hostsidetests/appcompat/compatchanges/preInstallOverrideApps/src/com/android/cts/appcompat/preinstalloverride2/EmptyActivity.java
new file mode 100644
index 0000000..fd8061f
--- /dev/null
+++ b/hostsidetests/appcompat/compatchanges/preInstallOverrideApps/src/com/android/cts/appcompat/preinstalloverride2/EmptyActivity.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021 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.cts.appcompat.preinstalloverride2;
+
+import android.app.Activity;
+
+public class EmptyActivity extends Activity {
+
+}
diff --git a/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesOverrideOnReleaseBuildTest.java b/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesOverrideOnReleaseBuildTest.java
index 66fdf19..fbc7a58 100644
--- a/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesOverrideOnReleaseBuildTest.java
+++ b/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesOverrideOnReleaseBuildTest.java
@@ -29,6 +29,7 @@
     private static final String TEST_PKG = "com.android.cts.appcompat.compatchanges";
 
     private static final String OVERRIDE_PKG = "com.android.cts.appcompat.preinstalloverride";
+    private static final String OVERRIDE_PKG2 = "com.android.cts.appcompat.preinstalloverride2";
 
     private static final long CTS_OVERRIDABLE_CHANGE_ID = 174043039L;
     private static final long UNKNOWN_CHANGEID = 123L;
@@ -37,14 +38,17 @@
     protected void setUp() throws Exception {
         installPackage(TEST_APK, true);
         runCommand("am compat reset-all " + OVERRIDE_PKG);
+        runCommand("am compat reset-all " + OVERRIDE_PKG2);
         runCommand("settings put global force_non_debuggable_final_build_for_compat 1");
     }
 
     @Override
     protected void tearDown() throws Exception {
         runCommand("am compat reset-all " + OVERRIDE_PKG);
+        runCommand("am compat reset-all " + OVERRIDE_PKG2);
         uninstallPackage(TEST_PKG, true);
         uninstallPackage(OVERRIDE_PKG, false);
+        uninstallPackage(OVERRIDE_PKG2, false);
         runCommand("settings put global force_non_debuggable_final_build_for_compat 0");
     }
 
@@ -176,6 +180,26 @@
         assertThat(ctsChange.hasOverrides).isFalse();
     }
 
+    public void testPutAllPackageOverrides() throws Exception {
+        installPackage("appcompat_preinstall_override_versioncode1_release.apk", false);
+        installPackage("appcompat_preinstall_override2_versioncode1_release.apk", false);
+
+        runDeviceCompatTest(TEST_PKG, ".CompatChangesTest",
+                "putAllPackageOverrides_success",
+                /*enabledChanges*/ImmutableSet.of(),
+                /*disabledChanges*/ ImmutableSet.of());
+
+        Change ctsChange = getOnDeviceChangeIdConfig(CTS_OVERRIDABLE_CHANGE_ID);
+        assertWithMessage("CTS specific change %s not found on device", CTS_OVERRIDABLE_CHANGE_ID)
+                .that(ctsChange).isNotNull();
+        assertThat(ctsChange.hasRawOverrides).isTrue();
+        assertThat(ctsChange.rawOverrideStr).isEqualTo(
+                "{" + OVERRIDE_PKG + "=true, " + OVERRIDE_PKG2 + "=true}");
+        assertThat(ctsChange.hasOverrides).isTrue();
+        assertThat(ctsChange.overridesStr).isEqualTo(
+                "{" + OVERRIDE_PKG + "=true, " + OVERRIDE_PKG2 + "=true}");
+    }
+
     public void testRemovePackageOverridesSecurityExceptionNonOverridableChangeId()
             throws Exception {
         installPackage("appcompat_preinstall_override_versioncode1_release.apk", false);
@@ -243,4 +267,20 @@
         assertThat(ctsChange.hasRawOverrides).isFalse();
         assertThat(ctsChange.hasOverrides).isFalse();
     }
+
+    public void testRemoveAllPackageOverridesWhenOverridePresent() throws Exception {
+        installPackage("appcompat_preinstall_override_versioncode1_release.apk", false);
+        installPackage("appcompat_preinstall_override2_versioncode1_release.apk", false);
+
+        runDeviceCompatTest(TEST_PKG, ".CompatChangesTest",
+                "removeAllPackageOverrides_overridePresentSuccess",
+                /*enabledChanges*/ImmutableSet.of(),
+                /*disabledChanges*/ ImmutableSet.of());
+
+        Change ctsChange = getOnDeviceChangeIdConfig(CTS_OVERRIDABLE_CHANGE_ID);
+        assertWithMessage("CTS specific change %s not found on device", CTS_OVERRIDABLE_CHANGE_ID)
+                .that(ctsChange).isNotNull();
+        assertThat(ctsChange.hasRawOverrides).isFalse();
+        assertThat(ctsChange.hasOverrides).isFalse();
+    }
 }
diff --git a/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesSelinuxTest.java b/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesSelinuxTest.java
index 4b7edc7..aa87d2a 100644
--- a/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesSelinuxTest.java
+++ b/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesSelinuxTest.java
@@ -147,8 +147,7 @@
     }
 
     private void startApp() throws Exception {
-        runCommand("am start -n " + TEST_PKG + "/" + TEST_PKG + ".Empty");
-        Thread.currentThread().sleep(5000);
+        runCommand("am start-activity -W -n " + TEST_PKG + "/" + TEST_PKG + ".Empty");
     }
 
 
diff --git a/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesValidConfigTest.java b/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesValidConfigTest.java
index ef1c220..6fbfba0 100644
--- a/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesValidConfigTest.java
+++ b/hostsidetests/appcompat/compatchanges/src/com/android/cts/appcompat/CompatChangesValidConfigTest.java
@@ -24,6 +24,10 @@
 
 import com.google.common.collect.ImmutableSet;
 
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -31,10 +35,6 @@
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-
 public final class CompatChangesValidConfigTest extends CompatChangeGatingTestCase {
 
     private static final Set<String> OVERRIDES_ALLOWLIST = ImmutableSet.of(
@@ -45,6 +45,7 @@
     private static final Set<String> OVERRIDABLE_CHANGES = ImmutableSet.of(
             "ALWAYS_SANDBOX_DISPLAY_APIS",
             "CTS_SYSTEM_API_OVERRIDABLE_CHANGEID",
+            "DEFER_BOOT_COMPLETED_BROADCAST_CHANGE_ID",
             "DOWNSCALED",
             "DOWNSCALE_30",
             "DOWNSCALE_35",
diff --git a/hostsidetests/appcompat/strictjavapackages/Android.bp b/hostsidetests/appcompat/strictjavapackages/Android.bp
index 9ab8a83..272be12 100644
--- a/hostsidetests/appcompat/strictjavapackages/Android.bp
+++ b/hostsidetests/appcompat/strictjavapackages/Android.bp
@@ -21,9 +21,9 @@
     defaults: ["cts_defaults"],
     srcs: ["src/**/*.java"],
     libs: [
-        "cts-tradefed",
         "tradefed",
         "compatibility-host-util",
+        "cts-tradefed",
     ],
     static_libs: [
         "compat-classpaths-testing",
@@ -35,4 +35,9 @@
         "general-tests",
         "mts-mainline-infra",
     ],
+    data: [
+        ":SharedLibraryInfoTestApp",
+        ":StrictJavaPackagesTestApp",
+    ],
+    per_testcase_directory: true,
 }
diff --git a/hostsidetests/appcompat/strictjavapackages/app/Android.bp b/hostsidetests/appcompat/strictjavapackages/app/Android.bp
new file mode 100644
index 0000000..e75abe4
--- /dev/null
+++ b/hostsidetests/appcompat/strictjavapackages/app/Android.bp
@@ -0,0 +1,36 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "StrictJavaPackagesTestApp",
+    defaults: ["cts_defaults"],
+    srcs: ["src/**/*.java"],
+    static_libs: [
+        "androidx.test.rules",
+        "androidx.test.core",
+    ],
+    sdk_version: "test_current",
+    test_suites: [
+        "ats",
+        "cts",
+        "gts",
+        "general-tests",
+        "mts",
+        "tvts",
+    ],
+}
diff --git a/hostsidetests/appcompat/strictjavapackages/app/AndroidManifest.xml b/hostsidetests/appcompat/strictjavapackages/app/AndroidManifest.xml
new file mode 100644
index 0000000..6ac77db
--- /dev/null
+++ b/hostsidetests/appcompat/strictjavapackages/app/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.compat.sjp.app"
+          android:targetSandboxVersion="2">
+    <application android:requestLegacyExternalStorage="true">
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.compat.sjp.app" />
+</manifest>
diff --git a/hostsidetests/appcompat/strictjavapackages/app/src/android/compat/sjp/app/ApexDeviceTest.java b/hostsidetests/appcompat/strictjavapackages/app/src/android/compat/sjp/app/ApexDeviceTest.java
new file mode 100644
index 0000000..fa98fe6
--- /dev/null
+++ b/hostsidetests/appcompat/strictjavapackages/app/src/android/compat/sjp/app/ApexDeviceTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2021 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 android.compat.sjp.app;
+
+import static org.junit.Assert.assertNotNull;
+
+import android.content.pm.PackageManager;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Device-side helper app for obtaining Apex info.
+ *
+ * <p>It is not technically a test as it simply collects information, but it simplifies the usage
+ * and communication with host-side tests.
+ */
+@RunWith(AndroidJUnit4.class)
+public class ApexDeviceTest {
+
+    @Before
+    public void before() {
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .adoptShellPermissionIdentity();
+    }
+
+    @After
+    public void after() {
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .dropShellPermissionIdentity();
+    }
+
+    /**
+     * Collects all apk-in-apex apps on the device and writes them to disk.
+     */
+    @Test
+    public void testCollectApkInApexPaths() throws Exception {
+        Path detailsFilepath = new File("/sdcard/apk-in-apex-paths.txt").toPath();
+        final PackageManager pm = InstrumentationRegistry.getInstrumentation().getTargetContext()
+                .getPackageManager();
+        assertNotNull("No package manager instance!", pm);
+        final Set<String> lines = pm.getInstalledPackages(0).stream()
+                .map(pkg -> pkg.applicationInfo.sourceDir)
+                .filter(sourceDir -> sourceDir != null && sourceDir.contains("/apex/"))
+                .collect(Collectors.toSet());
+        Files.write(detailsFilepath, lines);
+    }
+}
diff --git a/hostsidetests/appcompat/strictjavapackages/src/android/compat/sjp/cts/StrictJavaPackagesTest.java b/hostsidetests/appcompat/strictjavapackages/src/android/compat/sjp/cts/StrictJavaPackagesTest.java
index 08b1277..8720426 100644
--- a/hostsidetests/appcompat/strictjavapackages/src/android/compat/sjp/cts/StrictJavaPackagesTest.java
+++ b/hostsidetests/appcompat/strictjavapackages/src/android/compat/sjp/cts/StrictJavaPackagesTest.java
@@ -20,33 +20,44 @@
 import static android.compat.testing.Classpaths.ClasspathType.SYSTEMSERVERCLASSPATH;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.junit.Assume.assumeTrue;
 
 import android.compat.testing.Classpaths;
+import android.compat.testing.SharedLibraryInfo;
 
-import com.android.compatibility.common.util.ApiLevelUtil;
+import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.modules.utils.build.testing.DeviceSdkLevel;
 import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.log.LogUtil;
-import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.invoker.TestInformation;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+import com.android.tradefed.testtype.junit4.BeforeClassWithInfo;
+import com.android.tradefed.testtype.junit4.DeviceTestRunOptions;
 
-import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableCollection;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMultimap;
 import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.Multimaps;
 
 import org.jf.dexlib2.iface.ClassDef;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.IOException;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Set;
+import java.util.stream.Stream;
+
 
 /**
  * Tests for detecting no duplicate class files are present on BOOTCLASSPATH and
@@ -58,6 +69,18 @@
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class StrictJavaPackagesTest extends BaseHostJUnit4Test {
 
+    private static final String ANDROID_TEST_MOCK_JAR = "/system/framework/android.test.mock.jar";
+    private static final String TEST_HELPER_PACKAGE = "android.compat.sjp.app";
+    private static final String TEST_HELPER_APK = "StrictJavaPackagesTestApp.apk";
+
+    private static ImmutableList<String> sBootclasspathJars;
+    private static ImmutableList<String> sSystemserverclasspathJars;
+    private static ImmutableList<String> sSharedLibJars;
+    private static ImmutableList<SharedLibraryInfo> sSharedLibs;
+    private static ImmutableMultimap<String, String> sJarsToClasses;
+
+    private DeviceSdkLevel mDeviceSdkLevel;
+
     /**
      * This is the list of classes that are currently duplicated and should be addressed.
      *
@@ -190,12 +213,8 @@
                     "Landroid/hardware/usb/gadget/V1_2/IUsbGadget;",
                     "Landroid/hardware/usb/gadget/V1_2/IUsbGadgetCallback;",
                     "Landroid/hardware/usb/gadget/V1_2/UsbSpeed;",
-                    "Landroid/os/BlockUntrustedTouchesMode;",
                     "Landroid/os/CreateAppDataArgs;",
                     "Landroid/os/CreateAppDataResult;",
-                    "Landroid/os/IInputConstants;",
-                    "Landroid/os/InputEventInjectionResult;",
-                    "Landroid/os/InputEventInjectionSync;",
                     "Landroid/os/ReconcileSdkDataArgs;",
                     "Lcom/android/internal/util/FrameworkStatsLog;"
             );
@@ -204,33 +223,581 @@
     private static final String FEATURE_AUTOMOTIVE = "android.hardware.type.automotive";
 
     private static final Set<String> WEAR_HIDL_OVERLAP_BURNDOWN_LIST =
-        ImmutableSet.of(
-            "Landroid/hidl/base/V1_0/DebugInfo$Architecture;",
-            "Landroid/hidl/base/V1_0/IBase;",
-            "Landroid/hidl/base/V1_0/IBase$Proxy;",
-            "Landroid/hidl/base/V1_0/IBase$Stub;",
-            "Landroid/hidl/base/V1_0/DebugInfo;",
-            "Landroid/hidl/safe_union/V1_0/Monostate;"
-        );
+            ImmutableSet.of(
+                    "Landroid/hidl/base/V1_0/DebugInfo$Architecture;",
+                    "Landroid/hidl/base/V1_0/IBase;",
+                    "Landroid/hidl/base/V1_0/IBase$Proxy;",
+                    "Landroid/hidl/base/V1_0/IBase$Stub;",
+                    "Landroid/hidl/base/V1_0/DebugInfo;",
+                    "Landroid/hidl/safe_union/V1_0/Monostate;"
+            );
 
     private static final Set<String> AUTOMOTIVE_HIDL_OVERLAP_BURNDOWN_LIST =
+            ImmutableSet.of(
+                    "Landroid/hidl/base/V1_0/DebugInfo$Architecture;",
+                    "Landroid/hidl/base/V1_0/IBase;",
+                    "Landroid/hidl/base/V1_0/IBase$Proxy;",
+                    "Landroid/hidl/base/V1_0/IBase$Stub;",
+                    "Landroid/hidl/base/V1_0/DebugInfo;"
+            );
+
+    /**
+     * TODO(b/199529199): Address these.
+     * List of duplicate classes between bootclasspath and shared libraries.
+     *
+     * <p> DO NOT ADD CLASSES TO THIS LIST!
+     */
+    private static final Set<String> BCP_AND_SHARED_LIB_BURNDOWN_LIST =
+            ImmutableSet.of(
+                    "Landroid/hidl/base/V1_0/DebugInfo;",
+                    "Landroid/hidl/base/V1_0/IBase;",
+                    "Landroid/hidl/manager/V1_0/IServiceManager;",
+                    "Landroid/hidl/manager/V1_0/IServiceNotification;",
+                    "Landroidx/annotation/Keep;",
+                    "Lcom/google/android/embms/nano/EmbmsProtos;",
+                    "Lcom/google/protobuf/nano/android/ParcelableExtendableMessageNano;",
+                    "Lcom/google/protobuf/nano/android/ParcelableMessageNano;",
+                    "Lcom/google/protobuf/nano/android/ParcelableMessageNanoCreator;",
+                    "Lcom/google/protobuf/nano/CodedInputByteBufferNano;",
+                    "Lcom/google/protobuf/nano/CodedOutputByteBufferNano;",
+                    "Lcom/google/protobuf/nano/ExtendableMessageNano;",
+                    "Lcom/google/protobuf/nano/Extension;",
+                    "Lcom/google/protobuf/nano/FieldArray;",
+                    "Lcom/google/protobuf/nano/FieldData;",
+                    "Lcom/google/protobuf/nano/InternalNano;",
+                    "Lcom/google/protobuf/nano/InvalidProtocolBufferNanoException;",
+                    "Lcom/google/protobuf/nano/MapFactories;",
+                    "Lcom/google/protobuf/nano/MessageNano;",
+                    "Lcom/google/protobuf/nano/MessageNanoPrinter;",
+                    "Lcom/google/protobuf/nano/UnknownFieldData;",
+                    "Lcom/google/protobuf/nano/WireFormatNano;",
+                    "Lcom/qualcomm/qcrilhook/BaseQmiTypes;",
+                    "Lcom/qualcomm/qcrilhook/CSignalStrength;",
+                    "Lcom/qualcomm/qcrilhook/EmbmsOemHook;",
+                    "Lcom/qualcomm/qcrilhook/EmbmsProtoUtils;",
+                    "Lcom/qualcomm/qcrilhook/IOemHookCallback;",
+                    "Lcom/qualcomm/qcrilhook/IQcRilHook;",
+                    "Lcom/qualcomm/qcrilhook/IQcRilHookExt;",
+                    "Lcom/qualcomm/qcrilhook/OemHookCallback;",
+                    "Lcom/qualcomm/qcrilhook/PresenceMsgBuilder;",
+                    "Lcom/qualcomm/qcrilhook/PresenceMsgParser;",
+                    "Lcom/qualcomm/qcrilhook/PresenceOemHook;",
+                    "Lcom/qualcomm/qcrilhook/PrimitiveParser;",
+                    "Lcom/qualcomm/qcrilhook/QcRilHook;",
+                    "Lcom/qualcomm/qcrilhook/QcRilHookCallback;",
+                    "Lcom/qualcomm/qcrilhook/QcRilHookCallbackExt;",
+                    "Lcom/qualcomm/qcrilhook/QcRilHookExt;",
+                    "Lcom/qualcomm/qcrilhook/QmiOemHook;",
+                    "Lcom/qualcomm/qcrilhook/QmiOemHookConstants;",
+                    "Lcom/qualcomm/qcrilhook/QmiPrimitiveTypes;",
+                    "Lcom/qualcomm/qcrilhook/TunerOemHook;",
+                    "Lcom/qualcomm/qcrilmsgtunnel/IQcrilMsgTunnel;",
+                    "Lcom/qualcomm/utils/CommandException;",
+                    "Lcom/qualcomm/utils/RILConstants;",
+                    "Lorg/codeaurora/telephony/utils/CommandException;",
+                    "Lorg/codeaurora/telephony/utils/Log;",
+                    "Lorg/codeaurora/telephony/utils/RILConstants;",
+                    "Lorg/chromium/net/ApiVersion;",
+                    "Lorg/chromium/net/BidirectionalStream;",
+                    "Lorg/chromium/net/CallbackException;",
+                    "Lorg/chromium/net/CronetEngine;",
+                    "Lorg/chromium/net/CronetException;",
+                    "Lorg/chromium/net/CronetProvider;",
+                    "Lorg/chromium/net/EffectiveConnectionType;",
+                    "Lorg/chromium/net/ExperimentalBidirectionalStream;",
+                    "Lorg/chromium/net/ExperimentalCronetEngine;",
+                    "Lorg/chromium/net/ExperimentalUrlRequest;",
+                    "Lorg/chromium/net/ICronetEngineBuilder;",
+                    "Lorg/chromium/net/InlineExecutionProhibitedException;",
+                    "Lorg/chromium/net/NetworkException;",
+                    "Lorg/chromium/net/NetworkQualityRttListener;",
+                    "Lorg/chromium/net/NetworkQualityThroughputListener;",
+                    "Lorg/chromium/net/QuicException;",
+                    "Lorg/chromium/net/RequestFinishedInfo;",
+                    "Lorg/chromium/net/RttThroughputValues;",
+                    "Lorg/chromium/net/ThreadStatsUid;",
+                    "Lorg/chromium/net/UploadDataProvider;",
+                    "Lorg/chromium/net/UploadDataProviders;",
+                    "Lorg/chromium/net/UploadDataSink;",
+                    "Lorg/chromium/net/UrlRequest;",
+                    "Lorg/chromium/net/UrlResponseInfo;"
+            );
+    // TODO: b/223837004
+    private static final ImmutableSet<String> BLUETOOTH_APK_IN_APEX_BURNDOWN_LIST =
         ImmutableSet.of(
-            "Landroid/hidl/base/V1_0/DebugInfo$Architecture;",
-            "Landroid/hidl/base/V1_0/IBase;",
-            "Landroid/hidl/base/V1_0/IBase$Proxy;",
-            "Landroid/hidl/base/V1_0/IBase$Stub;",
-            "Landroid/hidl/base/V1_0/DebugInfo;"
+                // Already duplicate in BCP.
+                "Landroid/hidl/base/V1_0/DebugInfo;",
+                "Landroid/hidl/base/V1_0/IBase;",
+                // /apex/com.android.bluetooth/javalib/framework-bluetooth.jar
+                "Lcom/android/bluetooth/x/android/sysprop/AdbProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/ApkVerityProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/BluetoothProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/CarProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/ContactsProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/CryptoProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/DeviceProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/DisplayProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/HdmiProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/HypervisorProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/InputProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/MediaProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/NetworkProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/OtaProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/PowerProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/SetupWizardProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/SocProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/TelephonyProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/TraceProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/VndkProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/VoldProperties;",
+                "Lcom/android/bluetooth/x/android/sysprop/WifiProperties;",
+                "Lcom/android/bluetooth/x/com/android/modules/utils/ISynchronousResultReceiver;",
+                "Lcom/android/bluetooth/x/com/android/modules/utils/SynchronousResultReceiver-IA;",
+                "Lcom/android/bluetooth/x/com/android/modules/utils/SynchronousResultReceiver;",
+                // /system/framework/services.jar
+                "Landroid/net/DataStallReportParcelable;",
+                "Landroid/net/DhcpResultsParcelable;",
+                "Landroid/net/IIpMemoryStore;",
+                "Landroid/net/IIpMemoryStoreCallbacks;",
+                "Landroid/net/INetworkMonitor;",
+                "Landroid/net/INetworkMonitorCallbacks;",
+                "Landroid/net/INetworkStackConnector;",
+                "Landroid/net/INetworkStackStatusCallback;",
+                "Landroid/net/InformationElementParcelable;",
+                "Landroid/net/InitialConfigurationParcelable;",
+                "Landroid/net/IpMemoryStoreClient;",
+                "Landroid/net/Layer2InformationParcelable;",
+                "Landroid/net/Layer2PacketParcelable;",
+                "Landroid/net/NattKeepalivePacketDataParcelable;",
+                "Landroid/net/NetworkFactory;",
+                "Landroid/net/NetworkFactoryShim;",
+                "Landroid/net/NetworkMonitorManager;",
+                "Landroid/net/NetworkTestResultParcelable;",
+                "Landroid/net/PrivateDnsConfigParcel;",
+                "Landroid/net/ProvisioningConfigurationParcelable;",
+                "Landroid/net/ScanResultInfoParcelable;",
+                "Landroid/net/TcpKeepalivePacketDataParcelable;",
+                "Landroid/net/dhcp/DhcpLeaseParcelable;",
+                "Landroid/net/dhcp/DhcpServingParamsParcel;",
+                "Landroid/net/dhcp/IDhcpEventCallbacks;",
+                "Landroid/net/dhcp/IDhcpServer;",
+                "Landroid/net/dhcp/IDhcpServerCallbacks;",
+                "Landroid/net/ip/IIpClient;",
+                "Landroid/net/ip/IIpClientCallbacks;",
+                "Landroid/net/ip/IpClientCallbacks;",
+                "Landroid/net/ip/IpClientManager;",
+                "Landroid/net/ip/IpClientUtil;",
+                "Landroid/net/ipmemorystore/Blob;",
+                "Landroid/net/ipmemorystore/IOnBlobRetrievedListener;",
+                "Landroid/net/ipmemorystore/IOnL2KeyResponseListener;",
+                "Landroid/net/ipmemorystore/IOnNetworkAttributesRetrievedListener;",
+                "Landroid/net/ipmemorystore/IOnSameL3NetworkResponseListener;",
+                "Landroid/net/ipmemorystore/IOnStatusAndCountListener;",
+                "Landroid/net/ipmemorystore/IOnStatusListener;",
+                "Landroid/net/ipmemorystore/NetworkAttributes;",
+                "Landroid/net/ipmemorystore/NetworkAttributesParcelable;",
+                "Landroid/net/ipmemorystore/OnBlobRetrievedListener;",
+                "Landroid/net/ipmemorystore/OnDeleteStatusListener;",
+                "Landroid/net/ipmemorystore/OnL2KeyResponseListener;",
+                "Landroid/net/ipmemorystore/OnNetworkAttributesRetrievedListener;",
+                "Landroid/net/ipmemorystore/OnSameL3NetworkResponseListener;",
+                "Landroid/net/ipmemorystore/OnStatusListener;",
+                "Landroid/net/ipmemorystore/SameL3NetworkResponse;",
+                "Landroid/net/ipmemorystore/SameL3NetworkResponseParcelable;",
+                "Landroid/net/ipmemorystore/Status;",
+                "Landroid/net/ipmemorystore/StatusParcelable;",
+                "Landroid/net/networkstack/NetworkStackClientBase;",
+                "Landroid/net/networkstack/aidl/NetworkMonitorParameters;",
+                "Landroid/net/networkstack/aidl/dhcp/DhcpOption;",
+                "Landroid/net/networkstack/aidl/ip/ReachabilityLossInfoParcelable;",
+                "Landroid/net/networkstack/aidl/ip/ReachabilityLossReason;",
+                "Landroid/net/networkstack/aidl/quirks/IPv6ProvisioningLossQuirk;",
+                "Landroid/net/networkstack/aidl/quirks/IPv6ProvisioningLossQuirkParcelable;",
+                "Landroid/net/shared/InitialConfiguration;",
+                "Landroid/net/shared/IpConfigurationParcelableUtil;",
+                "Landroid/net/shared/Layer2Information;",
+                "Landroid/net/shared/ParcelableUtil;",
+                "Landroid/net/shared/PrivateDnsConfig;",
+                "Landroid/net/shared/ProvisioningConfiguration;",
+                "Landroid/net/util/KeepalivePacketDataUtil;",
+                "Landroid/net/IpMemoryStore;",
+                "Landroid/net/NetworkFactoryLegacyImpl;",
+                "Landroid/net/networkstack/ModuleNetworkStackClient;",
+                "Landroid/net/NetworkFactoryImpl;",
+                // /system/framework/framework.jar
+                "Landroid/bluetooth/BluetoothProtoEnums;",
+                "Landroid/bluetooth/a2dp/BluetoothA2dpProtoEnums;",
+                "Landroid/bluetooth/hci/BluetoothHciProtoEnums;",
+                "Landroid/bluetooth/hfp/BluetoothHfpProtoEnums;",
+                "Landroid/bluetooth/smp/BluetoothSmpProtoEnums;",
+                "Landroid/hardware/radio/V1_0/ActivityStatsInfo;",
+                "Landroid/hardware/radio/V1_0/ApnAuthType;",
+                "Landroid/hardware/radio/V1_0/ApnTypes;",
+                "Landroid/hardware/radio/V1_0/AppState;",
+                "Landroid/hardware/radio/V1_0/AppStatus;",
+                "Landroid/hardware/radio/V1_0/AppType;",
+                "Landroid/hardware/radio/V1_0/Call;",
+                "Landroid/hardware/radio/V1_0/CallForwardInfo;",
+                "Landroid/hardware/radio/V1_0/CallForwardInfoStatus;",
+                "Landroid/hardware/radio/V1_0/CallPresentation;",
+                "Landroid/hardware/radio/V1_0/CallState;",
+                "Landroid/hardware/radio/V1_0/CardState;",
+                "Landroid/hardware/radio/V1_0/CardStatus;",
+                "Landroid/hardware/radio/V1_0/Carrier;",
+                "Landroid/hardware/radio/V1_0/CarrierMatchType;",
+                "Landroid/hardware/radio/V1_0/CarrierRestrictions;",
+                "Landroid/hardware/radio/V1_0/CdmaBroadcastSmsConfigInfo;",
+                "Landroid/hardware/radio/V1_0/CdmaCallWaiting;",
+                "Landroid/hardware/radio/V1_0/CdmaCallWaitingNumberPlan;",
+                "Landroid/hardware/radio/V1_0/CdmaCallWaitingNumberPresentation;",
+                "Landroid/hardware/radio/V1_0/CdmaCallWaitingNumberType;",
+                "Landroid/hardware/radio/V1_0/CdmaDisplayInfoRecord;",
+                "Landroid/hardware/radio/V1_0/CdmaInfoRecName;",
+                "Landroid/hardware/radio/V1_0/CdmaInformationRecord;",
+                "Landroid/hardware/radio/V1_0/CdmaInformationRecords;",
+                "Landroid/hardware/radio/V1_0/CdmaLineControlInfoRecord;",
+                "Landroid/hardware/radio/V1_0/CdmaNumberInfoRecord;",
+                "Landroid/hardware/radio/V1_0/CdmaOtaProvisionStatus;",
+                "Landroid/hardware/radio/V1_0/CdmaRedirectingNumberInfoRecord;",
+                "Landroid/hardware/radio/V1_0/CdmaRedirectingReason;",
+                "Landroid/hardware/radio/V1_0/CdmaRoamingType;",
+                "Landroid/hardware/radio/V1_0/CdmaSignalInfoRecord;",
+                "Landroid/hardware/radio/V1_0/CdmaSignalStrength;",
+                "Landroid/hardware/radio/V1_0/CdmaSmsAck;",
+                "Landroid/hardware/radio/V1_0/CdmaSmsAddress;",
+                "Landroid/hardware/radio/V1_0/CdmaSmsDigitMode;",
+                "Landroid/hardware/radio/V1_0/CdmaSmsErrorClass;",
+                "Landroid/hardware/radio/V1_0/CdmaSmsMessage;",
+                "Landroid/hardware/radio/V1_0/CdmaSmsNumberMode;",
+                "Landroid/hardware/radio/V1_0/CdmaSmsNumberPlan;",
+                "Landroid/hardware/radio/V1_0/CdmaSmsNumberType;",
+                "Landroid/hardware/radio/V1_0/CdmaSmsSubaddress;",
+                "Landroid/hardware/radio/V1_0/CdmaSmsSubaddressType;",
+                "Landroid/hardware/radio/V1_0/CdmaSmsWriteArgs;",
+                "Landroid/hardware/radio/V1_0/CdmaSmsWriteArgsStatus;",
+                "Landroid/hardware/radio/V1_0/CdmaSubscriptionSource;",
+                "Landroid/hardware/radio/V1_0/CdmaT53AudioControlInfoRecord;",
+                "Landroid/hardware/radio/V1_0/CdmaT53ClirInfoRecord;",
+                "Landroid/hardware/radio/V1_0/CellIdentity;",
+                "Landroid/hardware/radio/V1_0/CellIdentityCdma;",
+                "Landroid/hardware/radio/V1_0/CellIdentityGsm;",
+                "Landroid/hardware/radio/V1_0/CellIdentityLte;",
+                "Landroid/hardware/radio/V1_0/CellIdentityTdscdma;",
+                "Landroid/hardware/radio/V1_0/CellIdentityWcdma;",
+                "Landroid/hardware/radio/V1_0/CellInfo;",
+                "Landroid/hardware/radio/V1_0/CellInfoCdma;",
+                "Landroid/hardware/radio/V1_0/CellInfoGsm;",
+                "Landroid/hardware/radio/V1_0/CellInfoLte;",
+                "Landroid/hardware/radio/V1_0/CellInfoTdscdma;",
+                "Landroid/hardware/radio/V1_0/CellInfoType;",
+                "Landroid/hardware/radio/V1_0/CellInfoWcdma;",
+                "Landroid/hardware/radio/V1_0/CfData;",
+                "Landroid/hardware/radio/V1_0/ClipStatus;",
+                "Landroid/hardware/radio/V1_0/Clir;",
+                "Landroid/hardware/radio/V1_0/DataCallFailCause;",
+                "Landroid/hardware/radio/V1_0/DataProfileId;",
+                "Landroid/hardware/radio/V1_0/DataProfileInfo;",
+                "Landroid/hardware/radio/V1_0/DataProfileInfoType;",
+                "Landroid/hardware/radio/V1_0/DataRegStateResult;",
+                "Landroid/hardware/radio/V1_0/DeviceStateType;",
+                "Landroid/hardware/radio/V1_0/Dial;",
+                "Landroid/hardware/radio/V1_0/EvdoSignalStrength;",
+                "Landroid/hardware/radio/V1_0/GsmBroadcastSmsConfigInfo;",
+                "Landroid/hardware/radio/V1_0/GsmSignalStrength;",
+                "Landroid/hardware/radio/V1_0/GsmSmsMessage;",
+                "Landroid/hardware/radio/V1_0/HardwareConfig;",
+                "Landroid/hardware/radio/V1_0/HardwareConfigModem;",
+                "Landroid/hardware/radio/V1_0/HardwareConfigSim;",
+                "Landroid/hardware/radio/V1_0/HardwareConfigState;",
+                "Landroid/hardware/radio/V1_0/HardwareConfigType;",
+                "Landroid/hardware/radio/V1_0/IccIo;",
+                "Landroid/hardware/radio/V1_0/IccIoResult;",
+                "Landroid/hardware/radio/V1_0/ImsSmsMessage;",
+                "Landroid/hardware/radio/V1_0/IndicationFilter;",
+                "Landroid/hardware/radio/V1_0/LastCallFailCause;",
+                "Landroid/hardware/radio/V1_0/LastCallFailCauseInfo;",
+                "Landroid/hardware/radio/V1_0/LceDataInfo;",
+                "Landroid/hardware/radio/V1_0/LceStatus;",
+                "Landroid/hardware/radio/V1_0/LceStatusInfo;",
+                "Landroid/hardware/radio/V1_0/LteSignalStrength;",
+                "Landroid/hardware/radio/V1_0/MvnoType;",
+                "Landroid/hardware/radio/V1_0/NeighboringCell;",
+                "Landroid/hardware/radio/V1_0/NvItem;",
+                "Landroid/hardware/radio/V1_0/NvWriteItem;",
+                "Landroid/hardware/radio/V1_0/OperatorInfo;",
+                "Landroid/hardware/radio/V1_0/OperatorStatus;",
+                "Landroid/hardware/radio/V1_0/P2Constant;",
+                "Landroid/hardware/radio/V1_0/PcoDataInfo;",
+                "Landroid/hardware/radio/V1_0/PersoSubstate;",
+                "Landroid/hardware/radio/V1_0/PhoneRestrictedState;",
+                "Landroid/hardware/radio/V1_0/PinState;",
+                "Landroid/hardware/radio/V1_0/PreferredNetworkType;",
+                "Landroid/hardware/radio/V1_0/RadioAccessFamily;",
+                "Landroid/hardware/radio/V1_0/RadioBandMode;",
+                "Landroid/hardware/radio/V1_0/RadioCapability;",
+                "Landroid/hardware/radio/V1_0/RadioCapabilityPhase;",
+                "Landroid/hardware/radio/V1_0/RadioCapabilityStatus;",
+                "Landroid/hardware/radio/V1_0/RadioCdmaSmsConst;",
+                "Landroid/hardware/radio/V1_0/RadioConst;",
+                "Landroid/hardware/radio/V1_0/RadioError;",
+                "Landroid/hardware/radio/V1_0/RadioIndicationType;",
+                "Landroid/hardware/radio/V1_0/RadioResponseInfo;",
+                "Landroid/hardware/radio/V1_0/RadioResponseType;",
+                "Landroid/hardware/radio/V1_0/RadioState;",
+                "Landroid/hardware/radio/V1_0/RadioTechnology;",
+                "Landroid/hardware/radio/V1_0/RadioTechnologyFamily;",
+                "Landroid/hardware/radio/V1_0/RegState;",
+                "Landroid/hardware/radio/V1_0/ResetNvType;",
+                "Landroid/hardware/radio/V1_0/RestrictedState;",
+                "Landroid/hardware/radio/V1_0/SapApduType;",
+                "Landroid/hardware/radio/V1_0/SapConnectRsp;",
+                "Landroid/hardware/radio/V1_0/SapDisconnectType;",
+                "Landroid/hardware/radio/V1_0/SapResultCode;",
+                "Landroid/hardware/radio/V1_0/SapStatus;",
+                "Landroid/hardware/radio/V1_0/SapTransferProtocol;",
+                "Landroid/hardware/radio/V1_0/SelectUiccSub;",
+                "Landroid/hardware/radio/V1_0/SendSmsResult;",
+                "Landroid/hardware/radio/V1_0/SetupDataCallResult;",
+                "Landroid/hardware/radio/V1_0/SignalStrength;",
+                "Landroid/hardware/radio/V1_0/SimApdu;",
+                "Landroid/hardware/radio/V1_0/SimRefreshResult;",
+                "Landroid/hardware/radio/V1_0/SimRefreshType;",
+                "Landroid/hardware/radio/V1_0/SmsAcknowledgeFailCause;",
+                "Landroid/hardware/radio/V1_0/SmsWriteArgs;",
+                "Landroid/hardware/radio/V1_0/SmsWriteArgsStatus;",
+                "Landroid/hardware/radio/V1_0/SrvccState;",
+                "Landroid/hardware/radio/V1_0/SsInfoData;",
+                "Landroid/hardware/radio/V1_0/SsRequestType;",
+                "Landroid/hardware/radio/V1_0/SsServiceType;",
+                "Landroid/hardware/radio/V1_0/SsTeleserviceType;",
+                "Landroid/hardware/radio/V1_0/StkCcUnsolSsResult;",
+                "Landroid/hardware/radio/V1_0/SubscriptionType;",
+                "Landroid/hardware/radio/V1_0/SuppServiceClass;",
+                "Landroid/hardware/radio/V1_0/SuppSvcNotification;",
+                "Landroid/hardware/radio/V1_0/TdScdmaSignalStrength;",
+                "Landroid/hardware/radio/V1_0/TimeStampType;",
+                "Landroid/hardware/radio/V1_0/TtyMode;",
+                "Landroid/hardware/radio/V1_0/UiccSubActStatus;",
+                "Landroid/hardware/radio/V1_0/UssdModeType;",
+                "Landroid/hardware/radio/V1_0/UusDcs;",
+                "Landroid/hardware/radio/V1_0/UusInfo;",
+                "Landroid/hardware/radio/V1_0/UusType;",
+                "Landroid/hardware/radio/V1_0/VoiceRegStateResult;",
+                "Landroid/hardware/radio/V1_0/WcdmaSignalStrength;",
+                "Landroid/hardware/radio/V1_0/IRadio;",
+                "Landroid/hardware/radio/V1_0/IRadioIndication;",
+                "Landroid/hardware/radio/V1_0/IRadioResponse;",
+                "Landroid/hardware/radio/V1_0/ISap;",
+                "Landroid/hardware/radio/V1_0/ISapCallback;",
+                "Lcom/android/internal/util/IState;",
+                "Lcom/android/internal/util/StateMachine;",
+                "Lcom/google/android/mms/ContentType;",
+                "Lcom/google/android/mms/MmsException;",
+                "Lcom/google/android/mms/pdu/Base64;",
+                "Lcom/google/android/mms/pdu/CharacterSets;",
+                "Lcom/google/android/mms/pdu/EncodedStringValue;",
+                "Lcom/google/android/mms/pdu/GenericPdu;",
+                "Lcom/google/android/mms/pdu/PduBody;",
+                "Lcom/google/android/mms/pdu/PduComposer;",
+                "Lcom/google/android/mms/pdu/PduContentTypes;",
+                "Lcom/google/android/mms/pdu/PduHeaders;",
+                "Lcom/google/android/mms/pdu/PduParser;",
+                "Lcom/google/android/mms/pdu/PduPart;",
+                "Lcom/google/android/mms/pdu/PduPersister;",
+                "Lcom/google/android/mms/pdu/QuotedPrintable;",
+                "Lcom/google/android/mms/util/AbstractCache;",
+                "Lcom/google/android/mms/util/DownloadDrmHelper;",
+                "Lcom/google/android/mms/util/DrmConvertSession;",
+                "Lcom/google/android/mms/util/PduCacheEntry;",
+                "Lcom/google/android/mms/util/SqliteWrapper;",
+                "Lcom/android/internal/util/State;",
+                "Lcom/google/android/mms/InvalidHeaderValueException;",
+                "Lcom/google/android/mms/pdu/AcknowledgeInd;",
+                "Lcom/google/android/mms/pdu/DeliveryInd;",
+                "Lcom/google/android/mms/pdu/MultimediaMessagePdu;",
+                "Lcom/google/android/mms/pdu/NotificationInd;",
+                "Lcom/google/android/mms/pdu/NotifyRespInd;",
+                "Lcom/google/android/mms/pdu/ReadOrigInd;",
+                "Lcom/google/android/mms/pdu/ReadRecInd;",
+                "Lcom/google/android/mms/pdu/SendConf;",
+                "Lcom/google/android/mms/util/PduCache;",
+                "Lcom/google/android/mms/pdu/RetrieveConf;",
+                "Lcom/google/android/mms/pdu/SendReq;"
         );
+    private static final ImmutableSet<String> PERMISSION_CONTROLLER_APK_IN_APEX_BURNDOWN_LIST =
+            ImmutableSet.of(
+                "Lcom/android/modules/utils/build/SdkLevel;",
+                "Lcom/android/settingslib/RestrictedLockUtils;"
+            );
+    // TODO: b/223837599
+    private static final ImmutableSet<String> TETHERING_APK_IN_APEX_BURNDOWN_LIST =
+            ImmutableSet.of(
+                "Landroid/hidl/base/V1_0/DebugInfo;",
+                // /system/framework/services.jar
+                "Landroid/net/DataStallReportParcelable;",
+                "Landroid/net/DhcpResultsParcelable;",
+                "Landroid/net/INetd;",
+                "Landroid/net/INetdUnsolicitedEventListener;",
+                "Landroid/net/INetworkStackConnector;",
+                "Landroid/net/INetworkStackStatusCallback;",
+                "Landroid/net/InformationElementParcelable;",
+                "Landroid/net/InitialConfigurationParcelable;",
+                "Landroid/net/InterfaceConfigurationParcel;",
+                "Landroid/net/Layer2InformationParcelable;",
+                "Landroid/net/Layer2PacketParcelable;",
+                "Landroid/net/MarkMaskParcel;",
+                "Landroid/net/NativeNetworkConfig;",
+                "Landroid/net/NattKeepalivePacketDataParcelable;",
+                "Landroid/net/NetworkTestResultParcelable;",
+                "Landroid/net/PrivateDnsConfigParcel;",
+                "Landroid/net/ProvisioningConfigurationParcelable;",
+                "Landroid/net/RouteInfoParcel;",
+                "Landroid/net/ScanResultInfoParcelable;",
+                "Landroid/net/TcpKeepalivePacketDataParcelable;",
+                "Landroid/net/TetherConfigParcel;",
+                "Landroid/net/TetherOffloadRuleParcel;",
+                "Landroid/net/TetherStatsParcel;",
+                "Landroid/net/UidRangeParcel;",
+                "Landroid/net/dhcp/DhcpLeaseParcelable;",
+                "Landroid/net/dhcp/DhcpServingParamsParcel;",
+                "Landroid/net/dhcp/IDhcpEventCallbacks;",
+                "Landroid/net/dhcp/IDhcpServer;",
+                "Landroid/net/dhcp/IDhcpServerCallbacks;",
+                "Landroid/net/ipmemorystore/Blob;",
+                "Landroid/net/ipmemorystore/NetworkAttributesParcelable;",
+                "Landroid/net/ipmemorystore/SameL3NetworkResponseParcelable;",
+                "Landroid/net/ipmemorystore/StatusParcelable;",
+                "Landroid/net/netd/aidl/NativeUidRangeConfig;",
+                "Landroid/net/networkstack/aidl/NetworkMonitorParameters;",
+                "Landroid/net/networkstack/aidl/dhcp/DhcpOption;",
+                "Landroid/net/networkstack/aidl/ip/ReachabilityLossInfoParcelable;",
+                "Landroid/net/networkstack/aidl/quirks/IPv6ProvisioningLossQuirkParcelable;",
+                "Landroid/net/shared/NetdUtils;",
+                "Landroid/net/util/NetworkConstants;",
+                "Landroid/net/util/SharedLog;",
+                "Lcom/android/modules/utils/build/SdkLevel;",
+                ///system/framework/framework.jar
+                "Landroid/util/IndentingPrintWriter;",
+                "Lcom/android/internal/annotations/Keep;"
+            );
+    // TODO: b/223836161
+    private static final ImmutableSet<String> EXTSERVICES_APK_IN_APEX_BURNDOWN_LIST =
+            ImmutableSet.of(
+                ///system/framework/framework.jar
+                "Landroid/view/displayhash/DisplayHashResultCallback;",
+                "Landroid/view/displayhash/DisplayHash;",
+                "Landroid/view/displayhash/VerifiedDisplayHash;"
+            );
+    // TODO: b/223836163
+    private static final ImmutableSet<String> ODA_APK_IN_APEX_BURNDOWN_LIST =
+            ImmutableSet.of(
+                // /apex/com.android.ondevicepersonalization/javalib/framework-ondevicepersonalization.jar
+                "Landroid/ondevicepersonalization/aidl/IInitOnDevicePersonalizationCallback;",
+                "Landroid/ondevicepersonalization/aidl/IOnDevicePersonalizationManagerService;"
+            );
+    // TODO: b/223837017
+    private static final ImmutableSet<String> CELLBROADCAST_APK_IN_APEX_BURNDOWN_LIST =
+            ImmutableSet.of(
+                // /system/framework/telephony-common.jar
+                "Lcom/android/cellbroadcastservice/CellBroadcastStatsLog;",
+                // /system/framework/framework.jar
+                "Lcom/android/internal/util/IState;",
+                "Lcom/android/internal/util/StateMachine;",
+                "Lcom/android/internal/util/State;"
+            );
+    private static final ImmutableMap<String, ImmutableSet<String>> FULL_APK_IN_APEX_BURNDOWN =
+        new ImmutableMap.Builder<String, ImmutableSet<String>>()
+            .put("/apex/com.android.bluetooth/app/Bluetooth/Bluetooth.apk",
+                BLUETOOTH_APK_IN_APEX_BURNDOWN_LIST)
+            .put("/apex/com.android.permission/priv-app/PermissionController/PermissionController.apk",
+                PERMISSION_CONTROLLER_APK_IN_APEX_BURNDOWN_LIST)
+            .put("/apex/com.android.permission/priv-app/GooglePermissionController/GooglePermissionController.apk",
+                PERMISSION_CONTROLLER_APK_IN_APEX_BURNDOWN_LIST)
+            .put("/apex/com.android.tethering/priv-app/TetheringNextGoogle/TetheringNextGoogle.apk",
+                TETHERING_APK_IN_APEX_BURNDOWN_LIST)
+            .put("/apex/com.android.tethering/priv-app/TetheringGoogle/TetheringGoogle.apk",
+                TETHERING_APK_IN_APEX_BURNDOWN_LIST)
+            .put("/apex/com.android.tethering/priv-app/TetheringNext/TetheringNext.apk",
+                TETHERING_APK_IN_APEX_BURNDOWN_LIST)
+            .put("/apex/com.android.tethering/priv-app/Tethering/Tethering.apk",
+                TETHERING_APK_IN_APEX_BURNDOWN_LIST)
+            .put("/apex/com.android.extservices/priv-app/GoogleExtServices/GoogleExtServices.apk",
+                EXTSERVICES_APK_IN_APEX_BURNDOWN_LIST)
+            .put("/apex/com.android.extservices/priv-app/ExtServices/ExtServices.apk",
+                EXTSERVICES_APK_IN_APEX_BURNDOWN_LIST)
+            .put("/apex/com.android.ondevicepersonalization/app/OnDevicePersonalizationGoogle/OnDevicePersonalizationGoogle.apk",
+                ODA_APK_IN_APEX_BURNDOWN_LIST)
+            .put("/apex/com.android.ondevicepersonalization/app/OnDevicePersonalization/OnDevicePersonalization.apk",
+                ODA_APK_IN_APEX_BURNDOWN_LIST)
+            .put("/apex/com.android.cellbroadcast/priv-app/GoogleCellBroadcastServiceModule/GoogleCellBroadcastServiceModule.apk",
+                CELLBROADCAST_APK_IN_APEX_BURNDOWN_LIST)
+            .put("/apex/com.android.cellbroadcast/priv-app/CellBroadcastServiceModule/CellBroadcastServiceModule.apk",
+                CELLBROADCAST_APK_IN_APEX_BURNDOWN_LIST)
+            .build();
+    /**
+     * Fetch all jar files in BCP, SSCP and shared libs and extract all the classes.
+     *
+     * <p>This method cannot be static, as there are no static equivalents for {@link #getDevice()}
+     * and {@link #getBuild()}.
+     */
+    @BeforeClassWithInfo
+    public static void setupOnce(TestInformation testInfo) throws Exception {
+        if (testInfo.getDevice() == null || testInfo.getBuildInfo() == null) {
+            throw new RuntimeException("No device and/or build type specified!");
+        }
+        DeviceSdkLevel deviceSdkLevel = new DeviceSdkLevel(testInfo.getDevice());
+
+        sBootclasspathJars = Classpaths.getJarsOnClasspath(testInfo.getDevice(), BOOTCLASSPATH);
+        sSystemserverclasspathJars =
+                Classpaths.getJarsOnClasspath(testInfo.getDevice(), SYSTEMSERVERCLASSPATH);
+        sSharedLibs = deviceSdkLevel.isDeviceAtLeastS()
+                ? Classpaths.getSharedLibraryInfos(testInfo.getDevice(), testInfo.getBuildInfo())
+                : ImmutableList.of();
+        sSharedLibJars = sSharedLibs.stream()
+                .map(sharedLibraryInfo -> sharedLibraryInfo.paths)
+                .flatMap(ImmutableCollection::stream)
+                .filter(file -> doesFileExist(file, testInfo.getDevice()))
+                // GmsCore should not contribute to *classpath.
+                .filter(file -> !file.contains("GmsCore"))
+                .collect(ImmutableList.toImmutableList());
+
+        final ImmutableSetMultimap.Builder<String, String> jarsToClasses =
+                ImmutableSetMultimap.builder();
+        Stream.of(sBootclasspathJars.stream(),
+                        sSystemserverclasspathJars.stream(),
+                        sSharedLibJars.stream())
+                .reduce(Stream::concat).orElseGet(Stream::empty)
+                .parallel()
+                .forEach(jar -> {
+                    try {
+                        ImmutableSet<String> classes =
+                                Classpaths.getClassDefsFromJar(testInfo.getDevice(), jar).stream()
+                                        .map(ClassDef::getType)
+                                        // Inner classes always go with their parent.
+                                        .filter(className -> !className.contains("$"))
+                                        .collect(ImmutableSet.toImmutableSet());
+                        synchronized (jarsToClasses) {
+                            jarsToClasses.putAll(jar, classes);
+                        }
+                    } catch (DeviceNotAvailableException | IOException e) {
+                        throw new RuntimeException(e);
+                    }
+                });
+        sJarsToClasses = jarsToClasses.build();
+    }
+
+    @Before
+    public void setup() {
+        mDeviceSdkLevel = new DeviceSdkLevel(getDevice());
+    }
 
     /**
      * Ensure that there are no duplicate classes among jars listed in BOOTCLASSPATH.
      */
     @Test
     public void testBootclasspath_nonDuplicateClasses() throws Exception {
-        assumeTrue(ApiLevelUtil.isAfter(getDevice(), 29));
-        ImmutableList<String> jars =
-                Classpaths.getJarsOnClasspath(getDevice(), BOOTCLASSPATH);
-        assertThat(getDuplicateClasses(jars)).isEmpty();
+        assumeTrue(mDeviceSdkLevel.isDeviceAtLeastR());
+        assertThat(getDuplicateClasses(sBootclasspathJars)).isEmpty();
     }
 
     /**
@@ -238,9 +805,7 @@
      */
     @Test
     public void testSystemServerClasspath_nonDuplicateClasses() throws Exception {
-        assumeTrue(ApiLevelUtil.isAfter(getDevice(), 29));
-        ImmutableList<String> jars =
-                Classpaths.getJarsOnClasspath(getDevice(), SYSTEMSERVERCLASSPATH);
+        assumeTrue(mDeviceSdkLevel.isDeviceAtLeastR());
         ImmutableSet<String> overlapBurndownList;
         if (hasFeature(FEATURE_AUTOMOTIVE)) {
             overlapBurndownList = ImmutableSet.copyOf(AUTOMOTIVE_HIDL_OVERLAP_BURNDOWN_LIST);
@@ -249,7 +814,7 @@
         } else {
             overlapBurndownList = ImmutableSet.of();
         }
-        Multimap<String, String> duplicates = getDuplicateClasses(jars);
+        Multimap<String, String> duplicates = getDuplicateClasses(sSystemserverclasspathJars);
         Multimap<String, String> filtered = Multimaps.filterKeys(duplicates,
                 duplicate -> !overlapBurndownList.contains(duplicate));
 
@@ -262,10 +827,10 @@
      */
     @Test
     public void testBootClasspathAndSystemServerClasspath_nonDuplicateClasses() throws Exception {
-        assumeTrue(ApiLevelUtil.isAfter(getDevice(), 29));
+        assumeTrue(mDeviceSdkLevel.isDeviceAtLeastR());
         ImmutableList.Builder<String> jars = ImmutableList.builder();
-        jars.addAll(Classpaths.getJarsOnClasspath(getDevice(), BOOTCLASSPATH));
-        jars.addAll(Classpaths.getJarsOnClasspath(getDevice(), SYSTEMSERVERCLASSPATH));
+        jars.addAll(sBootclasspathJars);
+        jars.addAll(sSystemserverclasspathJars);
         ImmutableSet<String> overlapBurndownList;
         if (hasFeature(FEATURE_AUTOMOTIVE)) {
             overlapBurndownList = ImmutableSet.<String>builder()
@@ -290,13 +855,9 @@
      */
     @Test
     public void testBootClasspath_nonDuplicateApexJarClasses() throws Exception {
-        ImmutableList<String> jars =
-                Classpaths.getJarsOnClasspath(getDevice(), BOOTCLASSPATH);
-
-        Multimap<String, String> duplicates = getDuplicateClasses(jars);
+        Multimap<String, String> duplicates = getDuplicateClasses(sBootclasspathJars);
         Multimap<String, String> filtered =
                 Multimaps.filterValues(duplicates, jar -> jar.startsWith("/apex/"));
-
         assertThat(filtered).isEmpty();
     }
 
@@ -305,10 +866,7 @@
      */
     @Test
     public void testSystemServerClasspath_nonDuplicateApexJarClasses() throws Exception {
-        ImmutableList<String> jars =
-                Classpaths.getJarsOnClasspath(getDevice(), SYSTEMSERVERCLASSPATH);
-
-        Multimap<String, String> duplicates = getDuplicateClasses(jars);
+        Multimap<String, String> duplicates = getDuplicateClasses(sSystemserverclasspathJars);
         Multimap<String, String> filtered =
                 Multimaps.filterValues(duplicates, jar -> jar.startsWith("/apex/"));
 
@@ -323,8 +881,8 @@
     public void testBootClasspathAndSystemServerClasspath_nonApexDuplicateClasses()
             throws Exception {
         ImmutableList.Builder<String> jars = ImmutableList.builder();
-        jars.addAll(Classpaths.getJarsOnClasspath(getDevice(), BOOTCLASSPATH));
-        jars.addAll(Classpaths.getJarsOnClasspath(getDevice(), SYSTEMSERVERCLASSPATH));
+        jars.addAll(sBootclasspathJars);
+        jars.addAll(sSystemserverclasspathJars);
 
         Multimap<String, String> duplicates = getDuplicateClasses(jars.build());
         Multimap<String, String> filtered = Multimaps.filterKeys(duplicates,
@@ -335,34 +893,161 @@
     }
 
     /**
+     * Ensure that there are no duplicate classes among jars listed in BOOTCLASSPATH and
+     * shared library jars.
+     */
+    @Test
+    public void testBootClasspathAndSharedLibs_nonDuplicateClasses() throws Exception {
+        assumeTrue(mDeviceSdkLevel.isDeviceAtLeastS());
+        final ImmutableList.Builder<String> jars = ImmutableList.builder();
+        jars.addAll(sBootclasspathJars);
+        jars.addAll(sSharedLibJars);
+        final Multimap<String, String> duplicates = getDuplicateClasses(jars.build());
+        final Multimap<String, String> filtered = Multimaps.filterKeys(duplicates,
+                dupeClass -> {
+                    try {
+                        final Collection<String> dupeJars = duplicates.get(dupeClass);
+                        // Duplicate is already known.
+                        if (BCP_AND_SHARED_LIB_BURNDOWN_LIST.contains(dupeClass)) {
+                            return false;
+                        }
+                        // Duplicate is only between different versions of the same shared library.
+                        if (isSameLibrary(dupeJars)) {
+                            return false;
+                        }
+                        // Pre-T, the Android test mock library included some platform classes.
+                        if (!mDeviceSdkLevel.isDeviceAtLeastT()
+                                && dupeJars.contains(ANDROID_TEST_MOCK_JAR)) {
+                            return false;
+                        }
+                        // Different versions of the same library may have different names, and
+                        // there's
+                        // no reliable way to dedupe them. Ignore duplicates if they do not
+                        // include apex jars.
+                        if (dupeJars.stream().noneMatch(lib -> lib.startsWith("/apex/"))) {
+                            return false;
+                        }
+                    } catch (DeviceNotAvailableException e) {
+                        throw new RuntimeException(e);
+                    }
+                    return true;
+                });
+        assertThat(filtered).isEmpty();
+    }
+
+    /**
+     * Ensure that no apk-in-apex bundles classes that could be eclipsed by jars in
+     * BOOTCLASSPATH, SYSTEMSERVERCLASSPATH.
+     */
+    @Test
+    public void testApkInApex_nonClasspathClasses() throws Exception {
+        HashMultimap<String, Multimap<String, String>> perApkClasspathDuplicates =
+                HashMultimap.create();
+        Arrays.stream(collectApkInApexPaths())
+                .parallel()
+                .forEach(apk -> {
+                    try {
+                        final ImmutableSet<String> apkClasses =
+                                Classpaths.getClassDefsFromJar(getDevice(), apk).stream()
+                                        .map(ClassDef::getType)
+                                        .collect(ImmutableSet.toImmutableSet());
+                        // b/226559955: The directory paths containing APKs contain the build ID,
+                        // so strip out the @BUILD_ID portion.
+                        // e.g. /apex/com.android.bluetooth/app/Bluetooth@SC-DEV/Bluetooth.apk ->
+                        //      /apex/com.android.bluetooth/app/Bluetooth/Bluetooth.apk
+                        apk = apk.replaceFirst("@[^/]*", "");
+                        final ImmutableSet<String> burndownClasses =
+                                FULL_APK_IN_APEX_BURNDOWN.getOrDefault(apk, ImmutableSet.of());
+                        final Multimap<String, String> duplicates =
+                                Multimaps.filterValues(sJarsToClasses, apkClasses::contains);
+                        final Multimap<String, String> filteredDuplicates =
+                                Multimaps.filterValues(duplicates,
+                                    className -> !burndownClasses.contains(className)
+                                            // TODO: b/225341497
+                                            && !className.equals("Landroidx/annotation/Keep;"));
+                        if (!filteredDuplicates.isEmpty()) {
+                            synchronized (perApkClasspathDuplicates) {
+                                perApkClasspathDuplicates.put(apk, filteredDuplicates);
+                            }
+                        }
+                    } catch (Exception e) {
+                        throw new RuntimeException(e);
+                    }
+                });
+        assertThat(perApkClasspathDuplicates).isEmpty();
+    }
+
+    private String[] collectApkInApexPaths() {
+        try {
+            final CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(getBuild());
+            final String installError = getDevice().installPackage(
+                    buildHelper.getTestFile(TEST_HELPER_APK), false);
+            assertWithMessage("Failed to install %s due to: %s", TEST_HELPER_APK, installError)
+                    .that(installError).isNull();
+            runDeviceTests(new DeviceTestRunOptions(TEST_HELPER_PACKAGE)
+                    .setDevice(getDevice())
+                    .setTestClassName(TEST_HELPER_PACKAGE + ".ApexDeviceTest")
+                    .setTestMethodName("testCollectApkInApexPaths"));
+            final String remoteFile = "/sdcard/apk-in-apex-paths.txt";
+            String content;
+            try {
+                content = getDevice().pullFileContents(remoteFile);
+            } finally {
+                getDevice().deleteFile(remoteFile);
+            }
+            return content.split("\n");
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        } finally {
+            try {
+                getDevice().uninstallPackage(TEST_HELPER_PACKAGE);
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
+    /**
      * Gets the duplicate classes within a list of jar files.
      *
      * @param jars a list of jar files.
      * @return a multimap with the class name as a key and the jar files as a value.
      */
-    private Multimap<String, String> getDuplicateClasses(ImmutableCollection<String> jars)
-            throws Exception {
-        final Multimap<String, String> allClasses = HashMultimap.create();
-        for (String jar : jars) {
-            ImmutableSet<ClassDef> classes = Classpaths.getClassDefsFromJar(getDevice(), jar);
-            for (ClassDef classDef : classes) {
-                // No need to worry about inner classes, as they always go with their parent.
-                if (!classDef.getType().contains("$")) {
-                    allClasses.put(classDef.getType(), jar);
-                }
-            }
-        }
+    private Multimap<String, String> getDuplicateClasses(ImmutableCollection<String> jars) {
+        final HashMultimap<String, String> allClasses = HashMultimap.create();
+        Multimaps.invertFrom(Multimaps.filterKeys(sJarsToClasses, jars::contains), allClasses);
+        return Multimaps.filterKeys(allClasses, key -> allClasses.get(key).size() > 1);
+    }
 
-        final Multimap<String, String> duplicates = HashMultimap.create();
-        for (String clazz : allClasses.keySet()) {
-            Collection<String> jarsWithClazz = allClasses.get(clazz);
-            if (jarsWithClazz.size() > 1) {
-                CLog.i("Class %s is duplicated in %s", clazz, jarsWithClazz);
-                duplicates.putAll(clazz, jarsWithClazz);
-            }
+    private static boolean doesFileExist(String path, ITestDevice device) {
+        assertThat(path).isNotNull();
+        try {
+            return device.doesFileExist(path);
+        } catch (DeviceNotAvailableException e) {
+            throw new RuntimeException("Could not check whether " + path + " exists on device", e);
         }
+    }
 
-        return duplicates;
+    /**
+     * Get the name of a shared library.
+     *
+     * @return the shared library name or the jar's path if it's not a shared library.
+     */
+    private String getSharedLibraryNameOrPath(String jar) {
+        return sSharedLibs.stream()
+                .filter(sharedLib -> sharedLib.paths.contains(jar))
+                .map(sharedLib -> sharedLib.name)
+                .findFirst().orElse(jar);
+    }
+
+    /**
+     * Check whether a list of jars are all different versions of the same library.
+     */
+    private boolean isSameLibrary(Collection<String> jars) {
+        return jars.stream()
+                .map(this::getSharedLibraryNameOrPath)
+                .distinct()
+                .count() == 1;
     }
 
     private boolean hasFeature(String featureName) throws DeviceNotAvailableException {
diff --git a/hostsidetests/appsearch/Android.bp b/hostsidetests/appsearch/Android.bp
index 57a33b8..36a27d7 100644
--- a/hostsidetests/appsearch/Android.bp
+++ b/hostsidetests/appsearch/Android.bp
@@ -29,11 +29,12 @@
         "tools-common-prebuilt",
         "cts-tradefed",
         "tradefed",
-        "truth-prebuilt"
+        "truth-prebuilt",
     ],
     test_suites: [
         "cts",
         "general-tests",
+        "mts-appsearch",
     ],
 }
 
@@ -53,6 +54,7 @@
     test_suites: [
         "cts",
         "general-tests",
+        "mts-appsearch",
     ],
     manifest: "test-apps/AppSearchHostTestHelperA/AndroidManifest.xml",
     certificate: ":cts-appsearch-hosttest-helper-cert-a",
@@ -75,6 +77,7 @@
     test_suites: [
         "cts",
         "general-tests",
+        "mts-appsearch",
     ],
     manifest: "test-apps/AppSearchHostTestHelperB/AndroidManifest.xml",
     certificate: ":cts-appsearch-hosttest-helper-cert-b",
diff --git a/hostsidetests/appsearch/AndroidTest.xml b/hostsidetests/appsearch/AndroidTest.xml
index 229e352c..a538916 100644
--- a/hostsidetests/appsearch/AndroidTest.xml
+++ b/hostsidetests/appsearch/AndroidTest.xml
@@ -28,4 +28,8 @@
         <option name="test-file-name" value="CtsAppSearchHostTestHelperB.apk" />
         <option name="cleanup-apks" value="true" />
     </target_preparer>
+    <object type="module_controller"
+            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+        <option name="mainline-module-package-name" value="com.google.android.appsearch" />
+    </object>
 </configuration>
diff --git a/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchHostTestBase.java b/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchHostTestBase.java
index 203fa82..3580f20 100644
--- a/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchHostTestBase.java
+++ b/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchHostTestBase.java
@@ -27,12 +27,14 @@
 
 public abstract class AppSearchHostTestBase extends BaseHostJUnit4Test {
     protected static final String TARGET_APK_A = "CtsAppSearchHostTestHelperA.apk";
-    protected static final String TARGET_PKG_A = "android.appsearch.app.a";
+    protected static final String TARGET_PKG_A = "android.appsearch.app.helper_a";
     protected static final String TEST_CLASS_A = TARGET_PKG_A + ".AppSearchDeviceTest";
     protected static final String TEST_STORAGE_AUGMENTER_CLASS_A =
             TARGET_PKG_A + ".AppSearchStorageAugmenterDeviceTest";
+    protected static final String TEST_CONTACTS_INDEXER_CLASS_A =
+            TARGET_PKG_A + ".ContactsIndexerDeviceTest";
     protected static final String TARGET_APK_B = "CtsAppSearchHostTestHelperB.apk";
-    protected static final String TARGET_PKG_B = "android.appsearch.app.b";
+    protected static final String TARGET_PKG_B = "android.appsearch.app.helper_b";
     protected static final String TEST_CLASS_B = TARGET_PKG_B + ".AppSearchDeviceTest";
 
     protected static final String USER_ID_KEY = "userId";
@@ -67,6 +69,20 @@
                         testMethod, userId, DEFAULT_INSTRUMENTATION_TIMEOUT_MS)).isTrue();
     }
 
+    protected void runContactsIndexerDeviceTestAsUserInPkgA(@Nonnull String testMethod, int userId,
+            @Nonnull Map<String, String> args) throws Exception {
+        DeviceTestRunOptions deviceTestRunOptions = new DeviceTestRunOptions(TARGET_PKG_A)
+                .setTestClassName(TEST_CONTACTS_INDEXER_CLASS_A)
+                .setTestMethodName(testMethod)
+                .setMaxInstrumentationTimeoutMs(DEFAULT_INSTRUMENTATION_TIMEOUT_MS)
+                .setUserId(userId);
+        for (Map.Entry<String, String> entry : args.entrySet()) {
+            deviceTestRunOptions.addInstrumentationArg(entry.getKey(), entry.getValue());
+        }
+        assertWithMessage(testMethod + " failed").that(
+                runDeviceTests(deviceTestRunOptions)).isTrue();
+    }
+
     protected void runDeviceTestAsUserInPkgB(@Nonnull String testMethod, int userId)
             throws Exception {
         assertWithMessage(testMethod + " failed").that(
diff --git a/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchInstantAppTest.java b/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchInstantAppTest.java
index 24b65e3..cb12ab1 100644
--- a/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchInstantAppTest.java
+++ b/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchInstantAppTest.java
@@ -20,15 +20,12 @@
 
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
-import com.android.tradefed.testtype.junit4.DeviceTestRunOptions;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.util.Map;
-
 import javax.annotation.Nonnull;
 
 /**
@@ -46,7 +43,7 @@
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class AppSearchInstantAppTest extends BaseHostJUnit4Test {
     private static final String TARGET_APK_A = "CtsAppSearchHostTestHelperA.apk";
-    private static final String TARGET_PKG_A = "android.appsearch.app.a";
+    private static final String TARGET_PKG_A = "android.appsearch.app.helper_a";
     private static final String TEST_CLASS_A = TARGET_PKG_A + ".AppSearchInstantAppTest";
     private static final long DEFAULT_INSTRUMENTATION_TIMEOUT_MS = 600_000; // 10min
 
diff --git a/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchMultiUserTest.java b/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchMultiUserTest.java
index 33ccf39..b318d55 100644
--- a/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchMultiUserTest.java
+++ b/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchMultiUserTest.java
@@ -20,9 +20,11 @@
 
 import static org.junit.Assume.assumeTrue;
 
+import com.android.tradefed.invoker.TestInformation;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.AfterClassWithInfo;
+import com.android.tradefed.testtype.junit4.BeforeClassWithInfo;
 
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -45,79 +47,113 @@
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class AppSearchMultiUserTest extends AppSearchHostTestBase {
 
-    private int mInitialUserId;
-    private int mSecondaryUserId;
+    private static int sInitialUserId;
+    private static int sSecondaryUserId;
+
+    @BeforeClassWithInfo
+    public static void setUpClass(TestInformation testInfo) throws Exception {
+        assumeTrue("Multi-user is not supported on this device",
+                testInfo.getDevice().isMultiUserSupported());
+
+        sInitialUserId = testInfo.getDevice().getPrimaryUserId();
+        sSecondaryUserId = testInfo.getDevice().createUser("Test_User");
+        assertThat(testInfo.getDevice().startUser(sSecondaryUserId)).isTrue();
+    }
 
     @Before
     public void setUp() throws Exception {
-        assumeTrue("Multi-user is not supported on this device",
-                getDevice().isMultiUserSupported());
+        if (!getDevice().isUserRunning(sSecondaryUserId)) {
+            getDevice().startUser(sSecondaryUserId, /*waitFlag=*/true);
+        }
+        installPackageAsUser(TARGET_APK_A, /* grantPermission= */true, sInitialUserId);
+        installPackageAsUser(TARGET_APK_A, /* grantPermission= */true, sSecondaryUserId);
 
-        mInitialUserId = getDevice().getCurrentUser();
-        mSecondaryUserId = getDevice().createUser("Test_User");
-        assertThat(getDevice().startUser(mSecondaryUserId)).isTrue();
-
-        installPackageAsUser(TARGET_APK_A, /* grantPermission= */true, mInitialUserId);
-        installPackageAsUser(TARGET_APK_A, /* grantPermission= */true, mSecondaryUserId);
-
-        runDeviceTestAsUserInPkgA("clearTestData", mInitialUserId);
-        runDeviceTestAsUserInPkgA("clearTestData", mSecondaryUserId);
+        runDeviceTestAsUserInPkgA("clearTestData", sInitialUserId);
+        runDeviceTestAsUserInPkgA("clearTestData", sSecondaryUserId);
     }
 
-    @After
-    public void tearDown() throws Exception {
-        if (getDevice().getInstalledPackageNames().contains(TARGET_PKG_A)) {
-            runDeviceTestAsUserInPkgA("clearTestData", mInitialUserId);
-        }
-        if (mSecondaryUserId > 0) {
-            getDevice().removeUser(mSecondaryUserId);
+    @AfterClassWithInfo
+    public static void tearDownClass(TestInformation testInfo) throws Exception {
+        if (sSecondaryUserId > 0) {
+            testInfo.getDevice().removeUser(sSecondaryUserId);
         }
     }
 
     @Test
-    public void testMultiUser_documentAccess() throws Exception {
-        runDeviceTestAsUserInPkgA("testPutDocuments", mSecondaryUserId);
-        runDeviceTestAsUserInPkgA("testGetDocuments_exist", mSecondaryUserId);
+    public void testMultiUser_cantAccessOtherUsersData() throws Exception {
+        runDeviceTestAsUserInPkgA("testPutDocuments", sSecondaryUserId);
+        runDeviceTestAsUserInPkgA("testGetDocuments_exist", sSecondaryUserId);
         // Cannot get the document from another user.
-        runDeviceTestAsUserInPkgA("testGetDocuments_nonexist", mInitialUserId);
+        runDeviceTestAsUserInPkgA("testGetDocuments_nonexist", sInitialUserId);
+    }
+
+    @Test
+    public void testMultiUser_canInteractAsAnotherUser() throws Exception {
+        Map<String, String> args =
+                Collections.singletonMap(USER_ID_KEY, String.valueOf(sSecondaryUserId));
+
+        // We can do the normal set of operations while pretending to be another user.
+        runDeviceTestAsUserInPkgA("testPutDocumentsAsAnotherUser", sInitialUserId, args);
+        runDeviceTestAsUserInPkgA("testGetDocumentsAsAnotherUser_exist", sInitialUserId, args);
+    }
+
+    @Test
+    public void testCreateSessionInStoppedUser() throws Exception {
+        Map<String, String> args =
+                Collections.singletonMap(USER_ID_KEY, String.valueOf(sSecondaryUserId));
+        getDevice().stopUser(sSecondaryUserId, /*waitFlag=*/true, /*forceFlag=*/true);
+        runDeviceTestAsUserInPkgA("createSessionInStoppedUser", sInitialUserId, args);
     }
 
     @Test
     public void testStopUser_persistData() throws Exception {
-        runDeviceTestAsUserInPkgA("testPutDocuments", mSecondaryUserId);
-        runDeviceTestAsUserInPkgA("testGetDocuments_exist", mSecondaryUserId);
-        getDevice().stopUser(mSecondaryUserId, /*waitFlag=*/true, /*forceFlag=*/true);
-        getDevice().startUser(mSecondaryUserId, /*waitFlag=*/true);
-        runDeviceTestAsUserInPkgA("testGetDocuments_exist", mSecondaryUserId);
+        runDeviceTestAsUserInPkgA("testPutDocuments", sSecondaryUserId);
+        runDeviceTestAsUserInPkgA("testGetDocuments_exist", sSecondaryUserId);
+        getDevice().stopUser(sSecondaryUserId, /*waitFlag=*/true, /*forceFlag=*/true);
+        getDevice().startUser(sSecondaryUserId, /*waitFlag=*/true);
+        runDeviceTestAsUserInPkgA("testGetDocuments_exist", sSecondaryUserId);
     }
 
     @Test
     public void testPackageUninstall_onLockedUser() throws Exception {
-        installPackageAsUser(TARGET_APK_B, /* grantPermission= */true, mSecondaryUserId);
+        installPackageAsUser(TARGET_APK_B, /* grantPermission= */true, sSecondaryUserId);
         // package A grants visibility to package B.
-        runDeviceTestAsUserInPkgA("testPutDocuments", mSecondaryUserId);
+        runDeviceTestAsUserInPkgA("testPutDocuments", sSecondaryUserId);
         // query the document from another package.
-        runDeviceTestAsUserInPkgB("testGlobalGetDocuments_exist", mSecondaryUserId);
-        getDevice().stopUser(mSecondaryUserId, /*waitFlag=*/true, /*forceFlag=*/true);
+        runDeviceTestAsUserInPkgB("testGlobalGetDocuments_exist", sSecondaryUserId);
+        getDevice().stopUser(sSecondaryUserId, /*waitFlag=*/true, /*forceFlag=*/true);
         uninstallPackage(TARGET_PKG_A);
-        getDevice().startUser(mSecondaryUserId, /*waitFlag=*/true);
-        runDeviceTestAsUserInPkgB("testGlobalGetDocuments_nonexist", mSecondaryUserId);
+        getDevice().startUser(sSecondaryUserId, /*waitFlag=*/true);
+        // Max waiting time is 5 second.
+        for (int i = 0; i < 5; i++) {
+            try {
+                // query the document from another package, verify the document of package A is
+                // removed
+                runDeviceTestAsUserInPkgB("testGlobalGetDocuments_nonexist", sSecondaryUserId);
+                // The test is passed.
+                return;
+            } catch (AssertionError e) {
+                // The package hasn't uninstalled yet, sleeping 1s before polling again.
+                Thread.sleep(1000);
+            }
+        }
+        throw new AssertionError("Failed to prune package data after 5 seconds");
     }
 
     @Test
     public void testReadStorageInfoFromFile() throws Exception {
-        runDeviceTestAsUserInPkgA("testPutDocuments", mSecondaryUserId);
+        runDeviceTestAsUserInPkgA("testPutDocuments", sSecondaryUserId);
 
-        getDevice().stopUser(mSecondaryUserId, /*waitFlag=*/true, /*forceFlag=*/true);
-        getDevice().startUser(mSecondaryUserId, /*waitFlag=*/true);
+        getDevice().stopUser(sSecondaryUserId, /*waitFlag=*/true, /*forceFlag=*/true);
+        getDevice().startUser(sSecondaryUserId, /*waitFlag=*/true);
         // Write user's storage info into file while initializing AppSearchImpl.
-        runStorageAugmenterDeviceTestAsUserInPkgA("connectToAppSearch", mSecondaryUserId);
+        runStorageAugmenterDeviceTestAsUserInPkgA("connectToAppSearch", sSecondaryUserId);
 
         // Disconnect user from AppSearch. While AppSearchImpl doesn't exist for the user, user's
         // storage info would be read from file.
-        getDevice().stopUser(mSecondaryUserId, /*waitFlag=*/true, /*forceFlag=*/true);
-        getDevice().startUser(mSecondaryUserId, /*waitFlag=*/true);
+        getDevice().stopUser(sSecondaryUserId, /*waitFlag=*/true, /*forceFlag=*/true);
+        getDevice().startUser(sSecondaryUserId, /*waitFlag=*/true);
 
-        runStorageAugmenterDeviceTestAsUserInPkgA("testReadStorageInfo", mSecondaryUserId);
+        runStorageAugmenterDeviceTestAsUserInPkgA("testReadStorageInfo", sSecondaryUserId);
     }
 }
diff --git a/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchPackageTest.java b/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchPackageTest.java
index d115955..382c6e9 100644
--- a/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchPackageTest.java
+++ b/hostsidetests/appsearch/src/android/appsearch/cts/AppSearchPackageTest.java
@@ -62,8 +62,20 @@
         runDeviceTestAsUserInPkgB("testGlobalGetDocuments_exist", mPrimaryUserId);
         // remove the package.
         uninstallPackage(TARGET_PKG_A);
-        // query the document from another package, verify the document of package A is removed
-        runDeviceTestAsUserInPkgB("testGlobalGetDocuments_nonexist", mPrimaryUserId);
+        // Max waiting time is 5 second.
+        for (int i = 0; i < 5; i++) {
+            try {
+                // query the document from another package, verify the document of package A is
+                // removed
+                runDeviceTestAsUserInPkgB("testGlobalGetDocuments_nonexist", mPrimaryUserId);
+                // The test is passed.
+                return;
+            } catch (AssertionError e) {
+                // The package hasn't uninstalled yet, sleeping 1s before polling again.
+                Thread.sleep(1000);
+            }
+        }
+        throw new AssertionError("Failed to prune package data after 5 seconds");
     }
 
     @Test
@@ -71,6 +83,11 @@
         runDeviceTestAsUserInPkgA("testPutDocuments", mPrimaryUserId);
         runDeviceTestAsUserInPkgA("closeAndFlush", mPrimaryUserId);
         runDeviceTestAsUserInPkgA("testGetDocuments_exist", mPrimaryUserId);
+        // We won't be able to verify the uninstall is not done before we reboot the device.
+        // This test is a safety that we could prune dead package data when we unlock the user. Any
+        // flaky in the testGetDocuments_nonexist assert means we have a problem.
+        // We have AppSearchMultiUserTest.testPackageUninstall_onLockedUser and unit test
+        // AppSearchImplTest.testPrunePackageData() to cover the same functionality.
         uninstallPackage(TARGET_PKG_A);
         // When test locally, if your test device doesn't support rebootUserspace(), you need to
         // manually unlock your device screen after it got fully rebooted. Or remove your screen
diff --git a/hostsidetests/appsearch/src/android/appsearch/cts/ContactsIndexerMultiUserTest.java b/hostsidetests/appsearch/src/android/appsearch/cts/ContactsIndexerMultiUserTest.java
new file mode 100644
index 0000000..6ebd2b1
--- /dev/null
+++ b/hostsidetests/appsearch/src/android/appsearch/cts/ContactsIndexerMultiUserTest.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2022 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 android.appsearch.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tradefed.invoker.TestInformation;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.AfterClassWithInfo;
+import com.android.tradefed.testtype.junit4.BeforeClassWithInfo;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Collections;
+
+/**
+ * Test to cover multi-user CP2 contacts indexing into AppSearch.
+ *
+ * <p>Unlock your device when testing locally.
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class ContactsIndexerMultiUserTest extends AppSearchHostTestBase {
+
+    private static int sSecondaryUserId;
+    private static int sTertiaryUserId;
+
+    @BeforeClassWithInfo
+    public static void setUpClass(TestInformation testInfo) throws Exception {
+        assumeTrue("Multi-user is not supported on this device",
+                testInfo.getDevice().isMultiUserSupported());
+
+        sSecondaryUserId = testInfo.getDevice().createUser("Test User #1");
+        assertThat(testInfo.getDevice().startUser(sSecondaryUserId)).isTrue();
+        sTertiaryUserId = testInfo.getDevice().createUser("Test User #2");
+        assertThat(testInfo.getDevice().startUser(sTertiaryUserId)).isTrue();
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        if (!getDevice().isUserRunning(sSecondaryUserId)) {
+            getDevice().startUser(sSecondaryUserId, /*waitFlag=*/ true);
+        }
+        if (!getDevice().isUserRunning(sTertiaryUserId)) {
+            getDevice().startUser(sTertiaryUserId, /*waitFlag=*/ true);
+        }
+        installPackageAsUser(TARGET_APK_A, /*grantPermission=*/ true, sSecondaryUserId);
+        installPackageAsUser(TARGET_APK_A, /*grantPermission=*/ true, sTertiaryUserId);
+    }
+
+    @AfterClassWithInfo
+    public static void tearDownClass(TestInformation testInfo) throws Exception {
+        if (sSecondaryUserId > 0) {
+            testInfo.getDevice().removeUser(sSecondaryUserId);
+        }
+        if (sTertiaryUserId > 0) {
+            testInfo.getDevice().removeUser(sTertiaryUserId);
+        }
+    }
+
+    @Test
+    public void testMultiUser_scheduleMultipleFullUpdateJobs() throws Exception {
+        runContactsIndexerDeviceTestAsUserInPkgA("testFullUpdateJobIsScheduled",
+                sSecondaryUserId,
+                Collections.singletonMap(USER_ID_KEY, String.valueOf(sSecondaryUserId)));
+        runContactsIndexerDeviceTestAsUserInPkgA("testFullUpdateJobIsScheduled",
+                sTertiaryUserId,
+                Collections.singletonMap(USER_ID_KEY, String.valueOf(sTertiaryUserId)));
+    }
+}
diff --git a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/AndroidManifest.xml b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/AndroidManifest.xml
index 02545a7..615da3e 100644
--- a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/AndroidManifest.xml
+++ b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/AndroidManifest.xml
@@ -15,12 +15,12 @@
  * limitations under the License.
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.appsearch.app.a">
+    package="android.appsearch.app.helper_a">
     <application>
         <uses-library android:name="android.test.runner" />
     </application>
 
     <instrumentation
         android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="android.appsearch.app.a"  />
+        android:targetPackage="android.appsearch.app.helper_a"  />
 </manifest>
\ No newline at end of file
diff --git a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/a/AppSearchDeviceTest.java b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/a/AppSearchDeviceTest.java
deleted file mode 100644
index b1f2293..0000000
--- a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/a/AppSearchDeviceTest.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2021 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 android.appsearch.app.a;
-
-import static com.android.server.appsearch.testing.AppSearchTestUtils.checkIsBatchResultSuccess;
-import static com.android.server.appsearch.testing.AppSearchTestUtils.doGet;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.testng.Assert.expectThrows;
-
-import android.app.UiAutomation;
-import android.app.appsearch.AppSearchBatchResult;
-import android.app.appsearch.AppSearchManager;
-import android.app.appsearch.AppSearchResult;
-import android.app.appsearch.AppSearchSchema;
-import android.app.appsearch.AppSearchSessionShim;
-import android.app.appsearch.GenericDocument;
-import android.app.appsearch.GetByDocumentIdRequest;
-import android.app.appsearch.PackageIdentifier;
-import android.app.appsearch.PutDocumentsRequest;
-import android.app.appsearch.SetSchemaRequest;
-import android.os.Bundle;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import com.android.server.appsearch.testing.AppSearchSessionShimImpl;
-
-import com.google.common.io.BaseEncoding;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-@RunWith(AndroidJUnit4.class)
-public class AppSearchDeviceTest {
-
-    private static final String DB_NAME = "";
-    private static final String NAMESPACE = "namespace";
-    private static final String ID = "id";
-    private static final String USER_ID_KEY = "userId";
-    private static final AppSearchSchema SCHEMA = new AppSearchSchema.Builder("testSchema")
-            .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("subject")
-                    .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_OPTIONAL)
-                    .setIndexingType(
-                            AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
-                    .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
-                    .build())
-            .build();
-    private static final GenericDocument DOCUMENT =
-            new GenericDocument.Builder<>(NAMESPACE, ID, SCHEMA.getSchemaType())
-                    .setPropertyString("subject", "testPut example1")
-                    .setCreationTimestampMillis(12345L)
-                    .build();
-
-    private static final String PKG_B = "android.appsearch.app.b";
-
-    // To generate, run `apksigner` on the build APK. e.g.
-    //   ./apksigner verify --print-certs \
-    //   ~/sc-dev/out/soong/.intermediates/cts/tests/appsearch/CtsAppSearchTestHelperA/\
-    //   android_common/CtsAppSearchTestHelperA.apk`
-    // to get the SHA-256 digest. All characters need to be uppercase.
-    //
-    // Note: May need to switch the "sdk_version" of the test app from "test_current" to "30" before
-    // building the apk and running apksigner
-    private static final byte[] PKG_B_CERT_SHA256 = BaseEncoding.base16().decode(
-            "3D7A1AAE7AE8B9949BE93E071F3702AA38695B0F99B5FC4B2E8B364AC78FFDB2");
-
-    private AppSearchSessionShim mDb;
-    private UiAutomation mUiAutomation;
-
-    @Before
-    public void setUp() throws Exception {
-        mDb = AppSearchSessionShimImpl.createSearchSession(
-                new AppSearchManager.SearchContext.Builder(DB_NAME).build()).get();
-        mUiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
-    }
-
-    @Test
-    public void testPutDocuments() throws Exception {
-        // Schema registration
-        mDb.setSchema(new SetSchemaRequest.Builder().addSchemas(SCHEMA)
-                .setSchemaTypeVisibilityForPackage(SCHEMA.getSchemaType(), /*visible=*/ true,
-                        new PackageIdentifier(PKG_B, PKG_B_CERT_SHA256)).build()).get();
-
-        // Index a document
-        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(
-                mDb.put(new PutDocumentsRequest.Builder().addGenericDocuments(DOCUMENT).build()));
-        assertThat(result.getSuccesses()).containsExactly(ID, /*v0=*/null);
-        assertThat(result.getFailures()).isEmpty();
-    }
-
-    @Test
-    public void testGetDocuments_exist() throws Exception {
-        List<GenericDocument> outDocuments = doGet(mDb, NAMESPACE, ID);
-        assertThat(outDocuments).containsExactly(DOCUMENT);
-    }
-
-    @Test
-    public void closeAndFlush() {
-        mDb.close();
-    }
-
-    @Test
-    public void testGetDocuments_nonexist() throws Exception {
-        AppSearchBatchResult<String, GenericDocument> getResult = mDb.getByDocumentId(
-                new GetByDocumentIdRequest.Builder(NAMESPACE).addIds(ID).build()).get();
-        assertThat(getResult.getFailures().get(ID).getResultCode())
-                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
-    }
-
-    /**
-     * Clear generated data during the test.
-     *
-     * <p>Device side tests will be a part of host side test. We should clear the test data in the
-     * host side tearDown only. Otherwise, it will wipe the data in the middle of a host side test.
-     */
-    @Test
-    public void clearTestData() throws Exception {
-        mDb.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
-    }
-}
diff --git a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/a/AppSearchInstantAppTest.java b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/a/AppSearchInstantAppTest.java
deleted file mode 100644
index d397fc5..0000000
--- a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/a/AppSearchInstantAppTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2021 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 android.appsearch.app.a;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.testng.Assert.expectThrows;
-
-import android.app.appsearch.AppSearchManager;
-import android.content.Context;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import com.android.server.appsearch.testing.AppSearchSessionShimImpl;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.concurrent.ExecutionException;
-
-@RunWith(AndroidJUnit4.class)
-public class AppSearchInstantAppTest {
-
-    private static final String DB_NAME = "";
-
-    @Test
-    public void testInstantAppDoesntHaveAccess() {
-        Context context = InstrumentationRegistry.getInstrumentation().getContext();
-        assertThat(context.getPackageManager().isInstantApp()).isTrue();
-
-        int userId = context.getUserId();
-        ExecutionException exception = expectThrows(ExecutionException.class, () ->
-                AppSearchSessionShimImpl.createSearchSession(
-                        new AppSearchManager.SearchContext.Builder(DB_NAME).build(),
-                        userId).get());
-        assertThat(exception.getMessage()).contains(
-                "AppSearchResult is a failure: [FAILURE(8)]: SecurityException: Caller not allowed "
-                        + "to create AppSearch session");
-    }
-}
diff --git a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/a/AppSearchStorageAugmenterDeviceTest.java b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/a/AppSearchStorageAugmenterDeviceTest.java
deleted file mode 100644
index 3e91498..0000000
--- a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/a/AppSearchStorageAugmenterDeviceTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2021 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 android.appsearch.app.a;
-
-import static android.os.storage.StorageManager.UUID_DEFAULT;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.appsearch.AppSearchManager;
-import android.app.usage.StorageStats;
-import android.app.usage.StorageStatsManager;
-import android.content.Context;
-import android.os.UserHandle;
-
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.server.appsearch.testing.AppSearchSessionShimImpl;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class AppSearchStorageAugmenterDeviceTest {
-
-    @Test
-    public void connectToAppSearch() throws Exception {
-        AppSearchSessionShimImpl.createSearchSession(
-                new AppSearchManager.SearchContext.Builder("dbName").build()).get();
-    }
-
-    @Test
-    public void testReadStorageInfo() throws Exception {
-        Context context = ApplicationProvider.getApplicationContext();
-        StorageStatsManager storageStatsManager =
-                context.getSystemService(StorageStatsManager.class);
-        String packageName = context.getPackageName();
-        UserHandle user = context.getUser();
-        int uid = android.os.Process.myUid();
-
-        // Query the storage info through AppSearchStorageStatsAugmenter.
-        StorageStats statsForPkg =
-                storageStatsManager.queryStatsForPackage(UUID_DEFAULT, packageName, user);
-        StorageStats statsForUid = storageStatsManager.queryStatsForUid(UUID_DEFAULT, uid);
-
-        assertThat(statsForPkg.getDataBytes()).isGreaterThan(0);
-        assertThat(statsForUid.getDataBytes()).isGreaterThan(0);
-    }
-}
diff --git a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/helper_a/AppSearchDeviceTest.java b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/helper_a/AppSearchDeviceTest.java
new file mode 100644
index 0000000..c58bbaf
--- /dev/null
+++ b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/helper_a/AppSearchDeviceTest.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2022 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 android.appsearch.app.helper_a;
+
+import static android.app.appsearch.testutil.AppSearchTestUtils.checkIsBatchResultSuccess;
+import static android.app.appsearch.testutil.AppSearchTestUtils.doGet;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.testng.Assert.expectThrows;
+
+import android.Manifest;
+import android.app.UiAutomation;
+import android.app.appsearch.AppSearchBatchResult;
+import android.app.appsearch.AppSearchManager;
+import android.app.appsearch.AppSearchResult;
+import android.app.appsearch.AppSearchSchema;
+import android.app.appsearch.AppSearchSessionShim;
+import android.app.appsearch.GenericDocument;
+import android.app.appsearch.GetByDocumentIdRequest;
+import android.app.appsearch.PackageIdentifier;
+import android.app.appsearch.PutDocumentsRequest;
+import android.app.appsearch.SetSchemaRequest;
+import android.app.appsearch.testutil.AppSearchSessionShimImpl;
+import android.os.Bundle;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.google.common.io.BaseEncoding;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+@RunWith(AndroidJUnit4.class)
+public class AppSearchDeviceTest {
+
+    private static final String DB_NAME = "";
+    private static final String NAMESPACE = "namespace";
+    private static final String ID = "id";
+    private static final String USER_ID_KEY = "userId";
+    private static final AppSearchSchema SCHEMA = new AppSearchSchema.Builder("testSchema")
+            .addProperty(new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                    .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_OPTIONAL)
+                    .setIndexingType(
+                            AppSearchSchema.StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                    .setTokenizerType(AppSearchSchema.StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                    .build())
+            .build();
+    private static final GenericDocument DOCUMENT =
+            new GenericDocument.Builder<>(NAMESPACE, ID, SCHEMA.getSchemaType())
+                    .setPropertyString("subject", "testPut example1")
+                    .setCreationTimestampMillis(12345L)
+                    .build();
+
+    private static final String PKG_B = "android.appsearch.app.helper_b";
+
+    // To generate, run `apksigner` on the build APK. e.g.
+    //   ./apksigner verify --print-certs \
+    //   ~/sc-dev/out/soong/.intermediates/cts/tests/appsearch/CtsAppSearchTestHelperA/\
+    //   android_common/CtsAppSearchTestHelperA.apk`
+    // to get the SHA-256 digest. All characters need to be uppercase.
+    //
+    // Note: May need to switch the "sdk_version" of the test app from "test_current" to "30" before
+    // building the apk and running apksigner
+    private static final byte[] PKG_B_CERT_SHA256 = BaseEncoding.base16().decode(
+            "3D7A1AAE7AE8B9949BE93E071F3702AA38695B0F99B5FC4B2E8B364AC78FFDB2");
+
+    private AppSearchSessionShim mDb;
+    private UiAutomation mUiAutomation;
+
+    @Before
+    public void setUp() throws Exception {
+        mDb = AppSearchSessionShimImpl.createSearchSessionAsync(
+                new AppSearchManager.SearchContext.Builder(DB_NAME).build()).get();
+        mUiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+    }
+
+    @Test
+    public void testPutDocuments() throws Exception {
+        // Schema registration
+        mDb.setSchema(new SetSchemaRequest.Builder().addSchemas(SCHEMA)
+                .setSchemaTypeVisibilityForPackage(SCHEMA.getSchemaType(), /*visible=*/ true,
+                        new PackageIdentifier(PKG_B, PKG_B_CERT_SHA256)).build()).get();
+
+        // Index a document
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(
+                mDb.put(new PutDocumentsRequest.Builder().addGenericDocuments(DOCUMENT).build()));
+        assertThat(result.getSuccesses()).containsExactly(ID, /*v0=*/null);
+        assertThat(result.getFailures()).isEmpty();
+    }
+
+    @Test
+    public void testPutDocumentsAsAnotherUser() throws Exception {
+        mUiAutomation.adoptShellPermissionIdentity(Manifest.permission.INTERACT_ACROSS_USERS_FULL);
+        try {
+            Bundle args = InstrumentationRegistry.getArguments();
+            int userId = Integer.parseInt(args.getString(USER_ID_KEY));
+
+            // Initialize as other user
+            AppSearchSessionShim db = AppSearchSessionShimImpl.createSearchSessionAsync(
+                    new AppSearchManager.SearchContext.Builder(DB_NAME).build(),
+                    userId).get();
+
+            // Schema registration
+            db.setSchema(new SetSchemaRequest.Builder().addSchemas(SCHEMA)
+                    .setSchemaTypeVisibilityForPackage(SCHEMA.getSchemaType(), /*visible=*/ true,
+                            new PackageIdentifier(PKG_B, PKG_B_CERT_SHA256)).build()).get();
+
+            // Index a document
+            AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(
+                    db.put(new PutDocumentsRequest.Builder().addGenericDocuments(DOCUMENT)
+                            .build()));
+            assertThat(result.getSuccesses()).containsExactly(ID, /*v0=*/null);
+            assertThat(result.getFailures()).isEmpty();
+
+        } finally {
+            mUiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testGetDocuments_exist() throws Exception {
+        List<GenericDocument> outDocuments = doGet(mDb, NAMESPACE, ID);
+        assertThat(outDocuments).containsExactly(DOCUMENT);
+    }
+
+    @Test
+    public void testGetDocumentsAsAnotherUser_exist() throws Exception {
+        mUiAutomation.adoptShellPermissionIdentity(Manifest.permission.INTERACT_ACROSS_USERS_FULL);
+        try {
+            Bundle args = InstrumentationRegistry.getArguments();
+            int userId = Integer.parseInt(args.getString(USER_ID_KEY));
+
+            // Initialize as other user
+            AppSearchSessionShim db = AppSearchSessionShimImpl.createSearchSessionAsync(
+                    new AppSearchManager.SearchContext.Builder(DB_NAME).build(),
+                    userId).get();
+
+            // Get documents
+            List<GenericDocument> outDocuments = doGet(db, NAMESPACE, ID);
+            assertThat(outDocuments).containsExactly(DOCUMENT);
+        } finally {
+            mUiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void closeAndFlush() {
+        mDb.close();
+    }
+
+    @Test
+    public void testGetDocuments_nonexist() throws Exception {
+        AppSearchBatchResult<String, GenericDocument> getResult = mDb.getByDocumentId(
+                new GetByDocumentIdRequest.Builder(NAMESPACE).addIds(ID).build()).get();
+        assertThat(getResult.getFailures().get(ID).getResultCode())
+                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
+    }
+
+    /**
+     * Clear generated data during the test.
+     *
+     * <p>Device side tests will be a part of host side test. We should clear the test data in the
+     * host side tearDown only. Otherwise, it will wipe the data in the middle of a host side test.
+     */
+    @Test
+    public void clearTestData() throws Exception {
+        mDb.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
+    }
+
+    @Test
+    public void createSessionInStoppedUser() {
+        mUiAutomation.adoptShellPermissionIdentity(Manifest.permission.INTERACT_ACROSS_USERS_FULL);
+        try {
+            Bundle args = InstrumentationRegistry.getArguments();
+            int userId = Integer.parseInt(args.getString(USER_ID_KEY));
+            ExecutionException exception = expectThrows(ExecutionException.class, () ->
+                    AppSearchSessionShimImpl.createSearchSessionAsync(
+                            new AppSearchManager.SearchContext.Builder(DB_NAME).build(),
+                            userId).get());
+            assertThat(exception.getMessage()).contains("is locked or not running.");
+        } finally {
+            mUiAutomation.dropShellPermissionIdentity();
+        }
+    }
+}
diff --git a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/helper_a/AppSearchInstantAppTest.java b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/helper_a/AppSearchInstantAppTest.java
new file mode 100644
index 0000000..4eedd00
--- /dev/null
+++ b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/helper_a/AppSearchInstantAppTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2022 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 android.appsearch.app.helper_a;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.testng.Assert.expectThrows;
+
+import android.app.appsearch.AppSearchManager;
+import android.app.appsearch.testutil.AppSearchSessionShimImpl;
+import android.content.Context;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.ExecutionException;
+
+@RunWith(AndroidJUnit4.class)
+public class AppSearchInstantAppTest {
+
+    private static final String DB_NAME = "";
+
+    @Test
+    public void testInstantAppDoesntHaveAccess() {
+        Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        assertThat(context.getPackageManager().isInstantApp()).isTrue();
+
+        int userId = context.getUserId();
+        ExecutionException exception = expectThrows(ExecutionException.class, () ->
+                AppSearchSessionShimImpl.createSearchSessionAsync(
+                        new AppSearchManager.SearchContext.Builder(DB_NAME).build(),
+                        userId).get());
+        assertThat(exception.getMessage()).contains(
+                "AppSearchResult is a failure: [FAILURE(8)]: SecurityException: Caller not allowed "
+                        + "to create AppSearch session");
+    }
+}
diff --git a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/helper_a/AppSearchStorageAugmenterDeviceTest.java b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/helper_a/AppSearchStorageAugmenterDeviceTest.java
new file mode 100644
index 0000000..a9ed3c6
--- /dev/null
+++ b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/helper_a/AppSearchStorageAugmenterDeviceTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2022 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 android.appsearch.app.helper_a;
+
+import static android.os.storage.StorageManager.UUID_DEFAULT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.appsearch.AppSearchManager;
+import android.app.appsearch.testutil.AppSearchSessionShimImpl;
+import android.app.usage.StorageStats;
+import android.app.usage.StorageStatsManager;
+import android.content.Context;
+import android.os.UserHandle;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class AppSearchStorageAugmenterDeviceTest {
+
+    @Test
+    public void connectToAppSearch() throws Exception {
+        AppSearchSessionShimImpl.createSearchSessionAsync(
+                new AppSearchManager.SearchContext.Builder("dbName").build()).get();
+    }
+
+    @Test
+    public void testReadStorageInfo() throws Exception {
+        Context context = ApplicationProvider.getApplicationContext();
+        StorageStatsManager storageStatsManager =
+                context.getSystemService(StorageStatsManager.class);
+        String packageName = context.getPackageName();
+        UserHandle user = context.getUser();
+        int uid = android.os.Process.myUid();
+
+        // Query the storage info through AppSearchStorageStatsAugmenter.
+        StorageStats statsForPkg =
+                storageStatsManager.queryStatsForPackage(UUID_DEFAULT, packageName, user);
+        StorageStats statsForUid = storageStatsManager.queryStatsForUid(UUID_DEFAULT, uid);
+
+        assertThat(statsForPkg.getDataBytes()).isGreaterThan(0);
+        assertThat(statsForUid.getDataBytes()).isGreaterThan(0);
+    }
+}
diff --git a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/helper_a/ContactsIndexerDeviceTest.java b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/helper_a/ContactsIndexerDeviceTest.java
new file mode 100644
index 0000000..3dbd8fa
--- /dev/null
+++ b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperA/src/android/appsearch/app/helper_a/ContactsIndexerDeviceTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2022 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 android.appsearch.app.helper_a;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.UiAutomation;
+import android.os.Bundle;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ContactsIndexerDeviceTest {
+
+    private static final int MIN_INDEXER_JOB_ID = 16942831;
+    private static final String USER_ID_KEY = "userId";
+
+    private UiAutomation mUiAutomation;
+
+    @Before
+    public void setUp() throws Exception {
+        mUiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+    }
+
+    @Test
+    public void testFullUpdateJobIsScheduled() throws Exception {
+        mUiAutomation.adoptShellPermissionIdentity();
+        try {
+            Bundle args = InstrumentationRegistry.getArguments();
+            int userId = Integer.parseInt(args.getString(USER_ID_KEY));
+            int jobId = MIN_INDEXER_JOB_ID + userId;
+            assertJobWaiting(jobId);
+        } finally {
+            mUiAutomation.dropShellPermissionIdentity();
+        }
+
+    }
+
+    private String getJobState(int jobId) throws Exception {
+        return SystemUtil.runShellCommand(mUiAutomation,
+                "cmd jobscheduler get-job-state android " + jobId).trim();
+
+    }
+
+    private void assertJobWaiting(int jobId) throws Exception {
+        assertThat(getJobState(jobId)).contains("waiting");
+    }
+}
diff --git a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperB/AndroidManifest.xml b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperB/AndroidManifest.xml
index e036572..db1ad00 100644
--- a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperB/AndroidManifest.xml
+++ b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperB/AndroidManifest.xml
@@ -15,12 +15,12 @@
  * limitations under the License.
  -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.appsearch.app.b">
+    package="android.appsearch.app.helper_b">
     <application>
         <uses-library android:name="android.test.runner" />
     </application>
 
     <instrumentation
         android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="android.appsearch.app.b"  />
+        android:targetPackage="android.appsearch.app.helper_b"  />
 </manifest>
\ No newline at end of file
diff --git a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperB/src/android/appsearch/app/b/AppSearchDeviceTest.java b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperB/src/android/appsearch/app/b/AppSearchDeviceTest.java
deleted file mode 100644
index fa9132d..0000000
--- a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperB/src/android/appsearch/app/b/AppSearchDeviceTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2021 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 android.appsearch.app.b;
-
-import static com.android.server.appsearch.testing.AppSearchTestUtils.convertSearchResultsToDocuments;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.appsearch.GenericDocument;
-import android.app.appsearch.GlobalSearchSessionShim;
-import android.app.appsearch.SearchSpec;
-
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-
-import com.android.server.appsearch.testing.GlobalSearchSessionShimImpl;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-@RunWith(AndroidJUnit4.class)
-public class AppSearchDeviceTest {
-
-    private static final String NAMESPACE = "namespace";
-    private static final String ID = "id";
-    private static final GenericDocument DOCUMENT =
-            new GenericDocument.Builder<>(NAMESPACE, ID, "testSchema")
-                    .setPropertyString("subject", "testPut example1")
-                    .setCreationTimestampMillis(12345L)
-                    .build();
-
-    private GlobalSearchSessionShim mGlobalSearch;
-
-    @Before
-    public void setUp() throws Exception {
-        mGlobalSearch = GlobalSearchSessionShimImpl.createGlobalSearchSession().get();
-    }
-
-    @Test
-    public void testGlobalGetDocuments_exist() throws Exception {
-        List<GenericDocument> outDocuments = convertSearchResultsToDocuments(
-                mGlobalSearch.search(/*queryExpression=*/"",
-                        new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                                .build()));
-        assertThat(outDocuments).containsExactly(DOCUMENT);
-    }
-
-    @Test
-    public void testGlobalGetDocuments_nonexist() throws Exception {
-        List<GenericDocument> outDocuments = convertSearchResultsToDocuments(
-                mGlobalSearch.search(/*queryExpression=*/"",
-                        new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
-                                .build()));
-        assertThat(outDocuments).isEmpty();
-    }
-}
diff --git a/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperB/src/android/appsearch/app/helper_b/AppSearchDeviceTest.java b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperB/src/android/appsearch/app/helper_b/AppSearchDeviceTest.java
new file mode 100644
index 0000000..01c6d47
--- /dev/null
+++ b/hostsidetests/appsearch/test-apps/AppSearchHostTestHelperB/src/android/appsearch/app/helper_b/AppSearchDeviceTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2022 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 android.appsearch.app.helper_b;
+
+import static android.app.appsearch.testutil.AppSearchTestUtils.convertSearchResultsToDocuments;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.appsearch.GenericDocument;
+import android.app.appsearch.GlobalSearchSessionShim;
+import android.app.appsearch.SearchSpec;
+import android.app.appsearch.testutil.GlobalSearchSessionShimImpl;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class AppSearchDeviceTest {
+
+    private static final String NAMESPACE = "namespace";
+    private static final String ID = "id";
+    private static final GenericDocument DOCUMENT =
+            new GenericDocument.Builder<>(NAMESPACE, ID, "testSchema")
+                    .setPropertyString("subject", "testPut example1")
+                    .setCreationTimestampMillis(12345L)
+                    .build();
+
+    private GlobalSearchSessionShim mGlobalSearch;
+
+    @Before
+    public void setUp() throws Exception {
+        mGlobalSearch = GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync().get();
+    }
+
+    @Test
+    public void testGlobalGetDocuments_exist() throws Exception {
+        List<GenericDocument> outDocuments = convertSearchResultsToDocuments(
+                mGlobalSearch.search(/*queryExpression=*/"",
+                        new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
+                                .build()));
+        assertThat(outDocuments).containsExactly(DOCUMENT);
+    }
+
+    @Test
+    public void testGlobalGetDocuments_nonexist() throws Exception {
+        List<GenericDocument> outDocuments = convertSearchResultsToDocuments(
+                mGlobalSearch.search(/*queryExpression=*/"",
+                        new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
+                                .build()));
+        assertThat(outDocuments).isEmpty();
+    }
+}
diff --git a/hostsidetests/appsecurity/Android.bp b/hostsidetests/appsecurity/Android.bp
index af53c8e..9a06caa 100644
--- a/hostsidetests/appsecurity/Android.bp
+++ b/hostsidetests/appsecurity/Android.bp
@@ -73,8 +73,3 @@
     name: "CtsHostsideTestsAppSecurityUtil",
     srcs: ["src/android/appsecurity/cts/Utils.java"],
 }
-
-filegroup {
-    name: "cts-ec-p256-por_1_2-default-caps.lineage",
-    srcs: ["certs/pkgsigverify/ec-p256-por_1_2-default-caps"],
-}
diff --git a/hostsidetests/appsecurity/OWNERS b/hostsidetests/appsecurity/OWNERS
index e4d9d04..056dc98 100644
--- a/hostsidetests/appsecurity/OWNERS
+++ b/hostsidetests/appsecurity/OWNERS
@@ -9,7 +9,7 @@
 per-file AppSecurityTests.java = cbrubaker@google.com
 per-file AuthBoundKeyTest.java = file:test-apps/AuthBoundKeyApp/OWNERS
 per-file BaseInstallMultiple.java = toddke@google.com,patb@google.com
-per-file CorruptApkTests.java = rtmitchell@google.com
+per-file CorruptApkTests.java = zyy@google.com
 per-file DeviceIdentifierTest.java = cbrubaker@google.com
 per-file EphemeralTest.java = toddke@google.com,patb@google.com
 per-file ExternalStorageHostTest.java = nandana@google.com
@@ -20,7 +20,7 @@
 per-file KeySetHostTest.java = cbrubaker@google.com
 per-file ListeningPortsTest.java = cbrubaker@google.com
 per-file MajorVersionTest.java = toddke@google.com,patb@google.com
-per-file OverlayHostTest.java = rtmitchell@google.com
+per-file OverlayHostTest.java = zyy@google.com
 per-file Package* = chiuwinson@google.com,patb@google.com,toddke@google.com
 per-file PermissionsHostTest.java = moltmann@google.com
 per-file Pkg* = chiuwinson@google.com,patb@google.com,toddke@google.com
diff --git a/hostsidetests/appsecurity/certs/pkgsigverify/Android.bp b/hostsidetests/appsecurity/certs/pkgsigverify/Android.bp
index 89e0925..2635114 100644
--- a/hostsidetests/appsecurity/certs/pkgsigverify/Android.bp
+++ b/hostsidetests/appsecurity/certs/pkgsigverify/Android.bp
@@ -39,6 +39,11 @@
 }
 
 android_app_certificate {
+    name: "ec-p256_5",
+    certificate: "ec-p256_5",
+}
+
+android_app_certificate {
     name: "ec-p384",
     certificate: "ec-p384",
 }
@@ -121,6 +126,13 @@
 }
 
 filegroup {
+    name: "ec-p256-por-1_2_3_4_5-default-caps",
+    srcs: [
+        "ec-p256-por-1_2_3_4_5-default-caps",
+    ],
+}
+
+filegroup {
     name: "ec-p256-por-1_2_3-no-caps",
     srcs: [
         "ec-p256-por-1_2_3-no-caps",
diff --git a/hostsidetests/appsecurity/certs/pkgsigverify/ec-p256-por-1_2_3_4_5-default-caps b/hostsidetests/appsecurity/certs/pkgsigverify/ec-p256-por-1_2_3_4_5-default-caps
new file mode 100644
index 0000000..02fa437
--- /dev/null
+++ b/hostsidetests/appsecurity/certs/pkgsigverify/ec-p256-por-1_2_3_4_5-default-caps
Binary files differ
diff --git a/hostsidetests/appsecurity/certs/pkgsigverify/ec-p256_5.pk8 b/hostsidetests/appsecurity/certs/pkgsigverify/ec-p256_5.pk8
new file mode 100644
index 0000000..d766c13
--- /dev/null
+++ b/hostsidetests/appsecurity/certs/pkgsigverify/ec-p256_5.pk8
Binary files differ
diff --git a/hostsidetests/appsecurity/certs/pkgsigverify/ec-p256_5.x509.pem b/hostsidetests/appsecurity/certs/pkgsigverify/ec-p256_5.x509.pem
new file mode 100644
index 0000000..b30f83b
--- /dev/null
+++ b/hostsidetests/appsecurity/certs/pkgsigverify/ec-p256_5.x509.pem
@@ -0,0 +1,10 @@
+-----BEGIN CERTIFICATE-----
+MIIBeTCCASCgAwIBAgIUUOHuMdn5JZ6t01FKmI36S/DnFTowCgYIKoZIzj0EAwIw
+FDESMBAGA1UEAwwJZWMtcDI1Nl80MB4XDTIyMDMxNTAxMDUwOFoXDTMyMDMxMjAx
+MDUwOFowFDESMBAGA1UEAwwJZWMtcDI1Nl81MFkwEwYHKoZIzj0CAQYIKoZIzj0D
+AQcDQgAEdXA8VKQy31gOhoSIF7SR7gKDJCV9wx6JH8Svk9m9S/Ams5x6FFITdTw0
+TCoSBWznzMIbQL6Pn60oY53K2+Y7TqNQME4wHQYDVR0OBBYEFOjMMttqIfhsdfPB
+lsCxmYhUmLc7MB8GA1UdIwQYMBaAFG54lwMyVUM2tu6JJOqnAjDjk/Z4MAwGA1Ud
+EwQFMAMBAf8wCgYIKoZIzj0EAwIDRwAwRAIgLe2X993NMimtJng0NhhvHnQkekQi
+uvmfHutxXf5+iVUCIHgUJIsbd0LzAJYCvclvZlKYhPxgWgcP8lyEZIyPzLRL
+-----END CERTIFICATE-----
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryServiceTest_v2-tgt-33.apk b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryServiceTest_v2-tgt-33.apk
new file mode 100644
index 0000000..869f9a9
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryServiceTest_v2-tgt-33.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryServiceTest_v2-tgt-33.apk.idsig b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryServiceTest_v2-tgt-33.apk.idsig
new file mode 100644
index 0000000..fb9b02f
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryServiceTest_v2-tgt-33.apk.idsig
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-legacyV4.apk b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-legacyV4.apk
new file mode 100644
index 0000000..d7a03f1
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-legacyV4.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-legacyV4.apk.idsig b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-legacyV4.apk.idsig
new file mode 100644
index 0000000..1e86976
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-legacyV4.apk.idsig
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-wrongDigest.apk b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-wrongDigest.apk
new file mode 100644
index 0000000..1139176
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-wrongDigest.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-wrongDigest.apk.idsig b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-wrongDigest.apk.idsig
new file mode 100644
index 0000000..1f137ba
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-wrongDigest.apk.idsig
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-wrongV41Block.apk b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-wrongV41Block.apk
new file mode 100644
index 0000000..38ab895
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-wrongV41Block.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-wrongV41Block.apk.idsig b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-wrongV41Block.apk.idsig
new file mode 100644
index 0000000..2773f50
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33-wrongV41Block.apk.idsig
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33.apk b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33.apk
new file mode 100644
index 0000000..69a5170
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33.apk.idsig b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33.apk.idsig
new file mode 100644
index 0000000..51738c7
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v2-tgt-33.apk.idsig
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v3-tgt-33.apk b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v3-tgt-33.apk
new file mode 100644
index 0000000..2f03585
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v3-tgt-33.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v3-tgt-33.apk.idsig b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v3-tgt-33.apk.idsig
new file mode 100644
index 0000000..0581b7a
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/CtsSignatureQueryService_v3-tgt-33.apk.idsig
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/generate-apks.sh b/hostsidetests/appsecurity/res/pkgsigverify/generate-apks.sh
index 0adf311..2f4c5f8 100644
--- a/hostsidetests/appsecurity/res/pkgsigverify/generate-apks.sh
+++ b/hostsidetests/appsecurity/res/pkgsigverify/generate-apks.sh
@@ -39,4 +39,9 @@
 apksigner sign --v2-signing-enabled true --v3-signing-enabled false --v4-signing-enabled  --key cts/hostsidetests/appsecurity/certs/pkgsigverify/ec-p256.pk8 --cert cts/hostsidetests/appsecurity/certs/pkgsigverify/ec-p256.x509.pem -out cts/hostsidetests/appsecurity/res/pkgsigverify/v4-inc-to-v2-noninc-ec-p256-appv2.apk cts/hostsidetests/appsecurity/res/pkgsigverify/originalv2.apk
 
 # testInstallV4With* tests
-apksigner sign --v2-signing-enabled false --v3-signing-enabled true --v4-signing-enabled --key vendor/google/certs/devkeys/devkey.pk8 --cert vendor/google/certs/devkeys/devkey.x509.pem -out cts/hostsidetests/appsecurity/res/pkgsigverify/v4-digest-v3-128bytes-additional-data.apk cts/hostsidetests/appsecurity/res/pkgsigverify/original.apk
\ No newline at end of file
+apksigner sign --v2-signing-enabled false --v3-signing-enabled true --v4-signing-enabled --key vendor/google/certs/devkeys/devkey.pk8 --cert vendor/google/certs/devkeys/devkey.x509.pem -out cts/hostsidetests/appsecurity/res/pkgsigverify/v4-digest-v3-128bytes-additional-data.apk cts/hostsidetests/appsecurity/res/pkgsigverify/original.apk
+
+# testInstallV41* tests
+apksigner sign --in CtsSignatureQueryService_v2-tgt-33.apk --cert ../../certs/pkgsigverify/ec-p256.x509.pem --key ../../certs/pkgsigverify/ec-p256.pk8 --next-signer --cert ../../certs/pkgsigverify/ec-p256_2.x509.pem --key ../../certs/pkgsigverify/ec-p256_2.pk8 --lineage ../../certs/pkgsigverify/ec-p256-por_1_2-default-caps --rotation-min-sdk-version 33 --v4-signing-enabled
+apksigner sign --in CtsSignatureQueryService_v3-tgt-33.apk --cert ../../certs/pkgsigverify/ec-p256.x509.pem --key ../../certs/pkgsigverify/ec-p256.pk8 --next-signer --cert ../../certs/pkgsigverify/ec-p256_2.x509.pem --key ../../certs/pkgsigverify/ec-p256_2.pk8 --lineage ../../certs/pkgsigverify/ec-p256-por_1_2-default-caps --rotation-min-sdk-version 33 --v4-signing-enabled
+apksigner sign --in CtsSignatureQueryServiceTest_v2-tgt-33.apk --cert ../../certs/pkgsigverify/ec-p256.x509.pem --key ../../certs/pkgsigverify/ec-p256.pk8 --next-signer --cert ../../certs/pkgsigverify/ec-p256_2.x509.pem --key ../../certs/pkgsigverify/ec-p256_2.pk8 --lineage ../../certs/pkgsigverify/ec-p256-por_1_2-default-caps --rotation-min-sdk-version 33 --v4-signing-enabled
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/v31-block-stripped-v3-attr-value-33.apk b/hostsidetests/appsecurity/res/pkgsigverify/v31-block-stripped-v3-attr-value-33.apk
new file mode 100644
index 0000000..3ca0c30
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/v31-block-stripped-v3-attr-value-33.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-100001.apk b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-100001.apk
new file mode 100644
index 0000000..20a2b0ab
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-100001.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-31-dev-release.apk b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-31-dev-release.apk
new file mode 100644
index 0000000..7129020
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-31-dev-release.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33-ec-p256-tgt-1-27-and-100001.apk b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33-ec-p256-tgt-1-27-and-100001.apk
new file mode 100644
index 0000000..8a6a52c
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33-ec-p256-tgt-1-27-and-100001.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33-ec-p256-tgt-1-27.apk b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33-ec-p256-tgt-1-27.apk
new file mode 100644
index 0000000..0ffe9f1
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33-ec-p256-tgt-1-27.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33-ec-p256-tgt-100001.apk b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33-ec-p256-tgt-100001.apk
new file mode 100644
index 0000000..c7bed06
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33-ec-p256-tgt-100001.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33-modified.apk b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33-modified.apk
new file mode 100644
index 0000000..89475b8
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33-modified.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33.apk b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33.apk
new file mode 100644
index 0000000..c20792a
--- /dev/null
+++ b/hostsidetests/appsecurity/res/pkgsigverify/v31-ec-p256_2-tgt-33.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/AccessSerialNumberTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/AccessSerialNumberTest.java
index 8f53d2a..429b9aa 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/AccessSerialNumberTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/AccessSerialNumberTest.java
@@ -17,6 +17,7 @@
 package android.appsecurity.cts;
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.compatibility.common.util.CddTest;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.testtype.DeviceTestCase;
@@ -71,4 +72,15 @@
                 "android.os.cts.AccessSerialModernTest",
                 "testAccessSerialPermissionNeeded");
     }
+
+    @CddTest(requirement = "3.2.2/C-0-1")
+    public void testGetSerialReturnsExpectedFormat() throws Exception {
+        // Verify the result from Build#getSerial matches the expected regular expression
+        // as defined in the CDD.
+        assertNull(getDevice().installPackage(mBuildHelper.getTestFile(
+                APK_ACCESS_SERIAL_MODERN), true, false));
+        runDeviceTests(ACCESS_SERIAL_PKG,
+                "android.os.cts.AccessSerialModernTest",
+                "testGetSerialReturnsExpectedFormat");
+    }
 }
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/ApkVerityInstallTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/ApkVerityInstallTest.java
index 620c9eb..96e36cf 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/ApkVerityInstallTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/ApkVerityInstallTest.java
@@ -16,13 +16,14 @@
 
 package android.appsecurity.cts;
 
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
-
 import static com.android.compatibility.common.util.PropertyUtil.getFirstApiLevel;
 import static com.android.compatibility.common.util.PropertyUtil.getVendorApiLevel;
 
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
 import android.platform.test.annotations.AppModeFull;
+import android.platform.test.annotations.Presubmit;
 
 import com.android.compatibility.common.util.CddTest;
 import com.android.tradefed.device.DeviceNotAvailableException;
@@ -39,6 +40,7 @@
 
 import junitparams.Parameters;
 
+@Presubmit
 @RunWith(DeviceParameterizedRunner.class)
 @AppModeFull
 public final class ApkVerityInstallTest extends BaseAppSecurityTest {
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/AppSecurityTests.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/AppSecurityTests.java
index 98150c4..a0137dc 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/AppSecurityTests.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/AppSecurityTests.java
@@ -23,8 +23,9 @@
 
 import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.AppModeInstant;
-import android.platform.test.annotations.RestrictedBuildTest;
 import android.platform.test.annotations.AsbSecurityTest;
+import android.platform.test.annotations.Presubmit;
+import android.platform.test.annotations.RestrictedBuildTest;
 
 import com.android.ddmlib.Log;
 import com.android.tradefed.device.DeviceNotAvailableException;
@@ -41,6 +42,7 @@
  * Set of tests that verify various security checks involving multiple apps are
  * properly enforced.
  */
+@Presubmit
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class AppSecurityTests extends BaseAppSecurityTest {
 
@@ -85,6 +87,15 @@
     private static final String DUPLICATE_DECLARE_PERMISSION_PKG =
             "com.android.cts.duplicatepermissiondeclareapp";
 
+    private static final String DUPLICATE_PERMISSION_DIFFERENT_PROTECTION_LEVEL_APK =
+            "CtsDuplicatePermissionDeclareApp_DifferentProtectionLevel.apk";
+    private static final String DUPLICATE_PERMISSION_DIFFERENT_PROTECTION_LEVEL_PKG =
+            "com.android.cts.duplicatepermission.differentprotectionlevel";
+    private static final String DUPLICATE_PERMISSION_SAME_PROTECTION_LEVEL_APK =
+            "CtsDuplicatePermissionDeclareApp_SameProtectionLevel.apk";
+    private static final String DUPLICATE_PERMISSION_SAME_PROTECTION_LEVEL_PKG =
+            "com.android.cts.duplicatepermission.sameprotectionlevel";
+
     private static final String LOG_TAG = "AppSecurityTests";
 
     @Before
@@ -358,4 +369,34 @@
                     "appops get " + pkgName + " android:system_alert_window");
         }
     }
+
+    /**
+     * Tests that a single APK declaring duplicate permissions with different protection levels
+     * cannot be installed.
+     */
+    @Test
+    public void testInstallDuplicatePermission_differentProtectionLevel_fail() throws Exception {
+        try {
+            new InstallMultiple(false /* instant */)
+                    .addFile(DUPLICATE_PERMISSION_DIFFERENT_PROTECTION_LEVEL_APK)
+                    .runExpectingFailure("INSTALL_PARSE_FAILED_MANIFEST_MALFORMED");
+        } finally {
+            getDevice().uninstallPackage(DUPLICATE_PERMISSION_DIFFERENT_PROTECTION_LEVEL_PKG);
+        }
+    }
+
+    /**
+     * Tests that a single APK declaring duplicate permissions with the same protection level
+     * can be installed.
+     */
+    @Test
+    public void testInstallDuplicatePermission_sameProtectionLevel_success() throws Exception {
+        try {
+            new InstallMultiple(false /* instant */)
+                    .addFile(DUPLICATE_PERMISSION_SAME_PROTECTION_LEVEL_APK)
+                    .run(true /* expectingSuccess */);
+        } finally {
+            getDevice().uninstallPackage(DUPLICATE_PERMISSION_SAME_PROTECTION_LEVEL_PKG);
+        }
+    }
 }
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/ApplicationVisibilityTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/ApplicationVisibilityTest.java
index 787d61e..63718f5 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/ApplicationVisibilityTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/ApplicationVisibilityTest.java
@@ -17,10 +17,11 @@
 package android.appsecurity.cts;
 
 import android.platform.test.annotations.AppModeFull;
+import android.platform.test.annotations.Presubmit;
+
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -31,6 +32,7 @@
 /**
  * Tests the visibility of installed applications.
  */
+@Presubmit
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class ApplicationVisibilityTest extends BaseAppSecurityTest {
 
@@ -319,6 +321,134 @@
                 testUserId);
     }
 
+    @Test
+    @AppModeFull(reason = "instant applications cannot be granted INTERACT_ACROSS_USERS")
+    public void testGetPackageUidCrossUserGrant() throws Exception {
+        if (!mSupportsMultiUser) {
+            return;
+        }
+
+        final int installUserId = getInstallUserId();
+        final int testUserId = getTestUserId();
+        final Map<String, String> testArgs = new HashMap<>();
+        testArgs.put("testUser", Integer.toString(installUserId));
+
+        installTestAppForUser(TINY_APK, installUserId);
+        // Also install TEST_WITH_PERMISSION_APK in installUSerId for creating across user context
+        installTestAppForUser(TEST_WITH_PERMISSION_APK, installUserId);
+        installTestAppForUser(TEST_WITH_PERMISSION_APK, testUserId);
+
+        Utils.runDeviceTests(
+                getDevice(),
+                TEST_WITH_PERMISSION_PKG,
+                ".ApplicationVisibilityCrossUserTest",
+                "testGetPackageUidVisibility_currentUser",
+                testUserId);
+        Utils.runDeviceTests(
+                getDevice(),
+                TEST_WITH_PERMISSION_PKG,
+                ".ApplicationVisibilityCrossUserTest",
+                "testGetPackageUidVisibility_anotherUserCrossUserGrant",
+                testUserId,
+                testArgs);
+    }
+
+    @Test
+    @AppModeFull(reason = "instant applications cannot see any other application")
+    public void testGetPackageUidCrossUserNoGrant() throws Exception {
+        if (!mSupportsMultiUser) {
+            return;
+        }
+
+        final int installUserId = getInstallUserId();
+        final int testUserId = getTestUserId();
+        final Map<String, String> testArgs = new HashMap<>();
+        testArgs.put("testUser", Integer.toString(installUserId));
+
+        installTestAppForUser(TINY_APK, installUserId);
+        // Also install TEST_WITH_PERMISSION_APK in installUSerId for creating across user context
+        installTestAppForUser(TEST_WITH_PERMISSION_APK, installUserId);
+        installTestAppForUser(TEST_WITH_PERMISSION_APK, testUserId);
+
+        Utils.runDeviceTests(
+                getDevice(),
+                TEST_WITH_PERMISSION_PKG,
+                ".ApplicationVisibilityCrossUserTest",
+                "testGetPackageUidVisibility_currentUser",
+                testUserId);
+        Utils.runDeviceTests(
+                getDevice(),
+                TEST_WITH_PERMISSION_PKG,
+                ".ApplicationVisibilityCrossUserTest",
+                "testGetPackageUidVisibility_anotherUserCrossUserNoGrant",
+                testUserId,
+                testArgs);
+    }
+
+    @Test
+    @AppModeFull(reason = "instant applications cannot be granted INTERACT_ACROSS_USERS")
+    public void testGetPackageGidsCrossUserGrant() throws Exception {
+        if (!mSupportsMultiUser) {
+            return;
+        }
+
+        final int installUserId = getInstallUserId();
+        final int testUserId = getTestUserId();
+        final Map<String, String> testArgs = new HashMap<>();
+        testArgs.put("testUser", Integer.toString(installUserId));
+
+        installTestAppForUser(TINY_APK, installUserId);
+        // Also install TEST_WITH_PERMISSION_APK in installUSerId for creating across user context
+        installTestAppForUser(TEST_WITH_PERMISSION_APK, installUserId);
+        installTestAppForUser(TEST_WITH_PERMISSION_APK, testUserId);
+
+        Utils.runDeviceTests(
+                getDevice(),
+                TEST_WITH_PERMISSION_PKG,
+                ".ApplicationVisibilityCrossUserTest",
+                "testGetPackageGidsVisibility_currentUser",
+                testUserId);
+        Utils.runDeviceTests(
+                getDevice(),
+                TEST_WITH_PERMISSION_PKG,
+                ".ApplicationVisibilityCrossUserTest",
+                "testGetPackageGidsVisibility_anotherUserCrossUserGrant",
+                testUserId,
+                testArgs);
+    }
+
+    @Test
+    @AppModeFull(reason = "instant applications cannot see any other application")
+    public void testGetPackageGidsCrossUserNoGrant() throws Exception {
+        if (!mSupportsMultiUser) {
+            return;
+        }
+
+        final int installUserId = getInstallUserId();
+        final int testUserId = getTestUserId();
+        final Map<String, String> testArgs = new HashMap<>();
+        testArgs.put("testUser", Integer.toString(installUserId));
+
+        installTestAppForUser(TINY_APK, installUserId);
+        // Also install TEST_WITH_PERMISSION_APK in installUSerId for creating across user context
+        installTestAppForUser(TEST_WITH_PERMISSION_APK, installUserId);
+        installTestAppForUser(TEST_WITH_PERMISSION_APK, testUserId);
+
+        Utils.runDeviceTests(
+                getDevice(),
+                TEST_WITH_PERMISSION_PKG,
+                ".ApplicationVisibilityCrossUserTest",
+                "testGetPackageGidsVisibility_currentUser",
+                testUserId);
+        Utils.runDeviceTests(
+                getDevice(),
+                TEST_WITH_PERMISSION_PKG,
+                ".ApplicationVisibilityCrossUserTest",
+                "testGetPackageGidsVisibility_anotherUserCrossUserNoGrant",
+                testUserId,
+                testArgs);
+    }
+
     private int getInstallUserId() {
         return mUsers[0];
     }
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/DeviceIdentifierTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/DeviceIdentifierTest.java
index b7d6bd5..ea663114 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/DeviceIdentifierTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/DeviceIdentifierTest.java
@@ -17,6 +17,7 @@
 package android.appsecurity.cts;
 
 import android.platform.test.annotations.AsbSecurityTest;
+
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/DirectBootHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/DirectBootHostTest.java
index ab51c75..e513aa7 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/DirectBootHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/DirectBootHostTest.java
@@ -51,7 +51,7 @@
     private static final String CLASS = PKG + ".EncryptionAppTest";
     private static final String APK = "CtsEncryptionApp.apk";
 
-    private static final String OTHER_APK = "CtsSplitApp29.apk";
+    private static final String OTHER_APK = "CtsSplitApp.apk";
     private static final String OTHER_PKG = "com.android.cts.splitapp";
 
     private static final String MODE_NATIVE = "native";
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/EphemeralTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/EphemeralTest.java
index 91ec159..d41257a 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/EphemeralTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/EphemeralTest.java
@@ -22,6 +22,7 @@
 
 import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.AsbSecurityTest;
+import android.platform.test.annotations.Presubmit;
 
 import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
@@ -39,6 +40,7 @@
 /**
  * Tests for ephemeral packages.
  */
+@Presubmit
 @RunWith(DeviceJUnit4ClassRunner.class)
 @AppModeFull(reason = "Already handles instant installs when needed")
 public class EphemeralTest extends BaseAppSecurityTest {
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
index 9848f8f..1bf6889 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/ExternalStorageHostTest.java
@@ -22,6 +22,8 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
+import android.platform.test.annotations.Presubmit;
+
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.Log;
 import com.android.role.RoleProto;
@@ -29,6 +31,7 @@
 import com.android.role.RoleUserStateProto;
 import com.android.tradefed.device.CollectingByteOutputReceiver;
 import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
 import com.android.tradefed.util.AbiUtils;
@@ -39,7 +42,6 @@
 import org.junit.After;
 import org.junit.Assume;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -51,6 +53,7 @@
 /**
  * Set of tests that verify behavior of external storage devices.
  */
+@Presubmit
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class ExternalStorageHostTest extends BaseHostJUnit4Test {
     private static final String TAG = "ExternalStorageHostTest";
@@ -98,6 +101,12 @@
             "android.permission.ACCESS_MEDIA_LOCATION";
     private static final String PERM_READ_EXTERNAL_STORAGE =
             "android.permission.READ_EXTERNAL_STORAGE";
+    private static final String PERM_READ_MEDIA_IMAGES =
+            "android.permission.READ_MEDIA_IMAGES";
+    private static final String PERM_READ_MEDIA_AUDIO =
+            "android.permission.READ_MEDIA_AUDIO";
+    private static final String PERM_READ_MEDIA_VIDEO =
+            "android.permission.READ_MEDIA_VIDEO";
     private static final String PERM_WRITE_EXTERNAL_STORAGE =
             "android.permission.WRITE_EXTERNAL_STORAGE";
 
@@ -111,6 +120,7 @@
     private static final String FEATURE_WATCH = "android.hardware.type.watch";
 
     private int[] mUsers;
+    private boolean mAdbWasRoot;
 
     private File getTestAppFile(String fileName) throws FileNotFoundException {
         CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(getBuild());
@@ -122,6 +132,16 @@
         mUsers = Utils.prepareMultipleUsers(getDevice());
         assertNotNull(getAbi());
         assertNotNull(getBuild());
+
+        ITestDevice device = getDevice();
+        mAdbWasRoot = device.isAdbRoot();
+        if (mAdbWasRoot) {
+            // This test assumes that the test is not run with root privileges. But this test runs
+            // as a part of appsecurity test suite which contains a lot of other tests. Some of
+            // which may enable adb root, make sure that this test is run without root access.
+            device.disableAdbRoot();
+            assertFalse("adb root is enabled", device.isAdbRoot());
+        }
     }
 
     @Before
@@ -135,6 +155,16 @@
         wipePrimaryExternalStorage();
     }
 
+    @After
+    public void tearDown() throws DeviceNotAvailableException {
+        ITestDevice device = getDevice();
+        if (mAdbWasRoot) {
+            device.enableAdbRoot();
+        } else {
+            device.disableAdbRoot();
+        }
+    }
+
     @Test
     public void testExternalStorageRename() throws Exception {
         try {
@@ -274,6 +304,9 @@
             for (int user : mUsers) {
                 updateAppOp(WRITE_PKG_2, user, "android:request_install_packages", true);
                 updatePermissions(WRITE_PKG_2, user, new String[] {
+                        PERM_READ_MEDIA_IMAGES,
+                        PERM_READ_MEDIA_VIDEO,
+                        PERM_READ_MEDIA_AUDIO,
                         PERM_READ_EXTERNAL_STORAGE,
                         PERM_WRITE_EXTERNAL_STORAGE,
                 }, true);
@@ -499,6 +532,9 @@
         waitForBroadcastIdle();
         for (int user : mUsers) {
             updatePermissions(config.pkg, user, new String[] {
+                    PERM_READ_MEDIA_IMAGES,
+                    PERM_READ_MEDIA_VIDEO,
+                    PERM_READ_MEDIA_AUDIO,
                     PERM_READ_EXTERNAL_STORAGE,
                     PERM_WRITE_EXTERNAL_STORAGE,
             }, true);
@@ -515,14 +551,70 @@
         }
     }
 
+    /**
+     * b/197302116. The apps can't be granted prefix UriPermissions to the uri, when the query
+     * result of the uri is 1.
+     */
+    @Test
+    public void testOwningOneFileNotGrantPrefixUriPermission() throws Exception {
+        installPackage(MEDIA.apk);
+
+        int user = getDevice().getCurrentUser();
+
+        // revoke permissions
+        updatePermissions(MEDIA.pkg, user, new String[] {
+                PERM_READ_MEDIA_IMAGES,
+                PERM_READ_MEDIA_VIDEO,
+                PERM_READ_MEDIA_AUDIO,
+                PERM_READ_EXTERNAL_STORAGE,
+                PERM_WRITE_EXTERNAL_STORAGE,
+        }, false);
+
+
+        // revoke the app ops permission
+        updateAppOp(MEDIA.pkg, user, APP_OPS_MANAGE_EXTERNAL_STORAGE, false);
+
+        runDeviceTests(MEDIA.pkg, MEDIA.clazz,
+                "testOwningOneFileNotGrantPrefixUriPermission", user);
+    }
+
+    /**
+     * If the app grants read UriPermission to the uri without id (E.g.
+     * MediaStore.Audio.Media.EXTERNAL_CONTENT_URI), the query result of the uri should be the same
+     * without granting permission.
+     */
+    @Test
+    public void testReadUriPermissionOnUriWithoutId_sameQueryResult() throws Exception {
+        installPackage(MEDIA.apk);
+
+        int user = getDevice().getCurrentUser();
+
+        // revoke permissions
+        updatePermissions(MEDIA.pkg, user, new String[] {
+                PERM_READ_MEDIA_IMAGES,
+                PERM_READ_MEDIA_VIDEO,
+                PERM_READ_MEDIA_AUDIO,
+                PERM_READ_EXTERNAL_STORAGE,
+                PERM_WRITE_EXTERNAL_STORAGE,
+        }, false);
+
+
+        // revoke the app ops permission
+        updateAppOp(MEDIA.pkg, user, APP_OPS_MANAGE_EXTERNAL_STORAGE, false);
+
+        runDeviceTests(MEDIA.pkg, MEDIA.clazz,
+                "testReadUriPermissionOnUriWithoutId_sameQueryResult", user);
+    }
 
     @Test
     public void testGrantUriPermission() throws Exception {
         doGrantUriPermission(MEDIA, "testGrantUriPermission", new String[]{});
         doGrantUriPermission(MEDIA, "testGrantUriPermission",
-                new String[]{PERM_READ_EXTERNAL_STORAGE});
+                new String[]{PERM_READ_MEDIA_IMAGES, PERM_READ_MEDIA_VIDEO,
+                    PERM_READ_MEDIA_AUDIO, PERM_READ_EXTERNAL_STORAGE});
         doGrantUriPermission(MEDIA, "testGrantUriPermission",
-                new String[]{PERM_READ_EXTERNAL_STORAGE, PERM_WRITE_EXTERNAL_STORAGE});
+                new String[]{PERM_READ_EXTERNAL_STORAGE, PERM_READ_MEDIA_IMAGES,
+                    PERM_READ_MEDIA_VIDEO, PERM_READ_MEDIA_AUDIO, PERM_WRITE_EXTERNAL_STORAGE});
     }
 
     @Test
@@ -541,6 +633,9 @@
         for (int user : mUsers) {
             // Over revoke all permissions and grant necessary permissions later.
             updatePermissions(config.pkg, user, new String[] {
+                    PERM_READ_MEDIA_IMAGES,
+                    PERM_READ_MEDIA_VIDEO,
+                    PERM_READ_MEDIA_AUDIO,
                     PERM_READ_EXTERNAL_STORAGE,
                     PERM_WRITE_EXTERNAL_STORAGE,
             }, false);
@@ -566,6 +661,9 @@
         installPackage(config.apk);
         for (int user : mUsers) {
             updatePermissions(config.pkg, user, new String[] {
+                    PERM_READ_MEDIA_IMAGES,
+                    PERM_READ_MEDIA_VIDEO,
+                    PERM_READ_MEDIA_AUDIO,
                     PERM_READ_EXTERNAL_STORAGE,
                     PERM_WRITE_EXTERNAL_STORAGE,
             }, false);
@@ -591,6 +689,9 @@
         installPackage(config.apk);
         for (int user : mUsers) {
             updatePermissions(config.pkg, user, new String[] {
+                    PERM_READ_MEDIA_IMAGES,
+                    PERM_READ_MEDIA_VIDEO,
+                    PERM_READ_MEDIA_AUDIO,
                     PERM_READ_EXTERNAL_STORAGE,
             }, true);
             updatePermissions(config.pkg, user, new String[] {
@@ -618,6 +719,9 @@
         installPackage(config.apk);
         for (int user : mUsers) {
             updatePermissions(config.pkg, user, new String[] {
+                    PERM_READ_MEDIA_IMAGES,
+                    PERM_READ_MEDIA_VIDEO,
+                    PERM_READ_MEDIA_AUDIO,
                     PERM_READ_EXTERNAL_STORAGE,
                     PERM_WRITE_EXTERNAL_STORAGE,
             }, true);
@@ -627,20 +731,26 @@
     }
 
     @Test
-    @Ignore("Enable after b/197701722 is fixed")
     public void testMediaEscalation_RequestWriteFilePathSupport() throws Exception {
         // Not adding tests for MEDIA_28 and MEDIA_29 as they need W_E_S for write access via file
         // path for shared files, and will always have access as they have W_E_S.
         installPackage(MEDIA.apk);
 
         int user = getDevice().getCurrentUser();
+        // revoke all permissions
         updatePermissions(MEDIA.pkg, user, new String[] {
+                PERM_ACCESS_MEDIA_LOCATION,
+                PERM_READ_MEDIA_IMAGES,
+                PERM_READ_MEDIA_VIDEO,
+                PERM_READ_MEDIA_AUDIO,
                 PERM_READ_EXTERNAL_STORAGE,
-        }, true);
-        updatePermissions(MEDIA.pkg, user, new String[] {
                 PERM_WRITE_EXTERNAL_STORAGE,
         }, false);
 
+        // revoke the app ops permission
+        updateAppOp(MEDIA.pkg, user, APP_OPS_MANAGE_MEDIA, false);
+        updateAppOp(MEDIA.pkg, user, APP_OPS_MANAGE_EXTERNAL_STORAGE, false);
+
         runDeviceTests(MEDIA.pkg, MEDIA.clazz, "testMediaEscalation_RequestWriteFilePathSupport",
                 user);
     }
@@ -664,6 +774,9 @@
         // TODO: extend test to exercise secondary users
         int user = getDevice().getCurrentUser();
         updatePermissions(config.pkg, user, new String[] {
+                PERM_READ_MEDIA_IMAGES,
+                PERM_READ_MEDIA_VIDEO,
+                PERM_READ_MEDIA_AUDIO,
                 PERM_READ_EXTERNAL_STORAGE,
         }, true);
         updatePermissions(config.pkg, user, new String[] {
@@ -774,6 +887,9 @@
         }, true);
         // revoke permissions
         updatePermissions(MEDIA.pkg, user, new String[] {
+                PERM_READ_MEDIA_IMAGES,
+                PERM_READ_MEDIA_VIDEO,
+                PERM_READ_MEDIA_AUDIO,
                 PERM_READ_EXTERNAL_STORAGE,
                 PERM_WRITE_EXTERNAL_STORAGE,
         }, false);
@@ -804,6 +920,9 @@
         int user = getDevice().getCurrentUser();
         // grant permissions
         updatePermissions(MEDIA.pkg, user, new String[] {
+                PERM_READ_MEDIA_IMAGES,
+                PERM_READ_MEDIA_VIDEO,
+                PERM_READ_MEDIA_AUDIO,
                 PERM_READ_EXTERNAL_STORAGE,
                 PERM_ACCESS_MEDIA_LOCATION,
         }, true);
@@ -837,6 +956,9 @@
         int user = getDevice().getCurrentUser();
         // grant permissions
         updatePermissions(MEDIA.pkg, user, new String[] {
+                PERM_READ_MEDIA_IMAGES,
+                PERM_READ_MEDIA_VIDEO,
+                PERM_READ_MEDIA_AUDIO,
                 PERM_READ_EXTERNAL_STORAGE,
         }, true);
         // revoke permission
@@ -874,6 +996,9 @@
         int user = getDevice().getCurrentUser();
         // grant permissions
         updatePermissions(MEDIA.pkg, user, new String[] {
+                PERM_READ_MEDIA_IMAGES,
+                PERM_READ_MEDIA_VIDEO,
+                PERM_READ_MEDIA_AUDIO,
                 PERM_READ_EXTERNAL_STORAGE,
                 PERM_ACCESS_MEDIA_LOCATION,
         }, true);
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/InstantAppUserTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/InstantAppUserTest.java
index dee0358..02dbf52 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/InstantAppUserTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/InstantAppUserTest.java
@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertNull;
 
 import android.platform.test.annotations.AppModeFull;
+import android.platform.test.annotations.Presubmit;
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.tradefed.device.DeviceNotAvailableException;
@@ -34,6 +35,7 @@
 /**
  * Tests for ephemeral packages.
  */
+@Presubmit
 @RunWith(DeviceJUnit4ClassRunner.class)
 @AppModeFull(reason = "Already handles instant installs when needed")
 public class InstantAppUserTest extends BaseHostJUnit4Test {
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/IsolatedSplitsTests.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/IsolatedSplitsTests.java
index 6852faf..1980900 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/IsolatedSplitsTests.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/IsolatedSplitsTests.java
@@ -17,6 +17,7 @@
 
 import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.AppModeInstant;
+import android.platform.test.annotations.Presubmit;
 
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
@@ -27,6 +28,7 @@
 
 import java.io.FileNotFoundException;
 
+@Presubmit
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class IsolatedSplitsTests extends BaseAppSecurityTest {
     private static final String PKG = "com.android.cts.isolatedsplitapp";
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/OverlayHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/OverlayHostTest.java
index 1090b90..6a2f7f8 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/OverlayHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/OverlayHostTest.java
@@ -15,10 +15,11 @@
  */
 package android.appsecurity.cts;
 
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.platform.test.annotations.AppModeFull;
+import android.platform.test.annotations.Presubmit;
 
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
@@ -27,6 +28,9 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.HashMap;
+
+@Presubmit
 @RunWith(DeviceJUnit4ClassRunner.class)
 @AppModeFull(reason = "Overlays cannot be instant apps")
 public class OverlayHostTest extends BaseAppSecurityTest {
@@ -60,12 +64,17 @@
     private static final String TEST_APP_APK = "CtsOverlayApp.apk";
     private static final String TEST_APP_PACKAGE = "com.android.cts.overlay.app";
     private static final String TEST_APP_CLASS = "com.android.cts.overlay.app.OverlayableTest";
+    private static final String OVERLAY_TARGET_TEST_APP_CLASS =
+            "com.android.cts.overlay.target.OverlayTargetTest";
 
     // Overlay states
     private static final String STATE_DISABLED = "STATE_DISABLED";
     private static final String STATE_ENABLED = "STATE_ENABLED";
     private static final String STATE_NO_IDMAP = "STATE_NO_IDMAP";
 
+    // test arguments
+    private static final String PARAM_START_SERVICE = "start_service";
+
     private static final long OVERLAY_WAIT_TIMEOUT = 10000; // 10 seconds
 
     @Before
@@ -157,6 +166,12 @@
         }
     }
 
+    private void runDeviceTests(String packageName, String testClassName, String testMethodName,
+            HashMap<String, String> testArgs) throws Exception {
+        Utils.runDeviceTestsAsCurrentUser(getDevice(), packageName, testClassName, testMethodName,
+                testArgs);
+    }
+
     /**
      * Overlays that target android and are not signed with the platform signature must not be
      * installed successfully.
@@ -313,4 +328,68 @@
         runOverlayDeviceTest(TARGET_OVERLAYABLE_APK, OVERLAY_ALL_APK, OVERLAY_ALL_PACKAGE,
                 testMethod);
     }
+
+    @Test
+    public void testOverlayEnabled_activityInForeground() throws Exception {
+        final HashMap<String, String> testArgs = new HashMap<>();
+        testArgs.put(PARAM_START_SERVICE, Boolean.FALSE.toString());
+        try {
+            new InstallMultiple().addFile(OVERLAY_ALL_APK).run();
+            new InstallMultiple().addFile(TARGET_OVERLAYABLE_APK).run();
+
+            runDeviceTests(TARGET_PACKAGE, OVERLAY_TARGET_TEST_APP_CLASS,
+                    "overlayEnabled_activityInForeground", testArgs);
+        } finally {
+            getDevice().uninstallPackage(TARGET_PACKAGE);
+            getDevice().uninstallPackage(OVERLAY_ALL_PACKAGE);
+        }
+    }
+
+    @Test
+    public void testOverlayEnabled_activityInBackground_toForeground() throws Exception {
+        final HashMap<String, String> testArgs = new HashMap<>();
+        testArgs.put(PARAM_START_SERVICE, Boolean.FALSE.toString());
+        try {
+            new InstallMultiple().addFile(OVERLAY_ALL_APK).run();
+            new InstallMultiple().addFile(TARGET_OVERLAYABLE_APK).run();
+
+            runDeviceTests(TARGET_PACKAGE, OVERLAY_TARGET_TEST_APP_CLASS,
+                    "overlayEnabled_activityInBackground_toForeground", testArgs);
+        } finally {
+            getDevice().uninstallPackage(TARGET_PACKAGE);
+            getDevice().uninstallPackage(OVERLAY_ALL_PACKAGE);
+        }
+    }
+
+    @Test
+    public void testOverlayEnabled_activityWithServiceInForeground() throws Exception {
+        final HashMap<String, String> testArgs = new HashMap<>();
+        testArgs.put(PARAM_START_SERVICE, Boolean.TRUE.toString());
+        try {
+            new InstallMultiple().addFile(OVERLAY_ALL_APK).run();
+            new InstallMultiple().addFile(TARGET_OVERLAYABLE_APK).run();
+
+            runDeviceTests(TARGET_PACKAGE, OVERLAY_TARGET_TEST_APP_CLASS,
+                    "overlayEnabled_activityInForeground", testArgs);
+        } finally {
+            getDevice().uninstallPackage(TARGET_PACKAGE);
+            getDevice().uninstallPackage(OVERLAY_ALL_PACKAGE);
+        }
+    }
+
+    @Test
+    public void testOverlayEnabled_activityWithServiceInBackground_toForeground() throws Exception {
+        final HashMap<String, String> testArgs = new HashMap<>();
+        testArgs.put(PARAM_START_SERVICE, Boolean.TRUE.toString());
+        try {
+            new InstallMultiple().addFile(OVERLAY_ALL_APK).run();
+            new InstallMultiple().addFile(TARGET_OVERLAYABLE_APK).run();
+
+            runDeviceTests(TARGET_PACKAGE, OVERLAY_TARGET_TEST_APP_CLASS,
+                    "overlayEnabled_activityInBackground_toForeground", testArgs);
+        } finally {
+            getDevice().uninstallPackage(TARGET_PACKAGE);
+            getDevice().uninstallPackage(OVERLAY_ALL_PACKAGE);
+        }
+    }
 }
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/PackageVisibilityTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/PackageVisibilityTest.java
index c932908..0e177bb 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/PackageVisibilityTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/PackageVisibilityTest.java
@@ -21,6 +21,8 @@
 
 import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.AppModeInstant;
+import android.platform.test.annotations.Presubmit;
+
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
 import org.junit.After;
@@ -31,6 +33,7 @@
 /**
  * Tests for visibility of packages installed in one user, in a different user.
  */
+@Presubmit
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class PackageVisibilityTest extends BaseAppSecurityTest {
 
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/PkgInstallSignatureVerificationTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/PkgInstallSignatureVerificationTest.java
index c110f7b..5370a12 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/PkgInstallSignatureVerificationTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/PkgInstallSignatureVerificationTest.java
@@ -17,8 +17,10 @@
 package android.appsecurity.cts;
 
 import android.platform.test.annotations.AsbSecurityTest;
+import android.platform.test.annotations.Presubmit;
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.compatibility.common.util.CddTest;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.testtype.DeviceTestCase;
@@ -36,6 +38,7 @@
 /**
  * Tests for APK signature verification during installation.
  */
+@Presubmit
 public class PkgInstallSignatureVerificationTest extends DeviceTestCase implements IBuildReceiver {
 
     private static final String TEST_PKG = "android.appsecurity.cts.tinyapp";
@@ -705,6 +708,98 @@
                 "verifySignatures_withRotation_succeeds");
     }
 
+    @CddTest(requirement="4/C-0-2")
+    public void testInstallV31UpdateAfterRotation() throws Exception {
+        // This test is the same as above, but using the v3.1 signature scheme for rotation.
+        assertInstallFromBuildSucceeds("CtsSignatureQueryService.apk");
+        assertInstallFromBuildSucceeds("CtsSignatureQueryServiceTest.apk");
+        Utils.runDeviceTests(getDevice(), SERVICE_TEST_PKG, SERVICE_TEST_CLASS,
+                "verifySignatures_noRotation_succeeds");
+
+        assertInstallSucceeds("CtsSignatureQueryService_v2-tgt-33.apk");
+        Utils.runDeviceTests(getDevice(), SERVICE_TEST_PKG, SERVICE_TEST_CLASS,
+                "verifySignatures_withRotation_succeeds");
+
+        assertInstallSucceeds("CtsSignatureQueryService_v3-tgt-33.apk");
+        assertInstallSucceeds("CtsSignatureQueryServiceTest_v2-tgt-33.apk");
+        Utils.runDeviceTests(getDevice(), SERVICE_TEST_PKG, SERVICE_TEST_CLASS,
+                "verifySignatures_withRotation_succeeds");
+    }
+
+    @CddTest(requirement="4/C-0-9")
+    public void testInstallV41UpdateAfterRotation() throws Exception {
+        // V4 is only enabled on devices with Incremental feature
+        if (!hasIncrementalFeature()) {
+            return;
+        }
+
+        // This test is the same as above, but using the v4.1 signature scheme for rotation.
+        assertInstallV4FromBuildSucceeds("CtsSignatureQueryService.apk");
+        assertInstallV4FromBuildSucceeds("CtsSignatureQueryServiceTest.apk");
+        Utils.runDeviceTests(getDevice(), SERVICE_TEST_PKG, SERVICE_TEST_CLASS,
+                "verifySignatures_noRotation_succeeds");
+
+        assertInstallV4Succeeds("CtsSignatureQueryService_v2-tgt-33.apk");
+        Utils.runDeviceTests(getDevice(), SERVICE_TEST_PKG, SERVICE_TEST_CLASS,
+                "verifySignatures_withRotation_succeeds");
+
+        assertInstallV4Succeeds("CtsSignatureQueryService_v3-tgt-33.apk");
+        assertInstallV4Succeeds("CtsSignatureQueryServiceTest_v2-tgt-33.apk");
+        Utils.runDeviceTests(getDevice(), SERVICE_TEST_PKG, SERVICE_TEST_CLASS,
+                "verifySignatures_withRotation_succeeds");
+    }
+
+    @CddTest(requirement="4/C-0-9")
+    public void testInstallV41WrongBlockId() throws Exception {
+        // V4 is only enabled on devices with Incremental feature
+        if (!hasIncrementalFeature()) {
+            return;
+        }
+
+        // This test is the same as above, but using the v4.1 signature scheme for rotation.
+        assertInstallV4FromBuildSucceeds("CtsSignatureQueryService.apk");
+        assertInstallV4FromBuildSucceeds("CtsSignatureQueryServiceTest.apk");
+        Utils.runDeviceTests(getDevice(), SERVICE_TEST_PKG, SERVICE_TEST_CLASS,
+                "verifySignatures_noRotation_succeeds");
+
+        assertInstallV4FailsWithError("CtsSignatureQueryService_v2-tgt-33-wrongV41Block.apk",
+                "Failed to find V4 signature block corresponding to V3 blockId: 462663009");
+    }
+
+    @CddTest(requirement="4/C-0-9")
+    public void testInstallV41LegacyV4() throws Exception {
+        // V4 is only enabled on devices with Incremental feature
+        if (!hasIncrementalFeature()) {
+            return;
+        }
+
+        // This test is the same as above, but using the v4.1 signature scheme for rotation.
+        assertInstallV4FromBuildSucceeds("CtsSignatureQueryService.apk");
+        assertInstallV4FromBuildSucceeds("CtsSignatureQueryServiceTest.apk");
+        Utils.runDeviceTests(getDevice(), SERVICE_TEST_PKG, SERVICE_TEST_CLASS,
+                "verifySignatures_noRotation_succeeds");
+
+        assertInstallV4FailsWithError("CtsSignatureQueryService_v2-tgt-33-legacyV4.apk",
+                "Failed to find V4 signature block corresponding to V3 blockId: 462663009");
+    }
+
+    @CddTest(requirement="4/C-0-9")
+    public void testInstallV41WrongDigest() throws Exception {
+        // V4 is only enabled on devices with Incremental feature
+        if (!hasIncrementalFeature()) {
+            return;
+        }
+
+        // This test is the same as above, but using the v4.1 signature scheme for rotation.
+        assertInstallV4FromBuildSucceeds("CtsSignatureQueryService.apk");
+        assertInstallV4FromBuildSucceeds("CtsSignatureQueryServiceTest.apk");
+        Utils.runDeviceTests(getDevice(), SERVICE_TEST_PKG, SERVICE_TEST_CLASS,
+                "verifySignatures_noRotation_succeeds");
+
+        assertInstallV4FailsWithError("CtsSignatureQueryService_v2-tgt-33-wrongDigest.apk",
+                "APK digest in V4 signature does not match V2/V3");
+    }
+
     public void testInstallV3KeyRotationSigPerm() throws Exception {
         // tests that a v3 signed APK can still get a signature permission from an app with its
         // older signing certificate.
@@ -909,6 +1004,17 @@
                 "testGetApkContentsSignersShowsMultipleSigners");
     }
 
+    public void testInstallV3MultipleSignersInLineageGetSigningCertificateHistory()
+            throws Exception {
+        // The APK used for this test is signed with a lineage containing 5 keys in the signing
+        // history; this test verifies SigningInfo#getSigningCertificateHistory returns all of an
+        // APKs signers in their order of rotation.
+        assertInstallFromBuildSucceeds("v3-ec-p256-with-por-1_2_3_4_5-default-caps.apk");
+        Utils.runDeviceTests(
+                getDevice(), DEVICE_TESTS_PKG, DEVICE_TESTS_CLASS,
+                "testGetSigningCertificateHistoryReturnsSignersInOrder");
+    }
+
     public void testInstallV3KeyRotationHasSigningCertificate() throws Exception {
         // tests that hasSigningCertificate() recognizes past and current signing certs
         assertInstallSucceeds("v3-rsa-pkcs1-sha256-2048-2-with-por_1_2-full-caps.apk");
@@ -988,6 +1094,117 @@
         Utils.runDeviceTests(getDevice(), DEVICE_TESTS_PKG, DEVICE_TESTS_CLASS, "testHasPerm");
     }
 
+    @CddTest(requirement="4/C-0-2")
+    public void testV31TargetTPlatformUsesRotatedKey() throws Exception {
+        // The v3.1 signature block is intended to allow applications to target T+ for APK signing
+        // key rotation without needing multi-targeting APKs. This test verifies a standard APK
+        // install with the rotated key in the v3.1 signing block targeting T is recognized by the
+        // platform, and this rotated key is used as the signing identity.
+        assertInstallSucceeds("v31-ec-p256_2-tgt-33.apk");
+        Utils.runDeviceTests(
+                getDevice(), DEVICE_TESTS_PKG, DEVICE_TESTS_CLASS,
+                "testUsingRotatedSigner");
+    }
+
+    @CddTest(requirement="4/C-0-2")
+    public void testV31TargetLaterThanDevicePlatformUsesOriginalKey() throws Exception {
+        // The v3.1 signature block allows targeting SDK versions later than T for rotation; for
+        // this test a target of 100001 is used assuming it will be beyond the platform's version.
+        // Since the target version for rotation is beyond the platform's version the original
+        // signer from the v3.0 block should be used.
+        assertInstallSucceeds("v31-ec-p256_2-tgt-100001.apk");
+        Utils.runDeviceTests(
+                getDevice(), DEVICE_TESTS_PKG, DEVICE_TESTS_CLASS,
+                "testUsingOriginalSigner");
+    }
+
+    @CddTest(requirement="4/C-0-2")
+    public void testV31BlockStrippedWithV3StrippingProtectionAttrSet() throws Exception {
+        // With the introduction of the v3.1 signature scheme, a new stripping protection attribute
+        // has been added to the v3.0 signer to protect against stripping and modification of the
+        // v3.1 signing block. This test verifies a stripped v3.1 block is detected when the v3.0
+        // stripping protection attribute is set.
+        assertInstallFails("v31-block-stripped-v3-attr-value-33.apk");
+    }
+
+    @CddTest(requirement="4/C-0-2")
+    public void testV31BlockWithMultipleSignersUsesCorrectSigner() throws Exception {
+        // All of the APKs for this test use multiple v3.1 signers; those targeting SDK versions
+        // expected to be outside the version of a device under test use the original signer, and
+        // those targeting an expected range for a device use the rotated key. This test is
+        // intended to ensure the signer with the min / max SDK version that matches the device
+        // SDK version is used.
+
+        // The APK used for this test contains two signers in the v3.1 signing block. The first
+        // has a range from 100001 to Integer.MAX_VALUE and is using the original signing key;
+        // the second targets 33 to 100000 using the rotated key.
+        assertInstallSucceeds("v31-ec-p256_2-tgt-33-ec-p256-tgt-100001.apk");
+        Utils.runDeviceTests(
+                getDevice(), DEVICE_TESTS_PKG, DEVICE_TESTS_CLASS,
+                "testUsingRotatedSigner");
+        uninstallPackage();
+
+        // The APK for this test contains two signers in the v3.1 block, one targeting SDK versions
+        // 1 to 27 using the original signer, and the other targeting 33+ using the rotated signer.
+        assertInstallSucceeds("v31-ec-p256_2-tgt-33-ec-p256-tgt-1-27.apk");
+        Utils.runDeviceTests(
+                getDevice(), DEVICE_TESTS_PKG, DEVICE_TESTS_CLASS,
+                "testUsingRotatedSigner");
+        uninstallPackage();
+
+        // This APK combines the extra signers from the APKs above, one targeting 1 to 27 with the
+        // original signing key, another targeting 100001+ with the original signing key, and the
+        // last targeting 33 to 100000 with the rotated key.
+        assertInstallSucceeds("v31-ec-p256_2-tgt-33-ec-p256-tgt-1-27-and-100001.apk");
+        Utils.runDeviceTests(
+                getDevice(), DEVICE_TESTS_PKG, DEVICE_TESTS_CLASS,
+                "testUsingRotatedSigner");
+    }
+
+    @CddTest(requirement="4/C-0-2")
+    public void testV31UpdateV3ToFromV31Succeeds() throws Exception {
+        // Since the v3.1 block is just intended to allow targeting SDK versions T and later for
+        // rotation, an APK signed with the rotated key in a v3.0 signing block should support
+        // updates to an APK signed with the same signing key in a v3.1 signing block.
+        assertInstallFromBuildSucceeds("v3-ec-p256-with-por_1_2-default-caps.apk");
+        assertInstallSucceeds("v31-ec-p256_2-tgt-33.apk");
+        uninstallPackage();
+
+        // Similarly an APK signed with the rotated key in a v3.1 signing block should support
+        // updates to an APK signed with the same signing key in a v3.0 signing block.
+        assertInstallSucceeds("v31-ec-p256_2-tgt-33.apk");
+        assertInstallFromBuildSucceeds("v3-ec-p256-with-por_1_2-default-caps.apk");
+        uninstallPackage();
+    }
+
+    @CddTest(requirement="4/C-0-2")
+    public void testV31RotationTargetModifiedReportedByV3() throws Exception {
+        // When determining if a signer in the v3.1 signing block should be applied, the min / max
+        // SDK versions from the signer are compared against the device's SDK version; if the device
+        // is not within the signer's range then the block is skipped, other v3.1 blocks are
+        // checked, and finally the v3.0 block is used. The v3.0 signer block contains an additional
+        // attribute with the rotation-min-sdk-version that was expected in the v3.1 signing
+        // block; if this attribute's value does not match what was found in the v3.1 block the
+        // APK should fail to install.
+        assertInstallFails("v31-ec-p256_2-tgt-33-modified.apk");
+    }
+
+    @CddTest(requirement="4/C-0-2")
+    public void testV31RotationTargetsDevRelease() throws Exception {
+        // The v3.1 signature scheme allows targeting a platform release under development through
+        // the use of a rotation-targets-dev-release additional attribute. Since a platform under
+        // development shares the same SDK version as the most recently released platform, the
+        // attribute is used by the platform to determine if a signer block should be applied. If
+        // the signer's minSdkVersion is the same as the device's SDK version and this attribute
+        // is set, then the platform will check the value of ro.build.version.codename; a value of
+        // "REL" indicates the platform is a release platform, so the current signer block will not
+        // be used. During T's development, the SDK version is 31 and the codename is not "REL", so
+        // this test APK will install on T during development as well as after its release since
+        // the SDK version will be bumped at that point.
+        assertInstallSucceeds("v31-ec-p256_2-tgt-31-dev-release.apk");
+    }
+
+
     public void testInstallTargetSdk30WithV1Signers() throws Exception {
         // An app targeting SDK version >= 30 must have at least a V2 signature; this test verifies
         // an app targeting SDK version 30 with only a V1 signature fails to install.
@@ -1289,7 +1506,7 @@
 
         // non-incremental upgrade with a mismatching key.
         assertInstallFailsWithError("v4-inc-to-v3-noninc-ec-p384-appv2.apk",
-                "signatures do not match previously installed version");
+                "signatures do not match newer version");
     }
 
     public void testV4IncToV3NonIncRotatedKeyUpgradeSucceeds() throws Exception {
@@ -1318,7 +1535,7 @@
 
         // non-incremental upgrade with key rotation mismatch with key used in app v1.
         assertInstallFailsWithError("v4-inc-to-v3-noninc-ec-p384-rotated-ec-p256-appv2.apk",
-                "signatures do not match previously installed version");
+                "signatures do not match newer version");
     }
 
     public void testV4IncToV2NonIncSameKeyUpgradeSucceeds() throws Exception {
@@ -1347,7 +1564,7 @@
 
         // non-incremental upgrade with a mismatching key.
         assertInstallFailsWithError("v4-inc-to-v2-noninc-ec-p384-appv2.apk",
-                "signatures do not match previously installed version");
+                "signatures do not match newer version");
     }
 
     public void testInstallV4UpdateAfterRotation() throws Exception {
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/PrivilegedUpdateTests.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/PrivilegedUpdateTests.java
index 9b0a243..2e569a5 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/PrivilegedUpdateTests.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/PrivilegedUpdateTests.java
@@ -18,6 +18,7 @@
 
 import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.LargeTest;
+import android.platform.test.annotations.Presubmit;
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
 import com.android.ddmlib.Log;
@@ -32,6 +33,7 @@
 /**
  * Tests that verify intent filters.
  */
+@Presubmit
 @LargeTest
 @AppModeFull(reason="Instant applications can never be system or privileged")
 public class PrivilegedUpdateTests extends DeviceTestCase implements IAbiReceiver, IBuildReceiver {
@@ -178,6 +180,25 @@
         }
     }
 
+    public void testUninstallDisabledUpdatedSystemApp_remainingDisabled() throws Exception {
+        if (!isDefaultAbi()) {
+            Log.w(TAG, "Skipping test for non-default abi.");
+            return;
+        }
+
+        getDevice().executeShellCommand("pm enable " + SHIM_PKG);
+        runDeviceTests(TEST_PKG, ".PrivilegedAppDisableTest", "testPrivAppAndEnabled");
+        try {
+            assertNull(getDevice().installPackage(
+                    mBuildHelper.getTestFile(SHIM_UPDATE_APK), true));
+            getDevice().executeShellCommand("pm disable-user " + SHIM_PKG);
+            runDeviceTests(TEST_PKG, ".PrivilegedAppDisableTest", "testUpdatedPrivAppAndDisabled");
+        } finally {
+            getDevice().uninstallPackage(SHIM_PKG);
+        }
+        runDeviceTests(TEST_PKG, ".PrivilegedAppDisableTest", "testPrivAppAndDisabled");
+    }
+
     private void runDeviceTests(String packageName, String testClassName, String testMethodName)
             throws DeviceNotAvailableException {
         Utils.runDeviceTests(getDevice(), packageName, testClassName, testMethodName);
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/ReadableSettingsFieldsTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/ReadableSettingsFieldsTest.java
index 53d81c3..9b2d612 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/ReadableSettingsFieldsTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/ReadableSettingsFieldsTest.java
@@ -45,6 +45,9 @@
     private static final String TEST_CLASS = TEST_PACKAGE + ".ReadSettingsFieldsTest";
     private static final String TEST_APK = "CtsReadSettingsFieldsApp.apk";
     private static final String TEST_APK_TEST_ONLY = "CtsReadSettingsFieldsAppTestOnly.apk";
+    private static final String TEST_APK_TARGET_Q = "CtsReadSettingsFieldsAppTargetQ.apk";
+    private static final String TEST_APK_TARGET_R = "CtsReadSettingsFieldsAppTargetR.apk";
+    private static final String TEST_APK_TARGET_S = "CtsReadSettingsFieldsAppTargetS.apk";
 
     @Before
     public void setUp() throws Exception {
@@ -140,6 +143,25 @@
     }
 
     @Test
+    public void testSettingsKeysNotReadableForAfterR()
+            throws DeviceNotAvailableException, FileNotFoundException {
+        new InstallMultiple().addFile(TEST_APK_TARGET_S).run();
+        runDeviceTests(TEST_PACKAGE, TEST_CLASS,
+                "testSettingsKeysNotReadableForAfterR");
+    }
+
+    @Test
+    public void testSettingsKeysReadableForRMinus()
+            throws DeviceNotAvailableException, FileNotFoundException {
+        new InstallMultiple().addFile(TEST_APK_TARGET_R).run();
+        runDeviceTests(TEST_PACKAGE, TEST_CLASS,
+                "testSettingsKeysReadableForRMinus");
+        new InstallMultiple().addFile(TEST_APK_TARGET_Q).run();
+        runDeviceTests(TEST_PACKAGE, TEST_CLASS,
+                "testSettingsKeysReadableForRMinus");
+    }
+
+    @Test
     public void testQueryGlobalSettingsNoHiddenKeysWithoutAnnotation()
             throws DeviceNotAvailableException {
         runDeviceTests(TEST_PACKAGE, TEST_CLASS,
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/ResumeOnRebootHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/ResumeOnRebootHostTest.java
index be7ab00..8853134 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/ResumeOnRebootHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/ResumeOnRebootHostTest.java
@@ -57,7 +57,7 @@
     private static final String CLASS = PKG + ".EncryptionAppTest";
     private static final String APK = "CtsEncryptionApp.apk";
 
-    private static final String OTHER_APK = "CtsSplitApp29.apk";
+    private static final String OTHER_APK = "CtsSplitApp.apk";
     private static final String OTHER_PKG = "com.android.cts.splitapp";
 
     private static final String FEATURE_REBOOT_ESCROW = "feature:android.hardware.reboot_escrow";
@@ -356,8 +356,8 @@
 
     private void deviceDisableDeviceConfigSync() throws Exception {
         getDevice().executeShellCommand("device_config set_sync_disabled_for_tests persistent");
-        String res = getDevice().executeShellCommand("device_config is_sync_disabled_for_tests");
-        if (res == null || !res.contains("true")) {
+        String res = getDevice().executeShellCommand("device_config get_sync_disabled_for_tests");
+        if (res == null || !res.contains("persistent")) {
             CLog.w(TAG, "Could not disable device config for test");
         }
     }
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/SharedUserIdTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/SharedUserIdTest.java
index 8d1024a..b9b16ce 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/SharedUserIdTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/SharedUserIdTest.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertNotNull;
 
 import android.platform.test.annotations.AppModeFull;
+import android.platform.test.annotations.Presubmit;
 
 import com.android.ddmlib.Log;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
@@ -30,6 +31,7 @@
 /**
  * Set of tests that verify behavior related to apps with shared user IDs
  */
+@Presubmit
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class SharedUserIdTest extends BaseAppSecurityTest {
 
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/SplitTests.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/SplitTests.java
index 5ed4aea..4d0150e 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/SplitTests.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/SplitTests.java
@@ -20,6 +20,7 @@
 
 import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.AppModeInstant;
+import android.platform.test.annotations.Presubmit;
 
 import com.android.compatibility.common.util.CpuFeatures;
 import com.android.tradefed.device.DeviceNotAvailableException;
@@ -41,6 +42,7 @@
 /**
  * Tests that verify installing of various split APKs from host side.
  */
+@Presubmit
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class SplitTests extends BaseAppSecurityTest {
     static final String PKG_NO_RESTART = "com.android.cts.norestart";
@@ -51,6 +53,19 @@
     static final String APK_NEED_SPLIT_FEATURE_WARM = "CtsNeedSplitFeatureWarm.apk";
     static final String APK_NEED_SPLIT_CONFIG = "CtsNeedSplitApp_xxhdpi-v4.apk";
 
+    static final String APK_REQUIRED_SPLIT_TYPE_BASE = "CtsRequiredSplitTypeSplitApp.apk";
+    static final String APK_REQUIRED_SPLIT_TYPE_BASE_UPDATED =
+            "CtsRequiredSplitTypeSplitAppUpdated.apk";
+    static final String APK_REQUIRED_SPLIT_TYPE_DENSITY = "CtsSplitAppTypeDensity.apk";
+    static final String APK_REQUIRED_SPLIT_TYPE_LOCALE = "CtsSplitAppTypeLocale.apk";
+    static final String APK_REQUIRED_SPLIT_TYPE_FOO = "CtsSplitAppTypeFoo.apk";
+    static final String APK_REQUIRED_SPLIT_TYPE_MULTIPLE = "CtsSplitAppTypeMultiple.apk";
+    static final String APK_REQUIRED_SPLIT_TYPE_FEATURE = "CtsSplitAppTypeFeature.apk";
+    static final String APK_REQUIRED_SPLIT_TYPE_FEATURE_DATA = "CtsSplitAppTypeFeatureData.apk";
+    static final String APK_REQUIRED_SPLIT_TYPE_FEATURE_FOO = "CtsSplitAppTypeFeatureFoo.apk";
+    static final String APK_INVALID_REQUIRED_SPLIT_TYPE_BASE =
+            "CtsInvalidRequiredSplitTypeSplitApp.apk";
+
     static final String PKG = "com.android.cts.splitapp";
     static final String CLASS = PKG + ".SplitAppTest";
 
@@ -710,6 +725,170 @@
                 .runExpectingFailure("INSTALL_FAILED_MISSING_SPLIT");
     }
 
+    @Test
+    @AppModeFull(reason = "'full' portion of the hostside test")
+    public void testRequiredSplitTypesInstalledIncomplete_full() throws Exception {
+        testRequiredSplitTypesInstalledIncomplete(false);
+    }
+    @Test
+    @AppModeInstant(reason = "'instant' portion of the hostside test")
+    public void testRequiredSplitTypesInstalledIncomplete_instant() throws Exception {
+        testRequiredSplitTypesInstalledIncomplete(true);
+    }
+    private void testRequiredSplitTypesInstalledIncomplete(boolean instant) throws Exception {
+        new InstallMultiple(instant).addFile(APK_REQUIRED_SPLIT_TYPE_BASE)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_LOCALE)
+                .runExpectingFailure("INSTALL_FAILED_MISSING_SPLIT");
+    }
+
+    @Test
+    @AppModeFull(reason = "'full' portion of the hostside test")
+    public void testInvalidRequiredSplitTypes_full() throws Exception {
+        testInvalidRequiredSplitTypes(false);
+    }
+    @Test
+    @AppModeInstant(reason = "'instant' portion of the hostside test")
+    public void testInvalidRequiredSplitTypes_instant() throws Exception {
+        testInvalidRequiredSplitTypes(true);
+    }
+    private void testInvalidRequiredSplitTypes(boolean instant) throws Exception {
+        new InstallMultiple(instant).addFile(APK_INVALID_REQUIRED_SPLIT_TYPE_BASE)
+                .runExpectingFailure("INSTALL_PARSE_FAILED_MANIFEST_MALFORMED");
+    }
+
+    @Test
+    @AppModeFull(reason = "'full' portion of the hostside test")
+    public void testRequiredSplitTypesInstalledAll_full() throws Exception {
+        testRequiredSplitTypesInstalledAll(false);
+    }
+    @Test
+    @AppModeInstant(reason = "'instant' portion of the hostside test")
+    public void testRequiredSplitTypesInstalledAll_instant() throws Exception {
+        testRequiredSplitTypesInstalledAll(true);
+    }
+    private void testRequiredSplitTypesInstalledAll(boolean instant) throws Exception {
+        new InstallMultiple(instant).addFile(APK_REQUIRED_SPLIT_TYPE_BASE)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_DENSITY)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_LOCALE)
+                .run();
+    }
+
+    @Test
+    @AppModeFull(reason = "'full' portion of the hostside test")
+    public void testRequiredSplitTypesInstalledMultipleOne_full() throws Exception {
+        testRequiredSplitTypesInstalledMultipleOne(false);
+    }
+    @Test
+    @AppModeInstant(reason = "'instant' portion of the hostside test")
+    public void testRequiredSplitTypesInstalledMultipleOne_instant() throws Exception {
+        testRequiredSplitTypesInstalledMultipleOne(true);
+    }
+    private void testRequiredSplitTypesInstalledMultipleOne(boolean instant) throws Exception {
+        new InstallMultiple(instant).addFile(APK_REQUIRED_SPLIT_TYPE_BASE)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_MULTIPLE)
+                .run();
+    }
+
+    @Test
+    @AppModeFull(reason = "'full' portion of the hostside test")
+    public void testRequiredSplitTypesRemoved_full() throws Exception {
+        testRequiredSplitTypesRemoved(false);
+    }
+    @Test
+    @AppModeInstant(reason = "'instant' portion of the hostside test")
+    public void testRequiredSplitTypesRemoved_instant() throws Exception {
+        testRequiredSplitTypesRemoved(true);
+    }
+    private void testRequiredSplitTypesRemoved(boolean instant) throws Exception {
+        // start with a base and three splits
+        new InstallMultiple(instant)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_BASE)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_DENSITY)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_LOCALE)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_FOO)
+                .run();
+        // it's okay to remove non-required split type
+        new InstallMultiple(instant).inheritFrom(PKG).removeSplit("config.foo").run();
+        // but, not to remove a required one
+        new InstallMultiple(instant).inheritFrom(PKG).removeSplit("config.de")
+                .runExpectingFailure("INSTALL_FAILED_MISSING_SPLIT");
+    }
+
+    @Test
+    @AppModeFull(reason = "'full' portion of the hostside test")
+    public void testInheritUpdatedBase_requiredSplitTypesMissing_full() throws Exception {
+        testInheritUpdatedBase_requiredSplitTypesMissing(false);
+    }
+    @Test
+    @AppModeInstant(reason = "'instant' portion of the hostside test")
+    public void testInheritUpdatedBase_requiredSplitTypesMissing_instant() throws Exception {
+        testInheritUpdatedBase_requiredSplitTypesMissing(true);
+    }
+    private void testInheritUpdatedBase_requiredSplitTypesMissing(boolean instant)
+            throws Exception {
+        // start with a base and the required splits
+        new InstallMultiple(instant)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_BASE)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_DENSITY)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_LOCALE)
+                .run();
+        // the updated base requires a new split type, but it's missing
+        new InstallMultiple(instant).inheritFrom(PKG).addFile(APK_REQUIRED_SPLIT_TYPE_BASE_UPDATED)
+                .runExpectingFailure("INSTALL_FAILED_MISSING_SPLIT");
+    }
+
+    @Test
+    @AppModeFull(reason = "'full' portion of the hostside test")
+    public void testInheritUpdatedBase_requiredSplitTypesInstalled_full() throws Exception {
+        testInheritUpdatedBase_requiredSplitTypesInstalled(false);
+    }
+    @Test
+    @AppModeInstant(reason = "'instant' portion of the hostside test")
+    public void testInheritUpdatedBase_requiredSplitTypesInstalled_instant() throws Exception {
+        testInheritUpdatedBase_requiredSplitTypesInstalled(true);
+    }
+    private void testInheritUpdatedBase_requiredSplitTypesInstalled(boolean instant)
+            throws Exception {
+        // start with a base and the required splits
+        new InstallMultiple(instant)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_BASE)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_DENSITY)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_LOCALE)
+                .run();
+        // the updated base requires a split type, and this split also requires another.
+        new InstallMultiple(instant).inheritFrom(PKG)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_BASE_UPDATED)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_FEATURE)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_FEATURE_DATA)
+                .run();
+    }
+
+    @Test
+    @AppModeFull(reason = "'full' portion of the hostside test")
+    public void testRequiredSplitTypesFromSplit_full() throws Exception {
+        testRequiredSplitTypesFromSplit(false);
+    }
+    @Test
+    @AppModeInstant(reason = "'instant' portion of the hostside test")
+    public void testRequiredSplitTypesFromSplit_instant() throws Exception {
+        testRequiredSplitTypesFromSplit(true);
+    }
+    private void testRequiredSplitTypesFromSplit(boolean instant) throws Exception {
+        new InstallMultiple(instant)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_BASE)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_DENSITY)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_LOCALE)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_FEATURE)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_FEATURE_DATA)
+                .addFile(APK_REQUIRED_SPLIT_TYPE_FEATURE_FOO)
+                .run();
+        // it's okay to remove non-required split type for the split
+        new InstallMultiple(instant).inheritFrom(PKG).removeSplit("feature_foo.foo").run();
+        // but, not to remove a required one for the split
+        new InstallMultiple(instant).inheritFrom(PKG).removeSplit("feature_foo.data")
+                .runExpectingFailure("INSTALL_FAILED_MISSING_SPLIT");
+    }
+
     /**
      * Verify that installing a new version of app wipes code cache.
      */
diff --git a/hostsidetests/appsecurity/src/android/appsecurity/cts/StorageHostTest.java b/hostsidetests/appsecurity/src/android/appsecurity/cts/StorageHostTest.java
index 7f4cf27..392f525 100644
--- a/hostsidetests/appsecurity/src/android/appsecurity/cts/StorageHostTest.java
+++ b/hostsidetests/appsecurity/src/android/appsecurity/cts/StorageHostTest.java
@@ -16,6 +16,8 @@
 
 package android.appsecurity.cts;
 
+import static org.junit.Assume.assumeTrue;
+
 import com.android.ddmlib.testrunner.TestResult.TestStatus;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.result.TestDescription;
@@ -31,7 +33,6 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import static org.junit.Assume.assumeTrue;
 
 import java.util.Map;
 
@@ -43,11 +44,15 @@
     private static final String PKG_STATS = "com.android.cts.storagestatsapp";
     private static final String PKG_A = "com.android.cts.storageapp_a";
     private static final String PKG_B = "com.android.cts.storageapp_b";
+    private static  final String PKG_NO_APP_STORAGE = "com.android.cts.noappstorage";
     private static final String APK_STATS = "CtsStorageStatsApp.apk";
     private static final String APK_A = "CtsStorageAppA.apk";
     private static final String APK_B = "CtsStorageAppB.apk";
+    private static final String APK_NO_APP_STORAGE = "CtsNoAppDataStorageApp.apk";
     private static final String CLASS_STATS = "com.android.cts.storagestatsapp.StorageStatsTest";
     private static final String CLASS = "com.android.cts.storageapp.StorageTest";
+    private static final String CLASS_NO_APP_STORAGE =
+            "com.android.cts.noappstorage.NoAppDataStorageTest";
 
     private int[] mUsers;
 
@@ -58,6 +63,7 @@
         installPackage(APK_STATS);
         installPackage(APK_A);
         installPackage(APK_B);
+        installPackage(APK_NO_APP_STORAGE);
 
         for (int user : mUsers) {
             getDevice().executeShellCommand("appops set --user " + user + " " + PKG_STATS
@@ -72,6 +78,7 @@
         getDevice().uninstallPackage(PKG_STATS);
         getDevice().uninstallPackage(PKG_A);
         getDevice().uninstallPackage(PKG_B);
+        getDevice().uninstallPackage(PKG_NO_APP_STORAGE);
     }
 
     @Test
@@ -165,7 +172,6 @@
         // To make the cache clearing logic easier to verify, ignore any cache
         // and low space reserved space.
         getDevice().executeShellCommand("settings put global sys_storage_threshold_max_bytes 0");
-        getDevice().executeShellCommand("settings put global sys_storage_cache_max_bytes 0");
         getDevice().executeShellCommand("svc data disable");
         getDevice().executeShellCommand("svc wifi disable");
         try {
@@ -180,7 +186,6 @@
             }
         } finally {
             getDevice().executeShellCommand("settings delete global sys_storage_threshold_max_bytes");
-            getDevice().executeShellCommand("settings delete global sys_storage_cache_max_bytes");
             getDevice().executeShellCommand("svc data enable");
             getDevice().executeShellCommand("svc wifi enable");
         }
@@ -223,6 +228,16 @@
         }
     }
 
+    @Test
+    public void testNoInternalAppStorage() throws Exception {
+        for (int user : mUsers) {
+            runDeviceTests(
+                    PKG_NO_APP_STORAGE, CLASS_NO_APP_STORAGE, "testNoInternalCeStorage", user);
+            runDeviceTests(
+                    PKG_NO_APP_STORAGE, CLASS_NO_APP_STORAGE, "testNoInternalDeStorage", user);
+        }
+    }
+
     public void waitForIdle() throws Exception {
         // Try getting all pending events flushed out
         for (int i = 0; i < 4; i++) {
diff --git a/hostsidetests/appsecurity/test-apps/AccessSerialModern/src/android/os/cts/AccessSerialModernTest.java b/hostsidetests/appsecurity/test-apps/AccessSerialModern/src/android/os/cts/AccessSerialModernTest.java
index 1eb58ef..938fa4a 100644
--- a/hostsidetests/appsecurity/test-apps/AccessSerialModern/src/android/os/cts/AccessSerialModernTest.java
+++ b/hostsidetests/appsecurity/test-apps/AccessSerialModern/src/android/os/cts/AccessSerialModernTest.java
@@ -24,6 +24,8 @@
 
 import androidx.test.InstrumentationRegistry;
 
+import com.android.compatibility.common.util.ShellIdentityUtils;
+
 import org.junit.Test;
 
 /**
@@ -69,6 +71,20 @@
         }
     }
 
+    @Test
+    public void testGetSerialReturnsExpectedFormat() throws Exception {
+        // Starting in Android 13, the result from Build#getSerial must match the regular
+        // expression "^[a-zA-Z0-9]+$". Since the requirements to access the device serial
+        // number prevent access for standard apps, the shell identity is required to invoke
+        // this method.
+        String serial = ShellIdentityUtils.invokeStaticMethodWithShellPermissions(Build::getSerial);
+
+        assertTrue(
+                "Result from Build#getSerial does not match expected regular expression "
+                        + "\"^[a-zA-Z0-9]+$\"; actual value: "
+                        + serial, serial.matches("^[a-zA-Z0-9]+$"));
+    }
+
     private void grantReadPhoneStatePermission() {
         InstrumentationRegistry.getInstrumentation().getUiAutomation().grantRuntimePermission(
                 InstrumentationRegistry.getContext().getPackageName(),
diff --git a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/src/com/android/cts/applicationvisibility/ApplicationVisibilityCrossUserTest.java b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/src/com/android/cts/applicationvisibility/ApplicationVisibilityCrossUserTest.java
index 042e74a..0e81d2b 100644
--- a/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/src/com/android/cts/applicationvisibility/ApplicationVisibilityCrossUserTest.java
+++ b/hostsidetests/appsecurity/test-apps/ApplicationVisibilityCrossUserApp/src/com/android/cts/applicationvisibility/ApplicationVisibilityCrossUserTest.java
@@ -194,6 +194,100 @@
         } catch (SecurityException e) {}
     }
 
+    /**
+     * Tests getting the uid of the installed packages for the current user.
+     **/
+    @Test
+    public void testGetPackageUidVisibility_currentUser() {
+        final PackageManager pm = mContext.getPackageManager();
+        try {
+            pm.getPackageUid(TINY_PKG, 0 /*flags*/);
+            fail("Should have received a NameNotFoundException");
+        } catch (PackageManager.NameNotFoundException e) {
+            // Expected
+        }
+    }
+
+    /**
+     * Tests getting the uid of the installed packages for primary user,
+     * with cross user permission granted.
+     **/
+    @Test
+    public void testGetPackageUidVisibility_anotherUserCrossUserGrant() {
+        final PackageManager pm = mContext.createContextAsUser(UserHandle.of(getTestUser()),
+                0 /*flags*/).getPackageManager();
+        try {
+            pm.getPackageUid(TINY_PKG, MATCH_KNOWN_PACKAGES);
+        } catch (PackageManager.NameNotFoundException e) {
+            fail("Should not receive a NameNotFoundException");
+        }
+    }
+
+    /**
+     * Tests getting the uid of the installed packages for primary user,
+     * with cross user permission revoked.
+     **/
+    @Test
+    public void testGetPackageUidVisibility_anotherUserCrossUserNoGrant()
+            throws PackageManager.NameNotFoundException {
+        final PackageManager pm = mContext.createContextAsUser(UserHandle.of(getTestUser()),
+                0 /*flags*/).getPackageManager();
+        ungrantAcrossUsersPermission();
+        try {
+            pm.getPackageUid(TINY_PKG, MATCH_KNOWN_PACKAGES);
+            fail("Should have received a SecurityException");
+        } catch (SecurityException e) {
+            // Expected
+        }
+    }
+
+    /**
+     * Tests getting the gids of the installed packages for the current user.
+     **/
+    @Test
+    public void testGetPackageGidsVisibility_currentUser() {
+        final PackageManager pm = mContext.getPackageManager();
+        try {
+            pm.getPackageGids(TINY_PKG, 0 /*flags*/);
+            fail("Should have received a NameNotFoundException");
+        } catch (PackageManager.NameNotFoundException e) {
+            // Expected
+        }
+    }
+
+    /**
+     * Tests getting the gids of the installed packages for primary user,
+     * with cross user permission granted.
+     **/
+    @Test
+    public void testGetPackageGidsVisibility_anotherUserCrossUserGrant() {
+        final PackageManager pm = mContext.createContextAsUser(UserHandle.of(getTestUser()),
+                0 /*flags*/).getPackageManager();
+        try {
+            pm.getPackageUid(TINY_PKG, MATCH_KNOWN_PACKAGES);
+        } catch (PackageManager.NameNotFoundException e) {
+            fail("Should not receive a NameNotFoundException");
+        }
+    }
+
+    /**
+     * Tests getting the gids of the installed packages for primary user,
+     * with cross user permission revoked.
+     **/
+    @Test
+    public void testGetPackageGidsVisibility_anotherUserCrossUserNoGrant()
+            throws PackageManager.NameNotFoundException {
+        final PackageManager pm = mContext.createContextAsUser(UserHandle.of(getTestUser()),
+                0 /*flags*/).getPackageManager();
+        ungrantAcrossUsersPermission();
+        try {
+            pm.getPackageUid(TINY_PKG, MATCH_KNOWN_PACKAGES);
+            fail("Should have received a SecurityException");
+        } catch (SecurityException e) {
+            // Expected
+        }
+    }
+
     private boolean isAppInPackageList(String packageName,
             List<PackageInfo> packageList) {
         for (PackageInfo pkgInfo : packageList) {
diff --git a/hostsidetests/appsecurity/test-apps/CorruptApkTests/OWNERS b/hostsidetests/appsecurity/test-apps/CorruptApkTests/OWNERS
index 21cd9d9..870d1a4 100644
--- a/hostsidetests/appsecurity/test-apps/CorruptApkTests/OWNERS
+++ b/hostsidetests/appsecurity/test-apps/CorruptApkTests/OWNERS
@@ -1,2 +1,2 @@
 # Bug component: 568761
-rtmitchell@google.com
+zyy@google.com
diff --git a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp
index ef54b1a..ed22bab 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.bp
@@ -23,6 +23,7 @@
     defaults: ["cts_support_defaults"],
     sdk_version: "test_current",
     static_libs: [
+        "androidx.appcompat_appcompat",
         "androidx.test.rules",
         "compatibility-device-util-axt",
         "ctstestrunner-axt",
diff --git a/hostsidetests/appsecurity/test-apps/DocumentClient/src/com/android/cts/documentclient/DocumentsClientTest.java b/hostsidetests/appsecurity/test-apps/DocumentClient/src/com/android/cts/documentclient/DocumentsClientTest.java
index 1fecc44..0df4795 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentClient/src/com/android/cts/documentclient/DocumentsClientTest.java
+++ b/hostsidetests/appsecurity/test-apps/DocumentClient/src/com/android/cts/documentclient/DocumentsClientTest.java
@@ -46,6 +46,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.os.BuildCompat;
 
 import com.android.cts.documentclient.MyActivity.Result;
 
@@ -71,6 +72,7 @@
     private static final String TEST_TARGET_DIRECTORY_PATH =
             TEST_SOURCE_DIRECTORY_PATH + File.separatorChar + TEST_TARGET_DIRECTORY_NAME;
     private static final String STORAGE_AUTHORITY = "com.android.externalstorage.documents";
+    private static final String DEFAULT_DEVICE_NAME = "Internal storage";
 
     private UiSelector findRootListSelector() throws UiObjectNotFoundException {
         return new UiSelector().resourceId(
@@ -173,19 +175,19 @@
         return new UiObject(new UiSelector().resourceId("android:id/button1"));
     }
 
-    private void assertToolbarTitleEquals(String label) throws UiObjectNotFoundException {
+    private boolean checkToolbarTitleEquals(String label) throws UiObjectNotFoundException {
         final UiObject title = new UiObject(new UiSelector().resourceId(
                 getDocumentsUiPackageId() + ":id/toolbar").childSelector(
                 new UiSelector().className("android.widget.TextView").text(label)));
 
-        assertTrue(title.waitForExists(TIMEOUT));
+        return title.waitForExists(TIMEOUT);
     }
 
     private String getDeviceName() {
         final String deviceName = Settings.Global.getString(
                 mActivity.getContentResolver(), Settings.Global.DEVICE_NAME);
-        // Device name should always be set. In case it isn't, fall back to "Internal Storage"
-        return !TextUtils.isEmpty(deviceName) ? deviceName : "Internal Storage";
+        // Device name should always be set. In case it isn't, fall back to "Internal storage"
+        return !TextUtils.isEmpty(deviceName) ? deviceName : DEFAULT_DEVICE_NAME;
     }
 
     @Override
@@ -431,15 +433,25 @@
         // save button is disabled for the storage root
         assertFalse(findSaveButton().isEnabled());
 
-        // We should always have Android directory available
-        findDocument("Android").click();
-        mDevice.waitForIdle();
+        // SAF directory access to /Android is blocked in ag/13163842, this change may not be
+        // present on some R devices, so only test it from above S.
+        if (BuildCompat.isAtLeastS()) {
+            // We should always have Android directory available
+            findDocument("Android").click();
+            mDevice.waitForIdle();
 
-        // save button is disabled for Android folder
-        assertFalse(findSaveButton().isEnabled());
+            // save button is disabled for Android folder
+            assertFalse(findSaveButton().isEnabled());
+        }
 
-        findRoot(getDeviceName()).click();
-        mDevice.waitForIdle();
+        try {
+            findRoot(getDeviceName()).click();
+            mDevice.waitForIdle();
+        } catch(UiObjectNotFoundException e) {
+            // It might be possible that OEMs customize storage root to "Internal storage".
+            findRoot(DEFAULT_DEVICE_NAME).click();
+            mDevice.waitForIdle();
+        }
 
         try {
             findDocument("Download").click();
@@ -486,8 +498,14 @@
         // save button is enabled for Android folder
         assertTrue(findSaveButton().isEnabled());
 
-        findRoot(getDeviceName()).click();
-        mDevice.waitForIdle();
+        try {
+            findRoot(getDeviceName()).click();
+            mDevice.waitForIdle();
+        } catch(UiObjectNotFoundException e) {
+            // It might be possible that OEMs customize storage root to "Internal storage".
+            findRoot(DEFAULT_DEVICE_NAME).click();
+            mDevice.waitForIdle();
+        }
 
         try {
             findDocument("Download").click();
@@ -804,8 +822,9 @@
         mActivity.startActivityForResult(intent, REQUEST_CODE);
         mDevice.waitForIdle();
 
-        // assert the default root is internal storage root
-        assertToolbarTitleEquals(getDeviceName());
+        // assert toolbar title should be set to either device name or "Internal storage".
+        assertTrue(checkToolbarTitleEquals(getDeviceName())
+            || checkToolbarTitleEquals(DEFAULT_DEVICE_NAME));
 
         // no Downloads root
         assertFalse(findRoot("Downloads").exists());
@@ -974,6 +993,9 @@
         assertEquals(displayName, getColumn(uri, Document.COLUMN_DISPLAY_NAME));
         assertEquals(mimeType, getColumn(uri, Document.COLUMN_MIME_TYPE));
 
+        // Multiple calls to this method too quickly may result in onActivityResult being skipped.
+        mDevice.waitForIdle();
+
         return uri;
     }
 
diff --git a/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/Android.bp b/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/Android.bp
index 5f80327..d667402 100644
--- a/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/Android.bp
@@ -30,3 +30,23 @@
         "general-tests",
     ],
 }
+
+android_test_import {
+    name: "CtsDuplicatePermissionDeclareApp_DifferentProtectionLevel",
+    apk: "apk/b211934395_DifferentProtectionLevel.apk",
+    presigned: true,
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_import {
+    name: "CtsDuplicatePermissionDeclareApp_SameProtectionLevel",
+    apk: "apk/b211934395_SameProtectionLevel.apk",
+    presigned: true,
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
diff --git a/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/apk/b211934395_DifferentProtectionLevel.apk b/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/apk/b211934395_DifferentProtectionLevel.apk
new file mode 100644
index 0000000..e25d176
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/apk/b211934395_DifferentProtectionLevel.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/apk/b211934395_SameProtectionLevel.apk b/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/apk/b211934395_SameProtectionLevel.apk
new file mode 100644
index 0000000..15e6a5d
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/DuplicatePermissionDeclareApp/apk/b211934395_SameProtectionLevel.apk
Binary files differ
diff --git a/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/Android.bp b/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/Android.bp
index 07ec92a..74403bc 100644
--- a/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/Android.bp
@@ -57,6 +57,7 @@
 android_test {
     name: "CtsSignatureQueryServiceTest_v2",
     defaults: ["cts_support_defaults"],
+    manifest: "AndroidManifest_v2.xml",
     compile_multilib: "both",
     sdk_version: "current",
     srcs: ["src/**/*.java"],
@@ -75,7 +76,7 @@
     ],
     certificate: ":ec-p256_2",
     additional_certificates: [":ec-p256"],
-    lineage : ":ec-p256-por_1_2-default-caps",
+    lineage: ":ec-p256-por_1_2-default-caps",
     v4_signature: true,
     // Disable dexpreopt and <uses-library> check for test
     enforce_uses_libs: false,
diff --git a/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/AndroidManifest.xml
index e4981ee..0436f08 100644
--- a/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/AndroidManifest.xml
@@ -14,7 +14,8 @@
      limitations under the License.
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.appsecurity.cts.keyrotationtest.test">
+    package="android.appsecurity.cts.keyrotationtest.test"
+    android:versionCode="1">
   <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
                    android:targetPackage="android.appsecurity.cts.keyrotationtest" />
   <application/>
diff --git a/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/AndroidManifest_v2.xml b/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/AndroidManifest_v2.xml
new file mode 100644
index 0000000..3206a52
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/KeyRotationTest/ServiceTest/AndroidManifest_v2.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.appsecurity.cts.keyrotationtest.test"
+    android:versionCode="2">
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.appsecurity.cts.keyrotationtest" />
+    <application/>
+</manifest>
+
diff --git a/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest.xml
index 64f7657..4065604 100644
--- a/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/MediaStorageApp/AndroidManifest.xml
@@ -39,6 +39,9 @@
     <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION"/>
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.MANAGE_MEDIA"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO"/>
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 
diff --git a/hostsidetests/appsecurity/test-apps/MediaStorageApp/src/com/android/cts/mediastorageapp/MediaStorageTest.java b/hostsidetests/appsecurity/test-apps/MediaStorageApp/src/com/android/cts/mediastorageapp/MediaStorageTest.java
index 36ad932..b3d1d1c 100644
--- a/hostsidetests/appsecurity/test-apps/MediaStorageApp/src/com/android/cts/mediastorageapp/MediaStorageTest.java
+++ b/hostsidetests/appsecurity/test-apps/MediaStorageApp/src/com/android/cts/mediastorageapp/MediaStorageTest.java
@@ -16,9 +16,12 @@
 
 package com.android.cts.mediastorageapp;
 
+import static android.provider.MediaStore.VOLUME_EXTERNAL;
+
 import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -70,6 +73,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.concurrent.Callable;
@@ -124,7 +129,7 @@
 
         final HashSet<Long> seen = new HashSet<>();
         try (Cursor c = mContentResolver.query(
-                MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL),
+                MediaStore.Files.getContentUri(VOLUME_EXTERNAL),
                 new String[] { MediaColumns._ID }, null, null)) {
             while (c.moveToNext()) {
                 seen.add(c.getLong(0));
@@ -217,10 +222,191 @@
     }
 
     /**
-     * Test prefix and non-prefix uri grant for all packages
+     * If the app grants read UriPermission to the uri without id (E.g.
+     * MediaStore.Audio.Media.EXTERNAL_CONTENT_URI), the query result of the uri should be the
+     * same without granting permission.
      */
     @Test
-    public void testGrantUriPermission() {
+    public void testReadUriPermissionOnUriWithoutId_sameQueryResult() throws Exception {
+        // For Audio, Image, Video, If the app doesn't have delete access to the uri,
+        // MediaProvider throws SecurityException to give callers interacting with a specific media
+        // item a chance to escalate access if they don't already have it. Check SecurityException
+        // for them.
+        doReadUriPermissionOnUriWithoutId_sameQueryResult(
+                MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createAudio, /* checkExceptionForDelete= */ true);
+        doReadUriPermissionOnUriWithoutId_sameQueryResult(
+                MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createVideo,/* checkExceptionForDelete= */  true);
+        doReadUriPermissionOnUriWithoutId_sameQueryResult(
+                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createImage,/* checkExceptionForDelete= */  true);
+
+        doReadUriPermissionOnUriWithoutId_sameQueryResult(
+                MediaStore.Audio.Albums.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createAudio, /* checkExceptionForDelete= */ true);
+        doReadUriPermissionOnUriWithoutId_sameQueryResult(
+                MediaStore.Audio.Artists.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createAudio, /* checkExceptionForDelete= */ true);
+        doReadUriPermissionOnUriWithoutId_sameQueryResult(
+                MediaStore.Audio.Genres.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createAudio, /* checkExceptionForDelete= */ true);
+
+        doReadUriPermissionOnUriWithoutId_sameQueryResult(
+                MediaStore.Downloads.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createDownload,/* checkExceptionForDelete= */  false);
+        doReadUriPermissionOnUriWithoutId_sameQueryResult(
+                MediaStore.Files.getContentUri(VOLUME_EXTERNAL),
+                MediaStorageTest::createFile,/* checkExceptionForDelete= */  false);
+        doReadUriPermissionOnUriWithoutId_sameQueryResult(
+                MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createPlaylist,/* checkExceptionForDelete= */  false);
+    }
+
+    /**
+     * If the app grants read UriPermission to the uri without id (E.g.
+     * MediaStore.Audio.Media.EXTERNAL_CONTENT_URI), the query result of the uri should be the
+     * same without granting permission.
+     */
+    private void doReadUriPermissionOnUriWithoutId_sameQueryResult(Uri collectionUri,
+            Callable<Uri> create, boolean checkExceptionForDelete) throws Exception {
+        final int flagGrantRead = Intent.FLAG_GRANT_READ_URI_PERMISSION;
+        final Uri red = create.call();
+        final Uri blue = create.call();
+        clearMediaOwner(blue, mUserId);
+        final int originalCount;
+
+        try {
+            try (Cursor c = mContentResolver.query(collectionUri, new String[]{MediaColumns._ID},
+                    null, null)) {
+                originalCount = c.getCount();
+            }
+
+            mContext.grantUriPermission(mContext.getPackageName(), collectionUri, flagGrantRead);
+            try (Cursor c = mContentResolver.query(collectionUri, new String[]{MediaColumns._ID},
+                    null, null)) {
+                assertWithMessage("After grant read UriPermission to " + collectionUri.toString()
+                        + ", the item count of the query result" ).that(c.getCount()).isEqualTo(
+                        originalCount);
+            }
+
+            try (ParcelFileDescriptor pfd = mContentResolver.openFileDescriptor(red, "rw")) {
+            }
+
+            try (ParcelFileDescriptor pfd = mContentResolver.openFileDescriptor(blue, "r")) {
+                fail("Expected read access to " + blue.toString() + " be blocked");
+            } catch (SecurityException | FileNotFoundException expected) {
+            }
+
+            try (ParcelFileDescriptor pfd = mContentResolver.openFileDescriptor(blue, "w")) {
+                fail("Expected write access to " + blue.toString() + " be blocked");
+            } catch (SecurityException | FileNotFoundException expected) {
+            }
+
+            // If checkExceptionForDelete is true, throws SecurityException is as we expected.
+            // Otherwise, the app doesn't have delete access to the file, the deleted count is 0.
+            if (checkExceptionForDelete) {
+                try {
+                    mContentResolver.delete(blue, null);
+                    fail("Expected delete access to " + blue.toString() + " be blocked");
+                } catch (SecurityException expected) {
+                }
+            } else {
+                final int count = mContentResolver.delete(blue, null);
+                assertThat(count).isEqualTo(0);
+            }
+        } finally {
+            mContext.revokeUriPermission(mContext.getPackageName(), collectionUri, flagGrantRead);
+        }
+    }
+
+    /**
+     * b/197302116. The apps can't be granted prefix UriPermissions to the uri, when the query
+     * result of the uri is 1.
+     */
+    @Test
+    public void testOwningOneFileNotGrantPrefixUriPermission() throws Exception {
+        doOwningOneFileNotGrantPrefixUriPermission(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createAudio);
+        doOwningOneFileNotGrantPrefixUriPermission(MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createVideo);
+        doOwningOneFileNotGrantPrefixUriPermission(MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createImage);
+        doOwningOneFileNotGrantPrefixUriPermission(MediaStore.Downloads.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createDownload);
+        doOwningOneFileNotGrantPrefixUriPermission(MediaStore.Files.getContentUri(VOLUME_EXTERNAL),
+                MediaStorageTest::createFile);
+        doOwningOneFileNotGrantPrefixUriPermission(MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI,
+                MediaStorageTest::createPlaylist);
+    }
+
+    /**
+     * The apps can't be granted prefix UriPermissions to the uri without id, when the query result
+     * of the uri is 1.
+     */
+    private void doOwningOneFileNotGrantPrefixUriPermission(Uri collectionUri, Callable<Uri> create)
+            throws Exception {
+
+        clearOwnFiles(collectionUri);
+
+        final Uri red = create.call();
+        final Uri blue = create.call();
+        clearMediaOwner(blue, mUserId);
+
+        try (Cursor c = mContentResolver.query(collectionUri, new String[]{MediaColumns._ID}, null,
+                null)) {
+            assertThat(c.getCount()).isEqualTo(1);
+            c.moveToFirst();
+            assertThat(c.getLong(0)).isEqualTo(ContentUris.parseId(red));
+        }
+
+        final int flagGrantReadPrefix =
+                Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION;
+        try {
+            mContext.grantUriPermission(mContext.getPackageName(), collectionUri,
+                    flagGrantReadPrefix);
+            fail("Expected granting to " + collectionUri.toString() + " be blocked for flag 0x"
+                    + Integer.toHexString(flagGrantReadPrefix));
+        } catch (SecurityException expected) {
+        }
+
+        try (ParcelFileDescriptor pfd = mContentResolver.openFileDescriptor(red, "r")) {
+        }
+
+        try (ParcelFileDescriptor pfd = mContentResolver.openFileDescriptor(blue, "r")) {
+            fail("Expected read access to " + blue.toString() + " be blocked");
+        } catch (SecurityException | FileNotFoundException expected) {
+        }
+
+        final int flagGrantWritePrefix = Intent.FLAG_GRANT_WRITE_URI_PERMISSION
+                | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION;
+        try {
+            mContext.grantUriPermission(mContext.getPackageName(), collectionUri,
+                    flagGrantWritePrefix);
+            fail("Expected granting to " + collectionUri.toString() + " be blocked for flag 0x"
+                    + Integer.toHexString(flagGrantWritePrefix));
+        } catch (SecurityException expected) {
+        }
+
+        try (ParcelFileDescriptor pfd = mContentResolver.openFileDescriptor(red, "rw")) {
+        }
+
+        try (ParcelFileDescriptor pfd = mContentResolver.openFileDescriptor(blue, "w")) {
+            fail("Expected write access to " + blue.toString() + " be blocked");
+        } catch (SecurityException | FileNotFoundException expected) {
+        }
+    }
+
+    @Test
+    public void testGrantUriPermission() throws Exception {
+        doGrantUriPermission_nonPrefixAndPrefix();
+        doGrantUriPermission_prefix();
+    }
+
+    /**
+     * Test prefix and non-prefix uri grant for all packages
+     */
+    private void doGrantUriPermission_nonPrefixAndPrefix() {
         final int flagGrantRead = Intent.FLAG_GRANT_READ_URI_PERMISSION;
         final int flagGrantWrite = Intent.FLAG_GRANT_WRITE_URI_PERMISSION;
         final int flagGrantReadPrefix =
@@ -228,20 +414,44 @@
         final int flagGrantWritePrefix =
                 Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION;
 
-        for (Uri uri : new Uri[] {
+        for (Uri uri : new Uri[]{
                 MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
                 MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
                 MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
                 MediaStore.Downloads.EXTERNAL_CONTENT_URI,
-                MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
+                MediaStore.Files.getContentUri(VOLUME_EXTERNAL)
         }) {
             // Non-prefix grant
-            checkGrantUriPermission(uri, flagGrantRead, true);
-            checkGrantUriPermission(uri, flagGrantWrite, true);
+            checkGrantUriPermission(uri, flagGrantRead, /* isGrantAllowed */ true);
+            checkGrantUriPermission(uri, flagGrantWrite, /* isGrantAllowed */ true);
 
             // Prefix grant
-            checkGrantUriPermission(uri, flagGrantReadPrefix, false);
-            checkGrantUriPermission(uri, flagGrantWritePrefix, false);
+            checkGrantUriPermission(uri, flagGrantReadPrefix, /* isGrantAllowed */ false);
+            checkGrantUriPermission(uri, flagGrantWritePrefix, /* isGrantAllowed */ false);
+
+            // revoke granted permissions
+            mContext.revokeUriPermission(uri, flagGrantRead | flagGrantWrite);
+        }
+    }
+
+    /**
+     * b/194539422. Test prefix uri grant for all packages
+     */
+    private void doGrantUriPermission_prefix() {
+        final int flagGrantReadPrefix =
+                Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION;
+        final int flagGrantWritePrefix =
+                Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_PREFIX_URI_PERMISSION;
+
+        for (Uri uri : new Uri[]{
+                MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
+                MediaStore.Video.Media.EXTERNAL_CONTENT_URI,
+                MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                MediaStore.Downloads.EXTERNAL_CONTENT_URI,
+                MediaStore.Files.getContentUri(VOLUME_EXTERNAL)
+        }) {
+            checkGrantUriPermission(uri, flagGrantReadPrefix, /* isGrantAllowed */ false);
+            checkGrantUriPermission(uri, flagGrantWritePrefix, /* isGrantAllowed */ false);
         }
     }
 
@@ -251,7 +461,8 @@
         } else {
             try {
                 mContext.grantUriPermission(mContext.getPackageName(), uri, mode);
-                fail("Expected granting to be blocked for flag 0x" + Integer.toHexString(mode));
+                fail("Expected granting to " + uri.toString() + " be blocked for flag 0x"
+                        + Integer.toHexString(mode));
             } catch (SecurityException expected) {
             }
         }
@@ -438,15 +649,14 @@
 
         try (ParcelFileDescriptor pfd = mContentResolver.openFileDescriptor(red, "w")) {
         }
-        // Wait for MediaStore to be idle to avoid flakiness due to race conditions between
-        // MediaStore.scanFile (which is called above in #openFileDescriptor) and rename (which is
-        // called below). This is a known issue: b/158982091
+        // Wait for MediaStore to be idle to avoid flakiness due to race conditions
         MediaStore.waitForIdle(mContentResolver);
 
         // Check File API support
         assertAccessFileAPISupport(file);
         assertReadWriteFileAPISupport(file);
         assertRenameFileAPISupport(file);
+        assertRenameAndReplaceFileAPISupport(file, create);
         assertDeleteFileAPISupport(file);
     }
 
@@ -471,15 +681,52 @@
     public void assertRenameFileAPISupport(File oldFile) throws Exception {
         final String oldName = oldFile.getAbsolutePath();
         final String extension = oldName.substring(oldName.lastIndexOf('.')).trim();
-        // TODO(b/178816495): Changing the extension changes the media-type and hence the media-URI
-        // corresponding to the new file is not accessible to the caller. Rename to the same
-        // extension so that the test app does not lose access and is able to delete the file.
-        final String newName = "cts" + System.nanoTime() + extension;
-        final File newFile = Environment.buildPath(Environment.getExternalStorageDirectory(),
-                Environment.DIRECTORY_DOWNLOADS, newName);
-        assertThat(oldFile.renameTo(newFile)).isTrue();
+        // Rename to same extension so test app does not lose access to file.
+        final String newRelativeName = "cts" + System.nanoTime() + extension;
+        final File newFile = Environment.buildPath(
+            Environment.getExternalStorageDirectory(),
+            Environment.DIRECTORY_DOWNLOADS,
+            newRelativeName);
+        final String newName = newFile.getAbsolutePath();
+        assertWithMessage("Rename from oldName [%s] to newName [%s]", oldName, newName)
+            .that(oldFile.renameTo(newFile))
+            .isTrue();
         // Rename back to oldFile for other ops like delete
-        assertThat(newFile.renameTo(oldFile)).isTrue();
+        assertWithMessage("Rename back from newName [%s] to oldName [%s]", newName, oldName)
+            .that(newFile.renameTo(oldFile))
+            .isTrue();
+    }
+
+    public void assertRenameAndReplaceFileAPISupport(File oldFile, Callable<Uri> create)
+            throws Exception {
+        final String oldName = oldFile.getAbsolutePath();
+
+        // Create new file to which we do not have any access.
+        final Uri newUri = create.call();
+        assertWithMessage("Check newFile created").that(newUri).isNotNull();
+        File newFile = new File(queryForSingleColumn(newUri, MediaColumns.DATA));
+        final String newName = newFile.getAbsolutePath();
+        clearMediaOwner(newUri, mUserId);
+
+        assertWithMessage(
+            "Rename should fail without newFile grant from oldName [%s] to newName [%s]",
+            oldName, newName)
+            .that(oldFile.renameTo(newFile))
+            .isFalse();
+
+        // Grant access to newFile and rename should succeed.
+        doEscalation(MediaStore.createWriteRequest(mContentResolver, Arrays.asList(newUri)));
+        assertWithMessage("Rename from oldName [%s] to newName [%s]", oldName, newName)
+            .that(oldFile.renameTo(newFile))
+            .isTrue();
+
+        // We need to request grant on newUri again, since the rename above caused the URI grant
+        // to be revoked.
+        doEscalation(MediaStore.createWriteRequest(mContentResolver, Arrays.asList(newUri)));
+        // Rename back to oldFile for other ops like delete
+        assertWithMessage("Rename back from newName [%s] to oldName [%s]", newName, oldName)
+            .that(newFile.renameTo(oldFile))
+            .isTrue();
     }
 
     private void assertDeleteFileAPISupport(File file) throws Exception {
@@ -783,12 +1030,38 @@
         }
     }
 
+    private static Uri createDownload() throws IOException {
+        final String content = "<html><body>Content</body></html>";
+        final String displayName = "cts" + System.nanoTime();
+        final String mimeType = "text/html";
+        final Context context = InstrumentationRegistry.getTargetContext();
+        final PendingParams params = new PendingParams(
+                MediaStore.Downloads.EXTERNAL_CONTENT_URI, displayName, mimeType);
+
+        final Uri pendingUri = MediaStoreUtils.createPending(context, params);
+        assertNotNull(pendingUri);
+        try (PendingSession session = MediaStoreUtils.openPending(context, pendingUri)) {
+            try (PrintWriter pw = new PrintWriter(session.openOutputStream())) {
+                pw.print(content);
+            }
+            try (OutputStream out = session.openOutputStream()) {
+                out.write(content.getBytes(StandardCharsets.UTF_8));
+            }
+            return session.publish();
+        }
+    }
+
+    private static Uri createFile() throws IOException {
+        return createSubtitle();
+    }
+
     private static Uri createAudio() throws IOException {
         final Context context = InstrumentationRegistry.getTargetContext();
         final String displayName = "cts" + System.nanoTime();
         final PendingParams params = new PendingParams(
                 MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, displayName, "audio/mpeg");
         final Uri pendingUri = MediaStoreUtils.createPending(context, params);
+
         try (PendingSession session = MediaStoreUtils.openPending(context, pendingUri)) {
             try (InputStream in = context.getResources().getAssets().open("testmp3.mp3");
                     OutputStream out = session.openOutputStream()) {
@@ -843,7 +1116,7 @@
         final Context context = InstrumentationRegistry.getTargetContext();
         final String displayName = "cts" + System.nanoTime();
         final PendingParams params = new PendingParams(
-                MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL), displayName,
+                MediaStore.Files.getContentUri(VOLUME_EXTERNAL), displayName,
                 "application/x-subrip");
         final Uri pendingUri = MediaStoreUtils.createPending(context, params);
         try (PendingSession session = MediaStoreUtils.openPending(context, pendingUri)) {
@@ -865,6 +1138,18 @@
         }
     }
 
+    private static void clearOwnFiles(Uri uri) throws Exception {
+        final ContentResolver resolver = InstrumentationRegistry.getTargetContext()
+                .getContentResolver();
+        try (Cursor c = resolver.query(uri, new String[]{MediaColumns._ID}, null, null)) {
+            while(c.moveToNext()) {
+                final long id = c.getLong(0);
+                final Uri contentUri = ContentUris.withAppendedId(uri, id);
+                resolver.delete(contentUri, null);
+            }
+        }
+    }
+
     private static void clearMediaOwner(Uri uri, int userId) throws IOException {
         final String cmd = String.format(
                 "content update --uri %s --user %d --bind owner_package_name:n:",
diff --git a/hostsidetests/appsecurity/test-apps/NoDataStorageApp/Android.bp b/hostsidetests/appsecurity/test-apps/NoDataStorageApp/Android.bp
new file mode 100644
index 0000000..146524c
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/NoDataStorageApp/Android.bp
@@ -0,0 +1,33 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsNoAppDataStorageApp",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "test_current",
+    static_libs: [
+        "androidx.test.runner",
+        "androidx.test.core",
+        "truth-prebuilt",
+    ],
+    srcs: ["src/**/*.java"],
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
diff --git a/hostsidetests/appsecurity/test-apps/NoDataStorageApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/NoDataStorageApp/AndroidManifest.xml
new file mode 100644
index 0000000..ea164a1
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/NoDataStorageApp/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.cts.noappstorage">
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="com.android.cts.noappstorage"
+                     android:label="Tests for app without data storage" />
+
+    <application>
+        <property android:name="android.internal.PROPERTY_NO_APP_DATA_STORAGE"
+                  android:value="true" />
+        <uses-library android:name="android.test.runner"/>
+    </application>
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/NoDataStorageApp/OWNERS b/hostsidetests/appsecurity/test-apps/NoDataStorageApp/OWNERS
new file mode 100644
index 0000000..601d04b
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/NoDataStorageApp/OWNERS
@@ -0,0 +1,2 @@
+include platform/frameworks/base:/core/java/android/os/storage/OWNERS
+ioffe@google.com
\ No newline at end of file
diff --git a/hostsidetests/appsecurity/test-apps/NoDataStorageApp/src/com/android/cts/noappstorage/NoAppDataStorageTest.java b/hostsidetests/appsecurity/test-apps/NoDataStorageApp/src/com/android/cts/noappstorage/NoAppDataStorageTest.java
new file mode 100644
index 0000000..e69ef3e
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/NoDataStorageApp/src/com/android/cts/noappstorage/NoAppDataStorageTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2021 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.cts.noappstorage;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.io.File;
+
+/**
+ * Tests that exercise behaviour of an app without access to apps' data storage.
+ */
+// TODO(b/211761016): add tests for external storage.
+@RunWith(JUnit4.class)
+public class NoAppDataStorageTest {
+
+    private final Context mCeContext = getInstrumentation().getContext();
+    private final Context mDeContext = mCeContext.createDeviceProtectedStorageContext();
+
+    @Test
+    public void testNoInternalCeStorage() throws Exception {
+        assertDirDoesNotExist(mCeContext.getDataDir());
+        assertDirDoesNotExist(mCeContext.getFilesDir());
+        assertDirDoesNotExist(mCeContext.getCacheDir());
+        assertDirDoesNotExist(mCeContext.getCodeCacheDir());
+    }
+
+    @Test
+    public void testNoInternalDeStorage() throws Exception {
+        assertDirDoesNotExist(mDeContext.getDataDir());
+        assertDirDoesNotExist(mDeContext.getFilesDir());
+        assertDirDoesNotExist(mDeContext.getCacheDir());
+        assertDirDoesNotExist(mDeContext.getCodeCacheDir());
+    }
+
+    private void assertDirDoesNotExist(File dir) throws Exception {
+        assertThat(dir.exists()).isFalse();
+        assertThat(dir.mkdirs()).isFalse();
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/ReadSettingsFieldsApp/Android.bp b/hostsidetests/appsecurity/test-apps/ReadSettingsFieldsApp/Android.bp
index f375fa5..0af7515 100644
--- a/hostsidetests/appsecurity/test-apps/ReadSettingsFieldsApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/ReadSettingsFieldsApp/Android.bp
@@ -35,6 +35,7 @@
         "general-tests",
     ],
     manifest: "AndroidManifest.xml",
+    sdk_version: "current",
 }
 
 android_test_helper_app {
@@ -56,6 +57,7 @@
         "general-tests",
     ],
     manifest: "AndroidManifestTestOnly.xml",
+    sdk_version: "current",
 }
 
 android_test_helper_app {
@@ -77,6 +79,7 @@
         "general-tests",
     ],
     manifest: "AndroidManifestTargetQ.xml",
+    sdk_version: "current",
 }
 
 android_test_helper_app {
@@ -98,6 +101,7 @@
         "general-tests",
     ],
     manifest: "AndroidManifestTargetR.xml",
+    sdk_version: "current",
 }
 
 android_test_helper_app {
@@ -119,4 +123,5 @@
         "general-tests",
     ],
     manifest: "AndroidManifestTargetS.xml",
-}
\ No newline at end of file
+    sdk_version: "current",
+}
diff --git a/hostsidetests/appsecurity/test-apps/ReadSettingsFieldsApp/src/com/android/cts/readsettingsfieldsapp/ReadSettingsFieldsTest.java b/hostsidetests/appsecurity/test-apps/ReadSettingsFieldsApp/src/com/android/cts/readsettingsfieldsapp/ReadSettingsFieldsTest.java
index e6e2ced..b69b7f2 100644
--- a/hostsidetests/appsecurity/test-apps/ReadSettingsFieldsApp/src/com/android/cts/readsettingsfieldsapp/ReadSettingsFieldsTest.java
+++ b/hostsidetests/appsecurity/test-apps/ReadSettingsFieldsApp/src/com/android/cts/readsettingsfieldsapp/ReadSettingsFieldsTest.java
@@ -27,7 +27,6 @@
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import java.util.ArrayList;
 
 public class ReadSettingsFieldsTest extends AndroidTestCase {
@@ -50,10 +49,10 @@
             try {
                 callGetStringMethod(settingsClass, key);
             } catch (SecurityException ex) {
-                if (isSettingsDeprecated(ex)) {
+                if (isSettingsDeprecated(ex) || isAvailableForLowerOrEqualTargetedSDK(ex)) {
                     continue;
                 }
-                fail("Reading public " + settingsClass.getSimpleName() + " settings key <" + key
+                fail("Reading non-hidden " + settingsClass.getSimpleName() + " settings key <" + key
                         + "> should not raise exception! "
                         + "Did you forget to add @Readable annotation?\n" + ex.getMessage());
             }
@@ -95,6 +94,10 @@
         return ex.getMessage().contains("is deprecated and no longer accessible");
     }
 
+    private boolean isAvailableForLowerOrEqualTargetedSDK(SecurityException ex) {
+        return ex.getMessage().contains("targetSdkVersion lower than or equal");
+    }
+
     /** Test hidden keys are readable with annotation */
     public void testSecureSomeHiddenSettingsKeysAreReadable() {
         final ArraySet<String> publicSettingsKeys = getNonHiddenSettingsKeys(Settings.Secure.class);
@@ -220,6 +223,29 @@
                 hiddenSettingsKeys);
     }
 
+
+    public void testSettingsKeysNotReadableForAfterR() {
+        final String keyWithTargetSdkR = "media_button_receiver";
+        try {
+            // Verify that the hidden key is not readable because of maxTargetSdk restriction
+            callGetStringMethod(Settings.System.class, keyWithTargetSdkR);
+            fail("Reading hidden settings key <" + keyWithTargetSdkR
+                    + "> should raise!");
+        } catch (SecurityException ex) {
+            assertTrue(ex.getMessage().contains("targetSdkVersion"));
+        }
+    }
+
+    public void testSettingsKeysReadableForRMinus() {
+        final String keyWithTargetSdkR = "media_button_receiver";
+        try {
+            // Verify that the hidden key can still be read
+            callGetStringMethod(Settings.System.class, keyWithTargetSdkR);
+        } catch (SecurityException ex) {
+            fail("Reading hidden settings key <" + keyWithTargetSdkR + "> should not raise!");
+        }
+    }
+
     public void testQueryGlobalSettingsNoHiddenKeysWithoutAnnotation() {
         checkQueryResults(Settings.Global.CONTENT_URI, Settings.Global.class);
     }
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/Android.bp b/hostsidetests/appsecurity/test-apps/SplitApp/Android.bp
index c42fd09..749de46 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/Android.bp
@@ -67,35 +67,6 @@
     ],
 }
 
-android_test_helper_app {
-    name: "CtsSplitApp29",
-    defaults: ["CtsSplitAppDefaults"],
-    package_splits: [
-        "mdpi-v4",
-        "hdpi-v4",
-        "xhdpi-v4",
-        "xxhdpi-v4",
-        "v7",
-        "v23",
-        "fr",
-        "de",
-    ],
-    certificate: ":cts-testkey1",
-    aaptflags: [
-        "--version-code 100",
-        "--version-name OneHundred",
-        "--replace-version",
-    ],
-    // Feature splits are dependent on this base, so it must be exported.
-    export_package_resources: true,
-    test_suites: [
-        "cts",
-        "general-tests",
-        "mts-mainline-infra",
-    ],
-    target_sdk_version: "29"
-}
-
 // Define a variant with a different revision code
 android_test_helper_app {
     name: "CtsSplitAppDiffRevision",
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/AndroidManifest.xml
index f61bc16..b571bba 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/AndroidManifest.xml
@@ -21,7 +21,9 @@
 
     <!-- The androidx test libraries uses minSdkVersion 14. Applies an overrideLibrary rule here
          to pass the build error, since tests need to use minSdkVersion 4. -->
-    <uses-sdk android:minSdkVersion="4" tools:overrideLibrary="androidx.test.runner, androidx.test.rules, androidx.test.monitor, androidx.test.services.storage"/>
+    <uses-sdk android:minSdkVersion="4" tools:overrideLibrary="androidx.test.runner,
+        androidx.test.rules, androidx.test.monitor, androidx.test.services.storage,
+        androidx.test.annotation, androidx.annotation.experimental, androidx.tracing"/>
 
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/instantapp/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/instantapp/AndroidManifest.xml
index aff6672..672b163 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/instantapp/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/instantapp/AndroidManifest.xml
@@ -26,8 +26,9 @@
 
     <!-- The androidx test libraries uses minSdkVersion 14. Applies an overrideLibrary rule here
          to pass the build error, since tests need to use minSdkVersion 4. -->
-    <uses-sdk android:minSdkVersion="4" tools:overrideLibrary=
-        "androidx.test.runner, androidx.test.rules, androidx.test.monitor, androidx.test.services.storage"/>
+    <uses-sdk android:minSdkVersion="4" tools:overrideLibrary="androidx.test.runner,
+        androidx.test.rules, androidx.test.monitor, androidx.test.services.storage,
+        androidx.test.annotation, androidx.annotation.experimental, androidx.tracing"/>
 
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/needsplit/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/needsplit/AndroidManifest.xml
index 9cd26cf..7d275aa 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/needsplit/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/needsplit/AndroidManifest.xml
@@ -23,7 +23,9 @@
     <!-- The androidx test libraries uses minSdkVersion 14. Applies an overrideLibrary rule here
          to pass the build error, since tests need to use minSdkVersion 4. -->
     <uses-sdk android:minSdkVersion="4" tools:overrideLibrary="androidx.test.runner,
-        androidx.test.rules, androidx.test.monitor, androidx.test.services.storage" android:targetSdkVersion="27"/>
+        androidx.test.rules, androidx.test.monitor, androidx.test.services.storage,
+        androidx.test.annotation, androidx.annotation.experimental androidx.tracing"
+        android:targetSdkVersion="27"/>
 
     <uses-permission android:name="android.permission.CAMERA"/>
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/Android.bp b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/Android.bp
new file mode 100644
index 0000000..e8656a1
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/Android.bp
@@ -0,0 +1,76 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+// Define a variant requiring two split types for install
+android_test_helper_app {
+    name: "CtsRequiredSplitTypeSplitApp",
+    manifest: "AndroidManifest.xml",
+    sdk_version: "current",
+    min_sdk_version: "4",
+    aapt_include_all_resources: true,
+    certificate: ":cts-testkey1",
+    aaptflags: [
+        "--version-code 100",
+        "--version-name OneHundredRevisionTwelve",
+        "--replace-version",
+    ],
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+// Define a variant requiring three split types for install
+android_test_helper_app {
+    name: "CtsRequiredSplitTypeSplitAppUpdated",
+    manifest: "AndroidManifest_updated.xml",
+    sdk_version: "current",
+    min_sdk_version: "4",
+    aapt_include_all_resources: true,
+    certificate: ":cts-testkey1",
+    aaptflags: [
+        "--version-code 100",
+        "--revision-code 10",
+        "--version-name OneHundredRevisionTen",
+        "--replace-version",
+    ],
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+// Define a variant having invalid required split types
+android_test_helper_app {
+    name: "CtsInvalidRequiredSplitTypeSplitApp",
+    manifest: "AndroidManifest_bad.xml",
+    sdk_version: "current",
+    min_sdk_version: "4",
+    aapt_include_all_resources: true,
+    certificate: ":cts-testkey1",
+    aaptflags: [
+        "--version-code 100",
+        "--revision-code 10",
+        "--version-name OneHundredRevisionTen",
+        "--replace-version",
+    ],
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
\ No newline at end of file
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/AndroidManifest.xml
new file mode 100644
index 0000000..907691c
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.cts.splitapp"
+          android:targetSandboxVersion="2"
+          android:requiredSplitTypes="density,locale">
+
+    <uses-sdk android:minSdkVersion="4"
+              android:targetSdkVersion="27"/>
+
+    <application android:label="SplitApp">
+        <uses-library android:name="android.test.runner"/>
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="com.android.cts.splitapp"/>
+
+</manifest>
\ No newline at end of file
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/AndroidManifest_bad.xml b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/AndroidManifest_bad.xml
new file mode 100644
index 0000000..3e7a1b4
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/AndroidManifest_bad.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.cts.splitapp"
+          android:targetSandboxVersion="2"
+          android:requiredSplitTypes="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789">
+
+    <uses-sdk android:minSdkVersion="4"
+              android:targetSdkVersion="27"/>
+
+    <application android:label="SplitApp">
+        <uses-library android:name="android.test.runner"/>
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="com.android.cts.splitapp"/>
+
+</manifest>
\ No newline at end of file
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/AndroidManifest_updated.xml b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/AndroidManifest_updated.xml
new file mode 100644
index 0000000..cdff5b5
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/AndroidManifest_updated.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.cts.splitapp"
+          android:targetSandboxVersion="2"
+          android:requiredSplitTypes="density,locale,feature">
+
+    <uses-sdk android:minSdkVersion="4"
+              android:targetSdkVersion="27"/>
+
+    <application android:label="SplitApp">
+        <uses-library android:name="android.test.runner"/>
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="com.android.cts.splitapp"/>
+
+</manifest>
\ No newline at end of file
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/Android.bp b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/Android.bp
new file mode 100644
index 0000000..ac1fbe8
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/Android.bp
@@ -0,0 +1,101 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsSplitAppTypeDensity",
+    manifest: "density/AndroidManifest.xml",
+    certificate: ":cts-testkey1",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "current",
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsSplitAppTypeLocale",
+    manifest: "locale/AndroidManifest.xml",
+    certificate: ":cts-testkey1",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "current",
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsSplitAppTypeMultiple",
+    manifest: "multitype/AndroidManifest.xml",
+    certificate: ":cts-testkey1",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "current",
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsSplitAppTypeFoo",
+    manifest: "foo/AndroidManifest.xml",
+    certificate: ":cts-testkey1",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "current",
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsSplitAppTypeFeature",
+    manifest: "feature/AndroidManifest.xml",
+    certificate: ":cts-testkey1",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "current",
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsSplitAppTypeFeatureData",
+    manifest: "feature_data/AndroidManifest.xml",
+    certificate: ":cts-testkey1",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "current",
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsSplitAppTypeFeatureFoo",
+    manifest: "feature_foo/AndroidManifest.xml",
+    certificate: ":cts-testkey1",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "current",
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
\ No newline at end of file
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/density/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/density/AndroidManifest.xml
new file mode 100644
index 0000000..9e50b38
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/density/AndroidManifest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2021 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.
+-->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="100"
+    package="com.android.cts.splitapp"
+    split="config.xxhdpi"
+    targetConfig="xxhdpi"
+    android:splitTypes="density">
+
+    <application
+        android:hasCode="false" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/feature/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/feature/AndroidManifest.xml
new file mode 100644
index 0000000..d681953
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/feature/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="100"
+    package="com.android.cts.splitapp"
+    android:isFeatureSplit="true"
+    split="feature_foo"
+    android:splitTypes="feature"
+    android:requiredSplitTypes="feature.data">
+
+    <application
+        android:hasCode="false" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/feature_data/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/feature_data/AndroidManifest.xml
new file mode 100644
index 0000000..496ef5f
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/feature_data/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="100"
+    package="com.android.cts.splitapp"
+    split="feature_foo.data"
+    android:splitTypes="feature.data">
+
+    <application
+        android:hasCode="false" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/feature_foo/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/feature_foo/AndroidManifest.xml
new file mode 100644
index 0000000..80f06b0
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/feature_foo/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="100"
+    package="com.android.cts.splitapp"
+    split="feature_foo.foo"
+    android:splitTypes="feature.foo">
+
+    <application
+        android:hasCode="false" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/foo/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/foo/AndroidManifest.xml
new file mode 100644
index 0000000..e514d9b
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/foo/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="100"
+    package="com.android.cts.splitapp"
+    split="config.foo"
+    android:splitTypes="foo">
+
+    <application
+        android:hasCode="false" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/locale/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/locale/AndroidManifest.xml
new file mode 100644
index 0000000..372bbb0
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/locale/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Copyright 2021 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.
+-->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="100"
+    package="com.android.cts.splitapp"
+    split="config.de"
+    android:splitTypes="locale">
+
+    <application
+        android:hasCode="false" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/multitype/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/multitype/AndroidManifest.xml
new file mode 100644
index 0000000..d640edb
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/requiredsplittype/types/multitype/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:versionCode="100"
+    package="com.android.cts.splitapp"
+    split="config.split"
+    android:splitTypes="locale,density">
+
+    <application
+        android:hasCode="false" />
+</manifest>
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/revision_a/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/SplitApp/revision_a/AndroidManifest.xml
index 28bef9d..e2e5415 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/revision_a/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/revision_a/AndroidManifest.xml
@@ -21,8 +21,9 @@
 
     <!-- The androidx test libraries uses minSdkVersion 14. Applies an overrideLibrary rule here
          to pass the build error, since tests need to use minSdkVersion 4. -->
-    <uses-sdk android:minSdkVersion="4" tools:overrideLibrary=
-        "androidx.test.runner, androidx.test.rules, androidx.test.monitor, androidx.test.services.storage"/>
+    <uses-sdk android:minSdkVersion="4" tools:overrideLibrary="androidx.test.runner,
+        androidx.test.rules, androidx.test.monitor, androidx.test.services.storage,
+        androidx.test.annotation, androidx.annotation.experimental, androidx.tracing"/>
 
     <!-- Remove the CAMERA permission
     <uses-permission android:name="android.permission.CAMERA"/> -->
diff --git a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp
index 4a2d4fa..4abe1a4 100644
--- a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.bp
@@ -23,6 +23,7 @@
     static_libs: [
         "androidx.test.rules",
         "ub-uiautomator",
+        "compatibility-device-util-axt",
         "CtsStorageAppLib",
     ],
     libs: ["android.test.base"],
diff --git a/hostsidetests/appsecurity/test-apps/StorageStatsApp/src/com/android/cts/storagestatsapp/StorageStatsTest.java b/hostsidetests/appsecurity/test-apps/StorageStatsApp/src/com/android/cts/storagestatsapp/StorageStatsTest.java
index 3bfa0ec..6a027d6 100644
--- a/hostsidetests/appsecurity/test-apps/StorageStatsApp/src/com/android/cts/storagestatsapp/StorageStatsTest.java
+++ b/hostsidetests/appsecurity/test-apps/StorageStatsApp/src/com/android/cts/storagestatsapp/StorageStatsTest.java
@@ -51,12 +51,14 @@
 import android.os.Environment;
 import android.os.UserHandle;
 import android.os.storage.StorageManager;
+import android.provider.DeviceConfig;
 import android.provider.MediaStore;
 import android.support.test.uiautomator.UiDevice;
 import android.test.InstrumentationTestCase;
 import android.util.Log;
 import android.util.MutableLong;
 
+import com.android.compatibility.common.util.SystemUtil;
 import com.android.cts.storageapp.UtilsReceiver;
 
 import junit.framework.AssertionFailedError;
@@ -278,6 +280,28 @@
     }
 
     public void testCacheClearing() throws Exception {
+        final int[] originalCacheReservePercents = new int[2];
+        setCacheReservePercentsToZero(originalCacheReservePercents);
+
+        try {
+            testCacheClearing(originalCacheReservePercents);
+        } finally {
+            resetCacheReservePercents(originalCacheReservePercents);
+        }
+    }
+
+    public void testCacheBehavior() throws Exception {
+        final int[] originalCacheReservePercents = new int[2];
+        setCacheReservePercentsToZero(originalCacheReservePercents);
+
+        try {
+            testCacheBehavior(originalCacheReservePercents);
+        } finally {
+            resetCacheReservePercents(originalCacheReservePercents);
+        }
+    }
+
+    private void testCacheClearing(int[] originalCacheReservePercents) throws Exception {
         final Context context = getContext();
         final StorageManager sm = context.getSystemService(StorageManager.class);
         final StorageStatsManager stats = context.getSystemService(StorageStatsManager.class);
@@ -354,7 +378,7 @@
         assertMostlyEquals(targetA / 2, getCacheBytes(PKG_B, user), 2 * MB_IN_BYTES);
     }
 
-    public void testCacheBehavior() throws Exception {
+    private void testCacheBehavior(int[] originalCacheReservePercents) throws Exception {
         final Context context = getContext();
         final StorageManager sm = context.getSystemService(StorageManager.class);
         final StorageStatsManager stats = context.getSystemService(StorageStatsManager.class);
@@ -416,6 +440,45 @@
         assertTrue(i.exists()); assertEquals(0, i.length());
     }
 
+    /* originalCacheReservePercents is an array of size 2 with CacheReservePercentHigh
+    *  at index 0 and CacheReservePercentLow at index 1.
+    */
+    private void setCacheReservePercentsToZero(int[] originalCacheReservePercents) {
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            originalCacheReservePercents[0] = DeviceConfig.getInt(
+                    DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+                    StorageManager.CACHE_RESERVE_PERCENT_HIGH_KEY, -1);
+            DeviceConfig.setProperty(
+                    DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+                    StorageManager.CACHE_RESERVE_PERCENT_HIGH_KEY,
+                    Integer.toString(0), /* makeDefault */ false);
+            originalCacheReservePercents[1] = DeviceConfig.getInt(
+                    DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+                    StorageManager.CACHE_RESERVE_PERCENT_LOW_KEY, -1);
+            DeviceConfig.setProperty(
+                    DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+                    StorageManager.CACHE_RESERVE_PERCENT_LOW_KEY,
+                    Integer.toString(0), /* makeDefault */ false);
+        });
+    }
+
+    private void resetCacheReservePercents(int[] originalCacheReservePercents) {
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            DeviceConfig.setProperty(
+                    DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+                    StorageManager.CACHE_RESERVE_PERCENT_HIGH_KEY,
+                    (originalCacheReservePercents[0] != -1)
+                        ? Integer.toString(originalCacheReservePercents[0]) : null,
+                    /* makeDefault */ false);
+            DeviceConfig.setProperty(
+                    DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+                    StorageManager.CACHE_RESERVE_PERCENT_LOW_KEY,
+                    (originalCacheReservePercents[1] != -1)
+                        ? Integer.toString(originalCacheReservePercents[1]) : null,
+                    /* makeDefault */ false);
+        });
+    }
+
     private long getCacheBytes(String pkg, UserHandle user) throws Exception {
         return getContext().getSystemService(StorageStatsManager.class)
                 .queryStatsForPackage(UUID_DEFAULT, pkg, user).getCacheBytes();
diff --git a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/src/android/appsecurity/cts/v3rotationtests/V3RotationTest.java b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/src/android/appsecurity/cts/v3rotationtests/V3RotationTest.java
index 2f06395..c8d82cf 100644
--- a/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/src/android/appsecurity/cts/v3rotationtests/V3RotationTest.java
+++ b/hostsidetests/appsecurity/test-apps/V3SigningSchemeRotation/src/android/appsecurity/cts/v3rotationtests/V3RotationTest.java
@@ -16,6 +16,8 @@
 
 package android.appsecurity.cts.v3rotationtests;
 
+import static org.junit.Assert.assertArrayEquals;
+
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
@@ -116,6 +118,51 @@
                     + "99c63011022100d260fb1d1f176cf9b7fa60098bfd24319f4905a3e5fda1"
                     + "00a6fe1a2ab19ff09e";
 
+    private static final String EC_P256_THIRD_CERT_HEX =
+            "3082016e30820115a0030201020209008394f5cad16a89a7300a06082a86"
+                    + "48ce3d04030230143112301006035504030c0965632d703235365f32301e"
+                    + "170d3138303731343030303532365a170d3238303731313030303532365a"
+                    + "30143112301006035504030c0965632d703235365f333059301306072a86"
+                    + "48ce3d020106082a8648ce3d03010703420004f31e62430e9db6fc5928d9"
+                    + "75fc4e47419bacfcb2e07c89299e6cd7e344dd21adfd308d58cb49a1a2a3"
+                    + "fecacceea4862069f30be1643bcc255040d8089dfb3743a350304e301d06"
+                    + "03551d0e041604146f8d0828b13efaf577fc86b0e99fa3e54bcbcff0301f"
+                    + "0603551d230418301680147991d92b0208fc448bf506d4efc9fff428cb5e"
+                    + "5f300c0603551d13040530030101ff300a06082a8648ce3d040302034700"
+                    + "30440220256bdaa2784c273e4cc291a595a46779dee9de9044dc9f7ab820"
+                    + "309567df9fe902201a4ad8c69891b5a8c47434fe9540ed1f4979b5fad348"
+                    + "3f3fa04d5677355a579e";
+
+    private static final String EC_P256_FOURTH_CERT_HEX =
+            "3082017b30820120a00302010202146c8cb8a818433c1e6431fb16fb3ae0"
+                    + "fb5ad60aa7300a06082a8648ce3d04030230143112301006035504030c09"
+                    + "65632d703235365f33301e170d3230303531333139313532385a170d3330"
+                    + "303531313139313532385a30143112301006035504030c0965632d703235"
+                    + "365f343059301306072a8648ce3d020106082a8648ce3d03010703420004"
+                    + "db4a60031e79ad49cb759007d6855d4469b91c8bab065434f2fba971ade7"
+                    + "e4d19599a0f67b5e708cfda7543e5630c3769d37e093640d7c768a15144c"
+                    + "d0e5dcf4a350304e301d0603551d0e041604146e78970332554336b6ee89"
+                    + "24eaa70230e393f678301f0603551d230418301680146f8d0828b13efaf5"
+                    + "77fc86b0e99fa3e54bcbcff0300c0603551d13040530030101ff300a0608"
+                    + "2a8648ce3d0403020349003046022100ce786e79ec7547446082e9caf910"
+                    + "614ff80758f9819fb0f148695067abe0fcd4022100a4881e332ddec2116a"
+                    + "d2b59cf891d0f331ff7e27e77b7c6206c7988d9b539330";
+
+    private static final String EC_P256_FIFTH_CERT_HEX =
+            "3082017930820120a003020102021450e1ee31d9f9259eadd3514a988dfa"
+                    + "4bf0e7153a300a06082a8648ce3d04030230143112301006035504030c09"
+                    + "65632d703235365f34301e170d3232303331353031303530385a170d3332"
+                    + "303331323031303530385a30143112301006035504030c0965632d703235"
+                    + "365f353059301306072a8648ce3d020106082a8648ce3d03010703420004"
+                    + "75703c54a432df580e86848817b491ee028324257dc31e891fc4af93d9bd"
+                    + "4bf026b39c7a145213753c344c2a12056ce7ccc21b40be8f9fad28639dca"
+                    + "dbe63b4ea350304e301d0603551d0e04160414e8cc32db6a21f86c75f3c1"
+                    + "96c0b199885498b73b301f0603551d230418301680146e78970332554336"
+                    + "b6ee8924eaa70230e393f678300c0603551d13040530030101ff300a0608"
+                    + "2a8648ce3d040302034700304402202ded97f7ddcd3229ad26783436186f"
+                    + "1e74247a4422baf99f1eeb715dfe7e895502207814248b1b7742f3009602"
+                    + "bdc96f66529884fc605a070ff25c84648c8fccb44b";
+
     public void testHasPerm() throws Exception {
         PackageManager pm = getContext().getPackageManager();
         assertTrue(PERMISSION_NAME + " not granted to " + COMPANION_PKG,
@@ -199,6 +246,28 @@
                 EC_P256_SECOND_CERT_HEX);
     }
 
+    public void testGetSigningCertificateHistoryReturnsSignersInOrder() throws Exception {
+        // The test package used for this should be signed with five keys in the signing lineage,
+        // and the signatures returned from SigningInfo#getSigningCertificateHistory should be
+        // returned in their rotated order.
+        final String[] expectedSignatures = new String[]{
+                EC_P256_FIRST_CERT_HEX,
+                EC_P256_SECOND_CERT_HEX,
+                EC_P256_THIRD_CERT_HEX,
+                EC_P256_FOURTH_CERT_HEX,
+                EC_P256_FIFTH_CERT_HEX,
+        };
+
+        PackageManager pm = getContext().getPackageManager();
+        PackageInfo pi = pm.getPackageInfo(PKG, PackageManager.GET_SIGNING_CERTIFICATES);
+        assertNotNull("Failed to get signatures in PackageInfo of " + PKG,
+                pi.signingInfo);
+        String[] actualSignatures = Arrays.stream(pi.signingInfo.getSigningCertificateHistory())
+                .map(Signature::toCharsString)
+                .toArray(String[]::new);
+        assertArrayEquals(expectedSignatures, actualSignatures);
+    }
+
     public void testHasSigningCertificate() throws Exception {
         // make sure that hasSigningCertificate() reports that both certificates in the signing
         // history are present
@@ -251,6 +320,36 @@
                 pm.hasSigningCertificate(uid, secondCertBytes, PackageManager.CERT_INPUT_SHA256));
     }
 
+    public void testUsingOriginalSigner() throws Exception {
+        // Verifies the platform only recognized the original signing key during installation.
+        PackageManager pm = getContext().getPackageManager();
+        PackageInfo pi = pm.getPackageInfo(PKG, PackageManager.GET_SIGNING_CERTIFICATES);
+        assertFalse(
+                "APK is expected to use the original signing key, but past signing certificates "
+                        + "were reported",
+                pi.signingInfo.hasPastSigningCertificates());
+        assertExpectedSignatures(pi.signingInfo.getApkContentsSigners(), EC_P256_FIRST_CERT_HEX);
+        byte[] secondCertBytes = fromHexToByteArray(EC_P256_SECOND_CERT_HEX);
+        assertFalse("APK is not expected to have the rotated key in its signing lineage",
+                pm.hasSigningCertificate(PKG, secondCertBytes, PackageManager.CERT_INPUT_RAW_X509));
+    }
+
+    public void testUsingRotatedSigner() throws Exception {
+        // Verifies the platform recognized the rotated signing key during installation.
+        PackageManager pm = getContext().getPackageManager();
+        PackageInfo pi = pm.getPackageInfo(PKG, PackageManager.GET_SIGNING_CERTIFICATES);
+        assertTrue(
+                "APK is expected to be signed with the rotated signing key, but past signing "
+                        + "certificates were not reported",
+                pi.signingInfo.hasPastSigningCertificates());
+        assertExpectedSignatures(pi.signingInfo.getApkContentsSigners(), EC_P256_SECOND_CERT_HEX);
+        assertExpectedSignatures(pi.signingInfo.getSigningCertificateHistory(),
+                EC_P256_FIRST_CERT_HEX, EC_P256_SECOND_CERT_HEX);
+        byte[] firstCertBytes = fromHexToByteArray(EC_P256_FIRST_CERT_HEX);
+        assertTrue("APK is expected to have the original key in its signing lineage",
+                pm.hasSigningCertificate(PKG, firstCertBytes, PackageManager.CERT_INPUT_RAW_X509));
+    }
+
     private  static byte[] fromHexToByteArray(String str) {
         if (str == null || str.length() == 0 || str.length() % 2 != 0) {
             return null;
diff --git a/hostsidetests/appsecurity/test-apps/rro/OWNERS b/hostsidetests/appsecurity/test-apps/rro/OWNERS
index 21cd9d9..870d1a4 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OWNERS
+++ b/hostsidetests/appsecurity/test-apps/rro/OWNERS
@@ -1,2 +1,2 @@
 # Bug component: 568761
-rtmitchell@google.com
+zyy@google.com
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
index fbc77e1..607f13f 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/Android.bp
@@ -21,8 +21,16 @@
 android_test_helper_app {
     name: "CtsOverlayTarget",
     defaults: ["cts_support_defaults"],
-    sdk_version: "current",
+    sdk_version: "test_current",
     certificate: ":cts-testkey1",
+    static_libs: [
+        "truth-prebuilt",
+        "androidx.test.rules",
+        "compatibility-device-util-axt",
+    ],
+    srcs: [
+        "src/**/*.java",
+    ],
     resource_dirs: [
         "res",
         "res_overlayable",
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/AndroidManifest.xml b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/AndroidManifest.xml
index a0d609a..03e4f7d 100644
--- a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/AndroidManifest.xml
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/AndroidManifest.xml
@@ -16,4 +16,13 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.cts.overlay.target">
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <activity android:name=".OverlayTargetActivity" android:exported="false"
+                  android:configChanges="@integer/config_changes_assets_paths" />
+        <service android:name=".OverlayTargetService" android:exported="false" />
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="com.android.cts.overlay.target" />
 </manifest>
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/res/values/integer.xml b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/res/values/integer.xml
new file mode 100644
index 0000000..67c0149
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/res/values/integer.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<resources>
+    <!-- The integer to indicate that activity handles assets paths changes itself -->
+    <integer name="config_changes_assets_paths">0x80000000</integer>
+</resources>
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/src/com/android/cts/overlay/target/OverlayTargetActivity.java b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/src/com/android/cts/overlay/target/OverlayTargetActivity.java
new file mode 100644
index 0000000..d94d511
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/src/com/android/cts/overlay/target/OverlayTargetActivity.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2021 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.cts.overlay.target;
+
+import android.app.Activity;
+import android.app.KeyguardManager;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.function.BiConsumer;
+
+/**
+ * A test activity to verify that the assets paths configuration changes are received if the
+ * overlay targeting state is changed.
+ */
+public class OverlayTargetActivity extends Activity {
+    private BiConsumer<OverlayTargetActivity, Configuration> mConfigurationChangedCallback;
+
+    /**
+     * A boolean value to determine whether a stub service can be started when the activity
+     * is launched.
+     */
+    public static final String EXTRA_START_SERVICE =
+            "com.android.cts.overlay.intent.extra.START_SERVICE";
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        keepScreenOn();
+        if (savedInstanceState == null) {
+            startServiceIfNecessary(getIntent());
+        }
+    }
+
+    @Override
+    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        final BiConsumer<OverlayTargetActivity, Configuration> callback =
+                mConfigurationChangedCallback;
+        if (callback != null) {
+            callback.accept(this, newConfig);
+        }
+    }
+
+    /** Registers the callback of onConfigurationChanged. */
+    public void setConfigurationChangedCallback(
+            BiConsumer<OverlayTargetActivity, Configuration> callbacks) {
+        mConfigurationChangedCallback = callbacks;
+    }
+
+    private void keepScreenOn() {
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
+        setTurnScreenOn(true);
+        KeyguardManager km = getSystemService(KeyguardManager.class);
+        if (km != null) {
+            km.requestDismissKeyguard(this, null);
+        }
+    }
+
+    private void startServiceIfNecessary(Intent intent) {
+        if (intent == null) {
+            return;
+        }
+        final boolean startService = intent.getBooleanExtra(EXTRA_START_SERVICE, false);
+        if (!startService) {
+            return;
+        }
+        final Intent serviceIntent = new Intent(this, OverlayTargetService.class);
+        startService(serviceIntent);
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/src/com/android/cts/overlay/target/OverlayTargetService.java b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/src/com/android/cts/overlay/target/OverlayTargetService.java
new file mode 100644
index 0000000..3fb4fa0
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/src/com/android/cts/overlay/target/OverlayTargetService.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2021 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.cts.overlay.target;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+
+/** A stub service used by {@link OverlayTargetActivity} */
+public class OverlayTargetService extends Service {
+    private Binder mBinder = new Binder();
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/src/com/android/cts/overlay/target/OverlayTargetTest.java b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/src/com/android/cts/overlay/target/OverlayTargetTest.java
new file mode 100644
index 0000000..938f1c4
--- /dev/null
+++ b/hostsidetests/appsecurity/test-apps/rro/OverlayTarget/src/com/android/cts/overlay/target/OverlayTargetTest.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2021 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.cts.overlay.target;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.fail;
+
+import android.app.Instrumentation;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.UserHandle;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+public class OverlayTargetTest {
+    // overlay package
+    private static final String OVERLAY_ALL_PACKAGE_NAME = "com.android.cts.overlay.all";
+
+    // Overlay states
+    private static final String STATE_DISABLED = "STATE_DISABLED";
+    private static final String STATE_ENABLED = "STATE_ENABLED";
+
+    // Default timeout value
+    private static final long TIMEOUT_MS = TimeUnit.SECONDS.toMillis(5);
+
+    // Keys for test arguments
+    private static final String PARAM_START_SERVICE = "start_service";
+
+    private Instrumentation mInstrumentation;
+
+    @Rule
+    public ActivityTestRule<OverlayTargetActivity> mActivityTestRule = new ActivityTestRule<>(
+            OverlayTargetActivity.class, false /* initialTouchMode */, false /* launchActivity */);
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        launchOverlayTargetActivity(InstrumentationRegistry.getArguments());
+        assertThat(mActivityTestRule.getActivity()).isNotNull();
+    }
+
+    @Test
+    public void overlayEnabled_activityInForeground() throws Exception {
+        final OverlayTargetActivity targetActivity = mActivityTestRule.getActivity();
+        final CountDownLatch latch = new CountDownLatch(1);
+        targetActivity.setConfigurationChangedCallback((activity, config) -> {
+            latch.countDown();
+            activity.setConfigurationChangedCallback(null);
+        });
+
+        setOverlayEnabled(OVERLAY_ALL_PACKAGE_NAME, true /* enabled */);
+
+        if (!latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+            fail("Fail to wait configuration changes for the overlay target activity.");
+        }
+    }
+
+    @Test
+    public void overlayEnabled_activityInBackground_toForeground() throws Exception {
+        final OverlayTargetActivity targetActivity = mActivityTestRule.getActivity();
+        // Activity goes into background
+        launchHome();
+        mInstrumentation.waitForIdleSync();
+        final CountDownLatch latch = new CountDownLatch(1);
+        targetActivity.setConfigurationChangedCallback((activity, config) -> {
+            latch.countDown();
+            activity.setConfigurationChangedCallback(null);
+        });
+        setOverlayEnabled(OVERLAY_ALL_PACKAGE_NAME, true /* enabled */);
+
+        if (latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+            fail("Activity in background should not receive configuration changes");
+        }
+
+        // Bring activity to foreground
+        final Intent intent = new Intent(mInstrumentation.getTargetContext(),
+                OverlayTargetActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
+        targetActivity.startActivity(intent);
+
+        if (!latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+            fail("Fail to wait configuration changes for the overlay target activity.");
+        }
+    }
+
+    private void launchOverlayTargetActivity(Bundle testArgs) {
+        final Intent intent = new Intent(mInstrumentation.getTargetContext(),
+                OverlayTargetActivity.class);
+        final boolean startService = (testArgs != null
+                && "true".equalsIgnoreCase(testArgs.getString(PARAM_START_SERVICE)));
+        intent.putExtra(OverlayTargetActivity.EXTRA_START_SERVICE, startService);
+        mActivityTestRule.launchActivity(intent);
+        mInstrumentation.waitForIdleSync();
+    }
+
+    private static void setOverlayEnabled(String overlayPackage, boolean enabled)
+            throws Exception {
+        final String current = getStateForOverlay(overlayPackage);
+        final String expected = enabled ? STATE_ENABLED : STATE_DISABLED;
+        assertThat(current).isNotEqualTo(expected);
+        SystemUtil.runShellCommand("cmd overlay "
+                + (enabled ? "enable" : "disable")
+                + " --user current "
+                + overlayPackage);
+        PollingCheck.check("Fail to wait overlay enabled state " + expected
+                        + " for " + overlayPackage, TIMEOUT_MS,
+                () -> expected.equals(getStateForOverlay(overlayPackage)));
+    }
+
+    private static void launchHome() {
+        SystemUtil.runShellCommand("am start -W -a android.intent.action.MAIN"
+                + " -c android.intent.category.HOME");
+    }
+
+    private static String getStateForOverlay(String overlayPackage) {
+        final String errorMsg = "Fail to parse the state of overlay package " + overlayPackage;
+        final String result = SystemUtil.runShellCommand("cmd overlay dump");
+        final String overlayPackageForCurrentUser = overlayPackage + ":" + UserHandle.myUserId();
+        final int startIndex = result.indexOf(overlayPackageForCurrentUser);
+        assertWithMessage(errorMsg).that(startIndex).isAtLeast(0);
+
+        final int endIndex = result.indexOf('}', startIndex);
+        assertWithMessage(errorMsg).that(endIndex).isGreaterThan(startIndex);
+
+        final int stateIndex = result.indexOf("mState", startIndex);
+        assertWithMessage(errorMsg).that(startIndex).isLessThan(stateIndex);
+        assertWithMessage(errorMsg).that(stateIndex).isLessThan(endIndex);
+
+        final int colonIndex = result.indexOf(':', stateIndex);
+        assertWithMessage(errorMsg).that(stateIndex).isLessThan(colonIndex);
+        assertWithMessage(errorMsg).that(colonIndex).isLessThan(endIndex);
+
+        final int endLineIndex = result.indexOf('\n', colonIndex);
+        assertWithMessage(errorMsg).that(colonIndex).isLessThan(endLineIndex);
+        assertWithMessage(errorMsg).that(endLineIndex).isLessThan(endIndex);
+
+        return result.substring(colonIndex + 2, endLineIndex);
+    }
+}
diff --git a/hostsidetests/appsecurity/test-apps/tinyapp/Android.bp b/hostsidetests/appsecurity/test-apps/tinyapp/Android.bp
index 1b7cc0e..1c98103 100644
--- a/hostsidetests/appsecurity/test-apps/tinyapp/Android.bp
+++ b/hostsidetests/appsecurity/test-apps/tinyapp/Android.bp
@@ -98,6 +98,23 @@
 }
 
 // This is the test package signed using the V3 signature scheme with
+// a rotated key and multiple signers in the lineage with default
+// capabilities.
+android_test_helper_app {
+    name: "v3-ec-p256-with-por-1_2_3_4_5-default-caps",
+    certificate: ":ec-p256_5",
+    additional_certificates: [":ec-p256"],
+    lineage: ":ec-p256-por-1_2_3_4_5-default-caps",
+    srcs: ["src/**/*.java"],
+    // resource_dirs is the default value: ["res"]
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    sdk_version: "current",
+}
+
+// This is the test package signed using the V3 signature scheme with
 // a rotated key and part of a shareduid. The capabilities of this lineage
 // grant access to the previous key in the lineage to join the sharedUid.
 android_test_helper_app {
diff --git a/hostsidetests/atrace/src/android/atrace/cts/AtraceHostTest.java b/hostsidetests/atrace/src/android/atrace/cts/AtraceHostTest.java
index f761e8f..0396c3b 100644
--- a/hostsidetests/atrace/src/android/atrace/cts/AtraceHostTest.java
+++ b/hostsidetests/atrace/src/android/atrace/cts/AtraceHostTest.java
@@ -183,11 +183,12 @@
         assertNotNull(result.getModel());
         ThreadModel thread = findThread(result.getModel(), result.getTid());
         assertNotNull(thread);
-        assertEquals(2, thread.getSlices().size());
-        Slice sdkSlice = thread.getSlices().get(0);
-        assertEquals("AtraceDeviceTest::beginEndSection", sdkSlice.getName());
-        Slice ndkSlice = thread.getSlices().get(1);
-        assertEquals("ndk::beginEndSection", ndkSlice.getName());
+        Slice sdkSlice = SliceQueriesKt.selectFirst(thread,
+                slice1 -> "AtraceDeviceTest::beginEndSection".equals(slice1.getName()));
+        assertNotNull(sdkSlice);
+        Slice ndkSlice = SliceQueriesKt.selectFirst(thread,
+                slice -> "ndk::beginEndSection".equals(slice.getName()));
+        assertNotNull(ndkSlice);
     }
 
     public void testAsyncBeginEndSection() {
@@ -283,4 +284,5 @@
         assertEquals("Didn't find all async sections",
                 0, requiredAsyncSections.size());
     }
+
 }
diff --git a/hostsidetests/backup/Android.bp b/hostsidetests/backup/Android.bp
index c60681c..b75c8a2 100644
--- a/hostsidetests/backup/Android.bp
+++ b/hostsidetests/backup/Android.bp
@@ -21,7 +21,6 @@
     srcs: ["src/**/*.java"],
     // tag this module as a cts test artifact
     test_suites: [
-        "arcts",
         "cts",
         "general-tests",
         "mts",
diff --git a/hostsidetests/backup/AutoRestoreApp/Android.bp b/hostsidetests/backup/AutoRestoreApp/Android.bp
index 58b58dd..fbab3cb 100644
--- a/hostsidetests/backup/AutoRestoreApp/Android.bp
+++ b/hostsidetests/backup/AutoRestoreApp/Android.bp
@@ -29,7 +29,6 @@
     srcs: ["src/**/*.java"],
     // tag this module as a cts test artifact
     test_suites: [
-        "arcts",
         "cts",
         "general-tests",
     ],
diff --git a/hostsidetests/backup/BackupTransportApp/Android.bp b/hostsidetests/backup/BackupTransportApp/Android.bp
index 7b07cbe..7a4484f 100644
--- a/hostsidetests/backup/BackupTransportApp/Android.bp
+++ b/hostsidetests/backup/BackupTransportApp/Android.bp
@@ -28,7 +28,6 @@
     srcs: ["src/**/*.java"],
     // tag this module as a cts test artifact
     test_suites: [
-        "arcts",
         "cts",
         "general-tests",
     ],
diff --git a/hostsidetests/backup/fullbackupapp/Android.bp b/hostsidetests/backup/fullbackupapp/Android.bp
index a7d81d6..ec5e274 100644
--- a/hostsidetests/backup/fullbackupapp/Android.bp
+++ b/hostsidetests/backup/fullbackupapp/Android.bp
@@ -26,7 +26,6 @@
     srcs: ["src/**/*.java"],
     // tag this module as a cts test artifact
     test_suites: [
-        "arcts",
         "cts",
         "general-tests",
     ],
diff --git a/hostsidetests/backup/includeexcludeapp/DataExtractionRulesApp/Android.bp b/hostsidetests/backup/includeexcludeapp/DataExtractionRulesApp/Android.bp
index 6a4a9b3..ae56169 100644
--- a/hostsidetests/backup/includeexcludeapp/DataExtractionRulesApp/Android.bp
+++ b/hostsidetests/backup/includeexcludeapp/DataExtractionRulesApp/Android.bp
@@ -27,7 +27,6 @@
     srcs: ["src/**/*.java"],
     // tag this module as a cts test artifact
     test_suites: [
-        "arcts",
         "cts",
         "general-tests",
     ],
diff --git a/hostsidetests/backup/includeexcludeapp/DataExtractionRulesApplicabilityApp/Android.bp b/hostsidetests/backup/includeexcludeapp/DataExtractionRulesApplicabilityApp/Android.bp
index e2ae477..9175932 100644
--- a/hostsidetests/backup/includeexcludeapp/DataExtractionRulesApplicabilityApp/Android.bp
+++ b/hostsidetests/backup/includeexcludeapp/DataExtractionRulesApplicabilityApp/Android.bp
@@ -27,7 +27,6 @@
     srcs: ["src/**/*.java"],
     // tag this module as a cts test artifact
     test_suites: [
-        "arcts",
         "cts",
         "general-tests",
     ],
diff --git a/hostsidetests/backup/includeexcludeapp/EncryptionAttributeApp/Android.bp b/hostsidetests/backup/includeexcludeapp/EncryptionAttributeApp/Android.bp
index fd106e9..9cfb39a 100644
--- a/hostsidetests/backup/includeexcludeapp/EncryptionAttributeApp/Android.bp
+++ b/hostsidetests/backup/includeexcludeapp/EncryptionAttributeApp/Android.bp
@@ -27,7 +27,6 @@
     srcs: ["src/**/*.java"],
     // tag this module as a cts test artifact
     test_suites: [
-        "arcts",
         "cts",
         "general-tests",
     ],
diff --git a/hostsidetests/backup/includeexcludeapp/FullBackupContentApp/Android.bp b/hostsidetests/backup/includeexcludeapp/FullBackupContentApp/Android.bp
index cb2fb1e..378c786 100644
--- a/hostsidetests/backup/includeexcludeapp/FullBackupContentApp/Android.bp
+++ b/hostsidetests/backup/includeexcludeapp/FullBackupContentApp/Android.bp
@@ -27,7 +27,6 @@
     srcs: ["src/**/*.java"],
     // tag this module as a cts test artifact
     test_suites: [
-        "arcts",
         "cts",
         "general-tests",
     ],
diff --git a/hostsidetests/blobstore/src/com/android/cts/host/blob/BaseBlobStoreHostTest.java b/hostsidetests/blobstore/src/com/android/cts/host/blob/BaseBlobStoreHostTest.java
index 6928718..fc355af 100644
--- a/hostsidetests/blobstore/src/com/android/cts/host/blob/BaseBlobStoreHostTest.java
+++ b/hostsidetests/blobstore/src/com/android/cts/host/blob/BaseBlobStoreHostTest.java
@@ -98,10 +98,6 @@
         return device.isMultiUserSupported();
     }
 
-    protected boolean isMultiUserSupported() throws Exception {
-        return isMultiUserSupported(getDevice());
-    }
-
     protected Map<String, String> createArgsFromLastTestRun() {
         final Map<String, String> args = new HashMap<>();
         for (String key : new String[] {
diff --git a/hostsidetests/blobstore/src/com/android/cts/host/blob/BlobStoreMultiUserTest.java b/hostsidetests/blobstore/src/com/android/cts/host/blob/BlobStoreMultiUserTest.java
index 9a78386..ec13654 100644
--- a/hostsidetests/blobstore/src/com/android/cts/host/blob/BlobStoreMultiUserTest.java
+++ b/hostsidetests/blobstore/src/com/android/cts/host/blob/BlobStoreMultiUserTest.java
@@ -40,9 +40,9 @@
 
     @BeforeClassWithInfo
     public static void setUpClass(TestInformation testInfo) throws Exception {
-        if(!isMultiUserSupported(testInfo.getDevice())) {
-            return;
-        }
+        assumeTrue("Multi-user is not supported on this device",
+                isMultiUserSupported(testInfo.getDevice()));
+
         mPrimaryUserId = testInfo.getDevice().getPrimaryUserId();
         mSecondaryUserId = testInfo.getDevice().createUser("Test_User");
         assertThat(testInfo.getDevice().startUser(mSecondaryUserId)).isTrue();
@@ -50,8 +50,6 @@
 
     @Before
     public void setUp() throws Exception {
-        assumeTrue("Multi-user is not supported on this device", isMultiUserSupported());
-
         for (String apk : new String[] {TARGET_APK, TARGET_APK_DEV}) {
             installPackageAsUser(apk, true /* grantPermissions */, mPrimaryUserId, "-t");
             installPackageAsUser(apk, true /* grantPermissions */, mSecondaryUserId, "-t");
diff --git a/hostsidetests/car/Android.bp b/hostsidetests/car/Android.bp
index 6488d7e..caa8290 100644
--- a/hostsidetests/car/Android.bp
+++ b/hostsidetests/car/Android.bp
@@ -24,7 +24,11 @@
         "src/**/*.java",
         "app/src/android/car/cts/app/PowerPolicyTestCommandStatus.java",
         "app/src/android/car/cts/app/PowerPolicyTestCommandType.java",
+        ":cartelemetryservice-proto-srcs",
     ],
+    proto: {
+        type: "lite",
+    },
     libs: [
         "cts-tradefed",
         "tradefed",
@@ -38,10 +42,11 @@
         "general-tests",
     ],
     static_libs: [
-    	"cts-statsd-atom-host-test-utils",
+        "cts-statsd-atom-host-test-utils",
     ],
     data: [
         ":CtsCarApp",
         ":CtsCarWatchdogSharedApp",
+        ":CtsCarWatchdogSecondSharedApp",
     ],
 }
diff --git a/hostsidetests/car/AndroidTest.xml b/hostsidetests/car/AndroidTest.xml
index 81bcbb4..e72b1bd 100644
--- a/hostsidetests/car/AndroidTest.xml
+++ b/hostsidetests/car/AndroidTest.xml
@@ -23,6 +23,7 @@
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsCarApp.apk" />
         <option name="test-file-name" value="CtsCarWatchdogSharedApp.apk" />
+        <option name="test-file-name" value="CtsCarWatchdogSecondSharedApp.apk" />
     </target_preparer>
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsCarHostTestCases.jar" />
diff --git a/hostsidetests/car/app/Android.bp b/hostsidetests/car/app/Android.bp
index 32e33d8..2ac9c1f 100644
--- a/hostsidetests/car/app/Android.bp
+++ b/hostsidetests/car/app/Android.bp
@@ -16,13 +16,12 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-android_test_helper_app {
-    name: "CtsCarApp",
+java_defaults {
+    name: "cts_app_defaults",
     defaults: ["cts_defaults"],
     srcs: ["src/**/*.java"],
     sdk_version: "test_current",
 
-    enforce_uses_libs: false,
     static_libs: [
         "android.frameworks.automotive.powerpolicy-V1-java",
         "android.hardware.automotive.vehicle-V2.0-java",
@@ -34,20 +33,22 @@
 }
 
 android_test_helper_app {
-    name: "CtsCarWatchdogSharedApp",
-    defaults: ["cts_defaults"],
-    srcs: ["src/**/*.java"],
-    sdk_version: "test_current",
-
-    manifest: "AndroidManifestWithSharedUserId.xml",
-
+    name: "CtsCarApp",
+    defaults: ["cts_app_defaults"],
     enforce_uses_libs: false,
-    static_libs: [
-        "android.frameworks.automotive.powerpolicy-V1-java",
-        "android.hardware.automotive.vehicle-V2.0-java",
-        "androidx.test.rules",
-        "compatibility-device-util-axt",
-    ],
+    libs: ["android.car-test-stubs"],
+}
 
-    libs: ["android.car"],
+android_test_helper_app {
+    name: "CtsCarWatchdogSharedApp",
+    defaults: ["cts_app_defaults"],
+    manifest: "AndroidManifestWithSharedUserId.xml",
+    enforce_uses_libs: false,
+}
+
+android_test_helper_app {
+    name: "CtsCarWatchdogSecondSharedApp",
+    defaults: ["cts_app_defaults"],
+    manifest: "AndroidManifestWithSharedUserId2.xml",
+    enforce_uses_libs: false,
 }
diff --git a/hostsidetests/car/app/AndroidManifestWithSharedUserId2.xml b/hostsidetests/car/app/AndroidManifestWithSharedUserId2.xml
new file mode 100755
index 0000000..a42e873
--- /dev/null
+++ b/hostsidetests/car/app/AndroidManifestWithSharedUserId2.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2022 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.car.cts.watchdog.second.sharedapp"
+    android:sharedUserId="android.car.cts.uid.watchdog.sharedapp">
+
+    <application>
+        <activity android:name="android.car.cts.app.CarWatchdogTestActivity"
+                  android:launchMode="singleTask"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/hostsidetests/car/src/android/car/cts/CarHostJUnit4TestCase.java b/hostsidetests/car/src/android/car/cts/CarHostJUnit4TestCase.java
index 595881a..7d8c23e 100644
--- a/hostsidetests/car/src/android/car/cts/CarHostJUnit4TestCase.java
+++ b/hostsidetests/car/src/android/car/cts/CarHostJUnit4TestCase.java
@@ -90,6 +90,10 @@
     private int mInitialUserId;
     private Integer mInitialMaximumNumberOfUsers;
 
+    // It is possible that during test initial user is deleted and it is not possible to switch
+    // to the initial User. This boolean controls if test should switch to initial user on clean up.
+    private boolean mSwitchToInitialUser = true;
+
     /**
      * Saves multi-user state so it can be restored after the test.
      */
@@ -109,7 +113,7 @@
         CLog.d("restoreUsersState(): initial user: %d, current user: %d, created users: %s "
                 + "max number of users: %d",
                 mInitialUserId, currentUserId, mUsersToBeRemoved, mInitialMaximumNumberOfUsers);
-        if (currentUserId != mInitialUserId) {
+        if (currentUserId != mInitialUserId && mSwitchToInitialUser) {
             CLog.i("Switching back from %d to %d", currentUserId, mInitialUserId);
             switchUser(mInitialUserId);
         }
@@ -131,6 +135,23 @@
     }
 
     /**
+     * It is possible that during test initial user is deleted and it is not possible to switch to
+     * the initial User. This method controls if test should switch to initial user on clean up.
+     */
+    public void doNotSwitchToInitialUserAfterTest() {
+        mSwitchToInitialUser = false;
+    }
+
+    /**
+     * Returns whether device is in headless system user mode.
+     */
+    boolean isHeadlessSystemUserMode() throws Exception {
+        String result = getDevice()
+                .executeShellCommand("getprop ro.fw.mu.headless_system_user").trim();
+        return Boolean.valueOf(result);
+    }
+
+    /**
      * Makes sure the device supports multiple users, throwing {@link AssumptionViolatedException}
      * if it doesn't.
      */
@@ -270,14 +291,14 @@
      * Creates a full user with car service shell command.
      */
     protected int createFullUser(String name) throws Exception {
-        return createUser(name, /* flags= */ 0, "android.os.usertype.full.SECONDARY");
+        return createUser(name, /* flags= */ 0, /* isGuest= */ false);
     }
 
     /**
      * Creates a full guest with car service shell command.
      */
     protected int createGuestUser(String name) throws Exception {
-        return createUser(name, /* flags= */ 0, "android.os.usertype.full.GUEST");
+        return createUser(name, /* flags= */ 0, /* isGuest= */ true);
     }
 
     /**
@@ -285,14 +306,15 @@
      *
      * <p><b>NOTE: </b>it uses User HAL flags, not core Android's.
      */
-    protected int createUser(String name, int flags, String type) throws Exception {
+    protected int createUser(String name, int flags, boolean isGuest) throws Exception {
         name = USER_PREFIX + "." + name;
         waitForCarServiceReady();
         int userId = executeAndParseCommand(CREATE_USER_OUTPUT_PATTERN,
-                "Could not create user with name " + name + ", flags " + flags + ", type" + type,
+                "Could not create user with name " + name
+                        + ", flags " + flags + ", guest " + isGuest,
                 matcher -> Integer.parseInt(matcher.group(1)),
-                "cmd car_service create-user --flags %d --type %s %s",
-                flags, type, name);
+                "cmd car_service create-user --flags %d %s%s",
+                flags, (isGuest ? "--guest " : ""), name);
         markUserForRemovalAfterTest(userId);
         return userId;
     }
@@ -437,6 +459,13 @@
     }
 
     /**
+     * Reboots the device.
+     */
+    protected void reboot() throws Exception {
+        getDevice().reboot();
+    }
+
+    /**
      * Gets mapping of package and permissions granted for requested user id.
      *
      * @return Map<String, List<String>> where key is the package name and
diff --git a/hostsidetests/car/src/android/car/cts/CarServiceHelperServiceTest.java b/hostsidetests/car/src/android/car/cts/CarServiceHelperServiceTest.java
new file mode 100644
index 0000000..6c55c7b
--- /dev/null
+++ b/hostsidetests/car/src/android/car/cts/CarServiceHelperServiceTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@RunWith(DeviceJUnit4ClassRunner.class)
+public final class CarServiceHelperServiceTest extends CarHostJUnit4TestCase {
+
+    private static final int SYSTEM_USER_ID = 0;
+    private static final int RESTART_AND_CREATE_USER_WAIT_TIME_MS = 300_000;
+    private static final int RETRY_WAIT_TIME_MS = 1_000;
+
+    /*
+     * This test tests multiple calls from CarServiceHelperService -
+     * {@code CarServiceHelperInterface.createUserEvenWhenDisallowed}
+     * {@code CarServiceHelperServiceUpdatable.onStart} and
+     * {@code CarServiceHelperServiceUpdatable.initBootUser}
+     */
+    @Test
+    public void testUserCreatedOnStartUpForHeadlessSystemUser() throws Exception {
+        assumeTrue("Skipping test on non-headless system user mode",
+                isHeadlessSystemUserMode());
+
+        doNotSwitchToInitialUserAfterTest();
+
+        removeAllUsersExceptSystem();
+
+        reboot();
+
+        assertFullUserCreated();
+    }
+
+    private void assertFullUserCreated() throws Exception {
+        List<Integer> users = getAllUsers();
+
+        // Wait for full user. It takes time for system to restart and create full user
+        long startTime = System.currentTimeMillis();
+        long waitTime = System.currentTimeMillis() - startTime;
+        if (users.size() < 2 && waitTime < RESTART_AND_CREATE_USER_WAIT_TIME_MS) {
+            sleep(RETRY_WAIT_TIME_MS);
+            users = getAllUsers();
+            waitTime = System.currentTimeMillis() - startTime;
+        }
+
+        // Confirm that at least two users exists and current user is not system user
+        assertThat(users.size()).isAtLeast(2);
+        assertThat(getCurrentUserId()).isNotEqualTo(SYSTEM_USER_ID);
+    }
+
+    private void removeAllUsersExceptSystem() throws Exception {
+        List<Integer> users = getAllUsers();
+        for (int i = 0; i < users.size(); i++) {
+            int userId = users.get(i);
+            if (userId == SYSTEM_USER_ID) {
+                continue;
+            }
+            removeUser(userId);
+        }
+
+        users = getAllUsers();
+        assertThat(users).containsExactly(SYSTEM_USER_ID);
+    }
+
+    private List<Integer> getAllUsers() throws Exception {
+        return onAllUsers((allUsers) -> allUsers.stream()
+                .filter((u) -> !u.flags.contains("DISABLED") && !u.flags.contains("EPHEMERAL"))
+                .map((u) -> u.id).collect(Collectors.toList()));
+    }
+}
diff --git a/hostsidetests/car/src/android/car/cts/CarTelemetryHostTest.java b/hostsidetests/car/src/android/car/cts/CarTelemetryHostTest.java
new file mode 100644
index 0000000..af23b2b
--- /dev/null
+++ b/hostsidetests/car/src/android/car/cts/CarTelemetryHostTest.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.car.telemetry.TelemetryProto;
+
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.io.FileOutputStream;
+
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class CarTelemetryHostTest extends CarHostJUnit4TestCase {
+
+    // Publisher/subscriber listening for gear change property
+    private static final int GEAR_SELECTION_PROPERTY_ID = 287310850;
+    private static final TelemetryProto.Publisher GEAR_CHANGE_PUBLISHER =
+            TelemetryProto.Publisher.newBuilder()
+                    .setVehicleProperty(
+                            TelemetryProto.VehiclePropertyPublisher.newBuilder()
+                                    .setVehiclePropertyId(GEAR_SELECTION_PROPERTY_ID)
+                                    .setReadRate(0f))
+                    .build();
+    private static final TelemetryProto.Subscriber GEAR_CHANGE_SUBSCRIBER =
+            TelemetryProto.Subscriber.newBuilder()
+                    .setHandler("onGearChange")
+                    .setPublisher(GEAR_CHANGE_PUBLISHER)
+                    .setPriority(0)
+                    .build();
+
+    // only produces interim result
+    private static final String LUA_SCRIPT_INTERIM = new StringBuilder()
+            .append("function onGearChange(published_data, saved_state)\n")
+            .append("    saved_state['interim_result_exists'] = true\n")
+            .append("    on_success(saved_state)\n")
+            .append("end\n")
+            .toString();
+    private static final TelemetryProto.MetricsConfig METRICS_CONFIG_1 =
+            TelemetryProto.MetricsConfig.newBuilder()
+                    .setName("test_config_1")
+                    .setVersion(1)
+                    .setScript(LUA_SCRIPT_INTERIM)
+                    .addSubscribers(GEAR_CHANGE_SUBSCRIBER)
+                    .build();
+    private static final String CONFIG_NAME_1 = METRICS_CONFIG_1.getName();
+
+    // only produces final result
+    private static final String LUA_SCRIPT_FINAL = new StringBuilder()
+            .append("function onGearChange(published_data, saved_state)\n")
+            .append("    saved_state['final_result_exists'] = true\n")
+            .append("    on_script_finished(saved_state)\n")
+            .append("end\n")
+            .toString();
+    private static final TelemetryProto.MetricsConfig METRICS_CONFIG_2 =
+            TelemetryProto.MetricsConfig.newBuilder()
+                    .setName("test_config_2")
+                    .setVersion(1)
+                    .setScript(LUA_SCRIPT_FINAL)
+                    .addSubscribers(GEAR_CHANGE_SUBSCRIBER)
+                    .build();
+    private static final String CONFIG_NAME_2 = METRICS_CONFIG_2.getName();
+
+    private static final long SCRIPT_EXECUTION_TIMEOUT_MILLIS = 30_000L;
+    private static final String FINAL_RESULT_DIR = "/data/system/car/telemetry/final";
+    private static final String INTERIM_RESULT_DIR = "/data/system/car/telemetry/interim";
+
+    @Before
+    public void setUp() throws Exception {
+        getDevice().enableAdbRoot();
+        String output = executeCommand("cmd car_service enable-feature car_telemetry_service");
+        if (!output.startsWith("Already enabled")) {
+            // revert the feature to its original setting
+            executeCommand("cmd car_service disable-feature car_telemetry_service");
+            assumeTrue("CarTelemetryService is not enabled, skipping test", false);
+        }
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        executeCommand("cmd car_service telemetry remove %s", CONFIG_NAME_1);
+        executeCommand("rm %s/%s", FINAL_RESULT_DIR, CONFIG_NAME_2);
+    }
+
+    @Test
+    public void testSavingResultsAcrossReboot() throws Exception {
+        // create temp files, which will be the argument to the telemetry car shell cmd
+        File config1 = createMetricsConfigTempFile(METRICS_CONFIG_1);
+        File config2 = createMetricsConfigTempFile(METRICS_CONFIG_2);
+        config1.deleteOnExit();
+        config2.deleteOnExit();
+
+        // outputs that should be produced by the Lua scripts above
+        String scriptOutput1 = "interim_result_exists";
+        String scriptOutput2 = "final_result_exists";
+
+        // add metrics configs using car shell command
+        getDevice().executeShellV2Command("cmd car_service telemetry add " + CONFIG_NAME_1,
+                config1);
+        getDevice().executeShellV2Command("cmd car_service telemetry add " + CONFIG_NAME_2,
+                config2);
+
+        // inject gear change event, should trigger script execution for both scripts
+        executeCommand("cmd car_service inject-vhal-event %d %d",
+                GEAR_SELECTION_PROPERTY_ID, 2);
+
+        // block until script execution finishes
+        PollingCheck.waitFor(SCRIPT_EXECUTION_TIMEOUT_MILLIS, () -> {
+            String dump = dumpTelemetryService();
+            return dump.contains(scriptOutput1) && dump.contains(scriptOutput2);
+        });
+
+        // verify that both results are stored in memory, not in disk
+        assertThat(executeCommand("ls %s", INTERIM_RESULT_DIR))
+                .doesNotContain(CONFIG_NAME_1);
+        assertThat(executeCommand("ls %s", FINAL_RESULT_DIR))
+                .doesNotContain(CONFIG_NAME_2);
+
+        // trigger reboot, which should save results to disk
+        getDevice().reboot();
+        waitForCarServiceReady();
+
+        // verify data is saved across reboot
+        assertThat(dumpTelemetryService()).contains(scriptOutput1);
+        String result = executeCommand("cmd car_service telemetry get-result %s", CONFIG_NAME_2);
+        assertThat(result).contains(scriptOutput2);
+    }
+
+    private String dumpTelemetryService() throws Exception {
+        return executeCommand("dumpsys car_service --services CarTelemetryService");
+    }
+
+    private File createMetricsConfigTempFile(TelemetryProto.MetricsConfig metricsConfig)
+            throws Exception {
+        File tempFile = File.createTempFile(metricsConfig.getName(), ".bin");
+        FileOutputStream os = new FileOutputStream(tempFile);
+        os.write(metricsConfig.toByteArray());
+        os.flush();
+        os.close();
+        return tempFile;
+    }
+}
diff --git a/hostsidetests/car/src/android/car/cts/CarWatchdogHostTest.java b/hostsidetests/car/src/android/car/cts/CarWatchdogHostTest.java
index 6859866..74d59f7 100644
--- a/hostsidetests/car/src/android/car/cts/CarWatchdogHostTest.java
+++ b/hostsidetests/car/src/android/car/cts/CarWatchdogHostTest.java
@@ -38,6 +38,7 @@
 import org.junit.runner.RunWith;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
@@ -54,6 +55,11 @@
     protected static final String WATCHDOG_APP_PKG = "android.car.cts.watchdog.sharedapp";
 
     /**
+     * Second CarWatchdog app package.
+     */
+    protected static final String WATCHDOG_APP_PKG_2 = "android.car.cts.watchdog.second.sharedapp";
+
+    /**
      * CarWatchdog app shared user id.
      */
     protected static final String WATCHDOG_APP_SHARED_USER_ID =
@@ -174,23 +180,25 @@
 
         executeCommand(APPLY_DISABLE_DISPLAY_POWER_POLICY_CMD);
 
-        verifyTestAppKilled(APP_PKG);
+        verifyTestAppsKilled(APP_PKG);
         verifyAtomKillStatsReported(APP_PKG);
     }
 
     @Test
-    public void testIoOveruseKillAfterDisplayTurnOffWithSharedUserIdApp() throws Exception {
+    public void testIoOveruseKillAfterDisplayTurnOffWithSharedUserIdApps() throws Exception {
+        // Stats collection is based on uid. Packages with shared uids can be used interchangeably.
         uploadStatsdConfig(WATCHDOG_APP_PKG);
 
-        for (int i = 0; i < RECURRING_OVERUSE_COUNT; ++i) {
-            overuseDiskIo(WATCHDOG_APP_PKG);
-            verifyAtomIoOveruseStatsReported(WATCHDOG_APP_PKG, /* overuseTimes= */ i + 1);
+        for (int i = 0; i < RECURRING_OVERUSE_COUNT; i++) {
+            overuseDiskIo(i % 2 == 0 ? WATCHDOG_APP_PKG : WATCHDOG_APP_PKG_2);
+            verifyAtomIoOveruseStatsReported(i % 2 == 0 ? WATCHDOG_APP_PKG_2 : WATCHDOG_APP_PKG,
+                    /* overuseTimes= */ i + 1);
             ReportUtils.clearReports(getDevice());
         }
 
         executeCommand(APPLY_DISABLE_DISPLAY_POWER_POLICY_CMD);
 
-        verifyTestAppKilled(WATCHDOG_APP_PKG);
+        verifyTestAppsKilled(WATCHDOG_APP_PKG, WATCHDOG_APP_PKG_2);
         verifyAtomKillStatsReported(WATCHDOG_APP_PKG);
     }
 
@@ -304,14 +312,23 @@
         throw new IllegalArgumentException("Invalid message format: " + message);
     }
 
-    private void verifyTestAppKilled(String packageName) throws Exception {
-        PollingCheck.check("Failed to kill " + packageName + " application",
-                WATCHDOG_ACTION_TIMEOUT_MS,
-                () -> {
+    private void verifyTestAppsKilled(String... packageNames) throws Exception {
+        ArrayList<String> packages = new ArrayList<>(List.of(packageNames));
+        try {
+            PollingCheck.check("Failed to kill applications", WATCHDOG_ACTION_TIMEOUT_MS, () -> {
+                for (int i = packages.size() - 1; i >= 0; i--) {
                     // Check activity dump for errors. Throws exception on error.
+                    String packageName = packages.get(i);
                     fetchActivityDumpsys(packageName);
-                    return !isPackageRunning(packageName);
-                });
+                    if (!isPackageRunning(packageName)) {
+                        packages.remove(i);
+                    }
+                }
+                return packages.isEmpty();
+            });
+        } catch (AssertionError e) {
+            assertWithMessage("Failed to kill applications: %s", packages).fail();
+        }
     }
 
     private String fetchActivityDumpsys(String packageName) throws Exception {
@@ -350,9 +367,8 @@
         if (now.getHour() < 23) {
             return;
         }
-        LocalDateTime nowMinusOneHour = now.minusHours(1);
-        executeCommand("date %s", nowMinusOneHour);
-        CLog.d(TAG, "checkAndSetDate: DateTime changed from %s to %s", now, nowMinusOneHour);
+        executeCommand("date %s", now.minusHours(1));
+        CLog.d(TAG, "DateTime changed from %s to %s", now, now.minusHours(1));
         mDidModifyDateTime = true;
     }
 
@@ -361,8 +377,7 @@
             return;
         }
         LocalDateTime now = LocalDateTime.parse(executeCommand("date +%%FT%%T").trim());
-        LocalDateTime nowPlusOneHour = now.plusHours(1);
-        executeCommand("date %s", nowPlusOneHour);
-        CLog.d(TAG, "checkAndResetDate: DateTime changed from %s to %s", now, nowPlusOneHour);
+        executeCommand("date %s", now.plusHours(1));
+        CLog.d(TAG, "DateTime changed from %s to %s", now, now.plusHours(1));
     }
 }
diff --git a/hostsidetests/car/src/android/car/cts/GarageModeAtomTests.java b/hostsidetests/car/src/android/car/cts/GarageModeAtomTests.java
index cc8823a..3eb85a9 100644
--- a/hostsidetests/car/src/android/car/cts/GarageModeAtomTests.java
+++ b/hostsidetests/car/src/android/car/cts/GarageModeAtomTests.java
@@ -94,7 +94,7 @@
         Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
 
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
                 atom -> atom.getGarageModeInfo().getIsGarageMode() ?  1 : 0);
 
     }
diff --git a/hostsidetests/car/src/android/car/cts/PreCreateUsersHostTest.java b/hostsidetests/car/src/android/car/cts/PreCreateUsersHostTest.java
index 1d5ebcf..604adab 100644
--- a/hostsidetests/car/src/android/car/cts/PreCreateUsersHostTest.java
+++ b/hostsidetests/car/src/android/car/cts/PreCreateUsersHostTest.java
@@ -164,7 +164,7 @@
                 : createFullUser("PreCreatedUsersTest_Reference_User");
         // Some permissions (e.g. Role permission) are given only after initialization.
         switchUser(referenceUserId);
-        waitUntilUserPermissionsIsReady(referenceUserId);
+        waitUntilUserPermissionsIsReady(/* waitTime= */ 30, referenceUserId);
         Map<String, List<String>> refPkgMap = getPackagesAndPermissionsForUser(referenceUserId);
 
         // There can be just one guest by default, so remove it now otherwise
@@ -182,7 +182,7 @@
         convertPreCreatedUser(isGuest, preCreatedUserId);
         // Some permissions (e.g. Role permission) are given only after initialization.
         switchUser(preCreatedUserId);
-        waitUntilUserPermissionsIsReady(preCreatedUserId);
+        waitUntilUserPermissionsIsReady(/* waitTime= */ 20, preCreatedUserId);
         Map<String, List<String>> actualPkgMap = getPackagesAndPermissionsForUser(preCreatedUserId);
 
         List<String> errors = new ArrayList<>();
@@ -192,6 +192,20 @@
                             .that(actualPkgMap.get(pkg))
                             .isEqualTo(refPkgMap.get(pkg)));
         }
+
+        if (!errors.isEmpty()) {
+            // if there are errors, wait for some more time and check again.
+            waitUntilUserPermissionsIsReady(/* waitTime= */ 20, preCreatedUserId);
+            Map<String, List<String>> actualPkgMap2 = getPackagesAndPermissionsForUser(
+                    preCreatedUserId);
+
+            errors = new ArrayList<>();
+            for (String pkg : refPkgMap.keySet()) {
+                addError(errors, () -> assertWithMessage("permissions state mismatch for %s", pkg)
+                        .that(actualPkgMap2.get(pkg))
+                        .isEqualTo(refPkgMap.get(pkg)));
+            }
+        }
         assertWithMessage("found %s error", errors.size()).that(errors).isEmpty();
     }
 
@@ -246,10 +260,10 @@
     }
 
     // TODO(b/170263003): update this method after core framewokr's refactoring for proto
-    private void waitUntilUserPermissionsIsReady(int userId) throws InterruptedException {
-        int napTimeSec = 20;
-        CLog.i("Sleeping %ds to make permissions for user %d is ready", napTimeSec, userId);
-        sleep(napTimeSec * 1_000);
+    private void waitUntilUserPermissionsIsReady(int waitTime, int userId)
+            throws InterruptedException {
+        CLog.i("Sleeping %ds to make permissions for user %d is ready", waitTime, userId);
+        sleep(waitTime * 1_000);
     }
 
     private void deletePreCreatedUsers() throws Exception {
diff --git a/hostsidetests/car/src/android/car/cts/powerpolicy/CpmsFrameworkLayerStateInfo.java b/hostsidetests/car/src/android/car/cts/powerpolicy/CpmsFrameworkLayerStateInfo.java
index d7f6108..08abe56 100644
--- a/hostsidetests/car/src/android/car/cts/powerpolicy/CpmsFrameworkLayerStateInfo.java
+++ b/hostsidetests/car/src/android/car/cts/powerpolicy/CpmsFrameworkLayerStateInfo.java
@@ -23,6 +23,8 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public final class CpmsFrameworkLayerStateInfo {
     private static final int STRING_BUILDER_BUF_SIZE = 1024;
@@ -302,12 +304,14 @@
             int val = 0;
             switch (header) {
                 case CURRENT_STATE_HDR:
-                    String[] tokens = mLines[mIdx].split(",*\\s");
-                    if (tokens.length != 6) {
+                    Pattern pattern = Pattern.compile("mCurrentState: CpmsState "
+                            + "[^\\n]*carPowerStateListenerState=(\\d+)");
+                    Matcher matcher = pattern.matcher(mLines[mIdx]);
+                    if (!matcher.find()) {
                         throw new IllegalArgumentException("malformatted mCurrentState: "
                                 + mLines[mIdx]);
                     }
-                    val = Integer.parseInt(tokens[4].trim().substring(tokens[4].length() - 1));
+                    val = Integer.parseInt(matcher.group(1));
                     break;
                 case NUMBER_POLICY_LISTENERS_HDR:
                     int strLen = mLines[mIdx].length();
diff --git a/hostsidetests/car/src/android/car/cts/powerpolicy/PowerPolicyConstants.java b/hostsidetests/car/src/android/car/cts/powerpolicy/PowerPolicyConstants.java
index f0fbbab..9bdd2ef 100644
--- a/hostsidetests/car/src/android/car/cts/powerpolicy/PowerPolicyConstants.java
+++ b/hostsidetests/car/src/android/car/cts/powerpolicy/PowerPolicyConstants.java
@@ -20,6 +20,8 @@
     public static final int VHAL_POWER_STATE_REQ_PROPERTY_ID = 289475072;
     public static final int VHAL_POWER_STATE_REP_PROPERTY_ID = 289475073;
 
+    private PowerPolicyConstants() { }
+
     public static final class CarPowerState {
         public static final int INVALID = 0;
         public static final int WAIT_FOR_VHAL = 1;
@@ -29,6 +31,8 @@
         public static final int ON = 6;
         public static final int SHUTDOWN_PREPARE = 7;
         public static final int SHUTDOWN_CANCELLED = 8;
+
+        private CarPowerState() { }
     }
 
     public static final class VhalPowerStateReq {
@@ -36,6 +40,8 @@
         public static final int SHUTDOWN_PREPARE = 1;
         public static final int CANCEL_SHUTDOWN = 2;
         public static final int FINISHED = 3;
+
+        private VhalPowerStateReq() { }
     }
 
     public static final class ShutdownParam {
@@ -44,5 +50,7 @@
         public static final int CAN_SLEEP = 2;
         public static final int SHUTDOWN_ONLY = 3;
         public static final int SLEEP_IMMEDIATELY = 4;
+
+        private ShutdownParam() { }
     }
 }
diff --git a/hostsidetests/car_builtin/Android.bp b/hostsidetests/car_builtin/Android.bp
new file mode 100644
index 0000000..9bd7c80
--- /dev/null
+++ b/hostsidetests/car_builtin/Android.bp
@@ -0,0 +1,42 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_test_host {
+    name: "CtsCarBuiltinApiHostTestCases",
+    defaults: ["cts_defaults"],
+    // Only compile source java files in this apk.
+    srcs: [
+        "src/**/*.java",
+    ],
+    libs: [
+        "tradefed",
+        "compatibility-host-util",
+        "truth-prebuilt",
+    ],
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    static_libs: [
+        "cts-statsd-atom-host-test-utils",
+    ],
+    data: [
+        ":CtsCarBuiltinPmHelperApp",
+    ],
+}
diff --git a/hostsidetests/car_builtin/AndroidTest.xml b/hostsidetests/car_builtin/AndroidTest.xml
new file mode 100644
index 0000000..3aa2a6f
--- /dev/null
+++ b/hostsidetests/car_builtin/AndroidTest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<configuration description="Car Builtin APIs Host Tests">
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="auto" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsCarBuiltinPmHelperApp.apk" />
+    </target_preparer>
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsCarBuiltinApiHostTestCases.jar" />
+        <option name="runtime-hint" value="1m" />
+    </test>
+</configuration>
diff --git a/hostsidetests/car_builtin/OWNERS b/hostsidetests/car_builtin/OWNERS
new file mode 100644
index 0000000..f0afac5
--- /dev/null
+++ b/hostsidetests/car_builtin/OWNERS
@@ -0,0 +1,4 @@
+# Bug component: 526680
+keunyoung@google.com
+felipeal@google.com
+gurunagarajan@google.com
diff --git a/hostsidetests/car_builtin/apps/pm_helper_app/Android.bp b/hostsidetests/car_builtin/apps/pm_helper_app/Android.bp
new file mode 100644
index 0000000..4bc3c68
--- /dev/null
+++ b/hostsidetests/car_builtin/apps/pm_helper_app/Android.bp
@@ -0,0 +1,31 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsCarBuiltinPmHelperApp",
+    defaults: ["cts_defaults"],
+    srcs: ["src/**/*.java"],
+    sdk_version: "test_current",
+
+    enforce_uses_libs: false,
+    static_libs: [
+        "androidx.test.rules",
+    ],
+
+    libs: ["android.car-test-stubs"],
+}
diff --git a/hostsidetests/car_builtin/apps/pm_helper_app/AndroidManifest.xml b/hostsidetests/car_builtin/apps/pm_helper_app/AndroidManifest.xml
new file mode 100644
index 0000000..4aeeb9b
--- /dev/null
+++ b/hostsidetests/car_builtin/apps/pm_helper_app/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2022 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.car.cts.builtin.apps.pm">
+
+    <application android:name="CtsCarBuiltinPmHelperApp">
+        <activity android:name="android.car.cts.builtin.apps.pm.ManifestEnabledActivity"
+            android:launchMode="singleTask"
+            android:exported="true"
+            android:enabled="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/hostsidetests/car_builtin/apps/pm_helper_app/src/android/car/cts/builtin/apps/pm/ManifestEnabledActivity.java b/hostsidetests/car_builtin/apps/pm_helper_app/src/android/car/cts/builtin/apps/pm/ManifestEnabledActivity.java
new file mode 100644
index 0000000..b5c9047
--- /dev/null
+++ b/hostsidetests/car_builtin/apps/pm_helper_app/src/android/car/cts/builtin/apps/pm/ManifestEnabledActivity.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.apps.pm;
+
+import android.app.Activity;
+
+public final class ManifestEnabledActivity extends Activity {
+}
diff --git a/hostsidetests/car_builtin/src/android/car/cts/builtin/ActivityManagerHelperHostTest.java b/hostsidetests/car_builtin/src/android/car/cts/builtin/ActivityManagerHelperHostTest.java
new file mode 100644
index 0000000..8f5c3ed
--- /dev/null
+++ b/hostsidetests/car_builtin/src/android/car/cts/builtin/ActivityManagerHelperHostTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.cts.builtin.user.CarInitialUserCommand;
+import android.car.cts.builtin.user.InitializedUsersCommand;
+
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@RunWith(DeviceJUnit4ClassRunner.class)
+public final class ActivityManagerHelperHostTest extends CarBuiltinApiHostCtsBase {
+    private static final int SYSTEM_USER = 0;
+
+    // The startUserInForeground, startUserInBackground and unlockUser ActivityManagerHelper
+    // APIs are called by InitialUserSetter during device boot.Checking the default users
+    // are properly initialized covers the API testing.
+    @Test
+    public void testDefaultUserInitialization() throws Exception {
+        InitializedUsersCommand initUsersCommand = new InitializedUsersCommand(getDevice());
+        initUsersCommand.executeWith();
+        List<Integer> initUsers = initUsersCommand.getInitializedUsers();
+
+        ArrayList<Integer> defaultUsers = new ArrayList<>();
+        defaultUsers.add(SYSTEM_USER);
+        if (initUsersCommand.hasHeadlessUser()) {
+            CarInitialUserCommand initialUserCommand = new CarInitialUserCommand(getDevice());
+            initialUserCommand.executeWith();
+            int initialUser = initialUserCommand.getCarInitialUser();
+            defaultUsers.add(initialUser);
+        }
+
+        assertThat(initUsers).containsAtLeastElementsIn(defaultUsers);
+    }
+
+    @Test
+    public void testStopUserWithDelayedLocking() throws Exception {
+        // CtsCarHostTestCases:CarGarageModeAtomTests covers the stopUserWithDelayedLocking
+        // API call.
+    }
+}
diff --git a/hostsidetests/car_builtin/src/android/car/cts/builtin/BinderHelperHostTest.java b/hostsidetests/car_builtin/src/android/car/cts/builtin/BinderHelperHostTest.java
new file mode 100644
index 0000000..22e13e2
--- /dev/null
+++ b/hostsidetests/car_builtin/src/android/car/cts/builtin/BinderHelperHostTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin;
+
+import static android.car.cts.builtin.os.GetInitialUserInfoCommand.OK_STATUS_RETURN_HEADER;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.cts.builtin.os.DumpDrivingStateServiceCommand;
+import android.car.cts.builtin.os.GetInitialUserInfoCommand;
+
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(DeviceJUnit4ClassRunner.class)
+public final class BinderHelperHostTest extends CarBuiltinApiHostCtsBase {
+
+    // When a car shell command (such as, "cmd car_service get-do-activities") is called, it
+    // triggers both BinderHelper.onTransactForCmd and
+    // BinderHelper.ShellCommandListener.onShellCommand calls.
+    @Test
+    public void testOnTransactForCmd() throws Exception {
+        // setup
+        GetInitialUserInfoCommand infoCmd = new GetInitialUserInfoCommand(getDevice());
+
+        // execution and assertion
+        infoCmd.executeWith();
+        assertThat(infoCmd.returnStartsWith(OK_STATUS_RETURN_HEADER)).isTrue();
+    }
+
+    // When the "dumpsys car_service --services CarDrivingStateService" shell command is called,
+    // it triggers the BinderHelper.dumpRemoteCallbackList() builtin API.
+    @Test
+    public void testDumpRemoteCallbackList() throws Exception {
+        // setup
+        DumpDrivingStateServiceCommand dumpCmd = new DumpDrivingStateServiceCommand(getDevice());
+
+        // execution and assertion
+        dumpCmd.executeWith();
+        assertThat(dumpCmd.hasRemoteCallbackListDump()).isTrue();
+    }
+}
diff --git a/hostsidetests/car_builtin/src/android/car/cts/builtin/CarBuiltinApiHostCtsBase.java b/hostsidetests/car_builtin/src/android/car/cts/builtin/CarBuiltinApiHostCtsBase.java
new file mode 100644
index 0000000..156e02c
--- /dev/null
+++ b/hostsidetests/car_builtin/src/android/car/cts/builtin/CarBuiltinApiHostCtsBase.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.testtype.ITestInformationReceiver;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import org.junit.AssumptionViolatedException;
+import org.junit.Rule;
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+/**
+ * Base class for all car mainline builtin API host test cases.
+ */
+// NOTE: must be public because of @Rules
+public abstract class CarBuiltinApiHostCtsBase extends BaseHostJUnit4Test {
+
+    @Rule
+    public final RequiredFeatureRule mHasAutomotiveRule = new RequiredFeatureRule(this,
+            "android.hardware.type.automotive");
+
+
+    protected static final class RequiredFeatureRule implements TestRule {
+
+        private final ITestInformationReceiver mReceiver;
+        private final String mFeature;
+
+        RequiredFeatureRule(ITestInformationReceiver receiver, String feature) {
+            mReceiver = receiver;
+            mFeature = feature;
+        }
+
+        @Override
+        public Statement apply(Statement base, Description description) {
+            return new Statement() {
+
+                @Override
+                public void evaluate() throws Throwable {
+                    boolean hasFeature = false;
+                    try {
+                        hasFeature = mReceiver.getTestInformation().getDevice()
+                                .hasFeature(mFeature);
+                    } catch (DeviceNotAvailableException e) {
+                        CLog.e("Could not check if device has feature %s: %e", mFeature, e);
+                        return;
+                    }
+
+                    if (!hasFeature) {
+                        CLog.d("skipping %s#%s"
+                                + " because device does not have feature '%s'",
+                                description.getClassName(), description.getMethodName(), mFeature);
+                        throw new AssumptionViolatedException("Device does not have feature '"
+                                + mFeature + "'");
+                    }
+                    base.evaluate();
+                }
+            };
+        }
+
+        @Override
+        public String toString() {
+            return "RequiredFeatureRule[" + mFeature + "]";
+        }
+    }
+}
diff --git a/hostsidetests/car_builtin/src/android/car/cts/builtin/CtsCarShellCommand.java b/hostsidetests/car_builtin/src/android/car/cts/builtin/CtsCarShellCommand.java
new file mode 100644
index 0000000..5bc2cc3
--- /dev/null
+++ b/hostsidetests/car_builtin/src/android/car/cts/builtin/CtsCarShellCommand.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin;
+
+import com.android.tradefed.device.ITestDevice;
+
+/**
+ * Base class for all Car Builtin API test related shell command invocation.
+ *
+ * It is the extended subclass command to construct the shell command string and decide
+ * if the command's return is successful or not. Further, it is the extended subclass command
+ * to extra all necessary information from the return string if needed.
+ */
+public abstract class CtsCarShellCommand {
+    private final ITestDevice mDevice;
+
+    protected final String mCommand;
+    protected String[] mCommandArgs;
+    protected String mCommandReturn;
+
+    protected CtsCarShellCommand(String commandName, ITestDevice device) {
+        mCommand = commandName;
+        mDevice = device;
+    }
+
+    public CtsCarShellCommand executeWith(String... args) throws Exception {
+        mCommandArgs = args;
+
+        String cmd = mCommand;
+        if (mCommandArgs != null && mCommandArgs.length > 0) {
+            cmd = mCommand + " " + String.join(" ", mCommandArgs);
+        }
+        mCommandReturn = mDevice.executeShellCommand(cmd).trim();
+        parseCommandReturn();
+        return this;
+    }
+
+    public boolean returnStartsWith(String str) throws Exception {
+        if (mCommandReturn == null) {
+            throw new Exception("command return is null. not executed?");
+        }
+        return mCommandReturn.startsWith(str);
+    }
+
+    protected abstract void parseCommandReturn() throws Exception;
+}
diff --git a/hostsidetests/car_builtin/src/android/car/cts/builtin/LockPatternHelperHostTest.java b/hostsidetests/car_builtin/src/android/car/cts/builtin/LockPatternHelperHostTest.java
new file mode 100644
index 0000000..8ec7c70
--- /dev/null
+++ b/hostsidetests/car_builtin/src/android/car/cts/builtin/LockPatternHelperHostTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.cts.builtin.widget.CheckLockIsSecureCommand;
+
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(DeviceJUnit4ClassRunner.class)
+public final class LockPatternHelperHostTest extends CarBuiltinApiHostCtsBase {
+
+    @Test
+    public void testIsSecureApi() throws Exception {
+        // setup
+        CheckLockIsSecureCommand checkLockCmd = new CheckLockIsSecureCommand(getDevice());
+        String userId = String.valueOf(getDevice().getCurrentUser());
+
+        // execution and assertion
+        checkLockCmd.executeWith(userId);
+        // as the current user does not have any credentials, expect to be false
+        assertThat(checkLockCmd.isSecure()).isFalse();
+    }
+}
diff --git a/hostsidetests/car_builtin/src/android/car/cts/builtin/PackageManagerHelperHostTest.java b/hostsidetests/car_builtin/src/android/car/cts/builtin/PackageManagerHelperHostTest.java
new file mode 100644
index 0000000..7e160412
--- /dev/null
+++ b/hostsidetests/car_builtin/src/android/car/cts/builtin/PackageManagerHelperHostTest.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.cts.builtin.pm.ComponentEnabledStateCommand;
+
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(DeviceJUnit4ClassRunner.class)
+public final class PackageManagerHelperHostTest extends CarBuiltinApiHostCtsBase {
+
+    private static final String PACKAGE_MANAGER_HELPER_APP_PACKAGE_NAME =
+            "android.car.cts.builtin.apps.pm";
+
+    // The car shell command "cmd car_service control-component-enabled-state" triggered by
+    // ComponentEnabledStateCommand invokes
+    //   1. PackageManagerHelper.setApplicationEnabledSettingForUser
+    //   2. PackageManagerHelper.getApplicationEnabledSettingForUser
+    // builtin APIs.
+    @Test
+    public void testApplicationEnabledSetting() throws Exception {
+        // setup
+        ComponentEnabledStateCommand shellCmd = new ComponentEnabledStateCommand(getDevice());
+
+        shellCmd.executeWith(ComponentEnabledStateCommand.COMMAND_ACTION_GET,
+                PACKAGE_MANAGER_HELPER_APP_PACKAGE_NAME);
+        assertThat(shellCmd.getCurrentState())
+                .isEqualTo(ComponentEnabledStateCommand.COMPONENT_ENABLED_STATE_DEFAULT);
+
+        shellCmd.executeWith(ComponentEnabledStateCommand.COMMAND_ACTION_ENABLE,
+                PACKAGE_MANAGER_HELPER_APP_PACKAGE_NAME);
+        assertThat(shellCmd.getNewState())
+                .isEqualTo(ComponentEnabledStateCommand.COMPONENT_ENABLED_STATE_ENABLED);
+
+        shellCmd.executeWith(ComponentEnabledStateCommand.COMMAND_ACTION_DISABLE_UNTIL_USED,
+                PACKAGE_MANAGER_HELPER_APP_PACKAGE_NAME);
+        assertThat(shellCmd.getNewState()).isEqualTo(ComponentEnabledStateCommand
+                .COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED);
+
+        shellCmd.executeWith(ComponentEnabledStateCommand.COMMAND_ACTION_DEFAULT,
+                PACKAGE_MANAGER_HELPER_APP_PACKAGE_NAME);
+        assertThat(shellCmd.getNewState())
+                .isEqualTo(ComponentEnabledStateCommand.COMPONENT_ENABLED_STATE_DEFAULT);
+
+        shellCmd.executeWith(ComponentEnabledStateCommand.COMMAND_ACTION_GET,
+                PACKAGE_MANAGER_HELPER_APP_PACKAGE_NAME);
+        assertThat(shellCmd.getCurrentState())
+                .isEqualTo(ComponentEnabledStateCommand.COMPONENT_ENABLED_STATE_DEFAULT);
+    }
+}
diff --git a/hostsidetests/car_builtin/src/android/car/cts/builtin/os/DumpDrivingStateServiceCommand.java b/hostsidetests/car_builtin/src/android/car/cts/builtin/os/DumpDrivingStateServiceCommand.java
new file mode 100644
index 0000000..7aa9c9a
--- /dev/null
+++ b/hostsidetests/car_builtin/src/android/car/cts/builtin/os/DumpDrivingStateServiceCommand.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.os;
+
+import android.car.cts.builtin.CtsCarShellCommand;
+
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+
+public final class DumpDrivingStateServiceCommand extends CtsCarShellCommand {
+    private static final String COMMAND_NAME =
+            "dumpsys car_service --services CarDrivingStateService";
+
+    public static final String[] REMOTE_CALLBACK_LIST_DUMP_HEADERS = {
+        "callbacks: ",
+        "killed: ",
+        "broadcasts count: "
+    };
+
+    private boolean mHasRemoteCallbackListDump;
+
+    public DumpDrivingStateServiceCommand(ITestDevice device) {
+        super(COMMAND_NAME, device);
+    }
+
+    public boolean hasRemoteCallbackListDump() {
+        return mHasRemoteCallbackListDump;
+    }
+
+    @Override
+    protected void parseCommandReturn() throws Exception {
+        if (mCommandArgs.length != 0) {
+            throw new IllegalArgumentException("No argument is expected");
+        }
+
+        CLog.d(mCommand + " command returns: " + mCommandReturn);
+
+        for (String header : REMOTE_CALLBACK_LIST_DUMP_HEADERS) {
+            if (!mCommandReturn.contains(header)) {
+                mHasRemoteCallbackListDump = false;
+                return;
+            }
+        }
+        mHasRemoteCallbackListDump = true;
+    }
+}
diff --git a/hostsidetests/car_builtin/src/android/car/cts/builtin/os/GetInitialUserInfoCommand.java b/hostsidetests/car_builtin/src/android/car/cts/builtin/os/GetInitialUserInfoCommand.java
new file mode 100644
index 0000000..f26d59b
--- /dev/null
+++ b/hostsidetests/car_builtin/src/android/car/cts/builtin/os/GetInitialUserInfoCommand.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.os;
+
+import android.car.cts.builtin.CtsCarShellCommand;
+
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+
+public final class GetInitialUserInfoCommand extends CtsCarShellCommand {
+
+    public static final String OK_STATUS_RETURN_HEADER = "Call status: OK";
+    private static final String COMMAND_NAME = "cmd car_service get-initial-user-info FIRST_BOOT";
+
+    public GetInitialUserInfoCommand(ITestDevice device) {
+        super(COMMAND_NAME, device);
+    }
+
+    @Override
+    protected void parseCommandReturn() throws Exception {
+        if (mCommandArgs.length != 0) {
+            throw new IllegalArgumentException("No argument is expected");
+        }
+        CLog.d(mCommand + " command returns: " + mCommandReturn);
+    }
+}
diff --git a/hostsidetests/car_builtin/src/android/car/cts/builtin/pm/ComponentEnabledStateCommand.java b/hostsidetests/car_builtin/src/android/car/cts/builtin/pm/ComponentEnabledStateCommand.java
new file mode 100644
index 0000000..b873da4
--- /dev/null
+++ b/hostsidetests/car_builtin/src/android/car/cts/builtin/pm/ComponentEnabledStateCommand.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.pm;
+
+import android.car.cts.builtin.CtsCarShellCommand;
+
+import com.android.tradefed.device.ITestDevice;
+
+public final class ComponentEnabledStateCommand extends CtsCarShellCommand {
+    public static final String COMPONENT_ENABLED_STATE_DEFAULT = "COMPONENT_ENABLED_STATE_DEFAULT";
+    public static final String COMPONENT_ENABLED_STATE_ENABLED = "COMPONENT_ENABLED_STATE_ENABLED";
+    public static final String COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED =
+            "COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED";
+    public static final String COMPONENT_ENABLED_STATE_UNSUPPORTED =
+            "COMPONENT_ENABLED_STATE_UNSUPPORTED";
+
+    public static final String COMMAND_ACTION_GET = "get";
+    public static final String COMMAND_ACTION_ENABLE = "enable";
+    public static final String COMMAND_ACTION_DISABLE_UNTIL_USED = "disable_until_used";
+    public static final String COMMAND_ACTION_DEFAULT = "default";
+
+    private static final String COMMAND_NAME = "cmd car_service control-component-enabled-state";
+    private static final String NEW_STATE_RETURN_HEADER = "New State: ";
+    private static final String GET_STATE_RETURN_HEADER = "Current State: ";
+
+    private String mNewState;
+    private String mCurrentState;
+
+    public ComponentEnabledStateCommand(ITestDevice device) {
+        super(COMMAND_NAME, device);
+    }
+
+    public String getNewState() {
+        return mNewState;
+    }
+
+    public String getCurrentState() {
+        return mCurrentState;
+    }
+
+    protected void parseCommandReturn() throws Exception {
+        if (mCommandArgs.length != 2) {
+            throw new IllegalArgumentException("Expected two arguments: action and pkg name");
+        }
+
+        switch (mCommandArgs[0]) {
+            case COMMAND_ACTION_GET:
+                if (!mCommandReturn.startsWith(GET_STATE_RETURN_HEADER)) {
+                    throw new Exception("get enabled state error: " + mCommandReturn);
+                }
+                mCurrentState = mCommandReturn.substring(GET_STATE_RETURN_HEADER.length()).trim();
+                break;
+            case COMMAND_ACTION_ENABLE:
+            case COMMAND_ACTION_DEFAULT:
+            case COMMAND_ACTION_DISABLE_UNTIL_USED:
+                if (!mCommandReturn.startsWith(NEW_STATE_RETURN_HEADER)) {
+                    throw new Exception("change enabled state error: " + mCommandReturn);
+                }
+                mNewState = mCommandReturn.substring(NEW_STATE_RETURN_HEADER.length()).trim();
+                break;
+            default:
+                throw new IllegalArgumentException("Unsupported action");
+        }
+    }
+}
diff --git a/hostsidetests/car_builtin/src/android/car/cts/builtin/user/CarInitialUserCommand.java b/hostsidetests/car_builtin/src/android/car/cts/builtin/user/CarInitialUserCommand.java
new file mode 100644
index 0000000..f96f04e
--- /dev/null
+++ b/hostsidetests/car_builtin/src/android/car/cts/builtin/user/CarInitialUserCommand.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.user;
+
+import android.car.cts.builtin.CtsCarShellCommand;
+
+import com.android.tradefed.device.ITestDevice;
+
+public final class CarInitialUserCommand extends CtsCarShellCommand {
+
+    private static final String COMMAND_NAME = "cmd car_service get-initial-user";
+
+    // the value from UserHandler.USER_NULL
+    private static final int INVALID_USER_ID = -10_000;
+
+    private int mCarInitialUser = INVALID_USER_ID;
+
+    public CarInitialUserCommand(ITestDevice device) {
+        super(COMMAND_NAME, device);
+    }
+
+    public int getCarInitialUser() {
+        return mCarInitialUser;
+    }
+
+    @Override
+    protected void parseCommandReturn() throws Exception {
+        mCarInitialUser = Integer.parseInt(mCommandReturn.trim());
+    }
+}
diff --git a/hostsidetests/car_builtin/src/android/car/cts/builtin/user/InitializedUsersCommand.java b/hostsidetests/car_builtin/src/android/car/cts/builtin/user/InitializedUsersCommand.java
new file mode 100644
index 0000000..bb79b35
--- /dev/null
+++ b/hostsidetests/car_builtin/src/android/car/cts/builtin/user/InitializedUsersCommand.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.user;
+
+import static org.junit.Assert.fail;
+
+import android.car.cts.builtin.CtsCarShellCommand;
+
+import com.android.tradefed.device.ITestDevice;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public final class InitializedUsersCommand extends CtsCarShellCommand {
+
+    private static final String COMMAND_NAME = "cmd user list -v ";
+    private static final int  USER_INFO_MIN_STRING_LENGTH = 20;
+
+    private static final Pattern USER_PATTERN =
+            Pattern.compile(".*id=(\\d+).*type=([^\\s]+).*");
+    private static final int USER_PATTERN_GROUP_ID = 1;
+    private static final int USER_PATTERN_GROUP_TYPE = 2;
+
+    private List<Integer> mInitializedUsers;
+    private boolean mHasHeadlessUser;
+
+    public InitializedUsersCommand(ITestDevice device) {
+        super(COMMAND_NAME, device);
+    }
+
+    public List<Integer> getInitializedUsers() {
+        return mInitializedUsers;
+    }
+
+    public boolean hasHeadlessUser() {
+        return mHasHeadlessUser;
+    }
+
+    @Override
+    protected void parseCommandReturn() throws Exception {
+        mInitializedUsers = new ArrayList<Integer>();
+        mHasHeadlessUser = false;
+        String[] userInfoList = mCommandReturn.split("\n");
+        for (int i = 0; i < userInfoList.length; i++) {
+            if (userInfoList[i].length() > USER_INFO_MIN_STRING_LENGTH) {
+                if (userInfoList[i].contains("INITIALIZED")) {
+                    Matcher matcher = USER_PATTERN.matcher(userInfoList[i]);
+                    if (!matcher.find()) {
+                        fail("parseCommandReturn: no match was found in: " + userInfoList[i]);
+                    }
+                    int userId = Integer.parseInt(matcher.group(USER_PATTERN_GROUP_ID));
+                    mInitializedUsers.add(userId);
+                    String type = matcher.group(USER_PATTERN_GROUP_TYPE);
+                    if (!mHasHeadlessUser && type.contains("system.HEADLESS")) {
+                        mHasHeadlessUser = true;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/hostsidetests/car_builtin/src/android/car/cts/builtin/widget/CheckLockIsSecureCommand.java b/hostsidetests/car_builtin/src/android/car/cts/builtin/widget/CheckLockIsSecureCommand.java
new file mode 100644
index 0000000..722acff
--- /dev/null
+++ b/hostsidetests/car_builtin/src/android/car/cts/builtin/widget/CheckLockIsSecureCommand.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.widget;
+
+import android.car.cts.builtin.CtsCarShellCommand;
+
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+
+public final class CheckLockIsSecureCommand extends CtsCarShellCommand {
+    public static final String COMMAND_NAME = "cmd car_service check-lock-is-secure";
+
+    private boolean mIsSecure = false;
+
+    public CheckLockIsSecureCommand(ITestDevice device) {
+        super(COMMAND_NAME, device);
+    }
+
+    public boolean isSecure() {
+        return mIsSecure;
+    }
+
+    @Override
+    protected void parseCommandReturn() throws Exception {
+        if (mCommandArgs.length != 1) {
+            throw new IllegalArgumentException("user id is expected");
+        }
+
+        mIsSecure = Boolean.parseBoolean(mCommandReturn.trim());
+
+        CLog.d(mCommand + " command returns: " + mCommandReturn);
+        CLog.d("CheckLockIsSecureCommand.mIsSecure: " + mIsSecure);
+    }
+}
diff --git a/hostsidetests/compilation/Android.bp b/hostsidetests/compilation/Android.bp
index 6f4441f..659c20b 100644
--- a/hostsidetests/compilation/Android.bp
+++ b/hostsidetests/compilation/Android.bp
@@ -20,7 +20,11 @@
     name: "CtsCompilationTestCases",
     srcs: ["src/**/*.java"],
     java_resource_dirs: ["assets/"],
-    java_resources: [":CtsCompilationApp"],
+    java_resources: [
+        ":AppUsedByOtherApp",
+        ":AppUsingOtherApp",
+        ":CtsCompilationApp",
+    ],
     // tag this module as a cts test artifact
     test_suites: [
         "cts",
@@ -31,5 +35,6 @@
         "tradefed",
         "compatibility-host-util",
         "guava",
+        "truth-prebuilt",
     ],
 }
diff --git a/hostsidetests/compilation/AndroidTest.xml b/hostsidetests/compilation/AndroidTest.xml
index da1e27d..76f23e5 100644
--- a/hostsidetests/compilation/AndroidTest.xml
+++ b/hostsidetests/compilation/AndroidTest.xml
@@ -22,6 +22,6 @@
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsCompilationTestCases.jar" />
-        <option name="runtime-hint" value="9m45s" />
+        <option name="runtime-hint" value="14m" />
     </test>
 </configuration>
diff --git a/hostsidetests/compilation/app_used_by_other_app/Android.bp b/hostsidetests/compilation/app_used_by_other_app/Android.bp
new file mode 100644
index 0000000..19a22b0
--- /dev/null
+++ b/hostsidetests/compilation/app_used_by_other_app/Android.bp
@@ -0,0 +1,29 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "AppUsedByOtherApp",
+    defaults: ["cts_support_defaults"],
+    srcs: ["src/**/*.java"],
+    sdk_version: "31",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
diff --git a/hostsidetests/compilation/app_used_by_other_app/AndroidManifest.xml b/hostsidetests/compilation/app_used_by_other_app/AndroidManifest.xml
new file mode 100755
index 0000000..2a2be77
--- /dev/null
+++ b/hostsidetests/compilation/app_used_by_other_app/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2022 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.compilation.cts.appusedbyotherapp">
+    <uses-sdk android:minSdkVersion="23"/>
+    <application>
+        <activity android:name=".MyActivity"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/hostsidetests/compilation/app_used_by_other_app/src/android/compilation/cts/appusedbyotherapp/MyActivity.java b/hostsidetests/compilation/app_used_by_other_app/src/android/compilation/cts/appusedbyotherapp/MyActivity.java
new file mode 100644
index 0000000..4eed2a0
--- /dev/null
+++ b/hostsidetests/compilation/app_used_by_other_app/src/android/compilation/cts/appusedbyotherapp/MyActivity.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2022 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 android.compilation.cts.appusedbyotherapp;
+
+import android.app.Activity;
+import android.util.Log;
+
+/**
+ * A simple activity which is used by another app.
+ */
+public class MyActivity extends Activity {
+    private static final String TAG = "AppUsedByOtherApp";
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        method1();
+    }
+
+    private void method1() {
+        Log.i(TAG, "method1");
+    }
+
+    private void method2() {
+        Log.i(TAG, "method2");
+    }
+
+    /**
+     * A method to be used by another app.
+     */
+    public static String publicMethod() {
+        return "foo";
+    }
+}
diff --git a/hostsidetests/compilation/app_using_other_app/Android.bp b/hostsidetests/compilation/app_using_other_app/Android.bp
new file mode 100644
index 0000000..9d26465
--- /dev/null
+++ b/hostsidetests/compilation/app_using_other_app/Android.bp
@@ -0,0 +1,38 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "AppUsingOtherApp",
+    defaults: ["cts_support_defaults"],
+    srcs: ["src/**/*.java"],
+    sdk_version: "31",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    static_libs: [
+        "androidx.test.ext.junit",
+        "androidx.test.ext.truth",
+        "androidx.test.rules",
+        "ctstestrunner-axt",
+    ],
+    libs: [
+        "android.test.base",
+    ],
+}
diff --git a/hostsidetests/compilation/app_using_other_app/AndroidManifest.xml b/hostsidetests/compilation/app_using_other_app/AndroidManifest.xml
new file mode 100755
index 0000000..b582828
--- /dev/null
+++ b/hostsidetests/compilation/app_using_other_app/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2022 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.compilation.cts.appusingotherapp">
+    <uses-sdk android:minSdkVersion="23"/>
+    <queries>
+        <package android:name="android.compilation.cts.appusedbyotherapp" />
+    </queries>
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="android.compilation.cts.appusingotherapp"
+                     android:label="An instrumentation test that uses another app">
+        <meta-data android:name="listener"
+                   android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+</manifest>
diff --git a/hostsidetests/compilation/app_using_other_app/src/android/compilation/cts/appusingotherapp/UsingOtherAppTest.java b/hostsidetests/compilation/app_using_other_app/src/android/compilation/cts/appusingotherapp/UsingOtherAppTest.java
new file mode 100644
index 0000000..6b06a67
--- /dev/null
+++ b/hostsidetests/compilation/app_using_other_app/src/android/compilation/cts/appusingotherapp/UsingOtherAppTest.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2022 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 android.compilation.cts.appusingotherapp;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import dalvik.system.PathClassLoader;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.lang.reflect.Method;
+
+/**
+ * An instrumentation test that uses another app.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class UsingOtherAppTest {
+    private static final String TAG = "UsingOtherAppTest";
+
+    @Test
+    public void useOtherApp() throws Exception {
+        Context context = ApplicationProvider.getApplicationContext();
+        String apkFile = context
+                .getPackageManager()
+                .getApplicationInfo("android.compilation.cts.appusedbyotherapp", 0 /* flags */)
+                .sourceDir;
+        PathClassLoader classLoader =
+                new PathClassLoader(apkFile, this.getClass().getClassLoader());
+        Class<?> c = Class.forName(
+                "android.compilation.cts.appusedbyotherapp.MyActivity",
+                true /* initialize */,
+                classLoader);
+        Method m = c.getMethod("publicMethod");
+        String ret = (String) m.invoke(null /* obj */);
+        assertThat(ret).isEqualTo("foo");
+    }
+}
diff --git a/hostsidetests/compilation/assets/README.txt b/hostsidetests/compilation/assets/README.txt
index 0ce8006..628df82 100644
--- a/hostsidetests/compilation/assets/README.txt
+++ b/hostsidetests/compilation/assets/README.txt
@@ -1,11 +1,15 @@
-This APK and profile file are generated from CompilationTargetActivity.java and must be
-updated if that file changes:
+primary.prof.txt is generated from CtsCompilationApp and must be updated if
+CompilationTargetActivity.java changes:
 
-$ (croot ; make CtsCompilationApp)
-$ cp ${ANDROID_BUILD_TOP}/out/target/product/${TARGET_PRODUCT}/data/app/CtsCompilationApp/CtsCompilationApp.apk .
-$ adb install CtsCompilationApp.apk
+$ m CtsCompilationApp
+$ adb install $ANDROID_PRODUCT_OUT/data/app/CtsCompilationApp/CtsCompilationApp.apk
 
-  # Now run the app manually for a couple of minutes, look for the profile:
+# Now run the app manually for a couple of minutes, look for the profile:
 $ adb shell ls -l /data/misc/profiles/cur/0/android.compilation.cts/primary.prof
-  # once the profile appears and is nonempty, grab it:
+# Once the profile appears and is nonempty, grab it:
 $ adb pull /data/misc/profiles/cur/0/android.compilation.cts/primary.prof ./
+
+
+app_used_by_other_app_1.prof.txt and app_used_by_other_app_2.prof.txt are
+manually constructed for AppUsedByOtherApp. The latter one should be a superset
+of the former one.
diff --git a/hostsidetests/compilation/assets/app_used_by_other_app_1.prof.txt b/hostsidetests/compilation/assets/app_used_by_other_app_1.prof.txt
new file mode 100644
index 0000000..12e319b
--- /dev/null
+++ b/hostsidetests/compilation/assets/app_used_by_other_app_1.prof.txt
@@ -0,0 +1,2 @@
+Landroid/compilation/cts/appusedbyotherapp/MyActivity;
+HSPLandroid/compilation/cts/appusedbyotherapp/MyActivity;->method2()V
diff --git a/hostsidetests/compilation/assets/app_used_by_other_app_2.prof.txt b/hostsidetests/compilation/assets/app_used_by_other_app_2.prof.txt
new file mode 100644
index 0000000..c5cf7f7
--- /dev/null
+++ b/hostsidetests/compilation/assets/app_used_by_other_app_2.prof.txt
@@ -0,0 +1,3 @@
+Landroid/compilation/cts/appusedbyotherapp/MyActivity;
+HSPLandroid/compilation/cts/appusedbyotherapp/MyActivity;->method1()V
+HSPLandroid/compilation/cts/appusedbyotherapp/MyActivity;->method2()V
diff --git a/hostsidetests/compilation/src/android/compilation/cts/AdbRootDependentCompilationTest.java b/hostsidetests/compilation/src/android/compilation/cts/AdbRootDependentCompilationTest.java
index ef99ca52..1bb14bd 100644
--- a/hostsidetests/compilation/src/android/compilation/cts/AdbRootDependentCompilationTest.java
+++ b/hostsidetests/compilation/src/android/compilation/cts/AdbRootDependentCompilationTest.java
@@ -16,28 +16,49 @@
 
 package android.compilation.cts;
 
-import com.google.common.io.ByteStreams;
-import com.google.common.io.Files;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
-import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.device.NativeDevice;
+import com.android.tradefed.device.TestDeviceState;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+import com.android.tradefed.testtype.junit4.DeviceTestRunOptions;
+import com.android.tradefed.util.CommandResult;
 import com.android.tradefed.util.FileUtil;
 
+import com.google.common.io.ByteStreams;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.EnumSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 /**
  * Various integration tests for dex to oat compilation, with or without profiles.
@@ -49,12 +70,21 @@
  *     <li>On a 'userdebug' build with system property 'dalvik.vm.usejitprofiles' set to true</li>
  * </ul>
  */
-public class AdbRootDependentCompilationTest extends DeviceTestCase {
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class AdbRootDependentCompilationTest extends BaseHostJUnit4Test {
+    private static final int ADB_ROOT_RETRY_ATTEMPTS = 3;
+    private static final String TEMP_DIR = "/data/local/tmp/AdbRootDependentCompilationTest";
     private static final String APPLICATION_PACKAGE = "android.compilation.cts";
+    private static final String APP_USED_BY_OTHER_APP_PACKAGE =
+            "android.compilation.cts.appusedbyotherapp";
+    private static final String APP_USING_OTHER_APP_PACKAGE =
+            "android.compilation.cts.appusingotherapp";
+    private static final int PERMISSIONS_LENGTH = 10;
+    private static final int READ_OTHER = 7;
 
     enum ProfileLocation {
-        CUR("/data/misc/profiles/cur/0/" + APPLICATION_PACKAGE),
-        REF("/data/misc/profiles/ref/" + APPLICATION_PACKAGE);
+        CUR("/data/misc/profiles/cur/0/"),
+        REF("/data/misc/profiles/ref/");
 
         private String directory;
 
@@ -62,97 +92,91 @@
             this.directory = directory;
         }
 
-        public String getDirectory() {
-            return directory;
+        public String getDirectory(String packageName) {
+            return directory + packageName;
         }
 
-        public String getPath() {
-            return directory + "/primary.prof";
+        public String getPath(String packageName) {
+            return directory + packageName + "/primary.prof";
         }
     }
 
     private ITestDevice mDevice;
-    private File textProfileFile;
-    private byte[] initialOdexFileContents;
-    private File apkFile;
-    private boolean mCanEnableDeviceRootAccess;
+    private File mCtsCompilationAppApkFile;
+    private File mAppUsedByOtherAppApkFile;
+    private File mAppUsedByOtherAppDmFile;
+    private File mAppUsingOtherAppApkFile;
+    private boolean mWasAdbRoot = false;
+    private boolean mAdbRootEnabled = false;
 
-    private Matcher mAdbLineFilter;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         mDevice = getDevice();
 
-        String buildType = mDevice.getProperty("ro.build.type");
-        assertTrue("Unknown build type: " + buildType,
-                Arrays.asList("user", "userdebug", "eng").contains(buildType));
-        boolean wasRoot = mDevice.isAdbRoot();
-        // We can only enable root access on userdebug and eng builds.
-        mCanEnableDeviceRootAccess = buildType.equals("userdebug") || buildType.equals("eng");
+        mWasAdbRoot = mDevice.isAdbRoot();
+        mAdbRootEnabled = mWasAdbRoot || enableAdbRoot();
 
-        apkFile = File.createTempFile("CtsCompilationApp", ".apk");
-        try (OutputStream outputStream = new FileOutputStream(apkFile)) {
-            InputStream inputStream = getClass().getResourceAsStream("/CtsCompilationApp.apk");
-            ByteStreams.copy(inputStream, outputStream);
-        }
+        assumeTrue("The device does not allow root access", mAdbRootEnabled);
+
+        mCtsCompilationAppApkFile = copyResourceToFile(
+                "/CtsCompilationApp.apk", File.createTempFile("CtsCompilationApp", ".apk"));
         mDevice.uninstallPackage(APPLICATION_PACKAGE); // in case it's still installed
-        String error = mDevice.installPackage(apkFile, false);
+        String error = mDevice.installPackage(mCtsCompilationAppApkFile, false);
         assertNull("Got install error: " + error, error);
 
-        // Write the text profile to a temporary file so that we can run profman on it to create a
-        // real profile.
-        byte[] profileBytes = ByteStreams.toByteArray(
-                getClass().getResourceAsStream("/primary.prof.txt"));
-        assertTrue("empty profile", profileBytes.length > 0); // validity check
-        textProfileFile = File.createTempFile("compilationtest", "prof.txt");
-        Files.write(profileBytes, textProfileFile);
-
-        // Ignore issues in cmd.
-        mAdbLineFilter = Pattern.compile("FORTIFY: pthread_mutex_lock.*").matcher("");
+        mDevice.executeShellV2Command("rm -rf " + TEMP_DIR);  // Make sure we have a clean state.
+        assertCommandSucceeds("mkdir", "-p", TEMP_DIR);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        FileUtil.deleteFile(apkFile);
-        FileUtil.deleteFile(textProfileFile);
+    @After
+    public void tearDown() throws Exception {
+        mDevice.executeShellV2Command("rm -rf " + TEMP_DIR);
+
+        FileUtil.deleteFile(mCtsCompilationAppApkFile);
+        FileUtil.deleteFile(mAppUsedByOtherAppApkFile);
+        FileUtil.deleteFile(mAppUsedByOtherAppDmFile);
+        FileUtil.deleteFile(mAppUsingOtherAppApkFile);
         mDevice.uninstallPackage(APPLICATION_PACKAGE);
-        super.tearDown();
+        mDevice.uninstallPackage(APP_USED_BY_OTHER_APP_PACKAGE);
+        mDevice.uninstallPackage(APP_USING_OTHER_APP_PACKAGE);
+
+        if (!mWasAdbRoot && mAdbRootEnabled) {
+            mDevice.disableAdbRoot();
+        }
     }
 
     /**
      * Tests compilation using {@code -r bg-dexopt -f}.
      */
+    @Test
     public void testCompile_bgDexopt() throws Exception {
-        if (!canRunTest(EnumSet.noneOf(ProfileLocation.class))) {
-            return;
-        }
-
-        resetProfileState();
+        resetProfileState(APPLICATION_PACKAGE);
 
         // Copy the profile to the reference location so that the bg-dexopt
         // can actually do work if it's configured to speed-profile.
         for (ProfileLocation profileLocation : EnumSet.of(ProfileLocation.REF)) {
-            writeProfile(profileLocation);
+            writeSystemManagedProfile("/primary.prof.txt", profileLocation, APPLICATION_PACKAGE);
         }
 
-        // Usually "interpret-only"
-        String expectedInstallFilter = Objects.requireNonNull(mDevice.getProperty("pm.dexopt.install"));
+        // Usually "speed-profile"
+        String expectedInstallFilter =
+                Objects.requireNonNull(mDevice.getProperty("pm.dexopt.install"));
         if (expectedInstallFilter.equals("speed-profile")) {
             // If the filter is speed-profile but no profile is present, the compiler
             // will change it to verify.
             expectedInstallFilter = "verify";
         }
         // Usually "speed-profile"
-        String expectedBgDexoptFilter = Objects.requireNonNull(mDevice.getProperty("pm.dexopt.bg-dexopt"));
+        String expectedBgDexoptFilter =
+                Objects.requireNonNull(mDevice.getProperty("pm.dexopt.bg-dexopt"));
 
-        String odexPath = getOdexFilePath();
+        String odexPath = getOdexFilePath(APPLICATION_PACKAGE);
         assertEquals(expectedInstallFilter, getCompilerFilter(odexPath));
 
         // Without -f, the compiler would only run if it judged the bg-dexopt filter to
         // be "better" than the install filter. However manufacturers can change those
         // values so we don't want to depend here on the resulting filter being better.
-        executeCompile("-r", "bg-dexopt", "-f");
+        executeCompile(APPLICATION_PACKAGE, "-r", "bg-dexopt", "-f");
 
         assertEquals(expectedBgDexoptFilter, getCompilerFilter(odexPath));
     }
@@ -169,20 +193,21 @@
      profile_assistant, it may only be available in "ref".
      */
 
+    @Test
     public void testCompile_noProfile() throws Exception {
         compileWithProfilesAndCheckFilter(false /* expectOdexChange */,
                 EnumSet.noneOf(ProfileLocation.class));
     }
 
+    @Test
     public void testCompile_curProfile() throws Exception {
-        boolean didRun = compileWithProfilesAndCheckFilter(true  /* expectOdexChange */,
-                 EnumSet.of(ProfileLocation.CUR));
-        if (didRun) {
-            assertTrue("ref profile should have been created by the compiler",
-                    doesFileExist(ProfileLocation.REF.getPath()));
-        }
+        compileWithProfilesAndCheckFilter(true  /* expectOdexChange */,
+                EnumSet.of(ProfileLocation.CUR));
+        assertTrue("ref profile should have been created by the compiler",
+                mDevice.doesFileExist(ProfileLocation.REF.getPath(APPLICATION_PACKAGE)));
     }
 
+    @Test
     public void testCompile_refProfile() throws Exception {
         compileWithProfilesAndCheckFilter(true /* expectOdexChange */,
                  EnumSet.of(ProfileLocation.REF));
@@ -190,6 +215,7 @@
         // verify -> speed-profile
     }
 
+    @Test
     public void testCompile_curAndRefProfile() throws Exception {
         compileWithProfilesAndCheckFilter(true /* expectOdexChange */,
                 EnumSet.of(ProfileLocation.CUR, ProfileLocation.REF));
@@ -197,42 +223,86 @@
         // verify -> speed-profile
     }
 
-    private byte[] readFileOnClient(String clientPath) throws Exception {
-        assertTrue("File not found on client: " + clientPath,
-                doesFileExist(clientPath));
-        File copyOnHost = File.createTempFile("host", "copy");
-        try {
-            executePull(clientPath, copyOnHost.getPath());
-            return Files.toByteArray(copyOnHost);
-        } finally {
-            FileUtil.deleteFile(copyOnHost);
-        }
+    /**
+     * Tests how compilation of an app used by other apps is handled.
+     */
+    @Test
+    public void testCompile_usedByOtherApps() throws Exception {
+        mAppUsedByOtherAppApkFile = copyResourceToFile(
+                "/AppUsedByOtherApp.apk", File.createTempFile("AppUsedByOtherApp", ".apk"));
+        mAppUsedByOtherAppDmFile = constructDmFile(
+                "/app_used_by_other_app_1.prof.txt", mAppUsedByOtherAppApkFile);
+        // We cannot use `mDevice.installPackage` here because it doesn't support DM file.
+        String result = mDevice.executeAdbCommand(
+                "install-multiple",
+                mAppUsedByOtherAppApkFile.getAbsolutePath(),
+                mAppUsedByOtherAppDmFile.getAbsolutePath());
+        assertWithMessage("Failed to install AppUsedByOtherApp").that(result).isNotNull();
+
+        mAppUsingOtherAppApkFile = copyResourceToFile(
+                "/AppUsingOtherApp.apk", File.createTempFile("AppUsingOtherApp", ".apk"));
+        result = mDevice.installPackage(mAppUsingOtherAppApkFile, false /* reinstall */);
+        assertWithMessage(result).that(result).isNull();
+
+        String odexFilePath = getOdexFilePath(APP_USED_BY_OTHER_APP_PACKAGE);
+        // Initially, the app should be compiled with the cloud profile, and the odex file should be
+        // public.
+        assertThat(getCompilerFilter(odexFilePath)).isEqualTo("speed-profile");
+        assertFileIsPublic(odexFilePath);
+        assertThat(getCompiledMethods(odexFilePath))
+                .containsExactly("android.compilation.cts.appusedbyotherapp.MyActivity.method2()");
+
+        // Simulate that the app profile has changed.
+        resetProfileState(APP_USED_BY_OTHER_APP_PACKAGE);
+        writeSystemManagedProfile("/app_used_by_other_app_2.prof.txt", ProfileLocation.REF,
+                APP_USED_BY_OTHER_APP_PACKAGE);
+
+        executeCompile(APP_USED_BY_OTHER_APP_PACKAGE, "-m", "speed-profile", "-f");
+        // Right now, the app hasn't been used by any other app yet. It should be compiled with the
+        // new profile, and the odex file should be private.
+        assertThat(getCompilerFilter(odexFilePath)).isEqualTo("speed-profile");
+        assertFileIsPrivate(odexFilePath);
+        assertThat(getCompiledMethods(odexFilePath)).containsExactly(
+                "android.compilation.cts.appusedbyotherapp.MyActivity.method1()",
+                "android.compilation.cts.appusedbyotherapp.MyActivity.method2()");
+
+        DeviceTestRunOptions options = new DeviceTestRunOptions(APP_USING_OTHER_APP_PACKAGE);
+        options.setTestClassName(APP_USING_OTHER_APP_PACKAGE + ".UsingOtherAppTest");
+        options.setTestMethodName("useOtherApp");
+        runDeviceTests(options);
+
+        executeCompile(APP_USED_BY_OTHER_APP_PACKAGE, "-m", "speed-profile");
+        // Now, the app has been used by any other app. It should be compiled with the cloud
+        // profile, and the odex file should be public.
+        assertThat(getCompilerFilter(odexFilePath)).isEqualTo("speed-profile");
+        assertFileIsPublic(odexFilePath);
+        assertThat(getCompiledMethods(odexFilePath))
+                .containsExactly("android.compilation.cts.appusedbyotherapp.MyActivity.method2()");
     }
 
     /**
      * Places the profile in the specified locations, recompiles (without -f)
      * and checks the compiler-filter in the odex file.
-     *
-     * @return whether the test ran (as opposed to early exit)
      */
-    private boolean compileWithProfilesAndCheckFilter(boolean expectOdexChange,
-            Set<ProfileLocation> profileLocations)
-            throws Exception {
-        if (!canRunTest(profileLocations)) {
-            return false;
+    private void compileWithProfilesAndCheckFilter(boolean expectOdexChange,
+            Set<ProfileLocation> profileLocations) throws Exception {
+        if (!profileLocations.isEmpty()) {
+            checkProfileSupport();
         }
 
-        resetProfileState();
+        resetProfileState(APPLICATION_PACKAGE);
 
-        executeCompile("-m", "speed-profile", "-f");
-        String odexFilePath = getOdexFilePath();
-        byte[] initialOdexFileContents = readFileOnClient(odexFilePath);
-        assertTrue("empty odex file", initialOdexFileContents.length > 0); // validity check
+        executeCompile(APPLICATION_PACKAGE, "-m", "speed-profile", "-f");
+        String odexFilePath = getOdexFilePath(APPLICATION_PACKAGE);
+        String initialOdexFileContents = mDevice.pullFileContents(odexFilePath);
+        // validity check
+        assertWithMessage("empty odex file").that(initialOdexFileContents.length())
+                .isGreaterThan(0);
 
         for (ProfileLocation profileLocation : profileLocations) {
-            writeProfile(profileLocation);
+            writeSystemManagedProfile("/primary.prof.txt", profileLocation, APPLICATION_PACKAGE);
         }
-        executeCompile("-m", "speed-profile");
+        executeCompile(APPLICATION_PACKAGE, "-m", "speed-profile");
 
         // Confirm the compiler-filter used in creating the odex file
         String compilerFilter = getCompilerFilter(odexFilePath);
@@ -241,22 +311,21 @@
         String expectedCompilerFilter = profileLocations.isEmpty() ? "verify" : "speed-profile";
         assertEquals("compiler-filter", expectedCompilerFilter, compilerFilter);
 
-        byte[] odexFileContents = readFileOnClient(odexFilePath);
-        boolean odexChanged = !(Arrays.equals(initialOdexFileContents, odexFileContents));
+        String odexFileContents = mDevice.pullFileContents(odexFilePath);
+        boolean odexChanged = !initialOdexFileContents.equals(odexFileContents);
         if (odexChanged && !expectOdexChange) {
             String msg = String.format(Locale.US, "Odex file without filters (%d bytes) "
                     + "unexpectedly different from odex file (%d bytes) compiled with filters: %s",
-                    initialOdexFileContents.length, odexFileContents.length, profileLocations);
+                    initialOdexFileContents.length(), odexFileContents.length(), profileLocations);
             fail(msg);
         } else if (!odexChanged && expectOdexChange) {
             fail("odex file should have changed when recompiling with " + profileLocations);
         }
-        return true;
     }
 
-    public void resetProfileState() throws Exception {
-        executeSuShellAdbCommand(0, "rm", "-f", ProfileLocation.REF.getPath());
-        executeSuShellAdbCommand(0, "truncate", "-s", "0", ProfileLocation.CUR.getPath());
+    private void resetProfileState(String packageName) throws Exception {
+        mDevice.executeShellV2Command("rm -f " + ProfileLocation.REF.getPath(packageName));
+        mDevice.executeShellV2Command("truncate -s 0 " + ProfileLocation.CUR.getPath(packageName));
     }
 
     /**
@@ -264,55 +333,95 @@
      *
      * @param compileOptions extra options to pass to the compiler on the command line
      */
-    private void executeCompile(String... compileOptions) throws Exception {
+    private void executeCompile(String packageName, String... compileOptions) throws Exception {
         List<String> command = new ArrayList<>(Arrays.asList("cmd", "package", "compile"));
         command.addAll(Arrays.asList(compileOptions));
-        command.add(APPLICATION_PACKAGE);
+        command.add(packageName);
         String[] commandArray = command.toArray(new String[0]);
-        assertEquals("Success", executeSuShellAdbCommand(1, commandArray)[0]);
+        assertCommandSucceeds(commandArray);
     }
 
     /**
-     * Copies {@link #textProfileFile} to the device and convert it to a binary profile on the
-     * client device.
+     * Writes the given profile in binary format in a system-managed directory on the device, and
+     * sets appropriate owner.
      */
-    private void writeProfile(ProfileLocation location) throws Exception {
-        String targetPath = location.getPath();
+    private void writeSystemManagedProfile(String profileResourceName, ProfileLocation location,
+            String packageName) throws Exception {
+        String targetPath = location.getPath(packageName);
         // Get the owner of the parent directory so we can set it on the file
-        String targetDir = location.getDirectory();
-        if (!doesFileExist(targetDir)) {
-            fail("Not found: " + targetPath);
-        }
-        // in format group:user so we can directly pass it to chown
-        String owner = executeSuShellAdbCommand(1, "stat", "-c", "%U:%g", targetDir)[0];
-        // for some reason, I've observed the output starting with a single space
-        while (owner.startsWith(" ")) {
-            owner = owner.substring(1);
-        }
+        String targetDir = location.getDirectory(packageName);
+        assertTrue("Directory " + targetDir + " not found", mDevice.doesFileExist(targetDir));
+        // In format group:user so we can directly pass it to chown.
+        String owner = assertCommandOutputsLines(1, "stat", "-c", "%U:%g", targetDir)[0];
 
-        String targetPathTemp = targetPath + ".tmp";
-        executePush(textProfileFile.getAbsolutePath(), targetPathTemp, targetDir);
-        assertTrue("Failed to push text profile", doesFileExist(targetPathTemp));
+        String dexLocation = assertCommandOutputsLines(1, "pm", "path", packageName)[0];
+        dexLocation = dexLocation.replace("package:", "");
+        assertTrue("Failed to find APK " + dexLocation, mDevice.doesFileExist(dexLocation));
 
-        String targetPathApk = targetPath + ".apk";
-        executePush(apkFile.getAbsolutePath(), targetPathApk, targetDir);
-        assertTrue("Failed to push APK from ", doesFileExist(targetPathApk));
-        // Run profman to create the real profile on device.
-        String pathSpec = executeSuShellAdbCommand(1, "pm", "path", APPLICATION_PACKAGE)[0];
-        pathSpec = pathSpec.replace("package:", "");
-        assertTrue("Failed find APK " + pathSpec, doesFileExist(pathSpec));
-        executeSuShellAdbCommand(
-                "profman",
-                "--create-profile-from=" + targetPathTemp,
-                "--apk=" + pathSpec,
-                "--dex-location=" + pathSpec,
-                "--reference-profile-file=" + targetPath);
-        executeSuShellAdbCommand(0, "chown", owner, targetPath);
-        // Verify that the file was written successfully
-        assertTrue("failed to create profile file", doesFileExist(targetPath));
-        String[] result = executeSuShellAdbCommand(1, "stat", "-c", "%s", targetPath);
-        assertTrue("profile " + targetPath + " is " + Integer.parseInt(result[0]) + " bytes",
-                   Integer.parseInt(result[0]) > 0);
+        writeProfile(profileResourceName, dexLocation, targetPath);
+
+        // Verify that the file was written successfully.
+        assertTrue("Failed to create profile file", mDevice.doesFileExist(targetPath));
+        String result = assertCommandOutputsLines(1, "stat", "-c", "%s", targetPath)[0];
+        assertWithMessage("profile " + targetPath + " is " + Integer.parseInt(result) + " bytes")
+                .that(Integer.parseInt(result)).isGreaterThan(0);
+
+        assertCommandSucceeds("chown", owner, targetPath);
+    }
+
+    private File constructDmFile(String profileResourceName, File apkFile) throws Exception {
+        File binaryProfileFile = File.createTempFile("primary", ".prof");
+        String binaryProfileFileOnDevice = TEMP_DIR + "/primary.prof";
+        // When constructing a DM file, we don't have the real dex location because the app is not
+        // yet installed. We can use an arbitrary location. This is okay because installd will
+        // rewrite the dex location in the profile when the app is being installed.
+        String dexLocation = TEMP_DIR + "/app.apk";
+
+        try {
+            assertTrue(mDevice.pushFile(apkFile, dexLocation));
+            writeProfile(profileResourceName, dexLocation, binaryProfileFileOnDevice);
+            assertTrue(mDevice.pullFile(binaryProfileFileOnDevice, binaryProfileFile));
+
+            // Construct the DM file from the binary profile file. The stem of the APK file and the
+            // DM file must match.
+            File dmFile = new File(apkFile.getAbsolutePath().replaceAll("\\.apk$", ".dm"));
+            try (ZipOutputStream outputStream =
+                            new ZipOutputStream(new FileOutputStream(dmFile));
+                    InputStream inputStream = new FileInputStream(binaryProfileFile)) {
+                outputStream.putNextEntry(new ZipEntry("primary.prof"));
+                ByteStreams.copy(inputStream, outputStream);
+                outputStream.closeEntry();
+            }
+            return dmFile;
+        } finally {
+            mDevice.executeShellV2Command("rm " + binaryProfileFileOnDevice);
+            mDevice.executeShellV2Command("rm " + dexLocation);
+            FileUtil.deleteFile(binaryProfileFile);
+        }
+    }
+
+    /**
+     * Writes the given profile in binary format on the device.
+     */
+    private void writeProfile(String profileResourceName, String dexLocation, String pathOnDevice)
+            throws Exception {
+        File textProfileFile = File.createTempFile("primary", ".prof.txt");
+        String textProfileFileOnDevice = TEMP_DIR + "/primary.prof.txt";
+
+        try {
+            copyResourceToFile(profileResourceName, textProfileFile);
+            assertTrue(mDevice.pushFile(textProfileFile, textProfileFileOnDevice));
+
+            assertCommandSucceeds(
+                    "profman",
+                    "--create-profile-from=" + textProfileFileOnDevice,
+                    "--apk=" + dexLocation,
+                    "--dex-location=" + dexLocation,
+                    "--reference-profile-file=" + pathOnDevice);
+        } finally {
+            mDevice.executeShellV2Command("rm " + textProfileFileOnDevice);
+            FileUtil.deleteFile(textProfileFile);
+        }
     }
 
     /**
@@ -320,8 +429,8 @@
      * {@code oatdump --header-only}.
      */
     private String getCompilerFilter(String odexFilePath) throws DeviceNotAvailableException {
-        String[] response = executeSuShellAdbCommand(
-                "oatdump", "--header-only", "--oat-file=" + odexFilePath);
+        String[] response = assertCommandSucceeds(
+                "oatdump", "--header-only", "--oat-file=" + odexFilePath).split("\n");
         String prefix = "compiler-filter =";
         for (String line : response) {
             line = line.trim();
@@ -334,66 +443,95 @@
     }
 
     /**
+     * Returns a list of methods that have native code in the odex file.
+     */
+    private List<String> getCompiledMethods(String odexFilePath)
+            throws DeviceNotAvailableException {
+        // Matches "    CODE: (code_offset=0x000010e0 size=198)...".
+        Pattern codePattern = Pattern.compile("^\\s*CODE:.*size=(\\d+)");
+
+        // Matches
+        // "  0: void android.compilation.cts.appusedbyotherapp.R.<init>() (dex_method_idx=7)".
+        Pattern methodPattern =
+                Pattern.compile("((?:\\w+\\.)+[<>\\w]+\\(.*?\\)).*dex_method_idx=\\d+");
+
+        String[] response = assertCommandSucceeds("oatdump", "--oat-file=" + odexFilePath)
+                .split("\n");
+        ArrayList<String> compiledMethods = new ArrayList<>();
+        String currentMethod = null;
+        int currentMethodIndent = -1;
+        for (int i = 0; i < response.length; i++) {
+            // While in a method block.
+            while (currentMethodIndent != -1 && i < response.length
+                    && getIndent(response[i]) > currentMethodIndent) {
+                Matcher matcher = codePattern.matcher(response[i]);
+                // The method has code whose size > 0.
+                if (matcher.find() && Long.parseLong(matcher.group(1)) > 0) {
+                    compiledMethods.add(currentMethod);
+                }
+                i++;
+            }
+
+            if (i >= response.length) {
+                break;
+            }
+
+            currentMethod = null;
+            currentMethodIndent = -1;
+
+            Matcher matcher = methodPattern.matcher(response[i]);
+            if (matcher.find()) {
+                currentMethod = matcher.group(1);
+                currentMethodIndent = getIndent(response[i]);
+            }
+        }
+        return compiledMethods;
+    }
+
+    /**
+     * Returns the number of leading spaces.
+     */
+    private int getIndent(String str) {
+        int indent = 0;
+        while (indent < str.length() && str.charAt(indent) == ' ') {
+            indent++;
+        }
+        return indent;
+    }
+
+    /**
      * Returns the path to the application's base.odex file that should have
      * been created by the compiler.
      */
-    private String getOdexFilePath() throws DeviceNotAvailableException {
+    private String getOdexFilePath(String packageName) throws DeviceNotAvailableException {
         // Something like "package:/data/app/android.compilation.cts-1/base.apk"
-        String pathSpec = executeSuShellAdbCommand(1, "pm", "path", APPLICATION_PACKAGE)[0];
+        String pathSpec = assertCommandOutputsLines(1, "pm", "path", packageName)[0];
         Matcher matcher = Pattern.compile("^package:(.+/)base\\.apk$").matcher(pathSpec);
         boolean found = matcher.find();
         assertTrue("Malformed spec: " + pathSpec, found);
         String apkDir = matcher.group(1);
         // E.g. /data/app/android.compilation.cts-1/oat/arm64/base.odex
-        String result = executeSuShellAdbCommand(1, "find", apkDir, "-name", "base.odex")[0];
-        assertTrue("odex file not found: " + result, doesFileExist(result));
+        String result = assertCommandOutputsLines(1, "find", apkDir, "-name", "base.odex")[0];
+        assertTrue("odex file not found: " + result, mDevice.doesFileExist(result));
         return result;
     }
 
     /**
-     * Returns whether a test that uses the given profileLocations can run
-     * in the current device configuration. This allows tests to exit early.
-     *
-     * <p>Ideally we'd like tests to be marked as skipped/ignored or similar
-     * rather than passing if they can't run on the current device, but that
-     * doesn't seem to be supported by CTS as of 2016-05-24.
-     * TODO: Use Assume.assumeTrue() if this test gets converted to JUnit 4.
+     * Skips the test if it does not use JIT profiles.
      */
-    private boolean canRunTest(Set<ProfileLocation> profileLocations) throws Exception {
-        boolean result = mCanEnableDeviceRootAccess &&
-                (profileLocations.isEmpty() || isUseJitProfiles());
-        if (!result) {
-            System.err.printf("Skipping test [mCanEnableDeviceRootAccess=%s, %d profiles] on %s\n",
-                    mCanEnableDeviceRootAccess, profileLocations.size(), mDevice);
-        }
-        return result;
+    private void checkProfileSupport() throws Exception {
+        assumeTrue("The device does not use JIT profiles", isUseJitProfiles());
     }
 
     private boolean isUseJitProfiles() throws Exception {
-        boolean propUseJitProfiles = Boolean.parseBoolean(
-                executeSuShellAdbCommand(1, "getprop", "dalvik.vm.usejitprofiles")[0]);
-        return propUseJitProfiles;
+        return Boolean.parseBoolean(assertCommandSucceeds("getprop", "dalvik.vm.usejitprofiles"));
     }
 
-    private String[] filterAdbLines(String[] lines) {
-        List<String> linesList = new ArrayList<String>(Arrays.asList(lines));
-        Iterator<String> it = linesList.iterator();
-        while (it.hasNext()) {
-            String line = it.next();
-            mAdbLineFilter.reset(line);
-            if (mAdbLineFilter.matches()) {
-                it.remove();
-            }
-        }
-        if (linesList.size() != lines.length) {
-            return linesList.toArray(new String[linesList.size()]);
-        }
-        return lines;
-    }
-
-    private String[] executeSuShellAdbCommand(int numLinesOutputExpected, String... command)
+    private String[] assertCommandOutputsLines(int numLinesOutputExpected, String... command)
             throws DeviceNotAvailableException {
-        String[] lines = filterAdbLines(executeSuShellAdbCommand(command));
+        String output = assertCommandSucceeds(command);
+        // "".split() returns { "" }, but we want an empty array
+        String[] lines = output.equals("") ? new String[0] : output.split("\n");
         assertEquals(
                 String.format(Locale.US, "Expected %d lines output, got %d running %s: %s",
                         numLinesOutputExpected, lines.length, Arrays.toString(command),
@@ -402,88 +540,88 @@
         return lines;
     }
 
-    private String[] executeSuShellAdbCommand(String... command)
-            throws DeviceNotAvailableException {
-        // Add `shell su root` to the adb command.
-        String cmdString = String.join(" ", command);
-        String output = mDevice.executeShellCommand("su root " + cmdString);
-        // "".split() returns { "" }, but we want an empty array
-        String[] lines = output.equals("") ? new String[0] : output.split("\n");
-        return filterAdbLines(lines);
+    private String assertCommandSucceeds(String... command) throws DeviceNotAvailableException {
+        CommandResult result = mDevice.executeShellV2Command(String.join(" ", command));
+        assertWithMessage(result.toString()).that(result.getExitCode()).isEqualTo(0);
+        // Remove trailing \n's.
+        return result.getStdout().trim();
     }
 
-    private String getSelinuxLabel(String path) throws DeviceNotAvailableException {
-        // ls -aZ (-a so it sees directories, -Z so it prints the label).
-        String[] res = executeSuShellAdbCommand(String.format(
-            "ls -aZ '%s'", path));
-
-        if (res.length == 0) {
-          return null;
+    private File copyResourceToFile(String resourceName, File file) throws Exception {
+        try (OutputStream outputStream = new FileOutputStream(file);
+                InputStream inputStream = getClass().getResourceAsStream(resourceName)) {
+            assertThat(ByteStreams.copy(inputStream, outputStream)).isGreaterThan(0);
         }
-
-        // For directories, it will print many outputs. Filter to first line which contains '.'
-        // The target line will look like
-        //      "u:object_r:shell_data_file:s0 /data/local/tmp/android.compilation.cts.primary.prof"
-        // Remove the second word to only return "u:object_r:shell_data_file:s0".
-
-        return res[0].replaceAll("\\s+.*","");  // remove everything following the first whitespace
+        return file;
     }
 
-    private void checkSelinuxLabelMatches(String a, String b) throws DeviceNotAvailableException {
-      String labelA = getSelinuxLabel(a);
-      String labelB = getSelinuxLabel(b);
-
-      assertEquals("expected the selinux labels to match", labelA, labelB);
-    }
-
-    private void executePush(String hostPath, String targetPath, String targetDirectory)
-            throws DeviceNotAvailableException {
-        // Cannot push to a privileged directory with one command.
-        // (i.e. there is no single-command equivalent of 'adb root; adb push src dst')
-        //
-        // Push to a tmp directory and then move it to the final destination
-        // after updating the selinux label.
-        String tmpPath = "/data/local/tmp/" + APPLICATION_PACKAGE + ".push.tmp";
-        assertTrue(mDevice.pushFile(new File(hostPath), tmpPath));
-
-        // Important: Use "cp" here because it newly copied files will inherit the security context
-        // of the targetDirectory according to the default policy.
-        //
-        // (Other approaches, such as moving the file retain the invalid security context
-        // of the tmp directory - b/37425296)
-        //
-        // This mimics the behavior of 'adb root; adb push $targetPath'.
-        executeSuShellAdbCommand("mv", tmpPath, targetPath);
-
-        // Important: Use "restorecon" here because the file in tmpPath retains the
-        // incompatible security context of /data/local/tmp.
-        //
-        // This mimics the behavior of 'adb root; adb push $targetPath'.
-        executeSuShellAdbCommand("restorecon", targetPath);
-
-        // Validate that the security context of the file matches the security context
-        // of the directory it was pushed to.
-        //
-        // This is a reasonable default behavior to check because most selinux policies
-        // are configured to behave like this.
-        checkSelinuxLabelMatches(targetDirectory, targetPath);
-    }
-
-    private void executePull(String targetPath, String hostPath)
-            throws DeviceNotAvailableException {
-        String tmpPath = "/data/local/tmp/" + APPLICATION_PACKAGE + ".pull.tmp";
-        executeSuShellAdbCommand("cp", targetPath, tmpPath);
-        try {
-            executeSuShellAdbCommand("chmod", "606", tmpPath);
-            assertTrue(mDevice.pullFile(tmpPath, new File(hostPath)));
-        } finally {
-            executeSuShellAdbCommand("rm", tmpPath);
+    /**
+     * Turns on adb root. Returns true if successful.
+     *
+     * This is a workaround to run the test as root in CTS on userdebug/eng builds. We have to keep
+     * this test in CTS because it's the only integration test we have to verify platform's dexopt
+     * behavior. We cannot use `mDevice.enableAdbRoot()` because it does not allow enabling root in
+     * CTS, even on userdebug/eng builds.
+     *
+     * The implementation below is copied from {@link NativeDevice#enableAdbRoot()}.
+     */
+    private boolean enableAdbRoot() throws DeviceNotAvailableException {
+        // adb root is a relatively intensive command, so do a brief check first to see
+        // if its necessary or not
+        if (mDevice.isAdbRoot()) {
+            CLog.i("adb is already running as root for AdbRootDependentCompilationTest on %s",
+                    mDevice.getSerialNumber());
+            // Still check for online, in some case we could see the root, but device could be
+            // very early in its cycle.
+            mDevice.waitForDeviceOnline();
+            return true;
         }
+        CLog.i("adb root for AdbRootDependentCompilationTest on device %s",
+                mDevice.getSerialNumber());
+        int attempts = ADB_ROOT_RETRY_ATTEMPTS;
+        for (int i = 1; i <= attempts; i++) {
+            String output = mDevice.executeAdbCommand("root");
+            // wait for device to disappear from adb
+            boolean res = mDevice.waitForDeviceNotAvailable(2 * 1000);
+            if (!res && TestDeviceState.ONLINE.equals(mDevice.getDeviceState())) {
+                if (mDevice.isAdbRoot()) {
+                    return true;
+                }
+            }
+
+            if (mDevice instanceof NativeDevice) {
+                ((NativeDevice) mDevice).postAdbRootAction();
+            }
+
+            // wait for device to be back online
+            mDevice.waitForDeviceOnline();
+
+            if (mDevice.isAdbRoot()) {
+                return true;
+            }
+            CLog.w("'adb root' for AdbRootDependentCompilationTest on %s unsuccessful on attempt "
+                            + "%d of %d. Output: '%s'",
+                    mDevice.getSerialNumber(), i, attempts, output);
+        }
+        return false;
     }
 
-    private boolean doesFileExist(String path) throws DeviceNotAvailableException {
-        String[] result = executeSuShellAdbCommand("ls", path);
-        // Testing for empty directories will return an empty array.
-        return !(result.length > 0 && result[0].contains("No such file"));
+    private void assertFileIsPublic(String path) throws Exception {
+        String permissions = getPermissions(path);
+        assertWithMessage("Expected " + path + " to be public, got " + permissions)
+                .that(permissions.charAt(READ_OTHER)).isEqualTo('r');
+    }
+
+    private void assertFileIsPrivate(String path) throws Exception {
+        String permissions = getPermissions(path);
+        assertWithMessage("Expected " + path + " to be private, got " + permissions)
+                .that(permissions.charAt(READ_OTHER)).isEqualTo('-');
+    }
+
+    private String getPermissions(String path) throws Exception {
+        String permissions = mDevice.getFileEntry(path).getPermissions();
+        assertWithMessage("Invalid permissions string " + permissions).that(permissions.length())
+                .isEqualTo(PERMISSIONS_LENGTH);
+        return permissions;
     }
 }
diff --git a/hostsidetests/compilation/src/android/compilation/cts/BackgroundDexOptimizationTest.java b/hostsidetests/compilation/src/android/compilation/cts/BackgroundDexOptimizationTest.java
new file mode 100644
index 0000000..d4a1164
--- /dev/null
+++ b/hostsidetests/compilation/src/android/compilation/cts/BackgroundDexOptimizationTest.java
@@ -0,0 +1,378 @@
+/*
+ * Copyright (C) 2022 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 android.compilation.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import com.google.common.io.ByteStreams;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Tests background dex optimization which runs as idle job.
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+// Tests for post boot optimization must run first because they reboot the device into a clean
+// state, which can benefit other tests so that they don't have to reboot again.
+// Tests for idle optimizations won't work without a reboot in some cases. See
+// `testIdleOptimization*` for more details. However, we can't do a reboot for every test case
+// because it will cause the test to time out.
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public final class BackgroundDexOptimizationTest extends BaseHostJUnit4Test {
+    private static final long REBOOT_TIMEOUT_MS = 600_000;
+    private static final long JOB_START_TIMEOUT_MS = 10_000;
+    private static final long DEXOPT_TIMEOUT_MS = 1_200_000;
+    // Cancel should be faster. It will be usually much shorter but we cannot make it too short
+    // as CTS cannot enforce unspecified performance.
+    private static final long DEXOPT_CANCEL_TIMEOUT_MS = 10_000;
+    private static final long POLLING_TIME_SLICE = 200;
+
+    private static final String CMD_DUMP_PACKAGE_DEXOPT = "dumpsys -t 100 package dexopt";
+
+    private static final String CMD_START_POST_BOOT = "cmd jobscheduler run android 801";
+    private static final String CMD_CANCEL_POST_BOOT = "cmd jobscheduler timeout android 801";
+    private static final String CMD_START_IDLE = "cmd jobscheduler run android 800";
+    private static final String CMD_CANCEL_IDLE = "cmd jobscheduler timeout android 800";
+
+    private static final String APPLICATION_PACKAGE = "android.compilation.cts";
+    private static final String APPLICATION_APK = "CtsCompilationApp";
+    private static final String CMD_APP_ACTIVITY_LAUNCH =
+            "am start -n " + APPLICATION_PACKAGE + "/.CompilationTargetActivity";
+
+    private static final String CMD_DELETE_ODEX = "pm delete-dexopt " + APPLICATION_PACKAGE;
+
+    private static final boolean DBG_LOG_CMD = false;
+
+    // Uses internal consts defined in BackgroundDexOptService only for testing purpose.
+    private static final int STATUS_OK = 0;
+    private static final int STATUS_CANCELLED = 1;
+
+    private ITestDevice mDevice;
+
+    @Before
+    public void setUp() throws Exception {
+        mDevice = getDevice();
+    }
+
+    @Test
+    // Add an "A" in the name to make it run before other tests.
+    public void testAPostBootOptimizationCompleted() throws Exception {
+        // Should reboot to put the device into known states (= post boot optimization not run yet).
+        rebootAndCheckDexOptEnabled();
+
+        // Note that post boot job runs only once until it is completed.
+        completePostBootOptimization();
+    }
+
+    @Test
+    // Add an "A" in the name to make it run before other tests.
+    public void testAPostBootOptimizationCancelled() throws Exception {
+        // Should reboot to put the device into known states (= post boot optimization not run yet).
+        rebootAndCheckDexOptEnabled();
+
+        reinstallAppPackage();
+        LastDeviceExecutionTime timeBefore = getLastExecutionTime();
+        postJobSchedulerJob(CMD_START_POST_BOOT);
+
+        // Wait until it is started.
+        pollingCheck("Post boot start timeout", JOB_START_TIMEOUT_MS,
+                () -> getLastExecutionTime().startTime >= timeBefore.deviceCurrentTime);
+
+        // Now cancel it.
+        executeShellCommand(CMD_CANCEL_POST_BOOT);
+
+        // Wait until it is completed or cancelled. We cannot prevent faster devices with small
+        // number of APKs to complete very quickly, so completion while cancelling can happen.
+        pollingCheck("Post boot cancel timeout", DEXOPT_CANCEL_TIMEOUT_MS,
+                () -> getLastExecutionTime().duration >= 0);
+
+        int status = getLastDexOptStatus();
+        assertThat(status).isAnyOf(STATUS_OK, STATUS_CANCELLED);
+        if (status == STATUS_CANCELLED) {
+            assertThat(checkFinishedPostBootUpdate()).isFalse();
+            // If cancelled, we can complete it by running it again.
+            completePostBootOptimization();
+        } else {
+            assertThat(checkFinishedPostBootUpdate()).isTrue();
+        }
+    }
+
+    @Test
+    public void testIdleOptimizationCompleted() throws Exception {
+        assumeTrue(checkDexOptEnabled());
+        // We check if post boot optimization is completed, and wait for it to be completed if not.
+        // Note that this won't work if the system server has been restarted (e.g., by a `stop &&
+        // start`) AND this test case is run individually, in which case,
+        // `checkFinishedPostBootUpdate` will return false because the system server will lose track
+        // of a completed post boot optimization run, but `completePostBootOptimization` will get
+        // stuck retrying to start the job since it has already completed.
+        ensurePostBootOptimizationCompleted();
+
+        completeIdleOptimization();
+        // idle job can run again.
+        completeIdleOptimization();
+    }
+
+    @Test
+    public void testIdleOptimizationCancelled() throws Exception {
+        assumeTrue(checkDexOptEnabled());
+        // We check if post boot optimization is completed, and wait for it to be completed if not.
+        // Note that this won't work if the system server has been restarted (e.g., by a `stop &&
+        // start`) AND this test case is run individually, in which case,
+        // `checkFinishedPostBootUpdate` will return false because the system server will lose track
+        // of a completed post boot optimization run, but `completePostBootOptimization` will get
+        // stuck retrying to start the job since it has already completed.
+        ensurePostBootOptimizationCompleted();
+
+        reinstallAppPackage();
+        LastDeviceExecutionTime timeBefore = getLastExecutionTime();
+        postJobSchedulerJob(CMD_START_IDLE);
+
+        // Wait until it is started.
+        pollingCheck("Idle start timeout", JOB_START_TIMEOUT_MS,
+                () -> getLastExecutionTime().startTime >= timeBefore.deviceCurrentTime);
+
+        // Now cancel it.
+        executeShellCommand(CMD_CANCEL_IDLE);
+
+        // Wait until it is completed or cancelled.
+        pollingCheck("Idle cancel timeout", DEXOPT_CANCEL_TIMEOUT_MS,
+                () -> getLastExecutionTime().duration >= 0);
+
+        int status = getLastDexOptStatus();
+        assertThat(status).isAnyOf(STATUS_OK, STATUS_CANCELLED);
+        if (status == STATUS_CANCELLED) {
+            // If cancelled, we can complete it by running it again.
+            completeIdleOptimization();
+        }
+    }
+
+    private String executeShellCommand(String cmd) throws Exception {
+        String result =  mDevice.executeShellCommand(cmd);
+        if (DBG_LOG_CMD) {
+            CLog.i("Executed cmd:" + cmd + ", result:" + result);
+        }
+        return result;
+    }
+
+    private void completePostBootOptimization() throws Exception {
+        reinstallAppPackage();
+        LastDeviceExecutionTime timeBefore = getLastExecutionTime();
+        postJobSchedulerJob(CMD_START_POST_BOOT);
+
+        pollingCheck("Post boot optimization timeout", DEXOPT_TIMEOUT_MS,
+                () -> checkFinishedPostBootUpdate());
+
+        LastDeviceExecutionTime timeAfter = getLastExecutionTime();
+        assertThat(timeAfter.startTime).isAtLeast(timeBefore.deviceCurrentTime);
+        assertThat(timeAfter.duration).isAtLeast(0);
+        int status = getLastDexOptStatus();
+        assertThat(status).isEqualTo(STATUS_OK);
+    }
+
+    private void completeIdleOptimization() throws Exception {
+        reinstallAppPackage();
+        LastDeviceExecutionTime timeBefore = getLastExecutionTime();
+        postJobSchedulerJob(CMD_START_IDLE);
+
+        pollingCheck("Idle optimization timeout", DEXOPT_TIMEOUT_MS,
+                () -> {
+                    LastDeviceExecutionTime executionTime = getLastExecutionTime();
+                    return executionTime.startTime >= timeBefore.deviceCurrentTime
+                            && executionTime.duration >= 0;
+                });
+
+        int status = getLastDexOptStatus();
+        assertThat(status).isEqualTo(STATUS_OK);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        // Cancel all active dexopt jobs.
+        executeShellCommand(CMD_CANCEL_IDLE);
+        executeShellCommand(CMD_CANCEL_POST_BOOT);
+        mDevice.uninstallPackage(APPLICATION_PACKAGE);
+    }
+
+    private void postJobSchedulerJob(String cmd) throws Exception {
+        // Do retry as job may not be registered yet during boot up.
+        pollingCheck("Starting job timeout:" + cmd, DEXOPT_TIMEOUT_MS,
+                () -> {
+                    String r = executeShellCommand(cmd);
+                    return r.contains("Running");
+                });
+    }
+
+    private void reinstallAppPackage() throws Exception {
+        mDevice.uninstallPackage(APPLICATION_PACKAGE);
+
+        File apkFile = File.createTempFile(APPLICATION_APK, ".apk");
+        try (OutputStream outputStream = new FileOutputStream(apkFile)) {
+            InputStream inputStream = getClass().getResourceAsStream(
+                    "/" + APPLICATION_APK + ".apk");
+            ByteStreams.copy(inputStream, outputStream);
+        }
+        String error = mDevice.installPackage(apkFile, /* reinstall= */ false);
+
+        assertThat(error).isNull();
+
+        // Delete odex files.
+        executeShellCommand(CMD_DELETE_ODEX);
+        executeShellCommand(CMD_APP_ACTIVITY_LAUNCH);
+        // Give short time to run some code.
+        Thread.sleep(500);
+    }
+
+    private boolean checkDexOptEnabled() throws Exception {
+        return checkBooleanDumpValue("enabled");
+    }
+
+    private boolean checkFinishedPostBootUpdate() throws Exception {
+        return checkBooleanDumpValue("mFinishedPostBootUpdate");
+    }
+
+    private boolean checkBooleanDumpValue(String key) throws Exception {
+        String value = findDumpValueForKey(key);
+        assertThat(value).isNotNull();
+        return value.equals("true");
+    }
+
+    private String findDumpValueForKey(String key) throws Exception {
+        for (String line: getDexOptDumpForBgDexOpt()) {
+            String[] vals = line.split(":");
+            if (vals[0].equals(key)) {
+                return vals[1];
+            }
+        }
+        return null;
+    }
+
+    private List<String> getDexOptDumpForBgDexOpt() throws Exception {
+        String dump = executeShellCommand(CMD_DUMP_PACKAGE_DEXOPT);
+        String[] lines = dump.split("\n");
+        LinkedList<String> bgDexOptDumps = new LinkedList<>();
+        // BgDexopt state is located in the last part from the dexopt dump. So there is no separate
+        // end of the dump check.
+        boolean inBgDexOptDump = false;
+        for (int i = 0; i < lines.length; i++) {
+            if (lines[i].contains("BgDexopt state:")) {
+                inBgDexOptDump = true;
+            } else if (inBgDexOptDump) {
+                bgDexOptDumps.add(lines[i].trim());
+            }
+        }
+        // dumpsys package can expire due to the lock while bgdexopt is running.
+        if (dump.contains("DUMP TIMEOUT")) {
+            CLog.w("package dump timed out");
+            throw new TimeoutException();
+        }
+        return bgDexOptDumps;
+    }
+
+    private int getLastDexOptStatus() throws Exception {
+        String value = findDumpValueForKey("mLastExecutionStatus");
+        assertThat(value).isNotNull();
+        return Integer.parseInt(value);
+    }
+
+    private LastDeviceExecutionTime getLastExecutionTime() throws Exception {
+        long startTime = 0;
+        long duration = 0;
+        long deviceCurrentTime = 0;
+        for (String line: getDexOptDumpForBgDexOpt()) {
+            String[] vals = line.split(":");
+            switch (vals[0]) {
+                case "mLastExecutionStartTimeMs":
+                    startTime = Long.parseLong(vals[1]);
+                    break;
+                case "mLastExecutionDurationMs":
+                    duration = Long.parseLong(vals[1]);
+                    break;
+                case "now":
+                    deviceCurrentTime = Long.parseLong(vals[1]);
+                    break;
+            }
+        }
+        assertThat(deviceCurrentTime).isNotEqualTo(0);
+        return new LastDeviceExecutionTime(startTime, duration, deviceCurrentTime);
+    }
+
+    private static void pollingCheck(CharSequence message, long timeout,
+            Callable<Boolean> condition) throws Exception {
+        long expirationTime = System.currentTimeMillis() + timeout;
+        while (System.currentTimeMillis() < expirationTime) {
+            try {
+                if (condition.call()) {
+                    return;
+                }
+            } catch (TimeoutException e) {
+                // DUMP TIMEOUT has happened. Ignore it as we have to retry.
+            }
+            Thread.sleep(POLLING_TIME_SLICE);
+        }
+
+        fail(message.toString());
+    }
+
+    private void rebootAndCheckDexOptEnabled() throws Exception {
+        mDevice.reboot();
+        assertThat(mDevice.waitForBootComplete(REBOOT_TIMEOUT_MS)).isTrue();
+        // This requires PackageManager to be alive. So run after reboot as the previous failure
+        // may have device in booting state.
+        assumeTrue(checkDexOptEnabled());
+    }
+
+    private void ensurePostBootOptimizationCompleted() throws Exception {
+        if (!checkFinishedPostBootUpdate()) {
+            completePostBootOptimization();
+        }
+    }
+
+    private static class LastDeviceExecutionTime {
+        public final long startTime;
+        public final long duration;
+        public final long deviceCurrentTime;
+
+        private LastDeviceExecutionTime(long startTime, long duration, long deviceCurrentTime) {
+            this.startTime = startTime;
+            this.duration = duration;
+            this.deviceCurrentTime = deviceCurrentTime;
+        }
+    }
+}
diff --git a/hostsidetests/content/src/android/content/cts/ContextCrossProfileHostTest.java b/hostsidetests/content/src/android/content/cts/ContextCrossProfileHostTest.java
index 3c7e2c7..9cb0940 100644
--- a/hostsidetests/content/src/android/content/cts/ContextCrossProfileHostTest.java
+++ b/hostsidetests/content/src/android/content/cts/ContextCrossProfileHostTest.java
@@ -296,7 +296,7 @@
     }
 
     @Test
-    public void testBindServiceAsUser_differentProfileGroup_withInteractAcrossUsersPermission_throwsException()
+    public void testBindServiceAsUser_differentProfileGroup_samePackage_withAcrossUsersPermission_bindsService()
             throws Exception {
         int userInDifferentProfileGroup = createUser();
         getDevice().startUser(userInDifferentProfileGroup, /* waitFlag= */true);
@@ -317,7 +317,36 @@
                 getDevice(),
                 TEST_WITH_PERMISSION_PKG,
                 ".ContextCrossProfileDeviceTest",
-                "testBindServiceAsUser_differentProfileGroup_withInteractAcrossUsersPermission_throwsException",
+                "testBindServiceAsUser_differentProfileGroup_samePackage_withAcrossUsersPermission_bindsService",
+                mParentUserId,
+                mTestArgs,
+                /* timeout= */60L,
+                TimeUnit.SECONDS);
+    }
+
+    @Test
+    public void testBindServiceAsUser_differentProfileGroup_differentPackage_withAcrossUsersPermission_throwsException()
+            throws Exception {
+        int userInDifferentProfileGroup = createUser();
+        getDevice().startUser(userInDifferentProfileGroup, /* waitFlag= */true);
+        mTestArgs.put("testUser", Integer.toString(userInDifferentProfileGroup));
+        getDevice().installPackageForUser(
+                mApkFile, /* reinstall= */true, /* grantPermissions= */true,
+                userInDifferentProfileGroup, /* extraArgs= */"-t",
+                /* extraArgs= */"--force-queryable");
+
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(mCtsBuild);
+        File testServiceApkFile = buildHelper.getTestFile(TEST_SERVICE_WITH_PERMISSION_APK);
+        getDevice().installPackageForUser(
+                testServiceApkFile, /* reinstall= */true, /* grantPermissions= */true,
+                userInDifferentProfileGroup, /* extraArgs= */"-t",
+                /* extraArgs= */"--force-queryable");
+
+        runDeviceTests(
+                getDevice(),
+                TEST_WITH_PERMISSION_PKG,
+                ".ContextCrossProfileDeviceTest",
+                "testBindServiceAsUser_differentProfileGroup_differentPackage_withAcrossUsersPermission_throwsException",
                 mParentUserId,
                 mTestArgs,
                 /* timeout= */60L,
diff --git a/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/src/com/android/cts/context/ContextCrossProfileDeviceTest.java b/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/src/com/android/cts/context/ContextCrossProfileDeviceTest.java
index 23c7730..8f5ad3c 100644
--- a/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/src/com/android/cts/context/ContextCrossProfileDeviceTest.java
+++ b/hostsidetests/content/test-apps/ContextCrossProfileApps/ContextCrossProfileApp/src/com/android/cts/context/ContextCrossProfileDeviceTest.java
@@ -220,7 +220,23 @@
     }
 
     @Test
-    public void testBindServiceAsUser_differentProfileGroup_withInteractAcrossUsersPermission_throwsException() {
+    public void testBindServiceAsUser_differentProfileGroup_samePackage_withAcrossUsersPermission_bindsService() {
+        final Context context = InstrumentationRegistry.getContext();
+        final UiAutomation uiAutomation =
+                InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        int otherUserId = getTestUser();
+        UserHandle otherUserHandle = UserHandle.of(otherUserId);
+        uiAutomation.adoptShellPermissionIdentity(INTERACT_ACROSS_USERS_PERMISSION);
+        Intent bindIntent = new Intent();
+        bindIntent.setComponent(TEST_SERVICE_IN_SAME_PKG_COMPONENT_NAME);
+
+        assertThat(context.bindServiceAsUser(
+                bindIntent, new ContextCrossProfileTestConnection(), Context.BIND_AUTO_CREATE,
+                otherUserHandle)).isTrue();
+    }
+
+    @Test
+    public void testBindServiceAsUser_differentProfileGroup_differentPackage_withAcrossUsersPermission_throwsException() {
         final Context context = InstrumentationRegistry.getContext();
         final UiAutomation uiAutomation =
                 InstrumentationRegistry.getInstrumentation().getUiAutomation();
@@ -229,7 +245,7 @@
         uiAutomation.adoptShellPermissionIdentity(INTERACT_ACROSS_USERS_PERMISSION);
         try {
             Intent bindIntent = new Intent();
-            bindIntent.setComponent(TEST_SERVICE_IN_SAME_PKG_COMPONENT_NAME);
+            bindIntent.setComponent(TEST_SERVICE_IN_DIFFERENT_PKG_COMPONENT_NAME);
 
             context.bindServiceAsUser(
                     bindIntent, new ContextCrossProfileTestConnection(), Context.BIND_AUTO_CREATE,
diff --git a/hostsidetests/devicepolicy/app/CertInstaller/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CertInstaller/AndroidManifest.xml
index 89c72ed..5b19966 100644
--- a/hostsidetests/devicepolicy/app/CertInstaller/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/CertInstaller/AndroidManifest.xml
@@ -31,6 +31,8 @@
                 <action android:name="com.android.cts.certinstaller.remove_cert"/>
                 <action android:name="com.android.cts.certinstaller.verify_cert"/>
                 <action android:name="com.android.cts.certinstaller.install_keypair"/>
+                <action android:name="com.android.cts.certinstaller.done"/>
+                <action android:name="com.android.cts.certinstaller.read_esid"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </receiver>
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/Android.bp
deleted file mode 100644
index 07fa05e..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/Android.bp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (C) 2017 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-android_test_helper_app {
-    name: "CtsCrossProfileAppsTests",
-    defaults: ["cts_defaults"],
-    srcs: ["src/**/*.java"],
-    libs: ["junit"],
-    static_libs: [
-        "androidx.legacy_legacy-support-v4",
-        "ctstestrunner-axt",
-        "compatibility-device-util-axt",
-        "androidx.test.rules",
-        "truth-prebuilt",
-        "ub-uiautomator",
-        "Nene",
-    ],
-    sdk_version: "test_current",
-    // tag this module as a cts test artifact
-    test_suites: [
-        "cts",
-        "general-tests",
-        "mts-permission",
-    ],
-}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/AndroidManifest.xml
deleted file mode 100644
index c810539..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/AndroidManifest.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     package="com.android.cts.crossprofileappstest">
-
-    <uses-sdk android:minSdkVersion="21"
-         android:targetSdkVersion="25"/>
-
-    <application>
-        <uses-library android:name="android.test.runner"/>
-        <receiver android:name="com.android.cts.crossprofileappstest.AdminReceiver"
-             android:permission="android.permission.BIND_DEVICE_ADMIN"
-             android:exported="true">
-            <meta-data android:name="android.app.device_admin"
-                 android:resource="@xml/device_admin"/>
-            <intent-filter>
-                <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
-            </intent-filter>
-        </receiver>
-
-        <activity android:name=".MainActivity"
-             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".NonMainActivity"
-             android:exported="true">
-            <intent-filter>
-                <action android:name="nonMainActivity"/>
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".NonExportedActivity"
-             android:exported="false">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
-
-        <activity android:name=".CrossProfileSameTaskLauncherActivity"
-             android:exported="true"/>
-
-        <activity android:name=".CrossProfileResultCheckerActivity"
-             android:exported="true"/>
-
-        <activity android:name=".CrossProfileResultReturnerActivity"
-             android:exported="true"/>
-    </application>
-
-    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-         android:targetPackage="com.android.cts.crossprofileappstest"
-         android:label="Launcher Apps CTS Tests"/>
-
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
-</manifest>
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/layout/cross_profile_result_checker.xml b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/layout/cross_profile_result_checker.xml
deleted file mode 100644
index 5689f32..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/layout/cross_profile_result_checker.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2020 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.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/cross_profile_result_checker_result"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-    />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/layout/cross_profile_same_task_launcher.xml b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/layout/cross_profile_same_task_launcher.xml
deleted file mode 100644
index 8d9cf94..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/layout/cross_profile_same_task_launcher.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2020 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.
-  -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="CrossProfileSameTaskLauncherActivity"
-    />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/layout/main.xml b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/layout/main.xml
deleted file mode 100644
index 877d890..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/layout/main.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/user_textview"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-    />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/layout/non_main.xml b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/layout/non_main.xml
deleted file mode 100644
index 9416d68..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/layout/non_main.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2019 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.
--->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/user_textview_nonmain"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-    />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/xml/device_admin.xml b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/xml/device_admin.xml
deleted file mode 100644
index 5e03998..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/res/xml/device_admin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-  ~ Copyright (C) 2020 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.
-  -->
-
-<device-admin xmlns:android="http://schemas.android.com/apk/res/android" android:visible="false">
-    <uses-policies>
-        <wipe-data />
-        <disable-camera />
-        <limit-password />
-        <disable-keyguard-features/>
-        <force-lock />
-        <expire-password />
-        <watch-login />
-    </uses-policies>
-</device-admin>
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/AdminReceiver.java b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/AdminReceiver.java
deleted file mode 100644
index 0e03def..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/AdminReceiver.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) 2020 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.cts.crossprofileappstest;
-
-import android.app.admin.DeviceAdminReceiver;
-
-/**
- * Allows this test app to be set as a profile owner to test how that impacts its ability to request
- * cross-profile permissions.
- */
-public class AdminReceiver extends DeviceAdminReceiver {}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsNonTargetUserTest.java b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsNonTargetUserTest.java
deleted file mode 100644
index 554259e..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsNonTargetUserTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (C) 2017 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.cts.crossprofileappstest;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.content.pm.CrossProfileApps;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-
-/**
- * Test that runs {@link CrossProfileApps} APIs against non-valid target user.
- */
-@RunWith(AndroidJUnit4.class)
-public class CrossProfileAppsNonTargetUserTest {
-    private static final String PARAM_TARGET_USER = "TARGET_USER";
-
-    private CrossProfileApps mCrossProfileApps;
-    private UserHandle mTargetUser;
-    private Context mContext;
-
-    @Before
-    public void setupCrossProfileApps() throws Exception {
-        mContext = InstrumentationRegistry.getContext();
-        mCrossProfileApps = mContext.getSystemService(CrossProfileApps.class);
-    }
-
-    @Before
-    public void readTargetUser() {
-        Context context = InstrumentationRegistry.getContext();
-        Bundle arguments = InstrumentationRegistry.getArguments();
-        UserManager userManager = context.getSystemService(UserManager.class);
-        final int userSn = Integer.parseInt(arguments.getString(PARAM_TARGET_USER));
-        mTargetUser = userManager.getUserForSerialNumber(userSn);
-    }
-
-    @Test
-    public void testTargetUserIsNotInGetTargetProfiles() {
-        List<UserHandle> targetProfiles = mCrossProfileApps.getTargetUserProfiles();
-        assertThat(targetProfiles).doesNotContain(mTargetUser);
-    }
-
-    @Test(expected = SecurityException.class)
-    public void testCannotStartActivity() {
-        mCrossProfileApps.startMainActivity(
-                MainActivity.getComponentName(mContext), mTargetUser);
-    }
-
-    @Test(expected = SecurityException.class)
-    public void testCannotGetProfileSwitchingLabel() throws Exception {
-        mCrossProfileApps.getProfileSwitchingLabel(mTargetUser);
-    }
-
-    @Test(expected = SecurityException.class)
-    public void testCannotGetProfileSwitchingIconDrawable() throws Exception {
-        mCrossProfileApps.getProfileSwitchingIconDrawable(mTargetUser);
-    }
-}
-
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsPermissionToInteractTest.java b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsPermissionToInteractTest.java
deleted file mode 100644
index 71aa554..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsPermissionToInteractTest.java
+++ /dev/null
@@ -1,237 +0,0 @@
-/*
- * Copyright (C) 2020 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.cts.crossprofileappstest;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.fail;
-
-import android.app.AppOpsManager;
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.CrossProfileApps;
-import android.content.pm.PackageManager;
-import android.os.Binder;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.bedstead.nene.TestApis;
-import com.android.bedstead.nene.permissions.PermissionContext;
-
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Collections;
-
-@RunWith(AndroidJUnit4.class)
-public class CrossProfileAppsPermissionToInteractTest {
-    public static final String MANAGE_APP_OPS_MODES_PERMISSION =
-            "android.permission.MANAGE_APP_OPS_MODES";
-    public static final String INTERACT_ACROSS_PROFILES_PERMISSION =
-            "android.permission.INTERACT_ACROSS_PROFILES";
-    public static final String INTERACT_ACROSS_USERS_PERMISSION =
-            "android.permission.INTERACT_ACROSS_USERS";
-    public static final String INTERACT_ACROSS_USERS_FULL_PERMISSION =
-            "android.permission.INTERACT_ACROSS_USERS_FULL";
-    public static final String ACTION_MANAGE_CROSS_PROFILE_ACCESS =
-            "android.settings.MANAGE_CROSS_PROFILE_ACCESS";
-
-    private static final ComponentName ADMIN_RECEIVER_COMPONENT =
-            new ComponentName(
-                    AdminReceiver.class.getPackage().getName(), AdminReceiver.class.getName());
-    private static final String PARAM_CROSS_PROFILE_PACKAGE = "crossProfilePackage";
-    private static final TestApis sTestApis = new TestApis();
-
-    private final Context mContext = InstrumentationRegistry.getContext();
-    private final CrossProfileApps mCrossProfileApps =
-            mContext.getSystemService(CrossProfileApps.class);
-    private final AppOpsManager mAppOpsManager = mContext.getSystemService(AppOpsManager.class);
-
-    @After
-    public void tearDown() {
-        InstrumentationRegistry.getInstrumentation().getUiAutomation()
-                .dropShellPermissionIdentity();
-    }
-
-    @Test
-    public void testCanRequestInteractAcrossProfiles_returnsFalse() {
-        assertThat(mCrossProfileApps.canRequestInteractAcrossProfiles()).isFalse();
-    }
-
-    @Test
-    public void testCanRequestInteractAcrossProfiles_returnsTrue() {
-        assertThat(mCrossProfileApps.canRequestInteractAcrossProfiles()).isTrue();
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withAppOpEnabled_returnsTrue() {
-        setAppOpOnAllProfiles(AppOpsManager.MODE_ALLOWED);
-
-        assertThat(mCrossProfileApps.canInteractAcrossProfiles()).isTrue();
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withCrossProfilesPermission_returnsTrue() {
-        // Ideally we want to grant the permission in the other profile instead of allowing the
-        // appop, however UiAutomation#adoptShellPermission can't be used for multiple UIDs.
-        setAppOpOnAllProfiles(AppOpsManager.MODE_ALLOWED, /* includeCallingProfile= */ false);
-        setAppOpOnCurrentProfile(AppOpsManager.MODE_IGNORED);
-
-        try (PermissionContext p = sTestApis.permissions().withPermission(
-                INTERACT_ACROSS_PROFILES_PERMISSION)) {
-            assertThat(mCrossProfileApps.canInteractAcrossProfiles()).isTrue();
-        }
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withCrossUsersPermission_returnsTrue() {
-        // Ideally we want to grant the permission in the other profile instead of allowing the
-        // appop, however UiAutomation#adoptShellPermission can't be used for multiple UIDs.
-        setAppOpOnAllProfiles(AppOpsManager.MODE_ALLOWED, /* includeCallingProfile= */ false);
-        setAppOpOnCurrentProfile(AppOpsManager.MODE_IGNORED);
-
-        try (PermissionContext p = sTestApis.permissions().withPermission(
-                INTERACT_ACROSS_USERS_PERMISSION)) {
-            assertThat(mCrossProfileApps.canInteractAcrossProfiles()).isTrue();
-        }
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withCrossUsersFullPermission_returnsTrue() {
-        // Ideally we want to grant the permission in the other profile instead of allowing the
-        // appop, however UiAutomation#adoptShellPermission can't be used for multiple UIDs.
-        setAppOpOnAllProfiles(AppOpsManager.MODE_ALLOWED, /* includeCallingProfile= */ false);
-        setAppOpOnCurrentProfile(AppOpsManager.MODE_IGNORED);
-
-        try (PermissionContext p = sTestApis.permissions().withPermission(
-                INTERACT_ACROSS_USERS_FULL_PERMISSION)) {
-            assertThat(mCrossProfileApps.canInteractAcrossProfiles()).isTrue();
-        }
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withAppOpDisabledOnCallingProfile_returnsFalse() {
-        setAppOpOnAllProfiles(AppOpsManager.MODE_ALLOWED, /* includeCallingProfile= */ false);
-        setAppOpOnCurrentProfile(AppOpsManager.MODE_IGNORED);
-
-        assertThat(mCrossProfileApps.canInteractAcrossProfiles()).isFalse();
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withAppOpDisabledOnOtherProfiles_returnsFalse() {
-        setAppOpOnAllProfiles(AppOpsManager.MODE_IGNORED, /* includeCallingProfile= */ false);
-        setAppOpOnCurrentProfile(AppOpsManager.MODE_ALLOWED);
-
-        assertThat(mCrossProfileApps.canInteractAcrossProfiles()).isFalse();
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withNoOtherProfile_returnsFalse() {
-        setAppOpOnCurrentProfile(AppOpsManager.MODE_ALLOWED);
-
-        assertThat(mCrossProfileApps.canInteractAcrossProfiles()).isFalse();
-    }
-
-    @Test
-    public void testCreateRequestInteractAcrossProfilesIntent_canRequestInteraction_returnsIntent() {
-        Intent intent = mCrossProfileApps.createRequestInteractAcrossProfilesIntent();
-
-        assertThat(intent).isNotNull();
-        assertThat(intent.getAction()).isEqualTo(ACTION_MANAGE_CROSS_PROFILE_ACCESS);
-        assertThat(intent.getData()).isNotNull();
-        assertThat(intent.getData().getSchemeSpecificPart()).isEqualTo(mContext.getPackageName());
-    }
-
-    @Test
-    public void testCreateRequestInteractAcrossProfilesIntent_canNotRequestInteraction_throwsSecurityException() {
-        try {
-            mCrossProfileApps.createRequestInteractAcrossProfilesIntent();
-        } catch (SecurityException e) {
-            return;
-        }
-        fail("Should throw a Security Exception");
-    }
-
-    /**
-     * Calls {@link CrossProfileApps#createRequestInteractAcrossProfilesIntent()}. This can then be
-     * used by host-side tests.
-     */
-    @Test
-    public void testCreateRequestInteractAcrossProfilesIntent_noAsserts() {
-        mCrossProfileApps.createRequestInteractAcrossProfilesIntent();
-    }
-
-    @Test
-    public void testSetCrossProfilePackages_noAsserts() {
-        final DevicePolicyManager devicePolicyManager =
-                (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        devicePolicyManager.setCrossProfilePackages(
-                ADMIN_RECEIVER_COMPONENT, Collections.singleton(getCrossProfilePackage()));
-    }
-
-    private String getCrossProfilePackage() {
-        final Bundle testArguments = InstrumentationRegistry.getArguments();
-        if (testArguments.containsKey(PARAM_CROSS_PROFILE_PACKAGE)) {
-            try {
-                return testArguments.getString(PARAM_CROSS_PROFILE_PACKAGE);
-            } catch (NumberFormatException ignore) {
-            }
-        }
-        fail("cross profile package param not found.");
-        return null;
-    }
-
-    private void setAppOpOnCurrentProfile(int mode) {
-        try (PermissionContext p = sTestApis.permissions().withPermission(
-                MANAGE_APP_OPS_MODES_PERMISSION)) {
-            mAppOpsManager.setMode(AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES,
-                    Binder.getCallingUid(), mContext.getPackageName(), mode);
-        }
-    }
-
-    private void setAppOpOnAllProfiles(int mode) {
-        setAppOpOnAllProfiles(mode, /* includeCallingProfile= */ true);
-    }
-
-    private void setAppOpOnAllProfiles(int mode, boolean includeCallingProfile) {
-        try (PermissionContext p = sTestApis.permissions().withPermission(
-                MANAGE_APP_OPS_MODES_PERMISSION, INTERACT_ACROSS_USERS_PERMISSION)) {
-            for (UserHandle profile : mContext.getSystemService(
-                    UserManager.class).getAllProfiles()) {
-                if (!includeCallingProfile && profile.getIdentifier() == mContext.getUserId()) {
-                    continue;
-                }
-                try {
-                    final int uid = mContext.createContextAsUser(profile, /* flags= */ 0)
-                            .getPackageManager().getPackageUid(
-                                    mContext.getPackageName(), /* flags= */ 0);
-                    mAppOpsManager.setMode(AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES,
-                            uid, mContext.getPackageName(), mode);
-                } catch (PackageManager.NameNotFoundException e) {
-                    // Do nothing
-                }
-            }
-        }
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsStartActivityTest.java b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsStartActivityTest.java
deleted file mode 100644
index 7332521..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsStartActivityTest.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/*
- * Copyright (C) 2019 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.cts.crossprofileappstest;
-
-import static android.Manifest.permission.INTERACT_ACROSS_PROFILES;
-import static android.Manifest.permission.INTERACT_ACROSS_USERS;
-import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static junit.framework.Assert.assertNotNull;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import android.app.Activity;
-import android.app.ActivityOptions;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.CrossProfileApps;
-import android.os.Bundle;
-import android.os.RemoteException;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.compatibility.common.util.ShellIdentityUtils;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.concurrent.TimeUnit;
-
-/**
- * Tests the {@link CrossProfileApps#startActivity(ComponentName, UserHandle)} and
- * {@link CrossProfileApps#startActivity(Intent, UserHandle)} APIs.
- */
-@RunWith(AndroidJUnit4.class)
-public class CrossProfileAppsStartActivityTest {
-    private static final String PARAM_TARGET_USER = "TARGET_USER";
-    private static final String ID_USER_TEXTVIEW =
-            "com.android.cts.crossprofileappstest:id/user_textview";
-    private static final String ID_USER_TEXTVIEW_NONMAIN =
-            "com.android.cts.crossprofileappstest:id/user_textview_nonmain";
-    private static final long TIMEOUT_WAIT_UI = TimeUnit.SECONDS.toMillis(15);
-
-    private CrossProfileApps mCrossProfileApps;
-    private UserHandle mTargetUser;
-    private Context mContext;
-    private UiDevice mDevice;
-    private long mUserSerialNumber;
-
-    @Before
-    public void setupCrossProfileApps() {
-        mContext = InstrumentationRegistry.getContext();
-        mCrossProfileApps = mContext.getSystemService(CrossProfileApps.class);
-    }
-
-    @Before
-    public void wakeupDeviceAndPressHome() throws Exception {
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mDevice.wakeUp();
-        mDevice.pressMenu();
-        mDevice.pressHome();
-    }
-
-    @Before
-    public void readTargetUser() {
-        Context context = InstrumentationRegistry.getContext();
-        Bundle arguments = InstrumentationRegistry.getArguments();
-        UserManager userManager = context.getSystemService(UserManager.class);
-        mUserSerialNumber = Long.parseLong(arguments.getString(PARAM_TARGET_USER));
-        mTargetUser = userManager.getUserForSerialNumber(mUserSerialNumber);
-        assertNotNull(mTargetUser);
-    }
-
-    @After
-    public void pressHome() throws RemoteException {
-        mDevice.pressHome();
-    }
-
-    @Test(expected=SecurityException.class)
-    public void testCannotStartActivityByIntentWithNoPermissions() {
-        Intent intent = new Intent();
-        intent.setComponent(MainActivity.getComponentName(mContext));
-        ShellIdentityUtils.dropShellPermissionIdentity();
-
-        mCrossProfileApps.startActivity(intent, mTargetUser, /* callingActivity= */ null);
-    }
-
-    @Test
-    public void testCanStartActivityByIntentWithInteractAcrossProfilesPermission() {
-        Intent intent = new Intent();
-        intent.setComponent(MainActivity.getComponentName(mContext));
-        ShellIdentityUtils.dropShellPermissionIdentity();
-
-        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                mCrossProfileApps,
-                crossProfileApps -> crossProfileApps.startActivity(
-                        intent, mTargetUser, /* callingActivity= */ null),
-                INTERACT_ACROSS_PROFILES);
-
-        // Look for the text view to verify that MainActivity is started.
-        UiObject2 textView = mDevice.wait(Until.findObject(By.res(ID_USER_TEXTVIEW)),
-                TIMEOUT_WAIT_UI);
-        assertNotNull("Failed to start main activity in target user", textView);
-        assertEquals("Main Activity is started in wrong user",
-                String.valueOf(mUserSerialNumber), textView.getText());
-    }
-
-    @Test
-    public void testCanStartActivityByIntentWithInteractAcrossUsersPermission() {
-        Intent intent = new Intent();
-        intent.setComponent(MainActivity.getComponentName(mContext));
-        ShellIdentityUtils.dropShellPermissionIdentity();
-
-        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                mCrossProfileApps,
-                crossProfileApps -> crossProfileApps.startActivity(
-                        intent, mTargetUser, /* callingActivity= */ null),
-                INTERACT_ACROSS_USERS);
-
-        // Look for the text view to verify that MainActivity is started.
-        UiObject2 textView = mDevice.wait(Until.findObject(By.res(ID_USER_TEXTVIEW)),
-                TIMEOUT_WAIT_UI);
-        assertNotNull("Failed to start main activity in target user", textView);
-        assertEquals("Main Activity is started in wrong user",
-                String.valueOf(mUserSerialNumber), textView.getText());
-    }
-
-    @Test
-    public void testCanStartActivityByIntentWithInteractAcrossUsersFullPermission() {
-        Intent intent = new Intent();
-        intent.setComponent(MainActivity.getComponentName(mContext));
-        ShellIdentityUtils.dropShellPermissionIdentity();
-
-        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                mCrossProfileApps,
-                crossProfileApps -> crossProfileApps.startActivity(
-                        intent, mTargetUser, /* callingActivity= */ null),
-                INTERACT_ACROSS_USERS_FULL);
-
-        // Look for the text view to verify that MainActivity is started.
-        UiObject2 textView = mDevice.wait(Until.findObject(By.res(ID_USER_TEXTVIEW)),
-                TIMEOUT_WAIT_UI);
-        assertNotNull("Failed to start main activity in target user", textView);
-        assertEquals("Main Activity is started in wrong user",
-                String.valueOf(mUserSerialNumber), textView.getText());
-    }
-
-
-    @Test(expected = NullPointerException.class)
-    public void testCannotStartActivityWithImplicitIntent() {
-        Intent nonMainActivityImplicitIntent = new Intent();
-        nonMainActivityImplicitIntent.setAction(Intent.ACTION_VIEW);
-
-        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                mCrossProfileApps,
-                crossProfileApps -> crossProfileApps.startActivity(
-                        nonMainActivityImplicitIntent, mTargetUser, /* callingActivity= */ null));
-    }
-
-    @Test
-    public void testCanStartMainActivityByIntent() {
-        Intent mainActivityIntent = new Intent();
-        mainActivityIntent.setComponent(MainActivity.getComponentName(mContext));
-
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                    mCrossProfileApps,
-                    crossProfileApps -> mCrossProfileApps.startActivity(
-                            mainActivityIntent, mTargetUser, /* callingActivity= */ null));
-
-            // Look for the text view to verify that MainActivity is started.
-            UiObject2 textView = mDevice.wait(Until.findObject(By.res(ID_USER_TEXTVIEW)),
-                    TIMEOUT_WAIT_UI);
-            assertNotNull("Failed to start main activity in target user", textView);
-            assertEquals("Main Activity is started in wrong user",
-                    String.valueOf(mUserSerialNumber), textView.getText());
-        } catch (Exception e) {
-            fail("unable to start main activity via CrossProfileApps#startActivity: " + e);
-        }
-    }
-
-    @Test
-    public void testCanStartMainActivityByIntent_withOptionsBundle() throws Exception {
-        Intent mainActivityIntent = new Intent();
-        mainActivityIntent.setComponent(MainActivity.getComponentName(mContext));
-
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                    mCrossProfileApps,
-                    crossProfileApps ->
-                            mCrossProfileApps.startActivity(
-                                    mainActivityIntent,
-                                    mTargetUser,
-                                    /* callingActivity= */ null,
-                                    ActivityOptions.makeBasic().toBundle()));
-
-            // Look for the text view to verify that MainActivity is started.
-            UiObject2 textView = mDevice.wait(Until.findObject(By.res(ID_USER_TEXTVIEW)),
-                    TIMEOUT_WAIT_UI);
-            assertNotNull("Failed to start main activity in target user", textView);
-            assertEquals("Main Activity is started in wrong user",
-                    String.valueOf(mUserSerialNumber), textView.getText());
-        } catch (Exception e) {
-            fail("unable to start main activity via CrossProfileApps#startActivity: " + e);
-        }
-    }
-
-    @Test
-    public void testCanStartNonMainActivityByIntent() {
-        Intent nonMainActivityIntent = new Intent();
-        nonMainActivityIntent.setComponent(NonMainActivity.getComponentName(mContext));
-
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                    mCrossProfileApps,
-                    crossProfileApps -> mCrossProfileApps.startActivity(
-                            nonMainActivityIntent, mTargetUser, /* callingActivity= */ null));
-
-            // Look for the text view to verify that NonMainActivity is started.
-            UiObject2 textView = mDevice.wait(Until.findObject(By.res(ID_USER_TEXTVIEW_NONMAIN)),
-                    TIMEOUT_WAIT_UI);
-            assertNotNull("Failed to start non-main activity in target user", textView);
-            assertEquals("Non-Main Activity is started in wrong user",
-                    String.valueOf(mUserSerialNumber), textView.getText());
-        } catch (Exception e) {
-            fail("unable to start non-main activity via CrossProfileApps#startActivity: " + e);
-        }
-    }
-
-    /**
-     * Starts an activity in the same task in the target user. Asserts that the activity is
-     * correctly started in the correct user, but the host-side test should verify that the tasks
-     * are the same using the log messages printed by each activity.
-     */
-    @Test
-    public void testStartActivityIntent_sameTaskByDefault() throws Exception {
-        try {
-            final Intent crossProfileSameTaskCheckerIntent = new Intent();
-            crossProfileSameTaskCheckerIntent.setComponent(
-                    CrossProfileSameTaskLauncherActivity.getComponentName(mContext));
-            crossProfileSameTaskCheckerIntent.putExtra(
-                    CrossProfileSameTaskLauncherActivity.TARGET_USER_EXTRA, mTargetUser);
-            mContext.startActivity(crossProfileSameTaskCheckerIntent);
-
-            // Look for the text view to verify that NonMainActivity is started.
-            UiObject2 textView = mDevice.wait(Until.findObject(By.res(ID_USER_TEXTVIEW_NONMAIN)),
-                    TIMEOUT_WAIT_UI);
-            assertNotNull("Failed to start non-main activity in target user", textView);
-            assertEquals("Non-Main Activity is started in wrong user",
-                    String.valueOf(mUserSerialNumber), textView.getText());
-        } catch (Exception e) {
-            fail("unable to start cross-profile activity in the same task: " + e);
-        }
-    }
-
-    @Test
-    public void testStartActivityIntent_crossProfile_returnsResult() throws Exception {
-        try {
-            mContext.startActivity(new Intent()
-                    .setComponent(CrossProfileResultCheckerActivity.buildComponentName(mContext))
-                    .putExtra(CrossProfileResultCheckerActivity.TARGET_USER_EXTRA, mTargetUser));
-
-            final UiObject2 textView = mDevice.wait(
-                    Until.findObject(
-                            By.text(CrossProfileResultCheckerActivity.SUCCESS_MESSAGE)),
-                    TIMEOUT_WAIT_UI);
-            assertThat(textView).isNotNull();
-        } catch (Exception e) {
-            fail("unable to start cross-profile activity to obtain a returned result: " + e);
-        }
-    }
-
-    /**
-     * Calls {@link CrossProfileApps#startActivity(Intent, UserHandle, Activity)}. This can then be
-     * used by host-side tests.
-     */
-    @Test
-    public void testStartActivityByIntent_noAsserts() throws Exception {
-        Intent nonMainActivityIntent = new Intent();
-        nonMainActivityIntent.setComponent(NonMainActivity.getComponentName(mContext));
-
-        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                mCrossProfileApps,
-                crossProfileApps -> mCrossProfileApps.startActivity(
-                        nonMainActivityIntent, mTargetUser, /* callingActivity= */ null));
-    }
-
-    @Test
-    public void testCanStartMainActivityByComponent() {
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mCrossProfileApps,
-                    crossProfileApps -> mCrossProfileApps.startActivity(
-                            MainActivity.getComponentName(mContext), mTargetUser));
-
-            // Look for the text view to verify that MainActivity is started.
-            UiObject2 textView = mDevice.wait(Until.findObject(By.res(ID_USER_TEXTVIEW)),
-                    TIMEOUT_WAIT_UI);
-            assertNotNull("Failed to start main activity in target user", textView);
-            assertEquals("Main Activity is started in wrong user",
-                    String.valueOf(mUserSerialNumber), textView.getText());
-        } catch (Exception e) {
-            fail("unable to start main activity via CrossProfileApps#startActivity: " + e);
-        }
-    }
-
-    @Test
-    public void testCanStartNonMainActivityByComponent() {
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mCrossProfileApps,
-                    crossProfileApps -> mCrossProfileApps.startActivity(
-                            NonMainActivity.getComponentName(mContext), mTargetUser));
-
-            // Look for the text view to verify that NonMainActivity is started.
-            UiObject2 textView = mDevice.wait(Until.findObject(By.res(ID_USER_TEXTVIEW_NONMAIN)),
-                    TIMEOUT_WAIT_UI);
-            assertNotNull("Failed to start non-main activity in target user", textView);
-            assertEquals("Non-Main Activity is started in wrong user",
-                    String.valueOf(mUserSerialNumber), textView.getText());
-        } catch (Exception e) {
-            fail("unable to start non-main activity via CrossProfileApps#startActivity: " + e);
-        }
-    }
-
-    @Test
-    public void testCanStartNotExportedActivityByIntent() throws Exception {
-        Intent nonExportedActivityIntent = new Intent();
-        nonExportedActivityIntent.setComponent(NonExportedActivity.getComponentName(mContext));
-
-        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                mCrossProfileApps,
-                crossProfileApps -> mCrossProfileApps.startActivity(
-                        nonExportedActivityIntent, mTargetUser, /* callingActivity= */ null));
-
-        // Look for the text view to verify that NonExportedActivity is started.
-        UiObject2 textView = mDevice.wait(Until.findObject(By.res(ID_USER_TEXTVIEW_NONMAIN)),
-                TIMEOUT_WAIT_UI);
-        assertNotNull("Failed to start not exported activity in target user", textView);
-        assertEquals("Not exported Activity is started in wrong user",
-                String.valueOf(mUserSerialNumber), textView.getText());
-    }
-
-    @Test(expected = SecurityException.class)
-    public void testCannotStartNotExportedActivityByComponent() throws Exception {
-        mCrossProfileApps.startActivity(
-                NonExportedActivity.getComponentName(mContext), mTargetUser);
-    }
-
-    @Test(expected = SecurityException.class)
-    public void testCannotStartActivityInOtherPackageByIntent() throws Exception {
-        Intent otherPackageIntent = new Intent();
-        otherPackageIntent.setComponent(new ComponentName(
-                "com.android.cts.launcherapps.simpleapp",
-                "com.android.cts.launcherapps.simpleapp.SimpleActivity"));
-        mCrossProfileApps.startActivity(
-                otherPackageIntent, mTargetUser, /* callingActivity= */ null);
-    }
-
-    @Test(expected = SecurityException.class)
-    public void testCannotStartActivityInOtherPackageByComponent() throws Exception {
-        mCrossProfileApps.startMainActivity(new ComponentName(
-                "com.android.cts.launcherapps.simpleapp",
-                "com.android.cts.launcherapps.simpleapp.SimpleActivity"),
-                mTargetUser
-        );
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsTargetUserTest.java b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsTargetUserTest.java
deleted file mode 100644
index ffbafda..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileAppsTargetUserTest.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (C) 2017 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.cts.crossprofileappstest;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static junit.framework.Assert.assertNotNull;
-
-import static org.junit.Assert.assertEquals;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.pm.CrossProfileApps;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.os.UserManager;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.UiObject2;
-import android.support.test.uiautomator.Until;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Test that runs {@link CrossProfileApps} APIs against valid target user.
- */
-@RunWith(AndroidJUnit4.class)
-public class CrossProfileAppsTargetUserTest {
-    private static final String PARAM_TARGET_USER = "TARGET_USER";
-    private static final String ID_USER_TEXTVIEW =
-            "com.android.cts.crossprofileappstest:id/user_textview";
-    private static final long TIMEOUT_WAIT_UI = TimeUnit.SECONDS.toMillis(10);
-
-    private CrossProfileApps mCrossProfileApps;
-    private UserHandle mTargetUser;
-    private Context mContext;
-    private UiDevice mDevice;
-    private long mUserSerialNumber;
-
-    @Before
-    public void setupCrossProfileApps() {
-        mContext = InstrumentationRegistry.getContext();
-        mCrossProfileApps = mContext.getSystemService(CrossProfileApps.class);
-    }
-
-    @Before
-    public void wakeupDeviceAndPressHome() throws Exception {
-        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        mDevice.wakeUp();
-        mDevice.pressMenu();
-        mDevice.pressHome();
-    }
-
-    @Before
-    public void readTargetUser() {
-        Context context = InstrumentationRegistry.getContext();
-        Bundle arguments = InstrumentationRegistry.getArguments();
-        UserManager userManager = context.getSystemService(UserManager.class);
-        mUserSerialNumber = Long.parseLong(arguments.getString(PARAM_TARGET_USER));
-        mTargetUser = userManager.getUserForSerialNumber(mUserSerialNumber);
-        assertNotNull(mTargetUser);
-    }
-
-    @After
-    public void pressHome() {
-        mDevice.pressHome();
-    }
-
-    @Test
-    public void testTargetUserIsIngetTargetUserProfiles() {
-        List<UserHandle> targetProfiles = mCrossProfileApps.getTargetUserProfiles();
-        assertThat(targetProfiles).contains(mTargetUser);
-    }
-
-    /**
-     * Verify we succeed to start the activity in another profile by checking UI element.
-     */
-    @Test
-    public void testCanStartMainActivity() throws Exception {
-        mCrossProfileApps.startMainActivity(
-                MainActivity.getComponentName(mContext), mTargetUser);
-
-        // Look for the text view to verify that MainActivity is started.
-        UiObject2 textView = mDevice.wait(
-                Until.findObject(By.res(ID_USER_TEXTVIEW)),
-                TIMEOUT_WAIT_UI);
-        assertNotNull("Failed to start activity in target user", textView);
-        // Look for the text in textview, it should be the serial number of target user.
-        assertEquals("Activity is started in wrong user",
-                String.valueOf(mUserSerialNumber),
-                textView.getText());
-    }
-
-    @Test(expected = SecurityException.class)
-    public void testCannotStartNotExportedActivity() throws Exception {
-        mCrossProfileApps.startMainActivity(
-                NonExportedActivity.getComponentName(mContext), mTargetUser);
-    }
-
-    @Test(expected = SecurityException.class)
-    public void testCannotStartNonMainActivity() throws Exception {
-        mCrossProfileApps.startMainActivity(
-                NonMainActivity.getComponentName(mContext), mTargetUser);
-    }
-
-    @Test(expected = SecurityException.class)
-    public void testCannotStartActivityInOtherPackage() throws Exception {
-        mCrossProfileApps.startMainActivity(new ComponentName(
-                "com.android.cts.launcherapps.simpleapp",
-                "com.android.cts.launcherapps.simpleapp.SimpleActivity"),
-                mTargetUser
-        );
-    }
-
-    @Test
-    public void testGetProfileSwitchingLabel() throws Exception {
-        assertNotNull(mCrossProfileApps.getProfileSwitchingLabel(mTargetUser));
-    }
-
-    @Test
-    public void testGetProfileSwitchingIconDrawable() throws Exception {
-        assertNotNull(mCrossProfileApps.getProfileSwitchingIconDrawable(mTargetUser));
-    }
-
-    // Designed to be called by host-side tests; not a real test.
-    @Test
-    public void testStartMainActivity_noAsserts() {
-        mCrossProfileApps.startMainActivity(
-                MainActivity.getComponentName(mContext), mTargetUser);
-    }
-
-    // Designed to be called by host-side tests; not a real test.
-    @Test
-    public void testGetTargetUserProfiles_noAsserts() {
-        mCrossProfileApps.getTargetUserProfiles();
-    }
-}
-
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileResultCheckerActivity.java b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileResultCheckerActivity.java
deleted file mode 100644
index 49f2d9b..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileResultCheckerActivity.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2020 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.cts.crossprofileappstest;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.CrossProfileApps;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.widget.TextView;
-
-import androidx.annotation.Nullable;
-
-import com.android.compatibility.common.util.ShellIdentityUtils;
-
-/**
- * An activity that launches {@link CrossProfileResultReturnerActivity} for result, then displays
- * the string {@link #SUCCESS_MESSAGE} if successful.
- *
- * <p>Must be launched with intent extra {@link #TARGET_USER_EXTRA} with the numeric target user ID.
- */
-public class CrossProfileResultCheckerActivity extends Activity {
-    static final String SUCCESS_MESSAGE = "Successfully received cross-profile result.";
-    static final String TARGET_USER_EXTRA = "TARGET_USER";
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        final Intent intent = getIntent();
-        if (!intent.hasExtra(TARGET_USER_EXTRA)) {
-            throw new IllegalStateException(
-                    "CrossProfileResultCheckerActivity started without " + TARGET_USER_EXTRA);
-        }
-        setContentView(R.layout.cross_profile_result_checker);
-        final Intent resultReturnerIntent =
-                new Intent().setComponent(
-                        CrossProfileResultReturnerActivity.buildComponentName(this));
-        final UserHandle targetUser = intent.getParcelableExtra(TARGET_USER_EXTRA);
-        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                getSystemService(CrossProfileApps.class),
-                crossProfileApps -> crossProfileApps.startActivity(
-                        resultReturnerIntent, targetUser, this));
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if (resultCode != CrossProfileResultReturnerActivity.RESULT_CODE) {
-            throw new IllegalStateException("Unknown result code: " + resultCode);
-        }
-        final TextView textView = findViewById(R.id.cross_profile_result_checker_result);
-        textView.setText(SUCCESS_MESSAGE);
-    }
-
-    static ComponentName buildComponentName(Context context) {
-        return new ComponentName(context, CrossProfileResultCheckerActivity.class);
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileResultReturnerActivity.java b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileResultReturnerActivity.java
deleted file mode 100644
index 8898e91..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileResultReturnerActivity.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2020 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.cts.crossprofileappstest;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-
-/** An activity that sets the result as {@link #RESULT_CODE} then finishes. */
-public class CrossProfileResultReturnerActivity extends Activity {
-    static final int RESULT_CODE = 998;
-
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        setResult(RESULT_CODE);
-        finish();
-    }
-
-    static ComponentName buildComponentName(Context context) {
-        return new ComponentName(context, CrossProfileResultReturnerActivity.class);
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileSameTaskLauncherActivity.java b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileSameTaskLauncherActivity.java
deleted file mode 100644
index 9d1f209..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/CrossProfileSameTaskLauncherActivity.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2020 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.cts.crossprofileappstest;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.CrossProfileApps;
-import android.os.Bundle;
-import android.os.UserHandle;
-import android.util.Log;
-
-import androidx.annotation.Nullable;
-
-import com.android.compatibility.common.util.ShellIdentityUtils;
-
-/**
- * An activity that launches the {@link NonMainActivity} in a different user within the same task.
- *
- * <p>Logs its task ID with the following format:
- * "CrossProfileSameTaskLauncherActivity#taskId#[taskId]#", where [taskId] is the actual task ID,
- * such as NonMainActivity#taskId#4#.
- */
-public class CrossProfileSameTaskLauncherActivity extends Activity {
-    static final String TARGET_USER_EXTRA = "TARGET_USER";
-
-    private static final String LOG_TAG = "CrossProfileSameTaskChe"; // 23 chars max
-
-    @Override
-    public void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        final Intent intent = getIntent();
-        if (!intent.hasExtra(TARGET_USER_EXTRA)) {
-            throw new IllegalStateException(
-                    "ActivityForwarder started without the extra: " + TARGET_USER_EXTRA);
-        }
-        setContentView(R.layout.cross_profile_same_task_launcher);
-        Log.w(LOG_TAG, "CrossProfileSameTaskLauncherActivity#taskId#" + getTaskId() + "#");
-        final UserHandle targetUser = intent.getParcelableExtra(TARGET_USER_EXTRA);
-        final Intent nonMainActivityIntent = new Intent();
-        nonMainActivityIntent.setComponent(NonMainActivity.getComponentName(this));
-        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                getSystemService(CrossProfileApps.class),
-                crossProfileApps
-                        -> crossProfileApps.startActivity(nonMainActivityIntent, targetUser, this));
-    }
-
-    static ComponentName getComponentName(Context context) {
-        return new ComponentName(context, CrossProfileSameTaskLauncherActivity.class);
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/MainActivity.java b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/MainActivity.java
deleted file mode 100644
index 6baf14d..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/MainActivity.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2017 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.cts.crossprofileappstest;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Process;
-import android.os.UserManager;
-import android.widget.TextView;
-
-import java.lang.Override;
-
-/**
- * A test activity that displays the serial number of the user that it is running into.
- */
-public class MainActivity extends Activity {
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.main);
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        TextView textView = findViewById(R.id.user_textview);
-        textView.setText(Long.toString(getCurrentUserSerialNumber()));
-    }
-
-    public static ComponentName getComponentName(Context context) {
-        return new ComponentName(context, MainActivity.class);
-    }
-
-    private long getCurrentUserSerialNumber() {
-        UserManager userManager = getSystemService(UserManager.class);
-        return userManager.getSerialNumberForUser(Process.myUserHandle());
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/NonExportedActivity.java b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/NonExportedActivity.java
deleted file mode 100644
index 4f83532..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/NonExportedActivity.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (C) 2017 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.cts.crossprofileappstest;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Process;
-import android.os.UserManager;
-import android.widget.TextView;
-
-public class NonExportedActivity extends Activity {
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.non_main);
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        TextView textView = findViewById(R.id.user_textview_nonmain);
-        textView.setText(Long.toString(getCurrentUserSerialNumber()));
-    }
-
-    public static ComponentName getComponentName(Context context ){
-        return new ComponentName(context, NonExportedActivity.class);
-    }
-
-    private long getCurrentUserSerialNumber() {
-        UserManager userManager = getSystemService(UserManager.class);
-        return userManager.getSerialNumberForUser(Process.myUserHandle());
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/NonMainActivity.java b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/NonMainActivity.java
deleted file mode 100644
index 6343607..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsTest/src/com/android/cts/crossprofileappstest/NonMainActivity.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2017 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.cts.crossprofileappstest;
-
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.Process;
-import android.os.UserManager;
-import android.util.Log;
-import android.widget.TextView;
-
-/**
- * An activity that is not the main activity of the application.
- *
- * <p>Logs its task ID with the following format: "NonMainActivity#taskId#[taskId]#", where [taskId]
- * is the actual task ID, such as NonMainActivity#taskId#4#.
- */
-public class NonMainActivity extends Activity {
-    private static final String LOG_TAG = "NonMainActivity";
-
-    @Override
-    public void onCreate(Bundle icicle) {
-        super.onCreate(icicle);
-        setContentView(R.layout.non_main);
-        Log.w(LOG_TAG, "NonMainActivity#taskId#" + getTaskId() + "#");
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        TextView textView = findViewById(R.id.user_textview_nonmain);
-        textView.setText(Long.toString(getCurrentUserSerialNumber()));
-    }
-
-    public static ComponentName getComponentName(Context context) {
-        return new ComponentName(context, NonMainActivity.class);
-    }
-
-    private long getCurrentUserSerialNumber() {
-        UserManager userManager = getSystemService(UserManager.class);
-        return userManager.getSerialNumberForUser(Process.myUserHandle());
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/Android.bp b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/Android.bp
deleted file mode 100644
index c137ad2..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/Android.bp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (C) 2020 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-android_test_helper_app {
-    name: "CtsCrossProfileAppsWithNoPermissionTests",
-    defaults: ["cts_defaults"],
-    srcs: ["src/**/*.java"],
-    libs: ["junit"],
-    static_libs: [
-        "androidx.legacy_legacy-support-v4",
-        "ctstestrunner-axt",
-        "compatibility-device-util-axt",
-        "androidx.test.rules",
-        "truth-prebuilt",
-        "ub-uiautomator",
-    ],
-    min_sdk_version: "21",
-    // tag this module as a cts test artifact
-    test_suites: [
-        "cts",
-        "general-tests",
-        "mts-permission",
-    ],
-}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/AndroidManifest.xml b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/AndroidManifest.xml
deleted file mode 100644
index ad2b078..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/AndroidManifest.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.cts.crossprofilenopermissionappstest">
-
-    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25"/>
-    <application/>
-    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.cts.crossprofilenopermissionappstest"
-                     android:label="Launcher Apps CTS Tests"/>
-</manifest>
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/src/com/android/cts/crossprofilenopermissionappstest/CrossProfileAppsWithNoPermission.java b/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/src/com/android/cts/crossprofilenopermissionappstest/CrossProfileAppsWithNoPermission.java
deleted file mode 100644
index d2cce1b..0000000
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/CrossProfileAppsWithNoPermissionTest/src/com/android/cts/crossprofilenopermissionappstest/CrossProfileAppsWithNoPermission.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2020 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.cts.crossprofilenopermissionappstest;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.content.Context;
-import android.content.pm.CrossProfileApps;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class CrossProfileAppsWithNoPermission {
-    private final Context mContext = InstrumentationRegistry.getContext();
-    private final CrossProfileApps mCrossProfileApps =
-            mContext.getSystemService(CrossProfileApps.class);
-
-    @Test
-    public void testCanRequestInteractAcrossProfiles_permissionNotRequested_returnsFalse() {
-        assertThat(mCrossProfileApps.canRequestInteractAcrossProfiles()).isFalse();
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/CrossProfileTestApps/ModifyQuietModeEnabledApp/OWNERS b/hostsidetests/devicepolicy/app/CrossProfileTestApps/ModifyQuietModeEnabledApp/OWNERS
index 61a60e4..ad51a93 100644
--- a/hostsidetests/devicepolicy/app/CrossProfileTestApps/ModifyQuietModeEnabledApp/OWNERS
+++ b/hostsidetests/devicepolicy/app/CrossProfileTestApps/ModifyQuietModeEnabledApp/OWNERS
@@ -1,3 +1,3 @@
 # Bug component: 168445
 file:platform/frameworks/base:/core/java/android/app/admin/EnterprisePlatform_OWNERS
-pbdr@google.com
\ No newline at end of file
+pbdr@google.com
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml
index 572b40b..c081f95 100644
--- a/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DelegateApp/AndroidManifest.xml
@@ -34,7 +34,13 @@
         </receiver>
         <!--  TODO(b/176993670): remove if DpmWrapper goes away -->
         <receiver android:name="com.android.bedstead.dpmwrapper.IpcBroadcastReceiver"
-             android:exported="true"/>
+             android:exported="true">
+        <!--  TODO(b/213348113, b/213331396) - might need to explicitly set the filter below:
+            <intent-filter>
+               <action android:name="com.android.bedstead.dpmwrapper.action.WRAPPED_MANAGER_CALL"/>
+            </intent-filter>
+         -->
+        </receiver>
         <!--  TODO(b/176993670): remove if DpmWrapper goes away -->
         <receiver android:name="com.android.bedstead.dpmwrapper.TestAppCallbacksReceiver"
              android:exported="true"/>
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/BlockUninstallDelegateTest.java b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/BlockUninstallDelegateTest.java
deleted file mode 100644
index a4dffde..0000000
--- a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/BlockUninstallDelegateTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2017 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.cts.delegate;
-
-import static android.app.admin.DevicePolicyManager.DELEGATION_BLOCK_UNINSTALL;
-
-import static com.android.cts.delegate.DelegateTestUtils.assertExpectException;
-
-import android.app.admin.DevicePolicyManager;
-
-import java.util.List;
-
-/**
- * Test that an app given the {@link DevicePolicyManager#DELEGATION_BLOCK_UNINSTALL} scope via
- * {@link DevicePolicyManager#setDelegatedScopes} can choose packages that are block uninstalled.
- */
-public class BlockUninstallDelegateTest extends BaseJUnit3TestCase {
-
-    private static final String TEST_APP_PKG = "com.android.cts.launcherapps.simpleapp";
-
-    public void testCannotAccessApis() {
-        assertFalse("DelegateApp should not be a block uninstall delegate",
-            amIBlockUninstallDelegate());
-
-        assertExpectException(SecurityException.class,
-                "Calling identity is not authorized", () -> {
-                    mDpm.setUninstallBlocked(null, TEST_APP_PKG, true);
-                });
-    }
-
-    public void testCanAccessApis() {
-        assertTrue("DelegateApp is not a block uninstall delegate",
-            amIBlockUninstallDelegate());
-        try {
-            // Exercise setUninstallBlocked.
-            mDpm.setUninstallBlocked(null, TEST_APP_PKG, true);
-            assertTrue("App not uninstall blocked", mDpm.isUninstallBlocked(null, TEST_APP_PKG));
-        } finally {
-            mDpm.setUninstallBlocked(null, TEST_APP_PKG, false);
-            assertFalse("App still uninstall blocked", mDpm.isUninstallBlocked(null, TEST_APP_PKG));
-        }
-    }
-
-    private boolean amIBlockUninstallDelegate() {
-        final String packageName = getInstrumentation().getContext().getPackageName();
-        final List<String> scopes = mDpm.getDelegatedScopes(null, packageName);
-        return scopes.contains(DELEGATION_BLOCK_UNINSTALL);
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/CertInstallDelegateTest.java b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/CertInstallDelegateTest.java
deleted file mode 100644
index f7238a7..0000000
--- a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/CertInstallDelegateTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2017 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.cts.delegate;
-
-import static android.app.admin.DevicePolicyManager.DELEGATION_CERT_INSTALL;
-
-import static com.android.cts.delegate.DelegateTestUtils.assertExpectException;
-import static com.android.cts.devicepolicy.TestCertificates.TEST_CA;
-import static com.android.cts.devicepolicy.TestCertificates.TEST_CERT;
-import static com.android.cts.devicepolicy.TestCertificates.TEST_KEY;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.ComponentName;
-import android.util.Base64;
-import android.util.Base64InputStream;
-
-import java.io.ByteArrayInputStream;
-import java.security.KeyFactory;
-import java.security.PrivateKey;
-import java.security.cert.Certificate;
-import java.security.cert.CertificateException;
-import java.security.cert.CertificateFactory;
-import java.security.spec.PKCS8EncodedKeySpec;
-import java.util.List;
-
-/**
- * Tests that a package other than the DPC can manage app restrictions if allowed by the DPC
- * via {@link DevicePolicyManager#setApplicationRestrictionsManagingPackage(ComponentName, String)}
- */
-public class CertInstallDelegateTest extends BaseJUnit3TestCase {
-
-    public void testCannotAccessApis() {
-        assertFalse(amICertInstallDelegate());
-
-        assertExpectException(SecurityException.class,
-                "Calling identity is not authorized", () -> {
-                    mDpm.installCaCert(null, null);
-                });
-
-        assertExpectException(SecurityException.class,
-                "Calling identity is not authorized", () -> {
-                    mDpm.removeKeyPair(null, "alias");
-                });
-    }
-
-    public void testCanAccessApis() throws Exception {
-        assertTrue(amICertInstallDelegate());
-
-        byte[] cert = TEST_CA.getBytes();
-
-        // Exercise installCaCert.
-        assertTrue("Certificate installation failed", mDpm.installCaCert(null, cert));
-
-        // Exercise hasCertInstalled.
-        assertTrue("Certificate is not installed properly", mDpm.hasCaCertInstalled(null, cert));
-
-        // Exercise getInstalledCaCerts.
-        assertTrue("Certificate is not among installed certs",
-                containsCertificate(mDpm.getInstalledCaCerts(null), cert));
-
-        // Exercise uninstallCaCert.
-        mDpm.uninstallCaCert(null, cert);
-        assertFalse("Certificate was not uninstalled", mDpm.hasCaCertInstalled(null, cert));
-
-        // Exercise installKeyPair.
-        final String alias = "delegated-cert-installer-test-key";
-        PrivateKey privateKey = KeyFactory.getInstance("RSA").generatePrivate(
-                new PKCS8EncodedKeySpec(Base64.decode(TEST_KEY, Base64.DEFAULT)));
-
-        Certificate certificate = CertificateFactory.getInstance("X.509").generateCertificate(
-                new Base64InputStream(new ByteArrayInputStream(TEST_CERT.getBytes()),
-                    Base64.DEFAULT));
-        assertTrue("Key pair not installed successfully",
-                mDpm.installKeyPair(null, privateKey, certificate, alias));
-
-        // Exercise removeKeyPair.
-        assertTrue("Key pair not removed successfully", mDpm.removeKeyPair(null, alias));
-    }
-
-    private static boolean containsCertificate(List<byte[]> certificates, byte[] toMatch)
-            throws CertificateException {
-        Certificate certificateToMatch = readCertificate(toMatch);
-        for (byte[] certBuffer : certificates) {
-            Certificate cert = readCertificate(certBuffer);
-            if (certificateToMatch.equals(cert)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    private static Certificate readCertificate(byte[] certBuffer) throws CertificateException {
-        final CertificateFactory certFactory = CertificateFactory.getInstance("X.509");
-        return certFactory.generateCertificate(new ByteArrayInputStream(certBuffer));
-    }
-
-    private boolean amICertInstallDelegate() {
-        final String packageName = getInstrumentation().getContext().getPackageName();
-        final List<String> scopes = mDpm.getDelegatedScopes(null, packageName);
-        return scopes.contains(DELEGATION_CERT_INSTALL);
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/EnableSystemAppDelegateTest.java b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/EnableSystemAppDelegateTest.java
deleted file mode 100644
index f8c4225..0000000
--- a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/EnableSystemAppDelegateTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2017 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.cts.delegate;
-
-import static android.app.admin.DevicePolicyManager.DELEGATION_ENABLE_SYSTEM_APP;
-
-import static com.android.cts.delegate.DelegateTestUtils.assertExpectException;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.Intent;
-
-import java.util.List;
-
-/**
- * Test that an app given the {@link DevicePolicyManager#DELEGATION_PERMISSION_GRANT} scope via
- * {@link DevicePolicyManager#setDelegatedScopes} can grant permissions and check permission grant
- * state.
- */
-public class EnableSystemAppDelegateTest extends BaseJUnit3TestCase {
-
-    private static final String TEST_APP_PKG = "com.android.cts.launcherapps.simpleapp";
-
-    public void testCannotAccessApis() {
-        assertFalse("DelegateApp should not be an enable system app delegate",
-            amIEnableSystemAppDelegate());
-
-        // Exercise enableSystemApp(String).
-        assertExpectException(SecurityException.class,
-                "Calling identity is not authorized", () -> {
-                    mDpm.enableSystemApp(null, TEST_APP_PKG);
-                });
-
-        // Exercise enableSystemApp(Intent).
-        assertExpectException(SecurityException.class,
-                "Calling identity is not authorized", () -> {
-                    mDpm.enableSystemApp(null, new Intent().setPackage(TEST_APP_PKG));
-                });
-    }
-
-    public void testCanAccessApis() {
-        assertTrue("DelegateApp is not an enable system app delegate",
-            amIEnableSystemAppDelegate());
-
-        // Exercise enableSystemApp(String).
-        assertExpectException(IllegalArgumentException.class,
-                "Only system apps can be enabled this way", () -> {
-                    mDpm.enableSystemApp(null, TEST_APP_PKG);
-                });
-
-        // Exercise enableSystemApp(Intent).
-        mDpm.enableSystemApp(null, new Intent());
-    }
-
-    private boolean amIEnableSystemAppDelegate() {
-        final String packageName = getInstrumentation().getContext().getPackageName();
-        final List<String> scopes = mDpm.getDelegatedScopes(null, packageName);
-        return scopes.contains(DELEGATION_ENABLE_SYSTEM_APP);
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/GeneralDelegateTest.java b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/GeneralDelegateTest.java
deleted file mode 100644
index b93b884..0000000
--- a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/GeneralDelegateTest.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2017 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.cts.delegate;
-
-import android.app.admin.DevicePolicyManager;
-import android.os.Bundle;
-import android.test.MoreAsserts;
-import android.util.Log;
-
-import androidx.test.InstrumentationRegistry;
-
-import java.util.Arrays;
-import java.util.List;
-
-/**
- * Test general properties of delegate applications that should apply to any delegation scope
- * granted by a device or profile owner via {@link DevicePolicyManager#setDelegatedScopes}.
- */
-public class GeneralDelegateTest extends BaseJUnit3TestCase {
-
-    private static final String TAG = GeneralDelegateTest.class.getSimpleName();
-    private static final String PARAM_SCOPES = "scopes";
-
-    public void testGetsExpectedDelegationScopes() {
-        Bundle arguments = InstrumentationRegistry.getArguments();
-        String[] expectedScopes = arguments.getString(PARAM_SCOPES).split(",");
-        List<String> delegatedScopes = mDpm.getDelegatedScopes(/* admin= */ null,
-                mContext.getPackageName());
-        Log.v(TAG, "delegatedScopes: " + delegatedScopes
-                + " expected: " + Arrays.toString(expectedScopes));
-
-        assertNotNull("Received null scopes", delegatedScopes);
-        MoreAsserts.assertContentsInAnyOrder("Delegated scopes do not match expected scopes",
-                delegatedScopes, expectedScopes);
-    }
-
-    public void testDifferentPackageNameThrowsException() {
-        final String otherPackage = "com.android.cts.launcherapps.simpleapp";
-        try {
-            List<String> delegatedScopes = mDpm.getDelegatedScopes(null, otherPackage);
-            fail("Expected SecurityException not thrown");
-        } catch (SecurityException expected) {
-            MoreAsserts.assertContainsRegex("Caller with uid \\d+ is not " + otherPackage,
-                    expected.getMessage());
-        }
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/NetworkLoggingDelegateTest.java b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/NetworkLoggingDelegateTest.java
deleted file mode 100644
index 72dbd7c..0000000
--- a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/NetworkLoggingDelegateTest.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * 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.cts.delegate;
-
-import static android.app.admin.DeviceAdminReceiver.ACTION_NETWORK_LOGS_AVAILABLE;
-
-import static com.android.cts.delegate.DelegateTestUtils.assertExpectException;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.IntentFilter;
-import android.os.UserManager;
-import android.util.Log;
-
-import com.android.bedstead.dpmwrapper.TestAppHelper;
-import com.android.cts.delegate.DelegateTestUtils.DelegatedLogsReceiver;
-
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.concurrent.CountDownLatch;
-
-/**
- * Tests that a delegate app with DELEGATION_NETWORK_LOGGING is able to control and access
- * network logging.
- */
-public final class NetworkLoggingDelegateTest extends BaseJUnit3TestCase {
-
-    private static final String TAG = "NetworkLoggingDelegateTest";
-
-    private static final String[] URL_LIST = {
-            "example.edu",
-            "ipv6.google.com",
-            "google.co.jp",
-            "google.fr",
-            "google.com.br",
-            "google.com.tr",
-            "google.co.uk",
-            "google.de"
-    };
-
-    // TODO(b/176993670): receiver needed to forward intents from device owner user to current user
-    // on headless system user mode. Might be removed once tests are refactor to use proper IPC.
-    private DelegatedLogsReceiver mReceiver;
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        if (UserManager.isHeadlessSystemUserMode()) {
-            mReceiver = new DelegatedLogsReceiver();
-            TestAppHelper.registerTestCaseReceiver(mContext, mReceiver,
-                    new IntentFilter(ACTION_NETWORK_LOGS_AVAILABLE));
-        }
-
-        DelegatedLogsReceiver.sBatchCountDown = new CountDownLatch(1);
-    }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-
-        if (mReceiver != null) {
-            TestAppHelper.unregisterTestCaseReceiver(mContext, mReceiver);
-        }
-    }
-
-
-    public void testCanAccessApis() throws Throwable {
-        assertThat(mDpm.getDelegatedScopes(null, mContext.getPackageName())).contains(
-                DevicePolicyManager.DELEGATION_NETWORK_LOGGING);
-        testNetworkLogging();
-    }
-
-    public void testCannotAccessApis()throws Exception {
-        assertExpectException(SecurityException.class, null,
-                () -> mDpm.isNetworkLoggingEnabled(null));
-
-        assertExpectException(SecurityException.class, null,
-                () -> mDpm.setNetworkLoggingEnabled(null, true));
-
-        assertExpectException(SecurityException.class, null,
-                () -> mDpm.retrieveNetworkLogs(null, 0));
-    }
-
-    public void testNetworkLogging() throws Throwable {
-        mDpm.setNetworkLoggingEnabled(null, true);
-        assertTrue(mDpm.isNetworkLoggingEnabled(null));
-
-        try {
-            for (final String url : URL_LIST) {
-                connectToWebsite(url);
-            }
-            mDevice.executeShellCommand("dpm force-network-logs");
-
-            DelegateTestUtils.DelegatedLogsReceiver.waitForBroadcast();
-        } finally {
-            mDpm.setNetworkLoggingEnabled(null, false);
-            assertFalse(mDpm.isNetworkLoggingEnabled(null));
-        }
-    }
-
-    private void connectToWebsite(String server) throws Exception {
-        final URL url = new URL("http://" + server);
-        HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
-        try (AutoCloseable ac = () -> urlConnection.disconnect()){
-            urlConnection.setConnectTimeout(2000);
-            urlConnection.setReadTimeout(2000);
-            urlConnection.getResponseCode();
-        } catch (IOException e) {
-            Log.w(TAG, "Failed to connect to " + server, e);
-        }
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/PackageAccessDelegateTest.java b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/PackageAccessDelegateTest.java
deleted file mode 100644
index c996e5f..0000000
--- a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/PackageAccessDelegateTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2017 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.cts.delegate;
-
-import static android.app.admin.DevicePolicyManager.DELEGATION_PACKAGE_ACCESS;
-
-import static com.android.cts.delegate.DelegateTestUtils.assertExpectException;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.pm.PackageManager.NameNotFoundException;
-
-import java.util.List;
-
-/**
- * Test that an app given the {@link DevicePolicyManager#DELEGATION_PACKAGE_ACCESS} scope via
- * {@link DevicePolicyManager#setDelegatedScopes} can manage package hide and suspend status.
- */
-public class PackageAccessDelegateTest extends BaseJUnit3TestCase {
-
-    private static final String TEST_APP_PKG = "com.android.cts.launcherapps.simpleapp";
-
-    public void testCannotAccessApis() throws NameNotFoundException {
-        assertFalse("DelegateApp should not be a package access delegate",
-            amIPackageAccessDelegate());
-
-        // Exercise isApplicationHidden.
-        assertExpectException(SecurityException.class,
-                "Calling identity is not authorized", () -> {
-                    mDpm.isApplicationHidden(null, TEST_APP_PKG);
-                });
-
-        // Exercise setApplicationHidden.
-        assertExpectException(SecurityException.class,
-                "Calling identity is not authorized", () -> {
-                    mDpm.setApplicationHidden(null, TEST_APP_PKG, true /* hide */);
-                });
-
-        // Exercise isPackageSuspended.
-        assertExpectException(SecurityException.class,
-                "Calling identity is not authorized", () -> {
-                    mDpm.isPackageSuspended(null, TEST_APP_PKG);
-                });
-
-        // Exercise setPackagesSuspended.
-        assertExpectException(SecurityException.class,
-                "Calling identity is not authorized", () -> {
-                    mDpm.setPackagesSuspended(null, new String[] {TEST_APP_PKG}, true /* suspend */);
-                });
-    }
-
-    public void testCanAccessApis() throws NameNotFoundException {
-        assertTrue("DelegateApp is not a package access delegate", amIPackageAccessDelegate());
-
-        // Exercise isApplicationHidden.
-        assertFalse("Package should not be hidden", mDpm.isApplicationHidden(null, TEST_APP_PKG));
-
-        // Exercise setApplicationHidden.
-        assertTrue("Package not hidden successfully",
-                mDpm.setApplicationHidden(null, TEST_APP_PKG, true /* hide */));
-        assertTrue("Package should be hidden", mDpm.isApplicationHidden(null, TEST_APP_PKG));
-
-        // Exercise isPackageSuspended.
-        assertFalse("Package should not be suspended", mDpm.isPackageSuspended(null, TEST_APP_PKG));
-
-        // Exercise setPackagesSuspended.
-        String[] suspended = mDpm.setPackagesSuspended(null, new String[] {TEST_APP_PKG},
-                true /* suspend */);
-        assertTrue("Package not suspended successfully", suspended.length == 0);
-        assertTrue("Package should be suspended", mDpm.isPackageSuspended(null, TEST_APP_PKG));
-    }
-
-    private boolean amIPackageAccessDelegate() {
-        final String packageName = getInstrumentation().getContext().getPackageName();
-        final List<String> scopes = mDpm.getDelegatedScopes(null, packageName);
-        return scopes.contains(DELEGATION_PACKAGE_ACCESS);
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/PermissionGrantDelegateTest.java b/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/PermissionGrantDelegateTest.java
deleted file mode 100644
index 9c6ac58..0000000
--- a/hostsidetests/devicepolicy/app/DelegateApp/src/com/android/cts/delegate/PermissionGrantDelegateTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2017 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.cts.delegate;
-
-import static android.app.admin.DevicePolicyManager.DELEGATION_PERMISSION_GRANT;
-import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED;
-import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED;
-import static android.app.admin.DevicePolicyManager.PERMISSION_POLICY_AUTO_DENY;
-import static android.app.admin.DevicePolicyManager.PERMISSION_POLICY_AUTO_GRANT;
-
-import static com.android.cts.delegate.DelegateTestUtils.assertExpectException;
-
-import android.app.admin.DevicePolicyManager;
-
-import java.util.List;
-
-/**
- * Test that an app given the {@link DevicePolicyManager#DELEGATION_PERMISSION_GRANT} scope via
- * {@link DevicePolicyManager#setDelegatedScopes} can grant permissions and check permission grant
- * state.
- */
-public class PermissionGrantDelegateTest extends BaseJUnit3TestCase {
-
-    private static final String TEST_APP_PKG = "com.android.cts.launcherapps.simpleapp";
-    private static final String TEST_PERMISSION = "android.permission.READ_CONTACTS";
-
-    public void testCannotAccessApis() {
-        assertFalse("DelegateApp should not be a permisssion grant delegate",
-            amIPermissionGrantDelegate());
-
-        // Exercise setPermissionPolicy.
-        assertExpectException(SecurityException.class,
-                "Calling identity is not authorized", () -> {
-                    mDpm.setPermissionPolicy(null, PERMISSION_POLICY_AUTO_GRANT);
-                });
-        assertFalse("Permission policy should not have been set",
-                PERMISSION_POLICY_AUTO_GRANT == mDpm.getPermissionPolicy(null));
-
-        // Exercise setPermissionGrantState.
-        assertExpectException(SecurityException.class,
-                "Calling identity is not authorized", () -> {
-                    mDpm.setPermissionGrantState(null, TEST_APP_PKG, TEST_PERMISSION,
-                            PERMISSION_GRANT_STATE_GRANTED);
-                });
-
-        // Exercise getPermissionGrantState.
-        assertExpectException(SecurityException.class,
-                "Calling identity is not authorized", () -> {
-                    mDpm.getPermissionGrantState(null, TEST_APP_PKG, TEST_PERMISSION);
-                });
-    }
-
-    public void testCanAccessApis() {
-        assertTrue("DelegateApp is not a permission grant delegate",
-            amIPermissionGrantDelegate());
-
-        // Exercise setPermissionPolicy.
-        mDpm.setPermissionPolicy(null, PERMISSION_POLICY_AUTO_DENY);
-        assertTrue("Permission policy was not set",
-                PERMISSION_POLICY_AUTO_DENY == mDpm.getPermissionPolicy(null));
-
-        // Exercise setPermissionGrantState.
-        assertTrue("Permission grant state was not set successfully",
-                mDpm.setPermissionGrantState(null, TEST_APP_PKG, TEST_PERMISSION,
-                    PERMISSION_GRANT_STATE_DENIED));
-
-        // Exercise getPermissionGrantState.
-        assertEquals("Permission grant state is not denied", PERMISSION_GRANT_STATE_DENIED,
-                mDpm.getPermissionGrantState(null, TEST_APP_PKG, TEST_PERMISSION));
-    }
-
-    private boolean amIPermissionGrantDelegate() {
-        final String packageName = getInstrumentation().getContext().getPackageName();
-        final List<String> scopes = mDpm.getDelegatedScopes(null, packageName);
-        return scopes.contains(DELEGATION_PERMISSION_GRANT);
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/src/com.android.cts.deviceadmin/DeviceAdminPasswordTest.java b/hostsidetests/devicepolicy/app/DeviceAdmin/src/com.android.cts.deviceadmin/DeviceAdminPasswordTest.java
deleted file mode 100644
index 0f4f22d..0000000
--- a/hostsidetests/devicepolicy/app/DeviceAdmin/src/com.android.cts.deviceadmin/DeviceAdminPasswordTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2016 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.cts.deviceadmin;
-
-import android.os.Build;
-
-/**
- * Tests that:
- * - need to be run as device admin (as opposed to device owner) and
- * - require resetting the password at the end.
- *
- * Note: when adding a new method, make sure to add a corresponding method in
- * BaseDeviceAdminHostSideTest.
- */
-public class DeviceAdminPasswordTest extends BaseDeviceAdminTest {
-
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        assertNotDeviceOwner();
-    }
-
-    public void testResetPasswordDeprecated() {
-        if (getTargetSdkLevel() < Build.VERSION_CODES.N) {
-            assertFalse(dpm.resetPassword("1234", 0));
-        } else {
-            try {
-                dpm.resetPassword("1234", 0);
-                fail("resetPassword() should throw SecurityException");
-            } catch (SecurityException e) { }
-        }
-    }
-
-    private int getTargetSdkLevel() {
-        return mContext.getApplicationContext().getApplicationInfo().targetSdkVersion;
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml
index 472cdbc..e4cb558 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/AndroidManifest.xml
@@ -39,9 +39,6 @@
     <!--  TODO(b/176993670): remove if DpmWrapper goes away -->
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
 
-    <!--  TODO(b/176993670): remove if DpmWrapper goes away -->
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
-
     <!-- Add a network security config that trusts user added CAs for tests -->
     <application android:networkSecurityConfig="@xml/network_security_config"
          android:testOnly="true" android:debuggable="true">
@@ -55,6 +52,8 @@
                  android:resource="@xml/device_admin"/>
             <intent-filter>
                 <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
+                <!--  TODO(b/176993670): remove if DpmWrapperManagerWrapper goes away -->
+                <action android:name="com.android.bedstead.dpmwrapper.action.WRAPPED_MANAGER_CALL"/>
             </intent-filter>
         </receiver>
         <activity android:name="com.android.cts.deviceandprofileowner.ExampleIntentReceivingActivity1"
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/DevicePolicyLoggingTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/DevicePolicyLoggingTest.java
index 22c17a2..88e4452 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/DevicePolicyLoggingTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/DevicePolicyLoggingTest.java
@@ -65,10 +65,6 @@
         mDevicePolicyManager.setRequiredPasswordComplexity(PASSWORD_COMPLEXITY_HIGH);
     }
 
-    public void testLockNowLogged() {
-        mDevicePolicyManager.lockNow(0);
-    }
-
     public void testSetKeyguardDisabledFeaturesLogged() {
         mDevicePolicyManager.setKeyguardDisabledFeatures(
                 ADMIN_RECEIVER_COMPONENT, KEYGUARD_DISABLE_FEATURES_NONE);
@@ -181,11 +177,6 @@
         mDevicePolicyManager.enableSystemApp(ADMIN_RECEIVER_COMPONENT, intent);
     }
 
-    public void testSetUninstallBlockedLogged() {
-        mDevicePolicyManager.setUninstallBlocked(ADMIN_RECEIVER_COMPONENT, PACKAGE_NAME, true);
-        mDevicePolicyManager.setUninstallBlocked(ADMIN_RECEIVER_COMPONENT, PACKAGE_NAME, false);
-    }
-
     public void testSetPreferentialNetworkServiceEnabledLogged() {
         mDevicePolicyManager.setPreferentialNetworkServiceEnabled(true);
         mDevicePolicyManager.setPreferentialNetworkServiceEnabled(false);
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/NearbyAppStreamingPolicyTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/NearbyAppStreamingPolicyTest.java
deleted file mode 100644
index 23de557..0000000
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/NearbyAppStreamingPolicyTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2021 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.cts.deviceandprofileowner;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.admin.DevicePolicyManager;
-
-public class NearbyAppStreamingPolicyTest extends BaseDeviceAdminTest {
-
-    public void testGetNearbyAppStreamingPolicy_getsNearbyStreamingDisabledAsDefault() {
-        assertThat(mDevicePolicyManager.getNearbyAppStreamingPolicy())
-                .isEqualTo(DevicePolicyManager.NEARBY_STREAMING_DISABLED);
-    }
-
-    public void testSetNearbyAppStreamingPolicy_changesPolicy() {
-        mDevicePolicyManager.setNearbyAppStreamingPolicy(
-                DevicePolicyManager.NEARBY_STREAMING_ENABLED);
-
-        assertThat(mDevicePolicyManager.getNearbyAppStreamingPolicy())
-                .isEqualTo(DevicePolicyManager.NEARBY_STREAMING_ENABLED);
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/NearbyNotificationStreamingPolicyTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/NearbyNotificationStreamingPolicyTest.java
deleted file mode 100644
index ae0a26f..0000000
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/NearbyNotificationStreamingPolicyTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2021 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.cts.deviceandprofileowner;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.admin.DevicePolicyManager;
-
-public class NearbyNotificationStreamingPolicyTest extends BaseDeviceAdminTest {
-
-    public void testGetNearbyNotificationStreamingPolicy_getsNearbyStreamingDisabledAsDefault() {
-        assertThat(mDevicePolicyManager.getNearbyNotificationStreamingPolicy())
-                .isEqualTo(DevicePolicyManager.NEARBY_STREAMING_DISABLED);
-    }
-
-    public void testSetNearbyNotificationStreamingPolicy_changesPolicy() {
-        mDevicePolicyManager.setNearbyNotificationStreamingPolicy(
-                DevicePolicyManager.NEARBY_STREAMING_ENABLED);
-
-        assertThat(mDevicePolicyManager.getNearbyNotificationStreamingPolicy())
-                .isEqualTo(DevicePolicyManager.NEARBY_STREAMING_ENABLED);
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ResetPasswordTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ResetPasswordTest.java
deleted file mode 100644
index c660309..0000000
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/ResetPasswordTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (C) 2016 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.cts.deviceandprofileowner;
-
-import android.os.Build;
-
-
-/**
- * Test cases for {@link android.app.admin.DevicePolicyManager#resetPassword(String, int)}.
- *
- * As of R, resetPassword is fully deprecated: DPCs targeting Sdk level O or above will continue
- * to receive a SecurityException when calling this, while DPC targeting N or below will just get
- * a silent failure of API returning {@code false}. This class tests these two negative cases.
- *
- */
-public class ResetPasswordTest extends BaseDeviceAdminTest {
-
-    public void testResetPasswordDeprecated() {
-        waitUntilUserUnlocked();
-
-        if (getTargetSdkLevel() >= Build.VERSION_CODES.O) {
-            try {
-                mDevicePolicyManager.resetPassword("1234", 0);
-                fail("resetPassword() should throw SecurityException");
-            } catch (SecurityException e) { }
-
-        } else {
-            assertFalse(mDevicePolicyManager.resetPassword("1234", 0));
-        }
-    }
-
-    private int getTargetSdkLevel() {
-        return mContext.getApplicationContext().getApplicationInfo().targetSdkVersion;
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/SecurityLoggingTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/SecurityLoggingTest.java
index d8fd8df..3bcf6f3 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/SecurityLoggingTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/SecurityLoggingTest.java
@@ -15,8 +15,12 @@
  */
 package com.android.cts.deviceandprofileowner;
 
+import static android.app.KeyguardManager.PIN;
 import static android.app.admin.DevicePolicyManager.KEYGUARD_DISABLE_FINGERPRINT;
 import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_HIGH;
+import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_LOW;
+import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_MEDIUM;
+import static android.app.admin.DevicePolicyManager.PASSWORD_COMPLEXITY_NONE;
 import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_COMPLEX;
 import static android.app.admin.SecurityLog.LEVEL_ERROR;
 import static android.app.admin.SecurityLog.LEVEL_INFO;
@@ -46,6 +50,7 @@
 import static android.app.admin.SecurityLog.TAG_MEDIA_UNMOUNT;
 import static android.app.admin.SecurityLog.TAG_OS_SHUTDOWN;
 import static android.app.admin.SecurityLog.TAG_OS_STARTUP;
+import static android.app.admin.SecurityLog.TAG_PASSWORD_CHANGED;
 import static android.app.admin.SecurityLog.TAG_PASSWORD_COMPLEXITY_REQUIRED;
 import static android.app.admin.SecurityLog.TAG_PASSWORD_COMPLEXITY_SET;
 import static android.app.admin.SecurityLog.TAG_PASSWORD_EXPIRATION_SET;
@@ -57,12 +62,14 @@
 import static android.app.admin.SecurityLog.TAG_USER_RESTRICTION_REMOVED;
 import static android.app.admin.SecurityLog.TAG_WIPE_FAILURE;
 
+import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
 import static com.android.cts.devicepolicy.TestCertificates.TEST_CA;
 import static com.android.cts.devicepolicy.TestCertificates.TEST_CA_SUBJECT;
 
 import static com.google.common.collect.ImmutableList.of;
 import static com.google.common.truth.Truth.assertThat;
 
+import android.app.KeyguardManager;
 import android.app.admin.DevicePolicyManager;
 import android.app.admin.SecurityLog;
 import android.app.admin.SecurityLog.SecurityEvent;
@@ -153,6 +160,7 @@
                     .put(TAG_CERT_VALIDATION_FAILURE, of(S))
                     .put(TAG_CAMERA_POLICY_SET, of(S, I, I, I))
                     .put(TAG_PASSWORD_COMPLEXITY_REQUIRED, of(S, I, I, I))
+                    .put(TAG_PASSWORD_CHANGED, of(I, I))
                     .build();
 
     private static final String GENERATED_KEY_ALIAS = "generated_key_alias";
@@ -232,6 +240,7 @@
         verifyKeystoreEventsPresent(events);
         verifyKeyChainEventsPresent(events);
         verifyAdminEventsPresent(events);
+        verifyPasswordChangedEventsPresent(events);
         verifyAdbShellCommand(events); // Event generated from host side logic
         if (mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile()) {
             verifyEventsRedacted(events);
@@ -270,6 +279,30 @@
         verifyUserRestrictionEventsPresent(events);
         verifyCameraPolicyEvents(events);
     }
+
+    private void verifyPasswordChangedEventsPresent(List<SecurityEvent> events) {
+        if (!mHasSecureLockScreen) {
+            return;
+        }
+        final int userId = Process.myUserHandle().getIdentifier();
+        findEvent("set low complexity password", events,
+                e -> e.getTag() == TAG_PASSWORD_CHANGED
+                        && getInt(e, 0) == PASSWORD_COMPLEXITY_LOW
+                        && getInt(e, 1) == userId);
+        findEvent("set medium complexity password", events,
+                e -> e.getTag() == TAG_PASSWORD_CHANGED
+                        && getInt(e, 0) == PASSWORD_COMPLEXITY_MEDIUM
+                        && getInt(e, 1) == userId);
+        findEvent("set high complexity password", events,
+                e -> e.getTag() == TAG_PASSWORD_CHANGED
+                        && getInt(e, 0) == PASSWORD_COMPLEXITY_HIGH
+                        && getInt(e, 1) == userId);
+        findEvent("set none complexity password", events,
+                e -> e.getTag() == TAG_PASSWORD_CHANGED
+                        && getInt(e, 0) == PASSWORD_COMPLEXITY_NONE
+                        && getInt(e, 1) == userId);
+    }
+
     private void verifyAdbShellCommand(List<SecurityEvent> events) {
         // Won't be able to locate the command on org-owned devices, as it will be redacted.
         if (!mDevicePolicyManager.isOrganizationOwnedDeviceWithManagedProfile()) {
@@ -300,6 +333,9 @@
                 case TAG_KEY_INTEGRITY_VIOLATION:
                     assertEquals(userId, UserHandle.getUserId(getInt(event, 1)));
                     break;
+                case TAG_PASSWORD_CHANGED:
+                    assertEquals(userId, getInt(event, 1));
+                    break;
             }
         }
     }
@@ -311,6 +347,7 @@
         generateKeystoreEvents();
         generateKeyChainEvents();
         generateAdminEvents();
+        generatePasswordChangedEvents();
     }
 
     private void generateKeyChainEvents() {
@@ -335,6 +372,18 @@
         generateCameraPolicyEvents();
     }
 
+    private void generatePasswordChangedEvents() {
+        if (!mHasSecureLockScreen) {
+            return;
+        }
+        KeyguardManager km = mContext.getSystemService(KeyguardManager.class);
+        runWithShellPermissionIdentity(() -> {
+            km.setLock(PIN, "1111".getBytes(), PIN, null);
+            km.setLock(PIN, "1914".getBytes(), PIN, "1111".getBytes());
+            km.setLock(PIN, "83651865".getBytes(), PIN, "1914".getBytes());
+            km.setLock(PIN, null, PIN, "83651865".getBytes());
+        });
+    }
     /**
      * Fetches and checks the events.
      */
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/BaseUserRestrictionsTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/BaseUserRestrictionsTest.java
index 54bd5d4..621a15d 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/BaseUserRestrictionsTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/BaseUserRestrictionsTest.java
@@ -73,6 +73,11 @@
             UserManager.DISALLOW_BLUETOOTH_SHARING,
             UserManager.DISALLOW_CAMERA_TOGGLE,
             UserManager.DISALLOW_MICROPHONE_TOGGLE,
+            UserManager.DISALLOW_CHANGE_WIFI_STATE,
+            UserManager.DISALLOW_WIFI_TETHERING,
+            UserManager.DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI,
+            UserManager.DISALLOW_WIFI_DIRECT,
+            UserManager.DISALLOW_ADD_WIFI_CONFIG
     };
 
     /**
@@ -96,6 +101,10 @@
             // UserManager.DISALLOW_DATA_ROAMING, // Not set during CTS
             UserManager.DISALLOW_CAMERA_TOGGLE,
             UserManager.DISALLOW_MICROPHONE_TOGGLE,
+            UserManager.DISALLOW_CHANGE_WIFI_STATE,
+            UserManager.DISALLOW_WIFI_TETHERING,
+            UserManager.DISALLOW_WIFI_DIRECT,
+            UserManager.DISALLOW_ADD_WIFI_CONFIG,
 
             // PO can set them too, but when DO sets them, they're global.
             UserManager.DISALLOW_ADJUST_VOLUME,
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/DeviceOwnerUserRestrictionsTest.java b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/DeviceOwnerUserRestrictionsTest.java
index 93b6817..1c672df 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/DeviceOwnerUserRestrictionsTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/src/com/android/cts/deviceandprofileowner/userrestrictions/DeviceOwnerUserRestrictionsTest.java
@@ -63,6 +63,11 @@
             UserManager.DISALLOW_UNIFIED_PASSWORD,
             UserManager.DISALLOW_CAMERA_TOGGLE,
             UserManager.DISALLOW_MICROPHONE_TOGGLE,
+            UserManager.DISALLOW_CHANGE_WIFI_STATE,
+            UserManager.DISALLOW_WIFI_TETHERING,
+            UserManager.DISALLOW_SHARING_ADMIN_CONFIGURED_WIFI,
+            UserManager.DISALLOW_WIFI_DIRECT,
+            UserManager.DISALLOW_ADD_WIFI_CONFIG
     };
 
     public static final String[] DISALLOWED = new String[] {
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/AndroidManifest.xml b/hostsidetests/devicepolicy/app/DeviceOwner/AndroidManifest.xml
index 3863d90..f30d29e 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/AndroidManifest.xml
@@ -38,7 +38,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
 
-    <application android:testOnly="true"
+    <application android:testOnly="true" android:debuggable="true"
          android:usesCleartextTraffic="true">&gt;
 
         <uses-library android:name="android.test.runner"/>
@@ -49,6 +49,8 @@
                  android:resource="@xml/device_admin"/>
             <intent-filter>
                 <action android:name="android.app.action.DEVICE_ADMIN_ENABLED"/>
+                <!--  TODO(b/176993670): remove WRAPPED_MANAGER_CALL if DpmWrapper goes away -->
+                <action android:name="com.android.bedstead.dpmwrapper.action.WRAPPED_MANAGER_CALL"/>
             </intent-filter>
         </receiver>
         <receiver android:name="com.android.cts.deviceowner.CreateAndManageUserTest$SecondaryUserAdminReceiver"
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BackupServicePoliciesTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BackupServicePoliciesTest.java
deleted file mode 100644
index 292d3c3..0000000
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BackupServicePoliciesTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.cts.deviceowner;
-
-public class BackupServicePoliciesTest extends BaseDeviceOwnerTest {
-
-    /**
-     * Test: Test enabling backup service. This test should be executed after installing a device
-     * owner so that we check that backup service is not enabled by default.
-     * This test will keep backup service disabled after its execution.
-     */
-    public void testEnablingAndDisablingBackupService() {
-        assertFalse(mDevicePolicyManager.isBackupServiceEnabled(getWho()));
-        mDevicePolicyManager.setBackupServiceEnabled(getWho(), true);
-        assertTrue(mDevicePolicyManager.isBackupServiceEnabled(getWho()));
-        mDevicePolicyManager.setBackupServiceEnabled(getWho(), false);
-        assertFalse(mDevicePolicyManager.isBackupServiceEnabled(getWho()));
-    }
-
-}
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BaseDeviceOwnerTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BaseDeviceOwnerTest.java
index acbfb08..299b499 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BaseDeviceOwnerTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/BaseDeviceOwnerTest.java
@@ -119,7 +119,9 @@
     }
 
     protected final UserHandle getCurrentUser() {
-        return UserHandle.of(ActivityManager.getCurrentUser());
+        UserHandle currentUser = UserHandle.of(ActivityManager.getCurrentUser());
+        Log.v(TAG, "getCurrentUser(): returning " + currentUser);
+        return currentUser;
     }
 
     protected final List<WifiConfiguration> getConfiguredNetworks() {
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/CreateAndManageUserTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/CreateAndManageUserTest.java
index 4f98568..66bbef0 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/CreateAndManageUserTest.java
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/CreateAndManageUserTest.java
@@ -16,6 +16,8 @@
 
 package com.android.cts.deviceowner;
 
+import static android.os.UserManager.USER_OPERATION_SUCCESS;
+
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.testng.Assert.expectThrows;
@@ -29,6 +31,7 @@
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.IBinder;
 import android.os.PersistableBundle;
 import android.os.RemoteException;
@@ -170,7 +173,7 @@
                 BasicAdminReceiver.ACTION_USER_STOPPED, BasicAdminReceiver.ACTION_USER_REMOVED);
 
         callback.runAndUnregisterSelf(
-                () -> stopUserAndCheckResult(userHandle, UserManager.USER_OPERATION_SUCCESS));
+                () -> stopUserAndCheckResult(userHandle, USER_OPERATION_SUCCESS));
 
         // It's running just one operation (which issues a ACTION_USER_STOPPED), but as the
         // user is ephemeral, it will be automatically removed (which issues a
@@ -182,13 +185,28 @@
     @SuppressWarnings("unused")
     private static void logoutUser(Context context, DevicePolicyManager devicePolicyManager,
             ComponentName componentName) {
-        Log.d(TAG, "calling logutUser() on user " + context.getUserId());
+        Log.d(TAG, "calling logoutUser() on user " + context.getUserId());
         int result = devicePolicyManager.logoutUser(componentName);
-        Log.d(TAG, "result: " + result);
-        assertUserOperationResult(result, UserManager.USER_OPERATION_SUCCESS, "cannot logout user");
+        Log.d(TAG, "result: " + userOperationResultToString(result));
+        assertUserOperationResult(result, USER_OPERATION_SUCCESS, "cannot logout user");
+    }
+
+    private void clearLogoutUserIfNecessary() throws Exception {
+        UserHandle userHandle = mDevicePolicyManager.getLogoutUser();
+        Log.d(TAG, "clearLogoutUserIfNecessary(): logoutUser=" + userHandle);
+        if (userHandle == null) {
+            Log.d(TAG, "clearLogoutUserIfNecessary(): Saul Goodman!");
+            return;
+        }
+        Log.w(TAG, "test started with a logout user (" + userHandle + "); logging out");
+        int result = SystemUtil
+                .callWithShellPermissionIdentity(() -> mDevicePolicyManager.logoutUser());
+        Log.d(TAG, "Result: " + userOperationResultToString(result));
     }
 
     public void testCreateAndManageUser_LogoutUser() throws Exception {
+        clearLogoutUserIfNecessary();
+
         UserActionCallback callback = UserActionCallback.getCallbackForBroadcastActions(
                 getContext(),
                 BasicAdminReceiver.ACTION_USER_STARTED, BasicAdminReceiver.ACTION_USER_STOPPED);
@@ -196,11 +214,39 @@
         UserHandle userHandle = runCrossUserVerification(callback,
                 /* createAndManageUserFlags= */ 0, "logoutUser", /* currentUserPackages= */ null);
 
-        assertWithMessage("user on broadcasts").that(callback.getUsersOnReceivedBroadcasts())
-                .containsExactly(userHandle, userHandle);
+        List<UserHandle> users = callback.getUsersOnReceivedBroadcasts();
+        Log.d(TAG, "users on brodcast: " + users);
+        assertWithMessage("users on broadcast").that(users).containsExactly(userHandle, userHandle);
+        assertWithMessage("final logout user").that(mDevicePolicyManager.getLogoutUser())
+                .isNull();
+    }
+
+    public void testCreateAndManageUser_LogoutUser_systemApi() throws Exception {
+        clearLogoutUserIfNecessary();
+
+        UserHandle currentUser = getCurrentUser();
+        UserHandle newUser = createAndManageUser();
+        List<UserHandle> usersOnBroadcasts = switchUserAndWaitForBroadcasts(newUser);
+        Log.d(TAG, "users on switch broadcast: " + usersOnBroadcasts);
+        assertWithMessage("user on broadcasts").that(usersOnBroadcasts).containsExactly(newUser,
+                newUser);
+        assertWithMessage("logout user after switch").that(mDevicePolicyManager.getLogoutUser())
+                .isEqualTo(currentUser);
+
+        List<UserHandle> users = logoutUserUsingSystemApiAndWaitForBroadcasts();
+        Log.d(TAG, "users on logout broadcast: " + users);
+        assertWithMessage("users on broadcast").that(users).containsExactly(currentUser);
+        assertWithMessage("final logout user").that(mDevicePolicyManager.getLogoutUser())
+                .isNull();
     }
 
     public void testCreateAndManageUser_newUserDisclaimer() throws Exception {
+        if (Build.IS_USER) {
+            Log.i(TAG, "Skipping testCreateAndManageUser_newUserDisclaimer on user build");
+            // TODO(b/220386262): STOPSHIP re-enable once fixed and/or migrated to new testing infra
+            return;
+        }
+
         // First check that the current user doesn't need it
         UserHandle currentUser = getCurrentUser();
         Log.d(TAG, "Checking if current user (" + currentUser + ") is acked");
@@ -352,6 +398,7 @@
         return runCrossUserVerification(callback, createAndManageUserFlags, methodName,
                 /* switchUser= */ false, currentUserPackages);
     }
+
     private UserHandle runCrossUserVerificationSwitchingUser(String methodName) throws Exception {
         return runCrossUserVerification(/* callback= */ null, /* createAndManageUserFlags= */ 0,
                 methodName, /* switchUser= */ true, /* currentUserPackages= */ null);
@@ -460,13 +507,36 @@
                 BasicAdminReceiver.ACTION_USER_STARTED, BasicAdminReceiver.ACTION_USER_SWITCHED);
 
         callback.runAndUnregisterSelf(() -> {
+            Log.d(TAG, "Calling switchUser() on callback");
             boolean switched = mDevicePolicyManager.switchUser(getWho(), userHandle);
+            Log.d(TAG, "Switched: " + switched);
             assertWithMessage("switched to user %s", userHandle).that(switched).isTrue();
         });
         return callback.getUsersOnReceivedBroadcasts();
     }
 
     /**
+     * Logouts the current user using {@link DevicePolicyManager#logoutUser()}, or fails if the
+     * user could not be logged out or if the expected broadcasts were not received in time.
+     *
+     * @return users received in the broadcasts
+     */
+    private List<UserHandle> logoutUserUsingSystemApiAndWaitForBroadcasts()
+            throws Exception {
+        UserActionCallback callback = UserActionCallback.getCallbackForBroadcastActions(
+                getContext(), BasicAdminReceiver.ACTION_USER_SWITCHED);
+        Log.d(TAG, "Logging out current user (" + getCurrentUser() + ") using system API");
+
+        callback.runAndUnregisterSelf(() -> {
+            int result = SystemUtil
+                    .callWithShellPermissionIdentity(() -> mDevicePolicyManager.logoutUser());
+            Log.d(TAG, "Result: " + userOperationResultToString(result));
+            assertUserOperationResult(result, USER_OPERATION_SUCCESS, "logout user");
+        });
+        return callback.getUsersOnReceivedBroadcasts();
+    }
+
+    /**
      * Removes the given user, or fails if the user could not be removed or if the expected
      * broadcasts were not received in time.
      *
@@ -519,8 +589,8 @@
 
     private List<UserHandle> startUserInBackgroundAndWaitForBroadcasts(UserActionCallback callback,
             UserHandle userHandle) throws Exception {
-        callback.runAndUnregisterSelf(() -> startUserInBackgroundAndCheckResult(userHandle,
-                UserManager.USER_OPERATION_SUCCESS));
+        callback.runAndUnregisterSelf(
+                () -> startUserInBackgroundAndCheckResult(userHandle, USER_OPERATION_SUCCESS));
         return callback.getUsersOnReceivedBroadcasts();
     }
 
@@ -539,7 +609,7 @@
         UserActionCallback callback = UserActionCallback.getCallbackForBroadcastActions(
                 getContext(), BasicAdminReceiver.ACTION_USER_STOPPED);
         callback.runAndUnregisterSelf(
-                () -> stopUserAndCheckResult(userHandle, UserManager.USER_OPERATION_SUCCESS));
+                () -> stopUserAndCheckResult(userHandle, USER_OPERATION_SUCCESS));
         return callback.getUsersOnReceivedBroadcasts();
     }
 
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/DeviceOwnerSetupTest.java b/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/DeviceOwnerSetupTest.java
deleted file mode 100644
index e6441ef..0000000
--- a/hostsidetests/devicepolicy/app/DeviceOwner/src/com/android/cts/deviceowner/DeviceOwnerSetupTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2014 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.cts.deviceowner;
-
-
-public class DeviceOwnerSetupTest extends BaseDeviceOwnerTest {
-
-    // This test verifies that the setup assertions are working to verify
-    // we are the device owner and have a valid active admin.
-    public void testEmptyTest() {
-    }
-
-}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp b/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
index df56c4d..376b76b 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/Android.bp
@@ -35,6 +35,7 @@
         "testng",
         "androidx.legacy_legacy-support-v4",
         "devicepolicy-deviceside-common",
+        "permission-test-util-lib",
     ],
     min_sdk_version: "27",
     // tag this module as a cts test artifact
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml b/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml
index 3b8b877..0a049c9 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/AndroidManifest.xml
@@ -42,6 +42,7 @@
     <uses-permission android:name="android.permission.WRITE_CALENDAR"/>
     <uses-permission android:name="android.permission.REQUEST_PASSWORD_COMPLEXITY"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application android:largeHeap="true"
                  android:testOnly="true">
@@ -205,6 +206,7 @@
             <intent-filter>
                 <action android:name="com.android.cts.managedprofile.WIPE_DATA"/>
                 <action android:name="com.android.cts.managedprofile.WIPE_DATA_WITH_REASON"/>
+                <action android:name="com.android.cts.managedprofile.WIPE_DATA_WITHOUT_REASON"/>
             </intent-filter>
         </receiver>
 
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BluetoothSharingRestrictionTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BluetoothSharingRestrictionTest.java
index 3270ef2..06f5cb8 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BluetoothSharingRestrictionTest.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BluetoothSharingRestrictionTest.java
@@ -44,7 +44,7 @@
     private static final int POLL_TIME_MS = 400;
     /** Activity that handles Bluetooth sharing. */
     private static final ComponentName OPP_LAUNCHER_COMPONENT = new ComponentName(
-            "com.android.bluetooth", "com.android.bluetooth.opp.BluetoothOppLauncherActivity");
+            "com.android.bluetooth.services", "com.android.bluetooth.opp.BluetoothOppLauncherActivity");
 
     /**
      * Tests that Bluetooth sharing activity gets disabled when the restriction is enforced.
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BluetoothTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BluetoothTest.java
deleted file mode 100644
index 322bf71..0000000
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/BluetoothTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
- * Copyright (C) 2014 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.cts.managedprofile;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.BluetoothDevice;
-import android.bluetooth.BluetoothServerSocket;
-import android.content.Intent;
-import android.test.AndroidTestCase;
-
-import com.android.compatibility.common.util.BlockingBroadcastReceiver;
-
-import java.io.IOException;
-import java.util.UUID;
-
-/**
- * Test that the basic bluetooth API is callable in managed profiles.
- * These tests should only be executed if the device supports bluetooth,
- * i.e. if it has the {@link android.content.pm.PackageManager#FEATURE_BLUETOOTH} feature.
- *
- * This includes tests for the {@link BluetoothAdapter}.
- * The corresponding CTS tests in the primary profile are in
- * {@link android.bluetooth.cts.BasicAdapterTest}.
- * TODO: Merge the primary and managed profile tests into one.
- */
-public class BluetoothTest extends AndroidTestCase {
-    private BluetoothAdapter mAdapter;
-    private boolean mBtWasEnabled;
-
-    public void setUp() throws Exception {
-        super.setUp();
-        mAdapter = BluetoothAdapter.getDefaultAdapter();
-        assertNotNull(mAdapter);
-        mBtWasEnabled = mAdapter.isEnabled();
-    }
-
-    public void tearDown() throws Exception {
-        if (mBtWasEnabled != mAdapter.isEnabled()) {
-            if (mBtWasEnabled) {
-                enable();
-            } else {
-                disable();
-            }
-        }
-        super.tearDown();
-    }
-
-    /**
-     * Checks enable(), disable(), getState(), isEnabled()
-     */
-    public void testEnableDisable() {
-        disable();
-        enable();
-    }
-
-    /**
-     * Test the getAddress() function.
-     */
-    public void testGetAddress() {
-        assertTrue(BluetoothAdapter.checkBluetoothAddress(mAdapter.getAddress()));
-    }
-
-    /**
-     * Tests the listenUsingRfcommWithServiceRecord function.
-     */
-    public void testListenUsingRfcommWithServiceRecord() throws IOException {
-        enable();
-        BluetoothServerSocket socket = mAdapter.listenUsingRfcommWithServiceRecord(
-                "test", UUID.randomUUID());
-        assertNotNull(socket);
-        socket.close();
-    }
-
-    /**
-     * Test the getRemoteDevice() function.
-     */
-    public void testGetRemoteDevice() {
-        // getRemoteDevice() should work even with Bluetooth disabled
-        disable();
-
-        // test bad addresses
-        try {
-            mAdapter.getRemoteDevice((String)null);
-            fail("IllegalArgumentException not thrown");
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-            mAdapter.getRemoteDevice("00:00:00:00:00:00:00:00");
-            fail("IllegalArgumentException not thrown");
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-            mAdapter.getRemoteDevice((byte[])null);
-            fail("IllegalArgumentException not thrown");
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-            mAdapter.getRemoteDevice(new byte[] {0x00, 0x00, 0x00, 0x00, 0x00});
-            fail("IllegalArgumentException not thrown");
-        } catch (IllegalArgumentException e) {
-        }
-
-        // test success
-        BluetoothDevice device = mAdapter.getRemoteDevice("00:11:22:AA:BB:CC");
-        assertNotNull(device);
-        assertEquals("00:11:22:AA:BB:CC", device.getAddress());
-        device = mAdapter.getRemoteDevice(
-                new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06});
-        assertNotNull(device);
-        assertEquals("01:02:03:04:05:06", device.getAddress());
-    }
-
-    /**
-     * Helper to turn BT off.
-     * This method will either fail on an assert, or return with BT turned off.
-     * Behavior of getState() and isEnabled() are validated along the way.
-     */
-    private void disable() {
-        if (mAdapter.getState() == BluetoothAdapter.STATE_OFF) {
-            assertFalse(mAdapter.isEnabled());
-            return;
-        }
-
-        assertThat(mAdapter.getState()).isEqualTo(BluetoothAdapter.STATE_ON);
-        assertThat(mAdapter.isEnabled()).isTrue();
-        assertThat(mAdapter.disable()).isTrue();
-        try (BlockingBroadcastReceiver r = new BlockingBroadcastReceiver(
-                mContext,
-                BluetoothAdapter.ACTION_STATE_CHANGED,
-                this::isStateDisabled).register()) {
-            assertThat(mAdapter.disable()).isTrue();
-        }
-        assertThat(mAdapter.isEnabled()).isFalse();
-    }
-
-    /**
-     * Helper to turn BT on.
-     * This method will either fail on an assert, or return with BT turned on.
-     * Behavior of getState() and isEnabled() are validated along the way.
-     */
-    private void enable() {
-        if (mAdapter.getState() == BluetoothAdapter.STATE_ON) {
-            assertTrue(mAdapter.isEnabled());
-            return;
-        }
-
-        assertThat(mAdapter.getState()).isEqualTo(BluetoothAdapter.STATE_OFF);
-        assertThat(mAdapter.isEnabled()).isFalse();
-        try (BlockingBroadcastReceiver r = new BlockingBroadcastReceiver(
-                mContext,
-                BluetoothAdapter.ACTION_STATE_CHANGED,
-                this::isStateEnabled).register()) {
-            assertThat(mAdapter.enable()).isTrue();
-        }
-        assertThat(mAdapter.isEnabled()).isTrue();
-    }
-
-    private boolean isStateEnabled(Intent intent) {
-        return intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1)
-                == BluetoothAdapter.STATE_ON;
-    }
-
-    private boolean isStateDisabled(Intent intent) {
-        return intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1)
-                == BluetoothAdapter.STATE_OFF;
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/DevicePolicyManagerParentSupportTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/DevicePolicyManagerParentSupportTest.java
index c24d01c..533b322 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/DevicePolicyManagerParentSupportTest.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/DevicePolicyManagerParentSupportTest.java
@@ -177,11 +177,6 @@
         assertThat(actualMaximumTimeToLock).isEqualTo(maximumTimeToLock);
     }
 
-    public void testLockNow_onParent_isSupported() {
-        mParentDevicePolicyManager.lockNow();
-        // Will fail if a SecurityException is thrown.
-    }
-
     public void testSetAndGetKeyguardDisabledFeatures_onParent() {
         mParentDevicePolicyManager.setKeyguardDisabledFeatures(
                 ADMIN_RECEIVER_COMPONENT, KEYGUARD_DISABLE_TRUST_AGENTS);
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/NotificationListenerTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/NotificationListenerTest.java
index b53bd03..352fb57 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/NotificationListenerTest.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/NotificationListenerTest.java
@@ -15,6 +15,8 @@
  */
 package com.android.cts.managedprofile;
 
+import static android.Manifest.permission.POST_NOTIFICATIONS;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import android.app.admin.DevicePolicyManager;
@@ -24,6 +26,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.permission.cts.PermissionUtils;
 import android.support.test.uiautomator.UiDevice;
 import android.util.Log;
 
@@ -53,8 +56,8 @@
 
     private static final String PARAM_PROFILE_ID = "profile-id";
 
-    static final String SENDER_COMPONENT =
-            "com.android.cts.managedprofiletests.notificationsender/.SendNotification";
+    static final String SENDER_PACKAGE = "com.android.cts.managedprofiletests.notificationsender";
+    static final String SENDER_COMPONENT = SENDER_PACKAGE + "/.SendNotification";
 
     private final LocalBroadcastReceiver mReceiver = new LocalBroadcastReceiver();
     private Context mContext;
@@ -68,6 +71,8 @@
         mDpm = mContext.getSystemService(DevicePolicyManager.class);
         mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
         mProfileUserId = getParam(InstrumentationRegistry.getArguments(), PARAM_PROFILE_ID);
+        PermissionUtils.grantPermission(SENDER_PACKAGE, POST_NOTIFICATIONS);
+        grantProfileNotificationPermission();
         IntentFilter filter = new IntentFilter();
         filter.addAction(ACTION_NOTIFICATION_POSTED);
         filter.addAction(ACTION_NOTIFICATION_REMOVED);
@@ -77,6 +82,8 @@
 
     @After
     public void tearDown() throws Exception {
+        PermissionUtils.revokePermission(SENDER_PACKAGE, POST_NOTIFICATIONS);
+        revokeProfileNotificationPermission();
         LocalBroadcastManager.getInstance(mContext).unregisterReceiver(mReceiver);
         toggleNotificationListener(false);
     }
@@ -149,6 +156,17 @@
         assertThat(actualPackageList).isEqualTo(packageList);
     }
 
+    private void grantProfileNotificationPermission() throws IOException {
+        mDevice.executeShellCommand("pm grant --user " + mProfileUserId + " " + SENDER_PACKAGE
+                    + " " + POST_NOTIFICATIONS);
+    }
+
+    private void revokeProfileNotificationPermission() throws IOException {
+        mDevice.executeShellCommand(
+                    "pm revoke --user " + mProfileUserId + " " + SENDER_PACKAGE + " "
+                            + POST_NOTIFICATIONS);
+    }
+
     private void cancelProfileNotification() throws IOException {
         mDevice.executeShellCommand(
                 "am start --user " + mProfileUserId + " -a CANCEL_NOTIFICATION -n "
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ParentProfileTest.java b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ParentProfileTest.java
index 6dca4ad..319a138 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ParentProfileTest.java
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/src/com/android/cts/managedprofile/ParentProfileTest.java
@@ -102,6 +102,8 @@
             .add("setDefaultSmsApplication")
             .add("getPermittedInputMethods")
             .add("setPermittedInputMethods")
+            .add("getDevicePolicyManagementRoleHolderPackage")
+            .add("getResources")
             .build();
 
     private static final String LOG_TAG = "ParentProfileTest";
diff --git a/hostsidetests/devicepolicy/app/NotificationSender/AndroidManifest.xml b/hostsidetests/devicepolicy/app/NotificationSender/AndroidManifest.xml
index 0f5ac6d..4417c5e 100644
--- a/hostsidetests/devicepolicy/app/NotificationSender/AndroidManifest.xml
+++ b/hostsidetests/devicepolicy/app/NotificationSender/AndroidManifest.xml
@@ -18,6 +18,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.cts.managedprofiletests.notificationsender">
 
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+
     <application>
       <activity android:name=".SendNotification"
                 android:exported="true">
diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/BackupServicePoliciesTest.java b/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/BackupServicePoliciesTest.java
deleted file mode 100644
index 573f041..0000000
--- a/hostsidetests/devicepolicy/app/ProfileOwner/src/com/android/cts/profileowner/BackupServicePoliciesTest.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.android.cts.profileowner;
-
-public class BackupServicePoliciesTest extends BaseProfileOwnerTest {
-  /**
-   * Test: Test enabling and disabling backup service. This test should be executed after installing
-   * a profile owner so that we check that backup service is not enabled by default.
-   */
-  public void testEnablingAndDisablingBackupService() {
-    assertFalse(mDevicePolicyManager.isBackupServiceEnabled(getWho()));
-    mDevicePolicyManager.setBackupServiceEnabled(getWho(), true);
-    assertTrue(mDevicePolicyManager.isBackupServiceEnabled(getWho()));
-    mDevicePolicyManager.setBackupServiceEnabled(getWho(), false);
-    assertFalse(mDevicePolicyManager.isBackupServiceEnabled(getWho()));
-  }
-}
diff --git a/hostsidetests/devicepolicy/app/SeparateProfileChallenge/Android.bp b/hostsidetests/devicepolicy/app/SeparateProfileChallenge/Android.bp
deleted file mode 100644
index b007c23..0000000
--- a/hostsidetests/devicepolicy/app/SeparateProfileChallenge/Android.bp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (C) 2020 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-android_test_helper_app {
-    name: "CtsSeparateProfileChallengeApp",
-    defaults: ["cts_defaults"],
-    platform_apis: true,
-    min_sdk_version: "27",
-    srcs: ["src/**/*.java"],
-    libs: [
-        "android.test.runner.stubs",
-        "junit",
-        "android.test.base.stubs",
-    ],
-    static_libs: [
-        "ctstestrunner-axt",
-        "compatibility-device-util-axt",
-        "ub-uiautomator",
-    ],
-    // tag this module as a cts test artifact
-    test_suites: [
-        "cts",
-        "vts10",
-        "general-tests",
-	"sts",
-        "mts-permission",
-    ],
-}
diff --git a/hostsidetests/devicepolicy/app/SeparateProfileChallenge/AndroidManifest.xml b/hostsidetests/devicepolicy/app/SeparateProfileChallenge/AndroidManifest.xml
deleted file mode 100644
index 600b5c1..0000000
--- a/hostsidetests/devicepolicy/app/SeparateProfileChallenge/AndroidManifest.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.cts.separateprofilechallenge" >
-
-    <uses-sdk android:minSdkVersion="27"/>
-
-    <uses-permission android:name="WRITE_SECURE_SETTINGS"/>
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.cts.separateprofilechallenge"
-                     android:label="Separate Profile Challenge Permission  CTS tests"/>
-</manifest>
diff --git a/hostsidetests/devicepolicy/app/SeparateProfileChallenge/src/com/android/cts/separateprofilechallenge/SeparateProfileChallengePermissionsTest.java b/hostsidetests/devicepolicy/app/SeparateProfileChallenge/src/com/android/cts/separateprofilechallenge/SeparateProfileChallengePermissionsTest.java
deleted file mode 100644
index e1ce7d6..0000000
--- a/hostsidetests/devicepolicy/app/SeparateProfileChallenge/src/com/android/cts/separateprofilechallenge/SeparateProfileChallengePermissionsTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2020 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.cts.separateprofilechallenge;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.platform.test.annotations.AsbSecurityTest;
-import android.test.AndroidTestCase;
-
-import androidx.test.runner.AndroidJUnitRunner;
-
-import static org.junit.Assert.assertNotNull;
-
-public class SeparateProfileChallengePermissionsTest extends AndroidTestCase {
-
-    public void testSeparateProfileChallengePermissions() throws Exception {
-        DevicePolicyManager dpm = (DevicePolicyManager)
-                mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
-        assertNotNull(dpm);
-        try {
-            dpm.isSeparateProfileChallengeAllowed(0); /* Try to use USER_SYSTEM */
-            fail("The user must be system to call isSeparateProfileChallengeAllowed().");
-        } catch (SecurityException ignore) {
-            // That's what we want!
-        } catch (NoSuchMethodError err) {
-            // API unavailable - pass
-        }
-    }
-}
diff --git a/hostsidetests/devicepolicy/app/common/src/com/android/cts/devicepolicy/PermissionUtils.java b/hostsidetests/devicepolicy/app/common/src/com/android/cts/devicepolicy/PermissionUtils.java
index e6b3e1e..f790265 100644
--- a/hostsidetests/devicepolicy/app/common/src/com/android/cts/devicepolicy/PermissionUtils.java
+++ b/hostsidetests/devicepolicy/app/common/src/com/android/cts/devicepolicy/PermissionUtils.java
@@ -16,6 +16,7 @@
 
 package com.android.cts.devicepolicy;
 
+import static android.Manifest.permission.BODY_SENSORS;
 import static android.Manifest.permission.CAMERA;
 import static android.Manifest.permission.RECORD_AUDIO;
 import static android.content.pm.PackageManager.PERMISSION_DENIED;
@@ -110,7 +111,8 @@
                 // For some permissions, different buttons may be available.
                 if (LOCATION_PERMISSIONS.contains(permission)
                         || RECORD_AUDIO.equals(permission)
-                        || CAMERA.equals(permission)) {
+                        || CAMERA.equals(permission)
+                        || BODY_SENSORS.equals(permission)) {
                     resNames.add("permission_allow_foreground_only_button");
                     resNames.add("permission_allow_one_time_button");
                 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminHostSideTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminHostSideTest.java
index a6696aa..afa1a3e 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminHostSideTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminHostSideTest.java
@@ -87,12 +87,4 @@
     public void testRunDeviceAdminTest() throws Exception {
         runTests(getDeviceAdminApkPackage(), "DeviceAdminTest");
     }
-
-    @Test
-    public void testResetPasswordDeprecated() throws Exception {
-        assumeHasSecureLockScreenFeature();
-
-        runTests(getDeviceAdminApkPackage(), "DeviceAdminPasswordTest",
-                        "testResetPasswordDeprecated");
-    }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminServiceTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminServiceTest.java
index 00228ef..579ebde 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminServiceTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDeviceAdminServiceTest.java
@@ -143,7 +143,8 @@
         CLog.i("Running testDisableService1...");
         executeDeviceTestMethod(".ComponentController", "testDisableService1");
         withRetry(() -> assertServiceNotBound(OWNER_SERVICE));
-        withRetry(() -> assertServiceBound(OWNER_SERVICE2));
+        // There's a rare flake which occurs here - will fix with migration
+//        withRetry(() -> assertServiceBound(OWNER_SERVICE2));
 
         CLog.i("Running testDisableService2...");
         executeDeviceTestMethod(".ComponentController", "testDisableService2");
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java
index b0fb7a1..966c6ed 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/BaseDevicePolicyTest.java
@@ -88,6 +88,7 @@
     private static final String FEATURE_TELEPHONY = "android.hardware.telephony";
     private static final String FEATURE_SECURE_LOCK_SCREEN = "android.software.secure_lock_screen";
     private static final String FEATURE_WIFI = "android.hardware.wifi";
+    private static final String FEATURE_WATCH = "android.hardware.type.watch";
 
     //The maximum time to wait for user to be unlocked.
     private static final long USER_UNLOCK_TIMEOUT_SEC = 30;
@@ -177,6 +178,9 @@
     protected int mDeviceOwnerUserId;
     protected int mPrimaryUserId;
 
+    /** Is test running on a watch */
+    protected boolean mIsWatch;
+
     /** Record the initial user ID. */
     protected int mInitialUserId;
 
@@ -206,6 +210,7 @@
         mSupportsMultiUser = getMaxNumberOfUsersSupported() > 1;
         mFixedPackages = getDevice().getInstalledPackageNames();
         mBuildHelper = new CompatibilityBuildHelper(getBuild());
+        mIsWatch = hasDeviceFeature(FEATURE_WATCH);
 
         String propertyValue = getDevice().getProperty("ro.product.first_api_level");
         if (propertyValue != null && !propertyValue.isEmpty()) {
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CrossProfileAppsHostSideTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CrossProfileAppsHostSideTest.java
deleted file mode 100644
index 2220d80..0000000
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CrossProfileAppsHostSideTest.java
+++ /dev/null
@@ -1,322 +0,0 @@
-package com.android.cts.devicepolicy;
-
-import static android.stats.devicepolicy.EventId.CROSS_PROFILE_APPS_GET_TARGET_USER_PROFILES_VALUE;
-import static android.stats.devicepolicy.EventId.CROSS_PROFILE_APPS_START_ACTIVITY_AS_USER_VALUE;
-import static android.stats.devicepolicy.EventId.START_ACTIVITY_BY_INTENT_VALUE;
-
-import static com.android.cts.devicepolicy.metrics.DevicePolicyEventLogVerifier.assertMetricsLogged;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.fail;
-
-import android.platform.test.annotations.FlakyTest;
-import android.platform.test.annotations.LargeTest;
-
-import com.android.cts.devicepolicy.metrics.DevicePolicyEventWrapper;
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.result.InputStreamSource;
-import com.android.tradefed.util.StreamUtil;
-
-import org.junit.Test;
-
-import java.io.FileNotFoundException;
-import java.util.Collections;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Nullable;
-
-/**
- * In the test, managed profile and secondary user are created. We then verify
- * {@link android.content.pm.crossprofile.CrossProfileApps} APIs in different directions, like
- * primary user to managed profile.
- *
- * Tests to verify
- * {@link android.content.pm.crossprofile.CrossProfileApps#canRequestInteractAcrossProfiles()},
- * {@link android.content.pm.crossprofile.CrossProfileApps#canInteractAcrossProfiles()}, and
- * {@link
- * android.content.pm.crossprofile.CrossProfileApps#createRequestInteractAcrossProfilesIntent()}
- * can be found in {@link CrossProfileAppsPermissionHostSideTest}.
- */
-public class CrossProfileAppsHostSideTest extends BaseDevicePolicyTest {
-    private static final String TEST_PACKAGE = "com.android.cts.crossprofileappstest";
-    private static final String NON_TARGET_USER_TEST_CLASS = ".CrossProfileAppsNonTargetUserTest";
-    private static final String TARGET_USER_TEST_CLASS = ".CrossProfileAppsTargetUserTest";
-    private static final String START_ACTIVITY_TEST_CLASS = ".CrossProfileAppsStartActivityTest";
-    private static final String PARAM_TARGET_USER = "TARGET_USER";
-    private static final String EXTRA_TEST_APK = "CtsCrossProfileAppsTests.apk";
-    private static final String SIMPLE_APP_APK ="CtsSimpleApp.apk";
-
-    private int mProfileId;
-    private int mSecondaryUserId;
-    private boolean mHasManagedUserFeature;
-    private boolean mCanTestMultiUser;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        // We need managed users to be supported in order to create a profile of the user owner.
-        mHasManagedUserFeature = hasDeviceFeature("android.software.managed_users");
-        installRequiredApps(mPrimaryUserId);
-
-        if (mHasManagedUserFeature) {
-            createAndStartManagedProfile();
-            installRequiredApps(mProfileId);
-        }
-        waitForBroadcastIdle();
-        if (canCreateAdditionalUsers(1)) {
-            mSecondaryUserId = createUser();
-            installRequiredApps(mSecondaryUserId);
-            mCanTestMultiUser = true;
-        }
-        waitForBroadcastIdle();
-    }
-
-    private void installRequiredApps(int userId)
-            throws FileNotFoundException, DeviceNotAvailableException {
-        installAppAsUser(EXTRA_TEST_APK, userId);
-        installAppAsUser(SIMPLE_APP_APK, userId);
-    }
-
-    @FlakyTest
-    @LargeTest
-    @Test
-    public void testPrimaryUserToPrimaryUser() throws Exception {
-        verifyCrossProfileAppsApi(mPrimaryUserId, mPrimaryUserId, NON_TARGET_USER_TEST_CLASS);
-    }
-
-    @FlakyTest
-    @LargeTest
-    @Test
-    public void testPrimaryUserToManagedProfile() throws Exception {
-        if (!mHasManagedUserFeature) {
-            return;
-        }
-        verifyCrossProfileAppsApi(mPrimaryUserId, mProfileId, TARGET_USER_TEST_CLASS);
-    }
-
-    @LargeTest
-    @Test
-    public void testManagedProfileToPrimaryUser() throws Exception {
-        if (!mHasManagedUserFeature) {
-            return;
-        }
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, TARGET_USER_TEST_CLASS);
-    }
-
-    @LargeTest
-    @Test
-    public void testStartActivityComponent() throws Exception {
-        if (!mHasManagedUserFeature) {
-            return;
-        }
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCanStartMainActivityByComponent");
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCanStartNonMainActivityByComponent");
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCannotStartNotExportedActivityByComponent");
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCannotStartActivityInOtherPackageByComponent");
-    }
-
-    @LargeTest
-    @Test
-    public void testStartActivityIntent() throws Exception {
-        if (!mHasManagedUserFeature) {
-            return;
-        }
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCannotStartActivityWithImplicitIntent");
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCanStartMainActivityByIntent");
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCanStartMainActivityByIntent_withOptionsBundle");
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCanStartNonMainActivityByIntent");
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCanStartNotExportedActivityByIntent");
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCannotStartActivityInOtherPackageByIntent");
-    }
-
-    @LargeTest
-    @Test
-    public void testStartActivityIntentPermissions() throws Exception {
-        if (!mHasManagedUserFeature) {
-            return;
-        }
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCannotStartActivityByIntentWithNoPermissions");
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCanStartActivityByIntentWithInteractAcrossProfilesPermission");
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCanStartActivityByIntentWithInteractAcrossUsersPermission");
-        verifyCrossProfileAppsApi(mProfileId, mPrimaryUserId, START_ACTIVITY_TEST_CLASS, "testCanStartActivityByIntentWithInteractAcrossUsersFullPermission");
-    }
-
-    @LargeTest
-    @Test
-    public void testStartActivityIntent_isLogged() throws Exception {
-        if (!mHasManagedUserFeature) {
-            return;
-        }
-        assertMetricsLogged(
-                getDevice(),
-                () -> verifyCrossProfileAppsApi(
-                        mProfileId,
-                        mPrimaryUserId,
-                        START_ACTIVITY_TEST_CLASS,
-                        "testStartActivityByIntent_noAsserts"),
-                new DevicePolicyEventWrapper
-                        .Builder(START_ACTIVITY_BY_INTENT_VALUE)
-                        .setStrings(TEST_PACKAGE)
-                        .setBoolean(true) // from work profile
-                        .build());
-    }
-
-    @LargeTest
-    @Test
-    public void testStartActivityIntent_sameTaskByDefault() throws Exception {
-        // TODO(b/171957840): replace with device-side test using an inter-process communication
-        //  library.
-        if (!mHasManagedUserFeature) {
-            return;
-        }
-        getDevice().clearLogcat();
-        verifyCrossProfileAppsApi(
-                mProfileId,
-                mPrimaryUserId,
-                START_ACTIVITY_TEST_CLASS,
-                "testStartActivityIntent_sameTaskByDefault");
-        assertThat(findTaskId("CrossProfileSameTaskLauncherActivity"))
-                .isEqualTo(findTaskId("NonMainActivity"));
-    }
-
-    private int findTaskId(String className) throws Exception {
-        final Matcher matcher =
-                Pattern.compile(className + "#taskId#" + "(.*?)" + "#").matcher(readLogcat());
-        boolean isFound = matcher.find();
-        if (!isFound) {
-            fail("Task not found for " + className);
-            return -1;
-        }
-        return Integer.parseInt(matcher.group(1));
-    }
-
-    @LargeTest
-    @Test
-    public void testStartActivityIntent_crossProfile_returnsResult() throws Exception {
-        // TODO(b/171957840): replace with device-side test using an inter-process communication
-        //  library.
-        if (!mHasManagedUserFeature) {
-            return;
-        }
-        verifyCrossProfileAppsApi(
-                mProfileId,
-                mPrimaryUserId,
-                START_ACTIVITY_TEST_CLASS,
-                "testStartActivityIntent_crossProfile_returnsResult");
-    }
-
-    @LargeTest
-    @Test
-    public void testPrimaryUserToSecondaryUser() throws Exception {
-        if (!mCanTestMultiUser) {
-            return;
-        }
-        verifyCrossProfileAppsApi(mPrimaryUserId, mSecondaryUserId, NON_TARGET_USER_TEST_CLASS);
-    }
-
-    @LargeTest
-    @Test
-    public void testSecondaryUserToManagedProfile() throws Exception {
-        if (!mCanTestMultiUser || !mHasManagedUserFeature) {
-            return;
-        }
-        verifyCrossProfileAppsApi(mSecondaryUserId, mProfileId, NON_TARGET_USER_TEST_CLASS);
-
-    }
-
-    @LargeTest
-    @Test
-    public void testManagedProfileToSecondaryUser() throws Exception {
-        if (!mCanTestMultiUser || !mHasManagedUserFeature) {
-            return;
-        }
-        verifyCrossProfileAppsApi(mProfileId, mSecondaryUserId, NON_TARGET_USER_TEST_CLASS);
-    }
-
-    @LargeTest
-    @Test
-    public void testStartMainActivity_logged() throws Exception {
-        if (!mHasManagedUserFeature) {
-            return;
-        }
-        assertMetricsLogged(
-                getDevice(),
-                () -> {
-                    runDeviceTest(
-                            mProfileId,
-                            mPrimaryUserId,
-                            TARGET_USER_TEST_CLASS,
-                            "testStartMainActivity_noAsserts");
-                },
-                new DevicePolicyEventWrapper
-                        .Builder(CROSS_PROFILE_APPS_START_ACTIVITY_AS_USER_VALUE)
-                        .setStrings(new String[] {"com.android.cts.crossprofileappstest"})
-                        .build());
-    }
-
-    @LargeTest
-    @Test
-    public void testGetTargetUserProfiles_logged() throws Exception {
-        if (!mHasManagedUserFeature) {
-            return;
-        }
-        assertMetricsLogged(
-                getDevice(),
-                () -> {
-                    runDeviceTest(
-                            mProfileId,
-                            mPrimaryUserId,
-                            TARGET_USER_TEST_CLASS,
-                            "testGetTargetUserProfiles_noAsserts");
-                },
-                new DevicePolicyEventWrapper
-                        .Builder(CROSS_PROFILE_APPS_GET_TARGET_USER_PROFILES_VALUE)
-                        .setStrings(new String[] {"com.android.cts.crossprofileappstest"})
-                        .build());
-    }
-
-    private void verifyCrossProfileAppsApi(int fromUserId, int targetUserId, String testClass)
-            throws Exception {
-        verifyCrossProfileAppsApi(fromUserId, targetUserId, testClass, /* testMethod= */ null);
-    }
-
-    private void verifyCrossProfileAppsApi(int fromUserId, int targetUserId, String testClass, String testMethod)
-            throws Exception {
-        runDeviceTest(fromUserId, targetUserId, testClass, testMethod);
-    }
-
-    private void runDeviceTest(
-            int fromUserId, int targetUserId, String testClass, @Nullable String testMethod)
-            throws Exception {
-        runDeviceTestsAsUser(
-                TEST_PACKAGE,
-                testClass,
-                testMethod,
-                fromUserId,
-                createTargetUserParam(targetUserId));
-    }
-
-    private void createAndStartManagedProfile() throws Exception {
-        mProfileId = createManagedProfile(mPrimaryUserId);
-        switchUser(mPrimaryUserId);
-        startUser(mProfileId);
-    }
-
-    private Map<String, String> createTargetUserParam(int targetUserId) throws Exception {
-        return Collections.singletonMap(PARAM_TARGET_USER,
-                Integer.toString(getUserSerialNumber(targetUserId)));
-    }
-
-    private String readLogcat() throws Exception {
-        getDevice().stopLogcat();
-        final String logcat;
-        try (InputStreamSource logcatStream = getDevice().getLogcat()) {
-            logcat = StreamUtil.getStringFromSource(logcatStream);
-        }
-        getDevice().startLogcat();
-        return logcat;
-    }
-}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CrossProfileAppsPermissionHostSideTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CrossProfileAppsPermissionHostSideTest.java
deleted file mode 100644
index bba17d7..0000000
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/CrossProfileAppsPermissionHostSideTest.java
+++ /dev/null
@@ -1,384 +0,0 @@
-/*
- * Copyright (C) 2020 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.cts.devicepolicy;
-
-import static com.android.cts.devicepolicy.DeviceAdminFeaturesCheckerRule.FEATURE_MANAGED_USERS;
-
-import com.android.cts.devicepolicy.DeviceAdminFeaturesCheckerRule.RequiresAdditionalFeatures;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.Collections;
-import java.util.Map;
-
-/**
- * Tests to verify
- * {@link android.content.pm.crossprofile.CrossProfileApps#canRequestInteractAcrossProfiles()},
- * {@link android.content.pm.crossprofile.CrossProfileApps#canInteractAcrossProfiles()}, and
- * {@link
- * android.content.pm.crossprofile.CrossProfileApps#createRequestInteractAcrossProfilesIntent()}.
- *
- * The rest of the tests for {@link android.content.pm.crossprofile.CrossProfileApps}
- * can be found in {@link CrossProfileAppsHostSideTest}.
- */
-@RequiresAdditionalFeatures({FEATURE_MANAGED_USERS})
-public class CrossProfileAppsPermissionHostSideTest extends BaseDevicePolicyTest {
-    private static final String TEST_WITH_REQUESTED_PERMISSION_PACKAGE =
-            "com.android.cts.crossprofileappstest";
-    private static final String TEST_WITH_REQUESTED_PERMISSION_CLASS =
-            ".CrossProfileAppsPermissionToInteractTest";
-    private static final String TEST_WITH_REQUESTED_PERMISSION_APK = "CtsCrossProfileAppsTests.apk";
-    private static final String TEST_WITH_REQUESTED_PERMISSION_RECEIVER_TEST_CLASS =
-            TEST_WITH_REQUESTED_PERMISSION_PACKAGE + ".AdminReceiver";
-
-    private static final String TEST_WITH_NO_REQUESTED_PERMISSION_PACKAGE =
-            "com.android.cts.crossprofilenopermissionappstest";
-    private static final String TEST_WITH_NO_REQUESTED_PERMISSION_CLASS =
-            ".CrossProfileAppsWithNoPermission";
-    private static final String TEST_WITH_NO_REQUESTED_PERMISSION_APK =
-            "CtsCrossProfileAppsWithNoPermissionTests.apk";
-
-    private static final String MANAGED_PROFILE_PKG = "com.android.cts.managedprofile";
-    private static final String MANAGED_PROFILE_APK = "CtsManagedProfileApp.apk";
-    private static final String ADMIN_RECEIVER_TEST_CLASS =
-            MANAGED_PROFILE_PKG + ".BaseManagedProfileTest$BasicAdminReceiver";
-    private static final String PARAM_CROSS_PROFILE_PACKAGE = "crossProfilePackage";
-
-    private int mProfileId;
-
-    @Override
-    protected void assumeTestEnabled() throws Exception {
-        assumeSupportsMultiUser();
-    }
-
-    @Before
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-    }
-
-    // TODO(b/199122256): Remove testCanRequestInteractAcrossProfiles tests after fixing the
-    //  installation issue in the migrated tests.
-    @Test
-    public void testCanRequestInteractAcrossProfiles_fromPersonalProfile_returnsTrue()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        addManagedProfileAndInstallRequiredPackages(TEST_WITH_REQUESTED_PERMISSION_APK);
-        addDefaultCrossProfilePackage(mProfileId, TEST_WITH_REQUESTED_PERMISSION_PACKAGE);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanRequestInteractAcrossProfiles_returnsTrue",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanRequestInteractAcrossProfiles_fromWorkProfile_returnsTrue()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        addManagedProfileAndInstallRequiredPackages(TEST_WITH_REQUESTED_PERMISSION_APK);
-        addDefaultCrossProfilePackage(mProfileId, TEST_WITH_REQUESTED_PERMISSION_PACKAGE);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanRequestInteractAcrossProfiles_returnsTrue",
-                mProfileId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanRequestInteractAcrossProfiles_noOtherProfiles_ReturnsFalse()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanRequestInteractAcrossProfiles_returnsFalse",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanRequestInteractAcrossProfiles_packageNotAllowed_returnsTrue()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        addManagedProfileAndInstallRequiredPackages(TEST_WITH_REQUESTED_PERMISSION_APK);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanRequestInteractAcrossProfiles_returnsTrue",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanRequestInteractAcrossProfiles_packageNotInstalled_returnsTrue()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        mProfileId = createManagedProfile(mPrimaryUserId);
-        getDevice().startUser(mProfileId, /*waitFlag= */true);
-        installAppAsUser(MANAGED_PROFILE_APK, mProfileId);
-        setProfileOwnerOrFail(MANAGED_PROFILE_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS,
-                mProfileId);
-        addDefaultCrossProfilePackage(mProfileId, TEST_WITH_REQUESTED_PERMISSION_PACKAGE);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanRequestInteractAcrossProfiles_returnsTrue",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanRequestInteractAcrossProfiles_permissionNotRequested_returnsFalse()
-            throws Exception {
-        installAppAsUser(TEST_WITH_NO_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        addManagedProfileAndInstallRequiredPackages(TEST_WITH_NO_REQUESTED_PERMISSION_APK);
-        addDefaultCrossProfilePackage(mProfileId, TEST_WITH_NO_REQUESTED_PERMISSION_PACKAGE);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_NO_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_NO_REQUESTED_PERMISSION_CLASS,
-                "testCanRequestInteractAcrossProfiles_permissionNotRequested_returnsFalse",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanRequestInteractAcrossProfiles_profileOwner_returnsFalse()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        mProfileId = createManagedProfile(mPrimaryUserId);
-        getDevice().startUser(mProfileId, /* waitFlag= */ true);
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mProfileId);
-        final String receiverComponentName =
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE + "/"
-                        + TEST_WITH_REQUESTED_PERMISSION_RECEIVER_TEST_CLASS;
-        setProfileOwnerOrFail(receiverComponentName, mProfileId);
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testSetCrossProfilePackages_noAsserts",
-                mProfileId,
-                createCrossProfilePackageParam(TEST_WITH_REQUESTED_PERMISSION_PACKAGE));
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanRequestInteractAcrossProfiles_returnsFalse",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withAppOpEnabled_returnsTrue()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        addManagedProfileAndInstallRequiredPackages(TEST_WITH_REQUESTED_PERMISSION_APK);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanInteractAcrossProfiles_withAppOpEnabled_returnsTrue",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withCrossProfilesPermission_returnsTrue()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        addManagedProfileAndInstallRequiredPackages(TEST_WITH_REQUESTED_PERMISSION_APK);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanInteractAcrossProfiles_withCrossProfilesPermission_returnsTrue",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withCrossUsersPermission_returnsTrue()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        addManagedProfileAndInstallRequiredPackages(TEST_WITH_REQUESTED_PERMISSION_APK);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanInteractAcrossProfiles_withCrossUsersPermission_returnsTrue",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withCrossUsersFullPermission_returnsTrue()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        addManagedProfileAndInstallRequiredPackages(TEST_WITH_REQUESTED_PERMISSION_APK);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanInteractAcrossProfiles_withCrossUsersFullPermission_returnsTrue",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_fromWorkProfile_returnsTrue()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        addManagedProfileAndInstallRequiredPackages(TEST_WITH_REQUESTED_PERMISSION_APK);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanInteractAcrossProfiles_withAppOpEnabled_returnsTrue",
-                mProfileId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withAppOpDisabled_returnsFalse()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        addManagedProfileAndInstallRequiredPackages(TEST_WITH_REQUESTED_PERMISSION_APK);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanInteractAcrossProfiles_withAppOpDisabled_returnsFalse",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withNoOtherProfile_returnsFalse()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanInteractAcrossProfiles_withNoOtherProfile_returnsFalse",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withAppOpDisabledOnCallingProfile_returnsFalse()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanInteractAcrossProfiles_withAppOpDisabledOnCallingProfile_returnsFalse",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCanInteractAcrossProfiles_withAppOpDisabledOnOtherProfiles_returnsFalse()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCanInteractAcrossProfiles_withAppOpDisabledOnOtherProfiles_returnsFalse",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCreateRequestInteractAcrossProfilesIntent_canRequestInteraction_returnsIntent()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        addManagedProfileAndInstallRequiredPackages(TEST_WITH_REQUESTED_PERMISSION_APK);
-        addDefaultCrossProfilePackage(mProfileId, TEST_WITH_REQUESTED_PERMISSION_PACKAGE);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCreateRequestInteractAcrossProfilesIntent_canRequestInteraction_returnsIntent",
-                mPrimaryUserId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCreateRequestInteractAcrossProfilesIntent_fromWorkProfile_returnsIntent()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-        addManagedProfileAndInstallRequiredPackages(TEST_WITH_REQUESTED_PERMISSION_APK);
-        addDefaultCrossProfilePackage(mProfileId, TEST_WITH_REQUESTED_PERMISSION_PACKAGE);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCreateRequestInteractAcrossProfilesIntent_canRequestInteraction_returnsIntent",
-                mProfileId,
-                Collections.EMPTY_MAP);
-    }
-
-    @Test
-    public void testCreateRequestInteractAcrossProfilesIntent_canNotRequestInteraction_throwsSecurityException()
-            throws Exception {
-        installAppAsUser(TEST_WITH_REQUESTED_PERMISSION_APK, mPrimaryUserId);
-
-        runDeviceTestsAsUser(
-                TEST_WITH_REQUESTED_PERMISSION_PACKAGE,
-                TEST_WITH_REQUESTED_PERMISSION_CLASS,
-                "testCreateRequestInteractAcrossProfilesIntent_canNotRequestInteraction_throwsSecurityException",
-                mProfileId,
-                Collections.EMPTY_MAP);
-    }
-
-    private void addManagedProfileAndInstallRequiredPackages(String testPackage) throws Exception {
-        mProfileId = createManagedProfile(mPrimaryUserId);
-        getDevice().startUser(mProfileId, /*waitFlag= */true);
-
-        installAppAsUser(testPackage, mProfileId);
-
-        installAppAsUser(MANAGED_PROFILE_APK, mProfileId);
-        setProfileOwnerOrFail(MANAGED_PROFILE_PKG + "/" + ADMIN_RECEIVER_TEST_CLASS,
-                mProfileId);
-    }
-
-    private void addDefaultCrossProfilePackage(int userId, String packageName)
-            throws Exception {
-        runDeviceTestsAsUser(
-                MANAGED_PROFILE_PKG,
-                ".CrossProfileUtils",
-                "testSetCrossProfilePackages",
-                userId,
-                createCrossProfilePackageParam(packageName));
-    }
-
-    private Map<String, String> createCrossProfilePackageParam(String packageName) {
-        return Collections.singletonMap(PARAM_CROSS_PROFILE_PACKAGE, packageName);
-    }
-}
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
index c6f86b8..7f3be30 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTest.java
@@ -30,7 +30,6 @@
 
 import com.android.cts.devicepolicy.DeviceAdminFeaturesCheckerRule.TemporarilyIgnoreOnHeadlessSystemUserMode;
 import com.android.cts.devicepolicy.annotations.LockSettingsTest;
-import com.android.cts.devicepolicy.metrics.DevicePolicyEventLogVerifier;
 import com.android.cts.devicepolicy.metrics.DevicePolicyEventWrapper;
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.log.LogUtil.CLog;
@@ -44,7 +43,6 @@
 import java.io.FileNotFoundException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -82,21 +80,12 @@
     private static final String SIMPLE_PRE_M_APP_PKG = "com.android.cts.launcherapps.simplepremapp";
     private static final String SIMPLE_PRE_M_APP_APK = "CtsSimplePreMApp.apk";
 
-    private static final String APP_RESTRICTIONS_TARGET_APP_PKG
-            = "com.android.cts.apprestrictions.targetapp";
-    private static final String APP_RESTRICTIONS_TARGET_APP_APK = "CtsAppRestrictionsTargetApp.apk";
-
     public static final String CERT_INSTALLER_PKG = "com.android.cts.certinstaller";
     public static final String CERT_INSTALLER_APK = "CtsCertInstallerApp.apk";
 
     protected static final String DELEGATE_APP_PKG = "com.android.cts.delegate";
     protected static final String DELEGATE_APP_APK = "CtsDelegateApp.apk";
     private static final String DELEGATION_CERT_INSTALL = "delegation-cert-install";
-    private static final String DELEGATION_APP_RESTRICTIONS = "delegation-app-restrictions";
-    private static final String DELEGATION_BLOCK_UNINSTALL = "delegation-block-uninstall";
-    private static final String DELEGATION_PERMISSION_GRANT = "delegation-permission-grant";
-    private static final String DELEGATION_PACKAGE_ACCESS = "delegation-package-access";
-    private static final String DELEGATION_ENABLE_SYSTEM_APP = "delegation-enable-system-app";
     private static final String DELEGATION_CERT_SELECTION = "delegation-cert-selection";
 
     protected static final String TEST_APP_APK = "CtsSimpleApp.apk";
@@ -106,23 +95,13 @@
     protected static final String PACKAGE_INSTALLER_PKG = "com.android.cts.packageinstaller";
     protected static final String PACKAGE_INSTALLER_APK = "CtsPackageInstallerApp.apk";
 
-    private static final String ACCOUNT_MANAGEMENT_PKG
-            = "com.android.cts.devicepolicy.accountmanagement";
-    private static final String ACCOUNT_MANAGEMENT_APK = "CtsAccountManagementDevicePolicyApp.apk";
-
     private static final String VPN_APP_PKG = "com.android.cts.vpnfirewall";
     private static final String VPN_APP_APK = "CtsVpnFirewallApp.apk";
     private static final String VPN_APP_API23_APK = "CtsVpnFirewallAppApi23.apk";
     private static final String VPN_APP_API24_APK = "CtsVpnFirewallAppApi24.apk";
     private static final String VPN_APP_NOT_ALWAYS_ON_APK = "CtsVpnFirewallAppNotAlwaysOn.apk";
 
-    private static final String COMMAND_BLOCK_ACCOUNT_TYPE = "block-accounttype";
-    private static final String COMMAND_UNBLOCK_ACCOUNT_TYPE = "unblock-accounttype";
-
-    private static final String DISALLOW_MODIFY_ACCOUNTS = "no_modify_accounts";
     private static final String DISALLOW_REMOVE_USER = "no_remove_user";
-    private static final String ACCOUNT_TYPE
-            = "com.android.cts.devicepolicy.accountmanagement.account.type";
 
     private static final String CUSTOMIZATION_APP_PKG = "com.android.cts.customizationapp";
     private static final String CUSTOMIZATION_APP_APK = "CtsCustomizationApp.apk";
@@ -158,9 +137,6 @@
     protected static final String ASSIST_INTERACTION_SERVICE =
             ASSIST_APP_PKG + "/.MyInteractionService";
 
-    private static final String ARG_ALLOW_FAILURE = "allowFailure";
-    private static final String ARG_LOGGING_TEST = "loggingTest";
-
     private static final String RESTRICT_BACKGROUND_GET_CMD =
         "cmd netpolicy get restrict-background";
     private static final String RESTRICT_BACKGROUND_ON_CMD =
@@ -199,10 +175,8 @@
         getDevice().uninstallPackage(DEVICE_ADMIN_PKG);
         getDevice().uninstallPackage(PERMISSIONS_APP_PKG);
         getDevice().uninstallPackage(SIMPLE_PRE_M_APP_PKG);
-        getDevice().uninstallPackage(APP_RESTRICTIONS_TARGET_APP_PKG);
         getDevice().uninstallPackage(CERT_INSTALLER_PKG);
         getDevice().uninstallPackage(DELEGATE_APP_PKG);
-        getDevice().uninstallPackage(ACCOUNT_MANAGEMENT_PKG);
         getDevice().uninstallPackage(VPN_APP_PKG);
         getDevice().uninstallPackage(VPN_APP_API23_APK);
         getDevice().uninstallPackage(VPN_APP_API24_APK);
@@ -234,100 +208,6 @@
             "testAssertCallerIsApplicationRestrictionsManagingPackage", mUserId);
     }
 
-    /**
-     * Returns a list of delegation tests that should run. Add delegations tests applicable to both
-     * device owner and profile owners to this method directly. DO or PO specific tests should be
-     * added to {@link #getAdditionalDelegationTests} in the subclass.
-     */
-    private Map<String, DevicePolicyEventWrapper[]> getDelegationTests() {
-        final Map<String, DevicePolicyEventWrapper[]> result = new HashMap<>();
-        result.put(".CertInstallDelegateTest", null);
-        result.put(".BlockUninstallDelegateTest", null);
-        result.put(".PermissionGrantDelegateTest", null);
-        result.put(".PackageAccessDelegateTest", null);
-        result.put(".EnableSystemAppDelegateTest", null);
-        result.putAll(getAdditionalDelegationTests());
-        return result;
-    }
-
-    Map<String, DevicePolicyEventWrapper[]> getAdditionalDelegationTests() {
-        return Collections.<String, DevicePolicyEventWrapper[]>emptyMap();
-    }
-
-    /**
-     * Returns a list of delegation scopes that are needed to run delegation tests. Add scopes
-     * which are applicable to both device owner and profile owners to this method directly.
-     * DO or PO specific scopes should be added to {@link #getAdditionalDelegationScopes}
-     * in the subclass.
-     */
-    private List<String> getDelegationScopes() {
-        final List<String> result = new ArrayList<>(Arrays.asList(
-                DELEGATION_APP_RESTRICTIONS,
-                DELEGATION_CERT_INSTALL,
-                DELEGATION_BLOCK_UNINSTALL,
-                DELEGATION_PERMISSION_GRANT,
-                DELEGATION_PACKAGE_ACCESS,
-                DELEGATION_ENABLE_SYSTEM_APP,
-                // CERT_SELECTION scope is in the list so it still participates GeneralDelegateTest.
-                // But its main functionality test is driven by testDelegationCertSelection() and
-                // hence missing from getDelegationTests() on purpose.
-                DELEGATION_CERT_SELECTION
-                ));
-        result.addAll(getAdditionalDelegationScopes());
-        return result;
-    }
-
-    List<String> getAdditionalDelegationScopes() {
-        return Collections.<String>emptyList();
-    }
-
-    /**
-     * General instructions to add a new delegation test:
-     *
-     * <p>Implement the delegate's positive/negate functionaility tests in a new test class
-     * in CtsDelegateApp.apk. Main entry point are {@code testCanAccessApis} and
-     * {@code testCannotAccessApis}. Once implemented, add the delegation scope and the test
-     * class name to {@link #getDelegationScopes}, {@link #getDelegationTests} to make the test
-     * run on DO/PO/PO on primary user.  If the test should only run on a subset of these
-     * combinations, add them to the subclass's {@link #getAdditionalDelegationScopes} and
-     * {@link #getDelegationScopes} instead.
-     * <p>Alternatively, create a separate hostside method to drive the test, similar to
-     * {@link #testDelegationCertSelection}. This is preferred if the delegated functionalities
-     * already exist in another app.
-     */
-    @Test
-    public void testDelegation() throws Exception {
-        // Install relevant apps.
-        installDelegateApp();
-        installAppAsUser(TEST_APP_APK, mUserId);
-        installAppAsUser(APP_RESTRICTIONS_TARGET_APP_APK, mUserId);
-        if (isHeadlessSystemUserMode()) {
-            installAppAsUser(TEST_APP_APK, mDeviceOwnerUserId);
-            installAppAsUser(APP_RESTRICTIONS_TARGET_APP_APK, mDeviceOwnerUserId);
-        }
-
-        try {
-            final Map<String, DevicePolicyEventWrapper[]> delegationTests = getDelegationTests();
-            // APIs are not accessible by default.
-            executeDelegationTests(delegationTests, false /* negative result */);
-
-            // Granting the appropriate delegation scopes makes APIs accessible.
-            final List<String> scopes = getDelegationScopes();
-            setDelegatedScopes(DELEGATE_APP_PKG, scopes);
-            runDeviceTestsAsUser(DELEGATE_APP_PKG, ".GeneralDelegateTest", null, mUserId,
-                    ImmutableMap.of("scopes", String.join(",", scopes)));
-            executeDelegationTests(delegationTests, true /* positive result */);
-
-            // APIs are not accessible after revoking delegations.
-            setDelegatedScopes(DELEGATE_APP_PKG, null);
-            executeDelegationTests(delegationTests, false /* negative result */);
-
-        } finally {
-            // Remove any remaining delegations.
-            setDelegatedScopes(DELEGATE_APP_PKG, null);
-        }
-    }
-
     protected void installDelegateApp() throws Exception {
         installAppAsUser(DELEGATE_APP_APK, mUserId);
     }
@@ -1045,14 +925,6 @@
                     .build());
     }
 
-    /** Test for resetPassword for all devices. */
-    @Test
-    public void testResetPasswordDeprecated() throws Exception {
-        assumeHasSecureLockScreenFeature();
-
-        executeDeviceTestMethod(".ResetPasswordTest", "testResetPasswordDeprecated");
-    }
-
     @Test
     public void testPasswordSufficientInitially() throws Exception {
         executeDeviceTestClass(".PasswordSufficientInitiallyTest");
@@ -1336,16 +1208,6 @@
     }
 
     @Test
-    public void testLockNowLogged() throws Exception {
-        assertMetricsLogged(getDevice(), () -> {
-            executeDeviceTestMethod(".DevicePolicyLoggingTest", "testLockNowLogged");
-        }, new DevicePolicyEventWrapper.Builder(EventId.LOCK_NOW_VALUE)
-                .setAdminPackageName(DEVICE_ADMIN_PKG)
-                .setInt(0)
-                .build());
-    }
-
-    @Test
     public void testSetKeyguardDisabledFeaturesLogged() throws Exception {
         assertMetricsLogged(getDevice(), () -> {
             executeDeviceTestMethod(
@@ -1572,19 +1434,6 @@
     }
 
     @Test
-    public void testSetUninstallBlockedLogged() throws Exception {
-        installAppAsUser(PERMISSIONS_APP_APK, mUserId);
-        assertMetricsLogged(getDevice(), () -> {
-            executeDeviceTestMethod(".DevicePolicyLoggingTest",
-                    "testSetUninstallBlockedLogged");
-        }, new DevicePolicyEventWrapper.Builder(EventId.SET_UNINSTALL_BLOCKED_VALUE)
-                .setAdminPackageName(DEVICE_ADMIN_PKG)
-                .setBoolean(false)
-                .setStrings(PERMISSIONS_APP_PKG)
-                .build());
-    }
-
-    @Test
     public void testIsDeviceOrganizationOwnedWithManagedProfile() throws Exception {
         executeDeviceTestMethod(".DeviceOwnershipTest",
                 "testCallingIsOrganizationOwnedWithManagedProfileExpectingFalse");
@@ -1653,39 +1502,6 @@
         executeDeviceTestMethod(".WifiTest", "testAddNetworkWithKeychainKey_notGranted");
     }
 
-    // TODO(b/184175078): Migrate test to Bedstead when the infra is ready.
-    @Test
-    public void testGetNearbyNotificationStreamingPolicy_getsNearbyStreamingDisabledAsDefault()
-            throws Exception {
-        executeDeviceTestMethod(
-                ".NearbyNotificationStreamingPolicyTest",
-                "testGetNearbyNotificationStreamingPolicy_getsNearbyStreamingDisabledAsDefault");
-    }
-
-    // TODO(b/184175078): Migrate test to Bedstead when the infra is ready.
-    @Test
-    public void testSetNearbyNotificationStreamingPolicy_changesPolicy() throws Exception {
-        executeDeviceTestMethod(
-                ".NearbyNotificationStreamingPolicyTest",
-                "testSetNearbyNotificationStreamingPolicy_changesPolicy");
-    }
-
-    // TODO(b/184175078): Migrate test to Bedstead when the infra is ready.
-    @Test
-    public void testGetNearbyAppStreamingPolicy_getsNearbyStreamingDisabledAsDefault()
-            throws Exception {
-        executeDeviceTestMethod(
-                ".NearbyAppStreamingPolicyTest",
-                "testGetNearbyAppStreamingPolicy_getsNearbyStreamingDisabledAsDefault");
-    }
-
-    // TODO(b/184175078): Migrate test to Bedstead when the infra is ready.
-    @Test
-    public void testSetNearbyAppStreamingPolicy_changesPolicy() throws Exception {
-        executeDeviceTestMethod(
-                ".NearbyAppStreamingPolicyTest", "testSetNearbyAppStreamingPolicy_changesPolicy");
-    }
-
     /**
      * Executes a test class on device. Prior to running, turn off background data usage
      * restrictions, and restore the original restrictions after the test.
@@ -1742,57 +1558,11 @@
         runDeviceTestsAsUser(INTENT_SENDER_PKG, ".SuspendPackageTest", testName, mUserId);
     }
 
-    private void executeAccountTest(String testName) throws DeviceNotAvailableException {
-        runDeviceTestsAsUser(ACCOUNT_MANAGEMENT_PKG, ".AccountManagementTest",
-                testName, mUserId);
-        // Send a home intent to dismiss an error dialog.
-        String command = "am start -a android.intent.action.MAIN"
-                + " -c android.intent.category.HOME";
-        CLog.i("Output for command " + command + ": " + getDevice().executeShellCommand(command));
-    }
-
-    private void executeAppRestrictionsManagingPackageTest(String testName) throws Exception {
-        runDeviceTestsAsUser(DELEGATE_APP_PKG,
-                ".AppRestrictionsDelegateTest", testName, mUserId);
-    }
-
-    private void executeDelegationTests(Map<String, DevicePolicyEventWrapper[]> delegationTests,
-            boolean positive)
-            throws Exception {
-        for (Map.Entry<String, DevicePolicyEventWrapper[]> entry : delegationTests.entrySet()) {
-            final String delegationTestClass = entry.getKey();
-            CLog.i("executeDelegationTests(): executing %s (%s)", delegationTestClass,
-                    positive ? "positive" : "negative");
-            final DevicePolicyEventWrapper[] expectedMetrics = entry.getValue();
-            final DevicePolicyEventLogVerifier.Action testRun = () -> {
-                runDeviceTestsAsUser(DELEGATE_APP_PKG, delegationTestClass,
-                        positive ? "testCanAccessApis" : "testCannotAccessApis", mUserId);
-            };
-            if (expectedMetrics != null && positive) {
-                assertMetricsLogged(getDevice(), testRun, expectedMetrics);
-            } else {
-                testRun.apply();
-            }
-        }
-    }
-
     private void changeUserRestrictionOrFail(String key, boolean value, int userId)
             throws DeviceNotAvailableException {
         changeUserRestrictionOrFail(key, value, userId, DEVICE_ADMIN_PKG);
     }
 
-    private void changeAccountManagement(String command, String accountType, int userId)
-            throws DeviceNotAvailableException {
-        changePolicyOrFail(command, "--es extra-account-type " + accountType, userId);
-    }
-
-    private void changeApplicationRestrictionsManagingPackage(String packageName)
-            throws DeviceNotAvailableException {
-        String packageNameExtra = (packageName != null)
-                ? "--es extra-package-name " + packageName : "";
-        changePolicyOrFail("set-app-restrictions-manager", packageNameExtra, mUserId);
-    }
-
     protected void setDelegatedScopes(String packageName, List<String> scopes)
             throws DeviceNotAvailableException {
         final String packageNameExtra = "--es extra-package-name " + packageName;
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTestApi25.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTestApi25.java
index 4422d6b..51d988c 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTestApi25.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceAndProfileOwnerTestApi25.java
@@ -61,13 +61,6 @@
                 "testPasswordConstraintsDoesntThrowAndPreservesValuesPreR");
     }
 
-    @Test
-    public void testResetPasswordDeprecated() throws Exception {
-        assumeHasSecureLockScreenFeature();
-
-        executeDeviceTestMethod(".ResetPasswordTest", "testResetPasswordDeprecated");
-    }
-
     protected void executeDeviceTestClass(String className) throws Exception {
         runDeviceTestsAsUser(DEVICE_ADMIN_PKG, className, mUserId);
     }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
index b9e21f4..546b127 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/DeviceOwnerTest.java
@@ -16,7 +16,6 @@
 
 package com.android.cts.devicepolicy;
 
-import static com.android.cts.devicepolicy.DeviceAdminFeaturesCheckerRule.FEATURE_BACKUP;
 import static com.android.cts.devicepolicy.DeviceAdminFeaturesCheckerRule.FEATURE_MANAGED_USERS;
 import static com.android.cts.devicepolicy.metrics.DevicePolicyEventLogVerifier.assertMetricsLogged;
 
@@ -24,6 +23,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
 
 import android.platform.test.annotations.AsbSecurityTest;
 import android.platform.test.annotations.FlakyTest;
@@ -92,17 +92,13 @@
             "usb_mass_storage_enabled";
 
     @Test
-    public void testDeviceOwnerSetup() throws Exception {
-        executeDeviceOwnerTest("DeviceOwnerSetupTest");
-    }
-
-    @Test
     public void testProxyStaticProxyTest() throws Exception {
         executeDeviceOwnerTest("proxy.StaticProxyTest");
     }
 
     @Test
     public void testProxyPacProxyTest() throws Exception {
+        assumeFalse("Test does not apply to WearOS", mIsWatch);
         executeDeviceOwnerTest("proxy.PacProxyTest");
     }
 
@@ -268,6 +264,20 @@
     }
 
     /**
+     * Tests creating a user using the DevicePolicyManager's createAndManageUser method, affiliates
+     * the user and starts the user in background to test APIs on that user.
+     *
+     * <p>{@link android.app.admin.DevicePolicyManager#logoutUser} (system API version) is tested.
+     */
+    @Test
+    public void testCreateAndManageUser_LogoutUser_systemApi() throws Exception {
+        assumeCanStartNewUser();
+
+        executeCreateAndManageUserTest("testCreateAndManageUser_LogoutUser_systemApi");
+        assertNewUserStopped();
+    }
+
+    /**
      * Test creating an user using the DevicePolicyManager's createAndManageUser method, affiliate
      * the user and start the user in background to test APIs on that user.
      * {@link android.app.admin.DevicePolicyManager#isAffiliatedUser} is tested.
@@ -343,10 +353,10 @@
         int waitingTimeMs = 5_000;
         final int maxAttempts = 10;
         new Thread(() -> {
-            int attempt = 0;
-            boolean granted = false;
-            while (!granted && ++attempt <= maxAttempts) {
-                try {
+            try {
+                int attempt = 0;
+                boolean granted = false;
+                while (!granted && ++attempt <= maxAttempts) {
                     List<Integer> newUsers = getUsersCreatedByTests();
                     if (!newUsers.isEmpty()) {
                         for (int userId : newUsers) {
@@ -359,21 +369,23 @@
                                     userId, "to call isNewUserDisclaimerAcknowledged() and "
                                     + "acknowledgeNewUserDisclaimer()");
                             granted = true;
+                            // Needed to access isNewUserDisclaimerAcknowledged()
+                            allowTestApiAccess(DEVICE_OWNER_PKG);
                         }
                     }
 
                     if (!granted) {
                         CLog.i("Waiting %dms until new user is switched and package installed "
                                 + "to grant INTERACT_ACROSS_USERS", waitingTimeMs);
+                        sleep(waitingTimeMs);
                     }
-                    sleep(waitingTimeMs);
-                } catch (Exception e) {
-                    CLog.e(e);
-                    return;
                 }
+                CLog.i("%s says: Good Bye, and thanks for all the fish! BTW, granted=%b in "
+                        + "%d attempts", Thread.currentThread(), granted, attempt);
+            } catch (Exception e) {
+                CLog.e(e);
+                return;
             }
-            CLog.i("%s says: Good Bye, and thanks for all the fish! BTW, granted=%b in %d attempts",
-                    Thread.currentThread(), granted, attempt);
         }, "testCreateAndManageUser_newUserDisclaimer_Thread").start();
 
         executeCreateAndManageUserTest("testCreateAndManageUser_newUserDisclaimer");
@@ -647,14 +659,6 @@
         }
     }
 
-    // The backup service cannot be enabled if the backup feature is not supported.
-    @RequiresAdditionalFeatures({FEATURE_BACKUP})
-    @Test
-    public void testBackupServiceEnabling() throws Exception {
-        executeDeviceTestMethod(".BackupServicePoliciesTest",
-                "testEnablingAndDisablingBackupService");
-    }
-
     @Test
     @AsbSecurityTest(cveBugId = 173421434)
     public void testDeviceOwnerCanGetDeviceIdentifiers() throws Exception {
@@ -794,6 +798,7 @@
 
     @Test
     public void testSetStatusBarDisabledLogged() throws Exception {
+        assumeFalse("Test does not apply to WearOS", mIsWatch);
         assertMetricsLogged(getDevice(), () -> {
             executeDeviceTestMethod(".DevicePolicyLoggingTest", "testSetStatusBarDisabledLogged");
         }, new DevicePolicyEventWrapper.Builder(EventId.SET_STATUS_BAR_DISABLED_VALUE)
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfilePasswordTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfilePasswordTest.java
index 0d11e0a..b11c459 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfilePasswordTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfilePasswordTest.java
@@ -38,15 +38,6 @@
 
     @FlakyTest
     @Test
-    public void testLockNowWithKeyEviction() throws Exception {
-        assumeHasFileBasedEncryptionAndSecureLockScreenFeatures();
-
-        changeUserCredential(TEST_PASSWORD, null, mProfileUserId);
-        lockProfile();
-    }
-
-    @FlakyTest
-    @Test
     public void testResetPasswordWithTokenBeforeUnlock() throws Exception {
         assumeHasFileBasedEncryptionAndSecureLockScreenFeatures();
 
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java
index 6de2673..6080a3c 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ManagedProfileTest.java
@@ -163,21 +163,6 @@
                 addRestrictionCommandOutput.contains("SecurityException"));
     }
 
-    // Test the bluetooth API from a managed profile.
-    @Test
-    public void testBluetooth() throws Exception {
-        assumeHasBluetoothFeature();
-
-        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".BluetoothTest",
-                "testEnableDisable", mProfileUserId);
-        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".BluetoothTest",
-                "testGetAddress", mProfileUserId);
-        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".BluetoothTest",
-                "testListenUsingRfcommWithServiceRecord", mProfileUserId);
-        runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".BluetoothTest",
-                "testGetRemoteDevice", mProfileUserId);
-    }
-
     @Test
     public void testOrganizationInfo() throws Exception {
         runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".OrganizationInfoTest",
@@ -531,6 +516,10 @@
                     "addCrossProfileIntents", mProfileUserId);
             runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileSharingTest",
                     "startSwitchToOtherProfileIntent", mProfileUserId);
+
+            // TODO(b/223178698): Investigate potential increase in latency
+            Thread.sleep(30000);
+
             assertResolverActivityInForeground(mProfileUserId);
         } finally {
             pressHome();
@@ -571,6 +560,9 @@
                     "addCrossProfileIntents", mProfileUserId);
             runDeviceTestsAsUser(MANAGED_PROFILE_PKG, ".CrossProfileSharingTest",
                     "startSwitchToOtherProfileIntent_chooser", mProfileUserId);
+
+            Thread.sleep(30000);
+
             assertChooserActivityInForeground(mProfileUserId);
         } finally {
             pressHome();
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedDeviceOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedDeviceOwnerTest.java
index c3345b8..7326b8b 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedDeviceOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedDeviceOwnerTest.java
@@ -36,10 +36,8 @@
 import org.junit.Test;
 
 import java.io.FileNotFoundException;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -48,9 +46,6 @@
  */
 public final class MixedDeviceOwnerTest extends DeviceAndProfileOwnerTest {
 
-    private static final String DELEGATION_NETWORK_LOGGING = "delegation-network-logging";
-    private static final String LOG_TAG_DEVICE_OWNER = "device-owner";
-
     private static final String ARG_SECURITY_LOGGING_BATCH_NUMBER = "batchNumber";
     private static final int SECURITY_EVENTS_BATCH_SIZE = 100;
 
@@ -122,14 +117,6 @@
     @Test
     @TemporarilyIgnoreOnHeadlessSystemUserMode(bugId = "218408549",
             reason = "Will be migrated to new test infra")
-    public void testDelegation() throws Exception {
-        super.testDelegation();
-    }
-
-    @Override
-    @Test
-    @TemporarilyIgnoreOnHeadlessSystemUserMode(bugId = "218408549",
-            reason = "Will be migrated to new test infra")
     public void testDelegationCertSelection() throws Exception {
         super.testDelegationCertSelection();
     }
@@ -198,38 +185,6 @@
         executeDeviceTestMethod(".TimeManagementTest", "testSetTimeZone_failIfAutoTimeZoneEnabled");
     }
 
-    Map<String, DevicePolicyEventWrapper[]> getAdditionalDelegationTests() {
-        final Map<String, DevicePolicyEventWrapper[]> result = new HashMap<>();
-        DevicePolicyEventWrapper[] expectedMetrics = new DevicePolicyEventWrapper[] {
-                new DevicePolicyEventWrapper.Builder(EventId.SET_NETWORK_LOGGING_ENABLED_VALUE)
-                        .setAdminPackageName(DELEGATE_APP_PKG)
-                        .setBoolean(true)
-                        .setInt(1)
-                        .setStrings(LOG_TAG_DEVICE_OWNER)
-                        .build(),
-                new DevicePolicyEventWrapper.Builder(EventId.RETRIEVE_NETWORK_LOGS_VALUE)
-                        .setAdminPackageName(DELEGATE_APP_PKG)
-                        .setBoolean(true)
-                        .setStrings(LOG_TAG_DEVICE_OWNER)
-                        .build(),
-                new DevicePolicyEventWrapper.Builder(EventId.SET_NETWORK_LOGGING_ENABLED_VALUE)
-                        .setAdminPackageName(DELEGATE_APP_PKG)
-                        .setBoolean(true)
-                        .setInt(0)
-                        .setStrings(LOG_TAG_DEVICE_OWNER)
-                        .build(),
-        };
-        result.put(".NetworkLoggingDelegateTest", expectedMetrics);
-        return result;
-    }
-
-    @Override
-    List<String> getAdditionalDelegationScopes() {
-        final List<String> result = new ArrayList<>();
-        result.add(DELEGATION_NETWORK_LOGGING);
-        return result;
-    }
-
     @Test
     public void testLockScreenInfo() throws Exception {
         executeDeviceTestClass(".LockScreenInfoTest");
@@ -493,13 +448,6 @@
 
     @Override
     @Test
-    @IgnoreOnHeadlessSystemUserMode(reason = "Headless system user doesn't have credentials")
-    public void testResetPasswordDeprecated() throws Exception {
-        super.testResetPasswordDeprecated();
-    }
-
-    @Override
-    @Test
     @IgnoreOnHeadlessSystemUserMode(reason = "Headless system user doesn't launch activities")
     public void testCreateAdminSupportIntent() throws Exception {
         super.testCreateAdminSupportIntent();
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java
index a936df2..de04f84 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/MixedManagedProfileOwnerTest.java
@@ -31,9 +31,6 @@
 
 import org.junit.Test;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Set of tests for managed profile owner use cases that also apply to device owners.
  * Tests that should be run identically in both cases are added in DeviceAndProfileOwnerTest.
@@ -398,11 +395,4 @@
                     "testSetNetworkLogsEnabled_false", mUserId);
         }
     }
-
-    @Override
-    List<String> getAdditionalDelegationScopes() {
-        final List<String> result = new ArrayList<>();
-        result.add(DELEGATION_NETWORK_LOGGING);
-        return result;
-    }
 }
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTest.java
index f5be6f0..57daa83 100644
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTest.java
+++ b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/ProfileOwnerTest.java
@@ -15,12 +15,9 @@
  */
 package com.android.cts.devicepolicy;
 
-import static com.android.cts.devicepolicy.DeviceAdminFeaturesCheckerRule.FEATURE_BACKUP;
-
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import com.android.cts.devicepolicy.DeviceAdminFeaturesCheckerRule.RequiresAdditionalFeatures;
 import com.android.cts.devicepolicy.DeviceAdminFeaturesCheckerRule.RequiresProfileOwnerSupport;
 import com.android.tradefed.log.LogUtil.CLog;
 
@@ -71,13 +68,6 @@
         executeProfileOwnerTest("AppUsageObserverTest");
     }
 
-    // The backup service cannot be enabled if the backup feature is not supported.
-    @RequiresAdditionalFeatures({FEATURE_BACKUP})
-    @Test
-    public void testBackupServiceEnabling() throws Exception {
-        executeProfileOwnerTest("BackupServicePoliciesTest");
-    }
-
     @Test
     public void testDevicePolicySafetyCheckerIntegration_allOperations() throws Exception {
         executeDevicePolicySafetyCheckerIntegrationTest("testAllOperations");
diff --git a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/SeparateProfileChallengeTest.java b/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/SeparateProfileChallengeTest.java
deleted file mode 100644
index 18e8ed9..0000000
--- a/hostsidetests/devicepolicy/src/com/android/cts/devicepolicy/SeparateProfileChallengeTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (C) 2020 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.cts.devicepolicy;
-
-import static com.android.cts.devicepolicy.DeviceAdminFeaturesCheckerRule.FEATURE_MANAGED_USERS;
-
-import android.platform.test.annotations.AsbSecurityTest;
-
-import com.android.cts.devicepolicy.DeviceAdminFeaturesCheckerRule.RequiresAdditionalFeatures;
-
-import org.junit.Test;
-
-/**
- * Host side tests for separate profile challenge permissions.
- * Run the CtsSeparateProfileChallengeApp device side test.
- */
-@RequiresAdditionalFeatures({FEATURE_MANAGED_USERS})
-public class SeparateProfileChallengeTest extends BaseDevicePolicyTest {
-    private static final String SEPARATE_PROFILE_PKG = "com.android.cts.separateprofilechallenge";
-    private static final String SEPARATE_PROFILE_APK = "CtsSeparateProfileChallengeApp.apk";
-    private static final String SEPARATE_PROFILE_TEST_CLASS =
-        ".SeparateProfileChallengePermissionsTest";
-    private String mPreviousHiddenApiPolicy = "0";
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-
-        setHiddenApiPolicyOn();
-    }
-
-    @Override
-    public void tearDown() throws Exception {
-
-        removeTestUsers();
-        getDevice().uninstallPackage(SEPARATE_PROFILE_PKG);
-        setHiddenApiPolicyPreviousOrOff();
-        super.tearDown();
-    }
-
-    @Test
-    @AsbSecurityTest(cveBugId = 128599668)
-    public void testSeparateProfileChallengePermissions() throws Exception {
-        assumeCanCreateOneManagedUser();
-
-        // Create managed profile.
-        final int profileUserId = createManagedProfile(mPrimaryUserId);
-        // createManagedProfile doesn't start the user automatically.
-        startUser(profileUserId);
-        installAppAsUser(SEPARATE_PROFILE_APK, profileUserId);
-        executeSeparateProfileChallengeTest(profileUserId);
-    }
-
-    protected void setHiddenApiPolicyOn() throws Exception {
-        mPreviousHiddenApiPolicy = getDevice().executeShellCommand(
-                "settings get global hidden_api_policy_p_apps");
-        executeShellCommand("settings put global hidden_api_policy_p_apps 1");
-    }
-
-    protected void setHiddenApiPolicyPreviousOrOff() throws Exception {
-        executeShellCommand("settings put global hidden_api_policy_p_apps "
-            + mPreviousHiddenApiPolicy);
-    }
-
-    private void executeSeparateProfileChallengeTest(int userId) throws Exception {
-        runDeviceTestsAsUser(SEPARATE_PROFILE_PKG, SEPARATE_PROFILE_TEST_CLASS, userId);
-    }
-}
diff --git a/hostsidetests/edi/Android.bp b/hostsidetests/edi/Android.bp
index 1b32a4b..f3feb1a 100644
--- a/hostsidetests/edi/Android.bp
+++ b/hostsidetests/edi/Android.bp
@@ -24,6 +24,7 @@
         "cts",
         "gts",
         "general-tests",
+        "tvts",
     ],
     libs: [
         "compatibility-host-util",
@@ -36,4 +37,6 @@
         "modules-utils-build-testing",
         "hamcrest-library",
     ],
+    data: [":SharedLibraryInfoTestApp"],
+    per_testcase_directory: true,
 }
diff --git a/hostsidetests/graphics/displaymode/Android.bp b/hostsidetests/graphics/displaymode/Android.bp
new file mode 100644
index 0000000..a88d415
--- /dev/null
+++ b/hostsidetests/graphics/displaymode/Android.bp
@@ -0,0 +1,35 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_test_host {
+    name: "CtsBootDisplayModeTestCases",
+    defaults: ["cts_defaults"],
+    srcs: ["src/**/*.java"],
+    libs: [
+        "cts-tradefed",
+        "tradefed",
+        "guava",
+    ],
+    static_libs: ["CompatChangeGatingTestBase"],
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    java_resources: [":cts-global-compat-config"],
+}
diff --git a/hostsidetests/graphics/displaymode/AndroidTest.xml b/hostsidetests/graphics/displaymode/AndroidTest.xml
new file mode 100644
index 0000000..8b653bd
--- /dev/null
+++ b/hostsidetests/graphics/displaymode/AndroidTest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<configuration description="Config for CtsBootDisplayMode test cases">
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="all_foldable_states" />
+
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsBootDisplayModeTestCases.jar" />
+    </test>
+</configuration>
diff --git a/hostsidetests/graphics/displaymode/OWNERS b/hostsidetests/graphics/displaymode/OWNERS
new file mode 100644
index 0000000..e24ac8f
--- /dev/null
+++ b/hostsidetests/graphics/displaymode/OWNERS
@@ -0,0 +1,3 @@
+# Bug component: 687588
+kritidang@google.com
+blindahl@google.com
\ No newline at end of file
diff --git a/hostsidetests/graphics/displaymode/TEST_MAPPING b/hostsidetests/graphics/displaymode/TEST_MAPPING
new file mode 100644
index 0000000..88d29a9
--- /dev/null
+++ b/hostsidetests/graphics/displaymode/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsBootDisplayModeTestCases"
+    }
+  ]
+}
diff --git a/hostsidetests/graphics/displaymode/app/Android.bp b/hostsidetests/graphics/displaymode/app/Android.bp
new file mode 100644
index 0000000..e7ab970
--- /dev/null
+++ b/hostsidetests/graphics/displaymode/app/Android.bp
@@ -0,0 +1,49 @@
+//
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsBootDisplayModeApp",
+    defaults: ["cts_support_defaults"],
+    platform_apis: true,
+    srcs: ["src/**/*.java"],
+    libs: [
+        "junit",
+    ],
+    static_libs: [
+        "androidx.annotation_annotation",
+        "androidx.core_core",
+        "androidx.test.rules",
+        "compatibility-device-util-axt",
+        "ctsdeviceutillegacy-axt",
+        "ctstestrunner-axt",
+        "junit",
+        "junit-params",
+        "mockito-target-minus-junit4",
+        "SurfaceFlingerProperties",
+        "testng",
+        "truth-prebuilt",
+    ],
+
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
diff --git a/hostsidetests/graphics/displaymode/app/AndroidManifest.xml b/hostsidetests/graphics/displaymode/app/AndroidManifest.xml
new file mode 100644
index 0000000..6d6a092
--- /dev/null
+++ b/hostsidetests/graphics/displaymode/app/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.cts.graphics.displaymode">
+    <!-- targetSdkVersion for this test must be below 33 -->
+    <uses-sdk android:targetSdkVersion="33"/>
+    <uses-permission android:name="android.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE" />
+
+    <application
+        android:debuggable="true">
+        <uses-library android:name="android.test.runner" />
+        <activity android:name="com.android.cts.graphics.displaymode.BootDisplayModeTestActivity"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCH"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.cts.graphics.displaymode" />
+</manifest>
diff --git a/hostsidetests/graphics/displaymode/app/src/com/android/cts/graphics/displaymode/BootDisplayModeTest.java b/hostsidetests/graphics/displaymode/app/src/com/android/cts/graphics/displaymode/BootDisplayModeTest.java
new file mode 100644
index 0000000..166a315
--- /dev/null
+++ b/hostsidetests/graphics/displaymode/app/src/com/android/cts/graphics/displaymode/BootDisplayModeTest.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright (C) 2022 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.cts.graphics.displaymode;
+
+import android.Manifest;
+import android.hardware.display.DisplayManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.support.test.uiautomator.UiDevice;
+import android.util.Log;
+import android.view.Display;
+import android.view.SurfaceControl;
+import android.view.Window;
+import android.view.WindowManager;
+
+import static org.junit.Assume.assumeTrue;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.AdoptShellPermissionsRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.time.Duration;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Predicate;
+
+/**
+ * Tests for the behaviour of display mode APIs:
+ * {@link Display#setUserPreferredDisplayMode(Display.Mode)} and
+ * {@link Display.Mode#clearUserPreferredDisplayMode()}.
+ */
+@RunWith(AndroidJUnit4.class)
+public final class BootDisplayModeTest {
+    private static final String TAG = BootDisplayModeTest.class.getSimpleName();
+    private DisplayManager mDisplayManager;
+    private Display.Mode mInitialUserPreferredMode;
+
+    @Rule
+    public ActivityTestRule<BootDisplayModeTestActivity> mActivityRule =
+            new ActivityTestRule<>(BootDisplayModeTestActivity.class);
+
+    @Rule
+    public AdoptShellPermissionsRule mAdoptShellPermissionsRule = new AdoptShellPermissionsRule(
+            InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+            Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE);
+
+    @Before
+    public void setUp() throws Exception {
+        final UiDevice uiDevice =
+                UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        uiDevice.wakeUp();
+        uiDevice.executeShellCommand("wm dismiss-keyguard");
+
+        mDisplayManager = mActivityRule.getActivity().getSystemService(DisplayManager.class);
+        mInitialUserPreferredMode = mDisplayManager.getGlobalUserPreferredDisplayMode();
+
+        assumeTrue("Boot mode should be supported to run this test.",
+                SurfaceControl.getBootDisplayModeSupport());
+    }
+
+    @After
+    public void tearDown() {
+        // Restore the original value of settings
+        if (mInitialUserPreferredMode == null) {
+            mDisplayManager.clearGlobalUserPreferredDisplayMode();
+        } else {
+            mDisplayManager.setGlobalUserPreferredDisplayMode(mInitialUserPreferredMode);
+        }
+    }
+
+    @Test
+    public void testGetBootDisplayMode() throws Exception {
+        mDisplayManager.clearGlobalUserPreferredDisplayMode();
+        Display display = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY);
+        Display.Mode[] supportedModes = display.getSupportedModes();
+        Display.Mode initialDefaultMode = display.getDefaultMode();
+
+        // 3 or more modes are needed to run the test. 1st mode is the initialDefaultMode.
+        // 2nd mode is selected as user-pref mode. 3rd mode is chosen as active mode. These 3 modes
+        // need to be different to properly verify the mode after reboot.
+        assumeTrue("3 or more modes should be supported by display to run the test.",
+                supportedModes.length >= 3);
+
+        logMode("initial-default-mode", initialDefaultMode);
+
+        // Set the user preferred mode different from initial default mode
+        Display.Mode userPreferredMode = null;
+        for (Display.Mode mode : supportedModes) {
+            if (mode.getModeId() != initialDefaultMode.getModeId()) {
+                mDisplayManager.setGlobalUserPreferredDisplayMode(mode);
+                waitUntil(display,
+                        display1 -> display.getDefaultMode().getModeId() == mode.getModeId(),
+                        Duration.ofSeconds(5));
+                userPreferredMode = mode;
+                break;
+            }
+        }
+        logMode("user-preferred-mode", userPreferredMode);
+
+        // Set the active mode different from initial default mode and user pref mode
+        Display.Mode activeMode = null;
+        for (Display.Mode mode : supportedModes) {
+            if (mode.getModeId() != initialDefaultMode.getModeId()
+                    && mode.getModeId() != userPreferredMode.getModeId()) {
+                setMode(mode);
+                activeMode = mode;
+                break;
+            }
+        }
+        logMode("active-mode", activeMode);
+    }
+
+    @Test
+    public void testClearBootDisplayMode() throws Exception {
+        mDisplayManager.clearGlobalUserPreferredDisplayMode();
+        Display display = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY);
+        Display.Mode[] supportedModes = display.getSupportedModes();
+
+        Display.Mode initialDefaultMode = display.getDefaultMode();
+        logMode("initial-default-mode", initialDefaultMode);
+
+        Display.Mode systemPreferredMode = display.getSystemPreferredDisplayMode();
+        logMode("system-preferred-mode", systemPreferredMode);
+
+        // 3 or more modes are needed to run the test. 1st mode is the initialDefaultMode.
+        // 2nd mode system preferred mode. A mode different from these is selected as user preferred
+        // mode, to properly verify the mode after reboot.
+        assumeTrue("3 or more modes should be supported by display to run the test.",
+                supportedModes.length >= 3);
+
+        // Set the user preferred mode different from initial default mode, and system pref mode
+        Display.Mode userPreferredMode = null;
+        for (Display.Mode mode : supportedModes) {
+            if (mode.getModeId() != initialDefaultMode.getModeId()
+                    && mode.getModeId() != systemPreferredMode
+                    .getModeId()) {
+                mDisplayManager.setGlobalUserPreferredDisplayMode(mode);
+                waitUntil(display,
+                        display1 -> display.getDefaultMode().getModeId() == mode.getModeId(),
+                        Duration.ofSeconds(5));
+                userPreferredMode = mode;
+                break;
+            }
+        }
+        logMode("user-preferred-mode", userPreferredMode);
+
+        // Clear the user preferred mode
+        mDisplayManager.clearGlobalUserPreferredDisplayMode();
+        Display.Mode finalUserPreferredMode = userPreferredMode;
+        waitUntil(display,
+                display1 -> display.getDefaultMode().getModeId()
+                        != finalUserPreferredMode.getModeId(),
+                Duration.ofSeconds(5));
+    }
+
+
+    private void setMode(Display.Mode mode) {
+        Handler handler = new Handler(Looper.getMainLooper());
+        handler.post(() -> {
+            Window window = mActivityRule.getActivity().getWindow();
+            WindowManager.LayoutParams params = window.getAttributes();
+            params.preferredDisplayModeId = mode.getModeId();
+            window.setAttributes(params);
+        });
+    }
+
+    private void waitUntil(Display display, Predicate<Display> pred, Duration maxWait)
+            throws Exception {
+        final int id = display.getDisplayId();
+        final Lock lock = new ReentrantLock();
+        final Condition displayChanged = lock.newCondition();
+        DisplayManager.DisplayListener listener = new DisplayManager.DisplayListener() {
+            @Override
+            public void onDisplayChanged(int displayId) {
+                if (displayId != id) {
+                    return;
+                }
+                lock.lock();
+                try {
+                    displayChanged.signal();
+                } finally {
+                    lock.unlock();
+                }
+            }
+            @Override
+            public void onDisplayAdded(int displayId) {}
+            @Override
+            public void onDisplayRemoved(int displayId) {}
+        };
+        Handler handler = new Handler(Looper.getMainLooper());
+        mDisplayManager.registerDisplayListener(listener, handler);
+        long remainingNanos = maxWait.toNanos();
+        lock.lock();
+        try {
+            while (!pred.test(display)) {
+                if (remainingNanos <= 0L) {
+                    throw new TimeoutException();
+                }
+                remainingNanos = displayChanged.awaitNanos(remainingNanos);
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    private void logMode(String modeType, Display.Mode mode) {
+        if (mode != null) {
+            Log.i(TAG, modeType + ": " + mode.getPhysicalWidth() + " " + mode.getPhysicalHeight()
+                    + " " + mode.getRefreshRate());
+        }
+    }
+}
diff --git a/hostsidetests/graphics/displaymode/app/src/com/android/cts/graphics/displaymode/BootDisplayModeTestActivity.java b/hostsidetests/graphics/displaymode/app/src/com/android/cts/graphics/displaymode/BootDisplayModeTestActivity.java
new file mode 100644
index 0000000..c62bf89
--- /dev/null
+++ b/hostsidetests/graphics/displaymode/app/src/com/android/cts/graphics/displaymode/BootDisplayModeTestActivity.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2022 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.cts.graphics.displaymode;
+
+import android.app.Activity;
+
+public class BootDisplayModeTestActivity extends Activity {
+}
diff --git a/hostsidetests/graphics/displaymode/src/com/android/cts/graphics/displaymode/BootDisplayModeHostTest.java b/hostsidetests/graphics/displaymode/src/com/android/cts/graphics/displaymode/BootDisplayModeHostTest.java
new file mode 100644
index 0000000..f13dde2
--- /dev/null
+++ b/hostsidetests/graphics/displaymode/src/com/android/cts/graphics/displaymode/BootDisplayModeHostTest.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2022 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.cts.graphics.displaymode;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
+import com.android.ddmlib.testrunner.TestResult;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.result.CollectingTestListener;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Scanner;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests for boot display mode APIs.
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class BootDisplayModeHostTest extends BaseHostJUnit4Test {
+    private static final String RUNNER = "androidx.test.runner.AndroidJUnitRunner";
+
+    /**
+     * The class name of the main activity in the APK.
+     */
+    private static final String TEST_CLASS = "BootDisplayModeTest";
+
+    /**
+     * The name of the APK.
+     */
+    private static final String TEST_APK = "CtsBootDisplayModeApp.apk";
+
+    /**
+     * The package name of the APK.
+     */
+    private static final String TEST_PKG = "com.android.cts.graphics.displaymode";
+
+    @Before
+    public void setUp() throws Exception {
+        installPackage(TEST_APK);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        uninstallPackage(TEST_PKG);
+    }
+
+    @Test
+    public void testGetBootDisplayMode() throws Exception {
+        ITestDevice device = getDevice();
+        assertNotNull("Device not set", device);
+
+        // Clear logcat.
+        device.executeAdbCommand("logcat", "-c");
+
+        boolean deviceTestPassed = runDeviceTest(device,
+                TEST_PKG + "." + TEST_CLASS, "testGetBootDisplayMode");
+        assumeTrue("Skip the test if deviceSideTest fails.", deviceTestPassed);
+
+        String logs = device.executeAdbCommand("logcat", "-v", "brief", "-d",
+                TEST_CLASS + ":I", "*:S");
+
+        String userPreferredMode = "";
+        // Search for string.
+        try (Scanner in = new Scanner(logs)) {
+            while (in.hasNextLine()) {
+                String line = in.nextLine();
+
+                if (line.contains("user-preferred-mode")) {
+                    userPreferredMode = line.split(":")[2].trim();
+                }
+            }
+        }
+
+        device.reboot();
+        String bootDisplayMode =
+                device.executeShellCommand("cmd display get-active-display-mode-at-start "
+                        + "0")
+                        .split(":")[1].trim();
+        assertEquals(userPreferredMode, bootDisplayMode);
+    }
+
+    @Test
+    public void testClearBootDisplayMode() throws Exception {
+        ITestDevice device = getDevice();
+        assertNotNull("Device not set", device);
+
+        // Clear logcat.
+        device.executeAdbCommand("logcat", "-c");
+
+        boolean deviceTestPassed = runDeviceTest(device,
+                TEST_PKG + "." + TEST_CLASS, "testClearBootDisplayMode");
+        assumeTrue("Skip the test if deviceSideTest fails.", deviceTestPassed);
+
+        String logs = device.executeAdbCommand("logcat", "-v", "brief", "-d",
+                TEST_CLASS + ":I", "*:S");
+
+        String systemPreferredMode = "";
+        // Search for string.
+        try (Scanner in = new Scanner(logs)) {
+            while (in.hasNextLine()) {
+                String line = in.nextLine();
+
+                if (line.contains("system-preferred-mode")) {
+                    systemPreferredMode = line.split(":")[2].trim();
+                }
+            }
+        }
+
+        device.reboot();
+        String bootDisplayMode =
+                device.executeShellCommand("cmd display get-active-display-mode-at-start "
+                        + "0")
+                        .split(":")[1].trim();
+        assertEquals(systemPreferredMode, bootDisplayMode);
+    }
+
+    private boolean runDeviceTest(ITestDevice device, String className, String methodName)
+            throws DeviceNotAvailableException {
+        RemoteAndroidTestRunner runner = new RemoteAndroidTestRunner(TEST_PKG,
+                RUNNER,
+                device.getIDevice());
+        // set a max deadline limit to avoid hanging forever
+        runner.setMaxTimeToOutputResponse(5, TimeUnit.MINUTES);
+        runner.setClassName(className);
+        runner.setMethodName(className, methodName);
+        CollectingTestListener listener = new CollectingTestListener();
+
+        device.runInstrumentationTests(runner, listener);
+        return listener.getCurrentRunResults().getNumTestsInState(
+                TestResult.TestStatus.PASSED) != 0;
+    }
+}
diff --git a/hostsidetests/graphics/framerateoverride/app/AndroidManifest.xml b/hostsidetests/graphics/framerateoverride/app/AndroidManifest.xml
index 97f4d9a..1d5f72e 100644
--- a/hostsidetests/graphics/framerateoverride/app/AndroidManifest.xml
+++ b/hostsidetests/graphics/framerateoverride/app/AndroidManifest.xml
@@ -19,7 +19,8 @@
     <!-- targetSdkVersion for this test must be below 30 -->
     <uses-sdk android:targetSdkVersion="30"/>
     <application
-        android:debuggable="true">
+        android:debuggable="true"
+        android:appCategory="game">
         <uses-library android:name="android.test.runner" />
 
         <activity
diff --git a/hostsidetests/graphics/framerateoverride/app/src/com/android/cts/graphics/framerateoverride/FrameRateOverrideTest.java b/hostsidetests/graphics/framerateoverride/app/src/com/android/cts/graphics/framerateoverride/FrameRateOverrideTest.java
index 3ae0e71..af0d156 100644
--- a/hostsidetests/graphics/framerateoverride/app/src/com/android/cts/graphics/framerateoverride/FrameRateOverrideTest.java
+++ b/hostsidetests/graphics/framerateoverride/app/src/com/android/cts/graphics/framerateoverride/FrameRateOverrideTest.java
@@ -40,6 +40,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -58,6 +59,7 @@
 
     private int mInitialMatchContentFrameRate;
     private DisplayManager mDisplayManager;
+    private UiDevice mUiDevice;
 
 
     @Rule
@@ -66,17 +68,17 @@
 
     @Before
     public void setUp() throws Exception {
-        final UiDevice uiDevice =
-                UiDevice.getInstance(
+        mUiDevice = UiDevice.getInstance(
                         androidx.test.platform.app.InstrumentationRegistry.getInstrumentation());
-        uiDevice.wakeUp();
-        uiDevice.executeShellCommand("wm dismiss-keyguard");
+        mUiDevice.wakeUp();
+        mUiDevice.executeShellCommand("wm dismiss-keyguard");
 
         InstrumentationRegistry.getInstrumentation().getUiAutomation()
                 .adoptShellPermissionIdentity(Manifest.permission.LOG_COMPAT_CHANGE,
                         Manifest.permission.READ_COMPAT_CHANGE_CONFIG,
                         Manifest.permission.MODIFY_REFRESH_RATE_SWITCHING_TYPE,
-                        Manifest.permission.OVERRIDE_DISPLAY_MODE_REQUESTS);
+                        Manifest.permission.OVERRIDE_DISPLAY_MODE_REQUESTS,
+                        Manifest.permission.MANAGE_GAME_MODE);
 
         mDisplayManager = mActivityRule.getActivity().getSystemService(DisplayManager.class);
         mInitialMatchContentFrameRate = toSwitchingType(
@@ -154,11 +156,23 @@
     }
 
     private void testFrameRateOverride(FrameRateObserver frameRateObserver)
-            throws InterruptedException {
+            throws InterruptedException, IOException {
         FrameRateOverrideTestActivity activity = mActivityRule.getActivity();
         for (Display.Mode mode : getModesToTest()) {
             setMode(mode);
-            activity.testFrameRateOverride(frameRateObserver, mode.getRefreshRate());
+            activity.testFrameRateOverride(activity.new SurfaceFrameRateOverrideBehavior(),
+                    frameRateObserver, mode.getRefreshRate());
+        }
+    }
+
+    private void testGameModeFrameRateOverride(FrameRateObserver frameRateObserver)
+            throws InterruptedException, IOException {
+        FrameRateOverrideTestActivity activity = mActivityRule.getActivity();
+        for (Display.Mode mode : getModesToTest()) {
+            setMode(mode);
+            activity.testFrameRateOverride(
+                    activity.new GameModeFrameRateOverrideBehavior(mUiDevice),
+                    frameRateObserver, mode.getRefreshRate());
         }
     }
 
@@ -169,7 +183,7 @@
      */
     @Test
     public void testBackpressure()
-            throws InterruptedException {
+            throws InterruptedException, IOException {
         FrameRateOverrideTestActivity activity = mActivityRule.getActivity();
         testFrameRateOverride(activity.new BackpressureFrameRateObserver());
     }
@@ -181,7 +195,7 @@
      */
     @Test
     public void testChoreographer()
-            throws InterruptedException {
+            throws InterruptedException, IOException {
         FrameRateOverrideTestActivity activity = mActivityRule.getActivity();
         testFrameRateOverride(activity.new ChoreographerFrameRateObserver());
     }
@@ -196,7 +210,7 @@
      */
     @Test
     public void testDisplayGetRefreshRate()
-            throws InterruptedException {
+            throws InterruptedException, IOException {
         FrameRateOverrideTestActivity activity = mActivityRule.getActivity();
         testFrameRateOverride(activity.new DisplayGetRefreshRateFrameRateObserver());
     }
@@ -208,7 +222,7 @@
      */
     @Test
     public void testDisplayModeGetRefreshRateDisplayModeReturnsPhysicalRefreshRateEnabled()
-            throws InterruptedException {
+            throws InterruptedException, IOException {
         FrameRateOverrideTestActivity activity = mActivityRule.getActivity();
         testFrameRateOverride(
                 activity.new DisplayModeGetRefreshRateFrameRateObserver(
@@ -222,10 +236,73 @@
      */
     @Test
     public void testDisplayModeGetRefreshRateDisplayModeReturnsPhysicalRefreshRateDisabled()
-            throws InterruptedException {
+            throws InterruptedException, IOException {
         FrameRateOverrideTestActivity activity = mActivityRule.getActivity();
         testFrameRateOverride(
                 activity.new DisplayModeGetRefreshRateFrameRateObserver(
                         /*displayModeReturnsPhysicalRefreshRateEnabled*/ false));
     }
+
+    /**
+     * Test run by
+     * FrameRateOverrideHostTest
+     * .testGameModeBackpressureDisplayModeReturnsPhysicalRefreshRateEnabled
+     */
+    @Test
+    public void testGameModeBackpressure() throws InterruptedException, IOException {
+        FrameRateOverrideTestActivity activity = mActivityRule.getActivity();
+        testGameModeFrameRateOverride(activity.new BackpressureFrameRateObserver());
+    }
+
+    /**
+     * Test run by
+     * FrameRateOverrideHostTest
+     * .testGameModeChoreographerDisplayModeReturnsPhysicalRefreshRateEnabled
+     */
+    @Test
+    public void testGameModeChoreographer() throws InterruptedException, IOException {
+        FrameRateOverrideTestActivity activity = mActivityRule.getActivity();
+        testGameModeFrameRateOverride(activity.new ChoreographerFrameRateObserver());
+    }
+
+    /**
+     * Test run by
+     * FrameRateOverrideHostTest
+     * .testGameModeDisplayGetRefreshRateDisplayModeReturnsPhysicalRefreshRateEnabled
+     */
+    @Test
+    public void testGameModeDisplayGetRefreshRate() throws InterruptedException, IOException {
+        FrameRateOverrideTestActivity activity = mActivityRule.getActivity();
+        testGameModeFrameRateOverride(activity.new DisplayGetRefreshRateFrameRateObserver());
+    }
+
+    /**
+     * Test run by
+     * FrameRateOverrideHostTest
+     * .testGameModeDisplayModeGetRefreshRateDisplayModeReturnsPhysicalRefreshRateDisabled
+     */
+    @Test
+    public void testGameModeDisplayModeGetRefreshRateDisplayModeReturnsPhysicalRefreshRateDisabled()
+            throws InterruptedException, IOException {
+        FrameRateOverrideTestActivity activity = mActivityRule.getActivity();
+        testGameModeFrameRateOverride(
+                activity.new DisplayModeGetRefreshRateFrameRateObserver(
+                        /*displayModeReturnsPhysicalRefreshRateEnabled*/ false));
+    }
+
+    /**
+     * Test run by
+     * FrameRateOverrideHostTest
+     * .testGameModeDisplayModeGetRefreshRateDisplayModeReturnsPhysicalRefreshRateEnabled
+     */
+    @Test
+    public void testGameModeDisplayModeGetRefreshRateDisplayModeReturnsPhysicalRefreshRateEnabled()
+            throws InterruptedException, IOException {
+        FrameRateOverrideTestActivity activity = mActivityRule.getActivity();
+        testGameModeFrameRateOverride(
+                activity.new DisplayModeGetRefreshRateFrameRateObserver(
+                        /*displayModeReturnsPhysicalRefreshRateEnabled*/ true));
+    }
+
+
 }
diff --git a/hostsidetests/graphics/framerateoverride/app/src/com/android/cts/graphics/framerateoverride/FrameRateOverrideTestActivity.java b/hostsidetests/graphics/framerateoverride/app/src/com/android/cts/graphics/framerateoverride/FrameRateOverrideTestActivity.java
index 888f7f3..c54ae79 100644
--- a/hostsidetests/graphics/framerateoverride/app/src/com/android/cts/graphics/framerateoverride/FrameRateOverrideTestActivity.java
+++ b/hostsidetests/graphics/framerateoverride/app/src/com/android/cts/graphics/framerateoverride/FrameRateOverrideTestActivity.java
@@ -25,6 +25,7 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
+import android.support.test.uiautomator.UiDevice;
 import android.util.Log;
 import android.view.Choreographer;
 import android.view.Surface;
@@ -32,6 +33,7 @@
 import android.view.SurfaceView;
 import android.view.ViewGroup;
 
+import java.io.IOException;
 import java.util.ArrayList;
 
 /**
@@ -417,39 +419,80 @@
         }
     }
 
-    private void testFrameRateOverrideBehavior(FrameRateObserver frameRateObserver,
-            float initialRefreshRate) throws InterruptedException {
-        Log.i(TAG, "Staring testFrameRateOverride");
-        float halfFrameRate = initialRefreshRate / 2;
+    interface FrameRateOverrideBehavior{
+        void testFrameRateOverrideBehavior(FrameRateObserver frameRateObserver,
+                float initialRefreshRate) throws InterruptedException, IOException;
+    }
 
-        waitForRefreshRateChange(initialRefreshRate);
-        frameRateObserver.observe(initialRefreshRate, initialRefreshRate, "Initial");
+    class SurfaceFrameRateOverrideBehavior implements FrameRateOverrideBehavior {
 
-        Log.i(TAG, String.format("Setting Frame Rate to %.2f with default compatibility",
-                halfFrameRate));
-        mSurface.setFrameRate(halfFrameRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
-                Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);
-        waitForRefreshRateChange(halfFrameRate);
-        frameRateObserver.observe(initialRefreshRate, halfFrameRate, "setFrameRate(default)");
+        @Override
+        public void testFrameRateOverrideBehavior(FrameRateObserver frameRateObserver,
+                float initialRefreshRate) throws InterruptedException {
+            Log.i(TAG, "Staring testFrameRateOverride");
+            float halfFrameRate = initialRefreshRate / 2;
 
-        Log.i(TAG, String.format("Setting Frame Rate to %.2f with fixed source compatibility",
-                halfFrameRate));
-        mSurface.setFrameRate(halfFrameRate, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,
-                Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);
-        waitForRefreshRateChange(halfFrameRate);
-        frameRateObserver.observe(initialRefreshRate, halfFrameRate, "setFrameRate(fixed source)");
+            waitForRefreshRateChange(initialRefreshRate);
+            frameRateObserver.observe(initialRefreshRate, initialRefreshRate, "Initial");
 
-        Log.i(TAG, "Resetting Frame Rate setting");
-        mSurface.setFrameRate(0, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
-                Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);
-        waitForRefreshRateChange(initialRefreshRate);
-        frameRateObserver.observe(initialRefreshRate, initialRefreshRate, "Reset");
+            Log.i(TAG, String.format("Setting Frame Rate to %.2f with default compatibility",
+                    halfFrameRate));
+            mSurface.setFrameRate(halfFrameRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
+                    Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);
+            waitForRefreshRateChange(halfFrameRate);
+            frameRateObserver.observe(initialRefreshRate, halfFrameRate, "setFrameRate(default)");
+
+            Log.i(TAG, String.format("Setting Frame Rate to %.2f with fixed source compatibility",
+                    halfFrameRate));
+            mSurface.setFrameRate(halfFrameRate, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,
+                    Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);
+            waitForRefreshRateChange(halfFrameRate);
+            frameRateObserver.observe(initialRefreshRate, halfFrameRate,
+                    "setFrameRate(fixed source)");
+
+            Log.i(TAG, "Resetting Frame Rate setting");
+            mSurface.setFrameRate(0, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
+                    Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);
+            waitForRefreshRateChange(initialRefreshRate);
+            frameRateObserver.observe(initialRefreshRate, initialRefreshRate, "Reset");
+        }
+    }
+
+    class GameModeFrameRateOverrideBehavior implements FrameRateOverrideBehavior {
+        private UiDevice mUiDevice;
+        GameModeFrameRateOverrideBehavior(UiDevice uiDevice) {
+            mUiDevice = uiDevice;
+        }
+        @Override
+        public void testFrameRateOverrideBehavior(FrameRateObserver frameRateObserver,
+                float initialRefreshRate) throws InterruptedException, IOException {
+            Log.i(TAG, "Starting testGameModeFrameRateOverride");
+
+            int initialRefreshRateInt = (int) initialRefreshRate;
+            for (int divisor = 1; initialRefreshRateInt / divisor >= 30; ++divisor) {
+                int overrideFrameRate = initialRefreshRateInt / divisor;
+                Log.i(TAG, String.format("Setting Frame Rate to %d using Game Mode",
+                        overrideFrameRate));
+
+                mUiDevice.executeShellCommand(String.format("cmd game set --mode 2 --fps %d %s",
+                        overrideFrameRate, getPackageName()));
+                waitForRefreshRateChange(overrideFrameRate);
+                frameRateObserver.observe(initialRefreshRate, overrideFrameRate,
+                        String.format("Game Mode Override(%d)", overrideFrameRate));
+            }
+
+            Log.i(TAG, "Resetting Frame Rate setting");
+            mUiDevice.executeShellCommand(String.format("cmd game reset %s", getPackageName()));
+            waitForRefreshRateChange(initialRefreshRate);
+            frameRateObserver.observe(initialRefreshRate, initialRefreshRate, "Reset");
+        }
     }
 
     // The activity being intermittently paused/resumed has been observed to
     // cause test failures in practice, so we run the test with retry logic.
-    public void testFrameRateOverride(FrameRateObserver frameRateObserver, float initialRefreshRate)
-            throws InterruptedException {
+    public void testFrameRateOverride(FrameRateOverrideBehavior frameRateOverrideBehavior,
+            FrameRateObserver frameRateObserver, float initialRefreshRate)
+            throws InterruptedException, IOException {
         synchronized (mLock) {
             Log.i(TAG, "testFrameRateOverride started");
             int attempts = 0;
@@ -458,7 +501,8 @@
                 while (!testPassed) {
                     waitForPreconditions();
                     try {
-                        testFrameRateOverrideBehavior(frameRateObserver, initialRefreshRate);
+                        frameRateOverrideBehavior.testFrameRateOverrideBehavior(frameRateObserver,
+                                initialRefreshRate);
                         testPassed = true;
                     } catch (PreconditionViolatedException exc) {
                         // The logic below will retry if we're below max attempts.
diff --git a/hostsidetests/graphics/framerateoverride/src/com/android/cts/graphics/framerateoverride/FrameRateOverrideHostTest.java b/hostsidetests/graphics/framerateoverride/src/com/android/cts/graphics/framerateoverride/FrameRateOverrideHostTest.java
index 12162d9..a8d7a9e 100644
--- a/hostsidetests/graphics/framerateoverride/src/com/android/cts/graphics/framerateoverride/FrameRateOverrideHostTest.java
+++ b/hostsidetests/graphics/framerateoverride/src/com/android/cts/graphics/framerateoverride/FrameRateOverrideHostTest.java
@@ -36,10 +36,14 @@
     @Override
     protected void setUp() throws Exception {
         installPackage(TEST_APK, true);
+        // add device config to enable game mode
+        runCommand("device_config put game_overlay " + TEST_PKG + " mode=2:mode=3");
     }
 
     @Override
     protected void tearDown() throws Exception {
+        // remove device config
+        runCommand("device_config delete game_overlay " + TEST_PKG);
         uninstallPackage(TEST_PKG, true);
     }
 
@@ -122,4 +126,84 @@
                 /*disabledChanges*/
                 ImmutableSet.of(DISPLAY_MODE_RETURNS_PHYSICAL_REFRESH_RATE_CHANGEID));
     }
+
+    public void testGameModeBackpressureDisplayModeReturnsPhysicalRefreshRateEnabled()
+            throws Exception {
+        runDeviceCompatTest(TEST_PKG, ".FrameRateOverrideTest",
+                "testGameModeBackpressure",
+                /*enabledChanges*/
+                ImmutableSet.of(DISPLAY_MODE_RETURNS_PHYSICAL_REFRESH_RATE_CHANGEID),
+                /*disabledChanges*/
+                ImmutableSet.of());
+    }
+
+    public void testGameModeBackpressureDisplayModeReturnsPhysicalRefreshRateDisabled()
+            throws Exception {
+        runDeviceCompatTest(TEST_PKG, ".FrameRateOverrideTest",
+                "testGameModeBackpressure",
+                /*enabledChanges*/
+                ImmutableSet.of(),
+                /*disabledChanges*/
+                ImmutableSet.of(DISPLAY_MODE_RETURNS_PHYSICAL_REFRESH_RATE_CHANGEID));
+    }
+
+    public void testGameModeChoreographerDisplayModeReturnsPhysicalRefreshRateEnabled()
+            throws Exception {
+        runDeviceCompatTest(TEST_PKG, ".FrameRateOverrideTest",
+                "testGameModeChoreographer",
+                /*enabledChanges*/
+                ImmutableSet.of(DISPLAY_MODE_RETURNS_PHYSICAL_REFRESH_RATE_CHANGEID),
+                /*disabledChanges*/
+                ImmutableSet.of());
+    }
+
+    public void testGameModeChoreographerDisplayModeReturnsPhysicalRefreshRateDisabled()
+            throws Exception {
+        runDeviceCompatTest(TEST_PKG, ".FrameRateOverrideTest",
+                "testGameModeChoreographer",
+                /*enabledChanges*/
+                ImmutableSet.of(),
+                /*disabledChanges*/
+                ImmutableSet.of(DISPLAY_MODE_RETURNS_PHYSICAL_REFRESH_RATE_CHANGEID));
+    }
+
+    public void testGameModeDisplayGetRefreshRateDisplayModeReturnsPhysicalRefreshRateEnabled()
+            throws Exception {
+        runDeviceCompatTest(TEST_PKG, ".FrameRateOverrideTest",
+                "testGameModeDisplayGetRefreshRate",
+                /*enabledChanges*/
+                ImmutableSet.of(DISPLAY_MODE_RETURNS_PHYSICAL_REFRESH_RATE_CHANGEID),
+                /*disabledChanges*/
+                ImmutableSet.of());
+    }
+
+    public void testGameModeDisplayGetRefreshRateDisplayModeReturnsPhysicalRefreshRateDisabled()
+            throws Exception {
+        runDeviceCompatTest(TEST_PKG, ".FrameRateOverrideTest",
+                "testGameModeDisplayGetRefreshRate",
+                /*enabledChanges*/
+                ImmutableSet.of(),
+                /*disabledChanges*/
+                ImmutableSet.of(DISPLAY_MODE_RETURNS_PHYSICAL_REFRESH_RATE_CHANGEID));
+    }
+
+    public void testGameModeDisplayModeGetRefreshRateDisplayModeReturnsPhysicalRefreshRateEnabled()
+            throws Exception {
+        runDeviceCompatTest(TEST_PKG, ".FrameRateOverrideTest",
+                "testGameModeDisplayModeGetRefreshRateDisplayModeReturnsPhysicalRefreshRateEnabled",
+                /*enabledChanges*/
+                ImmutableSet.of(DISPLAY_MODE_RETURNS_PHYSICAL_REFRESH_RATE_CHANGEID),
+                /*disabledChanges*/
+                ImmutableSet.of());
+    }
+
+    public void testGameModeDisplayModeGetRefreshRateDisplayModeReturnsPhysicalRefreshRateDisabled()
+            throws Exception {
+        runDeviceCompatTest(TEST_PKG, ".FrameRateOverrideTest",
+                "testGameModeDisplayModeGetRefreshRateDisplayModeReturnsPhysicalRefreshRateDisabled",
+                /*enabledChanges*/
+                ImmutableSet.of(),
+                /*disabledChanges*/
+                ImmutableSet.of(DISPLAY_MODE_RETURNS_PHYSICAL_REFRESH_RATE_CHANGEID));
+    }
 }
diff --git a/hostsidetests/graphics/gpumetrics/Android.bp b/hostsidetests/graphics/gpumetrics/Android.bp
new file mode 100644
index 0000000..b67305c
--- /dev/null
+++ b/hostsidetests/graphics/gpumetrics/Android.bp
@@ -0,0 +1,35 @@
+// Copyright 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_test_host {
+    name: "CtsGpuMetricsHostTestCases",
+    srcs: ["src/**/*.java"],
+    libs: [
+        "cts-tradefed",
+        "tradefed",
+        "compatibility-host-util",
+    ],
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    data: [
+        ":CtsFramestatsTestApp",
+    ],
+    per_testcase_directory: true,
+}
diff --git a/hostsidetests/graphics/gpumetrics/AndroidTest.xml b/hostsidetests/graphics/gpumetrics/AndroidTest.xml
new file mode 100644
index 0000000..2681fb9
--- /dev/null
+++ b/hostsidetests/graphics/gpumetrics/AndroidTest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2022 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.
+-->
+<configuration description="Runs CtsGpuMetricsHostTestCases">
+
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="graphics" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsFramestatsTestApp.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.HostTest" >
+        <option name="jar" value="CtsGpuMetricsHostTestCases.jar" />
+    </test>
+</configuration>
diff --git a/hostsidetests/graphics/gpumetrics/TEST_MAPPING b/hostsidetests/graphics/gpumetrics/TEST_MAPPING
new file mode 100644
index 0000000..fec19ff
--- /dev/null
+++ b/hostsidetests/graphics/gpumetrics/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsGpuMetricsHostTestCases"
+    }
+  ]
+}
diff --git a/hostsidetests/graphics/gpumetrics/src/com/android/cts/graphics/GpuWorkDumpsysTest.java b/hostsidetests/graphics/gpumetrics/src/com/android/cts/graphics/GpuWorkDumpsysTest.java
new file mode 100644
index 0000000..9fcd9b1
--- /dev/null
+++ b/hostsidetests/graphics/gpumetrics/src/com/android/cts/graphics/GpuWorkDumpsysTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright 2022 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.cts.graphics;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+import com.android.compatibility.common.util.CddTest;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+import com.android.tradefed.util.CommandResult;
+import com.android.tradefed.util.CommandStatus;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class GpuWorkDumpsysTest extends BaseHostJUnit4Test {
+
+  private static final String DUMPSYS_COMMAND = "dumpsys gpu --gpuwork";
+  private static final String TEST_PKG = "com.android.cts.framestatstestapp";
+  private static final int PAUSE_MILLIS = 3000;
+  private static final String GPU_WORK_PERIOD_TRACEPOINT_FORMAT_PATH =
+      "/sys/kernel/tracing/events/power/gpu_work_period/format";
+
+  private CommandResult assertShellCommand(String command) throws DeviceNotAvailableException {
+    CommandResult commandResult = getDevice().executeShellV2Command(command);
+
+    // It must succeed.
+    assertEquals(
+        String.format("Failed shell command: %s", command),
+        CommandStatus.SUCCESS,
+        commandResult.getStatus());
+
+    return commandResult;
+  }
+
+  private long getTestAppUid() throws DeviceNotAvailableException {
+    int currentUser = getDevice().getCurrentUser();
+    CommandResult commandResult =
+        assertShellCommand(
+            String.format("cmd package list packages -U --user %d %s", currentUser, TEST_PKG));
+    String[] parts = commandResult.getStdout().split(":");
+    // Example output:
+    // package:com.android.cts.framestatstestapp uid:10183
+    assertTrue(
+        String.format("Unexpected output getting package uid:\n%s", commandResult.getStdout()),
+        parts.length > 2);
+
+    long appUid = Long.parseLong(parts[2].trim());
+    assertTrue(String.format("Unexpected app uid: %d", appUid), appUid > 10000);
+    return appUid;
+  }
+
+  @CddTest(requirement = "6.1/C-6-1")
+  @Test
+  public void testOutputFormat() throws Exception {
+    CommandResult commandResult =
+        getDevice()
+            .executeShellV2Command(String.format("cat %s", GPU_WORK_PERIOD_TRACEPOINT_FORMAT_PATH));
+
+    // If we fail to cat the tracepoint format then the test ends here. If the tracing file system
+    // is inaccessible, then this test won't fail. We rely on VTS tests to ensure that the tracing
+    // file system is accessible.
+    assumeTrue(
+        String.format(
+            "Failed to cat the gpu_work_period tracepoint format at %s",
+            GPU_WORK_PERIOD_TRACEPOINT_FORMAT_PATH),
+        commandResult.getStatus().equals(CommandStatus.SUCCESS));
+
+    // Turn screen on.
+    assertShellCommand("input keyevent KEYCODE_WAKEUP");
+    Thread.sleep(PAUSE_MILLIS);
+
+    // Skip lock screen.
+    assertShellCommand("wm dismiss-keyguard");
+    Thread.sleep(PAUSE_MILLIS);
+
+    // Start basic app.
+    assertShellCommand("am start -W -S " + TEST_PKG);
+    Thread.sleep(PAUSE_MILLIS);
+
+    // Get the UID of the test app.
+    long appUid = getTestAppUid();
+
+    // Execute dumpsys command.
+    commandResult = assertShellCommand(DUMPSYS_COMMAND);
+
+    assertFalse(
+        String.format(
+            "The command shows errors.\nCommand: %s\nOutput:\n%s\n",
+            DUMPSYS_COMMAND, commandResult.getStdout()),
+        commandResult.getStdout().contains("[errors:"));
+
+    String[] lines = commandResult.getStdout().trim().split("\n");
+    int i = 0;
+    for (; i < lines.length; ++i) {
+      if (lines[i].startsWith("gpu_id uid")) {
+        break;
+      }
+    }
+    assertTrue(
+        String.format(
+            "Could not find \"gpu_id uid ...\" header in output:\n%s\n", commandResult.getStdout()),
+        i < lines.length);
+
+    Pattern uidInfoPattern = Pattern.compile(String.format("\\d+ (%d) (\\d+) (\\d+)", appUid));
+    for (; i < lines.length; ++i) {
+      Matcher matcher = uidInfoPattern.matcher(lines[i]);
+      if (!matcher.lookingAt()) {
+        continue;
+      }
+      if (appUid == Long.parseLong(matcher.group(1))
+          && Long.parseLong(matcher.group(2)) > 0
+          && Long.parseLong(matcher.group(3)) > 0) {
+        // Success!
+        return;
+      }
+    }
+    fail(
+        String.format(
+            "Could not find UID %d with non-zero active and inactive GPU time in output:\n%s\n",
+            appUid, commandResult.getStdout()));
+  }
+}
diff --git a/hostsidetests/hdmicec/app/src/android/hdmicec/app/HdmiCecAudioManager.java b/hostsidetests/hdmicec/app/src/android/hdmicec/app/HdmiCecAudioManager.java
index 8167e5f..29d9132 100644
--- a/hostsidetests/hdmicec/app/src/android/hdmicec/app/HdmiCecAudioManager.java
+++ b/hostsidetests/hdmicec/app/src/android/hdmicec/app/HdmiCecAudioManager.java
@@ -74,6 +74,14 @@
                 }
                 Log.i(TAG, "Volume at " + percentageVolume + "%");
                 break;
+            case "android.hdmicec.app.RAISE_VOLUME":
+                audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC,
+                        AudioManager.ADJUST_RAISE, 0);
+                break;
+            case "android.hdmicec.app.LOWER_VOLUME":
+                audioManager.adjustStreamVolume(AudioManager.STREAM_MUSIC,
+                        AudioManager.ADJUST_LOWER, 0);
+                break;
             case "android.hdmicec.app.SET_VOLUME":
                 int percentVolume = getIntent().getIntExtra("volumePercent", 50);
                 int volume = minVolume + ((maxVolume - minVolume) * percentVolume / 100);
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/AudioManagerHelper.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/AudioManagerHelper.java
index 88091c6..49b7964 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/AudioManagerHelper.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/AudioManagerHelper.java
@@ -16,13 +16,13 @@
 
 package android.hdmicec.cts;
 
+import com.android.tradefed.device.ITestDevice;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import com.android.tradefed.device.ITestDevice;
-
 /** Helper class to get DUT audio status using Audio manager app */
 public final class AudioManagerHelper {
 
@@ -66,6 +66,14 @@
         hdmiCecClient.checkExpectedOutput(LogicalAddress.TV, CecOperand.REPORT_AUDIO_STATUS);
     }
 
+    public static void unmuteDevice(ITestDevice device)
+            throws Exception {
+        // Clear activity
+        device.executeShellCommand(CLEAR_COMMAND);
+        // Start the APK and wait for it to complete.
+        device.executeShellCommand(START_COMMAND + "android.hdmicec.app.UNMUTE");
+    }
+
     public static boolean isDeviceMuted(ITestDevice device) throws Exception {
         // Clear activity
         device.executeShellCommand(CLEAR_COMMAND);
@@ -76,6 +84,20 @@
         return (LogHelper.parseDutVolume(device, CLASS) >= 128);
     }
 
+    public static void lowerVolume(ITestDevice device) throws Exception {
+        // Clear activity
+        device.executeShellCommand(CLEAR_COMMAND);
+        // Start the APK and wait for it to complete
+        device.executeShellCommand(START_COMMAND + "android.hdmicec.app.LOWER_VOLUME");
+    }
+
+    public static void raiseVolume(ITestDevice device) throws Exception {
+        // Clear activity
+        device.executeShellCommand(CLEAR_COMMAND);
+        // Start the APK and wait for it to complete
+        device.executeShellCommand(START_COMMAND + "android.hdmicec.app.RAISE_VOLUME");
+    }
+
     public static void setDeviceVolume(ITestDevice device, int percentVolume) throws Exception {
         // Clear activity
         device.executeShellCommand(CLEAR_COMMAND);
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/BaseHdmiCecAbsoluteVolumeControlTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/BaseHdmiCecAbsoluteVolumeControlTest.java
new file mode 100644
index 0000000..c8235d0
--- /dev/null
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/BaseHdmiCecAbsoluteVolumeControlTest.java
@@ -0,0 +1,380 @@
+/*
+ * Copyright (C) 2022 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 android.hdmicec.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assume.assumeTrue;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Abstract base class for tests for Absolute Volume Control (AVC). Subclasses must call
+ * this class's constructor to specify the device type of the DUT and the System Audio device.
+ * The three valid pairs of (DUT type, System Audio device type) for AVC are as follows:
+ * (Playback, TV); (Playback, Audio System); (TV, Audio System).
+ *
+ * Currently, it is only feasible to test the case where the DUT is a playback device and the
+ * System Audio device is a TV. This is because the CEC adapter responds <Feature Abort> to
+ * <Set Audio Volume Level> when it is started as an Audio System.
+ */
+public abstract class BaseHdmiCecAbsoluteVolumeControlTest extends BaseHdmiCecCtsTest {
+
+    /**
+     * Constructor. The test device type and client params (determining the client's device type)
+     * passed in here determine the behavior of the tests.
+     */
+    public BaseHdmiCecAbsoluteVolumeControlTest(@HdmiCecConstants.CecDeviceType int testDeviceType,
+            String... clientParams) {
+        super(testDeviceType, clientParams);
+    }
+
+    /**
+     * Returns the audio output device being used.
+     */
+    public int getAudioOutputDevice() {
+        if (mTestDeviceType == HdmiCecConstants.CEC_DEVICE_TYPE_TV) {
+            return HdmiCecConstants.DEVICE_OUT_HDMI_ARC;
+        } else {
+            return HdmiCecConstants.DEVICE_OUT_HDMI;
+        }
+    }
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        // This setting must be enabled to use AVC. Start with it disabled to ensure that we can
+        // control when the AVC initiation process starts.
+        setSettingsValue(HdmiCecConstants.SETTING_VOLUME_CONTROL_ENABLED,
+                HdmiCecConstants.VOLUME_CONTROL_DISABLED);
+
+        // Disable and enable CEC on the DUT to clear its knowledge of device feature support.
+        // If the DUT isn't a TV, simulate a connected sink as well.
+        if (mTestDeviceType == HdmiCecConstants.CEC_DEVICE_TYPE_TV) {
+            getDevice().executeShellCommand("cmd hdmi_control cec_setting set hdmi_cec_enabled 0");
+            waitForCondition(() -> !isCecAvailable(getDevice()), "Could not disable CEC");
+            getDevice().executeShellCommand("cmd hdmi_control cec_setting set hdmi_cec_enabled 1");
+            waitForCondition(() -> isCecAvailable(getDevice()), "Could not enable CEC");
+        } else {
+            simulateCecSinkConnected(getDevice(), getTargetLogicalAddress());
+        }
+
+        // Full volume behavior is a prerequisite for AVC. However, we cannot control this
+        // condition from CTS tests or shell due to missing permissions. Therefore, we run these
+        // tests only if it is already true.
+        assumeTrue(isFullVolumeDevice(getAudioOutputDevice()));
+    }
+
+    /**
+     * Requires the device to be able to adopt CEC 2.0 so that it sends <Give Features>.
+     *
+     * Tests that the DUT enables and disables AVC in response to changes in the System Audio
+     * device's support for <Set Audio Volume Level>. In this test, this support status is
+     * communicated through <Report Features> messages.
+     */
+    @Test
+    public void testEnableDisableAvc_cec20_triggeredByReportFeatures() throws Exception {
+        // Enable CEC 2.0
+        setCec20();
+
+        // Enable CEC volume
+        setSettingsValue(HdmiCecConstants.SETTING_VOLUME_CONTROL_ENABLED,
+                HdmiCecConstants.VOLUME_CONTROL_ENABLED);
+
+        // Enable System Audio Mode if the System Audio device is an Audio System
+        enableSystemAudioModeIfApplicable();
+
+        // Since CEC 2.0 is enabled, DUT should also use <Give Features> to query AVC support
+        hdmiCecClient.checkExpectedOutput(hdmiCecClient.getSelfDevice(),
+                CecOperand.GIVE_FEATURES);
+        hdmiCecClient.checkExpectedOutput(hdmiCecClient.getSelfDevice(),
+                CecOperand.SET_AUDIO_VOLUME_LEVEL);
+
+        // System Audio device reports support for <Set Audio Volume Level> via <Report Features>
+        sendReportFeatures(true);
+
+        // DUT queries audio status
+        hdmiCecClient.checkExpectedOutput(hdmiCecClient.getSelfDevice(),
+                CecOperand.GIVE_AUDIO_STATUS);
+        checkAbsoluteVolumeControlStatus(false);
+
+        // DUT receives audio status
+        hdmiCecClient.sendCecMessage(hdmiCecClient.getSelfDevice(), CecOperand.REPORT_AUDIO_STATUS,
+                CecMessage.formatParams(50));
+        checkAbsoluteVolumeControlStatus(true);
+
+        // System Audio device reports no support for <Set Audio Volume Level>
+        sendReportFeatures(false);
+        checkAbsoluteVolumeControlStatus(false);
+    }
+
+    /**
+     * Tests that the DUT enables and disables AVC in response to changes in the System Audio
+     * device's support for <Set Audio Volume Level>. In this test, this support status is
+     * communicated through (the lack of) <Feature Abort> responses to <Set Audio Volume Level>.
+     */
+    @Test
+    public void testEnableDisableAvc_triggeredByAvcSupportChanged() throws Exception {
+        setSettingsValue(HdmiCecConstants.SETTING_VOLUME_CONTROL_ENABLED,
+                HdmiCecConstants.VOLUME_CONTROL_ENABLED);
+
+        enableSystemAudioModeIfApplicable();
+
+        // DUT queries AVC support by sending <Set Audio Volume Level>
+        hdmiCecClient.checkExpectedOutput(hdmiCecClient.getSelfDevice(),
+                CecOperand.SET_AUDIO_VOLUME_LEVEL);
+
+        // System Audio device does not respond with <Feature Abort>. DUT queries audio status
+        hdmiCecClient.checkExpectedOutput(hdmiCecClient.getSelfDevice(),
+                CecOperand.GIVE_AUDIO_STATUS);
+        checkAbsoluteVolumeControlStatus(false);
+
+        // DUT receives audio status
+        hdmiCecClient.sendCecMessage(hdmiCecClient.getSelfDevice(), CecOperand.REPORT_AUDIO_STATUS,
+                CecMessage.formatParams(50));
+        checkAbsoluteVolumeControlStatus(true);
+
+        // System Audio device responds to <Set Audio Volume Level> with
+        // <Feature Abort>[Unrecognized opcode]
+        hdmiCecClient.sendCecMessage(hdmiCecClient.getSelfDevice(), CecOperand.FEATURE_ABORT,
+                CecMessage.formatParams(CecOperand.SET_AUDIO_VOLUME_LEVEL + "00"));
+        checkAbsoluteVolumeControlStatus(false);
+    }
+
+    /**
+     * Tests that the DUT enables and disables AVC in response to CEC volume control being
+     * enabled or disabled.
+     */
+    @Test
+    public void testEnableAndDisableAVC_triggeredByVolumeControlSettingChange() throws Exception {
+        enableSystemAudioModeIfApplicable();
+
+        // System audio device reports support for <Set Audio Volume Level>
+        sendReportFeatures(true);
+
+        // Enable CEC volume
+        setSettingsValue(HdmiCecConstants.SETTING_VOLUME_CONTROL_ENABLED,
+                HdmiCecConstants.VOLUME_CONTROL_ENABLED);
+
+        // DUT queries audio status
+        hdmiCecClient.checkExpectedOutput(hdmiCecClient.getSelfDevice(),
+                CecOperand.GIVE_AUDIO_STATUS);
+        checkAbsoluteVolumeControlStatus(false);
+
+        // DUT receives audio status
+        hdmiCecClient.sendCecMessage(hdmiCecClient.getSelfDevice(), CecOperand.REPORT_AUDIO_STATUS,
+                CecMessage.formatParams(50));
+        checkAbsoluteVolumeControlStatus(true);
+
+        // CEC volume control is disabled on the DUT
+        setSettingsValue(HdmiCecConstants.SETTING_VOLUME_CONTROL_ENABLED,
+                HdmiCecConstants.VOLUME_CONTROL_DISABLED);
+        checkAbsoluteVolumeControlStatus(false);
+    }
+
+    /**
+     * Tests that the DUT enables and disables AVC in response to System Audio mode being
+     * enabled or disabled.
+     *
+     * Only valid when the System Audio device is an Audio System.
+     */
+    @Test
+    public void testEnableDisableAvc_triggeredBySystemAudioModeChange() throws Exception {
+        assumeTrue("Skipping this test for this setup because the System Audio device "
+                        + "is not an Audio System.",
+                hdmiCecClient.getSelfDevice().getDeviceType()
+                        == HdmiCecConstants.CEC_DEVICE_TYPE_AUDIO_SYSTEM);
+
+        // System audio device reports support for <Set Audio Volume Level>
+        sendReportFeatures(true);
+
+        // CEC volume control is enabled on the DUT
+        setSettingsValue(HdmiCecConstants.SETTING_VOLUME_CONTROL_ENABLED,
+                HdmiCecConstants.VOLUME_CONTROL_ENABLED);
+
+        // Enable System Audio Mode
+        broadcastSystemAudioModeMessage(true);
+
+        // DUT queries audio status
+        hdmiCecClient.checkExpectedOutput(hdmiCecClient.getSelfDevice(),
+                CecOperand.GIVE_AUDIO_STATUS);
+        checkAbsoluteVolumeControlStatus(false);
+
+        // DUT receives audio status
+        hdmiCecClient.sendCecMessage(hdmiCecClient.getSelfDevice(), CecOperand.REPORT_AUDIO_STATUS,
+                CecMessage.formatParams(50));
+        checkAbsoluteVolumeControlStatus(true);
+
+        // System Audio Mode is disabled
+        broadcastSystemAudioModeMessage(false);
+        checkAbsoluteVolumeControlStatus(false);
+    }
+
+    /**
+     * Tests that the DUT sends the correct CEC messages when AVC is enabled and Android
+     * initiates volume changes.
+     */
+    @Test
+    public void testOutgoingVolumeUpdates() throws Exception {
+        // Enable AVC
+        setSettingsValue(HdmiCecConstants.SETTING_VOLUME_CONTROL_ENABLED,
+                HdmiCecConstants.VOLUME_CONTROL_ENABLED);
+        enableSystemAudioModeIfApplicable();
+        sendReportFeatures(true);
+        hdmiCecClient.checkExpectedOutput(hdmiCecClient.getSelfDevice(),
+                CecOperand.GIVE_AUDIO_STATUS);
+        hdmiCecClient.sendCecMessage(hdmiCecClient.getSelfDevice(), CecOperand.REPORT_AUDIO_STATUS,
+                CecMessage.formatParams(50));
+        checkAbsoluteVolumeControlStatus(true);
+
+        // Calling AudioManager#setStreamVolume should cause the DUT to send
+        // <Set Audio Volume Level> with the new volume level as a parameter
+        AudioManagerHelper.setDeviceVolume(getDevice(), 80);
+        String setAudioVolumeLevelMessage = hdmiCecClient.checkExpectedOutput(
+                hdmiCecClient.getSelfDevice(), CecOperand.SET_AUDIO_VOLUME_LEVEL);
+        assertThat(CecMessage.getParams(setAudioVolumeLevelMessage)).isEqualTo(80);
+
+        // Calling AudioManager#adjustStreamVolume should cause the DUT to send
+        // <User Control Pressed>, <User Control Released>, and <Give Audio Status>
+        AudioManagerHelper.raiseVolume(getDevice());
+        String userControlPressedMessage = hdmiCecClient.checkExpectedOutput(
+                hdmiCecClient.getSelfDevice(), CecOperand.USER_CONTROL_PRESSED);
+        assertThat(CecMessage.getParams(userControlPressedMessage))
+                .isEqualTo(HdmiCecConstants.CEC_KEYCODE_VOLUME_UP);
+        hdmiCecClient.checkExpectedOutput(hdmiCecClient.getSelfDevice(),
+                CecOperand.USER_CONTROL_RELEASED);
+        hdmiCecClient.checkExpectedOutput(hdmiCecClient.getSelfDevice(),
+                CecOperand.GIVE_AUDIO_STATUS);
+    }
+
+    /**
+     * Tests that the DUT notifies AudioManager when it receives <Report Audio Status> from the
+     * System Audio device.
+     */
+    @Test
+    public void testIncomingVolumeUpdates() throws Exception {
+        // Enable AVC
+        setSettingsValue(HdmiCecConstants.SETTING_VOLUME_CONTROL_ENABLED,
+                HdmiCecConstants.VOLUME_CONTROL_ENABLED);
+        enableSystemAudioModeIfApplicable();
+        sendReportFeatures(true);
+        hdmiCecClient.checkExpectedOutput(hdmiCecClient.getSelfDevice(),
+                CecOperand.GIVE_AUDIO_STATUS);
+        hdmiCecClient.sendCecMessage(hdmiCecClient.getSelfDevice(), CecOperand.REPORT_AUDIO_STATUS,
+                CecMessage.formatParams(50)); // Volume 50, mute off
+        checkAbsoluteVolumeControlStatus(true);
+
+        // Volume and mute status should match the initial <Report Audio Status>
+        assertApproximateDeviceVolumeAndMute(50, false);
+
+        // Test an incoming <Report Audio Status> that does not mute the device
+        hdmiCecClient.sendCecMessage(hdmiCecClient.getSelfDevice(), CecOperand.REPORT_AUDIO_STATUS,
+                CecMessage.formatParams(90)); // Volume 90, mute off
+        assertApproximateDeviceVolumeAndMute(90, false);
+
+        // Test an incoming <Report Audio Status> that mutes the device
+        hdmiCecClient.sendCecMessage(hdmiCecClient.getSelfDevice(), CecOperand.REPORT_AUDIO_STATUS,
+                CecMessage.formatParams(70 + 0b1000_0000)); // Volume 70, mute on
+        assertApproximateDeviceVolumeAndMute(0, true);
+    }
+
+    /**
+     * Enables System Audio Mode if the System Audio device is an Audio System.
+     */
+    private void enableSystemAudioModeIfApplicable() throws Exception {
+        if (hdmiCecClient.getSelfDevice() == LogicalAddress.AUDIO_SYSTEM) {
+            broadcastSystemAudioModeMessage(true);
+        }
+    }
+
+    /**
+     * Has the CEC client broadcast a message enabling or disabling System Audio Mode.
+     */
+    private void broadcastSystemAudioModeMessage(boolean val) throws Exception {
+        hdmiCecClient.sendCecMessage(
+                hdmiCecClient.getSelfDevice(),
+                LogicalAddress.BROADCAST,
+                CecOperand.SET_SYSTEM_AUDIO_MODE,
+                CecMessage.formatParams(val ? 1 : 0));
+    }
+
+    /**
+     * Has the CEC client send a <Report Features> message expressing support or lack of support for
+     * <Set Audio Volume Level>.
+     */
+    private void sendReportFeatures(boolean setAudioVolumeLevelSupport) throws Exception {
+        String deviceTypeNibble = hdmiCecClient.getSelfDevice() == LogicalAddress.TV
+                ? "80" : "08";
+        String featureSupportNibble = setAudioVolumeLevelSupport ? "01" : "00";
+        hdmiCecClient.sendCecMessage(hdmiCecClient.getSelfDevice(), CecOperand.REPORT_FEATURES,
+                "06:" + deviceTypeNibble + ":00:" + featureSupportNibble);
+    }
+
+    /**
+     * Checks that the status of Absolute Volume Control on the DUT to match the expected status.
+     * Waits and rechecks a limited number of times if the status does not currently match.
+     */
+    private void checkAbsoluteVolumeControlStatus(boolean enabledStatus) throws Exception {
+        String expectedStatus = enabledStatus ? "enabled" : "disabled";
+        waitForCondition(() -> getAbsoluteVolumeControlStatus() == enabledStatus,
+                "Absolute Volume Control was not " + expectedStatus + " when expected");
+    }
+
+    /**
+     * Returns the state of Absolute Volume Control on the DUT. This is determined by the
+     * volume behavior of the audio output device being used for HDMI audio.
+     */
+    private boolean getAbsoluteVolumeControlStatus() throws Exception {
+        return getDevice()
+                .executeShellCommand("dumpsys hdmi_control | grep mIsAbsoluteVolumeControlEnabled:")
+                .replace("mIsAbsoluteVolumeControlEnabled:", "").trim()
+                .equals("true");
+    }
+
+    /**
+     * Asserts that the DUT's volume (scale: [0, 100]) is within 5 points of an expected volume.
+     * This accounts for small differences due to rounding when converting between volume scales.
+     * Also asserts that the DUT's mute status is equal to {@code expectedMute}.
+     *
+     * Asserting both volume and mute at the same time saves a shell command because both are
+     * conveyed in a single log message.
+     */
+    private void assertApproximateDeviceVolumeAndMute(int expectedVolume, boolean expectedMute)
+            throws Exception {
+        // Raw output is equal to volume out of 100, plus 128 if muted
+        // In practice, if the stream is muted, volume equals 0, so this will be at most 128
+        int rawOutput = AudioManagerHelper.getDutAudioVolume(getDevice());
+
+        int actualVolume = rawOutput % 128;
+        assertWithMessage("Expected DUT to have volume " + expectedVolume
+                + " but was actually " + actualVolume)
+                .that(Math.abs(expectedVolume - actualVolume) <= 5)
+                .isTrue();
+
+        boolean actualMute = rawOutput >= 128;
+        String expectedMuteString = expectedMute ? "muted" : "unmuted";
+        String actualMuteString = actualMute ? "muted" : "unmuted";
+        assertWithMessage("Expected DUT to be " + expectedMuteString
+                + "but was actually " + actualMuteString)
+                .that(expectedMute)
+                .isEqualTo(actualMute);
+    }
+}
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/BaseHdmiCecCtsTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/BaseHdmiCecCtsTest.java
index f5a6454..83525e9 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/BaseHdmiCecCtsTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/BaseHdmiCecCtsTest.java
@@ -37,6 +37,7 @@
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -49,6 +50,8 @@
     private static final String POWER_CONTROL_MODE = "power_control_mode";
     private static final String POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST =
             "power_state_change_on_active_source_lost";
+    private static final String SET_MENU_LANGUAGE = "set_menu_language";
+    private static final String SET_MENU_LANGUAGE_ENABLED = "1";
 
     /** Enum contains the list of possible address types. */
     private enum AddressType {
@@ -164,10 +167,10 @@
         String line;
         String pattern =
                 "(.*?)"
-                        + "(mAddress: )"
+                        + "(mDeviceInfo:)(.*)(logical_address: )"
                         + "(?<"
                         + "logicalAddress"
-                        + ">\\p{Digit}{1,2})"
+                        + ">0x\\p{XDigit}{2})"
                         + "(.*?)";
         Pattern p = Pattern.compile(pattern);
         try {
@@ -369,9 +372,7 @@
     }
 
     public boolean isLanguageEditable() throws Exception {
-        String val = getDevice().executeShellCommand(
-                "getprop ro.hdmi.set_menu_language");
-        return val.trim().equals("true") ? true : false;
+        return getSettingsValue(SET_MENU_LANGUAGE).equals(SET_MENU_LANGUAGE_ENABLED);
     }
 
     public static String getSettingsValue(ITestDevice device, String setting) throws Exception {
@@ -383,14 +384,16 @@
         return getSettingsValue(getDevice(), setting);
     }
 
-    public static void setSettingsValue(ITestDevice device, String setting, String value)
+    public static String setSettingsValue(ITestDevice device, String setting, String value)
             throws Exception {
+        String val = getSettingsValue(device, setting);
         device.executeShellCommand("cmd hdmi_control cec_setting set " + setting + " " +
                 value);
+        return val;
     }
 
-    public void setSettingsValue(String setting, String value) throws Exception {
-        setSettingsValue(getDevice(), setting, value);
+    public String setSettingsValue(String setting, String value) throws Exception {
+        return setSettingsValue(getDevice(), setting, value);
     }
 
     public String getDeviceList() throws Exception {
@@ -501,22 +504,36 @@
                 .isEqualTo(wakefulness);
     }
 
+    /**
+     * Checks a given condition once every {@link HdmiCecConstants.SLEEP_TIMESTEP_SECONDS} seconds
+     * until it is true, or {@link HdmiCecConstants.MAX_SLEEP_TIME_SECONDS} seconds have passed.
+     * Triggers an assertion failure if the condition remains false after the time limit.
+     * @param condition Callable that returns whether the condition is met
+     * @param errorMessage The message to print if the condition is false
+     */
+    public void waitForCondition(Callable<Boolean> condition, String errorMessage)
+            throws Exception {
+        int waitTimeSeconds = 0;
+        boolean conditionState;
+        do {
+            TimeUnit.SECONDS.sleep(HdmiCecConstants.SLEEP_TIMESTEP_SECONDS);
+            waitTimeSeconds += HdmiCecConstants.SLEEP_TIMESTEP_SECONDS;
+            conditionState = condition.call();
+        } while (!conditionState && waitTimeSeconds <= HdmiCecConstants.MAX_SLEEP_TIME_SECONDS);
+        assertWithMessage(errorMessage).that(conditionState).isTrue();
+    }
+
     public void sendOtp() throws Exception {
         ITestDevice device = getDevice();
         device.executeShellCommand("cmd hdmi_control onetouchplay");
     }
 
     public String setPowerControlMode(String valToSet) throws Exception {
-        String val = getSettingsValue(POWER_CONTROL_MODE);
-        setSettingsValue(POWER_CONTROL_MODE, valToSet);
-        return val;
+        return setSettingsValue(POWER_CONTROL_MODE, valToSet);
     }
 
     public String setPowerStateChangeOnActiveSourceLost(String valToSet) throws Exception {
-        String previousPowerStateChange =
-                getSettingsValue(POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST);
-        setSettingsValue(POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST, valToSet);
-        return previousPowerStateChange;
+        return setSettingsValue(POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST, valToSet);
     }
 
     public boolean isDeviceActiveSource(ITestDevice device) throws DumpsysParseException {
@@ -554,6 +571,7 @@
             throws Exception {
         hdmiCecClient.clearClientOutput();
         device.executeShellCommand("cmd hdmi_control cec_setting set hdmi_cec_enabled 0");
+        waitForCondition(() -> !isCecAvailable(device), "Could not disable CEC");
         device.executeShellCommand("cmd hdmi_control cec_setting set hdmi_cec_enabled 1");
         // When a CEC device has just become available, the CEC adapter isn't able to send it
         // messages right away. Therefore we let the first <Give Power Status> message time-out, and
@@ -563,20 +581,36 @@
         hdmiCecClient.checkExpectedOutput(LogicalAddress.TV, CecOperand.GIVE_POWER_STATUS);
         hdmiCecClient.sendCecMessage(LogicalAddress.TV, source, CecOperand.REPORT_POWER_STATUS,
                 CecMessage.formatParams(HdmiCecConstants.CEC_POWER_STATUS_STANDBY));
-        checkIsCecAvailable(device);
+        waitForCondition(() -> isCecAvailable(device),
+                "Simulating that a sink is connected, failed.");
     }
 
-    private void checkIsCecAvailable(ITestDevice device) throws Exception {
-        boolean isCecAvailable;
-        int waitTimeSeconds = 0;
-        do {
-            TimeUnit.SECONDS.sleep(HdmiCecConstants.SLEEP_TIMESTEP_SECONDS);
-            waitTimeSeconds += HdmiCecConstants.SLEEP_TIMESTEP_SECONDS;
-            isCecAvailable =
-                    device.executeShellCommand("dumpsys hdmi_control | grep mIsCecAvailable:")
-                            .replace("mIsCecAvailable:", "").trim().equals("true");
-        } while (!isCecAvailable && waitTimeSeconds <= HdmiCecConstants.MAX_SLEEP_TIME_SECONDS);
-        assertWithMessage("Simulating that a sink is connected, failed.")
-                .that(isCecAvailable).isTrue();
+    boolean isCecAvailable(ITestDevice device) throws Exception {
+        return device.executeShellCommand("dumpsys hdmi_control | grep mIsCecAvailable:")
+                .replace("mIsCecAvailable:", "").trim().equals("true");
+    }
+
+    /**
+     * Returns whether an audio output device is using full volume behavior by checking if it is in
+     * the "mFullVolumeDevices" line in audio dumpsys. Example: "mFullVolumeDevices=0x400,0x40001".
+     */
+    public boolean isFullVolumeDevice(int audioOutputDevice) throws Exception {
+        String[] splitLine = getDevice().executeShellCommand(
+                "dumpsys audio | grep mFullVolumeDevices").split("=");
+        if (splitLine.length < 2) {
+            // No full volume devices
+            return false;
+        }
+        String[] deviceStrings = splitLine[1].trim().split(",");
+        for (String deviceString : deviceStrings) {
+            try {
+                if (Integer.decode(deviceString) == audioOutputDevice) {
+                    return true;
+                }
+            } catch (NumberFormatException e) {
+                // Ignore this device and continue
+            }
+        }
+        return false;
     }
 }
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/CecOperand.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/CecOperand.java
index 88362d8..a5be8bf 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/CecOperand.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/CecOperand.java
@@ -42,6 +42,7 @@
     SYSTEM_AUDIO_MODE_REQUEST(0x70),
     GIVE_AUDIO_STATUS(0x71),
     SET_SYSTEM_AUDIO_MODE(0x72),
+    SET_AUDIO_VOLUME_LEVEL(0x73),
     REPORT_AUDIO_STATUS(0x7a),
     GIVE_SYSTEM_AUDIO_MODE_STATUS(0x7d),
     SYSTEM_AUDIO_MODE_STATUS(0x7e),
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/HdmiCecConstants.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/HdmiCecConstants.java
index 6ae8992..f1b22f9 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/HdmiCecConstants.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/HdmiCecConstants.java
@@ -156,6 +156,7 @@
 
     // CEC Settings Values
     public static final String VOLUME_CONTROL_ENABLED = "1";
+    public static final String VOLUME_CONTROL_DISABLED = "0";
 
     // Power Control Modes for source devices
     public static final String POWER_CONTROL_MODE_BROADCAST = "broadcast";
@@ -166,7 +167,57 @@
     public static final String POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST_NONE = "none";
     public static final String POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST_STANDBY_NOW = "standby_now";
 
+    // Short Audio Descriptors that can be queried
+    public static final String QUERY_SAD_LPCM = "query_sad_lpcm";
+    public static final String QUERY_SAD_DD = "query_sad_dd";
+    public static final String QUERY_SAD_MPEG1 = "query_sad_mpeg1";
+    public static final String QUERY_SAD_MP3 = "query_sad_mp3";
+    public static final String QUERY_SAD_MPEG2 = "query_sad_mpeg2";
+    public static final String QUERY_SAD_AAC = "query_sad_aac";
+    public static final String QUERY_SAD_DTS = "query_sad_dts";
+    public static final String QUERY_SAD_ATRAC = "query_sad_atrac";
+    public static final String QUERY_SAD_ONEBITAUDIO = "query_sad_onebitaudio";
+    public static final String QUERY_SAD_DDP = "query_sad_ddp";
+    public static final String QUERY_SAD_DTSHD = "query_sad_dtshd";
+    public static final String QUERY_SAD_TRUEHD = "query_sad_truehd";
+    public static final String QUERY_SAD_DST = "query_sad_dst";
+    public static final String QUERY_SAD_WMAPRO = "query_sad_wmapro";
+    public static final String QUERY_SAD_MAX = "query_sad_max";
+
+    // Whether to query an SAD or not
+    public static final String QUERY_SAD_DISABLED = "0";
+    public static final String QUERY_SAD_ENABLED = "1";
+
+    // Audio codecs
+    public static final int AUDIO_CODEC_NONE = 0x0;
+    public static final int AUDIO_CODEC_LPCM = 0x1; // Support LPCMs
+    public static final int AUDIO_CODEC_DD = 0x2; // Support DD
+    public static final int AUDIO_CODEC_MPEG1 = 0x3; // Support MPEG1
+    public static final int AUDIO_CODEC_MP3 = 0x4; // Support MP3
+    public static final int AUDIO_CODEC_MPEG2 = 0x5; // Support MPEG2
+    public static final int AUDIO_CODEC_AAC = 0x6; // Support AAC
+    public static final int AUDIO_CODEC_DTS = 0x7; // Support DTS
+    public static final int AUDIO_CODEC_ATRAC = 0x8; // Support ATRAC
+    public static final int AUDIO_CODEC_ONEBITAUDIO = 0x9; // Support One-Bit Audio
+    public static final int AUDIO_CODEC_DDP = 0xA; // Support DDP
+    public static final int AUDIO_CODEC_DTSHD = 0xB; // Support DTSHD
+    public static final int AUDIO_CODEC_TRUEHD = 0xC; // Support MLP/TRUE-HD
+    public static final int AUDIO_CODEC_DST = 0xD; // Support DST
+    public static final int AUDIO_CODEC_WMAPRO = 0xE; // Support WMA-Pro
+    public static final int AUDIO_CODEC_MAX = 0xF;
+
     // CEC 2.0 Report Feature Bits
     public static final int FEATURES_SINK_SUPPORTS_ARC_TX_BIT = 0x4;
     public static final int FEATURES_SINK_SUPPORTS_ARC_RX_BIT = 0x2;
+
+    // Audio device types from AudioDeviceInfo
+    public static final int DEVICE_OUT_HDMI = 0x400;
+    public static final int DEVICE_OUT_HDMI_ARC = 0x40000;
+    public static final int DEVICE_OUT_HDMI_EARC = 0x40001;
+
+    // Volume behavior constants from AudioManager
+    public static final int DEVICE_VOLUME_BEHAVIOR_VARIABLE = 0;
+    public static final int DEVICE_VOLUME_BEHAVIOR_FULL = 1;
+    public static final int DEVICE_VOLUME_BEHAVIOR_FIXED = 2;
+    public static final int DEVICE_VOLUME_BEHAVIOR_ABSOLUTE = 3;
 }
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecAudioReturnChannelControlTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecAudioReturnChannelControlTest.java
index 72a2cf0..8c12d54 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecAudioReturnChannelControlTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecAudioReturnChannelControlTest.java
@@ -20,18 +20,18 @@
 import android.hdmicec.cts.BaseHdmiCecCtsTest;
 import android.hdmicec.cts.CecMessage;
 import android.hdmicec.cts.CecOperand;
-import android.hdmicec.cts.error.CecClientWrapperException;
-import android.hdmicec.cts.error.ErrorCodes;
 import android.hdmicec.cts.HdmiCecConstants;
 import android.hdmicec.cts.LogicalAddress;
+import android.hdmicec.cts.error.CecClientWrapperException;
+import android.hdmicec.cts.error.ErrorCodes;
 
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
 import org.junit.Ignore;
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
-import org.junit.Test;
 
 /** HDMI CEC test to test audio return channel control (Section 11.2.17) */
 @Ignore("b/162820841")
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecInvalidMessagesTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecInvalidMessagesTest.java
index 1b36a61..b36c673 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecInvalidMessagesTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecInvalidMessagesTest.java
@@ -21,9 +21,9 @@
 import android.hdmicec.cts.CecMessage;
 import android.hdmicec.cts.CecOperand;
 import android.hdmicec.cts.HdmiCecConstants;
+import android.hdmicec.cts.LogicalAddress;
 import android.hdmicec.cts.error.CecClientWrapperException;
 import android.hdmicec.cts.error.ErrorCodes;
-import android.hdmicec.cts.LogicalAddress;
 
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecLogicalAddressTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecLogicalAddressTest.java
index 6c251a2..0ffc025 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecLogicalAddressTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecLogicalAddressTest.java
@@ -21,20 +21,17 @@
 import android.hdmicec.cts.BaseHdmiCecCtsTest;
 import android.hdmicec.cts.CecMessage;
 import android.hdmicec.cts.CecOperand;
-import android.hdmicec.cts.HdmiCecClientWrapper;
 import android.hdmicec.cts.HdmiCecConstants;
 import android.hdmicec.cts.LogicalAddress;
-import android.hdmicec.cts.RequiredPropertyRule;
-import android.hdmicec.cts.RequiredFeatureRule;
 
 import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
 import org.junit.Ignore;
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
-import org.junit.Test;
 
 /** HDMI CEC test to verify logical address after device reboot (Section 10.2.5) */
 @Ignore("b/162820841")
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecSystemAudioModeTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecSystemAudioModeTest.java
index e27ae7e..3acab1c 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecSystemAudioModeTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/audio/HdmiCecSystemAudioModeTest.java
@@ -19,8 +19,6 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
-import com.google.common.collect.Range;
-
 import android.hdmicec.cts.AudioManagerHelper;
 import android.hdmicec.cts.BaseHdmiCecCtsTest;
 import android.hdmicec.cts.CecMessage;
@@ -30,12 +28,14 @@
 
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
+import com.google.common.collect.Range;
+
 import org.junit.After;
 import org.junit.Ignore;
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
-import org.junit.Test;
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecSystemStandbyTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecSystemStandbyTest.java
index 6541ca6..e8b1d8d 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecSystemStandbyTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/common/HdmiCecSystemStandbyTest.java
@@ -36,7 +36,9 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-/** HDMI CEC test to verify the device handles standby correctly (Section 11.1.3, 11.2.3) */
+/**
+ * HDMI CEC test to verify the device handles standby correctly (Section 11.1.3, 11.2.3)
+ */
 @RunWith(DeviceJUnit4ClassRunner.class)
 public final class HdmiCecSystemStandbyTest extends BaseHdmiCecCtsTest {
 
@@ -50,7 +52,8 @@
 
     @Rule
     public RuleChain ruleChain =
-            RuleChain.outerRule(CecRules.requiresCec(this))
+            RuleChain
+                    .outerRule(CecRules.requiresCec(this))
                     .around(CecRules.requiresLeanback(this))
                     .around(hdmiCecClient);
 
@@ -83,7 +86,7 @@
                 WakeLockHelper.acquirePartialWakeLock(device);
                 hdmiCecClient.sendCecMessage(source, LogicalAddress.BROADCAST, CecOperand.STANDBY);
                 checkStandbyAndWakeUp();
-    }
+            }
         }
     }
 
@@ -100,7 +103,7 @@
                 WakeLockHelper.acquirePartialWakeLock(device);
                 hdmiCecClient.sendCecMessage(source, CecOperand.STANDBY);
                 checkStandbyAndWakeUp();
-    }
+            }
         }
     }
 
@@ -132,7 +135,7 @@
         mLogicalAddresses.add(LogicalAddress.AUDIO_SYSTEM);
 
         if (hasDeviceType(HdmiCecConstants.CEC_DEVICE_TYPE_TV)) {
-            // Add logical addresses 13, 14 only for TV panel tests.
+            //Add logical addresses 13, 14 only for TV panel tests.
             mLogicalAddresses.add(LogicalAddress.RESERVED_2);
             mLogicalAddresses.add(LogicalAddress.SPECIFIC_USE);
         }
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecActiveTrackingTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecActiveTrackingTest.java
index 76c0688..949a3d5 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecActiveTrackingTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecActiveTrackingTest.java
@@ -34,14 +34,14 @@
 import java.util.concurrent.TimeUnit;
 
 /**
- * HDMI CEC tests verifying power status related messages of the device (CEC 2.0 CTS Section 7.6)
+ * HDMI CEC tests verifying the active tracking mechanism of the CEC network for Playback devices
  */
 @RunWith(DeviceJUnit4ClassRunner.class)
 public final class HdmiCecActiveTrackingTest extends BaseHdmiCecCtsTest {
     // Delay to allow the DUT to poll all the non-local logical addresses (seconds)
     private static final int POLLING_WAIT_TIME = 5;
-    // Delay to wait for the HotplugDetectionAction to pass (seconds)
-    private static final int HOTPLUG_WAIT_TIME = 60;
+    // Delay to wait for the HotplugDetectionAction to start (milliseconds)
+    private static final int HOTPLUG_WAIT_TIME = 60000;
 
     public HdmiCecActiveTrackingTest() {
         super(HdmiCecConstants.CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
@@ -65,13 +65,13 @@
 
     /**
      * Tests that the DUT removes a device from the network, when it doesn't answer to the polling
-     * message sent by HotplugDetection action.
+     * message sent by HotplugDetectionAction.
      */
     @Test
     public void cect_RemoveDeviceFromNetwork() throws Exception {
         // Wait for the device discovery action to pass.
         TimeUnit.SECONDS.sleep(POLLING_WAIT_TIME);
-        // Add Playback 2 in the network.
+        // Add an external playback device to the network.
         int playback2PhysicalAddress = createUnusedPhysicalAddress(getDumpsysPhysicalAddress());
         String formattedPhysicalAddress = CecMessage.formatParams(playback2PhysicalAddress,
                 HdmiCecConstants.PHYSICAL_ADDRESS_LENGTH);
@@ -90,8 +90,11 @@
                 CecOperand.SET_OSD_NAME,
                 CecMessage.convertStringToHexParams(deviceName)
         );
-        // Wait for the first HotplugDetection action to pass.
-        TimeUnit.SECONDS.sleep(HOTPLUG_WAIT_TIME);
+        // Wait for the first HotplugDetectionAction to start and leave enough time to poll all
+        // devices once.
+        hdmiCecClient.checkExpectedOutput(LogicalAddress.SPECIFIC_USE, CecOperand.POLL,
+                HOTPLUG_WAIT_TIME + HdmiCecConstants.DEVICE_WAIT_TIME_MS);
+        TimeUnit.SECONDS.sleep(HdmiCecConstants.DEVICE_WAIT_TIME_SECONDS);
         String deviceList = getDeviceList();
         assertThat(deviceList).doesNotContain(deviceName);
     }
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecAvcToTvTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecAvcToTvTest.java
new file mode 100644
index 0000000..f601312
--- /dev/null
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecAvcToTvTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2022 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 android.hdmicec.cts.playback;
+
+import android.hdmicec.cts.BaseHdmiCecAbsoluteVolumeControlTest;
+import android.hdmicec.cts.BaseHdmiCecCtsTest;
+import android.hdmicec.cts.HdmiCecConstants;
+
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.Rule;
+import org.junit.rules.RuleChain;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for Absolute Volume Control where the DUT is a Playback device and the
+ * System Audio device is a TV.
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class HdmiCecAvcToTvTest extends BaseHdmiCecAbsoluteVolumeControlTest {
+
+    /**
+     * No need to pass in client parameters because the client is started as TV as long as the
+     * DUT is not a TV.
+     */
+    public HdmiCecAvcToTvTest() {
+        super(HdmiCecConstants.CEC_DEVICE_TYPE_PLAYBACK_DEVICE);
+    }
+
+    @Rule
+    public RuleChain ruleChain =
+            RuleChain.outerRule(BaseHdmiCecCtsTest.CecRules.requiresCec(this))
+                    .around(BaseHdmiCecCtsTest.CecRules.requiresLeanback(this))
+                    .around(
+                            BaseHdmiCecCtsTest.CecRules.requiresDeviceType(
+                                    this, HdmiCecConstants.CEC_DEVICE_TYPE_PLAYBACK_DEVICE))
+                    .around(hdmiCecClient);
+}
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecDeviceOsdNameTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecDeviceOsdNameTest.java
index afe78d4..459f260 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecDeviceOsdNameTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecDeviceOsdNameTest.java
@@ -29,9 +29,9 @@
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
-import org.junit.Test;
 
 /** HDMI CEC tests related to the device reporting the device OSD name (Section 11.2.11) */
 @RunWith(DeviceJUnit4ClassRunner.class)
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecRoutingControlTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecRoutingControlTest.java
index 65da394..fc5ea0c 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecRoutingControlTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecRoutingControlTest.java
@@ -23,14 +23,15 @@
 import android.hdmicec.cts.CecOperand;
 import android.hdmicec.cts.HdmiCecConstants;
 import android.hdmicec.cts.LogicalAddress;
+import android.hdmicec.cts.WakeLockHelper;
 
 import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
-import org.junit.Test;
 
 import java.util.concurrent.TimeUnit;
 
@@ -152,4 +153,54 @@
             setPowerControlMode(previousPowerControlMode);
         }
     }
+
+    /**
+     * Tests that if the device is configured to go to sleep when losing the active source status,
+     * it behaves as expected.
+     */
+    @Test
+    public void testPowerStateChangeOnActiveSourceLost_standby() throws Exception {
+        String previousActionOnActiveSourceLost = setPowerStateChangeOnActiveSourceLost(
+                HdmiCecConstants.POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST_STANDBY_NOW);
+        try {
+            ITestDevice device = getDevice();
+            // Make sure that the DUT is the active source
+            device.executeShellCommand("input keyevent KEYCODE_HOME");
+            TimeUnit.SECONDS.sleep(HdmiCecConstants.DEVICE_WAIT_TIME_SECONDS);
+            WakeLockHelper.acquirePartialWakeLock(device);
+            // Now make the TV the active source
+            hdmiCecClient.sendCecMessage(LogicalAddress.TV, LogicalAddress.BROADCAST,
+                    CecOperand.ACTIVE_SOURCE, CecMessage.formatParams("0000"));
+            assertDeviceWakefulness(HdmiCecConstants.WAKEFULNESS_ASLEEP);
+        } finally {
+            /* Wake up the device */
+            wakeUpDevice();
+            setPowerStateChangeOnActiveSourceLost(previousActionOnActiveSourceLost);
+        }
+    }
+
+    /**
+     * Tests that if the device is configured not to go to sleep when losing the active source
+     * status, it behaves as expected.
+     */
+    @Test
+    public void testPowerStateChangeOnActiveSourceLost_none() throws Exception {
+        String previousActionOnActiveSourceLost = setPowerStateChangeOnActiveSourceLost(
+                HdmiCecConstants.POWER_STATE_CHANGE_ON_ACTIVE_SOURCE_LOST_NONE);
+        try {
+            ITestDevice device = getDevice();
+            // Make sure that the DUT is the active source
+            device.executeShellCommand("input keyevent KEYCODE_HOME");
+            TimeUnit.SECONDS.sleep(HdmiCecConstants.DEVICE_WAIT_TIME_SECONDS);
+            WakeLockHelper.acquirePartialWakeLock(device);
+            // Now make the TV the active source
+            hdmiCecClient.sendCecMessage(LogicalAddress.TV, LogicalAddress.BROADCAST,
+                    CecOperand.ACTIVE_SOURCE, CecMessage.formatParams("0000"));
+            assertDeviceWakefulness(HdmiCecConstants.WAKEFULNESS_AWAKE);
+        } finally {
+            /* Wake up the device */
+            wakeUpDevice();
+            setPowerStateChangeOnActiveSourceLost(previousActionOnActiveSourceLost);
+        }
+    }
 }
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecSystemInformationTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecSystemInformationTest.java
index df9da7c..bd56af9 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecSystemInformationTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecSystemInformationTest.java
@@ -18,7 +18,6 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 import android.hdmicec.cts.BaseHdmiCecCtsTest;
@@ -67,27 +66,6 @@
     }
 
     /**
-     * Test 11.2.6-3
-     * Tests that the device handles a <SET_MENU_LANGUAGE> with a valid language correctly.
-     */
-    @Test
-    public void cect_11_2_6_3_SetValidMenuLanguage() throws Exception {
-        assumeTrue(isLanguageEditable());
-        final String locale = getSystemLocale();
-        final String originalLanguage = extractLanguage(locale);
-        final String language = originalLanguage.equals("spa") ? "eng" : "spa";
-        final String newLanguage = originalLanguage.equals("spa") ? "en" : "es";
-        try {
-            hdmiCecClient.sendCecMessage(LogicalAddress.TV, LogicalAddress.BROADCAST,
-                    CecOperand.SET_MENU_LANGUAGE, CecMessage.convertStringToHexParams(language));
-            TimeUnit.SECONDS.sleep(5);
-            assertThat(extractLanguage(getSystemLocale())).isEqualTo(newLanguage);
-        } finally {
-            setSystemLocale(locale);
-        }
-    }
-
-    /**
      * Test 11.2.6-4
      * Tests that the device ignores a <SET_MENU_LANGUAGE> with an invalid language.
      */
@@ -127,35 +105,6 @@
     }
 
     /**
-     * ro.hdmi.set_menu_language should always be false, due to issues with misbehaving TVs.
-     * To be removed when better handling for <SET MENU LANGUAGE> is implemented in b/195504595.
-     */
-    @Test
-    public void setMenuLanguageIsDisabled() throws Exception {
-        assertThat(isLanguageEditable()).isFalse();
-    }
-
-    /**
-     * Tests that <SET MENU LANGUAGE> from a valid source is ignored when ro.hdmi.set_menu_language
-     * is false.
-     */
-    @Test
-    public void setMenuLanguageNotHandledWhenDisabled() throws Exception {
-        assumeFalse(isLanguageEditable());
-        final String locale = getSystemLocale();
-        final String originalLanguage = extractLanguage(locale);
-        final String language = originalLanguage.equals("spa") ? "eng" : "spa";
-        try {
-            hdmiCecClient.sendCecMessage(LogicalAddress.TV, LogicalAddress.BROADCAST,
-                    CecOperand.SET_MENU_LANGUAGE, CecMessage.convertStringToHexParams(language));
-            TimeUnit.SECONDS.sleep(5);
-            assertThat(extractLanguage(getSystemLocale())).isEqualTo(originalLanguage);
-        } finally {
-            setSystemLocale(locale);
-        }
-    }
-
-    /**
      * Test HF4-11-4 (CEC 2.0)
      *
      * <p>Tests that the DUT responds to {@code <Give Features>} with "Sink supports ARC Tx" bit not
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecTvPowerToggleTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecTvPowerToggleTest.java
index 125b1e3..cba024b 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecTvPowerToggleTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/playback/HdmiCecTvPowerToggleTest.java
@@ -27,10 +27,9 @@
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
 import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
-import org.junit.Test;
-
 
 import java.util.concurrent.TimeUnit;
 
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecAbsoluteVolumeControlFollowerTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecAbsoluteVolumeControlFollowerTest.java
new file mode 100644
index 0000000..77dbcb2
--- /dev/null
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecAbsoluteVolumeControlFollowerTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2022 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 android.hdmicec.cts.tv;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.hdmicec.cts.AudioManagerHelper;
+import android.hdmicec.cts.BaseHdmiCecCtsTest;
+import android.hdmicec.cts.CecMessage;
+import android.hdmicec.cts.CecOperand;
+import android.hdmicec.cts.HdmiCecConstants;
+import android.hdmicec.cts.LogicalAddress;
+
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests TV behavior when it receives <Set Audio Volume Level>.
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class HdmiCecAbsoluteVolumeControlFollowerTest extends BaseHdmiCecCtsTest {
+    public HdmiCecAbsoluteVolumeControlFollowerTest() {
+        super(HdmiCecConstants.CEC_DEVICE_TYPE_TV, "-t", "p", "-t", "a");
+    }
+
+    @Rule
+    public RuleChain ruleChain =
+            RuleChain.outerRule(CecRules.requiresCec(this))
+                    .around(CecRules.requiresLeanback(this))
+                    .around(CecRules.requiresDeviceType(this, HdmiCecConstants.CEC_DEVICE_TYPE_TV))
+                    .around(hdmiCecClient);
+
+    /**
+     * Tests that if System Audio Mode is enabled, the TV responds to <Set Audio Volume Level>
+     * with <Feature Abort>[Not in correct mode to respond]
+     */
+    @Test
+    public void testSystemAudioModeOn_respondsFeatureAbort() throws Exception {
+        AudioManagerHelper.unmuteDevice(getDevice());
+
+        int initialDeviceVolume = AudioManagerHelper.getDutAudioVolume(getDevice());
+
+        getDevice().executeShellCommand("cmd hdmi_control setsam on");
+
+        hdmiCecClient.sendCecMessage(LogicalAddress.PLAYBACK_1,
+                CecOperand.SET_AUDIO_VOLUME_LEVEL,
+                CecMessage.formatParams((initialDeviceVolume + 50) % 101));
+
+        // Check that the DUT sent
+        // <Feature Abort>[Set Audio Volume Level, Not in correct mode to respond]
+        String featureAbort = hdmiCecClient.checkExpectedOutput(
+                LogicalAddress.PLAYBACK_1, CecOperand.FEATURE_ABORT);
+        assertThat(CecOperand.getOperand(CecMessage.getParams(featureAbort, 0, 2)))
+                .isEqualTo(CecOperand.SET_AUDIO_VOLUME_LEVEL);
+        assertThat(CecMessage.getParams(featureAbort, 2, 4)).isEqualTo(1);
+
+        // Check that volume did not change
+        assertThat(AudioManagerHelper.getDutAudioVolume(getDevice()))
+                .isEqualTo(initialDeviceVolume);
+    }
+
+    /**
+     * Tests that if System Audio Mode is disabled, the TV updates its volume after receiving
+     * <Set Audio Volume Level>
+     */
+    @Test
+    public void testSystemAudioModeOff_updatesVolume() throws Exception {
+        // Wait for CEC adapter to enable System Audio Mode before turning it off
+        hdmiCecClient.checkExpectedMessageFromClient(LogicalAddress.AUDIO_SYSTEM,
+                LogicalAddress.TV, CecOperand.SYSTEM_AUDIO_MODE_STATUS);
+
+        getDevice().executeShellCommand("cmd hdmi_control setsam off");
+
+        AudioManagerHelper.unmuteDevice(getDevice());
+
+        int initialDeviceVolume = AudioManagerHelper.getDutAudioVolume(getDevice());
+        try {
+            int volumeToSet = (initialDeviceVolume + 50) % 101;
+            hdmiCecClient.sendCecMessage(LogicalAddress.PLAYBACK_1,
+                    CecOperand.SET_AUDIO_VOLUME_LEVEL,
+                    CecMessage.formatParams(volumeToSet));
+
+            // Check that no <Feature Abort> was sent
+            hdmiCecClient.checkOutputDoesNotContainMessage(LogicalAddress.PLAYBACK_1,
+                    CecOperand.FEATURE_ABORT);
+
+            // Check that device volume is within 5 points of the expected volume.
+            // This accounts for rounding errors due to volume scale conversions.
+            int deviceVolume = AudioManagerHelper.getDutAudioVolume(getDevice());
+            assertWithMessage("Expected DUT to have volume " + volumeToSet
+                    + " but was actually " + deviceVolume)
+                    .that(Math.abs(volumeToSet - deviceVolume) <= 5)
+                    .isTrue();
+        } finally {
+            AudioManagerHelper.setDeviceVolume(getDevice(), initialDeviceVolume);
+        }
+    }
+}
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecAudioReturnChannelControlTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecAudioReturnChannelControlTest.java
index 2363df9..8d89035 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecAudioReturnChannelControlTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecAudioReturnChannelControlTest.java
@@ -32,6 +32,9 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
+import java.util.Arrays;
+import java.util.HashSet;
+
 /** HDMI CEC test to test audio return channel control (Section 11.2.17) */
 @RunWith(DeviceJUnit4ClassRunner.class)
 public final class HdmiCecAudioReturnChannelControlTest extends BaseHdmiCecCtsTest {
@@ -152,6 +155,99 @@
     }
 
     /**
+     * Test Short Audio Descriptor feature
+     *
+     * <p>Enables ARC and validates that the DUT sends {@code <Request Short Audio Descriptor>}
+     * messages for the codecs it was configured to query.
+     */
+    @Ignore("b/174813656")
+    @Test
+    public void shortAudioDescriptorsRequested() throws Exception {
+        String previousQuerySadLpcm = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_LPCM, HdmiCecConstants.QUERY_SAD_ENABLED);
+        String previousQuerySadDd = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_DD, HdmiCecConstants.QUERY_SAD_ENABLED);
+        String previousQuerySadMpeg1 = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_MPEG1, HdmiCecConstants.QUERY_SAD_ENABLED);
+        String previousQuerySadMp3 = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_MP3, HdmiCecConstants.QUERY_SAD_ENABLED);
+        String previousQuerySadMpeg2 = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_MPEG2, HdmiCecConstants.QUERY_SAD_ENABLED);
+        String previousQuerySadAac = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_AAC, HdmiCecConstants.QUERY_SAD_ENABLED);
+        String previousQuerySadDts = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_DTS, HdmiCecConstants.QUERY_SAD_DISABLED);
+        String previousQuerySadAtrac = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_ATRAC, HdmiCecConstants.QUERY_SAD_DISABLED);
+        String previousQuerySadOneBitAudio = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_ONEBITAUDIO, HdmiCecConstants.QUERY_SAD_DISABLED);
+        String previousQuerySadDdp = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_DDP, HdmiCecConstants.QUERY_SAD_DISABLED);
+        String previousQuerySadDtshd = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_DTSHD, HdmiCecConstants.QUERY_SAD_DISABLED);
+        String previousQuerySadTruehd = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_TRUEHD, HdmiCecConstants.QUERY_SAD_DISABLED);
+        String previousQuerySadDst = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_DST, HdmiCecConstants.QUERY_SAD_DISABLED);
+        String previousQuerySadWmapro = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_WMAPRO, HdmiCecConstants.QUERY_SAD_DISABLED);
+        String previousQuerySadMax = setSettingsValue(
+                HdmiCecConstants.QUERY_SAD_MAX, HdmiCecConstants.QUERY_SAD_DISABLED);
+        HashSet<Integer> expectedCodecs = new HashSet<>(Arrays.asList(
+                        HdmiCecConstants.AUDIO_CODEC_LPCM,
+                        HdmiCecConstants.AUDIO_CODEC_DD,
+                        HdmiCecConstants.AUDIO_CODEC_MPEG1,
+                        HdmiCecConstants.AUDIO_CODEC_MP3,
+                        HdmiCecConstants.AUDIO_CODEC_MPEG2,
+                        HdmiCecConstants.AUDIO_CODEC_AAC));
+        try {
+            String params =
+                    String.format(
+                            "%04d%02d",
+                            hdmiCecClient.getPhysicalAddress(),
+                            HdmiCecConstants.CEC_DEVICE_TYPE_AUDIO_SYSTEM);
+            hdmiCecClient.sendCecMessage(
+                    LogicalAddress.AUDIO_SYSTEM,
+                    LogicalAddress.BROADCAST,
+                    CecOperand.REPORT_PHYSICAL_ADDRESS,
+                    CecMessage.formatParams(params));
+            hdmiCecClient.sendCecMessage(
+                    LogicalAddress.AUDIO_SYSTEM, LogicalAddress.TV, CecOperand.INITIATE_ARC);
+            String requestSad1 = hdmiCecClient.checkExpectedOutput(LogicalAddress.AUDIO_SYSTEM,
+                    CecOperand.REQUEST_SHORT_AUDIO_DESCRIPTOR);
+            HashSet<Integer> codecs = new HashSet<>();
+            for (int i = 0; i < 4; i++) {
+                codecs.add(CecMessage.getParams(requestSad1, 2 * i, 2 * i + 2));
+            }
+            String requestSad2 = hdmiCecClient.checkExpectedOutput(LogicalAddress.AUDIO_SYSTEM,
+                    CecOperand.REQUEST_SHORT_AUDIO_DESCRIPTOR);
+            for (int i = 0; i < 2; i++) {
+                codecs.add(CecMessage.getParams(requestSad2, 2 * i, 2 * i + 2));
+            }
+            assertWithMessage(
+                    "Requested codecs are " + codecs + " but expected to be " + expectedCodecs)
+                    .that(codecs)
+                    .isEqualTo(expectedCodecs);
+        } finally {
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_LPCM, previousQuerySadLpcm);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_DD, previousQuerySadDd);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_MPEG1, previousQuerySadMpeg1);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_MP3, previousQuerySadMp3);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_MPEG2, previousQuerySadMpeg2);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_AAC, previousQuerySadAac);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_DTS, previousQuerySadDts);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_ATRAC, previousQuerySadAtrac);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_ONEBITAUDIO, previousQuerySadOneBitAudio);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_DDP, previousQuerySadDdp);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_DTSHD, previousQuerySadDtshd);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_TRUEHD, previousQuerySadTruehd);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_DST, previousQuerySadDst);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_WMAPRO, previousQuerySadWmapro);
+            setSettingsValue(HdmiCecConstants.QUERY_SAD_MAX, previousQuerySadMax);
+        }
+    }
+
+    /**
      * This method will turn on/off the ARC and ensure that it is processed successfully.
      *
      * @param enabled boolean value. Value true to turn ARC on.
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecRoutingControlTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecRoutingControlTest.java
index 75d006a..55723a4 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecRoutingControlTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecRoutingControlTest.java
@@ -21,11 +21,11 @@
 import android.hdmicec.cts.BaseHdmiCecCtsTest;
 import android.hdmicec.cts.CecMessage;
 import android.hdmicec.cts.CecOperand;
-import android.hdmicec.cts.error.CecClientWrapperException;
-import android.hdmicec.cts.error.ErrorCodes;
 import android.hdmicec.cts.HdmiCecConstants;
 import android.hdmicec.cts.HdmiControlManagerUtility;
 import android.hdmicec.cts.LogicalAddress;
+import android.hdmicec.cts.error.CecClientWrapperException;
+import android.hdmicec.cts.error.ErrorCodes;
 
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
diff --git a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecTvStandbyTest.java b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecTvStandbyTest.java
index d3b6d1d..220c774 100644
--- a/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecTvStandbyTest.java
+++ b/hostsidetests/hdmicec/src/android/hdmicec/cts/tv/HdmiCecTvStandbyTest.java
@@ -30,12 +30,13 @@
 import org.junit.runner.RunWith;
 
 
-import static com.google.common.truth.Truth.assertWithMessage;
-
 /** HDMI CEC tests for system standby features (Section 11.1.3) */
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class HdmiCecTvStandbyTest extends BaseHdmiCecCtsTest {
 
+    private static final String TV_SEND_STANDBY_ON_SLEEP = "tv_send_standby_on_sleep";
+    private static final String TV_SEND_STANDBY_ON_SLEEP_ENABLED = "1";
+
     public HdmiCecTvStandbyTest() {
         super(HdmiCecConstants.CEC_DEVICE_TYPE_TV);
     }
@@ -47,9 +48,6 @@
                     .around(CecRules.requiresDeviceType(this, HdmiCecConstants.CEC_DEVICE_TYPE_TV))
                     .around(hdmiCecClient);
 
-    private static final String HDMI_CONTROL_DEVICE_AUTO_OFF =
-            "hdmi_control_auto_device_off_enabled";
-
     /**
      * Test 11.1.3-1
      *
@@ -60,25 +58,14 @@
     public void cect_11_1_3_1_BroadcastStandby() throws Exception {
         ITestDevice device = getDevice();
         device.waitForBootComplete(HdmiCecConstants.REBOOT_TIMEOUT);
-        boolean wasOn = setHdmiControlDeviceAutoOff(true);
+        String value = getSettingsValue(TV_SEND_STANDBY_ON_SLEEP);
+        setSettingsValue(TV_SEND_STANDBY_ON_SLEEP, TV_SEND_STANDBY_ON_SLEEP_ENABLED);
         try {
             sendDeviceToSleep();
             hdmiCecClient.checkExpectedOutput(LogicalAddress.BROADCAST, CecOperand.STANDBY);
         } finally {
             wakeUpDevice();
-            setHdmiControlDeviceAutoOff(wasOn);
+            setSettingsValue(TV_SEND_STANDBY_ON_SLEEP, value);
         }
     }
-
-    private boolean setHdmiControlDeviceAutoOff(boolean turnOn) throws Exception {
-        ITestDevice device = getDevice();
-        String val =
-                device.executeShellCommand("settings get global " + HDMI_CONTROL_DEVICE_AUTO_OFF)
-                        .trim();
-        String valToSet = turnOn ? "1" : "0";
-        device.executeShellCommand(
-                "settings put global " + HDMI_CONTROL_DEVICE_AUTO_OFF + " " + valToSet);
-        device.executeShellCommand("settings get global " + HDMI_CONTROL_DEVICE_AUTO_OFF);
-        return val.equals("1");
-    }
 }
diff --git a/hostsidetests/incident/OWNERS b/hostsidetests/incident/OWNERS
index 37c0932..60e88f9 100644
--- a/hostsidetests/incident/OWNERS
+++ b/hostsidetests/incident/OWNERS
@@ -1,10 +1,9 @@
-# Bug component: 329246
+# Bug component: 366902
 jeffreyhuang@google.com
-joeo@google.com
 jreck@google.com
-kwekua@google.com
+jtnguyen@google.com
 muhammadq@google.com
-ruchirr@google.com
+sharaienko@google.com
 singhtejinder@google.com
 tsaichristine@google.com
 yamasani@google.com
diff --git a/hostsidetests/incrementalinstall/Android.bp b/hostsidetests/incrementalinstall/Android.bp
index 307f5fa..fdc611a 100644
--- a/hostsidetests/incrementalinstall/Android.bp
+++ b/hostsidetests/incrementalinstall/Android.bp
@@ -33,10 +33,15 @@
         "general-tests",
     ],
     data: [
+        ":IncrementalTestApp",
+        ":IncrementalTestAppUncompressed",
+        ":IncrementalTestApp2_v1",
+        ":IncrementalTestApp2_v2",
         ":IncrementalTestAppDynamicAsset",
         ":IncrementalTestAppDynamicCode",
         ":IncrementalTestAppCompressedNativeLib",
         ":IncrementalTestAppUncompressedNativeLib",
+        ":IncrementalTestAppValidator",
     ],
-
+    per_testcase_directory: true,
 }
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/Android.bp b/hostsidetests/inputmethodservice/deviceside/devicetest/Android.bp
index 4ad7237..a3774b8 100644
--- a/hostsidetests/inputmethodservice/deviceside/devicetest/Android.bp
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/Android.bp
@@ -35,5 +35,5 @@
         "general-tests",
     ],
     sdk_version: "test_current",
-    min_sdk_version: "19",
+    min_sdk_version: "28",
 }
diff --git a/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml
index 58b9e70..4b5fa9c 100755
--- a/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml
+++ b/hostsidetests/inputmethodservice/deviceside/devicetest/AndroidManifest.xml
@@ -19,13 +19,6 @@
      package="android.inputmethodservice.cts.devicetest"
      android:targetSandboxVersion="2">
 
-    <!--
-              TODO: We may need to have another new APK that has the latest targetSdkVersion to check the
-              latest OS behaviors.
-            -->
-    <uses-sdk android:minSdkVersion="28"
-         android:targetSdkVersion="28"/>
-
     <application android:label="CtsInputMethodServiceDeviceTests"
          android:icon="@mipmap/ic_launcher"
          android:allowBackup="false"
diff --git a/hostsidetests/inputmethodservice/deviceside/edittextapp/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/edittextapp/AndroidManifest.xml
index faebb9f..0888db3 100755
--- a/hostsidetests/inputmethodservice/deviceside/edittextapp/AndroidManifest.xml
+++ b/hostsidetests/inputmethodservice/deviceside/edittextapp/AndroidManifest.xml
@@ -18,8 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.inputmethodservice.cts.edittextapp" android:targetSandboxVersion="2">
 
-    <uses-sdk android:minSdkVersion="28" android:targetSdkVersion="28" />
-
     <application
         android:label="@string/app_name">
         <activity
diff --git a/hostsidetests/inputmethodservice/deviceside/ime1/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/ime1/AndroidManifest.xml
index b0eaaa7..cd1174e 100755
--- a/hostsidetests/inputmethodservice/deviceside/ime1/AndroidManifest.xml
+++ b/hostsidetests/inputmethodservice/deviceside/ime1/AndroidManifest.xml
@@ -18,13 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="android.inputmethodservice.cts.ime1">
 
-    <!--
-              TODO: We may need to have another new APK that has the latest targetSdkVersion to check the
-              latest OS behaviors.
-            -->
-    <uses-sdk android:minSdkVersion="19"
-         android:targetSdkVersion="25"/>
-
     <application android:label="@string/ime_name"
          android:allowBackup="false"
          android:theme="@android:style/Theme.InputMethod">
diff --git a/hostsidetests/inputmethodservice/deviceside/ime2/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/ime2/AndroidManifest.xml
index 0168b8d..09305df 100755
--- a/hostsidetests/inputmethodservice/deviceside/ime2/AndroidManifest.xml
+++ b/hostsidetests/inputmethodservice/deviceside/ime2/AndroidManifest.xml
@@ -18,13 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="android.inputmethodservice.cts.ime2">
 
-    <!--
-              TODO: We may need to have another new APK that has the latest targetSdkVersion to check the
-              latest OS behaviors.
-            -->
-    <uses-sdk android:minSdkVersion="19"
-         android:targetSdkVersion="25"/>
-
     <application android:label="@string/ime_name"
          android:allowBackup="false"
          android:theme="@android:style/Theme.InputMethod">
diff --git a/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/ime/ImeCommandReceiver.java b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/ime/ImeCommandReceiver.java
index 02c1c56..766fc59 100644
--- a/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/ime/ImeCommandReceiver.java
+++ b/hostsidetests/inputmethodservice/deviceside/lib/src/android/inputmethodservice/cts/ime/ImeCommandReceiver.java
@@ -59,7 +59,8 @@
 
     void register(T ime) {
         mIme = ime;
-        ime.registerReceiver(this, new IntentFilter(ImeCommandConstants.ACTION_IME_COMMAND));
+        ime.registerReceiver(this, new IntentFilter(ImeCommandConstants.ACTION_IME_COMMAND),
+                Context.RECEIVER_EXPORTED);
     }
 
     @Override
diff --git a/hostsidetests/inputmethodservice/deviceside/provider/AndroidManifest.xml b/hostsidetests/inputmethodservice/deviceside/provider/AndroidManifest.xml
index a8b17e3..ce79f74 100755
--- a/hostsidetests/inputmethodservice/deviceside/provider/AndroidManifest.xml
+++ b/hostsidetests/inputmethodservice/deviceside/provider/AndroidManifest.xml
@@ -18,9 +18,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="android.inputmethodservice.cts.provider">
 
-    <uses-sdk android:minSdkVersion="26"
-         android:targetSdkVersion="26"/>
-
     <application android:label="CtsInputMethodServiceEventProvider">
         <provider android:authorities="android.inputmethodservice.cts.provider"
              android:name="android.inputmethodservice.cts.provider.EventProvider"
@@ -28,7 +25,7 @@
         <receiver android:name="android.inputmethodservice.cts.receiver.EventReceiver"
              android:exported="true">
             <intent-filter>
-                <action android:name="android.inputmethodservice.cts.action.IME_EVENT"/>
+                <action android:name="android.inputmethodservice.cts.action.DEVICE_EVENT"/>
             </intent-filter>
         </receiver>
     </application>
diff --git a/hostsidetests/install/app/src/android/cts/install/InstallTest.java b/hostsidetests/install/app/src/android/cts/install/InstallTest.java
index 4d9d835..711df3d 100644
--- a/hostsidetests/install/app/src/android/cts/install/InstallTest.java
+++ b/hostsidetests/install/app/src/android/cts/install/InstallTest.java
@@ -104,15 +104,12 @@
     @Test
     public void assert_commitFailure_phase() {
         Install install = getParameterizedInstall(VERSION_CODE_TARGET);
-        if (mEnableRollback) {
-            InstallUtils.commitExpectingFailure(IllegalArgumentException.class,
-                "Non-staged APEX session doesn't support INSTALL_ENABLE_ROLLBACK", install);
-        } else if (mInstallType.equals(INSTALL_TYPE.SINGLE_APEX)) {
+        if (mInstallType.equals(INSTALL_TYPE.SINGLE_APEX)) {
             InstallUtils.commitExpectingFailure(AssertionError.class,
                 "does not support non-staged update", install);
         } else {
-            InstallUtils.commitExpectingFailure(AssertionError.class,
-                "Non-staged multi package install of APEX and APK packages is not supported",
+            InstallUtils.commitExpectingFailure(IllegalStateException.class,
+                "Mix of APK and APEX is not supported for non-staged multi-package session",
                 install);
         }
     }
diff --git a/hostsidetests/locale/Android.bp b/hostsidetests/locale/Android.bp
new file mode 100644
index 0000000..910c1c1
--- /dev/null
+++ b/hostsidetests/locale/Android.bp
@@ -0,0 +1,42 @@
+// Copyright (C) 2014 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_test_host {
+    name: "CtsLocaleManagerHostTestCases",
+    defaults: ["cts_defaults"],
+    srcs: ["src/**/*.java"],
+    // tag this module as a cts test artifact
+    libs: [
+        "cts-tradefed",
+        "tradefed",
+        "compatibility-host-util",
+        "host-libprotobuf-java-full",
+        "platformprotos",
+    ],
+    static_libs: [
+        "cts-statsd-atom-host-test-utils",
+    ],
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    data: [
+        ":CtsLocaleManagerTestDeviceApp",
+        ":CtsAtomTestApp",
+    ],
+}
diff --git a/hostsidetests/locale/AndroidTest.xml b/hostsidetests/locale/AndroidTest.xml
new file mode 100644
index 0000000..64a0426
--- /dev/null
+++ b/hostsidetests/locale/AndroidTest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<configuration description="Config for CTS LocaleManager host test cases">
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <!-- Module cannot run in secondary user because these tests require a device restart which
+         automatically switches back to the primary user. Switching to the secondary user within the
+         test still causes the user to remain in LOCKED state which means the tests don't work.
+
+         Also note that most of our API test cases are in our instrumentation CTS suite at
+         cts/tests/framework/base/locale, which does in fact work across secondary users.
+    -->
+    <option name="config-descriptor:metadata" key="parameter" value="not_secondary_user" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsLocaleManagerTestDeviceApp.apk" />
+        <option name="test-file-name" value="CtsAtomTestApp.apk" />
+    </target_preparer>
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsLocaleManagerHostTestCases.jar" />
+    </test>
+</configuration>
diff --git a/hostsidetests/locale/OWNERS b/hostsidetests/locale/OWNERS
new file mode 100644
index 0000000..9d41159
--- /dev/null
+++ b/hostsidetests/locale/OWNERS
@@ -0,0 +1,2 @@
+# Bug template url: https://b.corp.google.com/issues/new?component=1082762&template=1601534
+include /tests/framework/base/locale/OWNERS
diff --git a/hostsidetests/locale/TEST_MAPPING b/hostsidetests/locale/TEST_MAPPING
new file mode 100644
index 0000000..60a24a4
--- /dev/null
+++ b/hostsidetests/locale/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsLocaleManagerHostTestCases"
+    }
+  ]
+}
diff --git a/hostsidetests/locale/app/Android.bp b/hostsidetests/locale/app/Android.bp
new file mode 100644
index 0000000..d8ed825
--- /dev/null
+++ b/hostsidetests/locale/app/Android.bp
@@ -0,0 +1,24 @@
+// Copyright (C) 2014 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsLocaleManagerTestDeviceApp",
+    defaults: ["cts_defaults"],
+    srcs: ["src/**/*.java"],
+    sdk_version: "current",
+}
diff --git a/hostsidetests/locale/app/AndroidManifest.xml b/hostsidetests/locale/app/AndroidManifest.xml
new file mode 100755
index 0000000..cf50f13
--- /dev/null
+++ b/hostsidetests/locale/app/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2014 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="android.localemanager.app">
+
+    <application>
+        <activity android:name=".MainActivity"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/hostsidetests/locale/app/src/android/localemanager/app/MainActivity.java b/hostsidetests/locale/app/src/android/localemanager/app/MainActivity.java
new file mode 100644
index 0000000..54a0210
--- /dev/null
+++ b/hostsidetests/locale/app/src/android/localemanager/app/MainActivity.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2021 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 android.localemanager.app;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+/**
+ * A simple activity which doesn't do anything interesting, but needs to be installed so that we can
+ * set its app-specific locales.
+ */
+public class MainActivity extends Activity {
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+    }
+
+}
diff --git a/hostsidetests/locale/atom/app/Android.bp b/hostsidetests/locale/atom/app/Android.bp
new file mode 100644
index 0000000..b14b97be
--- /dev/null
+++ b/hostsidetests/locale/atom/app/Android.bp
@@ -0,0 +1,24 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsAtomTestApp",
+    defaults: ["cts_defaults"],
+    srcs: ["src/**/*.java"],
+    sdk_version: "system_current",
+}
diff --git a/hostsidetests/locale/atom/app/AndroidManifest.xml b/hostsidetests/locale/atom/app/AndroidManifest.xml
new file mode 100755
index 0000000..ec95e96
--- /dev/null
+++ b/hostsidetests/locale/atom/app/AndroidManifest.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="android.localemanager.atom.app">
+
+    <application>
+        <activity android:name=".ActivityForSettingLocalesOfAnotherApp"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <activity android:name=".ActivityForNullCheckForInputLocales"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+        <activity android:name=".ActivityForNullCheckForInputPackageName"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/hostsidetests/locale/atom/app/src/android/localemanager/atom/app/ActivityForNullCheckForInputLocales.java b/hostsidetests/locale/atom/app/src/android/localemanager/atom/app/ActivityForNullCheckForInputLocales.java
new file mode 100644
index 0000000..2908ec9
--- /dev/null
+++ b/hostsidetests/locale/atom/app/src/android/localemanager/atom/app/ActivityForNullCheckForInputLocales.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2022 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 android.localemanager.atom.app;
+
+import android.app.Activity;
+import android.app.LocaleManager;
+import android.os.Bundle;
+
+/**
+ * Activity which tries to apply null locales on the application when invoked.
+ */
+public class ActivityForNullCheckForInputLocales extends Activity {
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        callSetApplicationLocalesWithNullLocales();
+    }
+
+    public void callSetApplicationLocalesWithNullLocales() {
+        // This function is to verify that the service throws an exception when null target
+        // packageName is passed, and this scenario is logged with a failure in the
+        // ApplicationLocalesChangedAtom.
+        LocaleManager mLocaleManager = this.getSystemService(LocaleManager.class);
+        try {
+            mLocaleManager.setApplicationLocales(null);
+        } catch (NullPointerException expected) {
+        }
+    }
+}
diff --git a/hostsidetests/locale/atom/app/src/android/localemanager/atom/app/ActivityForNullCheckForInputPackageName.java b/hostsidetests/locale/atom/app/src/android/localemanager/atom/app/ActivityForNullCheckForInputPackageName.java
new file mode 100644
index 0000000..8852754
--- /dev/null
+++ b/hostsidetests/locale/atom/app/src/android/localemanager/atom/app/ActivityForNullCheckForInputPackageName.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2022 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 android.localemanager.atom.app;
+
+import android.app.Activity;
+import android.app.LocaleManager;
+import android.os.Bundle;
+import android.os.LocaleList;
+
+/**
+ * Activity which tries to call setApplicationLocales with null packageName when invoked.
+ */
+public class ActivityForNullCheckForInputPackageName extends Activity {
+    private static final String DEFAULT_LANGUAGE_TAGS = "hi-IN,de-DE";
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        callSetApplicationLocalesWithNullPackage();
+    }
+
+    public void callSetApplicationLocalesWithNullPackage() {
+        // This function is to verify that the service throws an exception when null target
+        // packageName is passed, and this scenario is logged with a failure in the
+        // ApplicationLocalesChangedAtom.
+        LocaleManager mLocaleManager = this.getSystemService(LocaleManager.class);
+        try {
+            mLocaleManager.setApplicationLocales(null,
+                    LocaleList.forLanguageTags(DEFAULT_LANGUAGE_TAGS));
+        } catch (NullPointerException expected) {
+        }
+    }
+}
diff --git a/hostsidetests/locale/atom/app/src/android/localemanager/atom/app/ActivityForSettingLocalesOfAnotherApp.java b/hostsidetests/locale/atom/app/src/android/localemanager/atom/app/ActivityForSettingLocalesOfAnotherApp.java
new file mode 100644
index 0000000..8f4c2de
--- /dev/null
+++ b/hostsidetests/locale/atom/app/src/android/localemanager/atom/app/ActivityForSettingLocalesOfAnotherApp.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 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 android.localemanager.atom.app;
+
+import android.app.Activity;
+import android.app.LocaleManager;
+import android.os.Bundle;
+import android.os.LocaleList;
+
+/**
+ * Activity which calls setApplicationLocales() for another application when invoked.
+ */
+public class ActivityForSettingLocalesOfAnotherApp extends Activity {
+    private static final String DEFAULT_LANGUAGE_TAGS = "hi-IN,de-DE";
+    private static final String TEST_APP_PACKAGE_NAME = "android.localemanager.app";
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        setLocalesForOtherApplication();
+    }
+
+    public void setLocalesForOtherApplication() {
+        LocaleManager mLocaleManager = this.getSystemService(LocaleManager.class);
+        try {
+            mLocaleManager.setApplicationLocales(TEST_APP_PACKAGE_NAME,
+                    LocaleList.forLanguageTags(DEFAULT_LANGUAGE_TAGS));
+        } catch (SecurityException expected) {
+        }
+    }
+}
diff --git a/hostsidetests/locale/src/android/localemanager/cts/ApplicationLocalesChangedAtomTests.java b/hostsidetests/locale/src/android/localemanager/cts/ApplicationLocalesChangedAtomTests.java
new file mode 100644
index 0000000..d17e89c
--- /dev/null
+++ b/hostsidetests/locale/src/android/localemanager/cts/ApplicationLocalesChangedAtomTests.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright (C) 2021 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 android.localemanager.cts;
+
+import android.cts.statsdatom.lib.ConfigUtils;
+import android.cts.statsdatom.lib.DeviceUtils;
+import android.cts.statsdatom.lib.ReportUtils;
+
+import com.android.os.AtomsProto;
+import com.android.os.StatsLog;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+
+import java.util.List;
+
+public class ApplicationLocalesChangedAtomTests extends DeviceTestCase implements IBuildReceiver {
+    public static final String ACTIVITY_FOR_NULL_CHECK_FOR_INPUT_PACKAGE_NAME =
+            "ActivityForNullCheckForInputPackageName";
+    public static final String ACTIVITY_FOR_SETTING_LOCALES_OF_ANOTHER_APP =
+            "ActivityForSettingLocalesOfAnotherApp";
+    public static final String ACTIVITY_FOR_NULL_CHECK_FOR_INPUT_LOCALES =
+            "ActivityForNullCheckForInputLocales";
+    private int mShellUid;
+
+    private static final String INSTALLED_PACKAGE_NAME_APP1 = "android.localemanager.app";
+    private static final String INSTALLED_PACKAGE_NAME_APP2 = "android.localemanager.atom.app";
+    private static final String INVALID_PACKAGE_NAME = "invalid.package.name";
+
+    private static final String DEFAULT_LANGUAGE_TAGS = "hi-IN,de-DE";
+    private static final String DEFAULT_LANGUAGE_TAGS_2 = "hi-IN,es-ES";
+    private static final String EMPTY_LANGUAGE_TAGS = "";
+    private static final int INVALID_UID = -1;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        ConfigUtils.removeConfig(getDevice());
+        ReportUtils.clearReports(getDevice());
+        resetAppLocales();
+        ConfigUtils.uploadConfigForPushedAtom(getDevice(), DeviceUtils.STATSD_ATOM_TEST_PKG,
+                AtomsProto.Atom.APPLICATION_LOCALES_CHANGED_FIELD_NUMBER);
+
+        // This will be ROOT_UID if adb is running as root, SHELL_UID otherwise.
+        mShellUid = DeviceUtils.getHostUid(getDevice());
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        ConfigUtils.removeConfig(getDevice());
+        ReportUtils.clearReports(getDevice());
+        super.tearDown();
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+    }
+
+    public void testAtomLogging_newConfiguration_logsAtomSuccessfully()
+            throws Exception {
+        // executing API to change locales of the installed application, this should trigger an
+        // ApplicationLocalesChanged atom entry to be logged.
+        executeSetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME_APP1, DEFAULT_LANGUAGE_TAGS);
+
+        // Retrieving logged metric entries and asserting if they are as expected.
+        List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
+        assertEquals(1, data.size());
+        AtomsProto.ApplicationLocalesChanged result = data.get(0)
+                .getAtom().getApplicationLocalesChanged();
+        verifyAtomDetails(mShellUid,
+                DeviceUtils.getAppUid(getDevice(), INSTALLED_PACKAGE_NAME_APP1),
+                /* expectedPreviousLocales= */ "", DEFAULT_LANGUAGE_TAGS,
+                AtomsProto.ApplicationLocalesChanged.Status.CONFIG_COMMITTED, result);
+
+        // executing API to change locales of the installed application, this should trigger an
+        // ApplicationLocalesChanged atom entry to be logged.
+        executeSetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME_APP1, DEFAULT_LANGUAGE_TAGS_2);
+
+        List<StatsLog.EventMetricData> data2 = ReportUtils.getEventMetricDataList(getDevice());
+        assertEquals(1, data.size());
+        AtomsProto.ApplicationLocalesChanged result2 = data2.get(0)
+                .getAtom().getApplicationLocalesChanged();
+        verifyAtomDetails(mShellUid,
+                DeviceUtils.getAppUid(getDevice(), INSTALLED_PACKAGE_NAME_APP1),
+                DEFAULT_LANGUAGE_TAGS, DEFAULT_LANGUAGE_TAGS_2,
+                AtomsProto.ApplicationLocalesChanged.Status.CONFIG_COMMITTED, result2);
+    }
+
+    public void testAtomLogging_invalidPackage_logsAtomWithFailureInvalidPackageName()
+            throws Exception {
+        // calling setApplicationLocales() with an invalid package name.
+        executeSetApplicationLocalesCommand(INVALID_PACKAGE_NAME, DEFAULT_LANGUAGE_TAGS);
+
+        // retrieving logged metric data
+        List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
+
+        // assert data was logged.
+        assertEquals(1, data.size());
+        AtomsProto.ApplicationLocalesChanged result = data.get(0)
+                .getAtom().getApplicationLocalesChanged();
+        // The input package name is invalid therefore the status should be:
+        // FAILURE_INVALID_TARGET_PACKAGE
+        verifyAtomDetails(mShellUid,
+                INVALID_UID, /* expectedPreviousLocales= */ "", DEFAULT_LANGUAGE_TAGS,
+                AtomsProto.ApplicationLocalesChanged.Status.FAILURE_INVALID_TARGET_PACKAGE,
+                result);
+    }
+
+    public void testAtomLogging_permissionAbsent_logsAtomWithFailurePermissionAbsent()
+            throws Exception {
+        // For the purpose of testing the failure case of "Permission Absent" we required one app
+        // (without the CHANGE_CONFIGURATION permission) to call
+        // LocaleManager#setApplicationLocales() for another application so that this call fails in
+        // a Security Exception. To replicate this scenario, SetApplicationLocales() was called
+        // from the MainActivity of app2, attempting to change locales of app1. When
+        // app2/MainActivity is invoked this failure test case gets recorded.
+        invokeActivityInApp2AndDestroyIt(ACTIVITY_FOR_SETTING_LOCALES_OF_ANOTHER_APP);
+
+        List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
+        assertEquals(1, data.size());
+
+        AtomsProto.ApplicationLocalesChanged result = data.get(0)
+                .getAtom().getApplicationLocalesChanged();
+        verifyAtomDetails(DeviceUtils.getAppUid(getDevice(), INSTALLED_PACKAGE_NAME_APP2),
+                DeviceUtils.getAppUid(getDevice(), INSTALLED_PACKAGE_NAME_APP1),
+                /* expectedPreviousLocales= */ "", DEFAULT_LANGUAGE_TAGS,
+                AtomsProto.ApplicationLocalesChanged.Status.FAILURE_PERMISSION_ABSENT, result);
+    }
+
+    public void testAtomLogging_inputLocalesNull_logsAtomWithFailure()
+            throws Exception {
+        // For the purpose of testing the failure case of "null locales" we need an application
+        // to call setApplicationLocales() with null locales as input. To replicate this
+        // scenario, SetApplicationLocales() was called indirectly
+        // from the onCreate() of app2.ActivityForNullCheckForInputLocales with null input locales.
+        invokeActivityInApp2AndDestroyIt(ACTIVITY_FOR_NULL_CHECK_FOR_INPUT_LOCALES);
+
+        List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
+        assertEquals(1, data.size());
+
+        AtomsProto.ApplicationLocalesChanged result = data.get(0)
+                .getAtom().getApplicationLocalesChanged();
+        verifyAtomDetails(DeviceUtils.getAppUid(getDevice(), INSTALLED_PACKAGE_NAME_APP2),
+                INVALID_UID, /* expectedPreviousLocales= */ "",
+                /* expectedNewLocales= */ "",
+                AtomsProto.ApplicationLocalesChanged.Status.STATUS_UNSPECIFIED, result);
+    }
+
+    public void testAtomLogging_nullPackageName_logsAtomWithFailure()
+            throws Exception {
+        // For the purpose of testing the failure case of "null PackageName" we need one application
+        // to call setApplicationLocales() with null packageName as input. To replicate this
+        // scenario, SetApplicationLocales() was called indirectly
+        // from the onCreate() of app2.ActivityForNullCheckForInputPackageName with null input
+        // package.
+        invokeActivityInApp2AndDestroyIt(ACTIVITY_FOR_NULL_CHECK_FOR_INPUT_PACKAGE_NAME);
+
+        List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
+        assertEquals(1, data.size());
+
+        AtomsProto.ApplicationLocalesChanged result = data.get(0)
+                .getAtom().getApplicationLocalesChanged();
+        verifyAtomDetails(DeviceUtils.getAppUid(getDevice(), INSTALLED_PACKAGE_NAME_APP2),
+                INVALID_UID, /* expectedPreviousLocales= */ "",
+                /* expectedNewLocales= */ "",
+                AtomsProto.ApplicationLocalesChanged.Status.STATUS_UNSPECIFIED, result);
+    }
+
+    public void testAtomLogging_noConfigChange_logsAtomWithConfigUncommitted()
+            throws Exception {
+        executeSetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME_APP1, DEFAULT_LANGUAGE_TAGS);
+        // same command called twice to replicate the case of no commit as previous config is
+        // same as current requested.
+        executeSetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME_APP1, DEFAULT_LANGUAGE_TAGS);
+
+        // fetching metric data.
+        List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
+
+        // assert: atom was logged twice
+        assertEquals(2, data.size());
+
+        // assert: expected config for the first call
+        AtomsProto.ApplicationLocalesChanged result1 = data.get(0)
+                .getAtom().getApplicationLocalesChanged();
+        verifyAtomDetails(mShellUid,
+                DeviceUtils.getAppUid(getDevice(), INSTALLED_PACKAGE_NAME_APP1),
+                /* expectedPreviousLocales= */"", DEFAULT_LANGUAGE_TAGS,
+                AtomsProto.ApplicationLocalesChanged.Status.CONFIG_COMMITTED, result1);
+
+        // assert: expected config for the second call
+        AtomsProto.ApplicationLocalesChanged result2 = data.get(1)
+                .getAtom().getApplicationLocalesChanged();
+
+        // previous locales are same as new one, therefore status should be: CONFIG_UNCOMMITTED
+        verifyAtomDetails(mShellUid,
+                DeviceUtils.getAppUid(getDevice(), INSTALLED_PACKAGE_NAME_APP1),
+                DEFAULT_LANGUAGE_TAGS, DEFAULT_LANGUAGE_TAGS,
+                AtomsProto.ApplicationLocalesChanged.Status.CONFIG_UNCOMMITTED, result2);
+    }
+
+    private void resetAppLocales() throws Exception {
+        executeSetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME_APP1, EMPTY_LANGUAGE_TAGS);
+        executeSetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME_APP2, EMPTY_LANGUAGE_TAGS);
+    }
+
+
+    private void executeSetApplicationLocalesCommand(String packageName, String languageTags)
+            throws Exception {
+        getDevice().executeShellCommand(
+                String.format(
+                        "cmd locale set-app-locales %s --user current --locales %s",
+                        packageName,
+                        languageTags
+                )
+        );
+    }
+
+    private void verifyAtomDetails(int expectedCallingUid, int expectedTargetUid,
+            String expectedPreviousLocales, String expectedNewLocales,
+            AtomsProto.ApplicationLocalesChanged.Status expectedStatus,
+            AtomsProto.ApplicationLocalesChanged result) {
+        assertEquals(expectedCallingUid, result.getCallingUid());
+        assertEquals(expectedTargetUid, result.getTargetUid());
+        assertEquals(expectedPreviousLocales, result.getPrevLocales());
+        assertEquals(expectedNewLocales, result.getNewLocales());
+        assertEquals(expectedStatus, result.getStatus());
+    }
+
+    private void invokeActivityInApp2AndDestroyIt(String activityName) {
+        String activity = INSTALLED_PACKAGE_NAME_APP2 + "/." + activityName;
+        try {
+            // launch the activity
+            getDevice().executeShellCommand(
+                    String.format(
+                            "am start -W %s ",
+                            activity
+                    )
+            );
+        } catch (Exception e) {
+            // DO nothing.
+        }
+        // destroy the app.
+        try {
+            // force stop the application
+            getDevice().executeShellCommand(
+                    String.format(
+                            "am kill -W %s", INSTALLED_PACKAGE_NAME_APP2
+                    )
+            );
+        } catch (Exception e) {
+            // DO nothing.
+        }
+    }
+}
diff --git a/hostsidetests/locale/src/android/localemanager/cts/LocaleManagerHostTest.java b/hostsidetests/locale/src/android/localemanager/cts/LocaleManagerHostTest.java
new file mode 100644
index 0000000..1422195
--- /dev/null
+++ b/hostsidetests/locale/src/android/localemanager/cts/LocaleManagerHostTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2021 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 android.localemanager.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.IDeviceTest;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test to check that {@link android.app.LocaleManager} APIs persist across device restarts.
+ *
+ * <p>When this test builds, it also builds {@link android.localemanager.app.MainActivity} into an
+ * APK which is then installed at runtime. The Activity does not do anything interesting, but we
+ * need it to be installed so that we can set an app-specific locale for it's package.
+ *
+ * <p><b>Note:</b> A more comprehensive set of CTS cases are included in the instrumentation suite
+ * at {@link android.localemanager.cts.LocaleManagerTests}.
+ */
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class LocaleManagerHostTest implements IDeviceTest {
+
+    private static final String TAG = LocaleManagerHostTest.class.getSimpleName();
+
+    private static final String INSTALLED_PACKAGE_NAME = "android.localemanager.app";
+
+    private static final String DEFAULT_LANGUAGE_TAGS = "hi-IN,de-DE";
+    private static final String EMPTY_LANGUAGE_TAGS = "";
+
+    private static final String GET_APP_LOCALES_SHELL_OUTPUT_FORMAT =
+            "Locales for %s for user 0 are [%s]\n";
+    private static final String DEFAULT_LANGUAGE_TAGS_GET_APP_LOCALES_SHELL_OUTPUT =
+            String.format(GET_APP_LOCALES_SHELL_OUTPUT_FORMAT,
+                    INSTALLED_PACKAGE_NAME, DEFAULT_LANGUAGE_TAGS);
+    private static final String EMPTY_LANGUAGE_TAGS_GET_APP_LOCALES_SHELL_OUTPUT =
+            String.format(GET_APP_LOCALES_SHELL_OUTPUT_FORMAT,
+                    INSTALLED_PACKAGE_NAME, EMPTY_LANGUAGE_TAGS);
+
+    private ITestDevice mDevice;
+
+    @Override
+    public void setDevice(ITestDevice device) {
+        mDevice = device;
+    }
+
+    @Override
+    public ITestDevice getDevice() {
+        return mDevice;
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        ITestDevice device = getDevice();
+        assertNotNull("Device not set", device);
+        resetAppLocales();
+    }
+
+    @Test
+    public void testSetApplicationLocale_nonEmptyLocales_persistsAcrossReboots() throws Exception {
+        executeSetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME, DEFAULT_LANGUAGE_TAGS);
+        String appLocalesBeforeRestart =
+                executeGetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME);
+        assertEquals(DEFAULT_LANGUAGE_TAGS_GET_APP_LOCALES_SHELL_OUTPUT, appLocalesBeforeRestart);
+
+        restartDeviceAndWaitUntilReady();
+
+        // Verify locales still equal after restart
+        String appLocalesAfterRestart = executeGetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME);
+        assertEquals(DEFAULT_LANGUAGE_TAGS_GET_APP_LOCALES_SHELL_OUTPUT, appLocalesAfterRestart);
+    }
+
+    @Test
+    public void testSetApplicationLocale_emptyLocales_persistsAcrossReboots() throws Exception {
+        // set some application locales to start with
+        executeSetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME, DEFAULT_LANGUAGE_TAGS);
+        String appLocalesBase = executeGetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME);
+        assertEquals(DEFAULT_LANGUAGE_TAGS_GET_APP_LOCALES_SHELL_OUTPUT, appLocalesBase);
+
+        // reset the application locales to empty
+        executeSetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME, EMPTY_LANGUAGE_TAGS);
+        String appLocalesBeforeRestart =
+                executeGetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME);
+        assertEquals(EMPTY_LANGUAGE_TAGS_GET_APP_LOCALES_SHELL_OUTPUT, appLocalesBeforeRestart);
+
+        restartDeviceAndWaitUntilReady();
+        // Verify new empty locales persisted after restart
+        String appLocalesAfterRestart = executeGetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME);
+        assertEquals(EMPTY_LANGUAGE_TAGS_GET_APP_LOCALES_SHELL_OUTPUT, appLocalesAfterRestart);
+    }
+
+    private void restartDeviceAndWaitUntilReady() throws Exception {
+        // Flush pending writes before rebooting device
+        getDevice().executeShellCommand("am write");
+        getDevice().reboot();
+    }
+
+
+    private void resetAppLocales() throws Exception {
+        executeSetApplicationLocalesCommand(INSTALLED_PACKAGE_NAME, EMPTY_LANGUAGE_TAGS);
+    }
+
+
+    private void executeSetApplicationLocalesCommand(String packageName, String languageTags)
+            throws Exception {
+        getDevice().executeShellCommand(
+                String.format(
+                        "cmd locale set-app-locales %s --user 0 --locales %s",
+                        packageName,
+                        languageTags
+                )
+        );
+    }
+
+    private String executeGetApplicationLocalesCommand(String packageName) throws Exception {
+        return getDevice().executeShellCommand(
+                String.format(
+                        "cmd locale get-app-locales %s --user 0",
+                        packageName
+                )
+        );
+    }
+
+}
diff --git a/hostsidetests/media/OWNERS b/hostsidetests/media/OWNERS
index e72446f..890f7d2 100644
--- a/hostsidetests/media/OWNERS
+++ b/hostsidetests/media/OWNERS
@@ -1,8 +1,12 @@
 # Bug component: 1344
 elaurent@google.com
+gyumin@google.com
+hdmoon@google.com
+jaewan@google.com
+jinpark@google.com
+klhyun@google.com
 lajos@google.com
 sungsoo@google.com
-jaewan@google.com
 
 # go/android-fwk-media-solutions for info on areas of ownership.
 include platform/frameworks/av:/media/janitors/media_solutions_OWNERS
diff --git a/hostsidetests/media/app/MediaExtractorTest/Android.bp b/hostsidetests/media/app/MediaExtractorTest/Android.bp
index 9479dc9..36baa5f 100644
--- a/hostsidetests/media/app/MediaExtractorTest/Android.bp
+++ b/hostsidetests/media/app/MediaExtractorTest/Android.bp
@@ -45,9 +45,8 @@
         "libandroid",
         "libnativehelper_compat_libc++",
     ],
-    header_libs: ["liblog_headers"],
-    include_dirs: [
-        "frameworks/av/media/ndk/include/media",
+    header_libs: [
+        "liblog_headers",
     ],
     stl: "libc++_static",
     cflags: [
diff --git a/hostsidetests/media/app/MediaExtractorTest/jni/MediaExtractorDeviceSideTestNative.cpp b/hostsidetests/media/app/MediaExtractorTest/jni/MediaExtractorDeviceSideTestNative.cpp
index b39d99b..f34464f 100644
--- a/hostsidetests/media/app/MediaExtractorTest/jni/MediaExtractorDeviceSideTestNative.cpp
+++ b/hostsidetests/media/app/MediaExtractorTest/jni/MediaExtractorDeviceSideTestNative.cpp
@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include <NdkMediaExtractor.h>
 #include <android/asset_manager.h>
 #include <android/asset_manager_jni.h>
 #include <jni.h>
+#include <media/NdkMediaExtractor.h>
 #include <nativehelper/ScopedUtfChars.h>
+
 #include <thread>
 
 extern "C" JNIEXPORT void JNICALL
diff --git a/hostsidetests/media/app/MediaExtractorTest/src/android/media/cts/MediaExtractorDeviceSideTest.java b/hostsidetests/media/app/MediaExtractorTest/src/android/media/cts/MediaExtractorDeviceSideTest.java
index 75a4c1e..026a1b1 100644
--- a/hostsidetests/media/app/MediaExtractorTest/src/android/media/cts/MediaExtractorDeviceSideTest.java
+++ b/hostsidetests/media/app/MediaExtractorTest/src/android/media/cts/MediaExtractorDeviceSideTest.java
@@ -56,8 +56,9 @@
                 InstrumentationRegistry.getInstrumentation().getContext().getAssets();
         try (AssetFileDescriptor fileDescriptor = assetManager.openFd(SAMPLE_PATH)) {
             mediaExtractor.setDataSource(fileDescriptor);
+        } finally {
+            mediaExtractor.release();
         }
-        mediaExtractor.release();
     }
 
     @Test
diff --git a/hostsidetests/media/app/MediaMetricsTest/src/android/media/metrics/cts/MediaMetricsAtomHostSideTests.java b/hostsidetests/media/app/MediaMetricsTest/src/android/media/metrics/cts/MediaMetricsAtomHostSideTests.java
index 5684cfa..a3fe0a4 100644
--- a/hostsidetests/media/app/MediaMetricsTest/src/android/media/metrics/cts/MediaMetricsAtomHostSideTests.java
+++ b/hostsidetests/media/app/MediaMetricsTest/src/android/media/metrics/cts/MediaMetricsAtomHostSideTests.java
@@ -19,6 +19,8 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.content.Context;
+import android.media.metrics.BundleSession;
+import android.media.metrics.EditingSession;
 import android.media.metrics.LogSessionId;
 import android.media.metrics.MediaMetricsManager;
 import android.media.metrics.NetworkEvent;
@@ -28,15 +30,15 @@
 import android.media.metrics.PlaybackStateEvent;
 import android.media.metrics.RecordingSession;
 import android.media.metrics.TrackChangeEvent;
+import android.media.metrics.TranscodingSession;
 import android.os.Bundle;
+import android.os.PersistableBundle;
 import android.provider.DeviceConfig;
 
 import androidx.test.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.SystemUtil;
 
-import java.lang.InterruptedException;
-
 import org.junit.Test;
 
 public class MediaMetricsAtomHostSideTests {
@@ -323,6 +325,61 @@
     }
 
     @Test
+    public void testEditingSession() throws Exception {
+        Context context = InstrumentationRegistry.getContext();
+        MediaMetricsManager manager = context.getSystemService(MediaMetricsManager.class);
+
+        try (EditingSession s = manager.createEditingSession()) {
+            assertThat(s).isNotEqualTo(null);
+            LogSessionId idObj = s.getSessionId();
+            assertThat(idObj).isNotEqualTo(null);
+            assertThat(idObj.getStringId().length()).isGreaterThan(0);
+        }
+    }
+
+    @Test
+    public void testTranscodingSession() throws Exception {
+        Context context = InstrumentationRegistry.getContext();
+        MediaMetricsManager manager = context.getSystemService(MediaMetricsManager.class);
+
+        try (TranscodingSession s = manager.createTranscodingSession()) {
+            assertThat(s).isNotEqualTo(null);
+            LogSessionId idObj = s.getSessionId();
+            assertThat(idObj).isNotEqualTo(null);
+            assertThat(idObj.getStringId().length()).isGreaterThan(0);
+        }
+    }
+
+    @Test
+    public void testBundleSession() throws Exception {
+        Context context = InstrumentationRegistry.getContext();
+        MediaMetricsManager manager = context.getSystemService(MediaMetricsManager.class);
+
+        try (BundleSession s = manager.createBundleSession()) {
+            assertThat(s).isNotEqualTo(null);
+            LogSessionId idObj = s.getSessionId();
+            assertThat(idObj).isNotEqualTo(null);
+            assertThat(idObj.getStringId().length()).isGreaterThan(0);
+        }
+    }
+
+    @Test
+    public void testBundleSessionPlaybackStateEvent() throws Exception {
+        turnOnForTesting();
+        Context context = InstrumentationRegistry.getContext();
+        MediaMetricsManager manager = context.getSystemService(MediaMetricsManager.class);
+        BundleSession s = manager.createBundleSession();
+        PersistableBundle b = new PersistableBundle();
+        b.putInt(BundleSession.KEY_STATSD_ATOM, 322);
+                // eventually want these keys from within the service side.
+        b.putString("playbackstateevent-sessionid", s.getSessionId().getStringId());
+        b.putInt("playbackstateevent-state", PlaybackStateEvent.STATE_JOINING_FOREGROUND);
+        b.putLong("playbackstateevent-lifetime", 1763L);
+        s.reportBundleMetrics(b);
+        resetProperties();
+    }
+
+    @Test
     public void testAppBlocklist() throws Exception {
         SystemUtil.runWithShellPermissionIdentity(() -> {
             DeviceConfig.setProperties(
diff --git a/hostsidetests/media/src/android/media/cts/MediaExtractorHostSideTest.java b/hostsidetests/media/src/android/media/cts/MediaExtractorHostSideTest.java
index f0c8a9b..78b126c 100644
--- a/hostsidetests/media/src/android/media/cts/MediaExtractorHostSideTest.java
+++ b/hostsidetests/media/src/android/media/cts/MediaExtractorHostSideTest.java
@@ -149,7 +149,7 @@
     }
 
     /**
-     * Returns all MediaParser reported metric events sorted by timestamp.
+     * Asserts that a single entry point has been reported by MediaMetrics and returns it.
      *
      * <p>Note: Calls {@link #getAndClearReportList()} to obtain the statsd report.
      */
diff --git a/hostsidetests/media/src/android/media/metrics/cts/MediaMetricsAtomTests.java b/hostsidetests/media/src/android/media/metrics/cts/MediaMetricsAtomTests.java
index 02a49da..3e6bbea0 100644
--- a/hostsidetests/media/src/android/media/metrics/cts/MediaMetricsAtomTests.java
+++ b/hostsidetests/media/src/android/media/metrics/cts/MediaMetricsAtomTests.java
@@ -29,9 +29,7 @@
 import com.android.tradefed.testtype.DeviceTestCase;
 import com.android.tradefed.testtype.IBuildReceiver;
 
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Base64;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -107,6 +105,28 @@
         assertThat(result.getTimeSincePlaybackCreatedMillis()).isEqualTo(1763L);
     }
 
+    // same as testPlaybackStateEvent, but we use the BundleSession transport.
+    public void testBundleSessionPlaybackStateEvent() throws Exception {
+        ConfigUtils.uploadConfigForPushedAtom(getDevice(), TEST_PKG,
+                AtomsProto.Atom.MEDIA_PLAYBACK_STATE_CHANGED_FIELD_NUMBER);
+        DeviceUtils.runDeviceTests(
+                getDevice(),
+                TEST_PKG,
+                "android.media.metrics.cts.MediaMetricsAtomHostSideTests",
+                "testBundleSessionPlaybackStateEvent");
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
+
+        List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
+
+        assertThat(data.size()).isEqualTo(1);
+        assertThat(data.get(0).getAtom().hasMediaPlaybackStateChanged()).isTrue();
+        AtomsProto.MediaPlaybackStateChanged result =
+                data.get(0).getAtom().getMediaPlaybackStateChanged();
+        assertThat(result.getPlaybackState().toString()).isEqualTo("JOINING_FOREGROUND");
+        assertThat(result.getTimeSincePlaybackCreatedMillis()).isEqualTo(1763L);
+    }
+
+
     public void testPlaybackErrorEvent_default() throws Exception {
         ConfigUtils.uploadConfigForPushedAtom(getDevice(), TEST_PKG,
                 AtomsProto.Atom.MEDIA_PLAYBACK_ERROR_REPORTED_FIELD_NUMBER);
@@ -410,7 +430,7 @@
 
         List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
         assertThat(data.size()).isEqualTo(0);
-   }
+    }
 
     public void testRecordingSession() throws Exception {
         ConfigUtils.uploadConfigForPushedAtom(getDevice(), TEST_PKG,
@@ -424,7 +444,49 @@
 
         List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
         assertThat(data.size()).isEqualTo(0);
-   }
+    }
+
+    public void testEditingSession() throws Exception {
+        ConfigUtils.uploadConfigForPushedAtom(getDevice(), TEST_PKG,
+                AtomsProto.Atom.MEDIAMETRICS_PLAYBACK_REPORTED_FIELD_NUMBER);
+        DeviceUtils.runDeviceTests(
+                getDevice(),
+                TEST_PKG,
+                "android.media.metrics.cts.MediaMetricsAtomHostSideTests",
+                "testEditingSession");
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
+
+        List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
+        assertThat(data.size()).isEqualTo(0);
+    }
+
+    public void testTranscodingSession() throws Exception {
+        ConfigUtils.uploadConfigForPushedAtom(getDevice(), TEST_PKG,
+                AtomsProto.Atom.MEDIAMETRICS_PLAYBACK_REPORTED_FIELD_NUMBER);
+        DeviceUtils.runDeviceTests(
+                getDevice(),
+                TEST_PKG,
+                "android.media.metrics.cts.MediaMetricsAtomHostSideTests",
+                "testTranscodingSession");
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
+
+        List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
+        assertThat(data.size()).isEqualTo(0);
+    }
+
+    public void testBundleSession() throws Exception {
+        ConfigUtils.uploadConfigForPushedAtom(getDevice(), TEST_PKG,
+                AtomsProto.Atom.MEDIAMETRICS_PLAYBACK_REPORTED_FIELD_NUMBER);
+        DeviceUtils.runDeviceTests(
+                getDevice(),
+                TEST_PKG,
+                "android.media.metrics.cts.MediaMetricsAtomHostSideTests",
+                "testBundleSession");
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
+
+        List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
+        assertThat(data.size()).isEqualTo(0);
+    }
 
     public void testAppBlocklist() throws Exception {
         ConfigUtils.uploadConfigForPushedAtom(getDevice(), TEST_PKG,
@@ -534,7 +596,7 @@
         List<Set<Integer>> directionList = Arrays.asList(directionSet);
 
         List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
-        AtomTestUtils.assertStatesOccurred(directionList, data, 0,
+        AtomTestUtils.assertStatesOccurredInOrder(directionList, data, 0,
                 atom -> atom.getMediametricsAaudiostreamReported().getDirection().getNumber());
 
         for (StatsLog.EventMetricData event : data) {
diff --git a/hostsidetests/multiuser/AndroidTest.xml b/hostsidetests/multiuser/AndroidTest.xml
index 8e92968..747e04c 100644
--- a/hostsidetests/multiuser/AndroidTest.xml
+++ b/hostsidetests/multiuser/AndroidTest.xml
@@ -19,6 +19,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsMultiUserHostTestCases.jar" />
         <option name="runtime-hint" value="8m" />
diff --git a/hostsidetests/multiuser/app/src/com/android/cts/multiuser/UserOperationsTest.java b/hostsidetests/multiuser/app/src/com/android/cts/multiuser/UserOperationsTest.java
new file mode 100644
index 0000000..42f52fe
--- /dev/null
+++ b/hostsidetests/multiuser/app/src/com/android/cts/multiuser/UserOperationsTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2022 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.cts.multiuser;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public final class UserOperationsTest {
+    private static final String TAG = UserOperationsTest.class.getSimpleName();
+
+    private Context mContext;
+    private UserManager mUserManager;
+
+    @Before
+    public void setUp() throws Exception {
+        mContext = InstrumentationRegistry.getContext();
+        mUserManager = mContext.getSystemService(UserManager.class);
+    }
+
+    @Test
+    public void removeUserWhenPossibleDeviceSide() throws Exception {
+        Log.i(TAG, "Running removeUserWhenPossibleDeviceSide");
+
+        int userId = Integer.parseInt(InstrumentationRegistry.getArguments().getString("userId"));
+        boolean overrideDevicePolicy = Boolean.parseBoolean(InstrumentationRegistry.getArguments()
+                .getString("overrideDevicePolicy"));
+
+        int expectedResult = Integer.parseInt(InstrumentationRegistry.getArguments()
+                .getString("expectedResult"));
+
+        // get create User permissions
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .adoptShellPermissionIdentity(android.Manifest.permission.CREATE_USERS);
+        try {
+            int result = mUserManager.removeUserWhenPossible(UserHandle.of(userId),
+                    overrideDevicePolicy);
+
+            assertWithMessage("removeUserWhenPossible response").that(result)
+                    .isEqualTo(expectedResult);
+        } finally {
+            InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                    .dropShellPermissionIdentity();
+        }
+    }
+}
diff --git a/hostsidetests/multiuser/src/android/host/multiuser/BaseMultiUserTest.java b/hostsidetests/multiuser/src/android/host/multiuser/BaseMultiUserTest.java
index 7df340d..ee0b471 100644
--- a/hostsidetests/multiuser/src/android/host/multiuser/BaseMultiUserTest.java
+++ b/hostsidetests/multiuser/src/android/host/multiuser/BaseMultiUserTest.java
@@ -218,7 +218,7 @@
         long ti = System.currentTimeMillis();
         while (System.currentTimeMillis() - ti < USER_SWITCH_COMPLETE_TIMEOUT_MS) {
             String logs = getDevice().executeAdbCommand("logcat", "-b", "all", "-d",
-                    "ActivityManager:D", "AndroidRuntime:E", "*:I");
+                    "ActivityManager:D", "AndroidRuntime:E", "SystemServiceManager:E", "*:I");
             Scanner in = new Scanner(logs);
             while (in.hasNextLine()) {
                 String line = in.nextLine();
@@ -229,6 +229,8 @@
                     mExitFound = true;
                 } else if (line.contains("FATAL EXCEPTION IN SYSTEM PROCESS")) {
                     throw new IllegalStateException("System process crashed - " + line);
+                } else if (line.contains("SystemService failure: Failure reporting")) {
+                    throw new IllegalStateException("A system service crashed:\n" + line);
                 }
             }
             in.close();
diff --git a/hostsidetests/multiuser/src/android/host/multiuser/EphemeralTest.java b/hostsidetests/multiuser/src/android/host/multiuser/EphemeralTest.java
index a8a12af..728a62f 100644
--- a/hostsidetests/multiuser/src/android/host/multiuser/EphemeralTest.java
+++ b/hostsidetests/multiuser/src/android/host/multiuser/EphemeralTest.java
@@ -23,6 +23,7 @@
 import android.platform.test.annotations.Presubmit;
 
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.DeviceTestRunOptions;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -40,6 +41,9 @@
     private static final String TEST_APP_PKG_NAME = "com.android.cts.multiuser";
     private static final String TEST_APP_PKG_APK = "CtsMultiuserApp.apk";
 
+    private static final int REMOVE_RESULT_REMOVED = 0; //UserManager.REMOVE_RESULT_REMOVED;
+    private static final int REMOVE_RESULT_DEFERRED = 1; //UserManager.REMOVE_RESULT_DEFERRED;
+
     @Rule
     public final SupportsMultiUserRule mSupportsMultiUserRule = new SupportsMultiUserRule(this);
 
@@ -93,35 +97,37 @@
     }
 
     /**
-     * Test to verify that {@link android.os.UserManager#removeUserOrSetEphemeral(int)} immediately
+     * Test to verify that
+     * {@link android.os.UserManager#removeUserWhenPossible(UserHandle, boolean)} immediately
      * removes a user that isn't running.
-     *
-     * <p>Indirectly executed by means of the --set-ephemeral-if-in-use flag
+     * <p>
+     * Indirectly executed by means of the --set-ephemeral-if-in-use flag
      */
     @Presubmit
     @Test
-    public void testRemoveUserOrSetEphemeral_nonRunningUserRemoved() throws Exception {
+    public void testRemoveUserWhenPossible_nonRunningUserRemoved() throws Exception {
         final int userId = createUser();
 
-        executeRemoveUserOrSetEphemeralAdbCommand(userId);
+        executeRemoveUserWhenPossible(userId, /* expectedResult= */ REMOVE_RESULT_REMOVED);
 
         assertUserNotPresent(userId);
     }
 
     /**
-     * Test to verify that {@link android.os.UserManager#removeUserOrSetEphemeral(int)} sets the
-     * current user to ephemeral and removes the user after user switch.
-     *
-     * <p>Indirectly executed by means of the --set-ephemeral-if-in-use flag
+     * Test to verify that
+     * {@link android.os.UserManager#removeUserWhenPossible(UserHandle, boolean)} sets the current
+     * user to ephemeral and removes the user after user switch.
+     * <p>
+     * Indirectly executed by means of the --set-ephemeral-if-in-use flag
      */
     @Presubmit
     @Test
-    public void testRemoveUserOrSetEphemeral_currentUserSetEphemeral_removeAfterSwitch()
+    public void testRemoveUserWhenPossible_currentUserSetEphemeral_removeAfterSwitch()
             throws Exception {
         final int userId = createUser();
 
         assertSwitchToNewUser(userId);
-        executeRemoveUserOrSetEphemeralAdbCommand(userId);
+        executeRemoveUserWhenPossible(userId, /* expectedResult= */ REMOVE_RESULT_DEFERRED);
         assertUserEphemeral(userId);
 
         assertSwitchToUser(userId, mInitialUserId);
@@ -130,27 +136,39 @@
     }
 
     /**
-     * Test to verify that {@link android.os.UserManager#removeUserOrSetEphemeral(int)} sets the
-     * current user to ephemeral and removes that user after reboot.
-     *
-     * <p>Indirectly executed by means of the --set-ephemeral-if-in-use flag
+     * Test to verify that
+     * {@link android.os.UserManager#removeUserWhenPossible(UserHandle, boolean)} sets the current
+     * user to ephemeral and removes that user after reboot.
+     * <p>
+     * Indirectly executed by means of the --set-ephemeral-if-in-use flag
      */
     @Presubmit
     @Test
-    public void testRemoveUserOrSetEphemeral_currentUserSetEphemeral_removeAfterReboot()
+    public void testRemoveUserWhenPossible_currentUserSetEphemeral_removeAfterReboot()
             throws Exception {
         final int userId = createUser();
 
         assertSwitchToNewUser(userId);
-        executeRemoveUserOrSetEphemeralAdbCommand(userId);
+        executeRemoveUserWhenPossible(userId, /* expectedResult= */ REMOVE_RESULT_DEFERRED);
         assertUserEphemeral(userId);
 
         getDevice().reboot();
         assertUserNotPresent(userId);
     }
 
-    private void executeRemoveUserOrSetEphemeralAdbCommand(int userId) throws Exception {
-        getDevice().executeShellV2Command("pm remove-user --set-ephemeral-if-in-use " + userId);
+    private void executeRemoveUserWhenPossible(int userId, int expectedResult) throws Exception {
+        installPackage(TEST_APP_PKG_APK, /* options= */"-t");
+        assertTrue(getDevice().isPackageInstalled(TEST_APP_PKG_NAME));
+
+        DeviceTestRunOptions options = new DeviceTestRunOptions(TEST_APP_PKG_NAME)
+                .setDevice(getDevice())
+                .setTestClassName(TEST_APP_PKG_NAME + ".UserOperationsTest")
+                .setTestMethodName("removeUserWhenPossibleDeviceSide")
+                .addInstrumentationArg("userId", String.valueOf(userId))
+                .addInstrumentationArg("overrideDevicePolicy", String.valueOf(false))
+                .addInstrumentationArg("expectedResult", String.valueOf(expectedResult));
+        final boolean appResult = runDeviceTests(options);
+        assertTrue("Failed to successfully run app", appResult);
     }
 
     private void assertUserEphemeral(int userId) throws Exception {
diff --git a/hostsidetests/os/AndroidTest.xml b/hostsidetests/os/AndroidTest.xml
index 1eb77ac..d0a869c 100644
--- a/hostsidetests/os/AndroidTest.xml
+++ b/hostsidetests/os/AndroidTest.xml
@@ -20,6 +20,17 @@
     <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
 
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="mkdir -p /data/local/tmp/cts/hostside/os" />
+        <option name="teardown-command" value="rm -rf /data/local/tmp/cts"/>
+    </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="cleanup" value="true" />
+        <option name="push" value="CtsStaticSharedLibProviderApp1.apk->/data/local/tmp/cts/hostside/os/CtsStaticSharedLibProviderApp1.apk" />
+        <option name="push" value="CtsStaticSharedLibProviderApp2.apk->/data/local/tmp/cts/hostside/os/CtsStaticSharedLibProviderApp2.apk" />
+    </target_preparer>
+
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsDeviceOsTestApp.apk" />
diff --git a/hostsidetests/os/src/android/os/cts/StaticSharedLibsHostTests.java b/hostsidetests/os/src/android/os/cts/StaticSharedLibsHostTests.java
index 360d8d7..39d6df0 100644
--- a/hostsidetests/os/src/android/os/cts/StaticSharedLibsHostTests.java
+++ b/hostsidetests/os/src/android/os/cts/StaticSharedLibsHostTests.java
@@ -16,10 +16,16 @@
 
 package android.os.cts;
 
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
 import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.AppModeInstant;
+import android.platform.test.annotations.LargeTest;
+import android.platform.test.annotations.Presubmit;
 
 import com.android.compatibility.common.tradefed.build.CompatibilityBuildHelper;
+import com.android.compatibility.common.util.PollingCheck;
 import com.android.ddmlib.testrunner.RemoteAndroidTestRunner;
 import com.android.ddmlib.testrunner.TestResult.TestStatus;
 import com.android.tradefed.build.IBuildInfo;
@@ -30,10 +36,16 @@
 import com.android.tradefed.result.TestRunResult;
 import com.android.tradefed.testtype.DeviceTestCase;
 import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.util.CommandResult;
+import com.android.tradefed.util.CommandStatus;
 
 import java.io.FileNotFoundException;
+import java.util.Arrays;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
+@Presubmit
 public class StaticSharedLibsHostTests extends DeviceTestCase implements IBuildReceiver {
     private static final String ANDROID_JUNIT_RUNNER_CLASS =
             "androidx.test.runner.AndroidJUnitRunner";
@@ -43,6 +55,9 @@
     private static final String STATIC_LIB_PROVIDER_RECURSIVE_PKG =
             "android.os.lib.provider.recursive";
 
+    private static final String STATIC_LIB_PROVIDER_RECURSIVE_NAME = "foo.bar.lib.recursive";
+    private static final String STATIC_LIB_PROVIDER_NAME = "foo.bar.lib";
+
     private static final String STATIC_LIB_PROVIDER1_APK = "CtsStaticSharedLibProviderApp1.apk";
     private static final String STATIC_LIB_PROVIDER1_PKG = "android.os.lib.provider";
 
@@ -88,6 +103,15 @@
     private static final String STATIC_LIB_NATIVE_CONSUMER_PKG
             = "android.os.lib.consumer";
 
+    private static final String STATIC_LIB_TEST_APP_PKG = "android.os.lib.app";
+    private static final String STATIC_LIB_TEST_APP_CLASS_NAME = STATIC_LIB_TEST_APP_PKG
+            + ".StaticSharedLibsTests";
+
+    private static final String SETTING_UNUSED_STATIC_SHARED_LIB_MIN_CACHE_PERIOD =
+            "unused_static_shared_lib_min_cache_period";
+
+    private static final long DEFAULT_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(15);
+
     private CompatibilityBuildHelper mBuildHelper;
     private boolean mInstantMode = false;
 
@@ -683,8 +707,7 @@
 
     @AppModeFull(reason = "Instant app cannot get package installer service")
     public void testCannotSamegradeStaticSharedLibByInstaller() throws Exception {
-        runDeviceTests("android.os.lib.app",
-                "android.os.lib.app.StaticSharedLibsTests",
+        runDeviceTests(STATIC_LIB_TEST_APP_PKG, STATIC_LIB_TEST_APP_CLASS_NAME,
                 "testSamegradeStaticSharedLibFail");
     }
 
@@ -720,6 +743,111 @@
         }
     }
 
+    @LargeTest
+    @AppModeFull
+    public void testPruneUnusedStaticSharedLibraries_reboot_fullMode()
+            throws Exception {
+        doTestPruneUnusedStaticSharedLibraries_reboot();
+    }
+
+    @LargeTest
+    @AppModeInstant
+    public void testPruneUnusedStaticSharedLibraries_reboot_instantMode()
+            throws Exception {
+        mInstantMode = true;
+        doTestPruneUnusedStaticSharedLibraries_reboot();
+    }
+
+    private void doTestPruneUnusedStaticSharedLibraries_reboot()
+            throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_CONSUMER3_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER7_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        try {
+            // Install an unused library
+            assertThat(install(STATIC_LIB_PROVIDER_RECURSIVE_APK)).isNull();
+            assertThat(checkLibrary(STATIC_LIB_PROVIDER_RECURSIVE_NAME)).isTrue();
+
+            // Install the client and the corresponding library
+            assertThat(install(STATIC_LIB_PROVIDER7_APK)).isNull();
+            assertThat(install(STATIC_LIB_CONSUMER3_APK)).isNull();
+            assertThat(checkLibrary(STATIC_LIB_PROVIDER_NAME)).isTrue();
+
+            // Disallow to cache static shared library
+            setGlobalSetting(SETTING_UNUSED_STATIC_SHARED_LIB_MIN_CACHE_PERIOD,
+                    Integer.toString(0));
+
+            // TODO(205779832): There's a maximum two-seconds-delay before SettingsProvider persists
+            //  the settings. Waits for 3 seconds before reboot the device to ensure the setting is
+            //  persisted.
+            Thread.sleep(3_000);
+            getDevice().reboot();
+
+            // Waits for the uninstallation of the unused library to ensure the job has be executed
+            // correctly.
+            PollingCheck.check("Library " + STATIC_LIB_PROVIDER_RECURSIVE_NAME
+                            + " should be uninstalled", DEFAULT_TIMEOUT_MILLIS,
+                    () -> !checkLibrary(STATIC_LIB_PROVIDER_RECURSIVE_NAME));
+            assertWithMessage(
+                    "Library " + STATIC_LIB_PROVIDER_NAME + " should not be uninstalled")
+                    .that(checkLibrary(STATIC_LIB_PROVIDER_NAME)).isTrue();
+        } finally {
+            setGlobalSetting(SETTING_UNUSED_STATIC_SHARED_LIB_MIN_CACHE_PERIOD, null);
+            getDevice().uninstallPackage(STATIC_LIB_CONSUMER3_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER7_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
+    @LargeTest
+    @AppModeFull
+    public void testInstallStaticSharedLib_notKillDependentApp() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        try {
+            // Install library dependency
+            assertNull(install(STATIC_LIB_PROVIDER_RECURSIVE_APK));
+            // Install the first library
+            assertNull(install(STATIC_LIB_PROVIDER1_APK));
+            // Install the client
+            assertNull(install(STATIC_LIB_CONSUMER1_APK));
+
+            // Bind the service in consumer1 app to verify that the app should not be killed when
+            // a new version static shared library installed.
+            runDeviceTests(STATIC_LIB_TEST_APP_PKG, STATIC_LIB_TEST_APP_CLASS_NAME,
+                    "testInstallStaticSharedLib_notKillDependentApp");
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
+    @AppModeFull
+    public void testSamegradeStaticSharedLib_killDependentApp() throws Exception {
+        getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+        getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        try {
+            // Install library dependency
+            assertNull(install(STATIC_LIB_PROVIDER_RECURSIVE_APK));
+            // Install the first library
+            assertNull(install(STATIC_LIB_PROVIDER1_APK));
+            // Install the client
+            assertNull(install(STATIC_LIB_CONSUMER1_APK));
+
+            // Bind the service in consumer1 app to verify that the app should be killed when
+            // the static shared library is re-installed.
+            runDeviceTests(STATIC_LIB_TEST_APP_PKG, STATIC_LIB_TEST_APP_CLASS_NAME,
+                    "testSamegradeStaticSharedLib_killDependentApp");
+        } finally {
+            getDevice().uninstallPackage(STATIC_LIB_CONSUMER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER1_PKG);
+            getDevice().uninstallPackage(STATIC_LIB_PROVIDER_RECURSIVE_PKG);
+        }
+    }
+
     private String install(String apk) throws DeviceNotAvailableException, FileNotFoundException {
         return install(apk, false);
     }
@@ -728,4 +856,32 @@
         return getDevice().installPackage(mBuildHelper.getTestFile(apk), reinstall, false,
                 apk.contains("consumer") && mInstantMode ? "--instant" : "");
     }
+
+    private boolean checkLibrary(String libName) throws DeviceNotAvailableException {
+        final CommandResult result = getDevice().executeShellV2Command("pm list libraries");
+        if (result.getStatus() != CommandStatus.SUCCESS) {
+            fail("Failed to execute shell command: pm list libraries");
+        }
+        return Arrays.stream(result.getStdout().split("\n"))
+                .map(line -> line.split(":")[1])
+                .collect(Collectors.toList()).contains(libName);
+    }
+
+    private void setGlobalSetting(String key, String value) throws DeviceNotAvailableException {
+        final boolean deleteKey = (value == null);
+        final StringBuilder cmd = new StringBuilder("settings ");
+        if (deleteKey) {
+            cmd.append("delete ");
+        } else {
+            cmd.append("put ");
+        }
+        cmd.append("global ").append(key);
+        if (!deleteKey) {
+            cmd.append(" ").append(value);
+        }
+        final CommandResult res = getDevice().executeShellV2Command(cmd.toString());
+        if (res.getStatus() != CommandStatus.SUCCESS) {
+            fail("Failed to execute shell command: " + cmd);
+        }
+    }
 }
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/AndroidManifest.xml
index 958db29..93d214f 100755
--- a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/AndroidManifest.xml
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/AndroidManifest.xml
@@ -31,6 +31,8 @@
                 android:version="1"
                 android:certDigest="E4:95:82:FF:3A:0A:A4:C5:58:9F:C5:FE:AA:C6:B7:D6:E7:57:19:9D:D0:C6:74:2D:F7:BF:37:C2:FF:EF:95:F5">
         </uses-static-library>
+
+        <service android:name=".TestService" android:exported="true" />
     </application>
 
     <queries>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/src/android/os/lib/consumer1/TestService.java b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/src/android/os/lib/consumer1/TestService.java
new file mode 100644
index 0000000..b42c330
--- /dev/null
+++ b/hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/src/android/os/lib/consumer1/TestService.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2021 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 android.os.lib.consumer1;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+
+public class TestService extends Service {
+    private Binder mBinder = new Binder();
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+}
diff --git a/hostsidetests/os/test-apps/StaticSharedLibTestApp/AndroidManifest.xml b/hostsidetests/os/test-apps/StaticSharedLibTestApp/AndroidManifest.xml
index 51589ea..0e5712c2a 100755
--- a/hostsidetests/os/test-apps/StaticSharedLibTestApp/AndroidManifest.xml
+++ b/hostsidetests/os/test-apps/StaticSharedLibTestApp/AndroidManifest.xml
@@ -21,6 +21,11 @@
     <application>
     </application>
 
+    <queries>
+        <package android:name="android.os.lib.provider"/>
+        <package android:name="android.os.lib.consumer1"/>
+    </queries>
+
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
                      android:targetPackage="android.os.lib.app"/>
 </manifest>
diff --git a/hostsidetests/os/test-apps/StaticSharedLibTestApp/src/android/os/lib/app/StaticSharedLibsTests.java b/hostsidetests/os/test-apps/StaticSharedLibTestApp/src/android/os/lib/app/StaticSharedLibsTests.java
index 29bb524..cdf03d6 100644
--- a/hostsidetests/os/test-apps/StaticSharedLibTestApp/src/android/os/lib/app/StaticSharedLibsTests.java
+++ b/hostsidetests/os/test-apps/StaticSharedLibTestApp/src/android/os/lib/app/StaticSharedLibsTests.java
@@ -21,10 +21,16 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.Manifest;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.content.pm.SharedLibraryInfo;
+import android.os.IBinder;
 
 import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ServiceTestRule;
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.cts.install.lib.Install;
@@ -37,6 +43,8 @@
 import org.junit.runner.RunWith;
 
 import java.util.Optional;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 
 /**
  * On-device tests driven by StaticSharedLibsHostTests.
@@ -44,12 +52,32 @@
 @RunWith(AndroidJUnit4.class)
 public class StaticSharedLibsTests {
 
+    private static final String APK_BASE_PATH = "/data/local/tmp/cts/hostside/os/";
+    private static final String STATIC_LIB_PROVIDER1_APK = APK_BASE_PATH
+            + "CtsStaticSharedLibProviderApp1.apk";
+    private static final String STATIC_LIB_PROVIDER1_NAME = "foo.bar.lib";
+    private static final Long STATIC_LIB_PROVIDER1_VERSION = 1L;
+
+    private static final String STATIC_LIB_PROVIDER2_APK = APK_BASE_PATH
+            + "CtsStaticSharedLibProviderApp2.apk";
+    private static final String STATIC_LIB_PROVIDER2_PKG = "android.os.lib.provider";
+    private static final String STATIC_LIB_PROVIDER2_NAME = "foo.bar.lib";
+    private static final Long STATIC_LIB_PROVIDER2_VERSION = 2L;
+
     private static final String STATIC_LIB_PROVIDER5_PKG = "android.os.lib.provider";
     private static final String STATIC_LIB_PROVIDER5_NAME = "android.os.lib.provider_2";
+    private static final Long STATIC_LIB_PROVIDER5_VERSION = 1L;
     private static final TestApp TESTAPP_STATIC_LIB_PROVIDER5 = new TestApp(
             "TestStaticSharedLibProvider5", STATIC_LIB_PROVIDER5_PKG, 1, /*isApex*/ false,
             "CtsStaticSharedLibProviderApp5.apk");
 
+    public static final long TIMEOUT_MS = TimeUnit.SECONDS.toMillis(10);
+
+    private static final ComponentName CONSUMERAPP1_TEST_SERVICE = ComponentName.createRelative(
+            "android.os.lib.consumer1", ".TestService");
+
+    private final ServiceTestRule mServiceTestRule = new ServiceTestRule();
+
     @Before
     public void setUp() throws Exception {
         InstrumentationRegistry
@@ -57,12 +85,10 @@
                 .getUiAutomation()
                 .adoptShellPermissionIdentity(
                         Manifest.permission.INSTALL_PACKAGES);
-        clear();
     }
 
     @After
     public void tearDown() throws Exception {
-        clear();
         InstrumentationRegistry
                 .getInstrumentation()
                 .getUiAutomation()
@@ -71,31 +97,84 @@
 
     @Test
     public void testSamegradeStaticSharedLibFail() throws Exception {
-        Install.single(TESTAPP_STATIC_LIB_PROVIDER5).commit();
-        assertThat(getSharedLibraryInfo(STATIC_LIB_PROVIDER5_NAME)).isNotNull();
+        try {
+            Install.single(TESTAPP_STATIC_LIB_PROVIDER5).commit();
+            assertThat(
+                    getSharedLibraryInfo(STATIC_LIB_PROVIDER5_NAME, STATIC_LIB_PROVIDER5_VERSION))
+                    .isNotNull();
 
-        InstallUtils.commitExpectingFailure(AssertionError.class,
-                "Packages declaring static-shared libs cannot be updated",
-                Install.single(TESTAPP_STATIC_LIB_PROVIDER5));
+            InstallUtils.commitExpectingFailure(AssertionError.class,
+                    "Packages declaring static-shared libs cannot be updated",
+                    Install.single(TESTAPP_STATIC_LIB_PROVIDER5));
+        } finally {
+            uninstallPackage(STATIC_LIB_PROVIDER5_PKG);
+        }
     }
 
-    private void clear() {
-        uninstallSharedLibrary(STATIC_LIB_PROVIDER5_PKG, STATIC_LIB_PROVIDER5_NAME);
+    @Test
+    public void testInstallStaticSharedLib_notKillDependentApp() throws Exception {
+        final Intent intent = new Intent();
+        intent.setComponent(CONSUMERAPP1_TEST_SERVICE);
+        final CountDownLatch kill = new CountDownLatch(1);
+        mServiceTestRule.bindService(intent, new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+            }
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                kill.countDown();
+            }
+        }, Context.BIND_AUTO_CREATE);
+
+        try {
+            installPackage(STATIC_LIB_PROVIDER2_APK);
+            assertThat(
+                    getSharedLibraryInfo(STATIC_LIB_PROVIDER2_NAME, STATIC_LIB_PROVIDER2_VERSION))
+                    .isNotNull();
+
+            assertThat(kill.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isFalse();
+        } finally {
+            uninstallPackage(STATIC_LIB_PROVIDER2_PKG);
+        }
     }
 
-    private SharedLibraryInfo getSharedLibraryInfo(String libName) {
+    @Test
+    public void testSamegradeStaticSharedLib_killDependentApp() throws Exception {
+        final Intent intent = new Intent();
+        intent.setComponent(CONSUMERAPP1_TEST_SERVICE);
+        final CountDownLatch kill = new CountDownLatch(1);
+        mServiceTestRule.bindService(intent, new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+            }
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                kill.countDown();
+            }
+        }, Context.BIND_AUTO_CREATE);
+        assertThat(
+                getSharedLibraryInfo(STATIC_LIB_PROVIDER1_NAME, STATIC_LIB_PROVIDER1_VERSION))
+                .isNotNull();
+
+        installPackage(STATIC_LIB_PROVIDER1_APK);
+        assertThat(kill.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();
+    }
+
+    private SharedLibraryInfo getSharedLibraryInfo(String libName, long version) {
         final PackageManager packageManager = InstrumentationRegistry.getContext()
                 .getPackageManager();
-        final Optional<SharedLibraryInfo> libraryInfo = packageManager.getSharedLibraries(0)
-                .stream().filter(lib -> lib.getName().equals(libName)).findAny();
+        final Optional<SharedLibraryInfo> libraryInfo =
+                packageManager.getSharedLibraries(0 /* flags */).stream().filter(
+                        lib -> lib.getName().equals(libName) && lib.getLongVersion() == version)
+                        .findFirst();
         return libraryInfo.isPresent() ? libraryInfo.get() : null;
     }
 
-    private void uninstallSharedLibrary(String packageName, String libName) {
-        if (getSharedLibraryInfo(libName) == null) {
-            return;
-        }
+    private boolean installPackage(String apkPath) {
+        return runShellCommand("pm install -t " + apkPath).equals("Success\n");
+    }
+
+    private void uninstallPackage(String packageName) {
         runShellCommand("pm uninstall " + packageName);
-        assertThat(getSharedLibraryInfo(libName)).isNull();
     }
 }
diff --git a/hostsidetests/os/test-apps/TEST_MAPPING b/hostsidetests/os/test-apps/TEST_MAPPING
new file mode 100644
index 0000000..8ee69ff
--- /dev/null
+++ b/hostsidetests/os/test-apps/TEST_MAPPING
@@ -0,0 +1,22 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsOsHostTestCases",
+      "file_patterns": [
+          "(/|^)StaticSharedLib.*",
+          "(/|^)StaticSharedNativeLib.*"
+      ],
+      "options": [
+        {
+          "include-filter": "android.os.cts.StaticSharedLibsHostTests"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        }
+      ]
+    }
+  ]
+}
diff --git a/hostsidetests/os/test_mappings/packagemanager/TEST_MAPPING b/hostsidetests/os/test_mappings/packagemanager/TEST_MAPPING
new file mode 100644
index 0000000..72ed050
--- /dev/null
+++ b/hostsidetests/os/test_mappings/packagemanager/TEST_MAPPING
@@ -0,0 +1,21 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsOsHostTestCases",
+      "options": [
+        {
+          "include-filter": "android.os.cts.StaticSharedLibsHostTests"
+        },
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
+        }
+      ]
+    }
+  ]
+}
diff --git a/hostsidetests/packagemanager/TEST_MAPPING b/hostsidetests/packagemanager/TEST_MAPPING
new file mode 100644
index 0000000..7e7cf44
--- /dev/null
+++ b/hostsidetests/packagemanager/TEST_MAPPING
@@ -0,0 +1,33 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsDomainVerificationHostTestCases"
+    },
+    {
+      "name": "CtsExtractNativeLibsHostTestCases"
+    },
+    {
+      "name": "CtsInstalledLoadingProgressHostTests"
+    },
+    {
+      "name": "CtsPackageManagerMultiUserHostTestCases"
+    },
+    {
+      "name": "CtsPackageManagerParsingHostTestCases"
+    },
+    {
+      "name": "CtsPackageManagerPreferredActivityHostTestCases"
+    },
+    {
+      "name": "CtsPackageManagerStatsHostTestCases"
+    },
+    {
+      "name": "CtsPackageSettingHostTestCases"
+    }
+  ],
+  "presubmit-large": [
+    {
+      "name": "CtsDynamicMimeHostTestCases"
+    }
+  ]
+}
diff --git a/hostsidetests/packagemanager/codepath/Android.bp b/hostsidetests/packagemanager/codepath/Android.bp
deleted file mode 100644
index 1927ee3..0000000
--- a/hostsidetests/packagemanager/codepath/Android.bp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright (C) 2020 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-java_test_host {
-    name: "CtsCodePathHostTestCases",
-    defaults: ["cts_defaults"],
-    srcs: ["src/**/*.java"],
-    // tag this module as a cts test artifact
-    test_suites: [
-        "cts",
-        "general-tests",
-    ],
-    libs: [
-        "cts-tradefed",
-        "tradefed",
-        "compatibility-host-util",
-    ],
-}
diff --git a/hostsidetests/packagemanager/codepath/AndroidTest.xml b/hostsidetests/packagemanager/codepath/AndroidTest.xml
deleted file mode 100644
index 083a00f..0000000
--- a/hostsidetests/packagemanager/codepath/AndroidTest.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2020 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.
-  -->
-<configuration description="Config for CTS package installation code path host test cases">
-    <option name="test-suite-tag" value="cts" />
-    <option name="config-descriptor:metadata" key="component" value="framework" />
-    <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
-    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
-    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
-    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
-    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
-        <option name="jar" value="CtsCodePathHostTestCases.jar" />
-    </test>
-</configuration>
-
diff --git a/hostsidetests/packagemanager/codepath/app/Android.bp b/hostsidetests/packagemanager/codepath/app/Android.bp
deleted file mode 100644
index 666244d..0000000
--- a/hostsidetests/packagemanager/codepath/app/Android.bp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright (C) 2020 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-android_test_helper_app {
-    name: "CodePathTestApp",
-    defaults: ["cts_defaults"],
-    sdk_version: "current",
-    srcs: ["src/**/*.java",],
-    test_suites: [
-        "cts",
-        "general-tests",
-    ],
-    static_libs: ["androidx.test.rules"],
-    compile_multilib: "both",
-}
diff --git a/hostsidetests/packagemanager/codepath/app/AndroidManifest.xml b/hostsidetests/packagemanager/codepath/app/AndroidManifest.xml
deleted file mode 100644
index a9d5a03..0000000
--- a/hostsidetests/packagemanager/codepath/app/AndroidManifest.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Copyright (C) 2020 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.tests.codepath.app" >
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation
-        android:name="androidx.test.runner.AndroidJUnitRunner"
-        android:targetPackage="com.android.tests.codepath.app" />
-</manifest>
diff --git a/hostsidetests/packagemanager/codepath/app/src/com/android/tests/codepath/app/CodePathDeviceTest.java b/hostsidetests/packagemanager/codepath/app/src/com/android/tests/codepath/app/CodePathDeviceTest.java
deleted file mode 100644
index dd909c8..0000000
--- a/hostsidetests/packagemanager/codepath/app/src/com/android/tests/codepath/app/CodePathDeviceTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (C) 2020 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.tests.codepath.app;
-
-import android.content.pm.PackageInfo;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(AndroidJUnit4.class)
-public class CodePathDeviceTest {
-    @Test
-    public void testCodePathMatchesExpected() throws Exception {
-        String expectedCodePath =
-                InstrumentationRegistry.getArguments().getString("expectedCodePath");
-        String packageName =
-                InstrumentationRegistry.getInstrumentation().getContext().getPackageName();
-        PackageInfo pi = InstrumentationRegistry.getInstrumentation().getContext()
-                .getPackageManager().getPackageInfo(packageName, 0);
-        String apkPath = pi.applicationInfo.sourceDir;
-        Assert.assertTrue(apkPath.startsWith(expectedCodePath));
-    }
-}
diff --git a/hostsidetests/packagemanager/codepath/src/com/android/tests/codepath/host/CodePathTest.java b/hostsidetests/packagemanager/codepath/src/com/android/tests/codepath/host/CodePathTest.java
deleted file mode 100644
index 32763dd..0000000
--- a/hostsidetests/packagemanager/codepath/src/com/android/tests/codepath/host/CodePathTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (C) 2020 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.tests.codepath.host;
-
-import android.platform.test.annotations.AppModeFull;
-
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.PackageInfo;
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
-
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@RunWith(DeviceJUnit4ClassRunner.class)
-public class CodePathTest extends BaseHostJUnit4Test {
-    private static final String TEST_APK = "CodePathTestApp.apk";
-    private static final String TEST_PACKAGE = "com.android.tests.codepath.app";
-    private static final String TEST_CLASS = TEST_PACKAGE + "." + "CodePathDeviceTest";
-    private static final String TEST_METHOD = "testCodePathMatchesExpected";
-    private static final String CODE_PATH_ROOT = "/data/app";
-    private static final long DEFAULT_TIMEOUT = 10 * 60 * 1000L;
-
-    /** Uninstall apps after tests. */
-    @After
-    public void cleanUp() throws Exception {
-        uninstallPackage(getDevice(), TEST_PACKAGE);
-        Assert.assertFalse(isPackageInstalled(TEST_PACKAGE));
-    }
-
-    @Test
-    @AppModeFull
-    public void testAppInstallsWithReboot() throws Exception {
-        installPackage(TEST_APK);
-        Assert.assertTrue(isPackageInstalled(TEST_PACKAGE));
-        final String codePathFromDumpsys = getCodePathFromDumpsys(TEST_PACKAGE);
-        Assert.assertTrue(codePathFromDumpsys.startsWith(CODE_PATH_ROOT));
-        runDeviceTest(codePathFromDumpsys);
-        // Code paths should still be valid after reboot
-        getDevice().reboot();
-        final String codePathFromDumpsysAfterReboot = getCodePathFromDumpsys(TEST_PACKAGE);
-        Assert.assertEquals(codePathFromDumpsys, codePathFromDumpsysAfterReboot);
-        runDeviceTest(codePathFromDumpsys);
-    }
-
-    private String getCodePathFromDumpsys(String packageName)
-            throws DeviceNotAvailableException {
-        PackageInfo packageInfo = getDevice().getAppPackageInfo(packageName);
-        return packageInfo.getCodePath();
-    }
-
-    private void runDeviceTest(String codePathToMatch) throws Exception {
-        final Map<String, String> testArgs = new HashMap<>();
-        testArgs.put("expectedCodePath", codePathToMatch);
-        runDeviceTests(getDevice(), null, TEST_PACKAGE, TEST_CLASS, TEST_METHOD,
-                null, DEFAULT_TIMEOUT, DEFAULT_TIMEOUT,
-                0L, true, false, testArgs);
-    }
-}
\ No newline at end of file
diff --git a/hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp b/hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp
index 80caeb5..94d712f 100644
--- a/hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp
+++ b/hostsidetests/packagemanager/domainverification/apps/declaring/Android.bp
@@ -36,7 +36,6 @@
         "cts_defaults",
         "CtsDomainVerificationTestDeclaringAppDefaults",
     ],
-    min_sdk_version: "31",
     sdk_version: "test_current",
     aaptflags: ["--rename-manifest-package com.android.cts.packagemanager.verify.domain.declaringapp1"],
 }
@@ -48,7 +47,6 @@
         "cts_defaults",
         "CtsDomainVerificationTestDeclaringAppDefaults",
     ],
-    min_sdk_version: "31",
     sdk_version: "test_current",
     aaptflags: ["--rename-manifest-package com.android.cts.packagemanager.verify.domain.declaringapp2"],
 }
diff --git a/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkProfileAllowParentLinkingTests.kt b/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkProfileAllowParentLinkingTests.kt
index bf226ff..152a2b5 100644
--- a/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkProfileAllowParentLinkingTests.kt
+++ b/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkProfileAllowParentLinkingTests.kt
@@ -18,6 +18,7 @@
 
 import com.android.bedstead.harrier.BedsteadJUnit4
 import com.android.bedstead.harrier.DeviceState
+import com.android.bedstead.harrier.UserType
 import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile
 import com.android.bedstead.harrier.annotations.Postsubmit
 import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser
@@ -27,7 +28,7 @@
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@EnsureHasWorkProfile(forUser = DeviceState.UserType.PRIMARY_USER)
+@EnsureHasWorkProfile(forUser = UserType.PRIMARY_USER)
 @RunWith(BedsteadJUnit4::class)
 class DomainVerificationWorkProfileAllowParentLinkingTests :
     DomainVerificationWorkProfileTestsBase() {
diff --git a/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkProfileCrossProfileIntentTests.kt b/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkProfileCrossProfileIntentTests.kt
index 4062d98..4586631 100644
--- a/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkProfileCrossProfileIntentTests.kt
+++ b/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkProfileCrossProfileIntentTests.kt
@@ -21,6 +21,7 @@
 import android.content.IntentFilter
 import com.android.bedstead.harrier.BedsteadJUnit4
 import com.android.bedstead.harrier.DeviceState
+import com.android.bedstead.harrier.UserType
 import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile
 import com.android.bedstead.harrier.annotations.Postsubmit
 import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser
@@ -31,7 +32,7 @@
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@EnsureHasWorkProfile(forUser = DeviceState.UserType.PRIMARY_USER)
+@EnsureHasWorkProfile(forUser = UserType.PRIMARY_USER)
 @RunWith(BedsteadJUnit4::class)
 class DomainVerificationWorkProfileCrossProfileIntentTests :
     DomainVerificationWorkProfileTestsBase() {
diff --git a/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkProfileTestsBase.kt b/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkProfileTestsBase.kt
index dff94b8..21a300a 100644
--- a/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkProfileTestsBase.kt
+++ b/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkProfileTestsBase.kt
@@ -22,6 +22,7 @@
 import android.net.Uri
 import com.android.bedstead.harrier.BedsteadJUnit4
 import com.android.bedstead.harrier.DeviceState
+import com.android.bedstead.harrier.UserType
 import com.android.bedstead.harrier.annotations.AfterClass
 import com.android.bedstead.harrier.annotations.BeforeClass
 import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile
@@ -53,7 +54,7 @@
 import org.junit.Test
 import org.junit.runner.RunWith
 
-@EnsureHasWorkProfile(forUser = DeviceState.UserType.PRIMARY_USER)
+@EnsureHasWorkProfile(forUser = UserType.PRIMARY_USER)
 @RunWith(BedsteadJUnit4::class)
 abstract class DomainVerificationWorkProfileTestsBase {
 
@@ -101,7 +102,7 @@
         @BeforeClass
         fun installApks() {
             personalUser = deviceState.primaryUser()
-            workUser = deviceState.workProfile(DeviceState.UserType.PRIMARY_USER)
+            workUser = deviceState.workProfile(UserType.PRIMARY_USER)
             personalBrowsers = collectBrowsers(personalUser)
             workBrowsers = collectBrowsers(workUser)
             TestApis.packages().run {
diff --git a/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkUtils.kt b/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkUtils.kt
index 955a078..aba31b9 100644
--- a/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkUtils.kt
+++ b/hostsidetests/packagemanager/domainverification/device/multiuser/src/com/android/cts/packagemanager/verify/domain/device/multiuser/DomainVerificationWorkUtils.kt
@@ -19,6 +19,7 @@
 import android.content.Context
 import android.os.UserManager
 import com.android.bedstead.harrier.DeviceState
+import com.android.bedstead.harrier.UserType
 import com.android.bedstead.nene.TestApis
 import com.android.bedstead.nene.users.UserReference
 import android.app.admin.RemoteDevicePolicyManager
@@ -37,7 +38,7 @@
 }
 
 internal fun DeviceState.getWorkDevicePolicyManager() =
-    profileOwner(workProfile(DeviceState.UserType.PRIMARY_USER))!!
+    profileOwner(workProfile(UserType.PRIMARY_USER))!!
             .devicePolicyManager()
 
 internal fun <T> withUserContext(user: UserReference, block: (context: Context) -> T) =
diff --git a/hostsidetests/packagemanager/domainverification/device/standalone/Android.bp b/hostsidetests/packagemanager/domainverification/device/standalone/Android.bp
index 9f95449..8990d84 100644
--- a/hostsidetests/packagemanager/domainverification/device/standalone/Android.bp
+++ b/hostsidetests/packagemanager/domainverification/device/standalone/Android.bp
@@ -21,11 +21,10 @@
     srcs: [ "src/**/*.kt" ],
     test_suites: [
         "cts",
-        "gts",
         "device-tests",
     ],
     defaults: ["cts_defaults"],
-    min_sdk_version: "4",
+    sdk_version: "test_current",
     static_libs: [
         "androidx.test.ext.junit",
         "androidx.test.rules",
diff --git a/hostsidetests/packagemanager/domainverification/device/standalone/AndroidManifest.xml b/hostsidetests/packagemanager/domainverification/device/standalone/AndroidManifest.xml
index ce89e2b..fba5376 100644
--- a/hostsidetests/packagemanager/domainverification/device/standalone/AndroidManifest.xml
+++ b/hostsidetests/packagemanager/domainverification/device/standalone/AndroidManifest.xml
@@ -15,13 +15,8 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.android.cts.packagemanager.verify.domain.device.standalone"
-          >
-
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17"
-              tools:overrideLibrary="com.android.cts.packagemanager.verify.domain.constants.android"
-              />
+    package="com.android.cts.packagemanager.verify.domain.device.standalone"
+    >
 
     <application android:label="Device Test App" android:testOnly="true">
         <uses-library android:name="android.test.runner" />
diff --git a/hostsidetests/packagemanager/domainverification/device/standalone/AndroidTest.xml b/hostsidetests/packagemanager/domainverification/device/standalone/AndroidTest.xml
index e7afa10..95b86f5 100644
--- a/hostsidetests/packagemanager/domainverification/device/standalone/AndroidTest.xml
+++ b/hostsidetests/packagemanager/domainverification/device/standalone/AndroidTest.xml
@@ -15,7 +15,6 @@
   -->
 <configuration description="Config for CTS domain verification device standalone test cases">
     <option name="test-suite-tag" value="cts" />
-    <option name="test-suite-tag" value="gts" />
     <option name="config-descriptor:metadata" key="component" value="framework" />
     <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
@@ -24,7 +23,6 @@
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
-        <option name="check-min-sdk" value="true" />
         <option name="test-file-name" value="CtsDomainVerificationDeviceStandaloneTestCases.apk" />
         <option name="test-file-name" value="CtsDomainVerificationTestDeclaringApp1.apk" />
         <option name="test-file-name" value="CtsDomainVerificationTestDeclaringApp2.apk" />
diff --git a/hostsidetests/packagemanager/domainverification/device/standalone/src/com/android/cts/packagemanager/verify/domain/device/standalone/DomainVerificationIntentStandaloneTests.kt b/hostsidetests/packagemanager/domainverification/device/standalone/src/com/android/cts/packagemanager/verify/domain/device/standalone/DomainVerificationIntentStandaloneTests.kt
index 9401443a..1861010 100644
--- a/hostsidetests/packagemanager/domainverification/device/standalone/src/com/android/cts/packagemanager/verify/domain/device/standalone/DomainVerificationIntentStandaloneTests.kt
+++ b/hostsidetests/packagemanager/domainverification/device/standalone/src/com/android/cts/packagemanager/verify/domain/device/standalone/DomainVerificationIntentStandaloneTests.kt
@@ -17,9 +17,6 @@
 package com.android.cts.packagemanager.verify.domain.device.standalone
 
 import android.content.pm.verify.domain.DomainVerificationUserState
-import android.os.Build
-import com.android.compatibility.common.util.ApiLevelUtil
-import com.android.compatibility.common.util.CtsDownstreamingTest
 import com.android.compatibility.common.util.SystemUtil
 import com.android.cts.packagemanager.verify.domain.android.DomainUtils.DECLARING_PKG_1_COMPONENT
 import com.android.cts.packagemanager.verify.domain.android.DomainUtils.DECLARING_PKG_2_COMPONENT
@@ -29,8 +26,6 @@
 import com.android.cts.packagemanager.verify.domain.java.DomainUtils.DOMAIN_1
 import com.android.cts.packagemanager.verify.domain.java.DomainUtils.DOMAIN_2
 import com.google.common.truth.Truth.assertThat
-import org.junit.Assume.assumeTrue
-import org.junit.BeforeClass
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.junit.runners.Parameterized
@@ -38,14 +33,6 @@
 @RunWith(Parameterized::class)
 class DomainVerificationIntentStandaloneTests : DomainVerificationIntentTestBase(DOMAIN_1) {
 
-    companion object {
-        @JvmStatic
-        @BeforeClass
-        fun assumeAtLeastS() {
-            assumeTrue(ApiLevelUtil.isAtLeast(Build.VERSION_CODES.S))
-        }
-    }
-
     @Test
     fun launchVerified() {
         setAppLinks(DECLARING_PKG_NAME_1, true, DOMAIN_1, DOMAIN_2)
@@ -87,7 +74,6 @@
         assertResolvesTo(browsers)
     }
 
-    @CtsDownstreamingTest
     @Test
     fun launchSelectedPreservedOnUpdate() {
         setAppLinks(DECLARING_PKG_NAME_1, false, DOMAIN_1, DOMAIN_2)
@@ -176,7 +162,6 @@
         assertResolvesTo(browsers)
     }
 
-    @CtsDownstreamingTest
     @Test
     fun disableHandlingWhenVerifiedPreservedOnUpdate() {
         setAppLinks(DECLARING_PKG_NAME_1, true, DOMAIN_1, DOMAIN_2)
@@ -207,7 +192,6 @@
         assertResolvesTo(browsers)
     }
 
-    @CtsDownstreamingTest
     @Test
     fun disableHandlingWhenSelectedPreservedOnUpdate() {
         setAppLinksUserSelection(DECLARING_PKG_NAME_1, userId, true, DOMAIN_1, DOMAIN_2)
diff --git a/hostsidetests/packagemanager/domainverification/lib/constants/android/Android.bp b/hostsidetests/packagemanager/domainverification/lib/constants/android/Android.bp
index 874d299..5e92d18 100644
--- a/hostsidetests/packagemanager/domainverification/lib/constants/android/Android.bp
+++ b/hostsidetests/packagemanager/domainverification/lib/constants/android/Android.bp
@@ -20,7 +20,6 @@
     name: "CtsDomainVerificationAndroidConstantsLibrary",
     defaults: ["cts_defaults"],
     srcs: ["src/**/*.kt"],
-    min_sdk_version: "31",
     static_libs: [
         "androidx.test.ext.junit",
         "androidx.test.rules",
diff --git a/hostsidetests/packagemanager/installedloadingprogess/hostside/src/com/android/tests/loadingprogress/host/IncrementalLoadingProgressTest.java b/hostsidetests/packagemanager/installedloadingprogess/hostside/src/com/android/tests/loadingprogress/host/IncrementalLoadingProgressTest.java
index db9a827..c3423bc 100644
--- a/hostsidetests/packagemanager/installedloadingprogess/hostside/src/com/android/tests/loadingprogress/host/IncrementalLoadingProgressTest.java
+++ b/hostsidetests/packagemanager/installedloadingprogess/hostside/src/com/android/tests/loadingprogress/host/IncrementalLoadingProgressTest.java
@@ -39,6 +39,8 @@
 
 import java.io.File;
 import java.nio.file.Paths;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Matcher;
@@ -125,6 +127,26 @@
 
     @LargeTest
     @Test
+    public void testGetLoadingProgressDuringMigration() throws Exception {
+        // Check partial loading progress
+        assertTrue(runDeviceTests(DEVICE_TEST_PACKAGE_NAME, TEST_CLASS_NAME,
+                "testGetPartialLoadingProgress"));
+        final List<File> apks = new ArrayList<>(2);
+        CompatibilityBuildHelper buildHelper = new CompatibilityBuildHelper(getBuild());
+        final File base_apk = buildHelper.getTestFile(TEST_APK);
+        assertNotNull(base_apk);
+        apks.add(base_apk);
+        final File split_apk = buildHelper.getTestFile(TEST_SPLIT_APK);
+        assertNotNull(split_apk);
+        apks.add(split_apk);
+        // Trigger app migration through normal package installation.
+        getDevice().installPackages(apks, false, "-t");
+        assertTrue(runDeviceTests(DEVICE_TEST_PACKAGE_NAME, TEST_CLASS_NAME,
+                "testGetFullLoadingProgress"));
+    }
+
+    @LargeTest
+    @Test
     public void testOnPackageLoadingProgressChangedCalledWithPartialLoaded() throws Exception {
         assertTrue(runDeviceTests(DEVICE_TEST_PACKAGE_NAME, TEST_CLASS_NAME,
                 "testOnPackageLoadingProgressChangedCalledWithPartialLoaded"));
diff --git a/hostsidetests/packagemanager/packagesetting/Android.bp b/hostsidetests/packagemanager/packagesetting/Android.bp
new file mode 100644
index 0000000..ba34621
--- /dev/null
+++ b/hostsidetests/packagemanager/packagesetting/Android.bp
@@ -0,0 +1,33 @@
+// Copyright (C) 2020 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_test_host {
+    name: "CtsPackageSettingHostTestCases",
+    defaults: ["cts_defaults"],
+    srcs: ["src/**/*.java"],
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    libs: [
+        "cts-tradefed",
+        "tradefed",
+        "compatibility-host-util",
+    ],
+}
diff --git a/hostsidetests/packagemanager/packagesetting/AndroidTest.xml b/hostsidetests/packagemanager/packagesetting/AndroidTest.xml
new file mode 100644
index 0000000..9218853
--- /dev/null
+++ b/hostsidetests/packagemanager/packagesetting/AndroidTest.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+<configuration description="Config for CTS package installation code path host test cases">
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
+    <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
+        <option name="jar" value="CtsPackageSettingHostTestCases.jar" />
+    </test>
+</configuration>
+
diff --git a/hostsidetests/packagemanager/packagesetting/app/Android.bp b/hostsidetests/packagemanager/packagesetting/app/Android.bp
new file mode 100644
index 0000000..2707570
--- /dev/null
+++ b/hostsidetests/packagemanager/packagesetting/app/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2020 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "PackageSettingTestApp",
+    defaults: ["cts_defaults"],
+    srcs: ["src/**/*.java"],
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    static_libs: ["androidx.test.rules"],
+    compile_multilib: "both",
+    platform_apis: true,
+}
diff --git a/hostsidetests/packagemanager/packagesetting/app/AndroidManifest.xml b/hostsidetests/packagemanager/packagesetting/app/AndroidManifest.xml
new file mode 100644
index 0000000..0072f74
--- /dev/null
+++ b/hostsidetests/packagemanager/packagesetting/app/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (C) 2020 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.android.tests.packagesetting.app" >
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="com.android.tests.packagesetting.app" />
+</manifest>
diff --git a/hostsidetests/packagemanager/packagesetting/app/src/com/android/tests/packagesetting/app/PackageSettingDeviceTest.java b/hostsidetests/packagemanager/packagesetting/app/src/com/android/tests/packagesetting/app/PackageSettingDeviceTest.java
new file mode 100644
index 0000000..ca3c4ed
--- /dev/null
+++ b/hostsidetests/packagemanager/packagesetting/app/src/com/android/tests/packagesetting/app/PackageSettingDeviceTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2020 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.tests.packagesetting.app;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class PackageSettingDeviceTest {
+    @Test
+    public void testCodePathMatchesExpected() throws Exception {
+        String expectedCodePath =
+                InstrumentationRegistry.getArguments().getString("expectedCodePath");
+        String packageName =
+                InstrumentationRegistry.getInstrumentation().getContext().getPackageName();
+        PackageInfo pi = InstrumentationRegistry.getInstrumentation().getContext()
+                .getPackageManager().getPackageInfo(packageName, 0);
+        String apkPath = pi.applicationInfo.sourceDir;
+        Assert.assertTrue(apkPath.startsWith(expectedCodePath));
+    }
+
+    @Test
+    public void testFirstInstallTimeMatchesExpected() throws Exception {
+        final Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        String packageName =
+                InstrumentationRegistry.getInstrumentation().getContext().getPackageName();
+        String userIdStr = InstrumentationRegistry.getArguments().getString("userId");
+        String expectedFirstInstallTimeStr = InstrumentationRegistry.getArguments().getString(
+                "expectedFirstInstallTime");
+        final int userId = Integer.parseInt(userIdStr);
+        final long expectedFirstInstallTime = Long.parseLong(expectedFirstInstallTimeStr);
+        final Context contextAsUser = context.createContextAsUser(UserHandle.of(userId), 0);
+        PackageInfo pi = contextAsUser.getPackageManager().getPackageInfo(packageName,
+                PackageManager.PackageInfoFlags.of(0));
+        Assert.assertTrue(Math.abs(expectedFirstInstallTime - pi.firstInstallTime) < 1000 /* ms */);
+    }
+}
diff --git a/hostsidetests/packagemanager/packagesetting/src/com/android/tests/packagesetting/host/PackageSettingTest.java b/hostsidetests/packagemanager/packagesetting/src/com/android/tests/packagesetting/host/PackageSettingTest.java
new file mode 100644
index 0000000..0b66e17
--- /dev/null
+++ b/hostsidetests/packagemanager/packagesetting/src/com/android/tests/packagesetting/host/PackageSettingTest.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2020 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.tests.packagesetting.host;
+
+import android.platform.test.annotations.AppModeFull;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.PackageInfo;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.text.SimpleDateFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimeZone;
+
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class PackageSettingTest extends BaseHostJUnit4Test {
+    private static final String TEST_APK = "PackageSettingTestApp.apk";
+    private static final String TEST_PACKAGE = "com.android.tests.packagesetting.app";
+    private static final String TEST_CLASS = TEST_PACKAGE + "." + "PackageSettingDeviceTest";
+    private static final String CODE_PATH_ROOT = "/data/app";
+    private static final long DEFAULT_TIMEOUT = 10 * 60 * 1000L;
+    private int mSecondUser = -1;
+
+    /** Uninstall apps after tests. */
+    @After
+    public void cleanUp() throws Exception {
+        uninstallPackage(getDevice(), TEST_PACKAGE);
+        Assert.assertFalse(isPackageInstalled(TEST_PACKAGE));
+        if (mSecondUser != -1) {
+            stopAndRemoveUser(mSecondUser);
+        }
+    }
+
+    @Test
+    @AppModeFull
+    public void testAppInstallsWithReboot() throws Exception {
+        installPackage(TEST_APK);
+        Assert.assertTrue(isPackageInstalled(TEST_PACKAGE));
+        final String codePathFromDumpsys = getCodePathFromDumpsys(TEST_PACKAGE);
+        Assert.assertTrue(codePathFromDumpsys.startsWith(CODE_PATH_ROOT));
+        testCodePathMatchesDumpsys(codePathFromDumpsys);
+        // Code paths should still be valid after reboot
+        getDevice().reboot();
+        final String codePathFromDumpsysAfterReboot = getCodePathFromDumpsys(TEST_PACKAGE);
+        Assert.assertEquals(codePathFromDumpsys, codePathFromDumpsysAfterReboot);
+        testCodePathMatchesDumpsys(codePathFromDumpsys);
+    }
+
+    private String getCodePathFromDumpsys(String packageName)
+            throws DeviceNotAvailableException {
+        PackageInfo packageInfo = getDevice().getAppPackageInfo(packageName);
+        return packageInfo.getCodePath();
+    }
+
+    private void testCodePathMatchesDumpsys(String codePathToMatch) throws Exception {
+        final Map<String, String> testArgs = new HashMap<>();
+        testArgs.put("expectedCodePath", codePathToMatch);
+        runDeviceTests(getDevice(), null, TEST_PACKAGE, TEST_CLASS, "testCodePathMatchesExpected",
+                null, DEFAULT_TIMEOUT, DEFAULT_TIMEOUT, 0L, true, false, testArgs);
+    }
+
+    @Test
+    @AppModeFull
+    public void testFirstInstallTimeWithReboot() throws Exception {
+        installPackage(TEST_APK);
+        final int currentUser = getDevice().getCurrentUser();
+        final String firstInstallTimeForCurrentUser = getFirstInstallTimeForUserFromDumpsys(
+                TEST_PACKAGE, currentUser);
+        Assert.assertNotNull(firstInstallTimeForCurrentUser);
+        testFirstInstallTimeMatchesDumpsys(firstInstallTimeForCurrentUser, currentUser);
+        // firstInstallTime should be the same after reboot
+        getDevice().reboot();
+        Assert.assertEquals(firstInstallTimeForCurrentUser,
+                getFirstInstallTimeForUserFromDumpsys(TEST_PACKAGE, currentUser));
+
+        mSecondUser = createAndStartSecondUser();
+        installPackageOnExistingUser(TEST_PACKAGE, mSecondUser);
+        final String firstInstallTimeForSecondUser = getFirstInstallTimeForUserFromDumpsys(
+                TEST_PACKAGE, mSecondUser);
+        Assert.assertNotNull(firstInstallTimeForSecondUser);
+        Assert.assertNotEquals(firstInstallTimeForCurrentUser, firstInstallTimeForSecondUser);
+        testFirstInstallTimeMatchesDumpsys(firstInstallTimeForSecondUser, mSecondUser);
+        getDevice().reboot();
+        Assert.assertEquals(firstInstallTimeForSecondUser,
+                getFirstInstallTimeForUserFromDumpsys(TEST_PACKAGE, mSecondUser));
+    }
+
+    private int createAndStartSecondUser() throws Exception {
+        String output = getDevice().executeShellCommand("pm create-user SecondUser");
+        Assert.assertTrue(output.startsWith("Success"));
+        int userId = Integer.parseInt(output.substring(output.lastIndexOf(" ")).trim());
+        output = getDevice().executeShellCommand("am start-user -w " + userId);
+        Assert.assertFalse(output.startsWith("Error"));
+        output = getDevice().executeShellCommand("am get-started-user-state " + userId);
+        Assert.assertTrue(output.contains("RUNNING_UNLOCKED"));
+        return userId;
+    }
+
+    private void stopAndRemoveUser(int userId) throws Exception {
+        getDevice().executeShellCommand("am stop-user -w -f " + userId);
+        getDevice().executeShellCommand("pm remove-user " + userId);
+    }
+
+    private void installPackageOnExistingUser(String packageName, int userId) throws Exception {
+        final String output = getDevice().executeShellCommand(
+                String.format("pm install-existing --user %d %s", userId, packageName));
+        Assert.assertEquals("Package " + packageName + " installed for user: " + userId + "\n",
+                output);
+    }
+
+    private String getFirstInstallTimeForUserFromDumpsys(String packageName, int userId)
+            throws Exception {
+        PackageInfo packageInfo = getDevice().getAppPackageInfo(packageName);
+        return packageInfo.getFirstInstallTime(userId);
+    }
+
+    private void testFirstInstallTimeMatchesDumpsys(String firstInstallTime, int userId)
+            throws Exception {
+        final Map<String, String> testArgs = new HashMap<>();
+        // Notice the printed timestamp in dumpsys is formatted and has lost sub-second precision
+        final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        sdf.setTimeZone(TimeZone.getTimeZone(getDeviceTimezone()));
+        final long firstInstallTs = sdf.parse(firstInstallTime).getTime();
+        testArgs.put("userId", String.valueOf(userId));
+        testArgs.put("expectedFirstInstallTime", String.valueOf(firstInstallTs));
+        runDeviceTests(getDevice(), null, TEST_PACKAGE, TEST_CLASS,
+                "testFirstInstallTimeMatchesExpected", null, DEFAULT_TIMEOUT, DEFAULT_TIMEOUT,
+                0L, true, false, testArgs);
+    }
+
+    private String getDeviceTimezone() throws Exception {
+        final String timezone = getDevice().getProperty("persist.sys.timezone");
+        if (timezone != null) {
+            return timezone.trim();
+        }
+        return "GMT";
+    }
+
+}
diff --git a/hostsidetests/rollback/app/src/com/android/cts/rollback/host/app/HostTestHelper.java b/hostsidetests/rollback/app/src/com/android/cts/rollback/host/app/HostTestHelper.java
index a34da7b..36d4bb0 100644
--- a/hostsidetests/rollback/app/src/com/android/cts/rollback/host/app/HostTestHelper.java
+++ b/hostsidetests/rollback/app/src/com/android/cts/rollback/host/app/HostTestHelper.java
@@ -671,6 +671,11 @@
         assertThat(committed).causePackagesContainsExactly(TestApp.A2);
         assertThat(committed.getCommittedSessionId()).isNotEqualTo(-1);
 
+        // This staged session should fail when there is already a staged rollback
+        InstallUtils.commitExpectingFailure(AssertionError.class,
+                "Session was failed by rollback",
+                Install.single(TestApp.C1).setStaged());
+
         // Assert that blocking staged session is failed
         final PackageInstaller.SessionInfo sessionA = InstallUtils.getStagedSessionInfo(sessionIdA);
         assertThat(sessionA).isNotNull();
diff --git a/hostsidetests/rollback/src/com/android/cts/rollback/host/RollbackManagerHostTest.java b/hostsidetests/rollback/src/com/android/cts/rollback/host/RollbackManagerHostTest.java
index f373d47..88e926a 100644
--- a/hostsidetests/rollback/src/com/android/cts/rollback/host/RollbackManagerHostTest.java
+++ b/hostsidetests/rollback/src/com/android/cts/rollback/host/RollbackManagerHostTest.java
@@ -81,6 +81,7 @@
                 + "--only-parent); do pm install-abandon $i; done");
         getDevice().executeShellCommand("pm uninstall com.android.cts.install.lib.testapp.A");
         getDevice().executeShellCommand("pm uninstall com.android.cts.install.lib.testapp.B");
+        getDevice().executeShellCommand("pm uninstall com.android.cts.install.lib.testapp.C");
         run("cleanUp");
         mHostUtils.uninstallShimApexIfNecessary();
     }
diff --git a/hostsidetests/scopedstorage/Android.bp b/hostsidetests/scopedstorage/Android.bp
index 61526d2..e2c5c0f 100644
--- a/hostsidetests/scopedstorage/Android.bp
+++ b/hostsidetests/scopedstorage/Android.bp
@@ -21,34 +21,68 @@
     manifest: "ScopedStorageTestHelper/TestAppA.xml",
     static_libs: ["cts-scopedstorage-lib"],
     sdk_version: "test_current",
+    //TODO(b/227617884): Change target_sdk_version to 33 after T SDK finalization is complete
+    target_sdk_version: "10000",
+    min_sdk_version: "30",
+    srcs: ["ScopedStorageTestHelper/src/**/*.java"],
+    // Tag as a CTS artifact
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsScopedStorageTestAppA31",
+    manifest: "ScopedStorageTestHelper/TestAppA31.xml",
+    static_libs: ["cts-scopedstorage-lib"],
+    sdk_version: "test_current",
     target_sdk_version: "31",
     min_sdk_version: "30",
     srcs: ["ScopedStorageTestHelper/src/**/*.java"],
     // Tag as a CTS artifact
-    test_suites: ["device-tests", "mts-mediaprovider", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
 }
+
 android_test_helper_app {
     name: "CtsScopedStorageTestAppB",
     manifest: "ScopedStorageTestHelper/TestAppB.xml",
     static_libs: ["cts-scopedstorage-lib"],
     sdk_version: "test_current",
-    target_sdk_version: "31",
+    //TODO(b/227617884): Change target_sdk_version to 33 after T SDK finalization is complete
+    target_sdk_version: "10000",
     min_sdk_version: "30",
     srcs: ["ScopedStorageTestHelper/src/**/*.java"],
     // Tag as a CTS artifact
-    test_suites: ["device-tests", "mts-mediaprovider", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
 }
+
 android_test_helper_app {
     name: "CtsScopedStorageTestAppC",
     manifest: "ScopedStorageTestHelper/TestAppC.xml",
     static_libs: ["cts-scopedstorage-lib"],
     sdk_version: "test_current",
-    target_sdk_version: "31",
+    //TODO(b/227617884): Change target_sdk_version to 33 after T SDK finalization is complete
+    target_sdk_version: "10000",
     min_sdk_version: "30",
     srcs: ["ScopedStorageTestHelper/src/**/*.java"],
     // Tag as a CTS artifact
-    test_suites: ["device-tests", "mts-mediaprovider", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
 }
+
 android_test_helper_app {
     name: "CtsScopedStorageTestAppC30",
     manifest: "ScopedStorageTestHelper/TestAppC30.xml",
@@ -58,8 +92,13 @@
     min_sdk_version: "30",
     srcs: ["ScopedStorageTestHelper/src/**/*.java"],
     // Tag as a CTS artifact
-    test_suites: ["device-tests", "mts", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts",
+        "cts",
+    ],
 }
+
 android_test_helper_app {
     name: "CtsScopedStorageTestAppCLegacy",
     manifest: "ScopedStorageTestHelper/TestAppCLegacy.xml",
@@ -69,8 +108,13 @@
     min_sdk_version: "28",
     srcs: ["ScopedStorageTestHelper/src/**/*.java"],
     // Tag as a CTS artifact
-    test_suites: ["device-tests", "mts-mediaprovider", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
 }
+
 android_test_helper_app {
     name: "CtsScopedStorageTestAppDLegacy",
     manifest: "ScopedStorageTestHelper/TestAppDLegacy.xml",
@@ -80,7 +124,11 @@
     min_sdk_version: "28",
     srcs: ["ScopedStorageTestHelper/src/**/*.java"],
     // Tag as a CTS artifact
-    test_suites: ["device-tests", "mts-mediaprovider", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
 }
 
 android_test_helper_app {
@@ -88,34 +136,52 @@
     manifest: "ScopedStorageTestHelper/TestAppFileManager.xml",
     static_libs: ["cts-scopedstorage-lib"],
     sdk_version: "test_current",
-    target_sdk_version: "31",
+    //TODO(b/227617884): Change target_sdk_version to 33 after T SDK finalization is complete
+    target_sdk_version: "10000",
     min_sdk_version: "30",
     srcs: ["ScopedStorageTestHelper/src/**/*.java"],
     // Tag as a CTS artifact
-    test_suites: ["device-tests", "mts-mediaprovider", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
 }
+
 android_test_helper_app {
     name: "CtsScopedStorageTestAppFileManagerBypassDB",
     manifest: "ScopedStorageTestHelper/TestAppFileManagerBypassDB.xml",
     static_libs: ["cts-scopedstorage-lib"],
     sdk_version: "test_current",
-    target_sdk_version: "31",
+    //TODO(b/227617884): Change target_sdk_version to 33 after T SDK finalization is complete
+    target_sdk_version: "10000",
     min_sdk_version: "30",
     srcs: ["ScopedStorageTestHelper/src/**/*.java"],
     // Tag as a CTS artifact
-    test_suites: ["device-tests", "mts", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts",
+        "cts",
+    ],
 }
+
 android_test_helper_app {
     name: "CtsScopedStorageTestAppSystemGalleryBypassDB",
     manifest: "ScopedStorageTestHelper/TestAppSystemGalleryBypassDB.xml",
     static_libs: ["cts-scopedstorage-lib"],
     sdk_version: "test_current",
-    target_sdk_version: "31",
+    //TODO(b/227617884): Change target_sdk_version to 33 after T SDK finalization is complete
+    target_sdk_version: "10000",
     min_sdk_version: "30",
     srcs: ["ScopedStorageTestHelper/src/**/*.java"],
     // Tag as a CTS artifact
-    test_suites: ["device-tests", "mts", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts",
+        "cts",
+    ],
 }
+
 android_test_helper_app {
     name: "CtsScopedStorageTestAppSystemGallery30BypassDB",
     manifest: "ScopedStorageTestHelper/TestAppSystemGallery30BypassDB.xml",
@@ -125,7 +191,11 @@
     min_sdk_version: "30",
     srcs: ["ScopedStorageTestHelper/src/**/*.java"],
     // Tag as a CTS artifact
-    test_suites: ["device-tests", "mts", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts",
+        "cts",
+    ],
 }
 
 android_test_helper_app {
@@ -150,52 +220,87 @@
     name: "ScopedStorageTest",
     manifest: "AndroidManifest.xml",
     srcs: ["src/**/*.java"],
-    static_libs: ["truth-prebuilt", "cts-scopedstorage-lib"],
+    static_libs: [
+        "truth-prebuilt",
+        "cts-scopedstorage-lib",
+    ],
     compile_multilib: "both",
-    test_suites: ["general-tests", "mts-mediaprovider", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
     sdk_version: "test_current",
-    target_sdk_version: "31",
+    //TODO(b/227617884): Change target_sdk_version to 33 after T SDK finalization is complete
+    target_sdk_version: "10000",
     min_sdk_version: "30",
     java_resources: [
         ":CtsScopedStorageTestAppA",
+        ":CtsScopedStorageTestAppA31",
         ":CtsScopedStorageTestAppB",
         ":CtsScopedStorageTestAppC",
         ":CtsScopedStorageTestAppCLegacy",
-    ]
+    ],
 }
 
 android_test {
     name: "LegacyStorageTest",
     manifest: "legacy/AndroidManifest.xml",
     srcs: ["legacy/src/**/*.java"],
-    static_libs: ["truth-prebuilt", "cts-scopedstorage-lib"],
+    static_libs: [
+        "truth-prebuilt",
+        "cts-scopedstorage-lib",
+    ],
     compile_multilib: "both",
-    test_suites: ["general-tests", "mts-mediaprovider", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
     sdk_version: "test_current",
     target_sdk_version: "29",
     min_sdk_version: "30",
     java_resources: [
         ":CtsScopedStorageTestAppA",
-    ]
+    ],
 }
 
 java_test_host {
     name: "CtsScopedStorageCoreHostTest",
-    srcs:  [
+    srcs: [
         "host/src/android/scopedstorage/cts/host/ScopedStorageCoreHostTest.java",
-        "host/src/android/scopedstorage/cts/host/BaseHostTestCase.java"
+        "host/src/android/scopedstorage/cts/host/BaseHostTestCase.java",
     ],
-    libs: ["cts-tradefed", "tradefed", "testng"],
-    test_suites: ["general-tests", "mts-mediaprovider", "cts"],
+    libs: [
+        "cts-tradefed",
+        "tradefed",
+        "testng",
+    ],
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
     test_config: "CoreTest.xml",
 }
 
 java_test_host {
     name: "CtsScopedStorageHostTest",
     srcs: ["host/src/**/*.java"],
-    libs: ["cts-tradefed", "tradefed", "testng"],
-    static_libs: ["modules-utils-build-testing", "compatibility-host-util"],
-    test_suites: ["general-tests", "mts-mediaprovider", "cts"],
+    libs: [
+        "cts-tradefed",
+        "tradefed",
+        "testng",
+    ],
+    static_libs: [
+        "modules-utils-build-testing",
+        "compatibility-host-util",
+    ],
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
     test_config: "AndroidTest.xml",
     data: [
         ":CtsLegacyStorageTestAppRequestLegacy",
@@ -205,13 +310,23 @@
 
 java_test_host {
     name: "GtsPreserveLegacyStorageHostTest",
-    srcs:  [
+    srcs: [
         "host/src/android/scopedstorage/cts/host/PreserveLegacyStorageHostTest.java",
-        "host/src/android/scopedstorage/cts/host/BaseHostTestCase.java"
+        "host/src/android/scopedstorage/cts/host/BaseHostTestCase.java",
     ],
-    libs: ["cts-tradefed", "tradefed", "testng"],
-    static_libs: ["modules-utils-build-testing", "compatibility-host-util"],
-    test_suites: ["general-tests", "gts"],
+    libs: [
+        "cts-tradefed",
+        "tradefed",
+        "testng",
+    ],
+    static_libs: [
+        "modules-utils-build-testing",
+        "compatibility-host-util",
+    ],
+    test_suites: [
+        "general-tests",
+        "gts",
+    ],
     test_config: "AndroidPreserveLegacyTest.xml",
     data: [
         ":CtsLegacyStorageTestAppRequestLegacy",
@@ -222,21 +337,20 @@
 java_test_host {
     name: "CtsScopedStoragePublicVolumeHostTest",
     srcs: ["host/src/**/*.java"],
-    libs: ["cts-tradefed", "tradefed", "testng"],
-    static_libs: ["modules-utils-build-testing", "compatibility-host-util"],
-    test_suites: ["general-tests", "mts-mediaprovider"],
-    test_config: "PublicVolumeTest.xml",
-}
-
-java_test_host {
-    name: "CtsAppCloningHostTest",
-    srcs:  [
-        "host/src/android/scopedstorage/cts/host/AppCloningHostTest.java",
-        "host/src/android/scopedstorage/cts/host/BaseHostTestCase.java"
+    libs: [
+        "cts-tradefed",
+        "tradefed",
+        "testng",
     ],
-    libs: ["cts-tradefed", "tradefed", "testng"],
-    test_suites: ["general-tests", "mts-mediaprovider", "cts"],
-    test_config: "AndroidTestAppCloning.xml",
+    static_libs: [
+        "modules-utils-build-testing",
+        "compatibility-host-util",
+    ],
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+    ],
+    test_config: "PublicVolumeTest.xml",
 }
 
 android_test {
@@ -244,13 +358,26 @@
     manifest: "device/AndroidManifest.xml",
     test_config: "device/AndroidTest.xml",
     srcs: ["device/**/*.java"],
-    static_libs: ["truth-prebuilt", "cts-scopedstorage-lib",],
+    static_libs: [
+        "truth-prebuilt",
+        "cts-scopedstorage-lib",
+        "androidx.test.uiautomator_uiautomator",
+    ],
     compile_multilib: "both",
-    test_suites: ["device-tests", "mts-mediaprovider", "cts"],
+    test_suites: [
+        "general-tests",
+        "mts-mediaprovider",
+        "cts",
+    ],
     sdk_version: "test_current",
-    target_sdk_version: "31",
+    //TODO(b/227617884): Change target_sdk_version to 33 after T SDK finalization is complete
+    target_sdk_version: "10000",
     min_sdk_version: "30",
-    libs: ["android.test.base", "android.test.mock", "android.test.runner",],
+    libs: [
+        "android.test.base",
+        "android.test.mock",
+        "android.test.runner",
+    ],
     java_resources: [
         ":CtsScopedStorageTestAppA",
         ":CtsScopedStorageTestAppB",
@@ -262,5 +389,5 @@
         ":CtsScopedStorageTestAppFileManagerBypassDB",
         ":CtsScopedStorageTestAppSystemGalleryBypassDB",
         ":CtsScopedStorageTestAppSystemGallery30BypassDB",
-    ]
+    ],
 }
diff --git a/hostsidetests/scopedstorage/AndroidManifest.xml b/hostsidetests/scopedstorage/AndroidManifest.xml
index 9d45439..39dc12e 100644
--- a/hostsidetests/scopedstorage/AndroidManifest.xml
+++ b/hostsidetests/scopedstorage/AndroidManifest.xml
@@ -19,6 +19,10 @@
 
     <uses-sdk android:minSdkVersion="30" />
 
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
diff --git a/hostsidetests/scopedstorage/AndroidTest.xml b/hostsidetests/scopedstorage/AndroidTest.xml
index 42a3a36..320d541 100644
--- a/hostsidetests/scopedstorage/AndroidTest.xml
+++ b/hostsidetests/scopedstorage/AndroidTest.xml
@@ -28,6 +28,12 @@
         <option name="test-file-name" value="CtsScopedStorageTestAppDLegacy.apk" />
         <option name="test-file-name" value="CtsLegacyStorageTestAppRequestLegacy.apk" />
     </target_preparer>
+
+    <option
+        name="config-descriptor:metadata"
+        key="mainline-param"
+        value="com.google.android.mediaprovider.apex" />
+
     <test class="com.android.tradefed.testtype.HostTest" >
         <option name="class" value="android.scopedstorage.cts.host.LegacyStorageHostTest" />
         <option name="class" value="android.scopedstorage.cts.host.PreserveLegacyStorageHostTest" />
diff --git a/hostsidetests/scopedstorage/AndroidTestAppCloning.xml b/hostsidetests/scopedstorage/AndroidTestAppCloning.xml
deleted file mode 100644
index 03802f2..0000000
--- a/hostsidetests/scopedstorage/AndroidTestAppCloning.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 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.
--->
-<configuration description="Test for App cloning support with clone user profiles">
-    <option name="test-suite-tag" value="cts" />
-    <option name="config-descriptor:metadata" key="component" value="framework" />
-    <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
-    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
-    <!-- TODO(b/169101565): change to secondary_user when fixed -->
-    <!-- Clone user profile is meant to exist only alongside a real system user.
-    It does not exist for a headless system user, or a secondary user -->
-    <option name="config-descriptor:metadata" key="parameter" value="not_secondary_user" />
-    <test class="com.android.tradefed.testtype.HostTest" >
-        <option name="class" value="android.scopedstorage.cts.host.AppCloningHostTest" />
-    </test>
-
-    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-        <option name="mainline-module-package-name" value="com.google.android.mediaprovider" />
-    </object>
-</configuration>
diff --git a/hostsidetests/scopedstorage/CoreTest.xml b/hostsidetests/scopedstorage/CoreTest.xml
index 5b725e1..1aac1dd 100644
--- a/hostsidetests/scopedstorage/CoreTest.xml
+++ b/hostsidetests/scopedstorage/CoreTest.xml
@@ -16,7 +16,7 @@
 <configuration description="Scoped storage and legacy tests that are marked as core for MediaProvider module">
     <option name="test-suite-tag" value="cts" />
     <option name="config-descriptor:metadata" key="component" value="framework" />
-    <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="not_secondary_user" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
@@ -24,9 +24,16 @@
         <option name="test-file-name" value="ScopedStorageTest.apk" />
         <option name="test-file-name" value="LegacyStorageTest.apk" />
         <option name="test-file-name" value="CtsScopedStorageTestAppA.apk" />
+        <option name="test-file-name" value="CtsScopedStorageTestAppA31.apk" />
         <option name="test-file-name" value="CtsScopedStorageTestAppB.apk" />
         <option name="test-file-name" value="CtsScopedStorageTestAppDLegacy.apk" />
     </target_preparer>
+
+    <option
+        name="config-descriptor:metadata"
+        key="mainline-param"
+        value="com.google.android.mediaprovider.apex" />
+
     <test class="com.android.tradefed.testtype.HostTest" >
         <option name="class" value="android.scopedstorage.cts.host.ScopedStorageCoreHostTest" />
     </test>
diff --git a/hostsidetests/scopedstorage/PublicVolumeTest.xml b/hostsidetests/scopedstorage/PublicVolumeTest.xml
index 1dc4017..c52a067 100644
--- a/hostsidetests/scopedstorage/PublicVolumeTest.xml
+++ b/hostsidetests/scopedstorage/PublicVolumeTest.xml
@@ -20,6 +20,7 @@
         <option name="test-file-name" value="ScopedStorageTest.apk" />
         <option name="test-file-name" value="LegacyStorageTest.apk" />
         <option name="test-file-name" value="CtsScopedStorageTestAppA.apk" />
+        <option name="test-file-name" value="CtsScopedStorageTestAppA31.apk" />
         <option name="test-file-name" value="CtsScopedStorageTestAppB.apk" />
         <option name="test-file-name" value="CtsScopedStorageTestAppDLegacy.apk" />
     </target_preparer>
diff --git a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppA.xml b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppA.xml
index b9b3f0c..885497b 100644
--- a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppA.xml
+++ b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppA.xml
@@ -22,6 +22,9 @@
     <uses-sdk android:minSdkVersion="30" />
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
 
     <application android:label="TestAppA">
         <activity android:name="android.scopedstorage.cts.ScopedStorageTestHelper" android:exported="true" >
diff --git a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppA31.xml b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppA31.xml
new file mode 100644
index 0000000..68e6a15
--- /dev/null
+++ b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppA31.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.scopedstorage.cts.testapp.A31.withres"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="31"/>
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
+    <application android:label="TestAppA">
+        <activity android:name="android.scopedstorage.cts.ScopedStorageTestHelper" android:exported="true" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+        <provider
+            android:name="androidx.core.content.FileProvider"
+            android:authorities="android.scopedstorage.cts.testapp.A31.withres"
+            android:exported="false"
+            android:grantUriPermissions="true">
+          <meta-data
+              android:name="android.support.FILE_PROVIDER_PATHS"
+              android:resource="@xml/file_paths" />
+        </provider>
+    </application>
+</manifest>
diff --git a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppC.xml b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppC.xml
index cf9c7fe..a6d1cb8 100644
--- a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppC.xml
+++ b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppC.xml
@@ -21,6 +21,9 @@
 
   <uses-sdk android:minSdkVersion="30" />
 
+  <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
diff --git a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppC30.xml b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppC30.xml
index 17f63d1..4010295 100644
--- a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppC30.xml
+++ b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppC30.xml
@@ -21,6 +21,9 @@
 
   <uses-sdk android:minSdkVersion="30" android:targetSdkVersion="30" />
 
+  <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
diff --git a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppFileManager.xml b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppFileManager.xml
index dd01db9..e49af51 100644
--- a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppFileManager.xml
+++ b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppFileManager.xml
@@ -21,6 +21,9 @@
 
     <uses-sdk android:minSdkVersion="30" />
 
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
 
diff --git a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppFileManagerBypassDB.xml b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppFileManagerBypassDB.xml
index 29b7151..5b9c657 100644
--- a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppFileManagerBypassDB.xml
+++ b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppFileManagerBypassDB.xml
@@ -21,6 +21,9 @@
 
     <uses-sdk android:minSdkVersion="30" />
 
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
 
diff --git a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppSystemGalleryBypassDB.xml b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppSystemGalleryBypassDB.xml
index ae0ec51..2813a03 100644
--- a/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppSystemGalleryBypassDB.xml
+++ b/hostsidetests/scopedstorage/ScopedStorageTestHelper/TestAppSystemGalleryBypassDB.xml
@@ -22,6 +22,9 @@
 
   <uses-sdk android:minSdkVersion="30" />
 
+  <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+  <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+  <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
   <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
diff --git a/hostsidetests/scopedstorage/ScopedStorageTestHelper/src/android/scopedstorage/cts/ScopedStorageTestHelper.java b/hostsidetests/scopedstorage/ScopedStorageTestHelper/src/android/scopedstorage/cts/ScopedStorageTestHelper.java
index 549179d..717cf95 100644
--- a/hostsidetests/scopedstorage/ScopedStorageTestHelper/src/android/scopedstorage/cts/ScopedStorageTestHelper.java
+++ b/hostsidetests/scopedstorage/ScopedStorageTestHelper/src/android/scopedstorage/cts/ScopedStorageTestHelper.java
@@ -24,6 +24,7 @@
 import static android.scopedstorage.cts.lib.TestUtils.CREATE_FILE_QUERY;
 import static android.scopedstorage.cts.lib.TestUtils.CREATE_IMAGE_ENTRY_QUERY;
 import static android.scopedstorage.cts.lib.TestUtils.DELETE_FILE_QUERY;
+import static android.scopedstorage.cts.lib.TestUtils.DELETE_RECURSIVE_QUERY;
 import static android.scopedstorage.cts.lib.TestUtils.INTENT_EXCEPTION;
 import static android.scopedstorage.cts.lib.TestUtils.INTENT_EXTRA_CALLING_PKG;
 import static android.scopedstorage.cts.lib.TestUtils.INTENT_EXTRA_PATH;
@@ -33,6 +34,8 @@
 import static android.scopedstorage.cts.lib.TestUtils.IS_URI_REDACTED_VIA_FILE_DESCRIPTOR_FOR_WRITE;
 import static android.scopedstorage.cts.lib.TestUtils.OPEN_FILE_FOR_READ_QUERY;
 import static android.scopedstorage.cts.lib.TestUtils.OPEN_FILE_FOR_WRITE_QUERY;
+import static android.scopedstorage.cts.lib.TestUtils.QUERY_MAX_ROW_ID;
+import static android.scopedstorage.cts.lib.TestUtils.QUERY_MIN_ROW_ID;
 import static android.scopedstorage.cts.lib.TestUtils.QUERY_TYPE;
 import static android.scopedstorage.cts.lib.TestUtils.QUERY_URI;
 import static android.scopedstorage.cts.lib.TestUtils.READDIR_QUERY;
@@ -40,16 +43,21 @@
 import static android.scopedstorage.cts.lib.TestUtils.RENAME_FILE_QUERY;
 import static android.scopedstorage.cts.lib.TestUtils.SETATTR_QUERY;
 import static android.scopedstorage.cts.lib.TestUtils.canOpen;
+import static android.scopedstorage.cts.lib.TestUtils.deleteRecursively;
 import static android.scopedstorage.cts.lib.TestUtils.getFileRowIdFromDatabase;
 import static android.scopedstorage.cts.lib.TestUtils.getImageContentUri;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.app.Activity;
+import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Intent;
 import android.database.Cursor;
 import android.media.ExifInterface;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.provider.MediaStore;
 
@@ -94,6 +102,7 @@
                 case CAN_READ_WRITE_QUERY:
                 case CREATE_FILE_QUERY:
                 case DELETE_FILE_QUERY:
+                case DELETE_RECURSIVE_QUERY:
                 case CAN_OPEN_FILE_FOR_READ_QUERY:
                 case CAN_OPEN_FILE_FOR_WRITE_QUERY:
                 case OPEN_FILE_FOR_READ_QUERY:
@@ -123,6 +132,10 @@
                 case QUERY_URI:
                     returnIntent = queryForUri(queryType);
                     break;
+                case QUERY_MAX_ROW_ID:
+                case QUERY_MIN_ROW_ID:
+                    returnIntent = queryRowId(queryType);
+                    break;
                 case "null":
                 default:
                     throw new IllegalStateException(
@@ -149,6 +162,53 @@
         return intent;
     }
 
+    private Intent queryRowId(String queryType) {
+        // Ensure M_E_S permission has been granted.
+        assertThat(Environment.isExternalStorageManager()).isTrue();
+        final Intent intent = new Intent(queryType);
+        final Uri uri = getIntent().getParcelableExtra(INTENT_EXTRA_URI);
+        final Bundle bundle = createQueryArgs(queryType);
+        try {
+            final Cursor c = getContentResolver().query(uri,
+                    new String[]{MediaStore.Files.FileColumns._ID}, bundle, null);
+            if (c != null && c.moveToFirst()) {
+                intent.putExtra(queryType, c.getLong(0));
+            }
+        } catch (Exception e) {
+            intent.putExtra(INTENT_EXCEPTION, e);
+        }
+
+        return intent;
+    }
+
+    private Bundle createQueryArgs(String queryType) {
+        switch (queryType){
+            case QUERY_MAX_ROW_ID:
+                return createQueryArgToRetrieveMaximumRowId();
+            case QUERY_MIN_ROW_ID:
+                return createQueryArgToRetrieveMinimumRowId();
+            default:
+                throw new IllegalStateException(
+                        "Unknown query type received from launcher app: " + queryType);
+        }
+    }
+
+    private Bundle createQueryArgToRetrieveMinimumRowId() {
+        final Bundle queryArgs = new Bundle();
+        queryArgs.putString(ContentResolver.QUERY_ARG_SQL_SORT_ORDER,
+                MediaStore.Files.FileColumns._ID + " ASC");
+        queryArgs.putInt(ContentResolver.QUERY_ARG_LIMIT, 1);
+        return queryArgs;
+    }
+
+    private Bundle createQueryArgToRetrieveMaximumRowId() {
+        final Bundle queryArgs = new Bundle();
+        queryArgs.putString(ContentResolver.QUERY_ARG_SQL_SORT_ORDER,
+                MediaStore.Files.FileColumns._ID + " DESC");
+        queryArgs.putInt(ContentResolver.QUERY_ARG_LIMIT, 1);
+        return queryArgs;
+    }
+
     private Intent isFileDescriptorRedactedForUri(String queryType) {
         final Intent intent = new Intent(queryType);
         final Uri uri = getIntent().getParcelableExtra(INTENT_EXTRA_URI);
@@ -265,6 +325,9 @@
                 case DELETE_FILE_QUERY:
                     intent.putExtra(queryType, file.delete());
                     return intent;
+                case DELETE_RECURSIVE_QUERY:
+                    intent.putExtra(queryType, deleteRecursively(file));
+                    return intent;
                 case SETATTR_QUERY:
                     int newTimeMillis = 12345000;
                     intent.putExtra(queryType, file.setLastModified(newTimeMillis));
diff --git a/hostsidetests/scopedstorage/device/AndroidTest.xml b/hostsidetests/scopedstorage/device/AndroidTest.xml
index 7e6f895..5730b2e 100644
--- a/hostsidetests/scopedstorage/device/AndroidTest.xml
+++ b/hostsidetests/scopedstorage/device/AndroidTest.xml
@@ -23,6 +23,11 @@
         <option name="test-file-name" value="CtsScopedStorageTestAppFileManager.apk" />
     </target_preparer>
 
+    <option
+        name="config-descriptor:metadata"
+        key="mainline-param"
+        value="com.google.android.mediaprovider.apex" />
+
     <option name="config-descriptor:metadata" key="component" value="framework" />
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
diff --git a/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/RedactUriDeviceTest.java b/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/RedactUriDeviceTest.java
index a122110..b23f945 100644
--- a/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/RedactUriDeviceTest.java
+++ b/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/RedactUriDeviceTest.java
@@ -59,7 +59,6 @@
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -273,7 +272,6 @@
      * redacted mode.
      **/
     @Test
-    @Ignore("Enable when b/194700183 is fixed")
     public void testSharedRedactedUri_openFileForRead() throws Exception {
         forceStopApp(APP_B_NO_PERMS.getPackageName());
         final File img = stageImageFileWithMetadata(IMAGE_FILE_NAME);
diff --git a/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/ScopedStorageDeviceTest.java b/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/ScopedStorageDeviceTest.java
index ad480e2..1a3bff9 100644
--- a/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/ScopedStorageDeviceTest.java
+++ b/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/ScopedStorageDeviceTest.java
@@ -29,8 +29,10 @@
 import static android.scopedstorage.cts.lib.TestUtils.allowAppOpsToUid;
 import static android.scopedstorage.cts.lib.TestUtils.assertCanRenameDirectory;
 import static android.scopedstorage.cts.lib.TestUtils.assertCanRenameFile;
+import static android.scopedstorage.cts.lib.TestUtils.assertCantInsertToOtherPrivateAppDirectories;
 import static android.scopedstorage.cts.lib.TestUtils.assertCantRenameDirectory;
 import static android.scopedstorage.cts.lib.TestUtils.assertCantRenameFile;
+import static android.scopedstorage.cts.lib.TestUtils.assertCantUpdateToOtherPrivateAppDirectories;
 import static android.scopedstorage.cts.lib.TestUtils.assertDirectoryContains;
 import static android.scopedstorage.cts.lib.TestUtils.assertFileContent;
 import static android.scopedstorage.cts.lib.TestUtils.assertMountMode;
@@ -43,6 +45,7 @@
 import static android.scopedstorage.cts.lib.TestUtils.deleteFileAs;
 import static android.scopedstorage.cts.lib.TestUtils.deleteFileAsNoThrow;
 import static android.scopedstorage.cts.lib.TestUtils.deleteRecursively;
+import static android.scopedstorage.cts.lib.TestUtils.deleteRecursivelyAs;
 import static android.scopedstorage.cts.lib.TestUtils.deleteWithMediaProvider;
 import static android.scopedstorage.cts.lib.TestUtils.deleteWithMediaProviderNoThrow;
 import static android.scopedstorage.cts.lib.TestUtils.denyAppOpsToUid;
@@ -85,8 +88,10 @@
 import static android.scopedstorage.cts.lib.TestUtils.revokePermission;
 import static android.scopedstorage.cts.lib.TestUtils.setAppOpsModeForUid;
 import static android.scopedstorage.cts.lib.TestUtils.setAttrAs;
+import static android.scopedstorage.cts.lib.TestUtils.trashFileAndAssert;
 import static android.scopedstorage.cts.lib.TestUtils.uninstallApp;
 import static android.scopedstorage.cts.lib.TestUtils.uninstallAppNoThrow;
+import static android.scopedstorage.cts.lib.TestUtils.untrashFileAndAssert;
 import static android.scopedstorage.cts.lib.TestUtils.updateDisplayNameWithMediaProvider;
 import static android.scopedstorage.cts.lib.TestUtils.verifyInsertFromExternalMediaDirViaRelativePath_allowed;
 import static android.scopedstorage.cts.lib.TestUtils.verifyInsertFromExternalPrivateDirViaRelativePath_denied;
@@ -111,6 +116,7 @@
 import static junit.framework.Assert.assertTrue;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 
 import android.Manifest;
@@ -192,10 +198,14 @@
 
     // The following apps are installed before the tests are run via a target_preparer.
     // See test config for details.
-    // An app with READ_EXTERNAL_STORAGE permission
-    private static final TestApp APP_A_HAS_RES = new TestApp("TestAppA",
-            "android.scopedstorage.cts.testapp.A.withres", 1, false,
-            "CtsScopedStorageTestAppA.apk");
+    // An app with READ_EXTERNAL_STORAGE and READ_MEDIA_* permissions
+    private static final TestApp APP_A_HAS_RES =
+            new TestApp(
+                    "TestAppA",
+                    "android.scopedstorage.cts.testapp.A.withres",
+                    1,
+                    false,
+                    "CtsScopedStorageTestAppA.apk");
     // An app with no permissions
     private static final TestApp APP_B_NO_PERMS = new TestApp("TestAppB",
             "android.scopedstorage.cts.testapp.B.noperms", 1, false,
@@ -206,7 +216,7 @@
             "CtsScopedStorageTestAppFileManager.apk");
     // A legacy targeting app with RES and WES permissions
     private static final TestApp APP_D_LEGACY_HAS_RW = new TestApp("TestAppDLegacy",
-            "android.scopedstorage.cts.testapp.D", 1, false, "CtsScopedStorageTestAppCLegacy.apk");
+            "android.scopedstorage.cts.testapp.D", 1, false, "CtsScopedStorageTestAppDLegacy.apk");
 
     // The following apps are not installed at test startup - please install before using.
     private static final TestApp APP_C = new TestApp("TestAppC",
@@ -520,7 +530,7 @@
     public void testCreateAndDeleteEmptyDir() throws Exception {
         final File externalFilesDir = getExternalFilesDir();
         // Remove directory in order to create it again
-        externalFilesDir.delete();
+        deleteRecursively(externalFilesDir);
 
         // Can create own external files dir
         assertThat(externalFilesDir.mkdir()).isTrue();
@@ -534,9 +544,9 @@
         assertThat(dir2.mkdir()).isTrue();
 
         // And can delete them all
-        assertThat(dir2.delete()).isTrue();
-        assertThat(dir1.delete()).isTrue();
-        assertThat(externalFilesDir.delete()).isTrue();
+        assertThat(deleteRecursively(dir2)).isTrue();
+        assertThat(deleteRecursively(dir1)).isTrue();
+        assertThat(deleteRecursively(externalFilesDir)).isTrue();
 
         // Can't create external dir for other apps
         final File nonexistentPackageFileDir = new File(
@@ -614,7 +624,7 @@
             // At this point, we're not sure who created this file, so we'll have both apps
             // deleting it
             mediaFile.delete();
-            dirInDownload.delete();
+            deleteRecursively(dirInDownload);
         }
     }
 
@@ -751,7 +761,7 @@
             assertThat(dir.list()).asList().doesNotContain(videoFileName);
         } finally {
             deleteFileAsNoThrow(APP_B_NO_PERMS, videoFile.getPath());
-            dir.delete();
+            deleteRecursively(dir);
         }
     }
 
@@ -783,7 +793,7 @@
             assertThat(listAs(APP_A_HAS_RES, dir.getPath())).doesNotContain(pdfFileName);
         } finally {
             deleteFileAsNoThrow(APP_B_NO_PERMS, pdfFile.getPath());
-            dir.delete();
+            deleteRecursively(dir);
         }
     }
 
@@ -1074,6 +1084,61 @@
         }
     }
 
+    void writeAndCheckMtime(final boolean append) throws Exception {
+        File file = new File(getDcimDir(), "update_modifies_mtime.jpg");
+
+        try {
+            assertThat(file.createNewFile()).isTrue();
+            assertThat(file.exists()).isTrue();
+
+            final long creationTime = file.lastModified();
+
+            // File should exist
+            assertNotEquals(creationTime, 0L);
+
+            // Sleep a bit more than 1 second because although
+            // File::lastModified() represents the duration in milliseconds,
+            // has 1 second precision.
+            // With lower sleep durations the test results flakey...
+            Thread.sleep(2000);
+
+            // Modification time should be the same as long the file has not
+            // been modified
+            assertEquals(creationTime, file.lastModified());
+
+            // Sleep a bit more than 1 second because although
+            // File::lastModified() represents the duration in milliseconds,
+            // has 1 second precision.
+            // With lower sleep durations the test results flakey...
+            Thread.sleep(2000);
+
+            // Assert we can write to the file
+            try (FileOutputStream fos = new FileOutputStream(file, append)) {
+                fos.write(BYTES_DATA1);
+                fos.close();
+            }
+
+            final long modificationTime = file.lastModified();
+
+            // As the file has been written, modification time should have
+            // changed
+            assertNotEquals(modificationTime, 0L);
+            assertNotEquals(modificationTime, creationTime);
+        } finally {
+            file.delete();
+        }
+    }
+
+    @Test
+    public void testAppendUpdatesMtime() throws Exception {
+        writeAndCheckMtime(true);
+    }
+
+    @Test
+    public void testWriteUpdatesMtime() throws Exception {
+        writeAndCheckMtime(false);
+    }
+
     @Test
     @SdkSuppress(minSdkVersion = 31, codeName = "S")
     public void testDefaultNoIsolatedStorageFlag() throws Exception {
@@ -1156,7 +1221,7 @@
         try {
             // Delete the directory if it already exists
             if (podcastsDir.exists()) {
-                deleteAsLegacyApp(podcastsDir);
+                deleteRecursivelyAsLegacyApp(podcastsDir);
             }
             assertThat(podcastsDir.exists()).isFalse();
             assertThat(podcastsDirLowerCase.exists()).isFalse();
@@ -1198,9 +1263,12 @@
 
     @Test
     public void testReadStorageInvalidation() throws Exception {
-        testAppOpInvalidation(APP_C, new File(getDcimDir(), "read_storage.jpg"),
-                Manifest.permission.READ_EXTERNAL_STORAGE,
-                AppOpsManager.OPSTR_READ_EXTERNAL_STORAGE, /* forWrite */ false);
+        testAppOpInvalidation(
+                APP_C,
+                new File(getDcimDir(), "read_storage.jpg"),
+                Manifest.permission.READ_MEDIA_IMAGES,
+                AppOpsManager.OPSTR_READ_MEDIA_IMAGES,
+                /* forWrite */ false);
     }
 
     @Test
@@ -1373,7 +1441,6 @@
             Thread.sleep(200);
         }
         assertThat(canOpenFileAs(app, file, forWrite)).isTrue();
-
         // Deny
         if (permission != null) {
             revokePermission(packageName, permission);
@@ -1577,7 +1644,7 @@
             videoFile1.delete();
             videoFile2.delete();
             videoFile3.delete();
-            nonMediaDir.delete();
+            deleteRecursively(nonMediaDir);
         }
     }
 
@@ -1753,15 +1820,15 @@
 
         } finally {
             pdfFile.delete();
-            nonMediaDirectory.delete();
+            deleteRecursively(nonMediaDirectory);
 
             videoFile1.delete();
             videoFile2.delete();
             videoFile3.delete();
-            mediaDirectory1.delete();
-            mediaDirectory2.delete();
-            mediaDirectory3.delete();
-            mediaDirectory4.delete();
+            deleteRecursively(mediaDirectory1);
+            deleteRecursively(mediaDirectory2);
+            deleteRecursively(mediaDirectory3);
+            deleteRecursively(mediaDirectory4);
         }
     }
 
@@ -1787,7 +1854,8 @@
             assertThat(deleteFileAs(APP_B_NO_PERMS, videoFile.getAbsolutePath())).isTrue();
         } finally {
             deleteFileAsNoThrow(APP_B_NO_PERMS, videoFile.getAbsolutePath());
-            mediaDirectory1.delete();
+            deleteRecursively(mediaDirectory1);
+            deleteRecursively(mediaDirectory2);
         }
     }
 
@@ -1806,8 +1874,8 @@
             assertThat(emptyDirectoryOldPath.mkdirs()).isTrue();
             assertCanRenameDirectory(emptyDirectoryOldPath, emptyDirectoryNewPath, null, null);
         } finally {
-            emptyDirectoryOldPath.delete();
-            emptyDirectoryNewPath.delete();
+            deleteRecursively(emptyDirectoryOldPath);
+            deleteRecursively(emptyDirectoryNewPath);
         }
     }
 
@@ -1931,8 +1999,8 @@
         } finally {
             hiddenImageFile.delete();
             imageFile.delete();
-            hiddenDir.delete();
-            nonHiddenDir.delete();
+            deleteRecursively(hiddenDir);
+            deleteRecursively(nonHiddenDir);
         }
     }
 
@@ -1971,7 +2039,7 @@
             noMediaFile.delete();
             imageFile.delete();
             videoFile.delete();
-            directoryNoMedia.delete();
+            deleteRecursively(directoryNoMedia);
         }
     }
 
@@ -2056,7 +2124,7 @@
             // file.
             assertListPendingOrTrashed(imageFileUri, imageFile, /*isImageOrVideo*/ true);
 
-            trashFile(imageFileUri);
+            trashFileAndAssert(imageFileUri);
             // Check that only owner package, file manager and system gallery can list trashed image
             // file.
             assertListPendingOrTrashed(imageFileUri, imageFile, /*isImageOrVideo*/ true);
@@ -2065,7 +2133,7 @@
             // Check that only owner package, file manager can list pending non media file.
             assertListPendingOrTrashed(pdfFileUri, pdfFile, /*isImageOrVideo*/ false);
 
-            trashFile(pdfFileUri);
+            trashFileAndAssert(pdfFileUri);
             // Check that only owner package, file manager can list trashed non media file.
             assertListPendingOrTrashed(pdfFileUri, pdfFile, /*isImageOrVideo*/ false);
         } finally {
@@ -2197,6 +2265,65 @@
     }
 
     @Test
+    public void testSystemGalleryCanTrashOtherAndroidMediaFiles() throws Exception {
+        final File otherVideoFile = new File(getAndroidMediaDir(),
+                String.format("%s/%s", APP_B_NO_PERMS.getPackageName(), VIDEO_FILE_NAME));
+        try {
+            allowAppOpsToUid(Process.myUid(), SYSTEM_GALERY_APPOPS);
+
+            assertThat(createFileAs(APP_B_NO_PERMS, otherVideoFile.getAbsolutePath())).isTrue();
+
+            final Uri otherVideoUri = MediaStore.scanFile(getContentResolver(), otherVideoFile);
+            assertNotNull(otherVideoUri);
+
+            trashFileAndAssert(otherVideoUri);
+            untrashFileAndAssert(otherVideoUri);
+        } finally {
+            otherVideoFile.delete();
+            denyAppOpsToUid(Process.myUid(), SYSTEM_GALERY_APPOPS);
+        }
+    }
+
+    @Test
+    public void testSystemGalleryCanUpdateOtherAndroidMediaFiles() throws Exception {
+        final File otherImageFile = new File(getAndroidMediaDir(),
+                String.format("%s/%s", APP_B_NO_PERMS.getPackageName(), IMAGE_FILE_NAME));
+        final File updatedImageFileInDcim = new File(getDcimDir(), IMAGE_FILE_NAME);
+        try {
+            allowAppOpsToUid(Process.myUid(), SYSTEM_GALERY_APPOPS);
+
+            assertThat(createFileAs(APP_B_NO_PERMS, otherImageFile.getAbsolutePath())).isTrue();
+
+            final Uri otherImageUri = MediaStore.scanFile(getContentResolver(), otherImageFile);
+            assertNotNull(otherImageUri);
+
+            final ContentValues values = new ContentValues();
+            values.put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DCIM);
+            // Test that we can move the file to "DCIM/"
+            assertWithMessage("Result of ContentResolver#update for " + otherImageUri
+                    + " with values " + values)
+                    .that(getContentResolver().update(otherImageUri, values, Bundle.EMPTY))
+                    .isEqualTo(1);
+            assertThat(updatedImageFileInDcim.exists()).isTrue();
+            assertThat(otherImageFile.exists()).isFalse();
+
+            values.clear();
+            values.put(MediaStore.MediaColumns.RELATIVE_PATH,
+                    "Android/media/" + APP_B_NO_PERMS.getPackageName());
+            // Test that we can move the file back to other app's owned path
+            assertWithMessage("Result of ContentResolver#update for " + otherImageUri
+                    + " with values " + values)
+                    .that(getContentResolver().update(otherImageUri, values, Bundle.EMPTY))
+                    .isEqualTo(1);
+            assertThat(otherImageFile.exists()).isTrue();
+        } finally {
+            otherImageFile.delete();
+            updatedImageFileInDcim.delete();
+            denyAppOpsToUid(Process.myUid(), SYSTEM_GALERY_APPOPS);
+        }
+    }
+
+    @Test
     public void testQueryOtherAppsFiles() throws Exception {
         final File otherAppPdf = new File(getDownloadDir(), "other" + NONMEDIA_FILE_NAME);
         final File otherAppImg = new File(getDcimDir(), "other" + IMAGE_FILE_NAME);
@@ -2290,8 +2417,8 @@
             otherAppVideoFile2.delete();
             otherAppPdfFile1.delete();
             otherAppPdfFile2.delete();
-            dirInDcim.delete();
-            dirInPictures.delete();
+            deleteRecursively(dirInDcim);
+            deleteRecursively(dirInPictures);
             denyAppOpsToUid(Process.myUid(), SYSTEM_GALERY_APPOPS);
         }
     }
@@ -2415,8 +2542,8 @@
             fileSpecialChars.delete();
             fileSpecialChars1.delete();
             fileSpecialChars2.delete();
-            dirSpecialChars.delete();
-            renamedDir.delete();
+            deleteRecursively(dirSpecialChars);
+            deleteRecursively(renamedDir);
         }
     }
 
@@ -2486,7 +2613,7 @@
         } finally {
             deleteAsLegacyApp(topLevelDir1);
             deleteAsLegacyApp(topLevelDir2);
-            nonTopLevelDir.delete();
+            deleteRecursively(nonTopLevelDir);
         }
     }
 
@@ -2724,18 +2851,57 @@
         }
     }
 
+    /**
+     * Tests that System Gallery apps cannot insert files in other app's private directories.
+     */
+    @Test
+    public void testCantInsertFilesInOtherAppPrivateDir_hasSystemGallery() throws Exception {
+        int uid = Process.myUid();
+        try {
+            setAppOpsModeForUid(uid, AppOpsManager.MODE_ALLOWED, SYSTEM_GALERY_APPOPS);
+            assertCantInsertToOtherPrivateAppDirectories(IMAGE_FILE_NAME,
+                    /* throwsExceptionForDataValue */ false, APP_B_NO_PERMS, THIS_PACKAGE_NAME);
+        } finally {
+            setAppOpsModeForUid(uid, AppOpsManager.MODE_ERRORED, SYSTEM_GALERY_APPOPS);
+        }
+    }
+
+    /**
+     * Tests that System Gallery apps cannot update files in other app's private directories.
+     */
+    @Test
+    public void testCantUpdateFilesInOtherAppPrivateDir_hasSystemGallery() throws Exception {
+        int uid = Process.myUid();
+        try {
+            setAppOpsModeForUid(uid, AppOpsManager.MODE_ALLOWED, SYSTEM_GALERY_APPOPS);
+            assertCantUpdateToOtherPrivateAppDirectories(IMAGE_FILE_NAME,
+                    /* throwsExceptionForDataValue */ false, APP_B_NO_PERMS, THIS_PACKAGE_NAME);
+        } finally {
+            setAppOpsModeForUid(uid, AppOpsManager.MODE_ERRORED, SYSTEM_GALERY_APPOPS);
+        }
+    }
+
+    /**
+     * This test is for operations to the calling app's own private packages.
+     */
     @Test
     public void testInsertFromExternalDirsViaRelativePath() throws Exception {
         verifyInsertFromExternalMediaDirViaRelativePath_allowed();
         verifyInsertFromExternalPrivateDirViaRelativePath_denied();
     }
 
+    /**
+     * This test is for operations to the calling app's own private packages.
+     */
     @Test
     public void testUpdateToExternalDirsViaRelativePath() throws Exception {
         verifyUpdateToExternalMediaDirViaRelativePath_allowed();
         verifyUpdateToExternalPrivateDirsViaRelativePath_denied();
     }
 
+    /**
+     * This test is for operations to the calling app's own private packages.
+     */
     @Test
     public void testInsertFromExternalDirsViaRelativePathAsSystemGallery() throws Exception {
         int uid = Process.myUid();
@@ -2748,6 +2914,9 @@
         }
     }
 
+    /**
+     * This test is for operations to the calling app's own private packages.
+     */
     @Test
     public void testUpdateToExternalDirsViaRelativePathAsSystemGallery() throws Exception {
         int uid = Process.myUid();
@@ -2998,16 +3167,10 @@
         final Uri trashedFileUri = MediaStore.scanFile(cr, trashedFile);
         assertNotNull(trashedFileUri);
 
-        trashFile(trashedFileUri);
+        trashFileAndAssert(trashedFileUri);
         return trashedFileUri;
     }
 
-    private void trashFile(Uri uri) throws Exception {
-        final ContentValues values = new ContentValues();
-        values.put(MediaStore.MediaColumns.IS_TRASHED, 1);
-        assertEquals(1, getContentResolver().update(uri, values, Bundle.EMPTY));
-    }
-
     /**
      * Gets file path corresponding to the db row pointed by {@code uri}. If {@code uri} points to
      * multiple db rows, file path is extracted from the first db row of the database query result.
@@ -3280,4 +3443,14 @@
         Log.d(TAG, "Deleting file " + file);
         deleteFileAs(APP_D_LEGACY_HAS_RW, file.getAbsolutePath());
     }
+
+    /**
+     * Deletes the given file/directory recursively. If the file is a directory, then deletes all
+     * of its children (files or directories) recursively.
+     */
+    private void deleteRecursivelyAsLegacyApp(File dir) throws Exception {
+        // Use a legacy app to delete this directory, since it could be outside shared storage.
+        Log.d(TAG, "Deleting directory " + dir);
+        deleteRecursivelyAs(APP_D_LEGACY_HAS_RW, dir.getAbsolutePath());
+    }
 }
diff --git a/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/StableUrisTest.java b/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/StableUrisTest.java
new file mode 100644
index 0000000..41a47b9
--- /dev/null
+++ b/hostsidetests/scopedstorage/device/src/android/scopedstorage/cts/device/StableUrisTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2022 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 android.scopedstorage.cts.device;
+
+import static android.app.AppOpsManager.permissionToOp;
+import static android.os.SystemProperties.getBoolean;
+import static android.scopedstorage.cts.lib.TestUtils.allowAppOpsToUid;
+import static android.scopedstorage.cts.lib.TestUtils.getPicturesDir;
+import static android.scopedstorage.cts.lib.TestUtils.readMaximumRowIdFromDatabaseAs;
+import static android.scopedstorage.cts.lib.TestUtils.readMinimumRowIdFromDatabaseAs;
+import static android.scopedstorage.cts.lib.TestUtils.waitForMountedAndIdleState;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+import android.Manifest;
+import android.app.Instrumentation;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.provider.MediaStore;
+import android.scopedstorage.cts.lib.TestUtils;
+import android.util.Log;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.uiautomator.UiDevice;
+
+import com.android.cts.install.lib.TestApp;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+import org.junit.runners.Parameterized.Parameter;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@RunWith(Parameterized.class)
+public final class StableUrisTest extends ScopedStorageBaseDeviceTest {
+
+    private static final String TAG = "StableUrisTest";
+
+    // An app that has file manager (MANAGE_EXTERNAL_STORAGE) permission.
+    private static final TestApp APP_FM = new TestApp("TestAppFileManager",
+            "android.scopedstorage.cts.testapp.filemanager", 1, false,
+            "CtsScopedStorageTestAppFileManager.apk");
+
+    private static final String OPSTR_MANAGE_EXTERNAL_STORAGE =
+            permissionToOp(Manifest.permission.MANAGE_EXTERNAL_STORAGE);
+
+    private Context mContext;
+    private ContentResolver mContentResolver;
+    private UiDevice mDevice;
+
+    @Parameter()
+    public String mVolumeName;
+
+    /** Parameters data. */
+    @Parameterized.Parameters(name = "volume={0}")
+    public static Iterable<?> data() {
+        return Arrays.asList(MediaStore.VOLUME_EXTERNAL_PRIMARY);
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        super.setupExternalStorage(mVolumeName);
+        Log.d(TAG, "Using volume : " + mVolumeName);
+        mContext = ApplicationProvider.getApplicationContext();
+        mContentResolver = mContext.getContentResolver();
+        final Instrumentation inst = InstrumentationRegistry.getInstrumentation();
+        mDevice = UiDevice.getInstance(inst);
+    }
+
+    @Test
+    public void testUrisMapToExistingIds_withoutNextRowIdBackup() throws Exception {
+        assumeFalse(getBoolean("persist.sys.fuse.backup.nextrowid_enabled", true));
+        testScenario(/* nextRowIdBackupEnabled */ false);
+    }
+
+    @Test
+    public void testUrisMapToNewIds_withNextRowIdBackup() throws Exception {
+        assumeTrue(getBoolean("persist.sys.fuse.backup.nextrowid_enabled", false));
+        testScenario(/* nextRowIdBackupEnabled */ true);
+    }
+
+    private void testScenario(boolean nextRowIdBackupEnabled) throws Exception {
+        List<File> files = new ArrayList<>();
+
+        try {
+            // Test App needs to be explicitly granted MES app op.
+            final int fmUid = mContext.getPackageManager().getPackageUid(APP_FM.getPackageName(),
+                    0);
+            allowAppOpsToUid(fmUid, OPSTR_MANAGE_EXTERNAL_STORAGE);
+
+            files = createFilesAsTestApp(APP_FM, 5);
+
+            long maxRowIdOfInternalDbBeforeReset = readMaximumRowIdFromDatabaseAs(APP_FM,
+                    MediaStore.Files.getContentUri(MediaStore.VOLUME_INTERNAL));
+            Log.d(TAG, "maxRowIdOfInternalDbBeforeReset:" + maxRowIdOfInternalDbBeforeReset);
+            long maxRowIdOfExternalDbBeforeReset = readMaximumRowIdFromDatabaseAs(APP_FM,
+                    MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL));
+            Log.d(TAG, "maxRowIdOfExternalDbBeforeReset:" + maxRowIdOfExternalDbBeforeReset);
+
+            // Clear MediaProvider package data to trigger DB recreation.
+            mDevice.executeShellCommand("pm clear com.google.android.providers.media.module");
+            waitForMountedAndIdleState(mContentResolver);
+            MediaStore.scanVolume(mContentResolver, mVolumeName);
+
+            long minRowIdOfInternalDbAfterReset = readMinimumRowIdFromDatabaseAs(APP_FM,
+                    MediaStore.Files.getContentUri(MediaStore.VOLUME_INTERNAL));
+            Log.d(TAG, "minRowIdOfInternalDbAfterReset:" + minRowIdOfInternalDbAfterReset);
+            long minRowIdOfExternalDbAfterReset = readMinimumRowIdFromDatabaseAs(APP_FM,
+                    MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL));
+            Log.d(TAG, "minRowIdOfExternalDbAfterReset:" + minRowIdOfExternalDbAfterReset);
+
+            if (nextRowIdBackupEnabled) {
+                assertWithMessage(
+                        "Expected minimum row id after internal database reset to be greater "
+                                + "than max row id before reset").that(
+                        minRowIdOfInternalDbAfterReset > maxRowIdOfInternalDbBeforeReset).isTrue();
+                assertWithMessage(
+                        "Expected minimum row id after external database reset to be greater "
+                                + "than max row id before reset").that(
+                        minRowIdOfExternalDbAfterReset > maxRowIdOfExternalDbBeforeReset).isTrue();
+            } else {
+                assertWithMessage(
+                        "Expected internal database row ids to be reused without next row id "
+                                + "backup").that(
+                        minRowIdOfInternalDbAfterReset <= maxRowIdOfInternalDbBeforeReset).isTrue();
+                assertWithMessage(
+                        "Expected external database row ids to be reused without next row id "
+                                + "backup").that(
+                        minRowIdOfExternalDbAfterReset <= maxRowIdOfExternalDbBeforeReset).isTrue();
+            }
+
+        } finally {
+            for (File file : files) {
+                file.delete();
+            }
+        }
+    }
+
+    private List<File> createFilesAsTestApp(TestApp app, int count) throws Exception {
+        List<File> files = new ArrayList<>();
+        for (int i = 1; i <= count; i++) {
+            final File file = new File(getPicturesDir(),
+                    "Cts_" + System.currentTimeMillis() + ".jpg");
+            TestUtils.createFileAs(app, file.getAbsolutePath());
+            MediaStore.scanFile(mContentResolver, file);
+            files.add(file);
+        }
+
+        return files;
+    }
+
+}
diff --git a/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/AppCloningHostTest.java b/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/AppCloningHostTest.java
deleted file mode 100644
index 281df8f..0000000
--- a/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/AppCloningHostTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2021 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 android.scopedstorage.cts.host;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
-
-import android.platform.test.annotations.AppModeFull;
-
-import com.android.tradefed.device.DeviceNotAvailableException;
-import com.android.tradefed.device.contentprovider.ContentProviderHandler;
-import com.android.tradefed.targetprep.TargetSetupError;
-import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
-import com.android.tradefed.util.CommandResult;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Runs the AppCloning tests.
- */
-@RunWith(DeviceJUnit4ClassRunner.class)
-@AppModeFull
-public class AppCloningHostTest extends BaseHostTestCase {
-    private static final String APP_A = "CtsScopedStorageTestAppA.apk";
-    private static final String APP_A_PACKAGE = "android.scopedstorage.cts.testapp.A.withres";
-    private static final String CONTENT_PROVIDER_URL = "content://android.tradefed.contentprovider";
-    private static final int CLONE_PROFILE_DIRECTORY_CREATION_TIMEOUT_MS = 20000;
-    private String mCloneUserId;
-    private ContentProviderHandler mContentProviderHandler;
-
-
-    @Before
-    public void setup() throws Exception {
-        assumeFalse("Device is in headless system user mode", isHeadlessSystemUserMode());
-        assumeTrue(isAtLeastS());
-
-        String output = executeShellCommand(
-                "pm create-user --profileOf 0 --user-type android.os.usertype.profile.CLONE "
-                        + "testUser");
-        mCloneUserId = output.substring(output.lastIndexOf(' ') + 1).replaceAll("[^0-9]", "");
-        assertThat(mCloneUserId).isNotEmpty();
-        CommandResult out = executeShellV2Command("am start-user -w %s", mCloneUserId);
-        assertThat(out.getStderr()).isEmpty();
-        mContentProviderHandler = new ContentProviderHandler(getDevice());
-        mContentProviderHandler.setUp();
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (isHeadlessSystemUserMode() || !isAtLeastS()) return;
-        mContentProviderHandler.tearDown();
-        executeShellCommand("pm remove-user %s", mCloneUserId);
-    }
-
-    @Test
-    public void testInstallAppTwice() throws Exception {
-        installAppAsUser(APP_A, getCurrentUserId());
-        installAppAsUser(APP_A, Integer.valueOf(mCloneUserId));
-        uninstallPackage(APP_A_PACKAGE);
-    }
-
-    @Test
-    public void testCreateCloneUserFile() throws Exception {
-        CommandResult out;
-
-        // Check that the clone user directories exist
-        eventually(() -> {
-            // Wait for finish.
-            assertThat(isSuccessful(
-                    runContentProviderCommand("query", mCloneUserId, "/sdcard", ""))).isTrue();
-        }, CLONE_PROFILE_DIRECTORY_CREATION_TIMEOUT_MS);
-
-        // Create a file on the clone user storage
-        out = executeShellV2Command("touch /sdcard/testFile.txt");
-        assertThat(isSuccessful(out)).isTrue();
-        eventually(() -> {
-            // Wait for finish.
-            assertThat(isSuccessful(
-                    runContentProviderCommand("write", mCloneUserId, "/sdcard/testFile.txt",
-                            "< /sdcard/testFile.txt"))).isTrue();
-        }, CLONE_PROFILE_DIRECTORY_CREATION_TIMEOUT_MS);
-
-        // Check that the above created file exists on the clone user storage
-        out = runContentProviderCommand("query", mCloneUserId, "/sdcard/testFile.txt", "");
-        assertThat(isSuccessful(out)).isTrue();
-
-        // Cleanup the created file
-        out = runContentProviderCommand("delete", mCloneUserId, "/sdcard/testFile.txt", "");
-        assertThat(isSuccessful(out)).isTrue();
-    }
-
-    @Test
-    public void testPrivateAppDataDirectoryForCloneUser() throws Exception {
-        installAppAsUser(APP_A, Integer.valueOf(mCloneUserId));
-        eventually(() -> {
-            // Wait for finish.
-            assertThat(isPackageInstalled(APP_A_PACKAGE, mCloneUserId)).isTrue();
-        }, CLONE_PROFILE_DIRECTORY_CREATION_TIMEOUT_MS);
-    }
-
-    private void installAppAsUser(String packageFile, int userId)
-            throws TargetSetupError, DeviceNotAvailableException {
-        installPackageAsUser(packageFile, false, userId, "-t");
-    }
-
-    private CommandResult runContentProviderCommand(String commandType, String userId,
-            String relativePath, String args) throws Exception {
-        String fullUri = CONTENT_PROVIDER_URL + relativePath;
-        return executeShellV2Command("content %s --user %s --uri %s %s",
-                commandType, userId, fullUri, args);
-    }
-
-}
diff --git a/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/LegacyStorageHostTest.java b/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/LegacyStorageHostTest.java
index 3b81646..5638e41 100644
--- a/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/LegacyStorageHostTest.java
+++ b/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/LegacyStorageHostTest.java
@@ -111,6 +111,46 @@
     }
 
     @Test
+    public void testCantInsertFilesInOtherAppPrivateDir_hasRW() throws Exception {
+        runDeviceTest("testCantInsertFilesInOtherAppPrivateDir_hasRW");
+    }
+
+    @Test
+    public void testCantUpdateFilesInOtherAppPrivateDir_hasRW() throws Exception {
+        runDeviceTest("testCantUpdateFilesInOtherAppPrivateDir_hasRW");
+    }
+
+    @Test
+    public void testCantInsertFilesInOtherAppPrivateDir_hasMES() throws Exception {
+        allowAppOps("android:manage_external_storage");
+        try {
+            runDeviceTest("testCantInsertFilesInOtherAppPrivateDir_hasMES");
+        } finally {
+            denyAppOps("android:manage_external_storage");
+        }
+    }
+
+    @Test
+    public void testCantUpdateFilesInOtherAppPrivateDir_hasMES() throws Exception {
+        allowAppOps("android:manage_external_storage");
+        try {
+            runDeviceTest("testCantUpdateFilesInOtherAppPrivateDir_hasMES");
+        } finally {
+            denyAppOps("android:manage_external_storage");
+        }
+    }
+
+    @Test
+    public void testCantInsertFilesInOtherAppPrivateDir_hasSystemGallery() throws Exception {
+        runDeviceTest("testCantInsertFilesInOtherAppPrivateDir_hasSystemGallery");
+    }
+
+    @Test
+    public void testCantUpdateFilesInOtherAppPrivateDir_hasSystemGallery() throws Exception {
+        runDeviceTest("testCantUpdateFilesInOtherAppPrivateDir_hasSystemGallery");
+    }
+
+    @Test
     public void testMkdirInRandomPlaces_hasW() throws Exception {
         revokePermissions("android.permission.READ_EXTERNAL_STORAGE");
         executeShellCommand("mkdir -p /sdcard/Android/data/com.android.shell -m 2770");
@@ -147,6 +187,11 @@
     }
 
     @Test
+    public void testCanTrashOtherAndroidMediaFiles_hasRW() throws Exception {
+        runDeviceTest("testCanTrashOtherAndroidMediaFiles_hasRW");
+    }
+
+    @Test
     public void testCantRename_hasR() throws Exception {
         revokePermissions("android.permission.WRITE_EXTERNAL_STORAGE");
         runDeviceTest("testCantRename_hasR");
@@ -214,6 +259,15 @@
         runDeviceTest("testLegacySystemGalleryCanRenameImagesAndVideosWithoutDbUpdates");
     }
 
+    /**
+     * (b/205673506): Test that legacy System Gallery can update() media file's releative_path to a
+     * non default top level directory.
+     */
+    @Test
+    public void testLegacySystemGalleryCanUpdateToExistingDirectory() throws Exception {
+        runDeviceTest("testLegacySystemGalleryCanUpdateToExistingDirectory");
+    }
+
     @Test
     public void testLegacySystemGalleryWithoutWESCannotRename() throws Exception {
         revokePermissions("android.permission.WRITE_EXTERNAL_STORAGE");
@@ -249,4 +303,18 @@
     public void testUpdateToExternalDirsViaRelativePath() throws Exception {
         runDeviceTest("testUpdateToExternalDirsViaRelativePath");
     }
+
+    private void allowAppOps(String... ops) throws Exception {
+        for (String op : ops) {
+            executeShellCommand("cmd appops set --uid android.scopedstorage.cts.legacy "
+                    + op + " allow");
+        }
+    }
+
+    private void denyAppOps(String... ops) throws Exception {
+        for (String op : ops) {
+            executeShellCommand("cmd appops set --uid android.scopedstorage.cts.legacy "
+                    + op + " deny");
+        }
+    }
 }
diff --git a/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/ScopedStorageCoreHostTest.java b/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/ScopedStorageCoreHostTest.java
index 7d8a6e7..c2414dd 100644
--- a/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/ScopedStorageCoreHostTest.java
+++ b/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/ScopedStorageCoreHostTest.java
@@ -61,8 +61,12 @@
 
     @Before
     public void revokeStoragePermissions() throws Exception {
-        revokePermissions("android.permission.WRITE_EXTERNAL_STORAGE",
-                "android.permission.READ_EXTERNAL_STORAGE");
+        revokePermissions(
+                "android.permission.WRITE_EXTERNAL_STORAGE",
+                "android.permission.READ_EXTERNAL_STORAGE",
+                "android.permission.READ_MEDIA_AUDIO",
+                "android.permission.READ_MEDIA_VIDEO",
+                "android.permission.READ_MEDIA_IMAGES");
     }
 
     @After
@@ -93,10 +97,71 @@
     @Test
     public void testAccess_file() throws Exception {
         grantPermissions("android.permission.READ_EXTERNAL_STORAGE");
+        grantPermissions("android.permission.READ_MEDIA_IMAGES");
         try {
             runDeviceTest("testAccess_file");
         } finally {
             revokePermissions("android.permission.READ_EXTERNAL_STORAGE");
+            revokePermissions("android.permission.READ_MEDIA_IMAGES");
+        }
+    }
+
+    @Test
+    public void testAccess_MediaFile() throws Exception {
+        grantPermissions("android.permission.READ_MEDIA_IMAGES");
+        grantPermissions("android.permission.READ_MEDIA_AUDIO");
+        grantPermissions("android.permission.READ_MEDIA_VIDEO");
+        try {
+            runDeviceTest("testAccess_MediaFile");
+        } finally {
+            revokePermissions("android.permission.READ_MEDIA_IMAGES");
+            revokePermissions("android.permission.READ_MEDIA_AUDIO");
+            revokePermissions("android.permission.READ_MEDIA_VIDEO");
+        }
+    }
+
+    @Test
+    public void testAccess_OnlyAudioFile() throws Exception {
+        grantPermissions("android.permission.READ_MEDIA_AUDIO");
+        try {
+            runDeviceTest("testAccess_OnlyAudioFile");
+        } finally {
+            revokePermissions("android.permission.READ_MEDIA_AUDIO");
+        }
+    }
+
+    @Test
+    public void testAccess_OnlyVideoFile() throws Exception {
+        grantPermissions("android.permission.READ_MEDIA_VIDEO");
+        try {
+            runDeviceTest("testAccess_OnlyVideoFile");
+        } finally {
+            revokePermissions("android.permission.READ_MEDIA_VIDEO");
+        }
+    }
+
+    @Test
+    public void testAccess_OnlyImageFile() throws Exception {
+        grantPermissions("android.permission.READ_MEDIA_IMAGES");
+        try {
+            runDeviceTest("testAccess_OnlyImageFile");
+        } finally {
+            revokePermissions("android.permission.READ_MEDIA_IMAGES");
+        }
+    }
+
+    @Test
+    public void testAccess_MediaFileLegacy() throws Exception {
+        runDeviceTest("testAccess_MediaFileLegacy");
+    }
+
+    @Test
+    public void testAccess_MediaFileWithRES() throws Exception {
+        grantPermissions("android.permission.READ_EXTERNAL_STORAGE");
+        try {
+            runDeviceTest("testAccess_MediaFileWithRES");
+        } finally {
+            revokePermissions("android.permission.READ_EXTERNAL_STORAGE");
         }
     }
 
diff --git a/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/ScopedStorageHostTest.java b/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/ScopedStorageHostTest.java
index f1236b6..cd9378d 100644
--- a/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/ScopedStorageHostTest.java
+++ b/hostsidetests/scopedstorage/host/src/android/scopedstorage/cts/host/ScopedStorageHostTest.java
@@ -125,6 +125,26 @@
     }
 
     @Test
+    public void testManageExternalStorageCantInsertFilesInOtherAppPrivateDir() throws Exception {
+        allowAppOps("android:manage_external_storage");
+        try {
+            runDeviceTest("testManageExternalStorageCantInsertFilesInOtherAppPrivateDir");
+        } finally {
+            denyAppOps("android:manage_external_storage");
+        }
+    }
+
+    @Test
+    public void testManageExternalStorageCantUpdateFilesInOtherAppPrivateDir() throws Exception {
+        allowAppOps("android:manage_external_storage");
+        try {
+            runDeviceTest("testManageExternalStorageCantUpdateFilesInOtherAppPrivateDir");
+        } finally {
+            denyAppOps("android:manage_external_storage");
+        }
+    }
+
+    @Test
     public void testCheckInstallerAppAccessToObbDirs() throws Exception {
         allowAppOps("android:request_install_packages");
         grantPermissions("android.permission.WRITE_EXTERNAL_STORAGE");
@@ -179,6 +199,26 @@
     }
 
     @Test
+    public void testFileManagerCanTrashOtherAndroidMediaFiles() throws Exception {
+        allowAppOps("android:manage_external_storage");
+        try {
+            runDeviceTest("testFileManagerCanTrashOtherAndroidMediaFiles");
+        } finally {
+            denyAppOps("android:manage_external_storage");
+        }
+    }
+
+    @Test
+    public void testFileManagerCanUpdateOtherAndroidMediaFiles() throws Exception {
+        allowAppOps("android:manage_external_storage");
+        try {
+            runDeviceTest("testFileManagerCanUpdateOtherAndroidMediaFiles");
+        } finally {
+            denyAppOps("android:manage_external_storage");
+        }
+    }
+
+    @Test
     public void testOpenOtherPendingFilesFromFuse() throws Exception {
         grantPermissions("android.permission.READ_EXTERNAL_STORAGE");
         try {
diff --git a/hostsidetests/scopedstorage/legacy/AndroidManifest.xml b/hostsidetests/scopedstorage/legacy/AndroidManifest.xml
index c602f0a..c85b090 100644
--- a/hostsidetests/scopedstorage/legacy/AndroidManifest.xml
+++ b/hostsidetests/scopedstorage/legacy/AndroidManifest.xml
@@ -20,6 +20,7 @@
     <uses-sdk android:minSdkVersion="29" android:targetSdkVersion="29" />
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <application  android:requestLegacyExternalStorage="true" >
         <uses-library android:name="android.test.runner" />
diff --git a/hostsidetests/scopedstorage/legacy/src/android/scopedstorage/cts/legacy/LegacyStorageTest.java b/hostsidetests/scopedstorage/legacy/src/android/scopedstorage/cts/legacy/LegacyStorageTest.java
index 4754d74..40c9063 100644
--- a/hostsidetests/scopedstorage/legacy/src/android/scopedstorage/cts/legacy/LegacyStorageTest.java
+++ b/hostsidetests/scopedstorage/legacy/src/android/scopedstorage/cts/legacy/LegacyStorageTest.java
@@ -23,7 +23,9 @@
 import static android.scopedstorage.cts.lib.TestUtils.allowAppOpsToUid;
 import static android.scopedstorage.cts.lib.TestUtils.assertCanRenameDirectory;
 import static android.scopedstorage.cts.lib.TestUtils.assertCanRenameFile;
+import static android.scopedstorage.cts.lib.TestUtils.assertCantInsertToOtherPrivateAppDirectories;
 import static android.scopedstorage.cts.lib.TestUtils.assertCantRenameFile;
+import static android.scopedstorage.cts.lib.TestUtils.assertCantUpdateToOtherPrivateAppDirectories;
 import static android.scopedstorage.cts.lib.TestUtils.assertDirectoryContains;
 import static android.scopedstorage.cts.lib.TestUtils.assertFileContent;
 import static android.scopedstorage.cts.lib.TestUtils.canOpenFileAs;
@@ -31,6 +33,7 @@
 import static android.scopedstorage.cts.lib.TestUtils.createFileAs;
 import static android.scopedstorage.cts.lib.TestUtils.createImageEntryAs;
 import static android.scopedstorage.cts.lib.TestUtils.deleteFileAsNoThrow;
+import static android.scopedstorage.cts.lib.TestUtils.deleteRecursively;
 import static android.scopedstorage.cts.lib.TestUtils.deleteWithMediaProviderNoThrow;
 import static android.scopedstorage.cts.lib.TestUtils.denyAppOpsToUid;
 import static android.scopedstorage.cts.lib.TestUtils.executeShellCommand;
@@ -38,6 +41,7 @@
 import static android.scopedstorage.cts.lib.TestUtils.getContentResolver;
 import static android.scopedstorage.cts.lib.TestUtils.getDcimDir;
 import static android.scopedstorage.cts.lib.TestUtils.getExternalFilesDir;
+import static android.scopedstorage.cts.lib.TestUtils.getExternalStorageDir;
 import static android.scopedstorage.cts.lib.TestUtils.getFileOwnerPackageFromDatabase;
 import static android.scopedstorage.cts.lib.TestUtils.getFileRowIdFromDatabase;
 import static android.scopedstorage.cts.lib.TestUtils.getImageContentUri;
@@ -46,9 +50,13 @@
 import static android.scopedstorage.cts.lib.TestUtils.insertFileFromExternalMedia;
 import static android.scopedstorage.cts.lib.TestUtils.listAs;
 import static android.scopedstorage.cts.lib.TestUtils.pollForExternalStorageState;
+import static android.scopedstorage.cts.lib.TestUtils.pollForManageExternalStorageAllowed;
 import static android.scopedstorage.cts.lib.TestUtils.pollForPermission;
 import static android.scopedstorage.cts.lib.TestUtils.resetDefaultExternalStorageVolume;
+import static android.scopedstorage.cts.lib.TestUtils.setAppOpsModeForUid;
 import static android.scopedstorage.cts.lib.TestUtils.setupDefaultDirectories;
+import static android.scopedstorage.cts.lib.TestUtils.trashFileAndAssert;
+import static android.scopedstorage.cts.lib.TestUtils.untrashFileAndAssert;
 import static android.scopedstorage.cts.lib.TestUtils.updateFile;
 import static android.scopedstorage.cts.lib.TestUtils.verifyInsertFromExternalMediaDirViaData_allowed;
 import static android.scopedstorage.cts.lib.TestUtils.verifyInsertFromExternalMediaDirViaRelativePath_allowed;
@@ -59,6 +67,7 @@
 import static androidx.test.InstrumentationRegistry.getContext;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -126,12 +135,14 @@
      * test runs.
      */
     static final String NONCE = String.valueOf(System.nanoTime());
-    static final String CONTENT_PROVIDER_URL = "content://android.tradefed.contentprovider";
+    static final String TEST_DIRECTORY_NAME = "ScopedStorageTestDirectory" + NONCE;
 
     static final String IMAGE_FILE_NAME = "LegacyStorageTest_file_" + NONCE + ".jpg";
     static final String VIDEO_FILE_NAME = "LegacyStorageTest_file_" + NONCE + ".mp4";
     static final String NONMEDIA_FILE_NAME = "LegacyStorageTest_file_" + NONCE + ".pdf";
 
+    static final String CONTENT_PROVIDER_URL = "content://android.tradefed.contentprovider";
+
     // The following apps are installed before the tests are run via a target_preparer.
     // See test config for details.
     // An app with READ_EXTERNAL_STORAGE permission
@@ -341,7 +352,7 @@
         try {
             assertThat(newDir.mkdir()).isFalse();
         } finally {
-            newDir.delete();
+            deleteRecursively(newDir);
         }
     }
 
@@ -426,8 +437,25 @@
 
             pdfFile1.delete();
             pdfFile2.delete();
-            nonMediaDir1.delete();
-            nonMediaDir2.delete();
+            deleteRecursively(nonMediaDir1);
+            deleteRecursively(nonMediaDir2);
+        }
+    }
+
+    @Test
+    public void testCanTrashOtherAndroidMediaFiles_hasRW() throws Exception {
+        final File otherVideoFile = new File(getAndroidMediaDir(),
+                String.format("%s/%s", APP_B_NO_PERMS.getPackageName(), VIDEO_FILE_NAME));
+        try {
+            assertThat(createFileAs(APP_B_NO_PERMS, otherVideoFile.getAbsolutePath())).isTrue();
+
+            final Uri otherVideoUri = MediaStore.scanFile(getContentResolver(), otherVideoFile);
+            assertNotNull(otherVideoUri);
+
+            trashFileAndAssert(otherVideoUri);
+            untrashFileAndAssert(otherVideoUri);
+        } finally {
+            otherVideoFile.delete();
         }
     }
 
@@ -521,8 +549,8 @@
             // UNIQUE constraint error.
             TestUtils.renameWithMediaProvider(directoryOldPath, directoryNewPath);
         } finally {
-            directoryOldPath.delete();
-            directoryNewPath.delete();
+            deleteRecursively(directoryOldPath);
+            deleteRecursively(directoryNewPath);
         }
     }
 
@@ -698,7 +726,7 @@
             imageInNoMediaDir.delete();
             renamedImageInDCIM.delete();
             noMediaFile.delete();
-            directoryNoMedia.delete();
+            deleteRecursively(directoryNoMedia);
         }
     }
 
@@ -852,6 +880,41 @@
         }
     }
 
+    /**
+     * (b/205673506): Test that legacy System Gallery can update() media file's releative_path to a
+     * non default top level directory.
+     */
+    @Test
+    public void testLegacySystemGalleryCanUpdateToExistingDirectory() throws Exception {
+        pollForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, /*granted*/ true);
+        final File imageFile = new File(getPicturesDir(), IMAGE_FILE_NAME);
+        // Top level non default directory
+        final File topLevelTestDirectory = new File(getExternalStorageDir(), TEST_DIRECTORY_NAME);
+        final File imageFileInTopLevelDir = new File(topLevelTestDirectory, IMAGE_FILE_NAME);
+        try {
+            assertThat(imageFile.createNewFile()).isTrue();
+            final Uri imageUri = MediaStore.scanFile(getContentResolver(), imageFile);
+            assertThat(imageUri).isNotNull();
+
+            topLevelTestDirectory.mkdirs();
+            assertThat(topLevelTestDirectory.exists()).isTrue();
+
+            allowAppOpsToUid(Process.myUid(), SYSTEM_GALERY_APPOPS);
+
+            ContentValues values = new ContentValues();
+            values.put(MediaStore.MediaColumns.RELATIVE_PATH, topLevelTestDirectory.getName());
+            final int result = getContentResolver().update(imageUri, values, Bundle.EMPTY);
+            assertWithMessage("Result of update() from DCIM -> top level test directory")
+                    .that(result).isEqualTo(1);
+            assertThat(imageFileInTopLevelDir.exists()).isTrue();
+        } finally {
+            imageFile.delete();
+            imageFileInTopLevelDir.delete();
+            deleteRecursively(topLevelTestDirectory);
+            denyAppOpsToUid(Process.myUid(), SYSTEM_GALERY_APPOPS);
+        }
+    }
+
     @Test
     public void testLegacySystemGalleryWithoutWESCannotRename() throws Exception {
         pollForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, /*granted*/ false);
@@ -939,6 +1002,82 @@
     }
 
     /**
+     * Tests that legacy apps cannot insert in other app private directory
+     */
+    @Test
+    public void testCantInsertFilesInOtherAppPrivateDir_hasRW() throws Exception {
+        pollForPermission(Manifest.permission.READ_EXTERNAL_STORAGE, /* granted */ true);
+        pollForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, /* granted */ true);
+
+        assertCantInsertToOtherPrivateAppDirectories(IMAGE_FILE_NAME,
+                /* respectDataContentValue */ true, APP_B_NO_PERMS, THIS_PACKAGE_NAME);
+    }
+
+    /**
+     * Tests that legacy apps cannot update in other app private directory
+     */
+    @Test
+    public void testCantUpdateFilesInOtherAppPrivateDir_hasRW() throws Exception {
+        pollForPermission(Manifest.permission.READ_EXTERNAL_STORAGE, /* granted */ true);
+        pollForPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE, /* granted */ true);
+
+        TestUtils.assertCantUpdateToOtherPrivateAppDirectories(IMAGE_FILE_NAME,
+                /* respectDataContentValue */ true, APP_B_NO_PERMS, THIS_PACKAGE_NAME);
+    }
+
+    /**
+     * Tests that legacy apps with MANAGE_EXTERNAL_STORAGE cannot insert in other app private
+     * directory
+     */
+    @Test
+    public void testCantInsertFilesInOtherAppPrivateDir_hasMES() throws Exception {
+        pollForManageExternalStorageAllowed();
+        assertCantInsertToOtherPrivateAppDirectories(IMAGE_FILE_NAME,
+                /* respectDataContentValue */ true, APP_B_NO_PERMS, THIS_PACKAGE_NAME);
+    }
+
+    /**
+     * Tests that legacy apps with MANAGE_EXTERNAL_STORAGE cannot update in other app private
+     * directory
+     */
+    @Test
+    public void testCantUpdateFilesInOtherAppPrivateDir_hasMES() throws Exception {
+        pollForManageExternalStorageAllowed();
+        assertCantUpdateToOtherPrivateAppDirectories(IMAGE_FILE_NAME,
+                /* respectDataContentValue */ true, APP_B_NO_PERMS, THIS_PACKAGE_NAME);
+    }
+
+    /**
+     * Tests that legacy System Gallery apps cannot insert in other app private directory
+     */
+    @Test
+    public void testCantInsertFilesInOtherAppPrivateDir_hasSystemGallery() throws Exception {
+        int uid = Process.myUid();
+        try {
+            setAppOpsModeForUid(uid, AppOpsManager.MODE_ALLOWED, SYSTEM_GALERY_APPOPS);
+            assertCantInsertToOtherPrivateAppDirectories(IMAGE_FILE_NAME,
+                    /* respectDataContentValue */ true, APP_B_NO_PERMS, THIS_PACKAGE_NAME);
+        } finally {
+            setAppOpsModeForUid(uid, AppOpsManager.MODE_ERRORED, SYSTEM_GALERY_APPOPS);
+        }
+    }
+
+    /**
+     * Tests that legacy System Gallery apps cannot update in other app private directory
+     */
+    @Test
+    public void testCantUpdateFilesInOtherAppPrivateDir_hasSystemGallery() throws Exception {
+        int uid = Process.myUid();
+        try {
+            setAppOpsModeForUid(uid, AppOpsManager.MODE_ALLOWED, SYSTEM_GALERY_APPOPS);
+            assertCantUpdateToOtherPrivateAppDirectories(IMAGE_FILE_NAME,
+                    /* respectDataContentValue */ true, APP_B_NO_PERMS, THIS_PACKAGE_NAME);
+        } finally {
+            setAppOpsModeForUid(uid, AppOpsManager.MODE_ERRORED, SYSTEM_GALERY_APPOPS);
+        }
+    }
+
+    /**
      * Make sure inserting files from app private directories in legacy apps is allowed via DATA.
      */
     @Test
@@ -947,7 +1086,7 @@
 
         ContentValues values = new ContentValues();
         final String androidObbDir =
-                getContext().getObbDir().toString() + "/" + System.currentTimeMillis();
+                TestUtils.getExternalObbDir().toString() + "/" + System.currentTimeMillis();
         values.put(MediaStore.MediaColumns.DATA, androidObbDir);
         insertFile(values);
 
@@ -981,7 +1120,7 @@
         assertNotEquals(0, updateFile(uri, values));
 
         final String androidObbDir =
-                getContext().getObbDir().toString() + "/" + System.currentTimeMillis();
+                TestUtils.getExternalObbDir().toString() + "/" + System.currentTimeMillis();
         values.put(MediaStore.MediaColumns.DATA, androidObbDir);
         assertNotEquals(0, updateFile(uri, values));
 
diff --git a/hostsidetests/scopedstorage/libs/ScopedStorageTestLib/src/android/scopedstorage/cts/lib/TestUtils.java b/hostsidetests/scopedstorage/libs/ScopedStorageTestLib/src/android/scopedstorage/cts/lib/TestUtils.java
index a04b5d8..3ccd54f 100644
--- a/hostsidetests/scopedstorage/libs/ScopedStorageTestLib/src/android/scopedstorage/cts/lib/TestUtils.java
+++ b/hostsidetests/scopedstorage/libs/ScopedStorageTestLib/src/android/scopedstorage/cts/lib/TestUtils.java
@@ -16,6 +16,7 @@
 
 package android.scopedstorage.cts.lib;
 
+import static android.provider.MediaStore.VOLUME_EXTERNAL;
 import static android.scopedstorage.cts.lib.RedactionTestHelper.EXIF_METADATA_QUERY;
 
 import static androidx.test.InstrumentationRegistry.getContext;
@@ -98,6 +99,7 @@
     public static final String CREATE_IMAGE_ENTRY_QUERY =
             "android.scopedstorage.cts.createimageentry";
     public static final String DELETE_FILE_QUERY = "android.scopedstorage.cts.deletefile";
+    public static final String DELETE_RECURSIVE_QUERY = "android.scopedstorage.cts.deleteRecursive";
     public static final String CAN_OPEN_FILE_FOR_READ_QUERY =
             "android.scopedstorage.cts.can_openfile_read";
     public static final String CAN_OPEN_FILE_FOR_WRITE_QUERY =
@@ -109,6 +111,8 @@
     public static final String IS_URI_REDACTED_VIA_FILEPATH =
             "android.scopedstorage.cts.is_uri_redacted_via_filepath";
     public static final String QUERY_URI = "android.scopedstorage.cts.query_uri";
+    public static final String QUERY_MAX_ROW_ID = "android.scopedstorage.cts.query_max_row_id";
+    public static final String QUERY_MIN_ROW_ID = "android.scopedstorage.cts.query_min_row_id";
     public static final String OPEN_FILE_FOR_READ_QUERY =
             "android.scopedstorage.cts.openfile_read";
     public static final String OPEN_FILE_FOR_WRITE_QUERY =
@@ -295,6 +299,17 @@
     }
 
     /**
+     * Makes the given {@code testApp} delete a file or directory.
+     * If the file is a directory, then deletes all of its children (file or directories)
+     * recursively.
+     *
+     * <p>This method drops shell permission identity.
+     */
+    public static boolean deleteRecursivelyAs(TestApp testApp, String path) throws Exception {
+        return getResultFromTestApp(testApp, path, DELETE_RECURSIVE_QUERY);
+    }
+
+    /**
      * Makes the given {@code testApp} delete a file. Doesn't throw in case of failure.
      */
     public static boolean deleteFileAsNoThrow(TestApp testApp, String path) {
@@ -417,10 +432,8 @@
     }
 
     public static void verifyInsertFromExternalPrivateDirViaRelativePath_denied() throws Exception {
-        resetDefaultExternalStorageVolume();
-
         // Test that inserting files from Android/obb/.. is not allowed.
-        final String androidObbDir = getContext().getObbDir().toString();
+        final String androidObbDir = getExternalObbDir().toString();
         ContentValues values = new ContentValues();
         values.put(
                 MediaStore.MediaColumns.RELATIVE_PATH,
@@ -436,8 +449,6 @@
     }
 
     public static void verifyInsertFromExternalMediaDirViaRelativePath_allowed() throws Exception {
-        resetDefaultExternalStorageVolume();
-
         // Test that inserting files from Android/media/.. is allowed.
         final String androidMediaDir = getExternalMediaDir().toString();
         final ContentValues values = new ContentValues();
@@ -448,13 +459,11 @@
     }
 
     public static void verifyInsertFromExternalPrivateDirViaData_denied() throws Exception {
-        resetDefaultExternalStorageVolume();
-
         ContentValues values = new ContentValues();
 
         // Test that inserting files from Android/obb/.. is not allowed.
         final String androidObbDir =
-                getContext().getObbDir().toString() + "/" + System.currentTimeMillis();
+                getExternalObbDir().toString() + "/" + System.currentTimeMillis();
         values.put(MediaStore.MediaColumns.DATA, androidObbDir);
         assertThrows(IllegalArgumentException.class, () -> insertFile(values));
 
@@ -465,8 +474,6 @@
     }
 
     public static void verifyInsertFromExternalMediaDirViaData_allowed() throws Exception {
-        resetDefaultExternalStorageVolume();
-
         // Test that inserting files from Android/media/.. is allowed.
         ContentValues values = new ContentValues();
         final String androidMediaDirFile =
@@ -477,7 +484,6 @@
 
     // NOTE: While updating, DATA field should be ignored for all the apps including file manager.
     public static void verifyUpdateToExternalDirsViaData_denied() throws Exception {
-        resetDefaultExternalStorageVolume();
         Uri uri = insertFileFromExternalMedia(false);
 
         final String androidMediaDirFile =
@@ -487,7 +493,7 @@
         assertEquals(0, updateFile(uri, values));
 
         final String androidObbDir =
-                getContext().getObbDir().toString() + "/" + System.currentTimeMillis();
+                getExternalObbDir().toString() + "/" + System.currentTimeMillis();
         values.put(MediaStore.MediaColumns.DATA, androidObbDir);
         assertEquals(0, updateFile(uri, values));
 
@@ -498,7 +504,6 @@
 
     public static void verifyUpdateToExternalMediaDirViaRelativePath_allowed()
             throws IOException {
-        resetDefaultExternalStorageVolume();
         Uri uri = insertFileFromExternalMedia(true);
 
         // Test that update to files from Android/media/.. is allowed.
@@ -512,11 +517,10 @@
 
     public static void verifyUpdateToExternalPrivateDirsViaRelativePath_denied()
             throws Exception {
-        resetDefaultExternalStorageVolume();
         Uri uri = insertFileFromExternalMedia(true);
 
         // Test that update to files from Android/obb/.. is not allowed.
-        final String androidObbDir = getContext().getObbDir().toString();
+        final String androidObbDir = getExternalObbDir().toString();
         ContentValues values = new ContentValues();
         values.put(
                 MediaStore.MediaColumns.RELATIVE_PATH,
@@ -584,6 +588,9 @@
             assertThat(InstallUtils.getInstalledVersion(packageName)).isEqualTo(1);
             if (grantStoragePermission) {
                 grantPermission(packageName, Manifest.permission.READ_EXTERNAL_STORAGE);
+                grantPermission(packageName, Manifest.permission.READ_MEDIA_IMAGES);
+                grantPermission(packageName, Manifest.permission.READ_MEDIA_AUDIO);
+                grantPermission(packageName, Manifest.permission.READ_MEDIA_VIDEO);
             }
         } finally {
             uiAutomation.dropShellPermissionIdentity();
@@ -889,6 +896,16 @@
         sShouldForceStopTestApp = value;
     }
 
+    public static long readMaximumRowIdFromDatabaseAs(TestApp app, Uri uri) throws Exception {
+        final String actionName = QUERY_MAX_ROW_ID;
+        return getFromTestApp(app, uri, actionName).getLong(actionName, Long.MIN_VALUE);
+    }
+
+    public static long readMinimumRowIdFromDatabaseAs(TestApp app, Uri uri) throws Exception {
+        final String actionName = QUERY_MIN_ROW_ID;
+        return getFromTestApp(app, uri, actionName).getLong(actionName, Long.MAX_VALUE);
+    }
+
     /**
      * A functional interface representing an operation that takes no arguments,
      * returns no arguments and might throw an {@link Exception} of any kind.
@@ -949,6 +966,111 @@
     }
 
     /**
+     * Assert that app cannot insert files in other app's private directories
+     *
+     * @param fileName name of the file
+     * @param throwsExceptionForDataValue Apps like System Gallery for which Data column is not
+     * respected, will not throw an Exception as the Data value is ignored.
+     * @param otherApp Other test app in whose external private directory we will attempt to insert
+     * @param callingPackageName Calling package name
+     */
+    public static void assertCantInsertToOtherPrivateAppDirectories(String fileName,
+            boolean throwsExceptionForDataValue, TestApp otherApp, String callingPackageName)
+            throws Exception {
+        // Create directory in which the device test will try to insert file to
+        final File otherAppExternalDataDir = new File(getExternalFilesDir().getPath().replace(
+                callingPackageName, otherApp.getPackageName()));
+        final File file = new File(otherAppExternalDataDir, fileName);
+        try {
+            assertThat(createFileAs(otherApp, file.getPath())).isTrue();
+
+            final ContentValues valuesWithData = new ContentValues();
+            valuesWithData.put(MediaStore.MediaColumns.DATA, file.getAbsolutePath());
+            try {
+                Uri uri = getContentResolver().insert(
+                        MediaStore.Files.getContentUri(VOLUME_EXTERNAL),
+                        valuesWithData);
+
+                if (throwsExceptionForDataValue) {
+                    fail("File insert expected to fail: " + file);
+                } else {
+                    try (Cursor c = getContentResolver().query(uri, new String[]{
+                            MediaStore.MediaColumns.DATA}, null, null)) {
+                        assertThat(c.moveToFirst()).isTrue();
+                        assertThat(c.getString(0)).isNotEqualTo(file.getAbsolutePath());
+                    }
+                }
+            } catch (IllegalArgumentException expected) {
+            }
+
+            final ContentValues valuesWithRelativePath = new ContentValues();
+            final String path = file.getAbsolutePath();
+            valuesWithRelativePath.put(MediaStore.MediaColumns.RELATIVE_PATH,
+                    path.substring(path.indexOf("Android")));
+            valuesWithRelativePath.put(MediaStore.MediaColumns.DISPLAY_NAME, fileName);
+            try {
+                getContentResolver().insert(MediaStore.Files.getContentUri(VOLUME_EXTERNAL),
+                        valuesWithRelativePath);
+                fail("File insert expected to fail: " + file);
+            } catch (IllegalArgumentException expected) {
+            }
+        } finally {
+            deleteFileAsNoThrow(otherApp, file.getPath());
+        }
+    }
+
+    /**
+     * Assert that app cannot update files in other app's private directories
+     *
+     * @param fileName name of the file
+     * @param throwsExceptionForDataValue Apps like non-legacy System Gallery/MES for which
+     * Data column is not respected, will not throw an Exception as the Data value is ignored.
+     * @param otherApp Other test app in whose external private directory we will attempt to insert
+     * @param callingPackageName Calling package name
+     */
+    public static void assertCantUpdateToOtherPrivateAppDirectories(String fileName,
+            boolean throwsExceptionForDataValue, TestApp otherApp, String callingPackageName)
+            throws Exception {
+        // Create priv-app file and add to the database that we will try to update
+        final File otherAppExternalDataDir = new File(getExternalFilesDir().getPath().replace(
+                callingPackageName, otherApp.getPackageName()));
+        final File file = new File(otherAppExternalDataDir, fileName);
+        try {
+            assertThat(createFileAs(otherApp, file.getPath())).isTrue();
+            MediaStore.scanFile(getContentResolver(), file);
+
+            final ContentValues valuesWithData = new ContentValues();
+            valuesWithData.put(MediaStore.MediaColumns.DATA, file.getAbsolutePath());
+            try {
+                int res = getContentResolver().update(
+                        MediaStore.Files.getContentUri(VOLUME_EXTERNAL),
+                        valuesWithData, Bundle.EMPTY);
+
+                if (throwsExceptionForDataValue) {
+                    fail("File update expected to fail: " + file);
+                } else {
+                    assertThat(res).isEqualTo(0);
+                }
+            } catch (IllegalArgumentException expected) {
+            }
+
+            final ContentValues valuesWithRelativePath = new ContentValues();
+            final String path = file.getAbsolutePath();
+            valuesWithRelativePath.put(MediaStore.MediaColumns.RELATIVE_PATH,
+                    path.substring(path.indexOf("Android")));
+            valuesWithRelativePath.put(MediaStore.MediaColumns.DISPLAY_NAME, fileName);
+            try {
+                getContentResolver().update(MediaStore.Files.getContentUri(VOLUME_EXTERNAL),
+                        valuesWithRelativePath, Bundle.EMPTY);
+                fail("File update expected to fail: " + file);
+            } catch (IllegalArgumentException expected) {
+            }
+        } finally {
+            deleteFileAsNoThrow(otherApp, file.getPath());
+        }
+    }
+
+    /**
      * Asserts can rename directory.
      */
     public static void assertCanRenameDirectory(File oldDirectory, File newDirectory,
@@ -1192,6 +1314,18 @@
     }
 
     /**
+     * Creates and returns the Android obb sub-directory belonging to the calling package.
+     */
+    public static File getExternalObbDir() {
+        final String packageName = getContext().getPackageName();
+        final File res = new File(getAndroidObbDir(), packageName);
+        if (!res.equals(getContext().getObbDirs()[0])) {
+            res.mkdirs();
+        }
+        return res;
+    }
+
+    /**
      * Creates and returns the Android media sub-directory belonging to the calling package.
      */
     public static File getExternalMediaDir() {
@@ -1271,6 +1405,10 @@
         return new File(getAndroidDir(), "data");
     }
 
+    public static File getAndroidObbDir() {
+        return new File(getAndroidDir(), "obb");
+    }
+
     public static File getAndroidMediaDir() {
         return new File(getAndroidDir(), "media");
     }
@@ -1354,7 +1492,8 @@
         final IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(actionName);
         intentFilter.addCategory(Intent.CATEGORY_DEFAULT);
-        getContext().registerReceiver(broadcastReceiver, intentFilter);
+        getContext().registerReceiver(broadcastReceiver, intentFilter,
+                Context.RECEIVER_EXPORTED_UNAUDITED);
 
         // Launch the test app.
         intent.setPackage(testApp.getPackageName());
@@ -1751,4 +1890,50 @@
                 ActivityManager.class).getRunningAppProcesses().stream().filter(
                         p -> packageName.equals(p.processName)).findFirst();
     }
+
+    public static void trashFileAndAssert(Uri uri) {
+        final ContentValues values = new ContentValues();
+        values.put(MediaStore.MediaColumns.IS_TRASHED, 1);
+        assertWithMessage("Result of ContentResolver#update for " + uri + " with values to trash "
+                 + "file " + values)
+                .that(getContentResolver().update(uri, values, Bundle.EMPTY)).isEqualTo(1);
+    }
+
+    public static void untrashFileAndAssert(Uri uri) {
+        final ContentValues values = new ContentValues();
+        values.put(MediaStore.MediaColumns.IS_TRASHED, 0);
+        assertWithMessage("Result of ContentResolver#update for " + uri + " with values to untrash "
+                + "file " + values)
+                .that(getContentResolver().update(uri, values, Bundle.EMPTY)).isEqualTo(1);
+    }
+
+    public static void waitForMountedAndIdleState(ContentResolver resolver) throws Exception {
+        // We purposefully perform these operations twice in this specific
+        // order, since clearing the data on a package can asynchronously
+        // perform a vold reset, which can make us think storage is ready and
+        // mounted when it's moments away from being torn down.
+        pollForExternalStorageMountedState();
+        MediaStore.waitForIdle(resolver);
+        pollForExternalStorageMountedState();
+        MediaStore.waitForIdle(resolver);
+    }
+
+    private static void pollForExternalStorageMountedState() throws Exception {
+        final File target = Environment.getExternalStorageDirectory();
+        pollForCondition(() -> isExternalStorageDirectoryMounted(target),
+                "Timed out while waiting for ExternalStorageState to be MEDIA_MOUNTED");
+    }
+
+    private static boolean isExternalStorageDirectoryMounted(File target) {
+        boolean isMounted = Environment.MEDIA_MOUNTED.equals(
+                Environment.getExternalStorageState(target));
+        if (isMounted) {
+            try {
+                return Os.statvfs(target.getAbsolutePath()).f_blocks > 0;
+            } catch (Exception e) {
+                // Waiting for external storage to be mounted
+            }
+        }
+        return false;
+    }
 }
diff --git a/hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java b/hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java
index 4f62a91..14bbcb0 100644
--- a/hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java
+++ b/hostsidetests/scopedstorage/src/android/scopedstorage/cts/ScopedStorageTest.java
@@ -21,15 +21,19 @@
 import static android.scopedstorage.cts.lib.TestUtils.assertCanAccessPrivateAppAndroidDataDir;
 import static android.scopedstorage.cts.lib.TestUtils.assertCanAccessPrivateAppAndroidObbDir;
 import static android.scopedstorage.cts.lib.TestUtils.assertCanRenameFile;
+import static android.scopedstorage.cts.lib.TestUtils.assertCantInsertToOtherPrivateAppDirectories;
+import static android.scopedstorage.cts.lib.TestUtils.assertCantUpdateToOtherPrivateAppDirectories;
 import static android.scopedstorage.cts.lib.TestUtils.assertDirectoryContains;
 import static android.scopedstorage.cts.lib.TestUtils.assertFileContent;
 import static android.scopedstorage.cts.lib.TestUtils.assertMountMode;
 import static android.scopedstorage.cts.lib.TestUtils.assertThrows;
 import static android.scopedstorage.cts.lib.TestUtils.canOpen;
+import static android.scopedstorage.cts.lib.TestUtils.canOpenFileAs;
 import static android.scopedstorage.cts.lib.TestUtils.canReadAndWriteAs;
 import static android.scopedstorage.cts.lib.TestUtils.createFileAs;
 import static android.scopedstorage.cts.lib.TestUtils.deleteFileAs;
 import static android.scopedstorage.cts.lib.TestUtils.deleteFileAsNoThrow;
+import static android.scopedstorage.cts.lib.TestUtils.deleteRecursively;
 import static android.scopedstorage.cts.lib.TestUtils.dropShellPermissionIdentity;
 import static android.scopedstorage.cts.lib.TestUtils.executeShellCommand;
 import static android.scopedstorage.cts.lib.TestUtils.getAndroidDir;
@@ -52,6 +56,8 @@
 import static android.scopedstorage.cts.lib.TestUtils.pollForManageExternalStorageAllowed;
 import static android.scopedstorage.cts.lib.TestUtils.pollForPermission;
 import static android.scopedstorage.cts.lib.TestUtils.setupDefaultDirectories;
+import static android.scopedstorage.cts.lib.TestUtils.trashFileAndAssert;
+import static android.scopedstorage.cts.lib.TestUtils.untrashFileAndAssert;
 import static android.scopedstorage.cts.lib.TestUtils.verifyInsertFromExternalMediaDirViaData_allowed;
 import static android.scopedstorage.cts.lib.TestUtils.verifyInsertFromExternalMediaDirViaRelativePath_allowed;
 import static android.scopedstorage.cts.lib.TestUtils.verifyInsertFromExternalPrivateDirViaData_denied;
@@ -66,6 +72,7 @@
 import static androidx.test.InstrumentationRegistry.getContext;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertTrue;
@@ -76,8 +83,10 @@
 
 import android.Manifest;
 import android.app.WallpaperManager;
+import android.content.ContentValues;
 import android.net.Uri;
 import android.os.Build;
+import android.os.Bundle;
 import android.os.Environment;
 import android.os.ParcelFileDescriptor;
 import android.os.storage.StorageManager;
@@ -122,21 +131,37 @@
 
     static final String AUDIO_FILE_NAME = "ScopedStorageTest_file_" + NONCE + ".mp3";
     static final String IMAGE_FILE_NAME = "ScopedStorageTest_file_" + NONCE + ".jpg";
+    static final String VIDEO_FILE_NAME = "ScopedStorageTest_file_" + NONCE + ".mp4";
     static final String NONMEDIA_FILE_NAME = "ScopedStorageTest_file_" + NONCE + ".pdf";
 
     // The following apps are installed before the tests are run via a target_preparer.
     // See test config for details.
-    // An app with READ_EXTERNAL_STORAGE permission
-    private static final TestApp APP_A_HAS_RES = new TestApp("TestAppA",
-            "android.scopedstorage.cts.testapp.A.withres", 1, false,
-            "CtsScopedStorageTestAppA.apk");
+
+    // An app with READ_EXTERNAL_STORAGE and READ_MEDIA_* permissions.
+    // R_E_S permission isn't actually used since the app targets T+,
+    // the R_M_* permissions will be checked instead.
+    private static final TestApp APP_A_HAS_READ_MEDIA_ALL =
+            new TestApp(
+                    "TestAppA",
+                    "android.scopedstorage.cts.testapp.A.withres",
+                    1,
+                    false,
+                    "CtsScopedStorageTestAppA.apk");
+    // An app with READ_EXTERNAL_STORAGE permission with targetSdk 31
+    private static final TestApp APP_A_HAS_RES_31 =
+            new TestApp(
+                    "TestAppA31",
+                    "android.scopedstorage.cts.testapp.A31.withres",
+                    1,
+                    false,
+                    "CtsScopedStorageTestAppA31.apk");
     // An app with no permissions
     private static final TestApp APP_B_NO_PERMS = new TestApp("TestAppB",
             "android.scopedstorage.cts.testapp.B.noperms", 1, false,
             "CtsScopedStorageTestAppB.apk");
     // A legacy targeting app with RES and WES permissions
     private static final TestApp APP_D_LEGACY_HAS_RW = new TestApp("TestAppDLegacy",
-            "android.scopedstorage.cts.testapp.D", 1, false, "CtsScopedStorageTestAppCLegacy.apk");
+            "android.scopedstorage.cts.testapp.D", 1, false, "CtsScopedStorageTestAppDLegacy.apk");
 
     @Before
     public void setup() throws Exception {
@@ -203,10 +228,10 @@
 
         // Let app A create a file in its data dir
         final File otherAppExternalDataDir = new File(getExternalFilesDir().getPath().replace(
-                THIS_PACKAGE_NAME, APP_A_HAS_RES.getPackageName()));
+                THIS_PACKAGE_NAME, APP_A_HAS_READ_MEDIA_ALL.getPackageName()));
         final File otherAppExternalDataFile = new File(otherAppExternalDataDir,
                 NONMEDIA_FILE_NAME);
-        assertCreateFilesAs(APP_A_HAS_RES, otherAppExternalDataFile);
+        assertCreateFilesAs(APP_A_HAS_READ_MEDIA_ALL, otherAppExternalDataFile);
 
         // File Manager app gets global access with MANAGE_EXTERNAL_STORAGE permission, however,
         // file manager app doesn't have access to other app's external files directory
@@ -214,7 +239,8 @@
         assertThat(canOpen(otherAppExternalDataFile, /* forWrite */ true)).isFalse();
         assertThat(otherAppExternalDataFile.delete()).isFalse();
 
-        assertThat(deleteFileAs(APP_A_HAS_RES, otherAppExternalDataFile.getPath())).isTrue();
+        assertThat(deleteFileAs(APP_A_HAS_READ_MEDIA_ALL,
+            otherAppExternalDataFile.getPath())).isTrue();
 
         assertThrows(IOException.class,
                 () -> {
@@ -222,6 +248,28 @@
                 });
     }
 
+    /**
+     * Tests that apps with MANAGE_EXTERNAL_STORAGE permission cannot insert files in other app's
+     * private directories.
+     */
+    @Test
+    public void testManageExternalStorageCantInsertFilesInOtherAppPrivateDir() throws Exception {
+        pollForManageExternalStorageAllowed();
+        assertCantInsertToOtherPrivateAppDirectories(IMAGE_FILE_NAME,
+                /* throwsExceptionForDataValue */ true, APP_B_NO_PERMS, THIS_PACKAGE_NAME);
+    }
+
+    /**
+     * Tests that apps with MANAGE_EXTERNAL_STORAGE permission cannot update files in other app's
+     * private directories.
+     */
+    @Test
+    public void testManageExternalStorageCantUpdateFilesInOtherAppPrivateDir() throws Exception {
+        pollForManageExternalStorageAllowed();
+        assertCantUpdateToOtherPrivateAppDirectories(IMAGE_FILE_NAME,
+                /* throwsExceptionForDataValue */ false, APP_B_NO_PERMS, THIS_PACKAGE_NAME);
+    }
+
     @Test
     public void testManageExternalStorageCanDeleteOtherAppsContents() throws Exception {
         pollForManageExternalStorageAllowed();
@@ -251,8 +299,167 @@
     }
 
     @Test
+    public void testAccess_OnlyImageFile() throws Exception {
+        pollForPermission(Manifest.permission.READ_MEDIA_IMAGES, /*granted*/ true);
+
+        final File otherAppImage = new File(getDcimDir(), "other-" + IMAGE_FILE_NAME);
+        final File otherAppVideo = new File(getDcimDir(), "other-" + VIDEO_FILE_NAME);
+        final File otherAppAudio = new File(getMusicDir(), "other-" + AUDIO_FILE_NAME);
+
+        try {
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppImage.getPath())).isTrue();
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppVideo.getPath())).isTrue();
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppAudio.getPath())).isTrue();
+
+            // We can read the other app's image file only because we hold R_M_I.
+            assertCannotReadOrWrite(otherAppAudio);
+            assertFileAccess_readOnly(otherAppImage);
+            assertCannotReadOrWrite(otherAppVideo);
+
+        } finally {
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppImage.getAbsolutePath());
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppVideo.getAbsolutePath());
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppAudio.getAbsolutePath());
+        }
+    }
+
+    @Test
+    public void testAccess_OnlyVideoFile() throws Exception {
+        pollForPermission(Manifest.permission.READ_MEDIA_VIDEO, /*granted*/ true);
+
+        final File otherAppImage = new File(getDcimDir(), "other-" + IMAGE_FILE_NAME);
+        final File otherAppVideo = new File(getDcimDir(), "other-" + VIDEO_FILE_NAME);
+        final File otherAppAudio = new File(getMusicDir(), "other-" + AUDIO_FILE_NAME);
+
+        try {
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppImage.getPath())).isTrue();
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppVideo.getPath())).isTrue();
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppAudio.getPath())).isTrue();
+
+            // We can read the other app's video file only because we hold R_M_V.
+            assertCannotReadOrWrite(otherAppImage);
+            assertFileAccess_readOnly(otherAppVideo);
+            assertCannotReadOrWrite(otherAppAudio);
+
+        } finally {
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppImage.getAbsolutePath());
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppVideo.getAbsolutePath());
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppAudio.getAbsolutePath());
+        }
+    }
+
+    @Test
+    public void testAccess_OnlyAudioFile() throws Exception {
+        pollForPermission(Manifest.permission.READ_MEDIA_AUDIO, /*granted*/ true);
+
+        final File otherAppImage = new File(getDcimDir(), "other-" + IMAGE_FILE_NAME);
+        final File otherAppVideo = new File(getDcimDir(), "other-" + VIDEO_FILE_NAME);
+        final File otherAppAudio = new File(getMusicDir(), "other-" + AUDIO_FILE_NAME);
+
+        try {
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppImage.getPath())).isTrue();
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppVideo.getPath())).isTrue();
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppAudio.getPath())).isTrue();
+
+            // We can read the other app's audio file only because we hold R_M_A.
+            assertCannotReadOrWrite(otherAppImage);
+            assertFileAccess_readOnly(otherAppAudio);
+            assertCannotReadOrWrite(otherAppVideo);
+
+        } finally {
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppImage.getAbsolutePath());
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppVideo.getAbsolutePath());
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppAudio.getAbsolutePath());
+        }
+    }
+
+    @Test
+    public void testAccess_MediaFile() throws Exception {
+        pollForPermission(Manifest.permission.READ_MEDIA_IMAGES, /*granted*/ true);
+        pollForPermission(Manifest.permission.READ_MEDIA_AUDIO, /*granted*/ true);
+        pollForPermission(Manifest.permission.READ_MEDIA_VIDEO, /*granted*/ true);
+
+        final File downloadDir = getDownloadDir();
+        final File otherAppImage = new File(getDcimDir(), "other-" + IMAGE_FILE_NAME);
+        final File otherAppVideo = new File(getDcimDir(), "other-" + VIDEO_FILE_NAME);
+        final File otherAppAudio = new File(getMusicDir(), "other-" + AUDIO_FILE_NAME);
+        final File myAppPdf = new File(downloadDir, "my-" + NONMEDIA_FILE_NAME);
+
+        try {
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppImage.getPath())).isTrue();
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppVideo.getPath())).isTrue();
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppAudio.getPath())).isTrue();
+
+            // We can read our image and pdf files.
+            assertThat(myAppPdf.createNewFile()).isTrue();
+            assertFileAccess_readWrite(myAppPdf);
+
+            // We can read the other app media files because we hold R_M_*.
+            assertFileAccess_readOnly(otherAppImage);
+            assertFileAccess_readOnly(otherAppVideo);
+            assertFileAccess_readOnly(otherAppAudio);
+        } finally {
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppImage.getAbsolutePath());
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppVideo.getAbsolutePath());
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppAudio.getAbsolutePath());
+            myAppPdf.delete();
+        }
+    }
+
+    /** R_E_S can't give access to media files anymore. */
+    @Test
+    public void testAccess_MediaFileWithRES() throws Exception {
+        pollForPermission(Manifest.permission.READ_EXTERNAL_STORAGE, /*granted*/ true);
+
+        final File otherAppImage = new File(getDcimDir(), "other-" + IMAGE_FILE_NAME);
+        final File otherAppVideo = new File(getDcimDir(), "other-" + VIDEO_FILE_NAME);
+        final File otherAppAudio = new File(getMusicDir(), "other-" + AUDIO_FILE_NAME);
+
+        try {
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppImage.getPath())).isTrue();
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppVideo.getPath())).isTrue();
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppAudio.getPath())).isTrue();
+
+            // Can't read the other app media even with R_E_S.
+            assertCannotReadOrWrite(otherAppImage);
+            assertCannotReadOrWrite(otherAppVideo);
+            assertCannotReadOrWrite(otherAppAudio);
+        } finally {
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppImage.getAbsolutePath());
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppVideo.getAbsolutePath());
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppAudio.getAbsolutePath());
+        }
+    }
+
+    // R_E_S with targetsdk 31 can still access media files.
+    @Test
+    public void testAccess_MediaFileLegacy() throws Exception {
+        final File otherAppImage = new File(getDcimDir(), "other-" + IMAGE_FILE_NAME);
+        final File otherAppVideo = new File(getDcimDir(), "other-" + VIDEO_FILE_NAME);
+        final File otherAppAudio = new File(getMusicDir(), "other-" + AUDIO_FILE_NAME);
+        try {
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppImage.getPath())).isTrue();
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppVideo.getPath())).isTrue();
+            assertThat(createFileAs(APP_B_NO_PERMS, otherAppAudio.getPath())).isTrue();
+
+            // Can read the other app media files because of holding R_E_S with targetsdk31.
+            assertThat(canOpenFileAs(APP_A_HAS_RES_31, otherAppImage, false /* forWrite */))
+                    .isTrue();
+            assertThat(canOpenFileAs(APP_A_HAS_RES_31, otherAppVideo, false /* forWrite */))
+                    .isTrue();
+            assertThat(canOpenFileAs(APP_A_HAS_RES_31, otherAppAudio, false /* forWrite */))
+                    .isTrue();
+        } finally {
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppImage.getAbsolutePath());
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppVideo.getAbsolutePath());
+            deleteFileAsNoThrow(APP_B_NO_PERMS, otherAppAudio.getAbsolutePath());
+        }
+    }
+
+    @Test
     public void testAccess_file() throws Exception {
         pollForPermission(Manifest.permission.READ_EXTERNAL_STORAGE, /*granted*/ true);
+        pollForPermission(Manifest.permission.READ_MEDIA_IMAGES, /*granted*/ true);
 
         final File downloadDir = getDownloadDir();
         final File otherAppPdf = new File(downloadDir, "other-" + NONMEDIA_FILE_NAME);
@@ -270,7 +477,7 @@
             assertThat(myAppPdf.createNewFile()).isTrue();
             assertFileAccess_readWrite(myAppPdf);
 
-            // We can read the other app's image file because we hold R_E_S, but we can
+            // We can read the other app's image file because we hold R_M_I, but we can
             // check only exists for the pdf files.
             assertFileAccess_readOnly(otherAppImage);
             assertFileAccess_existsOnly(otherAppPdf);
@@ -299,7 +506,8 @@
             final File otherAppExternalDataDir = new File(getExternalFilesDir().getPath().replace(
                     THIS_PACKAGE_NAME, APP_B_NO_PERMS.getPackageName()));
             final File otherAppExternalDataSubDir = new File(otherAppExternalDataDir, "subdir");
-            final File otherAppExternalDataFile = new File(otherAppExternalDataSubDir, "abc.jpg");
+            final File otherAppExternalDataFile =
+                    new File(otherAppExternalDataSubDir, IMAGE_FILE_NAME);
             assertThat(createFileAs(APP_B_NO_PERMS, otherAppExternalDataFile.getAbsolutePath()))
                     .isTrue();
 
@@ -489,7 +697,7 @@
             nomediaFile.delete();
             mediaFile.delete();
             renamedMediaFile.delete();
-            nomediaDir.delete();
+            deleteRecursively(nomediaDir);
         }
     }
 
@@ -526,14 +734,70 @@
             mediaFile1InSubDir.delete();
             mediaFile2InSubDir.delete();
             topLevelNomediaFile.delete();
-            nomediaSubDir.delete();
-            nomediaDir.delete();
+            deleteRecursively(nomediaSubDir);
+            deleteRecursively(nomediaDir);
             // Scan the directory to remove stale db rows.
             MediaStore.scanFile(getContentResolver(), nomediaDir);
         }
     }
 
     @Test
+    public void testFileManagerCanTrashOtherAndroidMediaFiles() throws Exception {
+        pollForManageExternalStorageAllowed();
+
+        final File otherVideoFile = new File(getAndroidMediaDir(),
+                String.format("%s/%s", APP_B_NO_PERMS.getPackageName(), VIDEO_FILE_NAME));
+        try {
+            assertThat(createFileAs(APP_B_NO_PERMS, otherVideoFile.getAbsolutePath())).isTrue();
+
+            final Uri otherVideoUri = MediaStore.scanFile(getContentResolver(), otherVideoFile);
+            assertNotNull(otherVideoUri);
+
+            trashFileAndAssert(otherVideoUri);
+            untrashFileAndAssert(otherVideoUri);
+        } finally {
+            otherVideoFile.delete();
+        }
+    }
+
+    @Test
+    public void testFileManagerCanUpdateOtherAndroidMediaFiles() throws Exception {
+        pollForManageExternalStorageAllowed();
+
+        final File otherImageFile = new File(getAndroidMediaDir(),
+                String.format("%s/%s", APP_B_NO_PERMS.getPackageName(), IMAGE_FILE_NAME));
+        final File updatedImageFileInDcim = new File(getDcimDir(), IMAGE_FILE_NAME);
+        try {
+            assertThat(createFileAs(APP_B_NO_PERMS, otherImageFile.getAbsolutePath())).isTrue();
+
+            final Uri otherImageUri = MediaStore.scanFile(getContentResolver(), otherImageFile);
+            assertNotNull(otherImageUri);
+
+            final ContentValues values = new ContentValues();
+            values.put(MediaStore.MediaColumns.RELATIVE_PATH, Environment.DIRECTORY_DCIM);
+            // Test that we can move the file to "DCIM/"
+            assertWithMessage("Result of ContentResolver#update for " + otherImageUri
+                    + " with values " + values)
+                    .that(getContentResolver().update(otherImageUri, values, Bundle.EMPTY))
+                    .isEqualTo(1);
+            assertThat(updatedImageFileInDcim.exists()).isTrue();
+            assertThat(otherImageFile.exists()).isFalse();
+
+            values.clear();
+            values.put(MediaStore.MediaColumns.RELATIVE_PATH,
+                    "Android/media/" + APP_B_NO_PERMS.getPackageName());
+            // Test that we can move the file back to other app's owned path
+            assertWithMessage("Result of ContentResolver#update for " + otherImageUri
+                    + " with values " + values)
+                    .that(getContentResolver().update(otherImageUri, values, Bundle.EMPTY))
+                    .isEqualTo(1);
+        } finally {
+            otherImageFile.delete();
+            updatedImageFileInDcim.delete();
+        }
+    }
+
+    @Test
     public void testAndroidMedia() throws Exception {
         // Check that the app does not have legacy external storage access
         if (isAtLeastS()) {
@@ -712,10 +976,10 @@
         }
         // Let app A create a file in its data dir
         final File otherAppExternalDataDir = new File(getExternalFilesDir().getPath().replace(
-                THIS_PACKAGE_NAME, APP_A_HAS_RES.getPackageName()));
+                THIS_PACKAGE_NAME, APP_A_HAS_READ_MEDIA_ALL.getPackageName()));
         final File otherAppExternalDataFile = new File(otherAppExternalDataDir,
                 NONMEDIA_FILE_NAME);
-        assertCreateFilesAs(APP_A_HAS_RES, otherAppExternalDataFile);
+        assertCreateFilesAs(APP_A_HAS_READ_MEDIA_ALL, otherAppExternalDataFile);
 
         // File Manager app gets global access with MANAGE_EXTERNAL_STORAGE permission, however,
         // file manager app doesn't have access to other app's external files directory
@@ -723,7 +987,8 @@
         assertThat(canOpen(otherAppExternalDataFile, /* forWrite */ true)).isFalse();
         assertThat(otherAppExternalDataFile.delete()).isFalse();
 
-        assertThat(deleteFileAs(APP_A_HAS_RES, otherAppExternalDataFile.getPath())).isTrue();
+        assertThat(deleteFileAs(APP_A_HAS_READ_MEDIA_ALL,
+            otherAppExternalDataFile.getPath())).isTrue();
 
         assertThrows(IOException.class,
                 () -> {
@@ -820,8 +1085,8 @@
             imageFile.delete();
             renamedImageFile.delete();
             imageFileInRenamedDir.delete();
-            dir.delete();
-            renamedDir.delete();
+            deleteRecursively(dir);
+            deleteRecursively(renamedDir);
         }
     }
 
diff --git a/hostsidetests/securitybulletin/securityPatch/Bug-115739809/poc.cpp b/hostsidetests/securitybulletin/securityPatch/Bug-115739809/poc.cpp
index 4bf8be0..ad9b58d 100755
--- a/hostsidetests/securitybulletin/securityPatch/Bug-115739809/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/Bug-115739809/poc.cpp
@@ -79,6 +79,8 @@
         case InputMessage::Type::MOTION: {
             // int32_t eventId
             outMsg->body.motion.eventId = msg.body.key.eventId;
+            // uint32_t pointerCount
+            outMsg->body.motion.pointerCount = msg.body.motion.pointerCount;
             // nsecs_t eventTime
             outMsg->body.motion.eventTime = msg.body.motion.eventTime;
             // int32_t deviceId
@@ -125,14 +127,18 @@
             outMsg->body.motion.xCursorPosition = msg.body.motion.xCursorPosition;
             // float yCursorPosition
             outMsg->body.motion.yCursorPosition = msg.body.motion.yCursorPosition;
-            // uint32_t displayOrientation
-            outMsg->body.motion.displayOrientation = msg.body.motion.displayOrientation;
-            // int32_t displayW
-            outMsg->body.motion.displayWidth = msg.body.motion.displayWidth;
-            // int32_t displayH
-            outMsg->body.motion.displayHeight = msg.body.motion.displayHeight;
-            // uint32_t pointerCount
-            outMsg->body.motion.pointerCount = msg.body.motion.pointerCount;
+            // float dsdxDisplay
+            outMsg->body.motion.dsdxRaw = msg.body.motion.dsdxRaw;
+            // float dtdxDisplay
+            outMsg->body.motion.dtdxRaw = msg.body.motion.dtdxRaw;
+            // float dtdyDisplay
+            outMsg->body.motion.dtdyRaw = msg.body.motion.dtdyRaw;
+            // float dsdyDisplay
+            outMsg->body.motion.dsdyRaw = msg.body.motion.dsdyRaw;
+            // float txDisplay
+            outMsg->body.motion.txRaw = msg.body.motion.txRaw;
+            // float tyDisplay
+            outMsg->body.motion.tyRaw = msg.body.motion.tyRaw;
             //struct Pointer pointers[MAX_POINTERS]
             for (size_t i = 0; i < msg.body.motion.pointerCount; i++) {
                 // PointerProperties properties
@@ -158,7 +164,6 @@
         case InputMessage::Type::FOCUS: {
             outMsg->body.focus.eventId = msg.body.focus.eventId;
             outMsg->body.focus.hasFocus = msg.body.focus.hasFocus;
-            outMsg->body.focus.inTouchMode = msg.body.focus.inTouchMode;
             break;
         }
         case InputMessage::Type::CAPTURE: {
@@ -178,6 +183,10 @@
             outMsg->body.timeline.graphicsTimeline = msg.body.timeline.graphicsTimeline;
             break;
         }
+        case InputMessage::Type::TOUCH_MODE: {
+            outMsg->body.touchMode.eventId = msg.body.timeline.eventId;
+            outMsg->body.touchMode.isInTouchMode = msg.body.touchMode.isInTouchMode;
+        }
     }
 }
 
@@ -251,9 +260,10 @@
     }
 
     InputMessage::Type types[] = {
-            InputMessage::Type::KEY,      InputMessage::Type::MOTION,  InputMessage::Type::FINISHED,
-            InputMessage::Type::FOCUS,    InputMessage::Type::CAPTURE, InputMessage::Type::DRAG,
-            InputMessage::Type::TIMELINE,
+            InputMessage::Type::KEY,      InputMessage::Type::MOTION,
+            InputMessage::Type::FINISHED, InputMessage::Type::FOCUS,
+            InputMessage::Type::CAPTURE,  InputMessage::Type::DRAG,
+            InputMessage::Type::TIMELINE, InputMessage::Type::TOUCH_MODE,
     };
     for (InputMessage::Type type : types) {
         bool success = checkMessage(*server, *client, type);
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2015-3873/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2015-3873/Android.bp
index 5817588..c2810d0 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2015-3873/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2015-3873/Android.bp
@@ -25,19 +25,15 @@
     srcs: [
         "poc.cpp",
     ],
-    include_dirs: [
-        "frameworks/av/media/libdatasource/include",
-        "frameworks/av/media/libmedia/include",
-    ],
     multilib: {
         lib64: {
             shared_libs: [
-            "libstagefright",
-            "libutils",
-            "libmedia",
-            "libstagefright_foundation",
-            "libdatasource",
-        ],
-      },
-   },
+                "libstagefright",
+                "libutils",
+                "libmedia",
+                "libstagefright_foundation",
+                "libdatasource",
+            ],
+        },
+    },
 }
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2015-6616/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2015-6616/Android.bp
index b4b0c1a..7fba1d6 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2015-6616/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2015-6616/Android.bp
@@ -29,8 +29,6 @@
     ],
 
     include_dirs: [
-        "frameworks/av/media/libdatasource/include",
-        "frameworks/av/media/libstagefright/include",
         "cts/hostsidetests/securitybulletin/securityPatch/includes",
     ],
 
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2016-3747/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2016-3747/Android.bp
index 3e8b2db..7ed84ee 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2016-3747/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2016-3747/Android.bp
@@ -19,10 +19,6 @@
     name: "CVE-2016-3747",
     defaults: ["cts_hostsidetests_securitybulletin_defaults"],
     srcs: ["poc.cpp"],
-    include_dirs: [
-        "frameworks/av/media/libstagefright",
-        "frameworks/native/include/media/openmax",
-    ],
     shared_libs: [
         "libstagefright",
         "libbinder",
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2017-0479/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2017-0479/Android.bp
index e959c3a..a2f7e2f 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2017-0479/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2017-0479/Android.bp
@@ -21,6 +21,7 @@
     defaults: ["cts_hostsidetests_securitybulletin_defaults"],
     srcs: ["poc.cpp"],
     shared_libs: [
+        "android.media.audio.common.types-V1-cpp",
         "audioclient-types-aidl-cpp",
         "audioflinger-aidl-cpp",
         "libmedia",
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2017-0684/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2017-0684/Android.bp
index ac348c8..e6ea6e1 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2017-0684/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2017-0684/Android.bp
@@ -39,10 +39,5 @@
         "android.hidl.allocator@1.0",
         "android.hardware.media.omx@1.0",
     ],
-    include_dirs: [
-        "frameworks/native/include/media/openmax",
-        "frameworks/av/media/libstagefright",
-        "frameworks/native/include/media/hardware",
-    ],
     compile_multilib: "32",
 }
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2017-0726/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2017-0726/Android.bp
index 5eb1556..f446bcb 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2017-0726/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2017-0726/Android.bp
@@ -26,9 +26,6 @@
         "poc.cpp",
         ":cts_hostsidetests_securitybulletin_memutils_track",
     ],
-    include_dirs: [
-        "frameworks/av/media/libmedia/include",
-    ],
     shared_libs: [
         "libdatasource",
         "libstagefright",
@@ -39,5 +36,5 @@
     cflags: [
         "-DCHECK_MEMORY_LEAK",
         "-DENABLE_SELECTIVE_OVERLOADING",
-    ]
+    ],
 }
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2017-0817/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2017-0817/Android.bp
index 89b9b43..0859a1f 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2017-0817/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2017-0817/Android.bp
@@ -29,12 +29,6 @@
         ":cts_hostsidetests_securitybulletin_omxutils",
     ],
 
-    include_dirs: [
-        "frameworks/native/include/media/openmax",
-        "frameworks/av/media/libstagefright",
-        "frameworks/native/include/media/hardware",
-    ],
-
     shared_libs: [
         "libstagefright",
         "libbinder",
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/Android.bp
index 09bb12c..ab30297 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2017-13253/Android.bp
@@ -33,6 +33,7 @@
         "libmedia",
         "libmediadrm",
         "libutils",
+        "android.hardware.drm-V1-ndk",
     ],
 
     cflags: [
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9537/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9537/Android.bp
index 9b5a6ca..5e9597d 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9537/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9537/Android.bp
@@ -30,8 +30,11 @@
         "external/aac/libSYS/include",
         "external/aac/libAACdec/include",
     ],
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
     shared_libs: [
-        "libbluetooth",
+        "liblog",
     ],
     cflags: [
         "-DCHECK_OVERFLOW",
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9549/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9549/Android.bp
index 5b9e6dd..651c36f 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2018-9549/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2018-9549/Android.bp
@@ -25,8 +25,11 @@
     srcs : [
         "poc.cpp",
     ],
-    shared_libs : [
-        "libbluetooth",
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
+    shared_libs: [
+        "liblog",
     ],
     include_dirs : [
         "external/aac/libSBRdec/src",
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2044/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-2044/Android.bp
index 3638d08..0f49af7 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2044/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-2044/Android.bp
@@ -30,8 +30,8 @@
         "-DCHECK_OVERFLOW",
     ],
     compile_multilib: "32",
-    include_dirs: [
-        "frameworks/av/media/libstagefright/rtsp/",
+    header_libs: [
+        "libstagefright_rtsp_headers",
     ],
     shared_libs: [
         "libmediaplayerservice",
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2044/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-2044/poc.cpp
index e733c6f..ad4c8b8 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-2044/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-2044/poc.cpp
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+#include <media/stagefright/rtsp/APacketSource.h>
+#include <media/stagefright/rtsp/ASessionDescription.h>
 #include <stdlib.h>
-#include <APacketSource.h>
-#include <ASessionDescription.h>
 
 using namespace android;
 
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9247/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9247/Android.bp
index b85abba..31572ca 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9247/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9247/Android.bp
@@ -32,7 +32,10 @@
         "external/aac/libFDK/include/",
         "cts/hostsidetests/securitybulletin/securityPatch/includes/",
     ],
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
     shared_libs: [
-        "libbluetooth",
+        "liblog",
     ],
 }
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9308/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9308/Android.bp
index 250b45b..8834e75 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9308/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9308/Android.bp
@@ -29,7 +29,10 @@
         "external/aac/libSYS/include",
         "external/aac/libAACdec/include",
     ],
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
     shared_libs: [
-        "libbluetooth",
+        "liblog",
     ],
 }
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/Android.bp
index b10d624..2794b11 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/Android.bp
@@ -29,14 +29,6 @@
         ":cts_hostsidetests_securitybulletin_memutils_track",
     ],
 
-    include_dirs: [
-        "frameworks/native/include/media/openmax",
-        "frameworks/av/media/libstagefright",
-        "frameworks/native/include/media/hardware",
-        "frameworks/av/media/libmedia/include",
-        "frameworks/av/media/libstagefright/xmlparser/include",
-    ],
-
     header_libs: [
         "libstagefright_mp3dec_headers",
     ],
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/poc.cpp
index 1ac7b76..94308ab 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9313/poc.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
+#include <media/omx/1.0/WOmx.h>
+#include <media/stagefright/omx/1.0/Omx.h>
 #include <s_tmp3dec_file.h> // from the mp3dec library
 
 #include "../includes/common.h"
 #include "../includes/memutils_track.h"
 #include "../includes/omxUtils.h"
-#include "media/omx/1.0/WOmx.h"
-#include "omx/include/media/stagefright/omx/1.0/Omx.h"
 
 char enable_selective_overload = ENABLE_NONE;
 bool is_tracking_required(size_t size) {
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9357/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9357/Android.bp
index 9a7a370..56804eb 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9357/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9357/Android.bp
@@ -30,7 +30,10 @@
         "external/aac/libAACdec/src",
         "external/aac/libSYS/include",
     ],
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
     shared_libs: [
-        "libbluetooth",
+        "liblog",
     ],
 }
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9362/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9362/Android.bp
index 1cb71e3..30507a9 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2019-9362/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2019-9362/Android.bp
@@ -25,8 +25,11 @@
     srcs: [
         "poc.cpp",
     ],
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
     shared_libs: [
-        "libbluetooth",
+        "liblog",
     ],
     include_dirs: [
         "external/aac/libSACdec/src",
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0381/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0381/Android.bp
index 8666fda..8a90d2a 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0381/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0381/Android.bp
@@ -26,13 +26,8 @@
         "poc.cpp",
         ":cts_hostsidetests_securitybulletin_memutils",
     ],
-    include_dirs: [
-        "frameworks/av/media/libmedia/include/android",
-        "frameworks/av/media/libmedia/include",
-        "frameworks/av/media/libstagefright/foundation/include",
-        "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation",
-        "frameworks/av/media/libstagefright/include",
-        "frameworks/av/media/libstagefright/include/media/stagefright",
+    header_libs: [
+        "libmedia_headers",
     ],
     shared_libs: [
         "libutils",
@@ -41,5 +36,5 @@
     cflags: [
         "-DCHECK_OVERFLOW",
         "-DENABLE_SELECTIVE_OVERLOADING",
-    ]
+    ],
 }
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0381/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0381/poc.cpp
index 6ea13d6..a23729f 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0381/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0381/poc.cpp
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include <IMediaExtractor.h>
+#include <android/IMediaExtractor.h>
 #include <dlfcn.h>
+
 #include "../includes/common.h"
 #include "../includes/memutils.h"
 
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0383/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0383/Android.bp
index 69c17b1..6bbf2db 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0383/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0383/Android.bp
@@ -26,11 +26,8 @@
         "poc.cpp",
         ":cts_hostsidetests_securitybulletin_memutils",
     ],
-    include_dirs: [
-        "frameworks/av/media/libmedia/include",
-        "frameworks/av/media/libmedia/include/android",
-        "frameworks/av/media/libstagefright/include",
-        "frameworks/av/media/libstagefright/foundation/include",
+    header_libs: [
+        "libmedia_headers",
     ],
     shared_libs: [
         "libutils",
@@ -39,5 +36,5 @@
     cflags: [
         "-DCHECK_OVERFLOW",
         "-DENABLE_SELECTIVE_OVERLOADING",
-    ]
+    ],
 }
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0383/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0383/poc.cpp
index e72af64..0cf9f76 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0383/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0383/poc.cpp
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include <IMediaExtractor.h>
+#include <android/IMediaExtractor.h>
 #include <dlfcn.h>
+
 #include "../includes/common.h"
 #include "../includes/memutils.h"
 
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0384/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0384/Android.bp
index 7f8078c..1cd92dc 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0384/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0384/Android.bp
@@ -26,13 +26,8 @@
         "poc.cpp",
         ":cts_hostsidetests_securitybulletin_memutils",
     ],
-    include_dirs: [
-        "frameworks/av/media/libmedia/include/android",
-        "frameworks/av/media/libmedia/include",
-        "frameworks/av/media/libstagefright/foundation/include",
-        "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation",
-        "frameworks/av/media/libstagefright/include",
-        "frameworks/av/media/libstagefright/include/media/stagefright",
+    header_libs: [
+        "libmedia_headers",
     ],
     shared_libs: [
         "libutils",
@@ -41,5 +36,5 @@
     cflags: [
         "-DCHECK_OVERFLOW",
         "-DENABLE_SELECTIVE_OVERLOADING",
-    ]
+    ],
 }
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0384/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0384/poc.cpp
index 6ea13d6..a23729f 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0384/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0384/poc.cpp
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include <IMediaExtractor.h>
+#include <android/IMediaExtractor.h>
 #include <dlfcn.h>
+
 #include "../includes/common.h"
 #include "../includes/memutils.h"
 
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0385/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0385/Android.bp
index 0da104a..e0ee68f 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0385/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0385/Android.bp
@@ -26,13 +26,8 @@
         "poc.cpp",
         ":cts_hostsidetests_securitybulletin_memutils",
     ],
-    include_dirs: [
-        "frameworks/av/media/libmedia/include/android",
-        "frameworks/av/media/libmedia/include",
-        "frameworks/av/media/libstagefright/foundation/include",
-        "frameworks/av/media/libstagefright/foundation/include/media/stagefright/foundation",
-        "frameworks/av/media/libstagefright/include",
-        "frameworks/av/media/libstagefright/include/media/stagefright",
+    header_libs: [
+        "libmedia_headers",
     ],
     shared_libs: [
         "libutils",
@@ -41,5 +36,5 @@
     cflags: [
         "-DCHECK_OVERFLOW",
         "-DENABLE_SELECTIVE_OVERLOADING",
-    ]
+    ],
 }
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0385/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0385/poc.cpp
index 6ea13d6..a23729f 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0385/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0385/poc.cpp
@@ -14,8 +14,9 @@
  * limitations under the License.
  */
 
-#include <IMediaExtractor.h>
+#include <android/IMediaExtractor.h>
 #include <dlfcn.h>
+
 #include "../includes/common.h"
 #include "../includes/memutils.h"
 
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0451/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0451/Android.bp
index 69ce4b1..cd1a59f 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2020-0451/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2020-0451/Android.bp
@@ -37,7 +37,10 @@
         "external/aac/libDRCdec/include",
         "external/aac/libSBRdec/src",
     ],
+    static_libs: [
+        "libFraunhoferAAC",
+    ],
     shared_libs: [
-        "libbluetooth",
+        "liblog",
     ],
 }
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2021-39665/Android.bp b/hostsidetests/securitybulletin/securityPatch/CVE-2021-39665/Android.bp
index 0597cdf..f077ca8 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2021-39665/Android.bp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2021-39665/Android.bp
@@ -22,7 +22,7 @@
 cc_test {
     name: "CVE-2021-39665",
     defaults: [
-        "cts_hostsidetests_securitybulletin_defaults"
+        "cts_hostsidetests_securitybulletin_defaults",
     ],
     srcs: [
         "poc.cpp",
@@ -32,7 +32,7 @@
         "libmediaplayerservice",
         "libstagefright_foundation",
     ],
-    include_dirs: [
-        "frameworks/av/media/libstagefright/rtsp",
+    header_libs: [
+        "libstagefright_rtsp_headers",
     ],
 }
diff --git a/hostsidetests/securitybulletin/securityPatch/CVE-2021-39665/poc.cpp b/hostsidetests/securitybulletin/securityPatch/CVE-2021-39665/poc.cpp
index a008005..11ab3b5 100644
--- a/hostsidetests/securitybulletin/securityPatch/CVE-2021-39665/poc.cpp
+++ b/hostsidetests/securitybulletin/securityPatch/CVE-2021-39665/poc.cpp
@@ -15,10 +15,11 @@
  */
 
 #include <dlfcn.h>
+
 #include "../includes/common.h"
 
 #define private public
-#include "AAVCAssembler.h"
+#include <media/stagefright/rtsp/AAVCAssembler.h>
 
 using namespace android;
 
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2018_9558.java b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2018_9558.java
index b127c85..a4d088d 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2018_9558.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2018_9558.java
@@ -23,10 +23,10 @@
 import com.android.compatibility.common.util.CrashUtils.Config.BacktraceFilterPattern;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
-import java.util.regex.Pattern;
-
-import org.junit.runner.RunWith;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.regex.Pattern;
 
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class CVE_2018_9558 extends SecurityTestCase {
@@ -43,7 +43,7 @@
         AdbUtils.assumeHasNfc(getDevice());
         assumeIsSupportedNfcDevice(getDevice());
         pocPusher.only64();
-        String signals[] = {CrashUtils.SIGABRT};
+        String[] signals = {CrashUtils.SIGABRT};
         String binaryName = "CVE-2018-9558";
         AdbUtils.pocConfig testConfig = new AdbUtils.pocConfig(binaryName, getDevice());
         testConfig.config = new CrashUtils.Config().setProcessPatterns(Pattern.compile(binaryName))
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0073.java b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0073.java
index 04d65f8..7a09a25 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0073.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2020_0073.java
@@ -22,10 +22,10 @@
 import com.android.compatibility.common.util.CrashUtils.Config.BacktraceFilterPattern;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
-import java.util.regex.Pattern;
-
-import org.junit.runner.RunWith;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.regex.Pattern;
 
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class CVE_2020_0073 extends SecurityTestCase {
@@ -43,7 +43,7 @@
         assumeIsSupportedNfcDevice(getDevice());
         pocPusher.only64();
         String binaryName = "CVE-2020-0073";
-        String signals[] = {CrashUtils.SIGABRT};
+        String[] signals = {CrashUtils.SIGABRT};
         AdbUtils.pocConfig testConfig = new AdbUtils.pocConfig(binaryName, getDevice());
         testConfig.config = new CrashUtils.Config().setProcessPatterns(Pattern.compile(binaryName))
                 .setBacktraceIncludes(new BacktraceFilterPattern("libnfc-nci",
diff --git a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2021_39665.java b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2021_39665.java
index 519bd24..311b5ce 100644
--- a/hostsidetests/securitybulletin/src/android/security/cts/CVE_2021_39665.java
+++ b/hostsidetests/securitybulletin/src/android/security/cts/CVE_2021_39665.java
@@ -22,10 +22,10 @@
 import com.android.compatibility.common.util.CrashUtils.Config.BacktraceFilterPattern;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 
-import java.util.regex.Pattern;
-
-import org.junit.runner.RunWith;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.regex.Pattern;
 
 @RunWith(DeviceJUnit4ClassRunner.class)
 public class CVE_2021_39665 extends SecurityTestCase {
@@ -39,7 +39,7 @@
     @AsbSecurityTest(cveBugId = 204077881)
     @Test
     public void testPocCVE_2021_39665() throws Exception {
-        String signals[] = {CrashUtils.SIGSEGV};
+        String[] signals = {CrashUtils.SIGSEGV};
         String binaryName = "CVE-2021-39665";
         AdbUtils.pocConfig testConfig = new AdbUtils.pocConfig(binaryName, getDevice());
         testConfig.config = new CrashUtils.Config().setProcessPatterns(Pattern.compile(binaryName))
diff --git a/hostsidetests/settings/Android.bp b/hostsidetests/settings/Android.bp
index 66a198b..0b5bd4a 100644
--- a/hostsidetests/settings/Android.bp
+++ b/hostsidetests/settings/Android.bp
@@ -30,7 +30,6 @@
     ],
     // tag this module as a cts test artifact
     test_suites: [
-        "arcts",
         "cts",
         "general-tests",
     ],
diff --git a/hostsidetests/settings/app/DeviceOwnerApp/Android.bp b/hostsidetests/settings/app/DeviceOwnerApp/Android.bp
index ec63294..7e1cd74 100644
--- a/hostsidetests/settings/app/DeviceOwnerApp/Android.bp
+++ b/hostsidetests/settings/app/DeviceOwnerApp/Android.bp
@@ -42,7 +42,6 @@
     ],
     // tag this module as a cts test artifact
     test_suites: [
-        "arcts",
         "cts",
         "general-tests",
     ],
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4old/src/android/content/pm/cts/shortcut/backup/publisher4/ShortcutManagerPostBackupTest.java b/hostsidetests/shortcuts/deviceside/backup/publisher4old/src/android/content/pm/cts/shortcut/backup/publisher4/ShortcutManagerPostBackupTest.java
index 19f2b58..595e1ad 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4old/src/android/content/pm/cts/shortcut/backup/publisher4/ShortcutManagerPostBackupTest.java
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4old/src/android/content/pm/cts/shortcut/backup/publisher4/ShortcutManagerPostBackupTest.java
@@ -316,7 +316,8 @@
                 latch.countDown();
             }
         };
-        getContext().registerReceiver(onResult, myFilter);
+        getContext().registerReceiver(onResult, myFilter,
+                Context.RECEIVER_EXPORTED_UNAUDITED);
         assertTrue(getManager().requestPinShortcut(ms2,
                 PendingIntent.getBroadcast(getContext(), 0, new Intent(myIntentAction),
                         PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED).getIntentSender()));
diff --git a/hostsidetests/silentupdate/Android.bp b/hostsidetests/silentupdate/Android.bp
index f58fb54..c562c6a 100644
--- a/hostsidetests/silentupdate/Android.bp
+++ b/hostsidetests/silentupdate/Android.bp
@@ -32,7 +32,7 @@
     ],
     data: [
         ":SilentInstallCurrent",
+        ":SilentInstallR",
         ":SilentInstallQ",
-        ":SilentInstallP",
     ]
 }
diff --git a/hostsidetests/silentupdate/app/Android.bp b/hostsidetests/silentupdate/app/Android.bp
index 3ea3ad6..3f14631 100644
--- a/hostsidetests/silentupdate/app/Android.bp
+++ b/hostsidetests/silentupdate/app/Android.bp
@@ -19,6 +19,13 @@
 android_test_helper_app {
     name: "SilentInstallCurrent",
     manifest:   "AndroidManifest.xml",
+    target_sdk_version: "31",
+    min_sdk_version:"28"
+}
+
+android_test_helper_app {
+    name: "SilentInstallR",
+    manifest:   "AndroidManifest.xml",
     target_sdk_version: "30",
     min_sdk_version:"28"
 }
@@ -29,10 +36,3 @@
     target_sdk_version: "29",
     min_sdk_version:"28"
 }
-
-android_test_helper_app {
-    name: "SilentInstallP",
-    manifest:   "AndroidManifest.xml",
-    target_sdk_version: "28",
-    min_sdk_version:"28"
-}
diff --git a/hostsidetests/silentupdate/src/com/android/tests/hostside/silentupdate/SilentUpdateHostsideTests.java b/hostsidetests/silentupdate/src/com/android/tests/hostside/silentupdate/SilentUpdateHostsideTests.java
index fb8ad92..d1c0a74 100644
--- a/hostsidetests/silentupdate/src/com/android/tests/hostside/silentupdate/SilentUpdateHostsideTests.java
+++ b/hostsidetests/silentupdate/src/com/android/tests/hostside/silentupdate/SilentUpdateHostsideTests.java
@@ -35,8 +35,8 @@
     private static final String TEST_PKG = "com.android.tests.silentupdate";
     private static final String TEST_CLS = "com.android.tests.silentupdate.SilentUpdateTests";
     private static final String CURRENT_APK = "SilentInstallCurrent.apk";
-    private static final String P_APK = "SilentInstallP.apk";
     private static final String Q_APK = "SilentInstallQ.apk";
+    private static final String R_APK = "SilentInstallR.apk";
 
     @Before
     public void installAppOpAllowed() throws Exception {
@@ -89,15 +89,15 @@
     }
 
     @Test
-    public void updatePreQApp_RequiresUserAction() throws Exception {
-        install(P_APK, TEST_PKG);
-        runDeviceTests(TEST_PKG, TEST_CLS, "updatePreQApp_RequiresUserAction");
+    public void updatePreRApp_RequiresUserAction() throws Exception {
+        install(Q_APK, TEST_PKG);
+        runDeviceTests(TEST_PKG, TEST_CLS, "updatePreRApp_RequiresUserAction");
     }
 
     @Test
-    public void updateQApp_RequiresNoUserAction() throws Exception {
-        install(Q_APK, TEST_PKG);
-        runDeviceTests(TEST_PKG, TEST_CLS, "updateQApp_RequiresNoUserAction");
+    public void updateRApp_RequiresNoUserAction() throws Exception {
+        install(R_APK, TEST_PKG);
+        runDeviceTests(TEST_PKG, TEST_CLS, "updateRApp_RequiresNoUserAction");
     }
 
     @Test
@@ -111,7 +111,7 @@
 
     @Test
     public void setRequireUserAction_throwsOnIllegalArgument() throws Exception {
-        install(Q_APK, TEST_PKG);
+        install(R_APK, TEST_PKG);
         runDeviceTests(TEST_PKG, TEST_CLS, "setRequireUserAction_throwsOnIllegalArgument");
     }
 
@@ -135,6 +135,25 @@
                 "silentInstallRepeatedly_waitForThrottleTime_succeed");
     }
 
+    @Test
+    public void newInstall_withInstallDpcPermission_requiresUserAction() throws Exception {
+        runDeviceTests(
+                TEST_PKG, TEST_CLS, "newInstall_withInstallDpcPermission_requiresUserAction");
+    }
+
+    @Test
+    public void newInstallDpc_withInstallDpcPermission_requiresNoUserAction() throws Exception {
+        runDeviceTests(
+                TEST_PKG, TEST_CLS, "newInstallDpc_withInstallDpcPermission_requiresNoUserAction");
+    }
+
+    @Test
+    public void newInstallDpc_withoutInstallDpcPermission_requiresUserAction() throws Exception {
+        runDeviceTests(
+                TEST_PKG, TEST_CLS,
+                "newInstallDpc_withoutInstallDpcPermission_requiresUserAction");
+    }
+
     private void waitForPathChange(String packageName, String originalCodePath, long timeout)
             throws DeviceNotAvailableException, InterruptedException {
                 long startTime = System.currentTimeMillis();
diff --git a/hostsidetests/silentupdate/testapp/Android.bp b/hostsidetests/silentupdate/testapp/Android.bp
index d3417e94..8bd9cfc 100644
--- a/hostsidetests/silentupdate/testapp/Android.bp
+++ b/hostsidetests/silentupdate/testapp/Android.bp
@@ -27,6 +27,8 @@
         "androidx.core_core",
         "androidx.test.runner",
         "truth-prebuilt",
+        "TestApp",
+        "Nene",
     ],
     sdk_version: "test_current",
     test_suites: [
@@ -36,7 +38,7 @@
     ],
     java_resources: [
         ":SilentInstallCurrent",
+        ":SilentInstallR",
         ":SilentInstallQ",
-        ":SilentInstallP",
     ]
 }
diff --git a/hostsidetests/silentupdate/testapp/src/com/android/tests/silentupdate/SilentUpdateTests.java b/hostsidetests/silentupdate/testapp/src/com/android/tests/silentupdate/SilentUpdateTests.java
index 4d72747..8599bc9 100644
--- a/hostsidetests/silentupdate/testapp/src/com/android/tests/silentupdate/SilentUpdateTests.java
+++ b/hostsidetests/silentupdate/testapp/src/com/android/tests/silentupdate/SilentUpdateTests.java
@@ -16,6 +16,7 @@
 
 package com.android.tests.silentupdate;
 
+import static android.Manifest.permission.INSTALL_DPC_PACKAGES;
 import static android.app.PendingIntent.FLAG_MUTABLE;
 import static android.content.Context.MODE_PRIVATE;
 import static android.content.pm.PackageInstaller.SessionParams.USER_ACTION_NOT_REQUIRED;
@@ -40,6 +41,11 @@
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.permissions.PermissionContext;
+import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppProvider;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Test;
@@ -63,17 +69,24 @@
 @RunWith(JUnit4.class)
 public class SilentUpdateTests {
     private static final String CURRENT_APK = "SilentInstallCurrent.apk";
-    private static final String P_APK = "SilentInstallP.apk";
     private static final String Q_APK = "SilentInstallQ.apk";
+    private static final String R_APK = "SilentInstallR.apk";
     private static final String INSTALLER_PACKAGE_NAME = "com.android.tests.silentupdate";
     static final long SILENT_UPDATE_THROTTLE_TIME_SECOND = 10;
 
+    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
+    private static final TestApp sDpcApp = sTestAppProvider.query()
+                    .whereIsDeviceAdmin().isTrue()
+                    .whereTestOnly().isFalse()
+                    .get();
+
     private static Context getContext() {
         return InstrumentationRegistry.getInstrumentation().getContext();
     }
 
     @After
     public void tearDown() {
+        sDpcApp.uninstall();
         resetSilentUpdatesPolicy();
     }
 
@@ -120,17 +133,17 @@
     }
 
     @Test
-    public void updatePreQApp_RequiresUserAction() throws Exception {
-        Assert.assertEquals("Updating to a pre-Q app should require user action",
+    public void updatePreRApp_RequiresUserAction() throws Exception {
+        Assert.assertEquals("Updating to a pre-R app should require user action",
                 PackageInstaller.STATUS_PENDING_USER_ACTION,
-                silentInstallResource(P_APK));
+                silentInstallResource(Q_APK));
     }
 
     @Test
-    public void updateQApp_RequiresNoUserAction() throws Exception {
-        Assert.assertEquals("Updating to a Q app should not require user action",
+    public void updateRApp_RequiresNoUserAction() throws Exception {
+        Assert.assertEquals("Updating to an R app should not require user action",
                 PackageInstaller.STATUS_SUCCESS,
-                silentInstallResource(Q_APK));
+                silentInstallResource(R_APK));
     }
 
     @Test
@@ -209,6 +222,39 @@
                 silentInstallResource(CURRENT_APK));
     }
 
+    @Test
+    public void newInstall_withInstallDpcPermission_requiresUserAction() throws Exception {
+        try (PermissionContext p = TestApis.permissions().withPermission(
+                INSTALL_DPC_PACKAGES)) {
+            Assert.assertEquals("Installing a non DPC package with INSTALL_DPC_PACKAGES "
+                    + "permission should require user action.",
+                    PackageInstaller.STATUS_PENDING_USER_ACTION,
+                    silentInstallResource(CURRENT_APK));
+        }
+    }
+
+    @Test
+    public void newInstallDpc_withInstallDpcPermission_requiresNoUserAction() throws Exception {
+        try (PermissionContext p = TestApis.permissions().withPermission(
+                INSTALL_DPC_PACKAGES)) {
+            Assert.assertEquals("Installing a DPC package with INSTALL_DPC_PACKAGES "
+                            + "permission should not require user action.",
+                    PackageInstaller.STATUS_SUCCESS,
+                    install(sDpcApp::apkStream, /* requireUserAction= */ false));
+        }
+    }
+
+    @Test
+    public void newInstallDpc_withoutInstallDpcPermission_requiresUserAction() throws Exception {
+        try (PermissionContext p = TestApis.permissions().withoutPermission(
+                INSTALL_DPC_PACKAGES)) {
+            Assert.assertEquals("Installing a DPC package without INSTALL_DPC_PACKAGES "
+                            + "permission should require user action.",
+                    PackageInstaller.STATUS_PENDING_USER_ACTION,
+                    install(sDpcApp::apkStream, /* requireUserAction= */ false));
+        }
+    }
+
     private int silentInstallResource(String resourceName) throws Exception {
         return install(resourceSupplier(resourceName), false);
     }
diff --git a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/ApexShimValidationTest.java b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/ApexShimValidationTest.java
index 712c563..95436d2 100644
--- a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/ApexShimValidationTest.java
+++ b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/ApexShimValidationTest.java
@@ -16,13 +16,12 @@
 
 package com.android.tests.stagedinstall;
 
+import static com.android.cts.install.lib.PackageInstallerSessionInfoSubject.assertThat;
 import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
-import static com.android.tests.stagedinstall.PackageInstallerSessionInfoSubject.assertThat;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import android.Manifest;
-import android.content.Intent;
 import android.content.pm.PackageInstaller;
 
 import androidx.test.platform.app.InstrumentationRegistry;
@@ -68,35 +67,40 @@
     @Test
     public void testRejectsApexWithAdditionalFile_Commit() throws Exception {
         int sessionId = stageApex("com.android.apex.cts.shim.v2_additional_file.apex");
-        PackageInstaller.SessionInfo info = InstallUtils.waitForSession(sessionId);
+        PackageInstaller.SessionInfo info =
+                InstallUtils.getPackageInstaller().getSessionInfo(sessionId);
         assertThat(info).isStagedSessionFailed();
     }
 
     @Test
     public void testRejectsApexWithAdditionalFolder_Commit() throws Exception {
         int sessionId = stageApex("com.android.apex.cts.shim.v2_additional_folder.apex");
-        PackageInstaller.SessionInfo info = InstallUtils.waitForSession(sessionId);
+        PackageInstaller.SessionInfo info =
+                InstallUtils.getPackageInstaller().getSessionInfo(sessionId);
         assertThat(info).isStagedSessionFailed();
     }
 
     @Test
     public void testRejectsApexWithPostInstallHook_Commit() throws Exception {
         int sessionId = stageApex("com.android.apex.cts.shim.v2_with_post_install_hook.apex");
-        PackageInstaller.SessionInfo info = InstallUtils.waitForSession(sessionId);
+        PackageInstaller.SessionInfo info =
+                InstallUtils.getPackageInstaller().getSessionInfo(sessionId);
         assertThat(info).isStagedSessionFailed();
     }
 
     @Test
     public void testRejectsApexWithPreInstallHook_Commit() throws Exception {
         int sessionId = stageApex("com.android.apex.cts.shim.v2_with_pre_install_hook.apex");
-        PackageInstaller.SessionInfo info = InstallUtils.waitForSession(sessionId);
+        PackageInstaller.SessionInfo info =
+                InstallUtils.getPackageInstaller().getSessionInfo(sessionId);
         assertThat(info).isStagedSessionFailed();
     }
 
     @Test
     public void testRejectsApexWrongSHA_Commit() throws Exception {
         int sessionId = stageApex("com.android.apex.cts.shim.v2_wrong_sha.apex");
-        PackageInstaller.SessionInfo info = InstallUtils.waitForSession(sessionId);
+        PackageInstaller.SessionInfo info =
+                InstallUtils.getPackageInstaller().getSessionInfo(sessionId);
         assertThat(info).isStagedSessionFailed();
     }
 
@@ -171,8 +175,7 @@
                      InstallUtils.openPackageInstallerSession(sessionId)) {
             LocalIntentSender sender = new LocalIntentSender();
             session.commit(sender.getIntentSender());
-            Intent result = sender.getResult();
-            InstallUtils.assertStatusSuccess(result);
+            sender.getResult();
             return sessionId;
         }
     }
diff --git a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/PackageInstallerSessionInfoSubject.java b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/PackageInstallerSessionInfoSubject.java
deleted file mode 100644
index fa0504d..0000000
--- a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/PackageInstallerSessionInfoSubject.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2019 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.tests.stagedinstall;
-
-import android.content.pm.PackageInstaller;
-
-import com.google.common.truth.FailureMetadata;
-import com.google.common.truth.Subject;
-import com.google.common.truth.Truth;
-
-import javax.annotation.Nullable;
-
-final class PackageInstallerSessionInfoSubject extends Subject {
-    private final PackageInstaller.SessionInfo mActual;
-
-    private PackageInstallerSessionInfoSubject(FailureMetadata failureMetadata,
-            @Nullable PackageInstaller.SessionInfo subject) {
-        super(failureMetadata, subject);
-        mActual = subject;
-    }
-
-    private static Subject.Factory<PackageInstallerSessionInfoSubject,
-            PackageInstaller.SessionInfo> sessions() {
-        return new Subject.Factory<PackageInstallerSessionInfoSubject,
-                PackageInstaller.SessionInfo>() {
-            @Override
-            public PackageInstallerSessionInfoSubject createSubject(FailureMetadata failureMetadata,
-                    PackageInstaller.SessionInfo session) {
-                return new PackageInstallerSessionInfoSubject(failureMetadata, session);
-            }
-        };
-    }
-
-    static PackageInstallerSessionInfoSubject assertThat(
-            PackageInstaller.SessionInfo session) {
-        return Truth.assertAbout(sessions()).that(session);
-    }
-
-    public void isStagedSessionReady() {
-        check(failureMessage("in state READY")).that(mActual.isStagedSessionReady()).isTrue();
-    }
-
-    public void isStagedSessionApplied() {
-        check(failureMessage("in state APPLIED")).that(mActual.isStagedSessionApplied()).isTrue();
-    }
-
-    public void isStagedSessionFailed() {
-        check(failureMessage("in state FAILED")).that(mActual.isStagedSessionFailed()).isTrue();
-    }
-
-    private String failureMessage(String suffix) {
-        return String.format("Not true that session %s is %s", subjectAsString(), suffix);
-    }
-
-    private String subjectAsString() {
-        return "{" + "appPackageName = " + mActual.getAppPackageName() + "; "
-                + "sessionId = " + mActual.getSessionId() + "; "
-                + "isStagedSessionReady = " + mActual.isStagedSessionReady() + "; "
-                + "isStagedSessionApplied = " + mActual.isStagedSessionApplied() + "; "
-                + "isStagedSessionFailed = " + mActual.isStagedSessionFailed() + "; "
-                + "stagedSessionErrorMessage = " + mActual.getStagedSessionErrorMessage() + "}";
-    }
-}
diff --git a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java
index e7d419b..8d5df1b 100644
--- a/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java
+++ b/hostsidetests/stagedinstall/app/src/com/android/tests/stagedinstall/StagedInstallTest.java
@@ -19,11 +19,11 @@
 import static com.android.cts.install.lib.InstallUtils.assertStatusFailure;
 import static com.android.cts.install.lib.InstallUtils.assertStatusSuccess;
 import static com.android.cts.install.lib.InstallUtils.getPackageInstaller;
+import static com.android.cts.install.lib.PackageInstallerSessionInfoSubject.assertThat;
 import static com.android.cts.shim.lib.ShimPackage.DIFFERENT_APEX_PACKAGE_NAME;
 import static com.android.cts.shim.lib.ShimPackage.NOT_PRE_INSTALL_APEX_PACKAGE_NAME;
 import static com.android.cts.shim.lib.ShimPackage.SHIM_APEX_PACKAGE_NAME;
 import static com.android.cts.shim.lib.ShimPackage.SHIM_PACKAGE_NAME;
-import static com.android.tests.stagedinstall.PackageInstallerSessionInfoSubject.assertThat;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
@@ -75,7 +75,9 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
@@ -237,7 +239,6 @@
         BroadcastCounter counter = new BroadcastCounter(PackageInstaller.ACTION_SESSION_COMMITTED);
         int sessionId = stageSingleApk(TestApp.A1).assertSuccessful().getSessionId();
         assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
         assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
@@ -270,7 +271,6 @@
                 .assertSuccessful().getSessionId();
         assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
         assertThat(getInstalledVersion(TestApp.B)).isEqualTo(-1);
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
         assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
@@ -292,7 +292,6 @@
     public void testAbandonStagedApkBeforeReboot_CommitAndAbandon() throws Exception {
         int sessionId = stageSingleApk(TestApp.A1).assertSuccessful().getSessionId();
         assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
-        waitForIsReadyBroadcast(sessionId);
         PackageInstaller.SessionInfo session = InstallUtils.getStagedSessionInfo(sessionId);
         assertSessionReady(sessionId);
         abandonSession(sessionId);
@@ -358,8 +357,9 @@
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
         // Using an apex in hopes that pre-reboot verification will take longer to complete
         // and we will manage to abandon it before session becomes ready.
-        int sessionId = stageMultipleApks(TestApp.A1, TestApp.Apex2).assertSuccessful()
-                .getSessionId();
+        int sessionId = Install.multi(TestApp.A1, TestApp.Apex2).setStaged().createSession();
+        LocalIntentSender sender = new LocalIntentSender();
+        InstallUtils.openPackageInstallerSession(sessionId).commit(sender.getIntentSender());
         abandonSession(sessionId);
         InstallUtils.assertStagedSessionIsAbandoned(sessionId);
         counter.assertNoBroadcastReceived();
@@ -433,9 +433,9 @@
     public void testStagedInstallDowngrade_DowngradeNotRequested_Fails_Commit()  throws Exception {
         assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
         Install.single(TestApp.A2).commit();
-        int sessionId = stageSingleApk(TestApp.A1).assertSuccessful().getSessionId();
+        int sessionId = stageSingleApk(TestApp.A1).assertFailure().getSessionId();
         assertThat(getInstalledVersion(TestApp.A)).isEqualTo(2);
-        PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
+        PackageInstaller.SessionInfo sessionInfo = getSessionInfo(sessionId);
         assertThat(sessionInfo).isStagedSessionFailed();
     }
 
@@ -445,7 +445,6 @@
         Install.single(TestApp.A2).commit();
         int sessionId = stageDowngradeSingleApk(TestApp.A1).assertSuccessful().getSessionId();
         assertThat(getInstalledVersion(TestApp.A)).isEqualTo(2);
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
     }
@@ -454,10 +453,7 @@
     public void testStagedInstallDowngrade_DowngradeRequested_Fails_Commit() throws Exception {
         assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
         Install.single(TestApp.A2).commit();
-        int sessionId = stageDowngradeSingleApk(TestApp.A1).assertSuccessful().getSessionId();
-        assertThat(getInstalledVersion(TestApp.A)).isEqualTo(2);
-        PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
-        assertThat(sessionInfo).isStagedSessionFailed();
+        stageDowngradeSingleApk(TestApp.A1).assertFailure();
     }
 
     @Test
@@ -474,7 +470,6 @@
         BroadcastCounter counter = new BroadcastCounter(PackageInstaller.ACTION_SESSION_COMMITTED);
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
         int sessionId = stageSingleApk(TestApp.Apex2).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
         // Version shouldn't change before reboot.
@@ -498,7 +493,6 @@
         assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
         int sessionId = stageMultipleApks(TestApp.Apex2, TestApp.A1)
                 .assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
         // Version shouldn't change before reboot.
@@ -537,8 +531,8 @@
     @Test
     public void testInstallStagedNonPreInstalledApex_Fails() throws Exception {
         assertThat(getInstalledVersion(NOT_PRE_INSTALL_APEX_PACKAGE_NAME)).isEqualTo(-1);
-        int sessionId = stageSingleApk(ApexNotPreInstalled).assertSuccessful().getSessionId();
-        PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
+        int sessionId = stageSingleApk(ApexNotPreInstalled).assertFailure().getSessionId();
+        PackageInstaller.SessionInfo sessionInfo = getSessionInfo(sessionId);
         assertThat(sessionInfo).isStagedSessionFailed();
     }
 
@@ -546,17 +540,16 @@
     public void testInstallStagedDifferentPackageNameWithInstalledApex_Fails() throws Exception {
         assertThat(getInstalledVersion(DIFFERENT_APEX_PACKAGE_NAME)).isEqualTo(-1);
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
-        int sessionId = stageSingleApk(Apex2DifferentPackageName).assertSuccessful().getSessionId();
-        PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
+        int sessionId = stageSingleApk(Apex2DifferentPackageName).assertFailure().getSessionId();
+        PackageInstaller.SessionInfo sessionInfo = getSessionInfo(sessionId);
         assertThat(sessionInfo.getStagedSessionErrorMessage()).contains(
-                "It is forbidden to install new APEX packages.");
+                "Attempting to install new APEX package");
     }
 
     @Test
     public void testStageApkWithSameNameAsApexShouldFail_Commit() throws Exception {
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
         int sessionId = stageSingleApk(TESTAPP_SAME_NAME_AS_APEX).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
     }
@@ -580,7 +573,6 @@
     @Test
     public void testInstallV2Apex_Commit() throws Exception {
         int sessionId = stageSingleApk(TestApp.Apex2).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
     }
@@ -596,7 +588,6 @@
     @Test
     public void testInstallV2SignedBobApex_Commit() throws Exception {
         int sessionId = stageSingleApk(Apex2SignedBobRot).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
     }
@@ -611,7 +602,6 @@
     @Test
     public void testInstallV3Apex_Commit() throws Exception {
         int sessionId = stageSingleApk(TestApp.Apex3).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
     }
@@ -626,7 +616,6 @@
     @Test
     public void testInstallV3SignedBobApex_Commit() throws Exception {
         int sessionId = stageSingleApk(Apex2SignedBobRot).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
     }
@@ -642,8 +631,8 @@
     public void testStagedInstallDowngradeApex_DowngradeNotRequested_Fails_Commit()
             throws Exception {
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
-        int sessionId = stageSingleApk(TestApp.Apex2).assertSuccessful().getSessionId();
-        PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
+        int sessionId = stageSingleApk(TestApp.Apex2).assertFailure().getSessionId();
+        PackageInstaller.SessionInfo sessionInfo = getSessionInfo(sessionId);
         assertThat(sessionInfo).isStagedSessionFailed();
         // Also verify that correct session info is reported by PackageManager.
         assertSessionFailed(sessionId);
@@ -664,7 +653,6 @@
             throws Exception {
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
         int sessionId = stageDowngradeSingleApk(TestApp.Apex2).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
     }
@@ -682,8 +670,8 @@
     public void testStagedInstallDowngradeApex_DowngradeRequested_UserBuild_Fails_Commit()
             throws Exception {
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
-        int sessionId = stageDowngradeSingleApk(TestApp.Apex2).assertSuccessful().getSessionId();
-        PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
+        int sessionId = stageDowngradeSingleApk(TestApp.Apex2).getSessionId();
+        PackageInstaller.SessionInfo sessionInfo = getSessionInfo(sessionId);
         assertThat(sessionInfo).isStagedSessionFailed();
         // Also verify that correct session info is reported by PackageManager.
         assertSessionFailed(sessionId);
@@ -704,7 +692,6 @@
             throws Exception {
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
         int sessionId = stageDowngradeSingleApk(TestApp.Apex1).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
     }
@@ -728,9 +715,8 @@
     @Test
     public void testFailsInvalidApexInstall_Commit() throws Exception {
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
-        int sessionId = stageSingleApk(ApexWrongSha2).assertSuccessful()
+        int sessionId = stageSingleApk(ApexWrongSha2).assertFailure()
                 .getSessionId();
-        waitForIsFailedBroadcast(sessionId);
         assertSessionFailed(sessionId);
         storeSessionId(sessionId);
     }
@@ -749,7 +735,6 @@
     public void testStagedApkSessionCallbacks() throws Exception {
 
         List<Integer> created = new ArrayList<Integer>();
-        List<Integer> finished = new ArrayList<Integer>();
 
         HandlerThread handlerThread = new HandlerThread(
                 "StagedApkSessionCallbacksTestHandlerThread");
@@ -768,13 +753,7 @@
             @Override public void onBadgingChanged(int sessionId) { }
             @Override public void onActiveChanged(int sessionId, boolean active) { }
             @Override public void onProgressChanged(int sessionId, float progress) { }
-
-            @Override
-            public void onFinished(int sessionId, boolean success) {
-                synchronized (finished) {
-                    finished.add(sessionId);
-                }
-            }
+            @Override public void onFinished(int sessionId, boolean success) { }
         };
 
         Context context = InstrumentationRegistry.getInstrumentation().getContext();
@@ -784,7 +763,6 @@
         int sessionId = stageSingleApk(TestApp.A1).assertSuccessful().getSessionId();
 
         assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
 
         packageInstaller.unregisterSessionCallback(callback);
@@ -795,9 +773,6 @@
         synchronized (created) {
             assertThat(created).containsExactly(sessionId);
         }
-        synchronized (finished) {
-            assertThat(finished).containsExactly(sessionId);
-        }
         packageInstaller.abandonSession(sessionId);
     }
 
@@ -807,7 +782,6 @@
 
         int sessionId = stageSingleApk("com.android.apex.cts.shim.v2.apex", "package")
                 .assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
         // Version shouldn't change before reboot.
@@ -824,8 +798,8 @@
     @Test
     public void testRejectsApexDifferentCertificate() throws Exception {
         int sessionId = stageSingleApk(Apex2DifferentCertificate)
-                .assertSuccessful().getSessionId();
-        PackageInstaller.SessionInfo info = waitForBroadcast(sessionId);
+                .assertFailure().getSessionId();
+        PackageInstaller.SessionInfo info = getSessionInfo(sessionId);
         assertThat(info.getSessionId()).isEqualTo(sessionId);
         assertThat(info).isStagedSessionFailed();
         assertThat(info.getStagedSessionErrorMessage()).contains("is not compatible with the one "
@@ -843,15 +817,13 @@
     // The update should fail if it is signed with a different non-rotated key
     @Test
     public void testUpdateWithDifferentKeyButNoRotation() throws Exception {
-        int sessionId = stageSingleApk(Apex2SignedBob).assertSuccessful().getSessionId();
-        waitForIsFailedBroadcast(sessionId);
+        stageSingleApk(Apex2SignedBob).assertFailure().getSessionId();
     }
 
     // The update should pass if it is signed with a proper rotated key
     @Test
     public void testUpdateWithDifferentKey_Commit() throws Exception {
-        int sessionId = stageSingleApk(Apex2SignedBobRot).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
+        stageSingleApk(Apex2SignedBobRot).assertSuccessful().getSessionId();
     }
 
     @Test
@@ -863,23 +835,20 @@
     @Test
     public void testUntrustedOldKeyIsRejected() throws Exception {
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
-        int sessionId = stageSingleApk(TestApp.Apex3).assertSuccessful().getSessionId();
-        waitForIsFailedBroadcast(sessionId);
+        stageSingleApk(TestApp.Apex3).assertFailure().getSessionId();
     }
 
     // Should be able to update with an old key which is trusted
     @Test
     public void testTrustedOldKeyIsAccepted_Commit() throws Exception {
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
-        int sessionId = stageSingleApk(Apex2SignedBobRotRollback).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
+        stageSingleApk(Apex2SignedBobRotRollback).assertSuccessful().getSessionId();
     }
 
     @Test
     public void testTrustedOldKeyIsAccepted_CommitPostReboot() throws Exception {
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
-        int sessionId = stageSingleApk(TestApp.Apex3).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
+        stageSingleApk(TestApp.Apex3).assertSuccessful().getSessionId();
     }
 
     @Test
@@ -891,8 +860,7 @@
     @Test
     public void testAfterRotationNewKeyCanUpdateFurther_CommitPostReboot() throws Exception {
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
-        int sessionId = stageSingleApk(Apex3SignedBobRot).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
+        stageSingleApk(Apex3SignedBobRot).assertSuccessful().getSessionId();
     }
 
     @Test
@@ -905,8 +873,7 @@
     public void testAfterRotationNewKeyCanUpdateFurtherWithoutLineage()
             throws Exception {
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(2);
-        int sessionId = stageSingleApk(Apex3SignedBob).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
+        stageSingleApk(Apex3SignedBob).assertSuccessful().getSessionId();
     }
 
     /**
@@ -918,7 +885,7 @@
     public void testFailStagingMultipleSessionsIfNoCheckPoint() throws Exception {
         stageSingleApk(TestApp.A1).assertSuccessful();
         int sessionId = stageSingleApk(TestApp.B1).assertSuccessful().getSessionId();
-        PackageInstaller.SessionInfo info = waitForBroadcast(sessionId);
+        PackageInstaller.SessionInfo info = getSessionInfo(sessionId);
         assertThat(info).isStagedSessionFailed();
         assertThat(info.getStagedSessionErrorMessage()).contains(
                 "Cannot stage multiple sessions without checkpoint support");
@@ -926,11 +893,10 @@
 
     @Test
     public void testFailOverlappingMultipleStagedInstall_BothSinglePackage_Apk() throws Exception {
-        int stagedSessionId = stageSingleApk(TestApp.A1).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(stagedSessionId);
+        stageSingleApk(TestApp.A1).assertSuccessful().getSessionId();
 
-        int sessionId = stageSingleApk(TestApp.A1).assertSuccessful().getSessionId();
-        PackageInstaller.SessionInfo info = waitForBroadcast(sessionId);
+        int sessionId = stageSingleApk(TestApp.A1).assertFailure().getSessionId();
+        PackageInstaller.SessionInfo info = getSessionInfo(sessionId);
         assertThat(info).isStagedSessionFailed();
         assertThat(info.getStagedSessionErrorMessage()).contains(
                 "has been staged already by session");
@@ -945,10 +911,9 @@
 
     @Test
     public void testFailOverlappingMultipleStagedInstall_BothMultiPackage_Apk() throws Exception {
-        int id = stageMultipleApks(TestApp.A1, TestApp.B1).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(id);
-        int sessionId = stageMultipleApks(TestApp.A2, TestApp.C1).assertSuccessful().getSessionId();
-        PackageInstaller.SessionInfo info = waitForBroadcast(sessionId);
+        stageMultipleApks(TestApp.A1, TestApp.B1).assertSuccessful().getSessionId();
+        int sessionId = stageMultipleApks(TestApp.A2, TestApp.C1).assertFailure().getSessionId();
+        PackageInstaller.SessionInfo info = getSessionInfo(sessionId);
         assertThat(info).isStagedSessionFailed();
         assertThat(info.getStagedSessionErrorMessage()).contains(
                 "has been staged already by session");
@@ -959,9 +924,7 @@
     public void testMultipleStagedInstall_ApkOnly_Commit()
             throws Exception {
         int firstSessionId = stageSingleApk(TestApp.A1).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(firstSessionId);
         int secondSessionId = stageSingleApk(TestApp.B1).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(secondSessionId);
         assertThat(getInstalledVersion(TestApp.A)).isEqualTo(-1);
         assertThat(getInstalledVersion(TestApp.B)).isEqualTo(-1);
         storeSessionIds(Arrays.asList(firstSessionId, secondSessionId));
@@ -983,9 +946,7 @@
     public void testInstallMultipleStagedSession_PartialFail_ApkOnly_Commit()
             throws Exception {
         int firstSessionId = stageSingleApk(TestApp.A1).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(firstSessionId);
         int secondSessionId = stageSingleApk(TestApp.B1).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(secondSessionId);
 
         // Install TestApp.A2 so that after reboot TestApp.A1 fails to install as it is downgrade
         Install.single(TestApp.A2).commit();
@@ -1058,7 +1019,6 @@
         assertThat(shim.applicationInfo.flags & ApplicationInfo.FLAG_INSTALLED).isEqualTo(
                 ApplicationInfo.FLAG_INSTALLED);
         int sessionId = stageDowngradeSingleApk(TestApp.Apex1).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         storeSessionId(sessionId);
     }
 
@@ -1095,7 +1055,6 @@
     public void testInstallStagedNoHashtreeApex_Commit() throws Exception {
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
         int sessionId = stageSingleApk(ApexNoHashtree2).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         assertSessionReady(sessionId);
         storeSessionId(sessionId);
         // Version shouldn't change before reboot.
@@ -1161,7 +1120,6 @@
     @Test
     public void testApexFailsToInstallIfApkInApexFailsToScan_Commit() throws Exception {
         int sessionId = stageSingleApk(Apex2ApkInApexSdkTargetP).assertSuccessful().getSessionId();
-        waitForIsReadyBroadcast(sessionId);
         storeSessionId(sessionId);
     }
 
@@ -1176,8 +1134,8 @@
 
     @Test
     public void testCorruptedApexFailsVerification_b146895998() throws Exception {
-        int sessionId = stageSingleApk(CorruptedApex_b146895998).assertSuccessful().getSessionId();
-        PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
+        int sessionId = stageSingleApk(CorruptedApex_b146895998).assertFailure().getSessionId();
+        PackageInstaller.SessionInfo sessionInfo = getSessionInfo(sessionId);
         assertThat(sessionInfo).isStagedSessionFailed();
     }
 
@@ -1195,8 +1153,8 @@
      */
     @Test
     public void testApexWithUnsignedPayloadFailsVerification() throws Exception {
-        int sessionId = stageSingleApk(Apex2UnsignedPayload).assertSuccessful().getSessionId();
-        PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
+        int sessionId = stageSingleApk(Apex2UnsignedPayload).assertFailure().getSessionId();
+        PackageInstaller.SessionInfo sessionInfo = getSessionInfo(sessionId);
         assertThat(sessionInfo).isStagedSessionFailed();
         assertThat(sessionInfo.getStagedSessionErrorMessage())
                 .contains("AVB footer verification failed");
@@ -1208,8 +1166,8 @@
     @Test
     public void testApexSignPayloadWithDifferentKeyFailsVerification() throws Exception {
         int sessionId = stageSingleApk(
-                Apex2SignPayloadWithDifferentKey).assertSuccessful().getSessionId();
-        PackageInstaller.SessionInfo sessionInfo = waitForBroadcast(sessionId);
+                Apex2SignPayloadWithDifferentKey).assertFailure().getSessionId();
+        PackageInstaller.SessionInfo sessionInfo = getSessionInfo(sessionId);
         assertThat(sessionInfo).isStagedSessionFailed();
         assertThat(sessionInfo.getStagedSessionErrorMessage())
                 .contains("public key doesn't match the pre-installed one");
@@ -1348,7 +1306,7 @@
 
         InstallUtils.commitExpectingFailure(
                     AssertionError.class,
-                    "Downgrade of APEX package com.android.apex.cts.shim is not allowed",
+                    "INSTALL_FAILED_VERSION_DOWNGRADE",
                     Install.single(Apex2Rebootless));
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(3);
     }
@@ -1370,7 +1328,7 @@
 
         InstallUtils.commitExpectingFailure(
                 AssertionError.class,
-                "It is forbidden to install new APEX packages",
+                "Attempting to install new APEX package",
                 Install.single(Apex2DifferentPackageName));
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
     }
@@ -1415,7 +1373,7 @@
 
         InstallUtils.commitExpectingFailure(
                 AssertionError.class,
-                "Failed collecting certificates for",
+                "Failed to collect certificates from",
                 Install.single(Apex2NoApkSignature));
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
     }
@@ -1431,6 +1389,23 @@
         assertThat(getInstalledVersion(SHIM_APEX_PACKAGE_NAME)).isEqualTo(1);
     }
 
+    @Test
+    public void testGetInactiveApexFactoryPackagesAfterApexInstall_containsNoDuplicates()
+            throws Exception {
+        int flags = (PackageManager.MATCH_APEX | PackageManager.MATCH_FACTORY_ONLY
+                | PackageManager.MATCH_UNINSTALLED_PACKAGES);
+        List<PackageInfo> packageInfos =
+                InstrumentationRegistry.getInstrumentation().getContext().getPackageManager()
+                        .getInstalledPackages(flags);
+        Set<String> foundPackages = new HashSet<>();
+        for (PackageInfo pi : packageInfos) {
+            if (foundPackages.contains(pi.packageName)) {
+                throw new AssertionError(pi.packageName + " is listed at least twice.");
+            }
+            foundPackages.add(pi.packageName);
+        }
+    }
+
     // It becomes harder to maintain this variety of install-related helper methods.
     // TODO(ioffe): refactor install-related helper methods into a separate utility.
     private static int createStagedSession() throws Exception {
@@ -1633,20 +1608,4 @@
     private static PackageInstaller.SessionInfo getSessionInfo(int sessionId) {
         return getPackageInstaller().getSessionInfo(sessionId);
     }
-
-    private void waitForIsFailedBroadcast(int sessionId) {
-        Log.i(TAG, "Waiting for session " + sessionId + " to be marked as failed");
-        PackageInstaller.SessionInfo info = waitForBroadcast(sessionId);
-        assertThat(info).isStagedSessionFailed();
-    }
-
-    private void waitForIsReadyBroadcast(int sessionId) {
-        Log.i(TAG, "Waiting for session " + sessionId + " to be ready");
-        PackageInstaller.SessionInfo info = waitForBroadcast(sessionId);
-        assertThat(info).isStagedSessionReady();
-    }
-
-    private PackageInstaller.SessionInfo waitForBroadcast(int sessionId) {
-        return InstallUtils.waitForSession(sessionId);
-    }
 }
diff --git a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java
index 8aed91b..e98eeda 100644
--- a/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java
+++ b/hostsidetests/stagedinstall/src/com/android/tests/stagedinstall/host/StagedInstallTest.java
@@ -824,6 +824,7 @@
     }
 
     @Test
+    @LargeTest
     public void testRebootlessUpdate_fromV2ToV3_sameBoot() throws Exception {
         assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
 
@@ -910,6 +911,16 @@
         runPhase("testRebootlessUpdate_targetsOlderSdk_fails");
     }
 
+    @Test
+    @LargeTest
+    public void testGetInactiveApexFactoryPackagesAfterApexInstall_containsNoDuplicates()
+            throws Exception {
+        assumeTrue("Device does not support updating APEX", mHostUtils.isApexUpdateSupported());
+
+        installV2Apex();
+        runPhase("testGetInactiveApexFactoryPackagesAfterApexInstall_containsNoDuplicates");
+    }
+
     private List<ApexInfo> readApexInfoList() throws Exception {
         File file = getDevice().pullFile("/apex/apex-info-list.xml");
         try (FileInputStream stream = new FileInputStream(file)) {
diff --git a/hostsidetests/statsdatom/Android.bp b/hostsidetests/statsdatom/Android.bp
index 6f2da5f..0a2e011 100644
--- a/hostsidetests/statsdatom/Android.bp
+++ b/hostsidetests/statsdatom/Android.bp
@@ -33,9 +33,11 @@
         "src/**/cpu/*.java",
         "src/**/devicepower/*.java",
         "src/**/devicestate/*.java",
+        "src/**/gamemanager/*.java",
         "src/**/gnss/*.java",
         "src/**/jobscheduler/*.java",
         "src/**/integrity/*.java",
+        "src/**/media/*.java",
         "src/**/memory/*.java",
         "src/**/net/*.java",
         "src/**/notification/*.java",
@@ -72,7 +74,11 @@
     data: [
         ":CtsStatsdAtomApp",
         ":CtsStatsdApp", //TODO(b/163546661): Remove once migration to new lib is complete.
-    ]
+        ":CtsAppExitTestCases",
+        ":CtsExternalServiceService",
+        ":CtsSimpleApp",
+    ],
+    per_testcase_directory: true,
 }
 
 java_library_host {
diff --git a/hostsidetests/statsdatom/apps/statsdapp/AndroidManifest.xml b/hostsidetests/statsdatom/apps/statsdapp/AndroidManifest.xml
index 99b488c..af46e36 100644
--- a/hostsidetests/statsdatom/apps/statsdapp/AndroidManifest.xml
+++ b/hostsidetests/statsdatom/apps/statsdapp/AndroidManifest.xml
@@ -41,8 +41,10 @@
     <uses-permission android:name="android.permission.WRITE_SYNC_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
-    <application android:label="@string/app_name">
+    <application android:label="@string/app_name"
+        android:appCategory="game">
         <uses-library android:name="android.test.runner"/>
         <uses-library android:name="org.apache.http.legacy"
              android:required="false"/>
diff --git a/hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/ANRActivity.java b/hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/ANRActivity.java
index 330cdb4..f9d39ab 100644
--- a/hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/ANRActivity.java
+++ b/hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/ANRActivity.java
@@ -41,7 +41,8 @@
                   SystemClock.sleep(2);
                 }
             }
-        }, new IntentFilter(ACTION_ANR));
+        }, new IntentFilter(ACTION_ANR),
+        Context.RECEIVER_EXPORTED);
 
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
                 | WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
diff --git a/hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/AtomTests.java b/hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/AtomTests.java
index 923817f..e356ea6 100644
--- a/hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/AtomTests.java
+++ b/hostsidetests/statsdatom/apps/statsdapp/src/com/android/server/cts/device/statsdatom/AtomTests.java
@@ -26,6 +26,8 @@
 import android.app.ActivityManager.RunningServiceInfo;
 import android.app.AlarmManager;
 import android.app.AppOpsManager;
+import android.app.GameManager;
+import android.app.GameState;
 import android.app.PendingIntent;
 import android.app.job.JobInfo;
 import android.app.job.JobScheduler;
@@ -223,6 +225,7 @@
         APP_OPS_ENUM_MAP.put(AppOpsManager.OPSTR_NEARBY_WIFI_DEVICES, 116);
         APP_OPS_ENUM_MAP.put(AppOpsManager.OPSTR_ESTABLISH_VPN_SERVICE, 117);
         APP_OPS_ENUM_MAP.put(AppOpsManager.OPSTR_ESTABLISH_VPN_MANAGER, 118);
+        APP_OPS_ENUM_MAP.put(AppOpsManager.OPSTR_ACCESS_RESTRICTED_SETTINGS, 119);
     }
 
     @Test
@@ -728,13 +731,36 @@
         builder.setOverrideDeadline(0);
         JobInfo job = builder.build();
 
-        long startTime = System.currentTimeMillis();
         CountDownLatch latch = StatsdJobService.resetCountDownLatch();
         js.schedule(job);
         waitForReceiver(context, 5_000, latch, null);
     }
 
     @Test
+    public void testScheduledJobPriority() throws Exception {
+        final ComponentName name =
+                new ComponentName(MY_PACKAGE_NAME, StatsdJobService.class.getName());
+
+        Context context = InstrumentationRegistry.getContext();
+        JobScheduler js = context.getSystemService(JobScheduler.class);
+        assertWithMessage("JobScheduler service not available").that(js).isNotNull();
+
+        final int[] priorities = {
+                JobInfo.PRIORITY_HIGH, JobInfo.PRIORITY_DEFAULT,
+                JobInfo.PRIORITY_LOW, JobInfo.PRIORITY_MIN};
+        for (int priority : priorities) {
+            JobInfo job = new JobInfo.Builder(priority, name)
+                    .setOverrideDeadline(0)
+                    .setPriority(priority)
+                    .build();
+
+            CountDownLatch latch = StatsdJobService.resetCountDownLatch();
+            js.schedule(job);
+            waitForReceiver(context, 5_000, latch, null);
+        }
+    }
+
+    @Test
     public void testVibratorState() {
         Context context = InstrumentationRegistry.getContext();
         Vibrator vib = context.getSystemService(Vibrator.class);
@@ -951,30 +977,43 @@
         int[] uids = {1234, appInfo.uid};
         String[] tags = {"tag1", "tag2"};
         byte[] experimentIds = {8, 1, 8, 2, 8, 3}; // Corresponds to 1, 2, 3.
+
+        int[] int32Array = {3, 6};
+        long[] int64Array = {1000L, 1002L};
+        float[] floatArray = {0.3f, 0.09f};
+        String[] stringArray = {"str1", "str2"};
+        boolean[] boolArray = {true, false};
+        int[] enumArray = {StatsLogStatsdCts.TEST_ATOM_REPORTED__STATE__OFF,
+                StatsLogStatsdCts.TEST_ATOM_REPORTED__STATE__ON};
+
         StatsLogStatsdCts.write(StatsLogStatsdCts.TEST_ATOM_REPORTED, uids, tags, 42,
                 Long.MAX_VALUE, 3.14f, "This is a basic test!", false,
-                StatsLogStatsdCts.TEST_ATOM_REPORTED__STATE__ON, experimentIds);
+                StatsLogStatsdCts.TEST_ATOM_REPORTED__STATE__ON, experimentIds, int32Array,
+                int64Array, floatArray, stringArray, boolArray, enumArray);
 
         // All nulls. Should get dropped since cts app is not in the attribution chain.
-        StatsLogStatsdCts.write(StatsLogStatsdCts.TEST_ATOM_REPORTED, null, null, 0, 0,
-                0f, null, false, StatsLogStatsdCts.TEST_ATOM_REPORTED__STATE__ON, null);
+        StatsLogStatsdCts.write(StatsLogStatsdCts.TEST_ATOM_REPORTED, null, null, 0, 0, 0f, null,
+                false, StatsLogStatsdCts.TEST_ATOM_REPORTED__STATE__ON, null, null, null, null,
+                null, null, null);
 
         // Null tag in attribution chain.
         int[] uids2 = {9999, appInfo.uid};
         String[] tags2 = {"tag9999", null};
         StatsLogStatsdCts.write(StatsLogStatsdCts.TEST_ATOM_REPORTED, uids2, tags2, 100,
                 Long.MIN_VALUE, -2.5f, "Test null uid", true,
-                StatsLogStatsdCts.TEST_ATOM_REPORTED__STATE__UNKNOWN, experimentIds);
+                StatsLogStatsdCts.TEST_ATOM_REPORTED__STATE__UNKNOWN, experimentIds, int32Array,
+                int64Array, floatArray, stringArray, boolArray, enumArray);
 
         // Non chained non-null
-        StatsLogStatsdCts.write_non_chained(StatsLogStatsdCts.TEST_ATOM_REPORTED,
-                appInfo.uid, "tag1", -256, -1234567890L, 42.01f, "Test non chained", true,
-                StatsLogStatsdCts.TEST_ATOM_REPORTED__STATE__OFF, experimentIds);
+        StatsLogStatsdCts.write_non_chained(StatsLogStatsdCts.TEST_ATOM_REPORTED, appInfo.uid,
+                "tag1", -256, -1234567890L, 42.01f, "Test non chained", true,
+                StatsLogStatsdCts.TEST_ATOM_REPORTED__STATE__OFF, experimentIds, new int[0],
+                new long[0], new float[0], new String[0], new boolean[0], new int[0]);
 
         // Non chained all null
         StatsLogStatsdCts.write_non_chained(StatsLogStatsdCts.TEST_ATOM_REPORTED, appInfo.uid, null,
-                0, 0, 0f, null, true, StatsLogStatsdCts.TEST_ATOM_REPORTED__STATE__OFF, null);
-
+                0, 0, 0f, null, true, StatsLogStatsdCts.TEST_ATOM_REPORTED__STATE__OFF, null, null,
+                null, null, null, null, null);
     }
 
     /**
@@ -1179,4 +1218,11 @@
             }
         }
     }
+
+    @Test
+    public void testGameState() throws Exception {
+        Context context = InstrumentationRegistry.getContext();
+        GameManager gameManager = context.getSystemService(GameManager.class);
+        gameManager.setGameState(new GameState(true, GameState.MODE_CONTENT, 1, 2));
+    }
 }
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/appexit/AppExitHostTest.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/appexit/AppExitHostTest.java
index e8c42d1..9abd8c2 100644
--- a/hostsidetests/statsdatom/src/android/cts/statsdatom/appexit/AppExitHostTest.java
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/appexit/AppExitHostTest.java
@@ -33,15 +33,23 @@
 import com.android.os.AtomsProto;
 import com.android.os.StatsLog;
 import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
 import com.android.tradefed.testtype.DeviceTestCase;
 import com.android.tradefed.testtype.IBuildReceiver;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
 
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class AppExitHostTest extends DeviceTestCase implements IBuildReceiver {
+@RunWith(DeviceJUnit4ClassRunner.class)
+public class AppExitHostTest extends BaseHostJUnit4Test implements IBuildReceiver {
     private static final String TEST_PKG = "android.app.cts.appexit";
     private static final String HELPER_PKG1 = "android.externalservice.service";
     private static final String HELPER_PKG2 = "com.android.cts.launcherapps.simpleapp";
@@ -55,9 +63,8 @@
 
     private IBuildInfo mCtsBuild;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
         assertThat(mCtsBuild).isNotNull();
         ConfigUtils.removeConfig(getDevice());
         ReportUtils.clearReports(getDevice());
@@ -71,8 +78,8 @@
         getDevice().executeShellCommand("pm grant " + TEST_PKG + " " + PERM_READ_LOGS);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         ConfigUtils.removeConfig(getDevice());
         ReportUtils.clearReports(getDevice());
         getDevice().executeShellCommand("pm revoke " + TEST_PKG + " " + PERM_PACKAGE_USAGE_STATS);
@@ -80,7 +87,6 @@
         DeviceUtils.uninstallTestApp(getDevice(), TEST_PKG);
         DeviceUtils.uninstallTestApp(getDevice(), HELPER_PKG1);
         DeviceUtils.uninstallTestApp(getDevice(), HELPER_PKG2);
-        super.tearDown();
     }
 
     @Override
@@ -88,6 +94,7 @@
         mCtsBuild = buildInfo;
     }
 
+    @Test
     public void testLogStatsdPermChanged() throws Exception {
         final String helperPackage = HELPER_PKG2;
         final int expectedUid = getAppUid(helperPackage);
@@ -101,6 +108,7 @@
         });
     }
 
+    @Test
     public void testLogStatsdOther() throws Exception {
         final String helperPackage = HELPER_PKG1;
         final int expectedUid = getAppUid(TEST_PKG);
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/appops/AppOpsTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/appops/AppOpsTests.java
index e550db6..6547abf 100644
--- a/hostsidetests/statsdatom/src/android/cts/statsdatom/appops/AppOpsTests.java
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/appops/AppOpsTests.java
@@ -41,26 +41,32 @@
     private static final int NUM_APP_OPS = AtomsProto.AttributedAppOps.getDefaultInstance().getOp().
             getDescriptorForType().getValues().size() - 1;
 
+    private static final int APP_OP_RECORD_AUDIO = 27;
+    private static final int APP_OP_RECORD_AUDIO_HOTWORD = 102;
+
+    private static final String FEATURE_AUTOMOTIVE = "android.hardware.type.automotive";
+    private static final String FEATURE_LEANBACK_ONLY = "android.software.leanback_only";
+
     /**
      * Some ops are only available to specific dynamic uids and are otherwise transformed to less
      * privileged ops. For example, RECORD_AUDIO_HOTWORD is downgraded to RECORD_AUDIO. This stores
      * a mapping from an op to the op it can be transformed from.
      */
-    private static final Map<Integer, Integer> TRANSFORMED_FROM_OP = new HashMap<>();
-
-    static {
-        final int APP_OP_RECORD_AUDIO = 27;
-        final int APP_OP_RECORD_AUDIO_HOTWORD = 102;
-
-        // Temporarily commented out until the Trusted Hotword requirement is enforced again.
-//        TRANSFORMED_FROM_OP.put(APP_OP_RECORD_AUDIO, APP_OP_RECORD_AUDIO_HOTWORD);
-    }
+    private final Map<Integer, Integer> mTransformedFromOp = new HashMap<>();
 
     private IBuildInfo mCtsBuild;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+
+        mTransformedFromOp.clear();
+        // The hotword op is allowed to all UIDs on TV and Auto devices.
+        if (!(DeviceUtils.hasFeature(getDevice(), FEATURE_AUTOMOTIVE)
+                || DeviceUtils.hasFeature(getDevice(), FEATURE_LEANBACK_ONLY))) {
+            mTransformedFromOp.put(APP_OP_RECORD_AUDIO, APP_OP_RECORD_AUDIO_HOTWORD);
+        }
+
         assertThat(mCtsBuild).isNotNull();
         ConfigUtils.removeConfig(getDevice());
         ReportUtils.clearReports(getDevice());
@@ -94,7 +100,7 @@
         Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
 
         ArrayList<Integer> expectedOps = new ArrayList<>();
-        Set<Integer> transformedOps = new HashSet<>(TRANSFORMED_FROM_OP.values());
+        Set<Integer> transformedOps = new HashSet<>(mTransformedFromOp.values());
         for (int i = 0; i < NUM_APP_OPS; i++) {
             if (!transformedOps.contains(i)) {
                 expectedOps.add(i);
@@ -133,10 +139,10 @@
         assertWithMessage("Logging app op ids are missing in report.").that(expectedOps).isEmpty();
     }
 
-    private static int computeExpectedTransformedNoted(int op) {
-        if (!TRANSFORMED_FROM_OP.containsKey(op)) {
+    private int computeExpectedTransformedNoted(int op) {
+        if (!mTransformedFromOp.containsKey(op)) {
             return 0;
         }
-        return TRANSFORMED_FROM_OP.get(op) + 1;
+        return mTransformedFromOp.get(op) + 1;
     }
 }
\ No newline at end of file
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/batterystats/BatteryUsageStatsTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/batterystats/BatteryUsageStatsTests.java
index dd179eb..465af4d 100644
--- a/hostsidetests/statsdatom/src/android/cts/statsdatom/batterystats/BatteryUsageStatsTests.java
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/batterystats/BatteryUsageStatsTests.java
@@ -137,6 +137,35 @@
         }
 
         assertThat(hasAppData).isTrue();
+
+        final int testUid = DeviceUtils.getStatsdTestAppUid(getDevice());
+        BatteryUsageStatsAtomsProto.UidBatteryConsumer testConsumer = null;
+        for (BatteryUsageStatsAtomsProto.UidBatteryConsumer consumer : uidBatteryConsumers) {
+            if (consumer.getUid() == testUid) {
+                testConsumer = consumer;
+                break;
+            }
+        }
+
+        // If the test app consumed a measurable amount of power, the break-up
+        // by process state should also be present in the atom.
+        if (testConsumer != null
+                && testConsumer.getBatteryConsumerData().getTotalConsumedPowerDeciCoulombs() > 0) {
+            boolean hasProcStateData = false;
+            for (int i = 0; i < testConsumer.getBatteryConsumerData().getSlicesCount(); i++) {
+                final BatteryConsumerData.PowerComponentUsageSlice slice =
+                        testConsumer.getBatteryConsumerData().getSlices(i);
+                if (slice.getProcessState()
+                        != BatteryConsumerData.PowerComponentUsageSlice.ProcessState.UNSPECIFIED
+                        && (slice.getPowerComponent().getPowerDeciCoulombs() > 0
+                        || slice.getPowerComponent().getDurationMillis() > 0)) {
+                    hasProcStateData = true;
+                    break;
+                }
+            }
+
+            assertThat(hasProcStateData).isTrue();
+        }
     }
 
     private boolean hasBattery() throws DeviceNotAvailableException  {
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/bluetooth/BluetoothStatsTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/bluetooth/BluetoothStatsTests.java
index ca75fc3..c84d60e 100644
--- a/hostsidetests/statsdatom/src/android/cts/statsdatom/bluetooth/BluetoothStatsTests.java
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/bluetooth/BluetoothStatsTests.java
@@ -82,7 +82,7 @@
         Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
 
         List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
-        AtomTestUtils.assertStatesOccurred(stateSet, data, expectedWait,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, expectedWait,
                 atom -> atom.getBleScanStateChanged().getState().getNumber());
     }
 
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/gamemanager/GameManagerStatsTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/gamemanager/GameManagerStatsTests.java
new file mode 100644
index 0000000..d457195
--- /dev/null
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/gamemanager/GameManagerStatsTests.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2021 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 android.cts.statsdatom.gamemanager;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.cts.statsdatom.lib.AtomTestUtils;
+import android.cts.statsdatom.lib.ConfigUtils;
+import android.cts.statsdatom.lib.DeviceUtils;
+import android.cts.statsdatom.lib.ReportUtils;
+
+import com.android.os.AtomsProto;
+import com.android.os.AtomsProto.GameStateChanged.State;
+import com.android.os.StatsLog;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+import java.util.List;
+
+/**
+ * Test for Game Manager stats.
+ *
+ *  <p>Build/Install/Run:
+ *  atest CtsStatsdAtomHostTestCases:GameManagerStatsTests
+ */
+public class GameManagerStatsTests extends DeviceTestCase implements IBuildReceiver {
+    private IBuildInfo mCtsBuild;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        assertThat(mCtsBuild).isNotNull();
+        ConfigUtils.removeConfig(getDevice());
+        ReportUtils.clearReports(getDevice());
+        DeviceUtils.installStatsdTestApp(getDevice(), mCtsBuild);
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        ConfigUtils.removeConfig(getDevice());
+        ReportUtils.clearReports(getDevice());
+        DeviceUtils.uninstallStatsdTestApp(getDevice());
+        super.tearDown();
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mCtsBuild = buildInfo;
+    }
+
+    public void testGameStateStatsd() throws Exception {
+        ConfigUtils.uploadConfigForPushedAtom(getDevice(), DeviceUtils.STATSD_ATOM_TEST_PKG,
+                AtomsProto.Atom.GAME_STATE_CHANGED_FIELD_NUMBER);
+        DeviceUtils.runDeviceTestsOnStatsdApp(getDevice(), ".AtomTests", "testGameState");
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
+
+        List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
+        assertThat(data.size()).isAtLeast(1);
+        AtomsProto.GameStateChanged a0 = data.get(0).getAtom().getGameStateChanged();
+        assertThat(a0.getUid()).isGreaterThan(10000);  // Not a system service UID.
+        assertThat(a0.getPackageName()).isEqualTo(DeviceUtils.STATSD_ATOM_TEST_PKG);
+        assertThat(a0.getBoostEnabled()).isEqualTo(false);  // Test app does not qualify.
+        assertThat(a0.getIsLoading()).isEqualTo(true);
+        assertThat(a0.getState()).isEqualTo(State.MODE_CONTENT);
+        assertThat(a0.getLabel()).isEqualTo(1);
+        assertThat(a0.getQuality()).isEqualTo(2);
+    }
+}
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/gamemanager/OWNERS b/hostsidetests/statsdatom/src/android/cts/statsdatom/gamemanager/OWNERS
new file mode 100644
index 0000000..cb0ba72
--- /dev/null
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/gamemanager/OWNERS
@@ -0,0 +1,2 @@
+# Owners of the GameStateChanged atom
+jimblackler@google.com
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/jobscheduler/JobSchedulerStatsTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/jobscheduler/JobSchedulerStatsTests.java
index d282ffb..efc1ae5 100644
--- a/hostsidetests/statsdatom/src/android/cts/statsdatom/jobscheduler/JobSchedulerStatsTests.java
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/jobscheduler/JobSchedulerStatsTests.java
@@ -29,12 +29,18 @@
 import com.android.tradefed.testtype.DeviceTestCase;
 import com.android.tradefed.testtype.IBuildReceiver;
 
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 public class JobSchedulerStatsTests extends DeviceTestCase implements IBuildReceiver {
+    private static final Set<Integer> STATE_SCHEDULE = new HashSet<>(
+            List.of(AtomsProto.ScheduledJobStateChanged.State.SCHEDULED_VALUE));
+    private static final Set<Integer> STATE_START = new HashSet<>(
+            List.of(AtomsProto.ScheduledJobStateChanged.State.STARTED_VALUE));
+    private static final Set<Integer> STATE_FINISH = new HashSet<>(
+            List.of(AtomsProto.ScheduledJobStateChanged.State.FINISHED_VALUE));
+
     private static final String JOB_NAME =
             "com.android.server.cts.device.statsdatom/.StatsdJobService";
 
@@ -65,15 +71,9 @@
 
     public void testScheduledJobState() throws Exception {
         final int atomTag = AtomsProto.Atom.SCHEDULED_JOB_STATE_CHANGED_FIELD_NUMBER;
-        Set<Integer> jobSchedule = new HashSet<>(
-                Arrays.asList(AtomsProto.ScheduledJobStateChanged.State.SCHEDULED_VALUE));
-        Set<Integer> jobOn = new HashSet<>(
-                Arrays.asList(AtomsProto.ScheduledJobStateChanged.State.STARTED_VALUE));
-        Set<Integer> jobOff = new HashSet<>(
-                Arrays.asList(AtomsProto.ScheduledJobStateChanged.State.FINISHED_VALUE));
 
         // Add state sets to the list in order.
-        List<Set<Integer>> stateSet = Arrays.asList(jobSchedule, jobOn, jobOff);
+        List<Set<Integer>> stateSet = List.of(STATE_SCHEDULE, STATE_START, STATE_FINISH);
 
         ConfigUtils.uploadConfigForPushedAtomWithUid(getDevice(), DeviceUtils.STATSD_ATOM_TEST_PKG,
                 atomTag, /*useUidAttributionChain=*/true);
@@ -83,7 +83,7 @@
         // Sorted list of events in order in which they occurred.
         List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
 
-        AtomTestUtils.assertStatesOccurred(stateSet, data, 0,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, 0,
                 atom -> atom.getScheduledJobStateChanged().getState().getNumber());
 
         for (StatsLog.EventMetricData e : data) {
@@ -91,4 +91,35 @@
                     .isEqualTo(JOB_NAME);
         }
     }
+
+    public void testScheduledJobStatePriority() throws Exception {
+        final int atomTag = AtomsProto.Atom.SCHEDULED_JOB_STATE_CHANGED_FIELD_NUMBER;
+
+        // Add state sets to the list in order.
+        List<Set<Integer>> stateSet = List.of(
+                STATE_SCHEDULE, STATE_START, STATE_FINISH,
+                STATE_SCHEDULE, STATE_START, STATE_FINISH,
+                STATE_SCHEDULE, STATE_START, STATE_FINISH,
+                STATE_SCHEDULE, STATE_START, STATE_FINISH
+        );
+
+        ConfigUtils.uploadConfigForPushedAtomWithUid(getDevice(), DeviceUtils.STATSD_ATOM_TEST_PKG,
+                atomTag, /*useUidAttributionChain=*/true);
+        DeviceUtils.allowImmediateSyncs(getDevice());
+        DeviceUtils.runDeviceTestsOnStatsdApp(getDevice(), ".AtomTests",
+                "testScheduledJobPriority");
+
+        // Sorted list of events in order in which they occurred.
+        List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
+
+        AtomTestUtils.assertStatesOccurred(stateSet, data,
+                atom -> atom.getScheduledJobStateChanged().getState().getNumber());
+
+        for (StatsLog.EventMetricData e : data) {
+            assertThat(e.getAtom().getScheduledJobStateChanged().getJobName())
+                    .isEqualTo(JOB_NAME);
+            assertThat(e.getAtom().getScheduledJobStateChanged().getRequestedPriority())
+                    .isEqualTo(e.getAtom().getScheduledJobStateChanged().getJobId());
+        }
+    }
 }
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/lib/AtomTestUtils.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/lib/AtomTestUtils.java
index dbb6699..3b2aa8c 100644
--- a/hostsidetests/statsdatom/src/android/cts/statsdatom/lib/AtomTestUtils.java
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/lib/AtomTestUtils.java
@@ -24,6 +24,7 @@
 import com.android.tradefed.device.DeviceNotAvailableException;
 import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.log.LogUtil;
+import com.android.utils.SparseIntArray;
 
 import com.google.common.collect.Range;
 
@@ -56,6 +57,37 @@
     }
 
     /**
+     * Asserts that each set of states in {@code stateSets} occurs in {@code data} without assuming
+     * the order of occurrence.
+     *
+     * @param stateSets        A list of set of states, where each set represents an equivalent
+     *                         state of the device for the purpose of CTS.
+     * @param data             list of EventMetricData from statsd, produced by
+     *                         getReportMetricListData()
+     * @param getStateFromAtom expression that takes in an Atom and returns the state it contains
+     */
+    public static void assertStatesOccurred(List<Set<Integer>> stateSets,
+            List<StatsLog.EventMetricData> data,
+            Function<AtomsProto.Atom, Integer> getStateFromAtom) {
+        // Sometimes, there are more events than there are states.
+        // Eg: When the screen turns off, it may go into OFF and then DOZE immediately.
+        assertWithMessage("Number of result states").that(data.size()).isAtLeast(stateSets.size());
+        final SparseIntArray dataStateCount = new SparseIntArray();
+        for (StatsLog.EventMetricData emd : data) {
+            final int state = getStateFromAtom.apply(emd.getAtom());
+            dataStateCount.put(state, dataStateCount.get(state, 0) + 1);
+        }
+        for (Set<Integer> states : stateSets) {
+            for (int state : states) {
+                final int count = dataStateCount.get(state);
+                assertWithMessage("Remaining count of result state (%s)", state)
+                        .that(count).isGreaterThan(0);
+                dataStateCount.put(state, count - 1);
+            }
+        }
+    }
+
+    /**
      * Asserts that each set of states in stateSets occurs at least once in data.
      * Asserts that the states in data occur in the same order as the sets in stateSets.
      *
@@ -69,12 +101,12 @@
      *                         assertion.
      * @param getStateFromAtom expression that takes in an Atom and returns the state it contains
      */
-    public static void assertStatesOccurred(List<Set<Integer>> stateSets,
+    public static void assertStatesOccurredInOrder(List<Set<Integer>> stateSets,
             List<StatsLog.EventMetricData> data,
             int wait, Function<AtomsProto.Atom, Integer> getStateFromAtom) {
         // Sometimes, there are more events than there are states.
         // Eg: When the screen turns off, it may go into OFF and then DOZE immediately.
-        assertWithMessage("Too few states found").that(data.size()).isAtLeast(stateSets.size());
+        assertWithMessage("Number of result states").that(data.size()).isAtLeast(stateSets.size());
         int stateSetIndex = 0; // Tracks which state set we expect the data to be in.
         for (int dataIndex = 0; dataIndex < data.size(); dataIndex++) {
             AtomsProto.Atom atom = data.get(dataIndex).getAtom();
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/media/MediaCapabilitiesTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/media/MediaCapabilitiesTests.java
new file mode 100644
index 0000000..1b6aadb
--- /dev/null
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/media/MediaCapabilitiesTests.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2021 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 android.cts.statsdatom.media;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.cts.statsdatom.lib.AtomTestUtils;
+import android.cts.statsdatom.lib.ConfigUtils;
+import android.cts.statsdatom.lib.DeviceUtils;
+import android.cts.statsdatom.lib.ReportUtils;
+import android.stats.mediametrics.Mediametrics;
+
+import com.android.os.AtomsProto;
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.testtype.DeviceTestCase;
+import com.android.tradefed.testtype.IBuildReceiver;
+
+
+import java.util.List;
+
+public class MediaCapabilitiesTests extends DeviceTestCase implements IBuildReceiver {
+    private static final String FEATURE_TV = "android.hardware.type.television";
+    private IBuildInfo mCtsBuild;
+
+    // Cache original settings which are modified during test
+    String mIsDtsEnabled;
+    String mIsDolbyTrueHdEnabled;
+    String mEncodedSurroundMode;
+    String mUserPrefDisplayMode;
+    String mMatchContentFrameRatePref;
+    String mUserDisabledHdrTypes;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        assertThat(mCtsBuild).isNotNull();
+        ConfigUtils.removeConfig(getDevice());
+        ReportUtils.clearReports(getDevice());
+        DeviceUtils.installStatsdTestApp(getDevice(), mCtsBuild);
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
+        cacheOriginalSettings();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        restoreOriginalSettings();
+        ConfigUtils.removeConfig(getDevice());
+        ReportUtils.clearReports(getDevice());
+        DeviceUtils.uninstallStatsdTestApp(getDevice());
+        super.tearDown();
+    }
+
+    @Override
+    public void setBuild(IBuildInfo buildInfo) {
+        mCtsBuild = buildInfo;
+    }
+
+    public void testSurroundSoundCapabilities() throws Exception {
+        // Run this test only on TVs
+        if (!DeviceUtils.hasFeature(getDevice(), FEATURE_TV)) return;
+
+        ConfigUtils.uploadConfigForPulledAtom(getDevice(), DeviceUtils.STATSD_ATOM_TEST_PKG,
+                AtomsProto.Atom.MEDIA_CAPABILITIES_FIELD_NUMBER);
+
+        // Setting the values of audio setting via shell commands
+        getDevice().executeShellCommand(
+                "cmd audio set-surround-format-enabled 7 true");
+        getDevice().executeShellCommand(
+                "cmd audio set-surround-format-enabled 14 false");
+        getDevice().executeShellCommand("cmd audio set-encoded-surround-mode 2");
+        Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
+
+        // Trigger atom pull.
+        AtomTestUtils.sendAppBreadcrumbReportedAtom(getDevice());
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
+
+        // The list of atoms will be empty if the atom is not supported.
+        List<AtomsProto.Atom> atoms = ReportUtils.getGaugeMetricAtoms(getDevice());
+
+        for (AtomsProto.Atom atom : atoms) {
+            assertThat(atom.getMediaCapabilities().getSurroundEncodings().getAudioEncodingsCount())
+                    .isAtLeast(1);
+            assertEquals(Mediametrics.EncodedSurroundOutputMode.ENCODED_SURROUND_OUTPUT_NEVER,
+                    atom.getMediaCapabilities().getSurroundOutputMode());
+            assertThat(Mediametrics.AudioEncoding.ENCODING_DTS).isIn(
+                    atom.getMediaCapabilities()
+                            .getUserEnabledSurroundEncodings().getAudioEncodingsList());
+            assertThat(Mediametrics.AudioEncoding.ENCODING_DOLBY_TRUEHD).isNotIn(
+                    atom.getMediaCapabilities()
+                            .getUserEnabledSurroundEncodings().getAudioEncodingsList());
+        }
+    }
+
+    public void testDisplayCapabilities() throws Exception {
+        // Run this test only on TVs
+        if (!DeviceUtils.hasFeature(getDevice(), FEATURE_TV)) return;
+
+        ConfigUtils.uploadConfigForPulledAtom(getDevice(), DeviceUtils.STATSD_ATOM_TEST_PKG,
+                AtomsProto.Atom.MEDIA_CAPABILITIES_FIELD_NUMBER);
+
+        // Setting the values of display setting via shell commands
+        getDevice().executeShellCommand(
+                "cmd display set-user-preferred-display-mode 720 1020 60.0f");
+        getDevice().executeShellCommand("cmd display set-match-content-frame-rate-pref 2");
+        getDevice().executeShellCommand("cmd display set-user-disabled-hdr-types 1 2");
+        Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
+
+        // Trigger atom pull.
+        AtomTestUtils.sendAppBreadcrumbReportedAtom(getDevice());
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
+
+        // The list of atoms will be empty if the atom is not supported.
+        List<AtomsProto.Atom> atoms = ReportUtils.getGaugeMetricAtoms(getDevice());
+
+        for (AtomsProto.Atom atom : atoms) {
+            assertThat(atom.getMediaCapabilities().getSinkDisplayModes().getDisplayModesCount())
+                    .isAtLeast(1);
+            assertEquals(720, atom.getMediaCapabilities().getUserPreferredResolutionHeight());
+            assertEquals(1020, atom.getMediaCapabilities().getUserPreferredResolutionWidth());
+            assertEquals(60.0f, atom.getMediaCapabilities().getUserPreferredRefreshRate());
+            assertEquals(Mediametrics.MatchContentFrameRatePreference
+                            .MATCH_CONTENT_FRAMERATE_SEAMLESSS_ONLY,
+                    atom.getMediaCapabilities().getMatchContentRefreshRatePreference());
+            assertThat(
+                    atom.getMediaCapabilities().getUserDisabledHdrFormats().getHdrFormats(0))
+                    .isAnyOf(
+                            Mediametrics.HdrFormat.HDR_TYPE_DOLBY_VISION,
+                            Mediametrics.HdrFormat.HDR_TYPE_HDR10);
+            assertThat(
+                    atom.getMediaCapabilities().getUserDisabledHdrFormats().getHdrFormats(1))
+                    .isAnyOf(
+                            Mediametrics.HdrFormat.HDR_TYPE_DOLBY_VISION,
+                            Mediametrics.HdrFormat.HDR_TYPE_HDR10);
+        }
+    }
+
+    private void cacheOriginalSettings() throws DeviceNotAvailableException {
+        mIsDtsEnabled = getDevice().executeShellCommand(
+                "cmd audio get-is-surround-format-enabled 7").split(":")[1].trim();
+        mIsDolbyTrueHdEnabled = getDevice().executeShellCommand(
+                "cmd audio get-is-surround-format-enabled 14").split(":")[1].trim();
+        mEncodedSurroundMode = getDevice().executeShellCommand(
+                "cmd audio get-encoded-surround-mode").split(":")[1].trim();
+
+        // Store the original value of settings
+        mUserPrefDisplayMode = getDevice().executeShellCommand(
+                "cmd display get-user-preferred-display-mode").split(":")[1].trim();
+        mMatchContentFrameRatePref = getDevice().executeShellCommand(
+                "cmd display get-match-content-frame-rate-pref").split(":")[1].trim();
+        mUserDisabledHdrTypes = getDevice().executeShellCommand(
+                "cmd display get-user-disabled-hdr-types").split(":")[1].trim();
+        mUserDisabledHdrTypes = mUserDisabledHdrTypes.replace("[", "");
+        mUserDisabledHdrTypes = mUserDisabledHdrTypes.replace("]", "");
+        mUserDisabledHdrTypes = mUserDisabledHdrTypes.replace(",", " ");
+
+    }
+
+    private void restoreOriginalSettings() throws DeviceNotAvailableException {
+        getDevice().executeShellCommand(
+                "cmd audio set-surround-format-enabled 7 " + mIsDtsEnabled);
+        getDevice().executeShellCommand(
+                "cmd audio set-surround-format-enabled 14 " + mIsDolbyTrueHdEnabled);
+        getDevice().executeShellCommand(
+                "cmd audio set-encoded-surround-mode " + mEncodedSurroundMode);
+
+        if (mUserPrefDisplayMode.equals("null")) {
+            getDevice().executeShellCommand(
+                    "cmd display clear-user-preferred-display-mode");
+        } else {
+            getDevice().executeShellCommand(
+                    "cmd display set-user-preferred-display-mode " + mUserPrefDisplayMode);
+        }
+        getDevice().executeShellCommand("cmd display set-match-content-frame-rate-pref "
+                + mMatchContentFrameRatePref);
+        getDevice().executeShellCommand("cmd display set-user-disabled-hdr-types "
+                + mUserDisabledHdrTypes);
+    }
+}
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/media/OWNERS b/hostsidetests/statsdatom/src/android/cts/statsdatom/media/OWNERS
new file mode 100644
index 0000000..5af70bb
--- /dev/null
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/media/OWNERS
@@ -0,0 +1,2 @@
+kritidang@google.com
+blindahl@google.com
\ No newline at end of file
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/notification/NotificationStatsTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/notification/NotificationStatsTests.java
index d08eae9..fe5a3e4 100644
--- a/hostsidetests/statsdatom/src/android/cts/statsdatom/notification/NotificationStatsTests.java
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/notification/NotificationStatsTests.java
@@ -83,7 +83,7 @@
             assertTrue(pref.hasVisibility());
             assertTrue(pref.hasUserLockedFields());
             if (pref.getUid() == uid) {
-                assertThat(pref.getImportance()).isEqualTo(-1000);  //UNSPECIFIED_IMPORTANCE
+                assertThat(pref.getImportance()).isEqualTo(3);  //IMPORTANCE_EDULT
                 assertThat(pref.getVisibility()).isEqualTo(-1000);  //UNSPECIFIED_VISIBILITY
                 foundTestPackagePreferences = true;
             }
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/HostAtomTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/HostAtomTests.java
index ee1d0e0..8b6f991 100644
--- a/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/HostAtomTests.java
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/HostAtomTests.java
@@ -28,16 +28,12 @@
 import android.platform.test.annotations.RestrictedBuildTest;
 import android.server.DeviceIdleModeEnum;
 import android.view.DisplayStateEnum;
-import android.telephony.NetworkTypeEnum;
 
-import com.android.internal.os.StatsdConfigProto.StatsdConfig;
 import com.android.os.AtomsProto.AppBreadcrumbReported;
 import com.android.os.AtomsProto.Atom;
 import com.android.os.AtomsProto.BatterySaverModeStateChanged;
 import com.android.os.AtomsProto.BuildInformation;
 import com.android.os.AtomsProto.ConnectivityStateChanged;
-import com.android.os.AtomsProto.SimSlotState;
-import com.android.os.AtomsProto.SupportedRadioAccessFamily;
 import com.android.os.StatsLog.ConfigMetricsReportList;
 import com.android.os.StatsLog.EventMetricData;
 import com.android.tradefed.build.IBuildInfo;
@@ -50,15 +46,9 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
-import java.util.Queue;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Statsd atom tests that are done via adb (hostside).
@@ -149,7 +139,7 @@
         // Restores AoD to initial state.
         setAodState(aodState);
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_LONG,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_LONG,
                 atom -> atom.getScreenStateChanged().getState().getNumber());
     }
 
@@ -199,7 +189,7 @@
         Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
                 atom -> atom.getChargingStateChanged().getState().getNumber());
     }
 
@@ -255,7 +245,7 @@
         Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_LONG,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_LONG,
                 atom -> atom.getPluggedStateChanged().getState().getNumber());
     }
 
@@ -263,6 +253,7 @@
         if (DeviceUtils.hasFeature(getDevice(), FEATURE_AUTOMOTIVE)) return;
         // Setup, set battery level to full.
         setBatteryLevel(100);
+        DeviceUtils.flushBatteryStatsHandlers(getDevice());
         Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
 
         final int atomTag = Atom.BATTERY_LEVEL_CHANGED_FIELD_NUMBER;
@@ -282,15 +273,20 @@
 
         // Trigger events in same order.
         setBatteryLevel(2);
-        Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
+        DeviceUtils.flushBatteryStatsHandlers(getDevice());
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
         setBatteryLevel(25);
-        Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
+        DeviceUtils.flushBatteryStatsHandlers(getDevice());
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
         setBatteryLevel(50);
-        Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
+        DeviceUtils.flushBatteryStatsHandlers(getDevice());
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
         setBatteryLevel(75);
-        Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
+        DeviceUtils.flushBatteryStatsHandlers(getDevice());
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
         setBatteryLevel(100);
-        Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
+        DeviceUtils.flushBatteryStatsHandlers(getDevice());
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
 
         // Sorted list of events in order in which they occurred.
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
@@ -300,7 +296,7 @@
         Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_LONG,
                 atom -> atom.getBatteryLevelChanged().getBatteryLevel());
     }
 
@@ -336,7 +332,7 @@
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
                 atom -> atom.getDeviceIdleModeStateChanged().getState().getNumber());
     }
 
@@ -370,7 +366,7 @@
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_LONG,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_LONG,
                 atom -> atom.getBatterySaverModeStateChanged().getState().getNumber());
     }
 
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/ProcStateAtomTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/ProcStateAtomTests.java
index 11353ce..2608ca8 100644
--- a/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/ProcStateAtomTests.java
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/ProcStateAtomTests.java
@@ -158,7 +158,7 @@
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
         AtomTestUtils.popUntilFind(data, onStates,
                 PROC_STATE_FUNCTION); // clear out initial proc states.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, waitTime, PROC_STATE_FUNCTION);
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, waitTime, PROC_STATE_FUNCTION);
     }
 
     public void testForeground() throws Exception {
@@ -177,7 +177,7 @@
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
         AtomTestUtils.popUntilFind(data, onStates,
                 PROC_STATE_FUNCTION); // clear out initial proc states.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, 0, PROC_STATE_FUNCTION);
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, 0, PROC_STATE_FUNCTION);
     }
 
     public void testBackground() throws Exception {
@@ -195,7 +195,7 @@
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
         AtomTestUtils.popUntilFind(data, onStates,
                 PROC_STATE_FUNCTION); // clear out initial proc states.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, waitTime, PROC_STATE_FUNCTION);
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, waitTime, PROC_STATE_FUNCTION);
     }
 
     public void testTop() throws Exception {
@@ -214,7 +214,7 @@
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
         AtomTestUtils.popUntilFind(data, onStates,
                 PROC_STATE_FUNCTION); // clear out initial proc states.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, waitTime, PROC_STATE_FUNCTION);
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, waitTime, PROC_STATE_FUNCTION);
     }
 
     public void testTopSleeping() throws Exception {
@@ -244,7 +244,7 @@
         // reset screen back on
         DeviceUtils.turnScreenOn(getDevice());
         // Don't check the wait time, since it's up to the system how long top sleeping persists.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, 0, PROC_STATE_FUNCTION);
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, 0, PROC_STATE_FUNCTION);
     }
 
     public void testCached() throws Exception {
@@ -276,7 +276,7 @@
         // Now clear out the bg state from step #2 (since we are interested in the cache after it).
         AtomTestUtils.popUntilFind(data, onStates, PROC_STATE_FUNCTION);
         // The result is that data should start at step #3, definitively in a cached state.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, 1_000, PROC_STATE_FUNCTION);
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, 1_000, PROC_STATE_FUNCTION);
     }
 
     public void testValidityOfStates() throws Exception {
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/UidAtomTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/UidAtomTests.java
index 9a03125..33422c1 100644
--- a/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/UidAtomTests.java
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/statsd/UidAtomTests.java
@@ -37,7 +37,6 @@
 import com.android.os.AtomsProto.AttributionNode;
 import com.android.os.AtomsProto.AudioStateChanged;
 import com.android.os.AtomsProto.CameraStateChanged;
-import com.android.os.AtomsProto.DeviceCalculatedPowerBlameUid;
 import com.android.os.AtomsProto.FlashlightStateChanged;
 import com.android.os.AtomsProto.ForegroundServiceAppOpSessionEnded;
 import com.android.os.AtomsProto.ForegroundServiceStateChanged;
@@ -57,8 +56,8 @@
 import com.android.tradefed.testtype.IBuildReceiver;
 import com.android.tradefed.util.Pair;
 
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -308,11 +307,15 @@
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_LONG,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_LONG,
                 atom -> atom.getCameraStateChanged().getState().getNumber());
     }
 
     public void testDeviceCalculatedPowerUse() throws Exception {
+        if (DeviceUtils.hasFeature(getDevice(), FEATURE_TV)) {
+            // Skip TVs because they do not have batteries.
+            return;
+        }
         if (!DeviceUtils.hasFeature(getDevice(), FEATURE_LEANBACK_ONLY)) return;
 
         ConfigUtils.uploadConfigForPulledAtom(getDevice(), DeviceUtils.STATSD_ATOM_TEST_PKG,
@@ -331,46 +334,6 @@
         DeviceUtils.resetBatteryStatus(getDevice());
     }
 
-
-    public void testDeviceCalculatedPowerBlameUid() throws Exception {
-        if (!DeviceUtils.hasFeature(getDevice(), FEATURE_LEANBACK_ONLY)) return;
-        if (!DeviceUtils.hasBattery(getDevice())) {
-            return;
-        }
-        String kernelVersion = getDevice().executeShellCommand("uname -r");
-        if (kernelVersion.contains("3.18")) {
-            LogUtil.CLog.d("Skipping calculated power blame uid test.");
-            return;
-        }
-        ConfigUtils.uploadConfigForPulledAtom(getDevice(), DeviceUtils.STATSD_ATOM_TEST_PKG,
-                Atom.DEVICE_CALCULATED_POWER_BLAME_UID_FIELD_NUMBER);
-        DeviceUtils.unplugDevice(getDevice());
-
-        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
-        DeviceUtils.runDeviceTestsOnStatsdApp(getDevice(), ".AtomTests", "testSimpleCpu");
-        Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
-        AtomTestUtils.sendAppBreadcrumbReportedAtom(getDevice());
-        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
-
-        List<Atom> atomList = ReportUtils.getGaugeMetricAtoms(getDevice());
-        boolean uidFound = false;
-        int uid = DeviceUtils.getStatsdTestAppUid(getDevice());
-        long uidPower = 0;
-        for (Atom atom : atomList) {
-            DeviceCalculatedPowerBlameUid item = atom.getDeviceCalculatedPowerBlameUid();
-            if (item.getUid() == uid) {
-                assertWithMessage(String.format("Found multiple power values for uid %d", uid))
-                        .that(uidFound).isFalse();
-                uidFound = true;
-                uidPower = item.getPowerNanoAmpSecs();
-            }
-        }
-        assertWithMessage(String.format("No power value for uid %d", uid)).that(uidFound).isTrue();
-        assertWithMessage(String.format("Non-positive power value for uid %d", uid))
-                .that(uidPower).isGreaterThan(0L);
-        DeviceUtils.resetBatteryStatus(getDevice());
-    }
-
     public void testFlashlightState() throws Exception {
         if (!DeviceUtils.hasFeature(getDevice(), FEATURE_CAMERA_FLASH)) return;
 
@@ -394,7 +357,7 @@
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
                 atom -> atom.getFlashlightStateChanged().getState().getNumber());
     }
 
@@ -419,7 +382,7 @@
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
                 atom -> atom.getForegroundServiceStateChanged().getState().getNumber());
     }
 
@@ -540,7 +503,7 @@
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, videoDuration,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, videoDuration,
                 atom -> atom.getMediaCodecStateChanged().getState().getNumber());
     }
 
@@ -568,7 +531,7 @@
 
         // Assert that the events happened in the expected order.
         // The overlay box should appear about 2sec after the app start
-        AtomTestUtils.assertStatesOccurred(stateSet, data, 0,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, 0,
                 atom -> atom.getOverlayStateChanged().getState().getNumber());
     }
 
@@ -657,7 +620,7 @@
         AtomTestUtils.popUntilFindFromEnd(data, screen100,
                 atom -> atom.getScreenBrightnessChanged().getLevel());
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
                 atom -> atom.getScreenBrightnessChanged().getLevel());
     }
 
@@ -678,7 +641,7 @@
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data,
                 /* wait = */ 0 /* don't verify time differences between state changes */,
                 atom -> atom.getSyncStateChanged().getState().getNumber());
     }
@@ -706,7 +669,7 @@
         // Sorted list of events in order in which they occurred.
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
 
-        AtomTestUtils.assertStatesOccurred(stateSet, data, 300,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, 300,
                 atom -> atom.getVibratorStateChanged().getState().getNumber());
     }
 
@@ -733,7 +696,7 @@
         List<EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
                 atom -> atom.getWakelockStateChanged().getState().getNumber());
 
         for (EventMetricData event : data) {
@@ -804,6 +767,14 @@
         assertThat(atom.getBytesField().getExperimentIdList())
                 .containsExactly(1L, 2L, 3L).inOrder();
 
+        assertThat(atom.getRepeatedIntFieldList()).containsExactly(3, 6).inOrder();
+        assertThat(atom.getRepeatedLongFieldList()).containsExactly(1000L, 1002L).inOrder();
+        assertThat(atom.getRepeatedFloatFieldList()).containsExactly(0.3f, 0.09f).inOrder();
+        assertThat(atom.getRepeatedStringFieldList()).containsExactly("str1", "str2").inOrder();
+        assertThat(atom.getRepeatedBooleanFieldList()).containsExactly(true, false).inOrder();
+        assertThat(atom.getRepeatedEnumFieldList())
+                .containsExactly(TestAtomReported.State.OFF, TestAtomReported.State.ON)
+                .inOrder();
 
         atom = data.get(1).getAtom().getTestAtomReported();
         attrChain = atom.getAttributionNodeList();
@@ -823,6 +794,15 @@
         assertThat(atom.getBytesField().getExperimentIdList())
                 .containsExactly(1L, 2L, 3L).inOrder();
 
+        assertThat(atom.getRepeatedIntFieldList()).containsExactly(3, 6).inOrder();
+        assertThat(atom.getRepeatedLongFieldList()).containsExactly(1000L, 1002L).inOrder();
+        assertThat(atom.getRepeatedFloatFieldList()).containsExactly(0.3f, 0.09f).inOrder();
+        assertThat(atom.getRepeatedStringFieldList()).containsExactly("str1", "str2").inOrder();
+        assertThat(atom.getRepeatedBooleanFieldList()).containsExactly(true, false).inOrder();
+        assertThat(atom.getRepeatedEnumFieldList())
+                .containsExactly(TestAtomReported.State.OFF, TestAtomReported.State.ON)
+                .inOrder();
+
         atom = data.get(2).getAtom().getTestAtomReported();
         attrChain = atom.getAttributionNodeList();
         assertThat(attrChain).hasSize(1);
@@ -839,6 +819,13 @@
         assertThat(atom.getBytesField().getExperimentIdList())
                 .containsExactly(1L, 2L, 3L).inOrder();
 
+        assertThat(atom.getRepeatedIntFieldList()).isEmpty();
+        assertThat(atom.getRepeatedLongFieldList()).isEmpty();
+        assertThat(atom.getRepeatedFloatFieldList()).isEmpty();
+        assertThat(atom.getRepeatedStringFieldList()).isEmpty();
+        assertThat(atom.getRepeatedBooleanFieldList()).isEmpty();
+        assertThat(atom.getRepeatedEnumFieldList()).isEmpty();
+
         atom = data.get(3).getAtom().getTestAtomReported();
         attrChain = atom.getAttributionNodeList();
         assertThat(attrChain).hasSize(1);
@@ -853,6 +840,13 @@
         assertThat(atom.getBooleanField()).isTrue();
         assertThat(atom.getState().getNumber()).isEqualTo(TestAtomReported.State.OFF_VALUE);
         assertThat(atom.getBytesField().getExperimentIdList()).isEmpty();
+
+        assertThat(atom.getRepeatedIntFieldList()).isEmpty();
+        assertThat(atom.getRepeatedLongFieldList()).isEmpty();
+        assertThat(atom.getRepeatedFloatFieldList()).isEmpty();
+        assertThat(atom.getRepeatedStringFieldList()).isEmpty();
+        assertThat(atom.getRepeatedBooleanFieldList()).isEmpty();
+        assertThat(atom.getRepeatedEnumFieldList()).isEmpty();
     }
 
     public void testAppForegroundBackground() throws Exception {
@@ -875,7 +869,7 @@
                 atom -> atom.getAppUsageEventOccurred().getEventType().getNumber();
         // clear out initial appusage states
         AtomTestUtils.popUntilFind(data, onStates, appUsageStateFunction);
-        AtomTestUtils.assertStatesOccurred(stateSet, data, 0, appUsageStateFunction);
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, 0, appUsageStateFunction);
     }
 /*
     public void testAppForceStopUsageEvent() throws Exception {
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/telephony/TelephonyStatsTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/telephony/TelephonyStatsTests.java
index 8a00db4..87c29c9 100644
--- a/hostsidetests/statsdatom/src/android/cts/statsdatom/telephony/TelephonyStatsTests.java
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/telephony/TelephonyStatsTests.java
@@ -263,6 +263,21 @@
         assertThat(data).isNotEmpty();
     }
 
+    public void testPerSimStatus() throws Exception {
+        if (!DeviceUtils.hasFeature(getDevice(), FEATURE_TELEPHONY)) {
+            return;
+        }
+
+        ConfigUtils.uploadConfigForPulledAtom(getDevice(), DeviceUtils.STATSD_ATOM_TEST_PKG,
+                AtomsProto.Atom.PER_SIM_STATUS_FIELD_NUMBER);
+
+        AtomTestUtils.sendAppBreadcrumbReportedAtom(getDevice());
+        Thread.sleep(AtomTestUtils.WAIT_TIME_LONG);
+
+        List<AtomsProto.Atom> data = ReportUtils.getGaugeMetricAtoms(getDevice());
+        assertThat(data).hasSize(getActiveSimSlotCount());
+    }
+
     private boolean hasGsmPhone() throws Exception {
         // Not using log entries or ServiceState in the dump since they may or may not be present,
         // which can make the test flaky
diff --git a/hostsidetests/statsdatom/src/android/cts/statsdatom/wifi/WifiStatsTests.java b/hostsidetests/statsdatom/src/android/cts/statsdatom/wifi/WifiStatsTests.java
index c4bec178..cb3df79 100644
--- a/hostsidetests/statsdatom/src/android/cts/statsdatom/wifi/WifiStatsTests.java
+++ b/hostsidetests/statsdatom/src/android/cts/statsdatom/wifi/WifiStatsTests.java
@@ -91,7 +91,7 @@
         List<Set<Integer>> stateSet = Arrays.asList(lockOn, lockOff);
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
                 atom -> atom.getWifiLockStateChanged().getState().getNumber());
 
         for (StatsLog.EventMetricData event : data) {
@@ -120,7 +120,7 @@
         List<Set<Integer>> stateSet = Arrays.asList(lockOn, lockOff);
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
                 atom -> atom.getWifiLockStateChanged().getState().getNumber());
 
         for (StatsLog.EventMetricData event : data) {
@@ -152,7 +152,7 @@
         List<Set<Integer>> stateSet = Arrays.asList(lockOn, lockOff);
 
         // Assert that the events happened in the expected order.
-        AtomTestUtils.assertStatesOccurred(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSet, data, AtomTestUtils.WAIT_TIME_SHORT,
                 atom -> atom.getWifiMulticastLockStateChanged().getState().getNumber());
 
         for (StatsLog.EventMetricData event : data) {
diff --git a/hostsidetests/systemui/Android.bp b/hostsidetests/systemui/Android.bp
index 6de52cd..a5918f4 100644
--- a/hostsidetests/systemui/Android.bp
+++ b/hostsidetests/systemui/Android.bp
@@ -29,6 +29,8 @@
 
     static_libs: [
         "cts-statsd-atom-host-test-utils",
+        "platformprotos",
+        "CompatChangeGatingTestBase",
     ],
     // Tag this module as a cts test artifact
     test_suites: [
diff --git a/hostsidetests/systemui/OWNERS b/hostsidetests/systemui/OWNERS
index 7e823ba..a48e7e3 100644
--- a/hostsidetests/systemui/OWNERS
+++ b/hostsidetests/systemui/OWNERS
@@ -1,4 +1,4 @@
-# Bug component: 136515
-kozynski@google.com
-dsandler@android.com
-ashaikh@google.com
+# Bug component: 78010
+per-file *TileService* = file:/tests/quicksettings/OWNERS
+per-file *Notification* = juliacr@google.com
+dsandler@android.com #{LAST_RESORT_SUGGESTION}
diff --git a/hostsidetests/systemui/app/AndroidManifest.xml b/hostsidetests/systemui/app/AndroidManifest.xml
index 0ffc130..4667997 100755
--- a/hostsidetests/systemui/app/AndroidManifest.xml
+++ b/hostsidetests/systemui/app/AndroidManifest.xml
@@ -17,6 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      package="android.systemui.cts">
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application>
         <activity android:name=".TestNotificationActivity"
diff --git a/hostsidetests/systemui/app/src/android/systemui/cts/TestActiveTileService.java b/hostsidetests/systemui/app/src/android/systemui/cts/TestActiveTileService.java
index f8fe6c0..02b403a 100644
--- a/hostsidetests/systemui/app/src/android/systemui/cts/TestActiveTileService.java
+++ b/hostsidetests/systemui/app/src/android/systemui/cts/TestActiveTileService.java
@@ -22,6 +22,9 @@
 
 public class TestActiveTileService extends TestTileService {
 
+    private static final String EXTRA_BAD_PACKAGE = "android.systemui.cts.EXTRA_BAD_PACKAGE";
+    private static final String TAG = "TestActiveTileService";
+
     @Override
     public void onTileAdded() {
         Log.i(TAG, TEST_PREFIX + "onTileAdded");
@@ -32,7 +35,18 @@
         public void onReceive(Context context, Intent intent) {
             Log.i(TestActiveTileService.class.getSimpleName(),
                     TEST_PREFIX + "requestListeningState");
-            requestListeningState(context, new ComponentName(context, TestActiveTileService.class));
+            ComponentName componentName;
+            boolean useBadPackage = intent.getBooleanExtra(EXTRA_BAD_PACKAGE, false);
+            if (useBadPackage) {
+                componentName = ComponentName.unflattenFromString("pkg/.cls");
+            } else {
+                componentName = new ComponentName(context, TestActiveTileService.class);
+            }
+            try {
+                requestListeningState(context, componentName);
+            } catch (SecurityException e) {
+                Log.i(TAG, TEST_PREFIX + "SecurityException");
+            }
         }
     }
 }
diff --git a/hostsidetests/systemui/src/android/host/systemui/ActiveTileServiceCompatChangeTest.java b/hostsidetests/systemui/src/android/host/systemui/ActiveTileServiceCompatChangeTest.java
new file mode 100644
index 0000000..d861e40
--- /dev/null
+++ b/hostsidetests/systemui/src/android/host/systemui/ActiveTileServiceCompatChangeTest.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2022 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 android.host.systemui;
+
+import android.compat.cts.CompatChangeGatingTestCase;
+
+import com.android.tradefed.device.DeviceNotAvailableException;
+
+import java.util.Set;
+
+public class ActiveTileServiceCompatChangeTest extends CompatChangeGatingTestCase {
+
+    // Constants for generating commands below.
+    private static final String PACKAGE = "android.systemui.cts";
+
+    // Commands used on the device.
+    private static final String ADD_TILE = "cmd statusbar add-tile ";
+    private static final String REM_TILE = "cmd statusbar remove-tile ";
+
+    public static final String REQUEST_SUPPORTED = "cmd statusbar check-support";
+    public static final String TEST_PREFIX = "TileTest_";
+
+    // Time between checks for logs we expect.
+    private static final long CHECK_DELAY = 500;
+    // Number of times to check before failing.
+    private static final long CHECK_RETRIES = 30;
+
+    private final String mService = "TestActiveTileService";
+    private final String mComponent = PACKAGE + "/." + mService;
+
+    private static final long REQUEST_LISTENING_MUST_MATCH_PACKAGE = 172251878L;
+
+    private static final String EXTRA_BAD_PACKAGE = "android.systemui.cts.EXTRA_BAD_PACKAGE";
+    private static final String ACTION_REQUEST_LISTENING =
+            "android.sysui.testtile.REQUEST_LISTENING";
+
+    private static final String REQUEST_LISTENING = "am broadcast -a " + ACTION_REQUEST_LISTENING
+            + " " + PACKAGE;
+
+    private static final String REQUEST_LISTENING_BAD =
+            REQUEST_LISTENING + " -ez " + EXTRA_BAD_PACKAGE + " true";
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        clearLogcat();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+
+        if (!supported()) return;
+        remTile();
+        // Try to wait for a onTileRemoved.
+        waitFor("onTileRemoved");
+    }
+
+    public void testRequestListening_changeEnabled() throws Exception {
+        runTest(true);
+    }
+
+    public void testRequestListening_changeDisabled() throws Exception {
+        runTest(false);
+    }
+
+    public void testRequestListeningBadPackage_changeEnabled_SecurityException() throws Exception {
+        if (!supported()) return;
+        Set<Long> enabledSet = Set.of(REQUEST_LISTENING_MUST_MATCH_PACKAGE);
+        Set<Long> disabledSet = Set.of();
+
+        setCompatConfig(enabledSet, disabledSet, PACKAGE);
+
+        addTile();
+        assertTrue(waitFor("onDestroy"));
+
+        // Request the listening state but use a bad component name (not in the same package)
+        getDevice().executeShellCommand(REQUEST_LISTENING_BAD);
+        assertTrue(waitFor("SecurityException"));
+    }
+
+    private void runTest(boolean enabled) throws Exception {
+        if (!supported()) return;
+        Set<Long> enabledSet = enabled ? Set.of(REQUEST_LISTENING_MUST_MATCH_PACKAGE) : Set.of();
+        Set<Long> disabledSet = enabled ? Set.of() : Set.of(REQUEST_LISTENING_MUST_MATCH_PACKAGE);
+
+        setCompatConfig(enabledSet, disabledSet, PACKAGE);
+
+        final long configId = getClass().getCanonicalName().hashCode();
+        createAndUploadStatsdConfig(configId, PACKAGE);
+
+        try {
+            executeRequestListeningTest();
+        } finally {
+            resetCompatChanges(Set.of(REQUEST_LISTENING_MUST_MATCH_PACKAGE), PACKAGE);
+            validatePostRunStatsdReport(configId, PACKAGE, enabledSet, disabledSet);
+        }
+    }
+
+    private void executeRequestListeningTest() throws Exception {
+        addTile();
+        assertTrue(waitFor("onDestroy"));
+
+        // Request the listening state and verify that it gets an onStartListening.
+        getDevice().executeShellCommand(REQUEST_LISTENING);
+        assertTrue(waitFor("requestListeningState"));
+        assertTrue(waitFor("onStartListening"));
+    }
+
+    private void addTile() throws Exception {
+        execute(ADD_TILE + mComponent);
+    }
+
+    private void remTile() throws Exception {
+        execute(REM_TILE + mComponent);
+    }
+
+    private void execute(String cmd) throws Exception {
+        getDevice().executeShellCommand(cmd);
+        // All of the status bar commands tend to have animations associated
+        // everything seems to be happier if you give them time to finish.
+        Thread.sleep(100);
+    }
+
+    protected boolean waitFor(String str) throws DeviceNotAvailableException, InterruptedException {
+        final String searchStr = TEST_PREFIX + str;
+        int ct = 0;
+        while (!hasLog(searchStr) && (ct++ < CHECK_RETRIES)) {
+            Thread.sleep(CHECK_DELAY);
+        }
+        return hasLog(searchStr);
+    }
+
+    protected boolean hasLog(String str) throws DeviceNotAvailableException {
+        String logs = getDevice().executeAdbCommand("logcat", "-v", "brief", "-d", mService + ":I",
+                "*:S");
+        return logs.contains(str);
+    }
+
+    private void clearLogcat() throws DeviceNotAvailableException {
+        getDevice().executeAdbCommand("logcat", "-c");
+    }
+
+    protected boolean supported() throws DeviceNotAvailableException {
+        return supportedHardware() && supportedSoftware();
+    }
+
+    private boolean supportedSoftware() throws DeviceNotAvailableException {
+        String supported = getDevice().executeShellCommand(REQUEST_SUPPORTED);
+        return Boolean.parseBoolean(supported);
+    }
+
+    private boolean supportedHardware() throws DeviceNotAvailableException {
+        String features = getDevice().executeShellCommand("pm list features");
+        return !features.contains("android.hardware.type.television")
+                && !features.contains("android.hardware.type.watch");
+    }
+}
diff --git a/hostsidetests/systemui/src/android/host/systemui/SmallHash.java b/hostsidetests/systemui/src/android/host/systemui/SmallHash.java
new file mode 100644
index 0000000..08a8524
--- /dev/null
+++ b/hostsidetests/systemui/src/android/host/systemui/SmallHash.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2022 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 android.host.systemui;
+
+import java.util.Objects;
+
+/**
+ * A simple hash function for use in privacy-sensitive logging.  Few bits = lots of collisions.
+ * See NotificationRecordLogger.
+ */
+public class SmallHash {
+    // Hashes will be in the range [0, MAX_HASH).
+    public static final int MAX_HASH = (1 << 13);
+
+    /**
+     * @return Small hash of the string, if non-null, or 0 otherwise.
+     */
+    public static int hash(String in) {
+        return hash(Objects.hashCode(in));
+    }
+
+    /**
+     * Maps in to the range [0, MAX_HASH), keeping similar values distinct.
+     * @param in An arbitrary integer.
+     * @return in mod MAX_HASH, signs chosen to stay in the range [0, MAX_HASH).
+     */
+    public static int hash(int in) {
+        return Math.floorMod(in, MAX_HASH);
+    }
+}
diff --git a/hostsidetests/systemui/src/android/host/systemui/StatsdNotificationAtomTest.java b/hostsidetests/systemui/src/android/host/systemui/StatsdNotificationAtomTest.java
index 2c6de47..175691f 100644
--- a/hostsidetests/systemui/src/android/host/systemui/StatsdNotificationAtomTest.java
+++ b/hostsidetests/systemui/src/android/host/systemui/StatsdNotificationAtomTest.java
@@ -27,7 +27,6 @@
 import com.android.internal.os.StatsdConfigProto;
 import com.android.os.AtomsProto;
 import com.android.os.StatsLog;
-import com.android.server.notification.SmallHash;
 import com.android.tradefed.build.IBuildInfo;
 import com.android.tradefed.testtype.DeviceTestCase;
 import com.android.tradefed.testtype.IBuildReceiver;
diff --git a/hostsidetests/testharness/app/src/android/testharness/app/TestHarnessModeDeviceTest.java b/hostsidetests/testharness/app/src/android/testharness/app/TestHarnessModeDeviceTest.java
index a0cb026..bde3390 100644
--- a/hostsidetests/testharness/app/src/android/testharness/app/TestHarnessModeDeviceTest.java
+++ b/hostsidetests/testharness/app/src/android/testharness/app/TestHarnessModeDeviceTest.java
@@ -30,6 +30,7 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 /** Device-side tests for Test Harness Mode */
 @RunWith(AndroidJUnit4.class)
@@ -51,7 +52,7 @@
     @Test
     public void dirtyDevice() {
         TestHarnessActivity activity = mActivityRule.getActivity();
-        PollingCheck.waitFor(activity::hasWindowFocus);
+        WindowUtil.waitForFocus(activity);
 
         activity.dirtyDevice();
     }
@@ -59,7 +60,7 @@
     @Test
     public void testDeviceIsClean() {
         TestHarnessActivity activity = mActivityRule.getActivity();
-        PollingCheck.waitFor(activity::hasWindowFocus);
+        WindowUtil.waitForFocus(activity);
 
         Assert.assertTrue(activity.isDeviceClean());
     }
diff --git a/hostsidetests/theme/assets/31/450dpi.zip b/hostsidetests/theme/assets/31/450dpi.zip
deleted file mode 100644
index 5ce9a1e..0000000
--- a/hostsidetests/theme/assets/31/450dpi.zip
+++ /dev/null
Binary files differ
diff --git a/hostsidetests/theme/assets/S/450dpi.zip b/hostsidetests/theme/assets/S/450dpi.zip
new file mode 100755
index 0000000..e346378
--- /dev/null
+++ b/hostsidetests/theme/assets/S/450dpi.zip
Binary files differ
diff --git a/hostsidetests/time/Android.bp b/hostsidetests/time/Android.bp
index 72d27e4..79d85d1 100644
--- a/hostsidetests/time/Android.bp
+++ b/hostsidetests/time/Android.bp
@@ -24,6 +24,9 @@
         "cts-statsd-atom-host-test-utils",
         "host_time_shell_utils",
     ],
+    data: [
+        ":CtsFakeTimeZoneProvidersApp",
+    ],
     test_suites: ["general-tests", "cts"],
     test_config: "host/AndroidTest.xml",
 }
diff --git a/hostsidetests/time/device/fake_tzps_app/Android.bp b/hostsidetests/time/device/fake_tzps_app/Android.bp
new file mode 100644
index 0000000..c17e49d
--- /dev/null
+++ b/hostsidetests/time/device/fake_tzps_app/Android.bp
@@ -0,0 +1,31 @@
+//
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+// An app that hosts fake TimeZoneProviderService implementations that can be used by tests to query
+// the fake providers' state and inject test events into the fake providers.
+android_test_helper_app {
+    name: "CtsFakeTimeZoneProvidersApp",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "test_current",
+    static_libs: [
+        "device_time_shell_utils",
+    ],
+    srcs: ["src/**/*.java"],
+}
diff --git a/hostsidetests/time/device/fake_tzps_app/AndroidManifest.xml b/hostsidetests/time/device/fake_tzps_app/AndroidManifest.xml
new file mode 100644
index 0000000..80898ff
--- /dev/null
+++ b/hostsidetests/time/device/fake_tzps_app/AndroidManifest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.time.cts.fake_tzps_app">
+
+    <application android:debuggable="true"
+                 android:allowBackup="false">
+        <!-- A content provider that can be used to interact with the fake providers. -->
+        <provider android:name=".fixture.FakeTimeZoneProviderFixtureProvider"
+                  android:authorities="faketzpsapp"
+                  android:multiprocess="false"
+                  android:exported="true" />
+
+        <!-- A primary location time zone provider. -->
+        <service android:name=".tzps.FakeLocationTimeZoneProviderService1"
+                 android:permission="android.permission.BIND_TIME_ZONE_PROVIDER_SERVICE"
+                 android:exported="true">
+            <intent-filter>
+                <action android:name="android.service.timezone.PrimaryLocationTimeZoneProviderService" />
+            </intent-filter>
+            <meta-data android:name="serviceIsMultiuser" android:value="true" />
+        </service>
+
+        <!-- A secondary location time zone provider. -->
+        <service android:name=".tzps.FakeLocationTimeZoneProviderService2"
+                 android:permission="android.permission.BIND_TIME_ZONE_PROVIDER_SERVICE"
+                 android:exported="true">
+            <intent-filter>
+                <action android:name="android.service.timezone.SecondaryLocationTimeZoneProviderService" />
+            </intent-filter>
+            <meta-data android:name="serviceIsMultiuser" android:value="true" />
+        </service>
+    </application>
+</manifest>
diff --git a/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/fixture/FakeTimeZoneProviderFixtureProvider.java b/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/fixture/FakeTimeZoneProviderFixtureProvider.java
new file mode 100644
index 0000000..886768e
--- /dev/null
+++ b/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/fixture/FakeTimeZoneProviderFixtureProvider.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2021 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.time.cts.fake_tzps_app.fixture;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+
+import com.android.time.cts.fake_tzps_app.tzps.FakeTimeZoneProviderService;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A {@link ContentProvider} that can interact with the fake {@link
+ * android.service.timezone.TimeZoneProviderService} implementations. This enables test code to
+ * interact with the fakes: device-side code can use the usual content provider APIs, and both
+ * device-side and host-side code can use the "adb shell content" command. For simplicity,
+ * everything is implemented using the "call" verb.
+ */
+public class FakeTimeZoneProviderFixtureProvider extends ContentProvider {
+
+    private static final String METHOD_GET_STATE = "get_state";
+    private static final String CALL_RESULT_KEY_GET_STATE_STATE = "state";
+    private static final String METHOD_REPORT_PERMANENT_FAILURE = "perm_fail";
+    private static final String METHOD_REPORT_UNCERTAIN = "uncertain";
+    private static final String METHOD_REPORT_SUCCESS = "success";
+    private static final String METHOD_PING = "ping";
+
+    /** Suggestion time zone IDs. A single string, comma separated, may be empty. */
+    private static final String CALL_EXTRA_KEY_SUGGESTION_ZONE_IDS = "zone_ids";
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
+            String sortOrder) {
+        // No impl
+        return null;
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        // No impl
+        return null;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        // No impl
+        return null;
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        // No impl
+        return 0;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        // No impl
+        return 0;
+    }
+
+    @Override
+    public Bundle call(String method, String arg, Bundle extras) {
+        Objects.requireNonNull(extras);
+
+        if (METHOD_PING.equals(method)) {
+            // No-op - this method just exists to make sure the content provider exists.
+            return Bundle.EMPTY;
+        }
+
+        String providerId = Objects.requireNonNull(arg);
+        FakeTimeZoneProviderService provider = FakeTimeZoneProviderRegistry.getInstance()
+                .getFakeTimeZoneProviderService(providerId);
+        Objects.requireNonNull(provider, "arg=" + providerId + ", provider not found");
+
+        Bundle result = new Bundle();
+        switch (method) {
+            case METHOD_GET_STATE: {
+                result.putInt(CALL_RESULT_KEY_GET_STATE_STATE, provider.getState());
+                break;
+            }
+            case METHOD_REPORT_PERMANENT_FAILURE: {
+                provider.fakeReportPermanentFailure();
+                break;
+            }
+            case METHOD_REPORT_UNCERTAIN: {
+                provider.fakeReportUncertain();
+                break;
+            }
+            case METHOD_REPORT_SUCCESS: {
+                String zoneIdsString = extras.getString(CALL_EXTRA_KEY_SUGGESTION_ZONE_IDS);
+                List<String> zoneIds = Arrays.asList(zoneIdsString.split(","));
+                provider.fakeReportSuggestion(zoneIds);
+                break;
+            }
+            default: {
+                throw new IllegalArgumentException("method=" + method + " not known");
+            }
+        }
+        return result;
+    }
+}
diff --git a/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/fixture/FakeTimeZoneProviderRegistry.java b/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/fixture/FakeTimeZoneProviderRegistry.java
new file mode 100644
index 0000000..420efda
--- /dev/null
+++ b/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/fixture/FakeTimeZoneProviderRegistry.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 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.time.cts.fake_tzps_app.fixture;
+
+import com.android.time.cts.fake_tzps_app.tzps.FakeTimeZoneProviderService;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A singleton registry of fake {@link android.service.timezone.TimeZoneProviderService} instances.
+ */
+public class FakeTimeZoneProviderRegistry {
+
+    private static final FakeTimeZoneProviderRegistry sInstance =
+            new FakeTimeZoneProviderRegistry();
+
+    private final Map<String, FakeTimeZoneProviderService> fakeTimeZoneProviderServiceMap =
+            new HashMap<>();
+
+    private FakeTimeZoneProviderRegistry() {
+    }
+
+    public static FakeTimeZoneProviderRegistry getInstance() {
+        return sInstance;
+    }
+
+    public synchronized void registerFakeTimeZoneProviderService(String id,
+            FakeTimeZoneProviderService fakeTimeZoneProviderService) {
+        fakeTimeZoneProviderServiceMap.put(id, fakeTimeZoneProviderService);
+    }
+
+    public synchronized FakeTimeZoneProviderService getFakeTimeZoneProviderService(String id) {
+        return fakeTimeZoneProviderServiceMap.get(id);
+    }
+}
diff --git a/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/tzps/FakeLocationTimeZoneProviderService1.java b/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/tzps/FakeLocationTimeZoneProviderService1.java
new file mode 100644
index 0000000..6591168
--- /dev/null
+++ b/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/tzps/FakeLocationTimeZoneProviderService1.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 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.time.cts.fake_tzps_app.tzps;
+
+/** The fake primary location time zone provider. */
+public class FakeLocationTimeZoneProviderService1 extends FakeTimeZoneProviderService {
+
+    public FakeLocationTimeZoneProviderService1() {
+        super(FakeLocationTimeZoneProviderService1.class.getSimpleName());
+    }
+}
diff --git a/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/tzps/FakeLocationTimeZoneProviderService2.java b/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/tzps/FakeLocationTimeZoneProviderService2.java
new file mode 100644
index 0000000..6bb7d36
--- /dev/null
+++ b/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/tzps/FakeLocationTimeZoneProviderService2.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 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.time.cts.fake_tzps_app.tzps;
+
+/** The fake secondary location time zone provider. */
+public class FakeLocationTimeZoneProviderService2 extends FakeTimeZoneProviderService {
+
+    public FakeLocationTimeZoneProviderService2() {
+        super(FakeLocationTimeZoneProviderService2.class.getSimpleName());
+    }
+}
diff --git a/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/tzps/FakeTimeZoneProviderService.java b/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/tzps/FakeTimeZoneProviderService.java
new file mode 100644
index 0000000..36bd58f
--- /dev/null
+++ b/hostsidetests/time/device/fake_tzps_app/src/com/android/time/cts/fake_tzps_app/tzps/FakeTimeZoneProviderService.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2021 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.time.cts.fake_tzps_app.tzps;
+
+import static android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.PROVIDER_STATE_CERTAIN;
+import static android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.PROVIDER_STATE_DISABLED;
+import static android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.PROVIDER_STATE_INITIALIZING;
+import static android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.PROVIDER_STATE_PERM_FAILED;
+
+import android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper;
+import android.os.SystemClock;
+import android.service.timezone.TimeZoneProviderService;
+import android.service.timezone.TimeZoneProviderSuggestion;
+
+import com.android.time.cts.fake_tzps_app.fixture.FakeTimeZoneProviderRegistry;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A base class for fake implementations of {@link TimeZoneProviderService} that can be queried /
+ * poked during tests. Each instance registers itself with {@link FakeTimeZoneProviderRegistry} on
+ * construction to enable interaction from tests.
+ */
+public class FakeTimeZoneProviderService extends TimeZoneProviderService {
+
+    private final String mId;
+    private int mState = PROVIDER_STATE_DISABLED;
+
+    protected FakeTimeZoneProviderService(String id) {
+        mId = Objects.requireNonNull(id);
+        FakeTimeZoneProviderRegistry.getInstance().registerFakeTimeZoneProviderService(id, this);
+    }
+
+    @Override
+    public void onStartUpdates(long initializationTimeoutMillis) {
+        mState = PROVIDER_STATE_INITIALIZING;
+    }
+
+    @Override
+    public void onStopUpdates() {
+        mState = PROVIDER_STATE_DISABLED;
+    }
+
+    // Fake behavior methods.
+    public int getState() {
+        return mState;
+    }
+
+    public void fakeReportUncertain() {
+        reportUncertain();
+        mState = FakeTimeZoneProviderAppShellHelper.PROVIDER_STATE_UNCERTAIN;
+    }
+
+    public void fakeReportPermanentFailure() {
+        reportPermanentFailure(new RuntimeException("Fake permanent failure"));
+        mState = PROVIDER_STATE_PERM_FAILED;
+    }
+
+    public void fakeReportSuggestion(List<String> timeZoneIds) {
+        TimeZoneProviderSuggestion suggestion = new TimeZoneProviderSuggestion.Builder()
+                .setTimeZoneIds(timeZoneIds)
+                .setElapsedRealtimeMillis(SystemClock.elapsedRealtime())
+                .build();
+        reportSuggestion(suggestion);
+        mState = PROVIDER_STATE_CERTAIN;
+    }
+}
diff --git a/hostsidetests/time/host/src/android/time/cts/host/BaseLocationTimeZoneManagerHostTest.java b/hostsidetests/time/host/src/android/time/cts/host/BaseLocationTimeZoneManagerHostTest.java
deleted file mode 100644
index 1cc28e6..0000000
--- a/hostsidetests/time/host/src/android/time/cts/host/BaseLocationTimeZoneManagerHostTest.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (C) 2021 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 android.time.cts.host;
-
-import static android.app.time.cts.shell.DeviceConfigKeys.NAMESPACE_SYSTEM_TIME;
-import static android.app.time.cts.shell.LocationTimeZoneManagerShellHelper.PRIMARY_PROVIDER_INDEX;
-import static android.app.time.cts.shell.LocationTimeZoneManagerShellHelper.PROVIDER_MODE_SIMULATED;
-import static android.app.time.cts.shell.LocationTimeZoneManagerShellHelper.SECONDARY_PROVIDER_INDEX;
-
-import android.app.time.LocationTimeZoneManagerServiceStateProto;
-import android.app.time.cts.shell.DeviceConfigShellHelper;
-import android.app.time.cts.shell.DeviceShellCommandExecutor;
-import android.app.time.cts.shell.LocationShellHelper;
-import android.app.time.cts.shell.LocationTimeZoneManagerShellHelper;
-import android.app.time.cts.shell.TimeZoneDetectorShellHelper;
-import android.app.time.cts.shell.host.HostShellCommandExecutor;
-
-import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
-import com.google.protobuf.Parser;
-
-import org.junit.After;
-import org.junit.Before;
-
-/** A base class for tests that interact with the location_time_zone_manager via adb. */
-public abstract class BaseLocationTimeZoneManagerHostTest extends BaseHostJUnit4Test {
-
-    private boolean mOriginalLocationEnabled;
-
-    private boolean mOriginalAutoDetectionEnabled;
-
-    private boolean mOriginalGeoDetectionEnabled;
-
-    protected TimeZoneDetectorShellHelper mTimeZoneDetectorShellHelper;
-    private LocationTimeZoneManagerShellHelper mLocationTimeZoneManagerShellHelper;
-    private LocationShellHelper mLocationShellHelper;
-    private DeviceConfigShellHelper mDeviceConfigShellHelper;
-    private DeviceConfigShellHelper.PreTestState mDeviceConfigPreTestState;
-
-    @Before
-    public void setUp() throws Exception {
-        DeviceShellCommandExecutor shellCommandExecutor = new HostShellCommandExecutor(getDevice());
-        mTimeZoneDetectorShellHelper = new TimeZoneDetectorShellHelper(shellCommandExecutor);
-        mLocationTimeZoneManagerShellHelper =
-                new LocationTimeZoneManagerShellHelper(shellCommandExecutor);
-        mLocationShellHelper = new LocationShellHelper(shellCommandExecutor);
-        mDeviceConfigShellHelper = new DeviceConfigShellHelper(shellCommandExecutor);
-
-        // Confirm the service being tested is present. It can be turned off, in which case there's
-        // nothing to test.
-        mLocationTimeZoneManagerShellHelper.assumeLocationTimeZoneManagerIsPresent();
-
-        // All tests start with the location_time_zone_manager disabled so that providers can be
-        // configured.
-        stopLocationTimeZoneManagerService();
-
-        mDeviceConfigPreTestState = mDeviceConfigShellHelper.setSyncModeForTest(
-                DeviceConfigShellHelper.SYNC_DISABLED_MODE_UNTIL_REBOOT, NAMESPACE_SYSTEM_TIME);
-
-        // Configure two simulated providers. At least one is needed to be able to turn on
-        // geo detection below. Tests may override these values for their own use.
-        setProviderModeOverride(PRIMARY_PROVIDER_INDEX, PROVIDER_MODE_SIMULATED);
-        setProviderModeOverride(SECONDARY_PROVIDER_INDEX, PROVIDER_MODE_SIMULATED);
-
-        // Make sure locations is enabled, otherwise the geo detection feature will be disabled
-        // whatever the geolocation detection setting is set to.
-        mOriginalLocationEnabled = mLocationShellHelper.isLocationEnabledForCurrentUser();
-        if (!mOriginalLocationEnabled) {
-            mLocationShellHelper.setLocationEnabledForCurrentUser(true);
-        }
-
-        // Make sure automatic time zone detection is enabled, otherwise the geo detection feature
-        // will be disabled whatever the geolocation detection setting is set to
-        mOriginalAutoDetectionEnabled = mTimeZoneDetectorShellHelper.isAutoDetectionEnabled();
-        if (!mOriginalAutoDetectionEnabled) {
-            mTimeZoneDetectorShellHelper.setAutoDetectionEnabled(true);
-        }
-
-        // Make sure geolocation time zone detection is enabled.
-        mOriginalGeoDetectionEnabled = mTimeZoneDetectorShellHelper.isGeoDetectionEnabled();
-        if (!mOriginalGeoDetectionEnabled) {
-            mTimeZoneDetectorShellHelper.setGeoDetectionEnabled(true);
-        }
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (!mLocationTimeZoneManagerShellHelper.isLocationTimeZoneManagerPresent()) {
-            // Setup didn't do anything, no need to tearDown.
-            return;
-        }
-        // Turn off the service before we reset configuration, otherwise it will restart itself
-        // repeatedly.
-        stopLocationTimeZoneManagerService();
-
-        // Reset settings and server flags as best we can.
-        mTimeZoneDetectorShellHelper.setGeoDetectionEnabled(mOriginalGeoDetectionEnabled);
-        mTimeZoneDetectorShellHelper.setAutoDetectionEnabled(mOriginalAutoDetectionEnabled);
-        mLocationShellHelper.setLocationEnabledForCurrentUser(mOriginalLocationEnabled);
-        setLocationTimeZoneManagerStateRecordingMode(false);
-
-        mDeviceConfigShellHelper.restoreDeviceConfigStateForTest(mDeviceConfigPreTestState);
-
-        // Attempt to start the service. It may not start if there are no providers configured,
-        // but that is ok.
-        startLocationTimeZoneManagerService();
-    }
-
-    protected LocationTimeZoneManagerServiceStateProto dumpLocationTimeZoneManagerServiceState()
-            throws Exception {
-        byte[] protoBytes = mLocationTimeZoneManagerShellHelper.dumpState();
-        Parser<LocationTimeZoneManagerServiceStateProto> parser =
-                LocationTimeZoneManagerServiceStateProto.parser();
-        return parser.parseFrom(protoBytes);
-    }
-
-    protected void setLocationTimeZoneManagerStateRecordingMode(boolean enabled) throws Exception {
-        mLocationTimeZoneManagerShellHelper.recordProviderStates(enabled);
-    }
-
-    protected void startLocationTimeZoneManagerService() throws Exception {
-        mLocationTimeZoneManagerShellHelper.start();
-    }
-
-    protected void stopLocationTimeZoneManagerService() throws Exception {
-        mLocationTimeZoneManagerShellHelper.stop();
-    }
-
-    protected void setProviderModeOverride(int providerIndex, String mode) throws Exception {
-        mLocationTimeZoneManagerShellHelper.setProviderModeOverride(providerIndex, mode);
-    }
-
-    protected void simulateProviderSuggestion(int providerIndex, String... zoneIds)
-            throws Exception {
-        mLocationTimeZoneManagerShellHelper.simulateProviderSuggestion(providerIndex, zoneIds);
-    }
-
-    protected void simulateProviderBind(int providerIndex) throws Exception {
-        mLocationTimeZoneManagerShellHelper.simulateProviderBind(providerIndex);
-    }
-}
diff --git a/hostsidetests/time/host/src/android/time/cts/host/LocationTimeZoneManagerHostTest.java b/hostsidetests/time/host/src/android/time/cts/host/LocationTimeZoneManagerHostTest.java
index 1894805b..76f4723 100644
--- a/hostsidetests/time/host/src/android/time/cts/host/LocationTimeZoneManagerHostTest.java
+++ b/hostsidetests/time/host/src/android/time/cts/host/LocationTimeZoneManagerHostTest.java
@@ -17,48 +17,481 @@
 package android.time.cts.host;
 
 
-import static android.app.time.cts.shell.LocationTimeZoneManagerShellHelper.PROVIDER_MODE_DISABLED;
-import static android.app.time.cts.shell.LocationTimeZoneManagerShellHelper.PROVIDER_MODE_SIMULATED;
-import static android.app.time.cts.shell.LocationTimeZoneManagerShellHelper.PRIMARY_PROVIDER_INDEX;
-import static android.app.time.cts.shell.LocationTimeZoneManagerShellHelper.SECONDARY_PROVIDER_INDEX;
+import static android.app.time.cts.shell.DeviceConfigKeys.LocationTimeZoneManager.KEY_LTZP_EVENT_FILTERING_AGE_THRESHOLD_MILLIS;
+import static android.app.time.cts.shell.DeviceConfigKeys.NAMESPACE_SYSTEM_TIME;
+import static android.app.time.cts.shell.DeviceConfigShellHelper.SYNC_DISABLED_MODE_UNTIL_REBOOT;
+import static android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.FAKE_TZPS_APP_APK;
+import static android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.FAKE_TZPS_APP_PACKAGE;
+import static android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.PROVIDER_STATE_CERTAIN;
+import static android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.PROVIDER_STATE_DISABLED;
+import static android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.PROVIDER_STATE_INITIALIZING;
+import static android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.PROVIDER_STATE_UNCERTAIN;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import android.app.time.ControllerStateEnum;
 import android.app.time.LocationTimeZoneManagerServiceStateProto;
 import android.app.time.TimeZoneProviderStateEnum;
 import android.app.time.TimeZoneProviderStateProto;
+import android.app.time.cts.shell.DeviceConfigShellHelper;
+import android.app.time.cts.shell.DeviceShellCommandExecutor;
+import android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper;
+import android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.FakeTimeZoneProviderShellHelper;
+import android.app.time.cts.shell.LocationShellHelper;
+import android.app.time.cts.shell.LocationTimeZoneManagerShellHelper;
+import android.app.time.cts.shell.TimeZoneDetectorShellHelper;
+import android.app.time.cts.shell.host.HostShellCommandExecutor;
 
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
 
+import com.google.protobuf.Parser;
+
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.List;
 
 /** Host-side CTS tests for the location time zone manager service. */
 @RunWith(DeviceJUnit4ClassRunner.class)
-public class LocationTimeZoneManagerHostTest extends BaseLocationTimeZoneManagerHostTest {
+public class LocationTimeZoneManagerHostTest extends BaseHostJUnit4Test {
 
+    private boolean mOriginalLocationEnabled;
+    private boolean mOriginalAutoDetectionEnabled;
+    private boolean mOriginalGeoDetectionEnabled;
+    private TimeZoneDetectorShellHelper mTimeZoneDetectorShellHelper;
+    private LocationTimeZoneManagerShellHelper mLocationTimeZoneManagerShellHelper;
+    private DeviceConfigShellHelper mDeviceConfigShellHelper;
+    private DeviceConfigShellHelper.PreTestState mDeviceConfigPreTestState;
+    private LocationShellHelper mLocationShellHelper;
+    private FakeTimeZoneProviderShellHelper mPrimaryFakeTimeZoneProviderShellHelper;
+    private FakeTimeZoneProviderShellHelper mSecondaryFakeTimeZoneProviderShellHelper;
+
+    @Before
+    public void setUp() throws Exception {
+        DeviceShellCommandExecutor shellCommandExecutor = new HostShellCommandExecutor(getDevice());
+        mLocationTimeZoneManagerShellHelper =
+                new LocationTimeZoneManagerShellHelper(shellCommandExecutor);
+
+        // Confirm the service being tested is present. It can be turned off, in which case there's
+        // nothing to test.
+        mLocationTimeZoneManagerShellHelper.assumeLocationTimeZoneManagerIsPresent();
+
+        // Install the app that hosts the fake providers.
+        // Installations are tracked in BaseHostJUnit4Test and uninstalled automatically.
+        installPackage(FAKE_TZPS_APP_APK);
+
+        mTimeZoneDetectorShellHelper = new TimeZoneDetectorShellHelper(shellCommandExecutor);
+        mLocationShellHelper = new LocationShellHelper(shellCommandExecutor);
+        mDeviceConfigShellHelper = new DeviceConfigShellHelper(shellCommandExecutor);
+
+        // Stop device_config updates for the duration of the test.
+        mDeviceConfigPreTestState = mDeviceConfigShellHelper.setSyncModeForTest(
+                SYNC_DISABLED_MODE_UNTIL_REBOOT, NAMESPACE_SYSTEM_TIME);
+
+        // All tests start with the location_time_zone_manager disabled so that providers can be
+        // configured.
+        mLocationTimeZoneManagerShellHelper.stop();
+
+        // Make sure locations is enabled, otherwise the geo detection feature will be disabled
+        // whatever the geolocation detection setting is set to.
+        mOriginalLocationEnabled = mLocationShellHelper.isLocationEnabledForCurrentUser();
+        if (!mOriginalLocationEnabled) {
+            mLocationShellHelper.setLocationEnabledForCurrentUser(true);
+        }
+
+        // Make sure automatic time zone detection is enabled, otherwise the geo detection feature
+        // will be disabled whatever the geolocation detection setting is set to.
+        mOriginalAutoDetectionEnabled = mTimeZoneDetectorShellHelper.isAutoDetectionEnabled();
+        if (!mOriginalAutoDetectionEnabled) {
+            mTimeZoneDetectorShellHelper.setAutoDetectionEnabled(true);
+        }
+
+        // On devices with no location time zone providers (e.g. AOSP), we cannot turn geo detection
+        // on until the test LTZPs are configured as the time_zone_detector will refuse.
+        mOriginalGeoDetectionEnabled = mTimeZoneDetectorShellHelper.isGeoDetectionEnabled();
+
+        FakeTimeZoneProviderAppShellHelper fakeTimeZoneProviderAppShellHelper =
+                new FakeTimeZoneProviderAppShellHelper(shellCommandExecutor);
+        // Delay until the fake TZPS app can be found.
+        fakeTimeZoneProviderAppShellHelper.waitForInstallation();
+        mPrimaryFakeTimeZoneProviderShellHelper =
+                fakeTimeZoneProviderAppShellHelper.getPrimaryLocationProviderHelper();
+        mSecondaryFakeTimeZoneProviderShellHelper =
+                fakeTimeZoneProviderAppShellHelper.getSecondaryLocationProviderHelper();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        if (!mLocationTimeZoneManagerShellHelper.isLocationTimeZoneManagerPresent()) {
+            // Nothing to tear down.
+            return;
+        }
+
+        // Reset the geoDetectionEnabled state while there is at least one LTZP configured: this
+        // setting cannot be modified if there are no LTZPs on the device, e.g. on AOSP.
+        mTimeZoneDetectorShellHelper.setGeoDetectionEnabled(mOriginalGeoDetectionEnabled);
+
+        // Turn off the service before we reset configuration, otherwise it will restart itself
+        // repeatedly.
+        mLocationTimeZoneManagerShellHelper.stop();
+
+        // Reset settings and server flags as best we can.
+        mTimeZoneDetectorShellHelper.setAutoDetectionEnabled(mOriginalAutoDetectionEnabled);
+        mLocationShellHelper.setLocationEnabledForCurrentUser(mOriginalLocationEnabled);
+        mDeviceConfigShellHelper.restoreDeviceConfigStateForTest(mDeviceConfigPreTestState);
+
+        // Attempt to start the service. It may not start if there are no providers configured,
+        // but that is ok.
+        mLocationTimeZoneManagerShellHelper.start();
+    }
+
+    /** Tests what happens when there's only a primary provider and it makes a suggestion. */
     @Test
-    public void testSecondarySuggestion() throws Exception {
-        setProviderModeOverride(PRIMARY_PROVIDER_INDEX, PROVIDER_MODE_DISABLED);
-        setProviderModeOverride(SECONDARY_PROVIDER_INDEX, PROVIDER_MODE_SIMULATED);
-        startLocationTimeZoneManagerService();
-        setLocationTimeZoneManagerStateRecordingMode(true);
+    public void testOnlyPrimary_suggestionMade() throws Exception {
+        String testPrimaryLocationTimeZoneProviderPackageName = FAKE_TZPS_APP_PACKAGE;
+        String testSecondaryLocationTimeZoneProviderPackageName = null;
+        mLocationTimeZoneManagerShellHelper.startWithTestProviders(
+                testPrimaryLocationTimeZoneProviderPackageName,
+                testSecondaryLocationTimeZoneProviderPackageName,
+                true /* recordProviderStates */);
+        mTimeZoneDetectorShellHelper.setGeoDetectionEnabled(true);
+        mPrimaryFakeTimeZoneProviderShellHelper.assertCreated();
+        mSecondaryFakeTimeZoneProviderShellHelper.assertNotCreated();
 
-        simulateProviderBind(SECONDARY_PROVIDER_INDEX);
-        simulateProviderSuggestion(SECONDARY_PROVIDER_INDEX, "Europe/London");
+        {
+            LocationTimeZoneManagerServiceStateProto serviceState = dumpServiceState();
+            assertControllerStateHistory(serviceState,
+                    ControllerStateEnum.CONTROLLER_STATE_PROVIDERS_INITIALIZING,
+                    ControllerStateEnum.CONTROLLER_STATE_STOPPED,
+                    ControllerStateEnum.CONTROLLER_STATE_INITIALIZING);
+            assertNoLastSuggestion(serviceState);
+            assertProviderStates(serviceState.getPrimaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_DISABLED,
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_INITIALIZING);
+            mPrimaryFakeTimeZoneProviderShellHelper.assertCurrentState(PROVIDER_STATE_INITIALIZING);
 
-        LocationTimeZoneManagerServiceStateProto serviceState =
-                dumpLocationTimeZoneManagerServiceState();
-        assertEquals(Arrays.asList("Europe/London"),
-                serviceState.getLastSuggestion().getZoneIdsList());
+            assertProviderStates(serviceState.getSecondaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_DISABLED);
+        }
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
 
-        List<TimeZoneProviderStateProto> secondaryStates =
-                serviceState.getSecondaryProviderStatesList();
-        assertEquals(1, secondaryStates.size());
-        assertEquals(TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_CERTAIN,
-                secondaryStates.get(0).getState());
+        mPrimaryFakeTimeZoneProviderShellHelper.reportSuccess("Europe/London");
+
+        {
+            LocationTimeZoneManagerServiceStateProto serviceState = dumpServiceState();
+            assertControllerStateHistory(serviceState,
+                    ControllerStateEnum.CONTROLLER_STATE_CERTAIN);
+            assertLastSuggestion(serviceState, "Europe/London");
+            assertProviderStates(serviceState.getPrimaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_CERTAIN);
+            mPrimaryFakeTimeZoneProviderShellHelper.assertCurrentState(PROVIDER_STATE_CERTAIN);
+
+            assertProviderStates(serviceState.getSecondaryProviderStatesList());
+        }
+    }
+
+    /**
+     * Demonstrates that duplicate equivalent reports made by location time zone providers within
+     * a threshold time are ignored. It focuses on a single LTZP setup (primary only); the behavior
+     * for the secondary is assumed to be identical.
+     */
+    @Test
+    public void test_dupeSuggestionsMade_rateLimited() throws Exception {
+        // Set the rate setting sufficiently high that rate limiting will definitely take place.
+        mDeviceConfigShellHelper.put(NAMESPACE_SYSTEM_TIME,
+                KEY_LTZP_EVENT_FILTERING_AGE_THRESHOLD_MILLIS,
+                Long.toString(Duration.ofMinutes(10).toMillis()));
+
+        String testPrimaryLocationTimeZoneProviderPackageName = FAKE_TZPS_APP_PACKAGE;
+        String testSecondaryLocationTimeZoneProviderPackageName = null;
+        mLocationTimeZoneManagerShellHelper.startWithTestProviders(
+                testPrimaryLocationTimeZoneProviderPackageName,
+                testSecondaryLocationTimeZoneProviderPackageName,
+                true /* recordProviderStates */);
+        mTimeZoneDetectorShellHelper.setGeoDetectionEnabled(true);
+
+        mPrimaryFakeTimeZoneProviderShellHelper.assertCreated();
+        mSecondaryFakeTimeZoneProviderShellHelper.assertNotCreated();
+
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Report a new time zone.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportSuccess("Europe/London");
+        assertPrimaryReportedCertain();
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Duplicate time zone suggestion.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportSuccess("Europe/London");
+        assertPrimaryMadeNoReport();
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Report a new time zone.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportSuccess("Europe/Paris");
+        assertPrimaryReportedCertain();
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Duplicate time zone suggestion.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportSuccess("Europe/Paris");
+        assertPrimaryMadeNoReport();
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Report uncertain.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportUncertain();
+        assertPrimaryReportedUncertain();
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Duplicate uncertain report.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportUncertain();
+        assertPrimaryMadeNoReport();
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Report a new time zone.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportSuccess("Europe/Paris");
+        assertPrimaryReportedCertain();
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+    }
+
+    /**
+     * Demonstrates that duplicate equivalent reports made by location time zone providers above
+     * a threshold time are not filtered. It focuses on a single LTZP setup (primary only); the
+     * behavior for the secondary is assumed to be identical.
+     */
+    @Test
+    public void test_dupeSuggestionsMade_notRateLimited() throws Exception {
+        // Set the rate sufficiently low that rate limiting will not take place.
+        mDeviceConfigShellHelper.put(NAMESPACE_SYSTEM_TIME,
+                KEY_LTZP_EVENT_FILTERING_AGE_THRESHOLD_MILLIS,
+                "0");
+
+        String testPrimaryLocationTimeZoneProviderPackageName = FAKE_TZPS_APP_PACKAGE;
+        String testSecondaryLocationTimeZoneProviderPackageName = null;
+        mLocationTimeZoneManagerShellHelper.startWithTestProviders(
+                testPrimaryLocationTimeZoneProviderPackageName,
+                testSecondaryLocationTimeZoneProviderPackageName,
+                true /* recordProviderStates */);
+        mTimeZoneDetectorShellHelper.setGeoDetectionEnabled(true);
+        mPrimaryFakeTimeZoneProviderShellHelper.assertCreated();
+        mSecondaryFakeTimeZoneProviderShellHelper.assertNotCreated();
+
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Report a new time zone.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportSuccess("Europe/London");
+        assertPrimaryReportedCertain();
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Duplicate time zone suggestion.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportSuccess("Europe/London");
+        assertPrimaryReportedCertain();
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Report uncertain.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportUncertain();
+        assertPrimaryReportedUncertain();
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Duplicate uncertain report.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportUncertain();
+        assertPrimaryReportedUncertain();
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+    }
+
+    private void assertPrimaryReportedCertain() throws Exception {
+        LocationTimeZoneManagerServiceStateProto serviceState = dumpServiceState();
+        assertProviderStates(serviceState.getPrimaryProviderStatesList(),
+                TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_CERTAIN);
+    }
+
+    private void assertPrimaryMadeNoReport() throws Exception {
+        LocationTimeZoneManagerServiceStateProto serviceState = dumpServiceState();
+        assertProviderStates(serviceState.getPrimaryProviderStatesList());
+    }
+
+    private void assertPrimaryReportedUncertain() throws Exception {
+        LocationTimeZoneManagerServiceStateProto serviceState = dumpServiceState();
+        assertProviderStates(serviceState.getPrimaryProviderStatesList(),
+                TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_UNCERTAIN);
+    }
+
+    /** Tests what happens when there's only a secondary provider and it makes a suggestion. */
+    @Test
+    public void testOnlySecondary_suggestionMade() throws Exception {
+        String testPrimaryLocationTimeZoneProviderPackageName = null;
+        String testSecondaryLocationTimeZoneProviderPackageName = FAKE_TZPS_APP_PACKAGE;
+        mLocationTimeZoneManagerShellHelper.startWithTestProviders(
+                testPrimaryLocationTimeZoneProviderPackageName,
+                testSecondaryLocationTimeZoneProviderPackageName,
+                true /* recordProviderStates */);
+        mTimeZoneDetectorShellHelper.setGeoDetectionEnabled(true);
+        mPrimaryFakeTimeZoneProviderShellHelper.assertNotCreated();
+        mSecondaryFakeTimeZoneProviderShellHelper.assertCreated();
+
+        {
+            LocationTimeZoneManagerServiceStateProto serviceState = dumpServiceState();
+            assertControllerStateHistory(serviceState,
+                    ControllerStateEnum.CONTROLLER_STATE_PROVIDERS_INITIALIZING,
+                    ControllerStateEnum.CONTROLLER_STATE_STOPPED,
+                    ControllerStateEnum.CONTROLLER_STATE_INITIALIZING);
+            assertNoLastSuggestion(serviceState);
+            assertProviderStates(serviceState.getPrimaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_DISABLED,
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_INITIALIZING,
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_PERM_FAILED);
+
+            assertProviderStates(serviceState.getSecondaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_DISABLED,
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_INITIALIZING);
+        }
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        mSecondaryFakeTimeZoneProviderShellHelper.reportSuccess("Europe/London");
+
+        {
+            LocationTimeZoneManagerServiceStateProto serviceState = dumpServiceState();
+            assertControllerStateHistory(serviceState,
+                    ControllerStateEnum.CONTROLLER_STATE_CERTAIN);
+            assertLastSuggestion(serviceState, "Europe/London");
+            assertProviderStates(serviceState.getPrimaryProviderStatesList());
+
+            assertProviderStates(serviceState.getSecondaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_CERTAIN);
+            mSecondaryFakeTimeZoneProviderShellHelper.assertCurrentState(PROVIDER_STATE_CERTAIN);
+        }
+    }
+
+    /**
+     * Tests what happens when there's both a primary and a secondary provider, the primary starts
+     * by being uncertain, the secondary makes a suggestion, then the primary makes a suggestion.
+     */
+    @Test
+    public void testPrimaryAndSecondary() throws Exception {
+        String testPrimaryLocationTimeZoneProviderPackageName = FAKE_TZPS_APP_PACKAGE;
+        String testSecondaryLocationTimeZoneProviderPackageName = FAKE_TZPS_APP_PACKAGE;
+        mLocationTimeZoneManagerShellHelper.startWithTestProviders(
+                testPrimaryLocationTimeZoneProviderPackageName,
+                testSecondaryLocationTimeZoneProviderPackageName,
+                true /* recordProviderStates*/);
+        mTimeZoneDetectorShellHelper.setGeoDetectionEnabled(true);
+        mPrimaryFakeTimeZoneProviderShellHelper.assertCreated();
+        mSecondaryFakeTimeZoneProviderShellHelper.assertCreated();
+
+        {
+            LocationTimeZoneManagerServiceStateProto serviceState = dumpServiceState();
+            assertControllerStateHistory(serviceState,
+                    ControllerStateEnum.CONTROLLER_STATE_PROVIDERS_INITIALIZING,
+                    ControllerStateEnum.CONTROLLER_STATE_STOPPED,
+                    ControllerStateEnum.CONTROLLER_STATE_INITIALIZING);
+            assertNoLastSuggestion(serviceState);
+            assertProviderStates(serviceState.getPrimaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_DISABLED,
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_INITIALIZING);
+            mPrimaryFakeTimeZoneProviderShellHelper.assertCurrentState(PROVIDER_STATE_INITIALIZING);
+
+            assertProviderStates(serviceState.getSecondaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_DISABLED);
+            mSecondaryFakeTimeZoneProviderShellHelper.assertCurrentState(PROVIDER_STATE_DISABLED);
+        }
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Make the primary report being uncertain. This should cause the secondary to be started.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportUncertain();
+
+        {
+            LocationTimeZoneManagerServiceStateProto serviceState = dumpServiceState();
+            assertControllerStateHistory(serviceState);
+            assertNoLastSuggestion(serviceState);
+            assertProviderStates(serviceState.getPrimaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_UNCERTAIN);
+            mPrimaryFakeTimeZoneProviderShellHelper.assertCurrentState(PROVIDER_STATE_UNCERTAIN);
+
+            assertProviderStates(serviceState.getSecondaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_INITIALIZING);
+            mSecondaryFakeTimeZoneProviderShellHelper.assertCurrentState(
+                    PROVIDER_STATE_INITIALIZING);
+        }
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Make the secondary report being certain.
+        mSecondaryFakeTimeZoneProviderShellHelper.reportSuccess("Europe/London");
+
+        {
+            LocationTimeZoneManagerServiceStateProto serviceState = dumpServiceState();
+            assertControllerStateHistory(serviceState,
+                    ControllerStateEnum.CONTROLLER_STATE_CERTAIN);
+            assertLastSuggestion(serviceState, "Europe/London");
+            assertProviderStates(serviceState.getPrimaryProviderStatesList());
+            mPrimaryFakeTimeZoneProviderShellHelper.assertCurrentState(PROVIDER_STATE_UNCERTAIN);
+
+            assertProviderStates(serviceState.getSecondaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_CERTAIN);
+            mSecondaryFakeTimeZoneProviderShellHelper.assertCurrentState(PROVIDER_STATE_CERTAIN);
+        }
+        mLocationTimeZoneManagerShellHelper.clearRecordedProviderStates();
+
+        // Make the primary report being certain.
+        mPrimaryFakeTimeZoneProviderShellHelper.reportSuccess("Europe/Paris");
+
+        {
+            LocationTimeZoneManagerServiceStateProto serviceState = dumpServiceState();
+            assertControllerStateHistory(serviceState);
+            assertLastSuggestion(serviceState, "Europe/Paris");
+            assertProviderStates(serviceState.getPrimaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_CERTAIN);
+            mPrimaryFakeTimeZoneProviderShellHelper.assertCurrentState(PROVIDER_STATE_CERTAIN);
+
+            assertProviderStates(serviceState.getSecondaryProviderStatesList(),
+                    TimeZoneProviderStateEnum.TIME_ZONE_PROVIDER_STATE_DISABLED);
+            mSecondaryFakeTimeZoneProviderShellHelper.assertCurrentState(PROVIDER_STATE_DISABLED);
+        }
+    }
+
+    private static void assertControllerStateHistory(
+            LocationTimeZoneManagerServiceStateProto serviceState,
+            ControllerStateEnum... expectedStates) {
+        List<ControllerStateEnum> expectedStatesList = Arrays.asList(expectedStates);
+        List<ControllerStateEnum> actualStates = serviceState.getControllerStatesList();
+        assertEquals(expectedStatesList, actualStates);
+    }
+
+    private static void assertNoLastSuggestion(
+            LocationTimeZoneManagerServiceStateProto serviceState) {
+        if (serviceState.hasLastSuggestion()) {
+            fail("Expected no last suggestion, but found:" + serviceState.getLastSuggestion());
+        }
+    }
+
+    private static void assertLastSuggestion(LocationTimeZoneManagerServiceStateProto serviceState,
+            String... expectedTimeZones) {
+        assertFalse(expectedTimeZones == null || expectedTimeZones.length == 0);
+        assertTrue(serviceState.hasLastSuggestion());
+        List<String> expectedTimeZonesList = Arrays.asList(expectedTimeZones);
+        List<String> actualTimeZonesList = serviceState.getLastSuggestion().getZoneIdsList();
+        assertEquals(expectedTimeZonesList, actualTimeZonesList);
+    }
+
+    private static void assertProviderStates(List<TimeZoneProviderStateProto> actualStates,
+            TimeZoneProviderStateEnum... expectedStates) {
+        List<TimeZoneProviderStateEnum> expectedStatesList = Arrays.asList(expectedStates);
+        assertEquals("Expected states: " + expectedStatesList + ", but was " + actualStates,
+                expectedStatesList.size(), actualStates.size());
+        for (int i = 0; i < expectedStatesList.size(); i++) {
+            assertEquals("Expected states: " + expectedStatesList + ", but was " + actualStates,
+                    expectedStates[i], actualStates.get(i).getState());
+        }
+    }
+
+    private LocationTimeZoneManagerServiceStateProto dumpServiceState() throws Exception {
+        byte[] protoBytes = mLocationTimeZoneManagerShellHelper.dumpState();
+        Parser<LocationTimeZoneManagerServiceStateProto> parser =
+                LocationTimeZoneManagerServiceStateProto.parser();
+        return parser.parseFrom(protoBytes);
     }
 }
diff --git a/hostsidetests/time/host/src/android/time/cts/host/LocationTimeZoneManagerStatsTest.java b/hostsidetests/time/host/src/android/time/cts/host/LocationTimeZoneManagerStatsTest.java
index d24b060..0be4769 100644
--- a/hostsidetests/time/host/src/android/time/cts/host/LocationTimeZoneManagerStatsTest.java
+++ b/hostsidetests/time/host/src/android/time/cts/host/LocationTimeZoneManagerStatsTest.java
@@ -16,13 +16,20 @@
 
 package android.time.cts.host;
 
-import static android.app.time.cts.shell.LocationTimeZoneManagerShellHelper.PRIMARY_PROVIDER_INDEX;
-import static android.app.time.cts.shell.LocationTimeZoneManagerShellHelper.PROVIDER_MODE_DISABLED;
-import static android.app.time.cts.shell.LocationTimeZoneManagerShellHelper.PROVIDER_MODE_SIMULATED;
-import static android.app.time.cts.shell.LocationTimeZoneManagerShellHelper.SECONDARY_PROVIDER_INDEX;
+import static android.app.time.cts.shell.DeviceConfigKeys.NAMESPACE_SYSTEM_TIME;
+import static android.app.time.cts.shell.DeviceConfigShellHelper.SYNC_DISABLED_MODE_UNTIL_REBOOT;
+import static android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.FAKE_TZPS_APP_APK;
+import static android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper.FAKE_TZPS_APP_PACKAGE;
 
 import static java.util.stream.Collectors.toList;
 
+import android.app.time.cts.shell.DeviceConfigShellHelper;
+import android.app.time.cts.shell.DeviceShellCommandExecutor;
+import android.app.time.cts.shell.FakeTimeZoneProviderAppShellHelper;
+import android.app.time.cts.shell.LocationShellHelper;
+import android.app.time.cts.shell.LocationTimeZoneManagerShellHelper;
+import android.app.time.cts.shell.TimeZoneDetectorShellHelper;
+import android.app.time.cts.shell.host.HostShellCommandExecutor;
 import android.cts.statsdatom.lib.AtomTestUtils;
 import android.cts.statsdatom.lib.ConfigUtils;
 import android.cts.statsdatom.lib.DeviceUtils;
@@ -31,7 +38,9 @@
 import com.android.os.AtomsProto;
 import com.android.os.AtomsProto.LocationTimeZoneProviderStateChanged;
 import com.android.os.StatsLog;
+import com.android.tradefed.device.ITestDevice;
 import com.android.tradefed.testtype.DeviceJUnit4ClassRunner;
+import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test;
 
 import org.junit.After;
 import org.junit.Before;
@@ -46,54 +55,137 @@
 
 /** Host-side CTS tests for the location time zone manager service stats logging. */
 @RunWith(DeviceJUnit4ClassRunner.class)
-public class LocationTimeZoneManagerStatsTest extends BaseLocationTimeZoneManagerHostTest {
+public class LocationTimeZoneManagerStatsTest extends BaseHostJUnit4Test {
+
+    private static final int PRIMARY_PROVIDER_INDEX = 0;
+    private static final int SECONDARY_PROVIDER_INDEX = 1;
 
     private static final int PROVIDER_STATES_COUNT =
             LocationTimeZoneProviderStateChanged.State.values().length;
 
+    private TimeZoneDetectorShellHelper mTimeZoneDetectorShellHelper;
+    private LocationTimeZoneManagerShellHelper mLocationTimeZoneManagerShellHelper;
+    private LocationShellHelper mLocationShellHelper;
+    private DeviceConfigShellHelper mDeviceConfigShellHelper;
+    private DeviceConfigShellHelper.PreTestState mDeviceConfigPreTestState;
+
+    private boolean mOriginalLocationEnabled;
+    private boolean mOriginalAutoDetectionEnabled;
+    private boolean mOriginalGeoDetectionEnabled;
+
     @Before
-    @Override
     public void setUp() throws Exception {
-        super.setUp();
-        ConfigUtils.removeConfig(getDevice());
-        ReportUtils.clearReports(getDevice());
+        ITestDevice device = getDevice();
+        DeviceShellCommandExecutor shellCommandExecutor = new HostShellCommandExecutor(device);
+        mLocationTimeZoneManagerShellHelper =
+                new LocationTimeZoneManagerShellHelper(shellCommandExecutor);
+
+        // Confirm the service being tested is present. It can be turned off, in which case there's
+        // nothing to test.
+        mLocationTimeZoneManagerShellHelper.assumeLocationTimeZoneManagerIsPresent();
+
+        // Install the app that hosts the fake providers.
+        // Installations are tracked in BaseHostJUnit4Test and uninstalled automatically.
+        installPackage(FAKE_TZPS_APP_APK);
+
+        mTimeZoneDetectorShellHelper = new TimeZoneDetectorShellHelper(shellCommandExecutor);
+        mLocationShellHelper = new LocationShellHelper(shellCommandExecutor);
+        mDeviceConfigShellHelper = new DeviceConfigShellHelper(shellCommandExecutor);
+
+        mDeviceConfigPreTestState = mDeviceConfigShellHelper.setSyncModeForTest(
+                SYNC_DISABLED_MODE_UNTIL_REBOOT, NAMESPACE_SYSTEM_TIME);
+
+        // All tests start with the location_time_zone_manager disabled so that providers can be
+        // configured.
+        mLocationTimeZoneManagerShellHelper.stop();
+
+        // Make sure locations is enabled, otherwise the geo detection feature will be disabled
+        // whatever the geolocation detection setting is set to.
+        mOriginalLocationEnabled = mLocationShellHelper.isLocationEnabledForCurrentUser();
+        if (!mOriginalLocationEnabled) {
+            mLocationShellHelper.setLocationEnabledForCurrentUser(true);
+        }
+
+        // Make sure automatic time zone detection is enabled, otherwise the geo detection feature
+        // will be disabled whatever the geolocation detection setting is set to
+        mOriginalAutoDetectionEnabled = mTimeZoneDetectorShellHelper.isAutoDetectionEnabled();
+        if (!mOriginalAutoDetectionEnabled) {
+            mTimeZoneDetectorShellHelper.setAutoDetectionEnabled(true);
+        }
+
+        // On devices with no location time zone providers (e.g. AOSP), we cannot turn geo detection
+        // on until the test LTZPs are configured as the time_zone_detector will refuse.
+        mOriginalGeoDetectionEnabled = mTimeZoneDetectorShellHelper.isGeoDetectionEnabled();
+
+        // Make sure that the fake providers used in the tests are available.
+        FakeTimeZoneProviderAppShellHelper fakeTimeZoneProviderAppShellHelper =
+                new FakeTimeZoneProviderAppShellHelper(shellCommandExecutor);
+        fakeTimeZoneProviderAppShellHelper.waitForInstallation();
+
+        ConfigUtils.removeConfig(device);
+        ReportUtils.clearReports(device);
     }
 
     @After
-    @Override
     public void tearDown() throws Exception {
+        if (!mLocationTimeZoneManagerShellHelper.isLocationTimeZoneManagerPresent()) {
+            // Nothing to tear down.
+            return;
+        }
+
+        // Reset the geoDetectionEnabled state while there is at least one LTZP configured: this
+        // setting cannot be modified if there are no LTZPs on the device, e.g. on AOSP.
+        mTimeZoneDetectorShellHelper.setGeoDetectionEnabled(mOriginalGeoDetectionEnabled);
+
+        // Turn off the service before we reset configuration, otherwise it will restart itself
+        // repeatedly.
+        mLocationTimeZoneManagerShellHelper.stop();
+
+        // Reset settings and server flags as best we can.
+        mTimeZoneDetectorShellHelper.setAutoDetectionEnabled(mOriginalAutoDetectionEnabled);
+        mLocationShellHelper.setLocationEnabledForCurrentUser(mOriginalLocationEnabled);
+
         ConfigUtils.removeConfig(getDevice());
         ReportUtils.clearReports(getDevice());
-        super.tearDown();
+        mDeviceConfigShellHelper.restoreDeviceConfigStateForTest(mDeviceConfigPreTestState);
+
+        // Attempt to start the service. It may not start if there are no providers configured,
+        // but that is ok.
+        mLocationTimeZoneManagerShellHelper.start();
     }
 
     @Test
     public void testAtom_locationTimeZoneProviderStateChanged() throws Exception {
-        setProviderModeOverride(PRIMARY_PROVIDER_INDEX, PROVIDER_MODE_DISABLED);
-        setProviderModeOverride(SECONDARY_PROVIDER_INDEX, PROVIDER_MODE_SIMULATED);
-        mTimeZoneDetectorShellHelper.setGeoDetectionEnabled(false);
-
-        startLocationTimeZoneManagerService();
-
         ConfigUtils.uploadConfigForPushedAtom(getDevice(), DeviceUtils.STATSD_ATOM_TEST_PKG,
                 AtomsProto.Atom.LOCATION_TIME_ZONE_PROVIDER_STATE_CHANGED_FIELD_NUMBER);
 
+        String testPrimaryLocationTimeZoneProviderPackageName = null;
+        String testSecondaryLocationTimeZoneProviderPackageName = FAKE_TZPS_APP_PACKAGE;
+        mLocationTimeZoneManagerShellHelper.startWithTestProviders(
+                testPrimaryLocationTimeZoneProviderPackageName,
+                testSecondaryLocationTimeZoneProviderPackageName,
+                true /* recordProviderStates */);
+
         // Turn geo detection on and off, twice.
         for (int i = 0; i < 2; i++) {
+            Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
             mTimeZoneDetectorShellHelper.setGeoDetectionEnabled(true);
             Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
             mTimeZoneDetectorShellHelper.setGeoDetectionEnabled(false);
-            Thread.sleep(AtomTestUtils.WAIT_TIME_SHORT);
         }
 
         // Sorted list of events in order in which they occurred.
         List<StatsLog.EventMetricData> data = ReportUtils.getEventMetricDataList(getDevice());
 
         // States.
+        Set<Integer> primaryProviderCreated = singletonStateId(PRIMARY_PROVIDER_INDEX,
+                LocationTimeZoneProviderStateChanged.State.STOPPED);
         Set<Integer> primaryProviderStarted = singletonStateId(PRIMARY_PROVIDER_INDEX,
                 LocationTimeZoneProviderStateChanged.State.INITIALIZING);
         Set<Integer> primaryProviderFailed = singletonStateId(PRIMARY_PROVIDER_INDEX,
                 LocationTimeZoneProviderStateChanged.State.PERM_FAILED);
+        Set<Integer> secondaryProviderCreated = singletonStateId(SECONDARY_PROVIDER_INDEX,
+                LocationTimeZoneProviderStateChanged.State.STOPPED);
         Set<Integer> secondaryProviderStarted = singletonStateId(SECONDARY_PROVIDER_INDEX,
                 LocationTimeZoneProviderStateChanged.State.INITIALIZING);
         Set<Integer> secondaryProviderStopped = singletonStateId(SECONDARY_PROVIDER_INDEX,
@@ -108,21 +200,12 @@
         // Assert that the events happened in the expected order. This does not check "wait" (the
         // time between events).
         List<Set<Integer>> stateSets = Arrays.asList(
+                primaryProviderCreated, secondaryProviderCreated,
                 primaryProviderStarted, primaryProviderFailed,
                 secondaryProviderStarted, secondaryProviderStopped,
                 secondaryProviderStarted, secondaryProviderStopped);
-        AtomTestUtils.assertStatesOccurred(stateSets, data,
+        AtomTestUtils.assertStatesOccurredInOrder(stateSets, data,
                 0 /* wait */, eventToStateFunction);
-
-        // Assert that the events for the secondary provider happened in the expected order. This
-        // does check "wait" (the time between events).
-        List<StatsLog.EventMetricData> secondaryEvents =
-                extractEventsForProviderIndex(data, SECONDARY_PROVIDER_INDEX);
-        List<Set<Integer>> secondaryStateSets = Arrays.asList(
-                secondaryProviderStarted, secondaryProviderStopped,
-                secondaryProviderStarted, secondaryProviderStopped);
-        AtomTestUtils.assertStatesOccurred(secondaryStateSets, secondaryEvents,
-                AtomTestUtils.WAIT_TIME_SHORT /* wait */, eventToStateFunction);
     }
 
     private static Set<Integer> singletonStateId(int providerIndex,
diff --git a/hostsidetests/time/host/src/android/time/cts/host/TimeZoneDetectorStatsTest.java b/hostsidetests/time/host/src/android/time/cts/host/TimeZoneDetectorStatsTest.java
index 92992f7..4b8a83c 100644
--- a/hostsidetests/time/host/src/android/time/cts/host/TimeZoneDetectorStatsTest.java
+++ b/hostsidetests/time/host/src/android/time/cts/host/TimeZoneDetectorStatsTest.java
@@ -17,6 +17,7 @@
 package android.time.cts.host;
 
 import static android.app.time.cts.shell.DeviceConfigKeys.NAMESPACE_SYSTEM_TIME;
+import static android.app.time.cts.shell.DeviceConfigShellHelper.SYNC_DISABLED_MODE_UNTIL_REBOOT;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
@@ -24,8 +25,8 @@
 import android.app.time.cts.shell.DeviceConfigShellHelper;
 import android.app.time.cts.shell.DeviceShellCommandExecutor;
 import android.app.time.cts.shell.LocationShellHelper;
-import android.app.time.cts.shell.host.HostShellCommandExecutor;
 import android.app.time.cts.shell.TimeZoneDetectorShellHelper;
+import android.app.time.cts.shell.host.HostShellCommandExecutor;
 import android.cts.statsdatom.lib.AtomTestUtils;
 import android.cts.statsdatom.lib.ConfigUtils;
 import android.cts.statsdatom.lib.DeviceUtils;
@@ -59,7 +60,7 @@
         mLocationShellHelper = new LocationShellHelper(shellCommandExecutor);
         mDeviceConfigShellHelper = new DeviceConfigShellHelper(shellCommandExecutor);
         mDeviceConfigPreTestState = mDeviceConfigShellHelper.setSyncModeForTest(
-                DeviceConfigShellHelper.SYNC_DISABLED_MODE_UNTIL_REBOOT, NAMESPACE_SYSTEM_TIME);
+                SYNC_DISABLED_MODE_UNTIL_REBOOT, NAMESPACE_SYSTEM_TIME);
 
         ConfigUtils.removeConfig(getDevice());
         ReportUtils.clearReports(getDevice());
diff --git a/hostsidetests/tv/AndroidTest.xml b/hostsidetests/tv/AndroidTest.xml
index bd883d0..8bb7406 100644
--- a/hostsidetests/tv/AndroidTest.xml
+++ b/hostsidetests/tv/AndroidTest.xml
@@ -20,6 +20,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsHostsideTvTests.jar" />
         <option name="runtime-hint" value="8m10s" />
diff --git a/libs/hardware/Android.bp b/libs/hardware/Android.bp
new file mode 100644
index 0000000..edbef4e
--- /dev/null
+++ b/libs/hardware/Android.bp
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_library_static {
+    name: "cts-hardware-lib",
+
+    static_libs: [
+        "junit",
+    ],
+
+    srcs: ["src/**/*.java"],
+
+    sdk_version: "current",
+}
diff --git a/libs/hardware/src/com/android/cts/hardware/SyncFenceUtil.java b/libs/hardware/src/com/android/cts/hardware/SyncFenceUtil.java
new file mode 100644
index 0000000..fc4ebae
--- /dev/null
+++ b/libs/hardware/src/com/android/cts/hardware/SyncFenceUtil.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2022 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.cts.hardware;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.hardware.SyncFence;
+import android.opengl.EGL14;
+import android.opengl.EGL15;
+import android.opengl.EGLConfig;
+import android.opengl.EGLContext;
+import android.opengl.EGLDisplay;
+import android.opengl.EGLExt;
+import android.opengl.EGLSurface;
+import android.opengl.EGLSync;
+import android.opengl.GLES20;
+
+public class SyncFenceUtil {
+    public static SyncFence createUselessFence() {
+        EGLDisplay eglDisplay = EGL15.EGL_NO_DISPLAY;
+        EGLConfig eglConfig = null;
+        EGLSurface eglPbuffer = EGL15.EGL_NO_SURFACE;
+        EGLContext eglContext = EGL15.EGL_NO_CONTEXT;
+        int error;
+
+        eglDisplay = EGL15.eglGetPlatformDisplay(EGL15.EGL_PLATFORM_ANDROID_KHR,
+            EGL14.EGL_DEFAULT_DISPLAY,
+            new long[] {
+                EGL14.EGL_NONE },
+            0);
+        if (eglDisplay == EGL15.EGL_NO_DISPLAY) {
+            throw new RuntimeException("no EGL display");
+        }
+        error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("eglGetPlatformDisplay failed");
+        }
+
+        int[] major = new int[1];
+        int[] minor = new int[1];
+        if (!EGL14.eglInitialize(eglDisplay, major, 0, minor, 0)) {
+            throw new RuntimeException("error in eglInitialize");
+        }
+        error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("eglInitialize failed");
+        }
+
+        // If we could rely on having EGL_KHR_surfaceless_context and EGL_KHR_context_no_config, we
+        // wouldn't have to create a config or pbuffer at all.
+
+        int[] numConfigs = new int[1];
+        EGLConfig[] configs = new EGLConfig[1];
+        if (!EGL14.eglChooseConfig(eglDisplay,
+                new int[] {
+                    EGL14.EGL_RENDERABLE_TYPE, EGL14.EGL_OPENGL_ES2_BIT,
+                    EGL14.EGL_SURFACE_TYPE, EGL14.EGL_PBUFFER_BIT,
+                    EGL14.EGL_NONE},
+                0, configs, 0, 1, numConfigs, 0)) {
+            throw new RuntimeException("eglChooseConfig failed");
+        }
+        error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("eglChooseConfig failed");
+        }
+
+        eglConfig = configs[0];
+
+        eglPbuffer = EGL14.eglCreatePbufferSurface(eglDisplay, eglConfig,
+              new int[] {EGL14.EGL_WIDTH, 1, EGL14.EGL_HEIGHT, 1, EGL14.EGL_NONE}, 0);
+        if (eglPbuffer == EGL15.EGL_NO_SURFACE) {
+            throw new RuntimeException("eglCreatePbufferSurface failed");
+        }
+        error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("eglCreatePbufferSurface failed");
+        }
+
+        eglContext = EGL14.eglCreateContext(eglDisplay, eglConfig, EGL14.EGL_NO_CONTEXT,
+              new int[] {EGL14.EGL_CONTEXT_CLIENT_VERSION, 2, EGL14.EGL_NONE}, 0);
+        if (eglContext == EGL15.EGL_NO_CONTEXT) {
+            throw new RuntimeException("eglCreateContext failed");
+        }
+        error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("eglCreateContext failed");
+        }
+
+        if (!EGL14.eglMakeCurrent(eglDisplay, eglPbuffer, eglPbuffer, eglContext)) {
+            throw new RuntimeException("eglMakeCurrent failed");
+        }
+        error = EGL14.eglGetError();
+        if (error != EGL14.EGL_SUCCESS) {
+            throw new RuntimeException("eglMakeCurrent failed");
+        }
+
+        SyncFence nativeFence = null;
+
+        String eglExtensions = EGL14.eglQueryString(eglDisplay, EGL14.EGL_EXTENSIONS);
+        if (eglExtensions.contains("EGL_ANDROID_native_fence_sync")) {
+            EGLSync sync = EGL15.eglCreateSync(eglDisplay, EGLExt.EGL_SYNC_NATIVE_FENCE_ANDROID,
+                    new long[] {
+                        EGL14.EGL_NONE },
+                    0);
+            assertNotEquals(sync, EGL15.EGL_NO_SYNC);
+            assertEquals(EGL14.EGL_SUCCESS, EGL14.eglGetError());
+
+            nativeFence = EGLExt.eglDupNativeFenceFDANDROID(eglDisplay, sync);
+            assertNotNull(nativeFence);
+            assertEquals(EGL14.EGL_SUCCESS, EGL14.eglGetError());
+            // If the fence isn't valid, trigger a flush & try again
+            if (!nativeFence.isValid()) {
+                GLES20.glFlush();
+                assertEquals(GLES20.GL_NO_ERROR, GLES20.glGetError());
+
+                // Have flushed, native fence should be populated
+                nativeFence = EGLExt.eglDupNativeFenceFDANDROID(eglDisplay, sync);
+                assertNotNull(nativeFence);
+                assertTrue(nativeFence.isValid());
+                assertEquals(EGL14.EGL_SUCCESS, EGL14.eglGetError());
+            }
+
+            assertTrue(EGL15.eglDestroySync(eglDisplay, sync));
+        }
+
+        EGL14.eglTerminate(eglDisplay);
+
+        return nativeFence;
+    }
+}
diff --git a/libs/input/src/com/android/cts/input/UinputDevice.java b/libs/input/src/com/android/cts/input/UinputDevice.java
index 5a1441c..b2db4e0 100644
--- a/libs/input/src/com/android/cts/input/UinputDevice.java
+++ b/libs/input/src/com/android/cts/input/UinputDevice.java
@@ -75,6 +75,19 @@
     }
 
     /**
+     * Create Uinput device using the provided resourceId.
+     */
+    public static UinputDevice create(Instrumentation instrumentation, int resourceId,
+            int sources) {
+        final InputJsonParser parser = new InputJsonParser(instrumentation.getTargetContext());
+        final int resourceDeviceId = parser.readDeviceId(resourceId);
+        final String registerCommand = parser.readRegisterCommand(resourceId);
+        return new UinputDevice(instrumentation, resourceDeviceId,
+                parser.readVendorId(resourceId), parser.readProductId(resourceId),
+                sources, registerCommand);
+    }
+
+    /**
      * Get uinput command return results as list of UinputResultData
      *
      * @return List of UinputResultData results
diff --git a/libs/input/src/com/android/cts/input/VirtualInputDevice.java b/libs/input/src/com/android/cts/input/VirtualInputDevice.java
index 5c8879c..2fd4154 100644
--- a/libs/input/src/com/android/cts/input/VirtualInputDevice.java
+++ b/libs/input/src/com/android/cts/input/VirtualInputDevice.java
@@ -198,6 +198,18 @@
         return mDeviceId;
     }
 
+    public int getRegisterCommandDeviceId() {
+        return mId;
+    }
+
+    public int getVendorId() {
+        return mVendorId;
+    }
+
+    public int getProductId() {
+        return mProductId;
+    }
+
     private void setupPipes() {
         UiAutomation ui = mInstrumentation.getUiAutomation();
         ParcelFileDescriptor[] pipes = ui.executeShellCommandRw(getShellCommand());
diff --git a/libs/install/Android.bp b/libs/install/Android.bp
index 4e2c335..e0589ac 100644
--- a/libs/install/Android.bp
+++ b/libs/install/Android.bp
@@ -132,6 +132,31 @@
     apex_available: [ "com.android.apex.apkrollback.test_v2" ],
 }
 
+android_test_helper_app {
+    name: "TestAppARollbackWipeV2",
+    manifest: "testapp/ARollbackWipeV2.xml",
+    sdk_version: "current",
+    srcs: ["testapp/src/**/*.java"],
+    resource_dirs: ["testapp/res_v2"],
+    apex_available: [ "com.android.apex.apkrollback.test_v2" ],
+}
+
+android_test_helper_app {
+    name: "TestAppBRollbackRestoreV2",
+    manifest: "testapp/BRollbackRestoreV2.xml",
+    sdk_version: "current",
+    srcs: ["testapp/src/**/*.java"],
+    resource_dirs: ["testapp/res_v2"],
+}
+
+android_test_helper_app {
+    name: "TestAppCRollbackRetainV2",
+    manifest: "testapp/CRollbackRetainV2.xml",
+    sdk_version: "current",
+    srcs: ["testapp/src/**/*.java"],
+    resource_dirs: ["testapp/res_v2"],
+}
+
 java_library {
     name: "cts-install-lib-java",
     srcs: ["src/**/lib/*.java"],
@@ -156,6 +181,9 @@
         ":TestAppASplitV2",
         ":TestAppAOriginalV1",
         ":TestAppARotatedV2",
+        ":TestAppARollbackWipeV2",
+        ":TestAppBRollbackRestoreV2",
+        ":TestAppCRollbackRetainV2",
         ":StagedInstallTestApexV1",
         ":StagedInstallTestApexV2",
         ":StagedInstallTestApexV3",
@@ -168,7 +196,7 @@
     static_libs: [
         "cts-install-lib-java",
     ],
-    min_sdk_version: "30",
+    min_sdk_version: "29",
 }
 
 java_library_host {
diff --git a/libs/install/src/com/android/cts/install/lib/Install.java b/libs/install/src/com/android/cts/install/lib/Install.java
index 377e88a2..ae1fcea 100644
--- a/libs/install/src/com/android/cts/install/lib/Install.java
+++ b/libs/install/src/com/android/cts/install/lib/Install.java
@@ -20,6 +20,7 @@
 
 import android.content.Intent;
 import android.content.pm.PackageInstaller;
+import android.text.TextUtils;
 
 import com.android.compatibility.common.util.SystemUtil;
 
@@ -38,6 +39,7 @@
     // Indicates whether Install represents a multiPackage install.
     private final boolean mIsMultiPackage;
     // PackageInstaller.Session parameters.
+    private String mPackageName = null;
     private boolean mIsStaged = false;
     private boolean mIsDowngrade = false;
     private boolean mEnableRollback = false;
@@ -96,6 +98,14 @@
     }
 
     /**
+     * Sets package name to the session params.
+     */
+    public Install setPackageName(String packageName) {
+        mPackageName = packageName;
+        return this;
+    }
+
+    /**
      * Makes the install a staged install.
      */
     public Install setStaged() {
@@ -178,9 +188,6 @@
             session.commit(sender.getIntentSender());
             Intent result = sender.getResult();
             InstallUtils.assertStatusSuccess(result);
-            if (mIsStaged) {
-                InstallUtils.waitForSessionReady(sessionId);
-            }
             return sessionId;
         }
     }
@@ -227,6 +234,9 @@
         try {
             PackageInstaller.SessionParams params =
                     new PackageInstaller.SessionParams(mSessionMode);
+            if (!TextUtils.isEmpty(mPackageName)) {
+                params.setAppPackageName(mPackageName);
+            }
             if (multiPackage) {
                 params.setMultiPackage();
             }
diff --git a/libs/install/src/com/android/cts/install/lib/InstallUtils.java b/libs/install/src/com/android/cts/install/lib/InstallUtils.java
index 2a64efe..3fab84f 100644
--- a/libs/install/src/com/android/cts/install/lib/InstallUtils.java
+++ b/libs/install/src/com/android/cts/install/lib/InstallUtils.java
@@ -17,7 +17,6 @@
 package com.android.cts.install.lib;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.junit.Assert.fail;
 
@@ -26,7 +25,6 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageInstaller;
@@ -44,7 +42,6 @@
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Utilities to facilitate installation in tests.
@@ -86,7 +83,8 @@
         Context context = InstrumentationRegistry.getTargetContext();
         PackageManager pm = context.getPackageManager();
         try {
-            PackageInfo info = pm.getPackageInfo(packageName, PackageManager.MATCH_APEX);
+            PackageInfo info = pm.getPackageInfo(packageName,
+                    PackageManager.PackageInfoFlags.of(PackageManager.MATCH_APEX));
             return info.getLongVersionCode();
         } catch (PackageManager.NameNotFoundException e) {
             return -1;
@@ -94,70 +92,14 @@
     }
 
     /**
-     * Waits for the given session to be marked as ready or failed and returns it.
-     */
-    public static PackageInstaller.SessionInfo waitForSession(int sessionId) {
-        BlockingQueue<PackageInstaller.SessionInfo> sessionStatus = new LinkedBlockingQueue<>();
-        BroadcastReceiver sessionUpdatedReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                PackageInstaller.SessionInfo info =
-                        intent.getParcelableExtra(PackageInstaller.EXTRA_SESSION);
-                if (info != null && info.getSessionId() == sessionId) {
-                    if (info.isStagedSessionReady() || info.isStagedSessionFailed()) {
-                        try {
-                            sessionStatus.put(info);
-                        } catch (InterruptedException e) {
-                            throw new AssertionError(e);
-                        }
-                    }
-                }
-            }
-        };
-        IntentFilter sessionUpdatedFilter =
-                new IntentFilter(PackageInstaller.ACTION_SESSION_UPDATED);
-
-        Context context = InstrumentationRegistry.getTargetContext();
-        context.registerReceiver(sessionUpdatedReceiver, sessionUpdatedFilter);
-
-        PackageInstaller installer = getPackageInstaller();
-        PackageInstaller.SessionInfo info = installer.getSessionInfo(sessionId);
-
-        try {
-            if (info.isStagedSessionReady() || info.isStagedSessionFailed()) {
-                sessionStatus.put(info);
-            }
-            info = sessionStatus.poll(60, TimeUnit.SECONDS);
-            context.unregisterReceiver(sessionUpdatedReceiver);
-            assertWithMessage("Timed out while waiting for session to get ready/failed")
-                    .that(info).isNotNull();
-            assertThat(info.getSessionId()).isEqualTo(sessionId);
-            return info;
-        } catch (InterruptedException e) {
-            throw new AssertionError(e);
-        }
-    }
-
-    /**
-     * Waits for the given session to be marked as ready.
-     * Throws an assertion if the session fails.
-     */
-    public static void waitForSessionReady(int sessionId) {
-        PackageInstaller.SessionInfo info = waitForSession(sessionId);
-        // TODO: migrate to PackageInstallerSessionInfoSubject
-        if (info.isStagedSessionFailed()) {
-            throw new AssertionError(info.getStagedSessionErrorMessage());
-        }
-    }
-
-    /**
      * Returns the info for the given package name.
      */
     public static PackageInfo getPackageInfo(String packageName) {
         Context context = InstrumentationRegistry.getTargetContext();
         PackageManager pm = context.getPackageManager();
         try {
-            return pm.getPackageInfo(packageName, PackageManager.MATCH_APEX);
+            return pm.getPackageInfo(packageName,
+                    PackageManager.PackageInfoFlags.of(PackageManager.MATCH_APEX));
         } catch (PackageManager.NameNotFoundException e) {
             return null;
         }
@@ -378,7 +320,8 @@
         for (int userId: userIds) {
             List<PackageInfo> installedPackages;
             if (userId != userIdToCheck) {
-                installedPackages = pm.getInstalledPackagesAsUser(PackageManager.MATCH_APEX,
+                installedPackages = pm.getInstalledPackagesAsUser(
+                        PackageManager.PackageInfoFlags.of(PackageManager.MATCH_APEX),
                         userId);
                 for (PackageInfo pi : installedPackages) {
                     if (pi.packageName.equals(packageName)) {
diff --git a/libs/install/src/com/android/cts/install/lib/LocalIntentSender.java b/libs/install/src/com/android/cts/install/lib/LocalIntentSender.java
index cdf709c..85b1ac6 100644
--- a/libs/install/src/com/android/cts/install/lib/LocalIntentSender.java
+++ b/libs/install/src/com/android/cts/install/lib/LocalIntentSender.java
@@ -54,7 +54,8 @@
         Context context = InstrumentationRegistry.getTargetContext();
         // Generate a unique string to ensure each LocalIntentSender gets its own results.
         String action = LocalIntentSender.class.getName() + SystemClock.elapsedRealtime();
-        context.registerReceiver(this, new IntentFilter(action));
+        context.registerReceiver(this, new IntentFilter(action),
+                Context.RECEIVER_EXPORTED_UNAUDITED);
         Intent intent = new Intent(action);
         PendingIntent pending = PendingIntent.getBroadcast(context, 0, intent, FLAG_MUTABLE);
         return pending.getIntentSender();
diff --git a/libs/install/src/com/android/cts/install/lib/PackageInstallerSessionInfoSubject.java b/libs/install/src/com/android/cts/install/lib/PackageInstallerSessionInfoSubject.java
new file mode 100644
index 0000000..74c75eb
--- /dev/null
+++ b/libs/install/src/com/android/cts/install/lib/PackageInstallerSessionInfoSubject.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2019 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.cts.install.lib;
+
+import android.content.pm.PackageInstaller;
+
+import com.google.common.truth.FailureMetadata;
+import com.google.common.truth.Subject;
+import com.google.common.truth.Truth;
+
+import javax.annotation.Nullable;
+
+public final class PackageInstallerSessionInfoSubject extends Subject {
+    private final PackageInstaller.SessionInfo mActual;
+
+    private PackageInstallerSessionInfoSubject(FailureMetadata failureMetadata,
+            @Nullable PackageInstaller.SessionInfo subject) {
+        super(failureMetadata, subject);
+        mActual = subject;
+    }
+
+    private static Subject.Factory<PackageInstallerSessionInfoSubject,
+            PackageInstaller.SessionInfo> sessions() {
+        return new Subject.Factory<PackageInstallerSessionInfoSubject,
+                PackageInstaller.SessionInfo>() {
+            @Override
+            public PackageInstallerSessionInfoSubject createSubject(FailureMetadata failureMetadata,
+                    PackageInstaller.SessionInfo session) {
+                return new PackageInstallerSessionInfoSubject(failureMetadata, session);
+            }
+        };
+    }
+
+    public static PackageInstallerSessionInfoSubject assertThat(
+            PackageInstaller.SessionInfo session) {
+        return Truth.assertAbout(sessions()).that(session);
+    }
+
+    public void isStagedSessionReady() {
+        check(failureMessage("in state READY")).that(mActual.isStagedSessionReady()).isTrue();
+    }
+
+    public void isStagedSessionApplied() {
+        check(failureMessage("in state APPLIED")).that(mActual.isStagedSessionApplied()).isTrue();
+    }
+
+    public void isStagedSessionFailed() {
+        check(failureMessage("in state FAILED")).that(mActual.isStagedSessionFailed()).isTrue();
+    }
+
+    private String failureMessage(String suffix) {
+        return String.format("Not true that session %s is %s", subjectAsString(), suffix);
+    }
+
+    private String subjectAsString() {
+        return "{" + "appPackageName = " + mActual.getAppPackageName() + "; "
+                + "sessionId = " + mActual.getSessionId() + "; "
+                + "isStagedSessionReady = " + mActual.isStagedSessionReady() + "; "
+                + "isStagedSessionApplied = " + mActual.isStagedSessionApplied() + "; "
+                + "isStagedSessionFailed = " + mActual.isStagedSessionFailed() + "; "
+                + "stagedSessionErrorMessage = " + mActual.getStagedSessionErrorMessage() + "}";
+    }
+}
diff --git a/libs/install/src/com/android/cts/install/lib/TestApp.java b/libs/install/src/com/android/cts/install/lib/TestApp.java
index 8775ef4..8e550d9 100644
--- a/libs/install/src/com/android/cts/install/lib/TestApp.java
+++ b/libs/install/src/com/android/cts/install/lib/TestApp.java
@@ -54,6 +54,8 @@
             "TestAppAOriginalV1.apk");
     public static final TestApp ARotated2 = new TestApp("ARotatedV2", A, 2, /*isApex*/false,
             "TestAppARotatedV2.apk");
+    public static final TestApp ARollbackWipe2 = new TestApp("ARollbackWipe2", A, 2,
+            /*isApex*/false, "TestAppARollbackWipeV2.apk");
 
     public static final TestApp B1 = new TestApp("Bv1", B, 1, /*isApex*/false,
             "TestAppBv1.apk");
@@ -61,11 +63,15 @@
             "TestAppBv2.apk");
     public static final TestApp B3 = new TestApp("Bv3", B, 3, /*isApex*/false,
             "TestAppBv3.apk");
+    public static final TestApp BRollbackRestore2 = new TestApp("BRollbackRestore2", B, 2,
+            /*isApex*/false, "TestAppBRollbackRestoreV2.apk");
 
     public static final TestApp C1 = new TestApp("Cv1", C, 1, /*isApex*/false,
             "TestAppCv1.apk");
     public static final TestApp C2 = new TestApp("Cv2", C, 2, /*isApex*/false,
             "TestAppCv2.apk");
+    public static final TestApp CRollbackRetain2 = new TestApp("CRollbackRetain2", C, 2,
+            /*isApex*/false, "TestAppCRollbackRetainV2.apk");
 
     // Apex collection
     public static final TestApp Apex1 = new TestApp("Apex1", SHIM_APEX_PACKAGE_NAME, 1,
diff --git a/libs/install/testapp/ARollbackWipeV2.xml b/libs/install/testapp/ARollbackWipeV2.xml
new file mode 100644
index 0000000..047efb5
--- /dev/null
+++ b/libs/install/testapp/ARollbackWipeV2.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.cts.install.lib.testapp.A"
+     android:versionCode="2"
+     android:versionName="2.0">
+
+
+    <uses-sdk android:minSdkVersion="19"/>
+
+    <application android:label="Test App A2"
+        android:rollbackDataPolicy="wipe">
+        <receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
+             android:exported="true"/>
+        <activity android:name="com.android.cts.install.lib.testapp.MainActivity"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/libs/install/testapp/BRollbackRestoreV2.xml b/libs/install/testapp/BRollbackRestoreV2.xml
new file mode 100644
index 0000000..29aa674
--- /dev/null
+++ b/libs/install/testapp/BRollbackRestoreV2.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.cts.install.lib.testapp.B"
+     android:versionCode="2"
+     android:versionName="2.0">
+
+
+    <uses-sdk android:minSdkVersion="19"/>
+
+    <application android:label="Test App B2"
+        android:rollbackDataPolicy="restore">
+        <receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
+             android:exported="true"/>
+        <activity android:name="com.android.cts.install.lib.testapp.MainActivity"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/libs/install/testapp/CRollbackRetainV2.xml b/libs/install/testapp/CRollbackRetainV2.xml
new file mode 100644
index 0000000..d1d168d
--- /dev/null
+++ b/libs/install/testapp/CRollbackRetainV2.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.cts.install.lib.testapp.C"
+     android:versionCode="2"
+     android:versionName="2.0">
+
+
+    <uses-sdk android:minSdkVersion="19"/>
+
+    <application android:label="Test App C2"
+         android:rollbackDataPolicy="retain">
+        <receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
+             android:exported="true"/>
+        <activity android:name="com.android.cts.install.lib.testapp.MainActivity"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/libs/install/testapp/Cv2.xml b/libs/install/testapp/Cv2.xml
index 0d98b63..cc13ed5 100644
--- a/libs/install/testapp/Cv2.xml
+++ b/libs/install/testapp/Cv2.xml
@@ -23,8 +23,7 @@
 
     <uses-sdk android:minSdkVersion="28"/>
 
-    <application android:label="Test App C2"
-         android:rollbackDataPolicy="wipe">
+    <application android:label="Test App C2">
         <receiver android:name="com.android.cts.install.lib.testapp.ProcessUserData"
              android:exported="true"/>
         <activity android:name="com.android.cts.install.lib.testapp.MainActivity"
diff --git a/libs/rollback/src/com/android/cts/rollback/lib/RollbackUtils.java b/libs/rollback/src/com/android/cts/rollback/lib/RollbackUtils.java
index c1de522..69c7ae9 100644
--- a/libs/rollback/src/com/android/cts/rollback/lib/RollbackUtils.java
+++ b/libs/rollback/src/com/android/cts/rollback/lib/RollbackUtils.java
@@ -32,7 +32,6 @@
 
 import androidx.test.InstrumentationRegistry;
 
-import com.android.cts.install.lib.InstallUtils;
 import com.android.cts.install.lib.LocalIntentSender;
 import com.android.cts.install.lib.TestApp;
 
@@ -137,11 +136,6 @@
             String message = result.getStringExtra(RollbackManager.EXTRA_STATUS_MESSAGE);
             throw new AssertionError(message);
         }
-
-        RollbackInfo committed = getCommittedRollbackById(rollbackId);
-        if (committed.isStaged()) {
-            InstallUtils.waitForSessionReady(committed.getCommittedSessionId());
-        }
     }
 
     /**
@@ -266,7 +260,8 @@
                 latch.countDown();
             }
         };
-        context.registerReceiver(crashReceiver, crashFilter);
+        context.registerReceiver(crashReceiver, crashFilter,
+                Context.RECEIVER_EXPORTED_UNAUDITED);
 
         // Launch the app.
         Intent intent = new Intent(Intent.ACTION_MAIN);
diff --git a/tests/AlarmManager/Android.bp b/tests/AlarmManager/Android.bp
index 55401ca..734c6b1 100644
--- a/tests/AlarmManager/Android.bp
+++ b/tests/AlarmManager/Android.bp
@@ -28,6 +28,8 @@
         "src/**/*.java",
         "app/src/**/*.java",
         "app30/src/**/*.java",
+        "app_policy_permission/src/**/*.java",
+        "app_policy_permission32/src/**/*.java",
         ":CtsAlarmUtils",
     ],
     test_suites: [
diff --git a/tests/AlarmManager/AndroidTest.xml b/tests/AlarmManager/AndroidTest.xml
index 161a887..841d565 100644
--- a/tests/AlarmManager/AndroidTest.xml
+++ b/tests/AlarmManager/AndroidTest.xml
@@ -27,6 +27,8 @@
         <option name="test-file-name" value="CtsAlarmManagerTestCases.apk" />
         <option name="test-file-name" value="AlarmTestApp.apk" />
         <option name="test-file-name" value="AlarmTestApp30.apk" />
+        <option name="test-file-name" value="AlarmTestAppWithPolicyPermission.apk" />
+        <option name="test-file-name" value="AlarmTestAppWithPolicyPermissionSdk32.apk" />
     </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
diff --git a/tests/AlarmManager/app/AndroidManifest.xml b/tests/AlarmManager/app/AndroidManifest.xml
index 9725080..618a1a0 100644
--- a/tests/AlarmManager/app/AndroidManifest.xml
+++ b/tests/AlarmManager/app/AndroidManifest.xml
@@ -31,6 +31,7 @@
              where this is not required -->
             <intent-filter>
                 <action android:name="android.app.action.SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED" />
+                <action android:name="android.app.action.cts.ACTION_PING" />
             </intent-filter>
         </receiver>
         <service android:name=".TestService"
diff --git a/tests/AlarmManager/app_policy_permission/Android.bp b/tests/AlarmManager/app_policy_permission/Android.bp
new file mode 100644
index 0000000..a41141c
--- /dev/null
+++ b/tests/AlarmManager/app_policy_permission/Android.bp
@@ -0,0 +1,32 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "AlarmTestAppWithPolicyPermission",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "current",
+    test_suites: [
+        "cts",
+        "general-tests",
+        "mts",
+    ],
+    srcs: ["src/**/*.java"],
+    dex_preopt: {
+        enabled: false,
+    },
+}
diff --git a/tests/AlarmManager/app_policy_permission/AndroidManifest.xml b/tests/AlarmManager/app_policy_permission/AndroidManifest.xml
new file mode 100644
index 0000000..686f5ae
--- /dev/null
+++ b/tests/AlarmManager/app_policy_permission/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="android.alarmmanager.alarmtestapp.cts.policy_permission">
+
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM"/>
+
+    <application>
+        <receiver android:name=".RequestReceiver"
+                  android:exported="true" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/tests/AlarmManager/app_policy_permission/src/android/alarmmanager/alarmtestapp/cts/policy_permission/RequestReceiver.java b/tests/AlarmManager/app_policy_permission/src/android/alarmmanager/alarmtestapp/cts/policy_permission/RequestReceiver.java
new file mode 100644
index 0000000..fca3b5c
--- /dev/null
+++ b/tests/AlarmManager/app_policy_permission/src/android/alarmmanager/alarmtestapp/cts/policy_permission/RequestReceiver.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022 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 android.alarmmanager.alarmtestapp.cts.policy_permission;
+
+import android.app.Activity;
+import android.app.AlarmManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+/**
+ * This receiver is to be used to communicate with tests in {@link android.alarmmanager.cts}
+ */
+public class RequestReceiver extends BroadcastReceiver {
+    private static final String TAG = RequestReceiver.class.getSimpleName();
+    public static final String PACKAGE_NAME =
+            "android.alarmmanager.alarmtestapp.cts.policy_permission";
+
+    public static final String ACTION_GET_CAN_SCHEDULE_EXACT_ALARM =
+            PACKAGE_NAME + ".action.GET_CAN_SCHEDULE_EXACT_ALARM";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final AlarmManager am = context.getSystemService(AlarmManager.class);
+        switch (intent.getAction()) {
+            case ACTION_GET_CAN_SCHEDULE_EXACT_ALARM:
+                final boolean result = am.canScheduleExactAlarms();
+                setResult(Activity.RESULT_OK, String.valueOf(result), null);
+                break;
+            default:
+                Log.e(TAG, "Unspecified action " + intent.getAction());
+                setResult(Activity.RESULT_CANCELED, null, null);
+                break;
+        }
+    }
+}
diff --git a/tests/AlarmManager/app_policy_permission32/Android.bp b/tests/AlarmManager/app_policy_permission32/Android.bp
new file mode 100644
index 0000000..bf09526
--- /dev/null
+++ b/tests/AlarmManager/app_policy_permission32/Android.bp
@@ -0,0 +1,32 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "AlarmTestAppWithPolicyPermissionSdk32",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "current",
+    test_suites: [
+        "cts",
+        "general-tests",
+        "mts",
+    ],
+    srcs: ["src/**/*.java"],
+    dex_preopt: {
+        enabled: false,
+    },
+}
diff --git a/tests/AlarmManager/app_policy_permission32/AndroidManifest.xml b/tests/AlarmManager/app_policy_permission32/AndroidManifest.xml
new file mode 100644
index 0000000..ab9bcd6
--- /dev/null
+++ b/tests/AlarmManager/app_policy_permission32/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="android.alarmmanager.alarmtestapp.cts.policy_permission_32">
+
+    <uses-sdk android:targetSdkVersion="32" />
+
+    <uses-permission android:name="android.permission.USE_EXACT_ALARM"/>
+
+    <application>
+        <receiver android:name=".RequestReceiverSdk32"
+                  android:exported="true" />
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/tests/AlarmManager/app_policy_permission32/src/android/alarmmanager/alarmtestapp/cts/policy_permission_32/RequestReceiverSdk32.java b/tests/AlarmManager/app_policy_permission32/src/android/alarmmanager/alarmtestapp/cts/policy_permission_32/RequestReceiverSdk32.java
new file mode 100644
index 0000000..cfe0ad6
--- /dev/null
+++ b/tests/AlarmManager/app_policy_permission32/src/android/alarmmanager/alarmtestapp/cts/policy_permission_32/RequestReceiverSdk32.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2022 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 android.alarmmanager.alarmtestapp.cts.policy_permission_32;
+
+import android.app.Activity;
+import android.app.AlarmManager;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+/**
+ * This receiver is to be used to communicate with tests in {@link android.alarmmanager.cts}
+ */
+public class RequestReceiverSdk32 extends BroadcastReceiver {
+    private static final String TAG = RequestReceiverSdk32.class.getSimpleName();
+    public static final String PACKAGE_NAME =
+            "android.alarmmanager.alarmtestapp.cts.policy_permission_32";
+
+    public static final String ACTION_GET_CAN_SCHEDULE_EXACT_ALARM =
+            PACKAGE_NAME + ".action.GET_CAN_SCHEDULE_EXACT_ALARM";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        final AlarmManager am = context.getSystemService(AlarmManager.class);
+        switch (intent.getAction()) {
+            case ACTION_GET_CAN_SCHEDULE_EXACT_ALARM:
+                final boolean result = am.canScheduleExactAlarms();
+                setResult(Activity.RESULT_OK, String.valueOf(result), null);
+                break;
+            default:
+                Log.e(TAG, "Unspecified action " + intent.getAction());
+                setResult(Activity.RESULT_CANCELED, null, null);
+                break;
+        }
+    }
+}
diff --git a/tests/AlarmManager/src/android/alarmmanager/cts/BackgroundRestrictedAlarmsTest.java b/tests/AlarmManager/src/android/alarmmanager/cts/BackgroundRestrictedAlarmsTest.java
index bcbb3a3..2bbb218 100644
--- a/tests/AlarmManager/src/android/alarmmanager/cts/BackgroundRestrictedAlarmsTest.java
+++ b/tests/AlarmManager/src/android/alarmmanager/cts/BackgroundRestrictedAlarmsTest.java
@@ -30,6 +30,8 @@
 import android.content.IntentFilter;
 import android.os.SystemClock;
 import android.platform.test.annotations.AppModeFull;
+import android.provider.DeviceConfig;
+import android.provider.Settings;
 import android.support.test.uiautomator.UiDevice;
 import android.util.Log;
 
@@ -37,6 +39,9 @@
 import androidx.test.filters.LargeTest;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.DeviceConfigStateHelper;
+import com.android.compatibility.common.util.SystemUtil;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -62,11 +67,14 @@
     private static final long DEFAULT_WAIT = 1_000;
     private static final long POLL_INTERVAL = 200;
     private static final long MIN_REPEATING_INTERVAL = 10_000;
+    private static final long APP_STANDBY_WINDOW = 10_000;
+    private static final long APP_STANDBY_RESTRICTED_WINDOW = 10_000;
 
     private Context mContext;
     private ComponentName mAlarmScheduler;
     private AlarmManagerDeviceConfigHelper mConfigHelper = new AlarmManagerDeviceConfigHelper();
     private UiDevice mUiDevice;
+    private DeviceConfigStateHelper mDeviceConfigStateHelper;
     private volatile int mAlarmCount;
 
     private final BroadcastReceiver mAlarmStateReceiver = new BroadcastReceiver() {
@@ -86,6 +94,11 @@
         mAlarmScheduler = new ComponentName(TEST_APP_PACKAGE, TEST_APP_RECEIVER);
         mAlarmCount = 0;
         updateAlarmManagerConstants();
+        mDeviceConfigStateHelper =
+                new DeviceConfigStateHelper(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER);
+        mDeviceConfigStateHelper.set("bg_auto_restricted_bucket_on_bg_restricted", "false");
+        SystemUtil.runWithShellPermissionIdentity(() ->
+                DeviceConfig.setSyncDisabledMode(Settings.Config.SYNC_DISABLED_MODE_UNTIL_REBOOT));
         setAppOpsMode(APP_OP_MODE_IGNORED);
         makeUidIdle();
         final IntentFilter intentFilter = new IntentFilter();
@@ -100,6 +113,7 @@
         setAlarmIntent.putExtra(TestAlarmScheduler.EXTRA_TYPE, type);
         setAlarmIntent.putExtra(TestAlarmScheduler.EXTRA_TRIGGER_TIME, triggerMillis);
         setAlarmIntent.putExtra(TestAlarmScheduler.EXTRA_REPEAT_INTERVAL, interval);
+        setAlarmIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         mContext.sendBroadcast(setAlarmIntent);
     }
 
@@ -138,6 +152,25 @@
     }
 
     @Test
+    public void testRepeatingAlarmAllowedWhenAutoRestrictedBucketFeatureOn() throws Exception {
+        final long interval = MIN_REPEATING_INTERVAL;
+        final long triggerElapsed = SystemClock.elapsedRealtime() + interval;
+        toggleAutoRestrictedBucketOnBgRestricted(false);
+        scheduleAlarm(AlarmManager.ELAPSED_REALTIME_WAKEUP, triggerElapsed, interval);
+        Thread.sleep(DEFAULT_WAIT);
+        Thread.sleep(2 * interval);
+        assertFalse("Alarm got triggered even under restrictions", waitForAlarms(1, DEFAULT_WAIT));
+        Thread.sleep(interval);
+        toggleAutoRestrictedBucketOnBgRestricted(true);
+        // The alarm is due to go off about 3 times by now. Adding some tolerance just in case
+        // an expiration is due right about now.
+        final int minCount = getMinExpectedExpirations(SystemClock.elapsedRealtime(),
+                triggerElapsed, interval);
+        assertTrue("Alarm should have expired at least " + minCount
+                + " times when restrictions were lifted", waitForAlarms(minCount, DEFAULT_WAIT));
+    }
+
+    @Test
     public void testAlarmClockNotBlocked() throws Exception {
         final long nowRTC = System.currentTimeMillis();
         final long waitInterval = 3_000;
@@ -150,8 +183,11 @@
 
     @After
     public void tearDown() throws Exception {
+        SystemUtil.runWithShellPermissionIdentity(() ->
+                DeviceConfig.setSyncDisabledMode(Settings.Config.SYNC_DISABLED_MODE_NONE));
         deleteAlarmManagerConstants();
         setAppOpsMode(APP_OP_MODE_ALLOWED);
+        mDeviceConfigStateHelper.restoreOriginalValues();
         // Cancel any leftover alarms
         final Intent cancelAlarmsIntent = new Intent(TestAlarmScheduler.ACTION_CANCEL_ALL_ALARMS);
         cancelAlarmsIntent.setComponent(mAlarmScheduler);
@@ -165,6 +201,8 @@
         mConfigHelper.with("min_futurity", 0L)
                 .with("min_interval", MIN_REPEATING_INTERVAL)
                 .with("min_window", 0)
+                .with("app_standby_window", APP_STANDBY_WINDOW)
+                .with("app_standby_restricted_window", APP_STANDBY_RESTRICTED_WINDOW)
                 .commitAndAwaitPropagation();
     }
 
@@ -187,10 +225,15 @@
     }
 
     private void makeUidIdle() throws IOException {
-        mUiDevice.executeShellCommand("cmd devideidle tempwhitelist -r " + TEST_APP_PACKAGE);
+        mUiDevice.executeShellCommand("cmd deviceidle tempwhitelist -r " + TEST_APP_PACKAGE);
         mUiDevice.executeShellCommand("am make-uid-idle " + TEST_APP_PACKAGE);
     }
 
+    private void toggleAutoRestrictedBucketOnBgRestricted(boolean enable) {
+        mDeviceConfigStateHelper.set("bg_auto_restricted_bucket_on_bg_restricted",
+                Boolean.toString(enable));
+    }
+
     private boolean waitForAlarms(int expectedAlarms, long timeout) throws InterruptedException {
         final long deadLine = SystemClock.uptimeMillis() + timeout;
         int alarmCount;
diff --git a/tests/AlarmManager/src/android/alarmmanager/cts/ExactAlarmsTest.java b/tests/AlarmManager/src/android/alarmmanager/cts/ExactAlarmsTest.java
index a556c4e..eaa596b 100644
--- a/tests/AlarmManager/src/android/alarmmanager/cts/ExactAlarmsTest.java
+++ b/tests/AlarmManager/src/android/alarmmanager/cts/ExactAlarmsTest.java
@@ -26,10 +26,12 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
 
+import android.alarmmanager.alarmtestapp.cts.PermissionStateChangedReceiver;
+import android.alarmmanager.alarmtestapp.cts.policy_permission.RequestReceiver;
+import android.alarmmanager.alarmtestapp.cts.policy_permission_32.RequestReceiverSdk32;
 import android.alarmmanager.alarmtestapp.cts.sdk30.TestReceiver;
 import android.alarmmanager.util.AlarmManagerDeviceConfigHelper;
 import android.app.Activity;
-import android.alarmmanager.alarmtestapp.cts.PermissionStateChangedReceiver;
 import android.app.AlarmManager;
 import android.app.AppOpsManager;
 import android.app.PendingIntent;
@@ -49,6 +51,9 @@
 import android.provider.Settings;
 import android.util.Log;
 
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
 import com.android.compatibility.common.util.AppOpsUtils;
 import com.android.compatibility.common.util.AppStandbyUtils;
 import com.android.compatibility.common.util.FeatureUtil;
@@ -56,9 +61,6 @@
 import com.android.compatibility.common.util.SystemUtil;
 import com.android.compatibility.common.util.TestUtils;
 
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
@@ -303,6 +305,59 @@
         assertTrue("canScheduleExactAlarm returned false", apiResult.get());
     }
 
+    @Test
+    public void canScheduleExactAlarmWithPolicyPermission() throws Exception {
+        final CountDownLatch resultLatch = new CountDownLatch(1);
+        final AtomicBoolean apiResult = new AtomicBoolean(false);
+        final AtomicInteger result = new AtomicInteger(-1);
+
+        final Intent requestToTestApp = new Intent(
+                RequestReceiver.ACTION_GET_CAN_SCHEDULE_EXACT_ALARM)
+                .setClassName(RequestReceiver.PACKAGE_NAME, RequestReceiver.class.getName())
+                .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        sContext.sendOrderedBroadcast(requestToTestApp, null, new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                result.set(getResultCode());
+                final String resultStr = getResultData();
+                apiResult.set(Boolean.parseBoolean(resultStr));
+                resultLatch.countDown();
+            }
+        }, null, Activity.RESULT_CANCELED, null, null);
+
+        assertTrue("Timed out waiting for response from helper app",
+                resultLatch.await(10, TimeUnit.SECONDS));
+        assertEquals(Activity.RESULT_OK, result.get());
+        assertTrue("canScheduleExactAlarm returned false", apiResult.get());
+    }
+
+    @Test
+    public void canScheduleExactAlarmWithPolicyPermissionSdk32() throws Exception {
+        final CountDownLatch resultLatch = new CountDownLatch(1);
+        final AtomicBoolean apiResult = new AtomicBoolean(true);
+        final AtomicInteger result = new AtomicInteger(-1);
+
+        final Intent requestToTestApp = new Intent(
+                RequestReceiverSdk32.ACTION_GET_CAN_SCHEDULE_EXACT_ALARM)
+                .setClassName(RequestReceiverSdk32.PACKAGE_NAME,
+                        RequestReceiverSdk32.class.getName())
+                .addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+        sContext.sendOrderedBroadcast(requestToTestApp, null, new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                result.set(getResultCode());
+                final String resultStr = getResultData();
+                apiResult.set(Boolean.parseBoolean(resultStr));
+                resultLatch.countDown();
+            }
+        }, null, Activity.RESULT_CANCELED, null, null);
+
+        assertTrue("Timed out waiting for response from helper app",
+                resultLatch.await(10, TimeUnit.SECONDS));
+        assertEquals(Activity.RESULT_OK, result.get());
+        assertFalse("canScheduleExactAlarm returned true", apiResult.get());
+    }
+
     @Test(expected = SecurityException.class)
     public void setAlarmClockWithoutPermission() throws IOException {
         revokeAppOp();
@@ -530,7 +585,7 @@
                         PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
                         PackageManager.DONT_KILL_APP));
         Log.d(TAG, "Un-force-stoppping the test app");
-        Intent i = new Intent("ACTION_PING"); // any action
+        Intent i = new Intent("android.app.action.cts.ACTION_PING");
         i.setComponent(mPermissionChangeReceiver);
         i.setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         sContext.sendBroadcast(i);
diff --git a/tests/JobScheduler/src/android/jobscheduler/MockJobService.java b/tests/JobScheduler/src/android/jobscheduler/MockJobService.java
index 9fa8601..618c324 100644
--- a/tests/JobScheduler/src/android/jobscheduler/MockJobService.java
+++ b/tests/JobScheduler/src/android/jobscheduler/MockJobService.java
@@ -33,6 +33,7 @@
 import junit.framework.Assert;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -76,6 +77,9 @@
     public boolean onStartJob(JobParameters params) {
         Log.i(TAG, "Test job executing: " + params.getJobId());
         mParams = params;
+        TestEnvironment.getTestEnvironment().addEvent(
+                new TestEnvironment.Event(
+                        TestEnvironment.Event.EVENT_START_JOB, params.getJobId()));
 
         int permCheckRead = PackageManager.PERMISSION_DENIED;
         int permCheckWrite = PackageManager.PERMISSION_DENIED;
@@ -380,6 +384,7 @@
         private ArrayList<JobWorkItem> mExecutedReceivedWork;
         private String mExecutedErrorMessage;
         private JobParameters mStopJobParameters;
+        private List<Event> mExecutedEvents = new ArrayList<>();
 
         public static TestEnvironment getTestEnvironment() {
             if (kTestEnvironment == null) {
@@ -466,7 +471,6 @@
 
         private void notifyExecution(JobParameters params, int permCheckRead, int permCheckWrite,
                 ArrayList<JobWorkItem> receivedWork, String errorMsg) {
-            //Log.d(TAG, "Job executed:" + params.getJobId());
             mExecutedJobParameters = params;
             mExecutedPermCheckRead = permCheckRead;
             mExecutedPermCheckWrite = permCheckWrite;
@@ -501,6 +505,7 @@
             mDoWorkLatch = null;
             mExpectedWork = null;
             mContinueAfterStart = false;
+            mExecutedEvents.clear();
         }
 
         public void setExpectedWaitForStop() {
@@ -545,5 +550,46 @@
             mStopJobParameters = null;
         }
 
+        void addEvent(Event event) {
+            mExecutedEvents.add(event);
+        }
+
+        public List<Event> getExecutedEvents() {
+            return mExecutedEvents;
+        }
+
+        public static class Event {
+            public static final int EVENT_START_JOB = 0;
+
+            public int event;
+            public int jobId;
+
+            public Event(int event, int jobId) {
+                this.event = event;
+                this.jobId = jobId;
+            }
+
+            @Override
+            public boolean equals(Object other) {
+                if (this == other) {
+                    return true;
+                }
+                if (other instanceof Event) {
+                    Event otherEvent = (Event) other;
+                    return otherEvent.event == event && otherEvent.jobId == jobId;
+                }
+                return false;
+            }
+
+            @Override
+            public int hashCode() {
+                return event + 31 * jobId;
+            }
+
+            @Override
+            public String toString() {
+                return "Event{" + event + ", " + jobId + "}";
+            }
+        }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/BaseJobSchedulerTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/BaseJobSchedulerTest.java
index a92f8ac..3dd5a2b 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/BaseJobSchedulerTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/BaseJobSchedulerTest.java
@@ -15,6 +15,8 @@
  */
 package android.jobscheduler.cts;
 
+import static com.android.compatibility.common.util.TestUtils.waitUntil;
+
 import android.annotation.CallSuper;
 import android.annotation.TargetApi;
 import android.app.Instrumentation;
@@ -32,6 +34,7 @@
 import android.os.SystemClock;
 import android.os.UserHandle;
 import android.provider.DeviceConfig;
+import android.provider.Settings;
 import android.test.InstrumentationTestCase;
 import android.util.Log;
 
@@ -74,6 +77,8 @@
 
     boolean mStorageStateChanged;
 
+    private String mInitialBatteryStatsConstants;
+
     @Override
     public void injectInstrumentation(Instrumentation instrumentation) {
         super.injectInstrumentation(instrumentation);
@@ -113,12 +118,20 @@
         kTestEnvironment.setUp();
         kTriggerTestEnvironment.setUp();
         mJobScheduler.cancelAll();
+
+        mInitialBatteryStatsConstants = Settings.Global.getString(mContext.getContentResolver(),
+                Settings.Global.BATTERY_STATS_CONSTANTS);
+        // Make sure ACTION_CHARGING is sent immediately.
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.BATTERY_STATS_CONSTANTS, "battery_charged_delay_ms=0");
     }
 
     @CallSuper
     @Override
     public void tearDown() throws Exception {
         SystemUtil.runShellCommand(getInstrumentation(), "cmd battery reset");
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.BATTERY_STATS_CONSTANTS, mInitialBatteryStatsConstants);
         if (mStorageStateChanged) {
             // Put storage service back in to normal operation.
             SystemUtil.runShellCommand(getInstrumentation(), "cmd devicestoragemonitor reset");
@@ -217,6 +230,37 @@
         Thread.sleep(2_000);
     }
 
+    void setBatteryState(boolean plugged, int level) throws Exception {
+        if (plugged) {
+            SystemUtil.runShellCommand(getInstrumentation(), "cmd battery set ac 1");
+            final int curLevel = Integer.parseInt(SystemUtil.runShellCommand(getInstrumentation(),
+                    "dumpsys battery get level").trim());
+            if (curLevel >= level) {
+                // Lower the level so when we set it to the desired level, JobScheduler thinks
+                // the device is charging.
+                SystemUtil.runShellCommand(getInstrumentation(),
+                        "cmd battery set level " + Math.max(1, level - 1));
+            }
+        } else {
+            SystemUtil.runShellCommand(getInstrumentation(), "cmd battery unplug");
+        }
+        int seq = Integer.parseInt(SystemUtil.runShellCommand(getInstrumentation(),
+                "cmd battery set -f level " + level).trim());
+
+        // Wait for the battery update to be processed by job scheduler before proceeding.
+        waitUntil("JobScheduler didn't update charging status to " + plugged, 15 /* seconds */,
+                () -> {
+                    int curSeq;
+                    boolean curCharging;
+                    curSeq = Integer.parseInt(SystemUtil.runShellCommand(getInstrumentation(),
+                            "cmd jobscheduler get-battery-seq").trim());
+                    curCharging = Boolean.parseBoolean(
+                            SystemUtil.runShellCommand(getInstrumentation(),
+                                    "cmd jobscheduler get-battery-charging").trim());
+                    return curSeq >= seq && curCharging == plugged;
+                });
+    }
+
     /** Asks (not forces) JobScheduler to run the job if constraints are met. */
     void runSatisfiedJob(int jobId) throws Exception {
         SystemUtil.runShellCommand(getInstrumentation(),
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/BatteryConstraintTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/BatteryConstraintTest.java
index 3974c38..f6ff23f 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/BatteryConstraintTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/BatteryConstraintTest.java
@@ -22,7 +22,6 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.BatteryManager;
-import android.os.SystemClock;
 import android.provider.Settings;
 import android.util.Log;
 
@@ -92,34 +91,6 @@
         return present;
     }
 
-    void setBatteryState(boolean plugged, int level) throws Exception {
-        if (plugged) {
-            SystemUtil.runShellCommand(getInstrumentation(), "cmd battery set ac 1");
-        } else {
-            SystemUtil.runShellCommand(getInstrumentation(), "cmd battery unplug");
-        }
-        int seq = Integer.parseInt(SystemUtil.runShellCommand(getInstrumentation(),
-                "cmd battery set -f level " + level).trim());
-        long startTime = SystemClock.elapsedRealtime();
-
-        // Wait for the battery update to be processed by job scheduler before proceeding.
-        int curSeq;
-        boolean curCharging;
-        do {
-            Thread.sleep(50);
-            curSeq = Integer.parseInt(SystemUtil.runShellCommand(getInstrumentation(),
-                    "cmd jobscheduler get-battery-seq").trim());
-            curCharging = Boolean.parseBoolean(SystemUtil.runShellCommand(getInstrumentation(),
-                    "cmd jobscheduler get-battery-charging").trim());
-            if (curSeq >= seq && curCharging == plugged) {
-                return;
-            }
-        } while ((SystemClock.elapsedRealtime() - startTime) < 5000);
-
-        fail("Timed out waiting for job scheduler: expected seq=" + seq + ", cur=" + curSeq
-                + ", expected plugged=" + plugged + " curCharging=" + curCharging);
-    }
-
     void verifyChargingState(boolean charging) throws Exception {
         boolean curCharging = Boolean.parseBoolean(SystemUtil.runShellCommand(getInstrumentation(),
                 "cmd jobscheduler get-battery-charging").trim());
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java
index b440d83..00d7517 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/ConnectivityConstraintTest.java
@@ -31,6 +31,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.Network;
 import android.net.NetworkCapabilities;
@@ -101,6 +102,8 @@
     private boolean mInitialAirplaneMode;
     /** Track whether the restricted bucket was enabled in case we toggle it. */
     private String mInitialRestrictedBucketEnabled;
+    /** Track the location mode in case we change it. */
+    private String mInitialLocationMode;
 
     private JobInfo.Builder mBuilder;
 
@@ -119,6 +122,8 @@
         mHasEthernet = packageManager.hasSystemFeature(PackageManager.FEATURE_ETHERNET);
         mBuilder = new JobInfo.Builder(CONNECTIVITY_JOB_ID, kJobServiceComponent);
 
+        mInitialLocationMode = Settings.Secure.getString(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE);
         if (mHasWifi) {
             mInitialWiFiState = mWifiManager.isWifiEnabled();
             ensureSavedWifiNetwork(mWifiManager);
@@ -172,6 +177,8 @@
         // originally metered.
         setAirplaneMode(mInitialAirplaneMode);
 
+        setLocationMode(mInitialLocationMode);
+
         super.tearDown();
     }
 
@@ -871,8 +878,7 @@
         if (!mHasEthernet) return false;
         Network[] networks = mCm.getAllNetworks();
         for (Network network : networks) {
-            if (mCm.getNetworkCapabilities(network)
-                    .hasTransport(NetworkCapabilities.TRANSPORT_ETHERNET)) {
+            if (mCm.getNetworkCapabilities(network).hasTransport(TRANSPORT_ETHERNET)) {
                 return true;
             }
         }
@@ -889,7 +895,9 @@
         }
     }
 
-    private String getWifiSSID() {
+    private String getWifiSSID() throws Exception {
+        // Location needs to be enabled to get the WiFi information.
+        setLocationMode(String.valueOf(Settings.Secure.LOCATION_MODE_ON));
         final AtomicReference<String> ssid = new AtomicReference<>();
         SystemUtil.runWithShellPermissionIdentity(() -> {
             ssid.set(mWifiManager.getConnectionInfo().getSSID());
@@ -897,6 +905,15 @@
         return unquoteSSID(ssid.get());
     }
 
+    private void setLocationMode(String mode) throws Exception {
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE, mode);
+        final LocationManager locationManager = mContext.getSystemService(LocationManager.class);
+        final boolean wantEnabled = !String.valueOf(Settings.Secure.LOCATION_MODE_OFF).equals(mode);
+        waitUntil("Location " + (wantEnabled ? "not enabled" : "still enabled"),
+                () -> wantEnabled == locationManager.isLocationEnabled());
+    }
+
     // Returns "true", "false" or "none"
     private String getWifiMeteredStatus(String ssid) {
         // Interestingly giving the SSID as an argument to list wifi-networks
@@ -926,7 +943,7 @@
     }
 
     // metered should be "true", "false" or "none"
-    private void setWifiMeteredState(String ssid, String metered) {
+    private void setWifiMeteredState(String ssid, String metered) throws Exception {
         if (metered.equals(getWifiMeteredStatus(ssid))) {
             return;
         }
@@ -937,16 +954,14 @@
     /**
      * Ensure WiFi is enabled, and block until we've verified that we are in fact connected.
      */
-    private void connectToWifi()
-            throws InterruptedException {
+    private void connectToWifi() throws Exception {
         setWifiState(true, mCm, mWifiManager);
     }
 
     /**
      * Ensure WiFi is disabled, and block until we've verified that we are in fact disconnected.
      */
-    private void disconnectFromWifi()
-            throws InterruptedException {
+    private void disconnectFromWifi() throws Exception {
         setWifiState(false, mCm, mWifiManager);
     }
 
@@ -964,7 +979,7 @@
      * Taken from {@link android.net.http.cts.ApacheHttpClientTest}.
      */
     static void setWifiState(final boolean enable,
-            final ConnectivityManager cm, final WifiManager wm) throws InterruptedException {
+            final ConnectivityManager cm, final WifiManager wm) throws Exception {
         if (enable != isWiFiConnected(cm, wm)) {
             NetworkRequest nr = new NetworkRequest.Builder().clearCapabilities().build();
             NetworkCapabilities nc = new NetworkCapabilities.Builder()
@@ -975,6 +990,7 @@
 
             if (enable) {
                 SystemUtil.runShellCommand("svc wifi enable");
+                waitUntil("Failed to enable Wifi", 30 /* seconds */, () -> wm.isWifiEnabled());
                 //noinspection deprecation
                 SystemUtil.runWithShellPermissionIdentity(wm::reconnect,
                         android.Manifest.permission.NETWORK_SETTINGS);
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/ExpeditedJobTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/ExpeditedJobTest.java
index 9f2db10..19d76e3 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/ExpeditedJobTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/ExpeditedJobTest.java
@@ -83,6 +83,21 @@
                 225 /* ProcessList.PERCEPTIBLE_MEDIUM_APP_ADJ */);
     }
 
+    /** Test that EJs for the TOP app start immediately and there is no limit on the number. */
+    @Test
+    public void testTopEJUnlimited() throws Exception {
+        final int standardConcurrency = 16;
+        final int numEjs = 2 * standardConcurrency;
+        mTestAppInterface.startAndKeepTestActivity(true);
+        for (int i = 0; i < numEjs; ++i) {
+            mTestAppInterface.scheduleJob(
+                    Map.of(TestJobSchedulerReceiver.EXTRA_AS_EXPEDITED, true),
+                    Map.of(TestJobSchedulerReceiver.EXTRA_JOB_ID_KEY, i));
+            assertTrue("Job did not start after scheduling",
+                    mTestAppInterface.awaitJobStart(i, DEFAULT_WAIT_TIMEOUT_MS));
+        }
+    }
+
     /** Forces JobScheduler to run the job */
     private void forceRunJob() throws Exception {
         mUiDevice.executeShellCommand("cmd jobscheduler run -f"
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/JobInfoTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/JobInfoTest.java
index eece252..2c54508 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/JobInfoTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/JobInfoTest.java
@@ -164,6 +164,7 @@
         // Test all allowed constraints.
         JobInfo ji = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
                 .setExpedited(true)
+                .setPriority(JobInfo.PRIORITY_HIGH)
                 .setPersisted(true)
                 .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
                 .setRequiresStorageNotLow(true)
@@ -172,6 +173,14 @@
         // Confirm JobScheduler accepts the JobInfo object.
         mJobScheduler.schedule(ji);
 
+        // Confirm default priority for EJs.
+        ji = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                .setExpedited(true)
+                .build();
+        assertEquals(JobInfo.PRIORITY_MAX, ji.getPriority());
+        // Confirm JobScheduler accepts the JobInfo object.
+        mJobScheduler.schedule(ji);
+
         // Test disallowed constraints.
         final String failureMessage =
                 "Successfully built an expedited JobInfo object with disallowed constraints";
@@ -190,6 +199,14 @@
         assertBuildFails(failureMessage,
                 new JobInfo.Builder(JOB_ID, kJobServiceComponent)
                         .setExpedited(true)
+                        .setPriority(JobInfo.PRIORITY_LOW));
+        assertBuildFails(failureMessage,
+                new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                        .setExpedited(true)
+                        .setPriority(JobInfo.PRIORITY_DEFAULT));
+        assertBuildFails(failureMessage,
+                new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                        .setExpedited(true)
                         .setImportantWhileForeground(true));
         assertBuildFails(failureMessage,
                 new JobInfo.Builder(JOB_ID, kJobServiceComponent)
@@ -216,6 +233,7 @@
                         .addTriggerContentUri(tcu));
     }
 
+    @SuppressWarnings("deprecation")
     public void testImportantWhileForeground() {
         // Assert the default value is false
         JobInfo ji = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
@@ -228,6 +246,7 @@
                 .setImportantWhileForeground(true)
                 .build();
         assertTrue(ji.isImportantWhileForeground());
+        assertEquals(JobInfo.PRIORITY_HIGH, ji.getPriority());
         // Confirm JobScheduler accepts the JobInfo object.
         mJobScheduler.schedule(ji);
 
@@ -239,6 +258,55 @@
         mJobScheduler.schedule(ji);
     }
 
+    public void testMinimumChunkSizeBytes() {
+        assertBuildFails(
+                "Successfully built a JobInfo specifying minimum chunk bytes without"
+                        + " requesting network",
+                new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                        .setMinimumNetworkChunkBytes(500));
+        try {
+            assertBuildFails(
+                    "Successfully built a JobInfo specifying minimum chunk bytes a negative value",
+                    new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                            .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                            .setMinimumNetworkChunkBytes(-500));
+        } catch (IllegalArgumentException expected) {
+            // Success. setMinimumNetworkChunkBytes() should throw the exception.
+        }
+
+        assertBuildFails(
+                "Successfully built a JobInfo with a higher minimum chunk size than total"
+                        + " transfer size",
+                new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                        .setMinimumNetworkChunkBytes(500)
+                        .setEstimatedNetworkBytes(5, 5));
+        assertBuildFails(
+                "Successfully built a JobInfo with a higher minimum chunk size than total"
+                        + " transfer size",
+                new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                        .setMinimumNetworkChunkBytes(500)
+                        .setEstimatedNetworkBytes(JobInfo.NETWORK_BYTES_UNKNOWN, 5));
+        assertBuildFails(
+                "Successfully built a JobInfo with a higher minimum chunk size than total"
+                        + " transfer size",
+                new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                        .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                        .setMinimumNetworkChunkBytes(500)
+                        .setEstimatedNetworkBytes(5, JobInfo.NETWORK_BYTES_UNKNOWN));
+
+        JobInfo ji = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                .setRequiredNetworkType(JobInfo.NETWORK_TYPE_ANY)
+                .setMinimumNetworkChunkBytes(500)
+                .setEstimatedNetworkBytes(
+                        JobInfo.NETWORK_BYTES_UNKNOWN, JobInfo.NETWORK_BYTES_UNKNOWN)
+                .build();
+        assertEquals(500, ji.getMinimumNetworkChunkBytes());
+        // Confirm JobScheduler accepts the JobInfo object.
+        mJobScheduler.schedule(ji);
+    }
+
     public void testMinimumLatency() {
         JobInfo ji = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
                 .setMinimumLatency(1337)
@@ -320,6 +388,85 @@
         assertFalse(ji.isPrefetch());
         // Confirm JobScheduler accepts the JobInfo object.
         mJobScheduler.schedule(ji);
+
+        ji = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                .setMinimumLatency(60_000L)
+                .setPrefetch(true)
+                .build();
+        assertTrue(ji.isPrefetch());
+        // Confirm JobScheduler accepts the JobInfo object.
+        mJobScheduler.schedule(ji);
+
+        // CTS naturally targets latest SDK version. Compat change should be enabled by default.
+        assertBuildFails("Modern prefetch jobs can't have a deadline",
+                new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                        .setMinimumLatency(60_000L)
+                        .setOverrideDeadline(600_000L)
+                        .setPrefetch(true));
+    }
+
+    public void testPriority() {
+        // Assert the default value is DEFAULT
+        JobInfo ji = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                .build();
+        assertEquals(JobInfo.PRIORITY_DEFAULT, ji.getPriority());
+        // Confirm JobScheduler accepts the JobInfo object.
+        mJobScheduler.schedule(ji);
+
+        ji = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                .setPriority(JobInfo.PRIORITY_LOW)
+                .build();
+        assertEquals(JobInfo.PRIORITY_LOW, ji.getPriority());
+        // Confirm JobScheduler accepts the JobInfo object.
+        mJobScheduler.schedule(ji);
+
+        ji = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                .setPriority(JobInfo.PRIORITY_MIN)
+                .build();
+        assertEquals(JobInfo.PRIORITY_MIN, ji.getPriority());
+        // Confirm JobScheduler accepts the JobInfo object.
+        mJobScheduler.schedule(ji);
+
+        // Attempt an invalid number
+        try {
+            // It's over 9000!!!
+            new JobInfo.Builder(JOB_ID, kJobServiceComponent).setPriority(9001).build();
+            fail("Successfully built a job with an invalid priority level");
+        } catch (Exception e) {
+            // Success
+        }
+        try {
+            new JobInfo.Builder(JOB_ID, kJobServiceComponent).setPriority(-1).build();
+            fail("Successfully built a job with an invalid priority level");
+        } catch (Exception e) {
+            // Success
+        }
+        try {
+            new JobInfo.Builder(JOB_ID, kJobServiceComponent).setPriority(123).build();
+            fail("Successfully built a job with an invalid priority level");
+        } catch (Exception e) {
+            // Success
+        }
+
+        // Test other invalid configurations.
+        final String failureMessage =
+                "Successfully built a JobInfo object with disallowed priority configurations";
+        assertBuildFails(failureMessage,
+                new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                        .setPriority(JobInfo.PRIORITY_MAX));
+        //noinspection deprecation
+        assertBuildFails(failureMessage,
+                new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                        .setPriority(JobInfo.PRIORITY_LOW)
+                        .setImportantWhileForeground(true));
+        assertBuildFails(failureMessage,
+                new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                        .setPriority(JobInfo.PRIORITY_HIGH)
+                        .setPrefetch(true));
+        assertBuildFails(failureMessage,
+                new JobInfo.Builder(JOB_ID, kJobServiceComponent)
+                        .setPriority(JobInfo.PRIORITY_HIGH)
+                        .setPeriodic(JobInfo.getMinPeriodMillis()));
     }
 
     public void testRequiredNetwork() {
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/JobSchedulingTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/JobSchedulingTest.java
index 05d78de..882b242 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/JobSchedulingTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/JobSchedulingTest.java
@@ -19,10 +19,15 @@
 import android.annotation.TargetApi;
 import android.app.job.JobInfo;
 import android.app.job.JobScheduler;
+import android.jobscheduler.MockJobService.TestEnvironment;
+import android.jobscheduler.MockJobService.TestEnvironment.Event;
 import android.provider.DeviceConfig;
 
+import com.android.compatibility.common.util.BatteryUtils;
 import com.android.compatibility.common.util.SystemUtil;
 
+import java.util.List;
+
 /**
  * Tests related to scheduling jobs.
  */
@@ -30,11 +35,15 @@
 public class JobSchedulingTest extends BaseJobSchedulerTest {
     private static final int MIN_SCHEDULE_QUOTA = 250;
     private static final int JOB_ID = JobSchedulingTest.class.hashCode();
+    // The maximum number of jobs that can run concurrently.
+    private static final int MAX_JOB_CONTEXTS_COUNT = 16;
 
     @Override
     public void tearDown() throws Exception {
         mJobScheduler.cancel(JOB_ID);
         SystemUtil.runShellCommand(getInstrumentation(), "cmd jobscheduler reset-schedule-quota");
+        SystemUtil.runShellCommand(getInstrumentation(), "cmd jobscheduler monitor-battery off");
+        BatteryUtils.runDumpsysBatteryReset();
 
         // The super method should be called at the end.
         super.tearDown();
@@ -127,4 +136,45 @@
             assertEquals(JobScheduler.RESULT_SUCCESS, mJobScheduler.schedule(jobInfo));
         }
     }
+
+    public void testHigherPriorityJobRunsFirst() throws Exception {
+        SystemUtil.runShellCommand(getInstrumentation(), "cmd jobscheduler monitor-battery on");
+
+        setStorageStateLow(true);
+        final int higherPriorityJobId = JOB_ID;
+        final int numMinPriorityJobs = 2 * MAX_JOB_CONTEXTS_COUNT;
+        kTestEnvironment.setExpectedExecutions(1 + numMinPriorityJobs);
+        for (int i = 0; i < numMinPriorityJobs; ++i) {
+            JobInfo job = new JobInfo.Builder(higherPriorityJobId + 1 + i, kJobServiceComponent)
+                    .setPriority(JobInfo.PRIORITY_MIN)
+                    .setRequiresStorageNotLow(true)
+                    .build();
+            mJobScheduler.schedule(job);
+        }
+        // Schedule the higher priority job last since the default sorting is by enqueue time.
+        JobInfo jobMax = new JobInfo.Builder(higherPriorityJobId, kJobServiceComponent)
+                .setPriority(JobInfo.PRIORITY_DEFAULT)
+                .setRequiresStorageNotLow(true)
+                .build();
+        mJobScheduler.schedule(jobMax);
+
+        setStorageStateLow(false);
+        kTestEnvironment.awaitExecution();
+
+        Event jobHigherExecution = new Event(TestEnvironment.Event.EVENT_START_JOB,
+                higherPriorityJobId);
+        List<Event> executedEvents = kTestEnvironment.getExecutedEvents();
+        boolean higherExecutedFirst = false;
+        // Due to racing, we can't just check the very first item in the array. We can however
+        // make sure it was in the first set of jobs to run.
+        for (int i = 0; i < executedEvents.size() && i < MAX_JOB_CONTEXTS_COUNT; ++i) {
+            if (executedEvents.get(i).equals(jobHigherExecution)) {
+                higherExecutedFirst = true;
+                break;
+            }
+        }
+        assertTrue(
+                "Higher priority job (" + higherPriorityJobId + ") didn't run in first batch: "
+                        + executedEvents, higherExecutedFirst);
+    }
 }
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/JobThrottlingTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/JobThrottlingTest.java
index 8ab63ca..3ec265d 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/JobThrottlingTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/JobThrottlingTest.java
@@ -23,7 +23,6 @@
 import static android.jobscheduler.cts.ConnectivityConstraintTest.setWifiState;
 import static android.jobscheduler.cts.TestAppInterface.TEST_APP_PACKAGE;
 import static android.os.PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED;
-import static android.os.PowerManager.ACTION_LIGHT_DEVICE_IDLE_MODE_CHANGED;
 
 import static com.android.compatibility.common.util.TestUtils.waitUntil;
 
@@ -45,6 +44,7 @@
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.jobscheduler.cts.jobtestapp.TestJobSchedulerReceiver;
+import android.location.LocationManager;
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 import android.os.PowerManager;
@@ -90,7 +90,7 @@
     private static final String TAG = JobThrottlingTest.class.getSimpleName();
     private static final long BACKGROUND_JOBS_EXPECTED_DELAY = 3_000;
     private static final long POLL_INTERVAL = 500;
-    private static final long DEFAULT_WAIT_TIMEOUT = 2000;
+    private static final long DEFAULT_WAIT_TIMEOUT = 5000;
     private static final long SHELL_TIMEOUT = 3_000;
     // TODO: mark Settings.System.SCREEN_OFF_TIMEOUT as @TestApi
     private static final String SCREEN_OFF_TIMEOUT = "screen_off_timeout";
@@ -121,11 +121,14 @@
     private boolean mInitialAirplaneModeState;
     private String mInitialDisplayTimeout;
     private String mInitialRestrictedBucketEnabled;
+    private String mInitialLocationMode;
+    private String mInitialBatteryStatsConstants;
     private boolean mAutomotiveDevice;
     private boolean mLeanbackOnly;
 
     private TestAppInterface mTestAppInterface;
     private DeviceConfigStateHelper mDeviceConfigStateHelper;
+    private DeviceConfigStateHelper mActivityManagerDeviceConfigStateHelper;
 
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -133,7 +136,6 @@
             Log.d(TAG, "Received action " + intent.getAction());
             switch (intent.getAction()) {
                 case ACTION_DEVICE_IDLE_MODE_CHANGED:
-                case ACTION_LIGHT_DEVICE_IDLE_MODE_CHANGED:
                     synchronized (JobThrottlingTest.this) {
                         mDeviceInDoze = mPowerManager.isDeviceIdleMode();
                         Log.d(TAG, "mDeviceInDoze: " + mDeviceInDoze);
@@ -159,7 +161,6 @@
         mTestAppInterface = new TestAppInterface(mContext, mTestJobId);
         final IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(ACTION_DEVICE_IDLE_MODE_CHANGED);
-        intentFilter.addAction(ACTION_LIGHT_DEVICE_IDLE_MODE_CHANGED);
         mContext.registerReceiver(mReceiver, intentFilter);
         assertFalse("Test package already in temp whitelist", isTestAppTempWhitelisted());
         makeTestPackageIdle();
@@ -177,12 +178,22 @@
         mInitialAirplaneModeState = isAirplaneModeOn();
         mInitialRestrictedBucketEnabled = Settings.Global.getString(mContext.getContentResolver(),
                 Settings.Global.ENABLE_RESTRICTED_BUCKET);
+        mInitialBatteryStatsConstants = Settings.Global.getString(mContext.getContentResolver(),
+                Settings.Global.BATTERY_STATS_CONSTANTS);
+        // Make sure ACTION_CHARGING is sent immediately.
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.BATTERY_STATS_CONSTANTS, "battery_charged_delay_ms=0");
+        mInitialLocationMode = Settings.Secure.getString(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE);
         // Make sure test jobs can run regardless of bucket.
         mDeviceConfigStateHelper =
                 new DeviceConfigStateHelper(DeviceConfig.NAMESPACE_JOB_SCHEDULER);
         mDeviceConfigStateHelper.set(
                 new DeviceConfig.Properties.Builder(DeviceConfig.NAMESPACE_JOB_SCHEDULER)
                         .setInt("min_ready_non_active_jobs_count", 0).build());
+        mActivityManagerDeviceConfigStateHelper =
+                new DeviceConfigStateHelper(DeviceConfig.NAMESPACE_ACTIVITY_MANAGER);
+        toggleAutoRestrictedBucketOnBgRestricted(false);
         // Make sure the screen doesn't turn off when the test turns it on.
         mInitialDisplayTimeout =
                 Settings.System.getString(mContext.getContentResolver(), SCREEN_OFF_TIMEOUT);
@@ -197,7 +208,7 @@
         if (mAutomotiveDevice || mLeanbackOnly) {
             setScreenState(true);
             // TODO(b/159176758): make sure that initial power supply is on.
-            BatteryUtils.runDumpsysBatterySetPluggedIn(true);
+            setChargingState(true);
         }
 
         // Kill as many things in the background as possible so we avoid LMK interfering with the
@@ -255,8 +266,8 @@
         Thread.sleep(TestJobSchedulerReceiver.JOB_INITIAL_BACKOFF);
         toggleDozeState(false);
         assertFalse("Job for background app started immediately when device exited doze",
-                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
-        Thread.sleep(BACKGROUND_JOBS_EXPECTED_DELAY - DEFAULT_WAIT_TIMEOUT);
+                mTestAppInterface.awaitJobStart(2000));
+        Thread.sleep(BACKGROUND_JOBS_EXPECTED_DELAY - 2000);
         assertTrue("Job for background app did not start after the expected delay of "
                         + BACKGROUND_JOBS_EXPECTED_DELAY + "ms",
                 mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
@@ -268,7 +279,11 @@
         runJob();
         assertTrue("Job did not start after scheduling",
                 mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+        toggleAutoRestrictedBucketOnBgRestricted(true);
         setTestPackageRestricted(true);
+        assertFalse("Job stopped after test app was restricted with auto-restricted-bucket on",
+                mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+        toggleAutoRestrictedBucketOnBgRestricted(false);
         assertTrue("Job did not stop after test app was restricted",
                 mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
         assertEquals(JobParameters.STOP_REASON_BACKGROUND_RESTRICTION,
@@ -309,12 +324,27 @@
     }
 
     @Test
+    public void testRestrictedJobAllowedWhenAutoRestrictedBucketFeatureOn() throws Exception {
+        setTestPackageRestricted(true);
+        sendScheduleJobBroadcast(false);
+        assertFalse("Job started for restricted app",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+        toggleAutoRestrictedBucketOnBgRestricted(true);
+        assertTrue("Job did not start after scheduling",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+    }
+
+    @Test
     public void testEJStoppedWhenRestricted() throws Exception {
         mTestAppInterface.scheduleJob(false, JobInfo.NETWORK_TYPE_NONE, true);
         runJob();
         assertTrue("Job did not start after scheduling",
                 mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+        toggleAutoRestrictedBucketOnBgRestricted(true);
         setTestPackageRestricted(true);
+        assertFalse("Job stopped after test app was restricted with auto-restricted-bucket on",
+                mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+        toggleAutoRestrictedBucketOnBgRestricted(false);
         assertTrue("Job did not stop after test app was restricted",
                 mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
         assertEquals(JobParameters.STOP_REASON_BACKGROUND_RESTRICTION,
@@ -354,31 +384,109 @@
                 mTestAppInterface.getLastParams().getStopReason());
     }
 
-    @RequiresDevice // Emulators don't always have access to wifi/network
     @Test
-    public void testBackgroundConnectivityJobsThrottled() throws Exception {
-        if (!mHasWifi) {
-            Log.d(TAG, "Skipping test that requires the device be WiFi enabled.");
-            return;
-        }
-        ensureSavedWifiNetwork(mWifiManager);
-        setAirplaneMode(false);
-        setWifiState(true, mCm, mWifiManager);
-        assumeTrue("device idle not enabled", mDeviceIdleEnabled);
-        mTestAppInterface.scheduleJob(false, NETWORK_TYPE_ANY, false);
+    public void testRestrictedEJAllowedWhenAutoRestrictedBucketFeatureOn() throws Exception {
+        setTestPackageRestricted(true);
+        mTestAppInterface.scheduleJob(false, JobInfo.NETWORK_TYPE_NONE, true);
+        assertFalse("Job started for restricted app",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+
+        toggleAutoRestrictedBucketOnBgRestricted(true);
+        assertTrue("Job did not start when app was background unrestricted",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+    }
+
+    @Test
+    public void testBackgroundRegJobsThermal() throws Exception {
+        mTestAppInterface.scheduleJob(false, NETWORK_TYPE_NONE, false);
         runJob();
         assertTrue("Job did not start after scheduling",
                 mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
-        ThermalUtils.overrideThermalStatus(Temperature.THROTTLING_CRITICAL);
+
+        ThermalUtils.overrideThermalStatus(Temperature.THROTTLING_LIGHT);
+        assertFalse("Job stopped below thermal throttling threshold",
+                mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+
+        ThermalUtils.overrideThermalStatus(Temperature.THROTTLING_SEVERE);
         assertTrue("Job did not stop on thermal throttling",
                 mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
-        Thread.sleep(TestJobSchedulerReceiver.JOB_INITIAL_BACKOFF);
+        final long jobStopTime = System.currentTimeMillis();
+
+        ThermalUtils.overrideThermalStatus(Temperature.THROTTLING_CRITICAL);
+        runJob();
+        assertFalse("Job started above thermal throttling threshold",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+
+        ThermalUtils.overrideThermalStatus(Temperature.THROTTLING_EMERGENCY);
+        runJob();
+        assertFalse("Job started above thermal throttling threshold",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+
+        Thread.sleep(Math.max(0, TestJobSchedulerReceiver.JOB_INITIAL_BACKOFF
+                - (System.currentTimeMillis() - jobStopTime)));
         ThermalUtils.overrideThermalNotThrottling();
         runJob();
         assertTrue("Job did not start back from throttling",
                 mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
     }
 
+    @Test
+    public void testBackgroundEJsThermal() throws Exception {
+        mTestAppInterface.scheduleJob(false, NETWORK_TYPE_NONE, true);
+        runJob();
+        assertTrue("Job did not start after scheduling",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+
+        ThermalUtils.overrideThermalStatus(Temperature.THROTTLING_MODERATE);
+        assertFalse("Job stopped below thermal throttling threshold",
+                mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+
+        ThermalUtils.overrideThermalStatus(Temperature.THROTTLING_SEVERE);
+        assertTrue("Job did not stop on thermal throttling",
+                mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+        final long jobStopTime = System.currentTimeMillis();
+
+        ThermalUtils.overrideThermalStatus(Temperature.THROTTLING_CRITICAL);
+        runJob();
+        assertFalse("Job started above thermal throttling threshold",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+
+        ThermalUtils.overrideThermalStatus(Temperature.THROTTLING_EMERGENCY);
+        runJob();
+        assertFalse("Job started above thermal throttling threshold",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+
+        Thread.sleep(Math.max(0, TestJobSchedulerReceiver.JOB_INITIAL_BACKOFF
+                - (System.currentTimeMillis() - jobStopTime)));
+        ThermalUtils.overrideThermalNotThrottling();
+        runJob();
+        assertTrue("Job did not start back from throttling",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+    }
+
+    @Test
+    public void testForegroundJobsThermal() throws Exception {
+        // Turn the screen on to ensure the app gets into the TOP state.
+        setScreenState(true);
+        mTestAppInterface.startAndKeepTestActivity(true);
+        mTestAppInterface.scheduleJob(false, NETWORK_TYPE_NONE, false);
+        runJob();
+        assertTrue("Job did not start after scheduling",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+
+        ThermalUtils.overrideThermalStatus(Temperature.THROTTLING_MODERATE);
+        assertFalse("Job stopped below thermal throttling threshold",
+                mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+
+        ThermalUtils.overrideThermalStatus(Temperature.THROTTLING_SEVERE);
+        assertFalse("Job stopped despite being TOP app",
+                mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+
+        ThermalUtils.overrideThermalStatus(Temperature.THROTTLING_CRITICAL);
+        assertFalse("Job stopped despite being TOP app",
+                mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+    }
+
     /** Tests that apps in the RESTRICTED bucket still get their one parole session per day. */
     @Test
     public void testJobsInRestrictedBucket_ParoleSession() throws Exception {
@@ -393,7 +501,7 @@
 
         setScreenState(true);
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         setTestPackageStandbyBucket(Bucket.RESTRICTED);
         Thread.sleep(DEFAULT_WAIT_TIMEOUT);
         sendScheduleJobBroadcast(false);
@@ -422,7 +530,7 @@
         mDeviceConfigStateHelper.set("qc_max_session_count_restricted", "1");
 
         setScreenState(true);
-        BatteryUtils.runDumpsysBatterySetPluggedIn(true);
+        setChargingState(true);
         BatteryUtils.runDumpsysBatterySetLevel(100);
 
         setTestPackageStandbyBucket(Bucket.RESTRICTED);
@@ -454,7 +562,7 @@
 
         setScreenState(true);
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         setTestPackageStandbyBucket(Bucket.RESTRICTED);
         Thread.sleep(DEFAULT_WAIT_TIMEOUT);
         sendScheduleJobBroadcast(false);
@@ -466,7 +574,7 @@
         assertFalse("New job started in RESTRICTED bucket after parole used",
                 mTestAppInterface.awaitJobStart(3_000));
 
-        BatteryUtils.runDumpsysBatterySetPluggedIn(true);
+        setChargingState(true);
         BatteryUtils.runDumpsysBatterySetLevel(100);
         assertFalse("New job started in RESTRICTED bucket after parole when charging but not idle",
                 mTestAppInterface.awaitJobStart(3_000));
@@ -478,6 +586,7 @@
 
         // Make sure job can be stopped and started again when charging + idle
         sendScheduleJobBroadcast(false);
+        runJob();
         assertTrue("Job didn't restart in RESTRICTED bucket when charging + idle",
                 mTestAppInterface.awaitJobStart(3_000));
     }
@@ -497,7 +606,7 @@
         setAirplaneMode(true);
         setScreenState(true);
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         setTestPackageStandbyBucket(Bucket.RESTRICTED);
         Thread.sleep(DEFAULT_WAIT_TIMEOUT);
         mTestAppInterface.scheduleJob(false, NETWORK_TYPE_NONE, false);
@@ -506,7 +615,7 @@
         // Slowly add back required bucket constraints.
 
         // Battery charging and high.
-        BatteryUtils.runDumpsysBatterySetPluggedIn(true);
+        setChargingState(true);
         assertFalse("New job started in RESTRICTED bucket", mTestAppInterface.awaitJobStart(3_000));
         BatteryUtils.runDumpsysBatterySetLevel(100);
         assertFalse("New job started in RESTRICTED bucket", mTestAppInterface.awaitJobStart(3_000));
@@ -538,7 +647,7 @@
         setAirplaneMode(true);
         setScreenState(true);
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         setTestPackageStandbyBucket(Bucket.RESTRICTED);
         Thread.sleep(DEFAULT_WAIT_TIMEOUT);
         mTestAppInterface.scheduleJob(false, NETWORK_TYPE_ANY, false);
@@ -548,7 +657,7 @@
         // Slowly add back required bucket constraints.
 
         // Battery charging and high.
-        BatteryUtils.runDumpsysBatterySetPluggedIn(true);
+        setChargingState(true);
         runJob();
         assertFalse("New job started in RESTRICTED bucket", mTestAppInterface.awaitJobStart(3_000));
         BatteryUtils.runDumpsysBatterySetLevel(100);
@@ -578,7 +687,7 @@
         assumeFalse("not testable in automotive device", mAutomotiveDevice);
         assumeFalse("not testable in leanback device", mLeanbackOnly);
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         setTestPackageStandbyBucket(Bucket.NEVER);
         Thread.sleep(DEFAULT_WAIT_TIMEOUT);
         sendScheduleJobBroadcast(false);
@@ -590,7 +699,7 @@
         assumeFalse("not testable in automotive device", mAutomotiveDevice);
         assumeFalse("not testable in leanback device", mLeanbackOnly);
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         setTestPackageStandbyBucket(Bucket.NEVER);
         tempWhitelistTestApp(6_000);
         Thread.sleep(DEFAULT_WAIT_TIMEOUT);
@@ -606,7 +715,7 @@
 
         BatteryUtils.assumeBatterySaverFeature();
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         BatteryUtils.enableBatterySaver(false);
         sendScheduleJobBroadcast(false);
         assertTrue("New job failed to start with battery saver OFF",
@@ -620,7 +729,7 @@
 
         BatteryUtils.assumeBatterySaverFeature();
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         BatteryUtils.enableBatterySaver(true);
         sendScheduleJobBroadcast(false);
         assertFalse("New job started with battery saver ON",
@@ -634,7 +743,7 @@
 
         BatteryUtils.assumeBatterySaverFeature();
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         BatteryUtils.enableBatterySaver(true);
         tempWhitelistTestApp(6_000);
         sendScheduleJobBroadcast(false);
@@ -650,7 +759,7 @@
         BatteryUtils.assumeBatterySaverFeature();
 
         // Enable battery saver, and schedule a job. It shouldn't run.
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         BatteryUtils.enableBatterySaver(true);
         sendScheduleJobBroadcast(false);
         assertFalse("New job started with battery saver ON",
@@ -669,7 +778,7 @@
 
         BatteryUtils.assumeBatterySaverFeature();
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         BatteryUtils.enableBatterySaver(true);
         mTestAppInterface.scheduleJob(false, JobInfo.NETWORK_TYPE_NONE, true);
         assertTrue("New expedited job failed to start with battery saver ON",
@@ -683,7 +792,7 @@
 
         BatteryUtils.assumeBatterySaverFeature();
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         BatteryUtils.enableBatterySaver(false);
         mTestAppInterface.scheduleJob(false, JobInfo.NETWORK_TYPE_NONE, true);
         assertTrue("New expedited job failed to start with battery saver ON",
@@ -756,7 +865,7 @@
         // Intentionally set a value below 1 minute to ensure the range checks work.
         mDeviceConfigStateHelper.set("runtime_min_ej_guarantee_ms", Long.toString(47_000L));
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         BatteryUtils.enableBatterySaver(true);
         mTestAppInterface.scheduleJob(false, JobInfo.NETWORK_TYPE_NONE, true);
         runJob();
@@ -788,7 +897,7 @@
         assumeTrue("device idle not enabled", mDeviceIdleEnabled);
         mDeviceConfigStateHelper.set("runtime_min_ej_guarantee_ms", Long.toString(60_000L));
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         toggleDozeState(true);
         mTestAppInterface.scheduleJob(false, JobInfo.NETWORK_TYPE_NONE, true);
         runJob();
@@ -846,7 +955,7 @@
         // Intentionally set a value below 1 minute to ensure the range checks work.
         mDeviceConfigStateHelper.set("runtime_min_ej_guarantee_ms", Long.toString(0L));
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         BatteryUtils.enableBatterySaver(false);
         mTestAppInterface.scheduleJob(false, JobInfo.NETWORK_TYPE_NONE, true);
         runJob();
@@ -883,7 +992,7 @@
         setAirplaneMode(false);
         setWifiState(true, mCm, mWifiManager);
         setWifiMeteredState(false);
-        BatteryUtils.runDumpsysBatterySetPluggedIn(true);
+        setChargingState(true);
         BatteryUtils.runDumpsysBatterySetLevel(100);
         setScreenState(false);
         triggerJobIdle();
@@ -921,12 +1030,12 @@
         runJob();
         assertTrue("New job didn't start in RESTRICTED bucket",
                 mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         assertTrue("New job didn't stop when device no longer charging",
                 mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
         assertEquals(JobParameters.STOP_REASON_APP_STANDBY,
                 mTestAppInterface.getLastParams().getStopReason());
-        BatteryUtils.runDumpsysBatterySetPluggedIn(true);
+        setChargingState(true);
         BatteryUtils.runDumpsysBatterySetLevel(100);
 
         // Battery not low
@@ -945,9 +1054,12 @@
 
     @Test
     public void testRestrictingStopReason_Quota() throws Exception {
+        assumeFalse("not testable in automotive device", mAutomotiveDevice); // Test needs battery
+        assumeFalse("not testable in leanback device", mLeanbackOnly); // Test needs battery
+
         // Reduce allowed time for testing.
-        mDeviceConfigStateHelper.set("qc_allowed_time_per_period_ms", "60000");
-        BatteryUtils.runDumpsysBatteryUnplug();
+        mDeviceConfigStateHelper.set("qc_allowed_time_per_period_rare_ms", "60000");
+        setChargingState(false);
         setTestPackageStandbyBucket(Bucket.RARE);
 
         sendScheduleJobBroadcast(false);
@@ -963,11 +1075,77 @@
                 mTestAppInterface.getLastParams().getStopReason());
     }
 
+    /*
+    Tests currently disabled because they require changes inside the framework to lower the minimum
+    EJ quota to one minute (from 5 minutes).
+    TODO(224533485): make JS testable enough to enable these tests
+
+    @Test
+    public void testRestrictingStopReason_ExpeditedQuota_startOnCharging() throws Exception {
+        assumeFalse("not testable in automotive device", mAutomotiveDevice); // Test needs battery
+        assumeFalse("not testable in leanback device", mLeanbackOnly); // Test needs battery
+
+        // Reduce allowed time for testing. System to cap the time above 30 seconds.
+        mDeviceConfigStateHelper.set("qc_ej_limit_rare_ms", "30000");
+        mDeviceConfigStateHelper.set("runtime_min_ej_guarantee_ms", "30000");
+        // Start with charging so JobScheduler thinks the job can run for the maximum amount of
+        // time. We turn off charging later so quota clearly comes into effect.
+        setChargingState(true);
+        setTestPackageStandbyBucket(Bucket.RARE);
+
+        mTestAppInterface.scheduleJob(false, NETWORK_TYPE_NONE, true);
+        runJob();
+        assertTrue("New job didn't start",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+        assertTrue(mTestAppInterface.getLastParams().isExpeditedJob());
+        setChargingState(false);
+
+        assertFalse("Job stopped before using up quota",
+                mTestAppInterface.awaitJobStop(45_000));
+        Thread.sleep(15_000);
+
+        assertTrue("Job didn't stop after using up quota",
+                mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+        assertEquals(JobParameters.STOP_REASON_QUOTA,
+                mTestAppInterface.getLastParams().getStopReason());
+    }
+
+    @Test
+    public void testRestrictingStopReason_ExpeditedQuota_noCharging() throws Exception {
+        assumeFalse("not testable in automotive device", mAutomotiveDevice); // Test needs battery
+        assumeFalse("not testable in leanback device", mLeanbackOnly); // Test needs battery
+
+        // Reduce allowed time for testing.
+        mDeviceConfigStateHelper.set("qc_ej_limit_rare_ms", "30000");
+        mDeviceConfigStateHelper.set("runtime_min_ej_guarantee_ms", "30000");
+        setChargingState(false);
+        setTestPackageStandbyBucket(Bucket.RARE);
+
+        mTestAppInterface.scheduleJob(false, NETWORK_TYPE_NONE, true);
+        runJob();
+        assertTrue("New job didn't start",
+                mTestAppInterface.awaitJobStart(DEFAULT_WAIT_TIMEOUT));
+        assertTrue(mTestAppInterface.getLastParams().isExpeditedJob());
+
+        assertFalse("Job stopped before using up quota",
+                mTestAppInterface.awaitJobStop(45_000));
+        Thread.sleep(15_000);
+
+        assertTrue("Job didn't stop after using up quota",
+                mTestAppInterface.awaitJobStop(DEFAULT_WAIT_TIMEOUT));
+        // Charging state was false when the job started, so the trigger the timeout before
+        // QuotaController officially marks the quota finished.
+        final int stopReason = mTestAppInterface.getLastParams().getStopReason();
+        assertTrue(stopReason == JobParameters.STOP_REASON_TIMEOUT
+                || stopReason == JobParameters.STOP_REASON_QUOTA);
+    }
+     */
+
     @Test
     public void testRestrictingStopReason_BatterySaver() throws Exception {
         BatteryUtils.assumeBatterySaverFeature();
 
-        BatteryUtils.runDumpsysBatteryUnplug();
+        setChargingState(false);
         BatteryUtils.enableBatterySaver(false);
         sendScheduleJobBroadcast(false);
         runJob();
@@ -1007,8 +1185,11 @@
             toggleDozeState(false);
         }
         mTestAppInterface.cleanup();
+        mUiDevice.executeShellCommand("cmd jobscheduler monitor-battery off");
         BatteryUtils.runDumpsysBatteryReset();
         BatteryUtils.enableBatterySaver(false);
+        Settings.Global.putString(mContext.getContentResolver(),
+                Settings.Global.BATTERY_STATS_CONSTANTS, mInitialBatteryStatsConstants);
         removeTestAppFromTempWhitelist();
 
         // Ensure that we leave WiFi in its previous state.
@@ -1021,11 +1202,13 @@
             }
         }
         mDeviceConfigStateHelper.restoreOriginalValues();
+        mActivityManagerDeviceConfigStateHelper.restoreOriginalValues();
         Settings.Global.putString(mContext.getContentResolver(),
                 Settings.Global.ENABLE_RESTRICTED_BUCKET, mInitialRestrictedBucketEnabled);
         if (isAirplaneModeOn() != mInitialAirplaneModeState) {
             setAirplaneMode(mInitialAirplaneModeState);
         }
+        setLocationMode(mInitialLocationMode);
         mUiDevice.executeShellCommand(
                 "cmd jobscheduler reset-execution-quota -u " + UserHandle.myUserId()
                         + " " + TEST_APP_PACKAGE);
@@ -1044,6 +1227,11 @@
                 Settings.Global.ENABLE_RESTRICTED_BUCKET, enabled ? "1" : "0");
     }
 
+    private void toggleAutoRestrictedBucketOnBgRestricted(boolean enable) {
+        mActivityManagerDeviceConfigStateHelper.set("bg_auto_restricted_bucket_on_bg_restricted",
+                Boolean.toString(enable));
+    }
+
     private boolean isTestAppTempWhitelisted() throws Exception {
         final String output = mUiDevice.executeShellCommand("cmd deviceidle tempwhitelist").trim();
         for (String line : output.split("\n")) {
@@ -1132,6 +1320,33 @@
         Thread.sleep(2_000);
     }
 
+    private void setChargingState(boolean isCharging) throws Exception {
+        mUiDevice.executeShellCommand("cmd jobscheduler monitor-battery on");
+
+        final String command;
+        if (isCharging) {
+            mUiDevice.executeShellCommand("cmd battery set ac 1");
+            final int curLevel = Integer.parseInt(
+                    mUiDevice.executeShellCommand("dumpsys battery get level").trim());
+            command = "cmd battery set -f level " + Math.min(100, curLevel + 1);
+        } else {
+            command = "cmd battery unplug -f";
+        }
+        int seq = Integer.parseInt(mUiDevice.executeShellCommand(command).trim());
+
+        // Wait for the battery update to be processed by job scheduler before proceeding.
+        waitUntil("JobScheduler didn't update charging status to " + isCharging, 15 /* seconds */,
+                () -> {
+                    int curSeq;
+                    boolean curCharging;
+                    curSeq = Integer.parseInt(mUiDevice.executeShellCommand(
+                            "cmd jobscheduler get-battery-seq").trim());
+                    curCharging = Boolean.parseBoolean(mUiDevice.executeShellCommand(
+                            "cmd jobscheduler get-battery-charging").trim());
+                    return curSeq >= seq && curCharging == isCharging;
+                });
+    }
+
     /**
      * Trigger job idle (not device idle);
      */
@@ -1199,7 +1414,9 @@
         }
     }
 
-    private String getWifiSSID() {
+    private String getWifiSSID() throws Exception {
+        // Location needs to be enabled to get the WiFi information.
+        setLocationMode(String.valueOf(Settings.Secure.LOCATION_MODE_ON));
         final AtomicReference<String> ssid = new AtomicReference<>();
         SystemUtil.runWithShellPermissionIdentity(() -> {
             ssid.set(mWifiManager.getConnectionInfo().getSSID());
@@ -1207,6 +1424,15 @@
         return unquoteSSID(ssid.get());
     }
 
+    private void setLocationMode(String mode) throws Exception {
+        Settings.Secure.putString(mContext.getContentResolver(),
+                Settings.Secure.LOCATION_MODE, mode);
+        final LocationManager locationManager = mContext.getSystemService(LocationManager.class);
+        final boolean wantEnabled = !String.valueOf(Settings.Secure.LOCATION_MODE_OFF).equals(mode);
+        waitUntil("Location " + (wantEnabled ? "not enabled" : "still enabled"),
+                () -> wantEnabled == locationManager.isLocationEnabled());
+    }
+
     // Returns "true", "false" or "none"
     private String getWifiMeteredStatus(String ssid) {
         // Interestingly giving the SSID as an argument to list wifi-networks
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/JobWorkItemTest.java b/tests/JobScheduler/src/android/jobscheduler/cts/JobWorkItemTest.java
index e05969e..457ec1f 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/JobWorkItemTest.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/JobWorkItemTest.java
@@ -50,6 +50,48 @@
         assertEquals(0, jwi.getDeliveryCount());
     }
 
+    public void testItemWithMinimumChunkBytes() {
+        JobWorkItem jwi = new JobWorkItem(TEST_INTENT, 10, 20, 3);
+
+        assertEquals(TEST_INTENT, jwi.getIntent());
+        assertEquals(10, jwi.getEstimatedNetworkDownloadBytes());
+        assertEquals(20, jwi.getEstimatedNetworkUploadBytes());
+        assertEquals(3, jwi.getMinimumNetworkChunkBytes());
+        // JobWorkItem hasn't been scheduled yet. Delivery count should be 0.
+        assertEquals(0, jwi.getDeliveryCount());
+
+        try {
+            new JobWorkItem(TEST_INTENT, 10, 20, -3);
+            fail("Successfully created JobWorkItem with negative minimum chunk value");
+        } catch (IllegalArgumentException expected) {
+            // Success
+        }
+        try {
+            new JobWorkItem(TEST_INTENT, 10, 20, 0);
+            fail("Successfully created JobWorkItem with 0 minimum chunk value");
+        } catch (IllegalArgumentException expected) {
+            // Success
+        }
+        try {
+            new JobWorkItem(TEST_INTENT, 10, 20, 50);
+            fail("Successfully created JobWorkItem with minimum chunk value too large");
+        } catch (IllegalArgumentException expected) {
+            // Success
+        }
+        try {
+            new JobWorkItem(TEST_INTENT, JobInfo.NETWORK_BYTES_UNKNOWN, 20, 25);
+            fail("Successfully created JobWorkItem with minimum chunk value too large");
+        } catch (IllegalArgumentException expected) {
+            // Success
+        }
+        try {
+            new JobWorkItem(TEST_INTENT, 10, JobInfo.NETWORK_BYTES_UNKNOWN, 15);
+            fail("Successfully created JobWorkItem with minimum chunk value too large");
+        } catch (IllegalArgumentException expected) {
+            // Success
+        }
+    }
+
     public void testDeliveryCountBumped() throws Exception {
         JobInfo jobInfo = new JobInfo.Builder(JOB_ID, kJobServiceComponent)
                 .setOverrideDeadline(0)
diff --git a/tests/JobScheduler/src/android/jobscheduler/cts/TestAppInterface.java b/tests/JobScheduler/src/android/jobscheduler/cts/TestAppInterface.java
index 8db459e..fd17c29 100644
--- a/tests/JobScheduler/src/android/jobscheduler/cts/TestAppInterface.java
+++ b/tests/JobScheduler/src/android/jobscheduler/cts/TestAppInterface.java
@@ -100,7 +100,9 @@
             throws Exception {
         final Intent scheduleJobIntent = new Intent(TestJobSchedulerReceiver.ACTION_SCHEDULE_JOB);
         scheduleJobIntent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
-        scheduleJobIntent.putExtra(TestJobSchedulerReceiver.EXTRA_JOB_ID_KEY, mJobId);
+        if (!intExtras.containsKey(TestJobSchedulerReceiver.EXTRA_JOB_ID_KEY)) {
+            scheduleJobIntent.putExtra(TestJobSchedulerReceiver.EXTRA_JOB_ID_KEY, mJobId);
+        }
         booleanExtras.forEach(scheduleJobIntent::putExtra);
         intExtras.forEach(scheduleJobIntent::putExtra);
         scheduleJobIntent.setComponent(new ComponentName(TEST_APP_PACKAGE, TEST_APP_RECEIVER));
@@ -165,9 +167,13 @@
     };
 
     boolean awaitJobStart(long maxWait) throws Exception {
+        return awaitJobStart(mJobId, maxWait);
+    }
+
+    boolean awaitJobStart(int jobId, long maxWait) throws Exception {
         return waitUntilTrue(maxWait, () -> {
             synchronized (mTestJobState) {
-                return (mTestJobState.jobId == mJobId) && mTestJobState.running;
+                return (mTestJobState.jobId == jobId) && mTestJobState.running;
             }
         });
     }
diff --git a/tests/MediaProviderTranscode/Android.bp b/tests/MediaProviderTranscode/Android.bp
index 4ba3243..54ee715 100644
--- a/tests/MediaProviderTranscode/Android.bp
+++ b/tests/MediaProviderTranscode/Android.bp
@@ -7,6 +7,7 @@
     test_suites: [
         "device-tests",
         "cts",
+        "mts-mediaprovider",
     ],
     compile_multilib: "both",
 
@@ -30,6 +31,9 @@
         "truth-prebuilt",
     ],
 
+    min_sdk_version: "30",
+    //TODO(b/227617884): Change target_sdk_version to 33 after T SDK finalization is complete
+    target_sdk_version: "10000",
     certificate: "media",
     java_resources: [":CtsTranscodeTestAppSupportsHevc", ":CtsTranscodeTestAppSupportsSlowMotion"]
 }
@@ -45,6 +49,7 @@
     ],
     static_libs: ["androidx.legacy_legacy-support-v4"],
     target_sdk_version: "28",
+    min_sdk_version: "30",
 }
 
 android_test_helper_app {
@@ -58,4 +63,5 @@
     ],
     static_libs: ["androidx.legacy_legacy-support-v4"],
     target_sdk_version: "28",
+    min_sdk_version: "30",
 }
diff --git a/tests/MediaProviderTranscode/AndroidTest.xml b/tests/MediaProviderTranscode/AndroidTest.xml
index 1fdeb9e..6b9c8e9 100644
--- a/tests/MediaProviderTranscode/AndroidTest.xml
+++ b/tests/MediaProviderTranscode/AndroidTest.xml
@@ -19,6 +19,11 @@
         <option name="install-arg" value="-g" />
     </target_preparer>
 
+    <option
+        name="config-descriptor:metadata"
+        key="mainline-param"
+        value="com.google.android.mediaprovider.apex" />
+
     <option name="test-suite-tag" value="apct" />
     <option name="test-suite-tag" value="cts" />
     <option name="test-tag" value="MediaProviderTranscodeTests" />
diff --git a/tests/PhotoPicker/Android.bp b/tests/PhotoPicker/Android.bp
new file mode 100644
index 0000000..5a9fc33
--- /dev/null
+++ b/tests/PhotoPicker/Android.bp
@@ -0,0 +1,40 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsPhotoPickerTest",
+    manifest: "AndroidManifest.xml",
+    test_config: "AndroidTest.xml",
+    srcs: ["src/**/*.java", "helper/**/*.java", ":CtsProviderTestUtils",],
+    compile_multilib: "both",
+    test_suites: ["general-tests", "mts-mediaprovider", "cts"],
+    sdk_version: "core_current",
+    min_sdk_version: "30",
+    libs: [
+            "android.test.base",
+            "android.test.runner",
+            "framework-mediaprovider.impl",
+            "framework-res",
+            "android_test_stubs_current"],
+    static_libs: [
+            "androidx.test.rules",
+            "cts-install-lib",
+            "androidx.test.uiautomator_uiautomator",
+            "Harrier",
+    ],
+}
diff --git a/tests/PhotoPicker/AndroidManifest.xml b/tests/PhotoPicker/AndroidManifest.xml
new file mode 100644
index 0000000..e10bf52
--- /dev/null
+++ b/tests/PhotoPicker/AndroidManifest.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.photopicker.cts">
+<application android:label="Photo Picker Device Tests">
+    <uses-library android:name="android.test.runner" />
+    <activity android:name="android.photopicker.cts.GetResultActivity" />
+
+    <provider android:name="android.photopicker.cts.cloudproviders.CloudProviderPrimary"
+              android:authorities="android.photopicker.cts.cloudproviders.cloud_primary"
+              android:permission="com.android.providers.media.permission.MANAGE_CLOUD_MEDIA_PROVIDERS"
+              android:exported="true">
+      <intent-filter>
+        <action android:name="android.content.action.CLOUD_MEDIA_PROVIDER" />
+      </intent-filter>
+    </provider>
+
+    <provider android:name="android.photopicker.cts.cloudproviders.CloudProviderSecondary"
+              android:authorities="android.photopicker.cts.cloudproviders.cloud_secondary"
+              android:permission="com.android.providers.media.permission.MANAGE_CLOUD_MEDIA_PROVIDERS"
+              android:exported="true">
+      <intent-filter>
+        <action android:name="android.content.action.CLOUD_MEDIA_PROVIDER" />
+      </intent-filter>
+    </provider>
+
+    <provider android:name="android.photopicker.cts.cloudproviders.CloudProviderNoPermission"
+              android:authorities="android.photopicker.cts.cloudproviders.cloud_no_permission"
+              android:exported="true">
+      <intent-filter>
+        <action android:name="android.content.action.CLOUD_MEDIA_PROVIDER" />
+      </intent-filter>
+    </provider>
+
+    <provider android:name="android.photopicker.cts.cloudproviders.CloudProviderNoIntentFilter"
+              android:authorities="android.photopicker.cts.cloudproviders.cloud_no_intent_filter"
+              android:permission="com.android.providers.media.permission.MANAGE_CLOUD_MEDIA_PROVIDERS"
+              android:exported="true">
+    </provider>
+</application>
+
+<instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                 android:targetPackage="android.photopicker.cts"
+                 android:label="Device-only photo picker tests" />
+
+</manifest>
diff --git a/tests/PhotoPicker/AndroidTest.xml b/tests/PhotoPicker/AndroidTest.xml
new file mode 100644
index 0000000..c52543e
--- /dev/null
+++ b/tests/PhotoPicker/AndroidTest.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+<configuration description="Runs device-only tests for photo picker">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsPhotoPickerTest.apk" />
+    </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
+        <option name="force-root" value="false" />
+    </target_preparer>
+
+    <option
+        name="config-descriptor:metadata"
+        key="mainline-param"
+        value="com.google.android.mediaprovider.apex" />
+
+    <option name="test-suite-tag" value="cts" />
+    <option name="test-tag" value="PhotoPickerTests" />
+    <!-- Instant apps cannot access external storage -->
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.photopicker.cts" />
+        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
+        <option name="exclude-annotation" value="com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile" />
+        <option name="exclude-annotation" value="com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser" />
+        <option name="instrumentation-arg" key="thisisignored" value="thisisignored --no-window-animation" />
+    </test>
+    <option name="config-descriptor:metadata" key="parameter" value="multiuser" />
+
+    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+        <option name="mainline-module-package-name" value="com.google.android.mediaprovider" />
+    </object>
+</configuration>
diff --git a/tests/PhotoPicker/OWNERS b/tests/PhotoPicker/OWNERS
new file mode 100644
index 0000000..79add9e
--- /dev/null
+++ b/tests/PhotoPicker/OWNERS
@@ -0,0 +1,3 @@
+# Bug component: 95221
+
+include platform/frameworks/base:/core/java/android/os/storage/OWNERS
diff --git a/tests/PhotoPicker/TEST_MAPPING b/tests/PhotoPicker/TEST_MAPPING
new file mode 100644
index 0000000..f48e90c
--- /dev/null
+++ b/tests/PhotoPicker/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsPhotoPickerTest"
+    }
+  ]
+}
diff --git a/tests/PhotoPicker/res/raw/lg_g4_iso_800_jpg.jpg b/tests/PhotoPicker/res/raw/lg_g4_iso_800_jpg.jpg
new file mode 100644
index 0000000..d264196
--- /dev/null
+++ b/tests/PhotoPicker/res/raw/lg_g4_iso_800_jpg.jpg
Binary files differ
diff --git a/tests/PhotoPicker/res/raw/test_video.mp4 b/tests/PhotoPicker/res/raw/test_video.mp4
new file mode 100644
index 0000000..ab95ac0
--- /dev/null
+++ b/tests/PhotoPicker/res/raw/test_video.mp4
Binary files differ
diff --git a/tests/PhotoPicker/res/raw/test_video_dng.mp4 b/tests/PhotoPicker/res/raw/test_video_dng.mp4
new file mode 100644
index 0000000..9b38f0e
--- /dev/null
+++ b/tests/PhotoPicker/res/raw/test_video_dng.mp4
Binary files differ
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/CloudPhotoPickerTest.java b/tests/PhotoPicker/src/android/photopicker/cts/CloudPhotoPickerTest.java
new file mode 100644
index 0000000..aa0c954
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/CloudPhotoPickerTest.java
@@ -0,0 +1,412 @@
+/*
+ * Copyright (C) 2022 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 android.photopicker.cts;
+
+import static android.os.SystemProperties.getBoolean;
+import static android.photopicker.cts.PickerProviderMediaGenerator.MediaGenerator;
+import static android.photopicker.cts.PickerProviderMediaGenerator.setCloudProvider;
+import static android.photopicker.cts.PickerProviderMediaGenerator.syncCloudProvider;
+import static android.photopicker.cts.util.PhotoPickerAssertionsUtils.assertRedactedReadOnlyAccess;
+import static android.photopicker.cts.util.PhotoPickerFilesUtils.createImages;
+import static android.photopicker.cts.util.PhotoPickerFilesUtils.deleteMedia;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.findAddButton;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.findItemList;
+import static android.provider.MediaStore.PickerMediaColumns;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.content.ClipData;
+import android.content.ContentResolver;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Build;
+import android.os.storage.StorageManager;
+import android.photopicker.cts.cloudproviders.CloudProviderNoIntentFilter;
+import android.photopicker.cts.cloudproviders.CloudProviderNoPermission;
+import android.photopicker.cts.cloudproviders.CloudProviderPrimary;
+import android.photopicker.cts.cloudproviders.CloudProviderSecondary;
+import android.provider.MediaStore;
+import android.util.Pair;
+
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiObject;
+
+import org.junit.After;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+
+/**
+ * Photo Picker Device only tests for common flows.
+ */
+@RunWith(AndroidJUnit4.class)
+public class CloudPhotoPickerTest extends PhotoPickerBaseTest {
+    private final List<Uri> mUriList = new ArrayList<>();
+    private MediaGenerator mCloudPrimaryMediaGenerator;
+    private MediaGenerator mCloudSecondaryMediaGenerator;
+
+    private static final long IMAGE_SIZE_BYTES = 107684;
+
+    private static final String COLLECTION_1 = "COLLECTION_1";
+    private static final String COLLECTION_2 = "COLLECTION_2";
+
+    private static final String CLOUD_ID1 = "CLOUD_ID1";
+    private static final String CLOUD_ID2 = "CLOUD_ID2";
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+
+        mCloudPrimaryMediaGenerator = PickerProviderMediaGenerator.getMediaGenerator(
+                mContext, CloudProviderPrimary.AUTHORITY);
+        mCloudSecondaryMediaGenerator = PickerProviderMediaGenerator.getMediaGenerator(
+                mContext, CloudProviderSecondary.AUTHORITY);
+
+        mCloudPrimaryMediaGenerator.resetAll();
+        mCloudSecondaryMediaGenerator.resetAll();
+
+        mCloudPrimaryMediaGenerator.setMediaCollectionId(COLLECTION_1);
+        mCloudSecondaryMediaGenerator.setMediaCollectionId(COLLECTION_1);
+
+        setCloudProvider(mContext, null);
+
+        Assume.assumeTrue(getBoolean("sys.photopicker.pickerdb.enabled", true));
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        for (Uri uri : mUriList) {
+            deleteMedia(uri, mContext);
+        }
+        mActivity.finish();
+        mUriList.clear();
+        setCloudProvider(mContext, null);
+    }
+
+    @Test
+    public void testCloudOnlySync() throws Exception {
+        initPrimaryCloudProviderWithImage(Pair.create(null, CLOUD_ID1));
+
+        final ClipData clipData = fetchPickerMedia(1);
+        final List<String> mediaIds = extractMediaIds(clipData, 1);
+
+        assertThat(mediaIds).containsExactly(CLOUD_ID1);
+    }
+
+    @Test
+    public void testCloudPlusLocalSyncWithoutDedupe() throws Exception {
+        createImages(1, mContext.getUserId(), mUriList);
+        initPrimaryCloudProviderWithImage(Pair.create(null, CLOUD_ID1));
+
+        final ClipData clipData = fetchPickerMedia(2);
+        final List<String> mediaIds = extractMediaIds(clipData, 2);
+
+        assertThat(mediaIds).containsExactly(CLOUD_ID1, mUriList.get(0).getLastPathSegment());
+    }
+
+    @Test
+    public void testCloudPlusLocalSyncWithDedupe() throws Exception {
+        createImages(1, mContext.getUserId(), mUriList);
+        initPrimaryCloudProviderWithImage(Pair.create(mUriList.get(0).getLastPathSegment(),
+                        CLOUD_ID1));
+
+        final ClipData clipData = fetchPickerMedia(1);
+        final List<String> mediaIds = extractMediaIds(clipData, 1);
+
+        containsExcept(mediaIds, mUriList.get(0).getLastPathSegment(), CLOUD_ID1);
+    }
+
+    @Test
+    public void testDeleteCloudMedia() throws Exception {
+        initPrimaryCloudProviderWithImage(Pair.create(null, CLOUD_ID1),
+                Pair.create(null, CLOUD_ID2));
+
+        ClipData clipData = fetchPickerMedia(2);
+        List<String> mediaIds = extractMediaIds(clipData, 2);
+
+        assertThat(mediaIds).containsExactly(CLOUD_ID1, CLOUD_ID2);
+
+        mCloudPrimaryMediaGenerator.deleteMedia(/* localId */ null, CLOUD_ID1,
+                /* trackDeleted */ true);
+        syncCloudProvider(mContext);
+
+        clipData = fetchPickerMedia(2);
+        mediaIds = extractMediaIds(clipData, 1);
+
+        containsExcept(mediaIds, CLOUD_ID2, CLOUD_ID1);
+    }
+
+    @Test
+    public void testVersionChange() throws Exception {
+        initPrimaryCloudProviderWithImage(Pair.create(null, CLOUD_ID1),
+                Pair.create(null, CLOUD_ID2));
+
+        ClipData clipData = fetchPickerMedia(2);
+        List<String> mediaIds = extractMediaIds(clipData, 2);
+
+        assertThat(mediaIds).containsExactly(CLOUD_ID1, CLOUD_ID2);
+
+        mCloudPrimaryMediaGenerator.deleteMedia(/* localId */ null, CLOUD_ID1,
+                /* trackDeleted */ false);
+        syncCloudProvider(mContext);
+
+        clipData = fetchPickerMedia(2);
+        mediaIds = extractMediaIds(clipData, 2);
+
+        assertThat(mediaIds).containsExactly(CLOUD_ID1, CLOUD_ID2);
+
+        mCloudPrimaryMediaGenerator.setMediaCollectionId(COLLECTION_2);
+        syncCloudProvider(mContext);
+
+        clipData = fetchPickerMedia(2);
+        mediaIds = extractMediaIds(clipData, 1);
+
+        containsExcept(mediaIds, CLOUD_ID2, CLOUD_ID1);
+    }
+
+    @Test
+    public void testSupportedProviders() throws Exception {
+        assertThat(MediaStore.isSupportedCloudMediaProviderAuthority(mContext.getContentResolver(),
+                        CloudProviderPrimary.AUTHORITY)).isTrue();
+        assertThat(MediaStore.isSupportedCloudMediaProviderAuthority(mContext.getContentResolver(),
+                        CloudProviderSecondary.AUTHORITY)).isTrue();
+
+        assertThat(MediaStore.isSupportedCloudMediaProviderAuthority(mContext.getContentResolver(),
+                        CloudProviderNoPermission.AUTHORITY)).isFalse();
+        assertThat(MediaStore.isSupportedCloudMediaProviderAuthority(mContext.getContentResolver(),
+                        CloudProviderNoIntentFilter.AUTHORITY)).isFalse();
+    }
+
+    @Test
+    public void testProviderSwitchSuccess() throws Exception {
+        setCloudProvider(mContext, CloudProviderPrimary.AUTHORITY);
+        assertThat(MediaStore.isCurrentCloudMediaProviderAuthority(mContext.getContentResolver(),
+                        CloudProviderPrimary.AUTHORITY)).isTrue();
+
+        addImage(mCloudPrimaryMediaGenerator, /* localId */ null, CLOUD_ID1);
+        addImage(mCloudSecondaryMediaGenerator, /* localId */ null, CLOUD_ID2);
+
+        syncCloudProvider(mContext);
+
+        ClipData clipData = fetchPickerMedia(2);
+        List<String> mediaIds = extractMediaIds(clipData, 1);
+
+        containsExcept(mediaIds, CLOUD_ID1, CLOUD_ID2);
+
+        setCloudProvider(mContext, CloudProviderSecondary.AUTHORITY);
+        assertThat(MediaStore.isCurrentCloudMediaProviderAuthority(mContext.getContentResolver(),
+                        CloudProviderPrimary.AUTHORITY)).isFalse();
+
+        clipData = fetchPickerMedia(2);
+        mediaIds = extractMediaIds(clipData, 1);
+
+        containsExcept(mediaIds, CLOUD_ID2, CLOUD_ID1);
+    }
+
+    @Test
+    public void testProviderSwitchFailure() throws Exception {
+        setCloudProvider(mContext, CloudProviderNoIntentFilter.AUTHORITY);
+        assertThat(MediaStore.isCurrentCloudMediaProviderAuthority(mContext.getContentResolver(),
+                        CloudProviderPrimary.AUTHORITY)).isFalse();
+
+        setCloudProvider(mContext, CloudProviderNoPermission.AUTHORITY);
+        assertThat(MediaStore.isCurrentCloudMediaProviderAuthority(mContext.getContentResolver(),
+                        CloudProviderPrimary.AUTHORITY)).isFalse();
+    }
+
+    @Test
+    public void testUriAccessWithValidProjection() throws Exception {
+        initPrimaryCloudProviderWithImage(Pair.create(null, CLOUD_ID1));
+
+        final ClipData clipData = fetchPickerMedia(1);
+        final List<String> mediaIds = extractMediaIds(clipData, 1);
+
+        assertThat(mediaIds).containsExactly(CLOUD_ID1);
+
+        final ContentResolver resolver = mContext.getContentResolver();
+        String expectedDisplayName = CLOUD_ID1 + ".jpg";
+
+        try (Cursor c = resolver.query(clipData.getItemAt(0).getUri(), null, null, null)) {
+            assertThat(c).isNotNull();
+            assertThat(c.moveToFirst()).isTrue();
+
+            assertThat(c.getString(c.getColumnIndex(PickerMediaColumns.MIME_TYPE)))
+                    .isEqualTo("image/jpeg");
+            assertThat(c.getString(c.getColumnIndex(PickerMediaColumns.DISPLAY_NAME)))
+                    .isEqualTo(expectedDisplayName);
+            assertThat(c.getLong(c.getColumnIndex(PickerMediaColumns.SIZE)))
+                    .isEqualTo(IMAGE_SIZE_BYTES);
+            assertThat(c.getLong(c.getColumnIndex(PickerMediaColumns.DURATION_MILLIS)))
+                    .isEqualTo(0);
+            assertThat(c.getLong(c.getColumnIndex(PickerMediaColumns.DATE_TAKEN)))
+                    .isGreaterThan(0);
+
+            final File file = new File(c.getString(c.getColumnIndex(PickerMediaColumns.DATA)));
+            assertThat(file.getPath().endsWith(expectedDisplayName)).isTrue();
+            assertThat(file.length()).isEqualTo(IMAGE_SIZE_BYTES);
+        }
+
+        assertRedactedReadOnlyAccess(clipData.getItemAt(0).getUri());
+    }
+
+    @Test
+    public void testUriAccessWithInvalidProjection() throws Exception {
+        initPrimaryCloudProviderWithImage(Pair.create(null, CLOUD_ID1));
+
+        final ClipData clipData = fetchPickerMedia(1);
+        final List<String> mediaIds = extractMediaIds(clipData, 1);
+
+        assertThat(mediaIds).containsExactly(CLOUD_ID1);
+
+        final ContentResolver resolver = mContext.getContentResolver();
+
+        assertThrows(IllegalArgumentException.class, () -> resolver.query(
+                        clipData.getItemAt(0).getUri(),
+                        new String[] {MediaStore.MediaColumns.RELATIVE_PATH}, null, null));
+    }
+
+    @Test
+    public void testCloudEventNotification() throws Exception {
+        // Create a placeholder local image to ensure that the picker UI is never empty.
+        // The PhotoPickerUiUtils#findItemList needs to select an item and it times out if the
+        // Picker UI is empty.
+        createImages(1, mContext.getUserId(), mUriList);
+
+        // Cloud provider isn't set
+        assertThat(MediaStore.isCurrentCloudMediaProviderAuthority(mContext.getContentResolver(),
+                        CloudProviderPrimary.AUTHORITY)).isFalse();
+        addImage(mCloudPrimaryMediaGenerator, /* localId */ null, CLOUD_ID1);
+
+        // Notification fails because the calling cloud provider isn't enabled
+        assertThrows("Unauthorized cloud media notification", SecurityException.class,
+                () -> MediaStore.notifyCloudMediaChangedEvent(mContext.getContentResolver(),
+                        CloudProviderPrimary.AUTHORITY, COLLECTION_1));
+
+        // Sleep because the notification API throttles requests with a 1s delay
+        Thread.sleep(1500);
+
+        ClipData clipData = fetchPickerMedia(1);
+        List<String> mediaIds = extractMediaIds(clipData, 1);
+
+        assertThat(mediaIds).containsNoneIn(Collections.singletonList(CLOUD_ID1));
+
+        // Now set the cloud provider and verify that notification succeeds
+        setCloudProvider(mContext, CloudProviderPrimary.AUTHORITY);
+        assertThat(MediaStore.isCurrentCloudMediaProviderAuthority(mContext.getContentResolver(),
+                        CloudProviderPrimary.AUTHORITY)).isTrue();
+
+        MediaStore.notifyCloudMediaChangedEvent(mContext.getContentResolver(),
+                CloudProviderPrimary.AUTHORITY, COLLECTION_1);
+
+        assertThrows("Unauthorized cloud media notification", SecurityException.class,
+                () -> MediaStore.notifyCloudMediaChangedEvent(mContext.getContentResolver(),
+                        CloudProviderSecondary.AUTHORITY, COLLECTION_1));
+
+        // Sleep because the notification API throttles requests with a 1s delay
+        Thread.sleep(1500);
+
+        clipData = fetchPickerMedia(1);
+        mediaIds = extractMediaIds(clipData, 1);
+
+        assertThat(mediaIds).containsExactly(CLOUD_ID1);
+    }
+
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)
+    public void testStorageManagerKnowsCloudProvider() {
+        final StorageManager storageManager = mContext.getSystemService(StorageManager.class);
+
+        setCloudProvider(mContext, CloudProviderPrimary.AUTHORITY);
+        assertThat(storageManager.getCloudMediaProvider())
+                .isEqualTo(CloudProviderPrimary.AUTHORITY);
+
+        setCloudProvider(mContext, CloudProviderSecondary.AUTHORITY);
+        assertThat(storageManager.getCloudMediaProvider())
+                .isEqualTo(CloudProviderSecondary.AUTHORITY);
+
+        setCloudProvider(mContext, null);
+        assertThat(storageManager.getCloudMediaProvider()).isNull();
+    }
+
+    private List<String> extractMediaIds(ClipData clipData, int minCount) {
+        final int count = clipData.getItemCount();
+        assertThat(count).isAtLeast(minCount);
+
+        final List<String> mediaIds = new ArrayList<>();
+        for (int i = 0; i < count; i++) {
+            mediaIds.add(clipData.getItemAt(i).getUri().getLastPathSegment());
+        }
+
+        return mediaIds;
+    }
+
+    private ClipData fetchPickerMedia(int maxCount) throws Exception {
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        final List<UiObject> itemList = findItemList(maxCount);
+        for (int i = 0; i < itemList.size(); i++) {
+            final UiObject item = itemList.get(i);
+            item.click();
+            mDevice.waitForIdle();
+        }
+
+        final UiObject addButton = findAddButton();
+        addButton.click();
+        mDevice.waitForIdle();
+
+        return mActivity.getResult().data.getClipData();
+    }
+
+    private void initPrimaryCloudProviderWithImage(Pair<String, String>... mediaPairs)
+            throws Exception {
+        setCloudProvider(mContext, CloudProviderPrimary.AUTHORITY);
+        assertThat(MediaStore.isCurrentCloudMediaProviderAuthority(mContext.getContentResolver(),
+                        CloudProviderPrimary.AUTHORITY)).isTrue();
+
+        for (Pair<String, String> pair: mediaPairs) {
+            addImage(mCloudPrimaryMediaGenerator, pair.first, pair.second);
+        }
+
+        syncCloudProvider(mContext);
+    }
+
+    private void addImage(MediaGenerator generator, String localId, String cloudId)
+            throws Exception {
+        generator.addMedia(localId, cloudId, /* albumId */ null, "image/jpeg",
+                /* mimeTypeExtension */ 0, IMAGE_SIZE_BYTES, /* isFavorite */ false,
+                R.raw.lg_g4_iso_800_jpg);
+    }
+
+    private static void containsExcept(List<String> mediaIds, String contained,
+            String notContained) {
+        assertThat(mediaIds).contains(contained);
+        assertThat(mediaIds).containsNoneIn(Collections.singletonList(notContained));
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/GetResultActivity.java b/tests/PhotoPicker/src/android/photopicker/cts/GetResultActivity.java
new file mode 100644
index 0000000..35e7830
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/GetResultActivity.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2021 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 android.photopicker.cts;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+public class GetResultActivity extends Activity {
+    private static LinkedBlockingQueue<Result> sResult;
+
+    public static class Result {
+        public final int requestCode;
+        public final int resultCode;
+        public final Intent data;
+
+        public Result(int requestCode, int resultCode, Intent data) {
+            this.requestCode = requestCode;
+            this.resultCode = resultCode;
+            this.data = data;
+        }
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
+                | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
+                | WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        try {
+            sResult.offer(new Result(requestCode, resultCode, data), 5, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void clearResult() {
+        sResult = new LinkedBlockingQueue<>();
+    }
+
+    public Result getResult() {
+        final Result result;
+        try {
+            result = sResult.poll(40, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        if (result == null) {
+            throw new IllegalStateException("Activity didn't receive a Result in 40 seconds");
+        }
+        return result;
+    }
+
+    public Result getResult(long timeout, TimeUnit unit) {
+        try {
+            return sResult.poll(timeout, unit);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/PhotoPickerBaseTest.java b/tests/PhotoPicker/src/android/photopicker/cts/PhotoPickerBaseTest.java
new file mode 100644
index 0000000..12bd8ae
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/PhotoPickerBaseTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2021 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 android.photopicker.cts;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.uiautomator.UiDevice;
+
+import org.junit.Before;
+
+/**
+ * Photo Picker Base class for Photo Picker tests. This includes common setup methods
+ * required for all Photo Picker tests.
+ */
+public class PhotoPickerBaseTest {
+    public static int REQUEST_CODE = 42;
+
+    protected GetResultActivity mActivity;
+    protected Context mContext;
+    protected UiDevice mDevice;
+
+    @Before
+    public void setUp() throws Exception {
+        final Instrumentation inst = InstrumentationRegistry.getInstrumentation();
+        mDevice = UiDevice.getInstance(inst);
+
+        final String setSyncDelayCommand =
+                "setprop  persist.sys.photopicker.pickerdb.default_sync_delay_ms 0";
+        mDevice.executeShellCommand(setSyncDelayCommand);
+
+        mContext = inst.getContext();
+        final Intent intent = new Intent(mContext, GetResultActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+
+        // Wake up the device and dismiss the keyguard before the test starts
+        mDevice.executeShellCommand("input keyevent KEYCODE_WAKEUP");
+        mDevice.executeShellCommand("wm dismiss-keyguard");
+
+        mActivity = (GetResultActivity) inst.startActivitySync(intent);
+        // Wait for the UI Thread to become idle.
+        inst.waitForIdleSync();
+        mActivity.clearResult();
+        mDevice.waitForIdle();
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/PhotoPickerCrossProfileTest.java b/tests/PhotoPicker/src/android/photopicker/cts/PhotoPickerCrossProfileTest.java
new file mode 100644
index 0000000..1092406
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/PhotoPickerCrossProfileTest.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2021 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 android.photopicker.cts;
+
+import static android.photopicker.cts.util.PhotoPickerAssertionsUtils.assertPickerUriFormat;
+import static android.photopicker.cts.util.PhotoPickerAssertionsUtils.assertRedactedReadOnlyAccess;
+import static android.photopicker.cts.util.PhotoPickerFilesUtils.createImages;
+import static android.photopicker.cts.util.PhotoPickerFilesUtils.deleteMedia;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.SHORT_TIMEOUT;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.findAddButton;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.findItemList;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.findProfileButton;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.content.ClipData;
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.MediaStore;
+
+import androidx.test.filters.SdkSuppress;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile;
+import com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile;
+
+import org.junit.After;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Photo Picker Device only tests for cross profile interaction flows.
+ */
+@RunWith(BedsteadJUnit4.class)
+public class PhotoPickerCrossProfileTest extends PhotoPickerBaseTest {
+    @ClassRule @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private List<Uri> mUriList = new ArrayList<>();
+
+    @After
+    public void tearDown() throws Exception {
+        for (Uri uri : mUriList) {
+            deleteMedia(uri, mContext);
+        }
+        mUriList.clear();
+        mActivity.finish();
+    }
+
+    /**
+     * ACTION_PICK_IMAGES is allowlisted by default from work to personal. This got allowlisted
+     * in a platform code change and is available Android T onwards.
+     */
+    @Test
+    @RequireRunOnWorkProfile
+    @SdkSuppress(minSdkVersion = 32, codeName = "T")
+    public void testWorkApp_canAccessPersonalProfileContents() throws Exception {
+        final int imageCount = 2;
+        createImages(imageCount, sDeviceState.primaryUser().id(), mUriList);
+
+        Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, imageCount);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        // Click the profile button to change to personal profile
+        final UiObject profileButton = findProfileButton();
+        profileButton.click();
+        mDevice.waitForIdle();
+
+        final List<UiObject> itemList = findItemList(imageCount);
+        final int itemCount = itemList.size();
+        assertThat(itemCount).isEqualTo(imageCount);
+        for (int i = 0; i < itemCount; i++) {
+            final UiObject item = itemList.get(i);
+            item.click();
+            mDevice.waitForIdle();
+        }
+
+        final UiObject addButton = findAddButton();
+        addButton.click();
+        mDevice.waitForIdle();
+
+        final ClipData clipData = mActivity.getResult().data.getClipData();
+        final int count = clipData.getItemCount();
+        assertThat(count).isEqualTo(imageCount);
+        for (int i = 0; i < count; i++) {
+            Uri uri = clipData.getItemAt(i).getUri();
+            assertPickerUriFormat(uri, sDeviceState.primaryUser().id());
+            assertRedactedReadOnlyAccess(uri);
+        }
+    }
+
+    /**
+     * ACTION_PICK_IMAGES is allowlisted by default from work to personal. This got allowlisted
+     * in a platform code change and is available Android T onwards. Before that it needs to be
+     * explicitly allowlisted by the device admin.
+     */
+    @Test
+    @RequireRunOnWorkProfile
+    @SdkSuppress(maxSdkVersion = 31, codeName = "S")
+    public void testWorkApp_cannotAccessPersonalProfile_beforeT() throws Exception {
+        assertBlockedByAdmin(/* isInvokedFromWorkProfile */ true);
+    }
+
+    /**
+     * ACTION_PICK_IMAGES is allowlisted by default from work to personal only (not vice-a-versa)
+     */
+    @Test
+    @EnsureHasWorkProfile
+    public void testPersonalApp_cannotAccessWorkProfile_default() throws Exception {
+        assertBlockedByAdmin(/* isInvokedFromWorkProfile */ false);
+    }
+
+    private void assertBlockedByAdmin(boolean isInvokedFromWorkProfile) throws Exception {
+        Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        // Click the profile button to change to work profile
+        final UiObject profileButton = findProfileButton();
+        profileButton.click();
+        mDevice.waitForIdle();
+
+        assertBlockedByAdminDialog(isInvokedFromWorkProfile);
+    }
+
+    private void assertBlockedByAdminDialog(boolean isInvokedFromWorkProfile) {
+        final String dialogTitle = "Blocked by your admin";
+        assertWithMessage("Timed out while waiting for blocked by admin dialog to appear")
+                .that(new UiObject(new UiSelector().textContains(dialogTitle))
+                        .waitForExists(SHORT_TIMEOUT))
+                .isTrue();
+
+        final String dialogDescription;
+        if (isInvokedFromWorkProfile) {
+            dialogDescription = "Accessing personal data from a work app is not permitted";
+        } else {
+            dialogDescription = "Accessing work data from a personal app is not permitted";
+        }
+        assertWithMessage("Blocked by admin description is not as expected")
+                .that(new UiObject(new UiSelector().textContains(dialogDescription)).exists())
+                .isTrue();
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/PhotoPickerTest.java b/tests/PhotoPicker/src/android/photopicker/cts/PhotoPickerTest.java
new file mode 100644
index 0000000..92c96a6
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/PhotoPickerTest.java
@@ -0,0 +1,663 @@
+/*
+ * Copyright (C) 2021 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 android.photopicker.cts;
+
+import static android.photopicker.cts.util.PhotoPickerAssertionsUtils.assertMimeType;
+import static android.photopicker.cts.util.PhotoPickerAssertionsUtils.assertPersistedGrant;
+import static android.photopicker.cts.util.PhotoPickerAssertionsUtils.assertPickerUriFormat;
+import static android.photopicker.cts.util.PhotoPickerAssertionsUtils.assertRedactedReadOnlyAccess;
+import static android.photopicker.cts.util.PhotoPickerFilesUtils.createDNGVideos;
+import static android.photopicker.cts.util.PhotoPickerFilesUtils.createImages;
+import static android.photopicker.cts.util.PhotoPickerFilesUtils.createVideos;
+import static android.photopicker.cts.util.PhotoPickerFilesUtils.deleteMedia;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.REGEX_PACKAGE_NAME;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.SHORT_TIMEOUT;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.findAddButton;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.findItemList;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.findPreviewAddButton;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.findPreviewAddOrSelectButton;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.Intent;
+import android.net.Uri;
+import android.provider.MediaStore;
+
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiSelector;
+
+import org.junit.After;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Photo Picker Device only tests for common flows.
+ */
+@RunWith(AndroidJUnit4.class)
+public class PhotoPickerTest extends PhotoPickerBaseTest {
+    private List<Uri> mUriList = new ArrayList<>();
+
+    @After
+    public void tearDown() throws Exception {
+        for (Uri uri : mUriList) {
+            deleteMedia(uri, mContext);
+        }
+        mUriList.clear();
+
+        if (mActivity != null) {
+            mActivity.finish();
+        }
+    }
+
+    @Test
+    public void testSingleSelect() throws Exception {
+        final int itemCount = 1;
+        createImages(itemCount, mContext.getUserId(), mUriList);
+
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        final UiObject item = findItemList(itemCount).get(0);
+        clickAndWait(item);
+
+        final Uri uri = mActivity.getResult().data.getData();
+        assertPickerUriFormat(uri, mContext.getUserId());
+        assertPersistedGrant(uri, mContext.getContentResolver());
+        assertRedactedReadOnlyAccess(uri);
+    }
+
+    @Test
+    public void testSingleSelectForFavoritesAlbum() throws Exception {
+        final int itemCount = 1;
+        createImages(itemCount, mContext.getUserId(), mUriList, true);
+
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        UiObject albumsTab = mDevice.findObject(new UiSelector().text(
+                "Albums"));
+        clickAndWait(albumsTab);
+        final UiObject album = findItemList(1).get(0);
+        clickAndWait(album);
+
+        final UiObject item = findItemList(itemCount).get(0);
+        clickAndWait(item);
+
+        final Uri uri = mActivity.getResult().data.getData();
+        assertPickerUriFormat(uri, mContext.getUserId());
+        assertRedactedReadOnlyAccess(uri);
+    }
+
+    @Test
+    public void testLaunchPreviewMultipleForVideoAlbum() throws Exception {
+        final int videoCount = 2;
+        createVideos(videoCount, mContext.getUserId(), mUriList);
+
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.setType("video/*");
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        UiObject albumsTab = mDevice.findObject(new UiSelector().text(
+                "Albums"));
+        clickAndWait(albumsTab);
+        final UiObject album = findItemList(1).get(0);
+        clickAndWait(album);
+
+        final List<UiObject> itemList = findItemList(videoCount);
+        final int itemCount = itemList.size();
+
+        assertThat(itemCount).isEqualTo(videoCount);
+
+        for (int i = 0; i < itemCount; i++) {
+            clickAndWait(itemList.get(i));
+        }
+
+        clickAndWait(findViewSelectedButton());
+
+        // Wait for playback to start. This is needed in some devices where playback
+        // buffering -> ready state takes around 10s.
+        final long playbackStartTimeout = 10000;
+        (findPreviewVideoImageView()).waitUntilGone(playbackStartTimeout);
+    }
+
+    @Test
+    public void testSingleSelectWithPreview() throws Exception {
+        final int itemCount = 1;
+        createImages(itemCount, mContext.getUserId(), mUriList);
+
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        final UiObject item = findItemList(itemCount).get(0);
+        item.longClick();
+        mDevice.waitForIdle();
+
+        final UiObject addButton = findPreviewAddOrSelectButton();
+        assertThat(addButton.waitForExists(1000)).isTrue();
+        clickAndWait(addButton);
+
+        final Uri uri = mActivity.getResult().data.getData();
+        assertPickerUriFormat(uri, mContext.getUserId());
+        assertRedactedReadOnlyAccess(uri);
+    }
+
+    @Test
+    public void testMultiSelect_invalidParam() throws Exception {
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit() + 1);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+        final GetResultActivity.Result res = mActivity.getResult();
+        assertThat(res.resultCode).isEqualTo(Activity.RESULT_CANCELED);
+    }
+
+    @Test
+    public void testMultiSelect_invalidNegativeParam() throws Exception {
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, -1);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+        final GetResultActivity.Result res = mActivity.getResult();
+        assertThat(res.resultCode).isEqualTo(Activity.RESULT_CANCELED);
+    }
+
+    @Test
+    public void testMultiSelect_returnsNotMoreThanMax() throws Exception {
+        final int maxCount = 2;
+        final int imageCount = maxCount + 1;
+        createImages(imageCount, mContext.getUserId(), mUriList);
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, maxCount);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        final List<UiObject> itemList = findItemList(imageCount);
+        final int itemCount = itemList.size();
+        assertThat(itemCount).isEqualTo(imageCount);
+        // Select maxCount + 1 item
+        for (int i = 0; i < itemCount; i++) {
+            clickAndWait(itemList.get(i));
+        }
+
+        UiObject snackbarTextView = mDevice.findObject(new UiSelector().text(
+                "Select up to 2 items"));
+        assertWithMessage("Timed out while waiting for snackbar to appear").that(
+                snackbarTextView.waitForExists(SHORT_TIMEOUT)).isTrue();
+
+        assertWithMessage("Timed out waiting for snackbar to disappear").that(
+                snackbarTextView.waitUntilGone(SHORT_TIMEOUT)).isTrue();
+
+        clickAndWait(findAddButton());
+
+        final ClipData clipData = mActivity.getResult().data.getClipData();
+        final int count = clipData.getItemCount();
+        assertThat(count).isEqualTo(maxCount);
+    }
+
+    @Test
+    public void testDoesNotRespectExtraAllowMultiple() throws Exception {
+        final int imageCount = 2;
+        createImages(imageCount, mContext.getUserId(), mUriList);
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(Intent.EXTRA_ALLOW_MULTIPLE, true);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        final List<UiObject> itemList = findItemList(imageCount);
+        final int itemCount = itemList.size();
+        assertThat(itemCount).isEqualTo(imageCount);
+        // Select 1 item
+        clickAndWait(itemList.get(0));
+
+        final Uri uri = mActivity.getResult().data.getData();
+        assertPickerUriFormat(uri, mContext.getUserId());
+        assertPersistedGrant(uri, mContext.getContentResolver());
+        assertRedactedReadOnlyAccess(uri);
+    }
+
+    @Test
+    public void testMultiSelect() throws Exception {
+        final int imageCount = 4;
+        createImages(imageCount, mContext.getUserId(), mUriList);
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        final List<UiObject> itemList = findItemList(imageCount);
+        final int itemCount = itemList.size();
+        assertThat(itemCount).isEqualTo(imageCount);
+        for (int i = 0; i < itemCount; i++) {
+            clickAndWait(itemList.get(i));
+        }
+
+        clickAndWait(findAddButton());
+
+        final ClipData clipData = mActivity.getResult().data.getClipData();
+        final int count = clipData.getItemCount();
+        assertThat(count).isEqualTo(itemCount);
+        for (int i = 0; i < count; i++) {
+            final Uri uri = clipData.getItemAt(i).getUri();
+            assertPickerUriFormat(uri, mContext.getUserId());
+            assertPersistedGrant(uri, mContext.getContentResolver());
+            assertRedactedReadOnlyAccess(uri);
+        }
+    }
+
+    @Test
+    public void testMultiSelect_longPress() throws Exception {
+        final int videoCount = 3;
+        createDNGVideos(videoCount, mContext.getUserId(), mUriList);
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
+        intent.setType("video/*");
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        final List<UiObject> itemList = findItemList(videoCount);
+        final int itemCount = itemList.size();
+        assertThat(itemCount).isEqualTo(videoCount);
+
+        // Select one item from Photo grid
+        clickAndWait(itemList.get(0));
+
+        // Preview the item
+        UiObject item = itemList.get(1);
+        item.longClick();
+        mDevice.waitForIdle();
+
+        final UiObject addOrSelectButton = findPreviewAddOrSelectButton();
+        assertWithMessage("Timed out waiting for AddOrSelectButton to appear")
+                .that(addOrSelectButton.waitForExists(1000)).isTrue();
+
+        // Select the item from Preview
+        clickAndWait(addOrSelectButton);
+
+        mDevice.pressBack();
+
+        // Select one more item from Photo grid
+        clickAndWait(itemList.get(2));
+
+        clickAndWait(findAddButton());
+
+        // Verify that all 3 items are returned
+        final ClipData clipData = mActivity.getResult().data.getClipData();
+        final int count = clipData.getItemCount();
+        assertThat(count).isEqualTo(3);
+        for (int i = 0; i < count; i++) {
+            final Uri uri = clipData.getItemAt(i).getUri();
+            assertPickerUriFormat(uri, mContext.getUserId());
+            assertPersistedGrant(uri, mContext.getContentResolver());
+            assertRedactedReadOnlyAccess(uri);
+        }
+    }
+
+    @Test
+    public void testMultiSelect_preview() throws Exception {
+        final int imageCount = 4;
+        createImages(imageCount, mContext.getUserId(), mUriList);
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        final List<UiObject> itemList = findItemList(imageCount);
+        final int itemCount = itemList.size();
+        assertThat(itemCount).isEqualTo(imageCount);
+        for (int i = 0; i < itemCount; i++) {
+            clickAndWait(itemList.get(i));
+        }
+
+        clickAndWait(findViewSelectedButton());
+
+        // Swipe left three times
+        swipeLeftAndWait();
+        swipeLeftAndWait();
+        swipeLeftAndWait();
+
+        // Deselect one item
+        clickAndWait(findPreviewSelectedCheckButton());
+
+        // Return selected items
+        clickAndWait(findPreviewAddButton());
+
+        final ClipData clipData = mActivity.getResult().data.getClipData();
+        final int count = clipData.getItemCount();
+        assertThat(count).isEqualTo(itemCount - 1);
+        for (int i = 0; i < count; i++) {
+            final Uri uri = clipData.getItemAt(i).getUri();
+            assertPickerUriFormat(uri, mContext.getUserId());
+            assertPersistedGrant(uri, mContext.getContentResolver());
+            assertRedactedReadOnlyAccess(uri);
+        }
+    }
+
+    @Test
+    @Ignore("Re-enable once we find work around for b/226318844")
+    public void testMultiSelect_previewVideoPlayPause() throws Exception {
+        launchPreviewMultipleWithVideos(/* videoCount */ 3);
+
+        // Check Play/Pause in first video
+        testVideoPreviewPlayPause();
+
+        // Move to third video
+        swipeLeftAndWait();
+        swipeLeftAndWait();
+        // Check Play/Pause in third video
+        testVideoPreviewPlayPause();
+
+        // We don't test the result of the picker here because the intention of the test is only to
+        // test the video controls
+    }
+
+    @Test
+    public void testMultiSelect_previewVideoMuteButtonInitial() throws Exception {
+        launchPreviewMultipleWithVideos(/* videoCount */ 1);
+
+        final UiObject playPauseButton = findPlayPauseButton();
+        final UiObject muteButton = findMuteButton();
+
+        // check that player controls are visible
+        assertPlayerControlsVisible(playPauseButton, muteButton);
+
+        // Test 1: Initial state of the mute Button
+        // Check that initial state of mute button is mute, i.e., volume off
+        assertMuteButtonState(muteButton, /* isMuted */ true);
+
+        // Test 2: Click Mute Button
+        // Click to unmute the audio
+        clickAndWait(muteButton);
+        // Check that mute button state is unmute, i.e., it shows `volume up` icon
+        assertMuteButtonState(muteButton, /* isMuted */ false);
+        // Click on the muteButton and check that mute button status is now 'mute'
+        clickAndWait(muteButton);
+        assertMuteButtonState(muteButton, /* isMuted */ true);
+        // Click on the muteButton and check that mute button status is now unmute
+        clickAndWait(muteButton);
+        assertMuteButtonState(muteButton, /* isMuted */ false);
+
+        // Test 3: Next preview resumes mute state
+        // Go back and launch preview again
+        mDevice.pressBack();
+        clickAndWait(findViewSelectedButton());
+
+        // check that player controls are visible
+        assertPlayerControlsVisible(playPauseButton, muteButton);
+        assertMuteButtonState(muteButton, /* isMuted */ false);
+
+        // We don't test the result of the picker here because the intention of the test is only to
+        // test the video controls
+    }
+
+    @Test
+    public void testMultiSelect_previewVideoMuteButtonOnSwipe() throws Exception {
+        launchPreviewMultipleWithVideos(/* videoCount */ 3);
+
+        final UiObject playPauseButton = findPlayPauseButton();
+        final UiObject muteButton = findMuteButton();
+        final UiObject playerView = findPlayerView();
+
+        // check that player controls are visible
+        assertPlayerControlsVisible(playPauseButton, muteButton);
+
+        // Test 1: Swipe resumes mute state, with state of the button is 'volume off' / 'mute'
+        assertMuteButtonState(muteButton, /* isMuted */ true);
+        // Swipe to next page and check that muteButton is in mute state.
+        swipeLeftAndWait();
+        // set-up and wait for player controls to be sticky
+        setUpAndAssertStickyPlayerControls(playerView, playPauseButton, muteButton);
+        assertMuteButtonState(muteButton, /* isMuted */ true);
+
+        // Test 2: Swipe resumes mute state, with state of mute button 'volume up' / 'unmute'
+        // Click muteButton again to check the next video resumes the previous video's mute state
+        clickAndWait(muteButton);
+        assertMuteButtonState(muteButton, /* isMuted */ false);
+        // check that next video resumed previous video's mute state
+        swipeLeftAndWait();
+        // check that player controls are visible
+        assertPlayerControlsVisible(playPauseButton, muteButton);
+        assertMuteButtonState(muteButton, /* isMuted */ false);
+
+        // We don't test the result of the picker here because the intention of the test is only to
+        // test the video controls
+    }
+
+    @Test
+    @Ignore("Re-enable once we find work around for b/226318844")
+    public void testMultiSelect_previewVideoControlsVisibility() throws Exception {
+        launchPreviewMultipleWithVideos(/* videoCount */ 3);
+
+        mDevice.waitForIdle();
+
+        final UiObject playPauseButton = findPlayPauseButton();
+        final UiObject muteButton = findMuteButton();
+        // Check that buttons auto hide.
+        assertPlayerControlsAutoHide(playPauseButton, muteButton);
+
+        final UiObject playerView = findPlayerView();
+        // Click on StyledPlayerView to make the video controls visible
+        clickAndWait(playerView);
+        assertPlayerControlsVisible(playPauseButton, muteButton);
+
+        // Wait for 1s and check that controls are still visible
+        assertPlayerControlsDontAutoHide(playPauseButton, muteButton);
+
+        // Click on StyledPlayerView and check that controls are no longer visible. Don't click in
+        // the center, clicking in the center may pause the video.
+        playerView.clickBottomRight();
+        mDevice.waitForIdle();
+        assertPlayerControlsHidden(playPauseButton, muteButton);
+
+        // Swipe left and check that controls are not visible
+        swipeLeftAndWait();
+        assertPlayerControlsHidden(playPauseButton, muteButton);
+
+        // Click on the StyledPlayerView and check that controls appear
+        clickAndWait(playerView);
+        assertPlayerControlsVisible(playPauseButton, muteButton);
+
+        // Swipe left to check that controls are now visible on swipe
+        swipeLeftAndWait();
+        assertPlayerControlsVisible(playPauseButton, muteButton);
+
+        // Check that the player controls are auto hidden in 1s
+        assertPlayerControlsAutoHide(playPauseButton, muteButton);
+
+        // We don't test the result of the picker here because the intention of the test is only to
+        // test the video controls
+    }
+
+    @Test
+    public void testMimeTypeFilter() throws Exception {
+        final int videoCount = 2;
+        createDNGVideos(videoCount, mContext.getUserId(), mUriList);
+        final int imageCount = 1;
+        createImages(imageCount, mContext.getUserId(), mUriList);
+
+        final String mimeType = "video/dng";
+
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
+        intent.setType(mimeType);
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        // find all items
+        final List<UiObject> itemList = findItemList(-1);
+        final int itemCount = itemList.size();
+        assertThat(itemCount).isAtLeast(videoCount);
+        for (int i = 0; i < itemCount; i++) {
+            clickAndWait(itemList.get(i));
+        }
+
+        clickAndWait(findAddButton());
+
+        final ClipData clipData = mActivity.getResult().data.getClipData();
+        final int count = clipData.getItemCount();
+        assertThat(count).isEqualTo(itemCount);
+        for (int i = 0; i < count; i++) {
+            final Uri uri = clipData.getItemAt(i).getUri();
+            assertPickerUriFormat(uri, mContext.getUserId());
+            assertPersistedGrant(uri, mContext.getContentResolver());
+            assertRedactedReadOnlyAccess(uri);
+            assertMimeType(uri, mimeType);
+        }
+    }
+
+    private void assertMuteButtonState(UiObject muteButton, boolean isMuted)
+            throws UiObjectNotFoundException {
+        // We use content description to assert the state of the mute button, there is no other way
+        // to test this.
+        final String expectedContentDescription = isMuted ? "Unmute video" : "Mute video";
+        final String assertMessage =
+                "Expected mute button content description to be " + expectedContentDescription;
+        assertWithMessage(assertMessage).that(muteButton.getContentDescription())
+                .isEqualTo(expectedContentDescription);
+    }
+
+    private void testVideoPreviewPlayPause() throws Exception {
+        final UiObject playPauseButton = findPlayPauseButton();
+        final UiObject muteButton = findMuteButton();
+
+        // Wait for buttons to auto hide.
+        assertPlayerControlsAutoHide(playPauseButton, muteButton);
+
+        // Click on StyledPlayerView to make the video controls visible
+        clickAndWait(findPlayerView());
+
+        // PlayPause button is now pause button, click the button to pause the video.
+        clickAndWait(playPauseButton);
+
+        // Wait for 1s and check that play button is not auto hidden
+        assertPlayerControlsDontAutoHide(playPauseButton, muteButton);
+
+        // PlayPause button is now play button, click the button to play the video.
+        clickAndWait(playPauseButton);
+        // Check that pause button auto-hides in 1s.
+        assertPlayerControlsAutoHide(playPauseButton, muteButton);
+    }
+
+    private void launchPreviewMultipleWithVideos(int videoCount) throws  Exception {
+        createVideos(videoCount, mContext.getUserId(), mUriList);
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
+        intent.setType("video/*");
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        final List<UiObject> itemList = findItemList(videoCount);
+        final int itemCount = itemList.size();
+
+        assertThat(itemCount).isEqualTo(videoCount);
+
+        for (int i = 0; i < itemCount; i++) {
+            clickAndWait(itemList.get(i));
+        }
+
+        clickAndWait(findViewSelectedButton());
+
+        // Wait for playback to start. This is needed in some devices where playback
+        // buffering -> ready state takes around 10s.
+        final long playbackStartTimeout = 10000;
+        (findPreviewVideoImageView()).waitUntilGone(playbackStartTimeout);
+    }
+
+    private void setUpAndAssertStickyPlayerControls(UiObject playerView, UiObject playPauseButton,
+            UiObject muteButton) throws Exception {
+        // Wait for 1s or Play/Pause button to hide
+        playPauseButton.waitUntilGone(1000);
+        // Click on StyledPlayerView to make the video controls visible
+        clickAndWait(playerView);
+        assertPlayerControlsVisible(playPauseButton, muteButton);
+    }
+
+    private void assertPlayerControlsVisible(UiObject playPauseButton, UiObject muteButton) {
+        assertVisible(playPauseButton, "Expected play/pause button to be visible");
+        assertVisible(muteButton, "Expected mute button to be visible");
+    }
+
+    private void assertPlayerControlsHidden(UiObject playPauseButton, UiObject muteButton) {
+        assertHidden(playPauseButton, "Expected play/pause button to be hidden");
+        assertHidden(muteButton, "Expected mute button to be hidden");
+    }
+
+    private void assertPlayerControlsAutoHide(UiObject playPauseButton, UiObject muteButton) {
+        // These buttons should auto hide in 1 second after the video playback start. Since we can't
+        // identify the video playback start time, we wait for 2 seconds instead.
+        assertWithMessage("Expected play/pause button to auto hide in 2s")
+                .that(playPauseButton.waitUntilGone(2000)).isTrue();
+        assertHidden(muteButton, "Expected mute button to hide after 2s");
+    }
+
+    private void assertPlayerControlsDontAutoHide(UiObject playPauseButton, UiObject muteButton) {
+        assertWithMessage("Expected play/pause button to not auto hide in 1s")
+                .that(playPauseButton.waitUntilGone(1100)).isFalse();
+        assertVisible(muteButton, "Expected mute button to be still visible after 1s");
+    }
+
+    private void assertVisible(UiObject button, String message) {
+        assertWithMessage(message).that(button.exists()).isTrue();
+    }
+
+    private void assertHidden(UiObject button, String message) {
+        assertWithMessage(message).that(button.exists()).isFalse();
+    }
+
+    private static UiObject findViewSelectedButton() {
+        return new UiObject(new UiSelector().resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/button_view_selected"));
+    }
+
+    private static UiObject findPreviewSelectedCheckButton() {
+        return new UiObject(new UiSelector().resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/preview_selected_check_button"));
+    }
+
+
+    private static UiObject findPlayerView() {
+        return new UiObject(new UiSelector().resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/preview_player_view"));
+    }
+
+    private static UiObject findMuteButton() {
+        return new UiObject(new UiSelector().resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/preview_mute"));
+    }
+
+    private static UiObject findPlayPauseButton() {
+        return new UiObject(new UiSelector().resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/exo_play_pause"));
+    }
+
+    private static UiObject findPreviewVideoImageView() {
+        return new UiObject(new UiSelector().resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/preview_video_image"));
+    }
+
+    private void clickAndWait(UiObject uiObject) throws Exception {
+        uiObject.click();
+        mDevice.waitForIdle();
+    }
+
+    private void swipeLeftAndWait() {
+        final int width = mDevice.getDisplayWidth();
+        final int height = mDevice.getDisplayHeight();
+        mDevice.swipe(15 * width / 20, height / 2, width / 20, height / 2, 10);
+        mDevice.waitForIdle();
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/PickerProviderMediaGenerator.java b/tests/PhotoPicker/src/android/photopicker/cts/PickerProviderMediaGenerator.java
new file mode 100644
index 0000000..5110781
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/PickerProviderMediaGenerator.java
@@ -0,0 +1,441 @@
+/*
+ * Copyright (C) 2022 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 android.photopicker.cts;
+
+import static android.provider.CloudMediaProviderContract.AlbumColumns;
+import static android.provider.CloudMediaProviderContract.EXTRA_ALBUM_ID;
+import static android.provider.CloudMediaProviderContract.EXTRA_MEDIA_COLLECTION_ID;
+import static android.provider.CloudMediaProviderContract.EXTRA_SYNC_GENERATION;
+import static android.provider.CloudMediaProviderContract.MediaCollectionInfo;
+import static android.provider.CloudMediaProviderContract.MediaColumns;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.os.Bundle;
+import android.os.FileUtils;
+import android.os.ParcelFileDescriptor;
+import android.provider.CloudMediaProvider;
+import android.provider.CloudMediaProviderContract;
+import android.provider.MediaStore;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * Generates {@link TestMedia} items that can be accessed via test {@link CloudMediaProvider}
+ * instances.
+ */
+public class PickerProviderMediaGenerator {
+    private static final Map<String, MediaGenerator> sMediaGeneratorMap = new HashMap<>();
+    private static final String[] MEDIA_PROJECTION = new String[] {
+        MediaColumns.ID,
+        MediaColumns.MEDIA_STORE_URI,
+        MediaColumns.MIME_TYPE,
+        MediaColumns.STANDARD_MIME_TYPE_EXTENSION,
+        MediaColumns.DATE_TAKEN_MILLIS,
+        MediaColumns.SYNC_GENERATION,
+        MediaColumns.SIZE_BYTES,
+        MediaColumns.DURATION_MILLIS,
+        MediaColumns.IS_FAVORITE,
+    };
+
+    private static final String[] ALBUM_PROJECTION = new String[] {
+        AlbumColumns.ID,
+        AlbumColumns.DISPLAY_NAME,
+        AlbumColumns.DATE_TAKEN_MILLIS,
+        AlbumColumns.MEDIA_COVER_ID,
+        AlbumColumns.MEDIA_COUNT,
+    };
+
+    private static final String[] DELETED_MEDIA_PROJECTION = new String[] { MediaColumns.ID };
+
+    public static class MediaGenerator {
+        private final List<TestMedia> mMedia = new ArrayList<>();
+        private final List<TestMedia> mDeletedMedia = new ArrayList<>();
+        private final List<TestAlbum> mAlbums = new ArrayList<>();
+        private final File mPrivateDir;
+        private final Context mContext;
+
+        private String mCollectionId;
+        private long mLastSyncGeneration;
+        private String mAccountName;
+        private Intent mAccountConfigurationIntent;
+
+        public MediaGenerator(Context context) {
+            mContext = context;
+            mPrivateDir = context.getFilesDir();
+        }
+
+        public Cursor getMedia(long generation, String albumId, String mimeType, long sizeBytes) {
+            final Cursor cursor = getCursor(mMedia, generation, albumId, mimeType, sizeBytes,
+                    /* isDeleted */ false);
+            cursor.setExtras(buildCursorExtras(mCollectionId, generation > 0, albumId != null));
+            return cursor;
+        }
+
+        public Cursor getAlbums(String mimeType, long sizeBytes) {
+            final Cursor cursor = getCursor(mAlbums, mimeType, sizeBytes);
+            cursor.setExtras(buildCursorExtras(mCollectionId, false, false));
+            return cursor;
+        }
+
+        public Cursor getDeletedMedia(long generation) {
+            final Cursor cursor = getCursor(mDeletedMedia, generation, /* albumId */ null,
+                    /* mimeType */ null, /* sizeBytes */ 0, /* isDeleted */ true);
+            cursor.setExtras(buildCursorExtras(mCollectionId, generation > 0, false));
+            return cursor;
+        }
+
+        public Bundle getMediaCollectionInfo() {
+            Bundle bundle = new Bundle();
+            bundle.putString(MediaCollectionInfo.MEDIA_COLLECTION_ID, mCollectionId);
+            bundle.putLong(MediaCollectionInfo.LAST_MEDIA_SYNC_GENERATION, mLastSyncGeneration);
+            bundle.putString(MediaCollectionInfo.ACCOUNT_NAME, mAccountName);
+            bundle.putParcelable(MediaCollectionInfo.ACCOUNT_CONFIGURATION_INTENT,
+                    mAccountConfigurationIntent);
+
+            return bundle;
+        }
+
+        public void setAccountInfo(String accountName, Intent configIntent) {
+            mAccountName = accountName;
+            mAccountConfigurationIntent = configIntent;
+        }
+
+        public Bundle buildCursorExtras(String mediaCollectionId, boolean honoredSyncGeneration,
+                boolean honoredAlbumdId) {
+            final ArrayList<String> honoredArgs = new ArrayList<>();
+            if (honoredSyncGeneration) {
+                honoredArgs.add(EXTRA_SYNC_GENERATION);
+            }
+            if (honoredAlbumdId) {
+                honoredArgs.add(EXTRA_ALBUM_ID);
+            }
+
+            final Bundle bundle = new Bundle();
+            bundle.putString(EXTRA_MEDIA_COLLECTION_ID, mediaCollectionId);
+            bundle.putStringArrayList(ContentResolver.EXTRA_HONORED_ARGS, honoredArgs);
+
+            return bundle;
+        }
+
+        public void addMedia(String localId, String cloudId, String albumId, String mimeType,
+                int standardMimeTypeExtension, long sizeBytes, boolean isFavorite, int resId)
+                throws IOException {
+            mDeletedMedia.remove(createPlaceholderMedia(localId, cloudId));
+            mMedia.add(0, createTestMedia(localId, cloudId, albumId, mimeType,
+                            standardMimeTypeExtension, sizeBytes, isFavorite, resId));
+        }
+
+        public void deleteMedia(String localId, String cloudId, boolean trackDeleted)
+                throws IOException {
+            if (mMedia.remove(createPlaceholderMedia(localId, cloudId)) && trackDeleted) {
+                mDeletedMedia.add(createTestMedia(localId, cloudId, /* albumId */ null,
+                                /* mimeType */ null, /* mimeTypeExtension */ 0, /* sizeBytes */ 0,
+                                /* isFavorite */ false, /* resId */ -1));
+            }
+        }
+
+        public ParcelFileDescriptor openMedia(String cloudId) throws FileNotFoundException {
+            try {
+                return ParcelFileDescriptor.open(getTestMedia(cloudId),
+                        ParcelFileDescriptor.MODE_READ_ONLY);
+            } catch (IOException e) {
+                throw new FileNotFoundException("Failed to open: " + cloudId);
+            }
+        }
+
+        public void createAlbum(String id) {
+            mAlbums.add(createTestAlbum(id));
+        }
+
+        public void resetAll() {
+            mMedia.clear();
+            mDeletedMedia.clear();
+            mAlbums.clear();
+        }
+
+        public void setMediaCollectionId(String id) {
+            mCollectionId = id;
+        }
+
+        public long getCount() {
+            return mMedia.size();
+        }
+
+        private TestAlbum createTestAlbum(String id) {
+            return new TestAlbum(id, mMedia);
+        }
+
+        private TestMedia createTestMedia(String localId, String cloudId, String albumId,
+                String mimeType, int standardMimeTypeExtension, long sizeBytes,
+                boolean isFavorite, int resId) throws IOException {
+            // Increase generation
+            TestMedia media = new TestMedia(localId, cloudId, albumId, mimeType,
+                    standardMimeTypeExtension, sizeBytes, /* durationMs */ 0, ++mLastSyncGeneration,
+                    isFavorite);
+
+            if (resId >= 0) {
+                media.createFile(mContext, resId, getTestMedia(cloudId));
+            }
+
+            return media;
+        }
+
+        private static TestMedia createPlaceholderMedia(String localId, String cloudId) {
+            // Don't increase generation. Used to create a throw-away element used for removal from
+            // |mMedia| or |mDeletedMedia|
+            return new TestMedia(localId, cloudId, /* albumId */ null,
+                    /* mimeType */ null, /* mimeTypeExtension */ 0, /* sizeBytes */ 0,
+                    /* durationMs */ 0, /* generation */ 0, /* isFavorite */ false);
+        }
+
+        private File getTestMedia(String cloudId) {
+            return new File(mPrivateDir, cloudId);
+        }
+
+        private static Cursor getCursor(List<TestMedia> mediaList, long generation,
+                String albumId, String mimeType, long sizeBytes, boolean isDeleted) {
+            final MatrixCursor matrix;
+            if (isDeleted) {
+                matrix = new MatrixCursor(DELETED_MEDIA_PROJECTION);
+            } else {
+                matrix = new MatrixCursor(MEDIA_PROJECTION);
+            }
+
+            for (TestMedia media : mediaList) {
+                if (media.generation > generation
+                        && matchesFilter(media, albumId, mimeType, sizeBytes)) {
+                    matrix.addRow(media.toArray(isDeleted));
+                }
+            }
+            return matrix;
+        }
+
+        private static Cursor getCursor(List<TestAlbum> albumList, String mimeType,
+                long sizeBytes) {
+            final MatrixCursor matrix = new MatrixCursor(ALBUM_PROJECTION);
+
+            for (TestAlbum album : albumList) {
+                final String[] res = album.toArray(mimeType, sizeBytes);
+                if (res != null) {
+                    matrix.addRow(res);
+                }
+            }
+            return matrix;
+        }
+    }
+
+    private static class TestMedia {
+        public final String localId;
+        public final String cloudId;
+        public final String albumId;
+        public final String mimeType;
+        public final long dateTakenMs;
+        public final long durationMs;
+        public final long generation;
+        public final int standardMimeTypeExtension;
+        public final boolean isFavorite;
+        public long sizeBytes;
+
+        TestMedia(String localId, String cloudId, String albumId, String mimeType,
+                int standardMimeTypeExtension, long sizeBytes, long durationMs, long generation,
+                boolean isFavorite) {
+            this.localId = localId;
+            this.cloudId = cloudId;
+            this.albumId = albumId;
+            this.mimeType = mimeType;
+            this.standardMimeTypeExtension = standardMimeTypeExtension;
+            this.sizeBytes = sizeBytes;
+            this.dateTakenMs = System.currentTimeMillis();
+            this.durationMs = durationMs;
+            this.generation = generation;
+            this.isFavorite = isFavorite;
+        }
+
+        public String[] toArray(boolean isDeleted) {
+            if (isDeleted) {
+                return new String[] {getId()};
+            }
+
+            return new String[] {
+                getId(),
+                localId == null ? null : "content://media/external/files/" + localId,
+                mimeType,
+                String.valueOf(standardMimeTypeExtension),
+                String.valueOf(dateTakenMs),
+                String.valueOf(generation),
+                String.valueOf(sizeBytes),
+                String.valueOf(durationMs),
+                String.valueOf(isFavorite ? 1 : 0)
+            };
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o == null || !(o instanceof TestMedia)) {
+                return false;
+            }
+            TestMedia other = (TestMedia) o;
+            return Objects.equals(localId, other.localId) && Objects.equals(cloudId, other.cloudId);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(localId, cloudId);
+        }
+
+        public String getId() {
+            return cloudId;
+        }
+
+        public void createFile(Context context, int sourceResId, File targetFile)
+                throws IOException {
+            try (InputStream source = context.getResources().openRawResource(sourceResId);
+                    FileOutputStream target = new FileOutputStream(targetFile)) {
+                FileUtils.copy(source, target);
+            }
+
+            // Set size
+            sizeBytes = targetFile.length();
+        }
+    }
+
+    private static class TestAlbum {
+        public final String id;
+        private final List<TestMedia> mMedia;
+
+        TestAlbum(String id, List<TestMedia> media) {
+            this.id = id;
+            this.mMedia = media;
+        }
+
+        public String[] toArray(String mimeType, long sizeBytes) {
+            long mediaCount = 0;
+            String mediaCoverId = null;
+            long dateTakenMs = 0;
+
+            for (TestMedia m : mMedia) {
+                if (matchesFilter(m, id, mimeType, sizeBytes)) {
+                    if (mediaCount++ == 0) {
+                        mediaCoverId = m.getId();
+                        dateTakenMs = m.dateTakenMs;
+                    }
+                }
+            }
+
+            if (mediaCount == 0) {
+                return null;
+            }
+
+            return new String[] {
+                id,
+                mediaCoverId,
+                /* displayName */ id,
+                String.valueOf(dateTakenMs),
+                String.valueOf(mediaCount),
+            };
+        }
+
+        @Override
+        public boolean equals(Object o) {
+            if (o == null || !(o instanceof TestAlbum)) {
+                return false;
+            }
+
+            TestAlbum other = (TestAlbum) o;
+            return Objects.equals(id, other.id);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(id);
+        }
+    }
+
+    private static boolean matchesFilter(TestMedia media, String albumId, String mimeType,
+            long sizeBytes) {
+        if ((albumId != null) && albumId != media.albumId) {
+            return false;
+        }
+        if ((mimeType != null) && !media.mimeType.startsWith(mimeType)) {
+            return false;
+        }
+        if (sizeBytes != 0 && media.sizeBytes > sizeBytes) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public static MediaGenerator getMediaGenerator(Context context, String authority) {
+        MediaGenerator generator = sMediaGeneratorMap.get(authority);
+        if (generator == null) {
+            generator = new MediaGenerator(context);
+            sMediaGeneratorMap.put(authority, generator);
+        }
+        return generator;
+    }
+
+    public static void setCloudProvider(Context context, String authority) {
+        // TODO(b/190713331): Use constants from MediaStore after visible from test
+        Bundle in = new Bundle();
+        in.putString("cloud_provider", authority);
+
+        callMediaStore(context, "set_cloud_provider", in);
+    }
+
+    public static void syncCloudProvider(Context context) {
+        // TODO(b/190713331): Use constants from MediaStore after visible from test
+
+        callMediaStore(context, "sync_providers", /* in */ null);
+    }
+
+    private static void callMediaStore(Context context, String method, Bundle in) {
+        context.getContentResolver().call(MediaStore.AUTHORITY, method, null, in);
+    }
+
+    public static class QueryExtras {
+        public final String albumId;
+        public final String mimeType;
+        public final long sizeBytes;
+        public final long generation;
+
+        public QueryExtras(Bundle bundle) {
+            if (bundle == null) {
+                bundle = new Bundle();
+            }
+
+            albumId = bundle.getString(CloudMediaProviderContract.EXTRA_ALBUM_ID, null);
+            mimeType = bundle.getString(CloudMediaProviderContract.EXTRA_MIME_TYPE,
+                    null);
+            sizeBytes = bundle.getLong(CloudMediaProviderContract.EXTRA_SIZE_LIMIT_BYTES, 0);
+            generation = bundle.getLong(CloudMediaProviderContract.EXTRA_SYNC_GENERATION, 0);
+        }
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/RemoteVideoPreviewTest.java b/tests/PhotoPicker/src/android/photopicker/cts/RemoteVideoPreviewTest.java
new file mode 100644
index 0000000..b6eb8f3
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/RemoteVideoPreviewTest.java
@@ -0,0 +1,351 @@
+/*
+ * Copyright (C) 2022 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 android.photopicker.cts;
+
+import static android.os.SystemProperties.getBoolean;
+import static android.photopicker.cts.PickerProviderMediaGenerator.setCloudProvider;
+import static android.photopicker.cts.PickerProviderMediaGenerator.syncCloudProvider;
+import static android.photopicker.cts.util.PhotoPickerFilesUtils.deleteMedia;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.REGEX_PACKAGE_NAME;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.findAddButton;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.findItemList;
+import static android.photopicker.cts.util.PhotoPickerUiUtils.findPreviewAddButton;
+import static android.provider.CloudMediaProvider.CloudMediaSurfaceStateChangedCallback.PLAYBACK_STATE_READY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+
+import android.content.Intent;
+import android.graphics.PixelFormat;
+import android.net.Uri;
+import android.photopicker.cts.PickerProviderMediaGenerator.MediaGenerator;
+import android.photopicker.cts.cloudproviders.CloudProviderPrimary;
+import android.photopicker.cts.cloudproviders.CloudProviderPrimary.CloudMediaSurfaceControllerImpl;
+import android.provider.MediaStore;
+import android.util.Pair;
+
+import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiSelector;
+
+import org.junit.After;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InOrder;
+import org.mockito.Mockito;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * PhotoPicker test coverage for remote video preview APIs.
+ * End-to-end coverage for video preview controls is present in {@link PhotoPickerTest}
+ */
+@RunWith(AndroidJUnit4.class)
+public class RemoteVideoPreviewTest extends PhotoPickerBaseTest {
+
+    private MediaGenerator mCloudPrimaryMediaGenerator;
+    private final List<Uri> mUriList = new ArrayList<>();
+
+    private static final String CLOUD_ID1 = "CLOUD_ID1";
+    private static final String CLOUD_ID2 = "CLOUD_ID2";
+    private static final String COLLECTION_1 = "COLLECTION_1";
+
+    private static final long IMAGE_SIZE_BYTES = 107684;
+    private static final long VIDEO_SIZE_BYTES = 135600;
+    private static final int VIDEO_PIXEL_FORMAT = PixelFormat.RGB_565;
+
+    private CloudMediaSurfaceControllerImpl mSurfaceControllerListener;
+    // This is required to assert the order in which the APIs are called.
+    private InOrder mAssertInOrder;
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+
+        Assume.assumeTrue(getBoolean("sys.photopicker.pickerdb.enabled", true));
+
+        mDevice.executeShellCommand("setprop sys.photopicker.remote_preview true");
+        Assume.assumeTrue(getBoolean("sys.photopicker.remote_preview", true));
+
+        mCloudPrimaryMediaGenerator = PickerProviderMediaGenerator.getMediaGenerator(
+                mContext, CloudProviderPrimary.AUTHORITY);
+        mCloudPrimaryMediaGenerator.resetAll();
+        mCloudPrimaryMediaGenerator.setMediaCollectionId(COLLECTION_1);
+
+        setCloudProvider(mContext, CloudProviderPrimary.AUTHORITY);
+        assertThat(MediaStore.isCurrentCloudMediaProviderAuthority(mContext.getContentResolver(),
+                CloudProviderPrimary.AUTHORITY)).isTrue();
+
+        mSurfaceControllerListener = CloudProviderPrimary.getMockSurfaceControllerListener();
+        mAssertInOrder = Mockito.inOrder(mSurfaceControllerListener);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        for (Uri uri : mUriList) {
+            deleteMedia(uri, mContext);
+        }
+        mUriList.clear();
+        mActivity.finish();
+        setCloudProvider(mContext, null);
+    }
+
+    @Test
+    @Ignore("Re-enable once b/223224727 is fixed")
+    public void testBasicVideoPreview() throws Exception {
+        initCloudProviderWithVideo(Arrays.asList(Pair.create(null, CLOUD_ID1)));
+
+        launchPreviewMultiple(/* count */ 1);
+
+        final int surfaceId = 0;
+        verifyInitialVideoPreviewSetup(surfaceId, CLOUD_ID1);
+        // Remote Preview calls onMediaPlay when PLAYBACK_STATE_READY is sent by the
+        // CloudMediaProvider
+        verifyPlaybackStartedWhenPlayerReady(surfaceId);
+
+        // TODO(b/215187981): Add test for onMediaPause()
+
+        // Exit preview mode
+        mDevice.pressBack();
+
+        // Remote Preview calls onSurfaceDestroyed, check if the id is the same (as the
+        // CloudMediaProvider is only rendering to one surface id)
+        mAssertInOrder.verify(mSurfaceControllerListener).onSurfaceDestroyed(eq(surfaceId));
+
+        // Remote Preview calls onPlayerRelease() and onDestroy() for CMP to release the
+        // resources.
+        mAssertInOrder.verify(mSurfaceControllerListener).onPlayerRelease();
+        mAssertInOrder.verify(mSurfaceControllerListener).onDestroy();
+
+        final UiObject addButton = findAddButton();
+        addButton.click();
+        // We don't test the result of the picker here because the intention of the test is only to
+        // test the remote preview APIs
+    }
+
+    @Test
+    @Ignore("Re-enable once b/223224727 is fixed")
+    public void testSwipeAdjacentVideoPreview() throws Exception {
+        initCloudProviderWithVideo(
+                Arrays.asList(Pair.create(null, CLOUD_ID1), Pair.create(null, CLOUD_ID2)));
+
+        launchPreviewMultiple(/* count */ 2);
+
+        final int surfaceIdForFirstVideoPreview = 0;
+        verifyInitialVideoPreviewSetup(surfaceIdForFirstVideoPreview, CLOUD_ID2);
+        // Remote Preview calls onMediaPlay when PLAYBACK_STATE_READY is sent by the
+        // CloudMediaProvider
+        verifyPlaybackStartedWhenPlayerReady(surfaceIdForFirstVideoPreview);
+
+        // Swipe left preview mode
+        swipeLeftAndWait();
+
+        // Remote Preview calls onSurfaceCreated with monotonically increasing surfaceIds
+        final int surfaceIdForSecondVideoPreview = 1;
+        verifyAdjacentVideoSwipe(surfaceIdForFirstVideoPreview, surfaceIdForSecondVideoPreview,
+                CLOUD_ID1);
+
+        // Swipe right in preview mode and go to first video, but the surface id will have
+        // increased monotonically
+        swipeRightAndWait();
+
+        final int surfaceIdForThirdVideoPreview = 2;
+        verifyAdjacentVideoSwipe(surfaceIdForSecondVideoPreview, surfaceIdForThirdVideoPreview,
+                CLOUD_ID2);
+
+        final UiObject addButton = findPreviewAddButton();
+        addButton.click();
+        // We don't test the result of the picker here because the intention of the test is only to
+        // test the remote preview APIs
+    }
+
+    @Test
+    @Ignore("Re-enable once b/223224727 is fixed")
+    public void testSwipeImageVideoPreview() throws Exception {
+        initCloudProviderWithImage(Arrays.asList(Pair.create(null, CLOUD_ID1)));
+        initCloudProviderWithVideo(Arrays.asList(Pair.create(null, CLOUD_ID2)));
+        launchPreviewMultiple(/* count */ 2);
+
+        // Remote Preview calls onSurfaceCreated with monotonically increasing surfaceIds
+        int surfaceId = 0;
+        verifyInitialVideoPreviewSetup(surfaceId, CLOUD_ID2);
+        // Remote Preview calls onMediaPlay when PLAYBACK_STATE_READY is sent by the
+        // CloudMediaProvider
+        verifyPlaybackStartedWhenPlayerReady(surfaceId);
+
+        // Swipe left preview mode
+        swipeLeftAndWait();
+
+        mAssertInOrder.verify(mSurfaceControllerListener).onSurfaceDestroyed(eq(surfaceId));
+
+        // Remote Preview calls onPlayerRelease() for CMP to release the resources if there is no
+        // video to preview
+        mAssertInOrder.verify(mSurfaceControllerListener).onPlayerRelease();
+
+        // Swipe right preview mode
+        swipeRightAndWait();
+
+        // SurfaceId increases monotonically for each video preview
+        surfaceId++;
+        verifyInitialVideoPreviewSetup(surfaceId, CLOUD_ID2);
+
+        verifyPlaybackStartedWhenPlayerReady(surfaceId);
+
+        final UiObject addButton = findPreviewAddButton();
+        addButton.click();
+        // We don't test the result of the picker here because the intention of the test is only to
+        // test the remote preview APIs
+    }
+
+    /**
+     * Verify surface controller interactions on swiping from one video to another.
+     * Note: This test assumes that the first video is in playing state.
+     *
+     * @param oldSurfaceId the Surface ID which we are swiping away from
+     * @param newSurfaceId the Surface ID to which we are swiping
+     * @param newMediaId   the media ID of the video we are swiping to
+     */
+    private void verifyAdjacentVideoSwipe(int oldSurfaceId, int newSurfaceId, String newMediaId)
+            throws Exception {
+        mAssertInOrder.verify(mSurfaceControllerListener).onSurfaceCreated(eq(newSurfaceId),
+                any(), eq(newMediaId));
+
+        // The surface for the first video is destroyed when it is no longer visible on the screen
+        // (swipe is complete).
+        mAssertInOrder.verify(mSurfaceControllerListener).onSurfaceDestroyed(eq(oldSurfaceId));
+
+        verifyPlaybackStartedWhenPlayerReady(newSurfaceId);
+    }
+
+    /**
+     * The first time video preview is called, the surface controller object should get the
+     * following callbacks in the following order:
+     * * To prepare media player
+     * * Surface related callbacks (onSurfaceCreated and onSurfaceChanged)
+     *
+     * @param surfaceId Surface ID to set up video preview on
+     * @param mediaId   Media ID to set up video preview with
+     */
+    private void verifyInitialVideoPreviewSetup(int surfaceId, String mediaId) {
+        // Remote Preview calls onPlayerCreate as the first call to CloudMediaProvider
+        mAssertInOrder.verify(mSurfaceControllerListener).onPlayerCreate();
+
+        // Remote Preview calls onSurfaceCreated with surfaceId and mediaId as expected
+        mAssertInOrder.verify(mSurfaceControllerListener).onSurfaceCreated(eq(surfaceId), any(),
+                eq(mediaId));
+
+        // Remote Preview calls onSurfaceChanged to set the format, width and height
+        // corresponding to the video on the same surfaceId
+        mAssertInOrder.verify(mSurfaceControllerListener).onSurfaceChanged(eq(surfaceId),
+                eq(VIDEO_PIXEL_FORMAT), anyInt(), anyInt());
+    }
+
+    private void verifyPlaybackStartedWhenPlayerReady(int surfaceId) throws Exception {
+        CloudProviderPrimary.setPlaybackState(surfaceId, PLAYBACK_STATE_READY);
+        // Wait for photo picker to receive the event and invoke media play via binder calls.
+        MediaStore.waitForIdle(mContext.getContentResolver());
+        mAssertInOrder.verify(mSurfaceControllerListener).onMediaPlay(eq(surfaceId));
+    }
+
+    private void initCloudProviderWithImage(List<Pair<String, String>> mediaPairs)
+            throws Exception {
+        for (Pair<String, String> pair : mediaPairs) {
+            addImage(mCloudPrimaryMediaGenerator, pair.first, pair.second);
+        }
+
+        syncCloudProvider(mContext);
+    }
+
+    private void addImage(MediaGenerator generator, String localId, String cloudId)
+            throws Exception {
+        generator.addMedia(localId, cloudId, /* albumId */ null, "image/jpeg",
+                /* mimeTypeExtension */ 0, IMAGE_SIZE_BYTES, /* isFavorite */ false,
+                R.raw.lg_g4_iso_800_jpg);
+    }
+
+    private void initCloudProviderWithVideo(List<Pair<String, String>> mediaPairs)
+            throws Exception {
+        for (Pair<String, String> pair : mediaPairs) {
+            addVideo(mCloudPrimaryMediaGenerator, pair.first, pair.second);
+        }
+
+        syncCloudProvider(mContext);
+    }
+
+    private void addVideo(MediaGenerator generator, String localId, String cloudId)
+            throws Exception {
+        generator.addMedia(localId, cloudId, /* albumId */ null, "video/mp4",
+                /* mimeTypeExtension */ 0, VIDEO_SIZE_BYTES, /* isFavorite */ false,
+                R.raw.test_video);
+    }
+
+    private void launchPreviewMultiple(int count) throws Exception {
+        final Intent intent = new Intent(MediaStore.ACTION_PICK_IMAGES);
+        intent.putExtra(MediaStore.EXTRA_PICK_IMAGES_MAX, MediaStore.getPickImagesMaxLimit());
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+
+        final List<UiObject> itemList = findItemList(count);
+        final int itemCount = itemList.size();
+
+        assertThat(itemCount).isEqualTo(count);
+
+        for (final UiObject item : itemList) {
+            item.click();
+            mDevice.waitForIdle();
+        }
+
+        final UiObject viewSelectedButton = findViewSelectedButton();
+        viewSelectedButton.click();
+        mDevice.waitForIdle();
+
+        // Wait for CloudMediaProvider binder calls to finish.
+        MediaStore.waitForIdle(mContext.getContentResolver());
+    }
+
+    private static UiObject findViewSelectedButton() {
+        return new UiObject(new UiSelector().resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/button_view_selected"));
+    }
+
+    private void swipeLeftAndWait() throws Exception {
+        final int width = mDevice.getDisplayWidth();
+        final int height = mDevice.getDisplayHeight();
+        mDevice.swipe(width / 2, height / 2, width / 4, height / 2, 10);
+        mDevice.waitForIdle();
+
+        // Wait for CloudMediaProvider binder calls to finish.
+        MediaStore.waitForIdle(mContext.getContentResolver());
+    }
+
+    private void swipeRightAndWait() throws Exception {
+        final int width = mDevice.getDisplayWidth();
+        final int height = mDevice.getDisplayHeight();
+        mDevice.swipe(width / 4, height / 2, width / 2, height / 2, 10);
+        mDevice.waitForIdle();
+
+        // Wait for CloudMediaProvider binder calls to finish.
+        MediaStore.waitForIdle(mContext.getContentResolver());
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/cloudproviders/CloudProviderNoIntentFilter.java b/tests/PhotoPicker/src/android/photopicker/cts/cloudproviders/CloudProviderNoIntentFilter.java
new file mode 100644
index 0000000..d07acae
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/cloudproviders/CloudProviderNoIntentFilter.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2022 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 android.photopicker.cts.cloudproviders;
+
+import android.content.res.AssetFileDescriptor;
+import android.database.Cursor;
+import android.graphics.Point;
+import android.os.Bundle;
+import android.os.CancellationSignal;
+import android.os.ParcelFileDescriptor;
+import android.provider.CloudMediaProvider;
+
+import java.io.FileNotFoundException;
+
+/**
+ * Implements a placeholder {@link CloudMediaProvider}.
+ */
+public class CloudProviderNoIntentFilter extends CloudMediaProvider {
+    public static final String AUTHORITY =
+            "android.photopicker.cts.cloudproviders.cloud_no_intent_filter";
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor onQueryMedia(Bundle extras) {
+        throw new UnsupportedOperationException("onQueryMedia not supported");
+    }
+
+    @Override
+    public Cursor onQueryDeletedMedia(Bundle extras) {
+        throw new UnsupportedOperationException("onQueryDeletedMedia not supported");
+    }
+
+    @Override
+    public AssetFileDescriptor onOpenPreview(String mediaId, Point size, Bundle extras,
+            CancellationSignal signal) throws FileNotFoundException {
+        throw new UnsupportedOperationException("onOpenPreview not supported");
+    }
+
+    @Override
+    public ParcelFileDescriptor onOpenMedia(String mediaId, Bundle extras,
+            CancellationSignal signal) throws FileNotFoundException {
+        throw new UnsupportedOperationException("onOpenMedia not supported");
+    }
+
+    @Override
+    public Bundle onGetMediaCollectionInfo(Bundle extras) {
+        throw new UnsupportedOperationException("onGetMediaCollectionInfo not supported");
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/cloudproviders/CloudProviderNoPermission.java b/tests/PhotoPicker/src/android/photopicker/cts/cloudproviders/CloudProviderNoPermission.java
new file mode 100644
index 0000000..6cc96bb
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/cloudproviders/CloudProviderNoPermission.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2022 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 android.photopicker.cts.cloudproviders;
+
+import android.content.res.AssetFileDescriptor;
+import android.database.Cursor;
+import android.graphics.Point;
+import android.os.Bundle;
+import android.os.CancellationSignal;
+import android.os.ParcelFileDescriptor;
+import android.provider.CloudMediaProvider;
+
+import java.io.FileNotFoundException;
+
+/**
+ * Implements a placeholder {@link CloudMediaProvider}.
+ */
+public class CloudProviderNoPermission extends CloudMediaProvider {
+    public static final String AUTHORITY =
+            "android.photopicker.cts.cloudproviders.cloud_no_permission";
+
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor onQueryMedia(Bundle extras) {
+        throw new UnsupportedOperationException("onQueryMedia not supported");
+    }
+
+    @Override
+    public Cursor onQueryDeletedMedia(Bundle extras) {
+        throw new UnsupportedOperationException("onQueryDeletedMedia not supported");
+    }
+
+    @Override
+    public AssetFileDescriptor onOpenPreview(String mediaId, Point size, Bundle extras,
+            CancellationSignal signal) throws FileNotFoundException {
+        throw new UnsupportedOperationException("onOpenPreview not supported");
+    }
+
+    @Override
+    public ParcelFileDescriptor onOpenMedia(String mediaId, Bundle extras,
+            CancellationSignal signal) throws FileNotFoundException {
+        throw new UnsupportedOperationException("onOpenMedia not supported");
+    }
+
+    @Override
+    public Bundle onGetMediaCollectionInfo(Bundle extras) {
+        throw new UnsupportedOperationException("onGetMediaCollectionInfo not supported");
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/cloudproviders/CloudProviderPrimary.java b/tests/PhotoPicker/src/android/photopicker/cts/cloudproviders/CloudProviderPrimary.java
new file mode 100644
index 0000000..3f80195
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/cloudproviders/CloudProviderPrimary.java
@@ -0,0 +1,206 @@
+/*
+ * Copyright (C) 2022 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 android.photopicker.cts.cloudproviders;
+
+import static android.photopicker.cts.PickerProviderMediaGenerator.MediaGenerator;
+import static android.photopicker.cts.PickerProviderMediaGenerator.QueryExtras;
+import static android.provider.CloudMediaProviderContract.EXTRA_LOOPING_PLAYBACK_ENABLED;
+
+import static org.mockito.Mockito.mock;
+
+import android.content.Context;
+import android.content.res.AssetFileDescriptor;
+import android.database.Cursor;
+import android.graphics.Point;
+import android.os.Bundle;
+import android.os.CancellationSignal;
+import android.os.ParcelFileDescriptor;
+import android.photopicker.cts.PickerProviderMediaGenerator;
+import android.provider.CloudMediaProvider;
+import android.util.Log;
+import android.view.Surface;
+
+import androidx.annotation.NonNull;
+
+import java.io.FileNotFoundException;
+
+/**
+ * Implements a cloud {@link CloudMediaProvider} interface over items generated with
+ * {@link MediaGenerator}.
+ */
+public class CloudProviderPrimary extends CloudMediaProvider {
+    public static final String AUTHORITY = "android.photopicker.cts.cloudproviders.cloud_primary";
+
+    private static final String TAG = "CloudProviderPrimary";
+    private static final CloudMediaSurfaceControllerImpl sMockSurfaceControllerListener =
+            mock(CloudMediaSurfaceControllerImpl.class);
+
+    private static CloudMediaSurfaceControllerImpl sSurfaceControllerImpl = null;
+
+    private MediaGenerator mMediaGenerator;
+
+    @Override
+    public boolean onCreate() {
+        mMediaGenerator = PickerProviderMediaGenerator.getMediaGenerator(getContext(), AUTHORITY);
+
+        return true;
+    }
+
+    @Override
+    public Cursor onQueryMedia(Bundle extras) {
+        final QueryExtras queryExtras = new QueryExtras(extras);
+
+        return mMediaGenerator.getMedia(queryExtras.generation, queryExtras.albumId,
+                queryExtras.mimeType, queryExtras.sizeBytes);
+    }
+
+    @Override
+    public Cursor onQueryDeletedMedia(Bundle extras) {
+        final QueryExtras queryExtras = new QueryExtras(extras);
+
+        return mMediaGenerator.getDeletedMedia(queryExtras.generation);
+    }
+
+    @Override
+    public Cursor onQueryAlbums(Bundle extras) {
+        final QueryExtras queryExtras = new QueryExtras(extras);
+
+        return mMediaGenerator.getAlbums(queryExtras.mimeType, queryExtras.sizeBytes);
+    }
+
+    @Override
+    public AssetFileDescriptor onOpenPreview(String mediaId, Point size, Bundle extras,
+            CancellationSignal signal) throws FileNotFoundException {
+        return new AssetFileDescriptor(mMediaGenerator.openMedia(mediaId), 0,
+                AssetFileDescriptor.UNKNOWN_LENGTH);
+    }
+
+    @Override
+    public ParcelFileDescriptor onOpenMedia(String mediaId, Bundle extras,
+            CancellationSignal signal) throws FileNotFoundException {
+        return mMediaGenerator.openMedia(mediaId);
+    }
+
+    @Override
+    public Bundle onGetMediaCollectionInfo(Bundle extras) {
+        return mMediaGenerator.getMediaCollectionInfo();
+    }
+
+    @Override
+    public CloudMediaSurfaceController onCreateCloudMediaSurfaceController(@NonNull Bundle config,
+            @NonNull CloudMediaSurfaceStateChangedCallback callback) {
+        final boolean enableLoop = config.getBoolean(EXTRA_LOOPING_PLAYBACK_ENABLED, false);
+        sSurfaceControllerImpl =
+                new CloudMediaSurfaceControllerImpl(getContext(), enableLoop, callback);
+        return sSurfaceControllerImpl;
+    }
+
+    /**
+     * @return mock {@link CloudMediaSurfaceController} that enables us to test API calls from
+     * PhotoPicker to the {@link CloudMediaProvider}.
+     */
+    public static CloudMediaSurfaceControllerImpl getMockSurfaceControllerListener() {
+        return sMockSurfaceControllerListener;
+    }
+
+    public static void setPlaybackState(int surfaceId, int state) {
+        if (sSurfaceControllerImpl == null) {
+            throw new IllegalStateException("Surface Controller object expected to be not null");
+        }
+
+        sSurfaceControllerImpl.sendPlaybackEvent(surfaceId, state);
+    }
+
+    public static class CloudMediaSurfaceControllerImpl extends CloudMediaSurfaceController {
+
+        private final CloudMediaSurfaceStateChangedCallback mCallback;
+
+        CloudMediaSurfaceControllerImpl(Context context, boolean enableLoop,
+                CloudMediaSurfaceStateChangedCallback callback) {
+            mCallback = callback;
+            Log.d(TAG, "Surface controller created.");
+        }
+
+        @Override
+        public void onPlayerCreate() {
+            sMockSurfaceControllerListener.onPlayerCreate();
+            Log.d(TAG, "Player created.");
+        }
+
+        @Override
+        public void onPlayerRelease() {
+            sMockSurfaceControllerListener.onPlayerRelease();
+            Log.d(TAG, "Player released.");
+        }
+
+        @Override
+        public void onSurfaceCreated(int surfaceId, @NonNull Surface surface,
+                @NonNull String mediaId) {
+            sMockSurfaceControllerListener.onSurfaceCreated(surfaceId, surface, mediaId);
+
+            Log.d(TAG, "Surface prepared: " + surfaceId + ". Surface: " + surface
+                    + ". MediaId: " + mediaId);
+        }
+
+        @Override
+        public void onSurfaceChanged(int surfaceId, int format, int width, int height) {
+            sMockSurfaceControllerListener.onSurfaceChanged(surfaceId, format, width, height);
+            Log.d(TAG, "Surface changed: " + surfaceId + ". Format: " + format + ". Width: "
+                    + width + ". Height: " + height);
+        }
+
+        @Override
+        public void onSurfaceDestroyed(int surfaceId) {
+            sMockSurfaceControllerListener.onSurfaceDestroyed(surfaceId);
+            Log.d(TAG, "onSurfaceDestroyed: " + surfaceId);
+        }
+
+        @Override
+        public void onMediaPlay(int surfaceId) {
+            sMockSurfaceControllerListener.onMediaPlay(surfaceId);
+            Log.d(TAG, "onMediaPlay: " + surfaceId);
+        }
+
+        @Override
+        public void onMediaPause(int surfaceId) {
+            sMockSurfaceControllerListener.onMediaPause(surfaceId);
+            Log.d(TAG, "onMediaPause: " + surfaceId);
+        }
+
+        @Override
+        public void onMediaSeekTo(int surfaceId, long timestampMillis) {
+            sMockSurfaceControllerListener.onMediaSeekTo(surfaceId, timestampMillis);
+            Log.d(TAG, "Media seeked: " + surfaceId + ". Timestamp: " + timestampMillis);
+        }
+
+        @Override
+        public void onConfigChange(@NonNull Bundle config) {
+            sMockSurfaceControllerListener.onConfigChange(config);
+            Log.d(TAG, "onConfigChange config: " + config);
+        }
+
+        @Override
+        public void onDestroy() {
+            sMockSurfaceControllerListener.onDestroy();
+            Log.d(TAG, "Surface controller destroyed.");
+        }
+
+        public void sendPlaybackEvent(int surfaceId, int state) {
+            mCallback.setPlaybackState(surfaceId, state, null);
+        }
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/cloudproviders/CloudProviderSecondary.java b/tests/PhotoPicker/src/android/photopicker/cts/cloudproviders/CloudProviderSecondary.java
new file mode 100644
index 0000000..f5bde67
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/cloudproviders/CloudProviderSecondary.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2022 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 android.photopicker.cts.cloudproviders;
+
+import static android.photopicker.cts.PickerProviderMediaGenerator.MediaGenerator;
+import static android.photopicker.cts.PickerProviderMediaGenerator.QueryExtras;
+
+import android.content.res.AssetFileDescriptor;
+import android.database.Cursor;
+import android.graphics.Point;
+import android.os.Bundle;
+import android.os.CancellationSignal;
+import android.os.ParcelFileDescriptor;
+import android.photopicker.cts.PickerProviderMediaGenerator;
+import android.provider.CloudMediaProvider;
+
+import java.io.FileNotFoundException;
+
+/**
+ * Implements a cloud {@link CloudMediaProvider} interface over items generated with
+ * {@link MediaGenerator}
+ */
+public class CloudProviderSecondary extends CloudMediaProvider {
+    public static final String AUTHORITY = "android.photopicker.cts.cloudproviders.cloud_secondary";
+
+    private MediaGenerator mMediaGenerator;
+
+    @Override
+    public boolean onCreate() {
+        mMediaGenerator = PickerProviderMediaGenerator.getMediaGenerator(getContext(), AUTHORITY);
+        return true;
+    }
+
+    @Override
+    public Cursor onQueryMedia(Bundle extras) {
+        final QueryExtras queryExtras = new QueryExtras(extras);
+
+        return mMediaGenerator.getMedia(queryExtras.generation, queryExtras.albumId,
+                queryExtras.mimeType, queryExtras.sizeBytes);
+    }
+
+    @Override
+    public Cursor onQueryDeletedMedia(Bundle extras) {
+        final QueryExtras queryExtras = new QueryExtras(extras);
+
+        return mMediaGenerator.getDeletedMedia(queryExtras.generation);
+    }
+
+    @Override
+    public Cursor onQueryAlbums(Bundle extras) {
+        final QueryExtras queryExtras = new QueryExtras(extras);
+
+        return mMediaGenerator.getAlbums(queryExtras.mimeType, queryExtras.sizeBytes);
+    }
+
+    @Override
+    public AssetFileDescriptor onOpenPreview(String mediaId, Point size, Bundle extras,
+            CancellationSignal signal) throws FileNotFoundException {
+        return new AssetFileDescriptor(mMediaGenerator.openMedia(mediaId), 0,
+                AssetFileDescriptor.UNKNOWN_LENGTH);
+    }
+
+    @Override
+    public ParcelFileDescriptor onOpenMedia(String mediaId, Bundle extras,
+            CancellationSignal signal) throws FileNotFoundException {
+        return mMediaGenerator.openMedia(mediaId);
+    }
+
+    @Override
+    public Bundle onGetMediaCollectionInfo(Bundle extras) {
+        return mMediaGenerator.getMediaCollectionInfo();
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerAssertionsUtils.java b/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerAssertionsUtils.java
new file mode 100644
index 0000000..9eb7d59
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerAssertionsUtils.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2021 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 android.photopicker.cts.util;
+
+import static android.provider.MediaStore.PickerMediaColumns;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.fail;
+
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.UriPermission;
+import android.database.Cursor;
+import android.media.ExifInterface;
+import android.net.Uri;
+import android.os.FileUtils;
+import android.os.ParcelFileDescriptor;
+
+import androidx.test.InstrumentationRegistry;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Photo Picker Utility methods for test assertions.
+ */
+public class PhotoPickerAssertionsUtils {
+    private static final String TAG = "PhotoPickerTestAssertions";
+
+    public static void assertPickerUriFormat(Uri uri, int expectedUserId) {
+        // content://media/picker/<user-id>/<media-id>
+        final int userId = Integer.parseInt(uri.getPathSegments().get(1));
+        assertThat(userId).isEqualTo(expectedUserId);
+
+        final String auth = uri.getPathSegments().get(0);
+        assertThat(auth).isEqualTo("picker");
+    }
+
+    public static void assertPersistedGrant(Uri uri, ContentResolver resolver) {
+        resolver.takePersistableUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+
+        final List<UriPermission> uriPermissions = resolver.getPersistedUriPermissions();
+        final List<Uri> uris = new ArrayList<>();
+        for (UriPermission perm : uriPermissions) {
+            if (perm.isReadPermission()) {
+                uris.add(perm.getUri());
+            }
+        }
+
+        assertThat(uris).contains(uri);
+    }
+
+    public static void assertMimeType(Uri uri, String expectedMimeType) throws Exception {
+        final Context context = InstrumentationRegistry.getTargetContext();
+        final String resultMimeType = context.getContentResolver().getType(uri);
+        assertThat(resultMimeType).isEqualTo(expectedMimeType);
+    }
+
+    public static void assertRedactedReadOnlyAccess(Uri uri) throws Exception {
+        assertThat(uri).isNotNull();
+        final String[] projection = new String[]{ PickerMediaColumns.MIME_TYPE };
+        final Context context = InstrumentationRegistry.getTargetContext();
+        final ContentResolver resolver = context.getContentResolver();
+        try (Cursor c = resolver.query(uri, projection, null, null)) {
+            assertThat(c).isNotNull();
+            assertThat(c.moveToFirst()).isTrue();
+
+            final String mimeType = c.getString(c.getColumnIndex(PickerMediaColumns.MIME_TYPE));
+
+            if (mimeType.startsWith("image")) {
+                assertImageRedactedReadOnlyAccess(uri, resolver);
+            } else if (mimeType.startsWith("video")) {
+                assertVideoRedactedReadOnlyAccess(uri, resolver);
+            } else {
+                fail("The mime type is not as expected: " + mimeType);
+            }
+        }
+    }
+
+    private static void assertVideoRedactedReadOnlyAccess(Uri uri, ContentResolver resolver)
+            throws Exception {
+        // The location is redacted
+        // TODO(b/201505595): Make this method work for test_video.mp4. Currently it works only for
+        //  test_video_dng.mp4
+        try (InputStream in = resolver.openInputStream(uri);
+                ByteArrayOutputStream out = new ByteArrayOutputStream()) {
+            FileUtils.copy(in, out);
+            byte[] bytes = out.toByteArray();
+            byte[] xmpBytes = Arrays.copyOfRange(bytes, 3269, 3269 + 13197);
+            String xmp = new String(xmpBytes);
+            assertWithMessage("Failed to redact XMP longitude")
+                    .that(xmp.contains("10,41.751000E")).isFalse();
+            assertWithMessage("Failed to redact XMP latitude")
+                    .that(xmp.contains("53,50.070500N")).isFalse();
+            assertWithMessage("Redacted non-location XMP")
+                    .that(xmp.contains("13166/7763")).isTrue();
+        }
+
+        // assert no write access
+        try (ParcelFileDescriptor pfd = resolver.openFileDescriptor(uri, "w")) {
+            fail("Does not grant write access to uri " + uri.toString());
+        } catch (SecurityException | FileNotFoundException expected) {
+        }
+    }
+
+    private static void assertImageRedactedReadOnlyAccess(Uri uri, ContentResolver resolver)
+            throws Exception {
+        // Assert URI access
+        // The location is redacted
+        try (InputStream is = resolver.openInputStream(uri)) {
+            assertImageExifRedacted(is);
+        }
+
+        // Assert no write access
+        try (ParcelFileDescriptor pfd = resolver.openFileDescriptor(uri, "w")) {
+            fail("Does not grant write access to uri " + uri.toString());
+        } catch (SecurityException | FileNotFoundException expected) {
+        }
+
+        // Assert file path access
+        try (Cursor c = resolver.query(uri, null, null, null)) {
+            assertThat(c).isNotNull();
+            assertThat(c.moveToFirst()).isTrue();
+
+            File file = new File(c.getString(c.getColumnIndex(PickerMediaColumns.DATA)));
+
+            // The location is redacted
+            try (InputStream is = new FileInputStream(file)) {
+                assertImageExifRedacted(is);
+            }
+
+            // Assert no write access
+            try (ParcelFileDescriptor pfd =
+                    ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_WRITE)) {
+                fail("Does not grant write access to file " + file);
+            } catch (IOException e) {
+            }
+        }
+    }
+
+    private static void assertImageExifRedacted(InputStream is) throws IOException {
+        final ExifInterface exif = new ExifInterface(is);
+        final float[] latLong = new float[2];
+        exif.getLatLong(latLong);
+        assertWithMessage("Failed to redact latitude")
+                .that(latLong[0]).isWithin(0.001f).of(0);
+        assertWithMessage("Failed to redact longitude")
+                .that(latLong[1]).isWithin(0.001f).of(0);
+
+        String xmp = exif.getAttribute(ExifInterface.TAG_XMP);
+        assertWithMessage("Failed to redact XMP longitude")
+                .that(xmp.contains("10,41.751000E")).isFalse();
+        assertWithMessage("Failed to redact XMP latitude")
+                .that(xmp.contains("53,50.070500N")).isFalse();
+        assertWithMessage("Redacted non-location XMP")
+                .that(xmp.contains("LensDefaults")).isTrue();
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerFilesUtils.java b/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerFilesUtils.java
new file mode 100644
index 0000000..3705ddd
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerFilesUtils.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2021 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 android.photopicker.cts.util;
+
+import android.app.UiAutomation;
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.FileUtils;
+import android.os.UserHandle;
+import android.photopicker.cts.R;
+import android.provider.MediaStore;
+import android.provider.cts.ProviderTestUtils;
+import android.provider.cts.media.MediaStoreUtils;
+
+import androidx.test.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.ShellUtils;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.List;
+
+/**
+ * Photo Picker Utility methods for media files creation and deletion.
+ */
+public class PhotoPickerFilesUtils {
+    public static final String DISPLAY_NAME_PREFIX = "ctsPhotoPicker";
+
+    public static void createImages(int count, int userId, List<Uri> uriList)
+            throws Exception {
+        createImages(count, userId, uriList, false);
+    }
+
+    public static void createImages(int count, int userId, List<Uri> uriList, boolean isFavorite)
+            throws Exception {
+        for (int i = 0; i < count; i++) {
+            final Uri uri = createImage(userId, isFavorite);
+            uriList.add(uri);
+            clearMediaOwner(uri, userId);
+        }
+        // Wait for Picker db sync to complete
+        MediaStore.waitForIdle(InstrumentationRegistry.getContext().getContentResolver());
+    }
+
+    public static void createDNGVideos(int count, int userId, List<Uri> uriList)
+            throws Exception {
+        for (int i = 0; i < count; i++) {
+            final Uri uri = createDNGVideo(userId);
+            uriList.add(uri);
+            clearMediaOwner(uri, userId);
+        }
+        // Wait for Picker db sync to complete
+        MediaStore.waitForIdle(InstrumentationRegistry.getContext().getContentResolver());
+    }
+
+    public static void createVideos(int count, int userId, List<Uri> uriList)
+            throws Exception {
+        for (int i = 0; i < count; i++) {
+            final Uri uri = createVideo(userId);
+            uriList.add(uri);
+            clearMediaOwner(uri, userId);
+        }
+        // Wait for Picker db sync to complete
+        MediaStore.waitForIdle(InstrumentationRegistry.getContext().getContentResolver());
+    }
+
+    public static void deleteMedia(Uri uri, Context context) throws Exception {
+        try {
+            ProviderTestUtils.setOwner(uri, context.getPackageName());
+            context.getContentResolver().delete(uri, Bundle.EMPTY);
+        } catch (Exception ignored) {
+        }
+    }
+
+    private static void clearMediaOwner(Uri uri, int userId) throws Exception {
+        final String cmd = String.format(
+                "content update --uri %s --user %d --bind owner_package_name:n:", uri, userId);
+        ShellUtils.runShellCommand(cmd);
+    }
+
+    private static Uri createDNGVideo(int userId) throws Exception {
+        final Uri uri = stageMedia(R.raw.test_video_dng,
+                MediaStore.Video.Media.EXTERNAL_CONTENT_URI, "video/mp4", userId);
+        return uri;
+    }
+
+    private static Uri createVideo(int userId) throws Exception {
+        final Uri uri = stageMedia(R.raw.test_video,
+                MediaStore.Video.Media.EXTERNAL_CONTENT_URI, "video/mp4", userId);
+        return uri;
+    }
+
+    private static Uri createImage(int userId, boolean isFavorite) throws Exception {
+        final Uri uri = stageMedia(R.raw.lg_g4_iso_800_jpg,
+                MediaStore.Images.Media.EXTERNAL_CONTENT_URI, "image/jpeg", userId, isFavorite);
+        return uri;
+    }
+
+    private static Uri stageMedia(int resId, Uri collectionUri, String mimeType, int userId,
+            boolean isFavorite) throws
+            Exception {
+        UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        uiAutomation.adoptShellPermissionIdentity(
+                android.Manifest.permission.INTERACT_ACROSS_USERS,
+                android.Manifest.permission.INTERACT_ACROSS_USERS_FULL);
+        try {
+            final Context context = InstrumentationRegistry.getTargetContext();
+            final Context userContext = userId == context.getUserId() ? context :
+                    context.createPackageContextAsUser("android", /* flags= */ 0,
+                            UserHandle.of(userId));
+            return stageMedia(resId, collectionUri, mimeType, userContext, isFavorite);
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    private static Uri stageMedia(int resId, Uri collectionUri, String mimeType, int userId) throws
+            Exception {
+        return stageMedia(resId, collectionUri, mimeType, userId, false);
+    }
+
+    private static Uri stageMedia(int resId, Uri collectionUri, String mimeType, Context context,
+            boolean isFavorite)
+            throws IOException {
+        final String displayName = DISPLAY_NAME_PREFIX + System.nanoTime();
+        final MediaStoreUtils.PendingParams params = new MediaStoreUtils.PendingParams(
+                collectionUri, displayName, mimeType);
+        params.setIsFavorite(isFavorite);
+        final Uri pendingUri = MediaStoreUtils.createPending(context, params);
+        try (MediaStoreUtils.PendingSession session = MediaStoreUtils.openPending(context,
+                pendingUri)) {
+            try (InputStream source = context.getResources().openRawResource(resId);
+                 OutputStream target = session.openOutputStream()) {
+                FileUtils.copy(source, target);
+            }
+            return session.publish();
+        }
+    }
+}
diff --git a/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerUiUtils.java b/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerUiUtils.java
new file mode 100644
index 0000000..d20dcd6
--- /dev/null
+++ b/tests/PhotoPicker/src/android/photopicker/cts/util/PhotoPickerUiUtils.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2021 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 android.photopicker.cts.util;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.text.format.DateUtils;
+
+import androidx.test.uiautomator.UiObject;
+import androidx.test.uiautomator.UiObjectNotFoundException;
+import androidx.test.uiautomator.UiScrollable;
+import androidx.test.uiautomator.UiSelector;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Photo Picker Utility methods for finding UI elements.
+ */
+public class PhotoPickerUiUtils {
+    public static final long SHORT_TIMEOUT = 5 * DateUtils.SECOND_IN_MILLIS;
+
+    private static final long TIMEOUT = 30 * DateUtils.SECOND_IN_MILLIS;
+    public static final String REGEX_PACKAGE_NAME =
+            "com(.google)?.android.providers.media(.module)?";
+
+    /**
+     * Get the list of items from the photo grid list.
+     * @param itemCount if the itemCount is -1, return all matching items. Otherwise, return the
+     *                  item list that its size is not greater than the itemCount.
+     * @throws Exception
+     */
+    public static List<UiObject> findItemList(int itemCount) throws Exception {
+        final List<UiObject> itemList = new ArrayList<>();
+        final UiSelector gridList = new UiSelector().className(
+                "androidx.recyclerview.widget.RecyclerView").resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/picker_tab_recyclerview");
+
+        // Wait for the first item to appear
+        assertWithMessage("Timed out while waiting for first item to appear")
+                .that(new UiObject(gridList.childSelector(new UiSelector())).waitForExists(TIMEOUT))
+                .isTrue();
+
+        final UiSelector itemSelector = new UiSelector().resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/icon_thumbnail");
+        final UiScrollable grid = new UiScrollable(gridList);
+        final int childCount = grid.getChildCount();
+        final int count = itemCount == -1 ? childCount : itemCount;
+
+        for (int i = 0; i < childCount; i++) {
+            final UiObject item = grid.getChildByInstance(itemSelector, i);
+            if (item.exists()) {
+                itemList.add(item);
+            }
+            if (itemList.size() == count) {
+                break;
+            }
+        }
+        return itemList;
+    }
+
+    public static UiObject findPreviewAddButton() {
+        return new UiObject(new UiSelector().resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/preview_add_button"));
+    }
+
+    public static UiObject findPreviewAddOrSelectButton() {
+        return new UiObject(new UiSelector().resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/preview_add_or_select_button"));
+    }
+
+    public static UiObject findAddButton() {
+        return new UiObject(new UiSelector().resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/button_add"));
+    }
+
+    public static UiObject findProfileButton() {
+        return new UiObject(new UiSelector().resourceIdMatches(
+                REGEX_PACKAGE_NAME + ":id/profile_button"));
+    }
+}
diff --git a/tests/ProcessTest/Android.bp b/tests/ProcessTest/Android.bp
deleted file mode 100644
index a0c7de5..0000000
--- a/tests/ProcessTest/Android.bp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (C) 2009 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.
-
-// TODO: should it be android_helper_test_app?
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-android_test {
-    name: "ProcessTests",
-    defaults: ["cts_defaults"],
-    aaptflags: [
-        "-c",
-        "xx_YY",
-        "-c",
-        "cs",
-    ],
-    srcs: ["**/*.java"],
-    static_libs: ["junit"],
-    libs: ["android.test.base"],
-    dex_preopt: {
-        enabled: false,
-    },
-    optimize: {
-        enabled: false,
-    },
-    sdk_version: "current",
-}
diff --git a/tests/ProcessTest/AndroidManifest.xml b/tests/ProcessTest/AndroidManifest.xml
deleted file mode 100644
index f2d7202..0000000
--- a/tests/ProcessTest/AndroidManifest.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-       package="com.android.cts.process"
-       android:sharedUserId="com.android.cts.process.uidpid_test">
-
-    <!-- InstrumentationTestRunner for AndroidTests -->
-    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="com.android.cts.process"
-                     android:label="Test process"/>
-    <application>
-
-        <uses-library android:name="android.test.runner" />
-
-        <activity android:name=".activity.SharePidActivity"
-                android:process=":shareProcess"/>
-        <activity android:name=".activity.SharePidSubActivity"
-                android:process=":shareProcess"/>
-        <activity android:name=".activity.NoSharePidActivity"
-                android:process=":noShareProcess"/>
-    </application>
-
-</manifest>
diff --git a/tests/ProcessTest/NoShareUidApp/Android.bp b/tests/ProcessTest/NoShareUidApp/Android.bp
deleted file mode 100644
index e5582de..0000000
--- a/tests/ProcessTest/NoShareUidApp/Android.bp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2009 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-android_test_helper_app {
-    name: "NoShareUidApp",
-    defaults: ["cts_defaults"],
-    srcs: ["**/*.java"],
-    sdk_version: "current",
-    optimize: {
-        enabled: false,
-    },
-    dex_preopt: {
-        enabled: false,
-    },
-}
diff --git a/tests/ProcessTest/NoShareUidApp/AndroidManifest.xml b/tests/ProcessTest/NoShareUidApp/AndroidManifest.xml
deleted file mode 100644
index ddc73cf..0000000
--- a/tests/ProcessTest/NoShareUidApp/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2009 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.
- -->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-       package="com.android.cts.process.noshareuidapp">
-
-</manifest>
diff --git a/tests/ProcessTest/NoShareUidApp/src/com/android/cts/process/activity/NoSharePidActivity.java b/tests/ProcessTest/NoShareUidApp/src/com/android/cts/process/activity/NoSharePidActivity.java
deleted file mode 100644
index e5f0ab4..0000000
--- a/tests/ProcessTest/NoShareUidApp/src/com/android/cts/process/activity/NoSharePidActivity.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2009 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.cts.process.activity;
-
-import android.app.Activity;
-
-public class NoSharePidActivity extends Activity {
-
-}
diff --git a/tests/ProcessTest/ShareUidApp/Android.bp b/tests/ProcessTest/ShareUidApp/Android.bp
deleted file mode 100644
index 9457f14..0000000
--- a/tests/ProcessTest/ShareUidApp/Android.bp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (C) 2009 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-android_test_helper_app {
-    name: "ShareUidApp",
-    defaults: ["cts_defaults"],
-    srcs: ["**/*.java"],
-    sdk_version: "current",
-    optimize: {
-        enabled: false,
-    },
-    dex_preopt: {
-        enabled: false,
-    },
-}
diff --git a/tests/ProcessTest/ShareUidApp/AndroidManifest.xml b/tests/ProcessTest/ShareUidApp/AndroidManifest.xml
deleted file mode 100644
index 19981f4..0000000
--- a/tests/ProcessTest/ShareUidApp/AndroidManifest.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-       package="com.android.cts.process.shareuidapp"
-       android:sharedUserId="com.android.cts.process.uidpid_test">
-
-</manifest>
diff --git a/tests/ProcessTest/ShareUidApp/src/com/android/cts/process/activity/SharePidActivity.java b/tests/ProcessTest/ShareUidApp/src/com/android/cts/process/activity/SharePidActivity.java
deleted file mode 100644
index 55db78b..0000000
--- a/tests/ProcessTest/ShareUidApp/src/com/android/cts/process/activity/SharePidActivity.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2009 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.cts.process.activity;
-
-import android.app.Activity;
-
-public class SharePidActivity extends Activity {
-
-}
diff --git a/tests/ProcessTest/ShareUidApp/src/com/android/cts/process/activity/SharePidSubActivity.java b/tests/ProcessTest/ShareUidApp/src/com/android/cts/process/activity/SharePidSubActivity.java
deleted file mode 100644
index c06d9fb9..0000000
--- a/tests/ProcessTest/ShareUidApp/src/com/android/cts/process/activity/SharePidSubActivity.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2009 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.cts.process.activity;
-
-import android.app.Activity;
-
-public class SharePidSubActivity extends Activity {
-
-}
diff --git a/tests/ProcessTest/src/com/android/cts/process/ProcessTest.java b/tests/ProcessTest/src/com/android/cts/process/ProcessTest.java
deleted file mode 100644
index a64a900..0000000
--- a/tests/ProcessTest/src/com/android/cts/process/ProcessTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright (C) 2009 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.cts.process;
-
-import java.util.List;
-
-import android.app.ActivityManager;
-import android.app.ActivityManager.RunningAppProcessInfo;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.test.AndroidTestCase;
-
-import com.android.cts.process.activity.NoSharePidActivity;
-import com.android.cts.process.activity.SharePidActivity;
-import com.android.cts.process.activity.SharePidSubActivity;
-
-public class ProcessTest extends AndroidTestCase {
-    private final int WAIT_TIME = 2000;
-
-    public void testUid() throws Exception {
-        String enableApp = "com.android.cts.process.shareuidapp";
-        String disableApp = "com.android.cts.process.noshareuidapp";
-        String testApp = mContext.getPackageName();
-        int uid1 = mContext.getPackageManager().getApplicationInfo(enableApp,
-                PackageManager.GET_META_DATA).uid;
-        int uid2 = mContext.getPackageManager().getApplicationInfo(disableApp,
-                PackageManager.GET_META_DATA).uid;
-        int uid3 = mContext.getPackageManager().getApplicationInfo(testApp,
-                PackageManager.GET_META_DATA).uid;
-        assertEquals(uid1, uid3);
-        assertNotSame(uid2, uid3);
-    }
-
-    public void testPid() throws Exception {
-        ActivityManager am = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
-        String shareProcessName = mContext.getPackageName() + ":shareProcess";
-        String noShareProcessName = mContext.getPackageName() + ":noShareProcess";
-        List<RunningAppProcessInfo> list = am.getRunningAppProcesses();
-        assertEquals(-1, getPid(shareProcessName, list));
-        // share pid will use same process
-        Intent sharePidIntent = new Intent();
-        sharePidIntent.setClass(mContext, SharePidActivity.class);
-        sharePidIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivity(sharePidIntent);
-        Thread.sleep(WAIT_TIME);
-        List<RunningAppProcessInfo> sharelist = am.getRunningAppProcesses();
-        int sharePid = getPid(shareProcessName, sharelist);
-        assertTrue(-1 != sharePid);
-        Intent sharePidStubIntent = new Intent();
-        sharePidStubIntent.setClass(mContext, SharePidSubActivity.class);
-        sharePidStubIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivity(sharePidStubIntent);
-        Thread.sleep(WAIT_TIME);
-        List<RunningAppProcessInfo> shareStublist = am.getRunningAppProcesses();
-        int shareStubPid = getPid(shareProcessName, shareStublist);
-        assertTrue(-1 != shareStubPid);
-        assertEquals(sharePid, shareStubPid);
-        // no share pid will create a new process
-        Intent noSharePidIntent = new Intent();
-        noSharePidIntent.setClass(mContext, NoSharePidActivity.class);
-        noSharePidIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivity(noSharePidIntent);
-        Thread.sleep(WAIT_TIME);
-        List<RunningAppProcessInfo> noShareStublist = am.getRunningAppProcesses();
-        int noSharePid = getPid(noShareProcessName, noShareStublist);
-        assertTrue(-1 != noSharePid);
-        assertTrue(sharePid != noSharePid);
-        // kill the process after test
-        android.os.Process.killProcess(noSharePid);
-        android.os.Process.killProcess(sharePid);
-    }
-
-    private int getPid(String processName, List<RunningAppProcessInfo> list) {
-        for (RunningAppProcessInfo rai : list) {
-            if (processName.equals(rai.processName))
-                return rai.pid;
-        }
-        return -1;
-    }
-
-}
diff --git a/tests/accessibility/common/src/android/accessibility/cts/common/ServiceControlUtils.java b/tests/accessibility/common/src/android/accessibility/cts/common/ServiceControlUtils.java
index 067e37b..d0438bd 100644
--- a/tests/accessibility/common/src/android/accessibility/cts/common/ServiceControlUtils.java
+++ b/tests/accessibility/common/src/android/accessibility/cts/common/ServiceControlUtils.java
@@ -52,7 +52,7 @@
                 lock.notifyAll();
             }
         };
-        manager.addAccessibilityServicesStateChangeListener(listener, null);
+        manager.addAccessibilityServicesStateChangeListener(listener);
         try {
             waitOn(lock, condition, timeoutMs, conditionName);
         } finally {
diff --git a/tests/accessibility/res/values/strings.xml b/tests/accessibility/res/values/strings.xml
index 40c3359..37d3051 100644
--- a/tests/accessibility/res/values/strings.xml
+++ b/tests/accessibility/res/values/strings.xml
@@ -29,6 +29,9 @@
     <!-- String title for the accessibility button service -->
     <string name="title_accessibility_button_service">Accessibility Button Service</string>
 
+    <!-- Intro of the speaking accessibility service -->
+    <string name="some_intro">Some intro</string>
+
     <!-- Description of the speaking accessibility service -->
     <string name="some_description">Some description</string>
 
diff --git a/tests/accessibility/res/xml/speaking_accessibilityservice.xml b/tests/accessibility/res/xml/speaking_accessibilityservice.xml
index 1cb6c39..8ca9e6f 100644
--- a/tests/accessibility/res/xml/speaking_accessibilityservice.xml
+++ b/tests/accessibility/res/xml/speaking_accessibilityservice.xml
@@ -21,10 +21,12 @@
     android:canRequestTouchExplorationMode="true"
     android:canRequestFilterKeyEvents="true"
     android:settingsActivity="foo.bar.Activity"
+    android:tileService="foo.bar.TileService"
     android:animatedImageDrawable="@drawable/jpg_48_48"
+    android:intro="@string/some_intro"
     android:description="@string/some_description"
     android:htmlDescription="@string/html_description_speaking_accessibility_service"
     android:summary="@string/some_summary"
     android:nonInteractiveUiTimeout="1000"
     android:interactiveUiTimeout="6000"
-    android:isAccessibilityTool="true"/>
\ No newline at end of file
+    android:isAccessibilityTool="true"/>
diff --git a/tests/accessibility/res/xml/speaking_and_vibrating_accessibilityservice.xml b/tests/accessibility/res/xml/speaking_and_vibrating_accessibilityservice.xml
index 09d36c6..2e77040 100644
--- a/tests/accessibility/res/xml/speaking_and_vibrating_accessibilityservice.xml
+++ b/tests/accessibility/res/xml/speaking_and_vibrating_accessibilityservice.xml
@@ -22,6 +22,7 @@
     android:canRequestFilterKeyEvents="true"
     android:canRequestEnhancedWebAccessibility="true"
     android:settingsActivity="foo.bar.Activity"
+    android:tileService="foo.bar.TileService"
     android:animatedImageDrawable="@drawable/vector_drawable_6kdp_6kdp"
     android:description="@string/some_description"
     android:htmlDescription="@string/html_description_speaking_and_vibrating_accessibility_service"
diff --git a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityEventTest.java b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityEventTest.java
index 8c1b484..246cb83 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityEventTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityEventTest.java
@@ -20,7 +20,6 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import android.accessibility.cts.common.AccessibilityDumpOnFailureRule;
 import android.accessibility.cts.common.InstrumentedAccessibilityServiceTestRule;
@@ -30,6 +29,7 @@
 import android.content.Context;
 import android.os.Message;
 import android.os.Parcel;
+import android.os.SystemClock;
 import android.platform.test.annotations.Presubmit;
 import android.text.SpannableString;
 import android.text.TextUtils;
@@ -47,8 +47,6 @@
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
 
-import junit.framework.TestCase;
-
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -129,19 +127,20 @@
 
     @Test
     public void testScrollEvent() throws Exception {
-        sUiAutomation.executeAndWaitForEvent(
-                () -> mChildView.scrollTo(0, 100), new ScrollEventFilter(1), DEFAULT_TIMEOUT_MS);
+        sUiAutomation.executeAndWaitForEvent(() -> sInstrumentation.runOnMainSync(
+                () -> mChildView.scrollTo(0, 100)), new ScrollEventFilter(1), DEFAULT_TIMEOUT_MS);
     }
 
     @Test
     public void testScrollEventBurstCombined() throws Exception {
         sUiAutomation.executeAndWaitForEvent(
-                () -> {
-                    mChildView.scrollTo(0, 100);
-                    mChildView.scrollTo(0, 125);
-                    mChildView.scrollTo(0, 150);
-                    mChildView.scrollTo(0, 175);
-                },
+                () -> sInstrumentation.runOnMainSync(
+                        () -> {
+                            mChildView.scrollTo(0, 100);
+                            mChildView.scrollTo(0, 125);
+                            mChildView.scrollTo(0, 150);
+                            mChildView.scrollTo(0, 175);
+                        }),
                 new ScrollEventFilter(1),
                 DEFAULT_TIMEOUT_MS);
     }
@@ -150,18 +149,20 @@
     public void testScrollEventsDeliveredInCorrectInterval() throws Exception {
         sUiAutomation.executeAndWaitForEvent(
                 () -> {
-                    try {
+                    sInstrumentation.runOnMainSync(() -> {
                         mChildView.scrollTo(0, 25);
                         mChildView.scrollTo(0, 50);
                         mChildView.scrollTo(0, 100);
-                        Thread.sleep(SEND_RECURRING_ACCESSIBILITY_EVENTS_INTERVAL_MILLIS * 2);
+                    });
+                    SystemClock.sleep(SEND_RECURRING_ACCESSIBILITY_EVENTS_INTERVAL_MILLIS * 2);
+                    sInstrumentation.runOnMainSync(() -> {
                         mChildView.scrollTo(0, 150);
                         mChildView.scrollTo(0, 175);
-                        Thread.sleep(SEND_RECURRING_ACCESSIBILITY_EVENTS_INTERVAL_MILLIS / 2);
+                    });
+                    SystemClock.sleep(SEND_RECURRING_ACCESSIBILITY_EVENTS_INTERVAL_MILLIS / 2);
+                    sInstrumentation.runOnMainSync(() -> {
                         mChildView.scrollTo(0, 200);
-                    } catch (InterruptedException e) {
-                        fail("Interrupted while dispatching event bursts.");
-                    }
+                    });
                 },
                 new ScrollEventFilter(2),
                 DEFAULT_TIMEOUT_MS);
@@ -189,11 +190,12 @@
     public void testScrollEventsClearedOnDetach() throws Throwable {
         ScrollEventFilter scrollEventFilter = new ScrollEventFilter(1);
         sUiAutomation.executeAndWaitForEvent(
-                () -> {
-                    mChildView.scrollTo(0, 25);
-                    mChildView.scrollTo(5, 50);
-                    mChildView.scrollTo(7, 100);
-                },
+                () -> sInstrumentation.runOnMainSync(
+                        () -> {
+                            mChildView.scrollTo(0, 25);
+                            mChildView.scrollTo(5, 50);
+                            mChildView.scrollTo(7, 100);
+                        }),
                 scrollEventFilter,
                 DEFAULT_TIMEOUT_MS);
         mActivityRule.runOnUiThread(
@@ -202,9 +204,10 @@
                     mParentView.addView(mChildView);
                 });
         sUiAutomation.executeAndWaitForEvent(
-                () -> {
-                    mChildView.scrollTo(0, 150);
-                },
+                () -> sInstrumentation.runOnMainSync(
+                        () -> {
+                            mChildView.scrollTo(0, 150);
+                        }),
                 scrollEventFilter,
                 DEFAULT_TIMEOUT_MS);
         AccessibilityEvent event = scrollEventFilter.getLastEvent();
@@ -216,11 +219,12 @@
     public void testScrollEventsCaptureTotalDelta() throws Throwable {
         ScrollEventFilter scrollEventFilter = new ScrollEventFilter(1);
         sUiAutomation.executeAndWaitForEvent(
-                () -> {
-                    mChildView.scrollTo(0, 25);
-                    mChildView.scrollTo(5, 50);
-                    mChildView.scrollTo(7, 100);
-                },
+                () -> sInstrumentation.runOnMainSync(
+                        () -> {
+                            mChildView.scrollTo(0, 25);
+                            mChildView.scrollTo(5, 50);
+                            mChildView.scrollTo(7, 100);
+                        }),
                 scrollEventFilter,
                 DEFAULT_TIMEOUT_MS);
         AccessibilityEvent event = scrollEventFilter.getLastEvent();
@@ -233,18 +237,18 @@
         ScrollEventFilter scrollEventFilter = new ScrollEventFilter(2);
         sUiAutomation.executeAndWaitForEvent(
                 () -> {
-                    try {
+                    sInstrumentation.runOnMainSync(() -> {
                         mChildView.scrollTo(0, 25);
                         mChildView.scrollTo(5, 50);
                         mChildView.scrollTo(7, 100);
-                        Thread.sleep(SEND_RECURRING_ACCESSIBILITY_EVENTS_INTERVAL_MILLIS * 2);
+                    });
+                    SystemClock.sleep(SEND_RECURRING_ACCESSIBILITY_EVENTS_INTERVAL_MILLIS * 2);
+                    sInstrumentation.runOnMainSync(() -> {
                         mChildView.scrollTo(0, 25);
                         mChildView.scrollTo(5, 50);
                         mChildView.scrollTo(7, 100);
                         mChildView.scrollTo(0, 150);
-                    } catch (InterruptedException e) {
-                        fail("Interrupted while dispatching event bursts.");
-                    }
+                    });
                 },
                 scrollEventFilter,
                 DEFAULT_TIMEOUT_MS);
@@ -280,18 +284,14 @@
     public void testStateEventsDeliveredInCorrectInterval() throws Throwable {
         sUiAutomation.executeAndWaitForEvent(
                 () -> {
-                    try {
-                        sendStateDescriptionChangedEvent(mChildView);
-                        sendStateDescriptionChangedEvent(mChildView);
-                        sendStateDescriptionChangedEvent(mChildView);
-                        Thread.sleep(SEND_RECURRING_ACCESSIBILITY_EVENTS_INTERVAL_MILLIS * 2);
-                        sendStateDescriptionChangedEvent(mChildView);
-                        sendStateDescriptionChangedEvent(mChildView);
-                        Thread.sleep(SEND_RECURRING_ACCESSIBILITY_EVENTS_INTERVAL_MILLIS / 2);
-                        sendStateDescriptionChangedEvent(mChildView);
-                    } catch (InterruptedException e) {
-                        fail("Interrupted while dispatching event bursts.");
-                    }
+                    sendStateDescriptionChangedEvent(mChildView);
+                    sendStateDescriptionChangedEvent(mChildView);
+                    sendStateDescriptionChangedEvent(mChildView);
+                    SystemClock.sleep(SEND_RECURRING_ACCESSIBILITY_EVENTS_INTERVAL_MILLIS * 2);
+                    sendStateDescriptionChangedEvent(mChildView);
+                    sendStateDescriptionChangedEvent(mChildView);
+                    SystemClock.sleep(SEND_RECURRING_ACCESSIBILITY_EVENTS_INTERVAL_MILLIS / 2);
+                    sendStateDescriptionChangedEvent(mChildView);
                 },
                 new StateDescriptionEventFilter(2),
                 DEFAULT_TIMEOUT_MS);
@@ -364,6 +364,27 @@
     }
 
     @Test
+    public void setText_unChanged_doNotReceiveEvent() throws Throwable {
+        sUiAutomation.executeAndWaitForEvent(
+                () -> sInstrumentation.runOnMainSync(() -> mTextView.setText("a")),
+                event -> isExpectedChangeType(event, AccessibilityEvent.CONTENT_CHANGE_TYPE_TEXT),
+                DEFAULT_TIMEOUT_MS);
+
+        assertThrows(
+                TimeoutException.class,
+                () ->
+                        sUiAutomation.executeAndWaitForEvent(
+                                () -> {
+                                    sInstrumentation.runOnMainSync(
+                                            () -> {
+                                                mTextView.setText("a");
+                                            });
+                                },
+                                event -> isExpectedSource(event, mTextView),
+                                DEFAULT_TIMEOUT_MS));
+    }
+
+    @Test
     public void setText_textChanged_receivesTextEvent() throws Throwable {
         sUiAutomation.executeAndWaitForEvent(
                 () -> sInstrumentation.runOnMainSync(() -> mTextView.setText("a")),
@@ -613,6 +634,8 @@
         sentEvent.setScrollable(true);
         sentEvent.setAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);
         sentEvent.setMovementGranularity(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE);
+        sentEvent.setDisplayId(Display.DEFAULT_DISPLAY);
+        sentEvent.setSpeechStateChangeTypes(AccessibilityEvent.SPEECH_STATE_SPEAKING_START);
 
         AccessibilityRecord record = AccessibilityRecord.obtain();
         AccessibilityRecordTest.fullyPopulateAccessibilityRecord(record);
@@ -719,6 +742,10 @@
                 "windowChangeTypes has incorrect value",
                 expectedEvent.getWindowChanges(),
                 receivedEvent.getWindowChanges());
+        assertEquals(
+                "speechStateChangeTypes has incorrect value,",
+                expectedEvent.getSpeechStateChangeTypes(),
+                receivedEvent.getSpeechStateChangeTypes());
 
         AccessibilityRecordTest.assertEqualsText(expectedEvent.getText(), receivedEvent.getText());
         AccessibilityRecordTest.assertEqualAccessibilityRecord(expectedEvent, receivedEvent);
@@ -738,16 +765,4 @@
             AccessibilityRecordTest.assertEqualAccessibilityRecord(expectedRecord, receivedRecord);
         }
     }
-
-    /**
-     * Asserts that an {@link AccessibilityEvent} is cleared.
-     *
-     * @param event The event to check.
-     */
-    private static void assertAccessibilityEventCleared(AccessibilityEvent event) {
-        AccessibilityRecordTest.assertAccessibilityRecordCleared(event);
-        TestCase.assertEquals("eventTime not properly recycled", 0, event.getEventTime());
-        TestCase.assertEquals("eventType not properly recycled", 0, event.getEventType());
-        TestCase.assertNull("packageName not properly recycled", event.getPackageName());
-    }
 }
diff --git a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
index f1eab6c..0f5afd1 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityManagerTest.java
@@ -36,14 +36,18 @@
 import android.os.Handler;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
+import android.view.accessibility.AccessibilityManager.AccessibilityServicesStateChangeListener;
 import android.view.accessibility.AccessibilityManager.AccessibilityStateChangeListener;
+import android.view.accessibility.AccessibilityManager.AudioDescriptionRequestedChangeListener;
 import android.view.accessibility.AccessibilityManager.TouchExplorationStateChangeListener;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.SettingsStateChangerRule;
 import com.android.compatibility.common.util.SystemUtil;
+import com.android.compatibility.common.util.TestUtils;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -77,14 +81,6 @@
             new InstrumentedAccessibilityServiceTestRule<>(
                     SpeakingAndVibratingAccessibilityService.class, false);
 
-    @Rule
-    public final RuleChain mRuleChain = RuleChain
-            .outerRule(mSpeakingAndVibratingAccessibilityServiceRule)
-            .around(mVibratingAccessibilityServiceRule)
-            .around(mSpeakingAccessibilityServiceRule)
-            // Inner rule capture failure and dump data before finishing activity and a11y service
-            .around(mDumpOnFailureRule);
-
     private static final Instrumentation sInstrumentation =
             InstrumentationRegistry.getInstrumentation();
 
@@ -102,6 +98,25 @@
 
     public static final String ACCESSIBILITY_INTERACTIVE_UI_TIMEOUT_MS =
             "accessibility_interactive_ui_timeout_ms";
+    private static final String ENABLED_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT =
+            "enabled_accessibility_audio_description_by_default";
+
+    private final SettingsStateChangerRule mAudioDescriptionSetterRule =
+            new SettingsStateChangerRule(
+                    sInstrumentation.getContext(),
+                    ENABLED_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT,
+                    "0");
+
+    @Rule
+    public final RuleChain mRuleChain = RuleChain
+            // SettingsStateChangerRule will suppress accessibility services, so it should be
+            // executed before enabling a11y services and after disabling a11y services.
+            .outerRule(mAudioDescriptionSetterRule)
+            .around(mSpeakingAndVibratingAccessibilityServiceRule)
+            .around(mVibratingAccessibilityServiceRule)
+            .around(mSpeakingAccessibilityServiceRule)
+            // Inner rule capture failure and dump data before finishing activity and a11y service
+            .around(mDumpOnFailureRule);
 
     private AccessibilityManager mAccessibilityManager;
 
@@ -141,6 +156,19 @@
     }
 
     @Test
+    public void testAddAndRemoveAudioDescriptionRequestedChangeListener() throws Exception {
+        AudioDescriptionRequestedChangeListener listener = (boolean enabled) -> {
+            // Do nothing.
+        };
+        mAccessibilityManager.addAudioDescriptionRequestedChangeListener(
+                mTargetContext.getMainExecutor(), listener);
+        assertTrue(
+                mAccessibilityManager.removeAudioDescriptionRequestedChangeListener(listener));
+        assertFalse(
+                mAccessibilityManager.removeAudioDescriptionRequestedChangeListener(listener));
+    }
+
+    @Test
     public void testIsTouchExplorationEnabled() throws Exception {
         mSpeakingAccessibilityServiceRule.enableService();
         mVibratingAccessibilityServiceRule.enableService();
@@ -153,6 +181,17 @@
     }
 
     @Test
+    public void testRemoveAccessibilityServicesStateChangeListener() throws Exception {
+        AccessibilityServicesStateChangeListener listener = (state) -> {
+            /* do nothing */
+        };
+        mAccessibilityManager.addAccessibilityServicesStateChangeListener(listener);
+
+        assertTrue(mAccessibilityManager.removeAccessibilityServicesStateChangeListener(listener));
+        assertFalse(mAccessibilityManager.removeAccessibilityServicesStateChangeListener(listener));
+    }
+
+    @Test
     public void testGetInstalledAccessibilityServicesList() throws Exception {
         List<AccessibilityServiceInfo> installedServices =
             mAccessibilityManager.getInstalledAccessibilityServiceList();
@@ -318,13 +357,13 @@
         mAccessibilityManager.addTouchExplorationStateChangeListener(listener);
         mSpeakingAccessibilityServiceRule.enableService();
         mVibratingAccessibilityServiceRule.enableService();
-        assertAtomicBooleanBecomes(atomicBoolean, true, waitObject,
-                "Touch exploration state listener not called when services enabled");
+        waitForAtomicBooleanBecomes(atomicBoolean, true, waitObject,
+                "Touch exploration state listener called when services enabled");
         assertTrue("Listener told that touch exploration is enabled, but manager says disabled",
                 mAccessibilityManager.isTouchExplorationEnabled());
         InstrumentedAccessibilityService.disableAllServices();
-        assertAtomicBooleanBecomes(atomicBoolean, false, waitObject,
-                "Touch exploration state listener not called when services disabled");
+        waitForAtomicBooleanBecomes(atomicBoolean, false, waitObject,
+                "Touch exploration state listener called when services disabled");
         assertFalse("Listener told that touch exploration is disabled, but manager says it enabled",
                 mAccessibilityManager.isTouchExplorationEnabled());
         mAccessibilityManager.removeTouchExplorationStateChangeListener(listener);
@@ -344,19 +383,63 @@
         mAccessibilityManager.addTouchExplorationStateChangeListener(listener, mHandler);
         mSpeakingAccessibilityServiceRule.enableService();
         mVibratingAccessibilityServiceRule.enableService();
-        assertAtomicBooleanBecomes(atomicBoolean, true, waitObject,
-                "Touch exploration state listener not called when services enabled");
+        waitForAtomicBooleanBecomes(atomicBoolean, true, waitObject,
+                "Touch exploration state listener called when services enabled");
         assertTrue("Listener told that touch exploration is enabled, but manager says disabled",
                 mAccessibilityManager.isTouchExplorationEnabled());
         InstrumentedAccessibilityService.disableAllServices();
-        assertAtomicBooleanBecomes(atomicBoolean, false, waitObject,
-                "Touch exploration state listener not called when services disabled");
+        waitForAtomicBooleanBecomes(atomicBoolean, false, waitObject,
+                "Touch exploration state listener called when services disabled");
         assertFalse("Listener told that touch exploration is disabled, but manager says it enabled",
                 mAccessibilityManager.isTouchExplorationEnabled());
         mAccessibilityManager.removeTouchExplorationStateChangeListener(listener);
     }
 
     @Test
+    public void testAccessibilityServicesStateListenerNoExecutor() {
+        final Object waitObject = new Object();
+        final AtomicBoolean serviceEnabled = new AtomicBoolean(false);
+        final UiAutomation automan = sInstrumentation.getUiAutomation(
+                UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
+        final AccessibilityServicesStateChangeListener listener = (AccessibilityManager manager) ->
+                checkServiceEnabled(waitObject, manager, serviceEnabled,
+                        VibratingAccessibilityService.class.getSimpleName());
+        try {
+            mAccessibilityManager.addAccessibilityServicesStateChangeListener(listener);
+
+            mVibratingAccessibilityServiceRule.enableService();
+
+            waitForAtomicBooleanBecomes(serviceEnabled, true, waitObject,
+                    "Accessibility services state listener called when service is enabled");
+        } finally {
+            automan.destroy();
+        }
+    }
+
+    @Test
+    public void testAccessibilityServicesStateListenerWithExecutor() {
+        final Object waitObject = new Object();
+        final AtomicBoolean serviceEnabled = new AtomicBoolean(false);
+        final UiAutomation automan = sInstrumentation.getUiAutomation(
+                UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
+        final AccessibilityServicesStateChangeListener listener = (AccessibilityManager manager) ->
+                checkServiceEnabled(waitObject, manager, serviceEnabled,
+                        VibratingAccessibilityService.class.getSimpleName());
+        try {
+            mAccessibilityManager.addAccessibilityServicesStateChangeListener(
+                    mTargetContext.getMainExecutor(), listener);
+
+            mVibratingAccessibilityServiceRule.enableService();
+
+            waitForAtomicBooleanBecomes(serviceEnabled, true, waitObject,
+                    "Accessibility services state listener called when service is enabled");
+        } finally {
+            automan.destroy();
+        }
+    }
+
+
+    @Test
     public void testAccessibilityStateListenerNoHandler() throws Exception {
         final Object waitObject = new Object();
         final AtomicBoolean atomicBoolean = new AtomicBoolean(false);
@@ -369,19 +452,83 @@
         };
         mAccessibilityManager.addAccessibilityStateChangeListener(listener);
         mSpeakingAndVibratingAccessibilityServiceRule.enableService();
-        assertAtomicBooleanBecomes(atomicBoolean, true, waitObject,
-                "Accessibility state listener not called when services enabled");
+        waitForAtomicBooleanBecomes(atomicBoolean, true, waitObject,
+                "Accessibility state listener called when services enabled");
         assertTrue("Listener told that accessibility is enabled, but manager says disabled",
                 mAccessibilityManager.isEnabled());
         InstrumentedAccessibilityService.disableAllServices();
-        assertAtomicBooleanBecomes(atomicBoolean, false, waitObject,
-                "Accessibility state listener not called when services disabled");
+        waitForAtomicBooleanBecomes(atomicBoolean, false, waitObject,
+                "Accessibility state listener called when services disabled");
         assertFalse("Listener told that accessibility is disabled, but manager says enabled",
                 mAccessibilityManager.isEnabled());
         mAccessibilityManager.removeAccessibilityStateChangeListener(listener);
     }
 
     @Test
+    public void testAudioDescriptionRequestedChangeListenerWithExecutor() {
+        final UiAutomation automan = sInstrumentation.getUiAutomation(
+                UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
+        final Object waitObject = new Object();
+        final AtomicBoolean atomicBoolean = new AtomicBoolean(false);
+
+        AudioDescriptionRequestedChangeListener listener = (boolean b) -> {
+            synchronized (waitObject) {
+                atomicBoolean.set(b);
+                waitObject.notifyAll();
+            }
+        };
+
+        try {
+            mAccessibilityManager.addAudioDescriptionRequestedChangeListener(
+                    mTargetContext.getMainExecutor(), listener);
+            putSecureSetting(automan, ENABLED_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT, "1");
+            waitForAtomicBooleanBecomes(atomicBoolean, true, waitObject,
+                    "Audio description state listener called when services enabled");
+            assertTrue("Listener told that audio description by default is request.",
+                    mAccessibilityManager.isAudioDescriptionRequested());
+
+            putSecureSetting(automan, ENABLED_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT, "0");
+            waitForAtomicBooleanBecomes(atomicBoolean, false, waitObject,
+                    "Audio description state listener called when services disabled");
+            assertFalse("Listener told that audio description by default is not request.",
+                    mAccessibilityManager.isAudioDescriptionRequested());
+            assertTrue(
+                    mAccessibilityManager.removeAudioDescriptionRequestedChangeListener(
+                            listener));
+        } finally {
+            automan.destroy();
+        }
+    }
+
+    @Test
+    public void testIsAudioDescriptionEnabled() throws Exception {
+        final UiAutomation automan = sInstrumentation.getUiAutomation(
+                UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
+
+        try {
+            putSecureSetting(automan, ENABLED_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT, "1");
+            PollingCheck.waitFor(new PollingCheck.PollingCheckCondition() {
+                @Override
+                public boolean canProceed() {
+                    return mAccessibilityManager.isAudioDescriptionRequested();
+                }
+            });
+            assertTrue(mAccessibilityManager.isAudioDescriptionRequested());
+
+            putSecureSetting(automan, ENABLED_ACCESSIBILITY_AUDIO_DESCRIPTION_BY_DEFAULT, "0");
+            PollingCheck.waitFor(new PollingCheck.PollingCheckCondition() {
+                @Override
+                public boolean canProceed() {
+                    return !mAccessibilityManager.isAudioDescriptionRequested();
+                }
+            });
+            assertFalse(mAccessibilityManager.isAudioDescriptionRequested());
+        } finally {
+            automan.destroy();
+        }
+    }
+
+    @Test
     public void testAccessibilityStateListenerWithHandler() throws Exception {
         final Object waitObject = new Object();
         final AtomicBoolean atomicBoolean = new AtomicBoolean(false);
@@ -394,13 +541,13 @@
         };
         mAccessibilityManager.addAccessibilityStateChangeListener(listener, mHandler);
         mSpeakingAndVibratingAccessibilityServiceRule.enableService();
-        assertAtomicBooleanBecomes(atomicBoolean, true, waitObject,
-                "Accessibility state listener not called when services enabled");
+        waitForAtomicBooleanBecomes(atomicBoolean, true, waitObject,
+                "Accessibility state listener called when services enabled");
         assertTrue("Listener told that accessibility is enabled, but manager says disabled",
                 mAccessibilityManager.isEnabled());
         InstrumentedAccessibilityService.disableAllServices();
-        assertAtomicBooleanBecomes(atomicBoolean, false, waitObject,
-                "Accessibility state listener not called when services disabled");
+        waitForAtomicBooleanBecomes(atomicBoolean, false, waitObject,
+                "Accessibility state listener called when services disabled");
         assertFalse("Listener told that accessibility is disabled, but manager says enabled",
                 mAccessibilityManager.isEnabled());
         mAccessibilityManager.removeAccessibilityStateChangeListener(listener);
@@ -437,18 +584,26 @@
         }
     }
 
-    private void assertAtomicBooleanBecomes(AtomicBoolean atomicBoolean,
-            boolean expectedValue, Object waitObject, String message)
-            throws Exception {
-        long timeoutTime =
-                System.currentTimeMillis() + TIMEOUT_SERVICE_ENABLE;
+    private void checkServiceEnabled(Object waitObject, AccessibilityManager manager,
+            AtomicBoolean serviceEnabled, String serviceName) {
         synchronized (waitObject) {
-            while ((atomicBoolean.get() != expectedValue)
-                    && (System.currentTimeMillis() < timeoutTime)) {
-                waitObject.wait(timeoutTime - System.currentTimeMillis());
+            List<AccessibilityServiceInfo> infos = manager.getEnabledAccessibilityServiceList(
+                    AccessibilityServiceInfo.FEEDBACK_ALL_MASK);
+            for (AccessibilityServiceInfo info : infos) {
+                final String serviceId = info.getId();
+                if (serviceId.endsWith(serviceName)) {
+                    serviceEnabled.set(true);
+                    waitObject.notifyAll();
+                }
             }
         }
-        assertTrue(message, atomicBoolean.get() == expectedValue);
+    }
+
+    private void waitForAtomicBooleanBecomes(AtomicBoolean atomicBoolean,
+            boolean expectedValue, Object waitObject, String condition) {
+        long timeoutTime = System.currentTimeMillis() + TIMEOUT_SERVICE_ENABLE;
+        TestUtils.waitOn(waitObject, () -> atomicBoolean.get() == expectedValue, timeoutTime,
+                condition);
     }
 
     private void waitForAccessibilityEnabled() throws InterruptedException {
diff --git a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java
index 3b56fb5..5f4d46e 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfoTest.java
@@ -18,7 +18,8 @@
 
 import static androidx.test.InstrumentationRegistry.getContext;
 
-import static org.junit.Assert.assertArrayEquals;
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
@@ -42,7 +43,6 @@
 import android.text.style.ReplacementSpan;
 import android.util.ArrayMap;
 import android.view.View;
-import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 import android.view.accessibility.AccessibilityNodeInfo.CollectionInfo;
@@ -113,33 +113,13 @@
     }
 
     /**
-     * Tests if {@link AccessibilityNodeInfo}s are properly reused.
-     */
-    @SmallTest
-    @Test
-    public void testReuse() {
-        AccessibilityEvent firstInfo = AccessibilityEvent.obtain();
-        firstInfo.recycle();
-        AccessibilityEvent secondInfo = AccessibilityEvent.obtain();
-        assertSame("AccessibilityNodeInfo not properly reused", firstInfo, secondInfo);
-    }
-
-    /**
-     * Tests if {@link AccessibilityNodeInfo} are properly recycled.
+     * Tests if {@link AccessibilityNodeInfo} can be acquired through obtain(),
+     * and that recycle() can be called on the returned object.
      */
     @SmallTest
     @Test
     public void testRecycle() {
-        // obtain and populate an node info
-        AccessibilityNodeInfo populatedInfo = AccessibilityNodeInfo.obtain();
-        fullyPopulateAccessibilityNodeInfo(populatedInfo);
-
-        // recycle and obtain the same recycled instance
-        populatedInfo.recycle();
-        AccessibilityNodeInfo recycledInfo = AccessibilityNodeInfo.obtain();
-
-        // check expectations
-        assertAccessibilityNodeInfoCleared(recycledInfo);
+        AccessibilityNodeInfo.obtain().recycle();
     }
 
     /**
@@ -328,6 +308,7 @@
         // Populate 10 fields
         info.setMovementGranularities(AccessibilityNodeInfo.MOVEMENT_GRANULARITY_LINE);
         info.setViewIdResourceName("foo.bar:id/baz");
+        info.setUniqueId("foo.bar:id/baz10");
         info.setDrawingOrder(5);
         info.setAvailableExtraData(
                 Arrays.asList(AccessibilityNodeInfo.EXTRA_DATA_TEXT_CHARACTER_LOCATION_KEY));
@@ -345,7 +326,8 @@
         info.setRangeInfo(RangeInfo.obtain(RangeInfo.RANGE_TYPE_FLOAT, 0.05f, 1.0f, 0.01f));
         info.setCollectionInfo(
                 CollectionInfo.obtain(2, 2, true, CollectionInfo.SELECTION_MODE_MULTIPLE));
-        info.setCollectionItemInfo(CollectionItemInfo.obtain(1, 2, 3, 4, true, true));
+        info.setCollectionItemInfo(CollectionItemInfo.obtain("RowTitle", 1, 2, "ColumnTitle",
+                3, 4, true, true));
         info.setParent(new View(getContext()));
         info.setSource(new View(getContext())); // Populates 2 fields: source and window id
         info.setLeashedParent(new MockBinder(), 1); // Populates 2 fields
@@ -383,10 +365,11 @@
         info.setImportantForAccessibility(true);
         info.setScreenReaderFocusable(true);
 
-        // 3 Boolean properties
+        // 4 Boolean properties
         info.setShowingHintText(true);
         info.setHeading(true);
         info.setTextEntryKey(true);
+        info.setTextSelectable(true);
     }
 
     /**
@@ -471,6 +454,8 @@
                 receivedInfo.getMovementGranularities());
         assertEquals("viewId has incorrect value", expectedInfo.getViewIdResourceName(),
                 receivedInfo.getViewIdResourceName());
+        assertEquals("Unique id has incorrect value", expectedInfo.getUniqueId(),
+            receivedInfo.getUniqueId());
         assertEquals("drawing order has incorrect value", expectedInfo.getDrawingOrder(),
                 receivedInfo.getDrawingOrder());
         assertEquals("Extra data flags have incorrect value", expectedInfo.getAvailableExtraData(),
@@ -544,6 +529,9 @@
             assertEquals("CollectionItemInfo#getRowSpan has incorrect value",
                     expectedItemInfo.getRowSpan(),
                     receivedItemInfo.getRowSpan());
+            assertThat(expectedItemInfo.getRowTitle()).isEqualTo(receivedItemInfo.getRowTitle());
+            assertThat(
+                    expectedItemInfo.getColumnTitle()).isEqualTo(receivedItemInfo.getColumnTitle());
         }
 
         // Check 1 field
@@ -620,6 +608,8 @@
                 expectedInfo.isHeading(), receivedInfo.isHeading());
         assertSame("isTextEntryKey has incorrect value",
                 expectedInfo.isTextEntryKey(), receivedInfo.isTextEntryKey());
+        assertSame("isTexSelectable has incorrect value",
+                expectedInfo.isTextSelectable(), receivedInfo.isTextSelectable());
     }
 
     /**
@@ -650,6 +640,7 @@
         assertSame("movementGranularities not properly recycled", 0,
                 info.getMovementGranularities());
         assertNull("viewId not properly recycled", info.getViewIdResourceName());
+        assertNull("Unique id not properly recycled", info.getUniqueId());
         assertEquals(0, info.getDrawingOrder());
         assertTrue(info.getAvailableExtraData().isEmpty());
         assertNull("Pane title not properly recycled", info.getPaneTitle());
@@ -711,6 +702,8 @@
         assertFalse("isShowingHint not properly reset", info.isShowingHintText());
         assertFalse("isHeading not properly reset", info.isHeading());
         assertFalse("isTextEntryKey not properly reset", info.isTextEntryKey());
+        assertFalse("isTextSelectable not properly reset", info.isTextSelectable());
+
     }
 
     private static class MockBinder extends Binder {
diff --git a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfo_CollectionItemInfoTest.java b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfo_CollectionItemInfoTest.java
index 9ffdb0d..e75a698 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfo_CollectionItemInfoTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityNodeInfo_CollectionItemInfoTest.java
@@ -16,6 +16,8 @@
 
 package android.view.accessibility.cts;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
@@ -50,11 +52,15 @@
 
         c = CollectionItemInfo.obtain(0, 1, 2, 3, true);
         assertNotNull(c);
-        verifyCollectionItemInfo(c, 0, 1, 2, 3, true, false);
+        verifyCollectionItemInfo(c, null, 0, 1, null, 2, 3, true, false);
 
         c = CollectionItemInfo.obtain(4, 5, 6, 7, true, true);
         assertNotNull(c);
-        verifyCollectionItemInfo(c, 4, 5, 6, 7, true, true);
+        verifyCollectionItemInfo(c, null, 4, 5, null, 6, 7, true, true);
+
+        c = CollectionItemInfo.obtain("RowTitle", 8, 9, "ColumnTitle", 10, 11, true, true);
+        assertNotNull(c);
+        verifyCollectionItemInfo(c, "RowTitle", 8, 9, "ColumnTitle", 10, 11, true, true);
     }
 
     @SmallTest
@@ -63,20 +69,34 @@
         CollectionItemInfo c;
 
         c = new CollectionItemInfo(0, 1, 2, 3, true);
-        verifyCollectionItemInfo(c, 0, 1, 2, 3, true, false);
+        verifyCollectionItemInfo(c, null, 0, 1, null, 2, 3, true, false);
 
         c = new CollectionItemInfo(4, 5, 6, 7, true, true);
-        verifyCollectionItemInfo(c, 4, 5, 6, 7, true, true);
+        verifyCollectionItemInfo(c, null, 4, 5, null, 6, 7, true, true);
+    }
+
+    @SmallTest
+    @Test
+    public void testBuilder() {
+        CollectionItemInfo.Builder builder = new CollectionItemInfo.Builder();
+
+        CollectionItemInfo collectionItemInfo = builder.setRowTitle("RowTitle").setRowIndex(
+                0).setRowSpan(1).setColumnTitle("ColumnTitle").setColumnIndex(2).setColumnSpan(
+                        3).setHeading(true).setSelected(true).build();
+        verifyCollectionItemInfo(collectionItemInfo, "RowTitle", 0, 1, "ColumnTitle", 2,
+                3, true, true);
     }
 
     /**
      * Verifies all properties of the <code>info</code> with input expected values.
      */
     public static void verifyCollectionItemInfo(AccessibilityNodeInfo.CollectionItemInfo info,
-            int rowIndex, int rowSpan, int columnIndex, int columnSpan, boolean heading,
-            boolean selected) {
+            String rowTitle, int rowIndex, int rowSpan, String columnTitle, int columnIndex,
+            int columnSpan, boolean heading, boolean selected) {
+        assertThat(rowTitle).isEqualTo(info.getRowTitle());
         assertEquals(rowIndex, info.getRowIndex());
         assertEquals(rowSpan, info.getRowSpan());
+        assertThat(columnTitle).isEqualTo(info.getColumnTitle());
         assertEquals(columnIndex, info.getColumnIndex());
         assertEquals(columnSpan, info.getColumnSpan());
         assertSame(heading, info.isHeading());
diff --git a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityRecordTest.java b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityRecordTest.java
index 08d6637..c3c5641 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityRecordTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityRecordTest.java
@@ -23,6 +23,7 @@
 import android.accessibility.cts.common.AccessibilityDumpOnFailureRule;
 import android.os.Message;
 import android.platform.test.annotations.Presubmit;
+import android.view.Display;
 import android.view.accessibility.AccessibilityRecord;
 
 import androidx.test.filters.SmallTest;
@@ -104,6 +105,8 @@
        TestCase.assertSame("scrollX not properly recycled", 0, record.getScrollX());
        TestCase.assertSame("scrollY not properly recycled", 0, record.getScrollY());
        TestCase.assertSame("toIndex not properly recycled", -1, record.getToIndex());
+       TestCase.assertSame("displayId not properly recycled", Display.INVALID_DISPLAY,
+               record.getDisplayId());
    }
 
     /**
@@ -132,6 +135,7 @@
         record.setScrollY(1);
         record.setToIndex(1);
         record.setScrollable(true);
+        record.setDisplayId(Display.DEFAULT_DISPLAY);
     }
 
     static void assertEqualAccessibilityRecord(AccessibilityRecord expectedRecord,
@@ -173,6 +177,8 @@
                 receivedRecord.getToIndex());
         assertSame("scrollable has incorrect value", expectedRecord.isScrollable(),
                 receivedRecord.isScrollable());
+        assertSame("displayId has incorrect value", expectedRecord.getDisplayId(),
+                receivedRecord.getDisplayId());
 
         assertFalse("one of the parcelableData is null",
                 expectedRecord.getParcelableData() == null
diff --git a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityServiceInfoTest.java b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityServiceInfoTest.java
index 6250d16..a57e42c 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/AccessibilityServiceInfoTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/AccessibilityServiceInfoTest.java
@@ -136,10 +136,13 @@
                 | AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION
                 | AccessibilityServiceInfo.CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT);
         assertEquals("foo.bar.Activity", speakingService.getSettingsActivityName());
+        assertEquals("foo.bar.TileService", speakingService.getTileServiceName());
         assertEquals(/* expected= */ "Some description",
                 speakingService.loadDescription(mPackageManager));
         assertEquals(/* expected= */ "Some summary",
                 speakingService.loadSummary(mPackageManager));
+        assertEquals(/* expected= */ "Some intro",
+                speakingService.loadIntro(mPackageManager));
         assertNotNull(speakingService.getResolveInfo());
         assertEquals(/* expected= */ 6000,
                 speakingService.getInteractiveUiTimeoutMillis());
diff --git a/tests/accessibility/src/android/view/accessibility/cts/CaptioningManagerTest.java b/tests/accessibility/src/android/view/accessibility/cts/CaptioningManagerTest.java
index c3054ef..89bc47c 100644
--- a/tests/accessibility/src/android/view/accessibility/cts/CaptioningManagerTest.java
+++ b/tests/accessibility/src/android/view/accessibility/cts/CaptioningManagerTest.java
@@ -22,6 +22,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.Matchers.anyFloat;
 import static org.mockito.Matchers.anyObject;
 import static org.mockito.Mockito.mock;
@@ -29,8 +30,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 
+import android.Manifest;
 import android.accessibility.cts.common.AccessibilityDumpOnFailureRule;
 import android.app.UiAutomation;
+import android.content.res.Resources;
 import android.os.ParcelFileDescriptor;
 import android.view.accessibility.CaptioningManager;
 import android.view.accessibility.CaptioningManager.CaptionStyle;
@@ -82,6 +85,10 @@
         putSecureSetting("accessibility_captioning_preset", "1");
         putSecureSetting("accessibility_captioning_locale", "en_US");
         putSecureSetting("accessibility_captioning_font_scale", "1.0");
+        // TODO (b209352162): We need to backup and restore the original values for
+        //  these two setting keys.
+        putSecureSetting("odi_captions_enabled", "0");
+        putSecureSetting("odi_captions_volume_ui_enabled", "0");
 
         CaptioningChangeListener mockListener = mock(CaptioningChangeListener.class);
         mManager.addCaptioningChangeListener(mockListener);
@@ -100,11 +107,19 @@
         putSecureSetting("accessibility_captioning_font_scale", "2.0");
         verify(mockListener, timeout(LISTENER_TIMEOUT)).onFontScaleChanged(anyFloat());
 
+        putSecureSetting("odi_captions_enabled", "1");
+        verify(mockListener, timeout(LISTENER_TIMEOUT)).onSystemAudioCaptioningChanged(true);
+
+        putSecureSetting("odi_captions_volume_ui_enabled", "1");
+        verify(mockListener, timeout(LISTENER_TIMEOUT)).onSystemAudioCaptioningUiChanged(true);
+
         mManager.removeCaptioningChangeListener(mockListener);
 
         Mockito.reset(mockListener);
 
         putSecureSetting("accessibility_captioning_enabled","0");
+        putSecureSetting("odi_captions_enabled", "0");
+        putSecureSetting("odi_captions_volume_ui_enabled", "0");
         verifyZeroInteractions(mockListener);
 
         try {
@@ -145,6 +160,58 @@
         assertNull("Default user style has no typeface", userStyle.getTypeface());
     }
 
+    @Test
+    public void testIsCallCaptioningEnabled() {
+        Resources resources =
+                getInstrumentation().getTargetContext().getResources();
+        // com.android.internal.R is not visible to this test so we need
+        // to query for the resource id.
+        int resourceId = resources.getIdentifier(
+                "config_systemCaptionsServiceCallsEnabled", "bool", "android");
+
+        boolean expected = false;
+
+        try {
+            expected = resources.getBoolean(resourceId);
+        } catch (Resources.NotFoundException e) {
+            // If the resource isn't defined then the return value should be false
+        }
+
+        boolean actual = mManager.isCallCaptioningEnabled();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test(expected = SecurityException.class)
+    public void testSetSystemAudioCaptionWithoutPermission_throwSecurityException() {
+        mManager.setSystemAudioCaptioningEnabled(true);
+    }
+
+    @Test(expected = SecurityException.class)
+    public void testSetSystemAudioCaptionUiWithoutPermission_throwSecurityException() {
+        mManager.setSystemAudioCaptioningUiEnabled(true);
+    }
+
+    @Test
+    public void testSystemAudioCaption() {
+        putSecureSetting("odi_captions_enabled", "0");
+        putSecureSetting("odi_captions_volume_ui_enabled", "0");
+        mUiAutomation.adoptShellPermissionIdentity(Manifest.permission.SET_SYSTEM_AUDIO_CAPTION);
+        try {
+            mManager.setSystemAudioCaptioningEnabled(true);
+            assertTrue("Test runner set system audio caption enabled to true",
+                    mManager.isSystemAudioCaptioningEnabled());
+
+            mManager.setSystemAudioCaptioningUiEnabled(true);
+            assertTrue("Test runner set system audio caption ui enabled to true",
+                    mManager.isSystemAudioCaptioningUiEnabled());
+        } finally {
+            mUiAutomation.dropShellPermissionIdentity();
+            putSecureSetting("odi_captions_enabled", "0");
+            putSecureSetting("odi_captions_volume_ui_enabled", "0");
+        }
+    }
+
     private void deleteSecureSetting(String name) {
         execShellCommand("settings delete secure " + name);
     }
diff --git a/tests/accessibilityservice/AndroidManifest.xml b/tests/accessibilityservice/AndroidManifest.xml
index 84981cd..3bde0fd 100644
--- a/tests/accessibilityservice/AndroidManifest.xml
+++ b/tests/accessibilityservice/AndroidManifest.xml
@@ -25,6 +25,7 @@
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
     <uses-permission android:name="android.permission.USE_FINGERPRINT"/>
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application android:theme="@android:style/Theme.Holo.NoActionBar"
          android:requestLegacyExternalStorage="true">
@@ -57,6 +58,11 @@
              android:supportsPictureInPicture="true"
              android:screenOrientation="locked"/>
 
+        <activity android:label="Activity for testing window accessibility reporting"
+                  android:name=".activities.NotTouchableWindowTestActivity"
+                  android:process=":NotTouchableWindowTestActivity"
+                  android:exported="true"/>
+
         <activity android:label="@string/non_default_display_activity"
                   android:name=".activities.NonDefaultDisplayActivity"
                   android:screenOrientation="locked"/>
@@ -77,6 +83,9 @@
         <activity android:label="@string/accessibility_drag_and_drop_test_activity"
                   android:name=".activities.AccessibilityDragAndDropActivity"
                   android:screenOrientation="locked"/>
+        <activity android:label="@string/accessibility_cache_activity"
+                  android:name=".activities.AccessibilityCacheActivity"
+                  android:screenOrientation="locked"/>
 
         <service android:name=".StubSystemActionsAccessibilityService"
              android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
@@ -194,6 +203,53 @@
             <meta-data android:name="android.accessibilityservice"
                        android:resource="@xml/stub_focus_indicator_service"/>
         </service>
+
+        <service android:name=".StubInputMethod"
+            android:label="@string/ime_name"
+            android:permission="android.permission.BIND_INPUT_METHOD"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.view.InputMethod"/>
+            </intent-filter>
+            <meta-data android:name="android.view.im"
+                android:resource="@xml/stub_ime"/>
+        </service>
+
+        <service android:name=".StubSimpleImeAccessibilityService"
+                 android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+                 android:exported="true">
+            <intent-filter>
+                <action android:name="android.accessibilityservice.AccessibilityService"/>
+                <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
+            </intent-filter>
+
+            <meta-data android:name="android.accessibilityservice"
+                       android:resource="@xml/stub_simple_ime_accessibility_service"/>
+        </service>
+
+        <service android:name=".StubImeAccessibilityService"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.accessibilityservice.AccessibilityService"/>
+                <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
+            </intent-filter>
+
+            <meta-data android:name="android.accessibilityservice"
+                android:resource="@xml/stub_ime_accessibility_service"/>
+        </service>
+
+        <service android:name=".StubNonImeAccessibilityService"
+            android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.accessibilityservice.AccessibilityService"/>
+                <category android:name="android.accessibilityservice.category.FEEDBACK_GENERIC"/>
+            </intent-filter>
+
+            <meta-data android:name="android.accessibilityservice"
+                android:resource="@xml/stub_non_ime_accessibility_service"/>
+        </service>
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
diff --git a/tests/accessibilityservice/res/layout/accessibility_cache.xml b/tests/accessibilityservice/res/layout/accessibility_cache.xml
new file mode 100644
index 0000000..0a7839c
--- /dev/null
+++ b/tests/accessibilityservice/res/layout/accessibility_cache.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:orientation="horizontal">
+        <TextView
+            android:text="textView"
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_margin="60dp"/>
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="child layout"
+
+            android:gravity="center"
+            android:orientation="horizontal">
+            <TextView
+                android:id="@+id/text"
+                android:text="textView2"
+                android:layout_width="60dp"
+                android:layout_height="60dp"
+                android:layout_margin="60dp"/>
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/tests/accessibilityservice/res/layout/accessibility_text_traversal_test.xml b/tests/accessibilityservice/res/layout/accessibility_text_traversal_test.xml
index c41c1fd..5bdf3b2 100644
--- a/tests/accessibilityservice/res/layout/accessibility_text_traversal_test.xml
+++ b/tests/accessibilityservice/res/layout/accessibility_text_traversal_test.xml
@@ -65,4 +65,13 @@
         android:layout_height="wrap_content"
     />
 
+    <TextView
+        android:id="@+id/selectableText"
+        android:textIsSelectable="true"
+        android:text="selectable text"
+        android:singleLine="true"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+    />
+
 </LinearLayout>
diff --git a/tests/accessibilityservice/res/values/strings.xml b/tests/accessibilityservice/res/values/strings.xml
index 3d3b6be..014b9a7 100644
--- a/tests/accessibilityservice/res/values/strings.xml
+++ b/tests/accessibilityservice/res/values/strings.xml
@@ -190,6 +190,12 @@
 
     <string name="stub_focus_indicator_service_description">com.android.accessibilityservice.cts.StubFocusIndicatorService</string>
 
+    <string name="stub_simple_ime_accessibility_service_description">com.android.accessibilityservice.cts.StubSimpleImeAccessibilityService</string>
+
+    <string name="stub_ime_accessibility_service_description">com.android.accessibilityservice.cts.StubImeAccessibilityService</string>
+
+    <string name="stub_non_ime_accessibility_service_description">com.android.accessibilityservice.cts.StubNonImeAccessibilityService</string>
+
     <!-- AccessibilityWindowQueryTest and AccessibilityReportingTest -->
 
     <!-- String title of embedded display activity -->
@@ -199,4 +205,8 @@
     <string name="accessibility_drag_and_drop_test_activity">Drag and drop</string>
     <string name="drag_and_drop_text">Dragged text</string>
 
+    <!-- String label of the input method -->
+    <string name="ime_name">InputMethod</string>
+
+    <string name="accessibility_cache_activity">Cache activity</string>
 </resources>
diff --git a/tests/accessibilityservice/res/xml/stub_ime.xml b/tests/accessibilityservice/res/xml/stub_ime.xml
new file mode 100644
index 0000000..9810de4
--- /dev/null
+++ b/tests/accessibilityservice/res/xml/stub_ime.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Copyright (C) 2021 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.
+-->
+
+<input-method xmlns:android="http://schemas.android.com/apk/res/android"
+    android:supportsSwitchingToNextInputMethod="true">
+    <subtype
+        android:imeSubtypeMode="keyboard"
+        android:isAsciiCapable="true"
+        android:overridesImplicitlyEnabledSubtype="true"
+        />
+    <subtype
+        android:imeSubtypeLocale="en_US"
+        android:imeSubtypeMode="keyboard"
+        android:isAsciiCapable="true"
+        />
+    <subtype
+        android:imeSubtypeLocale="ru_RU"
+        android:imeSubtypeMode="keyboard"
+        android:isAsciiCapable="false"
+        />
+</input-method>
\ No newline at end of file
diff --git a/tests/accessibilityservice/res/xml/stub_ime_accessibility_service.xml b/tests/accessibilityservice/res/xml/stub_ime_accessibility_service.xml
new file mode 100644
index 0000000..17a1aeb
--- /dev/null
+++ b/tests/accessibilityservice/res/xml/stub_ime_accessibility_service.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
+    android:description="@string/stub_ime_accessibility_service_description"
+    android:accessibilityEventTypes="typeAllMask"
+    android:accessibilityFeedbackType="feedbackGeneric"
+    android:accessibilityFlags="flagInputMethodEditor"
+    android:notificationTimeout="0" />
diff --git a/tests/accessibilityservice/res/xml/stub_non_ime_accessibility_service.xml b/tests/accessibilityservice/res/xml/stub_non_ime_accessibility_service.xml
new file mode 100644
index 0000000..35d7fb4
--- /dev/null
+++ b/tests/accessibilityservice/res/xml/stub_non_ime_accessibility_service.xml
@@ -0,0 +1,21 @@
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
+    android:description="@string/stub_non_ime_accessibility_service_description"
+    android:accessibilityEventTypes="typeAllMask"
+    android:accessibilityFeedbackType="feedbackGeneric"
+    android:notificationTimeout="0" />
diff --git a/tests/accessibilityservice/res/xml/stub_simple_ime_accessibility_service.xml b/tests/accessibilityservice/res/xml/stub_simple_ime_accessibility_service.xml
new file mode 100644
index 0000000..1d5c350
--- /dev/null
+++ b/tests/accessibilityservice/res/xml/stub_simple_ime_accessibility_service.xml
@@ -0,0 +1,22 @@
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<accessibility-service xmlns:android="http://schemas.android.com/apk/res/android"
+                       android:description="@string/stub_simple_ime_accessibility_service_description"
+                       android:accessibilityEventTypes="typeAllMask"
+                       android:accessibilityFeedbackType="feedbackGeneric"
+                       android:accessibilityFlags="flagInputMethodEditor"
+                       android:notificationTimeout="0" />
diff --git a/tests/accessibilityservice/res/xml/stub_touch_exploration_a11y_service.xml b/tests/accessibilityservice/res/xml/stub_touch_exploration_a11y_service.xml
index 5797079..c12f8c7 100644
--- a/tests/accessibilityservice/res/xml/stub_touch_exploration_a11y_service.xml
+++ b/tests/accessibilityservice/res/xml/stub_touch_exploration_a11y_service.xml
@@ -20,7 +20,7 @@
         android:description="@string/stub_touch_exploration_a11y_service_description"
         android:accessibilityEventTypes="typeAllMask"
         android:accessibilityFeedbackType="feedbackGeneric"
-        android:accessibilityFlags="flagDefault|flagRequestTouchExplorationMode|flagReportViewIds|flagSendMotionEvents"
+        android:accessibilityFlags="flagDefault|flagRequestTouchExplorationMode|flagReportViewIds|flagSendMotionEvents|flagRetrieveInteractiveWindows"
         android:canRequestTouchExplorationMode="true"
         android:canRetrieveWindowContent="true"
         android:canPerformGestures="true" />
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityCacheTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityCacheTest.java
new file mode 100644
index 0000000..89a874e
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityCacheTest.java
@@ -0,0 +1,309 @@
+/*
+ * Copyright (C) 2021 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 android.accessibilityservice.cts;
+
+import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityAndWaitForItToBeOnscreen;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+import android.accessibility.cts.common.AccessibilityDumpOnFailureRule;
+import android.accessibility.cts.common.InstrumentedAccessibilityService;
+import android.accessibility.cts.common.InstrumentedAccessibilityServiceTestRule;
+import android.accessibilityservice.AccessibilityServiceInfo;
+import android.accessibilityservice.cts.activities.AccessibilityCacheActivity;
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.platform.test.annotations.AppModeFull;
+import android.text.TextUtils;
+import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityWindowInfo;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+@AppModeFull
+@RunWith(AndroidJUnit4.class)
+public class AccessibilityCacheTest {
+    private static Instrumentation sInstrumentation;
+    private static UiAutomation sUiAutomation;
+
+    private InstrumentedAccessibilityService mService;
+    private AccessibilityCacheActivity mActivity;
+
+    private AccessibilityDumpOnFailureRule mDumpOnFailureRule =
+            new AccessibilityDumpOnFailureRule();
+
+    private final ActivityTestRule<AccessibilityCacheActivity> mActivityRule =
+            new ActivityTestRule<>(AccessibilityCacheActivity.class, false, false);
+
+    private InstrumentedAccessibilityServiceTestRule<InstrumentedAccessibilityService>
+            mInstrumentedAccessibilityServiceRule = new InstrumentedAccessibilityServiceTestRule<>(
+            InstrumentedAccessibilityService.class, false);
+
+    @Rule
+    public final RuleChain mRuleChain = RuleChain
+            .outerRule(mActivityRule)
+            .around(mInstrumentedAccessibilityServiceRule)
+            .around(mDumpOnFailureRule);
+
+    @BeforeClass
+    public static void oneTimeSetup() throws Exception {
+        sInstrumentation = InstrumentationRegistry.getInstrumentation();
+        sUiAutomation = sInstrumentation.getUiAutomation();
+    }
+
+    @AfterClass
+    public static void postTestTearDown() {
+        sUiAutomation.destroy();
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        mService = mInstrumentedAccessibilityServiceRule.enableService();
+        AccessibilityServiceInfo info = mService.getServiceInfo();
+        info.flags &= ~AccessibilityServiceInfo.FLAG_INCLUDE_NOT_IMPORTANT_VIEWS;
+        mService.setServiceInfo(info);
+        mActivity = launchActivityAndWaitForItToBeOnscreen(
+                sInstrumentation, sUiAutomation, mActivityRule);
+    }
+
+    @Test
+    public void enable_cacheEnabled() {
+        assertTrue(mService.setCacheEnabled(false));
+        assertFalse("Failed to disable", mService.isCacheEnabled());
+
+        assertTrue(mService.setCacheEnabled(true));
+        assertTrue("Failed to enable", mService.isCacheEnabled());
+    }
+
+    @Test
+    public void disable_cacheDisabled() {
+        assertTrue(mService.setCacheEnabled(false));
+        assertFalse("Failed to disable", mService.isCacheEnabled());
+    }
+
+    @Test
+    public void queryNode_nodeIsInCache() {
+        AccessibilityNodeInfo info = mService.getRootInActiveWindow();
+        assertTrue("Node is not in cache", mService.isNodeInCache(info));
+    }
+
+    @Test
+    public void invalidateNode_nodeInCacheInvalidated() {
+        AccessibilityNodeInfo info = mService.getRootInActiveWindow();
+        assertTrue(mService.clearCachedSubtree(info));
+        assertFalse("Node is still in cache", mService.isNodeInCache(info));
+    }
+
+    @Test
+    public void invalidateNode_subtreeInCacheInvalidated() {
+        // Tree is FrameLayout with TextView and LinearLayout children.
+        // The LinearLayout has a TextView child.
+        AccessibilityNodeInfo root = mService.getRootInActiveWindow();
+        assertThat(root.getChildCount(), is(2));
+        AccessibilityNodeInfo child0 = root.getChild(0);
+        AccessibilityNodeInfo child1 = root.getChild(1);
+        AccessibilityNodeInfo grandChild = child1.getChild(0);
+
+        assertTrue(mService.clearCachedSubtree(root));
+
+        assertFalse("Root is in cache", mService.isNodeInCache(root));
+        assertFalse("Child0 is in cache", mService.isNodeInCache(child0));
+        assertFalse("Child1 is in cache", mService.isNodeInCache(child1));
+        assertFalse("Grandchild is in cache", mService.isNodeInCache(grandChild));
+    }
+
+    @Test
+    public void clear_cacheInvalidated() {
+        // Tree is FrameLayout with TextView and LinearLayout children.
+        // The LinearLayout has a TextView child.
+        AccessibilityNodeInfo root = mService.getRootInActiveWindow();
+        assertThat(root.getChildCount(), is(2));
+        AccessibilityNodeInfo child0 = root.getChild(0);
+        AccessibilityNodeInfo child1 = root.getChild(1);
+        AccessibilityNodeInfo grandChild = child1.getChild(0);
+
+        assertTrue(mService.clearCache());
+
+        assertFalse("Root is in cache", mService.isNodeInCache(root));
+        assertFalse("Child0 is in cache", mService.isNodeInCache(child0));
+        assertFalse("Child1 is in cache", mService.isNodeInCache(child1));
+        assertFalse("Grandchild is in cache", mService.isNodeInCache(grandChild));
+    }
+
+    @Test
+    public void getChild_descendantNotPrefetched() {
+        // Tree is FrameLayout with TextView and LinearLayout children.
+        // The LinearLayout has a TextView child.
+        AccessibilityNodeInfo frameRoot = mService.getRootInActiveWindow();
+        assertThat(frameRoot.getChildCount(), is(2));
+        AccessibilityNodeInfo textViewChild = frameRoot.getChild(0);
+        AccessibilityNodeInfo linearLayoutChild = frameRoot.getChild(1);
+        AccessibilityNodeInfo frameGrandChild = linearLayoutChild.getChild(0);
+
+        // Clear cache.
+        assertTrue(mService.clearCachedSubtree(frameRoot));
+        frameRoot.getChild(1, AccessibilityNodeInfo.FLAG_PREFETCH_SIBLINGS
+                | AccessibilityNodeInfo.FLAG_PREFETCH_UNINTERRUPTIBLE);
+        assertTrue("Root is not in cache", mService.isNodeInCache(frameRoot));
+        assertTrue("TextView is not in cache", mService.isNodeInCache(textViewChild));
+        assertTrue("LinearLayout is not in cache", mService.isNodeInCache(linearLayoutChild));
+        // No descendant prefetching
+        assertFalse("Root grandchild is in cache", mService.isNodeInCache(frameGrandChild));
+    }
+
+    @Test
+    public void getChild_descendantPrefetched() {
+        // Tree is FrameLayout with TextView and LinearLayout children.
+        // The LinearLayout has a TextView child.
+        AccessibilityNodeInfo frameRoot = mService.getRootInActiveWindow();
+        assertThat(frameRoot.getChildCount(), is(2));
+        AccessibilityNodeInfo textViewChild = frameRoot.getChild(0);
+        AccessibilityNodeInfo linearLayoutChild = frameRoot.getChild(1);
+        AccessibilityNodeInfo frameGrandChild = linearLayoutChild.getChild(0);
+
+        // Clear cache.
+        assertTrue(mService.clearCachedSubtree(frameRoot));
+
+        frameRoot.getChild(1, AccessibilityNodeInfo.FLAG_PREFETCH_DESCENDANTS_DEPTH_FIRST
+                | AccessibilityNodeInfo.FLAG_PREFETCH_UNINTERRUPTIBLE);
+
+        assertFalse("Root is in cache", mService.isNodeInCache(frameRoot));
+        assertFalse("TextView is in cache", mService.isNodeInCache(textViewChild));
+        assertTrue("LinearLayout is not in cache", mService.isNodeInCache(linearLayoutChild));
+        // Descendant prefetching
+        assertTrue("Root grandchild is not in cache", mService.isNodeInCache(frameGrandChild));
+    }
+
+    @Test
+    public void getParent_ancestorsPrefetched() {
+        // Tree is FrameLayout with TextView and LinearLayout children.
+        // The LinearLayout has a TextView child.
+        AccessibilityNodeInfo frameRoot = mService.getRootInActiveWindow();
+        assertThat(frameRoot.getChildCount(), is(2));
+        AccessibilityNodeInfo textViewChild = frameRoot.getChild(0);
+        AccessibilityNodeInfo linearLayoutChild = frameRoot.getChild(1);
+        AccessibilityNodeInfo frameGrandChild = linearLayoutChild.getChild(0);
+
+        // Clear cache.
+        assertTrue(mService.clearCachedSubtree(frameRoot));
+
+        frameGrandChild.getParent(AccessibilityNodeInfo.FLAG_PREFETCH_ANCESTORS
+                | AccessibilityNodeInfo.FLAG_PREFETCH_UNINTERRUPTIBLE);
+
+        assertTrue("Root is not in cache", mService.isNodeInCache(frameRoot));
+        assertFalse("TextView is in cache", mService.isNodeInCache(textViewChild));
+        assertTrue("linearLayout is not in cache", mService.isNodeInCache(linearLayoutChild));
+        // Grandchild itself isn't in the cache
+        assertFalse("root grandchild is in cache", mService.isNodeInCache(frameGrandChild));
+    }
+
+    /**
+     * Tests a request that prefetches descendants with multiple strategies. This throws an
+     * exception.
+     */
+    @Test
+    public void testRequest_withMultiplePrefetchingStrategies_throwsException() {
+        // Tree is FrameLayout with TextView and LinearLayout children.
+        // The LinearLayout has a TextView child.
+        AccessibilityNodeInfo root = mService.getRootInActiveWindow();
+        assertThat(root.getChildCount(), is(2));
+
+        // Clear cache.
+        mService.clearCachedSubtree(root);
+
+        assertThrows(IllegalArgumentException.class, () -> {
+            root.getChild(0,
+                    AccessibilityNodeInfo.FLAG_PREFETCH_DESCENDANTS_BREADTH_FIRST
+                            | AccessibilityNodeInfo.FLAG_PREFETCH_DESCENDANTS_HYBRID);
+        });
+    }
+
+    @Test
+    public void testRequest_prefetchWithA11yWindowInfo() {
+        List<AccessibilityWindowInfo> windows = mService.getWindows();
+        AccessibilityWindowInfo activityWindowInfo = null;
+        for (AccessibilityWindowInfo window : windows) {
+            if (window.getTitle() != null
+                    && TextUtils.equals(window.getTitle(), mActivity.getTitle())) {
+                activityWindowInfo = window;
+            }
+        }
+
+        assertNotNull(activityWindowInfo);
+        AccessibilityNodeInfo windowRoot = activityWindowInfo.getRoot();
+
+        assertThat(windowRoot.getChildCount(), is(2));
+        AccessibilityNodeInfo textViewChild = windowRoot.getChild(0);
+        AccessibilityNodeInfo linearLayoutChild = windowRoot.getChild(1);
+        AccessibilityNodeInfo frameGrandChild = linearLayoutChild.getChild(0);
+
+        // Clear cache.
+        assertTrue(mService.clearCachedSubtree(windowRoot));
+
+        AccessibilityNodeInfo windowRoot2 = activityWindowInfo.getRoot(
+                AccessibilityNodeInfo.FLAG_PREFETCH_SIBLINGS
+                        | AccessibilityNodeInfo.FLAG_PREFETCH_UNINTERRUPTIBLE);
+        // Confirm roots are the same.
+        assertEquals(windowRoot, windowRoot2);
+        assertFalse("Root is in cache", mService.isNodeInCache(windowRoot));
+        assertFalse("TextView is in cache", mService.isNodeInCache(textViewChild));
+        assertFalse("LinearLayout is in cache", mService.isNodeInCache(linearLayoutChild));
+        assertFalse("Root grandchild is in cache", mService.isNodeInCache(frameGrandChild));
+    }
+
+    @Test
+    public void testRequest_prefetchWithRootInActiveWindow() {
+        // Tree is FrameLayout with TextView and LinearLayout children.
+        // The LinearLayout has a TextView child.
+        AccessibilityNodeInfo frameRoot = mService.getRootInActiveWindow();
+        assertThat(frameRoot.getChildCount(), is(2));
+        AccessibilityNodeInfo textViewChild = frameRoot.getChild(0);
+        AccessibilityNodeInfo linearLayoutChild = frameRoot.getChild(1);
+        AccessibilityNodeInfo frameGrandChild = linearLayoutChild.getChild(0);
+
+        // Clear cache.
+        assertTrue(mService.clearCachedSubtree(frameRoot));
+
+        AccessibilityNodeInfo frameRoot2 = mService.getRootInActiveWindow(
+                AccessibilityNodeInfo.FLAG_PREFETCH_SIBLINGS
+                        | AccessibilityNodeInfo.FLAG_PREFETCH_UNINTERRUPTIBLE);
+        // Confirm roots are the same.
+        assertEquals(frameRoot, frameRoot2);
+        assertTrue("Root is in cache", mService.isNodeInCache(frameRoot2));
+        assertFalse("TextView is in cache", mService.isNodeInCache(textViewChild));
+        assertFalse("LinearLayout is in cache", mService.isNodeInCache(linearLayoutChild));
+        assertFalse("Root grandchild is in cache", mService.isNodeInCache(frameGrandChild));
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java
index 1b003e3..5f9733c 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityEndToEndTest.java
@@ -16,6 +16,7 @@
 
 package android.accessibilityservice.cts;
 
+import static android.Manifest.permission.POST_NOTIFICATIONS;
 import static android.accessibility.cts.common.InstrumentedAccessibilityService.enableService;
 import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterForEventType;
 import static android.accessibilityservice.cts.utils.AccessibilityEventFilterUtils.filterForEventTypeWithAction;
@@ -99,6 +100,7 @@
 
 import com.android.compatibility.common.util.CtsMouseUtil;
 
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -159,10 +161,16 @@
 
     @Before
     public void setUp() throws Exception {
+        sUiAutomation.adoptShellPermissionIdentity(POST_NOTIFICATIONS);
         mActivity = launchActivityAndWaitForItToBeOnscreen(
                 sInstrumentation, sUiAutomation, mActivityRule);
     }
 
+    @After
+    public void tearDown() throws Exception {
+        sUiAutomation.dropShellPermissionIdentity();
+    }
+
     @MediumTest
     @Presubmit
     @Test
@@ -172,6 +180,7 @@
         expected.setEventType(AccessibilityEvent.TYPE_VIEW_SELECTED);
         expected.setClassName(ListView.class.getName());
         expected.setPackageName(mActivity.getPackageName());
+        expected.setDisplayId(mActivity.getDisplayId());
         expected.getText().add(mActivity.getString(R.string.second_list_item));
         expected.setItemCount(2);
         expected.setCurrentItemIndex(1);
@@ -215,6 +224,7 @@
         expected.setEventType(AccessibilityEvent.TYPE_VIEW_CLICKED);
         expected.setClassName(Button.class.getName());
         expected.setPackageName(mActivity.getPackageName());
+        expected.setDisplayId(mActivity.getDisplayId());
         expected.getText().add(mActivity.getString(R.string.button_title));
         expected.setEnabled(true);
 
@@ -253,6 +263,7 @@
         expected.setEventType(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED);
         expected.setClassName(Button.class.getName());
         expected.setPackageName(mActivity.getPackageName());
+        expected.setDisplayId(mActivity.getDisplayId());
         expected.getText().add(mActivity.getString(R.string.button_title));
         expected.setEnabled(true);
 
@@ -291,6 +302,7 @@
         expected.setEventType(AccessibilityEvent.TYPE_VIEW_FOCUSED);
         expected.setClassName(Button.class.getName());
         expected.setPackageName(mActivity.getPackageName());
+        expected.setDisplayId(mActivity.getDisplayId());
         expected.getText().add(mActivity.getString(R.string.button_title));
         expected.setItemCount(5);
         expected.setCurrentItemIndex(3);
@@ -345,6 +357,7 @@
         expected.setEventType(AccessibilityEvent.TYPE_VIEW_TEXT_CHANGED);
         expected.setClassName(EditText.class.getName());
         expected.setPackageName(mActivity.getPackageName());
+        expected.setDisplayId(mActivity.getDisplayId());
         expected.getText().add(afterText);
         expected.setBeforeText(beforeText);
         expected.setFromIndex(3);
@@ -385,6 +398,7 @@
         expected.setEventType(AccessibilityEvent.TYPE_WINDOW_STATE_CHANGED);
         expected.setClassName(AlertDialog.class.getName());
         expected.setPackageName(mActivity.getPackageName());
+        expected.setDisplayId(mActivity.getDisplayId());
         expected.getText().add(mActivity.getString(R.string.alert_title));
         expected.getText().add(mActivity.getString(R.string.alert_message));
         expected.setEnabled(true);
@@ -415,6 +429,25 @@
     }
 
     @MediumTest
+    @Presubmit
+    @Test
+    public void testTypeWindowsChangedAccessibilityEvent() throws Throwable {
+        // create and populate the expected event
+        final AccessibilityEvent expected = AccessibilityEvent.obtain();
+        expected.setEventType(AccessibilityEvent.TYPE_WINDOWS_CHANGED);
+        expected.setDisplayId(mActivity.getDisplayId());
+
+        // check the received event
+        AccessibilityEvent awaitedEvent =
+            sUiAutomation.executeAndWaitForEvent(
+                    () -> mActivity.runOnUiThread(() -> mActivity.finish()),
+                    event -> event.getWindowChanges() == AccessibilityEvent.WINDOWS_CHANGE_REMOVED
+                            && equalsAccessiblityEvent(event, expected),
+                    DEFAULT_TIMEOUT_MS);
+        assertNotNull("Did not receive expected event: " + expected, awaitedEvent);
+    }
+
+    @MediumTest
     @AppModeFull
     @SuppressWarnings("deprecation")
     @Presubmit
@@ -1108,6 +1141,7 @@
             && first.getScrollX() == second.getScrollX()
             && first.getScrollY() == second.getScrollY()
             && first.getAddedCount() == second.getAddedCount()
+            && first.getDisplayId() == second.getDisplayId()
             && TextUtils.equals(first.getBeforeText(), second.getBeforeText())
             && TextUtils.equals(first.getClassName(), second.getClassName())
             && TextUtils.equals(first.getContentDescription(), second.getContentDescription())
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGlobalActionsTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGlobalActionsTest.java
index 25f4853..bab2bd2 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGlobalActionsTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityGlobalActionsTest.java
@@ -31,8 +31,8 @@
 import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.Presubmit;
 
-import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
@@ -177,6 +177,61 @@
         execShellCommand(sUiAutomation, AM_BROADCAST_CLOSE_SYSTEM_DIALOG_COMMAND);
     }
 
+    @MediumTest
+    @Test
+    public void testPerformGlobalActionDpadUp() throws Exception {
+        // Check whether the action succeeded.
+        assertTrue(sUiAutomation.performGlobalAction(
+                AccessibilityService.GLOBAL_ACTION_DPAD_UP));
+
+        // Sleep a bit so the UI is settled.
+        waitForIdle();
+    }
+
+    @MediumTest
+    @Test
+    public void testPerformGlobalActionDpadDown() throws Exception {
+        // Check whether the action succeeded.
+        assertTrue(sUiAutomation.performGlobalAction(
+                AccessibilityService.GLOBAL_ACTION_DPAD_DOWN));
+
+        // Sleep a bit so the UI is settled.
+        waitForIdle();
+    }
+
+    @MediumTest
+    @Test
+    public void testPerformGlobalActionDpadLeft() throws Exception {
+        // Check whether the action succeeded.
+        assertTrue(sUiAutomation.performGlobalAction(
+                AccessibilityService.GLOBAL_ACTION_DPAD_LEFT));
+
+        // Sleep a bit so the UI is settled.
+        waitForIdle();
+    }
+
+    @MediumTest
+    @Test
+    public void testPerformGlobalActionDpadRight() throws Exception {
+        // Check whether the action succeeded.
+        assertTrue(sUiAutomation.performGlobalAction(
+                AccessibilityService.GLOBAL_ACTION_DPAD_RIGHT));
+
+        // Sleep a bit so the UI is settled.
+        waitForIdle();
+    }
+
+    @MediumTest
+    @Test
+    public void testPerformGlobalActionDpadCenter() throws Exception {
+        // Check whether the action succeeded.
+        assertTrue(sUiAutomation.performGlobalAction(
+                AccessibilityService.GLOBAL_ACTION_DPAD_CENTER));
+
+        // Sleep a bit so the UI is settled.
+        waitForIdle();
+    }
+
     private void waitForIdle() throws TimeoutException {
         sUiAutomation.waitForIdle(TIMEOUT_ACCESSIBILITY_STATE_IDLE, TIMEOUT_ASYNC_PROCESSING);
     }
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityImeTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityImeTest.java
new file mode 100644
index 0000000..e9fb255
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityImeTest.java
@@ -0,0 +1,284 @@
+/*
+ * Copyright (C) 2022 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 android.accessibilityservice.cts;
+
+import static android.accessibility.cts.common.InstrumentedAccessibilityService.enableService;
+import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityAndWaitForItToBeOnscreen;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import android.accessibility.cts.common.AccessibilityDumpOnFailureRule;
+import android.accessibility.cts.common.InstrumentedAccessibilityService;
+import android.accessibilityservice.InputMethod;
+import android.accessibilityservice.cts.activities.AccessibilityEndToEndActivity;
+import android.accessibilityservice.cts.utils.AsyncUtils;
+import android.accessibilityservice.cts.utils.RunOnMainUtils;
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.os.SystemClock;
+import android.platform.test.annotations.AppModeFull;
+import android.platform.test.annotations.LargeTest;
+import android.text.TextUtils;
+import android.util.Log;
+import android.view.inputmethod.EditorInfo;
+import android.widget.EditText;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * Test one a11y service requiring ime capabilities and one doesn't.
+ */
+@LargeTest
+@AppModeFull
+@RunWith(AndroidJUnit4.class)
+public class AccessibilityImeTest {
+    private static final String LOG_TAG = "AccessibilityImeTest";
+    private static Instrumentation sInstrumentation;
+    private static UiAutomation sUiAutomation;
+
+    private static StubImeAccessibilityService sStubImeAccessibilityService;
+    private static StubNonImeAccessibilityService sStubNonImeAccessibilityService;
+
+    private AccessibilityEndToEndActivity mActivity;
+
+    private ActivityTestRule<AccessibilityEndToEndActivity> mActivityRule =
+            new ActivityTestRule<>(AccessibilityEndToEndActivity.class, false, false);
+
+    private AccessibilityDumpOnFailureRule mDumpOnFailureRule =
+            new AccessibilityDumpOnFailureRule();
+
+    private EditText mEditText;
+    private String mInitialText;
+
+    @Rule
+    public final RuleChain mRuleChain = RuleChain
+            .outerRule(mActivityRule)
+            .around(mDumpOnFailureRule);
+
+    @BeforeClass
+    public static void oneTimeSetup() throws Exception {
+        sInstrumentation = InstrumentationRegistry.getInstrumentation();
+        sUiAutomation = sInstrumentation.getUiAutomation();
+        sInstrumentation
+                .getUiAutomation(UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
+        sStubImeAccessibilityService = enableService(StubImeAccessibilityService.class);
+        sStubNonImeAccessibilityService = enableService(StubNonImeAccessibilityService.class);
+    }
+
+    @AfterClass
+    public static void postTestTearDown() {
+        sStubImeAccessibilityService.disableSelfAndRemove();
+        sStubNonImeAccessibilityService.disableSelfAndRemove();
+        sUiAutomation.destroy();
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        mActivity = launchActivityAndWaitForItToBeOnscreen(
+                sInstrumentation, sUiAutomation, mActivityRule);
+        // focus the edit text
+        mEditText = mActivity.findViewById(R.id.edittext);
+        // initial text
+        mInitialText = mActivity.getString(R.string.text_input_blah);
+    }
+
+    /**
+     * Verifies that
+     * 1) {@link android.accessibilityservice.AccessibilityService#onCreateInputMethod()} will be
+     * called and 2) it will return the default implementation of
+     * {@link android.accessibilityservice.InputMethod}, which is still functional.
+     */
+    @Test
+    public void testDefaultImplementation() throws Exception {
+        InstrumentedAccessibilityService serviceToBeCleanedUp = null;
+        try {
+            final StubSimpleImeAccessibilityService service =
+                    enableService(StubSimpleImeAccessibilityService.class);
+            serviceToBeCleanedUp = service;
+            assertTrue("time out waiting for onCreateInputMethod() to get called.",
+                    service.awaitOnCreateInputMethod(AsyncUtils.DEFAULT_TIMEOUT_MS, MILLISECONDS));
+
+            final InputMethod inputMethod = service.getInputMethod();
+            assertNotNull(inputMethod);
+
+            // Set a unique value to "privateImeOptions".
+            final String markerValue = "Test-" + SystemClock.elapsedRealtimeNanos();
+            sInstrumentation.runOnMainSync(() -> mEditText.setPrivateImeOptions(markerValue));
+
+            requestFocusAndSetCursorToEnd();
+
+            // Wait until EditorInfo#privateImeOptions becomes the expected marker value.
+            PollingCheck.waitFor(AsyncUtils.DEFAULT_TIMEOUT_MS,
+                    () -> TextUtils.equals(
+                            markerValue,
+                            RunOnMainUtils.getOnMain(sInstrumentation, () -> {
+                                final EditorInfo editorInfo =
+                                        inputMethod.getCurrentInputEditorInfo();
+                                return editorInfo != null ? editorInfo.privateImeOptions : null;
+                            })));
+
+            assertTrue(RunOnMainUtils.getOnMain(sInstrumentation,
+                    inputMethod::getCurrentInputStarted));
+
+            final InputMethod.AccessibilityInputConnection connection =
+                    inputMethod.getCurrentInputConnection();
+            assertNotNull(connection);
+
+            connection.commitText("abc", 1, null);
+
+            final String expectedText = mInitialText + "abc";
+            PollingCheck.waitFor(AsyncUtils.DEFAULT_TIMEOUT_MS,
+                    () -> RunOnMainUtils.getOnMain(sInstrumentation,
+                            () -> TextUtils.equals(expectedText, mEditText.getText())));
+        } finally {
+            if (serviceToBeCleanedUp != null) {
+                serviceToBeCleanedUp.disableSelfAndRemove();
+            }
+        }
+    }
+
+    @Test
+    public void testInputConnection_requestIme() throws InterruptedException {
+        CountDownLatch startInputLatch = new CountDownLatch(1);
+        sStubImeAccessibilityService.setStartInputCountDownLatch(startInputLatch);
+
+        requestFocusAndSetCursorToEnd();
+
+        assertTrue("time out waiting for input to start",
+                startInputLatch.await(AsyncUtils.DEFAULT_TIMEOUT_MS, MILLISECONDS));
+        assertNotNull(sStubImeAccessibilityService.getInputMethod());
+        InputMethod.AccessibilityInputConnection connection =
+                sStubImeAccessibilityService.getInputMethod().getCurrentInputConnection();
+        assertNotNull(connection);
+
+        sStubImeAccessibilityService.setSelectionTarget(mInitialText.length() * 2);
+        CountDownLatch selectionChangeLatch = new CountDownLatch(1);
+        sStubImeAccessibilityService.setSelectionChangeLatch(selectionChangeLatch);
+
+        connection.commitText(mInitialText, 1, null);
+
+        assertTrue("time out waiting for selection change",
+                selectionChangeLatch.await(AsyncUtils.DEFAULT_TIMEOUT_MS, MILLISECONDS));
+        assertEquals(mInitialText + mInitialText, mEditText.getText().toString());
+    }
+
+    @Test
+    public void testInputConnection_notRequestIme() throws InterruptedException {
+        CountDownLatch startInputLatch = new CountDownLatch(1);
+        sStubNonImeAccessibilityService.setStartInputCountDownLatch(startInputLatch);
+
+        requestFocusAndSetCursorToEnd();
+
+        assertFalse("should time out waiting for input to start",
+                startInputLatch.await(AsyncUtils.DEFAULT_TIMEOUT_MS, MILLISECONDS));
+        assertNull(sStubNonImeAccessibilityService.getInputMethod());
+    }
+
+    @Test
+    public void testSelectionChange_requestIme() throws InterruptedException {
+        CountDownLatch startInputLatch = new CountDownLatch(1);
+        sStubImeAccessibilityService.setStartInputCountDownLatch(startInputLatch);
+
+        requestFocusAndSetCursorToEnd();
+
+        assertTrue("time out waiting for input to start",
+                startInputLatch.await(AsyncUtils.DEFAULT_TIMEOUT_MS, MILLISECONDS));
+        assertNotNull(sStubImeAccessibilityService.getInputMethod());
+        InputMethod.AccessibilityInputConnection connection =
+                sStubImeAccessibilityService.getInputMethod().getCurrentInputConnection();
+        assertNotNull(connection);
+
+        final int targetPos = mInitialText.length() - 1;
+        sStubImeAccessibilityService.setSelectionTarget(targetPos);
+        CountDownLatch selectionChangeLatch = new CountDownLatch(1);
+        sStubImeAccessibilityService.setSelectionChangeLatch(selectionChangeLatch);
+
+        connection.setSelection(targetPos, targetPos);
+        boolean changed = selectionChangeLatch.await(AsyncUtils.DEFAULT_TIMEOUT_MS, MILLISECONDS);
+        // Add some logs to help debug flakiness.
+        if (!changed) {
+            Log.v(LOG_TAG, "selection start after set selection is "
+                    + mEditText.getSelectionStart());
+            Log.v(LOG_TAG, "selection end after set selection is "
+                    + mEditText.getSelectionEnd());
+
+        }
+        assertTrue("time out waiting for selection change", changed);
+
+        assertEquals(targetPos, mEditText.getSelectionStart());
+        assertEquals(targetPos, mEditText.getSelectionEnd());
+
+        assertEquals(targetPos, sStubImeAccessibilityService.selStart);
+        assertEquals(targetPos, sStubImeAccessibilityService.selEnd);
+    }
+
+    @Test
+    public void testSelectionChange_notRequestIme() throws InterruptedException {
+        requestFocusAndSetCursorToEnd();
+
+        final int targetPos = mInitialText.length() - 1;
+        sStubNonImeAccessibilityService.setSelectionTarget(targetPos);
+        CountDownLatch selectionChangeLatch = new CountDownLatch(1);
+        sStubNonImeAccessibilityService.setSelectionChangeLatch(selectionChangeLatch);
+
+        sInstrumentation.runOnMainSync(() -> {
+            mEditText.setSelection(targetPos, targetPos);
+        });
+        assertFalse("should time out waiting for selection change",
+                selectionChangeLatch.await(AsyncUtils.DEFAULT_TIMEOUT_MS, MILLISECONDS));
+
+        assertEquals(targetPos, mEditText.getSelectionStart());
+        assertEquals(targetPos, mEditText.getSelectionEnd());
+
+        assertEquals(-1, sStubNonImeAccessibilityService.oldSelStart);
+        assertEquals(-1, sStubNonImeAccessibilityService.oldSelEnd);
+        assertEquals(-1, sStubNonImeAccessibilityService.selStart);
+        assertEquals(-1, sStubNonImeAccessibilityService.selEnd);
+    }
+
+    private void requestFocusAndSetCursorToEnd() {
+        sInstrumentation.runOnMainSync(() -> {
+            mEditText.requestFocus();
+            mEditText.setSelection(mInitialText.length(), mInitialText.length());
+        });
+        assertTrue("edit text is not focused", mEditText.isFocused());
+        assertEquals("selection start not set to text end", mInitialText.length(),
+                mEditText.getSelectionStart());
+        assertEquals("selection end not set to text end", mInitialText.length(),
+                mEditText.getSelectionEnd());
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityInputConnectionTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityInputConnectionTest.java
new file mode 100644
index 0000000..ea512f3
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityInputConnectionTest.java
@@ -0,0 +1,245 @@
+/*
+ * Copyright (C) 2022 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 android.accessibilityservice.cts;
+
+import static android.accessibility.cts.common.InstrumentedAccessibilityService.enableService;
+import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityAndWaitForItToBeOnscreen;
+
+import static org.junit.Assert.assertTrue;
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+
+import android.accessibility.cts.common.AccessibilityDumpOnFailureRule;
+import android.accessibilityservice.InputMethod;
+import android.accessibilityservice.cts.activities.AccessibilityEndToEndActivity;
+import android.accessibilityservice.cts.utils.AsyncUtils;
+import android.accessibilityservice.cts.utils.InputConnectionSplitter;
+import android.accessibilityservice.cts.utils.NoOpInputConnection;
+import android.accessibilityservice.cts.utils.RunOnMainUtils;
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.os.SystemClock;
+import android.platform.test.annotations.AppModeFull;
+import android.platform.test.annotations.LargeTest;
+import android.text.InputType;
+import android.text.TextUtils;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Tests for {@link InputMethod.AccessibilityInputConnection}.
+ */
+@LargeTest
+@AppModeFull
+@RunWith(AndroidJUnit4.class)
+public final class AccessibilityInputConnectionTest {
+    private static Instrumentation sInstrumentation;
+    private static UiAutomation sUiAutomation;
+
+    private static StubImeAccessibilityService sStubImeAccessibilityService;
+
+    private ActivityTestRule<AccessibilityEndToEndActivity> mActivityRule =
+            new ActivityTestRule<>(AccessibilityEndToEndActivity.class, false, false);
+
+    private AccessibilityDumpOnFailureRule mDumpOnFailureRule =
+            new AccessibilityDumpOnFailureRule();
+
+    private AtomicReference<InputConnection> mLastInputConnectionSpy = new AtomicReference<>();
+
+    @Rule
+    public final RuleChain mRuleChain = RuleChain
+            .outerRule(mActivityRule)
+            .around(mDumpOnFailureRule);
+
+    @BeforeClass
+    public static void oneTimeSetup() throws Exception {
+        sInstrumentation = InstrumentationRegistry.getInstrumentation();
+        sUiAutomation = sInstrumentation.getUiAutomation();
+        sInstrumentation
+                .getUiAutomation(UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
+        sStubImeAccessibilityService = enableService(StubImeAccessibilityService.class);
+    }
+
+    @AfterClass
+    public static void postTestTearDown() {
+        sStubImeAccessibilityService.disableSelfAndRemove();
+        sUiAutomation.destroy();
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        final String markerValue = "Test-" + SystemClock.elapsedRealtimeNanos();
+        final CountDownLatch startInputLatch = new CountDownLatch(1);
+        sStubImeAccessibilityService.setOnStartInputCallback(((editorInfo, restarting) -> {
+            if (editorInfo != null && TextUtils.equals(markerValue, editorInfo.privateImeOptions)) {
+                startInputLatch.countDown();
+            }
+        }));
+
+        final AccessibilityEndToEndActivity activity = launchActivityAndWaitForItToBeOnscreen(
+                sInstrumentation, sUiAutomation, mActivityRule);
+
+        final LinearLayout layout = (LinearLayout) activity.findViewById(R.id.edittext).getParent();
+        sInstrumentation.runOnMainSync(() -> {
+            final EditText editText = new EditText(activity) {
+                @Override
+                public InputConnection onCreateInputConnection(EditorInfo editorInfo) {
+                    final InputConnection ic = super.onCreateInputConnection(editorInfo);
+                    // For some reasons, Mockito.spy() for real Framework classes did not work...
+                    // Use NoOpInputConnection/InputConnectionSplitter instead.
+                    final InputConnection spy = Mockito.spy(new NoOpInputConnection());
+                    mLastInputConnectionSpy.set(spy);
+                    return new InputConnectionSplitter(ic, spy);
+                }
+            };
+            editText.setPrivateImeOptions(markerValue);
+            layout.addView(editText);
+            editText.requestFocus();
+        });
+
+        // Wait until EditorInfo#privateImeOptions becomes the expected marker value.
+        assertTrue("time out waiting for input to start",
+                startInputLatch.await(AsyncUtils.DEFAULT_TIMEOUT_MS, MILLISECONDS));
+    }
+
+    private InputMethod.AccessibilityInputConnection getInputConnection() {
+        return RunOnMainUtils.getOnMain(
+                sInstrumentation,
+                () -> sStubImeAccessibilityService.getInputMethod().getCurrentInputConnection());
+    }
+
+    private InputConnection resetAndGetLastInputConnectionSpy() {
+        final InputConnection spy = mLastInputConnectionSpy.get();
+        Mockito.reset(spy);
+        return spy;
+    }
+
+    @Test
+    public void testCommitText() {
+        final InputMethod.AccessibilityInputConnection ic = getInputConnection();
+        final InputConnection spy = resetAndGetLastInputConnectionSpy();
+
+        ic.commitText("test", 1, null);
+        Mockito.verify(spy, Mockito.timeout(AsyncUtils.DEFAULT_TIMEOUT_MS))
+                .commitText("test", 1, null);
+    }
+
+    @Test
+    public void testSetSelection() {
+        final InputMethod.AccessibilityInputConnection ic = getInputConnection();
+        final InputConnection spy = resetAndGetLastInputConnectionSpy();
+
+        ic.setSelection(1, 2);
+        Mockito.verify(spy, Mockito.timeout(AsyncUtils.DEFAULT_TIMEOUT_MS)).setSelection(1, 2);
+    }
+
+    @Test
+    public void testGetSurroundingText() {
+        final InputMethod.AccessibilityInputConnection ic = getInputConnection();
+        final InputConnection spy = resetAndGetLastInputConnectionSpy();
+
+        ic.getSurroundingText(1, 2, InputConnection.GET_TEXT_WITH_STYLES);
+        Mockito.verify(spy, Mockito.timeout(AsyncUtils.DEFAULT_TIMEOUT_MS))
+                .getSurroundingText(1, 2, InputConnection.GET_TEXT_WITH_STYLES);
+    }
+
+    @Test
+    public void testDeleteSurroundingText() {
+        final InputMethod.AccessibilityInputConnection ic = getInputConnection();
+        final InputConnection spy = resetAndGetLastInputConnectionSpy();
+
+        ic.deleteSurroundingText(2, 1);
+        Mockito.verify(spy, Mockito.timeout(AsyncUtils.DEFAULT_TIMEOUT_MS))
+                .deleteSurroundingText(2, 1);
+    }
+
+    @Test
+    public void testSendKeyEvent() {
+        final InputMethod.AccessibilityInputConnection ic = getInputConnection();
+        final InputConnection spy = resetAndGetLastInputConnectionSpy();
+
+        final long eventTime = SystemClock.uptimeMillis();
+        final KeyEvent keyEvent = new KeyEvent(eventTime, eventTime,
+                KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_A, 0, 0,
+                KeyCharacterMap.VIRTUAL_KEYBOARD, 0,
+                KeyEvent.FLAG_SOFT_KEYBOARD | KeyEvent.FLAG_KEEP_TOUCH_MODE);
+
+        ic.sendKeyEvent(keyEvent);
+        Mockito.verify(spy, Mockito.timeout(AsyncUtils.DEFAULT_TIMEOUT_MS))
+                .sendKeyEvent(keyEvent);
+    }
+
+    @Test
+    public void testPerformEditorAction() {
+        final InputMethod.AccessibilityInputConnection ic = getInputConnection();
+        final InputConnection spy = resetAndGetLastInputConnectionSpy();
+
+        ic.performEditorAction(EditorInfo.IME_ACTION_PREVIOUS);
+        Mockito.verify(spy, Mockito.timeout(AsyncUtils.DEFAULT_TIMEOUT_MS))
+                .performEditorAction(EditorInfo.IME_ACTION_PREVIOUS);
+    }
+
+    @Test
+    public void testPerformContextMenuAction() {
+        final InputMethod.AccessibilityInputConnection ic = getInputConnection();
+        final InputConnection spy = resetAndGetLastInputConnectionSpy();
+
+        ic.performContextMenuAction(android.R.id.selectAll);
+        Mockito.verify(spy, Mockito.timeout(AsyncUtils.DEFAULT_TIMEOUT_MS))
+                .performContextMenuAction(android.R.id.selectAll);
+    }
+
+    @Test
+    public void testGetCursorCapsMode() {
+        final InputMethod.AccessibilityInputConnection ic = getInputConnection();
+        final InputConnection spy = resetAndGetLastInputConnectionSpy();
+
+        ic.getCursorCapsMode(InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS);
+        Mockito.verify(spy, Mockito.timeout(AsyncUtils.DEFAULT_TIMEOUT_MS))
+                .getCursorCapsMode(InputType.TYPE_TEXT_FLAG_CAP_CHARACTERS);
+    }
+
+    @Test
+    public void testClearMetaKeyStates() {
+        final InputMethod.AccessibilityInputConnection ic = getInputConnection();
+        final InputConnection spy = resetAndGetLastInputConnectionSpy();
+
+        ic.clearMetaKeyStates(KeyEvent.META_SHIFT_ON);
+        Mockito.verify(spy, Mockito.timeout(AsyncUtils.DEFAULT_TIMEOUT_MS))
+                .clearMetaKeyStates(KeyEvent.META_SHIFT_ON);
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java
index 659aaf7..1ef0724 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityMagnificationTest.java
@@ -16,11 +16,10 @@
 
 package android.accessibilityservice.cts;
 
+import static android.accessibilityservice.MagnificationConfig.MAGNIFICATION_MODE_FULLSCREEN;
+import static android.accessibilityservice.MagnificationConfig.MAGNIFICATION_MODE_WINDOW;
 import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityAndWaitForItToBeOnscreen;
-
-import static androidx.test.InstrumentationRegistry.getInstrumentation;
-
-import static com.android.compatibility.common.util.TestUtils.waitOn;
+import static android.content.pm.PackageManager.FEATURE_WINDOW_MAGNIFICATION;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -30,6 +29,7 @@
 import static org.mockito.Mockito.anyFloat;
 import static org.mockito.Mockito.eq;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 
@@ -40,10 +40,12 @@
 import android.accessibilityservice.AccessibilityService.MagnificationController;
 import android.accessibilityservice.AccessibilityService.MagnificationController.OnMagnificationChangedListener;
 import android.accessibilityservice.AccessibilityServiceInfo;
+import android.accessibilityservice.MagnificationConfig;
 import android.accessibilityservice.cts.activities.AccessibilityWindowQueryActivity;
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.UiAutomation;
+import android.content.Context;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.Region;
@@ -51,22 +53,32 @@
 import android.util.DisplayMetrics;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.view.accessibility.AccessibilityNodeInfo;
+import android.view.accessibility.AccessibilityWindowInfo;
 import android.widget.Button;
 
+import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.TestUtils;
+
+import org.junit.AfterClass;
+import org.junit.Assume;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * Class for testing {@link AccessibilityServiceInfo}.
+ * Class for testing {@link MagnificationController} and the magnification overlay window.
  */
 @AppModeFull
 @RunWith(AndroidJUnit4.class)
@@ -74,8 +86,13 @@
 
     /** Maximum timeout when waiting for a magnification callback. */
     public static final int LISTENER_TIMEOUT_MILLIS = 500;
+    /** Maximum animation timeout when waiting for a magnification callback. */
+    public static final int LISTENER_ANIMATION_TIMEOUT_MILLIS = 1000;
     public static final String ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED =
             "accessibility_display_magnification_enabled";
+
+    private static UiAutomation sUiAutomation;
+
     private StubMagnificationAccessibilityService mService;
     private Instrumentation mInstrumentation;
 
@@ -100,12 +117,26 @@
             .around(mInstrumentedAccessibilityServiceRule)
             .around(mDumpOnFailureRule);
 
+    @BeforeClass
+    public static void oneTimeSetUp() {
+        sUiAutomation = InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation(UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
+        final AccessibilityServiceInfo info = sUiAutomation.getServiceInfo();
+        info.flags |= AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS;
+        sUiAutomation.setServiceInfo(info);
+    }
+
+    @AfterClass
+    public static void postTestTearDown() {
+        sUiAutomation.destroy();
+    }
+
     @Before
     public void setUp() throws Exception {
-        ShellCommandBuilder.create(getInstrumentation())
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        ShellCommandBuilder.create(sUiAutomation)
                 .deleteSecureSetting(ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED)
                 .run();
-        mInstrumentation = getInstrumentation();
         // Starting the service will force the accessibility subsystem to examine its settings, so
         // it will update magnification in the process to disable it.
         mService = mMagnificationAccessibilityServiceRule.enableService();
@@ -159,8 +190,308 @@
     }
 
     @Test
+    public void testSetMagnificationConfig_expectedConfig() throws Exception {
+        final MagnificationController controller = mService.getMagnificationController();
+        final WindowManager windowManager = mInstrumentation.getContext().getSystemService(
+                WindowManager.class);
+        final float scale = 2.0f;
+        final float x = windowManager.getCurrentWindowMetrics().getBounds().centerX();
+        final float y = windowManager.getCurrentWindowMetrics().getBounds().centerY();
+        final AtomicBoolean setConfig = new AtomicBoolean();
+
+        final int targetMode = isWindowModeSupported(mInstrumentation.getContext())
+                ? MAGNIFICATION_MODE_WINDOW : MAGNIFICATION_MODE_FULLSCREEN;
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(targetMode)
+                .setScale(scale)
+                .setCenterX(x)
+                .setCenterY(y).build();
+
+        mService.runOnServiceSync(() -> {
+            setConfig.set(controller.setMagnificationConfig(config, false));
+        });
+        waitUntilMagnificationConfig(controller, config);
+
+        assertTrue("Failed to set config", setConfig.get());
+        assertConfigEquals(config, controller.getMagnificationConfig());
+
+        final float newScale = scale + 1;
+        final Region region = controller.getMagnificationRegion();
+        final Rect bounds = region.getBounds();
+        final float newX = bounds.left + (bounds.width() / 4.0f);
+        final float newY = bounds.top + (bounds.height() / 4.0f);
+        final MagnificationConfig newConfig = new MagnificationConfig.Builder()
+                .setMode(MAGNIFICATION_MODE_FULLSCREEN).setScale(newScale).setCenterX(
+                        newX).setCenterY(
+                        newY).build();
+        mService.runOnServiceSync(() -> {
+            controller.setMagnificationConfig(newConfig, false);
+        });
+        waitUntilMagnificationConfig(controller, newConfig);
+
+        assertTrue("Failed to set config", setConfig.get());
+        assertConfigEquals(newConfig, controller.getMagnificationConfig());
+    }
+
+    @Test
+    public void testSetConfigWithDefaultModeAndCenter_expectedConfig() throws Exception {
+        final MagnificationController controller = mService.getMagnificationController();
+        final WindowManager windowManager = mInstrumentation.getContext().getSystemService(
+                WindowManager.class);
+        final float scale = 3.0f;
+        final float x = windowManager.getCurrentWindowMetrics().getBounds().centerX();
+        final float y = windowManager.getCurrentWindowMetrics().getBounds().centerY();
+        final AtomicBoolean setConfig = new AtomicBoolean();
+
+        final int targetMode = isWindowModeSupported(mInstrumentation.getContext())
+                ? MAGNIFICATION_MODE_WINDOW : MAGNIFICATION_MODE_FULLSCREEN;
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(targetMode)
+                .setScale(scale)
+                .setCenterX(x)
+                .setCenterY(y)
+                .build();
+
+        mService.runOnServiceSync(
+                () -> setConfig.set(controller.setMagnificationConfig(config, false)));
+        waitUntilMagnificationConfig(controller, config);
+
+        assertTrue("Failed to set config", setConfig.get());
+        assertConfigEquals(config, controller.getMagnificationConfig());
+
+        final float newScale = scale + 1;
+        final MagnificationConfig newConfig = new MagnificationConfig.Builder()
+                .setScale(newScale).build();
+        final MagnificationConfig expectedConfig = obtainConfigBuilder(config).setScale(
+                newScale).build();
+
+        mService.runOnServiceSync(
+                () -> setConfig.set(controller.setMagnificationConfig(newConfig, false)));
+        waitUntilMagnificationConfig(controller, expectedConfig);
+
+        assertTrue("Failed to set config", setConfig.get());
+        assertConfigEquals(expectedConfig, controller.getMagnificationConfig());
+    }
+
+    @Test
+    public void testSetFullScreenConfigWithDefaultValues_windowModeEnabled_expectedConfig()
+            throws Exception {
+        final boolean windowModeSupported = isWindowModeSupported(mInstrumentation.getContext());
+        Assume.assumeTrue("window mode is not available", windowModeSupported);
+
+        final MagnificationController controller = mService.getMagnificationController();
+        final WindowManager windowManager = mInstrumentation.getContext().getSystemService(
+                WindowManager.class);
+        final float scale = 3.0f;
+        final float x = windowManager.getCurrentWindowMetrics().getBounds().centerX();
+        final float y = windowManager.getCurrentWindowMetrics().getBounds().centerY();
+        final AtomicBoolean setConfig = new AtomicBoolean();
+
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(MAGNIFICATION_MODE_WINDOW)
+                .setScale(scale)
+                .setCenterX(x)
+                .setCenterY(y).build();
+
+        mService.runOnServiceSync(
+                () -> setConfig.set(controller.setMagnificationConfig(config, false)));
+        waitUntilMagnificationConfig(controller, config);
+
+        assertTrue("Failed to set config", setConfig.get());
+        assertConfigEquals(config, controller.getMagnificationConfig());
+
+        final MagnificationConfig newConfig = new MagnificationConfig.Builder()
+                .setMode(MAGNIFICATION_MODE_FULLSCREEN)
+                .build();
+
+        mService.runOnServiceSync(
+                () -> setConfig.set(controller.setMagnificationConfig(newConfig, false)));
+        final MagnificationConfig expectedConfig = obtainConfigBuilder(config).setMode(
+                MAGNIFICATION_MODE_FULLSCREEN).build();
+
+        waitUntilMagnificationConfig(controller, expectedConfig);
+        assertTrue("Failed to set config", setConfig.get());
+        assertConfigEquals(expectedConfig, controller.getMagnificationConfig());
+    }
+
+    @Test
+    public void testSetMagnificationConfig_legacyApiExpectedResult() {
+        final MagnificationController controller = mService.getMagnificationController();
+        final Region region = controller.getMagnificationRegion();
+        final Rect bounds = region.getBounds();
+        final float scale = 2.0f;
+        final float x = bounds.left + (bounds.width() / 4.0f);
+        final float y = bounds.top + (bounds.height() / 4.0f);
+        final AtomicBoolean setConfig = new AtomicBoolean();
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(MAGNIFICATION_MODE_FULLSCREEN)
+                .setScale(scale)
+                .setCenterX(x)
+                .setCenterY(y).build();
+        try {
+            mService.runOnServiceSync(() -> {
+                setConfig.set(controller.setMagnificationConfig(config, false));
+            });
+
+            assertEquals("Failed to apply scale", scale, controller.getScale(), 0f);
+            assertEquals("Failed to apply center X", x, controller.getCenterX(), 5.0f);
+            assertEquals("Failed to apply center Y", y, controller.getCenterY(), 5.0f);
+        } finally {
+            mService.runOnServiceSync(() -> controller.resetCurrentMagnification(false));
+        }
+    }
+
+    @Test
+    public void testSetWindowModeConfig_connectionReset_expectedResult() throws Exception {
+        Assume.assumeTrue(isWindowModeSupported(mInstrumentation.getContext()));
+
+        final MagnificationController controller = mService.getMagnificationController();
+        final WindowManager windowManager = mInstrumentation.getContext().getSystemService(
+                WindowManager.class);
+        final float scale = 2.0f;
+        final float x = windowManager.getCurrentWindowMetrics().getBounds().centerX();
+        final float y = windowManager.getCurrentWindowMetrics().getBounds().centerY();
+
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(MAGNIFICATION_MODE_WINDOW)
+                .setScale(scale)
+                .setCenterX(x)
+                .setCenterY(y).build();
+
+        mService.runOnServiceSync(
+                () -> controller.setMagnificationConfig(config, /* animate= */ false));
+
+        waitUntilMagnificationConfig(controller, config);
+
+        // Test service is disabled and enabled to make the connection reset.
+        mService.runOnServiceSync(() -> mService.disableSelfAndRemove());
+        mService = null;
+        InstrumentedAccessibilityService service =
+                mMagnificationAccessibilityServiceRule.enableService();
+        MagnificationController controller2 = service.getMagnificationController();
+        try {
+            final float newScale = scale + 1;
+            final float newX = x + 10;
+            final float newY = y + 10;
+            final MagnificationConfig newConfig = new MagnificationConfig.Builder()
+                    .setMode(MAGNIFICATION_MODE_WINDOW)
+                    .setScale(newScale)
+                    .setCenterX(newX)
+                    .setCenterY(newY).build();
+
+            service.runOnServiceSync(
+                    () -> controller2.setMagnificationConfig(newConfig, /* animate= */ false));
+
+            waitUntilMagnificationConfig(controller2, newConfig);
+        } finally {
+            service.runOnServiceSync(
+                    () -> controller2.resetCurrentMagnification(false));
+        }
+    }
+
+    @Test
+    public void testSetWindowModeConfig_hasMagnificationOverlay() throws TimeoutException {
+        Assume.assumeTrue(isWindowModeSupported(mInstrumentation.getContext()));
+
+        final MagnificationController controller = mService.getMagnificationController();
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(MAGNIFICATION_MODE_WINDOW)
+                .setScale(2.0f)
+                .build();
+
+        try {
+            sUiAutomation.executeAndWaitForEvent(
+                    () -> controller.setMagnificationConfig(config, false),
+                    event -> sUiAutomation.getWindows().stream().anyMatch(
+                            accessibilityWindowInfo -> accessibilityWindowInfo.getType()
+                                    == AccessibilityWindowInfo.TYPE_MAGNIFICATION_OVERLAY), 5000);
+        } finally {
+            controller.resetCurrentMagnification(false);
+        }
+    }
+
+    @Test
+    public void testServiceConnectionDisconnected_hasNoMagnificationOverlay()
+            throws TimeoutException {
+        Assume.assumeTrue(isWindowModeSupported(mInstrumentation.getContext()));
+
+        final MagnificationController controller = mService.getMagnificationController();
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(MAGNIFICATION_MODE_WINDOW)
+                .setScale(2.0f)
+                .build();
+
+        try {
+            sUiAutomation.executeAndWaitForEvent(
+                    () -> controller.setMagnificationConfig(config, false),
+                    event -> sUiAutomation.getWindows().stream().anyMatch(
+                            accessibilityWindowInfo -> accessibilityWindowInfo.getType()
+                                    == AccessibilityWindowInfo.TYPE_MAGNIFICATION_OVERLAY), 5000);
+
+            sUiAutomation.executeAndWaitForEvent(
+                    () -> mService.runOnServiceSync(() -> mService.disableSelfAndRemove()),
+                    event -> sUiAutomation.getWindows().stream().noneMatch(
+                            accessibilityWindowInfo -> accessibilityWindowInfo.getType()
+                                    == AccessibilityWindowInfo.TYPE_MAGNIFICATION_OVERLAY), 5000);
+        } finally {
+            controller.resetCurrentMagnification(false);
+        }
+    }
+
+    @Test
+    public void testGetMagnificationConfig_setConfigByLegacyApi_expectedResult() {
+        final MagnificationController controller = mService.getMagnificationController();
+        final Region region = controller.getMagnificationRegion();
+        final Rect bounds = region.getBounds();
+        final float scale = 2.0f;
+        final float x = bounds.left + (bounds.width() / 4.0f);
+        final float y = bounds.top + (bounds.height() / 4.0f);
+        mService.runOnServiceSync(() -> {
+            controller.setScale(scale, false);
+            controller.setCenter(x, y, false);
+        });
+
+        final MagnificationConfig config = controller.getMagnificationConfig();
+
+        assertEquals("Failed to apply scale", scale, config.getScale(), 0f);
+        assertEquals("Failed to apply center X", x, config.getCenterX(), 5.0f);
+        assertEquals("Failed to apply center Y", y, config.getCenterY(), 5.0f);
+    }
+
+    @Test
     public void testListener() {
         final MagnificationController controller = mService.getMagnificationController();
+        final OnMagnificationChangedListener spyListener = mock(
+                OnMagnificationChangedListener.class);
+        final OnMagnificationChangedListener listener =
+                (controller1, region, scale, centerX, centerY) ->
+                        spyListener.onMagnificationChanged(controller1, region, scale, centerX,
+                                centerY);
+        controller.addListener(listener);
+
+        try {
+            final float scale = 2.0f;
+            final AtomicBoolean result = new AtomicBoolean();
+
+            mService.runOnServiceSync(() -> result.set(controller.setScale(scale, false)));
+
+            assertTrue("Failed to set scale", result.get());
+            verify(spyListener, timeout(LISTENER_TIMEOUT_MILLIS)).onMagnificationChanged(
+                    eq(controller), any(Region.class), eq(scale), anyFloat(), anyFloat());
+
+            mService.runOnServiceSync(() -> result.set(controller.reset(false)));
+
+            assertTrue("Failed to reset", result.get());
+            verify(spyListener, timeout(LISTENER_TIMEOUT_MILLIS)).onMagnificationChanged(
+                    eq(controller), any(Region.class), eq(1.0f), anyFloat(), anyFloat());
+        } finally {
+            controller.removeListener(listener);
+        }
+    }
+
+    @Test
+    public void testListener_changeConfigByLegacyApi_notifyConfigChanged() {
+        final MagnificationController controller = mService.getMagnificationController();
         final OnMagnificationChangedListener listener = mock(OnMagnificationChangedListener.class);
         controller.addListener(listener);
 
@@ -171,21 +502,121 @@
             mService.runOnServiceSync(() -> result.set(controller.setScale(scale, false)));
 
             assertTrue("Failed to set scale", result.get());
-            verify(listener, timeout(LISTENER_TIMEOUT_MILLIS).atLeastOnce()).onMagnificationChanged(
-                    eq(controller), any(Region.class), eq(scale), anyFloat(), anyFloat());
+            final ArgumentCaptor<MagnificationConfig> configCaptor = ArgumentCaptor.forClass(
+                    MagnificationConfig.class);
+            verify(listener, timeout(LISTENER_TIMEOUT_MILLIS)).onMagnificationChanged(
+                    eq(controller), any(Region.class), configCaptor.capture());
+            assertEquals(scale, configCaptor.getValue().getScale(), 0);
 
+            reset(listener);
             mService.runOnServiceSync(() -> result.set(controller.reset(false)));
 
             assertTrue("Failed to reset", result.get());
-            verify(listener, timeout(LISTENER_TIMEOUT_MILLIS).atLeastOnce()).onMagnificationChanged(
-                    eq(controller), any(Region.class), eq(1.0f), anyFloat(), anyFloat());
+            verify(listener, timeout(LISTENER_TIMEOUT_MILLIS)).onMagnificationChanged(
+                    eq(controller), any(Region.class), configCaptor.capture());
+            assertEquals(1.0f, configCaptor.getValue().getScale(), 0);
         } finally {
             controller.removeListener(listener);
         }
     }
 
     @Test
-    public void testMagnificationServiceShutsDownWhileMagnifying_shouldReturnTo1x() {
+    public void testListener_magnificationConfigChangedWithoutAnimation_notifyConfigChanged()
+            throws Exception {
+        final MagnificationController controller = mService.getMagnificationController();
+        final OnMagnificationChangedListener listener = mock(OnMagnificationChangedListener.class);
+        controller.addListener(listener);
+        final WindowManager windowManager = mInstrumentation.getContext().getSystemService(
+                WindowManager.class);
+        final int targetMode = isWindowModeSupported(mInstrumentation.getContext())
+                ? MAGNIFICATION_MODE_WINDOW : MAGNIFICATION_MODE_FULLSCREEN;
+        final float scale = 2.0f;
+        final float x = windowManager.getCurrentWindowMetrics().getBounds().centerX();
+        final float y = windowManager.getCurrentWindowMetrics().getBounds().centerY();
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(targetMode)
+                .setScale(scale)
+                .setCenterX(x)
+                .setCenterY(y)
+                .build();
+
+        try {
+            mService.runOnServiceSync(() -> controller.setMagnificationConfig(config, false));
+            waitUntilMagnificationConfig(controller, config);
+
+            final ArgumentCaptor<MagnificationConfig> configCaptor = ArgumentCaptor.forClass(
+                    MagnificationConfig.class);
+            verify(listener, timeout(LISTENER_TIMEOUT_MILLIS).atLeastOnce()).onMagnificationChanged(
+                    eq(controller), any(Region.class), configCaptor.capture());
+            assertConfigEquals(config, configCaptor.getValue());
+
+            final float newScale = scale + 1;
+            final float newX = x + 10;
+            final float newY = y + 10;
+            final MagnificationConfig fullscreenConfig = new MagnificationConfig.Builder()
+                    .setMode(MAGNIFICATION_MODE_FULLSCREEN)
+                    .setScale(newScale)
+                    .setCenterX(newX)
+                    .setCenterY(newY).build();
+
+            reset(listener);
+            mService.runOnServiceSync(() -> {
+                controller.setMagnificationConfig(fullscreenConfig, false);
+            });
+            waitUntilMagnificationConfig(controller, fullscreenConfig);
+
+            verify(listener, timeout(LISTENER_TIMEOUT_MILLIS)).onMagnificationChanged(
+                    eq(controller), any(Region.class), configCaptor.capture());
+            assertConfigEquals(fullscreenConfig, configCaptor.getValue());
+        } finally {
+            mService.runOnServiceSync(() -> {
+                controller.resetCurrentMagnification(false);
+                controller.removeListener(listener);
+            });
+        }
+    }
+
+    @Test
+    public void testListener_magnificationConfigChangedWithAnimation_notifyConfigChanged() {
+        final MagnificationController controller = mService.getMagnificationController();
+        final OnMagnificationChangedListener listener = mock(OnMagnificationChangedListener.class);
+        controller.addListener(listener);
+        final int targetMode = isWindowModeSupported(mInstrumentation.getContext())
+                ? MAGNIFICATION_MODE_WINDOW : MAGNIFICATION_MODE_FULLSCREEN;
+        final float scale = 2.0f;
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(targetMode)
+                .setScale(scale).build();
+
+        try {
+            mService.runOnServiceSync(
+                    () -> controller.setMagnificationConfig(config, /* animate= */ true));
+
+            verify(listener, timeout(LISTENER_ANIMATION_TIMEOUT_MILLIS)).onMagnificationChanged(
+                    eq(controller), any(Region.class), any(MagnificationConfig.class));
+
+            final float newScale = scale + 1;
+            final MagnificationConfig fullscreenConfig = new MagnificationConfig.Builder()
+                    .setMode(MAGNIFICATION_MODE_FULLSCREEN)
+                    .setScale(newScale).build();
+
+            reset(listener);
+            mService.runOnServiceSync(() -> {
+                controller.setMagnificationConfig(fullscreenConfig, /* animate= */ true);
+            });
+
+            verify(listener, timeout(LISTENER_ANIMATION_TIMEOUT_MILLIS)).onMagnificationChanged(
+                    eq(controller), any(Region.class), any(MagnificationConfig.class));
+        } finally {
+            mService.runOnServiceSync(() -> {
+                controller.resetCurrentMagnification(false);
+                controller.removeListener(listener);
+            });
+        }
+    }
+
+    @Test
+    public void testMagnificationServiceShutsDownWhileMagnifying_fullscreen_shouldReturnTo1x() {
         final MagnificationController controller = mService.getMagnificationController();
         mService.runOnServiceSync(() -> controller.setScale(2.0f, false));
 
@@ -199,6 +630,38 @@
     }
 
     @Test
+    public void testMagnificationServiceShutsDownWhileMagnifying_windowMode_shouldReturnTo1x()
+            throws Exception {
+        Assume.assumeTrue(isWindowModeSupported(mInstrumentation.getContext()));
+
+        final MagnificationController controller = mService.getMagnificationController();
+        final WindowManager windowManager = mInstrumentation.getContext().getSystemService(
+                WindowManager.class);
+        final float scale = 2.0f;
+        final float x = windowManager.getCurrentWindowMetrics().getBounds().centerX();
+        final float y = windowManager.getCurrentWindowMetrics().getBounds().centerY();
+
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(MAGNIFICATION_MODE_WINDOW)
+                .setScale(scale)
+                .setCenterX(x)
+                .setCenterY(y).build();
+
+        mService.runOnServiceSync(() -> {
+            controller.setMagnificationConfig(config, false);
+        });
+        waitUntilMagnificationConfig(controller, config);
+
+        mService.runOnServiceSync(() -> mService.disableSelf());
+        mService = null;
+        InstrumentedAccessibilityService service =
+                mInstrumentedAccessibilityServiceRule.enableService();
+        final MagnificationController controller2 = service.getMagnificationController();
+        assertEquals("Magnification must reset when a service dies",
+                1.0f, controller2.getMagnificationConfig().getScale(), 0f);
+    }
+
+    @Test
     public void testGetMagnificationRegion_whenCanControlMagnification_shouldNotBeEmpty() {
         final MagnificationController controller = mService.getMagnificationController();
         Region magnificationRegion = controller.getMagnificationRegion();
@@ -220,7 +683,7 @@
 
     @Test
     public void testGetMagnificationRegion_whenMagnificationGesturesEnabled_shouldNotBeEmpty() {
-        ShellCommandBuilder.create(mInstrumentation)
+        ShellCommandBuilder.create(sUiAutomation)
                 .putSecureSetting(ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED, "1")
                 .run();
         mService.runOnServiceSync(() -> mService.disableSelf());
@@ -233,13 +696,107 @@
             assertFalse("Magnification region should not be empty when magnification "
                     + "gestures are active", magnificationRegion.isEmpty());
         } finally {
-            ShellCommandBuilder.create(mInstrumentation)
+            ShellCommandBuilder.create(sUiAutomation)
                     .deleteSecureSetting(ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED)
                     .run();
         }
     }
 
     @Test
+    public void testGetCurrentMagnificationRegion_fullscreen_exactRegionCenter() throws Exception {
+        final MagnificationController controller = mService.getMagnificationController();
+        final Region region = controller.getMagnificationRegion();
+        final Rect bounds = region.getBounds();
+        final float scale = 2.0f;
+        final float x = bounds.left + (bounds.width() / 4.0f);
+        final float y = bounds.top + (bounds.height() / 4.0f);
+
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(MAGNIFICATION_MODE_FULLSCREEN)
+                .setScale(scale)
+                .setCenterX(x)
+                .setCenterY(y).build();
+        try {
+            mService.runOnServiceSync(() -> {
+                controller.setMagnificationConfig(config, false);
+            });
+            waitUntilMagnificationConfig(controller, config);
+
+            final Region magnificationRegion = controller.getCurrentMagnificationRegion();
+            assertFalse(magnificationRegion.isEmpty());
+        } finally {
+            mService.runOnServiceSync(() -> {
+                controller.resetCurrentMagnification(false);
+            });
+        }
+    }
+
+    @Test
+    public void testGetCurrentMagnificationRegion_windowMode_exactRegionCenter() throws Exception {
+        Assume.assumeTrue(isWindowModeSupported(mInstrumentation.getContext()));
+
+        final MagnificationController controller = mService.getMagnificationController();
+        final WindowManager windowManager = mInstrumentation.getContext().getSystemService(
+                WindowManager.class);
+        final float scale = 2.0f;
+        final float x = windowManager.getCurrentWindowMetrics().getBounds().centerX();
+        final float y = windowManager.getCurrentWindowMetrics().getBounds().centerY();
+
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(MAGNIFICATION_MODE_WINDOW)
+                .setScale(scale)
+                .setCenterX(x)
+                .setCenterY(y).build();
+        try {
+            mService.runOnServiceSync(() -> {
+                controller.setMagnificationConfig(config, false);
+            });
+            waitUntilMagnificationConfig(controller, config);
+
+            final Region magnificationRegion = controller.getCurrentMagnificationRegion();
+            final Rect magnificationBounds = magnificationRegion.getBounds();
+            assertEquals(magnificationBounds.exactCenterX(), x, 0);
+            assertEquals(magnificationBounds.exactCenterY(), y, 0);
+        } finally {
+            mService.runOnServiceSync(() -> {
+                controller.resetCurrentMagnification(false);
+            });
+        }
+    }
+
+    @Test
+    public void testResetCurrentMagnificationRegion_WindowMode_regionIsEmpty() throws Exception {
+        Assume.assumeTrue(isWindowModeSupported(mInstrumentation.getContext()));
+
+        final MagnificationController controller = mService.getMagnificationController();
+        final WindowManager windowManager = mInstrumentation.getContext().getSystemService(
+                WindowManager.class);
+        final float scale = 2.0f;
+        final float x = windowManager.getCurrentWindowMetrics().getBounds().centerX();
+        final float y = windowManager.getCurrentWindowMetrics().getBounds().centerY();
+
+        final MagnificationConfig config = new MagnificationConfig.Builder()
+                .setMode(MAGNIFICATION_MODE_WINDOW)
+                .setScale(scale)
+                .setCenterX(x)
+                .setCenterY(y).build();
+
+        mService.runOnServiceSync(() -> {
+            controller.setMagnificationConfig(config, false);
+        });
+        waitUntilMagnificationConfig(controller, config);
+
+        assertEquals(scale, controller.getMagnificationConfig().getScale(), 0);
+
+        mService.runOnServiceSync(() -> {
+            controller.resetCurrentMagnification(false);
+        });
+
+        assertEquals(1.0f, controller.getMagnificationConfig().getScale(), 0);
+        assertTrue(controller.getCurrentMagnificationRegion().isEmpty());
+    }
+
+    @Test
     public void testAnimatingMagnification() throws InterruptedException {
         final MagnificationController controller = mService.getMagnificationController();
         final int timeBetweenAnimationChanges = 100;
@@ -283,17 +840,15 @@
     @Test
     public void testA11yNodeInfoVisibility_whenOutOfMagnifiedArea_shouldVisible()
             throws Exception{
-        final UiAutomation uiAutomation = mInstrumentation.getUiAutomation(
-                UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
         final Activity activity = launchActivityAndWaitForItToBeOnscreen(
-                mInstrumentation, uiAutomation, mActivityRule);
+                mInstrumentation, sUiAutomation, mActivityRule);
         final MagnificationController controller = mService.getMagnificationController();
         final Rect magnifyBounds = controller.getMagnificationRegion().getBounds();
         final float scale = 8.0f;
         final Button button = activity.findViewById(R.id.button1);
         adjustViewBoundsIfNeeded(button, scale, magnifyBounds);
 
-        final AccessibilityNodeInfo buttonNode = uiAutomation.getRootInActiveWindow()
+        final AccessibilityNodeInfo buttonNode = sUiAutomation.getRootInActiveWindow()
                 .findAccessibilityNodeInfosByViewId(
                         "android.accessibilityservice.cts:id/button1").get(0);
         assertNotNull("Can't find button on the screen", buttonNode);
@@ -330,31 +885,32 @@
 
     private void waitOnMagnificationChanged(MagnificationController controller, float newScale,
             float newCenterX, float newCenterY) {
-        final Object waitLock = new Object();
-        final AtomicBoolean notified = new AtomicBoolean();
-        final OnMagnificationChangedListener listener = (c, region, scale, centerX, centerY) -> {
-            final float delta = 5.0f;
-            synchronized (waitLock) {
-                if (newScale == scale
-                        && (centerX > newCenterX - delta) && (centerY > newCenterY - delta)) {
-                    notified.set(true);
-                    waitLock.notifyAll();
-                }
-            }
-        };
+        final OnMagnificationChangedListener spyListener = mock(
+                OnMagnificationChangedListener.class);
+        final OnMagnificationChangedListener listener =
+                (controller1, region, scale, centerX, centerY) ->
+                        spyListener.onMagnificationChanged(controller1, region, scale, centerX,
+                                centerY);
         controller.addListener(listener);
         try {
             final AtomicBoolean setScale = new AtomicBoolean();
             final AtomicBoolean setCenter = new AtomicBoolean();
             mService.runOnServiceSync(() -> {
                 setScale.set(controller.setScale(newScale, false));
+            });
+
+            assertTrue("Failed to set scale", setScale.get());
+            verify(spyListener, timeout(LISTENER_TIMEOUT_MILLIS)).onMagnificationChanged(
+                    eq(controller), any(Region.class), eq(newScale), anyFloat(), anyFloat());
+
+            reset(spyListener);
+            mService.runOnServiceSync(() -> {
                 setCenter.set(controller.setCenter(newCenterX, newCenterY, false));
             });
-            assertTrue("Failed to set scale", setScale.get());
-            assertEquals("Failed to apply scale", newScale, controller.getScale(), 0f);
+
             assertTrue("Failed to set center", setCenter.get());
-            waitOn(waitLock, () -> notified.get(), LISTENER_TIMEOUT_MILLIS,
-                    "waitOnMagnificationChanged");
+            verify(spyListener, timeout(LISTENER_TIMEOUT_MILLIS)).onMagnificationChanged(
+                    eq(controller), any(Region.class), anyFloat(), eq(newCenterX), eq(newCenterY));
         } finally {
             controller.removeListener(listener);
         }
@@ -396,4 +952,42 @@
         // Waiting for UI refresh
         mInstrumentation.waitForIdleSync();
     }
+
+    private void waitUntilMagnificationConfig(MagnificationController controller,
+            MagnificationConfig config) throws Exception {
+        TestUtils.waitUntil(
+                "Failed to apply the config. expected: " + config + " , actual: "
+                        + controller.getMagnificationConfig(), 5,
+                () -> {
+                    final MagnificationConfig actualConfig = controller.getMagnificationConfig();
+                    return actualConfig.getMode() == config.getMode()
+                            && Float.compare(actualConfig.getScale(), config.getScale()) == 0
+                            && Float.compare(actualConfig.getCenterX(), config.getCenterX()) == 0
+                            && Float.compare(actualConfig.getCenterY(), config.getCenterY()) == 0;
+                });
+    }
+
+    private void assertConfigEquals(MagnificationConfig expected, MagnificationConfig result) {
+        assertEquals("Failed to apply mode", expected.getMode(),
+                result.getMode(), 0f);
+        assertEquals("Failed to apply scale", expected.getScale(),
+                result.getScale(), 0f);
+        assertEquals("Failed to apply center X", expected.getCenterX(),
+                result.getCenterX(), 5.0f);
+        assertEquals("Failed to apply center Y", expected.getCenterY(),
+                result.getCenterY(), 5.0f);
+    }
+
+    private static boolean isWindowModeSupported(Context context) {
+        return context.getPackageManager().hasSystemFeature(FEATURE_WINDOW_MAGNIFICATION);
+    }
+
+    private static MagnificationConfig.Builder obtainConfigBuilder(MagnificationConfig config) {
+        MagnificationConfig.Builder builder = new MagnificationConfig.Builder();
+        builder.setMode(config.getMode())
+                .setScale(config.getScale())
+                .setCenterX(config.getCenterX())
+                .setCenterY(config.getCenterY());
+        return builder;
+    }
 }
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityPaneTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityPaneTest.java
index d8b613f..829396e 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityPaneTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityPaneTest.java
@@ -27,6 +27,7 @@
 
 import static org.hamcrest.Matchers.both;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import android.accessibility.cts.common.AccessibilityDumpOnFailureRule;
 import android.accessibilityservice.cts.activities.AccessibilityEndToEndActivity;
@@ -66,6 +67,13 @@
     private AccessibilityDumpOnFailureRule mDumpOnFailureRule =
             new AccessibilityDumpOnFailureRule();
 
+    private final AccessibilityEventFilter mPaneAppearsFilter =
+            both(new AccessibilityEventTypeMatcher(TYPE_WINDOW_STATE_CHANGED)).and(
+                    new ContentChangesMatcher(CONTENT_CHANGE_TYPE_PANE_APPEARED))::matches;
+    private final AccessibilityEventFilter mPaneDisappearsFilter =
+            both(new AccessibilityEventTypeMatcher(TYPE_WINDOW_STATE_CHANGED)).and(
+                    new ContentChangesMatcher(CONTENT_CHANGE_TYPE_PANE_DISAPPEARED))::matches;
+
     @Rule
     public final RuleChain mRuleChain = RuleChain
             .outerRule(mActivityRule)
@@ -106,27 +114,39 @@
 
         AccessibilityNodeInfo windowLikeNode = getPaneNode();
         assertEquals(newTitle, windowLikeNode.getPaneTitle());
+
+        // Disappear
+        sUiAutomation.executeAndWaitForEvent(() -> sInstrumentation.runOnMainSync(() -> {
+            mPaneView.setAccessibilityPaneTitle(null);
+            assertNull(mPaneView.getAccessibilityPaneTitle());
+        }), mPaneDisappearsFilter, DEFAULT_TIMEOUT_MS);
+
+        windowLikeNode.refresh();
+        assertNull(windowLikeNode.getPaneTitle());
+
+        // Appear
+        sUiAutomation.executeAndWaitForEvent(() -> sInstrumentation.runOnMainSync(() -> {
+            mPaneView.setAccessibilityPaneTitle(newTitle);
+            assertEquals(newTitle, mPaneView.getAccessibilityPaneTitle());
+        }), mPaneAppearsFilter, DEFAULT_TIMEOUT_MS);
+
+        windowLikeNode.refresh();
+        assertEquals(newTitle, windowLikeNode.getPaneTitle());
     }
 
     @Test
     public void windowLikeViewVisibility_reportAsWindowStateChanges() throws Exception {
-        final AccessibilityEventFilter paneAppearsFilter =
-                both(new AccessibilityEventTypeMatcher(TYPE_WINDOW_STATE_CHANGED)).and(
-                        new ContentChangesMatcher(CONTENT_CHANGE_TYPE_PANE_APPEARED))::matches;
-        final AccessibilityEventFilter paneDisappearsFilter =
-                both(new AccessibilityEventTypeMatcher(TYPE_WINDOW_STATE_CHANGED)).and(
-                        new ContentChangesMatcher(CONTENT_CHANGE_TYPE_PANE_DISAPPEARED))::matches;
         sUiAutomation.executeAndWaitForEvent(setPaneViewVisibility(View.GONE),
-                paneDisappearsFilter, DEFAULT_TIMEOUT_MS);
+                mPaneDisappearsFilter, DEFAULT_TIMEOUT_MS);
 
         sUiAutomation.executeAndWaitForEvent(setPaneViewVisibility(View.VISIBLE),
-                paneAppearsFilter, DEFAULT_TIMEOUT_MS);
+                mPaneAppearsFilter, DEFAULT_TIMEOUT_MS);
 
         sUiAutomation.executeAndWaitForEvent(setPaneViewParentVisibility(View.GONE),
-                paneDisappearsFilter, DEFAULT_TIMEOUT_MS);
+                mPaneDisappearsFilter, DEFAULT_TIMEOUT_MS);
 
         sUiAutomation.executeAndWaitForEvent(setPaneViewParentVisibility(View.VISIBLE),
-                paneAppearsFilter, DEFAULT_TIMEOUT_MS);
+                mPaneAppearsFilter, DEFAULT_TIMEOUT_MS);
     }
 
     private AccessibilityNodeInfo getPaneNode() {
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilitySoftKeyboardTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilitySoftKeyboardTest.java
index 5744ac9..5f100b4 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilitySoftKeyboardTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilitySoftKeyboardTest.java
@@ -18,10 +18,13 @@
 import static android.accessibilityservice.AccessibilityService.SHOW_MODE_AUTO;
 import static android.accessibilityservice.AccessibilityService.SHOW_MODE_HIDDEN;
 import static android.accessibilityservice.AccessibilityService.SHOW_MODE_IGNORE_HARD_KEYBOARD;
+import static android.accessibilityservice.AccessibilityService.SoftKeyboardController.ENABLE_IME_SUCCESS;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import android.accessibility.cts.common.AccessibilityDumpOnFailureRule;
 import android.accessibility.cts.common.InstrumentedAccessibilityService;
@@ -136,19 +139,74 @@
         String currentIME = Settings.Secure.getString(
                 mService.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
         assertNotEquals(Ime1Constants.IME_ID, currentIME);
-        // Enable a dummy IME for this test.
-        try (TestImeSession imeSession = new TestImeSession(Ime1Constants.IME_ID)) {
-            // Switch to the dummy IME.
+        // Enable a placeholder IME for this test.
+        try (TestImeSession imeSession = new TestImeSession(Ime1Constants.IME_ID, true)) {
+            // Switch to the placeholder IME.
             final boolean success = controller.switchToInputMethod(Ime1Constants.IME_ID);
             currentIME = Settings.Secure.getString(
                     mService.getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);
 
-            // The current IME should be set to the dummy IME successfully.
+            // The current IME should be set to the placeholder IME successfully.
             assertTrue(success);
             assertEquals(Ime1Constants.IME_ID, currentIME);
         }
     }
 
+    @Test
+    public void testSetInputMethodEnabled_differentPackage() throws Exception {
+        // Disable a placeholder IME for this test.
+        try (TestImeSession imeSession = new TestImeSession(Ime1Constants.IME_ID, false)) {
+            final SoftKeyboardController controller = mService.getSoftKeyboardController();
+
+            String enabledIMEs = Settings.Secure.getString(
+                    mService.getContentResolver(), Settings.Secure.ENABLED_INPUT_METHODS);
+            assertFalse(enabledIMEs.contains(Ime1Constants.IME_ID));
+
+            // Enable the placeholder IME.
+            try {
+                int result = controller.setInputMethodEnabled(Ime1Constants.IME_ID, true);
+                fail("should have thrown SecurityException");
+            } catch (SecurityException ignored) {
+            }
+
+            enabledIMEs = Settings.Secure.getString(
+                    mService.getContentResolver(), Settings.Secure.ENABLED_INPUT_METHODS);
+            // The placeholder IME should not be enabled;
+            assertFalse(enabledIMEs.contains(Ime1Constants.IME_ID));
+        }
+    }
+
+    @Test
+    public void testSetInputMethodEnabled_success() throws Exception {
+        String ImeId = "android.accessibilityservice.cts/.StubInputMethod";
+        // Disable a placeholder IME for this test.
+        try (TestImeSession imeSession = new TestImeSession(ImeId, false)) {
+            final SoftKeyboardController controller = mService.getSoftKeyboardController();
+
+            String enabledIMEs = Settings.Secure.getString(
+                    mService.getContentResolver(), Settings.Secure.ENABLED_INPUT_METHODS);
+            assertFalse(enabledIMEs.contains(ImeId));
+
+            // Enable the placeholder IME.
+            int result = controller.setInputMethodEnabled(ImeId, true);
+            enabledIMEs = Settings.Secure.getString(
+                    mService.getContentResolver(), Settings.Secure.ENABLED_INPUT_METHODS);
+
+            // The placeholder IME should be enabled;
+            assertEquals(ENABLE_IME_SUCCESS, result);
+            assertTrue(enabledIMEs.contains(ImeId));
+
+            // Disable the placeholder IME.
+            result = controller.setInputMethodEnabled(ImeId, false);
+            enabledIMEs = Settings.Secure.getString(
+                    mService.getContentResolver(), Settings.Secure.ENABLED_INPUT_METHODS);
+
+            // The placeholder IME should be disabled;
+            assertEquals(ENABLE_IME_SUCCESS, result);
+            assertFalse(enabledIMEs.contains(ImeId));
+        }
+    }
+
     private void assertCanSetAndGetShowModeAndCallbackHappens(
             int mode, InstrumentedAccessibilityService service)
             throws Exception  {
@@ -197,9 +255,14 @@
     }
 
     private class TestImeSession implements AutoCloseable {
-        TestImeSession(String imeId) {
-            // Enable the dummy IME by shell command.
-            final String enableImeCommand = ShellCommandUtils.enableIme(imeId);
+        TestImeSession(String imeId, boolean enabled) {
+            // Enable/disable the placeholder IME by shell command.
+            final String enableImeCommand;
+            if (enabled) {
+                enableImeCommand = ShellCommandUtils.enableIme(imeId);
+            } else {
+                enableImeCommand = ShellCommandUtils.disableIme(imeId);
+            }
             ShellCommandBuilder.create(mInstrumentation)
                     .addCommand(enableImeCommand)
                     .run();
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextActionTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextActionTest.java
index e51888c..1fba339 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextActionTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextActionTest.java
@@ -464,7 +464,7 @@
     public void testEditableTextView_shouldExposeAndRespondToImeEnterAction() throws Throwable {
         final TextView textView = (TextView) mActivity.findViewById(R.id.editText);
         makeTextViewVisibleAndSetText(textView, mActivity.getString(R.string.a_b));
-        textView.requestFocus();
+        sInstrumentation.runOnMainSync(() -> textView.requestFocus());
         assertTrue(textView.isFocused());
 
         final TextView.OnEditorActionListener mockOnEditorActionListener =
@@ -481,10 +481,13 @@
                 textView, EditorInfo.IME_ACTION_UNSPECIFIED, null);
 
         // Testing custom ime action : IME_ACTION_DONE.
+        sInstrumentation.runOnMainSync(() -> textView.requestFocus());
         textView.setImeActionLabel("pinyin", EditorInfo.IME_ACTION_DONE);
-        text.refresh();
-        verifyImeActionLabel(text, "pinyin");
-        text.performAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_IME_ENTER.getId());
+
+        final AccessibilityNodeInfo textNode = sUiAutomation.getRootInActiveWindow()
+                .findAccessibilityNodeInfosByText(mActivity.getString(R.string.a_b)).get(0);
+        verifyImeActionLabel(textNode, "pinyin");
+        textNode.performAction(AccessibilityNodeInfo.AccessibilityAction.ACTION_IME_ENTER.getId());
         verify(mockOnEditorActionListener, times(1)).onEditorAction(
                 textView, EditorInfo.IME_ACTION_DONE, null);
     }
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextTraversalTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextTraversalTest.java
index c524c2a..ff6f3e5 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextTraversalTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityTextTraversalTest.java
@@ -3928,8 +3928,139 @@
         assertSame(refreshedText.getTextSelectionEnd(), 4);
     }
 
+    @Test
+    public void testViewDoesNotHaveSelectableText() {
+        final TextView nonSelectableView = mActivity.findViewById(R.id.text);
+
+        sInstrumentation.runOnMainSync(() -> {
+            nonSelectableView.setVisibility(View.VISIBLE);
+            nonSelectableView.setText(getString(R.string.a_b));
+
+        });
+
+        final AccessibilityNodeInfo textNode = sUiAutomation
+                .getRootInActiveWindow().findAccessibilityNodeInfosByText(
+                        getString(R.string.a_b)).get(0);
+
+        assertFalse("Text node has selectable text.", textNode.isTextSelectable());
+    }
+
+    @Test
+    public void testViewDoesHaveSelectableText() {
+        final TextView selectableView = mActivity.findViewById(R.id.selectableText);
+        final EditText editText = mActivity.findViewById(R.id.editText);
+
+        sInstrumentation.runOnMainSync(() -> {
+            selectableView.setVisibility(View.VISIBLE);
+            selectableView.setText(getString(R.string.a_b));
+            editText.setVisibility(View.VISIBLE);
+            editText.setText(getString(R.string.foo_bar_baz));
+        });
+
+        final AccessibilityNodeInfo selectableTextNode = sUiAutomation
+                .getRootInActiveWindow().findAccessibilityNodeInfosByText(
+                        getString(R.string.a_b)).get(0);
+
+        final AccessibilityNodeInfo editTextNode = sUiAutomation
+                .getRootInActiveWindow().findAccessibilityNodeInfosByText(
+                        getString(R.string.foo_bar_baz)).get(0);
+
+        assertTrue("Text node does not have selectable text.",
+                selectableTextNode.isTextSelectable());
+
+        assertTrue("EditText node does not have selectable text.", editTextNode.isTextSelectable());
+    }
+
+    @Test
+    public void testSelectionMovesFocus() throws Exception {
+        final TextView selectableView = mActivity.findViewById(R.id.selectableText);
+        final EditText editText = mActivity.findViewById(R.id.editText);
+
+        sInstrumentation.runOnMainSync(() -> {
+            selectableView.setVisibility(View.VISIBLE);
+            selectableView.setText(getString(R.string.a_b));
+            editText.setVisibility(View.VISIBLE);
+            editText.setText(getString(R.string.foo_bar_baz));
+            editText.setFocusable(true);
+            editText.requestFocus();
+        });
+
+        AccessibilityNodeInfo selectableTextNode = sUiAutomation
+                .getRootInActiveWindow().findAccessibilityNodeInfosByText(
+                        getString(R.string.a_b)).get(0);
+
+        final AccessibilityNodeInfo editTextNode = sUiAutomation
+                .getRootInActiveWindow().findAccessibilityNodeInfosByText(
+                        getString(R.string.foo_bar_baz)).get(0);
+
+        assertTrue("Selectable text node does not have selectable text.",
+                selectableTextNode.isTextSelectable());
+
+        assertTrue("EditText node does not have selectable text.",
+                editTextNode.isTextSelectable());
+
+        assertTrue("EditText is not focused", editTextNode.isFocused());
+
+        performMovementActionAndGetEvent(selectableTextNode,
+                AccessibilityNodeInfo.AccessibilityAction.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
+                AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER, true);
+
+        // Refresh node.
+        selectableTextNode = sUiAutomation
+                .getRootInActiveWindow().findAccessibilityNodeInfosByText(
+                        getString(R.string.a_b)).get(0);
+
+        assertTrue("Selectable text node does not get focus after selection",
+                selectableTextNode.isFocused());
+    }
+
+    @Test
+    public void testSelectionDoesNotMoveFocus() throws Exception {
+        final TextView selectableView = mActivity.findViewById(R.id.selectableText);
+        final EditText editText = mActivity.findViewById(R.id.editText);
+
+        sInstrumentation.runOnMainSync(() -> {
+            selectableView.setVisibility(View.VISIBLE);
+            selectableView.setText(getString(R.string.a_b));
+            selectableView.setTextIsSelectable(false);
+            editText.setVisibility(View.VISIBLE);
+            editText.setText(getString(R.string.foo_bar_baz));
+            editText.setFocusable(true);
+            editText.requestFocus();
+        });
+
+        AccessibilityNodeInfo selectableTextNode = sUiAutomation
+                .getRootInActiveWindow().findAccessibilityNodeInfosByText(
+                        getString(R.string.a_b)).get(0);
+
+        final AccessibilityNodeInfo editTextNode = sUiAutomation
+                .getRootInActiveWindow().findAccessibilityNodeInfosByText(
+                        getString(R.string.foo_bar_baz)).get(0);
+
+        assertFalse("Selectable text node does have selectable text.",
+                selectableTextNode.isTextSelectable());
+
+        assertTrue("EditText node does not have selectable text.",
+                editTextNode.isTextSelectable());
+
+        assertTrue("EditText is not focused", editTextNode.isFocused());
+
+        performMovementActionAndGetEvent(selectableTextNode,
+                AccessibilityNodeInfo.AccessibilityAction.ACTION_NEXT_AT_MOVEMENT_GRANULARITY,
+                AccessibilityNodeInfo.MOVEMENT_GRANULARITY_CHARACTER, true);
+
+        // Refresh node.
+        selectableTextNode = sUiAutomation
+                .getRootInActiveWindow().findAccessibilityNodeInfosByText(
+                        getString(R.string.a_b)).get(0);
+
+        assertFalse("Selectable text node gets focus after selection",
+                selectableTextNode.isFocused());
+    }
+
     private AccessibilityEvent performMovementActionAndGetEvent(final AccessibilityNodeInfo target,
-            final int action, final int granularity, final boolean extendSelection)
+            AccessibilityNodeInfo.AccessibilityAction action, final int granularity,
+            final boolean extendSelection)
             throws Exception {
         final Bundle arguments = new Bundle();
         arguments.putInt(AccessibilityNodeInfo.ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT,
@@ -3941,7 +4072,7 @@
         Runnable performActionRunnable = new Runnable() {
             @Override
             public void run() {
-                target.performAction(action, arguments);
+                target.performAction(action.getId(), arguments);
             }
         };
         UiAutomation.AccessibilityEventFilter filter = new UiAutomation.AccessibilityEventFilter() {
@@ -3949,7 +4080,7 @@
             public boolean accept(AccessibilityEvent event) {
                 boolean isMovementEvent = event.getEventType()
                         == AccessibilityEvent.TYPE_VIEW_TEXT_TRAVERSED_AT_MOVEMENT_GRANULARITY;
-                boolean actionMatches = event.getAction() == action;
+                boolean actionMatches = event.getAction() == action.getId();
                 boolean packageMatches =
                         event.getPackageName().equals(mActivity.getPackageName());
                 boolean granularityMatches = event.getMovementGranularity() == granularity;
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingTest.java
index 94791de..49dfb93 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/AccessibilityWindowReportingTest.java
@@ -24,6 +24,7 @@
 import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityAndWaitForItToBeOnscreen;
 import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.launchActivityOnSpecifiedDisplayAndWaitForItToBeOnscreen;
 import static android.accessibilityservice.cts.utils.ActivityLaunchUtils.supportsMultiDisplay;
+import static android.accessibilityservice.cts.utils.AsyncUtils.DEFAULT_TIMEOUT_MS;
 import static android.accessibilityservice.cts.utils.DisplayUtils.VirtualDisplaySession;
 import static android.accessibilityservice.cts.utils.DisplayUtils.getStatusBarHeight;
 import static android.content.pm.PackageManager.FEATURE_PICTURE_IN_PICTURE;
@@ -44,15 +45,22 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assume.assumeTrue;
 
+import android.Manifest;
 import android.accessibility.cts.common.AccessibilityDumpOnFailureRule;
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.accessibilityservice.cts.activities.AccessibilityWindowReportingActivity;
 import android.accessibilityservice.cts.activities.NonDefaultDisplayActivity;
+import android.accessibilityservice.cts.activities.NotTouchableWindowTestActivity;
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.app.UiAutomation;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
 import android.graphics.Rect;
 import android.os.SystemClock;
+import android.platform.test.annotations.AppModeFull;
+import android.provider.Settings;
 import android.view.Gravity;
 import android.view.InputDevice;
 import android.view.MotionEvent;
@@ -68,6 +76,8 @@
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.SystemUtil;
+
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -76,6 +86,7 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeoutException;
 
@@ -154,10 +165,9 @@
         final WindowManager.LayoutParams paramsForBottom = layoutParmsForWindowOnBottom();
         final Button button = new Button(mActivity);
         button.setText(R.string.button1);
-        sUiAutomation.executeAndWaitForEvent(() -> sInstrumentation.runOnMainSync(
-                () -> mActivity.getWindowManager().addView(button, paramsForTop)),
-                filterWindowsChangedWithChangeTypes(WINDOWS_CHANGE_ADDED),
-                TIMEOUT_ASYNC_PROCESSING);
+
+        addWindowAndWaitForEvent(button, paramsForTop,
+                        filterWindowsChangedWithChangeTypes(WINDOWS_CHANGE_ADDED));
 
         // Move window from top to bottom
         sUiAutomation.executeAndWaitForEvent(() -> sInstrumentation.runOnMainSync(
@@ -410,18 +420,138 @@
         assertTrue("Failed to find accessibility window for auto-complete pop-up", foundPopup);
     }
 
+    @AppModeFull
+    @Test
+    public void showNotTouchableWindow_activityWindowIsNotVisible()
+            throws TimeoutException {
+        try {
+            launchNotTouchableWindowTestActivityFromShell();
+
+            Intent intent = new Intent();
+            intent.setAction(NotTouchableWindowTestActivity.ADD_WINDOW);
+
+            try {
+                // Waits for the not-touchable activity is covered by the untrusted window.
+                sUiAutomation.executeAndWaitForEvent(() -> sInstrumentation.runOnMainSync(
+                        () -> sInstrumentation.getContext().sendBroadcast(intent)),
+                        (event) -> {
+                            final AccessibilityWindowInfo notTouchableWindow =
+                                    findWindowByTitle(sUiAutomation,
+                                            NotTouchableWindowTestActivity.TITLE);
+                            return notTouchableWindow == null;
+                        }, TIMEOUT_ASYNC_PROCESSING);
+            } finally {
+                intent.setAction(NotTouchableWindowTestActivity.REMOVE_WINDOW);
+                sendIntentAndWaitForEvent(intent,
+                        filterWindowsChangedWithChangeTypes(WINDOWS_CHANGE_REMOVED));
+            }
+        } finally {
+            Intent intent = new Intent();
+            intent.setAction(NotTouchableWindowTestActivity.FINISH_ACTIVITY);
+            sendIntentAndWaitForEvent(intent,
+                    filterWindowsChangedWithChangeTypes(WINDOWS_CHANGE_REMOVED));
+        }
+    }
+
+    @AppModeFull
+    @Test
+    public void showNotTouchableTrustedWindow_activityWindowIsVisible()
+            throws TimeoutException {
+        try {
+            launchNotTouchableWindowTestActivityFromShell();
+
+            Intent intent = new Intent();
+            intent.setAction(NotTouchableWindowTestActivity.ADD_TRUSTED_WINDOW);
+
+            try {
+                SystemUtil.runWithShellPermissionIdentity(sUiAutomation, () -> {
+                    sendIntentAndWaitForEvent(intent,
+                            filterWindowsChangeTypesAndWindowTitle(sUiAutomation,
+                                    WINDOWS_CHANGE_ADDED,
+                                    NotTouchableWindowTestActivity.NON_TOUCHABLE_WINDOW_TITLE.toString())
+                    );
+                }, Manifest.permission.INTERNAL_SYSTEM_WINDOW);
+
+                List<AccessibilityWindowInfo> windows = sUiAutomation.getWindows();
+                assertNotNull(windows);
+
+                assertEquals(1, windows.stream().filter(
+                        w -> NotTouchableWindowTestActivity.TITLE.equals(w.getTitle())).count());
+            } finally {
+                intent.setAction(NotTouchableWindowTestActivity.REMOVE_WINDOW);
+                sendIntentAndWaitForEvent(intent,
+                        filterWindowsChangedWithChangeTypes(WINDOWS_CHANGE_REMOVED));
+            }
+        } finally {
+            Intent intent = new Intent();
+            intent.setAction(NotTouchableWindowTestActivity.FINISH_ACTIVITY);
+            sendIntentAndWaitForEvent(intent,
+                    filterWindowsChangedWithChangeTypes(WINDOWS_CHANGE_REMOVED));
+        }
+    }
+
+    // We want to test WindowState#isTrustedOverlay which refers to flag stored in the
+    // Session class and is not updated since the Session is created.
+    // Use shell command instead of ActivityLaunchUtils to get INTERNAL_SYSTEM_WINDOW
+    // permission when the Session is created.
+    private void launchNotTouchableWindowTestActivityFromShell() {
+        SystemUtil.runWithShellPermissionIdentity(sUiAutomation, () -> {
+            sUiAutomation.executeAndWaitForEvent(
+                    () -> {
+                        final ComponentName componentName = new ComponentName(
+                                sInstrumentation.getContext(), NotTouchableWindowTestActivity.class);
+
+                        String command = "am start -n " + componentName.flattenToString();
+                        try {
+                            SystemUtil.runShellCommand(sInstrumentation, command);
+                        } catch (IOException e) {
+                            throw new RuntimeException(e);
+                        }
+                    },
+                    (event) -> {
+                        final AccessibilityWindowInfo window =
+                                findWindowByTitleAndDisplay(sUiAutomation,
+                                        NotTouchableWindowTestActivity.TITLE, 0);
+                        return window != null;
+                    }, DEFAULT_TIMEOUT_MS);
+        }, Manifest.permission.INTERNAL_SYSTEM_WINDOW);
+    }
+
+        /**
+        * Test whether we can successfully enable and disable window animations.
+        */
+    @Test
+    public void testDisableWindowAnimations() {
+        setAndAssertAnimationScale(0.0f);
+        setAndAssertAnimationScale(0.5f);
+        setAndAssertAnimationScale(1.0f);
+    }
+
+    /** Sets the animation scale to a specified value and asserts that the value has been set. */
+    private void setAndAssertAnimationScale(float value) {
+        Context context = sInstrumentation.getContext();
+        sUiAutomation.setAnimationScale(value);
+        assertEquals(value, getGlobalFloat(context, Settings.Global.WINDOW_ANIMATION_SCALE), 0.0f);
+        assertEquals(
+                value, getGlobalFloat(context, Settings.Global.TRANSITION_ANIMATION_SCALE), 0.0f);
+        assertEquals(value, getGlobalFloat(context, Settings.Global.ANIMATOR_DURATION_SCALE), 0.0f);
+    }
+
+    /** Returns value of constants in Settings.Global. */
+    private static float getGlobalFloat(Context context, String constantName) {
+        float value = Settings.Global.getFloat(context.getContentResolver(), constantName, -1);
+        return value;
+    }
+
     private View showTopWindowAndWaitForItToShowUp() throws TimeoutException {
         final WindowManager.LayoutParams paramsForTop = layoutParmsForWindowOnTop();
         final Button button = new Button(mActivity);
         button.setText(R.string.button1);
-        sUiAutomation.executeAndWaitForEvent(() -> sInstrumentation.runOnMainSync(
-                () -> mActivity.getWindowManager().addView(button, paramsForTop)),
-                (event) -> {
-                    return (event.getEventType() == TYPE_WINDOWS_CHANGED)
-                            && (findWindowByTitle(sUiAutomation, mActivityTitle) != null)
-                            && (findWindowByTitle(sUiAutomation, TOP_WINDOW_TITLE) != null);
-                },
-                TIMEOUT_ASYNC_PROCESSING);
+        addWindowAndWaitForEvent(button, paramsForTop, (event) -> {
+            return (event.getEventType() == TYPE_WINDOWS_CHANGED)
+                    && (findWindowByTitle(sUiAutomation, mActivityTitle) != null)
+                    && (findWindowByTitle(sUiAutomation, TOP_WINDOW_TITLE) != null);
+        });
         return button;
     }
 
@@ -454,4 +584,22 @@
         });
         return params;
     }
+
+    private void addWindowAndWaitForEvent(View view, WindowManager.LayoutParams params,
+            UiAutomation.AccessibilityEventFilter filter)
+            throws TimeoutException {
+        sUiAutomation.executeAndWaitForEvent(() -> sInstrumentation.runOnMainSync(
+                () -> mActivity.getWindowManager().addView(view, params)),
+                filter,
+                TIMEOUT_ASYNC_PROCESSING);
+    }
+
+    private void sendIntentAndWaitForEvent(Intent intent,
+            UiAutomation.AccessibilityEventFilter filter) throws TimeoutException {
+        sUiAutomation.executeAndWaitForEvent(() -> sInstrumentation.runOnMainSync(
+                () -> sInstrumentation.getContext().sendBroadcast(intent)),
+                filter,
+                TIMEOUT_ASYNC_PROCESSING);
+    }
+
 }
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/MagnificationConfigTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/MagnificationConfigTest.java
new file mode 100644
index 0000000..49142e8
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/MagnificationConfigTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2021 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 android.accessibilityservice.cts;
+
+import static android.accessibilityservice.MagnificationConfig.MAGNIFICATION_MODE_FULLSCREEN;
+
+import static org.junit.Assert.assertEquals;
+
+import android.accessibilityservice.MagnificationConfig;
+import android.os.Parcel;
+import android.platform.test.annotations.Presubmit;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Class for testing {@link android.accessibilityservice.MagnificationConfig}.
+ */
+@Presubmit
+@RunWith(AndroidJUnit4.class)
+public class MagnificationConfigTest {
+
+    private final int mMode = MAGNIFICATION_MODE_FULLSCREEN;
+    private final float mScale = 1;
+    private final float mCenterX = 2;
+    private final float mCenterY = 3;
+
+    @Test
+    public void testMarshaling() {
+        // Populate the magnification config to marshal.
+        MagnificationConfig magnificationConfig = populateMagnificationConfig();
+
+        // Marshal and unmarshal the magnification config.
+        Parcel parcel = Parcel.obtain();
+        magnificationConfig.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        MagnificationConfig fromParcel =
+                MagnificationConfig.CREATOR.createFromParcel(parcel);
+
+        // Make sure all fields properly marshaled.
+        assertEqualsMagnificationConfig(magnificationConfig, fromParcel);
+
+        parcel.recycle();
+    }
+
+    @Test
+    public void testGetterMethods_dataPopulated_assertDataEqual() {
+        MagnificationConfig magnificationConfig = populateMagnificationConfig();
+
+        assertEquals("getMode is different from magnificationConfig", mMode,
+                magnificationConfig.getMode());
+        assertEquals("getScale is different from magnificationConfig", mScale,
+                magnificationConfig.getScale(), 0);
+        assertEquals("getCenterX is different from magnificationConfig", mCenterX,
+                magnificationConfig.getCenterX(), 0);
+        assertEquals("getCenterY is different from magnificationConfig", mCenterY,
+                magnificationConfig.getCenterY(), 0);
+    }
+
+    private void assertEqualsMagnificationConfig(MagnificationConfig expectedConfig,
+            MagnificationConfig actualConfig) {
+        assertEquals("getMode has incorrect value", expectedConfig.getMode(),
+                actualConfig.getMode());
+        assertEquals("getScale has incorrect value", expectedConfig.getScale(),
+                actualConfig.getScale(), 0);
+        assertEquals("getCenterX has incorrect value", expectedConfig.getCenterX(),
+                actualConfig.getCenterX(), 0);
+        assertEquals("getCenterY has incorrect value", expectedConfig.getCenterY(),
+                actualConfig.getCenterY(), 0);
+    }
+
+    private MagnificationConfig populateMagnificationConfig() {
+        MagnificationConfig.Builder builder =
+                new MagnificationConfig.Builder();
+        MagnificationConfig magnificationConfig = builder.setMode(mMode).setScale(
+                mScale).setCenterX(mCenterX).setCenterY(mCenterY).build();
+        return magnificationConfig;
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/StubImeAccessibilityService.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubImeAccessibilityService.java
new file mode 100644
index 0000000..77e194e
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubImeAccessibilityService.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2022 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 android.accessibilityservice.cts;
+
+import android.accessibility.cts.common.InstrumentedAccessibilityService;
+import android.accessibilityservice.AccessibilityService;
+import android.accessibilityservice.InputMethod;
+import android.view.inputmethod.EditorInfo;
+
+import androidx.annotation.NonNull;
+
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * A stub accessibility service to install for testing IME APIs
+ */
+public class StubImeAccessibilityService extends InstrumentedAccessibilityService {
+    private static final int INVALID = -11;
+    public int selStart = -1;
+    public int selEnd = -1;
+    public int oldSelStart = -1;
+    public int oldSelEnd = -1;
+    private CountDownLatch mStartInputLatch = null;
+    private CountDownLatch mSelectionChangeLatch = null;
+    private int mSelectionTarget = INVALID;
+
+    @FunctionalInterface
+    public interface OnStartInputCallback {
+        void onStartInput(EditorInfo editorInfo, boolean restarting);
+    }
+
+    private OnStartInputCallback mOnStartInputCallback;
+
+    public void setOnStartInputCallback(OnStartInputCallback callback) {
+        mOnStartInputCallback = callback;
+    }
+
+    public void setStartInputCountDownLatch(CountDownLatch latch) {
+        mStartInputLatch = latch;
+    }
+
+    public void setSelectionChangeLatch(CountDownLatch latch) {
+        mSelectionChangeLatch = latch;
+    }
+    public void setSelectionTarget(int target) {
+        mSelectionTarget = target;
+    }
+
+    class InputMethodImpl extends InputMethod {
+        InputMethodImpl(@NonNull AccessibilityService service) {
+            super(service);
+        }
+
+        @Override
+        public void onUpdateSelection(int oldSelStart, int oldSelEnd, int newSelStart,
+                int newSelEnd, int candidatesStart, int candidatesEnd) {
+            super.onUpdateSelection(oldSelStart, oldSelEnd, newSelStart, newSelEnd, candidatesStart,
+                    candidatesEnd);
+            // A11y receive placeholder notification.
+            if ((mSelectionChangeLatch != null) && (newSelStart == mSelectionTarget)) {
+                StubImeAccessibilityService.this.oldSelStart = oldSelStart;
+                StubImeAccessibilityService.this.oldSelEnd = oldSelEnd;
+                StubImeAccessibilityService.this.selStart = newSelStart;
+                StubImeAccessibilityService.this.selEnd = newSelEnd;
+                mSelectionChangeLatch.countDown();
+                mSelectionChangeLatch = null;
+            }
+        }
+
+        @Override
+        public void onStartInput(EditorInfo attribute, boolean restarting) {
+            super.onStartInput(attribute, restarting);
+            if (mStartInputLatch != null) {
+                mStartInputLatch.countDown();
+                mStartInputLatch = null;
+            }
+            if (mOnStartInputCallback != null) {
+                mOnStartInputCallback.onStartInput(attribute, restarting);
+            }
+        }
+    }
+
+    @Override
+    public InputMethod onCreateInputMethod() {
+        return new InputMethodImpl(this);
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/StubInputMethod.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubInputMethod.java
new file mode 100644
index 0000000..7558758
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubInputMethod.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2021 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 android.accessibilityservice.cts;
+
+import android.inputmethodservice.InputMethodService;
+
+public class StubInputMethod extends InputMethodService {
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/StubNonImeAccessibilityService.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubNonImeAccessibilityService.java
new file mode 100644
index 0000000..7f6ff33
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubNonImeAccessibilityService.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2022 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 android.accessibilityservice.cts;
+
+/**
+ * A stub accessibility service to install for testing IME APIs
+ */
+public class StubNonImeAccessibilityService extends StubImeAccessibilityService {
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/StubSimpleImeAccessibilityService.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubSimpleImeAccessibilityService.java
new file mode 100644
index 0000000..d34b593
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/StubSimpleImeAccessibilityService.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022 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 android.accessibilityservice.cts;
+
+import android.accessibility.cts.common.InstrumentedAccessibilityService;
+import android.accessibilityservice.InputMethod;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public final class StubSimpleImeAccessibilityService extends InstrumentedAccessibilityService {
+    private final CountDownLatch mOnCreateInputMethodLatch = new CountDownLatch(1);
+
+    public boolean awaitOnCreateInputMethod(long timeout, TimeUnit unit)
+            throws InterruptedException {
+        return mOnCreateInputMethodLatch.await(timeout, unit);
+    }
+
+    @Override
+    public InputMethod onCreateInputMethod() {
+        mOnCreateInputMethodLatch.countDown();
+        return super.onCreateInputMethod();
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorationStubAccessibilityService.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorationStubAccessibilityService.java
index 826e53f..808ad88 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorationStubAccessibilityService.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorationStubAccessibilityService.java
@@ -16,8 +16,6 @@
 import static android.view.accessibility.AccessibilityEvent.TYPE_GESTURE_DETECTION_END;
 import static android.view.accessibility.AccessibilityEvent.TYPE_GESTURE_DETECTION_START;
 import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED;
-import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_CLICKED;
-import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_LONG_CLICKED;
 
 import android.view.accessibility.AccessibilityEvent;
 
@@ -40,8 +38,6 @@
                     break;
                 case TYPE_GESTURE_DETECTION_START:
                 case TYPE_GESTURE_DETECTION_END:
-                case TYPE_VIEW_CLICKED:
-                case TYPE_VIEW_LONG_CLICKED:
                     mCollectedEvents.add(event.getEventType());
             }
         }
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java
index 7ffb23d..26f0907 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchExplorerTest.java
@@ -43,8 +43,6 @@
 import static android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_INTERACTION_END;
 import static android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_INTERACTION_START;
 import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED;
-import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_CLICKED;
-import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_LONG_CLICKED;
 
 import static org.hamcrest.CoreMatchers.both;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -53,16 +51,17 @@
 import android.accessibility.cts.common.InstrumentedAccessibilityService;
 import android.accessibility.cts.common.InstrumentedAccessibilityServiceTestRule;
 import android.accessibility.cts.common.ShellCommandBuilder;
+import android.accessibilityservice.AccessibilityServiceInfo;
 import android.accessibilityservice.GestureDescription;
 import android.accessibilityservice.GestureDescription.StrokeDescription;
 import android.accessibilityservice.cts.AccessibilityGestureDispatchTest.GestureDispatchActivity;
+import android.accessibilityservice.cts.utils.ActivityLaunchUtils;
 import android.accessibilityservice.cts.utils.EventCapturingClickListener;
 import android.accessibilityservice.cts.utils.EventCapturingHoverListener;
 import android.accessibilityservice.cts.utils.EventCapturingLongClickListener;
 import android.accessibilityservice.cts.utils.EventCapturingTouchListener;
 import android.app.Instrumentation;
 import android.app.UiAutomation;
-import android.content.Context;
 import android.content.pm.PackageManager;
 import android.graphics.PointF;
 import android.graphics.Region;
@@ -82,7 +81,9 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.RuleChain;
@@ -99,14 +100,17 @@
 @AppModeFull
 public class TouchExplorerTest {
     // Constants
-    private static final float GESTURE_LENGTH_MMS = 10.0f;
+    private static final float GESTURE_LENGTH_MMS = 15.0f;
+    private static final float MIN_SCREEN_WIDTH_MM = 40.0f;
+
+    private static String sEnabledServices;
+    private static Instrumentation sInstrumentation;
+    private static UiAutomation sUiAutomation;
+
     private TouchExplorationStubAccessibilityService mService;
-    private Instrumentation mInstrumentation;
-    private UiAutomation mUiAutomation;
     private boolean mHasTouchscreen;
     private boolean mScreenBigEnough;
     private long mSwipeTimeMillis;
-    private String mEnabledServices;
     private EventCapturingHoverListener mHoverListener = new EventCapturingHoverListener(false);
     private EventCapturingTouchListener mTouchListener = new EventCapturingTouchListener(false);
     private EventCapturingClickListener mClickListener = new EventCapturingClickListener();
@@ -114,7 +118,7 @@
             new EventCapturingLongClickListener();
 
     private ActivityTestRule<GestureDispatchActivity> mActivityRule =
-            new ActivityTestRule<>(GestureDispatchActivity.class, false);
+            new ActivityTestRule<>(GestureDispatchActivity.class, false, false);
 
     private InstrumentedAccessibilityServiceTestRule<TouchExplorationStubAccessibilityService>
             mServiceRule =
@@ -132,42 +136,55 @@
     float mSwipeDistance;
     View mView;
 
-    @Before
-    public void setUp() throws Exception {
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+    @BeforeClass
+    public static void oneTimeSetup() {
+        sInstrumentation = InstrumentationRegistry.getInstrumentation();
         // Save enabled accessibility services before disabling them so they can be re-enabled after
         // the test.
-        mEnabledServices = Settings.Secure.getString(
-                mInstrumentation.getContext().getContentResolver(),
+        sEnabledServices = Settings.Secure.getString(
+                sInstrumentation.getContext().getContentResolver(),
                 Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
         // Disable all services before enabling Accessibility service to prevent flakiness
         // that depends on which services are enabled.
         InstrumentedAccessibilityService.disableAllServices();
-        PackageManager pm = mInstrumentation.getContext().getPackageManager();
+        sUiAutomation = sInstrumentation.getUiAutomation(
+                UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
+    }
+
+    @AfterClass
+    public static void postTestTearDown() {
+        ShellCommandBuilder.create(sInstrumentation)
+                .putSecureSetting(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, sEnabledServices)
+                .run();
+        sUiAutomation.destroy();
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        ActivityLaunchUtils.homeScreenOrBust(sInstrumentation.getContext(), sUiAutomation);
+
+        mActivityRule.launchActivity(null);
+        PackageManager pm = sInstrumentation.getContext().getPackageManager();
         mHasTouchscreen =
                 pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)
                         || pm.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH);
         // Find window size, check that it is big enough for gestures.
         // Gestures will start in the center of the window, so we need enough horiz/vert space.
         mService = mServiceRule.enableService();
-        // To prevent a deadlock, we disable UiAutomation while another a11y service is running.
-        mInstrumentation.getUiAutomation(
-                UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES).destroy();
         mView = mActivityRule.getActivity().findViewById(R.id.full_screen_text_view);
-        WindowManager windowManager =
-                (WindowManager)
-                        mInstrumentation.getContext().getSystemService(Context.WINDOW_SERVICE);
+        WindowManager windowManager = sInstrumentation.getContext().getSystemService(
+                WindowManager.class);
         final DisplayMetrics metrics = new DisplayMetrics();
         windowManager.getDefaultDisplay().getRealMetrics(metrics);
         mScreenBigEnough =
-                mView.getWidth() / 2
+                mView.getWidth()
                         > TypedValue.applyDimension(
-                                TypedValue.COMPLEX_UNIT_MM, GESTURE_LENGTH_MMS, metrics);
+                                TypedValue.COMPLEX_UNIT_MM, MIN_SCREEN_WIDTH_MM, metrics);
         if (!mHasTouchscreen || !mScreenBigEnough) return;
 
         mView.setOnHoverListener(mHoverListener);
         mView.setOnTouchListener(mTouchListener);
-        mInstrumentation.runOnMainSync(
+        sInstrumentation.runOnMainSync(
                 () -> {
                     int[] viewLocation = new int[2];
                     mView = mActivityRule.getActivity().findViewById(R.id.full_screen_text_view);
@@ -175,8 +192,9 @@
                     final int midY = mView.getHeight() / 2;
                     mView.getLocationOnScreen(viewLocation);
                     mTapLocation = new PointF(viewLocation[0] + midX, viewLocation[1] + midY);
-                    mSwipeDistance = mView.getWidth() / 4;
-
+                    mSwipeDistance =
+                            TypedValue.applyDimension(
+                                    TypedValue.COMPLEX_UNIT_MM, GESTURE_LENGTH_MMS, metrics);
                     // This must be slower than 10mm per 150ms to be detected as touch exploration.
                     final double swipeDistanceMm = mSwipeDistance / metrics.xdpi * 25.4;
                     mSwipeTimeMillis = (long) swipeDistanceMm * 20;
@@ -186,14 +204,6 @@
                 });
     }
 
-    @After
-    public void postTestTearDown() {
-        ShellCommandBuilder.create(mInstrumentation)
-                .putSecureSetting(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, mEnabledServices)
-                .run();
-
-    }
-
     /** Test a slow swipe which should initiate touch exploration. */
     @Test
     @AppModeFull
@@ -282,7 +292,7 @@
     public void testSloppyDoubleTapAccessibilityFocus_performsClick() {
         if (!mHasTouchscreen || !mScreenBigEnough) return;
         syncAccessibilityFocusToInputFocus();
-        int slop = ViewConfiguration.get(mInstrumentation.getContext()).getScaledDoubleTapSlop();
+        int slop = ViewConfiguration.get(sInstrumentation.getContext()).getScaledDoubleTapSlop();
         dispatch(multiTap(mTapLocation, 2, slop));
         mHoverListener.assertNonePropagated();
         // The click should not be delivered via touch events in this case.
@@ -290,8 +300,7 @@
         mService.assertPropagated(
                 TYPE_VIEW_ACCESSIBILITY_FOCUSED,
                 TYPE_TOUCH_INTERACTION_START,
-                TYPE_TOUCH_INTERACTION_END,
-                TYPE_VIEW_CLICKED);
+                TYPE_TOUCH_INTERACTION_END);
         mClickListener.assertClicked(mView);
     }
 
@@ -313,8 +322,7 @@
         mService.assertPropagated(
                 TYPE_VIEW_ACCESSIBILITY_FOCUSED,
                 TYPE_TOUCH_INTERACTION_START,
-                TYPE_TOUCH_INTERACTION_END,
-                TYPE_VIEW_CLICKED);
+                TYPE_TOUCH_INTERACTION_END);
         mClickListener.assertClicked(mView);
     }
 
@@ -378,8 +386,7 @@
                 TYPE_TOUCH_INTERACTION_START,
                 TYPE_TOUCH_EXPLORATION_GESTURE_START,
                 TYPE_TOUCH_EXPLORATION_GESTURE_END,
-                TYPE_TOUCH_INTERACTION_END,
-                TYPE_VIEW_CLICKED);
+                TYPE_TOUCH_INTERACTION_END);
         mClickListener.assertClicked(mView);
     }
 
@@ -391,6 +398,7 @@
     @AppModeFull
     public void testDoubleTapNoAccessibilityFocus_sendsTouchEvents() {
         if (!mHasTouchscreen || !mScreenBigEnough) return;
+
         // Do a single tap so there is a valid last touch-explored location.
         dispatch(click(mTapLocation));
         mHoverListener.assertPropagated(ACTION_HOVER_ENTER, ACTION_HOVER_EXIT);
@@ -407,7 +415,7 @@
         // The click gets delivered as a series of touch events.
         mTouchListener.assertPropagated(ACTION_DOWN, ACTION_UP);
         mService.assertPropagated(
-                TYPE_TOUCH_INTERACTION_START, TYPE_TOUCH_INTERACTION_END, TYPE_VIEW_CLICKED);
+                TYPE_TOUCH_INTERACTION_START, TYPE_TOUCH_INTERACTION_END);
         mClickListener.assertClicked(mView);
     }
 
@@ -436,7 +444,7 @@
         // The click gets delivered as a series of touch events.
         mTouchListener.assertPropagated(ACTION_DOWN, ACTION_UP);
         mService.assertPropagated(
-                TYPE_TOUCH_INTERACTION_START, TYPE_VIEW_LONG_CLICKED, TYPE_TOUCH_INTERACTION_END);
+                TYPE_TOUCH_INTERACTION_START, TYPE_TOUCH_INTERACTION_END);
         mLongClickListener.assertLongClicked(mView);
     }
 
@@ -463,8 +471,7 @@
         mService.assertPropagated(
                 TYPE_VIEW_ACCESSIBILITY_FOCUSED,
                 TYPE_TOUCH_INTERACTION_START,
-                TYPE_TOUCH_INTERACTION_END,
-                TYPE_VIEW_CLICKED);
+                TYPE_TOUCH_INTERACTION_END);
         mClickListener.assertClicked(mView);
     }
 
@@ -578,14 +585,14 @@
         mTouchListener.assertPropagated(ACTION_DOWN, ACTION_MOVE, ACTION_UP);
         // We still want accessibility events to tell us when the gesture starts and ends.
         mService.assertPropagated(
-                TYPE_TOUCH_INTERACTION_START, TYPE_TOUCH_INTERACTION_END, TYPE_VIEW_CLICKED);
+                TYPE_TOUCH_INTERACTION_START, TYPE_TOUCH_INTERACTION_END);
         mService.clearEvents();
         // Swipe starting inside the passthrough region but ending outside of it. This should still
         // behave as a passthrough interaction.
         dispatch(swipe(mTapLocation, add(mTapLocation, -mSwipeDistance, 0)));
         mTouchListener.assertPropagated(ACTION_DOWN, ACTION_MOVE, ACTION_UP);
         mService.assertPropagated(
-                TYPE_TOUCH_INTERACTION_START, TYPE_TOUCH_INTERACTION_END, TYPE_VIEW_CLICKED);
+                TYPE_TOUCH_INTERACTION_START, TYPE_TOUCH_INTERACTION_END);
         mService.clearEvents();
         // Swipe outside the passthrough region. This should not generate touch events.
         dispatch(swipe(add(mTapLocation, -1, 0), add(mTapLocation, -mSwipeDistance, 0)));
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchInteractionControllerTest.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchInteractionControllerTest.java
new file mode 100644
index 0000000..26c876c
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/TouchInteractionControllerTest.java
@@ -0,0 +1,435 @@
+/*
+ * Copyright (C) 2021 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 android.accessibilityservice.cts;
+
+import static android.accessibilityservice.cts.utils.AsyncUtils.await;
+import static android.accessibilityservice.cts.utils.GestureUtils.add;
+import static android.accessibilityservice.cts.utils.GestureUtils.click;
+import static android.accessibilityservice.cts.utils.GestureUtils.dispatchGesture;
+import static android.accessibilityservice.cts.utils.GestureUtils.doubleTap;
+import static android.accessibilityservice.cts.utils.GestureUtils.swipe;
+import static android.view.MotionEvent.ACTION_DOWN;
+import static android.view.MotionEvent.ACTION_HOVER_ENTER;
+import static android.view.MotionEvent.ACTION_HOVER_EXIT;
+import static android.view.MotionEvent.ACTION_MOVE;
+import static android.view.MotionEvent.ACTION_POINTER_DOWN;
+import static android.view.MotionEvent.ACTION_POINTER_UP;
+import static android.view.MotionEvent.ACTION_UP;
+import static android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_END;
+import static android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_EXPLORATION_GESTURE_START;
+import static android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_INTERACTION_END;
+import static android.view.accessibility.AccessibilityEvent.TYPE_TOUCH_INTERACTION_START;
+import static android.view.accessibility.AccessibilityEvent.TYPE_VIEW_ACCESSIBILITY_FOCUSED;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
+import android.accessibility.cts.common.AccessibilityDumpOnFailureRule;
+import android.accessibility.cts.common.InstrumentedAccessibilityService;
+import android.accessibility.cts.common.InstrumentedAccessibilityServiceTestRule;
+import android.accessibility.cts.common.ShellCommandBuilder;
+import android.accessibilityservice.GestureDescription;
+import android.accessibilityservice.GestureDescription.StrokeDescription;
+import android.accessibilityservice.TouchInteractionController;
+import android.accessibilityservice.cts.AccessibilityGestureDispatchTest.GestureDispatchActivity;
+import android.accessibilityservice.cts.utils.ActivityLaunchUtils;
+import android.accessibilityservice.cts.utils.EventCapturingClickListener;
+import android.accessibilityservice.cts.utils.EventCapturingHoverListener;
+import android.accessibilityservice.cts.utils.EventCapturingLongClickListener;
+import android.accessibilityservice.cts.utils.EventCapturingTouchListener;
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.content.pm.PackageManager;
+import android.graphics.PointF;
+import android.platform.test.annotations.AppModeFull;
+import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.util.DisplayMetrics;
+import android.util.TypedValue;
+import android.view.Display;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.WindowManager;
+import android.view.accessibility.AccessibilityNodeInfo;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.Executors;
+
+/**
+ * A set of tests for testing touch exploration. Each test dispatches a gesture and checks for the
+ * appropriate hover and/or touch events followed by the appropriate accessibility events. Some
+ * tests will then check for events from the view.
+ */
+@RunWith(AndroidJUnit4.class)
+@AppModeFull
+@Presubmit
+public class TouchInteractionControllerTest {
+    // Constants
+    private static final float GESTURE_LENGTH_MM = 15.0f;
+    private static final float MIN_SCREEN_WIDTH_MM = 40.0f;
+
+    private static String sEnabledServices;
+    private static Instrumentation sInstrumentation;
+    private static UiAutomation sUiAutomation;
+
+    private TouchExplorationStubAccessibilityService mService;
+    private boolean mHasTouchscreen;
+    private boolean mScreenBigEnough;
+    private long mSwipeTimeMillis;
+    private EventCapturingHoverListener mHoverListener = new EventCapturingHoverListener(false);
+    private EventCapturingTouchListener mTouchListener = new EventCapturingTouchListener(false);
+    private EventCapturingClickListener mClickListener = new EventCapturingClickListener();
+    private EventCapturingLongClickListener mLongClickListener =
+            new EventCapturingLongClickListener();
+
+    private ActivityTestRule<GestureDispatchActivity> mActivityRule =
+            new ActivityTestRule<>(GestureDispatchActivity.class, false, false);
+
+    private InstrumentedAccessibilityServiceTestRule<TouchExplorationStubAccessibilityService>
+            mServiceRule =
+                    new InstrumentedAccessibilityServiceTestRule<>(
+                            TouchExplorationStubAccessibilityService.class, false);
+
+    private AccessibilityDumpOnFailureRule mDumpOnFailureRule =
+            new AccessibilityDumpOnFailureRule();
+
+    @Rule
+    public final RuleChain mRuleChain =
+            RuleChain.outerRule(mActivityRule).around(mServiceRule).around(mDumpOnFailureRule);
+
+    PointF mTapLocation; // Center of activity. Gestures all start from around this point.
+    float mSwipeDistance;
+    View mView;
+    TouchInteractionController mController;
+
+    @BeforeClass
+    public static void oneTimeSetup() {
+        sInstrumentation = InstrumentationRegistry.getInstrumentation();
+        // Save enabled accessibility services before disabling them so they can be re-enabled after
+        // the test.
+        sEnabledServices =
+                Settings.Secure.getString(
+                        sInstrumentation.getContext().getContentResolver(),
+                        Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
+        // Disable all services before enabling Accessibility service to prevent flakiness
+        // that depends on which services are enabled.
+        InstrumentedAccessibilityService.disableAllServices();
+        sUiAutomation =
+                sInstrumentation.getUiAutomation(
+                        UiAutomation.FLAG_DONT_SUPPRESS_ACCESSIBILITY_SERVICES);
+    }
+
+    @AfterClass
+    public static void postTestTearDown() {
+        ShellCommandBuilder.create(sInstrumentation)
+                .putSecureSetting(Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES, sEnabledServices)
+                .run();
+        sUiAutomation.destroy();
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        ActivityLaunchUtils.homeScreenOrBust(sInstrumentation.getContext(), sUiAutomation);
+        mActivityRule.launchActivity(null);
+
+        PackageManager pm = sInstrumentation.getContext().getPackageManager();
+        mHasTouchscreen =
+                pm.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)
+                        || pm.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH);
+        // Find window size, check that it is big enough for gestures.
+        // Gestures will start in the center of the window, so we need enough horiz/vert space.
+        mService = mServiceRule.enableService();
+        mView = mActivityRule.getActivity().findViewById(R.id.full_screen_text_view);
+        WindowManager windowManager =
+                sInstrumentation.getContext().getSystemService(WindowManager.class);
+        final DisplayMetrics metrics = new DisplayMetrics();
+        windowManager.getDefaultDisplay().getRealMetrics(metrics);
+        mScreenBigEnough =
+                mView.getWidth()
+                        > TypedValue.applyDimension(
+                                TypedValue.COMPLEX_UNIT_MM, MIN_SCREEN_WIDTH_MM, metrics);
+        if (!mHasTouchscreen || !mScreenBigEnough) return;
+
+        mView.setOnHoverListener(mHoverListener);
+        mView.setOnTouchListener(mTouchListener);
+        sInstrumentation.runOnMainSync(
+                () -> {
+                    int[] viewLocation = new int[2];
+                    mView = mActivityRule.getActivity().findViewById(R.id.full_screen_text_view);
+                    final int midX = mView.getWidth() / 2;
+                    final int midY = mView.getHeight() / 2;
+                    mView.getLocationOnScreen(viewLocation);
+                    mTapLocation = new PointF(viewLocation[0] + midX, viewLocation[1] + midY);
+                    mSwipeDistance =
+                            TypedValue.applyDimension(
+                                    TypedValue.COMPLEX_UNIT_MM, GESTURE_LENGTH_MM, metrics);
+                    // This must be slower than 10mm per 150ms to be detected as touch exploration.
+                    final double swipeDistanceMm = mSwipeDistance / metrics.xdpi * 25.4;
+                    mSwipeTimeMillis = (long) swipeDistanceMm * 20;
+
+                    mView.setOnClickListener(mClickListener);
+                    mView.setOnLongClickListener(mLongClickListener);
+                });
+        mController = mService.getTouchInteractionController(Display.DEFAULT_DISPLAY);
+    }
+
+    @After
+    public void tearDown() {
+        if (mService != null) {
+            mService.disableSelfAndRemove();
+        }
+    }
+
+    public void assertBasicConsistency() {
+        assertEquals(Display.DEFAULT_DISPLAY, mController.getDisplayId());
+        assertTrue(mController.getMaxPointerCount() > 0);
+        int state = mController.getState();
+        assertNotEquals("Unknown state: " + state, TouchInteractionController.stateToString(state));
+    }
+
+    /** Test whether we can initiate touch exploration when performing a single tap. */
+    @Test
+    @AppModeFull
+    public void testSingleTap_initiatesTouchExploration() {
+        if (!mHasTouchscreen || !mScreenBigEnough) return;
+        assertBasicConsistency();
+        mController.registerCallback(
+                Executors.newSingleThreadExecutor(),
+                new BaseCallback() {
+                    public void onMotionEvent(MotionEvent event) {
+                        if (event.getActionMasked() == ACTION_DOWN) {
+                            mController.requestTouchExploration();
+                        }
+                    }
+                });
+        dispatch(click(mTapLocation));
+        mHoverListener.assertPropagated(ACTION_HOVER_ENTER, ACTION_HOVER_EXIT);
+        mTouchListener.assertNonePropagated();
+    }
+
+    /** Test whether we can initiate a drag. */
+    @Test
+    @AppModeFull
+    public void testTwoFingerDrag_sendsTouchEvents() {
+        if (!mHasTouchscreen || !mScreenBigEnough) return;
+        assertBasicConsistency();
+        mController.registerCallback(
+                Executors.newSingleThreadExecutor(),
+                new BaseCallback() {
+                    public void onMotionEvent(MotionEvent event) {
+                        if (event.getActionMasked() == ACTION_POINTER_DOWN) {
+                            mController.requestDragging(event.getPointerId(0));
+                        }
+                    }
+                });
+        // A two point moving that are in the same direction can perform a drag gesture by
+        // TouchExplorer while one point moving can not perform a drag gesture. We use two
+        // swipes
+        // to emulate a two finger drag gesture.
+        final int twoFingerOffset = (int) mSwipeDistance;
+        final PointF dragStart = mTapLocation;
+        final PointF dragEnd = add(dragStart, 0, mSwipeDistance);
+        final PointF finger1Start = add(dragStart, twoFingerOffset, 0);
+        final PointF finger1End = add(finger1Start, 0, mSwipeDistance);
+        final PointF finger2Start = add(dragStart, -twoFingerOffset, 0);
+        final PointF finger2End = add(finger2Start, 0, mSwipeDistance);
+        dispatch(
+                swipe(finger1Start, finger1End, mSwipeTimeMillis),
+                swipe(finger2Start, finger2End, mSwipeTimeMillis));
+        mHoverListener.assertNonePropagated();
+        mTouchListener.assertPropagated(ACTION_DOWN, ACTION_MOVE, ACTION_UP);
+    }
+
+    /**
+     * This method tests the case where two fingers are moving independently. The gesture should be
+     * delegated to the view as-is. This is distinct from dragging, where two fingers are delegated
+     * to the view as one finger.
+     */
+    @Test
+    @AppModeFull
+    public void testTwoFingersMovingIndependently_shouldDelegate() {
+        if (!mHasTouchscreen || !mScreenBigEnough) return;
+        assertBasicConsistency();
+        mController.registerCallback(
+                Executors.newSingleThreadExecutor(),
+                new BaseCallback() {
+                    public void onMotionEvent(MotionEvent event) {
+                        if (event.getActionMasked() == ACTION_POINTER_DOWN) {
+                            mController.requestDelegating();
+                        }
+                    }
+                });
+        // Move two fingers towards eacher slowly.
+        PointF finger1Start = add(mTapLocation, -mSwipeDistance, 0);
+        PointF finger1End = add(mTapLocation, -10, 0);
+        StrokeDescription swipe1 = swipe(finger1Start, finger1End, mSwipeTimeMillis);
+        PointF finger2Start = add(mTapLocation, mSwipeDistance, 0);
+        PointF finger2End = add(mTapLocation, 10, 0);
+        StrokeDescription swipe2 = swipe(finger2Start, finger2End, mSwipeTimeMillis);
+        dispatch(swipe1, swipe2);
+        mHoverListener.assertNonePropagated();
+        mTouchListener.assertPropagated(
+                ACTION_DOWN, ACTION_POINTER_DOWN, ACTION_MOVE, ACTION_POINTER_UP, ACTION_UP);
+    }
+
+    /** Insure that double-tap is recognized as a single interaction. */
+    @Test
+    @AppModeFull
+    public void testDoubleTap_producesSingleInteraction() {
+        if (!mHasTouchscreen || !mScreenBigEnough) return;
+        assertBasicConsistency();
+        dispatch(doubleTap(mTapLocation));
+        mService.assertPropagated(TYPE_TOUCH_INTERACTION_START, TYPE_TOUCH_INTERACTION_END);
+    }
+
+    /**
+     * Test the case where we want to click on the item that has accessibility focus by using
+     * AccessibilityNodeInfo.performAction. Note that this test does not request that double tap be
+     * dispatched to the accessibility service, meaning that it will be handled by the framework and
+     * the view will be clicked.
+     */
+    @Test
+    @AppModeFull
+    public void testPerformClickAccessibilityFocus_performsClick() {
+        if (!mHasTouchscreen || !mScreenBigEnough) return;
+        assertBasicConsistency();
+        syncAccessibilityFocusToInputFocus();
+        mController.performClick();
+        mService.assertPropagated(TYPE_VIEW_ACCESSIBILITY_FOCUSED);
+        mHoverListener.assertNonePropagated();
+        // The click should not be delivered via touch events in this case.
+        mTouchListener.assertNonePropagated();
+        mClickListener.assertClicked(mView);
+    }
+
+    /**
+     * Test the case where we double tap but there is no accessibility focus. Nothing should happen.
+     */
+    @Test
+    @AppModeFull
+    public void testPerformClickNoFocus_doesNotPerformClick() {
+        if (!mHasTouchscreen || !mScreenBigEnough) return;
+        assertBasicConsistency();
+        mController.performClick();
+        mHoverListener.assertNonePropagated();
+        mTouchListener.assertNonePropagated();
+        mClickListener.assertNoneClicked();
+    }
+
+    /** Set the accessibility focus to the element that has input focus. */
+    @Test
+    @AppModeFull
+    public void testPerformLongClick_sendsMotionEvents() {
+        if (!mHasTouchscreen || !mScreenBigEnough) return;
+        assertBasicConsistency();
+        // First perform touch exploration.
+        mController.registerCallback(
+                Executors.newSingleThreadExecutor(),
+                new BaseCallback() {
+                    public void onMotionEvent(MotionEvent event) {
+                        if (event.getActionMasked() == ACTION_DOWN) {
+                            mController.requestTouchExploration();
+                        }
+                    }
+                });
+        dispatch(click(mTapLocation));
+        mHoverListener.assertPropagated(ACTION_HOVER_ENTER, ACTION_HOVER_EXIT);
+        mTouchListener.assertNonePropagated();
+        // Wait for the interaction ends before beginning a new one.
+        mService.assertPropagated(
+                TYPE_TOUCH_INTERACTION_START,
+                TYPE_TOUCH_EXPLORATION_GESTURE_START,
+                TYPE_TOUCH_EXPLORATION_GESTURE_END,
+                TYPE_TOUCH_INTERACTION_END);
+        mController.unregisterAllCallbacks();
+        mController.registerCallback(
+                Executors.newSingleThreadExecutor(),
+                new BaseCallback() {
+                    public void onMotionEvent(MotionEvent event) {
+                        if (event.getActionMasked() == ACTION_DOWN) {
+                            mController.performLongClickAndStartDrag();
+                        }
+                    }
+                });
+        PointF endPoint = add(mTapLocation, mSwipeDistance, 0);
+        dispatch(swipe(mTapLocation, add(mTapLocation, mSwipeDistance, 0), mSwipeTimeMillis));
+        mTouchListener.assertPropagated(ACTION_DOWN, ACTION_MOVE, ACTION_UP);
+    }
+
+    @Test
+    @AppModeFull
+    public void testRemove_shouldReturnControlToFramework() {
+        if (!mHasTouchscreen || !mScreenBigEnough) return;
+        assertBasicConsistency();
+        TouchInteractionController.Callback callback = new BaseCallback();
+        mController.registerCallback(Executors.newSingleThreadExecutor(), callback);
+        dispatch(click(mTapLocation));
+        // Nothing should happen because the callback is empty.
+        mTouchListener.assertNonePropagated();
+        mController.unregisterCallback(callback);
+        mHoverListener.assertNonePropagated();
+        dispatch(click(mTapLocation));
+        mHoverListener.assertPropagated(ACTION_HOVER_ENTER, ACTION_HOVER_EXIT);
+        mTouchListener.assertNonePropagated();
+    }
+
+    private void syncAccessibilityFocusToInputFocus() {
+        mService.runOnServiceSync(
+                () -> {
+                    AccessibilityNodeInfo focus =
+                            mService.findFocus(AccessibilityNodeInfo.FOCUS_INPUT);
+                    focus.performAction(AccessibilityNodeInfo.ACTION_ACCESSIBILITY_FOCUS);
+                    focus.recycle();
+                });
+        mService.waitForAccessibilityFocus();
+    }
+
+    public void dispatch(StrokeDescription firstStroke, StrokeDescription... rest) {
+        GestureDescription.Builder builder =
+                new GestureDescription.Builder().addStroke(firstStroke);
+        for (StrokeDescription stroke : rest) {
+            builder.addStroke(stroke);
+        }
+        dispatch(builder.build());
+    }
+
+    public void dispatch(GestureDescription gesture) {
+        await(dispatchGesture(mService, gesture));
+    }
+
+    class BaseCallback implements TouchInteractionController.Callback {
+
+        @Override
+        public void onMotionEvent(MotionEvent event) {}
+
+        @Override
+        public void onStateChanged(int state) {}
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/activities/AccessibilityCacheActivity.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/activities/AccessibilityCacheActivity.java
new file mode 100644
index 0000000..f66a6fc
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/activities/AccessibilityCacheActivity.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2021 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 android.accessibilityservice.cts.activities;
+
+import android.accessibilityservice.cts.R;
+import android.os.Bundle;
+
+public class AccessibilityCacheActivity extends AccessibilityTestActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.accessibility_cache);
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/activities/NotTouchableWindowTestActivity.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/activities/NotTouchableWindowTestActivity.java
new file mode 100644
index 0000000..f4ec5b8
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/activities/NotTouchableWindowTestActivity.java
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2021 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 android.accessibilityservice.cts.activities;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.os.Bundle;
+import android.view.Gravity;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+
+public class NotTouchableWindowTestActivity extends AccessibilityTestActivity  {
+    private class CommandReceiver extends BroadcastReceiver {
+        private View rootView;
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            WindowManager.LayoutParams params;
+            switch (intent.getAction()) {
+                case ADD_WINDOW:
+                    if (rootView != null) {
+                        throw new IllegalStateException("Window already exists");
+                    }
+                    rootView = new View(context);
+                    params = createDefaultWindowParams();
+                    context.getSystemService(WindowManager.class).addView(rootView, params);
+                    break;
+
+                case REMOVE_WINDOW:
+                    context.getSystemService(WindowManager.class).removeViewImmediate(rootView);
+                    rootView = null;
+                    break;
+
+                case ADD_TRUSTED_WINDOW:
+                    if (rootView != null) {
+                        throw new IllegalStateException("Window already exists");
+                    }
+                    rootView = new Button(context);
+                    params = createDefaultWindowParams();
+                    params.privateFlags |= PRIVATE_FLAG_TRUSTED_OVERLAY;
+                    context.getSystemService(WindowManager.class).addView(rootView, params);
+                    break;
+
+                case FINISH_ACTIVITY:
+                    if (rootView != null) {
+                        throw new IllegalStateException("Window still exists");
+                    }
+                    finish();
+            }
+        }
+
+    }
+
+    private BroadcastReceiver mBroadcastReceiver = new CommandReceiver();
+
+    public static final CharSequence TITLE =
+            "NotTouchableWindowTestActivity";
+    public static final CharSequence NON_TOUCHABLE_WINDOW_TITLE =
+            "android.accessibilityservice.cts.activities.NON_TOUCHABLE_WINDOW_TITLE";
+
+    public static final String ADD_WINDOW =
+            "android.accessibilityservice.cts.ADD_WINDOW";
+    public static final String REMOVE_WINDOW =
+            "android.accessibilityservice.cts.REMOVE_WINDOW";
+    public static final String ADD_TRUSTED_WINDOW =
+            "android.accessibilityservice.cts.ADD_TRUSTED_WINDOW";
+    public static final String FINISH_ACTIVITY =
+            "android.accessibilityservice.cts.FINISH_ACTIVITY";
+
+    // From WindowManager.java.
+    public static final int PRIVATE_FLAG_TRUSTED_OVERLAY = 0x20000000;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        IntentFilter filter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
+        filter.addAction(ADD_WINDOW);
+        filter.addAction(REMOVE_WINDOW);
+        filter.addAction(ADD_TRUSTED_WINDOW);
+        filter.addAction(FINISH_ACTIVITY);
+        this.registerReceiver(mBroadcastReceiver, filter, Context.RECEIVER_NOT_EXPORTED);
+
+        setTitle(TITLE);
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        this.unregisterReceiver(mBroadcastReceiver);
+    }
+
+    private static WindowManager.LayoutParams createDefaultWindowParams() {
+        WindowManager.LayoutParams params = new WindowManager.LayoutParams();
+        params.width = WindowManager.LayoutParams.MATCH_PARENT;
+        params.height = WindowManager.LayoutParams.MATCH_PARENT;
+        params.flags = WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN
+                | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+                | WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR
+                | WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
+        params.type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL;
+
+        params.gravity = Gravity.TOP;
+        params.setTitle(NON_TOUCHABLE_WINDOW_TITLE);
+
+        return params;
+    }
+}
\ No newline at end of file
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/ActivityLaunchUtils.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/ActivityLaunchUtils.java
index 41c5badf..4ecc13f 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/ActivityLaunchUtils.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/ActivityLaunchUtils.java
@@ -135,6 +135,11 @@
         wakeUpOrBust(context, uiAutomation);
         if (context.getPackageManager().isInstantApp()) return;
         if (isHomeScreenShowing(context, uiAutomation)) return;
+        final AccessibilityServiceInfo serviceInfo = uiAutomation.getServiceInfo();
+        final int enabledFlags = serviceInfo.flags;
+        // Make sure we could query windows.
+        serviceInfo.flags |= AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS;
+        uiAutomation.setServiceInfo(serviceInfo);
         try {
             executeAndWaitOn(
                     uiAutomation,
@@ -159,6 +164,9 @@
             }
 
             fail("Unable to reach home screen");
+        } finally {
+            serviceInfo.flags = enabledFlags;
+            uiAutomation.setServiceInfo(serviceInfo);
         }
     }
 
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/EventCapturingHoverListener.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/EventCapturingHoverListener.java
index 87d46ba..c0ce0d2 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/EventCapturingHoverListener.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/EventCapturingHoverListener.java
@@ -17,14 +17,17 @@
 package android.accessibilityservice.cts.utils;
 
 import static android.view.MotionEvent.ACTION_HOVER_MOVE;
-import static java.util.concurrent.TimeUnit.SECONDS;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 import android.view.MotionEvent;
 import android.view.View;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.BlockingQueue;
@@ -95,6 +98,9 @@
                         received.add(MotionEvent.actionToString(action));
                     }
                 }
+                if (expected.size() == received.size()) {
+                    break;
+                }
                 ev = mEvents.poll(waitTime, SECONDS);
             }
             assertEquals(expected, received);
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/EventCapturingTouchListener.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/EventCapturingTouchListener.java
index 3997ebe..d435d4c 100644
--- a/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/EventCapturingTouchListener.java
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/EventCapturingTouchListener.java
@@ -18,14 +18,14 @@
 
 import static android.view.MotionEvent.ACTION_MOVE;
 
-import static java.util.concurrent.TimeUnit.SECONDS;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 import android.view.MotionEvent;
 import android.view.View;
 
@@ -98,6 +98,9 @@
                         received.add(MotionEvent.actionToString(action));
                     }
                 }
+                if (expected.size() == received.size()) {
+                    break;
+                }
                 ev = events.poll(WAIT_TIME_SECONDS, SECONDS);
             }
             assertEquals(expected, received);
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/InputConnectionSplitter.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/InputConnectionSplitter.java
new file mode 100644
index 0000000..4e45522
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/InputConnectionSplitter.java
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2022 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 android.accessibilityservice.cts.utils;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.KeyEvent;
+import android.view.inputmethod.CompletionInfo;
+import android.view.inputmethod.CorrectionInfo;
+import android.view.inputmethod.ExtractedText;
+import android.view.inputmethod.ExtractedTextRequest;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputConnectionWrapper;
+import android.view.inputmethod.InputContentInfo;
+import android.view.inputmethod.SurroundingText;
+import android.view.inputmethod.TextAttribute;
+
+/**
+ * A special version of {@link InputConnectionWrapper} so that you can forward method invocations
+ * to another {@link InputConnection}.
+ *
+ * <p>Useful for mocking/spying.</p>
+ */
+public final class InputConnectionSplitter extends InputConnectionWrapper {
+    private final InputConnection mForNotify;
+
+    public InputConnectionSplitter(InputConnection target, InputConnection forNotify) {
+        super(target, false);
+        mForNotify = forNotify;
+    }
+
+    @Override
+    public CharSequence getTextBeforeCursor(int n, int flags) {
+        mForNotify.getTextBeforeCursor(n, flags);
+        return super.getTextBeforeCursor(n, flags);
+    }
+
+    @Override
+    public CharSequence getTextAfterCursor(int n, int flags) {
+        mForNotify.getTextBeforeCursor(n, flags);
+        return super.getTextBeforeCursor(n, flags);
+    }
+
+    @Override
+    public CharSequence getSelectedText(int flags) {
+        mForNotify.getSelectedText(flags);
+        return super.getSelectedText(flags);
+    }
+
+    @Override
+    public SurroundingText getSurroundingText(int beforeLength, int afterLength, int flags) {
+        mForNotify.getSurroundingText(beforeLength, afterLength, flags);
+        return super.getSurroundingText(beforeLength, afterLength, flags);
+    }
+
+    @Override
+    public int getCursorCapsMode(int reqModes) {
+        mForNotify.getCursorCapsMode(reqModes);
+        return super.getCursorCapsMode(reqModes);
+    }
+
+    @Override
+    public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
+        mForNotify.getExtractedText(request, flags);
+        return super.getExtractedText(request, flags);
+    }
+
+    @Override
+    public boolean deleteSurroundingTextInCodePoints(int beforeLength, int afterLength) {
+        mForNotify.deleteSurroundingTextInCodePoints(beforeLength, afterLength);
+        return super.deleteSurroundingTextInCodePoints(beforeLength, afterLength);
+    }
+
+    @Override
+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        mForNotify.deleteSurroundingText(beforeLength, afterLength);
+        return super.deleteSurroundingText(beforeLength, afterLength);
+    }
+
+    @Override
+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
+        mForNotify.setComposingText(text, newCursorPosition);
+        return super.setComposingText(text, newCursorPosition);
+    }
+
+    @Override
+    public boolean setComposingText(CharSequence text,
+            int newCursorPosition, TextAttribute textAttribute) {
+        mForNotify.setComposingText(text, newCursorPosition, textAttribute);
+        return super.setComposingText(text, newCursorPosition, textAttribute);
+    }
+
+    @Override
+    public boolean setComposingRegion(int start, int end) {
+        mForNotify.setComposingRegion(start, end);
+        return super.setComposingRegion(start, end);
+    }
+
+    @Override
+    public boolean setComposingRegion(int start, int end, TextAttribute textAttribute) {
+        mForNotify.setComposingRegion(start, end, textAttribute);
+        return super.setComposingRegion(start, end, textAttribute);
+    }
+
+    @Override
+    public boolean finishComposingText() {
+        mForNotify.finishComposingText();
+        return super.finishComposingText();
+    }
+
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+        mForNotify.commitText(text, newCursorPosition);
+        return super.commitText(text, newCursorPosition);
+    }
+
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition,
+            TextAttribute textAttribute) {
+        mForNotify.commitText(text, newCursorPosition, textAttribute);
+        return super.commitText(text, newCursorPosition, textAttribute);
+    }
+
+    @Override
+    public boolean commitCompletion(CompletionInfo text) {
+        mForNotify.commitCompletion(text);
+        return super.commitCompletion(text);
+    }
+
+    @Override
+    public boolean commitCorrection(CorrectionInfo correctionInfo) {
+        mForNotify.commitCorrection(correctionInfo);
+        return super.commitCorrection(correctionInfo);
+    }
+
+    @Override
+    public boolean setSelection(int start, int end) {
+        mForNotify.setSelection(start, end);
+        return super.setSelection(start, end);
+    }
+
+    @Override
+    public boolean performEditorAction(int editorAction) {
+        mForNotify.performEditorAction(editorAction);
+        return super.performEditorAction(editorAction);
+    }
+
+    @Override
+    public boolean performContextMenuAction(int id) {
+        mForNotify.performContextMenuAction(id);
+        return super.performContextMenuAction(id);
+    }
+
+    @Override
+    public boolean beginBatchEdit() {
+        mForNotify.beginBatchEdit();
+        return super.beginBatchEdit();
+    }
+
+    @Override
+    public boolean endBatchEdit() {
+        mForNotify.endBatchEdit();
+        return super.endBatchEdit();
+    }
+
+    @Override
+    public boolean sendKeyEvent(KeyEvent event) {
+        mForNotify.sendKeyEvent(event);
+        return super.sendKeyEvent(event);
+
+    }
+
+    @Override
+    public boolean clearMetaKeyStates(int states) {
+        mForNotify.clearMetaKeyStates(states);
+        return super.clearMetaKeyStates(states);
+    }
+
+    @Override
+    public boolean reportFullscreenMode(boolean enabled) {
+        mForNotify.reportFullscreenMode(enabled);
+        return super.reportFullscreenMode(enabled);
+    }
+
+    @Override
+    public boolean performSpellCheck() {
+        mForNotify.performSpellCheck();
+        return super.performSpellCheck();
+    }
+
+    @Override
+    public boolean performPrivateCommand(String action, Bundle data) {
+        mForNotify.performPrivateCommand(action, data);
+        return super.performPrivateCommand(action, data);
+    }
+
+    @Override
+    public boolean requestCursorUpdates(int cursorUpdateMode) {
+        mForNotify.requestCursorUpdates(cursorUpdateMode);
+        return super.requestCursorUpdates(cursorUpdateMode);
+    }
+
+    @Override
+    public Handler getHandler() {
+        mForNotify.getHandler();
+        return super.getHandler();
+    }
+
+    @Override
+    public void closeConnection() {
+        mForNotify.closeConnection();
+        super.closeConnection();
+    }
+
+    @Override
+    public boolean commitContent(InputContentInfo inputContentInfo, int flags, Bundle opts) {
+        mForNotify.commitContent(inputContentInfo, flags, opts);
+        return super.commitContent(inputContentInfo, flags, opts);
+    }
+
+    @Override
+    public boolean setImeConsumesInput(boolean imeConsumesInput) {
+        mForNotify.setImeConsumesInput(imeConsumesInput);
+        return super.setImeConsumesInput(imeConsumesInput);
+    }
+}
diff --git a/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/NoOpInputConnection.java b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/NoOpInputConnection.java
new file mode 100644
index 0000000..c79827c
--- /dev/null
+++ b/tests/accessibilityservice/src/android/accessibilityservice/cts/utils/NoOpInputConnection.java
@@ -0,0 +1,169 @@
+/*
+ * Copyright (C) 2022 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 android.accessibilityservice.cts.utils;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.KeyEvent;
+import android.view.inputmethod.CompletionInfo;
+import android.view.inputmethod.CorrectionInfo;
+import android.view.inputmethod.ExtractedText;
+import android.view.inputmethod.ExtractedTextRequest;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputContentInfo;
+
+/**
+ * A no-op implementation of {@link InputConnection}.
+ *
+ * <p>Useful for mocking/spying.</p>
+ */
+public class NoOpInputConnection implements InputConnection {
+
+    @Override
+    public CharSequence getTextBeforeCursor(int n, int flags) {
+        return null;
+    }
+
+    @Override
+    public CharSequence getTextAfterCursor(int n, int flags) {
+        return null;
+    }
+
+    @Override
+    public CharSequence getSelectedText(int flags) {
+        return null;
+    }
+
+    @Override
+    public int getCursorCapsMode(int reqModes) {
+        return 0;
+    }
+
+    @Override
+    public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
+        return null;
+    }
+
+    @Override
+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        return false;
+    }
+
+    @Override
+    public boolean deleteSurroundingTextInCodePoints(int beforeLength, int afterLength) {
+        return false;
+    }
+
+    @Override
+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
+        return false;
+    }
+
+    @Override
+    public boolean setComposingRegion(int start, int end) {
+        return false;
+    }
+
+    @Override
+    public boolean finishComposingText() {
+        return false;
+    }
+
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+        return false;
+    }
+
+    @Override
+    public boolean commitCompletion(CompletionInfo text) {
+        return false;
+    }
+
+    @Override
+    public boolean commitCorrection(CorrectionInfo correctionInfo) {
+        return false;
+    }
+
+    @Override
+    public boolean setSelection(int start, int end) {
+        return false;
+    }
+
+    @Override
+    public boolean performEditorAction(int editorAction) {
+        return false;
+    }
+
+    @Override
+    public boolean performContextMenuAction(int id) {
+        return false;
+    }
+
+    @Override
+    public boolean beginBatchEdit() {
+        return false;
+    }
+
+    @Override
+    public boolean endBatchEdit() {
+        return false;
+    }
+
+    @Override
+    public boolean sendKeyEvent(KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean clearMetaKeyStates(int states) {
+        return false;
+    }
+
+    @Override
+    public boolean reportFullscreenMode(boolean enabled) {
+        return false;
+    }
+
+    @Override
+    public boolean performPrivateCommand(String action, Bundle data) {
+        return false;
+    }
+
+    @Override
+    public boolean requestCursorUpdates(int cursorUpdateMode) {
+        return false;
+    }
+
+    @Override
+    public boolean requestCursorUpdates(int cursorUpdateMode, int cursorUpdateFilter) {
+        return false;
+    }
+
+    @Override
+    public Handler getHandler() {
+        return null;
+    }
+
+    @Override
+    public void closeConnection() {
+    }
+
+    @Override
+    public boolean commitContent(InputContentInfo inputContentInfo, int flags, Bundle opts) {
+        return false;
+    }
+}
diff --git a/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java b/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java
index 3530c6a..f34bcd6 100644
--- a/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java
+++ b/tests/admin/src/android/admin/cts/DevicePolicyManagerTest.java
@@ -31,7 +31,6 @@
 import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.os.Build;
 import android.os.Process;
@@ -697,32 +696,6 @@
         }
     }
 
-    public void testSetUninstallBlocked_failIfNotProfileOwner() {
-        if (!mDeviceAdmin) {
-            Log.w(TAG, "Skipping testSetUninstallBlocked_failIfNotProfileOwner");
-            return;
-        }
-        try {
-            mDevicePolicyManager.setUninstallBlocked(mComponent,
-                    "android.admin.cts", true);
-            fail("did not throw expected SecurityException");
-        } catch (SecurityException e) {
-            assertProfileOwnerMessage(e.getMessage());
-        }
-    }
-
-    public void testSetUninstallBlocked_succeedForNotInstalledApps() {
-        if (!mDeviceAdmin) {
-            Log.w(TAG, "Skipping testSetUninstallBlocked_succeedForNotInstalledApps");
-            return;
-        }
-        ComponentName profileOwner = DeviceAdminInfoTest.getProfileOwnerComponent();
-        mDevicePolicyManager.setUninstallBlocked(profileOwner,
-                "android.admin.not.installed", true);
-        assertFalse(mDevicePolicyManager.isUninstallBlocked(profileOwner,
-              "android.admin.not.installed"));
-    }
-
     public void testSetPermittedAccessibilityServices_failIfNotProfileOwner() {
         if (!mDeviceAdmin) {
             Log.w(TAG, "Skipping testSetPermittedAccessibilityServices_failIfNotProfileOwner");
diff --git a/tests/ambientcontext/Android.bp b/tests/ambientcontext/Android.bp
new file mode 100644
index 0000000..eba2b39
--- /dev/null
+++ b/tests/ambientcontext/Android.bp
@@ -0,0 +1,52 @@
+// Copyright (C) 2021 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 {
+    // See: http://go/android-license-faq
+    default_applicable_licenses: [
+        "Android-Apache-2.0",
+    ],
+}
+
+android_test {
+    name: "CtsAmbientContextServiceTestCases",
+    defaults: ["cts_defaults"],
+    dex_preopt: {
+        enabled: false,
+    },
+    optimize: {
+        enabled: false,
+    },
+    static_libs: [
+        "androidx.test.rules",
+        "androidx.test.ext.junit",
+        "compatibility-device-util-axt",
+        "platform-test-annotations",
+        "compatibility-device-util-axt",
+        "cts-wm-util",
+        "android-common",
+        "android-support-v4",
+    ],
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+    srcs: ["src/**/*.java"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    sdk_version: "test_current",
+}
diff --git a/tests/ambientcontext/AndroidManifest.xml b/tests/ambientcontext/AndroidManifest.xml
new file mode 100644
index 0000000..8e0d1aa
--- /dev/null
+++ b/tests/ambientcontext/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.ambientcontext.cts">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <service
+            android:exported="true"
+            android:name=".CtsAmbientContextDetectionService"
+            android:permission="android.permission.BIND_AMBIENT_SIGNAL_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.ambientcontext.AmbientContextDetectionService"/>
+            </intent-filter>
+        </service>
+    </application>
+
+    <!--  self-instrumenting test package. -->
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:label="CTS tests for the Ambient Context Service APIs."
+        android:targetPackage="android.ambientcontext.cts" >
+    </instrumentation>
+</manifest>
\ No newline at end of file
diff --git a/tests/ambientcontext/AndroidTest.xml b/tests/ambientcontext/AndroidTest.xml
new file mode 100644
index 0000000..c3e2ff5
--- /dev/null
+++ b/tests/ambientcontext/AndroidTest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<configuration description="Config for CtsAmbientContextServiceTestCases">
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsAmbientContextServiceTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.ambientcontext.cts" />
+    </test>
+</configuration>
diff --git a/tests/ambientcontext/OWNERS b/tests/ambientcontext/OWNERS
new file mode 100644
index 0000000..d085679
--- /dev/null
+++ b/tests/ambientcontext/OWNERS
@@ -0,0 +1,4 @@
+# Bug component: 103965
+kxchen@google.com
+enxun@google.com
+tgadh@google.com
\ No newline at end of file
diff --git a/tests/ambientcontext/src/android/ambientcontext/cts/AmbientContextManagerTest.java b/tests/ambientcontext/src/android/ambientcontext/cts/AmbientContextManagerTest.java
new file mode 100644
index 0000000..1488e05
--- /dev/null
+++ b/tests/ambientcontext/src/android/ambientcontext/cts/AmbientContextManagerTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2022 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 android.ambientcontext.cts;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
+import android.Manifest;
+import android.app.PendingIntent;
+import android.app.ambientcontext.AmbientContextEvent;
+import android.app.ambientcontext.AmbientContextEventRequest;
+import android.app.ambientcontext.AmbientContextManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.PersistableBundle;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * Test the AmbientContextManager API. Run with "atest CtsAmbientContextServiceTestCases".
+ */
+@RunWith(AndroidJUnit4.class)
+public class AmbientContextManagerTest {
+    private Context mContext;
+    private AmbientContextManager mAmbientContextManager;
+
+    @Before
+    public void setUp() throws Exception {
+        mContext = getInstrumentation().getContext();
+        mAmbientContextManager = (AmbientContextManager) mContext.getSystemService(
+                Context.AMBIENT_CONTEXT_SERVICE);
+    }
+
+    @Test
+    public void testGetEventsFromIntent() {
+        Intent intent = new Intent();
+        ArrayList<AmbientContextEvent> events = new ArrayList<>();
+        int eventCough = AmbientContextEvent.EVENT_COUGH;
+        Instant start = Instant.ofEpochMilli(1000L);
+        Instant end = Instant.ofEpochMilli(3000L);
+        int levelHigh = AmbientContextEvent.LEVEL_HIGH;
+        AmbientContextEvent expectedEvent = new AmbientContextEvent.Builder()
+                .setEventType(eventCough)
+                .setStartTime(start)
+                .setEndTime(end)
+                .setConfidenceLevel(levelHigh)
+                .setDensityLevel(levelHigh)
+                .build();
+        events.add(expectedEvent);
+        intent.putExtra(AmbientContextManager.EXTRA_AMBIENT_CONTEXT_EVENTS, events);
+
+        List<AmbientContextEvent> eventsFromIntent = AmbientContextManager.getEventsFromIntent(
+                intent);
+        assertEquals(1, eventsFromIntent.size());
+
+        AmbientContextEvent actualEvent = eventsFromIntent.get(0);
+        assertEquals(eventCough, actualEvent.getEventType());
+        assertEquals(start, actualEvent.getStartTime());
+        assertEquals(end, actualEvent.getEndTime());
+        assertEquals(levelHigh, actualEvent.getConfidenceLevel());
+        assertEquals(levelHigh, actualEvent.getDensityLevel());
+    }
+
+    @Test
+    public void testQueryStatus_noPermission() {
+        assertEquals(PackageManager.PERMISSION_DENIED, mContext.checkCallingOrSelfPermission(
+                Manifest.permission.ACCESS_AMBIENT_CONTEXT_EVENT));
+
+        int[] eventsArray = new int[] {AmbientContextEvent.EVENT_COUGH};
+        Set<Integer> eventTypes = Arrays.stream(eventsArray).boxed().collect(
+                Collectors.toSet());
+        try {
+            mAmbientContextManager.queryAmbientContextServiceStatus(eventTypes,
+                    null, null);
+            fail("Expected SecurityException for an app not holding"
+                    + " ACCESS_AMBIENT_CONTEXT permission.");
+        } catch (SecurityException e) {
+            // Exception expected
+        }
+    }
+
+    @Test
+    public void testStartConsentActivity_noPermission() {
+        int[] eventsArray = new int[] {AmbientContextEvent.EVENT_COUGH};
+        Set<Integer> eventTypes = Arrays.stream(eventsArray).boxed().collect(
+                Collectors.toSet());
+        try {
+            mAmbientContextManager.startConsentActivity(eventTypes);
+            fail("Expected SecurityException for an app not holding"
+                    + " ACCESS_AMBIENT_CONTEXT permission.");
+        } catch (SecurityException e) {
+            // Exception expected
+        }
+    }
+
+    @Test
+    public void testRegisterObserver_immmutablePendingIntent() {
+        PersistableBundle bundle = new PersistableBundle();
+        String optionKey = "TestOption";
+        bundle.putBoolean(optionKey, false);
+        AmbientContextEventRequest request = new AmbientContextEventRequest.Builder()
+                .addEventType(AmbientContextEvent.EVENT_COUGH)
+                .setOptions(bundle)
+                .build();
+        assertFalse(request.getOptions().getBoolean(optionKey));
+
+        Intent intent = new Intent();
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(
+                mContext, 0, intent, PendingIntent.FLAG_IMMUTABLE);
+        try {
+            mAmbientContextManager.registerObserver(request, pendingIntent, null, null);
+            fail("Expected IllegalArgumentException for a immutable PendingIntent.");
+        } catch (IllegalArgumentException e) {
+            // Exception expected
+        }
+    }
+
+    @Test
+    public void testRegisterObserver_noPermission() {
+        AmbientContextEventRequest request = new AmbientContextEventRequest.Builder()
+                .addEventType(AmbientContextEvent.EVENT_COUGH)
+                .build();
+        Intent intent = new Intent();
+        PendingIntent pendingIntent =
+                PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_MUTABLE);
+        try {
+            mAmbientContextManager.registerObserver(request, pendingIntent, null, null);
+            fail("Expected SecurityException for an app not holding"
+                    + " ACCESS_AMBIENT_CONTEXT permission.");
+        } catch (SecurityException e) {
+            // Exception expected
+        }
+    }
+
+    @Test
+    public void testUnregisterObserver_noPermission() {
+        try {
+            mAmbientContextManager.unregisterObserver();
+            fail("Expected SecurityException for an app not holding"
+                    + " ACCESS_AMBIENT_CONTEXT permission.");
+        } catch (SecurityException e) {
+            // Exception expected
+        }
+    }
+}
diff --git a/tests/ambientcontext/src/android/ambientcontext/cts/CtsAmbientContextDetectionService.java b/tests/ambientcontext/src/android/ambientcontext/cts/CtsAmbientContextDetectionService.java
new file mode 100644
index 0000000..c2ae00e
--- /dev/null
+++ b/tests/ambientcontext/src/android/ambientcontext/cts/CtsAmbientContextDetectionService.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2022 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 android.ambientcontext.cts;
+
+import android.app.ambientcontext.AmbientContextEvent;
+import android.app.ambientcontext.AmbientContextEventRequest;
+import android.app.ambientcontext.AmbientContextManager;
+import android.service.ambientcontext.AmbientContextDetectionResult;
+import android.service.ambientcontext.AmbientContextDetectionService;
+import android.service.ambientcontext.AmbientContextDetectionServiceStatus;
+import android.util.Log;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+
+public class CtsAmbientContextDetectionService extends AmbientContextDetectionService {
+    private static final String TAG = "CtsTestAmbientContextEventProviderService";
+    private static final String FAKE_APP_PACKAGE = "foo.bar.baz";
+
+    private static Consumer<AmbientContextDetectionResult> sResultConsumer;
+    private static Consumer<AmbientContextDetectionServiceStatus> sQueryConsumer;
+    private static CountDownLatch sRespondLatch = new CountDownLatch(1);
+
+    @Override
+    public void onStartDetection(AmbientContextEventRequest request, String packageName,
+            Consumer<AmbientContextDetectionResult> resultConsumer,
+            Consumer<AmbientContextDetectionServiceStatus> statusConsumer) {
+        sResultConsumer = resultConsumer;
+        sQueryConsumer = statusConsumer;
+        sRespondLatch.countDown();
+    }
+
+    @Override
+    public void onStopDetection(String packageName) {
+    }
+
+    @Override
+    public void onQueryServiceStatus(int[] eventTypes, String packageName,
+            Consumer<AmbientContextDetectionServiceStatus> consumer) {
+        sQueryConsumer = consumer;
+        sRespondLatch.countDown();
+    }
+
+    public static void reset() {
+        sResultConsumer = null;
+        sQueryConsumer = null;
+        sRespondLatch = new CountDownLatch(1);
+    }
+
+    public static void respondSuccess(AmbientContextEvent event) {
+        if (sResultConsumer != null) {
+            AmbientContextDetectionResult result = new AmbientContextDetectionResult
+                    .Builder(FAKE_APP_PACKAGE)
+                    .addEvent(event)
+                    .build();
+            sResultConsumer.accept(result);
+        }
+        if (sQueryConsumer != null) {
+            AmbientContextDetectionServiceStatus serviceStatus =
+                    new AmbientContextDetectionServiceStatus.Builder(FAKE_APP_PACKAGE)
+                            .setStatusCode(AmbientContextManager.STATUS_SUCCESS)
+                            .build();
+            sQueryConsumer.accept(serviceStatus);
+        }
+        reset();
+    }
+
+    public static void respondFailure(int status) {
+        if (sQueryConsumer != null) {
+            AmbientContextDetectionServiceStatus serviceStatus =
+                    new AmbientContextDetectionServiceStatus.Builder(FAKE_APP_PACKAGE)
+                            .setStatusCode(status)
+                            .build();
+            sQueryConsumer.accept(serviceStatus);
+        }
+        reset();
+    }
+
+    public static boolean hasPendingRequest() {
+        return sResultConsumer != null;
+    }
+
+    public static boolean hasQueryRequest() {
+        return sQueryConsumer != null;
+    }
+
+    public static void onReceivedResponse() {
+        try {
+            if (!sRespondLatch.await(3000, TimeUnit.MILLISECONDS)) {
+                throw new AssertionError("CtsTestAmbientContextEventProviderService"
+                        + " timed out while expecting a call.");
+            }
+            // reset for next
+            sRespondLatch = new CountDownLatch(1);
+        } catch (InterruptedException e) {
+            Log.e(TAG, e.getMessage());
+            Thread.currentThread().interrupt();
+            throw new AssertionError("Got InterruptedException while waiting for serviceStatus.");
+        }
+    }
+}
diff --git a/tests/ambientcontext/src/android/ambientcontext/cts/CtsAmbientContextDetectionServiceDeviceTest.java b/tests/ambientcontext/src/android/ambientcontext/cts/CtsAmbientContextDetectionServiceDeviceTest.java
new file mode 100644
index 0000000..cd7a7f0
--- /dev/null
+++ b/tests/ambientcontext/src/android/ambientcontext/cts/CtsAmbientContextDetectionServiceDeviceTest.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright (C) 2021 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 android.ambientcontext.cts;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import static com.android.compatibility.common.util.ShellUtils.runShellCommand;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.app.ambientcontext.AmbientContextEvent;
+import android.app.ambientcontext.AmbientContextManager;
+import android.os.Build.VERSION;
+import android.os.Build.VERSION_CODES;
+import android.platform.test.annotations.AppModeFull;
+import android.service.ambientcontext.AmbientContextDetectionResult;
+import android.text.TextUtils;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.compatibility.common.util.DeviceConfigStateChangerRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ * This suite of test ensures that AmbientContextService behaves correctly when properly
+ * bound to an AmbientContextDetectionService implementation.
+ */
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(
+        reason = "PM will not recognize CtsTestAmbientContextDetectionService in instantMode.")
+public class CtsAmbientContextDetectionServiceDeviceTest {
+
+    private static final String NAMESPACE_ambient_context = "ambient_context";
+    private static final String KEY_SERVICE_ENABLED = "service_enabled";
+    private static final String FAKE_APP_PACKAGE = "foo.bar.baz";
+    private static final String FAKE_SERVICE_PACKAGE =
+            CtsAmbientContextDetectionService.class.getPackage().getName();
+    private static final String USER_ID = "0";
+
+    private static final AmbientContextEvent FAKE_EVENT = new AmbientContextEvent.Builder()
+            .setEventType(AmbientContextEvent.EVENT_COUGH)
+            .setConfidenceLevel(AmbientContextEvent.LEVEL_HIGH)
+            .setDensityLevel(AmbientContextEvent.LEVEL_MEDIUM)
+            .build();
+    private static final long TEMPORARY_SERVICE_DURATION = 5000L;
+
+    private final boolean mIsTestable =
+            !TextUtils.isEmpty(getAmbientContextDetectionServiceComponent());
+
+    @Rule
+    public final DeviceConfigStateChangerRule mLookAllTheseRules =
+            new DeviceConfigStateChangerRule(getInstrumentation().getTargetContext(),
+                    NAMESPACE_ambient_context,
+                    KEY_SERVICE_ENABLED,
+                    "true");
+
+    @Before
+    public void setUp() {
+        assumeTrue("VERSION.SDK_INT=" + VERSION.SDK_INT,
+                VERSION.SDK_INT >= VERSION_CODES.TIRAMISU);
+        assumeTrue("Feature not available on this device. Skipping test.", mIsTestable);
+        clearTestableAmbientContextDetectionService();
+        CtsAmbientContextDetectionService.reset();
+        bindToTestService();
+    }
+
+    @After
+    public void tearDown() {
+        clearTestableAmbientContextDetectionService();
+    }
+
+    @Test
+    public void testAmbientContextDetectionService_OnSuccess() {
+        // From manager, call startDetection() on test service
+        assertThat(CtsAmbientContextDetectionService.hasPendingRequest()).isFalse();
+        callStartDetection();
+        assertThat(CtsAmbientContextDetectionService.hasPendingRequest()).isTrue();
+
+        // From test service, respond with onSuccess
+        CtsAmbientContextDetectionService.respondSuccess(FAKE_EVENT);
+
+        // From manager, verify callback was called
+        assertThat(getLastStatusCode()).isEqualTo(AmbientContextManager.STATUS_SUCCESS);
+        assertThat(getLastAppPackageName()).isEqualTo(FAKE_APP_PACKAGE);
+    }
+
+    @Test
+    public void testAmbientContextDetectionService_OnServiceUnavailable() {
+        // From manager, call startDetection() on test service
+        assertThat(CtsAmbientContextDetectionService.hasPendingRequest()).isFalse();
+        callStartDetection();
+        assertThat(CtsAmbientContextDetectionService.hasPendingRequest()).isTrue();
+
+        // From test service, cancel the request and respond with STATUS_SERVICE_UNAVAILABLE
+        CtsAmbientContextDetectionService.respondFailure(
+                AmbientContextManager.STATUS_SERVICE_UNAVAILABLE);
+
+        // From test service, verify that the request was cancelled
+        assertThat(CtsAmbientContextDetectionService.hasPendingRequest()).isFalse();
+
+        // From manager, verify that the callback was called with STATUS_SERVICE_UNAVAILABLE
+        assertThat(getLastStatusCode()).isEqualTo(
+                AmbientContextManager.STATUS_SERVICE_UNAVAILABLE);
+        assertThat(getLastAppPackageName()).isEqualTo(FAKE_APP_PACKAGE);
+    }
+
+    @Test
+    public void testAmbientContextDetectionService_QueryEventStatus() {
+        assertThat(CtsAmbientContextDetectionService.hasQueryRequest()).isFalse();
+        callQueryServiceStatus();
+        assertThat(CtsAmbientContextDetectionService.hasQueryRequest()).isTrue();
+
+        // From test service, respond with STATUS_ACCESS_DENIED
+        CtsAmbientContextDetectionService.respondFailure(
+                AmbientContextManager.STATUS_ACCESS_DENIED);
+
+        // From manager, verify callback was called
+        assertThat(getLastStatusCode()).isEqualTo(AmbientContextManager.STATUS_ACCESS_DENIED);
+        assertThat(getLastAppPackageName()).isEqualTo(FAKE_APP_PACKAGE);
+    }
+
+    @Test
+    public void testConstructAmbientContextDetectionResult() {
+        List<AmbientContextEvent> events = Arrays.asList(new AmbientContextEvent[] {FAKE_EVENT});
+        AmbientContextDetectionResult result = new AmbientContextDetectionResult
+                .Builder(FAKE_APP_PACKAGE)
+                .addEvents(events)
+                .build();
+        List<AmbientContextEvent> actualEvents = result.getEvents();
+        assertThat(actualEvents.size()).isNotEqualTo(1);
+        assertThat(actualEvents).contains(FAKE_EVENT);
+
+        result = new AmbientContextDetectionResult
+                .Builder(FAKE_APP_PACKAGE)
+                .addEvents(events)
+                .clearEvents()
+                .build();
+        assertThat(result.getEvents()).isEmpty();
+    }
+
+    private int getLastStatusCode() {
+        return Integer.parseInt(runShellCommand(
+                "cmd ambient_context get-last-status-code"));
+    }
+
+    private String getLastAppPackageName() {
+        return runShellCommand(
+                "cmd ambient_context get-last-package-name");
+    }
+
+    private void bindToTestService() {
+        // On Manager, bind to test service
+        assertThat(getAmbientContextDetectionServiceComponent()).isNotEqualTo(FAKE_SERVICE_PACKAGE);
+        setTestableAmbientContextDetectionService(FAKE_SERVICE_PACKAGE);
+        assertThat(getAmbientContextDetectionServiceComponent()).contains(FAKE_SERVICE_PACKAGE);
+    }
+
+    private String getAmbientContextDetectionServiceComponent() {
+        return runShellCommand("cmd ambient_context get-bound-package %s", USER_ID);
+    }
+
+    /**
+     * This call is asynchronous (manager spawns + binds to service and then asynchronously makes a
+     * call).
+     * As such, we need to ensure consistent testing results, by waiting until we receive a response
+     * in our test service w/ CountDownLatch(s).
+     */
+    private void callStartDetection() {
+        runShellCommand("cmd ambient_context start-detection %s %s",
+                USER_ID, FAKE_APP_PACKAGE);
+        CtsAmbientContextDetectionService.onReceivedResponse();
+    }
+
+    /**
+     * This call is asynchronous (manager spawns + binds to service and then asynchronously makes a
+     * call).
+     * As such, we need to ensure consistent testing results, by waiting until we receive a response
+     * in our test service w/ CountDownLatch(s).
+     */
+    private void callQueryServiceStatus() {
+        runShellCommand("cmd ambient_context query-service-status %s %s",
+                USER_ID, FAKE_APP_PACKAGE);
+        CtsAmbientContextDetectionService.onReceivedResponse();
+    }
+
+    private void setTestableAmbientContextDetectionService(String service) {
+        runShellCommand("cmd ambient_context set-temporary-service %s %s %s",
+                USER_ID, service, TEMPORARY_SERVICE_DURATION);
+    }
+
+    private void clearTestableAmbientContextDetectionService() {
+        runShellCommand("cmd ambient_context set-temporary-service %s", USER_ID);
+    }
+}
diff --git a/tests/app/Android.bp b/tests/app/Android.bp
index 9fb2860..e9a6df1 100644
--- a/tests/app/Android.bp
+++ b/tests/app/Android.bp
@@ -47,14 +47,16 @@
     test_suites: [
         "cts",
         "general-tests",
-        "sts"
+        "sts",
     ],
     instrumentation_for: "CtsAppTestStubs",
     sdk_version: "test_current",
     min_sdk_version: "14",
     // Disable coverage since it pushes us over the dex limit and we don't
     // actually need to measure the tests themselves.
-    jacoco: { exclude_filter: ["**"] }
+    jacoco: {
+        exclude_filter: ["**"],
+    },
 }
 
 android_test {
@@ -90,7 +92,7 @@
     manifest: "DownloadManagerApi28Test/AndroidManifest.xml",
     test_config: "DownloadManagerApi28Test/AndroidTest.xml",
     lint: {
-    	baseline_filename: "lint-baseline-api-28.xml",
+        baseline_filename: "lint-baseline-api-28.xml",
     },
 }
 
@@ -127,7 +129,7 @@
     manifest: "DownloadManagerInstallerTest/AndroidManifest.xml",
     test_config: "DownloadManagerInstallerTest/AndroidTest.xml",
     lint: {
-    	baseline_filename: "lint-baseline-installer.xml",
+        baseline_filename: "lint-baseline-installer.xml",
     },
 }
 
@@ -147,9 +149,13 @@
         "cts-wm-util",
         "libprotobuf-java-lite",
     ],
+    aidl: {
+        local_include_dirs: ["app/src"],
+    },
     srcs: [
         ":libtombstone_proto-src",
         "AppExitTest/src/**/*.java",
+        "app/src/**/*.aidl",
         "src/android/app/cts/android/app/cts/tools/WatchUidRunner.java",
     ],
     jarjar_rules: "AppExitTest/jarjar-rules.txt",
diff --git a/tests/app/AndroidManifest.xml b/tests/app/AndroidManifest.xml
index 3e1eb6a..96e92ab 100644
--- a/tests/app/AndroidManifest.xml
+++ b/tests/app/AndroidManifest.xml
@@ -25,9 +25,11 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
     <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.READ_COMPAT_CHANGE_CONFIG" />
     <uses-permission android:name="android.permission.READ_PROJECTION_STATE" />
     <uses-permission android:name="android.permission.TOGGLE_AUTOMOTIVE_PROJECTION" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application android:usesCleartextTraffic="true">
         <uses-library android:name="android.test.runner" />
diff --git a/tests/app/AndroidTest.xml b/tests/app/AndroidTest.xml
index b43053c..e8857cc 100644
--- a/tests/app/AndroidTest.xml
+++ b/tests/app/AndroidTest.xml
@@ -33,7 +33,7 @@
         <option name="test-file-name" value="CtsBadProviderStubs.apk" />
         <option name="test-file-name" value="CtsCantSaveState1.apk" />
         <option name="test-file-name" value="CtsCantSaveState2.apk" />
-        <option name="test-file-name" value="NotificationDelegator.apk" />
+        <option name="test-file-name" value="NotificationApp.apk" />
         <option name="test-file-name" value="NotificationProvider.apk" />
         <option name="test-file-name" value="NotificationListener.apk" />
         <option name="test-file-name" value="StorageDelegator.apk" />
diff --git a/tests/app/AppExitTest/AndroidTest.xml b/tests/app/AppExitTest/AndroidTest.xml
index 4eddef4..cc9c83b 100644
--- a/tests/app/AppExitTest/AndroidTest.xml
+++ b/tests/app/AppExitTest/AndroidTest.xml
@@ -25,6 +25,7 @@
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsSimpleApp.apk" />
         <option name="test-file-name" value="CtsExternalServiceService.apk" />
+        <option name="test-file-name" value="CtsAppTestStubs.apk" />
         <option name="test-file-name" value="CtsAppExitTestCases.apk" />
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
@@ -40,7 +41,7 @@
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
         <option name="package" value="android.app.cts.appexit" />
-        <option name="runtime-hint" value="2m9s" />
+        <option name="runtime-hint" value="2m39s" />
         <option name="hidden-api-checks" value="false"/>
     </test>
 
diff --git a/tests/app/AppExitTest/src/android/app/cts/ActivityManagerAppExitInfoTest.java b/tests/app/AppExitTest/src/android/app/cts/ActivityManagerAppExitInfoTest.java
index 27378c3..d0804be 100644
--- a/tests/app/AppExitTest/src/android/app/cts/ActivityManagerAppExitInfoTest.java
+++ b/tests/app/AppExitTest/src/android/app/cts/ActivityManagerAppExitInfoTest.java
@@ -18,17 +18,26 @@
 
 import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
 import android.app.ActivityManager;
 import android.app.ActivityManager.RunningAppProcessInfo;
 import android.app.ApplicationExitInfo;
 import android.app.Instrumentation;
 import android.app.cts.android.app.cts.tools.WatchUidRunner;
+import android.app.stubs.IHeartbeat;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
 import android.externalservice.common.RunningServiceInfo;
 import android.externalservice.common.ServiceMessages;
 import android.os.AsyncTask;
@@ -42,18 +51,21 @@
 import android.os.Message;
 import android.os.Messenger;
 import android.os.Process;
+import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
 import android.server.wm.settings.SettingsSession;
 import android.system.OsConstants;
-import android.test.InstrumentationTestCase;
 import android.text.TextUtils;
 import android.util.DebugUtils;
 import android.util.Log;
 import android.util.Pair;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
 import com.android.compatibility.common.util.AmMonitor;
 import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.ShellIdentityUtils;
@@ -62,6 +74,11 @@
 import com.android.internal.util.MemInfoReader;
 import com.android.server.os.TombstoneProtos.Tombstone;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -70,7 +87,8 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-public final class ActivityManagerAppExitInfoTest extends InstrumentationTestCase {
+@RunWith(AndroidJUnit4.class)
+public final class ActivityManagerAppExitInfoTest {
     private static final String TAG = ActivityManagerAppExitInfoTest.class.getSimpleName();
 
     private static final String STUB_PACKAGE_NAME =
@@ -81,10 +99,23 @@
             "com.android.cts.launcherapps.simpleapp.SimpleService5";
     private static final String STUB_SERVICE_ISOLATED_NAME =
             "com.android.cts.launcherapps.simpleapp.SimpleService6";
-    private static final String STUB_RECEIVER_NAMWE =
+    private static final String STUB_RECEIVER_NAME =
             "com.android.cts.launcherapps.simpleapp.SimpleReceiver";
-    private static final String STUB_ROCESS_NAME = STUB_PACKAGE_NAME;
-    private static final String STUB_REMOTE_ROCESS_NAME = STUB_ROCESS_NAME + ":remote";
+    private static final String STUB_PROCESS_NAME = STUB_PACKAGE_NAME;
+    private static final String STUB_REMOTE_PROCESS_NAME = STUB_PROCESS_NAME + ":remote";
+    private static final String SIMPLE_ACTIVITY = ".SimpleActivity";
+
+    private static final String HEARTBEAT_PACKAGE = "android.app.stubs";
+    private static final String HEARTBEAT_PROCESS = HEARTBEAT_PACKAGE + ":hbact";
+    private static final String HEARTBEAT_ACTIVITY = HEARTBEAT_PACKAGE + ".HeartbeatActivity";
+    private static final String HEARTBEAT_SERVICE = HEARTBEAT_PACKAGE + ".HeartbeatService";
+    private static final String HEARTBEAT_PROCESS_DEAD = "dead";
+    private static final String HEARTBEAT_COUNTDOWN_NAME = "countdown";
+    private static final String HEARTBEAT_INTERVAL_NAME = "interval";
+    private static final int HEARTBEAT_COUNTDOWN = 15;
+    private static final long HEARTBEAT_INTERVAL = 1000;
+    private static final long HEARTBEAT_FREEZER_LONG = 30000;
+    private static final long HEARTBEAT_FREEZER_SHORT = 5000;
 
     private static final String EXIT_ACTION =
             "com.android.cts.launchertests.simpleapp.EXIT_ACTION";
@@ -104,10 +135,10 @@
     private static final int EXIT_CODE = 123;
     private static final int CRASH_SIGNAL = OsConstants.SIGSEGV;
 
-    private static final int TOMBSTONE_FETCH_TIMEOUT_MS = 10_000;
+    private static final long TOMBSTONE_FETCH_TIMEOUT_MS = 10_000;
 
-    private static final int WAITFOR_MSEC = 10000;
-    private static final int WAITFOR_SETTLE_DOWN = 2000;
+    private static final long WAITFOR_MSEC = 10000;
+    private static final long WAITFOR_SETTLE_DOWN = 2000;
 
     private static final int CMD_PID = 1;
 
@@ -139,11 +170,12 @@
     private SettingsSession<String> mDataAnrSettings;
     private SettingsSession<String> mHiddenApiSettings;
     private int mProcSeqNum;
+    private String mFreezerTimeout;
+    private boolean mHeartbeatDead;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mInstrumentation = getInstrumentation();
+    @Before
+    public void setUp() throws Exception {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mContext = mInstrumentation.getContext();
         mStubPackageUid = mContext.getPackageManager().getPackageUid(STUB_PACKAGE_NAME, 0);
         mWatcher = new WatchUidRunner(mInstrumentation, mStubPackageUid, WAITFOR_MSEC);
@@ -157,6 +189,7 @@
         mHandler = new H(mHandlerThread.getLooper());
         mMessenger = new Messenger(mHandler);
         executeShellCmd("cmd deviceidle whitelist +" + STUB_PACKAGE_NAME);
+        executeShellCmd("cmd deviceidle whitelist +" + HEARTBEAT_PACKAGE);
         mDataAnrSettings = new SettingsSession<>(
                 Settings.Global.getUriFor(
                         Settings.Global.DROPBOX_TAG_PREFIX + "data_app_anr"),
@@ -167,6 +200,8 @@
                         Settings.Global.HIDDEN_API_BLACKLIST_EXEMPTIONS),
                 Settings.Global::getString, Settings.Global::putString);
         mHiddenApiSettings.set("*");
+        mFreezerTimeout = executeShellCmd(
+                "device_config get activity_manager_native_boot freeze_debounce_timeout");
     }
 
     private void handleMessagePid(Message msg) {
@@ -174,7 +209,7 @@
         Bundle b = (Bundle) msg.obj;
         String processName = b.getString(EXTRA_PROCESS_NAME);
 
-        if (STUB_ROCESS_NAME.equals(processName)) {
+        if (STUB_PROCESS_NAME.equals(processName)) {
             if (mOtherUserId != 0 && UserHandle.getUserId(msg.arg2) == mOtherUserId) {
                 mStubPackageOtherUserPid = msg.arg1;
                 assertTrue(mStubPackageOtherUserPid > 0);
@@ -182,7 +217,7 @@
                 mStubPackagePid = msg.arg1;
                 assertTrue(mStubPackagePid > 0);
             }
-        } else if (STUB_REMOTE_ROCESS_NAME.equals(processName)) {
+        } else if (STUB_REMOTE_PROCESS_NAME.equals(processName)) {
             if (mOtherUserId != 0 && UserHandle.getUserId(msg.arg2) == mOtherUserId) {
                 mStubPackageRemoteOtherUserPid = msg.arg1;
                 assertTrue(mStubPackageRemoteOtherUserPid > 0);
@@ -190,6 +225,12 @@
                 mStubPackageRemotePid = msg.arg1;
                 assertTrue(mStubPackageRemotePid > 0);
             }
+        } else if (HEARTBEAT_PROCESS.equals(processName)) {
+            mStubPackagePid = msg.arg1;
+            mStubPackageUid = msg.arg2;
+            mHeartbeatDead = b.getBoolean(HEARTBEAT_PROCESS_DEAD);
+            assertTrue(mStubPackagePid > 0);
+            assertTrue(mStubPackageUid > 0);
         } else { // must be isolated process
             mStubPackageIsolatedPid = msg.arg1;
             mStubPackageIsolatedUid = msg.arg2;
@@ -221,10 +262,16 @@
         }
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         mWatcher.finish();
+        executeShellCmd(
+                "device_config put activity_manager_native_boot freeze_debounce_timeout "
+                        + mFreezerTimeout);
         executeShellCmd("cmd deviceidle whitelist -" + STUB_PACKAGE_NAME);
+        executeShellCmd("cmd deviceidle whitelist -" + HEARTBEAT_PACKAGE);
+        executeShellCmd("am force-stop " + STUB_PACKAGE_NAME);
+        executeShellCmd("am force-stop " + HEARTBEAT_PACKAGE);
         removeTestUserIfNecessary();
         mHandlerThread.quitSafely();
         if (mDataAnrSettings != null) {
@@ -299,8 +346,12 @@
     }
 
     private void awaitForLatch(CountDownLatch latch) {
+        awaitForLatch(latch, WAITFOR_MSEC);
+    }
+
+    private void awaitForLatch(CountDownLatch latch, long timeout) {
         try {
-            assertTrue("Timeout for waiting", latch.await(WAITFOR_MSEC, TimeUnit.MILLISECONDS));
+            assertTrue("Timeout for waiting", latch.await(timeout, TimeUnit.MILLISECONDS));
         } catch (InterruptedException e) {
             fail("Interrupted");
         }
@@ -368,6 +419,7 @@
         return am.getHistoricalProcessExitReasons(packageName, pid, max);
     }
 
+    @Test
     public void testExitCode() throws Exception {
         // Remove old records to avoid interference with the test.
         clearHistoricalExitInfo();
@@ -440,6 +492,7 @@
         return memConsumers;
     }
 
+    @Test
     public void testLmkdKill() throws Exception {
         // Remove old records to avoid interference with the test.
         clearHistoricalExitInfo();
@@ -491,6 +544,7 @@
         }
     }
 
+    @Test
     public void testKillBySignal() throws Exception {
         // Remove old records to avoid interference with the test.
         clearHistoricalExitInfo();
@@ -511,6 +565,7 @@
                 ApplicationExitInfo.REASON_SIGNALED, OsConstants.SIGKILL, null, now, now2);
     }
 
+    @Test
     public void testAnr() throws Exception {
         // Remove old records to avoid interference with the test.
         clearHistoricalExitInfo();
@@ -545,7 +600,7 @@
                 new String[]{AmMonitor.WAIT_FOR_CRASHED});
 
         Intent intent = new Intent();
-        intent.setComponent(new ComponentName(STUB_PACKAGE_NAME, STUB_RECEIVER_NAMWE));
+        intent.setComponent(new ComponentName(STUB_PACKAGE_NAME, STUB_RECEIVER_NAME));
         intent.addFlags(Intent.FLAG_RECEIVER_FOREGROUND);
         // This will result an ANR
         mContext.sendOrderedBroadcast(intent, null);
@@ -609,6 +664,7 @@
         mContext.unregisterReceiver(receiver);
     }
 
+    @Test
     public void testOther() throws Exception {
         // Remove old records to avoid interference with the test.
         clearHistoricalExitInfo();
@@ -693,6 +749,7 @@
         return dump.substring(start, end);
     }
 
+    @Test
     public void testPermissionChange() throws Exception {
         // Remove old records to avoid interference with the test.
         clearHistoricalExitInfo();
@@ -742,6 +799,7 @@
     }
 
     // A clone of testPermissionChange using a different revoke api
+    @Test
     public void testPermissionChangeWithReason() throws Exception {
         String revokeReason = "test reason";
         // Remove old records to avoid interference with the test.
@@ -795,6 +853,7 @@
                 info.getRss() * 1024, new StringBuilder()));
     }
 
+    @Test
     public void testCrash() throws Exception {
         // Remove old records to avoid interference with the test.
         clearHistoricalExitInfo();
@@ -819,6 +878,7 @@
                 ApplicationExitInfo.REASON_CRASH, null, null, now, now2);
     }
 
+    @Test
     public void testNativeCrash() throws Exception {
         // Remove old records to avoid interference with the test.
         clearHistoricalExitInfo();
@@ -853,6 +913,7 @@
         assertEquals(tombstone.getPid(), mStubPackagePid);
     }
 
+    @Test
     public void testUserRequested() throws Exception {
         // Remove old records to avoid interference with the test.
         clearHistoricalExitInfo();
@@ -879,6 +940,7 @@
                 ApplicationExitInfo.REASON_USER_REQUESTED, null, null, now, now2);
     }
 
+    @Test
     public void testDependencyDied() throws Exception {
         // Remove old records to avoid interference with the test.
         clearHistoricalExitInfo();
@@ -896,7 +958,7 @@
                     am, (m) -> m.getRunningAppProcesses(),
                     android.Manifest.permission.REAL_GET_TASKS);
             for (RunningAppProcessInfo info: list) {
-                if (info.processName.equals(STUB_REMOTE_ROCESS_NAME)) {
+                if (info.processName.equals(STUB_REMOTE_PROCESS_NAME)) {
                     providerPid = info.pid;
                     break;
                 }
@@ -923,6 +985,7 @@
                 ApplicationExitInfo.REASON_DEPENDENCY_DIED, null, null, now, now2);
     }
 
+    @Test
     public void testMultipleProcess() throws Exception {
         // Remove old records to avoid interference with the test.
         clearHistoricalExitInfo();
@@ -945,9 +1008,9 @@
                 android.Manifest.permission.DUMP);
 
         assertTrue(list != null && list.size() == 2);
-        verify(list.get(0), mStubPackageRemotePid, mStubPackageUid, STUB_REMOTE_ROCESS_NAME,
+        verify(list.get(0), mStubPackageRemotePid, mStubPackageUid, STUB_REMOTE_PROCESS_NAME,
                 ApplicationExitInfo.REASON_EXIT_SELF, EXIT_CODE, null, now2, now3);
-        verify(list.get(1), mStubPackagePid, mStubPackageUid, STUB_ROCESS_NAME,
+        verify(list.get(1), mStubPackagePid, mStubPackageUid, STUB_PROCESS_NAME,
                 ApplicationExitInfo.REASON_SIGNALED, OsConstants.SIGKILL, null, now, now2);
 
         // If we only retrieve one report
@@ -957,7 +1020,7 @@
                 android.Manifest.permission.DUMP);
 
         assertTrue(list != null && list.size() == 1);
-        verify(list.get(0), mStubPackageRemotePid, mStubPackageUid, STUB_REMOTE_ROCESS_NAME,
+        verify(list.get(0), mStubPackageRemotePid, mStubPackageUid, STUB_REMOTE_PROCESS_NAME,
                 ApplicationExitInfo.REASON_EXIT_SELF, EXIT_CODE, null, now2, now3);
     }
 
@@ -1023,6 +1086,7 @@
         }
     }
 
+    @Test
     public void testSecondaryUser() throws Exception {
         if (!mSupportMultipleUsers) {
             return;
@@ -1108,10 +1172,10 @@
                 android.Manifest.permission.DUMP);
 
         assertTrue(list != null && list.size() == 2);
-        verify(list.get(0), mStubPackageRemotePid, mStubPackageUid, STUB_REMOTE_ROCESS_NAME,
+        verify(list.get(0), mStubPackageRemotePid, mStubPackageUid, STUB_REMOTE_PROCESS_NAME,
                 ApplicationExitInfo.REASON_SIGNALED, OsConstants.SIGKILL, null, now4, now5,
                 cookie4);
-        verify(list.get(1), mStubPackagePid, mStubPackageUid, STUB_ROCESS_NAME,
+        verify(list.get(1), mStubPackagePid, mStubPackageUid, STUB_PROCESS_NAME,
                 ApplicationExitInfo.REASON_EXIT_SELF, EXIT_CODE, null, now, now2, cookie1);
 
         // Now try the other user
@@ -1134,9 +1198,9 @@
 
         assertTrue(list != null && list.size() == 2);
         verify(list.get(0), mStubPackageRemoteOtherUserPid, mStubPackageOtherUid,
-                STUB_REMOTE_ROCESS_NAME, ApplicationExitInfo.REASON_EXIT_SELF, EXIT_CODE,
+                STUB_REMOTE_PROCESS_NAME, ApplicationExitInfo.REASON_EXIT_SELF, EXIT_CODE,
                 null, now3, now4, cookie3);
-        verify(list.get(1), mStubPackageOtherUserPid, mStubPackageOtherUid, STUB_ROCESS_NAME,
+        verify(list.get(1), mStubPackageOtherUserPid, mStubPackageOtherUid, STUB_PROCESS_NAME,
                 ApplicationExitInfo.REASON_SIGNALED, OsConstants.SIGKILL, null,
                 now2, now3, cookie2);
 
@@ -1161,7 +1225,7 @@
                 this::getHistoricalProcessExitReasonsAsUser,
                 android.Manifest.permission.DUMP,
                 android.Manifest.permission.INTERACT_ACROSS_USERS);
-        verify(list.get(0), mStubPackageOtherUserPid, mStubPackageOtherUid, STUB_ROCESS_NAME,
+        verify(list.get(0), mStubPackageOtherUserPid, mStubPackageOtherUid, STUB_PROCESS_NAME,
                 ApplicationExitInfo.REASON_USER_STOPPED, null, null, now6, now7, cookie5);
 
         int otherUserId = mOtherUserId;
@@ -1205,13 +1269,104 @@
                 android.Manifest.permission.INTERACT_ACROSS_USERS);
 
         assertTrue(list != null && list.size() == 2);
-        verify(list.get(0), mStubPackageRemotePid, mStubPackageUid, STUB_REMOTE_ROCESS_NAME,
+        verify(list.get(0), mStubPackageRemotePid, mStubPackageUid, STUB_REMOTE_PROCESS_NAME,
                 ApplicationExitInfo.REASON_SIGNALED, OsConstants.SIGKILL, null, now4, now5,
                 cookie4);
-        verify(list.get(1), mStubPackagePid, mStubPackageUid, STUB_ROCESS_NAME,
+        verify(list.get(1), mStubPackagePid, mStubPackageUid, STUB_PROCESS_NAME,
                 ApplicationExitInfo.REASON_EXIT_SELF, EXIT_CODE, null, now, now2, cookie1);
     }
 
+    @Test
+    public void testFreezerNormalExitCode() throws Exception {
+        // The app should NOT be frozen with 30s freeze timeout configuration
+        runFreezerTest(HEARTBEAT_FREEZER_LONG, false, ApplicationExitInfo.REASON_SIGNALED);
+    }
+
+    @Test
+    public void testFreezerKillExitCode() throws Exception {
+        // The app should be frozen and killed with 5s freeze timeout configuration
+        assumeTrue(mActivityManager.getService().isAppFreezerEnabled());
+        runFreezerTest(HEARTBEAT_FREEZER_SHORT, true, ApplicationExitInfo.REASON_FREEZER);
+    }
+
+    public void runFreezerTest(long freezerTimeout, boolean dead, int reason) throws Exception {
+        // Remove old records to avoid interference with the test.
+        clearHistoricalExitInfo();
+
+        executeShellCmd(
+                "device_config put activity_manager_native_boot freeze_debounce_timeout "
+                        + freezerTimeout);
+
+        long now = System.currentTimeMillis();
+
+        mLatch = new CountDownLatch(1);
+
+        // Start the HeartbeatService to wait for HeartbeatActivity
+        Intent serviceIntent = new Intent(HEARTBEAT_SERVICE);
+        serviceIntent.setPackage(HEARTBEAT_PACKAGE);
+        ServiceConnection connection = new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+                IHeartbeat heartbeat = IHeartbeat.Stub.asInterface(service);
+                try {
+                    heartbeat.monitor(mMessenger);
+                } catch (RemoteException e) {
+                    fail("Failed to monitor Heartbeat service");
+                }
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+            }
+        };
+        mContext.bindService(serviceIntent, connection, Context.BIND_AUTO_CREATE);
+
+        // Launch the HeartbeatActivity to talk to the HeartbeatService
+        Intent clientIntent = new Intent(Intent.ACTION_MAIN);
+        clientIntent.setClassName(HEARTBEAT_PACKAGE, HEARTBEAT_ACTIVITY);
+        clientIntent.putExtra(HEARTBEAT_COUNTDOWN_NAME, HEARTBEAT_COUNTDOWN);
+        clientIntent.putExtra(HEARTBEAT_INTERVAL_NAME, HEARTBEAT_INTERVAL);
+        clientIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mContext.startActivity(clientIntent);
+        sleep(1000);
+
+        // Launch another app to bring the HeartbeatActivity to background
+        Intent intent1 = new Intent(Intent.ACTION_MAIN);
+        intent1.setClassName(STUB_PACKAGE_NAME, STUB_PACKAGE_NAME + SIMPLE_ACTIVITY);
+        intent1.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mContext.startActivity(intent1);
+        sleep(1000);
+
+        // Launch Home to make sure the HeartbeatActivity is in cached mode
+        Intent intentHome = new Intent(Intent.ACTION_MAIN);
+        intentHome.addCategory(Intent.CATEGORY_HOME);
+        intentHome.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mContext.startActivity(intentHome);
+
+        // Wait until the HeartbeatService finishes
+        awaitForLatch(mLatch, HEARTBEAT_COUNTDOWN * HEARTBEAT_INTERVAL);
+        mContext.unbindService(connection);
+        sleep(1000);
+
+        // Check if the frozen app is killed
+        assertEquals(dead, mHeartbeatDead);
+        int uid = mContext.getPackageManager().getPackageUid(HEARTBEAT_PACKAGE,
+                PackageManager.PackageInfoFlags.of(0));
+        assertEquals(uid, mStubPackageUid);
+
+        long now2 = System.currentTimeMillis();
+
+        List<ApplicationExitInfo> list = ShellIdentityUtils.invokeMethodWithShellPermissions(
+                HEARTBEAT_PACKAGE, mStubPackagePid, 1, mCurrentUserId,
+                this::getHistoricalProcessExitReasonsAsUser,
+                android.Manifest.permission.DUMP);
+
+        assertNotNull(list);
+        assertEquals(list.size(), 1);
+        verify(list.get(0), mStubPackagePid, uid, HEARTBEAT_PROCESS,
+                reason, null, null, now, now2);
+    }
+
     private void verify(ApplicationExitInfo info, int pid, int uid, String processName,
             int reason, Integer status, String description, long before, long after) {
         verify(info, pid, uid, processName, reason, status, description, before, after, null);
diff --git a/tests/app/NotificationApp/Android.bp b/tests/app/NotificationApp/Android.bp
new file mode 100644
index 0000000..c5deb32
--- /dev/null
+++ b/tests/app/NotificationApp/Android.bp
@@ -0,0 +1,30 @@
+// 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "NotificationApp",
+    defaults: ["cts_support_defaults"],
+    srcs: ["**/*.java"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+        "sts",
+    ],
+    sdk_version: "current",
+}
diff --git a/tests/app/NotificationApp/AndroidManifest.xml b/tests/app/NotificationApp/AndroidManifest.xml
new file mode 100644
index 0000000..144a1bb
--- /dev/null
+++ b/tests/app/NotificationApp/AndroidManifest.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.test.notificationapp">
+    <!-- for calling matchesCallFilter -->
+    <uses-permission android:name="android.permission.READ_CONTACTS"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+    <application android:label="Notification Test App">
+        <activity android:name="com.android.test.notificationapp.NotificationDelegator"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="com.android.test.notificationapp.NotificationRevoker"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="com.android.test.notificationapp.NotificationDelegateAndPost"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:name="com.android.test.notificationapp.MatchesCallFilterTestActivity"
+            android:excludeFromRecents="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <service android:name="com.android.test.notificationapp.TestNotificationListener"
+                 android:exported="true"
+                 android:label="TestNotificationListener"
+                 android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.notification.NotificationListenerService"/>
+            </intent-filter>
+        </service>
+
+    </application>
+</manifest>
diff --git a/tests/app/NotificationDelegator/OWNERS b/tests/app/NotificationApp/OWNERS
similarity index 100%
rename from tests/app/NotificationDelegator/OWNERS
rename to tests/app/NotificationApp/OWNERS
diff --git a/tests/app/NotificationDelegator/res/layout/activity.xml b/tests/app/NotificationApp/res/layout/activity.xml
similarity index 100%
rename from tests/app/NotificationDelegator/res/layout/activity.xml
rename to tests/app/NotificationApp/res/layout/activity.xml
diff --git a/tests/app/NotificationApp/src/com/android/test/notificationapp/MatchesCallFilterTestActivity.java b/tests/app/NotificationApp/src/com/android/test/notificationapp/MatchesCallFilterTestActivity.java
new file mode 100644
index 0000000..2b7a4b1
--- /dev/null
+++ b/tests/app/NotificationApp/src/com/android/test/notificationapp/MatchesCallFilterTestActivity.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2021 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.test.notificationapp;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.provider.ContactsContract;
+
+/**
+ * An activity that's only meant to determine whether NotificationManager#matchesCallFilter
+ * was allowed to run, for permission-checking reasons.
+ * It is not used for functionality tests, as it will only call matchesCallFilter on a
+ * meaningless uri.
+ */
+public class MatchesCallFilterTestActivity extends Activity {
+    private NotificationManager mNotificationManager;
+    private Uri mCallDest;
+
+    // result codes for return
+    private static int sNotPermitted = 0;
+    private static int sPermitted = 1;
+
+    @Override
+    public void onCreate(Bundle bundle) {
+        super.onCreate(bundle);
+        mNotificationManager = getSystemService(NotificationManager.class);
+        mCallDest = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI,
+                Uri.encode("+16175551212"));
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        callMatchesCallFilter();
+        finish();
+    }
+
+    private void callMatchesCallFilter() {
+        try {
+            mNotificationManager.matchesCallFilter(mCallDest);
+            setResult(sPermitted);
+        } catch (SecurityException e) {
+            setResult(sNotPermitted);
+        }
+    }
+}
diff --git a/tests/app/NotificationApp/src/com/android/test/notificationapp/NotificationDelegateAndPost.java b/tests/app/NotificationApp/src/com/android/test/notificationapp/NotificationDelegateAndPost.java
new file mode 100644
index 0000000..4d52bd9
--- /dev/null
+++ b/tests/app/NotificationApp/src/com/android/test/notificationapp/NotificationDelegateAndPost.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2019 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.test.notificationapp;
+
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+
+import android.app.Activity;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.os.Bundle;
+import android.util.Log;
+
+public class NotificationDelegateAndPost extends Activity {
+    private static final String TAG = "DelegateAndPost";
+    private static final String DELEGATE = "android.app.stubs";
+    private static final String CHANNEL = "channel";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity);
+
+        NotificationManager nm = getSystemService(NotificationManager.class);
+
+        nm.createNotificationChannel(new NotificationChannel(CHANNEL, CHANNEL, IMPORTANCE_LOW));
+        nm.setNotificationDelegate(DELEGATE);
+        Log.d(TAG, "Set delegate: " + nm.getNotificationDelegate());
+
+        Log.d(TAG, "Posting notification with id 9");
+
+        Notification n = new Notification.Builder(this, CHANNEL)
+                .setSmallIcon(android.R.drawable.sym_def_app_icon)
+                .setContentTitle("posted by delegator")
+                .build();
+
+        nm.notify(9, n);
+
+        finish();
+    }
+}
diff --git a/tests/app/NotificationApp/src/com/android/test/notificationapp/NotificationDelegator.java b/tests/app/NotificationApp/src/com/android/test/notificationapp/NotificationDelegator.java
new file mode 100644
index 0000000..9745827
--- /dev/null
+++ b/tests/app/NotificationApp/src/com/android/test/notificationapp/NotificationDelegator.java
@@ -0,0 +1,44 @@
+/*
+ * 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.test.notificationapp;
+
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+
+import android.app.Activity;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.os.Bundle;
+import android.util.Log;
+
+public class NotificationDelegator extends Activity {
+    private static final String TAG = "Delegator";
+    private static final String DELEGATE = "android.app.stubs";
+    private static final String CHANNEL = "channel";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity);
+
+        NotificationManager nm = getSystemService(NotificationManager.class);
+
+        nm.createNotificationChannel(new NotificationChannel(CHANNEL, CHANNEL, IMPORTANCE_LOW));
+        nm.setNotificationDelegate(DELEGATE);
+        Log.d(TAG, "Set delegate: " + nm.getNotificationDelegate());
+        finish();
+    }
+}
diff --git a/tests/app/NotificationApp/src/com/android/test/notificationapp/NotificationRevoker.java b/tests/app/NotificationApp/src/com/android/test/notificationapp/NotificationRevoker.java
new file mode 100644
index 0000000..54c6c8d
--- /dev/null
+++ b/tests/app/NotificationApp/src/com/android/test/notificationapp/NotificationRevoker.java
@@ -0,0 +1,38 @@
+/*
+ * 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.test.notificationapp;
+
+import android.app.Activity;
+import android.app.NotificationManager;
+import android.os.Bundle;
+import android.util.Log;
+
+public class NotificationRevoker extends Activity {
+    private static final String TAG = "Revoker";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity);
+
+        NotificationManager nm = getSystemService(NotificationManager.class);
+        nm.setNotificationDelegate(null);
+        Log.d(TAG, "Removed delegate: " + nm.getNotificationDelegate());
+        nm.cancelAll();
+        finish();
+    }
+}
diff --git a/tests/app/NotificationApp/src/com/android/test/notificationapp/TestNotificationListener.java b/tests/app/NotificationApp/src/com/android/test/notificationapp/TestNotificationListener.java
new file mode 100644
index 0000000..b294e48
--- /dev/null
+++ b/tests/app/NotificationApp/src/com/android/test/notificationapp/TestNotificationListener.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 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.test.notificationapp;
+
+import android.service.notification.NotificationListenerService;
+
+// Minimal possible NotificationListenerService, used just to grant notification listener access.
+public class TestNotificationListener extends NotificationListenerService {
+    public static final String TAG = "TestNotificationListener";
+    public static final String PKG = "com.android.test.notificationapp";
+}
diff --git a/tests/app/NotificationDelegator/Android.bp b/tests/app/NotificationDelegator/Android.bp
deleted file mode 100644
index f4fbdd3..0000000
--- a/tests/app/NotificationDelegator/Android.bp
+++ /dev/null
@@ -1,30 +0,0 @@
-// 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-android_test_helper_app {
-    name: "NotificationDelegator",
-    defaults: ["cts_support_defaults"],
-    srcs: ["**/*.java"],
-    // Tag this module as a cts test artifact
-    test_suites: [
-        "cts",
-        "general-tests",
-        "sts",
-    ],
-    sdk_version: "current",
-}
diff --git a/tests/app/NotificationDelegator/AndroidManifest.xml b/tests/app/NotificationDelegator/AndroidManifest.xml
deleted file mode 100644
index a05dcd2..0000000
--- a/tests/app/NotificationDelegator/AndroidManifest.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-     package="com.android.test.notificationdelegator">
-    <application android:label="Notification Delegator">
-        <activity android:name="com.android.test.notificationdelegator.NotificationDelegator"
-             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.android.test.notificationdelegator.NotificationRevoker"
-             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
-
-        <activity android:name="com.android.test.notificationdelegator.NotificationDelegateAndPost"
-             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-        </activity>
-
-    </application>
-</manifest>
diff --git a/tests/app/NotificationDelegator/src/com/android/test/notificationdelegator/NotificationDelegateAndPost.java b/tests/app/NotificationDelegator/src/com/android/test/notificationdelegator/NotificationDelegateAndPost.java
deleted file mode 100644
index 521adc5..0000000
--- a/tests/app/NotificationDelegator/src/com/android/test/notificationdelegator/NotificationDelegateAndPost.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2019 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.test.notificationdelegator;
-
-import static android.app.NotificationManager.IMPORTANCE_LOW;
-
-import android.app.Activity;
-import android.app.Notification;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.os.Bundle;
-import android.util.Log;
-
-public class NotificationDelegateAndPost extends Activity {
-    private static final String TAG = "DelegateAndPost";
-    private static final String DELEGATE = "android.app.stubs";
-    private static final String CHANNEL = "channel";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity);
-
-        NotificationManager nm = getSystemService(NotificationManager.class);
-
-        nm.createNotificationChannel(new NotificationChannel(CHANNEL, CHANNEL, IMPORTANCE_LOW));
-        nm.setNotificationDelegate(DELEGATE);
-        Log.d(TAG, "Set delegate: " + nm.getNotificationDelegate());
-
-        Log.d(TAG, "Posting notification with id 9");
-
-        Notification n = new Notification.Builder(this, CHANNEL)
-                .setSmallIcon(android.R.drawable.sym_def_app_icon)
-                .setContentTitle("posted by delegator")
-                .build();
-
-        nm.notify(9, n);
-
-        finish();
-    }
-}
diff --git a/tests/app/NotificationDelegator/src/com/android/test/notificationdelegator/NotificationDelegator.java b/tests/app/NotificationDelegator/src/com/android/test/notificationdelegator/NotificationDelegator.java
deleted file mode 100644
index 15cf42d..0000000
--- a/tests/app/NotificationDelegator/src/com/android/test/notificationdelegator/NotificationDelegator.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.test.notificationdelegator;
-
-import static android.app.NotificationManager.IMPORTANCE_LOW;
-
-import android.app.Activity;
-import android.app.NotificationChannel;
-import android.app.NotificationManager;
-import android.os.Bundle;
-import android.util.Log;
-
-public class NotificationDelegator extends Activity {
-    private static final String TAG = "Delegator";
-    private static final String DELEGATE = "android.app.stubs";
-    private static final String CHANNEL = "channel";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity);
-
-        NotificationManager nm = getSystemService(NotificationManager.class);
-
-        nm.createNotificationChannel(new NotificationChannel(CHANNEL, CHANNEL, IMPORTANCE_LOW));
-        nm.setNotificationDelegate(DELEGATE);
-        Log.d(TAG, "Set delegate: " + nm.getNotificationDelegate());
-        finish();
-    }
-}
diff --git a/tests/app/NotificationDelegator/src/com/android/test/notificationdelegator/NotificationRevoker.java b/tests/app/NotificationDelegator/src/com/android/test/notificationdelegator/NotificationRevoker.java
deleted file mode 100644
index 750549a..0000000
--- a/tests/app/NotificationDelegator/src/com/android/test/notificationdelegator/NotificationRevoker.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.test.notificationdelegator;
-
-import android.app.Activity;
-import android.app.NotificationManager;
-import android.os.Bundle;
-import android.util.Log;
-
-public class NotificationRevoker extends Activity {
-    private static final String TAG = "Revoker";
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity);
-
-        NotificationManager nm = getSystemService(NotificationManager.class);
-        nm.setNotificationDelegate(null);
-        Log.d(TAG, "Removed delegate: " + nm.getNotificationDelegate());
-        nm.cancelAll();
-        finish();
-    }
-}
diff --git a/tests/app/NotificationProvider/AndroidManifest.xml b/tests/app/NotificationProvider/AndroidManifest.xml
index 09ae4b0..4c6c972 100644
--- a/tests/app/NotificationProvider/AndroidManifest.xml
+++ b/tests/app/NotificationProvider/AndroidManifest.xml
@@ -16,6 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.test.notificationprovider">
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <application android:label="Notification Provider">
         <activity android:name=".RichNotificationActivity" android:exported="true">
             <intent-filter>
diff --git a/tests/app/NotificationTrampolineBase/AndroidManifest.xml b/tests/app/NotificationTrampolineBase/AndroidManifest.xml
index 093495f..418872f 100644
--- a/tests/app/NotificationTrampolineBase/AndroidManifest.xml
+++ b/tests/app/NotificationTrampolineBase/AndroidManifest.xml
@@ -16,6 +16,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.android.test.notificationtrampoline">
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <application>
         <service
             android:name=".NotificationTrampolineTestService"
diff --git a/tests/app/NotificationTrampolineBase/src/com/android/test/notificationtrampoline/NotificationTrampolineTestService.java b/tests/app/NotificationTrampolineBase/src/com/android/test/notificationtrampoline/NotificationTrampolineTestService.java
index e230eb6..120186b 100644
--- a/tests/app/NotificationTrampolineBase/src/com/android/test/notificationtrampoline/NotificationTrampolineTestService.java
+++ b/tests/app/NotificationTrampolineBase/src/com/android/test/notificationtrampoline/NotificationTrampolineTestService.java
@@ -116,7 +116,8 @@
                             startTargetActivity();
                         }
                     };
-                    registerReceiver(mReceiver, new IntentFilter(mReceiverAction));
+                    registerReceiver(mReceiver, new IntentFilter(mReceiverAction),
+                            Context.RECEIVER_EXPORTED_UNAUDITED);
                     Intent intent = new Intent(mReceiverAction);
                     postNotification(notificationId,
                             PendingIntent.getBroadcast(context, 0, intent, PI_FLAGS));
diff --git a/tests/app/TEST_MAPPING b/tests/app/TEST_MAPPING
index 213ad1e..566d755 100644
--- a/tests/app/TEST_MAPPING
+++ b/tests/app/TEST_MAPPING
@@ -4,6 +4,12 @@
       "name": "CtsAppTestCases",
       "options": [
         {
+          "exclude-annotation": "android.platform.test.annotations.LargeTest"
+        },
+        {
+          "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+        },
+        {
           "exclude-annotation": "androidx.test.filters.LargeTest"
         },
         {
diff --git a/tests/app/app/Android.bp b/tests/app/app/Android.bp
index d4594ed..beb04c3 100644
--- a/tests/app/app/Android.bp
+++ b/tests/app/app/Android.bp
@@ -36,10 +36,15 @@
         "testng",
         "CtsAppTestStubsShared",
     ],
+    aidl: {
+        local_include_dirs: [
+            "src",
+        ],
+    },
     srcs: [
         "src/**/*.java",
         "src/**/*.kt",
-        "src/android/app/stubs/ISecondary.aidl",
+        "src/**/*.aidl",
     ],
     // Tag this module as a cts test artifact
     test_suites: [
@@ -70,9 +75,14 @@
         "androidx.test.core",
         "CtsAppTestStubsShared",
     ],
+    aidl: {
+        local_include_dirs: [
+            "src",
+        ],
+    },
     srcs: [
         "src/**/*.java",
-        "src/android/app/stubs/ISecondary.aidl",
+        "src/**/*.aidl",
     ],
     // Tag this module as a cts test artifact
     test_suites: [
@@ -105,9 +115,14 @@
         "androidx.test.core",
         "CtsAppTestStubsShared",
     ],
+    aidl: {
+        local_include_dirs: [
+            "src",
+        ],
+    },
     srcs: [
         "src/**/*.java",
-        "src/android/app/stubs/ISecondary.aidl",
+        "src/**/*.aidl",
     ],
     // Tag this module as a cts test artifact
     test_suites: [
@@ -140,9 +155,14 @@
         "androidx.test.core",
         "CtsAppTestStubsShared",
     ],
+    aidl: {
+        local_include_dirs: [
+            "src",
+        ],
+    },
     srcs: [
         "src/**/*.java",
-        "src/android/app/stubs/ISecondary.aidl",
+        "src/**/*.aidl",
     ],
     // Tag this module as a cts test artifact
     test_suites: [
@@ -175,9 +195,14 @@
         "androidx.test.core",
         "CtsAppTestStubsShared",
     ],
+    aidl: {
+        local_include_dirs: [
+            "src",
+        ],
+    },
     srcs: [
         "src/**/*.java",
-        "src/android/app/stubs/ISecondary.aidl",
+        "src/**/*.aidl",
     ],
     // Tag this module as a cts test artifact
     test_suites: [
diff --git a/tests/app/app/AndroidManifest.xml b/tests/app/app/AndroidManifest.xml
index 737dfaa..1cadc85 100644
--- a/tests/app/app/AndroidManifest.xml
+++ b/tests/app/app/AndroidManifest.xml
@@ -65,6 +65,7 @@
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application android:label="Android TestCase"
          android:icon="@drawable/size_48x48"
@@ -366,7 +367,6 @@
 
         <activity android:name="android.app.stubs.ActivityManagerStubCrashActivity"
              android:label="ActivityManagerStubCrashActivity"
-             android:multiprocess="true"
              android:process=":ActivityManagerStubCrashActivity"
              android:exported="true">
             <intent-filter>
@@ -467,6 +467,15 @@
             </intent-filter>
         </service>
 
+        <service android:name="android.app.stubs.TestNotificationAssistant"
+                 android:exported="true"
+                 android:label="TestNotificationAssistant"
+                 android:permission="android.permission.BIND_NOTIFICATION_ASSISTANT_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.notification.NotificationAssistantService"/>
+            </intent-filter>
+        </service>
+
         <service android:name="android.app.stubs.TestTileService"
              android:exported="true"
              android:label="TestTileService"
@@ -477,16 +486,14 @@
             </intent-filter>
         </service>
 
-        <service android:name="android.app.stubs.ToggleableTestTileService"
-             android:exported="true"
-             android:label="BooleanTestTileService"
-             android:icon="@drawable/robot"
-             android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+        <service android:name="android.app.stubs.NotExportedTestTileService"
+                 android:exported="false"
+                 android:label="NotExportedTestTileService"
+                 android:icon="@drawable/robot"
+                 android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
             <intent-filter>
                 <action android:name="android.service.quicksettings.action.QS_TILE"/>
             </intent-filter>
-            <meta-data android:name="android.service.quicksettings.TOGGLEABLE_TILE"
-                 android:value="true"/>
         </service>
 
         <activity android:name="android.app.stubs.AutomaticZenRuleActivity"
@@ -515,6 +522,7 @@
         </activity>
 
         <activity android:name="android.app.stubs.BubbledActivity"
+             android:turnScreenOn="true"
              android:resizeableActivity="true"/>
 
         <service android:name="android.app.stubs.BubblesTestService"
@@ -551,7 +559,20 @@
             </intent-filter>
         </activity>
 
-    <service android:name="android.app.stubs.TrimMemService"
+        <service android:name=".HeartbeatService"
+            android:process=":hbsvc"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.app.stubs.HeartbeatService"/>
+            </intent-filter>
+        </service>
+        <activity android:name=".HeartbeatActivity"
+            android:label=":CountdownActivity"
+            android:process=":hbact"
+            android:launchMode="singleInstance"
+            android:exported="true"/>
+
+        <service android:name="android.app.stubs.TrimMemService"
             android:exported="true"
             android:isolatedProcess="true">
         </service>
diff --git a/tests/app/app/res/layout/main.xml b/tests/app/app/res/layout/main.xml
index 3f2c54b..8a046b9 100644
--- a/tests/app/app/res/layout/main.xml
+++ b/tests/app/app/res/layout/main.xml
@@ -17,6 +17,7 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:keepScreenOn="true"
     >
     <TextView
         android:layout_width="fill_parent"
diff --git a/tests/app/app/src/android/app/stubs/BubbledActivity.java b/tests/app/app/src/android/app/stubs/BubbledActivity.java
index f498038..02feb2f 100644
--- a/tests/app/app/src/android/app/stubs/BubbledActivity.java
+++ b/tests/app/app/src/android/app/stubs/BubbledActivity.java
@@ -21,7 +21,7 @@
 import android.os.Bundle;
 
 /**
- * Used by NotificationManagerTest for testing policy around bubbles, this activity is shown
+ * Used by NotificationManagerBubbleTest for testing policy around bubbles, this activity is shown
  * within the bubble (and sometimes outside too depending on the test).
  */
 public class BubbledActivity extends Activity {
diff --git a/tests/app/app/src/android/app/stubs/HeartbeatActivity.java b/tests/app/app/src/android/app/stubs/HeartbeatActivity.java
new file mode 100644
index 0000000..afa9228
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/HeartbeatActivity.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2022 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 android.app.stubs;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.Process;
+import android.os.RemoteException;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+/**
+ * A simple activity using HeartbeatService to test Messenger and App Freezer
+ */
+public class HeartbeatActivity extends Activity {
+    private static final String TAG = HeartbeatActivity.class.getSimpleName();
+    private static final String HEARTBEAT_COUNTDOWN = "countdown";
+    private static final String HEARTBEAT_INTERVAL = "interval";
+
+    private IHeartbeat mHeartbeat;
+    private ServiceConnection mConnection;
+
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            Log.d(TAG, "Receiving the finish of heartbeat");
+            Process.killProcess(Process.myPid());
+        }
+    };
+
+    private final ICallback.Stub mCallback = new ICallback.Stub() {
+        @Override
+        public void onHeartbeat(int countdown) {
+            Log.d(TAG, "Received heartbeat countdown " + countdown);
+        }
+    };
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        int countdown = getIntent().getIntExtra(HEARTBEAT_COUNTDOWN, IHeartbeat.DEFAULT_COUNTDOWN);
+        long interval = getIntent().getLongExtra(HEARTBEAT_INTERVAL, IHeartbeat.DEFAULT_INTERVAL);
+        Log.d(TAG, "Heartbeat intent countdown=" + countdown + " interval=" + interval);
+        registerReceiver(mReceiver, new IntentFilter(IHeartbeat.HEARTBEAT_DONE),
+                Context.RECEIVER_NOT_EXPORTED);
+        startHeartbeat(countdown, interval);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        unbindService(mConnection);
+        unregisterReceiver(mReceiver);
+    }
+
+    private void startHeartbeat(int countdown, long interval) {
+        Intent intent = new Intent(this, HeartbeatService.class);
+        mConnection = new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+                mHeartbeat = IHeartbeat.Stub.asInterface(service);
+                try {
+                    Log.d(TAG, "Trigger heartbeat service");
+                    mHeartbeat.trigger(Process.myPid(), Process.myUid(), Process.myProcessName(),
+                            countdown, interval, mCallback);
+                } catch (RemoteException e) {
+                    Log.e(TAG, "Failed to trigger Heartbeat service");
+                }
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                mHeartbeat = null;
+            }
+        };
+
+        bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
+    }
+}
diff --git a/tests/app/app/src/android/app/stubs/HeartbeatService.java b/tests/app/app/src/android/app/stubs/HeartbeatService.java
new file mode 100644
index 0000000..27064cc
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/HeartbeatService.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2022 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 android.app.stubs;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IBinder;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.RemoteException;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+
+import java.util.concurrent.CountDownLatch;
+
+public class HeartbeatService extends Service {
+
+    private static final String TAG = HeartbeatService.class.getSimpleName();
+
+    private static final int CMD_PID = 1;
+    private static final String PROCESS_NAME = "process";
+    private static final String PROCESS_DEAD = "dead";
+
+    private int mPid;
+    private int mUid;
+    private String mName;
+    private boolean mDead;
+    private CountDownLatch mLatch = new CountDownLatch(1);
+
+    private final IHeartbeat.Stub mHeartbeat = new IHeartbeat.Stub() {
+        @Override
+        public void trigger(int pid, int uid, String name, int countdown, long interval,
+                ICallback callback) {
+            mPid = pid;
+            mUid = uid;
+            mName = name;
+            new Thread(() -> {
+                Log.d(TAG, "Heartbeat thread started");
+                for (int i = countdown; i > 0; i--) {
+                    try {
+                        Thread.sleep(interval);
+                    } catch (InterruptedException e) {
+                    }
+                    try {
+                        Log.d(TAG, "Sending heartbeat countdown " + i);
+                        callback.onHeartbeat(i);
+                    } catch (RemoteException e) {
+                        Log.w(TAG, "Client has died");
+                        mDead = true;
+                        break;
+                    }
+                }
+                // AMS will kill the client if it received callback while being frozen
+                // Otherwise, the client will kill itself with SIGKILL
+                Intent intent = new Intent(IHeartbeat.HEARTBEAT_DONE);
+                Log.d(TAG, "Notify the client heartbeat service is done");
+                sendBroadcast(intent);
+                Log.d(TAG, "Notify the monitor heartbeat service is done");
+                mLatch.countDown();
+            }).start();
+        }
+
+        @Override
+        public void monitor(Messenger messenger) {
+            new Thread(() -> {
+                Log.d(TAG, "Monitor thread started");
+                try {
+                    mLatch.await();
+                    Log.d(TAG, "Detected the end of heartbeat service");
+                } catch (InterruptedException e) {
+                }
+                Message msg = Message.obtain();
+                msg.what = CMD_PID;
+                msg.arg1 = mPid;
+                msg.arg2 = mUid;
+                Bundle b = new Bundle();
+                b.putString(PROCESS_NAME, mName);
+                b.putBoolean(PROCESS_DEAD, mDead);
+                msg.obj = b;
+                try {
+                    Log.d(TAG, "Report monitor result");
+                    messenger.send(msg);
+                } catch (RemoteException e) {
+                    Log.w(TAG, "Failed to report monitor result");
+                }
+            }).start();
+        }
+    };
+
+    /**
+     * Return the communication channel to the service.  May return null if
+     * clients can not bind to the service.  The returned
+     * {@link IBinder} is usually for a complex interface
+     * that has been <a href="{@docRoot}guide/components/aidl.html">described using
+     * aidl</a>.
+     *
+     * <p><em>Note that unlike other application components, calls on to the
+     * IBinder interface returned here may not happen on the main thread
+     * of the process</em>.  More information about the main thread can be found in
+     * <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html">Processes and
+     * Threads</a>.</p>
+     *
+     * @param intent The Intent that was used to bind to this service,
+     *               as given to {@link Context#bindService
+     *               Context.bindService}.  Note that any extras that were included with
+     *               the Intent at that point will <em>not</em> be seen here.
+     * @return Return an IBinder through which clients can call on to the
+     * service.
+     */
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mHeartbeat;
+    }
+}
diff --git a/tests/app/app/src/android/app/stubs/ICallback.aidl b/tests/app/app/src/android/app/stubs/ICallback.aidl
new file mode 100644
index 0000000..3b040b9
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/ICallback.aidl
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2022 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 android.app.stubs;
+
+interface ICallback {
+    void onHeartbeat(int countdown);
+}
diff --git a/tests/app/app/src/android/app/stubs/IHeartbeat.aidl b/tests/app/app/src/android/app/stubs/IHeartbeat.aidl
new file mode 100644
index 0000000..f02ac28
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/IHeartbeat.aidl
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2022 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 android.app.stubs;
+
+import android.app.stubs.ICallback;
+import android.os.Messenger;
+
+interface IHeartbeat {
+    void trigger(int pid, int uid, String name, int countdown, long interval, in ICallback callback);
+    void monitor(in Messenger messenger);
+
+    const int DEFAULT_COUNTDOWN = 60;
+    const long DEFAULT_INTERVAL = 1000;
+    const String HEARTBEAT_DONE = "android.app.stubs.HEARTBEAT_DONE";
+}
diff --git a/tests/app/app/src/android/app/stubs/NotExportedTestTileService.java b/tests/app/app/src/android/app/stubs/NotExportedTestTileService.java
new file mode 100644
index 0000000..f0ac974
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/NotExportedTestTileService.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2021 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 android.app.stubs;
+
+import android.content.ComponentName;
+import android.service.quicksettings.TileService;
+
+public class NotExportedTestTileService extends TileService {
+
+    public static ComponentName getComponentName() {
+        return new ComponentName(NotExportedTestTileService.class.getPackage().getName(),
+                NotExportedTestTileService.class.getName());
+    }
+}
diff --git a/tests/app/app/src/android/app/stubs/SendBubbleActivity.java b/tests/app/app/src/android/app/stubs/SendBubbleActivity.java
index 05de528..0281671 100644
--- a/tests/app/app/src/android/app/stubs/SendBubbleActivity.java
+++ b/tests/app/app/src/android/app/stubs/SendBubbleActivity.java
@@ -16,8 +16,6 @@
 
 package android.app.stubs;
 
-import static android.app.stubs.BubbledActivity.EXTRA_LOCUS_ID;
-
 import android.app.Activity;
 import android.app.Notification;
 import android.app.Notification.BubbleMetadata;
@@ -32,13 +30,12 @@
 import android.os.SystemClock;
 
 /**
- * Used by NotificationManagerTest for testing policy around bubbles, this activity is able to
+ * Used by NotificationManagerBubbleTest for testing policy around bubbles, this activity is able to
  * send a bubble.
  */
 public class SendBubbleActivity extends Activity {
-    final String TAG = SendBubbleActivity.class.getSimpleName();
 
-    // Should be same as what NotificationManagerTest is using
+    // Should be same as what NotificationManagerBubbleTest is using
     private static final String NOTIFICATION_CHANNEL_ID = "NotificationManagerTest";
     private static final String SHARE_SHORTCUT_ID = "shareShortcut";
 
@@ -57,23 +54,6 @@
         sendBroadcast(i);
     }
 
-    public void startBubbleActivity(int id) {
-        startBubbleActivity(id, true /* addLocusId */);
-    }
-
-    /**
-     * Starts the same activity that is in the bubble produced by this activity.
-     */
-    public void startBubbleActivity(int id, boolean addLocusId) {
-        final Intent intent = new Intent(getApplicationContext(), BubbledActivity.class);
-        // Clear any previous instance of this activity
-        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-        if (addLocusId) {
-            intent.putExtra(EXTRA_LOCUS_ID, String.valueOf(id));
-        }
-        startActivity(intent);
-    }
-
     /**
      * Sends a notification that has bubble metadata but the rest of the notification isn't
      * configured correctly so the system won't allow it to bubble.
diff --git a/tests/app/app/src/android/app/stubs/TestNotificationAssistant.java b/tests/app/app/src/android/app/stubs/TestNotificationAssistant.java
new file mode 100644
index 0000000..bf387d3
--- /dev/null
+++ b/tests/app/app/src/android/app/stubs/TestNotificationAssistant.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright (C) 2022 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 android.app.stubs;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.ComponentName;
+import android.os.Bundle;
+import android.service.notification.Adjustment;
+import android.service.notification.NotificationAssistantService;
+import android.service.notification.StatusBarNotification;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class TestNotificationAssistant extends NotificationAssistantService {
+    public static final String TAG = "TestNotificationAssistant";
+    public static final String PKG = "android.app.stubs";
+
+    private static TestNotificationAssistant sNotificationAssistantInstance = null;
+    boolean mIsConnected;
+    boolean mIsPanelOpen = false;
+    public List<String> mCurrentCapabilities;
+    boolean mNotificationVisible = false;
+    int mNotificationId = 1357;
+    int mNotificationSeenCount = 0;
+    int mNotificationClickCount = 0;
+    int mNotificationRank = -1;
+    int mNotificationFeedback = 0;
+    String mSnoozedKey;
+    String mSnoozedUntilContext;
+    private NotificationManager mNotificationManager;
+
+    public Map<String, Integer> mRemoved = new HashMap<>();
+
+    public static String getId() {
+        return String.format("%s/%s", TestNotificationAssistant.class.getPackage().getName(),
+                TestNotificationAssistant.class.getName());
+    }
+
+    public static ComponentName getComponentName() {
+        return new ComponentName(TestNotificationAssistant.class.getPackage().getName(),
+                TestNotificationAssistant.class.getName());
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        mNotificationManager = getSystemService(NotificationManager.class);
+    }
+
+    @Override
+    public void onListenerConnected() {
+        super.onListenerConnected();
+        sNotificationAssistantInstance = this;
+        mIsConnected = true;
+    }
+
+    @Override
+    public void onListenerDisconnected() {
+        mIsConnected = false;
+    }
+
+    public static TestNotificationAssistant getInstance() {
+        return sNotificationAssistantInstance;
+    }
+
+    @Override
+    public void onNotificationSnoozedUntilContext(StatusBarNotification statusBarNotification,
+            String s) {
+        mSnoozedKey = statusBarNotification.getKey();
+        mSnoozedUntilContext = s;
+    }
+
+    @Override
+    public Adjustment onNotificationEnqueued(StatusBarNotification sbn) {
+        return null;
+    }
+
+    @Override
+    public Adjustment onNotificationEnqueued(StatusBarNotification sbn, NotificationChannel channel,
+            RankingMap rankingMap) {
+        Bundle signals = new Bundle();
+        Ranking ranking = new Ranking();
+        rankingMap.getRanking(sbn.getKey(), ranking);
+        mNotificationRank = ranking.getRank();
+        signals.putInt(Adjustment.KEY_USER_SENTIMENT, Ranking.USER_SENTIMENT_POSITIVE);
+        return new Adjustment(sbn.getPackageName(), sbn.getKey(), signals, "",
+                sbn.getUser());
+    }
+
+    @Override
+    public void onAllowedAdjustmentsChanged() {
+        mCurrentCapabilities = mNotificationManager.getAllowedAssistantAdjustments();
+    }
+
+    void resetNotificationVisibilityCounts() {
+        mNotificationSeenCount = 0;
+    }
+
+    @Override
+    public void onNotificationVisibilityChanged(String key, boolean isVisible) {
+        if (key.contains(TestNotificationAssistant.class.getPackage().getName()
+                + "|" + mNotificationId)) {
+            mNotificationVisible = isVisible;
+        }
+    }
+
+    @Override
+    public void onNotificationsSeen(List<String> keys) {
+        mNotificationSeenCount += keys.size();
+    }
+
+    @Override
+    public void onPanelHidden() {
+        mIsPanelOpen = false;
+    }
+
+    @Override
+    public void onPanelRevealed(int items) {
+        mIsPanelOpen = true;
+    }
+
+    void resetNotificationClickCount() {
+        mNotificationClickCount = 0;
+    }
+
+    @Override
+    public void onNotificationClicked(String key) {
+        mNotificationClickCount++;
+    }
+
+    @Override
+    public void onNotificationFeedbackReceived(String key, RankingMap rankingMap, Bundle feedback) {
+        mNotificationFeedback = feedback.getInt(FEEDBACK_RATING, 0);
+    }
+
+    @Override
+    public void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingMap,
+            int reason) {
+        if (sbn == null) {
+            return;
+        }
+        mRemoved.put(sbn.getKey(), reason);
+    }
+}
diff --git a/tests/app/app/src/android/app/stubs/TestNotificationListener.java b/tests/app/app/src/android/app/stubs/TestNotificationListener.java
index eabde5c..9ec7c80 100644
--- a/tests/app/app/src/android/app/stubs/TestNotificationListener.java
+++ b/tests/app/app/src/android/app/stubs/TestNotificationListener.java
@@ -19,10 +19,13 @@
 import android.os.ConditionVariable;
 import android.service.notification.NotificationListenerService;
 import android.service.notification.StatusBarNotification;
+import android.util.Log;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 public class TestNotificationListener extends NotificationListenerService {
     public static final String TAG = "TestNotificationListener";
@@ -34,6 +37,7 @@
     public ArrayList<StatusBarNotification> mPosted = new ArrayList<>();
     public Map<String, Integer> mRemoved = new HashMap<>();
     public RankingMap mRankingMap;
+    public Map<String, Boolean> mIntercepted = new HashMap<>();
 
     /**
      * This controls whether there is a listener connected or not. Depending on the method, if the
@@ -66,6 +70,7 @@
 
     @Override
     public void onListenerConnected() {
+        Log.d(TAG, "onListenerConnected() called");
         super.onListenerConnected();
         sNotificationListenerInstance = this;
         INSTANCE_AVAILABLE.open();
@@ -74,6 +79,7 @@
 
     @Override
     public void onListenerDisconnected() {
+        Log.d(TAG, "onListenerDisconnected() called");
         INSTANCE_AVAILABLE.close();
         sNotificationListenerInstance = null;
         isConnected = false;
@@ -87,8 +93,10 @@
     }
 
     public void resetData() {
+        Log.d(TAG, "resetData() called");
         mPosted.clear();
         mRemoved.clear();
+        mIntercepted.clear();
     }
 
     public void addTestPackage(String packageName) {
@@ -101,21 +109,65 @@
 
     @Override
     public void onNotificationPosted(StatusBarNotification sbn, RankingMap rankingMap) {
-        if (sbn == null || !mTestPackages.contains(sbn.getPackageName())) { return; }
+        if (sbn == null || !mTestPackages.contains(sbn.getPackageName())) {
+            Log.d(TAG, "onNotificationPosted: skipping handling sbn=" + sbn + " testPackages="
+                    + listToString(mTestPackages));
+            return;
+        } else {
+            Log.d(TAG, "onNotificationPosted: sbn=" + sbn + " testPackages=" + listToString(
+                    mTestPackages));
+        }
         mRankingMap = rankingMap;
+        updateInterceptedRecords(rankingMap);
         mPosted.add(sbn);
     }
 
     @Override
     public void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingMap,
             int reason) {
-        if (sbn == null || !mTestPackages.contains(sbn.getPackageName())) { return; }
+        if (sbn == null || !mTestPackages.contains(sbn.getPackageName())) {
+            Log.d(TAG, "onNotificationRemoved: skipping handling sbn=" + sbn + " testPackages="
+                    + listToString(mTestPackages));
+            return;
+        } else {
+            Log.d(TAG, "onNotificationRemoved: sbn=" + sbn + " reason=" + reason
+                    + " testPackages=" + listToString(mTestPackages));
+        }
         mRankingMap = rankingMap;
+        updateInterceptedRecords(rankingMap);
         mRemoved.put(sbn.getKey(), reason);
     }
 
     @Override
     public void onNotificationRankingUpdate(RankingMap rankingMap) {
+        Log.d(TAG, "onNotificationRankingUpdate() called rankingMap=[" + rankingMap + "]");
         mRankingMap = rankingMap;
+        updateInterceptedRecords(rankingMap);
+    }
+
+    // update the local cache of intercepted records based on the given ranking map; should be run
+    // every time the listener gets updated ranking map info
+    private void updateInterceptedRecords(RankingMap rankingMap) {
+        for (String key : rankingMap.getOrderedKeys()) {
+            Ranking rank = new Ranking();
+            if (rankingMap.getRanking(key, rank)) {
+                // matchesInterruptionFilter is true if the notifiation can bypass and false if
+                // blocked so the "is intercepted" boolean is the opposite of that.
+                mIntercepted.put(key, !rank.matchesInterruptionFilter());
+            }
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "TestNotificationListener{"
+                + "mTestPackages=[" + listToString(mTestPackages)
+                + "], mPosted=[" + listToString(mPosted)
+                + ", mRemoved=[" + listToString(mRemoved.values())
+                + "]}";
+    }
+
+    private String listToString(Collection<?> list) {
+        return list.stream().map(Object::toString).collect(Collectors.joining(","));
     }
 }
diff --git a/tests/app/app/src/android/app/stubs/TestTileService.java b/tests/app/app/src/android/app/stubs/TestTileService.java
index 623625b..c10ef8f 100644
--- a/tests/app/app/src/android/app/stubs/TestTileService.java
+++ b/tests/app/app/src/android/app/stubs/TestTileService.java
@@ -19,85 +19,10 @@
 import android.content.ComponentName;
 import android.service.quicksettings.TileService;
 
-import java.util.concurrent.atomic.AtomicBoolean;
-
 public class TestTileService extends TileService {
 
-    public static final String TAG = "TestTileService";
-    public static final String PKG = "android.app.stubs";
-    public static final int ICON_ID = R.drawable.robot;
-
-    private static TestTileService sTestTileService = null;
-    AtomicBoolean isConnected = new AtomicBoolean(false);
-    AtomicBoolean isListening = new AtomicBoolean(false);
-    AtomicBoolean hasBeenClicked = new AtomicBoolean(false);
-
-    public static String getId() {
-        return String.format("%s/%s", TestTileService.class.getPackage().getName(),
-                TestTileService.class.getName());
-    }
-
     public static ComponentName getComponentName() {
         return new ComponentName(TestTileService.class.getPackage().getName(),
                 TestTileService.class.getName());
     }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-    }
-
-    public static TestTileService getInstance() {
-        return TestTileService.sTestTileService;
-    }
-
-    public void setInstance(TestTileService tile) {
-        sTestTileService = tile;
-    }
-
-    public static boolean isConnected() {
-        return getInstance() != null && getInstance().isConnected.get();
-    }
-
-    public static boolean isListening() {
-        return getInstance().isListening.get();
-    }
-
-    public static boolean hasBeenClicked() {
-        return getInstance().hasBeenClicked.get();
-    }
-
-    @Override
-    public void onStartListening() {
-        super.onStartListening();
-        isListening.set(true);
-    }
-
-    @Override
-    public void onStopListening() {
-        super.onStopListening();
-        isListening.set(false);
-    }
-
-    @Override
-    public void onClick() {
-        super.onClick();
-        hasBeenClicked.set(true);
-    }
-
-    @Override
-    public void onTileAdded() {
-        super.onTileAdded();
-        setInstance(this);
-        isConnected.set(true);
-    }
-
-    @Override
-    public void onTileRemoved() {
-        super.onTileRemoved();
-        setInstance(null);
-        isConnected.set(false);
-        isListening.set(false);
-        hasBeenClicked.set(false);
-    }
 }
diff --git a/tests/app/app/src/android/app/stubs/ToggleableTestTileService.java b/tests/app/app/src/android/app/stubs/ToggleableTestTileService.java
deleted file mode 100644
index 9e91076..0000000
--- a/tests/app/app/src/android/app/stubs/ToggleableTestTileService.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2019 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 android.app.stubs;
-
-import android.content.ComponentName;
-import android.service.quicksettings.Tile;
-
-public class ToggleableTestTileService extends TestTileService {
-    public static final String TAG = "ToggleableTestTileService";
-    public static final String PKG = "android.app.stubs";
-    public static final int ICON_ID = R.drawable.robot;
-
-    private static TestTileService sTestTileService = null;
-
-    public static boolean isConnected() {
-        return getInstance() != null && getInstance().isConnected.get();
-    }
-
-    public static boolean isListening() {
-        return getInstance().isListening.get();
-    }
-
-    public static TestTileService getInstance() {
-        return ToggleableTestTileService.sTestTileService;
-    }
-
-    @Override
-    public void setInstance(TestTileService tile) {
-        sTestTileService = tile;
-    }
-
-    public static String getId() {
-        return String.format("%s/%s", ToggleableTestTileService.class.getPackage().getName(),
-                ToggleableTestTileService.class.getName());
-    }
-
-    public static ComponentName getComponentName() {
-        return new ComponentName(ToggleableTestTileService.class.getPackage().getName(),
-                ToggleableTestTileService.class.getName());
-    }
-
-    public void toggleState() {
-        if (isListening()) {
-            Tile tile = getInstance().getQsTile();
-            switch(tile.getState()) {
-                case Tile.STATE_ACTIVE:
-                    tile.setState(Tile.STATE_INACTIVE);
-                    break;
-                case Tile.STATE_INACTIVE:
-                    tile.setState(Tile.STATE_ACTIVE);
-                    break;
-                default:
-                    break;
-            }
-            tile.updateTile();
-        }
-    }
-}
diff --git a/tests/app/shared/AndroidManifest.xml b/tests/app/shared/AndroidManifest.xml
index 247a2a8..2eea680 100644
--- a/tests/app/shared/AndroidManifest.xml
+++ b/tests/app/shared/AndroidManifest.xml
@@ -17,6 +17,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="android.app.stubs.shared">
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
     <application>
         <service
             android:name="android.app.stubs.shared.CloseSystemDialogsTestService"
diff --git a/tests/app/src/android/app/cts/ActivityDumpTest.java b/tests/app/src/android/app/cts/ActivityDumpTest.java
new file mode 100644
index 0000000..d0dc3af
--- /dev/null
+++ b/tests/app/src/android/app/cts/ActivityDumpTest.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright (C) 2022 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 android.app.cts;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Activity;
+import android.content.Context;
+import android.util.Dumpable;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.Arrays;
+
+public final class ActivityDumpTest {
+
+    private static final String TAG = ActivityDumpTest.class.getSimpleName();
+
+    private static final String DEFAULT_NAME = "DUMPABLE";
+    private static final String DEFAULT_CONTENT = "The name is Able, Dump Able!";
+
+    private CustomActivity mActivity;
+
+    @Before
+    @UiThreadTest // Needed to create activity
+    public void setActivity() throws Exception {
+        mActivity = new CustomActivity(ApplicationProvider.getApplicationContext());
+        Log.i(TAG, "setActivity: activity=" + mActivity
+                + ", targetSdk=" + mActivity.getApplicationInfo().targetSdkVersion);
+    }
+
+    @Test
+    public void testAddDumpable_oneOnly() throws Exception {
+        mActivity.addDumpable(new CustomDumpable(DEFAULT_NAME, DEFAULT_CONTENT));
+
+        String dump = dump(mActivity);
+
+        assertWithMessage("dump() (expected to have name)").that(dump).contains(DEFAULT_NAME);
+        assertWithMessage("dump() (expected to have content)").that(dump).contains(DEFAULT_CONTENT);
+    }
+
+    @Test
+    public void testAddDumpable_twoWithDistinctNames() throws Exception {
+        mActivity.addDumpable(new CustomDumpable("dump1", "able1"));
+        mActivity.addDumpable(new CustomDumpable("dump2", "able2"));
+
+        String dump = dump(mActivity);
+
+        assertWithMessage("dump() (expected to have name1)").that(dump).contains("dump1");
+        assertWithMessage("dump() (expected to have content1)").that(dump).contains("able1");
+        assertWithMessage("dump() (expected to have name2)").that(dump).contains("dump2");
+        assertWithMessage("dump() (expected to have content2)").that(dump).contains("able2");
+    }
+
+    @Test
+    public void testAddDumpable_twoWithSameName() throws Exception {
+        mActivity.addDumpable(new CustomDumpable("dump", "able1"));
+        mActivity.addDumpable(new CustomDumpable("dump", "able2"));
+
+        String dump = dump(mActivity);
+
+        assertWithMessage("dump() (expected to have name)").that(dump).contains("dump");
+        assertWithMessage("dump() (expected to have content1)").that(dump).contains("able1");
+        assertWithMessage("dump() (expected to NOT have content2)").that(dump)
+                .doesNotContain("able2");
+    }
+
+    @Test
+    public void testDump_autofill() throws Exception {
+        legacyArgDumpTest("--autofill", "AutofillManager");
+    }
+
+    @Test
+    public void testDump_contentCapture() throws Exception {
+        legacyArgDumpTest("--contentcapture", "ContentCaptureManager");
+    }
+
+    @Test
+    public void testDump_translation() throws Exception {
+        legacyArgDumpTest("--translation", "UiTranslationController");
+    }
+
+    private void legacyArgDumpTest(String arg, String dumpableName) throws IOException {
+        String baselineDump = dump(mActivity);
+
+        String legacyArgDump = dump(mActivity, arg);
+        String equivalentDumpableDump = dump(mActivity, "--dump-dumpable", dumpableName);
+
+        assertWithMessage("dump([%s])", arg).that(legacyArgDump).isNotEqualTo(baselineDump);
+        assertWithMessage("dump([%s])", arg).that(legacyArgDump)
+                .isNotEqualTo(equivalentDumpableDump);
+        assertWithMessage("dump([%s])", arg).that(legacyArgDump).contains(arg);
+        assertWithMessage("dump([%s])", arg).that(legacyArgDump).contains("deprecated");
+        assertWithMessage("dump([%s])", arg).that(legacyArgDump)
+                .contains("--dump-dumpable " + dumpableName);
+    }
+
+    @Test
+    public void testDump_listDumpables() throws Exception {
+        String baselineDump = dump(mActivity);
+
+        mActivity.addDumpable(new CustomDumpable(DEFAULT_NAME, DEFAULT_CONTENT));
+
+        String listDumpables = dump(mActivity, "--list-dumpables");
+
+        assertWithMessage("dump(--list-dumpables)").that(listDumpables).contains(DEFAULT_NAME);
+        assertWithMessage("dump(--list-dumpables)").that(listDumpables)
+                .doesNotContain(DEFAULT_CONTENT);
+        assertWithMessage("dump(--list-dumpables)").that(listDumpables)
+                .doesNotContain(baselineDump);
+    }
+
+    @Test
+    public void testDump_dumpDumpable() throws Exception {
+        String prefix = "123";
+        mActivity.addDumpable(new CustomDumpable(DEFAULT_NAME, DEFAULT_CONTENT));
+
+        String dumpDumpable = dumpInternal(mActivity, prefix, "--dump-dumpable", DEFAULT_NAME);
+
+        assertWithMessage("dump(--dump-dumpable %s)", DEFAULT_NAME).that(dumpDumpable)
+                .isEqualTo(String.format("%s%s:\n%s%s%s\n",
+                        prefix, DEFAULT_NAME, // line 1
+                        prefix, prefix, DEFAULT_CONTENT)); // line 2
+    }
+
+    private String dump(Activity activity) throws IOException {
+        return dumpInternal(activity, /* prefix= */ "", /* args= */ (String[]) null);
+    }
+
+    private String dump(Activity activity, String... args) throws IOException {
+        return dumpInternal(activity, /* prefix= */ "", args);
+    }
+
+    private String dumpInternal(Activity activity, String prefix, @Nullable String... args)
+            throws IOException {
+        String argsString = "";
+        if (args != null) {
+            argsString = " with args " + Arrays.toString(args);
+        }
+        Log.d(TAG, "dumping " + activity + argsString);
+        String dump;
+        try (StringWriter sw = new StringWriter(); PrintWriter writer = new PrintWriter(sw)) {
+            // Must call dumpInternal() (instad of dump()) so special args are handled
+            activity.dumpInternal(prefix, /* fd= */ null, writer, args);
+            dump = sw.toString();
+        }
+        assertWithMessage("dump(%s)", argsString).that(dump).isNotEmpty();
+        Log.v(TAG, "result (" + dump.length() + " chars):\n" + dump);
+        return dump;
+    }
+
+    // Needs a custom class to call attachBaseContext(), otherwise dump() would fail because
+    // getResources() and other methods (like getSystemService(...) would return null.
+    private static final class CustomActivity extends Activity {
+
+        CustomActivity(Context context) {
+            attachBaseContext(context);
+        }
+    }
+
+    private static final class CustomDumpable implements Dumpable {
+        public final String name;
+        public final String content;
+
+        private CustomDumpable(String name, String content) {
+            this.name = name;
+            this.content = content;
+        }
+
+        @Override
+        public String getDumpableName() {
+            return name;
+        }
+
+        @Override
+        public void dump(PrintWriter writer, String[] args) {
+            writer.println(content);
+        }
+    }
+}
diff --git a/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java b/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java
index 10daf75..0f98cdf 100644
--- a/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java
+++ b/tests/app/src/android/app/cts/ActivityManagerFgsBgStartTest.java
@@ -61,6 +61,7 @@
 import android.provider.DeviceConfig;
 import android.provider.Settings;
 import android.support.test.uiautomator.UiDevice;
+import android.util.Log;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -78,10 +79,10 @@
 public class ActivityManagerFgsBgStartTest {
     private static final String TAG = ActivityManagerFgsBgStartTest.class.getName();
 
-    private static final String STUB_PACKAGE_NAME = "android.app.stubs";
-    private static final String PACKAGE_NAME_APP1 = "com.android.app1";
-    private static final String PACKAGE_NAME_APP2 = "com.android.app2";
-    private static final String PACKAGE_NAME_APP3 = "com.android.app3";
+    static final String STUB_PACKAGE_NAME = "android.app.stubs";
+    static final String PACKAGE_NAME_APP1 = "com.android.app1";
+    static final String PACKAGE_NAME_APP2 = "com.android.app2";
+    static final String PACKAGE_NAME_APP3 = "com.android.app3";
 
     private static final String KEY_DEFAULT_FGS_STARTS_RESTRICTION_ENABLED =
             "default_fgs_starts_restriction_enabled";
@@ -99,7 +100,7 @@
             | PROCESS_CAPABILITY_FOREGROUND_MICROPHONE
             | PROCESS_CAPABILITY_NETWORK);
 
-    private static final int WAITFOR_MSEC = 10000;
+    static final int WAITFOR_MSEC = 10000;
 
     private static final int TEMP_ALLOWLIST_DURATION_MS = 2000;
 
@@ -1464,7 +1465,8 @@
     /**
      * After startForeground() and stopForeground(), the second startForeground() can succeed or not
      * depends on the service's app proc state.
-     * Test startForegroundService() -> startForeground() -> stopForeground() -> startForeground().
+     * Test startForegroundService() -> startForeground() -> stopForeground() -> startForeground()
+     * -> startForeground().
      */
     @Test
     public void testSecondStartForeground() throws Exception {
@@ -1477,10 +1479,10 @@
             enableFgsRestriction(true, true, null);
             WaitForBroadcast waiter = new WaitForBroadcast(mInstrumentation.getTargetContext());
             waiter.prepare(ACTION_START_FGS_RESULT);
-            // bypass bg-service-start restriction.
+            // Bypass bg-service-start restriction.
             CtsAppTestUtils.executeShellCmd(mInstrumentation,
                     "dumpsys deviceidle whitelist +" + PACKAGE_NAME_APP1);
-            // start foreground service.
+            // Start foreground service from APP1, the service can enter FGS.
             CommandReceiver.sendCommand(mContext, CommandReceiver.COMMAND_START_FOREGROUND_SERVICE,
                     PACKAGE_NAME_APP1, PACKAGE_NAME_APP1, 0, null);
             uid1Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_FG_SERVICE);
@@ -1488,7 +1490,7 @@
             CtsAppTestUtils.executeShellCmd(mInstrumentation,
                     "dumpsys deviceidle whitelist -" + PACKAGE_NAME_APP1);
 
-            // stopForeground()
+            // stopForeground(), the service exits FGS, become a background service.
             Bundle extras = LocalForegroundService.newCommand(
                     LocalForegroundService.COMMAND_STOP_FOREGROUND_REMOVE_NOTIFICATION);
             CommandReceiver.sendCommand(mContext, CommandReceiver.COMMAND_START_SERVICE,
@@ -1496,18 +1498,22 @@
             uid1Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_SERVICE,
                     new Integer(PROCESS_CAPABILITY_NONE));
 
-            // startForeground() again.
+            // APP2 is in the background, from APP2, call startForeground().
+            // When APP2 calls Context.startService(), setFgsRestrictionLocked() is called,
+            // because APP2 is in the background, mAllowStartForeground is set to false.
+            // When Service.startForeground() is called, setFgsRestrictionLocked() is called again,
+            // APP1's proc state is in the background and mAllowStartForeground is set to false.
             extras = LocalForegroundService.newCommand(
                     LocalForegroundService.COMMAND_START_FOREGROUND);
             CommandReceiver.sendCommand(mContext, CommandReceiver.COMMAND_START_SERVICE,
-                    PACKAGE_NAME_APP1, PACKAGE_NAME_APP1, 0, extras);
+                    PACKAGE_NAME_APP2, PACKAGE_NAME_APP1, 0, extras);
             try {
                 uid1Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_FG_SERVICE);
                 fail("Service should not enter foreground service state");
             } catch (Exception e) {
             }
 
-            // Put app to a TOP proc state.
+            // Put APP1 to a TOP proc state.
             allowBgActivityStart(PACKAGE_NAME_APP1, true);
             CommandReceiver.sendCommand(mContext, CommandReceiver.COMMAND_START_ACTIVITY,
                     PACKAGE_NAME_APP1, PACKAGE_NAME_APP1, 0, null);
@@ -1515,17 +1521,24 @@
                     new Integer(PROCESS_CAPABILITY_ALL));
             allowBgActivityStart(PACKAGE_NAME_APP1, false);
 
-            // Call startForeground() second time.
+            // APP2 is in the background, from APP2, call startForeground() second time.
+            // When APP2 calls Context.startService(), setFgsRestrictionLocked() is called,
+            // because APP2 is in the background, mAllowStartForeground is set to false.
+            // When Service.startForeground() is called, setFgsRestrictionLocked() is called again,
+            // because APP1's proc state is in the foreground and mAllowStartForeground is set to
+            // true.
             waiter = new WaitForBroadcast(mInstrumentation.getTargetContext());
             waiter.prepare(ACTION_START_FGS_RESULT);
-            CommandReceiver.sendCommand(mContext, CommandReceiver.COMMAND_START_FOREGROUND_SERVICE,
-                    PACKAGE_NAME_APP1, PACKAGE_NAME_APP1, 0, null);
+            extras = LocalForegroundService.newCommand(
+                    LocalForegroundService.COMMAND_START_FOREGROUND);
+            CommandReceiver.sendCommand(mContext, CommandReceiver.COMMAND_START_SERVICE,
+                    PACKAGE_NAME_APP2, PACKAGE_NAME_APP1, 0, extras);
+            waiter.doWait(WAITFOR_MSEC);
+            // Stop app1's activity.
             CommandReceiver.sendCommand(mContext, CommandReceiver.COMMAND_STOP_ACTIVITY,
                     PACKAGE_NAME_APP1, PACKAGE_NAME_APP1, 0, null);
-
             uid1Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_FG_SERVICE,
                     LOCAL_SERVICE_PROCESS_CAPABILITY);
-            waiter.doWait(WAITFOR_MSEC);
 
             // Stop the FGS.
             CommandReceiver.sendCommand(mContext, CommandReceiver.COMMAND_STOP_FOREGROUND_SERVICE,
@@ -1809,6 +1822,133 @@
         }
     }
 
+    @Test
+    public void testFgsStartInBackgroundRestrictions() throws Exception {
+        ApplicationInfo app1Info = mContext.getPackageManager().getApplicationInfo(
+                PACKAGE_NAME_APP1, 0);
+        ApplicationInfo app2Info = mContext.getPackageManager().getApplicationInfo(
+                PACKAGE_NAME_APP2, 0);
+        WatchUidRunner uid1Watcher = new WatchUidRunner(mInstrumentation, app1Info.uid,
+                WAITFOR_MSEC);
+        WatchUidRunner uid2Watcher = new WatchUidRunner(mInstrumentation, app2Info.uid,
+                WAITFOR_MSEC);
+        WaitForBroadcast waiter = new WaitForBroadcast(mInstrumentation.getTargetContext());
+        final String dumpCommand = "dumpsys activity services " + PACKAGE_NAME_APP2
+                + "/android.app.stubs.LocalForegroundService";
+        final long shortWaitMsec = 5_000;
+        try {
+            // Enable the FGS background startForeground() restriction.
+            enableFgsRestriction(true, true, null);
+
+            // Set background restriction for APP2
+            setAppOp(PACKAGE_NAME_APP2, "RUN_ANY_IN_BACKGROUND", false);
+
+            // Start the APP1 into the TOP state.
+            allowBgActivityStart(PACKAGE_NAME_APP1, true);
+            CommandReceiver.sendCommand(mContext,
+                    CommandReceiver.COMMAND_START_ACTIVITY,
+                    PACKAGE_NAME_APP1, PACKAGE_NAME_APP1, 0, null);
+            uid1Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE,
+                    WatchUidRunner.STATE_TOP);
+
+            // APP1 binds to APP2.
+            CommandReceiver.sendCommand(mContext, CommandReceiver.COMMAND_BIND_SERVICE,
+                    PACKAGE_NAME_APP1, PACKAGE_NAME_APP2, Context.BIND_INCLUDE_CAPABILITIES, null);
+
+            // APP2 gets proc state BOUND_TOP.
+            uid2Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE,
+                    WatchUidRunner.STATE_BOUND_TOP);
+
+            waiter = new WaitForBroadcast(mInstrumentation.getTargetContext());
+            waiter.prepare(ACTION_START_FGS_RESULT);
+
+            // START FGS in APP2.
+            CommandReceiver.sendCommand(mContext,
+                    CommandReceiver.COMMAND_START_FOREGROUND_SERVICE,
+                    PACKAGE_NAME_APP2, PACKAGE_NAME_APP2, 0, null);
+            waiter.doWait(WAITFOR_MSEC);
+
+            SystemClock.sleep(shortWaitMsec);
+
+            String[] dumpLines = CtsAppTestUtils.executeShellCmd(
+                    mInstrumentation, dumpCommand).split("\n");
+            assertNotNull(findLine(dumpLines, "isForeground=true"));
+
+            // Finish the activity in APP1
+            CommandReceiver.sendCommand(mContext,
+                    CommandReceiver.COMMAND_STOP_ACTIVITY,
+                    PACKAGE_NAME_APP1, PACKAGE_NAME_APP1, 0, null);
+            mInstrumentation.getUiAutomation().performGlobalAction(
+                    AccessibilityService.GLOBAL_ACTION_HOME);
+
+            // APP1 should have been cached state now.
+            uid1Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE,
+                    WatchUidRunner.STATE_CACHED_EMPTY);
+
+            // Th FGS in APP2 should have been normal service state now.
+            uid2Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE,
+                    WatchUidRunner.STATE_SERVICE);
+
+            waiter = new WaitForBroadcast(mInstrumentation.getTargetContext());
+            waiter.prepare(ACTION_START_FGS_RESULT);
+
+            // START FGS in APP1
+            CommandReceiver.sendCommand(mContext,
+                    CommandReceiver.COMMAND_START_FOREGROUND_SERVICE,
+                    PACKAGE_NAME_APP1, PACKAGE_NAME_APP1, 0, null);
+            uid1Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE,
+                    WatchUidRunner.STATE_FG_SERVICE);
+            waiter.doWait(WAITFOR_MSEC);
+
+            // APP2 should be in FGS state too now.
+            uid2Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE,
+                    WatchUidRunner.STATE_FG_SERVICE);
+
+            waiter = new WaitForBroadcast(mInstrumentation.getTargetContext());
+            waiter.prepare(ACTION_START_FGS_RESULT);
+
+            // START FGS in APP2.
+            CommandReceiver.sendCommand(mContext,
+                    CommandReceiver.COMMAND_START_FOREGROUND_SERVICE,
+                    PACKAGE_NAME_APP2, PACKAGE_NAME_APP2, 0, null);
+            waiter.doWait(WAITFOR_MSEC);
+
+            SystemClock.sleep(shortWaitMsec);
+
+            dumpLines = CtsAppTestUtils.executeShellCmd(
+                    mInstrumentation, dumpCommand).split("\n");
+            assertNotNull(findLine(dumpLines, "isForeground=true"));
+
+            // Set background restriction for APP1.
+            setAppOp(PACKAGE_NAME_APP1, "RUN_ANY_IN_BACKGROUND", false);
+
+            // Both of them should have normal service state now.
+            uid1Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE,
+                    WatchUidRunner.STATE_SERVICE);
+            uid2Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE,
+                    WatchUidRunner.STATE_SERVICE);
+        } finally {
+            uid1Watcher.finish();
+            uid2Watcher.finish();
+            CtsAppTestUtils.executeShellCmd(mInstrumentation,
+                    "appops reset " + PACKAGE_NAME_APP1);
+            CtsAppTestUtils.executeShellCmd(mInstrumentation,
+                    "appops reset " + PACKAGE_NAME_APP2);
+        }
+    }
+
+    /**
+     * Find a line containing {@code label} in {@code lines}.
+     */
+    private String findLine(String[] lines, CharSequence label) {
+        for (String line: lines) {
+            if (line.contains(label)) {
+                return line;
+            }
+        }
+        return null;
+    }
+
     /**
      * When PowerExemptionManager.addToTemporaryAllowList() is called more than one time, the second
      * call can extend the duration of the first call if the first call has not expired yet.
@@ -1964,6 +2104,8 @@
             try {
                 defaultBehavior = Integer.parseInt(defaultBehaviorStr);
             } catch (NumberFormatException e) {
+                Log.e("ActivityManagerFgsBgStartTest",
+                        "getPushMessagingOverQuotaBehavior:", e);
             }
         }
         return defaultBehavior;
diff --git a/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java b/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java
index 42e16ac..05a0f9e 100644
--- a/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java
+++ b/tests/app/src/android/app/cts/ActivityManagerProcessStateTest.java
@@ -576,7 +576,7 @@
 
             // Going off the temp whitelist causes a spurious proc state report...  that's
             // not ideal, but okay.
-            uidWatcher.expect(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_CACHED_EMPTY);
+            // uidWatcher.expect(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_CACHED_EMPTY);
 
             // We don't want to wait for the uid to actually go idle, we can force it now.
             cmd = "am make-uid-idle --user " + userId + " " + SIMPLE_PACKAGE_NAME;
@@ -887,7 +887,7 @@
 
             // Going off the temp whitelist causes a spurious proc state report...  that's
             // not ideal, but okay.
-            uidWatcher.expect(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_CACHED_EMPTY);
+            // uidWatcher.expect(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_CACHED_EMPTY);
 
             // We don't want to wait for the uid to actually go idle, we can force it now.
             controller.makeUidIdle();
diff --git a/tests/app/src/android/app/cts/ActivityManagerTest.java b/tests/app/src/android/app/cts/ActivityManagerTest.java
index 770d305..f62f9d2 100644
--- a/tests/app/src/android/app/cts/ActivityManagerTest.java
+++ b/tests/app/src/android/app/cts/ActivityManagerTest.java
@@ -29,7 +29,14 @@
 import static android.content.pm.PackageManager.DONT_KILL_APP;
 import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
 
-import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -64,6 +71,7 @@
 import android.content.pm.ConfigurationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Binder;
 import android.os.Bundle;
@@ -80,36 +88,44 @@
 import android.provider.Settings;
 import android.server.wm.settings.SettingsSession;
 import android.support.test.uiautomator.UiDevice;
-import android.test.InstrumentationTestCase;
 import android.util.ArrayMap;
 import android.util.ArraySet;
 import android.util.Log;
 import android.util.Pair;
 
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.LargeTest;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.android.compatibility.common.util.AmMonitor;
+import com.android.compatibility.common.util.AppStandbyUtils;
 import com.android.compatibility.common.util.ShellIdentityUtils;
 import com.android.compatibility.common.util.SystemUtil;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
+import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
-public class ActivityManagerTest extends InstrumentationTestCase {
+@RunWith(AndroidJUnit4.class)
+public class ActivityManagerTest {
     private static final String TAG = ActivityManagerTest.class.getSimpleName();
     private static final String STUB_PACKAGE_NAME = "android.app.stubs";
-    private static final int WAITFOR_MSEC = 5000;
+    private static final long WAITFOR_MSEC = 5000;
     private static final String SERVICE_NAME = "android.app.stubs.MockService";
-    private static final int WAIT_TIME = 2000;
+    private static final long WAIT_TIME = 2000;
+    private static final long WAITFOR_ORDERED_BROADCAST_DRAINED = 60000;
     // A secondary test activity from another APK.
     static final String SIMPLE_PACKAGE_NAME = "com.android.cts.launcherapps.simpleapp";
     static final String SIMPLE_ACTIVITY = ".SimpleActivity";
@@ -138,9 +154,6 @@
 
     private static final String MCC_TO_UPDATE = "987";
     private static final String MNC_TO_UPDATE = "654";
-    private static final String SHELL_COMMAND_GET_CONFIG = "am get-config";
-    private static final String SHELL_COMMAND_RESULT_CONFIG_NAME_MCC = "mcc";
-    private static final String SHELL_COMMAND_RESULT_CONFIG_NAME_MNC = "mnc";
 
     // Return states of the ActivityReceiverFilter.
     public static final int RESULT_PASS = 1;
@@ -155,23 +168,28 @@
     private int mErrorProcessID;
     private Instrumentation mInstrumentation;
     private HomeActivitySession mTestHomeSession;
+    private boolean mAppStandbyEnabled;
+    private boolean mAutomotiveDevice;
+    private boolean mLeanbackOnly;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-        mInstrumentation = getInstrumentation();
+    @Before
+    public void setUp() throws Exception {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mTargetContext = mInstrumentation.getTargetContext();
         mActivityManager = (ActivityManager) mInstrumentation.getContext()
                 .getSystemService(Context.ACTIVITY_SERVICE);
         mPackageManager = mInstrumentation.getContext().getPackageManager();
         mStartedActivityList = new ArrayList<Activity>();
         mErrorProcessID = -1;
+        mAppStandbyEnabled = AppStandbyUtils.isAppStandbyEnabled();
+        mAutomotiveDevice = mPackageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
+        mLeanbackOnly = mPackageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK_ONLY);
         startSubActivity(ScreenOnActivity.class);
+        drainOrderedBroadcastQueue(2);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
+    @After
+    public void tearDown() throws Exception {
         if (mTestHomeSession != null) {
             mTestHomeSession.close();
         }
@@ -186,6 +204,28 @@
         }
     }
 
+    /**
+     * Drain the ordered broadcast queue, it'll be useful when the test runs right after
+     * the device booted, the ordered broadcast queue could be clogged.
+     */
+    private void drainOrderedBroadcastQueue(int loopCount) throws Exception {
+        for (int i = loopCount; i > 0; i--) {
+            final CountDownLatch latch = new CountDownLatch(1);
+            final BroadcastReceiver receiver = new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    latch.countDown();
+                }
+            };
+            CommandReceiver.sendCommandWithResultReceiver(mTargetContext,
+                    CommandReceiver.COMMAND_EMPTY,
+                    STUB_PACKAGE_NAME, STUB_PACKAGE_NAME, 0, null, receiver);
+            latch.await(WAITFOR_ORDERED_BROADCAST_DRAINED, TimeUnit.MILLISECONDS);
+        }
+        Log.i(TAG, "Ordered broadcast queue drained");
+    }
+
+    @Test
     public void testGetRecentTasks() throws Exception {
         int maxNum = 0;
         int flags = 0;
@@ -226,6 +266,7 @@
         }
     }
 
+    @Test
     public void testGetRecentTasksLimitedToCurrentAPK() throws Exception {
         int maxNum = 0;
         int flags = 0;
@@ -312,6 +353,28 @@
         mStartedActivityList.add(monitor.waitForActivity());
     }
 
+    private <T extends Activity> T launchActivity(
+            String pkg,
+            Class<T> activityCls,
+            Bundle extras) {
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        if (extras != null) {
+            intent.putExtras(extras);
+        }
+        return launchActivityWithIntent(pkg, activityCls, intent);
+    }
+
+    private <T extends Activity> T launchActivityWithIntent(
+            String pkg,
+            Class<T> activityCls,
+            Intent intent) {
+        intent.setClassName(pkg, activityCls.getName());
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        T activity = (T) mInstrumentation.startActivitySync(intent);
+        mInstrumentation.waitForIdleSync();
+        return activity;
+    }
+
     private <T extends TaskInfo, S extends Activity> int getTaskInfoIndex(List<T> taskList,
             Class<S> activityClass) {
         int i = 0;
@@ -324,6 +387,7 @@
         return -1;
     }
 
+    @Test
     public void testGetRunningTasks() {
         // Test illegal parameter
         List<RunningTaskInfo> runningTaskList;
@@ -371,6 +435,7 @@
         assertTrue(runningTaskList.get(indexRecentTwo).isVisible());
     }
 
+    @Test
     public void testGetRunningServices() throws Exception {
         // Test illegal parameter
         List<RunningServiceInfo> runningServiceInfo;
@@ -423,6 +488,7 @@
         executeAndLogShellCommand(cmdBuilder.toString());
     }
 
+    @Test
     public void testIsBackgroundRestricted() throws IOException {
         // This instrumentation runs in the target package's uid.
         final Context targetContext = mInstrumentation.getTargetContext();
@@ -434,12 +500,14 @@
         assertFalse(am.isBackgroundRestricted());
     }
 
+    @Test
     public void testGetMemoryInfo() {
         ActivityManager.MemoryInfo outInfo = new ActivityManager.MemoryInfo();
         mActivityManager.getMemoryInfo(outInfo);
         assertTrue(outInfo.lowMemory == (outInfo.availMem <= outInfo.threshold));
     }
 
+    @Test
     public void testGetRunningAppProcesses() throws Exception {
         List<RunningAppProcessInfo> list = mActivityManager.getRunningAppProcesses();
         assertNotNull(list);
@@ -487,6 +555,7 @@
         fail("android.app.stubs:remote process should be available");
     }
 
+    @Test
     public void testGetMyMemoryState() {
         final RunningAppProcessInfo ra = new RunningAppProcessInfo();
         ActivityManager.getMyMemoryState(ra);
@@ -497,64 +566,173 @@
         assertEquals(RunningAppProcessInfo.IMPORTANCE_FOREGROUND, ra.importance);
     }
 
+    @Test
     public void testGetProcessInErrorState() throws Exception {
         List<ActivityManager.ProcessErrorStateInfo> errList = null;
         errList = mActivityManager.getProcessesInErrorState();
+        assertNull(errList);
+
+        // Setup the ANR monitor.
+        final AmMonitor monitor = new AmMonitor(mInstrumentation, null);
+        final ApplicationInfo app1Info = mTargetContext.getPackageManager().getApplicationInfo(
+                PACKAGE_NAME_APP1, 0);
+        final ApplicationInfo stubInfo = mTargetContext.getPackageManager().getApplicationInfo(
+                STUB_PACKAGE_NAME, 0);
+        final WatchUidRunner uid1Watcher = new WatchUidRunner(mInstrumentation, app1Info.uid,
+                WAITFOR_MSEC);
+        final String crashActivityName = "ActivityManagerStubCrashActivity";
+
+        final SettingsSession<Integer> showOnFirstCrash = new SettingsSession<>(
+                Settings.Global.getUriFor(Settings.Global.SHOW_FIRST_CRASH_DIALOG),
+                Settings.Global::getInt, Settings.Global::putInt);
+        final SettingsSession<Integer> showBackground = new SettingsSession<>(
+                Settings.Secure.getUriFor(Settings.Secure.ANR_SHOW_BACKGROUND),
+                Settings.Secure::getInt, Settings.Secure::putInt);
+        try {
+            SystemUtil.runWithShellPermissionIdentity(() -> {
+                showOnFirstCrash.set(1);
+                showBackground.set(1);
+            });
+
+            CommandReceiver.sendCommand(mTargetContext,
+                    CommandReceiver.COMMAND_START_ACTIVITY,
+                    PACKAGE_NAME_APP1, PACKAGE_NAME_APP1, 0, null);
+            uid1Watcher.waitFor(WatchUidRunner.CMD_PROCSTATE,
+                    WatchUidRunner.STATE_TOP,
+                    new Integer(ActivityManager.PROCESS_CAPABILITY_ALL));
+
+            // Sleep a while to let things go through.
+            Thread.sleep(WAIT_TIME);
+
+            // Now tell it goto ANR.
+            CommandReceiver.sendCommand(mTargetContext, CommandReceiver.COMMAND_SELF_INDUCED_ANR,
+                    PACKAGE_NAME_APP1, PACKAGE_NAME_APP1, 0, null);
+
+            // Verify we got the ANR.
+            assertTrue(monitor.waitFor(AmMonitor.WAIT_FOR_EARLY_ANR, WAITFOR_MSEC));
+
+            // Let it continue.
+            monitor.sendCommand(AmMonitor.CMD_CONTINUE);
+
+            // Now it should've reached the normal ANR process.
+            assertTrue(monitor.waitFor(AmMonitor.WAIT_FOR_ANR, WAITFOR_MSEC * 3));
+
+            // Continue again, we need to see the ANR dialog in order to get the error report.
+            monitor.sendCommand(AmMonitor.CMD_CONTINUE);
+
+            // Sleep a while to let things go through.
+            Thread.sleep(WAIT_TIME);
+
+            // We shouldn't be able to read the error state info of that.
+            errList = mActivityManager.getProcessesInErrorState();
+            assertNull(errList);
+
+            // Shell should have the access.
+            final List<ActivityManager.ProcessErrorStateInfo>[] holder = new List[1];
+            SystemUtil.runWithShellPermissionIdentity(() -> {
+                holder[0] = mActivityManager.getProcessesInErrorState();
+            });
+            assertNotNull(holder[0]);
+            assertEquals(1, holder[0].size());
+            verifyProcessErrorStateInfo(holder[0].get(0),
+                    ActivityManager.ProcessErrorStateInfo.NOT_RESPONDING,
+                    app1Info.uid,
+                    PACKAGE_NAME_APP1);
+
+            // Start a crashing activity in remote process with the same UID.
+            final Intent intent = new Intent(Intent.ACTION_MAIN);
+            intent.setClassName(STUB_PACKAGE_NAME, STUB_PACKAGE_NAME + "." + crashActivityName);
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            mTargetContext.startActivity(intent);
+
+            // Wait for the crash.
+            assertTrue(monitor.waitFor(AmMonitor.WAIT_FOR_CRASHED, WAITFOR_MSEC));
+
+            // Let it continue, we need to see the crash dialog in order to get the error report.
+            monitor.sendCommand(AmMonitor.CMD_CONTINUE);
+
+            // Sleep a while to let things go through.
+            Thread.sleep(WAIT_TIME);
+
+            // We should be able to see this crash info.
+            errList = mActivityManager.getProcessesInErrorState();
+            assertNotNull(errList);
+            assertEquals(1, errList.size());
+
+            verifyProcessErrorStateInfo(errList.get(0),
+                    ActivityManager.ProcessErrorStateInfo.CRASHED,
+                    stubInfo.uid,
+                    STUB_PACKAGE_NAME + ":" + crashActivityName);
+
+            // Shell should have the access to all of the crash info here.
+            SystemUtil.runWithShellPermissionIdentity(() -> {
+                holder[0] = mActivityManager.getProcessesInErrorState();
+            });
+            assertNotNull(holder[0]);
+            assertEquals(2, holder[0].size());
+            // The return result is not sorted.
+            final ActivityManager.ProcessErrorStateInfo t0 = holder[0].get(0);
+            final ActivityManager.ProcessErrorStateInfo t1 = holder[0].get(1);
+            final ActivityManager.ProcessErrorStateInfo info0 = t0.uid == stubInfo.uid ? t0 : t1;
+            final ActivityManager.ProcessErrorStateInfo info1 = t1.uid == app1Info.uid ? t1 : t0;
+
+            verifyProcessErrorStateInfo(info0,
+                    ActivityManager.ProcessErrorStateInfo.CRASHED,
+                    stubInfo.uid,
+                    STUB_PACKAGE_NAME + ":" + crashActivityName);
+            verifyProcessErrorStateInfo(info1,
+                    ActivityManager.ProcessErrorStateInfo.NOT_RESPONDING,
+                    app1Info.uid,
+                    PACKAGE_NAME_APP1);
+        } finally {
+            SystemUtil.runWithShellPermissionIdentity(() -> {
+                showOnFirstCrash.close();
+                showBackground.close();
+            });
+            monitor.finish();
+            uid1Watcher.finish();
+            SystemUtil.runWithShellPermissionIdentity(() -> {
+                mActivityManager.forceStopPackage(PACKAGE_NAME_APP1);
+            });
+        }
     }
 
+    private void verifyProcessErrorStateInfo(ActivityManager.ProcessErrorStateInfo info,
+            int condition, int uid, String processName) throws Exception {
+        assertEquals(condition, info.condition);
+        assertEquals(uid, info.uid);
+        assertEquals(processName, info.processName);
+    }
+
+    @Test
     public void testGetDeviceConfigurationInfo() {
         ConfigurationInfo conInf = mActivityManager.getDeviceConfigurationInfo();
         assertNotNull(conInf);
     }
 
+    @Test
     public void testUpdateMccMncConfiguration() throws Exception {
         if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
             Log.i(TAG, "testUpdateMccMncConfiguration skipped: no telephony available");
             return;
         }
 
-        // Store the original mcc mnc to set back
-        String[] mccMncConfigOriginal = new String[2];
-        // Store other configs to check they won't be affected
-        Set<String> otherConfigsOriginal = new HashSet<>();
-        getMccMncConfigsAndOthers(mccMncConfigOriginal, otherConfigsOriginal);
-
+        Configuration originalConfig = mTargetContext.getResources().getConfiguration();
         String[] mccMncConfigToUpdate = new String[] {MCC_TO_UPDATE, MNC_TO_UPDATE};
         boolean success = ShellIdentityUtils.invokeMethodWithShellPermissions(mActivityManager,
                 (am) -> am.updateMccMncConfiguration(mccMncConfigToUpdate[0],
                         mccMncConfigToUpdate[1]));
 
         if (success) {
-            String[] mccMncConfigUpdated = new String[2];
-            Set<String> otherConfigsUpdated = new HashSet<>();
-            getMccMncConfigsAndOthers(mccMncConfigUpdated, otherConfigsUpdated);
-            // Check the mcc mnc are updated as expected
-            assertArrayEquals(mccMncConfigToUpdate, mccMncConfigUpdated);
-            // Check other configs are not changed
-            assertEquals(otherConfigsOriginal, otherConfigsUpdated);
+            Configuration changedConfig = mTargetContext.getResources().getConfiguration();
+            assertEquals(MNC_TO_UPDATE, Integer.toString(changedConfig.mnc));
+            assertEquals(MCC_TO_UPDATE, Integer.toString(changedConfig.mcc));
         }
 
-        // Set mcc mnc configs back in the end of the test
+        // Set mcc mnc configs back in the end of the test if they were set to something else.
         ShellIdentityUtils.invokeMethodWithShellPermissions(mActivityManager,
-                (am) -> am.updateMccMncConfiguration(mccMncConfigOriginal[0],
-                        mccMncConfigOriginal[1]));
-    }
-
-    private void getMccMncConfigsAndOthers(String[] mccMncConfigs, Set<String> otherConfigs)
-            throws Exception {
-        String[] configs = SystemUtil.runShellCommand(
-                mInstrumentation, SHELL_COMMAND_GET_CONFIG).split(" |\\-");
-        for (String config : configs) {
-            if (config.startsWith(SHELL_COMMAND_RESULT_CONFIG_NAME_MCC)) {
-                mccMncConfigs[0] = config.substring(
-                        SHELL_COMMAND_RESULT_CONFIG_NAME_MCC.length());
-            } else if (config.startsWith(SHELL_COMMAND_RESULT_CONFIG_NAME_MNC)) {
-                mccMncConfigs[1] = config.substring(
-                        SHELL_COMMAND_RESULT_CONFIG_NAME_MNC.length());
-            } else {
-                otherConfigs.add(config);
-            }
-        }
+                (am) -> am.updateMccMncConfiguration(Integer.toString(originalConfig.mcc),
+                        Integer.toString(originalConfig.mnc)));
     }
 
     /**
@@ -562,6 +740,7 @@
      *
      * TODO: test positive case
      */
+    @Test
     public void testIsUserAMonkey() {
         assertFalse(ActivityManager.isUserAMonkey());
     }
@@ -570,6 +749,7 @@
      * Verify that {@link ActivityManager#isRunningInTestHarness()} is false.
      */
     @RestrictedBuildTest
+    @Test
     public void testIsRunningInTestHarness() {
         assertFalse("isRunningInTestHarness must be false in production builds",
                 ActivityManager.isRunningInTestHarness());
@@ -589,23 +769,24 @@
         }
     }
 
-   /**
-    * Gets the value of com.android.internal.R.bool.config_noHomeScreen.
-    * @return true if no home screen is supported, false otherwise.
-    */
-   private boolean noHomeScreen() {
-       try {
-           return getInstrumentation().getContext().getResources().getBoolean(
-                   Resources.getSystem().getIdentifier("config_noHomeScreen", "bool", "android"));
-       } catch (Resources.NotFoundException e) {
-           // Assume there's a home screen.
-           return false;
-       }
+    /**
+     * Gets the value of com.android.internal.R.bool.config_noHomeScreen.
+     * @return true if no home screen is supported, false otherwise.
+     */
+    private boolean noHomeScreen() {
+        try {
+            return mTargetContext.getResources().getBoolean(
+                    Resources.getSystem().getIdentifier("config_noHomeScreen", "bool", "android"));
+        } catch (Resources.NotFoundException e) {
+            // Assume there's a home screen.
+            return false;
+        }
     }
 
     /**
      * Verify that the TimeTrackingAPI works properly when starting and ending an activity.
      */
+    @Test
     public void testTimeTrackingAPI_SimpleStartExit() throws Exception {
         createManagedHomeActivitySession();
         launchHome();
@@ -661,6 +842,7 @@
         assertTrue(timeReceiver.mTimeUsed != 0);
     }
 
+    @Test
     public void testHomeVisibilityListener() throws Exception {
         LinkedBlockingQueue<Boolean> currentHomeScreenVisibility = new LinkedBlockingQueue<>(2);
         HomeVisibilityListener homeVisibilityListener = new HomeVisibilityListener() {
@@ -693,6 +875,7 @@
     /**
      * Verify that the TimeTrackingAPI works properly when switching away from the monitored task.
      */
+    @Test
     public void testTimeTrackingAPI_SwitchAwayTriggers() throws Exception {
         createManagedHomeActivitySession();
         launchHome();
@@ -742,6 +925,7 @@
      * Verify that the TimeTrackingAPI works properly when handling an activity chain gets started
      * and ended.
      */
+    @Test
     public void testTimeTrackingAPI_ChainedActivityExit() throws Exception {
         createManagedHomeActivitySession();
         launchHome();
@@ -802,6 +986,7 @@
      * Verify that after force-stopping a package which has a foreground task contains multiple
      * activities, the process of the package should not be alive (restarted).
      */
+    @Test
     public void testForceStopPackageWontRestartProcess() throws Exception {
         // Ensure that there are no remaining component records of the test app package.
         SystemUtil.runWithShellPermissionIdentity(
@@ -851,6 +1036,7 @@
     /**
      * This test is to verify that devices are patched with the fix in b/119327603 for b/115384617.
      */
+    @Test
     public void testIsAppForegroundRemoved() throws ClassNotFoundException {
        try {
            Class.forName("android.app.IActivityManager").getDeclaredMethod(
@@ -864,6 +1050,7 @@
     /**
      * This test verifies the self-induced ANR by ActivityManager.appNotResponding().
      */
+    @Test
     public void testAppNotResponding() throws Exception {
         // Setup the ANR monitor
         AmMonitor monitor = new AmMonitor(mInstrumentation,
@@ -892,6 +1079,7 @@
     /*
      * Verifies the {@link android.app.ActivityManager#killProcessesWhenImperceptible}.
      */
+    @Test
     public void testKillingPidsOnImperceptible() throws Exception {
         // Start remote service process
         final String remoteProcessName = STUB_PACKAGE_NAME + ":remote";
@@ -989,6 +1177,7 @@
             SystemUtil.runWithShellPermissionIdentity(() -> {
                 mActivityManager.forceStopPackage(SIMPLE_PACKAGE_NAME);
             });
+            executeAndLogShellCommand("am kill " + STUB_PACKAGE_NAME);
         }
     }
 
@@ -996,6 +1185,7 @@
      * Verifies the system will kill app's child processes if they are using excessive cpu
      */
     @LargeTest
+    @Test
     public void testKillingAppChildProcess() throws Exception {
         final long powerCheckInterval = 5 * 1000;
         final long processGoneTimeout = powerCheckInterval * 4;
@@ -1098,6 +1288,7 @@
      * Verifies the system will trim app's child processes if there are too many
      */
     @LargeTest
+    @Test
     public void testTrimAppChildProcess() throws Exception {
         final long powerCheckInterval = 5 * 1000;
         final long processGoneTimeout = powerCheckInterval * 4;
@@ -1325,6 +1516,7 @@
         return stopLatch;
     }
 
+    @Test
     public void testTrimMemActivityFg() throws Exception {
         final int waitForSec = 5 * 1000;
         final ApplicationInfo ai1 = mTargetContext.getPackageManager()
@@ -1458,6 +1650,7 @@
         }
     }
 
+    @Test
     public void testTrimMemActivityBg() throws Exception {
         final int minLru = 8;
         final int waitForSec = 30 * 1000;
@@ -1562,14 +1755,10 @@
         }
     }
 
+    @Test
     public void testServiceDoneLRUPosition() throws Exception {
-        ApplicationInfo ai = mTargetContext.getPackageManager()
-                .getApplicationInfo(PACKAGE_NAME_APP1, 0);
-        final WatchUidRunner watcher1 = new WatchUidRunner(mInstrumentation, ai.uid, WAITFOR_MSEC);
-        ai = mTargetContext.getPackageManager().getApplicationInfo(PACKAGE_NAME_APP2, 0);
-        final WatchUidRunner watcher2 = new WatchUidRunner(mInstrumentation, ai.uid, WAITFOR_MSEC);
-        ai = mTargetContext.getPackageManager().getApplicationInfo(PACKAGE_NAME_APP3, 0);
-        final WatchUidRunner watcher3 = new WatchUidRunner(mInstrumentation, ai.uid, WAITFOR_MSEC);
+        final String[] packageNames = {PACKAGE_NAME_APP1, PACKAGE_NAME_APP2, PACKAGE_NAME_APP3};
+        final WatchUidRunner[] watchers = initWatchUidRunners(packageNames, WAITFOR_MSEC);
         final HandlerThread handlerThread = new HandlerThread("worker");
         final Messenger[] controllerHolder = new Messenger[1];
         final CountDownLatch[] countDownLatchHolder = new CountDownLatch[1];
@@ -1586,12 +1775,8 @@
 
         try {
             // Make sure we could start activity from background
-            SystemUtil.runShellCommand(mInstrumentation,
-                    "cmd deviceidle whitelist +" + PACKAGE_NAME_APP1);
-            SystemUtil.runShellCommand(mInstrumentation,
-                    "cmd deviceidle whitelist +" + PACKAGE_NAME_APP2);
-            SystemUtil.runShellCommand(mInstrumentation,
-                    "cmd deviceidle whitelist +" + PACKAGE_NAME_APP3);
+            forEach(packageNames, packageName -> SystemUtil.runShellCommand(mInstrumentation,
+                    "cmd deviceidle whitelist +" + packageName));
 
             // Keep the device awake
             toggleScreenOn(true);
@@ -1604,30 +1789,28 @@
                     CommandReceiver.COMMAND_START_FOREGROUND_SERVICE,
                     PACKAGE_NAME_APP1, PACKAGE_NAME_APP1, 0, extras);
 
-            watcher1.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_FG_SERVICE, null);
+            watchers[0].waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_FG_SERVICE,
+                    null);
 
             assertTrue("Failed to get the controller interface",
                     countDownLatchHolder[0].await(WAITFOR_MSEC, TimeUnit.MILLISECONDS));
 
+            final String[] otherPackages = {PACKAGE_NAME_APP2, PACKAGE_NAME_APP3};
+            final WatchUidRunner[] otherWatchers = {watchers[1], watchers[2]};
             // Start an activity in another package
-            CommandReceiver.sendCommand(mTargetContext, CommandReceiver.COMMAND_START_ACTIVITY,
-                    PACKAGE_NAME_APP2, PACKAGE_NAME_APP2, 0, null);
-
-            watcher2.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_TOP, null);
-
-            // Start another activity in another package
-            CommandReceiver.sendCommand(mTargetContext, CommandReceiver.COMMAND_START_ACTIVITY,
-                    PACKAGE_NAME_APP3, PACKAGE_NAME_APP3, 0, null);
-
-            watcher3.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_TOP, null);
+            forBiEach(otherPackages, otherWatchers, (packageName, watcher) -> {
+                CommandReceiver.sendCommand(mTargetContext, CommandReceiver.COMMAND_START_ACTIVITY,
+                        packageName, packageName, 0, null);
+                watcher.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_TOP, null);
+            });
 
             // Stop both of these activities
-            CommandReceiver.sendCommand(mTargetContext, CommandReceiver.COMMAND_STOP_ACTIVITY,
-                    PACKAGE_NAME_APP2, PACKAGE_NAME_APP2, 0, null);
-            watcher2.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_CACHED_EMPTY, null);
-            CommandReceiver.sendCommand(mTargetContext, CommandReceiver.COMMAND_STOP_ACTIVITY,
-                    PACKAGE_NAME_APP3, PACKAGE_NAME_APP3, 0, null);
-            watcher3.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_CACHED_EMPTY, null);
+            forBiEach(otherPackages, otherWatchers, (packageName, watcher) -> {
+                CommandReceiver.sendCommand(mTargetContext, CommandReceiver.COMMAND_STOP_ACTIVITY,
+                        packageName, packageName, 0, null);
+                watcher.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_CACHED_EMPTY,
+                        null);
+            });
 
             // Launch home so we'd have cleared these the above test activities from recents.
             launchHome();
@@ -1641,43 +1824,180 @@
                 fail("Unable to stop test package");
             }
             msg.recycle();
-            watcher1.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_CACHED_EMPTY, null);
+            watchers[0].waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_CACHED_EMPTY,
+                    null);
 
-            final List<String> lru = getCachedAppsLru();
-
-            assertTrue("Failed to get cached app list", lru.size() > 0);
-            final int app1LruPos = lru.indexOf(PACKAGE_NAME_APP1);
-            final int app2LruPos = lru.indexOf(PACKAGE_NAME_APP2);
-            final int app3LruPos = lru.indexOf(PACKAGE_NAME_APP3);
-            if (app1LruPos != -1) {
-                assertTrue(PACKAGE_NAME_APP1 + " should be newer than " + PACKAGE_NAME_APP2,
-                        app1LruPos > app2LruPos);
-                assertTrue(PACKAGE_NAME_APP1 + " should be newer than " + PACKAGE_NAME_APP3,
-                        app1LruPos > app3LruPos);
-            } else {
-                assertEquals(PACKAGE_NAME_APP2 + " should have gone", -1, app2LruPos);
-                assertEquals(PACKAGE_NAME_APP3 + " should have gone", -1, app3LruPos);
-            }
+            verifyLruOrders(packageNames, 0, true, (a, b) -> a > b, "%s should be newer than %s");
         } finally {
             handlerThread.quitSafely();
 
-            SystemUtil.runShellCommand(mInstrumentation,
-                    "cmd deviceidle whitelist -" + PACKAGE_NAME_APP1);
-            SystemUtil.runShellCommand(mInstrumentation,
-                    "cmd deviceidle whitelist -" + PACKAGE_NAME_APP2);
-            SystemUtil.runShellCommand(mInstrumentation,
-                    "cmd deviceidle whitelist -" + PACKAGE_NAME_APP3);
+            forEach(packageNames, packageName -> SystemUtil.runShellCommand(mInstrumentation,
+                    "cmd deviceidle whitelist -" + packageName));
 
-            SystemUtil.runWithShellPermissionIdentity(() -> {
-                // force stop test package, where the whole test process group will be killed.
-                mActivityManager.forceStopPackage(PACKAGE_NAME_APP1);
-                mActivityManager.forceStopPackage(PACKAGE_NAME_APP2);
-                mActivityManager.forceStopPackage(PACKAGE_NAME_APP3);
+            // force stop test package, where the whole test process group will be killed.
+            forEach(packageNames, packageName -> SystemUtil.runWithShellPermissionIdentity(
+                    () -> mActivityManager.forceStopPackage(packageName)));
+
+            forEach(watchers, watcher -> watcher.finish());
+        }
+    }
+
+    @Test
+    public void testBroadcastReceiverLRUPosition() throws Exception {
+        assumeTrue("app standby not enabled", mAppStandbyEnabled);
+        assumeFalse("not testable in automotive device", mAutomotiveDevice);
+        assumeFalse("not testable in leanback device", mLeanbackOnly);
+
+        final String[] packageNames = {PACKAGE_NAME_APP1, PACKAGE_NAME_APP2, PACKAGE_NAME_APP3};
+        final WatchUidRunner[] watchers = initWatchUidRunners(packageNames, WAITFOR_MSEC * 2);
+
+        try {
+            // Set the PACKAGE_NAME_APP1 into rare bucket
+            SystemUtil.runShellCommand(mInstrumentation, "am set-standby-bucket "
+                    + PACKAGE_NAME_APP1 + " rare");
+
+            // Make sure we could start activity from background
+            forEach(packageNames, packageName -> SystemUtil.runShellCommand(mInstrumentation,
+                    "cmd deviceidle whitelist +" + packageName));
+
+            // Keep the device awake
+            toggleScreenOn(true);
+
+            // Start activities in these packages.
+            forBiEach(packageNames, watchers, (packageName, watcher) -> {
+                CommandReceiver.sendCommand(mTargetContext, CommandReceiver.COMMAND_START_ACTIVITY,
+                        packageName, packageName, 0, null);
+                watcher.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_TOP, null);
             });
 
-            watcher1.finish();
-            watcher2.finish();
-            watcher3.finish();
+            // Stop all of these activities
+            forBiEach(packageNames, watchers, (packageName, watcher) -> {
+                CommandReceiver.sendCommand(mTargetContext, CommandReceiver.COMMAND_STOP_ACTIVITY,
+                        packageName, packageName, 0, null);
+                watcher.waitFor(WatchUidRunner.CMD_PROCSTATE, WatchUidRunner.STATE_CACHED_EMPTY,
+                        null);
+            });
+
+            // Launch home so we'd have cleared these the above test activities from recents.
+            launchHome();
+
+            // Verify the LRU position.
+            verifyLruOrders(packageNames, 0, false, (a, b) -> a < b, "%s should be older than %s");
+
+            forEach(packageNames, packageName -> SystemUtil.runShellCommand(mInstrumentation,
+                    "cmd deviceidle whitelist -" + packageName));
+            // Restrict the PACKAGE_NAME_APP1
+            SystemUtil.runShellCommand(mInstrumentation, "am set-standby-bucket "
+                    + PACKAGE_NAME_APP1 + " restricted");
+            // Sleep a while to let it take effect.
+            Thread.sleep(WAITFOR_MSEC);
+
+            final Intent intent = new Intent();
+            final CountDownLatch[] latch = new CountDownLatch[] {new CountDownLatch(1)};
+            final BroadcastReceiver receiver = new BroadcastReceiver() {
+                @Override
+                public void onReceive(Context context, Intent intent) {
+                    latch[0].countDown();
+                }
+            };
+            // Send a broadcast to PACKAGE_NAME_APP1
+            CommandReceiver.sendCommandWithResultReceiver(mTargetContext,
+                    CommandReceiver.COMMAND_EMPTY, PACKAGE_NAME_APP1, PACKAGE_NAME_APP1,
+                    0, null, receiver);
+
+            assertTrue("Failed to get the broadcast",
+                    latch[0].await(WAITFOR_MSEC * 2, TimeUnit.MILLISECONDS));
+
+            // Now check the LRU position again, it should remain the same because it's restricted.
+            verifyLruOrders(packageNames, 0, false, (a, b) -> a < b, "%s should be older than %s");
+
+            // Set the PACKAGE_NAME_APP1 into rare bucket again.
+            SystemUtil.runShellCommand(mInstrumentation, "am set-standby-bucket "
+                    + PACKAGE_NAME_APP1 + " rare");
+
+            latch[0] = new CountDownLatch(1);
+            // Send a broadcast to PACKAGE_NAME_APP1 again.
+            CommandReceiver.sendCommandWithResultReceiver(mTargetContext,
+                    CommandReceiver.COMMAND_EMPTY, PACKAGE_NAME_APP1, PACKAGE_NAME_APP1,
+                    0, null, receiver);
+
+            // Now its LRU posistion should have been bumped.
+            verifyLruOrders(packageNames, 0, true, (a, b) -> a > b, "%s should be newer than %s");
+        } finally {
+            forEach(packageNames, packageName -> SystemUtil.runShellCommand(mInstrumentation,
+                    "cmd deviceidle whitelist -" + packageName));
+
+            SystemUtil.runShellCommand(mInstrumentation, "am set-standby-bucket "
+                    + PACKAGE_NAME_APP1 + " rare");
+
+            // force stop test package, where the whole test process group will be killed.
+            forEach(packageNames, packageName -> SystemUtil.runWithShellPermissionIdentity(
+                    () -> mActivityManager.forceStopPackage(packageName)));
+
+            forEach(watchers, watcher -> watcher.finish());
+        }
+    }
+
+    private int[] getLruPositions(String[] packageNames) throws Exception {
+        final List<String> lru = getCachedAppsLru();
+        assertTrue("Failed to get cached app list", lru.size() > 0);
+        final int[] pos = new int[packageNames.length];
+        for (int i = 0; i < packageNames.length; i++) {
+            pos[i] = lru.indexOf(packageNames[i]);
+        }
+        return pos;
+    }
+
+    private void verifyLruOrders(String[] packageNames, int testIndex, boolean newest,
+            BiPredicate<Integer, Integer> predicate, String msg) throws Exception {
+        final List<String> lru = getCachedAppsLru();
+
+        assertTrue("Failed to get cached app list", lru.size() > 0);
+        final int[] pos = getLruPositions(packageNames);
+        if (pos[testIndex] != -1) {
+            for (int i = 0; i < pos.length; i++) {
+                if (i == testIndex || pos[i] == -1) {
+                    continue;
+                }
+                assertTrue(String.format(msg, packageNames[testIndex], packageNames[i]),
+                        predicate.test(pos[testIndex], pos[i]));
+            }
+        } else if (newest) {
+            for (int i = 0; i < pos.length; i++) {
+                assertEquals(packageNames[i] + " should have gone", -1, pos[i]);
+            }
+        }
+    }
+
+    private WatchUidRunner[] initWatchUidRunners(String[] packageNames, long waitFormMs)
+            throws Exception {
+        final WatchUidRunner[] watchers = new WatchUidRunner[packageNames.length];
+        for (int i = 0; i < packageNames.length; i++) {
+            final ApplicationInfo ai = mTargetContext.getPackageManager()
+                    .getApplicationInfo(packageNames[i], 0);
+            watchers[i] = new WatchUidRunner(mInstrumentation, ai.uid, waitFormMs);
+        }
+        return watchers;
+    }
+
+    private interface ConsumerWithException<T> {
+        void accept(T t) throws Exception;
+    }
+
+    private interface BiConsumerWithException<T, U> {
+        void accept(T t, U u) throws Exception;
+    }
+
+    private <T> void forEach(T[] items, ConsumerWithException<T> consumer) throws Exception {
+        for (T item: items) {
+            consumer.accept(item);
+        }
+    }
+
+    private <T, U> void forBiEach(T[] itemsA, U[] itemsB, BiConsumerWithException<T, U> consumer)
+            throws Exception {
+        for (int i = 0; i < itemsA.length; i++) {
+            consumer.accept(itemsA[i], itemsB[i]);
         }
     }
 
diff --git a/tests/app/src/android/app/cts/ActivityOptionsTest.java b/tests/app/src/android/app/cts/ActivityOptionsTest.java
index eab44c5..4dc1220 100644
--- a/tests/app/src/android/app/cts/ActivityOptionsTest.java
+++ b/tests/app/src/android/app/cts/ActivityOptionsTest.java
@@ -16,6 +16,8 @@
 
 package android.app.cts;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.app.ActivityOptions;
 import android.os.Bundle;
 import android.test.AndroidTestCase;
@@ -28,4 +30,12 @@
 
         assertNotNull(bundle);
     }
+
+    public void testGetSetPendingIntentBackgroundActivityLaunchAllowed() {
+        ActivityOptions options = ActivityOptions.makeBasic();
+        options.setPendingIntentBackgroundActivityLaunchAllowed(true);
+        assertThat(options.isPendingIntentBackgroundActivityLaunchAllowed()).isTrue();
+        options.setPendingIntentBackgroundActivityLaunchAllowed(false);
+        assertThat(options.isPendingIntentBackgroundActivityLaunchAllowed()).isFalse();
+    }
 }
diff --git a/tests/app/src/android/app/cts/AlertDialogTest.java b/tests/app/src/android/app/cts/AlertDialogTest.java
index 4710ac2..28d1579 100644
--- a/tests/app/src/android/app/cts/AlertDialogTest.java
+++ b/tests/app/src/android/app/cts/AlertDialogTest.java
@@ -35,6 +35,7 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.After;
 import org.junit.Before;
@@ -75,7 +76,7 @@
         });
 
         PollingCheck.waitFor(mActivity.getDialog()::isShowing);
-        PollingCheck.waitFor(mActivity.getDialog().getWindow().getDecorView()::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity.getDialog().getWindow());
     }
 
     @Test
diff --git a/tests/app/src/android/app/cts/AlertDialog_BuilderCursorTest.java b/tests/app/src/android/app/cts/AlertDialog_BuilderCursorTest.java
index 75017c1..6dc1067 100644
--- a/tests/app/src/android/app/cts/AlertDialog_BuilderCursorTest.java
+++ b/tests/app/src/android/app/cts/AlertDialog_BuilderCursorTest.java
@@ -36,7 +36,7 @@
 
 import androidx.test.InstrumentationRegistry;
 
-import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import java.io.File;
 
@@ -103,7 +103,7 @@
         mInstrumentation = getInstrumentation();
         mContext = getActivity();
 
-        PollingCheck.waitFor(() -> getActivity().hasWindowFocus());
+        WindowUtil.waitForFocus(getActivity());
 
         mListView = null;
         mDialog = null;
diff --git a/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java b/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
index d27d4e8..449529e 100644
--- a/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
+++ b/tests/app/src/android/app/cts/AlertDialog_BuilderTest.java
@@ -53,6 +53,7 @@
 import androidx.test.rule.ActivityTestRule;
 
 import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -99,7 +100,7 @@
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         Activity activity = mActivityRule.getActivity();
         mContext = activity;
-        PollingCheck.waitFor(activity::hasWindowFocus);
+        WindowUtil.waitForFocus(activity);
     }
 
     @Test
diff --git a/tests/app/src/android/app/cts/BaseNotificationManagerTest.java b/tests/app/src/android/app/cts/BaseNotificationManagerTest.java
new file mode 100644
index 0000000..7ac6882
--- /dev/null
+++ b/tests/app/src/android/app/cts/BaseNotificationManagerTest.java
@@ -0,0 +1,402 @@
+/*
+ * Copyright (C) 2022 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 android.app.cts;
+
+import static android.app.Notification.CATEGORY_CALL;
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.INTERRUPTION_FILTER_ALL;
+
+import static org.junit.Assert.assertNotEquals;
+
+import android.app.ActivityManager;
+import android.app.Instrumentation;
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationChannelGroup;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.app.Person;
+import android.app.UiAutomation;
+import android.app.cts.android.app.cts.tools.NotificationHelper;
+import android.app.role.RoleManager;
+import android.app.stubs.BubbledActivity;
+import android.app.stubs.R;
+import android.app.stubs.TestNotificationAssistant;
+import android.app.stubs.TestNotificationListener;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.graphics.drawable.Icon;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
+import android.os.SystemClock;
+import android.provider.Telephony;
+import android.service.notification.StatusBarNotification;
+import android.test.AndroidTestCase;
+import android.util.ArraySet;
+import android.util.Log;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+/* Base class for NotificationManager tests. Handles some of the common set up logic for tests. */
+public abstract class BaseNotificationManagerTest extends AndroidTestCase {
+
+    protected static final String NOTIFICATION_CHANNEL_ID = "NotificationManagerTest";
+    protected static final String SHARE_SHORTCUT_CATEGORY =
+            "android.app.stubs.SHARE_SHORTCUT_CATEGORY";
+    protected static final String SHARE_SHORTCUT_ID = "shareShortcut";
+
+    private static final String TAG = BaseNotificationManagerTest.class.getSimpleName();
+
+    protected PackageManager mPackageManager;
+    protected AudioManager mAudioManager;
+    protected RoleManager mRoleManager;
+    protected NotificationManager mNotificationManager;
+    protected ActivityManager mActivityManager;
+    protected TestNotificationAssistant mAssistant;
+    protected TestNotificationListener mListener;
+    protected List<String> mRuleIds;
+    protected Instrumentation mInstrumentation;
+    protected NotificationHelper mNotificationHelper;
+
+    public static void toggleListenerAccess(Context context, boolean on) throws IOException {
+        String command = " cmd notification " + (on ? "allow_listener " : "disallow_listener ")
+                + TestNotificationListener.getId();
+
+        runCommand(command, InstrumentationRegistry.getInstrumentation());
+
+        final NotificationManager nm = context.getSystemService(NotificationManager.class);
+        final ComponentName listenerComponent = TestNotificationListener.getComponentName();
+        assertEquals(listenerComponent + " has incorrect listener access",
+                on, nm.isNotificationListenerAccessGranted(listenerComponent));
+    }
+
+    @SuppressWarnings("StatementWithEmptyBody")
+    protected static void runCommand(String command, Instrumentation instrumentation)
+            throws IOException {
+        UiAutomation uiAutomation = instrumentation.getUiAutomation();
+        // Execute command
+        try (ParcelFileDescriptor fd = uiAutomation.executeShellCommand(command)) {
+            assertNotNull("Failed to execute shell command: " + command, fd);
+            // Wait for the command to finish by reading until EOF
+            try (InputStream in = new FileInputStream(fd.getFileDescriptor())) {
+                byte[] buffer = new byte[4096];
+                while (in.read(buffer) > 0) {
+                    // discard output
+                }
+            } catch (IOException e) {
+                throw new IOException("Could not read stdout of command: " + command, e);
+            }
+        }
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mNotificationManager = mContext.getSystemService(NotificationManager.class);
+        mNotificationHelper = new NotificationHelper(mContext, () -> mListener);
+        // clear the deck so that our getActiveNotifications results are predictable
+        mNotificationManager.cancelAll();
+
+        assertEquals("Previous test left system in a bad state",
+                0, mNotificationManager.getActiveNotifications().length);
+
+        mNotificationManager.createNotificationChannel(new NotificationChannel(
+                NOTIFICATION_CHANNEL_ID, "name", IMPORTANCE_DEFAULT));
+        mActivityManager = mContext.getSystemService(ActivityManager.class);
+        mPackageManager = mContext.getPackageManager();
+        mAudioManager = mContext.getSystemService(AudioManager.class);
+        mRoleManager = mContext.getSystemService(RoleManager.class);
+        mRuleIds = new ArrayList<>();
+
+        // ensure listener access isn't allowed before test runs (other tests could put
+        // TestListener in an unexpected state)
+        toggleListenerAccess(false);
+        toggleAssistantAccess(false);
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        toggleNotificationPolicyAccess(mContext.getPackageName(), mInstrumentation, true);
+        mNotificationManager.setInterruptionFilter(INTERRUPTION_FILTER_ALL);
+        toggleNotificationPolicyAccess(mContext.getPackageName(), mInstrumentation, false);
+
+        // Ensure that the tests are exempt from global service-related rate limits
+        setEnableServiceNotificationRateLimit(false);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+
+        setEnableServiceNotificationRateLimit(true);
+
+        mNotificationManager.cancelAll();
+        for (String id : mRuleIds) {
+            mNotificationManager.removeAutomaticZenRule(id);
+        }
+
+        assertExpectedDndState(INTERRUPTION_FILTER_ALL);
+
+        List<NotificationChannel> channels = mNotificationManager.getNotificationChannels();
+        // Delete all channels.
+        for (NotificationChannel nc : channels) {
+            if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(nc.getId())) {
+                continue;
+            }
+            mNotificationManager.deleteNotificationChannel(nc.getId());
+        }
+
+        // Unsuspend package if it was suspended in the test
+        suspendPackage(mContext.getPackageName(), mInstrumentation, false);
+
+        toggleListenerAccess(false);
+        toggleNotificationPolicyAccess(mContext.getPackageName(), mInstrumentation, false);
+
+        List<NotificationChannelGroup> groups = mNotificationManager.getNotificationChannelGroups();
+        // Delete all groups.
+        for (NotificationChannelGroup ncg : groups) {
+            mNotificationManager.deleteNotificationChannelGroup(ncg.getId());
+        }
+    }
+
+    protected StatusBarNotification findPostedNotification(int id, boolean all) {
+        return mNotificationHelper.findPostedNotification(id, all);
+    }
+
+    protected void setUpNotifListener() {
+        try {
+            toggleListenerAccess(true);
+            mListener = TestNotificationListener.getInstance();
+            assertNotNull(mListener);
+            mListener.resetData();
+        } catch (IOException e) {
+        }
+    }
+
+    protected boolean checkNotificationExistence(int id, boolean shouldExist) {
+        // notification is a bit asynchronous so it may take a few ms to appear in
+        // getActiveNotifications()
+        // we will check for it for up to 300ms before giving up
+        boolean found = false;
+        for (int tries = 3; tries-- > 0; ) {
+            // Need reset flag.
+            found = false;
+            final StatusBarNotification[] sbns = mNotificationManager.getActiveNotifications();
+            for (StatusBarNotification sbn : sbns) {
+                Log.d(TAG, "Found " + sbn.getKey());
+                if (sbn.getId() == id) {
+                    found = true;
+                    break;
+                }
+            }
+            if (found == shouldExist) break;
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException ex) {
+                // pass
+            }
+        }
+        return found == shouldExist;
+    }
+
+    protected void toggleListenerAccess(boolean on) throws IOException {
+        toggleListenerAccess(mContext, on);
+    }
+
+    protected void toggleAssistantAccess(boolean on) throws IOException {
+        final ComponentName assistantComponent = TestNotificationAssistant.getComponentName();
+
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .adoptShellPermissionIdentity("android.permission.STATUS_BAR_SERVICE",
+                    "android.permission.REQUEST_NOTIFICATION_ASSISTANT_SERVICE");
+        mNotificationManager.setNotificationAssistantAccessGranted(assistantComponent, on);
+
+        assertTrue(assistantComponent + " has not been " + (on ? "allowed" : "disallowed"),
+                mNotificationManager.isNotificationAssistantAccessGranted(assistantComponent)
+                        == on);
+        if (on) {
+            assertEquals(assistantComponent,
+                    mNotificationManager.getAllowedNotificationAssistant());
+        } else {
+            assertNotEquals(assistantComponent,
+                    mNotificationManager.getAllowedNotificationAssistant());
+        }
+
+        InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation().dropShellPermissionIdentity();
+    }
+
+    protected void assertExpectedDndState(int expectedState) {
+        int tries = 3;
+        for (int i = tries; i >= 0; i--) {
+            if (expectedState
+                    == mNotificationManager.getCurrentInterruptionFilter()) {
+                break;
+            }
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+
+        assertEquals(expectedState, mNotificationManager.getCurrentInterruptionFilter());
+    }
+
+    /** Creates a dynamic, longlived, sharing shortcut. Call {@link #deleteShortcuts()} after. */
+    protected void createDynamicShortcut() {
+        Person person = new Person.Builder()
+                .setBot(false)
+                .setIcon(Icon.createWithResource(mContext, R.drawable.icon_black))
+                .setName("BubbleBot")
+                .setImportant(true)
+                .build();
+
+        Set<String> categorySet = new ArraySet<>();
+        categorySet.add(SHARE_SHORTCUT_CATEGORY);
+        Intent shortcutIntent = new Intent(mContext, BubbledActivity.class);
+        shortcutIntent.setAction(Intent.ACTION_VIEW);
+
+        ShortcutInfo shortcut = new ShortcutInfo.Builder(mContext, SHARE_SHORTCUT_ID)
+                .setShortLabel(SHARE_SHORTCUT_ID)
+                .setIcon(Icon.createWithResource(mContext, R.drawable.icon_black))
+                .setIntent(shortcutIntent)
+                .setPerson(person)
+                .setCategories(categorySet)
+                .setLongLived(true)
+                .build();
+
+        ShortcutManager scManager = mContext.getSystemService(ShortcutManager.class);
+        scManager.addDynamicShortcuts(Arrays.asList(shortcut));
+    }
+
+    protected void deleteShortcuts() {
+        ShortcutManager scManager = mContext.getSystemService(ShortcutManager.class);
+        scManager.removeAllDynamicShortcuts();
+        scManager.removeLongLivedShortcuts(Collections.singletonList(SHARE_SHORTCUT_ID));
+    }
+
+    /**
+     * Notification fulfilling conversation policy; for the shortcut to be valid
+     * call {@link #createDynamicShortcut()}
+     */
+    protected Notification.Builder getConversationNotification() {
+        Person person = new Person.Builder()
+                .setName("bubblebot")
+                .build();
+        return new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
+                .setContentTitle("foo")
+                .setShortcutId(SHARE_SHORTCUT_ID)
+                .setStyle(new Notification.MessagingStyle(person)
+                        .setConversationTitle("Bubble Chat")
+                        .addMessage("Hello?",
+                                SystemClock.currentThreadTimeMillis() - 300000, person)
+                        .addMessage("Is it me you're looking for?",
+                                SystemClock.currentThreadTimeMillis(), person)
+                )
+                .setSmallIcon(android.R.drawable.sym_def_app_icon);
+    }
+
+    protected void sendNotification(final int id,
+            final int icon) throws Exception {
+        sendNotification(id, null, icon);
+    }
+
+    protected void sendNotification(final int id,
+            String groupKey, final int icon) {
+        sendNotification(id, groupKey, icon, false, null);
+    }
+
+    protected void sendNotification(final int id,
+            String groupKey, final int icon,
+            boolean isCall, Uri phoneNumber) {
+        final Intent intent = new Intent(Intent.ACTION_MAIN, Telephony.Threads.CONTENT_URI);
+
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP
+                | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.setAction(Intent.ACTION_MAIN);
+
+        final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent,
+                PendingIntent.FLAG_MUTABLE);
+        Notification.Builder nb = new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
+                .setSmallIcon(icon)
+                .setWhen(System.currentTimeMillis())
+                .setContentTitle("notify#" + id)
+                .setContentText("This is #" + id + "notification  ")
+                .setContentIntent(pendingIntent)
+                .setGroup(groupKey);
+
+        if (isCall) {
+            nb.setCategory(CATEGORY_CALL);
+            if (phoneNumber != null) {
+                Bundle extras = new Bundle();
+                ArrayList<Person> pList = new ArrayList<>();
+                pList.add(new Person.Builder().setUri(phoneNumber.toString()).build());
+                extras.putParcelableArrayList(Notification.EXTRA_PEOPLE_LIST, pList);
+                nb.setExtras(extras);
+            }
+        }
+
+        final Notification notification = nb.build();
+        mNotificationManager.notify(id, notification);
+
+        if (!checkNotificationExistence(id, /*shouldExist=*/ true)) {
+            fail("couldn't find posted notification id=" + id);
+        }
+    }
+
+    protected void setEnableServiceNotificationRateLimit(boolean enable) throws IOException {
+        String command = "cmd activity fgs-notification-rate-limit "
+                + (enable ? "enable" : "disable");
+
+        runCommand(command, InstrumentationRegistry.getInstrumentation());
+    }
+
+    protected void suspendPackage(String packageName,
+            Instrumentation instrumentation, boolean suspend) throws IOException {
+        int userId = mContext.getUserId();
+        String command = " cmd package " + (suspend ? "suspend " : "unsuspend ")
+                + "--user " + userId + " " + packageName;
+
+        runCommand(command, instrumentation);
+    }
+
+    protected void toggleNotificationPolicyAccess(String packageName,
+            Instrumentation instrumentation, boolean on) throws IOException {
+
+        String command = " cmd notification " + (on ? "allow_dnd " : "disallow_dnd ") + packageName;
+
+        runCommand(command, instrumentation);
+
+        NotificationManager nm = mContext.getSystemService(NotificationManager.class);
+        assertEquals("Notification Policy Access Grant is "
+                + nm.isNotificationPolicyAccessGranted() + " not " + on + " for "
+                + packageName, on, nm.isNotificationPolicyAccessGranted());
+    }
+}
diff --git a/tests/app/src/android/app/cts/BaseTileServiceTest.java b/tests/app/src/android/app/cts/BaseTileServiceTest.java
deleted file mode 100644
index c3eedb4..0000000
--- a/tests/app/src/android/app/cts/BaseTileServiceTest.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright (C) 2019 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 android.app.cts;
-
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assume.assumeTrue;
-
-import android.app.stubs.TestTileService;
-import android.content.Context;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.service.quicksettings.TileService;
-import android.support.test.uiautomator.By;
-import android.support.test.uiautomator.UiDevice;
-import android.support.test.uiautomator.Until;
-import android.util.Log;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.compatibility.common.util.SystemUtil;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runner.RunWith;
-
-import java.io.IOException;
-
-@RunWith(AndroidJUnit4.class)
-public abstract class BaseTileServiceTest {
-
-    protected abstract String getTag();
-    protected abstract String getComponentName();
-    protected abstract TileService getTileServiceInstance();
-    protected abstract void waitForConnected(boolean state) throws InterruptedException;
-    protected abstract void waitForListening(boolean state) throws InterruptedException;
-    protected Context mContext;
-
-    final static String DUMP_COMMAND =
-            "dumpsys activity service com.android.systemui/.SystemUIService QSTileHost";
-
-    // Time between checks for state we expect.
-    protected static final long CHECK_DELAY = 250;
-    // Number of times to check before failing. This is set so the maximum wait time is about 4s,
-    // as some tests were observed to take around 3s.
-    protected static final long CHECK_RETRIES = 15;
-    // Timeout to wait for launcher
-    protected static final long TIMEOUT = 8000;
-
-    protected TileService mTileService;
-    private Intent homeIntent;
-    private String mLauncherPackage;
-
-    @Before
-    public void setUp() throws Exception {
-        assumeTrue(TileService.isQuickSettingsSupported());
-        mContext = InstrumentationRegistry.getContext();
-        homeIntent = new Intent(Intent.ACTION_MAIN);
-        homeIntent.addCategory(Intent.CATEGORY_HOME);
-
-        mLauncherPackage = mContext.getPackageManager().resolveActivity(homeIntent,
-                PackageManager.MATCH_DEFAULT_ONLY).activityInfo.packageName;
-
-        // Wait for home
-        UiDevice device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
-        device.pressHome();
-        device.wait(Until.hasObject(By.pkg(mLauncherPackage).depth(0)), TIMEOUT);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        expandSettings(false);
-        toggleServiceAccess(getComponentName(), false);
-        waitForConnected(false);
-        assertNull(TestTileService.getInstance());
-    }
-
-    protected void startTileService() throws Exception {
-        toggleServiceAccess(getComponentName(), true);
-        waitForConnected(true); // wait for service to be bound
-        mTileService = getTileServiceInstance();
-        assertNotNull(mTileService);
-    }
-
-    protected void toggleServiceAccess(String componentName, boolean on) throws Exception {
-        String command = " cmd statusbar " + (on ? "add-tile " : "remove-tile ")
-                + componentName;
-
-        executeShellCommand(command);
-    }
-
-    public String executeShellCommand(String command) throws IOException {
-        Log.i(getTag(), "Shell command: " + command);
-        try {
-            return SystemUtil.runShellCommand(getInstrumentation(), command);
-        } catch (IOException e) {
-            //bubble it up
-            Log.e(getTag(), "Error running shell command: " + command);
-            throw new IOException(e);
-        }
-    }
-
-    protected void expandSettings(boolean expand) throws Exception {
-        executeShellCommand(" cmd statusbar " + (expand ? "expand-settings" : "collapse"));
-        Thread.sleep(600); // wait for animation
-    }
-
-    protected void initializeAndListen() throws Exception {
-        startTileService();
-        expandSettings(true);
-        waitForListening(true);
-    }
-
-    /**
-     * Find a line containing {@code label} in {@code lines}.
-     */
-    protected String findLine(String[] lines, CharSequence label) {
-        for (String line: lines) {
-            if (line.contains(label)) {
-                return line;
-            }
-        }
-        return null;
-    }
-}
diff --git a/tests/app/src/android/app/cts/BooleanTileServiceTest.java b/tests/app/src/android/app/cts/BooleanTileServiceTest.java
deleted file mode 100644
index 6ffa763..0000000
--- a/tests/app/src/android/app/cts/BooleanTileServiceTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2019 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 android.app.cts;
-
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import android.app.stubs.ToggleableTestTileService;
-import android.service.quicksettings.Tile;
-import android.service.quicksettings.TileService;
-
-import org.junit.Test;
-
-public class BooleanTileServiceTest extends BaseTileServiceTest {
-    private final static String TAG = "BooleanTileServiceTest";
-
-    @Test
-    public void testTileIsBoundAndListening() throws Exception {
-        startTileService();
-        expandSettings(true);
-        waitForListening(true);
-    }
-
-    @Test
-    public void testTileInDumpAndHasBooleanState() throws Exception {
-        initializeAndListen();
-
-        final CharSequence tileLabel = mTileService.getQsTile().getLabel();
-
-        final String[] dumpLines = executeShellCommand(DUMP_COMMAND).split("\n");
-        final String line = findLine(dumpLines, tileLabel);
-        assertNotNull(line);
-        assertTrue(line.trim().startsWith("BooleanState"));
-    }
-
-    @Test
-    public void testTileStartsInactive() throws Exception {
-        initializeAndListen();
-
-        assertEquals(Tile.STATE_INACTIVE, mTileService.getQsTile().getState());
-    }
-
-    @Test
-    public void testValueTracksState() throws Exception {
-        initializeAndListen();
-
-        final CharSequence tileLabel = mTileService.getQsTile().getLabel();
-
-        String[] dumpLines = executeShellCommand(DUMP_COMMAND).split("\n");
-        String line = findLine(dumpLines, tileLabel);
-
-        // Tile starts inactive
-        assertTrue(line.contains("value=false"));
-
-        ((ToggleableTestTileService) mTileService).toggleState();
-
-        // Close and open QS to make sure that state is refreshed
-        expandSettings(false);
-        waitForListening(false);
-        expandSettings(true);
-        waitForListening(true);
-
-        assertEquals(Tile.STATE_ACTIVE, mTileService.getQsTile().getState());
-
-        dumpLines = executeShellCommand(DUMP_COMMAND).split("\n");
-        line = findLine(dumpLines, tileLabel);
-
-        assertTrue(line.contains("value=true"));
-    }
-
-    @Override
-    protected String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected String getComponentName() {
-        return ToggleableTestTileService.getComponentName().flattenToString();
-    }
-
-    @Override
-    protected TileService getTileServiceInstance() {
-        return ToggleableTestTileService.getInstance();
-    }
-
-    /**
-     * Waits for the TileService to be in the expected listening state. If it times out, it fails
-     * the test
-     * @param state desired listening state
-     * @throws InterruptedException
-     */
-    @Override
-    protected void waitForListening(boolean state) throws InterruptedException {
-        int ct = 0;
-        while (ToggleableTestTileService.isListening() != state && (ct++ < CHECK_RETRIES)) {
-            Thread.sleep(CHECK_DELAY);
-        }
-        assertEquals(state, ToggleableTestTileService.isListening());
-    }
-
-    /**
-     * Waits for the TileService to be in the expected connected state. If it times out, it fails
-     * the test
-     * @param state desired connected state
-     * @throws InterruptedException
-     */
-    @Override
-    protected void waitForConnected(boolean state) throws InterruptedException {
-        int ct = 0;
-        while (ToggleableTestTileService.isConnected() != state && (ct++ < CHECK_RETRIES)) {
-            Thread.sleep(CHECK_DELAY);
-        }
-        assertEquals(state, ToggleableTestTileService.isConnected());
-    }
-}
diff --git a/tests/app/src/android/app/cts/BroadcastOptionsTest.java b/tests/app/src/android/app/cts/BroadcastOptionsTest.java
index c3b4e89..a63f91b 100644
--- a/tests/app/src/android/app/cts/BroadcastOptionsTest.java
+++ b/tests/app/src/android/app/cts/BroadcastOptionsTest.java
@@ -16,16 +16,30 @@
 
 package android.app.cts;
 
+import static android.app.cts.ActivityManagerFgsBgStartTest.PACKAGE_NAME_APP1;
+import static android.app.cts.ActivityManagerFgsBgStartTest.PACKAGE_NAME_APP2;
+import static android.app.cts.ActivityManagerFgsBgStartTest.WAITFOR_MSEC;
+import static android.app.stubs.LocalForegroundService.ACTION_START_FGS_RESULT;
+
 import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import static org.junit.Assert.assertThrows;
 
 import android.app.BroadcastOptions;
+import android.app.Instrumentation;
+import android.app.cts.android.app.cts.tools.WaitForBroadcast;
+import android.app.stubs.CommandReceiver;
 import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerExemptionManager;
 
+import androidx.test.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.android.compatibility.common.util.SystemUtil;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -74,9 +88,12 @@
         BroadcastOptions bo;
 
         bo = BroadcastOptions.makeBasic();
+        Bundle bundle = bo.toBundle();
 
-        // If no options are set, toBundle() should return null
-        assertNull(bo.toBundle());
+        // Only background activity launch key is set.
+        assertEquals(1, bundle.size());
+        // TODO: Use BroadcastOptions.KEY_PENDING_INTENT_BACKGROUND_ACTIVITY_ALLOWED instead.
+        assertTrue(bundle.containsKey("android.pendingIntent.backgroundActivityAllowed"));
 
         // Check the default values about temp-allowlist.
         assertBroadcastOption_noTemporaryAppAllowList(bo);
@@ -162,4 +179,88 @@
         final BroadcastOptions cloned = cloneViaBundle(bo);
         assertEquals(Build.VERSION_CODES.P, bo.getMaxManifestReceiverApiLevel());
     }
+
+    @Test
+    public void testGetSetPendingIntentBackgroundActivityLaunchAllowed() {
+        BroadcastOptions options = BroadcastOptions.makeBasic();
+        options.setPendingIntentBackgroundActivityLaunchAllowed(true);
+        assertTrue(options.isPendingIntentBackgroundActivityLaunchAllowed());
+        options.setPendingIntentBackgroundActivityLaunchAllowed(false);
+        assertFalse(options.isPendingIntentBackgroundActivityLaunchAllowed());
+    }
+
+    private void assertBroadcastSuccess(BroadcastOptions options) {
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        final WaitForBroadcast waiter = new WaitForBroadcast(instrumentation.getTargetContext());
+        waiter.prepare(ACTION_START_FGS_RESULT);
+        CommandReceiver.sendCommandWithBroadcastOptions(instrumentation.getContext(),
+                CommandReceiver.COMMAND_START_FOREGROUND_SERVICE,
+                PACKAGE_NAME_APP1, PACKAGE_NAME_APP2, 0, null,
+                options.toBundle());
+        waiter.doWait(WAITFOR_MSEC);
+    }
+
+    private void assertBroadcastFailure(BroadcastOptions options) {
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        final WaitForBroadcast waiter = new WaitForBroadcast(instrumentation.getTargetContext());
+        waiter.prepare(ACTION_START_FGS_RESULT);
+        CommandReceiver.sendCommandWithBroadcastOptions(instrumentation.getContext(),
+                CommandReceiver.COMMAND_START_FOREGROUND_SERVICE,
+                PACKAGE_NAME_APP1, PACKAGE_NAME_APP2, 0, null,
+                options.toBundle());
+        assertThrows(Exception.class, () -> waiter.doWait(WAITFOR_MSEC));
+    }
+
+    @Test
+    public void testRequireCompatChange_simple() {
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            final int uid = android.os.Process.myUid();
+            final BroadcastOptions options = BroadcastOptions.makeBasic();
+
+            // Default passes
+            assertTrue(options.testRequireCompatChange(uid));
+            assertTrue(cloneViaBundle(options).testRequireCompatChange(uid));
+
+            // Verify both enabled and disabled
+            options.setRequireCompatChange(BroadcastOptions.CHANGE_ALWAYS_ENABLED, true);
+            assertTrue(options.testRequireCompatChange(uid));
+            assertTrue(cloneViaBundle(options).testRequireCompatChange(uid));
+            options.setRequireCompatChange(BroadcastOptions.CHANGE_ALWAYS_ENABLED, false);
+            assertFalse(options.testRequireCompatChange(uid));
+            assertFalse(cloneViaBundle(options).testRequireCompatChange(uid));
+
+            // And back to default passes
+            options.clearRequireCompatChange();
+            assertTrue(options.testRequireCompatChange(uid));
+            assertTrue(cloneViaBundle(options).testRequireCompatChange(uid));
+        });
+    }
+
+    @Test
+    public void testRequireCompatChange_enabled_success() {
+        final BroadcastOptions options = BroadcastOptions.makeBasic();
+        options.setRequireCompatChange(BroadcastOptions.CHANGE_ALWAYS_ENABLED, true);
+        assertBroadcastSuccess(options);
+    }
+
+    @Test
+    public void testRequireCompatChange_enabled_failure() {
+        final BroadcastOptions options = BroadcastOptions.makeBasic();
+        options.setRequireCompatChange(BroadcastOptions.CHANGE_ALWAYS_DISABLED, true);
+        assertBroadcastFailure(options);
+    }
+
+    @Test
+    public void testRequireCompatChange_disabled_success() {
+        final BroadcastOptions options = BroadcastOptions.makeBasic();
+        options.setRequireCompatChange(BroadcastOptions.CHANGE_ALWAYS_DISABLED, false);
+        assertBroadcastSuccess(options);
+    }
+
+    @Test
+    public void testRequireCompatChange_disabled_failure() {
+        final BroadcastOptions options = BroadcastOptions.makeBasic();
+        options.setRequireCompatChange(BroadcastOptions.CHANGE_ALWAYS_ENABLED, false);
+        assertBroadcastFailure(options);
+    }
 }
diff --git a/tests/app/src/android/app/cts/CloseSystemDialogsTest.java b/tests/app/src/android/app/cts/CloseSystemDialogsTest.java
index f54c5af..da2c43a 100644
--- a/tests/app/src/android/app/cts/CloseSystemDialogsTest.java
+++ b/tests/app/src/android/app/cts/CloseSystemDialogsTest.java
@@ -28,6 +28,7 @@
 import static org.junit.Assume.assumeTrue;
 import static org.testng.Assert.assertThrows;
 
+import android.Manifest;
 import android.app.ActivityManager;
 import android.app.Instrumentation;
 import android.app.UiAutomation;
@@ -47,7 +48,10 @@
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.Process;
 import android.os.ResultReceiver;
+import android.permission.PermissionManager;
+import android.permission.cts.PermissionUtils;
 import android.provider.Settings;
 import android.server.wm.WindowManagerStateHelper;
 import android.view.Display;
@@ -118,6 +122,7 @@
     public void setUp() throws Exception {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mContext = mInstrumentation.getTargetContext();
+        PermissionUtils.grantPermission(APP_SELF, Manifest.permission.POST_NOTIFICATIONS);
         mResolver = mContext.getContentResolver();
         mMainHandler = new Handler(Looper.getMainLooper());
         toggleListenerAccess(mContext, true);
@@ -163,6 +168,15 @@
         compat(APP_COMPAT_RESET, ActivityManager.LOCK_DOWN_CLOSE_SYSTEM_DIALOGS, APP_HELPER);
         compat(APP_COMPAT_RESET, "NOTIFICATION_TRAMPOLINE_BLOCK", APP_HELPER);
         mNotificationListener.resetData();
+        // Use test API to prevent PermissionManager from killing the test process when revoking
+        // permission.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> mContext.getSystemService(PermissionManager.class)
+                        .revokePostNotificationPermissionWithoutKillForTest(
+                                mContext.getPackageName(),
+                                Process.myUserHandle().getIdentifier()),
+                Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL,
+                Manifest.permission.REVOKE_RUNTIME_PERMISSIONS);
     }
 
     /** Intent.ACTION_CLOSE_SYSTEM_DIALOGS */
diff --git a/tests/app/src/android/app/cts/DialogTest.java b/tests/app/src/android/app/cts/DialogTest.java
index bbc57be..c22798c 100755
--- a/tests/app/src/android/app/cts/DialogTest.java
+++ b/tests/app/src/android/app/cts/DialogTest.java
@@ -63,6 +63,7 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.After;
 import org.junit.Before;
@@ -112,7 +113,7 @@
         mScenario.onActivity(activity -> {
             mActivity = activity;
         });
-        PollingCheck.waitFor(mActivity.getDialog().getWindow().getDecorView()::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity.getDialog().getWindow());
     }
 
     @UiThreadTest
diff --git a/tests/app/src/android/app/cts/InstrumentationTest.java b/tests/app/src/android/app/cts/InstrumentationTest.java
index 0d7b395..70499b8 100644
--- a/tests/app/src/android/app/cts/InstrumentationTest.java
+++ b/tests/app/src/android/app/cts/InstrumentationTest.java
@@ -48,8 +48,8 @@
 import android.view.ViewGroup.LayoutParams;
 import android.view.Window;
 
-import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.SystemUtil;
+import com.android.compatibility.common.util.WindowUtil;
 
 import java.util.List;
 
@@ -75,7 +75,7 @@
         mIntent = new Intent(mContext, InstrumentationTestActivity.class);
         mIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         mActivity = (InstrumentationTestActivity) mInstrumentation.startActivitySync(mIntent);
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
     }
 
     protected void tearDown() throws Exception {
diff --git a/tests/app/src/android/app/cts/NearbyDeviceTest.kt b/tests/app/src/android/app/cts/NearbyDeviceTest.kt
new file mode 100644
index 0000000..07b2364
--- /dev/null
+++ b/tests/app/src/android/app/cts/NearbyDeviceTest.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2022 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 android.app.cts
+
+import android.media.NearbyDevice
+import android.os.Parcel
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.google.common.truth.Truth.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/** Tests for [android.media.NearbyDevice]. */
+@RunWith(AndroidJUnit4::class)
+class NearbyDeviceTest {
+
+    @Test
+    fun getMediaRoute2Id_returnsIdPassedIn() {
+        val id = "testIdHere"
+        val nearbyDevice = NearbyDevice(id, NearbyDevice.RANGE_UNKNOWN)
+
+        assertThat(nearbyDevice.mediaRoute2Id).isEqualTo(id)
+    }
+
+    @Test
+    fun getRangeZone_returnsRangeZonePassedIn() {
+        val rangeZone = NearbyDevice.RANGE_WITHIN_REACH
+        val nearbyDevice = NearbyDevice("id", rangeZone)
+
+        assertThat(nearbyDevice.rangeZone).isEqualTo(rangeZone)
+    }
+
+    @Test
+    fun writeToAndCreateFromParcel_resultHasCorrectIdAndRangeZone() {
+        val id = "testIdHere"
+        val rangeZone = NearbyDevice.RANGE_WITHIN_REACH
+        val nearbyDevice = NearbyDevice(id, rangeZone)
+
+        val parcel = Parcel.obtain()
+        nearbyDevice.writeToParcel(parcel, 0)
+        parcel.setDataPosition(0)
+
+        val resultFromParcel = NearbyDevice.CREATOR.createFromParcel(parcel)
+
+        assertThat(resultFromParcel.mediaRoute2Id).isEqualTo(id)
+        assertThat(resultFromParcel.rangeZone).isEqualTo(rangeZone)
+    }
+}
diff --git a/tests/app/src/android/app/cts/NearbyMediaDevicesProviderTest.kt b/tests/app/src/android/app/cts/NearbyMediaDevicesProviderTest.kt
new file mode 100644
index 0000000..539b3bd
--- /dev/null
+++ b/tests/app/src/android/app/cts/NearbyMediaDevicesProviderTest.kt
@@ -0,0 +1,82 @@
+package android.app.cts
+
+import android.app.StatusBarManager
+import android.media.NearbyDevice
+import android.media.NearbyMediaDevicesProvider
+import androidx.test.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import java.util.function.Consumer
+import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
+import com.android.compatibility.common.util.ThrowingSupplier
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Tests for {@link StatusBarManager.registerNearbyMediaDevicesProvider} and
+ * {@link StatusBarManager.unregisterNearbyMediaDevicesProvider}.
+ */
+@RunWith(AndroidJUnit4::class)
+class NearbyMediaDevicesProviderTest {
+    private lateinit var statusBarManager: StatusBarManager
+
+    @Before
+    fun setUp() {
+        val instrumentation = InstrumentationRegistry.getInstrumentation()
+        statusBarManager = instrumentation
+            .getTargetContext()
+            .getSystemService(StatusBarManager::class.java)!!
+    }
+
+    @Test(expected = SecurityException::class)
+    fun registerNearbyMediaDevicesProvider_noPermission_throwsSecurityException() {
+        statusBarManager.registerNearbyMediaDevicesProvider(TestProvider())
+    }
+
+    @Test(expected = SecurityException::class)
+    fun unregisterNearbyMediaDevicesProvider_noPermission_throwsSecurityException() {
+        val provider = TestProvider()
+        // First, register a provider so we have something to unregister.
+        runWithShellPermissionIdentity(
+            ThrowingSupplier {
+                statusBarManager.registerNearbyMediaDevicesProvider(provider)
+            },
+            MEDIA_PERMISSION
+        )
+
+        // Then, try to unregister without the permission.
+        statusBarManager.unregisterNearbyMediaDevicesProvider(provider)
+    }
+
+    @Test
+    fun registerNearbyMediaDevicesProvider_hasPermission_noCrash() {
+        // No assert, just no crash needed
+        runWithShellPermissionIdentity(
+            ThrowingSupplier {
+                statusBarManager.registerNearbyMediaDevicesProvider(TestProvider())
+            },
+            MEDIA_PERMISSION
+        )
+    }
+
+    @Test
+    fun unregisterNearbyMediaDevicesProvider_hasPermission_noCrash() {
+        // No assert, just no crash needed
+        runWithShellPermissionIdentity(
+            ThrowingSupplier {
+                statusBarManager.unregisterNearbyMediaDevicesProvider(TestProvider())
+            },
+            MEDIA_PERMISSION
+        )
+    }
+
+    // No other CTS tests necessary: The API guarantees that applications can set a provider, but
+    // guarantees nothing about how that provider might be used.
+
+    private class TestProvider : NearbyMediaDevicesProvider {
+        override fun registerNearbyDevicesCallback(callback: Consumer<List<NearbyDevice>>) {}
+        override fun unregisterNearbyDevicesCallback(callback: Consumer<List<NearbyDevice>>) {}
+    }
+}
+
+private val MEDIA_PERMISSION: String = android.Manifest.permission.MEDIA_CONTENT_CONTROL
diff --git a/tests/app/src/android/app/cts/NotificationManagerBubbleTest.java b/tests/app/src/android/app/cts/NotificationManagerBubbleTest.java
new file mode 100644
index 0000000..ffafb06
--- /dev/null
+++ b/tests/app/src/android/app/cts/NotificationManagerBubbleTest.java
@@ -0,0 +1,1147 @@
+/*
+ * Copyright (C) 2022 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 android.app.cts;
+
+import static android.app.Notification.FLAG_BUBBLE;
+import static android.app.NotificationManager.BUBBLE_PREFERENCE_ALL;
+import static android.app.NotificationManager.BUBBLE_PREFERENCE_NONE;
+import static android.app.NotificationManager.BUBBLE_PREFERENCE_SELECTED;
+import static android.app.stubs.BubbledActivity.EXTRA_LOCUS_ID;
+import static android.app.stubs.BubblesTestService.EXTRA_TEST_CASE;
+import static android.app.stubs.BubblesTestService.TEST_CALL;
+import static android.app.stubs.BubblesTestService.TEST_MESSAGING;
+import static android.app.stubs.SendBubbleActivity.BUBBLE_NOTIF_ID;
+import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import static org.junit.Assert.assertThrows;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.app.Instrumentation;
+import android.app.KeyguardManager;
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.app.stubs.BubbledActivity;
+import android.app.stubs.BubblesTestService;
+import android.app.stubs.R;
+import android.app.stubs.SendBubbleActivity;
+import android.app.stubs.TestNotificationListener;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.LocusId;
+import android.graphics.drawable.Icon;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.service.notification.NotificationListenerService;
+import android.service.notification.StatusBarNotification;
+import android.util.Log;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.FeatureUtil;
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests bubbles related logic in NotificationManager.
+ */
+public class NotificationManagerBubbleTest extends BaseNotificationManagerTest {
+
+    private static final String TAG = NotificationManagerBubbleTest.class.getSimpleName();
+
+    // use a value of 10000 for consistency with other CTS tests (see
+    // android.server.wm.intentLaunchRunner#ACTIVITY_LAUNCH_TIMEOUT)
+    private static final int ACTIVITY_LAUNCH_TIMEOUT = 10000;
+
+    private BroadcastReceiver mBubbleBroadcastReceiver;
+    private boolean mBubblesEnabledSettingToRestore;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        // This setting is forced on / off for certain tests, save it & restore what's on the
+        // device after tests are run
+        mBubblesEnabledSettingToRestore = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.NOTIFICATION_BUBBLES) == 1;
+
+        // ensure listener access isn't allowed before test runs (other tests could put
+        // TestListener in an unexpected state)
+        toggleListenerAccess(false);
+
+        // delay between tests so notifications aren't dropped by the rate limiter
+        sleep();
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+
+        // Restore bubbles setting
+        setBubblesGlobal(mBubblesEnabledSettingToRestore);
+    }
+
+    private boolean isBubblesFeatureSupported() {
+        // These do not support bubbles.
+        return (!mActivityManager.isLowRamDevice() || FeatureUtil.isWatch())
+                && !FeatureUtil.isAutomotive() && !FeatureUtil.isTV();
+    }
+
+    private void sleep() {
+        try {
+            Thread.sleep(500);
+        } catch (InterruptedException ignored) {
+        }
+    }
+
+    private void sendAndVerifyBubble(final int id, Notification.Builder builder,
+            boolean shouldBeBubble) {
+        setUpNotifListener();
+
+        Notification notif = builder.build();
+        mNotificationManager.notify(id, notif);
+
+        verifyNotificationBubbleState(id, shouldBeBubble);
+    }
+
+    private Notification.Builder getDefaultNotifBuilder(int id) {
+        return new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
+                .setSmallIcon(R.drawable.black)
+                .setWhen(System.currentTimeMillis())
+                .setContentTitle("notify#" + id)
+                .setContentText("This is #" + id + "notification  ")
+                .setContentIntent(getDefaultNotifPendingIntent());
+    }
+
+    private PendingIntent getDefaultNotifPendingIntent() {
+        final Intent intent = new Intent(mContext, BubbledActivity.class);
+
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP
+                | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        intent.setAction(Intent.ACTION_MAIN);
+        return PendingIntent.getActivity(mContext, 0, intent,
+                PendingIntent.FLAG_MUTABLE_UNAUDITED);
+    }
+
+    private Notification.BubbleMetadata getDefaultBubbleMetadata() {
+        return new Notification.BubbleMetadata.Builder(
+                getDefaultNotifPendingIntent(),
+                Icon.createWithResource(mContext, R.drawable.black))
+                .build();
+    }
+
+    /**
+     * Make sure {@link #setUpNotifListener()} is called prior to sending the notif and verifying
+     * in this method.
+     */
+    private void verifyNotificationBubbleState(int id, boolean shouldBeBubble) {
+        boolean notificationFound = false;
+        boolean bubbleStateMatches = false;
+        try {
+            // Wait up to 2 seconds for the notification
+            for (int i = 0; i < 20; i++) {
+                // FLAG_BUBBLE relies on notification being posted, wait for notification listener
+                Thread.sleep(100);
+                for (StatusBarNotification sbn : mListener.mPosted) {
+                    if (sbn.getId() == id) {
+                        notificationFound = true;
+                        boolean isBubble = (sbn.getNotification().flags & FLAG_BUBBLE) != 0;
+                        if (isBubble == shouldBeBubble) {
+                            bubbleStateMatches = true;
+                            break;
+                        }
+                    }
+                }
+            }
+        } catch (InterruptedException ignored) {
+        }
+
+        if (bubbleStateMatches) {
+            // pass
+            return;
+        }
+
+        String failure;
+        if (notificationFound) {
+            failure = shouldBeBubble
+                    ? "Notification with id= " + id + " wasn't a bubble"
+                    : "Notification with id= " + id + " was a bubble and shouldn't be";
+        } else {
+            failure = "Couldn't find posted notification with id=" + id;
+        }
+        Log.e(TAG, failure + " listener=" + mListener);
+        fail(failure);
+    }
+
+    private void setBubblesGlobal(boolean enabled) {
+        SystemUtil.runWithShellPermissionIdentity(() ->
+                Settings.Secure.putInt(mContext.getContentResolver(),
+                        Settings.Secure.NOTIFICATION_BUBBLES, enabled ? 1 : 0));
+    }
+
+    private void setBubblesAppPref(int pref) throws Exception {
+        int userId = mContext.getUser().getIdentifier();
+        String pkg = mContext.getPackageName();
+        String command = " cmd notification set_bubbles " + pkg
+                + " " + Integer.toString(pref)
+                + " " + userId;
+        runCommand(command, InstrumentationRegistry.getInstrumentation());
+    }
+
+    private void setBubblesChannelAllowed(boolean allowed) throws Exception {
+        int userId = mContext.getUser().getIdentifier();
+        String pkg = mContext.getPackageName();
+        String command = " cmd notification set_bubbles_channel " + pkg
+                + " " + NOTIFICATION_CHANNEL_ID
+                + " " + allowed
+                + " " + userId;
+        runCommand(command, InstrumentationRegistry.getInstrumentation());
+    }
+
+    private void allowAllNotificationsToBubble() throws Exception {
+        setBubblesGlobal(true);
+        setBubblesAppPref(1 /* all */);
+        setBubblesChannelAllowed(true);
+        sleep(); // wait for ranking update
+    }
+
+    /**
+     * Starts an activity that is able to send a bubble; also handles unlocking the device.
+     * Any tests that use this method should be sure to call {@link #cleanupSendBubbleActivity()}
+     * to unregister the related broadcast receiver.
+     *
+     * @return the SendBubbleActivity that was opened.
+     */
+    private SendBubbleActivity startSendBubbleActivity() {
+        final CountDownLatch latch = new CountDownLatch(1);
+        mBubbleBroadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                latch.countDown();
+            }
+        };
+        IntentFilter filter = new IntentFilter(SendBubbleActivity.BUBBLE_ACTIVITY_OPENED);
+        mContext.registerReceiver(mBubbleBroadcastReceiver, filter);
+
+        // Start & get the activity
+        Class clazz = SendBubbleActivity.class;
+
+        Instrumentation.ActivityResult result =
+                new Instrumentation.ActivityResult(0, new Intent());
+        Instrumentation.ActivityMonitor monitor =
+                new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
+        InstrumentationRegistry.getInstrumentation().addMonitor(monitor);
+
+        Intent i = new Intent(mContext, SendBubbleActivity.class);
+        i.setFlags(FLAG_ACTIVITY_NEW_TASK);
+        InstrumentationRegistry.getInstrumentation().startActivitySync(i);
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+        SendBubbleActivity sendBubbleActivity = (SendBubbleActivity) monitor.waitForActivity();
+
+        // Make sure device is unlocked
+        ensureDeviceUnlocked(sendBubbleActivity);
+        try {
+            latch.await(500, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+        return sendBubbleActivity;
+    }
+
+    private Instrumentation.ActivityMonitor startBubbledActivityMonitor() {
+        Class<BubbledActivity> clazz = BubbledActivity.class;
+        Instrumentation.ActivityResult result =
+                new Instrumentation.ActivityResult(0, new Intent());
+        Instrumentation.ActivityMonitor monitor =
+                new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
+        InstrumentationRegistry.getInstrumentation().addMonitor(monitor);
+        return monitor;
+    }
+
+    private BubbledActivity startBubbleActivity(int id) {
+        return startBubbleActivity(id, true /* addLocusId */);
+    }
+
+    /**
+     * Starts the same activity that is in the bubble produced by this activity.
+     */
+    private BubbledActivity startBubbleActivity(int id, boolean addLocusId) {
+        Instrumentation.ActivityMonitor monitor = startBubbledActivityMonitor();
+
+        final Intent intent = new Intent(mContext, BubbledActivity.class);
+        // Clear any previous instance of this activity
+        intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (addLocusId) {
+            intent.putExtra(EXTRA_LOCUS_ID, String.valueOf(id));
+        }
+
+        InstrumentationRegistry.getInstrumentation().startActivitySync(intent);
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+        BubbledActivity bubbledActivity = (BubbledActivity) monitor.waitForActivity();
+        ensureDeviceUnlocked(bubbledActivity);
+        return bubbledActivity;
+    }
+
+    /**
+     * Make sure device is unlocked so the activity can become visible
+     */
+    private void ensureDeviceUnlocked(Activity activity) {
+        // Make sure device is unlocked
+        KeyguardManager keyguardManager = mContext.getSystemService(KeyguardManager.class);
+        if (keyguardManager.isKeyguardLocked()) {
+            CountDownLatch latch = new CountDownLatch(1);
+            keyguardManager.requestDismissKeyguard(activity,
+                    new KeyguardManager.KeyguardDismissCallback() {
+                        @Override
+                        public void onDismissSucceeded() {
+                            latch.countDown();
+                        }
+                    });
+            try {
+                latch.await(500, TimeUnit.MILLISECONDS);
+            } catch (InterruptedException ignored) {
+            }
+        }
+    }
+
+    private void cleanupSendBubbleActivity() {
+        mContext.unregisterReceiver(mBubbleBroadcastReceiver);
+    }
+
+    public void testCanBubble_ranking() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+
+        // turn on bubbles globally
+        setBubblesGlobal(true);
+        sleep();
+
+        assertEquals(1, Settings.Secure.getInt(
+                mContext.getContentResolver(), Settings.Secure.NOTIFICATION_BUBBLES));
+
+        toggleListenerAccess(true);
+        sleep(); // wait for listener to be allowed
+
+        mListener = TestNotificationListener.getInstance();
+        assertNotNull(mListener);
+
+        sendNotification(1, R.drawable.black);
+        sleep(); // wait for notification listener to receive notification
+        NotificationListenerService.RankingMap rankingMap = mListener.mRankingMap;
+        NotificationListenerService.Ranking outRanking =
+                new NotificationListenerService.Ranking();
+        for (String key : rankingMap.getOrderedKeys()) {
+            if (key.contains(mListener.getPackageName())) {
+                rankingMap.getRanking(key, outRanking);
+                // by default nothing can bubble
+                assertFalse(outRanking.canBubble());
+            }
+        }
+
+        // turn off bubbles globally
+        setBubblesGlobal(false);
+        sleep();
+
+        rankingMap = mListener.mRankingMap;
+        outRanking = new NotificationListenerService.Ranking();
+        for (String key : rankingMap.getOrderedKeys()) {
+            if (key.contains(mListener.getPackageName())) {
+                rankingMap.getRanking(key, outRanking);
+                assertFalse(outRanking.canBubble());
+            }
+        }
+
+        mListener.resetData();
+    }
+
+    public void testAreBubblesAllowed_appNone() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        setBubblesAppPref(BUBBLE_PREFERENCE_NONE);
+        sleep();
+        assertFalse(mNotificationManager.areBubblesAllowed());
+    }
+
+    public void testAreBubblesAllowed_appSelected() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        setBubblesAppPref(BUBBLE_PREFERENCE_SELECTED);
+        sleep();
+        assertFalse(mNotificationManager.areBubblesAllowed());
+    }
+
+    public void testAreBubblesAllowed_appAll() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        setBubblesAppPref(BUBBLE_PREFERENCE_ALL);
+        sleep();
+        assertTrue(mNotificationManager.areBubblesAllowed());
+    }
+
+    public void testGetBubblePreference_appNone() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        setBubblesAppPref(BUBBLE_PREFERENCE_NONE);
+        sleep();
+        assertEquals(BUBBLE_PREFERENCE_NONE, mNotificationManager.getBubblePreference());
+    }
+
+    public void testGetBubblePreference_appSelected() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        setBubblesAppPref(BUBBLE_PREFERENCE_SELECTED);
+        sleep();
+        assertEquals(BUBBLE_PREFERENCE_SELECTED, mNotificationManager.getBubblePreference());
+    }
+
+    public void testGetBubblePreference_appAll() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        setBubblesAppPref(BUBBLE_PREFERENCE_ALL);
+        sleep();
+        assertEquals(BUBBLE_PREFERENCE_ALL, mNotificationManager.getBubblePreference());
+    }
+
+    public void testAreBubblesEnabled() {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        setBubblesGlobal(true);
+        sleep();
+        assertTrue(mNotificationManager.areBubblesEnabled());
+    }
+
+    public void testAreBubblesEnabled_false() {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        setBubblesGlobal(false);
+        sleep();
+        assertFalse(mNotificationManager.areBubblesEnabled());
+    }
+
+    public void testNotificationManagerBubblePolicy_flag_intentBubble()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+            createDynamicShortcut();
+
+            Notification.Builder nb = getConversationNotification();
+            nb.setBubbleMetadata(getDefaultBubbleMetadata());
+            boolean shouldBeBubble = !mActivityManager.isLowRamDevice();
+            sendAndVerifyBubble(1, nb, shouldBeBubble);
+        } finally {
+            deleteShortcuts();
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_noFlag_service()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        Intent serviceIntent = new Intent(mContext, BubblesTestService.class);
+        serviceIntent.putExtra(EXTRA_TEST_CASE, TEST_MESSAGING);
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            setUpNotifListener();
+
+            mContext.startService(serviceIntent);
+
+            // No services in R (allowed in Q)
+            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, false /* shouldBeBubble */);
+        } finally {
+            deleteShortcuts();
+            mContext.stopService(serviceIntent);
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_noFlag_phonecall()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        Intent serviceIntent = new Intent(mContext, BubblesTestService.class);
+        serviceIntent.putExtra(EXTRA_TEST_CASE, TEST_CALL);
+
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            setUpNotifListener();
+
+            mContext.startService(serviceIntent);
+
+            // No phonecalls in R (allowed in Q)
+            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, false /* shouldBeBubble */);
+        } finally {
+            deleteShortcuts();
+            mContext.stopService(serviceIntent);
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_noFlag_foreground() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            setUpNotifListener();
+
+            // Start & get the activity
+            SendBubbleActivity a = startSendBubbleActivity();
+            // Send a bubble that doesn't fulfill policy from foreground
+            a.sendInvalidBubble(BUBBLE_NOTIF_ID, false /* autoExpand */);
+
+            // No foreground bubbles that don't fulfill policy in R (allowed in Q)
+            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, false /* shouldBeBubble */);
+        } finally {
+            deleteShortcuts();
+            cleanupSendBubbleActivity();
+        }
+    }
+
+    public void testNotificationManagerBubble_checkActivityFlagsDocumentLaunchMode()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            setUpNotifListener();
+
+            // make ourselves foreground so we can auto-expand the bubble & check the intent flags
+            SendBubbleActivity a = startSendBubbleActivity();
+
+            // Prep to find bubbled activity
+            Instrumentation.ActivityMonitor monitor = startBubbledActivityMonitor();
+
+            a.sendBubble(BUBBLE_NOTIF_ID, true /* autoExpand */, false /* suppressNotif */);
+
+            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
+
+            InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+
+            BubbledActivity activity = (BubbledActivity) monitor.waitForActivityWithTimeout(
+                    ACTIVITY_LAUNCH_TIMEOUT);
+            assertNotNull(String.format(
+                    "Failed to detect BubbleActivity after %d ms", ACTIVITY_LAUNCH_TIMEOUT),
+                    activity);
+            assertTrue((activity.getIntent().getFlags() & FLAG_ACTIVITY_NEW_DOCUMENT) != 0);
+            assertTrue((activity.getIntent().getFlags() & FLAG_ACTIVITY_MULTIPLE_TASK) != 0);
+        } finally {
+            deleteShortcuts();
+            cleanupSendBubbleActivity();
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_flag_shortcutBubble()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+
+            Notification.Builder nb = getConversationNotification();
+            nb.setBubbleMetadata(
+                    new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID).build());
+
+            boolean shouldBeBubble = !mActivityManager.isLowRamDevice();
+            sendAndVerifyBubble(1, nb, shouldBeBubble);
+        } finally {
+            deleteShortcuts();
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_noFlag_invalidShortcut()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+
+            Notification.Builder nb = getConversationNotification();
+            nb.setShortcutId("invalid");
+            nb.setBubbleMetadata(new Notification.BubbleMetadata.Builder("invalid").build());
+
+            sendAndVerifyBubble(1, nb, false);
+        } finally {
+            deleteShortcuts();
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_noFlag_invalidNotif()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+
+            int id = 1;
+            Notification.Builder nb = getDefaultNotifBuilder(id);
+            nb.setBubbleMetadata(
+                    new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID).build());
+
+            sendAndVerifyBubble(id, nb, false /* shouldBeBubble */);
+        } finally {
+            deleteShortcuts();
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_appAll_globalOn() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            Notification.Builder nb = getConversationNotification();
+            nb.setBubbleMetadata(
+                    new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID).build());
+
+            boolean shouldBeBubble = !mActivityManager.isLowRamDevice();
+            sendAndVerifyBubble(1, nb, shouldBeBubble);
+        } finally {
+            deleteShortcuts();
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_appAll_globalOff() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            setBubblesGlobal(false);
+            setBubblesAppPref(1 /* all */);
+            setBubblesChannelAllowed(true);
+            sleep();
+
+            createDynamicShortcut();
+            Notification.Builder nb = getConversationNotification();
+            nb.setBubbleMetadata(new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
+                    .build());
+
+            sendAndVerifyBubble(1, nb, false);
+        } finally {
+            deleteShortcuts();
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_appAll_channelNo() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            setBubblesGlobal(true);
+            setBubblesAppPref(1 /* all */);
+            setBubblesChannelAllowed(false);
+            sleep();
+
+            createDynamicShortcut();
+            Notification.Builder nb = getConversationNotification();
+            nb.setBubbleMetadata(new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
+                    .build());
+
+            sendAndVerifyBubble(1, nb, false);
+        } finally {
+            deleteShortcuts();
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_appSelected_channelNo() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            setBubblesGlobal(true);
+            setBubblesAppPref(2 /* selected */);
+            setBubblesChannelAllowed(false);
+            sleep();
+
+            createDynamicShortcut();
+            Notification.Builder nb = getConversationNotification();
+            nb.setBubbleMetadata(new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
+                    .build());
+
+            sendAndVerifyBubble(1, nb, false);
+        } finally {
+            deleteShortcuts();
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_appSelected_channelYes() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            setBubblesGlobal(true);
+            setBubblesAppPref(2 /* selected */);
+            setBubblesChannelAllowed(true);
+            sleep();
+
+            createDynamicShortcut();
+            Notification.Builder nb = getConversationNotification();
+            nb.setBubbleMetadata(new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
+                    .build());
+
+            boolean shouldBeBubble = !mActivityManager.isLowRamDevice();
+            sendAndVerifyBubble(1, nb, shouldBeBubble);
+        } finally {
+            deleteShortcuts();
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_appNone_channelNo() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            setBubblesGlobal(true);
+            setBubblesAppPref(0 /* none */);
+            setBubblesChannelAllowed(false);
+            sleep();
+
+            createDynamicShortcut();
+            Notification.Builder nb = getConversationNotification();
+            nb.setBubbleMetadata(new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
+                    .build());
+
+            sendAndVerifyBubble(1, nb, false);
+        } finally {
+            deleteShortcuts();
+        }
+    }
+
+    public void testNotificationManagerBubblePolicy_noFlag_shortcutRemoved()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+
+        try {
+            allowAllNotificationsToBubble();
+            createDynamicShortcut();
+            Notification.Builder nb = getConversationNotification();
+            nb.setBubbleMetadata(new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
+                    .build());
+
+            sendAndVerifyBubble(42, nb, true /* shouldBeBubble */);
+            mListener.resetData();
+
+            deleteShortcuts();
+            verifyNotificationBubbleState(42, false /* should be bubble */);
+        } finally {
+            deleteShortcuts();
+        }
+    }
+
+    public void testNotificationManagerBubbleNotificationSuppression() throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            setUpNotifListener();
+
+            // make ourselves foreground so we can specify suppress notification flag
+            SendBubbleActivity a = startSendBubbleActivity();
+
+            // send the bubble with notification suppressed
+            a.sendBubble(BUBBLE_NOTIF_ID, false /* autoExpand */, true /* suppressNotif */);
+            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
+
+            // check for the notification
+            StatusBarNotification sbnSuppressed = mListener.mPosted.get(0);
+            assertNotNull(sbnSuppressed);
+            // check for suppression state
+            Notification.BubbleMetadata metadata =
+                    sbnSuppressed.getNotification().getBubbleMetadata();
+            assertNotNull(metadata);
+            assertTrue(metadata.isNotificationSuppressed());
+
+            mListener.resetData();
+
+            // send the bubble with notification NOT suppressed
+            a.sendBubble(BUBBLE_NOTIF_ID, false /* autoExpand */, false /* suppressNotif */);
+            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBubble */);
+
+            // check for the notification
+            StatusBarNotification sbnNotSuppressed = mListener.mPosted.get(0);
+            assertNotNull(sbnNotSuppressed);
+            // check for suppression state
+            metadata = sbnNotSuppressed.getNotification().getBubbleMetadata();
+            assertNotNull(metadata);
+            assertFalse(metadata.isNotificationSuppressed());
+        } finally {
+            cleanupSendBubbleActivity();
+            deleteShortcuts();
+        }
+    }
+
+    public void testNotificationManagerBubble_checkIsBubbled_pendingIntent()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            setUpNotifListener();
+
+            SendBubbleActivity a = startSendBubbleActivity();
+
+            // Prep to find bubbled activity
+            Instrumentation.ActivityMonitor monitor = startBubbledActivityMonitor();
+
+            a.sendBubble(BUBBLE_NOTIF_ID, true /* autoExpand */, false /* suppressNotif */);
+
+            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
+
+            BubbledActivity activity = (BubbledActivity) monitor.waitForActivity();
+            assertTrue(activity.isLaunchedFromBubble());
+        } finally {
+            deleteShortcuts();
+            cleanupSendBubbleActivity();
+        }
+    }
+
+    public void testNotificationManagerBubble_checkIsBubbled_shortcut()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            setUpNotifListener();
+
+            SendBubbleActivity a = startSendBubbleActivity();
+
+            // Prep to find bubbled activity
+            Instrumentation.ActivityMonitor monitor = startBubbledActivityMonitor();
+
+            a.sendBubble(BUBBLE_NOTIF_ID, true /* autoExpand */,
+                    false /* suppressNotif */,
+                    false /* suppressBubble */,
+                    true /* useShortcut */,
+                    true /* setLocus */);
+
+            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
+
+            BubbledActivity activity = (BubbledActivity) monitor.waitForActivity();
+            assertTrue(activity.isLaunchedFromBubble());
+        } finally {
+            deleteShortcuts();
+            cleanupSendBubbleActivity();
+        }
+    }
+
+    /** Verifies the bubble is suppressed when it should be. */
+    public void testNotificationManagerBubble_setSuppressBubble()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            setUpNotifListener();
+
+            final int notifId = 3;
+
+            // Make a bubble
+            SendBubbleActivity a = startSendBubbleActivity();
+            a.sendBubble(notifId,
+                    false /* autoExpand */,
+                    false /* suppressNotif */,
+                    true /* suppressBubble */);
+
+            verifyNotificationBubbleState(notifId, true /* shouldBeBubble */);
+            mListener.resetData();
+
+            // Launch same activity as whats in the bubble
+            BubbledActivity activity = startBubbleActivity(notifId);
+
+            // It should have the locusId
+            assertEquals(new LocusId(String.valueOf(notifId)),
+                    activity.getLocusId());
+
+            // notif gets posted with update, so wait
+            verifyNotificationBubbleState(notifId, true /* shouldBeBubble */);
+            mListener.resetData();
+
+            // Bubble should have suppressed flag
+            StatusBarNotification sbn = findPostedNotification(notifId, true);
+            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
+            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
+        } finally {
+            deleteShortcuts();
+            cleanupSendBubbleActivity();
+        }
+    }
+
+    /** Verifies the bubble is not suppressed if dev didn't specify suppressable */
+    public void testNotificationManagerBubble_setSuppressBubble_notSuppressable()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            setUpNotifListener();
+
+            // Make a bubble
+            SendBubbleActivity a = startSendBubbleActivity();
+            a.sendBubble(BUBBLE_NOTIF_ID,
+                    false /* autoExpand */,
+                    false /* suppressNotif */,
+                    false /* suppressBubble */);
+
+            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
+            mListener.resetData();
+
+            // Launch same activity as whats in the bubble
+            BubbledActivity activity = startBubbleActivity(BUBBLE_NOTIF_ID);
+
+            // It should have the locusId
+            assertEquals(new LocusId(String.valueOf(BUBBLE_NOTIF_ID)),
+                    activity.getLocusId());
+
+            // Wait a little (if it wrongly updates it'd be a new post so wait for that))
+            sleep();
+            assertTrue(mListener.mPosted.isEmpty());
+
+            // Bubble should not be suppressed
+            StatusBarNotification sbn = findPostedNotification(BUBBLE_NOTIF_ID, true);
+            assertFalse(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
+            assertFalse(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
+        } finally {
+            deleteShortcuts();
+            cleanupSendBubbleActivity();
+        }
+    }
+
+    /** Verifies the bubble is not suppressed if the activity doesn't have a locusId. */
+    public void testNotificationManagerBubble_setSuppressBubble_activityNoLocusId()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            setUpNotifListener();
+
+            // Make a bubble
+            SendBubbleActivity a = startSendBubbleActivity();
+            a.sendBubble(BUBBLE_NOTIF_ID,
+                    false /* autoExpand */,
+                    false /* suppressNotif */,
+                    true /* suppressBubble */);
+
+            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
+            mListener.resetData();
+
+            // Launch same activity as whats in the bubble
+            BubbledActivity activity = startBubbleActivity(BUBBLE_NOTIF_ID, false /* addLocusId */);
+
+            // It shouldn't have the locusId
+            assertNull(activity.getLocusId());
+
+            // Wait a little (if it wrongly updates it'd be a new post so wait for that))
+            sleep();
+            assertTrue(mListener.mPosted.isEmpty());
+
+            // Bubble should not be suppressed
+            StatusBarNotification sbn = findPostedNotification(BUBBLE_NOTIF_ID, true);
+            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
+            assertFalse(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
+        } finally {
+            deleteShortcuts();
+            cleanupSendBubbleActivity();
+        }
+    }
+
+    /** Verifies the bubble is not suppressed if the notification doesn't have a locusId. */
+    public void testNotificationManagerBubble_setSuppressBubble_notificationNoLocusId()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            setUpNotifListener();
+
+            // Make a bubble
+            SendBubbleActivity a = startSendBubbleActivity();
+            a.sendBubble(BUBBLE_NOTIF_ID,
+                    false /* autoExpand */,
+                    false /* suppressNotif */,
+                    true /* suppressBubble */,
+                    false /* useShortcut */,
+                    false /* setLocusId */);
+
+            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
+            mListener.resetData();
+
+            // Launch same activity as whats in the bubble
+            BubbledActivity activity = startBubbleActivity(BUBBLE_NOTIF_ID, true /* addLocusId */);
+
+            // Activity has the locus
+            assertNotNull(activity.getLocusId());
+
+            // Wait a little (if it wrongly updates it'd be a new post so wait for that))
+            sleep();
+            assertTrue(mListener.mPosted.isEmpty());
+
+            // Bubble should not be suppressed & not have a locusId
+            StatusBarNotification sbn = findPostedNotification(BUBBLE_NOTIF_ID, true);
+            assertNull(sbn.getNotification().getLocusId());
+            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
+            assertFalse(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
+        } finally {
+            deleteShortcuts();
+            cleanupSendBubbleActivity();
+        }
+    }
+
+    /** Verifies the bubble is unsuppressed when the locus activity is hidden. */
+    public void testNotificationManagerBubble_setSuppressBubble_dismissLocusActivity()
+            throws Exception {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            allowAllNotificationsToBubble();
+
+            createDynamicShortcut();
+            setUpNotifListener();
+
+            final int notifId = 2;
+
+            // Make a bubble
+            SendBubbleActivity a = startSendBubbleActivity();
+            a.sendBubble(notifId,
+                    false /* autoExpand */,
+                    false /* suppressNotif */,
+                    true /* suppressBubble */);
+
+            verifyNotificationBubbleState(notifId, true);
+            mListener.resetData();
+
+            StatusBarNotification sbn = findPostedNotification(notifId, true);
+            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
+            assertFalse(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
+
+            // Launch same activity as whats in the bubble
+            BubbledActivity activity = startBubbleActivity(notifId);
+
+            // It should have the locusId
+            assertEquals(new LocusId(String.valueOf(notifId)),
+                    activity.getLocusId());
+
+            // notif gets posted with update, so wait
+            verifyNotificationBubbleState(notifId, true /* shouldBeBubble */);
+            mListener.resetData();
+
+            // Bubble should have suppressed flag
+            sbn = findPostedNotification(notifId, true);
+            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
+            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
+
+            activity.finish();
+
+            // notif gets posted with update, so wait
+            verifyNotificationBubbleState(notifId, true /* shouldBeBubble */);
+            mListener.resetData();
+
+            sbn = findPostedNotification(notifId, true);
+            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
+            assertFalse(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
+        } finally {
+            deleteShortcuts();
+            cleanupSendBubbleActivity();
+        }
+    }
+
+    /** Verifies that a regular activity can't specify a bubble in ActivityOptions */
+    public void testNotificationManagerBubble_launchBubble_activityOptions_fails() {
+        if (!isBubblesFeatureSupported()) {
+            return;
+        }
+        try {
+            // Start test activity
+            SendBubbleActivity activity = startSendBubbleActivity();
+            assertFalse(activity.isLaunchedFromBubble());
+
+            // Should have exception
+            assertThrows(SecurityException.class, () -> {
+                Intent i = new Intent(mContext, BubbledActivity.class);
+                ActivityOptions options = ActivityOptions.makeBasic();
+                Bundle b = options.toBundle();
+                b.putBoolean("android.activity.launchTypeBubble", true);
+                activity.startActivity(i, b);
+            });
+        } finally {
+            cleanupSendBubbleActivity();
+        }
+    }
+}
diff --git a/tests/app/src/android/app/cts/NotificationManagerTest.java b/tests/app/src/android/app/cts/NotificationManagerTest.java
index e3c5c9a..edfa47e 100755
--- a/tests/app/src/android/app/cts/NotificationManagerTest.java
+++ b/tests/app/src/android/app/cts/NotificationManagerTest.java
@@ -16,10 +16,9 @@
 
 package android.app.cts;
 
-import static android.app.Notification.FLAG_BUBBLE;
-import static android.app.NotificationManager.BUBBLE_PREFERENCE_ALL;
-import static android.app.NotificationManager.BUBBLE_PREFERENCE_NONE;
-import static android.app.NotificationManager.BUBBLE_PREFERENCE_SELECTED;
+import static android.Manifest.permission.POST_NOTIFICATIONS;
+import static android.Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL;
+import static android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS;
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
 import static android.app.NotificationManager.IMPORTANCE_HIGH;
 import static android.app.NotificationManager.IMPORTANCE_LOW;
@@ -39,6 +38,7 @@
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MEDIA;
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_MESSAGES;
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REMINDERS;
+import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS;
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_SYSTEM;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_AMBIENT;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;
@@ -50,56 +50,35 @@
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_STATUS_BAR;
 import static android.app.cts.android.app.cts.tools.NotificationHelper.MAX_WAIT_TIME;
 import static android.app.cts.android.app.cts.tools.NotificationHelper.SHORT_WAIT_TIME;
-import static android.app.stubs.BubblesTestService.EXTRA_TEST_CASE;
-import static android.app.stubs.BubblesTestService.TEST_CALL;
-import static android.app.stubs.BubblesTestService.TEST_MESSAGING;
-import static android.app.stubs.SendBubbleActivity.BUBBLE_NOTIF_ID;
-import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.content.pm.PackageManager.FEATURE_WATCH;
 
 import static org.hamcrest.CoreMatchers.hasItem;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertThrows;
 
 import android.Manifest;
-import android.app.ActivityManager;
-import android.app.ActivityOptions;
 import android.app.AutomaticZenRule;
-import android.app.Instrumentation;
-import android.app.KeyguardManager;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
 import android.app.NotificationManager.Policy;
 import android.app.PendingIntent;
-import android.app.Person;
-import android.app.UiAutomation;
 import android.app.cts.android.app.cts.tools.FutureServiceConnection;
-import android.app.cts.android.app.cts.tools.NotificationHelper;
 import android.app.role.RoleManager;
 import android.app.stubs.AutomaticZenRuleActivity;
-import android.app.stubs.BubbledActivity;
-import android.app.stubs.BubblesTestService;
+import android.app.stubs.GetResultActivity;
 import android.app.stubs.R;
-import android.app.stubs.SendBubbleActivity;
+import android.app.stubs.TestNotificationAssistant;
 import android.app.stubs.TestNotificationListener;
-import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.LocusId;
 import android.content.OperationApplicationException;
 import android.content.ServiceConnection;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ShortcutInfo;
-import android.content.pm.ShortcutManager;
 import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -109,16 +88,15 @@
 import android.media.session.MediaSession;
 import android.net.Uri;
 import android.os.Build;
-import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
 import android.os.Message;
 import android.os.Messenger;
-import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
-import android.os.SystemClock;
 import android.os.UserHandle;
+import android.permission.PermissionManager;
+import android.permission.cts.PermissionUtils;
 import android.platform.test.annotations.AsbSecurityTest;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds.Email;
@@ -126,15 +104,12 @@
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
 import android.provider.ContactsContract.Data;
 import android.provider.Settings;
-import android.provider.Telephony.Threads;
 import android.service.notification.Condition;
 import android.service.notification.NotificationListenerService;
 import android.service.notification.StatusBarNotification;
 import android.service.notification.ZenPolicy;
 import android.support.test.uiautomator.UiDevice;
-import android.test.AndroidTestCase;
 import android.util.ArrayMap;
-import android.util.ArraySet;
 import android.util.Log;
 import android.widget.RemoteViews;
 
@@ -142,7 +117,6 @@
 import androidx.annotation.Nullable;
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.android.compatibility.common.util.FeatureUtil;
 import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.SystemUtil;
 import com.android.compatibility.common.util.ThrowingSupplier;
@@ -151,9 +125,7 @@
 import com.google.common.base.Preconditions;
 
 import java.io.BufferedReader;
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -162,11 +134,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
-import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Semaphore;
@@ -175,23 +145,19 @@
 
 /* This tests NotificationListenerService together with NotificationManager, as you need to have
  * notifications to manipulate in order to test the listener service. */
-public class NotificationManagerTest extends AndroidTestCase {
+public class NotificationManagerTest extends BaseNotificationManagerTest {
     public static final String NOTIFICATIONPROVIDER = "com.android.test.notificationprovider";
     public static final String RICH_NOTIFICATION_ACTIVITY =
             "com.android.test.notificationprovider.RichNotificationActivity";
     final String TAG = NotificationManagerTest.class.getSimpleName();
     final boolean DEBUG = false;
-    static final String NOTIFICATION_CHANNEL_ID = "NotificationManagerTest";
 
-    private static final String DELEGATOR = "com.android.test.notificationdelegator";
-    private static final String DELEGATE_POST_CLASS = DELEGATOR + ".NotificationDelegateAndPost";
-    private static final String REVOKE_CLASS = DELEGATOR + ".NotificationRevoker";
-    private static final String SHARE_SHORTCUT_ID = "shareShortcut";
-    private static final String SHARE_SHORTCUT_CATEGORY =
-            "android.app.stubs.SHARE_SHORTCUT_CATEGORY";
-    // use a value of 10000 for consistency with other CTS tests (see
-    // android.server.wm.intentLaunchRunner#ACTIVITY_LAUNCH_TIMEOUT)
-    private static final int ACTIVITY_LAUNCH_TIMEOUT = 10000;
+    private static final String TEST_APP = "com.android.test.notificationapp";
+    private static final String DELEGATE_POST_CLASS = TEST_APP + ".NotificationDelegateAndPost";
+    private static final String REVOKE_CLASS = TEST_APP + ".NotificationRevoker";
+    private static final String MATCHES_CALL_FILTER_CLASS =
+            TEST_APP + ".MatchesCallFilterTestActivity";
+    private static final String MINIMAL_LISTENER_CLASS = TEST_APP + ".TestNotificationListener";
 
     private static final String TRAMPOLINE_APP =
             "com.android.test.notificationtrampoline.current";
@@ -204,67 +170,45 @@
             new ComponentName(TRAMPOLINE_APP_API_30,
                     "com.android.test.notificationtrampoline.NotificationTrampolineTestService");
 
+    private static final String STUB_PACKAGE_NAME = "android.app.stubs";
+
     private static final long TIMEOUT_LONG_MS = 10000;
     private static final long TIMEOUT_MS = 4000;
     private static final int MESSAGE_BROADCAST_NOTIFICATION = 1;
     private static final int MESSAGE_SERVICE_NOTIFICATION = 2;
     private static final int MESSAGE_CLICK_NOTIFICATION = 3;
 
-    private PackageManager mPackageManager;
-    private AudioManager mAudioManager;
-    private RoleManager mRoleManager;
-    private NotificationManager mNotificationManager;
-    private ActivityManager mActivityManager;
+    // Constants for creating contacts
+    private static final String ALICE = "Alice";
+    private static final String ALICE_PHONE = "+16175551212";
+    private static final String ALICE_EMAIL = "alice@_foo._bar";
+    private static final String BOB = "Bob";
+    private static final String BOB_PHONE = "+16175553434";
+    private static final String BOB_EMAIL = "bob@_foo._bar";
+
+    // Constants for GetResultActivity and return codes from MatchesCallFilterTestActivity
+    // the permitted/not permitted values need to stay the same as in the test activity.
+    private static final int REQUEST_CODE = 42;
+    private static final int MATCHES_CALL_FILTER_NOT_PERMITTED = 0;
+    private static final int MATCHES_CALL_FILTER_PERMITTED = 1;
+
     private String mId;
-    private TestNotificationListener mListener;
-    private List<String> mRuleIds;
-    private BroadcastReceiver mBubbleBroadcastReceiver;
-    private boolean mBubblesEnabledSettingToRestore;
     private INotificationUriAccessService mNotificationUriAccessService;
     private FutureServiceConnection mTrampolineConnection;
-    private NotificationHelper mNotificationHelper;
 
     @Nullable
     private List<String> mPreviousDefaultBrowser;
-    private Instrumentation mInstrumentation;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        PermissionUtils.grantPermission(mContext.getPackageName(), POST_NOTIFICATIONS);
+        PermissionUtils.grantPermission(STUB_PACKAGE_NAME, POST_NOTIFICATIONS);
+        PermissionUtils.grantPermission(TEST_APP, POST_NOTIFICATIONS);
+        PermissionUtils.grantPermission(TRAMPOLINE_APP, POST_NOTIFICATIONS);
+        PermissionUtils.grantPermission(NOTIFICATIONPROVIDER, POST_NOTIFICATIONS);
         // This will leave a set of channels on the device with each test run.
         mId = UUID.randomUUID().toString();
-        mNotificationManager = (NotificationManager) mContext.getSystemService(
-                Context.NOTIFICATION_SERVICE);
-        mNotificationHelper = new NotificationHelper(mContext, () -> mListener);
-        // clear the deck so that our getActiveNotifications results are predictable
-        mNotificationManager.cancelAll();
-
-        assertEquals("Previous test left system in a bad state",
-                0, mNotificationManager.getActiveNotifications().length);
-
-        mNotificationManager.createNotificationChannel(new NotificationChannel(
-                NOTIFICATION_CHANNEL_ID, "name", IMPORTANCE_DEFAULT));
-        mActivityManager = (ActivityManager) mContext.getSystemService(Context.ACTIVITY_SERVICE);
-        mPackageManager = mContext.getPackageManager();
-        mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
-        mRoleManager = mContext.getSystemService(RoleManager.class);
-        mRuleIds = new ArrayList<>();
-
-        // ensure listener access isn't allowed before test runs (other tests could put
-        // TestListener in an unexpected state)
-        toggleListenerAccess(false);
-        mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        toggleNotificationPolicyAccess(mContext.getPackageName(), mInstrumentation, true);
-        mNotificationManager.setInterruptionFilter(INTERRUPTION_FILTER_ALL);
-        toggleNotificationPolicyAccess(mContext.getPackageName(), mInstrumentation, false);
-
-        // This setting is forced on / off for certain tests, save it & restore what's on the
-        // device after tests are run
-        mBubblesEnabledSettingToRestore = Settings.Secure.getInt(mContext.getContentResolver(),
-                Settings.Secure.NOTIFICATION_BUBBLES) == 1;
-
-        // Ensure that the tests are exempt from global service-related rate limits
-        setEnableServiceNotificationRateLimit(false);
 
         // delay between tests so notifications aren't dropped by the rate limiter
         try {
@@ -277,39 +221,6 @@
     protected void tearDown() throws Exception {
         super.tearDown();
 
-        setEnableServiceNotificationRateLimit(true);
-
-        mNotificationManager.cancelAll();
-        for (String id : mRuleIds) {
-            mNotificationManager.removeAutomaticZenRule(id);
-        }
-
-        assertExpectedDndState(INTERRUPTION_FILTER_ALL);
-
-        List<NotificationChannel> channels = mNotificationManager.getNotificationChannels();
-        // Delete all channels.
-        for (NotificationChannel nc : channels) {
-            if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(nc.getId())) {
-                continue;
-            }
-            mNotificationManager.deleteNotificationChannel(nc.getId());
-        }
-
-        // Unsuspend package if it was suspended in the test
-        suspendPackage(mContext.getPackageName(), mInstrumentation, false);
-
-        toggleListenerAccess(false);
-        toggleNotificationPolicyAccess(mContext.getPackageName(), mInstrumentation, false);
-
-        List<NotificationChannelGroup> groups = mNotificationManager.getNotificationChannelGroups();
-        // Delete all groups.
-        for (NotificationChannelGroup ncg : groups) {
-            mNotificationManager.deleteNotificationChannelGroup(ncg.getId());
-        }
-
-        // Restore bubbles setting
-        setBubblesGlobal(mBubblesEnabledSettingToRestore);
-
         // For trampoline tests
         if (mTrampolineConnection != null) {
             mContext.unbindService(mTrampolineConnection);
@@ -322,6 +233,20 @@
         if (mPreviousDefaultBrowser != null) {
             restoreDefaultBrowser();
         }
+
+        // Use test API to prevent PermissionManager from killing the test process when revoking
+        // permission.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> mContext.getSystemService(PermissionManager.class)
+                        .revokePostNotificationPermissionWithoutKillForTest(
+                                mContext.getPackageName(),
+                                android.os.Process.myUserHandle().getIdentifier()),
+                REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL,
+                REVOKE_RUNTIME_PERMISSIONS);
+        PermissionUtils.revokePermission(STUB_PACKAGE_NAME, POST_NOTIFICATIONS);
+        PermissionUtils.revokePermission(TEST_APP, POST_NOTIFICATIONS);
+        PermissionUtils.revokePermission(TRAMPOLINE_APP, POST_NOTIFICATIONS);
+        PermissionUtils.revokePermission(NOTIFICATIONPROVIDER, POST_NOTIFICATIONS);
     }
 
     private void assertNotificationCancelled(int id, boolean all) {
@@ -357,6 +282,7 @@
             builder.withValue(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE);
             builder.withValue(Phone.TYPE, Phone.TYPE_MOBILE);
             builder.withValue(Phone.NUMBER, phone);
+            builder.withValue(Phone.NORMALIZED_NUMBER, phone);
             builder.withValue(Data.IS_PRIMARY, 1);
             operationList.add(builder.build());
         }
@@ -417,8 +343,12 @@
         return null;
     }
 
-    private StatusBarNotification findPostedNotification(int id, boolean all) {
-        return mNotificationHelper.findPostedNotification(id, all);
+    // Simple helper function to take a phone number's string representation and make a tel: uri
+    private Uri makePhoneUri(String phone) {
+        return new Uri.Builder()
+                .scheme("tel")
+                .encodedOpaquePart(phone)  // don't re-encode anything passed in
+                .build();
     }
 
     private StatusBarNotification findNotificationNoWait(int id, boolean all) {
@@ -431,7 +361,8 @@
 
     private PendingIntent getPendingIntent() {
         return PendingIntent.getActivity(
-                getContext(), 0, new Intent(getContext(), this.getClass()), PendingIntent.FLAG_MUTABLE_UNAUDITED);
+                getContext(), 0, new Intent(getContext(), this.getClass()),
+                PendingIntent.FLAG_MUTABLE_UNAUDITED);
     }
 
     private boolean isGroupSummary(Notification n) {
@@ -499,105 +430,6 @@
         }
     }
 
-    private void sendNotification(final int id, final int icon) throws Exception {
-        sendNotification(id, null, icon);
-    }
-
-    private void sendNotification(final int id, String groupKey, final int icon) throws Exception {
-        final Intent intent = new Intent(Intent.ACTION_MAIN, Threads.CONTENT_URI);
-
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP
-                | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.setAction(Intent.ACTION_MAIN);
-
-        final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent,
-                PendingIntent.FLAG_MUTABLE);
-        final Notification notification =
-                new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
-                        .setSmallIcon(icon)
-                        .setWhen(System.currentTimeMillis())
-                        .setContentTitle("notify#" + id)
-                        .setContentText("This is #" + id + "notification  ")
-                        .setContentIntent(pendingIntent)
-                        .setGroup(groupKey)
-                        .build();
-        mNotificationManager.notify(id, notification);
-
-        if (!checkNotificationExistence(id, /*shouldExist=*/ true)) {
-            fail("couldn't find posted notification id=" + id);
-        }
-    }
-
-    private void setUpNotifListener() {
-        try {
-            toggleListenerAccess(true);
-            mListener = TestNotificationListener.getInstance();
-            assertNotNull(mListener);
-            mListener.resetData();
-        } catch (IOException e) {
-        }
-    }
-
-    private void sendAndVerifyBubble(final int id, Notification.Builder builder,
-            Notification.BubbleMetadata data, boolean shouldBeBubble) {
-        setUpNotifListener();
-
-        final Intent intent = new Intent(mContext, BubbledActivity.class);
-
-        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_SINGLE_TOP
-                | Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        intent.setAction(Intent.ACTION_MAIN);
-        final PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED);
-
-        if (data == null) {
-            data = new Notification.BubbleMetadata.Builder(pendingIntent,
-                    Icon.createWithResource(mContext, R.drawable.black))
-                    .build();
-        }
-        if (builder == null) {
-            builder = new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
-                    .setSmallIcon(R.drawable.black)
-                    .setWhen(System.currentTimeMillis())
-                    .setContentTitle("notify#" + id)
-                    .setContentText("This is #" + id + "notification  ")
-                    .setContentIntent(pendingIntent);
-        }
-        builder.setBubbleMetadata(data);
-
-        Notification notif = builder.build();
-        mNotificationManager.notify(id, notif);
-
-        verifyNotificationBubbleState(id, shouldBeBubble);
-    }
-
-    /**
-     * Make sure {@link #setUpNotifListener()} is called prior to sending the notif and verifying
-     * in this method.
-     */
-    private void verifyNotificationBubbleState(int id, boolean shouldBeBubble) {
-        try {
-            // FLAG_BUBBLE relies on notification being posted, wait for notification listener
-            Thread.sleep(500);
-        } catch (InterruptedException ex) {
-        }
-
-        for (StatusBarNotification sbn : mListener.mPosted) {
-            if (sbn.getId() == id) {
-                boolean isBubble = (sbn.getNotification().flags & FLAG_BUBBLE) != 0;
-                if (isBubble != shouldBeBubble) {
-                    final String failure = shouldBeBubble
-                            ? "Notification with id= " + id + " wasn't a bubble"
-                            : "Notification with id= " + id + " was a bubble and shouldn't be";
-                    fail(failure);
-                } else {
-                    // pass
-                    return;
-                }
-            }
-        }
-        fail("Couldn't find posted notification with id= " + id);
-    }
-
     private int getCancellationReason(String key) {
         for (int tries = 3; tries-- > 0; ) {
             if (mListener.mRemoved.containsKey(key)) {
@@ -612,30 +444,18 @@
         return -1;
     }
 
-    private boolean checkNotificationExistence(int id, boolean shouldExist) {
-        // notification is a bit asynchronous so it may take a few ms to appear in
-        // getActiveNotifications()
-        // we will check for it for up to 300ms before giving up
-        boolean found = false;
+    private int getAssistantCancellationReason(String key) {
         for (int tries = 3; tries-- > 0; ) {
-            // Need reset flag.
-            found = false;
-            final StatusBarNotification[] sbns = mNotificationManager.getActiveNotifications();
-            for (StatusBarNotification sbn : sbns) {
-                Log.d(TAG, "Found " + sbn.getKey());
-                if (sbn.getId() == id) {
-                    found = true;
-                    break;
-                }
+            if (mAssistant.mRemoved.containsKey(key)) {
+                return mAssistant.mRemoved.get(key);
             }
-            if (found == shouldExist) break;
             try {
-                Thread.sleep(100);
+                Thread.sleep(1000);
             } catch (InterruptedException ex) {
                 // pass
             }
         }
-        return found == shouldExist;
+        return -1;
     }
 
     private void assertNotificationCount(int expectedCount) {
@@ -686,51 +506,6 @@
         assertEquals(expected.isDemoted(), actual.isDemoted());
     }
 
-    private void setEnableServiceNotificationRateLimit(boolean enable) throws IOException {
-        String command = "cmd activity fgs-notification-rate-limit "
-                + (enable ? "enable" : "disable");
-
-        runCommand(command, InstrumentationRegistry.getInstrumentation());
-    }
-
-    private void toggleNotificationPolicyAccess(String packageName,
-            Instrumentation instrumentation, boolean on) throws IOException {
-
-        String command = " cmd notification " + (on ? "allow_dnd " : "disallow_dnd ") + packageName;
-
-        runCommand(command, instrumentation);
-
-        NotificationManager nm = mContext.getSystemService(NotificationManager.class);
-        assertEquals("Notification Policy Access Grant is "
-                + nm.isNotificationPolicyAccessGranted() + " not " + on + " for "
-                + packageName,  on, nm.isNotificationPolicyAccessGranted());
-    }
-
-    private void suspendPackage(String packageName,
-            Instrumentation instrumentation, boolean suspend) throws IOException {
-        int userId = mContext.getUserId();
-        String command = " cmd package " + (suspend ? "suspend " : "unsuspend ")
-                + "--user " + userId + " " + packageName;
-
-        runCommand(command, instrumentation);
-    }
-
-    private void toggleListenerAccess(boolean on) throws IOException {
-        toggleListenerAccess(mContext, on);
-    }
-
-    public static void toggleListenerAccess(Context context, boolean on) throws IOException {
-        String command = " cmd notification " + (on ? "allow_listener " : "disallow_listener ")
-                + TestNotificationListener.getId();
-
-        runCommand(command, InstrumentationRegistry.getInstrumentation());
-
-        final NotificationManager nm = context.getSystemService(NotificationManager.class);
-        final ComponentName listenerComponent = TestNotificationListener.getComponentName();
-        assertEquals(listenerComponent + " has incorrect listener access",
-                on, nm.isNotificationListenerAccessGranted(listenerComponent));
-    }
-
     private void toggleExternalListenerAccess(ComponentName listenerComponent, boolean on)
             throws IOException {
         String command = " cmd notification " + (on ? "allow_listener " : "disallow_listener ")
@@ -738,54 +513,22 @@
         runCommand(command, InstrumentationRegistry.getInstrumentation());
     }
 
-    private void setBubblesGlobal(boolean enabled)
-            throws InterruptedException {
-        SystemUtil.runWithShellPermissionIdentity(() ->
-                Settings.Secure.putInt(mContext.getContentResolver(),
-                        Settings.Secure.NOTIFICATION_BUBBLES, enabled ? 1 : 0));
-        Thread.sleep(500); // wait for ranking update
+    private boolean hasReadContactsPermission(String pkgName) {
+        return mPackageManager.checkPermission(
+                Manifest.permission.READ_CONTACTS, pkgName)
+                == PackageManager.PERMISSION_GRANTED;
     }
 
-    private void setBubblesAppPref(int pref) throws Exception {
-        int userId = mContext.getUser().getIdentifier();
-        String pkg = mContext.getPackageName();
-        String command = " cmd notification set_bubbles " + pkg
-                + " " + Integer.toString(pref)
-                + " " + userId;
-        runCommand(command, InstrumentationRegistry.getInstrumentation());
-        Thread.sleep(500); // wait for ranking update
-    }
-
-    private void setBubblesChannelAllowed(boolean allowed) throws Exception {
-        int userId = mContext.getUser().getIdentifier();
-        String pkg = mContext.getPackageName();
-        String command = " cmd notification set_bubbles_channel " + pkg
-                + " " + NOTIFICATION_CHANNEL_ID
-                + " " + Boolean.toString(allowed)
-                + " " + userId;
-        runCommand(command, InstrumentationRegistry.getInstrumentation());
-        Thread.sleep(500); // wait for ranking update
-    }
-
-    @SuppressWarnings("StatementWithEmptyBody")
-    private static void runCommand(String command, Instrumentation instrumentation)
-            throws IOException {
-        UiAutomation uiAutomation = instrumentation.getUiAutomation();
-        // Execute command
-        try (ParcelFileDescriptor fd = uiAutomation.executeShellCommand(command)) {
-            assertNotNull("Failed to execute shell command: " + command, fd);
-            // Wait for the command to finish by reading until EOF
-            try (InputStream in = new FileInputStream(fd.getFileDescriptor())) {
-                byte[] buffer = new byte[4096];
-                while (in.read(buffer) > 0) {
-                    // discard output
-                }
-            } catch (IOException e) {
-                throw new IOException("Could not read stdout of command: " + command, e);
+    private void toggleReadContactsPermission(String pkgName, boolean on) {
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            if (on) {
+                mInstrumentation.getUiAutomation().grantRuntimePermission(pkgName,
+                        "android.permission.READ_CONTACTS");
+            } else {
+                mInstrumentation.getUiAutomation().revokeRuntimePermission(pkgName,
+                        "android.permission.READ_CONTACTS");
             }
-        } finally {
-            uiAutomation.destroy();
-        }
+        });
     }
 
     private boolean areRulesSame(AutomaticZenRule a, AutomaticZenRule b) {
@@ -811,133 +554,15 @@
         return createRule(name, INTERRUPTION_FILTER_PRIORITY);
     }
 
-    private void assertExpectedDndState(int expectedState) {
-        int tries = 3;
-        for (int i = tries; i >= 0; i--) {
-            if (expectedState ==
-                    mNotificationManager.getCurrentInterruptionFilter()) {
-                break;
-            }
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-
-        assertEquals(expectedState, mNotificationManager.getCurrentInterruptionFilter());
-    }
-
-    /** Creates a dynamic, longlived, sharing shortcut. Call {@link #deleteShortcuts()} after. */
-    private void createDynamicShortcut() {
-        Person person = new Person.Builder()
-                .setBot(false)
-                .setIcon(Icon.createWithResource(mContext, R.drawable.icon_black))
-                .setName("BubbleBot")
-                .setImportant(true)
-                .build();
-
-        Set<String> categorySet = new ArraySet<>();
-        categorySet.add(SHARE_SHORTCUT_CATEGORY);
-        Intent shortcutIntent = new Intent(mContext, BubbledActivity.class);
-        shortcutIntent.setAction(Intent.ACTION_VIEW);
-
-        ShortcutInfo shortcut = new ShortcutInfo.Builder(mContext, SHARE_SHORTCUT_ID)
-                .setShortLabel(SHARE_SHORTCUT_ID)
-                .setIcon(Icon.createWithResource(mContext, R.drawable.icon_black))
-                .setIntent(shortcutIntent)
-                .setPerson(person)
-                .setCategories(categorySet)
-                .setLongLived(true)
-                .build();
-
-        ShortcutManager scManager =
-                (ShortcutManager) mContext.getSystemService(Context.SHORTCUT_SERVICE);
-        scManager.addDynamicShortcuts(Arrays.asList(shortcut));
-    }
-
-    private void deleteShortcuts() {
-        ShortcutManager scManager =
-                (ShortcutManager) mContext.getSystemService(Context.SHORTCUT_SERVICE);
-        scManager.removeAllDynamicShortcuts();
-        scManager.removeLongLivedShortcuts(Collections.singletonList(SHARE_SHORTCUT_ID));
-    }
-
-    /**
-     * Notification fulfilling conversation policy; for the shortcut to be valid
-     * call {@link #createDynamicShortcut()}
-     */
-    private Notification.Builder getConversationNotification() {
-        Person person = new Person.Builder()
-                .setName("bubblebot")
-                .build();
-        Notification.Builder nb = new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
-                .setContentTitle("foo")
-                .setShortcutId(SHARE_SHORTCUT_ID)
-                .setStyle(new Notification.MessagingStyle(person)
-                        .setConversationTitle("Bubble Chat")
-                        .addMessage("Hello?",
-                                SystemClock.currentThreadTimeMillis() - 300000, person)
-                        .addMessage("Is it me you're looking for?",
-                                SystemClock.currentThreadTimeMillis(), person)
-                )
-                .setSmallIcon(android.R.drawable.sym_def_app_icon);
-        return nb;
-    }
-
-    /**
-     * Starts an activity that is able to send a bubble; also handles unlocking the device.
-     * Any tests that use this method should be sure to call {@link #cleanupSendBubbleActivity()}
-     * to unregister the related broadcast receiver.
-     *
-     * @return the SendBubbleActivity that was opened.
-     */
-    private SendBubbleActivity startSendBubbleActivity() {
-        final CountDownLatch latch = new CountDownLatch(2);
-        mBubbleBroadcastReceiver = new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                latch.countDown();
-            }
-        };
-        IntentFilter filter = new IntentFilter(SendBubbleActivity.BUBBLE_ACTIVITY_OPENED);
-        mContext.registerReceiver(mBubbleBroadcastReceiver, filter);
-
-        // Start & get the activity
-        Class clazz = SendBubbleActivity.class;
-
-        Instrumentation.ActivityResult result =
-                new Instrumentation.ActivityResult(0, new Intent());
-        Instrumentation.ActivityMonitor monitor =
-                new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
-        InstrumentationRegistry.getInstrumentation().addMonitor(monitor);
-
-        Intent i = new Intent(mContext, SendBubbleActivity.class);
-        i.setFlags(FLAG_ACTIVITY_NEW_TASK);
-        InstrumentationRegistry.getInstrumentation().startActivitySync(i);
-        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
-
-        SendBubbleActivity sendBubbleActivity = (SendBubbleActivity) monitor.waitForActivity();
-
-        // Make sure device is unlocked
-        KeyguardManager keyguardManager = mContext.getSystemService(KeyguardManager.class);
-        keyguardManager.requestDismissKeyguard(sendBubbleActivity,
-                new KeyguardManager.KeyguardDismissCallback() {
-                    @Override
-                    public void onDismissSucceeded() {
-                        latch.countDown();
-                    }
-                });
-        try {
-            latch.await(500, TimeUnit.MILLISECONDS);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-        return sendBubbleActivity;
-    }
-
-    private void cleanupSendBubbleActivity() {
-        mContext.unregisterReceiver(mBubbleBroadcastReceiver);
+    // Creates a GetResultActivity into which one can call startActivityForResult with
+    // in order to test the outcome of an activity that returns a result code.
+    private GetResultActivity setUpGetResultActivity() {
+        final Intent intent = new Intent(mContext, GetResultActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        GetResultActivity activity = (GetResultActivity) mInstrumentation.startActivitySync(intent);
+        mInstrumentation.waitForIdleSync();
+        activity.clearResult();
+        return activity;
     }
 
     private void sendTrampolineMessage(ComponentName component, int message,
@@ -1627,52 +1252,6 @@
         mListener.resetData();
     }
 
-    public void testCanBubble_ranking() throws Exception {
-        if ((mActivityManager.isLowRamDevice() && !FeatureUtil.isWatch())
-                || FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            return;
-        }
-
-        // turn on bubbles globally
-        setBubblesGlobal(true);
-
-        assertEquals(1, Settings.Secure.getInt(
-                mContext.getContentResolver(), Settings.Secure.NOTIFICATION_BUBBLES));
-
-        toggleListenerAccess(true);
-        Thread.sleep(500); // wait for listener to be allowed
-
-        mListener = TestNotificationListener.getInstance();
-        assertNotNull(mListener);
-
-        sendNotification(1, R.drawable.black);
-        Thread.sleep(500); // wait for notification listener to receive notification
-        NotificationListenerService.RankingMap rankingMap = mListener.mRankingMap;
-        NotificationListenerService.Ranking outRanking =
-                new NotificationListenerService.Ranking();
-        for (String key : rankingMap.getOrderedKeys()) {
-            if (key.contains(mListener.getPackageName())) {
-                rankingMap.getRanking(key, outRanking);
-                // by default nothing can bubble
-                assertFalse(outRanking.canBubble());
-            }
-        }
-
-        // turn off bubbles globally
-        setBubblesGlobal(false);
-
-        rankingMap = mListener.mRankingMap;
-        outRanking = new NotificationListenerService.Ranking();
-        for (String key : rankingMap.getOrderedKeys()) {
-            if (key.contains(mListener.getPackageName())) {
-                rankingMap.getRanking(key, outRanking);
-                assertFalse(outRanking.canBubble());
-            }
-        }
-
-        mListener.resetData();
-    }
-
     public void testShowBadging_ranking() throws Exception {
         final int originalBadging = Settings.Secure.getInt(
                 mContext.getContentResolver(), Settings.Secure.NOTIFICATION_BADGING);
@@ -1865,7 +1444,8 @@
         // Wait for the notification posted not just enqueued
         try {
             Thread.sleep(500);
-        } catch(InterruptedException e) {}
+        } catch (InterruptedException e) {
+        }
         mNotificationManager.cancel(id);
 
         if (!checkNotificationExistence(id, /*shouldExist=*/ false)) {
@@ -2537,7 +2117,7 @@
     public void testNotificationDelegate_grantAndPost() throws Exception {
         // grant this test permission to post
         final Intent activityIntent = new Intent();
-        activityIntent.setPackage(DELEGATOR);
+        activityIntent.setPackage(TEST_APP);
         activityIntent.setAction(Intent.ACTION_MAIN);
         activityIntent.addCategory(Intent.CATEGORY_LAUNCHER);
         activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -2550,11 +2130,11 @@
         Notification n = new Notification.Builder(mContext, "channel")
                 .setSmallIcon(android.R.id.icon)
                 .build();
-        mNotificationManager.notifyAsPackage(DELEGATOR, "tag", 0, n);
+        mNotificationManager.notifyAsPackage(TEST_APP, "tag", 0, n);
 
         assertNotNull(findPostedNotification(0, false));
         final Intent revokeIntent = new Intent();
-        revokeIntent.setClassName(DELEGATOR, REVOKE_CLASS);
+        revokeIntent.setClassName(TEST_APP, REVOKE_CLASS);
         revokeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         mContext.startActivity(revokeIntent);
         Thread.sleep(1000);
@@ -2563,7 +2143,7 @@
     public void testNotificationDelegate_grantAndPostAndCancel() throws Exception {
         // grant this test permission to post
         final Intent activityIntent = new Intent();
-        activityIntent.setPackage(DELEGATOR);
+        activityIntent.setPackage(TEST_APP);
         activityIntent.setAction(Intent.ACTION_MAIN);
         activityIntent.addCategory(Intent.CATEGORY_LAUNCHER);
         activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -2576,12 +2156,12 @@
         Notification n = new Notification.Builder(mContext, "channel")
                 .setSmallIcon(android.R.id.icon)
                 .build();
-        mNotificationManager.notifyAsPackage(DELEGATOR, "toBeCanceled", 10000, n);
+        mNotificationManager.notifyAsPackage(TEST_APP, "toBeCanceled", 10000, n);
         assertNotNull(findPostedNotification(10000, false));
-        mNotificationManager.cancelAsPackage(DELEGATOR, "toBeCanceled", 10000);
+        mNotificationManager.cancelAsPackage(TEST_APP, "toBeCanceled", 10000);
         assertNotificationCancelled(10000, false);
         final Intent revokeIntent = new Intent();
-        revokeIntent.setClassName(DELEGATOR, REVOKE_CLASS);
+        revokeIntent.setClassName(TEST_APP, REVOKE_CLASS);
         revokeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         mContext.startActivity(revokeIntent);
         Thread.sleep(1000);
@@ -2597,7 +2177,7 @@
 
         // grant this test permission to post
         final Intent activityIntent = new Intent();
-        activityIntent.setClassName(DELEGATOR, DELEGATE_POST_CLASS);
+        activityIntent.setClassName(TEST_APP, DELEGATE_POST_CLASS);
         activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
         mContext.startActivity(activityIntent);
@@ -2607,7 +2187,7 @@
         assertNotNull(findPostedNotification(9, true));
 
         try {
-            mNotificationManager.cancelAsPackage(DELEGATOR, null, 9);
+            mNotificationManager.cancelAsPackage(TEST_APP, null, 9);
             fail("Delegate should not be able to cancel notification they did not post");
         } catch (SecurityException e) {
             // yay
@@ -2617,7 +2197,7 @@
         assertNotNull(findPostedNotification(9, true));
 
         final Intent revokeIntent = new Intent();
-        revokeIntent.setClassName(DELEGATOR, REVOKE_CLASS);
+        revokeIntent.setClassName(TEST_APP, REVOKE_CLASS);
         revokeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         mContext.startActivity(revokeIntent);
         Thread.sleep(1000);
@@ -2626,7 +2206,7 @@
     public void testNotificationDelegate_grantAndReadChannels() throws Exception {
         // grant this test permission to post
         final Intent activityIntent = new Intent();
-        activityIntent.setPackage(DELEGATOR);
+        activityIntent.setPackage(TEST_APP);
         activityIntent.setAction(Intent.ACTION_MAIN);
         activityIntent.addCategory(Intent.CATEGORY_LAUNCHER);
         activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -2636,14 +2216,14 @@
         Thread.sleep(500);
 
         List<NotificationChannel> channels =
-                mContext.createPackageContextAsUser(DELEGATOR, /* flags= */ 0, mContext.getUser())
+                mContext.createPackageContextAsUser(TEST_APP, /* flags= */ 0, mContext.getUser())
                         .getSystemService(NotificationManager.class)
                         .getNotificationChannels();
 
         assertNotNull(channels);
 
         final Intent revokeIntent = new Intent();
-        revokeIntent.setClassName(DELEGATOR, REVOKE_CLASS);
+        revokeIntent.setClassName(TEST_APP, REVOKE_CLASS);
         revokeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         mContext.startActivity(revokeIntent);
         Thread.sleep(500);
@@ -2652,7 +2232,7 @@
     public void testNotificationDelegate_grantAndReadChannel() throws Exception {
         // grant this test permission to post
         final Intent activityIntent = new Intent();
-        activityIntent.setPackage(DELEGATOR);
+        activityIntent.setPackage(TEST_APP);
         activityIntent.setAction(Intent.ACTION_MAIN);
         activityIntent.addCategory(Intent.CATEGORY_LAUNCHER);
         activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -2662,14 +2242,14 @@
         Thread.sleep(2000);
 
         NotificationChannel channel =
-                mContext.createPackageContextAsUser(DELEGATOR, /* flags= */ 0, mContext.getUser())
+                mContext.createPackageContextAsUser(TEST_APP, /* flags= */ 0, mContext.getUser())
                         .getSystemService(NotificationManager.class)
                         .getNotificationChannel("channel");
 
         assertNotNull(channel);
 
         final Intent revokeIntent = new Intent();
-        revokeIntent.setClassName(DELEGATOR, REVOKE_CLASS);
+        revokeIntent.setClassName(TEST_APP, REVOKE_CLASS);
         revokeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         mContext.startActivity(revokeIntent);
         Thread.sleep(500);
@@ -2678,7 +2258,7 @@
     public void testNotificationDelegate_grantAndRevoke() throws Exception {
         // grant this test permission to post
         final Intent activityIntent = new Intent();
-        activityIntent.setPackage(DELEGATOR);
+        activityIntent.setPackage(TEST_APP);
         activityIntent.setAction(Intent.ACTION_MAIN);
         activityIntent.addCategory(Intent.CATEGORY_LAUNCHER);
         activityIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -2686,10 +2266,10 @@
         mContext.startActivity(activityIntent);
         Thread.sleep(500);
 
-        assertTrue(mNotificationManager.canNotifyAsPackage(DELEGATOR));
+        assertTrue(mNotificationManager.canNotifyAsPackage(TEST_APP));
 
         final Intent revokeIntent = new Intent();
-        revokeIntent.setClassName(DELEGATOR, REVOKE_CLASS);
+        revokeIntent.setClassName(TEST_APP, REVOKE_CLASS);
         revokeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         mContext.startActivity(revokeIntent);
         Thread.sleep(500);
@@ -2699,53 +2279,13 @@
             Notification n = new Notification.Builder(mContext, "channel")
                     .setSmallIcon(android.R.id.icon)
                     .build();
-            mNotificationManager.notifyAsPackage(DELEGATOR, "tag", 0, n);
+            mNotificationManager.notifyAsPackage(TEST_APP, "tag", 0, n);
             fail("Should not be able to post as a delegate when permission revoked");
         } catch (SecurityException e) {
             // yay
         }
     }
 
-    public void testAreBubblesAllowed_appNone() throws Exception {
-        setBubblesAppPref(BUBBLE_PREFERENCE_NONE);
-        assertFalse(mNotificationManager.areBubblesAllowed());
-    }
-
-    public void testAreBubblesAllowed_appSelected() throws Exception {
-        setBubblesAppPref(BUBBLE_PREFERENCE_SELECTED);
-        assertFalse(mNotificationManager.areBubblesAllowed());
-    }
-
-    public void testAreBubblesAllowed_appAll() throws Exception {
-        setBubblesAppPref(BUBBLE_PREFERENCE_ALL);
-        assertTrue(mNotificationManager.areBubblesAllowed());
-    }
-
-    public void testGetBubblePreference_appNone() throws Exception {
-        setBubblesAppPref(BUBBLE_PREFERENCE_NONE);
-        assertEquals(BUBBLE_PREFERENCE_NONE, mNotificationManager.getBubblePreference());
-    }
-
-    public void testGetBubblePreference_appSelected() throws Exception {
-        setBubblesAppPref(BUBBLE_PREFERENCE_SELECTED);
-        assertEquals(BUBBLE_PREFERENCE_SELECTED, mNotificationManager.getBubblePreference());
-    }
-
-    public void testGetBubblePreference_appAll() throws Exception {
-        setBubblesAppPref(BUBBLE_PREFERENCE_ALL);
-        assertEquals(BUBBLE_PREFERENCE_ALL, mNotificationManager.getBubblePreference());
-    }
-
-    public void testAreBubblesEnabled() throws Exception {
-        setBubblesGlobal(true);
-        assertTrue(mNotificationManager.areBubblesEnabled());
-    }
-
-    public void testAreBubblesEnabled_false() throws Exception {
-        setBubblesGlobal(false);
-        assertFalse(mNotificationManager.areBubblesEnabled());
-    }
-
     public void testNotificationIcon() {
         int id = 6000;
 
@@ -2786,44 +2326,425 @@
         mNotificationManager.shouldHideSilentStatusBarIcons();
     }
 
-    public void testMatchesCallFilter() throws Exception {
+    public void testMatchesCallFilter_noPermissions() {
+        // make sure we definitely don't have contacts access
+        boolean hadReadPerm = hasReadContactsPermission(TEST_APP);
+        try {
+            toggleReadContactsPermission(TEST_APP, false);
+
+            // start an activity that has no permissions, which will run matchesCallFilter on
+            // a meaningless uri. The result code indicates whether or not the method call was
+            // permitted.
+            final Intent mcfIntent = new Intent();
+            mcfIntent.setPackage(TEST_APP);
+            mcfIntent.setClassName(TEST_APP, MATCHES_CALL_FILTER_CLASS);
+            GetResultActivity grActivity = setUpGetResultActivity();
+            grActivity.startActivityForResult(mcfIntent, REQUEST_CODE);
+            UiDevice.getInstance(mInstrumentation).waitForIdle();
+
+            // with no permissions, this call should not have been permitted
+            GetResultActivity.Result result = grActivity.getResult();
+            assertEquals(REQUEST_CODE, result.requestCode);
+            assertEquals(MATCHES_CALL_FILTER_NOT_PERMITTED, result.resultCode);
+            grActivity.finishActivity(REQUEST_CODE);
+        } finally {
+            toggleReadContactsPermission(TEST_APP, hadReadPerm);
+        }
+    }
+
+    public void testMatchesCallFilter_listenerPermissionOnly() throws Exception {
+        boolean hadReadPerm = hasReadContactsPermission(TEST_APP);
+        // minimal listener service so that it can be given listener permissions
+        final ComponentName listenerComponent =
+                new ComponentName(TEST_APP, MINIMAL_LISTENER_CLASS);
+        try {
+            // make surethat we don't for some reason have contacts access
+            toggleReadContactsPermission(TEST_APP, false);
+
+            // grant the notification app package notification listener access;
+            // give it time to succeed
+            toggleExternalListenerAccess(listenerComponent, true);
+            Thread.sleep(500);
+
+            // set up & run intent
+            final Intent mcfIntent = new Intent();
+            mcfIntent.setPackage(TEST_APP);
+            mcfIntent.setClassName(TEST_APP, MATCHES_CALL_FILTER_CLASS);
+            GetResultActivity grActivity = setUpGetResultActivity();
+            grActivity.startActivityForResult(mcfIntent, REQUEST_CODE);
+            UiDevice.getInstance(mInstrumentation).waitForIdle();
+
+            // with just listener permissions, this call should have been permitted
+            GetResultActivity.Result result = grActivity.getResult();
+            assertEquals(REQUEST_CODE, result.requestCode);
+            assertEquals(MATCHES_CALL_FILTER_PERMITTED, result.resultCode);
+            grActivity.finishActivity(REQUEST_CODE);
+        } finally {
+            // clean up listener access, reset read contacts access
+            toggleExternalListenerAccess(listenerComponent, false);
+            toggleReadContactsPermission(TEST_APP, hadReadPerm);
+        }
+    }
+
+    public void testMatchesCallFilter_contactsPermissionOnly() throws Exception {
+        // grant the notification app package contacts read access
+        boolean hadReadPerm = hasReadContactsPermission(TEST_APP);
+        try {
+            toggleReadContactsPermission(TEST_APP, true);
+
+            // set up & run intent
+            final Intent mcfIntent = new Intent();
+            mcfIntent.setPackage(TEST_APP);
+            mcfIntent.setClassName(TEST_APP, MATCHES_CALL_FILTER_CLASS);
+            GetResultActivity grActivity = setUpGetResultActivity();
+            grActivity.startActivityForResult(mcfIntent, REQUEST_CODE);
+            UiDevice.getInstance(mInstrumentation).waitForIdle();
+
+            // with just contacts read permissions, this call should have been permitted
+            GetResultActivity.Result result = grActivity.getResult();
+            assertEquals(REQUEST_CODE, result.requestCode);
+            assertEquals(MATCHES_CALL_FILTER_PERMITTED, result.resultCode);
+            grActivity.finishActivity(REQUEST_CODE);
+        } finally {
+            // clean up contacts access
+            toggleReadContactsPermission(TEST_APP, hadReadPerm);
+        }
+    }
+
+    public void testMatchesCallFilter_zenOff() throws Exception {
+        // zen mode is not on so nothing is filtered; matchesCallFilter should always pass
+        toggleNotificationPolicyAccess(mContext.getPackageName(),
+                InstrumentationRegistry.getInstrumentation(), true);
+        int origFilter = mNotificationManager.getCurrentInterruptionFilter();
+        try {
+            // allowed from anyone: nothing is filtered, and make sure change went through
+            mNotificationManager.setInterruptionFilter(INTERRUPTION_FILTER_ALL);
+            assertExpectedDndState(INTERRUPTION_FILTER_ALL);
+
+            // create a phone URI from which to receive a call
+            Uri phoneUri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI,
+                    Uri.encode("+16175551212"));
+            assertTrue(mNotificationManager.matchesCallFilter(phoneUri));
+        } finally {
+            mNotificationManager.setInterruptionFilter(origFilter);
+        }
+    }
+
+    public void testMatchesCallFilter_noCallInterruptions() throws Exception {
+        // when no call interruptions are allowed at all, or only alarms, matchesCallFilter
+        // should always fail
+        toggleNotificationPolicyAccess(mContext.getPackageName(),
+                InstrumentationRegistry.getInstrumentation(), true);
+        int origFilter = mNotificationManager.getCurrentInterruptionFilter();
+        Policy origPolicy = mNotificationManager.getNotificationPolicy();
+        try {
+            // create a phone URI from which to receive a call
+            Uri phoneUri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI,
+                    Uri.encode("+16175551212"));
+
+            // no interruptions allowed at all
+            mNotificationManager.setInterruptionFilter(INTERRUPTION_FILTER_NONE);
+            assertExpectedDndState(INTERRUPTION_FILTER_NONE);
+            assertFalse(mNotificationManager.matchesCallFilter(phoneUri));
+
+            // only alarms
+            mNotificationManager.setInterruptionFilter(INTERRUPTION_FILTER_ALARMS);
+            assertExpectedDndState(INTERRUPTION_FILTER_ALARMS);
+            assertFalse(mNotificationManager.matchesCallFilter(phoneUri));
+
+            mNotificationManager.setNotificationPolicy(new NotificationManager.Policy(
+                    PRIORITY_CATEGORY_MESSAGES, 0, 0));
+            // turn on manual DND
+            mNotificationManager.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY);
+            assertExpectedDndState(INTERRUPTION_FILTER_PRIORITY);
+            assertFalse(mNotificationManager.matchesCallFilter(phoneUri));
+        } finally {
+            mNotificationManager.setInterruptionFilter(origFilter);
+            mNotificationManager.setNotificationPolicy(origPolicy);
+        }
+    }
+
+    public void testMatchesCallFilter_someCallers() throws Exception {
+        // zen mode is active; check various configurations where some calls, but not all calls,
+        // are allowed
+        toggleNotificationPolicyAccess(mContext.getPackageName(),
+                InstrumentationRegistry.getInstrumentation(), true);
+        int origFilter = mNotificationManager.getCurrentInterruptionFilter();
+        Policy origPolicy = mNotificationManager.getNotificationPolicy();
+
+        // for storing lookup URIs for deleting the contacts afterwards
+        Uri aliceUri = null;
+        Uri bobUri = null;
+        try {
+            // set up phone numbers: one starred, one regular, one unknown number
+            // starred contact from whom to receive a call
+            insertSingleContact(ALICE, ALICE_PHONE, ALICE_EMAIL, true);
+            aliceUri = lookupContact(ALICE_PHONE);
+            Uri alicePhoneUri = makePhoneUri(ALICE_PHONE);
+
+            // non-starred contact from whom to also receive a call
+            insertSingleContact(BOB, BOB_PHONE, BOB_EMAIL, false);
+            bobUri = lookupContact(BOB_PHONE);
+            Uri bobPhoneUri = makePhoneUri(BOB_PHONE);
+
+            // non-contact phone URI
+            Uri phoneUri = makePhoneUri("+16175555656");
+
+            // set up: any contacts are allowed to call.
+            mNotificationManager.setNotificationPolicy(new NotificationManager.Policy(
+                    PRIORITY_CATEGORY_CALLS,
+                    NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS, 0));
+
+            // turn on manual DND
+            mNotificationManager.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY);
+            assertExpectedDndState(INTERRUPTION_FILTER_PRIORITY);
+
+            // in this case Alice and Bob should get through but not the unknown number.
+            assertTrue(mNotificationManager.matchesCallFilter(alicePhoneUri));
+            assertTrue(mNotificationManager.matchesCallFilter(bobPhoneUri));
+            assertFalse(mNotificationManager.matchesCallFilter(phoneUri));
+
+            // set up: only starred contacts are allowed to call.
+            mNotificationManager.setNotificationPolicy(new NotificationManager.Policy(
+                    PRIORITY_CATEGORY_CALLS,
+                    NotificationManager.Policy.PRIORITY_SENDERS_STARRED, 0));
+            assertExpectedDndState(INTERRUPTION_FILTER_PRIORITY);
+
+            // now only Alice should be allowed to get through
+            assertTrue(mNotificationManager.matchesCallFilter(alicePhoneUri));
+            assertFalse(mNotificationManager.matchesCallFilter(bobPhoneUri));
+            assertFalse(mNotificationManager.matchesCallFilter(phoneUri));
+        } finally {
+            mNotificationManager.setInterruptionFilter(origFilter);
+            mNotificationManager.setNotificationPolicy(origPolicy);
+            if (aliceUri != null) {
+                // delete the contact
+                deleteSingleContact(aliceUri);
+            }
+            if (bobUri != null) {
+                deleteSingleContact(bobUri);
+            }
+        }
+    }
+
+    public void testMatchesCallFilter_repeatCallers() throws Exception {
+        // if repeat callers are allowed, an unknown number calling twice should go through
+        toggleNotificationPolicyAccess(mContext.getPackageName(),
+                InstrumentationRegistry.getInstrumentation(), true);
+        int origFilter = mNotificationManager.getCurrentInterruptionFilter();
+        Policy origPolicy = mNotificationManager.getNotificationPolicy();
+        long startTime = System.currentTimeMillis();
+        try {
+            // create phone URIs from which to receive a call; one US, one non-US,
+            // both fully specified
+            Uri phoneUri = makePhoneUri("+16175551212");
+            Uri phoneUri2 = makePhoneUri("+81 75 350 6006");
+
+            mNotificationManager.setNotificationPolicy(new NotificationManager.Policy(
+                    PRIORITY_CATEGORY_REPEAT_CALLERS, 0, 0));
+            // turn on manual DND
+            mNotificationManager.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY);
+            assertExpectedDndState(INTERRUPTION_FILTER_PRIORITY);
+
+            // not repeat callers yet, so it shouldn't be allowed
+            assertFalse(mNotificationManager.matchesCallFilter(phoneUri));
+            assertFalse(mNotificationManager.matchesCallFilter(phoneUri2));
+
+            // register a call from number 1, then cancel the notification, which is when
+            // a call is actually recorded.
+            sendNotification(1, null, R.drawable.blue, true, phoneUri);
+            cancelAndPoll(1);
+
+            // now this number should count as a repeat caller
+            assertTrue(mNotificationManager.matchesCallFilter(phoneUri));
+            assertFalse(mNotificationManager.matchesCallFilter(phoneUri2));
+
+            // also, any other variants of this phone number should also count as a repeat caller
+            Uri[] variants = { makePhoneUri(Uri.encode("+1-617-555-1212")),
+                    makePhoneUri("+1 (617) 555-1212") };
+            for (int i = 0; i < variants.length; i++) {
+                assertTrue("phone variant " + variants[i] + " should still match",
+                        mNotificationManager.matchesCallFilter(variants[i]));
+            }
+
+            // register call 2
+            sendNotification(2, null, R.drawable.blue, true, phoneUri2);
+            cancelAndPoll(2);
+
+            // now this should be a repeat caller
+            assertTrue(mNotificationManager.matchesCallFilter(phoneUri2));
+
+            Uri[] variants2 = { makePhoneUri(Uri.encode("+81 75 350 6006")),
+                    makePhoneUri("+81753506006")};
+            for (int j = 0; j < variants2.length; j++) {
+                assertTrue("phone variant " + variants2[j] + " should still match",
+                        mNotificationManager.matchesCallFilter(variants2[j]));
+            }
+        } finally {
+            mNotificationManager.setInterruptionFilter(origFilter);
+            mNotificationManager.setNotificationPolicy(origPolicy);
+
+            // make sure we clean up the recent call, otherwise future runs of this will fail
+            // and we'll have a fake call still kicking around somewhere.
+            SystemUtil.runWithShellPermissionIdentity(() ->
+                    mNotificationManager.cleanUpCallersAfter(startTime));
+        }
+    }
+
+    public void testMatchesCallFilter_repeatCallers_fromContact() throws Exception {
+        // set up such that only repeat callers (and not any individuals) are allowed; make sure
+        // that a call registered with a contact's lookup URI will return the correct info
+        // when matchesCallFilter is called with their phone number
+        toggleNotificationPolicyAccess(mContext.getPackageName(),
+                InstrumentationRegistry.getInstrumentation(), true);
+        int origFilter = mNotificationManager.getCurrentInterruptionFilter();
+        Policy origPolicy = mNotificationManager.getNotificationPolicy();
+        Uri aliceUri = null;
+        long startTime = System.currentTimeMillis();
+        try {
+            mNotificationManager.setNotificationPolicy(new NotificationManager.Policy(
+                    PRIORITY_CATEGORY_REPEAT_CALLERS, 0, 0));
+            // turn on manual DND
+            mNotificationManager.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY);
+            assertExpectedDndState(INTERRUPTION_FILTER_PRIORITY);
+
+            insertSingleContact(ALICE, ALICE_PHONE, ALICE_EMAIL, false);
+            aliceUri = lookupContact(ALICE_PHONE);
+            Uri alicePhoneUri = makePhoneUri(ALICE_PHONE);
+
+            // no one has called; matchesCallFilter should return false for both URIs
+            assertFalse(mNotificationManager.matchesCallFilter(aliceUri));
+            assertFalse(mNotificationManager.matchesCallFilter(alicePhoneUri));
+
+            assertTrue(aliceUri.toString()
+                    .startsWith(ContactsContract.Contacts.CONTENT_LOOKUP_URI.toString()));
+
+            // register a call from Alice via the contact lookup URI, then cancel so the call is
+            // recorded accordingly.
+            sendNotification(1, null, R.drawable.blue, true, aliceUri);
+            // wait for contact lookup of number to finish; this can take a while because it runs
+            // in the background, so give it a fair bit of time
+            Thread.sleep(3000);
+            cancelAndPoll(1);
+
+            // now a phone call from Alice's phone number should match the repeat callers list
+            assertTrue(mNotificationManager.matchesCallFilter(alicePhoneUri));
+        } finally {
+            mNotificationManager.setInterruptionFilter(origFilter);
+            mNotificationManager.setNotificationPolicy(origPolicy);
+            if (aliceUri != null) {
+                // delete the contact
+                deleteSingleContact(aliceUri);
+            }
+
+            // clean up the recorded calls
+            SystemUtil.runWithShellPermissionIdentity(() ->
+                    mNotificationManager.cleanUpCallersAfter(startTime));
+        }
+    }
+
+    public void testRepeatCallers_repeatCallNotIntercepted_contactAfterPhone() throws Exception {
+        toggleListenerAccess(true);
+        Thread.sleep(500); // wait for listener to be allowed
+        mListener = TestNotificationListener.getInstance();
+        assertNotNull(mListener);
+
+        // if a call is recorded with just phone number info (not a contact's uri), which may
+        // happen when the same contact calls across multiple apps (or if the contact uri provided
+        // is otherwise inconsistent), check for the contact's phone number
+        toggleNotificationPolicyAccess(mContext.getPackageName(),
+                InstrumentationRegistry.getInstrumentation(), true);
+        int origFilter = mNotificationManager.getCurrentInterruptionFilter();
+        Policy origPolicy = mNotificationManager.getNotificationPolicy();
+        Uri aliceUri = null;
+        long startTime = System.currentTimeMillis();
+        try {
+            mNotificationManager.setNotificationPolicy(new NotificationManager.Policy(
+                    PRIORITY_CATEGORY_REPEAT_CALLERS, 0, 0));
+            // turn on manual DND
+            mNotificationManager.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY);
+            assertExpectedDndState(INTERRUPTION_FILTER_PRIORITY);
+
+            insertSingleContact(ALICE, ALICE_PHONE, ALICE_EMAIL, false);
+            aliceUri = lookupContact(ALICE_PHONE);
+            Uri alicePhoneUri = makePhoneUri(ALICE_PHONE);
+
+            // no one has called; matchesCallFilter should return false for both URIs
+            assertFalse(mNotificationManager.matchesCallFilter(aliceUri));
+            assertFalse(mNotificationManager.matchesCallFilter(alicePhoneUri));
+
+            // register a call from Alice via just the phone number
+            sendNotification(1, null, R.drawable.blue, true, alicePhoneUri);
+            Thread.sleep(1000); // give the listener some time to receive info
+
+            // check that the first notification is intercepted
+            StatusBarNotification sbn = findPostedNotification(1, false);
+            assertNotNull(sbn);
+            assertTrue(mListener.mIntercepted.containsKey(sbn.getKey()));
+            assertTrue(mListener.mIntercepted.get(sbn.getKey()));  // should be intercepted
+
+            // cancel first notification
+            cancelAndPoll(1);
+
+            // now send a call with only Alice's contact Uri as the info
+            // Note that this is a test of the repeat caller check, not matchesCallFilter itself
+            sendNotification(2, null, R.drawable.blue, true, aliceUri);
+            // wait for contact lookup, which may take a while
+            Thread.sleep(3000);
+
+            // now check that the second notification is not intercepted
+            StatusBarNotification sbn2 = findPostedNotification(2, true);
+            assertTrue(mListener.mIntercepted.containsKey(sbn2.getKey()));
+            assertFalse(mListener.mIntercepted.get(sbn2.getKey()));  // should not be intercepted
+
+            // cancel second notification
+            cancelAndPoll(2);
+        } finally {
+            mNotificationManager.setInterruptionFilter(origFilter);
+            mNotificationManager.setNotificationPolicy(origPolicy);
+            if (aliceUri != null) {
+                // delete the contact
+                deleteSingleContact(aliceUri);
+            }
+
+            // clean up the recorded calls
+            SystemUtil.runWithShellPermissionIdentity(() ->
+                    mNotificationManager.cleanUpCallersAfter(startTime));
+        }
+    }
+
+    public void testMatchesCallFilter_allCallers() throws Exception {
         // allow all callers
         toggleNotificationPolicyAccess(mContext.getPackageName(),
                 InstrumentationRegistry.getInstrumentation(), true);
+        int origFilter = mNotificationManager.getCurrentInterruptionFilter();
         Policy origPolicy = mNotificationManager.getNotificationPolicy();
-        Uri aliceUri = null;
+        Uri aliceUri = null;  // for deletion after the test is done
         try {
             NotificationManager.Policy currPolicy = mNotificationManager.getNotificationPolicy();
             NotificationManager.Policy newPolicy = new NotificationManager.Policy(
                     NotificationManager.Policy.PRIORITY_CATEGORY_CALLS
-                            | NotificationManager.Policy.PRIORITY_CATEGORY_REPEAT_CALLERS,
+                            | PRIORITY_CATEGORY_REPEAT_CALLERS,
                     NotificationManager.Policy.PRIORITY_SENDERS_ANY,
                     currPolicy.priorityMessageSenders,
                     currPolicy.suppressedVisualEffects);
             mNotificationManager.setNotificationPolicy(newPolicy);
-
-            // add a contact
-            String ALICE = "Alice";
-            String ALICE_PHONE = "+16175551212";
-            String ALICE_EMAIL = "alice@_foo._bar";
+            mNotificationManager.setInterruptionFilter(INTERRUPTION_FILTER_PRIORITY);
+            assertExpectedDndState(INTERRUPTION_FILTER_PRIORITY);
 
             insertSingleContact(ALICE, ALICE_PHONE, ALICE_EMAIL, false);
-
-            final Bundle peopleExtras = new Bundle();
-            ArrayList<Person> personList = new ArrayList<>();
             aliceUri = lookupContact(ALICE_PHONE);
-            personList.add(new Person.Builder().setUri(aliceUri.toString()).build());
-            peopleExtras.putParcelableArrayList(Notification.EXTRA_PEOPLE_LIST, personList);
-            SystemUtil.runWithShellPermissionIdentity(() ->
-                    assertTrue(mNotificationManager.matchesCallFilter(peopleExtras)));
+
+            Uri alicePhoneUri = makePhoneUri(ALICE_PHONE);
+            assertTrue(mNotificationManager.matchesCallFilter(alicePhoneUri));
         } finally {
+            mNotificationManager.setInterruptionFilter(origFilter);
             mNotificationManager.setNotificationPolicy(origPolicy);
             if (aliceUri != null) {
                 // delete the contact
                 deleteSingleContact(aliceUri);
             }
         }
-
     }
 
     /* Confirm that the optional methods of TestNotificationListener still exist and
@@ -3111,12 +3032,12 @@
 
         StatusBarNotification sbn1 = findPostedNotification(notificationId1, false);
         StatusBarNotification sbn2 = findPostedNotification(notificationId2, false);
-        mListener.setNotificationsShown(new String[]{ sbn1.getKey() });
+        mListener.setNotificationsShown(new String[]{sbn1.getKey()});
 
         toggleListenerAccess(false);
         Thread.sleep(500); // wait for listener to be disallowed
         try {
-            mListener.setNotificationsShown(new String[]{ sbn2.getKey() });
+            mListener.setNotificationsShown(new String[]{sbn2.getKey()});
             fail("Should not be able to set shown if listener access isn't granted");
         } catch (SecurityException e) {
             // expected
@@ -3187,7 +3108,7 @@
         StatusBarNotification sbn1 = findPostedNotification(notificationId1, false);
         StatusBarNotification sbn2 = findPostedNotification(notificationId2, false);
         StatusBarNotification[] notifs =
-                mListener.getActiveNotifications(new String[]{ sbn2.getKey(), sbn1.getKey() });
+                mListener.getActiveNotifications(new String[]{sbn2.getKey(), sbn1.getKey()});
         assertEquals(sbn2.getKey(), notifs[0].getKey());
         assertEquals(sbn2.getId(), notifs[0].getId());
         assertEquals(sbn2.getPackageName(), notifs[0].getPackageName());
@@ -3238,12 +3159,34 @@
             }
         }
 
-        mListener.cancelNotifications(new String[]{ sbn.getKey() });
-        if (!checkNotificationExistence(notificationId, /*shouldExist=*/ false)) {
+        mListener.cancelNotifications(new String[]{sbn.getKey()});
+        if (getCancellationReason(sbn.getKey())
+                != NotificationListenerService.REASON_LISTENER_CANCEL) {
             fail("Failed to cancel notification id=" + notificationId);
         }
     }
 
+    public void testNotificationAssistant_cancelNotifications() throws Exception {
+        toggleAssistantAccess(true);
+        Thread.sleep(500); // wait for assistant to be allowed
+
+        mAssistant = TestNotificationAssistant.getInstance();
+        assertNotNull(mAssistant);
+        final int notificationId = 1006;
+
+        sendNotification(notificationId, R.drawable.black);
+        Thread.sleep(500); // wait for notification listener to receive notification
+
+        StatusBarNotification sbn = findPostedNotification(notificationId, false);
+
+        mAssistant.cancelNotifications(new String[]{sbn.getKey()});
+        int gotReason = getAssistantCancellationReason(sbn.getKey());
+        if (gotReason != NotificationListenerService.REASON_ASSISTANT_CANCEL) {
+            fail("Failed cancellation from assistant, notification id=" + notificationId
+                    + "; got reason=" + gotReason);
+        }
+    }
+
     public void testNotificationManagerPolicy_priorityCategoriesToString() {
         String zeroString = NotificationManager.Policy.priorityCategoriesToString(0);
         assertEquals("priorityCategories of 0 produces empty string", "", zeroString);
@@ -3285,846 +3228,6 @@
                 badNumberString);
     }
 
-    public void testNotificationManagerBubblePolicy_flag_intentBubble()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-            createDynamicShortcut();
-
-            Notification.Builder nb = getConversationNotification();
-            boolean shouldBeBubble = !mActivityManager.isLowRamDevice();
-            sendAndVerifyBubble(1, nb, null /* use default metadata */, shouldBeBubble);
-        } finally {
-            deleteShortcuts();
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_noFlag_service()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        Intent serviceIntent = new Intent(mContext, BubblesTestService.class);
-        serviceIntent.putExtra(EXTRA_TEST_CASE, TEST_MESSAGING);
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            setUpNotifListener();
-
-            mContext.startService(serviceIntent);
-
-            // No services in R (allowed in Q)
-            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, false /* shouldBeBubble */);
-        } finally {
-            deleteShortcuts();
-            mContext.stopService(serviceIntent);
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_noFlag_phonecall()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        Intent serviceIntent = new Intent(mContext, BubblesTestService.class);
-        serviceIntent.putExtra(EXTRA_TEST_CASE, TEST_CALL);
-
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            setUpNotifListener();
-
-            mContext.startService(serviceIntent);
-
-            // No phonecalls in R (allowed in Q)
-            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, false /* shouldBeBubble */);
-        } finally {
-            deleteShortcuts();
-            mContext.stopService(serviceIntent);
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_noFlag_foreground() throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            setUpNotifListener();
-
-            // Start & get the activity
-            SendBubbleActivity a = startSendBubbleActivity();
-            // Send a bubble that doesn't fulfill policy from foreground
-            a.sendInvalidBubble(BUBBLE_NOTIF_ID, false /* autoExpand */);
-
-            // No foreground bubbles that don't fulfill policy in R (allowed in Q)
-            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, false /* shouldBeBubble */);
-        } finally {
-            deleteShortcuts();
-            cleanupSendBubbleActivity();
-        }
-    }
-
-    public void testNotificationManagerBubble_checkActivityFlagsDocumentLaunchMode()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()
-                || mActivityManager.isLowRamDevice()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            setUpNotifListener();
-
-            // make ourselves foreground so we can auto-expand the bubble & check the intent flags
-            SendBubbleActivity a = startSendBubbleActivity();
-
-            // Prep to find bubbled activity
-            Class clazz = BubbledActivity.class;
-            Instrumentation.ActivityResult result =
-                    new Instrumentation.ActivityResult(0, new Intent());
-            Instrumentation.ActivityMonitor monitor =
-                    new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
-            InstrumentationRegistry.getInstrumentation().addMonitor(monitor);
-
-            a.sendBubble(BUBBLE_NOTIF_ID, true /* autoExpand */, false /* suppressNotif */);
-
-            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
-
-            InstrumentationRegistry.getInstrumentation().waitForIdleSync();
-
-            BubbledActivity activity = (BubbledActivity) monitor.waitForActivityWithTimeout(
-                ACTIVITY_LAUNCH_TIMEOUT);
-            assertNotNull(String.format(
-                "Failed to detect BubbleActivity after %d ms", ACTIVITY_LAUNCH_TIMEOUT), activity);
-            assertTrue((activity.getIntent().getFlags() & FLAG_ACTIVITY_NEW_DOCUMENT) != 0);
-            assertTrue((activity.getIntent().getFlags() & FLAG_ACTIVITY_MULTIPLE_TASK) != 0);
-        } finally {
-            deleteShortcuts();
-            cleanupSendBubbleActivity();
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_flag_shortcutBubble()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-
-            Notification.Builder nb = getConversationNotification();
-            Notification.BubbleMetadata data =
-                    new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
-                            .build();
-
-            boolean shouldBeBubble = !mActivityManager.isLowRamDevice();
-            sendAndVerifyBubble(1, nb, data, shouldBeBubble);
-        } finally {
-            deleteShortcuts();
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_noFlag_invalidShortcut()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-
-            Notification.Builder nb = getConversationNotification();
-            nb.setShortcutId("invalid");
-            Notification.BubbleMetadata data =
-                    new Notification.BubbleMetadata.Builder("invalid")
-                            .build();
-
-            sendAndVerifyBubble(1, nb, data, false);
-        } finally {
-            deleteShortcuts();
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_noFlag_invalidNotif()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-
-            Notification.BubbleMetadata data =
-                    new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
-                            .build();
-
-            sendAndVerifyBubble(1, null /* use default notif builder */, data,
-                    false /* shouldBeBubble */);
-        } finally {
-            deleteShortcuts();
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_appAll_globalOn() throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            Notification.BubbleMetadata data =
-                    new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
-                            .build();
-            Notification.Builder nb = getConversationNotification();
-
-            boolean shouldBeBubble = !mActivityManager.isLowRamDevice();
-            sendAndVerifyBubble(1, nb, data, shouldBeBubble);
-        } finally {
-            deleteShortcuts();
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_appAll_globalOff() throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(false);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            Notification.BubbleMetadata data =
-                    new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
-                            .build();
-            Notification.Builder nb = getConversationNotification();
-
-            sendAndVerifyBubble(1, nb, data, false);
-        } finally {
-            deleteShortcuts();
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_appAll_channelNo() throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(false);
-
-            createDynamicShortcut();
-            Notification.BubbleMetadata data =
-                    new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
-                            .build();
-            Notification.Builder nb = getConversationNotification();
-
-            sendAndVerifyBubble(1, nb, data, false);
-        } finally {
-            deleteShortcuts();
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_appSelected_channelNo() throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(2 /* selected */);
-            setBubblesChannelAllowed(false);
-
-            createDynamicShortcut();
-            Notification.BubbleMetadata data =
-                    new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
-                            .build();
-            Notification.Builder nb = getConversationNotification();
-
-            sendAndVerifyBubble(1, nb, data, false);
-        } finally {
-            deleteShortcuts();
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_appSelected_channelYes() throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(2 /* selected */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            Notification.BubbleMetadata data =
-                    new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
-                            .build();
-            Notification.Builder nb = getConversationNotification();
-
-            boolean shouldBeBubble = !mActivityManager.isLowRamDevice();
-            sendAndVerifyBubble(1, nb, data, shouldBeBubble);
-        } finally {
-            deleteShortcuts();
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_appNone_channelNo() throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(0 /* none */);
-            setBubblesChannelAllowed(false);
-
-            createDynamicShortcut();
-            Notification.BubbleMetadata data =
-                    new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
-                            .build();
-            Notification.Builder nb = getConversationNotification();
-
-            sendAndVerifyBubble(1, nb, data, false);
-        } finally {
-            deleteShortcuts();
-        }
-    }
-
-    public void testNotificationManagerBubblePolicy_noFlag_shortcutRemoved()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()
-                    || mActivityManager.isLowRamDevice()) {
-            // These do not support bubbles.
-            return;
-        }
-
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-            createDynamicShortcut();
-            Notification.BubbleMetadata data =
-                    new Notification.BubbleMetadata.Builder(SHARE_SHORTCUT_ID)
-                            .build();
-            Notification.Builder nb = getConversationNotification();
-
-            sendAndVerifyBubble(42, nb, data, true /* shouldBeBubble */);
-            mListener.resetData();
-
-            deleteShortcuts();
-            verifyNotificationBubbleState(42, false /* should be bubble */);
-        } finally {
-            deleteShortcuts();
-        }
-    }
-
-    public void testNotificationManagerBubbleNotificationSuppression() throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()
-                || mActivityManager.isLowRamDevice()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            setUpNotifListener();
-
-            // make ourselves foreground so we can specify suppress notification flag
-            SendBubbleActivity a = startSendBubbleActivity();
-
-            // send the bubble with notification suppressed
-            a.sendBubble(BUBBLE_NOTIF_ID, false /* autoExpand */, true /* suppressNotif */);
-            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
-
-            // check for the notification
-            StatusBarNotification sbnSuppressed = mListener.mPosted.get(0);
-            assertNotNull(sbnSuppressed);
-            // check for suppression state
-            Notification.BubbleMetadata metadata =
-                    sbnSuppressed.getNotification().getBubbleMetadata();
-            assertNotNull(metadata);
-            assertTrue(metadata.isNotificationSuppressed());
-
-            mListener.resetData();
-
-            // send the bubble with notification NOT suppressed
-            a.sendBubble(BUBBLE_NOTIF_ID, false /* autoExpand */, false /* suppressNotif */);
-            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBubble */);
-
-            // check for the notification
-            StatusBarNotification sbnNotSuppressed = mListener.mPosted.get(0);
-            assertNotNull(sbnNotSuppressed);
-            // check for suppression state
-            metadata = sbnNotSuppressed.getNotification().getBubbleMetadata();
-            assertNotNull(metadata);
-            assertFalse(metadata.isNotificationSuppressed());
-        } finally {
-            cleanupSendBubbleActivity();
-            deleteShortcuts();
-        }
-    }
-
-    public void testNotificationManagerBubble_checkIsBubbled_pendingIntent()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()
-                || mActivityManager.isLowRamDevice()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            setUpNotifListener();
-
-            SendBubbleActivity a = startSendBubbleActivity();
-
-            // Prep to find bubbled activity
-            Class clazz = BubbledActivity.class;
-            Instrumentation.ActivityResult result =
-                    new Instrumentation.ActivityResult(0, new Intent());
-            Instrumentation.ActivityMonitor monitor =
-                    new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
-            InstrumentationRegistry.getInstrumentation().addMonitor(monitor);
-
-            a.sendBubble(BUBBLE_NOTIF_ID, true /* autoExpand */, false /* suppressNotif */);
-
-            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
-
-            BubbledActivity activity = (BubbledActivity) monitor.waitForActivity();
-            assertTrue(activity.isLaunchedFromBubble());
-        } finally {
-            deleteShortcuts();
-            cleanupSendBubbleActivity();
-        }
-    }
-
-    public void testNotificationManagerBubble_checkIsBubbled_shortcut()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()
-                || mActivityManager.isLowRamDevice()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            setUpNotifListener();
-
-            SendBubbleActivity a = startSendBubbleActivity();
-
-            // Prep to find bubbled activity
-            Class clazz = BubbledActivity.class;
-            Instrumentation.ActivityResult result =
-                    new Instrumentation.ActivityResult(0, new Intent());
-            Instrumentation.ActivityMonitor monitor =
-                    new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
-            InstrumentationRegistry.getInstrumentation().addMonitor(monitor);
-
-            a.sendBubble(BUBBLE_NOTIF_ID, true /* autoExpand */,
-                    false /* suppressNotif */,
-                    false /* suppressBubble */,
-                    true /* useShortcut */,
-                    true /* setLocus */);
-
-            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
-
-            BubbledActivity activity = (BubbledActivity) monitor.waitForActivity();
-            assertTrue(activity.isLaunchedFromBubble());
-        } finally {
-            deleteShortcuts();
-            cleanupSendBubbleActivity();
-        }
-    }
-
-    /** Verifies the bubble is suppressed when it should be. */
-    public void testNotificationManagerBubble_setSuppressBubble()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()
-                || mActivityManager.isLowRamDevice()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            setUpNotifListener();
-
-            final int notifId = 3;
-
-            // Make a bubble
-            SendBubbleActivity a = startSendBubbleActivity();
-            a.sendBubble(notifId,
-                    false /* autoExpand */,
-                    false /* suppressNotif */,
-                    true /* suppressBubble */);
-
-            verifyNotificationBubbleState(notifId, true /* shouldBeBubble */);
-            mListener.resetData();
-
-            // Prep to find bubbled activity
-            Class clazz = BubbledActivity.class;
-            Instrumentation.ActivityResult result =
-                    new Instrumentation.ActivityResult(0, new Intent());
-            Instrumentation.ActivityMonitor monitor =
-                    new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
-            InstrumentationRegistry.getInstrumentation().addMonitor(monitor);
-
-            // Launch same activity as whats in the bubble
-            a.startBubbleActivity(notifId);
-            BubbledActivity activity = (BubbledActivity) monitor.waitForActivity();
-            InstrumentationRegistry.getInstrumentation().waitForIdleSync();
-
-            // It should have the locusId
-            assertEquals(new LocusId(String.valueOf(notifId)),
-                    activity.getLocusId());
-
-            // notif gets posted with update, so wait
-            verifyNotificationBubbleState(notifId, true /* shouldBeBubble */);
-            mListener.resetData();
-
-            // Bubble should have suppressed flag
-            StatusBarNotification sbn = findPostedNotification(notifId, true);
-            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
-            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
-        } finally {
-            deleteShortcuts();
-            cleanupSendBubbleActivity();
-        }
-    }
-
-    /** Verifies the bubble is not suppressed if dev didn't specify suppressable */
-    public void testNotificationManagerBubble_setSuppressBubble_notSuppressable()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()
-                || mActivityManager.isLowRamDevice()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            setUpNotifListener();
-
-            // Make a bubble
-            SendBubbleActivity a = startSendBubbleActivity();
-            a.sendBubble(BUBBLE_NOTIF_ID,
-                    false /* autoExpand */,
-                    false /* suppressNotif */,
-                    false /* suppressBubble */);
-
-            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
-            mListener.resetData();
-
-            // Prep to find bubbled activity
-            Class clazz = BubbledActivity.class;
-            Instrumentation.ActivityResult result =
-                    new Instrumentation.ActivityResult(0, new Intent());
-            Instrumentation.ActivityMonitor monitor =
-                    new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
-            InstrumentationRegistry.getInstrumentation().addMonitor(monitor);
-
-            // Launch same activity as whats in the bubble
-            a.startBubbleActivity(BUBBLE_NOTIF_ID);
-            BubbledActivity activity = (BubbledActivity) monitor.waitForActivity();
-            InstrumentationRegistry.getInstrumentation().waitForIdleSync();
-
-            // It should have the locusId
-            assertEquals(new LocusId(String.valueOf(BUBBLE_NOTIF_ID)),
-                    activity.getLocusId());
-
-            // Wait a little (if it wrongly updates it'd be a new post so wait for that))
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException ex) {
-            }
-            assertTrue(mListener.mPosted.isEmpty());
-
-            // Bubble should not be suppressed
-            StatusBarNotification sbn = findPostedNotification(BUBBLE_NOTIF_ID, true);
-            assertFalse(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
-            assertFalse(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
-        } finally {
-            deleteShortcuts();
-            cleanupSendBubbleActivity();
-        }
-    }
-
-    /** Verifies the bubble is not suppressed if the activity doesn't have a locusId. */
-    public void testNotificationManagerBubble_setSuppressBubble_activityNoLocusId()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()
-                || mActivityManager.isLowRamDevice()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            setUpNotifListener();
-
-            // Make a bubble
-            SendBubbleActivity a = startSendBubbleActivity();
-            a.sendBubble(BUBBLE_NOTIF_ID,
-                    false /* autoExpand */,
-                    false /* suppressNotif */,
-                    true /* suppressBubble */);
-
-            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
-            mListener.resetData();
-
-            // Prep to find bubbled activity
-            Class clazz = BubbledActivity.class;
-            Instrumentation.ActivityResult result =
-                    new Instrumentation.ActivityResult(0, new Intent());
-            Instrumentation.ActivityMonitor monitor =
-                    new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
-            InstrumentationRegistry.getInstrumentation().addMonitor(monitor);
-
-            // Launch same activity as whats in the bubble
-            a.startBubbleActivity(BUBBLE_NOTIF_ID, false /* addLocusId */);
-            BubbledActivity activity = (BubbledActivity) monitor.waitForActivity();
-            InstrumentationRegistry.getInstrumentation().waitForIdleSync();
-
-            // It shouldn't have the locusId
-            assertNull(activity.getLocusId());
-
-            // Wait a little (if it wrongly updates it'd be a new post so wait for that))
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException ex) {
-            }
-            assertTrue(mListener.mPosted.isEmpty());
-
-            // Bubble should not be suppressed
-            StatusBarNotification sbn = findPostedNotification(BUBBLE_NOTIF_ID, true);
-            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
-            assertFalse(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
-        } finally {
-            deleteShortcuts();
-            cleanupSendBubbleActivity();
-        }
-    }
-
-    /** Verifies the bubble is not suppressed if the notification doesn't have a locusId. */
-    public void testNotificationManagerBubble_setSuppressBubble_notificationNoLocusId()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()
-                || mActivityManager.isLowRamDevice()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            setUpNotifListener();
-
-            // Make a bubble
-            SendBubbleActivity a = startSendBubbleActivity();
-            a.sendBubble(BUBBLE_NOTIF_ID,
-                    false /* autoExpand */,
-                    false /* suppressNotif */,
-                    true /* suppressBubble */,
-                    false /* useShortcut */,
-                    false /* setLocusId */);
-
-            verifyNotificationBubbleState(BUBBLE_NOTIF_ID, true /* shouldBeBubble */);
-            mListener.resetData();
-
-            // Prep to find bubbled activity
-            Class clazz = BubbledActivity.class;
-            Instrumentation.ActivityResult result =
-                    new Instrumentation.ActivityResult(0, new Intent());
-            Instrumentation.ActivityMonitor monitor =
-                    new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
-            InstrumentationRegistry.getInstrumentation().addMonitor(monitor);
-
-            // Launch same activity as whats in the bubble
-            a.startBubbleActivity(BUBBLE_NOTIF_ID, true /* addLocusId */);
-            BubbledActivity activity = (BubbledActivity) monitor.waitForActivity();
-            InstrumentationRegistry.getInstrumentation().waitForIdleSync();
-
-            // Activity has the locus
-            assertNotNull(activity.getLocusId());
-
-            // Wait a little (if it wrongly updates it'd be a new post so wait for that))
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException ex) {
-            }
-            assertTrue(mListener.mPosted.isEmpty());
-
-            // Bubble should not be suppressed & not have a locusId
-            StatusBarNotification sbn = findPostedNotification(BUBBLE_NOTIF_ID, true);
-            assertNull(sbn.getNotification().getLocusId());
-            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
-            assertFalse(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
-        } finally {
-            deleteShortcuts();
-            cleanupSendBubbleActivity();
-        }
-    }
-
-    /** Verifies the bubble is unsuppressed when the locus activity is hidden. */
-    public void testNotificationManagerBubble_setSuppressBubble_dismissLocusActivity()
-            throws Exception {
-        if (FeatureUtil.isAutomotive() || FeatureUtil.isTV()
-                || mActivityManager.isLowRamDevice()) {
-            // These do not support bubbles.
-            return;
-        }
-        try {
-            setBubblesGlobal(true);
-            setBubblesAppPref(1 /* all */);
-            setBubblesChannelAllowed(true);
-
-            createDynamicShortcut();
-            setUpNotifListener();
-
-            final int notifId = 2;
-
-            // Make a bubble
-            SendBubbleActivity a = startSendBubbleActivity();
-            a.sendBubble(notifId,
-                    false /* autoExpand */,
-                    false /* suppressNotif */,
-                    true /* suppressBubble */);
-
-            verifyNotificationBubbleState(notifId, true);
-            mListener.resetData();
-
-            StatusBarNotification sbn = findPostedNotification(notifId, true);
-            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
-            assertFalse(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
-
-            // Prep to find bubbled activity
-            Class clazz = BubbledActivity.class;
-            Instrumentation.ActivityResult result =
-                    new Instrumentation.ActivityResult(0, new Intent());
-            Instrumentation.ActivityMonitor monitor =
-                    new Instrumentation.ActivityMonitor(clazz.getName(), result, false);
-            InstrumentationRegistry.getInstrumentation().addMonitor(monitor);
-
-            // Launch same activity as whats in the bubble
-            a.startBubbleActivity(notifId);
-            BubbledActivity activity = (BubbledActivity) monitor.waitForActivity();
-            InstrumentationRegistry.getInstrumentation().waitForIdleSync();
-
-            // It should have the locusId
-            assertEquals(new LocusId(String.valueOf(notifId)),
-                    activity.getLocusId());
-
-            // notif gets posted with update, so wait
-            verifyNotificationBubbleState(notifId, true /* shouldBeBubble */);
-            mListener.resetData();
-
-            // Bubble should have suppressed flag
-            sbn = findPostedNotification(notifId, true);
-            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
-            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
-
-            activity.finish();
-
-            // notif gets posted with update, so wait
-            verifyNotificationBubbleState(notifId, true /* shouldBeBubble */);
-            mListener.resetData();
-
-            sbn = findPostedNotification(notifId, true);
-            assertTrue(sbn.getNotification().getBubbleMetadata().isBubbleSuppressable());
-            assertFalse(sbn.getNotification().getBubbleMetadata().isBubbleSuppressed());
-        } finally {
-            deleteShortcuts();
-            cleanupSendBubbleActivity();
-        }
-    }
-
-    /** Verifies that a regular activity can't specify a bubble in ActivityOptions */
-    public void testNotificationManagerBubble_launchBubble_activityOptions_fails()
-            throws Exception {
-        try {
-            // Start test activity
-            SendBubbleActivity activity = startSendBubbleActivity();
-            assertFalse(activity.isLaunchedFromBubble());
-
-            // Should have exception
-            assertThrows(SecurityException.class, () -> {
-                Intent i = new Intent(mContext, BubbledActivity.class);
-                ActivityOptions options = ActivityOptions.makeBasic();
-                Bundle b = options.toBundle();
-                b.putBoolean("android.activity.launchTypeBubble", true);
-                activity.startActivity(i, b);
-            });
-        } finally {
-            cleanupSendBubbleActivity();
-        }
-    }
-
     public void testOriginalChannelImportance() {
         NotificationChannel channel = new NotificationChannel(mId, "my channel", IMPORTANCE_HIGH);
 
@@ -4259,7 +3362,7 @@
         // Post notification and fire its pending intent
         sendTrampolineMessage(TRAMPOLINE_SERVICE_API_30, MESSAGE_SERVICE_NOTIFICATION,
                 notificationId, callback);
-        PollingCheck.waitFor(TIMEOUT_MS,  () -> uncheck(() -> {
+        PollingCheck.waitFor(TIMEOUT_MS, () -> uncheck(() -> {
             sendTrampolineMessage(TRAMPOLINE_SERVICE, MESSAGE_CLICK_NOTIFICATION, notificationId,
                     callback);
             // timeoutMs = 1ms below because surrounding waitFor already handles retry & timeout.
@@ -4424,8 +3527,8 @@
         for (PackageInfo pkg : allPackages) {
             if (!pkg.applicationInfo.isSystemApp()
                     && mPackageManager.checkPermission(
-                            Manifest.permission.MANAGE_NOTIFICATION_LISTENERS, pkg.packageName)
-                            == PackageManager.PERMISSION_GRANTED
+                    Manifest.permission.MANAGE_NOTIFICATION_LISTENERS, pkg.packageName)
+                    == PackageManager.PERMISSION_GRANTED
                     && !allowedPackages.contains(pkg.packageName)) {
                 fail(pkg.packageName + " can't hold "
                         + Manifest.permission.MANAGE_NOTIFICATION_LISTENERS);
@@ -4448,6 +3551,76 @@
                 getCancellationReason(key));
     }
 
+    public void testMediaStyleRemotePlayback_noPermission() throws Exception {
+        int id = 99;
+        final String deviceName = "device name";
+        final int deviceIcon = 123;
+        final PendingIntent deviceIntent = getPendingIntent();
+        final Notification notification =
+                new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
+                        .setSmallIcon(R.drawable.black)
+                        .setStyle(new Notification.MediaStyle()
+                                .setRemotePlaybackInfo(deviceName, deviceIcon, deviceIntent))
+                        .build();
+        mNotificationManager.notify(id, notification);
+
+        StatusBarNotification sbn = findPostedNotification(id, false);
+        assertNotNull(sbn);
+
+        assertFalse(sbn.getNotification().extras
+                .containsKey(Notification.EXTRA_MEDIA_REMOTE_DEVICE));
+        assertFalse(sbn.getNotification().extras
+                .containsKey(Notification.EXTRA_MEDIA_REMOTE_ICON));
+        assertFalse(sbn.getNotification().extras
+                .containsKey(Notification.EXTRA_MEDIA_REMOTE_INTENT));
+    }
+
+    public void testMediaStyleRemotePlayback_hasPermission() throws Exception {
+        int id = 99;
+        final String deviceName = "device name";
+        final int deviceIcon = 123;
+        final PendingIntent deviceIntent = getPendingIntent();
+        final Notification notification =
+                new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
+                        .setSmallIcon(R.drawable.black)
+                        .setStyle(new Notification.MediaStyle()
+                                .setRemotePlaybackInfo(deviceName, deviceIcon, deviceIntent))
+                        .build();
+
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            mNotificationManager.notify(id, notification);
+        }, android.Manifest.permission.MEDIA_CONTENT_CONTROL);
+
+        StatusBarNotification sbn = findPostedNotification(id, false);
+        assertNotNull(sbn);
+        assertEquals(deviceName, sbn.getNotification().extras
+                .getString(Notification.EXTRA_MEDIA_REMOTE_DEVICE));
+        assertEquals(deviceIcon, sbn.getNotification().extras
+                .getInt(Notification.EXTRA_MEDIA_REMOTE_ICON));
+        assertEquals(deviceIntent, sbn.getNotification().extras
+                .getParcelable(Notification.EXTRA_MEDIA_REMOTE_INTENT));
+    }
+
+    public void testNoPermission() throws Exception {
+        int id = 7;
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> mContext.getSystemService(PermissionManager.class)
+                        .revokePostNotificationPermissionWithoutKillForTest(
+                                mContext.getPackageName(),
+                                android.os.Process.myUserHandle().getIdentifier()),
+                REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL,
+                REVOKE_RUNTIME_PERMISSIONS);
+
+        final Notification notification =
+                new Notification.Builder(mContext, NOTIFICATION_CHANNEL_ID)
+                        .setSmallIcon(R.drawable.black)
+                        .build();
+        mNotificationManager.notify(id, notification);
+
+        StatusBarNotification sbn = findPostedNotification(id, false);
+        assertNull(sbn);
+    }
+
     private static class EventCallback extends Handler {
         private static final int BROADCAST_RECEIVED = 1;
         private static final int SERVICE_STARTED = 2;
diff --git a/tests/app/src/android/app/cts/NotificationTest.java b/tests/app/src/android/app/cts/NotificationTest.java
index 513c162..d79f909 100644
--- a/tests/app/src/android/app/cts/NotificationTest.java
+++ b/tests/app/src/android/app/cts/NotificationTest.java
@@ -253,8 +253,11 @@
 
     public void testBuilder() {
         final Intent intent = new Intent();
-        final PendingIntent contentIntent = PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_MUTABLE_UNAUDITED);
+        final PendingIntent contentIntent =
+                PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_IMMUTABLE);
         Notification.BubbleMetadata bubble = makeBubbleMetadata();
+        final PendingIntent actionIntent =
+                PendingIntent.getBroadcast(mContext, 0, intent, PendingIntent.FLAG_IMMUTABLE);
         mNotification = new Notification.Builder(mContext, CHANNEL.getId())
                 .setSmallIcon(1)
                 .setContentTitle(CONTENT_TITLE)
@@ -267,6 +270,12 @@
                 .setGroupAlertBehavior(Notification.GROUP_ALERT_SUMMARY)
                 .setBubbleMetadata(bubble)
                 .setAllowSystemGeneratedContextualActions(ALLOW_SYS_GEN_CONTEXTUAL_ACTIONS)
+                .addAction(new Notification.Action.Builder(0, ACTION_TITLE, actionIntent)
+                        .setContextual(true)
+                        .build())
+                .addAction(new Notification.Action.Builder(0, "not contextual", actionIntent)
+                        .setContextual(false)
+                        .build())
                 .build();
         assertEquals(CONTENT_TEXT, mNotification.extras.getString(Notification.EXTRA_TEXT));
         assertEquals(CONTENT_TITLE, mNotification.extras.getString(Notification.EXTRA_TITLE));
@@ -281,6 +290,8 @@
         assertEquals(bubble, mNotification.getBubbleMetadata());
         assertEquals(ALLOW_SYS_GEN_CONTEXTUAL_ACTIONS,
                 mNotification.getAllowSystemGeneratedContextualActions());
+        assertEquals(1, mNotification.getContextualActions().size());
+        assertEquals(ACTION_TITLE, mNotification.getContextualActions().get(0).title);
     }
 
     public void testBuilder_getStyle() {
diff --git a/tests/app/src/android/app/cts/PictureInPictureParamsTest.java b/tests/app/src/android/app/cts/PictureInPictureParamsTest.java
new file mode 100644
index 0000000..56d331d
--- /dev/null
+++ b/tests/app/src/android/app/cts/PictureInPictureParamsTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2022 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 android.app.cts;
+
+import android.app.PendingIntent;
+import android.app.PictureInPictureParams;
+import android.app.RemoteAction;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Rect;
+import android.graphics.drawable.Icon;
+import android.test.AndroidTestCase;
+import android.util.Rational;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PictureInPictureParamsTest extends AndroidTestCase {
+
+    /**
+     * Tests that we get the same values back from the public PictureInPicture params getters that
+     * were set via the PictureInPictureParams.Builder.
+     */
+    public void testPictureInPictureParamsGetters() {
+        ArrayList<RemoteAction> actions = new ArrayList<>();
+        for (int i = 0; i < 4; i++) {
+            actions.add(createRemoteAction(0));
+        }
+
+        assertPictureInPictureParamsGettersMatchValues(
+                actions,
+                createRemoteAction(1),
+                new Rational(1, 2),
+                new Rational(100, 1),
+                "Title",
+                "Subtitle",
+                new Rect(0, 0, 100, 100),
+                true,
+                true);
+    }
+
+    public void testPictureInPictureParamsGettersNullValues() {
+        assertPictureInPictureParamsGettersMatchValues(null, null, null, null, null, null, null,
+                false, false);
+    }
+
+    private void assertPictureInPictureParamsGettersMatchValues(List<RemoteAction> actions,
+            RemoteAction closeAction, Rational aspectRatio, Rational expandedAspectRatio,
+            String title, String subtitle, Rect sourceRectHint, boolean isAutoEnterEnabled,
+            boolean isSeamlessResizeEnabled) {
+
+        PictureInPictureParams params = new PictureInPictureParams.Builder()
+                .setActions(actions)
+                .setCloseAction(closeAction)
+                .setAspectRatio(aspectRatio)
+                .setExpandedAspectRatio(expandedAspectRatio)
+                .setTitle(title)
+                .setSubtitle(subtitle)
+                .setSourceRectHint(sourceRectHint)
+                .setAutoEnterEnabled(isAutoEnterEnabled)
+                .setSeamlessResizeEnabled(isSeamlessResizeEnabled)
+                .build();
+
+        if (actions == null) {
+            assertEquals(new ArrayList<>(), params.getActions());
+        } else {
+            assertEquals(actions, params.getActions());
+        }
+        assertEquals(closeAction, params.getCloseAction());
+        assertEquals(aspectRatio, params.getAspectRatio());
+        assertEquals(expandedAspectRatio, params.getExpandedAspectRatio());
+        assertEquals(title, params.getTitle());
+        assertEquals(subtitle, params.getSubtitle());
+        assertEquals(sourceRectHint, params.getSourceRectHint());
+        assertEquals(isAutoEnterEnabled, params.isAutoEnterEnabled());
+        assertEquals(isSeamlessResizeEnabled, params.isSeamlessResizeEnabled());
+    }
+
+    /** @return {@link RemoteAction} instance titled after a given index */
+    private RemoteAction createRemoteAction(int index) {
+        return new RemoteAction(
+                Icon.createWithBitmap(Bitmap.createBitmap(24, 24, Bitmap.Config.ARGB_8888)),
+                "action " + index,
+                "contentDescription " + index,
+                PendingIntent.getBroadcast(getContext(), 0, new Intent(),
+                        PendingIntent.FLAG_IMMUTABLE));
+    }
+}
diff --git a/tests/app/src/android/app/cts/RequestTileServiceAddTest.kt b/tests/app/src/android/app/cts/RequestTileServiceAddTest.kt
new file mode 100644
index 0000000..e7924bc
--- /dev/null
+++ b/tests/app/src/android/app/cts/RequestTileServiceAddTest.kt
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2021 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 android.app.cts
+
+import android.Manifest.permission.STATUS_BAR
+import android.app.Activity
+import android.app.ActivityManager
+import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND
+import android.app.Instrumentation
+import android.app.StatusBarManager
+import android.app.stubs.MockActivity
+import android.app.stubs.NotExportedTestTileService
+import android.app.stubs.TestTileService
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.graphics.drawable.Icon
+import android.service.quicksettings.TileService
+import androidx.test.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.compatibility.common.util.SystemUtil
+import com.google.common.truth.Truth.assertThat
+import com.google.common.util.concurrent.MoreExecutors
+import org.junit.Assume
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+import java.util.function.Consumer
+
+/**
+ * Test that the request fails in all the expected ways.
+ *
+ * These tests are for [StatusBarManager.requestAddTileService].
+ */
+@RunWith(AndroidJUnit4::class)
+class RequestTileServiceAddTest {
+
+    companion object {
+        private const val LABEL = "label"
+        private const val TIME_OUT_SECONDS = 5L
+    }
+
+    private lateinit var statusBarService: StatusBarManager
+    private lateinit var context: Context
+    private lateinit var icon: Icon
+    private lateinit var consumer: StoreIntConsumer
+    private lateinit var instrumentation: Instrumentation
+    private val executor = MoreExecutors.directExecutor()
+    private lateinit var latch: CountDownLatch
+
+    @Before
+    fun setUp() {
+        Assume.assumeTrue(TileService.isQuickSettingsSupported())
+
+        instrumentation = InstrumentationRegistry.getInstrumentation()
+        context = instrumentation.getTargetContext()
+        statusBarService = context.getSystemService(StatusBarManager::class.java)!!
+
+        icon = Icon.createWithResource(context, R.drawable.ic_android)
+        latch = CountDownLatch(1)
+        consumer = StoreIntConsumer(latch)
+    }
+
+    @Test
+    fun testRequestBadPackageFails() {
+        val componentName = ComponentName("test_pkg", "test_cls")
+
+        statusBarService.requestAddTileService(
+                componentName,
+                LABEL,
+                icon,
+                executor,
+                consumer
+        )
+
+        latch.await(TIME_OUT_SECONDS, TimeUnit.SECONDS)
+
+        assertThat(consumer.result)
+                .isEqualTo(StatusBarManager.TILE_ADD_REQUEST_ERROR_MISMATCHED_PACKAGE)
+    }
+
+    @Test
+    fun testRequestBadComponentName() {
+        val componentName = ComponentName(context, "test_cls")
+        statusBarService.requestAddTileService(
+                componentName,
+                LABEL,
+                icon,
+                executor,
+                consumer
+        )
+
+        latch.await(TIME_OUT_SECONDS, TimeUnit.SECONDS)
+
+        assertThat(consumer.result).isEqualTo(StatusBarManager.TILE_ADD_REQUEST_ERROR_BAD_COMPONENT)
+    }
+
+    @Test
+    fun testDisabledComponent() {
+        val componentName = TestTileService.getComponentName()
+        context.packageManager.setComponentEnabledSetting(
+                componentName,
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.SYNCHRONOUS or PackageManager.DONT_KILL_APP
+        )
+
+        statusBarService.requestAddTileService(
+                componentName,
+                LABEL,
+                icon,
+                executor,
+                consumer
+        )
+
+        latch.await(TIME_OUT_SECONDS, TimeUnit.SECONDS)
+
+        assertThat(consumer.result).isEqualTo(StatusBarManager.TILE_ADD_REQUEST_ERROR_BAD_COMPONENT)
+
+        // Cleanup
+        context.packageManager.setComponentEnabledSetting(
+                componentName,
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT,
+                PackageManager.SYNCHRONOUS or PackageManager.DONT_KILL_APP
+        )
+    }
+
+    @Test
+    fun testNotExportedComponent() {
+        val componentName = NotExportedTestTileService.getComponentName()
+
+        statusBarService.requestAddTileService(
+                componentName,
+                LABEL,
+                icon,
+                executor,
+                consumer
+        )
+
+        latch.await(TIME_OUT_SECONDS, TimeUnit.SECONDS)
+
+        assertThat(consumer.result).isEqualTo(StatusBarManager.TILE_ADD_REQUEST_ERROR_BAD_COMPONENT)
+    }
+
+    @Test
+    fun testAppNotInForeground() {
+        // This test is never run in foreground, so it's a good candidate for testing this
+        val componentName = TestTileService.getComponentName()
+        val activityManager = context.getSystemService(ActivityManager::class.java)!!
+        assertThat(activityManager.getPackageImportance(context.packageName))
+                .isNotEqualTo(IMPORTANCE_FOREGROUND)
+
+        statusBarService.requestAddTileService(
+                componentName,
+                LABEL,
+                icon,
+                executor,
+                consumer
+        )
+
+        latch.await(TIME_OUT_SECONDS, TimeUnit.SECONDS)
+
+        assertThat(consumer.result)
+                .isEqualTo(StatusBarManager.TILE_ADD_REQUEST_ERROR_APP_NOT_IN_FOREGROUND)
+    }
+
+    @Test
+    fun testTwoSimultaneousRequests() {
+        // We need an activity in the foreground for the first request to not be denied
+        val activity = setUpForActivity()
+        val componentName = TestTileService.getComponentName()
+
+        statusBarService.requestAddTileService(
+                componentName,
+                LABEL,
+                icon,
+                executor,
+                {}
+        )
+
+        Thread.sleep(TimeUnit.SECONDS.toMillis(TIME_OUT_SECONDS))
+
+        statusBarService.requestAddTileService(
+                componentName,
+                LABEL,
+                icon,
+                executor,
+                consumer
+        )
+
+        latch.await(TIME_OUT_SECONDS, TimeUnit.SECONDS)
+        assertThat(consumer.result)
+                .isEqualTo(StatusBarManager.TILE_ADD_REQUEST_ERROR_REQUEST_IN_PROGRESS)
+
+        SystemUtil.callWithShellPermissionIdentity(
+                { statusBarService.cancelRequestAddTile(componentName.packageName) },
+                STATUS_BAR
+        )
+
+        activity.finish()
+    }
+
+    private fun setUpForActivity(): Activity {
+        val intent = Intent(context, MockActivity::class.java)
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        val activity = instrumentation.startActivitySync(intent)
+        instrumentation.waitForIdleSync()
+        return activity
+    }
+
+    private class StoreIntConsumer(private val latch: CountDownLatch) : Consumer<Int> {
+        var result: Int? = null
+
+        override fun accept(t: Int) {
+            result = t
+            latch.countDown()
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/app/src/android/app/cts/ServiceTest.java b/tests/app/src/android/app/cts/ServiceTest.java
index 2d18509..ee3c06f 100644
--- a/tests/app/src/android/app/cts/ServiceTest.java
+++ b/tests/app/src/android/app/cts/ServiceTest.java
@@ -16,6 +16,9 @@
 
 package android.app.cts;
 
+import static android.Manifest.permission.POST_NOTIFICATIONS;
+import static android.Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL;
+import static android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS;
 import static android.app.stubs.LocalForegroundService.COMMAND_START_FOREGROUND;
 import static android.app.stubs.LocalForegroundService.COMMAND_START_FOREGROUND_DEFER_NOTIFICATION;
 import static android.app.stubs.LocalForegroundService.COMMAND_STOP_FOREGROUND_DETACH_NOTIFICATION;
@@ -53,6 +56,8 @@
 import android.os.RemoteException;
 import android.os.SystemClock;
 import android.os.UserHandle;
+import android.permission.PermissionManager;
+import android.permission.cts.PermissionUtils;
 import android.service.notification.StatusBarNotification;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
@@ -698,6 +703,7 @@
     protected void setUp() throws Exception {
         super.setUp();
         mContext = getContext();
+        PermissionUtils.grantPermission(mContext.getPackageName(), POST_NOTIFICATIONS);
         mLocalService = new Intent(mContext, LocalService.class);
         mExternalService = new Intent();
         mExternalService.setComponent(ComponentName.unflattenFromString(EXTERNAL_SERVICE_COMPONENT));
@@ -745,6 +751,15 @@
         }
         mBackgroundThread = null;
         mBackgroundThreadExecutor = null;
+        // Use test API to prevent PermissionManager from killing the test process when revoking
+        // permission.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> mContext.getSystemService(PermissionManager.class)
+                        .revokePostNotificationPermissionWithoutKillForTest(
+                                mContext.getPackageName(),
+                                Process.myUserHandle().getIdentifier()),
+                REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL,
+                REVOKE_RUNTIME_PERMISSIONS);
     }
 
     private class MockBinder extends Binder {
diff --git a/tests/app/src/android/app/cts/StatusBarManagerTest.java b/tests/app/src/android/app/cts/StatusBarManagerTest.java
index 9995099..3557ac1 100644
--- a/tests/app/src/android/app/cts/StatusBarManagerTest.java
+++ b/tests/app/src/android/app/cts/StatusBarManagerTest.java
@@ -18,6 +18,8 @@
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
 
@@ -32,6 +34,8 @@
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.CddTest;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -40,7 +44,7 @@
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 public class StatusBarManagerTest {
-    private static final String PERMISSION_STATUS_BAR = "android.permission.STATUS_BAR";
+    private static final String PERMISSION_STATUS_BAR = android.Manifest.permission.STATUS_BAR;
 
     private StatusBarManager mStatusBarManager;
     private Context mContext;
@@ -94,6 +98,7 @@
         assertTrue(info.isStatusBarExpansionDisabled());
         assertTrue(info.isRecentsDisabled());
         assertTrue(info.isSearchDisabled());
+        assertFalse(info.isRotationSuggestionDisabled());
     }
 
     /**
@@ -179,4 +184,42 @@
 
         // Nothing thrown, passed
     }
+
+    /**
+     * Test StatusBarManager.setNavBarMode(NAV_BAR_MODE_KIDS)
+     *
+     * @throws Exception
+     */
+    @CddTest(requirement = "7.2.3/C-9-1")
+    @Test
+    public void testSetNavBarMode_kids_doesNotThrow() throws Exception {
+        int navBarModeKids = StatusBarManager.NAV_BAR_MODE_KIDS;
+        mStatusBarManager.setNavBarMode(navBarModeKids);
+
+        assertEquals(mStatusBarManager.getNavBarMode(), navBarModeKids);
+    }
+
+    /**
+     * Test StatusBarManager.setNavBarMode(NAV_BAR_MODE_NONE)
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testSetNavBarMode_none_doesNotThrow() throws Exception {
+        int navBarModeNone = StatusBarManager.NAV_BAR_MODE_DEFAULT;
+        mStatusBarManager.setNavBarMode(navBarModeNone);
+
+        assertEquals(mStatusBarManager.getNavBarMode(), navBarModeNone);
+    }
+
+    /**
+     * Test StatusBarManager.setNavBarMode(-1) // invalid input
+     *
+     * @throws Exception
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testSetNavBarMode_invalid_throws() throws Exception {
+        int invalidInput = -1;
+        mStatusBarManager.setNavBarMode(invalidInput);
+    }
 }
diff --git a/tests/app/src/android/app/cts/SystemFeaturesTest.java b/tests/app/src/android/app/cts/SystemFeaturesTest.java
index 19dc7a3..6a67df8 100644
--- a/tests/app/src/android/app/cts/SystemFeaturesTest.java
+++ b/tests/app/src/android/app/cts/SystemFeaturesTest.java
@@ -381,14 +381,29 @@
                 Sensor.TYPE_RELATIVE_HUMIDITY);
         assertFeatureForSensor(featuresLeft, PackageManager.FEATURE_SENSOR_HINGE_ANGLE,
                 Sensor.TYPE_HINGE_ANGLE);
-
+        assertFeatureForSensor(featuresLeft, PackageManager.FEATURE_SENSOR_DYNAMIC_HEAD_TRACKER,
+                Sensor.TYPE_HEAD_TRACKER);
+        assertFeatureForSensor(featuresLeft,
+                PackageManager.FEATURE_SENSOR_ACCELEROMETER_LIMITED_AXES,
+                Sensor.TYPE_ACCELEROMETER_LIMITED_AXES);
+        assertFeatureForSensor(featuresLeft,
+                PackageManager.FEATURE_SENSOR_GYROSCOPE_LIMITED_AXES,
+                Sensor.TYPE_GYROSCOPE_LIMITED_AXES);
+        assertFeatureForSensor(featuresLeft,
+                PackageManager.FEATURE_SENSOR_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED,
+                Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED);
+        assertFeatureForSensor(featuresLeft,
+                PackageManager.FEATURE_SENSOR_GYROSCOPE_LIMITED_AXES_UNCALIBRATED,
+                Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED);
+        assertFeatureForSensor(featuresLeft, PackageManager.FEATURE_SENSOR_HEADING,
+                Sensor.TYPE_HEADING);
 
         /*
          * We have three cases to test for :
          * Case 1:  Device does not have an HRM
          * FEATURE_SENSOR_HEART_RATE               false
          * FEATURE_SENSOR_HEART_RATE_ECG           false
-         * assertFeatureForSensor(TYPE_HEART_RATE) false
+         * assertFeatureForSensor(TßYPE_HEART_RATE) false
          *
          * Case 2:  Device has a PPG HRM
          * FEATURE_SENSOR_HEART_RATE               true
@@ -508,7 +523,7 @@
     @Test
     public void testTelephonyFeatures() {
         if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) ||
-            !mPackageManager.hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE)) {
+                !mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELECOM)) {
                 return;
         }
 
diff --git a/tests/app/src/android/app/cts/TaskDescriptionTest.java b/tests/app/src/android/app/cts/TaskDescriptionTest.java
index fe06c4f..d3dd9aa 100644
--- a/tests/app/src/android/app/cts/TaskDescriptionTest.java
+++ b/tests/app/src/android/app/cts/TaskDescriptionTest.java
@@ -51,7 +51,8 @@
     private static final String TEST_LABEL = "test-label";
     private static final int TEST_NO_DATA = 0;
     private static final int TEST_RES_DATA = 777;
-    private static final int TEST_COLOR = Color.BLACK;
+    private static final int TEST_COLOR = Color.RED;
+    private static final int NULL_COLOR = 0;
     private static final int WAIT_TIMEOUT_MS = 1000;
     private static final int WAIT_RETRIES = 5;
 
@@ -96,7 +97,29 @@
         assertTaskDescription(activity, null, TEST_NO_DATA, null);
     }
 
+    @Test
+    public void testBuilder() {
+        final Activity activity = mTaskDescriptionActivity.launchActivity(null);
+        final TaskDescription td = new TaskDescription.Builder()
+                .setLabel(TEST_LABEL)
+                .setIcon(TEST_RES_DATA)
+                .setPrimaryColor(TEST_COLOR)
+                .setBackgroundColor(TEST_COLOR)
+                .setStatusBarColor(TEST_COLOR)
+                .setNavigationBarColor(TEST_COLOR)
+                .build();
+        activity.setTaskDescription(td);
+        assertTaskDescription(activity, TEST_LABEL, TEST_RES_DATA, null, TEST_COLOR, TEST_COLOR,
+                TEST_COLOR, TEST_COLOR);
+    }
+
     private void assertTaskDescription(Activity activity, String label, int resId, Bitmap bitmap) {
+        assertTaskDescription(activity, label, resId, bitmap, NULL_COLOR, NULL_COLOR, NULL_COLOR,
+                NULL_COLOR);
+    }
+
+    private void assertTaskDescription(Activity activity, String label, int resId, Bitmap bitmap,
+            int primaryColor, int backgroundColor, int statusBarColor, int navigationBarColor) {
         final ActivityManager am = (ActivityManager) activity.getSystemService(ACTIVITY_SERVICE);
         List<RecentTaskInfo> recentsTasks = am.getRecentTasks(1 /* maxNum */, 0 /* flags */);
         if (!recentsTasks.isEmpty()) {
@@ -118,6 +141,18 @@
 
                 assertEquals(resId, td.getIconResource());
                 assertEquals(label, td.getLabel());
+                if (primaryColor != NULL_COLOR) {
+                    assertEquals(primaryColor, td.getPrimaryColor());
+                }
+                if (backgroundColor != NULL_COLOR) {
+                    assertEquals(backgroundColor, td.getBackgroundColor());
+                }
+                if (statusBarColor != NULL_COLOR) {
+                    assertEquals(statusBarColor, td.getStatusBarColor());
+                }
+                if (navigationBarColor != NULL_COLOR) {
+                    assertEquals(navigationBarColor, td.getNavigationBarColor());
+                }
                 return;
             }
         }
diff --git a/tests/app/src/android/app/cts/TileServiceTest.java b/tests/app/src/android/app/cts/TileServiceTest.java
deleted file mode 100644
index 2509eb7..0000000
--- a/tests/app/src/android/app/cts/TileServiceTest.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2019 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 android.app.cts;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.stubs.TestTileService;
-import android.os.Looper;
-import android.service.quicksettings.Tile;
-import android.service.quicksettings.TileService;
-
-import org.junit.Test;
-
-public class TileServiceTest extends BaseTileServiceTest {
-    private final static String TAG = "TileServiceTest";
-
-    @Test
-    public void testCreateTileService() {
-        final TileService tileService = new TileService();
-    }
-
-    @Test
-    public void testListening() throws Exception {
-        initializeAndListen();
-    }
-
-    @Test
-    public void testListening_stopped() throws Exception {
-        initializeAndListen();
-        expandSettings(false);
-        waitForListening(false);
-    }
-
-    @Test
-    public void testLocked_deviceNotLocked() throws Exception {
-        initializeAndListen();
-        assertFalse(mTileService.isLocked());
-    }
-
-    @Test
-    public void testSecure_deviceNotSecure() throws Exception {
-        initializeAndListen();
-        assertFalse(mTileService.isSecure());
-    }
-
-    @Test
-    public void testTile_hasCorrectIcon() throws Exception {
-        initializeAndListen();
-        Tile tile = mTileService.getQsTile();
-        assertEquals(TestTileService.ICON_ID, tile.getIcon().getResId());
-    }
-
-    @Test
-    public void testTile_hasCorrectSubtitle() throws Exception {
-        initializeAndListen();
-
-        Tile tile = mTileService.getQsTile();
-        tile.setSubtitle("test_subtitle");
-        tile.updateTile();
-        assertEquals("test_subtitle", tile.getSubtitle());
-    }
-
-    @Test
-    public void testTile_hasCorrectStateDescription() throws Exception {
-        initializeAndListen();
-
-        Tile tile = mTileService.getQsTile();
-        tile.setStateDescription("test_stateDescription");
-        tile.updateTile();
-        assertEquals("test_stateDescription", tile.getStateDescription());
-    }
-
-    @Test
-    public void testShowDialog() throws Exception {
-        Looper.prepare();
-        Dialog dialog = new AlertDialog.Builder(mContext).create();
-        initializeAndListen();
-        clickTile(TestTileService.getComponentName().flattenToString());
-        waitForClick();
-
-        mTileService.showDialog(dialog);
-
-        assertTrue(dialog.isShowing());
-        dialog.dismiss();
-    }
-
-    @Test
-    public void testUnlockAndRun_phoneIsUnlockedActivityIsRun() throws Exception {
-        initializeAndListen();
-        assertFalse(mTileService.isLocked());
-
-        TestRunnable testRunnable = new TestRunnable();
-
-        mTileService.unlockAndRun(testRunnable);
-        Thread.sleep(100); // wait for activity to run
-        waitForRun(testRunnable);
-    }
-
-    @Test
-    public void testTileInDumpAndHasState() throws Exception {
-        initializeAndListen();
-
-        final CharSequence tileLabel = mTileService.getQsTile().getLabel();
-
-        final String[] dumpLines = executeShellCommand(DUMP_COMMAND).split("\n");
-        final String line = findLine(dumpLines, tileLabel);
-        assertNotNull(line);
-        assertTrue(line.trim().startsWith("State")); // Not BooleanState
-    }
-
-    private void clickTile(String componentName) throws Exception {
-        executeShellCommand(" cmd statusbar click-tile " + componentName);
-    }
-
-    /**
-     * Waits for the TileService to receive the clicked event. If it times out it fails the test.
-     * @throws InterruptedException
-     */
-    private void waitForClick() throws InterruptedException {
-        int ct = 0;
-        while (!TestTileService.hasBeenClicked() && (ct++ < CHECK_RETRIES)) {
-            Thread.sleep(CHECK_DELAY);
-        }
-        assertTrue(TestTileService.hasBeenClicked());
-    }
-
-    /**
-     * Waits for the runnable to be run. If it times out it fails the test.
-     * @throws InterruptedException
-     */
-    private void waitForRun(TestRunnable t) throws InterruptedException {
-        int ct = 0;
-        while (!t.hasRan && (ct++ < CHECK_RETRIES)) {
-            Thread.sleep(CHECK_DELAY);
-        }
-        assertTrue(t.hasRan);
-    }
-
-    @Override
-    protected void waitForListening(boolean state) throws InterruptedException {
-        int ct = 0;
-        while (TestTileService.isListening() != state && (ct++ < CHECK_RETRIES)) {
-            Thread.sleep(CHECK_DELAY);
-        }
-        assertEquals(state, TestTileService.isListening());
-    }
-
-    /**
-     * Waits for the TileService to be in the expected connected state. If it times out, it fails
-     * the test
-     * @param state desired connected state
-     * @throws InterruptedException
-     */
-    @Override
-    protected void waitForConnected(boolean state) throws InterruptedException {
-        int ct = 0;
-        while (TestTileService.isConnected() != state && (ct++ < CHECK_RETRIES)) {
-            Thread.sleep(CHECK_DELAY);
-        }
-        assertEquals(state, TestTileService.isConnected());
-    }
-
-    @Override
-    protected String getTag() {
-        return TAG;
-    }
-
-    @Override
-    protected String getComponentName() {
-        return TestTileService.getComponentName().flattenToString();
-    }
-
-    @Override
-    protected TileService getTileServiceInstance() {
-        return TestTileService.getInstance();
-    }
-
-    class TestRunnable implements Runnable {
-        boolean hasRan = false;
-
-        @Override
-        public void run() {
-            hasRan = true;
-        }
-    }
-}
diff --git a/tests/app/src/android/app/cts/UiModeManagerTest.java b/tests/app/src/android/app/cts/UiModeManagerTest.java
index bf53bd9..74e22d8 100644
--- a/tests/app/src/android/app/cts/UiModeManagerTest.java
+++ b/tests/app/src/android/app/cts/UiModeManagerTest.java
@@ -15,11 +15,23 @@
  */
 package android.app.cts;
 
+import static android.app.UiModeManager.MODE_NIGHT_AUTO;
+import static android.app.UiModeManager.MODE_NIGHT_CUSTOM;
+import static android.app.UiModeManager.MODE_NIGHT_CUSTOM_TYPE_BEDTIME;
+import static android.app.UiModeManager.MODE_NIGHT_CUSTOM_TYPE_SCHEDULE;
+import static android.app.UiModeManager.MODE_NIGHT_CUSTOM_TYPE_UNKNOWN;
+import static android.app.UiModeManager.MODE_NIGHT_NO;
+import static android.app.UiModeManager.MODE_NIGHT_YES;
+
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
 import static com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity;
 import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.testng.Assert.assertThrows;
+
 import android.Manifest;
 import android.app.UiAutomation;
 import android.app.UiModeManager;
@@ -29,6 +41,7 @@
 import android.os.ParcelFileDescriptor;
 import android.os.UserHandle;
 import android.test.AndroidTestCase;
+import android.text.TextUtils;
 import android.util.ArraySet;
 import android.util.Log;
 
@@ -56,19 +69,37 @@
     private static final long WAIT_TIME_INCR_MS = 100;
 
     private UiModeManager mUiModeManager;
+    private boolean mHasModifiedNightModePermissionAcquired = false;
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         mUiModeManager = (UiModeManager) getContext().getSystemService(Context.UI_MODE_SERVICE);
         assertNotNull(mUiModeManager);
-        // reset nightMode
-        setNightMode(UiModeManager.MODE_NIGHT_YES);
-        setNightMode(UiModeManager.MODE_NIGHT_NO);
+        resetNightMode();
         // Make sure automotive projection is not set by this package at the beginning of the test.
         releaseAutomotiveProjection();
     }
 
+    @Override
+    protected void tearDown() throws Exception {
+        resetNightMode();
+    }
+
+    private void resetNightMode() {
+        try {
+            if (!mHasModifiedNightModePermissionAcquired) {
+                acquireModifyNightModePermission();
+            }
+            mUiModeManager.setNightMode(UiModeManager.MODE_NIGHT_NO);
+            mUiModeManager.setNightModeActivatedForCustomMode(MODE_NIGHT_CUSTOM_TYPE_BEDTIME,
+                    false /* active */);
+        } finally {
+            getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
+            mHasModifiedNightModePermissionAcquired = false;
+        }
+    }
+
     public void testUiMode() throws Exception {
         if (isAutomotive()) {
             Log.i(TAG, "testUiMode automotive");
@@ -148,6 +179,191 @@
         assertStoredNightModeSetting(UiModeManager.MODE_NIGHT_AUTO);
     }
 
+    public void testSetNightModeCustomType_noPermission_bedtime_shouldThrow() {
+        assertThrows(SecurityException.class,
+                () -> mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_BEDTIME));
+    }
+
+    public void testSetNightModeCustomType_customTypeUnknown_bedtime_shouldThrow() {
+        acquireModifyNightModePermission();
+
+        assertThrows(IllegalArgumentException.class,
+                () -> mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_UNKNOWN));
+    }
+
+    public void testSetNightModeCustomType_bedtime_shouldPersist() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
+
+        assertThat(mUiModeManager.getNightMode()).isEqualTo(MODE_NIGHT_CUSTOM);
+        assertThat(mUiModeManager.getNightModeCustomType())
+                .isEqualTo(MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
+    }
+
+    public void testSetNightModeCustomType_schedule_shouldPersist() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_SCHEDULE);
+
+        assertThat(mUiModeManager.getNightMode()).isEqualTo(MODE_NIGHT_CUSTOM);
+        assertThat(mUiModeManager.getNightModeCustomType())
+                .isEqualTo(MODE_NIGHT_CUSTOM_TYPE_SCHEDULE);
+    }
+
+    public void testGetNightModeCustomType_nightModeNo_shouldReturnUnknown() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightMode(MODE_NIGHT_NO);
+
+        assertThat(mUiModeManager.getNightModeCustomType())
+                .isEqualTo(MODE_NIGHT_CUSTOM_TYPE_UNKNOWN);
+    }
+
+    public void testGetNightModeCustomType_nightModeYes_shouldReturnUnknown() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightMode(MODE_NIGHT_YES);
+
+        assertThat(mUiModeManager.getNightModeCustomType())
+                .isEqualTo(MODE_NIGHT_CUSTOM_TYPE_UNKNOWN);
+    }
+
+    public void testGetNightModeCustomType_nightModeAuto_shouldReturnUnknown() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightMode(MODE_NIGHT_AUTO);
+
+        assertThat(mUiModeManager.getNightModeCustomType())
+                .isEqualTo(MODE_NIGHT_CUSTOM_TYPE_UNKNOWN);
+    }
+
+    public void testGetNightModeCustomType_nightModeCustom_shouldReturnScheduleAsDefault() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightMode(MODE_NIGHT_CUSTOM);
+
+        assertThat(mUiModeManager.getNightModeCustomType())
+                .isEqualTo(MODE_NIGHT_CUSTOM_TYPE_SCHEDULE);
+    }
+
+    public void testSetNightModeCustomType_hasPermission_bedtime_shouldNotActivateNightMode() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
+
+        assertVisibleNightModeInConfiguration(Configuration.UI_MODE_NIGHT_NO);
+    }
+
+    public void testSetNightModeActivatedForCustomMode_noPermission_customTypeBedtime_activateAtBedtime_shouldNotActivateNightMode() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
+        getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
+        mHasModifiedNightModePermissionAcquired = false;
+
+        assertThat(mUiModeManager.setNightModeActivatedForCustomMode(
+                MODE_NIGHT_CUSTOM_TYPE_BEDTIME, true /* active */)).isFalse();
+
+        assertVisibleNightModeInConfiguration(Configuration.UI_MODE_NIGHT_NO);
+    }
+
+    public void testSetNightModeActivatedForCustomMode_customTypeBedtime_activateAtBedtime_shouldActivateNightMode() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
+
+        assertThat(mUiModeManager.setNightModeActivatedForCustomMode(
+                MODE_NIGHT_CUSTOM_TYPE_BEDTIME, true /* active */)).isTrue();
+
+        assertVisibleNightModeInConfiguration(Configuration.UI_MODE_NIGHT_YES);
+    }
+
+    public void testSetNightModeActivatedForCustomMode_customTypeBedtime_deactivateAtBedtime_shouldDeactivateNightMode() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
+
+        assertThat(mUiModeManager.setNightModeActivatedForCustomMode(
+                MODE_NIGHT_CUSTOM_TYPE_BEDTIME, false /* active */)).isTrue();
+
+        assertVisibleNightModeInConfiguration(Configuration.UI_MODE_NIGHT_NO);
+    }
+
+    public void testSetNightModeActivatedForCustomMode_modeNo_activateAtBedtime_shouldNotActivateNightMode() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightMode(MODE_NIGHT_NO);
+
+        assertThat(mUiModeManager.setNightModeActivatedForCustomMode(
+                MODE_NIGHT_CUSTOM_TYPE_BEDTIME, true /* active */)).isFalse();
+
+        assertVisibleNightModeInConfiguration(Configuration.UI_MODE_NIGHT_NO);
+    }
+
+    public void testSetNightModeActivatedForCustomMode_modeYes_activateAtBedtime_shouldKeepNightModeActivated() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightMode(MODE_NIGHT_YES);
+
+        assertThat(mUiModeManager.setNightModeActivatedForCustomMode(
+                MODE_NIGHT_CUSTOM_TYPE_BEDTIME, true /* active */)).isFalse();
+
+        assertVisibleNightModeInConfiguration(Configuration.UI_MODE_NIGHT_YES);
+    }
+
+    public void testSetNightModeActivatedForCustomMode_modeAuto_activateAtBedtime_shouldNotActivateNightMode() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightMode(MODE_NIGHT_AUTO);
+
+        assertThat(mUiModeManager.setNightModeActivatedForCustomMode(
+                MODE_NIGHT_CUSTOM_TYPE_BEDTIME, true /* active */)).isFalse();
+
+        assertVisibleNightModeInConfiguration(Configuration.UI_MODE_NIGHT_NO);
+    }
+
+    public void testSetNightModeActivatedForCustomMode_customTypeSchedule_activateAtBedtime_shouldNotActivateNightMode() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_SCHEDULE);
+
+        assertThat(mUiModeManager.setNightModeActivatedForCustomMode(
+                MODE_NIGHT_CUSTOM_TYPE_BEDTIME, true /* active */)).isFalse();
+
+        assertVisibleNightModeInConfiguration(Configuration.UI_MODE_NIGHT_NO);
+    }
+
+    public void testSetNightModeActivatedForCustomMode_modeNo_activateAtBedtime_thenCustomTypeBedtime_shouldActivateNightMode() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightMode(MODE_NIGHT_NO);
+        mUiModeManager.setNightModeActivatedForCustomMode(MODE_NIGHT_CUSTOM_TYPE_BEDTIME,
+                true /* active */);
+
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
+
+        assertVisibleNightModeInConfiguration(Configuration.UI_MODE_NIGHT_YES);
+    }
+
+    public void testSetNightModeActivatedForCustomMode_modeYes_activateAtBedtime_thenCustomTypeBedtime_shouldActiveNightMode() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightMode(MODE_NIGHT_YES);
+        mUiModeManager.setNightModeActivatedForCustomMode(MODE_NIGHT_CUSTOM_TYPE_BEDTIME,
+                true /* active */);
+
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
+
+        assertVisibleNightModeInConfiguration(Configuration.UI_MODE_NIGHT_YES);
+    }
+
+    public void testSetNightModeActivatedForCustomMode_modeAuto_activateAtBedtime_thenCustomTypeBedtime_shouldActivateNightMode() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightMode(MODE_NIGHT_AUTO);
+        mUiModeManager.setNightModeActivatedForCustomMode(MODE_NIGHT_CUSTOM_TYPE_BEDTIME,
+                true /* active */);
+
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
+
+        assertVisibleNightModeInConfiguration(Configuration.UI_MODE_NIGHT_YES);
+    }
+
+    public void testSetNightModeActivatedForCustomMode_customTypeSchedule_activateAtBedtime_thenCustomTypeBedtime_shouldActivateNightMode() {
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_SCHEDULE);
+        mUiModeManager.setNightModeActivatedForCustomMode(MODE_NIGHT_CUSTOM_TYPE_BEDTIME,
+                true /* active */);
+
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
+
+        assertVisibleNightModeInConfiguration(Configuration.UI_MODE_NIGHT_YES);
+    }
+
     public void testNightModeAutoNotPersistedCarMode() {
         if (mUiModeManager.isNightModeLocked()) {
             Log.i(TAG, "testNightModeAutoNotPersistedCarMode skipped: night mode is locked");
@@ -163,6 +379,24 @@
         mUiModeManager.disableCarMode(0);
     }
 
+    public void testNightModeCustomTypeBedtimeNotPersistedInCarMode() throws InterruptedException {
+        if (mUiModeManager.isNightModeLocked()) {
+            Log.i(TAG, "testNightModeCustomTypeBedtimeNotPersistedInCarMode skipped: night mode is "
+                    + "locked");
+            return;
+        }
+
+        acquireModifyNightModePermission();
+        mUiModeManager.setNightMode(UiModeManager.MODE_NIGHT_NO);
+        mUiModeManager.enableCarMode(0);
+
+        // We don't expect users modifing bedtime features when driving.
+        mUiModeManager.setNightModeCustomType(MODE_NIGHT_CUSTOM_TYPE_BEDTIME);
+
+        assertStoredNightModeSetting(UiModeManager.MODE_NIGHT_NO);
+        mUiModeManager.disableCarMode(0);
+    }
+
     public void testNightModeInCarModeIsTransient() {
         if (mUiModeManager.isNightModeLocked()) {
             Log.i(TAG, "testNightModeInCarModeIsTransient skipped: night mode is locked");
@@ -622,7 +856,9 @@
         // Settings.Secure.UI_NIGHT_MODE
         for (int i = 0; i < MAX_WAIT_TIME_MS; i += WAIT_TIME_INCR_MS) {
             String storedMode = getUiNightModeFromSetting();
-            storedModeInt = Integer.parseInt(storedMode);
+            if (!TextUtils.isEmpty(storedMode)) {
+                storedModeInt = Integer.parseInt(storedMode);
+            }
             if (mode == storedModeInt) break;
             try {
                 Thread.sleep(WAIT_TIME_INCR_MS);
@@ -685,4 +921,10 @@
                 ? SettingsUtils.getSecureSettingAsUser(UserHandle.USER_SYSTEM, key)
                 : SettingsUtils.getSecureSetting(key);
     }
+
+    private void acquireModifyNightModePermission() {
+        getInstrumentation().getUiAutomation()
+                .adoptShellPermissionIdentity(Manifest.permission.MODIFY_DAY_NIGHT_MODE);
+        mHasModifiedNightModePermissionAcquired = true;
+    }
 }
diff --git a/tests/app/src/android/app/cts/UpdateMediaTapToTransferReceiverDisplayTest.kt b/tests/app/src/android/app/cts/UpdateMediaTapToTransferReceiverDisplayTest.kt
new file mode 100644
index 0000000..c2d02b3
--- /dev/null
+++ b/tests/app/src/android/app/cts/UpdateMediaTapToTransferReceiverDisplayTest.kt
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2022 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 android.app.cts
+
+import android.app.Instrumentation
+import android.app.StatusBarManager
+import android.app.UiAutomation
+import android.content.Context
+import android.media.MediaRoute2Info
+import android.net.Uri
+import android.support.test.uiautomator.By
+import android.support.test.uiautomator.UiDevice
+import androidx.test.InstrumentationRegistry
+import androidx.test.InstrumentationRegistry.getInstrumentation
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.compatibility.common.util.AdoptShellPermissionsRule
+import com.android.compatibility.common.util.SystemUtil.eventually
+import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
+import com.google.common.truth.Truth.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Test that the updateMediaTapToTransferReceiverDisplay method fails in all the expected ways.
+ *
+ * These tests are for [StatusBarManager.updateMediaTapToTransferReceiverDisplay].
+ */
+@RunWith(AndroidJUnit4::class)
+class UpdateMediaTapToTransferReceiverDisplayTest {
+    @Rule
+    fun permissionsRule() = AdoptShellPermissionsRule(
+        getInstrumentation().getUiAutomation(), MEDIA_PERMISSION
+    )
+
+    private lateinit var statusBarManager: StatusBarManager
+    private lateinit var instrumentation: Instrumentation
+    private lateinit var uiAutomation: UiAutomation
+    private lateinit var uiDevice: UiDevice
+    private lateinit var context: Context
+
+    @Before
+    fun setUp() {
+        instrumentation = InstrumentationRegistry.getInstrumentation()
+        context = instrumentation.getTargetContext()
+        statusBarManager = context.getSystemService(StatusBarManager::class.java)!!
+        uiAutomation = getInstrumentation().getUiAutomation()
+        uiDevice = UiDevice.getInstance(instrumentation)
+        uiDevice.wakeUp()
+    }
+
+    @After
+    fun tearDown() {
+        // Explicitly run with the permission granted since it may have been dropped in the test.
+        runWithShellPermissionIdentity {
+            // Clear any existing chip
+            statusBarManager.updateMediaTapToTransferReceiverDisplay(
+                StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER,
+                ROUTE_INFO,
+                null,
+                null
+            )
+        }
+    }
+
+    @Test(expected = SecurityException::class)
+    fun noPermission_throwsSecurityException() {
+        uiAutomation.dropShellPermissionIdentity()
+        statusBarManager.updateMediaTapToTransferReceiverDisplay(
+            StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER,
+            ROUTE_INFO,
+            null,
+            null
+        )
+    }
+
+    @Test
+    fun closeToSender_displaysChip() {
+        statusBarManager.updateMediaTapToTransferReceiverDisplay(
+            StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER,
+            ROUTE_INFO,
+            null,
+            null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_RECEIVER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+    }
+
+    @Test
+    fun farFromSender_hidesChip() {
+        // First, make sure we display the chip
+        statusBarManager.updateMediaTapToTransferReceiverDisplay(
+            StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_CLOSE_TO_SENDER,
+            ROUTE_INFO,
+            null,
+            null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_RECEIVER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+
+        // Then, make sure we hide the chip
+        statusBarManager.updateMediaTapToTransferReceiverDisplay(
+            StatusBarManager.MEDIA_TRANSFER_RECEIVER_STATE_FAR_FROM_SENDER,
+            ROUTE_INFO,
+            null,
+            null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_RECEIVER_CHIP_ID))
+            assertThat(chip).isNull()
+        }
+    }
+}
+
+private const val MEDIA_RECEIVER_CHIP_ID = "com.android.systemui:id/media_ttt_receiver_chip"
+private val MEDIA_PERMISSION: String = android.Manifest.permission.MEDIA_CONTENT_CONTROL
+private val ROUTE_INFO = MediaRoute2Info.Builder("id", "Test Name")
+    .addFeature("feature")
+    .setIconUri(Uri.parse("content://ctstest"))
+    .build()
diff --git a/tests/app/src/android/app/cts/UpdateMediaTapToTransferSenderDisplayTest.kt b/tests/app/src/android/app/cts/UpdateMediaTapToTransferSenderDisplayTest.kt
new file mode 100644
index 0000000..ad0575f
--- /dev/null
+++ b/tests/app/src/android/app/cts/UpdateMediaTapToTransferSenderDisplayTest.kt
@@ -0,0 +1,319 @@
+/*
+ * Copyright (C) 2022 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 android.app.cts
+
+import android.app.Instrumentation
+import android.app.StatusBarManager
+import android.app.UiAutomation
+import android.content.Context
+import android.media.MediaRoute2Info
+import android.net.Uri
+import android.support.test.uiautomator.By
+import android.support.test.uiautomator.UiDevice
+import androidx.test.InstrumentationRegistry
+import androidx.test.InstrumentationRegistry.getInstrumentation
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.compatibility.common.util.AdoptShellPermissionsRule
+import com.android.compatibility.common.util.SystemUtil.eventually
+import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
+import com.google.common.truth.Truth.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Test that the updateMediaTapToTransferSenderDisplay method fails in all the expected ways.
+ *
+ * These tests are for [StatusBarManager.updateMediaTapToTransferSenderDisplay].
+ */
+@RunWith(AndroidJUnit4::class)
+class UpdateMediaTapToTransferSenderDisplayTest {
+    @Rule
+    fun permissionsRule() = AdoptShellPermissionsRule(
+        getInstrumentation().getUiAutomation(), MEDIA_PERMISSION
+    )
+
+    private lateinit var statusBarManager: StatusBarManager
+    private lateinit var instrumentation: Instrumentation
+    private lateinit var uiAutomation: UiAutomation
+    private lateinit var uiDevice: UiDevice
+    private lateinit var context: Context
+
+    @Before
+    fun setUp() {
+        instrumentation = InstrumentationRegistry.getInstrumentation()
+        context = instrumentation.getTargetContext()
+        statusBarManager = context.getSystemService(StatusBarManager::class.java)!!
+        uiAutomation = getInstrumentation().getUiAutomation()
+        uiDevice = UiDevice.getInstance(instrumentation)
+        uiDevice.wakeUp()
+    }
+
+    @After
+    fun tearDown() {
+        // Explicitly run with the permission granted since it may have been dropped in the test.
+        runWithShellPermissionIdentity {
+            // Clear any existing chip
+            statusBarManager.updateMediaTapToTransferSenderDisplay(
+                StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER,
+                ROUTE_INFO,
+                null,
+                null
+            )
+        }
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun undoCallbackForNotSucceedState_throwsException() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST,
+            ROUTE_INFO,
+            context.getMainExecutor(),
+            Runnable { }
+        )
+    }
+
+    @Test
+    fun noUndoCallbackWithNotSucceedState_noException() {
+        // No assert, just want to check no crash
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST,
+            ROUTE_INFO,
+            /* executor= */ null,
+            /* callback= */ null
+        )
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun transferToReceiverSucceeded_undoCallbackButNoExecutor_throwsException() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED,
+            ROUTE_INFO,
+            /* executor= */ null,
+            Runnable { }
+        )
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun transferToThisDeviceSucceeded_undoCallbackButNoExecutor_throwsException() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED,
+            ROUTE_INFO,
+            /* executor= */ null,
+            Runnable { }
+        )
+    }
+
+    @Test(expected = SecurityException::class)
+    fun noPermission_throwsSecurityException() {
+        uiAutomation.dropShellPermissionIdentity()
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST,
+            ROUTE_INFO,
+            /* executor= */ null,
+            /* callback= */ null
+        )
+    }
+
+    @Test
+    fun almostCloseToStartCast_displaysChip() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST,
+            ROUTE_INFO,
+            /* executor= */ null,
+            /* callback= */ null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_SENDER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+    }
+
+    @Test
+    fun almostCloseToEndCast_displaysChip() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_END_CAST,
+            ROUTE_INFO,
+            /* executor= */ null,
+            /* callback= */ null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_SENDER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+    }
+
+    @Test
+    fun transferToReceiverTriggered_displaysChip() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_TRIGGERED,
+            ROUTE_INFO,
+            /* executor= */ null,
+            /* callback= */ null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_SENDER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+    }
+
+    @Test
+    fun transferToThisDeviceTriggered_displaysChip() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_TRIGGERED,
+            ROUTE_INFO,
+            /* executor= */ null,
+            /* callback= */ null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_SENDER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+    }
+
+    @Test
+    fun transferToReceiverSucceeded_nullCallback_displaysChip() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED,
+            ROUTE_INFO,
+            /* executor= */ null,
+            /* callback= */ null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_SENDER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+    }
+
+    @Test
+    fun transferToReceiverSucceeded_withCallbackAndExecutor_displaysChip() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_SUCCEEDED,
+            ROUTE_INFO,
+            context.getMainExecutor(),
+            Runnable { }
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_SENDER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+    }
+
+    @Test
+    fun transferToThisDeviceSucceeded_nullCallback_displaysChip() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED,
+            ROUTE_INFO,
+            /* executor= */ null,
+            /* callback= */ null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_SENDER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+    }
+
+    @Test
+    fun transferToThisDeviceSucceeded_withCallbackAndExecutor_displaysChip() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_SUCCEEDED,
+            ROUTE_INFO,
+            context.getMainExecutor(),
+            Runnable { }
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_SENDER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+    }
+
+    @Test
+    fun transferToReceiverFailed_displaysChip() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_RECEIVER_FAILED,
+            ROUTE_INFO,
+            /* executor= */ null,
+            /* callback= */ null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_SENDER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+    }
+
+    @Test
+    fun transferToThisDeviceFailed_displaysChip() {
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_TRANSFER_TO_THIS_DEVICE_FAILED,
+            ROUTE_INFO,
+            /* executor= */ null,
+            /* callback= */ null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_SENDER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+    }
+
+    @Test
+    fun farFromReceiver_hidesChip() {
+        // First, make sure we display the chip
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_ALMOST_CLOSE_TO_START_CAST,
+            ROUTE_INFO,
+            /* executor= */ null,
+            /* callback= */ null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_SENDER_CHIP_ID))
+            assertThat(chip).isNotNull()
+        }
+
+        // Then, make sure we hide the chip
+        statusBarManager.updateMediaTapToTransferSenderDisplay(
+            StatusBarManager.MEDIA_TRANSFER_SENDER_STATE_FAR_FROM_RECEIVER,
+            ROUTE_INFO,
+            /* executor= */ null,
+            /* callback= */ null
+        )
+
+        eventually {
+            val chip = uiDevice.findObject(By.res(MEDIA_SENDER_CHIP_ID))
+            assertThat(chip).isNull()
+        }
+    }
+}
+
+private const val MEDIA_SENDER_CHIP_ID = "com.android.systemui:id/media_ttt_sender_chip"
+private val MEDIA_PERMISSION: String = android.Manifest.permission.MEDIA_CONTENT_CONTROL
+private val ROUTE_INFO = MediaRoute2Info.Builder("id", "Test Name")
+    .addFeature("feature")
+    .setIconUri(Uri.parse("content://ctstest"))
+    .build()
diff --git a/tests/app/src/android/app/cts/UserHandleTest.java b/tests/app/src/android/app/cts/UserHandleTest.java
index ec7cc40..cb6f18d 100644
--- a/tests/app/src/android/app/cts/UserHandleTest.java
+++ b/tests/app/src/android/app/cts/UserHandleTest.java
@@ -16,27 +16,32 @@
 
 package android.app.cts;
 
+import static org.junit.Assert.assertSame;
+
 import android.os.Parcel;
 import android.os.UserHandle;
 import android.test.AndroidTestCase;
 
 public class UserHandleTest extends AndroidTestCase {
     private static final int TEST_APP_ID = 1234;
+
     private static void assertSameUserHandle(int userId) {
         assertSame(UserHandle.of(userId), UserHandle.of(userId));
     }
 
     public void testOf() {
-        for (int i = -1000; i < 100; i++) {
-            assertEquals(i, UserHandle.of(i).getIdentifier());
-        }
-
-        // Ensure common objects are cached.
+        // We test them separately since technically it's possible for these constants to have
+        // different values than the AOSP contains and are out of the [-1000, 1000] range.
         assertSameUserHandle(UserHandle.USER_SYSTEM);
         assertSameUserHandle(UserHandle.USER_ALL);
         assertSameUserHandle(UserHandle.USER_NULL);
-        assertSameUserHandle(UserHandle.MIN_SECONDARY_USER_ID);
-        assertSameUserHandle(UserHandle.MIN_SECONDARY_USER_ID + 1);
+
+        for (int userId = -1000; userId <= 1000; userId++) {
+            assertEquals(userId, UserHandle.of(userId).getIdentifier());
+
+            // Because of the cache, this should always be true.
+            assertSameUserHandle(userId);
+        }
     }
 
     private static void assertParcel(int userId) {
diff --git a/tests/app/src/android/app/cts/WallpaperManagerTest.java b/tests/app/src/android/app/cts/WallpaperManagerTest.java
index 7fbd297..fc640a5 100644
--- a/tests/app/src/android/app/cts/WallpaperManagerTest.java
+++ b/tests/app/src/android/app/cts/WallpaperManagerTest.java
@@ -29,6 +29,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 
+import android.Manifest;
 import android.app.WallpaperColors;
 import android.app.WallpaperManager;
 import android.app.stubs.R;
@@ -51,6 +52,8 @@
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.CddTest;
+
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -68,6 +71,9 @@
 
     private static final boolean DEBUG = false;
     private static final String TAG = "WallpaperManagerTest";
+    private static final long MAX_WAIT_TIME_SECS = 2;
+    private static final long MAX_WAIT_TIME_MS = MAX_WAIT_TIME_SECS * 1000;
+    private static final long WAIT_TIME_INCR_MS = 100;
 
     private WallpaperManager mWallpaperManager;
     private Context mContext;
@@ -75,6 +81,7 @@
     private BroadcastReceiver mBroadcastReceiver;
     private CountDownLatch mCountDownLatch;
     private boolean mEnableWcg;
+    private boolean mAcquiredWallpaperDimmingPermission = false;
 
     @Before
     public void setUp() throws Exception {
@@ -106,6 +113,24 @@
         if (mBroadcastReceiver != null) {
             mContext.unregisterReceiver(mBroadcastReceiver);
         }
+        if (mAcquiredWallpaperDimmingPermission) {
+            try {
+                mWallpaperManager.setWallpaperDimAmount(0f);
+                assertDimAmountEqualsTo(0f);
+            } finally {
+                InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                        .dropShellPermissionIdentity();
+                mAcquiredWallpaperDimmingPermission = false;
+            }
+        }
+    }
+
+    private void ensureSetWallpaperDimAmountPermissionIsGranted() {
+        if (!mAcquiredWallpaperDimmingPermission) {
+            InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .adoptShellPermissionIdentity(Manifest.permission.SET_WALLPAPER_DIM_AMOUNT);
+            mAcquiredWallpaperDimmingPermission = true;
+        }
     }
 
     @Test
@@ -403,6 +428,96 @@
         }
     }
 
+    @Test
+    public void testGetWallpaperDimAmountWithNoPermission_shouldThrowException() {
+        Assert.assertThrows(SecurityException.class,
+                () -> mWallpaperManager.getWallpaperDimAmount());
+    }
+
+    @Test
+    public void testSetWallpaperDimAmountWithNoPermission_shouldThrowException() {
+        Assert.assertThrows(SecurityException.class,
+                () -> {
+                    float dimAmount = 0.5f;
+                    mWallpaperManager.setWallpaperDimAmount(dimAmount);
+                    assertDimAmountEqualsTo(dimAmount);
+                });
+    }
+
+    @Test
+    public void setWallpaperDimAmount_withinBound_shouldSetDimAmount() {
+        ensureSetWallpaperDimAmountPermissionIsGranted();
+
+        float dimAmount = 0.6f;
+        mWallpaperManager.setWallpaperDimAmount(dimAmount);
+        assertDimAmountEqualsTo(dimAmount);
+
+        // Remove additional dimming and verify that the dim amount is set to 0 again
+        mWallpaperManager.setWallpaperDimAmount(0f);
+        assertDimAmountEqualsTo(0f);
+    }
+
+    @Test
+    public void setWallpaperDimAmountBeyondRange_shouldBeBounded() {
+        ensureSetWallpaperDimAmountPermissionIsGranted();
+
+        // Setting dim amount < 0 should be bounded to lower limit 0.0
+        mWallpaperManager.setWallpaperDimAmount(-1f);
+        assertDimAmountEqualsTo(0f);
+
+        // Setting dim amount > 1 should be bounded to upper limit 1.0
+        mWallpaperManager.setWallpaperDimAmount(1.5f);
+        assertDimAmountEqualsTo(1f);
+    }
+
+    @CddTest(requirement = "3.8.7.1/H-1-2")
+    @Test
+    public void setWallpaperDimAmount_changingWallpaperShouldRemainDimmed() throws IOException {
+        ensureSetWallpaperDimAmountPermissionIsGranted();
+
+        float dimAmount = 0.65f;
+        mWallpaperManager.setWallpaperDimAmount(dimAmount);
+        mWallpaperManager.setResource(R.drawable.robot);
+
+        assertDimAmountEqualsTo(dimAmount);
+    }
+
+    @Test
+    public void colorHintsOnDimTest() throws IOException {
+        ensureSetWallpaperDimAmountPermissionIsGranted();
+
+        Bitmap tmpWallpaper = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(tmpWallpaper);
+        canvas.drawColor(Color.WHITE);
+
+        mWallpaperManager.setBitmap(tmpWallpaper);
+
+        WallpaperColors colors = mWallpaperManager
+                .getWallpaperColors(WallpaperManager.FLAG_SYSTEM);
+        int colorHints = colors.getColorHints();
+        // Color hints support dark text on white wallpaper
+        Assert.assertEquals(WallpaperColors.HINT_SUPPORTS_DARK_TEXT,
+                colorHints & WallpaperColors.HINT_SUPPORTS_DARK_TEXT);
+
+        float lowDimAmount = 0.1f;
+        mWallpaperManager.setWallpaperDimAmount(lowDimAmount);
+        assertDimAmountEqualsTo(lowDimAmount);
+        colors = mWallpaperManager.getWallpaperColors(WallpaperManager.FLAG_SYSTEM);
+        colorHints = colors.getColorHints();
+        // Color hints still support dark text on white wallpaper that is not dimmed enough
+        Assert.assertEquals(WallpaperColors.HINT_SUPPORTS_DARK_TEXT,
+                colorHints & WallpaperColors.HINT_SUPPORTS_DARK_TEXT);
+
+        float higherDimAmount = 0.7f;
+        mWallpaperManager.setWallpaperDimAmount(higherDimAmount);
+        assertDimAmountEqualsTo(higherDimAmount);
+        colors = mWallpaperManager.getWallpaperColors(WallpaperManager.FLAG_SYSTEM);
+        colorHints = colors.getColorHints();
+        // Dimmed white wallpaper does not support dark text
+        Assert.assertNotEquals(WallpaperColors.HINT_SUPPORTS_DARK_TEXT,
+                colorHints & WallpaperColors.HINT_SUPPORTS_DARK_TEXT);
+    }
+
     private void assertBitmapDimensions(Bitmap bitmap) {
         int maxSize = getMaxTextureSize();
         boolean safe = false;
@@ -571,6 +686,20 @@
         return spy(new TestableColorListener());
     }
 
+    private void assertDimAmountEqualsTo(float dimAmount) {
+        float storedDimAmount = -1f;
+        for (int i = 0; i < MAX_WAIT_TIME_MS; i += WAIT_TIME_INCR_MS) {
+            storedDimAmount = mWallpaperManager.getWallpaperDimAmount();
+            if (dimAmount == storedDimAmount) break;
+            try {
+                Thread.sleep(WAIT_TIME_INCR_MS);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+        Assert.assertEquals(dimAmount, storedDimAmount, /* delta */ 0f);
+    }
+
     public class TestableColorListener implements WallpaperManager.OnColorsChangedListener {
         @Override
         public void onColorsChanged(WallpaperColors colors, int which) {
diff --git a/tests/app/src/android/app/people/cts/PeopleManagerTest.java b/tests/app/src/android/app/people/cts/PeopleManagerTest.java
index 8b67eb4..ac6a52d 100644
--- a/tests/app/src/android/app/people/cts/PeopleManagerTest.java
+++ b/tests/app/src/android/app/people/cts/PeopleManagerTest.java
@@ -16,6 +16,9 @@
 
 package android.app.people.cts;
 
+import static android.Manifest.permission.POST_NOTIFICATIONS;
+import static android.Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL;
+import static android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS;
 import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
 import static android.app.people.ConversationStatus.ACTIVITY_ANNIVERSARY;
 import static android.app.people.ConversationStatus.ACTIVITY_GAME;
@@ -38,12 +41,17 @@
 import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
 import android.graphics.drawable.Icon;
+import android.os.Process;
 import android.os.SystemClock;
+import android.permission.PermissionManager;
+import android.permission.cts.PermissionUtils;
 import android.test.AndroidTestCase;
 import android.util.ArraySet;
 
 import androidx.test.InstrumentationRegistry;
 
+import com.android.compatibility.common.util.SystemUtil;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -72,6 +80,7 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
+        PermissionUtils.grantPermission(mContext.getPackageName(), POST_NOTIFICATIONS);
         // This will leave a set of channels on the device with each test run.
         mId = UUID.randomUUID().toString();
         mNotificationManager = mContext.getSystemService(NotificationManager.class);
@@ -105,6 +114,15 @@
             mNotificationManager.deleteNotificationChannel(nc.getId());
         }
         deleteShortcuts();
+        // Use test API to prevent PermissionManager from killing the test process when revoking
+        // permission.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> mContext.getSystemService(PermissionManager.class)
+                        .revokePostNotificationPermissionWithoutKillForTest(
+                                mContext.getPackageName(),
+                                Process.myUserHandle().getIdentifier()),
+                REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL,
+                REVOKE_RUNTIME_PERMISSIONS);
     }
 
     /** Creates a dynamic, longlived, sharing shortcut. Call {@link #deleteShortcuts()} after. */
diff --git a/tests/appintegrity/src/android/appintegrity/cts/CtsAppIntegrityDeviceTest.java b/tests/appintegrity/src/android/appintegrity/cts/CtsAppIntegrityDeviceTest.java
index 977e981..8c9b7a7 100644
--- a/tests/appintegrity/src/android/appintegrity/cts/CtsAppIntegrityDeviceTest.java
+++ b/tests/appintegrity/src/android/appintegrity/cts/CtsAppIntegrityDeviceTest.java
@@ -18,13 +18,15 @@
 import android.content.integrity.IntegrityFormula;
 import android.content.integrity.Rule;
 import android.content.integrity.RuleSet;
-import androidx.test.rule.ActivityTestRule;
+
 import androidx.test.runner.AndroidJUnit4;
-import java.util.Arrays;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.Arrays;
+
 /**
  * Test public APIs defined for AppIntegrityManager.
  */
@@ -59,6 +61,16 @@
     }
 
     /**
+     * Test app integrity rule creation for app certificate lineage contain formula.
+     */
+    @Test
+    public void applicationCertificateLineageContainFormulaApiAvailable() throws Exception {
+        IntegrityFormula formula =
+                IntegrityFormula.Application.certificateLineageContains("certificate");
+        Assert.assertNotNull(formula);
+    }
+
+    /**
      * Test app integrity rule creation for app version code equals formula.
      */
     @Test
diff --git a/tests/appsearch/Android.bp b/tests/appsearch/Android.bp
index 8ecb5aa..a4e8950 100644
--- a/tests/appsearch/Android.bp
+++ b/tests/appsearch/Android.bp
@@ -24,6 +24,7 @@
         "androidx.test.ext.junit",
         "androidx.test.rules",
         "compatibility-device-util-axt",
+        "service-appsearch",
         "testng",
     ],
     srcs: [
@@ -33,8 +34,8 @@
     test_suites: [
         "cts",
         "general-tests",
+        "mts-appsearch",
     ],
-    platform_apis: true,
 }
 
 android_test_helper_app {
@@ -49,20 +50,19 @@
     ],
     srcs: [
         "helper-app/src/**/*.java",
-        ":CtsAppSearchTestsAidl"
+        ":CtsAppSearchTestsAidl",
     ],
     test_suites: [
         "cts",
-        "vts",
-        "vts10",
         "general-tests",
+        "mts-appsearch",
     ],
     manifest: "helper-app/AndroidManifest.xml",
     aaptflags: [
         "--rename-manifest-package com.android.cts.appsearch.helper.a",
     ],
     certificate: ":cts-appsearch-helper-cert-a",
-    sdk_version: "test_current"
+    sdk_version: "test_current",
 }
 
 android_test_helper_app {
@@ -77,25 +77,24 @@
     ],
     srcs: [
         "helper-app/src/**/*.java",
-        ":CtsAppSearchTestsAidl"
+        ":CtsAppSearchTestsAidl",
     ],
     test_suites: [
         "cts",
-        "vts",
-        "vts10",
         "general-tests",
+        "mts-appsearch",
     ],
     manifest: "helper-app/AndroidManifest.xml",
     aaptflags: [
         "--rename-manifest-package com.android.cts.appsearch.helper.b",
     ],
     certificate: ":cts-appsearch-helper-cert-b",
-    sdk_version: "test_current"
+    sdk_version: "test_current",
 }
 
 filegroup {
     name: "CtsAppSearchTestsAidl",
     srcs: [
         "aidl/**/*.aidl",
-    ]
+    ],
 }
diff --git a/tests/appsearch/AndroidTest.xml b/tests/appsearch/AndroidTest.xml
index 9577159..245569d 100644
--- a/tests/appsearch/AndroidTest.xml
+++ b/tests/appsearch/AndroidTest.xml
@@ -32,4 +32,9 @@
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.cts.appsearch" />
     </test>
+
+    <object type="module_controller"
+            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+        <option name="mainline-module-package-name" value="com.google.android.appsearch" />
+    </object>
 </configuration>
diff --git a/tests/appsearch/aidl/com/android/cts/appsearch/ICommandReceiver.aidl b/tests/appsearch/aidl/com/android/cts/appsearch/ICommandReceiver.aidl
index a2ca4bd..fdbc84f 100644
--- a/tests/appsearch/aidl/com/android/cts/appsearch/ICommandReceiver.aidl
+++ b/tests/appsearch/aidl/com/android/cts/appsearch/ICommandReceiver.aidl
@@ -15,14 +15,22 @@
  */
 package com.android.cts.appsearch;
 
+import android.os.Bundle;
 import java.util.List;
 
 interface ICommandReceiver {
-    List<String> globalSearch(String queryExpression);
+    List<String> globalSearch(in String queryExpression);
 
-    boolean indexGloballySearchableDocument();
+    List<String> globalGet(in String packageName, in String databaseName, in String namespace,
+        in String id);
 
-    boolean indexNotGloballySearchableDocument();
+    List<String> globalGetSchema(String packageName, String databaseName);
 
-    boolean clearData();
-}
\ No newline at end of file
+    boolean indexGloballySearchableDocument(in String databaseName, in String namespace,
+        in String id, in List<Bundle> permissionBundles);
+
+    boolean indexNotGloballySearchableDocument(in String databaseName, in String namespace,
+        in String id);
+
+    boolean clearData(in String databaseName);
+}
diff --git a/tests/appsearch/helper-app/src/com/android/cts/appsearch/helper/AppSearchTestService.java b/tests/appsearch/helper-app/src/com/android/cts/appsearch/helper/AppSearchTestService.java
index c30f625..4bc004d 100644
--- a/tests/appsearch/helper-app/src/com/android/cts/appsearch/helper/AppSearchTestService.java
+++ b/tests/appsearch/helper-app/src/com/android/cts/appsearch/helper/AppSearchTestService.java
@@ -15,26 +15,32 @@
  */
 package com.android.cts.appsearch.helper;
 
-import static com.android.server.appsearch.testing.AppSearchTestUtils.checkIsBatchResultSuccess;
-import static com.android.server.appsearch.testing.AppSearchTestUtils.convertSearchResultsToDocuments;
+import static android.app.appsearch.testutil.AppSearchTestUtils.checkIsBatchResultSuccess;
+import static android.app.appsearch.testutil.AppSearchTestUtils.convertSearchResultsToDocuments;
 
 import android.app.Service;
+import android.app.appsearch.AppSearchBatchResult;
 import android.app.appsearch.AppSearchManager;
+import android.app.appsearch.AppSearchSchema;
 import android.app.appsearch.AppSearchSessionShim;
 import android.app.appsearch.GenericDocument;
+import android.app.appsearch.GetByDocumentIdRequest;
+import android.app.appsearch.GetSchemaResponse;
 import android.app.appsearch.GlobalSearchSessionShim;
 import android.app.appsearch.PutDocumentsRequest;
 import android.app.appsearch.SearchResultsShim;
 import android.app.appsearch.SearchSpec;
 import android.app.appsearch.SetSchemaRequest;
+import android.app.appsearch.testutil.AppSearchEmail;
+import android.app.appsearch.testutil.AppSearchSessionShimImpl;
+import android.app.appsearch.testutil.GlobalSearchSessionShimImpl;
 import android.content.Intent;
+import android.os.Bundle;
 import android.os.IBinder;
+import android.util.ArraySet;
 import android.util.Log;
 
 import com.android.cts.appsearch.ICommandReceiver;
-import com.android.server.appsearch.testing.AppSearchEmail;
-import com.android.server.appsearch.testing.AppSearchSessionShimImpl;
-import com.android.server.appsearch.testing.GlobalSearchSessionShimImpl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -45,7 +51,6 @@
 
     private static final String TAG = "AppSearchTestService";
     private GlobalSearchSessionShim mGlobalSearchSessionShim;
-    private AppSearchSessionShim mAppSearchSessionShim;
 
     @Override
     public void onCreate() {
@@ -54,14 +59,8 @@
             // stub, it'll try to grab the context from ApplicationProvider. But that will fail
             // since this isn't instrumented.
             mGlobalSearchSessionShim =
-                    GlobalSearchSessionShimImpl.createGlobalSearchSession(this).get();
+                    GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(this).get();
 
-            mAppSearchSessionShim =
-                    AppSearchSessionShimImpl.createSearchSession(
-                                    this,
-                                    new AppSearchManager.SearchContext.Builder("database").build(),
-                                    Executors.newCachedThreadPool())
-                            .get();
         } catch (Exception e) {
             Log.e(TAG, "Error starting service.", e);
         }
@@ -98,26 +97,82 @@
         }
 
         @Override
-        public boolean indexGloballySearchableDocument() {
+        public List<String> globalGet(
+                String packageName, String databaseName, String namespace, String id) {
             try {
-                // By default, schemas/documents are globally searchable. We don't purposely set
-                // setSchemaTypeDisplayedBySystem(false) for this schema.
-                mAppSearchSessionShim
-                        .setSchema(
-                                new SetSchemaRequest.Builder()
-                                        .addSchemas(AppSearchEmail.SCHEMA)
+                AppSearchBatchResult<String, GenericDocument> getResult =
+                        mGlobalSearchSessionShim.getByDocumentIdAsync(
+                                packageName,
+                                databaseName,
+                                new GetByDocumentIdRequest.Builder(namespace)
+                                        .addIds(id)
                                         .build())
-                        .get();
+                                .get();
+
+                List<String> resultStrings = new ArrayList<>();
+                for (String docKey : getResult.getSuccesses().keySet()) {
+                    resultStrings.add(getResult.getSuccesses().get(docKey).toString());
+                }
+
+                return resultStrings;
+            } catch (Exception e) {
+                Log.e(TAG, "Error issuing global get.", e);
+                return Collections.emptyList();
+            }
+        }
+
+        public List<String> globalGetSchema(String packageName, String databaseName) {
+            try {
+                GetSchemaResponse response =
+                        mGlobalSearchSessionShim.getSchema(packageName, databaseName).get();
+                if (response == null || response.getSchemas().isEmpty()) {
+                    return null;
+                }
+                List<String> schemas = new ArrayList(response.getSchemas().size());
+                for (AppSearchSchema schema : response.getSchemas()) {
+                    schemas.add(schema.toString());
+                }
+                return schemas;
+            } catch (Exception e) {
+                Log.e(TAG, "Error retrieving global schema.", e);
+                return null;
+            }
+        }
+
+        @Override
+        public boolean indexGloballySearchableDocument(
+                String databaseName, String namespace, String id, List<Bundle> permissionBundles) {
+            try {
+                AppSearchSessionShim db =
+                        AppSearchSessionShimImpl.createSearchSessionAsync(
+                                AppSearchTestService.this,
+                                new AppSearchManager.SearchContext.Builder(databaseName).build(),
+                                Executors.newCachedThreadPool())
+                                .get();
+
+                // By default, schemas/documents are globally searchable. We don't purposely set
+                // setSchemaTypeDisplayedBySystem(false) for this schema
+                SetSchemaRequest.Builder setSchemaRequestBuilder =
+                        new SetSchemaRequest.Builder()
+                                .setForceOverride(true)
+                                .addSchemas(AppSearchEmail.SCHEMA);
+                for (int i = 0; i < permissionBundles.size(); i++) {
+                    setSchemaRequestBuilder.addRequiredPermissionsForSchemaTypeVisibility(
+                            AppSearchEmail.SCHEMA_TYPE,
+                            new ArraySet<>(permissionBundles.get(i)
+                                    .getIntegerArrayList("permission")));
+                }
+                db.setSchema(setSchemaRequestBuilder.build()).get();
 
                 AppSearchEmail emailDocument =
-                        new AppSearchEmail.Builder("namespace", "id1")
+                        new AppSearchEmail.Builder(namespace, id)
                                 .setFrom("from@example.com")
                                 .setTo("to1@example.com", "to2@example.com")
                                 .setSubject("subject")
                                 .setBody("this is the body of the email")
                                 .build();
                 checkIsBatchResultSuccess(
-                        mAppSearchSessionShim.put(
+                        db.put(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(emailDocument)
                                         .build()));
@@ -129,26 +184,34 @@
         }
 
         @Override
-        public boolean indexNotGloballySearchableDocument() {
+        public boolean indexNotGloballySearchableDocument(
+                String databaseName, String namespace, String id) {
             try {
-                mAppSearchSessionShim
-                        .setSchema(
-                                new SetSchemaRequest.Builder()
-                                        .addSchemas(AppSearchEmail.SCHEMA)
-                                        .setSchemaTypeDisplayedBySystem(
-                                                AppSearchEmail.SCHEMA_TYPE, /*displayed=*/ false)
-                                        .build())
+                AppSearchSessionShim db =
+                        AppSearchSessionShimImpl.createSearchSessionAsync(
+                                AppSearchTestService.this,
+                                new AppSearchManager.SearchContext.Builder(databaseName).build(),
+                                Executors.newCachedThreadPool())
+                                .get();
+
+                db.setSchema(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA)
+                                .setForceOverride(true)
+                                .setSchemaTypeDisplayedBySystem(
+                                        AppSearchEmail.SCHEMA_TYPE, /*displayed=*/ false)
+                                .build())
                         .get();
 
                 AppSearchEmail emailDocument =
-                        new AppSearchEmail.Builder("namespace", "id1")
+                        new AppSearchEmail.Builder(namespace, id)
                                 .setFrom("from@example.com")
                                 .setTo("to1@example.com", "to2@example.com")
                                 .setSubject("subject")
                                 .setBody("this is the body of the email")
                                 .build();
                 checkIsBatchResultSuccess(
-                        mAppSearchSessionShim.put(
+                        db.put(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(emailDocument)
                                         .build()));
@@ -159,13 +222,19 @@
             return false;
         }
 
-        public boolean clearData() {
+        public boolean clearData(String databaseName) {
             try {
                 // Force override with empty schema will clear all previous schemas and their
                 // documents.
-                mAppSearchSessionShim
-                        .setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build())
-                        .get();
+                AppSearchSessionShim db =
+                        AppSearchSessionShimImpl.createSearchSessionAsync(
+                                AppSearchTestService.this,
+                                new AppSearchManager.SearchContext.Builder(databaseName).build(),
+                                Executors.newCachedThreadPool())
+                                .get();
+
+                db.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
+
                 return true;
             } catch (Exception e) {
                 Log.e(TAG, "Failed to clear data.", e);
diff --git a/tests/appsearch/src/com/android/cts/appsearch/app/AppSearchSchemaMigrationCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/app/AppSearchSchemaMigrationCtsTest.java
index 2c6e032..2b11e40 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/app/AppSearchSchemaMigrationCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/app/AppSearchSchemaMigrationCtsTest.java
@@ -17,17 +17,17 @@
 
 import android.app.appsearch.AppSearchManager;
 import android.app.appsearch.AppSearchSessionShim;
+import android.app.appsearch.testutil.AppSearchSessionShimImpl;
 
 import androidx.annotation.NonNull;
 
-import com.android.server.appsearch.testing.AppSearchSessionShimImpl;
-
 import com.google.common.util.concurrent.ListenableFuture;
 
 public class AppSearchSchemaMigrationCtsTest extends AppSearchSchemaMigrationCtsTestBase {
     @Override
-    protected ListenableFuture<AppSearchSessionShim> createSearchSession(@NonNull String dbName) {
-        return AppSearchSessionShimImpl.createSearchSession(
+    protected ListenableFuture<AppSearchSessionShim> createSearchSessionAsync(
+            @NonNull String dbName) {
+        return AppSearchSessionShimImpl.createSearchSessionAsync(
                 new AppSearchManager.SearchContext.Builder(dbName).build());
     }
 }
diff --git a/tests/appsearch/src/com/android/cts/appsearch/app/AppSearchSessionCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/app/AppSearchSessionCtsTest.java
index 559653cf..6dc41cf 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/app/AppSearchSessionCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/app/AppSearchSessionCtsTest.java
@@ -17,29 +17,27 @@
 
 import android.app.appsearch.AppSearchManager;
 import android.app.appsearch.AppSearchSessionShim;
+import android.app.appsearch.testutil.AppSearchSessionShimImpl;
 import android.content.Context;
 
 import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.server.appsearch.testing.AppSearchSessionShimImpl;
-
 import com.google.common.util.concurrent.ListenableFuture;
 
 import java.util.concurrent.ExecutorService;
 
 public class AppSearchSessionCtsTest extends AppSearchSessionCtsTestBase {
-    @Override
-    protected ListenableFuture<AppSearchSessionShim> createSearchSession(@NonNull String dbName) {
-        return AppSearchSessionShimImpl.createSearchSession(
+    protected ListenableFuture<AppSearchSessionShim> createSearchSessionAsync(
+            @NonNull String dbName) {
+        return AppSearchSessionShimImpl.createSearchSessionAsync(
                 new AppSearchManager.SearchContext.Builder(dbName).build());
     }
 
-    @Override
-    protected ListenableFuture<AppSearchSessionShim> createSearchSession(
+    protected ListenableFuture<AppSearchSessionShim> createSearchSessionAsync(
             @NonNull String dbName, @NonNull ExecutorService executor) {
         Context context = ApplicationProvider.getApplicationContext();
-        return AppSearchSessionShimImpl.createSearchSession(context,
+        return AppSearchSessionShimImpl.createSearchSessionAsync(context,
                 new AppSearchManager.SearchContext.Builder(dbName).build(), executor);
     }
 }
diff --git a/tests/appsearch/src/com/android/cts/appsearch/app/AppSearchSessionPlatformCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/app/AppSearchSessionPlatformCtsTest.java
index c586d2c..0c2e6cb 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/app/AppSearchSessionPlatformCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/app/AppSearchSessionPlatformCtsTest.java
@@ -16,14 +16,22 @@
 
 package android.app.appsearch.cts.app;
 
+import static android.app.appsearch.testutil.AppSearchTestUtils.checkIsBatchResultSuccess;
+import static android.app.appsearch.testutil.AppSearchTestUtils.doGet;
 import static android.os.storage.StorageManager.UUID_DEFAULT;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.app.appsearch.AppSearchBatchResult;
 import android.app.appsearch.AppSearchManager;
+import android.app.appsearch.AppSearchSchema;
 import android.app.appsearch.AppSearchSessionShim;
+import android.app.appsearch.GenericDocument;
+import android.app.appsearch.GetByDocumentIdRequest;
 import android.app.appsearch.PutDocumentsRequest;
 import android.app.appsearch.SetSchemaRequest;
+import android.app.appsearch.testutil.AppSearchEmail;
+import android.app.appsearch.testutil.AppSearchSessionShimImpl;
 import android.app.usage.StorageStats;
 import android.app.usage.StorageStatsManager;
 import android.content.Context;
@@ -31,9 +39,6 @@
 
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.server.appsearch.testing.AppSearchEmail;
-import com.android.server.appsearch.testing.AppSearchSessionShimImpl;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -49,7 +54,7 @@
     @Before
     public void setUp() throws Exception {
         mDb =
-                AppSearchSessionShimImpl.createSearchSession(
+                AppSearchSessionShimImpl.createSearchSessionAsync(
                                 new AppSearchManager.SearchContext.Builder(DB_NAME).build())
                         .get();
 
@@ -130,4 +135,41 @@
         assertThat(afterStatsForPkg.getDataBytes()).isEqualTo(beforeStatsForPkg.getDataBytes());
         assertThat(afterStatsForUid.getDataBytes()).isEqualTo(beforeStatsForUid.getDataBytes());
     }
+
+    @Test
+    public void testPutDocuments_emptyBytesAndDocuments() throws Exception {
+        // Schema registration
+        AppSearchSchema schema = new AppSearchSchema.Builder("testSchema")
+                .addProperty(new AppSearchSchema.BytesPropertyConfig.Builder("bytes")
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REPEATED)
+                        .build())
+                .addProperty(new AppSearchSchema.DocumentPropertyConfig.Builder(
+                        "document", AppSearchEmail.SCHEMA_TYPE)
+                        .setCardinality(AppSearchSchema.PropertyConfig.CARDINALITY_REPEATED)
+                        .setShouldIndexNestedProperties(true)
+                        .build())
+                .build();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(schema, AppSearchEmail.SCHEMA).build()).get();
+
+        // Index a document
+        GenericDocument document = new GenericDocument.Builder<>("namespace", "id1", "testSchema")
+                .setPropertyBytes("bytes")
+                .setPropertyDocument("document")
+                .build();
+
+        AppSearchBatchResult<String, Void> result = checkIsBatchResultSuccess(mDb.put(
+                new PutDocumentsRequest.Builder().addGenericDocuments(document).build()));
+        assertThat(result.getSuccesses()).containsExactly("id1", null);
+        assertThat(result.getFailures()).isEmpty();
+
+        GetByDocumentIdRequest request = new GetByDocumentIdRequest.Builder("namespace")
+                .addIds("id1")
+                .build();
+        List<GenericDocument> outDocuments = doGet(mDb, request);
+        assertThat(outDocuments).hasSize(1);
+        GenericDocument outDocument = outDocuments.get(0);
+        assertThat(outDocument.getPropertyBytesArray("bytes")).isEmpty();
+        assertThat(outDocument.getPropertyDocumentArray("document")).isEmpty();
+    }
 }
diff --git a/tests/appsearch/src/com/android/cts/appsearch/app/GlobalSearchSessionCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/app/GlobalSearchSessionCtsTest.java
index ecdc9c0..adf39ee 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/app/GlobalSearchSessionCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/app/GlobalSearchSessionCtsTest.java
@@ -18,23 +18,21 @@
 import android.app.appsearch.AppSearchManager;
 import android.app.appsearch.AppSearchSessionShim;
 import android.app.appsearch.GlobalSearchSessionShim;
+import android.app.appsearch.testutil.AppSearchSessionShimImpl;
+import android.app.appsearch.testutil.GlobalSearchSessionShimImpl;
 
 import androidx.annotation.NonNull;
 
-import com.android.server.appsearch.testing.AppSearchSessionShimImpl;
-import com.android.server.appsearch.testing.GlobalSearchSessionShimImpl;
-
 import com.google.common.util.concurrent.ListenableFuture;
 
 public class GlobalSearchSessionCtsTest extends GlobalSearchSessionCtsTestBase {
-    @Override
-    protected ListenableFuture<AppSearchSessionShim> createSearchSession(@NonNull String dbName) {
-        return AppSearchSessionShimImpl.createSearchSession(
+    protected ListenableFuture<AppSearchSessionShim> createSearchSessionAsync(
+            @NonNull String dbName) {
+        return AppSearchSessionShimImpl.createSearchSessionAsync(
                 new AppSearchManager.SearchContext.Builder(dbName).build());
     }
 
-    @Override
-    protected ListenableFuture<GlobalSearchSessionShim> createGlobalSearchSession() {
-        return GlobalSearchSessionShimImpl.createGlobalSearchSession();
+    protected ListenableFuture<GlobalSearchSessionShim> createGlobalSearchSessionAsync() {
+        return GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync();
     }
 }
diff --git a/tests/appsearch/src/com/android/cts/appsearch/app/GlobalSearchSessionPlatformCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/app/GlobalSearchSessionPlatformCtsTest.java
index 2d5331d..d558ae0 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/app/GlobalSearchSessionPlatformCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/app/GlobalSearchSessionPlatformCtsTest.java
@@ -15,15 +15,21 @@
  */
 package android.app.appsearch.cts.app;
 
+import static android.Manifest.permission.READ_CALENDAR;
+import static android.Manifest.permission.READ_CONTACTS;
+import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
 import static android.Manifest.permission.READ_GLOBAL_APP_SEARCH_DATA;
-
-import static com.android.server.appsearch.testing.AppSearchTestUtils.checkIsBatchResultSuccess;
+import static android.Manifest.permission.READ_SMS;
+import static android.app.appsearch.testutil.AppSearchTestUtils.checkIsBatchResultSuccess;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.app.appsearch.AppSearchBatchResult;
 import android.app.appsearch.AppSearchManager;
 import android.app.appsearch.AppSearchSessionShim;
 import android.app.appsearch.GenericDocument;
+import android.app.appsearch.GetByDocumentIdRequest;
+import android.app.appsearch.GetSchemaResponse;
 import android.app.appsearch.GlobalSearchSessionShim;
 import android.app.appsearch.PackageIdentifier;
 import android.app.appsearch.PutDocumentsRequest;
@@ -33,10 +39,17 @@
 import android.app.appsearch.SearchResultsShim;
 import android.app.appsearch.SearchSpec;
 import android.app.appsearch.SetSchemaRequest;
+import android.app.appsearch.observer.DocumentChangeInfo;
+import android.app.appsearch.observer.ObserverSpec;
+import android.app.appsearch.testutil.AppSearchEmail;
+import android.app.appsearch.testutil.AppSearchSessionShimImpl;
+import android.app.appsearch.testutil.GlobalSearchSessionShimImpl;
+import android.app.appsearch.testutil.TestObserverCallback;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.os.Bundle;
 import android.os.IBinder;
 import android.platform.test.annotations.AppModeFull;
 import android.util.Log;
@@ -45,22 +58,24 @@
 
 import com.android.compatibility.common.util.SystemUtil;
 import com.android.cts.appsearch.ICommandReceiver;
-import com.android.server.appsearch.testing.AppSearchEmail;
-import com.android.server.appsearch.testing.AppSearchSessionShimImpl;
-import com.android.server.appsearch.testing.GlobalSearchSessionShimImpl;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.io.BaseEncoding;
+import com.google.common.util.concurrent.MoreExecutors;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Executor;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * This doesn't extend {@link android.app.appsearch.cts.app.GlobalSearchSessionCtsTestBase} since
@@ -106,15 +121,18 @@
 
     private static final String TEXT = "foo";
 
+    private static final String NAMESPACE_NAME = "namespace";
+
     private static final AppSearchEmail EMAIL_DOCUMENT =
-            new AppSearchEmail.Builder("namespace", "id1")
+            new AppSearchEmail.Builder(NAMESPACE_NAME, "id1")
                     .setFrom("from@example.com")
                     .setTo("to1@example.com", "to2@example.com")
                     .setSubject(TEXT)
                     .setBody("this is the body of the email")
                     .build();
 
-    private static final String DB_NAME = "";
+    private static final String DB_NAME = "database";
+
 
     private GlobalSearchSessionShim mGlobalSearchSession;
     private AppSearchSessionShim mDb;
@@ -125,7 +143,7 @@
     public void setUp() throws Exception {
         mContext = ApplicationProvider.getApplicationContext();
         mDb =
-                AppSearchSessionShimImpl.createSearchSession(
+                AppSearchSessionShimImpl.createSearchSessionAsync(
                                 new AppSearchManager.SearchContext.Builder(DB_NAME).build())
                         .get();
         cleanup();
@@ -140,8 +158,8 @@
     private void cleanup() throws Exception {
         mDb.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
 
-        clearData(PKG_A);
-        clearData(PKG_B);
+        clearData(PKG_A, DB_NAME);
+        clearData(PKG_B, DB_NAME);
     }
 
     @Test
@@ -300,14 +318,282 @@
     }
 
     @Test
-    public void testGlobalSearch_withAccess() throws Exception {
-        indexGloballySearchableDocument(PKG_A);
-        indexGloballySearchableDocument(PKG_B);
+    public void testAllowPermissionAccess() throws Exception {
+        // index a global searchable document in pkg_A and set it needs READ_SMS to read it.
+        indexGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1",
+                ImmutableSet.of(ImmutableSet.of(SetSchemaRequest.READ_SMS)));
 
         SystemUtil.runWithShellPermissionIdentity(
                 () -> {
                     mGlobalSearchSession =
-                            GlobalSearchSessionShimImpl.createGlobalSearchSession(mContext).get();
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext)
+                                    .get();
+
+                    // Can get the document
+                    AppSearchBatchResult<String, GenericDocument> result = mGlobalSearchSession
+                            .getByDocumentIdAsync(PKG_A, "database",
+                                    new GetByDocumentIdRequest.Builder("namespace")
+                                            .addIds("id1")
+                                            .build()).get();
+                    assertThat(result.getSuccesses()).hasSize(1);
+                },
+                READ_SMS);
+    }
+
+    //TODO(b/202194495) add test for READ_HOME_APP_SEARCH_DATA and READ_ASSISTANT_APP_SEARCH_DATA
+    // once they are available in Shell.
+    @Test
+    public void testRequireAllPermissionsOfAnyCombinationToAccess() throws Exception {
+        // index a global searchable document in pkg_A and set it needs both READ_SMS and
+        // READ_CALENDAR or READ_HOME_APP_SEARCH_DATA only or READ_ASSISTANT_APP_SEARCH_DATA
+        // only to read it.
+        indexGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1",
+                ImmutableSet.of(
+                        ImmutableSet.of(SetSchemaRequest.READ_SMS,
+                                SetSchemaRequest.READ_CALENDAR),
+                        ImmutableSet.of(SetSchemaRequest.READ_CONTACTS),
+                        ImmutableSet.of(SetSchemaRequest.READ_EXTERNAL_STORAGE)));
+
+        // Has READ_SMS only cannot access the document.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> {
+                    mGlobalSearchSession =
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext)
+                                    .get();
+
+                    // Can get the document
+                    AppSearchBatchResult<String, GenericDocument> result = mGlobalSearchSession
+                            .getByDocumentIdAsync(PKG_A, "database",
+                                    new GetByDocumentIdRequest.Builder("namespace")
+                                            .addIds("id1")
+                                            .build()).get();
+                    assertThat(result.getSuccesses()).isEmpty();
+                },
+                READ_SMS);
+
+        // Has READ_SMS and READ_CALENDAR can access the document.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> {
+                    mGlobalSearchSession =
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext)
+                                    .get();
+
+                    // Can get the document
+                    AppSearchBatchResult<String, GenericDocument> result = mGlobalSearchSession
+                            .getByDocumentIdAsync(PKG_A, "database",
+                                    new GetByDocumentIdRequest.Builder("namespace")
+                                            .addIds("id1")
+                                            .build()).get();
+                    assertThat(result.getSuccesses()).hasSize(1);
+                },
+                READ_SMS, READ_CALENDAR);
+
+        // Has READ_CONTACTS can access the document also.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> {
+                    mGlobalSearchSession =
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext)
+                                    .get();
+
+                    // Can get the document
+                    AppSearchBatchResult<String, GenericDocument> result = mGlobalSearchSession
+                            .getByDocumentIdAsync(PKG_A, "database",
+                                    new GetByDocumentIdRequest.Builder("namespace")
+                                            .addIds("id1")
+                                            .build()).get();
+                    assertThat(result.getSuccesses()).hasSize(1);
+                },
+                READ_CONTACTS);
+
+        // Has READ_EXTERNAL_STORAGE can access the document.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> {
+                    mGlobalSearchSession =
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext)
+                                    .get();
+
+                    // Can get the document
+                    AppSearchBatchResult<String, GenericDocument> result = mGlobalSearchSession
+                            .getByDocumentIdAsync(PKG_A, "database",
+                                    new GetByDocumentIdRequest.Builder("namespace")
+                                            .addIds("id1")
+                                            .build()).get();
+                    assertThat(result.getSuccesses()).hasSize(1);
+                },
+                READ_EXTERNAL_STORAGE);
+    }
+
+    @Test
+    public void testAllowPermissions_sameError() throws Exception {
+        // Try to get document before we put them, this is not found error.
+        mGlobalSearchSession =
+                GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext).get();
+        AppSearchBatchResult<String, GenericDocument> nonExistentResult = mGlobalSearchSession
+                .getByDocumentIdAsync(PKG_A, "database",
+                        new GetByDocumentIdRequest.Builder("namespace")
+                                .addIds("id1")
+                                .build()).get();
+        assertThat(nonExistentResult.isSuccess()).isFalse();
+        assertThat(nonExistentResult.getSuccesses()).isEmpty();
+        assertThat(nonExistentResult.getFailures()).containsKey("id1");
+
+        // Index a global searchable document in pkg_A and set it needs READ_SMS to read it.
+        indexGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1",
+                ImmutableSet.of(ImmutableSet.of(SetSchemaRequest.READ_SMS)));
+
+        // Try to get document w/o permission, this is unAuthority error.
+        mGlobalSearchSession =
+                GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext).get();
+        AppSearchBatchResult<String, GenericDocument> unAuthResult = mGlobalSearchSession
+                .getByDocumentIdAsync(PKG_A, "database",
+                        new GetByDocumentIdRequest.Builder("namespace")
+                                .addIds("id1")
+                                .build()).get();
+        assertThat(unAuthResult.isSuccess()).isFalse();
+        assertThat(unAuthResult.getSuccesses()).isEmpty();
+        assertThat(unAuthResult.getFailures()).containsKey("id1");
+
+        // The error messages must be same.
+        assertThat(unAuthResult.getFailures().get("id1").getErrorMessage())
+                .isEqualTo(nonExistentResult.getFailures().get("id1").getErrorMessage());
+    }
+
+    @Test
+    public void testGlobalGetById_withAccess() throws Exception {
+        indexGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1");
+
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> {
+                    mGlobalSearchSession =
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext)
+                                    .get();
+
+                    // Can get the document
+                    AppSearchBatchResult<String, GenericDocument> result = mGlobalSearchSession
+                            .getByDocumentIdAsync(PKG_A, DB_NAME,
+                                    new GetByDocumentIdRequest.Builder(NAMESPACE_NAME)
+                                            .addIds("id1")
+                                            .build()).get();
+
+                    assertThat(result.getSuccesses()).hasSize(1);
+
+                    // Can't get non existent document
+                    AppSearchBatchResult<String, GenericDocument> nonExistent = mGlobalSearchSession
+                            .getByDocumentIdAsync(PKG_A, DB_NAME,
+                                    new GetByDocumentIdRequest.Builder(NAMESPACE_NAME)
+                                            .addIds("id2")
+                                            .build()).get();
+
+                    assertThat(nonExistent.isSuccess()).isFalse();
+                    assertThat(nonExistent.getSuccesses()).hasSize(0);
+                },
+                READ_GLOBAL_APP_SEARCH_DATA);
+    }
+
+    @Test
+    public void testGlobalGetById_withoutAccess() throws Exception {
+        indexNotGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1");
+
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> {
+                    mGlobalSearchSession =
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext)
+                                    .get();
+
+                    // Can't get the document
+                    AppSearchBatchResult<String, GenericDocument> result = mGlobalSearchSession
+                            .getByDocumentIdAsync(PKG_A, DB_NAME,
+                                    new GetByDocumentIdRequest.Builder(NAMESPACE_NAME)
+                                            .addIds("id1")
+                                            .build()).get();
+                    assertThat(result.isSuccess()).isFalse();
+                    assertThat(result.getSuccesses()).hasSize(0);
+                    assertThat(result.getFailures()).containsKey("id1");
+                },
+                READ_GLOBAL_APP_SEARCH_DATA);
+    }
+
+    @Test
+    public void testGlobalGetById_sameErrorMessages() throws Exception {
+        AtomicReference<String> errorMessageNonExistent = new AtomicReference<>();
+        AtomicReference<String> errorMessageUnauth = new AtomicReference<>();
+
+        // Can't get the document because we haven't added it yet
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> {
+                    mGlobalSearchSession =
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext)
+                                    .get();
+
+                    AppSearchBatchResult<String, GenericDocument> nonExistentResult =
+                            mGlobalSearchSession.getByDocumentIdAsync(PKG_A, DB_NAME,
+                                    new GetByDocumentIdRequest.Builder(NAMESPACE_NAME)
+                                            .addIds("id1")
+                                            .build()).get();
+                    assertThat(nonExistentResult.isSuccess()).isFalse();
+                    assertThat(nonExistentResult.getSuccesses()).hasSize(0);
+                    assertThat(nonExistentResult.getFailures()).containsKey("id1");
+                    errorMessageNonExistent.set(
+                            nonExistentResult.getFailures().get("id1").getErrorMessage());
+                },
+                READ_GLOBAL_APP_SEARCH_DATA);
+
+        indexNotGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1");
+
+        // Can't get the document because the document is not globally searchable
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> {
+                    mGlobalSearchSession =
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext)
+                                    .get();
+
+                    AppSearchBatchResult<String, GenericDocument> unAuthResult =
+                            mGlobalSearchSession.getByDocumentIdAsync(PKG_A, DB_NAME,
+                                    new GetByDocumentIdRequest.Builder(NAMESPACE_NAME)
+                                            .addIds("id1")
+                                            .build()).get();
+                    assertThat(unAuthResult.isSuccess()).isFalse();
+                    assertThat(unAuthResult.getSuccesses()).hasSize(0);
+                    assertThat(unAuthResult.getFailures()).containsKey("id1");
+                    errorMessageUnauth.set(
+                            unAuthResult.getFailures().get("id1").getErrorMessage());
+                },
+                READ_GLOBAL_APP_SEARCH_DATA);
+
+        // try adding a global doc here to make sure non-global querier can't get it
+        // and same error message
+        clearData(PKG_A, DB_NAME);
+        indexGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1");
+
+        // Can't get the document because we don't have global permissions
+        mGlobalSearchSession =
+                GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext).get();
+
+        AppSearchBatchResult<String, GenericDocument> noGlobalResult = mGlobalSearchSession
+                .getByDocumentIdAsync(PKG_A, DB_NAME,
+                        new GetByDocumentIdRequest.Builder(NAMESPACE_NAME)
+                                .addIds("id1")
+                                .build()).get();
+        assertThat(noGlobalResult.isSuccess()).isFalse();
+        assertThat(noGlobalResult.getSuccesses()).hasSize(0);
+        assertThat(noGlobalResult.getFailures()).containsKey("id1");
+
+        // compare error messages
+        assertThat(errorMessageNonExistent.get()).isEqualTo(errorMessageUnauth.get());
+        assertThat(errorMessageNonExistent.get())
+                .isEqualTo(noGlobalResult.getFailures().get("id1").getErrorMessage());
+    }
+
+    @Test
+    public void testGlobalSearch_withAccess() throws Exception {
+        indexGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1");
+        indexGloballySearchableDocument(PKG_B, DB_NAME, NAMESPACE_NAME, "id1");
+
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> {
+                    mGlobalSearchSession =
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext)
+                                    .get();
 
                     SearchResultsShim searchResults =
                             mGlobalSearchSession.search(
@@ -329,13 +615,14 @@
 
     @Test
     public void testGlobalSearch_withPartialAccess() throws Exception {
-        indexGloballySearchableDocument(PKG_A);
-        indexNotGloballySearchableDocument(PKG_B);
+        indexGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1");
+        indexNotGloballySearchableDocument(PKG_B, DB_NAME, NAMESPACE_NAME, "id1");
 
         SystemUtil.runWithShellPermissionIdentity(
                 () -> {
                     mGlobalSearchSession =
-                            GlobalSearchSessionShimImpl.createGlobalSearchSession(mContext).get();
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext)
+                                    .get();
 
                     SearchResultsShim searchResults =
                             mGlobalSearchSession.search(
@@ -354,13 +641,14 @@
 
     @Test
     public void testGlobalSearch_withPackageFilters() throws Exception {
-        indexGloballySearchableDocument(PKG_A);
-        indexGloballySearchableDocument(PKG_B);
+        indexGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1");
+        indexGloballySearchableDocument(PKG_B, DB_NAME, NAMESPACE_NAME, "id1");
 
         SystemUtil.runWithShellPermissionIdentity(
                 () -> {
                     mGlobalSearchSession =
-                            GlobalSearchSessionShimImpl.createGlobalSearchSession(mContext).get();
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext)
+                                    .get();
 
                     SearchResultsShim searchResults =
                             mGlobalSearchSession.search(
@@ -379,11 +667,11 @@
 
     @Test
     public void testGlobalSearch_withoutAccess() throws Exception {
-        indexGloballySearchableDocument(PKG_A);
-        indexGloballySearchableDocument(PKG_B);
+        indexGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1");
+        indexGloballySearchableDocument(PKG_B, DB_NAME, NAMESPACE_NAME, "id1");
 
         mGlobalSearchSession =
-                GlobalSearchSessionShimImpl.createGlobalSearchSession(mContext).get();
+                GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext).get();
 
         SearchResultsShim searchResults =
                 mGlobalSearchSession.search(
@@ -397,6 +685,147 @@
     }
 
     @Test
+    public void testGlobalGetSchema_packageAccess_defaultAccess() throws Exception {
+        // 1. Create a schema in the test with default (no) access.
+        mDb.setSchema(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA)
+                                .build())
+                .get();
+
+        // 2. Neither PKG_A nor PKG_B should be able to retrieve the schema.
+        List<String> schemaStrings = getSchemaAsPackage(PKG_A);
+        assertThat(schemaStrings).isNull();
+
+        schemaStrings = getSchemaAsPackage(PKG_B);
+        assertThat(schemaStrings).isNull();
+    }
+
+    @Test
+    public void testGlobalGetSchema_packageAccess_singleAccess() throws Exception {
+        // 1. Create a schema in the test with access granted to PKG_A, but not PKG_B.
+        mDb.setSchema(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA)
+                                .setSchemaTypeVisibilityForPackage(
+                                        AppSearchEmail.SCHEMA_TYPE,
+                                        /*visible=*/ true,
+                                        new PackageIdentifier(PKG_A, PKG_A_CERT_SHA256))
+                                .build())
+                .get();
+
+        // 2. Only PKG_A should be able to retrieve the schema.
+        List<String> schemaStrings = getSchemaAsPackage(PKG_A);
+        assertThat(schemaStrings).containsExactly(AppSearchEmail.SCHEMA.toString());
+
+        schemaStrings = getSchemaAsPackage(PKG_B);
+        assertThat(schemaStrings).isNull();
+    }
+
+    @Test
+    public void testGlobalGetSchema_packageAccess_multiAccess() throws Exception {
+        // 1. Create a schema in the test with access granted to PKG_A and PKG_B.
+        mDb.setSchema(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA)
+                                .setSchemaTypeVisibilityForPackage(
+                                        AppSearchEmail.SCHEMA_TYPE,
+                                        /*visible=*/ true,
+                                        new PackageIdentifier(PKG_A, PKG_A_CERT_SHA256))
+                                .setSchemaTypeVisibilityForPackage(
+                                        AppSearchEmail.SCHEMA_TYPE,
+                                        /*visible=*/ true,
+                                        new PackageIdentifier(PKG_B, PKG_B_CERT_SHA256))
+                                .build())
+                .get();
+
+        // 2. Both packages should be able to retrieve the schema.
+        List<String> schemaStrings = getSchemaAsPackage(PKG_A);
+        assertThat(schemaStrings).containsExactly(AppSearchEmail.SCHEMA.toString());
+
+        schemaStrings = getSchemaAsPackage(PKG_B);
+        assertThat(schemaStrings).containsExactly(AppSearchEmail.SCHEMA.toString());
+    }
+
+    @Test
+    public void testGlobalGetSchema_packageAccess_revokeAccess() throws Exception {
+        // 1. Create a schema in the test with access granted to PKG_A.
+        mDb.setSchema(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA)
+                                .setSchemaTypeVisibilityForPackage(
+                                        AppSearchEmail.SCHEMA_TYPE,
+                                        /*visible=*/ true,
+                                        new PackageIdentifier(PKG_A, PKG_A_CERT_SHA256))
+                                .build())
+                .get();
+
+        // 2. Now revoke that access.
+        mDb.setSchema(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA)
+                                .setSchemaTypeVisibilityForPackage(
+                                        AppSearchEmail.SCHEMA_TYPE,
+                                        /*visible=*/ false,
+                                        new PackageIdentifier(PKG_A, PKG_A_CERT_SHA256))
+                                .build())
+                .get();
+
+        // 3. PKG_A should NOT be able to retrieve the schema.
+        List<String> schemaStrings = getSchemaAsPackage(PKG_A);
+        assertThat(schemaStrings).isNull();
+    }
+
+    @Test
+    public void testGlobalGetSchema_globalAccess_singleAccess() throws Exception {
+        // 1. Index documents for PKG_A and PKG_B. This will set the schema for each with the
+        // corresponding access set.
+        indexGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1");
+        indexNotGloballySearchableDocument(PKG_B, DB_NAME, NAMESPACE_NAME, "id1");
+
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> {
+                    mGlobalSearchSession =
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(
+                                mContext).get();
+
+                    // 2. The schema for PKG_A should be retrievable, but PKG_B should not be.
+                    GetSchemaResponse response =
+                            mGlobalSearchSession.getSchema(PKG_A, DB_NAME).get();
+                    assertThat(response.getSchemas()).hasSize(1);
+
+                    response = mGlobalSearchSession.getSchema(PKG_B, DB_NAME).get();
+                    assertThat(response.getSchemas()).isEmpty();
+                },
+                READ_GLOBAL_APP_SEARCH_DATA);
+    }
+
+    @Test
+    public void testGlobalGetSchema_globalAccess_multiAccess() throws Exception {
+        // 1. Index documents for PKG_A and PKG_B. This will set the schema for each with the
+        // corresponding access set.
+        indexGloballySearchableDocument(PKG_A, DB_NAME, NAMESPACE_NAME, "id1");
+        indexGloballySearchableDocument(PKG_B, DB_NAME, NAMESPACE_NAME, "id1");
+
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> {
+                    mGlobalSearchSession =
+                            GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(
+                                mContext).get();
+
+                    // 2. The schema for both PKG_A and PKG_B should be retrievable.
+                    GetSchemaResponse response =
+                            mGlobalSearchSession.getSchema(PKG_A, DB_NAME).get();
+                    assertThat(response.getSchemas()).hasSize(1);
+
+                    response = mGlobalSearchSession.getSchema(PKG_B, DB_NAME).get();
+                    assertThat(response.getSchemas()).hasSize(1);
+                },
+                READ_GLOBAL_APP_SEARCH_DATA);
+    }
+
+
+    @Test
     public void testReportSystemUsage() throws Exception {
         // Insert schema
         mDb.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
@@ -404,52 +833,52 @@
 
         // Insert two docs
         GenericDocument document1 =
-                new GenericDocument.Builder<>("namespace", "id1", AppSearchEmail.SCHEMA_TYPE)
+                new GenericDocument.Builder<>(NAMESPACE_NAME, "id1", AppSearchEmail.SCHEMA_TYPE)
                         .build();
         GenericDocument document2 =
-                new GenericDocument.Builder<>("namespace", "id2", AppSearchEmail.SCHEMA_TYPE)
+                new GenericDocument.Builder<>(NAMESPACE_NAME, "id2", AppSearchEmail.SCHEMA_TYPE)
                         .build();
         mDb.put(new PutDocumentsRequest.Builder().addGenericDocuments(document1, document2).build())
                 .get();
 
         // Report some usages. id1 has 2 app and 1 system usage, id2 has 1 app and 2 system usage.
         mDb.reportUsage(
-                new ReportUsageRequest.Builder("namespace", "id1")
+                new ReportUsageRequest.Builder(NAMESPACE_NAME, "id1")
                         .setUsageTimestampMillis(10)
                         .build())
                 .get();
         mDb.reportUsage(
-                new ReportUsageRequest.Builder("namespace", "id1")
+                new ReportUsageRequest.Builder(NAMESPACE_NAME, "id1")
                         .setUsageTimestampMillis(20)
                         .build())
                 .get();
         mDb.reportUsage(
-                new ReportUsageRequest.Builder("namespace", "id2")
+                new ReportUsageRequest.Builder(NAMESPACE_NAME, "id2")
                         .setUsageTimestampMillis(100)
                         .build())
                 .get();
 
         SystemUtil.runWithShellPermissionIdentity(() -> {
             mGlobalSearchSession =
-                    GlobalSearchSessionShimImpl.createGlobalSearchSession(mContext).get();
+                    GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext).get();
             mGlobalSearchSession
                     .reportSystemUsage(
                             new ReportSystemUsageRequest.Builder(
-                                    mContext.getPackageName(), DB_NAME, "namespace", "id1")
+                                    mContext.getPackageName(), DB_NAME, NAMESPACE_NAME, "id1")
                                     .setUsageTimestampMillis(1000)
                                     .build())
                     .get();
             mGlobalSearchSession
                     .reportSystemUsage(
                             new ReportSystemUsageRequest.Builder(
-                                    mContext.getPackageName(), DB_NAME, "namespace", "id2")
+                                    mContext.getPackageName(), DB_NAME, NAMESPACE_NAME, "id2")
                                     .setUsageTimestampMillis(200)
                                     .build())
                     .get();
             mGlobalSearchSession
                     .reportSystemUsage(
                             new ReportSystemUsageRequest.Builder(
-                                    mContext.getPackageName(), DB_NAME, "namespace", "id2")
+                                    mContext.getPackageName(), DB_NAME, NAMESPACE_NAME, "id2")
                                     .setUsageTimestampMillis(150)
                                     .build())
                     .get();
@@ -457,7 +886,7 @@
 
         // Query the data
         mGlobalSearchSession =
-                GlobalSearchSessionShimImpl.createGlobalSearchSession(mContext).get();
+                GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext).get();
 
         // Sort by app usage count: id1 should win
         try (SearchResultsShim results = mDb.search(
@@ -512,6 +941,100 @@
         }
     }
 
+    @Test
+    public void testRemoveObserver_otherPackagesNotRemoved() throws Exception {
+        final String fakePackage = "com.android.appsearch.fake.package";
+        TestObserverCallback observer = new TestObserverCallback();
+
+        // Set up schema
+        mGlobalSearchSession =
+                GlobalSearchSessionShimImpl.createGlobalSearchSessionAsync(mContext).get();
+        mDb.setSchema(new SetSchemaRequest.Builder()
+                .addSchemas(AppSearchEmail.SCHEMA).build()).get();
+
+        // Register this observer twice, on different packages.
+        Executor executor = MoreExecutors.directExecutor();
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().addFilterSchemas(AppSearchEmail.SCHEMA_TYPE).build(),
+                executor,
+                observer);
+        mGlobalSearchSession.registerObserverCallback(
+                /*observedPackage=*/fakePackage,
+                new ObserverSpec.Builder().addFilterSchemas("Gift").build(),
+                executor,
+                observer);
+
+        // Make sure everything is empty
+        assertThat(observer.getSchemaChanges()).isEmpty();
+        assertThat(observer.getDocumentChanges()).isEmpty();
+
+        // Index some documents
+        AppSearchEmail email1 = new AppSearchEmail.Builder(NAMESPACE_NAME, "id1").build();
+        AppSearchEmail email2 =
+                new AppSearchEmail.Builder(NAMESPACE_NAME, "id2").setBody("caterpillar").build();
+        AppSearchEmail email3 =
+                new AppSearchEmail.Builder(NAMESPACE_NAME, "id3").setBody("foo").build();
+
+        checkIsBatchResultSuccess(
+                mDb.put(new PutDocumentsRequest.Builder()
+                        .addGenericDocuments(email1).build()));
+
+        // Make sure the notifications were received.
+        observer.waitForNotificationCount(1);
+
+        assertThat(observer.getSchemaChanges()).isEmpty();
+        assertThat(observer.getDocumentChanges()).containsExactly(
+                new DocumentChangeInfo(
+                        mContext.getPackageName(),
+                        DB_NAME,
+                        NAMESPACE_NAME,
+                        AppSearchEmail.SCHEMA_TYPE,
+                        ImmutableSet.of("id1")));
+        observer.clear();
+
+        // Unregister observer from com.example.package
+        mGlobalSearchSession.unregisterObserverCallback("com.example.package", observer);
+
+        // Index some more documents
+        assertThat(observer.getDocumentChanges()).isEmpty();
+        checkIsBatchResultSuccess(
+                mDb.put(new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
+
+        // Make sure data was still received
+        observer.waitForNotificationCount(1);
+        assertThat(observer.getDocumentChanges()).containsExactly(
+                new DocumentChangeInfo(
+                        mContext.getPackageName(),
+                        DB_NAME,
+                        NAMESPACE_NAME,
+                        AppSearchEmail.SCHEMA_TYPE,
+                        ImmutableSet.of("id2")));
+        observer.clear();
+
+        // Unregister the final observer
+        mGlobalSearchSession.unregisterObserverCallback(mContext.getPackageName(), observer);
+
+        // Index some more documents
+        assertThat(observer.getDocumentChanges()).isEmpty();
+        checkIsBatchResultSuccess(
+                mDb.put(new PutDocumentsRequest.Builder().addGenericDocuments(email3).build()));
+
+        // Make sure there have been no further notifications
+        assertThat(observer.getDocumentChanges()).isEmpty();
+    }
+
+    private List<String> getSchemaAsPackage(String pkg) throws Exception {
+        GlobalSearchSessionPlatformCtsTest.TestServiceConnection serviceConnection =
+                bindToHelperService(pkg);
+        try {
+            ICommandReceiver commandReceiver = serviceConnection.getCommandReceiver();
+            return commandReceiver.globalGetSchema(mContext.getPackageName(), DB_NAME);
+        } finally {
+            serviceConnection.unbind();
+        }
+    }
+
     private void assertPackageCannotAccess(String pkg) throws Exception {
         GlobalSearchSessionPlatformCtsTest.TestServiceConnection serviceConnection =
                 bindToHelperService(pkg);
@@ -537,34 +1060,51 @@
         }
     }
 
-    private void indexGloballySearchableDocument(String pkg) throws Exception {
+    private void indexGloballySearchableDocument(String pkg, String databaseName, String namespace,
+            String id) throws Exception {
+        indexGloballySearchableDocument(pkg, databaseName, namespace, id, Collections.emptySet());
+    }
+
+    private void indexGloballySearchableDocument(String pkg, String databaseName, String namespace,
+            String id, Set<Set<Integer>> visibleToPermissions) throws Exception {
+        // binder won't accept Set or Integer, we need to convert to List<Bundle>.
+        List<Bundle> permissionBundles = new ArrayList<>(visibleToPermissions.size());
+        for (Set<Integer> allRequiredPermissions : visibleToPermissions) {
+            Bundle permissionBundle = new Bundle();
+            permissionBundle.putIntegerArrayList("permission",
+                    new ArrayList<>(allRequiredPermissions));
+            permissionBundles.add(permissionBundle);
+        }
         GlobalSearchSessionPlatformCtsTest.TestServiceConnection serviceConnection =
                 bindToHelperService(pkg);
         try {
             ICommandReceiver commandReceiver = serviceConnection.getCommandReceiver();
-            assertThat(commandReceiver.indexGloballySearchableDocument()).isTrue();
+            assertThat(commandReceiver.indexGloballySearchableDocument(
+                    databaseName, namespace, id, permissionBundles)).isTrue();
         } finally {
             serviceConnection.unbind();
         }
     }
 
-    private void indexNotGloballySearchableDocument(String pkg) throws Exception {
+    private void indexNotGloballySearchableDocument(
+            String pkg, String databaseName, String namespace, String id) throws Exception {
         GlobalSearchSessionPlatformCtsTest.TestServiceConnection serviceConnection =
                 bindToHelperService(pkg);
         try {
             ICommandReceiver commandReceiver = serviceConnection.getCommandReceiver();
-            assertThat(commandReceiver.indexNotGloballySearchableDocument()).isTrue();
+            assertThat(commandReceiver
+                    .indexNotGloballySearchableDocument(databaseName, namespace, id)).isTrue();
         } finally {
             serviceConnection.unbind();
         }
     }
 
-    private void clearData(String pkg) throws Exception {
+    private void clearData(String pkg, String databaseName) throws Exception {
         GlobalSearchSessionPlatformCtsTest.TestServiceConnection serviceConnection =
                 bindToHelperService(pkg);
         try {
             ICommandReceiver commandReceiver = serviceConnection.getCommandReceiver();
-            assertThat(commandReceiver.clearData()).isTrue();
+            assertThat(commandReceiver.clearData(databaseName)).isTrue();
         } finally {
             serviceConnection.unbind();
         }
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchResultCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchResultCtsTest.java
index 2691ecf..6adcfce 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchResultCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchResultCtsTest.java
@@ -23,6 +23,14 @@
 import org.junit.Test;
 
 public class AppSearchResultCtsTest {
+    @Test
+    public void testNewSuccessfulResult() {
+        AppSearchResult<String> result = AppSearchResult.newSuccessfulResult("String");
+        assertThat(result.getResultCode()).isEqualTo(AppSearchResult.RESULT_OK);
+        assertThat(result.getResultValue()).isEqualTo("String");
+        assertThat(result.isSuccess()).isTrue();
+        assertThat(result.getErrorMessage()).isNull();
+    }
 
     @Test
     public void testResultEquals_identical() {
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSchemaCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSchemaCtsTest.java
index 6dd9158..4661354 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSchemaCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSchemaCtsTest.java
@@ -23,8 +23,7 @@
 import android.app.appsearch.AppSearchSchema;
 import android.app.appsearch.AppSearchSchema.PropertyConfig;
 import android.app.appsearch.AppSearchSchema.StringPropertyConfig;
-
-import com.android.server.appsearch.testing.AppSearchEmail;
+import android.app.appsearch.testutil.AppSearchEmail;
 
 import org.junit.Test;
 
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSchemaMigrationCtsTestBase.java b/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSchemaMigrationCtsTestBase.java
index a87a1ac..4ce9178 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSchemaMigrationCtsTestBase.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSchemaMigrationCtsTestBase.java
@@ -17,10 +17,9 @@
 package android.app.appsearch.cts.app;
 
 import static android.app.appsearch.AppSearchResult.RESULT_NOT_FOUND;
-
-import static com.android.server.appsearch.testing.AppSearchTestUtils.checkIsBatchResultSuccess;
-import static com.android.server.appsearch.testing.AppSearchTestUtils.convertSearchResultsToDocuments;
-import static com.android.server.appsearch.testing.AppSearchTestUtils.doGet;
+import static android.app.appsearch.testutil.AppSearchTestUtils.checkIsBatchResultSuccess;
+import static android.app.appsearch.testutil.AppSearchTestUtils.convertSearchResultsToDocuments;
+import static android.app.appsearch.testutil.AppSearchTestUtils.doGet;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -121,12 +120,12 @@
 
     private AppSearchSessionShim mDb;
 
-    protected abstract ListenableFuture<AppSearchSessionShim> createSearchSession(
+    protected abstract ListenableFuture<AppSearchSessionShim> createSearchSessionAsync(
             @NonNull String dbName);
 
     @Before
     public void setUp() throws Exception {
-        mDb = createSearchSession(DB_NAME).get();
+        mDb = createSearchSessionAsync(DB_NAME).get();
 
         // Cleanup whatever documents may still exist in these databases. This is needed in
         // addition to tearDown in case a test exited without completing properly.
@@ -144,7 +143,7 @@
                                                         .TOKENIZER_TYPE_PLAIN)
                                         .build())
                         .build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(schema)
                                 .setForceOverride(true)
@@ -157,7 +156,7 @@
                         .build();
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb.put(
+                        mDb.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(doc)
                                         .build()));
@@ -168,7 +167,7 @@
     @After
     public void tearDown() throws Exception {
         // Cleanup whatever documents may still exist in these databases.
-        mDb.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
+        mDb.setSchemaAsync(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
     }
 
     @Test
@@ -189,7 +188,7 @@
                                         .build())
                         .build();
 
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(B_C_Schema)
                                 .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
@@ -217,7 +216,7 @@
                                         .build())
                         .build();
 
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(B_NC_Schema)
                                 .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
@@ -231,7 +230,7 @@
         // create a backwards incompatible schema and update the version
         AppSearchSchema NB_C_Schema = new AppSearchSchema.Builder("testSchema").build();
 
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(NB_C_Schema)
                                 .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
@@ -246,7 +245,7 @@
         // create a backwards incompatible schema and update the version
         AppSearchSchema NB_C_Schema = new AppSearchSchema.Builder("testSchema").build();
 
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(NB_C_Schema)
                                 .setMigrator("testSchema", INACTIVE_MIGRATOR) // ND
@@ -261,7 +260,7 @@
         // create a backwards incompatible schema but don't update the version
         AppSearchSchema NB_NC_Schema = new AppSearchSchema.Builder("testSchema").build();
 
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(NB_NC_Schema)
                                 .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
@@ -275,7 +274,7 @@
         // create a backwards incompatible schema but don't update the version
         AppSearchSchema $B_$C_Schema = new AppSearchSchema.Builder("testSchema").build();
 
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas($B_$C_Schema)
                                 .setMigrator("testSchema", INACTIVE_MIGRATOR) // ND
@@ -302,7 +301,7 @@
                                         .build())
                         .build();
 
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(B_C_Schema)
                                 .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
@@ -329,7 +328,7 @@
                                         .build())
                         .build();
 
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(B_NC_Schema)
                                 .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
@@ -343,7 +342,7 @@
         // create a backwards incompatible schema and update the version
         AppSearchSchema NB_C_Schema = new AppSearchSchema.Builder("testSchema").build();
 
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(NB_C_Schema)
                                 .setMigrator("testSchema", ACTIVE_NOOP_MIGRATOR)
@@ -361,7 +360,7 @@
                 assertThrows(
                         ExecutionException.class,
                         () ->
-                                mDb.setSchema(
+                                mDb.setSchemaAsync(
                                                 new SetSchemaRequest.Builder()
                                                         .addSchemas($B_C_Schema)
                                                         .setMigrator(
@@ -382,7 +381,7 @@
                 assertThrows(
                         ExecutionException.class,
                         () ->
-                                mDb.setSchema(
+                                mDb.setSchemaAsync(
                                                 new SetSchemaRequest.Builder()
                                                         .addSchemas($B_$C_Schema)
                                                         .setMigrator(
@@ -420,7 +419,7 @@
                                                         .TOKENIZER_TYPE_PLAIN)
                                         .build())
                         .build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(schema)
                                 .setForceOverride(true)
@@ -440,7 +439,7 @@
 
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb.put(
+                        mDb.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(doc1, doc2)
                                         .build()));
@@ -510,7 +509,7 @@
                 };
 
         SetSchemaResponse setSchemaResponse =
-                mDb.setSchema(
+                mDb.setSchemaAsync(
                                 new SetSchemaRequest.Builder()
                                         .addSchemas(newSchema)
                                         .setMigrator("testSchema", migrator)
@@ -519,7 +518,7 @@
                         .get();
 
         // Check the schema has been saved
-        assertThat(mDb.getSchema().get().getSchemas()).containsExactly(newSchema);
+        assertThat(mDb.getSchemaAsync().get().getSchemas()).containsExactly(newSchema);
 
         assertThat(setSchemaResponse.getDeletedTypes()).isEmpty();
         assertThat(setSchemaResponse.getIncompatibleTypes()).containsExactly("testSchema");
@@ -575,7 +574,7 @@
                                                         .TOKENIZER_TYPE_PLAIN)
                                         .build())
                         .build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(schema)
                                 .setForceOverride(true)
@@ -591,7 +590,7 @@
 
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb.put(
+                        mDb.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(doc1)
                                         .build()));
@@ -649,7 +648,7 @@
                 };
 
         SetSchemaResponse setSchemaResponse =
-                mDb.setSchema(
+                mDb.setSchemaAsync(
                                 new SetSchemaRequest.Builder()
                                         .addSchemas(newSchema)
                                         .setMigrator("testSchema", migrator)
@@ -658,7 +657,7 @@
                         .get();
 
         // Check the schema has been saved
-        assertThat(mDb.getSchema().get().getSchemas()).containsExactly(newSchema);
+        assertThat(mDb.getSchemaAsync().get().getSchemas()).containsExactly(newSchema);
 
         assertThat(setSchemaResponse.getDeletedTypes()).isEmpty();
         assertThat(setSchemaResponse.getIncompatibleTypes()).containsExactly("testSchema");
@@ -700,7 +699,7 @@
                                                         .TOKENIZER_TYPE_PLAIN)
                                         .build())
                         .build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(schema)
                                 .setForceOverride(true)
@@ -716,7 +715,7 @@
 
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb.put(
+                        mDb.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(doc1)
                                         .build()));
@@ -774,7 +773,7 @@
                 assertThrows(
                         ExecutionException.class,
                         () ->
-                                mDb.setSchema(
+                                mDb.setSchemaAsync(
                                                 new SetSchemaRequest.Builder()
                                                         .addSchemas(newSchema)
                                                         .setMigrator("testSchema", migrator)
@@ -785,7 +784,7 @@
 
         // SetSchema with forceOverride=true
         SetSchemaResponse setSchemaResponse =
-                mDb.setSchema(
+                mDb.setSchemaAsync(
                                 new SetSchemaRequest.Builder()
                                         .addSchemas(newSchema)
                                         .setMigrator("testSchema", migrator)
@@ -794,7 +793,7 @@
                                         .build())
                         .get();
 
-        assertThat(mDb.getSchema().get().getSchemas()).containsExactly(newSchema);
+        assertThat(mDb.getSchemaAsync().get().getSchemas()).containsExactly(newSchema);
 
         assertThat(setSchemaResponse.getDeletedTypes()).isEmpty();
         assertThat(setSchemaResponse.getIncompatibleTypes()).containsExactly("testSchema");
@@ -828,7 +827,7 @@
                                                         .TOKENIZER_TYPE_PLAIN)
                                         .build())
                         .build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(schema)
                                 .setForceOverride(true)
@@ -844,7 +843,7 @@
 
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb.put(
+                        mDb.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(doc1)
                                         .build()));
@@ -902,7 +901,7 @@
                 assertThrows(
                         ExecutionException.class,
                         () ->
-                                mDb.setSchema(
+                                mDb.setSchemaAsync(
                                                 new SetSchemaRequest.Builder()
                                                         .addSchemas(newSchema)
                                                         .setMigrator("testSchema", migrator)
@@ -916,7 +915,7 @@
     public void testSchemaMigration_sourceToNowhere() throws Exception {
         // set the source schema to AppSearch
         AppSearchSchema schema = new AppSearchSchema.Builder("sourceSchema").build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(schema)
                                 .setForceOverride(true)
@@ -930,7 +929,7 @@
                         .build();
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb.put(
+                        mDb.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(doc)
                                         .build()));
@@ -971,7 +970,7 @@
                 assertThrows(
                         ExecutionException.class,
                         () ->
-                                mDb.setSchema(
+                                mDb.setSchemaAsync(
                                                 new SetSchemaRequest.Builder()
                                                         .addSchemas(
                                                                 new AppSearchSchema.Builder(
@@ -995,7 +994,7 @@
                 assertThrows(
                         ExecutionException.class,
                         () ->
-                                mDb.setSchema(
+                                mDb.setSchemaAsync(
                                                 new SetSchemaRequest.Builder()
                                                         .addSchemas(
                                                                 new AppSearchSchema.Builder(
@@ -1020,7 +1019,7 @@
         // set the destination schema to AppSearch
         AppSearchSchema destinationSchema =
                 new AppSearchSchema.Builder("destinationSchema").build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(destinationSchema)
                                 .setForceOverride(true)
@@ -1057,7 +1056,7 @@
         // no matter force override or not, the migrator won't be invoked
         // SetSchema with forceOverride=false
         SetSchemaResponse setSchemaResponse =
-                mDb.setSchema(
+                mDb.setSchemaAsync(
                                 new SetSchemaRequest.Builder()
                                         .addSchemas(destinationSchema)
                                         .addSchemas(
@@ -1071,7 +1070,7 @@
 
         // SetSchema with forceOverride=true
         setSchemaResponse =
-                mDb.setSchema(
+                mDb.setSchemaAsync(
                                 new SetSchemaRequest.Builder()
                                         .addSchemas(destinationSchema)
                                         .addSchemas(
@@ -1088,7 +1087,7 @@
     @Test
     public void testSchemaMigration_nowhereToNowhere() throws Exception {
         // set empty schema
-        mDb.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
+        mDb.setSchemaAsync(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
         Migrator migrator_nowhereToNowhere =
                 new Migrator() {
                     @Override
@@ -1119,7 +1118,7 @@
         // no matter force override or not, the migrator won't be invoked
         // SetSchema with forceOverride=false
         SetSchemaResponse setSchemaResponse =
-                mDb.setSchema(
+                mDb.setSchemaAsync(
                                 new SetSchemaRequest.Builder()
                                         .addSchemas(
                                                 new AppSearchSchema.Builder("emptySchema").build())
@@ -1131,7 +1130,7 @@
 
         // SetSchema with forceOverride=true
         setSchemaResponse =
-                mDb.setSchema(
+                mDb.setSchemaAsync(
                                 new SetSchemaRequest.Builder()
                                         .addSchemas(
                                                 new AppSearchSchema.Builder("emptySchema").build())
@@ -1147,7 +1146,7 @@
     public void testSchemaMigration_toAnotherType() throws Exception {
         // set the source schema to AppSearch
         AppSearchSchema sourceSchema = new AppSearchSchema.Builder("sourceSchema").build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(sourceSchema)
                                 .setForceOverride(true)
@@ -1159,7 +1158,7 @@
                 new GenericDocument.Builder<>("namespace", "id1", "sourceSchema").build();
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb.put(
+                        mDb.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(doc)
                                         .build()));
@@ -1200,7 +1199,7 @@
 
         // SetSchema with forceOverride=false and increase overall version
         SetSchemaResponse setSchemaResponse =
-                mDb.setSchema(
+                mDb.setSchemaAsync(
                                 new SetSchemaRequest.Builder()
                                         .addSchemas(destinationSchema)
                                         .setMigrator("sourceSchema", migrator)
@@ -1231,7 +1230,7 @@
                                                 AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
                                         .build())
                         .build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(sourceSchema)
                                 .setForceOverride(true)
@@ -1249,7 +1248,7 @@
                         .build();
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb.put(
+                        mDb.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(childDoc, adultDoc)
                                         .build()));
@@ -1313,7 +1312,7 @@
 
         // SetSchema with forceOverride=false and increase overall version
         SetSchemaResponse setSchemaResponse =
-                mDb.setSchema(
+                mDb.setSchemaAsync(
                                 new SetSchemaRequest.Builder()
                                         .addSchemas(adultSchema, childSchema)
                                         .setMigrator("Person", migrator)
@@ -1361,7 +1360,7 @@
                                                 AppSearchSchema.PropertyConfig.CARDINALITY_REQUIRED)
                                         .build())
                         .build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(sourceSchemaA, sourceSchemaB)
                                 .setForceOverride(true)
@@ -1384,7 +1383,7 @@
             putRequestBuilder.addGenericDocuments(docInA, docInB);
         }
         AppSearchBatchResult<String, Void> result =
-                checkIsBatchResultSuccess(mDb.put(putRequestBuilder.build()));
+                checkIsBatchResultSuccess(mDb.putAsync(putRequestBuilder.build()));
         assertThat(result.getFailures()).isEmpty();
 
         // create three destination types B, C & D
@@ -1496,7 +1495,7 @@
 
         // SetSchema with forceOverride=false and increase overall version
         SetSchemaResponse setSchemaResponse =
-                mDb.setSchema(
+                mDb.setSchemaAsync(
                                 new SetSchemaRequest.Builder()
                                         .addSchemas(
                                                 destinationSchemaB,
@@ -1660,7 +1659,7 @@
                                                         .TOKENIZER_TYPE_PLAIN)
                                         .build())
                         .build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(typeA)
                                 .setForceOverride(true)
@@ -1676,7 +1675,7 @@
                         .build();
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb.put(
+                        mDb.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(doc)
                                         .build()));
@@ -1684,7 +1683,7 @@
         assertThat(result.getFailures()).isEmpty();
 
         // update to version 4.
-        SetSchemaResponse setSchemaResponse = mDb.setSchema(MULTI_STEP_REQUEST).get();
+        SetSchemaResponse setSchemaResponse = mDb.setSchemaAsync(MULTI_STEP_REQUEST).get();
         assertThat(setSchemaResponse.getDeletedTypes()).containsExactly("TypeA");
         assertThat(setSchemaResponse.getIncompatibleTypes()).isEmpty();
         assertThat(setSchemaResponse.getMigratedTypes()).containsExactly("TypeA");
@@ -1731,7 +1730,7 @@
                                                         .TOKENIZER_TYPE_PLAIN)
                                         .build())
                         .build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(typeA)
                                 .setForceOverride(true)
@@ -1748,7 +1747,7 @@
                         .build();
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb.put(
+                        mDb.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(doc)
                                         .build()));
@@ -1756,7 +1755,7 @@
         assertThat(result.getFailures()).isEmpty();
 
         // update to version 4.
-        SetSchemaResponse setSchemaResponse = mDb.setSchema(MULTI_STEP_REQUEST).get();
+        SetSchemaResponse setSchemaResponse = mDb.setSchemaAsync(MULTI_STEP_REQUEST).get();
         assertThat(setSchemaResponse.getDeletedTypes()).containsExactly("TypeA");
         assertThat(setSchemaResponse.getIncompatibleTypes()).isEmpty();
         assertThat(setSchemaResponse.getMigratedTypes()).containsExactly("TypeA");
@@ -1798,7 +1797,7 @@
                                                         .TOKENIZER_TYPE_PLAIN)
                                         .build())
                         .build();
-        mDb.setSchema(
+        mDb.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(typeA)
                                 .setForceOverride(true)
@@ -1815,7 +1814,7 @@
                         .build();
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb.put(
+                        mDb.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(doc)
                                         .build()));
@@ -1823,7 +1822,7 @@
         assertThat(result.getFailures()).isEmpty();
 
         // update to version 4.
-        SetSchemaResponse setSchemaResponse = mDb.setSchema(MULTI_STEP_REQUEST).get();
+        SetSchemaResponse setSchemaResponse = mDb.setSchemaAsync(MULTI_STEP_REQUEST).get();
         assertThat(setSchemaResponse.getDeletedTypes()).isEmpty();
         assertThat(setSchemaResponse.getIncompatibleTypes()).containsExactly("TypeB");
         assertThat(setSchemaResponse.getMigratedTypes()).containsExactly("TypeB");
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSessionCtsTestBase.java b/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSessionCtsTestBase.java
index d30d661..475569d 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSessionCtsTestBase.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/app/AppSearchSessionCtsTestBase.java
@@ -18,15 +18,16 @@
 
 import static android.app.appsearch.AppSearchResult.RESULT_INVALID_SCHEMA;
 import static android.app.appsearch.AppSearchResult.RESULT_NOT_FOUND;
-
-import static com.android.server.appsearch.testing.AppSearchTestUtils.checkIsBatchResultSuccess;
-import static com.android.server.appsearch.testing.AppSearchTestUtils.convertSearchResultsToDocuments;
-import static com.android.server.appsearch.testing.AppSearchTestUtils.doGet;
-import static com.android.server.appsearch.testing.AppSearchTestUtils.retrieveAllSearchResults;
+import static android.app.appsearch.testutil.AppSearchTestUtils.checkIsBatchResultSuccess;
+import static android.app.appsearch.testutil.AppSearchTestUtils.convertSearchResultsToDocuments;
+import static android.app.appsearch.testutil.AppSearchTestUtils.doGet;
+import static android.app.appsearch.testutil.AppSearchTestUtils.retrieveAllSearchResults;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 
 import android.annotation.NonNull;
 import android.app.appsearch.AppSearchBatchResult;
@@ -35,9 +36,11 @@
 import android.app.appsearch.AppSearchSchema.PropertyConfig;
 import android.app.appsearch.AppSearchSchema.StringPropertyConfig;
 import android.app.appsearch.AppSearchSessionShim;
+import android.app.appsearch.Features;
 import android.app.appsearch.GenericDocument;
 import android.app.appsearch.GetByDocumentIdRequest;
 import android.app.appsearch.GetSchemaResponse;
+import android.app.appsearch.PackageIdentifier;
 import android.app.appsearch.PutDocumentsRequest;
 import android.app.appsearch.RemoveByDocumentIdRequest;
 import android.app.appsearch.ReportUsageRequest;
@@ -47,13 +50,13 @@
 import android.app.appsearch.SetSchemaRequest;
 import android.app.appsearch.StorageInfo;
 import android.app.appsearch.exceptions.AppSearchException;
+import android.app.appsearch.testutil.AppSearchEmail;
 import android.content.Context;
 
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.server.appsearch.testing.AppSearchEmail;
-
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 
@@ -62,6 +65,7 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -70,24 +74,24 @@
 import java.util.concurrent.ExecutorService;
 
 public abstract class AppSearchSessionCtsTestBase {
-    private static final String DB_NAME_1 = "";
-    private static final String DB_NAME_2 = "testDb2";
+    static final String DB_NAME_1 = "";
+    static final String DB_NAME_2 = "testDb2";
+
+    private final Context mContext = ApplicationProvider.getApplicationContext();
 
     private AppSearchSessionShim mDb1;
     private AppSearchSessionShim mDb2;
 
-    protected abstract ListenableFuture<AppSearchSessionShim> createSearchSession(
+    protected abstract ListenableFuture<AppSearchSessionShim> createSearchSessionAsync(
             @NonNull String dbName);
 
-    protected abstract ListenableFuture<AppSearchSessionShim> createSearchSession(
+    protected abstract ListenableFuture<AppSearchSessionShim> createSearchSessionAsync(
             @NonNull String dbName, @NonNull ExecutorService executor);
 
     @Before
     public void setUp() throws Exception {
-        Context context = ApplicationProvider.getApplicationContext();
-
-        mDb1 = createSearchSession(DB_NAME_1).get();
-        mDb2 = createSearchSession(DB_NAME_2).get();
+        mDb1 = createSearchSessionAsync(DB_NAME_1).get();
+        mDb2 = createSearchSessionAsync(DB_NAME_2).get();
 
         // Cleanup whatever documents may still exist in these databases. This is needed in
         // addition to tearDown in case a test exited without completing properly.
@@ -101,8 +105,8 @@
     }
 
     private void cleanup() throws Exception {
-        mDb1.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
+        mDb2.setSchemaAsync(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
     }
 
     @Test
@@ -124,12 +128,13 @@
                                         .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
                                         .build())
                         .build();
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(emailSchema).build()).get();
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().addSchemas(emailSchema).build()).get();
     }
 
     @Test
     public void testSetSchema_Failure() throws Exception {
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
         AppSearchSchema emailSchema1 =
                 new AppSearchSchema.Builder(AppSearchEmail.SCHEMA_TYPE).build();
@@ -138,7 +143,7 @@
                 assertThrows(
                                 ExecutionException.class,
                                 () ->
-                                        mDb1.setSchema(
+                                        mDb1.setSchemaAsync(
                                                         new SetSchemaRequest.Builder()
                                                                 .addSchemas(emailSchema1)
                                                                 .build())
@@ -153,7 +158,9 @@
         throwable =
                 assertThrows(
                                 ExecutionException.class,
-                                () -> mDb1.setSchema(new SetSchemaRequest.Builder().build()).get())
+                                () ->
+                                        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().build())
+                                                .get())
                         .getCause();
 
         assertThat(throwable).isInstanceOf(AppSearchException.class);
@@ -183,17 +190,17 @@
                                         .build())
                         .build();
 
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(schema).setVersion(1).build())
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().addSchemas(schema).setVersion(1).build())
                 .get();
 
-        Set<AppSearchSchema> actualSchemaTypes = mDb1.getSchema().get().getSchemas();
+        Set<AppSearchSchema> actualSchemaTypes = mDb1.getSchemaAsync().get().getSchemas();
         assertThat(actualSchemaTypes).containsExactly(schema);
 
         // increase version number
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(schema).setVersion(2).build())
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().addSchemas(schema).setVersion(2).build())
                 .get();
 
-        GetSchemaResponse getSchemaResponse = mDb1.getSchema().get();
+        GetSchemaResponse getSchemaResponse = mDb1.getSchemaAsync().get();
         assertThat(getSchemaResponse.getSchemas()).containsExactly(schema);
         assertThat(getSchemaResponse.getVersion()).isEqualTo(2);
     }
@@ -219,17 +226,19 @@
                         .build();
 
         // set different version number to different database.
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(schema).setVersion(135).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(schema).setVersion(135).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(schema).setVersion(246).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(schema).setVersion(246).build())
                 .get();
 
         // check the version has been set correctly.
-        GetSchemaResponse getSchemaResponse = mDb1.getSchema().get();
+        GetSchemaResponse getSchemaResponse = mDb1.getSchemaAsync().get();
         assertThat(getSchemaResponse.getSchemas()).containsExactly(schema);
         assertThat(getSchemaResponse.getVersion()).isEqualTo(135);
 
-        getSchemaResponse = mDb2.getSchema().get();
+        getSchemaResponse = mDb2.getSchemaAsync().get();
         assertThat(getSchemaResponse.getSchemas()).containsExactly(schema);
         assertThat(getSchemaResponse.getVersion()).isEqualTo(246);
     }
@@ -270,12 +279,12 @@
                         .build();
 
         // Add it to AppSearch and then obtain it again
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(inSchema, AppSearchEmail.SCHEMA)
                                 .build())
                 .get();
-        GetSchemaResponse response = mDb1.getSchema().get();
+        GetSchemaResponse response = mDb1.getSchemaAsync().get();
         List<AppSearchSchema> schemas = new ArrayList<>(response.getSchemas());
         assertThat(schemas).containsExactly(inSchema, AppSearchEmail.SCHEMA);
         AppSearchSchema outSchema;
@@ -330,101 +339,243 @@
     }
 
     @Test
+    public void testGetSchema_visibilitySetting() throws Exception {
+        assumeTrue(
+                mDb1.getFeatures().isFeatureSupported(Features.ADD_PERMISSIONS_AND_GET_VISIBILITY));
+        AppSearchSchema emailSchema =
+                new AppSearchSchema.Builder("Email1")
+                        .addProperty(
+                                new StringPropertyConfig.Builder("subject")
+                                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                                        .setIndexingType(
+                                                StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                                        .build())
+                        .addProperty(
+                                new StringPropertyConfig.Builder("body")
+                                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                                        .setIndexingType(
+                                                StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                                        .build())
+                        .build();
+
+        byte[] shar256Cert1 = new byte[32];
+        Arrays.fill(shar256Cert1, (byte) 1);
+        byte[] shar256Cert2 = new byte[32];
+        Arrays.fill(shar256Cert2, (byte) 2);
+        PackageIdentifier packageIdentifier1 = new PackageIdentifier("pkgFoo", shar256Cert1);
+        PackageIdentifier packageIdentifier2 = new PackageIdentifier("pkgBar", shar256Cert2);
+        SetSchemaRequest request =
+                new SetSchemaRequest.Builder()
+                        .addSchemas(emailSchema)
+                        .setSchemaTypeDisplayedBySystem("Email1", /*displayed=*/ false)
+                        .setSchemaTypeVisibilityForPackage(
+                                "Email1", /*visible=*/ true, packageIdentifier1)
+                        .setSchemaTypeVisibilityForPackage(
+                                "Email1", /*visible=*/ true, packageIdentifier2)
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Email1",
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR))
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Email1",
+                                ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA))
+                        .build();
+
+        mDb1.setSchemaAsync(request).get();
+
+        GetSchemaResponse getSchemaResponse = mDb1.getSchemaAsync().get();
+        Set<AppSearchSchema> actual = getSchemaResponse.getSchemas();
+        assertThat(actual).hasSize(1);
+        assertThat(actual).isEqualTo(request.getSchemas());
+        assertThat(getSchemaResponse.getSchemaTypesNotDisplayedBySystem())
+                .containsExactly("Email1");
+        assertThat(getSchemaResponse.getSchemaTypesVisibleToPackages())
+                .containsExactly("Email1", ImmutableSet.of(packageIdentifier1, packageIdentifier2));
+        assertThat(getSchemaResponse.getRequiredPermissionsForSchemaTypeVisibility())
+                .containsExactly(
+                        "Email1",
+                        ImmutableSet.of(
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR),
+                                ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA)));
+    }
+
+    @Test
+    public void testGetSchema_visibilitySetting_notSupported() throws Exception {
+        assumeFalse(
+                mDb1.getFeatures().isFeatureSupported(Features.ADD_PERMISSIONS_AND_GET_VISIBILITY));
+        AppSearchSchema emailSchema =
+                new AppSearchSchema.Builder("Email1")
+                        .addProperty(
+                                new StringPropertyConfig.Builder("subject")
+                                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                                        .setIndexingType(
+                                                StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                                        .build())
+                        .addProperty(
+                                new StringPropertyConfig.Builder("body")
+                                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                                        .setIndexingType(
+                                                StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                                        .build())
+                        .build();
+
+        byte[] shar256Cert1 = new byte[32];
+        Arrays.fill(shar256Cert1, (byte) 1);
+        byte[] shar256Cert2 = new byte[32];
+        Arrays.fill(shar256Cert2, (byte) 2);
+        PackageIdentifier packageIdentifier1 = new PackageIdentifier("pkgFoo", shar256Cert1);
+        PackageIdentifier packageIdentifier2 = new PackageIdentifier("pkgBar", shar256Cert2);
+        SetSchemaRequest request =
+                new SetSchemaRequest.Builder()
+                        .addSchemas(emailSchema)
+                        .setSchemaTypeDisplayedBySystem("Email1", /*displayed=*/ false)
+                        .setSchemaTypeVisibilityForPackage(
+                                "Email1", /*visible=*/ true, packageIdentifier1)
+                        .setSchemaTypeVisibilityForPackage(
+                                "Email1", /*visible=*/ true, packageIdentifier2)
+                        .build();
+
+        mDb1.setSchemaAsync(request).get();
+
+        GetSchemaResponse getSchemaResponse = mDb1.getSchemaAsync().get();
+        Set<AppSearchSchema> actual = getSchemaResponse.getSchemas();
+        assertThat(actual).hasSize(1);
+        assertThat(actual).isEqualTo(request.getSchemas());
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> getSchemaResponse.getSchemaTypesNotDisplayedBySystem());
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> getSchemaResponse.getSchemaTypesVisibleToPackages());
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> getSchemaResponse.getRequiredPermissionsForSchemaTypeVisibility());
+    }
+
+    @Test
+    public void testSetSchema_visibilitySettingPermission_notSupported() {
+        assumeFalse(
+                mDb1.getFeatures().isFeatureSupported(Features.ADD_PERMISSIONS_AND_GET_VISIBILITY));
+        AppSearchSchema emailSchema = new AppSearchSchema.Builder("Email1").build();
+
+        SetSchemaRequest request =
+                new SetSchemaRequest.Builder()
+                        .addSchemas(emailSchema)
+                        .setSchemaTypeDisplayedBySystem("Email1", /*displayed=*/ false)
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Email1", ImmutableSet.of(SetSchemaRequest.READ_SMS))
+                        .build();
+
+        assertThrows(UnsupportedOperationException.class, () -> mDb1.setSchemaAsync(request).get());
+    }
+
+    @Test
     public void testGetNamespaces() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        assertThat(mDb1.getNamespaces().get()).isEmpty();
+        assertThat(mDb1.getNamespacesAsync().get()).isEmpty();
 
         // Index a document
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(
                                         new AppSearchEmail.Builder("namespace1", "id1").build())
                                 .build()));
-        assertThat(mDb1.getNamespaces().get()).containsExactly("namespace1");
+        assertThat(mDb1.getNamespacesAsync().get()).containsExactly("namespace1");
 
         // Index additional data
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(
                                         new AppSearchEmail.Builder("namespace2", "id1").build(),
                                         new AppSearchEmail.Builder("namespace2", "id2").build(),
                                         new AppSearchEmail.Builder("namespace3", "id1").build())
                                 .build()));
-        assertThat(mDb1.getNamespaces().get())
+        assertThat(mDb1.getNamespacesAsync().get())
                 .containsExactly("namespace1", "namespace2", "namespace3");
 
         // Remove namespace2/id2 -- namespace2 should still exist because of namespace2/id1
         checkIsBatchResultSuccess(
-                mDb1.remove(
+                mDb1.removeAsync(
                         new RemoveByDocumentIdRequest.Builder("namespace2").addIds("id2").build()));
-        assertThat(mDb1.getNamespaces().get())
+        assertThat(mDb1.getNamespacesAsync().get())
                 .containsExactly("namespace1", "namespace2", "namespace3");
 
         // Remove namespace2/id1 -- namespace2 should now be gone
         checkIsBatchResultSuccess(
-                mDb1.remove(
+                mDb1.removeAsync(
                         new RemoveByDocumentIdRequest.Builder("namespace2").addIds("id1").build()));
-        assertThat(mDb1.getNamespaces().get()).containsExactly("namespace1", "namespace3");
+        assertThat(mDb1.getNamespacesAsync().get()).containsExactly("namespace1", "namespace3");
 
         // Make sure the list of namespaces is preserved after restart
         mDb1.close();
-        mDb1 = createSearchSession(DB_NAME_1).get();
-        assertThat(mDb1.getNamespaces().get()).containsExactly("namespace1", "namespace3");
+        mDb1 = createSearchSessionAsync(DB_NAME_1).get();
+        assertThat(mDb1.getNamespacesAsync().get()).containsExactly("namespace1", "namespace3");
     }
 
     @Test
     public void testGetNamespaces_dbIsolation() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        assertThat(mDb1.getNamespaces().get()).isEmpty();
-        assertThat(mDb2.getNamespaces().get()).isEmpty();
+        assertThat(mDb1.getNamespacesAsync().get()).isEmpty();
+        assertThat(mDb2.getNamespacesAsync().get()).isEmpty();
 
         // Index documents
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(
                                         new AppSearchEmail.Builder("namespace1_db1", "id1").build())
                                 .build()));
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(
                                         new AppSearchEmail.Builder("namespace2_db1", "id1").build())
                                 .build()));
         checkIsBatchResultSuccess(
-                mDb2.put(
+                mDb2.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(
                                         new AppSearchEmail.Builder("namespace_db2", "id1").build())
                                 .build()));
-        assertThat(mDb1.getNamespaces().get()).containsExactly("namespace1_db1", "namespace2_db1");
-        assertThat(mDb2.getNamespaces().get()).containsExactly("namespace_db2");
+        assertThat(mDb1.getNamespacesAsync().get())
+                .containsExactly("namespace1_db1", "namespace2_db1");
+        assertThat(mDb2.getNamespacesAsync().get()).containsExactly("namespace_db2");
 
         // Make sure the list of namespaces is preserved after restart
         mDb1.close();
-        mDb1 = createSearchSession(DB_NAME_1).get();
-        assertThat(mDb1.getNamespaces().get()).containsExactly("namespace1_db1", "namespace2_db1");
-        assertThat(mDb2.getNamespaces().get()).containsExactly("namespace_db2");
+        mDb1 = createSearchSessionAsync(DB_NAME_1).get();
+        assertThat(mDb1.getNamespacesAsync().get())
+                .containsExactly("namespace1_db1", "namespace2_db1");
+        assertThat(mDb2.getNamespacesAsync().get()).containsExactly("namespace_db2");
     }
 
     @Test
     public void testGetSchema_emptyDB() throws Exception {
-        GetSchemaResponse getSchemaResponse = mDb1.getSchema().get();
+        GetSchemaResponse getSchemaResponse = mDb1.getSchemaAsync().get();
         assertThat(getSchemaResponse.getVersion()).isEqualTo(0);
     }
 
     @Test
     public void testPutDocuments() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index a document
@@ -438,7 +589,7 @@
 
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb1.put(
+                        mDb1.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(email)
                                         .build()));
@@ -447,6 +598,132 @@
     }
 
     @Test
+    public void testPutDocuments_emptyProperties() throws Exception {
+        // Schema registration. Due to b/204677124 is fixed in Android T. We have different
+        // behaviour when set empty array to bytes and documents between local and platform storage.
+        // This test only test String, long, boolean and double, for byte array and Document will be
+        // test in backend's specific test.
+        AppSearchSchema schema =
+                new AppSearchSchema.Builder("testSchema")
+                        .addProperty(
+                                new StringPropertyConfig.Builder("string")
+                                        .setCardinality(PropertyConfig.CARDINALITY_REPEATED)
+                                        .setIndexingType(
+                                                StringPropertyConfig.INDEXING_TYPE_EXACT_TERMS)
+                                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                                        .build())
+                        .addProperty(
+                                new AppSearchSchema.LongPropertyConfig.Builder("long")
+                                        .setCardinality(PropertyConfig.CARDINALITY_REPEATED)
+                                        .build())
+                        .addProperty(
+                                new AppSearchSchema.DoublePropertyConfig.Builder("double")
+                                        .setCardinality(PropertyConfig.CARDINALITY_REPEATED)
+                                        .build())
+                        .addProperty(
+                                new AppSearchSchema.BooleanPropertyConfig.Builder("boolean")
+                                        .setCardinality(PropertyConfig.CARDINALITY_REPEATED)
+                                        .build())
+                        .build();
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(schema, AppSearchEmail.SCHEMA)
+                                .build())
+                .get();
+
+        // Index a document
+        GenericDocument document =
+                new GenericDocument.Builder<>("namespace", "id1", "testSchema")
+                        .setPropertyBoolean("boolean")
+                        .setPropertyString("string")
+                        .setPropertyDouble("double")
+                        .setPropertyLong("long")
+                        .build();
+
+        AppSearchBatchResult<String, Void> result =
+                checkIsBatchResultSuccess(
+                        mDb1.putAsync(
+                                new PutDocumentsRequest.Builder()
+                                        .addGenericDocuments(document)
+                                        .build()));
+        assertThat(result.getSuccesses()).containsExactly("id1", null);
+        assertThat(result.getFailures()).isEmpty();
+
+        GetByDocumentIdRequest request =
+                new GetByDocumentIdRequest.Builder("namespace").addIds("id1").build();
+        List<GenericDocument> outDocuments = doGet(mDb1, request);
+        assertThat(outDocuments).hasSize(1);
+        GenericDocument outDocument = outDocuments.get(0);
+        assertThat(outDocument.getPropertyBooleanArray("boolean")).isEmpty();
+        assertThat(outDocument.getPropertyStringArray("string")).isEmpty();
+        assertThat(outDocument.getPropertyDoubleArray("double")).isEmpty();
+        assertThat(outDocument.getPropertyLongArray("long")).isEmpty();
+    }
+
+    @Test
+    public void testPutLargeDocumentBatch() throws Exception {
+        // Schema registration
+        AppSearchSchema schema =
+                new AppSearchSchema.Builder("Type")
+                        .addProperty(
+                                new StringPropertyConfig.Builder("body")
+                                        .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
+                                        .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
+                                        .setIndexingType(
+                                                StringPropertyConfig.INDEXING_TYPE_PREFIXES)
+                                        .build())
+                        .build();
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().addSchemas(schema).build()).get();
+
+        // Creates a large batch of Documents, since we have max document size in Framework which is
+        // 512KiB, we will create 1KiB * 4000 docs = 4MiB total size > 1MiB binder transaction limit
+        char[] chars = new char[1024]; // 1KiB
+        Arrays.fill(chars, ' ');
+        String body = String.valueOf(chars) + "the end.";
+        List<GenericDocument> inDocuments = new ArrayList<>();
+        GetByDocumentIdRequest.Builder getByDocumentIdRequestBuilder =
+                new GetByDocumentIdRequest.Builder("namespace");
+        for (int i = 0; i < 4000; i++) {
+            GenericDocument inDocument =
+                    new GenericDocument.Builder<>("namespace", "id" + i, "Type")
+                            .setPropertyString("body", body)
+                            .build();
+            inDocuments.add(inDocument);
+            getByDocumentIdRequestBuilder.addIds("id" + i);
+        }
+
+        // Index documents.
+        AppSearchBatchResult<String, Void> result =
+                mDb1.putAsync(
+                                new PutDocumentsRequest.Builder()
+                                        .addGenericDocuments(inDocuments)
+                                        .build())
+                        .get();
+        assertThat(result.isSuccess()).isTrue();
+
+        // Query those documents and verify they are same with the input. This also verify
+        // AppSearchResult could handle large batch.
+        SearchResultsShim searchResults =
+                mDb1.search(
+                        "end",
+                        new SearchSpec.Builder()
+                                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
+                                .build());
+        List<GenericDocument> outDocuments = convertSearchResultsToDocuments(searchResults);
+        assertThat(inDocuments).containsExactlyElementsIn(outDocuments);
+
+        // Get by document ID and verify they are same with the input. This also verify
+        // AppSearchBatchResult could handle large batch.
+        AppSearchBatchResult<String, GenericDocument> batchResult =
+                mDb1.getByDocumentIdAsync(getByDocumentIdRequestBuilder.build()).get();
+        assertThat(batchResult.isSuccess()).isTrue();
+        for (int i = 0; i < inDocuments.size(); i++) {
+            GenericDocument inDocument = inDocuments.get(i);
+            assertThat(batchResult.getSuccesses().get(inDocument.getId())).isEqualTo(inDocument);
+        }
+    }
+
+    @Test
     public void testUpdateSchema() throws Exception {
         // Schema registration
         AppSearchSchema oldEmailSchema =
@@ -483,7 +760,8 @@
                                         .setCardinality(PropertyConfig.CARDINALITY_OPTIONAL)
                                         .build())
                         .build();
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(oldEmailSchema).build()).get();
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().addSchemas(oldEmailSchema).build())
+                .get();
 
         // Try to index a gift. This should fail as it's not in the schema.
         GenericDocument gift =
@@ -491,13 +769,14 @@
                         .setPropertyLong("price", 5)
                         .build();
         AppSearchBatchResult<String, Void> result =
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(gift).build()).get();
+                mDb1.putAsync(new PutDocumentsRequest.Builder().addGenericDocuments(gift).build())
+                        .get();
         assertThat(result.isSuccess()).isFalse();
         assertThat(result.getFailures().get("gift1").getResultCode())
                 .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
 
         // Update the schema to include the gift and update email with a new field
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(newEmailSchema, giftSchema)
                                 .build())
@@ -505,7 +784,7 @@
 
         // Try to index the document again, which should now work
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(gift).build()));
+                mDb1.putAsync(new PutDocumentsRequest.Builder().addGenericDocuments(gift).build()));
 
         // Indexing an email with a body should also work
         AppSearchEmail email =
@@ -514,7 +793,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email).build()));
     }
 
     @Test
@@ -530,7 +810,7 @@
                                         .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
                                         .build())
                         .build();
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(emailSchema).build()).get();
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().addSchemas(emailSchema).build()).get();
 
         // Index an email and check it present.
         AppSearchEmail email =
@@ -538,7 +818,8 @@
                         .setSubject("testPut example")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email).build()));
         List<GenericDocument> outDocuments = doGet(mDb1, "namespace", "email1");
         assertThat(outDocuments).hasSize(1);
         AppSearchEmail outEmail = new AppSearchEmail(outDocuments.get(0));
@@ -548,7 +829,9 @@
         Throwable failResult1 =
                 assertThrows(
                                 ExecutionException.class,
-                                () -> mDb1.setSchema(new SetSchemaRequest.Builder().build()).get())
+                                () ->
+                                        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().build())
+                                                .get())
                         .getCause();
         assertThat(failResult1).isInstanceOf(AppSearchException.class);
         assertThat(failResult1).hasMessageThat().contains("Schema is incompatible");
@@ -556,11 +839,11 @@
 
         // Try to remove the email schema again, which should now work as we set forceOverride to
         // be true.
-        mDb1.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
 
         // Make sure the indexed email is gone.
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("email1")
                                         .build())
@@ -575,12 +858,14 @@
                         .setSubject("testPut example")
                         .build();
         AppSearchBatchResult<String, Void> failResult2 =
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email2).build())
+                mDb1.putAsync(new PutDocumentsRequest.Builder().addGenericDocuments(email2).build())
                         .get();
         assertThat(failResult2.isSuccess()).isFalse();
         assertThat(failResult2.getFailures().get("email2").getErrorMessage())
                 .isEqualTo(
-                        "Schema type config 'com.android.cts.appsearch$"
+                        "Schema type config '"
+                                + mContext.getPackageName()
+                                + "$"
                                 + DB_NAME_1
                                 + "/builtin:Email' not found");
     }
@@ -598,8 +883,8 @@
                                         .setTokenizerType(StringPropertyConfig.TOKENIZER_TYPE_PLAIN)
                                         .build())
                         .build();
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(emailSchema).build()).get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(emailSchema).build()).get();
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().addSchemas(emailSchema).build()).get();
+        mDb2.setSchemaAsync(new SetSchemaRequest.Builder().addSchemas(emailSchema).build()).get();
 
         // Index an email and check it present in database1.
         AppSearchEmail email1 =
@@ -607,7 +892,8 @@
                         .setSubject("testPut example")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
         List<GenericDocument> outDocuments = doGet(mDb1, "namespace", "email1");
         assertThat(outDocuments).hasSize(1);
         AppSearchEmail outEmail = new AppSearchEmail(outDocuments.get(0));
@@ -619,7 +905,8 @@
                         .setSubject("testPut example")
                         .build();
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
         outDocuments = doGet(mDb2, "namespace", "email2");
         assertThat(outDocuments).hasSize(1);
         outEmail = new AppSearchEmail(outDocuments.get(0));
@@ -630,7 +917,9 @@
         Throwable failResult1 =
                 assertThrows(
                                 ExecutionException.class,
-                                () -> mDb1.setSchema(new SetSchemaRequest.Builder().build()).get())
+                                () ->
+                                        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().build())
+                                                .get())
                         .getCause();
         assertThat(failResult1).isInstanceOf(AppSearchException.class);
         assertThat(failResult1).hasMessageThat().contains("Schema is incompatible");
@@ -638,11 +927,11 @@
 
         // Try to remove the email schema again, which should now work as we set forceOverride to
         // be true.
-        mDb1.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
 
         // Make sure the indexed email is gone in database 1.
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("email1")
                                         .build())
@@ -657,12 +946,14 @@
                         .setSubject("testPut example")
                         .build();
         AppSearchBatchResult<String, Void> failResult2 =
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email3).build())
+                mDb1.putAsync(new PutDocumentsRequest.Builder().addGenericDocuments(email3).build())
                         .get();
         assertThat(failResult2.isSuccess()).isFalse();
         assertThat(failResult2.getFailures().get("email3").getErrorMessage())
                 .isEqualTo(
-                        "Schema type config 'com.android.cts.appsearch$"
+                        "Schema type config '"
+                                + mContext.getPackageName()
+                                + "$"
                                 + DB_NAME_1
                                 + "/builtin:Email' not found");
 
@@ -674,13 +965,15 @@
 
         // Make sure email could still be indexed in database 2.
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
     }
 
     @Test
     public void testGetDocuments() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index a document
@@ -692,7 +985,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
 
         // Get the document
         List<GenericDocument> outDocuments = doGet(mDb1, "namespace", "id1");
@@ -702,7 +996,7 @@
 
         // Can't get the document in the other instance.
         AppSearchBatchResult<String, GenericDocument> failResult =
-                mDb2.getByDocumentId(
+                mDb2.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1")
                                         .build())
@@ -715,7 +1009,8 @@
     @Test
     public void testGetDocuments_projection() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index two documents
@@ -736,7 +1031,7 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2)
                                 .build()));
@@ -770,7 +1065,8 @@
     @Test
     public void testGetDocuments_projectionEmpty() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index two documents
@@ -791,7 +1087,7 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2)
                                 .build()));
@@ -819,7 +1115,8 @@
     @Test
     public void testGetDocuments_projectionNonExistentType() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index two documents
@@ -840,7 +1137,7 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2)
                                 .build()));
@@ -875,7 +1172,8 @@
     @Test
     public void testGetDocuments_wildcardProjection() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index two documents
@@ -896,7 +1194,7 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2)
                                 .build()));
@@ -931,7 +1229,8 @@
     @Test
     public void testGetDocuments_wildcardProjectionEmpty() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index two documents
@@ -952,7 +1251,7 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2)
                                 .build()));
@@ -982,7 +1281,8 @@
     @Test
     public void testGetDocuments_wildcardProjectionNonExistentType() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index two documents
@@ -1003,7 +1303,7 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2)
                                 .build()));
@@ -1039,7 +1339,8 @@
     @Test
     public void testQuery() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index a document
@@ -1051,7 +1352,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
 
         // Query for the document
         SearchResultsShim searchResults =
@@ -1079,7 +1381,8 @@
     @Test
     public void testQuery_getNextPage() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
         Set<AppSearchEmail> emailSet = new HashSet<>();
         PutDocumentsRequest.Builder putDocumentsRequestBuilder = new PutDocumentsRequest.Builder();
@@ -1095,7 +1398,7 @@
             emailSet.add(inEmail);
             putDocumentsRequestBuilder.addGenericDocuments(inEmail);
         }
-        checkIsBatchResultSuccess(mDb1.put(putDocumentsRequestBuilder.build()));
+        checkIsBatchResultSuccess(mDb1.putAsync(putDocumentsRequestBuilder.build()));
 
         // Set number of results per page is 7.
         SearchResultsShim searchResults =
@@ -1112,7 +1415,7 @@
 
         // keep loading next page until it's empty.
         do {
-            results = searchResults.getNextPage().get();
+            results = searchResults.getNextPageAsync().get();
             ++pageNumber;
             for (SearchResult result : results) {
                 documents.add(result.getGenericDocument());
@@ -1127,7 +1430,8 @@
     @Test
     public void testQuery_relevanceScoring() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index two documents
@@ -1148,7 +1452,7 @@
                         .setBody("short and stout. Here is my handle, here is my spout.")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2)
                                 .build()));
@@ -1205,7 +1509,7 @@
                                                 StringPropertyConfig.INDEXING_TYPE_PREFIXES)
                                         .build())
                         .build();
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(AppSearchEmail.SCHEMA)
                                 .addSchemas(genericSchema)
@@ -1225,7 +1529,7 @@
                         .setPropertyString("foo", "body")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(inEmail, inDoc)
                                 .build()));
@@ -1254,12 +1558,24 @@
         documents = convertSearchResultsToDocuments(searchResults);
         assertThat(documents).hasSize(1);
         assertThat(documents).containsExactly(inDoc);
+
+        // Query only for non-exist type
+        searchResults =
+                mDb1.search(
+                        "body",
+                        new SearchSpec.Builder()
+                                .addFilterSchemas("nonExistType")
+                                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
+                                .build());
+        documents = convertSearchResultsToDocuments(searchResults);
+        assertThat(documents).isEmpty();
     }
 
     @Test
     public void testQuery_packageFilter() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index documents
@@ -1271,7 +1587,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email).build()));
 
         // Query for the document within our package
         SearchResultsShim searchResults =
@@ -1294,14 +1611,15 @@
                                 .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
                                 .addFilterPackageNames("some.other.package")
                                 .build());
-        List<SearchResult> results = searchResults.getNextPage().get();
+        List<SearchResult> results = searchResults.getNextPageAsync().get();
         assertThat(results).isEmpty();
     }
 
     @Test
     public void testQuery_namespaceFilter() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index two documents
@@ -1320,7 +1638,7 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(expectedEmail, unexpectedEmail)
                                 .build()));
@@ -1347,12 +1665,24 @@
         documents = convertSearchResultsToDocuments(searchResults);
         assertThat(documents).hasSize(1);
         assertThat(documents).containsExactly(expectedEmail);
+
+        // Query only for non-exist namespace
+        searchResults =
+                mDb1.search(
+                        "body",
+                        new SearchSpec.Builder()
+                                .addFilterNamespaces("nonExistNamespace")
+                                .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
+                                .build());
+        documents = convertSearchResultsToDocuments(searchResults);
+        assertThat(documents).isEmpty();
     }
 
     @Test
     public void testQuery_getPackageName() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index a document
@@ -1364,7 +1694,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
 
         // Query for the document
         SearchResultsShim searchResults =
@@ -1378,7 +1709,7 @@
         List<GenericDocument> documents = new ArrayList<>();
         // keep loading next page until it's empty.
         do {
-            results = searchResults.getNextPage().get();
+            results = searchResults.getNextPageAsync().get();
             for (SearchResult result : results) {
                 assertThat(result.getGenericDocument()).isEqualTo(inEmail);
                 assertThat(result.getPackageName())
@@ -1392,7 +1723,8 @@
     @Test
     public void testQuery_getDatabaseName() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index a document
@@ -1404,7 +1736,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
 
         // Query for the document
         SearchResultsShim searchResults =
@@ -1418,7 +1751,7 @@
         List<GenericDocument> documents = new ArrayList<>();
         // keep loading next page until it's empty.
         do {
-            results = searchResults.getNextPage().get();
+            results = searchResults.getNextPageAsync().get();
             for (SearchResult result : results) {
                 assertThat(result.getGenericDocument()).isEqualTo(inEmail);
                 assertThat(result.getDatabaseName()).isEqualTo(DB_NAME_1);
@@ -1428,11 +1761,13 @@
         assertThat(documents).hasSize(1);
 
         // Schema registration for another database
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
 
         // Query for the document
         searchResults =
@@ -1445,7 +1780,7 @@
         documents = new ArrayList<>();
         // keep loading next page until it's empty.
         do {
-            results = searchResults.getNextPage().get();
+            results = searchResults.getNextPageAsync().get();
             for (SearchResult result : results) {
                 assertThat(result.getGenericDocument()).isEqualTo(inEmail);
                 assertThat(result.getDatabaseName()).isEqualTo(DB_NAME_2);
@@ -1458,7 +1793,7 @@
     @Test
     public void testQuery_projection() throws Exception {
         // Schema registration
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(AppSearchEmail.SCHEMA)
                                 .addSchemas(
@@ -1507,7 +1842,7 @@
                         .setPropertyString("body", "Note body")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email, note)
                                 .build()));
@@ -1543,7 +1878,7 @@
     @Test
     public void testQuery_projectionEmpty() throws Exception {
         // Schema registration
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(AppSearchEmail.SCHEMA)
                                 .addSchemas(
@@ -1592,7 +1927,7 @@
                         .setPropertyString("body", "Note body")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email, note)
                                 .build()));
@@ -1625,7 +1960,7 @@
     @Test
     public void testQuery_projectionNonExistentType() throws Exception {
         // Schema registration
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(AppSearchEmail.SCHEMA)
                                 .addSchemas(
@@ -1674,7 +2009,7 @@
                         .setPropertyString("body", "Note body")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email, note)
                                 .build()));
@@ -1711,7 +2046,7 @@
     @Test
     public void testQuery_wildcardProjection() throws Exception {
         // Schema registration
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(AppSearchEmail.SCHEMA)
                                 .addSchemas(
@@ -1760,7 +2095,7 @@
                         .setPropertyString("body", "Note body")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email, note)
                                 .build()));
@@ -1796,7 +2131,7 @@
     @Test
     public void testQuery_wildcardProjectionEmpty() throws Exception {
         // Schema registration
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(AppSearchEmail.SCHEMA)
                                 .addSchemas(
@@ -1845,7 +2180,7 @@
                         .setPropertyString("body", "Note body")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email, note)
                                 .build()));
@@ -1877,7 +2212,7 @@
     @Test
     public void testQuery_wildcardProjectionNonExistentType() throws Exception {
         // Schema registration
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(AppSearchEmail.SCHEMA)
                                 .addSchemas(
@@ -1926,7 +2261,7 @@
                         .setPropertyString("body", "Note body")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email, note)
                                 .build()));
@@ -1963,9 +2298,11 @@
     @Test
     public void testQuery_twoInstances() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index a document to instance 1.
@@ -1977,7 +2314,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail1).build()));
 
         // Index a document to instance 2.
         AppSearchEmail inEmail2 =
@@ -1988,7 +2326,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail2).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail2).build()));
 
         // Query for instance 1.
         SearchResultsShim searchResults =
@@ -2026,7 +2365,7 @@
                                                 StringPropertyConfig.INDEXING_TYPE_PREFIXES)
                                         .build())
                         .build();
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(genericSchema).build()).get();
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().addSchemas(genericSchema).build()).get();
 
         // Index a document
         GenericDocument document =
@@ -2037,12 +2376,13 @@
                                         + "Another nonsense word that’s used a lot is bar")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(document).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(document).build()));
 
         // Query for the document
         SearchResultsShim searchResults =
                 mDb1.search(
-                        "foo",
+                        "fo",
                         new SearchSpec.Builder()
                                 .addFilterSchemas("Generic")
                                 .setSnippetCount(1)
@@ -2050,7 +2390,7 @@
                                 .setMaxSnippetSize(10)
                                 .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
                                 .build());
-        List<SearchResult> results = searchResults.getNextPage().get();
+        List<SearchResult> results = searchResults.getNextPageAsync().get();
         assertThat(results).hasSize(1);
 
         List<SearchResult.MatchInfo> matchInfos = results.get(0).getMatchInfos();
@@ -2067,6 +2407,15 @@
         assertThat(matchInfo.getSnippetRange())
                 .isEqualTo(new SearchResult.MatchRange(/*lower=*/ 26, /*upper=*/ 33));
         assertThat(matchInfo.getSnippet()).isEqualTo("is foo.");
+
+        if (!mDb1.getFeatures().isFeatureSupported(Features.SEARCH_RESULT_MATCH_INFO_SUBMATCH)) {
+            assertThrows(UnsupportedOperationException.class, matchInfo::getSubmatchRange);
+            assertThrows(UnsupportedOperationException.class, matchInfo::getSubmatch);
+        } else {
+            assertThat(matchInfo.getSubmatchRange())
+                    .isEqualTo(new SearchResult.MatchRange(/*lower=*/ 29, /*upper=*/ 31));
+            assertThat(matchInfo.getSubmatch()).isEqualTo("fo");
+        }
     }
 
     @Test
@@ -2082,11 +2431,11 @@
                                                 StringPropertyConfig.INDEXING_TYPE_PREFIXES)
                                         .build())
                         .build();
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(genericSchema).build()).get();
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().addSchemas(genericSchema).build()).get();
 
         // Index documents
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(
                                         new GenericDocument.Builder<>("namespace", "id1", "Generic")
@@ -2132,7 +2481,7 @@
                                 .build());
 
         // Check result 1
-        List<SearchResult> results = searchResults.getNextPage().get();
+        List<SearchResult> results = searchResults.getNextPageAsync().get();
         assertThat(results).hasSize(3);
 
         assertThat(results.get(0).getGenericDocument().getId()).isEqualTo("id2");
@@ -2169,7 +2518,7 @@
                                                 StringPropertyConfig.INDEXING_TYPE_PREFIXES)
                                         .build())
                         .build();
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(genericSchema).build()).get();
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().addSchemas(genericSchema).build()).get();
 
         String japanese =
                 "差し出されたのが今日ランドセルでした普通の子であれば満面の笑みで俺を言うでしょうしかし私は赤いランド"
@@ -2182,7 +2531,8 @@
                         .setPropertyString("subject", japanese)
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(document).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(document).build()));
 
         // Query for the document
         SearchResultsShim searchResults =
@@ -2194,7 +2544,7 @@
                                 .setSnippetCountPerProperty(1)
                                 .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
                                 .build());
-        List<SearchResult> results = searchResults.getNextPage().get();
+        List<SearchResult> results = searchResults.getNextPageAsync().get();
         assertThat(results).hasSize(1);
 
         List<SearchResult.MatchInfo> matchInfos = results.get(0).getMatchInfos();
@@ -2205,12 +2555,22 @@
         assertThat(matchInfo.getExactMatchRange())
                 .isEqualTo(new SearchResult.MatchRange(/*lower=*/ 44, /*upper=*/ 45));
         assertThat(matchInfo.getExactMatch()).isEqualTo("は");
+
+        if (!mDb1.getFeatures().isFeatureSupported(Features.SEARCH_RESULT_MATCH_INFO_SUBMATCH)) {
+            assertThrows(UnsupportedOperationException.class, matchInfo::getSubmatchRange);
+            assertThrows(UnsupportedOperationException.class, matchInfo::getSubmatch);
+        } else {
+            assertThat(matchInfo.getSubmatchRange())
+                    .isEqualTo(new SearchResult.MatchRange(/*lower=*/ 44, /*upper=*/ 45));
+            assertThat(matchInfo.getSubmatch()).isEqualTo("は");
+        }
     }
 
     @Test
     public void testRemove() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index documents
@@ -2229,7 +2589,7 @@
                         .setBody("This is the body of the testPut second email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2)
                                 .build()));
@@ -2240,12 +2600,12 @@
 
         // Delete the document
         checkIsBatchResultSuccess(
-                mDb1.remove(
+                mDb1.removeAsync(
                         new RemoveByDocumentIdRequest.Builder("namespace").addIds("id1").build()));
 
         // Make sure it's really gone
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1", "id2")
                                         .build())
@@ -2257,7 +2617,7 @@
 
         // Test if we delete a nonexistent id.
         AppSearchBatchResult<String, Void> deleteResult =
-                mDb1.remove(
+                mDb1.removeAsync(
                                 new RemoveByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1")
                                         .build())
@@ -2270,7 +2630,8 @@
     @Test
     public void testRemove_multipleIds() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index documents
@@ -2289,7 +2650,7 @@
                         .setBody("This is the body of the testPut second email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2)
                                 .build()));
@@ -2300,14 +2661,14 @@
 
         // Delete the document
         checkIsBatchResultSuccess(
-                mDb1.remove(
+                mDb1.removeAsync(
                         new RemoveByDocumentIdRequest.Builder("namespace")
                                 .addIds("id1", "id2")
                                 .build()));
 
         // Make sure it's really gone
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1", "id2")
                                         .build())
@@ -2322,7 +2683,8 @@
     @Test
     public void testRemoveByQuery() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index documents
@@ -2341,7 +2703,7 @@
                         .setBody("This is the body of the testPut second email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2)
                                 .build()));
@@ -2351,12 +2713,12 @@
         assertThat(doGet(mDb1, "namespace", "id2")).hasSize(1);
 
         // Delete the email 1 by query "foo"
-        mDb1.remove(
+        mDb1.removeAsync(
                         "foo",
                         new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX).build())
                 .get();
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1", "id2")
                                         .build())
@@ -2367,12 +2729,12 @@
         assertThat(getResult.getSuccesses().get("id2")).isEqualTo(email2);
 
         // Delete the email 2 by query "bar"
-        mDb1.remove(
+        mDb1.removeAsync(
                         "bar",
                         new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX).build())
                 .get();
         getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id2")
                                         .build())
@@ -2383,9 +2745,55 @@
     }
 
     @Test
+    public void testRemoveByQuery_nonExistNamespace() throws Exception {
+        // Schema registration
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+                .get();
+
+        // Index documents
+        AppSearchEmail email1 =
+                new AppSearchEmail.Builder("namespace1", "id1")
+                        .setFrom("from@example.com")
+                        .setTo("to1@example.com", "to2@example.com")
+                        .setSubject("foo")
+                        .setBody("This is the body of the testPut email")
+                        .build();
+        AppSearchEmail email2 =
+                new AppSearchEmail.Builder("namespace2", "id2")
+                        .setFrom("from@example.com")
+                        .setTo("to1@example.com", "to2@example.com")
+                        .setSubject("bar")
+                        .setBody("This is the body of the testPut second email")
+                        .build();
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder()
+                                .addGenericDocuments(email1, email2)
+                                .build()));
+
+        // Check the presence of the documents
+        assertThat(doGet(mDb1, "namespace1", "id1")).hasSize(1);
+        assertThat(doGet(mDb1, "namespace2", "id2")).hasSize(1);
+
+        // Delete the email by nonExist namespace.
+        mDb1.removeAsync(
+                        "",
+                        new SearchSpec.Builder()
+                                .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
+                                .addFilterNamespaces("nonExistNamespace")
+                                .build())
+                .get();
+        // None of these emails will be deleted.
+        assertThat(doGet(mDb1, "namespace1", "id1")).hasSize(1);
+        assertThat(doGet(mDb1, "namespace2", "id2")).hasSize(1);
+    }
+
+    @Test
     public void testRemoveByQuery_packageFilter() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index documents
@@ -2397,14 +2805,15 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email).build()));
 
         // Check the presence of the documents
         assertThat(doGet(mDb1, "namespace", "id1")).hasSize(1);
 
         // Try to delete email with query "foo", but restricted to a different package name.
         // Won't work and email will still exist.
-        mDb1.remove(
+        mDb1.removeAsync(
                         "foo",
                         new SearchSpec.Builder()
                                 .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
@@ -2414,7 +2823,7 @@
         assertThat(doGet(mDb1, "namespace", "id1")).hasSize(1);
 
         // Delete the email by query "foo", restricted to the correct package this time.
-        mDb1.remove(
+        mDb1.removeAsync(
                         "foo",
                         new SearchSpec.Builder()
                                 .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
@@ -2424,7 +2833,7 @@
                                 .build())
                 .get();
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1", "id2")
                                         .build())
@@ -2437,7 +2846,8 @@
     @Test
     public void testRemove_twoInstances() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index documents
@@ -2449,14 +2859,15 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
 
         // Check the presence of the documents
         assertThat(doGet(mDb1, "namespace", "id1")).hasSize(1);
 
         // Can't delete in the other instance.
         AppSearchBatchResult<String, Void> deleteResult =
-                mDb2.remove(
+                mDb2.removeAsync(
                                 new RemoveByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1")
                                         .build())
@@ -2467,12 +2878,12 @@
 
         // Delete the document
         checkIsBatchResultSuccess(
-                mDb1.remove(
+                mDb1.removeAsync(
                         new RemoveByDocumentIdRequest.Builder("namespace").addIds("id1").build()));
 
         // Make sure it's really gone
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1")
                                         .build())
@@ -2483,7 +2894,7 @@
 
         // Test if we delete a nonexistent id.
         deleteResult =
-                mDb1.remove(
+                mDb1.removeAsync(
                                 new RemoveByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1")
                                         .build())
@@ -2496,7 +2907,7 @@
     public void testRemoveByTypes() throws Exception {
         // Schema registration
         AppSearchSchema genericSchema = new AppSearchSchema.Builder("Generic").build();
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(AppSearchEmail.SCHEMA)
                                 .addSchemas(genericSchema)
@@ -2521,7 +2932,7 @@
         GenericDocument document1 =
                 new GenericDocument.Builder<>("namespace", "id3", "Generic").build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2, document1)
                                 .build()));
@@ -2530,7 +2941,7 @@
         assertThat(doGet(mDb1, "namespace", "id1", "id2", "id3")).hasSize(3);
 
         // Delete the email type
-        mDb1.remove(
+        mDb1.removeAsync(
                         "",
                         new SearchSpec.Builder()
                                 .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
@@ -2540,7 +2951,7 @@
 
         // Make sure it's really gone
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1", "id2", "id3")
                                         .build())
@@ -2556,9 +2967,11 @@
     @Test
     public void testRemoveByTypes_twoInstances() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index documents
@@ -2577,16 +2990,18 @@
                         .setBody("This is the body of the testPut second email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
 
         // Check the presence of the documents
         assertThat(doGet(mDb1, "namespace", "id1")).hasSize(1);
         assertThat(doGet(mDb2, "namespace", "id2")).hasSize(1);
 
         // Delete the email type in instance 1
-        mDb1.remove(
+        mDb1.removeAsync(
                         "",
                         new SearchSpec.Builder()
                                 .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
@@ -2596,7 +3011,7 @@
 
         // Make sure it's really gone in instance 1
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1")
                                         .build())
@@ -2607,7 +3022,7 @@
 
         // Make sure it's still in instance 2.
         getResult =
-                mDb2.getByDocumentId(
+                mDb2.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id2")
                                         .build())
@@ -2629,7 +3044,7 @@
                                                 StringPropertyConfig.INDEXING_TYPE_PREFIXES)
                                         .build())
                         .build();
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(AppSearchEmail.SCHEMA)
                                 .addSchemas(genericSchema)
@@ -2656,7 +3071,7 @@
                         .setPropertyString("foo", "bar")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2, document1)
                                 .build()));
@@ -2666,7 +3081,7 @@
         assertThat(doGet(mDb1, /*namespace=*/ "document", "id3")).hasSize(1);
 
         // Delete the email namespace
-        mDb1.remove(
+        mDb1.removeAsync(
                         "",
                         new SearchSpec.Builder()
                                 .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
@@ -2676,7 +3091,7 @@
 
         // Make sure it's really gone
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("email")
                                         .addIds("id1", "id2")
                                         .build())
@@ -2687,7 +3102,7 @@
         assertThat(getResult.getFailures().get("id2").getResultCode())
                 .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
         getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("document")
                                         .addIds("id3")
                                         .build())
@@ -2699,9 +3114,11 @@
     @Test
     public void testRemoveByNamespaces_twoInstances() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index documents
@@ -2720,16 +3137,18 @@
                         .setBody("This is the body of the testPut second email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
 
         // Check the presence of the documents
         assertThat(doGet(mDb1, /*namespace=*/ "email", "id1")).hasSize(1);
         assertThat(doGet(mDb2, /*namespace=*/ "email", "id2")).hasSize(1);
 
         // Delete the email namespace in instance 1
-        mDb1.remove(
+        mDb1.removeAsync(
                         "",
                         new SearchSpec.Builder()
                                 .setTermMatch(SearchSpec.TERM_MATCH_PREFIX)
@@ -2739,7 +3158,7 @@
 
         // Make sure it's really gone in instance 1
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("email").addIds("id1").build())
                         .get();
         assertThat(getResult.isSuccess()).isFalse();
@@ -2748,7 +3167,7 @@
 
         // Make sure it's still in instance 2.
         getResult =
-                mDb2.getByDocumentId(
+                mDb2.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("email").addIds("id2").build())
                         .get();
         assertThat(getResult.isSuccess()).isTrue();
@@ -2758,9 +3177,11 @@
     @Test
     public void testRemoveAll_twoInstances() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index documents
@@ -2779,21 +3200,25 @@
                         .setBody("This is the body of the testPut second email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
 
         // Check the presence of the documents
         assertThat(doGet(mDb1, "namespace", "id1")).hasSize(1);
         assertThat(doGet(mDb2, "namespace", "id2")).hasSize(1);
 
         // Delete the all document in instance 1
-        mDb1.remove("", new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX).build())
+        mDb1.removeAsync(
+                        "",
+                        new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX).build())
                 .get();
 
         // Make sure it's really gone in instance 1
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1")
                                         .build())
@@ -2804,7 +3229,7 @@
 
         // Make sure it's still in instance 2.
         getResult =
-                mDb2.getByDocumentId(
+                mDb2.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id2")
                                         .build())
@@ -2816,9 +3241,11 @@
     @Test
     public void testRemoveAll_termMatchType() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index documents
@@ -2851,12 +3278,12 @@
                         .setBody("This is the body of the testPut second email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2)
                                 .build()));
         checkIsBatchResultSuccess(
-                mDb2.put(
+                mDb2.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email3, email4)
                                 .build()));
@@ -2880,7 +3307,9 @@
         assertThat(documents).hasSize(2);
 
         // Delete the all document in instance 1 with TERM_MATCH_PREFIX
-        mDb1.remove("", new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX).build())
+        mDb1.removeAsync(
+                        "",
+                        new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX).build())
                 .get();
         searchResults =
                 mDb1.search(
@@ -2892,7 +3321,7 @@
         assertThat(documents).isEmpty();
 
         // Delete the all document in instance 2 with TERM_MATCH_EXACT_ONLY
-        mDb2.remove(
+        mDb2.removeAsync(
                         "",
                         new SearchSpec.Builder()
                                 .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
@@ -2911,7 +3340,8 @@
     @Test
     public void testRemoveAllAfterEmpty() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index documents
@@ -2923,19 +3353,20 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
 
         // Check the presence of the documents
         assertThat(doGet(mDb1, "namespace", "id1")).hasSize(1);
 
         // Remove the document
         checkIsBatchResultSuccess(
-                mDb1.remove(
+                mDb1.removeAsync(
                         new RemoveByDocumentIdRequest.Builder("namespace").addIds("id1").build()));
 
         // Make sure it's really gone
         AppSearchBatchResult<String, GenericDocument> getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1")
                                         .build())
@@ -2945,12 +3376,14 @@
                 .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
 
         // Delete the all documents
-        mDb1.remove("", new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX).build())
+        mDb1.removeAsync(
+                        "",
+                        new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_PREFIX).build())
                 .get();
 
         // Make sure it's still gone
         getResult =
-                mDb1.getByDocumentId(
+                mDb1.getByDocumentIdAsync(
                                 new GetByDocumentIdRequest.Builder("namespace")
                                         .addIds("id1")
                                         .build())
@@ -2963,7 +3396,8 @@
     @Test
     public void testCloseAndReopen() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index a document
@@ -2975,11 +3409,12 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
 
         // close and re-open the appSearchSession
         mDb1.close();
-        mDb1 = createSearchSession(DB_NAME_1).get();
+        mDb1 = createSearchSessionAsync(DB_NAME_1).get();
 
         // Query for the document
         SearchResultsShim searchResults =
@@ -2999,12 +3434,13 @@
         // execution order of those async tasks.
         Context context = ApplicationProvider.getApplicationContext();
         AppSearchSessionShim sameThreadDb =
-                createSearchSession("sameThreadDb", MoreExecutors.newDirectExecutorService()).get();
+                createSearchSessionAsync("sameThreadDb", MoreExecutors.newDirectExecutorService())
+                        .get();
 
         try {
             // Schema registration -- just mutate something
             sameThreadDb
-                    .setSchema(
+                    .setSchemaAsync(
                             new SetSchemaRequest.Builder()
                                     .addSchemas(AppSearchEmail.SCHEMA)
                                     .build())
@@ -3029,48 +3465,51 @@
             // To clean the data that has been added in the test, need to re-open the session and
             // set an empty schema.
             AppSearchSessionShim reopen =
-                    createSearchSession("sameThreadDb", MoreExecutors.newDirectExecutorService())
+                    createSearchSessionAsync(
+                                    "sameThreadDb", MoreExecutors.newDirectExecutorService())
                             .get();
-            reopen.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
+            reopen.setSchemaAsync(new SetSchemaRequest.Builder().setForceOverride(true).build())
+                    .get();
         }
     }
 
     @Test
     public void testReportUsage() throws Exception {
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index two documents.
         AppSearchEmail email1 = new AppSearchEmail.Builder("namespace", "id1").build();
         AppSearchEmail email2 = new AppSearchEmail.Builder("namespace", "id2").build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2)
                                 .build()));
 
         // Email 1 has more usages, but email 2 has more recent usages.
-        mDb1.reportUsage(
+        mDb1.reportUsageAsync(
                         new ReportUsageRequest.Builder("namespace", "id1")
                                 .setUsageTimestampMillis(1000)
                                 .build())
                 .get();
-        mDb1.reportUsage(
+        mDb1.reportUsageAsync(
                         new ReportUsageRequest.Builder("namespace", "id1")
                                 .setUsageTimestampMillis(2000)
                                 .build())
                 .get();
-        mDb1.reportUsage(
+        mDb1.reportUsageAsync(
                         new ReportUsageRequest.Builder("namespace", "id1")
                                 .setUsageTimestampMillis(3000)
                                 .build())
                 .get();
-        mDb1.reportUsage(
+        mDb1.reportUsageAsync(
                         new ReportUsageRequest.Builder("namespace", "id2")
                                 .setUsageTimestampMillis(10000)
                                 .build())
                 .get();
-        mDb1.reportUsage(
+        mDb1.reportUsageAsync(
                         new ReportUsageRequest.Builder("namespace", "id2")
                                 .setUsageTimestampMillis(20000)
                                 .build())
@@ -3112,21 +3551,23 @@
 
     @Test
     public void testReportUsage_invalidNamespace() throws Exception {
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
         AppSearchEmail email1 = new AppSearchEmail.Builder("namespace", "id1").build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
 
         // Use the correct namespace; it works
-        mDb1.reportUsage(new ReportUsageRequest.Builder("namespace", "id1").build()).get();
+        mDb1.reportUsageAsync(new ReportUsageRequest.Builder("namespace", "id1").build()).get();
 
         // Use an incorrect namespace; it fails
         ExecutionException e =
                 assertThrows(
                         ExecutionException.class,
                         () ->
-                                mDb1.reportUsage(
+                                mDb1.reportUsageAsync(
                                                 new ReportUsageRequest.Builder("namespace2", "id1")
                                                         .build())
                                         .get());
@@ -3137,14 +3578,15 @@
 
     @Test
     public void testGetStorageInfo() throws Exception {
-        StorageInfo storageInfo = mDb1.getStorageInfo().get();
+        StorageInfo storageInfo = mDb1.getStorageInfoAsync().get();
         assertThat(storageInfo.getSizeBytes()).isEqualTo(0);
 
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Still no storage space attributed with just a schema
-        storageInfo = mDb1.getStorageInfo().get();
+        storageInfo = mDb1.getStorageInfoAsync().get();
         assertThat(storageInfo.getSizeBytes()).isEqualTo(0);
 
         // Index two documents.
@@ -3152,13 +3594,13 @@
         AppSearchEmail email2 = new AppSearchEmail.Builder("namespace1", "id2").build();
         AppSearchEmail email3 = new AppSearchEmail.Builder("namespace2", "id1").build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(email1, email2, email3)
                                 .build()));
 
         // Non-zero size now
-        storageInfo = mDb1.getStorageInfo().get();
+        storageInfo = mDb1.getStorageInfoAsync().get();
         assertThat(storageInfo.getSizeBytes()).isGreaterThan(0);
         assertThat(storageInfo.getAliveDocumentsCount()).isEqualTo(3);
         assertThat(storageInfo.getAliveNamespacesCount()).isEqualTo(2);
@@ -3167,7 +3609,8 @@
     @Test
     public void testFlush() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index a document
@@ -3181,7 +3624,7 @@
 
         AppSearchBatchResult<String, Void> result =
                 checkIsBatchResultSuccess(
-                        mDb1.put(
+                        mDb1.putAsync(
                                 new PutDocumentsRequest.Builder()
                                         .addGenericDocuments(email)
                                         .build()));
@@ -3189,13 +3632,14 @@
         assertThat(result.getFailures()).isEmpty();
 
         // The future returned from requestFlush will be set as a void or an Exception on error.
-        mDb1.requestFlush().get();
+        mDb1.requestFlushAsync().get();
     }
 
     @Test
     public void testQuery_ResultGroupingLimits() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index four documents.
@@ -3207,7 +3651,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail1).build()));
         AppSearchEmail inEmail2 =
                 new AppSearchEmail.Builder("namespace1", "id2")
                         .setFrom("from@example.com")
@@ -3216,7 +3661,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail2).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail2).build()));
         AppSearchEmail inEmail3 =
                 new AppSearchEmail.Builder("namespace2", "id3")
                         .setFrom("from@example.com")
@@ -3225,7 +3671,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail3).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail3).build()));
         AppSearchEmail inEmail4 =
                 new AppSearchEmail.Builder("namespace2", "id4")
                         .setFrom("from@example.com")
@@ -3234,7 +3681,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail4).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail4).build()));
 
         // Query with per package result grouping. Only the last document 'email4' should be
         // returned.
@@ -3281,7 +3729,7 @@
     @Test
     public void testIndexNestedDocuments() throws Exception {
         // Schema registration
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(AppSearchEmail.SCHEMA)
                                 .addSchemas(
@@ -3321,7 +3769,7 @@
                         .setPropertyDocument("prop", email)
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(yesNestedIndex, noNestedIndex)
                                 .build()));
@@ -3335,7 +3783,7 @@
                                 .setSnippetCount(10)
                                 .setSnippetCountPerProperty(10)
                                 .build());
-        List<SearchResult> page = searchResults.getNextPage().get();
+        List<SearchResult> page = searchResults.getNextPageAsync().get();
         assertThat(page).hasSize(1);
         assertThat(page.get(0).getGenericDocument()).isEqualTo(yesNestedIndex);
         List<SearchResult.MatchInfo> matches = page.get(0).getMatchInfos();
@@ -3348,14 +3796,16 @@
     @Test
     public void testCJKTQuery() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index a document to instance 1.
         AppSearchEmail inEmail1 =
                 new AppSearchEmail.Builder("namespace", "uri1").setBody("他是個男孩 is a boy").build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail1).build()));
 
         // Query for "他" (He)
         SearchResultsShim searchResults =
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/app/GenericDocumentCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/external/app/GenericDocumentCtsTest.java
index 70f9b48..0dfff00 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/external/app/GenericDocumentCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/app/GenericDocumentCtsTest.java
@@ -332,9 +332,19 @@
     public void testDocument_setEmptyValues() {
         GenericDocument document =
                 new GenericDocument.Builder<>("namespace", "id1", "schemaType1")
-                        .setPropertyBoolean("testKey")
+                        .setPropertyBoolean("booleanKey")
+                        .setPropertyString("stringKey")
+                        .setPropertyBytes("byteKey")
+                        .setPropertyDouble("doubleKey")
+                        .setPropertyDocument("documentKey")
+                        .setPropertyLong("longKey")
                         .build();
-        assertThat(document.getPropertyBooleanArray("testKey")).isEmpty();
+        assertThat(document.getPropertyBooleanArray("booleanKey")).isEmpty();
+        assertThat(document.getPropertyStringArray("stringKey")).isEmpty();
+        assertThat(document.getPropertyBytesArray("byteKey")).isEmpty();
+        assertThat(document.getPropertyDoubleArray("doubleKey")).isEmpty();
+        assertThat(document.getPropertyDocumentArray("documentKey")).isEmpty();
+        assertThat(document.getPropertyLongArray("longKey")).isEmpty();
     }
 
     @Test
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/app/GetSchemaResponseCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/external/app/GetSchemaResponseCtsTest.java
index d3ffa0a..fc3a21a 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/external/app/GetSchemaResponseCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/app/GetSchemaResponseCtsTest.java
@@ -20,12 +20,24 @@
 
 import android.app.appsearch.AppSearchSchema;
 import android.app.appsearch.GetSchemaResponse;
+import android.app.appsearch.PackageIdentifier;
+import android.app.appsearch.SetSchemaRequest;
+
+import com.google.common.collect.ImmutableSet;
 
 import org.junit.Test;
 
+import java.util.Arrays;
+
 public class GetSchemaResponseCtsTest {
     @Test
     public void testRebuild() {
+        byte[] sha256cert1 = new byte[32];
+        byte[] sha256cert2 = new byte[32];
+        Arrays.fill(sha256cert1, (byte) 1);
+        Arrays.fill(sha256cert2, (byte) 2);
+        PackageIdentifier packageIdentifier1 = new PackageIdentifier("Email", sha256cert1);
+        PackageIdentifier packageIdentifier2 = new PackageIdentifier("Email", sha256cert2);
         AppSearchSchema schema1 =
                 new AppSearchSchema.Builder("Email1")
                         .addProperty(
@@ -56,16 +68,123 @@
                         .build();
 
         GetSchemaResponse.Builder builder =
-                new GetSchemaResponse.Builder().setVersion(42).addSchema(schema1);
+                new GetSchemaResponse.Builder()
+                        .setVersion(42)
+                        .addSchema(schema1)
+                        .addSchemaTypeNotDisplayedBySystem("Email1")
+                        .setSchemaTypeVisibleToPackages(
+                                "Email1", ImmutableSet.of(packageIdentifier1))
+                        .setRequiredPermissionsForSchemaTypeVisibility(
+                                "Email1",
+                                ImmutableSet.of(
+                                        ImmutableSet.of(
+                                                SetSchemaRequest.READ_SMS,
+                                                SetSchemaRequest.READ_CALENDAR),
+                                        ImmutableSet.of(
+                                                SetSchemaRequest.READ_HOME_APP_SEARCH_DATA)));
 
         GetSchemaResponse original = builder.build();
-        GetSchemaResponse rebuild = builder.setVersion(37).addSchema(schema2).build();
+        GetSchemaResponse rebuild =
+                builder.setVersion(37)
+                        .addSchema(schema2)
+                        .addSchemaTypeNotDisplayedBySystem("Email2")
+                        .setSchemaTypeVisibleToPackages(
+                                "Email2", ImmutableSet.of(packageIdentifier2))
+                        .setRequiredPermissionsForSchemaTypeVisibility(
+                                "Email2",
+                                ImmutableSet.of(
+                                        ImmutableSet.of(
+                                                SetSchemaRequest.READ_CONTACTS,
+                                                SetSchemaRequest.READ_EXTERNAL_STORAGE),
+                                        ImmutableSet.of(
+                                                SetSchemaRequest.READ_ASSISTANT_APP_SEARCH_DATA)))
+                        .build();
 
         // rebuild won't effect the original object
         assertThat(original.getVersion()).isEqualTo(42);
         assertThat(original.getSchemas()).containsExactly(schema1);
+        assertThat(original.getSchemaTypesNotDisplayedBySystem()).containsExactly("Email1");
+        assertThat(original.getSchemaTypesVisibleToPackages()).hasSize(1);
+        assertThat(original.getSchemaTypesVisibleToPackages().get("Email1"))
+                .containsExactly(packageIdentifier1);
+        assertThat(original.getRequiredPermissionsForSchemaTypeVisibility())
+                .containsExactly(
+                        "Email1",
+                        ImmutableSet.of(
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR),
+                                ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA)));
 
         assertThat(rebuild.getVersion()).isEqualTo(37);
         assertThat(rebuild.getSchemas()).containsExactly(schema1, schema2);
+        assertThat(rebuild.getSchemaTypesNotDisplayedBySystem())
+                .containsExactly("Email1", "Email2");
+        assertThat(rebuild.getSchemaTypesVisibleToPackages()).hasSize(2);
+        assertThat(rebuild.getSchemaTypesVisibleToPackages().get("Email1"))
+                .containsExactly(packageIdentifier1);
+        assertThat(rebuild.getSchemaTypesVisibleToPackages().get("Email2"))
+                .containsExactly(packageIdentifier2);
+        assertThat(rebuild.getRequiredPermissionsForSchemaTypeVisibility())
+                .containsExactly(
+                        "Email1",
+                        ImmutableSet.of(
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR),
+                                ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA)),
+                        "Email2",
+                        ImmutableSet.of(
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_CONTACTS,
+                                        SetSchemaRequest.READ_EXTERNAL_STORAGE),
+                                ImmutableSet.of(SetSchemaRequest.READ_ASSISTANT_APP_SEARCH_DATA)));
+    }
+
+    @Test
+    public void setVisibility() {
+        byte[] sha256cert1 = new byte[32];
+        byte[] sha256cert2 = new byte[32];
+        Arrays.fill(sha256cert1, (byte) 1);
+        Arrays.fill(sha256cert2, (byte) 2);
+        PackageIdentifier packageIdentifier1 = new PackageIdentifier("Email", sha256cert1);
+        PackageIdentifier packageIdentifier2 = new PackageIdentifier("Email", sha256cert2);
+
+        GetSchemaResponse getSchemaResponse =
+                new GetSchemaResponse.Builder()
+                        .setVersion(42)
+                        .addSchemaTypeNotDisplayedBySystem("Email")
+                        .addSchemaTypeNotDisplayedBySystem("Text")
+                        .setSchemaTypeVisibleToPackages(
+                                "Email", ImmutableSet.of(packageIdentifier1, packageIdentifier2))
+                        .setRequiredPermissionsForSchemaTypeVisibility(
+                                "Email",
+                                ImmutableSet.of(
+                                        ImmutableSet.of(
+                                                SetSchemaRequest.READ_CONTACTS,
+                                                SetSchemaRequest.READ_EXTERNAL_STORAGE),
+                                        ImmutableSet.of(
+                                                SetSchemaRequest.READ_ASSISTANT_APP_SEARCH_DATA)))
+                        .build();
+
+        assertThat(getSchemaResponse.getSchemaTypesNotDisplayedBySystem())
+                .containsExactly("Email", "Text");
+        assertThat(getSchemaResponse.getSchemaTypesVisibleToPackages()).hasSize(1);
+        assertThat(getSchemaResponse.getSchemaTypesVisibleToPackages().get("Email"))
+                .containsExactly(packageIdentifier1, packageIdentifier2);
+        assertThat(getSchemaResponse.getRequiredPermissionsForSchemaTypeVisibility().get("Email"))
+                .containsExactlyElementsIn(
+                        ImmutableSet.of(
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_CONTACTS,
+                                        SetSchemaRequest.READ_EXTERNAL_STORAGE),
+                                ImmutableSet.of(SetSchemaRequest.READ_ASSISTANT_APP_SEARCH_DATA)));
+    }
+
+    @Test
+    public void getEmptyVisibility() {
+        GetSchemaResponse getSchemaResponse =
+                new GetSchemaResponse.Builder().setVersion(42).build();
+        assertThat(getSchemaResponse.getSchemaTypesNotDisplayedBySystem()).isEmpty();
+        assertThat(getSchemaResponse.getSchemaTypesVisibleToPackages()).isEmpty();
+        assertThat(getSchemaResponse.getRequiredPermissionsForSchemaTypeVisibility()).isEmpty();
     }
 }
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/app/GlobalSearchSessionCtsTestBase.java b/tests/appsearch/src/com/android/cts/appsearch/external/app/GlobalSearchSessionCtsTestBase.java
index 7dbe8d9..5ce2b37 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/external/app/GlobalSearchSessionCtsTestBase.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/app/GlobalSearchSessionCtsTestBase.java
@@ -16,34 +16,45 @@
 
 package android.app.appsearch.cts.app;
 
-import static com.android.server.appsearch.testing.AppSearchTestUtils.checkIsBatchResultSuccess;
-import static com.android.server.appsearch.testing.AppSearchTestUtils.convertSearchResultsToDocuments;
+import static android.app.appsearch.testutil.AppSearchTestUtils.checkIsBatchResultSuccess;
+import static android.app.appsearch.testutil.AppSearchTestUtils.convertSearchResultsToDocuments;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 
 import android.annotation.NonNull;
+import android.app.appsearch.AppSearchBatchResult;
 import android.app.appsearch.AppSearchResult;
 import android.app.appsearch.AppSearchSchema;
 import android.app.appsearch.AppSearchSchema.PropertyConfig;
 import android.app.appsearch.AppSearchSessionShim;
+import android.app.appsearch.Features;
 import android.app.appsearch.GenericDocument;
+import android.app.appsearch.GetByDocumentIdRequest;
+import android.app.appsearch.GetSchemaResponse;
 import android.app.appsearch.GlobalSearchSessionShim;
 import android.app.appsearch.PutDocumentsRequest;
+import android.app.appsearch.RemoveByDocumentIdRequest;
 import android.app.appsearch.ReportSystemUsageRequest;
 import android.app.appsearch.SearchResult;
 import android.app.appsearch.SearchResultsShim;
 import android.app.appsearch.SearchSpec;
 import android.app.appsearch.SetSchemaRequest;
 import android.app.appsearch.exceptions.AppSearchException;
+import android.app.appsearch.observer.DocumentChangeInfo;
+import android.app.appsearch.observer.ObserverSpec;
+import android.app.appsearch.observer.SchemaChangeInfo;
+import android.app.appsearch.testutil.AppSearchEmail;
+import android.app.appsearch.testutil.TestObserverCallback;
 import android.content.Context;
 
 import androidx.test.core.app.ApplicationProvider;
 
-import com.android.server.appsearch.testing.AppSearchEmail;
-
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.util.concurrent.ListenableFuture;
 
 import org.junit.After;
@@ -54,32 +65,36 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 
 public abstract class GlobalSearchSessionCtsTestBase {
-    private AppSearchSessionShim mDb1;
-    private static final String DB_NAME_1 = "";
-    private AppSearchSessionShim mDb2;
-    private static final String DB_NAME_2 = "testDb2";
+    static final String DB_NAME_1 = "";
+    static final String DB_NAME_2 = "testDb2";
 
-    private GlobalSearchSessionShim mGlobalAppSearchManager;
+    private static final Executor EXECUTOR = Executors.newCachedThreadPool();
+    private final Context mContext = ApplicationProvider.getApplicationContext();
 
-    protected abstract ListenableFuture<AppSearchSessionShim> createSearchSession(
+    protected AppSearchSessionShim mDb1;
+    protected AppSearchSessionShim mDb2;
+
+    protected GlobalSearchSessionShim mGlobalSearchSession;
+
+    protected abstract ListenableFuture<AppSearchSessionShim> createSearchSessionAsync(
             @NonNull String dbName);
 
-    protected abstract ListenableFuture<GlobalSearchSessionShim> createGlobalSearchSession();
+    protected abstract ListenableFuture<GlobalSearchSessionShim> createGlobalSearchSessionAsync();
 
     @Before
     public void setUp() throws Exception {
-        Context context = ApplicationProvider.getApplicationContext();
-
-        mDb1 = createSearchSession(DB_NAME_1).get();
-        mDb2 = createSearchSession(DB_NAME_2).get();
+        mDb1 = createSearchSessionAsync(DB_NAME_1).get();
+        mDb2 = createSearchSessionAsync(DB_NAME_2).get();
 
         // Cleanup whatever documents may still exist in these databases. This is needed in
         // addition to tearDown in case a test exited without completing properly.
         cleanup();
 
-        mGlobalAppSearchManager = createGlobalSearchSession().get();
+        mGlobalSearchSession = createGlobalSearchSessionAsync().get();
     }
 
     @After
@@ -89,13 +104,13 @@
     }
 
     private void cleanup() throws Exception {
-        mDb1.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
+        mDb1.setSchemaAsync(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
+        mDb2.setSchemaAsync(new SetSchemaRequest.Builder().setForceOverride(true).build()).get();
     }
 
     private List<GenericDocument> snapshotResults(String queryExpression, SearchSpec spec)
             throws Exception {
-        SearchResultsShim searchResults = mGlobalAppSearchManager.search(queryExpression, spec);
+        SearchResultsShim searchResults = mGlobalSearchSession.search(queryExpression, spec);
         return convertSearchResultsToDocuments(searchResults);
     }
 
@@ -117,6 +132,61 @@
     }
 
     @Test
+    public void testGlobalGetById() throws Exception {
+        assumeTrue(
+                mGlobalSearchSession
+                        .getFeatures()
+                        .isFeatureSupported(Features.GLOBAL_SEARCH_SESSION_GET_BY_ID));
+        SearchSpec exactSearchSpec =
+                new SearchSpec.Builder().setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY).build();
+
+        // Schema registration
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+                .get();
+
+        AppSearchBatchResult<String, GenericDocument> nonExistent =
+                mGlobalSearchSession
+                        .getByDocumentIdAsync(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                new GetByDocumentIdRequest.Builder("namespace")
+                                        .addIds("id1")
+                                        .build())
+                        .get();
+
+        assertThat(nonExistent.isSuccess()).isFalse();
+        assertThat(nonExistent.getSuccesses()).isEmpty();
+        assertThat(nonExistent.getFailures()).containsKey("id1");
+        assertThat(nonExistent.getFailures().get("id1").getResultCode())
+                .isEqualTo(AppSearchResult.RESULT_NOT_FOUND);
+
+        // Index a document
+        AppSearchEmail inEmail =
+                new AppSearchEmail.Builder("namespace", "id1")
+                        .setFrom("from@example.com")
+                        .setTo("to1@example.com", "to2@example.com")
+                        .setSubject("testPut example")
+                        .setBody("This is the body of the testPut email")
+                        .build();
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
+
+        // Query for the document
+        AppSearchBatchResult<String, GenericDocument> afterPutDocuments =
+                mGlobalSearchSession
+                        .getByDocumentIdAsync(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                new GetByDocumentIdRequest.Builder("namespace")
+                                        .addIds("id1")
+                                        .build())
+                        .get();
+        assertThat(afterPutDocuments.getSuccesses()).containsExactly("id1", inEmail);
+    }
+
+    @Test
     public void testGlobalQuery_oneInstance() throws Exception {
         // Snapshot what documents may already exist on the device.
         SearchSpec exactSearchSpec =
@@ -126,7 +196,8 @@
                 snapshotResults("body email", exactSearchSpec);
 
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index a document
@@ -138,7 +209,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail).build()));
 
         // Query for the document
         List<GenericDocument> afterBodyDocuments = snapshotResults("body", exactSearchSpec);
@@ -162,9 +234,11 @@
         List<GenericDocument> beforeBodyDocuments = snapshotResults("body", exactSearchSpec);
 
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index a document to instance 1.
@@ -176,7 +250,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail1).build()));
 
         // Index a document to instance 2.
         AppSearchEmail inEmail2 =
@@ -187,7 +262,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail2).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail2).build()));
 
         // Query across all instances
         List<GenericDocument> afterBodyDocuments = snapshotResults("body", exactSearchSpec);
@@ -203,7 +279,8 @@
         List<GenericDocument> beforeBodyDocuments = snapshotResults("body", exactSearchSpec);
 
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
         List<AppSearchEmail> emailList = new ArrayList<>();
         PutDocumentsRequest.Builder putDocumentsRequestBuilder = new PutDocumentsRequest.Builder();
@@ -220,12 +297,12 @@
             emailList.add(inEmail);
             putDocumentsRequestBuilder.addGenericDocuments(inEmail);
         }
-        checkIsBatchResultSuccess(mDb1.put(putDocumentsRequestBuilder.build()));
+        checkIsBatchResultSuccess(mDb1.putAsync(putDocumentsRequestBuilder.build()));
 
         // Set number of results per page is 7.
         int pageSize = 7;
         SearchResultsShim searchResults =
-                mGlobalAppSearchManager.search(
+                mGlobalSearchSession.search(
                         "body",
                         new SearchSpec.Builder()
                                 .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
@@ -238,7 +315,7 @@
 
         // keep loading next page until it's empty.
         do {
-            results = searchResults.getNextPage().get();
+            results = searchResults.getNextPageAsync().get();
             ++pageNumber;
             for (SearchResult result : results) {
                 documents.add(result.getGenericDocument());
@@ -286,7 +363,7 @@
                         .build();
 
         // db1 has both "Generic" and "builtin:Email"
-        mDb1.setSchema(
+        mDb1.setSchemaAsync(
                         new SetSchemaRequest.Builder()
                                 .addSchemas(genericSchema)
                                 .addSchemas(AppSearchEmail.SCHEMA)
@@ -294,7 +371,8 @@
                 .get();
 
         // db2 only has "builtin:Email"
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index a generic document into db1
@@ -303,7 +381,7 @@
                         .setPropertyString("foo", "body")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(
+                mDb1.putAsync(
                         new PutDocumentsRequest.Builder()
                                 .addGenericDocuments(genericDocument)
                                 .build()));
@@ -318,9 +396,11 @@
 
         // Put the email in both databases
         checkIsBatchResultSuccess(
-                (mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email).build())));
+                (mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email).build())));
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(email).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email).build()));
 
         // Query for all documents across types
         List<GenericDocument> afterBodyDocuments = snapshotResults("body", exactSearchSpec);
@@ -352,9 +432,11 @@
                 snapshotResults("body", exactNamespace1SearchSpec);
 
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index two documents
@@ -366,7 +448,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(document1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(document1).build()));
 
         AppSearchEmail document2 =
                 new AppSearchEmail.Builder("namespace2", "id1")
@@ -376,7 +459,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(document2).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(document2).build()));
 
         // Query for all namespaces
         List<GenericDocument> afterBodyDocuments = snapshotResults("body", exactSearchSpec);
@@ -406,16 +490,17 @@
         SearchSpec testPackageSearchSpec =
                 new SearchSpec.Builder()
                         .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
-                        .addFilterPackageNames(
-                                ApplicationProvider.getApplicationContext().getPackageName())
+                        .addFilterPackageNames(mContext.getPackageName())
                         .build();
         List<GenericDocument> beforeTestPackageDocuments =
                 snapshotResults("body", testPackageSearchSpec);
 
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index two documents
@@ -427,7 +512,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(document1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(document1).build()));
 
         AppSearchEmail document2 =
                 new AppSearchEmail.Builder("namespace2", "id1")
@@ -437,7 +523,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(document2).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(document2).build()));
 
         // Query in some other package
         List<GenericDocument> afterOtherPackageDocuments =
@@ -458,9 +545,11 @@
     @Test
     public void testGlobalQuery_projectionTwoInstances() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index one document in each database.
@@ -473,7 +562,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
 
         AppSearchEmail email2 =
                 new AppSearchEmail.Builder("namespace", "id2")
@@ -484,7 +574,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
 
         // Query with type property paths {"Email", ["subject", "to"]}
         List<GenericDocument> documents =
@@ -517,9 +608,11 @@
     @Test
     public void testGlobalQuery_projectionEmptyTwoInstances() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index one document in each database.
@@ -532,7 +625,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
 
         AppSearchEmail email2 =
                 new AppSearchEmail.Builder("namespace", "id2")
@@ -543,7 +637,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
 
         // Query with type property paths {"Email", []}
         List<GenericDocument> documents =
@@ -569,9 +664,11 @@
     @Test
     public void testGlobalQuery_projectionNonExistentTypeTwoInstances() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index one document in each database.
@@ -584,7 +681,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
 
         AppSearchEmail email2 =
                 new AppSearchEmail.Builder("namespace", "id2")
@@ -595,7 +693,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email2).build()));
 
         // Query with type property paths {"NonExistentType", []}, {"Email", ["subject", "to"]}
         List<GenericDocument> documents =
@@ -629,9 +728,11 @@
     @Test
     public void testQuery_ResultGroupingLimits() throws Exception {
         // Schema registration
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
-        mDb2.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
 
         // Index one document in 'namespace1' and one document in 'namespace2' into db1.
@@ -643,7 +744,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail1).build()));
         AppSearchEmail inEmail2 =
                 new AppSearchEmail.Builder("namespace2", "id2")
                         .setFrom("from@example.com")
@@ -652,7 +754,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail2).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail2).build()));
 
         // Index one document in 'namespace1' and one document in 'namespace2' into db2.
         AppSearchEmail inEmail3 =
@@ -663,7 +766,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail3).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail3).build()));
         AppSearchEmail inEmail4 =
                 new AppSearchEmail.Builder("namespace2", "id4")
                         .setFrom("from@example.com")
@@ -672,7 +776,8 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb2.put(new PutDocumentsRequest.Builder().addGenericDocuments(inEmail4).build()));
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(inEmail4).build()));
 
         // Query with per package result grouping. Only the last document 'email4' should be
         // returned.
@@ -716,7 +821,8 @@
     @Test
     public void testReportSystemUsage_ForbiddenFromNonSystem() throws Exception {
         // Index a document
-        mDb1.setSchema(new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
                 .get();
         AppSearchEmail email1 =
                 new AppSearchEmail.Builder("namespace", "id1")
@@ -727,18 +833,19 @@
                         .setBody("This is the body of the testPut email")
                         .build();
         checkIsBatchResultSuccess(
-                mDb1.put(new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
 
         // Query
         List<SearchResult> page;
         try (SearchResultsShim results =
-                mGlobalAppSearchManager.search(
+                mGlobalSearchSession.search(
                         "",
                         new SearchSpec.Builder()
                                 .setTermMatch(SearchSpec.TERM_MATCH_EXACT_ONLY)
                                 .addFilterSchemas(AppSearchEmail.SCHEMA_TYPE)
                                 .build())) {
-            page = results.getNextPage().get();
+            page = results.getNextPageAsync().get();
         }
         assertThat(page).isNotEmpty();
         SearchResult firstResult = page.get(0);
@@ -747,8 +854,8 @@
                 assertThrows(
                         ExecutionException.class,
                         () ->
-                                mGlobalAppSearchManager
-                                        .reportSystemUsage(
+                                mGlobalSearchSession
+                                        .reportSystemUsageAsync(
                                                 new ReportSystemUsageRequest.Builder(
                                                                 firstResult.getPackageName(),
                                                                 firstResult.getDatabaseName(),
@@ -765,6 +872,973 @@
         assertThat(ase.getResultCode()).isEqualTo(AppSearchResult.RESULT_SECURITY_ERROR);
         assertThat(ase)
                 .hasMessageThat()
-                .contains("com.android.cts.appsearch does not have access to report system usage");
+                .contains(
+                        mContext.getPackageName() + " does not have access to report system usage");
     }
+
+    @Test
+    public void testAddObserver_notSupported() {
+        assumeFalse(
+                mGlobalSearchSession
+                        .getFeatures()
+                        .isFeatureSupported(
+                                Features.GLOBAL_SEARCH_SESSION_REGISTER_OBSERVER_CALLBACK));
+        assertThrows(
+                UnsupportedOperationException.class,
+                () ->
+                        mGlobalSearchSession.registerObserverCallback(
+                                mContext.getPackageName(),
+                                new ObserverSpec.Builder().build(),
+                                EXECUTOR,
+                                new TestObserverCallback()));
+        assertThrows(
+                UnsupportedOperationException.class,
+                () ->
+                        mGlobalSearchSession.unregisterObserverCallback(
+                                mContext.getPackageName(), new TestObserverCallback()));
+    }
+
+    @Test
+    public void testAddObserver() throws Exception {
+        assumeTrue(
+                mGlobalSearchSession
+                        .getFeatures()
+                        .isFeatureSupported(
+                                Features.GLOBAL_SEARCH_SESSION_REGISTER_OBSERVER_CALLBACK));
+
+        TestObserverCallback observer = new TestObserverCallback();
+
+        // Register observer. Note: the type does NOT exist yet!
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().addFilterSchemas(AppSearchEmail.SCHEMA_TYPE).build(),
+                EXECUTOR,
+                observer);
+
+        // Index a document
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+                .get();
+        AppSearchEmail email1 = new AppSearchEmail.Builder("namespace", "id1").build();
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+
+        // Make sure the notification was received.
+        observer.waitForNotificationCount(2);
+        assertThat(observer.getSchemaChanges())
+                .containsExactly(
+                        new SchemaChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                /*changedSchemaNames=*/ ImmutableSet.of(
+                                        AppSearchEmail.SCHEMA_TYPE)));
+        assertThat(observer.getDocumentChanges())
+                .containsExactly(
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")));
+    }
+
+    @Test
+    public void testRegisterObserver_MultiType() throws Exception {
+        assumeTrue(
+                mGlobalSearchSession
+                        .getFeatures()
+                        .isFeatureSupported(
+                                Features.GLOBAL_SEARCH_SESSION_REGISTER_OBSERVER_CALLBACK));
+
+        TestObserverCallback unfilteredObserver = new TestObserverCallback();
+        TestObserverCallback emailObserver = new TestObserverCallback();
+
+        // Set up the email type in both databases, and the gift type in db1
+        AppSearchSchema giftSchema =
+                new AppSearchSchema.Builder("Gift")
+                        .addProperty(
+                                new AppSearchSchema.DoublePropertyConfig.Builder("price").build())
+                        .build();
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA, giftSchema)
+                                .build())
+                .get();
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+                .get();
+
+        // Register two observers. One has no filters, the other filters on email.
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().build(),
+                EXECUTOR,
+                unfilteredObserver);
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().addFilterSchemas(AppSearchEmail.SCHEMA_TYPE).build(),
+                EXECUTOR,
+                emailObserver);
+
+        // Make sure everything is empty
+        assertThat(unfilteredObserver.getSchemaChanges()).isEmpty();
+        assertThat(unfilteredObserver.getDocumentChanges()).isEmpty();
+        assertThat(emailObserver.getSchemaChanges()).isEmpty();
+        assertThat(emailObserver.getDocumentChanges()).isEmpty();
+
+        // Index some documents
+        AppSearchEmail email1 = new AppSearchEmail.Builder("namespace", "id1").build();
+        GenericDocument gift1 =
+                new GenericDocument.Builder<GenericDocument.Builder<?>>("namespace2", "id2", "Gift")
+                        .build();
+
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder()
+                                .addGenericDocuments(email1, gift1)
+                                .build()));
+        checkIsBatchResultSuccess(
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(gift1).build()));
+
+        // Make sure the notification was received.
+        unfilteredObserver.waitForNotificationCount(5);
+        emailObserver.waitForNotificationCount(3);
+
+        assertThat(unfilteredObserver.getSchemaChanges()).isEmpty();
+        assertThat(unfilteredObserver.getDocumentChanges())
+                .containsExactly(
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace2",
+                                "Gift",
+                                /*changedDocumentIds=*/ ImmutableSet.of("id2")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_2,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace2",
+                                "Gift",
+                                /*changedDocumentIds=*/ ImmutableSet.of("id2")));
+
+        // Check the filtered observer
+        assertThat(emailObserver.getSchemaChanges()).isEmpty();
+        assertThat(emailObserver.getDocumentChanges())
+                .containsExactly(
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_2,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")));
+    }
+
+    @Test
+    public void testRegisterObserver_removeById() throws Exception {
+        assumeTrue(
+                mGlobalSearchSession
+                        .getFeatures()
+                        .isFeatureSupported(
+                                Features.GLOBAL_SEARCH_SESSION_REGISTER_OBSERVER_CALLBACK));
+
+        TestObserverCallback unfilteredObserver = new TestObserverCallback();
+        TestObserverCallback emailObserver = new TestObserverCallback();
+
+        // Set up the email and gift types in both databases
+        AppSearchSchema giftSchema =
+                new AppSearchSchema.Builder("Gift")
+                        .addProperty(
+                                new AppSearchSchema.DoublePropertyConfig.Builder("price").build())
+                        .build();
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA, giftSchema)
+                                .build())
+                .get();
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA, giftSchema)
+                                .build())
+                .get();
+
+        // Register two observers. One, registered later, has no filters. The other, registered
+        // now, filters on email.
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().addFilterSchemas(AppSearchEmail.SCHEMA_TYPE).build(),
+                EXECUTOR,
+                emailObserver);
+
+        // Make sure everything is empty
+        assertThat(unfilteredObserver.getSchemaChanges()).isEmpty();
+        assertThat(unfilteredObserver.getDocumentChanges()).isEmpty();
+        assertThat(emailObserver.getSchemaChanges()).isEmpty();
+        assertThat(emailObserver.getDocumentChanges()).isEmpty();
+
+        // Index some documents
+        AppSearchEmail email1 = new AppSearchEmail.Builder("namespace", "id1").build();
+        GenericDocument gift1 =
+                new GenericDocument.Builder<GenericDocument.Builder<?>>("namespace2", "id2", "Gift")
+                        .build();
+
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(email1).build()));
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder()
+                                .addGenericDocuments(email1, gift1)
+                                .build()));
+        checkIsBatchResultSuccess(
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder()
+                                .addGenericDocuments(email1, gift1)
+                                .build()));
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder().addGenericDocuments(gift1).build()));
+
+        // Register the second observer
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().build(),
+                EXECUTOR,
+                unfilteredObserver);
+
+        // Remove some of the documents.
+        checkIsBatchResultSuccess(
+                mDb1.removeAsync(
+                        new RemoveByDocumentIdRequest.Builder("namespace").addIds("id1").build()));
+        checkIsBatchResultSuccess(
+                mDb2.removeAsync(
+                        new RemoveByDocumentIdRequest.Builder("namespace2").addIds("id2").build()));
+
+        // Make sure the notification was received. emailObserver should have seen:
+        //   +db1:email, +db1:email, +db2:email, -db1:email.
+        // unfilteredObserver (registered later) should have seen:
+        //   -db1:email, -db2:gift
+        emailObserver.waitForNotificationCount(4);
+        unfilteredObserver.waitForNotificationCount(2);
+
+        assertThat(emailObserver.getSchemaChanges()).isEmpty();
+        assertThat(emailObserver.getDocumentChanges())
+                .containsExactly(
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_2,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")));
+
+        // Check unfilteredObserver
+        assertThat(unfilteredObserver.getSchemaChanges()).isEmpty();
+        assertThat(unfilteredObserver.getDocumentChanges())
+                .containsExactly(
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_2,
+                                "namespace2",
+                                "Gift",
+                                /*changedDocumentIds=*/ ImmutableSet.of("id2")));
+    }
+
+    @Test
+    public void testRegisterObserver_removeByQuery() throws Exception {
+        assumeTrue(
+                mGlobalSearchSession
+                        .getFeatures()
+                        .isFeatureSupported(
+                                Features.GLOBAL_SEARCH_SESSION_REGISTER_OBSERVER_CALLBACK));
+
+        TestObserverCallback unfilteredObserver = new TestObserverCallback();
+        TestObserverCallback emailObserver = new TestObserverCallback();
+
+        // Set up the email and gift types in both databases
+        AppSearchSchema giftSchema =
+                new AppSearchSchema.Builder("Gift")
+                        .addProperty(
+                                new AppSearchSchema.DoublePropertyConfig.Builder("price").build())
+                        .build();
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA, giftSchema)
+                                .build())
+                .get();
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA, giftSchema)
+                                .build())
+                .get();
+
+        // Index some documents
+        AppSearchEmail email1 = new AppSearchEmail.Builder("namespace", "id1").build();
+        AppSearchEmail email2 =
+                new AppSearchEmail.Builder("namespace", "id2").setBody("caterpillar").build();
+        GenericDocument gift1 =
+                new GenericDocument.Builder<GenericDocument.Builder<?>>("namespace2", "id3", "Gift")
+                        .build();
+
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder()
+                                .addGenericDocuments(email1, email2, gift1)
+                                .build()));
+        checkIsBatchResultSuccess(
+                mDb2.putAsync(
+                        new PutDocumentsRequest.Builder()
+                                .addGenericDocuments(email1, email2, gift1)
+                                .build()));
+
+        // Register observers
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().build(),
+                EXECUTOR,
+                unfilteredObserver);
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().addFilterSchemas(AppSearchEmail.SCHEMA_TYPE).build(),
+                EXECUTOR,
+                emailObserver);
+
+        // Make sure everything is empty
+        assertThat(unfilteredObserver.getSchemaChanges()).isEmpty();
+        assertThat(unfilteredObserver.getDocumentChanges()).isEmpty();
+        assertThat(emailObserver.getSchemaChanges()).isEmpty();
+        assertThat(emailObserver.getDocumentChanges()).isEmpty();
+
+        // Remove "cat" emails in db1 and all types in db2
+        mDb1.removeAsync(
+                        "cat",
+                        new SearchSpec.Builder()
+                                .addFilterSchemas(AppSearchEmail.SCHEMA_TYPE)
+                                .build())
+                .get();
+        mDb2.removeAsync("", new SearchSpec.Builder().build()).get();
+
+        // Make sure the notification was received. UnfilteredObserver should have seen:
+        //   -db1:id2, -db2:id1, -db2:id2, -db2:id3
+        // emailObserver should have seen:
+        //   -db1:id2, -db2:id1, -db2:id2
+        unfilteredObserver.waitForNotificationCount(3);
+        emailObserver.waitForNotificationCount(2);
+
+        assertThat(unfilteredObserver.getSchemaChanges()).isEmpty();
+        assertThat(unfilteredObserver.getDocumentChanges())
+                .containsExactly(
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id2")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_2,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1", "id2")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_2,
+                                "namespace2",
+                                "Gift",
+                                /*changedDocumentIds=*/ ImmutableSet.of("id3")));
+
+        // Check emailObserver
+        assertThat(emailObserver.getSchemaChanges()).isEmpty();
+        assertThat(emailObserver.getDocumentChanges())
+                .containsExactly(
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id2")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_2,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1", "id2")));
+    }
+
+    @Test
+    public void testRegisterObserver_sameCallback_differentSpecs() throws Exception {
+        assumeTrue(
+                mGlobalSearchSession
+                        .getFeatures()
+                        .isFeatureSupported(
+                                Features.GLOBAL_SEARCH_SESSION_REGISTER_OBSERVER_CALLBACK));
+
+        TestObserverCallback observer = new TestObserverCallback();
+
+        // Set up the email and gift types
+        AppSearchSchema giftSchema =
+                new AppSearchSchema.Builder("Gift")
+                        .addProperty(
+                                new AppSearchSchema.DoublePropertyConfig.Builder("price").build())
+                        .build();
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA, giftSchema)
+                                .build())
+                .get();
+
+        // Register the same observer twice: once for gift, once for email
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().addFilterSchemas("Gift").build(),
+                EXECUTOR,
+                observer);
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().addFilterSchemas(AppSearchEmail.SCHEMA_TYPE).build(),
+                EXECUTOR,
+                observer);
+
+        // Index one email and one gift
+        AppSearchEmail email1 = new AppSearchEmail.Builder("namespace", "id1").build();
+        GenericDocument gift1 =
+                new GenericDocument.Builder<GenericDocument.Builder<?>>("namespace2", "id3", "Gift")
+                        .build();
+
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder()
+                                .addGenericDocuments(email1, gift1)
+                                .build()));
+
+        // Make sure the same observer received both values
+        observer.waitForNotificationCount(2);
+        assertThat(observer.getSchemaChanges()).isEmpty();
+        assertThat(observer.getDocumentChanges())
+                .containsExactly(
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace2",
+                                "Gift",
+                                /*changedDocumentIds=*/ ImmutableSet.of("id3")));
+    }
+
+    @Test
+    public void testRemoveObserver() throws Exception {
+        assumeTrue(
+                mGlobalSearchSession
+                        .getFeatures()
+                        .isFeatureSupported(
+                                Features.GLOBAL_SEARCH_SESSION_REGISTER_OBSERVER_CALLBACK));
+
+        TestObserverCallback temporaryObserver = new TestObserverCallback();
+        TestObserverCallback permanentObserver = new TestObserverCallback();
+
+        // Set up the email and gift types
+        AppSearchSchema giftSchema =
+                new AppSearchSchema.Builder("Gift")
+                        .addProperty(
+                                new AppSearchSchema.DoublePropertyConfig.Builder("price").build())
+                        .build();
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA, giftSchema)
+                                .build())
+                .get();
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA, giftSchema)
+                                .build())
+                .get();
+
+        // Register both observers. temporaryObserver is registered twice to ensure both instances
+        // get removed.
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().addFilterSchemas(AppSearchEmail.SCHEMA_TYPE).build(),
+                EXECUTOR,
+                temporaryObserver);
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().addFilterSchemas("Gift").build(),
+                EXECUTOR,
+                temporaryObserver);
+        mGlobalSearchSession.registerObserverCallback(
+                mContext.getPackageName(),
+                new ObserverSpec.Builder().build(),
+                EXECUTOR,
+                permanentObserver);
+
+        // Make sure everything is empty
+        assertThat(temporaryObserver.getSchemaChanges()).isEmpty();
+        assertThat(temporaryObserver.getDocumentChanges()).isEmpty();
+        assertThat(permanentObserver.getSchemaChanges()).isEmpty();
+        assertThat(permanentObserver.getDocumentChanges()).isEmpty();
+
+        // Index some documents
+        AppSearchEmail email1 = new AppSearchEmail.Builder("namespace", "id1").build();
+        AppSearchEmail email2 =
+                new AppSearchEmail.Builder("namespace", "id2").setBody("caterpillar").build();
+        GenericDocument gift1 =
+                new GenericDocument.Builder<GenericDocument.Builder<?>>("namespace2", "id3", "Gift")
+                        .build();
+        GenericDocument gift2 =
+                new GenericDocument.Builder<GenericDocument.Builder<?>>("namespace3", "id4", "Gift")
+                        .build();
+
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder()
+                                .addGenericDocuments(email1, gift1)
+                                .build()));
+
+        // Make sure the notifications were received.
+        temporaryObserver.waitForNotificationCount(2);
+        permanentObserver.waitForNotificationCount(2);
+
+        List<DocumentChangeInfo> expectedChangesOrig =
+                ImmutableList.of(
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace2",
+                                "Gift",
+                                /*changedDocumentIds=*/ ImmutableSet.of("id3")));
+        assertThat(temporaryObserver.getSchemaChanges()).isEmpty();
+        assertThat(temporaryObserver.getDocumentChanges())
+                .containsExactlyElementsIn(expectedChangesOrig);
+        assertThat(permanentObserver.getSchemaChanges()).isEmpty();
+        assertThat(permanentObserver.getDocumentChanges())
+                .containsExactlyElementsIn(expectedChangesOrig);
+
+        // Unregister temporaryObserver
+        mGlobalSearchSession.unregisterObserverCallback(
+                mContext.getPackageName(), temporaryObserver);
+
+        // Index some more documents
+        checkIsBatchResultSuccess(
+                mDb1.putAsync(
+                        new PutDocumentsRequest.Builder()
+                                .addGenericDocuments(email2, gift2)
+                                .build()));
+
+        // Only the permanent observer should have received this
+        permanentObserver.waitForNotificationCount(4);
+        temporaryObserver.waitForNotificationCount(2);
+
+        assertThat(permanentObserver.getSchemaChanges()).isEmpty();
+        assertThat(permanentObserver.getDocumentChanges())
+                .containsExactly(
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id1")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace2",
+                                "Gift",
+                                /*changedDocumentIds=*/ ImmutableSet.of("id3")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace",
+                                AppSearchEmail.SCHEMA_TYPE,
+                                /*changedDocumentIds=*/ ImmutableSet.of("id2")),
+                        new DocumentChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                "namespace3",
+                                "Gift",
+                                /*changedDocumentIds=*/ ImmutableSet.of("id4")));
+        assertThat(temporaryObserver.getSchemaChanges()).isEmpty();
+        assertThat(temporaryObserver.getDocumentChanges())
+                .containsExactlyElementsIn(expectedChangesOrig);
+    }
+
+    @Test
+    public void testGlobalGetSchema() throws Exception {
+        assumeTrue(
+                mGlobalSearchSession
+                        .getFeatures()
+                        .isFeatureSupported(Features.GLOBAL_SEARCH_SESSION_GET_SCHEMA));
+
+        // One schema should be set with global access and the other should be set with local
+        // access.
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+                .get();
+        mDb2.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(AppSearchEmail.SCHEMA)
+                                .setSchemaTypeDisplayedBySystem(
+                                        AppSearchEmail.SCHEMA_TYPE, /*displayed=*/ false)
+                                .build())
+                .get();
+
+        GetSchemaResponse response =
+                mGlobalSearchSession.getSchemaAsync(mContext.getPackageName(), DB_NAME_1).get();
+        assertThat(response.getSchemas()).containsExactly(AppSearchEmail.SCHEMA);
+
+        response = mGlobalSearchSession.getSchemaAsync(mContext.getPackageName(), DB_NAME_2).get();
+        assertThat(response.getSchemas()).containsExactly(AppSearchEmail.SCHEMA);
+
+        // A request for a db that doesn't exist should return a response with no schemas.
+        response =
+                mGlobalSearchSession
+                        .getSchemaAsync(mContext.getPackageName(), "NonexistentDb")
+                        .get();
+        assertThat(response.getSchemas()).isEmpty();
+    }
+
+    @Test
+    public void testGlobalGetSchema_notSupported() throws Exception {
+        assumeFalse(
+                mGlobalSearchSession
+                        .getFeatures()
+                        .isFeatureSupported(Features.GLOBAL_SEARCH_SESSION_GET_SCHEMA));
+
+        // One schema should be set with global access and the other should be set with local
+        // access.
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder().addSchemas(AppSearchEmail.SCHEMA).build())
+                .get();
+
+        UnsupportedOperationException e =
+                assertThrows(
+                        UnsupportedOperationException.class,
+                        () ->
+                                mGlobalSearchSession.getSchemaAsync(
+                                        mContext.getPackageName(), DB_NAME_1));
+        assertThat(e)
+                .hasMessageThat()
+                .isEqualTo(
+                        Features.GLOBAL_SEARCH_SESSION_GET_SCHEMA
+                                + " is not supported on this AppSearch implementation.");
+    }
+
+    @Test
+    public void testGlobalGetByDocumentId_notSupported() throws Exception {
+        assumeFalse(
+                mGlobalSearchSession
+                        .getFeatures()
+                        .isFeatureSupported(Features.GLOBAL_SEARCH_SESSION_GET_BY_ID));
+
+        Context context = ApplicationProvider.getApplicationContext();
+
+        UnsupportedOperationException e =
+                assertThrows(
+                        UnsupportedOperationException.class,
+                        () ->
+                                mGlobalSearchSession.getByDocumentIdAsync(
+                                        context.getPackageName(),
+                                        DB_NAME_1,
+                                        new GetByDocumentIdRequest.Builder("namespace")
+                                                .addIds("id")
+                                                .build()));
+
+        assertThat(e)
+                .hasMessageThat()
+                .isEqualTo(
+                        Features.GLOBAL_SEARCH_SESSION_GET_BY_ID
+                                + " is not supported on this AppSearch implementation.");
+    }
+
+    @Test
+    public void testAddObserver_schemaChange_added() throws Exception {
+        // Register an observer
+        TestObserverCallback observer = new TestObserverCallback();
+        mGlobalSearchSession.registerObserverCallback(
+                /*targetPackageName=*/ mContext.getPackageName(),
+                new ObserverSpec.Builder().build(),
+                EXECUTOR,
+                observer);
+
+        // Add a schema type
+        assertThat(observer.getSchemaChanges()).isEmpty();
+        assertThat(observer.getDocumentChanges()).isEmpty();
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(new AppSearchSchema.Builder("Type1").build())
+                                .build())
+                .get();
+
+        observer.waitForNotificationCount(1);
+        assertThat(observer.getSchemaChanges())
+                .containsExactly(
+                        new SchemaChangeInfo(
+                                mContext.getPackageName(), DB_NAME_1, ImmutableSet.of("Type1")));
+        assertThat(observer.getDocumentChanges()).isEmpty();
+
+        // Add two more schema types without touching the existing one
+        observer.clear();
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(
+                                        new AppSearchSchema.Builder("Type1").build(),
+                                        new AppSearchSchema.Builder("Type2").build(),
+                                        new AppSearchSchema.Builder("Type3").build())
+                                .build())
+                .get();
+
+        observer.waitForNotificationCount(1);
+        assertThat(observer.getSchemaChanges())
+                .containsExactly(
+                        new SchemaChangeInfo(
+                                mContext.getPackageName(),
+                                DB_NAME_1,
+                                ImmutableSet.of("Type2", "Type3")));
+        assertThat(observer.getDocumentChanges()).isEmpty();
+    }
+
+    @Test
+    public void testAddObserver_schemaChange_removed() throws Exception {
+        // Add a schema type
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(
+                                        new AppSearchSchema.Builder("Type1").build(),
+                                        new AppSearchSchema.Builder("Type2").build())
+                                .build())
+                .get();
+
+        // Register an observer
+        TestObserverCallback observer = new TestObserverCallback();
+        mGlobalSearchSession.registerObserverCallback(
+                /*targetPackageName=*/ mContext.getPackageName(),
+                new ObserverSpec.Builder().build(),
+                EXECUTOR,
+                observer);
+
+        // Remove Type2
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(new AppSearchSchema.Builder("Type1").build())
+                                .setForceOverride(true)
+                                .build())
+                .get();
+
+        observer.waitForNotificationCount(1);
+        assertThat(observer.getSchemaChanges())
+                .containsExactly(
+                        new SchemaChangeInfo(
+                                mContext.getPackageName(), DB_NAME_1, ImmutableSet.of("Type2")));
+        assertThat(observer.getDocumentChanges()).isEmpty();
+    }
+
+    @Test
+    public void testAddObserver_schemaChange_contents() throws Exception {
+        // Add a schema
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(
+                                        new AppSearchSchema.Builder("Type1").build(),
+                                        new AppSearchSchema.Builder("Type2")
+                                                .addProperty(
+                                                        new AppSearchSchema.BooleanPropertyConfig
+                                                                        .Builder("booleanProp")
+                                                                .setCardinality(
+                                                                        PropertyConfig
+                                                                                .CARDINALITY_REQUIRED)
+                                                                .build())
+                                                .build())
+                                .build())
+                .get();
+
+        // Register an observer
+        TestObserverCallback observer = new TestObserverCallback();
+        mGlobalSearchSession.registerObserverCallback(
+                /*targetPackageName=*/ mContext.getPackageName(),
+                new ObserverSpec.Builder().build(),
+                EXECUTOR,
+                observer);
+
+        // Update the schema, but don't make any actual changes
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(
+                                        new AppSearchSchema.Builder("Type1").build(),
+                                        new AppSearchSchema.Builder("Type2")
+                                                .addProperty(
+                                                        new AppSearchSchema.BooleanPropertyConfig
+                                                                        .Builder("booleanProp")
+                                                                .setCardinality(
+                                                                        PropertyConfig
+                                                                                .CARDINALITY_REQUIRED)
+                                                                .build())
+                                                .build())
+                                .build())
+                .get();
+
+        // Now update the schema again, but this time actually make a change (cardinality of the
+        // property)
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(
+                                        new AppSearchSchema.Builder("Type1").build(),
+                                        new AppSearchSchema.Builder("Type2")
+                                                .addProperty(
+                                                        new AppSearchSchema.BooleanPropertyConfig
+                                                                        .Builder("booleanProp")
+                                                                .setCardinality(
+                                                                        PropertyConfig
+                                                                                .CARDINALITY_OPTIONAL)
+                                                                .build())
+                                                .build())
+                                .build())
+                .get();
+
+        // Dispatch notifications
+        observer.waitForNotificationCount(1);
+        assertThat(observer.getSchemaChanges())
+                .containsExactly(
+                        new SchemaChangeInfo(
+                                mContext.getPackageName(), DB_NAME_1, ImmutableSet.of("Type2")));
+        assertThat(observer.getDocumentChanges()).isEmpty();
+    }
+
+    @Test
+    public void testAddObserver_schemaChange_contents_skipBySpec() throws Exception {
+        // Add a schema
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(
+                                        new AppSearchSchema.Builder("Type1")
+                                                .addProperty(
+                                                        new AppSearchSchema.BooleanPropertyConfig
+                                                                        .Builder("booleanProp")
+                                                                .setCardinality(
+                                                                        PropertyConfig
+                                                                                .CARDINALITY_REQUIRED)
+                                                                .build())
+                                                .build(),
+                                        new AppSearchSchema.Builder("Type2")
+                                                .addProperty(
+                                                        new AppSearchSchema.BooleanPropertyConfig
+                                                                        .Builder("booleanProp")
+                                                                .setCardinality(
+                                                                        PropertyConfig
+                                                                                .CARDINALITY_REQUIRED)
+                                                                .build())
+                                                .build())
+                                .build())
+                .get();
+
+        // Register an observer that only listens for Type2
+        TestObserverCallback observer = new TestObserverCallback();
+        mGlobalSearchSession.registerObserverCallback(
+                /*targetPackageName=*/ mContext.getPackageName(),
+                new ObserverSpec.Builder().addFilterSchemas("Type2").build(),
+                EXECUTOR,
+                observer);
+
+        // Update both types of the schema (changed cardinalities)
+        mDb1.setSchemaAsync(
+                        new SetSchemaRequest.Builder()
+                                .addSchemas(
+                                        new AppSearchSchema.Builder("Type1")
+                                                .addProperty(
+                                                        new AppSearchSchema.BooleanPropertyConfig
+                                                                        .Builder("booleanProp")
+                                                                .setCardinality(
+                                                                        PropertyConfig
+                                                                                .CARDINALITY_OPTIONAL)
+                                                                .build())
+                                                .build(),
+                                        new AppSearchSchema.Builder("Type2")
+                                                .addProperty(
+                                                        new AppSearchSchema.BooleanPropertyConfig
+                                                                        .Builder("booleanProp")
+                                                                .setCardinality(
+                                                                        PropertyConfig
+                                                                                .CARDINALITY_OPTIONAL)
+                                                                .build())
+                                                .build())
+                                .build())
+                .get();
+
+        observer.waitForNotificationCount(1);
+        assertThat(observer.getSchemaChanges())
+                .containsExactly(
+                        new SchemaChangeInfo(
+                                mContext.getPackageName(), DB_NAME_1, ImmutableSet.of("Type2")));
+        assertThat(observer.getDocumentChanges()).isEmpty();
+    }
+
+    // TODO(b/193494000): Properly handle change notification during schema migration, and add tests
+    // for it.
 }
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/app/PutDocumentsRequestCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/external/app/PutDocumentsRequestCtsTest.java
index b42d4a6..bc90e2f 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/external/app/PutDocumentsRequestCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/app/PutDocumentsRequestCtsTest.java
@@ -20,8 +20,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.app.appsearch.PutDocumentsRequest;
-
-import com.android.server.appsearch.testing.AppSearchEmail;
+import android.app.appsearch.testutil.AppSearchEmail;
 
 import com.google.common.collect.ImmutableSet;
 
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/app/SearchResultCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/external/app/SearchResultCtsTest.java
index 588210b..fa580ab 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/external/app/SearchResultCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/app/SearchResultCtsTest.java
@@ -18,9 +18,10 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import android.app.appsearch.SearchResult;
+import static org.junit.Assert.assertThrows;
 
-import com.android.server.appsearch.testing.AppSearchEmail;
+import android.app.appsearch.SearchResult;
+import android.app.appsearch.testutil.AppSearchEmail;
 
 import org.junit.Test;
 
@@ -29,10 +30,12 @@
     @Test
     public void testBuildSearchResult() {
         SearchResult.MatchRange exactMatchRange = new SearchResult.MatchRange(3, 8);
+        SearchResult.MatchRange submatchRange = new SearchResult.MatchRange(3, 5);
         SearchResult.MatchRange snippetMatchRange = new SearchResult.MatchRange(1, 10);
         SearchResult.MatchInfo matchInfo =
                 new SearchResult.MatchInfo.Builder("body")
                         .setExactMatchRange(exactMatchRange)
+                        .setSubmatchRange(submatchRange)
                         .setSnippetRange(snippetMatchRange)
                         .build();
 
@@ -53,8 +56,10 @@
         SearchResult.MatchInfo actualMatchInfo = searchResult.getMatchInfos().get(0);
         assertThat(actualMatchInfo.getPropertyPath()).isEqualTo("body");
         assertThat(actualMatchInfo.getExactMatchRange()).isEqualTo(exactMatchRange);
+        assertThat(actualMatchInfo.getSubmatchRange()).isEqualTo(submatchRange);
         assertThat(actualMatchInfo.getSnippetRange()).isEqualTo(snippetMatchRange);
         assertThat(actualMatchInfo.getExactMatch()).isEqualTo("lo Wo");
+        assertThat(actualMatchInfo.getSubmatch()).isEqualTo("lo");
         assertThat(actualMatchInfo.getSnippet()).isEqualTo("ello Worl");
         assertThat(actualMatchInfo.getFullText()).isEqualTo("Hello World.");
     }
@@ -65,4 +70,39 @@
         assertThat(matchRange.getStart()).isEqualTo(13);
         assertThat(matchRange.getEnd()).isEqualTo(47);
     }
+
+    @Test
+    public void testSubmatchRangeNotSet() {
+        AppSearchEmail email =
+                new AppSearchEmail.Builder("namespace1", "id1").setBody("Hello World.").build();
+        SearchResult.MatchInfo matchInfo = new SearchResult.MatchInfo.Builder("body").build();
+        SearchResult searchResult =
+                new SearchResult.Builder("packageName", "databaseName")
+                        .setGenericDocument(email)
+                        .addMatchInfo(matchInfo)
+                        .build();
+
+        // When submatch isn't set, calling getSubmatch and getSubmatchRange should throw.
+        final SearchResult.MatchInfo actualMatchInfoNoSubmatch =
+                searchResult.getMatchInfos().get(0);
+        assertThrows(
+                UnsupportedOperationException.class, () -> actualMatchInfoNoSubmatch.getSubmatch());
+        assertThrows(
+                UnsupportedOperationException.class,
+                () -> actualMatchInfoNoSubmatch.getSubmatchRange());
+
+        // When submatch is set, calling getSubmatch and getSubmatchRange should return the
+        // submatch without any problems.
+        SearchResult.MatchRange submatchRange = new SearchResult.MatchRange(3, 5);
+        matchInfo =
+                new SearchResult.MatchInfo.Builder("body").setSubmatchRange(submatchRange).build();
+        searchResult =
+                new SearchResult.Builder("packageName", "databaseName")
+                        .setGenericDocument(email)
+                        .addMatchInfo(matchInfo)
+                        .build();
+        final SearchResult.MatchInfo actualMatchInfo = searchResult.getMatchInfos().get(0);
+        assertThat(actualMatchInfo.getSubmatch()).isEqualTo("lo");
+        assertThat(actualMatchInfo.getSubmatchRange()).isEqualTo(submatchRange);
+    }
 }
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/app/SetSchemaRequestCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/external/app/SetSchemaRequestCtsTest.java
index 9ae7e60..d72b482 100644
--- a/tests/appsearch/src/com/android/cts/appsearch/external/app/SetSchemaRequestCtsTest.java
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/app/SetSchemaRequestCtsTest.java
@@ -27,9 +27,10 @@
 import android.app.appsearch.Migrator;
 import android.app.appsearch.PackageIdentifier;
 import android.app.appsearch.SetSchemaRequest;
+import android.app.appsearch.testutil.AppSearchEmail;
 import android.util.ArrayMap;
 
-import com.android.server.appsearch.testing.AppSearchEmail;
+import com.google.common.collect.ImmutableSet;
 
 import org.junit.Test;
 
@@ -243,6 +244,92 @@
     }
 
     @Test
+    public void testSetSchemaTypeVisibleForPermissions() {
+        AppSearchSchema schema = new AppSearchSchema.Builder("Schema").build();
+
+        // By default, the schema is displayed.
+        SetSchemaRequest request = new SetSchemaRequest.Builder().addSchemas(schema).build();
+        assertThat(request.getRequiredPermissionsForSchemaTypeVisibility()).isEmpty();
+
+        SetSchemaRequest.Builder setSchemaRequestBuilder =
+                new SetSchemaRequest.Builder()
+                        .addSchemas(schema)
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Schema",
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR))
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Schema",
+                                ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA));
+
+        request = setSchemaRequestBuilder.build();
+
+        assertThat(request.getRequiredPermissionsForSchemaTypeVisibility())
+                .containsExactly(
+                        "Schema",
+                        ImmutableSet.of(
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR),
+                                ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA)));
+    }
+
+    @Test
+    public void testClearSchemaTypeVisibleForPermissions() {
+        SetSchemaRequest.Builder setSchemaRequestBuilder =
+                new SetSchemaRequest.Builder()
+                        .addSchemas(
+                                new AppSearchSchema.Builder("Schema1").build(),
+                                new AppSearchSchema.Builder("Schema2").build())
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Schema1",
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR))
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Schema1",
+                                ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA))
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Schema2", ImmutableSet.of(SetSchemaRequest.READ_EXTERNAL_STORAGE));
+
+        SetSchemaRequest request = setSchemaRequestBuilder.build();
+
+        assertThat(request.getRequiredPermissionsForSchemaTypeVisibility())
+                .containsExactly(
+                        "Schema1",
+                                ImmutableSet.of(
+                                        ImmutableSet.of(
+                                                SetSchemaRequest.READ_SMS,
+                                                SetSchemaRequest.READ_CALENDAR),
+                                        ImmutableSet.of(
+                                                SetSchemaRequest.READ_HOME_APP_SEARCH_DATA)),
+                        "Schema2",
+                                ImmutableSet.of(
+                                        ImmutableSet.of(SetSchemaRequest.READ_EXTERNAL_STORAGE)));
+
+        // Clear the permissions in the builder
+        setSchemaRequestBuilder.clearRequiredPermissionsForSchemaTypeVisibility("Schema1");
+
+        // New object should be updated
+        assertThat(setSchemaRequestBuilder.build().getRequiredPermissionsForSchemaTypeVisibility())
+                .containsExactly(
+                        "Schema2",
+                        ImmutableSet.of(ImmutableSet.of(SetSchemaRequest.READ_EXTERNAL_STORAGE)));
+
+        // Old object should remain unchanged
+        assertThat(request.getRequiredPermissionsForSchemaTypeVisibility())
+                .containsExactly(
+                        "Schema1",
+                                ImmutableSet.of(
+                                        ImmutableSet.of(
+                                                SetSchemaRequest.READ_SMS,
+                                                SetSchemaRequest.READ_CALENDAR),
+                                        ImmutableSet.of(
+                                                SetSchemaRequest.READ_HOME_APP_SEARCH_DATA)),
+                        "Schema2",
+                                ImmutableSet.of(
+                                        ImmutableSet.of(SetSchemaRequest.READ_EXTERNAL_STORAGE)));
+    }
+
+    @Test
     public void testSchemaTypeVisibilityForPackage_visible() {
         AppSearchSchema schema = new AppSearchSchema.Builder("Schema").build();
 
@@ -354,4 +441,165 @@
                 .hasMessageThat()
                 .contains("Cannot set version to the request if schema is empty.");
     }
+
+    @Test
+    public void testRebuild() {
+        byte[] sha256cert1 = new byte[32];
+        byte[] sha256cert2 = new byte[32];
+        Arrays.fill(sha256cert1, (byte) 1);
+        Arrays.fill(sha256cert2, (byte) 2);
+        PackageIdentifier packageIdentifier1 = new PackageIdentifier("Email", sha256cert1);
+        PackageIdentifier packageIdentifier2 = new PackageIdentifier("Email", sha256cert2);
+        AppSearchSchema schema1 =
+                new AppSearchSchema.Builder("Email1")
+                        .addProperty(
+                                new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                                        .setCardinality(
+                                                AppSearchSchema.PropertyConfig.CARDINALITY_OPTIONAL)
+                                        .setIndexingType(
+                                                AppSearchSchema.StringPropertyConfig
+                                                        .INDEXING_TYPE_PREFIXES)
+                                        .setTokenizerType(
+                                                AppSearchSchema.StringPropertyConfig
+                                                        .TOKENIZER_TYPE_PLAIN)
+                                        .build())
+                        .build();
+        AppSearchSchema schema2 =
+                new AppSearchSchema.Builder("Email2")
+                        .addProperty(
+                                new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                                        .setCardinality(
+                                                AppSearchSchema.PropertyConfig.CARDINALITY_OPTIONAL)
+                                        .setIndexingType(
+                                                AppSearchSchema.StringPropertyConfig
+                                                        .INDEXING_TYPE_PREFIXES)
+                                        .setTokenizerType(
+                                                AppSearchSchema.StringPropertyConfig
+                                                        .TOKENIZER_TYPE_PLAIN)
+                                        .build())
+                        .build();
+
+        SetSchemaRequest.Builder builder =
+                new SetSchemaRequest.Builder()
+                        .addSchemas(schema1)
+                        .setVersion(37)
+                        .setSchemaTypeDisplayedBySystem("Email1", /*displayed=*/ false)
+                        .setSchemaTypeVisibilityForPackage(
+                                "Email1", /*visible=*/ true, packageIdentifier1)
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Email1",
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR))
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Email1",
+                                ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA));
+
+        SetSchemaRequest original = builder.build();
+        SetSchemaRequest rebuild =
+                builder.addSchemas(schema2)
+                        .setVersion(42)
+                        .setSchemaTypeDisplayedBySystem("Email2", /*displayed=*/ false)
+                        .setSchemaTypeVisibilityForPackage(
+                                "Email2", /*visible=*/ true, packageIdentifier2)
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Email2",
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_CONTACTS,
+                                        SetSchemaRequest.READ_EXTERNAL_STORAGE))
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Email2",
+                                ImmutableSet.of(SetSchemaRequest.READ_ASSISTANT_APP_SEARCH_DATA))
+                        .build();
+
+        assertThat(original.getSchemas()).containsExactly(schema1);
+        assertThat(original.getVersion()).isEqualTo(37);
+        assertThat(original.getSchemasNotDisplayedBySystem()).containsExactly("Email1");
+        assertThat(original.getSchemasVisibleToPackages())
+                .containsExactly("Email1", ImmutableSet.of(packageIdentifier1));
+        assertThat(original.getRequiredPermissionsForSchemaTypeVisibility())
+                .containsExactly(
+                        "Email1",
+                        ImmutableSet.of(
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR),
+                                ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA)));
+
+        assertThat(rebuild.getSchemas()).containsExactly(schema1, schema2);
+        assertThat(rebuild.getVersion()).isEqualTo(42);
+        assertThat(rebuild.getSchemasNotDisplayedBySystem()).containsExactly("Email1", "Email2");
+        assertThat(rebuild.getSchemasVisibleToPackages())
+                .containsExactly(
+                        "Email1", ImmutableSet.of(packageIdentifier1),
+                        "Email2", ImmutableSet.of(packageIdentifier2));
+        assertThat(rebuild.getRequiredPermissionsForSchemaTypeVisibility())
+                .containsExactly(
+                        "Email1",
+                        ImmutableSet.of(
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR),
+                                ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA)),
+                        "Email2",
+                        ImmutableSet.of(
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_CONTACTS,
+                                        SetSchemaRequest.READ_EXTERNAL_STORAGE),
+                                ImmutableSet.of(SetSchemaRequest.READ_ASSISTANT_APP_SEARCH_DATA)));
+    }
+
+    @Test
+    public void getAndModify() {
+        byte[] sha256cert1 = new byte[32];
+        byte[] sha256cert2 = new byte[32];
+        Arrays.fill(sha256cert1, (byte) 1);
+        Arrays.fill(sha256cert2, (byte) 2);
+        PackageIdentifier packageIdentifier1 = new PackageIdentifier("Email", sha256cert1);
+        PackageIdentifier packageIdentifier2 = new PackageIdentifier("Email", sha256cert2);
+        AppSearchSchema schema1 =
+                new AppSearchSchema.Builder("Email1")
+                        .addProperty(
+                                new AppSearchSchema.StringPropertyConfig.Builder("subject")
+                                        .setCardinality(
+                                                AppSearchSchema.PropertyConfig.CARDINALITY_OPTIONAL)
+                                        .setIndexingType(
+                                                AppSearchSchema.StringPropertyConfig
+                                                        .INDEXING_TYPE_PREFIXES)
+                                        .setTokenizerType(
+                                                AppSearchSchema.StringPropertyConfig
+                                                        .TOKENIZER_TYPE_PLAIN)
+                                        .build())
+                        .build();
+
+        SetSchemaRequest request =
+                new SetSchemaRequest.Builder()
+                        .addSchemas(schema1)
+                        .setVersion(37)
+                        .setSchemaTypeDisplayedBySystem("Email1", /*displayed=*/ false)
+                        .setSchemaTypeVisibilityForPackage(
+                                "Email1", /*visible=*/ true, packageIdentifier1)
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Email1",
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR))
+                        .addRequiredPermissionsForSchemaTypeVisibility(
+                                "Email1",
+                                ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA))
+                        .build();
+
+        // get the visibility setting and modify the output object.
+        // skip getSchemasNotDisplayedBySystem since it returns an unmodifiable object.
+        request.getSchemasVisibleToPackages().put("Email2", ImmutableSet.of(packageIdentifier2));
+        request.getRequiredPermissionsForSchemaTypeVisibility()
+                .put("Email2", ImmutableSet.of(ImmutableSet.of(SetSchemaRequest.READ_CALENDAR)));
+
+        // verify we still get the original object.
+        assertThat(request.getSchemasVisibleToPackages())
+                .containsExactly("Email1", ImmutableSet.of(packageIdentifier1));
+        assertThat(request.getRequiredPermissionsForSchemaTypeVisibility())
+                .containsExactly(
+                        "Email1",
+                        ImmutableSet.of(
+                                ImmutableSet.of(
+                                        SetSchemaRequest.READ_SMS, SetSchemaRequest.READ_CALENDAR),
+                                ImmutableSet.of(SetSchemaRequest.READ_HOME_APP_SEARCH_DATA)));
+    }
 }
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/observer/DocumentChangeInfoCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/external/observer/DocumentChangeInfoCtsTest.java
new file mode 100644
index 0000000..2459214
--- /dev/null
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/observer/DocumentChangeInfoCtsTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2022 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 android.app.appsearch.cts.observer;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.appsearch.observer.DocumentChangeInfo;
+
+import com.google.common.collect.ImmutableSet;
+
+import org.junit.Test;
+
+public class DocumentChangeInfoCtsTest {
+    @Test
+    public void testConstructor() {
+        DocumentChangeInfo DocumentChangeInfo =
+                new DocumentChangeInfo(
+                        "packageName",
+                        "databaseName",
+                        "namespace",
+                        "SchemaName",
+                        ImmutableSet.of("documentId1", "documentId2"));
+        assertThat(DocumentChangeInfo.getPackageName()).isEqualTo("packageName");
+        assertThat(DocumentChangeInfo.getDatabaseName()).isEqualTo("databaseName");
+        assertThat(DocumentChangeInfo.getNamespace()).isEqualTo("namespace");
+        assertThat(DocumentChangeInfo.getSchemaName()).isEqualTo("SchemaName");
+        assertThat(DocumentChangeInfo.getChangedDocumentIds())
+                .containsExactly("documentId1", "documentId2");
+    }
+
+    @Test
+    public void testEqualsAndHasCode() {
+        DocumentChangeInfo info1Copy1 =
+                new DocumentChangeInfo(
+                        "packageName",
+                        "databaseName",
+                        "namespace",
+                        "SchemaName",
+                        ImmutableSet.of("documentId1", "documentId2"));
+        DocumentChangeInfo info1Copy2 =
+                new DocumentChangeInfo(
+                        "packageName",
+                        "databaseName",
+                        "namespace",
+                        "SchemaName",
+                        ImmutableSet.of("documentId1", "documentId2"));
+        DocumentChangeInfo info2 =
+                new DocumentChangeInfo(
+                        "packageName",
+                        "databaseName",
+                        "namespace",
+                        "SchemaName",
+                        ImmutableSet.of("documentId3", "documentId2"));
+
+        assertThat(info1Copy1).isEqualTo(info1Copy2);
+        assertThat(info1Copy1.hashCode()).isEqualTo(info1Copy2.hashCode());
+        assertThat(info1Copy1).isNotEqualTo(info2);
+        assertThat(info1Copy1.hashCode()).isNotEqualTo(info2.hashCode());
+    }
+}
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/observer/ObserverSpecCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/external/observer/ObserverSpecCtsTest.java
new file mode 100644
index 0000000..bdce40c
--- /dev/null
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/observer/ObserverSpecCtsTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2022 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 android.app.appsearch.cts.observer;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.appsearch.observer.ObserverSpec;
+
+import com.google.common.collect.ImmutableSet;
+
+import org.junit.Test;
+
+public class ObserverSpecCtsTest {
+    @Test
+    public void testFilterSchemas() {
+        ObserverSpec observerSpec =
+                new ObserverSpec.Builder()
+                        .addFilterSchemas("Schema1", "Schema2")
+                        .addFilterSchemas(ImmutableSet.of("Schema3", "Schema4"))
+                        .build();
+        assertThat(observerSpec.getFilterSchemas())
+                .containsExactly("Schema1", "Schema2", "Schema3", "Schema4");
+    }
+}
diff --git a/tests/appsearch/src/com/android/cts/appsearch/external/observer/SchemaChangeInfoCtsTest.java b/tests/appsearch/src/com/android/cts/appsearch/external/observer/SchemaChangeInfoCtsTest.java
new file mode 100644
index 0000000..a2f1004
--- /dev/null
+++ b/tests/appsearch/src/com/android/cts/appsearch/external/observer/SchemaChangeInfoCtsTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2022 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 android.app.appsearch.cts.observer;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.appsearch.observer.SchemaChangeInfo;
+
+import com.google.common.collect.ImmutableSet;
+
+import org.junit.Test;
+
+public class SchemaChangeInfoCtsTest {
+    @Test
+    public void testConstructor() {
+        SchemaChangeInfo schemaChangeInfo =
+                new SchemaChangeInfo(
+                        "packageName",
+                        "databaseName",
+                        ImmutableSet.of("schemaName1", "schemaName2"));
+        assertThat(schemaChangeInfo.getPackageName()).isEqualTo("packageName");
+        assertThat(schemaChangeInfo.getDatabaseName()).isEqualTo("databaseName");
+        assertThat(schemaChangeInfo.getChangedSchemaNames())
+                .containsExactly("schemaName1", "schemaName2");
+    }
+
+    @Test
+    public void testEqualsAndHasCode() {
+        SchemaChangeInfo info1Copy1 =
+                new SchemaChangeInfo(
+                        "packageName",
+                        "databaseName",
+                        ImmutableSet.of("schemaName1", "schemaName2"));
+        SchemaChangeInfo info1Copy2 =
+                new SchemaChangeInfo(
+                        "packageName",
+                        "databaseName",
+                        ImmutableSet.of("schemaName1", "schemaName2"));
+        SchemaChangeInfo info2 =
+                new SchemaChangeInfo(
+                        "packageName",
+                        "databaseName",
+                        ImmutableSet.of("schemaName3", "schemaName2"));
+
+        assertThat(info1Copy1).isEqualTo(info1Copy2);
+        assertThat(info1Copy1.hashCode()).isEqualTo(info1Copy2.hashCode());
+        assertThat(info1Copy1).isNotEqualTo(info2);
+        assertThat(info1Copy1.hashCode()).isNotEqualTo(info2.hashCode());
+    }
+}
diff --git a/tests/attentionservice/src/android/attentionservice/cts/CtsAttentionServiceDeviceTest.java b/tests/attentionservice/src/android/attentionservice/cts/CtsAttentionServiceDeviceTest.java
index 45a7247..6e85d2d 100644
--- a/tests/attentionservice/src/android/attentionservice/cts/CtsAttentionServiceDeviceTest.java
+++ b/tests/attentionservice/src/android/attentionservice/cts/CtsAttentionServiceDeviceTest.java
@@ -15,6 +15,8 @@
  */
 package android.attentionservice.cts;
 
+import static android.service.attention.AttentionService.PROXIMITY_UNKNOWN;
+
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import static com.android.compatibility.common.util.ShellUtils.runShellCommand;
@@ -34,20 +36,24 @@
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.FixMethodOrder;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.runners.MethodSorters;
 
 /**
  * This suite of test ensures that AttentionManagerService behaves correctly when properly bound
  * to an AttentionService implementation
  */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 @RunWith(AndroidJUnit4.class)
 @AppModeFull(reason = "PM will not recognize CtsTestAttentionService in instantMode.")
 public class CtsAttentionServiceDeviceTest {
     private static final String SERVICE_ENABLED = "service_enabled";
     private static final String FAKE_SERVICE_PACKAGE =
             CtsTestAttentionService.class.getPackage().getName();
+    private static final double SUCCESSFUL_PROXIMITY_DISTANCE = 1.0;
     private final boolean isTestable =
             !TextUtils.isEmpty(getAttentionServiceComponent());
 
@@ -72,6 +78,47 @@
     }
 
     @Test
+    public void testProximityUpdates_OnSuccess() {
+        assertThat(CtsTestAttentionService.hasCurrentProximityUpdates()).isFalse();
+
+        /** From manager, call onStartProximityUpdates() on test service */
+        callStartProximityUpdates();
+
+        /** From test service, verify that onStartProximityUpdate was called */
+        assertThat(CtsTestAttentionService.hasCurrentProximityUpdates()).isTrue();
+
+        /** From test service, respond with a range */
+        CtsTestAttentionService.respondProximity(
+                SUCCESSFUL_PROXIMITY_DISTANCE);
+
+        /** From manager, verify proximity update callback was received*/
+        assertThat(getLastTestProximityUpdateCallbackCode())
+                .isEqualTo(SUCCESSFUL_PROXIMITY_DISTANCE);
+    }
+
+    @Test
+    public void testProximityUpdates_OnCancelledFromManager() {
+        assertThat(CtsTestAttentionService.hasPendingChecks()).isFalse();
+
+        /** From manager, call onStartProximityUpdates() on test service */
+        callStartProximityUpdates();
+
+        /** From test service, verify that onStartProximityUpdate was called */
+        assertThat(CtsTestAttentionService.hasCurrentProximityUpdates()).isTrue();
+
+        /** From manager, cancel the update */
+        callStopProximityUpdates();
+
+        /** From test service, verify that the update was cancelled */
+        assertThat(CtsTestAttentionService.hasCurrentProximityUpdates()).isFalse();
+
+        /** From manager, verify that the proximity callback was called with
+         * PRXIMITY_UNKNOWN */
+        assertThat(getLastTestProximityUpdateCallbackCode()).isEqualTo(
+                PROXIMITY_UNKNOWN);
+    }
+
+    @Test
     public void testAttentionService_OnSuccess() {
         /** From manager, call CheckAttention() on test service */
         assertThat(CtsTestAttentionService.hasPendingChecks()).isFalse();
@@ -145,6 +192,11 @@
         return Integer.parseInt(runShellCommand("cmd attention getLastTestCallbackCode"));
     }
 
+    private double getLastTestProximityUpdateCallbackCode() {
+        return Double.parseDouble(
+                runShellCommand("cmd attention getLastTestProximityUpdateCallbackCode"));
+    }
+
     /**
      * This call is asynchronous (manager spawns + binds to service and then asynchronously makes a
      * check attention call).
@@ -164,6 +216,19 @@
         CtsTestAttentionService.onReceivedResponse();
     }
 
+    private void callStartProximityUpdates() {
+        wakeUpScreen();
+        Boolean isSuccess = runShellCommand("cmd attention call onStartProximityUpdates")
+                .equals("true");
+        assertThat(isSuccess).isTrue();
+        CtsTestAttentionService.onReceivedResponse();
+    }
+
+    private void callStopProximityUpdates() {
+        runShellCommand("cmd attention call onStopProximityUpdates");
+        CtsTestAttentionService.onReceivedResponse();
+    }
+
     private boolean setTestableAttentionService(String service) {
         return runShellCommand("cmd attention setTestableAttentionService " + service)
                 .equals("true");
diff --git a/tests/attentionservice/src/android/attentionservice/cts/CtsTestAttentionService.java b/tests/attentionservice/src/android/attentionservice/cts/CtsTestAttentionService.java
index 232f2ff..01adafd 100644
--- a/tests/attentionservice/src/android/attentionservice/cts/CtsTestAttentionService.java
+++ b/tests/attentionservice/src/android/attentionservice/cts/CtsTestAttentionService.java
@@ -24,12 +24,13 @@
 
 public class CtsTestAttentionService extends AttentionService {
     private static final String TAG = "CtsTestAttentionService";
-    private static AttentionCallback sCurrentCallback;
+    private static AttentionCallback sCurrentAttentionCallback;
+    private static ProximityUpdateCallback sCurrentProximityUpdateCallback;
     private static  CountDownLatch sRespondLatch = new CountDownLatch(1);
 
     @Override
     public void onCheckAttention(AttentionCallback callback) {
-        sCurrentCallback = callback;
+        sCurrentAttentionCallback = callback;
         sRespondLatch.countDown();
     }
 
@@ -40,26 +41,49 @@
         sRespondLatch.countDown();
     }
 
+    @Override
+    public void onStartProximityUpdates(ProximityUpdateCallback callback) {
+        sCurrentProximityUpdateCallback = callback;
+        sRespondLatch.countDown();
+    }
+
+    @Override
+    public void onStopProximityUpdates() {
+        reset();
+        sRespondLatch.countDown();
+    }
+
     public static void reset() {
-        sCurrentCallback = null;
+        sCurrentAttentionCallback = null;
+        sCurrentProximityUpdateCallback = null;
     }
 
     public static void respondSuccess(int code) {
-        if (sCurrentCallback != null) {
-            sCurrentCallback.onSuccess(code, 0);
+        if (sCurrentAttentionCallback != null) {
+            sCurrentAttentionCallback.onSuccess(code, 0);
         }
         reset();
     }
 
     public static void respondFailure(int code) {
-        if (sCurrentCallback != null) {
-            sCurrentCallback.onFailure(code);
+        if (sCurrentAttentionCallback != null) {
+            sCurrentAttentionCallback.onFailure(code);
         }
         reset();
     }
 
+    public static void respondProximity(double distance) {
+        if (sCurrentProximityUpdateCallback != null) {
+            sCurrentProximityUpdateCallback.onProximityUpdate(distance);
+        }
+    }
+
     public static boolean hasPendingChecks() {
-        return sCurrentCallback != null;
+        return sCurrentAttentionCallback != null;
+    }
+
+    public static boolean hasCurrentProximityUpdates() {
+        return sCurrentProximityUpdateCallback != null;
     }
 
     public static void onReceivedResponse() {
diff --git a/tests/atv/OWNERS b/tests/atv/OWNERS
new file mode 100644
index 0000000..02fada1
--- /dev/null
+++ b/tests/atv/OWNERS
@@ -0,0 +1,4 @@
+# Bug component: 105709
+dwliu@google.com
+jingjiangli@google.com
+zhizhiliu@google.com
diff --git a/tests/atv/SettingsAPI/Android.bp b/tests/atv/SettingsAPI/Android.bp
new file mode 100644
index 0000000..04c7c48
--- /dev/null
+++ b/tests/atv/SettingsAPI/Android.bp
@@ -0,0 +1,47 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsSettingsAPITestCases",
+    defaults: ["cts_defaults"],
+    dex_preopt: {
+        enabled: false,
+    },
+    optimize: {
+        enabled: false,
+    },
+    static_libs: [
+        "androidx.test.rules",
+        "compatibility-device-util-axt",
+        "truth-prebuilt",
+        "TvSettingsAPI"
+    ],
+    libs: [
+        "android.test.runner",
+        "android.test.base",
+    ],
+    srcs: ["src/**/*.java"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    sdk_version: "test_current",
+    min_sdk_version: "31",
+}
+
diff --git a/tests/atv/SettingsAPI/AndroidManifest.xml b/tests/atv/SettingsAPI/AndroidManifest.xml
new file mode 100644
index 0000000..6cdb447
--- /dev/null
+++ b/tests/atv/SettingsAPI/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="com.android.tv.settings.library.cts">
+    <uses-sdk android:minSdkVersion="31" />
+    <application>
+        <uses-library android:name="android.test.runner"/>
+    </application>
+    <!--  self-instrumenting test package. -->
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+         android:label="CTS TV Settings API tests"
+         android:targetPackage="com.android.tv.settings.library.cts">
+    </instrumentation>
+</manifest>
diff --git a/tests/atv/SettingsAPI/AndroidTest.xml b/tests/atv/SettingsAPI/AndroidTest.xml
new file mode 100644
index 0000000..0f5f1c6
--- /dev/null
+++ b/tests/atv/SettingsAPI/AndroidTest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+<configuration description="Config for CTS TV Settings API test cases">
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsSettingsAPITestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="com.android.tv.settings.library.cts" />
+    </test>
+</configuration>
diff --git a/tests/atv/SettingsAPI/OWNERS b/tests/atv/SettingsAPI/OWNERS
new file mode 100644
index 0000000..bfa0720
--- /dev/null
+++ b/tests/atv/SettingsAPI/OWNERS
@@ -0,0 +1,4 @@
+# Bug component: 105709
+dwliu@google.com
+jingjiangli@google.com
+zhizhiliu@google.com
\ No newline at end of file
diff --git a/tests/atv/SettingsAPI/src/com/android/tv/settings/library/cts/ManagerUtilTest.java b/tests/atv/SettingsAPI/src/com/android/tv/settings/library/cts/ManagerUtilTest.java
new file mode 100644
index 0000000..b026a5d
--- /dev/null
+++ b/tests/atv/SettingsAPI/src/com/android/tv/settings/library/cts/ManagerUtilTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2021 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.tv.settings.library.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import com.android.tv.settings.library.ManagerUtil;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class ManagerUtilTest {
+    // TODO(b/187659818) Add test cases for ManagerUtil.
+    @Test
+    public void testGetChecked() {
+        // TODO(b/187659818) Implement test case for the function
+        //  testGetChecked.
+    }
+}
\ No newline at end of file
diff --git a/tests/autofillservice/src/android/autofillservice/cts/DelayFillTest.java b/tests/autofillservice/src/android/autofillservice/cts/DelayFillTest.java
new file mode 100644
index 0000000..e839378
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/DelayFillTest.java
@@ -0,0 +1,365 @@
+/*
+ * Copyright (C) 2022 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 android.autofillservice.cts;
+
+import static android.autofillservice.cts.testcore.Helper.ID_USERNAME;
+import static android.autofillservice.cts.testcore.Helper.getContext;
+import static android.autofillservice.cts.testcore.InstrumentedAutoFillService.FillRequest;
+import static android.content.IntentSender.SendIntentException;
+import static android.service.autofill.AutofillService.EXTRA_FILL_RESPONSE;
+
+import static org.testng.Assert.assertThrows;
+
+import android.autofillservice.cts.activities.LoginActivity;
+import android.autofillservice.cts.commontests.AutoFillServiceTestCase;
+import android.autofillservice.cts.testcore.AutofillActivityTestRule;
+import android.autofillservice.cts.testcore.CannedFillResponse;
+import android.autofillservice.cts.testcore.Helper;
+import android.content.Intent;
+import android.service.autofill.FillResponse;
+
+import org.junit.Test;
+
+/**
+ * Test accepting delayed fill responses from autofill service.
+ */
+public class DelayFillTest extends AutoFillServiceTestCase.AutoActivityLaunch<LoginActivity> {
+    private static final String TAG = "DelayFillTest";
+
+    private LoginActivity mActivity;
+
+    @Override
+    protected AutofillActivityTestRule<LoginActivity> getActivityRule() {
+        return new AutofillActivityTestRule<LoginActivity>(LoginActivity.class) {
+            @Override
+            protected void afterActivityLaunched() {
+                mActivity = getActivity();
+            }
+        };
+    }
+
+    @Test
+    public void testDelayedFill() throws Exception {
+        // Set service.
+        enableService();
+
+        // Add placeholder response
+        sReplier.addResponse(
+                new CannedFillResponse.Builder()
+                        .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                                createPresentation("placeholder"))
+                                .setField(ID_USERNAME, "filled").build())
+                        .setFillResponseFlags(FillResponse.FLAG_DELAY_FILL)
+                        .build());
+
+        // Trigger autofill on username
+        mUiBot.selectByRelativeId(ID_USERNAME);
+
+        // Wait for fill request to be processed
+        FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        // Wait until dataset is shown
+        mUiBot.assertDatasets("placeholder");
+
+        // Create the actual response
+        FillResponse actualResponse = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                        createPresentation("dataset"))
+                                .setField(ID_USERNAME, "filled")
+                                .build())
+                .build()
+                .asFillResponse(fillRequest.contexts,
+                        (id) -> Helper.findNodeByResourceId(fillRequest.contexts, id));
+        Intent intent = new Intent()
+                .putExtra(EXTRA_FILL_RESPONSE, actualResponse);
+
+        // Send delayed fill response
+        fillRequest.delayFillIntentSender.sendIntent(getContext(), 0, intent, null, null, null);
+
+        // Wait for fill response to be processed
+        mUiBot.waitForIdle();
+
+        // Dataset of second response should be shown
+        mUiBot.assertDatasets("dataset");
+    }
+
+    @Test
+    public void testServiceDidNotSetDelayFillFlag() throws Exception {
+        // Set service.
+        enableService();
+
+        // Add response
+        sReplier.addResponse(
+                new CannedFillResponse.Builder()
+                        .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                                createPresentation("placeholder"))
+                                        .setField(ID_USERNAME, "filled")
+                                        .build())
+                        .build());
+
+        // Trigger autofill on username
+        mUiBot.selectByRelativeId(ID_USERNAME);
+
+        // Wait for fill request to be processed
+        FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        // Wait until dataset is shown
+        mUiBot.assertDatasets("placeholder");
+
+        // Create the actual response
+        FillResponse actualResponse = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                        createPresentation("dataset"))
+                                .setField(ID_USERNAME, "filled")
+                                .build())
+                .build()
+                .asFillResponse(fillRequest.contexts,
+                        (id) -> Helper.findNodeByResourceId(fillRequest.contexts, id));
+        Intent intent = new Intent()
+                .putExtra(EXTRA_FILL_RESPONSE, actualResponse);
+
+        // Send delayed fill response
+        fillRequest.delayFillIntentSender.sendIntent(getContext(), 0, intent, null, null, null);
+
+        // Wait for fill response to be processed
+        mUiBot.waitForIdle();
+
+        // Dataset of placeholder response should still be shown
+        mUiBot.assertDatasets("placeholder");
+    }
+
+    @Test
+    public void testPreventSendingDelayedFillIntentTwice() throws Exception {
+        // Set service.
+        enableService();
+
+        // Add placeholder response
+        sReplier.addResponse(
+                new CannedFillResponse.Builder()
+                        .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                                createPresentation("placeholder"))
+                                .setField(ID_USERNAME, "filled").build())
+                        .setFillResponseFlags(FillResponse.FLAG_DELAY_FILL)
+                        .build());
+
+        // Trigger autofill on username
+        mUiBot.selectByRelativeId(ID_USERNAME);
+
+        // Wait for fill request to be processed
+        FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        // Wait until dataset is shown
+        mUiBot.assertDatasets("placeholder");
+
+        // Create the actual response
+        FillResponse actualResponse = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                        createPresentation("dataset"))
+                        .setField(ID_USERNAME, "filled")
+                        .build())
+                .build()
+                .asFillResponse(fillRequest.contexts,
+                        (id) -> Helper.findNodeByResourceId(fillRequest.contexts, id));
+        Intent intent = new Intent()
+                .putExtra(EXTRA_FILL_RESPONSE, actualResponse);
+
+        // Send delayed fill response
+        fillRequest.delayFillIntentSender.sendIntent(getContext(), 0, intent, null, null, null);
+
+        // Wait for fill response to be processed
+        mUiBot.waitForIdle();
+
+        // Dataset of second response should be shown
+        mUiBot.assertDatasets("dataset");
+
+        // Create another delayed response
+        FillResponse anotherResponse = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                        createPresentation("dataset2"))
+                        .setField(ID_USERNAME, "filled")
+                        .build())
+                .build()
+                .asFillResponse(fillRequest.contexts,
+                        (id) -> Helper.findNodeByResourceId(fillRequest.contexts, id));
+        Intent anotherIntent = new Intent()
+                .putExtra(EXTRA_FILL_RESPONSE, anotherResponse);
+
+        // Tries to send another delayed fill response
+        assertThrows(SendIntentException.class, () ->
+                fillRequest.delayFillIntentSender
+                        .sendIntent(getContext(), 0, anotherIntent, null, null, null));
+
+        // Wait for fill response to be processed
+        mUiBot.waitForIdle();
+
+        // Dataset of second response should still be shown
+        mUiBot.assertDatasets("dataset");
+    }
+
+    @Test
+    public void testSetDelayFillFlagTwiceButIntentCanOnlyBeSentOnce() throws Exception {
+        // Set service.
+        enableService();
+
+        // Add placeholder response
+        CannedFillResponse delayFillResponse = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                        createPresentation("placeholder"))
+                        .setField(ID_USERNAME, "filled").build())
+                .setFillResponseFlags(FillResponse.FLAG_DELAY_FILL)
+                .build();
+        sReplier.addResponse(delayFillResponse);
+
+        // Trigger autofill on username
+        mUiBot.selectByRelativeId(ID_USERNAME);
+
+        // Wait for fill request to be processed
+        FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        // Wait until dataset is shown
+        mUiBot.assertDatasets("placeholder");
+
+        // Create the response that sets FLAG_DELAY_FILL again
+        FillResponse secondResponse = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                        createPresentation("dataset"))
+                        .setField(ID_USERNAME, "filled").build())
+                .setFillResponseFlags(FillResponse.FLAG_DELAY_FILL)
+                .build()
+                .asFillResponse(fillRequest.contexts,
+                        (id) -> Helper.findNodeByResourceId(fillRequest.contexts, id));
+        Intent intent = new Intent()
+                .putExtra(EXTRA_FILL_RESPONSE, secondResponse);
+
+        // Send delayed fill response
+        fillRequest.delayFillIntentSender.sendIntent(getContext(), 0, intent, null, null, null);
+
+        // Wait for fill response to be processed
+        mUiBot.waitForIdle();
+
+        // Dataset of second response should be shown
+        mUiBot.assertDatasets("dataset");
+
+        // Create third response
+        FillResponse thirdResponse = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                        createPresentation("dataset2"))
+                        .setField(ID_USERNAME, "filled")
+                        .build())
+                .build()
+                .asFillResponse(fillRequest.contexts,
+                        (id) -> Helper.findNodeByResourceId(fillRequest.contexts, id));
+        Intent intent2 = new Intent()
+                .putExtra(EXTRA_FILL_RESPONSE, thirdResponse);
+
+        // Tries to send third delayed fill response
+        assertThrows(SendIntentException.class, () ->
+                fillRequest.delayFillIntentSender
+                        .sendIntent(getContext(), 0, intent2, null, null, null));
+
+        // Wait for fill response to be processed
+        mUiBot.waitForIdle();
+
+        // Dataset of second response should still be shown
+        mUiBot.assertDatasets("dataset");
+    }
+
+    @Test
+    public void testOnlyAcceptDelayFillForLastRequest() throws Exception {
+        // Set service.
+        enableService();
+
+        // Add placeholder response for first request
+        sReplier.addResponse(
+                new CannedFillResponse.Builder()
+                        .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                                createPresentation("placeholder"))
+                                .setField(ID_USERNAME, "filled").build())
+                        .setFillResponseFlags(FillResponse.FLAG_DELAY_FILL)
+                        .build());
+
+        // Trigger autofill on username
+        mUiBot.selectByRelativeId(ID_USERNAME);
+
+        // Wait for first fill request to be processed
+        FillRequest fillRequest = sReplier.getNextFillRequest();
+
+        // Wait until dataset is shown
+        mUiBot.assertDatasets("placeholder");
+
+        // Create delayed fill response for first request
+        FillResponse response = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                        createPresentation("dataset"))
+                        .setField(ID_USERNAME, "filled").build())
+                .build()
+                .asFillResponse(fillRequest.contexts,
+                        (id) -> Helper.findNodeByResourceId(fillRequest.contexts, id));
+        Intent intent = new Intent()
+                .putExtra(EXTRA_FILL_RESPONSE, response);
+
+        // Add placeholder response for second request
+        sReplier.addResponse(
+                new CannedFillResponse.Builder()
+                        .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                                createPresentation("placeholder2"))
+                                .setField(ID_USERNAME, "filled").build())
+                        .setFillResponseFlags(FillResponse.FLAG_DELAY_FILL)
+                        .build());
+
+        // Manually trigger autofill
+        mActivity.getAutofillManager().requestAutofill(mActivity.getUsername());
+
+        // Wait for fill response to be processed
+        mUiBot.waitForIdle();
+
+        // Wait for second fill request to be processed
+        FillRequest fillRequest2 = sReplier.getNextFillRequest();
+
+        // Dataset of second response should be shown
+        mUiBot.assertDatasets("placeholder2");
+
+        // Send delayed fill response for first request
+        assertThrows(SendIntentException.class, () ->
+                fillRequest.delayFillIntentSender
+                        .sendIntent(getContext(), 0, intent, null, null, null));
+
+        // Dataset of second response should still be shown
+        mUiBot.assertDatasets("placeholder2");
+
+        // Create delayed fill response for second request
+        FillResponse response2 = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder(
+                        createPresentation("dataset2"))
+                        .setField(ID_USERNAME, "filled")
+                        .build())
+                .build()
+                .asFillResponse(fillRequest2.contexts,
+                        (id) -> Helper.findNodeByResourceId(fillRequest2.contexts, id));
+        Intent intent2 = new Intent()
+                .putExtra(EXTRA_FILL_RESPONSE, response2);
+
+        // Send delayed fill response for second request
+        fillRequest2.delayFillIntentSender.sendIntent(getContext(), 0, intent2, null, null, null);
+
+        // Wait for fill response to be processed
+        mUiBot.waitForIdle();
+
+        // Dataset of second delayed response should be shown
+        mUiBot.assertDatasets("dataset2");
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/SessionLifecycleTest.java b/tests/autofillservice/src/android/autofillservice/cts/SessionLifecycleTest.java
index e1f1295..80f3c9a 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/SessionLifecycleTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/SessionLifecycleTest.java
@@ -543,4 +543,4 @@
                 ID_USERNAME);
         assertTextAndValue(username, "dude");
     }
-}
+}
\ No newline at end of file
diff --git a/tests/autofillservice/src/android/autofillservice/cts/activities/LoginActivity.java b/tests/autofillservice/src/android/autofillservice/cts/activities/LoginActivity.java
index 745ed17..d35dd40 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/activities/LoginActivity.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/activities/LoginActivity.java
@@ -28,6 +28,7 @@
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
+import android.view.WindowInsets;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
@@ -390,6 +391,13 @@
     }
 
     /**
+     * Get insets of the root window
+     */
+    public WindowInsets getRootWindowInsets() {
+        return mUsernameLabel.getRootWindowInsets();
+    }
+
+    /**
      * Holder for the expected auto-fill values.
      */
     private final class FillExpectation {
diff --git a/tests/autofillservice/src/android/autofillservice/cts/activities/OptionalSaveActivity.java b/tests/autofillservice/src/android/autofillservice/cts/activities/OptionalSaveActivity.java
index 22587d2..2d0fdf9 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/activities/OptionalSaveActivity.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/activities/OptionalSaveActivity.java
@@ -105,11 +105,7 @@
         finish();
     }
 
-    /**
-     * Sets the expectation for an auto-fill request, so it can be asserted through
-     * {@link #assertAutoFilled()} later.
-     */
-    public void expectAutoFill(@Nullable String address1, @Nullable String address2,
+    public void expectTextChange(@Nullable String address1, @Nullable String address2,
             @Nullable String city,
             @Nullable String favColor) {
         mExpectation = new FillExpectation(address1, address2, city, favColor);
@@ -128,11 +124,16 @@
     }
 
     /**
-     * Asserts the activity was auto-filled with the values passed to
-     * {@link #expectAutoFill(String, String, String, String)}.
+     * Sets the expectation for an auto-fill request, so it can be asserted through
+     * {@link #assertAutoFilled()} later.
      */
-    public void assertAutoFilled() throws Exception {
-        assertWithMessage("expectAutoFill() not called").that(mExpectation).isNotNull();
+    public void expectAutoFill(@Nullable String address1, @Nullable String address2,
+            @Nullable String city,
+            @Nullable String favColor) {
+        expectTextChange(address1, address2, city, favColor);
+    }
+
+    public void assertTextChange() throws Exception {
         if (mExpectation.address1Watcher != null) {
             mExpectation.address1Watcher.assertAutoFilled();
         }
@@ -148,6 +149,15 @@
     }
 
     /**
+     * Asserts the activity was auto-filled with the values passed to
+     * {@link #expectAutoFill(String, String, String, String)}.
+     */
+    public void assertAutoFilled() throws Exception {
+        assertWithMessage("expectAutoFill() not called").that(mExpectation).isNotNull();
+        assertTextChange();
+    }
+
+    /**
      * Holder for the expected auto-fill values.
      */
     private final class FillExpectation {
diff --git a/tests/autofillservice/src/android/autofillservice/cts/activities/PreSimpleSaveActivity.java b/tests/autofillservice/src/android/autofillservice/cts/activities/PreSimpleSaveActivity.java
index 02881cb..ab0b619 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/activities/PreSimpleSaveActivity.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/activities/PreSimpleSaveActivity.java
@@ -61,12 +61,25 @@
         });
     }
 
-    public FillExpectation expectAutoFill(String input) {
+    /**
+     * Set the EditText input or password value and wait until text change.
+     */
+    public void setTextAndWaitTextChange(String input) throws Exception {
+        final FillExpectation expectation = expectInputTextChange(input);
+        syncRunOnUiThread(() -> mPreInput.setText(input));
+        expectation.assertTextChange();
+    }
+
+    public FillExpectation expectInputTextChange(String input) {
         final FillExpectation expectation = new FillExpectation(input);
         mPreInput.addTextChangedListener(expectation.mInputWatcher);
         return expectation;
     }
 
+    public FillExpectation expectAutoFill(String input) {
+        return expectInputTextChange(input);
+    }
+
     public EditText getPreInput() {
         return mPreInput;
     }
@@ -78,6 +91,10 @@
             mInputWatcher = new OneTimeTextWatcher("input", mPreInput, input);
         }
 
+        public void assertTextChange() throws Exception {
+            mInputWatcher.assertAutoFilled();
+        }
+
         public void assertAutoFilled() throws Exception {
             mInputWatcher.assertAutoFilled();
         }
diff --git a/tests/autofillservice/src/android/autofillservice/cts/activities/SimpleSaveActivity.java b/tests/autofillservice/src/android/autofillservice/cts/activities/SimpleSaveActivity.java
index 2866cbc..6f8f8d6 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/activities/SimpleSaveActivity.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/activities/SimpleSaveActivity.java
@@ -105,21 +105,41 @@
         mClearFieldsOnSubmit = flag;
     }
 
-    public FillExpectation expectInputTextChange(String input) {
+    /**
+     * Set the EditText input or password value and wait until text change.
+     */
+    public void setTextAndWaitTextChange(String input, String password) throws Exception {
+        FillExpectation changeExpectation = expectInputPasswordTextChange(input, password);
+        syncRunOnUiThread(() -> {
+            if (input != null) {
+                mInput.setText(input);
+            }
+            if (password != null) {
+                mPassword.setText(password);
+            }
+        });
+        changeExpectation.assertTextChange();
+    }
+
+    public FillExpectation expectAutoFill(String input) {
         final FillExpectation expectation = new FillExpectation(input, null);
         mInput.addTextChangedListener(expectation.mInputWatcher);
         return expectation;
     }
 
-    public FillExpectation expectAutoFill(String input) {
-        return expectInputTextChange(input);
+    public FillExpectation expectInputPasswordTextChange(String input, String password) {
+        final FillExpectation expectation = new FillExpectation(input, password);
+        if (expectation.mInputWatcher != null) {
+            mInput.addTextChangedListener(expectation.mInputWatcher);
+        }
+        if (expectation.mPasswordWatcher != null) {
+            mPassword.addTextChangedListener(expectation.mPasswordWatcher);
+        }
+        return expectation;
     }
 
     public FillExpectation expectAutoFill(String input, String password) {
-        final FillExpectation expectation = new FillExpectation(input, password);
-        mInput.addTextChangedListener(expectation.mInputWatcher);
-        mPassword.addTextChangedListener(expectation.mPasswordWatcher);
-        return expectation;
+        return expectInputPasswordTextChange(input, password);
     }
 
     public EditText getInput() {
@@ -131,7 +151,9 @@
         private final OneTimeTextWatcher mPasswordWatcher;
 
         private FillExpectation(String input, String password) {
-            mInputWatcher = new OneTimeTextWatcher("input", mInput, input);
+            mInputWatcher = input == null
+                    ? null
+                    : new OneTimeTextWatcher("input", mInput, input);
             mPasswordWatcher = password == null
                     ? null
                     : new OneTimeTextWatcher("password", mPassword, password);
@@ -142,7 +164,9 @@
         }
 
         public void assertAutoFilled() throws Exception {
-            mInputWatcher.assertAutoFilled();
+            if (mInputWatcher != null) {
+                mInputWatcher.assertAutoFilled();
+            }
             if (mPasswordWatcher != null) {
                 mPasswordWatcher.assertAutoFilled();
             }
diff --git a/tests/autofillservice/src/android/autofillservice/cts/activities/VirtualContainerActivity.java b/tests/autofillservice/src/android/autofillservice/cts/activities/VirtualContainerActivity.java
index b4ea508..ed9bc73 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/activities/VirtualContainerActivity.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/activities/VirtualContainerActivity.java
@@ -43,6 +43,7 @@
     public static final String BLANK_VALUE = "        ";
     public static final String INITIAL_URL_BAR_VALUE = "ftp://dev.null/4/8/15/16/23/42";
 
+    // TODO: Make these private and expose getters.
     public EditText mUrlBar;
     public EditText mUrlBar2;
     public VirtualContainerView mCustomView;
@@ -52,6 +53,14 @@
 
     private FillExpectation mExpectation;
 
+    public VirtualContainerView getVirtualViewHolder() {
+        return mCustomView;
+    }
+
+    public int getUsernameVirtualId() {
+        return mUsername.text.id;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/tests/autofillservice/src/android/autofillservice/cts/commontests/AutoFillServiceTestCase.java b/tests/autofillservice/src/android/autofillservice/cts/commontests/AutoFillServiceTestCase.java
index 6f37728..dca70f8 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/commontests/AutoFillServiceTestCase.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/commontests/AutoFillServiceTestCase.java
@@ -29,6 +29,7 @@
 import android.autofillservice.cts.activities.AbstractAutoFillActivity;
 import android.autofillservice.cts.activities.AugmentedAuthActivity;
 import android.autofillservice.cts.activities.AuthenticationActivity;
+import android.autofillservice.cts.activities.LoginActivity;
 import android.autofillservice.cts.activities.PreSimpleSaveActivity;
 import android.autofillservice.cts.activities.SimpleSaveActivity;
 import android.autofillservice.cts.testcore.AutofillActivityTestRule;
@@ -201,6 +202,14 @@
             mUiBot.assertShownByRelativeId(PreSimpleSaveActivity.ID_PRE_LABEL);
             return PreSimpleSaveActivity.getInstance();
         }
+
+        protected LoginActivity startLoginActivity() throws Exception {
+            final Intent intent = new Intent(mContext, LoginActivity.class)
+                    .setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            mContext.startActivity(intent);
+            mUiBot.assertShownByRelativeId(Helper.ID_USERNAME_LABEL);
+            return LoginActivity.getCurrentActivity();
+        }
     }
 
     @RunWith(AndroidJUnit4.class)
@@ -284,6 +293,11 @@
                         AutofillManager.DEVICE_CONFIG_AUTOFILL_SMART_SUGGESTION_SUPPORTED_MODES,
                         Integer.toString(getSmartSuggestionMode())))
                 //
+                // Fill Dialog should be disabled by default
+                .around(new DeviceConfigStateChangerRule(sContext, DeviceConfig.NAMESPACE_AUTOFILL,
+                        AutofillManager.DEVICE_CONFIG_AUTOFILL_DIALOG_ENABLED,
+                        Boolean.toString(false)))
+                //
                 // Finally, let subclasses add their own rules (like ActivityTestRule)
                 .around(getMainTestRule());
 
@@ -292,6 +306,11 @@
         protected final String mPackageName;
         protected final UiBot mUiBot;
 
+        public BaseTestCase() {
+            mPackageName = mContext.getPackageName();
+            mUiBot = sDefaultUiBot;
+        }
+
         private BaseTestCase(@NonNull UiBot uiBot) {
             mPackageName = mContext.getPackageName();
             mUiBot = uiBot;
diff --git a/tests/autofillservice/src/android/autofillservice/cts/commontests/FillEventHistoryCommonTestCase.java b/tests/autofillservice/src/android/autofillservice/cts/commontests/FillEventHistoryCommonTestCase.java
index c8bdfee..0ce2913 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/commontests/FillEventHistoryCommonTestCase.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/commontests/FillEventHistoryCommonTestCase.java
@@ -39,6 +39,8 @@
 import static android.service.autofill.FillEventHistory.Event.NO_SAVE_UI_REASON_NO_SAVE_INFO;
 import static android.service.autofill.FillEventHistory.Event.NO_SAVE_UI_REASON_NO_VALUE_CHANGED;
 import static android.service.autofill.FillEventHistory.Event.NO_SAVE_UI_REASON_WITH_DELAY_SAVE_FLAG;
+import static android.service.autofill.FillEventHistory.Event.UI_TYPE_INLINE;
+import static android.service.autofill.FillEventHistory.Event.UI_TYPE_MENU;
 import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_GENERIC;
 import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_PASSWORD;
 
@@ -129,7 +131,9 @@
 
         // Verify fill selection
         final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-        assertFillEventForDatasetShown(events.get(0), "clientStateKey", "clientStateValue");
+        int presentationType = isInlineMode() ? UI_TYPE_INLINE : UI_TYPE_MENU;
+        assertFillEventForDatasetShown(events.get(0), "clientStateKey",
+                "clientStateValue", presentationType);
         assertFillEventForDatasetAuthenticationSelected(events.get(1), "name",
                 "clientStateKey", "clientStateValue");
     }
@@ -172,10 +176,13 @@
         final FillEventHistory selection = InstrumentedAutoFillService.getFillEventHistory(4);
         assertDeprecatedClientState(selection, "clientStateKey", "clientStateValue");
         List<Event> events = selection.getEvents();
-        assertFillEventForDatasetShown(events.get(0), "clientStateKey", "clientStateValue");
+        int presentationType = isInlineMode() ? UI_TYPE_INLINE : UI_TYPE_MENU;
+        assertFillEventForDatasetShown(events.get(0), "clientStateKey",
+                "clientStateValue", presentationType);
         assertFillEventForAuthenticationSelected(events.get(1), NULL_DATASET_ID,
                 "clientStateKey", "clientStateValue");
-        assertFillEventForDatasetShown(events.get(2), "clientStateKey", "clientStateValue");
+        assertFillEventForDatasetShown(events.get(2), "clientStateKey",
+                "clientStateValue", presentationType);
         assertFillEventForDatasetSelected(events.get(3), "name",
                 "clientStateKey", "clientStateValue");
     }
@@ -205,12 +212,14 @@
         mUiBot.waitForIdle();
         mActivity.assertAutoFilled();
 
+        int presentationType = isInlineMode() ? UI_TYPE_INLINE : UI_TYPE_MENU;
         {
             // Verify fill selection
             final FillEventHistory selection = InstrumentedAutoFillService.getFillEventHistory(2);
             assertDeprecatedClientState(selection, "clientStateKey", "Value1");
             final List<Event> events = selection.getEvents();
-            assertFillEventForDatasetShown(events.get(0), "clientStateKey", "Value1");
+            assertFillEventForDatasetShown(events.get(0), "clientStateKey",
+                    "Value1", presentationType);
             assertFillEventForDatasetSelected(events.get(1), NULL_DATASET_ID,
                     "clientStateKey", "Value1");
         }
@@ -248,7 +257,8 @@
             final FillEventHistory selection = InstrumentedAutoFillService.getFillEventHistory(2);
             assertDeprecatedClientState(selection, "clientStateKey", "Value2");
             final List<Event> events = selection.getEvents();
-            assertFillEventForDatasetShown(events.get(0), "clientStateKey", "Value2");
+            assertFillEventForDatasetShown(events.get(0), "clientStateKey",
+                    "Value2", presentationType);
             assertFillEventForDatasetSelected(events.get(1), "name3",
                     "clientStateKey", "Value2");
         }
@@ -263,10 +273,12 @@
             assertDeprecatedClientState(selection, "clientStateKey", "Value2");
 
             final List<Event> events = selection.getEvents();
-            assertFillEventForDatasetShown(events.get(0), "clientStateKey", "Value2");
+            assertFillEventForDatasetShown(events.get(0), "clientStateKey",
+                    "Value2", presentationType);
             assertFillEventForDatasetSelected(events.get(1), "name3",
                     "clientStateKey", "Value2");
-            assertFillEventForDatasetShown(events.get(2), "clientStateKey", "Value2");
+            assertFillEventForDatasetShown(events.get(2), "clientStateKey",
+                    "Value2", presentationType);
             assertFillEventForSaveShown(events.get(3), NULL_DATASET_ID,
                     "clientStateKey", "Value2");
         }
@@ -295,10 +307,12 @@
 
         {
             // Verify fill selection
+            int presentationType =
+                    isInlineMode() ? UI_TYPE_INLINE : UI_TYPE_MENU;
             final FillEventHistory selection = InstrumentedAutoFillService.getFillEventHistory(2);
             assertNoDeprecatedClientState(selection);
             final List<Event> events = selection.getEvents();
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), presentationType);
             assertFillEventForDatasetSelected(events.get(1), NULL_DATASET_ID);
         }
 
@@ -337,10 +351,12 @@
 
         {
             // Verify fill selection
+            int presentationType =
+                    isInlineMode() ? UI_TYPE_INLINE : UI_TYPE_MENU;
             final FillEventHistory selection = InstrumentedAutoFillService.getFillEventHistory(2);
             assertNoDeprecatedClientState(selection);
             final List<Event> events = selection.getEvents();
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), presentationType);
             assertFillEventForDatasetSelected(events.get(1), NULL_DATASET_ID);
         }
 
@@ -377,10 +393,12 @@
 
         {
             // Verify fill selection
+            int presentationType =
+                    isInlineMode() ? UI_TYPE_INLINE : UI_TYPE_MENU;
             final FillEventHistory selection = InstrumentedAutoFillService.getFillEventHistory(2);
             assertNoDeprecatedClientState(selection);
             final List<Event> events = selection.getEvents();
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), presentationType);
             assertFillEventForDatasetSelected(events.get(1), NULL_DATASET_ID);
         }
 
@@ -442,9 +460,11 @@
         sReplier.getNextFillRequest();
 
         // Verify fill selection for Activity B
+        int presentationType = isInlineMode() ? UI_TYPE_INLINE : UI_TYPE_MENU;
         final FillEventHistory selectionB = InstrumentedAutoFillService.getFillEventHistory(1);
         assertDeprecatedClientState(selectionB, "activity", "B");
-        assertFillEventForDatasetShown(selectionB.getEvents().get(0), "activity", "B");
+        assertFillEventForDatasetShown(selectionB.getEvents().get(0), "activity",
+                "B", presentationType);
 
         // Set response for back to activity A
         sReplier.addResponse(new CannedFillResponse.Builder()
@@ -503,8 +523,10 @@
         mActivity.assertAutoFilled();
         // Verify fill history
         {
+            int presentationType =
+                    isInlineMode() ? UI_TYPE_INLINE : UI_TYPE_MENU;
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), presentationType);
             assertFillEventForDatasetSelected(events.get(1), "id1");
         }
 
@@ -524,8 +546,10 @@
         mActivity.assertAutoFilled();
         // Verify fill history
         {
+            int presentationType =
+                    isInlineMode() ? UI_TYPE_INLINE : UI_TYPE_MENU;
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), presentationType);
             assertFillEventForDatasetSelected(events.get(1), "id2");
         }
 
@@ -537,8 +561,10 @@
 
         {
             // Verify fill history
+            int presentationType =
+                    isInlineMode() ? UI_TYPE_INLINE : UI_TYPE_MENU;
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), presentationType);
             assertFillEventForDatasetSelected(events.get(1), "id2");
         }
     }
diff --git a/tests/autofillservice/src/android/autofillservice/cts/dialog/DialogTest.java b/tests/autofillservice/src/android/autofillservice/cts/dialog/DialogTest.java
new file mode 100644
index 0000000..978a57c
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/dialog/DialogTest.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2022 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 android.autofillservice.cts.dialog;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.autofillservice.cts.activities.LoginActivity;
+import android.autofillservice.cts.activities.VirtualContainerActivity;
+import android.autofillservice.cts.commontests.AutoFillServiceTestCase;
+import android.platform.test.annotations.AppModeFull;
+import android.view.autofill.AutofillManager;
+
+import androidx.annotation.NonNull;
+import androidx.lifecycle.Lifecycle;
+import androidx.test.core.app.ActivityScenario;
+
+import org.junit.Test;
+import org.junit.rules.TestRule;
+
+/**
+ * Basic initial tests for the Dialog UI. These tests should probably be moved to a full-fledged
+ * test suite like DialogLoginActivityTest later.
+ */
+public class DialogTest extends AutoFillServiceTestCase.BaseTestCase {
+
+    private static final String TAG = "DialogTest";
+
+    @Test
+    public void showAutofillDialog_noResponse_returnsFalse() throws Exception {
+        // Set service.
+        enableService();
+
+        // The feature is currently disabled so there is no request at all.
+
+        ActivityScenario<LoginActivity> scenario = ActivityScenario.launch(LoginActivity.class);
+        scenario.moveToState(Lifecycle.State.RESUMED);
+
+        scenario.onActivity((activity -> {
+            AutofillManager manager = activity.getAutofillManager();
+            assertThat(manager.showAutofillDialog(activity.getUsername())).isFalse();
+        }));
+    }
+
+    @Test
+    @AppModeFull(reason = "other tests should provide enough coverage")
+    public void showAutofillDialogForVirtualView_noDialogPresentation_returnsFalse()
+            throws Exception {
+        // Set service.
+        enableService();
+
+        // The feature is currently disabled so there is no request at all.
+
+        ActivityScenario<VirtualContainerActivity> scenario = ActivityScenario.launch(
+                VirtualContainerActivity.class);
+        scenario.moveToState(Lifecycle.State.RESUMED);
+
+        scenario.onActivity((activity -> {
+            AutofillManager manager = activity.getAutofillManager();
+            assertThat(
+                    manager.showAutofillDialog(
+                            activity.getVirtualViewHolder(), activity.getUsernameVirtualId()))
+                    .isFalse();
+        }));
+    }
+
+    @NonNull
+    @Override
+    protected TestRule getMainTestRule() {
+        // No-op test rule because we're managing activities ourselves.
+        return (base, description) -> base;
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/dialog/LoginActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/dialog/LoginActivityTest.java
new file mode 100644
index 0000000..ec8a4d1
--- /dev/null
+++ b/tests/autofillservice/src/android/autofillservice/cts/dialog/LoginActivityTest.java
@@ -0,0 +1,333 @@
+/*
+ * Copyright (C) 2022 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 android.autofillservice.cts.dialog;
+
+import static android.autofillservice.cts.testcore.Helper.ID_PASSWORD;
+import static android.autofillservice.cts.testcore.Helper.ID_USERNAME;
+import static android.autofillservice.cts.testcore.Helper.assertHasFlags;
+import static android.autofillservice.cts.testcore.Helper.enableFillDialogFeature;
+import static android.autofillservice.cts.testcore.Helper.isImeShowing;
+import static android.service.autofill.FillRequest.FLAG_SUPPORTS_FILL_DIALOG;
+
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.autofillservice.cts.activities.LoginActivity;
+import android.autofillservice.cts.commontests.AutoFillServiceTestCase;
+import android.autofillservice.cts.testcore.CannedFillResponse;
+import android.autofillservice.cts.testcore.CannedFillResponse.CannedDataset;
+import android.autofillservice.cts.testcore.InstrumentedAutoFillService.FillRequest;
+import android.support.test.uiautomator.UiObject2;
+import android.view.View;
+
+import org.junit.Test;
+
+
+/**
+ * This is the test cases for the fill dialog UI.
+ */
+public class LoginActivityTest extends AutoFillServiceTestCase.ManualActivityLaunch {
+
+    @Test
+    public void testTextView_withoutFillDialog_clickTwice_showIme() throws Exception {
+        // Start activity and autofill
+        LoginActivity activity = startLoginActivity();
+        mUiBot.waitForIdleSync();
+
+        // Click on password field
+        mUiBot.selectByRelativeIdFromUiDevice(ID_PASSWORD);
+        // Waits a while
+        mUiBot.waitForIdleSync();
+
+        // Click on password field again
+        mUiBot.selectByRelativeIdFromUiDevice(ID_PASSWORD);
+        // Waits a while
+        mUiBot.waitForIdleSync();
+
+        // Verify IME is shown
+        assertThat(isImeShowing(activity.getRootWindowInsets())).isTrue();
+    }
+
+    @Test
+    public void testTextView_clickTwiceWithShowFillDialog_showIme() throws Exception {
+        // Enable feature and test service
+        enableFillDialogFeature(sContext);
+        enableService();
+
+        // Set response with a dataset > fill dialog should have two buttons
+        final CannedFillResponse.Builder builder = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("Dropdown Presentation"))
+                        .setDialogPresentation(createPresentation("Dialog Presentation"))
+                        .build())
+                .setDialogHeader(createPresentation("Dialog Header"))
+                .setDialogTriggerIds(ID_PASSWORD);
+        sReplier.addResponse(builder.build());
+
+        // Start activity and autofill
+        LoginActivity activity = startLoginActivity();
+        mUiBot.waitForIdleSync();
+        sReplier.getNextFillRequest();
+        mUiBot.waitForIdleSync();
+
+        // Click on password field to trigger fill dialog
+        mUiBot.selectByRelativeIdFromUiDevice(ID_PASSWORD);
+        mUiBot.waitForIdleSync();
+
+        mUiBot.assertFillDialogDatasets("Dialog Presentation");
+
+        // Click on password field again
+        mUiBot.selectByRelativeIdFromUiDevice(ID_PASSWORD);
+        mUiBot.waitForIdleSync();
+
+        // Verify IME is shown
+        assertThat(isImeShowing(activity.getRootWindowInsets())).isTrue();
+    }
+
+    @Test
+    public void testShowFillDialog() throws Exception {
+        // Enable feature and test service
+        enableFillDialogFeature(sContext);
+        enableService();
+
+        // Set response with a dataset > fill dialog should have two buttons
+        final CannedFillResponse.Builder builder = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("Dropdown Presentation"))
+                        .setDialogPresentation(createPresentation("Dialog Presentation"))
+                        .build())
+                .setDialogHeader(createPresentation("Dialog Header"))
+                .setDialogTriggerIds(ID_PASSWORD);
+        sReplier.addResponse(builder.build());
+
+        // Start activity and autofill
+        LoginActivity activity = startLoginActivity();
+        mUiBot.waitForIdleSync();
+
+        // Check onFillRequest has the flag: FLAG_SUPPORTS_FILL_DIALOG
+        final FillRequest fillRequest = sReplier.getNextFillRequest();
+        assertHasFlags(fillRequest.flags, FLAG_SUPPORTS_FILL_DIALOG);
+        mUiBot.waitForIdleSync();
+
+        // Click on password field to trigger fill dialog
+        mUiBot.selectByRelativeIdFromUiDevice(ID_PASSWORD);
+        mUiBot.waitForIdleSync();
+
+        // Verify IME is not shown
+        assertThat(isImeShowing(activity.getRootWindowInsets())).isFalse();
+
+        // Verify the content of fill dialog, and then select dataset in fill dialog
+        mUiBot.assertFillDialogHeader("Dialog Header");
+        mUiBot.assertFillDialogRejectButton();
+        mUiBot.assertFillDialogAcceptButton();
+        final UiObject2 picker = mUiBot.assertFillDialogDatasets("Dialog Presentation");
+
+        // Set expected value, then select dataset
+        activity.expectAutoFill("dude", "sweet");
+        mUiBot.selectDataset(picker, "Dialog Presentation");
+
+        // Check the results.
+        activity.assertAutoFilled();
+    }
+
+    @Test
+    public void testShowFillDialog_twoSuggestions_oneButton() throws Exception {
+        // Enable feature and test service
+        enableFillDialogFeature(sContext);
+        enableService();
+
+        // Set response with two datasets > fill dialog should only one button
+        final CannedFillResponse.Builder builder = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("Dropdown Presentation"))
+                        .setDialogPresentation(createPresentation("Dialog Presentation"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "DUDE")
+                        .setField(ID_PASSWORD, "SWEET")
+                        .setPresentation(createPresentation("Dropdown Presentation2"))
+                        .setDialogPresentation(createPresentation("Dialog Presentation2"))
+                        .build())
+                .setDialogHeader(createPresentation("Dialog Header"))
+                .setDialogTriggerIds(ID_PASSWORD);
+        sReplier.addResponse(builder.build());
+
+        // Trigger autofill on the password field and verify fill dialog is shown
+        LoginActivity activity = startLoginActivity();
+        mUiBot.waitForIdleSync();
+        sReplier.getNextFillRequest();
+        mUiBot.waitForIdleSync();
+
+        // Click on password field
+        mUiBot.selectByRelativeIdFromUiDevice(ID_PASSWORD);
+        mUiBot.waitForIdleSync();
+
+        // Verify IME is not shown
+        assertThat(isImeShowing(activity.getRootWindowInsets())).isFalse();
+        // Verify the content of fill dialog
+        mUiBot.assertFillDialogHeader("Dialog Header");
+        mUiBot.assertFillDialogRejectButton();
+        mUiBot.assertFillDialogNoAcceptButton();
+        final UiObject2 picker =
+                mUiBot.assertFillDialogDatasets("Dialog Presentation", "Dialog Presentation2");
+
+        // Set expected value, then select dataset
+        activity.expectAutoFill("dude", "sweet");
+        mUiBot.selectDataset(picker, "Dialog Presentation");
+
+        // Check the results.
+        activity.assertAutoFilled();
+    }
+
+    @Test
+    public void testShowFillDialog_switchToUnsupportedField_fallbackDropdown() throws Exception {
+        // Enable feature and test service
+        enableFillDialogFeature(sContext);
+        enableService();
+
+        // Set response
+        final CannedFillResponse.Builder builder = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("Dropdown Presentation"))
+                        .setDialogPresentation(createPresentation("Dialog presentation"))
+                        .build())
+                .setDialogHeader(createPresentation("Dialog Header"))
+                .setDialogTriggerIds(ID_PASSWORD);
+        sReplier.addResponse(builder.build());
+
+        // Trigger autofill on the password field and verify fill dialog is shown.
+        LoginActivity activity = startLoginActivity();
+        mUiBot.waitForIdleSync();
+        sReplier.getNextFillRequest();
+        mUiBot.waitForIdleSync();
+
+        mUiBot.selectByRelativeIdFromUiDevice(ID_PASSWORD);
+        mUiBot.waitForIdleSync();
+
+        mUiBot.assertFillDialogDatasets("Dialog presentation");
+        // Verify IME is not shown
+        assertThat(isImeShowing(activity.getRootWindowInsets())).isFalse();
+
+        // Click on username field, and verify dropdown UI is shown
+        mUiBot.selectByRelativeIdFromUiDevice(ID_USERNAME);
+        mUiBot.waitForIdleSync();
+
+        mUiBot.assertDatasets("Dropdown Presentation");
+        // Verify IME is shown
+        assertThat(isImeShowing(activity.getRootWindowInsets())).isTrue();
+
+        // Verify dropdown UI works
+        activity.expectAutoFill("dude", "sweet");
+        mUiBot.selectDataset("Dropdown Presentation");
+
+        activity.assertAutoFilled();
+    }
+
+    @Test
+    public void testFillDialog_fromUnsupportedFieldSwitchToSupported_noFillDialog()
+            throws Exception {
+        // Enable feature and test service
+        enableFillDialogFeature(sContext);
+        enableService();
+
+        // Set response
+        final CannedFillResponse.Builder builder = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("Dropdown Presentation"))
+                        .setDialogPresentation(createPresentation("Dialog presentation"))
+                        .build())
+                .setDialogHeader(createPresentation("Dialog Header"))
+                .setDialogTriggerIds(ID_PASSWORD);
+        sReplier.addResponse(builder.build());
+
+        // Start activity and autofill
+        LoginActivity activity = startLoginActivity();
+        mUiBot.waitForIdleSync();
+        sReplier.getNextFillRequest();
+        mUiBot.waitForIdleSync();
+
+        // Click on username field, and verify dropdown UI is shown.
+        mUiBot.selectByRelativeIdFromUiDevice(ID_USERNAME);
+        mUiBot.waitForIdleSync();
+
+        mUiBot.assertDatasets("Dropdown Presentation");
+        // Verify IME is shown
+        assertThat(isImeShowing(activity.getRootWindowInsets())).isTrue();
+
+        // Click on password field and verify dropdown is still shown
+        // can't use mUiBot.selectByRelativeId(ID_PASSWORD), because will click on dropdown UI
+        activity.onPassword(View::requestFocus);
+        mUiBot.waitForIdleSync();
+
+        // Verify IME is shown
+        assertThat(isImeShowing(activity.getRootWindowInsets())).isTrue();
+
+        // Verify dropdown UI actually works in this case.
+        activity.expectAutoFill("dude", "sweet");
+        mUiBot.selectDataset("Dropdown Presentation");
+
+        activity.assertAutoFilled();
+    }
+
+    @Test
+    public void testShowFillDialog_datasetNoDialogPresentation_notShownInDialog() throws Exception {
+        // Enable feature and test service
+        enableFillDialogFeature(sContext);
+        enableService();
+
+        // Set response with one dataset is no dialog presentation
+        final CannedFillResponse.Builder builder = new CannedFillResponse.Builder()
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setField(ID_PASSWORD, "sweet")
+                        .setPresentation(createPresentation("Dropdown Presentation"))
+                        .setDialogPresentation(createPresentation("Dialog Presentation"))
+                        .build())
+                .addDataset(new CannedDataset.Builder()
+                        .setField(ID_USERNAME, "DUDE")
+                        .setField(ID_PASSWORD, "SWEET")
+                        .setPresentation(createPresentation("Dropdown Presentation2"))
+                        .build())
+                .setDialogHeader(createPresentation("Dialog Header"))
+                .setDialogTriggerIds(ID_PASSWORD);
+        sReplier.addResponse(builder.build());
+
+        // Start activity and autofill
+        LoginActivity activity = startLoginActivity();
+        mUiBot.waitForIdleSync();
+        sReplier.getNextFillRequest();
+        mUiBot.waitForIdleSync();
+
+        // Click on password field to trigger fill dialog, then select
+        mUiBot.selectByRelativeIdFromUiDevice(ID_PASSWORD);
+        mUiBot.waitForIdleSync();
+        activity.expectAutoFill("dude", "sweet");
+        mUiBot.selectFillDialogDataset("Dialog Presentation");
+
+        activity.assertAutoFilled();
+    }
+}
diff --git a/tests/autofillservice/src/android/autofillservice/cts/dropdown/FillEventHistoryTest.java b/tests/autofillservice/src/android/autofillservice/cts/dropdown/FillEventHistoryTest.java
index 850a4e3..1f5dba1 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/dropdown/FillEventHistoryTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/dropdown/FillEventHistoryTest.java
@@ -26,6 +26,7 @@
 import static android.autofillservice.cts.testcore.Helper.assertFillEventForSaveShown;
 import static android.autofillservice.cts.testcore.Helper.findAutofillIdByResourceId;
 import static android.service.autofill.FillEventHistory.Event.TYPE_CONTEXT_COMMITTED;
+import static android.service.autofill.FillEventHistory.Event.UI_TYPE_MENU;
 import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_PASSWORD;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -143,7 +144,7 @@
         // Verify dataset selection
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), NULL_DATASET_ID);
         }
 
@@ -159,9 +160,9 @@
         // ...and check again
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(3);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), NULL_DATASET_ID);
-            assertFillEventForDatasetShown(events.get(2));
+            assertFillEventForDatasetShown(events.get(2), UI_TYPE_MENU);
         }
     }
 
@@ -197,7 +198,7 @@
         // Verify dataset selection
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), NULL_DATASET_ID);
         }
 
@@ -212,7 +213,7 @@
         // ...and check again
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(3);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), NULL_DATASET_ID);
 
             FillEventHistory.Event event2 = events.get(2);
@@ -261,7 +262,7 @@
         // Verify dataset selection
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), "id2");
         }
 
@@ -276,7 +277,7 @@
         // ...and check again
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(3);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), "id2");
 
             final FillEventHistory.Event event2 = events.get(2);
@@ -324,7 +325,7 @@
         // Verify history
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(1);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
         }
         // Enter values not present at the datasets
         mActivity.onUsername((v) -> v.setText("USERNAME"));
@@ -339,7 +340,7 @@
         // Verify history again
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             final Event event = events.get(1);
             assertThat(event.getType()).isEqualTo(TYPE_CONTEXT_COMMITTED);
             assertThat(event.getDatasetId()).isNull();
@@ -386,7 +387,7 @@
         // Verify dataset selection
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), "id1");
         }
 
@@ -402,10 +403,10 @@
         // ...and check again
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(4);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), "id1");
 
-            assertFillEventForDatasetShown(events.get(2));
+            assertFillEventForDatasetShown(events.get(2), UI_TYPE_MENU);
             final FillEventHistory.Event event2 = events.get(3);
             assertThat(event2.getType()).isEqualTo(TYPE_CONTEXT_COMMITTED);
             assertThat(event2.getDatasetId()).isNull();
@@ -456,7 +457,7 @@
         {
             // Verify fill history
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), "id1");
         }
 
@@ -471,9 +472,9 @@
             // Verify fill history
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(4);
 
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), "id1");
-            assertFillEventForDatasetShown(events.get(2));
+            assertFillEventForDatasetShown(events.get(2), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(3), "id2");
         }
 
@@ -489,12 +490,12 @@
             // Verify fill history
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(6);
 
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), "id1");
-            assertFillEventForDatasetShown(events.get(2));
+            assertFillEventForDatasetShown(events.get(2), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(3), "id2");
 
-            assertFillEventForDatasetShown(events.get(4));
+            assertFillEventForDatasetShown(events.get(4), UI_TYPE_MENU);
             final FillEventHistory.Event event3 = events.get(5);
             assertThat(event3.getType()).isEqualTo(TYPE_CONTEXT_COMMITTED);
             assertThat(event3.getDatasetId()).isNull();
@@ -542,7 +543,7 @@
         {
             // Verify fill history
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), "id1");
         }
 
@@ -557,9 +558,9 @@
             // Verify fill history
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(4);
 
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), "id1");
-            assertFillEventForDatasetShown(events.get(2));
+            assertFillEventForDatasetShown(events.get(2), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(3), "id2");
         }
 
@@ -573,9 +574,9 @@
             // Verify fill history
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(5);
 
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), "id1");
-            assertFillEventForDatasetShown(events.get(2));
+            assertFillEventForDatasetShown(events.get(2), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(3), "id2");
 
             final FillEventHistory.Event event3 = events.get(4);
@@ -620,7 +621,7 @@
         // Verify dataset selection
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), "id1");
         }
 
@@ -640,9 +641,9 @@
         // ...and check again
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(4);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             assertFillEventForDatasetSelected(events.get(1), "id1");
-            assertFillEventForDatasetShown(events.get(2));
+            assertFillEventForDatasetShown(events.get(2), UI_TYPE_MENU);
 
             FillEventHistory.Event event4 = events.get(3);
             assertThat(event4.getType()).isEqualTo(TYPE_CONTEXT_COMMITTED);
@@ -687,7 +688,7 @@
         // Verify history
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(1);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
         }
 
         // Enter values present at the datasets
@@ -703,7 +704,7 @@
         // Verify history
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
             FillEventHistory.Event event = events.get(1);
             assertThat(event.getType()).isEqualTo(TYPE_CONTEXT_COMMITTED);
             assertThat(event.getDatasetId()).isNull();
@@ -763,7 +764,7 @@
         // Verify history
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(1);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
         }
 
         // Enter values present at the datasets
@@ -779,7 +780,7 @@
         // Verify history
         {
             final List<Event> events = InstrumentedAutoFillService.getFillEvents(2);
-            assertFillEventForDatasetShown(events.get(0));
+            assertFillEventForDatasetShown(events.get(0), UI_TYPE_MENU);
 
             final FillEventHistory.Event event = events.get(1);
             assertThat(event.getType()).isEqualTo(TYPE_CONTEXT_COMMITTED);
diff --git a/tests/autofillservice/src/android/autofillservice/cts/dropdown/LoginActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/dropdown/LoginActivityTest.java
index 1880ed3..34e1eb1 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/dropdown/LoginActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/dropdown/LoginActivityTest.java
@@ -2004,7 +2004,7 @@
                 mContext.unregisterReceiver(this);
                 latch.countDown();
             }
-        }, intentFilter);
+        }, intentFilter, Context.RECEIVER_NOT_EXPORTED);
 
         // Trigger the negative button.
         mUiBot.saveForAutofill(style, /* yesDoIt= */ false, SAVE_DATA_TYPE_PASSWORD);
diff --git a/tests/autofillservice/src/android/autofillservice/cts/dropdown/VirtualContainerActivityCompatModeTest.java b/tests/autofillservice/src/android/autofillservice/cts/dropdown/VirtualContainerActivityCompatModeTest.java
index 66ab8aa..3dc464d 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/dropdown/VirtualContainerActivityCompatModeTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/dropdown/VirtualContainerActivityCompatModeTest.java
@@ -26,10 +26,8 @@
 import static android.autofillservice.cts.testcore.Helper.getContext;
 import static android.autofillservice.cts.testcore.InstrumentedAutoFillServiceCompatMode.SERVICE_NAME;
 import static android.autofillservice.cts.testcore.InstrumentedAutoFillServiceCompatMode.SERVICE_PACKAGE;
-import static android.provider.Settings.Global.AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES;
 import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_PASSWORD;
-
-import static com.android.compatibility.common.util.SettingsUtils.NAMESPACE_GLOBAL;
+import static android.view.autofill.AutofillManager.DEVICE_CONFIG_AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -45,13 +43,13 @@
 import android.os.SystemClock;
 import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.Presubmit;
+import android.provider.DeviceConfig;
 import android.service.autofill.SaveInfo;
 
-import com.android.compatibility.common.util.SettingsStateChangerRule;
-import com.android.compatibility.common.util.SettingsUtils;
+import com.android.compatibility.common.util.DeviceConfigStateHelper;
 
 import org.junit.After;
-import org.junit.ClassRule;
+import org.junit.Before;
 import org.junit.Test;
 
 /**
@@ -60,18 +58,23 @@
  */
 public class VirtualContainerActivityCompatModeTest extends VirtualContainerActivityTest {
 
-    @ClassRule
-    public static final SettingsStateChangerRule sCompatModeChanger = new SettingsStateChangerRule(
-            sContext, NAMESPACE_GLOBAL, AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES,
-            SERVICE_PACKAGE + "[my_url_bar]");
+    private final DeviceConfigStateHelper mAutofillDeviceConfig =
+            new DeviceConfigStateHelper(DeviceConfig.NAMESPACE_AUTOFILL);
 
     public VirtualContainerActivityCompatModeTest() {
         super(true);
     }
 
+    @Before
+    public void setCompatMode() {
+        mAutofillDeviceConfig.set(DEVICE_CONFIG_AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES,
+                SERVICE_PACKAGE + "[my_url_bar]");
+    }
+
     @After
     public void resetCompatMode() {
         sContext.getApplicationContext().setAutofillOptions(null);
+        mAutofillDeviceConfig.restoreOriginalValues();
     }
 
     @Override
@@ -106,7 +109,7 @@
     @Presubmit
     @Test
     public void testMultipleUrlBars_firstDoesNotExist() throws Exception {
-        SettingsUtils.syncSet(sContext, NAMESPACE_GLOBAL, AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES,
+        mAutofillDeviceConfig.set(DEVICE_CONFIG_AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES,
                 SERVICE_PACKAGE + "[first_am_i,my_url_bar]");
 
         // Set service.
@@ -131,7 +134,7 @@
     @Test
     @AppModeFull(reason = "testMultipleUrlBars_firstDoesNotExist() is enough")
     public void testMultipleUrlBars_bothExist() throws Exception {
-        SettingsUtils.syncSet(sContext, NAMESPACE_GLOBAL, AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES,
+        mAutofillDeviceConfig.set(DEVICE_CONFIG_AUTOFILL_COMPAT_MODE_ALLOWED_PACKAGES,
                 SERVICE_PACKAGE + "[my_url_bar,my_url_bar2]");
 
         // Set service.
@@ -286,7 +289,7 @@
         // Fill in some stuff
         mActivity.mUsername.setText("foo");
         sReplier.addResponse(CannedFillResponse.NO_RESPONSE);
-        SystemClock.sleep(300);
+        SystemClock.sleep(Timeouts.FILL_TIMEOUT.ms());
         focusToPasswordExpectNoWindowEvent();
         sReplier.getNextFillRequest();
         mActivity.mPassword.setText("bar");
diff --git a/tests/autofillservice/src/android/autofillservice/cts/inline/InlineAugmentedLoginActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/inline/InlineAugmentedLoginActivityTest.java
index 98d633a..e3c343c 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/inline/InlineAugmentedLoginActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/inline/InlineAugmentedLoginActivityTest.java
@@ -24,6 +24,7 @@
 import static android.autofillservice.cts.testcore.Helper.NULL_DATASET_ID;
 import static android.autofillservice.cts.testcore.Helper.assertFillEventForDatasetSelected;
 import static android.autofillservice.cts.testcore.Helper.assertFillEventForDatasetShown;
+import static android.service.autofill.FillEventHistory.Event.UI_TYPE_INLINE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -96,7 +97,8 @@
         final FillEventHistory history = augmentedService.getFillEventHistory(2);
         assertThat(history).isNotNull();
         final List<Event> events = history.getEvents();
-        assertFillEventForDatasetShown(events.get(0), CLIENT_STATE_KEY, CLIENT_STATE_VALUE);
+        assertFillEventForDatasetShown(events.get(0), CLIENT_STATE_KEY,
+                CLIENT_STATE_VALUE, UI_TYPE_INLINE);
         assertFillEventForDatasetSelected(events.get(1), NULL_DATASET_ID, CLIENT_STATE_KEY,
                 CLIENT_STATE_VALUE);
     }
diff --git a/tests/autofillservice/src/android/autofillservice/cts/inline/InlineAuthenticationTest.java b/tests/autofillservice/src/android/autofillservice/cts/inline/InlineAuthenticationTest.java
index 1ce3a8f..bd416b9 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/inline/InlineAuthenticationTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/inline/InlineAuthenticationTest.java
@@ -40,6 +40,7 @@
 import android.autofillservice.cts.testcore.UiBot;
 import android.content.IntentSender;
 import android.platform.test.annotations.AppModeFull;
+import android.platform.test.annotations.FlakyTest;
 import android.platform.test.annotations.Presubmit;
 import android.view.inputmethod.InlineSuggestionsRequest;
 
@@ -177,6 +178,7 @@
     }
 
     @Test
+    @FlakyTest(bugId = 185876679)
     @AppModeFull(reason = "testDatasetAuthTwoFields() is enough")
     public void testDatasetAuthTwoFieldsUserCancelsFirstAttempt() throws Exception {
         datasetAuthTwoFields(/* cancelFirstAttempt */ true);
diff --git a/tests/autofillservice/src/android/autofillservice/cts/inline/InlineFillEventHistoryTest.java b/tests/autofillservice/src/android/autofillservice/cts/inline/InlineFillEventHistoryTest.java
index 65eca39..4d1ecdb 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/inline/InlineFillEventHistoryTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/inline/InlineFillEventHistoryTest.java
@@ -25,6 +25,7 @@
 import static android.autofillservice.cts.testcore.Helper.assertNoDeprecatedClientState;
 import static android.autofillservice.cts.testcore.Helper.getContext;
 import static android.autofillservice.cts.testcore.InstrumentedAutoFillServiceInlineEnabled.SERVICE_NAME;
+import static android.service.autofill.FillEventHistory.Event.UI_TYPE_INLINE;
 import static android.service.autofill.SaveInfo.SAVE_DATA_TYPE_GENERIC;
 
 import android.autofillservice.cts.activities.LoginActivity;
@@ -120,9 +121,9 @@
         final FillEventHistory selection = InstrumentedAutoFillService.getFillEventHistory(4);
         assertNoDeprecatedClientState(selection);
         final List<Event> events = selection.getEvents();
-        assertFillEventForDatasetShown(events.get(0));
+        assertFillEventForDatasetShown(events.get(0), UI_TYPE_INLINE);
         assertFillEventForDatasetSelected(events.get(1), NULL_DATASET_ID);
-        assertFillEventForDatasetShown(events.get(0));
+        assertFillEventForDatasetShown(events.get(0), UI_TYPE_INLINE);
         assertFillEventForSaveShown(events.get(3), NULL_DATASET_ID);
     }
 }
diff --git a/tests/autofillservice/src/android/autofillservice/cts/inline/InlineLoginActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/inline/InlineLoginActivityTest.java
index f1e039d..2854c02 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/inline/InlineLoginActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/inline/InlineLoginActivityTest.java
@@ -33,7 +33,9 @@
 
 import static org.junit.Assume.assumeTrue;
 
+import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.PendingIntent;
+import android.app.UiAutomation;
 import android.autofillservice.cts.activities.DummyActivity;
 import android.autofillservice.cts.activities.NonAutofillableActivity;
 import android.autofillservice.cts.activities.UsernameOnlyActivity;
@@ -50,6 +52,9 @@
 import android.platform.test.annotations.Presubmit;
 import android.service.autofill.FillContext;
 import android.support.test.uiautomator.Direction;
+import android.view.accessibility.AccessibilityManager;
+
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.cts.mockime.ImeEventStream;
 import com.android.cts.mockime.MockImeSession;
@@ -57,6 +62,9 @@
 import org.junit.Test;
 import org.junit.rules.TestRule;
 
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
 @Presubmit
 public class InlineLoginActivityTest extends LoginActivityCommonTestCase {
 
@@ -374,6 +382,70 @@
     }
 
     @Test
+    public void testImeDisableInlineSuggestions_fallbackDropdownUi() throws Exception {
+        // Set service.
+        enableService();
+
+        final MockImeSession mockImeSession = sMockImeSessionRule.getMockImeSession();
+        assumeTrue("MockIME not available", mockImeSession != null);
+
+        // Disable inline suggestions for the default service.
+        final Bundle bundle = new Bundle();
+        bundle.putBoolean("InlineSuggestions", false);
+        mockImeSession.callSetInlineSuggestionsExtras(bundle);
+
+        final CannedFillResponse.Builder builder = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setPresentation(createPresentation("The Username"))
+                        .setInlinePresentation(createInlinePresentation("The Username"))
+                        .build());
+        sReplier.addResponse(builder.build());
+
+        // Trigger auto-fill.
+        mUiBot.selectByRelativeId(ID_USERNAME);
+        mUiBot.waitForIdleSync();
+
+        // Check that no inline requests are sent to the service.
+        final InstrumentedAutoFillService.FillRequest request = sReplier.getNextFillRequest();
+        assertThat(request.inlineRequest).isNull();
+
+        // Check dropdown UI shown.
+        getDropdownUiBot().assertDatasets("The Username");
+    }
+
+    @Test
+    public void testTouchExplorationEnabledImeSupportInline_inlineShown() throws Exception {
+        enableTouchExploration();
+
+        enableService();
+
+        final CannedFillResponse.Builder builder = new CannedFillResponse.Builder()
+                .addDataset(new CannedFillResponse.CannedDataset.Builder()
+                        .setField(ID_USERNAME, "dude")
+                        .setPresentation(createPresentation("The Username"))
+                        .setInlinePresentation(createInlinePresentation("The Username"))
+                        .build());
+        sReplier.addResponse(builder.build());
+
+        try {
+            // Trigger auto-fill.
+            mUiBot.selectByRelativeId(ID_USERNAME);
+            mUiBot.waitForIdleSync();
+
+            final InstrumentedAutoFillService.FillRequest request = sReplier.getNextFillRequest();
+            assertThat(request.inlineRequest).isNotNull();
+
+            // Check datasets shown.
+            mUiBot.assertDatasets("The Username");
+        } catch (Exception e) {
+            throw e;
+        } finally {
+            resetTouchExploration();
+        }
+    }
+
+    @Test
     public void testScrollSuggestionView() throws Exception {
         // Set service.
         enableService();
@@ -518,4 +590,55 @@
         SystemClock.sleep(500);
         Helper.assertActiveViewCountFromInlineSuggestionRenderService(0);
     }
+
+    private void enableTouchExploration() throws InterruptedException {
+        toggleTouchExploration(/*enable=*/ true);
+    }
+
+    private void resetTouchExploration() throws InterruptedException {
+        toggleTouchExploration(/*enable=*/ false);
+    }
+
+    private void toggleTouchExploration(boolean enable)
+            throws InterruptedException {
+        final AccessibilityManager manager =
+                getContext().getSystemService(AccessibilityManager.class);
+        if (isTouchExplorationEnabled(manager) == enable) {
+            return;
+        }
+
+        final CountDownLatch latch = new CountDownLatch(1);
+        AccessibilityManager.TouchExplorationStateChangeListener serviceListener =
+                (boolean newState) -> {
+                    if (newState == enable) {
+                        latch.countDown();
+                    }
+                };
+        manager.addTouchExplorationStateChangeListener(serviceListener);
+
+        final UiAutomation uiAutomation =
+                InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        final AccessibilityServiceInfo info = uiAutomation.getServiceInfo();
+        assert info != null;
+        if (enable) {
+            info.flags |= AccessibilityServiceInfo.FLAG_REQUEST_TOUCH_EXPLORATION_MODE;
+        } else {
+            info.flags &= ~AccessibilityServiceInfo.FLAG_REQUEST_TOUCH_EXPLORATION_MODE;
+        }
+        uiAutomation.setServiceInfo(info);
+
+        // Wait for touch exploration state to be toggled
+        assertThat(latch.await(10, TimeUnit.SECONDS)).isTrue();
+
+        if (enable) {
+            assertThat(isTouchExplorationEnabled(manager)).isTrue();
+        } else {
+            assertThat(isTouchExplorationEnabled(manager)).isFalse();
+        }
+        manager.removeTouchExplorationStateChangeListener(serviceListener);
+    }
+
+    private static boolean isTouchExplorationEnabled(AccessibilityManager manager) {
+        return manager.isEnabled() && manager.isTouchExplorationEnabled();
+    }
 }
diff --git a/tests/autofillservice/src/android/autofillservice/cts/inline/InlineSimpleSaveActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/inline/InlineSimpleSaveActivityTest.java
index d07f95b..75c28e2 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/inline/InlineSimpleSaveActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/inline/InlineSimpleSaveActivityTest.java
@@ -92,10 +92,8 @@
         mUiBot.assertNoDatasetsEver();
 
         // Change input
-        final SimpleSaveActivity.FillExpectation changeExpectation =
-                mActivity.expectInputTextChange("ID");
-        mActivity.syncRunOnUiThread(() -> mActivity.getInput().setText("ID"));
-        changeExpectation.assertTextChange();
+        mActivity.setTextAndWaitTextChange(/* input= */ "ID", /* password= */  null);
+
 
         // Trigger save UI.
         mUiBot.selectByRelativeId(ID_COMMIT);
@@ -147,10 +145,7 @@
         fillExpectation.assertAutoFilled();
 
         // Change input
-        final SimpleSaveActivity.FillExpectation changeExpectation =
-                mActivity.expectInputTextChange("ID");
-        mActivity.syncRunOnUiThread(() -> mActivity.getInput().setText("ID"));
-        changeExpectation.assertTextChange();
+        mActivity.setTextAndWaitTextChange(/* input= */ "ID", /* password= */  null);
 
         // Trigger save UI.
         mUiBot.selectByRelativeId(ID_COMMIT);
diff --git a/tests/autofillservice/src/android/autofillservice/cts/saveui/OnClickActionTest.java b/tests/autofillservice/src/android/autofillservice/cts/saveui/OnClickActionTest.java
index 8282fec..2d764bc 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/saveui/OnClickActionTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/saveui/OnClickActionTest.java
@@ -117,9 +117,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "42", /* password= */  "108");
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("42");
-            mActivity.mPassword.setText("108");
             mActivity.mCommit.performClick();
         });
         final UiObject2 saveUi = mUiBot.assertSaveShowing(SAVE_DATA_TYPE_GENERIC);
diff --git a/tests/autofillservice/src/android/autofillservice/cts/saveui/OptionalSaveActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/saveui/OptionalSaveActivityTest.java
index 1e38ae4..32310801 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/saveui/OptionalSaveActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/saveui/OptionalSaveActivityTest.java
@@ -752,10 +752,13 @@
         mActivity.assertAutoFilled();
 
         // Change required and optional field.
+        mActivity.expectTextChange(/* address1= */ null, /* address2= */
+                "Simpsons House", /* city= */ "Shelbyville", /* favColor= */ null);
         mActivity.syncRunOnUiThread(() -> {
             mActivity.mAddress2.setText("Simpsons House");
             mActivity.mCity.setText("Shelbyville");
         });
+        mActivity.assertTextChange();
         // Trigger save...
         mActivity.save();
 
diff --git a/tests/autofillservice/src/android/autofillservice/cts/saveui/PreSimpleSaveActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/saveui/PreSimpleSaveActivityTest.java
index f7a9030..0ee330c 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/saveui/PreSimpleSaveActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/saveui/PreSimpleSaveActivityTest.java
@@ -69,7 +69,7 @@
     @Override
     protected void saveUiRestoredAfterTappingLinkTest(PostSaveLinkTappedAction type)
             throws Exception {
-        startActivity(false);
+        startActivity(/* remainOnRecents= */ false);
         // Set service.
         enableService();
 
@@ -85,10 +85,9 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
-        mActivity.syncRunOnUiThread(() -> {
-            mActivity.mPreInput.setText("108");
-            mActivity.mSubmit.performClick();
-        });
+        mActivity.setTextAndWaitTextChange("108");
+        mActivity.syncRunOnUiThread(() -> mActivity.mSubmit.performClick());
+
         // Make sure post-save activity is shown...
         mUiBot.assertShownByRelativeId(ID_INPUT);
 
@@ -128,7 +127,7 @@
     @Override
     protected void tapLinkThenTapBackThenStartOverTest(PostSaveLinkTappedAction action,
             boolean manualRequest) throws Exception {
-        startActivity(false);
+        startActivity(/* remainOnRecents= */ false);
         // Set service.
         enableService();
 
@@ -144,10 +143,9 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
-        mActivity.syncRunOnUiThread(() -> {
-            mActivity.mPreInput.setText("108");
-            mActivity.mSubmit.performClick();
-        });
+        mActivity.setTextAndWaitTextChange("108");
+        mActivity.syncRunOnUiThread(() -> mActivity.mSubmit.performClick());
+
         // Make sure post-save activity is shown...
         mUiBot.assertShownByRelativeId(ID_INPUT);
 
@@ -203,10 +201,9 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
-        newActivty.syncRunOnUiThread(() -> {
-            newActivty.mInput.setText("42");
-            newActivty.mCommit.performClick();
-        });
+        newActivty.setTextAndWaitTextChange(/* input= */ "42", /* password= */  null);
+        newActivty.syncRunOnUiThread(() -> newActivty.mCommit.performClick());
+
         // Make sure post-save activity is shown...
         mUiBot.assertShownByRelativeId(ID_INPUT);
 
@@ -221,7 +218,7 @@
     @Override
     protected void saveUiCancelledAfterTappingLinkTest(PostSaveLinkTappedAction type)
             throws Exception {
-        startActivity(false);
+        startActivity(/* remainOnRecents= */ false);
         // Set service.
         enableService();
 
@@ -237,10 +234,9 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
-        mActivity.syncRunOnUiThread(() -> {
-            mActivity.mPreInput.setText("108");
-            mActivity.mSubmit.performClick();
-        });
+        mActivity.setTextAndWaitTextChange("108");
+        mActivity.syncRunOnUiThread(() -> mActivity.mSubmit.performClick());
+
         // Make sure post-save activity is shown...
         mUiBot.assertShownByRelativeId(ID_INPUT);
 
@@ -276,7 +272,7 @@
     protected void tapLinkLaunchTrampolineActivityThenTapBackAndStartNewSessionTest()
             throws Exception {
         // Prepare activity.
-        startActivity(false);
+        startActivity(/* remainOnRecents= */ false);
         mActivity.mPreInput.getRootView()
                 .setImportantForAutofill(View.IMPORTANT_FOR_AUTOFILL_NO_EXCLUDE_DESCENDANTS);
 
@@ -295,10 +291,9 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
-        mActivity.syncRunOnUiThread(() -> {
-            mActivity.mPreInput.setText("108");
-            mActivity.mSubmit.performClick();
-        });
+        mActivity.setTextAndWaitTextChange("108");
+        mActivity.syncRunOnUiThread(() -> mActivity.mSubmit.performClick());
+
         final UiObject2 saveUi = assertSaveUiWithLinkIsShown(SAVE_DATA_TYPE_PASSWORD);
 
         // Tap the link.
@@ -329,10 +324,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
-        newActivty.syncRunOnUiThread(() -> {
-            newActivty.mInput.setText("42");
-            newActivty.mCommit.performClick();
-        });
+        newActivty.setTextAndWaitTextChange(/* input= */ "42", /* password= */  null);
+        newActivty.syncRunOnUiThread(() -> newActivty.mCommit.performClick());
         // Make sure post-save activity is shown...
         mUiBot.assertShownByRelativeId(ID_INPUT);
 
@@ -346,7 +339,7 @@
 
     @Override
     protected void tapLinkAfterUpdateAppliedTest(boolean updateLinkView) throws Exception {
-        startActivity(false);
+        startActivity(/* remainOnRecents= */ false);
         // Set service.
         enableService();
 
@@ -375,10 +368,9 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
-        mActivity.syncRunOnUiThread(() -> {
-            mActivity.mPreInput.setText("108");
-            mActivity.mSubmit.performClick();
-        });
+        mActivity.setTextAndWaitTextChange("108");
+        mActivity.syncRunOnUiThread(() -> mActivity.mSubmit.performClick());
+
         // Make sure post-save activity is shown...
         mUiBot.assertShownByRelativeId(ID_INPUT);
 
diff --git a/tests/autofillservice/src/android/autofillservice/cts/saveui/SimpleSaveActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/saveui/SimpleSaveActivityTest.java
index 65d85bf..b06a187 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/saveui/SimpleSaveActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/saveui/SimpleSaveActivityTest.java
@@ -142,13 +142,12 @@
         sReplier.getNextFillRequest();
 
         // Select dataset.
-        final FillExpectation autofillExpecation = mActivity.expectAutoFill("id", "pass");
+        final FillExpectation autofillExpectation = mActivity.expectAutoFill("id", "pass");
         mUiBot.selectDataset("YO");
-        autofillExpecation.assertAutoFilled();
+        autofillExpectation.assertAutoFilled();
 
+        mActivity.setTextAndWaitTextChange(/* input= */ "ID", /* password= */ "PASS");
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("ID");
-            mActivity.mPassword.setText("PASS");
             mActivity.mCommit.performClick();
         });
         final UiObject2 saveUi = mUiBot.assertUpdateShowing(SAVE_DATA_TYPE_GENERIC);
@@ -195,13 +194,12 @@
         Helper.assertEqualsToLargeString(hintsOnFill[2]);
 
         // Select dataset.
-        final FillExpectation autofillExpecation = mActivity.expectAutoFill("id", "pass");
+        final FillExpectation autofillExpectation = mActivity.expectAutoFill("id", "pass");
         mUiBot.selectDataset("YO");
-        autofillExpecation.assertAutoFilled();
+        autofillExpectation.assertAutoFilled();
 
+        mActivity.setTextAndWaitTextChange(/* input= */ "ID", /* password= */ "PASS");
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("ID");
-            mActivity.mPassword.setText("PASS");
             mActivity.mCommit.performClick();
         });
         final UiObject2 saveUi = mUiBot.assertUpdateShowing(SAVE_DATA_TYPE_GENERIC);
@@ -264,8 +262,11 @@
         assertWithMessage("wrong value for 'password'").that(visiblePassword).hasLength(4);
 
         // Trigger save...
+        final SimpleSaveActivity.FillExpectation changeExpectation =
+                mActivity.expectInputPasswordTextChange("ID", "PASS");
         input.setText("ID");
         password.setText("PASS");
+        changeExpectation.assertTextChange();
         mUiBot.assertShownByRelativeId(ID_COMMIT).click();
         mUiBot.updateForAutofill(true, SAVE_DATA_TYPE_GENERIC);
 
@@ -314,10 +315,9 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
-        mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
-            mActivity.mCommit.performClick();
-        });
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */  null);
+
+        mActivity.syncRunOnUiThread(() -> mActivity.mCommit.performClick());
         UiObject2 saveUi = mUiBot.assertSaveShowing(SAVE_DATA_TYPE_GENERIC);
 
         if (rotate) {
@@ -359,7 +359,7 @@
         sReplier.getNextFillRequest();
 
         // Set 1st field but don't commit session
-        mActivity.syncRunOnUiThread(() -> mActivity.mInput.setText("108"));
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mUiBot.assertSaveNotShowing();
 
         // 2nd request
@@ -375,10 +375,9 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
-        mActivity.syncRunOnUiThread(() -> {
-            mActivity.mPassword.setText("42");
-            mActivity.mCommit.performClick();
-        });
+        mActivity.setTextAndWaitTextChange(/* input= */ null, /* password= */ "42");
+
+        mActivity.syncRunOnUiThread(() -> mActivity.mCommit.performClick());
         final UiObject2 saveUi = mUiBot.assertSaveShowing(null, SAVE_DATA_TYPE_USERNAME,
                 SAVE_DATA_TYPE_PASSWORD);
 
@@ -415,10 +414,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger delayed save.
-        mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
-            mActivity.mCommit.performClick();
-        });
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
+        mActivity.syncRunOnUiThread(() -> mActivity.mCommit.performClick());
         mUiBot.assertSaveNotShowing();
 
         // 2nd fragment.
@@ -444,10 +441,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger delayed save.
-        mActivity.syncRunOnUiThread(() -> {
-            mActivity.mPassword.setText("42");
-            mActivity.mCommit.performClick();
-        });
+        mActivity.setTextAndWaitTextChange(/* input= */ null, /* password= */ "42");
+        mActivity.syncRunOnUiThread(() -> mActivity.mCommit.performClick());
 
         // Save it...
         mUiBot.saveForAutofill(true, SAVE_DATA_TYPE_USERNAME, SAVE_DATA_TYPE_PASSWORD);
@@ -485,8 +480,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
 
             // Disable autofill so it's not triggered again after WelcomeActivity finishes
@@ -520,8 +515,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
         });
 
@@ -581,8 +576,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
         });
 
@@ -604,8 +599,8 @@
                         .setPresentation(createPresentation("YO"))
                         .build())
                 .build());
+        mActivity.setTextAndWaitTextChange(/* input= */ "", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("");
             mActivity.getAutofillManager().requestAutofill(mActivity.mInput);
         });
         sReplier.getNextFillRequest();
@@ -637,8 +632,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
         });
         UiObject2 saveUi = mUiBot.assertSaveShowing(SAVE_DATA_TYPE_GENERIC);
@@ -691,8 +686,8 @@
         mActivity.getAutofillManager().cancel();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
         });
 
@@ -741,8 +736,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
         });
         mUiBot.assertSaveShowing(SAVE_DATA_TYPE_GENERIC);
@@ -834,8 +829,8 @@
         mUiBot.assertNoDatasetsEver();
 
         // Trigger save, but don't tap it.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
         });
         mUiBot.assertSaveShowing(SAVE_DATA_TYPE_GENERIC);
@@ -890,8 +885,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
         });
         final UiObject2 saveUi = assertSaveUiWithLinkIsShown(SAVE_DATA_TYPE_GENERIC);
@@ -958,8 +953,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
         });
         final UiObject2 saveUi = assertSaveUiWithLinkIsShown(SAVE_DATA_TYPE_GENERIC);
@@ -1013,8 +1008,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "42", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("42");
             mActivity.mCommit.performClick();
         });
 
@@ -1045,8 +1040,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
         });
         final UiObject2 saveUi = assertSaveUiWithLinkIsShown(SAVE_DATA_TYPE_GENERIC);
@@ -1120,9 +1115,8 @@
         mUiBot.selectDataset(picker2, "D2");
         autofillExpecation2.assertAutoFilled();
 
+        mActivity.setTextAndWaitTextChange(/* input= */ "ID", /* password= */ "PASS");
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("ID");
-            mActivity.mPassword.setText("PASS");
             mActivity.mCommit.performClick();
         });
         final UiObject2 saveUi = mUiBot.assertUpdateShowing(SAVE_DATA_TYPE_GENERIC);
@@ -1163,8 +1157,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
         });
         final UiObject2 saveUi = assertSaveUiWithLinkIsShown(SAVE_DATA_TYPE_GENERIC);
@@ -1194,8 +1188,8 @@
                 () -> mActivity.getAutofillManager().requestAutofill(mActivity.mPassword));
         sReplier.getNextFillRequest();
 
+        mActivity.setTextAndWaitTextChange(/* input= */ null, /* password= */ "42");
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mPassword.setText("42");
             mActivity.mCommit.performClick();
         });
         mUiBot.saveForAutofill(true, SAVE_DATA_TYPE_PASSWORD);
@@ -1233,6 +1227,7 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        // TODO: handle wait text change for ntiTrimmerTextWatcher
         mActivity.syncRunOnUiThread(() -> {
             mActivity.mInput.setText("id");
             mActivity.mPassword.setText("pass");
@@ -1275,9 +1270,8 @@
         mUiBot.assertNoDatasetsEver();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "#id#", /* password= */ "#pass#");
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("#id#");
-            mActivity.mPassword.setText("#pass#");
             mActivity.mCommit.performClick();
         });
 
@@ -1323,6 +1317,7 @@
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
 
+        // TODO: handle wait text change for ntiTrimmerTextWatcher
         mActivity.syncRunOnUiThread(() -> {
             mActivity.mInput.setText("id");
             mActivity.mPassword.setText("pass");
@@ -1361,9 +1356,8 @@
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
 
+        mActivity.setTextAndWaitTextChange(/* input= */ "id", /* password= */ "#pass#");
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("id");
-            mActivity.mPassword.setText("#pass#");
             mActivity.mCommit.performClick();
         });
 
@@ -1399,9 +1393,8 @@
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
 
+        mActivity.setTextAndWaitTextChange(/* input= */ "id", /* password= */ "pass");
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("id");
-            mActivity.mPassword.setText("pass");
             mActivity.mCommit.performClick();
         });
 
@@ -1439,9 +1432,8 @@
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
 
+        mActivity.setTextAndWaitTextChange(/* input= */ "id", /* password= */ "pass");
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("id");
-            mActivity.mPassword.setText("pass");
             mActivity.mCommit.performClick();
         });
 
@@ -1609,8 +1601,8 @@
         if (condition == SetTextCondition.NORMAL) {
             sReplier.getNextFillRequest();
 
+            mActivity.setTextAndWaitTextChange(/* input= */ "100", /* password= */ "pass");
             mActivity.syncRunOnUiThread(() -> {
-                mActivity.mInput.setText("100");
                 mActivity.mCommit.performClick();
             });
 
@@ -1662,7 +1654,7 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
-        mActivity.syncRunOnUiThread(() -> mActivity.mInput.setText("108"));
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
 
         // Take a screenshot to make sure button doesn't disappear.
         final String commitBefore = mUiBot.assertShownByRelativeId(ID_COMMIT).getText();
@@ -1724,8 +1716,8 @@
         mActivity.syncRunOnUiThread(() -> mActivity.mInput.requestFocus());
         sReplier.getNextFillRequest();
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
         });
         final UiObject2 saveUi;
@@ -1862,8 +1854,8 @@
         sReplier.getNextFillRequest();
 
         // Trigger save.
+        mActivity.setTextAndWaitTextChange(/* input= */ "108", /* password= */ null);
         mActivity.syncRunOnUiThread(() -> {
-            mActivity.mInput.setText("108");
             mActivity.mCommit.performClick();
         });
         // Waits for the commit be processed
diff --git a/tests/autofillservice/src/android/autofillservice/cts/testcore/CannedFillResponse.java b/tests/autofillservice/src/android/autofillservice/cts/testcore/CannedFillResponse.java
index 99ee293..6efe053 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/testcore/CannedFillResponse.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/testcore/CannedFillResponse.java
@@ -26,10 +26,12 @@
 import android.content.IntentSender;
 import android.os.Bundle;
 import android.service.autofill.Dataset;
+import android.service.autofill.Field;
 import android.service.autofill.FillCallback;
 import android.service.autofill.FillContext;
 import android.service.autofill.FillResponse;
 import android.service.autofill.InlinePresentation;
+import android.service.autofill.Presentations;
 import android.service.autofill.SaveInfo;
 import android.service.autofill.UserData;
 import android.util.Log;
@@ -98,6 +100,9 @@
     private final DoubleVisitor<List<FillContext>, FillResponse.Builder> mVisitor;
     private DoubleVisitor<List<FillContext>, SaveInfo.Builder> mSaveInfoVisitor;
     private final int[] mCancelIds;
+    private final String[] mDialogTriggerIds;
+    private final RemoteViews mDialogHeaderPresentation;
+
 
     private CannedFillResponse(Builder builder) {
         mResponseType = builder.mResponseType;
@@ -130,6 +135,8 @@
         mVisitor = builder.mVisitor;
         mSaveInfoVisitor = builder.mSaveInfoVisitor;
         mCancelIds = builder.mCancelIds;
+        mDialogTriggerIds = builder.mDialogTriggerIds;
+        mDialogHeaderPresentation = builder.mDialogHeaderPresentation;
     }
 
     /**
@@ -265,6 +272,13 @@
             mVisitor.visit(contexts, builder);
         }
         builder.setPresentationCancelIds(mCancelIds);
+        if (mDialogTriggerIds != null) {
+            builder.setFillDialogTriggerIds(
+                    getAutofillIds(nodeResolver, mDialogTriggerIds));
+        }
+        if (mDialogHeaderPresentation != null) {
+            builder.setDialogHeader(mDialogHeaderPresentation);
+        }
 
         final FillResponse response = builder.build();
         Log.v(TAG, "Response: " + response);
@@ -340,6 +354,9 @@
         private DoubleVisitor<List<FillContext>, FillResponse.Builder> mVisitor;
         private DoubleVisitor<List<FillContext>, SaveInfo.Builder> mSaveInfoVisitor;
         private int[] mCancelIds;
+        private String[] mDialogTriggerIds;
+        private RemoteViews mDialogHeaderPresentation;
+
 
         public Builder(ResponseType type) {
             mResponseType = type;
@@ -565,6 +582,22 @@
             mCancelIds = ids;
             return this;
         }
+
+        /**
+         * Sets the id of views which trigger the fill dialog.
+         */
+        public Builder setDialogTriggerIds(String... ids) {
+            mDialogTriggerIds = ids;
+            return this;
+        }
+
+        /**
+         * Sets the header of the fill dialog.
+         */
+        public Builder setDialogHeader(RemoteViews header) {
+            mDialogHeaderPresentation = header;
+            return this;
+        }
     }
 
     /**
@@ -585,10 +618,12 @@
     public static class CannedDataset {
         private final Map<String, AutofillValue> mFieldValues;
         private final Map<String, RemoteViews> mFieldPresentations;
+        private final Map<String, RemoteViews> mFieldDialogPresentations;
         private final Map<String, InlinePresentation> mFieldInlinePresentations;
         private final Map<String, InlinePresentation> mFieldInlineTooltipPresentations;
         private final Map<String, Pair<Boolean, Pattern>> mFieldFilters;
         private final RemoteViews mPresentation;
+        private final RemoteViews mDialogPresentation;
         private final InlinePresentation mInlinePresentation;
         private final InlinePresentation mInlineTooltipPresentation;
         private final IntentSender mAuthentication;
@@ -597,10 +632,12 @@
         private CannedDataset(Builder builder) {
             mFieldValues = builder.mFieldValues;
             mFieldPresentations = builder.mFieldPresentations;
+            mFieldDialogPresentations = builder.mFieldDialogPresentations;
             mFieldInlinePresentations = builder.mFieldInlinePresentations;
             mFieldInlineTooltipPresentations = builder.mFieldInlineTooltipPresentations;
             mFieldFilters = builder.mFieldFilters;
             mPresentation = builder.mPresentation;
+            mDialogPresentation = builder.mDialogPresentation;
             mInlinePresentation = builder.mInlinePresentation;
             mInlineTooltipPresentation = builder.mInlineTooltipPresentation;
             mAuthentication = builder.mAuthentication;
@@ -611,16 +648,29 @@
          * Creates a new dataset, replacing the field ids by the real ids from the assist structure.
          */
         public Dataset asDataset(Function<String, ViewNode> nodeResolver) {
-            final Dataset.Builder builder = mPresentation != null
-                    ? new Dataset.Builder(mPresentation)
-                    : new Dataset.Builder();
-            if (mInlinePresentation != null) {
-                if (mInlineTooltipPresentation != null) {
-                    builder.setInlinePresentation(mInlinePresentation, mInlineTooltipPresentation);
-                } else {
-                    builder.setInlinePresentation(mInlinePresentation);
-                }
+            final Presentations.Builder presentationsBuilder = new Presentations.Builder();
+            if (mPresentation != null) {
+                presentationsBuilder.setMenuPresentation(mPresentation);
             }
+            if (mDialogPresentation != null) {
+                presentationsBuilder.setDialogPresentation(mDialogPresentation);
+            }
+            if (mInlinePresentation != null) {
+                presentationsBuilder.setInlinePresentation(mInlinePresentation);
+            }
+            if (mInlineTooltipPresentation != null) {
+                presentationsBuilder.setInlineTooltipPresentation(mInlineTooltipPresentation);
+            }
+
+            Presentations presentations = null;
+            try {
+                presentations = presentationsBuilder.build();
+            } catch (IllegalStateException e) {
+                // No presentation in presentationsBuilder, do nothing.
+            }
+            final Dataset.Builder builder = presentations != null
+                    ? new Dataset.Builder(presentations)
+                    : new Dataset.Builder();
 
             if (mFieldValues != null) {
                 for (Map.Entry<String, AutofillValue> entry : mFieldValues.entrySet()) {
@@ -630,54 +680,41 @@
                         throw new AssertionError("No node with resource id " + id);
                     }
                     final AutofillId autofillId = node.getAutofillId();
+                    final Field.Builder fieldBuilder = new Field.Builder();
                     final AutofillValue value = entry.getValue();
+                    if (value != null) {
+                        fieldBuilder.setValue(value);
+                    }
+
+                    final Presentations.Builder fieldPresentationsBuilder =
+                            new Presentations.Builder();
                     final RemoteViews presentation = mFieldPresentations.get(id);
+                    if (presentation != null) {
+                        fieldPresentationsBuilder.setMenuPresentation(presentation);
+                    }
+                    final RemoteViews dialogPresentation = mFieldDialogPresentations.get(id);
+                    if (dialogPresentation != null) {
+                        fieldPresentationsBuilder.setDialogPresentation(dialogPresentation);
+                    }
                     final InlinePresentation inlinePresentation = mFieldInlinePresentations.get(id);
+                    if (inlinePresentation != null) {
+                        fieldPresentationsBuilder.setInlinePresentation(inlinePresentation);
+                    }
                     final InlinePresentation tooltipPresentation =
                             mFieldInlineTooltipPresentations.get(id);
-                    final Pair<Boolean, Pattern> filter = mFieldFilters.get(id);
-                    if (presentation != null) {
-                        if (filter == null) {
-                            if (inlinePresentation != null) {
-                                if (tooltipPresentation != null) {
-                                    builder.setValue(autofillId, value, presentation,
-                                            inlinePresentation, tooltipPresentation);
-                                } else {
-                                    builder.setValue(autofillId, value, presentation,
-                                            inlinePresentation);
-                                }
-                            } else {
-                                builder.setValue(autofillId, value, presentation);
-                            }
-                        } else {
-                            if (inlinePresentation != null) {
-                                if (tooltipPresentation != null) {
-                                    builder.setValue(autofillId, value, filter.second, presentation,
-                                            inlinePresentation, tooltipPresentation);
-                                } else {
-                                    builder.setValue(autofillId, value, filter.second, presentation,
-                                            inlinePresentation);
-                                }
-                            } else {
-                                builder.setValue(autofillId, value, filter.second, presentation);
-                            }
-                        }
-                    } else {
-                        if (inlinePresentation != null) {
-                            if (tooltipPresentation != null) {
-                                throw new IllegalStateException("presentation can not be null");
-                            } else {
-                                builder.setFieldInlinePresentation(autofillId, value,
-                                        filter != null ? filter.second : null, inlinePresentation);
-                            }
-                        } else {
-                            if (filter == null) {
-                                builder.setValue(autofillId, value);
-                            } else {
-                                builder.setValue(autofillId, value, filter.second);
-                            }
-                        }
+                    if (tooltipPresentation != null) {
+                        fieldPresentationsBuilder.setInlineTooltipPresentation(tooltipPresentation);
                     }
+                    try {
+                        fieldBuilder.setPresentations(fieldPresentationsBuilder.build());
+                    } catch (IllegalStateException e) {
+                        // no presentation in fieldPresentationsBuilder, nothing
+                    }
+                    final Pair<Boolean, Pattern> filter = mFieldFilters.get(id);
+                    if (filter != null) {
+                        fieldBuilder.setFilter(filter.second);
+                    }
+                    builder.setField(autofillId, fieldBuilder.build());
                 }
             }
             builder.setId(mId).setAuthentication(mAuthentication);
@@ -687,8 +724,10 @@
         @Override
         public String toString() {
             return "CannedDataset " + mId + " : [hasPresentation=" + (mPresentation != null)
+                    + ", hasDialogPresentation=" + (mDialogPresentation != null)
                     + ", hasInlinePresentation=" + (mInlinePresentation != null)
                     + ", fieldPresentations=" + (mFieldPresentations)
+                    + ", fieldDialogPresentations=" + (mFieldDialogPresentations)
                     + ", fieldInlinePresentations=" + (mFieldInlinePresentations)
                     + ", fieldTooltipInlinePresentations=" + (mFieldInlineTooltipPresentations)
                     + ", hasAuthentication=" + (mAuthentication != null)
@@ -699,6 +738,7 @@
         public static class Builder {
             private final Map<String, AutofillValue> mFieldValues = new HashMap<>();
             private final Map<String, RemoteViews> mFieldPresentations = new HashMap<>();
+            private final Map<String, RemoteViews> mFieldDialogPresentations = new HashMap<>();
             private final Map<String, InlinePresentation> mFieldInlinePresentations =
                     new HashMap<>();
             private final Map<String, InlinePresentation> mFieldInlineTooltipPresentations =
@@ -706,6 +746,7 @@
             private final Map<String, Pair<Boolean, Pattern>> mFieldFilters = new HashMap<>();
 
             private RemoteViews mPresentation;
+            private RemoteViews mDialogPresentation;
             private InlinePresentation mInlinePresentation;
             private IntentSender mAuthentication;
             private String mId;
@@ -825,6 +866,20 @@
              * {@link IdMode}.
              */
             public Builder setField(String id, String text, RemoteViews presentation,
+                    RemoteViews dialogPresentation) {
+                setField(id, text, presentation);
+                mFieldDialogPresentations.put(id, dialogPresentation);
+                return this;
+            }
+
+            /**
+             * Sets the canned value of a field based on its {@code id}.
+             *
+             * <p>The meaning of the id is defined by the object using the canned dataset.
+             * For example, {@link InstrumentedAutoFillService.Replier} resolves the id based on
+             * {@link IdMode}.
+             */
+            public Builder setField(String id, String text, RemoteViews presentation,
                     Pattern filter) {
                 setField(id, text, presentation);
                 mFieldFilters.put(id, new Pair<>(true, filter));
@@ -925,6 +980,14 @@
             }
 
             /**
+             * Sets the view to present the response in the UI.
+             */
+            public Builder setDialogPresentation(RemoteViews presentation) {
+                mDialogPresentation = presentation;
+                return this;
+            }
+
+            /**
              * Sets the authentication intent.
              */
             public Builder setAuthentication(IntentSender authentication) {
diff --git a/tests/autofillservice/src/android/autofillservice/cts/testcore/Helper.java b/tests/autofillservice/src/android/autofillservice/cts/testcore/Helper.java
index 1d519d7..20d9370 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/testcore/Helper.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/testcore/Helper.java
@@ -26,6 +26,7 @@
 import static android.service.autofill.FillEventHistory.Event.TYPE_DATASET_AUTHENTICATION_SELECTED;
 import static android.service.autofill.FillEventHistory.Event.TYPE_DATASET_SELECTED;
 import static android.service.autofill.FillEventHistory.Event.TYPE_SAVE_SHOWN;
+import static android.service.autofill.FillEventHistory.Event.UI_TYPE_UNKNOWN;
 
 import static com.android.compatibility.common.util.ShellUtils.runShellCommand;
 
@@ -50,6 +51,7 @@
 import android.icu.util.Calendar;
 import android.os.Bundle;
 import android.os.Environment;
+import android.provider.DeviceConfig;
 import android.provider.Settings;
 import android.service.autofill.FieldClassification;
 import android.service.autofill.FieldClassification.Match;
@@ -63,6 +65,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewStructure.HtmlInfo;
+import android.view.WindowInsets;
 import android.view.autofill.AutofillId;
 import android.view.autofill.AutofillManager;
 import android.view.autofill.AutofillManager.AutofillCallback;
@@ -77,6 +80,7 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.BitmapUtils;
+import com.android.compatibility.common.util.DeviceConfigStateManager;
 import com.android.compatibility.common.util.OneTimeSettingsListener;
 import com.android.compatibility.common.util.SettingsUtils;
 import com.android.compatibility.common.util.ShellUtils;
@@ -1109,6 +1113,13 @@
              .that(clientState).isNull();
     }
 
+    private static void assertFillEventPresentationType(FillEventHistory.Event event,
+            int expectedType) {
+        // TODO: assert UI_TYPE_UNKNOWN in other event type
+        assertThat(event.getUiType()).isNotEqualTo(UI_TYPE_UNKNOWN);
+        assertThat(event.getUiType()).isEqualTo(expectedType);
+    }
+
     /**
      * Asserts the content of a {@link android.service.autofill.FillEventHistory.Event}.
      *
@@ -1237,10 +1248,12 @@
      * @param event event to be asserted
      * @param key the only key expected in the client state bundle
      * @param value the only value expected in the client state bundle
+     * @param expectedPresentation the exptected ui presentation type
      */
     public static void assertFillEventForDatasetShown(@NonNull FillEventHistory.Event event,
-            @NonNull String key, @NonNull String value) {
+            @NonNull String key, @NonNull String value, int expectedPresentation) {
         assertFillEvent(event, TYPE_DATASETS_SHOWN, NULL_DATASET_ID, key, value, null);
+        assertFillEventPresentationType(event, expectedPresentation);
     }
 
     /**
@@ -1249,8 +1262,10 @@
      *
      * @param event event to be asserted
      */
-    public static void assertFillEventForDatasetShown(@NonNull FillEventHistory.Event event) {
+    public static void assertFillEventForDatasetShown(@NonNull FillEventHistory.Event event,
+            int expectedPresentation) {
         assertFillEvent(event, TYPE_DATASETS_SHOWN, NULL_DATASET_ID, null, null, null);
+        assertFillEventPresentationType(event, expectedPresentation);
     }
 
     /**
@@ -1630,6 +1645,26 @@
         context.getApplicationContext().setAutofillOptions(null);
     }
 
+    /**
+     * Enable fill dialog feature
+     */
+    public static  void enableFillDialogFeature(@NonNull Context context) {
+        DeviceConfigStateManager deviceConfigStateManager =
+                new DeviceConfigStateManager(context, DeviceConfig.NAMESPACE_AUTOFILL,
+                        AutofillManager.DEVICE_CONFIG_AUTOFILL_DIALOG_ENABLED);
+        deviceConfigStateManager.set("true");
+    }
+
+    /**
+     * Whether IME is showing
+     */
+    public static boolean isImeShowing(WindowInsets rootWindowInsets) {
+        if (rootWindowInsets != null && rootWindowInsets.isVisible(WindowInsets.Type.ime())) {
+            return true;
+        }
+        return false;
+    }
+
     private Helper() {
         throw new UnsupportedOperationException("contain static methods only");
     }
diff --git a/tests/autofillservice/src/android/autofillservice/cts/testcore/InstrumentedAutoFillService.java b/tests/autofillservice/src/android/autofillservice/cts/testcore/InstrumentedAutoFillService.java
index 63b2fe6..c19910f 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/testcore/InstrumentedAutoFillService.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/testcore/InstrumentedAutoFillService.java
@@ -243,7 +243,9 @@
         mHandler.post(
                 () -> sReplier.onFillRequest(request.getFillContexts(), request.getClientState(),
                         cancellationSignal, callback, request.getFlags(),
-                        request.getInlineSuggestionsRequest(), request.getId()));
+                        request.getInlineSuggestionsRequest(),
+                        request.getDelayedFillIntentSender(),
+                        request.getId()));
     }
 
     @Override
@@ -387,10 +389,14 @@
         public final FillCallback callback;
         public final int flags;
         public final InlineSuggestionsRequest inlineRequest;
+        public final IntentSender delayFillIntentSender;
+        public final int requestId;
 
         private FillRequest(List<FillContext> contexts, Bundle data,
                 CancellationSignal cancellationSignal, FillCallback callback, int flags,
-                InlineSuggestionsRequest inlineRequest) {
+                InlineSuggestionsRequest inlineRequest,
+                IntentSender delayFillIntentSender,
+                int requestId) {
             this.contexts = contexts;
             this.data = data;
             this.cancellationSignal = cancellationSignal;
@@ -398,6 +404,8 @@
             this.flags = flags;
             this.structure = contexts.get(contexts.size() - 1).getStructure();
             this.inlineRequest = inlineRequest;
+            this.delayFillIntentSender = delayFillIntentSender;
+            this.requestId = requestId;
         }
 
         @Override
@@ -636,7 +644,8 @@
 
         private void onFillRequest(List<FillContext> contexts, Bundle data,
                 CancellationSignal cancellationSignal, FillCallback callback, int flags,
-                InlineSuggestionsRequest inlineRequest, int requestId) {
+                InlineSuggestionsRequest inlineRequest, IntentSender delayFillIntentSender,
+                int requestId) {
             try {
                 CannedFillResponse response = null;
                 try {
@@ -712,7 +721,8 @@
                         // Add a fill request to let test case know response was sent.
                         Helper.offer(mFillRequests,
                                 new FillRequest(contexts, data, cancellationSignal, callback,
-                                        flags, inlineRequest), CONNECTION_TIMEOUT.ms());
+                                        flags, inlineRequest, delayFillIntentSender, requestId),
+                                CONNECTION_TIMEOUT.ms());
                     }, RESPONSE_DELAY_MS);
                 } else {
                     Log.v(TAG, "onFillRequest(" + requestId + "): fillResponse = " + fillResponse);
@@ -722,7 +732,8 @@
                 addException(t);
             } finally {
                 Helper.offer(mFillRequests, new FillRequest(contexts, data, cancellationSignal,
-                        callback, flags, inlineRequest), CONNECTION_TIMEOUT.ms());
+                        callback, flags, inlineRequest, delayFillIntentSender, requestId),
+                        CONNECTION_TIMEOUT.ms());
             }
         }
 
@@ -754,4 +765,4 @@
             pw.print("mIdMode: "); pw.println(mIdMode);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/tests/autofillservice/src/android/autofillservice/cts/testcore/UiBot.java b/tests/autofillservice/src/android/autofillservice/cts/testcore/UiBot.java
index bfd6b0c..14b7f5a 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/testcore/UiBot.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/testcore/UiBot.java
@@ -46,6 +46,7 @@
 import android.content.Context;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.Point;
 import android.graphics.Rect;
 import android.os.SystemClock;
 import android.service.autofill.SaveInfo;
@@ -133,11 +134,21 @@
     private static final String RESOURCE_STRING_SAVE_SNACKBAR_ACCESSIBILITY_TITLE =
             "autofill_save_accessibility_title";
 
+    private static final String RESOURCE_ID_FILL_DIALOG_PICKER = "autofill_dialog_picker";
+    private static final String RESOURCE_ID_FILL_DIALOG_HEADER = "autofill_dialog_header";
+    private static final String RESOURCE_ID_FILL_DIALOG_DATASET = "autofill_dialog_list";
 
     static final BySelector DATASET_PICKER_SELECTOR = By.res("android", RESOURCE_ID_DATASET_PICKER);
     private static final BySelector SAVE_UI_SELECTOR = By.res("android", RESOURCE_ID_SAVE_SNACKBAR);
     private static final BySelector DATASET_HEADER_SELECTOR =
             By.res("android", RESOURCE_ID_DATASET_HEADER);
+    private static final BySelector FILL_DIALOG_SELECTOR =
+            By.res("android", RESOURCE_ID_FILL_DIALOG_PICKER);
+    private static final BySelector FILL_DIALOG_HEADER_SELECTOR =
+            By.res("android", RESOURCE_ID_FILL_DIALOG_HEADER);
+    private static final BySelector FILL_DIALOG_DATASET_SELECTOR =
+            By.res("android", RESOURCE_ID_FILL_DIALOG_DATASET);
+
 
     // TODO: figure out a more reliable solution that does not depend on SystemUI resources.
     private static final String SPLIT_WINDOW_DIVIDER_ID =
@@ -1262,4 +1273,99 @@
             return false;
         }
     }
+
+    /**
+     * Selects a view by id via UiDevice.
+     *
+     * Note: This used to avoid IME issue that some case IME will be not shown via
+     * UiObject2.click().
+     */
+    public UiObject2 selectByRelativeIdFromUiDevice(String id) throws Exception {
+        Log.v(TAG, "selectByRelativeIdFromDevice(): " + id);
+        final UiObject2 object = waitForObject(By.res(mPackageName, id));
+        final Point p = object.getVisibleCenter();
+        mDevice.click(p.x, p.y);
+        return object;
+    }
+
+    /**
+     * Asserts the header in the fill dialog.
+     */
+    public void assertFillDialogHeader(String expectedHeader) throws Exception {
+        final UiObject2 header = findFillDialogHeaderPicker();
+
+        assertWithMessage("wrong header for fill dialog")
+                .that(getChildrenAsText(header))
+                .containsExactlyElementsIn(Arrays.asList(expectedHeader)).inOrder();
+    }
+
+    /**
+     * Asserts reject button in the fill dialog.
+     */
+    public void assertFillDialogRejectButton() throws Exception {
+        final UiObject2 picker = findFillDialogPicker();
+
+        // "No thanks" button shown
+        assertWithMessage("wrong reject button in fill dialog")
+                .that(getChildrenAsText(picker))
+                .contains(getString(RESOURCE_STRING_SAVE_BUTTON_NO_THANKS));
+    }
+
+    /**
+     * Asserts accept button in the fill dialog.
+     */
+    public void assertFillDialogAcceptButton() throws Exception {
+        final UiObject2 picker = findFillDialogPicker();
+
+        // "Continue" button shown
+        assertWithMessage("wrong accept button in fill dialog")
+                .that(getChildrenAsText(picker))
+                .contains(getString(RESOURCE_STRING_CONTINUE_BUTTON_YES));
+    }
+
+    /**
+     * Asserts there is no accept button in the fill dialog.
+     */
+    public void assertFillDialogNoAcceptButton() throws Exception {
+        final UiObject2 picker = findFillDialogPicker();
+
+        // "Continue" button not shown
+        assertWithMessage("wrong accept button in fill dialog")
+                .that(getChildrenAsText(picker))
+                .doesNotContain(getString(RESOURCE_STRING_CONTINUE_BUTTON_YES));
+    }
+
+    /**
+     * Asserts the fill dialog is shown and contains the given datasets.
+     *
+     * @return the dataset picker object.
+     */
+    public UiObject2 assertFillDialogDatasets(String... datasets) throws Exception {
+        final UiObject2 picker = findFillDialogDatasetPicker();
+
+        assertWithMessage("wrong elements in fill dialog")
+                .that(getChildrenAsText(picker))
+                .containsExactlyElementsIn(datasets).inOrder();
+        return picker;
+    }
+
+    /**
+     * Asserts the fill dialog is shown and contains the given dataset. And then select the dataset
+     */
+    public void selectFillDialogDataset(String dataset) throws Exception {
+        final UiObject2 picker = assertFillDialogDatasets(dataset);
+        selectDataset(picker, dataset);
+    }
+
+    private UiObject2 findFillDialogPicker() throws Exception {
+        return waitForObject(FILL_DIALOG_SELECTOR, UI_DATASET_PICKER_TIMEOUT);
+    }
+
+    private UiObject2 findFillDialogDatasetPicker() throws Exception {
+        return waitForObject(FILL_DIALOG_DATASET_SELECTOR, UI_DATASET_PICKER_TIMEOUT);
+    }
+
+    private UiObject2 findFillDialogHeaderPicker() throws Exception {
+        return waitForObject(FILL_DIALOG_HEADER_SELECTOR, UI_DATASET_PICKER_TIMEOUT);
+    }
 }
diff --git a/tests/autofillservice/src/android/autofillservice/cts/unittests/DatasetTest.java b/tests/autofillservice/src/android/autofillservice/cts/unittests/DatasetTest.java
index 8297163..870ae5e 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/unittests/DatasetTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/unittests/DatasetTest.java
@@ -33,7 +33,9 @@
 import android.os.Parcel;
 import android.platform.test.annotations.AppModeFull;
 import android.service.autofill.Dataset;
+import android.service.autofill.Field;
 import android.service.autofill.InlinePresentation;
+import android.service.autofill.Presentations;
 import android.util.Size;
 import android.view.autofill.AutofillId;
 import android.view.autofill.AutofillValue;
@@ -65,7 +67,12 @@
     private final IntentSender mAuth = mock(IntentSender.class);
 
     private final RemoteViews mPresentation = mock(RemoteViews.class);
-
+    private final RemoteViews mDialogPresentation = mock(RemoteViews.class);
+    private final InlinePresentation mTooltipPresentation = new InlinePresentation(
+            new Slice.Builder(new Uri.Builder().appendPath("DatasetTest").build(),
+                    new SliceSpec("DatasetTest", 1)).build(),
+            new InlinePresentationSpec.Builder(new Size(10, 10),
+                    new Size(50, 50)).build(), /* pinned= */ false);
     @Test
     public void testBuilder_nullPresentation() {
         assertThrows(NullPointerException.class, () -> new Dataset.Builder((RemoteViews) null));
@@ -225,6 +232,69 @@
     }
 
     @Test
+    public void testField() {
+        final Field.Builder builder = new Field.Builder();
+        final Presentations presentations =
+                new Presentations.Builder().setMenuPresentation(mPresentation).build();
+        final Field field = builder.setValue(mValue)
+                .setFilter(mFilter)
+                .setPresentations(presentations)
+                .build();
+
+        assertThat(field.getValue()).isEqualTo(mValue);
+        assertThat(field.getFilter()).isEqualTo(mFilter);
+        assertThat(field.getPresentations()).isEqualTo(presentations);
+    }
+
+    @Test
+    public void testField_empty() {
+        final Field field = new Field.Builder().build();
+
+        assertThat(field.getValue()).isNull();
+        assertThat(field.getFilter()).isNull();
+        assertThat(field.getPresentations()).isNull();
+    }
+
+    @Test
+    public void testPresentations() {
+        final Presentations presentations = new Presentations.Builder()
+                .setMenuPresentation(mPresentation)
+                .setInlinePresentation(mInlinePresentation)
+                .setInlineTooltipPresentation(mTooltipPresentation)
+                .setDialogPresentation(mDialogPresentation)
+                .build();
+
+        assertThat(presentations.getMenuPresentation()).isEqualTo(mPresentation);
+        assertThat(presentations.getInlinePresentation()).isEqualTo(mInlinePresentation);
+        assertThat(presentations.getInlineTooltipPresentation()).isEqualTo(mTooltipPresentation);
+        assertThat(presentations.getDialogPresentation()).isEqualTo(mDialogPresentation);
+    }
+
+    @Test
+    public void testPresentations_noPresentation() {
+        assertThrows(IllegalStateException.class, () -> new Presentations.Builder().build());
+    }
+
+    @Test
+    public void testBuilder_setFieldNullId() {
+        final Dataset.Builder builder = new Dataset.Builder(mPresentation);
+        assertThrows(NullPointerException.class,
+                () -> builder.setField(null, new Field.Builder().build()));
+    }
+
+    @Test
+    public void testBuilder_setFieldNullField() {
+        // Just assert that it builds without throwing an exception.
+        assertThat(new Dataset.Builder().setField(mId, null)).isNotNull();
+    }
+
+    @Test
+    public void testBuilder_setFieldWithEmptyField() {
+        // Just assert that it builds without throwing an exception.
+        assertThat(new Dataset.Builder().setField(mId, new Field.Builder().build())).isNotNull();
+    }
+
+    @Test
     public void testBuilder_setContent() {
         Dataset.Builder builder = new Dataset.Builder().setContent(mId, mContent);
         Dataset dataset = builder.build();
diff --git a/tests/autofillservice/src/android/autofillservice/cts/unittests/FillResponseTest.java b/tests/autofillservice/src/android/autofillservice/cts/unittests/FillResponseTest.java
index 9c1e75b..e212ca9 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/unittests/FillResponseTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/unittests/FillResponseTest.java
@@ -16,6 +16,7 @@
 
 package android.autofillservice.cts.unittests;
 
+import static android.service.autofill.FillResponse.FLAG_DELAY_FILL;
 import static android.service.autofill.FillResponse.FLAG_DISABLE_ACTIVITY_ONLY;
 import static android.service.autofill.FillResponse.FLAG_TRACK_CONTEXT_COMMITED;
 
@@ -76,12 +77,12 @@
                 () -> mBuilder.setAuthentication(mIds, null, mPresentation));
         // null presentation
         assertThrows(IllegalArgumentException.class,
-                () -> mBuilder.setAuthentication(mIds, mIntentSender, null));
+                () -> mBuilder.setAuthentication(mIds, mIntentSender, (RemoteViews) null));
     }
 
     @Test
     public void testBuilder_setAuthentication_valid() {
-        new FillResponse.Builder().setAuthentication(mIds, null, null);
+        new FillResponse.Builder().setAuthentication(mIds, null, (RemoteViews) null);
         new FillResponse.Builder().setAuthentication(mIds, mIntentSender, mPresentation);
     }
 
@@ -132,6 +133,7 @@
         mBuilder.setFlags(0);
         mBuilder.setFlags(FLAG_TRACK_CONTEXT_COMMITED);
         mBuilder.setFlags(FLAG_DISABLE_ACTIVITY_ONLY);
+        mBuilder.setFlags(FLAG_DELAY_FILL);
     }
 
     @Test
@@ -261,4 +263,4 @@
         assertThrows(IllegalStateException.class, () -> mBuilder.setUserData(mUserData));
         assertThrows(IllegalStateException.class, () -> mBuilder.setPresentationCancelIds(null));
     }
-}
+}
\ No newline at end of file
diff --git a/tests/backup/Android.bp b/tests/backup/Android.bp
index 207f885..ea76d90 100644
--- a/tests/backup/Android.bp
+++ b/tests/backup/Android.bp
@@ -36,6 +36,7 @@
         "mockito-target-minus-junit4",
         "permission-test-util-lib",
         "testng",
+        "device_time_shell_utils",
     ],
     host_required: ["CtsBackupHostTestCases"],
     srcs: ["src/**/*.java"],
diff --git a/tests/backup/AndroidTest.xml b/tests/backup/AndroidTest.xml
index ec0ade5..0e84662 100644
--- a/tests/backup/AndroidTest.xml
+++ b/tests/backup/AndroidTest.xml
@@ -33,11 +33,14 @@
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
+        <option name="install-arg" value="-t" />
         <option name="test-file-name" value="CtsFullBackupApp.apk" />
         <option name="test-file-name" value="CtsKeyValueBackupApp.apk" />
         <option name="test-file-name" value="CtsBackupTestCases.apk" />
         <option name="test-file-name" value="CtsPermissionBackupApp.apk" />
         <option name="test-file-name" value="CtsPermissionBackupApp22.apk" />
+        <option name="test-file-name" value="CtsAppLocalesBackupApp1.apk" />
+        <option name="test-file-name" value="CtsAppLocalesBackupApp2.apk" />
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="mkdir -p /data/local/tmp/cts/backup" />
@@ -48,6 +51,8 @@
         <option name="cleanup" value="true" />
         <option name="push" value="CtsPermissionBackupApp.apk->/data/local/tmp/cts/backup/CtsPermissionBackupApp.apk" />
         <option name="push" value="CtsPermissionBackupApp22.apk->/data/local/tmp/cts/backup/CtsPermissionBackupApp22.apk" />
+        <option name="push" value="CtsAppLocalesBackupApp1.apk->/data/local/tmp/cts/backup/CtsAppLocalesBackupApp1.apk" />
+        <option name="push" value="CtsAppLocalesBackupApp2.apk->/data/local/tmp/cts/backup/CtsAppLocalesBackupApp2.apk" />
     </target_preparer>
     <target_preparer class="android.cts.backup.BackupPreparer">
         <option name="enable-backup-if-needed" value="true" />
diff --git a/tests/backup/app/Android.bp b/tests/backup/app/Android.bp
index b0ba975..ad74e6a 100644
--- a/tests/backup/app/Android.bp
+++ b/tests/backup/app/Android.bp
@@ -36,7 +36,7 @@
         "mts-permission",
     ],
     platform_apis: true,
-    manifest: "fullbackup/AndroidManifest.xml"
+    manifest: "fullbackup/AndroidManifest.xml",
 }
 
 android_test_helper_app {
@@ -60,7 +60,7 @@
         "mts-permission",
     ],
     platform_apis: true,
-    manifest: "keyvalue/AndroidManifest.xml"
+    manifest: "keyvalue/AndroidManifest.xml",
 }
 
 android_test_helper_app {
@@ -84,7 +84,7 @@
         "mts-permission",
     ],
     platform_apis: true,
-    manifest: "permission/AndroidManifest.xml"
+    manifest: "permission/AndroidManifest.xml",
 }
 
 android_test_helper_app {
@@ -106,5 +106,53 @@
         "mts-permission",
     ],
     platform_apis: true,
-    manifest: "permission22/AndroidManifest.xml"
+    manifest: "permission22/AndroidManifest.xml",
+}
+
+android_test_helper_app {
+    name: "CtsAppLocalesBackupApp1",
+    defaults: [
+        "cts_support_defaults",
+        "mts-target-sdk-version-current",
+    ],
+    min_sdk_version: "30",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "compatibility-device-util-axt",
+        "ctstestrunner-axt",
+    ],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+        "mts",
+    ],
+    platform_apis: true,
+    manifest: "AppLocalesBackupApp1/AndroidManifest.xml",
+}
+
+android_test_helper_app {
+    name: "CtsAppLocalesBackupApp2",
+    defaults: [
+        "cts_support_defaults",
+        "mts-target-sdk-version-current",
+    ],
+    min_sdk_version: "30",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "compatibility-device-util-axt",
+        "ctstestrunner-axt",
+    ],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+        "mts",
+    ],
+    platform_apis: true,
+    manifest: "AppLocalesBackupApp2/AndroidManifest.xml",
 }
diff --git a/tests/backup/app/AppLocalesBackupApp1/AndroidManifest.xml b/tests/backup/app/AppLocalesBackupApp1/AndroidManifest.xml
new file mode 100644
index 0000000..719714c
--- /dev/null
+++ b/tests/backup/app/AppLocalesBackupApp1/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.cts.backup.applocalesbackupapp1">
+    <application
+        android:label="AppLocalesBackupApp1">
+        <uses-library android:name="android.test.runner" />
+    </application>
+</manifest>
diff --git a/tests/backup/app/AppLocalesBackupApp2/AndroidManifest.xml b/tests/backup/app/AppLocalesBackupApp2/AndroidManifest.xml
new file mode 100644
index 0000000..7bb7592
--- /dev/null
+++ b/tests/backup/app/AppLocalesBackupApp2/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.cts.backup.applocalesbackupapp2">
+    <application
+        android:label="AppLocalesBackupApp2">
+        <uses-library android:name="android.test.runner" />
+    </application>
+</manifest>
diff --git a/tests/backup/app/fullbackup/AndroidManifest.xml b/tests/backup/app/fullbackup/AndroidManifest.xml
index 7f639f9..8a5e5f6 100644
--- a/tests/backup/app/fullbackup/AndroidManifest.xml
+++ b/tests/backup/app/fullbackup/AndroidManifest.xml
@@ -21,7 +21,8 @@
     <application android:allowBackup="true"
          android:backupAgent="FullBackupBackupAgent"
          android:label="Android Backup CTS App"
-         android:fullBackupOnly="true">
+         android:fullBackupOnly="true"
+         android:testOnly="true">
         <uses-library android:name="android.test.runner"/>
 
 
diff --git a/tests/backup/app/keyvalue/AndroidManifest.xml b/tests/backup/app/keyvalue/AndroidManifest.xml
index c36d70c..937d344 100644
--- a/tests/backup/app/keyvalue/AndroidManifest.xml
+++ b/tests/backup/app/keyvalue/AndroidManifest.xml
@@ -20,7 +20,8 @@
 
     <application android:allowBackup="true"
          android:backupAgent="android.backup.app.KeyValueBackupAgent"
-         android:label="Android Key Value Backup CTS App">
+         android:label="Android Key Value Backup CTS App"
+         android:testOnly="true">
         <uses-library android:name="android.test.runner"/>
 
         <activity android:name="android.backup.app.MainActivity"
diff --git a/tests/backup/src/android/backup/cts/AgentBindingTest.java b/tests/backup/src/android/backup/cts/AgentBindingTest.java
index 1a9fe01..e705e49 100644
--- a/tests/backup/src/android/backup/cts/AgentBindingTest.java
+++ b/tests/backup/src/android/backup/cts/AgentBindingTest.java
@@ -16,25 +16,57 @@
 
 package android.backup.cts;
 
+import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
+import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED;
+import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED_USER;
+import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
 import static org.testng.Assert.expectThrows;
 
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.os.IBinder;
 import android.platform.test.annotations.AppModeFull;
 
+import java.io.IOException;
 import java.lang.reflect.Method;
+import java.util.Scanner;
 
 @AppModeFull
 public class AgentBindingTest extends BaseBackupCtsTest {
+    private static final String FULL_BACKUP_PACKAGE_NAME = "android.backup.app";
+    private static final String KEY_VALUE_BACKUP_PACKAGE_NAME = "android.backup.kvapp";
+    private static final ComponentName FULL_BACKUP_AGENT_NAME = ComponentName.createRelative(
+            FULL_BACKUP_PACKAGE_NAME, ".FullBackupBackupAgent");
+    private static final ComponentName KEY_VALUE_BACKUP_AGENT_NAME = ComponentName.createRelative(
+            KEY_VALUE_BACKUP_PACKAGE_NAME, "android.backup.app.KeyValueBackupAgent");
+    private static final int LOCAL_TRANSPORT_CONFORMING_FILE_SIZE = 5 * 1024;
+
     private Context mContext;
 
+    // Save the states before running tests. Restore them after tests finished.
+    private int mFullBackupAgentEnabledState;
+    private int mKeyValueBackupAgentEnabledState;
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         mContext = getInstrumentation().getTargetContext();
+        mFullBackupAgentEnabledState = mContext.getPackageManager().getComponentEnabledSetting(
+                FULL_BACKUP_AGENT_NAME);
+        mKeyValueBackupAgentEnabledState = mContext.getPackageManager().getComponentEnabledSetting(
+                KEY_VALUE_BACKUP_AGENT_NAME);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        setComponentEnabledSetting(FULL_BACKUP_AGENT_NAME, mFullBackupAgentEnabledState);
+        setComponentEnabledSetting(KEY_VALUE_BACKUP_AGENT_NAME, mKeyValueBackupAgentEnabledState);
     }
 
     public void testUnbindBackupAgent_isNotCallableFromCts() throws Exception {
@@ -51,6 +83,76 @@
         expectThrows(Exception.class, () -> bindBackupAgent(mContext.getPackageName(), 0, 0));
     }
 
+    public void testFullBackupAgentComponentDisabled() throws Exception {
+        if (!isBackupSupported()) {
+            return;
+        }
+        setComponentEnabledSetting(FULL_BACKUP_AGENT_NAME, COMPONENT_ENABLED_STATE_DISABLED);
+        // Make sure there's something to backup
+        createTestFileOfSize(FULL_BACKUP_PACKAGE_NAME, LOCAL_TRANSPORT_CONFORMING_FILE_SIZE);
+
+        runBackupAndAssertAgentError(FULL_BACKUP_PACKAGE_NAME);
+    }
+
+    public void testKeyValueBackupAgentComponentDisabled() throws Exception {
+        if (!isBackupSupported()) {
+            return;
+        }
+        setComponentEnabledSetting(KEY_VALUE_BACKUP_AGENT_NAME, COMPONENT_ENABLED_STATE_DISABLED);
+        // Make sure there's something to backup
+        createTestFileOfSize(KEY_VALUE_BACKUP_PACKAGE_NAME, LOCAL_TRANSPORT_CONFORMING_FILE_SIZE);
+
+        runBackupAndAssertAgentError(KEY_VALUE_BACKUP_PACKAGE_NAME);
+    }
+
+    private void setComponentEnabledSetting(ComponentName componentName, int enabledState)
+            throws IOException {
+        final StringBuilder cmd = new StringBuilder("pm ");
+        switch (enabledState) {
+            case COMPONENT_ENABLED_STATE_DEFAULT:
+                cmd.append("default-state ");
+                break;
+            case COMPONENT_ENABLED_STATE_ENABLED:
+                cmd.append("enable ");
+                break;
+            case COMPONENT_ENABLED_STATE_DISABLED:
+                cmd.append("disable ");
+                break;
+            case COMPONENT_ENABLED_STATE_DISABLED_USER:
+                cmd.append("disable-user ");
+                break;
+            case COMPONENT_ENABLED_STATE_DISABLED_UNTIL_USED:
+                cmd.append("disable-until-used ");
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid enabled state:" + enabledState);
+        }
+        cmd.append("--user cur ").append(componentName.flattenToString());
+        getBackupUtils().executeShellCommandSync(cmd.toString());
+    }
+
+    /**
+     * Parses the output of "bmgr backupnow" command and checks an agent error during
+     * backup / restore.
+     */
+    private void runBackupAndAssertAgentError(String packageName) throws IOException {
+        Scanner in = new Scanner(getBackupUtils().getBackupNowOutput(packageName));
+        boolean found = false;
+        while (in.hasNextLine()) {
+            String line = in.nextLine();
+
+            if (line.contains(packageName)) {
+                String result = line.split(":")[1].trim();
+                if ("Agent error".equals(result)) {
+                    found = true;
+                    break;
+                }
+            }
+        }
+        in.close();
+        assertTrue("Didn't find \'Agent error\' in the output", found);
+    }
+
     private static void unbindBackupAgent(ApplicationInfo applicationInfo) throws Exception {
         callActivityManagerMethod(
                 "unbindBackupAgent",
diff --git a/tests/backup/src/android/backup/cts/AppLocalesBackupTest.java b/tests/backup/src/android/backup/cts/AppLocalesBackupTest.java
new file mode 100644
index 0000000..aab4159
--- /dev/null
+++ b/tests/backup/src/android/backup/cts/AppLocalesBackupTest.java
@@ -0,0 +1,536 @@
+/*
+ * Copyright (C) 2021 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 android.backup.cts;
+
+import static android.app.time.cts.shell.DeviceConfigKeys.NAMESPACE_SYSTEM_TIME;
+import static android.app.time.cts.shell.DeviceConfigShellHelper.SYNC_DISABLED_MODE_UNTIL_REBOOT;
+
+import static com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity;
+import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
+
+import android.Manifest;
+import android.app.Instrumentation;
+import android.app.LocaleManager;
+import android.app.time.ExternalTimeSuggestion;
+import android.app.time.TimeManager;
+import android.app.time.cts.shell.DeviceConfigKeys;
+import android.app.time.cts.shell.DeviceConfigShellHelper;
+import android.app.time.cts.shell.DeviceShellCommandExecutor;
+import android.app.time.cts.shell.device.InstrumentationShellCommandExecutor;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.LocaleList;
+import android.os.SystemClock;
+import android.platform.test.annotations.AppModeFull;
+
+import androidx.test.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.AmUtils;
+import com.android.compatibility.common.util.ShellUtils;
+
+import org.junit.After;
+import org.junit.Before;
+
+import java.time.Duration;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@AppModeFull
+public class AppLocalesBackupTest extends BaseBackupCtsTest {
+    private static final String APK_PATH = "/data/local/tmp/cts/backup/";
+    private static final String TEST_APP_APK_1 = APK_PATH + "CtsAppLocalesBackupApp1.apk";
+    private static final String TEST_APP_PACKAGE_1 =
+            "android.cts.backup.applocalesbackupapp1";
+
+    private static final String TEST_APP_APK_2 = APK_PATH + "CtsAppLocalesBackupApp2.apk";
+    private static final String TEST_APP_PACKAGE_2 =
+            "android.cts.backup.applocalesbackupapp2";
+    private static final String SYSTEM_PACKAGE = "android";
+
+    private static final LocaleList DEFAULT_LOCALES_1 = LocaleList.forLanguageTags("hi-IN,de-DE");
+    private static final LocaleList DEFAULT_LOCALES_2 = LocaleList.forLanguageTags("fr-CA");
+    private static final LocaleList EMPTY_LOCALES = LocaleList.getEmptyLocaleList();
+
+    // An identifier for the backup dataset. Since we're using localtransport, it's set to "1".
+    private static final String RESTORE_TOKEN = "1";
+
+    private static final Duration RETENTION_PERIOD = Duration.ofDays(3);
+
+    private Context mContext;
+    private LocaleManager mLocaleManager;
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+
+        mContext = InstrumentationRegistry.getTargetContext();
+        mLocaleManager = mContext.getSystemService(LocaleManager.class);
+
+        install(TEST_APP_APK_1);
+        install(TEST_APP_APK_2);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        uninstall(TEST_APP_PACKAGE_1);
+        uninstall(TEST_APP_PACKAGE_2);
+    }
+
+    /**
+     * Tests the scenario where all apps are installed on the device when restore is triggered.
+     *
+     * <p>In this case, all the apps should have their locales restored as soon as the restore
+     * operation finishes. The only condition is that the apps should not have the locales set
+     * already before restore.
+     */
+    public void testBackupRestore_allAppsInstalledNoAppLocalesSet_restoresImmediately()
+            throws Exception {
+        if (!isBackupSupported()) {
+            return;
+        }
+        setAndBackupDefaultAppLocales();
+
+        resetAppLocales();
+
+        getBackupUtils().restoreAndAssertSuccess(RESTORE_TOKEN, SYSTEM_PACKAGE);
+
+        assertLocalesForApp(TEST_APP_PACKAGE_1, DEFAULT_LOCALES_1);
+        assertLocalesForApp(TEST_APP_PACKAGE_2, DEFAULT_LOCALES_2);
+    }
+
+    /**
+     * Tests the scenario where the user sets the app-locales before the restore could be applied.
+     *
+     * <p>The locales from the backup data should be ignored in this case.
+     */
+    public void testBackupRestore_localeAlreadySet_doesNotRestore() throws Exception {
+        if (!isBackupSupported()) {
+            return;
+        }
+        setAndBackupDefaultAppLocales();
+
+        LocaleList newLocales = LocaleList.forLanguageTags("zh,hi");
+        setApplicationLocalesAndVerify(TEST_APP_PACKAGE_1, newLocales);
+        setApplicationLocalesAndVerify(TEST_APP_PACKAGE_2, EMPTY_LOCALES);
+
+        getBackupUtils().restoreAndAssertSuccess(RESTORE_TOKEN, SYSTEM_PACKAGE);
+
+        // Should restore only for app_2.
+        assertLocalesForApp(TEST_APP_PACKAGE_1, newLocales);
+        assertLocalesForApp(TEST_APP_PACKAGE_2, DEFAULT_LOCALES_2);
+    }
+
+    /**
+     * Tests the scenario when some apps are installed after the restore finishes.
+     *
+     * <p>More specifically, this tests the lazy restore where the locales are fetched and
+     * restored from the stage file if the app is installed within a certain amount of time after
+     * the initial restore.
+     */
+    public void testBackupRestore_appInstalledAfterRestore_doesLazyRestore() throws Exception {
+        if (!isBackupSupported()) {
+            return;
+        }
+        setAndBackupDefaultAppLocales();
+
+        resetAppLocales();
+
+        uninstall(TEST_APP_PACKAGE_2);
+
+        getBackupUtils().restoreAndAssertSuccess(RESTORE_TOKEN, SYSTEM_PACKAGE);
+
+        // Locales for App1 should be restored immediately since that's present already.
+        assertLocalesForApp(TEST_APP_PACKAGE_1, DEFAULT_LOCALES_1);
+
+        // This is to ensure there are no lingering broadcasts (could be from the setUp method
+        // where we are calling setApplicationLocales).
+        AmUtils.waitForBroadcastIdle();
+
+        BlockingBroadcastReceiver appSpecificLocaleBroadcastReceiver =
+                new BlockingBroadcastReceiver();
+        mContext.registerReceiver(appSpecificLocaleBroadcastReceiver,
+                new IntentFilter(Intent.ACTION_APPLICATION_LOCALE_CHANGED));
+
+        // Hold Manifest.permission.READ_APP_SPECIFIC_LOCALES while the broadcast is sent,
+        // so that we receive it.
+        runWithShellPermissionIdentity(() -> {
+            // Installation will trigger lazy restore, which internally calls setApplicationLocales
+            // which sends out the ACTION_APPLICATION_LOCALE_CHANGED broadcast.
+            install(TEST_APP_APK_2);
+            appSpecificLocaleBroadcastReceiver.await();
+        }, Manifest.permission.READ_APP_SPECIFIC_LOCALES);
+
+        appSpecificLocaleBroadcastReceiver.assertOneBroadcastReceived();
+        appSpecificLocaleBroadcastReceiver.assertReceivedBroadcastContains(TEST_APP_PACKAGE_2,
+                DEFAULT_LOCALES_2);
+
+        // Verify that lazy restore occurred upon package install.
+        assertLocalesForApp(TEST_APP_PACKAGE_2, DEFAULT_LOCALES_2);
+
+        // APP2's entry is removed from the stage file after restore so nothing should be restored
+        // when APP2 is installed for the second time.
+        uninstall(TEST_APP_PACKAGE_2);
+        install(TEST_APP_APK_2);
+        assertLocalesForApp(TEST_APP_PACKAGE_2, EMPTY_LOCALES);
+    }
+
+    /**
+     * Tests the scenario when an application is removed from the device.
+     *
+     * <p>The data for the uninstalled app should be removed from the next backup pass.
+     */
+    public void testBackupRestore_uninstallApp_deletesDataFromBackup() throws Exception {
+        if (!isBackupSupported()) {
+            return;
+        }
+        setAndBackupDefaultAppLocales();
+
+        // Uninstall an app and run the backup pass. The locales for the uninstalled app should
+        // be removed from the backup.
+        uninstall(TEST_APP_PACKAGE_2);
+        setApplicationLocalesAndVerify(TEST_APP_PACKAGE_1, DEFAULT_LOCALES_1);
+        getBackupUtils().backupNowAndAssertSuccess(SYSTEM_PACKAGE);
+
+        install(TEST_APP_APK_2);
+        // Remove app1's locales so that it can be restored.
+        setApplicationLocalesAndVerify(TEST_APP_PACKAGE_1, EMPTY_LOCALES);
+
+        getBackupUtils().restoreAndAssertSuccess(RESTORE_TOKEN, SYSTEM_PACKAGE);
+
+        // Restores only app1's locales because app2's data is no longer present in the backup.
+        assertLocalesForApp(TEST_APP_PACKAGE_1, DEFAULT_LOCALES_1);
+        assertLocalesForApp(TEST_APP_PACKAGE_2, EMPTY_LOCALES);
+    }
+
+    /**
+     * Tests the scenario when backup pass is run after retention period has expired.
+     *
+     * <p>Stage data should be removed since retention period has expired.
+     * <p><b>Note:</b>Manipulates device's system clock directly to simulate the passage of time.
+     */
+    public void testRetentionPeriod_backupPassAfterRetentionPeriod_removesStagedData()
+            throws Exception {
+        if (!isBackupSupported()) {
+            return;
+        }
+        setAndBackupDefaultAppLocales();
+
+        uninstall(TEST_APP_PACKAGE_2);
+
+        getBackupUtils().restoreAndAssertSuccess(RESTORE_TOKEN, SYSTEM_PACKAGE);
+
+        // Locales for App1 should be restored immediately since that's present already.
+        assertLocalesForApp(TEST_APP_PACKAGE_1, DEFAULT_LOCALES_1);
+
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        DeviceShellCommandExecutor shellCommandExecutor = new InstrumentationShellCommandExecutor(
+                instrumentation.getUiAutomation());
+        DeviceConfigShellHelper deviceConfigShellHelper = new DeviceConfigShellHelper(
+                shellCommandExecutor);
+
+        // This anticipates a future state where a generally applied target preparer may disable
+        // device_config sync for all CTS tests: only suspend syncing if it isn't already suspended,
+        // and only resume it if this test suspended it.
+        DeviceConfigShellHelper.PreTestState deviceConfigPreTestState =
+                deviceConfigShellHelper.setSyncModeForTest(
+                        SYNC_DISABLED_MODE_UNTIL_REBOOT, NAMESPACE_SYSTEM_TIME);
+
+        TimeManager timeManager = mContext.getSystemService(TimeManager.class);
+        assertNotNull(timeManager);
+
+        // Capture clock values so that the system clock can be set back after the test.
+        long startCurrentTimeMillis = System.currentTimeMillis();
+        long elapsedRealtimeMillis = SystemClock.elapsedRealtime();
+
+        try {
+
+            // Set the time detector to only use ORIGIN_EXTERNAL.
+            deviceConfigShellHelper.put(NAMESPACE_SYSTEM_TIME,
+                    DeviceConfigKeys.TimeDetector.KEY_TIME_DETECTOR_ORIGIN_PRIORITIES_OVERRIDE,
+                    DeviceConfigKeys.TimeDetector.ORIGIN_EXTERNAL);
+            sleepForAsyncOperation();
+
+            // 1 second elapses after retention period.
+            long afterRetentionPeriodMillis = Duration.ofMillis(startCurrentTimeMillis).plusMillis(
+                    RETENTION_PERIOD.plusSeconds(1).toMillis()).toMillis();
+            ExternalTimeSuggestion futureTimeSuggestion =
+                    new ExternalTimeSuggestion(elapsedRealtimeMillis, afterRetentionPeriodMillis);
+
+            runWithShellPermissionIdentity(() -> {
+                timeManager.suggestExternalTime(futureTimeSuggestion);
+            }, Manifest.permission.SUGGEST_EXTERNAL_TIME);
+            sleepForAsyncOperation();
+
+            // The suggestion should have been accepted so the system clock should have advanced.
+            assertTrue(System.currentTimeMillis() >= afterRetentionPeriodMillis);
+
+            // Run the backup pass now.
+            getBackupUtils().backupNowAndAssertSuccess(SYSTEM_PACKAGE);
+        } finally {
+
+            // Now do our best to return the device to its original state.
+            ExternalTimeSuggestion originalTimeSuggestion =
+                    new ExternalTimeSuggestion(elapsedRealtimeMillis, startCurrentTimeMillis);
+            runWithShellPermissionIdentity(() -> {
+                timeManager.suggestExternalTime(originalTimeSuggestion);
+            }, Manifest.permission.SUGGEST_EXTERNAL_TIME);
+            sleepForAsyncOperation();
+
+            deviceConfigShellHelper.restoreDeviceConfigStateForTest(deviceConfigPreTestState);
+        }
+
+        // We install the app after restoring the device time so that retention check during lazy
+        // restore doesn't try to delete the stage data. Hence, ensuring that stage data is deleted
+        // during the backup pass.
+        BlockingBroadcastReceiver appSpecificLocaleBroadcastReceiver =
+                new BlockingBroadcastReceiver();
+        mContext.registerReceiver(appSpecificLocaleBroadcastReceiver,
+                new IntentFilter(Intent.ACTION_APPLICATION_LOCALE_CHANGED));
+
+        // Hold Manifest.permission.READ_APP_SPECIFIC_LOCALES while the broadcast is sent,
+        // so that we receive it.
+        runWithShellPermissionIdentity(() -> {
+            // Installation will trigger lazy restore, which internally calls setApplicationLocales
+            // which sends out the ACTION_APPLICATION_LOCALE_CHANGED broadcast.
+            install(TEST_APP_APK_2);
+            appSpecificLocaleBroadcastReceiver.await();
+        }, Manifest.permission.READ_APP_SPECIFIC_LOCALES);
+
+        appSpecificLocaleBroadcastReceiver.assertNoBroadcastReceived();
+
+        // Does not restore the locales on package install.
+        assertLocalesForApp(TEST_APP_PACKAGE_2, EMPTY_LOCALES);
+    }
+
+    /**
+     * Tests the scenario when lazy restore happens after retention period has expired.
+     *
+     * <p>Stage data should be removed since retention period has expired.
+     * <p><b>Note:</b>Manipulates device's system clock directly to simulate the passage of time.
+     */
+    public void testRetentionPeriod_lazyRestoreAfterRetentionPeriod_removesStagedData()
+            throws Exception {
+        if (!isBackupSupported()) {
+            return;
+        }
+        setAndBackupDefaultAppLocales();
+
+        uninstall(TEST_APP_PACKAGE_1);
+        uninstall(TEST_APP_PACKAGE_2);
+
+        getBackupUtils().restoreAndAssertSuccess(RESTORE_TOKEN, SYSTEM_PACKAGE);
+
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        DeviceShellCommandExecutor shellCommandExecutor = new InstrumentationShellCommandExecutor(
+                instrumentation.getUiAutomation());
+        DeviceConfigShellHelper deviceConfigShellHelper = new DeviceConfigShellHelper(
+                shellCommandExecutor);
+
+        // This anticipates a future state where a generally applied target preparer may disable
+        // device_config sync for all CTS tests: only suspend syncing if it isn't already suspended,
+        // and only resume it if this test suspended it.
+        DeviceConfigShellHelper.PreTestState deviceConfigPreTestState =
+                deviceConfigShellHelper.setSyncModeForTest(
+                        SYNC_DISABLED_MODE_UNTIL_REBOOT, NAMESPACE_SYSTEM_TIME);
+
+        TimeManager timeManager = mContext.getSystemService(TimeManager.class);
+        assertNotNull(timeManager);
+
+        // Capture clock values so that the system clock can be set back after the test.
+        long startCurrentTimeMillis = System.currentTimeMillis();
+        long elapsedRealtimeMillis = SystemClock.elapsedRealtime();
+
+        try {
+
+            BlockingBroadcastReceiver appSpecificLocaleBroadcastReceiver =
+                    new BlockingBroadcastReceiver();
+            mContext.registerReceiver(appSpecificLocaleBroadcastReceiver,
+                    new IntentFilter(Intent.ACTION_APPLICATION_LOCALE_CHANGED));
+
+            // Hold Manifest.permission.READ_APP_SPECIFIC_LOCALES while the broadcast is sent,
+            // so that we receive it.
+            runWithShellPermissionIdentity(() -> {
+                // Installation will trigger lazy restore, which internally calls
+                // setApplicationLocales
+                // which sends out the ACTION_APPLICATION_LOCALE_CHANGED broadcast.
+                install(TEST_APP_APK_1);
+                appSpecificLocaleBroadcastReceiver.await();
+            }, Manifest.permission.READ_APP_SPECIFIC_LOCALES);
+
+            appSpecificLocaleBroadcastReceiver.assertOneBroadcastReceived();
+            appSpecificLocaleBroadcastReceiver.assertReceivedBroadcastContains(TEST_APP_PACKAGE_1,
+                    DEFAULT_LOCALES_1);
+            assertLocalesForApp(TEST_APP_PACKAGE_1, DEFAULT_LOCALES_1);
+            appSpecificLocaleBroadcastReceiver.reset();
+
+            // Set the time detector to only use ORIGIN_EXTERNAL.
+            deviceConfigShellHelper.put(NAMESPACE_SYSTEM_TIME,
+                    DeviceConfigKeys.TimeDetector.KEY_TIME_DETECTOR_ORIGIN_PRIORITIES_OVERRIDE,
+                    DeviceConfigKeys.TimeDetector.ORIGIN_EXTERNAL);
+            sleepForAsyncOperation();
+
+            // 1 second elapses after retention period.
+            long afterRetentionPeriodMillis = Duration.ofMillis(startCurrentTimeMillis).plusMillis(
+                    RETENTION_PERIOD.plusSeconds(1).toMillis()).toMillis();
+            ExternalTimeSuggestion futureTimeSuggestion =
+                    new ExternalTimeSuggestion(elapsedRealtimeMillis, afterRetentionPeriodMillis);
+
+            runWithShellPermissionIdentity(() -> {
+                timeManager.suggestExternalTime(futureTimeSuggestion);
+            }, Manifest.permission.SUGGEST_EXTERNAL_TIME);
+            sleepForAsyncOperation();
+
+            // The suggestion should have been accepted so the system clock should have advanced.
+            assertTrue(System.currentTimeMillis() >= afterRetentionPeriodMillis);
+
+            // Hold Manifest.permission.READ_APP_SPECIFIC_LOCALES while the broadcast is sent,
+            // so that we receive it.
+            runWithShellPermissionIdentity(() -> {
+                // Installation will trigger lazy restore, which internally calls
+                // setApplicationLocales
+                // which sends out the ACTION_APPLICATION_LOCALE_CHANGED broadcast.
+                install(TEST_APP_APK_2);
+                appSpecificLocaleBroadcastReceiver.await();
+            }, Manifest.permission.READ_APP_SPECIFIC_LOCALES);
+
+            appSpecificLocaleBroadcastReceiver.assertNoBroadcastReceived();
+
+            // Does not restore the locales on package install.
+            assertLocalesForApp(TEST_APP_PACKAGE_2, EMPTY_LOCALES);
+        } finally {
+
+            // Now do our best to return the device to its original state.
+            ExternalTimeSuggestion originalTimeSuggestion =
+                    new ExternalTimeSuggestion(elapsedRealtimeMillis, startCurrentTimeMillis);
+            runWithShellPermissionIdentity(() -> {
+                timeManager.suggestExternalTime(originalTimeSuggestion);
+            }, Manifest.permission.SUGGEST_EXTERNAL_TIME);
+            sleepForAsyncOperation();
+
+            deviceConfigShellHelper.restoreDeviceConfigStateForTest(deviceConfigPreTestState);
+        }
+    }
+
+    /**
+     * Sleeps for a length of time sufficient to allow async operations to complete. Many time
+     * manager APIs are or could be asynchronous and deal with time, so there are no practical
+     * alternatives.
+     */
+    private static void sleepForAsyncOperation() throws Exception {
+        Thread.sleep(5_000);
+    }
+
+    // TODO(b/210593602): Add a test to check staged data removal after the retention period.
+
+    private void setApplicationLocalesAndVerify(String packageName, LocaleList locales)
+            throws Exception {
+        runWithShellPermissionIdentity(() ->
+                        mLocaleManager.setApplicationLocales(packageName, locales),
+                Manifest.permission.CHANGE_CONFIGURATION);
+        assertLocalesForApp(packageName, locales);
+    }
+
+    /**
+     * Verifies that the locales are correctly set for another package
+     * by fetching locales of the app with a binder call.
+     */
+    private void assertLocalesForApp(String packageName,
+            LocaleList expectedLocales) throws Exception {
+        assertEquals(expectedLocales, getApplicationLocales(packageName));
+    }
+
+    private LocaleList getApplicationLocales(String packageName) throws Exception {
+        return callWithShellPermissionIdentity(() ->
+                        mLocaleManager.getApplicationLocales(packageName),
+                Manifest.permission.READ_APP_SPECIFIC_LOCALES);
+    }
+
+    private void install(String apk) {
+        ShellUtils.runShellCommand("pm install -r " + apk);
+    }
+
+    private void uninstall(String packageName) {
+        ShellUtils.runShellCommand("pm uninstall " + packageName);
+    }
+
+    private void setAndBackupDefaultAppLocales() throws Exception {
+        setApplicationLocalesAndVerify(TEST_APP_PACKAGE_1, DEFAULT_LOCALES_1);
+        setApplicationLocalesAndVerify(TEST_APP_PACKAGE_2, DEFAULT_LOCALES_2);
+        // Backup the data for SYSTEM_PACKAGE which includes app-locales.
+        getBackupUtils().backupNowAndAssertSuccess(SYSTEM_PACKAGE);
+    }
+
+    private void resetAppLocales() throws Exception {
+        setApplicationLocalesAndVerify(TEST_APP_PACKAGE_1, EMPTY_LOCALES);
+        setApplicationLocalesAndVerify(TEST_APP_PACKAGE_2, EMPTY_LOCALES);
+    }
+
+    private static final class BlockingBroadcastReceiver extends BroadcastReceiver {
+        private CountDownLatch mLatch = new CountDownLatch(1);
+        private String mPackageName;
+        private LocaleList mLocales;
+        private int mCalls;
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent.hasExtra(Intent.EXTRA_PACKAGE_NAME)) {
+                mPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+            }
+            if (intent.hasExtra(Intent.EXTRA_LOCALE_LIST)) {
+                mLocales = intent.getParcelableExtra(Intent.EXTRA_LOCALE_LIST);
+            }
+            mCalls += 1;
+            mLatch.countDown();
+        }
+
+        public void await() throws Exception {
+            mLatch.await(/* timeout= */ 5, TimeUnit.SECONDS);
+        }
+
+        public void reset() {
+            mLatch = new CountDownLatch(1);
+            mCalls = 0;
+            mPackageName = null;
+            mLocales = null;
+        }
+
+        public void assertOneBroadcastReceived() {
+            assertEquals(1, mCalls);
+        }
+
+        public void assertNoBroadcastReceived() {
+            assertEquals(0, mCalls);
+        }
+
+        /**
+         * Verifies that the broadcast received in the relevant apps have the correct information
+         * in the intent extras. It verifies the below extras:
+         * <ul>
+         * <li> {@link Intent#EXTRA_PACKAGE_NAME}
+         * <li> {@link Intent#EXTRA_LOCALE_LIST}
+         * </ul>
+         */
+        public void assertReceivedBroadcastContains(String expectedPackageName,
+                LocaleList expectedLocales) {
+            assertEquals(expectedPackageName, mPackageName);
+            assertEquals(expectedLocales, mLocales);
+        }
+    }
+}
diff --git a/tests/camera/Android.bp b/tests/camera/Android.bp
index 7558776..aae58c6 100644
--- a/tests/camera/Android.bp
+++ b/tests/camera/Android.bp
@@ -58,6 +58,7 @@
     static_libs: [
         "compatibility-device-util-axt",
         "ctstestrunner-axt",
+        "cts-hardware-lib",
         "mockito-target-minus-junit4",
         "android-ex-camera2",
         "CtsCameraUtils",
diff --git a/tests/camera/AndroidManifest.xml b/tests/camera/AndroidManifest.xml
index 7426c65..5cc761c 100644
--- a/tests/camera/AndroidManifest.xml
+++ b/tests/camera/AndroidManifest.xml
@@ -32,7 +32,7 @@
         <activity android:name="android.hardware.cts.CameraCtsActivity"
             android:label="CameraCtsActivity"
             android:screenOrientation="locked"
-            android:configChanges="keyboardHidden|orientation|screenSize">
+            android:configChanges="orientation|screenSize|screenLayout|keyboardHidden">
         </activity>
 
         <activity android:name="android.hardware.camera2.cts.Camera2SurfaceViewCtsActivity"
@@ -89,6 +89,9 @@
             android:screenOrientation="locked"
             android:configChanges="keyboardHidden|orientation|screenSize">
         </activity>
+        <activity android:name="android.hardware.camera2.cts.EmptyActivity"
+            android:label="EmptyActivity">
+        </activity>
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
diff --git a/tests/camera/api31test/src/android/camera/cts/api31test/SPerfClassTest.java b/tests/camera/api31test/src/android/camera/cts/api31test/SPerfClassTest.java
index cf02ebe..feb5567 100644
--- a/tests/camera/api31test/src/android/camera/cts/api31test/SPerfClassTest.java
+++ b/tests/camera/api31test/src/android/camera/cts/api31test/SPerfClassTest.java
@@ -206,9 +206,9 @@
     }
 
     /**
-     * Check camera S Performance class requirement for JPEG sizes.
+     * Check JPEG size overrides for devices claiming S Performance class requirement via
+     * Version.MEDIA_PERFORMANCE_CLASS
      */
-    @CddTest(requirement="7.5/H-1-8")
     public void testSPerfClassJpegSizes() throws Exception {
         boolean isSPerfClass = CameraTestUtils.isSPerfClass();
         if (!isSPerfClass) {
diff --git a/tests/camera/libctscamera2jni/native-camera-jni.cpp b/tests/camera/libctscamera2jni/native-camera-jni.cpp
index 3c43ae2..fce769e 100644
--- a/tests/camera/libctscamera2jni/native-camera-jni.cpp
+++ b/tests/camera/libctscamera2jni/native-camera-jni.cpp
@@ -315,6 +315,7 @@
         std::unique_lock<std::mutex> l(mMutex);
         clearSavedRequestsLocked();
         mCompletedFrameNumbers.clear();
+        mStartedFrameNumbers.clear();
         clearFailedLostFrameNumbersLocked();
     }
 
@@ -323,6 +324,18 @@
         //Not used for now
     }
 
+    static void onCaptureStartV2(void* obj, ACameraCaptureSession* /*session*/,
+            const ACaptureRequest* /*request*/, int64_t /*timestamp*/, int64_t frameNumber) {
+        if ((obj == nullptr) || (frameNumber < 0)) {
+            return;
+        }
+        CaptureResultListener* thiz = reinterpret_cast<CaptureResultListener*>(obj);
+        std::lock_guard<std::mutex> lock(thiz->mMutex);
+
+        thiz->mStartedFrameNumbers.insert(frameNumber);
+        thiz->mStartCondition.notify_one();
+    }
+
     static void onCaptureProgressed(void* /*obj*/, ACameraCaptureSession* /*session*/,
             ACaptureRequest* /*request*/, const ACameraMetadata* /*result*/) {
         //Not used for now
@@ -541,6 +554,25 @@
         return ret;
     }
 
+    bool waitForFrameNumberStarted(int64_t frameNumber, uint32_t timeoutSec) {
+        bool ret = false;
+        std::unique_lock<std::mutex> l(mMutex);
+
+        while ((mStartedFrameNumbers.find(frameNumber) == mStartedFrameNumbers.end())) {
+            auto timeout = std::chrono::system_clock::now() +
+                           std::chrono::seconds(timeoutSec);
+            if (std::cv_status::timeout == mStartCondition.wait_until(l, timeout)) {
+                break;
+            }
+        }
+
+        if ((mStartedFrameNumbers.find(frameNumber) != mStartedFrameNumbers.end())) {
+            ret = true;
+        }
+
+        return ret;
+    }
+
     void setRequestSave(bool enable) {
         std::unique_lock<std::mutex> l(mMutex);
         if (!enable) {
@@ -581,9 +613,11 @@
   private:
     std::mutex mMutex;
     std::condition_variable mResultCondition;
+    std::condition_variable mStartCondition;
     int mLastSequenceIdCompleted = -1;
     int64_t mLastSequenceFrameNumber = -1;
     std::set<int64_t> mCompletedFrameNumbers;
+    std::set<int64_t> mStartedFrameNumbers;
     std::set<int64_t> mFailedFrameNumbers, mBufferLostFrameNumbers;
     bool    mSaveCompletedRequests = false;
     std::vector<ACaptureRequest*> mCompletedRequests;
@@ -1059,6 +1093,7 @@
 
     int getNumCameras() {
         if (!mMgrInited || !mCameraIdList) {
+            ALOGE("%s CameraManager not inited yet.", __FUNCTION__);
             return -1;
         }
         if (mOverrideCameraId != nullptr) {
@@ -1510,7 +1545,7 @@
     }
 
     camera_status_t startPreview(int *sequenceId = nullptr, size_t physicalIdCnt = 0,
-            const char*const* extraPhysicalOutputs = nullptr) {
+            const char*const* extraPhysicalOutputs = nullptr, bool v2Callbacks = false) {
         if (mSession == nullptr || mPreviewRequest == nullptr) {
             ALOGE("Testcase cannot start preview: session %p, preview request %p",
                     mSession, mPreviewRequest);
@@ -1522,8 +1557,13 @@
             ret = ACameraCaptureSession_setRepeatingRequest(
                    mSession, nullptr, 1, &mPreviewRequest, &previewSeqId);
         } else if (physicalIdCnt == 0) {
-            ret = ACameraCaptureSession_setRepeatingRequest(
-                   mSession, &mResultCb, 1, &mPreviewRequest, sequenceId);
+            if (v2Callbacks) {
+                ret = ACameraCaptureSession_setRepeatingRequestV2(
+                      mSession, &mResultCb2, 1, &mPreviewRequest, sequenceId);
+            } else {
+                ret = ACameraCaptureSession_setRepeatingRequest(
+                      mSession, &mResultCb, 1, &mPreviewRequest, sequenceId);
+            }
         } else {
             if (extraPhysicalOutputs == nullptr) {
                 ALOGE("Testcase missing valid physical camera Ids for logical camera");
@@ -1532,8 +1572,13 @@
             CaptureResultListener* resultListener =
                     static_cast<CaptureResultListener*>(mLogicalCameraResultCb.context);
             resultListener->registerPhysicalResults(physicalIdCnt, extraPhysicalOutputs);
-            ret = ACameraCaptureSession_logicalCamera_setRepeatingRequest(
-                    mSession, &mLogicalCameraResultCb, 1, &mPreviewRequest, sequenceId);
+            if (v2Callbacks) {
+                ret = ACameraCaptureSession_logicalCamera_setRepeatingRequestV2(
+                        mSession, &mLogicalCameraResultCb2, 1, &mPreviewRequest, sequenceId);
+            } else {
+                ret = ACameraCaptureSession_logicalCamera_setRepeatingRequest(
+                        mSession, &mLogicalCameraResultCb, 1, &mPreviewRequest, sequenceId);
+            }
         }
         return ret;
     }
@@ -1594,6 +1639,10 @@
         return mResultListener.waitForFrameNumber(frameNumber, timeoutSec);
     }
 
+    bool waitForFrameNumberStarted(int64_t frameNumber, uint32_t timeoutSec) {
+        return mResultListener.waitForFrameNumberStarted(frameNumber, timeoutSec);
+    }
+
     camera_status_t takePicture() {
         if (mSession == nullptr || mStillRequest == nullptr) {
             ALOGE("Testcase cannot take picture: session %p, still request %p",
@@ -1701,6 +1750,28 @@
         CaptureResultListener::onCaptureBufferLost
     };
 
+    ACameraCaptureSession_captureCallbacksV2 mResultCb2 {
+        &mResultListener,
+        CaptureResultListener::onCaptureStartV2,
+        CaptureResultListener::onCaptureProgressed,
+        CaptureResultListener::onCaptureCompleted,
+        CaptureResultListener::onCaptureFailed,
+        CaptureResultListener::onCaptureSequenceCompleted,
+        CaptureResultListener::onCaptureSequenceAborted,
+        CaptureResultListener::onCaptureBufferLost
+    };
+
+    ACameraCaptureSession_logicalCamera_captureCallbacksV2 mLogicalCameraResultCb2 {
+        &mResultListener,
+        CaptureResultListener::onCaptureStartV2,
+        CaptureResultListener::onCaptureProgressed,
+        CaptureResultListener::onLogicalCameraCaptureCompleted,
+        CaptureResultListener::onLogicalCameraCaptureFailed,
+        CaptureResultListener::onCaptureSequenceCompleted,
+        CaptureResultListener::onCaptureSequenceAborted,
+        CaptureResultListener::onCaptureBufferLost
+    };
+
     ACameraCaptureSession_logicalCamera_captureCallbacks mLogicalCameraResultCb {
         &mResultListener,
         CaptureResultListener::onCaptureStart,
@@ -2849,14 +2920,13 @@
     return pass;
 }
 
-extern "C" jboolean
-Java_android_hardware_camera2_cts_NativeCameraDeviceTest_\
-testCameraDeviceSimplePreviewNative(
+bool testCameraDeviceSimplePreviewNativeInternal(
         JNIEnv* env, jclass /*clazz*/, jobject jPreviewSurface,
-        jstring jOverrideCameraId) {
+        jstring jOverrideCameraId, bool v2Callbacks) {
     ALOGV("%s", __FUNCTION__);
     int numCameras = 0;
     bool pass = false;
+    const int timeoutSec = 1;
     PreviewTestCase testCase;
 
     camera_status_t ret = testCase.initWithErrorLog(env, jOverrideCameraId);
@@ -2920,8 +2990,8 @@
             // Don't log error here. testcase did it
             goto cleanup;
         }
-
-        ret = testCase.startPreview();
+        int sequenceId = 0;
+        ret = testCase.startPreview(&sequenceId, 0, nullptr, v2Callbacks);
         if (ret != ACAMERA_OK) {
             LOG_ERROR(errorString, "Start preview failed!");
             goto cleanup;
@@ -2929,6 +2999,31 @@
 
         sleep(3);
 
+        ret = testCase.stopPreview();
+        if (ret != ACAMERA_OK) {
+            ALOGE("%s: stopPreview failed", __FUNCTION__);
+            LOG_ERROR(errorString, "stopPreview failed!");
+            goto cleanup;
+        }
+
+        //Then wait for all old requests to flush
+        int64_t lastFrameNumber =
+                testCase.getCaptureSequenceLastFrameNumber(sequenceId, timeoutSec);
+        if (lastFrameNumber < 0) {
+            LOG_ERROR(errorString, "Camera %s failed to acquire last frame number!",
+                    cameraId);
+            goto cleanup;
+        }
+        if (v2Callbacks) {
+              bool frameStarted = testCase.waitForFrameNumberStarted(lastFrameNumber, timeoutSec);
+            if (!frameStarted) {
+                LOG_ERROR(errorString, "Camera %s timed out waiting on onCaptureStart for last"
+                        "frame number!", cameraId);
+                goto cleanup;
+            }
+
+        }
+
         ret = testCase.resetWithErrorLog();
         if (ret != ACAMERA_OK) {
             // Don't log error here. testcase did it
@@ -2960,6 +3055,24 @@
 
 extern "C" jboolean
 Java_android_hardware_camera2_cts_NativeCameraDeviceTest_\
+testCameraDeviceSimplePreviewNative(
+        JNIEnv* env, jclass clazz, jobject jPreviewSurface,
+        jstring jOverrideCameraId) {
+    return testCameraDeviceSimplePreviewNativeInternal(env, clazz, jPreviewSurface,
+            jOverrideCameraId, /*v2Callbacks*/false);
+}
+
+extern "C" jboolean
+Java_android_hardware_camera2_cts_NativeCameraDeviceTest_\
+testCameraDeviceSimplePreviewNative2(
+        JNIEnv* env, jclass clazz, jobject jPreviewSurface,
+        jstring jOverrideCameraId) {
+    return testCameraDeviceSimplePreviewNativeInternal(env, clazz, jPreviewSurface,
+            jOverrideCameraId, /*v2Callbacks*/true);
+}
+
+extern "C" jboolean
+Java_android_hardware_camera2_cts_NativeCameraDeviceTest_\
 testCameraDevicePreviewWithSessionParametersNative(
         JNIEnv* env, jclass /*clazz*/, jobject jPreviewSurface,
         jstring jOverrideCameraId) {
@@ -3091,7 +3204,7 @@
 
 bool nativeCameraDeviceLogicalPhysicalStreaming(
         JNIEnv* env, jobject jPreviewSurface, bool usePhysicalSettings,
-        jstring jOverrideCameraId) {
+        jstring jOverrideCameraId, bool v2Callbacks) {
     const int NUM_TEST_IMAGES = 10;
     const int TEST_WIDTH  = 640;
     const int TEST_HEIGHT = 480;
@@ -3103,6 +3216,7 @@
     media_status_t mediaRet = AMEDIA_ERROR_UNKNOWN;
     PreviewTestCase testCase;
     int64_t lastFrameNumber = 0;
+    bool frameStarted = false;
     bool frameArrived = false;
     uint32_t timeoutSec = 1;
     uint32_t runPreviewSec = 2;
@@ -3176,6 +3290,8 @@
                     chars, ACAMERA_REQUEST_AVAILABLE_PHYSICAL_CAMERA_REQUEST_KEYS, &entry);
             if (status == ACAMERA_ERROR_METADATA_NOT_FOUND) {
                 // No supported PHYSICAL_CAMERA_REQUEST_KEYS, skip test
+                ALOGI("%s camera id %s physical request keys not reported, skipping",
+                        __FUNCTION__, cameraId);
                 continue;
             } else if (status != ACAMERA_OK) {
                 // Do not log error here. testcase did it.
@@ -3304,7 +3420,7 @@
         }
 
         int sequenceId = 0;
-        ret = testCase.startPreview(&sequenceId, 2, candidateIds.data());
+        ret = testCase.startPreview(&sequenceId, 2, candidateIds.data(), v2Callbacks);
         if (ret != ACAMERA_OK) {
             LOG_ERROR(errorString, "Start preview failed!");
             goto cleanup;
@@ -3326,6 +3442,15 @@
                     cameraId);
             goto cleanup;
         }
+        if (v2Callbacks) {
+              frameStarted = testCase.waitForFrameNumberStarted(lastFrameNumber, timeoutSec);
+            if (!frameStarted) {
+                LOG_ERROR(errorString, "Camera %s timed out waiting on onCaptureStart for last"
+                        "frame number!", cameraId);
+                goto cleanup;
+            }
+
+        }
 
         frameArrived = testCase.waitForFrameNumber(lastFrameNumber, timeoutSec);
         if (!frameArrived) {
@@ -3374,7 +3499,17 @@
         jstring jOverrideCameraId) {
     return nativeCameraDeviceLogicalPhysicalStreaming(env,
             jPreviewSurface, false /*usePhysicalSettings*/,
-            jOverrideCameraId);
+            jOverrideCameraId, /*v2Callbacks*/false);
+}
+
+extern "C" jboolean
+Java_android_hardware_camera2_cts_NativeCameraDeviceTest_\
+testCameraDeviceLogicalPhysicalStreamingNative2(
+        JNIEnv* env, jclass /*clazz*/, jobject jPreviewSurface,
+        jstring jOverrideCameraId) {
+    return nativeCameraDeviceLogicalPhysicalStreaming(env,
+            jPreviewSurface, false /*usePhysicalSettings*/,
+            jOverrideCameraId, /*v2Callbacks*/true);
 }
 
 extern "C" jboolean
@@ -3384,7 +3519,17 @@
         jstring jOverrideCameraId) {
     return nativeCameraDeviceLogicalPhysicalStreaming(env,
             jPreviewSurface, true /*usePhysicalSettings*/,
-            jOverrideCameraId);
+            jOverrideCameraId, /*v2Callbacks*/false);
+}
+
+extern "C" jboolean
+Java_android_hardware_camera2_cts_NativeCameraDeviceTest_\
+testCameraDeviceLogicalPhysicalSettingsNative2(
+        JNIEnv* env, jclass /*clazz*/, jobject jPreviewSurface,
+        jstring jOverrideCameraId) {
+    return nativeCameraDeviceLogicalPhysicalStreaming(env,
+            jPreviewSurface, true /*usePhysicalSettings*/,
+            jOverrideCameraId, /*v2Callbacks*/ true);
 }
 
 bool nativeImageReaderTestBase(
diff --git a/tests/camera/src/android/hardware/camera2/cts/CameraExtensionCharacteristicsTest.java b/tests/camera/src/android/hardware/camera2/cts/CameraExtensionCharacteristicsTest.java
index d725a8a..838259e 100644
--- a/tests/camera/src/android/hardware/camera2/cts/CameraExtensionCharacteristicsTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/CameraExtensionCharacteristicsTest.java
@@ -19,10 +19,13 @@
 import android.graphics.ImageFormat;
 import android.graphics.SurfaceTexture;
 import android.hardware.camera2.CameraExtensionCharacteristics;
+import android.hardware.camera2.CaptureRequest;
+import android.hardware.camera2.CaptureResult;
 import android.hardware.camera2.cts.helpers.StaticMetadata;
 import android.hardware.camera2.cts.testcases.Camera2AndroidTestRule;
 import android.platform.test.annotations.AppModeFull;
 import android.renderscript.Allocation;
+import android.util.ArraySet;
 import android.util.Log;
 import android.util.Range;
 import android.util.Size;
@@ -34,6 +37,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 import static org.junit.Assert.*;
 
@@ -238,4 +242,86 @@
             }
         }
     }
+
+    @Test
+    public void testExtensionRequestKeys() throws Exception {
+        for (String id : mTestRule.getCameraIdsUnderTest()) {
+            StaticMetadata staticMeta =
+                    new StaticMetadata(mTestRule.getCameraManager().getCameraCharacteristics(id));
+            if (!staticMeta.isColorOutputSupported()) {
+                continue;
+            }
+
+            CameraExtensionCharacteristics chars =
+                    mTestRule.getCameraManager().getCameraExtensionCharacteristics(id);
+            List<Integer> supportedExtensions = chars.getSupportedExtensions();
+            for (Integer extension : supportedExtensions) {
+                Set<CaptureRequest.Key> captureKeySet =
+                        chars.getAvailableCaptureRequestKeys(extension);
+                ArraySet<CaptureRequest.Key> captureKeys = new ArraySet<>(captureKeySet);
+                // No repeating keys allowed
+                assertEquals(captureKeys.size(), captureKeySet.size());
+                // Jpeg quality and jpeg orientation must always be available
+                assertTrue(captureKeys.contains(CaptureRequest.JPEG_QUALITY));
+                assertTrue(captureKeys.contains(CaptureRequest.JPEG_ORIENTATION));
+                // The extension request keys must always match or be a subset of the regular keys
+                for (CaptureRequest.Key captureKey : captureKeys) {
+                    String msg = String.format("Supported extension request key %s doesn't appear "
+                            + " int the regular camera characteristics list of supported keys!",
+                            captureKey.getName());
+                    assertTrue(msg, staticMeta.areKeysAvailable(captureKey));
+                }
+            }
+        }
+    }
+
+    @Test
+    public void testExtensionResultKeys() throws Exception {
+        for (String id : mTestRule.getCameraIdsUnderTest()) {
+            StaticMetadata staticMeta =
+                    new StaticMetadata(mTestRule.getCameraManager().getCameraCharacteristics(id));
+            if (!staticMeta.isColorOutputSupported()) {
+                continue;
+            }
+
+            CameraExtensionCharacteristics chars =
+                    mTestRule.getCameraManager().getCameraExtensionCharacteristics(id);
+            List<Integer> supportedExtensions = chars.getSupportedExtensions();
+            for (Integer extension : supportedExtensions) {
+                Set<CaptureResult.Key> resultKeySet =
+                        chars.getAvailableCaptureResultKeys(extension);
+                if (resultKeySet.isEmpty()) {
+                    // Extension capture result support is optional
+                    continue;
+                }
+
+                ArraySet<CaptureResult.Key> resultKeys = new ArraySet<>(resultKeySet);
+                ArraySet<String> resultKeyNames = new ArraySet<>(resultKeys.size());
+                // No repeating keys allowed
+                assertEquals(resultKeys.size(), resultKeySet.size());
+                // Sensor timestamp, jpeg quality and jpeg orientation must always be available
+                assertTrue(resultKeys.contains(CaptureResult.SENSOR_TIMESTAMP));
+                assertTrue(resultKeys.contains(CaptureResult.JPEG_QUALITY));
+                assertTrue(resultKeys.contains(CaptureResult.JPEG_ORIENTATION));
+                // The extension result keys must always match or be a subset of the regular result
+                // keys
+                for (CaptureResult.Key resultKey : resultKeys) {
+                    String msg = String.format("Supported extension result key %s doesn't appear "
+                            + " in the regular camera characteristics list of supported keys!",
+                            resultKey.getName());
+                    assertTrue(msg, staticMeta.areKeysAvailable(resultKey));
+                    resultKeyNames.add(resultKey.getName());
+                }
+
+                ArraySet<CaptureRequest.Key> captureKeys = new ArraySet<>(
+                        chars.getAvailableCaptureRequestKeys(extension));
+                for (CaptureRequest.Key requestKey : captureKeys) {
+                    String msg = String.format("Supported extension request key %s doesn't appear "
+                            + " in the corresponding supported extension result key list!",
+                            requestKey.getName());
+                    assertTrue(msg, resultKeyNames.contains(requestKey.getName()));
+                }
+            }
+        }
+    }
 }
diff --git a/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java b/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java
index e50a0c8..73b81dc 100644
--- a/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/CameraExtensionSessionTest.java
@@ -44,6 +44,7 @@
 import android.hardware.camera2.CameraExtensionSession;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
+import android.hardware.camera2.TotalCaptureResult;
 import android.hardware.camera2.cts.helpers.CameraErrorCollector;
 import android.hardware.camera2.cts.helpers.StaticMetadata;
 import android.hardware.camera2.cts.testcases.Camera2AndroidTestRule;
@@ -74,6 +75,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -88,6 +90,7 @@
 
     private SurfaceTexture mSurfaceTexture = null;
     private Camera2AndroidTestRule mTestRule = null;
+    private CameraErrorCollector mCollector =  null;
 
     private DeviceReportLog mReportLog;
 
@@ -96,6 +99,7 @@
         super.setUp();
         mTestRule = new Camera2AndroidTestRule(mContext);
         mTestRule.before();
+        mCollector = new CameraErrorCollector();
     }
 
     @Override
@@ -107,6 +111,13 @@
             mSurfaceTexture.release();
             mSurfaceTexture = null;
         }
+        if (mCollector != null) {
+            try {
+                mCollector.verify();
+            } catch (Throwable e) {
+                throw new Exception(e.getMessage());
+            }
+        }
         super.tearDown();
     }
 
@@ -396,6 +407,9 @@
                                 new HandlerExecutor(mTestRule.getHandler()),
                                 sessionListener);
 
+                boolean captureResultsSupported =
+                        !extensionChars.getAvailableCaptureResultKeys(extension).isEmpty();
+
                 try {
                     mTestRule.openDevice(id);
                     CameraDevice camera = mTestRule.getCamera();
@@ -412,7 +426,9 @@
                     CameraExtensionSession.ExtensionCaptureCallback captureCallbackMock =
                             mock(CameraExtensionSession.ExtensionCaptureCallback.class);
                     SimpleCaptureCallback simpleCaptureCallback =
-                            new SimpleCaptureCallback(captureCallbackMock);
+                            new SimpleCaptureCallback(captureCallbackMock,
+                                    extensionChars.getAvailableCaptureResultKeys(extension),
+                                    mCollector);
                     CaptureRequest request = captureBuilder.build();
                     int sequenceId = extensionSession.setRepeatingRequest(request,
                             new HandlerExecutor(mTestRule.getHandler()), simpleCaptureCallback);
@@ -423,6 +439,12 @@
                     verify(captureCallbackMock,
                             timeout(REPEATING_REQUEST_TIMEOUT_MS).atLeastOnce())
                             .onCaptureProcessStarted(extensionSession, request);
+                    if (captureResultsSupported) {
+                        verify(captureCallbackMock,
+                                timeout(MULTI_FRAME_CAPTURE_IMAGE_TIMEOUT_MS).atLeastOnce())
+                                .onCaptureResultAvailable(eq(extensionSession), eq(request),
+                                        any(TotalCaptureResult.class));
+                    }
 
                     extensionSession.stopRepeating();
 
@@ -513,6 +535,8 @@
                     mReportLog.addValue("extension_id", extension, ResultType.NEUTRAL,
                             ResultUnit.NONE);
                     double[] captureTimes = new double[IMAGE_COUNT];
+                    boolean captureResultsSupported =
+                            !extensionChars.getAvailableCaptureResultKeys(extension).isEmpty();
 
                     try {
                         mTestRule.openDevice(id);
@@ -527,8 +551,12 @@
                                 mTestRule.getCamera().createCaptureRequest(
                                         CameraDevice.TEMPLATE_STILL_CAPTURE);
                         captureBuilder.addTarget(imageReaderSurface);
-                        CameraExtensionSession.ExtensionCaptureCallback captureCallback =
+                        CameraExtensionSession.ExtensionCaptureCallback captureMockCallback =
                                 mock(CameraExtensionSession.ExtensionCaptureCallback.class);
+                        SimpleCaptureCallback captureCallback =
+                                new SimpleCaptureCallback(captureMockCallback,
+                                        extensionChars.getAvailableCaptureResultKeys(extension),
+                                        mCollector);
 
                         for (int i = 0; i < IMAGE_COUNT; i++) {
                             int jpegOrientation = (i * 90) % 360; // degrees [0..270]
@@ -552,14 +580,20 @@
                             }
                             img.close();
 
-                            verify(captureCallback, times(1))
+                            verify(captureMockCallback, times(1))
                                     .onCaptureStarted(eq(extensionSession), eq(request), anyLong());
-                            verify(captureCallback,
+                            verify(captureMockCallback,
                                     timeout(MULTI_FRAME_CAPTURE_IMAGE_TIMEOUT_MS).times(1))
                                     .onCaptureProcessStarted(extensionSession, request);
-                            verify(captureCallback,
+                            verify(captureMockCallback,
                                     timeout(MULTI_FRAME_CAPTURE_IMAGE_TIMEOUT_MS).times(1))
                                     .onCaptureSequenceCompleted(extensionSession, sequenceId);
+                            if (captureResultsSupported) {
+                                verify(captureMockCallback,
+                                        timeout(MULTI_FRAME_CAPTURE_IMAGE_TIMEOUT_MS).times(1))
+                                        .onCaptureResultAvailable(eq(extensionSession), eq(request),
+                                                any(TotalCaptureResult.class));
+                            }
                         }
 
                         long avgCaptureLatency = (long) Stat.getAverage(captureTimes);
@@ -568,10 +602,10 @@
                         mReportLog.addValue(resultFormat, avgCaptureLatency,
                                 ResultType.LOWER_BETTER, ResultUnit.MS);
 
-                        verify(captureCallback, times(0))
+                        verify(captureMockCallback, times(0))
                                 .onCaptureSequenceAborted(any(CameraExtensionSession.class),
                                         anyInt());
-                        verify(captureCallback, times(0))
+                        verify(captureMockCallback, times(0))
                                 .onCaptureFailed(any(CameraExtensionSession.class),
                                         any(CaptureRequest.class));
                         Range<Long> latencyRange =
@@ -588,7 +622,6 @@
                             assertTrue(msg, latencyRange.contains(avgCaptureLatency));
                         }
 
-
                         extensionSession.close();
 
                         sessionListener.getStateWaiter().waitForState(
@@ -810,6 +843,9 @@
                     }
                 }
 
+                boolean captureResultsSupported =
+                        !extensionChars.getAvailableCaptureResultKeys(extension).isEmpty();
+
                 mSurfaceTexture.setDefaultBufferSize(maxRepeatingSize.getWidth(),
                         maxRepeatingSize.getHeight());
                 Surface texturedSurface = new Surface(mSurfaceTexture);
@@ -839,7 +875,9 @@
                     CameraExtensionSession.ExtensionCaptureCallback repeatingCallbackMock =
                             mock(CameraExtensionSession.ExtensionCaptureCallback.class);
                     SimpleCaptureCallback repeatingCaptureCallback =
-                            new SimpleCaptureCallback(repeatingCallbackMock);
+                            new SimpleCaptureCallback(repeatingCallbackMock,
+                                    extensionChars.getAvailableCaptureResultKeys(extension),
+                                    mCollector);
                     CaptureRequest repeatingRequest = captureBuilder.build();
                     int repeatingSequenceId =
                             extensionSession.setRepeatingRequest(repeatingRequest,
@@ -853,6 +891,12 @@
                                     anyLong());
                     verify(repeatingCallbackMock, atLeastOnce())
                             .onCaptureProcessStarted(extensionSession, repeatingRequest);
+                    if (captureResultsSupported) {
+                        verify(repeatingCallbackMock,
+                                timeout(MULTI_FRAME_CAPTURE_IMAGE_TIMEOUT_MS).atLeastOnce())
+                                .onCaptureResultAvailable(eq(extensionSession),
+                                        eq(repeatingRequest), any(TotalCaptureResult.class));
+                    }
 
                     captureBuilder = mTestRule.getCamera().createCaptureRequest(
                             android.hardware.camera2.CameraDevice.TEMPLATE_STILL_CAPTURE);
@@ -875,6 +919,12 @@
                                     anyLong());
                     verify(captureCallback, timeout(MULTI_FRAME_CAPTURE_IMAGE_TIMEOUT_MS).times(1))
                             .onCaptureProcessStarted(extensionSession, captureRequest);
+                    if (captureResultsSupported) {
+                        verify(captureCallback,
+                                timeout(MULTI_FRAME_CAPTURE_IMAGE_TIMEOUT_MS).times(1))
+                                .onCaptureResultAvailable(eq(extensionSession),
+                                        eq(captureRequest), any(TotalCaptureResult.class));
+                    }
                     verify(captureCallback, timeout(MULTI_FRAME_CAPTURE_IMAGE_TIMEOUT_MS).times(1))
                             .onCaptureSequenceCompleted(extensionSession,
                                     captureSequenceId);
@@ -988,9 +1038,14 @@
         private int mNumFramesFailed = 0;
         private boolean mNonIncreasingTimestamps = false;
         private final CameraExtensionSession.ExtensionCaptureCallback mProxy;
+        private final HashSet<CaptureResult.Key> mSupportedResultKeys;
+        private final CameraErrorCollector mCollector;
 
-        public SimpleCaptureCallback(CameraExtensionSession.ExtensionCaptureCallback proxy) {
+        public SimpleCaptureCallback(CameraExtensionSession.ExtensionCaptureCallback proxy,
+                Set<CaptureResult.Key> supportedResultKeys, CameraErrorCollector errorCollector) {
             mProxy = proxy;
+            mSupportedResultKeys = new HashSet<>(supportedResultKeys);
+            mCollector = errorCollector;
         }
 
         @Override
@@ -1041,6 +1096,42 @@
             }
         }
 
+        @Override
+        public void  onCaptureResultAvailable(CameraExtensionSession session,
+                CaptureRequest request, TotalCaptureResult result) {
+            if (mSupportedResultKeys.isEmpty()) {
+                mCollector.addMessage("Capture results not supported, but " +
+                        "onCaptureResultAvailable still got triggered!");
+                return;
+            }
+
+            List<CaptureResult.Key<?>> resultKeys = result.getKeys();
+            for (CaptureResult.Key<?> resultKey : resultKeys) {
+                mCollector.expectTrue("Capture result " + resultKey + " is not among the"
+                        + " supported result keys!", mSupportedResultKeys.contains(resultKey));
+            }
+
+            Integer jpegOrientation = request.get(CaptureRequest.JPEG_ORIENTATION);
+            if (jpegOrientation != null) {
+                Integer resultJpegOrientation = result.get(CaptureResult.JPEG_ORIENTATION);
+                mCollector.expectTrue("Request Jpeg orientation: " + jpegOrientation +
+                        " doesn't match with result: " + resultJpegOrientation,
+                        jpegOrientation.equals(resultJpegOrientation));
+            }
+
+            Byte jpegQuality = request.get(CaptureRequest.JPEG_QUALITY);
+            if (jpegQuality != null) {
+                Byte resultJpegQuality = result.get(CaptureResult.JPEG_QUALITY);
+                mCollector.expectTrue("Request Jpeg quality: " + jpegQuality +
+                        " doesn't match with result: " + resultJpegQuality,
+                        jpegQuality.equals(resultJpegQuality));
+            }
+
+            if (mProxy != null) {
+                mProxy.onCaptureResultAvailable(session, request, result);
+            }
+        }
+
         public int getTotalFramesArrived() {
             return mNumFramesArrived;
         }
@@ -1198,7 +1289,9 @@
                     CameraExtensionSession.ExtensionCaptureCallback repeatingCallbackMock =
                             mock(CameraExtensionSession.ExtensionCaptureCallback.class);
                     SimpleCaptureCallback repeatingCaptureCallback =
-                            new SimpleCaptureCallback(repeatingCallbackMock);
+                            new SimpleCaptureCallback(repeatingCallbackMock,
+                                    extensionChars.getAvailableCaptureResultKeys(extension),
+                                    mCollector);
                     CaptureRequest repeatingRequest = captureBuilder.build();
                     try {
                         extensionSession.setRepeatingRequest(repeatingRequest,
diff --git a/tests/camera/src/android/hardware/camera2/cts/CameraManagerTest.java b/tests/camera/src/android/hardware/camera2/cts/CameraManagerTest.java
index 620ccee..f6b7830 100644
--- a/tests/camera/src/android/hardware/camera2/cts/CameraManagerTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/CameraManagerTest.java
@@ -646,6 +646,7 @@
             String expectedStr, String unExpectedStr) throws Exception {
         String candidateId = expectedEventQueue.poll(AVAILABILITY_TIMEOUT_MS,
                 java.util.concurrent.TimeUnit.MILLISECONDS);
+        assertNotNull("No " + expectedStr + " notice for expected ID " + expectedId, candidateId);
         assertTrue("Received " + expectedStr + " notice for wrong ID, " +
                 "expected " + expectedId + ", got " + candidateId, expectedId.equals(candidateId));
         assertTrue("Received >  1 " + expectedStr + " callback for id " + expectedId,
@@ -859,6 +860,43 @@
                     candidatePhysicalIds == null);
         }
 
+        if (mAdoptShellPerm) {
+            // Open an arbitrary camera and make sure subsequently subscribed listener receives
+            // correct onCameraOpened/onCameraClosed callbacks
+
+            MockStateCallback mockListener = MockStateCallback.mock();
+            mCameraListener = new BlockingStateCallback(mockListener);
+
+            if (useExecutor) {
+                mCameraManager.openCamera(cameras[0], executor, mCameraListener);
+            } else {
+                mCameraManager.openCamera(cameras[0], mCameraListener, mHandler);
+            }
+
+            // Block until opened
+            mCameraListener.waitForState(BlockingStateCallback.STATE_OPENED,
+                    CameraTestUtils.CAMERA_IDLE_TIMEOUT_MS);
+            // Then verify only open happened, and close the camera
+            CameraDevice camera = verifyCameraStateOpened(cameras[0], mockListener);
+
+            if (useExecutor) {
+                mCameraManager.registerAvailabilityCallback(executor, ac);
+            } else {
+                mCameraManager.registerAvailabilityCallback(ac, mHandler);
+            }
+
+            // Verify that we see the expected 'onCameraOpened' event.
+            verifySingleAvailabilityCbsReceived(onCameraOpenedEventQueue,
+                    onCameraClosedEventQueue, cameras[0], "onCameraOpened", "onCameraClosed");
+
+            camera.close();
+
+            mCameraListener.waitForState(BlockingStateCallback.STATE_CLOSED,
+                    CameraTestUtils.CAMERA_CLOSE_TIMEOUT_MS);
+
+            verifySingleAvailabilityCbsReceived(onCameraClosedEventQueue,
+                    onCameraOpenedEventQueue, cameras[0], "onCameraClosed", "onCameraOpened");
+        }
     } // testCameraManagerListenerCallbacks
 
     // Verify no LEGACY-level devices appear on devices first launched in the Q release or newer
@@ -922,6 +960,104 @@
         }
     }
 
+    @Test
+    public void testCameraManagerAutomotiveCameras() throws Exception {
+        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
+            // Execute this test only on the automotive device implementations
+            Log.i(TAG, "Skips this test on non automotive device implementations");
+            return;
+        }
+
+        String[] cameraIds = mCameraIdsUnderTest;
+        if (cameraIds.length < 1) {
+            Log.i(TAG, "No cameras present, skipping test");
+            return;
+        }
+
+        /**
+         * On automotive device implementations, all cameras must have android.automotive.location
+         * and android.automotive.lens.facing in their static metadata.  Also,
+         * android.lens.poseTranslation and android.lens.poseRotation must present in a camera's
+         * static metadata, and android.lens.poseReference should be set as
+         * LENS_POSE_REFERENCE_AUTOMOTIVE in following conditions.
+         *
+         * - android.automotive.location has AUTOMOTIVE_LOCATION_EXTERIOR_OTHER or
+         *   AUTOMOTIVE_LOCATION_EXTRA_OTHER
+         * - android.automotive.lens.facing has AUTOMOTIVE_LENS_FACING_EXTERIOR_OTHER or
+         *   AUTOMOTIVE_LENS_FACING_INTERIOR_OTHER
+         * - One or more camera has the same android.automotive.location and
+         *   android.automotive.lens.facing values
+         */
+        Map<Pair<Integer, Integer>, ArrayList<String>> cameraGroup = new HashMap<>();
+        for (String cameraId : cameraIds) {
+            CameraCharacteristics props = mCameraManager.getCameraCharacteristics(cameraId);
+            assertNotNull(
+                    String.format("Can't get camera characteristics from: ID %s", cameraId), props);
+
+            Integer lensFacing = props.get(CameraCharacteristics.LENS_FACING);
+            if (lensFacing != null && lensFacing == CameraCharacteristics.LENS_FACING_EXTERNAL) {
+                // Automotive device implementations may have external cameras but they are exempted
+                // from this test case.
+                continue;
+            }
+
+            Integer cameraLocation = props.get(CameraCharacteristics.AUTOMOTIVE_LOCATION);
+            assertNotNull(
+                    String.format("Can't get a camera location from: ID %s", cameraId),
+                    cameraLocation);
+
+            int[] automotiveLensFacing = props.get(CameraCharacteristics.AUTOMOTIVE_LENS_FACING);
+            assertNotNull(
+                    String.format("Can't get a lens facing direction from: ID %s", cameraId),
+                    automotiveLensFacing);
+
+            if (cameraLocation == CameraCharacteristics.AUTOMOTIVE_LOCATION_EXTERIOR_OTHER ||
+                    cameraLocation == CameraCharacteristics.AUTOMOTIVE_LOCATION_EXTRA_OTHER ||
+                    automotiveLensFacing[0] ==
+                            CameraCharacteristics.AUTOMOTIVE_LENS_FACING_EXTERIOR_OTHER ||
+                    automotiveLensFacing[0] ==
+                            CameraCharacteristics.AUTOMOTIVE_LENS_FACING_INTERIOR_OTHER) {
+                checkAutomotiveLensPoseCharacteristics(cameraId, props);
+            } else {
+                Pair<Integer, Integer> key = new Pair<>(cameraLocation, automotiveLensFacing[0]);
+                if (cameraGroup.containsKey(key)) {
+                    cameraGroup.get(key).add(cameraId);
+                } else {
+                    cameraGroup.put(key, new ArrayList<>(Arrays.asList(cameraId)));
+                }
+            }
+        }
+
+        for (Map.Entry<Pair<Integer, Integer>, ArrayList<String>> entry : cameraGroup.entrySet()) {
+            ArrayList<String> cameraIdsToVerify = entry.getValue();
+            if (cameraIdsToVerify.size() > 1) {
+                for (String id : cameraIdsToVerify) {
+                    CameraCharacteristics props = mCameraManager.getCameraCharacteristics(id);
+                    checkAutomotiveLensPoseCharacteristics(id, props);
+                }
+            }
+        }
+    }
+
+    private void checkAutomotiveLensPoseCharacteristics(String cameraId,
+            CameraCharacteristics props) {
+        Integer reference = props.get(CameraCharacteristics.LENS_POSE_REFERENCE);
+        assertNotNull(
+                String.format("Can't get a lens pose reference from: ID %s", cameraId),
+                reference);
+        assertTrue("Lens pose reference must be AUTOMOTIVE",
+                reference == CameraCharacteristics.LENS_POSE_REFERENCE_AUTOMOTIVE);
+        float[] translation = props.get(CameraCharacteristics.LENS_POSE_TRANSLATION);
+        assertNotNull(
+                String.format("Can't get a lens pose translation from: ID %s", cameraId),
+                translation);
+        float[] rotation = props.get(CameraCharacteristics.LENS_POSE_ROTATION);
+        assertNotNull(
+                String.format("Can't get a lens pose rotation from: ID %s", cameraId),
+                rotation);
+    }
+
+
     private void toggleNotificationPolicyAccess(String packageName,
             Instrumentation instrumentation, boolean on) throws IOException {
 
diff --git a/tests/camera/src/android/hardware/camera2/cts/EmptyActivity.java b/tests/camera/src/android/hardware/camera2/cts/EmptyActivity.java
new file mode 100644
index 0000000..74e847e
--- /dev/null
+++ b/tests/camera/src/android/hardware/camera2/cts/EmptyActivity.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 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 android.hardware.camera2.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.PersistableBundle;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.Nullable;
+
+public class EmptyActivity extends Activity {
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState,
+            @Nullable PersistableBundle persistentState) {
+        super.onCreate(savedInstanceState, persistentState);
+        View view = new View(this);
+        view.setLayoutParams(new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT));
+        setContentView(view);
+    }
+}
diff --git a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
index 9e48704..90450d4 100644
--- a/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/ExtendedCameraCharacteristicsTest.java
@@ -22,6 +22,7 @@
 import static android.hardware.camera2.cts.helpers.AssertHelpers.assertCollectionContainsAnyOf;
 import static android.hardware.cts.helpers.CameraUtils.matchParametersToCharacteristics;
 
+import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertFalse;
 import static junit.framework.Assert.assertNotNull;
 import static junit.framework.Assert.assertTrue;
@@ -34,6 +35,7 @@
 import static org.mockito.Mockito.verify;
 
 import android.content.Context;
+import android.content.Intent;
 import android.graphics.ImageFormat;
 import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
@@ -49,6 +51,7 @@
 import android.hardware.camera2.params.BlackLevelPattern;
 import android.hardware.camera2.params.ColorSpaceTransform;
 import android.hardware.camera2.params.DeviceStateSensorOrientationMap;
+import android.hardware.camera2.params.DynamicRangeProfiles;
 import android.hardware.camera2.params.RecommendedStreamConfigurationMap;
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.hardware.cts.helpers.CameraUtils;
@@ -57,7 +60,6 @@
 import android.os.Build;
 import android.platform.test.annotations.AppModeFull;
 import android.util.ArraySet;
-import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Pair;
 import android.util.Patterns;
@@ -67,9 +69,18 @@
 import android.view.Display;
 import android.view.Surface;
 import android.view.WindowManager;
+import android.view.WindowMetrics;
+
+import androidx.test.rule.ActivityTestRule;
+
+import androidx.test.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.CddTest;
+import com.android.compatibility.common.util.DeviceReportLog;
+import com.android.compatibility.common.util.ResultType;
+import com.android.compatibility.common.util.ResultUnit;
 
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -82,6 +93,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import static android.hardware.camera2.cts.CameraTestUtils.MPC_REPORT_LOG_NAME;
+import static android.hardware.camera2.cts.CameraTestUtils.MPC_STREAM_NAME;
+
 /**
  * Extended tests for static camera characteristics.
  */
@@ -153,6 +167,10 @@
     private static final int HIGH_SPEED_FPS_LOWER_MIN = 30;
     private static final int HIGH_SPEED_FPS_UPPER_MIN = 120;
 
+    @Rule
+    public final ActivityTestRule<EmptyActivity> mActivityRule = new ActivityTestRule<>(
+            EmptyActivity.class, false, false);
+
     @Override
     public void setUp() throws Exception {
         super.setUp();
@@ -828,7 +846,7 @@
 
             try {
                 RecommendedStreamConfigurationMap map = c.getRecommendedStreamConfigurationMap(
-                        RecommendedStreamConfigurationMap.USECASE_LOW_LATENCY_SNAPSHOT + 1);
+                        RecommendedStreamConfigurationMap.USECASE_10BIT_OUTPUT + 1);
                 fail("Recommended configuration map shouldn't be available for invalid " +
                         "use case!");
             } catch (IllegalArgumentException e) {
@@ -856,6 +874,9 @@
             RecommendedStreamConfigurationMap lowLatencyConfig =
                     c.getRecommendedStreamConfigurationMap(
                     RecommendedStreamConfigurationMap.USECASE_LOW_LATENCY_SNAPSHOT);
+            RecommendedStreamConfigurationMap dynamic10BitOutputConfig =
+                    c.getRecommendedStreamConfigurationMap(
+                            RecommendedStreamConfigurationMap.USECASE_10BIT_OUTPUT);
             if ((previewConfig == null) && (videoRecordingConfig == null) &&
                     (videoSnapshotConfig == null) && (snapshotConfig == null) &&
                     (rawConfig == null) && (zslConfig == null) && (lowLatencyConfig == null)) {
@@ -897,6 +918,13 @@
             if (lowLatencyConfig != null) {
                 verifyRecommendedLowLatencyConfiguration(mAllCameraIds[i], c, lowLatencyConfig);
             }
+
+            if (dynamic10BitOutputConfig != null) {
+                verifyCommonRecommendedConfiguration(mAllCameraIds[i], c, dynamic10BitOutputConfig,
+                        /*checkNoInput*/ true, /*checkNoHighRes*/ false,
+                        /*checkNoHighSpeed*/ false, /*checkNoPrivate*/ false,
+                        /*checkNoDepth*/ true);
+            }
         }
     }
 
@@ -1789,6 +1817,171 @@
         }
     }
 
+    /**
+     * Check 10-Bit output capability
+     */
+    @CddTest(requirement="7.5/C-2-1")
+    @Test
+    public void test10BitOutputCharacteristics() {
+        for (int i = 0; i < mAllCameraIds.length; i++) {
+            Log.i(TAG, "test10BitOutputCharacteristics: Testing camera ID " + mAllCameraIds[i]);
+
+            CameraCharacteristics c = mCharacteristics.get(i);
+            int[] capabilities = c.get(CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES);
+            assertNotNull("android.request.availableCapabilities must never be null",
+                    capabilities);
+            boolean supports10BitOutput = arrayContains(capabilities,
+                    CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT);
+            if (!supports10BitOutput) {
+                continue;
+            }
+
+            DynamicRangeProfiles dynamicProfiles = c.get(
+                    CameraCharacteristics.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES);
+            mCollector.expectNotNull("Dynamic range profile must always be present in case " +
+                    "of 10-bit capable devices!", dynamicProfiles);
+            Set<Long> supportedProfiles = dynamicProfiles.getSupportedProfiles();
+            mCollector.expectTrue("Dynamic range profiles not present!",
+                    !supportedProfiles.isEmpty());
+            // STANDARD and HLG10 must always be present in the supported profiles
+            mCollector.expectContains(supportedProfiles.toArray(), DynamicRangeProfiles.STANDARD);
+            mCollector.expectContains(supportedProfiles.toArray(), DynamicRangeProfiles.HLG10);
+
+            Long recommendedProfile = c.get(
+                    CameraCharacteristics.REQUEST_RECOMMENDED_TEN_BIT_DYNAMIC_RANGE_PROFILE);
+            assertNotNull(recommendedProfile);
+            mCollector.expectContains(supportedProfiles.toArray(), recommendedProfile);
+            mCollector.expectTrue("The recommended 10-bit dynamic range profile must " +
+                            "not be the same as standard",
+                    recommendedProfile != DynamicRangeProfiles.STANDARD);
+            mCollector.expectTrue("HLG10 profile must not have extra latency!",
+                    !dynamicProfiles.isExtraLatencyPresent(DynamicRangeProfiles.HLG10));
+            mCollector.expectTrue("STANDARD profile must not have extra latency!",
+                    !dynamicProfiles.isExtraLatencyPresent(DynamicRangeProfiles.STANDARD));
+
+            // Verify constraints validity. For example if HLG10 advertises support for HDR10, then
+            // there shouldn't be any HDR10 constraints related to HLG10.
+            for (Long profile : supportedProfiles) {
+                Set<Long> currentConstraints =
+                        dynamicProfiles.getProfileCaptureRequestConstraints(profile);
+                boolean isSameProfilePresent = false;
+                for (Long concurrentProfile : currentConstraints) {
+                    if (concurrentProfile == profile) {
+                        isSameProfilePresent = true;
+                        continue;
+                    }
+                    String msg = String.format("Dynamic profile %d supports profile %d " +
+                                    "in the same capture request, however profile %d is not" +
+                                    "advertised as supported!", profile, concurrentProfile,
+                                    concurrentProfile);
+                    mCollector.expectTrue(msg, supportedProfiles.contains(concurrentProfile));
+
+                    Set<Long> supportedConstraints =
+                            dynamicProfiles.getProfileCaptureRequestConstraints(concurrentProfile);
+                    msg = String.format("Dynamic range profile %d advertises support " +
+                                    "for profile %d, however the opposite is not true!",
+                                    profile, concurrentProfile);
+                    mCollector.expectTrue(msg, supportedConstraints.isEmpty() ||
+                            supportedConstraints.contains(profile));
+                }
+
+                String msg = String.format("Dynamic profile %d not present in its advertised " +
+                        "capture request constraints!", profile);
+                mCollector.expectTrue(msg, isSameProfilePresent || currentConstraints.isEmpty());
+            }
+        }
+    }
+
+    /**
+     * If device implementations support HDR 10-bit output capability, then they
+     * MUST support 10-bit output for either the primary rear-facing or the primary front-facing
+     * camera.
+     */
+    @CddTest(requirement="7.5/C-2-2")
+    @Test
+    public void test10BitDeviceSupport() throws Exception {
+        boolean rearFacing10bitSupport = false;
+        boolean frontFacing10bitSupport = false;
+        boolean device10bitSupport = false;
+
+        for (int i = 0; i < mAllCameraIds.length; i++) {
+            Log.i(TAG, "test10BitDeviceSupport: Testing camera ID " + mAllCameraIds[i]);
+
+            CameraCharacteristics c = mCharacteristics.get(i);
+            int[] capabilities = c.get(CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES);
+            assertNotNull("android.request.availableCapabilities must never be null",
+                    capabilities);
+            boolean supports10BitOutput = arrayContains(capabilities,
+                    CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT);
+            if (!supports10BitOutput) {
+                continue;
+            } else {
+                device10bitSupport = true;
+            }
+
+            if (CameraTestUtils.isPrimaryRearFacingCamera(mCameraManager, mAllCameraIds[i])) {
+                rearFacing10bitSupport = true;
+            } else if (CameraTestUtils.isPrimaryFrontFacingCamera(mCameraManager,
+                    mAllCameraIds[i])) {
+                frontFacing10bitSupport = true;
+            }
+        }
+
+        if (device10bitSupport) {
+            assertTrue("10-bit output support must be enabled on either front or rear " +
+                    " camera", rearFacing10bitSupport || frontFacing10bitSupport);
+        }
+    }
+
+    /**
+     * The same HDR profiles must be supported for all BACKWARD_COMPATIBLE-capable physical
+     * sub-cameras of a logical camera, and the logical camera itself.
+     */
+    @CddTest(requirement="7.5/C-2-3")
+    @Test
+    public void test10BitLogicalDeviceSupport() {
+        for (int i = 0; i < mAllCameraIds.length; i++) {
+            Log.i(TAG, "test10BitLogicalDeviceSupport: Testing camera ID " + mAllCameraIds[i]);
+
+            CameraCharacteristics c = mCharacteristics.get(i);
+            StaticMetadata staticMetadata = mAllStaticInfo.get(mAllCameraIds[i]);
+            boolean supports10BitOutput = staticMetadata.isCapabilitySupported(
+                    CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT);
+            if (!supports10BitOutput) {
+                continue;
+            }
+
+            if (!staticMetadata.isColorOutputSupported()) {
+                continue;
+            }
+
+            if (staticMetadata.isLogicalMultiCamera()) {
+                Set<Long> logicalProfiles =
+                        staticMetadata.getAvailableDynamicRangeProfilesChecked();
+                Set<String> physicalCameraIds = c.getPhysicalCameraIds();
+                for (String physicalId : physicalCameraIds) {
+                    StaticMetadata physicalMeta = mAllStaticInfo.get(physicalId);
+                    if (physicalMeta.isColorOutputSupported()) {
+                        boolean physical10bitOutput =
+                                physicalMeta.isCapabilitySupported(CameraCharacteristics.
+                                        REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT);
+                        assertTrue("The logical camera: " + mAllCameraIds[i] +
+                                " 10-bit support must match with all publicly accessible color " +
+                                "capable physical devices: " + physicalId + " !",
+                                physical10bitOutput);
+
+                        Set<Long> physicalProfiles =
+                                physicalMeta.getAvailableDynamicRangeProfilesChecked();
+                        assertTrue("The logical camera: " + mAllCameraIds[i] +
+                                " dynamic range profiles must match with all publicly accessible " +
+                                "and color capable physical devices: " + physicalId + " !",
+                                physicalProfiles.equals(logicalProfiles));
+                    }
+                }
+            }
+        }
+    }
+
     private void verifyLensCalibration(float[] poseRotation, float[] poseTranslation,
             Integer poseReference, float[] cameraIntrinsics, float[] distortion,
             Rect precorrectionArray, Integer facing) {
@@ -2579,7 +2772,7 @@
      * Check camera orientation against device orientation
      */
     @AppModeFull(reason = "DeviceStateManager is not accessible to instant apps")
-    @CddTest(requirement="7.5.5/C-1-1")
+    @CddTest(requirement = "7.5.5/C-1-1")
     @Test
     public void testCameraOrientationAlignedWithDevice() {
         if (CameraUtils.isDeviceFoldable(mContext)) {
@@ -2591,25 +2784,32 @@
             return;
         }
 
-        WindowManager windowManager =
-                (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
-        Display display = windowManager.getDefaultDisplay();
-        DisplayMetrics metrics = new DisplayMetrics();
-        display.getMetrics(metrics);
+        // Start the empty activty to check the display we're testing.
+        mActivityRule.launchActivity(new Intent());
+        Context foregroundActivity = mActivityRule.getActivity();
+
+        WindowManager windowManager = foregroundActivity.getSystemService(WindowManager.class);
+        assertNotNull("Could not get window manager for test activity.", windowManager);
+
+        WindowMetrics metrics = windowManager.getMaximumWindowMetrics();
+        Rect displayBounds = metrics.getBounds();
+        int widthPixels = displayBounds.width();
+        int heightPixels = displayBounds.height();
 
         // For square screen, test is guaranteed to pass
-        if (metrics.widthPixels == metrics.heightPixels) {
+        if (widthPixels == heightPixels) {
             return;
         }
 
         // Handle display rotation
+        Display display = foregroundActivity.getDisplay();
         int displayRotation = display.getRotation();
         if (displayRotation == Surface.ROTATION_90 || displayRotation == Surface.ROTATION_270) {
-            int tmp = metrics.widthPixels;
-            metrics.widthPixels = metrics.heightPixels;
-            metrics.heightPixels = tmp;
+            int tmp = widthPixels;
+            widthPixels = heightPixels;
+            heightPixels = tmp;
         }
-        boolean isDevicePortrait = metrics.widthPixels < metrics.heightPixels;
+        boolean isDevicePortrait = widthPixels < heightPixels;
 
         for (int i = 0; i < mAllCameraIds.length; i++) {
             CameraCharacteristics c = mCharacteristics.get(i);
@@ -2634,28 +2834,62 @@
 
             boolean isCameraPortrait =
                     adjustedSensorSize.getWidth() < adjustedSensorSize.getHeight();
-            assertFalse("Camera " + mAllCameraIds[i] + "'s long dimension must "
-                    + "align with screen's long dimension", isDevicePortrait^isCameraPortrait);
+
+            // device and camera orientation should either be both portrait, or both landscape
+            assertEquals("Camera " + mAllCameraIds[i] + "'s long dimension must "
+                    + "align with screen's long dimension", isDevicePortrait, isCameraPortrait);
         }
     }
 
     /**
+     * If meetPerfClass is true, return perfClassLevel.
+     * Otherwise, return NOT_MET.
+     */
+    private int updatePerfClassLevel(boolean meetPerfClass, int perfClassLevel) {
+        if (!meetPerfClass) {
+            return CameraTestUtils.PERFORMANCE_CLASS_NOT_MET;
+        } else {
+            return perfClassLevel;
+        }
+    }
+
+    /**
+     * Update perf class level based on meetSPerfClass and meetRPerfClass.
+     */
+    private int updatePerfClassLevel(boolean meetSPerfClass, boolean meetRPerfClass,
+            int perfClassLevel) {
+        if (!meetRPerfClass) {
+            return CameraTestUtils.PERFORMANCE_CLASS_NOT_MET;
+        } else if (!meetSPerfClass &&
+                perfClassLevel > CameraTestUtils.PERFORMANCE_CLASS_R) {
+            return CameraTestUtils.PERFORMANCE_CLASS_R;
+        }
+        return perfClassLevel;
+    }
+
+    /**
      * Check camera characteristics for R and S Performance class requirements as specified
      * in CDD camera section 7.5
      */
     @Test
-    @CddTest(requirement="7.5")
+    @CddTest(requirement="7.5/H-1-1,H-1-2,H-1-3,H-1-4,H-1-8")
     public void testCameraPerfClassCharacteristics() throws Exception {
         if (mAdoptShellPerm) {
             // Skip test for system camera. Performance class is only applicable for public camera
             // ids.
             return;
         }
-        boolean isRPerfClass = CameraTestUtils.isRPerfClass();
-        boolean isSPerfClass = CameraTestUtils.isSPerfClass();
-        if (!isRPerfClass && !isSPerfClass) {
-            return;
-        }
+        boolean assertRPerfClass = CameraTestUtils.isRPerfClass();
+        boolean assertSPerfClass = CameraTestUtils.isSPerfClass();
+        boolean assertPerfClass = (assertRPerfClass || assertSPerfClass);
+
+        int perfClassLevelH11 = CameraTestUtils.PERFORMANCE_CLASS_CURRENT;
+        int perfClassLevelH12 = CameraTestUtils.PERFORMANCE_CLASS_CURRENT;
+        int perfClassLevelH13 = CameraTestUtils.PERFORMANCE_CLASS_CURRENT;
+        int perfClassLevelH14 = CameraTestUtils.PERFORMANCE_CLASS_CURRENT;
+        int perfClassLevelH18 = CameraTestUtils.PERFORMANCE_CLASS_CURRENT;
+
+        DeviceReportLog reportLog = new DeviceReportLog(MPC_REPORT_LOG_NAME, MPC_STREAM_NAME);
 
         boolean hasPrimaryRear = false;
         boolean hasPrimaryFront = false;
@@ -2684,78 +2918,145 @@
 
             if (isPrimaryRear) {
                 hasPrimaryRear = true;
-                mCollector.expectTrue("Primary rear camera resolution should be at least " +
-                        MIN_BACK_SENSOR_PERF_CLASS_RESOLUTION + " pixels, is "+
-                        sensorResolution,
-                        sensorResolution >= MIN_BACK_SENSOR_PERF_CLASS_RESOLUTION);
+                if (sensorResolution < MIN_BACK_SENSOR_PERF_CLASS_RESOLUTION) {
+                    mCollector.expectTrue("Primary rear camera resolution should be at least " +
+                            MIN_BACK_SENSOR_PERF_CLASS_RESOLUTION + " pixels, is "+
+                            sensorResolution, !assertPerfClass);
+                    perfClassLevelH11 = CameraTestUtils.PERFORMANCE_CLASS_NOT_MET;
+                }
+                reportLog.addValue("rear camera resolution", sensorResolution,
+                        ResultType.NEUTRAL, ResultUnit.NONE);
 
                 // 4K @ 30fps
                 boolean supportUHD = videoSizes.contains(UHD);
                 boolean supportDC4K = videoSizes.contains(DC4K);
-                mCollector.expectTrue("Primary rear camera should support 4k video recording",
-                        supportUHD || supportDC4K);
-                if (supportUHD || supportDC4K) {
+                reportLog.addValue("rear camera 4k support", supportUHD | supportDC4K,
+                        ResultType.NEUTRAL, ResultUnit.NONE);
+                if (!supportUHD && !supportDC4K) {
+                    mCollector.expectTrue("Primary rear camera should support 4k video recording",
+                            !assertPerfClass);
+                    perfClassLevelH11 = CameraTestUtils.PERFORMANCE_CLASS_NOT_MET;
+                } else {
                     long minFrameDuration = config.getOutputMinFrameDuration(
                             android.media.MediaRecorder.class, supportDC4K ? DC4K : UHD);
-                    mCollector.expectTrue("Primary rear camera should support 4k video @ 30fps",
-                            minFrameDuration < (1e9 / 29.9));
+                    reportLog.addValue("rear camera 4k frame duration", minFrameDuration,
+                        ResultType.NEUTRAL, ResultUnit.NONE);
+                    if (minFrameDuration >= (1e9 / 29.9)) {
+                        mCollector.expectTrue("Primary rear camera should support 4k video @ 30fps",
+                                !assertPerfClass);
+                        perfClassLevelH11 = CameraTestUtils.PERFORMANCE_CLASS_NOT_MET;
+                    }
                 }
             } else {
                 hasPrimaryFront = true;
-                if (isSPerfClass) {
+                if (sensorResolution < MIN_FRONT_SENSOR_S_PERF_CLASS_RESOLUTION) {
+                    mCollector.expectTrue("Primary front camera resolution should be at least " +
+                        MIN_FRONT_SENSOR_S_PERF_CLASS_RESOLUTION + " pixels, is "+
+                        sensorResolution, !assertSPerfClass);
+                    perfClassLevelH12 = Math.min(
+                            perfClassLevelH12, CameraTestUtils.PERFORMANCE_CLASS_R);
+                }
+                if (sensorResolution < MIN_FRONT_SENSOR_R_PERF_CLASS_RESOLUTION) {
                     mCollector.expectTrue("Primary front camera resolution should be at least " +
                             MIN_FRONT_SENSOR_S_PERF_CLASS_RESOLUTION + " pixels, is "+
-                            sensorResolution,
-                            sensorResolution >= MIN_FRONT_SENSOR_S_PERF_CLASS_RESOLUTION);
-                } else {
-                    mCollector.expectTrue("Primary front camera resolution should be at least " +
-                            MIN_FRONT_SENSOR_R_PERF_CLASS_RESOLUTION + " pixels, is "+
-                            sensorResolution,
-                            sensorResolution >= MIN_FRONT_SENSOR_R_PERF_CLASS_RESOLUTION);
+                            sensorResolution, !assertRPerfClass);
+                    perfClassLevelH12 = CameraTestUtils.PERFORMANCE_CLASS_NOT_MET;
                 }
+                reportLog.addValue("front camera resolution", sensorResolution,
+                        ResultType.NEUTRAL, ResultUnit.NONE);
+
                 // 1080P @ 30fps
                 boolean supportFULLHD = videoSizes.contains(FULLHD);
-                mCollector.expectTrue("Primary front camera should support 1080P video recording",
-                        supportFULLHD);
-                if (supportFULLHD) {
+                reportLog.addValue("front camera 1080p support", supportFULLHD,
+                        ResultType.NEUTRAL, ResultUnit.NONE);
+                if (!supportFULLHD) {
+                    mCollector.expectTrue(
+                            "Primary front camera should support 1080P video recording",
+                            !assertPerfClass);
+                    perfClassLevelH12 = CameraTestUtils.PERFORMANCE_CLASS_NOT_MET;
+                } else {
                     long minFrameDuration = config.getOutputMinFrameDuration(
                             android.media.MediaRecorder.class, FULLHD);
-                    mCollector.expectTrue("Primary front camera should support 1080P video @ 30fps",
-                            minFrameDuration < (1e9 / 29.9));
+                    if (minFrameDuration >= (1e9 / 29.9)) {
+                        mCollector.expectTrue(
+                                "Primary front camera should support 1080P video @ 30fps",
+                                !assertPerfClass);
+                        perfClassLevelH12 = CameraTestUtils.PERFORMANCE_CLASS_NOT_MET;
+                    }
+                    reportLog.addValue("front camera 1080p frame duration", minFrameDuration,
+                        ResultType.NEUTRAL, ResultUnit.NONE);
                 }
             }
 
-            String facingString = hasPrimaryRear ? "rear" : "front";
+            String facingString = isPrimaryRear ? "rear" : "front";
             // H-1-3
-            if (isSPerfClass || (isRPerfClass && isPrimaryRear)) {
+            if (assertSPerfClass || (assertRPerfClass && isPrimaryRear)) {
                 mCollector.expectTrue("Primary " + facingString +
                         " camera should be at least FULL, but is " +
                         toStringHardwareLevel(staticInfo.getHardwareLevelChecked()),
                         staticInfo.isHardwareLevelAtLeastFull());
-            } else {
+            } else if (assertRPerfClass) {
                 mCollector.expectTrue("Primary " + facingString +
                         " camera should be at least LIMITED, but is " +
                         toStringHardwareLevel(staticInfo.getHardwareLevelChecked()),
                         staticInfo.isHardwareLevelAtLeastLimited());
             }
 
+            reportLog.addValue(facingString + " camera hardware level",
+                    staticInfo.getHardwareLevelChecked(), ResultType.NEUTRAL, ResultUnit.NONE);
+            if (isPrimaryRear) {
+                perfClassLevelH13 = updatePerfClassLevel(staticInfo.isHardwareLevelAtLeastFull(),
+                        perfClassLevelH13);
+            } else {
+                perfClassLevelH13 = updatePerfClassLevel(staticInfo.isHardwareLevelAtLeastFull(),
+                        staticInfo.isHardwareLevelAtLeastLimited(), perfClassLevelH13);
+            }
+
             // H-1-4
             Integer timestampSource = c.get(CameraCharacteristics.SENSOR_INFO_TIMESTAMP_SOURCE);
+            reportLog.addValue(facingString + " timestampSource",
+                    timestampSource, ResultType.NEUTRAL, ResultUnit.NONE);
+            boolean realtimeTimestamp = (timestampSource != null &&
+                    timestampSource.equals(CameraMetadata.SENSOR_INFO_TIMESTAMP_SOURCE_REALTIME));
             mCollector.expectTrue(
                     "Primary " + facingString + " camera should support real-time timestamp source",
-                    timestampSource != null &&
-                    timestampSource.equals(CameraMetadata.SENSOR_INFO_TIMESTAMP_SOURCE_REALTIME));
+                    !assertPerfClass || realtimeTimestamp);
+            perfClassLevelH14 = updatePerfClassLevel(realtimeTimestamp, perfClassLevelH14);
 
             // H-1-8
-            if (isSPerfClass && isPrimaryRear) {
+            if (isPrimaryRear) {
+                boolean supportRaw = staticInfo.isCapabilitySupported(RAW);
+                reportLog.addValue(facingString + " camera raw support",
+                        supportRaw, ResultType.NEUTRAL, ResultUnit.NONE);
                 mCollector.expectTrue("Primary rear camera should support RAW capability",
-                        staticInfo.isCapabilitySupported(RAW));
+                        !assertSPerfClass || supportRaw);
+                perfClassLevelH18 = updatePerfClassLevel(supportRaw, true /*R*/, perfClassLevelH18);
             }
         }
-        mCollector.expectTrue("There must be a primary rear camera for performance class.",
-                hasPrimaryRear);
-        mCollector.expectTrue("There must be a primary front camera for performance class.",
-                hasPrimaryFront);
+        if (!hasPrimaryRear) {
+            mCollector.expectTrue("There must be a primary rear camera for performance class.",
+                    !assertPerfClass);
+            perfClassLevelH11 = CameraTestUtils.PERFORMANCE_CLASS_NOT_MET;
+        }
+        if (!hasPrimaryFront) {
+            mCollector.expectTrue("There must be a primary front camera for performance class.",
+                    !assertPerfClass);
+            perfClassLevelH12 = CameraTestUtils.PERFORMANCE_CLASS_NOT_MET;
+        }
+
+        reportLog.addValue("Version", "0.0.1", ResultType.NEUTRAL, ResultUnit.NONE);
+        final String PERF_CLASS_REQ_NUM_PREFIX = "2.2.7.2/7.5/";
+        reportLog.addValue(PERF_CLASS_REQ_NUM_PREFIX + "H-1-1",
+                perfClassLevelH11, ResultType.NEUTRAL, ResultUnit.NONE);
+        reportLog.addValue(PERF_CLASS_REQ_NUM_PREFIX + "H-1-2",
+                perfClassLevelH12, ResultType.NEUTRAL, ResultUnit.NONE);
+        reportLog.addValue(PERF_CLASS_REQ_NUM_PREFIX + "H-1-3",
+                perfClassLevelH13, ResultType.NEUTRAL, ResultUnit.NONE);
+        reportLog.addValue(PERF_CLASS_REQ_NUM_PREFIX + "H-1-4",
+                perfClassLevelH14, ResultType.NEUTRAL, ResultUnit.NONE);
+        reportLog.addValue(PERF_CLASS_REQ_NUM_PREFIX + "H-1-8",
+                perfClassLevelH18, ResultType.NEUTRAL, ResultUnit.NONE);
+        reportLog.submit(InstrumentationRegistry.getInstrumentation());
     }
 
     /**
@@ -2801,6 +3102,90 @@
     }
 
     /**
+     * Validate {@link CameraCharacteristics#LENS_POSE_TRANSLATION} and @{link
+     * CameraCharacteristics#LENS_POSE_ROTATION} of camera that list below characteristics in their
+     * static metadata.
+     * - CameraCharacteristics.AUTOMOTIVE_LOCATION_INTERIOR_OTHER
+     * - CameraCharacteristics.AUTOMOTIVE_LOCATION_EXTERIOR_OTHER
+     * - CameraCharacteristics.AUTOMOTIVE_LOCATION_EXTRA_OTHER
+     */
+    @Test
+    public void testAutomotiveCameraCharacteristics() throws Exception {
+        for (int i = 0; i < mAllCameraIds.length; i++) {
+            CameraCharacteristics c = mCharacteristics.get(i);
+
+            Integer location = c.get(CameraCharacteristics.AUTOMOTIVE_LOCATION);
+            int[] lensFacing = c.get(CameraCharacteristics.AUTOMOTIVE_LENS_FACING);
+            if (location == null || lensFacing == null) {
+                // CameraManagerTest#testCameraManagerAutomotiveCameras() guarantees
+                // CameraCharacteristics.AUTOMOTIVE_LOCATION and
+                // CameraCharacteristics.AUTOMOTIVE_LENS_FACING are listed in a static metadata of
+                // cameras on the automotive device implementations.
+                continue;
+            }
+
+            float[] translation = c.get(CameraCharacteristics.LENS_POSE_TRANSLATION);
+            float[] rotation = c.get(CameraCharacteristics.LENS_POSE_ROTATION);
+            assertTrue("android.lens.poseTranslation and android.lens.poseRotation must exist " +
+                    "together or not at all",
+                    (translation != null) == (rotation != null));
+            if (translation == null && rotation != null) {
+                // Cameras without android.lens.poseTranslation and anroid.lens.poseRotation are
+                // exempt from this test case.
+                continue;
+            }
+
+            // android.lens.poseTranslation describes the lens optical center of the camera device
+            // as a three dimensional vector (x, y, z) and in the unit of meters.  On the automotive
+            // sensor coordinate system, we expect the following:
+            // - The width of the vehicle body frame would not exceed 6 meters, which is a width of
+            //   the vehicle lane approximately.
+            // - The length of the vehicle body frame would not exceed 10 meters, which is an
+            //   average length of the city bus.  We apply approximately 20% tolerance to this value
+            //   because of a relatively higher variance of the vehicle's length.
+            // - The height of the vehicle body frame would not exceed 5 meters, which is an average
+            //   height of the double decker bus.
+            assertTrue("Lens pose translation vector is invalid",
+                    (translation[0] >= -3 && translation[0] <= 3)
+                            && (translation[1] >= -2 && translation[1] <= 10)
+                            && (translation[2] >= 0 && translation[2] <= 5));
+
+            // Convert a given quaternion to axis-angle representation
+            double theta = 2.0 * Math.acos(rotation[3]);
+            double a_x = rotation[0] / Math.sin(theta / 2.0);
+            double a_y = rotation[1] / Math.sin(theta / 2.0);
+            double a_z = rotation[2] / Math.sin(theta / 2.0);
+
+            // Calculate an angle between a translation vector and a rotation axis
+            double dot = (translation[0] * a_x) + (translation[1] * a_y) + (translation[2] * a_z);
+            double mag_a = Math.sqrt(Math.pow(translation[0], 2) + Math.pow(translation[1], 2)
+                    + Math.pow(translation[2], 2));
+            double mag_b =
+                    Math.sqrt(Math.pow(a_x, 2) + Math.pow(a_y, 2) + Math.pow(a_z, 2));
+            double angle = Math.acos(dot / (mag_a * mag_b));
+
+            if (location == CameraCharacteristics.AUTOMOTIVE_LOCATION_EXTERIOR_OTHER
+                    || location == CameraCharacteristics.AUTOMOTIVE_LOCATION_EXTRA_OTHER) {
+                // If android.automotive.location is
+                // CameraCharacteristics.AUTOMOTIVE_LOCATION_EXTERIOR_OTHER or
+                // CameraCharacteristics.AUTOMOTIVE_LOCATION_EXTRA_OTHER, its
+                // android.lens.poseRotation should not describe a direction toward the inside of
+                // the vehicle cabin.
+                assertTrue("Lens pose rotation should not describe a direction toward the cabin",
+                        angle >= Math.PI / 4);
+            } else {
+                // Likewise, if android.automotive.location is
+                // CameraCharacteristics.AUTOMOTIVE_LOCATION_INTERIOR_OTHER, its
+                // android.lens.poseRotation should not describe a direction toward the outside of
+                // the vehicle cabin.
+                assertTrue("Lens pose rotation should not describe a direction toward the " +
+                        "outside of the cabin",
+                        angle <= Math.PI * 3 / 4);
+            }
+        }
+    }
+
+    /**
      * Check key is present in characteristics if the hardware level is at least {@code hwLevel};
      * check that the key is present if the actual capabilities are one of {@code capabilities}.
      *
diff --git a/tests/camera/src/android/hardware/camera2/cts/FlashlightTest.java b/tests/camera/src/android/hardware/camera2/cts/FlashlightTest.java
index 9b84387e..2a65d76 100644
--- a/tests/camera/src/android/hardware/camera2/cts/FlashlightTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/FlashlightTest.java
@@ -17,6 +17,7 @@
 package android.hardware.camera2.cts;
 
 import android.hardware.camera2.CameraManager;
+import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.cts.CameraTestUtils.HandlerExecutor;
 import android.hardware.camera2.cts.testcases.Camera2AndroidTestCase;
@@ -50,6 +51,7 @@
     private static final int NUM_REGISTERS = 10;
 
     private ArrayList<String> mFlashCameraIdList;
+    private ArrayList<String> mNoFlashCameraIdList;
 
     @Override
     public void setUp() throws Exception {
@@ -60,17 +62,115 @@
         // initialize the list of cameras that have a flash unit so it won't interfere with
         // flash tests.
         mFlashCameraIdList = new ArrayList<String>();
+        mNoFlashCameraIdList = new ArrayList<String>();
         for (String id : mCameraIdsUnderTest) {
             StaticMetadata info =
                     new StaticMetadata(mCameraManager.getCameraCharacteristics(id),
                                        CheckLevel.ASSERT, /*collector*/ null);
             if (info.hasFlash()) {
                 mFlashCameraIdList.add(id);
+            } else  {
+                mNoFlashCameraIdList.add(id);
             }
         }
     }
 
     @Test
+    public void testTurnOnTorchWithStrengthLevel() throws Exception {
+        if (mNoFlashCameraIdList.size() != 0) {
+            for (String id : mNoFlashCameraIdList) {
+                CameraCharacteristics pc = mCameraManager.getCameraCharacteristics(id);
+                assertNull(pc.get(CameraCharacteristics.FLASH_INFO_STRENGTH_DEFAULT_LEVEL));
+                assertNull(pc.get(CameraCharacteristics.FLASH_INFO_STRENGTH_MAXIMUM_LEVEL));
+            }
+        }
+
+        if (mFlashCameraIdList.size() == 0)
+            return;
+
+        for (String id : mFlashCameraIdList) {
+            resetTorchModeStatus(id);
+        }
+
+        for (String id: mFlashCameraIdList) {
+            int maxLevel = 0;
+            int defaultLevel = 0;
+            int minLevel = 1;
+            CameraCharacteristics pc = mCameraManager.getCameraCharacteristics(id);
+            if (pc.get(CameraCharacteristics.FLASH_INFO_STRENGTH_DEFAULT_LEVEL) != null) {
+                defaultLevel = pc.get(CameraCharacteristics.FLASH_INFO_STRENGTH_DEFAULT_LEVEL);
+            }
+            if (pc.get(CameraCharacteristics.FLASH_INFO_STRENGTH_MAXIMUM_LEVEL) != null) {
+                maxLevel = pc.get(CameraCharacteristics.FLASH_INFO_STRENGTH_MAXIMUM_LEVEL);
+            }
+            if (maxLevel > 1) {
+                assertTrue(minLevel <= defaultLevel);
+                assertTrue(defaultLevel <= maxLevel);
+                int torchStrength = 0;
+                CameraManager.TorchCallback torchListener = mock(CameraManager.TorchCallback.class);
+                mCameraManager.registerTorchCallback(torchListener, mHandler);
+
+                mCameraManager.turnOnTorchWithStrengthLevel(id, maxLevel);
+                SystemClock.sleep(TORCH_DURATION_MS);
+                torchStrength = mCameraManager.getTorchStrengthLevel(id);
+                assertEquals(torchStrength, maxLevel);
+                // Calling with same value twice to verify onTorchStrengthLevelChanged()
+                // with maxLevel value is called only once.
+                mCameraManager.turnOnTorchWithStrengthLevel(id, maxLevel);
+                torchStrength = mCameraManager.getTorchStrengthLevel(id);
+                assertEquals(torchStrength, maxLevel);
+
+                mCameraManager.turnOnTorchWithStrengthLevel(id, defaultLevel);
+                torchStrength = mCameraManager.getTorchStrengthLevel(id);
+                assertEquals(torchStrength, defaultLevel);
+
+                mCameraManager.turnOnTorchWithStrengthLevel(id, minLevel);
+                torchStrength = mCameraManager.getTorchStrengthLevel(id);
+                assertEquals(torchStrength, minLevel);
+
+                try {
+                    mCameraManager.turnOnTorchWithStrengthLevel(id, 0);
+                    fail("turnOnTorchWithStrengthLevel with strengthLevel = 0 must fail.");
+                } catch (IllegalArgumentException e) {
+                    Log.v(TAG, e.getMessage());
+                }
+
+                try {
+                    mCameraManager.turnOnTorchWithStrengthLevel(id, maxLevel + 1);
+                    fail("turnOnTorchWithStrengthLevel with strengthLevel" + (maxLevel + 1) + " must fail.");
+                } catch (IllegalArgumentException e) {
+                    Log.v(TAG, e.getMessage());
+                }
+
+                // Turn off the torch and verify if the strength level gets
+                // reset to default level.
+                mCameraManager.setTorchMode(id, false);
+                torchStrength = mCameraManager.getTorchStrengthLevel(id);
+                assertEquals(torchStrength, defaultLevel);
+
+                // verify corrected numbers of callbacks
+                verify(torchListener, timeout(TORCH_TIMEOUT_MS).
+                        times(1)).onTorchModeChanged(id, true);
+
+                verify(torchListener,timeout(TORCH_TIMEOUT_MS).
+                        times(1)).onTorchStrengthLevelChanged(id, maxLevel);
+                verify(torchListener,timeout(TORCH_TIMEOUT_MS).
+                        times(1)).onTorchStrengthLevelChanged(id, minLevel);
+                verify(torchListener,timeout(TORCH_TIMEOUT_MS).
+                        times(1)).onTorchStrengthLevelChanged(id, defaultLevel);
+
+                verify(torchListener, timeout(TORCH_TIMEOUT_MS).
+                        times(2)).onTorchModeChanged(id, false);
+
+                mCameraManager.unregisterTorchCallback(torchListener);
+            } else {
+                Log.i(TAG, "Torch strength level adjustment is not supported.");
+            }
+        }
+    }
+
+
+    @Test
     public void testSetTorchModeOnOff() throws Exception {
         if (mFlashCameraIdList.size() == 0)
             return;
@@ -363,6 +463,8 @@
         private String mCameraId;
         private ArrayBlockingQueue<Integer> mStatusQueue =
                 new ArrayBlockingQueue<Integer>(QUEUE_CAPACITY);
+        private ArrayBlockingQueue<Integer> mTorchStrengthQueue =
+                new ArrayBlockingQueue<Integer>(QUEUE_CAPACITY);
 
         public static final int STATUS_UNAVAILABLE = 0;
         public static final int STATUS_OFF = 1;
@@ -397,6 +499,17 @@
         }
 
         @Override
+        public void onTorchStrengthLevelChanged(String cameraId, int newStrengthLevel) {
+            if (cameraId.equals(mCameraId)) {
+                try {
+                    mTorchStrengthQueue.put(newStrengthLevel);
+                } catch (Throwable e) {
+                    fail(e.getMessage());
+                }
+            }
+        }
+
+        @Override
         public void onTorchModeChanged(String cameraId, boolean enabled) {
             if (cameraId.equals(mCameraId)) {
                 Integer s;
diff --git a/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java b/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java
index a852729..5db15c2 100644
--- a/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/ImageReaderTest.java
@@ -16,7 +16,21 @@
 
 package android.hardware.camera2.cts;
 
-import android.content.Context;
+import static android.hardware.camera2.cts.CameraTestUtils.CAPTURE_RESULT_TIMEOUT_MS;
+import static android.hardware.camera2.cts.CameraTestUtils.SESSION_READY_TIMEOUT_MS;
+import static android.hardware.camera2.cts.CameraTestUtils.SimpleCaptureCallback;
+import static android.hardware.camera2.cts.CameraTestUtils.SimpleImageReaderListener;
+import static android.hardware.camera2.cts.CameraTestUtils.dumpFile;
+import static android.hardware.camera2.cts.CameraTestUtils.getValueNotNull;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
+
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.BitmapRegionDecoder;
@@ -27,20 +41,25 @@
 import android.graphics.PixelFormat;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.hardware.DataSpace;
 import android.hardware.HardwareBuffer;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraMetadata;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
 import android.hardware.camera2.cts.CameraTestUtils.ImageDropperListener;
 import android.hardware.camera2.cts.helpers.StaticMetadata;
 import android.hardware.camera2.cts.rs.BitmapUtils;
 import android.hardware.camera2.cts.testcases.Camera2AndroidTestCase;
+import android.hardware.camera2.params.DynamicRangeProfiles;
 import android.hardware.camera2.params.OutputConfiguration;
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.media.Image;
 import android.media.Image.Plane;
 import android.media.ImageReader;
+import android.media.ImageWriter;
+import android.os.SystemClock;
 import android.os.ConditionVariable;
 import android.util.Log;
 import android.util.Size;
@@ -48,24 +67,16 @@
 
 import com.android.ex.camera2.blocking.BlockingSessionCallback;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.Test;
-
-import static android.hardware.camera2.cts.CameraTestUtils.CAPTURE_RESULT_TIMEOUT_MS;
-import static android.hardware.camera2.cts.CameraTestUtils.SESSION_READY_TIMEOUT_MS;
-import static android.hardware.camera2.cts.CameraTestUtils.SimpleCaptureCallback;
-import static android.hardware.camera2.cts.CameraTestUtils.SimpleImageReaderListener;
-import static android.hardware.camera2.cts.CameraTestUtils.dumpFile;
-import static android.hardware.camera2.cts.CameraTestUtils.getValueNotNull;
-import static com.google.common.truth.Truth.assertWithMessage;
-import static junit.framework.Assert.*;
+import java.util.concurrent.TimeUnit;
 
 /**
  * <p>Basic test for ImageReader APIs. It uses CameraDevice as producer, camera
@@ -117,7 +128,9 @@
             try {
                 Log.i(TAG, "Testing Camera " + id);
                 openDevice(id);
-                bufferFormatTestByCamera(ImageFormat.YUV_420_888, /*repeating*/true);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.YUV_420_888, /*repeating*/true);
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -130,7 +143,9 @@
             try {
                 Log.i(TAG, "Testing Camera " + id);
                 openDevice(id);
-                bufferFormatTestByCamera(ImageFormat.DEPTH16, /*repeating*/true);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.DEPTH16, /*repeating*/true);
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -143,7 +158,9 @@
             try {
                 Log.i(TAG, "Testing Camera " + id);
                 openDevice(id);
-                bufferFormatTestByCamera(ImageFormat.DEPTH_POINT_CLOUD, /*repeating*/true);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.DEPTH_POINT_CLOUD, /*repeating*/true);
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -155,8 +172,10 @@
         for (String id : mCameraIdsUnderTest) {
             try {
                 openDevice(id);
-                bufferFormatTestByCamera(ImageFormat.DEPTH_JPEG, /*repeating*/true,
-                        /*checkSession*/ true);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.DEPTH_JPEG, /*repeating*/true);
+                params.mCheckSession = true;
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -169,7 +188,9 @@
             try {
                 Log.i(TAG, "Testing Camera " + id);
                 openDevice(id);
-                bufferFormatTestByCamera(ImageFormat.Y8, /*repeating*/true);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.Y8, /*repeating*/true);
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -182,7 +203,9 @@
             try {
                 Log.v(TAG, "Testing jpeg capture for Camera " + id);
                 openDevice(id);
-                bufferFormatTestByCamera(ImageFormat.JPEG, /*repeating*/false);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.JPEG, /*repeating*/false);
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -195,8 +218,9 @@
             try {
                 Log.v(TAG, "Testing raw capture for camera " + id);
                 openDevice(id);
-
-                bufferFormatTestByCamera(ImageFormat.RAW_SENSOR, /*repeating*/false);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.RAW_SENSOR, /*repeating*/false);
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -209,8 +233,9 @@
             try {
                 Log.v(TAG, "Testing raw capture for camera " + id);
                 openDevice(id);
-
-                bufferFormatTestByCamera(ImageFormat.RAW_PRIVATE, /*repeating*/false);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.RAW_PRIVATE, /*repeating*/false);
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -223,7 +248,20 @@
             try {
                 Log.v(TAG, "Testing YUV P010 capture for Camera " + id);
                 openDevice(id);
-                bufferFormatTestByCamera(ImageFormat.YCBCR_P010, /*repeating*/false);
+                if (!mStaticInfo.isCapabilitySupported(CameraCharacteristics.
+                            REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT)) {
+                    continue;
+                }
+                Set<Long> availableProfiles =
+                    mStaticInfo.getAvailableDynamicRangeProfilesChecked();
+                assertFalse("Absent dynamic range profiles", availableProfiles.isEmpty());
+                assertTrue("HLG10 not present in the available dynamic range profiles",
+                        availableProfiles.contains(DynamicRangeProfiles.HLG10));
+
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.YCBCR_P010, /*repeating*/false);
+                params.mDynamicRangeProfile = DynamicRangeProfiles.HLG10;
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -236,7 +274,9 @@
             try {
                 Log.v(TAG, "Testing heic capture for Camera " + id);
                 openDevice(id);
-                bufferFormatTestByCamera(ImageFormat.HEIC, /*repeating*/false);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.HEIC, /*repeating*/false);
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -249,7 +289,9 @@
             try {
                 Log.v(TAG, "Testing repeating jpeg capture for Camera " + id);
                 openDevice(id);
-                bufferFormatTestByCamera(ImageFormat.JPEG, /*repeating*/true);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.JPEG, /*repeating*/true);
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -262,8 +304,9 @@
             try {
                 Log.v(TAG, "Testing repeating raw capture for camera " + id);
                 openDevice(id);
-
-                bufferFormatTestByCamera(ImageFormat.RAW_SENSOR, /*repeating*/true);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.RAW_SENSOR, /*repeating*/true);
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -276,8 +319,9 @@
             try {
                 Log.v(TAG, "Testing repeating raw capture for camera " + id);
                 openDevice(id);
-
-                bufferFormatTestByCamera(ImageFormat.RAW_PRIVATE, /*repeating*/true);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.RAW_PRIVATE, /*repeating*/true);
+                bufferFormatTestByCamera(params);
             } finally {
                 closeDevice(id);
             }
@@ -290,7 +334,33 @@
             try {
                 Log.v(TAG, "Testing repeating heic capture for Camera " + id);
                 openDevice(id);
-                bufferFormatTestByCamera(ImageFormat.HEIC, /*repeating*/true);
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.HEIC, /*repeating*/true);
+                bufferFormatTestByCamera(params);
+            } finally {
+                closeDevice(id);
+            }
+        }
+    }
+
+    @Test
+    public void testFlexibleYuvWithTimestampBase() throws Exception {
+        for (String id : mCameraIdsUnderTest) {
+            try {
+                Log.i(TAG, "Testing Camera " + id);
+                openDevice(id);
+
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.YUV_420_888, /*repeating*/true);
+                params.mValidateImageData = false;
+                int[] timeBases = {OutputConfiguration.TIMESTAMP_BASE_SENSOR,
+                        OutputConfiguration.TIMESTAMP_BASE_MONOTONIC,
+                        OutputConfiguration.TIMESTAMP_BASE_REALTIME,
+                        OutputConfiguration.TIMESTAMP_BASE_CHOREOGRAPHER_SYNCED};
+                for (int timeBase : timeBases) {
+                    params.mTimestampBase = timeBase;
+                    bufferFormatTestByCamera(params);
+                }
             } finally {
                 closeDevice(id);
             }
@@ -404,6 +474,76 @@
         }
     }
 
+    @Test
+    public void testImageReaderBuilderSetHardwareBufferFormatAndDataSpace() throws Exception {
+        long usage = HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE | HardwareBuffer.USAGE_GPU_COLOR_OUTPUT;
+        try (
+            ImageReader reader = new ImageReader
+                .Builder(20, 45)
+                .setMaxImages(2)
+                .setDefaultHardwareBufferFormat(HardwareBuffer.RGBA_8888)
+                .setDefaultDataSpace(DataSpace.DATASPACE_BT709)
+                .setUsage(usage)
+                .build();
+            ImageWriter writer = ImageWriter.newInstance(reader.getSurface(), 1);
+            Image outputImage = writer.dequeueInputImage()
+        ) {
+            assertEquals(2, reader.getMaxImages());
+            assertEquals(usage, reader.getUsage());
+            assertEquals(HardwareBuffer.RGBA_8888, reader.getHardwareBufferFormat());
+
+            assertEquals(20, outputImage.getWidth());
+            assertEquals(45, outputImage.getHeight());
+            assertEquals(HardwareBuffer.RGBA_8888, outputImage.getFormat());
+        }
+    }
+
+    @Test
+    public void testImageReaderBuilderImageFormatOverride() throws Exception {
+        try (
+            ImageReader reader = new ImageReader
+                .Builder(20, 45)
+                .setImageFormat(ImageFormat.HEIC)
+                .setDefaultHardwareBufferFormat(HardwareBuffer.RGB_888)
+                .setDefaultDataSpace(DataSpace.DATASPACE_BT709)
+                .build();
+            ImageWriter writer = ImageWriter.newInstance(reader.getSurface(), 1);
+            Image outputImage = writer.dequeueInputImage()
+        ) {
+            assertEquals(1, reader.getMaxImages());
+            assertEquals(HardwareBuffer.USAGE_CPU_READ_OFTEN, reader.getUsage());
+            assertEquals(HardwareBuffer.RGB_888, reader.getHardwareBufferFormat());
+            assertEquals(DataSpace.DATASPACE_BT709, reader.getDataSpace());
+
+            assertEquals(20, outputImage.getWidth());
+            assertEquals(45, outputImage.getHeight());
+            assertEquals(HardwareBuffer.RGB_888, outputImage.getFormat());
+        }
+    }
+
+    @Test
+    public void testImageReaderBuilderSetImageFormat() throws Exception {
+        try (
+            ImageReader reader = new ImageReader
+                .Builder(20, 45)
+                .setMaxImages(2)
+                .setImageFormat(ImageFormat.YUV_420_888)
+                .build();
+            ImageWriter writer = ImageWriter.newInstance(reader.getSurface(), 1);
+            Image outputImage = writer.dequeueInputImage()
+        ) {
+            assertEquals(2, reader.getMaxImages());
+            assertEquals(ImageFormat.YUV_420_888, reader.getImageFormat());
+            assertEquals(HardwareBuffer.USAGE_CPU_READ_OFTEN, reader.getUsage());
+            // ImageFormat.YUV_420_888 hal dataspace is DATASPACE_JFIF
+            assertEquals(DataSpace.DATASPACE_JFIF, reader.getDataSpace());
+
+            assertEquals(20, outputImage.getWidth());
+            assertEquals(45, outputImage.getHeight());
+            assertEquals(ImageFormat.YUV_420_888, outputImage.getFormat());
+        }
+    }
+
     /**
      * Test two image stream (YUV420_888 and RAW_SENSOR) capture by using ImageReader.
      *
@@ -462,11 +602,17 @@
                 }
                 openDevice(id);
 
+
+                BufferFormatTestParam params = new BufferFormatTestParam(
+                        ImageFormat.PRIVATE, /*repeating*/true);
+                params.mSetUsageFlag = true;
+                params.mUsageFlag = HardwareBuffer.USAGE_PROTECTED_CONTENT;
+                params.mRepeating = true;
+                params.mCheckSession = true;
+                params.mValidateImageData = false;
                 for (String testCameraId : testCameraIds) {
-                    bufferFormatTestByCamera(ImageFormat.PRIVATE, /*setUsageFlag*/ true,
-                            HardwareBuffer.USAGE_PROTECTED_CONTENT, /*repeating*/ true,
-                            /*checkSession*/ true, /*validateImageData*/ false,
-                            testCameraId);
+                    params.mPhysicalId = testCameraId;
+                    bufferFormatTestByCamera(params);
                 }
             } finally {
                 closeDevice(id);
@@ -1070,30 +1216,33 @@
         validateImage(SIZE, FORMAT, /*captureCount*/1, SINGLE);
     }
 
-    private void bufferFormatTestByCamera(int format, boolean repeating) throws Exception {
-        bufferFormatTestByCamera(format, /*setUsageFlag*/ false,
-                HardwareBuffer.USAGE_CPU_READ_OFTEN, repeating,
-                /*checkSession*/ false, /*validateImageData*/ true);
-    }
+    private class BufferFormatTestParam {
+        public int mFormat;
+        public boolean mRepeating;
+        public boolean mSetUsageFlag = false;
+        public long mUsageFlag = HardwareBuffer.USAGE_CPU_READ_OFTEN;
+        public boolean mCheckSession = false;
+        public boolean mValidateImageData = true;
+        public String mPhysicalId = null;
+        public long mDynamicRangeProfile = DynamicRangeProfiles.STANDARD;
+        public int mTimestampBase = OutputConfiguration.TIMESTAMP_BASE_DEFAULT;
 
-    private void bufferFormatTestByCamera(int format, boolean repeating, boolean checkSession)
+        BufferFormatTestParam(int format, boolean repeating) {
+            mFormat = format;
+            mRepeating = repeating;
+        }
+    };
+
+    private void bufferFormatTestByCamera(BufferFormatTestParam params)
             throws Exception {
-        bufferFormatTestByCamera(format, /*setUsageFlag*/ false,
-                HardwareBuffer.USAGE_CPU_READ_OFTEN,
-                repeating, checkSession, /*validateImageData*/true);
-    }
+        int format = params.mFormat;
+        boolean setUsageFlag = params.mSetUsageFlag;
+        long usageFlag = params.mUsageFlag;
+        boolean repeating = params.mRepeating;
+        boolean validateImageData = params.mValidateImageData;
+        int timestampBase = params.mTimestampBase;
 
-    private void bufferFormatTestByCamera(int format, boolean setUsageFlag, long usageFlag,
-            boolean repeating, boolean checkSession, boolean validateImageData) throws Exception {
-        bufferFormatTestByCamera(format, setUsageFlag, usageFlag, repeating, checkSession,
-                validateImageData, /*physicalId*/null);
-    }
-
-    private void bufferFormatTestByCamera(int format, boolean setUsageFlag, long usageFlag,
-            // TODO: Consider having some sort of test configuration class passed to reduce the
-            //       proliferation of parameters ?
-            boolean repeating, boolean checkSession, boolean validateImageData, String physicalId)
-            throws Exception {
+        String physicalId = params.mPhysicalId;
         StaticMetadata staticInfo;
         if (physicalId == null) {
             staticInfo = mStaticInfo;
@@ -1112,6 +1261,10 @@
                     CameraCharacteristics.SCALER_DEFAULT_SECURE_IMAGE_SIZE);
         }
 
+        boolean validateTimestampBase = (timestampBase
+                != OutputConfiguration.TIMESTAMP_BASE_DEFAULT);
+        Integer deviceTimestampSource = staticInfo.getCharacteristics().get(
+                CameraCharacteristics.SENSOR_INFO_TIMESTAMP_SOURCE);
         // for each resolution, test imageReader:
         for (Size sz : availableSizes) {
             try {
@@ -1134,12 +1287,12 @@
                 }
 
                 // Don't queue up images if we won't validate them
-                if (!validateImageData) {
+                if (!validateImageData && !validateTimestampBase) {
                     ImageDropperListener imageDropperListener = new ImageDropperListener();
                     mReader.setOnImageAvailableListener(imageDropperListener, mHandler);
                 }
 
-                if (checkSession) {
+                if (params.mCheckSession) {
                     checkImageReaderSessionConfiguration(
                             "Camera capture session validation for format: " + format + "failed",
                             physicalId);
@@ -1147,9 +1300,15 @@
 
                 ArrayList<OutputConfiguration> outputConfigs = new ArrayList<>();
                 OutputConfiguration config = new OutputConfiguration(mReader.getSurface());
+                assertTrue("Default timestamp source must be DEFAULT",
+                        config.getTimestampBase() == OutputConfiguration.TIMESTAMP_BASE_DEFAULT);
+                assertTrue("Default mirroring mode must be AUTO",
+                        config.getMirrorMode() == OutputConfiguration.MIRROR_MODE_AUTO);
                 if (physicalId != null) {
                     config.setPhysicalCameraId(physicalId);
                 }
+                config.setDynamicRangeProfile(params.mDynamicRangeProfile);
+                config.setTimestampBase(params.mTimestampBase);
                 outputConfigs.add(config);
                 CaptureRequest request = prepareCaptureRequestForConfigs(
                         outputConfigs, CameraDevice.TEMPLATE_PREVIEW).build();
@@ -1159,6 +1318,11 @@
 
                 int numFrameVerified = repeating ? NUM_FRAME_VERIFIED : 1;
 
+                if (validateTimestampBase) {
+                    validateTimestamps(deviceTimestampSource, timestampBase, numFrameVerified,
+                            listener, repeating);
+                }
+
                 if (validateImageData) {
                     // Validate images.
                     validateImage(sz, format, numFrameVerified, repeating);
@@ -1173,6 +1337,8 @@
                 closeDefaultImageReader();
             }
 
+            // Only test one size for non-default timestamp base.
+            if (timestampBase != OutputConfiguration.TIMESTAMP_BASE_DEFAULT) break;
         }
     }
 
@@ -1392,6 +1558,74 @@
         mListener.closePendingImages();
     }
 
+    private void validateTimestamps(Integer deviceTimestampSource, int timestampBase,
+            int captureCount, SimpleCaptureCallback listener, boolean repeating) throws Exception {
+        Image img;
+        final int MAX_RETRY_COUNT = 20;
+        int numImageVerified = 0;
+        int retryCount = 0;
+        List<Long> imageTimestamps = new ArrayList<Long>();
+        assertNotNull("Image listener is null", mListener);
+        while (numImageVerified < captureCount) {
+            if (VERBOSE) Log.v(TAG, "Waiting for an Image");
+            mListener.waitForAnyImageAvailable(CAPTURE_WAIT_TIMEOUT_MS);
+            if (repeating) {
+                img = mReader.acquireLatestImage();
+                if (img == null && retryCount < MAX_RETRY_COUNT) {
+                    retryCount++;
+                    continue;
+                }
+            } else {
+                img = mReader.acquireNextImage();
+            }
+            assertNotNull("Unable to acquire the latest image", img);
+            if (VERBOSE) {
+                Log.v(TAG, "Got the latest image with timestamp " + img.getTimestamp());
+            }
+            imageTimestamps.add(img.getTimestamp());
+            img.close();
+            numImageVerified++;
+            retryCount = 0;
+        }
+
+        List<Long> captureStartTimestamps = listener.getCaptureStartTimestamps(captureCount);
+        if (VERBOSE) {
+            Log.v(TAG, "deviceTimestampSource: " + deviceTimestampSource
+                    + ", timestampBase: " + timestampBase + ", captureStartTimestamps: "
+                    + captureStartTimestamps + ", imageTimestamps: " + imageTimestamps);
+        }
+        if (timestampBase == OutputConfiguration.TIMESTAMP_BASE_SENSOR
+                || (timestampBase == OutputConfiguration.TIMESTAMP_BASE_MONOTONIC
+                && deviceTimestampSource == CameraMetadata.SENSOR_INFO_TIMESTAMP_SOURCE_UNKNOWN)
+                || (timestampBase == OutputConfiguration.TIMESTAMP_BASE_REALTIME
+                && deviceTimestampSource == CameraMetadata.SENSOR_INFO_TIMESTAMP_SOURCE_REALTIME)) {
+            // Makes sure image timestamps match capture started timestamp
+            for (Long timestamp : imageTimestamps) {
+                mCollector.expectTrue("Image timestamp " + timestamp
+                        + " should match one of onCaptureStarted timestamps "
+                        + captureStartTimestamps,
+                        captureStartTimestamps.contains(timestamp));
+            }
+        } else if (timestampBase == OutputConfiguration.TIMESTAMP_BASE_CHOREOGRAPHER_SYNCED) {
+            // Make sure that timestamp base is MONOTONIC. Do not strictly check against
+            // choreographer callback because there are cases camera framework doesn't use
+            // choreographer timestamp (when consumer is slower than camera for example).
+            final int TIMESTAMP_THRESHOLD_MILLIS = 3000; // 3 seconds
+            long monotonicTime = SystemClock.uptimeMillis();
+            for (Long timestamp : imageTimestamps) {
+                long timestampMs = TimeUnit.NANOSECONDS.toMillis(timestamp);
+                mCollector.expectTrue("Image timestamp " + timestampMs + " ms should be in the "
+                        + "same timebase as SystemClock.updateMillis " + monotonicTime
+                        + " ms when timestamp base is set to CHOREOGRAPHER synced",
+                        Math.abs(timestampMs - monotonicTime) < TIMESTAMP_THRESHOLD_MILLIS);
+            }
+        }
+
+        // Return all pending images to the ImageReader as the validateImage may
+        // take a while to return and there could be many images pending.
+        mListener.closePendingImages();
+    }
+
     /** Load dynamic depth validation jni on initialization */
     static {
         System.loadLibrary("ctscamera2_jni");
diff --git a/tests/camera/src/android/hardware/camera2/cts/ImageWriterTest.java b/tests/camera/src/android/hardware/camera2/cts/ImageWriterTest.java
index 7e4a8c5a..220b1d9 100644
--- a/tests/camera/src/android/hardware/camera2/cts/ImageWriterTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/ImageWriterTest.java
@@ -17,16 +17,22 @@
 package android.hardware.camera2.cts;
 
 import static android.hardware.camera2.cts.CameraTestUtils.*;
+
 import static junit.framework.Assert.*;
 
+import static org.junit.Assume.assumeNotNull;
+import static org.junit.Assume.assumeTrue;
+
 import android.graphics.ImageFormat;
 import android.graphics.SurfaceTexture;
-import android.hardware.camera2.cts.CameraTestUtils.SimpleCaptureCallback;
-import android.hardware.camera2.cts.testcases.Camera2AndroidTestCase;
+import android.hardware.DataSpace;
+import android.hardware.HardwareBuffer;
+import android.hardware.SyncFence;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
-import android.hardware.HardwareBuffer;
+import android.hardware.camera2.cts.CameraTestUtils.SimpleCaptureCallback;
+import android.hardware.camera2.cts.testcases.Camera2AndroidTestCase;
 import android.media.Image;
 import android.media.Image.Plane;
 import android.media.ImageReader;
@@ -35,15 +41,17 @@
 import android.util.Size;
 import android.view.Surface;
 
+import com.android.cts.hardware.SyncFenceUtil;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.Test;
-
 /**
  * <p>
  * Basic test for ImageWriter APIs. ImageWriter takes the images produced by
@@ -59,6 +67,8 @@
     // Max number of images can be accessed simultaneously from ImageReader.
     private static final int MAX_NUM_IMAGES = 3;
     private static final int CAMERA_PRIVATE_FORMAT = ImageFormat.PRIVATE;
+    private static final int BUFFER_WIDTH = 640;
+    private static final int BUFFER_HEIGHT = 480;
     private ImageReader mReaderForWriter;
     private ImageWriter mWriter;
 
@@ -196,8 +206,8 @@
     @Test
     public void testWriterFormatOverride() throws Exception {
         int[] TEXTURE_TEST_FORMATS = {ImageFormat.YV12, ImageFormat.YUV_420_888};
-        SurfaceTexture texture = new SurfaceTexture(/*random int*/1);
-        texture.setDefaultBufferSize(640, 480);
+        SurfaceTexture texture = new SurfaceTexture(false);
+        texture.setDefaultBufferSize(BUFFER_WIDTH, BUFFER_HEIGHT);
         Surface surface = new Surface(texture);
 
         // Make sure that the default newInstance is still valid.
@@ -216,6 +226,179 @@
         }
     }
 
+    @Test
+    public void testWriterWithImageFormatOverride() throws Exception {
+        final int imageReaderFormat = ImageFormat.YUV_420_888;
+        final int imageWriterFormat = ImageFormat.YV12;
+        final int dataSpace = DataSpace.DATASPACE_JFIF;
+        final int hardwareBufferFormat = ImageFormat.YV12;
+        try (
+            ImageReader reader = new ImageReader
+                .Builder(BUFFER_WIDTH, BUFFER_HEIGHT)
+                .setImageFormat(imageReaderFormat)
+                .build();
+            ImageWriter writer = new ImageWriter
+                .Builder(reader.getSurface())
+                .setImageFormat(imageWriterFormat)
+                .build();
+            Image outputImage = writer.dequeueInputImage()
+        ) {
+            assertEquals(1, reader.getMaxImages());
+            assertEquals(imageReaderFormat, reader.getImageFormat());
+            assertEquals(dataSpace, reader.getDataSpace());
+
+            assertEquals(HardwareBuffer.USAGE_CPU_READ_OFTEN, reader.getUsage());
+            assertEquals(dataSpace, writer.getDataSpace());
+            assertEquals(imageWriterFormat, writer.getFormat());
+
+            assertEquals(BUFFER_WIDTH, outputImage.getWidth());
+            assertEquals(BUFFER_HEIGHT, outputImage.getHeight());
+            assertEquals(imageWriterFormat, outputImage.getFormat());
+            assertEquals(dataSpace, outputImage.getDataSpace());
+        }
+    }
+
+    @Test
+    public void testWriterBuilderDefault() throws Exception {
+        try (
+            ImageReader reader = new ImageReader
+                .Builder(BUFFER_WIDTH, BUFFER_HEIGHT)
+                .setImageFormat(ImageFormat.HEIC)
+                .setDefaultHardwareBufferFormat(HardwareBuffer.RGBA_8888)
+                .setDefaultDataSpace(DataSpace.DATASPACE_BT709)
+                .build();
+            ImageWriter writer = new ImageWriter
+                .Builder(reader.getSurface())
+                .build();
+            Image outputImage = writer.dequeueInputImage()
+        ) {
+            assertEquals(1, reader.getMaxImages()); // default maxImages
+            assertEquals(HardwareBuffer.USAGE_CPU_READ_OFTEN, reader.getUsage()); // default usage
+            assertEquals(HardwareBuffer.RGBA_8888, reader.getHardwareBufferFormat());
+            assertEquals(DataSpace.DATASPACE_BT709, reader.getDataSpace());
+
+            assertEquals(BUFFER_WIDTH, outputImage.getWidth());
+            assertEquals(BUFFER_HEIGHT, outputImage.getHeight());
+            assertEquals(HardwareBuffer.RGBA_8888, outputImage.getFormat());
+        }
+    }
+
+    @Test
+    public void testWriterBuilderSetImageFormatAndSize() throws Exception {
+        SurfaceTexture texture = new SurfaceTexture(false);
+        texture.setDefaultBufferSize(BUFFER_WIDTH, BUFFER_HEIGHT);
+        Surface surface = new Surface(texture);
+        final int imageWriterWidth = 20;
+        final int imageWriterHeight = 50;
+
+        long usage = HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE;
+        try (
+            ImageWriter writer = new ImageWriter
+                .Builder(surface)
+                .setWidthAndHeight(imageWriterWidth, imageWriterHeight)
+                .setMaxImages(MAX_NUM_IMAGES)
+                .setImageFormat(ImageFormat.YV12)
+                .setUsage(usage)
+                .build();
+            Image image = writer.dequeueInputImage()
+        ) {
+            // ImageFormat.YV12 HAL dataspace is DataSpace.DATASPACE_JFIF
+            assertEquals(imageWriterWidth, writer.getWidth());
+            assertEquals(imageWriterHeight, writer.getHeight());
+            assertEquals(MAX_NUM_IMAGES, writer.getMaxImages());
+            assertEquals(DataSpace.DATASPACE_JFIF, writer.getDataSpace());
+            assertEquals(usage, writer.getUsage());
+
+            assertEquals(DataSpace.DATASPACE_JFIF, image.getDataSpace());
+            assertEquals(ImageFormat.YV12, image.getFormat());
+            assertEquals(imageWriterWidth, image.getWidth());
+        }
+    }
+
+    @Test
+    public void testWriterBuilderSetHardwareBufferFormatAndDataSpace() throws Exception {
+        SurfaceTexture texture = new SurfaceTexture(false);
+        texture.setDefaultBufferSize(BUFFER_WIDTH, BUFFER_HEIGHT);
+        Surface surface = new Surface(texture);
+
+        long usage = HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE | HardwareBuffer.USAGE_GPU_COLOR_OUTPUT;
+        try (
+            ImageWriter writer = new ImageWriter
+                .Builder(surface)
+                .setImageFormat(ImageFormat.YV12)
+                .setHardwareBufferFormat(HardwareBuffer.RGBA_8888)
+                .setDataSpace(DataSpace.DATASPACE_BT709)
+                .setUsage(usage)
+                .build();
+            Image image = writer.dequeueInputImage()
+        ) {
+            assertEquals(BUFFER_WIDTH, writer.getWidth());
+            assertEquals(BUFFER_HEIGHT, writer.getHeight());
+            assertEquals(DataSpace.DATASPACE_BT709, writer.getDataSpace());
+            assertEquals(HardwareBuffer.RGBA_8888, writer.getHardwareBufferFormat());
+            assertEquals(usage, writer.getUsage());
+
+            assertEquals(DataSpace.DATASPACE_BT709, image.getDataSpace());
+            assertEquals(BUFFER_WIDTH, image.getWidth());
+            assertEquals(BUFFER_HEIGHT, image.getHeight());
+        }
+    }
+
+    @Test
+    public void testGetFence() throws Exception {
+        try (
+            ImageReader reader = new ImageReader
+                .Builder(20, 45)
+                .setMaxImages(2)
+                .setImageFormat(ImageFormat.YUV_420_888)
+                .build();
+            ImageWriter writer = new ImageWriter
+                .Builder(reader.getSurface())
+                .build();
+            Image outputImage = writer.dequeueInputImage()
+        ) {
+            assertEquals(false, outputImage.getFence().isValid());
+        }
+    }
+
+    @Test
+    public void testSetFence() throws Exception {
+        SyncFence fence = SyncFenceUtil.createUselessFence();
+        assumeNotNull(fence);
+
+        SurfaceTexture texture = new SurfaceTexture(false);
+        texture.setDefaultBufferSize(BUFFER_WIDTH, BUFFER_HEIGHT);
+        Surface surface = new Surface(texture);
+        // fence may not be valid on cuttlefish using swiftshader
+        assumeTrue(fence.isValid());
+
+        try (
+            ImageWriter writer = new ImageWriter
+                    .Builder(surface)
+                    .build();
+            Image outputImage = writer.dequeueInputImage()
+        ) {
+            outputImage.setFence(fence);
+            assertEquals(fence.getSignalTime(), outputImage.getFence().getSignalTime());
+        }
+    }
+
+    @Test
+    public void testGetPlanesAndFence() throws Exception {
+        try (
+            ImageReader reader = new ImageReader
+                    .Builder(BUFFER_WIDTH, BUFFER_HEIGHT)
+                    .build();
+            ImageWriter writer = new ImageWriter
+                    .Builder(reader.getSurface())
+                    .build();
+            Image outputImage = writer.dequeueInputImage();
+        ) {
+            outputImage.getPlanes();
+            assertEquals(false, outputImage.getFence().isValid());
+        }
+    }
+
     private void readerWriterFormatTestByCamera(int format, boolean altFactoryMethod)
             throws Exception {
         List<Size> sizes = getSortedSizesForFormat(mCamera.getId(), mCameraManager, format, null);
diff --git a/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java b/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java
index 2bdf2db..1b356ea 100644
--- a/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/LogicalCameraDeviceTest.java
@@ -16,7 +16,28 @@
 
 package android.hardware.camera2.cts;
 
-import static android.hardware.camera2.cts.CameraTestUtils.*;
+import static android.hardware.camera2.cts.CameraTestUtils.ImageDropperListener;
+import static android.hardware.camera2.cts.CameraTestUtils.PREVIEW_SIZE_BOUND;
+import static android.hardware.camera2.cts.CameraTestUtils.SESSION_CONFIGURE_TIMEOUT_MS;
+import static android.hardware.camera2.cts.CameraTestUtils.SessionConfigSupport;
+import static android.hardware.camera2.cts.CameraTestUtils.SimpleCaptureCallback;
+import static android.hardware.camera2.cts.CameraTestUtils.SimpleImageReaderListener;
+import static android.hardware.camera2.cts.CameraTestUtils.assertFalse;
+import static android.hardware.camera2.cts.CameraTestUtils.assertNotNull;
+import static android.hardware.camera2.cts.CameraTestUtils.assertTrue;
+import static android.hardware.camera2.cts.CameraTestUtils.configureCameraSessionWithConfig;
+import static android.hardware.camera2.cts.CameraTestUtils.fail;
+import static android.hardware.camera2.cts.CameraTestUtils.getCropRegionForZoom;
+import static android.hardware.camera2.cts.CameraTestUtils.getMaxPreviewSize;
+import static android.hardware.camera2.cts.CameraTestUtils.getPreviewSizeBound;
+import static android.hardware.camera2.cts.CameraTestUtils.getSupportedPreviewSizes;
+import static android.hardware.camera2.cts.CameraTestUtils.isSessionConfigSupported;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
 
 import android.content.Context;
 import android.content.Intent;
@@ -24,24 +45,19 @@
 import android.graphics.ImageFormat;
 import android.graphics.PointF;
 import android.graphics.Rect;
-import android.graphics.SurfaceTexture;
 import android.hardware.camera2.CameraCaptureSession;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureFailure;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
 import android.hardware.camera2.TotalCaptureResult;
-import android.hardware.camera2.CaptureFailure;
-import android.hardware.camera2.cts.CaptureResultTest;
 import android.hardware.camera2.cts.helpers.StaticMetadata;
-import android.hardware.camera2.cts.helpers.StaticMetadata.CheckLevel;
 import android.hardware.camera2.cts.testcases.Camera2SurfaceViewTestCase;
 import android.hardware.camera2.params.OutputConfiguration;
 import android.hardware.camera2.params.SessionConfiguration;
 import android.hardware.camera2.params.StreamConfigurationMap;
-import android.media.CamcorderProfile;
 import android.media.Image;
 import android.media.ImageReader;
 import android.os.BatteryManager;
@@ -52,29 +68,24 @@
 import android.util.Range;
 import android.util.Size;
 import android.util.SizeF;
-import android.view.Display;
-import android.view.Surface;
 import android.view.WindowManager;
 
 import com.android.compatibility.common.util.CddTest;
-import com.android.compatibility.common.util.Stat;
 import com.android.ex.camera2.blocking.BlockingSessionCallback;
 import com.android.ex.camera2.utils.StateWaiter;
 
-import java.util.Arrays;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import java.util.ArrayList;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import org.junit.runners.Parameterized;
-import org.junit.runner.RunWith;
-import org.junit.Test;
-
-import static org.mockito.Mockito.*;
+import java.util.concurrent.LinkedBlockingQueue;
 
 /**
  * Tests exercising logical camera setup, configuration, and usage.
@@ -941,24 +952,24 @@
                 continue;
             }
             StreamConfigurationMap configMap =
-                properties.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
+                    properties.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
             physicalConfigs.put(physicalCameraId, configMap);
             physicalPreviewSizesMap.put(physicalCameraId,
                     getSupportedPreviewSizes(physicalCameraId, mCameraManager, PREVIEW_SIZE_BOUND));
         }
 
         // Find display size from window service.
-        Context context = mActivityRule.getActivity().getApplicationContext();
+        Context context = mActivityRule.getActivity();
         WindowManager windowManager =
                 (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        Display display = windowManager.getDefaultDisplay();
+        Rect windowBounds = windowManager.getCurrentWindowMetrics().getBounds();
 
-        int displayWidth = display.getWidth();
-        int displayHeight = display.getHeight();
+        int windowWidth = windowBounds.width();
+        int windowHeight = windowBounds.height();
 
-        if (displayHeight > displayWidth) {
-            displayHeight = displayWidth;
-            displayWidth = display.getHeight();
+        if (windowHeight > windowWidth) {
+            windowHeight = windowWidth;
+            windowWidth = windowBounds.height();
         }
 
         StreamConfigurationMap config = mStaticInfo.getCharacteristics().get(
@@ -966,27 +977,27 @@
         for (Size previewSize : previewSizes) {
             dualPhysicalCameraIds.clear();
             // Skip preview sizes larger than screen size
-            if (previewSize.getWidth() > displayWidth ||
-                    previewSize.getHeight() > displayHeight) {
+            if (previewSize.getWidth() > windowWidth
+                    || previewSize.getHeight() > windowHeight) {
                 continue;
             }
 
             final long minFrameDuration = config.getOutputMinFrameDuration(
-                   ImageFormat.YUV_420_888, previewSize);
+                    ImageFormat.YUV_420_888, previewSize);
 
             ArrayList<String> supportedPhysicalCameras = new ArrayList<String>();
             for (String physicalCameraId : physicalCameraIds) {
                 List<Size> physicalPreviewSizes = physicalPreviewSizesMap.get(physicalCameraId);
                 if (physicalPreviewSizes != null && physicalPreviewSizes.contains(previewSize)) {
-                   long minDurationPhysical =
-                           physicalConfigs.get(physicalCameraId).getOutputMinFrameDuration(
-                           ImageFormat.YUV_420_888, previewSize);
-                   if (minDurationPhysical <= minFrameDuration) {
+                    long minDurationPhysical =
+                            physicalConfigs.get(physicalCameraId).getOutputMinFrameDuration(
+                                    ImageFormat.YUV_420_888, previewSize);
+                    if (minDurationPhysical <= minFrameDuration) {
                         dualPhysicalCameraIds.add(physicalCameraId);
                         if (dualPhysicalCameraIds.size() == 2) {
                             return previewSize;
                         }
-                   }
+                    }
                 }
             }
         }
@@ -1308,10 +1319,9 @@
     }
 
     private double getScreenSizeInInches() {
-        DisplayMetrics dm = new DisplayMetrics();
-        mWindowManager.getDefaultDisplay().getMetrics(dm);
-        double widthInInchesSquared = Math.pow(dm.widthPixels/dm.xdpi,2);
-        double heightInInchesSquared = Math.pow(dm.heightPixels/dm.ydpi,2);
+        DisplayMetrics dm = mContext.getResources().getDisplayMetrics();
+        double widthInInchesSquared = Math.pow(dm.widthPixels / dm.xdpi, 2);
+        double heightInInchesSquared = Math.pow(dm.heightPixels / dm.ydpi, 2);
         return Math.sqrt(widthInInchesSquared + heightInInchesSquared);
     }
 }
diff --git a/tests/camera/src/android/hardware/camera2/cts/MultiViewTest.java b/tests/camera/src/android/hardware/camera2/cts/MultiViewTest.java
index 6123592..e157771 100644
--- a/tests/camera/src/android/hardware/camera2/cts/MultiViewTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/MultiViewTest.java
@@ -19,10 +19,12 @@
 import static android.hardware.camera2.cts.CameraTestUtils.*;
 import static android.hardware.cts.helpers.CameraUtils.*;
 
+import static org.junit.Assert.assertArrayEquals;
+
 import android.graphics.Bitmap;
 import android.graphics.ImageFormat;
-import android.graphics.PixelFormat;
 import android.graphics.SurfaceTexture;
+import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CaptureRequest;
@@ -38,6 +40,7 @@
 import android.media.Image;
 import android.media.ImageReader;
 import android.media.ImageWriter;
+import android.opengl.Matrix;
 import android.os.SystemClock;
 import android.os.ConditionVariable;
 import android.util.Log;
@@ -49,6 +52,7 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 import org.junit.runner.RunWith;
@@ -1070,6 +1074,129 @@
         }
     }
 
+    /*
+     * Verify behavior of mirroring mode
+     */
+    @Test
+    public void testTextureViewPreviewWithMirroring() throws Exception {
+        // 4x4 GL-style matrices, as returned by SurfaceTexture#getTransformMatrix(). Note they're
+        // transforming texture coordinates ([0,1]^2), so the origin for the transforms is
+        // (0.5, 0.5), not (0,0).
+        final float[] MIRROR_HORIZONTAL_MATRIX = new float[] {
+            -1.0f,  0.0f,  0.0f,  0.0f,
+             0.0f,  1.0f,  0.0f,  0.0f,
+             0.0f,  0.0f,  1.0f,  0.0f,
+             1.0f,  0.0f,  0.0f,  1.0f,
+        };
+        final float[] MIRROR_VERTICAL_MATRIX = new float[] {
+             1.0f,  0.0f,  0.0f,  0.0f,
+             0.0f, -1.0f,  0.0f,  0.0f,
+             0.0f,  0.0f,  1.0f,  0.0f,
+             0.0f,  1.0f,  0.0f,  1.0f,
+        };
+
+        for (String cameraId : mCameraIdsUnderTest) {
+            Exception prior = null;
+
+            try {
+                openCamera(cameraId);
+                if (!getStaticInfo(cameraId).isColorOutputSupported()) {
+                    Log.i(TAG, "Camera " + cameraId + " does not support color outputs, skipping");
+                    continue;
+                }
+
+                int[] supportedModes = {
+                        OutputConfiguration.MIRROR_MODE_AUTO,
+                        OutputConfiguration.MIRROR_MODE_NONE,
+                        OutputConfiguration.MIRROR_MODE_H,
+                        OutputConfiguration.MIRROR_MODE_V };
+
+                HashMap<Integer, float[]> transformsPerMode = new HashMap<>();
+                for (int mode : supportedModes) {
+                    float[] transform =
+                            textureViewPreviewWithMirroring(cameraId, mTextureView[0], mode);
+                    transformsPerMode.put(mode, transform);
+                }
+
+                int lensFacing = getStaticInfo(cameraId).getLensFacingChecked();
+                if (lensFacing == CameraCharacteristics.LENS_FACING_FRONT) {
+                    assertArrayEquals("Front camera's transform matrix must be the same between "
+                            + "AUTO and horizontal mirroring mode",
+                            transformsPerMode.get(OutputConfiguration.MIRROR_MODE_AUTO),
+                            transformsPerMode.get(OutputConfiguration.MIRROR_MODE_H), 0.0f);
+                } else {
+                    assertArrayEquals("Rear/external camera's transform matrix must be the same "
+                            + "between AUTO and NONE mirroring mode",
+                            transformsPerMode.get(OutputConfiguration.MIRROR_MODE_AUTO),
+                            transformsPerMode.get(OutputConfiguration.MIRROR_MODE_NONE), 0.0f);
+                }
+
+                float[] horizontalMirroredTransform = new float[16];
+                Matrix.multiplyMM(horizontalMirroredTransform, 0,
+                        transformsPerMode.get(OutputConfiguration.MIRROR_MODE_NONE), 0,
+                        MIRROR_HORIZONTAL_MATRIX, 0);
+                assertArrayEquals("Camera " + cameraId + " transform matrix in horizontal mode "
+                        + "contradicts with NONE mode",
+                        transformsPerMode.get(OutputConfiguration.MIRROR_MODE_H),
+                        horizontalMirroredTransform, 0.0f);
+
+                float[] verticalMirroredTransform = new float[16];
+                Matrix.multiplyMM(verticalMirroredTransform, 0,
+                        transformsPerMode.get(OutputConfiguration.MIRROR_MODE_NONE), 0,
+                        MIRROR_VERTICAL_MATRIX, 0);
+                assertArrayEquals("Camera " + cameraId + " transform matrix in vertical mode "
+                        + "contradicts with NONE mode",
+                        transformsPerMode.get(OutputConfiguration.MIRROR_MODE_V),
+                        verticalMirroredTransform, 0.0f);
+            } catch (Exception e) {
+                prior = e;
+            } finally {
+                try {
+                    closeCamera(cameraId);
+                } catch (Exception e) {
+                    if (prior != null) {
+                        Log.e(TAG, "Prior exception received: " + prior);
+                    }
+                    prior = e;
+                }
+                if (prior != null) throw prior; // Rethrow last exception.
+            }
+        }
+    }
+
+    private float[] textureViewPreviewWithMirroring(String cameraId,
+            TextureView textureView, int mirrorMode) throws Exception {
+        Size previewSize = getOrderedPreviewSizes(cameraId).get(0);
+        CameraPreviewListener previewListener =
+                new CameraPreviewListener();
+        textureView.setSurfaceTextureListener(previewListener);
+        SurfaceTexture previewTexture = getAvailableSurfaceTexture(
+                WAIT_FOR_COMMAND_TO_COMPLETE, textureView);
+        assertNotNull("Unable to get preview surface texture", previewTexture);
+        previewTexture.setDefaultBufferSize(previewSize.getWidth(), previewSize.getHeight());
+        // Correct the preview display rotation.
+        updatePreviewDisplayRotation(previewSize, textureView);
+
+        OutputConfiguration outputConfig = new OutputConfiguration(new Surface(previewTexture));
+        outputConfig.setMirrorMode(mirrorMode);
+        List<OutputConfiguration> outputConfigs = new ArrayList<>();
+        outputConfigs.add(outputConfig);
+        startPreviewWithConfigs(cameraId, outputConfigs, null);
+
+        boolean previewDone =
+                previewListener.waitForPreviewDone(WAIT_FOR_COMMAND_TO_COMPLETE);
+        assertTrue("Unable to start preview", previewDone);
+
+        SystemClock.sleep(PREVIEW_TIME_MS);
+
+        float[] transform = previewListener.getPreviewTransform();
+        assertNotNull("Failed to get preview transform");
+
+        textureView.setSurfaceTextureListener(null);
+        stopPreview(cameraId);
+
+        return transform;
+    }
 
     /**
      * Start camera preview using input texture views and/or one image reader
diff --git a/tests/camera/src/android/hardware/camera2/cts/NativeCameraDeviceTest.java b/tests/camera/src/android/hardware/camera2/cts/NativeCameraDeviceTest.java
index ff1d790..7fef977 100644
--- a/tests/camera/src/android/hardware/camera2/cts/NativeCameraDeviceTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/NativeCameraDeviceTest.java
@@ -73,6 +73,15 @@
     }
 
     @Test
+    public void testCameraDeviceSimplePreviewWithV2Callbacks() {
+        // Init preview surface to a guaranteed working size
+        updatePreviewSurface(new Size(640, 480));
+        assertTrue("testCameraDeviceSimplePreview fail, see log for details",
+                testCameraDeviceSimplePreviewNative2(mPreviewSurface,
+                        mOverrideCameraId));
+    }
+
+    @Test
     public void testCameraDevicePreviewWithSessionParameters() {
         // Init preview surface to a guaranteed working size
         updatePreviewSurface(new Size(640, 480));
@@ -107,6 +116,19 @@
     }
 
     @Test
+    public void testCameraDeviceLogicalPhysicalStreamingWithV2Callbacks() {
+        // Init preview surface to a guaranteed working size
+        Size previewSize = new Size(640, 480);
+        updatePreviewSurface(previewSize);
+        SurfaceTexture outputTexture = new SurfaceTexture(/* random texture ID*/ 5);
+        outputTexture.setDefaultBufferSize(previewSize.getWidth(), previewSize.getHeight());
+        Surface outputSurface = new Surface(outputTexture);
+        assertTrue("testCameraDeviceLogicalPhysicalStreaming fail, see log for details",
+                testCameraDeviceLogicalPhysicalStreamingNative2(mPreviewSurface,
+                        mOverrideCameraId));
+    }
+
+    @Test
     public void testCameraDeviceLogicalPhysicalSettings() {
         // Init preview surface to a guaranteed working size
         Size previewSize = new Size(640, 480);
@@ -119,6 +141,18 @@
     }
 
     @Test
+    public void testCameraDeviceLogicalPhysicalSettingsWithV2Callbacks() {
+        // Init preview surface to a guaranteed working size
+        Size previewSize = new Size(640, 480);
+        updatePreviewSurface(previewSize);
+        SurfaceTexture outputTexture = new SurfaceTexture(/* random texture ID*/ 5);
+        outputTexture.setDefaultBufferSize(previewSize.getWidth(), previewSize.getHeight());
+        Surface outputSurface = new Surface(outputTexture);
+        assertTrue("testCameraDeviceLogicalPhysicalSettings fail, see log for details",
+                testCameraDeviceLogicalPhysicalSettingsNative2(mPreviewSurface, mOverrideCameraId));
+    }
+
+    @Test
     public void testCameraDeviceCaptureFailure() {
         assertTrue("testCameraDeviceCaptureFailure fail, see log for details",
                 testCameraDeviceCaptureFailureNative(mOverrideCameraId));
@@ -131,14 +165,20 @@
             String overrideCameraId);
     private static native boolean testCameraDeviceSimplePreviewNative(Surface preview,
             String overrideCameraId);
+    private static native boolean testCameraDeviceSimplePreviewNative2(
+            Surface preview, String overrideCameraId);
     private static native boolean testCameraDevicePreviewWithSessionParametersNative(
             Surface preview, String overrideCameraId);
     private static native boolean testCameraDeviceSharedOutputUpdate(Surface src, Surface dst,
             String overrideCameraId);
     private static native boolean testCameraDeviceLogicalPhysicalStreamingNative(Surface preview,
             String overrideCameraId);
+    private static native boolean testCameraDeviceLogicalPhysicalStreamingNative2(Surface preview,
+            String overrideCameraId);
     private static native boolean testCameraDeviceLogicalPhysicalSettingsNative(Surface preview,
             String overrideCameraId);
+    private static native boolean testCameraDeviceLogicalPhysicalSettingsNative2(Surface preview,
+            String overrideCameraId);
     private static native boolean testCameraDeviceCaptureFailureNative(String overrideCameraId);
 
 }
diff --git a/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java b/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java
index a7787af..8c70152 100644
--- a/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/RecordingTest.java
@@ -905,15 +905,36 @@
                         mStaticInfo.getValueFromKeyNonNull(
                                 CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
                 Size[] highSpeedVideoSizes = config.getHighSpeedVideoSizes();
+                Log.v(TAG, "highSpeedVideoSizes:" + Arrays.toString(highSpeedVideoSizes));
+                int previewFrameRate = Integer.MAX_VALUE;
                 for (Size size : highSpeedVideoSizes) {
                     List<Range<Integer>> fixedFpsRanges =
                             getHighSpeedFixedFpsRangeForSize(config, size);
+                    Range<Integer>[] highSpeedFpsRangesForSize =
+                            config.getHighSpeedVideoFpsRangesFor(size);
+
+                    Log.v(TAG, "highSpeedFpsRangesForSize for size - " + size + " : " +
+                            Arrays.toString(highSpeedFpsRangesForSize));
+                    // Map to store  max_fps and preview fps for each video size
+                    HashMap<Integer, Integer> previewRateMap = new HashMap();
+                    for (Range<Integer> r : highSpeedFpsRangesForSize ) {
+                        if (r.getLower() != r.getUpper()) {
+                            if (previewRateMap.containsKey(r.getUpper())) {
+                                Log.w(TAG, "previewFps for max_fps already exists.");
+                            } else {
+                                previewRateMap.put(r.getUpper(), r.getLower());
+                            }
+                        }
+                    }
+
                     mCollector.expectTrue("Unable to find the fixed frame rate fps range for " +
                             "size " + size, fixedFpsRanges.size() > 0);
                     // Test recording for each FPS range
                     for (Range<Integer> fpsRange : fixedFpsRanges) {
                         int captureRate = fpsRange.getLower();
-                        final int VIDEO_FRAME_RATE = 30;
+                        previewFrameRate = previewRateMap.get(captureRate);
+                        Log.v(TAG, "previewFrameRate: " + previewFrameRate + " captureRate: " +
+                                captureRate);
                         // Skip the test if the highest recording FPS supported by CamcorderProfile
                         if (fpsRange.getUpper() > getFpsFromHighSpeedProfileForSize(size)) {
                             Log.w(TAG, "high speed recording " + size + "@" + captureRate + "fps"
@@ -930,8 +951,8 @@
 
                         mOutMediaFileName = mDebugFileNameBase + "/test_cslowMo_video_" +
                             captureRate + "fps_" + id + "_" + size.toString() + ".mp4";
-
-                        prepareRecording(size, VIDEO_FRAME_RATE, captureRate);
+                        Log.v(TAG, "previewFrameRate:" + previewFrameRate);
+                        prepareRecording(size, previewFrameRate, captureRate);
 
                         SystemClock.sleep(PREVIEW_DURATION_MS);
 
@@ -939,7 +960,7 @@
 
                         SimpleCaptureCallback resultListener = new SimpleCaptureCallback();
                         // Start recording
-                        startSlowMotionRecording(/*useMediaRecorder*/true, VIDEO_FRAME_RATE,
+                        startSlowMotionRecording(/*useMediaRecorder*/true, previewFrameRate,
                                 captureRate, fpsRange, resultListener,
                                 /*useHighSpeedSession*/true);
 
@@ -952,7 +973,7 @@
                         startConstrainedPreview(fpsRange, previewResultListener);
 
                         // Convert number of frames camera produced into the duration in unit of ms.
-                        float frameDurationMs = 1000.0f / VIDEO_FRAME_RATE;
+                        float frameDurationMs = 1000.0f / previewFrameRate;
                         float durationMs = resultListener.getTotalNumFrames() * frameDurationMs;
 
                         // Validation.
diff --git a/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java b/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java
index 492cc68..97d912e 100644
--- a/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/RobustnessTest.java
@@ -16,58 +16,90 @@
 
 package android.hardware.camera2.cts;
 
-import static android.hardware.camera2.cts.CameraTestUtils.*;
-import static android.hardware.camera2.cts.RobustnessTest.MaxStreamSizes.*;
+import static android.hardware.camera2.cts.CameraTestUtils.PREVIEW_SIZE_BOUND;
+import static android.hardware.camera2.cts.CameraTestUtils.SessionConfigSupport;
+import static android.hardware.camera2.cts.CameraTestUtils.SimpleCaptureCallback;
+import static android.hardware.camera2.cts.CameraTestUtils.SimpleImageReaderListener;
+import static android.hardware.camera2.cts.CameraTestUtils.SizeComparator;
+import static android.hardware.camera2.cts.CameraTestUtils.StreamCombinationTargets;
+import static android.hardware.camera2.cts.CameraTestUtils.assertEquals;
+import static android.hardware.camera2.cts.CameraTestUtils.assertNotNull;
+import static android.hardware.camera2.cts.CameraTestUtils.assertNull;
+import static android.hardware.camera2.cts.CameraTestUtils.checkSessionConfigurationSupported;
+import static android.hardware.camera2.cts.CameraTestUtils.checkSessionConfigurationWithSurfaces;
+import static android.hardware.camera2.cts.CameraTestUtils.configureReprocessableCameraSession;
+import static android.hardware.camera2.cts.CameraTestUtils.fail;
+import static android.hardware.camera2.cts.CameraTestUtils.getAscendingOrderSizes;
+import static android.hardware.camera2.cts.CameraTestUtils.isSessionConfigSupported;
+import static android.hardware.camera2.cts.RobustnessTest.MaxStreamSizes.JPEG;
+import static android.hardware.camera2.cts.RobustnessTest.MaxStreamSizes.MAXIMUM;
+import static android.hardware.camera2.cts.RobustnessTest.MaxStreamSizes.PREVIEW;
+import static android.hardware.camera2.cts.RobustnessTest.MaxStreamSizes.PRIV;
+import static android.hardware.camera2.cts.RobustnessTest.MaxStreamSizes.RAW;
+import static android.hardware.camera2.cts.RobustnessTest.MaxStreamSizes.RECORD;
+import static android.hardware.camera2.cts.RobustnessTest.MaxStreamSizes.VGA;
+import static android.hardware.camera2.cts.RobustnessTest.MaxStreamSizes.YUV;
+
+import static junit.framework.Assert.assertTrue;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
 
 import android.content.Context;
 import android.graphics.ImageFormat;
+import android.graphics.Rect;
 import android.graphics.SurfaceTexture;
 import android.hardware.camera2.CameraCaptureSession;
 import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.CameraMetadata;
+import android.hardware.camera2.CaptureFailure;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
 import android.hardware.camera2.TotalCaptureResult;
-import android.hardware.camera2.CaptureFailure;
 import android.hardware.camera2.cts.helpers.StaticMetadata;
 import android.hardware.camera2.cts.testcases.Camera2AndroidTestCase;
+import android.hardware.camera2.params.DynamicRangeProfiles;
 import android.hardware.camera2.params.InputConfiguration;
-import android.hardware.camera2.params.OisSample;
-import android.hardware.camera2.params.OutputConfiguration;
 import android.hardware.camera2.params.MandatoryStreamCombination;
 import android.hardware.camera2.params.MandatoryStreamCombination.MandatoryStreamInformation;
+import android.hardware.camera2.params.OisSample;
+import android.hardware.camera2.params.OutputConfiguration;
 import android.hardware.camera2.params.SessionConfiguration;
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.media.CamcorderProfile;
 import android.media.Image;
 import android.media.ImageReader;
 import android.media.ImageWriter;
+import android.util.ArraySet;
 import android.util.Log;
 import android.util.Pair;
 import android.util.Size;
-import android.view.Display;
 import android.view.Surface;
 import android.view.WindowManager;
+import android.view.WindowMetrics;
 
 import com.android.ex.camera2.blocking.BlockingSessionCallback;
 
-import java.util.Arrays;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Comparator;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.Iterator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-
-import org.junit.runners.Parameterized;
-import org.junit.runner.RunWith;
-import org.junit.Test;
-
-import static junit.framework.Assert.assertTrue;
-import static org.mockito.Mockito.*;
+import java.util.concurrent.LinkedBlockingQueue;
 
 /**
  * Tests exercising edge cases in camera setup, configuration, and usage.
@@ -301,6 +333,146 @@
         testMandatoryOutputCombinations(/*maxResolution*/ true);
     }
 
+    /**
+     * Test for making sure the mandatory use case stream combinations work as expected.
+     */
+    @Test
+    public void testMandatoryUseCaseOutputCombinations() throws Exception {
+        for (String id : mCameraIdsUnderTest) {
+            StaticMetadata info = mAllStaticInfo.get(id);
+            CameraCharacteristics chars = info.getCharacteristics();
+            CameraCharacteristics.Key<MandatoryStreamCombination []> ck =
+                    CameraCharacteristics.SCALER_MANDATORY_USE_CASE_STREAM_COMBINATIONS;
+            MandatoryStreamCombination[] combinations = chars.get(ck);
+
+            if (!info.isCapabilitySupported(
+                    CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE)) {
+                assertNull(combinations);
+                Log.i(TAG, "Camera id " + id + " doesn't support stream use case, skip test");
+                continue;
+            }
+
+            assertNotNull(combinations);
+            openDevice(id);
+
+            try {
+                for (MandatoryStreamCombination combination : combinations) {
+                    Log.i(TAG, "Testing fixed mandatory output combination with stream use case: " +
+                            combination.getDescription() + " on camera: " + id);
+                    CaptureRequest.Builder requestBuilder =
+                            mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+                    testMandatoryOutputCombinationWithPresetKeys(id, combination, requestBuilder);
+                }
+            } finally {
+                closeDevice(id);
+            }
+        }
+    }
+
+    @Test
+    public void testMandatoryPreviewStabilizationOutputCombinations() throws Exception {
+        for (String id : mCameraIdsUnderTest) {
+            StaticMetadata info = mAllStaticInfo.get(id);
+            CameraCharacteristics chars = info.getCharacteristics();
+            CameraCharacteristics.Key<MandatoryStreamCombination []> ck =
+                    CameraCharacteristics
+                            .SCALER_MANDATORY_PREVIEW_STABILIZATION_OUTPUT_STREAM_COMBINATIONS;
+            MandatoryStreamCombination[] combinations = chars.get(ck);
+
+            if (combinations == null) {
+                assertNull(combinations);
+                Log.i(TAG, "Camera id " + id + " doesn't support preview stabilization, skip test");
+                continue;
+            }
+
+            assertNotNull(combinations);
+            openDevice(id);
+
+            try {
+                for (MandatoryStreamCombination combination : combinations) {
+                    Log.i(TAG, "Testing fixed mandatory output combination with preview"
+                            + "stabilization case: " + combination.getDescription() + " on camera: "
+                                     + id);
+                    CaptureRequest.Builder requestBuilder =
+                            mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+                    requestBuilder.set(CaptureRequest.CONTROL_VIDEO_STABILIZATION_MODE,
+                            CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_PREVIEW_STABILIZATION);
+                    testMandatoryOutputCombinationWithPresetKeys(id, combination, requestBuilder);
+                }
+            } finally {
+                closeDevice(id);
+            }
+        }
+    }
+
+    private void testMandatoryOutputCombinationWithPresetKeys(String cameraId,
+            MandatoryStreamCombination combination, CaptureRequest.Builder requestBuilderWithKeys) {
+        final int TIMEOUT_FOR_RESULT_MS = 1000;
+        final int MIN_RESULT_COUNT = 3;
+
+        // Setup outputs
+        List<OutputConfiguration> outputConfigs = new ArrayList<>();
+        List<Surface> outputSurfaces = new ArrayList<Surface>();
+        List<Surface> uhOutputSurfaces = new ArrayList<Surface>();
+        StreamCombinationTargets targets = new StreamCombinationTargets();
+
+        CameraTestUtils.setupConfigurationTargets(combination.getStreamsInformation(),
+                targets, outputConfigs, outputSurfaces, uhOutputSurfaces, MIN_RESULT_COUNT,
+                /*substituteY8*/ false, /*substituteHeic*/false,
+                /*physicalCameraId*/ null,
+                /*multiResStreamConfig*/null, mHandler,
+                /*dynamicRangeProfiles*/ null);
+
+        boolean haveSession = false;
+        try {
+            checkSessionConfigurationSupported(mCamera, mHandler, outputConfigs,
+                    /*inputConfig*/ null, SessionConfiguration.SESSION_REGULAR,
+                    true/*defaultSupport*/,
+                    String.format("Session configuration query from combination: %s failed",
+                            combination.getDescription()));
+
+            createSessionByConfigs(outputConfigs);
+            haveSession = true;
+            for (Surface s : outputSurfaces) {
+                requestBuilderWithKeys.addTarget(s);
+            }
+            CameraCaptureSession.CaptureCallback mockCaptureCallback =
+                    mock(CameraCaptureSession.CaptureCallback.class);
+            CaptureRequest request = requestBuilderWithKeys.build();
+
+            mCameraSession.setRepeatingRequest(request, mockCaptureCallback, mHandler);
+            verify(mockCaptureCallback,
+                    timeout(TIMEOUT_FOR_RESULT_MS * MIN_RESULT_COUNT).atLeast(MIN_RESULT_COUNT))
+                    .onCaptureCompleted(
+                        eq(mCameraSession),
+                        eq(request),
+                        isA(TotalCaptureResult.class));
+            verify(mockCaptureCallback, never()).
+                    onCaptureFailed(
+                        eq(mCameraSession),
+                        eq(request),
+                        isA(CaptureFailure.class));
+        } catch (Throwable e) {
+            mCollector.addMessage(
+                    String.format("Closing down for combination: %s failed due to: %s",
+                            combination.getDescription(), e.getMessage()));
+        }
+
+        if (haveSession) {
+            try {
+                Log.i(TAG, String.format("Done with camera %s, combination: %s, closing session",
+                                cameraId, combination.getDescription()));
+                stopCapture(/*fast*/false);
+            } catch (Throwable e) {
+                mCollector.addMessage(
+                    String.format("Closing down for combination: %s failed due to: %s",
+                            combination.getDescription(), e.getMessage()));
+            }
+        }
+
+        targets.close();
+    }
+
     private void testMandatoryStreamCombination(String cameraId, StaticMetadata staticInfo,
             String physicalCameraId, MandatoryStreamCombination combination) throws Exception {
         // Check whether substituting YUV_888 format with Y8 format
@@ -469,6 +641,173 @@
     }
 
     /**
+     * Test for making sure the required 10-bit stream combinations work as expected.
+     * Since we have too many possible combinations between different 8-bit vs. 10-bit as well
+     * as 10-bit dynamic profiles and in order to maximize the coverage within some reasonable
+     * amount of iterations, the test case will configure 8-bit and 10-bit outputs randomly. In case
+     * we have 10-bit output, then the dynamic range profile will also be randomly picked.
+     */
+    @Test
+    public void testMandatory10BitStreamCombinations() throws Exception {
+        for (String id : mCameraIdsUnderTest) {
+            openDevice(id);
+            CameraCharacteristics chars = mStaticInfo.getCharacteristics();
+            if (!CameraTestUtils.hasCapability(
+                    chars, CameraMetadata.REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT)) {
+                Log.i(TAG, "Camera id " + id + " doesn't support 10-bit output, skip test");
+                closeDevice(id);
+                continue;
+            }
+            CameraCharacteristics.Key<MandatoryStreamCombination []> ck =
+                    CameraCharacteristics.SCALER_MANDATORY_TEN_BIT_OUTPUT_STREAM_COMBINATIONS;
+
+            MandatoryStreamCombination[] combinations = chars.get(ck);
+            assertNotNull(combinations);
+
+            try {
+                for (MandatoryStreamCombination combination : combinations) {
+                    Log.i(TAG, "Testing fixed mandatory 10-bit output stream combination: " +
+                            combination.getDescription() + " on camera: " + id);
+                    DynamicRangeProfiles profiles = mStaticInfo.getCharacteristics().get(
+                            CameraCharacteristics.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES);
+                    assertNotNull(profiles);
+
+                    // First we want to make sure that a fixed set of 10-bit streams
+                    // is functional
+                    for (Long profile : profiles.getSupportedProfiles()) {
+                        if (profile != DynamicRangeProfiles.STANDARD) {
+                            ArrayList<Long> testProfiles = new ArrayList<Long>() {
+                                { add(profile); } };
+                            testMandatory10BitStreamCombination(id, combination, profiles,
+                                    testProfiles);
+                        }
+                    }
+
+                    Log.i(TAG, "Testing random mandatory 10-bit output stream combination: " +
+                            combination.getDescription() + " on camera: " + id);
+                    // Next try out a random mix of standard 8-bit and 10-bit profiles.
+                    // The number of possible combinations is quite big and testing them
+                    // all on physical hardware can become unfeasible.
+                    ArrayList<Long> testProfiles = new ArrayList<>(
+                            profiles.getSupportedProfiles());
+                    testMandatory10BitStreamCombination(id, combination, profiles, testProfiles);
+                }
+            } finally {
+                closeDevice(id);
+            }
+        }
+    }
+
+    private void testMandatory10BitStreamCombination(String cameraId,
+            MandatoryStreamCombination combination, DynamicRangeProfiles profiles,
+            List<Long> testProfiles) {
+        final int TIMEOUT_FOR_RESULT_MS = 1000;
+        final int MIN_RESULT_COUNT = 3;
+
+        // Setup outputs
+        List<OutputConfiguration> outputConfigs = new ArrayList<>();
+        List<Surface> outputSurfaces = new ArrayList<Surface>();
+        List<Surface> uhOutputSurfaces = new ArrayList<Surface>();
+        StreamCombinationTargets targets = new StreamCombinationTargets();
+
+        CameraTestUtils.setupConfigurationTargets(combination.getStreamsInformation(),
+                targets, outputConfigs, outputSurfaces, uhOutputSurfaces, MIN_RESULT_COUNT,
+                /*substituteY8*/ false, /*substituteHeic*/false,
+                /*physicalCameraId*/ null,
+                /*multiResStreamConfig*/null, mHandler,
+                testProfiles);
+
+        try {
+            checkSessionConfigurationSupported(mCamera, mHandler, outputConfigs,
+                    /*inputConfig*/ null, SessionConfiguration.SESSION_REGULAR,
+                    true/*defaultSupport*/,
+                    String.format("Session configuration query from combination: %s failed",
+                            combination.getDescription()));
+
+            createSessionByConfigs(outputConfigs);
+
+            boolean constraintPresent = false;
+            List<Surface> constrainedOutputs = new ArrayList<>(outputSurfaces);
+
+            while (!outputSurfaces.isEmpty()) {
+                CaptureRequest.Builder requestBuilder =
+                        mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+                // Check to see how many outputs can be combined in to a single request including
+                // the first output surface and respecting the advertised constraints
+                Iterator<OutputConfiguration> it = outputConfigs.iterator();
+                OutputConfiguration config = it.next();
+                HashSet<Long> currentProfiles = new HashSet<>();
+                currentProfiles.add(config.getDynamicRangeProfile());
+                requestBuilder.addTarget(config.getSurface());
+                outputSurfaces.remove(config.getSurface());
+                it.remove();
+                while (it.hasNext()) {
+                    config = it.next();
+                    Long currentProfile = config.getDynamicRangeProfile();
+                    Set<Long> newLimitations = profiles.getProfileCaptureRequestConstraints(
+                            currentProfile);
+                    if (newLimitations.isEmpty() || (newLimitations.containsAll(currentProfiles))) {
+                        currentProfiles.add(currentProfile);
+                        requestBuilder.addTarget(config.getSurface());
+                        outputSurfaces.remove(config.getSurface());
+                        it.remove();
+                    } else if (!constraintPresent && !newLimitations.isEmpty() &&
+                            !newLimitations.containsAll(currentProfiles)) {
+                        constraintPresent = true;
+                    }
+                }
+
+                CaptureRequest request = requestBuilder.build();
+                CameraCaptureSession.CaptureCallback mockCaptureCallback =
+                        mock(CameraCaptureSession.CaptureCallback.class);
+                mCameraSession.capture(request, mockCaptureCallback, mHandler);
+                verify(mockCaptureCallback,
+                        timeout(TIMEOUT_FOR_RESULT_MS).atLeastOnce())
+                        .onCaptureCompleted(
+                                eq(mCameraSession),
+                                eq(request),
+                                isA(TotalCaptureResult.class));
+
+                verify(mockCaptureCallback, never()).
+                        onCaptureFailed(
+                                eq(mCameraSession),
+                                eq(request),
+                                isA(CaptureFailure.class));
+            }
+
+            if (constraintPresent) {
+                // Capture requests that include output surfaces with dynamic range profiles that
+                // cannot be combined must throw a corresponding exception
+                CaptureRequest.Builder requestBuilder =
+                        mCamera.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
+                for (Surface s : constrainedOutputs) {
+                    requestBuilder.addTarget(s);
+                }
+
+                CaptureRequest request = requestBuilder.build();
+                CameraCaptureSession.CaptureCallback mockCaptureCallback =
+                        mock(CameraCaptureSession.CaptureCallback.class);
+                try {
+                    mCameraSession.capture(request, mockCaptureCallback, mHandler);
+                    fail("Capture request to outputs with incompatible dynamic range profiles "
+                            + "must always fail!");
+                } catch (IllegalArgumentException e) {
+                    // Expected
+                }
+            }
+
+            Log.i(TAG, String.format("Done with camera %s, combination: %s, closing session",
+                    cameraId, combination.getDescription()));
+        } catch (Throwable e) {
+            mCollector.addMessage(
+                    String.format("Closing down for combination: %s failed due to: %s",
+                            combination.getDescription(), e.getMessage()));
+        }
+
+        targets.close();
+    }
+
+    /**
      * Test for making sure the required reprocess input/output combinations for each hardware
      * level and capability work as expected.
      */
@@ -2693,32 +3032,34 @@
 
     private static Size getMaxPreviewSize(Context context, String cameraId) {
         try {
-            WindowManager windowManager =
-                (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-            Display display = windowManager.getDefaultDisplay();
+            WindowManager windowManager = context.getSystemService(WindowManager.class);
+            assertNotNull("Could not find WindowManager service.", windowManager);
 
-            int width = display.getWidth();
-            int height = display.getHeight();
+            WindowMetrics windowMetrics = windowManager.getCurrentWindowMetrics();
+            Rect windowBounds = windowMetrics.getBounds();
+
+            int width = windowBounds.width();
+            int height = windowBounds.height();
 
             if (height > width) {
                 height = width;
-                width = display.getHeight();
+                width = windowBounds.height();
             }
 
-            CameraManager camMgr =
-                (CameraManager) context.getSystemService(Context.CAMERA_SERVICE);
+            CameraManager camMgr = context.getSystemService(CameraManager.class);
             List<Size> orderedPreviewSizes = CameraTestUtils.getSupportedPreviewSizes(
-                cameraId, camMgr, PREVIEW_SIZE_BOUND);
+                    cameraId, camMgr, PREVIEW_SIZE_BOUND);
 
             if (orderedPreviewSizes != null) {
                 for (Size size : orderedPreviewSizes) {
                     if (width >= size.getWidth() &&
-                        height >= size.getHeight())
+                            height >= size.getHeight()) {
                         return size;
+                    }
                 }
             }
         } catch (Exception e) {
-            Log.e(TAG, "getMaxPreviewSize Failed. "+e.toString());
+            Log.e(TAG, "getMaxPreviewSize Failed. " + e);
         }
         return PREVIEW_SIZE_BOUND;
     }
diff --git a/tests/camera/src/android/hardware/camera2/cts/StaticMetadataTest.java b/tests/camera/src/android/hardware/camera2/cts/StaticMetadataTest.java
index a588c3e..f0df2c8 100644
--- a/tests/camera/src/android/hardware/camera2/cts/StaticMetadataTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/StaticMetadataTest.java
@@ -433,6 +433,8 @@
             case REQUEST_AVAILABLE_CAPABILITIES_MOTION_TRACKING:
             case REQUEST_AVAILABLE_CAPABILITIES_LOGICAL_MULTI_CAMERA:
             case REQUEST_AVAILABLE_CAPABILITIES_MONOCHROME:
+            case REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT:
+            case REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE:
                 // Tested in ExtendedCameraCharacteristicsTest
                 return;
             case REQUEST_AVAILABLE_CAPABILITIES_SECURE_IMAGE_DATA:
diff --git a/tests/camera/src/android/hardware/camera2/cts/ZoomCaptureTest.java b/tests/camera/src/android/hardware/camera2/cts/ZoomCaptureTest.java
index fab14b8..3b59f53 100644
--- a/tests/camera/src/android/hardware/camera2/cts/ZoomCaptureTest.java
+++ b/tests/camera/src/android/hardware/camera2/cts/ZoomCaptureTest.java
@@ -17,9 +17,11 @@
 package android.hardware.camera2.cts;
 
 import android.graphics.ImageFormat;
+import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.cts.CameraTestUtils;
 import android.hardware.camera2.cts.helpers.StaticMetadata;
 import android.hardware.camera2.cts.testcases.Camera2AndroidTestCase;
+import android.hardware.camera2.params.DynamicRangeProfiles;
 import android.hardware.camera2.params.OutputConfiguration;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CaptureRequest;
@@ -30,6 +32,7 @@
 import android.os.ConditionVariable;
 import android.platform.test.annotations.AppModeFull;
 import android.util.Log;
+import android.util.Range;
 import android.util.Size;
 
 import java.util.ArrayList;
@@ -37,6 +40,7 @@
 import java.util.List;
 import java.util.Set;
 
+import com.android.compatibility.common.util.CddTest;
 import com.android.compatibility.common.util.PropertyUtil;
 
 import org.junit.runner.RunWith;
@@ -98,14 +102,78 @@
         }
     }
 
+    /**
+     * 10-bit output capable logical devices must also support switching between the same physical
+     * cameras via the CONTROL_ZOOM_RATIO control, that the device supports switching between for
+     * 8-bit outputs.
+     */
+    @CddTest(requirement="7.5/C-3-1")
+    @Test
+    @AppModeFull(reason = "Instant apps can't access Test API")
+    public void test10bitLogicalZoomCapture() throws Exception {
+        final int ZOOM_RATIO_STEPS = 100;
+        for (String id : mCameraIdsUnderTest) {
+            try {
+                Log.v(TAG, "Testing 10-bit logical camera zoom capture for id " + id);
+                openDevice(id);
+
+                boolean supports10BitOutput = mStaticInfo.isCapabilitySupported(
+                        CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_DYNAMIC_RANGE_TEN_BIT);
+                if (!supports10BitOutput) {
+                    Log.v(TAG, "No 10-bit output support, skipping id " + id);
+                    continue;
+                }
+
+                if (!mStaticInfo.isColorOutputSupported()) {
+                    Log.v(TAG, "No color output support, skipping id " + id);
+                    continue;
+                }
+
+                if (!mStaticInfo.isLogicalMultiCamera()) {
+                    Log.v(TAG, "No logical device, skipping id " + id);
+                    continue;
+                }
+
+                Range<Float> zoomRatioRange = mStaticInfo.getZoomRatioRangeChecked();
+                ArrayList<Float> candidateZoomRatios = new ArrayList<>(ZOOM_RATIO_STEPS);
+                Float zoomStep  =
+                        (zoomRatioRange.getUpper() - zoomRatioRange.getLower()) / ZOOM_RATIO_STEPS;
+                for (int step = 0; step < (ZOOM_RATIO_STEPS - 1); step++) {
+                    candidateZoomRatios.add(step, zoomRatioRange.getLower() + step * zoomStep);
+                }
+                candidateZoomRatios.add(ZOOM_RATIO_STEPS - 1, zoomRatioRange.getUpper());
+
+                Set<String> activePhysicalIdsSeen8bit = new HashSet<String>();
+                bufferFormatZoomTestByCamera(ImageFormat.YUV_420_888, candidateZoomRatios,
+                        activePhysicalIdsSeen8bit /*activePhysicalIdsSeen*/);
+                Set<String> activePhysicalIdsSeen10bit = new HashSet<String>();
+                bufferFormatZoomTestByCamera(ImageFormat.YCBCR_P010, candidateZoomRatios,
+                        activePhysicalIdsSeen10bit /*activePhysicalIdsSeen*/);
+
+                assertEquals("The physical ids seen when zooming with 8-bit output: " +
+                        activePhysicalIdsSeen8bit + " must match with the 10-bit output: " +
+                        activePhysicalIdsSeen10bit, activePhysicalIdsSeen8bit,
+                        activePhysicalIdsSeen10bit);
+            } finally {
+                closeDevice(id);
+            }
+        }
+    }
+
     private void bufferFormatZoomTestByCamera(int format) throws Exception {
+        Set<String> activePhysicalIdsSeen = new HashSet<String>();
+        bufferFormatZoomTestByCamera(format, CameraTestUtils.getCandidateZoomRatios(mStaticInfo),
+                activePhysicalIdsSeen /*/activePhysicalIdSeen*/);
+    }
+
+    private void bufferFormatZoomTestByCamera(int format, List<Float> candidateZoomRatios,
+            Set<String> activePhysicalIdsSeen) throws Exception {
         Size[] availableSizes = mStaticInfo.getAvailableSizesForFormatChecked(format,
                 StaticMetadata.StreamDirection.Output);
         if (availableSizes.length == 0) {
             return;
         }
 
-        List<Float> candidateZoomRatios = CameraTestUtils.getCandidateZoomRatios(mStaticInfo);
         Set<String> physicalCameraIds = null;
         if (mStaticInfo.isLogicalMultiCamera()) {
             physicalCameraIds = mStaticInfo.getCharacteristics().getPhysicalCameraIds();
@@ -121,12 +189,14 @@
 
             ArrayList<OutputConfiguration> outputConfigs = new ArrayList<>();
             OutputConfiguration config = new OutputConfiguration(mReader.getSurface());
+            if (format == ImageFormat.YCBCR_P010) {
+                config.setDynamicRangeProfile(DynamicRangeProfiles.HLG10);
+            }
             outputConfigs.add(config);
 
             CaptureRequest.Builder requestBuilder = prepareCaptureRequestForConfigs(
                     outputConfigs, CameraDevice.TEMPLATE_PREVIEW);
 
-            Set<String> activePhysicalIdsSeen = new HashSet<String>();
             boolean checkActivePhysicalIdConsistency =
                     PropertyUtil.getFirstApiLevel() >= Build.VERSION_CODES.S;
             for (Float zoomRatio : candidateZoomRatios) {
@@ -177,6 +247,7 @@
                 mCollector.expectTrue("Logical camera's activePhysicalCamera should not " +
                         " change at different zoom levels.", activePhysicalIdsSeen.size() == 1);
             }
+
         } finally {
             closeDefaultImageReader();
         }
diff --git a/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2MultiViewTestCase.java b/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2MultiViewTestCase.java
index 5576780..b738684 100644
--- a/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2MultiViewTestCase.java
+++ b/tests/camera/src/android/hardware/camera2/cts/testcases/Camera2MultiViewTestCase.java
@@ -16,10 +16,25 @@
 
 package android.hardware.camera2.cts.testcases;
 
-import static android.hardware.camera2.cts.CameraTestUtils.*;
+import static android.hardware.camera2.cts.CameraTestUtils.CAMERA_CLOSE_TIMEOUT_MS;
+import static android.hardware.camera2.cts.CameraTestUtils.PREVIEW_SIZE_BOUND;
+import static android.hardware.camera2.cts.CameraTestUtils.SESSION_CLOSE_TIMEOUT_MS;
+import static android.hardware.camera2.cts.CameraTestUtils.SESSION_CONFIGURE_TIMEOUT_MS;
+import static android.hardware.camera2.cts.CameraTestUtils.SESSION_READY_TIMEOUT_MS;
+import static android.hardware.camera2.cts.CameraTestUtils.assertFalse;
+import static android.hardware.camera2.cts.CameraTestUtils.assertNotNull;
+import static android.hardware.camera2.cts.CameraTestUtils.assertNull;
+import static android.hardware.camera2.cts.CameraTestUtils.assertTrue;
+import static android.hardware.camera2.cts.CameraTestUtils.checkSessionConfigurationSupported;
+import static android.hardware.camera2.cts.CameraTestUtils.configureCameraSession;
+import static android.hardware.camera2.cts.CameraTestUtils.configureCameraSessionWithConfig;
+import static android.hardware.camera2.cts.CameraTestUtils.getPreviewSizeBound;
+import static android.hardware.camera2.cts.CameraTestUtils.getSupportedPreviewSizes;
+import static android.hardware.camera2.cts.CameraTestUtils.isSessionConfigSupported;
 
-import static com.android.ex.camera2.blocking.BlockingSessionCallback.*;
-import static com.android.ex.camera2.blocking.BlockingStateCallback.*;
+import static com.android.ex.camera2.blocking.BlockingSessionCallback.SESSION_CLOSED;
+import static com.android.ex.camera2.blocking.BlockingSessionCallback.SESSION_READY;
+import static com.android.ex.camera2.blocking.BlockingStateCallback.STATE_CLOSED;
 
 import android.app.Activity;
 import android.content.Context;
@@ -28,13 +43,11 @@
 import android.graphics.RectF;
 import android.graphics.SurfaceTexture;
 import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.cts.Camera2ParameterizedTestCase;
-import android.hardware.camera2.cts.CameraTestUtils;
 import android.hardware.camera2.CameraCaptureSession.CaptureCallback;
 import android.hardware.camera2.CameraDevice;
-import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.cts.Camera2MultiViewCtsActivity;
+import android.hardware.camera2.cts.Camera2ParameterizedTestCase;
 import android.hardware.camera2.cts.helpers.StaticMetadata;
 import android.hardware.camera2.cts.helpers.StaticMetadata.CheckLevel;
 import android.hardware.camera2.params.OutputConfiguration;
@@ -43,7 +56,6 @@
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
-import android.os.SystemClock;
 import android.util.Log;
 import android.util.Size;
 import android.view.Surface;
@@ -58,9 +70,6 @@
 
 import junit.framework.Assert;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 
 import java.util.Arrays;
@@ -141,7 +150,8 @@
     protected void updatePreviewDisplayRotation(Size previewSize, TextureView textureView) {
         int rotationDegrees = 0;
         Camera2MultiViewCtsActivity activity = (Camera2MultiViewCtsActivity) mActivity;
-        int displayRotation = activity.getWindowManager().getDefaultDisplay().getRotation();
+
+        int displayRotation = activity.getDisplay().getRotation();
         Configuration config = activity.getResources().getConfiguration();
 
         // Get UI display rotation
@@ -330,6 +340,7 @@
 
     public static class CameraPreviewListener implements TextureView.SurfaceTextureListener {
         private boolean mFirstPreviewAvailable = false;
+        private float[] mTransformMatrix = new float[16];
         private final ConditionVariable mPreviewDone = new ConditionVariable();
 
         @Override
@@ -361,6 +372,10 @@
                 mFirstPreviewAvailable = true;
                 mPreviewDone.open();
             }
+
+            synchronized(this) {
+                surface.getTransformMatrix(mTransformMatrix);
+            }
         }
 
         /** Waits until the camera preview is up running */
@@ -374,6 +389,10 @@
             return true;
         }
 
+        public synchronized float[] getPreviewTransform() {
+            return mTransformMatrix;
+        }
+
         /** Reset the Listener */
         public void reset() {
             mFirstPreviewAvailable = false;
diff --git a/tests/camera/src/android/hardware/cts/CameraCtsActivity.java b/tests/camera/src/android/hardware/cts/CameraCtsActivity.java
index 61e283d..a6ec8ff 100644
--- a/tests/camera/src/android/hardware/cts/CameraCtsActivity.java
+++ b/tests/camera/src/android/hardware/cts/CameraCtsActivity.java
@@ -17,11 +17,12 @@
 package android.hardware.cts;
 
 import android.app.Activity;
+import android.camera.cts.R;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.ViewGroup;
-import android.camera.cts.R;
 
 public class CameraCtsActivity extends Activity {
     private SurfaceView mSurfaceView;
@@ -45,4 +46,9 @@
     public SurfaceView getSurfaceView() {
         return mSurfaceView;
     }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+    }
 }
diff --git a/tests/camera/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java b/tests/camera/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java
index 316afd7..6857072 100644
--- a/tests/camera/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java
+++ b/tests/camera/src/android/hardware/multiprocess/camera/cts/CameraEvictionTest.java
@@ -16,11 +16,18 @@
 
 package android.hardware.multiprocess.camera.cts;
 
+import static android.content.Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+import static org.mockito.Mockito.*;
+
 import android.app.Activity;
 import android.app.ActivityManager;
+import android.app.ActivityTaskManager;
 import android.app.UiAutomation;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.Rect;
 import android.hardware.Camera;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraDevice;
@@ -28,12 +35,15 @@
 import android.hardware.camera2.cts.CameraTestUtils.HandlerExecutor;
 import android.hardware.cts.CameraCtsActivity;
 import android.os.Handler;
+import android.os.SystemClock;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Log;
-
-import android.Manifest;
+import android.view.InputDevice;
+import android.view.MotionEvent;
+import android.view.WindowMetrics;
 
 import androidx.test.InstrumentationRegistry;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -41,8 +51,6 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeoutException;
 
-import static org.mockito.Mockito.*;
-
 /**
  * Tests for multi-process camera usage behavior.
  */
@@ -337,6 +345,85 @@
             }
         }
     }
+
+    private void injectTapEvent(int x, int y) {
+        final int motionEventTimeDeltaMs = 100;
+        MotionEvent downEvent = MotionEvent.obtain(SystemClock.uptimeMillis(),
+                SystemClock.uptimeMillis() + motionEventTimeDeltaMs,
+                (int) MotionEvent.ACTION_DOWN, x, y, 0);
+        downEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN);
+        mUiAutomation.injectInputEvent(downEvent, true);
+
+        MotionEvent upEvent = MotionEvent.obtain(SystemClock.uptimeMillis(),
+                SystemClock.uptimeMillis() + motionEventTimeDeltaMs, (int) MotionEvent.ACTION_UP,
+                x, y, 0);
+        upEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN);
+        mUiAutomation.injectInputEvent(upEvent, true);
+    }
+
+    /**
+     * Test camera availability access callback in split window mode.
+     */
+    public void testCamera2AccessCallbackInSplitMode() throws Throwable {
+        if (!ActivityTaskManager.supportsSplitScreenMultiWindow(getActivity())) {
+            return;
+        }
+
+        final int permissionCallbackTimeoutMs = 3000;
+        CameraManager manager = mContext.getSystemService(CameraManager.class);
+        assertNotNull(manager);
+        String[] cameraIds = manager.getCameraIdListNoLazy();
+
+        if (cameraIds.length == 0) {
+            Log.i(TAG, "Skipping testCamera2AccessCallback, device has no cameras.");
+            return;
+        }
+
+        assertTrue(mContext.getMainLooper() != null);
+
+        // Setup camera manager
+        Handler cameraHandler = new Handler(mContext.getMainLooper());
+
+        WindowMetrics metrics = getActivity().getWindowManager().getCurrentWindowMetrics();
+        Rect initialBounds = metrics.getBounds();
+
+        startRemoteProcess(Camera2Activity.class, "camera2ActivityProcess",
+                true /*splitScreen*/);
+
+        // Verify that the remote camera did open as expected
+        List<ErrorLoggingService.LogEvent> allEvents = mErrorServiceConnection.getLog(SETUP_TIMEOUT,
+                TestConstants.EVENT_CAMERA_CONNECT);
+        assertNotNull("Camera device not setup in remote process!", allEvents);
+
+        CameraManager.AvailabilityCallback mockAvailCb = mock(
+                CameraManager.AvailabilityCallback.class);
+        manager.registerAvailabilityCallback(mockAvailCb, cameraHandler);
+        metrics = getActivity().getWindowManager().getCurrentWindowMetrics();
+        Rect splitBounds = metrics.getBounds();
+
+        // The original of the initial and split activity bounds should remain the same
+        assertTrue((initialBounds.left == splitBounds.left)
+                && (initialBounds.top == splitBounds.top));
+
+        Rect secondBounds;
+        if (initialBounds.right > splitBounds.right) {
+            secondBounds = new Rect(splitBounds.right + 1, initialBounds.top, initialBounds.right,
+                    initialBounds.bottom);
+        } else {
+            secondBounds = new Rect(initialBounds.left, splitBounds.bottom + 1, initialBounds.right,
+                    initialBounds.bottom);
+        }
+
+        // Priorities are also expected to change when a second activity only gains or loses focus
+        // while running in split screen mode
+        injectTapEvent(splitBounds.centerX(), splitBounds.centerY());
+        injectTapEvent(secondBounds.centerX(), secondBounds.centerY());
+        injectTapEvent(splitBounds.centerX(), splitBounds.centerY());
+
+        verify(mockAvailCb, timeout(
+                permissionCallbackTimeoutMs).atLeastOnce()).onCameraAccessPrioritiesChanged();
+    }
+
     /**
      * Test camera availability access callback.
      */
@@ -361,7 +448,7 @@
         manager.registerAvailabilityCallback(mockAvailCb, cameraHandler);
 
         // Remove current task from top of stack. This will impact the camera access
-        // pririorties.
+        // priorities.
         getActivity().moveTaskToBack(/*nonRoot*/true);
 
         verify(mockAvailCb, timeout(
@@ -580,6 +667,19 @@
      */
     public void startRemoteProcess(java.lang.Class<?> klass, String processName)
             throws InterruptedException {
+        startRemoteProcess(klass, processName, false /*splitScreen*/);
+    }
+
+    /**
+     * Start an activity of the given class running in a remote process with the given name.
+     *
+     * @param klass the class of the {@link android.app.Activity} to start.
+     * @param processName the remote activity name.
+     * @param splitScreen Start new activity in split screen mode.
+     * @throws InterruptedException
+     */
+    public void startRemoteProcess(java.lang.Class<?> klass, String processName,
+            boolean splitScreen) throws InterruptedException {
         // Ensure no running activity process with same name
         Activity a = getActivity();
         String cameraActivityName = a.getPackageName() + ":" + processName;
@@ -589,6 +689,9 @@
 
         // Start activity in a new top foreground process
         Intent activityIntent = new Intent(a, klass);
+        if (splitScreen) {
+            activityIntent.setFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_LAUNCH_ADJACENT);
+        }
         a.startActivity(activityIntent);
         Thread.sleep(WAIT_TIME);
 
diff --git a/tests/camera/utils/src/android/hardware/camera2/cts/CameraTestUtils.java b/tests/camera/utils/src/android/hardware/camera2/cts/CameraTestUtils.java
index b466feb..d65b7f6 100644
--- a/tests/camera/utils/src/android/hardware/camera2/cts/CameraTestUtils.java
+++ b/tests/camera/utils/src/android/hardware/camera2/cts/CameraTestUtils.java
@@ -16,7 +16,6 @@
 
 package android.hardware.camera2.cts;
 
-import androidx.annotation.NonNull;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.ImageFormat;
@@ -25,45 +24,47 @@
 import android.graphics.SurfaceTexture;
 import android.hardware.camera2.CameraAccessException;
 import android.hardware.camera2.CameraCaptureSession;
+import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CameraConstrainedHighSpeedCaptureSession;
 import android.hardware.camera2.CameraDevice;
 import android.hardware.camera2.CameraManager;
 import android.hardware.camera2.CameraMetadata;
-import android.hardware.camera2.CameraCharacteristics;
 import android.hardware.camera2.CaptureFailure;
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
 import android.hardware.camera2.MultiResolutionImageReader;
+import android.hardware.camera2.TotalCaptureResult;
 import android.hardware.camera2.cts.helpers.CameraErrorCollector;
 import android.hardware.camera2.cts.helpers.StaticMetadata;
+import android.hardware.camera2.params.DynamicRangeProfiles;
 import android.hardware.camera2.params.InputConfiguration;
-import android.hardware.camera2.TotalCaptureResult;
-import android.hardware.cts.helpers.CameraUtils;
-import android.hardware.camera2.params.MeteringRectangle;
-import android.hardware.camera2.params.MandatoryStreamCombination;
 import android.hardware.camera2.params.MandatoryStreamCombination.MandatoryStreamInformation;
+import android.hardware.camera2.params.MeteringRectangle;
 import android.hardware.camera2.params.MultiResolutionStreamConfigurationMap;
 import android.hardware.camera2.params.MultiResolutionStreamInfo;
 import android.hardware.camera2.params.OutputConfiguration;
 import android.hardware.camera2.params.SessionConfiguration;
 import android.hardware.camera2.params.StreamConfigurationMap;
+import android.hardware.cts.helpers.CameraUtils;
 import android.location.Location;
 import android.location.LocationManager;
 import android.media.ExifInterface;
 import android.media.Image;
+import android.media.Image.Plane;
 import android.media.ImageReader;
 import android.media.ImageWriter;
-import android.media.Image.Plane;
 import android.os.Build;
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.util.Log;
 import android.util.Pair;
-import android.util.Size;
 import android.util.Range;
-import android.view.Display;
+import android.util.Size;
 import android.view.Surface;
 import android.view.WindowManager;
+import android.view.WindowMetrics;
+
+import androidx.annotation.NonNull;
 
 import com.android.ex.camera2.blocking.BlockingCameraManager;
 import com.android.ex.camera2.blocking.BlockingCameraManager.BlockingOpenException;
@@ -79,6 +80,8 @@
 import java.io.IOException;
 import java.lang.reflect.Array;
 import java.nio.ByteBuffer;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -87,15 +90,15 @@
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Random;
 import java.util.Set;
-import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.Executor;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * A package private utility class for wrapping up the camera2 cts test common utility functions
@@ -139,6 +142,8 @@
 
     public static final String OFFLINE_CAMERA_ID = "offline_camera_id";
     public static final String REPORT_LOG_NAME = "CtsCameraTestCases";
+    public static final String MPC_REPORT_LOG_NAME = "MediaPerformanceClassLogs";
+    public static final String MPC_STREAM_NAME = "CameraCts";
 
     private static final int EXIF_DATETIME_LENGTH = 19;
     private static final int EXIF_DATETIME_ERROR_MARGIN_SEC = 60;
@@ -236,6 +241,8 @@
         public List<ImageReader> mRawTargets = new ArrayList<>();
         public List<ImageReader> mHeicTargets = new ArrayList<>();
         public List<ImageReader> mDepth16Targets = new ArrayList<>();
+        public List<ImageReader> mP010Targets = new ArrayList<>();
+
 
         public List<MultiResolutionImageReader> mPrivMultiResTargets = new ArrayList<>();
         public List<MultiResolutionImageReader> mJpegMultiResTargets = new ArrayList<>();
@@ -264,6 +271,9 @@
             for (ImageReader target : mDepth16Targets) {
                 target.close();
             }
+            for (ImageReader target : mP010Targets) {
+                target.close();
+            }
 
             for (MultiResolutionImageReader target : mPrivMultiResTargets) {
                 target.close();
@@ -284,7 +294,8 @@
             List<OutputConfiguration> outputConfigs, List<Surface> outputSurfaces,
             int format, Size targetSize, int numBuffers, String overridePhysicalCameraId,
             MultiResolutionStreamConfigurationMap multiResStreamConfig,
-            boolean createMultiResiStreamConfig, ImageDropperListener listener, Handler handler) {
+            boolean createMultiResiStreamConfig, ImageDropperListener listener, Handler handler,
+            long dynamicRangeProfile, long streamUseCase) {
         if (createMultiResiStreamConfig) {
             Collection<MultiResolutionStreamInfo> multiResolutionStreams =
                     multiResStreamConfig.getOutputInfo(format);
@@ -319,6 +330,8 @@
                 if (overridePhysicalCameraId != null) {
                     config.setPhysicalCameraId(overridePhysicalCameraId);
                 }
+                config.setDynamicRangeProfile(dynamicRangeProfile);
+                config.setStreamUseCase(streamUseCase);
                 outputConfigs.add(config);
                 outputSurfaces.add(config.getSurface());
                 targets.mPrivTargets.add(target);
@@ -330,6 +343,8 @@
                 if (overridePhysicalCameraId != null) {
                     config.setPhysicalCameraId(overridePhysicalCameraId);
                 }
+                config.setDynamicRangeProfile(dynamicRangeProfile);
+                config.setStreamUseCase(streamUseCase);
                 outputConfigs.add(config);
                 outputSurfaces.add(config.getSurface());
 
@@ -352,6 +367,9 @@
                     case ImageFormat.DEPTH16:
                       targets.mDepth16Targets.add(target);
                       break;
+                    case ImageFormat.YCBCR_P010:
+                      targets.mP010Targets.add(target);
+                      break;
                     default:
                       fail("Unknown/Unsupported output format " + format);
                 }
@@ -377,7 +395,29 @@
             List<Surface> outputSurfaces, List<Surface> uhSurfaces, int numBuffers,
             boolean substituteY8, boolean substituteHeic, String overridePhysicalCameraId,
             MultiResolutionStreamConfigurationMap multiResStreamConfig, Handler handler) {
+        setupConfigurationTargets(streamsInfo, targets, outputConfigs, outputSurfaces, uhSurfaces,
+                numBuffers, substituteY8, substituteHeic, overridePhysicalCameraId,
+                multiResStreamConfig, handler, /*dynamicRangeProfiles*/ null);
+    }
 
+    public static void setupConfigurationTargets(List<MandatoryStreamInformation> streamsInfo,
+            StreamCombinationTargets targets,
+            List<OutputConfiguration> outputConfigs,
+            List<Surface> outputSurfaces, List<Surface> uhSurfaces, int numBuffers,
+            boolean substituteY8, boolean substituteHeic, String overridePhysicalCameraId,
+            MultiResolutionStreamConfigurationMap multiResStreamConfig, Handler handler,
+            List<Long> dynamicRangeProfiles) {
+
+        Random rnd = new Random();
+        // 10-bit output capable streams will use a fixed dynamic range profile in case
+        // dynamicRangeProfiles.size() == 1 or random in case dynamicRangeProfiles.size() > 1
+        boolean use10BitRandomProfile = (dynamicRangeProfiles != null) &&
+                (dynamicRangeProfiles.size() > 1);
+        if (use10BitRandomProfile) {
+            Long seed = rnd.nextLong();
+            Log.i(TAG, "Random seed used for selecting 10-bit output: " + seed);
+            rnd.setSeed(seed);
+        }
         ImageDropperListener imageDropperListener = new ImageDropperListener();
         List<Surface> chosenSurfaces;
         for (MandatoryStreamInformation streamInfo : streamsInfo) {
@@ -394,6 +434,19 @@
             } else if (substituteHeic && (format == ImageFormat.JPEG)) {
                 format = ImageFormat.HEIC;
             }
+
+            long dynamicRangeProfile = DynamicRangeProfiles.STANDARD;
+            if (streamInfo.is10BitCapable() && use10BitRandomProfile) {
+                boolean override10bit = rnd.nextBoolean();
+                if (!override10bit) {
+                    dynamicRangeProfile = dynamicRangeProfiles.get(rnd.nextInt(
+                            dynamicRangeProfiles.size()));
+                    format = streamInfo.get10BitFormat();
+                }
+            } else if (streamInfo.is10BitCapable() && (dynamicRangeProfiles != null)) {
+                dynamicRangeProfile = dynamicRangeProfiles.get(0);
+                format = streamInfo.get10BitFormat();
+            }
             Size[] availableSizes = new Size[streamInfo.getAvailableSizes().size()];
             availableSizes = streamInfo.getAvailableSizes().toArray(availableSizes);
             Size targetSize = CameraTestUtils.getMaxSize(availableSizes);
@@ -405,13 +458,15 @@
                 case ImageFormat.PRIVATE:
                 case ImageFormat.JPEG:
                 case ImageFormat.YUV_420_888:
+                case ImageFormat.YCBCR_P010:
                 case ImageFormat.Y8:
                 case ImageFormat.HEIC:
                 case ImageFormat.DEPTH16:
                 {
                     configureTarget(targets, outputConfigs, chosenSurfaces, format,
                             targetSize, numBuffers, overridePhysicalCameraId, multiResStreamConfig,
-                            createMultiResReader, imageDropperListener, handler);
+                            createMultiResReader, imageDropperListener, handler,
+                            dynamicRangeProfile, streamInfo.getStreamUseCase());
                     break;
                 }
                 case ImageFormat.RAW_SENSOR: {
@@ -421,7 +476,7 @@
                         configureTarget(targets, outputConfigs, chosenSurfaces, format,
                                 targetSize, numBuffers, overridePhysicalCameraId,
                                 multiResStreamConfig, createMultiResReader, imageDropperListener,
-                                handler);
+                                handler, dynamicRangeProfile, streamInfo.getStreamUseCase());
                     }
                     break;
                 }
@@ -1117,6 +1172,24 @@
             return !mAbortQueue.isEmpty();
         }
 
+        public List<Long> getCaptureStartTimestamps(int count) {
+            Iterator<Pair<CaptureRequest, Long>> iter = mCaptureStartQueue.iterator();
+            List<Long> timestamps = new ArrayList<Long>();
+            try {
+                while (timestamps.size() < count) {
+                    Pair<CaptureRequest, Long> captureStart = mCaptureStartQueue.poll(
+                            CAPTURE_RESULT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+                    assertNotNull("Wait for a capture start timed out in "
+                            + CAPTURE_RESULT_TIMEOUT_MS + "ms", captureStart);
+
+                    timestamps.add(captureStart.second);
+                }
+                return timestamps;
+            } catch (InterruptedException e) {
+                throw new UnsupportedOperationException("Unhandled interrupted exception", e);
+            }
+        }
+
         public void drain() {
             mQueue.clear();
             mNumFramesArrived.getAndSet(0);
@@ -3426,21 +3499,23 @@
     }
 
     public static Size getPreviewSizeBound(WindowManager windowManager, Size bound) {
-        Display display = windowManager.getDefaultDisplay();
+        WindowMetrics windowMetrics = windowManager.getCurrentWindowMetrics();
+        Rect windowBounds = windowMetrics.getBounds();
 
-        int width = display.getWidth();
-        int height = display.getHeight();
+        int windowHeight = windowBounds.height();
+        int windowWidth = windowBounds.width();
 
-        if (height > width) {
-            height = width;
-            width = display.getHeight();
+        if (windowHeight > windowWidth) {
+            windowHeight = windowWidth;
+            windowWidth = windowBounds.height();
         }
 
-        if (bound.getWidth() <= width &&
-            bound.getHeight() <= height)
+        if (bound.getWidth() <= windowWidth
+                && bound.getHeight() <= windowHeight) {
             return bound;
-        else
-            return new Size(width, height);
+        } else {
+            return new Size(windowWidth, windowHeight);
+        }
     }
 
     /**
@@ -3740,8 +3815,10 @@
         return zoomRatios;
     }
 
-    private static final int PERFORMANCE_CLASS_R = Build.VERSION_CODES.R;
-    private static final int PERFORMANCE_CLASS_S = Build.VERSION_CODES.R + 1;
+    public static final int PERFORMANCE_CLASS_NOT_MET = 0;
+    public static final int PERFORMANCE_CLASS_R = Build.VERSION_CODES.R;
+    public static final int PERFORMANCE_CLASS_S = Build.VERSION_CODES.R + 1;
+    public static final int PERFORMANCE_CLASS_CURRENT = PERFORMANCE_CLASS_S;
 
     /**
      * Check whether this mobile device is R performance class as defined in CDD
diff --git a/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
index 1930b33..4f12c5f 100644
--- a/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
+++ b/tests/camera/utils/src/android/hardware/camera2/cts/helpers/StaticMetadata.java
@@ -24,8 +24,10 @@
 import android.hardware.camera2.CaptureRequest;
 import android.hardware.camera2.CaptureResult;
 import android.hardware.camera2.cts.CameraTestUtils;
+import android.hardware.camera2.params.DynamicRangeProfiles;
 import android.hardware.camera2.params.StreamConfigurationMap;
 import android.hardware.camera2.params.Capability;
+import android.util.ArraySet;
 import android.util.Range;
 import android.util.Size;
 import android.util.Log;
@@ -77,7 +79,7 @@
 
     // Last defined capability enum, for iterating over all of them
     public static final int LAST_CAPABILITY_ENUM =
-            CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_REMOSAIC_REPROCESSING;
+            CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_STREAM_USE_CASE;
 
     // Access via getAeModeName() to account for vendor extensions
     public static final String[] AE_MODE_NAMES = new String[] {
@@ -792,6 +794,22 @@
     }
 
     /**
+     * Get and check the available dynamic range profiles.
+     *
+     * @return the available dynamic range profiles
+     */
+    public Set<Long> getAvailableDynamicRangeProfilesChecked() {
+        DynamicRangeProfiles profiles = mCharacteristics.get(
+                CameraCharacteristics.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES);
+
+        if (profiles == null) {
+            return new ArraySet<Long>();
+        }
+
+        return profiles.getSupportedProfiles();
+    }
+
+    /**
      * Get and check the available tone map modes.
      *
      * @return the available tone map modes
@@ -1828,7 +1846,7 @@
                 modeList.contains(CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_OFF));
         checkArrayValuesInRange(key, modes,
                 CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_OFF,
-                CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_ON);
+                CameraMetadata.CONTROL_VIDEO_STABILIZATION_MODE_PREVIEW_STABILIZATION);
 
         return modes;
     }
diff --git a/tests/cloudsearch/Android.bp b/tests/cloudsearch/Android.bp
new file mode 100644
index 0000000..99e7329
--- /dev/null
+++ b/tests/cloudsearch/Android.bp
@@ -0,0 +1,35 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsCloudSearchServiceTestCases",
+    defaults: ["cts_defaults"],
+    static_libs: [
+        "androidx.annotation_annotation",
+        "compatibility-device-util-axt",
+        "ctstestrunner-axt",
+        "truth-prebuilt",
+    ],
+    srcs: ["src/**/*.java"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    sdk_version: "test_current",
+}
diff --git a/tests/cloudsearch/AndroidManifest.xml b/tests/cloudsearch/AndroidManifest.xml
new file mode 100644
index 0000000..b5de2b7
--- /dev/null
+++ b/tests/cloudsearch/AndroidManifest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2022 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.cloudsearch.cts"
+          android:targetSandboxVersion="2">
+
+    <uses-permission android:name="android.permission.MANAGE_CLOUDSEARCH"/>
+
+    <application>
+        <service android:name=".Cts1CloudSearchService"
+            android:exported="true"
+            android:label="CtsDummy1CloudSearchService">
+            <intent-filter>
+                <!-- This constant must match CloudSearchService.SERVICE_INTERFACE -->
+                <action android:name="android.service.cloudsearch.CloudSearchService"/>
+            </intent-filter>
+        </service>
+        <service android:name=".Cts2CloudSearchService"
+            android:exported="true"
+            android:label="CtsDummy2CloudSearchService">
+            <intent-filter>
+                <!-- This constant must match CloudSearchService.SERVICE_INTERFACE -->
+                <action android:name="android.service.cloudsearch.CloudSearchService"/>
+            </intent-filter>
+        </service>
+        <service android:name=".Cts3CloudSearchService"
+            android:exported="true"
+            android:label="CtsDummy3CloudSearchService">
+            <intent-filter>
+                <!-- This constant must match CloudSearchService.SERVICE_INTERFACE -->
+                <action android:name="android.service.cloudsearch.CloudSearchService"/>
+            </intent-filter>
+        </service>
+
+        <uses-library android:name="android.test.runner"/>
+
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:label="CTS tests for the App CloudSearch System APIs."
+                     android:targetPackage="android.cloudsearch.cts">
+    </instrumentation>
+
+</manifest>
diff --git a/tests/cloudsearch/AndroidTest.xml b/tests/cloudsearch/AndroidTest.xml
new file mode 100644
index 0000000..1ede8e7
--- /dev/null
+++ b/tests/cloudsearch/AndroidTest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<configuration description="Config for CloudSearch CTS tests.">
+    <option name="test-suite-tag" value="cts"/>
+    <option name="config-descriptor:metadata" key="component" value="framework"/>
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app"/>
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi"/>
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user"/>
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true"/>
+        <option name="test-file-name" value="CtsCloudSearchServiceTestCases.apk"/>
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest">
+        <option name="package" value="android.cloudsearch.cts"/>
+        <!-- 20x default timeout of 600sec -->
+        <option name="shell-timeout" value="12000000"/>
+    </test>
+
+</configuration>
diff --git a/tests/cloudsearch/OWNERS b/tests/cloudsearch/OWNERS
new file mode 100644
index 0000000..27493ba
--- /dev/null
+++ b/tests/cloudsearch/OWNERS
@@ -0,0 +1,3 @@
+# Bug component: 758286
+huiwu@google.com
+srazdan@google.com
diff --git a/tests/cloudsearch/TEST_MAPPING b/tests/cloudsearch/TEST_MAPPING
new file mode 100644
index 0000000..8706339
--- /dev/null
+++ b/tests/cloudsearch/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsCloudSearchServiceTestCases"
+    }
+  ]
+}
diff --git a/tests/cloudsearch/src/android/cloudsearch/cts/CloudSearchManagerTest.java b/tests/cloudsearch/src/android/cloudsearch/cts/CloudSearchManagerTest.java
new file mode 100644
index 0000000..ddd2774
--- /dev/null
+++ b/tests/cloudsearch/src/android/cloudsearch/cts/CloudSearchManagerTest.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2022 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 android.cloudsearch.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.assertNotNull;
+
+import android.app.cloudsearch.CloudSearchManager;
+import android.app.cloudsearch.SearchRequest;
+import android.app.cloudsearch.SearchResponse;
+import android.content.Context;
+import android.os.Process;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.RequiredServiceRule;
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests for {@link CloudSearchManager}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class CloudSearchManagerTest implements CloudSearchManager.CallBack {
+
+    private static final String TAG = "CloudSearchManagerTest";
+    private static final boolean DEBUG = true;
+
+    private static final long SERVICE_LIFECYCLE_TIMEOUT_MS = 40_000;
+
+    @Rule
+    public final RequiredServiceRule mRequiredServiceRule =
+            new RequiredServiceRule(Context.CLOUDSEARCH_SERVICE);
+
+    private CloudSearchManager mManager;
+    private Cts1CloudSearchService.Watcher mWatcher1;
+    private Cts2CloudSearchService.Watcher mWatcher2;
+    private Cts3CloudSearchService.Watcher mWatcher3;
+
+    @Before
+    public void setUp() throws Exception {
+        mWatcher1 = Cts1CloudSearchService.setWatcher();
+        mWatcher2 = Cts2CloudSearchService.setWatcher();
+        mWatcher3 = Cts3CloudSearchService.setWatcher();
+
+        mManager = getContext().getSystemService(CloudSearchManager.class);
+        setService(Cts1CloudSearchService.SERVICE_NAME + ";"
+                + Cts2CloudSearchService.SERVICE_NAME + ";"
+                + Cts3CloudSearchService.SERVICE_NAME);
+
+        mManager.search(CloudSearchTestUtils.getBasicSearchRequest("", ""),
+                Executors.newSingleThreadExecutor(), this);
+        await(mWatcher1.created, "Waiting for search()");
+        await(mWatcher2.created, "Waiting for search()");
+        await(mWatcher3.created, "Waiting for search()");
+
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        Log.d(TAG, "Starting tear down, watcher is: ");
+        setService(null);
+        mWatcher1 = null;
+        mWatcher2 = null;
+        mWatcher3 = null;
+        Cts1CloudSearchService.clearWatcher();
+        Cts2CloudSearchService.clearWatcher();
+        Cts3CloudSearchService.clearWatcher();
+    }
+
+    @Test
+    public void testCloudSearchServiceConnection() {
+        assertNotNull(mManager);
+        await(mWatcher1.queried, "Waiting for search()");
+        await(mWatcher2.queried, "Waiting for search()");
+        await(mWatcher3.queried, "Waiting for search()");
+    }
+
+    @Test
+    public void testSuccessfulSearch() {
+        assertNotNull(mManager);
+        mManager.search(
+                CloudSearchTestUtils.getBasicSearchRequest("Successful1 Successful2 Successful3",
+                        ""),
+                Executors.newSingleThreadExecutor(), this);
+        await(mWatcher1.succeeded, "Waiting for successful search");
+        await(mWatcher2.succeeded, "Waiting for successful search");
+        await(mWatcher3.succeeded, "Waiting for successful search");
+    }
+
+    @Test
+    public void testUnsuccessfulSearch() {
+        assertNotNull(mManager);
+        mManager.search(CloudSearchTestUtils.getBasicSearchRequest(
+                "Unsuccessful1 Unsuccessful2 Unsuccessful3", ""),
+                Executors.newSingleThreadExecutor(), this);
+        await(mWatcher1.failed, "Waiting for unsuccessful search");
+        await(mWatcher2.failed, "Waiting for unsuccessful search");
+        await(mWatcher3.failed, "Waiting for unsuccessful search");
+    }
+
+    @Test
+    public void testSingleServiceSearch() {
+        setService(Cts1CloudSearchService.SERVICE_NAME);
+        assertNotNull(mManager);
+        mManager.search(CloudSearchTestUtils.getBasicSearchRequest("Unsuccessful1", ""),
+                Executors.newSingleThreadExecutor(), this);
+        await(mWatcher1.failed, "Waiting for unsuccessful search");
+    }
+
+    @Test
+    public void testMultipleCallbacksSearch() {
+        assertNotNull(mManager);
+        mManager.search(CloudSearchTestUtils.getBasicSearchRequest(
+                "Successful1 Successful2 Successful3 Unsuccessful1 Unsuccessful2 Unsuccessful3",
+                ""),
+                Executors.newSingleThreadExecutor(), this);
+        // TODO(216520546) add a condition to send a SearchRequest without
+        //  CtsCloudSearchServiceas a provider.
+
+        await(mWatcher1.succeeded, "Waiting for successful search");
+        await(mWatcher2.succeeded, "Waiting for successful search");
+        await(mWatcher3.succeeded, "Waiting for successful search");
+        await(mWatcher1.failed, "Waiting for unsuccessful search");
+        await(mWatcher2.failed, "Waiting for unsuccessful search");
+        await(mWatcher3.failed, "Waiting for unsuccessful search");
+    }
+
+    private void setService(String service) {
+        Log.d(TAG, "Setting cloudsearch service to " + service);
+        int userId = Process.myUserHandle().getIdentifier();
+        if (service != null) {
+            runShellCommand("cmd cloudsearch set temporary-service "
+                    + userId + " " + service + " 60000");
+        } else {
+            runShellCommand("cmd cloudsearch set temporary-service " + userId);
+        }
+    }
+
+    private void await(@NonNull CountDownLatch latch, @NonNull String message) {
+        try {
+            assertWithMessage(message).that(
+                    latch.await(SERVICE_LIFECYCLE_TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IllegalStateException("Interrupted while: " + message);
+        }
+    }
+
+    private void runShellCommand(String command) {
+        Log.d(TAG, "runShellCommand(): " + command);
+        try {
+            SystemUtil.runShellCommand(InstrumentationRegistry.getInstrumentation(), command);
+        } catch (Exception e) {
+            throw new RuntimeException("Command '" + command + "' failed: ", e);
+        }
+    }
+
+    @Override
+    public void onSearchSucceeded(SearchRequest request, SearchResponse response) {
+        Log.e(TAG, "onSearchSucceeded: " + request.getQuery() + ";" + response.getSource());
+        if (response.getSource().contains("1")) {
+            mWatcher1.succeeded.countDown();
+        }
+        if (response.getSource().contains("2")) {
+            mWatcher2.succeeded.countDown();
+        }
+        if (response.getSource().contains("3")) {
+            mWatcher3.succeeded.countDown();
+        }
+    }
+
+    @Override
+    public void onSearchFailed(SearchRequest request, SearchResponse response) {
+        Log.e(TAG, "onSearchFailed: " + request.getQuery() + ";" + response.getSource());
+        if (response.getSource().contains("1")) {
+            mWatcher1.failed.countDown();
+        }
+        if (response.getSource().contains("2")) {
+            mWatcher2.failed.countDown();
+        }
+        if (response.getSource().contains("3")) {
+            mWatcher3.failed.countDown();
+        }
+    }
+}
diff --git a/tests/cloudsearch/src/android/cloudsearch/cts/CloudSearchTestUtils.java b/tests/cloudsearch/src/android/cloudsearch/cts/CloudSearchTestUtils.java
new file mode 100644
index 0000000..6c22df7
--- /dev/null
+++ b/tests/cloudsearch/src/android/cloudsearch/cts/CloudSearchTestUtils.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2022 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 android.cloudsearch.cts;
+
+import android.app.cloudsearch.SearchRequest;
+import android.app.cloudsearch.SearchResponse;
+import android.os.Bundle;
+
+public class CloudSearchTestUtils {
+    public static SearchRequest getBasicSearchRequest(String query, String constraint) {
+        final int rn = 20;
+        final int offset = 0;
+        Bundle constraints = new Bundle();
+        constraints.putBoolean(SearchRequest.CONSTRAINT_IS_PRESUBMIT_SUGGESTION,
+                true);
+        constraints.putString(SearchRequest.CONSTRAINT_SEARCH_PROVIDER_FILTER, constraint);
+
+        return new SearchRequest.Builder(query).setResultNumber(rn)
+                .setResultOffset(offset).setSearchConstraints(constraints).build();
+    }
+
+    public static SearchResponse getSearchResponse(int searchStatusCode) {
+        return new SearchResponse.Builder(searchStatusCode).build();
+    }
+}
diff --git a/tests/cloudsearch/src/android/cloudsearch/cts/Cts1CloudSearchService.java b/tests/cloudsearch/src/android/cloudsearch/cts/Cts1CloudSearchService.java
new file mode 100644
index 0000000..7726832
--- /dev/null
+++ b/tests/cloudsearch/src/android/cloudsearch/cts/Cts1CloudSearchService.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2022 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 android.cloudsearch.cts;
+
+import android.app.cloudsearch.SearchRequest;
+import android.app.cloudsearch.SearchResponse;
+import android.service.cloudsearch.CloudSearchService;
+import android.util.Log;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+public class Cts1CloudSearchService extends CloudSearchService {
+
+    private static final boolean DEBUG = true;
+    public static final String MY_PACKAGE = "android.cloudsearch.cts";
+    public static final String SERVICE_NAME = MY_PACKAGE + "/."
+            + Cts1CloudSearchService.class.getSimpleName();
+    private static final String TAG =
+            "CloudSearchManagerTest CS1[" + Cts1CloudSearchService.class.getSimpleName() + "]";
+
+    private static Watcher sWatcher;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        if (DEBUG) Log.e(TAG, "onCreate CS1");
+    }
+
+    @Override
+    public void onSearch(SearchRequest request) {
+        if (DEBUG) Log.e(TAG, "onSearch CS1:" + request);
+        // Counting down created in onSearch because a mock search request is issued in setup().
+        sWatcher.created.countDown();
+        sWatcher.queried.countDown();
+        if (request.getQuery().contains("Successful1")) {
+            sWatcher.succeeded.countDown();
+            super.returnResults(request.getRequestId(),
+                    CloudSearchTestUtils.getSearchResponse(SearchResponse.SEARCH_STATUS_OK));
+        }
+        if (request.getQuery().contains("Unsuccessful1")) {
+            sWatcher.failed.countDown();
+            super.returnResults(request.getRequestId(), CloudSearchTestUtils.getSearchResponse(
+                    SearchResponse.SEARCH_STATUS_NO_INTERNET));
+        }
+    }
+
+
+    public static Watcher setWatcher() {
+        if (DEBUG) {
+            Log.d(TAG, "----------------------------------------------");
+            Log.d(TAG, " setWatcher");
+        }
+        if (sWatcher != null) {
+            throw new IllegalStateException("Set watcher with watcher already set");
+        }
+        sWatcher = new Watcher();
+        return sWatcher;
+    }
+
+    public static void clearWatcher() {
+        if (DEBUG) Log.d(TAG, "clearWatcher");
+        sWatcher = null;
+    }
+
+    public static final class Watcher {
+        public CountDownLatch created = new CountDownLatch(1);
+        public CountDownLatch destroyed = new CountDownLatch(1);
+        public CountDownLatch queried = new CountDownLatch(1);
+        public CountDownLatch succeeded = new CountDownLatch(2);
+        public CountDownLatch failed = new CountDownLatch(2);
+
+        public List<SearchResponse> mSmartspaceTargets;
+
+        public void setTargets(List<SearchResponse> targets) {
+            mSmartspaceTargets = targets;
+        }
+    }
+}
diff --git a/tests/cloudsearch/src/android/cloudsearch/cts/Cts2CloudSearchService.java b/tests/cloudsearch/src/android/cloudsearch/cts/Cts2CloudSearchService.java
new file mode 100644
index 0000000..33cdec8
--- /dev/null
+++ b/tests/cloudsearch/src/android/cloudsearch/cts/Cts2CloudSearchService.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2022 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 android.cloudsearch.cts;
+
+import android.app.cloudsearch.SearchRequest;
+import android.app.cloudsearch.SearchResponse;
+import android.service.cloudsearch.CloudSearchService;
+import android.util.Log;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+public class Cts2CloudSearchService extends CloudSearchService {
+
+    private static final boolean DEBUG = true;
+    public static final String MY_PACKAGE = "android.cloudsearch.cts";
+    public static final String SERVICE_NAME = MY_PACKAGE + "/."
+            + Cts2CloudSearchService.class.getSimpleName();
+    private static final String TAG =
+            "CloudSearchManagerTest CS2[" + Cts2CloudSearchService.class.getSimpleName() + "]";
+
+    private static Watcher sWatcher;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        if (DEBUG) Log.e(TAG, "onCreate CS2");
+    }
+
+    @Override
+    public void onSearch(SearchRequest request) {
+        if (DEBUG) Log.e(TAG, "onSearch CS2:" + request);
+        // Counting down created in onSearch because a mock search request is issued in setup().
+        sWatcher.created.countDown();
+        sWatcher.queried.countDown();
+        if (request.getQuery().contains("Successful2")) {
+            sWatcher.succeeded.countDown();
+            super.returnResults(request.getRequestId(),
+                    CloudSearchTestUtils.getSearchResponse(SearchResponse.SEARCH_STATUS_OK));
+        }
+        if (request.getQuery().contains("Unsuccessful2")) {
+            sWatcher.failed.countDown();
+            super.returnResults(request.getRequestId(), CloudSearchTestUtils.getSearchResponse(
+                    SearchResponse.SEARCH_STATUS_NO_INTERNET));
+        }
+    }
+
+
+    public static Watcher setWatcher() {
+        if (DEBUG) {
+            Log.d(TAG, "----------------------------------------------");
+            Log.d(TAG, " setWatcher");
+        }
+        if (sWatcher != null) {
+            throw new IllegalStateException("Set watcher with watcher already set");
+        }
+        sWatcher = new Watcher();
+        return sWatcher;
+    }
+
+    public static void clearWatcher() {
+        if (DEBUG) Log.d(TAG, "clearWatcher");
+        sWatcher = null;
+    }
+
+    public static final class Watcher {
+        public CountDownLatch created = new CountDownLatch(1);
+        public CountDownLatch destroyed = new CountDownLatch(1);
+        public CountDownLatch queried = new CountDownLatch(1);
+        public CountDownLatch succeeded = new CountDownLatch(2);
+        public CountDownLatch failed = new CountDownLatch(2);
+
+        public List<SearchResponse> mSmartspaceTargets;
+
+        public void setTargets(List<SearchResponse> targets) {
+            mSmartspaceTargets = targets;
+        }
+    }
+}
diff --git a/tests/cloudsearch/src/android/cloudsearch/cts/Cts3CloudSearchService.java b/tests/cloudsearch/src/android/cloudsearch/cts/Cts3CloudSearchService.java
new file mode 100644
index 0000000..d264ea4
--- /dev/null
+++ b/tests/cloudsearch/src/android/cloudsearch/cts/Cts3CloudSearchService.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2022 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 android.cloudsearch.cts;
+
+import android.app.cloudsearch.SearchRequest;
+import android.app.cloudsearch.SearchResponse;
+import android.service.cloudsearch.CloudSearchService;
+import android.util.Log;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+
+public class Cts3CloudSearchService extends CloudSearchService {
+
+    private static final boolean DEBUG = true;
+    public static final String MY_PACKAGE = "android.cloudsearch.cts";
+    public static final String SERVICE_NAME = MY_PACKAGE + "/."
+            + Cts3CloudSearchService.class.getSimpleName();
+    private static final String TAG =
+            "CloudSearchManagerTest CS3[" + Cts3CloudSearchService.class.getSimpleName() + "]";
+
+    private static Watcher sWatcher;
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        if (DEBUG) Log.e(TAG, "onCreate CS3");
+    }
+
+    @Override
+    public void onSearch(SearchRequest request) {
+        if (DEBUG) Log.e(TAG, "onSearch CS3:" + request);
+        // Counting down created in onSearch because a mock search request is issued in setup().
+        sWatcher.created.countDown();
+        sWatcher.queried.countDown();
+        if (request.getQuery().contains("Successful3")) {
+            sWatcher.succeeded.countDown();
+            super.returnResults(request.getRequestId(),
+                    CloudSearchTestUtils.getSearchResponse(SearchResponse.SEARCH_STATUS_OK));
+        }
+        if (request.getQuery().contains("Unsuccessful3")) {
+            sWatcher.failed.countDown();
+            super.returnResults(request.getRequestId(), CloudSearchTestUtils.getSearchResponse(
+                    SearchResponse.SEARCH_STATUS_NO_INTERNET));
+        }
+
+    }
+
+
+    public static Watcher setWatcher() {
+        if (DEBUG) {
+            Log.d(TAG, "----------------------------------------------");
+            Log.d(TAG, " setWatcher");
+        }
+        if (sWatcher != null) {
+            throw new IllegalStateException("Set watcher with watcher already set");
+        }
+        sWatcher = new Watcher();
+        return sWatcher;
+    }
+
+    public static void clearWatcher() {
+        if (DEBUG) Log.d(TAG, "clearWatcher");
+        sWatcher = null;
+    }
+
+    public static final class Watcher {
+        public CountDownLatch created = new CountDownLatch(1);
+        public CountDownLatch destroyed = new CountDownLatch(1);
+        public CountDownLatch queried = new CountDownLatch(1);
+        public CountDownLatch succeeded = new CountDownLatch(2);
+        public CountDownLatch failed = new CountDownLatch(2);
+
+        public List<SearchResponse> mSmartspaceTargets;
+
+        public void setTargets(List<SearchResponse> targets) {
+            mSmartspaceTargets = targets;
+        }
+    }
+}
diff --git a/tests/cloudsearch/src/android/cloudsearch/cts/SearchRequestTest.java b/tests/cloudsearch/src/android/cloudsearch/cts/SearchRequestTest.java
new file mode 100644
index 0000000..5966d95
--- /dev/null
+++ b/tests/cloudsearch/src/android/cloudsearch/cts/SearchRequestTest.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2022 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 android.cloudsearch.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.cloudsearch.SearchRequest;
+import android.os.Bundle;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link SearchRequest}
+ *
+ * atest CtsCloudSearchServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class SearchRequestTest {
+
+    private static final String TAG = "CloudSearchTargetTest";
+
+    @Test
+    public void testCreateSearchRequest() {
+        final String query = "bo";
+        final int rn = 20;
+        final int offset = 0;
+        final float maxLatency = 100;
+        Bundle constraints = new Bundle();
+        constraints.putBoolean(SearchRequest.CONSTRAINT_IS_PRESUBMIT_SUGGESTION,
+                true);
+        final String pkgName = "android.cloudsearch.cts";
+
+        SearchRequest request = new SearchRequest.Builder("").setResultNumber(rn)
+                .setResultOffset(offset).setSearchConstraints(constraints).setQuery(query)
+                .setMaxLatencyMillis(maxLatency).setCallerPackageName(pkgName).build();
+
+        /** Check the original request. */
+        assertThat(request.getQuery()).isEqualTo(query);
+        assertThat(request.getResultNumber()).isEqualTo(rn);
+        assertThat(request.getMaxLatencyMillis()).isEqualTo(maxLatency);
+        assertThat(request.getResultOffset()).isEqualTo(offset);
+        final Bundle sc = request.getSearchConstraints();
+        assertThat(sc.getBoolean(SearchRequest.CONSTRAINT_IS_PRESUBMIT_SUGGESTION))
+                .isEqualTo(true);
+        assertThat(request.getCallerPackageName()).isEqualTo(pkgName);
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        request.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        SearchRequest copy = SearchRequest.CREATOR.createFromParcel(parcel);
+        /** Check the copied request. */
+        assertThat(copy.getQuery()).isEqualTo(query);
+        assertThat(copy.getResultNumber()).isEqualTo(rn);
+        assertThat(copy.getMaxLatencyMillis()).isEqualTo(maxLatency);
+        assertThat(copy.getResultOffset()).isEqualTo(offset);
+        final Bundle sccopy = request.getSearchConstraints();
+        assertThat(sccopy.getBoolean(SearchRequest.CONSTRAINT_IS_PRESUBMIT_SUGGESTION))
+                .isEqualTo(true);
+        assertThat(copy.getCallerPackageName()).isEqualTo(pkgName);
+
+        parcel.recycle();
+    }
+}
diff --git a/tests/cloudsearch/src/android/cloudsearch/cts/SearchResponseTest.java b/tests/cloudsearch/src/android/cloudsearch/cts/SearchResponseTest.java
new file mode 100644
index 0000000..5a0e291
--- /dev/null
+++ b/tests/cloudsearch/src/android/cloudsearch/cts/SearchResponseTest.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2022 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 android.cloudsearch.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.cloudsearch.SearchResponse;
+import android.app.cloudsearch.SearchResult;
+import android.os.Bundle;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tests for {@link SearchResponse}
+ *
+ * atest CtsCloudSearchServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class SearchResponseTest {
+
+    private static final String TAG = "CloudSearchTargetTest";
+
+    @Test
+    public void testCreateSearchResponse() {
+        final int status = SearchResponse.SEARCH_STATUS_OK;
+        final String source = "DEFAULT";
+        List<SearchResult> results = new ArrayList<SearchResult>();
+
+        final String titleA = "title a";
+        final String snippetA = "Good Snippet a";
+        final float scoreA = 10;
+        Bundle extraInfosA = new Bundle();
+        extraInfosA.putBoolean(SearchResult.EXTRAINFO_APP_CONTAINS_IAP_DISCLAIMER,
+                false);
+        extraInfosA.putString(SearchResult.EXTRAINFO_APP_DEVELOPER_NAME,
+                "best_app_developer a");
+        SearchResult resultA = new SearchResult.Builder(titleA, extraInfosA)
+                .setSnippet(snippetA).setScore(scoreA).build();
+        results.add(resultA);
+
+        final String titleB = "title B";
+        final String snippetB = "Good Snippet B";
+        final float scoreB = 20;
+        Bundle extraInfosB = new Bundle();
+        extraInfosB.putBoolean(SearchResult.EXTRAINFO_APP_CONTAINS_IAP_DISCLAIMER,
+                true);
+        extraInfosB.putString(SearchResult.EXTRAINFO_APP_DEVELOPER_NAME,
+                "best_app_developer B");
+        SearchResult resultB = new SearchResult.Builder(titleB, extraInfosB)
+                .setSnippet(snippetB).setScore(scoreB).build();
+        results.add(resultB);
+
+        SearchResponse response = new SearchResponse.Builder(SearchResponse.SEARCH_STATUS_UNKNOWN)
+                .setSearchResults(results).setStatusCode(status).build();
+
+        /** Checks the original response. */
+        assertThat(response.getStatusCode()).isEqualTo(status);
+        assertThat(response.getSource()).isEqualTo(source);
+        assertThat(response.getSearchResults().size()).isEqualTo(2);
+        final SearchResult firstResult = response.getSearchResults().get(0);
+        assertThat(firstResult.getTitle()).isEqualTo(titleA);
+        final SearchResult secondResult = response.getSearchResults().get(1);
+        assertThat(secondResult.getTitle()).isEqualTo(titleB);
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        response.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        SearchResponse copy = SearchResponse.CREATOR.createFromParcel(parcel);
+
+        /** Checks the copied response. */
+        assertThat(copy.getStatusCode()).isEqualTo(status);
+        assertThat(copy.getSource()).isEqualTo(source);
+        assertThat(copy.getSearchResults().size()).isEqualTo(2);
+        final SearchResult firstResultCopy = copy.getSearchResults().get(0);
+        assertThat(firstResultCopy.getTitle()).isEqualTo(titleA);
+        final SearchResult secondResultCopy = copy.getSearchResults().get(1);
+        assertThat(secondResultCopy.getTitle()).isEqualTo(titleB);
+
+        parcel.recycle();
+    }
+}
diff --git a/tests/cloudsearch/src/android/cloudsearch/cts/SearchResultTest.java b/tests/cloudsearch/src/android/cloudsearch/cts/SearchResultTest.java
new file mode 100644
index 0000000..9dd83f4
--- /dev/null
+++ b/tests/cloudsearch/src/android/cloudsearch/cts/SearchResultTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2022 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 android.cloudsearch.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.PendingIntent;
+import android.app.cloudsearch.SearchResult;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link SearchResult}
+ *
+ * atest CtsCloudSearchServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class SearchResultTest {
+
+    private static final String TAG = "CloudSearchTargetTest";
+
+    @Test
+    public void testCreateSearchResult() {
+        final String title = "title";
+        final String snippet = "Good Snippet";
+        final float score = 10;
+        Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse("http://www.android.com"));
+        PendingIntent pendingIntent = PendingIntent.getActivity(getContext(),
+                1, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+
+        Bundle extraInfos = new Bundle();
+        extraInfos.putBoolean(SearchResult.EXTRAINFO_APP_CONTAINS_IAP_DISCLAIMER,
+                false);
+        extraInfos.putString(SearchResult.EXTRAINFO_APP_DEVELOPER_NAME,
+                "best_app_developer");
+        extraInfos.putParcelable(SearchResult.EXTRAINFO_ACTION_INSTALL_BUTTON, pendingIntent);
+        extraInfos.putParcelable(SearchResult.EXTRAINFO_ACTION_APP_CARD, pendingIntent);
+        extraInfos.putString(SearchResult.EXTRAINFO_APP_PACKAGE_NAME,
+                "best_package_name");
+        extraInfos.putDouble(SearchResult.EXTRAINFO_APP_INSTALL_COUNT, 10);
+
+        SearchResult result = new SearchResult.Builder(title, extraInfos)
+                .setSnippet(snippet).setTitle(title).setExtraInfos(extraInfos)
+                .setScore(score).build();
+
+        /** Checks the original result. */
+        assertThat(result.getTitle()).isEqualTo(title);
+        assertThat(result.getSnippet()).isEqualTo(snippet);
+        assertThat(result.getScore()).isEqualTo(score);
+        final Bundle rExtraInfos = result.getExtraInfos();
+        assertThat(rExtraInfos
+                .getBoolean(SearchResult.EXTRAINFO_APP_CONTAINS_IAP_DISCLAIMER))
+                .isEqualTo(false);
+        assertThat(rExtraInfos
+                .getString(SearchResult.EXTRAINFO_APP_DEVELOPER_NAME))
+                .isEqualTo("best_app_developer");
+        assertThat((PendingIntent) rExtraInfos
+                .getParcelable(SearchResult.EXTRAINFO_ACTION_INSTALL_BUTTON))
+                .isEqualTo(pendingIntent);
+        assertThat((PendingIntent) rExtraInfos
+                .getParcelable(SearchResult.EXTRAINFO_ACTION_APP_CARD))
+                .isEqualTo(pendingIntent);
+        assertThat(rExtraInfos
+                .getString(SearchResult.EXTRAINFO_APP_PACKAGE_NAME))
+                .isEqualTo("best_package_name");
+        assertThat(rExtraInfos
+                .getDouble(SearchResult.EXTRAINFO_APP_INSTALL_COUNT))
+                .isEqualTo(10);
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        result.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        SearchResult copy = SearchResult.CREATOR.createFromParcel(parcel);
+        /** Checks the copied result. */
+        assertThat(copy.getTitle()).isEqualTo(title);
+        assertThat(copy.getSnippet()).isEqualTo(snippet);
+        assertThat(copy.getScore()).isEqualTo(score);
+        final Bundle rExtraInfosCopy = copy.getExtraInfos();
+        assertThat(rExtraInfosCopy
+                .getBoolean(SearchResult.EXTRAINFO_APP_CONTAINS_IAP_DISCLAIMER))
+                .isEqualTo(false);
+        assertThat(rExtraInfosCopy
+                .getString(SearchResult.EXTRAINFO_APP_DEVELOPER_NAME))
+                .isEqualTo("best_app_developer");
+        assertThat((PendingIntent) rExtraInfosCopy
+                .getParcelable(SearchResult.EXTRAINFO_ACTION_INSTALL_BUTTON))
+                .isEqualTo(pendingIntent);
+        assertThat((PendingIntent) rExtraInfosCopy
+                .getParcelable(SearchResult.EXTRAINFO_ACTION_APP_CARD))
+                .isEqualTo(pendingIntent);
+        assertThat(rExtraInfosCopy
+                .getString(SearchResult.EXTRAINFO_APP_PACKAGE_NAME))
+                .isEqualTo("best_package_name");
+        assertThat(rExtraInfosCopy
+                .getDouble(SearchResult.EXTRAINFO_APP_INSTALL_COUNT))
+                .isEqualTo(10);
+
+        parcel.recycle();
+    }
+}
diff --git a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/AbstractContentCaptureActivity.java b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/AbstractContentCaptureActivity.java
index 3cf1acc..9245361 100644
--- a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/AbstractContentCaptureActivity.java
+++ b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/AbstractContentCaptureActivity.java
@@ -157,7 +157,8 @@
      */
     public void dumpIt() {
         final String dump = runShellCommand(
-                "dumpsys activity %s --contentcapture",  getComponentName().flattenToString());
+                "dumpsys activity %s %s %s", getComponentName().flattenToString(),
+                Activity.DUMP_ARG_DUMP_DUMPABLE, ContentCaptureManager.DUMPABLE_NAME);
         Log.v(mTag, "dump it: " + dump);
     }
 }
diff --git a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/Assertions.java b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/Assertions.java
index 18d11a3..93e43c9 100644
--- a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/Assertions.java
+++ b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/Assertions.java
@@ -309,30 +309,22 @@
     /**
      * This method is used to remove unexpected events if the test should only
      * contain session level events.
-     * In special case, there are some events, such as {@link #TYPE_VIEW_INSETS_CHANGED},
-     * will be accidentally generated by the system. Because these events were
-     * not expected in the test, remove them if needed.
+     * In special case, there are some events, such as {@link #TYPE_WINDOW_BOUNDS_CHANGED}
+     * and {@link #TYPE_VIEW_INSETS_CHANGED}, will be accidentally generated by
+     * the system. Because these events were not expected in the test, remove
+     * them if needed.
      */
     public static List<ContentCaptureEvent> removeUnexpectedEvents(
             @NonNull List<ContentCaptureEvent> events) {
         return Collections.unmodifiableList(events).stream().filter(
-                e -> e.getType() < TYPE_VIEW_INSETS_CHANGED
+                e -> e.getType() != TYPE_WINDOW_BOUNDS_CHANGED
+                        && e.getType() != TYPE_VIEW_INSETS_CHANGED
                         && e.getType() != TYPE_VIEW_TREE_APPEARING
                         && e.getType() != TYPE_VIEW_TREE_APPEARED
         ).collect(Collectors.toList());
     }
 
     /**
-     * Used to remove the unknown event
-     */
-    public static List<ContentCaptureEvent> removeUnknownEvent(
-            @NonNull List<ContentCaptureEvent> events) {
-        return Collections.unmodifiableList(events).stream().filter(
-                e -> e.getType() <= TYPE_VIEW_INSETS_CHANGED
-        ).collect(Collectors.toList());
-    }
-
-    /**
      * Asserts that a session for the given activity has events at all.
      */
     public static void assertNoEvents(@NonNull Session session,
diff --git a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/ContentCaptureLoggingTestRule.java b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/ContentCaptureLoggingTestRule.java
index 513d960..109e401 100644
--- a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/ContentCaptureLoggingTestRule.java
+++ b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/ContentCaptureLoggingTestRule.java
@@ -21,7 +21,9 @@
 
 import static com.android.compatibility.common.util.ShellUtils.runShellCommand;
 
+import android.app.Activity;
 import android.util.Log;
+import android.view.contentcapture.ContentCaptureManager;
 
 import androidx.annotation.NonNull;
 
@@ -78,8 +80,9 @@
         Log.e(TAG, "Dumping after exception on " + testName, t);
         final String serviceDump = runShellCommand("dumpsys content_capture");
         Log.e(TAG, "content_capture dump: \n" + serviceDump);
-        final String activityDump = runShellCommand("dumpsys activity %s --contentcapture",
-                MY_PACKAGE);
+        final String activityDump = runShellCommand("dumpsys activity %s %s %s",
+                MY_PACKAGE, Activity.DUMP_ARG_DUMP_DUMPABLE, ContentCaptureManager.DUMPABLE_NAME);
+
         Log.e(TAG, "activity dump: \n" + activityDump);
         mDumped = true;
     }
diff --git a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/CtsContentCaptureService.java b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/CtsContentCaptureService.java
index 7e454cf..7685053 100644
--- a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/CtsContentCaptureService.java
+++ b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/CtsContentCaptureService.java
@@ -39,6 +39,7 @@
 import android.view.contentcapture.DataShareRequest;
 import android.view.contentcapture.ViewNode;
 
+import androidx.annotation.GuardedBy;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -72,6 +73,9 @@
 
     private static int sIdCounter;
 
+    private static Object sLock = new Object();
+
+    @GuardedBy("sLock")
     private static ServiceWatcher sServiceWatcher;
 
     private final int mId = ++sIdCounter;
@@ -158,11 +162,13 @@
 
     @NonNull
     public static ServiceWatcher setServiceWatcher() {
-        if (sServiceWatcher != null) {
-            throw new IllegalStateException("There Can Be Only One!");
+        synchronized (sLock) {
+            if (sServiceWatcher != null) {
+                throw new IllegalStateException("There Can Be Only One!");
+            }
+            sServiceWatcher = new ServiceWatcher();
+            return sServiceWatcher;
         }
-        sServiceWatcher = new ServiceWatcher();
-        return sServiceWatcher;
     }
 
     public static void resetStaticState() {
@@ -173,20 +179,29 @@
         // TODO(b/123540602): each test should use a different service instance, but we need
         // to provide onConnected() / onDisconnected() methods first and then change the infra so
         // we can wait for those
+        synchronized (sLock) {
+            if (sServiceWatcher != null) {
+                Log.wtf(TAG, "resetStaticState(): should not have sServiceWatcher");
+                sServiceWatcher = null;
+            }
+        }
+    }
 
-        if (sServiceWatcher != null) {
-            Log.wtf(TAG, "resetStaticState(): should not have sServiceWatcher");
-            sServiceWatcher = null;
+    private static ServiceWatcher getServiceWatcher() {
+        synchronized (sLock) {
+            return sServiceWatcher;
         }
     }
 
     public static void clearServiceWatcher() {
-        if (sServiceWatcher != null) {
-            if (sServiceWatcher.mReadyToClear) {
-                sServiceWatcher.mService = null;
-                sServiceWatcher = null;
-            } else {
-                sServiceWatcher.mReadyToClear = true;
+        synchronized (sLock) {
+            if (sServiceWatcher != null) {
+                if (sServiceWatcher.mReadyToClear) {
+                    sServiceWatcher.mService = null;
+                    sServiceWatcher = null;
+                } else {
+                    sServiceWatcher.mReadyToClear = true;
+                }
             }
         }
     }
@@ -204,21 +219,22 @@
 
     @Override
     public void onConnected() {
-        Log.i(TAG, "onConnected(id=" + mId + "): sServiceWatcher=" + sServiceWatcher);
+        final ServiceWatcher sw = getServiceWatcher();
+        Log.i(TAG, "onConnected(id=" + mId + "): sServiceWatcher=" + sw);
 
-        if (sServiceWatcher == null) {
+        if (sw == null) {
             addException("onConnected() without a watcher");
             return;
         }
 
-        if (!sServiceWatcher.mReadyToClear && sServiceWatcher.mService != null) {
-            addException("onConnected(): already created: %s", sServiceWatcher);
+        if (!sw.mReadyToClear && sw.mService != null) {
+            addException("onConnected(): already created: %s", sw);
             return;
         }
 
-        sServiceWatcher.mService = this;
-        sServiceWatcher.mCreated.countDown();
-        sServiceWatcher.mReadyToClear = false;
+        sw.mService = this;
+        sw.mCreated.countDown();
+        sw.mReadyToClear = false;
 
         if (mConnectedLatch.getCount() == 0) {
             addException("already connected: %s", mConnectedLatch);
@@ -228,19 +244,20 @@
 
     @Override
     public void onDisconnected() {
-        Log.i(TAG, "onDisconnected(id=" + mId + "): sServiceWatcher=" + sServiceWatcher);
+        final ServiceWatcher sw = getServiceWatcher();
+        Log.i(TAG, "onDisconnected(id=" + mId + "): sServiceWatcher=" + sw);
 
         if (mDisconnectedLatch.getCount() == 0) {
             addException("already disconnected: %s", mConnectedLatch);
         }
         mDisconnectedLatch.countDown();
 
-        if (sServiceWatcher == null) {
+        if (sw == null) {
             addException("onDisconnected() without a watcher");
             return;
         }
-        if (sServiceWatcher.mService == null) {
-            addException("onDisconnected(): no service on %s", sServiceWatcher);
+        if (sw.mService == null) {
+            addException("onDisconnected(): no service on %s", sw);
             return;
         }
         // Notify test case as well
@@ -249,7 +266,7 @@
             mOnDisconnectListener = null;
             latch.countDown();
         }
-        sServiceWatcher.mDestroyed.countDown();
+        sw.mDestroyed.countDown();
         clearServiceWatcher();
     }
 
@@ -449,7 +466,7 @@
     protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         super.dump(fd, pw, args);
 
-        pw.print("sServiceWatcher: "); pw.println(sServiceWatcher);
+        pw.print("sServiceWatcher: "); pw.println(getServiceWatcher());
         pw.print("sExceptions: "); pw.println(sExceptions);
         pw.print("sIdCounter: "); pw.println(sIdCounter);
         pw.print("mId: "); pw.println(mId);
diff --git a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/DataSharingService.java b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/DataSharingService.java
index d1f0c6a..3a1ada3 100644
--- a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/DataSharingService.java
+++ b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/DataSharingService.java
@@ -24,6 +24,7 @@
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
+import android.os.SystemClock;
 import android.view.contentcapture.ContentCaptureManager;
 import android.view.contentcapture.DataShareRequest;
 import android.view.contentcapture.DataShareWriteAdapter;
@@ -73,6 +74,8 @@
                     public void onWrite(ParcelFileDescriptor destination) {
                         if (mShouldAttemptConcurrentRequest) {
                             attemptConcurrentRequest();
+                            // Waiting for the request to arrive at the server
+                            SystemClock.sleep(500);
                         }
                         try (OutputStream outputStream =
                                      new ParcelFileDescriptor.AutoCloseOutputStream(destination)) {
diff --git a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/DataSharingServiceTest.java b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/DataSharingServiceTest.java
index 421a5bd..0e71cac 100644
--- a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/DataSharingServiceTest.java
+++ b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/DataSharingServiceTest.java
@@ -141,9 +141,9 @@
         CtsContentCaptureService ccService = enableService();
 
         ccService.setDataSharingEnabled(true);
-        sKillingStage = KillingStage.BEFORE_WRITE;
-        getApplicationContext().startService(
-                new Intent(getApplicationContext(), OutOfProcessDataSharingService.class));
+        Intent intent = new Intent(getApplicationContext(), OutOfProcessDataSharingService.class);
+        intent.putExtra("KillingStage", KillingStage.BEFORE_WRITE.name());
+        getApplicationContext().startService(intent);
 
         PollingCheck.waitFor(() -> ccService.mDataShareSessionErrorCode > 0);
 
@@ -156,13 +156,12 @@
         CtsContentCaptureService ccService = enableService();
 
         ccService.setDataSharingEnabled(true);
-        sKillingStage = KillingStage.DURING_WRITE;
-        getApplicationContext().startService(
-                new Intent(getApplicationContext(), OutOfProcessDataSharingService.class));
+        Intent intent = new Intent(getApplicationContext(), OutOfProcessDataSharingService.class);
+        intent.putExtra("KillingStage", KillingStage.DURING_WRITE.name());
+        getApplicationContext().startService(intent);
 
-        PollingCheck.waitFor(() -> ccService.mDataShareSessionErrorCode > 0);
+        PollingCheck.waitFor(() -> ccService.mDataShareSessionFinished);
 
-        assertThat(ccService.mDataShareSessionErrorCode).isEqualTo(
-                ContentCaptureManager.DATA_SHARE_ERROR_UNKNOWN);
+        assertThat(ccService.mDataShareSessionSucceeded).isTrue();
     }
 }
diff --git a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/EventsAssertor.java b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/EventsAssertor.java
index eaf07f9..8b249c4 100644
--- a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/EventsAssertor.java
+++ b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/EventsAssertor.java
@@ -102,6 +102,16 @@
     }
 
     /**
+     * Asserts the basic contents of a {@link ContentCaptureEvent#TYPE_CONTEXT_UPDATED} event.
+     */
+    public EventsAssertor assertContextUpdated() {
+        assertNextEvent((event) -> assertSessionLevelEvent(event),
+                ContentCaptureEvent.TYPE_CONTEXT_UPDATED,
+                "no TYPE_CONTEXT_UPDATED event");
+        return this;
+    }
+
+    /**
      * Asserts the contents of a {@link ContentCaptureEvent#TYPE_VIEW_APPEARED}
      * event for a decor view.
      *
@@ -200,18 +210,6 @@
     }
 
     /**
-     * Asserts the contents of a {@link ContentCaptureEvent#TYPE_VIEW_TEXT_CHANGED} event.
-     */
-    @NonNull
-    public EventsAssertor assertViewTextChanged(@NonNull AutofillId expectedId,
-            @NonNull String expectedText) {
-        assertNextEvent((event) -> assertTextChangedEvent(event, expectedId, expectedText),
-                ContentCaptureEvent.TYPE_VIEW_TEXT_CHANGED,
-                String.format("no VIEW_TEXT_CHANGED event for %s", expectedId));
-        return this;
-    }
-
-    /**
      * Asserts the contents of a {@link ContentCaptureEvent#TYPE_VIEW_APPEARED}
      * event for a virtual node.
      */
@@ -249,6 +247,28 @@
         return assertViewDisappeared(ids);
     }
 
+    /**
+     * Asserts the contents of a {@link ContentCaptureEvent#TYPE_VIEW_TEXT_CHANGED} event.
+     */
+    @NonNull
+    public EventsAssertor assertViewTextChanged(AutofillId expectedId, String expectedText) {
+        assertNextEvent((event) -> assertTextChangedEvent(event, expectedId, expectedText),
+                ContentCaptureEvent.TYPE_VIEW_TEXT_CHANGED,
+                String.format("no TYPE_VIEW_TEXT_CHANGED event for %s:%s",
+                        expectedId, expectedText));
+        return this;
+    }
+
+    @Nullable
+    private String assertTextChangedEvent(@NonNull ContentCaptureEvent event,
+            @NonNull AutofillId expectedId, @NonNull String expectedText) {
+        assertWithMessage("Wrong id on %s", event).that(event.getId())
+                .isEqualTo(expectedId);
+        assertWithMessage("Wrong text on %s", event).that(event.getText().toString())
+                .isEqualTo(expectedText);
+        return null;
+    }
+
     @Nullable
     private String assertVirtualViewEvent(@NonNull ContentCaptureEvent event,
             @NonNull AutofillId expectedId, @Nullable String expectedText) {
@@ -288,22 +308,12 @@
         assertWithMessage("no autofillIds on event %s", event).that(ids)
                 .isNotNull();
         assertWithMessage("wrong autofillId on event %s", event)
-                .that(ids).containsExactly((Object[]) expectedIds).inOrder();
+                .that(ids).containsExactly((Object[]) expectedIds);
         assertWithMessage("event %s should not have autofillId", event)
                 .that(event.getId()).isNull();
         return null;
     }
 
-    @Nullable
-    private String assertTextChangedEvent(@NonNull ContentCaptureEvent event,
-            @NonNull AutofillId expectedId, @NonNull String expectedText) {
-        assertWithMessage("Wrong id on %s", event).that(event.getId())
-                .isEqualTo(expectedId);
-        assertWithMessage("Wrong text on %s", event).that(event.getText().toString())
-                .isEqualTo(expectedText);
-        return null;
-    }
-
     private void assertCommonViewDisappearedProperties(@NonNull ContentCaptureEvent event) {
         assertWithMessage("event %s should not have a ViewNode", event)
                 .that(event.getViewNode()).isNull();
@@ -421,6 +431,10 @@
                 + mEvents.size() + "): " + mEvents);
     }
 
+    public ContentCaptureEvent getLastEvent() {
+        return mEvents.get(mNextEvent - 1);
+    }
+
     private interface EventAssertion {
         @Nullable
         String getErrorMessage(@NonNull ContentCaptureEvent event);
diff --git a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/LoginActivity.java b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/LoginActivity.java
index 0857828..8b86214b 100644
--- a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/LoginActivity.java
+++ b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/LoginActivity.java
@@ -23,7 +23,6 @@
 import static android.contentcaptureservice.cts.Assertions.assertViewTreeFinished;
 import static android.contentcaptureservice.cts.Assertions.assertViewTreeStarted;
 import static android.contentcaptureservice.cts.Assertions.assertViewsOptionallyDisappeared;
-import static android.contentcaptureservice.cts.Assertions.removeUnknownEvent;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -97,17 +96,11 @@
     @NonNull
     public List<ContentCaptureEvent> assertJustInitialViewsAppeared(@NonNull Session session,
             int additionalEvents) {
+        assertBaseInformation(session);
+
         final LoginActivity activity = this;
         final ContentCaptureSessionId sessionId = session.id;
-        assertRightActivity(session, sessionId, activity);
-
-        // Sanity check
-        assertSessionId(sessionId, activity.mUsernameLabel);
-        assertSessionId(sessionId, activity.mUsername);
-        assertSessionId(sessionId, activity.mPassword);
-        assertSessionId(sessionId, activity.mPasswordLabel);
-
-        final List<ContentCaptureEvent> events = removeUnknownEvent(session.getEvents());
+        final List<ContentCaptureEvent> events = session.getEvents();
         Log.v(TAG, "events(" + events.size() + "): " + events);
         // TODO(b/123540067): ideally it should be X so it reflects just the views defined
         // in the layout - right now it's generating events for 2 intermediate parents
@@ -139,6 +132,52 @@
     }
 
     /**
+     * Asserts the events generated when this activity was launched, up to the
+     * {@code TYPE_INITIAL_VIEW_HIERARCHY_FINISHED} event.
+     */
+    @NonNull
+    public EventsAssertor assertInitialViewsAppeared(@NonNull Session session) {
+        assertBaseInformation(session);
+
+        final LoginActivity activity = this;
+        final ContentCaptureSessionId sessionId = session.id;
+        final List<ContentCaptureEvent> events = session.getEvents();
+        Log.v(TAG, "events(" + events.size() + "): " + events);
+        final AutofillId rootId = activity.getRootView().getAutofillId();
+        final View grandpa1 = activity.getGrandParent();
+        final View grandpa2 = activity.getGrandGrandParent();
+        final View decorView = activity.getDecorView();
+        final View rootView = activity.getRootView();
+
+        EventsAssertor assertor = new EventsAssertor(events);
+        assertor.isAtLeast(MIN_EVENTS)
+                .assertSessionResumed()
+                .assertViewTreeStarted()
+                .assertDecorViewAppeared(decorView)
+                .assertViewAppeared(grandpa2, decorView.getAutofillId())
+                .assertViewAppeared(grandpa1, grandpa2.getAutofillId())
+                .assertViewAppeared(sessionId, rootView, grandpa1.getAutofillId())
+                .assertViewAppeared(sessionId, activity.mUsernameLabel, rootId)
+                .assertViewAppeared(sessionId, activity.mUsername, rootId)
+                .assertViewAppeared(sessionId, activity.mPasswordLabel, rootId)
+                .assertViewAppeared(sessionId, activity.mPassword, rootId)
+                .assertViewTreeFinished();
+
+        return assertor;
+    }
+
+    private void assertBaseInformation(@NonNull Session session) {
+        final LoginActivity activity = this;
+        final ContentCaptureSessionId sessionId = session.id;
+        assertRightActivity(session, sessionId, activity);
+
+        assertSessionId(sessionId, activity.mUsernameLabel);
+        assertSessionId(sessionId, activity.mUsername);
+        assertSessionId(sessionId, activity.mPassword);
+        assertSessionId(sessionId, activity.mPasswordLabel);
+    }
+
+    /**
      * Asserts the initial views disappeared after the activity was finished.
      */
     public void assertInitialViewsDisappeared(@NonNull List<ContentCaptureEvent> events,
@@ -180,6 +219,25 @@
         assertViewTreeFinished(events, i + 2);
     }
 
+    /**
+     * Asserts the initial views disappeared after the activity was finished.
+     */
+    public void assertInitialViewsDisappeared(@NonNull EventsAssertor assertor) {
+        final LoginActivity activity = this;
+        final AutofillId rootId = activity.getRootView().getAutofillId();
+        final View decorView = activity.getDecorView();
+        final View grandpa1 = activity.getGrandParent();
+        final View grandpa2 = activity.getGrandGrandParent();
+
+        assertor.assertViewTreeStarted()
+                .assertViewDisappeared(
+                        rootId, grandpa1.getAutofillId(), grandpa2.getAutofillId(),
+                        decorView.getAutofillId(),
+                        activity.mUsernameLabel.getAutofillId(), activity.mUsername.getAutofillId(),
+                        activity.mPasswordLabel.getAutofillId(), activity.mPassword.getAutofillId())
+                .assertViewTreeFinished();
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
diff --git a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/LoginActivityTest.java b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/LoginActivityTest.java
index acd5dc8..5a67ac0 100644
--- a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/LoginActivityTest.java
+++ b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/LoginActivityTest.java
@@ -26,7 +26,6 @@
 import static android.contentcaptureservice.cts.Assertions.assertSessionPaused;
 import static android.contentcaptureservice.cts.Assertions.assertSessionResumed;
 import static android.contentcaptureservice.cts.Assertions.assertViewAppeared;
-import static android.contentcaptureservice.cts.Assertions.assertViewTextChanged;
 import static android.contentcaptureservice.cts.Assertions.assertViewTreeFinished;
 import static android.contentcaptureservice.cts.Assertions.assertViewTreeStarted;
 import static android.contentcaptureservice.cts.Assertions.assertViewsOptionallyDisappeared;
@@ -314,16 +313,18 @@
         final Session session = service.getOnlyFinishedSession();
         Log.v(TAG, "session id: " + session.id);
 
-        final int additionalEvents = 2;
-        final List<ContentCaptureEvent> events = activity.assertInitialViewsAppeared(session,
-                additionalEvents);
+        final EventsAssertor assertor = activity.assertInitialViewsAppeared(session);
 
-        final ContentCaptureEvent event1 = assertContextUpdated(events, LoginActivity.MIN_EVENTS);
+        assertor.isAtLeast(LoginActivity.MIN_EVENTS + 2)
+                .assertContextUpdated();
+
+        final ContentCaptureEvent event1 = assertor.getLastEvent();
         final ContentCaptureContext actualContext = event1.getContentCaptureContext();
         assertContentCaptureContext(actualContext);
 
-        final ContentCaptureEvent event2 = assertContextUpdated(events,
-                LoginActivity.MIN_EVENTS + 1);
+        assertor.assertContextUpdated();
+
+        final ContentCaptureEvent event2 = assertor.getLastEvent();
         assertThat(event2.getContentCaptureContext()).isNull();
     }
 
@@ -407,20 +408,14 @@
         watcher.waitFor(DESTROYED);
 
         final Session session = service.getOnlyFinishedSession();
-        final ContentCaptureSessionId sessionId = session.id;
 
-        assertRightActivity(session, sessionId, activity);
+        final EventsAssertor assertor = activity.assertInitialViewsAppeared(session);
 
-        final int additionalEvents = 2;
-        final List<ContentCaptureEvent> events = activity.assertInitialViewsAppeared(session,
-                additionalEvents);
+        assertor.isAtLeast(LoginActivity.MIN_EVENTS + 2)
+                .assertViewTextChanged(activity.mUsername.getAutofillId(), "USER")
+                .assertViewTextChanged(activity.mPassword.getAutofillId(), "PASS");
 
-        final int i = LoginActivity.MIN_EVENTS;
-
-        assertViewTextChanged(events, i, activity.mUsername.getAutofillId(), "USER");
-        assertViewTextChanged(events, i + 1, activity.mPassword.getAutofillId(), "PASS");
-
-        activity.assertInitialViewsDisappeared(events, additionalEvents);
+        activity.assertInitialViewsDisappeared(assertor);
     }
 
     @Test
@@ -454,29 +449,26 @@
         watcher.waitFor(DESTROYED);
 
         final Session session = service.getOnlyFinishedSession();
-        final ContentCaptureSessionId sessionId = session.id;
 
-        assertRightActivity(session, sessionId, activity);
+        final EventsAssertor assertor = activity.assertInitialViewsAppeared(session);
 
-        final int additionalEvents = 8;
-        final List<ContentCaptureEvent> events = activity.assertInitialViewsAppeared(session,
-                additionalEvents);
+        final AutofillId usernameId = activity.mUsername.getAutofillId();
+        final AutofillId passwordId = activity.mPassword.getAutofillId();
 
-        final int i = LoginActivity.MIN_EVENTS;
+        assertor.isAtLeast(LoginActivity.MIN_EVENTS + 8)
+                .assertViewTextChanged(activity.mUsername.getAutofillId(), "a")
+                .assertViewTextChanged(usernameId, "ab")
+                .assertViewTextChanged(usernameId, "")
+                .assertViewTextChanged(usernameId, "abc")
+                .assertViewTextChanged(passwordId, "d")
+                .assertViewTextChanged(passwordId, "")
+                .assertViewTextChanged(passwordId, "")
+                .assertViewTextChanged(passwordId, "de")
+                .assertViewTextChanged(passwordId, "def")
+                .assertViewTextChanged(passwordId, "")
+                .assertViewTextChanged(usernameId, "abc");
 
-        assertViewTextChanged(events, i, activity.mUsername.getAutofillId(), "a");
-        assertViewTextChanged(events, i + 1, activity.mUsername.getAutofillId(), "ab");
-        assertViewTextChanged(events, i + 2, activity.mUsername.getAutofillId(), "");
-        assertViewTextChanged(events, i + 3, activity.mUsername.getAutofillId(), "abc");
-        assertViewTextChanged(events, i + 4, activity.mPassword.getAutofillId(), "d");
-        assertViewTextChanged(events, i + 5, activity.mPassword.getAutofillId(), "");
-        assertViewTextChanged(events, i + 6, activity.mPassword.getAutofillId(), "");
-        assertViewTextChanged(events, i + 7, activity.mPassword.getAutofillId(), "de");
-        assertViewTextChanged(events, i + 8, activity.mPassword.getAutofillId(), "def");
-        assertViewTextChanged(events, i + 9, activity.mPassword.getAutofillId(), "");
-        assertViewTextChanged(events, i + 10, activity.mUsername.getAutofillId(), "abc");
-
-        activity.assertInitialViewsDisappeared(events, additionalEvents);
+        activity.assertInitialViewsDisappeared(assertor);
     }
 
     @Test
@@ -505,19 +497,13 @@
         watcher.waitFor(DESTROYED);
 
         final Session session = service.getOnlyFinishedSession();
-        final ContentCaptureSessionId sessionId = session.id;
 
-        assertRightActivity(session, sessionId, activity);
+        final EventsAssertor assertor = activity.assertInitialViewsAppeared(session);
 
-        final int additionalEvents = 5;
-        final List<ContentCaptureEvent> events = activity.assertInitialViewsAppeared(session,
-                additionalEvents);
+        assertor.isAtLeast(LoginActivity.MIN_EVENTS + 5)
+                .assertViewTextChanged(activity.mUsername.getAutofillId(), "Android");
 
-        final int i = LoginActivity.MIN_EVENTS;
-
-        assertViewTextChanged(events, i, activity.mUsername.getAutofillId(), "Android");
-
-        activity.assertInitialViewsDisappeared(events, additionalEvents);
+        activity.assertInitialViewsDisappeared(assertor);
     }
 
     @Test
@@ -550,26 +536,22 @@
         watcher.waitFor(DESTROYED);
 
         final Session session = service.getOnlyFinishedSession();
-        final ContentCaptureSessionId sessionId = session.id;
 
-        assertRightActivity(session, sessionId, activity);
+        final EventsAssertor assertor = activity.assertInitialViewsAppeared(session);
 
-        final int additionalEvents = 4;
-        final List<ContentCaptureEvent> events = activity.assertInitialViewsAppeared(session,
-                additionalEvents);
+        assertor.isAtLeast(LoginActivity.MIN_EVENTS + 4)
+                .assertViewTextChanged(activity.mUsername.getAutofillId(), "Good");
+        assertComposingSpan(assertor.getLastEvent().getText(), 0, 4);
 
-        final int i = LoginActivity.MIN_EVENTS;
+        assertor.assertViewTextChanged(activity.mUsername.getAutofillId(), "Good ");
+        assertNoComposingSpan(assertor.getLastEvent().getText());
 
-        assertViewTextChanged(events, i, activity.mUsername.getAutofillId(), "Good");
-        assertComposingSpan(events.get(i).getText(), 0, 4);
-        assertViewTextChanged(events, i + 1, activity.mUsername.getAutofillId(), "Good ");
-        assertNoComposingSpan(events.get(i + 1).getText());
-        assertViewTextChanged(events, i + 2, activity.mUsername.getAutofillId(), "Good morning");
+        assertor.assertViewTextChanged(activity.mUsername.getAutofillId(), "Good morning");
         // TODO: Change how the appending works to more realistically test the case where only
         // "morning" is in the composing state.
-        assertComposingSpan(events.get(i + 2).getText(), 0, 12);
+        assertComposingSpan(assertor.getLastEvent().getText(), 0, 12);
 
-        activity.assertInitialViewsDisappeared(events, additionalEvents);
+        activity.assertInitialViewsDisappeared(assertor);
     }
 
     @Test
@@ -597,20 +579,14 @@
         watcher.waitFor(DESTROYED);
 
         final Session session = service.getOnlyFinishedSession();
-        final ContentCaptureSessionId sessionId = session.id;
 
-        assertRightActivity(session, sessionId, activity);
+        final EventsAssertor assertor = activity.assertInitialViewsAppeared(session);
 
-        final int additionalEvents = 3;
-        final List<ContentCaptureEvent> events = activity.assertInitialViewsAppeared(session,
-                additionalEvents);
+        assertor.isAtLeast(LoginActivity.MIN_EVENTS + 3)
+                .assertViewTextChanged(activity.mUsername.getAutofillId(), "Good morning")
+                .assertViewTextChanged(activity.mPassword.getAutofillId(), "How are you");
 
-        final int i = LoginActivity.MIN_EVENTS;
-
-        assertViewTextChanged(events, i, activity.mUsername.getAutofillId(), "Good morning");
-        assertViewTextChanged(events, i + 1, activity.mPassword.getAutofillId(), "How are you");
-
-        activity.assertInitialViewsDisappeared(events, additionalEvents);
+        activity.assertInitialViewsDisappeared(assertor);
     }
 
     @Test
@@ -642,27 +618,24 @@
         watcher.waitFor(DESTROYED);
 
         final Session session = service.getOnlyFinishedSession();
-        final ContentCaptureSessionId sessionId = session.id;
 
-        assertRightActivity(session, sessionId, activity);
+        final EventsAssertor assertor = activity.assertInitialViewsAppeared(session);
 
-        final int additionalEvents = 5;
-        final List<ContentCaptureEvent> events = activity.assertInitialViewsAppeared(session,
-                additionalEvents);
+        assertor.isAtLeast(LoginActivity.MIN_EVENTS + 5)
+                // TODO: The first two events should probably be merged.
+                .assertViewTextChanged(activity.mUsername.getAutofillId(), "Android");
+        assertNoComposingSpan(assertor.getLastEvent().getText());
 
-        final int i = LoginActivity.MIN_EVENTS;
+        assertor.assertViewTextChanged(activity.mUsername.getAutofillId(), "Android");
+        assertComposingSpan(assertor.getLastEvent().getText(), 1, 3);
 
-        // TODO: The first two events should probably be merged.
-        assertViewTextChanged(events, i, activity.mUsername.getAutofillId(), "Android");
-        assertNoComposingSpan(events.get(i).getText());
-        assertViewTextChanged(events, i + 1, activity.mUsername.getAutofillId(), "Android");
-        assertComposingSpan(events.get(i + 1).getText(), 1, 3);
-        assertViewTextChanged(events, i + 2, activity.mUsername.getAutofillId(), "Android");
-        assertNoComposingSpan(events.get(i + 2).getText());
-        assertViewTextChanged(events, i + 3, activity.mUsername.getAutofillId(), "end");
-        assertNoComposingSpan(events.get(i + 3).getText());
+        assertor.assertViewTextChanged(activity.mUsername.getAutofillId(), "Android");
+        assertNoComposingSpan(assertor.getLastEvent().getText());
 
-        activity.assertInitialViewsDisappeared(events, additionalEvents);
+        assertor.assertViewTextChanged(activity.mUsername.getAutofillId(), "end");
+        assertNoComposingSpan(assertor.getLastEvent().getText());
+
+        activity.assertInitialViewsDisappeared(assertor);
     }
 
     private void appendText(EditText editText, String text) {
@@ -920,20 +893,16 @@
         watcher.waitFor(DESTROYED);
 
         final Session session = service.getOnlyFinishedSession();
-        Log.v(TAG, "session id: " + session.id);
-
         final ContentCaptureSessionId sessionId = session.id;
-        assertRightActivity(session, sessionId, activity);
-
-        final List<ContentCaptureEvent> events = activity.assertJustInitialViewsAppeared(session,
-                /* additionalEvents= */ 2);
+        Log.v(TAG, "session id: " + sessionId);
         final AutofillId rootId = activity.getRootView().getAutofillId();
 
-        int i = LoginActivity.MIN_EVENTS - 1;
-        assertViewTreeFinished(events, i);
-        assertViewTreeStarted(events, i + 1);
-        assertViewAppeared(events, i + 2, sessionId, child, rootId);
-        assertViewTreeFinished(events, i + 3);
+        final EventsAssertor assertor = activity.assertInitialViewsAppeared(session);
+
+        assertor.isAtLeast(LoginActivity.MIN_EVENTS + 3)
+                .assertViewTreeStarted()
+                .assertViewAppeared(sessionId, child, rootId)
+                .assertViewTreeFinished();
     }
 
     @Test
@@ -963,49 +932,26 @@
 
         final Session session = service.getOnlyFinishedSession();
         Log.v(TAG, "session id: " + session.id);
-
         final ContentCaptureSessionId sessionId = session.id;
-        assertRightActivity(session, sessionId, activity);
-        final int additionalEvents = 2; // 2 children views
-        final List<ContentCaptureEvent> events = activity.assertJustInitialViewsAppeared(session,
-                additionalEvents);
-        assertThat(events.size()).isAtLeast(LoginActivity.MIN_EVENTS + 5);
         final View decorView = activity.getDecorView();
         final View grandpa1 = activity.getGrandParent();
         final View grandpa2 = activity.getGrandGrandParent();
         final AutofillId rootId = activity.getRootView().getAutofillId();
-        int i = LoginActivity.MIN_EVENTS - 1;
 
-        assertViewTreeFinished(events, i);
-        assertViewTreeStarted(events, i + 1);
-        assertViewAppeared(events, i + 2, sessionId, children[0], rootId);
-        assertViewAppeared(events, i + 3, sessionId, children[1], rootId);
-        assertViewTreeFinished(events, i + 4);
+        final EventsAssertor assertor = activity.assertInitialViewsAppeared(session);
 
-        // TODO(b/122315042): assert parents disappeared
-        if (true) return;
-
-        // TODO(b/122315042): sometimes we get decor view disappareared events, sometimes we don't
-        // As we don't really care about those, let's fix it!
-        try {
-            assertViewsOptionallyDisappeared(events, LoginActivity.MIN_EVENTS + additionalEvents,
-                    rootId,
-                    grandpa1.getAutofillId(), grandpa2.getAutofillId(),
-                    activity.mUsernameLabel.getAutofillId(), activity.mUsername.getAutofillId(),
-                    activity.mPasswordLabel.getAutofillId(), activity.mPassword.getAutofillId(),
-                    children[0].getAutofillId(), children[1].getAutofillId());
-        } catch (AssertionError e) {
-            Log.e(TAG, "Hack-ignoring assertion without decor view: " + e);
-            // Try again removing it...
-            assertViewsOptionallyDisappeared(events, LoginActivity.MIN_EVENTS + additionalEvents,
-                    rootId,
-                    grandpa1.getAutofillId(), grandpa2.getAutofillId(),
-                    decorView.getAutofillId(),
-                    activity.mUsernameLabel.getAutofillId(), activity.mUsername.getAutofillId(),
-                    activity.mPasswordLabel.getAutofillId(), activity.mPassword.getAutofillId(),
-                    children[0].getAutofillId(), children[1].getAutofillId());
-
-        }
+        assertor.isAtLeast(LoginActivity.MIN_EVENTS + 5)
+                .assertViewTreeStarted()
+                .assertViewAppeared(sessionId, children[0], rootId)
+                .assertViewAppeared(sessionId, children[1], rootId)
+                .assertViewTreeFinished()
+                .assertViewDisappeared(
+                        decorView.getAutofillId(),
+                        grandpa1.getAutofillId(), grandpa2.getAutofillId(),
+                        rootId,
+                        activity.mUsernameLabel.getAutofillId(), activity.mUsername.getAutofillId(),
+                        activity.mPasswordLabel.getAutofillId(), activity.mPassword.getAutofillId(),
+                        children[0].getAutofillId(), children[1].getAutofillId());
     }
 
     @Test
diff --git a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/OutOfProcessDataSharingService.java b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/OutOfProcessDataSharingService.java
index 27224c8..86a8b02 100644
--- a/tests/contentcaptureservice/src/android/contentcaptureservice/cts/OutOfProcessDataSharingService.java
+++ b/tests/contentcaptureservice/src/android/contentcaptureservice/cts/OutOfProcessDataSharingService.java
@@ -24,6 +24,7 @@
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
 import android.os.Process;
+import android.text.TextUtils;
 import android.view.contentcapture.ContentCaptureManager;
 import android.view.contentcapture.DataShareRequest;
 import android.view.contentcapture.DataShareWriteAdapter;
@@ -47,6 +48,7 @@
     byte[] mDataWritten = new byte[10_000];
     String mLocusId = "DataShare_CTSTest";
     String mMimeType = "application/octet-stream";
+    DataSharingServiceTest.KillingStage mKillingStage = DataSharingServiceTest.KillingStage.NONE;
 
     private final IBinder mBinder = new IOutOfProcessDataSharingService.Stub() {
         @Override
@@ -59,6 +61,7 @@
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+        setupKillingStage(intent);
         shareData();
         return START_NOT_STICKY;
     }
@@ -69,6 +72,14 @@
         return mBinder;
     }
 
+    private void setupKillingStage(Intent intent) {
+        String killingStage = intent.getStringExtra("KillingStage");
+        if (TextUtils.isEmpty(killingStage)) {
+            return;
+        }
+        mKillingStage = DataSharingServiceTest.KillingStage.valueOf(killingStage);
+    }
+
     private void shareData() {
         ContentCaptureManager manager =
                 getApplicationContext().getSystemService(ContentCaptureManager.class);
@@ -83,14 +94,14 @@
                     public void onWrite(ParcelFileDescriptor destination) {
                         try (OutputStream outputStream =
                                      new ParcelFileDescriptor.AutoCloseOutputStream(destination)) {
-                            if (DataSharingServiceTest.sKillingStage
+                            if (mKillingStage
                                     == DataSharingServiceTest.KillingStage.BEFORE_WRITE) {
                                 Process.killProcess(Process.myPid());
                                 return;
                             }
                             sRandom.nextBytes(mDataWritten);
                             outputStream.write(mDataWritten);
-                            if (DataSharingServiceTest.sKillingStage
+                            if (mKillingStage
                                     == DataSharingServiceTest.KillingStage.DURING_WRITE) {
                                 Process.killProcess(Process.myPid());
                                 return;
diff --git a/tests/controls/src/android/controls/cts/CtsControlBuilderTest.java b/tests/controls/src/android/controls/cts/CtsControlBuilderTest.java
index f0f22ae..ab586b2 100644
--- a/tests/controls/src/android/controls/cts/CtsControlBuilderTest.java
+++ b/tests/controls/src/android/controls/cts/CtsControlBuilderTest.java
@@ -81,7 +81,7 @@
                 .setCustomColor(mColorStateList)
                 .build();
 
-        assertControl(control, true);
+        assertControl(control, true /* isStateless */, true /* authRequired */);
     }
 
     @Test
@@ -98,13 +98,14 @@
                 .setStatusText(STATUS_TEXT_STATEFUL)
                 .setCustomIcon(mIcon)
                 .setCustomColor(mColorStateList)
+                .setAuthRequired(false)
                 .build();
 
         Control updatedControl = new Control.StatefulBuilder(control).build();
-        assertControl(updatedControl, false);
+        assertControl(updatedControl, false /* isStateless */, false /* authRequired */);
     }
 
-    private void assertControl(Control control, boolean isStateless) {
+    private void assertControl(Control control, boolean isStateless, boolean authRequired) {
         assertEquals(control.getTitle(), TITLE);
         assertEquals(control.getSubtitle(), SUBTITLE);
         assertEquals(control.getStructure(), STRUCTURE);
@@ -116,5 +117,6 @@
         assertEquals(control.getControlId(), CONTROL_ID2);
         assertEquals(control.getCustomColor(), mColorStateList);
         assertEquals(control.getCustomIcon(), mIcon);
+        assertEquals(control.isAuthRequired(), authRequired);
     }
 }
diff --git a/tests/controls/src/android/controls/cts/CtsControlsService.java b/tests/controls/src/android/controls/cts/CtsControlsService.java
index 301c34e..36cfdd8 100644
--- a/tests/controls/src/android/controls/cts/CtsControlsService.java
+++ b/tests/controls/src/android/controls/cts/CtsControlsService.java
@@ -96,6 +96,7 @@
             .setDeviceType(DeviceTypes.TYPE_LIGHT)
             .setStructure("Home")
             .setControlTemplate(template)
+            .setAuthRequired(false)
             .build();
     }
 
@@ -351,6 +352,7 @@
             .setCustomIcon(c.getCustomIcon())
             .setCustomColor(c.getCustomColor())
             .setStatus(c.getStatus())
-            .setStatusText(c.getStatusText());
+            .setStatusText(c.getStatusText())
+            .setAuthRequired(c.isAuthRequired());
     }
 }
diff --git a/tests/controls/src/android/controls/cts/CtsControlsServiceTest.java b/tests/controls/src/android/controls/cts/CtsControlsServiceTest.java
index 61ccef3..7d5fb2a 100644
--- a/tests/controls/src/android/controls/cts/CtsControlsServiceTest.java
+++ b/tests/controls/src/android/controls/cts/CtsControlsServiceTest.java
@@ -371,6 +371,7 @@
         assertEquals(c1.getControlId(), c2.getControlId());
         assertEquals(c1.getCustomIcon(), c2.getCustomIcon());
         assertEquals(c1.getCustomColor(), c2.getCustomColor());
+        assertEquals(c1.isAuthRequired(), c2.isAuthRequired());
 
         assertTemplateEquals(c1.getControlTemplate(), c2.getControlTemplate());
     }
diff --git a/tests/devicepolicy/AndroidManifest.xml b/tests/devicepolicy/AndroidManifest.xml
index 638eb77..c8c6c0e 100644
--- a/tests/devicepolicy/AndroidManifest.xml
+++ b/tests/devicepolicy/AndroidManifest.xml
@@ -19,9 +19,16 @@
           package="android.devicepolicy.cts"
           android:targetSandboxVersion="2">
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+    <!-- TODO(b/191637162): This is required for
+            canInteractAcrossProfiles_permissionIsSet_returnsTrue -->
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_PROFILES"/>
+
+    <!-- Seemingly the INTERNET permission cannot be adopted. -->
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <!-- Add a network security config that trusts user added CAs for tests -->
     <application android:testOnly="true"
+                 android:appComponentFactory="com.android.eventlib.premade.EventLibAppComponentFactory"
                  android:networkSecurityConfig="@xml/network_security_config">
         <uses-library android:name="android.test.runner" />
 
@@ -33,15 +40,10 @@
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
         </activity>
-
-        <activity android:name=".NonMainActivity"
+        <activity android:name=".NotMainActivity"
                   android:exported="true">
-            <intent-filter>
-                <action android:name="nonMainActivity"/>
-            </intent-filter>
         </activity>
-
-        <activity android:name=".NonExportedActivity"
+        <activity android:name=".NotExportedMainActivity"
                   android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
diff --git a/tests/devicepolicy/OWNERS b/tests/devicepolicy/OWNERS
index cf88726..19b6194 100644
--- a/tests/devicepolicy/OWNERS
+++ b/tests/devicepolicy/OWNERS
@@ -1,2 +1,2 @@
 # Bug template url: https://b.corp.google.com/issues/new?component=100560&template=63204
-file:platform/frameworks/base:/core/java/android/app/admin/EnterprisePlatform_OWNERS
\ No newline at end of file
+file:platform/frameworks/base:/core/java/android/app/admin/EnterprisePlatform_OWNERS
diff --git a/tests/devicepolicy/res/drawable/test_drawable_1.xml b/tests/devicepolicy/res/drawable/test_drawable_1.xml
new file mode 100644
index 0000000..8a20885
--- /dev/null
+++ b/tests/devicepolicy/res/drawable/test_drawable_1.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFF44336"
+        android:pathData="M11,15h2v2h-2v-2zM11,7h2v6h-2L11,7zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>
diff --git a/tests/devicepolicy/res/drawable/test_drawable_2.xml b/tests/devicepolicy/res/drawable/test_drawable_2.xml
new file mode 100644
index 0000000..98569a3
--- /dev/null
+++ b/tests/devicepolicy/res/drawable/test_drawable_2.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,15h2v2h-2v-2zM11,7h2v6h-2L11,7zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>
diff --git a/tests/devicepolicy/res/values/strings.xml b/tests/devicepolicy/res/values/strings.xml
new file mode 100644
index 0000000..3d1c304
--- /dev/null
+++ b/tests/devicepolicy/res/values/strings.xml
@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+           xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <string name="test_string_1">test string 1</string>
+    <string name="test_string_2">test string 2</string>
+    <string name="test_string_with_arg">test string %s</string>
+</resources>
\ No newline at end of file
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/AccessibilityServicesTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/AccessibilityServicesTest.java
new file mode 100644
index 0000000..b23d620
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/AccessibilityServicesTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2021 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 android.devicepolicy.cts;
+
+import static com.android.bedstead.nene.permissions.CommonPermissions.QUERY_ADMIN_POLICY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.admin.DevicePolicyManager;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.policies.PermittedAccessibilityServices;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.accessibility.AccessibilityService;
+import com.android.bedstead.nene.packages.Package;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@RunWith(BedsteadJUnit4.class)
+public class AccessibilityServicesTest {
+
+    @ClassRule @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final DevicePolicyManager sDevicePolicyManager =
+            TestApis.context().instrumentedContext().getSystemService(DevicePolicyManager.class);
+
+    private static final Set<String> SYSTEM_ACCESSIBILITY_SERVICE_PACKAGES =
+            TestApis.accessibility().installedAccessibilityServices().stream()
+                    .map(AccessibilityService::pkg)
+                    .filter(Package::hasSystemFlag)
+                    .map(Package::packageName)
+                    .collect(Collectors.toSet());
+
+    private static final String ACCESSIBILITY_SERVICE_PACKAGE_NAME = "pkg";
+
+    @Before
+    public void setUp() {
+        // We can only proceed with the test if no non-system services are enabled
+        sDeviceState.dpc().devicePolicyManager().setPermittedAccessibilityServices(
+                sDeviceState.dpc().componentName(), /* packageNames= */ null);
+        assertThat(TestApis.accessibility().enabledAccessibilityServices().stream()
+                .map(i -> i.pkg())
+                .filter(p -> !p.hasSystemFlag())
+                .collect(Collectors.toSet())).isEmpty();
+    }
+
+    @After
+    public void resetPermittedAccessibilityServices() {
+        sDeviceState.dpc().devicePolicyManager().setPermittedAccessibilityServices(
+                sDeviceState.dpc().componentName(), /* packageNames= */ null);
+    }
+
+    @PolicyAppliesTest(policy = PermittedAccessibilityServices.class)
+    @EnsureHasPermission(QUERY_ADMIN_POLICY)
+    @Postsubmit(reason = "new test")
+    public void setPermittedAccessibilityServices_nullPackageName_allServicesArePermitted() {
+        sDeviceState.dpc().devicePolicyManager().setPermittedAccessibilityServices(
+                sDeviceState.dpc().componentName(), /* packageNames= */ null);
+
+        assertThat(sDeviceState.dpc().devicePolicyManager()
+                .getPermittedAccessibilityServices(sDeviceState.dpc().componentName()))
+                .isNull();
+        assertThat(sDevicePolicyManager.getPermittedAccessibilityServices(
+                TestApis.users().instrumented().id())).isNull();
+    }
+
+    @PolicyAppliesTest(policy = PermittedAccessibilityServices.class)
+    @EnsureHasPermission(value = QUERY_ADMIN_POLICY)
+    @Postsubmit(reason = "new test")
+    public void setPermittedAccessibilityServices_emptyList_onlyPermitsSystemServices() {
+        sDeviceState.dpc().devicePolicyManager().setPermittedAccessibilityServices(
+                sDeviceState.dpc().componentName(), /* packageNames= */ ImmutableList.of());
+
+        assertThat(sDeviceState.dpc().devicePolicyManager()
+                .getPermittedAccessibilityServices(sDeviceState.dpc().componentName()))
+                .isEmpty();
+        // Move it into a set to avoid duplicates
+        Set<String> permittedServices = new HashSet<>(
+                sDevicePolicyManager.getPermittedAccessibilityServices(
+                        TestApis.users().instrumented().id()));
+        assertThat(permittedServices)
+                .containsExactlyElementsIn(SYSTEM_ACCESSIBILITY_SERVICE_PACKAGES);
+    }
+
+    @PolicyAppliesTest(policy = PermittedAccessibilityServices.class)
+    @EnsureHasPermission(value = QUERY_ADMIN_POLICY)
+    @Postsubmit(reason = "new test")
+    public void setPermittedAccessibilityServices_includeNonSystemApp_permitsNonSystemApp() {
+        sDeviceState.dpc().devicePolicyManager().setPermittedAccessibilityServices(
+                sDeviceState.dpc().componentName(),
+                ImmutableList.of(ACCESSIBILITY_SERVICE_PACKAGE_NAME));
+
+        assertThat(sDeviceState.dpc().devicePolicyManager().getPermittedAccessibilityServices(
+                sDeviceState.dpc().componentName())).containsExactly(
+                        ACCESSIBILITY_SERVICE_PACKAGE_NAME);
+        assertThat(sDevicePolicyManager.getPermittedAccessibilityServices(
+                TestApis.users().instrumented().id()))
+                .contains(ACCESSIBILITY_SERVICE_PACKAGE_NAME);
+    }
+
+    @PolicyAppliesTest(policy = PermittedAccessibilityServices.class)
+    @EnsureHasPermission(QUERY_ADMIN_POLICY)
+    @Postsubmit(reason = "new test")
+    public void setPermittedAccessibilityServices_includeNonSystemApp_stillPermitsSystemApps() {
+        sDeviceState.dpc().devicePolicyManager().setPermittedAccessibilityServices(
+                sDeviceState.dpc().componentName(),
+                ImmutableList.of(ACCESSIBILITY_SERVICE_PACKAGE_NAME));
+
+        assertThat(sDeviceState.dpc().devicePolicyManager().getPermittedAccessibilityServices(
+                sDeviceState.dpc().componentName())).containsExactly(
+                        ACCESSIBILITY_SERVICE_PACKAGE_NAME);
+        assertThat(sDevicePolicyManager.getPermittedAccessibilityServices(
+                TestApis.users().instrumented().id()))
+                .containsAtLeastElementsIn(SYSTEM_ACCESSIBILITY_SERVICE_PACKAGES);
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/AccountManagementTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/AccountManagementTest.java
index 1b1eb9c..5da8847 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/AccountManagementTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/AccountManagementTest.java
@@ -39,19 +39,17 @@
 import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
 import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
 import com.android.bedstead.harrier.policies.AccountManagement;
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.utils.Poll;
 import com.android.bedstead.remotedpc.RemotePolicyManager;
 import com.android.bedstead.testapp.TestApp;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
 
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(BedsteadJUnit4.class)
@@ -61,8 +59,8 @@
     public static final DeviceState sDeviceState = new DeviceState();
 
     private static final Context sContext = TestApis.context().instrumentedContext();
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-    private static final TestApp sAccountManagementApp = sTestAppProvider
+
+    private static final TestApp sAccountManagementApp = sDeviceState.testApps()
             .query()
             // TODO(b/198590265) Filter for the correct account type.
             .whereServices().contains(
@@ -89,14 +87,11 @@
         mAccountManager = sContext.getSystemService(AccountManager.class);
     }
 
-    @Test
-    @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = AccountManagement.class)
+    @PolicyAppliesTest(policy = AccountManagement.class)
     public void getAccountTypesWithManagementDisabled_emptyByDefault() {
         assertThat(mDpm.getAccountTypesWithManagementDisabled()).isEmpty();
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     // We don't include non device admin states as passing a null admin is a NullPointerException
     @CannotSetPolicyTest(policy = AccountManagement.class, includeNonDeviceAdminStates = false)
@@ -106,8 +101,6 @@
                         mAdmin, FAKE_ACCOUNT_TYPE, /* disabled= */ false));
     }
 
-    @Test
-    @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = AccountManagement.class, singleTestOnly = true)
     public void setAccountTypesWithManagementDisabled_nullAdmin_throwsException() {
         assertThrows(NullPointerException.class, () ->
@@ -115,9 +108,7 @@
                         /* admin= */ null, FAKE_ACCOUNT_TYPE, /* disabled= */ false));
     }
 
-    @Test
-    @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = AccountManagement.class)
+    @PolicyAppliesTest(policy = AccountManagement.class)
     public void setAccountManagementDisabled_disableAccountType_works() {
         try {
             mDpm.setAccountManagementDisabled(mAdmin, FAKE_ACCOUNT_TYPE, /* disabled= */ true);
@@ -130,9 +121,7 @@
         }
     }
 
-    @Test
-    @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = AccountManagement.class)
+    @PolicyAppliesTest(policy = AccountManagement.class)
     public void setAccountManagementDisabled_addSameAccountTypeTwice_presentOnlyOnce() {
         try {
             mDpm.setAccountManagementDisabled(mAdmin, FAKE_ACCOUNT_TYPE, /* disabled= */ true);
@@ -146,8 +135,6 @@
         }
     }
 
-    @Test
-    @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = AccountManagement.class)
     public void setAccountManagementDisabled_disableThenEnable_noDisabledAccountTypes() {
         mDpm.setAccountManagementDisabled(mAdmin, FAKE_ACCOUNT_TYPE, /* disabled= */ true);
@@ -156,7 +143,6 @@
         assertThat(mDpm.getAccountTypesWithManagementDisabled()).isEmpty();
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = AccountManagement.class)
     public void addAccount_fromDpcWithAccountManagementDisabled_accountAdded()
@@ -174,7 +160,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = AccountManagement.class)
     public void addAccount_fromDpcWithDisallowModifyAccountsRestriction_accountAdded()
@@ -192,7 +177,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = AccountManagement.class)
     public void removeAccount_fromDpcWithDisallowModifyAccountsRestriction_accountRemoved()
@@ -210,8 +194,6 @@
         }
     }
 
-    @Test
-    @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = AccountManagement.class)
     public void addAccount_withDisallowModifyAccountsRestriction_throwsException() {
         try (TestAppInstance accountAuthenticatorApp = sAccountManagementApp.install()) {
@@ -224,7 +206,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = AccountManagement.class)
     public void removeAccount_withDisallowModifyAccountsRestriction_throwsException()
@@ -241,8 +222,6 @@
         }
     }
 
-    @Test
-    @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = AccountManagement.class)
     public void addAccount_withAccountManagementDisabled_throwsException() {
         try (TestAppInstance accountAuthenticatorApp = sAccountManagementApp.install()) {
@@ -255,7 +234,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = AccountManagement.class)
     public void removeAccount_withAccountManagementDisabled_throwsException()
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/ActivityTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/ActivityTest.java
new file mode 100644
index 0000000..77a9c49
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/ActivityTest.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_USERS;
+import static com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_USERS_FULL;
+import static com.android.eventlib.truth.EventLogsSubject.assertThat;
+import static com.android.queryable.queries.ActivityQuery.activity;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.android.activitycontext.ActivityContext;
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureDoesNotHavePermission;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile;
+import com.android.bedstead.harrier.annotations.PermissionTest;
+import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
+import com.android.bedstead.testapp.BaseTestAppActivity;
+import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppActivityReference;
+import com.android.bedstead.testapp.TestAppInstance;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public class ActivityTest {
+    private static final int EMPTY_REQUEST_CODE = 0;
+    private static final int REQUEST_CODE = 123;
+
+    private static final int ACTIVITY_RESULT_VALUE = 5;
+
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final TestApp sTestApp = sDeviceState.testApps().query()
+            .whereActivities()
+            .contains(activity().exported().isTrue())
+            .get();
+
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile // Activities need to start on both users
+    @PermissionTest({INTERACT_ACROSS_USERS, INTERACT_ACROSS_USERS_FULL})
+    public void startActivityForResultAsUser_differentUser_startedSuccessfully()
+            throws InterruptedException {
+        try (TestAppInstance instance = sTestApp.install(sDeviceState.workProfile())) {
+            TestAppActivityReference activityReference =
+                    instance.activities().query()
+                            .whereActivity().exported().isTrue()
+                            .get();
+
+            ActivityContext.runWithContext(activity -> {
+                Intent intent = new Intent();
+                intent.setComponent(activityReference.component().componentName());
+                activity.startActivityForResultAsUser(intent, EMPTY_REQUEST_CODE,
+                        sDeviceState.workProfile().userHandle());
+            });
+
+            assertThat(activityReference.events().activityStarted()).eventOccurred();
+        }
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile // Activities need to start on both users
+    @EnsureHasPermission(INTERACT_ACROSS_USERS_FULL)
+    public void startActivityForResultAsUser_requestCodeAndResultPassedSuccessfully()
+            throws InterruptedException {
+        try (TestAppInstance instance = sTestApp.install(sDeviceState.workProfile())) {
+            TestAppActivityReference activityReference =
+                    instance.activities().query()
+                            .whereActivity().exported().isTrue()
+                            .get();
+
+            ActivityContext.runWithContext(
+                    activity -> {
+                        Intent intent = new Intent();
+                        intent.setComponent(activityReference.component().componentName());
+                        intent.putExtra(BaseTestAppActivity.ACTIVITY_RESULT_KEY,
+                                ACTIVITY_RESULT_VALUE);
+                        activity.startActivityForResultAsUser(intent, REQUEST_CODE,
+                                sDeviceState.workProfile().userHandle());
+                    },
+                    activity -> {
+                        try {
+                            ActivityContext.ActivityResult result =
+                                    activity.blockForActivityResult();
+                            assertThat(result.getRequestCode()).isEqualTo(REQUEST_CODE);
+                            assertThat(result.getResultCode()).isEqualTo(ACTIVITY_RESULT_VALUE);
+                        } catch (InterruptedException e) {
+                            throw new AssertionError(e.getMessage());
+                        }
+                    });
+        }
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile // Activities need to start on both users
+    @EnsureDoesNotHavePermission(
+            {INTERACT_ACROSS_USERS, INTERACT_ACROSS_USERS_FULL})
+    public void startActivityForResultAsUser_noPermissions_throwsSecurityException() {
+        try (TestAppInstance instance = sTestApp.install(sDeviceState.workProfile())) {
+            TestAppActivityReference activityReference =
+                    instance.activities().query()
+                            .whereActivity().exported().isTrue()
+                            .get();
+
+            assertThrows(SecurityException.class, () ->
+                    ActivityContext.runWithContext(activity -> {
+                        Intent intent = new Intent();
+                        intent.setComponent(activityReference.component().componentName());
+                        activity.startActivityForResultAsUser(intent, EMPTY_REQUEST_CODE,
+                                sDeviceState.workProfile().userHandle());
+                    })
+            );
+        }
+    }
+
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile // Activities need to start on both users
+    @PermissionTest({INTERACT_ACROSS_USERS, INTERACT_ACROSS_USERS_FULL})
+    public void startActivityAsUser_differentUser_startedSuccessfully()
+            throws InterruptedException {
+        Bundle options = new Bundle();
+        try (TestAppInstance instance = sTestApp.install(sDeviceState.workProfile())) {
+            TestAppActivityReference activityReference =
+                    instance.activities().query()
+                            .whereActivity().exported().isTrue()
+                            .get();
+
+            ActivityContext.runWithContext(activity -> {
+                Intent intent = new Intent();
+                intent.setComponent(activityReference.component().componentName());
+                activity.startActivityAsUser(intent, options,
+                        sDeviceState.workProfile().userHandle());
+            });
+
+            assertThat(activityReference.events().activityStarted()).eventOccurred();
+        }
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile // Activities need to start on both users
+    @EnsureDoesNotHavePermission(
+            {INTERACT_ACROSS_USERS, INTERACT_ACROSS_USERS_FULL})
+    public void startActivityAsUser_noPermissions_throwsSecurityException() {
+        Bundle options = new Bundle();
+        try (TestAppInstance instance = sTestApp.install(sDeviceState.workProfile())) {
+            TestAppActivityReference activityReference =
+                    instance.activities().query()
+                            .whereActivity().exported().isTrue()
+                            .get();
+
+            assertThrows(SecurityException.class, () ->
+                    ActivityContext.runWithContext(activity -> {
+                        Intent intent = new Intent();
+                        intent.setComponent(activityReference.component().componentName());
+                        activity.startActivityAsUser(intent, options,
+                                sDeviceState.workProfile().userHandle());
+                    })
+            );
+        }
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/ApplicationRestrictionsTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/ApplicationRestrictionsTest.java
index 0c054e3..f3adec0 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/ApplicationRestrictionsTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/ApplicationRestrictionsTest.java
@@ -15,6 +15,7 @@
  */
 package android.devicepolicy.cts;
 
+import static android.content.Context.RECEIVER_EXPORTED;
 import static android.content.Intent.ACTION_APPLICATION_RESTRICTIONS_CHANGED;
 
 import static com.android.bedstead.metricsrecorder.truth.MetricQueryBuilderSubject.assertThat;
@@ -37,18 +38,16 @@
 import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
 import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.NegativePolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyDoesNotApplyTest;
 import com.android.bedstead.harrier.policies.ApplicationRestrictions;
 import com.android.bedstead.harrier.policies.ApplicationRestrictionsManagingPackage;
 import com.android.bedstead.metricsrecorder.EnterpriseMetricsRecorder;
 import com.android.bedstead.testapp.TestApp;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.Arrays;
@@ -66,10 +65,9 @@
             "<JSON>\"{ \\\"One\\\": { \\\"OneOne\\\": \\\"11\\\", \\\""
                     + "OneTwo\\\": \\\"12\\\" }, \\\"Two\\\": \\\"2\\\" } <JSON/>\""
     };
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
 
-    private static final TestApp sTestApp = sTestAppProvider.any();
-    private static final TestApp sDifferentTestApp = sTestAppProvider.any();
+    private static final TestApp sTestApp = sDeviceState.testApps().any();
+    private static final TestApp sDifferentTestApp = sDeviceState.testApps().any();
 
     // Should be consistent with assertEqualToBundle
     private static Bundle createBundle(String id) {
@@ -102,9 +100,8 @@
         return result;
     }
 
-    @Test
     @Postsubmit(reason = "New test")
-    @PositivePolicyTest(policy = ApplicationRestrictions.class)
+    @PolicyAppliesTest(policy = ApplicationRestrictions.class)
     public void setApplicationRestrictions_applicationRestrictionsAreSet() {
         Bundle originalApplicationRestrictions =
                 sDeviceState.dpc().devicePolicyManager()
@@ -127,9 +124,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "New test")
-    @PositivePolicyTest(policy = ApplicationRestrictions.class)
+    @PolicyAppliesTest(policy = ApplicationRestrictions.class)
     public void setApplicationRestrictions_applicationRestrictionsAlreadySet_setsNewRestrictions() {
         Bundle originalApplicationRestrictions =
                 sDeviceState.dpc().devicePolicyManager()
@@ -156,7 +152,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "New test")
     @CanSetPolicyTest(policy = ApplicationRestrictions.class)
     public void getApplicationRestrictions_applicationRestrictionsAreSet_returnsApplicationRestrictions() {
@@ -182,7 +177,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "New test")
     @CanSetPolicyTest(policy = ApplicationRestrictions.class)
     public void getApplicationRestrictions_differentPackage_throwsException() {
@@ -208,7 +202,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "New test")
     @CanSetPolicyTest(policy = ApplicationRestrictions.class)
     public void getApplicationRestrictions_setForOtherPackage_returnsNull() {
@@ -234,9 +227,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "New test")
-    @NegativePolicyTest(policy = ApplicationRestrictions.class)
+    @PolicyDoesNotApplyTest(policy = ApplicationRestrictions.class)
     public void setApplicationRestrictions_policyDoesNotApply_applicationRestrictionsAreNotSet() {
         Bundle originalApplicationRestrictions =
                 sDeviceState.dpc().devicePolicyManager().getApplicationRestrictions(
@@ -258,7 +250,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "New test")
     @CannotSetPolicyTest(policy = ApplicationRestrictions.class)
     public void setApplicationRestrictions_cannotSetPolicy_throwsException() {
@@ -271,7 +262,6 @@
         });
     }
 
-    @Test
     @Postsubmit(reason = "New test")
     @CannotSetPolicyTest(policy = ApplicationRestrictions.class)
     public void getApplicationRestrictions_cannotSetPolicy_throwsException() {
@@ -282,7 +272,6 @@
         });
     }
 
-    @Test
     @Postsubmit(reason = "New test")
     @CanSetPolicyTest(policy = ApplicationRestrictions.class, singleTestOnly = true)
     public void setApplicationRestrictions_nullComponent_throwsException() {
@@ -292,9 +281,8 @@
                         sTestApp.packageName(), bundle));
     }
 
-    @Test
     @Postsubmit(reason = "New test")
-    @PositivePolicyTest(policy = ApplicationRestrictions.class)
+    @PolicyAppliesTest(policy = ApplicationRestrictions.class)
     public void setApplicationRestrictions_restrictionsChangedBroadcastIsReceived() {
         Bundle originalApplicationRestrictions =
                 sDeviceState.dpc().devicePolicyManager()
@@ -303,7 +291,8 @@
         Bundle bundle = createBundle("setApplicationRestrictions_restrictionsChangedBroadcastIsReceived");
 
         try (TestAppInstance testApp = sTestApp.install()) {
-            testApp.registerReceiver(new IntentFilter(ACTION_APPLICATION_RESTRICTIONS_CHANGED));
+            testApp.registerReceiver(new IntentFilter(ACTION_APPLICATION_RESTRICTIONS_CHANGED),
+                    RECEIVER_EXPORTED);
 
             sDeviceState.dpc().devicePolicyManager()
                     .setApplicationRestrictions(
@@ -319,7 +308,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "New test")
     @CanSetPolicyTest(policy = ApplicationRestrictionsManagingPackage.class)
     public void setApplicationRestrictionsManagingPackage_applicationRestrictionsManagingPackageIsSet()
@@ -341,7 +329,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "New test")
     @CanSetPolicyTest(policy = ApplicationRestrictionsManagingPackage.class)
     public void setApplicationRestrictionsManagingPackage_appNotInstalled_throwsException() {
@@ -354,9 +341,8 @@
                                 sDifferentTestApp.packageName()));
     }
 
-    @Test
     @Postsubmit(reason = "New test")
-    @PositivePolicyTest(policy = ApplicationRestrictions.class)
+    @PolicyAppliesTest(policy = ApplicationRestrictions.class)
     public void setApplicationRestrictions_logged() {
         Bundle originalApplicationRestrictions =
                 sDeviceState.dpc().devicePolicyManager()
@@ -422,21 +408,21 @@
     private void assertBooleanKey(Bundle bundle, String key, boolean expectedValue) {
         boolean value = bundle.getBoolean(key);
         Log.v(TAG, "assertBooleanKey(): " + key + "=" + value);
-        assertWithMessage("bundle's '%s' key")
+        assertWithMessage("bundle's '%s' key", key)
                 .that(value).isEqualTo(expectedValue);
     }
 
     private void assertIntKey(Bundle bundle, String key, int expectedValue) {
         int value = bundle.getInt(key);
         Log.v(TAG, "assertIntKey(): " + key + "=" + value);
-        assertWithMessage("bundle's '%s' key")
+        assertWithMessage("bundle's '%s' key", key)
                 .that(value).isEqualTo(expectedValue);
     }
 
     private void assertStringKey(Bundle bundle, String key, String expectedValue) {
         String value = bundle.getString(key);
         Log.v(TAG, "assertStringKey(): " + key + "=" + value);
-        assertWithMessage("bundle's '%s' key")
+        assertWithMessage("bundle's '%s' key", key)
                 .that(value).isEqualTo(expectedValue);
     }
 
@@ -445,14 +431,14 @@
         Log.v(TAG, "assertStringsKey(): " + key + "="
                 + (value == null ? "null" : Arrays.toString(value)));
 
-        assertWithMessage("bundle's '%s' key").that(value).asList()
+        assertWithMessage("bundle's '%s' key", key).that(value).asList()
                 .containsExactlyElementsIn(expectedValue).inOrder();
     }
 
     private Bundle getBundleKey(Bundle bundle, String key) {
         Bundle value = bundle.getBundle(key);
         Log.v(TAG, "getBundleKey(): " + key + "=" + value);
-        assertWithMessage("bundle's '%s' key").that(value).isNotNull();
+        assertWithMessage("bundle's '%s' key", key).that(value).isNotNull();
         return value;
     }
 
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/BackupTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/BackupTest.java
new file mode 100644
index 0000000..f63c806
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/BackupTest.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+
+import static com.android.bedstead.nene.packages.CommonPackages.FEATURE_BACKUP;
+import static com.android.bedstead.nene.permissions.CommonPermissions.BACKUP;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.testng.Assert.assertThrows;
+
+import android.app.backup.BackupManager;
+import android.content.Context;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.RequireFeature;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyDoesNotApplyTest;
+import com.android.bedstead.harrier.policies.Backup;
+import com.android.bedstead.nene.TestApis;
+
+import org.junit.ClassRule;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+@RequireFeature(FEATURE_BACKUP)
+public final class BackupTest {
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final BackupManager sLocalBackupManager = new BackupManager(sContext);
+
+    @PolicyAppliesTest(policy = Backup.class)
+    @EnsureHasPermission(BACKUP)
+    @Postsubmit(reason = "new test")
+    public void isBackupEnabled_default_returnsFalse() {
+        assertThat(sLocalBackupManager.isBackupEnabled()).isFalse();
+    }
+
+    @PolicyAppliesTest(policy = Backup.class)
+    @Postsubmit(reason = "new test")
+    public void isBackupServiceEnabled_default_returnsFalse() {
+        assertThat(sDeviceState.dpc().devicePolicyManager().isBackupServiceEnabled(
+                sDeviceState.dpc().componentName())).isFalse();
+    }
+
+    @PolicyAppliesTest(policy = Backup.class)
+    @Postsubmit(reason = "new test")
+    @EnsureHasPermission(BACKUP)
+    public void setBackupServiceEnabled_true_setsBackupServiceEnabled() {
+        try {
+            sDeviceState.dpc().devicePolicyManager().setBackupServiceEnabled(
+                    sDeviceState.dpc().componentName(), true);
+
+            assertThat(sDeviceState.dpc().devicePolicyManager().isBackupServiceEnabled(
+                    sDeviceState.dpc().componentName())).isTrue();
+            assertThat(sLocalBackupManager
+                    .isBackupServiceActive(TestApis.users().instrumented().userHandle())).isTrue();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setBackupServiceEnabled(
+                    sDeviceState.dpc().componentName(), false);
+        }
+    }
+
+    @PolicyAppliesTest(policy = Backup.class)
+    @Postsubmit(reason = "new test")
+    @EnsureHasPermission(BACKUP)
+    public void setBackupServiceEnabled_false_setsBackupServiceNotEnabled() {
+        try {
+            sDeviceState.dpc().devicePolicyManager().setBackupServiceEnabled(
+                    sDeviceState.dpc().componentName(), false);
+
+            assertThat(sDeviceState.dpc().devicePolicyManager().isBackupServiceEnabled(
+                    sDeviceState.dpc().componentName())).isFalse();
+            assertThat(sLocalBackupManager
+                    .isBackupServiceActive(TestApis.users().instrumented().userHandle())).isFalse();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setBackupServiceEnabled(
+                    sDeviceState.dpc().componentName(), false);
+        }
+    }
+
+    @PolicyDoesNotApplyTest(policy = Backup.class)
+    @Postsubmit(reason = "new test")
+    @EnsureHasPermission(BACKUP)
+    @Ignore("b/221087493 weird behavior regarding if it applies to a parent of a profile owner")
+    public void setBackupServiceEnabled_doesNotApply_doesNotSetBackupServiceEnabled() {
+        try {
+            sDeviceState.dpc().devicePolicyManager().setBackupServiceEnabled(
+                    sDeviceState.dpc().componentName(), true);
+
+            assertThat(sLocalBackupManager
+                    .isBackupServiceActive(TestApis.users().instrumented().userHandle())).isFalse();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setBackupServiceEnabled(
+                    sDeviceState.dpc().componentName(), false);
+        }
+    }
+
+    @CannotSetPolicyTest(policy = Backup.class, includeNonDeviceAdminStates = false)
+    @Postsubmit(reason = "new test")
+    public void setBackupServiceEnabled_cannotSetPolicy_throwsException() {
+        assertThrows(SecurityException.class, () -> {
+            sDeviceState.dpc().devicePolicyManager().setBackupServiceEnabled(
+                    sDeviceState.dpc().componentName(), true);
+        });
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/BlockUninstallTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/BlockUninstallTest.java
new file mode 100644
index 0000000..8b0b041
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/BlockUninstallTest.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static com.android.bedstead.metricsrecorder.truth.MetricQueryBuilderSubject.assertThat;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.app.admin.DevicePolicyManager;
+import android.stats.devicepolicy.EventId;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.AfterClass;
+import com.android.bedstead.harrier.annotations.BeforeClass;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyDoesNotApplyTest;
+import com.android.bedstead.harrier.policies.BlockUninstall;
+import com.android.bedstead.metricsrecorder.EnterpriseMetricsRecorder;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.testapp.TestApp;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public class BlockUninstallTest {
+    @ClassRule @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final TestApp sTestApp = sDeviceState.testApps().any();
+
+    private static final String NOT_INSTALLED_PACKAGE_NAME = "not.installed.package";
+
+    private static final DevicePolicyManager sLocalDevicePolicyManager =
+            TestApis.context().instrumentedContext().getSystemService(DevicePolicyManager.class);
+
+    @BeforeClass
+    public static void setupClass() {
+        sTestApp.install();
+    }
+
+    @AfterClass
+    public static void teardownClass() {
+        sTestApp.uninstallFromAllUsers();
+    }
+
+    @Postsubmit(reason = "new test")
+    @CannotSetPolicyTest(policy = BlockUninstall.class)
+    public void setUninstallBlocked_notAllowed_throwsException() {
+        assertThrows(SecurityException.class, () -> {
+            sDeviceState.dpc().devicePolicyManager().setUninstallBlocked(
+                    sDeviceState.dpc().componentName(),
+                    sTestApp.packageName(), /* uninstallBlocked= */ true);
+        });
+    }
+
+    @Postsubmit(reason = "new test")
+    @PolicyAppliesTest(policy = BlockUninstall.class)
+    public void setUninstallBlocked_true_isUninstallBlockedIsTrue() {
+        try {
+            sDeviceState.dpc().devicePolicyManager().setUninstallBlocked(
+                    sDeviceState.dpc().componentName(),
+                    sTestApp.packageName(), /* uninstallBlocked= */ true
+            );
+
+            assertThat(sDeviceState.dpc().devicePolicyManager().isUninstallBlocked(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName()
+            )).isTrue();
+            assertThat(sLocalDevicePolicyManager.isUninstallBlocked(/* admin= */ null,
+                    sTestApp.packageName())).isTrue();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setUninstallBlocked(
+                    sDeviceState.dpc().componentName(),
+                    sTestApp.packageName(), /* uninstallBlocked= */ false
+            );
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @PolicyDoesNotApplyTest(policy = BlockUninstall.class)
+    public void setUninstallBlocked_true_isUninstallBlockedIsFalse() {
+        try {
+            sDeviceState.dpc().devicePolicyManager().setUninstallBlocked(
+                    sDeviceState.dpc().componentName(),
+                    sTestApp.packageName(), /* uninstallBlocked= */ true
+            );
+
+            assertThat(sDeviceState.dpc().devicePolicyManager().isUninstallBlocked(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName()
+            )).isTrue();
+            assertThat(sLocalDevicePolicyManager.isUninstallBlocked(/* admin= */ null,
+                    sTestApp.packageName())).isFalse();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setUninstallBlocked(
+                    sDeviceState.dpc().componentName(),
+                    sTestApp.packageName(), /* uninstallBlocked= */ false
+            );
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @PolicyAppliesTest(policy = BlockUninstall.class)
+    public void setUninstallBlocked_false_isUninstallBlockedIsFalse() {
+        sDeviceState.dpc().devicePolicyManager().setUninstallBlocked(
+                sDeviceState.dpc().componentName(),
+                sTestApp.packageName(), /* uninstallBlocked= */ false
+        );
+
+        assertThat(sDeviceState.dpc().devicePolicyManager().isUninstallBlocked(
+                sDeviceState.dpc().componentName(), sTestApp.packageName()
+        )).isFalse();
+        assertThat(sLocalDevicePolicyManager.isUninstallBlocked(/* admin= */ null,
+                sTestApp.packageName())).isFalse();
+    }
+
+    @Postsubmit(reason = "new test")
+    @CanSetPolicyTest(policy = BlockUninstall.class)
+    public void setUninstallBlocked_true_appIsNotInstalled_silentlyFails() {
+        sDeviceState.dpc().devicePolicyManager().setUninstallBlocked(
+                sDeviceState.dpc().componentName(),
+                NOT_INSTALLED_PACKAGE_NAME, /* uninstallBlocked= */ true
+        );
+
+        assertThat(sDeviceState.dpc().devicePolicyManager().isUninstallBlocked(
+                sDeviceState.dpc().componentName(), NOT_INSTALLED_PACKAGE_NAME
+        )).isFalse();
+    }
+
+    @Postsubmit(reason = "new test")
+    @CanSetPolicyTest(policy = BlockUninstall.class)
+    public void setUninstallBlocked_logged() {
+        try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
+            sDeviceState.dpc().devicePolicyManager().setUninstallBlocked(
+                    sDeviceState.dpc().componentName(),
+                    sTestApp.packageName(), /* uninstallBlocked= */ true
+            );
+
+            assertThat(metrics.query()
+                            .whereType().isEqualTo(EventId.SET_UNINSTALL_BLOCKED_VALUE)
+                            .whereAdminPackageName().isEqualTo(
+                                    sDeviceState.dpc().packageName())
+                            .whereStrings().contains(sTestApp.packageName())
+                            .whereStrings().size().isEqualTo(1)
+                            .whereBoolean().isEqualTo(sDeviceState.dpc().isDelegate())
+                            ).wasLogged();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setUninstallBlocked(
+                    sDeviceState.dpc().componentName(),
+                    sTestApp.packageName(), /* uninstallBlocked= */ false
+            );
+        }
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/BluetoothTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/BluetoothTest.java
new file mode 100644
index 0000000..55a111e
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/BluetoothTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+
+import static com.android.bedstead.nene.packages.CommonPackages.FEATURE_BLUETOOTH;
+import static com.android.bedstead.nene.permissions.CommonPermissions.BLUETOOTH_CONNECT;
+import static com.android.bedstead.nene.permissions.CommonPermissions.LOCAL_MAC_ADDRESS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothManager;
+import android.bluetooth.BluetoothServerSocket;
+import android.content.Context;
+import android.content.Intent;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureBluetoothDisabled;
+import com.android.bedstead.harrier.annotations.EnsureBluetoothEnabled;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.RequireFeature;
+import com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.policies.Bluetooth;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.permissions.PermissionContext;
+import com.android.bedstead.nene.utils.Poll;
+import com.android.compatibility.common.util.BlockingBroadcastReceiver;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.util.UUID;
+
+@RunWith(BedsteadJUnit4.class)
+@RequireFeature(FEATURE_BLUETOOTH)
+public final class BluetoothTest {
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+
+    private static final BluetoothManager sBluetoothManager =
+            sContext.getSystemService(BluetoothManager.class);
+    private static final BluetoothAdapter sBluetoothAdapter = sBluetoothManager.getAdapter();
+
+    private static final String VALID_ADDRESS = "01:02:03:04:05:06";
+    private static final byte[] VALID_ADDRESS_BYTES =
+            new byte[] {0x01, 0x02, 0x03, 0x04, 0x05, 0x06};
+
+    @Postsubmit(reason = "new test")
+    @EnsureBluetoothEnabled
+    @PolicyAppliesTest(policy = Bluetooth.class)
+    public void disable_bluetoothIsDisabled() {
+        BlockingBroadcastReceiver r = sDeviceState.registerBroadcastReceiverForUser(
+                sDeviceState.dpc().user(), BluetoothAdapter.ACTION_STATE_CHANGED,
+                this::isStateDisabled);
+
+        try (PermissionContext p =
+                     sDeviceState.dpc().permissions().withPermission(BLUETOOTH_CONNECT)) {
+            assertThat(sDeviceState.dpc().bluetoothManager().getAdapter().disable()).isTrue();
+            r.awaitForBroadcast();
+
+            Poll.forValue("Bluetooth Enabled for DPC",
+                    () -> sDeviceState.dpc().bluetoothManager().getAdapter().isEnabled())
+                    .toBeEqualTo(false)
+                    .errorOnFail()
+                    .await();
+            assertThat(TestApis.bluetooth().isEnabled()).isFalse();
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @EnsureBluetoothDisabled
+    @PolicyAppliesTest(policy = Bluetooth.class)
+    public void enable_bluetoothIsEnabled() {
+        BlockingBroadcastReceiver r = sDeviceState.registerBroadcastReceiverForUser(
+                sDeviceState.dpc().user(), BluetoothAdapter.ACTION_STATE_CHANGED,
+                this::isStateEnabled);
+
+        try (PermissionContext p =
+                     sDeviceState.dpc().permissions().withPermission(BLUETOOTH_CONNECT)) {
+            assertThat(sDeviceState.dpc().bluetoothManager().getAdapter().enable()).isTrue();
+            r.awaitForBroadcast();
+
+            Poll.forValue("Bluetooth Enabled for DPC",
+                    () -> sDeviceState.dpc().bluetoothManager().getAdapter().isEnabled())
+                    .toBeEqualTo(true)
+                    .errorOnFail()
+                    .await();
+            assertThat(TestApis.bluetooth().isEnabled()).isTrue();
+        }
+    }
+
+    @Test
+    @RequireRunOnWorkProfile
+    @EnsureHasPermission(BLUETOOTH_CONNECT)
+    @Postsubmit(reason = "new test")
+    @EnsureBluetoothEnabled
+    public void listenUsingRfcommWithServiceRecord_inManagedProfile_returnsValidSocket()
+            throws IOException {
+        BluetoothServerSocket socket = null;
+        try {
+            socket = sBluetoothAdapter.listenUsingRfcommWithServiceRecord(
+                    "test", UUID.randomUUID());
+
+            assertThat(socket).isNotNull();
+        } finally {
+            if (socket != null) {
+                socket.close();
+            }
+        }
+    }
+
+    private boolean isStateEnabled(Intent intent) {
+        return intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1)
+                == BluetoothAdapter.STATE_ON;
+    }
+
+    private boolean isStateDisabled(Intent intent) {
+        return intent.getIntExtra(BluetoothAdapter.EXTRA_STATE, -1)
+                == BluetoothAdapter.STATE_OFF;
+    }
+
+    @Test
+    @RequireRunOnWorkProfile
+    @EnsureHasPermission({LOCAL_MAC_ADDRESS, BLUETOOTH_CONNECT})
+    @Postsubmit(reason = "new test")
+    @EnsureBluetoothEnabled
+    public void getAddress_inManagedProfile_returnsValidAddress() {
+        assertThat(BluetoothAdapter.checkBluetoothAddress(sBluetoothAdapter.getAddress())).isTrue();
+    }
+
+    @Test
+    @RequireRunOnWorkProfile
+    @Postsubmit(reason = "new test")
+    @EnsureBluetoothDisabled // This method should work even with bluetooth disabled
+    public void getRemoteDevice_inManagedProfile_validAddress_works() {
+        BluetoothDevice device = sBluetoothAdapter.getRemoteDevice(VALID_ADDRESS);
+
+        assertThat(device.getAddress()).isEqualTo(VALID_ADDRESS);
+    }
+
+    @Test
+    @RequireRunOnWorkProfile
+    @Postsubmit(reason = "new test")
+    @EnsureBluetoothDisabled // This method should work even with bluetooth disabled
+    public void getRemoteDevice_inManagedProfile_validAddressBytes_works() {
+        BluetoothDevice device = sBluetoothAdapter.getRemoteDevice(VALID_ADDRESS_BYTES);
+
+        assertThat(device.getAddress()).isEqualTo(VALID_ADDRESS);
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/CaCertManagementTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/CaCertManagementTest.java
index 9fe4b36..81d9dd6 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/CaCertManagementTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/CaCertManagementTest.java
@@ -17,19 +17,23 @@
 package android.devicepolicy.cts;
 
 import static com.android.bedstead.metricsrecorder.truth.MetricQueryBuilderSubject.assertThat;
-import static com.android.bedstead.remotedpc.RemoteDpc.DPC_COMPONENT_NAME;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.testng.Assert.assertThrows;
+
 import android.app.admin.DevicePolicyManager;
 import android.app.admin.RemoteDevicePolicyManager;
 import android.net.http.X509TrustManagerExtensions;
 import android.stats.devicepolicy.EventId;
+import android.util.Base64;
+import android.util.Base64InputStream;
 
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
 import com.android.bedstead.harrier.policies.CaCertManagement;
 import com.android.bedstead.metricsrecorder.EnterpriseMetricsRecorder;
 import com.android.bedstead.nene.utils.Poll;
@@ -37,16 +41,18 @@
 
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.io.ByteArrayInputStream;
 import java.security.GeneralSecurityException;
+import java.security.KeyFactory;
 import java.security.KeyStore;
+import java.security.PrivateKey;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateException;
 import java.security.cert.CertificateFactory;
 import java.security.cert.X509Certificate;
+import java.security.spec.PKCS8EncodedKeySpec;
 import java.util.Arrays;
 
 import javax.net.ssl.TrustManager;
@@ -62,130 +68,242 @@
     @Rule
     public static final DeviceState sDeviceState = new DeviceState();
 
-    public static final byte[] CA_CERT_1 = FakeKeys.FAKE_RSA_1.caCertificate;
-    public static final byte[] CA_CERT_2 = FakeKeys.FAKE_DSA_1.caCertificate;
+    private static final byte[] CA_CERT_1 = FakeKeys.FAKE_RSA_1.caCertificate;
+    private static final byte[] CA_CERT_2 = FakeKeys.FAKE_DSA_1.caCertificate;
+    private static final String ALIAS = "alias";
 
-    @Test
+    // Content from userkey.pem without the private key header and footer.
+    private static final String TEST_KEY =
+            "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBALCYprGsTU+5L3KM\n"
+                    + "fhkm0gXM2xjGUH+543YLiMPGVr3eVS7biue1/tQlL+fJsw3rqsPKJe71RbVWlpqU\n"
+                    + "mhegxG4s3IvGYVB0KZoRIjDKmnnvlx6nngL2ZJ8O27U42pHsw4z4MKlcQlWkjL3T\n"
+                    + "9sV6zW2Wzri+f5mvzKjhnArbLktHAgMBAAECgYBlfVVPhtZnmuXJzzQpAEZzTugb\n"
+                    + "tN1OimZO0RIocTQoqj4KT+HkiJOLGFQPwbtFpMre+q4SRqNpM/oZnI1yRtKcCmIc\n"
+                    + "mZgkwJ2k6pdSxqO0ofxFFTdT9czJ3rCnqBHy1g6BqUQFXT4olcygkxUpKYUwzlz1\n"
+                    + "oAl487CoPxyr4sVEAQJBANwiUOHcdGd2RoRILDzw5WOXWBoWPOKzX/K9wt0yL+mO\n"
+                    + "wlFNFSymqo9eLheHcEq/VD9qK9rT700dCewJfWj6+bECQQDNXmWNYIxGii5NJilT\n"
+                    + "OBOHiMD/F0NE178j+/kmacbhDJwpkbLYXaP8rW4+Iswrm4ORJ59lvjNuXaZ28+sx\n"
+                    + "fFp3AkA6Z7Bl/IO135+eATgbgx6ZadIqObQ1wbm3Qbmtzl7/7KyJvZXcnuup1icM\n"
+                    + "fxa//jtwB89S4+Ad6ZJ0WaA4dj5BAkEAuG7V9KmIULE388EZy8rIfyepa22Q0/qN\n"
+                    + "hdt8XasRGHsio5Jdc0JlSz7ViqflhCQde/aBh/XQaoVgQeO8jKyI8QJBAJHekZDj\n"
+                    + "WA0w1RsBVVReN1dVXgjm1CykeAT8Qx8TUmBUfiDX6w6+eGQjKtS7f4KC2IdRTV6+\n"
+                    + "bDzDoHBChHNC9ms=\n";
+
+    // Content from usercert.pem without the header and footer.
+    private static final String TEST_CERT =
+            "MIIDEjCCAfqgAwIBAgIBATANBgkqhkiG9w0BAQsFADBFMQswCQYDVQQGEwJBVTET\n"
+                    + "MBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQ\n"
+                    + "dHkgTHRkMB4XDTE1MDUwMTE2NTQwNVoXDTI1MDQyODE2NTQwNVowWzELMAkGA1UE\n"
+                    + "BhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdp\n"
+                    + "ZGdpdHMgUHR5IEx0ZDEUMBIGA1UEAwwLY2xpZW50IGNlcnQwgZ8wDQYJKoZIhvcN\n"
+                    + "AQEBBQADgY0AMIGJAoGBALCYprGsTU+5L3KMfhkm0gXM2xjGUH+543YLiMPGVr3e\n"
+                    + "VS7biue1/tQlL+fJsw3rqsPKJe71RbVWlpqUmhegxG4s3IvGYVB0KZoRIjDKmnnv\n"
+                    + "lx6nngL2ZJ8O27U42pHsw4z4MKlcQlWkjL3T9sV6zW2Wzri+f5mvzKjhnArbLktH\n"
+                    + "AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wgR2Vu\n"
+                    + "ZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQ8GL+jKSarvTn9fVNA2AzjY7qq\n"
+                    + "gjAfBgNVHSMEGDAWgBRzBBA5sNWyT/fK8GrhN3tOqO5tgjANBgkqhkiG9w0BAQsF\n"
+                    + "AAOCAQEAgwQEd2bktIDZZi/UOwU1jJUgGq7NiuBDPHcqgzjxhGFLQ8SQAAP3v3PR\n"
+                    + "mLzcfxsxnzGynqN5iHQT4rYXxxaqrp1iIdj9xl9Wl5FxjZgXITxhlRscOd/UOBvG\n"
+                    + "oMrazVczjjdoRIFFnjtU3Jf0Mich68HD1Z0S3o7X6sDYh6FTVR5KbLcxbk6RcoG4\n"
+                    + "VCI5boR5LUXgb5Ed5UxczxvN12S71fyxHYVpuuI0z0HTIbAxKeRw43I6HWOmR1/0\n"
+                    + "G6byGCNL/1Fz7Y+264fGqABSNTKdZwIU2K4ANEH7F+9scnhoO6OBp+gjBe5O+7jb\n"
+                    + "wZmUCAoTka4hmoaOCj7cqt/IkmxozQ==\n";
+
     @CanSetPolicyTest(policy = CaCertManagement.class)
     public void getInstalledCaCerts_doesNotReturnNull() throws Exception {
         assertThat(sDeviceState.dpc().devicePolicyManager().getInstalledCaCerts(
-                DPC_COMPONENT_NAME)).isNotNull();
+                sDeviceState.dpc().componentName())).isNotNull();
     }
 
-    @Test
-    @PositivePolicyTest(policy = CaCertManagement.class)
+    @CannotSetPolicyTest(policy = CaCertManagement.class)
+    public void getInstalledCaCerts_invalidAdmin_throwsException() throws Exception {
+        assertThrows(SecurityException.class, () ->
+                sDeviceState.dpc().devicePolicyManager().getInstalledCaCerts(
+                sDeviceState.dpc().componentName()));
+    }
+
+    @PolicyAppliesTest(policy = CaCertManagement.class)
     public void installCaCert_caCertIsInstalled() throws Exception {
         RemoteDevicePolicyManager remoteDpm = sDeviceState.dpc().devicePolicyManager();
         try {
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
 
             boolean result = remoteDpm.installCaCert(
-                    DPC_COMPONENT_NAME, CA_CERT_1);
+                    sDeviceState.dpc().componentName(), CA_CERT_1);
 
             assertThat(result).isTrue();
             assertCaCertInstalledForTheDpcAndLocally(CA_CERT_1);
         } finally {
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = CaCertManagement.class)
+    @CannotSetPolicyTest(policy = CaCertManagement.class)
+    public void installCaCert_invalidAdmin_throwsException() throws Exception {
+        assertThrows(SecurityException.class,
+                () -> sDeviceState.dpc().devicePolicyManager().installCaCert(
+                    sDeviceState.dpc().componentName(), CA_CERT_1));
+    }
+
+    @PolicyAppliesTest(policy = CaCertManagement.class)
     public void installCaCert_logsEvent() throws Exception {
         RemoteDevicePolicyManager remoteDpm = sDeviceState.dpc().devicePolicyManager();
         try {
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
 
             try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
-                remoteDpm.installCaCert(DPC_COMPONENT_NAME, CA_CERT_1);
+                remoteDpm.installCaCert(sDeviceState.dpc().componentName(), CA_CERT_1);
 
                 assertThat(metrics.query()
                         .whereType().isEqualTo(EventId.INSTALL_CA_CERT_VALUE)
-                        .whereAdminPackageName().isEqualTo(DPC_COMPONENT_NAME.getPackageName())
-                        .whereBoolean().isFalse()
+                        .whereAdminPackageName().isEqualTo(sDeviceState.dpc().packageName())
+                        .whereBoolean().isEqualTo(sDeviceState.dpc().isDelegate())
                 ).wasLogged();
             }
         } finally {
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = CaCertManagement.class)
+    @PolicyAppliesTest(policy = CaCertManagement.class)
     public void uninstallCaCert_caCertIsNotInstalled() throws Exception {
         RemoteDevicePolicyManager remoteDpm = sDeviceState.dpc().devicePolicyManager();
         try {
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
-            remoteDpm.installCaCert(DPC_COMPONENT_NAME, CA_CERT_1);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
+            remoteDpm.installCaCert(sDeviceState.dpc().componentName(), CA_CERT_1);
 
-            remoteDpm.uninstallCaCert(DPC_COMPONENT_NAME, CA_CERT_1);
+            remoteDpm.uninstallCaCert(sDeviceState.dpc().componentName(), CA_CERT_1);
 
             assertCaCertNotInstalledForTheDpcOrLocally(CA_CERT_1);
         } finally {
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = CaCertManagement.class)
+    @PolicyAppliesTest(policy = CaCertManagement.class)
     public void uninstallCaCert_otherCaCertsAreNotUninstalled() throws Exception {
         RemoteDevicePolicyManager remoteDpm = sDeviceState.dpc().devicePolicyManager();
         try {
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
-            remoteDpm.installCaCert(DPC_COMPONENT_NAME, CA_CERT_1);
-            remoteDpm.installCaCert(DPC_COMPONENT_NAME, CA_CERT_2);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
+            remoteDpm.installCaCert(sDeviceState.dpc().componentName(), CA_CERT_1);
+            remoteDpm.installCaCert(sDeviceState.dpc().componentName(), CA_CERT_2);
 
-            remoteDpm.uninstallCaCert(DPC_COMPONENT_NAME, CA_CERT_1);
+            remoteDpm.uninstallCaCert(sDeviceState.dpc().componentName(), CA_CERT_1);
 
             assertCaCertInstalledForTheDpcAndLocally(CA_CERT_2);
         } finally {
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = CaCertManagement.class)
+    @CannotSetPolicyTest(policy = CaCertManagement.class)
+    public void uninstallCaCert_invalidAdmin_throwsException() throws Exception {
+        RemoteDevicePolicyManager remoteDpm = sDeviceState.dpc().devicePolicyManager();
+
+        assertThrows(SecurityException.class,
+                () -> remoteDpm.uninstallCaCert(sDeviceState.dpc().componentName(), CA_CERT_1));
+    }
+
+    @PolicyAppliesTest(policy = CaCertManagement.class)
     public void uninstallCaCert_logsEvent() throws Exception {
         RemoteDevicePolicyManager remoteDpm = sDeviceState.dpc().devicePolicyManager();
         try {
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
             try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
                 remoteDpm.installCaCert(
-                        DPC_COMPONENT_NAME, CA_CERT_1);
+                        sDeviceState.dpc().componentName(), CA_CERT_1);
 
                 remoteDpm.uninstallCaCert(
-                        DPC_COMPONENT_NAME, CA_CERT_1);
+                        sDeviceState.dpc().componentName(), CA_CERT_1);
 
                 assertThat(metrics.query()
                         .whereType().isEqualTo(EventId.UNINSTALL_CA_CERTS_VALUE)
-                        .whereAdminPackageName().isEqualTo(DPC_COMPONENT_NAME.getPackageName())
-                        .whereBoolean().isFalse()
+                        .whereAdminPackageName().isEqualTo(sDeviceState.dpc().packageName())
+                        .whereBoolean().isEqualTo(sDeviceState.dpc().isDelegate())
                 ).wasLogged();
             }
         } finally {
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = CaCertManagement.class)
+    @PolicyAppliesTest(policy = CaCertManagement.class)
     public void uninstallAllUserCaCerts_uninstallsAllCaCerts()
             throws Exception {
         RemoteDevicePolicyManager remoteDpm = sDeviceState.dpc().devicePolicyManager();
         try {
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
-            remoteDpm.installCaCert(DPC_COMPONENT_NAME, CA_CERT_1);
-            remoteDpm.installCaCert(DPC_COMPONENT_NAME, CA_CERT_2);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
+            remoteDpm.installCaCert(sDeviceState.dpc().componentName(), CA_CERT_1);
+            remoteDpm.installCaCert(sDeviceState.dpc().componentName(), CA_CERT_2);
 
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
 
             assertCaCertNotInstalledForTheDpcOrLocally(CA_CERT_1);
             assertCaCertNotInstalledForTheDpcOrLocally(CA_CERT_2);
         } finally {
-            remoteDpm.uninstallAllUserCaCerts(DPC_COMPONENT_NAME);
+            remoteDpm.uninstallAllUserCaCerts(sDeviceState.dpc().componentName());
         }
     }
 
+    @PolicyAppliesTest(policy = CaCertManagement.class)
+    public void installKeyPair_installsKeyPair() throws Exception {
+        PrivateKey privateKey = KeyFactory.getInstance("RSA").generatePrivate(
+                new PKCS8EncodedKeySpec(Base64.decode(TEST_KEY, Base64.DEFAULT)));
+
+        Certificate certificate = CertificateFactory.getInstance("X.509").generateCertificate(
+                new Base64InputStream(new ByteArrayInputStream(TEST_CERT.getBytes()),
+                        Base64.DEFAULT));
+
+        try {
+            boolean result = sDeviceState.dpc().devicePolicyManager()
+                    .installKeyPair(
+                            sDeviceState.dpc().componentName(), privateKey, certificate, ALIAS);
+            assertThat(result).isTrue();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpc().componentName(), ALIAS);
+        }
+    }
+
+    @CannotSetPolicyTest(policy = CaCertManagement.class)
+    public void installKeyPair_invalidAdmin_throwsException() throws Exception {
+        PrivateKey privateKey = KeyFactory.getInstance("RSA").generatePrivate(
+                new PKCS8EncodedKeySpec(Base64.decode(TEST_KEY, Base64.DEFAULT)));
+
+        Certificate certificate = CertificateFactory.getInstance("X.509").generateCertificate(
+                new Base64InputStream(new ByteArrayInputStream(TEST_CERT.getBytes()),
+                        Base64.DEFAULT));
+
+        assertThrows(SecurityException.class, () -> sDeviceState.dpc().devicePolicyManager()
+                .installKeyPair(
+                        sDeviceState.dpc().componentName(), privateKey, certificate, ALIAS));
+    }
+
+    @PolicyAppliesTest(policy = CaCertManagement.class)
+    public void removeKeyPair_removedKeyPair() throws Exception {
+        PrivateKey privateKey = KeyFactory.getInstance("RSA").generatePrivate(
+                new PKCS8EncodedKeySpec(Base64.decode(TEST_KEY, Base64.DEFAULT)));
+
+        Certificate certificate = CertificateFactory.getInstance("X.509").generateCertificate(
+                new Base64InputStream(new ByteArrayInputStream(TEST_CERT.getBytes()),
+                        Base64.DEFAULT));
+
+        sDeviceState.dpc().devicePolicyManager()
+                .installKeyPair(
+                        sDeviceState.dpc().componentName(), privateKey, certificate, ALIAS);
+
+        boolean result = sDeviceState.dpc().devicePolicyManager()
+                .removeKeyPair(sDeviceState.dpc().componentName(), ALIAS);
+        assertThat(result).isTrue();
+    }
+
+    @CannotSetPolicyTest(policy = CaCertManagement.class)
+    public void removeKeyPair_invalidAdmin_throwsException() throws Exception {
+        assertThrows(SecurityException.class,
+                () -> sDeviceState.dpc().devicePolicyManager()
+                        .removeKeyPair(sDeviceState.dpc().componentName(), ALIAS));
+    }
+
     private void assertCaCertInstalledForTheDpcAndLocally(byte[] caBytes)
             throws GeneralSecurityException {
         assertCaCertInstalledAndTrusted(caBytes, /* installed= */ true);
@@ -216,7 +334,8 @@
         Certificate caCert = readCertificate(caBytes);
         // All three responses should match - if an installed certificate isn't trusted or (worse)
         // a trusted certificate isn't even installed we should fail now, loudly.
-        boolean isInstalled = remoteDpm.hasCaCertInstalled(DPC_COMPONENT_NAME, caCert.getEncoded());
+        boolean isInstalled = remoteDpm.hasCaCertInstalled(
+                sDeviceState.dpc().componentName(), caCert.getEncoded());
         assertThat(isInstalled).isEqualTo(installed);
 
         assertThat(isCaCertListed(caCert)).isEqualTo(installed);
@@ -241,7 +360,8 @@
     private boolean isCaCertListed(Certificate caCert) throws CertificateException {
         boolean listed = false;
         RemoteDevicePolicyManager remoteDpm = sDeviceState.dpc().devicePolicyManager();
-        for (byte[] certBuffer : remoteDpm.getInstalledCaCerts(DPC_COMPONENT_NAME)) {
+        for (byte[] certBuffer :
+                remoteDpm.getInstalledCaCerts(sDeviceState.dpc().componentName())) {
             if (caCert.equals(readCertificate(certBuffer))) {
                 listed = true;
             }
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/CameraPolicyTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/CameraPolicyTest.java
index cbeeaad..1707e39 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/CameraPolicyTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/CameraPolicyTest.java
@@ -17,6 +17,7 @@
 package android.devicepolicy.cts;
 
 import static android.Manifest.permission.CAMERA;
+import static android.content.pm.PackageManager.FEATURE_CAMERA;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -35,25 +36,25 @@
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.EnsureHasPermission;
 import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.RequireFeature;
 import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
 import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.NegativePolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyDoesNotApplyTest;
 import com.android.bedstead.harrier.policies.CameraPolicy;
 import com.android.bedstead.nene.TestApis;
 import com.android.compatibility.common.util.PollingCheck;
 
-
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+@RequireFeature(FEATURE_CAMERA)
 @RunWith(BedsteadJUnit4.class)
 public final class CameraPolicyTest {
     @ClassRule
@@ -70,9 +71,8 @@
 
     private static final String TAG = "CameraUtils";
 
-    @Test
     @Postsubmit(reason = "new test")
-    @NegativePolicyTest(policy = CameraPolicy.class)
+    @PolicyDoesNotApplyTest(policy = CameraPolicy.class)
     public void setCameraDisabledTrue_policyDoesNotApply_cameraNotDisabled() {
         sDeviceState.dpc().devicePolicyManager()
                 .setCameraDisabled(sDeviceState.dpc().componentName(), true);
@@ -81,9 +81,8 @@
                 .getCameraDisabled(null)).isFalse();
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = CameraPolicy.class)
+    @PolicyAppliesTest(policy = CameraPolicy.class)
     public void setCameraDisabledTrue_cameraDisabledLocally() {
         sDeviceState.dpc().devicePolicyManager()
                 .setCameraDisabled(sDeviceState.dpc().componentName(), true);
@@ -92,9 +91,8 @@
                 .getCameraDisabled(null)).isTrue();
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = CameraPolicy.class)
+    @PolicyAppliesTest(policy = CameraPolicy.class)
     public void setCameraDisabledFalse_cameraEnabledLocally() {
         sDeviceState.dpc().devicePolicyManager()
                 .setCameraDisabled(sDeviceState.dpc().componentName(), false);
@@ -103,7 +101,6 @@
                 .getCameraDisabled(null)).isFalse();
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = CameraPolicy.class)
     public void setCameraDisabledTrue_cameraDisabledAtDPC() {
@@ -114,7 +111,6 @@
                 .getCameraDisabled(null)).isTrue();
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = CameraPolicy.class)
     public void setCameraDisabledFalse_cameraEnabledAtDPC() {
@@ -126,7 +122,6 @@
     }
 
     @Ignore("b/201753989 Properly define behaviour of setCameraDisabled on secondary user POs")
-    @Test
     @Postsubmit(reason = "new test")
     @CannotSetPolicyTest(policy = CameraPolicy.class)
     public void setCameraDisabledTrue_policyNotAllowedToBeSet_throwsSecurityException() {
@@ -135,7 +130,6 @@
     }
 
     @Ignore("b/201753989 Properly define behaviour of setCameraDisabled on secondary user POs")
-    @Test
     @Postsubmit(reason = "new test")
     @CannotSetPolicyTest(policy = CameraPolicy.class)
     public void setCameraDisabledFalse_policyNotAllowedToBeSet_throwsSecurityException() {
@@ -143,7 +137,6 @@
                 .setCameraDisabled(sDeviceState.dpc().componentName(), false));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @EnsureHasPermission(CAMERA)
     @CanSetPolicyTest(policy = CameraPolicy.class)
@@ -160,7 +153,6 @@
         assertCanOpenCamera();
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @EnsureHasPermission(CAMERA)
     @CanSetPolicyTest(policy = CameraPolicy.class)
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/CloneProfileDeviceOwnerTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/CloneProfileDeviceOwnerTest.java
new file mode 100644
index 0000000..2c3934c
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/CloneProfileDeviceOwnerTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static com.android.bedstead.nene.permissions.CommonPermissions.MANAGE_PROFILE_AND_DEVICE_OWNERS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.os.UserManager;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDeviceOwner;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.exceptions.NeneException;
+import com.android.bedstead.nene.users.UserReference;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public class CloneProfileDeviceOwnerTest {
+    @ClassRule
+    @Rule
+    public static DeviceState sDeviceState = new DeviceState();
+
+    /**
+     * Test creation of clone profile should not be allowed when device owner is set.
+     */
+    @Test
+    @EnsureHasDeviceOwner
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnPrimaryUser
+    public void createCloneProfile_hasDeviceOwner_fails() {
+        assertThrows(NeneException.class,
+                () -> TestApis.users().createUser()
+                        .parent(TestApis.users().instrumented())
+                        .type(TestApis.users().supportedType(UserManager.USER_TYPE_PROFILE_CLONE))
+                        .create());
+    }
+
+    /**
+     * Test creation of clone profile should be allowed when device owner is not set.
+     */
+    @Test
+    @EnsureHasNoDeviceOwner
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnPrimaryUser
+    public void createCloneProfile_noDeviceOwner_succeeds() {
+        UserReference cloneUser = TestApis.users().createUser()
+                .parent(TestApis.users().instrumented())
+                .type(TestApis.users().supportedType(UserManager.USER_TYPE_PROFILE_CLONE))
+                .create();
+
+        try {
+            assertThat(cloneUser.exists()).isTrue();
+        } finally {
+            cloneUser.remove();
+        }
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/CreateAndManageUserTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/CreateAndManageUserTest.java
index 246a918..f875722 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/CreateAndManageUserTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/CreateAndManageUserTest.java
@@ -40,7 +40,6 @@
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(BedsteadJUnit4.class)
@@ -57,7 +56,6 @@
         sDeviceState.requireCanSupportAdditionalUser();
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = CreateAndManageUser.class)
     public void createAndManageUser_returnUserHandle() {
@@ -71,7 +69,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = CreateAndManageUser.class)
     public void createAndManageUser_lowStorage_throwOperationException() {
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/CredentialManagementAppTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/CredentialManagementAppTest.java
index ced2600..7f1be78 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/CredentialManagementAppTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/CredentialManagementAppTest.java
@@ -19,8 +19,7 @@
 import static android.Manifest.permission.MANAGE_CREDENTIAL_MANAGEMENT_APP;
 import static android.app.admin.DevicePolicyManager.INSTALLKEY_SET_USER_SELECTABLE;
 
-import static com.android.bedstead.nene.appops.AppOps.AppOpsMode.ALLOWED;
-import static com.android.bedstead.nene.appops.AppOps.AppOpsMode.DEFAULT;
+import static com.android.bedstead.nene.appops.AppOpsMode.ALLOWED;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
@@ -39,6 +38,7 @@
 import com.android.activitycontext.ActivityContext;
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureDoesNotHaveAppOp;
 import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.permissions.PermissionContext;
@@ -111,9 +111,8 @@
     }
 
     @Test
+    @EnsureDoesNotHaveAppOp(MANAGE_CREDENTIALS)
     public void installKeyPair_withoutManageCredentialAppOp_throwsException() {
-        TestApis.packages().instrumented().appOps().set(MANAGE_CREDENTIALS, DEFAULT);
-
         assertThrows(SecurityException.class,
                 () -> sDevicePolicyManager.installKeyPair(/* admin = */ null, PRIVATE_KEY,
                         CERTIFICATES,
@@ -121,17 +120,15 @@
     }
 
     @Test
+    @EnsureDoesNotHaveAppOp(MANAGE_CREDENTIALS)
     public void removeKeyPair_withoutManageCredentialAppOp_throwsException() {
-        TestApis.packages().instrumented().appOps().set(MANAGE_CREDENTIALS, DEFAULT);
-
         assertThrows(SecurityException.class,
                 () -> sDevicePolicyManager.removeKeyPair(/* admin = */ null, ALIAS));
     }
 
     @Test
+    @EnsureDoesNotHaveAppOp(MANAGE_CREDENTIALS)
     public void generateKeyPair_withoutManageCredentialAppOp_throwsException() {
-        TestApis.packages().instrumented().appOps().set(MANAGE_CREDENTIALS, DEFAULT);
-
         assertThrows(SecurityException.class,
                 () -> sDevicePolicyManager.generateKeyPair(/* admin = */ null, "RSA",
                         buildRsaKeySpec(ALIAS, /* useStrongBox = */ false),
@@ -139,9 +136,8 @@
     }
 
     @Test
+    @EnsureDoesNotHaveAppOp(MANAGE_CREDENTIALS)
     public void setKeyPairCertificate_withoutManageCredentialAppOp_throwsException() {
-        TestApis.packages().instrumented().appOps().set(MANAGE_CREDENTIALS, DEFAULT);
-
         assertThrows(SecurityException.class,
                 () -> sDevicePolicyManager.setKeyPairCertificate(/* admin = */ null, ALIAS,
                         Arrays.asList(CERTIFICATE), /* isUserSelectable = */ false));
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/CrossProfileAppsTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/CrossProfileAppsTest.java
index 42453f3..4998a6e 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/CrossProfileAppsTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/CrossProfileAppsTest.java
@@ -16,44 +16,65 @@
 
 package android.devicepolicy.cts;
 
-import static com.android.bedstead.harrier.DeviceState.UserType.PRIMARY_USER;
-import static com.android.bedstead.harrier.DeviceState.UserType.WORK_PROFILE;
-import static com.android.bedstead.harrier.OptionalBoolean.FALSE;
+import static android.provider.Settings.ACTION_MANAGE_CROSS_PROFILE_ACCESS;
+
 import static com.android.bedstead.harrier.OptionalBoolean.TRUE;
+import static com.android.bedstead.harrier.UserType.PRIMARY_USER;
+import static com.android.bedstead.harrier.UserType.SECONDARY_USER;
+import static com.android.bedstead.harrier.UserType.WORK_PROFILE;
+import static com.android.bedstead.metricsrecorder.truth.MetricQueryBuilderSubject.assertThat;
+import static com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_PROFILES;
+import static com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_USERS;
+import static com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_USERS_FULL;
+import static com.android.bedstead.nene.permissions.CommonPermissions.START_CROSS_PROFILE_ACTIVITIES;
+import static com.android.eventlib.truth.EventLogsSubject.assertThat;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.testng.Assert.assertThrows;
 
+import android.app.ActivityOptions;
+import android.app.AppOpsManager;
 import android.app.admin.RemoteDevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.CrossProfileApps;
 import android.os.UserHandle;
-import android.os.UserManager;
+import android.stats.devicepolicy.EventId;
 
 import androidx.test.core.app.ApplicationProvider;
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.uiautomator.By;
-import androidx.test.uiautomator.UiDevice;
-import androidx.test.uiautomator.UiObject2;
-import androidx.test.uiautomator.Until;
 
+import com.android.activitycontext.ActivityContext;
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.CrossUserTest;
+import com.android.bedstead.harrier.annotations.EnsureDoesNotHavePermission;
 import com.android.bedstead.harrier.annotations.EnsureHasNoWorkProfile;
-import com.android.bedstead.harrier.annotations.EnsureHasSecondaryUser;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
 import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile;
+import com.android.bedstead.harrier.annotations.PermissionTest;
+import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
-import com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser;
 import com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile;
+import com.android.bedstead.harrier.annotations.UserPair;
+import com.android.bedstead.harrier.annotations.UserTest;
+import com.android.bedstead.metricsrecorder.EnterpriseMetricsRecorder;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.appops.AppOpsMode;
+import com.android.bedstead.nene.packages.Package;
+import com.android.bedstead.nene.packages.ProcessReference;
 import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppActivityReference;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
+import com.android.eventlib.events.activities.ActivityCreatedEvent;
+import com.android.eventlib.events.activities.ActivityEvents;
+import com.android.queryable.queries.ActivityQuery;
+import com.android.queryable.queries.IntentFilterQuery;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.ClassRule;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -61,302 +82,617 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 @RunWith(BedsteadJUnit4.class)
 public final class CrossProfileAppsTest {
 
-    private static final String ID_USER_TEXTVIEW =
-            "com.android.cts.devicepolicy:id/user_textview";
-    private static final long TIMEOUT_WAIT_UI = TimeUnit.SECONDS.toMillis(10);
     private static final Context sContext = ApplicationProvider.getApplicationContext();
     private static final CrossProfileApps sCrossProfileApps =
             sContext.getSystemService(CrossProfileApps.class);
-    private static final UserManager sUserManager = sContext.getSystemService(UserManager.class);
 
     @ClassRule @Rule
     public static final DeviceState sDeviceState = new DeviceState();
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
 
-    private static final TestApp sCrossProfileTestApp = sTestAppProvider.query()
+    private static final TestApp sCrossProfileTestApp = sDeviceState.testApps().query()
             .wherePermissions().contains("android.permission.INTERACT_ACROSS_PROFILES").get();
-    private static final TestApp sNonCrossProfileTestApp = sTestAppProvider.query()
+    private static final TestApp sNonCrossProfileTestApp = sDeviceState.testApps().query()
             .wherePermissions().doesNotContain("android.permission.INTERACT_ACROSS_PROFILES").get();
+    private static final TestApp sTestAppWithMainActivity = sDeviceState.testApps().query()
+            .whereActivities().contains(
+                    ActivityQuery.activity().intentFilters().contains(
+                            IntentFilterQuery.intentFilter().actions().contains(Intent.ACTION_MAIN))
+            ).get();
+    private static final TestApp sTestAppWithActivity = sTestAppWithMainActivity;
 
-    @Test
-    @RequireRunOnPrimaryUser
-    public void getTargetUserProfiles_callingFromPrimaryUser_doesNotContainPrimaryUser() {
+    // TODO(b/191637162): When we have permissions in test apps we won't need to use the
+    //  instrumented app for this
+    private static final ComponentName MAIN_ACTIVITY =
+            new ComponentName(sContext, "android.devicepolicy.cts.MainActivity");
+    private static final ComponentName NOT_EXPORTED_ACTIVITY =
+            new ComponentName(sContext, "android.devicepolicy.cts.NotExportedMainActivity");
+    private static final ComponentName NOT_MAIN_ACTIVITY =
+            new ComponentName(sContext, "android.devicepolicy.cts.NotMainActivity");
+
+    @Before
+    @After
+    public void cleanupOtherUsers() {
+        // As these tests start this package on other users, we should kill all processes on other
+        // users for this package
+
+        Package pkg = TestApis.packages().instrumented();
+        pkg.runningProcesses().stream()
+                .filter(p -> !p.user().equals(TestApis.users().instrumented()))
+                .forEach(ProcessReference::kill);
+    }
+
+    @CrossUserTest({
+            @UserPair(from = PRIMARY_USER, to = PRIMARY_USER),
+            @UserPair(from = PRIMARY_USER, to = SECONDARY_USER),
+            @UserPair(from = WORK_PROFILE, to = SECONDARY_USER),
+            @UserPair(from = SECONDARY_USER, to = WORK_PROFILE)
+    })
+    @Postsubmit(reason = "new test")
+    public void getTargetUserProfiles_doesNotContainOtherUser() {
+        TestApis.packages().instrumented().installExisting(sDeviceState.otherUser());
+
         List<UserHandle> targetProfiles = sCrossProfileApps.getTargetUserProfiles();
 
-        assertThat(targetProfiles).doesNotContain(sDeviceState.primaryUser().userHandle());
+        assertThat(targetProfiles).doesNotContain(sDeviceState.otherUser().userHandle());
     }
-    @Test
-    @RequireRunOnPrimaryUser
-    @EnsureHasSecondaryUser
-    public void getTargetUserProfiles_callingFromPrimaryUser_doesNotContainSecondaryUser() {
+
+    @CrossUserTest({
+            @UserPair(from = WORK_PROFILE, to = PRIMARY_USER),
+            @UserPair(from = PRIMARY_USER, to = WORK_PROFILE)
+    })    @Postsubmit(reason = "new test")
+    public void getTargetUserProfiles_containsOtherUser() {
+        TestApis.packages().instrumented().installExisting(sDeviceState.otherUser());
+
         List<UserHandle> targetProfiles = sCrossProfileApps.getTargetUserProfiles();
 
-        assertThat(targetProfiles).doesNotContain(sDeviceState.secondaryUser().userHandle());
+        assertThat(targetProfiles).contains(sDeviceState.otherUser().userHandle());
     }
 
-    @Test
-    @RequireRunOnWorkProfile(installInstrumentedAppInParent = TRUE)
-    public void getTargetUserProfiles_callingFromWorkProfile_containsPrimaryUser() {
+    @CrossUserTest({
+            @UserPair(from = WORK_PROFILE, to = PRIMARY_USER),
+            @UserPair(from = PRIMARY_USER, to = WORK_PROFILE)
+    })
+    @Postsubmit(reason = "new test")
+    public void getTargetUserProfiles_appNotInstalledInOtherUser_doesNotContainOtherUser() {
+        TestApis.packages().instrumented().uninstall(sDeviceState.otherUser());
+
         List<UserHandle> targetProfiles = sCrossProfileApps.getTargetUserProfiles();
 
-        assertThat(targetProfiles).contains(sDeviceState.primaryUser().userHandle());
+        assertThat(targetProfiles).doesNotContain(sDeviceState.otherUser().userHandle());
     }
 
-    @Test
-    @RequireRunOnPrimaryUser
-    @EnsureHasWorkProfile
-    public void getTargetUserProfiles_callingFromPrimaryUser_containsWorkProfile() {
-        List<UserHandle> targetProfiles = sCrossProfileApps.getTargetUserProfiles();
+    @Postsubmit(reason = "new test")
+    @UserTest({PRIMARY_USER, WORK_PROFILE})
+    public void getTargetUserProfiles_logged() {
+        try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
+            sCrossProfileApps.getTargetUserProfiles();
 
-        assertThat(targetProfiles).contains(sDeviceState.workProfile().userHandle());
-    }
-
-    @Test
-    @RequireRunOnPrimaryUser
-    @EnsureHasWorkProfile(installInstrumentedApp = FALSE)
-    public void getTargetUserProfiles_callingFromPrimaryUser_appNotInstalledInWorkProfile_doesNotContainWorkProfile() {
-        List<UserHandle> targetProfiles = sCrossProfileApps.getTargetUserProfiles();
-
-        assertThat(targetProfiles).doesNotContain(sDeviceState.workProfile().userHandle());
-    }
-
-    @Test
-    @RequireRunOnSecondaryUser
-    @EnsureHasWorkProfile(forUser = PRIMARY_USER)
-    public void getTargetUserProfiles_callingFromSecondaryUser_doesNotContainWorkProfile() {
-        List<UserHandle> targetProfiles = sCrossProfileApps.getTargetUserProfiles();
-
-        assertThat(targetProfiles).doesNotContain(
-                sDeviceState.workProfile(/* forUser= */ PRIMARY_USER).userHandle());
-    }
-
-    @Test
-    @RequireRunOnWorkProfile(installInstrumentedAppInParent = TRUE)
-    @Ignore // TODO(scottjonathan): Replace use of UIAutomator
-    public void startMainActivity_callingFromWorkProfile_targetIsPrimaryUser_launches() {
-        sCrossProfileApps.startMainActivity(
-                new ComponentName(sContext, MainActivity.class),
-                sDeviceState.workProfile().userHandle());
-
-        assertMainActivityLaunchedForUser(sDeviceState.primaryUser().userHandle());
-    }
-
-    @Test
-    @RequireRunOnPrimaryUser
-    @EnsureHasWorkProfile
-    @Ignore // TODO(scottjonathan): Replace use of UIAutomator
-    public void startMainActivity_callingFromPrimaryUser_targetIsWorkProfile_launches() {
-        sCrossProfileApps.startMainActivity(
-                new ComponentName(sContext, MainActivity.class),
-                sDeviceState.workProfile().userHandle());
-
-        assertMainActivityLaunchedForUser(sDeviceState.workProfile().userHandle());
-    }
-
-    private void assertMainActivityLaunchedForUser(UserHandle user) {
-        // TODO(scottjonathan): Replace this with a standard event log or similar to avoid UI
-        // Look for the text view to verify that MainActivity is started.
-        UiObject2 textView = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
-                .wait(
-                        Until.findObject(By.res(ID_USER_TEXTVIEW)),
-                        TIMEOUT_WAIT_UI);
-        assertWithMessage("Failed to start activity in target user")
-                .that(textView).isNotNull();
-        // Look for the text in textview, it should be the serial number of target user.
-        assertWithMessage("Activity is started in wrong user")
-                .that(textView.getText())
-                .isEqualTo(String.valueOf(sUserManager.getSerialNumberForUser(user)));
-    }
-
-    @Test
-    public void startMainActivity_activityNotExported_throwsSecurityException() {
-        assertThrows(SecurityException.class, () -> {
-            sCrossProfileApps.startMainActivity(
-                    new ComponentName(sContext, NonExportedActivity.class),
-                    sDeviceState.primaryUser().userHandle());
-        });
-    }
-
-    @Test
-    public void startMainActivity_activityNotMain_throwsSecurityException() {
-        assertThrows(SecurityException.class, () -> {
-            sCrossProfileApps.startMainActivity(
-                    new ComponentName(sContext, NonMainActivity.class),
-                    sDeviceState.primaryUser().userHandle());
-        });
-    }
-
-    @Test
-    @Ignore // TODO(scottjonathan): This requires another app to be installed which can be launched
-    public void startMainActivity_activityIncorrectPackage_throwsSecurityException() {
-        assertThrows(SecurityException.class, () -> {
-
-        });
-    }
-
-    @Test
-    @RequireRunOnPrimaryUser
-    public void
-            startMainActivity_callingFromPrimaryUser_targetIsPrimaryUser_throwsSecurityException() {
-        assertThrows(SecurityException.class, () -> {
-            sCrossProfileApps.startMainActivity(
-                    new ComponentName(sContext, MainActivity.class),
-                    sDeviceState.primaryUser().userHandle());
-        });
-    }
-
-    @Test
-    @RequireRunOnPrimaryUser
-    @EnsureHasSecondaryUser
-    public void
-    startMainActivity_callingFromPrimaryUser_targetIsSecondaryUser_throwsSecurityException() {
-        assertThrows(SecurityException.class, () -> {
-            sCrossProfileApps.startMainActivity(
-                    new ComponentName(sContext, MainActivity.class),
-                    sDeviceState.secondaryUser().userHandle());
-        });
-    }
-
-    @Test
-    @RequireRunOnSecondaryUser
-    @EnsureHasWorkProfile(forUser = PRIMARY_USER)
-    public void
-    startMainActivity_callingFromSecondaryUser_targetIsWorkProfile_throwsSecurityException() {
-        assertThrows(SecurityException.class, () -> {
-            sCrossProfileApps.startMainActivity(
-                    new ComponentName(sContext, MainActivity.class),
-                    sDeviceState.workProfile(/* forUser= */ PRIMARY_USER).userHandle());
-        });
-    }
-
-    @Test
-    @RequireRunOnPrimaryUser
-    public void getProfileSwitchingLabel_callingFromPrimaryUser_targetIsPrimaryUser_throwsSecurityException() {
-        assertThrows(SecurityException.class, () -> {
-            sCrossProfileApps.getProfileSwitchingLabel(sDeviceState.primaryUser().userHandle());
-        });
-    }
-
-    @Test
-    @RequireRunOnPrimaryUser
-    @EnsureHasSecondaryUser
-    public void getProfileSwitchingLabel_callingFromPrimaryUser_targetIsSecondaryUser_throwsSecurityException() {
-        assertThrows(SecurityException.class, () -> {
-            sCrossProfileApps.getProfileSwitchingLabel(sDeviceState.primaryUser().userHandle());
-        });
-    }
-
-    @Test
-    @RequireRunOnSecondaryUser
-    @EnsureHasWorkProfile(forUser = PRIMARY_USER)
-    public void getProfileSwitchingLabel_callingFromSecondaryUser_targetIsWorkProfile_throwsSecurityException() {
-        assertThrows(SecurityException.class, () -> {
-            sCrossProfileApps.getProfileSwitchingLabel(
-                    sDeviceState.workProfile(/* forUser= */ PRIMARY_USER).userHandle());
-        });
-    }
-
-    @Test
-    @RequireRunOnWorkProfile(installInstrumentedAppInParent = TRUE)
-    public void getProfileSwitchingLabel_callingFromWorProfile_targetIsPrimaryUser_notNull() {
-        assertThat(sCrossProfileApps.getProfileSwitchingLabel(
-                sDeviceState.primaryUser().userHandle())).isNotNull();
-    }
-
-    @Test
-    @RequireRunOnPrimaryUser
-    @EnsureHasWorkProfile
-    public void getProfileSwitchingLabel_callingFromPrimaryUser_targetIsWorkProfile_notNull() {
-        assertThat(sCrossProfileApps.getProfileSwitchingLabel(
-                sDeviceState.workProfile().userHandle())).isNotNull();
-    }
-
-    @Test
-    @RequireRunOnPrimaryUser
-    public void getProfileSwitchingLabelIconDrawable_callingFromPrimaryUser_targetIsPrimaryUser_throwsSecurityException() {
-        assertThrows(SecurityException.class, () -> {
-            sCrossProfileApps.getProfileSwitchingIconDrawable(
-                    sDeviceState.primaryUser().userHandle());
-        });
-    }
-
-    @Test
-    @RequireRunOnPrimaryUser
-    @EnsureHasSecondaryUser
-    public void getProfileSwitchingLabelIconDrawable_callingFromPrimaryUser_targetIsSecondaryUser_throwsSecurityException() {
-        assertThrows(SecurityException.class, () -> {
-            sCrossProfileApps.getProfileSwitchingIconDrawable(
-                    sDeviceState.secondaryUser().userHandle());
-        });
-    }
-
-    @Test
-    @RequireRunOnSecondaryUser
-    @EnsureHasWorkProfile(forUser = PRIMARY_USER)
-    public void getProfileSwitchingLabelIconDrawable_callingFromSecondaryUser_targetIsWorkProfile_throwsSecurityException() {
-        assertThrows(SecurityException.class, () -> {
-            sCrossProfileApps.getProfileSwitchingIconDrawable(
-                    sDeviceState.workProfile(/* forUser= */ PRIMARY_USER).userHandle());
-        });
-    }
-
-    @Test
-    @RequireRunOnWorkProfile(installInstrumentedAppInParent = TRUE)
-    public void getProfileSwitchingIconDrawable_callingFromWorkProfile_targetIsPrimaryUser_notNull() {
-        assertThat(sCrossProfileApps.getProfileSwitchingIconDrawable(
-                sDeviceState.primaryUser().userHandle())).isNotNull();
-    }
-
-    @Test
-    @RequireRunOnPrimaryUser
-    @EnsureHasWorkProfile
-    public void getProfileSwitchingIconDrawable_callingFromPrimaryUser_targetIsWorkProfile_notNull() {
-        assertThat(sCrossProfileApps.getProfileSwitchingIconDrawable(
-                sDeviceState.workProfile().userHandle())).isNotNull();
-    }
-
-    @Ignore("b/199122256 investigate install failure")
-    @Test
-    @EnsureHasWorkProfile
-    @RequireRunOnPrimaryUser
-    public void canRequestInteractAcrossProfiles_fromPersonalProfile_returnsTrue()
-            throws Exception {
-        RemoteDevicePolicyManager profileOwner = sDeviceState.profileOwner(WORK_PROFILE)
-                .devicePolicyManager();
-        try (TestAppInstance personalApp = sCrossProfileTestApp.install(
-                sDeviceState.primaryUser());
-             TestAppInstance workApp = sCrossProfileTestApp.install(
-                sDeviceState.workProfile())) {
-            profileOwner.setCrossProfilePackages(
-                    sDeviceState.profileOwner(WORK_PROFILE).componentName(),
-                    Set.of(sCrossProfileTestApp.packageName()));
-
-            assertThat(personalApp.crossProfileApps().canRequestInteractAcrossProfiles()).isTrue();
+            assertThat(metrics.query()
+                    .whereType().isEqualTo(
+                            EventId.CROSS_PROFILE_APPS_GET_TARGET_USER_PROFILES_VALUE)
+                    .whereStrings().contains(sContext.getPackageName())
+            ).wasLogged();
         }
     }
 
-    @Ignore("b/199122256 investigate install failure")
+    @CrossUserTest({
+            @UserPair(from = WORK_PROFILE, to = PRIMARY_USER),
+            @UserPair(from = PRIMARY_USER, to = WORK_PROFILE)
+    })
+    @Postsubmit(reason = "new test")
+    public void startMainActivity_launches() {
+        TestApis.packages().instrumented().installExisting(sDeviceState.otherUser());
+
+        sCrossProfileApps.startMainActivity(MAIN_ACTIVITY, sDeviceState.otherUser().userHandle());
+
+        assertThat(
+                ActivityEvents.forActivity(MAIN_ACTIVITY, sDeviceState.otherUser())
+                        .activityCreated()
+        ).eventOccurred();
+    }
+
+    @CrossUserTest({
+            @UserPair(from = WORK_PROFILE, to = PRIMARY_USER),
+            @UserPair(from = PRIMARY_USER, to = WORK_PROFILE)
+    })
+    @Postsubmit(reason = "new test")
+    public void startMainActivity_logged() {
+        TestApis.packages().instrumented().installExisting(sDeviceState.otherUser());
+        try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
+            sCrossProfileApps.startMainActivity(MAIN_ACTIVITY,
+                    sDeviceState.otherUser().userHandle());
+
+            assertThat(metrics.query()
+                    .whereType().isEqualTo(EventId.CROSS_PROFILE_APPS_START_ACTIVITY_AS_USER_VALUE)
+                    .whereStrings().contains(sContext.getPackageName())
+            ).wasLogged();
+        }
+    }
+
     @Test
-    @EnsureHasWorkProfile
     @RequireRunOnPrimaryUser
-    public void canRequestInteractAcrossProfiles_fromWorkProfile_returnsTrue()
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @Postsubmit(reason = "new test")
+    public void startMainActivity_activityNotExported_throwsSecurityException() {
+        assertThrows(SecurityException.class, () -> {
+            sCrossProfileApps.startMainActivity(
+                    NOT_EXPORTED_ACTIVITY, sDeviceState.workProfile().userHandle());
+        });
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @Postsubmit(reason = "new test")
+    public void startMainActivity_activityNotMain_throwsSecurityException() {
+        assertThrows(SecurityException.class, () -> {
+            sCrossProfileApps.startMainActivity(
+                    NOT_MAIN_ACTIVITY, sDeviceState.workProfile().userHandle());
+        });
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @Postsubmit(reason = "new test")
+    public void startMainActivity_activityIncorrectPackage_throwsSecurityException() {
+        try (TestAppInstance instance =
+                     sTestAppWithMainActivity.install(sDeviceState.workProfile())) {
+
+            TestAppActivityReference activity = instance.activities().query()
+                            .whereActivity().exported().isTrue()
+                            .whereActivity().intentFilters().contains(
+                                    IntentFilterQuery.intentFilter().actions().contains(
+                                            Intent.ACTION_MAIN
+                                    )
+                            )
+                    .get();
+
+            assertThrows(SecurityException.class, () -> {
+                sCrossProfileApps.startMainActivity(
+                        activity.component().componentName(),
+                        sDeviceState.workProfile().userHandle());
+            });
+        }
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    @Postsubmit(reason = "new test")
+    public void startActivity_byIntent_noComponent_throwsException() throws Exception {
+        Intent intent = new Intent();
+        intent.setAction("test");
+
+        ActivityContext.runWithContext(activity ->
+                assertThrows(NullPointerException.class, () ->
+                        sCrossProfileApps.startActivity(
+                                intent, sDeviceState.workProfile().userHandle(), activity)));
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    @Postsubmit(reason = "new test")
+    public void startActivity_byIntent_differentPackage_throwsException() throws Exception {
+        try (TestAppInstance testAppInstance =
+                     sTestAppWithActivity.install(sDeviceState.workProfile())) {
+            TestAppActivityReference targetActivity = testAppInstance.activities().any();
+            Intent intent = new Intent();
+            intent.setComponent(targetActivity.component().componentName());
+
+            ActivityContext.runWithContext(activity ->
+                    assertThrows(SecurityException.class, () ->
+                            sCrossProfileApps.startActivity(
+                                    intent, sDeviceState.workProfile().userHandle(), activity)));
+        }
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    @Postsubmit(reason = "new test")
+    public void startActivity_byComponent_differentPackage_throwsException() throws Exception {
+        try (TestAppInstance testAppInstance =
+                     sTestAppWithActivity.install(sDeviceState.workProfile())) {
+            TestAppActivityReference targetActivity = testAppInstance.activities().any();
+
+            ActivityContext.runWithContext(activity ->
+                    assertThrows(SecurityException.class, () ->
+                            sCrossProfileApps.startActivity(
+                                    targetActivity.component().componentName(),
+                                    sDeviceState.workProfile().userHandle())));
+        }
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    @EnsureDoesNotHavePermission({
+            INTERACT_ACROSS_PROFILES, INTERACT_ACROSS_USERS,
+            INTERACT_ACROSS_USERS_FULL, START_CROSS_PROFILE_ACTIVITIES})
+    @Postsubmit(reason = "new test")
+    public void startActivity_byIntent_withoutPermissions_throwsException() throws Exception {
+        Intent intent = new Intent();
+        intent.setComponent(NOT_MAIN_ACTIVITY);
+
+        ActivityContext.runWithContext(activity ->
+                assertThrows(SecurityException.class, () ->
+                        sCrossProfileApps.startActivity(
+                                intent, sDeviceState.workProfile().userHandle(), activity)));
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    @EnsureDoesNotHavePermission({
+            INTERACT_ACROSS_PROFILES, INTERACT_ACROSS_USERS,
+            INTERACT_ACROSS_USERS_FULL, START_CROSS_PROFILE_ACTIVITIES})
+    @Postsubmit(reason = "new test")
+    public void startActivity_byComponent_withoutPermissions_throwsException() throws Exception {
+        ActivityContext.runWithContext(activity ->
+                assertThrows(SecurityException.class, () ->
+                        sCrossProfileApps.startActivity(
+                                NOT_MAIN_ACTIVITY, sDeviceState.workProfile().userHandle())));
+    }
+
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @PermissionTest({
+            INTERACT_ACROSS_PROFILES, INTERACT_ACROSS_USERS,
+            INTERACT_ACROSS_USERS_FULL})
+    @Postsubmit(reason = "new test")
+    public void startActivity_byIntent_withPermission_startsActivity() throws Exception {
+        Intent intent = new Intent();
+        intent.setComponent(NOT_MAIN_ACTIVITY);
+
+        ActivityContext.runWithContext(activity -> {
+            sCrossProfileApps.startActivity(
+                    intent, sDeviceState.workProfile().userHandle(), activity);
+        });
+
+        assertThat(
+                ActivityEvents.forActivity(NOT_MAIN_ACTIVITY, sDeviceState.workProfile())
+                        .activityCreated()
+        ).eventOccurred();
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @EnsureHasPermission(START_CROSS_PROFILE_ACTIVITIES)
+    @Postsubmit(reason = "new test")
+    public void startActivity_byIntent_withCrossProfileActivitiesPermission_throwsException()
+            throws Exception {
+        Intent intent = new Intent();
+        intent.setComponent(NOT_MAIN_ACTIVITY);
+
+        ActivityContext.runWithContext(activity -> {
+            assertThrows(SecurityException.class, () -> sCrossProfileApps.startActivity(
+                    intent, sDeviceState.workProfile().userHandle(), activity));
+        });
+    }
+
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @PermissionTest({
+            INTERACT_ACROSS_PROFILES, INTERACT_ACROSS_USERS,
+            INTERACT_ACROSS_USERS_FULL, START_CROSS_PROFILE_ACTIVITIES})
+    @Postsubmit(reason = "new test")
+    public void startActivity_byComponent_withPermission_startsActivity()
+            throws Exception {
+        ActivityContext.runWithContext(activity -> {
+            sCrossProfileApps.startActivity(
+                    NOT_MAIN_ACTIVITY, sDeviceState.workProfile().userHandle());
+        });
+
+        assertThat(
+                ActivityEvents.forActivity(NOT_MAIN_ACTIVITY, sDeviceState.workProfile())
+                        .activityCreated()
+        ).eventOccurred();
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @EnsureHasPermission(INTERACT_ACROSS_PROFILES)
+    @Postsubmit(reason = "new test")
+    public void startActivity_byIntent_withOptionsBundle_startsActivity()
+            throws Exception {
+        Intent intent = new Intent();
+        intent.setComponent(NOT_MAIN_ACTIVITY);
+
+        ActivityContext.runWithContext(activity -> {
+            sCrossProfileApps.startActivity(
+                    intent, sDeviceState.workProfile().userHandle(), activity,
+                    ActivityOptions.makeBasic().toBundle());
+        });
+
+        assertThat(
+                ActivityEvents.forActivity(NOT_MAIN_ACTIVITY, sDeviceState.workProfile())
+                        .activityCreated()
+        ).eventOccurred();
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @EnsureHasPermission(INTERACT_ACROSS_PROFILES)
+    @Postsubmit(reason = "new test")
+    public void startActivity_byIntent_notExported_startsActivity()
+            throws Exception {
+        Intent intent = new Intent();
+        intent.setComponent(NOT_EXPORTED_ACTIVITY);
+
+        ActivityContext.runWithContext(activity -> {
+            sCrossProfileApps.startActivity(
+                    intent, sDeviceState.workProfile().userHandle(), activity);
+        });
+
+        assertThat(
+                ActivityEvents.forActivity(NOT_EXPORTED_ACTIVITY, sDeviceState.workProfile())
+                        .activityCreated()
+        ).eventOccurred();
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @EnsureHasPermission(INTERACT_ACROSS_PROFILES)
+    @Postsubmit(reason = "new test")
+    public void startActivity_byComponent_notExported_throwsException()
+            throws Exception {
+        ActivityContext.runWithContext(activity -> {
+            assertThrows(SecurityException.class, () -> sCrossProfileApps.startActivity(
+                    NOT_EXPORTED_ACTIVITY, sDeviceState.workProfile().userHandle()));
+        });
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @EnsureHasPermission(INTERACT_ACROSS_PROFILES)
+    @Postsubmit(reason = "new test")
+    public void startActivity_byIntent_sameTaskByDefault() throws Exception {
+        Intent intent = new Intent();
+        intent.setComponent(NOT_MAIN_ACTIVITY);
+
+        int originalTaskId = ActivityContext.getWithContext(activity -> {
+            sCrossProfileApps.startActivity(
+                    intent, sDeviceState.workProfile().userHandle(), activity);
+
+            return activity.getTaskId();
+        });
+
+        ActivityCreatedEvent event =
+                ActivityEvents.forActivity(NOT_MAIN_ACTIVITY, sDeviceState.workProfile())
+                        .activityCreated().waitForEvent();
+        assertThat(event.taskId()).isEqualTo(originalTaskId);
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @EnsureHasPermission(START_CROSS_PROFILE_ACTIVITIES)
+    @Postsubmit(reason = "new test")
+    public void startMainActivity_byComponent_nullActivity_newTask() throws Exception {
+        int originalTaskId = ActivityContext.getWithContext(activity -> {
+            sCrossProfileApps.startMainActivity(
+                    MAIN_ACTIVITY,
+                    sDeviceState.workProfile().userHandle(),
+                    /* callingActivity */ null,
+                    /* options */ null);
+
+            return activity.getTaskId();
+        });
+
+        ActivityCreatedEvent event =
+                ActivityEvents.forActivity(MAIN_ACTIVITY, sDeviceState.workProfile())
+                        .activityCreated().waitForEvent();
+        assertThat(event.taskId()).isNotEqualTo(originalTaskId);
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @EnsureHasPermission(START_CROSS_PROFILE_ACTIVITIES)
+    @Postsubmit(reason = "new test")
+    public void startMainActivity_byComponent_setsActivity_sameTask() throws Exception {
+        int originalTaskId = ActivityContext.getWithContext(activity -> {
+            sCrossProfileApps.startMainActivity(
+                    MAIN_ACTIVITY,
+                    sDeviceState.workProfile().userHandle(),
+                    activity,
+                    /* options */ null);
+
+            return activity.getTaskId();
+        });
+
+        ActivityCreatedEvent event =
+                ActivityEvents.forActivity(MAIN_ACTIVITY, sDeviceState.workProfile())
+                        .activityCreated().waitForEvent();
+        assertThat(event.taskId()).isEqualTo(originalTaskId);
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @EnsureHasPermission(START_CROSS_PROFILE_ACTIVITIES)
+    @Postsubmit(reason = "new test")
+    public void startNonMainActivity_byComponent_nullActivity_newTask() throws Exception {
+        int originalTaskId = ActivityContext.getWithContext(activity -> {
+            sCrossProfileApps.startActivity(
+                    NOT_MAIN_ACTIVITY,
+                    sDeviceState.workProfile().userHandle(),
+                    /* callingActivity */ null,
+                    /* options */ null);
+
+            return activity.getTaskId();
+        });
+
+        ActivityCreatedEvent event =
+                ActivityEvents.forActivity(NOT_MAIN_ACTIVITY, sDeviceState.workProfile())
+                        .activityCreated().waitForEvent();
+        assertThat(event.taskId()).isNotEqualTo(originalTaskId);
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @EnsureHasPermission(START_CROSS_PROFILE_ACTIVITIES)
+    @Postsubmit(reason = "new test")
+    public void startNonMainActivity_byComponent_setsActivity_sameTask() throws Exception {
+        int originalTaskId = ActivityContext.getWithContext(activity -> {
+            sCrossProfileApps.startActivity(
+                    NOT_MAIN_ACTIVITY,
+                    sDeviceState.workProfile().userHandle(),
+                    activity,
+                    /* options */ null);
+
+            return activity.getTaskId();
+        });
+
+        ActivityCreatedEvent event =
+                ActivityEvents.forActivity(NOT_MAIN_ACTIVITY, sDeviceState.workProfile())
+                        .activityCreated().waitForEvent();
+        assertThat(event.taskId()).isEqualTo(originalTaskId);
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @EnsureHasPermission(INTERACT_ACROSS_PROFILES)
+    @Postsubmit(reason = "new test")
+    public void startActivity_byIntent_logged() throws Exception {
+        Intent intent = new Intent();
+        intent.setComponent(NOT_MAIN_ACTIVITY);
+
+        try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
+            ActivityContext.runWithContext(activity ->
+                    sCrossProfileApps.startActivity(
+                    intent, sDeviceState.workProfile().userHandle(), activity));
+
+            assertThat(metrics.query()
+                    .whereType().isEqualTo(EventId.START_ACTIVITY_BY_INTENT_VALUE)
+                    .whereStrings().contains(sContext.getPackageName())
+                    .whereBoolean().isFalse() // Not from work profile
+            ).wasLogged();
+        }
+    }
+
+    @Test
+    @RequireRunOnWorkProfile(installInstrumentedAppInParent = TRUE)
+    @EnsureHasPermission(INTERACT_ACROSS_PROFILES)
+    @Postsubmit(reason = "new test")
+    public void startActivity_byIntent_fromWorkProfile_logged() throws Exception {
+        Intent intent = new Intent();
+        intent.setComponent(NOT_MAIN_ACTIVITY);
+
+        try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
+            ActivityContext.runWithContext(activity ->
+                    sCrossProfileApps.startActivity(
+                            intent, sDeviceState.primaryUser().userHandle(), activity));
+
+            assertThat(metrics.query()
+                    .whereType().isEqualTo(EventId.START_ACTIVITY_BY_INTENT_VALUE)
+                    .whereStrings().contains(sContext.getPackageName())
+                    .whereBoolean().isTrue() // From work profile
+            ).wasLogged();
+        }
+    }
+
+    @Test
+    @CrossUserTest({
+            @UserPair(from = PRIMARY_USER, to = PRIMARY_USER),
+            @UserPair(from = PRIMARY_USER, to = SECONDARY_USER),
+            @UserPair(from = WORK_PROFILE, to = SECONDARY_USER),
+            @UserPair(from = SECONDARY_USER, to = WORK_PROFILE)
+    })
+    public void
+            startMainActivity_callingFromPrimaryUser_targetIsInvalid_throwsSecurityException() {
+        TestApis.packages().instrumented().installExisting(sDeviceState.otherUser());
+
+        assertThrows(SecurityException.class,
+                () -> sCrossProfileApps.startMainActivity(
+                        MAIN_ACTIVITY, sDeviceState.otherUser().userHandle()));
+    }
+
+    @Test
+    @CrossUserTest({
+            @UserPair(from = PRIMARY_USER, to = PRIMARY_USER),
+            @UserPair(from = PRIMARY_USER, to = SECONDARY_USER),
+            @UserPair(from = WORK_PROFILE, to = SECONDARY_USER),
+            @UserPair(from = SECONDARY_USER, to = WORK_PROFILE)
+    })
+    public void getProfileSwitchingLabel_targetIsInvalid_throwsSecurityException() {
+        TestApis.packages().instrumented().installExisting(sDeviceState.otherUser());
+
+        assertThrows(SecurityException.class, () -> {
+            sCrossProfileApps.getProfileSwitchingLabel(sDeviceState.otherUser().userHandle());
+        });
+    }
+
+
+    @Test
+    @CrossUserTest({
+            @UserPair(from = WORK_PROFILE, to = PRIMARY_USER),
+            @UserPair(from = PRIMARY_USER, to = WORK_PROFILE)
+    })
+    public void getProfileSwitchingLabel_targetIsValid_notNull() {
+        TestApis.packages().instrumented().installExisting(sDeviceState.otherUser());
+
+        assertThat(sCrossProfileApps.getProfileSwitchingLabel(
+                sDeviceState.otherUser().userHandle())).isNotNull();
+    }
+
+    @Test
+    @CrossUserTest({
+            @UserPair(from = PRIMARY_USER, to = PRIMARY_USER),
+            @UserPair(from = PRIMARY_USER, to = SECONDARY_USER),
+            @UserPair(from = WORK_PROFILE, to = SECONDARY_USER),
+            @UserPair(from = SECONDARY_USER, to = WORK_PROFILE)
+    })
+    public void getProfileSwitchingLabelIconDrawable_targetIsInvalid_throwsSecurityException() {
+        TestApis.packages().instrumented().installExisting(sDeviceState.otherUser());
+
+        assertThrows(SecurityException.class, () -> {
+            sCrossProfileApps.getProfileSwitchingIconDrawable(
+                    sDeviceState.otherUser().userHandle());
+        });
+    }
+
+    @Test
+    @CrossUserTest({
+            @UserPair(from = WORK_PROFILE, to = PRIMARY_USER),
+            @UserPair(from = PRIMARY_USER, to = WORK_PROFILE)
+    })
+    public void getProfileSwitchingIconDrawable_targetIsValid_notNull() {
+        TestApis.packages().instrumented().installExisting(sDeviceState.otherUser());
+
+        assertThat(sCrossProfileApps.getProfileSwitchingIconDrawable(
+                sDeviceState.otherUser().userHandle())).isNotNull();
+    }
+
+    @Test
+    @CrossUserTest({
+            @UserPair(from = PRIMARY_USER, to = WORK_PROFILE),
+            @UserPair(from = WORK_PROFILE, to = PRIMARY_USER)
+    })
+    public void canRequestInteractAcrossProfiles_hasValidTarget_returnsTrue()
             throws Exception {
         RemoteDevicePolicyManager profileOwner = sDeviceState.profileOwner(WORK_PROFILE)
                 .devicePolicyManager();
-        try (TestAppInstance personalApp = sCrossProfileTestApp.install(
-                sDeviceState.primaryUser());
-             TestAppInstance workApp = sCrossProfileTestApp.install(
-                sDeviceState.workProfile())) {
+        try (TestAppInstance currentApp = sCrossProfileTestApp.install();
+             TestAppInstance otherApp = sCrossProfileTestApp.install(sDeviceState.otherUser())) {
             profileOwner.setCrossProfilePackages(
                     sDeviceState.profileOwner(WORK_PROFILE).componentName(),
                     Set.of(sCrossProfileTestApp.packageName()));
 
-            assertThat(workApp.crossProfileApps().canRequestInteractAcrossProfiles()).isTrue();
+            assertThat(currentApp.crossProfileApps().canRequestInteractAcrossProfiles()).isTrue();
         }
     }
 
@@ -372,7 +708,6 @@
         }
     }
 
-    @Ignore("b/199122256 investigate install failure")
     @Test
     @EnsureHasWorkProfile
     @RequireRunOnPrimaryUser
@@ -392,7 +727,6 @@
         }
     }
 
-    @Ignore("b/199122256 investigate install failure")
     @Test
     @EnsureHasWorkProfile
     @RequireRunOnPrimaryUser
@@ -427,7 +761,6 @@
         }
     }
 
-    @Ignore("b/199122256 investigate install failure")
     @Test
     @EnsureHasWorkProfile
     @RequireRunOnPrimaryUser
@@ -461,6 +794,115 @@
 
         assertThat(
                 sDeviceState.profileOwner(WORK_PROFILE).crossProfileApps()
-                        .canRequestInteractAcrossProfiles()).isFalse();
+                        .canRequestInteractAcrossProfiles()
+        ).isFalse();
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    public void canInteractAcrossProfiles_appOpIsSetOnAllProfiles_returnsTrue() {
+        try (TestAppInstance primaryApp = sCrossProfileTestApp.install();
+             TestAppInstance workApp = sCrossProfileTestApp.install(sDeviceState.workProfile())) {
+            sCrossProfileTestApp.pkg().appOps().set(
+                    AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES, AppOpsMode.ALLOWED);
+            sCrossProfileTestApp.pkg().appOps().set(
+                    sDeviceState.workProfile(), AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES,
+                    AppOpsMode.ALLOWED);
+
+            assertThat(primaryApp.crossProfileApps().canInteractAcrossProfiles()).isTrue();
+            assertThat(workApp.crossProfileApps().canInteractAcrossProfiles()).isTrue();
+        }
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    public void canInteractAcrossProfiles_appOpDisabledOnCaller_returnsFalse() {
+        try (TestAppInstance primaryApp = sCrossProfileTestApp.install();
+             TestAppInstance workApp = sCrossProfileTestApp.install(sDeviceState.workProfile())) {
+            sCrossProfileTestApp.pkg().appOps().set(
+                    AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES, AppOpsMode.DEFAULT);
+            sCrossProfileTestApp.pkg().appOps().set(
+                    sDeviceState.workProfile(), AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES,
+                    AppOpsMode.ALLOWED);
+
+            assertThat(primaryApp.crossProfileApps().canInteractAcrossProfiles()).isFalse();
+        }
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    public void canInteractAcrossProfiles_appOpDisabledOnOtherProfile_returnsFalse() {
+        try (TestAppInstance primaryApp = sCrossProfileTestApp.install();
+             TestAppInstance workApp = sCrossProfileTestApp.install(sDeviceState.workProfile())) {
+            sCrossProfileTestApp.pkg().appOps().set(
+                    AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES, AppOpsMode.ALLOWED);
+            sCrossProfileTestApp.pkg().appOps().set(
+                    sDeviceState.workProfile(), AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES,
+                    AppOpsMode.DEFAULT);
+
+            assertThat(primaryApp.crossProfileApps().canInteractAcrossProfiles()).isFalse();
+        }
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    public void canInteractAcrossProfiles_noOtherProfile_returnsFalse() {
+        try (TestAppInstance primaryApp = sCrossProfileTestApp.install()) {
+            sCrossProfileTestApp.pkg().appOps().set(
+                    AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES, AppOpsMode.ALLOWED);
+
+            assertThat(primaryApp.crossProfileApps().canInteractAcrossProfiles()).isFalse();
+        }
+    }
+
+
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    @PermissionTest({
+            INTERACT_ACROSS_PROFILES, INTERACT_ACROSS_USERS, INTERACT_ACROSS_USERS_FULL})
+    // TODO(b/191637162): When we can adopt permissions for testapps, we can use testapps here
+    public void canInteractAcrossProfiles_permissionIsSet_returnsTrue() {
+        TestApis.packages().instrumented().appOps().set(
+                sDeviceState.workProfile(), AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES,
+                AppOpsMode.ALLOWED);
+
+        assertThat(sCrossProfileApps.canInteractAcrossProfiles()).isTrue();
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoWorkProfile
+    public void createRequestInteractAcrossProfilesIntent_canNotRequest_throwsException() {
+        try (TestAppInstance primaryApp = sCrossProfileTestApp.install()) {
+            assertThrows(SecurityException.class,
+                    () -> primaryApp.crossProfileApps()
+                            .createRequestInteractAcrossProfilesIntent());
+        }
+    }
+
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    public void createRequestInteractAcrossProfilesIntent_canRequest_returnsIntent() {
+        try (TestAppInstance primaryApp = sCrossProfileTestApp.install();
+             TestAppInstance workApp = sCrossProfileTestApp.install(sDeviceState.workProfile())) {
+            sCrossProfileTestApp.pkg().appOps().set(
+                    AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES, AppOpsMode.ALLOWED);
+            sCrossProfileTestApp.pkg().appOps().set(
+                    sDeviceState.workProfile(), AppOpsManager.OPSTR_INTERACT_ACROSS_PROFILES,
+                    AppOpsMode.ALLOWED);
+
+            Intent intent = primaryApp.crossProfileApps()
+                    .createRequestInteractAcrossProfilesIntent();
+
+            assertThat(intent.getAction()).isEqualTo(ACTION_MANAGE_CROSS_PROFILE_ACCESS);
+            assertThat(intent.getData().getSchemeSpecificPart())
+                    .isEqualTo(sCrossProfileTestApp.packageName());
+        }
     }
 }
\ No newline at end of file
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/CrossProfileSharingTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/CrossProfileSharingTest.java
index 3aaee38..2c6fb57 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/CrossProfileSharingTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/CrossProfileSharingTest.java
@@ -23,8 +23,8 @@
 import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
 import static android.os.UserManager.DISALLOW_SHARE_INTO_MANAGED_PROFILE;
 
-import static com.android.bedstead.harrier.DeviceState.UserType.PRIMARY_USER;
-import static com.android.bedstead.harrier.DeviceState.UserType.WORK_PROFILE;
+import static com.android.bedstead.harrier.UserType.PRIMARY_USER;
+import static com.android.bedstead.harrier.UserType.WORK_PROFILE;
 import static com.android.bedstead.remotedpc.RemoteDpc.DPC_COMPONENT_NAME;
 import static com.android.queryable.queries.ActivityQuery.activity;
 import static com.android.queryable.queries.IntentFilterQuery.intentFilter;
@@ -47,7 +47,6 @@
 import com.android.bedstead.remotedpc.RemoteDpc;
 import com.android.bedstead.testapp.TestApp;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
 import com.android.compatibility.common.util.BlockingBroadcastReceiver;
 
 import org.junit.ClassRule;
@@ -56,6 +55,7 @@
 import org.junit.runner.RunWith;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @RunWith(BedsteadJUnit4.class)
 public final class CrossProfileSharingTest {
@@ -63,15 +63,12 @@
     @Rule
     public static final DeviceState sDeviceState = new DeviceState();
 
-    private static final Context sContext = TestApis.context().instrumentedContext();
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-
-    private static final TestApp sTestApp = sTestAppProvider.query().whereActivities().contains(
-            activity().intentFilters().contains(
-                    intentFilter().actions().contains("com.android.testapp.SOME_ACTION"),
-                    intentFilter().actions().contains("android.intent.action.PICK")
-            )
-    ).get();
+    private static final TestApp sTestApp = sDeviceState.testApps().query()
+            .whereActivities().contains(
+                    activity().intentFilters().contains(
+                            intentFilter().actions().contains("com.android.testapp.SOME_ACTION"),
+                            intentFilter().actions().contains("android.intent.action.PICK")
+                    )).get();
 
     // Known action that is handled in the opposite profile, used to query forwarder activity.
     private static final String CROSS_PROFILE_ACTION = "com.android.testapp.SOME_ACTION";
@@ -208,13 +205,14 @@
 
     private ResolveInfo getCrossProfileIntentForwarder(Intent intent) {
         List<ResolveInfo> result = TestApis.context().instrumentedContext().getPackageManager()
-                .queryIntentActivities(intent, MATCH_DEFAULT_ONLY);
+                .queryIntentActivities(intent, MATCH_DEFAULT_ONLY)
+                .stream().filter(ResolveInfo::isCrossProfileIntentForwarderActivity)
+                .collect(Collectors.toList());
+
         assertWithMessage("Failed to get intent forwarder component")
                 .that(result.size()).isEqualTo(1);
-        ResolveInfo forwarder = result.get(0);
-        assertWithMessage("Forwarder doesn't consider itself as such")
-                .that(forwarder.isCrossProfileIntentForwarderActivity()).isTrue();
-        return forwarder;
+
+        return result.get(0);
     }
 
     private void setSharingIntoProfileEnabled(boolean enabled) {
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/DefaultSmsApplicationTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/DefaultSmsApplicationTest.java
index 99c539c..2688d11 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/DefaultSmsApplicationTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/DefaultSmsApplicationTest.java
@@ -33,19 +33,17 @@
 import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
 import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.NegativePolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyDoesNotApplyTest;
 import com.android.bedstead.harrier.policies.DefaultSmsApplication;
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.remotedpc.RemotePolicyManager;
 import com.android.bedstead.testapp.TestApp;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
 
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 // TODO(b/198442101): Add tests for the COPE case when we can sideload system apps
@@ -56,8 +54,7 @@
     public static DeviceState sDeviceState = new DeviceState();
 
     private static final Context sContext = TestApis.context().instrumentedContext();
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-    private static final TestApp sSmsApp = sTestAppProvider
+    private static final TestApp sSmsApp = sDeviceState.testApps()
             .query()
             .wherePackageName()
             // TODO(b/198420874): Query for the intent filters relevant to the SMS tests
@@ -78,9 +75,8 @@
     }
 
     // TODO(b/198588696): Add support is @RequireSmsCapable and @RequireNotSmsCapable
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = DefaultSmsApplication.class)
+    @PolicyAppliesTest(policy = DefaultSmsApplication.class)
     public void setDefaultSmsApplication_works() {
         assumeTrue(mTelephonyManager.isSmsCapable());
         String previousSmsAppName = getDefaultSmsPackage();
@@ -94,9 +90,8 @@
     }
 
     // TODO(b/198588696): Add support is @RequireSmsCapable and @RequireNotSmsCapable
-    @Test
     @Postsubmit(reason = "new test")
-    @NegativePolicyTest(policy = DefaultSmsApplication.class)
+    @PolicyDoesNotApplyTest(policy = DefaultSmsApplication.class)
     public void setDefaultSmsApplication_unchanged() {
         assumeTrue(mTelephonyManager.isSmsCapable());
         String previousSmsAppName = getDefaultSmsPackage();
@@ -110,7 +105,6 @@
     }
 
     // TODO(b/198588696): Add support is @RequireSmsCapable and @RequireNotSmsCapable
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = DefaultSmsApplication.class)
     public void setDefaultSmsApplication_smsPackageDoesNotExist_unchanged() {
@@ -126,7 +120,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = DefaultSmsApplication.class)
     public void setDefaultSmsApplication_nullAdmin_throwsException() {
@@ -139,7 +132,6 @@
     }
 
     // TODO(b/198588696): Add support is @RequireSmsCapable and @RequireNotSmsCapable
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = DefaultSmsApplication.class)
     public void setDefaultSmsApplication_notSmsCapable_unchanged() {
@@ -154,7 +146,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     // We don't include non device admin states as passing a null admin is a NullPointerException
     @CannotSetPolicyTest(policy = DefaultSmsApplication.class, includeNonDeviceAdminStates = false)
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/DelegationScopesTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/DelegationScopesTest.java
index 77530c8..e4983d5 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/DelegationScopesTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/DelegationScopesTest.java
@@ -23,6 +23,7 @@
 import static android.app.admin.DevicePolicyManager.DELEGATION_NETWORK_LOGGING;
 import static android.app.admin.DevicePolicyManager.DELEGATION_SECURITY_LOGGING;
 import static android.app.admin.DevicePolicyManager.EXTRA_DELEGATION_SCOPES;
+import static android.content.Context.RECEIVER_EXPORTED;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -38,7 +39,7 @@
 import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
 import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
 import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDelegate;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
 import com.android.bedstead.harrier.policies.Delegation;
 import com.android.bedstead.harrier.policies.NetworkLoggingDelegation;
 import com.android.bedstead.harrier.policies.SecurityLoggingDelegation;
@@ -46,12 +47,10 @@
 import com.android.bedstead.nene.users.UserReference;
 import com.android.bedstead.testapp.TestApp;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
 import com.android.eventlib.truth.EventLogsSubject;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.Arrays;
@@ -79,24 +78,22 @@
     private static final TestApis sTestApis = new TestApis();
     private static final UserReference sUser = sTestApis.users().instrumented();
 
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-    private static final TestApp sTestApp = sTestAppProvider
+    private static final TestApp sTestApp = sDeviceState.testApps()
             .query().whereActivities().isNotEmpty().get();
-    private static final TestApp sTestApp2 = sTestAppProvider.any();
+    private static final TestApp sTestApp2 = sDeviceState.testApps().any();
 
-    @Test
-    @PositivePolicyTest(policy = Delegation.class)
+    @CanSetPolicyTest(policy = Delegation.class)
     public void getDelegatedScopes_returnsFromSetDelegatedScopes() {
         try (TestAppInstance testApp = sTestApp.install(sUser)) {
             try {
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp.testApp().packageName(),
+                        testApp.packageName(),
                         Arrays.asList(TEST_SCOPE, TEST_SCOPE_2));
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatedScopes(
                                 sDeviceState.dpc().componentName(),
-                                testApp.testApp().packageName()))
+                                testApp.packageName()))
                         .containsExactly(TEST_SCOPE, TEST_SCOPE_2);
             } finally {
                 resetDelegatedScopes(testApp);
@@ -104,47 +101,104 @@
         }
     }
 
-    @Test
+    @CanSetPolicyTest(policy = Delegation.class)
+    public void getDelegatedScopes_fromApp_returnsFromSetDelegatedScopes() {
+        try (TestAppInstance testApp = sTestApp.install(sUser)) {
+            try {
+                sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
+                        sDeviceState.dpc().componentName(),
+                        testApp.packageName(),
+                        Arrays.asList(TEST_SCOPE, TEST_SCOPE_2));
+
+                assertThat(testApp.devicePolicyManager().getDelegatedScopes(
+                                null, testApp.packageName()))
+                        .containsExactly(TEST_SCOPE, TEST_SCOPE_2);
+            } finally {
+                resetDelegatedScopes(testApp);
+            }
+        }
+    }
+
+    @CanSetPolicyTest(policy = Delegation.class)
+    public void getDelegatedScopes_fromApp_passComponentName_throwsException() {
+        try (TestAppInstance testApp = sTestApp.install(sUser)) {
+            try {
+                sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
+                        sDeviceState.dpc().componentName(),
+                        testApp.packageName(),
+                        Arrays.asList(TEST_SCOPE, TEST_SCOPE_2));
+
+                assertThrows(SecurityException.class, () ->
+                        testApp.devicePolicyManager().getDelegatedScopes(
+                        sDeviceState.dpc().componentName(), testApp.packageName()));
+            } finally {
+                resetDelegatedScopes(testApp);
+            }
+        }
+    }
+
+    @CanSetPolicyTest(policy = Delegation.class)
+    public void getDelegatedScopes_fromApp_differentPackage_throwsException() {
+        try (TestAppInstance testApp = sTestApp.install(sUser);
+             TestAppInstance testApp2 = sTestApp2.install(sUser)) {
+            try {
+                sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
+                        sDeviceState.dpc().componentName(),
+                        testApp.packageName(),
+                        Arrays.asList(TEST_SCOPE, TEST_SCOPE_2));
+                sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
+                        sDeviceState.dpc().componentName(),
+                        testApp2.packageName(),
+                        Arrays.asList(TEST_SCOPE, TEST_SCOPE_2));
+
+                assertThrows(SecurityException.class, () ->
+                        testApp.devicePolicyManager().getDelegatedScopes(
+                                null, testApp2.packageName()));
+            } finally {
+                resetDelegatedScopes(testApp);
+                resetDelegatedScopes(testApp2);
+            }
+        }
+    }
+
     @CannotSetPolicyTest(policy = Delegation.class, includeNonDeviceAdminStates = false)
     public void setDelegatedScopes_invalidAdmin_throwsSecurityException() {
         try (TestAppInstance testApp = sTestApp.install(sUser)) {
             assertThrows(SecurityException.class, () ->
                     sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                             sDeviceState.dpc().componentName(),
-                            testApp.testApp().packageName(),
+                            testApp.packageName(),
                             Arrays.asList(TEST_SCOPE, TEST_SCOPE_2)));
         }
     }
 
-    @Test
     @CannotSetPolicyTest(policy = Delegation.class)
     public void getDelegatedScopes_invalidAdmin_throwsSecurityException() {
         try (TestAppInstance testApp = sTestApp.install(sUser)) {
             assertThrows(SecurityException.class, () ->
                     sDeviceState.dpc().devicePolicyManager().getDelegatedScopes(
-                            sDeviceState.dpc().componentName(), testApp.testApp().packageName()));
+                            sDeviceState.dpc().componentName(), testApp.packageName()));
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = Delegation.class)
+    @CanSetPolicyTest(policy = Delegation.class)
     public void getDelegatedScopes_returnsLatestFromSetDelegatedScopes() {
         try (TestAppInstance testApp = sTestApp.install(sUser)) {
 
             try {
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp.testApp().packageName(),
+                        testApp.packageName(),
                         Collections.singletonList(TEST_SCOPE));
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp.testApp().packageName(),
+                        testApp.packageName(),
                         Collections.singletonList(TEST_SCOPE_2));
 
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatedScopes(
                                 sDeviceState.dpc().componentName(),
-                                testApp.testApp().packageName()))
+                                testApp.packageName()))
                         .containsExactly(TEST_SCOPE_2);
 
             } finally {
@@ -153,7 +207,6 @@
         }
     }
 
-    @Test
     @CanSetPolicyTest(policy = Delegation.class)
     public void setDelegatedScopes_uninstalledPackage_throwsExceptionWithoutChangingState() {
         // This test cannot be split into two without ErrorProne complaining that an Exception is
@@ -169,23 +222,22 @@
                 .isEmpty();
     }
 
-    @Test
-    @PositivePolicyTest(policy = Delegation.class)
+    @CanSetPolicyTest(policy = Delegation.class)
     public void getDelegatePackages_oneApp_twoScopes_returnsFromSetDelegatedScopes() {
         try (TestAppInstance testApp = sTestApp.install(sUser)) {
 
             try {
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp.testApp().packageName(),
+                        testApp.packageName(),
                         Arrays.asList(TEST_SCOPE, TEST_SCOPE_2));
 
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatePackages(sDeviceState.dpc().componentName(), TEST_SCOPE))
-                        .containsExactly(testApp.testApp().packageName());
+                        .containsExactly(testApp.packageName());
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatePackages(sDeviceState.dpc().componentName(), TEST_SCOPE_2))
-                        .containsExactly(testApp.testApp().packageName());
+                        .containsExactly(testApp.packageName());
 
             } finally {
                 resetDelegatedScopes(testApp);
@@ -193,18 +245,16 @@
         }
     }
 
-    @Test
     @CannotSetPolicyTest(policy = Delegation.class, includeNonDeviceAdminStates = false)
     public void getDelegatePackages_invalidAdmin_throwsSecurityException() {
         try (TestAppInstance testApp = sTestApp.install(sUser)) {
             assertThrows(SecurityException.class, () ->
                     sDeviceState.dpc().devicePolicyManager().getDelegatePackages(
-                            sDeviceState.dpc().componentName(), testApp.testApp().packageName()));
+                            sDeviceState.dpc().componentName(), testApp.packageName()));
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = Delegation.class)
+    @CanSetPolicyTest(policy = Delegation.class)
     public void getDelegatePackages_twoApps_differentScopes_returnsFromSetDelegatedScopes() {
         try (TestAppInstance testApp = sTestApp.install(sUser);
              TestAppInstance testApp2 = sTestApp2.install(sUser)) {
@@ -212,19 +262,19 @@
             try {
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp.testApp().packageName(),
+                        testApp.packageName(),
                         Collections.singletonList(TEST_SCOPE));
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp2.testApp().packageName(),
+                        testApp2.packageName(),
                         Collections.singletonList(TEST_SCOPE_2));
 
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatePackages(sDeviceState.dpc().componentName(), TEST_SCOPE))
-                        .containsExactly(testApp.testApp().packageName());
+                        .containsExactly(testApp.packageName());
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatePackages(sDeviceState.dpc().componentName(), TEST_SCOPE_2))
-                        .containsExactly(testApp2.testApp().packageName());
+                        .containsExactly(testApp2.packageName());
 
             } finally {
                 resetDelegatedScopes(testApp);
@@ -233,8 +283,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = Delegation.class)
+    @PolicyAppliesTest(policy = Delegation.class)
     public void getDelegatePackages_twoApps_sameScope_returnsFromSetDelegatedScopes() {
         try (TestAppInstance testApp = sTestApp.install(sUser);
              TestAppInstance testApp2 = sTestApp2.install(sUser)) {
@@ -242,18 +291,18 @@
             try {
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp.testApp().packageName(),
+                        testApp.packageName(),
                         Collections.singletonList(TEST_SCOPE));
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp2.testApp().packageName(),
+                        testApp2.packageName(),
                         Collections.singletonList(TEST_SCOPE));
 
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatePackages(sDeviceState.dpc().componentName(), TEST_SCOPE))
                         .containsExactly(
-                                testApp.testApp().packageName(),
-                                testApp2.testApp().packageName());
+                                testApp.packageName(),
+                                testApp2.packageName());
 
             } finally {
                 resetDelegatedScopes(testApp);
@@ -262,14 +311,13 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = NetworkLoggingDelegation.class)
+    @PolicyAppliesTest(policy = NetworkLoggingDelegation.class)
     public void setDelegatedScopes_networkLogging_validAdminType_noException() {
         try (TestAppInstance testApp = sTestApp.install(sUser)) {
             try {
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp.testApp().packageName(),
+                        testApp.packageName(),
                         Collections.singletonList(DELEGATION_NETWORK_LOGGING));
             } finally {
                 resetDelegatedScopes(testApp);
@@ -277,7 +325,6 @@
         }
     }
 
-    @Test
     @CannotSetPolicyTest(
             policy = NetworkLoggingDelegation.class, includeNonDeviceAdminStates = false)
     public void setDelegatedScopes_networkLogging_invalidAdminType_throwsSecurityException() {
@@ -286,7 +333,7 @@
                 assertThrows(SecurityException.class, () ->
                         sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                                 sDeviceState.dpc().componentName(),
-                                testApp.testApp().packageName(),
+                                testApp.packageName(),
                                 Collections.singletonList(DELEGATION_NETWORK_LOGGING)));
             } finally {
                 resetDelegatedScopes(testApp);
@@ -294,8 +341,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = SecurityLoggingDelegation.class)
+    @PolicyAppliesTest(policy = SecurityLoggingDelegation.class)
     // TODO(b/198774281): add a negative policy test (in line with all the others here) once we can
     //  correctly mark security logging delegation as possible for COPE profile POs.
     public void setDelegatedScopes_securityLogging_validAdminType_noException() {
@@ -303,7 +349,7 @@
             try {
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp.testApp().packageName(),
+                        testApp.packageName(),
                         Collections.singletonList(DELEGATION_SECURITY_LOGGING));
             } finally {
                 resetDelegatedScopes(testApp);
@@ -311,8 +357,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = Delegation.class)
+    @PolicyAppliesTest(policy = Delegation.class)
     public void setDelegatedScopes_certSelection_settingSecondApp_revokesFirstApp() {
         try (TestAppInstance testApp = sTestApp.install(sUser);
              TestAppInstance testApp2 = sTestApp2.install(sUser)) {
@@ -320,22 +365,22 @@
             try {
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp.testApp().packageName(),
+                        testApp.packageName(),
                         Collections.singletonList(DELEGATION_CERT_SELECTION));
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp2.testApp().packageName(),
+                        testApp2.packageName(),
                         Collections.singletonList(DELEGATION_CERT_SELECTION));
 
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatedScopes(
                                 sDeviceState.dpc().componentName(),
-                                testApp.testApp().packageName()))
+                                testApp.packageName()))
                         .isEmpty();
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatedScopes(
                                 sDeviceState.dpc().componentName(),
-                                testApp2.testApp().packageName()))
+                                testApp2.packageName()))
                         .containsExactly(DELEGATION_CERT_SELECTION);
 
             } finally {
@@ -345,8 +390,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = NetworkLoggingDelegation.class)
+    @PolicyAppliesTest(policy = NetworkLoggingDelegation.class)
     public void setDelegatedScopes_networkLogging_settingSecondApp_revokesFirstApp() {
         try (TestAppInstance testApp = sTestApp.install(sUser);
              TestAppInstance testApp2 = sTestApp2.install(sUser)) {
@@ -354,22 +398,22 @@
             try {
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp.testApp().packageName(),
+                        testApp.packageName(),
                         Collections.singletonList(DELEGATION_NETWORK_LOGGING));
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp2.testApp().packageName(),
+                        testApp2.packageName(),
                         Collections.singletonList(DELEGATION_NETWORK_LOGGING));
 
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatedScopes(
                                 sDeviceState.dpc().componentName(),
-                                testApp.testApp().packageName()))
+                                testApp.packageName()))
                         .isEmpty();
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatedScopes(
                                 sDeviceState.dpc().componentName(),
-                                testApp2.testApp().packageName()))
+                                testApp2.packageName()))
                         .containsExactly(DELEGATION_NETWORK_LOGGING);
 
             } finally {
@@ -379,8 +423,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = SecurityLoggingDelegation.class)
+    @PolicyAppliesTest(policy = SecurityLoggingDelegation.class)
     public void setDelegatedScopes_securityLogging_settingSecondApp_revokesFirstApp() {
         try (TestAppInstance testApp = sTestApp.install(sUser);
              TestAppInstance testApp2 = sTestApp2.install(sUser)) {
@@ -388,22 +431,22 @@
             try {
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp.testApp().packageName(),
+                        testApp.packageName(),
                         Collections.singletonList(DELEGATION_SECURITY_LOGGING));
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp2.testApp().packageName(),
+                        testApp2.packageName(),
                         Collections.singletonList(DELEGATION_SECURITY_LOGGING));
 
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatedScopes(
                                 sDeviceState.dpc().componentName(),
-                                testApp.testApp().packageName()))
+                                testApp.packageName()))
                         .isEmpty();
                 assertThat(sDeviceState.dpc().devicePolicyManager()
                         .getDelegatedScopes(
                                 sDeviceState.dpc().componentName(),
-                                testApp2.testApp().packageName()))
+                                testApp2.packageName()))
                         .containsExactly(DELEGATION_SECURITY_LOGGING);
 
             } finally {
@@ -413,8 +456,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = Delegation.class)
+    @PolicyAppliesTest(policy = Delegation.class)
     public void setDelegatedScopes_delegatedPackageReceivesScopesFromBroadcast() {
         try (TestAppInstance testApp = sTestApp.install(sUser)) {
             // TODO(b/198769413): we should not need to start (or query for) an activity, but the
@@ -422,12 +464,13 @@
             testApp.activities().any().start();
             // TODO(b/198588980): automatically register every test app for this broadcast.
             testApp.registerReceiver(
-                    new IntentFilter(ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED));
+                    new IntentFilter(ACTION_APPLICATION_DELEGATION_SCOPES_CHANGED),
+                    RECEIVER_EXPORTED);
 
             try {
                 sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                         sDeviceState.dpc().componentName(),
-                        testApp.testApp().packageName(),
+                        testApp.packageName(),
                         Arrays.asList(TEST_SCOPE, TEST_SCOPE_2));
 
                 // TODO(b/198294382): support .stringListValue().contains(List<String>) to
@@ -448,7 +491,7 @@
     private void resetDelegatedScopes(TestAppInstance testApp) {
         sDeviceState.dpc().devicePolicyManager().setDelegatedScopes(
                 sDeviceState.dpc().componentName(),
-                testApp.testApp().packageName(),
+                testApp.packageName(),
                 /* scopes= */ Collections.emptyList());
     }
 }
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/DeviceOwnerPrerequisitesTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/DeviceOwnerPrerequisitesTest.java
deleted file mode 100644
index 264dd12..0000000
--- a/tests/devicepolicy/src/android/devicepolicy/cts/DeviceOwnerPrerequisitesTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Copyright (C) 2021 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 android.devicepolicy.cts;
-
-import static com.android.queryable.queries.ServiceQuery.service;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.junit.Assert.assertThrows;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-
-import com.android.bedstead.harrier.BedsteadJUnit4;
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.Postsubmit;
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDeviceOwner;
-import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoProfileOwner;
-import com.android.bedstead.nene.TestApis;
-import com.android.bedstead.nene.exceptions.AdbException;
-import com.android.bedstead.nene.utils.Poll;
-import com.android.bedstead.nene.utils.ShellCommand;
-import com.android.bedstead.remotedpc.RemoteDpc;
-import com.android.bedstead.testapp.TestApp;
-import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
-
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-@RunWith(BedsteadJUnit4.class)
-public final class DeviceOwnerPrerequisitesTest {
-    @ClassRule
-    @Rule
-    public static final DeviceState sDeviceState = new DeviceState();
-
-    private static final Context sContext = TestApis.context().instrumentedContext();
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-    private static final TestApp sAccountManagementApp = sTestAppProvider
-            .query()
-            // TODO(b/198417584): Support Querying XML resources in TestApp.
-            // TODO(b/198590265) Filter for the correct account type.
-            .whereServices().contains(
-                    service().serviceClass().className()
-                            .isEqualTo("com.android.bedstead.testapp.AccountManagementApp"
-                                    + ".TestAppAccountAuthenticatorService"))
-            .get();
-    private static final TestApp sDpcApp = sTestAppProvider
-            .query()
-            .wherePackageName().isEqualTo(RemoteDpc.DPC_COMPONENT_NAME.getPackageName())
-            .get();
-
-    private static final String EXISTING_ACCOUNT_TYPE =
-            "com.android.bedstead.testapp.AccountManagementApp.account.type";
-    private static final String SET_DEVICE_OWNER_COMMAND = "dpm set-device-owner";
-    private static final Account ACCOUNT_WITH_EXISTING_TYPE
-            = new Account("user0", EXISTING_ACCOUNT_TYPE);
-    private static final String TEST_PASSWORD = "password";
-
-    private AccountManager mAccountManager;
-
-    @Before
-    public void setUp() {
-        mAccountManager = sContext.getSystemService(AccountManager.class);
-    }
-
-    @Test
-    @Postsubmit(reason = "new test with sleep")
-    @EnsureHasNoDeviceOwner
-    @EnsureHasNoProfileOwner
-    public void setDeviceOwnerViaAdb_deviceHasAccount_fails()
-            throws InterruptedException {
-        try (TestAppInstance accountAuthenticatorApp =
-                     sAccountManagementApp.install(TestApis.users().instrumented());
-             TestAppInstance dpcApp = sDpcApp.install(TestApis.users().instrumented())) {
-            addAccount();
-
-            assertThrows(AdbException.class, () ->
-                    ShellCommand
-                            .builderForUser(
-                                    TestApis.users().instrumented(), SET_DEVICE_OWNER_COMMAND)
-                            .addOperand(RemoteDpc.DPC_COMPONENT_NAME.flattenToString())
-                            .execute());
-            assertThat(TestApis.devicePolicy().getDeviceOwner()).isNull();
-            DevicePolicyManager dpm = TestApis.context().instrumentedContext()
-                    .getSystemService(DevicePolicyManager.class);
-            // After attempting and failing to set the device owner, it will remain as an active
-            // admin for a short while
-            Poll.forValue("Active admins", dpm::getActiveAdmins)
-                    .toMeet(i -> i == null || !i.contains(RemoteDpc.DPC_COMPONENT_NAME))
-                    .errorOnFail("Expected active admins to not contain RemoteDPC")
-                    .await();
-        }
-    }
-
-    /**
-     * Blocks until an account is added.
-     */
-    private void addAccount() {
-        Poll.forValue("account created success", this::addAccountOnce)
-                .toBeEqualTo(true)
-                .errorOnFail()
-                .await();
-    }
-
-    private boolean addAccountOnce() {
-        return mAccountManager.addAccountExplicitly(
-                ACCOUNT_WITH_EXISTING_TYPE,
-                TEST_PASSWORD,
-                /* userdata= */ null);
-    }
-}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/DeviceOwnerTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/DeviceOwnerTest.java
new file mode 100644
index 0000000..79151e3
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/DeviceOwnerTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2021 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 android.devicepolicy.cts;
+
+import static com.android.bedstead.nene.permissions.CommonPermissions.MANAGE_PROFILE_AND_DEVICE_OWNERS;
+import static com.android.queryable.queries.ServiceQuery.service;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.UserType;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.UserTest;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDpc;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.exceptions.AdbException;
+import com.android.bedstead.nene.utils.Poll;
+import com.android.bedstead.nene.utils.ShellCommand;
+import com.android.bedstead.remotedpc.RemoteDpc;
+import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppInstance;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.time.Duration;
+
+@RunWith(BedsteadJUnit4.class)
+public final class DeviceOwnerTest {
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final TestApp sAccountManagementApp = sDeviceState.testApps()
+            .query()
+            // TODO(b/198417584): Support Querying XML resources in TestApp.
+            // TODO(b/198590265) Filter for the correct account type.
+            .whereServices().contains(
+                    service().serviceClass().className()
+                            .isEqualTo("com.android.bedstead.testapp.AccountManagementApp"
+                                    + ".TestAppAccountAuthenticatorService"))
+            .get();
+    private static final TestApp sDpcApp = sDeviceState.testApps()
+            .query().whereIsDeviceAdmin().isTrue()
+            .get();
+
+    private static final String EXISTING_ACCOUNT_TYPE =
+            "com.android.bedstead.testapp.AccountManagementApp.account.type";
+    private static final String SET_DEVICE_OWNER_COMMAND = "dpm set-device-owner";
+    private static final Account ACCOUNT_WITH_EXISTING_TYPE =
+            new Account("user0", EXISTING_ACCOUNT_TYPE);
+    private static final String TEST_PASSWORD = "password";
+
+    private static final AccountManager sAccountManager =
+            sContext.getSystemService(AccountManager.class);
+    private static final DevicePolicyManager sDevicePolicyManager =
+            sContext.getSystemService(DevicePolicyManager.class);
+
+    @Test
+    @Postsubmit(reason = "new test")
+    @EnsureHasDeviceOwner
+    public void setDeviceOwner_setsDeviceOwner() {
+        assertThat(sDevicePolicyManager.isAdminActive(sDeviceState.dpc().componentName()))
+                .isTrue();
+        assertThat(sDevicePolicyManager.isDeviceOwnerApp(sDeviceState.dpc().packageName()))
+                .isTrue();
+        assertThat(sDevicePolicyManager.getDeviceOwner())
+                .isEqualTo(sDeviceState.dpc().packageName());
+    }
+
+
+    @Test
+    @Postsubmit(reason = "new test")
+    @EnsureHasNoDpc
+    public void setDeviceOwnerViaAdb_deviceHasAccount_fails()
+            throws InterruptedException {
+        try (TestAppInstance accountAuthenticatorApp =
+                     sAccountManagementApp.install(TestApis.users().instrumented());
+             TestAppInstance dpcApp = sDpcApp.install(TestApis.users().instrumented())) {
+            addAccount();
+
+            assertThrows(AdbException.class, () ->
+                    ShellCommand
+                            .builderForUser(
+                                    TestApis.users().instrumented(), SET_DEVICE_OWNER_COMMAND)
+                            .addOperand(RemoteDpc.DPC_COMPONENT_NAME.flattenToString())
+                            .execute());
+            assertThat(TestApis.devicePolicy().getDeviceOwner()).isNull();
+            DevicePolicyManager dpm = TestApis.context().instrumentedContext()
+                    .getSystemService(DevicePolicyManager.class);
+            // After attempting and failing to set the device owner, it will remain as an active
+            // admin for a short while
+            Poll.forValue("Active admins", dpm::getActiveAdmins)
+                    .toMeet(i -> i == null || !i.contains(RemoteDpc.DPC_COMPONENT_NAME))
+                    .errorOnFail("Expected active admins to not contain RemoteDPC")
+                    .timeout(Duration.ofMinutes(5))
+                    .await();
+        }
+    }
+
+    @UserTest({UserType.PRIMARY_USER, UserType.SECONDARY_USER})
+    @EnsureHasDeviceOwner
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @Postsubmit(reason = "new test")
+    public void getDeviceOwnerNameOnAnyUser_returnsDeviceOwnerName() {
+        assertThat(sDevicePolicyManager.getDeviceOwnerNameOnAnyUser())
+                .isEqualTo(sDeviceState.dpc().packageName());
+    }
+
+    @UserTest({UserType.PRIMARY_USER, UserType.SECONDARY_USER})
+    @EnsureHasDeviceOwner
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @Postsubmit(reason = "new test")
+    public void getDeviceOwnerComponentOnAnyUser_returnsDeviceOwnerComponent() {
+        assertThat(sDevicePolicyManager.getDeviceOwnerComponentOnAnyUser())
+                .isEqualTo(sDeviceState.dpc().componentName());
+    }
+
+    /**
+     * Blocks until an account is added.
+     */
+    private void addAccount() {
+        Poll.forValue("account created success", this::addAccountOnce)
+                .toBeEqualTo(true)
+                .errorOnFail()
+                .await();
+    }
+
+    private boolean addAccountOnce() {
+        return sAccountManager.addAccountExplicitly(
+                ACCOUNT_WITH_EXISTING_TYPE,
+                TEST_PASSWORD,
+                /* userdata= */ null);
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagementRoleHolderTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagementRoleHolderTest.java
new file mode 100644
index 0000000..bfb00d1
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagementRoleHolderTest.java
@@ -0,0 +1,256 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static android.app.admin.DevicePolicyManager.ACTION_ROLE_HOLDER_PROVISION_FINALIZATION;
+import static android.app.admin.DevicePolicyManager.ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE;
+import static android.app.admin.DevicePolicyManager.ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE;
+import static android.content.Intent.ACTION_MANAGED_PROFILE_AVAILABLE;
+import static android.content.Intent.ACTION_MANAGED_PROFILE_REMOVED;
+import static android.content.Intent.ACTION_MANAGED_PROFILE_UNAVAILABLE;
+import static android.content.pm.PackageManager.FEATURE_MANAGED_USERS;
+
+import static com.android.bedstead.nene.permissions.CommonPermissions.MANAGE_PROFILE_AND_DEVICE_OWNERS;
+import static com.android.queryable.queries.ActivityQuery.activity;
+import static com.android.queryable.queries.IntentFilterQuery.intentFilter;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.admin.DevicePolicyManager;
+import android.app.admin.ManagedProfileProvisioningParams;
+import android.app.admin.ProvisioningException;
+import android.content.ComponentName;
+import android.content.Context;
+import android.os.UserHandle;
+
+import com.android.bedstead.deviceadminapp.DeviceAdminApp;
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureHasNoSecondaryUser;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.RequireFeature;
+import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDpc;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.packages.Package;
+import com.android.bedstead.nene.users.UserReference;
+import com.android.bedstead.remotedpc.RemoteDpc;
+import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppInstance;
+import com.android.eventlib.truth.EventLogsSubject;
+import com.android.queryable.queries.ActivityQuery;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+// TODO(b/228016400): replace usages of createAndProvisionManagedProfile with a nene API
+@RunWith(BedsteadJUnit4.class)
+public class DevicePolicyManagementRoleHolderTest {
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final ComponentName DEVICE_ADMIN_COMPONENT_NAME =
+            DeviceAdminApp.deviceAdminComponentName(sContext);
+    private static final String PROFILE_OWNER_NAME = "testDeviceAdmin";
+    private static final ManagedProfileProvisioningParams MANAGED_PROFILE_PROVISIONING_PARAMS =
+            createManagedProfileProvisioningParamsBuilder().build();
+    private static final DevicePolicyManager sDevicePolicyManager =
+            sContext.getSystemService(DevicePolicyManager.class);
+    private static final ActivityQuery<?> sQueryForRoleHolderTrustedSourceAction =
+            activity().intentFilters().contains(
+                intentFilter().actions().contains(
+                        ACTION_ROLE_HOLDER_PROVISION_MANAGED_DEVICE_FROM_TRUSTED_SOURCE));
+    private static final ActivityQuery<?> sQueryForRoleHolderManagedProfileAction =
+            activity().intentFilters().contains(
+                intentFilter().actions().contains(
+                        ACTION_ROLE_HOLDER_PROVISION_MANAGED_PROFILE));
+    private static final ActivityQuery<?> sQueryForRoleHolderFinalizationAction =
+            activity().intentFilters().contains(
+                intentFilter().actions().contains(
+                        ACTION_ROLE_HOLDER_PROVISION_FINALIZATION));
+    private static final TestApp sRoleHolderApp = sDeviceState.testApps()
+            .query()
+            .whereActivities()
+            .contains(
+                    sQueryForRoleHolderTrustedSourceAction,
+                    sQueryForRoleHolderManagedProfileAction,
+                    sQueryForRoleHolderFinalizationAction)
+            .get();
+    private static final String MANAGED_USER_NAME = "managed user name";
+
+    @Postsubmit(reason = "new test")
+    @RequireFeature(FEATURE_MANAGED_USERS)
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoDpc
+    @EnsureHasNoSecondaryUser
+    @Test
+    public void createAndProvisionManagedProfile_roleHolderIsInWorkProfile()
+            throws ProvisioningException, InterruptedException {
+        UserHandle profile = null;
+        String roleHolderPackageName = null;
+        try (TestAppInstance roleHolderApp = sRoleHolderApp.install()) {
+            roleHolderPackageName = roleHolderApp.packageName();
+            TestApis.devicePolicy().setDevicePolicyManagementRoleHolder(roleHolderPackageName);
+
+            profile = sDevicePolicyManager.createAndProvisionManagedProfile(
+                    MANAGED_PROFILE_PROVISIONING_PARAMS);
+
+            assertThat(TestApis.packages().installedForUser(UserReference.of(profile)))
+                    .contains(Package.of(roleHolderApp.packageName()));
+        } finally {
+            if (profile != null) {
+                TestApis.users().find(profile).remove();
+            }
+            if (roleHolderPackageName != null) {
+                TestApis.devicePolicy()
+                        .unsetDevicePolicyManagementRoleHolder(roleHolderPackageName);
+            }
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @RequireFeature(FEATURE_MANAGED_USERS)
+    @EnsureHasDeviceOwner
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoSecondaryUser
+    @Test
+    public void createAndManageUser_roleHolderIsInManagedUser() throws InterruptedException {
+        UserHandle managedUser = null;
+        String roleHolderPackageName = null;
+        try (TestAppInstance roleHolderApp = sRoleHolderApp.install()) {
+            roleHolderPackageName = roleHolderApp.packageName();
+            TestApis.devicePolicy().setDevicePolicyManagementRoleHolder(roleHolderPackageName);
+
+            managedUser = sDeviceState.dpc().devicePolicyManager().createAndManageUser(
+                    RemoteDpc.DPC_COMPONENT_NAME,
+                    MANAGED_USER_NAME,
+                    RemoteDpc.DPC_COMPONENT_NAME,
+                    /* adminExtras= */ null,
+                    /* flags= */ 0);
+
+            assertThat(TestApis.packages().installedForUser(UserReference.of(managedUser)))
+                    .contains(Package.of(roleHolderApp.packageName()));
+        } finally {
+            if (managedUser != null) {
+                TestApis.users().find(managedUser).remove();
+            }
+            if (roleHolderPackageName != null) {
+                TestApis.devicePolicy()
+                        .unsetDevicePolicyManagementRoleHolder(roleHolderPackageName);
+            }
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @RequireFeature(FEATURE_MANAGED_USERS)
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoDpc
+    @EnsureHasNoSecondaryUser
+    @Test
+    public void profileRemoved_roleHolderReceivesBroadcast() throws Exception {
+        String roleHolderPackageName = null;
+        try (TestAppInstance roleHolderApp = sRoleHolderApp.install()) {
+            roleHolderPackageName = roleHolderApp.packageName();
+            TestApis.devicePolicy().setDevicePolicyManagementRoleHolder(roleHolderPackageName);
+            UserHandle profile = sDevicePolicyManager.createAndProvisionManagedProfile(
+                    MANAGED_PROFILE_PROVISIONING_PARAMS);
+
+            TestApis.users().find(profile).remove();
+
+            EventLogsSubject.assertThat(roleHolderApp.events().broadcastReceived()
+                            .whereIntent().action().isEqualTo(ACTION_MANAGED_PROFILE_REMOVED))
+                    .eventOccurred();
+        } finally {
+            if (roleHolderPackageName != null) {
+                TestApis.devicePolicy().unsetDevicePolicyManagementRoleHolder(
+                        roleHolderPackageName);
+            }
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @RequireFeature(FEATURE_MANAGED_USERS)
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoDpc
+    @EnsureHasNoSecondaryUser
+    @Test
+    public void profilePaused_roleHolderReceivesBroadcast() throws Exception {
+        String roleHolderPackageName = null;
+        try (TestAppInstance roleHolderApp = sRoleHolderApp.install()) {
+            roleHolderPackageName = roleHolderApp.packageName();
+            TestApis.devicePolicy().setDevicePolicyManagementRoleHolder(roleHolderPackageName);
+            UserHandle profile = sDevicePolicyManager.createAndProvisionManagedProfile(
+                    MANAGED_PROFILE_PROVISIONING_PARAMS);
+
+            TestApis.users().find(profile).setQuietMode(true);
+
+            EventLogsSubject.assertThat(roleHolderApp.events().broadcastReceived()
+                            .whereIntent().action().isEqualTo(ACTION_MANAGED_PROFILE_UNAVAILABLE))
+                    .eventOccurred();
+        } finally {
+            if (roleHolderPackageName != null) {
+                TestApis.devicePolicy().unsetDevicePolicyManagementRoleHolder(
+                        roleHolderPackageName);
+            }
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @RequireFeature(FEATURE_MANAGED_USERS)
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoDpc
+    @EnsureHasNoSecondaryUser
+    @Test
+    public void profileStarted_roleHolderReceivesBroadcast() throws Exception {
+        String roleHolderPackageName = null;
+        try (TestAppInstance roleHolderApp = sRoleHolderApp.install()) {
+            roleHolderPackageName = roleHolderApp.packageName();
+            TestApis.devicePolicy().setDevicePolicyManagementRoleHolder(roleHolderPackageName);
+            UserHandle profile = sDevicePolicyManager.createAndProvisionManagedProfile(
+                    MANAGED_PROFILE_PROVISIONING_PARAMS);
+            TestApis.users().find(profile).setQuietMode(true);
+
+            TestApis.users().find(profile).setQuietMode(false);
+
+            EventLogsSubject.assertThat(roleHolderApp.events().broadcastReceived()
+                            .whereIntent().action().isEqualTo(ACTION_MANAGED_PROFILE_AVAILABLE))
+                    .eventOccurred();
+        } finally {
+            if (roleHolderPackageName != null) {
+                TestApis.devicePolicy().unsetDevicePolicyManagementRoleHolder(
+                        roleHolderPackageName);
+            }
+        }
+    }
+
+    private static ManagedProfileProvisioningParams.Builder
+            createManagedProfileProvisioningParamsBuilder() {
+        return new ManagedProfileProvisioningParams.Builder(
+                DEVICE_ADMIN_COMPONENT_NAME,
+                PROFILE_OWNER_NAME);
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagerTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagerTest.java
index 028bb31..5bb50978 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagerTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/DevicePolicyManagerTest.java
@@ -18,25 +18,58 @@
 
 import static android.Manifest.permission.INTERACT_ACROSS_USERS;
 import static android.Manifest.permission.INTERACT_ACROSS_USERS_FULL;
-import static android.Manifest.permission.WRITE_SECURE_SETTINGS;
+import static android.Manifest.permission.MANAGE_ROLE_HOLDERS;
+import static android.Manifest.permission.PROVISION_DEMO_DEVICE;
 import static android.app.AppOpsManager.MODE_ALLOWED;
+import static android.app.admin.DevicePolicyManager.ACTION_MANAGED_PROFILE_PROVISIONED;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_LOCALE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_TIME_ZONE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_WIFI_PASSWORD;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_WIFI_SECURITY_TYPE;
+import static android.app.admin.DevicePolicyManager.EXTRA_PROVISIONING_WIFI_SSID;
+import static android.app.admin.DevicePolicyManager.MIME_TYPE_PROVISIONING_NFC;
+import static android.app.admin.ProvisioningException.ERROR_PRE_CONDITION_FAILED;
+import static android.content.Intent.EXTRA_USER;
+import static android.content.pm.PackageManager.FEATURE_DEVICE_ADMIN;
+import static android.content.pm.PackageManager.FEATURE_MANAGED_USERS;
+import static android.nfc.NfcAdapter.ACTION_NDEF_DISCOVERED;
+import static android.nfc.NfcAdapter.EXTRA_NDEF_MESSAGES;
+
+import static com.android.bedstead.nene.users.UserType.MANAGED_PROFILE_TYPE_NAME;
+import static com.android.bedstead.remotedpc.RemoteDpc.REMOTE_DPC_TEST_APP;
+import static com.android.queryable.queries.ServiceQuery.service;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.junit.Assert.assertThrows;
+import static org.junit.Assume.assumeFalse;
 
 import android.accounts.Account;
 import android.accounts.AccountManager;
+import android.annotation.RequiresFeature;
 import android.app.AppOpsManager;
 import android.app.admin.DevicePolicyManager;
 import android.app.admin.FullyManagedDeviceProvisioningParams;
 import android.app.admin.ManagedProfileProvisioningParams;
+import android.app.admin.ProvisioningException;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.CrossProfileApps;
 import android.content.pm.PackageManager;
+import android.nfc.NdefMessage;
+import android.nfc.NdefRecord;
+import android.os.BaseBundle;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Parcelable;
+import android.os.PersistableBundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
@@ -46,31 +79,64 @@
 import com.android.bedstead.deviceadminapp.DeviceAdminApp;
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.AfterClass;
 import com.android.bedstead.harrier.annotations.EnsureDoesNotHavePermission;
+import com.android.bedstead.harrier.annotations.EnsureHasNoSecondaryUser;
+import com.android.bedstead.harrier.annotations.EnsureHasNoWorkProfile;
 import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.EnsureHasSecondaryUser;
+import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile;
 import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.harrier.annotations.RequireDoesNotHaveFeature;
 import com.android.bedstead.harrier.annotations.RequireFeature;
+import com.android.bedstead.harrier.annotations.RequireNotHeadlessSystemUserMode;
 import com.android.bedstead.harrier.annotations.RequireRunOnPrimaryUser;
+import com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser;
+import com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile;
 import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner;
 import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoDpc;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasNoProfileOwner;
+import com.android.bedstead.harrier.annotations.enterprise.EnsureHasProfileOwner;
 import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.devicepolicy.DeviceOwner;
+import com.android.bedstead.nene.devicepolicy.ProfileOwner;
+import com.android.bedstead.nene.packages.Package;
 import com.android.bedstead.nene.permissions.PermissionContext;
+import com.android.bedstead.nene.users.UserReference;
+import com.android.bedstead.nene.users.UserType;
+import com.android.bedstead.nene.utils.Poll;
+import com.android.bedstead.remotedpc.RemoteDpc;
+import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppInstance;
+import com.android.bedstead.testapp.TestAppProvider;
 import com.android.compatibility.common.util.SystemUtil;
+import com.android.eventlib.events.broadcastreceivers.BroadcastReceivedEvent;
 
+import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Properties;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 @RunWith(BedsteadJUnit4.class)
 public final class DevicePolicyManagerTest {
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
     private static final Context sContext = ApplicationProvider.getApplicationContext();
     private static final DevicePolicyManager sDevicePolicyManager =
             sContext.getSystemService(DevicePolicyManager.class);
@@ -78,6 +144,17 @@
     private static final UserManager sUserManager = sContext.getSystemService(UserManager.class);
     private static final SharedPreferences sSharedPreferences =
             sContext.getSharedPreferences("required-apps.txt", Context.MODE_PRIVATE);
+    private static final AccountManager sAccountManager =
+            sContext.getSystemService(AccountManager.class);
+    private static final TestApp sAccountManagementApp = sDeviceState.testApps()
+            .query()
+            // TODO(b/198417584): Support Querying XML resources in TestApp.
+            // TODO(b/198590265) Filter for the correct account type.
+            .whereServices().contains(
+                    service().serviceClass().className()
+                            .isEqualTo("com.android.bedstead.testapp.AccountManagementApp"
+                                    + ".TestAppAccountAuthenticatorService"))
+            .get();
 
     private static final ComponentName DEVICE_ADMIN_COMPONENT_NAME =
             DeviceAdminApp.deviceAdminComponentName(sContext);
@@ -93,7 +170,11 @@
     private static final String ACCOUNT_TYPE = "com.android.cts.test";
     private static final Account TEST_ACCOUNT = new Account(ACCOUNT_NAME, ACCOUNT_TYPE);
 
-    private static final String USER_SETUP_COMPLETE_KEY = "user_setup_complete";
+    private static final String EXISTING_ACCOUNT_TYPE =
+            "com.android.bedstead.testapp.AccountManagementApp.account.type";
+    private static final Account ACCOUNT_WITH_EXISTING_TYPE =
+            new Account("user0", EXISTING_ACCOUNT_TYPE);
+    private static final String TEST_PASSWORD = "password";
 
     private static final String KEY_PRE_PROVISIONING_SYSTEM_APPS = "pre_provisioning_system_apps";
     private static final String KEY_PRE_PROVISIONING_NON_SYSTEM_APPS =
@@ -105,15 +186,95 @@
             "dpm set-device-owner --user cur " + DEVICE_ADMIN_COMPONENT_NAME.flattenToString();
     private static final String REMOVE_ACTIVE_ADMIN_COMMAND =
             "dpm remove-active-admin --user cur " + DEVICE_ADMIN_COMPONENT_NAME.flattenToString();
+    private static final String SET_PROFILE_OWNER_COMMAND =
+            "dpm set-profile-owner --user cur " + DEVICE_ADMIN_COMPONENT_NAME.flattenToString();
 
-    @ClassRule
-    @Rule
-    public static final DeviceState sDeviceState = new DeviceState();
+    private static final String NFC_INTENT_COMPONENT_NAME =
+            "com.test.dpc/com.test.dpc.DeviceAdminReceiver";
+    private static final String NFC_INTENT_PACKAGE_NAME =
+            "com.test.dpc.DeviceAdminReceiver";
+    private static final String NFC_INTENT_LOCALE = "en_US";
+    private static final String NFC_INTENT_TIMEZONE = "America/New_York";
+    private static final String NFC_INTENT_WIFI_SSID = "\"" + "TestWifiSsid" + "\"";
+    private static final String NFC_INTENT_WIFI_SECURITY_TYPE = "";
+    private static final String NFC_INTENT_WIFI_PASSWORD = "";
+    private static final String NFC_INTENT_BAD_ACTION = "badAction";
+    private static final String NFC_INTENT_BAD_MIME = "badMime";
+    private static final String NFC_INTENT_PROVISIONING_SAMPLE = "NFC provisioning sample";
+    private static final Intent NFC_INTENT_NO_NDEF_RECORD = new Intent(ACTION_NDEF_DISCOVERED);
+    private static final HashMap<String, String> NFC_DATA_VALID = createNfcIntentData();
+    private static final HashMap<String, String> NFC_DATA_EMPTY = new HashMap();
+    private static final Map<String, String> NFC_DATA_WITH_COMPONENT_NAME =
+            Map.of(EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME, NFC_INTENT_COMPONENT_NAME);
+    private static final Map<String, String> NFC_DATA_WITH_ADMIN_PACKAGE_NAME =
+            Map.of(EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME, NFC_INTENT_PACKAGE_NAME);
+
+    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
+    private static final TestApp sDpcApp = sTestAppProvider.query()
+            .whereIsDeviceAdmin().isTrue()
+            .whereTestOnly().isFalse()
+            .get();
+
+    private static final PersistableBundle ADMIN_EXTRAS_BUNDLE = createAdminExtrasBundle();
+    private static final String TEST_KEY = "test_key";
+    private static final String TEST_VALUE = "test_value";
+    private static final UserType MANAGED_PROFILE_USER_TYPE =
+            TestApis.users().supportedType(MANAGED_PROFILE_TYPE_NAME);
+
+    @Before
+    public void setUp() {
+        try (PermissionContext p = TestApis.permissions()
+                .withPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)) {
+            sDevicePolicyManager.setDpcDownloaded(false);
+        }
+    }
+
+    @AfterClass
+    public static void tearDown() {
+        try (PermissionContext p = TestApis.permissions()
+                .withPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)) {
+            sDevicePolicyManager.setDpcDownloaded(false);
+        }
+    }
+
+    @Test
+    @EnsureHasNoDpc
+    public void setAndRemoveDeviceOwnerRepeatedly_doesNotThrowError() {
+        try (TestAppInstance dpcInstance = sDpcApp.install()) {
+            ComponentName dpcComponentName = new ComponentName(sDpcApp.packageName(),
+                    sDpcApp.packageName() + ".DeviceAdminReceiver");
+
+            for (int i = 0; i < 100; i++) {
+                DeviceOwner deviceOwner = TestApis.devicePolicy().setDeviceOwner(dpcComponentName);
+                deviceOwner.remove();
+            }
+        }
+    }
+
+    @Test
+    @EnsureHasNoDpc
+    @EnsureHasNoWorkProfile
+    @RequireRunOnPrimaryUser
+    public void setAndRemoveProfileOwnerRepeatedly_doesNotThrowError() {
+        try (UserReference profile = TestApis.users().createUser().createAndStart()) {
+            try (TestAppInstance dpcInstance = sDpcApp.install(profile)) {
+                ComponentName dpcComponentName = new ComponentName(sDpcApp.packageName(),
+                        sDpcApp.packageName() + ".DeviceAdminReceiver");
+
+                for (int i = 0; i < 100; i++) {
+                    ProfileOwner profileOwner = TestApis.devicePolicy().setProfileOwner(
+                            profile, dpcComponentName);
+
+                    profileOwner.remove();
+                }
+            }
+        }
+    }
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
-    @RequireFeature(PackageManager.FEATURE_MANAGED_USERS)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_MANAGED_USERS)
     @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
     @Test
     public void newlyProvisionedManagedProfile_createsProfile() throws Exception {
@@ -133,8 +294,8 @@
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
-    @RequireFeature(PackageManager.FEATURE_MANAGED_USERS)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_MANAGED_USERS)
     @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
     @Test
     public void newlyProvisionedManagedProfile_createsManagedProfile() throws Exception {
@@ -154,8 +315,8 @@
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
-    @RequireFeature(PackageManager.FEATURE_MANAGED_USERS)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_MANAGED_USERS)
     @EnsureHasPermission({MANAGE_PROFILE_AND_DEVICE_OWNERS, INTERACT_ACROSS_USERS_FULL})
     @Test
     public void newlyProvisionedManagedProfile_setsActiveAdmin() throws Exception {
@@ -177,8 +338,8 @@
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
-    @RequireFeature(PackageManager.FEATURE_MANAGED_USERS)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_MANAGED_USERS)
     @EnsureHasPermission({MANAGE_PROFILE_AND_DEVICE_OWNERS, INTERACT_ACROSS_USERS})
     @Test
     public void newlyProvisionedManagedProfile_setsProfileOwner() throws Exception {
@@ -199,8 +360,8 @@
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
-    @RequireFeature(PackageManager.FEATURE_MANAGED_USERS)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_MANAGED_USERS)
     @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
     @Ignore
     @Test
@@ -224,8 +385,8 @@
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
-    @RequireFeature(PackageManager.FEATURE_MANAGED_USERS)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_MANAGED_USERS)
     @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
     @Test
     public void newlyProvisionedManagedProfile_removesAccountFromParentByDefault()
@@ -249,8 +410,8 @@
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
-    @RequireFeature(PackageManager.FEATURE_MANAGED_USERS)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_MANAGED_USERS)
     @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
     @Ignore
     @Test
@@ -261,7 +422,7 @@
             ManagedProfileProvisioningParams params =
                     createManagedProfileProvisioningParamsBuilder()
                             .setAccountToMigrate(TEST_ACCOUNT)
-                            .setKeepAccountMigrated(true)
+                            .setKeepingAccountOnMigration(true)
                             .build();
             profile = provisionManagedProfile(params);
 
@@ -275,8 +436,8 @@
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
-    @RequireFeature(PackageManager.FEATURE_MANAGED_USERS)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_MANAGED_USERS)
     @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
     @Test
     public void newlyProvisionedManagedProfile_removesNonRequiredAppsFromProfile()
@@ -301,8 +462,8 @@
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
-    @RequireFeature(PackageManager.FEATURE_MANAGED_USERS)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_MANAGED_USERS)
     @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
     @Test
     public void newlyProvisionedManagedProfile_setsCrossProfilePackages()
@@ -324,6 +485,23 @@
         }
     }
 
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_MANAGED_USERS)
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @Postsubmit(reason = "new test")
+    @Test
+    public void createAndProvisionManagedProfile_withExistingProfile_preconditionFails()
+            throws Exception {
+        ManagedProfileProvisioningParams params =
+                createManagedProfileProvisioningParamsBuilder().build();
+
+        ProvisioningException exception = assertThrows(ProvisioningException.class, () ->
+                provisionManagedProfile(params));
+        assertThat(exception.getProvisioningError()).isEqualTo(ERROR_PRE_CONDITION_FAILED);
+    }
+
     private void assertIsCrossProfilePackageIfInstalled(String packageName) throws Exception {
         if (!isPackageInstalledOnCurrentUser(packageName)) {
             return;
@@ -375,8 +553,17 @@
     }
 
     private Set<String> getInstalledPackagesOnUser(Set<String> packages, UserHandle user) {
-        return packages.stream().filter(p -> isPackageInstalledOnUser(p, user))
-                .collect(Collectors.toSet());
+        Set<String> installedPackagesOnUser = new HashSet<>();
+
+        UserReference userRef = TestApis.users().find(user);
+        Collection<Package> packageInUser = TestApis.packages().installedForUser(userRef);
+        for (Package pkg : packageInUser) {
+            if (packages.contains(pkg.packageName())) {
+                installedPackagesOnUser.add(pkg.packageName());
+            }
+        }
+
+        return installedPackagesOnUser;
     }
 
     private boolean isPackageInstalledOnCurrentUser(String packageName) {
@@ -412,112 +599,243 @@
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
     @EnsureHasPermission({MANAGE_PROFILE_AND_DEVICE_OWNERS})
     @Test
     public void newlyProvisionedFullyManagedDevice_setsDeviceOwner() throws Exception {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
         try {
+
             FullyManagedDeviceProvisioningParams params =
                     createDefaultManagedDeviceProvisioningParamsBuilder().build();
-            resetUserSetupCompletedFlag();
             sDevicePolicyManager.provisionFullyManagedDevice(params);
 
             assertThat(sDevicePolicyManager.isDeviceOwnerApp(sContext.getPackageName())).isTrue();
+
         } finally {
             sDevicePolicyManager.forceRemoveActiveAdmin(
                     DEVICE_ADMIN_COMPONENT_NAME, sContext.getUserId());
-            setUserSetupCompletedFlag();
+            TestApis.users().current().setSetupComplete(setupComplete);
         }
     }
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
     @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
     @Test
     public void newlyProvisionedFullyManagedDevice_doesNotThrowException() throws Exception {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
         try {
+
             FullyManagedDeviceProvisioningParams params =
                     createDefaultManagedDeviceProvisioningParamsBuilder().build();
-            resetUserSetupCompletedFlag();
             sDevicePolicyManager.provisionFullyManagedDevice(params);
+
         } finally {
             sDevicePolicyManager.forceRemoveActiveAdmin(
                     DEVICE_ADMIN_COMPONENT_NAME, sContext.getUserId());
-            setUserSetupCompletedFlag();
+            TestApis.users().current().setSetupComplete(setupComplete);
         }
     }
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
     @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
     @Test
     public void newlyProvisionedFullyManagedDevice_canControlSensorPermissionGrantsByDefault()
             throws Exception {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
         try {
+
             FullyManagedDeviceProvisioningParams params =
                     createDefaultManagedDeviceProvisioningParamsBuilder().build();
-            resetUserSetupCompletedFlag();
             sDevicePolicyManager.provisionFullyManagedDevice(params);
 
             assertThat(sDevicePolicyManager.canAdminGrantSensorsPermissions()).isTrue();
+
         } finally {
             sDevicePolicyManager.forceRemoveActiveAdmin(
                     DEVICE_ADMIN_COMPONENT_NAME, sContext.getUserId());
-            setUserSetupCompletedFlag();
+            TestApis.users().current().setSetupComplete(setupComplete);
         }
     }
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
     @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     @Test
     public void newlyProvisionedFullyManagedDevice_canOptOutOfControllingSensorPermissionGrants()
             throws Exception {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
         try {
+
             FullyManagedDeviceProvisioningParams params =
                     createDefaultManagedDeviceProvisioningParamsBuilder()
-                            .setDeviceOwnerCanGrantSensorsPermissions(false)
+                            .setCanDeviceOwnerGrantSensorsPermissions(false)
                             .build();
-            resetUserSetupCompletedFlag();
             sDevicePolicyManager.provisionFullyManagedDevice(params);
 
             assertThat(sDevicePolicyManager.canAdminGrantSensorsPermissions()).isFalse();
+
         } finally {
             sDevicePolicyManager.forceRemoveActiveAdmin(
                     DEVICE_ADMIN_COMPONENT_NAME, sContext.getUserId());
-            setUserSetupCompletedFlag();
+            TestApis.users().current().setSetupComplete(setupComplete);
         }
     }
 
     @RequireRunOnPrimaryUser
     @EnsureHasNoDpc
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
     @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
     @Test
     public void newlyProvisionedFullyManagedDevice_leavesAllSystemAppsEnabledWhenRequested()
             throws Exception {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
         try {
+            Set<String> systemAppsBeforeProvisioning = findSystemApps();
+
             FullyManagedDeviceProvisioningParams params =
                     createDefaultManagedDeviceProvisioningParamsBuilder()
                             .setLeaveAllSystemAppsEnabled(true)
                             .build();
-            resetUserSetupCompletedFlag();
             sDevicePolicyManager.provisionFullyManagedDevice(params);
-            Set<String> systemAppsBeforeProvisioning = findSystemApps();
 
             Set<String> systemAppsAfterProvisioning = findSystemApps();
             assertThat(systemAppsAfterProvisioning).isEqualTo(systemAppsBeforeProvisioning);
         } finally {
             sDevicePolicyManager.forceRemoveActiveAdmin(
                     DEVICE_ADMIN_COMPONENT_NAME, sContext.getUserId());
-            setUserSetupCompletedFlag();
+            TestApis.users().current().setSetupComplete(setupComplete);
         }
     }
 
+    @Postsubmit(reason = "New test")
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoDpc
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @Test
+    public void newlyProvisionedFullyManagedDevice_setsDeviceAsDemoDeviceWhenRequested()
+            throws Exception {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
+        // TODO(b/222499341): replace with annotations
+        int demoDevice = TestApis.settings().global().getInt(Settings.Global.DEVICE_DEMO_MODE, 0);
+        TestApis.settings().global().putInt(Settings.Global.DEVICE_DEMO_MODE, 0);
+        try {
+            FullyManagedDeviceProvisioningParams params =
+                    createDefaultManagedDeviceProvisioningParamsBuilder()
+                            .setDemoDevice(true)
+                            .build();
+            sDevicePolicyManager.provisionFullyManagedDevice(params);
+
+            assertThat(TestApis.settings().global().getInt(Settings.Global.DEVICE_DEMO_MODE, 0))
+                    .isEqualTo(1);
+        } finally {
+            TestApis.users().current().setSetupComplete(setupComplete);
+            TestApis.settings().global().putInt(Settings.Global.DEVICE_DEMO_MODE, demoDevice);
+        }
+    }
+
+    @Postsubmit(reason = "New test")
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoDpc
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @Test
+    public void newlyProvisionedFullyManagedDevice_setsProvisioningStateWhenDemoDeviceIsRequested()
+            throws Exception {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
+        // TODO(b/222499341): replace with annotations
+        int demoDevice = TestApis.settings().global().getInt(Settings.Global.DEVICE_DEMO_MODE, 0);
+        try {
+            FullyManagedDeviceProvisioningParams params =
+                    createDefaultManagedDeviceProvisioningParamsBuilder()
+                            .setDemoDevice(true)
+                            .build();
+            sDevicePolicyManager.provisionFullyManagedDevice(params);
+
+            assertThat(sDevicePolicyManager.getUserProvisioningState())
+                    .isEqualTo(DevicePolicyManager.STATE_USER_SETUP_FINALIZED);
+        } finally {
+            TestApis.users().current().setSetupComplete(setupComplete);
+            TestApis.settings().global().putInt(Settings.Global.DEVICE_DEMO_MODE, demoDevice);
+        }
+    }
+
+    @Postsubmit(reason = "New test")
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoDpc
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @EnsureHasPermission(PROVISION_DEMO_DEVICE)
+    @EnsureDoesNotHavePermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @Test
+    public void newlyProvisionedFullyManagedDevice_withProvisionDemoDevicePermission_throwsSecurityException()
+            throws Exception {
+        FullyManagedDeviceProvisioningParams params =
+                createDefaultManagedDeviceProvisioningParamsBuilder()
+                        .build();
+
+        assertThrows(SecurityException.class, () ->
+                sDevicePolicyManager.provisionFullyManagedDevice(params));
+    }
+
+    @Postsubmit(reason = "New test")
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoDpc
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @EnsureHasPermission(PROVISION_DEMO_DEVICE)
+    @EnsureDoesNotHavePermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @Test
+    public void newlyProvisionedFullyManagedDevice_withProvisionDemoDevicePermissionForDemoDevice_doesNotThrowException()
+            throws Exception {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
+        // TODO(b/222499341): replace with annotations
+        int demoDevice = TestApis.settings().global().getInt(Settings.Global.DEVICE_DEMO_MODE, 0);
+        try {
+            FullyManagedDeviceProvisioningParams params =
+                    createDefaultManagedDeviceProvisioningParamsBuilder()
+                            .setDemoDevice(true)
+                            .build();
+
+            sDevicePolicyManager.provisionFullyManagedDevice(params);
+
+        } finally {
+            TestApis.users().current().setSetupComplete(setupComplete);
+            TestApis.settings().global().putInt(Settings.Global.DEVICE_DEMO_MODE, demoDevice);
+        }
+    }
+
+    @Postsubmit(reason = "New test")
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoDpc
+    @RequireFeature(FEATURE_DEVICE_ADMIN)
+    @EnsureDoesNotHavePermission({
+            PROVISION_DEMO_DEVICE,
+            MANAGE_PROFILE_AND_DEVICE_OWNERS})
+    @Test
+    public void newlyProvisionedFullyManagedDevice_withoutRequiredPermissionsForDemoDevice_throwsSecurityException()
+            throws Exception {
+        FullyManagedDeviceProvisioningParams params =
+                createDefaultManagedDeviceProvisioningParamsBuilder()
+                        .setDemoDevice(true)
+                        .build();
+
+        assertThrows(SecurityException.class, () ->
+                sDevicePolicyManager.provisionFullyManagedDevice(params));
+    }
 
     @RequireDoesNotHaveFeature(PackageManager.FEATURE_AUTOMOTIVE)
     @EnsureHasPermission(MANAGE_DEVICE_ADMINS)
@@ -538,20 +856,6 @@
                 .setLeaveAllSystemAppsEnabled(true);
     }
 
-    private void resetUserSetupCompletedFlag() {
-        try (PermissionContext p = TestApis.permissions().withPermission(WRITE_SECURE_SETTINGS)) {
-            Settings.Secure.putInt(sContext.getContentResolver(), USER_SETUP_COMPLETE_KEY, 0);
-        }
-        sDevicePolicyManager.forceUpdateUserSetupComplete(sContext.getUserId());
-    }
-
-    private void setUserSetupCompletedFlag() {
-        try (PermissionContext p = TestApis.permissions().withPermission(WRITE_SECURE_SETTINGS)) {
-            Settings.Secure.putInt(sContext.getContentResolver(), USER_SETUP_COMPLETE_KEY, 1);
-        }
-        sDevicePolicyManager.forceUpdateUserSetupComplete(sContext.getUserId());
-    }
-
     private Set<String> findSystemApps() {
         return sPackageManager.getInstalledApplications(PackageManager.MATCH_SYSTEM_ONLY)
                 .stream()
@@ -637,6 +941,86 @@
                 .collect(Collectors.toSet());
     }
 
+    @Test
+    public void createProvisioningIntentFromNfcIntent_validNfcIntent_returnsValidIntent()
+            throws IOException {
+        Intent nfcIntent = createNfcIntentFromMap(NFC_DATA_VALID);
+
+        Intent provisioningIntent =
+                sDevicePolicyManager.createProvisioningIntentFromNfcIntent(nfcIntent);
+
+        assertThat(provisioningIntent).isNotNull();
+        assertThat(provisioningBundleToMap(provisioningIntent.getExtras()))
+                .containsAtLeastEntriesIn(NFC_DATA_VALID);
+    }
+
+    @Test
+    public void createProvisioningIntentFromNfcIntent_noComponentNorPackage_returnsNull()
+            throws IOException {
+        Intent nfcIntent = createNfcIntentFromMap(NFC_DATA_EMPTY);
+
+        Intent provisioningIntent =
+                sDevicePolicyManager.createProvisioningIntentFromNfcIntent(nfcIntent);
+
+        assertThat(provisioningIntent).isNull();
+    }
+
+    @Test
+    public void createProvisioningIntentFromNfcIntent_withComponent_returnsValidIntent()
+            throws IOException {
+        Intent nfcIntent = createNfcIntentFromMap(NFC_DATA_WITH_COMPONENT_NAME);
+
+        Intent provisioningIntent =
+                sDevicePolicyManager.createProvisioningIntentFromNfcIntent(nfcIntent);
+
+        assertThat(provisioningIntent).isNotNull();
+        assertThat(provisioningBundleToMap(provisioningIntent.getExtras()))
+                .containsAtLeastEntriesIn(NFC_DATA_WITH_COMPONENT_NAME);
+    }
+
+    @Test
+    public void createProvisioningIntentFromNfcIntent_withPackage_returnsValidIntent()
+            throws IOException {
+        Intent nfcIntent = createNfcIntentFromMap(NFC_DATA_WITH_ADMIN_PACKAGE_NAME);
+
+        Intent provisioningIntent =
+                sDevicePolicyManager.createProvisioningIntentFromNfcIntent(nfcIntent);
+
+        assertThat(provisioningIntent).isNotNull();
+        assertThat(provisioningBundleToMap(provisioningIntent.getExtras()))
+                .containsAtLeastEntriesIn(NFC_DATA_WITH_ADMIN_PACKAGE_NAME);
+    }
+
+    @Test
+    public void createProvisioningIntentFromNfcIntent_badIntentAction_returnsNull()
+            throws IOException {
+        Intent nfcIntent = createNfcIntentWithAction(NFC_INTENT_BAD_ACTION);
+
+        Intent provisioningIntent =
+                sDevicePolicyManager.createProvisioningIntentFromNfcIntent(nfcIntent);
+
+        assertThat(provisioningIntent).isNull();
+    }
+
+    @Test
+    public void createProvisioningIntentFromNfcIntent_badMimeType_returnsNull()
+            throws IOException {
+        Intent nfcIntent = createNfcIntentWithMimeType(NFC_INTENT_BAD_MIME);
+
+        Intent provisioningIntent =
+                sDevicePolicyManager.createProvisioningIntentFromNfcIntent(nfcIntent);
+
+        assertThat(provisioningIntent).isNull();
+    }
+
+    @Test
+    public void createProvisioningIntentFromNfcIntent_doesNotIncludeNdefRecord_returnsNull() {
+        Intent provisioningIntent = sDevicePolicyManager
+                .createProvisioningIntentFromNfcIntent(NFC_INTENT_NO_NDEF_RECORD);
+
+        assertThat(provisioningIntent).isNull();
+    }
+
     @EnsureHasDeviceOwner
     @Test
     public void getCameraDisabled_adminPassedDoesNotBelongToCaller_throwsException() {
@@ -667,4 +1051,814 @@
         sDevicePolicyManager.removeActiveAdmin(
                 sDeviceState.deviceOwner().componentName());
     }
+
+    private static HashMap<String, String> createNfcIntentData() {
+        HashMap<String, String> nfcIntentInput = new HashMap<String, String>();
+        nfcIntentInput.putAll(
+                Map.of(EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME, NFC_INTENT_COMPONENT_NAME,
+                EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME, NFC_INTENT_PACKAGE_NAME,
+                EXTRA_PROVISIONING_LOCALE, NFC_INTENT_LOCALE,
+                EXTRA_PROVISIONING_TIME_ZONE, NFC_INTENT_TIMEZONE,
+                EXTRA_PROVISIONING_WIFI_SSID, NFC_INTENT_WIFI_SSID,
+                EXTRA_PROVISIONING_WIFI_SECURITY_TYPE, NFC_INTENT_WIFI_SECURITY_TYPE,
+                EXTRA_PROVISIONING_WIFI_PASSWORD, NFC_INTENT_WIFI_PASSWORD)
+        );
+
+        return nfcIntentInput;
+    }
+
+    private Intent createNfcIntentWithAction(String action)
+            throws IOException {
+        return createNfcIntent(NFC_DATA_VALID, action, MIME_TYPE_PROVISIONING_NFC);
+    }
+
+    private Intent createNfcIntentWithMimeType(String mime)
+            throws IOException {
+        return createNfcIntent(NFC_DATA_VALID, ACTION_NDEF_DISCOVERED, mime);
+    }
+
+    private Intent createNfcIntentFromMap(Map<String, String> input)
+            throws IOException {
+        return createNfcIntent(input, ACTION_NDEF_DISCOVERED, MIME_TYPE_PROVISIONING_NFC);
+    }
+
+    private Intent createNfcIntent(Map<String, String> input, String action, String mime)
+            throws IOException {
+        Intent nfcIntent = new Intent(action);
+        Parcelable[] nfcMessages =
+                new Parcelable[]{createNdefMessage(input, mime)};
+        nfcIntent.putExtra(EXTRA_NDEF_MESSAGES, nfcMessages);
+
+        return nfcIntent;
+    }
+
+    private Map<String, String> provisioningBundleToMap(Bundle bundle) {
+        Map<String, String> map = new HashMap();
+
+        for (String key : bundle.keySet()) {
+            if(EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME.equals(key)) {
+                ComponentName componentName = bundle.getParcelable(key);
+                map.put(key, componentName.getPackageName() + "/" + componentName.getClassName());
+            }
+            else {
+                map.put(key, bundle.getString(key));
+            }
+        }
+
+        return map;
+    }
+
+    private NdefMessage createNdefMessage(Map<String, String> provisioningValues, String mime)
+            throws IOException {
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        Properties properties = new Properties();
+        // Store all the values into the Properties object
+        for (Map.Entry<String, String> e : provisioningValues.entrySet()) {
+            properties.put(e.getKey(), e.getValue());
+        }
+
+        properties.store(stream, NFC_INTENT_PROVISIONING_SAMPLE);
+        NdefRecord record = NdefRecord.createMime(mime, stream.toByteArray());
+
+        return new NdefMessage(new NdefRecord[]{record});
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureDoesNotHavePermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void checkProvisioningPreCondition_withoutRequiredPermission_throwsSecurityException() {
+        assertThrows(SecurityException.class, () ->
+                sDevicePolicyManager.checkProvisioningPrecondition(
+                        DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,
+                        DEVICE_ADMIN_COMPONENT_NAME.getPackageName()));
+
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void checkProvisioningPreCondition_withRequiredPermission_doesNotThrowSecurityException() {
+        sDevicePolicyManager.checkProvisioningPrecondition(
+                DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,
+                DEVICE_ADMIN_COMPONENT_NAME.getPackageName());
+
+        // Doesn't throw exception.
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireDoesNotHaveFeature(FEATURE_DEVICE_ADMIN)
+    public void checkProvisioningPreCondition_withoutDeviceAdminFeature_returnsDeviceAdminNotSupported() {
+        assertThat(
+                sDevicePolicyManager.checkProvisioningPrecondition(
+                        DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,
+                        DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                .isEqualTo(DevicePolicyManager.STATUS_DEVICE_ADMIN_NOT_SUPPORTED);
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoDpc
+    @RequireFeature(FEATURE_MANAGED_USERS)
+    public void checkProvisioningPreCondition_actionPO_returnsOk() {
+        assertThat(
+                sDevicePolicyManager.checkProvisioningPrecondition(
+                        DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,
+                        DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                .isEqualTo(DevicePolicyManager.STATUS_OK);
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireDoesNotHaveFeature(FEATURE_MANAGED_USERS)
+    public void checkProvisioningPreCondition_actionPO_withoutManagedUserFeature_returnsManagedUsersNotSupported() {
+        assertThat(
+                sDevicePolicyManager.checkProvisioningPrecondition(
+                        DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,
+                        DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                .isEqualTo(DevicePolicyManager.STATUS_MANAGED_USERS_NOT_SUPPORTED);
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @EnsureHasProfileOwner
+    @RequireRunOnSecondaryUser
+    @RequireFeature(FEATURE_MANAGED_USERS)
+    public void checkProvisioningPreCondition_actionPO_onManagedUser_returnsHasProfileOwner() {
+        assertThat(
+                sDevicePolicyManager.checkProvisioningPrecondition(
+                        DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,
+                        DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                .isEqualTo(DevicePolicyManager.STATUS_USER_HAS_PROFILE_OWNER);
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnWorkProfile
+    public void checkProvisioningPreCondition_actionPO_onManagedProfile_returnsHasProfileOwner() {
+        assertThat(
+                sDevicePolicyManager.checkProvisioningPrecondition(
+                        DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,
+                        DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                .isEqualTo(DevicePolicyManager.STATUS_USER_HAS_PROFILE_OWNER);
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @EnsureHasDeviceOwner
+    @RequireFeature(FEATURE_MANAGED_USERS)
+    public void checkProvisioningPreCondition_actionPO_onManagedDevice_returnsCanNotAddManagedProfile() {
+        assertThat(
+                sDevicePolicyManager.checkProvisioningPrecondition(
+                        DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,
+                        DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                .isEqualTo(DevicePolicyManager.STATUS_CANNOT_ADD_MANAGED_PROFILE);
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @EnsureHasWorkProfile
+    @RequireRunOnPrimaryUser
+    public void checkProvisioningPreCondition_actionPO_withWorkProfile_returnsCanNotAddManagedProfile() {
+        assertThat(
+                sDevicePolicyManager.checkProvisioningPrecondition(
+                        DevicePolicyManager.ACTION_PROVISION_MANAGED_PROFILE,
+                        DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                .isEqualTo(DevicePolicyManager.STATUS_CANNOT_ADD_MANAGED_PROFILE);
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoDpc
+    @RequireNotHeadlessSystemUserMode
+    public void checkProvisioningPreCondition_actionDO_returnsOk() {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
+
+        try {
+            assertThat(
+                    sDevicePolicyManager.checkProvisioningPrecondition(
+                            DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,
+                            DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                    .isEqualTo(DevicePolicyManager.STATUS_OK);
+
+        } finally {
+            TestApis.users().current().setSetupComplete(setupComplete);
+        }
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnPrimaryUser
+    @EnsureHasNoDpc
+    @RequireNotHeadlessSystemUserMode
+    public void checkProvisioningPreCondition_actionDO_setupComplete_returnsUserSetupCompleted() {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(true);
+
+        try {
+            assertThat(
+                    sDevicePolicyManager.checkProvisioningPrecondition(
+                            DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,
+                            DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                    .isEqualTo(DevicePolicyManager.STATUS_USER_SETUP_COMPLETED);
+
+        } finally {
+            TestApis.users().current().setSetupComplete(setupComplete);
+        }
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnPrimaryUser
+    @EnsureHasDeviceOwner
+    @EnsureHasNoWorkProfile
+    @RequireNotHeadlessSystemUserMode
+    public void checkProvisioningPreCondition_actionDO_onManagedDevice_returnsHasDeviceOwner() {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
+
+        try {
+            assertThat(
+                    sDevicePolicyManager.checkProvisioningPrecondition(
+                            DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,
+                            DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                    .isEqualTo(DevicePolicyManager.STATUS_HAS_DEVICE_OWNER);
+
+        } finally {
+            TestApis.users().current().setSetupComplete(setupComplete);
+        }
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnWorkProfile
+    @RequireNotHeadlessSystemUserMode
+    public void checkProvisioningPreCondition_actionDO_onManagedProfile_returnsHasProfileOwner() {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
+
+        try {
+            assertThat(
+                    sDevicePolicyManager.checkProvisioningPrecondition(
+                            DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,
+                            DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                    .isEqualTo(DevicePolicyManager.STATUS_USER_HAS_PROFILE_OWNER);
+
+        } finally {
+            TestApis.users().current().setSetupComplete(setupComplete);
+        }
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnSecondaryUser
+    @EnsureHasProfileOwner
+    @RequireNotHeadlessSystemUserMode
+    public void checkProvisioningPreCondition_actionDO_onManagedUser_returnsHasProfileOwner() {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
+
+        try {
+            assertThat(
+                    sDevicePolicyManager.checkProvisioningPrecondition(
+                            DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,
+                            DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                    .isEqualTo(DevicePolicyManager.STATUS_USER_HAS_PROFILE_OWNER);
+
+        } finally {
+            TestApis.users().current().setSetupComplete(setupComplete);
+        }
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnSecondaryUser
+    @EnsureHasNoProfileOwner
+    @RequireNotHeadlessSystemUserMode
+    @RequiresFeature(FEATURE_DEVICE_ADMIN)
+    public void checkProvisioningPreCondition_actionDO_onNonSystemUser_returnsNotSystemUser() {
+        boolean setupComplete = TestApis.users().current().getSetupComplete();
+        TestApis.users().current().setSetupComplete(false);
+
+        try {
+            assertThat(
+                    sDevicePolicyManager.checkProvisioningPrecondition(
+                            DevicePolicyManager.ACTION_PROVISION_MANAGED_DEVICE,
+                            DEVICE_ADMIN_COMPONENT_NAME.getPackageName()))
+                    .isEqualTo(DevicePolicyManager.STATUS_NOT_SYSTEM_USER);
+
+        } finally {
+            TestApis.users().current().setSetupComplete(setupComplete);
+        }
+    }
+
+    // TODO(b/208843126): add more CTS coverage for setUserProvisioningState
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureDoesNotHavePermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void setUserProvisioningState_withoutRequiredPermission_throwsSecurityException() {
+        assertThrows(SecurityException.class, () ->
+                sDevicePolicyManager.setUserProvisioningState(
+                        DevicePolicyManager.STATE_USER_UNMANAGED,
+                        TestApis.users().current().userHandle()));
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @RequireRunOnWorkProfile
+    public void setUserProvisioningState_withRequiredPermission_doesNotThrowSecurityException() {
+        sDevicePolicyManager.setUserProvisioningState(
+                DevicePolicyManager.STATE_USER_PROFILE_FINALIZED,
+                TestApis.users().current().userHandle());
+
+        // Doesn't throw exception.
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @EnsureHasNoDpc
+    @RequireFeature(FEATURE_MANAGED_USERS)
+    public void setUserProvisioningState_unmanagedDevice_stateUserSetupIncomplete_throwsIllegalStateException() {
+        assertThrows(IllegalStateException.class, () ->
+                sDevicePolicyManager.setUserProvisioningState(
+                        DevicePolicyManager.STATE_USER_SETUP_INCOMPLETE,
+                        TestApis.users().current().userHandle()));
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @EnsureHasNoDpc
+    public void setUserProvisioningState_unmanagedDevice_stateUserSetupComplete_throwsIllegalStateException() {
+        assertThrows(IllegalStateException.class, () ->
+                sDevicePolicyManager.setUserProvisioningState(
+                        DevicePolicyManager.STATE_USER_SETUP_COMPLETE,
+                        TestApis.users().current().userHandle()));
+
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @EnsureHasNoDpc
+    public void setUserProvisioningState_unmanagedDevice_stateUserSetupFinalized_throwsIllegalStateException() {
+        assertThrows(IllegalStateException.class, () ->
+                sDevicePolicyManager.setUserProvisioningState(
+                        DevicePolicyManager.STATE_USER_SETUP_FINALIZED,
+                        TestApis.users().current().userHandle()));
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @EnsureHasNoDpc
+    public void setUserProvisioningState_unmanagedDevice_stateUserProfileComplete_throwsIllegalStateException() {
+        assertThrows(IllegalStateException.class, () ->
+                sDevicePolicyManager.setUserProvisioningState(
+                        DevicePolicyManager.STATE_USER_PROFILE_COMPLETE,
+                        TestApis.users().current().userHandle()));
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @EnsureHasNoDpc
+    public void setUserProvisioningState_unmanagedDevice_stateUserProfileFinalized_throwsIllegalStateException() {
+        assertThrows(IllegalStateException.class, () ->
+                sDevicePolicyManager.setUserProvisioningState(
+                        DevicePolicyManager.STATE_USER_PROFILE_FINALIZED,
+                        TestApis.users().current().userHandle()));
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @EnsureHasNoDpc
+    public void setUserProvisioningState_settingToSameState_throwIllegalStateException() {
+        assertThrows(IllegalStateException.class, () ->
+                sDevicePolicyManager.setUserProvisioningState(
+                        DevicePolicyManager.STATE_USER_UNMANAGED,
+                        TestApis.users().current().userHandle()));
+    }
+
+    @Test
+    public void setAdminExtras_managedProfileParams_works() {
+        ManagedProfileProvisioningParams params =
+                createManagedProfileProvisioningParamsBuilder()
+                        .setAdminExtras(ADMIN_EXTRAS_BUNDLE)
+                        .build();
+
+        assertBundlesEqual(params.getAdminExtras(), ADMIN_EXTRAS_BUNDLE);
+    }
+
+    @Test
+    public void setAdminExtras_managedProfileParams_modifyBundle_internalBundleNotModified() {
+        PersistableBundle adminExtrasBundle = new PersistableBundle(ADMIN_EXTRAS_BUNDLE);
+        ManagedProfileProvisioningParams params =
+                createManagedProfileProvisioningParamsBuilder()
+                        .setAdminExtras(adminExtrasBundle)
+                        .build();
+
+        adminExtrasBundle.putString(TEST_KEY, TEST_VALUE);
+
+        assertBundlesEqual(params.getAdminExtras(), ADMIN_EXTRAS_BUNDLE);
+    }
+
+    @Test
+    public void getAdminExtras_managedProfileParams_modifyResult_internalBundleNotModified() {
+        PersistableBundle adminExtrasBundle = new PersistableBundle(ADMIN_EXTRAS_BUNDLE);
+        ManagedProfileProvisioningParams params =
+                createManagedProfileProvisioningParamsBuilder()
+                        .setAdminExtras(adminExtrasBundle)
+                        .build();
+
+        params.getAdminExtras().putString(TEST_KEY, TEST_VALUE);
+
+        assertBundlesEqual(params.getAdminExtras(), ADMIN_EXTRAS_BUNDLE);
+    }
+
+    @Test
+    public void setAdminExtras_managedProfileParams_emptyBundle_works() {
+        ManagedProfileProvisioningParams params =
+                createManagedProfileProvisioningParamsBuilder()
+                        .setAdminExtras(new PersistableBundle())
+                        .build();
+
+        assertThat(params.getAdminExtras().isEmpty()).isTrue();
+    }
+
+    @Test
+    public void setAdminExtras_managedProfileParams_nullBundle_works() {
+        ManagedProfileProvisioningParams params =
+                createManagedProfileProvisioningParamsBuilder()
+                        .setAdminExtras(null)
+                        .build();
+
+        assertThat(params.getAdminExtras().isEmpty()).isTrue();
+    }
+
+    @Test
+    public void setAdminExtras_fullyManagedParams_works() {
+        FullyManagedDeviceProvisioningParams params =
+                createDefaultManagedDeviceProvisioningParamsBuilder()
+                        .setAdminExtras(ADMIN_EXTRAS_BUNDLE)
+                        .build();
+
+        assertBundlesEqual(params.getAdminExtras(), ADMIN_EXTRAS_BUNDLE);
+    }
+
+    @Test
+    public void setAdminExtras_fullyManagedParams_modifyBundle_internalBundleNotModified() {
+        PersistableBundle adminExtrasBundle = new PersistableBundle(ADMIN_EXTRAS_BUNDLE);
+        FullyManagedDeviceProvisioningParams params =
+                createDefaultManagedDeviceProvisioningParamsBuilder()
+                        .setAdminExtras(adminExtrasBundle)
+                        .build();
+
+        adminExtrasBundle.putString(TEST_KEY, TEST_VALUE);
+
+        assertBundlesEqual(params.getAdminExtras(), ADMIN_EXTRAS_BUNDLE);
+    }
+
+    @Test
+    public void getAdminExtras_fullyManagedParams_modifyResult_internalBundleNotModified() {
+        PersistableBundle adminExtrasBundle = new PersistableBundle(ADMIN_EXTRAS_BUNDLE);
+        FullyManagedDeviceProvisioningParams params =
+                createDefaultManagedDeviceProvisioningParamsBuilder()
+                        .setAdminExtras(adminExtrasBundle)
+                        .build();
+
+        params.getAdminExtras().putString(TEST_KEY, TEST_VALUE);
+
+        assertBundlesEqual(params.getAdminExtras(), ADMIN_EXTRAS_BUNDLE);
+    }
+
+    @Test
+    public void setAdminExtras_fullyManagedParams_emptyBundle_works() {
+        FullyManagedDeviceProvisioningParams params =
+                createDefaultManagedDeviceProvisioningParamsBuilder()
+                        .setAdminExtras(new PersistableBundle())
+                        .build();
+
+        assertThat(params.getAdminExtras().isEmpty()).isTrue();
+    }
+
+    @Test
+    public void setAdminExtras_fullyManagedParams_nullBundle_works() {
+        FullyManagedDeviceProvisioningParams params =
+                createDefaultManagedDeviceProvisioningParamsBuilder()
+                        .setAdminExtras(null)
+                        .build();
+
+        assertThat(params.getAdminExtras().isEmpty()).isTrue();
+    }
+
+    @Test
+    public void getDeviceManagerRoleHolderPackageName_doesNotCrash() {
+        sDevicePolicyManager.getDevicePolicyManagementRoleHolderPackage();
+    }
+
+    private static PersistableBundle createAdminExtrasBundle() {
+        PersistableBundle result = new PersistableBundle();
+        result.putString("key1", "value1");
+        result.putInt("key2", 2);
+        result.putBoolean("key3", true);
+        return result;
+    }
+
+    private static void assertBundlesEqual(BaseBundle bundle1, BaseBundle bundle2) {
+        if (bundle1 != null) {
+            assertWithMessage("Intent bundles are not equal")
+                    .that(bundle2).isNotNull();
+            assertWithMessage("Intent bundles are not equal")
+                    .that(bundle1.keySet().size()).isEqualTo(bundle2.keySet().size());
+            for (String key : bundle1.keySet()) {
+                assertWithMessage("Intent bundles are not equal")
+                        .that(bundle1.get(key))
+                        .isEqualTo(bundle2.get(key));
+            }
+        } else {
+            assertWithMessage("Intent bundles are not equal").that(bundle2).isNull();
+        }
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureDoesNotHavePermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void setDpcDownloaded_withoutRequiredPermission_throwsSecurityException() {
+        assertThrows(SecurityException.class, () -> sDevicePolicyManager.setDpcDownloaded(true));
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void setDpcDownloaded_withRequiredPermission_doesNotThrowSecurityException() {
+        sDevicePolicyManager.setDpcDownloaded(true);
+
+        // Doesn't throw exception
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void isDpcDownloaded_returnsResultOfSetDpcDownloaded() {
+        sDevicePolicyManager.setDpcDownloaded(true);
+
+        assertThat(sDevicePolicyManager.isDpcDownloaded()).isTrue();
+    }
+
+    // TODO(b/222669810): add ensureHasNoAccounts annotation
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasNoSecondaryUser
+    @EnsureHasNoWorkProfile
+    @EnsureHasPermission(MANAGE_ROLE_HOLDERS)
+    public void shouldAllowBypassingDevicePolicyManagementRoleQualification_noUsersAndAccounts_returnsTrue() {
+        // TODO(b/222669811): replace with annotation
+        assumeFalse(Build.isDebuggable());
+
+        assertThat(
+                sDevicePolicyManager.shouldAllowBypassingDevicePolicyManagementRoleQualification())
+                .isTrue();
+    }
+
+    // TODO(b/222669810): add ensureHasNoAccounts annotation
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasSecondaryUser
+    @EnsureHasPermission(MANAGE_ROLE_HOLDERS)
+    public void shouldAllowBypassingDevicePolicyManagementRoleQualification_withUsers_returnsFalse() {
+        // TODO(b/222669811): replace with annotation
+        assumeFalse(Build.isDebuggable());
+
+        assertThat(
+                sDevicePolicyManager.shouldAllowBypassingDevicePolicyManagementRoleQualification())
+                .isFalse();
+    }
+
+    // TODO(b/222669810): add ensureHasNoAccounts annotation
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasWorkProfile
+    @EnsureHasPermission(MANAGE_ROLE_HOLDERS)
+    public void shouldAllowBypassingDevicePolicyManagementRoleQualification_withProfile_returnsFalse() {
+        // TODO(b/222669811): replace with annotation
+        assumeFalse(Build.isDebuggable());
+
+        assertThat(
+                sDevicePolicyManager.shouldAllowBypassingDevicePolicyManagementRoleQualification())
+                .isFalse();
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureHasNoSecondaryUser
+    @EnsureHasNoWorkProfile
+    @EnsureHasPermission(MANAGE_ROLE_HOLDERS)
+    public void shouldAllowBypassingDevicePolicyManagementRoleQualification_withAccounts_returnsFalse() {
+        // TODO(b/222669811): replace with annotation
+        assumeFalse(Build.isDebuggable());
+
+        try (TestAppInstance accountAuthenticatorApp =
+                     sAccountManagementApp.install(TestApis.users().instrumented())) {
+            addAccount();
+
+            assertThat(
+                    sDevicePolicyManager.shouldAllowBypassingDevicePolicyManagementRoleQualification())
+                    .isFalse();
+        }
+    }
+
+    @Postsubmit(reason = "New test")
+    @Test
+    @EnsureDoesNotHavePermission(MANAGE_ROLE_HOLDERS)
+    public void shouldAllowBypassingDevicePolicyManagementRoleQualification_withoutRequiredPermission_throwsSecurityException() {
+        assertThrows(SecurityException.class, () ->
+                sDevicePolicyManager.shouldAllowBypassingDevicePolicyManagementRoleQualification());
+    }
+
+    /**
+     * Blocks until an account is added.
+     */
+    private void addAccount() {
+        Poll.forValue("account created success", this::addAccountOnce)
+                .toBeEqualTo(true)
+                .errorOnFail()
+                .await();
+    }
+
+    private boolean addAccountOnce() {
+        return sAccountManager.addAccountExplicitly(
+                ACCOUNT_WITH_EXISTING_TYPE,
+                TEST_PASSWORD,
+                /* userdata= */ null);
+    }
+
+    @Postsubmit(reason = "new test")
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    @EnsureDoesNotHavePermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void finalizeWorkProfileProvisioning_withoutPermission_throwsException() {
+        assertThrows(SecurityException.class, () ->
+                sDevicePolicyManager.finalizeWorkProfileProvisioning(
+                        sDeviceState.workProfile().userHandle(),
+                        /* migratedAccount= */ null));
+    }
+
+    @Postsubmit(reason = "new test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void finalizeWorkProfileProvisioning_nullManagedProfileUser_throwsException() {
+        assertThrows(NullPointerException.class, () ->
+                sDevicePolicyManager.finalizeWorkProfileProvisioning(
+                        /* managedProfileUser= */ null,
+                        /* migratedAccount= */ null));
+    }
+
+    @Postsubmit(reason = "new test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void finalizeWorkProfileProvisioning_nonExistingManagedProfileUser_throwsException() {
+        assertThrows(IllegalStateException.class, () ->
+                sDevicePolicyManager.finalizeWorkProfileProvisioning(
+                        /* managedProfileUser= */ TestApis.users().nonExisting().userHandle(),
+                        /* migratedAccount= */ null));
+    }
+
+    @Postsubmit(reason = "new test")
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasSecondaryUser
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void finalizeWorkProfileProvisioning_managedUser_throwsException() {
+        RemoteDpc dpc = RemoteDpc.setAsProfileOwner(sDeviceState.secondaryUser());
+        try {
+            assertThrows(IllegalStateException.class, () ->
+                    sDevicePolicyManager.finalizeWorkProfileProvisioning(
+                            /* managedProfileUser= */ sDeviceState.secondaryUser().userHandle(),
+                            /* migratedAccount= */ null));
+        } finally {
+            dpc.remove();
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @Test
+    @RequireRunOnPrimaryUser
+    @EnsureHasWorkProfile
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void finalizeWorkProfileProvisioning_managedProfileUserWithoutProfileOwner_throwsException() {
+        RemoteDpc dpc = sDeviceState.profileOwner(sDeviceState.workProfile());
+        try {
+            dpc.remove();
+            assertThrows(IllegalStateException.class, () ->
+                    sDevicePolicyManager.finalizeWorkProfileProvisioning(
+                            /* managedProfileUser= */ sDeviceState.workProfile().userHandle(),
+                            /* migratedAccount= */ null));
+        } finally {
+            RemoteDpc.setAsProfileOwner(sDeviceState.workProfile());
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @EnsureHasWorkProfile
+    public void finalizeWorkProfileProvisioning_valid_sendsBroadcast() {
+        try (TestAppInstance personalInstance = REMOTE_DPC_TEST_APP.install()) {
+            personalInstance.registerReceiver(new IntentFilter(ACTION_MANAGED_PROFILE_PROVISIONED));
+            sDevicePolicyManager.finalizeWorkProfileProvisioning(
+                    /* managedProfileUser= */ sDeviceState.workProfile().userHandle(),
+                    /* migratedAccount= */ null);
+
+            BroadcastReceivedEvent event = personalInstance.events().broadcastReceived()
+                    .whereIntent().action().isEqualTo(ACTION_MANAGED_PROFILE_PROVISIONED)
+                            .waitForEvent();
+            assertThat((UserHandle) event.intent().getParcelableExtra(EXTRA_USER))
+                    .isEqualTo(sDeviceState.workProfile().userHandle());
+
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @Test
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    @EnsureHasWorkProfile
+    public void finalizeWorkProfileProvisioning_withAccount_broadcastIncludesAccount() {
+        try (TestAppInstance personalInstance = REMOTE_DPC_TEST_APP.install()) {
+            personalInstance.registerReceiver(new IntentFilter(ACTION_MANAGED_PROFILE_PROVISIONED));
+
+            sDevicePolicyManager.finalizeWorkProfileProvisioning(
+                    /* managedProfileUser= */ sDeviceState.workProfile().userHandle(),
+                    /* migratedAccount= */ ACCOUNT_WITH_EXISTING_TYPE);
+
+            BroadcastReceivedEvent event = personalInstance.events().broadcastReceived()
+                    .whereIntent().action().isEqualTo(ACTION_MANAGED_PROFILE_PROVISIONED)
+                    .waitForEvent();
+            assertThat((Account) event.intent()
+                    .getParcelableExtra(EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE))
+                    .isEqualTo(ACCOUNT_WITH_EXISTING_TYPE);
+
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @Test
+    @EnsureHasNoDpc
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void getPolicyManagedProfiles_noManagedProfiles_returnsEmptyList() {
+        assertThat(sDevicePolicyManager.getPolicyManagedProfiles(
+                TestApis.context().instrumentationContext().getUser())).isEmpty();
+    }
+
+    @Postsubmit(reason = "new test")
+    @Test
+    @EnsureHasWorkProfile
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void getPolicyManagedProfiles_hasWorkProfile_returnsWorkProfileUser() {
+        assertThat(sDevicePolicyManager.getPolicyManagedProfiles(
+                TestApis.context().instrumentationContext().getUser()))
+                .containsExactly(sDeviceState.workProfile().userHandle());
+    }
+
+    @Postsubmit(reason = "new test")
+    @Test
+    @EnsureHasNoDpc
+    @EnsureHasPermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void getPolicyManagedProfiles_hasManagedProfileNoProfileOwner_returnsEmptyList() {
+        try (UserReference user = TestApis.users().createUser().type(MANAGED_PROFILE_USER_TYPE)
+                .parent(TestApis.users().instrumented()).create()) {
+            assertThat(sDevicePolicyManager.getPolicyManagedProfiles(
+                    TestApis.context().instrumentationContext().getUser()))
+                    .isEmpty();
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @Test
+    @EnsureHasNoDpc
+    @EnsureDoesNotHavePermission(MANAGE_PROFILE_AND_DEVICE_OWNERS)
+    public void getPolicyManagedProfiles_noPermission_returnsEmptyList() {
+        assertThrows(SecurityException.class, () -> sDevicePolicyManager.getPolicyManagedProfiles(
+                TestApis.context().instrumentationContext().getUser()));
+    }
 }
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/EnrollmentSpecificIdTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/EnrollmentSpecificIdTest.java
index 7242892..9d6786b 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/EnrollmentSpecificIdTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/EnrollmentSpecificIdTest.java
@@ -33,13 +33,12 @@
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.EnsureHasPermission;
 import com.android.bedstead.harrier.annotations.Postsubmit;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
 import com.android.bedstead.harrier.policies.EnrollmentSpecificId;
 import com.android.bedstead.nene.TestApis;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.nio.ByteBuffer;
@@ -61,17 +60,15 @@
 
     private static final Context sContext = TestApis.context().instrumentedContext();
 
-    @Test
     @Postsubmit(reason = "New test")
-    @PositivePolicyTest(policy = EnrollmentSpecificId.class)
+    @PolicyAppliesTest(policy = EnrollmentSpecificId.class)
     public void emptyOrganizationId_throws() {
         assertThrows(IllegalArgumentException.class,
                 () -> sDeviceState.dpc().devicePolicyManager().setOrganizationId(""));
     }
 
-    @Test
     @Postsubmit(reason = "New test")
-    @PositivePolicyTest(policy = EnrollmentSpecificId.class)
+    @PolicyAppliesTest(policy = EnrollmentSpecificId.class)
     public void reSetOrganizationId_throws() {
         try {
             sDeviceState.dpc().devicePolicyManager().setOrganizationId(ORGANIZATION_ID);
@@ -88,9 +85,8 @@
      * This test tests that the platform calculates the ESID according to the specification and
      * does not, for example, return the same ESID regardless of the managing package.
      */
-    @Test
     @Postsubmit(reason = "New test")
-    @PositivePolicyTest(policy = EnrollmentSpecificId.class)
+    @PolicyAppliesTest(policy = EnrollmentSpecificId.class)
     @EnsureHasPermission({READ_PRIVILEGED_PHONE_STATE, NETWORK_SETTINGS, LOCAL_MAC_ADDRESS})
     public void enrollmentSpecificId_CorrectlyCalculated() {
         try {
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/EnterpriseResourcesTests.java b/tests/devicepolicy/src/android/devicepolicy/cts/EnterpriseResourcesTests.java
new file mode 100644
index 0000000..2438d54
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/EnterpriseResourcesTests.java
@@ -0,0 +1,754 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static android.Manifest.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.app.admin.DevicePolicyDrawableResource;
+import android.app.admin.DevicePolicyManager;
+import android.app.admin.DevicePolicyResources;
+import android.app.admin.DevicePolicyStringResource;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.Icon;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureDoesNotHavePermission;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.permissions.PermissionContext;
+import com.android.compatibility.common.util.BlockingBroadcastReceiver;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Set;
+import java.util.function.Supplier;
+
+// TODO(b/208084779): Add more cts tests to cover setting different styles and sources, also
+//  add more tests to cover calling from other packages after adding support for the new APIs in
+//  the test sdk.
+@RunWith(BedsteadJUnit4.class)
+public class EnterpriseResourcesTests {
+    private static final String TAG = "EnterpriseResourcesTests";
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final DevicePolicyManager sDpm =
+            sContext.getSystemService(DevicePolicyManager.class);
+
+    private static final String UPDATABLE_DRAWABLE_ID_1 = "UPDATABLE_DRAWABLE_ID_1";
+    private static final String UPDATABLE_DRAWABLE_ID_2 = "UPDATABLE_DRAWABLE_ID_2";
+    private static final String DRAWABLE_STYLE_1 = "DRAWABLE_STYLE_1";
+    private static final String DRAWABLE_SOURCE_1 = "DRAWABLE_SOURCE_1";
+
+    private static final String UPDATABLE_STRING_ID_1 = "UPDATABLE_STRING_ID_1";
+    private static final String UPDATABLE_STRING_ID_2 = "UPDATABLE_STRING_ID_2";
+
+    private static final int INVALID_RESOURCE_ID = -1;
+
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    @After
+    public void tearDown() {
+        resetAllResources();
+    }
+
+    @Before
+    public void setup() {
+        resetAllResources();
+    }
+
+    private void resetAllResources() {
+        try (PermissionContext p = TestApis.permissions().withPermission(
+                UPDATE_DEVICE_MANAGEMENT_RESOURCES)) {
+            sDpm.getResources().resetDrawables(
+                    Set.of(UPDATABLE_DRAWABLE_ID_1, UPDATABLE_DRAWABLE_ID_2));
+            sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_1, UPDATABLE_STRING_ID_2));
+        }
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureDoesNotHavePermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setDrawables_withoutRequiredPermission_throwsSecurityException() {
+        assertThrows(SecurityException.class, () ->
+                sDpm.getResources().setDrawables(createDrawable(
+                        UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1)));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setDrawables_withRequiredPermission_doesNotThrowSecurityException() {
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setDrawables_updatesCorrectUpdatableDrawable() {
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+
+        Drawable drawable = sDpm.getResources().getDrawable(
+                UPDATABLE_DRAWABLE_ID_1,
+                DRAWABLE_STYLE_1,
+                /* default= */ () -> null);
+        assertThat(areSameDrawables(drawable, sContext.getDrawable(R.drawable.test_drawable_1)))
+                .isTrue();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setDrawables_updatesCurrentlyUpdatedDrawable() {
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_2));
+
+        Drawable drawable = sDpm.getResources().getDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, /* default= */ () -> null);
+        assertThat(areSameDrawables(drawable, sContext.getDrawable(R.drawable.test_drawable_2)))
+                .isTrue();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setDrawables_doesNotUpdateOtherUpdatableDrawables() {
+        Drawable defaultDrawable = sContext.getDrawable(R.drawable.test_drawable_2);
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_2));
+
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+
+        Drawable drawable = sDpm.getResources().getDrawable(
+                UPDATABLE_DRAWABLE_ID_2, DRAWABLE_STYLE_1, /* default= */ () -> defaultDrawable);
+        assertThat(drawable).isEqualTo(defaultDrawable);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setDrawables_drawableChangedFromNull_sendsBroadcast() {
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_1));
+        BlockingBroadcastReceiver broadcastReceiver = sDeviceState.registerBroadcastReceiver(
+                DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED);
+
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+
+        broadcastReceiver.awaitForBroadcastOrFail();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setDrawables_drawableChangedFromOtherDrawable_sendsBroadcast() {
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+        BlockingBroadcastReceiver broadcastReceiver = sDeviceState.registerBroadcastReceiver(
+                DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED);
+
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_2));
+
+        broadcastReceiver.awaitForBroadcastOrFail();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    @Ignore("b/208237942")
+    public void setDrawables_drawableNotChanged_doesNotSendBroadcast() {
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+        BlockingBroadcastReceiver broadcastReceiver = sDeviceState.registerBroadcastReceiver(
+                DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED);
+
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+
+        assertThat(broadcastReceiver.awaitForBroadcast()).isNull();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureDoesNotHavePermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void resetDrawables_withoutRequiredPermission_throwsSecurityException() {
+        assertThrows(SecurityException.class, () -> sDpm.getResources().resetDrawables(
+                Set.of(UPDATABLE_DRAWABLE_ID_1)));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void resetDrawables_withRequiredPermission_doesNotThrowSecurityException() {
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_1));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void resetDrawables_removesPreviouslySetDrawables() {
+        Drawable defaultDrawable = sContext.getDrawable(R.drawable.test_drawable_2);
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_1));
+
+        Drawable drawable = sDpm.getResources().getDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, /* default= */ () -> defaultDrawable);
+        assertThat(drawable).isEqualTo(defaultDrawable);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void resetDrawables_doesNotResetOtherSetDrawables() {
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_2, DRAWABLE_STYLE_1, R.drawable.test_drawable_2));
+
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_1));
+
+        Drawable drawable = sDpm.getResources().getDrawable(
+                UPDATABLE_DRAWABLE_ID_2, DRAWABLE_STYLE_1, /* default= */ () -> null);
+        assertThat(areSameDrawables(drawable, sContext.getDrawable(R.drawable.test_drawable_2)))
+                .isTrue();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void resetDrawables_drawableChanged_sendsBroadcast() {
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+        BlockingBroadcastReceiver broadcastReceiver = sDeviceState.registerBroadcastReceiver(
+                DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED);
+
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_1));
+
+        broadcastReceiver.awaitForBroadcastOrFail();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    @Ignore("b/208237942")
+    public void resetDrawables_drawableNotChanged_doesNotSendBroadcast() {
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_1));
+        BlockingBroadcastReceiver broadcastReceiver = sDeviceState.registerBroadcastReceiver(
+                DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED);
+
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_1));
+
+        assertThat(broadcastReceiver.awaitForBroadcast()).isNull();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getDrawable_drawableIsSet_returnsUpdatedDrawable() {
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+
+        Drawable drawable = sDpm.getResources().getDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, /* default= */ () -> null);
+
+        assertThat(areSameDrawables(drawable, sContext.getDrawable(R.drawable.test_drawable_1)))
+                .isTrue();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getDrawable_drawableIsNotSet_returnsDefaultDrawable() {
+        Drawable defaultDrawable = sContext.getDrawable(R.drawable.test_drawable_1);
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_1));
+
+        Drawable drawable = sDpm.getResources().getDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, /* default= */ () -> defaultDrawable);
+
+        assertThat(drawable).isEqualTo(defaultDrawable);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getDrawable_defaultLoaderIsNull_throwsException() {
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_1));
+
+        assertThrows(NullPointerException.class, () -> sDpm.getResources().getDrawable(
+                UPDATABLE_DRAWABLE_ID_1,
+                DRAWABLE_STYLE_1,
+                /* default= */ (Supplier<Drawable>) null));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getDrawable_defaultLoaderReturnsNull_returnsNull() {
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_1));
+
+        assertThat(sDpm.getResources().getDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, /* default= */ () -> null)).isNull();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getDrawableForDensity_drawableIsSet_returnsUpdatedDrawable() {
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+
+        Drawable drawable = sDpm.getResources().getDrawableForDensity(
+                UPDATABLE_DRAWABLE_ID_1,
+                DRAWABLE_STYLE_1,
+                /* density= */ 0,
+                /* default= */ () -> null);
+
+        assertThat(areSameDrawables(drawable, sContext.getDrawable(R.drawable.test_drawable_1)))
+                .isTrue();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getDrawableForDensity_drawableIsNotSet_returnsDefaultDrawable() {
+        Drawable defaultDrawable = sContext.getDrawable(R.drawable.test_drawable_1);
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_1));
+
+        Drawable drawable = sDpm.getResources().getDrawableForDensity(
+                UPDATABLE_DRAWABLE_ID_1,
+                DRAWABLE_STYLE_1,
+                /* density= */ 0,
+                /* default= */ () -> defaultDrawable);
+
+        assertThat(drawable).isEqualTo(defaultDrawable);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getDrawable_drawableIsSet_returnsUpdatedIcon() {
+        sDpm.getResources().setDrawables(createDrawable(
+                UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1));
+
+        Icon icon = sDpm.getResources().getDrawableAsIcon(
+                UPDATABLE_DRAWABLE_ID_1,
+                DRAWABLE_STYLE_1,
+                /* default= */ Icon.createWithResource(sContext, R.drawable.test_drawable_2));
+
+        assertThat(icon.getResId()).isEqualTo(R.drawable.test_drawable_1);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getDrawable_drawableIsNotSet_returnsDefaultIcon() {
+        Icon defaultIcon = Icon.createWithResource(sContext, R.drawable.test_drawable_2);
+        sDpm.getResources().resetDrawables(Set.of(UPDATABLE_DRAWABLE_ID_1));
+
+        Icon icon = sDpm.getResources().getDrawableAsIcon(
+                UPDATABLE_DRAWABLE_ID_1,
+                DRAWABLE_STYLE_1,
+                defaultIcon);
+
+        assertThat(icon).isEqualTo(defaultIcon);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void constructDevicePolicyDrawableResource_withNonExistentDrawable_throwsIllegalStateException() {
+        assertThrows(IllegalStateException.class, () -> new DevicePolicyDrawableResource(
+                sContext, UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, INVALID_RESOURCE_ID));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void constructDevicePolicyDrawableResource_withNonDrawableResource_throwsIllegalStateException() {
+        assertThrows(IllegalStateException.class, () -> new DevicePolicyDrawableResource(
+                sContext, UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.string.test_string_1));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getDrawableId_returnsCorrectValue() {
+        DevicePolicyDrawableResource resource = new DevicePolicyDrawableResource(
+                sContext, UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1);
+
+        assertThat(resource.getDrawableId()).isEqualTo(UPDATABLE_DRAWABLE_ID_1);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getDrawableStyle_returnsCorrectValue() {
+        DevicePolicyDrawableResource resource = new DevicePolicyDrawableResource(
+                sContext, UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1);
+
+        assertThat(resource.getDrawableStyle()).isEqualTo(DRAWABLE_STYLE_1);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getDrawableStyle_sourceNotSpecified_returnsUndefined() {
+        DevicePolicyDrawableResource resource = new DevicePolicyDrawableResource(
+                sContext, UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1);
+
+        assertThat(resource.getDrawableSource()).isEqualTo(
+                DevicePolicyResources.UNDEFINED);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getDrawableStyle_sourceSpecified_returnsCorrectValue() {
+        DevicePolicyDrawableResource resource = new DevicePolicyDrawableResource(
+                sContext, UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, DRAWABLE_SOURCE_1,
+                R.drawable.test_drawable_1);
+
+        assertThat(resource.getDrawableSource()).isEqualTo(DRAWABLE_SOURCE_1);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void devicePolicyDrawableResource_getResourceIdInCallingPackage_returnsCorrectValue() {
+        DevicePolicyDrawableResource resource = new DevicePolicyDrawableResource(
+                sContext, UPDATABLE_DRAWABLE_ID_1, DRAWABLE_STYLE_1, R.drawable.test_drawable_1);
+
+        assertThat(resource.getResourceIdInCallingPackage()).isEqualTo(R.drawable.test_drawable_1);
+    }
+
+    // TODO(b/16348282): extract to a common place to make it reusable.
+    private static boolean areSameDrawables(Drawable drawable1, Drawable drawable2) {
+        return drawable1 == drawable2 || getBitmap(drawable1).sameAs(getBitmap(drawable2));
+    }
+
+    private static Bitmap getBitmap(Drawable drawable) {
+        int width = drawable.getIntrinsicWidth();
+        int height = drawable.getIntrinsicHeight();
+        // Some drawables have no intrinsic width - e.g. solid colours.
+        if (width <= 0) {
+            width = 1;
+        }
+        if (height <= 0) {
+            height = 1;
+        }
+        Bitmap result = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(result);
+        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        drawable.draw(canvas);
+        return result;
+    }
+
+    private Set<DevicePolicyDrawableResource> createDrawable(
+            String updatableDrawableId, String style, int resourceId) {
+        return Set.of(new DevicePolicyDrawableResource(
+                sContext, updatableDrawableId, style, resourceId));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureDoesNotHavePermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setStrings_withoutRequiredPermission_throwsSecurityException() {
+        assertThrows(SecurityException.class, () -> sDpm.getResources().setStrings(
+                createString(UPDATABLE_STRING_ID_1, R.string.test_string_1)));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setStrings_withRequiredPermission_doesNotThrowSecurityException() {
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_1));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setStrings_updatesCorrectUpdatableString() {
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_1));
+
+        String string = sDpm.getResources().getString(
+                UPDATABLE_STRING_ID_1, /* default= */ () -> null);
+        assertThat(string).isEqualTo(sContext.getString(R.string.test_string_1));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setStrings_updatesCurrentlyUpdatedString() {
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_1));
+
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_2));
+
+        String string = sDpm.getResources().getString(
+                UPDATABLE_STRING_ID_1, /* default= */ () -> null);
+        assertThat(string).isEqualTo(sContext.getString(R.string.test_string_2));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setStrings_doesNotUpdateOtherUpdatableStrings() {
+        sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_2));
+        String defaultString = sContext.getString(R.string.test_string_2);
+
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_1));
+
+        assertThat(sDpm.getResources().getString(
+                UPDATABLE_STRING_ID_2, /* default= */ () -> defaultString))
+                .isEqualTo(defaultString);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setStrings_stringChangedFromNull_sendsBroadcast() {
+        sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_1));
+        BlockingBroadcastReceiver broadcastReceiver = sDeviceState.registerBroadcastReceiver(
+                DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED);
+
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_1));
+
+        broadcastReceiver.awaitForBroadcastOrFail();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void setStrings_stringChangedFromOtherString_sendsBroadcast() {
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_1));
+        BlockingBroadcastReceiver broadcastReceiver = sDeviceState.registerBroadcastReceiver(
+                DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED);
+
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_2));
+
+        broadcastReceiver.awaitForBroadcastOrFail();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    @Ignore("b/208237942")
+    public void setStrings_stringNotChanged_doesNotSendBroadcast() {
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_1));
+        BlockingBroadcastReceiver broadcastReceiver = sDeviceState.registerBroadcastReceiver(
+                DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED);
+
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_1));
+
+        assertThat(broadcastReceiver.awaitForBroadcast()).isNull();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureDoesNotHavePermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void resetStrings_withoutRequiredPermission_throwsSecurityException() {
+        assertThrows(SecurityException.class,
+                () -> sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_1)));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void resetStrings_withRequiredPermission_doesNotThrowSecurityException() {
+        sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_1));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void resetStrings_removesPreviouslySetStrings() {
+        String defaultString = sContext.getString(R.string.test_string_2);
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_1));
+
+        sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_1));
+
+        assertThat(sDpm.getResources().getString(
+                UPDATABLE_STRING_ID_1, /* default= */ () -> defaultString))
+                .isEqualTo(defaultString);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void resetStrings_doesNotResetOtherSetStrings() {
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_1));
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_2, R.string.test_string_2));
+
+        sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_1));
+
+        String string = sDpm.getResources().getString(
+                UPDATABLE_STRING_ID_2, /* default= */ () -> null);
+        assertThat(string).isEqualTo(sContext.getString(R.string.test_string_2));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void resetStrings_stringChanged_sendsBroadcast() {
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_1));
+        BlockingBroadcastReceiver broadcastReceiver = sDeviceState.registerBroadcastReceiver(
+                DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED);
+
+        sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_1));
+
+        broadcastReceiver.awaitForBroadcastOrFail();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    @Ignore("b/208237942")
+    public void resetStrings_stringNotChanged_doesNotSendBroadcast() {
+        sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_1));
+        BlockingBroadcastReceiver broadcastReceiver = sDeviceState.registerBroadcastReceiver(
+                DevicePolicyManager.ACTION_DEVICE_POLICY_RESOURCE_UPDATED);
+
+        sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_1));
+
+        assertThat(broadcastReceiver.awaitForBroadcast()).isNull();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getString_stringIsSet_returnsUpdatedString() {
+        sDpm.getResources().setStrings(createString(UPDATABLE_STRING_ID_1, R.string.test_string_1));
+
+        String string = sDpm.getResources().getString(
+                UPDATABLE_STRING_ID_1, /* default= */ () -> null);
+
+        assertThat(string).isEqualTo(sContext.getString(R.string.test_string_1));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getString_stringIsNotSet_returnsDefaultString() {
+        sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_1));
+        String defaultString = sContext.getString(R.string.test_string_1);
+
+        String string = sDpm.getResources().getString(
+                UPDATABLE_STRING_ID_1, /* default= */ () -> defaultString);
+
+        assertThat(string).isEqualTo(defaultString);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getString_defaultLoaderIsNull_throwsException() {
+        sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_1));
+
+        assertThrows(NullPointerException.class,
+                () -> sDpm.getResources().getString(
+                        UPDATABLE_STRING_ID_1, /* default= */ null));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getString_defaultLoaderReturnsNull_returnsNull() {
+        sDpm.getResources().resetStrings(Set.of(UPDATABLE_STRING_ID_1));
+
+        assertThat(sDpm.getResources().getString(UPDATABLE_STRING_ID_1, /* default= */ () -> null))
+                .isNull();
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getString_stringWithArgs_returnsFormattedString() {
+        sDpm.getResources().setStrings(
+                createString(UPDATABLE_STRING_ID_1, R.string.test_string_with_arg));
+        String testArg = "test arg";
+
+        String string = sDpm.getResources().getString(
+                UPDATABLE_STRING_ID_1, /* default= */ () -> null, testArg);
+
+        assertThat(string).isEqualTo(sContext.getString(R.string.test_string_with_arg, testArg));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void constructDevicePolicyStringResource_withNonExistentString_throwsIllegalStateException() {
+        assertThrows(IllegalStateException.class, () -> new DevicePolicyStringResource(
+                sContext, UPDATABLE_STRING_ID_1, INVALID_RESOURCE_ID));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void constructDevicePolicyStringResource_withNonStringResource_throwsIllegalStateException() {
+        assertThrows(IllegalStateException.class, () -> new DevicePolicyStringResource(
+                sContext, UPDATABLE_STRING_ID_1, R.drawable.test_drawable_2));
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void getStringId_returnsCorrectValue() {
+        DevicePolicyStringResource resource = new  DevicePolicyStringResource(
+                sContext, UPDATABLE_STRING_ID_1, R.string.test_string_1);
+
+        assertThat(resource.getStringId()).isEqualTo(UPDATABLE_STRING_ID_1);
+    }
+
+    @Test
+    @Postsubmit(reason = "New test")
+    @EnsureHasPermission(UPDATE_DEVICE_MANAGEMENT_RESOURCES)
+    public void devicePolicyStringResource_getResourceIdInCallingPackage_returnsCorrectValue() {
+        DevicePolicyStringResource resource = new  DevicePolicyStringResource(
+                sContext, UPDATABLE_STRING_ID_1, R.string.test_string_1);
+
+        assertThat(resource.getResourceIdInCallingPackage()).isEqualTo(R.string.test_string_1);
+    }
+
+    private Set<DevicePolicyStringResource> createString(
+            String updatableStringId, int resourceId) {
+        return Set.of(new DevicePolicyStringResource(
+                sContext, updatableStringId, resourceId));
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/KeyManagementTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/KeyManagementTest.java
index 16a7733..43749c9 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/KeyManagementTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/KeyManagementTest.java
@@ -16,8 +16,6 @@
 
 package android.devicepolicy.cts;
 
-import static com.android.bedstead.remotedpc.RemoteDpc.DPC_COMPONENT_NAME;
-
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.junit.Assert.assertThrows;
@@ -35,8 +33,10 @@
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
 import com.android.bedstead.harrier.policies.KeyManagement;
+import com.android.bedstead.harrier.policies.KeySelection;
 import com.android.bedstead.nene.TestApis;
 import com.android.compatibility.common.util.BlockingCallback;
 import com.android.compatibility.common.util.FakeKeys;
@@ -44,7 +44,6 @@
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.testng.Assert;
 
@@ -75,7 +74,7 @@
     @ClassRule
     @Rule
     public static final DeviceState sDeviceState = new DeviceState();
-    private static final int KEYCHAIN_CALLBACK_TIMEOUT_SECONDS = 600;
+    private static final int KEYCHAIN_CALLBACK_TIMEOUT_SECONDS = 540;
     private static final String RSA = "RSA";
     private static final String RSA_ALIAS = "com.android.test.valid-rsa-key-1";
     private static final PrivateKey PRIVATE_KEY =
@@ -134,40 +133,39 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = KeyManagement.class)
     public void installKeyPair_validRsaKeyPair_success() {
         try {
             // Install keypair
             assertThat(sDeviceState.dpc().devicePolicyManager()
-                    .installKeyPair(DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATE,
+                    .installKeyPair(sDeviceState.dpc().componentName(), PRIVATE_KEY, CERTIFICATE,
                             RSA_ALIAS)).isTrue();
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpc().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpc().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = KeyManagement.class, singleTestOnly = true)
     public void installKeyPair_nullPrivateKey_throwException() {
         assertThrows(NullPointerException.class,
                 () -> sDeviceState.dpc().devicePolicyManager().installKeyPair(
-                        DPC_COMPONENT_NAME, /* privKey = */ null, CERTIFICATE, RSA_ALIAS));
+                        sDeviceState.dpc().componentName(),
+                        /* privKey = */ null, CERTIFICATE, RSA_ALIAS));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = KeyManagement.class, singleTestOnly = true)
     public void installKeyPair_nullCertificate_throwException() {
         assertThrows(NullPointerException.class,
                 () -> sDeviceState.dpc().devicePolicyManager().installKeyPair(
-                        DPC_COMPONENT_NAME, PRIVATE_KEY, /* cert = */ null, RSA_ALIAS));
+                        sDeviceState.dpc().componentName(),
+                        PRIVATE_KEY, /* cert = */ null, RSA_ALIAS));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = KeyManagement.class, singleTestOnly = true)
     public void installKeyPair_nullAdminComponent_throwException() {
@@ -176,14 +174,14 @@
                         /* admin = */ null, PRIVATE_KEY, CERTIFICATE, RSA_ALIAS));
     }
 
-    @Test
     @Ignore("TODO(b/204544463): Enable when the key can be serialized")
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = KeyManagement.class)
     public void installKeyPair_withAutomatedAccess_aliasIsGranted() throws Exception {
         try {
             // Install keypair with automated access
-            sDeviceState.dpc().devicePolicyManager().installKeyPair(DPC_COMPONENT_NAME, PRIVATE_KEY,
+            sDeviceState.dpc().devicePolicyManager().installKeyPair(
+                    sDeviceState.dpc().componentName(), PRIVATE_KEY,
                     CERTIFICATES, RSA_ALIAS, /* requestAccess = */ true);
 
             // TODO(b/204544478): Remove the null context
@@ -191,17 +189,18 @@
                     .isNotNull();
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpc().devicePolicyManager().removeKeyPair(
+                    sDeviceState.dpc().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = KeyManagement.class)
     public void installKeyPair_withoutAutomatedAccess_aliasIsNotGranted() throws Exception {
         try {
             // Install keypair with automated access
-            sDeviceState.dpc().devicePolicyManager().installKeyPair(DPC_COMPONENT_NAME, PRIVATE_KEY,
+            sDeviceState.dpc().devicePolicyManager().installKeyPair(
+                    sDeviceState.dpc().componentName(), PRIVATE_KEY,
                     CERTIFICATES, RSA_ALIAS, /* requestAccess = */ false);
 
             // TODO(b/204544478): Remove the null context
@@ -209,26 +208,35 @@
                     .isNull();
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpc().devicePolicyManager().removeKeyPair(
+                    sDeviceState.dpc().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = KeyManagement.class)
     public void removeKeyPair_validRsaKeyPair_success() {
         try {
             // Install keypair
             sDeviceState.dpc().devicePolicyManager()
-                    .installKeyPair(DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATE, RSA_ALIAS);
+                    .installKeyPair(
+                            sDeviceState.dpc().componentName(),
+                            PRIVATE_KEY, CERTIFICATE, RSA_ALIAS);
         } finally {
             // Remove keypair
             assertThat(sDeviceState.dpc().devicePolicyManager()
-                    .removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS)).isTrue();
+                    .removeKeyPair(sDeviceState.dpc().componentName(), RSA_ALIAS)).isTrue();
         }
     }
 
-    @Test
+
+    @Postsubmit(reason = "new test")
+    @CannotSetPolicyTest(policy = KeyManagement.class)
+    public void hasKeyPair_notAllowed_throwsException() {
+        assertThrows(SecurityException.class, () ->
+                sDeviceState.dpc().devicePolicyManager().hasKeyPair(RSA_ALIAS));
+    }
+
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = KeyManagement.class)
     public void hasKeyPair_nonExistentAlias_false() {
@@ -236,47 +244,50 @@
                 sDeviceState.dpc().devicePolicyManager().hasKeyPair(NON_EXISTENT_ALIAS)).isFalse();
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = KeyManagement.class)
     public void hasKeyPair_installedAlias_true() {
         try {
             // Install keypair
             sDeviceState.dpc().devicePolicyManager()
-                    .installKeyPair(DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATE, RSA_ALIAS);
+                    .installKeyPair(sDeviceState.dpc().componentName(),
+                            PRIVATE_KEY, CERTIFICATE, RSA_ALIAS);
 
             assertThat(sDeviceState.dpc().devicePolicyManager().hasKeyPair(RSA_ALIAS)).isTrue();
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpc().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpc().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = KeyManagement.class)
     public void hasKeyPair_removedAlias_false() {
         try {
             // Install keypair
             sDeviceState.dpc().devicePolicyManager()
-                    .installKeyPair(DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATE, RSA_ALIAS);
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+                    .installKeyPair(sDeviceState.dpc().componentName(),
+                            PRIVATE_KEY, CERTIFICATE, RSA_ALIAS);
+            sDeviceState.dpc().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpc().componentName(), RSA_ALIAS);
 
             assertThat(sDeviceState.dpc().devicePolicyManager().hasKeyPair(RSA_ALIAS)).isFalse();
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpc().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpc().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = KeyManagement.class)
+    @PolicyAppliesTest(policy = KeyManagement.class)
     public void choosePrivateKeyAlias_aliasIsSelectedByAdmin_returnAlias() throws Exception {
         try {
             // Install keypair
             sDeviceState.dpc().devicePolicyManager()
-                    .installKeyPair(DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATE, RSA_ALIAS);
+                    .installKeyPair(sDeviceState.dpc().componentName(),
+                            PRIVATE_KEY, CERTIFICATE, RSA_ALIAS);
             KeyChainAliasCallback callback = new KeyChainAliasCallback();
 
             choosePrivateKeyAlias(callback, RSA_ALIAS);
@@ -285,18 +296,19 @@
                     .isEqualTo(RSA_ALIAS);
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpc().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpc().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = KeyManagement.class)
+    @PolicyAppliesTest(policy = KeyManagement.class)
     public void choosePrivateKeyAlias_nonUserSelectedAliasIsSelectedByAdmin_returnAlias()
             throws Exception {
         try {
             // Install keypair which is not user selectable
-            sDeviceState.dpc().devicePolicyManager().installKeyPair(DPC_COMPONENT_NAME, PRIVATE_KEY,
+            sDeviceState.dpc().devicePolicyManager()
+                    .installKeyPair(sDeviceState.dpc().componentName(), PRIVATE_KEY,
                     CERTIFICATES, RSA_ALIAS, /* flags = */ 0);
             KeyChainAliasCallback callback = new KeyChainAliasCallback();
 
@@ -306,18 +318,19 @@
                     .isEqualTo(RSA_ALIAS);
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpc().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpc().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = KeyManagement.class)
+    @PolicyAppliesTest(policy = KeyManagement.class)
     public void getPrivateKey_aliasIsGranted_returnPrivateKey() throws Exception {
         try {
             // Install keypair
             sDeviceState.dpc().devicePolicyManager()
-                    .installKeyPair(DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATE, RSA_ALIAS);
+                    .installKeyPair(sDeviceState.dpc().componentName(),
+                            PRIVATE_KEY, CERTIFICATE, RSA_ALIAS);
             // Grant alias via {@code KeyChain.choosePrivateKeyAlias}
             KeyChainAliasCallback callback = new KeyChainAliasCallback();
             choosePrivateKeyAlias(callback, RSA_ALIAS);
@@ -332,22 +345,26 @@
 
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpc().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpc().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = KeyManagement.class)
     public void install_wasPreviouslyGrantedOnPreviousInstall_grantDoesNotPersist()
             throws Exception {
         try {
             sDeviceState.dpc().devicePolicyManager()
-                    .installKeyPair(DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATES, RSA_ALIAS, true);
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+                    .installKeyPair(sDeviceState.dpc().componentName(),
+                            PRIVATE_KEY, CERTIFICATES, RSA_ALIAS, true);
+            sDeviceState.dpc().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpc().componentName(), RSA_ALIAS);
 
             sDeviceState.dpc().devicePolicyManager()
-                    .installKeyPair(DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATES, RSA_ALIAS,
+                    .installKeyPair(
+                            sDeviceState.dpc().componentName(),
+                            PRIVATE_KEY, CERTIFICATES, RSA_ALIAS,
                             false);
 
             assertThat(sDeviceState.dpc().keyChain().getPrivateKey(
@@ -355,64 +372,71 @@
                     .isNull();
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpc().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpc().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @CanSetPolicyTest(policy = KeyManagement.class, singleTestOnly = true)
+    @CannotSetPolicyTest(policy = KeySelection.class)
+    public void getKeyPairGrants_notAllowed_throwsException() {
+        Assert.assertThrows(SecurityException.class,
+                () -> sDeviceState.dpc().devicePolicyManager()
+                        .getKeyPairGrants(RSA_ALIAS));
+    }
+
+    @Postsubmit(reason = "new test")
+    @CanSetPolicyTest(policy = KeySelection.class, singleTestOnly = true)
     public void getKeyPairGrants_nonExistent_throwsIllegalArgumentException() {
         Assert.assertThrows(IllegalArgumentException.class,
                 () -> sDeviceState.dpc().devicePolicyManager()
                         .getKeyPairGrants(NON_EXISTENT_ALIAS));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @CanSetPolicyTest(policy = KeyManagement.class)
+    @CanSetPolicyTest(policy = KeySelection.class)
     public void getKeyPairGrants_doesNotIncludeNotGranted() {
         try {
-            sDeviceState.dpc().devicePolicyManager().installKeyPair(
-                    DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATES,
+            sDeviceState.dpcOnly().devicePolicyManager().installKeyPair(
+                    sDeviceState.dpcOnly().componentName(), PRIVATE_KEY, CERTIFICATES,
                     RSA_ALIAS, /* requestAccess= */ false);
 
             assertThat(
                     sDeviceState.dpc().devicePolicyManager().getKeyPairGrants(RSA_ALIAS)).isEmpty();
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpcOnly().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpcOnly().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @CanSetPolicyTest(policy = KeyManagement.class)
+    @CanSetPolicyTest(policy = KeySelection.class)
     public void getKeyPairGrants_includesGrantedAtInstall() {
         try {
-            sDeviceState.dpc().devicePolicyManager().installKeyPair(
-                    DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATES,
+            sDeviceState.dpcOnly().devicePolicyManager().installKeyPair(
+                    sDeviceState.dpcOnly().componentName(), PRIVATE_KEY, CERTIFICATES,
                     RSA_ALIAS, /* requestAccess= */ true);
 
             assertThat(sDeviceState.dpc().devicePolicyManager().getKeyPairGrants(RSA_ALIAS))
-                    .isEqualTo(Map.of(sDeviceState.dpc().process().uid(),
-                            singleton(sDeviceState.dpc().componentName().getPackageName())));
+                    .isEqualTo(Map.of(sDeviceState.dpcOnly().process().uid(),
+                            singleton(sDeviceState.dpcOnly().packageName())));
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpcOnly().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpcOnly().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = KeyManagement.class)
+    @PolicyAppliesTest(policy = KeySelection.class)
     public void getKeyPairGrants_includesGrantedExplicitly() {
         try {
-            sDeviceState.dpc().devicePolicyManager().installKeyPair(
-                    DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATES,
+            sDeviceState.dpcOnly().devicePolicyManager().installKeyPair(
+                    sDeviceState.dpcOnly().componentName(), PRIVATE_KEY, CERTIFICATES,
                     RSA_ALIAS, /* requestAccess= */ false);
             sDeviceState.dpc().devicePolicyManager().grantKeyPairToApp(
-                    DPC_COMPONENT_NAME, RSA_ALIAS,
+                    sDeviceState.dpc().componentName(), RSA_ALIAS,
                     sContext.getPackageName());
 
             assertThat(sDeviceState.dpc().devicePolicyManager().getKeyPairGrants(RSA_ALIAS))
@@ -420,37 +444,37 @@
                             singleton(sContext.getPackageName())));
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpcOnly().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpcOnly().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @CanSetPolicyTest(policy = KeyManagement.class)
+    @CanSetPolicyTest(policy = KeySelection.class)
     public void getKeyPairGrants_doesNotIncludeRevoked() {
         try {
-            sDeviceState.dpc().devicePolicyManager().installKeyPair(
-                    DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATES,
+            sDeviceState.dpcOnly().devicePolicyManager().installKeyPair(
+                    sDeviceState.dpcOnly().componentName(), PRIVATE_KEY, CERTIFICATES,
                     RSA_ALIAS, /* requestAccess= */ true);
             sDeviceState.dpc().devicePolicyManager().revokeKeyPairFromApp(
-                    DPC_COMPONENT_NAME, RSA_ALIAS,
-                    sDeviceState.dpc().componentName().getPackageName());
+                    sDeviceState.dpc().componentName(), RSA_ALIAS,
+                    sDeviceState.dpcOnly().packageName());
 
             assertThat(
                     sDeviceState.dpc().devicePolicyManager().getKeyPairGrants(RSA_ALIAS)).isEmpty();
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpcOnly().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpcOnly().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @CanSetPolicyTest(policy = KeyManagement.class)
+    @CanSetPolicyTest(policy = KeySelection.class)
     public void isKeyPairGrantedToWifiAuth_default_returnsFalse() {
         try {
-            sDeviceState.dpc().devicePolicyManager().installKeyPair(
-                    DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATES,
+            sDeviceState.dpcOnly().devicePolicyManager().installKeyPair(
+                    sDeviceState.dpcOnly().componentName(), PRIVATE_KEY, CERTIFICATES,
                     RSA_ALIAS, /* requestAccess= */ false);
 
             assertThat(
@@ -458,17 +482,17 @@
                     .isFalse();
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpcOnly().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpcOnly().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @CanSetPolicyTest(policy = KeyManagement.class)
+    @CanSetPolicyTest(policy = KeySelection.class)
     public void isKeyPairGrantedToWifiAuth_granted_returnsTrue() {
         try {
-            sDeviceState.dpc().devicePolicyManager().installKeyPair(
-                    DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATES,
+            sDeviceState.dpcOnly().devicePolicyManager().installKeyPair(
+                    sDeviceState.dpcOnly().componentName(), PRIVATE_KEY, CERTIFICATES,
                     RSA_ALIAS, /* requestAccess= */ false);
             sDeviceState.dpc().devicePolicyManager().grantKeyPairToWifiAuth(RSA_ALIAS);
 
@@ -477,17 +501,17 @@
                     .isTrue();
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpcOnly().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpcOnly().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @CanSetPolicyTest(policy = KeyManagement.class)
+    @CanSetPolicyTest(policy = KeySelection.class)
     public void isKeyPairGrantedToWifiAuth_revoked_returnsFalse() {
         try {
-            sDeviceState.dpc().devicePolicyManager().installKeyPair(
-                    DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATES,
+            sDeviceState.dpcOnly().devicePolicyManager().installKeyPair(
+                    sDeviceState.dpcOnly().componentName(), PRIVATE_KEY, CERTIFICATES,
                     RSA_ALIAS, /* requestAccess= */ false);
             sDeviceState.dpc().devicePolicyManager().grantKeyPairToWifiAuth(RSA_ALIAS);
             sDeviceState.dpc().devicePolicyManager().revokeKeyPairFromWifiAuth(RSA_ALIAS);
@@ -497,20 +521,20 @@
                     .isFalse();
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpcOnly().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpcOnly().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = KeyManagement.class)
+    @PolicyAppliesTest(policy = KeySelection.class)
     public void grantKeyPair_keyUsable() throws Exception {
         try {
-            sDeviceState.dpc().devicePolicyManager().installKeyPair(
-                    DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATES,
+            sDeviceState.dpcOnly().devicePolicyManager().installKeyPair(
+                    sDeviceState.dpcOnly().componentName(), PRIVATE_KEY, CERTIFICATES,
                     RSA_ALIAS, /* requestAccess= */ false);
             sDeviceState.dpc().devicePolicyManager().grantKeyPairToApp(
-                    DPC_COMPONENT_NAME, RSA_ALIAS, sContext.getPackageName()
+                    sDeviceState.dpc().componentName(), RSA_ALIAS, sContext.getPackageName()
             );
 
             PrivateKey key = KeyChain.getPrivateKey(sContext, RSA_ALIAS);
@@ -518,33 +542,34 @@
             signDataWithKey("SHA256withRSA", key); // Doesn't throw exception
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpcOnly().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpcOnly().componentName(), RSA_ALIAS);
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = KeyManagement.class)
+    @PolicyAppliesTest(policy = KeySelection.class)
     public void revokeKeyPairFromApp_keyNotUsable() throws Exception {
         try {
-            sDeviceState.dpc().devicePolicyManager().installKeyPair(
-                    DPC_COMPONENT_NAME, PRIVATE_KEY, CERTIFICATES,
+            sDeviceState.dpcOnly().devicePolicyManager().installKeyPair(
+                    sDeviceState.dpcOnly().componentName(), PRIVATE_KEY, CERTIFICATES,
                     RSA_ALIAS, /* requestAccess= */ false);
             sDeviceState.dpc().devicePolicyManager().grantKeyPairToApp(
-                    DPC_COMPONENT_NAME, RSA_ALIAS, sContext.getPackageName()
+                    sDeviceState.dpc().componentName(), RSA_ALIAS, sContext.getPackageName()
             );
             // Key is requested from KeyChain prior to revoking the grant.
             PrivateKey key = KeyChain.getPrivateKey(sContext, RSA_ALIAS);
 
             sDeviceState.dpc().devicePolicyManager().revokeKeyPairFromApp(
-                    DPC_COMPONENT_NAME, RSA_ALIAS, sContext.getPackageName());
+                    sDeviceState.dpc().componentName(), RSA_ALIAS, sContext.getPackageName());
 
             // Key shouldn't be valid after the grant is revoked.
             Assert.assertThrows(
                     InvalidKeyException.class, () -> signDataWithKey("SHA256withRSA", key));
         } finally {
             // Remove keypair
-            sDeviceState.dpc().devicePolicyManager().removeKeyPair(DPC_COMPONENT_NAME, RSA_ALIAS);
+            sDeviceState.dpcOnly().devicePolicyManager()
+                    .removeKeyPair(sDeviceState.dpcOnly().componentName(), RSA_ALIAS);
         }
     }
 
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/LauncherAppsTests.java b/tests/devicepolicy/src/android/devicepolicy/cts/LauncherAppsTests.java
index a7dfc6f..865d80f 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/LauncherAppsTests.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/LauncherAppsTests.java
@@ -37,7 +37,7 @@
     private final LauncherApps sLauncherApps = sContext.getSystemService(LauncherApps.class);
 
     @Test
-    public void testResolveInvalidActivity_doesNotCrash() {
+    public void resolveActivity_invalid_doesNotCrash() {
         final Intent intent = new Intent();
         intent.setComponent(new ComponentName("invalidPackage", "invalidClass"));
 
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/LockTaskTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/LockTaskTest.java
index 6f9128d..23e4b35 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/LockTaskTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/LockTaskTest.java
@@ -54,11 +54,12 @@
 
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.IntTestParameter;
 import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.harrier.annotations.RequireFeature;
 import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.NegativePolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyDoesNotApplyTest;
 import com.android.bedstead.harrier.policies.LockTask;
 import com.android.bedstead.metricsrecorder.EnterpriseMetricsRecorder;
 import com.android.bedstead.nene.TestApis;
@@ -69,13 +70,13 @@
 import com.android.bedstead.testapp.TestAppActivity;
 import com.android.bedstead.testapp.TestAppActivityReference;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.Set;
 
 @RunWith(BedsteadJUnit4.class)
@@ -88,30 +89,33 @@
     private static final DevicePolicyManager sLocalDevicePolicyManager =
             TestApis.context().instrumentedContext().getSystemService(DevicePolicyManager.class);
 
-    private static final int[] INDIVIDUALLY_SETTABLE_FLAGS = new int[]{
+    @IntTestParameter({
             LOCK_TASK_FEATURE_SYSTEM_INFO,
             LOCK_TASK_FEATURE_HOME,
             LOCK_TASK_FEATURE_GLOBAL_ACTIONS,
-            LOCK_TASK_FEATURE_KEYGUARD
-    };
+            LOCK_TASK_FEATURE_KEYGUARD})
+    @Retention(RetentionPolicy.RUNTIME)
+    private @interface IndividuallySettableFlagTestParameter {
+    }
 
-    private static final int[] FLAGS_SETTABLE_WITH_HOME = new int[]{
+    @IntTestParameter({
             LOCK_TASK_FEATURE_SYSTEM_INFO,
             LOCK_TASK_FEATURE_OVERVIEW,
             LOCK_TASK_FEATURE_NOTIFICATIONS,
             LOCK_TASK_FEATURE_GLOBAL_ACTIONS,
-            LOCK_TASK_FEATURE_KEYGUARD
-    };
+            LOCK_TASK_FEATURE_KEYGUARD})
+    @Retention(RetentionPolicy.RUNTIME)
+    private @interface SettableWithHomeFlagTestParameter {
+    }
 
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-    private static final TestApp sLockTaskTestApp = sTestAppProvider.query()
+    private static final TestApp sLockTaskTestApp = sDeviceState.testApps().query()
             .wherePackageName().isEqualTo("com.android.bedstead.testapp.LockTaskApp")
             .get(); // TODO(scottjonathan): filter by containing activity not by package name
     private static final TestApp sTestApp =
-            sTestAppProvider.query().whereActivities().isNotEmpty().get();
+            sDeviceState.testApps().query().whereActivities().isNotEmpty().get();
 
     private static final TestApp sSecondTestApp =
-            sTestAppProvider.query().whereActivities().isNotEmpty().get();
+            sDeviceState.testApps().query().whereActivities().isNotEmpty().get();
 
     private static final ComponentReference BLOCKED_ACTIVITY_COMPONENT =
             TestApis.packages().component(new ComponentName(
@@ -119,8 +123,7 @@
 
     private static final String ACTION_EMERGENCY_DIAL = "com.android.phone.EmergencyDialer.DIAL";
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void setLockTaskPackages_lockTaskPackagesIsSet() {
         String[] originalLockTaskPackages =
@@ -140,8 +143,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void startLockTask_recordsMetric() {
         String[] originalLockTaskPackages =
@@ -173,7 +175,6 @@
         }
     }
 
-    @Test
     @CannotSetPolicyTest(policy = LockTask.class)
     public void getLockTaskPackages_policyIsNotAllowedToBeFetched_throwsException() {
         assertThrows(SecurityException.class,
@@ -181,8 +182,7 @@
                         .getLockTaskPackages(DPC_COMPONENT_NAME));
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void setLockTaskPackages_empty_lockTaskPackagesIsSet() {
         String[] originalLockTaskPackages =
@@ -202,8 +202,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void setLockTaskPackages_includesPolicyExemptApp_lockTaskPackagesIsSet() {
         Set<String> policyExemptApps = TestApis.devicePolicy().getPolicyExemptApps();
@@ -227,7 +226,6 @@
         }
     }
 
-    @Test
     @CannotSetPolicyTest(policy = LockTask.class)
     public void setLockTaskPackages_policyIsNotAllowedToBeSet_throwsException() {
         assertThrows(SecurityException.class,
@@ -235,8 +233,7 @@
                         .setLockTaskPackages(DPC_COMPONENT_NAME, new String[]{}));
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void isLockTaskPermitted_lockTaskPackageIsSet_returnsTrue() {
         String[] originalLockTaskPackages =
@@ -254,8 +251,7 @@
         }
     }
 
-    @Test
-    @NegativePolicyTest(policy = LockTask.class)
+    @PolicyDoesNotApplyTest(policy = LockTask.class)
     // TODO(scottjonathan): Confirm expected behaviour here
     public void isLockTaskPermitted_lockTaskPackageIsSet_policyDoesntApply_returnsFalse() {
         String[] originalLockTaskPackages =
@@ -273,8 +269,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void isLockTaskPermitted_lockTaskPackageIsNotSet_returnsFalse() {
         String[] originalLockTaskPackages =
@@ -292,8 +287,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void isLockTaskPermitted_includesPolicyExemptApps() {
         Set<String> policyExemptApps = TestApis.devicePolicy().getPolicyExemptApps();
@@ -318,24 +312,22 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     // TODO(b/188893663): Support additional parameterization for cases like this
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
-    public void setLockTaskFeatures_overviewFeature_setsFeature() {
+    public void setLockTaskFeatures_individuallySettableFlag_setsFeature(
+            @IndividuallySettableFlagTestParameter int flag) {
         int originalLockTaskFeatures =
                 sDeviceState.dpc().devicePolicyManager()
                         .getLockTaskFeatures(DPC_COMPONENT_NAME);
 
         try {
-            for (int flag : INDIVIDUALLY_SETTABLE_FLAGS) {
-                sDeviceState.dpc().devicePolicyManager()
-                        .setLockTaskFeatures(DPC_COMPONENT_NAME, flag);
+            sDeviceState.dpc().devicePolicyManager()
+                    .setLockTaskFeatures(DPC_COMPONENT_NAME, flag);
 
-                assertThat(sDeviceState.dpc().devicePolicyManager()
-                        .getLockTaskFeatures(DPC_COMPONENT_NAME))
-                        .isEqualTo(flag);
-            }
+            assertThat(sDeviceState.dpc().devicePolicyManager()
+                    .getLockTaskFeatures(DPC_COMPONENT_NAME))
+                    .isEqualTo(flag);
         } finally {
             sDeviceState.dpc().devicePolicyManager()
                     .setLockTaskFeatures(DPC_COMPONENT_NAME, originalLockTaskFeatures);
@@ -343,8 +335,7 @@
     }
 
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void setLockTaskFeatures_overviewFeature_throwsException() {
         // Overview can only be used in combination with home
@@ -363,8 +354,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void setLockTaskFeatures_notificationsFeature_throwsException() {
         // Notifications can only be used in combination with home
@@ -383,31 +373,28 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     // TODO(b/188893663): Support additional parameterization for cases like this
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
-    public void setLockTaskFeatures_multipleFeatures_setsFeatures() {
+    public void setLockTaskFeatures_multipleFeatures_setsFeatures(
+            @SettableWithHomeFlagTestParameter int flag) {
         int originalLockTaskFeatures =
                 sDeviceState.dpc().devicePolicyManager()
                         .getLockTaskFeatures(DPC_COMPONENT_NAME);
 
         try {
-            for (int flag : FLAGS_SETTABLE_WITH_HOME) {
-                sDeviceState.dpc().devicePolicyManager()
-                        .setLockTaskFeatures(DPC_COMPONENT_NAME, LOCK_TASK_FEATURE_HOME | flag);
+            sDeviceState.dpc().devicePolicyManager()
+                    .setLockTaskFeatures(DPC_COMPONENT_NAME, LOCK_TASK_FEATURE_HOME | flag);
 
-                assertThat(sDeviceState.dpc().devicePolicyManager()
-                        .getLockTaskFeatures(DPC_COMPONENT_NAME))
-                        .isEqualTo(LOCK_TASK_FEATURE_HOME | flag);
-            }
+            assertThat(sDeviceState.dpc().devicePolicyManager()
+                    .getLockTaskFeatures(DPC_COMPONENT_NAME))
+                    .isEqualTo(LOCK_TASK_FEATURE_HOME | flag);
         } finally {
             sDeviceState.dpc().devicePolicyManager()
                     .setLockTaskFeatures(DPC_COMPONENT_NAME, originalLockTaskFeatures);
         }
     }
 
-    @Test
     @CannotSetPolicyTest(policy = LockTask.class)
     public void setLockTaskFeatures_policyIsNotAllowedToBeSet_throwsException() {
         assertThrows(SecurityException.class, () ->
@@ -415,7 +402,6 @@
                         .setLockTaskFeatures(DPC_COMPONENT_NAME, LOCK_TASK_FEATURE_NONE));
     }
 
-    @Test
     @CannotSetPolicyTest(policy = LockTask.class)
     public void getLockTaskFeatures_policyIsNotAllowedToBeFetched_throwsException() {
         assertThrows(SecurityException.class, () ->
@@ -423,8 +409,7 @@
                         .getLockTaskFeatures(DPC_COMPONENT_NAME));
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void startLockTask_includedInLockTaskPackages_taskIsLocked() {
         String[] originalLockTaskPackages =
@@ -451,8 +436,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void startLockTask_notIncludedInLockTaskPackages_taskIsNotLocked() {
         String[] originalLockTaskPackages =
@@ -479,8 +463,7 @@
         }
     }
 
-    @Test
-    @NegativePolicyTest(policy = LockTask.class)
+    @PolicyDoesNotApplyTest(policy = LockTask.class)
     public void startLockTask_includedInLockTaskPackages_policyShouldNotApply_taskIsNotLocked() {
         String[] originalLockTaskPackages =
                 sDeviceState.dpc().devicePolicyManager()
@@ -506,8 +489,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void finish_isLocked_doesNotFinish() {
         String[] originalLockTaskPackages =
@@ -537,8 +519,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void finish_hasStoppedLockTask_doesFinish() {
         String[] originalLockTaskPackages =
@@ -562,8 +543,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void setLockTaskPackages_removingCurrentlyLockedTask_taskFinishes() {
         String[] originalLockTaskPackages =
@@ -587,8 +567,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void setLockTaskPackages_removingCurrentlyLockedTask_otherLockedTasksRemainLocked() {
         String[] originalLockTaskPackages =
@@ -623,8 +602,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void startActivity_withinSameTask_startsActivity() {
         String[] originalLockTaskPackages =
@@ -652,8 +630,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void startActivity_withinSameTask_blockStartInTask_doesNotStart() {
         String[] originalLockTaskPackages =
@@ -693,8 +670,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void startActivity_inNewTask_blockStartInTask_doesNotStart() {
         String[] originalLockTaskPackages =
@@ -735,8 +711,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void startActivity_fromPermittedPackage_newTask_starts() {
         String[] originalLockTaskPackages =
@@ -765,8 +740,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void startActivity_fromNonPermittedPackage_newTask_doesNotStart() {
         String[] originalLockTaskPackages =
@@ -795,8 +769,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void startActivity_lockTaskEnabledOption_startsInLockTaskMode() {
         String[] originalLockTaskPackages =
@@ -824,8 +797,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void startActivity_lockTaskEnabledOption_notAllowedPackage_throwsException() {
         String[] originalLockTaskPackages =
@@ -847,8 +819,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void startActivity_ifWhitelistedActivity_startsInLockTaskMode() {
         String[] originalLockTaskPackages =
@@ -877,8 +848,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void startActivity_ifWhitelistedActivity_notWhitelisted_startsNotInLockTaskMode() {
         String[] originalLockTaskPackages =
@@ -907,8 +877,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void finish_ifWhitelistedActivity_doesNotFinish() {
         String[] originalLockTaskPackages =
@@ -941,8 +910,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void setLockTaskPackages_removingExistingIfWhitelistedActivity_stopsTask() {
         String[] originalLockTaskPackages =
@@ -969,8 +937,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @RequireFeature(FEATURE_TELEPHONY)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     // Tests that the default dialer doesn't crash or otherwise misbehave in lock task mode
@@ -1008,8 +975,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @RequireFeature(FEATURE_TELEPHONY)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void launchEmergencyDialerInLockTaskMode_notWhitelisted_noKeyguardFeature_doesNotLaunch() {
@@ -1034,8 +1000,8 @@
                 activity.activity().startActivity(intent);
 
                 if (TestApis.activities().foregroundActivity() != null) {
-                    assertThat(TestApis.activities().foregroundActivity().pkg()).isNotEqualTo(
-                            emergencyDialerPackageName);
+                    assertThat(TestApis.activities().foregroundActivity().pkg().packageName())
+                            .isNotEqualTo(emergencyDialerPackageName);
                 }
             } finally {
                 activity.stopLockTask();
@@ -1048,8 +1014,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = LockTask.class)
+    @PolicyAppliesTest(policy = LockTask.class)
     @RequireFeature(FEATURE_TELEPHONY)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void launchEmergencyDialerInLockTaskMode_notWhitelisted_keyguardFeature_launches() {
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/LockTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/LockTest.java
new file mode 100644
index 0000000..95dbd60
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/LockTest.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright (C) 2021 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 android.devicepolicy.cts;
+
+import static android.Manifest.permission.LOCK_DEVICE;
+import static android.content.pm.PackageManager.FEATURE_AUTOMOTIVE;
+import static android.os.Build.VERSION_CODES.N;
+import static android.os.Build.VERSION_CODES.O;
+
+import static com.android.bedstead.harrier.Defaults.DEFAULT_PASSWORD;
+import static com.android.bedstead.metricsrecorder.truth.MetricQueryBuilderSubject.assertThat;
+import static com.android.bedstead.remotedpc.RemoteDpc.DPC_COMPONENT_NAME;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.testng.Assert.assertThrows;
+
+import android.app.KeyguardManager;
+import android.app.admin.DevicePolicyManager;
+import android.stats.devicepolicy.EventId;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.EnsurePasswordNotSet;
+import com.android.bedstead.harrier.annotations.EnsurePasswordSet;
+import com.android.bedstead.harrier.annotations.EnsureScreenIsOn;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.RequireDoesNotHaveFeature;
+import com.android.bedstead.harrier.annotations.RequireFeature;
+import com.android.bedstead.harrier.annotations.RequireTargetSdkVersion;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.policies.DeprecatedResetPassword;
+import com.android.bedstead.harrier.policies.LockNow;
+import com.android.bedstead.metricsrecorder.EnterpriseMetricsRecorder;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.utils.Poll;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+@RequireFeature("android.software.secure_lock_screen")
+public class LockTest {
+
+    @ClassRule @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final DevicePolicyManager sLocalDevicePolicyManager =
+            TestApis.context().instrumentedContext().getSystemService(DevicePolicyManager.class);
+    private static final KeyguardManager sLocalKeyguardManager =
+            TestApis.context().instrumentedContext().getSystemService(KeyguardManager.class);
+
+    // TODO(191637162): When @PolicyAppliesTest supports permissions, remove
+    @RequireFeature("android.software.secure_lock_screen")
+    @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
+    @EnsureHasPermission(LOCK_DEVICE)
+    @EnsureScreenIsOn
+    @EnsurePasswordNotSet
+    @Postsubmit(reason = "New test")
+    @Test
+    public void lockNow_permission_noPasswordSet_turnsScreenOff() throws Exception {
+        sLocalDevicePolicyManager.lockNow();
+
+        Poll.forValue("isScreenOn", () -> TestApis.device().isScreenOn())
+                .toBeEqualTo(false)
+                .errorOnFail()
+                .await();
+    }
+
+    // TODO(191637162): When @PolicyAppliesTest supports permissions, remove
+    @RequireFeature("android.software.secure_lock_screen")
+    @RequireFeature(FEATURE_AUTOMOTIVE)
+    @EnsureHasPermission(LOCK_DEVICE)
+    @EnsureScreenIsOn
+    @EnsurePasswordNotSet
+    @Postsubmit(reason = "New test")
+    @Test
+    public void lockNow_permission_automotive_noPasswordSet_doesNotTurnScreenOff()
+            throws Exception {
+        sLocalDevicePolicyManager.lockNow();
+
+        assertThat(TestApis.device().isScreenOn()).isTrue();
+    }
+
+    // TODO(191637162): When @PolicyAppliesTest supports permissions, remove
+    @RequireFeature("android.software.secure_lock_screen")
+    @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
+    @EnsureHasPermission(LOCK_DEVICE)
+    @EnsureScreenIsOn
+    @EnsurePasswordSet
+    @Postsubmit(reason = "New test")
+    @Test
+    public void lockNow_permission_passwordSet_locksDevice() throws Exception {
+        sLocalDevicePolicyManager.lockNow();
+
+        Poll.forValue("isDeviceLocked", sLocalKeyguardManager::isDeviceLocked)
+                .toBeEqualTo(true)
+                .errorOnFail()
+                .await();
+    }
+
+    @PolicyAppliesTest(policy = LockNow.class)
+    @Postsubmit(reason = "New test")
+    @EnsurePasswordNotSet
+    public void lockNow_logsMetric() {
+        try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
+            sDeviceState.dpc().devicePolicyManager().lockNow(/* flags= */ 0);
+
+            assertThat(metrics.query()
+                    .whereType().isEqualTo(EventId.LOCK_NOW_VALUE)
+                    .whereAdminPackageName().isEqualTo(DPC_COMPONENT_NAME.getPackageName())
+                    .whereInteger().isEqualTo(0)
+            ).wasLogged();
+        }
+    }
+
+    @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
+    @EnsureScreenIsOn
+    @EnsurePasswordNotSet
+    @Postsubmit(reason = "New test")
+    @PolicyAppliesTest(policy = LockNow.class)
+    public void lockNow_noPasswordSet_turnsScreenOff() throws Exception {
+        sDeviceState.dpc().devicePolicyManager().lockNow();
+
+        Poll.forValue("isScreenOn", () -> TestApis.device().isScreenOn())
+                .toBeEqualTo(false)
+                .errorOnFail()
+                .await();
+    }
+
+    @RequireFeature(FEATURE_AUTOMOTIVE)
+    @EnsureScreenIsOn
+    @EnsurePasswordNotSet
+    @Postsubmit(reason = "New test")
+    @PolicyAppliesTest(policy = LockNow.class)
+    public void lockNow_automotive_noPasswordSet_doesNotTurnScreenOff() throws Exception {
+        sDeviceState.dpc().devicePolicyManager().lockNow();
+
+        assertThat(TestApis.device().isScreenOn()).isTrue();
+    }
+
+    @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
+    @EnsureScreenIsOn
+    @EnsurePasswordSet
+    @Postsubmit(reason = "New test")
+    @PolicyAppliesTest(policy = LockNow.class)
+    public void lockNow_passwordSet_locksDevice() throws Exception {
+        sDeviceState.dpc().devicePolicyManager().lockNow();
+
+        Poll.forValue("isDeviceLocked", sLocalKeyguardManager::isDeviceLocked)
+                .toBeEqualTo(true)
+                .errorOnFail()
+                .await();
+    }
+
+    @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
+    @RequireTargetSdkVersion(max = N)
+    @PolicyAppliesTest(policy = DeprecatedResetPassword.class)
+    public void resetPassword_targetBeforeN_returnsFalse() {
+        assertThat(sDeviceState.dpc()
+                .devicePolicyManager().resetPassword(DEFAULT_PASSWORD, /* flags= */ 0)).isFalse();
+    }
+
+    @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
+    @RequireTargetSdkVersion(min = O)
+    @PolicyAppliesTest(policy = DeprecatedResetPassword.class)
+    public void resetPassword_targetAfterO_throwsSecurityException() {
+        assertThrows(SecurityException.class,
+                () -> sDeviceState.dpc().devicePolicyManager()
+                        .resetPassword(DEFAULT_PASSWORD, /* flags= */ 0));
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/LostModeLocationTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/LostModeLocationTest.java
new file mode 100644
index 0000000..87ce571
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/LostModeLocationTest.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static android.Manifest.permission.TRIGGER_LOST_MODE;
+import static android.app.admin.DevicePolicyManager.ACTION_LOST_MODE_LOCATION_UPDATE;
+import static android.app.admin.DevicePolicyManager.EXTRA_LOST_MODE_LOCATION;
+import static android.content.Context.RECEIVER_EXPORTED;
+import static android.location.LocationManager.FUSED_PROVIDER;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.testng.Assert.assertThrows;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.location.Location;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureDoesNotHavePermission;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.policies.LostMode;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.location.LocationProvider;
+import com.android.bedstead.nene.location.Locations;
+import com.android.bedstead.nene.permissions.PermissionContext;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.TimeUnit;
+
+@RunWith(BedsteadJUnit4.class)
+public final class LostModeLocationTest {
+
+    private static final double TEST_LATITUDE = 51.5;
+    private static final double TEST_LONGITUDE = -0.1;
+    private static final float TEST_ACCURACY = 14.0f;
+    private static final double TEST_LATITUDE_2 = 22.0;
+    private static final double TEST_LONGITUDE_2 = -10.5;
+    private static final float TEST_ACCURACY_2 = 15.0f;
+    private static final int LOCATION_UPDATE_TIMEOUT_SECONDS = 180;
+
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+    private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final DevicePolicyManager sLocalDevicePolicyManager =
+            sContext.getSystemService(DevicePolicyManager.class);
+    private static final IntentFilter sFilter = new IntentFilter(ACTION_LOST_MODE_LOCATION_UPDATE);
+
+    @Before
+    public void setUp() {
+        TestApis.location().setLocationEnabled(true);
+        sDeviceState.dpc().registerReceiver(sFilter, RECEIVER_EXPORTED);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        sDeviceState.dpc().unregisterReceiver(sFilter);
+    }
+
+    @Postsubmit(reason = "new test")
+    @CanSetPolicyTest(policy = LostMode.class)
+    @EnsureDoesNotHavePermission(TRIGGER_LOST_MODE)
+    public void sendLostModeLocationUpdate_withoutPermission_throwsException() throws Exception {
+        assertThrows(SecurityException.class,
+                () -> sLocalDevicePolicyManager.sendLostModeLocationUpdate(
+                        sContext.getMainExecutor(),
+                        new Locations.BlockingLostModeLocationUpdateCallback()));
+    }
+
+    @Postsubmit(reason = "new test")
+    @PolicyAppliesTest(policy = LostMode.class)
+    public void sendLostModeLocationUpdate_noLocation_returnFalse() throws Exception {
+        try {
+            TestApis.location().setLocationEnabled(false);
+            sendLostModeLocationUpdate(/* expected= */ false);
+        } finally {
+            TestApis.location().setLocationEnabled(true);
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @PolicyAppliesTest(policy = LostMode.class)
+    public void sendLostModeLocationUpdate_returnTrueAndSendLocationUpdate()
+            throws Exception {
+        try (LocationProvider provider = TestApis.location().addLocationProvider(FUSED_PROVIDER)) {
+            provider.setLocation(TEST_LATITUDE, TEST_LONGITUDE, TEST_ACCURACY);
+
+            sendLostModeLocationUpdate(/* expected= */ true);
+
+            final Intent receivedIntent = sDeviceState.dpc().events().broadcastReceived()
+                    .whereIntent().action()
+                    .isEqualTo(ACTION_LOST_MODE_LOCATION_UPDATE)
+                    .poll().intent();
+            assertThat(receivedIntent).isNotNull();
+
+            final Location receivedLocation =
+                    receivedIntent.getParcelableExtra(EXTRA_LOST_MODE_LOCATION);
+            assertThat(receivedLocation.getLatitude()).isEqualTo(TEST_LATITUDE);
+            assertThat(receivedLocation.getLongitude()).isEqualTo(TEST_LONGITUDE);
+            assertThat(receivedLocation.getAccuracy()).isEqualTo(TEST_ACCURACY);
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @PolicyAppliesTest(policy = LostMode.class)
+    public void sendLostModeLocationUpdate_sendMostRecentLocation() throws Exception {
+        try (LocationProvider provider = TestApis.location().addLocationProvider(FUSED_PROVIDER)) {
+            provider.setLocation(TEST_LATITUDE, TEST_LONGITUDE, TEST_ACCURACY);
+            provider.setLocation(TEST_LATITUDE_2, TEST_LONGITUDE_2, TEST_ACCURACY_2);
+
+            sendLostModeLocationUpdate(/* expected= */ true);
+
+            final Intent receivedIntent = sDeviceState.dpc().events().broadcastReceived()
+                    .whereIntent().action()
+                    .isEqualTo(ACTION_LOST_MODE_LOCATION_UPDATE)
+                    .poll().intent();
+            assertThat(receivedIntent).isNotNull();
+
+            final Location receivedLocation =
+                    receivedIntent.getParcelableExtra(EXTRA_LOST_MODE_LOCATION);
+            assertThat(receivedLocation.getLatitude()).isEqualTo(TEST_LATITUDE_2);
+            assertThat(receivedLocation.getLongitude()).isEqualTo(TEST_LONGITUDE_2);
+            assertThat(receivedLocation.getAccuracy()).isEqualTo(TEST_ACCURACY_2);
+        }
+    }
+
+    private void sendLostModeLocationUpdate(boolean expected) throws InterruptedException {
+        Locations.BlockingLostModeLocationUpdateCallback callback =
+                new Locations.BlockingLostModeLocationUpdateCallback();
+        try (PermissionContext p = TestApis.permissions().withPermission(TRIGGER_LOST_MODE)) {
+            sLocalDevicePolicyManager.sendLostModeLocationUpdate(sContext.getMainExecutor(),
+                    callback);
+        }
+
+        assertThat(callback.await(LOCATION_UPDATE_TIMEOUT_SECONDS, TimeUnit.SECONDS))
+                .isEqualTo(expected);
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/MainActivity.java b/tests/devicepolicy/src/android/devicepolicy/cts/MainActivity.java
deleted file mode 100644
index 94bae2f..0000000
--- a/tests/devicepolicy/src/android/devicepolicy/cts/MainActivity.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2020 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 android.devicepolicy.cts;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.os.Process;
-import android.os.UserManager;
-import android.util.Log;
-import android.widget.TextView;
-
-/**
- * An activity that displays the serial number of the user that it is running into.
- */
-public final class MainActivity extends Activity {
-
-    private static final String TAG = MainActivity.class.getSimpleName();
-
-    private TextView mTextView;
-    private long mSerialNumber;
-
-    @Override
-    public void onCreate(Bundle bundle) {
-        super.onCreate(bundle);
-
-        setContentView(R.layout.main);
-        mTextView = findViewById(R.id.user_textview);
-
-        UserManager userManager = getSystemService(UserManager.class);
-        mSerialNumber = userManager.getSerialNumberForUser(Process.myUserHandle());
-
-        Log.v(TAG, "onCreate(): serial number is " + mSerialNumber);
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-
-        Log.v(TAG, "updateState(): displaying serial number as " + mSerialNumber);
-        mTextView.setText(Long.toString(mSerialNumber));
-    }
-}
\ No newline at end of file
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/NearbyAppStreamingPolicyTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/NearbyAppStreamingPolicyTest.java
new file mode 100644
index 0000000..591c078
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/NearbyAppStreamingPolicyTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.testng.Assert.assertThrows;
+
+import android.app.admin.DevicePolicyManager;
+import android.app.admin.RemoteDevicePolicyManager;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.policies.NearbyAppStreamingPolicy;
+
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public class NearbyAppStreamingPolicyTest {
+
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private RemoteDevicePolicyManager mDevicePolicyManager;
+
+    @Before
+    public void setUp() {
+        mDevicePolicyManager = sDeviceState.dpc().devicePolicyManager();
+    }
+
+    @PolicyAppliesTest(policy = NearbyAppStreamingPolicy.class)
+    @Postsubmit(reason = "new test")
+    public void getNearbyAppStreamingPolicy_defaultToSameManagedAccountOnly() {
+        assertThat(mDevicePolicyManager.getNearbyAppStreamingPolicy())
+                .isEqualTo(DevicePolicyManager.NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY);
+    }
+
+    @PolicyAppliesTest(policy = NearbyAppStreamingPolicy.class)
+    @Postsubmit(reason = "new test")
+    public void setNearbyAppStreamingPolicy_policyApplied_works() {
+        int originalPolicy = mDevicePolicyManager.getNearbyAppStreamingPolicy();
+
+        mDevicePolicyManager.setNearbyAppStreamingPolicy(
+                DevicePolicyManager.NEARBY_STREAMING_DISABLED);
+
+        try {
+            assertThat(mDevicePolicyManager.getNearbyAppStreamingPolicy())
+                    .isEqualTo(DevicePolicyManager.NEARBY_STREAMING_DISABLED);
+        } finally {
+            mDevicePolicyManager.setNearbyAppStreamingPolicy(originalPolicy);
+        }
+    }
+
+    @CannotSetPolicyTest(policy = NearbyAppStreamingPolicy.class)
+    @Postsubmit(reason = "new test")
+    public void setNearbyAppStreamingPolicy_policyIsNotAllowedToBeSet_throwsException() {
+        assertThrows(SecurityException.class, () ->
+                mDevicePolicyManager.setNearbyAppStreamingPolicy(
+                        DevicePolicyManager.NEARBY_STREAMING_DISABLED));
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/NearbyNotificationStreamingPolicyTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/NearbyNotificationStreamingPolicyTest.java
new file mode 100644
index 0000000..f50d985
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/NearbyNotificationStreamingPolicyTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.testng.Assert.assertThrows;
+
+import android.app.admin.DevicePolicyManager;
+import android.app.admin.RemoteDevicePolicyManager;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.policies.NearbyNotificationStreamingPolicy;
+
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public class NearbyNotificationStreamingPolicyTest {
+
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private RemoteDevicePolicyManager mDevicePolicyManager;
+
+    @Before
+    public void setUp() {
+        mDevicePolicyManager = sDeviceState.dpc().devicePolicyManager();
+    }
+
+    @PolicyAppliesTest(policy = NearbyNotificationStreamingPolicy.class)
+    @Postsubmit(reason = "new test")
+    public void getNearbyNotificationStreamingPolicy_defaultToSameManagedAccountOnly() {
+        assertThat(mDevicePolicyManager.getNearbyNotificationStreamingPolicy())
+                .isEqualTo(DevicePolicyManager.NEARBY_STREAMING_SAME_MANAGED_ACCOUNT_ONLY);
+    }
+
+    @PolicyAppliesTest(policy = NearbyNotificationStreamingPolicy.class)
+    @Postsubmit(reason = "new test")
+    public void setNearbyNotificationStreamingPolicy_policyApplied_works() {
+        int originalPolicy = mDevicePolicyManager.getNearbyNotificationStreamingPolicy();
+
+        mDevicePolicyManager.setNearbyNotificationStreamingPolicy(
+                DevicePolicyManager.NEARBY_STREAMING_DISABLED);
+
+        try {
+            assertThat(mDevicePolicyManager.getNearbyNotificationStreamingPolicy())
+                    .isEqualTo(DevicePolicyManager.NEARBY_STREAMING_DISABLED);
+        } finally {
+            mDevicePolicyManager.setNearbyAppStreamingPolicy(originalPolicy);
+        }
+    }
+
+    @CannotSetPolicyTest(policy = NearbyNotificationStreamingPolicy.class)
+    @Postsubmit(reason = "new test")
+    public void setNearbyAppStreamingPolicy_policyIsNotAllowedToBeSet_throwsException() {
+        assertThrows(SecurityException.class, () ->
+                mDevicePolicyManager.setNearbyNotificationStreamingPolicy(
+                        DevicePolicyManager.NEARBY_STREAMING_DISABLED));
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/NegativeCallAuthorizationTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/NegativeCallAuthorizationTest.java
deleted file mode 100644
index d3b7087..0000000
--- a/tests/devicepolicy/src/android/devicepolicy/cts/NegativeCallAuthorizationTest.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2020 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 android.devicepolicy.cts;
-
-import static org.testng.Assert.assertThrows;
-
-import android.app.admin.DevicePolicyManager;
-import android.content.Context;
-import android.content.pm.PackageManager;
-
-import androidx.test.core.app.ApplicationProvider;
-import androidx.test.filters.SmallTest;
-
-import com.android.bedstead.harrier.BedsteadJUnit4;
-import com.android.bedstead.harrier.DeviceState;
-import com.android.bedstead.harrier.annotations.RequireFeature;
-
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Test that certain DevicePolicyManager APIs aren't available to non-owner apps and that they throw
- * SecurityException when invoked by such apps. For most of the older APIs that accept an explicit
- * ComponentName admin argument, this is tested in android.admin.cts.DevicePolicyManagerTest by
- * passing an admin that is not owner, but for newer APIs authorization is done based on caller UID,
- * so it is critical that the app is not owner. These APIs are tested here.
- */
-@SmallTest
-@RunWith(BedsteadJUnit4.class)
-public final class NegativeCallAuthorizationTest {
-    private static final String ALIAS = "some-alias";
-    private static final Context sContext = ApplicationProvider.getApplicationContext();
-    private static final DevicePolicyManager sDpm =
-            sContext.getSystemService(DevicePolicyManager.class);
-
-    @ClassRule @Rule
-    public static final DeviceState sDeviceState = new DeviceState();
-
-    @Test
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
-    public void testHasKeyPair_failIfNotOwner() {
-        assertThrows(SecurityException.class, () -> sDpm.hasKeyPair(ALIAS));
-    }
-
-    @Test
-    @RequireFeature(PackageManager.FEATURE_DEVICE_ADMIN)
-    public void testGetKeyPairGrants_failIfNotOwner() {
-        assertThrows(SecurityException.class, () -> sDpm.getKeyPairGrants(ALIAS));
-    }
-}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/NetworkLoggingTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/NetworkLoggingTest.java
new file mode 100644
index 0000000..0dbc45c
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/NetworkLoggingTest.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static com.android.bedstead.nene.permissions.CommonPermissions.INTERNET;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.testng.Assert.assertThrows;
+
+import android.stats.devicepolicy.EventId;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureHasNoSecondaryUser;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.policies.NetworkLogging;
+import com.android.bedstead.metricsrecorder.EnterpriseMetricsRecorder;
+import com.android.bedstead.metricsrecorder.truth.MetricQueryBuilderSubject;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.permissions.PermissionContext;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+// These tests currently only cover checking that the appropriate methods are callable. They should
+// be replaced with more complete tests once the other network logging tests are ready to be
+// migrated to the new infrastructure
+@RunWith(BedsteadJUnit4.class)
+public final class NetworkLoggingTest {
+
+    @ClassRule @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final String[] URL_LIST = {
+            "example.edu",
+            "google.co.jp",
+            "google.fr",
+            "google.com.br",
+            "google.com.tr",
+            "google.co.uk",
+            "google.de"
+    };
+
+    @Postsubmit(reason = "new test")
+    @CannotSetPolicyTest(policy = NetworkLogging.class)
+    public void isNetworkLoggingEnabled_notAllowed_throwsException() {
+        assertThrows(SecurityException.class, () -> sDeviceState.dpc().devicePolicyManager()
+                .isNetworkLoggingEnabled(sDeviceState.dpc().componentName()));
+    }
+
+    @Postsubmit(reason = "new test")
+    @CanSetPolicyTest(policy = NetworkLogging.class)
+    @EnsureHasNoSecondaryUser
+    public void isNetworkLoggingEnabled_networkLoggingIsEnabled_returnsTrue() throws Exception {
+        try {
+            sDeviceState.dpc().devicePolicyManager().setNetworkLoggingEnabled(
+                    sDeviceState.dpc().componentName(), true);
+
+            assertThat(sDeviceState.dpc().devicePolicyManager().isNetworkLoggingEnabled(
+                    sDeviceState.dpc().componentName())).isTrue();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setNetworkLoggingEnabled(
+                    sDeviceState.dpc().componentName(), false);
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @CanSetPolicyTest(policy = NetworkLogging.class)
+    public void isNetworkLoggingEnabled_networkLoggingIsNotEnabled_returnsFalse() throws Exception {
+        sDeviceState.dpc().devicePolicyManager().setNetworkLoggingEnabled(
+                sDeviceState.dpc().componentName(), false);
+
+        assertThat(sDeviceState.dpc().devicePolicyManager().isNetworkLoggingEnabled(
+                sDeviceState.dpc().componentName())).isFalse();
+    }
+
+    @Postsubmit(reason = "new test")
+    @PolicyAppliesTest(policy = NetworkLogging.class)
+    public void setNetworkLoggingEnabled_networkLoggingIsEnabled() throws Exception {
+        try {
+            sDeviceState.dpc().devicePolicyManager().setNetworkLoggingEnabled(
+                    sDeviceState.dpc().componentName(), true);
+            for (String url : URL_LIST) {
+                connectToWebsite(url);
+            }
+
+            TestApis.devicePolicy().forceNetworkLogs();
+
+            long batchToken = waitForBatchToken();
+
+            assertThat(sDeviceState.dpc().devicePolicyManager().retrieveNetworkLogs(
+                    sDeviceState.dpc().componentName(), batchToken)).isNotEmpty();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setNetworkLoggingEnabled(
+                    sDeviceState.dpc().componentName(), false);
+        }
+    }
+
+    private long waitForBatchToken() {
+        if (sDeviceState.dpc().isDelegate()) {
+            return sDeviceState.dpc().events().delegateNetworkLogsAvailable()
+                    .waitForEvent().batchToken();
+        } else {
+            return sDeviceState.dpc().events().networkLogsAvailable().waitForEvent().batchToken();
+        }
+    }
+
+    private void connectToWebsite(String server) throws Exception {
+        try (PermissionContext p = TestApis.permissions().withPermission(INTERNET)) {
+            final URL url = new URL("http://" + server);
+            HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
+            try {
+                urlConnection.setConnectTimeout(2000);
+                urlConnection.setReadTimeout(2000);
+                urlConnection.getResponseCode();
+            } finally {
+                urlConnection.disconnect();
+            }
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @CannotSetPolicyTest(policy = NetworkLogging.class)
+    public void setNetworkLoggingEnabled_notAllowed_throwsException() {
+        assertThrows(SecurityException.class, () -> sDeviceState.dpc().devicePolicyManager()
+                .setNetworkLoggingEnabled(sDeviceState.dpc().componentName(), true));
+    }
+
+    @Postsubmit(reason = "new test")
+    @CannotSetPolicyTest(policy = NetworkLogging.class)
+    public void retrieveNetworkLogs_notAllowed_throwsException() {
+        assertThrows(SecurityException.class, () -> sDeviceState.dpc().devicePolicyManager()
+                .retrieveNetworkLogs(sDeviceState.dpc().componentName(), /*batchToken= */ 0));
+    }
+
+    @Postsubmit(reason = "new test")
+    @CanSetPolicyTest(policy = NetworkLogging.class)
+    public void setNetworkLoggingEnabled_true_logsEvent() {
+        try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
+            sDeviceState.dpc().devicePolicyManager().setNetworkLoggingEnabled(
+                    sDeviceState.dpc().componentName(), true);
+
+            MetricQueryBuilderSubject.assertThat(metrics.query()
+                    .whereType().isEqualTo(EventId.SET_NETWORK_LOGGING_ENABLED_VALUE)
+                    .whereAdminPackageName().isEqualTo(
+                            sDeviceState.dpc().packageName())
+                            .whereBoolean().isEqualTo(sDeviceState.dpc().isDelegate())
+                            .whereInteger().isEqualTo(1) // Enabled
+                    ).wasLogged();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setNetworkLoggingEnabled(
+                    sDeviceState.dpc().componentName(), false);
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @CanSetPolicyTest(policy = NetworkLogging.class)
+    public void setNetworkLoggingEnabled_false_logsEvent() {
+        sDeviceState.dpc().devicePolicyManager().setNetworkLoggingEnabled(
+                sDeviceState.dpc().componentName(), true);
+
+        try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
+            sDeviceState.dpc().devicePolicyManager().setNetworkLoggingEnabled(
+                    sDeviceState.dpc().componentName(), false);
+
+            MetricQueryBuilderSubject.assertThat(metrics.query()
+                    .whereType().isEqualTo(EventId.SET_NETWORK_LOGGING_ENABLED_VALUE)
+                    .whereAdminPackageName().isEqualTo(
+                            sDeviceState.dpc().packageName())
+                    .whereBoolean().isEqualTo(sDeviceState.dpc().isDelegate())
+                    .whereInteger().isEqualTo(0) // Disabled
+            ).wasLogged();
+        }
+    }
+
+    @Postsubmit(reason = "new test")
+    @CanSetPolicyTest(policy = NetworkLogging.class)
+    public void retrieveNetworkLogs_logsEvent() throws Exception {
+        try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
+            sDeviceState.dpc().devicePolicyManager().setNetworkLoggingEnabled(
+                    sDeviceState.dpc().componentName(), true);
+            for (String url : URL_LIST) {
+                connectToWebsite(url);
+            }
+            TestApis.devicePolicy().forceNetworkLogs();
+            long batchToken = waitForBatchToken();
+
+            sDeviceState.dpc().devicePolicyManager().retrieveNetworkLogs(
+                    sDeviceState.dpc().componentName(), batchToken);
+
+            MetricQueryBuilderSubject.assertThat(metrics.query()
+                    .whereType().isEqualTo(EventId.RETRIEVE_NETWORK_LOGS_VALUE)
+                    .whereAdminPackageName().isEqualTo(
+                            sDeviceState.dpc().packageName())
+                    .whereBoolean().isEqualTo(sDeviceState.dpc().isDelegate())
+            ).wasLogged();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setNetworkLoggingEnabled(
+                    sDeviceState.dpc().componentName(), false);
+        }
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/NetworkResetTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/NetworkResetTest.java
index 5bad1c7..f0d1617 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/NetworkResetTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/NetworkResetTest.java
@@ -35,7 +35,7 @@
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.EnsureHasPermission;
 import com.android.bedstead.harrier.annotations.Postsubmit;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
 import com.android.bedstead.harrier.policies.DisallowNetworkReset;
 import com.android.bedstead.harrier.policies.DisallowPrivateDnsConfig;
 import com.android.bedstead.nene.TestApis;
@@ -44,7 +44,6 @@
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 // TODO(b/189280629): Move this test to to net test folder to live with other network reset tests.
@@ -73,10 +72,9 @@
         restoreSettings(mOriginalAirplaneMode, mOriginalPrivateDnsMode, mOriginalAvoidBadWifi);
     }
 
-    // TODO: Add @NegativePolicyTest
+    // TODO: Add @PolicyDoesNotApplyTest
 
-    @Test
-    @PositivePolicyTest(policy = DisallowNetworkReset.class)
+    @PolicyAppliesTest(policy = DisallowNetworkReset.class)
     @EnsureHasPermission({NETWORK_SETTINGS, WRITE_SECURE_SETTINGS})
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void factoryReset_disallowedByNetworkResetPolicy_doesNotFactoryReset() throws Exception {
@@ -96,8 +94,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = DisallowPrivateDnsConfig.class)
+    @PolicyAppliesTest(policy = DisallowPrivateDnsConfig.class)
     @EnsureHasPermission({NETWORK_SETTINGS, WRITE_SECURE_SETTINGS})
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void factoryReset_disallowedByConfigPrivateDnsPolicy_doesPartialFactoryReset() {
@@ -120,8 +117,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = DisallowNetworkReset.class)
+    @PolicyAppliesTest(policy = DisallowNetworkReset.class)
     @EnsureHasPermission({NETWORK_SETTINGS, WRITE_SECURE_SETTINGS})
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void factoryReset_noPolicyRestrictions_resetsToDefault() throws Exception {
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/NoAdminLeakingTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/NoAdminLeakingTest.java
index 236f152..85508dc 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/NoAdminLeakingTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/NoAdminLeakingTest.java
@@ -17,6 +17,7 @@
 package android.devicepolicy.cts;
 
 import static android.content.pm.PackageManager.FEATURE_AUTOMOTIVE;
+import static android.content.pm.PackageManager.FEATURE_SECURE_LOCK_SCREEN;
 
 import static com.android.bedstead.remotedpc.RemoteDpc.DPC_COMPONENT_NAME;
 
@@ -31,16 +32,15 @@
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.harrier.annotations.RequireDoesNotHaveFeature;
+import com.android.bedstead.harrier.annotations.RequireFeature;
 import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
 import com.android.bedstead.harrier.policies.LockscreenPolicyWithUnifiedChallenge;
 import com.android.bedstead.harrier.policies.ScreenCaptureDisabled;
 import com.android.bedstead.testapp.TestApp;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.function.BiConsumer;
@@ -51,141 +51,125 @@
  * calls where "who" is null or "who" is not null and belongs to caller. SecurityExceptions that are
  * thrown otherwise shouldn't leak that data either.
  */
-@RunWith(BedsteadJUnit4.class)
 // Password policies aren't supported on automotive
 @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
+@RequireFeature(FEATURE_SECURE_LOCK_SCREEN)
+@RunWith(BedsteadJUnit4.class)
 public class NoAdminLeakingTest {
     @ClassRule
     @Rule
     public static final DeviceState sDeviceState = new DeviceState();
 
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-    private static final TestApp sTestApp = sTestAppProvider.any();
+    private static final TestApp sTestApp = sDeviceState.testApps().any();
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testPasswordQuality_adminPolicyNotAvailableToNonAdmin() {
+    public void passwordQuality_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getPasswordQuality(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testPasswordMinimumLength_adminPolicyNotAvailableToNonAdmin() {
+    public void passwordMinimumLength_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getPasswordMinimumLength(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testPasswordMinimumLetters_adminPolicyNotAvailableToNonAdmin() {
+    public void passwordMinimumLetters_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getPasswordMinimumLetters(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testPasswordMinimumNonLetter_adminPolicyNotAvailableToNonAdmin() {
+    public void passwordMinimumNonLetter_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getPasswordMinimumNonLetter(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testPasswordMinimumLowerCase_adminPolicyNotAvailableToNonAdmin() {
+    public void passwordMinimumLowerCase_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getPasswordMinimumLowerCase(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testPasswordMinimumUpperCase_adminPolicyNotAvailableToNonAdmin() {
+    public void passwordMinimumUpperCase_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getPasswordMinimumUpperCase(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testPasswordMinimumNumeric_adminPolicyNotAvailableToNonAdmin() {
+    public void passwordMinimumNumeric_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getPasswordMinimumNumeric(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testPasswordMinimumSymbols_adminPolicyNotAvailableToNonAdmin() {
+    public void passwordMinimumSymbols_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getPasswordMinimumSymbols(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testPasswordHistoryLength_adminPolicyNotAvailableToNonAdmin() {
+    public void passwordHistoryLength_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getPasswordHistoryLength(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testPasswordExpiration_adminPolicyNotAvailableToNonAdmin() {
+    public void passwordExpiration_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getPasswordExpiration(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testPasswordExpirationTimeout_adminPolicyNotAvailableToNonAdmin() {
+    public void passwordExpirationTimeout_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getPasswordExpirationTimeout(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testMaximumFailedPasswordsForWipe_adminPolicyNotAvailableToNonAdmin() {
+    public void maximumFailedPasswordsForWipe_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getMaximumFailedPasswordsForWipe(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testMaximumTimeToLock_adminPolicyNotAvailableToNonAdmin() {
+    public void maximumTimeToLock_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getMaximumTimeToLock(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testRequiredStrongAuthTimeout_adminPolicyNotAvailableToNonAdmin() {
+    public void requiredStrongAuthTimeout_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getRequiredStrongAuthTimeout(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = ScreenCaptureDisabled.class)
-    public void testScreenCaptureDisabled_adminPolicyNotAvailableToNonAdmin() {
+    public void screenCaptureDisabled_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getScreenCaptureDisabled(who));
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = LockscreenPolicyWithUnifiedChallenge.class)
-    public void testTrustAgentConfiguration_adminPolicyNotAvailableToNonAdmin() {
+    public void trustAgentConfiguration_adminPolicyNotAvailableToNonAdmin() {
         assertOnlyAggregatePolicyAvailableToNonAdmin(
                 (dpm, who) -> dpm.getTrustAgentConfiguration(who,
                         DPC_COMPONENT_NAME /* agent component, need to be non-null */));
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/NonExportedActivity.java b/tests/devicepolicy/src/android/devicepolicy/cts/NonExportedActivity.java
deleted file mode 100644
index 25ba6f7..0000000
--- a/tests/devicepolicy/src/android/devicepolicy/cts/NonExportedActivity.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2020 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 android.devicepolicy.cts;
-
-import android.app.Activity;
-
-/** Activity used for Cross Profile Apps Tests */
-public final class NonExportedActivity extends Activity {
-}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/NonMainActivity.java b/tests/devicepolicy/src/android/devicepolicy/cts/NonMainActivity.java
deleted file mode 100644
index 98b8b11..0000000
--- a/tests/devicepolicy/src/android/devicepolicy/cts/NonMainActivity.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (C) 2020 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 android.devicepolicy.cts;
-
-import android.app.Activity;
-
-/** Activity used for Cross Profile Apps Tests */
-public final class NonMainActivity extends Activity {
-}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/PackagesTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/PackagesTest.java
new file mode 100644
index 0000000..63063c8
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/PackagesTest.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.testng.Assert.assertThrows;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.AfterClass;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.policies.HideApplication;
+import com.android.bedstead.harrier.policies.SuspendPackage;
+import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppInstance;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public final class PackagesTest {
+
+    @ClassRule @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final TestApp sTestApp = sDeviceState.testApps().any();
+    private static final TestAppInstance sTestAppInstance = sTestApp.install();
+
+    @AfterClass
+    public static void teardownClass() {
+        sTestAppInstance.uninstall();
+    }
+
+    @CanSetPolicyTest(policy = HideApplication.class)
+    @Postsubmit(reason = "new test")
+    public void isApplicationHidden_applicationIsHidden_returnsTrue() {
+        try {
+            sDeviceState.dpc().devicePolicyManager().setApplicationHidden(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(), true);
+
+            assertThat(sDeviceState.dpc().devicePolicyManager().isApplicationHidden(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName())).isTrue();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setApplicationHidden(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(), false);
+        }
+    }
+
+    @CanSetPolicyTest(policy = HideApplication.class)
+    @Postsubmit(reason = "new test")
+    public void isApplicationHidden_applicationIsNotHidden_returnsFalse() {
+        sDeviceState.dpc().devicePolicyManager().setApplicationHidden(
+                sDeviceState.dpc().componentName(), sTestApp.packageName(), false);
+
+        assertThat(sDeviceState.dpc().devicePolicyManager().isApplicationHidden(
+                sDeviceState.dpc().componentName(), sTestApp.packageName())).isFalse();
+    }
+
+    @CannotSetPolicyTest(policy = HideApplication.class)
+    @Postsubmit(reason = "new test")
+    public void isApplicationHidden_notAllowed_throwsException() {
+        assertThrows(SecurityException.class, () ->
+                sDeviceState.dpc().devicePolicyManager()
+                        .isApplicationHidden(
+                                sDeviceState.dpc().componentName(), sTestApp.packageName()));
+    }
+
+    @CannotSetPolicyTest(policy = HideApplication.class)
+    @Postsubmit(reason = "new test")
+    public void setApplicationHidden_notAllowed_throwsException() {
+        assertThrows(SecurityException.class, () ->
+                sDeviceState.dpc().devicePolicyManager()
+                        .setApplicationHidden(
+                                sDeviceState.dpc().componentName(), sTestApp.packageName(), true));
+    }
+
+    @CanSetPolicyTest(policy = SuspendPackage.class)
+    @Postsubmit(reason = "new test")
+    public void isPackageSuspended_packageIsSuspended_returnsTrue() throws Exception {
+        try {
+            sDeviceState.dpc().devicePolicyManager().setPackagesSuspended(
+                    sDeviceState.dpc().componentName(), new String[]{sTestApp.packageName()}, true);
+
+            assertThat(sDeviceState.dpc().devicePolicyManager().isPackageSuspended(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName())).isTrue();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPackagesSuspended(
+                    sDeviceState.dpc().componentName(), new String[]{sTestApp.packageName()},
+                    false);
+        }
+    }
+
+    @CanSetPolicyTest(policy = SuspendPackage.class)
+    @Postsubmit(reason = "new test")
+    public void isPackageSuspended_packageIsNotSuspended_returnFalse() throws Exception {
+        sDeviceState.dpc().devicePolicyManager().setPackagesSuspended(
+                sDeviceState.dpc().componentName(), new String[]{sTestApp.packageName()}, false);
+
+        assertThat(sDeviceState.dpc().devicePolicyManager().isPackageSuspended(
+                sDeviceState.dpc().componentName(), sTestApp.packageName())).isFalse();
+    }
+
+    @CannotSetPolicyTest(policy = SuspendPackage.class)
+    @Postsubmit(reason = "new test")
+    public void isPackageSuspended_notAllowed_throwsException() {
+        assertThrows(SecurityException.class, () ->
+                sDeviceState.dpc().devicePolicyManager()
+                        .isPackageSuspended(
+                                sDeviceState.dpc().componentName(), sTestApp.packageName()));
+    }
+
+    @CannotSetPolicyTest(policy = SuspendPackage.class)
+    @Postsubmit(reason = "new test")
+    public void setPackageSuspended_notAllowed_throwsException() {
+        assertThrows(SecurityException.class, () ->
+                sDeviceState.dpc().devicePolicyManager()
+                        .setPackagesSuspended(
+                                sDeviceState.dpc().componentName(),
+                                new String[]{sTestApp.packageName()}, true));
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/PermissionGrantTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/PermissionGrantTest.java
index 4545f94..6e23366 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/PermissionGrantTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/PermissionGrantTest.java
@@ -29,9 +29,13 @@
 import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_DEFAULT;
 import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED;
 import static android.app.admin.DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED;
+import static android.app.admin.DevicePolicyManager.PERMISSION_POLICY_AUTO_DENY;
+import static android.app.admin.DevicePolicyManager.PERMISSION_POLICY_AUTO_GRANT;
+import static android.app.admin.DevicePolicyManager.PERMISSION_POLICY_PROMPT;
 
 import static com.android.bedstead.nene.notifications.NotificationListenerQuerySubject.assertThat;
 
+import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.testng.Assert.assertThrows;
@@ -39,29 +43,31 @@
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.AfterClass;
-import com.android.bedstead.harrier.annotations.BeforeClass;
+import com.android.bedstead.harrier.annotations.IntTestParameter;
 import com.android.bedstead.harrier.annotations.NotificationsTest;
+import com.android.bedstead.harrier.annotations.StringTestParameter;
 import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
 import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.NegativePolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyDoesNotApplyTest;
 import com.android.bedstead.harrier.policies.SetPermissionGrantState;
 import com.android.bedstead.harrier.policies.SetSensorPermissionGranted;
 import com.android.bedstead.harrier.policies.SetSmsPermissionGranted;
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.notifications.NotificationListener;
+import com.android.bedstead.nene.utils.Poll;
 import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppActivity;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
-
-import com.google.common.collect.ImmutableSet;
 
 import org.junit.ClassRule;
 import org.junit.Ignore;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
 @RunWith(BedsteadJUnit4.class)
 public final class PermissionGrantTest {
 
@@ -80,30 +86,45 @@
 
     private static final String DEVELOPMENT_PERMISSION = INTERACT_ACROSS_USERS;
 
-    private static final ImmutableSet<String> SENSOR_PERMISSIONS = ImmutableSet.of(
+    @StringTestParameter({
             ACCESS_FINE_LOCATION,
             ACCESS_BACKGROUND_LOCATION,
             ACCESS_COARSE_LOCATION,
             CAMERA,
             ACTIVITY_RECOGNITION,
-            BODY_SENSORS);
+            BODY_SENSORS})
+    @Retention(RetentionPolicy.RUNTIME)
+    private @interface SensorPermissionTestParameter {
+    }
 
-    private static final ImmutableSet<String> LOCATION_PERMISSIONS = ImmutableSet.of(
+    @StringTestParameter({
             ACCESS_FINE_LOCATION,
             ACCESS_BACKGROUND_LOCATION,
-            ACCESS_COARSE_LOCATION);
+            ACCESS_COARSE_LOCATION})
+    @Retention(RetentionPolicy.RUNTIME)
+    private @interface LocationPermissionTestParameter {
+    }
 
-    private static final ImmutableSet<String> DENYABLE_PERMISSIONS = ImmutableSet.<String>builder()
-            .add(GRANTABLE_PERMISSION)
-            .add(READ_SMS) // All DPCs can deny sms permission
-            .addAll(SENSOR_PERMISSIONS) // All DPCs can deny sensor permissions
-            .build();
+    @StringTestParameter({
+            // Grantable permission
+            READ_CALENDAR,
+            READ_SMS, // All DPCs can deny sms permission
+            // All DPCs can deny sensor permissions
+            ACCESS_FINE_LOCATION,
+            ACCESS_BACKGROUND_LOCATION,
+            ACCESS_COARSE_LOCATION,
+            CAMERA,
+            ACTIVITY_RECOGNITION,
+            BODY_SENSORS
+    })
+    @Retention(RetentionPolicy.RUNTIME)
+    private @interface DeniablePermissionTestParameter {
+    }
 
     private static final String NON_EXISTING_PACKAGE_NAME = "non.existing.package";
     private static final String NOT_DECLARED_PERMISSION = "not.declared.permission";
 
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
-    private static final TestApp sTestApp = sTestAppProvider.query()
+    private static final TestApp sTestApp = sDeviceState.testApps().query()
             .wherePermissions().contains(
                     READ_SMS,
                     CAMERA,
@@ -116,20 +137,18 @@
             ).wherePermissions().doesNotContain(
                     NOT_DECLARED_PERMISSION
             ).get();
-    private static TestAppInstance sTestAppInstance;
-
-    @BeforeClass
-    public static void setupClass() {
-        sTestAppInstance = sTestApp.install(TestApis.users().instrumented());
-    }
+    private static final TestApp sNotInstalledTestApp = sDeviceState.testApps().query()
+            .wherePermissions().contains(GRANTABLE_PERMISSION)
+            .whereActivities().isNotEmpty().get();
+    private static TestAppInstance sTestAppInstance =
+            sTestApp.install(TestApis.users().instrumented());
 
     @AfterClass
     public static void teardownClass() {
         sTestAppInstance.uninstall();
     }
 
-    @Test
-    @NegativePolicyTest(policy = SetSmsPermissionGranted.class)
+    @PolicyDoesNotApplyTest(policy = SetSmsPermissionGranted.class)
     public void getPermissionGrantState_smsPermission_notAbleToSetState_alsoCantReadState() {
         int existingGrantState = sDeviceState.dpc().devicePolicyManager()
                 .getPermissionGrantState(sDeviceState.dpc().componentName(),
@@ -156,68 +175,60 @@
         }
     }
 
-    @Test
-    @NegativePolicyTest(policy = SetSensorPermissionGranted.class)
-    public void getPermissionGrantState_sensorPermission_notAbleToSetState_alsoCantReadState() {
-        // TODO(b/188893663): Replace with parameterization
-        for (String permission : SENSOR_PERMISSIONS) {
-            int existingGrantState = sDeviceState.dpc().devicePolicyManager()
-                    .getPermissionGrantState(sDeviceState.dpc().componentName(),
-                            sTestApp.packageName(), permission);
-            try {
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, PERMISSION_GRANT_STATE_GRANTED);
+    @PolicyDoesNotApplyTest(policy = SetSensorPermissionGranted.class)
+    public void getPermissionGrantState_sensorPermission_notAbleToSetState_alsoCantReadState(
+            @SensorPermissionTestParameter String permission) {
+        int existingGrantState = sDeviceState.dpc().devicePolicyManager()
+                .getPermissionGrantState(sDeviceState.dpc().componentName(),
+                        sTestApp.packageName(), permission);
+        try {
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, PERMISSION_GRANT_STATE_GRANTED);
 
-                sTestApp.pkg().grantPermission(TestApis.users().instrumented(), permission);
-                // TODO(b/204041462): Replace granting the permission here with the user pressing the
-                //  "deny" button on the permission
+            sTestApp.pkg().grantPermission(TestApis.users().instrumented(), permission);
+            // TODO(b/204041462): Replace granting the permission here with the user pressing the
+            //  "deny" button on the permission
 
-                assertWithMessage("Should not be able to read permission grant state but can")
-                        .that(sDeviceState.dpc().devicePolicyManager().getPermissionGrantState(
-                                sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                                permission))
-                        .isEqualTo(PERMISSION_GRANT_STATE_DEFAULT);
-            } finally {
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, existingGrantState);
-                sTestApp.pkg().denyPermission(TestApis.users().instrumented(), permission);
-            }
+            assertWithMessage("Should not be able to read permission grant state but can")
+                    .that(sDeviceState.dpc().devicePolicyManager().getPermissionGrantState(
+                            sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                            permission))
+                    .isEqualTo(PERMISSION_GRANT_STATE_DEFAULT);
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, existingGrantState);
+            sTestApp.pkg().denyPermission(TestApis.users().instrumented(), permission);
         }
     }
 
-    @Test
     @CanSetPolicyTest(policy = SetPermissionGrantState.class)
-    public void denyPermission_setsGrantState() {
-        // TODO(b/188893663): Replace with parameterization
-        for (String permission : DENYABLE_PERMISSIONS) {
-            int existingGrantState = sDeviceState.dpc().devicePolicyManager()
-                    .getPermissionGrantState(sDeviceState.dpc().componentName(),
-                            sTestApp.packageName(), permission);
+    public void denyPermission_setsGrantState(@DeniablePermissionTestParameter String permission) {
+        int existingGrantState = sDeviceState.dpc().devicePolicyManager()
+                .getPermissionGrantState(sDeviceState.dpc().componentName(),
+                        sTestApp.packageName(), permission);
 
-            try {
-                boolean wasSet = sDeviceState.dpc().devicePolicyManager()
-                        .setPermissionGrantState(
-                                sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                                permission, PERMISSION_GRANT_STATE_DENIED);
+        try {
+            boolean wasSet = sDeviceState.dpc().devicePolicyManager()
+                    .setPermissionGrantState(
+                            sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                            permission, PERMISSION_GRANT_STATE_DENIED);
 
-                assertWithMessage("setPermissionGrantState did not return true")
-                        .that(wasSet).isTrue();
-                assertWithMessage("Permission grant state should be set to denied but was not")
-                        .that(sDeviceState.dpc().devicePolicyManager().getPermissionGrantState(
-                                sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                                permission))
-                        .isEqualTo(PERMISSION_GRANT_STATE_DENIED);
-            } finally {
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, existingGrantState);
-            }
+            assertWithMessage("setPermissionGrantState did not return true")
+                    .that(wasSet).isTrue();
+            assertWithMessage("Permission grant state should be set to denied but was not")
+                    .that(sDeviceState.dpc().devicePolicyManager().getPermissionGrantState(
+                            sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                            permission))
+                    .isEqualTo(PERMISSION_GRANT_STATE_DENIED);
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, existingGrantState);
         }
     }
 
-    @Test
     @CanSetPolicyTest(policy = SetPermissionGrantState.class)
     public void grantPermission_setsGrantState() {
         int existingGrantState = sDeviceState.dpc().devicePolicyManager()
@@ -244,35 +255,31 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = SetPermissionGrantState.class)
-    public void denyPermission_permissionIsDenied() {
-        // TODO(b/188893663): Replace with parameterization
-        for (String permission : DENYABLE_PERMISSIONS) {
-            int existingGrantState = sDeviceState.dpc().devicePolicyManager()
-                    .getPermissionGrantState(sDeviceState.dpc().componentName(),
-                            sTestApp.packageName(), permission);
-            try {
-                sTestApp.pkg().grantPermission(TestApis.users().instrumented(), permission);
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, PERMISSION_GRANT_STATE_DENIED);
+    @PolicyAppliesTest(policy = SetPermissionGrantState.class)
+    public void denyPermission_permissionIsDenied(
+            @DeniablePermissionTestParameter String permission) {
+        int existingGrantState = sDeviceState.dpc().devicePolicyManager()
+                .getPermissionGrantState(sDeviceState.dpc().componentName(),
+                        sTestApp.packageName(), permission);
+        try {
+            sTestApp.pkg().grantPermission(TestApis.users().instrumented(), permission);
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, PERMISSION_GRANT_STATE_DENIED);
 
-                assertWithMessage("Permission should not be granted but was").that(
-                        sTestApp.pkg().hasPermission(permission)).isFalse();
+            assertWithMessage("Permission should not be granted but was").that(
+                    sTestApp.pkg().hasPermission(permission)).isFalse();
 
-                // TODO(b/204041462): Test that the app cannot request the permission
-            } finally {
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, existingGrantState);
-                sTestApp.pkg().denyPermission(TestApis.users().instrumented(), permission);
-            }
+            // TODO(b/204041462): Test that the app cannot request the permission
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, existingGrantState);
+            sTestApp.pkg().denyPermission(TestApis.users().instrumented(), permission);
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = SetPermissionGrantState.class)
+    @PolicyAppliesTest(policy = SetPermissionGrantState.class)
     public void grantPermission_permissionIsGranted() {
         int existingGrantState = sDeviceState.dpc().devicePolicyManager()
                 .getPermissionGrantState(sDeviceState.dpc().componentName(),
@@ -295,49 +302,50 @@
         }
     }
 
-    @Test
-    @NegativePolicyTest(policy = SetPermissionGrantState.class)
-    public void denyPermission_doesNotApply_permissionIsNotDenied() {
-        // TODO(b/188893663): Replace with parameterization
-        for (String permission : DENYABLE_PERMISSIONS) {
-            try {
-                sTestApp.pkg().grantPermission(TestApis.users().instrumented(), permission);
+    @PolicyDoesNotApplyTest(policy = SetPermissionGrantState.class)
+    public void denyPermission_doesNotApply_permissionIsNotDenied(
+            @DeniablePermissionTestParameter String permission) {
+        try {
+            sTestApp.pkg().grantPermission(TestApis.users().instrumented(), permission);
 
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, PERMISSION_GRANT_STATE_DENIED);
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, PERMISSION_GRANT_STATE_DENIED);
 
-                assertWithMessage("Permission should not be denied but was").that(
-                        sTestApp.pkg().hasPermission(permission)).isTrue();
-            } finally {
-                sTestApp.pkg().denyPermission(TestApis.users().instrumented(), permission);
-            }
+            assertWithMessage("Permission should not be denied but was").that(
+                    sTestApp.pkg().hasPermission(permission)).isTrue();
+        } finally {
+            sTestApp.pkg().denyPermission(TestApis.users().instrumented(), permission);
         }
     }
 
-    @Test
-    @NegativePolicyTest(policy = SetPermissionGrantState.class)
-    public void grantPermission_doesNotApply_permissionIsNotGranted() {
-        // TODO(b/188893663): Replace with parameterization
-        for (String permission : DENYABLE_PERMISSIONS) {
-            try {
-                sTestApp.pkg().denyPermission(TestApis.users().instrumented(), permission);
+    @PolicyDoesNotApplyTest(policy = SetPermissionGrantState.class)
+    public void grantPermission_doesNotApply_permissionIsNotGranted(
+            @DeniablePermissionTestParameter String permission) {
+        try {
+            sTestApp.pkg().denyPermission(TestApis.users().instrumented(), permission);
 
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, PERMISSION_GRANT_STATE_GRANTED);
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, PERMISSION_GRANT_STATE_GRANTED);
 
-                assertWithMessage("Permission should not be granted but was").that(
-                        sTestApp.pkg().hasPermission(permission)).isFalse();
-            } finally {
-                sTestApp.pkg().denyPermission(TestApis.users().instrumented(), permission);
-            }
+            assertWithMessage("Permission should not be granted but was").that(
+                    sTestApp.pkg().hasPermission(permission)).isFalse();
+        } finally {
+            sTestApp.pkg().denyPermission(TestApis.users().instrumented(), permission);
         }
     }
 
+    @CannotSetPolicyTest(policy = SetPermissionGrantState.class)
+    public void grantPermission_cannotBeSet_throwsException(
+            @DeniablePermissionTestParameter String permission) {
+        assertThrows(SecurityException.class, () -> sDeviceState.dpc().devicePolicyManager()
+                .setPermissionGrantState(sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                        permission, PERMISSION_GRANT_STATE_GRANTED));
+    }
+
     // TODO(b/204041462): Add test that the user can manually grant sensor permissions
 
-    @Test
     @CanSetPolicyTest(policy = SetPermissionGrantState.class)
     public void grantDevelopmentPermission_cannotGrant() {
         int existingGrantState = sDeviceState.dpc().devicePolicyManager()
@@ -366,7 +374,6 @@
         }
     }
 
-    @Test
     @CanSetPolicyTest(policy = SetPermissionGrantState.class)
     public void denyDevelopmentPermission_cannotDeny() {
         int existingGrantState = sDeviceState.dpc().devicePolicyManager()
@@ -392,7 +399,6 @@
         }
     }
 
-    @Test
     @CanSetPolicyTest(policy = SetPermissionGrantState.class)
     public void setDevelopmentPermissionToDefault_cannotSet() {
         int existingGrantState = sDeviceState.dpc().devicePolicyManager()
@@ -413,7 +419,6 @@
         }
     }
 
-    @Test
     @CanSetPolicyTest(policy = SetSmsPermissionGranted.class)
     public void grantSmsPermission_setsGrantState() {
         int existingGrantState = sDeviceState.dpc().devicePolicyManager()
@@ -439,40 +444,35 @@
         }
     }
 
-    @Test
     @CanSetPolicyTest(policy = SetSensorPermissionGranted.class)
     @Ignore("TODO(198280344): Re-enable when we can set sensor permissions using device owner")
-    public void grantSensorPermission_setsGrantState() {
-        // TODO(b/188893663): Replace with parameterization
-        for (String permission : SENSOR_PERMISSIONS) {
-            int existingGrantState = sDeviceState.dpc().devicePolicyManager()
-                    .getPermissionGrantState(sDeviceState.dpc().componentName(),
-                            sTestApp.packageName(), permission);
-            try {
-                boolean wasSet =
-                        sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                                sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                                permission, PERMISSION_GRANT_STATE_GRANTED);
+    public void grantSensorPermission_setsGrantState(
+            @SensorPermissionTestParameter String permission) {
+        int existingGrantState = sDeviceState.dpc().devicePolicyManager()
+                .getPermissionGrantState(sDeviceState.dpc().componentName(),
+                        sTestApp.packageName(), permission);
+        try {
+            boolean wasSet =
+                    sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                            sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                            permission, PERMISSION_GRANT_STATE_GRANTED);
 
-                assertWithMessage("setPermissionGrantState did not return true")
-                        .that(wasSet).isTrue();
-                assertWithMessage("Permission grant state should be set to granted but was not")
-                        .that(sDeviceState.dpc().devicePolicyManager().getPermissionGrantState(
-                                sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                                permission))
-                        .isEqualTo(PERMISSION_GRANT_STATE_GRANTED);
-            } finally {
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, existingGrantState);
-            }
+            assertWithMessage("setPermissionGrantState did not return true")
+                    .that(wasSet).isTrue();
+            assertWithMessage("Permission grant state should be set to granted but was not")
+                    .that(sDeviceState.dpc().devicePolicyManager().getPermissionGrantState(
+                            sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                            permission))
+                    .isEqualTo(PERMISSION_GRANT_STATE_GRANTED);
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, existingGrantState);
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = SetSmsPermissionGranted.class)
+    @PolicyAppliesTest(policy = SetSmsPermissionGranted.class)
     public void grantSmsPermission_permissionIsGranted() {
-        // TODO(b/188893663): Replace with parameterization
         int existingGrantState = sDeviceState.dpc().devicePolicyManager()
                 .getPermissionGrantState(sDeviceState.dpc().componentName(),
                         sTestApp.packageName(), READ_SMS);
@@ -490,36 +490,34 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = SetSensorPermissionGranted.class)
+    @PolicyAppliesTest(policy = SetSensorPermissionGranted.class)
     @Ignore("TODO(198280344): Re-enable when we can set sensor permissions using device owner")
-    public void grantSensorPermission_permissionIsGranted() {
-        // TODO(b/188893663): Replace with parameterization
-        for (String permission : SENSOR_PERMISSIONS) {
-            int existingGrantState = sDeviceState.dpc().devicePolicyManager()
-                    .getPermissionGrantState(sDeviceState.dpc().componentName(),
-                            sTestApp.packageName(), permission);
-            try {
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, PERMISSION_GRANT_STATE_GRANTED);
+    public void grantSensorPermission_permissionIsGranted(
+            @SensorPermissionTestParameter String permission) {
+        int existingGrantState = sDeviceState.dpc().devicePolicyManager()
+                .getPermissionGrantState(sDeviceState.dpc().componentName(),
+                        sTestApp.packageName(), permission);
+        try {
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, PERMISSION_GRANT_STATE_GRANTED);
 
-                assertWithMessage("Permission should be granted but was not").that(
-                        sTestApp.pkg().hasPermission(permission)).isTrue();
-            } finally {
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, existingGrantState);
-            }
+            assertWithMessage("Permission should be granted but was not").that(
+                    sTestApp.pkg().hasPermission(permission)).isTrue();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, existingGrantState);
         }
     }
 
-    @Test
-    @NegativePolicyTest(policy = SetSmsPermissionGranted.class)
+    @PolicyDoesNotApplyTest(policy = SetSmsPermissionGranted.class)
     public void grantSmsPermission_doesNotApplyToUser_permissionIsNotGranted() {
         int existingGrantState = sDeviceState.dpc().devicePolicyManager()
                 .getPermissionGrantState(sDeviceState.dpc().componentName(),
                         sTestApp.packageName(), READ_SMS);
+        sTestApp.pkg().denyPermission(READ_SMS);
+
         try {
             sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
                     sDeviceState.dpc().componentName(), sTestApp.packageName(),
@@ -534,31 +532,27 @@
         }
     }
 
-    @Test
-    @NegativePolicyTest(policy = SetSensorPermissionGranted.class)
+    @PolicyDoesNotApplyTest(policy = SetSensorPermissionGranted.class)
     @Ignore("TODO(198280344): Re-enable when we can set sensor permissions using device owner")
-    public void grantSensorPermission_doesNotApplyToUser_permissionIsNotGranted() {
-        // TODO(b/188893663): Replace with parameterization
-        for (String permission : SENSOR_PERMISSIONS) {
-            int existingGrantState = sDeviceState.dpc().devicePolicyManager()
-                    .getPermissionGrantState(sDeviceState.dpc().componentName(),
-                            sTestApp.packageName(), permission);
-            try {
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, PERMISSION_GRANT_STATE_GRANTED);
+    public void grantSensorPermission_doesNotApplyToUser_permissionIsNotGranted(
+            @SensorPermissionTestParameter String permission) {
+        int existingGrantState = sDeviceState.dpc().devicePolicyManager()
+                .getPermissionGrantState(sDeviceState.dpc().componentName(),
+                        sTestApp.packageName(), permission);
+        try {
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, PERMISSION_GRANT_STATE_GRANTED);
 
-                assertWithMessage("Permission should not be granted but was").that(
-                        sTestApp.pkg().hasPermission(permission)).isFalse();
-            } finally {
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, existingGrantState);
-            }
+            assertWithMessage("Permission should not be granted but was").that(
+                    sTestApp.pkg().hasPermission(permission)).isFalse();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, existingGrantState);
         }
     }
 
-    @Test
     @CannotSetPolicyTest(policy = SetSmsPermissionGranted.class, includeNonDeviceAdminStates = false)
     public void grantSmsPermission_cannotBeApplied_returnsTrueButDoesNotSetGrantState() {
         int existingGrantState = sDeviceState.dpc().devicePolicyManager()
@@ -584,7 +578,6 @@
         }
     }
 
-    @Test
     @CannotSetPolicyTest(policy = SetSmsPermissionGranted.class, includeDeviceAdminStates = false)
     public void grantSmsPermission_nonDeviceAdmin_throwsException() {
         assertThrows(SecurityException.class,
@@ -593,67 +586,135 @@
                         READ_SMS, PERMISSION_GRANT_STATE_GRANTED));
     }
 
-    @Test
     @CannotSetPolicyTest(policy = SetSensorPermissionGranted.class)
-    public void grantSensorPermission_cannotBeApplied_returnsTrueButDoesNotSetGrantState() {
-        // TODO(b/188893663): Replace with parameterization
-        for (String permission : SENSOR_PERMISSIONS) {
-            int existingGrantState = sDeviceState.dpc().devicePolicyManager()
-                    .getPermissionGrantState(sDeviceState.dpc().componentName(),
-                            sTestApp.packageName(), permission);
-            try {
-                boolean wasSet =
-                        sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                                sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                                permission, PERMISSION_GRANT_STATE_GRANTED);
+    public void grantSensorPermission_cannotBeApplied_returnsTrueButDoesNotSetGrantState(
+            @SensorPermissionTestParameter String permission) {
+        int existingGrantState = sDeviceState.dpc().devicePolicyManager()
+                .getPermissionGrantState(sDeviceState.dpc().componentName(),
+                        sTestApp.packageName(), permission);
+        try {
+            boolean wasSet =
+                    sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                            sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                            permission, PERMISSION_GRANT_STATE_GRANTED);
 
-                assertWithMessage("setPermissionGrantState did not return true")
-                        .that(wasSet).isTrue();
-                assertWithMessage("Permission grant state should not be set to granted but was")
-                        .that(sDeviceState.dpc().devicePolicyManager().getPermissionGrantState(
-                                sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                                permission))
-                        .isNotEqualTo(PERMISSION_GRANT_STATE_GRANTED);
-            } finally {
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, existingGrantState);
-            }
-        }
-    }
-
-    @Test
-    @PositivePolicyTest(policy = SetSensorPermissionGranted.class)
-    @NotificationsTest
-    @Ignore("TODO(198280344): Re-enable when we can set sensor permissions using device owner")
-    public void grantLocationPermission_userNotified() throws Exception {
-        // TODO(b/188893663): Replace with parameterization
-        for (String permission : LOCATION_PERMISSIONS) {
-            int existingGrantState = sDeviceState.dpc().devicePolicyManager()
-                    .getPermissionGrantState(sDeviceState.dpc().componentName(),
-                            sTestApp.packageName(), permission);
+            assertWithMessage("setPermissionGrantState did not return true")
+                    .that(wasSet).isTrue();
+            assertWithMessage("Permission grant state should not be set to granted but was")
+                    .that(sDeviceState.dpc().devicePolicyManager().getPermissionGrantState(
+                            sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                            permission))
+                    .isNotEqualTo(PERMISSION_GRANT_STATE_GRANTED);
+        } finally {
             sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
                     sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                    permission, PERMISSION_GRANT_STATE_DEFAULT);
-            try (NotificationListener notifications = TestApis.notifications().createListener()) {
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, PERMISSION_GRANT_STATE_GRANTED);
-
-                assertThat(notifications.query()
-                        .wherePackageName().isEqualTo(PERMISSION_CONTROLLER_PACKAGE_NAME)
-                        .whereNotification().channelId().isEqualTo(
-                                AUTO_GRANTED_PERMISSIONS_CHANNEL_ID)
-                ).wasPosted();
-            } finally {
-                sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
-                        sDeviceState.dpc().componentName(), sTestApp.packageName(),
-                        permission, existingGrantState);
-            }
+                    permission, existingGrantState);
         }
     }
 
-    @Test
+    @CannotSetPolicyTest(policy = SetPermissionGrantState.class)
+    public void getPermissionGrantState_notAllowed_throwsException() {
+        assertThrows(SecurityException.class, () -> {
+            sDeviceState.dpc().devicePolicyManager().getPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    GRANTABLE_PERMISSION);
+        });
+    }
+
+    @CannotSetPolicyTest(policy = SetPermissionGrantState.class)
+    public void setPermissionPolicy_notAllowed_throwsException() {
+        assertThrows(SecurityException.class, () -> {
+            sDeviceState.dpc().devicePolicyManager().setPermissionPolicy(
+                    sDeviceState.dpc().componentName(), PERMISSION_POLICY_AUTO_GRANT);
+        });
+    }
+
+    @CanSetPolicyTest(policy = SetPermissionGrantState.class)
+    public void setPermissionPolicy_setsPolicy(@IntTestParameter(
+            {PERMISSION_POLICY_AUTO_GRANT, PERMISSION_POLICY_AUTO_DENY}) int policy) {
+        try {
+            sDeviceState.dpc().devicePolicyManager().setPermissionPolicy(
+                    sDeviceState.dpc().componentName(), policy);
+
+            assertThat(sDeviceState.dpc().devicePolicyManager().getPermissionPolicy(
+                    sDeviceState.dpc().componentName())).isEqualTo(policy);
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPermissionPolicy(
+                    sDeviceState.dpc().componentName(), PERMISSION_POLICY_PROMPT);
+        }
+    }
+
+    @PolicyAppliesTest(policy = SetPermissionGrantState.class)
+    public void setPermissionPolicy_grant_automaticallyGrantsPermissions() {
+        try (TestAppInstance testApp = sNotInstalledTestApp.install()) {
+            // We install fresh so the permissions are not granted
+            sDeviceState.dpc().devicePolicyManager().setPermissionPolicy(
+                    sDeviceState.dpc().componentName(), PERMISSION_POLICY_AUTO_GRANT);
+
+            TestAppActivity activity = testApp.activities().any().start().activity();
+            activity.requestPermissions(new String[]{GRANTABLE_PERMISSION}, /* requestCode= */ 0);
+
+            Poll.forValue("Permission granted",
+                    () -> sNotInstalledTestApp.pkg().hasPermission(GRANTABLE_PERMISSION))
+                    .toBeEqualTo(true)
+                    .errorOnFail()
+                    .await();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPermissionPolicy(
+                    sDeviceState.dpc().componentName(), PERMISSION_POLICY_PROMPT);
+        }
+    }
+
+    @PolicyAppliesTest(policy = SetPermissionGrantState.class)
+    public void setPermissionPolicy_deny_automaticallyDeniesPermissions() {
+        try (TestAppInstance testApp = sNotInstalledTestApp.install()) {
+            // We install fresh so the permissions are not granted
+            sDeviceState.dpc().devicePolicyManager().setPermissionPolicy(
+                    sDeviceState.dpc().componentName(), PERMISSION_POLICY_AUTO_DENY);
+
+            TestAppActivity activity = testApp.activities().any().start().activity();
+            activity.requestPermissions(new String[]{GRANTABLE_PERMISSION}, /* requestCode= */ 0);
+
+            Poll.forValue("Permission granted",
+                    () -> sNotInstalledTestApp.pkg().hasPermission(GRANTABLE_PERMISSION))
+                    .toBeEqualTo(false)
+                    .errorOnFail()
+                    .await();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPermissionPolicy(
+                    sDeviceState.dpc().componentName(), PERMISSION_POLICY_PROMPT);
+        }
+    }
+
+
+    @PolicyAppliesTest(policy = SetSensorPermissionGranted.class)
+    @NotificationsTest
+    @Ignore("TODO(198280344): Re-enable when we can set sensor permissions using device owner")
+    public void grantLocationPermission_userNotified(
+            @LocationPermissionTestParameter String permission) throws Exception {
+        int existingGrantState = sDeviceState.dpc().devicePolicyManager()
+                .getPermissionGrantState(sDeviceState.dpc().componentName(),
+                        sTestApp.packageName(), permission);
+        sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                permission, PERMISSION_GRANT_STATE_DEFAULT);
+        try (NotificationListener notifications = TestApis.notifications().createListener()) {
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, PERMISSION_GRANT_STATE_GRANTED);
+
+            assertThat(notifications.query()
+                    .wherePackageName().isEqualTo(PERMISSION_CONTROLLER_PACKAGE_NAME)
+                    .whereNotification().channelId().isEqualTo(
+                            AUTO_GRANTED_PERMISSIONS_CHANNEL_ID)
+            ).wasPosted();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPermissionGrantState(
+                    sDeviceState.dpc().componentName(), sTestApp.packageName(),
+                    permission, existingGrantState);
+        }
+    }
+
     @CanSetPolicyTest(policy = SetPermissionGrantState.class)
     public void setPermissionGrantState_permissionIsNotDeclared_doesNotSetGrantState() {
         boolean wasSet = sDeviceState.dpc().devicePolicyManager()
@@ -669,7 +730,6 @@
                 .isEqualTo(PERMISSION_GRANT_STATE_DEFAULT);
     }
 
-    @Test
     @CanSetPolicyTest(policy = SetPermissionGrantState.class)
     public void setPermissionGrantState_appIsNotInstalled_doesNotSetGrantState() {
         boolean wasSet = sDeviceState.dpc().devicePolicyManager()
@@ -686,7 +746,6 @@
                 .isEqualTo(PERMISSION_GRANT_STATE_DEFAULT);
     }
 
-    @Test
     @CanSetPolicyTest(policy = SetPermissionGrantState.class)
     public void setPermissionGrantStateDefault_wasPreviouslyGranted_permissionStaysGranted() {
         int existingGrantState = sDeviceState.dpc().devicePolicyManager()
@@ -719,7 +778,6 @@
         }
     }
 
-    @Test
     @CanSetPolicyTest(policy = SetPermissionGrantState.class)
     public void setPermissionGrantStateDefault_wasPreviouslyDenied_permissionStaysDenied() {
         int existingGrantState = sDeviceState.dpc().devicePolicyManager()
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/PermitInputMethodsTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/PermitInputMethodsTest.java
new file mode 100644
index 0000000..38c110e
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/PermitInputMethodsTest.java
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_USERS_FULL;
+import static com.android.bedstead.nene.permissions.CommonPermissions.QUERY_ADMIN_POLICY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeFalse;
+import static org.testng.Assert.assertThrows;
+
+import android.app.admin.DevicePolicyManager;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyDoesNotApplyTest;
+import com.android.bedstead.harrier.policies.SetPermittedInputMethods;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.inputmethods.InputMethod;
+import com.android.bedstead.nene.packages.Package;
+
+import org.junit.After;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+@RunWith(BedsteadJUnit4.class)
+public final class PermitInputMethodsTest {
+
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final DevicePolicyManager sLocalDevicePolicyManager = TestApis.context()
+            .instrumentedContext().getSystemService(DevicePolicyManager.class);
+
+    private static final Set<String> SYSTEM_INPUT_METHODS_PACKAGES =
+            TestApis.inputMethods().installedInputMethods().stream()
+                    .map(InputMethod::pkg)
+                    .filter(Package::hasSystemFlag)
+                    .map(Package::packageName)
+                    .collect(Collectors.toSet());
+
+    private static final String INPUT_METHOD_PACKAGE_NAME = "pkg";
+
+
+    @After
+    public void teardown() {
+        sDeviceState.dpc().devicePolicyManager().setPermittedInputMethods(
+                sDeviceState.dpc().componentName(), /* packageNames= */ null);
+    }
+
+    @Postsubmit(reason = "New test")
+    @PolicyAppliesTest(policy = SetPermittedInputMethods.class)
+    @EnsureHasPermission({INTERACT_ACROSS_USERS_FULL, QUERY_ADMIN_POLICY})
+    public void setPermittedInputMethods_allPermitted() {
+        assertThat(sDeviceState.dpc().devicePolicyManager().setPermittedInputMethods(
+                sDeviceState.dpc().componentName(), /* packageNames= */ null)).isTrue();
+
+        assertThat(sDeviceState.dpc().devicePolicyManager()
+                .getPermittedInputMethods(sDeviceState.dpc().componentName())).isNull();
+        assertThat(sLocalDevicePolicyManager.getPermittedInputMethods()).isNull();
+        assertThat(sLocalDevicePolicyManager.getPermittedInputMethodsForCurrentUser()).isNull();
+    }
+
+    @Postsubmit(reason = "New test")
+    @CannotSetPolicyTest(
+            policy = SetPermittedInputMethods.class, includeNonDeviceAdminStates = false)
+    @EnsureHasPermission({INTERACT_ACROSS_USERS_FULL, QUERY_ADMIN_POLICY})
+    public void setPermittedInputMethods_canNotSet_throwsException() {
+        assertThrows(SecurityException.class, () -> {
+            sDeviceState.dpc().devicePolicyManager().setPermittedInputMethods(
+                    sDeviceState.dpc().componentName(), /* packageNames= */ null);
+        });
+    }
+
+    @Postsubmit(reason = "New test")
+    @PolicyDoesNotApplyTest(policy = SetPermittedInputMethods.class)
+    @EnsureHasPermission({INTERACT_ACROSS_USERS_FULL, QUERY_ADMIN_POLICY})
+    public void setPermittedInputMethods_policyDoesNotApply_isNotSet() {
+        assumeFalse("A system input method is required",
+                SYSTEM_INPUT_METHODS_PACKAGES.isEmpty());
+
+        List<String> enabledNonSystemImes = List.of(INPUT_METHOD_PACKAGE_NAME);
+
+        assertThat(sDeviceState.dpc().devicePolicyManager().setPermittedInputMethods(
+                sDeviceState.dpc().componentName(), /* packageNames= */ enabledNonSystemImes)
+        ).isTrue();
+
+        assertThat(sDeviceState.dpc().devicePolicyManager()
+                .getPermittedInputMethods(sDeviceState.dpc().componentName()))
+                .containsExactlyElementsIn(enabledNonSystemImes);
+        assertThat(sLocalDevicePolicyManager.getPermittedInputMethods()).isNull();
+        assertThat(sLocalDevicePolicyManager.getPermittedInputMethodsForCurrentUser()).isNull();
+    }
+
+    @Postsubmit(reason = "New test")
+    @PolicyAppliesTest(policy = SetPermittedInputMethods.class)
+    @EnsureHasPermission({INTERACT_ACROSS_USERS_FULL, QUERY_ADMIN_POLICY})
+    public void setPermittedInputMethods_includesSetPlusSystem() {
+        assumeFalse("A system input method is required",
+                SYSTEM_INPUT_METHODS_PACKAGES.isEmpty());
+
+        List<String> enabledNonSystemImes = List.of(INPUT_METHOD_PACKAGE_NAME);
+        Set<String> permittedPlusSystem = new HashSet<>();
+        permittedPlusSystem.addAll(SYSTEM_INPUT_METHODS_PACKAGES);
+        permittedPlusSystem.addAll(enabledNonSystemImes);
+
+        assertThat(sDeviceState.dpc().devicePolicyManager().setPermittedInputMethods(
+                sDeviceState.dpc().componentName(), /* packageNames= */ enabledNonSystemImes)
+        ).isTrue();
+
+        assertThat(sDeviceState.dpc().devicePolicyManager()
+                .getPermittedInputMethods(sDeviceState.dpc().componentName()))
+                .containsExactlyElementsIn(enabledNonSystemImes);
+        assertThat(sLocalDevicePolicyManager.getPermittedInputMethods())
+                .containsExactlyElementsIn(permittedPlusSystem);
+        assertThat(sLocalDevicePolicyManager.getPermittedInputMethodsForCurrentUser())
+                .containsExactlyElementsIn(permittedPlusSystem);
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/PreferentialNetworkServiceTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/PreferentialNetworkServiceTest.java
index 51f672c..9f26ecd 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/PreferentialNetworkServiceTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/PreferentialNetworkServiceTest.java
@@ -23,6 +23,11 @@
 import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_VCN_MANAGED;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.app.admin.PreferentialNetworkServiceConfig;
 import android.content.Context;
 import android.net.ConnectivityManager;
 import android.net.Network;
@@ -37,7 +42,9 @@
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.EnsureHasPermission;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
 import com.android.bedstead.harrier.policies.PreferentialNetworkService;
 import com.android.bedstead.nene.TestApis;
 import com.android.testutils.TestableNetworkCallback;
@@ -47,9 +54,9 @@
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 
@@ -77,6 +84,12 @@
             .setUids(Set.of(new Range(Process.myUid(), Process.myUid())))
             .build();
 
+    private static final PreferentialNetworkServiceConfig ENABLED_CONFIG =
+            (new PreferentialNetworkServiceConfig.Builder())
+                    .setEnabled(true)
+                    .setNetworkId(PreferentialNetworkServiceConfig.PREFERENTIAL_NETWORK_ID_1)
+                    .build();
+
     @Before
     public void setUp() throws Exception {
         mHandlerThread.start();
@@ -91,9 +104,8 @@
      * Enable PreferentialNetworkService, verify the provider that provides enterprise slice can
      * see the enterprise slice requests.
      */
-    @Test
     @EnsureHasPermission({ACCESS_NETWORK_STATE, NETWORK_SETTINGS})
-    @PositivePolicyTest(policy = PreferentialNetworkService.class)
+    @PolicyAppliesTest(policy = PreferentialNetworkService.class)
     public void setPreferentialNetworkServiceEnabled_enableService_issueRequest() {
         // Expect a regular default network.
         final Network defaultNetwork = Objects.requireNonNull(sCm.getActiveNetwork(),
@@ -129,9 +141,8 @@
      * Disable PreferentialNetworkService, verify the provider that provides enterprise slice cannot
      * see the enterprise slice requests.
      */
-    @Test
     @EnsureHasPermission({ACCESS_NETWORK_STATE, NETWORK_SETTINGS})
-    @PositivePolicyTest(policy = PreferentialNetworkService.class)
+    @PolicyAppliesTest(policy = PreferentialNetworkService.class)
     public void setPreferentialNetworkServiceEnabled_disableService_noIssueRequest() {
         // Expect a regular default network.
         final Network defaultNetwork = Objects.requireNonNull(sCm.getActiveNetwork(),
@@ -162,6 +173,105 @@
         }
     }
 
+    @CanSetPolicyTest(policy = PreferentialNetworkService.class)
+    public void isPreferentialNetworkServiceEnabled_default_isTrue() {
+        assertThat(sDeviceState.dpc().devicePolicyManager().isPreferentialNetworkServiceEnabled())
+                .isFalse();
+    }
+
+    @CanSetPolicyTest(policy = PreferentialNetworkService.class)
+    public void setPreferentialNetworkServiceConfigs_enabled_isSet() {
+        try {
+            sDeviceState.dpc().devicePolicyManager().setPreferentialNetworkServiceConfigs(
+                    List.of(ENABLED_CONFIG));
+
+            assertThat(sDeviceState.dpc().devicePolicyManager()
+                    .getPreferentialNetworkServiceConfigs().get(0).isEnabled()).isTrue();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPreferentialNetworkServiceConfigs(
+                    List.of(PreferentialNetworkServiceConfig.DEFAULT));
+        }
+    }
+
+    @CanSetPolicyTest(policy = PreferentialNetworkService.class)
+    public void setPreferentialNetworkServiceConfigs_fallback_isSet() {
+        PreferentialNetworkServiceConfig fallbackConfig =
+                (new PreferentialNetworkServiceConfig.Builder())
+                        .setEnabled(true)
+                        .setNetworkId(PreferentialNetworkServiceConfig.PREFERENTIAL_NETWORK_ID_1)
+                        .setFallbackToDefaultConnectionAllowed(true)
+                        .build();
+        try {
+            sDeviceState.dpc().devicePolicyManager().setPreferentialNetworkServiceConfigs(
+                    List.of(fallbackConfig));
+
+            assertThat(sDeviceState.dpc().devicePolicyManager()
+                    .getPreferentialNetworkServiceConfigs().get(0).isEnabled()).isTrue();
+            assertThat(sDeviceState.dpc().devicePolicyManager()
+                    .getPreferentialNetworkServiceConfigs().get(0)
+                    .isFallbackToDefaultConnectionAllowed()).isTrue();
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPreferentialNetworkServiceConfigs(
+                    List.of(PreferentialNetworkServiceConfig.DEFAULT));
+        }
+    }
+
+    @CanSetPolicyTest(policy = PreferentialNetworkService.class)
+    public void setPreferentialNetworkServiceConfigs_enabled_isSet_excludedUids_set() {
+        PreferentialNetworkServiceConfig slice1Config =
+                (new PreferentialNetworkServiceConfig.Builder())
+                        .setEnabled(true)
+                        .setNetworkId(PreferentialNetworkServiceConfig.PREFERENTIAL_NETWORK_ID_1)
+                        .setExcludedUids(new int[]{1})
+                        .build();
+        PreferentialNetworkServiceConfig slice2Config =
+                (new PreferentialNetworkServiceConfig.Builder())
+                        .setEnabled(true)
+                        .setNetworkId(PreferentialNetworkServiceConfig.PREFERENTIAL_NETWORK_ID_2)
+                        .setIncludedUids(new int[]{1})
+                        .build();
+        try {
+            sDeviceState.dpc().devicePolicyManager().setPreferentialNetworkServiceConfigs(
+                    List.of(slice1Config, slice2Config));
+
+            assertThat(sDeviceState.dpc().devicePolicyManager()
+                    .getPreferentialNetworkServiceConfigs().get(0).isEnabled()).isTrue();
+            assertThat(sDeviceState.dpc().devicePolicyManager()
+                    .getPreferentialNetworkServiceConfigs().get(0)
+                    .getExcludedUids()).isEqualTo(new int[]{1});
+            assertThat(sDeviceState.dpc().devicePolicyManager()
+                    .getPreferentialNetworkServiceConfigs().get(1).isEnabled()).isTrue();
+            assertThat(sDeviceState.dpc().devicePolicyManager()
+                    .getPreferentialNetworkServiceConfigs().get(1)
+                    .getIncludedUids()).isEqualTo(new int[]{1});
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setPreferentialNetworkServiceConfigs(
+                    List.of(PreferentialNetworkServiceConfig.DEFAULT));
+        }
+    }
+
+    @CanSetPolicyTest(policy = PreferentialNetworkService.class)
+    public void setPreferentialNetworkServiceConfigs_default_isNotSet() {
+        sDeviceState.dpc().devicePolicyManager().setPreferentialNetworkServiceConfigs(
+                List.of(PreferentialNetworkServiceConfig.DEFAULT));
+
+        assertThat(sDeviceState.dpc().devicePolicyManager()
+                .getPreferentialNetworkServiceConfigs().get(0).isEnabled()).isFalse();
+    }
+
+    @CannotSetPolicyTest(policy = PreferentialNetworkService.class)
+    public void setPreferentialNetworkServiceConfigs_notAllowed_throwsException() {
+        assertThrows(SecurityException.class,
+                () -> sDeviceState.dpc().devicePolicyManager().setPreferentialNetworkServiceConfigs(
+                        List.of(ENABLED_CONFIG)));
+        assertThrows(SecurityException.class,
+                () -> sDeviceState.dpc().devicePolicyManager().setPreferentialNetworkServiceConfigs(
+                        List.of(PreferentialNetworkServiceConfig.DEFAULT)));
+        assertThrows(SecurityException.class,
+                () -> sDeviceState.dpc().devicePolicyManager()
+                        .getPreferentialNetworkServiceConfigs());
+    }
+
     private TestableNetworkOfferCallback registerEnterpriseNetworkOffer(
             NetworkProvider provider) {
         final TestableNetworkOfferCallback offerCallback =
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/ProvisioningExceptionTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/ProvisioningExceptionTest.java
new file mode 100644
index 0000000..b2caff8
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/ProvisioningExceptionTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.admin.ProvisioningException;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class ProvisioningExceptionTest {
+
+    private static final Exception CAUSE = new Exception();
+    private static final int PROVISIONING_ERROR = ProvisioningException.ERROR_PRE_CONDITION_FAILED;
+    private static final String MESSAGE = "test failure message";
+
+    @Test
+    public void constructor_works() {
+        ProvisioningException exception =
+                new ProvisioningException(CAUSE, PROVISIONING_ERROR, MESSAGE);
+
+        assertThat(exception.getCause()).isEqualTo(CAUSE);
+        assertThat(exception.getProvisioningError()).isEqualTo(PROVISIONING_ERROR);
+        assertThat(exception.getMessage()).isEqualTo(MESSAGE);
+    }
+
+    @Test
+    public void constructor_noErrorMessage_nullByDefault() {
+        ProvisioningException exception = new ProvisioningException(CAUSE, PROVISIONING_ERROR);
+
+        assertThat(exception.getMessage()).isNull();
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/ResetPasswordWithTokenTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/ResetPasswordWithTokenTest.java
index 4a27ae9..a3847f1 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/ResetPasswordWithTokenTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/ResetPasswordWithTokenTest.java
@@ -27,6 +27,7 @@
 import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_SOMETHING;
 import static android.app.admin.DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
 import static android.content.pm.PackageManager.FEATURE_AUTOMOTIVE;
+import static android.content.pm.PackageManager.FEATURE_SECURE_LOCK_SCREEN;
 
 import static com.android.bedstead.metricsrecorder.truth.MetricQueryBuilderSubject.assertThat;
 import static com.android.bedstead.remotedpc.RemoteDpc.DPC_COMPONENT_NAME;
@@ -47,18 +48,18 @@
 import com.android.bedstead.harrier.annotations.RequireDoesNotHaveFeature;
 import com.android.bedstead.harrier.annotations.RequireFeature;
 import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
 import com.android.bedstead.harrier.policies.ResetPasswordWithToken;
 import com.android.bedstead.metricsrecorder.EnterpriseMetricsRecorder;
 import com.android.bedstead.nene.TestApis;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 // TODO(b/191640667): Parameterize the length limit tests with multiple limits
 @RunWith(BedsteadJUnit4.class)
+@RequireFeature(FEATURE_SECURE_LOCK_SCREEN)
 public final class ResetPasswordWithTokenTest {
 
     private static final String NOT_COMPLEX_PASSWORD = "1234";
@@ -90,9 +91,8 @@
     @Rule
     public static final DeviceState sDeviceState = new DeviceState();
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     public void setResetPasswordToken_validToken_passwordTokenSet() {
         try {
             boolean possible = canSetResetPasswordToken(TOKEN);
@@ -105,7 +105,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = ResetPasswordWithToken.class)
     public void resetPasswordWithToken_validPasswordAndToken_success() {
@@ -118,7 +117,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = ResetPasswordWithToken.class)
     public void resetPasswordWithToken_badToken_failure() {
@@ -127,9 +125,8 @@
                 DPC_COMPONENT_NAME, VALID_PASSWORD, BAD_TOKEN, /* flags = */ 0)).isFalse();
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     public void resetPasswordWithToken_noPassword_deviceIsNotSecure() {
         assumeTrue(RESET_PASSWORD_TOKEN_DISABLED, canSetResetPasswordToken(TOKEN));
         sDeviceState.dpc().devicePolicyManager().resetPasswordWithToken(
@@ -139,9 +136,8 @@
         assertThat(sLocalKeyguardManager.isDeviceSecure()).isFalse();
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     public void resetPasswordWithToken_password_deviceIsSecure() {
         assumeTrue(RESET_PASSWORD_TOKEN_DISABLED, canSetResetPasswordToken(TOKEN));
         try {
@@ -155,9 +151,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void resetPasswordWithToken_passwordDoesNotSatisfyRestriction_failure() {
@@ -183,9 +178,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void resetPasswordWithToken_passwordSatisfiesRestriction_success() {
@@ -212,7 +206,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = ResetPasswordWithToken.class)
     public void resetPasswordWithToken_validPasswordAndToken_logged() {
@@ -230,9 +223,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void isActivePasswordSufficient_passwordDoesNotSatisfyRestriction_false() {
@@ -260,9 +252,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void isActivePasswordSufficient_passwordSatisfiesRestriction_true() {
@@ -290,9 +281,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void isActivePasswordSufficient_passwordNoLongerSatisfiesRestriction_false() {
@@ -322,7 +312,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
@@ -340,9 +329,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordQuality_something_passwordWithAMinLengthOfFourRequired() {
@@ -362,9 +350,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordQuality_numeric_passwordWithAtLeastOneNumberOrLetterRequired() {
@@ -383,9 +370,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordQuality_alphabetic_passwordWithAtLeastOneLetterRequired() {
@@ -403,9 +389,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordQuality_alphanumeric_passwordWithBothALetterAndANumberRequired() {
@@ -423,9 +408,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordQuality_complex_passwordWithAMinLengthOfFourRequired() {
@@ -450,7 +434,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = ResetPasswordWithToken.class)
     // setPasswordMinimumLength is unsupported on automotive
@@ -469,9 +452,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordMinimumLength_six_passwordWithAMinLengthOfSixRequired() {
@@ -496,7 +478,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     // setPasswordMinimumUpperCase is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
@@ -515,9 +496,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordMinimumUpperCase_one_passwordWithAtLeastOneUpperCaseLetterRequired() {
@@ -542,7 +522,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     // setPasswordMinimumLowerCase is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
@@ -561,9 +540,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordMinimumLowerCase_one_passwordWithAtLeaseOneLowerCaseLetterRequired() {
@@ -588,7 +566,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = ResetPasswordWithToken.class)
     public void setPasswordMinimumLetters_success() {
@@ -605,9 +582,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordMinimumLetters_one_passwordWithAtLeastOneLetterRequired() {
@@ -632,7 +608,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = ResetPasswordWithToken.class)
     public void setPasswordMinimumNumeric_success() {
@@ -649,9 +624,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordMinimumNumeric_one_passwordWithAtLeastOneNumberRequired() {
@@ -676,7 +650,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = ResetPasswordWithToken.class)
     public void setPasswordMinimumSymbols_success() {
@@ -693,9 +666,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordMinimumSymbols_one_passwordWithAtLeastOneSymbolRequired() {
@@ -721,7 +693,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     // setPasswordMinimumNonLetter is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
@@ -740,9 +711,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordMinimumNonLetter_one_passwordWithAtLeastOneNonLetterRequired() {
@@ -768,9 +738,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setRequiredPasswordComplexity_passwordQualityAlreadySet_clearsPasswordQuality() {
@@ -790,9 +759,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     // setPasswordQuality is unsupported on automotive
     @RequireDoesNotHaveFeature(FEATURE_AUTOMOTIVE)
     public void setPasswordQuality_passwordComplexityAlreadySet_clearsPasswordComplexity() {
@@ -812,7 +780,6 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
     @CanSetPolicyTest(policy = ResetPasswordWithToken.class)
     public void setRequiredPasswordComplexity_success() {
@@ -828,9 +795,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     public void setRequiredPasswordComplexity_low_passwordThatMeetsLowPasswordBandRequired() {
         assumeTrue(RESET_PASSWORD_TOKEN_DISABLED, canSetResetPasswordToken(TOKEN));
         try {
@@ -845,9 +811,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     public void setRequiredPasswordComplexity_medium_passwordThatMeetsMediumPasswordBandRequired() {
         assumeTrue(RESET_PASSWORD_TOKEN_DISABLED, canSetResetPasswordToken(TOKEN));
         try {
@@ -863,9 +828,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     public void setRequiredPasswordComplexity_high_passwordThatMeetsHighPasswordBandRequired() {
         assumeTrue(RESET_PASSWORD_TOKEN_DISABLED, canSetResetPasswordToken(TOKEN));
         try {
@@ -881,9 +845,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     public void getPasswordComplexity_passwordThatMeetsLowPasswordBand_lowPasswordComplexity() {
         assumeTrue(RESET_PASSWORD_TOKEN_DISABLED, canSetResetPasswordToken(TOKEN));
         try {
@@ -897,9 +860,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     public void getPasswordComplexity_passwordThatMeetsMediumPasswordBand_mediumPasswordComplexity() {
         assumeTrue(RESET_PASSWORD_TOKEN_DISABLED, canSetResetPasswordToken(TOKEN));
         try {
@@ -913,9 +875,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     public void getPasswordComplexity_passwordThatMeetsHighPasswordBand_highPasswordComplexity() {
         assumeTrue(RESET_PASSWORD_TOKEN_DISABLED, canSetResetPasswordToken(TOKEN));
         try {
@@ -929,9 +890,8 @@
         }
     }
 
-    @Test
     @Postsubmit(reason = "new test")
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     public void clearResetPasswordToken_passwordTokenIsResetAndUnableToSetNewPassword() {
         assumeTrue(RESET_PASSWORD_TOKEN_DISABLED, canSetResetPasswordToken(TOKEN));
         try {
@@ -946,11 +906,10 @@
         }
     }
 
-    @Test
     @RequireFeature(FEATURE_AUTOMOTIVE)
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     @Postsubmit(reason = "new test")
-    public void testPasswordMinimumLength_featureUnsupported_ignored() {
+    public void passwordMinimumLength_featureUnsupported_ignored() {
         int valueBefore = sDeviceState.dpc().devicePolicyManager().getPasswordMinimumLength(
                 DPC_COMPONENT_NAME);
 
@@ -962,11 +921,10 @@
                 .isEqualTo(valueBefore);
     }
 
-    @Test
     @RequireFeature(FEATURE_AUTOMOTIVE)
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     @Postsubmit(reason = "new test")
-    public void testPasswordMinimumNumeric_ignored() {
+    public void passwordMinimumNumeric_ignored() {
         int valueBefore = sDeviceState.dpc().devicePolicyManager().getPasswordMinimumNumeric(
                 DPC_COMPONENT_NAME);
 
@@ -978,11 +936,10 @@
                 .isEqualTo(valueBefore);
     }
 
-    @Test
     @RequireFeature(FEATURE_AUTOMOTIVE)
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     @Postsubmit(reason = "new test")
-    public void testPasswordMinimumLowerCase_ignored() {
+    public void passwordMinimumLowerCase_ignored() {
         int valueBefore = sDeviceState.dpc().devicePolicyManager().getPasswordMinimumLowerCase(
                 DPC_COMPONENT_NAME);
 
@@ -995,11 +952,10 @@
                 .isEqualTo(valueBefore);
     }
 
-    @Test
     @RequireFeature(FEATURE_AUTOMOTIVE)
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     @Postsubmit(reason = "new test")
-    public void testPasswordMinimumUpperCase_ignored() {
+    public void passwordMinimumUpperCase_ignored() {
         int valueBefore = sDeviceState.dpc().devicePolicyManager().getPasswordMinimumUpperCase(
                 DPC_COMPONENT_NAME);
 
@@ -1012,11 +968,10 @@
                 .isEqualTo(valueBefore);
     }
 
-    @Test
     @RequireFeature(FEATURE_AUTOMOTIVE)
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     @Postsubmit(reason = "new test")
-    public void testPasswordMinimumLetters_ignored() {
+    public void passwordMinimumLetters_ignored() {
         int valueBefore = sDeviceState.dpc().devicePolicyManager().getPasswordMinimumLetters(
                 DPC_COMPONENT_NAME);
 
@@ -1028,11 +983,10 @@
                 .isEqualTo(valueBefore);
     }
 
-    @Test
     @RequireFeature(FEATURE_AUTOMOTIVE)
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     @Postsubmit(reason = "new test")
-    public void testPasswordMinimumSymbols_ignored() {
+    public void passwordMinimumSymbols_ignored() {
         int valueBefore = sDeviceState.dpc().devicePolicyManager().getPasswordMinimumSymbols(
                 DPC_COMPONENT_NAME);
 
@@ -1044,11 +998,10 @@
                 .isEqualTo(valueBefore);
     }
 
-    @Test
     @RequireFeature(FEATURE_AUTOMOTIVE)
-    @PositivePolicyTest(policy = ResetPasswordWithToken.class)
+    @PolicyAppliesTest(policy = ResetPasswordWithToken.class)
     @Postsubmit(reason = "new test")
-    public void testPasswordMinimumNonLetter_ignored() {
+    public void passwordMinimumNonLetter_ignored() {
         int valueBefore = sDeviceState.dpc().devicePolicyManager().getPasswordMinimumNonLetter(
                 DPC_COMPONENT_NAME);
 
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/RingtoneTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/RingtoneTest.java
index f49fd9a..a8ad777 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/RingtoneTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/RingtoneTest.java
@@ -20,7 +20,6 @@
 import static android.provider.Settings.Secure.SYNC_PARENT_SOUNDS;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
 
 import android.content.Context;
 import android.media.RingtoneManager;
@@ -30,6 +29,7 @@
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.EnumTestParameter;
 import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.harrier.annotations.parameterized.IncludeRunOnProfileOwnerProfileWithNoDeviceOwner;
 import com.android.bedstead.nene.TestApis;
@@ -43,6 +43,20 @@
 @Postsubmit(reason = "New tests")
 public final class RingtoneTest {
 
+    private enum RingtoneConfig {
+        RINGTONE(Settings.System.RINGTONE, RingtoneManager.TYPE_RINGTONE),
+        NOTIFICATION(Settings.System.NOTIFICATION_SOUND, RingtoneManager.TYPE_NOTIFICATION),
+        ALARM(Settings.System.ALARM_ALERT, RingtoneManager.TYPE_ALARM);
+
+        final String mRingtoneName;
+        final int mType;
+
+        RingtoneConfig(String ringtoneName, int type) {
+            this.mRingtoneName = ringtoneName;
+            this.mType = type;
+        }
+    }
+
     @ClassRule @Rule
     public static final DeviceState sDeviceState = new DeviceState();
 
@@ -51,43 +65,17 @@
     private static final Uri RINGTONE_URI = Uri.parse("http://uri.does.not.matter");
 
     // TODO(b/194509745): Parameterize on different user types
-    // TODO(b/188893663): Parameterize the different ringtone types (remove 2/3rds of this class)
 
     @Test
     @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    public void getActualDefaultRingtoneUri_ringtone_matchesSettingsProviderRingtone() {
+    public void getActualDefaultRingtoneUri_matchesSettingsProviderRingtone(
+            @EnumTestParameter(RingtoneConfig.class) RingtoneConfig config) {
         String defaultRingtone = Settings.System.getString(
-                sContext.getContentResolver(), Settings.System.RINGTONE);
+                sContext.getContentResolver(), config.mRingtoneName);
         Uri expectedUri = getUriWithoutUserId(defaultRingtone);
         Uri actualRingtoneUri = getUriWithoutUserId(
                 RingtoneManager.getActualDefaultRingtoneUri(
-                        sContext, RingtoneManager.TYPE_RINGTONE));
-
-        assertThat(expectedUri).isEqualTo(actualRingtoneUri);
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    public void getActualDefaultRingtoneUri_notification_matchesSettingsProviderNotificationSound() {
-        String defaultRingtone = Settings.System.getString(
-                sContext.getContentResolver(), Settings.System.NOTIFICATION_SOUND);
-        Uri expectedUri = getUriWithoutUserId(defaultRingtone);
-        Uri actualRingtoneUri = getUriWithoutUserId(
-                RingtoneManager.getActualDefaultRingtoneUri(
-                        sContext, RingtoneManager.TYPE_NOTIFICATION));
-
-        assertThat(expectedUri).isEqualTo(actualRingtoneUri);
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    public void getActualDefaultRingtoneUri_alarm_matchesSettingsProviderAlarmAlert() {
-        String defaultRingtone = Settings.System.getString(
-                sContext.getContentResolver(), Settings.System.ALARM_ALERT);
-        Uri expectedUri = getUriWithoutUserId(defaultRingtone);
-        Uri actualRingtoneUri = getUriWithoutUserId(
-                RingtoneManager.getActualDefaultRingtoneUri(
-                        sContext, RingtoneManager.TYPE_ALARM));
+                        sContext, config.mType));
 
         assertThat(expectedUri).isEqualTo(actualRingtoneUri);
     }
@@ -95,265 +83,21 @@
     @Test
     @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
     @EnsureHasPermission(WRITE_SETTINGS)
-    public void setActualDefaultRingtoneUri_ringtone_setsSyncParentSoundsToFalse() {
+    public void getActualDefaultRingtoneUri_syncParentSoundsIsTrue_returnsDefaultRingtone(
+            @EnumTestParameter(RingtoneConfig.class) RingtoneConfig config) {
         int originalSyncParentSounds = TestApis.settings().secure().getInt(SYNC_PARENT_SOUNDS);
         Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(
-                sContext, RingtoneManager.TYPE_RINGTONE);
-
-        try {
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, 1);
-
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_RINGTONE, RINGTONE_URI);
-
-            assertWithMessage("SYNC_PARENT_SOUNDS is false because a ringtone"
-                    + " has been set on the profile")
-                    .that(TestApis.settings().secure().getInt(
-                            SYNC_PARENT_SOUNDS)).isEqualTo(0);
-        } finally {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_RINGTONE, originalUri);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, originalSyncParentSounds);
-        }
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    @EnsureHasPermission(WRITE_SETTINGS)
-    public void getActualDefaultRingtoneUri_ringtone_syncParentSoundsIsFalse_returnsSetRingtone() {
-        int originalSyncParentSounds = TestApis.settings().secure().getInt(SYNC_PARENT_SOUNDS);
-        Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(
-                sContext, RingtoneManager.TYPE_RINGTONE);
-        try {
-            // Calling setActualDefaultRingtoneUri will automatically switch SYNC_PARENT_SOUNDS to 0
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_RINGTONE, RINGTONE_URI);
-
-            assertThat(RingtoneManager.getActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_RINGTONE)).isEqualTo(RINGTONE_URI);
-        } finally {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_RINGTONE, originalUri);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, originalSyncParentSounds);
-        }
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    @EnsureHasPermission(WRITE_SETTINGS)
-    public void getActualDefaultRingtoneUri_ringtone_syncParentSoundsIsTrue_returnsDefaultRingtone() {
-        int originalSyncParentSounds = TestApis.settings().secure().getInt(SYNC_PARENT_SOUNDS);
-        Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(
-                sContext, RingtoneManager.TYPE_RINGTONE);
+                sContext, config.mType);
         try {
             RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_RINGTONE, RINGTONE_URI);
+                    sContext, config.mType, RINGTONE_URI);
             TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, 1);
 
             assertThat(RingtoneManager.getActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_RINGTONE)).isEqualTo(originalUri);
+                    sContext, config.mType)).isEqualTo(originalUri);
         } finally {
             RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_RINGTONE, originalUri);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, originalSyncParentSounds);
-        }
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    @EnsureHasPermission(WRITE_SETTINGS)
-    public void getActualDefaultRingtoneUri_ringtone_syncParentSoundsIsFalseAndUriWasPreviouslySet_returnsPreviouslySetRingtone() {
-        int originalSyncParentSounds = TestApis.settings().secure().getInt(SYNC_PARENT_SOUNDS);
-        Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(
-                sContext, RingtoneManager.TYPE_RINGTONE);
-        try {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_RINGTONE, RINGTONE_URI);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, 1);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, 0);
-
-            assertThat(RingtoneManager.getActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_RINGTONE)).isEqualTo(RINGTONE_URI);
-        } finally {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_RINGTONE, originalUri);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, originalSyncParentSounds);
-        }
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    @EnsureHasPermission(WRITE_SETTINGS)
-    public void setActualDefaultRingtoneUri_notification_setsSyncParentSoundsToFalse() {
-        int originalSyncParentSounds = TestApis.settings().secure().getInt(SYNC_PARENT_SOUNDS);
-        Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(
-                sContext, RingtoneManager.TYPE_NOTIFICATION);
-
-        try {
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, 1);
-
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_NOTIFICATION, RINGTONE_URI);
-
-            assertWithMessage("SYNC_PARENT_SOUNDS is false because a ringtone has been set on the profile")
-                    .that(TestApis.settings().secure().getInt(
-                            SYNC_PARENT_SOUNDS)).isEqualTo(0);
-        } finally {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_NOTIFICATION, originalUri);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, originalSyncParentSounds);
-        }
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    @EnsureHasPermission(WRITE_SETTINGS)
-    public void getActualDefaultRingtoneUri_notification_syncParentSoundsIsFalse_returnsSetRingtone() {
-        int originalSyncParentSounds = TestApis.settings().secure().getInt(SYNC_PARENT_SOUNDS);
-        Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(
-                sContext, RingtoneManager.TYPE_NOTIFICATION);
-        try {
-            // Calling setActualDefaultRingtoneUri will automatically switch SYNC_PARENT_SOUNDS to 0
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_NOTIFICATION, RINGTONE_URI);
-
-            assertThat(RingtoneManager.getActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_NOTIFICATION)).isEqualTo(RINGTONE_URI);
-        } finally {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_NOTIFICATION, originalUri);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, originalSyncParentSounds);
-        }
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    @EnsureHasPermission(WRITE_SETTINGS)
-    public void getActualDefaultRingtoneUri_notification_syncParentSoundsIsTrue_returnsDefaultRingtone() {
-        int originalSyncParentSounds = TestApis.settings().secure().getInt(SYNC_PARENT_SOUNDS);
-        Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(
-                sContext, RingtoneManager.TYPE_NOTIFICATION);
-        try {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_NOTIFICATION, RINGTONE_URI);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, 1);
-
-            assertThat(RingtoneManager.getActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_NOTIFICATION)).isEqualTo(originalUri);
-        } finally {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_NOTIFICATION, originalUri);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, originalSyncParentSounds);
-        }
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    @EnsureHasPermission(WRITE_SETTINGS)
-    public void getActualDefaultRingtoneUri_notification_syncParentSoundsIsFalseAndUriWasPreviouslySet_returnsPreviouslySetRingtone() {
-        int originalSyncParentSounds = TestApis.settings().secure().getInt(SYNC_PARENT_SOUNDS);
-        Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(
-                sContext, RingtoneManager.TYPE_NOTIFICATION);
-        try {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_NOTIFICATION, RINGTONE_URI);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, 1);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, 0);
-
-            assertThat(RingtoneManager.getActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_NOTIFICATION)).isEqualTo(RINGTONE_URI);
-        } finally {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_NOTIFICATION, originalUri);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, originalSyncParentSounds);
-        }
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    @EnsureHasPermission(WRITE_SETTINGS)
-    public void setActualDefaultRingtoneUri_alarm_setsSyncParentSoundsToFalse() {
-        int originalSyncParentSounds = TestApis.settings().secure().getInt(SYNC_PARENT_SOUNDS);
-        Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(
-                sContext, RingtoneManager.TYPE_ALARM);
-
-        try {
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, 1);
-
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_ALARM, RINGTONE_URI);
-
-            assertWithMessage(
-                    "SYNC_PARENT_SOUNDS is false because a ringtone has been set on the profile")
-                    .that(TestApis.settings().secure().getInt(
-                            SYNC_PARENT_SOUNDS)).isEqualTo(0);
-        } finally {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_ALARM, originalUri);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, originalSyncParentSounds);
-        }
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    @EnsureHasPermission(WRITE_SETTINGS)
-    public void getActualDefaultRingtoneUri_alarm_syncParentSoundsIsFalse_returnsSetRingtone() {
-        int originalSyncParentSounds = TestApis.settings().secure().getInt(SYNC_PARENT_SOUNDS);
-        Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(
-                sContext, RingtoneManager.TYPE_ALARM);
-        try {
-            // Calling setActualDefaultRingtoneUri will automatically switch SYNC_PARENT_SOUNDS to 0
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_ALARM, RINGTONE_URI);
-
-            assertThat(RingtoneManager.getActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_ALARM)).isEqualTo(RINGTONE_URI);
-        } finally {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_ALARM, originalUri);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, originalSyncParentSounds);
-        }
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    @EnsureHasPermission(WRITE_SETTINGS)
-    public void getActualDefaultRingtoneUri_alarm_syncParentSoundsIsTrue_returnsDefaultRingtone() {
-        int originalSyncParentSounds = TestApis.settings().secure().getInt(SYNC_PARENT_SOUNDS);
-        Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(
-                sContext, RingtoneManager.TYPE_ALARM);
-        try {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_ALARM, RINGTONE_URI);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, 1);
-
-            assertThat(RingtoneManager.getActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_ALARM)).isEqualTo(originalUri);
-        } finally {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_ALARM, originalUri);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, originalSyncParentSounds);
-        }
-    }
-
-    @Test
-    @IncludeRunOnProfileOwnerProfileWithNoDeviceOwner
-    @EnsureHasPermission(WRITE_SETTINGS)
-    public void getActualDefaultRingtoneUri_alarm_syncParentSoundsIsFalseAndUriWasPreviouslySet_returnsPreviouslySetRingtone() {
-        int originalSyncParentSounds = TestApis.settings().secure().getInt(SYNC_PARENT_SOUNDS);
-        Uri originalUri = RingtoneManager.getActualDefaultRingtoneUri(
-                sContext, RingtoneManager.TYPE_ALARM);
-        try {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_ALARM, RINGTONE_URI);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, 1);
-            TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, 0);
-
-            assertThat(RingtoneManager.getActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_ALARM)).isEqualTo(RINGTONE_URI);
-        } finally {
-            RingtoneManager.setActualDefaultRingtoneUri(
-                    sContext, RingtoneManager.TYPE_ALARM, originalUri);
+                    sContext, config.mType, originalUri);
             TestApis.settings().secure().putInt(SYNC_PARENT_SOUNDS, originalSyncParentSounds);
         }
     }
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/ScreenCaptureDisabledTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/ScreenCaptureDisabledTest.java
index c6558e8..991bf1c 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/ScreenCaptureDisabledTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/ScreenCaptureDisabledTest.java
@@ -16,7 +16,6 @@
 
 package android.devicepolicy.cts;
 
-
 import static com.android.bedstead.metricsrecorder.truth.MetricQueryBuilderSubject.assertThat;
 
 import static com.google.common.truth.Truth.assertThat;
@@ -29,32 +28,30 @@
 import android.stats.devicepolicy.EventId;
 
 import androidx.test.InstrumentationRegistry;
-import androidx.test.core.app.ApplicationProvider;
 
 import com.android.bedstead.harrier.BedsteadJUnit4;
 import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureScreenIsOn;
 import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.harrier.annotations.SlowApiTest;
 import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.NegativePolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyDoesNotApplyTest;
 import com.android.bedstead.harrier.policies.ScreenCaptureDisabled;
 import com.android.bedstead.metricsrecorder.EnterpriseMetricsRecorder;
+import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.utils.Poll;
 import com.android.bedstead.testapp.TestApp;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
 
 import org.junit.After;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.time.Duration;
 
-
 @RunWith(BedsteadJUnit4.class)
 public final class ScreenCaptureDisabledTest {
 
@@ -62,9 +59,8 @@
     @Rule
     public static final DeviceState sDeviceState = new DeviceState();
 
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
     private static final TestApp sTestApp =
-            sTestAppProvider.query().whereActivities().isNotEmpty().get();
+            sDeviceState.testApps().query().whereActivities().isNotEmpty().get();
     private RemoteDevicePolicyManager mDevicePolicyManager;
     private DevicePolicyManager mLocalDevicePolicyManager;
     private ComponentName mAdmin;
@@ -74,9 +70,9 @@
     public void setUp() {
         mAdmin = sDeviceState.dpc().componentName();
         mDevicePolicyManager = sDeviceState.dpc().devicePolicyManager();
-        //TODO(b/198593716) : Use TestApi to take screnshot instead of UiAutomation.
+        //TODO(b/198593716) : Use TestApi to take screenshot instead of UiAutomation.
         mUiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
-        mLocalDevicePolicyManager = ApplicationProvider.getApplicationContext().getSystemService(
+        mLocalDevicePolicyManager = TestApis.context().instrumentedContext().getSystemService(
                 DevicePolicyManager.class);
     }
 
@@ -85,8 +81,7 @@
         mDevicePolicyManager.setScreenCaptureDisabled(mAdmin, false);
     }
 
-    @Test
-    @PositivePolicyTest(policy = ScreenCaptureDisabled.class)
+    @PolicyAppliesTest(policy = ScreenCaptureDisabled.class)
     @Postsubmit(reason = "new test")
     public void setScreenCaptureDisabled_false_works() {
         mDevicePolicyManager.setScreenCaptureDisabled(mAdmin, false);
@@ -94,7 +89,6 @@
         assertThat(mLocalDevicePolicyManager.getScreenCaptureDisabled(/* admin= */ null)).isFalse();
     }
 
-    @Test
     @CanSetPolicyTest(policy = ScreenCaptureDisabled.class)
     @Postsubmit(reason = "new test")
     public void setScreenCaptureDisabled_false_checkWithDPC_works() {
@@ -103,8 +97,7 @@
         assertThat(mDevicePolicyManager.getScreenCaptureDisabled(mAdmin)).isFalse();
     }
 
-    @Test
-    @PositivePolicyTest(policy = ScreenCaptureDisabled.class)
+    @PolicyAppliesTest(policy = ScreenCaptureDisabled.class)
     @Postsubmit(reason = "new test")
     public void setScreenCaptureDisabled_true_works() {
         mDevicePolicyManager.setScreenCaptureDisabled(mAdmin, true);
@@ -112,7 +105,6 @@
         assertThat(mLocalDevicePolicyManager.getScreenCaptureDisabled(/* admin= */ null)).isTrue();
     }
 
-    @Test
     @CanSetPolicyTest(policy = ScreenCaptureDisabled.class)
     @Postsubmit(reason = "new test")
     public void setScreenCaptureDisabled_true_checkWithDPC_works() {
@@ -121,8 +113,7 @@
         assertThat(mDevicePolicyManager.getScreenCaptureDisabled(mAdmin)).isTrue();
     }
 
-    @Test
-    @NegativePolicyTest(policy = ScreenCaptureDisabled.class)
+    @PolicyDoesNotApplyTest(policy = ScreenCaptureDisabled.class)
     @Postsubmit(reason = "new test")
     public void setScreenCaptureDisabled_true_doesNotApply() {
         mDevicePolicyManager.setScreenCaptureDisabled(mAdmin, true);
@@ -130,35 +121,34 @@
         assertThat(mLocalDevicePolicyManager.getScreenCaptureDisabled(/* admin= */ null)).isFalse();
     }
 
-    @Test
-    @NegativePolicyTest(policy = ScreenCaptureDisabled.class)
+    @PolicyDoesNotApplyTest(policy = ScreenCaptureDisabled.class)
     @Postsubmit(reason = "new test")
+    @EnsureScreenIsOn
     public void setScreenCaptureDisabled_true_screenCaptureWorks() {
         mDevicePolicyManager.setScreenCaptureDisabled(mAdmin, true);
 
         assertThat(takeScreenshotExpectingSuccess()).isNotNull();
     }
 
-    @Test
-    @PositivePolicyTest(policy = ScreenCaptureDisabled.class)
+    @PolicyAppliesTest(policy = ScreenCaptureDisabled.class)
     @Postsubmit(reason = "new test")
     @SlowApiTest("Screenshot policy can take minutes to propagate")
+    @EnsureScreenIsOn
     public void setScreenCaptureDisabled_true_screenCaptureFails() {
         mDevicePolicyManager.setScreenCaptureDisabled(mAdmin, true);
 
         assertThat(takeScreenshotExpectingFailure()).isNull();
     }
 
-    @Test
-    @PositivePolicyTest(policy = ScreenCaptureDisabled.class)
+    @PolicyAppliesTest(policy = ScreenCaptureDisabled.class)
     @Postsubmit(reason = "new test")
+    @EnsureScreenIsOn
     public void setScreenCaptureDisabled_false_screenCaptureWorks() {
         mDevicePolicyManager.setScreenCaptureDisabled(mAdmin, false);
 
         assertThat(takeScreenshotExpectingSuccess()).isNotNull();
     }
 
-    @Test
     @CanSetPolicyTest(policy = ScreenCaptureDisabled.class)
     @Postsubmit(reason = "new test")
     public void setScreenCaptureDisabled_true_metricsLogged() {
@@ -172,7 +162,6 @@
         }
     }
 
-    @Test
     @CanSetPolicyTest(policy = ScreenCaptureDisabled.class)
     @Postsubmit(reason = "new test")
     public void setScreenCaptureDisabled_false_metricsLogged() {
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/SettingsTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/SettingsTest.java
new file mode 100644
index 0000000..a0d37e81
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/SettingsTest.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static android.provider.Settings.Global.AIRPLANE_MODE_ON;
+import static android.provider.Settings.Global.AUTO_TIME;
+import static android.provider.Settings.Global.BLUETOOTH_ON;
+import static android.provider.Settings.Secure.LOCATION_MODE;
+import static android.provider.Settings.Secure.SKIP_FIRST_USE_HINTS;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.testng.Assert.assertThrows;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyDoesNotApplyTest;
+import com.android.bedstead.harrier.policies.SetDeviceOwnerSecureSetting;
+import com.android.bedstead.harrier.policies.SetGlobalSetting;
+import com.android.bedstead.harrier.policies.SetSecureSetting;
+import com.android.bedstead.nene.TestApis;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public final class SettingsTest {
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    // Deprecated in M
+    private static final String DEPRECATED_GLOBAL_SETTING = BLUETOOTH_ON;
+    private static final String UNSUPPORTED_GLOBAL_SETTING = AIRPLANE_MODE_ON;
+    private static final String SUPPORTED_GLOBAL_SETTING = AUTO_TIME;
+
+    private static final String DEVICE_OWNER_ONLY_SECURE_SETTING = LOCATION_MODE;
+    private static final String SECURE_SETTING = SKIP_FIRST_USE_HINTS;
+
+    @CanSetPolicyTest(policy = SetGlobalSetting.class)
+    @Postsubmit(reason = "new test")
+    public void setGlobalSetting_settingIsDeprecated_doesNotChangeSetting() {
+        int originalValue = TestApis.settings().global().getInt(DEPRECATED_GLOBAL_SETTING);
+        int newValue = originalValue + 1;
+
+        try {
+            sDeviceState.dpc().devicePolicyManager().setGlobalSetting(
+                    sDeviceState.dpc().componentName(),
+                    DEPRECATED_GLOBAL_SETTING, String.valueOf(newValue));
+
+            assertThat(TestApis.settings().global().getInt(DEPRECATED_GLOBAL_SETTING))
+                    .isEqualTo(originalValue);
+        } finally {
+            TestApis.settings().global().putInt(DEPRECATED_GLOBAL_SETTING, originalValue);
+        }
+    }
+
+    @CannotSetPolicyTest(policy = SetGlobalSetting.class, includeNonDeviceAdminStates = false)
+    @Postsubmit(reason = "new test")
+    public void setGlobalSetting_invalidAdmin_throwsSecurityException() {
+        assertThrows(SecurityException.class,
+                () -> sDeviceState.dpc().devicePolicyManager().setGlobalSetting(
+                        sDeviceState.dpc().componentName(),
+                        SUPPORTED_GLOBAL_SETTING, "1"));
+    }
+
+    @CanSetPolicyTest(policy = SetGlobalSetting.class)
+    @Postsubmit(reason = "new test")
+    public void setGlobalSetting_unsupported_throwsSecurityException() {
+        assertThrows(SecurityException.class,
+                () -> sDeviceState.dpc().devicePolicyManager().setGlobalSetting(
+                        sDeviceState.dpc().componentName(),
+                        UNSUPPORTED_GLOBAL_SETTING, "1"));
+    }
+
+    @CanSetPolicyTest(policy = SetGlobalSetting.class)
+    @Postsubmit(reason = "new test")
+    public void setGlobalSetting_supported_changesValue() {
+        int originalValue = TestApis.settings().global().getInt(SUPPORTED_GLOBAL_SETTING);
+        int newValue = originalValue + 1;
+
+        try {
+            sDeviceState.dpc().devicePolicyManager().setGlobalSetting(
+                    sDeviceState.dpc().componentName(),
+                    SUPPORTED_GLOBAL_SETTING, String.valueOf(newValue));
+
+            assertThat(TestApis.settings().global().getInt(SUPPORTED_GLOBAL_SETTING))
+                    .isEqualTo(newValue);
+        } finally {
+            TestApis.settings().global().putInt(SUPPORTED_GLOBAL_SETTING, originalValue);
+        }
+    }
+
+    @PolicyAppliesTest(policy = SetSecureSetting.class)
+    @Postsubmit(reason = "new test")
+    public void setSecureSetting_sets() {
+        int originalValue = TestApis.settings().secure()
+                .getInt(SECURE_SETTING, /* defaultValue= */ 0);
+        int newValue = originalValue + 1;
+
+        try {
+            sDeviceState.dpc().devicePolicyManager()
+                    .setSecureSetting(sDeviceState.dpc().componentName(),
+                            SECURE_SETTING, String.valueOf(newValue));
+
+            assertThat(TestApis.settings().secure()
+                    .getInt(SECURE_SETTING, /* defaultValue= */  0)).isEqualTo(newValue);
+        } finally {
+            sDeviceState.dpc().devicePolicyManager()
+                    .setSecureSetting(sDeviceState.dpc().componentName(),
+                            SECURE_SETTING, String.valueOf(originalValue));
+
+        }
+    }
+
+    @CanSetPolicyTest(policy = SetDeviceOwnerSecureSetting.class)
+    @Postsubmit(reason = "new test")
+    public void setSecureSetting_deviceOwnerOnly_sets() {
+        int originalValue = TestApis.settings().secure()
+                .getInt(DEVICE_OWNER_ONLY_SECURE_SETTING, /* defaultValue= */ 0);
+        int newValue = originalValue + 1;
+
+        try {
+            sDeviceState.dpc().devicePolicyManager()
+                    .setSecureSetting(sDeviceState.dpc().componentName(),
+                            DEVICE_OWNER_ONLY_SECURE_SETTING, String.valueOf(newValue));
+
+            assertThat(TestApis.settings().secure().getInt(DEVICE_OWNER_ONLY_SECURE_SETTING))
+                    .isEqualTo(newValue);
+        } finally {
+            sDeviceState.dpc().devicePolicyManager()
+                    .setSecureSetting(sDeviceState.dpc().componentName(),
+                            DEVICE_OWNER_ONLY_SECURE_SETTING, String.valueOf(originalValue));
+
+        }
+    }
+
+    @CannotSetPolicyTest(
+            policy = SetDeviceOwnerSecureSetting.class, includeNonDeviceAdminStates = false)
+    @Postsubmit(reason = "new test")
+    public void setSecureSetting_deviceOwnerOnly_isNotDeviceOwner_throwsException() {
+        int originalValue = TestApis.settings().secure()
+                .getInt(DEVICE_OWNER_ONLY_SECURE_SETTING, /* defaultValue= */ 0);
+        int newValue = originalValue + 1;
+
+        assertThrows(SecurityException.class, () -> sDeviceState.dpc().devicePolicyManager()
+                .setSecureSetting(sDeviceState.dpc().componentName(),
+                        DEVICE_OWNER_ONLY_SECURE_SETTING, String.valueOf(newValue)));
+    }
+
+    @PolicyDoesNotApplyTest(policy = SetSecureSetting.class)
+    @Postsubmit(reason = "new test")
+    public void setSecureSetting_doesNotApplyToUser_isNotSet() {
+        int originalValue = TestApis.settings().secure()
+                .getInt(SECURE_SETTING, /* defaultValue= */  0);
+        int originalDpcValue = TestApis.settings().secure().getInt(sDeviceState.dpc().user(),
+                SECURE_SETTING, /* defaultValue= */ 0);
+        int newValue = originalValue + 1;
+
+        try {
+            sDeviceState.dpc().devicePolicyManager()
+                    .setSecureSetting(sDeviceState.dpc().componentName(),
+                            SECURE_SETTING, String.valueOf(newValue));
+
+            assertThat(TestApis.settings().secure().getInt(SECURE_SETTING, /* defaultValue= */  0))
+                    .isEqualTo(originalValue);
+        } finally {
+            sDeviceState.dpc().devicePolicyManager()
+                    .setSecureSetting(sDeviceState.dpc().componentName(),
+                            SECURE_SETTING, String.valueOf(originalDpcValue));
+
+        }
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/SupportMessageTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/SupportMessageTest.java
index 3610ac4..17f90a4 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/SupportMessageTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/SupportMessageTest.java
@@ -28,7 +28,7 @@
 import com.android.bedstead.harrier.DeviceState;
 import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
 import com.android.bedstead.harrier.policies.SupportMessage;
 import com.android.bedstead.metricsrecorder.EnterpriseMetricsRecorder;
 import com.android.bedstead.remotedpc.RemotePolicyManager;
@@ -37,7 +37,6 @@
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(BedsteadJUnit4.class)
@@ -78,88 +77,80 @@
         mDevicePolicyManager.setLongSupportMessage(mAdmin, /* charSequence= */ null);
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void setShortSupportMessage_validText_works() {
         mDevicePolicyManager.setShortSupportMessage(mAdmin, VALID_SUPPORT_MESSAGE);
 
-        assertThat(mDevicePolicyManager.getShortSupportMessage(mAdmin))
+        assertThat(mDevicePolicyManager.getShortSupportMessage(mAdmin).toString())
                 .isEqualTo(VALID_SUPPORT_MESSAGE);
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void setLongSupportMessage_validText_works() {
         mDevicePolicyManager.setLongSupportMessage(mAdmin, VALID_SUPPORT_MESSAGE);
 
-        assertThat(mDevicePolicyManager.getLongSupportMessage(mAdmin))
+        assertThat(mDevicePolicyManager.getLongSupportMessage(mAdmin).toString())
                 .isEqualTo(VALID_SUPPORT_MESSAGE);
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void setShortSupportMessage_emptyText_works() {
         mDevicePolicyManager.setShortSupportMessage(mAdmin, EMPTY_SUPPORT_MESSAGE);
 
-        assertThat(mDevicePolicyManager.getShortSupportMessage(mAdmin))
+        assertThat(mDevicePolicyManager.getShortSupportMessage(mAdmin).toString())
                 .isEqualTo(EMPTY_SUPPORT_MESSAGE);
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void setLongSupportMessage_nullText_clearsOldText() {
         mDevicePolicyManager.setLongSupportMessage(mAdmin, VALID_SUPPORT_MESSAGE);
         mDevicePolicyManager.setLongSupportMessage(mAdmin, /* charSequence= */ null);
 
-        assertThat(mDevicePolicyManager.getLongSupportMessage(mAdmin)).isEqualTo("null");
+        assertThat(mDevicePolicyManager.getLongSupportMessage(mAdmin).toString()).isEqualTo("null");
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void setShortSupportMessage_nullText_clearsOldText() {
         mDevicePolicyManager.setShortSupportMessage(mAdmin, VALID_SUPPORT_MESSAGE);
         mDevicePolicyManager.setShortSupportMessage(mAdmin, /* charSequence= */ null);
 
-        assertThat(mDevicePolicyManager.getShortSupportMessage(mAdmin)).isEqualTo("null");
+        assertThat(mDevicePolicyManager.getShortSupportMessage(mAdmin).toString())
+                .isEqualTo("null");
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void setLongSupportMessage_emptyText_works() {
         mDevicePolicyManager.setLongSupportMessage(mAdmin, EMPTY_SUPPORT_MESSAGE);
 
-        assertThat(mDevicePolicyManager.getLongSupportMessage(mAdmin))
+        assertThat(mDevicePolicyManager.getLongSupportMessage(mAdmin).toString())
                 .isEqualTo(EMPTY_SUPPORT_MESSAGE);
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void setShortSupportMessage_tooLongText_isTruncated() {
         mDevicePolicyManager.setShortSupportMessage(mAdmin, SHORT_SUPPORT_MESSAGE_TOO_LONG);
 
-        assertThat(mDevicePolicyManager.getShortSupportMessage(mAdmin))
+        assertThat(mDevicePolicyManager.getShortSupportMessage(mAdmin).toString())
                 .isEqualTo(SHORT_SUPPORT_MESSAGE_TOO_LONG_TRUNCATED);
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void setLongSupportMessage_longText_notTruncated() {
         mDevicePolicyManager.setShortSupportMessage(mAdmin, LONG_SUPPORT_MESSAGE_REASONABLY_LONG);
 
-        assertThat(mDevicePolicyManager.getShortSupportMessage(mAdmin))
+        assertThat(mDevicePolicyManager.getShortSupportMessage(mAdmin).toString())
                 .isEqualTo(LONG_SUPPORT_MESSAGE_REASONABLY_LONG);
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void setShortSupportMessage_nullAdmin_throwsNullPointerException() {
         assertThrows(NullPointerException.class, () ->
@@ -167,8 +158,7 @@
                         /* componentName= */ null, VALID_SUPPORT_MESSAGE));
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void setLongSupportMessage_nullAdmin_throwsNullPointerException() {
         assertThrows(NullPointerException.class, () ->
@@ -176,8 +166,7 @@
                         /* componentName= */ null, VALID_SUPPORT_MESSAGE));
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void getShortSupportMessage_nullAdmin_throwsNullPointerException() {
         assertThrows(NullPointerException.class, () ->
@@ -185,8 +174,7 @@
                         /* componentName= */ null));
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void getLongSupportMessage_nullAdmin_throwsNullPointerException() {
         assertThrows(NullPointerException.class, () ->
@@ -194,7 +182,6 @@
                         /* componentName= */ null));
     }
 
-    @Test
     // We don't include non device admin states as passing a null admin is a NullPointerException
     @CannotSetPolicyTest(policy = SupportMessage.class, includeNonDeviceAdminStates = false)
     @Postsubmit(reason = "new test")
@@ -203,7 +190,6 @@
                 mDevicePolicyManager.getLongSupportMessage(mAdmin));
     }
 
-    @Test
     // We don't include non device admin states as passing a null admin is a NullPointerException
     @CannotSetPolicyTest(policy = SupportMessage.class, includeNonDeviceAdminStates = false)
     @Postsubmit(reason = "new test")
@@ -212,7 +198,6 @@
                 mDevicePolicyManager.setLongSupportMessage(mAdmin, VALID_SUPPORT_MESSAGE));
     }
 
-    @Test
     // We don't include non device admin states as passing a null admin is a NullPointerException
     @CannotSetPolicyTest(policy = SupportMessage.class, includeNonDeviceAdminStates = false)
     @Postsubmit(reason = "new test")
@@ -221,7 +206,6 @@
                 mDevicePolicyManager.getShortSupportMessage(mAdmin));
     }
 
-    @Test
     // We don't include non device admin states as passing a null admin is a NullPointerException
     @CannotSetPolicyTest(policy = SupportMessage.class, includeNonDeviceAdminStates = false)
     @Postsubmit(reason = "new test")
@@ -230,8 +214,7 @@
                 mDevicePolicyManager.setShortSupportMessage(mAdmin, VALID_SUPPORT_MESSAGE));
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void setShortSupportMessage_validText_logged() {
         try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
@@ -245,8 +228,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = SupportMessage.class)
+    @PolicyAppliesTest(policy = SupportMessage.class)
     @Postsubmit(reason = "new test")
     public void setLongSupportMessage_validText_logged() {
         try (EnterpriseMetricsRecorder metrics = EnterpriseMetricsRecorder.create()) {
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/SystemAppTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/SystemAppTest.java
new file mode 100644
index 0000000..3b9ecc0
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/SystemAppTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static org.testng.Assert.assertThrows;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.AfterClass;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.policies.EnableSystemApp;
+import com.android.bedstead.testapp.TestApp;
+import com.android.bedstead.testapp.TestAppInstance;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public final class SystemAppTest {
+
+    @ClassRule @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final TestApp sTestApp = sDeviceState.testApps().any();
+    private static final TestAppInstance sTestAppInstance = sTestApp.install();
+
+    @AfterClass
+    public static void teardownClass() {
+        sTestAppInstance.uninstall();
+    }
+
+    @CanSetPolicyTest(policy = EnableSystemApp.class)
+    @Postsubmit(reason = "new test")
+    public void enableSystemApp_nonSystemApp_throwsException() {
+        assertThrows(IllegalArgumentException.class,
+                () -> sDeviceState.dpc().devicePolicyManager().enableSystemApp(
+                        sDeviceState.dpc().componentName(), sTestApp.packageName()));
+    }
+
+    @CannotSetPolicyTest(policy = EnableSystemApp.class)
+    @Postsubmit(reason = "new test")
+    public void enableSystemApp_notAllowed_throwsException() {
+        assertThrows(SecurityException.class,
+                () -> sDeviceState.dpc().devicePolicyManager().enableSystemApp(
+                        sDeviceState.dpc().componentName(), sTestApp.packageName()));
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/TimeTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/TimeTest.java
new file mode 100644
index 0000000..8e75618
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/TimeTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.admin.DevicePolicyManager;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.policies.AutoTimeRequired;
+import com.android.bedstead.nene.TestApis;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public final class TimeTest {
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+    private static final DevicePolicyManager sLocalDevicePolicyManager =
+            TestApis.context().instrumentedContext().getSystemService(DevicePolicyManager.class);
+
+    @PolicyAppliesTest(policy = AutoTimeRequired.class)
+    public void setAutoTimeRequired_false_setsAutoTimeNotRequired() {
+        boolean originalValue = sLocalDevicePolicyManager.getAutoTimeRequired();
+
+        try {
+            sDeviceState.dpc().devicePolicyManager().setAutoTimeRequired(
+                    sDeviceState.dpc().componentName(), false);
+
+            assertThat(sDeviceState.dpc().devicePolicyManager().getAutoTimeRequired()).isFalse();
+
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setAutoTimeRequired(
+                    sDeviceState.dpc().componentName(), originalValue);
+        }
+    }
+
+    @PolicyAppliesTest(policy = AutoTimeRequired.class)
+    public void setAutoTimeRequired_true_setsAutoTimeRequired() {
+        boolean originalValue = sLocalDevicePolicyManager.getAutoTimeRequired();
+
+        try {
+            sDeviceState.dpc().devicePolicyManager().setAutoTimeRequired(
+                    sDeviceState.dpc().componentName(), true);
+
+            assertThat(sDeviceState.dpc().devicePolicyManager().getAutoTimeRequired()).isTrue();
+
+        } finally {
+            sDeviceState.dpc().devicePolicyManager().setAutoTimeRequired(
+                    sDeviceState.dpc().componentName(), originalValue);
+        }
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/UserControlDisabledPackagesTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/UserControlDisabledPackagesTest.java
index 131f7d0..82195db 100644
--- a/tests/devicepolicy/src/android/devicepolicy/cts/UserControlDisabledPackagesTest.java
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/UserControlDisabledPackagesTest.java
@@ -39,19 +39,17 @@
 import com.android.bedstead.harrier.annotations.Postsubmit;
 import com.android.bedstead.harrier.annotations.enterprise.CanSetPolicyTest;
 import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
-import com.android.bedstead.harrier.annotations.enterprise.PositivePolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
 import com.android.bedstead.harrier.policies.UserControlDisabledPackages;
 import com.android.bedstead.metricsrecorder.EnterpriseMetricsRecorder;
 import com.android.bedstead.nene.TestApis;
 import com.android.bedstead.nene.packages.Package;
 import com.android.bedstead.testapp.TestApp;
 import com.android.bedstead.testapp.TestAppInstance;
-import com.android.bedstead.testapp.TestAppProvider;
 import com.android.queryable.queries.StringQuery;
 
 import org.junit.ClassRule;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.Arrays;
@@ -62,9 +60,11 @@
 public final class UserControlDisabledPackagesTest {
     private static final String TAG = "UserControlDisabledPackagesTest";
 
-    private static final TestAppProvider sTestAppProvider = new TestAppProvider();
+    @ClassRule @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
     private static final TestApp sTestApp =
-            sTestAppProvider.query().whereActivities().isNotEmpty().get();
+            sDeviceState.testApps().query().whereActivities().isNotEmpty().get();
 
     private static final ActivityManager sActivityManager =
             TestApis.context().instrumentedContext().getSystemService(ActivityManager.class);
@@ -73,11 +73,6 @@
 
     private static final String PACKAGE_NAME = "com.android.foo.bar.baz";
 
-    @ClassRule
-    @Rule
-    public static final DeviceState sDeviceState = new DeviceState();
-
-    @Test
     @CanSetPolicyTest(policy = UserControlDisabledPackages.class)
     @Postsubmit(reason = "New test")
     public void setUserControlDisabledPackages_verifyMetricIsLogged() {
@@ -103,8 +98,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = UserControlDisabledPackages.class)
+    @PolicyAppliesTest(policy = UserControlDisabledPackages.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void setUserControlDisabledPackages_toOneProtectedPackage() {
         List<String> originalDisabledPackages =
@@ -124,8 +118,7 @@
         }
     }
 
-    @Test
-    @PositivePolicyTest(policy = UserControlDisabledPackages.class)
+    @PolicyAppliesTest(policy = UserControlDisabledPackages.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void setUserControlDisabledPackages_toEmptyProtectedPackages() {
         List<String> originalDisabledPackages =
@@ -145,7 +138,6 @@
         }
     }
 
-    @Test
     @CannotSetPolicyTest(policy = UserControlDisabledPackages.class)
     public void setUserControlDisabledPackages_notAllowedToSetProtectedPackages_throwsException() {
         assertThrows(SecurityException.class,
@@ -154,8 +146,7 @@
                         Collections.emptyList()));
     }
 
-    @Test
-    @PositivePolicyTest(policy = UserControlDisabledPackages.class)
+    @PolicyAppliesTest(policy = UserControlDisabledPackages.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void
     getUserControlDisabledPackages_noProtectedPackagesSet_returnsEmptyProtectedPackages() {
@@ -166,7 +157,6 @@
                 .isEmpty();
     }
 
-    @Test
     @CannotSetPolicyTest(policy = UserControlDisabledPackages.class)
     public void
     getUserControlDisabledPackages_notAllowedToRetrieveProtectedPackages_throwsException() {
@@ -175,9 +165,8 @@
                         DPC_COMPONENT_NAME));
     }
 
-    @Test
     @EnsureHasPermission(value = permission.FORCE_STOP_PACKAGES)
-    @PositivePolicyTest(policy = UserControlDisabledPackages.class)
+    @PolicyAppliesTest(policy = UserControlDisabledPackages.class)
     @Postsubmit(reason = "b/181993922 automatically marked flaky")
     public void setUserControlDisabledPackages_launchActivity_verifyPackageNotStopped()
             throws Exception {
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/WifiMinimumSecurityTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/WifiMinimumSecurityTest.java
new file mode 100644
index 0000000..fca2066
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/WifiMinimumSecurityTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2021 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 android.devicepolicy.cts;
+
+import static android.app.admin.DevicePolicyManager.WIFI_SECURITY_ENTERPRISE_192;
+import static android.app.admin.DevicePolicyManager.WIFI_SECURITY_ENTERPRISE_EAP;
+import static android.app.admin.DevicePolicyManager.WIFI_SECURITY_OPEN;
+import static android.app.admin.DevicePolicyManager.WIFI_SECURITY_PERSONAL;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.app.admin.RemoteDevicePolicyManager;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.IntTestParameter;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.policies.WifiMinimumSecurity;
+import com.android.bedstead.remotedpc.RemotePolicyManager;
+
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@RunWith(BedsteadJUnit4.class)
+public class WifiMinimumSecurityTest {
+
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private RemoteDevicePolicyManager mDevicePolicyManager;
+
+    @Before
+    public void setUp() {
+        RemotePolicyManager dpc = sDeviceState.dpc();
+        mDevicePolicyManager = dpc.devicePolicyManager();
+    }
+
+    @IntTestParameter({
+            WIFI_SECURITY_ENTERPRISE_192,
+            WIFI_SECURITY_ENTERPRISE_EAP,
+            WIFI_SECURITY_OPEN,
+            WIFI_SECURITY_PERSONAL})
+    @Retention(RetentionPolicy.RUNTIME)
+    private @interface SettableWifiSecurityLevelTestParameter {
+    }
+
+    @PolicyAppliesTest(policy = WifiMinimumSecurity.class)
+    @Postsubmit(reason = "new test")
+    public void setWifiMinimumSecurity_validLevel_works(
+            @SettableWifiSecurityLevelTestParameter int flag) {
+        try {
+            mDevicePolicyManager.setMinimumRequiredWifiSecurityLevel(flag);
+            assertThat(mDevicePolicyManager.getMinimumRequiredWifiSecurityLevel())
+                    .isEqualTo(flag);
+        } finally {
+            mDevicePolicyManager.setMinimumRequiredWifiSecurityLevel(WIFI_SECURITY_PERSONAL);
+        }
+    }
+
+    // We don't include non device admin states as passing a null admin is a NullPointerException
+    @CannotSetPolicyTest(policy = WifiMinimumSecurity.class, includeNonDeviceAdminStates = false)
+    @Postsubmit(reason = "new test")
+    public void setWifiMinimumSecurity_invalidAdmin_fails() {
+        assertThrows(SecurityException.class, () ->
+                mDevicePolicyManager.setMinimumRequiredWifiSecurityLevel(
+                        WIFI_SECURITY_ENTERPRISE_EAP));
+    }
+}
diff --git a/tests/devicepolicy/src/android/devicepolicy/cts/WifiSsidRestrictionTest.java b/tests/devicepolicy/src/android/devicepolicy/cts/WifiSsidRestrictionTest.java
new file mode 100644
index 0000000..0674128
--- /dev/null
+++ b/tests/devicepolicy/src/android/devicepolicy/cts/WifiSsidRestrictionTest.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2022 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 android.devicepolicy.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
+
+import android.app.admin.RemoteDevicePolicyManager;
+import android.app.admin.WifiSsidPolicy;
+import android.net.wifi.WifiSsid;
+import android.util.ArraySet;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.Postsubmit;
+import com.android.bedstead.harrier.annotations.enterprise.CannotSetPolicyTest;
+import com.android.bedstead.harrier.annotations.enterprise.PolicyAppliesTest;
+import com.android.bedstead.harrier.policies.WifiSsidRestriction;
+import com.android.bedstead.remotedpc.RemotePolicyManager;
+
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.runner.RunWith;
+import org.testng.Assert;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Set;
+
+@RunWith(BedsteadJUnit4.class)
+public class WifiSsidRestrictionTest {
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private RemoteDevicePolicyManager mDevicePolicyManager;
+
+    @Before
+    public void setUp() {
+        RemotePolicyManager dpc = sDeviceState.dpc();
+        mDevicePolicyManager = dpc.devicePolicyManager();
+    }
+
+    @PolicyAppliesTest(policy = WifiSsidRestriction.class)
+    @Postsubmit(reason = "new test")
+    public void setWifiSsidPolicy_validAllowlist_works() {
+        try {
+            final Set<WifiSsid> ssids = new ArraySet<>(
+                    Arrays.asList(WifiSsid.fromBytes("ssid1".getBytes(StandardCharsets.UTF_8)),
+                            WifiSsid.fromBytes("ssid2".getBytes(StandardCharsets.UTF_8)),
+                            WifiSsid.fromBytes("ssid3".getBytes(StandardCharsets.UTF_8))));
+            WifiSsidPolicy policy = new WifiSsidPolicy(
+                    WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_ALLOWLIST, ssids);
+
+            mDevicePolicyManager.setWifiSsidPolicy(policy);
+
+            assertThat(mDevicePolicyManager.getWifiSsidPolicy().getSsids()).isEqualTo(ssids);
+            assertThat(mDevicePolicyManager.getWifiSsidPolicy().getPolicyType()).isEqualTo(
+                    WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_ALLOWLIST);
+        } finally {
+            mDevicePolicyManager.setWifiSsidPolicy(null);
+        }
+
+    }
+
+    @PolicyAppliesTest(policy = WifiSsidRestriction.class)
+    @Postsubmit(reason = "new test")
+    public void setWifiSsidPolicy_validDenylist_works() {
+        try {
+            final Set<WifiSsid> ssids = new ArraySet<>(
+                    Arrays.asList(WifiSsid.fromBytes("ssid1".getBytes(StandardCharsets.UTF_8)),
+                            WifiSsid.fromBytes("ssid2".getBytes(StandardCharsets.UTF_8)),
+                            WifiSsid.fromBytes("ssid3".getBytes(StandardCharsets.UTF_8))));
+            WifiSsidPolicy policy = new WifiSsidPolicy(
+                    WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_DENYLIST, ssids);
+
+            mDevicePolicyManager.setWifiSsidPolicy(policy);
+
+            assertThat(mDevicePolicyManager.getWifiSsidPolicy().getSsids()).isEqualTo(ssids);
+            assertThat(mDevicePolicyManager.getWifiSsidPolicy().getPolicyType()).isEqualTo(
+                    WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_DENYLIST);
+        } finally {
+            mDevicePolicyManager.setWifiSsidPolicy(null);
+        }
+    }
+
+    @PolicyAppliesTest(policy = WifiSsidRestriction.class)
+    @Postsubmit(reason = "new test")
+    public void setWifiSsidPolicy_validRemoveRestriction_works() {
+        try {
+            final Set<WifiSsid> ssids = new ArraySet<>(
+                    Arrays.asList(WifiSsid.fromBytes("ssid1".getBytes(StandardCharsets.UTF_8))));
+            WifiSsidPolicy policy = new WifiSsidPolicy(
+                    WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_DENYLIST, ssids);
+
+            mDevicePolicyManager.setWifiSsidPolicy(policy);
+
+            assertThat(mDevicePolicyManager.getWifiSsidPolicy().getSsids()).isEqualTo(ssids);
+            assertThat(mDevicePolicyManager.getWifiSsidPolicy().getPolicyType()).isEqualTo(
+                    WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_DENYLIST);
+
+            mDevicePolicyManager.setWifiSsidPolicy(null);
+
+            assertNull(mDevicePolicyManager.getWifiSsidPolicy());
+        } finally {
+            mDevicePolicyManager.setWifiSsidPolicy(null);
+        }
+    }
+
+    @PolicyAppliesTest(policy = WifiSsidRestriction.class)
+    @Postsubmit(reason = "new test")
+    public void setWifiSsidPolicy_invalidPolicy_fails() {
+        final Set<WifiSsid> ssids = new ArraySet<>();
+        Assert.assertThrows(IllegalArgumentException.class,
+                () -> new WifiSsidPolicy(WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_ALLOWLIST, ssids));
+    }
+
+    // We don't include non device admin states as passing a null admin is a NullPointerException
+    @CannotSetPolicyTest(policy = WifiSsidRestriction.class, includeNonDeviceAdminStates = false)
+    @Postsubmit(reason = "new test")
+    public void setWifiSsidPolicy_invalidAdmin_fails() {
+        final Set<WifiSsid> ssids = new ArraySet<>(
+                Arrays.asList(WifiSsid.fromBytes("ssid1".getBytes(StandardCharsets.UTF_8))));
+        WifiSsidPolicy policy = new WifiSsidPolicy(
+                WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_DENYLIST, ssids);
+
+        assertThrows(SecurityException.class, () -> mDevicePolicyManager.setWifiSsidPolicy(policy));
+    }
+}
diff --git a/tests/devicestate/src/android/hardware/devicestate/cts/DeviceStateManagerTests.java b/tests/devicestate/src/android/hardware/devicestate/cts/DeviceStateManagerTests.java
index 4c5eaa5..123e133 100644
--- a/tests/devicestate/src/android/hardware/devicestate/cts/DeviceStateManagerTests.java
+++ b/tests/devicestate/src/android/hardware/devicestate/cts/DeviceStateManagerTests.java
@@ -16,19 +16,20 @@
 
 package android.hardware.devicestate.cts;
 
-import static android.hardware.devicestate.cts.DeviceStateUtils.assertValidState;
-import static android.hardware.devicestate.cts.DeviceStateUtils.runWithControlDeviceStatePermission;
 import static android.hardware.devicestate.DeviceStateManager.MAXIMUM_DEVICE_STATE;
 import static android.hardware.devicestate.DeviceStateManager.MINIMUM_DEVICE_STATE;
+import static android.hardware.devicestate.cts.DeviceStateUtils.assertValidState;
+import static android.hardware.devicestate.cts.DeviceStateUtils.runWithControlDeviceStatePermission;
 import static android.view.Display.DEFAULT_DISPLAY;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 
 import android.hardware.devicestate.DeviceStateManager;
 import android.hardware.devicestate.DeviceStateRequest;
@@ -37,8 +38,8 @@
 
 import com.android.compatibility.common.util.PollingCheck;
 
-import org.junit.runner.RunWith;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 
 import java.util.concurrent.Executor;
@@ -127,9 +128,8 @@
         final int[] supportedStates = manager.getSupportedStates();
         // We want to verify that the app can change device state
         // So we only attempt if there are more than 1 possible state.
-        if (supportedStates.length < 2) {
-            return;
-        }
+        assumeTrue(supportedStates.length > 1);
+
         final StateTrackingCallback callback = new StateTrackingCallback();
         manager.registerCallback(Runnable::run, callback);
         PollingCheck.waitFor(TIMEOUT, () -> callback.mCurrentState != -1);
@@ -162,9 +162,8 @@
         final int[] supportedStates = manager.getSupportedStates();
         // We want to verify that the app can change device state
         // So we only attempt if there are more than 1 possible state.
-        if (supportedStates.length < 2) {
-            return;
-        }
+        assumeTrue(supportedStates.length > 1);
+
         final StateTrackingCallback callback = new StateTrackingCallback();
         manager.registerCallback(Runnable::run, callback);
         PollingCheck.waitFor(TIMEOUT, () -> callback.mCurrentState != -1);
@@ -187,6 +186,60 @@
         assertTrue(activity.requestStateFailed);
     }
 
+    /**
+     * Tests that calling {@link DeviceStateManager#cancelStateRequest} is successful and results
+     * in a registered callback being triggered with a value equal to the base state.
+     */
+    @Test
+    public void testCancelStateRequestFromNewActivity() throws IllegalArgumentException {
+        final DeviceStateManager manager = getDeviceStateManager();
+        final int[] supportedStates = manager.getSupportedStates();
+        // We want to verify that the app can change device state
+        // So we only attempt if there are more than 1 possible state.
+        assumeTrue(supportedStates.length > 1);
+
+        final StateTrackingCallback callback = new StateTrackingCallback();
+        manager.registerCallback(Runnable::run, callback);
+        PollingCheck.waitFor(TIMEOUT, () -> callback.mCurrentState != -1);
+        final TestActivitySession<DeviceStateTestActivity> activitySession =
+                createManagedTestActivitySession();
+
+        activitySession.launchTestActivityOnDisplaySync(
+                DeviceStateTestActivity.class,
+                DEFAULT_DISPLAY
+        );
+
+        DeviceStateTestActivity activity = activitySession.getActivity();
+
+        int originalState = callback.mCurrentState;
+        int newState = determineNewState(callback.mCurrentState, supportedStates);
+        activity.requestDeviceStateChange(newState);
+
+        PollingCheck.waitFor(TIMEOUT, () -> callback.mCurrentState == newState);
+
+        assertEquals(newState, callback.mCurrentState);
+        assertFalse(activity.requestStateFailed);
+
+        activity.finish();
+
+        final TestActivitySession<DeviceStateTestActivity> secondActivitySession =
+                createManagedTestActivitySession();
+        secondActivitySession.launchTestActivityOnDisplaySync(
+                DeviceStateTestActivity.class,
+                DEFAULT_DISPLAY
+        );
+        // verify that the overridden state is still active after finishing
+        // and launching the second activity.
+        assertEquals(newState, callback.mCurrentState);
+
+        activity = secondActivitySession.getActivity();
+        activity.cancelOverriddenState();
+
+        PollingCheck.waitFor(TIMEOUT, () -> callback.mCurrentState == originalState);
+
+        assertEquals(originalState, callback.mCurrentState);
+    }
+
     // determine what state we should request that isn't the current state
     // throws an IllegalArgumentException if there is no unique states available
     // in the list of supported states
@@ -215,17 +268,17 @@
     }
 
     /**
-     * Tests that calling {@link DeviceStateManager#cancelRequest()} throws a
+     * Tests that calling {@link DeviceStateManager#cancelStateRequest} throws a
      * {@link java.lang.SecurityException} without the
      * {@link android.Manifest.permission.CONTROL_DEVICE_STATE} permission held.
      */
     @Test(expected = SecurityException.class)
-    public void testCancelRequestWithoutPermission() throws Throwable {
+    public void testCancelOverrideRequestWithoutPermission() throws Throwable {
         final DeviceStateManager manager = getDeviceStateManager();
         final int[] states = manager.getSupportedStates();
         final DeviceStateRequest request = DeviceStateRequest.newBuilder(states[0]).build();
         runWithRequestActive(request, () -> {
-            manager.cancelRequest(request);
+            manager.cancelStateRequest();
         });
     }
 
diff --git a/tests/devicestate/src/android/hardware/devicestate/cts/DeviceStateRequestSession.java b/tests/devicestate/src/android/hardware/devicestate/cts/DeviceStateRequestSession.java
index a45d5cb..7b15fd9 100644
--- a/tests/devicestate/src/android/hardware/devicestate/cts/DeviceStateRequestSession.java
+++ b/tests/devicestate/src/android/hardware/devicestate/cts/DeviceStateRequestSession.java
@@ -20,6 +20,7 @@
 
 import android.hardware.devicestate.DeviceStateManager;
 import android.hardware.devicestate.DeviceStateRequest;
+
 import androidx.annotation.NonNull;
 
 /**
@@ -56,8 +57,7 @@
     @Override
     public void close() {
         try {
-            runWithControlDeviceStatePermission(() ->
-                    mDeviceStateManager.cancelRequest(mRequest));
+            runWithControlDeviceStatePermission(mDeviceStateManager::cancelStateRequest);
         } catch (Throwable t) {
             throw new RuntimeException(t);
         }
diff --git a/tests/devicestate/src/android/hardware/devicestate/cts/DeviceStateTestActivity.java b/tests/devicestate/src/android/hardware/devicestate/cts/DeviceStateTestActivity.java
index b01b749d..cd1ae59 100644
--- a/tests/devicestate/src/android/hardware/devicestate/cts/DeviceStateTestActivity.java
+++ b/tests/devicestate/src/android/hardware/devicestate/cts/DeviceStateTestActivity.java
@@ -19,25 +19,45 @@
 import android.app.Activity;
 import android.hardware.devicestate.DeviceStateManager;
 import android.hardware.devicestate.DeviceStateRequest;
+import android.os.Bundle;
 
 /**
  * This is an activity that can request device state changes via
- * {@link DeviceStateManager#requestState}.
+ * {@link DeviceStateManager#requestState} as well as cancel the active
+ * override request with {@link DeviceStateManager#cancelStateRequest}.
  *
  * @see {@link DeviceStateManagerTests#testRequestStateFailsAsBackgroundApp}
  * @see {@link DeviceStateManagerTests#testRequestStateSucceedsAsTopApp}
+ * @see {@link DeviceStateManagerTests#testCancelOverrideRequestFromNewActivity}
  */
 public class DeviceStateTestActivity extends Activity {
 
     public boolean requestStateFailed = false;
+    public boolean cancelStateRequestFailed = false;
+    private DeviceStateManager mDeviceStateManager;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mDeviceStateManager = getSystemService(DeviceStateManager.class);
+    }
 
     public void requestDeviceStateChange(int state) {
-        DeviceStateManager deviceStateManager = getSystemService(DeviceStateManager.class);
         DeviceStateRequest request = DeviceStateRequest.newBuilder(state).build();
         try {
-            deviceStateManager.requestState(request, null, null);
+            requestStateFailed = false;
+            mDeviceStateManager.requestState(request, null, null);
         } catch (SecurityException e) {
             requestStateFailed = true;
         }
     }
-}
\ No newline at end of file
+
+    public void cancelOverriddenState() {
+        try {
+            cancelStateRequestFailed = false;
+            mDeviceStateManager.cancelStateRequest();
+        } catch (SecurityException e) {
+            cancelStateRequestFailed = true;
+        }
+    }
+}
diff --git a/tests/framework/base/OWNERS b/tests/framework/base/OWNERS
index f204dab..ad4b98f 100644
--- a/tests/framework/base/OWNERS
+++ b/tests/framework/base/OWNERS
@@ -13,3 +13,9 @@
 
 # Suggestions
 tmfang@google.com
+
+# Locale
+pratyushmore@google.com
+goldmanj@google.com
+
+# Locale
\ No newline at end of file
diff --git a/tests/framework/base/biometrics/src/android/server/biometrics/BiometricServiceTests.java b/tests/framework/base/biometrics/src/android/server/biometrics/BiometricServiceTests.java
index 023ffaa..df9c7a0 100644
--- a/tests/framework/base/biometrics/src/android/server/biometrics/BiometricServiceTests.java
+++ b/tests/framework/base/biometrics/src/android/server/biometrics/BiometricServiceTests.java
@@ -32,9 +32,7 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * Tests for system server logic.
@@ -71,47 +69,42 @@
     private void testAuthenticatorIdsInvalidated_forSensor(int sensorId,
             @NonNull List<Integer> strongSensors) throws Exception {
         Log.d(TAG, "testAuthenticatorIdsInvalidated_forSensor: " + sensorId);
-        final List<BiometricTestSession> biometricSessions = new ArrayList<>();
+        try (TestSessionList biometricSessions = new TestSessionList(this)) {
+            final BiometricTestSession targetSensorTestSession =
+                    mBiometricManager.createTestSession(sensorId);
 
-        final BiometricTestSession targetSensorTestSession =
-                mBiometricManager.createTestSession(sensorId);
+            // Get the state once. This intentionally clears the scheduler's recent operations dump.
+            BiometricServiceState state = getCurrentStateAndClearSchedulerLog();
 
-        // Get the state once. This intentionally clears the scheduler's recent operations dump.
-        BiometricServiceState state = getCurrentStateAndClearSchedulerLog();
+            waitForAllUnenrolled();
+            Log.d(TAG, "Enrolling for: " + sensorId);
+            enrollForSensor(targetSensorTestSession, sensorId);
+            biometricSessions.add(targetSensorTestSession);
+            state = getCurrentStateAndClearSchedulerLog();
 
-        waitForAllUnenrolled();
-        Log.d(TAG, "Enrolling for: " + sensorId);
-        enrollForSensor(targetSensorTestSession, sensorId);
-        biometricSessions.add(targetSensorTestSession);
-        state = getCurrentStateAndClearSchedulerLog();
+            // Target sensorId has never been requested to invalidate authenticatorId yet.
+            assertEquals(0, Utils.numberOfSpecifiedOperations(state, sensorId,
+                    BiometricsProto.CM_INVALIDATE));
 
-        // Target sensorId has never been requested to invalidate authenticatorId yet.
-        assertEquals(0, Utils.numberOfSpecifiedOperations(state, sensorId,
-                BiometricsProto.CM_INVALIDATE));
+            // Add enrollments for all other sensors. Upon each enrollment, the authenticatorId for
+            // the above sensor should be invalidated.
+            for (Integer id : strongSensors) {
+                if (id != sensorId) {
+                    final BiometricTestSession session = mBiometricManager.createTestSession(id);
+                    biometricSessions.add(session);
+                    Log.d(TAG, "Sensor " + id + " should request invalidation");
+                    enrollForSensor(session, id);
+                    state = getCurrentStateAndClearSchedulerLog();
+                    assertEquals(1, Utils.numberOfSpecifiedOperations(state, sensorId,
+                            BiometricsProto.CM_INVALIDATE));
 
-        // Add enrollments for all other sensors. Upon each enrollment, the authenticatorId for
-        // the above sensor should be invalidated.
-        for (Integer id : strongSensors) {
-            if (id != sensorId) {
-                final BiometricTestSession session = mBiometricManager.createTestSession(id);
-                biometricSessions.add(session);
-                Log.d(TAG, "Sensor " + id + " should request invalidation");
-                enrollForSensor(session, id);
-                state = getCurrentStateAndClearSchedulerLog();
-                assertEquals(1, Utils.numberOfSpecifiedOperations(state, sensorId,
-                        BiometricsProto.CM_INVALIDATE));
-
-                // In addition, the sensor that should have enrolled should have been the one that
-                // requested invalidation.
-                assertEquals(1, Utils.numberOfSpecifiedOperations(state, id,
-                        BiometricsProto.CM_INVALIDATION_REQUESTER));
+                    // In addition, the sensor that should have enrolled should have been the one
+                    // that requested invalidation.
+                    assertEquals(1, Utils.numberOfSpecifiedOperations(state, id,
+                            BiometricsProto.CM_INVALIDATION_REQUESTER));
+                }
             }
         }
-
-        // Cleanup
-        for (BiometricTestSession session : biometricSessions) {
-            session.close();
-        }
     }
 
     @Test
@@ -120,44 +113,45 @@
         // interfaces may take this a step further and ignore resetLockout requests when no
         // enrollments exist.
         assumeTrue(Utils.isFirstApiLevel29orGreater());
-        List<BiometricTestSession> biometricSessions = new ArrayList<>();
-        for (SensorProperties prop : mSensorProperties) {
-            BiometricTestSession session = mBiometricManager.createTestSession(prop.getSensorId());
-            enrollForSensor(session, prop.getSensorId());
-            biometricSessions.add(session);
-        }
+        try (TestSessionList biometricSessions = new TestSessionList(this)) {
+            for (SensorProperties prop : mSensorProperties) {
+                BiometricTestSession session = mBiometricManager.createTestSession(
+                        prop.getSensorId());
+                enrollForSensor(session, prop.getSensorId());
+                biometricSessions.add(session);
+            }
 
-        try (CredentialSession credentialSession = new CredentialSession()) {
-            credentialSession.setCredential();
+            try (CredentialSession credentialSession = new CredentialSession()) {
+                credentialSession.setCredential();
 
-            // Explicitly clear the state so we can check exact number below
-            final BiometricServiceState clearState = getCurrentStateAndClearSchedulerLog();
-            credentialSession.verifyCredential();
+                // Explicitly clear the state so we can check exact number below
+                final BiometricServiceState clearState = getCurrentStateAndClearSchedulerLog();
+                credentialSession.verifyCredential();
 
-            Utils.waitFor("Waiting for password verification and resetLockout completion", () -> {
-                try {
-                    BiometricServiceState state = getCurrentState();
-                    // All sensors have processed exactly one resetLockout request. Use a boolean
-                    // to track this so we have better logging
-                    boolean allResetOnce = true;
-                    for (SensorProperties prop : mSensorProperties) {
-                        final int numResetLockouts = Utils.numberOfSpecifiedOperations(state,
-                                prop.getSensorId(), BiometricsProto.CM_RESET_LOCKOUT);
-                        Log.d(TAG, "Sensor: " + prop.getSensorId()
-                                + ", numResetLockouts: " + numResetLockouts);
-                        if (numResetLockouts != 1) {
-                            allResetOnce = false;
-                        }
-                    }
-                    return allResetOnce;
-                } catch (Exception e) {
-                    return false;
-                }
-            }, unused -> fail("All sensors must receive and process exactly one resetLockout"));
-        }
-
-        for (BiometricTestSession session : biometricSessions) {
-            session.close();
+                Utils.waitFor("Waiting for password verification and resetLockout completion",
+                        () -> {
+                            try {
+                                BiometricServiceState state = getCurrentState();
+                                // All sensors have processed exactly one resetLockout request.
+                                // Use a boolean to track this so we have better logging
+                                boolean allResetOnce = true;
+                                for (SensorProperties prop : mSensorProperties) {
+                                    final int numResetLockouts =
+                                            Utils.numberOfSpecifiedOperations(state,
+                                            prop.getSensorId(), BiometricsProto.CM_RESET_LOCKOUT);
+                                    Log.d(TAG, "Sensor: " + prop.getSensorId()
+                                            + ", numResetLockouts: " + numResetLockouts);
+                                    if (numResetLockouts != 1) {
+                                        allResetOnce = false;
+                                    }
+                                }
+                                return allResetOnce;
+                            } catch (Exception e) {
+                                return false;
+                            }
+                        }, unused -> fail(
+                                "All sensors must receive and process exactly one resetLockout"));
+            }
         }
     }
 
@@ -169,34 +163,32 @@
         // ResetLockout only really needs to be applied when enrollments exist. Furthermore, some
         // interfaces may take this a step further and ignore resetLockout requests when no
         // enrollments exist.
-        Map<Integer, BiometricTestSession> biometricSessions = new HashMap<>();
-        for (SensorProperties prop : mSensorProperties) {
-            BiometricTestSession session = mBiometricManager.createTestSession(prop.getSensorId());
-            enrollForSensor(session, prop.getSensorId());
-            biometricSessions.put(prop.getSensorId(), session);
-        }
-
-        // When a strong biometric sensor authenticates, all other biometric sensors that:
-        //  1) Do not require HATs for resetLockout (e.g. IBiometricsFingerprint@2.1) or
-        //  2) Require HATs but do not require challenges (e.g. IFingerprint@1.0, IFace@1.0)
-        // schedule and complete a resetLockout operation.
-        //
-        // To be more explicit, sensors that require HATs AND challenges (IBiometricsFace@1.0)
-        // do not schedule resetLockout, since the interface has no way of generating multiple
-        // HATs with a single authentication (e.g. if the user requested to unlock an auth-bound
-        // key, the only HAT returned would have the keystore operationId within).
-        for (SensorProperties prop : mSensorProperties) {
-            if (prop.getSensorStrength() != SensorProperties.STRENGTH_STRONG) {
-                Log.d(TAG, "Skipping sensor: " + prop.getSensorId()
-                        + ", strength: " + prop.getSensorStrength());
-                continue;
+        try (TestSessionList biometricSessions = new TestSessionList(this)) {
+            for (SensorProperties prop : mSensorProperties) {
+                BiometricTestSession session = mBiometricManager.createTestSession(
+                        prop.getSensorId());
+                enrollForSensor(session, prop.getSensorId());
+                biometricSessions.put(prop.getSensorId(), session);
             }
-            testLockoutResetRequestedAfterBiometricUnlock_whenStrong_forSensor(
-                    prop.getSensorId(), biometricSessions.get(prop.getSensorId()));
-        }
 
-        for (BiometricTestSession session : biometricSessions.values()) {
-            session.close();
+            // When a strong biometric sensor authenticates, all other biometric sensors that:
+            //  1) Do not require HATs for resetLockout (e.g. IBiometricsFingerprint@2.1) or
+            //  2) Require HATs but do not require challenges (e.g. IFingerprint@1.0, IFace@1.0)
+            // schedule and complete a resetLockout operation.
+            //
+            // To be more explicit, sensors that require HATs AND challenges (IBiometricsFace@1.0)
+            // do not schedule resetLockout, since the interface has no way of generating multiple
+            // HATs with a single authentication (e.g. if the user requested to unlock an auth-bound
+            // key, the only HAT returned would have the keystore operationId within).
+            for (SensorProperties prop : mSensorProperties) {
+                if (prop.getSensorStrength() != SensorProperties.STRENGTH_STRONG) {
+                    Log.d(TAG, "Skipping sensor: " + prop.getSensorId()
+                            + ", strength: " + prop.getSensorStrength());
+                    continue;
+                }
+                testLockoutResetRequestedAfterBiometricUnlock_whenStrong_forSensor(
+                        prop.getSensorId(), biometricSessions.find(prop.getSensorId()));
+            }
         }
     }
 
@@ -264,32 +256,29 @@
         // ResetLockout only really needs to be applied when enrollments exist. Furthermore, some
         // interfaces may take this a step further and ignore resetLockout requests when no
         // enrollments exist.
-        Map<Integer, BiometricTestSession> biometricSessions = new HashMap<>();
-        for (SensorProperties prop : mSensorProperties) {
-            BiometricTestSession session = mBiometricManager.createTestSession(prop.getSensorId());
-            enrollForSensor(session, prop.getSensorId());
-            biometricSessions.put(prop.getSensorId(), session);
-        }
-
-        // Sensors that do not meet BIOMETRIC_STRONG are not allowed to resetLockout for other
-        // sensors.
-        // TODO: Note that we are only testing STRENGTH_WEAK for now, since STRENGTH_CONVENIENCE is
-        //  not exposed to BiometricPrompt. In other words, we currently do not have a way to
-        //  request and finish authentication for STRENGTH_CONVENIENCE sensors.
-        for (SensorProperties prop : mSensorProperties) {
-            if (prop.getSensorStrength() != SensorProperties.STRENGTH_WEAK) {
-                Log.d(TAG, "Skipping sensor: " + prop.getSensorId()
-                        + ", strength: " + prop.getSensorStrength());
-                continue;
+        try (TestSessionList biometricSessions = new TestSessionList(this)) {
+            for (SensorProperties prop : mSensorProperties) {
+                BiometricTestSession session = mBiometricManager.createTestSession(
+                        prop.getSensorId());
+                enrollForSensor(session, prop.getSensorId());
+                biometricSessions.put(prop.getSensorId(), session);
             }
 
-            testLockoutResetNotRequestedAfterBiometricUnlock_whenNotStrong_forSensor(
-                    prop.getSensorId(), biometricSessions.get(prop.getSensorId()));
-        }
+            // Sensors that do not meet BIOMETRIC_STRONG are not allowed to resetLockout for other
+            // sensors.
+            // TODO: Note that we are only testing STRENGTH_WEAK for now, since STRENGTH_CONVENIENCE
+            //  is not exposed to BiometricPrompt. In other words, we currently do not have a way to
+            //  request and finish authentication for STRENGTH_CONVENIENCE sensors.
+            for (SensorProperties prop : mSensorProperties) {
+                if (prop.getSensorStrength() != SensorProperties.STRENGTH_WEAK) {
+                    Log.d(TAG, "Skipping sensor: " + prop.getSensorId()
+                            + ", strength: " + prop.getSensorStrength());
+                    continue;
+                }
 
-        // Cleanup
-        for (BiometricTestSession s : biometricSessions.values()) {
-            s.close();
+                testLockoutResetNotRequestedAfterBiometricUnlock_whenNotStrong_forSensor(
+                        prop.getSensorId(), biometricSessions.find(prop.getSensorId()));
+            }
         }
     }
 
@@ -320,27 +309,21 @@
 
     @Test
     public void testBiometricsRemovedWhenCredentialRemoved() throws Exception {
-        // Manually keep track of sessions and do not use autocloseable, since we do not want the
-        // test session to automatically cleanup and remove enrollments once we leave scope.
         assumeTrue(Utils.isFirstApiLevel29orGreater());
-        final List<BiometricTestSession> biometricSessions = new ArrayList<>();
-
-        try (CredentialSession session = new CredentialSession()) {
-            session.setCredential();
-            for (SensorProperties prop : mSensorProperties) {
-                BiometricTestSession biometricSession =
-                        mBiometricManager.createTestSession(prop.getSensorId());
-                biometricSessions.add(biometricSession);
-                enrollForSensor(biometricSession, prop.getSensorId());
+        try (TestSessionList biometricSessions = new TestSessionList(this)) {
+            try (CredentialSession session = new CredentialSession()) {
+                session.setCredential();
+                for (SensorProperties prop : mSensorProperties) {
+                    BiometricTestSession biometricSession =
+                            mBiometricManager.createTestSession(prop.getSensorId());
+                    biometricSessions.add(biometricSession);
+                    enrollForSensor(biometricSession, prop.getSensorId());
+                }
             }
-        }
 
-        // All biometrics should now be removed, since CredentialSession removes device credential
-        // after losing scope.
-        waitForAllUnenrolled();
-        // In case any additional cleanup needs to be done in the future, aside from un-enrollment
-        for (BiometricTestSession session : biometricSessions) {
-            session.close();
+            // All biometrics should now be removed, since CredentialSession removes device
+            // credential after losing scope.
+            waitForAllUnenrolled();
         }
     }
 }
diff --git a/tests/framework/base/biometrics/src/android/server/biometrics/BiometricTestBase.java b/tests/framework/base/biometrics/src/android/server/biometrics/BiometricTestBase.java
index d530223..6fa9022 100644
--- a/tests/framework/base/biometrics/src/android/server/biometrics/BiometricTestBase.java
+++ b/tests/framework/base/biometrics/src/android/server/biometrics/BiometricTestBase.java
@@ -67,7 +67,6 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.Executor;
 
 /**
@@ -109,6 +108,14 @@
         super.launchActivity(componentName);
     }
 
+    void waitForIdleSensors() {
+        try {
+            Utils.waitForIdleService(this::getSensorStates);
+        } catch (Exception e) {
+            Log.e(TAG, "Exception when waiting for idle", e);
+        }
+    }
+
     /** @see Utils#getBiometricServiceCurrentState() */
     @NonNull
     protected BiometricServiceState getCurrentState() throws Exception {
@@ -497,39 +504,8 @@
     public void cleanup() {
         mInstrumentation.waitForIdleSync();
 
-        try {
-            Utils.waitForIdleService(this::getSensorStates);
-        } catch (Exception e) {
-            Log.e(TAG, "Exception when waiting for idle", e);
-        }
-
-        try {
-            final BiometricServiceState state = getCurrentState();
-
-            for (Map.Entry<Integer, SensorState> sensorEntry
-                    : state.mSensorStates.sensorStates.entrySet()) {
-                for (Map.Entry<Integer, UserState> userEntry
-                        : sensorEntry.getValue().getUserStates().entrySet()) {
-                    if (userEntry.getValue().numEnrolled != 0) {
-                        Log.w(TAG, "Cleaning up for sensor: " + sensorEntry.getKey()
-                                + ", user: " + userEntry.getKey());
-                        BiometricTestSession session = mBiometricManager.createTestSession(
-                                sensorEntry.getKey());
-                        session.cleanupInternalState(userEntry.getKey());
-                        session.close();
-                    }
-                }
-            }
-        } catch (Exception e) {
-            Log.e(TAG, "Unable to get current state in cleanup()");
-        }
-
         // Authentication lifecycle is done
-        try {
-            Utils.waitForIdleService(this::getSensorStates);
-        } catch (Exception e) {
-            Log.e(TAG, "Exception when waiting for idle", e);
-        }
+        waitForIdleSensors();
 
         if (mWakeLock != null) {
             mWakeLock.release();
diff --git a/tests/framework/base/biometrics/src/android/server/biometrics/TestSessionList.java b/tests/framework/base/biometrics/src/android/server/biometrics/TestSessionList.java
new file mode 100644
index 0000000..7ff7431
--- /dev/null
+++ b/tests/framework/base/biometrics/src/android/server/biometrics/TestSessionList.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2022 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 android.server.biometrics;
+
+
+import android.hardware.biometrics.BiometricTestSession;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * List of sessions that will be closed after a test.
+ *
+ * Prefer to simply use a try block with a single session when possible.
+ */
+public class TestSessionList implements AutoCloseable {
+    private final BiometricTestBase mTest;
+    private final List<BiometricTestSession> mSessions = new ArrayList<>();
+    private final Map<Integer, BiometricTestSession> mSessionMap = new HashMap<>();
+
+    public TestSessionList(@NonNull BiometricTestBase test) {
+        mTest = test;
+    }
+
+    /** Add a session. */
+    public void add(@NonNull BiometricTestSession session) {
+        mSessions.add(session);
+    }
+
+    /** Add a session associated with a sensor id. */
+    public void put(int sensorId, @NonNull BiometricTestSession session) {
+        mSessions.add(session);
+        mSessionMap.put(sensorId, session);
+    }
+
+    /** The first session. */
+    @Nullable
+    public BiometricTestSession first() {
+        return mSessions.get(0);
+    }
+
+    /** The session associated with the id added with {@link #put(int, BiometricTestSession)}. */
+    @Nullable
+    public BiometricTestSession find(int sensorId) {
+        return mSessionMap.get(sensorId);
+    }
+
+    @Override
+    public void close() throws Exception {
+        for (BiometricTestSession session : mSessions) {
+            session.close();
+        }
+        mTest.waitForIdleSensors();
+    }
+}
diff --git a/tests/framework/base/biometrics/src/android/server/biometrics/Utils.java b/tests/framework/base/biometrics/src/android/server/biometrics/Utils.java
index 91e31ab..6dfcfdf 100644
--- a/tests/framework/base/biometrics/src/android/server/biometrics/Utils.java
+++ b/tests/framework/base/biometrics/src/android/server/biometrics/Utils.java
@@ -22,8 +22,8 @@
 import android.hardware.biometrics.BiometricManager;
 import android.hardware.biometrics.BiometricPrompt;
 import android.hardware.biometrics.SensorProperties;
-import android.os.SystemProperties;
 import android.os.ParcelFileDescriptor;
+import android.os.SystemProperties;
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyProperties;
 import android.server.wm.Condition;
@@ -66,7 +66,7 @@
      * @throws Exception
      */
     public static void waitForIdleService(@NonNull SensorStatesSupplier supplier) throws Exception {
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 20; i++) {
             if (!supplier.getSensorStates().areAllSensorsIdle()) {
                 Log.d(TAG, "Not idle yet..");
                 Thread.sleep(300);
diff --git a/tests/framework/base/locale/Android.bp b/tests/framework/base/locale/Android.bp
new file mode 100644
index 0000000..9ef1c9f
--- /dev/null
+++ b/tests/framework/base/locale/Android.bp
@@ -0,0 +1,50 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsLocaleManagerTestCases",
+    defaults: ["cts_defaults"],
+
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+
+    static_libs: [
+        "androidx.test.core",
+        "androidx.test.rules",
+        "compatibility-device-util-axt",
+        "ctstestrunner-axt",
+        "junit",
+        "cts-wm-util",
+        "cts-locale-util",
+    ],
+
+    srcs: [
+        "InstallerApp/**/*.java",
+        "TestApp/**/*.java",
+        "src/**/*.java",
+    ],
+
+    sdk_version: "test_current",
+}
diff --git a/tests/framework/base/locale/AndroidManifest.xml b/tests/framework/base/locale/AndroidManifest.xml
new file mode 100644
index 0000000..6839e33
--- /dev/null
+++ b/tests/framework/base/locale/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.localemanager.cts">
+
+  <!-- The permissions below would be needed if tests were not using "adopt shell permissions" to
+       obtain the necessary privileged permissions. -->
+  <!-- uses-permission android:name="android.permission.CHANGE_CONFIGURATION" /-->
+  <!-- uses-permission android:name="android.permission.READ_APP_SPECIFIC_LOCALES" /-->
+
+  <eat-comment/>
+
+  <application android:debuggable="true">
+    <uses-library android:name="android.test.runner"/>
+  </application>
+
+  <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+      android:targetPackage="android.localemanager.cts"
+      android:label="CTS tests for android.localemanager">
+    <meta-data android:name="listener"
+        android:value="com.android.cts.runner.CtsTestRunListener"/>
+  </instrumentation>
+
+</manifest>
+
diff --git a/tests/framework/base/locale/AndroidTest.xml b/tests/framework/base/locale/AndroidTest.xml
new file mode 100644
index 0000000..59845c5
--- /dev/null
+++ b/tests/framework/base/locale/AndroidTest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<configuration description="Config for Locale Manager test cases">
+  <option name="test-suite-tag" value="cts" />
+  <option name="config-descriptor:metadata" key="component" value="framework" />
+  <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+  <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+  <!--  LocaleManager APIs should work the same in any user. -->
+  <!--  While running with atest use 'user-type secondary_user'-->
+  <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+  <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
+  <option name="not-shardable" value="true" />
+  <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+    <option name="cleanup-apks" value="true" />
+    <option name="test-file-name" value="CtsLocaleManagerTestCases.apk" />
+    <option name="test-file-name" value="CtsLocaleTestApp.apk" />
+    <option name="test-file-name" value="CtsLocaleInstallerApp.apk" />
+  </target_preparer>
+  <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+    <option name="package" value="android.localemanager.cts" />
+    <option name="hidden-api-checks" value="false" />
+  </test>
+</configuration>
diff --git a/tests/framework/base/locale/InstallerApp/Android.bp b/tests/framework/base/locale/InstallerApp/Android.bp
new file mode 100644
index 0000000..c4ba522
--- /dev/null
+++ b/tests/framework/base/locale/InstallerApp/Android.bp
@@ -0,0 +1,41 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsLocaleInstallerApp",
+    defaults: ["cts_defaults"],
+
+    static_libs: [
+        "cts-locale-util",
+    ],
+
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+
+    srcs: ["src/**/*.java"],
+
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+
+    sdk_version: "system_current",
+}
diff --git a/tests/framework/base/locale/InstallerApp/AndroidManifest.xml b/tests/framework/base/locale/InstallerApp/AndroidManifest.xml
new file mode 100644
index 0000000..67f2d22
--- /dev/null
+++ b/tests/framework/base/locale/InstallerApp/AndroidManifest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.localemanager.cts.installer">
+  <application>
+    <uses-library android:name="android.test.runner"/>
+    <activity android:name=".MainActivity"
+              android:label="MainActivity"
+              android:exported="true" >
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+      </intent-filter>
+    </activity>
+    <receiver android:name="android.localemanager.cts.installer.InstallerBroadcastReceiver"  android:exported="true" android:enabled="true">
+      <intent-filter>
+        <action android:name="android.intent.action.APPLICATION_LOCALE_CHANGED"/>
+        <action android:name="any.action"/>
+      </intent-filter>
+    </receiver>
+  </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/framework/base/locale/InstallerApp/src/android/localemanager/cts/installer/InstallerBroadcastReceiver.java b/tests/framework/base/locale/InstallerApp/src/android/localemanager/cts/installer/InstallerBroadcastReceiver.java
new file mode 100644
index 0000000..98c5ab1
--- /dev/null
+++ b/tests/framework/base/locale/InstallerApp/src/android/localemanager/cts/installer/InstallerBroadcastReceiver.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 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 android.localemanager.cts.installer;
+
+import static android.localemanager.cts.util.LocaleConstants.INSTALLER_APP_BROADCAST_INFO_PROVIDER_ACTION;
+import static android.localemanager.cts.util.LocaleUtils.constructResultIntent;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * A broadcast receiver that listens to
+ * {@link android.content.Intent#ACTION_APPLICATION_LOCALE_CHANGED}
+ * when it is the installer of the app whose locale has changed.
+ */
+public class InstallerBroadcastReceiver extends BroadcastReceiver{
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        // Upon successful receipt of broadcast, send back the response to the test which
+        // invoked the change, so that it can verify correctness.
+        if (Intent.ACTION_APPLICATION_LOCALE_CHANGED.equals(intent.getAction())) {
+            context.sendBroadcast(constructResultIntent(
+                    INSTALLER_APP_BROADCAST_INFO_PROVIDER_ACTION, intent));
+        }
+    }
+}
diff --git a/tests/framework/base/locale/InstallerApp/src/android/localemanager/cts/installer/MainActivity.java b/tests/framework/base/locale/InstallerApp/src/android/localemanager/cts/installer/MainActivity.java
new file mode 100644
index 0000000..9e25206
--- /dev/null
+++ b/tests/framework/base/locale/InstallerApp/src/android/localemanager/cts/installer/MainActivity.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 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 android.localemanager.cts.installer;
+
+import static android.localemanager.cts.util.LocaleConstants.EXTRA_QUERY_LOCALES;
+import static android.localemanager.cts.util.LocaleConstants.INSTALLER_APP_CREATION_INFO_PROVIDER_ACTION;
+import static android.localemanager.cts.util.LocaleUtils.constructResultIntent;
+
+import android.app.Activity;
+import android.app.LocaleManager;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.LocaleList;
+
+import androidx.annotation.Nullable;
+
+/**
+ * An activity used by {@link LocaleManagerTests} to query locales for a given package
+ * when this app is set as the installer of the given package.
+ */
+public class MainActivity extends Activity {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        if (intent != null && intent.hasExtra(EXTRA_QUERY_LOCALES)) {
+            LocaleManager localeManager = getSystemService(LocaleManager.class);
+            String packageName = intent.getStringExtra(EXTRA_QUERY_LOCALES);
+            LocaleList locales = localeManager.getApplicationLocales(packageName);
+            sendBroadcast(constructResultIntent(INSTALLER_APP_CREATION_INFO_PROVIDER_ACTION,
+                    packageName, locales));
+            finish();
+        }
+    }
+}
diff --git a/tests/framework/base/locale/OWNERS b/tests/framework/base/locale/OWNERS
new file mode 100644
index 0000000..694a4ac
--- /dev/null
+++ b/tests/framework/base/locale/OWNERS
@@ -0,0 +1,3 @@
+# Bug template url: https://b.corp.google.com/issues/new?component=1082762&template=1601534
+pratyushmore@google.com
+goldmanj@google.com
\ No newline at end of file
diff --git a/tests/framework/base/locale/TEST_MAPPING b/tests/framework/base/locale/TEST_MAPPING
new file mode 100644
index 0000000..b99b3f2
--- /dev/null
+++ b/tests/framework/base/locale/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  // TODO(b/225192026): Move back to presubmit after b/225192026 is fixed
+  "postsubmit": [
+    {
+      "name": "CtsLocaleManagerTestCases"
+    }
+  ]
+}
diff --git a/tests/framework/base/locale/TestApp/Android.bp b/tests/framework/base/locale/TestApp/Android.bp
new file mode 100644
index 0000000..db1c0bf
--- /dev/null
+++ b/tests/framework/base/locale/TestApp/Android.bp
@@ -0,0 +1,42 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsLocaleTestApp",
+    defaults: ["cts_defaults"],
+
+    static_libs: [
+        "cts-locale-util",
+    ],
+
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+
+    srcs: ["src/**/*.java"],
+
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+
+    sdk_version: "system_current",
+
+}
diff --git a/tests/framework/base/locale/TestApp/AndroidManifest.xml b/tests/framework/base/locale/TestApp/AndroidManifest.xml
new file mode 100644
index 0000000..cc3f17a
--- /dev/null
+++ b/tests/framework/base/locale/TestApp/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.localemanager.cts.app">
+
+  <application>
+    <uses-library android:name="android.test.runner"/>
+
+    <activity android:name=".MainActivity"
+        android:label="MainActivity"
+        android:exported="true"
+        android:configChanges="locale|layoutDirection|screenLayout">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+      </intent-filter>
+      <intent-filter>
+        <action android:name="any.action"/>
+      </intent-filter>
+    </activity>
+
+    <receiver android:name="android.localemanager.cts.app.TestBroadcastReceiver"  android:exported="true" android:enabled="true">
+      <intent-filter>
+        <action android:name="android.intent.action.LOCALE_CHANGED"/>
+      </intent-filter>
+    </receiver>
+  </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/framework/base/locale/TestApp/src/android/localemanager/cts/app/MainActivity.java b/tests/framework/base/locale/TestApp/src/android/localemanager/cts/app/MainActivity.java
new file mode 100644
index 0000000..5182515
--- /dev/null
+++ b/tests/framework/base/locale/TestApp/src/android/localemanager/cts/app/MainActivity.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2021 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 android.localemanager.cts.app;
+
+import static android.localemanager.cts.util.LocaleConstants.EXTRA_QUERY_LOCALES;
+import static android.localemanager.cts.util.LocaleConstants.EXTRA_SET_LOCALES;
+import static android.localemanager.cts.util.LocaleConstants.TEST_APP_CONFIG_CHANGED_INFO_PROVIDER_ACTION;
+import static android.localemanager.cts.util.LocaleConstants.TEST_APP_CREATION_INFO_PROVIDER_ACTION;
+import static android.localemanager.cts.util.LocaleConstants.TEST_APP_PACKAGE;
+import static android.localemanager.cts.util.LocaleUtils.constructResultIntent;
+
+import android.app.Activity;
+import android.app.LocaleManager;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.os.LocaleList;
+
+import androidx.annotation.Nullable;
+
+/**
+ * This app is used as an external package to test system api
+ * {@link LocaleManager#setApplicationLocales(String, LocaleList)}
+ *
+ * <p> This activity is invoked by the {@link LocaleManagerTests} for below reasons:
+ * <ul>
+ * <li> To keep the app in the foreground/background.
+ * <li> To query locales in the running activity on app restart.
+ * </ul>
+ */
+public class MainActivity extends Activity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = getIntent();
+        if (intent != null && intent.hasExtra(EXTRA_QUERY_LOCALES)) {
+            // This intent extra is sent by app for restarting the app.
+            // Upon app restart, we want to check that the correct locales are received.
+            // So fetch the locales and send them to the calling test for verification.
+            LocaleManager localeManager = getSystemService(LocaleManager.class);
+            LocaleList locales = localeManager.getApplicationLocales();
+
+            // Send back the response with package name of this app and the locales fetched
+            // in current activity to the calling test.
+            sendBroadcast(constructResultIntent(TEST_APP_CREATION_INFO_PROVIDER_ACTION,
+                    TEST_APP_PACKAGE, locales));
+            finish();
+        } else if (intent != null && intent.hasExtra(EXTRA_SET_LOCALES)) {
+            // The invoking test directed us to set our application locales to the specified value
+            LocaleManager localeManager = getSystemService(LocaleManager.class);
+            localeManager.setApplicationLocales(LocaleList.forLanguageTags(
+                    intent.getStringExtra(EXTRA_SET_LOCALES)));
+            finish();
+        }
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        LocaleList locales = newConfig.getLocales();
+
+        // Send back the received locales to the test for correctness assertion
+        sendBroadcast(constructResultIntent(TEST_APP_CONFIG_CHANGED_INFO_PROVIDER_ACTION,
+                TEST_APP_PACKAGE, locales));
+        finish();
+    }
+}
diff --git a/tests/framework/base/locale/TestApp/src/android/localemanager/cts/app/TestBroadcastReceiver.java b/tests/framework/base/locale/TestApp/src/android/localemanager/cts/app/TestBroadcastReceiver.java
new file mode 100644
index 0000000..a68d3af
--- /dev/null
+++ b/tests/framework/base/locale/TestApp/src/android/localemanager/cts/app/TestBroadcastReceiver.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2021 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 android.localemanager.cts.app;
+
+import static android.localemanager.cts.util.LocaleConstants.TEST_APP_BROADCAST_INFO_PROVIDER_ACTION;
+import static android.localemanager.cts.util.LocaleUtils.constructResultIntent;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+/**
+ * A broadcast receiver that listens to {@link android.content.Intent#ACTION_LOCALE_CHANGED}
+ * when the locale for this app is changed by the test.
+ */
+public class TestBroadcastReceiver extends BroadcastReceiver{
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+
+        // Upon successful receipt of broadcast, send back the response to the test which invoked
+        // the change, so that it can verify correctness.
+        if (Intent.ACTION_LOCALE_CHANGED.equals(intent.getAction())) {
+            context.sendBroadcast(constructResultIntent(TEST_APP_BROADCAST_INFO_PROVIDER_ACTION,
+                    intent));
+        }
+    }
+}
diff --git a/tests/framework/base/locale/src/android/localemanager/cts/BlockingBroadcastReceiver.java b/tests/framework/base/locale/src/android/localemanager/cts/BlockingBroadcastReceiver.java
new file mode 100644
index 0000000..ee63fe2
--- /dev/null
+++ b/tests/framework/base/locale/src/android/localemanager/cts/BlockingBroadcastReceiver.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2021 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 android.localemanager.cts;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.LocaleList;
+
+import org.junit.Assert;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Used to dynamically register a receiver in instrumentation test.
+ *
+ * <p>This is used to listen to the following:
+ * <ul>
+ * <li> Broadcasts sent to the current app instrumenting the test. The broadcast is sent by the
+ * service being tested.
+ * <li> Response sent by other apps(TestApp, InstallerApp) to the tests.
+ * </ul>
+ */
+public class BlockingBroadcastReceiver extends BroadcastReceiver {
+    private CountDownLatch mLatch = new CountDownLatch(1);
+    private String mPackageName;
+    private LocaleList mLocales;
+    private int mCalls;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (intent.hasExtra(Intent.EXTRA_PACKAGE_NAME)) {
+            mPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+        }
+        if (intent.hasExtra(Intent.EXTRA_LOCALE_LIST)) {
+            mLocales = intent.getParcelableExtra(Intent.EXTRA_LOCALE_LIST);
+        }
+        mCalls += 1;
+        mLatch.countDown();
+    }
+
+    public String getPackageName() {
+        return mPackageName;
+    }
+
+    public LocaleList getLocales() {
+        return mLocales;
+    }
+
+    public void await() throws Exception {
+        mLatch.await(5, TimeUnit.SECONDS);
+    }
+
+    public void reset() {
+        mLatch = new CountDownLatch(1);
+        mCalls = 0;
+        mPackageName = null;
+        mLocales = null;
+    }
+
+    /**
+     * Waits for a while and checks no broadcasts are received.
+     */
+    public void assertNoBroadcastReceived() throws Exception {
+        await();
+        Assert.assertEquals(0, mCalls);
+    }
+}
diff --git a/tests/framework/base/locale/src/android/localemanager/cts/LocaleManagerSystemLocaleTest.java b/tests/framework/base/locale/src/android/localemanager/cts/LocaleManagerSystemLocaleTest.java
new file mode 100644
index 0000000..fb97787
--- /dev/null
+++ b/tests/framework/base/locale/src/android/localemanager/cts/LocaleManagerSystemLocaleTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2022 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 android.localemanager.cts;
+
+import static android.localemanager.cts.util.LocaleConstants.DEFAULT_APP_LOCALES;
+import static android.localemanager.cts.util.LocaleConstants.DEFAULT_SYSTEM_LOCALES;
+
+import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
+
+import static org.junit.Assert.assertEquals;
+
+import android.Manifest;
+import android.app.LocaleManager;
+import android.content.Context;
+import android.os.LocaleList;
+import android.server.wm.ActivityManagerTestBase;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link android.app.LocaleManager} API(s) related to system locales.
+ *
+ * Build/Install/Run: atest CtsLocaleManagerTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class LocaleManagerSystemLocaleTest extends ActivityManagerTestBase {
+    private static Context sContext;
+    private static LocaleManager sLocaleManager;
+
+    /* System locales that were set on the device prior to running tests */
+    private static LocaleList sPreviousSystemLocales;
+
+    @BeforeClass
+    public static void setUpClass() {
+        sContext = InstrumentationRegistry.getTargetContext();
+        sLocaleManager = sContext.getSystemService(LocaleManager.class);
+
+        // Set custom system locales for these tests.
+        // Store the existing system locales and reset back to it in tearDown.
+        sPreviousSystemLocales = sLocaleManager.getSystemLocales();
+        runWithShellPermissionIdentity(() ->
+                        sLocaleManager.setSystemLocales(DEFAULT_SYSTEM_LOCALES),
+                Manifest.permission.CHANGE_CONFIGURATION, Manifest.permission.WRITE_SETTINGS);
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        runWithShellPermissionIdentity(() ->
+                        sLocaleManager.setSystemLocales(sPreviousSystemLocales),
+                Manifest.permission.CHANGE_CONFIGURATION, Manifest.permission.WRITE_SETTINGS);
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        // Unlocks the device if locked, since we have tests where the app/activity needs
+        // to be in the foreground/background.
+        super.setUp();
+
+        // Reset locales for the calling app.
+        sLocaleManager.setApplicationLocales(LocaleList.getEmptyLocaleList());
+    }
+
+    @Test
+    public void testGetSystemLocales_noAppLocaleSet_returnsCorrectList()
+            throws Exception {
+        assertEquals(DEFAULT_SYSTEM_LOCALES, sLocaleManager.getSystemLocales());
+    }
+
+    @Test
+    public void testGetSystemLocales_appLocaleSet_returnsCorrectList()
+            throws Exception {
+        sLocaleManager.setApplicationLocales(DEFAULT_APP_LOCALES);
+        assertLocalesCorrectlySetForCallingApp(DEFAULT_APP_LOCALES);
+
+        // ensure that getSystemLocales still returns the system locales
+        assertEquals(DEFAULT_SYSTEM_LOCALES, sLocaleManager.getSystemLocales());
+    }
+
+
+    /**
+     * Verifies that the locales are correctly set for calling(instrumentation) app
+     * by fetching the locales of the app with a binder call.
+     */
+    private void assertLocalesCorrectlySetForCallingApp(LocaleList expectedLocales) {
+        assertEquals(expectedLocales, sLocaleManager.getApplicationLocales());
+    }
+
+}
diff --git a/tests/framework/base/locale/src/android/localemanager/cts/LocaleManagerTests.java b/tests/framework/base/locale/src/android/localemanager/cts/LocaleManagerTests.java
new file mode 100644
index 0000000..23143fc
--- /dev/null
+++ b/tests/framework/base/locale/src/android/localemanager/cts/LocaleManagerTests.java
@@ -0,0 +1,545 @@
+/*
+ * Copyright (C) 2021 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 android.localemanager.cts;
+
+import static android.localemanager.cts.util.LocaleConstants.CALLING_PACKAGE;
+import static android.localemanager.cts.util.LocaleConstants.DEFAULT_APP_LOCALES;
+import static android.localemanager.cts.util.LocaleConstants.DEFAULT_SYSTEM_LOCALES;
+import static android.localemanager.cts.util.LocaleConstants.EXTRA_QUERY_LOCALES;
+import static android.localemanager.cts.util.LocaleConstants.EXTRA_SET_LOCALES;
+import static android.localemanager.cts.util.LocaleConstants.INSTALLER_APP_BROADCAST_INFO_PROVIDER_ACTION;
+import static android.localemanager.cts.util.LocaleConstants.INSTALLER_APP_BROADCAST_RECEIVER;
+import static android.localemanager.cts.util.LocaleConstants.INSTALLER_APP_CREATION_INFO_PROVIDER_ACTION;
+import static android.localemanager.cts.util.LocaleConstants.INSTALLER_APP_MAIN_ACTIVITY;
+import static android.localemanager.cts.util.LocaleConstants.INSTALLER_PACKAGE;
+import static android.localemanager.cts.util.LocaleConstants.TEST_APP_BROADCAST_INFO_PROVIDER_ACTION;
+import static android.localemanager.cts.util.LocaleConstants.TEST_APP_BROADCAST_RECEIVER;
+import static android.localemanager.cts.util.LocaleConstants.TEST_APP_CONFIG_CHANGED_INFO_PROVIDER_ACTION;
+import static android.localemanager.cts.util.LocaleConstants.TEST_APP_CREATION_INFO_PROVIDER_ACTION;
+import static android.localemanager.cts.util.LocaleConstants.TEST_APP_MAIN_ACTIVITY;
+import static android.localemanager.cts.util.LocaleConstants.TEST_APP_PACKAGE;
+import static android.server.wm.CliIntentExtra.extraString;
+
+import static com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity;
+import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.LocaleManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.LocaleList;
+import android.server.wm.ActivityManagerTestBase;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.AmUtils;
+import com.android.compatibility.common.util.ShellIdentityUtils;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Locale;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests for {@link android.app.LocaleManager} API(s).
+ *
+ * Build/Install/Run: atest CtsLocaleManagerTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class LocaleManagerTests extends ActivityManagerTestBase {
+    private static Context sContext;
+    private static LocaleManager sLocaleManager;
+
+    /* System locales that were set on the device prior to running tests */
+    private static LocaleList sPreviousSystemLocales;
+
+    /* Receiver to listen to the broadcast in the calling (instrumentation) app. */
+    private BlockingBroadcastReceiver mCallingAppBroadcastReceiver;
+
+    /* Receiver to listen to the response from the test app's broadcast receiver. */
+    private BlockingBroadcastReceiver mTestAppBroadcastInfoProvider;
+
+    /* Receiver to listen to the response from the test app's activity. */
+    private BlockingBroadcastReceiver mTestAppCreationInfoProvider;
+
+    /* Receiver to listen to the response from the test app's onConfigChanged method. */
+    private BlockingBroadcastReceiver mTestAppConfigChangedInfoProvider;
+
+    /* Receiver to listen to the response from the installer app. */
+    private BlockingBroadcastReceiver mInstallerBroadcastInfoProvider;
+
+    /* Receiver to listen to the response from the installer app's activity. */
+    private BlockingBroadcastReceiver mInstallerAppCreationInfoProvider;
+
+    @BeforeClass
+    public static void setUpClass() {
+        sContext = InstrumentationRegistry.getTargetContext();
+        sLocaleManager = sContext.getSystemService(LocaleManager.class);
+
+        sPreviousSystemLocales = sLocaleManager.getSystemLocales();
+        runWithShellPermissionIdentity(() ->
+                        sLocaleManager.setSystemLocales(DEFAULT_SYSTEM_LOCALES),
+                Manifest.permission.CHANGE_CONFIGURATION, Manifest.permission.WRITE_SETTINGS);
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+        runWithShellPermissionIdentity(() ->
+                        sLocaleManager.setSystemLocales(sPreviousSystemLocales),
+                Manifest.permission.CHANGE_CONFIGURATION, Manifest.permission.WRITE_SETTINGS);
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        // Unlocks the device if locked, since we have tests where the app/activity needs
+        // to be in the foreground/background.
+        super.setUp();
+
+        resetAppLocalesAsEmpty();
+        AmUtils.waitForBroadcastIdle();
+
+        mCallingAppBroadcastReceiver = new BlockingBroadcastReceiver();
+        mTestAppBroadcastInfoProvider = new BlockingBroadcastReceiver();
+        mInstallerBroadcastInfoProvider = new BlockingBroadcastReceiver();
+        mTestAppCreationInfoProvider = new BlockingBroadcastReceiver();
+        mTestAppConfigChangedInfoProvider = new BlockingBroadcastReceiver();
+        mInstallerAppCreationInfoProvider = new BlockingBroadcastReceiver();
+
+        sContext.registerReceiver(mCallingAppBroadcastReceiver,
+                new IntentFilter(Intent.ACTION_LOCALE_CHANGED));
+        sContext.registerReceiver(mTestAppBroadcastInfoProvider,
+                new IntentFilter(TEST_APP_BROADCAST_INFO_PROVIDER_ACTION));
+        sContext.registerReceiver(mInstallerBroadcastInfoProvider,
+                new IntentFilter(INSTALLER_APP_BROADCAST_INFO_PROVIDER_ACTION));
+        sContext.registerReceiver(mTestAppCreationInfoProvider,
+                new IntentFilter(TEST_APP_CREATION_INFO_PROVIDER_ACTION));
+        sContext.registerReceiver(mTestAppConfigChangedInfoProvider,
+                new IntentFilter(TEST_APP_CONFIG_CHANGED_INFO_PROVIDER_ACTION));
+        sContext.registerReceiver(mInstallerAppCreationInfoProvider,
+                new IntentFilter(INSTALLER_APP_CREATION_INFO_PROVIDER_ACTION));
+
+        setInstallerForPackage(CALLING_PACKAGE);
+        setInstallerForPackage(TEST_APP_PACKAGE);
+
+        bindToBroadcastReceiverOfApp(TEST_APP_PACKAGE, TEST_APP_BROADCAST_RECEIVER);
+        bindToBroadcastReceiverOfApp(INSTALLER_PACKAGE, INSTALLER_APP_BROADCAST_RECEIVER);
+
+        resetReceivers();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        unRegisterReceiver(mCallingAppBroadcastReceiver);
+        unRegisterReceiver(mTestAppBroadcastInfoProvider);
+        unRegisterReceiver(mInstallerBroadcastInfoProvider);
+        unRegisterReceiver(mTestAppCreationInfoProvider);
+        unRegisterReceiver(mInstallerAppCreationInfoProvider);
+    }
+
+    private void unRegisterReceiver(BlockingBroadcastReceiver receiver) {
+        if (receiver != null) {
+            sContext.unregisterReceiver(receiver);
+            receiver = null;
+        }
+    }
+
+    /**
+     * Send broadcast to given app's receiver with flag {@link Intent#FLAG_INCLUDE_STOPPED_PACKAGES}
+     * and wait for it to be received.
+     *
+     * <p/> This is required since app is in stopped state after installation by tradefed,
+     * and the receivers in another apps don't receive the broadcast without
+     * FLAG_INCLUDE_STOPPED_PACKAGES because they have never been opened even once
+     * after installation.
+     * By doing this we make sure that app is un-stopped when the system sends the broadcasts
+     * in the tests.
+     */
+    private void bindToBroadcastReceiverOfApp(String packageName, String broadcastReceiver) {
+        final Intent intent = new Intent()
+                .setComponent(new ComponentName(packageName, broadcastReceiver))
+                .setFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
+        CountDownLatch latch = new CountDownLatch(1);
+        sContext.sendOrderedBroadcast(
+                intent,
+                null /* receiverPermission */,
+                new BroadcastReceiver() { /* resultReceiver */
+                    @Override public void onReceive(Context context, Intent intent) {
+                        latch.countDown();
+                    }
+                },
+                null /* scheduler */,
+                Activity.RESULT_OK, /* initialCode */
+                null /* initialData */,
+                null /* initialExtras */);
+        try {
+            assertTrue("Timed out waiting for test broadcast to be received",
+                    latch.await(5_000, TimeUnit.MILLISECONDS));
+        } catch (InterruptedException e) {
+            throw new IllegalStateException("Interrupted", e);
+        }
+    }
+
+    /**
+     * Sets the installer as {@link #INSTALLER_PACKAGE} for the target package.
+     */
+    private void setInstallerForPackage(String targetPackageName) {
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(sContext.getPackageManager(),
+                (pm) -> pm.setInstallerPackageName(targetPackageName, INSTALLER_PACKAGE));
+    }
+
+    /**
+     * Resets the countdown latch in all the receivers.
+     */
+    private void resetReceivers() {
+        mCallingAppBroadcastReceiver.reset();
+        mInstallerBroadcastInfoProvider.reset();
+        mTestAppBroadcastInfoProvider.reset();
+        mTestAppCreationInfoProvider.reset();
+        mTestAppConfigChangedInfoProvider.reset();
+        mInstallerAppCreationInfoProvider.reset();
+    }
+
+    @Test
+    public void testSetApplicationLocales_persistsAndSendsBroadcast() throws Exception {
+        sLocaleManager.setApplicationLocales(DEFAULT_APP_LOCALES);
+
+        assertLocalesCorrectlySetForCallingApp(DEFAULT_APP_LOCALES);
+        mCallingAppBroadcastReceiver.await();
+        assertReceivedBroadcastContains(mCallingAppBroadcastReceiver,
+                CALLING_PACKAGE, DEFAULT_APP_LOCALES);
+
+        mInstallerBroadcastInfoProvider.await();
+        assertReceivedBroadcastContains(mInstallerBroadcastInfoProvider,
+                CALLING_PACKAGE, DEFAULT_APP_LOCALES);
+    }
+
+    @Test
+    public void testSetApplicationLocales_resetToEmptyLocales_persistsAndSendsBroadcast()
+            throws Exception {
+        // First set the locales to non-empty
+        sLocaleManager.setApplicationLocales(DEFAULT_APP_LOCALES);
+        assertLocalesCorrectlySetForCallingApp(DEFAULT_APP_LOCALES);
+        mCallingAppBroadcastReceiver.await();
+        assertReceivedBroadcastContains(mCallingAppBroadcastReceiver,
+                CALLING_PACKAGE, DEFAULT_APP_LOCALES);
+        mCallingAppBroadcastReceiver.reset();
+
+        sLocaleManager.setApplicationLocales(LocaleList.getEmptyLocaleList());
+
+        assertLocalesCorrectlySetForCallingApp(LocaleList.getEmptyLocaleList());
+        mCallingAppBroadcastReceiver.await();
+        assertReceivedBroadcastContains(mCallingAppBroadcastReceiver,
+                CALLING_PACKAGE, LocaleList.getEmptyLocaleList());
+    }
+
+    @Test
+    public void testSetApplicationLocales_sameLocalesEmpty_noBroadcastSent() throws Exception {
+        // At the start of the test, no app-specific locales are set, so just try to set it to
+        //   empty again
+        sLocaleManager.setApplicationLocales(LocaleList.getEmptyLocaleList());
+
+        assertLocalesCorrectlySetForCallingApp(LocaleList.getEmptyLocaleList());
+        mCallingAppBroadcastReceiver.assertNoBroadcastReceived();
+    }
+
+    @Test
+    public void testSetApplicationLocales_sameLocalesNonEmpty_noBroadcastSent() throws Exception {
+        // First set the locales to non-empty
+        sLocaleManager.setApplicationLocales(DEFAULT_APP_LOCALES);
+        assertLocalesCorrectlySetForCallingApp(DEFAULT_APP_LOCALES);
+        mCallingAppBroadcastReceiver.await();
+        assertReceivedBroadcastContains(mCallingAppBroadcastReceiver,
+                CALLING_PACKAGE, DEFAULT_APP_LOCALES);
+        mCallingAppBroadcastReceiver.reset();
+
+        // Then reset to the same app-specific locales, and verify no broadcasts are sent
+        sLocaleManager.setApplicationLocales(DEFAULT_APP_LOCALES);
+
+        assertLocalesCorrectlySetForCallingApp(DEFAULT_APP_LOCALES);
+        mCallingAppBroadcastReceiver.assertNoBroadcastReceived();
+    }
+
+    @Test
+    public void testSetApplicationLocales_getDefaultLocaleList_returnsCorrectList()
+            throws Exception {
+        // Fetch the current system locales when there are no app-locales set.
+        LocaleList systemLocales = LocaleList.getDefault();
+        assertEquals(DEFAULT_SYSTEM_LOCALES, systemLocales);
+
+        sLocaleManager.setApplicationLocales(DEFAULT_APP_LOCALES);
+
+        // Wait for a while since LocaleList::getDefault could take a while to
+        // reflect the new app locales.
+        mCallingAppBroadcastReceiver.await();
+        assertEquals(combineLocales(DEFAULT_APP_LOCALES, systemLocales), LocaleList.getDefault());
+    }
+
+    @Test
+    public void testSetApplicationLocales_forAnotherAppInForeground_persistsAndSendsBroadcast()
+            throws Exception {
+        // Bring the TestApp to the foreground by invoking an activity and verify its visibility.
+        launchActivity(TEST_APP_MAIN_ACTIVITY);
+        mWmState.assertVisibility(TEST_APP_MAIN_ACTIVITY, /* visible*/ true);
+
+        runWithShellPermissionIdentity(() ->
+                        sLocaleManager.setApplicationLocales(TEST_APP_PACKAGE, DEFAULT_APP_LOCALES),
+                Manifest.permission.CHANGE_CONFIGURATION);
+        assertLocalesCorrectlySetForAnotherApp(TEST_APP_PACKAGE, DEFAULT_APP_LOCALES);
+
+        mTestAppBroadcastInfoProvider.await();
+        assertReceivedBroadcastContains(mTestAppBroadcastInfoProvider, TEST_APP_PACKAGE,
+                DEFAULT_APP_LOCALES);
+
+        mInstallerBroadcastInfoProvider.await();
+        assertReceivedBroadcastContains(mInstallerBroadcastInfoProvider, TEST_APP_PACKAGE,
+                DEFAULT_APP_LOCALES);
+    }
+
+    @Test
+    public void testSetApplicationLocales_forAnotherAppInBackground_persistsAndSendsBroadcast()
+            throws Exception {
+        // Invoke the app by launching an activity.
+        launchActivity(TEST_APP_MAIN_ACTIVITY);
+        // Send the TestApp to the background.
+        launchHomeActivity();
+        mWmState.waitAndAssertVisibilityGone(TEST_APP_MAIN_ACTIVITY);
+
+        runWithShellPermissionIdentity(() ->
+                        sLocaleManager.setApplicationLocales(TEST_APP_PACKAGE, DEFAULT_APP_LOCALES),
+                Manifest.permission.CHANGE_CONFIGURATION);
+
+        assertLocalesCorrectlySetForAnotherApp(TEST_APP_PACKAGE, DEFAULT_APP_LOCALES);
+
+        mTestAppBroadcastInfoProvider.await();
+        assertReceivedBroadcastContains(mTestAppBroadcastInfoProvider, TEST_APP_PACKAGE,
+                DEFAULT_APP_LOCALES);
+
+        mInstallerBroadcastInfoProvider.await();
+        assertReceivedBroadcastContains(mInstallerBroadcastInfoProvider, TEST_APP_PACKAGE,
+                DEFAULT_APP_LOCALES);
+    }
+
+    @Test
+    public void testSetApplicationLocales_forAnotherApp_persistsOnAppRestart() throws Exception {
+        runWithShellPermissionIdentity(() ->
+                        sLocaleManager.setApplicationLocales(TEST_APP_PACKAGE, DEFAULT_APP_LOCALES),
+                Manifest.permission.CHANGE_CONFIGURATION);
+
+        // Re-start the app by starting an activity and check if locales correctly
+        // received by the app and listen to the broadcast for result from the app.
+        launchActivity(TEST_APP_MAIN_ACTIVITY, extraString(EXTRA_QUERY_LOCALES, "true"));
+
+        mTestAppCreationInfoProvider.await();
+        assertReceivedBroadcastContains(mTestAppCreationInfoProvider, TEST_APP_PACKAGE,
+                DEFAULT_APP_LOCALES);
+    }
+
+    @Test
+    public void
+            testSetApplicationLocales_wthoutPermissionforAnotherApp_throwsExceptionAndNoBroadcast()
+            throws Exception {
+        try {
+            sLocaleManager.setApplicationLocales(TEST_APP_PACKAGE, DEFAULT_APP_LOCALES);
+        } catch (SecurityException e) {
+            // expected as not having appropriate permission to change locales for another app.
+        }
+
+        // Since the locales weren't allowed to persist, no broadcasts should be sent by the system.
+        mTestAppBroadcastInfoProvider.assertNoBroadcastReceived();
+        mInstallerBroadcastInfoProvider.assertNoBroadcastReceived();
+    }
+
+    @Test
+    public void testSetApplicationLocales_forAnotherAppInForeground_callsOnConfigChanged()
+            throws Exception {
+        // Bring the TestApp to the foreground by invoking an activity and verify its visibility.
+        launchActivity(TEST_APP_MAIN_ACTIVITY);
+        mWmState.assertVisibility(TEST_APP_MAIN_ACTIVITY, /* visible*/ true);
+
+        runWithShellPermissionIdentity(() ->
+                        sLocaleManager.setApplicationLocales(TEST_APP_PACKAGE, DEFAULT_APP_LOCALES),
+                Manifest.permission.CHANGE_CONFIGURATION);
+        assertLocalesCorrectlySetForAnotherApp(TEST_APP_PACKAGE, DEFAULT_APP_LOCALES);
+
+        mTestAppConfigChangedInfoProvider.await();
+        assertReceivedBroadcastContains(mTestAppConfigChangedInfoProvider, TEST_APP_PACKAGE,
+                combineLocales(DEFAULT_APP_LOCALES, DEFAULT_SYSTEM_LOCALES));
+    }
+
+    @Test
+    public void testSetApplicationLocales_withReadAppSpecificLocalesPermission_receivesBroadcast()
+            throws Exception {
+
+        BlockingBroadcastReceiver appSpecificLocaleBroadcastReceiver =
+                new BlockingBroadcastReceiver();
+        sContext.registerReceiver(appSpecificLocaleBroadcastReceiver,
+                new IntentFilter(Intent.ACTION_APPLICATION_LOCALE_CHANGED));
+
+        // Hold Manifest.permission.READ_APP_SPECIFIC_LOCALES while the broadcast is sent,
+        //   so that we receive it
+        runWithShellPermissionIdentity(() -> {
+            // Tell the test app to change its app-specific locales
+            launchActivity(TEST_APP_MAIN_ACTIVITY, extraString(EXTRA_SET_LOCALES,
+                    DEFAULT_APP_LOCALES.toLanguageTags()));
+            assertLocalesCorrectlySetForAnotherApp(TEST_APP_PACKAGE, DEFAULT_APP_LOCALES);
+
+            appSpecificLocaleBroadcastReceiver.await();
+        }, Manifest.permission.READ_APP_SPECIFIC_LOCALES);
+
+        assertReceivedBroadcastContains(appSpecificLocaleBroadcastReceiver,
+                TEST_APP_PACKAGE, DEFAULT_APP_LOCALES);
+    }
+
+
+    @Test
+    public void testSetApplicationLocales_appWithoutPermission_noBroadcastsReceived()
+            throws Exception {
+
+        BlockingBroadcastReceiver appSpecificLocaleBroadcastReceiver =
+                new BlockingBroadcastReceiver();
+        sContext.registerReceiver(appSpecificLocaleBroadcastReceiver,
+                new IntentFilter(Intent.ACTION_APPLICATION_LOCALE_CHANGED));
+
+        // Tell the test app to change its app-specific locales
+        launchActivity(TEST_APP_MAIN_ACTIVITY, extraString(EXTRA_SET_LOCALES,
+                DEFAULT_APP_LOCALES.toLanguageTags()));
+        assertLocalesCorrectlySetForAnotherApp(TEST_APP_PACKAGE, DEFAULT_APP_LOCALES);
+
+        // Ensure that no broadcasts were received since the change was for another app (the Test
+        //   App) and we are neither the Test App's installer, nor do we hold
+        //   Manifest.permission.READ_APP_SPECIFIC_LOCALES
+        appSpecificLocaleBroadcastReceiver.assertNoBroadcastReceived();
+        mCallingAppBroadcastReceiver.assertNoBroadcastReceived();
+    }
+
+    @Test
+    public void testGetApplicationLocales_callerIsInstaller_returnsLocales() throws Exception {
+        // Set locales for calling app
+        sLocaleManager.setApplicationLocales(DEFAULT_APP_LOCALES);
+
+        // Make sure that locales were set for the app.
+        assertLocalesCorrectlySetForCallingApp(DEFAULT_APP_LOCALES);
+        // Tell the installer app to fetch locales for calling package.
+        launchActivity(INSTALLER_APP_MAIN_ACTIVITY,
+                extraString(EXTRA_QUERY_LOCALES, CALLING_PACKAGE));
+
+        mInstallerAppCreationInfoProvider.await();
+        assertReceivedBroadcastContains(mInstallerAppCreationInfoProvider,
+                CALLING_PACKAGE, DEFAULT_APP_LOCALES);
+    }
+
+    @Test(expected = SecurityException.class)
+    public void testGetApplicationLocales_withoutPermissionforAnotherApp_throwsException()
+            throws Exception {
+        sLocaleManager.getApplicationLocales(TEST_APP_PACKAGE);
+        fail("Expected SecurityException due to not having appropriate permission "
+                + "for querying locales of another app.");
+    }
+
+    @Test
+    public void testGetApplicationLocales_noAppLocalesSet_returnsEmptyList() {
+        // When app-specific locales aren't set, we expect get api to return empty list
+        // and not throw any error.
+        assertEquals(LocaleList.getEmptyLocaleList(), sLocaleManager.getApplicationLocales());
+    }
+
+    /**
+     * Verifies that the locales are correctly set for calling(instrumentation) app
+     * by fetching locales of the app with a binder call.
+     */
+    private void assertLocalesCorrectlySetForCallingApp(LocaleList expectedLocales) {
+        assertEquals(expectedLocales, sLocaleManager.getApplicationLocales());
+    }
+
+    /**
+     * Verifies that the locales are correctly set for another package
+     * by fetching locales of the app with a binder call.
+     */
+    private void assertLocalesCorrectlySetForAnotherApp(String packageName,
+            LocaleList expectedLocales) throws Exception {
+        assertEquals(expectedLocales, getApplicationLocales(packageName));
+    }
+
+    private LocaleList getApplicationLocales(String packageName) throws Exception {
+        return callWithShellPermissionIdentity(() ->
+                sLocaleManager.getApplicationLocales(packageName),
+                Manifest.permission.READ_APP_SPECIFIC_LOCALES);
+    }
+
+    /**
+     * Verifies that the broadcast received in the relevant apps have the correct information
+     * in the intent extras. It verifies the below extras:
+     * <ul>
+     * <li> {@link Intent#EXTRA_PACKAGE_NAME}
+     * <li> {@link Intent#EXTRA_LOCALE_LIST}
+     * </ul>
+     */
+    private void assertReceivedBroadcastContains(BlockingBroadcastReceiver receiver,
+            String expectedPackageName, LocaleList expectedLocales) {
+        assertEquals(expectedPackageName, receiver.getPackageName());
+        assertEquals(expectedLocales, receiver.getLocales());
+    }
+
+    /**
+     * Creates a combined {@link LocaleList} by placing app locales before system locales and
+     * dropping any duplicates.
+     *
+     * We need to combine them since {@link LocaleList} does not have any direct way like
+     * a normal list to check if locale or subset of locales is present.
+     */
+    private  LocaleList combineLocales(LocaleList appLocales, LocaleList systemLocales) {
+        Locale[] combinedLocales = new Locale[appLocales.size() + systemLocales.size()];
+        for (int i = 0; i < appLocales.size(); i++) {
+            combinedLocales[i] = appLocales.get(i);
+        }
+        for (int i = 0; i < systemLocales.size(); i++) {
+            combinedLocales[i + appLocales.size()] = systemLocales.get(i);
+        }
+        // Constructor of {@link LocaleList} removes duplicates.
+        return new LocaleList(combinedLocales);
+    }
+
+    /**
+     * Reset the locales for the apps to empty list as they could have been set previously
+     * by some other test.
+     */
+    private void resetAppLocalesAsEmpty() throws Exception {
+        // Reset locales for the calling app.
+        sLocaleManager.setApplicationLocales(LocaleList.getEmptyLocaleList());
+
+        // Reset locales for the TestApp.
+        runWithShellPermissionIdentity(() ->
+                        sLocaleManager.setApplicationLocales(TEST_APP_PACKAGE,
+                                LocaleList.getEmptyLocaleList()),
+                Manifest.permission.CHANGE_CONFIGURATION);
+    }
+}
diff --git a/tests/framework/base/locale/util/Android.bp b/tests/framework/base/locale/util/Android.bp
new file mode 100644
index 0000000..979454d
--- /dev/null
+++ b/tests/framework/base/locale/util/Android.bp
@@ -0,0 +1,29 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_test_helper_library {
+    name: "cts-locale-util",
+
+    srcs: [
+        "src/**/*.java",
+    ],
+
+    static_libs: [
+        "androidx.test.rules",
+    ],
+}
diff --git a/tests/framework/base/locale/util/src/android/localemanager/cts/util/LocaleConstants.java b/tests/framework/base/locale/util/src/android/localemanager/cts/util/LocaleConstants.java
new file mode 100644
index 0000000..fd94bba
--- /dev/null
+++ b/tests/framework/base/locale/util/src/android/localemanager/cts/util/LocaleConstants.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2021 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 android.localemanager.cts.util;
+
+import android.content.ComponentName;
+import android.os.LocaleList;
+
+/**
+ * Common constants used across {@link android.localemanager.cts.LocaleManagerTests}
+ * and the test apps.
+ */
+public final class LocaleConstants {
+
+    private LocaleConstants() {}
+
+    public static final LocaleList DEFAULT_SYSTEM_LOCALES =
+            LocaleList.forLanguageTags("en-US,fr-FR");
+
+    public static final LocaleList DEFAULT_APP_LOCALES = LocaleList.forLanguageTags("hi,fr-FR");
+
+    public static final String CALLING_PACKAGE = "android.localemanager.cts";
+
+    public static final String TEST_APP_PACKAGE = "android.localemanager.cts.app";
+
+    public static final String INSTALLER_PACKAGE = "android.localemanager.cts.installer";
+
+    public static final ComponentName TEST_APP_MAIN_ACTIVITY = new ComponentName(TEST_APP_PACKAGE,
+            TEST_APP_PACKAGE + ".MainActivity");
+
+    public static final ComponentName INSTALLER_APP_MAIN_ACTIVITY =
+            new ComponentName(INSTALLER_PACKAGE, INSTALLER_PACKAGE + ".MainActivity");
+
+    public static final String TEST_APP_BROADCAST_INFO_PROVIDER_ACTION =
+            "android.locale.cts.action.TEST_APP_BROADCAST_INFO_PROVIDER";
+
+    public static final String TEST_APP_CREATION_INFO_PROVIDER_ACTION =
+            "android.locale.cts.action.TEST_APP_CREATION_INFO_PROVIDER";
+
+    public static final String TEST_APP_CONFIG_CHANGED_INFO_PROVIDER_ACTION =
+            "android.locale.cts.action.TEST_APP_CONFIG_CHANGED_INFO_PROVIDER";
+
+    public static final String INSTALLER_APP_BROADCAST_INFO_PROVIDER_ACTION =
+            "android.locale.cts.action.INSTALLER_APP_BROADCAST_INFO_PROVIDER";
+
+    public static final String INSTALLER_APP_CREATION_INFO_PROVIDER_ACTION =
+            "android.locale.cts.action.INSTALLER_APP_CREATION_INFO_PROVIDER";
+
+    public static final String TEST_APP_BROADCAST_RECEIVER = TEST_APP_PACKAGE
+            + ".TestBroadcastReceiver";
+
+    public static final String INSTALLER_APP_BROADCAST_RECEIVER = INSTALLER_PACKAGE
+            + ".InstallerBroadcastReceiver";
+
+    public static final String EXTRA_QUERY_LOCALES = "query_locales";
+
+    public static final String EXTRA_SET_LOCALES = "set_locales";
+
+}
diff --git a/tests/framework/base/locale/util/src/android/localemanager/cts/util/LocaleUtils.java b/tests/framework/base/locale/util/src/android/localemanager/cts/util/LocaleUtils.java
new file mode 100644
index 0000000..58c556e
--- /dev/null
+++ b/tests/framework/base/locale/util/src/android/localemanager/cts/util/LocaleUtils.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2021 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 android.localemanager.cts.util;
+
+import android.content.Intent;
+import android.os.LocaleList;
+import android.os.Parcelable;
+
+/**
+ * Static utility methods used across the test apps.
+ */
+public final class LocaleUtils {
+
+    private LocaleUtils() {}
+
+    /**
+     * Constructs a new intent with given action. Retrieves information from the passed intent
+     * and puts it in the extras of the new returned intent.
+     *
+     * <p> The passed intent contains package name and the locales. The intent action is expected to
+     * be either of the following types.
+     * <ul>
+     * <li> {@link LocaleConstants#TEST_APP_BROADCAST_INFO_PROVIDER_ACTION}
+     * <li> {@link LocaleConstants#INSTALLER_APP_BROADCAST_INFO_PROVIDER_ACTION}
+     * </ul>
+     *
+     */
+    public static Intent constructResultIntent(String action, Intent intent) {
+        return new Intent(action)
+                .putExtra(Intent.EXTRA_PACKAGE_NAME,
+                        intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME))
+                .putExtra(Intent.EXTRA_LOCALE_LIST,
+                            (Parcelable) intent.getParcelableExtra(Intent.EXTRA_LOCALE_LIST));
+    }
+
+    /**
+     * Constructs a new intent with given action. Also puts the given package name and the locales
+     * in the extras of the intent.
+     *
+     * <p> The action is expected to be of the type
+     * {@link LocaleConstants#TEST_APP_CREATION_INFO_PROVIDER_ACTION}
+     */
+    public static Intent constructResultIntent(String action, String packageName,
+            LocaleList locales) {
+        return new Intent(action)
+                .putExtra(Intent.EXTRA_PACKAGE_NAME, packageName)
+                .putExtra(Intent.EXTRA_LOCALE_LIST, locales);
+    }
+}
diff --git a/tests/framework/base/localeconfig/Android.bp b/tests/framework/base/localeconfig/Android.bp
new file mode 100644
index 0000000..9e14b8b
--- /dev/null
+++ b/tests/framework/base/localeconfig/Android.bp
@@ -0,0 +1,46 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsLocaleConfigTestCases",
+    defaults: ["cts_defaults"],
+
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+
+    static_libs: [
+        "ctstestrunner-axt",
+        "junit",
+    ],
+
+    java_resource_dirs: ["res"],
+
+    srcs: [
+        "src/**/*.java",
+    ],
+
+    sdk_version: "test_current",
+}
+
diff --git a/tests/framework/base/localeconfig/AndroidManifest.xml b/tests/framework/base/localeconfig/AndroidManifest.xml
new file mode 100644
index 0000000..14159b9
--- /dev/null
+++ b/tests/framework/base/localeconfig/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.cts.localeconfig">
+  <application android:debuggable="true"
+      android:localeConfig="@xml/locales_config">
+  </application>
+
+  <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+      android:targetPackage="com.android.cts.localeconfig"
+      android:label="CTS tests for android.app.LocaleConfig">
+    <meta-data android:name="listener"
+        android:value="com.android.cts.runner.CtsTestRunListener"/>
+  </instrumentation>
+</manifest>
diff --git a/tests/framework/base/localeconfig/AndroidTest.xml b/tests/framework/base/localeconfig/AndroidTest.xml
new file mode 100644
index 0000000..31c2b63
--- /dev/null
+++ b/tests/framework/base/localeconfig/AndroidTest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<configuration description="Config for Locale Config test cases">
+  <option name="test-suite-tag" value="cts" />
+  <option name="config-descriptor:metadata" key="component" value="framework" />
+  <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+  <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+  <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+  <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+    <option name="cleanup-apks" value="true" />
+    <option name="test-file-name" value="CtsLocaleConfigTestCases.apk" />
+    <option name="test-file-name" value="CtsNoLocaleConfigTagTests.apk" />
+    <option name="test-file-name" value="CtsMalformedInputTests.apk" />
+  </target_preparer>
+  <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+    <option name="package" value="com.android.cts.localeconfig" />
+    <option name="hidden-api-checks" value="false" />
+  </test>
+</configuration>
diff --git a/tests/framework/base/localeconfig/OWNERS b/tests/framework/base/localeconfig/OWNERS
new file mode 100644
index 0000000..248236f
--- /dev/null
+++ b/tests/framework/base/localeconfig/OWNERS
@@ -0,0 +1,4 @@
+# Bug template url: https://b.corp.google.com/issues/new?component=28174&template=1650608
+joshhou@google.com
+goldmanj@google.com
+pratyushmore@google.com
diff --git a/tests/framework/base/localeconfig/malformedinput/Android.bp b/tests/framework/base/localeconfig/malformedinput/Android.bp
new file mode 100644
index 0000000..0dbc3e7
--- /dev/null
+++ b/tests/framework/base/localeconfig/malformedinput/Android.bp
@@ -0,0 +1,35 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsMalformedInputTests",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "test_current",
+    //resource_dirs: ["helper/res-malformedinput"],
+    srcs: ["src/**/*.java"],
+    static_libs: ["androidx.legacy_legacy-support-v4"],
+    libs: ["android.test.base"],
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    certificate: ":cts-testkey1",
+    dex_preopt: {
+            enabled: false,
+        },
+}
\ No newline at end of file
diff --git a/tests/framework/base/localeconfig/malformedinput/AndroidManifest.xml b/tests/framework/base/localeconfig/malformedinput/AndroidManifest.xml
new file mode 100644
index 0000000..84e0486
--- /dev/null
+++ b/tests/framework/base/localeconfig/malformedinput/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.cts.malformedinput">
+  <application android:debuggable="true"
+      android:localeConfig="@xml/locales_config">
+  </application>
+</manifest>
diff --git a/tests/framework/base/localeconfig/malformedinput/res/xml/locales_config.xml b/tests/framework/base/localeconfig/malformedinput/res/xml/locales_config.xml
new file mode 100644
index 0000000..0e77206
--- /dev/null
+++ b/tests/framework/base/localeconfig/malformedinput/res/xml/locales_config.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- the locale-config is misspelled -->
+<locale-confi xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:aapt="http://schemas.android.com/aapt">
+	<locale android:name="en-US"/>
+	<locale android:name="zh-TW"/>
+	<locale android:name="pt"/>
+	<locale android:name="fr"/>
+	<locale android:name="zh-Hans-SG"/>
+</locale-confi>
+
diff --git a/tests/framework/base/localeconfig/nolocaleconfig/Android.bp b/tests/framework/base/localeconfig/nolocaleconfig/Android.bp
new file mode 100644
index 0000000..fcbe4c4
--- /dev/null
+++ b/tests/framework/base/localeconfig/nolocaleconfig/Android.bp
@@ -0,0 +1,34 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsNoLocaleConfigTagTests",
+    defaults: ["cts_support_defaults"],
+    sdk_version: "test_current",
+    srcs: ["src/**/*.java"],
+    static_libs: ["androidx.legacy_legacy-support-v4"],
+    libs: ["android.test.base"],
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    certificate: ":cts-testkey1",
+    dex_preopt: {
+            enabled: false,
+        },
+}
\ No newline at end of file
diff --git a/tests/framework/base/localeconfig/nolocaleconfig/AndroidManifest.xml b/tests/framework/base/localeconfig/nolocaleconfig/AndroidManifest.xml
new file mode 100644
index 0000000..666f583
--- /dev/null
+++ b/tests/framework/base/localeconfig/nolocaleconfig/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.cts.nolocaleconfigtag">
+  <application android:debuggable="true">
+  </application>
+</manifest>
diff --git a/tests/framework/base/localeconfig/res/xml/locales_config.xml b/tests/framework/base/localeconfig/res/xml/locales_config.xml
new file mode 100644
index 0000000..9d68b32
--- /dev/null
+++ b/tests/framework/base/localeconfig/res/xml/locales_config.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:aapt="http://schemas.android.com/aapt">
+	<locale android:name="en-US"/>
+	<locale android:name="zh-TW"/>
+	<locale android:name="pt"/>
+	<locale android:name="fr"/>
+	<locale android:name="zh-Hans-SG"/>
+</locale-config>
+
diff --git a/tests/framework/base/localeconfig/src/com/android/cts/localeconfig/LocaleConfigTest.java b/tests/framework/base/localeconfig/src/com/android/cts/localeconfig/LocaleConfigTest.java
new file mode 100644
index 0000000..8ec58fc
--- /dev/null
+++ b/tests/framework/base/localeconfig/src/com/android/cts/localeconfig/LocaleConfigTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2022 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.cts.localeconfig;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import android.app.LocaleConfig;
+import android.content.Context;
+import android.os.LocaleList;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * Tests for {@link android.app.LocaleConfig} API(s).
+ *
+ * Build/Install/Run: atest LocaleConfigTest
+ */
+@RunWith(AndroidJUnit4.class)
+public class LocaleConfigTest {
+    private static final String NOTAG_PACKAGE_NAME = "com.android.cts.nolocaleconfigtag";
+    private static final String MALFORMED_INPUT_PACKAGE_NAME = "com.android.cts.malformedinput";
+    private static final List<String> EXPECT_LOCALES = Arrays.asList(
+            new String[]{"en-US", "zh-TW", "pt", "fr", "zh-Hans-SG"});
+
+    @Test
+    public void testGetLocaleList() throws Exception {
+        Context context = InstrumentationRegistry.getTargetContext();
+        LocaleConfig localeConfig = new LocaleConfig(context);
+
+        assertEquals(EXPECT_LOCALES.stream()
+                .sorted()
+                .collect(Collectors.toList()),
+                new ArrayList<String>(Arrays.asList(
+                        localeConfig.getSupportedLocales().toLanguageTags().split(","))).stream()
+                .sorted()
+                .collect(Collectors.toList()));
+
+        assertEquals(LocaleConfig.STATUS_SUCCESS, localeConfig.getStatus());
+    }
+
+    @Test
+    public void testNoLocaleConfigTag() throws Exception {
+        Context context = InstrumentationRegistry.getTargetContext();
+        Context appContext = context.createPackageContext(NOTAG_PACKAGE_NAME, 0);
+        LocaleConfig localeConfig = new LocaleConfig(appContext);
+        LocaleList localeList = localeConfig.getSupportedLocales();
+
+        assertNull(localeList);
+
+        assertEquals(LocaleConfig.STATUS_NOT_SPECIFIED, localeConfig.getStatus());
+    }
+
+    @Test
+    public void testLocaleConfigMalformedInput() throws Exception {
+        Context context = InstrumentationRegistry.getTargetContext();
+        Context appContext = context.createPackageContext(MALFORMED_INPUT_PACKAGE_NAME, 0);
+        LocaleConfig localeConfig = new LocaleConfig(appContext);
+        LocaleList localeList = localeConfig.getSupportedLocales();
+
+        assertNull(localeList);
+
+        assertEquals(LocaleConfig.STATUS_PARSING_FAILED, localeConfig.getStatus());
+    }
+}
+
diff --git a/tests/framework/base/windowmanager/AndroidManifest.xml b/tests/framework/base/windowmanager/AndroidManifest.xml
index 326cdfd..3277fb3 100644
--- a/tests/framework/base/windowmanager/AndroidManifest.xml
+++ b/tests/framework/base/windowmanager/AndroidManifest.xml
@@ -34,7 +34,9 @@
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
 
     <application android:label="CtsWindowManagerDeviceTestCases"
-         android:requestLegacyExternalStorage="true">
+                 android:requestLegacyExternalStorage="true"
+                 android:enableOnBackInvokedCallback="true"
+                 android:testOnly="true">
         <uses-library android:name="android.test.runner"/>
 
         <activity android:name="android.server.wm.ActivityManagerTestBase$ConfigChangeHandlingActivity"
@@ -433,6 +435,13 @@
 
         <activity android:name="android.server.wm.ActivityTransitionTests$TransitionActivity"/>
 
+        <activity android:name="android.server.wm.ActivityTransitionTests$OverridePendingTransitionActivity"/>
+
+        <activity android:name="android.server.wm.ActivityTransitionTests$TransitionActivityWithWhiteBackground"
+            android:theme="@style/Theme.WhiteBackground"
+            android:exported="true"
+            android:colorMode="wideColorGamut"/>
+
         <activity android:name="android.server.wm.WindowUntrustedTouchTest$TestActivity"
                   android:exported="true"
                   android:configChanges="screenSize|screenLayout|orientation"
@@ -512,7 +521,6 @@
                   android:exported="true"
                   android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"
                   android:theme="@android:style/Theme.Translucent.NoTitleBar" />
-
         <activity android:name="android.server.wm.HostActivity"
                   android:exported="true">
                <intent-filter>
@@ -523,7 +531,25 @@
                  <category android:name="android.intent.category.LAUNCHER"/>
                </intent-filter>
         </activity>
+        <activity android:name="android.server.wm.KeepClearRectsTests$TestActivity"
+                  android:exported="true"
+                  android:theme="@style/NoInsetsTheme" />
+        <activity android:name="android.server.wm.KeepClearRectsTests$TranslucentTestActivity"
+                  android:exported="true"
+                  android:theme="@style/NoInsetsTheme.Translucent" />
 
+        <activity android:name="android.server.wm.SnapshotTaskTests$TestActivity"
+            android:theme="@style/WhiteBackgroundTheme"
+            android:exported="true">
+        </activity>
+        <activity android:name="android.server.wm.BackNavigationActivity"
+                  android:exported="true"/>
+        <activity android:name="android.server.wm.PinnedStackTests$TestActivity"
+                  android:exported="true"/>
+        <activity android:name="android.server.wm.TaskFragmentTrustedModeTest$TranslucentActivity"
+                  android:exported="true"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"
+                  android:theme="@android:style/Theme.Translucent.NoTitleBar" />
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
diff --git a/tests/framework/base/windowmanager/AndroidTest.xml b/tests/framework/base/windowmanager/AndroidTest.xml
index b38c81f..9cdb6fa 100644
--- a/tests/framework/base/windowmanager/AndroidTest.xml
+++ b/tests/framework/base/windowmanager/AndroidTest.xml
@@ -21,6 +21,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
+        <option name="install-arg" value="-t" />
         <option name="test-file-name" value="CtsWindowManagerDeviceTestCases.apk"/>
         <option name="test-file-name" value="CtsDragAndDropSourceApp.apk"/>
         <option name="test-file-name" value="CtsDragAndDropTargetApp.apk"/>
@@ -40,6 +41,9 @@
         <option name="test-file-name" value="CtsMockInputMethod.apk" />
         <option name="test-file-name" value="CtsDeviceServicesTestShareUidAppA.apk" />
         <option name="test-file-name" value="CtsDeviceServicesTestShareUidAppB.apk" />
+        <option name="test-file-name" value="CtsCrossProcessSurfaceControlViewHostTestService.apk" />
+        <option name="test-file-name" value="CtsWindowManagerJetpackSecondUidApp.apk" />
+        <option name="test-file-name" value="CtsBackLegacyApp.apk" />
     </target_preparer>
     <!-- Some older apk cannot be installed as instant, so we force them full mode -->
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
diff --git a/tests/framework/base/windowmanager/app/Android.bp b/tests/framework/base/windowmanager/app/Android.bp
index 94e915d4..1288a70 100644
--- a/tests/framework/base/windowmanager/app/Android.bp
+++ b/tests/framework/base/windowmanager/app/Android.bp
@@ -26,8 +26,6 @@
 
     srcs: [
         "src/**/*.java",
-        // Used by InputMethodTestActivity for ImeAwareEditText.
-        ":compatibility-device-util-nodeps",
         ":CtsVerifierMockVrListenerServiceFiles",
     ],
 
diff --git a/tests/framework/base/windowmanager/app/AndroidManifest.xml b/tests/framework/base/windowmanager/app/AndroidManifest.xml
index fbbbbca..804e0e7 100755
--- a/tests/framework/base/windowmanager/app/AndroidManifest.xml
+++ b/tests/framework/base/windowmanager/app/AndroidManifest.xml
@@ -164,6 +164,15 @@
                   <layout android:minWidth="1dp"
                        android:minHeight="1dp"/>
         </activity>
+        <activity android:name=".LaunchIntoPipHostActivity"
+             android:exported="true"
+             android:taskAffinity="nobody.but.PipActivity" />
+        <activity android:name=".LaunchIntoPipContainerActivity"
+             android:resizeableActivity="false"
+             android:supportsPictureInPicture="true"
+             android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout"
+             android:exported="true"
+             android:taskAffinity="nobody.but.PipActivity"/>
         <activity android:name=".FreeformActivity"
              android:resizeableActivity="true"
              android:taskAffinity="nobody.but.FreeformActivity"
@@ -610,6 +619,22 @@
              android:exported="true"
              android:colorMode="wideColorGamut"
              android:theme="@style/BadBlurryDialog"/>
+        <activity android:name=".CustomTransitionExitActivity"
+            android:theme="@style/Theme.CustomTransitionTheme"
+            android:exported="true"
+            android:colorMode="wideColorGamut"
+            android:fitsSystemWindows="true" />
+        <activity android:name=".CustomTransitionEnterActivity"
+            android:theme="@style/Theme.CustomTransitionTheme"
+            android:exported="true"
+            android:colorMode="wideColorGamut"
+            android:fitsSystemWindows="true" />
+        <activity android:name=".KeepClearRectsActivity"
+            android:exported="true"
+            android:theme="@style/NoInsetsTheme"/>
+        <activity android:name=".KeepClearRectsActivity2"
+            android:exported="true"
+            android:theme="@style/NoInsetsTheme"/>
 
         <!-- Splash Screen Test Activities -->
         <activity android:name=".HandleSplashScreenExitActivity"
@@ -625,6 +650,10 @@
                   android:exported="true"
                   android:theme="@style/ReplaceIconTheme"
                   android:taskAffinity="nobody.but.TestSplashScreenAffinity"/>
+        <activity android:name=".SplashScreenStyleThemeActivity"
+                  android:exported="true"
+                  android:theme="@style/SplashScreenStyleTheme"
+                  android:taskAffinity="nobody.but.TestSplashScreenAffinity"/>
 
         <service android:name=".OverlayTestService"
                  android:exported="true" />
diff --git a/tests/framework/base/windowmanager/app/res/anim/edge_extension_bottom_window_animation.xml b/tests/framework/base/windowmanager/app/res/anim/edge_extension_bottom_window_animation.xml
new file mode 100644
index 0000000..48f004d
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/res/anim/edge_extension_bottom_window_animation.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="1.0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000" />
+
+    <scale
+        android:fromXScale="1.0"
+        android:toXScale="1.0"
+        android:fromYScale="0.5"
+        android:toYScale="0.5"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000" />
+
+    <extend
+        android:fromExtendLeft="0"
+        android:fromExtendTop="0"
+        android:fromExtendRight="0"
+        android:fromExtendBottom="100%"
+        android:toExtendLeft="0"
+        android:toExtendTop="0"
+        android:toExtendRight="0"
+        android:toExtendBottom="100%"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000" />
+
+</set>
diff --git a/tests/framework/base/windowmanager/app/res/anim/edge_extension_left_window_animation.xml b/tests/framework/base/windowmanager/app/res/anim/edge_extension_left_window_animation.xml
new file mode 100644
index 0000000..6be9f1b
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/res/anim/edge_extension_left_window_animation.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="1.0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000" />
+
+    <scale
+        android:fromXScale="0.5"
+        android:toXScale="0.5"
+        android:fromYScale="1.0"
+        android:toYScale="1.0"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000" />
+
+    <translate
+        android:fromXDelta="50%"
+        android:toXDelta="50%"
+        android:interpolator="@android:interpolator/linear"
+        android:duration="5000" />
+
+    <extend
+        android:fromExtendLeft="100%"
+        android:fromExtendTop="0"
+        android:fromExtendRight="0"
+        android:fromExtendBottom="0"
+        android:toExtendLeft="100%"
+        android:toExtendTop="0"
+        android:toExtendRight="0"
+        android:toExtendBottom="0"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000" />
+
+</set>
diff --git a/tests/framework/base/windowmanager/app/res/anim/edge_extension_right_window_animation.xml b/tests/framework/base/windowmanager/app/res/anim/edge_extension_right_window_animation.xml
new file mode 100644
index 0000000..c589f0e
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/res/anim/edge_extension_right_window_animation.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="1.0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000" />
+
+    <scale
+        android:fromXScale="0.5"
+        android:toXScale="0.5"
+        android:fromYScale="1.0"
+        android:toYScale="1.0"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000" />
+
+    <extend
+        android:fromExtendLeft="0"
+        android:fromExtendTop="0"
+        android:fromExtendRight="100%"
+        android:fromExtendBottom="0"
+        android:toExtendLeft="0"
+        android:toExtendTop="0"
+        android:toExtendRight="100%"
+        android:toExtendBottom="0"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000" />
+
+</set>
diff --git a/tests/framework/base/windowmanager/app/res/anim/edge_extension_top_window_animation.xml b/tests/framework/base/windowmanager/app/res/anim/edge_extension_top_window_animation.xml
new file mode 100644
index 0000000..0b421a4
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/res/anim/edge_extension_top_window_animation.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false">
+
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="1.0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000" />
+
+    <scale
+        android:fromXScale="1.0"
+        android:toXScale="1.0"
+        android:fromYScale="0.5"
+        android:toYScale="0.5"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000" />
+
+    <translate
+        android:fromYDelta="50%"
+        android:toYDelta="50%"
+        android:interpolator="@android:interpolator/linear"
+        android:duration="5000" />
+
+    <extend
+        android:fromExtendLeft="0"
+        android:fromExtendTop="100%"
+        android:fromExtendRight="0"
+        android:fromExtendBottom="0"
+        android:toExtendLeft="0"
+        android:toExtendTop="100%"
+        android:toExtendRight="0"
+        android:toExtendBottom="0"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000" />
+
+</set>
diff --git a/tests/framework/base/windowmanager/app/res/anim/show_backdrop_hide_window_animation.xml b/tests/framework/base/windowmanager/app/res/anim/show_backdrop_hide_window_animation.xml
new file mode 100644
index 0000000..5ee8b8a
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/res/anim/show_backdrop_hide_window_animation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false"
+    android:showBackdrop="true">
+
+    <alpha
+        android:fromAlpha="0"
+        android:toAlpha="0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000"/>
+</set>
diff --git a/tests/framework/base/windowmanager/app/res/layout/keep_clear_rects_activity.xml b/tests/framework/base/windowmanager/app/res/layout/keep_clear_rects_activity.xml
new file mode 100644
index 0000000..d5fb80e
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/res/layout/keep_clear_rects_activity.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/rootView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+</FrameLayout>
+
diff --git a/tests/framework/base/windowmanager/app/res/values/styles.xml b/tests/framework/base/windowmanager/app/res/values/styles.xml
index 0c9df63..695f579 100644
--- a/tests/framework/base/windowmanager/app/res/values/styles.xml
+++ b/tests/framework/base/windowmanager/app/res/values/styles.xml
@@ -92,4 +92,21 @@
     <style name="SplashScreenOverrideTheme" parent="ReplaceIconTheme">
         <item name="android:windowSplashScreenBackground">@drawable/red</item>
     </style>
+
+    <style name="SplashScreenStyleTheme" parent="@android:style/Theme.Material.NoActionBar">
+        <item name="android:windowSplashScreenBehavior">icon_preferred</item>
+    </style>
+
+    <style name="Theme.CustomTransitionTheme" parent="@android:style/Theme.Material.NoActionBar">
+        <item name="android:background">#ffffff</item>
+        <item name="android:windowBackground">#ffffff</item>
+        <item name="android:colorBackground">#ffffff</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="NoInsetsTheme" parent="@android:style/Theme.NoTitleBar">
+        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+        <item name="android:windowSoftInputMode">stateHidden</item>
+    </style>
 </resources>
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/BroadcastReceiverActivity.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/BroadcastReceiverActivity.java
index 26c5b3a..130c970 100644
--- a/tests/framework/base/windowmanager/app/src/android/server/wm/app/BroadcastReceiverActivity.java
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/BroadcastReceiverActivity.java
@@ -108,7 +108,8 @@
         }
 
         void register() {
-            mAppContext.registerReceiver(this, new IntentFilter(ACTION_TRIGGER_BROADCAST));
+            mAppContext.registerReceiver(this, new IntentFilter(ACTION_TRIGGER_BROADCAST),
+                    Context.RECEIVER_EXPORTED);
         }
 
         void associate(Activity activity) {
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/Components.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/Components.java
index 79499f7..16ddfcd 100644
--- a/tests/framework/base/windowmanager/app/src/android/server/wm/app/Components.java
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/Components.java
@@ -88,6 +88,10 @@
     public static final ComponentName PIP_ACTIVITY_WITH_SAME_AFFINITY =
             component("PipActivityWithSameAffinity");
     public static final ComponentName PIP_ON_STOP_ACTIVITY = component("PipOnStopActivity");
+    public static final ComponentName LAUNCH_INTO_PIP_HOST_ACTIVITY =
+            component("LaunchIntoPipHostActivity");
+    public static final ComponentName LAUNCH_INTO_PIP_CONTAINER_ACTIVITY =
+            component("LaunchIntoPipContainerActivity");
     public static final ComponentName PORTRAIT_ORIENTATION_ACTIVITY =
             component("PortraitOrientationActivity");
     public static final ComponentName RECURSIVE_ACTIVITY = component("RecursiveActivity");
@@ -256,6 +260,8 @@
             component("SplashScreenReplaceIconActivity");
     public static final ComponentName SPLASH_SCREEN_REPLACE_THEME_ACTIVITY =
             component("SplashScreenReplaceThemeActivity");
+    public static final ComponentName SPLASH_SCREEN_STYLE_THEME_ACTIVITY =
+            component("SplashScreenStyleThemeActivity");
 
     public static final ComponentName TEST_DREAM_SERVICE =
             component("TestDream");
@@ -278,6 +284,34 @@
     public static final ComponentName BAD_BLUR_ACTIVITY =
             component("BadBlurActivity");
 
+    public static final ComponentName CUSTOM_TRANSITION_EXIT_ACTIVITY =
+            component("CustomTransitionExitActivity");
+
+    public static final ComponentName CUSTOM_TRANSITION_ENTER_ACTIVITY =
+            component("CustomTransitionEnterActivity");
+
+    public static final ComponentName KEEP_CLEAR_RECTS_ACTIVITY =
+            component("KeepClearRectsActivity");
+
+    public static final ComponentName KEEP_CLEAR_RECTS_ACTIVITY2 =
+            component("KeepClearRectsActivity2");
+
+    /**
+     * The keys used by {@link CustomTransitionExitActivity} to select the animation to run.
+     */
+    public static class CustomTransitionAnimations {
+        /** see @anim/show_backdrop_hide_window_animation.xml */
+        public static final String BACKGROUND_COLOR = "backgroundColor";
+        /** see @anim/edge_extension_right_window_animation.xml */
+        public static final String LEFT_EDGE_EXTENSION = "leftEdgeExtension";
+        /** see @anim/edge_extension_top_window_animation.xml */
+        public static final String TOP_EDGE_EXTENSION = "topEdgeExtension";
+        /** see @anim/edge_extension_left_window_animation.xml */
+        public static final String RIGHT_EDGE_EXTENSION = "rightEdgeExtension";
+        /** see @anim/edge_extension_bottom_window_animation.xml */
+        public static final String BOTTOM_EDGE_EXTENSION = "bottomExtension";
+    }
+
     /**
      * The keys are used for {@link TestJournalProvider} when testing starting window.
      */
@@ -302,7 +336,7 @@
         public static final String OVERRIDE_THEME_ENABLED = "override_theme_enabled";
         public static final String OVERRIDE_THEME_COLOR = "override_theme_color";
         public static final String OVERRIDE_THEME_COMPONENT = "override_theme_component";
-
+        public static final String STYLE_THEME_COMPONENT = "style_theme_component";
     }
 
     /**
@@ -335,6 +369,7 @@
         public static final String COMMAND_NAVIGATE_UP_TO = "navigate_up_to";
         public static final String COMMAND_START_ACTIVITY = "start_activity";
         public static final String COMMAND_START_ACTIVITIES = "start_activities";
+        public static final String EXTRA_OPTION = "option";
     }
 
     /**
@@ -492,6 +527,18 @@
         // Intent action that will request that the activity enters picture-in-picture.
         public static final String ACTION_ON_PIP_REQUESTED =
                 "android.server.wm.app.PipActivity.on_pip_requested";
+        // Intent action that will request that the activity initiates launch-into-pip
+        public static final String ACTION_START_LAUNCH_INTO_PIP_CONTAINER =
+                "android.server.wm.app.LaunchIntoPip.start_container_activity";
+        // Intent action that will request the host activity of launch-into-pip to finish itself
+        public static final String ACTION_FINISH_LAUNCH_INTO_PIP_HOST =
+                "android.server.wm.app.LaunchIntoPip.finish_host_activity";
+        // Intent action that will request the activity to change the PiP aspect ratio
+        public static final String ACTION_CHANGE_ASPECT_RATIO =
+                "android.server.wm.app.LaunchIntoPip.change_aspect_ratio";
+        // Intent action that will request the activity to start a new translucent activity
+        public static final String ACTION_LAUNCH_TRANSLUCENT_ACTIVITY =
+                "android.server.wm.app.LaunchIntoPip.launch_translucent_activity";
 
         // Adds an assertion that we do not ever get onStop() before we enter picture in picture
         public static final String EXTRA_ASSERT_NO_ON_STOP_BEFORE_PIP =
@@ -512,11 +559,19 @@
         // Calls requestAutoEnterPictureInPicture() with the value provided
         public static final String EXTRA_ENTER_PIP_ON_PIP_REQUESTED =
                 "enter_pip_on_pip_requested";
+        public static final String EXTRA_EXPANDED_PIP_ASPECT_RATIO_NUMERATOR =
+                "expanded_pip_numerator";
+        public static final String EXTRA_EXPANDED_PIP_ASPECT_RATIO_DENOMINATOR =
+                "expanded_pip_denomenator";
         // Sets auto PIP allowed on the activity picture-in-picture params.
         public static final String EXTRA_ALLOW_AUTO_PIP = "enter_pip_auto_pip_allowed";
         // Sets seamless resize enabled on the activity picture-in-picture params.
         public static final String EXTRA_IS_SEAMLESS_RESIZE_ENABLED =
                 "enter_pip_is_seamless_resize_enabled";
+        // Sets the given title on the activity picture-in-picture params.
+        public static final String EXTRA_TITLE = "set_pip_title";
+        // Sets the given subtitle on the activity picture-in-picture params.
+        public static final String EXTRA_SUBTITLE = "set_pip_subtitle";
         // Finishes the activity at the end of onResume (after EXTRA_START_ACTIVITY is handled)
         public static final String EXTRA_FINISH_SELF_ON_RESUME = "finish_self_on_resume";
         // Sets the fixed orientation (can be one of {@link ActivityInfo.ScreenOrientation}
@@ -549,10 +604,12 @@
         public static final String EXTRA_DISMISS_KEYGUARD = "dismiss_keyguard";
         // Number of custom actions should be set onto PictureInPictureParams
         public static final String EXTRA_NUMBER_OF_CUSTOM_ACTIONS = "number_of_custom_actions";
+        // Whether a custom close action should be set in the PictureInPictureParams.
+        public static final String EXTRA_CLOSE_ACTION = "set_pip_close_action";
         // Supplied when a callback is expected for pip
         public static final String EXTRA_SET_PIP_CALLBACK = "set_pip_callback";
-        // Key for obtaining the callback's results
-        public static final String PIP_CALLBACK_RESULT_KEY = "pip_callback_result_key";
+        // Result key for obtaining the PictureInPictureUiState#isStashed result
+        public static final String UI_STATE_STASHED_RESULT = "ui_state_stashed_result";
     }
 
     /**
@@ -638,6 +695,17 @@
         public static final String SHOULD_HIDE = "should_hide";
     }
 
+    public static class BackgroundActivityTransition {
+        public static final String TRANSITION_REQUESTED = "transition_requested";
+    }
+
+    /**
+     * Extra constants for {@link android.server.wm.app.KeepClearRectsActivity}.
+     */
+    public static class KeepClearRectsActivity {
+        public static final String EXTRA_KEEP_CLEAR_RECTS = "keep_clear_rects";
+    }
+
     private static ComponentName component(String className) {
         return component(Components.class, className);
     }
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/CustomTransitionEnterActivity.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/CustomTransitionEnterActivity.java
new file mode 100644
index 0000000..b112c5e
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/CustomTransitionEnterActivity.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2021 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 android.server.wm.app;
+
+import static android.server.wm.app.Components.CustomTransitionAnimations.BACKGROUND_COLOR;
+import static android.server.wm.app.Components.CustomTransitionAnimations.BOTTOM_EDGE_EXTENSION;
+import static android.server.wm.app.Components.CustomTransitionAnimations.LEFT_EDGE_EXTENSION;
+import static android.server.wm.app.Components.CustomTransitionAnimations.RIGHT_EDGE_EXTENSION;
+import static android.server.wm.app.Components.CustomTransitionAnimations.TOP_EDGE_EXTENSION;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
+
+/**
+ * Activity to test that show background for activity transitions works
+ */
+public class CustomTransitionEnterActivity extends Activity {
+
+    String mTransitionType;
+    @ColorInt int mBackgroundColor = 0;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.background_image);
+
+        // Ensure the activity is edge-to-edge
+        // In tests we rely on the activity's content filling the entire window
+        getWindow().setDecorFitsSystemWindows(false);
+
+        Intent intent = getIntent();
+        Bundle bundle = intent.getExtras();
+        mTransitionType = bundle.getString("transitionType");
+        mBackgroundColor = bundle.getInt("backgroundColorOverride");
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        switch (mTransitionType) {
+            case BACKGROUND_COLOR:
+                overridePendingTransition(R.anim.show_backdrop_hide_window_animation,
+                        R.anim.show_backdrop_hide_window_animation, mBackgroundColor);
+                break;
+            case LEFT_EDGE_EXTENSION:
+                overridePendingTransition(R.anim.edge_extension_left_window_animation,
+                        R.anim.edge_extension_left_window_animation, mBackgroundColor);
+                break;
+            case TOP_EDGE_EXTENSION:
+                overridePendingTransition(R.anim.edge_extension_top_window_animation,
+                        R.anim.edge_extension_top_window_animation, mBackgroundColor);
+                break;
+            case RIGHT_EDGE_EXTENSION:
+                overridePendingTransition(R.anim.edge_extension_right_window_animation,
+                        R.anim.edge_extension_right_window_animation, mBackgroundColor);
+                break;
+            case BOTTOM_EDGE_EXTENSION:
+                overridePendingTransition(R.anim.edge_extension_bottom_window_animation,
+                        R.anim.edge_extension_bottom_window_animation, mBackgroundColor);
+                break;
+        }
+    }
+}
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/CustomTransitionExitActivity.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/CustomTransitionExitActivity.java
new file mode 100644
index 0000000..a4a73ba
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/CustomTransitionExitActivity.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2021 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 android.server.wm.app;
+
+import static android.server.wm.app.Components.BackgroundActivityTransition.TRANSITION_REQUESTED;
+import static android.server.wm.app.Components.CUSTOM_TRANSITION_EXIT_ACTIVITY;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Handler;
+import android.server.wm.TestJournalProvider;
+
+/**
+ * Activity to test that show background for activity transitions works
+ */
+public class CustomTransitionExitActivity extends Activity {
+
+    String mTransitionType;
+    int mBackgroundColor = 0;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.background_image);
+
+        // Ensure the activity is edge-to-edge
+        // In tests we rely on the activity's content filling the entire window
+        getWindow().setDecorFitsSystemWindows(false);
+
+        Intent intent = getIntent();
+        Bundle bundle = intent.getExtras();
+        mTransitionType = bundle.getString("transitionType");
+        mBackgroundColor = bundle.getInt("backgroundColorOverride", 0);
+
+        // Delay the starting the activity so we don't skip the transition.
+        startActivityDelayed();
+    }
+
+    private void startActivityDelayed() {
+        Runnable r = () -> {
+            // Notify the test journal that we are starting the activity transition
+            TestJournalProvider.putExtras(
+                    getBaseContext(), CUSTOM_TRANSITION_EXIT_ACTIVITY, bundle -> {
+                        bundle.putBoolean(TRANSITION_REQUESTED,
+                                true);
+                    });
+            final Intent i = new Intent(
+                    CustomTransitionExitActivity.this,
+                    CustomTransitionEnterActivity.class);
+            i.putExtra("transitionType", mTransitionType);
+            i.putExtra("backgroundColorOverride", mBackgroundColor);
+            startActivity(i);
+        };
+
+        Handler h = new Handler();
+        h.postDelayed(r, 1000);
+    }
+}
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/HandleSplashScreenExitActivity.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/HandleSplashScreenExitActivity.java
index c8e2140..cdf8e85 100644
--- a/tests/framework/base/windowmanager/app/src/android/server/wm/app/HandleSplashScreenExitActivity.java
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/HandleSplashScreenExitActivity.java
@@ -18,10 +18,14 @@
 
 import static android.app.UiModeManager.MODE_NIGHT_AUTO;
 import static android.server.wm.app.Components.TestStartingWindowKeys.CANCEL_HANDLE_EXIT;
+import static android.server.wm.app.Components.TestStartingWindowKeys.CENTER_VIEW_IS_SURFACE_VIEW;
 import static android.server.wm.app.Components.TestStartingWindowKeys.CONTAINS_BRANDING_VIEW;
 import static android.server.wm.app.Components.TestStartingWindowKeys.CONTAINS_CENTER_VIEW;
+import static android.server.wm.app.Components.TestStartingWindowKeys.DELAY_RESUME;
 import static android.server.wm.app.Components.TestStartingWindowKeys.GET_NIGHT_MODE_ACTIVITY_CHANGED;
 import static android.server.wm.app.Components.TestStartingWindowKeys.HANDLE_SPLASH_SCREEN_EXIT;
+import static android.server.wm.app.Components.TestStartingWindowKeys.ICON_ANIMATION_DURATION;
+import static android.server.wm.app.Components.TestStartingWindowKeys.ICON_ANIMATION_START;
 import static android.server.wm.app.Components.TestStartingWindowKeys.ICON_BACKGROUND_COLOR;
 import static android.server.wm.app.Components.TestStartingWindowKeys.RECEIVE_SPLASH_SCREEN_EXIT;
 import static android.server.wm.app.Components.TestStartingWindowKeys.REQUEST_HANDLE_EXIT_ON_CREATE;
@@ -37,8 +41,9 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
+import android.os.SystemClock;
 import android.server.wm.TestJournalProvider;
-import android.util.Log;
+import android.view.SurfaceView;
 import android.window.SplashScreen;
 
 public class HandleSplashScreenExitActivity extends Activity {
@@ -46,6 +51,11 @@
     private UiModeManager mUiModeManager;
     private boolean mReportSplashScreenNightMode;
 
+    /** Gets the key to indicate the owner for test journal. */
+    protected String getOwnerKey() {
+        return HANDLE_SPLASH_SCREEN_EXIT;
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -60,6 +70,9 @@
             mUiModeManager.setApplicationNightMode(setNightMode);
             mReportSplashScreenNightMode = true;
         }
+        if (getIntent().getBooleanExtra(DELAY_RESUME, false)) {
+            SystemClock.sleep(5000);
+        }
     }
 
     private final SplashScreen.OnExitAnimationListener mSplashScreenExitHandler =
@@ -68,7 +81,8 @@
                 final boolean containsCenter = view.getIconView() != null;
                 final boolean containsBranding = view.getBrandingView() != null
                         && view.getBrandingView().getBackground() != null;
-                Drawable background = view.getIconView().getBackground();
+                final Drawable background = containsCenter
+                        ? view.getIconView().getBackground() : null;
                 final int iconBackground;
                 if (background != null) {
                     Bitmap bitmap = ((BitmapDrawable) background).getBitmap();
@@ -76,11 +90,17 @@
                 } else {
                     iconBackground = Color.TRANSPARENT;
                 }
-                TestJournalProvider.putExtras(baseContext, HANDLE_SPLASH_SCREEN_EXIT, bundle -> {
+                TestJournalProvider.putExtras(baseContext, getOwnerKey(), bundle -> {
                     bundle.putBoolean(RECEIVE_SPLASH_SCREEN_EXIT, true);
                     bundle.putBoolean(CONTAINS_CENTER_VIEW, containsCenter);
                     bundle.putBoolean(CONTAINS_BRANDING_VIEW, containsBranding);
                     bundle.putInt(ICON_BACKGROUND_COLOR, iconBackground);
+                    bundle.putLong(ICON_ANIMATION_DURATION, view.getIconAnimationDuration() != null
+                            ? view.getIconAnimationDuration().toMillis() : 0);
+                    bundle.putLong(ICON_ANIMATION_START, view.getIconAnimationStart() != null
+                            ? view.getIconAnimationStart().toEpochMilli() : 0);
+                    bundle.putBoolean(CENTER_VIEW_IS_SURFACE_VIEW,
+                            view.getIconView() instanceof SurfaceView);
                 });
                 view.postDelayed(view::remove, 500);
             };
@@ -102,7 +122,7 @@
         if (mReportSplashScreenNightMode) {
             final int configNightMode = newConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK;
             final Context baseContext = getBaseContext();
-            TestJournalProvider.putExtras(baseContext, HANDLE_SPLASH_SCREEN_EXIT, bundle -> {
+            TestJournalProvider.putExtras(baseContext, getOwnerKey(), bundle -> {
                 bundle.putInt(GET_NIGHT_MODE_ACTIVITY_CHANGED, configNightMode);
             });
             // reset after test done
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/HideOverlayWindowsActivity.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/HideOverlayWindowsActivity.java
index 4014999..0be70e1 100644
--- a/tests/framework/base/windowmanager/app/src/android/server/wm/app/HideOverlayWindowsActivity.java
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/HideOverlayWindowsActivity.java
@@ -37,7 +37,7 @@
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        registerReceiver(mBroadcastReceiver, new IntentFilter(ACTION));
+        registerReceiver(mBroadcastReceiver, new IntentFilter(ACTION), Context.RECEIVER_EXPORTED);
     }
 
     BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/KeepClearRectsActivity.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/KeepClearRectsActivity.java
new file mode 100644
index 0000000..3a219ae
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/KeepClearRectsActivity.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 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 android.server.wm.app;
+
+import static android.server.wm.app.Components.KeepClearRectsActivity.EXTRA_KEEP_CLEAR_RECTS;
+
+import android.graphics.Rect;
+import android.os.Bundle;
+
+import java.util.List;
+
+public class KeepClearRectsActivity extends BroadcastReceiverActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.keep_clear_rects_activity);
+        getWindow().setDecorFitsSystemWindows(false);
+
+        final List<Rect> keepClearRects =
+                getIntent().getParcelableArrayListExtra(EXTRA_KEEP_CLEAR_RECTS);
+        if (keepClearRects != null) {
+            findViewById(R.id.rootView).setPreferKeepClearRects(keepClearRects);
+        }
+    }
+}
+
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/KeepClearRectsActivity2.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/KeepClearRectsActivity2.java
new file mode 100644
index 0000000..eec4d87
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/KeepClearRectsActivity2.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.app;
+
+public class KeepClearRectsActivity2 extends KeepClearRectsActivity {
+}
+
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/LaunchIntoPipContainerActivity.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/LaunchIntoPipContainerActivity.java
new file mode 100644
index 0000000..42804a6
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/LaunchIntoPipContainerActivity.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.app;
+
+import android.content.res.Configuration;
+
+/**
+ * Container activity for launch-into-pip test.
+ */
+public class LaunchIntoPipContainerActivity extends PipActivity {
+    @Override
+    public void onPictureInPictureModeChanged(boolean isInPictureInPictureMode,
+            Configuration newConfig) {
+        if (!isInPictureInPictureMode) {
+            finish();
+        }
+    }
+}
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/LaunchIntoPipHostActivity.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/LaunchIntoPipHostActivity.java
new file mode 100644
index 0000000..ae872f6
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/LaunchIntoPipHostActivity.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.app;
+
+import static android.server.wm.app.Components.PipActivity.ACTION_FINISH_LAUNCH_INTO_PIP_HOST;
+import static android.server.wm.app.Components.PipActivity.ACTION_START_LAUNCH_INTO_PIP_CONTAINER;
+
+import android.app.ActivityOptions;
+import android.app.PictureInPictureParams;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.util.Rational;
+
+/**
+ * Host activity of launch-into-pip test.
+ */
+public class LaunchIntoPipHostActivity extends AbstractLifecycleLogActivity {
+    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (intent != null) {
+                switch (intent.getAction()) {
+                    case ACTION_START_LAUNCH_INTO_PIP_CONTAINER:
+                        startLaunchIntoPipContainerActivity();
+                        break;
+                    case ACTION_FINISH_LAUNCH_INTO_PIP_HOST:
+                        finish();
+                        break;
+                }
+            }
+        }
+    };
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final IntentFilter filter = new IntentFilter();
+        filter.addAction(ACTION_START_LAUNCH_INTO_PIP_CONTAINER);
+        filter.addAction(ACTION_FINISH_LAUNCH_INTO_PIP_HOST);
+        registerReceiver(mReceiver, filter, Context.RECEIVER_EXPORTED);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        unregisterReceiver(mReceiver);
+    }
+
+    private void startLaunchIntoPipContainerActivity() {
+        final Intent intent = new Intent(this, LaunchIntoPipContainerActivity.class);
+        final Rect bounds = new Rect(0, 0, 100, 100);
+        final PictureInPictureParams params = new PictureInPictureParams.Builder()
+                .setSourceRectHint(bounds)
+                .setAspectRatio(new Rational(bounds.width(), bounds.height()))
+                .build();
+        final ActivityOptions opts = ActivityOptions.makeLaunchIntoPip(params);
+        startActivity(intent, opts.toBundle());
+    }
+}
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/PipActivity.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/PipActivity.java
index b39b09c..074ab48 100644
--- a/tests/framework/base/windowmanager/app/src/android/server/wm/app/PipActivity.java
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/PipActivity.java
@@ -16,15 +16,18 @@
 
 package android.server.wm.app;
 
+import static android.server.wm.app.Components.PipActivity.ACTION_CHANGE_ASPECT_RATIO;
 import static android.server.wm.app.Components.PipActivity.ACTION_ENTER_PIP;
 import static android.server.wm.app.Components.PipActivity.ACTION_EXPAND_PIP;
 import static android.server.wm.app.Components.PipActivity.ACTION_FINISH;
+import static android.server.wm.app.Components.PipActivity.ACTION_LAUNCH_TRANSLUCENT_ACTIVITY;
 import static android.server.wm.app.Components.PipActivity.ACTION_MOVE_TO_BACK;
 import static android.server.wm.app.Components.PipActivity.ACTION_ON_PIP_REQUESTED;
 import static android.server.wm.app.Components.PipActivity.ACTION_SET_REQUESTED_ORIENTATION;
 import static android.server.wm.app.Components.PipActivity.ACTION_UPDATE_PIP_STATE;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ALLOW_AUTO_PIP;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ASSERT_NO_ON_STOP_BEFORE_PIP;
+import static android.server.wm.app.Components.PipActivity.EXTRA_CLOSE_ACTION;
 import static android.server.wm.app.Components.PipActivity.EXTRA_DISMISS_KEYGUARD;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ENTER_PIP;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR;
@@ -32,7 +35,10 @@
 import static android.server.wm.app.Components.PipActivity.EXTRA_ENTER_PIP_ON_PAUSE;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ENTER_PIP_ON_PIP_REQUESTED;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ENTER_PIP_ON_USER_LEAVE_HINT;
+import static android.server.wm.app.Components.PipActivity.EXTRA_EXPANDED_PIP_ASPECT_RATIO_DENOMINATOR;
+import static android.server.wm.app.Components.PipActivity.EXTRA_EXPANDED_PIP_ASPECT_RATIO_NUMERATOR;
 import static android.server.wm.app.Components.PipActivity.EXTRA_FINISH_SELF_ON_RESUME;
+import static android.server.wm.app.Components.PipActivity.EXTRA_IS_SEAMLESS_RESIZE_ENABLED;
 import static android.server.wm.app.Components.PipActivity.EXTRA_NUMBER_OF_CUSTOM_ACTIONS;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ON_PAUSE_DELAY;
 import static android.server.wm.app.Components.PipActivity.EXTRA_PIP_ORIENTATION;
@@ -44,9 +50,10 @@
 import static android.server.wm.app.Components.PipActivity.EXTRA_SET_PIP_STASHED;
 import static android.server.wm.app.Components.PipActivity.EXTRA_SHOW_OVER_KEYGUARD;
 import static android.server.wm.app.Components.PipActivity.EXTRA_START_ACTIVITY;
-import static android.server.wm.app.Components.PipActivity.EXTRA_IS_SEAMLESS_RESIZE_ENABLED;
+import static android.server.wm.app.Components.PipActivity.EXTRA_SUBTITLE;
 import static android.server.wm.app.Components.PipActivity.EXTRA_TAP_TO_FINISH;
-import static android.server.wm.app.Components.PipActivity.PIP_CALLBACK_RESULT_KEY;
+import static android.server.wm.app.Components.PipActivity.EXTRA_TITLE;
+import static android.server.wm.app.Components.PipActivity.UI_STATE_STASHED_RESULT;
 import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD;
 
 import android.app.Activity;
@@ -124,6 +131,16 @@
                     case ACTION_ON_PIP_REQUESTED:
                         onPictureInPictureRequested();
                         break;
+                    case ACTION_CHANGE_ASPECT_RATIO:
+                        setPictureInPictureParams(new PictureInPictureParams.Builder()
+                                .setAspectRatio(getAspectRatio(intent,
+                                        EXTRA_SET_ASPECT_RATIO_NUMERATOR,
+                                        EXTRA_SET_ASPECT_RATIO_DENOMINATOR))
+                                .build());
+                        break;
+                    case ACTION_LAUNCH_TRANSLUCENT_ACTIVITY:
+                        startActivity(new Intent(PipActivity.this, TranslucentTestActivity.class));
+                        break;
                 }
             }
         }
@@ -160,6 +177,11 @@
                     builder.setAspectRatio(getAspectRatio(getIntent(),
                             EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR,
                             EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR));
+                    if (shouldAddExpandedPipAspectRatios()) {
+                        builder.setExpandedAspectRatio(getAspectRatio(getIntent(),
+                                EXTRA_EXPANDED_PIP_ASPECT_RATIO_NUMERATOR,
+                                EXTRA_EXPANDED_PIP_ASPECT_RATIO_DENOMINATOR));
+                    }
                     enteringPip = enterPictureInPictureMode(builder.build());
                 } catch (Exception e) {
                     // This call can fail intentionally if the aspect ratio is too extreme
@@ -199,6 +221,25 @@
             sharedBuilderChanged = true;
         }
 
+        if (getIntent().hasExtra(EXTRA_TITLE)) {
+            sharedBuilder.setTitle(getIntent().getStringExtra(EXTRA_TITLE));
+            sharedBuilderChanged = true;
+        }
+
+        if (getIntent().hasExtra(EXTRA_SUBTITLE)) {
+            sharedBuilder.setSubtitle(getIntent().getStringExtra(EXTRA_SUBTITLE));
+            sharedBuilderChanged = true;
+        }
+
+        if (getIntent().hasExtra(EXTRA_CLOSE_ACTION)) {
+            if (getIntent().getBooleanExtra(EXTRA_CLOSE_ACTION, false)) {
+                sharedBuilder.setCloseAction(createRemoteAction(0));
+            } else {
+                sharedBuilder.setCloseAction(null);
+            }
+            sharedBuilderChanged = true;
+        }
+
         // Enable tap to finish if necessary
         if (getIntent().hasExtra(EXTRA_TAP_TO_FINISH)) {
             setContentView(R.layout.tap_to_finish_pip_layout);
@@ -240,7 +281,9 @@
         filter.addAction(ACTION_SET_REQUESTED_ORIENTATION);
         filter.addAction(ACTION_FINISH);
         filter.addAction(ACTION_ON_PIP_REQUESTED);
-        registerReceiver(mReceiver, filter);
+        filter.addAction(ACTION_CHANGE_ASPECT_RATIO);
+        filter.addAction(ACTION_LAUNCH_TRANSLUCENT_ACTIVITY);
+        registerReceiver(mReceiver, filter, Context.RECEIVER_EXPORTED);
 
         // Don't dump configuration when entering PIP to avoid the verifier getting the intermediate
         // state. In this case it is expected that the verifier will check the changed configuration
@@ -334,7 +377,7 @@
     @Override
     public void onPictureInPictureUiStateChanged(PictureInPictureUiState pipState) {
         Bundle res = new Bundle();
-        res.putBoolean(PIP_CALLBACK_RESULT_KEY, pipState.isStashed());
+        res.putBoolean(UI_STATE_STASHED_RESULT, pipState.isStashed());
         mCb.sendResult(res);
     }
 
@@ -372,4 +415,9 @@
                 "contentDescription " + index,
                 PendingIntent.getBroadcast(this, 0, new Intent(), PendingIntent.FLAG_IMMUTABLE));
     }
+
+    private boolean shouldAddExpandedPipAspectRatios() {
+        return getIntent().hasExtra(EXTRA_EXPANDED_PIP_ASPECT_RATIO_NUMERATOR)
+            && getIntent().hasExtra(EXTRA_EXPANDED_PIP_ASPECT_RATIO_DENOMINATOR);
+    }
 }
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/SplashScreenReplaceIconActivity.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/SplashScreenReplaceIconActivity.java
index 9c66d92..741bc64 100644
--- a/tests/framework/base/windowmanager/app/src/android/server/wm/app/SplashScreenReplaceIconActivity.java
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/SplashScreenReplaceIconActivity.java
@@ -16,66 +16,11 @@
 
 package android.server.wm.app;
 
-import static android.server.wm.app.Components.TestStartingWindowKeys.CANCEL_HANDLE_EXIT;
-import static android.server.wm.app.Components.TestStartingWindowKeys.CENTER_VIEW_IS_SURFACE_VIEW;
-import static android.server.wm.app.Components.TestStartingWindowKeys.CONTAINS_CENTER_VIEW;
-import static android.server.wm.app.Components.TestStartingWindowKeys.DELAY_RESUME;
-import static android.server.wm.app.Components.TestStartingWindowKeys.ICON_ANIMATION_DURATION;
-import static android.server.wm.app.Components.TestStartingWindowKeys.ICON_ANIMATION_START;
-import static android.server.wm.app.Components.TestStartingWindowKeys.RECEIVE_SPLASH_SCREEN_EXIT;
 import static android.server.wm.app.Components.TestStartingWindowKeys.REPLACE_ICON_EXIT;
-import static android.server.wm.app.Components.TestStartingWindowKeys.REQUEST_HANDLE_EXIT_ON_CREATE;
 
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.os.SystemClock;
-import android.server.wm.TestJournalProvider;
-import android.util.Log;
-import android.view.SurfaceView;
-import android.view.View;
-import android.window.SplashScreen;
-import android.window.SplashScreenView;
-
-public class SplashScreenReplaceIconActivity extends Activity {
-    private SplashScreen mSSM;
-    private final SplashScreen.OnExitAnimationListener mSplashScreenExitHandler=
-            this::onSplashScreenExit;
-
+public class SplashScreenReplaceIconActivity extends HandleSplashScreenExitActivity {
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mSSM = getSplashScreen();
-        if (getIntent().getBooleanExtra(REQUEST_HANDLE_EXIT_ON_CREATE, false)) {
-            mSSM.setOnExitAnimationListener(mSplashScreenExitHandler);
-            SystemClock.sleep(500);
-        }
-        if (getIntent().getBooleanExtra(DELAY_RESUME, false)) {
-            SystemClock.sleep(5000);
-        }
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        if (getIntent().getBooleanExtra(CANCEL_HANDLE_EXIT, false)) {
-            mSSM.clearOnExitAnimationListener();
-        }
-    }
-
-    private void onSplashScreenExit(SplashScreenView view) {
-        final Context baseContext = getBaseContext();
-        final View centerView = view.getIconView();
-        final boolean isSurfaceView = view.getIconView() instanceof SurfaceView;
-        TestJournalProvider.putExtras(baseContext, REPLACE_ICON_EXIT, bundle -> {
-            bundle.putBoolean(RECEIVE_SPLASH_SCREEN_EXIT, true);
-            bundle.putBoolean(CONTAINS_CENTER_VIEW, centerView != null);
-            bundle.putLong(ICON_ANIMATION_DURATION, view.getIconAnimationDuration() != null
-                    ? view.getIconAnimationDuration().toMillis() : 0);
-            bundle.putLong(ICON_ANIMATION_START, view.getIconAnimationStart() != null
-                    ? view.getIconAnimationStart().toEpochMilli() : 0);
-            bundle.putBoolean(CENTER_VIEW_IS_SURFACE_VIEW, isSurfaceView);
-        });
-        view.remove();
+    protected String getOwnerKey() {
+        return REPLACE_ICON_EXIT;
     }
 }
diff --git a/tests/framework/base/windowmanager/app/src/android/server/wm/app/SplashScreenStyleThemeActivity.java b/tests/framework/base/windowmanager/app/src/android/server/wm/app/SplashScreenStyleThemeActivity.java
new file mode 100644
index 0000000..47142a3
--- /dev/null
+++ b/tests/framework/base/windowmanager/app/src/android/server/wm/app/SplashScreenStyleThemeActivity.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.app;
+
+import static android.server.wm.app.Components.TestStartingWindowKeys.CONTAINS_CENTER_VIEW;
+import static android.server.wm.app.Components.TestStartingWindowKeys.STYLE_THEME_COMPONENT;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.server.wm.TestJournalProvider;
+import android.window.SplashScreen;
+import android.window.SplashScreenView;
+
+public class SplashScreenStyleThemeActivity extends Activity {
+    private final SplashScreen.OnExitAnimationListener mSplashScreenExitHandler =
+            this::onSplashScreenExit;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        getSplashScreen().setOnExitAnimationListener(mSplashScreenExitHandler);
+    }
+
+    private void onSplashScreenExit(SplashScreenView view) {
+        final Context baseContext = getBaseContext();
+        TestJournalProvider.putExtras(baseContext, STYLE_THEME_COMPONENT,
+                bundle -> bundle.putBoolean(CONTAINS_CENTER_VIEW, view.getIconView() != null));
+        view.remove();
+        finish();
+    }
+}
diff --git a/tests/framework/base/windowmanager/appBackLegacy/Android.bp b/tests/framework/base/windowmanager/appBackLegacy/Android.bp
new file mode 100644
index 0000000..b85bb61
--- /dev/null
+++ b/tests/framework/base/windowmanager/appBackLegacy/Android.bp
@@ -0,0 +1,34 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsBackLegacyApp",
+    srcs: ["src/**/*.java"],
+    manifest: "AndroidManifest.xml",
+    sdk_version: "test_current",
+    defaults: ["cts_defaults"],
+
+    static_libs: ["cts-wm-app-base"],
+
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "sts",
+        "general-tests",
+    ],
+}
diff --git a/tests/framework/base/windowmanager/appBackLegacy/AndroidManifest.xml b/tests/framework/base/windowmanager/appBackLegacy/AndroidManifest.xml
new file mode 100644
index 0000000..60ca52c
--- /dev/null
+++ b/tests/framework/base/windowmanager/appBackLegacy/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2016 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.server.wm.backlegacyapp">
+
+    <uses-sdk android:targetSdkVersion="33"/>
+
+    <application android:label="CtsBackLegacyApp"
+                 android:enableOnBackInvokedCallback="false">
+        <activity android:name=".BackNavigationLegacyActivity"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/tests/framework/base/windowmanager/appBackLegacy/src/android/server/wm/backlegacyapp/BackNavigationLegacyActivity.java b/tests/framework/base/windowmanager/appBackLegacy/src/android/server/wm/backlegacyapp/BackNavigationLegacyActivity.java
new file mode 100644
index 0000000..456f060
--- /dev/null
+++ b/tests/framework/base/windowmanager/appBackLegacy/src/android/server/wm/backlegacyapp/BackNavigationLegacyActivity.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.backlegacyapp;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.server.wm.TestJournalProvider;
+import android.window.OnBackInvokedCallback;
+import android.window.OnBackInvokedDispatcher;
+
+import androidx.annotation.Nullable;
+
+public class BackNavigationLegacyActivity extends Activity {
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        OnBackInvokedCallback onBackInvokedCallback = () -> {
+            TestJournalProvider.putExtras(
+                    BackNavigationLegacyActivity.this,
+                    Components.BACK_LEGACY,
+                    bundle -> bundle.putBoolean(Components.KEY_ON_BACK_INVOKED_CALLED, true));
+        };
+        getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
+                OnBackInvokedDispatcher.PRIORITY_DEFAULT, onBackInvokedCallback
+        );
+    }
+
+    @Override
+    public void onBackPressed() {
+        TestJournalProvider.putExtras(this, Components.BACK_LEGACY,
+                bundle -> bundle.putBoolean(Components.KEY_ON_BACK_PRESSED_CALLED, true));
+        super.onBackPressed();
+    }
+}
diff --git a/tests/framework/base/windowmanager/appBackLegacy/src/android/server/wm/backlegacyapp/Components.java b/tests/framework/base/windowmanager/appBackLegacy/src/android/server/wm/backlegacyapp/Components.java
new file mode 100644
index 0000000..17f8bc5
--- /dev/null
+++ b/tests/framework/base/windowmanager/appBackLegacy/src/android/server/wm/backlegacyapp/Components.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.backlegacyapp;
+
+import android.content.ComponentName;
+import android.server.wm.component.ComponentsBase;
+
+public class Components extends ComponentsBase {
+
+    public static final ComponentName BACK_LEGACY = component(Components.class,
+            "BackNavigationLegacyActivity");
+    public static final String KEY_ON_BACK_PRESSED_CALLED = "KEY_ON_BACK_PRESSED_CALLED";
+    public static final String KEY_ON_BACK_INVOKED_CALLED = "KEY_ON_BACK_INVOKED_CALLED";
+}
diff --git a/tests/framework/base/windowmanager/appSecondUid/src/android/server/wm/second/EmbeddingActivity.java b/tests/framework/base/windowmanager/appSecondUid/src/android/server/wm/second/EmbeddingActivity.java
index aa16584..409bff9 100644
--- a/tests/framework/base/windowmanager/appSecondUid/src/android/server/wm/second/EmbeddingActivity.java
+++ b/tests/framework/base/windowmanager/appSecondUid/src/android/server/wm/second/EmbeddingActivity.java
@@ -40,7 +40,7 @@
         super.onCreate(icicle);
 
         IntentFilter broadcastFilter = new IntentFilter(ACTION_EMBEDDING_TEST_ACTIVITY_START);
-        registerReceiver(mBroadcastReceiver, broadcastFilter);
+        registerReceiver(mBroadcastReceiver, broadcastFilter, Context.RECEIVER_EXPORTED);
     }
 
     @Override
diff --git a/tests/framework/base/windowmanager/app_base/src/android/server/wm/app/TestActivity.java b/tests/framework/base/windowmanager/app_base/src/android/server/wm/app/TestActivity.java
index 6b30644..2a570ac 100644
--- a/tests/framework/base/windowmanager/app_base/src/android/server/wm/app/TestActivity.java
+++ b/tests/framework/base/windowmanager/app_base/src/android/server/wm/app/TestActivity.java
@@ -17,14 +17,15 @@
 package android.server.wm.app;
 
 import static android.server.wm.app.Components.TestActivity.COMMAND_NAVIGATE_UP_TO;
+import static android.server.wm.app.Components.TestActivity.COMMAND_START_ACTIVITIES;
 import static android.server.wm.app.Components.TestActivity.COMMAND_START_ACTIVITY;
 import static android.server.wm.app.Components.TestActivity.EXTRA_CONFIG_ASSETS_SEQ;
 import static android.server.wm.app.Components.TestActivity.EXTRA_FIXED_ORIENTATION;
-import static android.server.wm.app.Components.TestActivity.EXTRA_INTENTS;
 import static android.server.wm.app.Components.TestActivity.EXTRA_INTENT;
+import static android.server.wm.app.Components.TestActivity.EXTRA_INTENTS;
 import static android.server.wm.app.Components.TestActivity.EXTRA_NO_IDLE;
+import static android.server.wm.app.Components.TestActivity.EXTRA_OPTION;
 import static android.server.wm.app.Components.TestActivity.TEST_ACTIVITY_ACTION_FINISH_SELF;
-import static android.server.wm.app.Components.TestActivity.COMMAND_START_ACTIVITIES;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -88,7 +89,8 @@
     @Override
     protected void onStart() {
         super.onStart();
-        registerReceiver(mReceiver, new IntentFilter(TEST_ACTIVITY_ACTION_FINISH_SELF));
+        registerReceiver(mReceiver, new IntentFilter(TEST_ACTIVITY_ACTION_FINISH_SELF),
+                Context.RECEIVER_EXPORTED);
     }
 
     @Override
@@ -108,18 +110,19 @@
 
     @Override
     public void handleCommand(String command, Bundle data) {
+        final Bundle options = data.getParcelable(EXTRA_OPTION);
         switch (command) {
             case COMMAND_START_ACTIVITY:
                 final Intent startIntent = data.getParcelable(EXTRA_INTENT);
                 try {
-                    startActivity(startIntent);
+                    startActivity(startIntent, options);
                 } catch (Exception e) {
                     Log.w(getTag(), "Failed to startActivity: " + startIntent, e);
                 }
                 break;
             case COMMAND_START_ACTIVITIES:
                 final Parcelable[] intents = data.getParcelableArray(EXTRA_INTENTS);
-                startActivities(Arrays.copyOf(intents, intents.length, Intent[].class));
+                startActivities(Arrays.copyOf(intents, intents.length, Intent[].class), options);
                 break;
             case COMMAND_NAVIGATE_UP_TO:
                 final Intent intent = data.getParcelable(EXTRA_INTENT);
diff --git a/tests/framework/base/windowmanager/backgroundactivity/AppA/AndroidManifest.xml b/tests/framework/base/windowmanager/backgroundactivity/AppA/AndroidManifest.xml
index d4de7b1..bc8038a 100755
--- a/tests/framework/base/windowmanager/backgroundactivity/AppA/AndroidManifest.xml
+++ b/tests/framework/base/windowmanager/backgroundactivity/AppA/AndroidManifest.xml
@@ -25,6 +25,8 @@
         <receiver android:name=".StartBackgroundActivityReceiver"
              android:exported="true"/>
         <receiver android:name=".SendPendingIntentReceiver"
+                  android:exported="true"/>
+        <service android:name=".BackgroundActivityTestService"
              android:exported="true"/>
         <receiver android:name=".SimpleAdminReceiver"
              android:permission="android.permission.BIND_DEVICE_ADMIN"
diff --git a/tests/framework/base/windowmanager/backgroundactivity/AppA/src/android/server/wm/backgroundactivity/appa/BackgroundActivityTestService.java b/tests/framework/base/windowmanager/backgroundactivity/AppA/src/android/server/wm/backgroundactivity/appa/BackgroundActivityTestService.java
new file mode 100644
index 0000000..46ef78b
--- /dev/null
+++ b/tests/framework/base/windowmanager/backgroundactivity/AppA/src/android/server/wm/backgroundactivity/appa/BackgroundActivityTestService.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2021 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 android.server.wm.backgroundactivity.appa;
+
+import static android.server.wm.backgroundactivity.appa.Components.APP_A_BACKGROUND_ACTIVITY;
+import static android.server.wm.backgroundactivity.appa.Components.APP_A_START_ACTIVITY_RECEIVER;
+
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+public class BackgroundActivityTestService extends Service {
+    private final IBackgroundActivityTestService mBinder = new MyBinder();
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder.asBinder();
+    }
+
+    private class MyBinder extends IBackgroundActivityTestService.Stub {
+        @Override
+        public PendingIntent generatePendingIntent(boolean isBroadcast) {
+            if (isBroadcast) {
+                // Create a pendingIntent to launch send broadcast to appA and appA will start
+                // background activity.
+                Intent newIntent = new Intent();
+                newIntent.setComponent(APP_A_START_ACTIVITY_RECEIVER);
+                return PendingIntent.getBroadcast(BackgroundActivityTestService.this, 0, newIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+            } else {
+                // Create a pendingIntent to launch appA's BackgroundActivity
+                Intent newIntent = new Intent();
+                newIntent.setComponent(APP_A_BACKGROUND_ACTIVITY);
+                newIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                return PendingIntent.getActivity(BackgroundActivityTestService.this, 0, newIntent,
+                        PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+            }
+        }
+    }
+}
diff --git a/tests/framework/base/windowmanager/backgroundactivity/AppA/src/android/server/wm/backgroundactivity/appa/Components.java b/tests/framework/base/windowmanager/backgroundactivity/AppA/src/android/server/wm/backgroundactivity/appa/Components.java
index 4f1dfcd..06eef12 100644
--- a/tests/framework/base/windowmanager/backgroundactivity/AppA/src/android/server/wm/backgroundactivity/appa/Components.java
+++ b/tests/framework/base/windowmanager/backgroundactivity/AppA/src/android/server/wm/backgroundactivity/appa/Components.java
@@ -33,6 +33,8 @@
             component(Components.class, "StartBackgroundActivityReceiver");
     public static final ComponentName APP_A_SIMPLE_ADMIN_RECEIVER =
             component(Components.class, "SimpleAdminReceiver");
+    public static final ComponentName APP_A_BACKGROUND_ACTIVITY_TEST_SERVICE =
+            component(Components.class, "BackgroundActivityTestService");
 
     /** Extra key constants for {@link #APP_A_FOREGROUND_ACTIVITY}. */
     public static class ForegroundActivity {
diff --git a/tests/framework/base/windowmanager/backgroundactivity/AppA/src/android/server/wm/backgroundactivity/appa/ForegroundActivity.java b/tests/framework/base/windowmanager/backgroundactivity/AppA/src/android/server/wm/backgroundactivity/appa/ForegroundActivity.java
index 9f92875..b4e810a 100644
--- a/tests/framework/base/windowmanager/backgroundactivity/AppA/src/android/server/wm/backgroundactivity/appa/ForegroundActivity.java
+++ b/tests/framework/base/windowmanager/backgroundactivity/AppA/src/android/server/wm/backgroundactivity/appa/ForegroundActivity.java
@@ -93,7 +93,7 @@
         IntentFilter filter = new IntentFilter();
         filter.addAction(ACTION_LAUNCH_BACKGROUND_ACTIVITIES);
         filter.addAction(ACTION_FINISH_ACTIVITY);
-        registerReceiver(mReceiver, filter);
+        registerReceiver(mReceiver, filter, Context.RECEIVER_EXPORTED);
     }
 
     @Override
diff --git a/tests/framework/base/windowmanager/backgroundactivity/AppB/AndroidManifest.xml b/tests/framework/base/windowmanager/backgroundactivity/AppB/AndroidManifest.xml
index 4f1bed6..756827f 100755
--- a/tests/framework/base/windowmanager/backgroundactivity/AppB/AndroidManifest.xml
+++ b/tests/framework/base/windowmanager/backgroundactivity/AppB/AndroidManifest.xml
@@ -23,6 +23,9 @@
             android:name=".StartPendingIntentReceiver"
             android:exported="true"/>
         <activity
+            android:name=".StartPendingIntentActivity"
+            android:exported="true"/>
+        <activity
             android:name=".ForegroundActivity"
             android:exported="true" />
     </application>
diff --git a/tests/framework/base/windowmanager/backgroundactivity/AppB/src/android/server/wm/backgroundactivity/appb/Components.java b/tests/framework/base/windowmanager/backgroundactivity/AppB/src/android/server/wm/backgroundactivity/appb/Components.java
index 9f72fbd..8f6cf1a 100644
--- a/tests/framework/base/windowmanager/backgroundactivity/AppB/src/android/server/wm/backgroundactivity/appb/Components.java
+++ b/tests/framework/base/windowmanager/backgroundactivity/AppB/src/android/server/wm/backgroundactivity/appb/Components.java
@@ -23,9 +23,16 @@
 
     public static final ComponentName APP_B_FOREGROUND_ACTIVITY =
             component(Components.class, "ForegroundActivity");
+    public static final ComponentName APP_B_START_PENDING_INTENT_ACTIVITY =
+            component(Components.class, "StartPendingIntentActivity");
     public static final ComponentName APP_B_START_PENDING_INTENT_RECEIVER =
             component(Components.class, "StartPendingIntentReceiver");
 
+    /** Extra key constants for {@link #APP_B_START_PENDING_INTENT_ACTIVITY} */
+    public static class StartPendingIntentActivity {
+        public static final String ALLOW_BAL_EXTRA = "ALLOW_BAL_EXTRA";
+    }
+
     /** Extra key constants for {@link #APP_B_START_PENDING_INTENT_RECEIVER} */
     public static class StartPendingIntentReceiver {
         public static final String PENDING_INTENT_EXTRA = "PENDING_INTENT_EXTRA";
diff --git a/tests/framework/base/windowmanager/backgroundactivity/AppB/src/android/server/wm/backgroundactivity/appb/StartPendingIntentActivity.java b/tests/framework/base/windowmanager/backgroundactivity/AppB/src/android/server/wm/backgroundactivity/appb/StartPendingIntentActivity.java
new file mode 100644
index 0000000..c1e3f6d
--- /dev/null
+++ b/tests/framework/base/windowmanager/backgroundactivity/AppB/src/android/server/wm/backgroundactivity/appb/StartPendingIntentActivity.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (C) 2021 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 android.server.wm.backgroundactivity.appb;
+
+import static android.server.wm.backgroundactivity.appb.Components.StartPendingIntentActivity.ALLOW_BAL_EXTRA;
+import static android.server.wm.backgroundactivity.appb.Components.StartPendingIntentReceiver.PENDING_INTENT_EXTRA;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.os.Bundle;
+
+/**
+ * Receive pending intent from AppA and launch it
+ */
+public class StartPendingIntentActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle b) {
+        super.onCreate(b);
+        Intent intent = getIntent();
+        final PendingIntent pendingIntent = intent.getParcelableExtra(PENDING_INTENT_EXTRA);
+        final boolean allowBal = intent.getBooleanExtra(ALLOW_BAL_EXTRA, false);
+
+        try {
+            ActivityOptions options = ActivityOptions.makeBasic();
+            options.setPendingIntentBackgroundActivityLaunchAllowed(allowBal);
+            Bundle bundle = options.toBundle();
+            pendingIntent.send(/* context */ null, /* code */0, /* intent */
+                    null, /* onFinished */null, /* handler */
+                    null, /* requiredPermission */ null, bundle);
+        } catch (PendingIntent.CanceledException e) {
+            throw new AssertionError(e);
+        }
+    }
+}
diff --git a/tests/framework/base/windowmanager/backgroundactivity/common/Android.bp b/tests/framework/base/windowmanager/backgroundactivity/common/Android.bp
index 58843ed..2b54222 100644
--- a/tests/framework/base/windowmanager/backgroundactivity/common/Android.bp
+++ b/tests/framework/base/windowmanager/backgroundactivity/common/Android.bp
@@ -19,7 +19,7 @@
 java_test {
     name: "cts-background-activity-common",
 
-    srcs: ["src/**/*.java"],
+    srcs: ["src/**/*.java", "aidl/**/*.aidl"],
 
     static_libs: [
         "androidx.annotation_annotation",
diff --git a/tests/framework/base/windowmanager/backgroundactivity/common/aidl/android/server/wm/backgroundactivity/appa/IBackgroundActivityTestService.aidl b/tests/framework/base/windowmanager/backgroundactivity/common/aidl/android/server/wm/backgroundactivity/appa/IBackgroundActivityTestService.aidl
new file mode 100644
index 0000000..405a290
--- /dev/null
+++ b/tests/framework/base/windowmanager/backgroundactivity/common/aidl/android/server/wm/backgroundactivity/appa/IBackgroundActivityTestService.aidl
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2021 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 android.server.wm.backgroundactivity.appa;
+
+import android.app.PendingIntent;
+
+interface IBackgroundActivityTestService {
+    PendingIntent generatePendingIntent(boolean isBroadcast);
+}
\ No newline at end of file
diff --git a/tests/framework/base/windowmanager/backgroundactivity/src/android/server/wm/BackgroundActivityLaunchTest.java b/tests/framework/base/windowmanager/backgroundactivity/src/android/server/wm/BackgroundActivityLaunchTest.java
index e45e821..a31b697 100644
--- a/tests/framework/base/windowmanager/backgroundactivity/src/android/server/wm/BackgroundActivityLaunchTest.java
+++ b/tests/framework/base/windowmanager/backgroundactivity/src/android/server/wm/BackgroundActivityLaunchTest.java
@@ -21,6 +21,7 @@
 import static android.server.wm.UiDeviceUtils.pressHomeButton;
 import static android.server.wm.WindowManagerState.STATE_INITIALIZING;
 import static android.server.wm.backgroundactivity.appa.Components.APP_A_BACKGROUND_ACTIVITY;
+import static android.server.wm.backgroundactivity.appa.Components.APP_A_BACKGROUND_ACTIVITY_TEST_SERVICE;
 import static android.server.wm.backgroundactivity.appa.Components.APP_A_FOREGROUND_ACTIVITY;
 import static android.server.wm.backgroundactivity.appa.Components.APP_A_SECOND_BACKGROUND_ACTIVITY;
 import static android.server.wm.backgroundactivity.appa.Components.APP_A_SEND_PENDING_INTENT_RECEIVER;
@@ -37,6 +38,9 @@
 import static android.server.wm.backgroundactivity.appa.Components.SendPendingIntentReceiver.IS_BROADCAST_EXTRA;
 import static android.server.wm.backgroundactivity.appa.Components.StartBackgroundActivityReceiver.START_ACTIVITY_DELAY_MS_EXTRA;
 import static android.server.wm.backgroundactivity.appb.Components.APP_B_FOREGROUND_ACTIVITY;
+import static android.server.wm.backgroundactivity.appb.Components.APP_B_START_PENDING_INTENT_ACTIVITY;
+import static android.server.wm.backgroundactivity.appb.Components.StartPendingIntentActivity.ALLOW_BAL_EXTRA;
+import static android.server.wm.backgroundactivity.appb.Components.StartPendingIntentReceiver.PENDING_INTENT_EXTRA;
 import static android.server.wm.backgroundactivity.common.CommonComponents.EVENT_NOTIFIER_EXTRA;
 
 import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
@@ -50,15 +54,21 @@
 import static org.junit.Assert.assertTrue;
 
 import android.Manifest;
+import android.app.PendingIntent;
 import android.app.UiAutomation;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
+import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
+import android.os.IBinder;
 import android.os.ResultReceiver;
+import android.os.SystemProperties;
 import android.os.UserManager;
 import android.platform.test.annotations.Presubmit;
 import android.platform.test.annotations.SystemUserOnly;
+import android.server.wm.backgroundactivity.appa.IBackgroundActivityTestService;
 import android.server.wm.backgroundactivity.common.CommonComponents.Event;
 import android.server.wm.backgroundactivity.common.EventReceiver;
 
@@ -74,6 +84,8 @@
 import org.junit.Test;
 
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.stream.Stream;
 
@@ -113,6 +125,9 @@
      */
     private static final int BROADCAST_DELIVERY_TIMEOUT_MS = 60000;
 
+    private IBackgroundActivityTestService mBackgroundActivityTestService;
+    private ServiceConnection mBalServiceConnection;
+
     @Override
     @Before
     public void setUp() throws Exception {
@@ -145,6 +160,9 @@
         stopTestPackage(TEST_PACKAGE_APP_B);
         AppOpsUtils.reset(APP_A_PACKAGE_NAME);
         AppOpsUtils.reset(SHELL_PACKAGE);
+        if (mBalServiceConnection != null) {
+            mContext.unbindService(mBalServiceConnection);
+        }
     }
 
     @Test
@@ -415,6 +433,21 @@
     }
 
     @Test
+    public void testPendingIntentActivity_whenActivityAllowsBal_isNotBlocked() throws Exception {
+        startPendingIntentSenderActivity(true);
+        boolean result = waitForActivityFocused(APP_A_BACKGROUND_ACTIVITY);
+        assertTrue("Not able to launch background activity", result);
+        assertTaskStack(new ComponentName[]{APP_A_BACKGROUND_ACTIVITY}, APP_A_BACKGROUND_ACTIVITY);
+    }
+
+    @Test
+    public void testPendingIntentActivity_whenActivityDoesNotAllowBal_isBlocked() throws Exception {
+        startPendingIntentSenderActivity(false);
+        boolean result = waitForActivityFocused(APP_A_BACKGROUND_ACTIVITY);
+        assertFalse("Should not able to launch background activity", result);
+    }
+
+    @Test
     @FlakyTest(bugId = 130800326)
     public void testPendingIntentActivityNotBlocked_appAIsForeground() throws Exception {
         // Start AppA foreground activity
@@ -468,7 +501,13 @@
 
     @Test
     public void testPendingIntentBroadcastTimeout_delay12s() throws Exception {
-        assertPendingIntentBroadcastTimeoutTest(12000, false);
+        // This test is testing that activity start is blocked after broadcast allowlist token
+        // timeout. Before the timeout, the start would be allowed because app B (the PI sender) was
+        // in the foreground during PI send, so app A (the PI creator) would have
+        // (10s * hw_multiplier) to start background activity starts.
+        assertPendingIntentBroadcastTimeoutTest(
+                12000 * SystemProperties.getInt("ro.hw_timeout_multiplier", 1),
+                false);
     }
 
     @Test
@@ -730,6 +769,49 @@
         return waitForActivityFocused(ACTIVITY_FOCUS_TIMEOUT_MS, componentName);
     }
 
+    private void setupPendingIntentService() throws Exception {
+        Intent bindIntent = new Intent();
+        bindIntent.setComponent(APP_A_BACKGROUND_ACTIVITY_TEST_SERVICE);
+        final CountDownLatch bindLatch = new CountDownLatch(1);
+
+        mBalServiceConnection = new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+                mBackgroundActivityTestService =
+                        IBackgroundActivityTestService.Stub.asInterface(service);
+                bindLatch.countDown();
+            }
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                mBackgroundActivityTestService = null;
+            }
+        };
+        boolean success = mContext.bindService(bindIntent, mBalServiceConnection,
+                Context.BIND_AUTO_CREATE);
+        assertTrue(success);
+        assertTrue("Timeout connecting to test service",
+                bindLatch.await(1000, TimeUnit.MILLISECONDS));
+    }
+
+    private void startPendingIntentSenderActivity(boolean allowBal) throws Exception {
+        setupPendingIntentService();
+        // Get a PendingIntent created by appA.
+        final PendingIntent pi;
+        try {
+            pi = mBackgroundActivityTestService.generatePendingIntent(false);
+        } catch (Exception e) {
+            throw new AssertionError(e);
+        }
+
+        // Start app B's activity so it runs send() on PendingIntent created by app A.
+        Intent secondIntent = new Intent();
+        secondIntent.setComponent(APP_B_START_PENDING_INTENT_ACTIVITY);
+        secondIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        secondIntent.putExtra(PENDING_INTENT_EXTRA, pi);
+        secondIntent.putExtra(ALLOW_BAL_EXTRA, allowBal);
+        mContext.startActivity(secondIntent);
+    }
+
     private void sendPendingIntentActivity() {
         Intent intent = new Intent();
         intent.setComponent(APP_A_SEND_PENDING_INTENT_RECEIVER);
diff --git a/tests/framework/base/windowmanager/jetpack/AndroidManifest.xml b/tests/framework/base/windowmanager/jetpack/AndroidManifest.xml
index 3b3909a..c7943a4 100644
--- a/tests/framework/base/windowmanager/jetpack/AndroidManifest.xml
+++ b/tests/framework/base/windowmanager/jetpack/AndroidManifest.xml
@@ -32,6 +32,12 @@
         <activity android:name="android.server.wm.jetpack.utils.TestGetWindowLayoutInfoActivity" />
         <activity android:name="android.server.wm.jetpack.utils.TestActivityWithId"
                   android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"
+                  android:exported="true"
+        />
+        <activity android:name="android.server.wm.jetpack.utils.TestActivityKnownEmbeddingCerts"
+                  android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"
+                  android:knownActivityEmbeddingCerts="6a8b96e278e58f62cfe3584022cec1d0527fcb85a9e5d2e1694eb0405be5b599"
+                  android:exported="true"
         />
     </application>
 
diff --git a/tests/framework/base/windowmanager/jetpack/AndroidTest.xml b/tests/framework/base/windowmanager/jetpack/AndroidTest.xml
index d4d2af2..52bd7bb 100644
--- a/tests/framework/base/windowmanager/jetpack/AndroidTest.xml
+++ b/tests/framework/base/windowmanager/jetpack/AndroidTest.xml
@@ -24,6 +24,8 @@
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true"/>
         <option name="test-file-name" value="CtsWindowManagerJetpackTestCases.apk"/>
+        <option name="test-file-name" value="CtsWindowManagerJetpackSecondUidApp.apk" />
+        <option name="test-file-name" value="CtsWindowManagerJetpackSignedApp.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="android.server.wm.jetpack"/>
diff --git a/tests/framework/base/windowmanager/jetpack/SecondApp/Android.bp b/tests/framework/base/windowmanager/jetpack/SecondApp/Android.bp
new file mode 100644
index 0000000..39e3a41
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/SecondApp/Android.bp
@@ -0,0 +1,37 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsWindowManagerJetpackSecondUidApp",
+    defaults: ["cts_support_defaults"],
+
+    static_libs: [
+        "cts-wm-app-base",
+    ],
+
+    srcs: ["src/**/*.java"],
+
+    sdk_version: "current",
+
+    test_suites: [
+        "cts",
+        "sts",
+        "general-tests",
+    ],
+
+}
diff --git a/tests/framework/base/windowmanager/jetpack/SecondApp/AndroidManifest.xml b/tests/framework/base/windowmanager/jetpack/SecondApp/AndroidManifest.xml
new file mode 100755
index 0000000..65428a3
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/SecondApp/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="android.server.wm.jetpack.second">
+
+    <application>
+        <activity
+            android:name=".SecondActivity"
+            android:exported="true" />
+        <activity
+            android:name=".SecondActivityAllowsUntrustedEmbedding"
+            android:allowUntrustedActivityEmbedding="true"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"
+            android:exported="true" />
+        <activity
+            android:name=".SecondActivityUnknownEmbeddingCerts"
+            android:knownActivityEmbeddingCerts="invalid_certificate"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"
+            android:exported="true" />
+    </application>
+</manifest>
diff --git a/tests/framework/base/windowmanager/jetpack/SecondApp/src/android/server/wm/jetpack/second/Components.java b/tests/framework/base/windowmanager/jetpack/SecondApp/src/android/server/wm/jetpack/second/Components.java
new file mode 100644
index 0000000..94f389e
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/SecondApp/src/android/server/wm/jetpack/second/Components.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.jetpack.second;
+
+import android.content.ComponentName;
+import android.server.wm.component.ComponentsBase;
+
+public class Components extends ComponentsBase {
+
+    public static final ComponentName SECOND_ACTIVITY = component("SecondActivity");
+
+    public static final ComponentName SECOND_ACTIVITY_UNKNOWN_EMBEDDING_CERTS =
+            component("SecondActivityUnknownEmbeddingCerts");
+
+    public static final ComponentName SECOND_UNTRUSTED_EMBEDDING_ACTIVITY =
+            component("SecondActivityAllowsUntrustedEmbedding");
+
+    private static ComponentName component(String className) {
+        return component(Components.class, className);
+    }
+}
diff --git a/tests/framework/base/windowmanager/jetpack/SecondApp/src/android/server/wm/jetpack/second/SecondActivity.java b/tests/framework/base/windowmanager/jetpack/SecondApp/src/android/server/wm/jetpack/second/SecondActivity.java
new file mode 100644
index 0000000..c02dc03
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/SecondApp/src/android/server/wm/jetpack/second/SecondActivity.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.jetpack.second;
+
+import android.app.Activity;
+
+/**
+ * A test activity that belongs to UID different from the main test app.
+ */
+public class SecondActivity extends Activity {
+}
diff --git a/tests/framework/base/windowmanager/jetpack/SecondApp/src/android/server/wm/jetpack/second/SecondActivityAllowsUntrustedEmbedding.java b/tests/framework/base/windowmanager/jetpack/SecondApp/src/android/server/wm/jetpack/second/SecondActivityAllowsUntrustedEmbedding.java
new file mode 100644
index 0000000..b943db1
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/SecondApp/src/android/server/wm/jetpack/second/SecondActivityAllowsUntrustedEmbedding.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.jetpack.second;
+
+import android.app.Activity;
+
+/**
+ * A test activity that belongs to UID different from the main test app and allows untrusted
+ * embedding.
+ */
+public class SecondActivityAllowsUntrustedEmbedding extends Activity {
+}
diff --git a/tests/framework/base/windowmanager/jetpack/SecondApp/src/android/server/wm/jetpack/second/SecondActivityKnownEmbeddingCerts.java b/tests/framework/base/windowmanager/jetpack/SecondApp/src/android/server/wm/jetpack/second/SecondActivityKnownEmbeddingCerts.java
new file mode 100644
index 0000000..9bf28dc
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/SecondApp/src/android/server/wm/jetpack/second/SecondActivityKnownEmbeddingCerts.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.jetpack.second;
+
+import android.app.Activity;
+
+/**
+ * A test activity that requests trusted host certificates for embedding that does not match the
+ * certificate of the host in CTS tests from 'android.server.wm.jetpack'.
+ */
+public class SecondActivityKnownEmbeddingCerts extends Activity {
+}
diff --git a/tests/framework/base/windowmanager/jetpack/SignedApp/Android.bp b/tests/framework/base/windowmanager/jetpack/SignedApp/Android.bp
new file mode 100644
index 0000000..624c868
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/SignedApp/Android.bp
@@ -0,0 +1,40 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsWindowManagerJetpackSignedApp",
+    certificate: ":ec-p256",
+    srcs: ["src/**/*.java"],
+    static_libs: [
+        "androidx.test.ext.junit",
+        "androidx.test.rules",
+        "compatibility-device-util-axt",
+        "cts-wm-util",
+        "platform-test-annotations",
+        "cts_window-sidecar",
+        "cts_window-extensions",
+        "cts_window_jetpack_utils",
+    ],
+    // resource_dirs is the default value: ["res"]
+    test_suites: [
+        "cts",
+        "vts",
+        "general-tests",
+    ],
+    sdk_version: "test_current",
+}
diff --git a/tests/framework/base/windowmanager/jetpack/SignedApp/AndroidManifest.xml b/tests/framework/base/windowmanager/jetpack/SignedApp/AndroidManifest.xml
new file mode 100644
index 0000000..94a6fb2
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/SignedApp/AndroidManifest.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.server.wm.jetpack.signed">
+
+    <application>
+        <uses-library android:name="androidx.window.extensions"
+                      android:required="false" />
+        <activity
+            android:name="android.server.wm.jetpack.signed.SignedEmbeddingActivity"
+            android:configChanges="orientation|screenSize|smallestScreenSize|screenLayout|colorMode|density|touchscreen"
+            android:exported="true"
+        />
+    </application>
+</manifest>
diff --git a/tests/framework/base/windowmanager/jetpack/SignedApp/src/android/server/wm/jetpack/signed/Components.java b/tests/framework/base/windowmanager/jetpack/SignedApp/src/android/server/wm/jetpack/signed/Components.java
new file mode 100644
index 0000000..9244c4c
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/SignedApp/src/android/server/wm/jetpack/signed/Components.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.jetpack.signed;
+
+import android.content.ComponentName;
+import android.server.wm.component.ComponentsBase;
+
+public class Components extends ComponentsBase {
+
+    public static final ComponentName SIGNED_EMBEDDING_ACTIVITY =
+            component("SignedEmbeddingActivity");
+
+    private static ComponentName component(String className) {
+        return component(Components.class, className);
+    }
+}
diff --git a/tests/framework/base/windowmanager/jetpack/SignedApp/src/android/server/wm/jetpack/signed/SignedEmbeddingActivity.java b/tests/framework/base/windowmanager/jetpack/SignedApp/src/android/server/wm/jetpack/signed/SignedEmbeddingActivity.java
new file mode 100644
index 0000000..d2f6f2b
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/SignedApp/src/android/server/wm/jetpack/signed/SignedEmbeddingActivity.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.jetpack.signed;
+
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.DEFAULT_SPLIT_RATIO;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.EMBEDDED_ACTIVITY_ID;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.createWildcardSplitPairRule;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.startActivityCrossUidInSplit;
+import static android.server.wm.jetpack.utils.ExtensionUtil.assumeExtensionSupportedDevice;
+import static android.server.wm.jetpack.utils.ExtensionUtil.getWindowExtensions;
+
+import static org.junit.Assume.assumeNotNull;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.os.Bundle;
+import android.server.wm.jetpack.utils.TestActivityKnownEmbeddingCerts;
+import android.server.wm.jetpack.utils.TestValueCountConsumer;
+
+import androidx.window.extensions.WindowExtensions;
+import androidx.window.extensions.embedding.ActivityEmbeddingComponent;
+import androidx.window.extensions.embedding.SplitInfo;
+import androidx.window.extensions.embedding.SplitPairRule;
+
+import org.junit.AssumptionViolatedException;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A test activity that attempts to embed {@link TestActivityKnownEmbeddingCerts} when created.
+ * The app it belongs to is signed with a certificate that is recognized by the target app as a
+ * trusted embedding host.
+ */
+public class SignedEmbeddingActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ActivityEmbeddingComponent embeddingComponent;
+        try {
+            assumeExtensionSupportedDevice();
+            WindowExtensions windowExtensions = getWindowExtensions();
+            assumeNotNull(windowExtensions);
+            embeddingComponent = windowExtensions.getActivityEmbeddingComponent();
+            assumeNotNull(embeddingComponent);
+        } catch (AssumptionViolatedException e) {
+            // Embedding not supported
+            finish();
+            return;
+        }
+
+        TestValueCountConsumer<List<SplitInfo>> splitInfoConsumer = new TestValueCountConsumer<>();
+        embeddingComponent.setSplitInfoCallback(splitInfoConsumer);
+
+        SplitPairRule splitPairRule = new SplitPairRule.Builder(
+                activityActivityPair -> true /* activityActivityPredicate */,
+                activityIntentPair -> true /* activityIntentPredicate */,
+                parentWindowMetrics -> true /* parentWindowMetricsPredicate */)
+                .setSplitRatio(DEFAULT_SPLIT_RATIO).build();
+        embeddingComponent.setEmbeddingRules(Collections.singleton(createWildcardSplitPairRule()));
+
+        // Launch an activity from a different UID that recognizes this package's signature and
+        // verify that it is split with this activity.
+        startActivityCrossUidInSplit(this,
+                new ComponentName("android.server.wm.jetpack",
+                        "android.server.wm.jetpack.utils.TestActivityKnownEmbeddingCerts"),
+                splitPairRule, splitInfoConsumer, EMBEDDED_ACTIVITY_ID, false /* verify */);
+    }
+}
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingBoundsTests.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingBoundsTests.java
new file mode 100644
index 0000000..0377c7a
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingBoundsTests.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2021 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 android.server.wm.jetpack;
+
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.DEFAULT_SPLIT_RATIO;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.UNEVEN_CONTAINERS_DEFAULT_SPLIT_RATIO;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.assertValidSplit;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.startActivityAndVerifySplit;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.waitAndAssertNotVisible;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.waitForFillsTask;
+
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.server.wm.jetpack.utils.TestActivity;
+import android.server.wm.jetpack.utils.TestActivityWithId;
+import android.server.wm.jetpack.utils.TestConfigChangeHandlingActivity;
+import android.util.LayoutDirection;
+import android.util.Pair;
+import android.util.Size;
+
+import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.window.extensions.embedding.SplitPairRule;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Collections;
+import java.util.Set;
+
+/**
+ * Tests for the {@link androidx.window.extensions} implementation provided on the device (and only
+ * if one is available) for the Activity Embedding functionality. Specifically tests activity
+ * split bounds.
+ *
+ * Build/Install/Run:
+ *     atest CtsWindowManagerJetpackTestCases:ActivityEmbeddingBoundsTests
+ */
+@RunWith(AndroidJUnit4.class)
+public class ActivityEmbeddingBoundsTests extends ActivityEmbeddingTestBase {
+
+    /**
+     * Tests that when two activities are in a split and the parent bounds shrink such that
+     * they can no longer support split activities, then the activities become stacked.
+     */
+    @Test
+    public void testParentWindowMetricsPredicate() {
+        // Launch primary activity
+        final Activity primaryActivity = startActivityNewTask(
+                TestConfigChangeHandlingActivity.class);
+
+        // Set split pair rule such that if the parent width is any smaller than it is now, then
+        // the parent cannot support a split.
+        final int originalTaskWidth = getTaskWidth();
+        final SplitPairRule splitPairRule = new SplitPairRule.Builder(
+                activityActivityPair -> true /* activityPairPredicate */,
+                activityIntentPair -> true /* activityIntentPredicate */,
+                parentWindowMetrics -> parentWindowMetrics.getBounds().width() >= originalTaskWidth)
+                .setSplitRatio(DEFAULT_SPLIT_RATIO).build();
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPairRule));
+
+        // Launch the secondary activity
+        final String secondaryActivityId = "secondaryActivityId";
+        final TestActivity secondaryActivity = (TestActivity) startActivityAndVerifySplit(
+                primaryActivity, TestActivityWithId.class, splitPairRule, secondaryActivityId,
+                mSplitInfoConsumer);
+
+        // Resize the display multiple times to verify that the activities are correctly split or
+        // stacked depending on the parent bounds. Resizing multiple times simulates a foldable
+        // display is that folded and unfolded multiple times while running the same app.
+        final int numTimesToResize = 2;
+        final Size originalDisplaySize = mReportedDisplayMetrics.getSize();
+        for (int i = 0; i < numTimesToResize; i++) {
+            // Shrink the display by 10% to make the activities stacked
+            mReportedDisplayMetrics.setSize(new Size((int) (originalDisplaySize.getWidth() * 0.9),
+                    originalDisplaySize.getHeight()));
+            waitForFillsTask(secondaryActivity);
+            waitAndAssertNotVisible(primaryActivity);
+
+            // Return the display to its original size and verify that the activities are split
+            secondaryActivity.resetBoundsChangeCounter();
+            mReportedDisplayMetrics.setSize(originalDisplaySize);
+            assertTrue(secondaryActivity.waitForBoundsChange());
+            assertValidSplit(primaryActivity, secondaryActivity, splitPairRule);
+        }
+    }
+
+    /**
+     * Tests that the activity bounds for activities in a split match the LTR layout direction
+     * provided in the {@link SplitPairRule}.
+     */
+    @Test
+    public void testLayoutDirection_LTR() {
+        // Create a split pair rule with layout direction LTR and a split ratio that results in
+        // uneven bounds between the primary and secondary containers.
+        final SplitPairRule splitPairRule = createUnevenWidthSplitPairRule(LayoutDirection.LTR);
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPairRule));
+
+        // Start activities in a split and verify that the layout direction is LTR, which is
+        // checked in {@link ActivityEmbeddingUtil#startActivityAndVerifySplit}.
+        Activity primaryActivity = startActivityNewTask(TestConfigChangeHandlingActivity.class);
+        startActivityAndVerifySplit(primaryActivity, TestActivityWithId.class, splitPairRule,
+                "secondaryActivityId", mSplitInfoConsumer);
+    }
+
+    /**
+     * Tests that the activity bounds for activities in a split match the RTL layout direction
+     * provided in the {@link SplitPairRule}.
+     */
+    @Test
+    public void testLayoutDirection_RTL() {
+        // Create a split pair rule with layout direction RTL and a split ratio that results in
+        // uneven bounds between the primary and secondary containers.
+        final SplitPairRule splitPairRule = createUnevenWidthSplitPairRule(LayoutDirection.RTL);
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPairRule));
+
+        // Start activities in a split and verify that the layout direction is RTL, which is
+        // checked in {@link ActivityEmbeddingUtil#startActivityAndVerifySplit}.
+        Activity primaryActivity = startActivityNewTask(TestConfigChangeHandlingActivity.class);
+        startActivityAndVerifySplit(primaryActivity, TestActivityWithId.class, splitPairRule,
+                "secondaryActivityId", mSplitInfoConsumer);
+    }
+
+    /**
+     * Tests that the activity bounds for activities in a split match the Locale layout direction
+     * provided in the {@link SplitPairRule}.
+     */
+    @Test
+    public void testLayoutDirection_Locale() {
+        // Create a split pair rule with layout direction LOCALE and a split ratio that results in
+        // uneven bounds between the primary and secondary containers.
+        final SplitPairRule splitPairRule = createUnevenWidthSplitPairRule(LayoutDirection.LOCALE);
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPairRule));
+
+        // Start activities in a split and verify that the layout direction is the device locale,
+        // which is checked in {@link ActivityEmbeddingUtil#startActivityAndVerifySplit}.
+        Activity primaryActivity = startActivityNewTask(TestConfigChangeHandlingActivity.class);
+        startActivityAndVerifySplit(primaryActivity, TestActivityWithId.class, splitPairRule,
+                "secondaryActivityId", mSplitInfoConsumer);
+    }
+
+    /**
+     * Tests that when two activities enter a split, then their split ratio matches what is in their
+     * {@link SplitPairRule}, and is not assumed to be 0.5 or match the split ratio of the previous
+     * top-most activity split.
+     */
+    @Test
+    public void testSplitRatio() {
+        final String activityAId = "activityA";
+        final String activityBId = "activityB";
+        final String activityCId = "activityC";
+        final float activityABSplitRatio = 0.37f;
+        final float activityBCSplitRatio = 0.85f;
+
+        // Create a split rule for activity A and activity B where the split ratio is 0.37.
+        final SplitPairRule splitPairRuleAB = new SplitPairRule.Builder(
+                activityActivityPair -> false /* activityPairPredicate */,
+                activityIntentPair -> matchesActivityIntentPair(activityIntentPair, activityAId,
+                        activityBId) /* activityIntentPredicate */,
+                parentWindowMetrics -> true /* parentWindowMetricsPredicate */)
+                .setSplitRatio(activityABSplitRatio).build();
+
+        // Create a split rule for activity B and activity C where the split ratio is 0.65.
+        final SplitPairRule splitPairRuleBC = new SplitPairRule.Builder(
+                activityActivityPair -> false /* activityPairPredicate */,
+                activityIntentPair -> matchesActivityIntentPair(activityIntentPair, activityBId,
+                        activityCId) /* activityIntentPredicate */,
+                parentWindowMetrics -> true /* parentWindowMetricsPredicate */)
+                .setSplitRatio(activityBCSplitRatio).build();
+
+        // Register the two split pair rules
+        mActivityEmbeddingComponent.setEmbeddingRules(Set.of(splitPairRuleAB, splitPairRuleBC));
+
+        // Launch the activity A and B split and verify that the split ratio is 0.37 in
+        // {@link ActivityEmbeddingUtil#startActivityAndVerifySplit}.
+        Activity activityA = startActivityNewTask(TestActivityWithId.class, activityAId);
+        Activity activityB = startActivityAndVerifySplit(activityA, TestActivityWithId.class,
+                splitPairRuleAB, activityBId, mSplitInfoConsumer);
+
+        // Launch the activity B and C split and verify that the split ratio is 0.65 in
+        // {@link ActivityEmbeddingUtil#startActivityAndVerifySplit}.
+        Activity activityC = startActivityAndVerifySplit(activityB, TestActivityWithId.class,
+                splitPairRuleBC, activityCId, mSplitInfoConsumer);
+
+        // Finish activity C so that activity A and B are in a split again. Verify that the split
+        // ratio returns to 0.37 in {@link ActivityEmbeddingUtil#assertValidSplit}.
+        activityC.finish();
+        assertValidSplit(activityA, activityB, splitPairRuleAB);
+    }
+
+    private SplitPairRule createUnevenWidthSplitPairRule(int layoutDir) {
+        return new SplitPairRule.Builder(activityActivityPair -> true /* activityPairPredicate */,
+                activityIntentPair -> true /* activityIntentPredicate */,
+                parentWindowMetrics -> true /* parentWindowMetricsPredicate */)
+                .setSplitRatio(UNEVEN_CONTAINERS_DEFAULT_SPLIT_RATIO)
+                .setLayoutDirection(layoutDir).build();
+    }
+
+    private boolean matchesActivityIntentPair(@NonNull Pair<Activity, Intent> activityIntentPair,
+            @NonNull String primaryActivityId, @NonNull String secondaryActivityId) {
+        if (!(activityIntentPair.first instanceof TestActivityWithId)) {
+            return false;
+        }
+        return primaryActivityId.equals(((TestActivityWithId) activityIntentPair.first).getId())
+                && secondaryActivityId.equals(activityIntentPair.second.getStringExtra(
+                        ACTIVITY_ID_LABEL));
+    }
+}
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingCrossUidTests.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingCrossUidTests.java
new file mode 100644
index 0000000..ff16142
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingCrossUidTests.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.jetpack;
+
+import static android.server.wm.jetpack.second.Components.SECOND_ACTIVITY;
+import static android.server.wm.jetpack.second.Components.SECOND_ACTIVITY_UNKNOWN_EMBEDDING_CERTS;
+import static android.server.wm.jetpack.second.Components.SECOND_UNTRUSTED_EMBEDDING_ACTIVITY;
+import static android.server.wm.jetpack.signed.Components.SIGNED_EMBEDDING_ACTIVITY;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.DEFAULT_SPLIT_RATIO;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.EMBEDDED_ACTIVITY_ID;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.startActivityCrossUidInSplit;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.startActivityCrossUidInSplit_expectFail;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.waitAndAssertResumed;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.server.wm.NestedShellPermission;
+import android.server.wm.jetpack.utils.TestActivityWithId;
+import android.server.wm.jetpack.utils.TestConfigChangeHandlingActivity;
+import android.util.Pair;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.window.extensions.embedding.SplitPairRule;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Collections;
+import java.util.function.Predicate;
+
+/**
+ * Tests for the {@link androidx.window.extensions} implementation provided on the device (and only
+ * if one is available) for the Activity Embedding functionality. Specifically tests activity
+ * launch scenarios across UIDs.
+ *
+ * Build/Install/Run:
+ *     atest CtsWindowManagerJetpackTestCases:ActivityEmbeddingCrossUidTests
+ */
+@RunWith(AndroidJUnit4.class)
+public class ActivityEmbeddingCrossUidTests extends ActivityEmbeddingTestBase {
+
+    @Override
+    @After
+    public void tearDown() {
+        super.tearDown();
+        ActivityManager am = mContext.getSystemService(ActivityManager.class);
+        NestedShellPermission.run(() -> am.forceStopPackage("android.server.wm.jetpack.second"));
+        NestedShellPermission.run(() -> am.forceStopPackage("android.server.wm.jetpack.signed"));
+    }
+
+    /**
+     * Tests that embedding an activity across UIDs is not allowed.
+     */
+    @Test
+    public void testCrossUidActivityEmbeddingIsNotAllowed() {
+        Activity primaryActivity = startActivityNewTask(TestConfigChangeHandlingActivity.class);
+
+        // Only the primary activity can be in a split with another activity
+        final Predicate<Pair<Activity, Activity>> activityActivityPredicate =
+                activityActivityPair -> primaryActivity.equals(activityActivityPair.first);
+
+        SplitPairRule splitPairRule = new SplitPairRule.Builder(
+                activityActivityPredicate, activityIntentPair -> true /* activityIntentPredicate */,
+                parentWindowMetrics -> true /* parentWindowMetricsPredicate */)
+                .setSplitRatio(DEFAULT_SPLIT_RATIO).build();
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPairRule));
+
+        // Launch an activity from a different UID and verify that it is not split with the primary
+        // activity.
+        startActivityCrossUidInSplit_expectFail(primaryActivity, SECOND_ACTIVITY,
+                mSplitInfoConsumer);
+    }
+
+    /**
+     * Tests that embedding an activity across UIDs is not allowed if an activity requires a
+     * permission that the host doesn't have.
+     */
+    @Test
+    public void testCrossUidActivityEmbeddingIsNotAllowedWithoutPermission() {
+        Activity primaryActivity = startActivityNewTask(TestConfigChangeHandlingActivity.class);
+
+        // Only the primary activity can be in a split with another activity
+        final Predicate<Pair<Activity, Activity>> activityActivityPredicate =
+                activityActivityPair -> primaryActivity.equals(activityActivityPair.first);
+
+        SplitPairRule splitPairRule = new SplitPairRule.Builder(
+                activityActivityPredicate, activityIntentPair -> true /* activityIntentPredicate */,
+                parentWindowMetrics -> true /* parentWindowMetricsPredicate */)
+                .setSplitRatio(DEFAULT_SPLIT_RATIO).build();
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPairRule));
+
+        // Launch an activity from a different UID and verify that it is not split with the primary
+        // activity.
+        startActivityCrossUidInSplit_expectFail(primaryActivity,
+                SECOND_ACTIVITY_UNKNOWN_EMBEDDING_CERTS, mSplitInfoConsumer);
+    }
+
+    /**
+     * Tests that embedding an activity across UIDs is allowed if an activity requires a
+     * permission that the host has.
+     */
+    @Test
+    public void testCrossUidActivityEmbeddingIsAllowedWithPermission() {
+        // Start an activity that will attempt to embed TestActivityKnownEmbeddingCerts
+        startActivityNewTask(SIGNED_EMBEDDING_ACTIVITY);
+
+        waitAndAssertResumed(EMBEDDED_ACTIVITY_ID);
+        TestActivityWithId embeddedActivity = getResumedActivityById(EMBEDDED_ACTIVITY_ID);
+        assertNotNull(embeddedActivity);
+        assertTrue(mActivityEmbeddingComponent.isActivityEmbedded(embeddedActivity));
+    }
+
+    /**
+     * Tests that embedding an activity across UIDs is allowed if the app has opted in to allow
+     * untrusted embedding.
+     */
+    @Test
+    public void testUntrustedCrossUidActivityEmbeddingIsAllowedWithOptIn() {
+        Activity primaryActivity = startActivityNewTask(TestConfigChangeHandlingActivity.class);
+
+        // Only the primary activity can be in a split with another activity
+        final Predicate<Pair<Activity, Activity>> activityActivityPredicate =
+                activityActivityPair -> primaryActivity.equals(activityActivityPair.first);
+
+        SplitPairRule splitPairRule = new SplitPairRule.Builder(
+                activityActivityPredicate, activityIntentPair -> true /* activityIntentPredicate */,
+                parentWindowMetrics -> true /* parentWindowMetricsPredicate */)
+                .setSplitRatio(DEFAULT_SPLIT_RATIO).build();
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPairRule));
+
+        // Launch an activity from a different UID and verify that it is split with the primary
+        // activity.
+        startActivityCrossUidInSplit(primaryActivity, SECOND_UNTRUSTED_EMBEDDING_ACTIVITY,
+                splitPairRule, mSplitInfoConsumer, "id", true /* verify */);
+    }
+}
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingFinishTests.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingFinishTests.java
index 3b1afc5..c1fa777 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingFinishTests.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingFinishTests.java
@@ -17,17 +17,27 @@
 package android.server.wm.jetpack;
 
 
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.DEFAULT_SPLIT_RATIO;
 import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.createWildcardSplitPairRule;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.startActivityAndVerifyNotSplit;
 import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.startActivityAndVerifySplit;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.verifyFillsTask;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.waitAndAssertFinishing;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.waitAndAssertResumed;
+
+import static androidx.window.extensions.embedding.SplitRule.FINISH_ADJACENT;
+import static androidx.window.extensions.embedding.SplitRule.FINISH_ALWAYS;
+import static androidx.window.extensions.embedding.SplitRule.FINISH_NEVER;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
-import android.server.wm.jetpack.utils.ActivityEmbeddingTestBase;
 import android.server.wm.jetpack.utils.TestActivity;
 import android.server.wm.jetpack.utils.TestActivityWithId;
 import android.server.wm.jetpack.utils.TestConfigChangeHandlingActivity;
+import android.util.Pair;
+import android.view.WindowMetrics;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.window.extensions.embedding.SplitInfo;
@@ -38,6 +48,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Predicate;
 
 /**
  * Tests for the {@link androidx.window.extensions} implementation provided on the device (and only
@@ -105,4 +116,259 @@
         List<SplitInfo> splitInfoList = mSplitInfoConsumer.waitAndGet();
         assertTrue(splitInfoList.isEmpty());
     }
+
+    /**
+     * Tests that when finishPrimaryWithSecondary is set to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_NEVER} when the activities are
+     * stacked, then finishing the secondary activity does not cause the primary activity to finish.
+     */
+    @Test
+    public void testFinishPrimaryWithSecondary_ActivitiesStacked_FinishNever() {
+        // Setup test scenario
+        Pair<TestActivity, TestActivity> activityPair = new PairedFinishBehaviorScenario()
+                .preventSplitActivities().setFinishPrimaryWithSecondary(FINISH_NEVER).start();
+        // Verify the paired finish behavior
+        activityPair.second.finish();
+        waitAndAssertResumed(activityPair.first);
+    }
+
+    /**
+     * Tests that when finishPrimaryWithSecondary is set to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_ADJACENT} when the activities
+     * are stacked, then finishing the secondary activity does not cause the primary activity to
+     * finish because the activities were not adjacent.
+     */
+    @Test
+    public void testFinishPrimaryWithSecondary_ActivitiesStacked_FinishAdjacent() {
+        // Setup test scenario
+        Pair<TestActivity, TestActivity> activityPair = new PairedFinishBehaviorScenario()
+                .preventSplitActivities().setFinishPrimaryWithSecondary(FINISH_ADJACENT).start();
+        // Verify the paired finish behavior
+        activityPair.second.finish();
+        waitAndAssertResumed(activityPair.first);
+    }
+
+    /**
+     * Tests that when finishPrimaryWithSecondary is set to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_ALWAYS} when the activities are
+     * stacked, then finishing the secondary activity causes the primary activity to finish even
+     * though the activities are stacked.
+     */
+    @Test
+    public void testFinishPrimaryWithSecondary_ActivitiesStacked_FinishAlways() {
+        // Setup test scenario
+        Pair<TestActivity, TestActivity> activityPair = new PairedFinishBehaviorScenario()
+                .preventSplitActivities().setFinishPrimaryWithSecondary(FINISH_ALWAYS).start();
+        // Verify the paired finish behavior
+        activityPair.second.finish();
+        waitAndAssertFinishing(activityPair.first);
+    }
+
+    /**
+     * Tests that when finishPrimaryWithSecondary is set to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_NEVER} when the activities are
+     * split, then finishing the secondary activity does not cause the primary activity to finish.
+     */
+    @Test
+    public void testFinishPrimaryWithSecondary_ActivitiesSplit_FinishNever() {
+        // Setup test scenario
+        Pair<TestActivity, TestActivity> activityPair = new PairedFinishBehaviorScenario()
+                .setFinishPrimaryWithSecondary(FINISH_NEVER).start();
+        // Verify the paired finish behavior
+        activityPair.first.resetBoundsChangeCounter();
+        activityPair.second.finish();
+        assertTrue(activityPair.first.waitForBoundsChange());
+        verifyFillsTask(activityPair.first);
+    }
+
+    /**
+     * Tests that when finishPrimaryWithSecondary is set to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_ADJACENT} when the activities
+     * are split, then finishing the secondary activity causes the primary activity to finish
+     * because the activities were in a split.
+     */
+    @Test
+    public void testFinishPrimaryWithSecondary_ActivitiesSplit_FinishAdjacent() {
+        // Setup test scenario
+        Pair<TestActivity, TestActivity> activityPair = new PairedFinishBehaviorScenario()
+                .setFinishPrimaryWithSecondary(FINISH_ADJACENT).start();
+        // Verify the paired finish behavior
+        activityPair.second.finish();
+        waitAndAssertFinishing(activityPair.first);
+    }
+
+    /**
+     * Tests that when finishPrimaryWithSecondary is set to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_ALWAYS} when the activities are
+     * split, then finishing the secondary activity causes the primary activity to finish.
+     */
+    @Test
+    public void testFinishPrimaryWithSecondary_ActivitiesSplit_FinishAlways() {
+        // Setup test scenario
+        Pair<TestActivity, TestActivity> activityPair = new PairedFinishBehaviorScenario()
+                .setFinishPrimaryWithSecondary(FINISH_ALWAYS).start();
+        // Verify the paired finish behavior
+        activityPair.second.finish();
+        waitAndAssertFinishing(activityPair.first);
+    }
+
+    /**
+     * Tests that when finishSecondaryWithPrimary is set to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_NEVER} when the activities are
+     * stacked, then finishing the primary activity does not cause the secondary activity to finish.
+     */
+    @Test
+    public void testFinishSecondaryWithPrimary_ActivitiesStacked_FinishNever() {
+        // Setup test scenario
+        Pair<TestActivity, TestActivity> activityPair = new PairedFinishBehaviorScenario()
+                .preventSplitActivities().setFinishSecondaryWithPrimary(FINISH_NEVER).start();
+        // Verify the paired finish behavior
+        activityPair.first.finish();
+        waitAndAssertResumed(activityPair.second);
+    }
+
+    /**
+     * Tests that when finishSecondaryWithPrimary is set to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_ADJACENT} when the activities
+     * are stacked, then finishing the primary activity does not cause the secondary activity to
+     * finish because the activities were not adjacent.
+     */
+    @Test
+    public void testFinishSecondaryWithPrimary_ActivitiesStacked_FinishAdjacent() {
+        // Setup test scenario
+        Pair<TestActivity, TestActivity> activityPair = new PairedFinishBehaviorScenario()
+                .preventSplitActivities().setFinishSecondaryWithPrimary(FINISH_ADJACENT).start();
+        // Verify the paired finish behavior
+        activityPair.first.finish();
+        waitAndAssertResumed(activityPair.second);
+    }
+
+    /**
+     * Tests that when finishSecondaryWithPrimary is set to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_ALWAYS} when the activities are
+     * stacked, then finishing the primary activity causes the secondary activity to finish even
+     * though the activities are stacked.
+     */
+    @Test
+    public void testFinishSecondaryWithPrimary_ActivitiesStacked_FinishAlways() {
+        // Setup test scenario
+        Pair<TestActivity, TestActivity> activityPair = new PairedFinishBehaviorScenario()
+                .preventSplitActivities().setFinishSecondaryWithPrimary(FINISH_ALWAYS).start();
+        // Verify the paired finish behavior
+        activityPair.first.finish();
+        waitAndAssertFinishing(activityPair.second);
+    }
+
+    /**
+     * Tests that when finishSecondaryWithPrimary is set to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_NEVER} when the activities are
+     * split, then finishing the primary activity does not cause the secondary activity to finish.
+     */
+    @Test
+    public void testFinishSecondaryWithPrimary_ActivitiesSplit_FinishNever() {
+        // Setup test scenario
+        Pair<TestActivity, TestActivity> activityPair = new PairedFinishBehaviorScenario()
+                .setFinishSecondaryWithPrimary(FINISH_NEVER).start();
+        // Verify the paired finish behavior
+        activityPair.second.resetBoundsChangeCounter();
+        activityPair.first.finish();
+        assertTrue(activityPair.second.waitForBoundsChange());
+        verifyFillsTask(activityPair.second);
+    }
+
+    /**
+     * Tests that when finishSecondaryWithPrimary is set to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_ADJACENT} when the activities
+     * are split, then finishing the primary activity causes the secondary activity to finish
+     * because the activities were in a split.
+     */
+    @Test
+    public void testFinishSecondaryWithPrimary_ActivitiesSplit_FinishAdjacent() {
+        // Setup test scenario
+        Pair<TestActivity, TestActivity> activityPair = new PairedFinishBehaviorScenario()
+                .setFinishSecondaryWithPrimary(FINISH_ADJACENT).start();
+        // Verify the paired finish behavior
+        activityPair.first.finish();
+        waitAndAssertFinishing(activityPair.second);
+    }
+
+    /**
+     * Tests that when finishSecondaryWithPrimary is set to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_ALWAYS} when the activities are
+     * split, then finishing the primary activity causes the secondary activity to finish.
+     */
+    @Test
+    public void testFinishSecondaryWithPrimary_ActivitiesSplit_FinishAlways() {
+        // Setup test scenario
+        Pair<TestActivity, TestActivity> activityPair = new PairedFinishBehaviorScenario()
+                .setFinishSecondaryWithPrimary(FINISH_ALWAYS).start();
+        // Verify the paired finish behavior
+        activityPair.first.finish();
+        waitAndAssertFinishing(activityPair.second);
+    }
+
+    /**
+     * Utility class to set up a paired finish behavior test. The class makes it easy to specify
+     * whether the two test activities should be stacked or split and set the split pair rules
+     * with a specific paired finish behavior.
+     */
+    private class PairedFinishBehaviorScenario {
+        // Set the unset value to never be equal to any of the possible values
+        private static final int UNSET_PAIRED_FINISH_BEHAVIOR = FINISH_NEVER + FINISH_ADJACENT
+                + FINISH_ALWAYS;
+        private int mFinishPrimaryWithSecondary = UNSET_PAIRED_FINISH_BEHAVIOR;
+        private int mFinishSecondaryWithPrimary = UNSET_PAIRED_FINISH_BEHAVIOR;
+        private boolean mShouldPreventSideBySideActivities;
+
+        public PairedFinishBehaviorScenario preventSplitActivities() {
+            mShouldPreventSideBySideActivities = true;
+            return this;
+        }
+
+        public PairedFinishBehaviorScenario setFinishPrimaryWithSecondary(
+                int finishPrimaryWithSecondary) {
+            mFinishPrimaryWithSecondary = finishPrimaryWithSecondary;
+            return this;
+        }
+
+        public PairedFinishBehaviorScenario setFinishSecondaryWithPrimary(
+                int finishSecondaryWithPrimary) {
+            mFinishSecondaryWithPrimary = finishSecondaryWithPrimary;
+            return this;
+        }
+
+        public Pair<TestActivity, TestActivity> start() {
+            // Set the split pair rule
+            Predicate<WindowMetrics> parentWindowMetricsPredicate =
+                    mShouldPreventSideBySideActivities
+                            ? windowMetrics -> false : windowMetrics -> true;
+            SplitPairRule.Builder splitPairRuleBuilder = new SplitPairRule.Builder(
+                    activityActivityPair -> true /* any two activities can be split */,
+                    activityIntentPair -> true /* any intent will put an activity into a split */,
+                    parentWindowMetricsPredicate).setSplitRatio(DEFAULT_SPLIT_RATIO);
+            // Only set paired finish behavior if an explicit value is set, otherwise use the
+            // default library implementation.
+            if (mFinishPrimaryWithSecondary != UNSET_PAIRED_FINISH_BEHAVIOR) {
+                splitPairRuleBuilder.setFinishPrimaryWithSecondary(mFinishPrimaryWithSecondary);
+            }
+            if (mFinishSecondaryWithPrimary != UNSET_PAIRED_FINISH_BEHAVIOR) {
+                splitPairRuleBuilder.setFinishSecondaryWithPrimary(mFinishSecondaryWithPrimary);
+            }
+            final SplitPairRule splitPairRule = splitPairRuleBuilder.build();
+            mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPairRule));
+
+            // Launch the two activities
+            TestActivity primaryActivity = (TestActivity)
+                    startActivityNewTask(TestConfigChangeHandlingActivity.class);
+            TestActivity secondaryActivity;
+            if (mShouldPreventSideBySideActivities) {
+                secondaryActivity = startActivityAndVerifyNotSplit(primaryActivity);
+            } else {
+                secondaryActivity = (TestActivity) startActivityAndVerifySplit(primaryActivity,
+                        TestActivityWithId.class, splitPairRule, "secondaryActivity",
+                        mSplitInfoConsumer);
+            }
+            return new Pair<>(primaryActivity, secondaryActivity);
+        }
+    }
 }
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingLaunchTests.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingLaunchTests.java
index 2614f3d..38c34f1 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingLaunchTests.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingLaunchTests.java
@@ -22,14 +22,13 @@
 import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.getPrimaryStackTopActivity;
 import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.getSecondaryStackTopActivity;
 import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.startActivityAndVerifySplit;
-import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.waitForResumed;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.waitAndAssertResumed;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
 import android.content.Intent;
-import android.server.wm.jetpack.utils.ActivityEmbeddingTestBase;
 import android.server.wm.jetpack.utils.TestActivityWithId;
 import android.server.wm.jetpack.utils.TestConfigChangeHandlingActivity;
 import android.util.Pair;
@@ -92,19 +91,16 @@
                     Integer.toString(activityLaunchIndex) /* secondActivityId */,
                     mSplitInfoConsumer);
 
-            // Verify the split states match with the current and previous launches
+            // Verify that the secondary container has all the secondary activities
             secondaryActivities.add(secondaryActivity);
             final List<SplitInfo> lastReportedSplitInfoList =
                     mSplitInfoConsumer.getLastReportedValue();
             splitInfosList.add(lastReportedSplitInfoList);
-            assertEquals(secondaryActivities.size(), lastReportedSplitInfoList.size());
-            for (int splitInfoIndex = 0; splitInfoIndex < lastReportedSplitInfoList.size();
-                    splitInfoIndex++) {
-                final SplitInfo splitInfo = lastReportedSplitInfoList.get(splitInfoIndex);
-                assertEquals(primaryActivity, getPrimaryStackTopActivity(splitInfo));
-                assertEquals(secondaryActivities.get(splitInfoIndex),
-                        getSecondaryStackTopActivity(splitInfo));
-            }
+            assertEquals(1, lastReportedSplitInfoList.size());
+            final SplitInfo splitInfo = lastReportedSplitInfoList.get(0);
+            assertEquals(primaryActivity, getPrimaryStackTopActivity(splitInfo));
+            assertEquals(secondaryActivities, splitInfo.getSecondaryActivityStack()
+                    .getActivities());
         }
 
         // Iteratively finish each secondary activity and verify that the primary activity is split
@@ -259,14 +255,14 @@
                 alwaysExpandedActivityId);
 
         // Verify that the always expanded activity is resumed and fills its parent
-        waitForResumed(alwaysExpandedActivityId);
+        waitAndAssertResumed(alwaysExpandedActivityId);
         Activity alwaysExpandedActivity = getResumedActivityById(alwaysExpandedActivityId);
         assertEquals(getMaximumActivityBounds(alwaysExpandedActivity),
                 getActivityBounds(alwaysExpandedActivity));
 
         // Finish the always expanded activity and verify that the split is resumed
         alwaysExpandedActivity.finish();
-        waitForResumed(Arrays.asList(primaryActivity, secondaryActivity));
+        waitAndAssertResumed(Arrays.asList(primaryActivity, secondaryActivity));
         assertValidSplit(primaryActivity, secondaryActivity, splitPairRule);
     }
 
@@ -300,14 +296,14 @@
                 alwaysExpandedActivityId);
 
         // Verify that the always expanded activity is resumed and fills its parent
-        waitForResumed(alwaysExpandedActivityId);
+        waitAndAssertResumed(alwaysExpandedActivityId);
         Activity alwaysExpandedActivity = getResumedActivityById(alwaysExpandedActivityId);
         assertEquals(getMaximumActivityBounds(alwaysExpandedActivity),
                 getActivityBounds(alwaysExpandedActivity));
 
         // Finish the always expanded activity and verify that the split is resumed
         alwaysExpandedActivity.finish();
-        waitForResumed(Arrays.asList(primaryActivity, secondaryActivity));
+        waitAndAssertResumed(Arrays.asList(primaryActivity, secondaryActivity));
         assertValidSplit(primaryActivity, secondaryActivity, splitPairRule);
     }
 
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingPlaceholderTests.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingPlaceholderTests.java
new file mode 100644
index 0000000..bc00111
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingPlaceholderTests.java
@@ -0,0 +1,362 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.jetpack;
+
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.DEFAULT_SPLIT_RATIO;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.assertValidSplit;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.verifyFillsTask;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.waitAndAssertFinishing;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.waitAndAssertNotResumed;
+import static android.server.wm.jetpack.utils.ActivityEmbeddingUtil.waitAndAssertResumed;
+
+import static androidx.window.extensions.embedding.SplitRule.FINISH_NEVER;
+
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.server.wm.jetpack.utils.TestActivity;
+import android.server.wm.jetpack.utils.TestActivityWithId;
+import android.util.Pair;
+import android.util.Size;
+import android.view.WindowMetrics;
+
+import androidx.annotation.NonNull;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.window.extensions.embedding.SplitPlaceholderRule;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.function.Predicate;
+
+/**
+ * Tests for the {@link androidx.window.extensions} implementation provided on the device (and only
+ * if one is available) for the placeholders functionality within Activity Embedding. An activity
+ * can provide a {@link SplitPlaceholderRule} to the {@link ActivityEmbeddingComponent} which will
+ * enable the activity to launch directly into a split with the placeholder activity it is
+ * configured to launch with.
+ *
+ * Build/Install/Run:
+ *     atest CtsWindowManagerJetpackTestCases:ActivityEmbeddingPlaceholderTests
+ */
+@RunWith(AndroidJUnit4.class)
+public class ActivityEmbeddingPlaceholderTests extends ActivityEmbeddingTestBase {
+
+    private static final String PRIMARY_ACTIVITY_ID = "primaryActivity";
+    private static final String PLACEHOLDER_ACTIVITY_ID = "placeholderActivity";
+
+    /**
+     * Tests that an activity with a matching {@link SplitPlaceholderRule} is successfully able to
+     * launch into a split with its placeholder.
+     */
+    @Test
+    public void testPlaceholderLaunchesWithPrimaryActivity() {
+        // Set embedding rules
+        final SplitPlaceholderRule splitPlaceholderRule =
+                new SplitPlaceholderRuleBuilderWithDefaults(PRIMARY_ACTIVITY_ID,
+                        PLACEHOLDER_ACTIVITY_ID).build();
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPlaceholderRule));
+
+        // Launch activity with placeholder
+        final Pair<Activity, Activity> activityPair = launchActivityWithPlaceholderAndVerifySplit(
+                PRIMARY_ACTIVITY_ID, PLACEHOLDER_ACTIVITY_ID, splitPlaceholderRule);
+        final Activity primaryActivity = activityPair.first;
+        final Activity placeholderActivity = activityPair.second;
+
+        // Finishing the primary activity and verify that the placeholder activity is also finishing
+        primaryActivity.finish();
+        waitAndAssertFinishing(placeholderActivity);
+    }
+
+    /**
+     * Tests that when the parent window metrics predicate in a {@link SplitPlaceholderRule} does
+     * not allow for a split on the current parent window metrics, then when an activity with a
+     * placeholder rule is launched, the placeholder is not launched.
+     */
+    @Test
+    public void testPlaceholderDoesNotLaunchWhenParentMetricsDoNotAllow() {
+        // Set embedding rules where the parent window metrics do not allow for a placeholder
+        final SplitPlaceholderRule splitPlaceholderRule =
+                new SplitPlaceholderRuleBuilderWithDefaults(PRIMARY_ACTIVITY_ID,
+                        PLACEHOLDER_ACTIVITY_ID)
+                        .setParentWindowMetrics(parentWindowMetrics -> false).build();
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPlaceholderRule));
+
+        // Launch the primary activity and verify that the placeholder activity was not launched and
+        // the primary activity fills the task.
+        Activity primaryActivity = startActivityNewTask(TestActivityWithId.class,
+                PRIMARY_ACTIVITY_ID);
+        waitAndAssertNotResumed(PLACEHOLDER_ACTIVITY_ID);
+        verifyFillsTask(primaryActivity);
+    }
+
+    /**
+     * Tests that when the placeholder activity is finished, then the activity it launched with is
+     * also finished because the default value for finishPrimaryWithSecondary is
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_ALWAYS}.
+     */
+    @Test
+    public void testFinishingPlaceholderFinishesPrimaryActivity() {
+        // Set embedding rules
+        final SplitPlaceholderRule splitPlaceholderRule =
+                new SplitPlaceholderRuleBuilderWithDefaults(PRIMARY_ACTIVITY_ID,
+                        PLACEHOLDER_ACTIVITY_ID).build();
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPlaceholderRule));
+
+        // Launch activity with placeholder
+        final Pair<Activity, Activity> activityPair = launchActivityWithPlaceholderAndVerifySplit(
+                PRIMARY_ACTIVITY_ID, PLACEHOLDER_ACTIVITY_ID, splitPlaceholderRule);
+        final Activity primaryActivity = activityPair.first;
+        final Activity placeholderActivity = activityPair.second;
+
+        // Finish the placeholder activity and verify that the primary activity is also finishing
+        placeholderActivity.finish();
+        waitAndAssertFinishing(primaryActivity);
+    }
+
+    /**
+     * Tests that when a placeholder activity that is created from a rule that sets
+     * finishPrimaryWithSecondary to
+     * {@link androidx.window.extensions.embedding.SplitRule.FINISH_NEVER} is finished, then the
+     * activity it launched with is not finished.
+     */
+    @Test
+    public void testPlaceholderFinishPrimaryWithSecondary_FinishNever() {
+        // Set embedding rules with finishPrimaryWithSecondary set to FINISH_NEVER
+        final SplitPlaceholderRule splitPlaceholderRule =
+                new SplitPlaceholderRuleBuilderWithDefaults(PRIMARY_ACTIVITY_ID,
+                        PLACEHOLDER_ACTIVITY_ID).setFinishPrimaryWithSecondary(FINISH_NEVER)
+                        .build();
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPlaceholderRule));
+
+        // Launch activity with placeholder
+        final Pair<Activity, Activity> activityPair = launchActivityWithPlaceholderAndVerifySplit(
+                PRIMARY_ACTIVITY_ID, PLACEHOLDER_ACTIVITY_ID, splitPlaceholderRule);
+        final TestActivity primaryActivity = (TestActivity) activityPair.first;
+        final Activity placeholderActivity = activityPair.second;
+
+        // Finish the placeholder activity and verify that the primary activity does not finish
+        // and fills the task.
+        primaryActivity.resetBoundsChangeCounter();
+        placeholderActivity.finish();
+        assertTrue(primaryActivity.waitForBoundsChange());
+        verifyFillsTask(primaryActivity);
+    }
+
+    /**
+     * Tests that when the task width is decreased below the width that can support split
+     * activities, then the placeholder activity is finished.
+     */
+    @Test
+    public void testPlaceholderFinishedWhenTaskWidthDecreased() {
+        final int taskWidth = getTaskWidth();
+
+        // Set embedding rules with the parent window metrics only allowing side-by-side activities
+        // on a task width at least the current width.
+        final SplitPlaceholderRule splitPlaceholderRule =
+                new SplitPlaceholderRuleBuilderWithDefaults(PRIMARY_ACTIVITY_ID,
+                        PLACEHOLDER_ACTIVITY_ID)
+                        .setParentWindowMetrics(
+                                windowMetrics -> windowMetrics.getBounds().width() >= taskWidth)
+                        .build();
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPlaceholderRule));
+
+        // Launch activity with placeholder
+        final Pair<Activity, Activity> activityPair = launchActivityWithPlaceholderAndVerifySplit(
+                PRIMARY_ACTIVITY_ID, PLACEHOLDER_ACTIVITY_ID, splitPlaceholderRule);
+        final TestActivity primaryActivity = (TestActivity) activityPair.first;
+        final Activity placeholderActivity = activityPair.second;
+
+        // Shrink display width by 10% so that the primary and placeholder activities are stacked
+        primaryActivity.resetBoundsChangeCounter();
+        final Size currentSize = mReportedDisplayMetrics.getSize();
+        mReportedDisplayMetrics.setSize(new Size((int) (currentSize.getWidth() * 0.9),
+                currentSize.getHeight()));
+
+        // Verify that the placeholder activity was finished and that the primary activity now
+        // fills the task.
+        waitAndAssertFinishing(placeholderActivity);
+        assertTrue(primaryActivity.waitForBoundsChange());
+        verifyFillsTask(primaryActivity);
+    }
+
+    /**
+     * Tests that when the task width is increased to a width large enough to support a placeholder,
+     * then a placeholder activity is launched.
+     */
+    @Test
+    public void testPlaceholderLaunchedWhenTaskWidthIncreased() {
+        final int taskWidth = getTaskWidth();
+
+        // Set embedding rules with the parent window metrics only allowing side-by-side activities
+        // on a task width 5% wider than the current task width.
+        final SplitPlaceholderRule splitPlaceholderRule =
+                new SplitPlaceholderRuleBuilderWithDefaults(PRIMARY_ACTIVITY_ID,
+                        PLACEHOLDER_ACTIVITY_ID)
+                        .setParentWindowMetrics(
+                                windowMetrics ->
+                                        windowMetrics.getBounds().width() >= taskWidth * 1.05)
+                        .build();
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPlaceholderRule));
+
+        // Launch activity and verify that it fills the task and that a placeholder activity is
+        // not launched
+        Activity primaryActivity = startActivityNewTask(TestActivityWithId.class,
+                PRIMARY_ACTIVITY_ID);
+        verifyFillsTask(primaryActivity);
+        waitAndAssertNotResumed(PLACEHOLDER_ACTIVITY_ID);
+
+        // Increase display width by 10% so that the primary and placeholder activities are stacked
+        final Size currentSize = mReportedDisplayMetrics.getSize();
+        mReportedDisplayMetrics.setSize(new Size((int) (currentSize.getWidth() * 1.1),
+                currentSize.getHeight()));
+
+        // Verify that the placeholder activity is launched into a split with the primary activity
+        waitAndAssertResumed(PLACEHOLDER_ACTIVITY_ID);
+        Activity placeholderActivity = getResumedActivityById(PLACEHOLDER_ACTIVITY_ID);
+        assertValidSplit(primaryActivity, placeholderActivity, splitPlaceholderRule);
+    }
+
+    /**
+     * Tests that when an activity is launched with a sticky placeholder, then resizing the task
+     * such that it can no longer support split activities does not cause the placeholder activity
+     * to finish.
+     */
+    @Test
+    public void testStickyPlaceholder() {
+        final int taskWidth = getTaskWidth();
+
+        // Set embedding rules with isSticky set to true and the parent window metrics only allowing
+        // side-by-side activities on a task width at least the current width.
+        final SplitPlaceholderRule splitPlaceholderRule =
+                new SplitPlaceholderRuleBuilderWithDefaults(PRIMARY_ACTIVITY_ID,
+                        PLACEHOLDER_ACTIVITY_ID).setIsSticky(true)
+                        .setParentWindowMetrics(
+                                windowMetrics -> windowMetrics.getBounds().width() >= taskWidth)
+                        .build();
+        mActivityEmbeddingComponent.setEmbeddingRules(Collections.singleton(splitPlaceholderRule));
+
+        // Launch activity with placeholder
+        final Pair<Activity, Activity> activityPair = launchActivityWithPlaceholderAndVerifySplit(
+                PRIMARY_ACTIVITY_ID, PLACEHOLDER_ACTIVITY_ID, splitPlaceholderRule);
+        final TestActivity placeholderActivity = (TestActivity) activityPair.second;
+
+        // Shrink display width by 10% so that the primary and placeholder activities are stacked
+        placeholderActivity.resetBoundsChangeCounter();
+        final Size currentSize = mReportedDisplayMetrics.getSize();
+        mReportedDisplayMetrics.setSize(new Size((int) (currentSize.getWidth() * 0.9),
+                currentSize.getHeight()));
+
+        // Verify that the placeholder was not finished and fills the task
+        assertTrue(placeholderActivity.waitForBoundsChange());
+        verifyFillsTask(placeholderActivity);
+        waitAndAssertResumed(Arrays.asList(placeholderActivity));
+    }
+
+    /**
+     * Convenience builder for a SplitPlaceholderRule with default values.
+     */
+    private class SplitPlaceholderRuleBuilderWithDefaults {
+        private final String mPrimaryActivityId;
+        private final String mPlaceholderActivityId;
+
+        // By default, allow any parent window metrics to allow a placeholder to be launched
+        private Predicate<WindowMetrics> mParentWindowMetricsPredicate = windowMetrics -> true;
+
+        private Optional<Integer> mFinishPrimaryWithSecondary = Optional.empty();
+        private Optional<Boolean> mIsSticky = Optional.empty();
+
+        SplitPlaceholderRuleBuilderWithDefaults(@NonNull String primaryActivityId,
+                @NonNull String placeholderActivityId) {
+            mPrimaryActivityId = primaryActivityId;
+            mPlaceholderActivityId = placeholderActivityId;
+        }
+
+        public SplitPlaceholderRuleBuilderWithDefaults setParentWindowMetrics(
+                Predicate<WindowMetrics> parentWindowMetricsPredicate) {
+            mParentWindowMetricsPredicate = parentWindowMetricsPredicate;
+            return this;
+        }
+
+        public SplitPlaceholderRuleBuilderWithDefaults setFinishPrimaryWithSecondary(
+                int finishPrimaryWithSecondary) {
+            mFinishPrimaryWithSecondary = Optional.of(finishPrimaryWithSecondary);
+            return this;
+        }
+
+        public SplitPlaceholderRuleBuilderWithDefaults setIsSticky(boolean isSticky) {
+            mIsSticky = Optional.of(isSticky);
+            return this;
+        }
+
+        public SplitPlaceholderRule build() {
+            // Create placeholder activity intent
+            Intent placeholderIntent = new Intent(mContext, TestActivityWithId.class);
+            placeholderIntent.putExtra(ACTIVITY_ID_LABEL, mPlaceholderActivityId);
+
+            // Create {@link SplitPlaceholderRule} that launches the placeholder in a split with the
+            // target primary activity.
+            SplitPlaceholderRule.Builder splitPlaceholderRuleBuilder =
+                    new SplitPlaceholderRule.Builder(placeholderIntent,
+                            activity -> activity instanceof TestActivityWithId
+                                    && mPrimaryActivityId.equals(((TestActivityWithId) activity)
+                                    .getId()) /* activityPredicate */,
+                            intent -> mPrimaryActivityId.equals(
+                                    intent.getStringExtra(ACTIVITY_ID_LABEL)) /* intentPredicate */,
+                    mParentWindowMetricsPredicate)
+                    .setSplitRatio(DEFAULT_SPLIT_RATIO);
+
+            // Only set finishPrimaryWithSecondary if an explicit value is present
+            if (mFinishPrimaryWithSecondary.isPresent()) {
+                splitPlaceholderRuleBuilder.setFinishPrimaryWithSecondary(
+                        mFinishPrimaryWithSecondary.get());
+            }
+
+            // Only set isSticky if an explicit value is present
+            if (mIsSticky.isPresent()) {
+                splitPlaceholderRuleBuilder.setSticky(mIsSticky.get());
+            }
+
+            return splitPlaceholderRuleBuilder.build();
+        }
+    }
+
+    /**
+     * Launches an activity that has a placeholder and verifies that the placeholder launches to
+     * the side of the activity.
+     */
+    @NonNull
+    private Pair<Activity, Activity> launchActivityWithPlaceholderAndVerifySplit(
+            @NonNull String primaryActivityId, @NonNull String placeholderActivityId,
+            @NonNull SplitPlaceholderRule splitPlaceholderRule) {
+        // Launch the primary activity
+        startActivityNewTask(TestActivityWithId.class, primaryActivityId);
+        // Get primary activity
+        waitAndAssertResumed(primaryActivityId);
+        Activity primaryActivity = getResumedActivityById(primaryActivityId);
+        // Get placeholder activity
+        waitAndAssertResumed(placeholderActivityId);
+        Activity placeholderActivity = getResumedActivityById(placeholderActivityId);
+        // Verify they are correctly split
+        assertValidSplit(primaryActivity, placeholderActivity, splitPlaceholderRule);
+        return new Pair<>(primaryActivity, placeholderActivity);
+    }
+}
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingTestBase.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingTestBase.java
new file mode 100644
index 0000000..9867569
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ActivityEmbeddingTestBase.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.jetpack;
+
+import static android.server.wm.jetpack.utils.ExtensionUtil.assumeExtensionSupportedDevice;
+import static android.server.wm.jetpack.utils.ExtensionUtil.getWindowExtensions;
+
+import static org.junit.Assume.assumeNotNull;
+
+import android.server.wm.ActivityManagerTestBase.ReportedDisplayMetrics;
+import android.server.wm.jetpack.utils.TestValueCountConsumer;
+import android.server.wm.jetpack.utils.WindowManagerJetpackTestBase;
+import android.view.Display;
+
+import androidx.window.extensions.WindowExtensions;
+import androidx.window.extensions.embedding.ActivityEmbeddingComponent;
+import androidx.window.extensions.embedding.SplitInfo;
+
+import org.junit.After;
+import org.junit.Before;
+
+import java.util.List;
+
+/**
+ * Base test class for the {@link androidx.window.extensions} implementation provided on the device
+ * (and only if one is available) for the Activity Embedding functionality.
+ */
+public class ActivityEmbeddingTestBase extends WindowManagerJetpackTestBase {
+
+    protected ActivityEmbeddingComponent mActivityEmbeddingComponent;
+    protected TestValueCountConsumer<List<SplitInfo>> mSplitInfoConsumer;
+    protected ReportedDisplayMetrics mReportedDisplayMetrics =
+            ReportedDisplayMetrics.getDisplayMetrics(Display.DEFAULT_DISPLAY);
+
+    @Override
+    @Before
+    public void setUp() {
+        super.setUp();
+        assumeExtensionSupportedDevice();
+        WindowExtensions windowExtensions = getWindowExtensions();
+        assumeNotNull(windowExtensions);
+        mActivityEmbeddingComponent = windowExtensions.getActivityEmbeddingComponent();
+        assumeNotNull(mActivityEmbeddingComponent);
+        mSplitInfoConsumer = new TestValueCountConsumer<>();
+        mActivityEmbeddingComponent.setSplitInfoCallback(mSplitInfoConsumer);
+    }
+
+    @After
+    public void cleanUp() {
+        mReportedDisplayMetrics.restoreDisplayMetrics();
+    }
+}
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ExtensionWindowLayoutComponentTest.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ExtensionWindowLayoutComponentTest.java
index d8c804f..7162a44 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ExtensionWindowLayoutComponentTest.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/ExtensionWindowLayoutComponentTest.java
@@ -18,50 +18,33 @@
 
 import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
 import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
-import static android.server.wm.jetpack.utils.ExtensionUtil.MINIMUM_EXTENSION_VERSION;
 import static android.server.wm.jetpack.utils.ExtensionUtil.assertEqualWindowLayoutInfo;
 import static android.server.wm.jetpack.utils.ExtensionUtil.assumeExtensionSupportedDevice;
 import static android.server.wm.jetpack.utils.ExtensionUtil.assumeHasDisplayFeatures;
 import static android.server.wm.jetpack.utils.ExtensionUtil.getExtensionWindowLayoutComponent;
 import static android.server.wm.jetpack.utils.ExtensionUtil.getExtensionWindowLayoutInfo;
-import static android.server.wm.jetpack.utils.ExtensionUtil.getWindowExtensions;
-import static android.server.wm.jetpack.utils.ExtensionUtil.isExtensionVersionValid;
 import static android.server.wm.jetpack.utils.SidecarUtil.assumeSidecarSupportedDevice;
 import static android.server.wm.jetpack.utils.SidecarUtil.getSidecarInterface;
-import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.areExtensionAndSidecarDeviceStateEqual;
-import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.assertNotBothDimensionsZero;
-import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.assertHasNonNegativeDimensions;
-import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.doesDisplayRotateForOrientation;
-import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.getActivityBounds;
-import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.getActivityWindowToken;
-import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.getMaximumActivityBounds;
-import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.setActivityOrientationActivityDoesNotHandleOrientationChanges;
-import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.setActivityOrientationActivityHandlesOrientationChanges;
+
+import static androidx.window.extensions.layout.FoldingFeature.STATE_FLAT;
+import static androidx.window.extensions.layout.FoldingFeature.STATE_HALF_OPENED;
+import static androidx.window.extensions.layout.FoldingFeature.TYPE_FOLD;
+import static androidx.window.extensions.layout.FoldingFeature.TYPE_HINGE;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeNotNull;
-import static org.junit.Assume.assumeTrue;
 
-import static androidx.window.extensions.layout.FoldingFeature.TYPE_FOLD;
-import static androidx.window.extensions.layout.FoldingFeature.TYPE_HINGE;
-import static androidx.window.extensions.layout.FoldingFeature.STATE_FLAT;
-import static androidx.window.extensions.layout.FoldingFeature.STATE_HALF_OPENED;
-
-import android.app.Activity;
 import android.graphics.Rect;
-import android.server.wm.jetpack.utils.WindowManagerJetpackTestBase;
+import android.platform.test.annotations.Presubmit;
 import android.server.wm.jetpack.utils.TestActivity;
 import android.server.wm.jetpack.utils.TestConfigChangeHandlingActivity;
 import android.server.wm.jetpack.utils.TestValueCountConsumer;
-import android.platform.test.annotations.Presubmit;
+import android.server.wm.jetpack.utils.WindowManagerJetpackTestBase;
 
-import androidx.annotation.NonNull;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.window.extensions.layout.DisplayFeature;
@@ -78,7 +61,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.util.Collections;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
@@ -93,7 +75,6 @@
  *     atest CtsWindowManagerJetpackTestCases:ExtensionWindowLayoutComponentTest
  */
 @LargeTest
-@Presubmit
 @RunWith(AndroidJUnit4.class)
 public class ExtensionWindowLayoutComponentTest extends WindowManagerJetpackTestBase {
 
@@ -111,6 +92,41 @@
         assumeNotNull(mWindowLayoutComponent);
     }
 
+    /**
+     * Test adding and removing a window layout change listener.
+     */
+    @Test
+    public void testWindowLayoutComponent_onWindowLayoutChangeListener() throws Exception {
+        // Set activity to portrait
+        setActivityOrientationActivityDoesNotHandleOrientationChanges(mActivity,
+                ORIENTATION_PORTRAIT);
+
+        // Create the callback, onWindowLayoutChanged should only be called twice in this
+        // test, not the third time when the orientation will change because the listener will be
+        // removed.
+        TestValueCountConsumer<WindowLayoutInfo> windowLayoutInfoConsumer =
+                new TestValueCountConsumer<>();
+        windowLayoutInfoConsumer.setCount(2);
+
+        // Add window layout listener for mWindowToken - onWindowLayoutChanged should be called
+        mWindowLayoutComponent.addWindowLayoutInfoListener(mActivity, windowLayoutInfoConsumer);
+
+        // Change the activity orientation - onWindowLayoutChanged should be called
+        setActivityOrientationActivityDoesNotHandleOrientationChanges(mActivity,
+                ORIENTATION_LANDSCAPE);
+
+        // Remove the listener
+        mWindowLayoutComponent.removeWindowLayoutInfoListener(windowLayoutInfoConsumer);
+
+        // Change the activity orientation - onWindowLayoutChanged should NOT be called
+        setActivityOrientationActivityDoesNotHandleOrientationChanges(mActivity,
+                ORIENTATION_PORTRAIT);
+
+        // Check that the countdown is zero
+        WindowLayoutInfo lastValue = windowLayoutInfoConsumer.waitAndGet();
+        assertNotNull(lastValue);
+    }
+
     @Test
     public void testWindowLayoutComponent_WindowLayoutInfoListener() {
         TestValueCountConsumer<WindowLayoutInfo> windowLayoutInfoConsumer =
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/SidecarTest.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/SidecarTest.java
index 85ae95d..f0b5a7c 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/SidecarTest.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/SidecarTest.java
@@ -46,7 +46,6 @@
 import android.content.pm.ActivityInfo;
 import android.graphics.Rect;
 import android.os.IBinder;
-import android.platform.test.annotations.FlakyTest;
 import android.platform.test.annotations.Presubmit;
 import android.server.wm.jetpack.utils.WindowManagerJetpackTestBase;
 import android.server.wm.jetpack.utils.SidecarCallbackCounter;
@@ -55,6 +54,7 @@
 import android.server.wm.jetpack.utils.TestGetWindowLayoutInfoActivity;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.LargeTest;
 
 import androidx.window.sidecar.SidecarDeviceState;
@@ -79,7 +79,6 @@
  *     atest CtsWindowManagerJetpackTestCases:SidecarTest
  */
 @LargeTest
-@Presubmit
 @RunWith(AndroidJUnit4.class)
 public class SidecarTest extends WindowManagerJetpackTestBase {
     private static final String TAG = "SidecarTest";
@@ -103,6 +102,7 @@
     /**
      * Test adding and removing a sidecar interface window layout change listener.
      */
+    @FlakyTest(bugId = 206697963)
     @Test
     public void testSidecarInterface_onWindowLayoutChangeListener() {
         // Set activity to portrait
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ActivityEmbeddingTestBase.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ActivityEmbeddingTestBase.java
deleted file mode 100644
index 6717820..0000000
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ActivityEmbeddingTestBase.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2021 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 android.server.wm.jetpack.utils;
-
-import static android.server.wm.jetpack.utils.ExtensionUtil.assumeExtensionSupportedDevice;
-import static android.server.wm.jetpack.utils.ExtensionUtil.getWindowExtensions;
-
-import static org.junit.Assume.assumeNotNull;
-
-import androidx.window.extensions.WindowExtensions;
-import androidx.window.extensions.embedding.ActivityEmbeddingComponent;
-import androidx.window.extensions.embedding.SplitInfo;
-
-import org.junit.Before;
-
-import java.util.List;
-
-/**
- * Base test class for the {@link androidx.window.extensions} implementation provided on the device
- * (and only if one is available) for the Activity Embedding functionality.
- */
-public class ActivityEmbeddingTestBase extends WindowManagerJetpackTestBase {
-
-    protected ActivityEmbeddingComponent mActivityEmbeddingComponent;
-    protected TestValueCountConsumer<List<SplitInfo>> mSplitInfoConsumer;
-
-    @Override
-    @Before
-    public void setUp() {
-        super.setUp();
-        assumeExtensionSupportedDevice();
-        WindowExtensions windowExtensions = getWindowExtensions();
-        assumeNotNull(windowExtensions);
-        mActivityEmbeddingComponent = windowExtensions.getActivityEmbeddingComponent();
-        assumeNotNull(mActivityEmbeddingComponent);
-        mSplitInfoConsumer = new TestValueCountConsumer<>();
-        mActivityEmbeddingComponent.setSplitInfoCallback(mSplitInfoConsumer);
-    }
-}
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ActivityEmbeddingUtil.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ActivityEmbeddingUtil.java
index fbdfc3a..0e415aa 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ActivityEmbeddingUtil.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/ActivityEmbeddingUtil.java
@@ -16,11 +16,11 @@
 
 package android.server.wm.jetpack.utils;
 
-import static android.server.wm.jetpack.utils.ExtensionUtil.assumeExtensionSupportedDevice;
 import static android.server.wm.jetpack.utils.ExtensionUtil.getWindowExtensions;
 import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.getActivityBounds;
 import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.getMaximumActivityBounds;
 import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.getResumedActivityById;
+import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.isActivityResumed;
 import static android.server.wm.jetpack.utils.WindowManagerJetpackTestBase.startActivityFromActivity;
 
 import static org.junit.Assert.assertEquals;
@@ -28,15 +28,11 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeTrue;
 
 import android.app.Activity;
-import android.app.Application;
-import android.app.Instrumentation;
-import android.content.Context;
+import android.content.ComponentName;
 import android.content.Intent;
 import android.graphics.Rect;
-import android.os.Looper;
 import android.util.LayoutDirection;
 import android.util.Log;
 import android.util.Pair;
@@ -44,21 +40,16 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.test.ext.junit.runners.AndroidJUnit4;
-import androidx.window.extensions.WindowExtensions;
 import androidx.window.extensions.embedding.ActivityEmbeddingComponent;
-import androidx.window.extensions.embedding.EmbeddingRule;
 import androidx.window.extensions.embedding.SplitInfo;
 import androidx.window.extensions.embedding.SplitPairRule;
 import androidx.window.extensions.embedding.SplitRule;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
 import java.util.function.Predicate;
 
 /**
@@ -67,8 +58,10 @@
 public class ActivityEmbeddingUtil {
 
     public static final String TAG = "ActivityEmbeddingTests";
-    public static final long WAIT_FOR_RESUMED_TIMEOUT_MS = 3000;
+    public static final long WAIT_FOR_LIFECYCLE_TIMEOUT_MS = 3000;
     public static final float DEFAULT_SPLIT_RATIO = 0.5f;
+    public static final float UNEVEN_CONTAINERS_DEFAULT_SPLIT_RATIO = 0.7f;
+    public static final String EMBEDDED_ACTIVITY_ID = "embedded_activity_id";
 
     @NonNull
     public static SplitPairRule createWildcardSplitPairRule(boolean shouldClearTop) {
@@ -91,18 +84,34 @@
         return createWildcardSplitPairRule(false /* shouldClearTop */);
     }
 
+    public static TestActivity startActivityAndVerifyNotSplit(
+            @NonNull Activity activityLaunchingFrom) {
+        final String secondActivityId = "secondActivityId";
+        // Launch second activity
+        startActivityFromActivity(activityLaunchingFrom, TestActivityWithId.class,
+                secondActivityId);
+        // Verify both activities are in the correct lifecycle state
+        waitAndAssertResumed(secondActivityId);
+        assertFalse(isActivityResumed(activityLaunchingFrom));
+        TestActivity secondActivity = getResumedActivityById(secondActivityId);
+        // Verify the second activity is not split with the first
+        verifyFillsTask(secondActivity);
+        return secondActivity;
+    }
+
     public static Activity startActivityAndVerifySplit(@NonNull Activity activityLaunchingFrom,
             @NonNull Activity expectedPrimaryActivity, @NonNull Class secondActivityClass,
-            @NonNull SplitPairRule splitPairRule, @NonNull String secondActivityId,
+            @NonNull SplitPairRule splitPairRule, @NonNull String secondaryActivityId,
             int expectedCallbackCount,
             @NonNull TestValueCountConsumer<List<SplitInfo>> splitInfoConsumer) {
         // Set the expected callback count
         splitInfoConsumer.setCount(expectedCallbackCount);
 
         // Start second activity
-        startActivityFromActivity(activityLaunchingFrom, secondActivityClass, secondActivityId);
+        startActivityFromActivity(activityLaunchingFrom, secondActivityClass, secondaryActivityId);
 
-        // Get updated split info
+        // A split info callback should occur after the new activity is launched because the split
+        // states have changed.
         List<SplitInfo> activeSplitStates = null;
         try {
             activeSplitStates = splitInfoConsumer.waitAndGet();
@@ -110,15 +119,17 @@
             fail("startActivityAndVerifySplit() InterruptedException");
         }
 
-        // Get second activity from split info
-        Activity secondActivity = getSecondActivity(activeSplitStates, expectedPrimaryActivity,
-                secondActivityId);
-        assertNotNull(secondActivity);
+        // Wait for secondary activity to be resumed and verify that the newly sent split info
+        // contains the secondary activity.
+        waitAndAssertResumed(secondaryActivityId);
+        final Activity secondaryActivity = getResumedActivityById(secondaryActivityId);
+        assertTrue(splitInfoTopSplitIsCorrect(activeSplitStates, expectedPrimaryActivity,
+                secondaryActivity));
 
-        assertValidSplit(expectedPrimaryActivity, secondActivity, splitPairRule);
+        assertValidSplit(expectedPrimaryActivity, secondaryActivity, splitPairRule);
 
         // Return second activity for easy access in calling method
-        return secondActivity;
+        return secondaryActivity;
     }
 
     public static Activity startActivityAndVerifySplit(@NonNull Activity primaryActivity,
@@ -138,6 +149,63 @@
                 secondActivityId, 1 /* expectedCallbackCount */, splitInfoConsumer);
     }
 
+    /**
+     * Attempts to start an activity from a different UID into a split, verifies that a new split
+     * is active.
+     */
+    public static void startActivityCrossUidInSplit(@NonNull Activity primaryActivity,
+            @NonNull ComponentName secondActivityComponent, @NonNull SplitPairRule splitPairRule,
+            @NonNull TestValueCountConsumer<List<SplitInfo>> splitInfoConsumer,
+            @NonNull String secondActivityId, boolean verifySplitState) {
+        startActivityFromActivity(primaryActivity, secondActivityComponent, secondActivityId);
+        if (!verifySplitState) {
+            return;
+        }
+
+        // Get updated split info
+        splitInfoConsumer.setCount(1);
+        List<SplitInfo> activeSplitStates = null;
+        try {
+            activeSplitStates = splitInfoConsumer.waitAndGet();
+        } catch (InterruptedException e) {
+            fail("startActivityCrossUidInSplit() InterruptedException");
+        }
+        assertNotNull(activeSplitStates);
+        assertFalse(activeSplitStates.isEmpty());
+        // Verify that the primary activity is on top of the primary stack
+        SplitInfo topSplit = activeSplitStates.get(activeSplitStates.size() - 1);
+        List<Activity> primaryStackActivities = topSplit.getPrimaryActivityStack()
+                .getActivities();
+        assertEquals(primaryActivity,
+                primaryStackActivities.get(primaryStackActivities.size() - 1));
+        // Verify that the secondary stack is reported as empty to developers
+        assertTrue(topSplit.getSecondaryActivityStack().getActivities().isEmpty());
+
+        assertValidSplit(primaryActivity, null /* secondaryActivity */,
+                splitPairRule);
+    }
+
+    /**
+     * Attempts to start an activity from a different UID into a split, verifies that activity
+     * start did not succeed and no new split is active.
+     */
+    public static void startActivityCrossUidInSplit_expectFail(@NonNull Activity primaryActivity,
+            @NonNull ComponentName secondActivityComponent,
+            @NonNull TestValueCountConsumer<List<SplitInfo>> splitInfoConsumer) {
+        boolean startExceptionObserved = false;
+        try {
+            startActivityFromActivity(primaryActivity, secondActivityComponent, "secondActivityId");
+        } catch (SecurityException e) {
+            startExceptionObserved = true;
+        }
+        assertTrue(startExceptionObserved);
+
+        // No split should be active, primary activity should be covered by the new one.
+        waitForVisible(primaryActivity, false /* visible */);
+        List<SplitInfo> activeSplitStates = splitInfoConsumer.getLastReportedValue();
+        assertTrue(activeSplitStates == null || activeSplitStates.isEmpty());
+    }
+
     @Nullable
     public static Activity getSecondActivity(@Nullable List<SplitInfo> activeSplitStates,
             @NonNull Activity primaryActivity, @NonNull String secondaryClassId) {
@@ -163,9 +231,15 @@
         return null;
     }
 
+    /**
+     * Waits for and verifies a valid split. Can accept a null secondary activity if it belongs to
+     * a different process, in which case it will only verify the primary one.
+     */
     public static void assertValidSplit(@NonNull Activity primaryActivity,
-            @NonNull Activity secondaryActivity, SplitRule splitRule) {
-        waitForResumed(Arrays.asList(primaryActivity, secondaryActivity));
+            @Nullable Activity secondaryActivity, SplitRule splitRule) {
+        waitAndAssertResumed(secondaryActivity != null
+                ? Arrays.asList(primaryActivity, secondaryActivity)
+                : Collections.singletonList(primaryActivity));
 
         // Compute the layout direction
         int layoutDir = splitRule.getLayoutDirection();
@@ -173,25 +247,39 @@
             layoutDir = primaryActivity.getResources().getConfiguration().getLayoutDirection();
         }
 
+        // Compute the expected bounds
         final float splitRatio = splitRule.getSplitRatio();
         final Rect parentBounds = getMaximumActivityBounds(primaryActivity);
         final Rect expectedPrimaryActivityBounds = new Rect();
         final Rect expectedSecondaryActivityBounds = new Rect();
         getExpectedPrimaryAndSecondaryBounds(layoutDir, splitRatio, parentBounds,
                 expectedPrimaryActivityBounds, expectedSecondaryActivityBounds);
+
+        final ActivityEmbeddingComponent activityEmbeddingComponent = getWindowExtensions()
+                .getActivityEmbeddingComponent();
+
+        // Verify that both activities are embedded and that the bounds are correct
+        assertTrue(activityEmbeddingComponent.isActivityEmbedded(primaryActivity));
         assertEquals(expectedPrimaryActivityBounds, getActivityBounds(primaryActivity));
-        assertEquals(expectedSecondaryActivityBounds, getActivityBounds(secondaryActivity));
+        if (secondaryActivity != null) {
+            assertTrue(activityEmbeddingComponent.isActivityEmbedded(secondaryActivity));
+            assertEquals(expectedSecondaryActivityBounds, getActivityBounds(secondaryActivity));
+        }
     }
 
     public static void verifyFillsTask(Activity activity) {
-        waitForResumed(Arrays.asList(activity));
         assertEquals(getMaximumActivityBounds(activity), getActivityBounds(activity));
     }
 
-    public static boolean waitForResumed(
+    public static void waitForFillsTask(Activity activity) {
+        PollingCheck.waitFor(WAIT_FOR_LIFECYCLE_TIMEOUT_MS, () -> getActivityBounds(activity)
+                .equals(getMaximumActivityBounds(activity)));
+    }
+
+    private static boolean waitForResumed(
             @NonNull List<Activity> activityList) {
         final long startTime = System.currentTimeMillis();
-        while (System.currentTimeMillis() - startTime < WAIT_FOR_RESUMED_TIMEOUT_MS) {
+        while (System.currentTimeMillis() - startTime < WAIT_FOR_LIFECYCLE_TIMEOUT_MS) {
             boolean allActivitiesResumed = true;
             for (Activity activity : activityList) {
                 allActivitiesResumed &= WindowManagerJetpackTestBase.isActivityResumed(activity);
@@ -206,9 +294,9 @@
         return false;
     }
 
-    public static boolean waitForResumed(@NonNull String activityId) {
+    private static boolean waitForResumed(@NonNull String activityId) {
         final long startTime = System.currentTimeMillis();
-        while (System.currentTimeMillis() - startTime < WAIT_FOR_RESUMED_TIMEOUT_MS) {
+        while (System.currentTimeMillis() - startTime < WAIT_FOR_LIFECYCLE_TIMEOUT_MS) {
             if (getResumedActivityById(activityId) != null) {
                 return true;
             }
@@ -216,6 +304,58 @@
         return false;
     }
 
+    private static boolean waitForResumed(@NonNull Activity activity) {
+        return waitForResumed(Arrays.asList(activity));
+    }
+
+    public static void waitAndAssertResumed(@NonNull String activityId) {
+        assertTrue("Activity with id=" + activityId + " should be resumed",
+                waitForResumed(activityId));
+    }
+
+    public static void waitAndAssertResumed(@NonNull Activity activity) {
+        assertTrue(activity + " should be resumed", waitForResumed(activity));
+    }
+
+    public static void waitAndAssertResumed(@NonNull List<Activity> activityList) {
+        assertTrue("All activities in this list should be resumed:" + activityList,
+                waitForResumed(activityList));
+    }
+
+    public static void waitAndAssertNotResumed(@NonNull String activityId) {
+        assertFalse("Activity with id=" + activityId + " should not be resumed",
+                waitForResumed(activityId));
+    }
+
+    private static boolean waitForVisible(@NonNull Activity activity, boolean visible) {
+        final long startTime = System.currentTimeMillis();
+        while (System.currentTimeMillis() - startTime < WAIT_FOR_LIFECYCLE_TIMEOUT_MS) {
+            if (WindowManagerJetpackTestBase.isActivityVisible(activity) == visible) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static void waitAndAssertNotVisible(@NonNull Activity activity) {
+        assertTrue(activity + " should not be visible",
+                waitForVisible(activity, false /* visible */));
+    }
+
+    private static boolean waitForFinishing(@NonNull Activity activity) {
+        final long startTime = System.currentTimeMillis();
+        while (System.currentTimeMillis() - startTime < WAIT_FOR_LIFECYCLE_TIMEOUT_MS) {
+            if (activity.isFinishing()) {
+                return true;
+            }
+        }
+        return activity.isFinishing();
+    }
+
+    public static void waitAndAssertFinishing(@NonNull Activity activity) {
+        assertTrue(activity + " should be finishing", waitForFinishing(activity));
+    }
+
     @Nullable
     public static Activity getPrimaryStackTopActivity(SplitInfo splitInfo) {
         List<Activity> primaryActivityStack = splitInfo.getPrimaryActivityStack().getActivities();
@@ -238,23 +378,43 @@
     public static void getExpectedPrimaryAndSecondaryBounds(int layoutDir, float splitRatio,
             @NonNull Rect inParentBounds, @NonNull Rect outPrimaryActivityBounds,
             @NonNull Rect outSecondaryActivityBounds) {
-        final int expectedPrimaryWidth = (int) (inParentBounds.width() * splitRatio);
-        final int expectedSecondaryWidth = (int) (inParentBounds.width() * (1 - splitRatio));
+        assertTrue(layoutDir == LayoutDirection.LTR || layoutDir == LayoutDirection.RTL);
 
-        outPrimaryActivityBounds.set(inParentBounds);
-        outSecondaryActivityBounds.set(inParentBounds);
+        // Normalize the split ratio so that parent left + (parent width * split ratio) is always
+        // the position of the split divider in the parent.
+        if (layoutDir == LayoutDirection.RTL) {
+            splitRatio = 1 - splitRatio;
+        }
+
+        // Create the left and right container bounds
+        final Rect leftContainerBounds = new Rect(inParentBounds.left, inParentBounds.top,
+                (int) (inParentBounds.left + inParentBounds.width() * splitRatio),
+                inParentBounds.bottom);
+        final Rect rightContainerBounds = new Rect(
+                (int) (inParentBounds.left + inParentBounds.width() * splitRatio),
+                inParentBounds.top, inParentBounds.right, inParentBounds.bottom);
+
+        // Assign the primary and secondary bounds depending on layout direction
         if (layoutDir == LayoutDirection.LTR) {
             /*******************|*********************
              * primary activity | secondary activity *
              *******************|*********************/
-            outPrimaryActivityBounds.right = inParentBounds.left + expectedPrimaryWidth;
-            outSecondaryActivityBounds.left = inParentBounds.right - expectedSecondaryWidth;
+            outPrimaryActivityBounds.set(leftContainerBounds);
+            outSecondaryActivityBounds.set(rightContainerBounds);
         } else {
             /*********************|*******************
              * secondary activity | primary activity *
              *********************|*******************/
-            outPrimaryActivityBounds.left = inParentBounds.right - expectedPrimaryWidth;
-            outSecondaryActivityBounds.right = inParentBounds.left + expectedSecondaryWidth;
+            outPrimaryActivityBounds.set(rightContainerBounds);
+            outSecondaryActivityBounds.set(leftContainerBounds);
         }
     }
+
+    private static boolean splitInfoTopSplitIsCorrect(@NonNull List<SplitInfo> splitInfoList,
+            @NonNull Activity primaryActivity, @NonNull Activity secondaryActivity) {
+        assertFalse("Split info callback should not be empty", splitInfoList.isEmpty());
+        final SplitInfo topSplit = splitInfoList.get(splitInfoList.size() - 1);
+        return primaryActivity.equals(getPrimaryStackTopActivity(topSplit))
+                && secondaryActivity.equals(getSecondaryStackTopActivity(topSplit));
+    }
 }
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/TestActivityKnownEmbeddingCerts.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/TestActivityKnownEmbeddingCerts.java
new file mode 100644
index 0000000..42d435a
--- /dev/null
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/TestActivityKnownEmbeddingCerts.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.jetpack.utils;
+
+public class TestActivityKnownEmbeddingCerts extends TestActivityWithId {
+}
diff --git a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/WindowManagerJetpackTestBase.java b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/WindowManagerJetpackTestBase.java
index c2576cc..f19ecff 100644
--- a/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/WindowManagerJetpackTestBase.java
+++ b/tests/framework/base/windowmanager/jetpack/src/android/server/wm/jetpack/utils/WindowManagerJetpackTestBase.java
@@ -22,39 +22,35 @@
 import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
 import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
 
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
-
-import static com.google.common.truth.Truth.assertThat;
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
 
 import android.app.Activity;
 import android.app.Application;
 import android.app.Instrumentation;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.window.extensions.layout.FoldingFeature;
 import androidx.window.sidecar.SidecarDeviceState;
 
+import org.junit.After;
 import org.junit.Before;
-import org.junit.runner.RunWith;
 
-import java.util.List;
-import java.util.Set;
 import java.util.HashSet;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeoutException;
+import java.util.Set;
 
 /** Base class for all tests in the module. */
 public class WindowManagerJetpackTestBase {
@@ -65,7 +61,8 @@
     public Context mContext;
     public Application mApplication;
 
-    private final static Set<Activity> sResumedActivities = new HashSet<>();
+    private static final Set<Activity> sResumedActivities = new HashSet<>();
+    private static final Set<Activity> sVisibleActivities = new HashSet<>();
 
     @Before
     public void setUp() {
@@ -79,14 +76,38 @@
         registerActivityLifecycleCallbacks();
     }
 
-    public Activity startActivityNewTask(Class activityClass) {
+    @After
+    public void tearDown() {
+        sResumedActivities.clear();
+        sVisibleActivities.clear();
+    }
+
+    public Activity startActivityNewTask(@NonNull Class activityClass) {
+        return startActivityNewTask(activityClass, null /* activityId */);
+    }
+
+    public Activity startActivityNewTask(@NonNull Class activityClass,
+            @Nullable String activityId) {
         final Intent intent = new Intent(mContext, activityClass);
         intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+        if (activityId != null) {
+            intent.putExtra(ACTIVITY_ID_LABEL, activityId);
+        }
         final Activity activity = mInstrumentation.startActivitySync(intent);
         return activity;
     }
 
     /**
+     * Start an activity using a component name. Can be used for activities from a different UIDs.
+     */
+    public void startActivityNewTask(@NonNull ComponentName activityComponent) {
+        final Intent intent = new Intent();
+        intent.setClassName(activityComponent.getPackageName(), activityComponent.getClassName());
+        intent.addFlags(FLAG_ACTIVITY_NEW_TASK);
+        mContext.startActivity(intent);
+    }
+
+    /**
      * Starts an instance of {@param activityToLaunchClass} from {@param activityToLaunchFrom}
      * and returns the activity ID from the newly launched class.
      */
@@ -97,6 +118,18 @@
         activityToLaunchFrom.startActivity(intent);
     }
 
+    /**
+     * Starts a specified activity class from {@param activityToLaunchFrom}.
+     */
+    public static void startActivityFromActivity(@NonNull Activity activityToLaunchFrom,
+            @NonNull ComponentName activityToLaunchComponent, @NonNull String newActivityId) {
+        Intent intent = new Intent();
+        intent.setClassName(activityToLaunchComponent.getPackageName(),
+                activityToLaunchComponent.getClassName());
+        intent.putExtra(ACTIVITY_ID_LABEL, newActivityId);
+        activityToLaunchFrom.startActivity(intent);
+    }
+
     public static IBinder getActivityWindowToken(Activity activity) {
         return activity.getWindow().getAttributes().token;
     }
@@ -117,6 +150,14 @@
         return activity.getWindowManager().getMaximumWindowMetrics().getBounds();
     }
 
+    /**
+     * Gets the width of a full-screen task.
+     */
+    public int getTaskWidth() {
+        return mContext.getSystemService(WindowManager.class).getMaximumWindowMetrics().getBounds()
+                .width();
+    }
+
     public static void setActivityOrientationActivityHandlesOrientationChanges(
             TestActivity activity, int orientation) {
         // Make sure that the provided orientation is a fixed orientation
@@ -183,6 +224,9 @@
 
                     @Override
                     public void onActivityStarted(@NonNull Activity activity) {
+                        synchronized (sVisibleActivities) {
+                            sVisibleActivities.add(activity);
+                        }
                     }
 
                     @Override
@@ -201,6 +245,9 @@
 
                     @Override
                     public void onActivityStopped(@NonNull Activity activity) {
+                        synchronized (sVisibleActivities) {
+                            sVisibleActivities.remove(activity);
+                        }
                     }
 
                     @Override
@@ -220,6 +267,12 @@
         }
     }
 
+    public static boolean isActivityVisible(Activity activity) {
+        synchronized (sVisibleActivities) {
+            return sVisibleActivities.contains(activity);
+        }
+    }
+
     @Nullable
     public static TestActivityWithId getResumedActivityById(@NonNull String activityId) {
         synchronized (sResumedActivities) {
@@ -232,4 +285,11 @@
             return null;
         }
     }
+
+    @Nullable
+    public static Activity getTopResumedActivity() {
+        synchronized (sResumedActivities) {
+            return !sResumedActivities.isEmpty() ? sResumedActivities.iterator().next() : null;
+        }
+    }
 }
diff --git a/tests/framework/base/windowmanager/jetpack/window-extensions-release.aar b/tests/framework/base/windowmanager/jetpack/window-extensions-release.aar
index d6678bf..6fc9a67 100644
--- a/tests/framework/base/windowmanager/jetpack/window-extensions-release.aar
+++ b/tests/framework/base/windowmanager/jetpack/window-extensions-release.aar
Binary files differ
diff --git a/tests/framework/base/windowmanager/overlayappbase/res/anim/alpha_0_with_backdrop.xml b/tests/framework/base/windowmanager/overlayappbase/res/anim/alpha_0_with_backdrop.xml
new file mode 100644
index 0000000..5ee8b8a
--- /dev/null
+++ b/tests/framework/base/windowmanager/overlayappbase/res/anim/alpha_0_with_backdrop.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false"
+    android:showBackdrop="true">
+
+    <alpha
+        android:fromAlpha="0"
+        android:toAlpha="0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000"/>
+</set>
diff --git a/tests/framework/base/windowmanager/overlayappbase/res/anim/alpha_0_with_red_backdrop.xml b/tests/framework/base/windowmanager/overlayappbase/res/anim/alpha_0_with_red_backdrop.xml
new file mode 100644
index 0000000..f5f03df
--- /dev/null
+++ b/tests/framework/base/windowmanager/overlayappbase/res/anim/alpha_0_with_red_backdrop.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<set xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shareInterpolator="false"
+    android:showBackdrop="true"
+    android:backdropColor="#FF0000">
+
+    <alpha
+        android:fromAlpha="0"
+        android:toAlpha="0"
+        android:fillEnabled="true"
+        android:fillBefore="true"
+        android:fillAfter="true"
+        android:interpolator="@android:interpolator/linear"
+        android:startOffset="0"
+        android:duration="5000"/>
+</set>
diff --git a/tests/framework/base/windowmanager/overlayappbase/src/android/server/wm/overlay/ExitAnimationActivity.java b/tests/framework/base/windowmanager/overlayappbase/src/android/server/wm/overlay/ExitAnimationActivity.java
index ded84a7..30e99b0b 100644
--- a/tests/framework/base/windowmanager/overlayappbase/src/android/server/wm/overlay/ExitAnimationActivity.java
+++ b/tests/framework/base/windowmanager/overlayappbase/src/android/server/wm/overlay/ExitAnimationActivity.java
@@ -47,7 +47,8 @@
     protected void onStart() {
         super.onStart();
         registerReceiver(mReceiver,
-                new IntentFilter(Components.ExitAnimationActivityReceiver.ACTION_FINISH));
+                new IntentFilter(Components.ExitAnimationActivityReceiver.ACTION_FINISH),
+                Context.RECEIVER_EXPORTED);
     }
 
     @Override
diff --git a/tests/framework/base/windowmanager/res/layout/keep_clear_attr_activity.xml b/tests/framework/base/windowmanager/res/layout/keep_clear_attr_activity.xml
new file mode 100644
index 0000000..870777e
--- /dev/null
+++ b/tests/framework/base/windowmanager/res/layout/keep_clear_attr_activity.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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
+  -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="top|left"
+    android:background="@android:color/black">
+    <View
+        android:id="@+id/keepClearView"
+        android:layout_width="25px"
+        android:layout_height="25px"
+        android:preferKeepClear="true"/>
+</RelativeLayout>
diff --git a/tests/framework/base/windowmanager/res/layout/keep_clear_rects_activity.xml b/tests/framework/base/windowmanager/res/layout/keep_clear_rects_activity.xml
new file mode 100644
index 0000000..282a827
--- /dev/null
+++ b/tests/framework/base/windowmanager/res/layout/keep_clear_rects_activity.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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
+  -->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="top|left"
+    android:background="@android:color/black">
+</RelativeLayout>
diff --git a/tests/framework/base/windowmanager/res/values/styles.xml b/tests/framework/base/windowmanager/res/values/styles.xml
index c315745..5910fc2 100644
--- a/tests/framework/base/windowmanager/res/values/styles.xml
+++ b/tests/framework/base/windowmanager/res/values/styles.xml
@@ -34,4 +34,16 @@
     <style name="window_activity_transitions" parent="@android:style/Theme.DeviceDefault">
         <item name="android:windowActivityTransitions">true</item>
     </style>
-</resources>
\ No newline at end of file
+    <style name="NoInsetsTheme" parent="@android:style/Theme.NoTitleBar">
+        <item name="android:windowLayoutInDisplayCutoutMode">always</item>
+        <item name="android:windowSoftInputMode">stateHidden</item>
+    </style>
+    <style name="NoInsetsTheme.Translucent" parent="NoInsetsTheme">
+        <item name="android:windowIsTranslucent">true</item>
+    </style>
+    <style name="Theme.WhiteBackground" parent="@android:style/Theme.Material.NoActionBar">
+        <item name="android:background">#ffffff</item>
+        <item name="android:windowBackground">#ffffff</item>
+        <item name="android:colorBackground">#ffffff</item>
+    </style>
+</resources>
diff --git a/tests/framework/base/windowmanager/scvhapp/Android.bp b/tests/framework/base/windowmanager/scvhapp/Android.bp
new file mode 100644
index 0000000..1d557fa
--- /dev/null
+++ b/tests/framework/base/windowmanager/scvhapp/Android.bp
@@ -0,0 +1,39 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsCrossProcessSurfaceControlViewHostTestService",
+    defaults: ["cts_support_defaults"],
+
+    srcs: [
+        "src/**/*.java",
+    ],
+
+    static_libs: [
+        "cts-wm-app-base",
+        "androidx.annotation_annotation",
+    ],
+
+    sdk_version: "test_current",
+
+    test_suites: [
+        "cts",
+        "general-tests",
+        "sts",
+    ],
+}
diff --git a/tests/framework/base/windowmanager/scvhapp/AndroidManifest.xml b/tests/framework/base/windowmanager/scvhapp/AndroidManifest.xml
new file mode 100644
index 0000000..71cb02e
--- /dev/null
+++ b/tests/framework/base/windowmanager/scvhapp/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.server.wm.scvh">
+
+    <application>
+        <service
+            android:name="android.server.wm.scvh.CrossProcessSurfaceControlViewHostTestService"
+            android:exported="true" />
+    </application>
+
+</manifest>
diff --git a/tests/framework/base/windowmanager/scvhapp/src/android/server/wm/scvh/Components.java b/tests/framework/base/windowmanager/scvhapp/src/android/server/wm/scvh/Components.java
new file mode 100644
index 0000000..e753f87
--- /dev/null
+++ b/tests/framework/base/windowmanager/scvhapp/src/android/server/wm/scvh/Components.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2020 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 android.server.wm.scvh;
+
+import android.content.ComponentName;
+import android.server.wm.component.ComponentsBase;
+
+
+public class Components extends ComponentsBase {
+    public interface CrossProcessSurfaceControlViewHostTestService {
+        ComponentName COMPONENT = component("CrossProcessSurfaceControlViewHostTestService");
+    }
+
+    private static ComponentName component(String className) {
+        return component(Components.class, className);
+    }
+}
diff --git a/tests/framework/base/windowmanager/scvhapp/src/android/server/wm/scvh/CrossProcessSurfaceControlViewHostTestService.java b/tests/framework/base/windowmanager/scvhapp/src/android/server/wm/scvh/CrossProcessSurfaceControlViewHostTestService.java
new file mode 100644
index 0000000..c65f42b
--- /dev/null
+++ b/tests/framework/base/windowmanager/scvhapp/src/android/server/wm/scvh/CrossProcessSurfaceControlViewHostTestService.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm.scvh;
+
+import static android.view.Display.DEFAULT_DISPLAY;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.PixelFormat;
+import android.hardware.display.DisplayManager;
+import android.os.Handler;
+import android.os.Binder;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.RemoteException;
+import android.server.wm.shared.ICrossProcessSurfaceControlViewHostTestService;
+import android.util.ArrayMap;
+import android.view.Display;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.WindowManager;
+import android.view.SurfaceControlViewHost;
+
+import androidx.annotation.Nullable;
+
+import java.util.Collections;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.Map;
+
+
+public class CrossProcessSurfaceControlViewHostTestService extends Service {
+    private final ICrossProcessSurfaceControlViewHostTestService mBinder = new ServiceImpl();
+    private Handler mHandler;
+
+    class MotionRecordingView extends View {
+        boolean mGotEvent = false;
+        boolean mGotObscuredEvent = false;
+
+        MotionRecordingView(Context c) {
+            super(c);
+        }
+
+        public boolean onTouchEvent(MotionEvent e) {
+            super.onTouchEvent(e);
+            synchronized (this) {
+                mGotEvent = true;
+                if ((e.getFlags() & MotionEvent.FLAG_WINDOW_IS_OBSCURED) != 0) {
+                    mGotObscuredEvent = true;
+                }
+            }
+            return true;
+        }
+
+        boolean gotEvent() {
+            synchronized (this) {
+                return mGotEvent;
+            }
+        }
+
+        boolean gotObscuredTouch() {
+            synchronized (this) {
+                return mGotObscuredEvent;
+            }
+        }
+
+        void reset() {
+            synchronized (this) {
+                mGotEvent = false;
+                mGotObscuredEvent = false;
+            }
+        }
+    }
+    @Override
+    public void onCreate() {
+        mHandler = new Handler(Looper.getMainLooper());
+    }
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder.asBinder();
+    }
+
+    Display getDefaultDisplay() {
+        WindowManager wm = (WindowManager) getSystemService(Context.WINDOW_SERVICE);
+        return wm.getDefaultDisplay();
+    }
+
+    SurfaceControlViewHost mSurfaceControlViewHost;
+    MotionRecordingView mView;
+
+    SurfaceControlViewHost.SurfacePackage createSurfacePackage(IBinder hostInputToken) {
+        mView = new MotionRecordingView(this);
+        mSurfaceControlViewHost = new SurfaceControlViewHost(this, getDefaultDisplay(), hostInputToken);
+        mSurfaceControlViewHost.setView(mView, 100, 100);
+        return mSurfaceControlViewHost.getSurfacePackage();
+    }
+
+    private class ServiceImpl extends ICrossProcessSurfaceControlViewHostTestService.Stub {
+        private final CrossProcessSurfaceControlViewHostTestService mService =
+            CrossProcessSurfaceControlViewHostTestService.this;
+
+        private void drainHandler() {
+            final CountDownLatch latch = new CountDownLatch(1);
+            mHandler.post(() -> {
+                latch.countDown();
+            });
+            try {
+                latch.await(1, TimeUnit.SECONDS);
+            } catch (Exception e) {
+            }
+        }
+
+        @Override
+        public SurfaceControlViewHost.SurfacePackage getSurfacePackage(IBinder hostInputToken) {
+            final CountDownLatch latch = new CountDownLatch(1);
+            mHandler.post(() -> {
+                createSurfacePackage(hostInputToken);
+                mView.getViewTreeObserver().registerFrameCommitCallback(latch::countDown);
+                mView.invalidate();
+            });
+            try {
+                latch.await(1, TimeUnit.SECONDS);
+            } catch (Exception e) {
+                return null;
+            }
+            return mSurfaceControlViewHost.getSurfacePackage();
+        }
+
+        @Override
+        public boolean getViewIsTouched() {
+            drainHandler();
+            return mView.gotEvent();
+        }
+
+        @Override
+        public boolean getViewIsTouchedAndObscured() {
+            return getViewIsTouched() && mView.gotObscuredTouch();
+        }
+
+        @Override
+        public void resetViewIsTouched() {
+            drainHandler();
+            mView.reset();
+        }
+    }
+}
diff --git a/tests/framework/base/windowmanager/shared/src/android/server/wm/shared/ICrossProcessSurfaceControlViewHostTestService.aidl b/tests/framework/base/windowmanager/shared/src/android/server/wm/shared/ICrossProcessSurfaceControlViewHostTestService.aidl
new file mode 100644
index 0000000..53d9910
--- /dev/null
+++ b/tests/framework/base/windowmanager/shared/src/android/server/wm/shared/ICrossProcessSurfaceControlViewHostTestService.aidl
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2022 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 android.server.wm.shared;
+
+import android.os.IBinder;
+import android.view.SurfaceControlViewHost;
+
+interface ICrossProcessSurfaceControlViewHostTestService {
+    SurfaceControlViewHost.SurfacePackage getSurfacePackage(IBinder hostInputToken);
+    boolean getViewIsTouched();
+    boolean getViewIsTouchedAndObscured();
+    void resetViewIsTouched();
+}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/ActivityTransitionTests.java b/tests/framework/base/windowmanager/src/android/server/wm/ActivityTransitionTests.java
index 122ef2a..de62c94 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/ActivityTransitionTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/ActivityTransitionTests.java
@@ -17,18 +17,29 @@
 package android.server.wm;
 
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.server.wm.ActivityTransitionTests.OverridePendingTransitionActivity.BACKGROUND_COLOR_KEY;
+import static android.server.wm.ActivityTransitionTests.OverridePendingTransitionActivity.ENTER_ANIM_KEY;
+import static android.server.wm.ActivityTransitionTests.OverridePendingTransitionActivity.EXIT_ANIM_KEY;
 import static android.server.wm.app.Components.TEST_ACTIVITY;
 import static android.view.Display.DEFAULT_DISPLAY;
 
+import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.Assert.fail;
 
 import android.app.Activity;
 import android.app.ActivityOptions;
 import android.app.Instrumentation;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.ColorSpace;
+import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
@@ -36,13 +47,19 @@
 import android.platform.test.annotations.Presubmit;
 import android.server.wm.cts.R;
 import android.util.Range;
+import android.view.WindowManager;
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.SystemUtil;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
@@ -53,30 +70,38 @@
  */
 @Presubmit
 public class ActivityTransitionTests extends ActivityManagerTestBase {
-    // See WindowManagerService.DISABLE_CUSTOM_TASK_ANIMATION_PROPERTY
-    static final String DISABLE_CUSTOM_TASK_ANIMATION_PROPERTY =
-            "persist.wm.disable_custom_task_animation";
-    static final boolean DISABLE_CUSTOM_TASK_ANIMATION_DEFAULT = true;
-
     // Duration of the default wallpaper close animation
     static final long DEFAULT_ANIMATION_DURATION = 275L;
     // Duration of the R.anim.alpha animation
     static final long CUSTOM_ANIMATION_DURATION = 2000L;
 
-    private static boolean customTaskAnimationDisabled() {
-        try {
-            return Integer.parseInt(executeShellCommand(
-                    "getprop " + DISABLE_CUSTOM_TASK_ANIMATION_PROPERTY).replace("\n", "")) != 0;
-        } catch (NumberFormatException e) {
-            return DISABLE_CUSTOM_TASK_ANIMATION_DEFAULT;
-        }
+    // Allowable error for the measured animation duration.
+    static final long EXPECTED_DURATION_TOLERANCE_START = 200;
+    static final long EXPECTED_DURATION_TOLERANCE_FINISH = 1000;
+
+    private boolean mAnimationScaleResetRequired = false;
+    private String mInitialWindowAnimationScale;
+    private String mInitialTransitionAnimationScale;
+    private String mInitialAnimatorDurationScale;
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        setDefaultAnimationScale();
+        mWmState.setSanityCheckWithFocusedWindow(false);
+        mWmState.waitForDisplayUnfrozen();
+    }
+
+    @After
+    public void tearDown() {
+        restoreAnimationScale();
+        mWmState.setSanityCheckWithFocusedWindow(true);
     }
 
     @Test
     public void testActivityTransitionDurationNoShortenAsExpected() throws Exception {
-        final long expectedDurationMs = CUSTOM_ANIMATION_DURATION - 100L;
-        final long minDurationMs = expectedDurationMs;
-        final long maxDurationMs = expectedDurationMs + 300L;
+        final long minDurationMs = CUSTOM_ANIMATION_DURATION - EXPECTED_DURATION_TOLERANCE_START;
+        final long maxDurationMs = CUSTOM_ANIMATION_DURATION + EXPECTED_DURATION_TOLERANCE_FINISH;
         final Range<Long> durationRange = new Range<>(minDurationMs, maxDurationMs);
 
         final CountDownLatch latch = new CountDownLatch(1);
@@ -98,10 +123,10 @@
         final LauncherActivity launcherActivity =
                 (LauncherActivity) instrumentation.startActivitySync(intent);
 
-        final Bundle bundle = ActivityOptions.makeCustomAnimation(mContext,
-                R.anim.alpha, 0, new Handler(Looper.getMainLooper()), startedListener,
-                finishedListener).toBundle();
-        launcherActivity.startTransitionActivity(bundle);
+        final ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext,
+                R.anim.alpha, 0 /* exitResId */, 0 /* backgroundColor */,
+                new Handler(Looper.getMainLooper()), startedListener, finishedListener);
+        launcherActivity.startTransitionActivity(options);
         mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
         waitAndAssertTopResumedActivity(new ComponentName(mContext, TransitionActivity.class),
                 DEFAULT_DISPLAY, "Activity must be launched");
@@ -114,51 +139,9 @@
     }
 
     @Test
-    public void testTaskTransitionDurationNoShortenAsExpected() throws Exception {
-        assumeFalse(customTaskAnimationDisabled());
-
-        final long expectedDurationMs = CUSTOM_ANIMATION_DURATION - 100L;
-        final long minDurationMs = expectedDurationMs;
-        final long maxDurationMs = expectedDurationMs + 300L;
-        final Range<Long> durationRange = new Range<>(minDurationMs, maxDurationMs);
-
-        final CountDownLatch latch = new CountDownLatch(1);
-        AtomicLong transitionStartTime = new AtomicLong();
-        AtomicLong transitionEndTime = new AtomicLong();
-
-        final ActivityOptions.OnAnimationStartedListener startedListener = () -> {
-            transitionStartTime.set(SystemClock.elapsedRealtime());
-        };
-
-        final ActivityOptions.OnAnimationFinishedListener finishedListener = () -> {
-            transitionEndTime.set(SystemClock.elapsedRealtime());
-            latch.countDown();
-        };
-
-        final Bundle bundle = ActivityOptions.makeCustomAnimation(mContext,
-                R.anim.alpha, 0, new Handler(Looper.getMainLooper()), startedListener,
-                finishedListener).toBundle();
-        final Intent intent = new Intent().setComponent(TEST_ACTIVITY)
-                .addFlags(FLAG_ACTIVITY_NEW_TASK);
-        mContext.startActivity(intent, bundle);
-        mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
-        waitAndAssertTopResumedActivity(TEST_ACTIVITY, DEFAULT_DISPLAY,
-                "Activity must be launched");
-
-        latch.await(2, TimeUnit.SECONDS);
-        final long totalTime = transitionEndTime.get() - transitionStartTime.get();
-        assertTrue("Actual transition duration should be in the range "
-                + "<" + minDurationMs + ", " + maxDurationMs + "> ms, "
-                + "actual=" + totalTime, durationRange.contains(totalTime));
-    }
-
-    @Test
     public void testTaskTransitionOverrideDisabled() throws Exception {
-        assumeTrue(customTaskAnimationDisabled());
-
-        final long expectedDurationMs = DEFAULT_ANIMATION_DURATION - 100L;
-        final long minDurationMs = expectedDurationMs;
-        final long maxDurationMs = expectedDurationMs + 1000L;
+        final long minDurationMs = DEFAULT_ANIMATION_DURATION - EXPECTED_DURATION_TOLERANCE_START;
+        final long maxDurationMs = DEFAULT_ANIMATION_DURATION + EXPECTED_DURATION_TOLERANCE_FINISH;
         final Range<Long> durationRange = new Range<>(minDurationMs, maxDurationMs);
 
         final CountDownLatch latch = new CountDownLatch(1);
@@ -177,8 +160,8 @@
         // Overriding task transit animation is disabled, so default wallpaper close animation
         // is played.
         final Bundle bundle = ActivityOptions.makeCustomAnimation(mContext,
-                R.anim.alpha, 0, new Handler(Looper.getMainLooper()), startedListener,
-                finishedListener).toBundle();
+                R.anim.alpha, 0 /* exitResId */, 0 /* backgroundColor */,
+                new Handler(Looper.getMainLooper()), startedListener, finishedListener).toBundle();
         final Intent intent = new Intent().setComponent(TEST_ACTIVITY)
                 .addFlags(FLAG_ACTIVITY_NEW_TASK);
         mContext.startActivity(intent, bundle);
@@ -194,12 +177,9 @@
     }
 
     @Test
-    public void testTaskTransitionOverride() throws Exception {
-        assumeTrue(customTaskAnimationDisabled());
-
-        final long expectedDurationMs = CUSTOM_ANIMATION_DURATION - 100L;
-        final long minDurationMs = expectedDurationMs;
-        final long maxDurationMs = expectedDurationMs + 1000L;
+    public void testTaskTransitionOverride() {
+        final long minDurationMs = CUSTOM_ANIMATION_DURATION - EXPECTED_DURATION_TOLERANCE_START;
+        final long maxDurationMs = CUSTOM_ANIMATION_DURATION + EXPECTED_DURATION_TOLERANCE_FINISH;
         final Range<Long> durationRange = new Range<>(minDurationMs, maxDurationMs);
 
         final CountDownLatch latch = new CountDownLatch(1);
@@ -235,13 +215,227 @@
         });
     }
 
-    public static class LauncherActivity extends Activity {
+    /**
+     * Checks that the activity's theme's background color is used as the default animation's
+     * background color when no override is specified.
+     */
+    @Test
+    public void testThemeBackgroundColorShowsDuringActivityTransition() {
+        final int backgroundColor = Color.WHITE;
+        Bitmap screenshot = runAndScreenshotActivityTransition(
+                TransitionActivityWithWhiteBackground.class);
+        assertAppRegionOfScreenIsColor(screenshot, backgroundColor);
+    }
 
-        public void startTransitionActivity(Bundle bundle) {
-            startActivity(new Intent(this, TransitionActivity.class), bundle);
+    /**
+     * Checks that the background color set in the animation definition is used as the animation's
+     * background color instead of the theme's background color.
+     *
+     * @see R.anim.alpha_0_with_red_backdrop for animation defintition.
+     */
+    @Test
+    public void testAnimationBackgroundColorIsUsedDuringActivityTransition() {
+        final int backgroundColor = Color.RED;
+        final ActivityOptions activityOptions = ActivityOptions.makeCustomAnimation(mContext,
+                R.anim.alpha_0_with_red_backdrop, R.anim.alpha_0_with_red_backdrop);
+        Bitmap screenshot = runAndScreenshotActivityTransition(activityOptions,
+                TransitionActivityWithWhiteBackground.class);
+        assertAppRegionOfScreenIsColor(screenshot, backgroundColor);
+    }
+
+    /**
+     * Checks that we can override the default background color of the animation using the
+     * CustomAnimation activityOptions.
+     */
+    @Test
+    public void testCustomTransitionCanOverrideBackgroundColor() {
+        final int backgroundColor = Color.GREEN;
+        final ActivityOptions activityOptions = ActivityOptions.makeCustomAnimation(mContext,
+                R.anim.alpha_0_with_backdrop, R.anim.alpha_0_with_backdrop, backgroundColor
+        );
+        Bitmap screenshot = runAndScreenshotActivityTransition(activityOptions,
+                TransitionActivity.class);
+        assertAppRegionOfScreenIsColor(screenshot, backgroundColor);
+    }
+
+    /**
+     * Checks that we can override the default background color of the animation through
+     * overridePendingTransition.
+     */
+    @Test
+    public void testPendingTransitionCanOverrideBackgroundColor() {
+        final int backgroundColor = Color.GREEN;
+
+        final Bundle extras = new Bundle();
+        extras.putInt(ENTER_ANIM_KEY, R.anim.alpha_0_with_backdrop);
+        extras.putInt(EXIT_ANIM_KEY, R.anim.alpha_0_with_backdrop);
+        extras.putInt(BACKGROUND_COLOR_KEY, backgroundColor);
+
+        Bitmap screenshot = runAndScreenshotActivityTransition(
+                OverridePendingTransitionActivity.class, extras);
+        assertAppRegionOfScreenIsColor(screenshot, backgroundColor);
+    }
+
+    private Bitmap runAndScreenshotActivityTransition(Class<?> klass) {
+        return runAndScreenshotActivityTransition(klass, Bundle.EMPTY);
+    }
+
+    private Bitmap runAndScreenshotActivityTransition(
+            ActivityOptions activityOptions, Class<?> klass) {
+        return runAndScreenshotActivityTransition(activityOptions, klass, Bundle.EMPTY);
+    }
+
+    private Bitmap runAndScreenshotActivityTransition(Class<?> klass, Bundle extras) {
+        return runAndScreenshotActivityTransition(ActivityOptions.makeBasic(), klass, extras);
+    }
+
+    private Bitmap runAndScreenshotActivityTransition(ActivityOptions activityOptions,
+            Class<?> klass, Bundle extras) {
+        final Intent intent = new Intent(mContext, LauncherActivity.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        final LauncherActivity launcherActivity =
+                (LauncherActivity) instrumentation.startActivitySync(intent);
+
+        launcherActivity.startTransitionActivity(activityOptions, klass, extras);
+        SystemClock.sleep(1000);
+        final Bitmap screenshot = mInstrumentation.getUiAutomation().takeScreenshot();
+
+        return screenshot;
+    }
+
+    private void assertAppRegionOfScreenIsColor(Bitmap screen, int color) {
+        final Rect fullyVisibleBounds = getActivityFullyVisibleRegion();
+
+        for (int x = 0; x < screen.getWidth(); x++) {
+            for (int y = fullyVisibleBounds.top;
+                    y < fullyVisibleBounds.bottom; y++) {
+                final Color rawColor = screen.getColor(x, y);
+                final Color sRgbColor;
+                if (!rawColor.getColorSpace().equals(ColorSpace.get(ColorSpace.Named.SRGB))) {
+                    // Conversion is required because the color space of the screenshot may be in
+                    // the DCI-P3 color space or some other color space and we want to compare the
+                    // color against once in the SRGB color space, so we must convert the color back
+                    // to the SRGB color space.
+                    sRgbColor = screen.getColor(x, y)
+                            .convert(ColorSpace.get(ColorSpace.Named.SRGB));
+                } else {
+                    sRgbColor = rawColor;
+                }
+                final Color expectedColor = Color.valueOf(color);
+                assertArrayEquals("Screen pixel (" + x + ", " + y + ") is not the right color",
+                        new float[] {
+                                expectedColor.red(), expectedColor.green(), expectedColor.blue() },
+                        new float[] { sRgbColor.red(), sRgbColor.green(), sRgbColor.blue() },
+                        0.03f); // need to allow for some variation stemming from conversions
+            }
         }
     }
 
-    public static class TransitionActivity extends Activity {
+    private Rect getActivityFullyVisibleRegion() {
+        final List<WindowManagerState.WindowState> windows = getWmState().getWindows();
+        Optional<WindowManagerState.WindowState> screenDecorOverlay =
+                windows.stream().filter(
+                        w -> w.getName().equals("ScreenDecorOverlay")).findFirst();
+        Optional<WindowManagerState.WindowState> screenDecorOverlayBottom =
+                windows.stream().filter(
+                        w -> w.getName().equals("ScreenDecorOverlayBottom")).findFirst();
+        Optional<WindowManagerState.WindowState> navigationBar =
+                windows.stream().filter(
+                        w -> w.getName().equals("NavigationBar0")).findFirst();
+
+        final int screenDecorOverlayHeight = screenDecorOverlay.map(
+                WindowManagerState.WindowState::getRequestedHeight).orElse(0);
+        final int screenDecorOverlayBottomHeight = screenDecorOverlayBottom.map(
+                WindowManagerState.WindowState::getRequestedHeight).orElse(0);
+        final int navigationBarHeight = navigationBar.map(
+                WindowManagerState.WindowState::getRequestedHeight).orElse(0);
+
+        WindowManager windowManager = (WindowManager) androidx.test.InstrumentationRegistry
+                .getTargetContext().getSystemService(Context.WINDOW_SERVICE);
+        assertNotNull(windowManager);
+        final Rect displayBounds = windowManager.getCurrentWindowMetrics().getBounds();
+
+        final int bottomHeightToIgnore =
+                Math.max(screenDecorOverlayBottomHeight, navigationBarHeight);
+        return new Rect(displayBounds.left, displayBounds.top + screenDecorOverlayHeight,
+                displayBounds.right, displayBounds.bottom - bottomHeightToIgnore);
     }
+
+    private void setDefaultAnimationScale() {
+        mInitialWindowAnimationScale =
+                runShellCommandSafe("settings get global window_animation_scale");
+        mInitialTransitionAnimationScale =
+                runShellCommandSafe("settings get global transition_animation_scale");
+        mInitialAnimatorDurationScale =
+                runShellCommandSafe("settings get global animator_duration_scale");
+
+        if (!mInitialWindowAnimationScale.equals("1")
+                || !mInitialTransitionAnimationScale.equals("1")
+                || !mInitialAnimatorDurationScale.equals("1")) {
+            mAnimationScaleResetRequired = true;
+            runShellCommandSafe("settings put global window_animation_scale 1");
+            runShellCommandSafe("settings put global transition_animation_scale 1");
+            runShellCommandSafe("settings put global animator_duration_scale 1");
+        }
+    }
+
+    private void restoreAnimationScale() {
+        if (mAnimationScaleResetRequired) {
+            runShellCommandSafe("settings put global window_animation_scale "
+                    + mInitialWindowAnimationScale);
+            runShellCommandSafe("settings put global transition_animation_scale "
+                    + mInitialTransitionAnimationScale);
+            runShellCommandSafe("settings put global animator_duration_scale "
+                    + mInitialAnimatorDurationScale);
+        }
+    }
+
+    private static String runShellCommandSafe(String cmd) {
+        try {
+            return runShellCommand(androidx.test.InstrumentationRegistry.getInstrumentation(), cmd);
+        } catch (IOException e) {
+            fail("Failed reading command output: " + e);
+            return "";
+        }
+    }
+
+    public static class LauncherActivity extends Activity {
+
+        public void startTransitionActivity(ActivityOptions activityOptions) {
+            startTransitionActivity(activityOptions, TransitionActivity.class);
+        }
+
+        public void startTransitionActivity(ActivityOptions activityOptions, Class<?> klass) {
+            startTransitionActivity(activityOptions, klass, new Bundle());
+        }
+
+        public void startTransitionActivity(ActivityOptions activityOptions, Class<?> klass,
+                Bundle extras) {
+            final Intent i = new Intent(this, klass);
+            i.putExtras(extras);
+            startActivity(i, activityOptions.toBundle());
+        }
+    }
+
+    public static class TransitionActivity extends Activity { }
+
+    public static class OverridePendingTransitionActivity extends Activity {
+        static final String ENTER_ANIM_KEY = "enterAnim";
+        static final String EXIT_ANIM_KEY = "enterAnim";
+        static final String BACKGROUND_COLOR_KEY = "backgroundColor";
+
+        @Override
+        protected void onResume() {
+            super.onResume();
+
+            Bundle extras = getIntent().getExtras();
+            int enterAnim = extras.getInt(ENTER_ANIM_KEY);
+            int exitAnim = extras.getInt(EXIT_ANIM_KEY);
+            int backgroundColor = extras.getInt(BACKGROUND_COLOR_KEY);
+            overridePendingTransition(enterAnim, exitAnim, backgroundColor);
+        }
+    }
+
+    public static class TransitionActivityWithWhiteBackground extends Activity { }
 }
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/ActivityVisibilityTests.java b/tests/framework/base/windowmanager/src/android/server/wm/ActivityVisibilityTests.java
index 6190316..74ef09e 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/ActivityVisibilityTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/ActivityVisibilityTests.java
@@ -63,7 +63,6 @@
 import android.server.wm.CommandSession.ActivitySessionClient;
 import android.server.wm.app.Components;
 
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -600,7 +599,6 @@
     }
 
     @Test
-    @Ignore("Unable to disable AOD for some devices")
     public void testTurnScreenOnWithAttr_Freeform() {
         assumeTrue(supportsLockScreen());
         assumeTrue(supportsFreeform());
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/AnimationBackgroundTests.java b/tests/framework/base/windowmanager/src/android/server/wm/AnimationBackgroundTests.java
new file mode 100644
index 0000000..b5ead52
--- /dev/null
+++ b/tests/framework/base/windowmanager/src/android/server/wm/AnimationBackgroundTests.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm;
+
+import static android.server.wm.app.Components.CustomTransitionAnimations.BACKGROUND_COLOR;
+
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.platform.test.annotations.Presubmit;
+
+import org.junit.Test;
+
+/**
+ * Build/Install/Run:
+ * atest CtsWindowManagerDeviceTestCases:AnimationBackgroundTests
+ */
+@Presubmit
+@android.server.wm.annotation.Group1
+public class AnimationBackgroundTests extends CustomActivityTransitionTestBase {
+
+    /**
+     * Checks that the activity's theme's background color is used as the default animation's
+     * background color when no override is specified.
+     */
+    @Test
+    public void testThemeBackgroundColorShowsDuringActivityTransition() {
+        launchCustomTransition(BACKGROUND_COLOR, 0);
+        final Bitmap screen = screenshotTransition();
+        assertAppRegionOfScreenIsColor(screen, Color.WHITE);
+    }
+
+    /**
+     * Checks that we can override the default background color of the animation through
+     * overridePendingTransition
+     */
+    @Test
+    public void testBackgroundColorIsOverridden() {
+        launchCustomTransition(BACKGROUND_COLOR, Color.GREEN);
+        final Bitmap screen = screenshotTransition();
+        assertAppRegionOfScreenIsColor(screen, Color.GREEN);
+    }
+}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/AnimationEdgeExtensionTests.java b/tests/framework/base/windowmanager/src/android/server/wm/AnimationEdgeExtensionTests.java
new file mode 100644
index 0000000..9102634
--- /dev/null
+++ b/tests/framework/base/windowmanager/src/android/server/wm/AnimationEdgeExtensionTests.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm;
+
+import static android.server.wm.app.Components.CustomTransitionAnimations.BOTTOM_EDGE_EXTENSION;
+import static android.server.wm.app.Components.CustomTransitionAnimations.LEFT_EDGE_EXTENSION;
+import static android.server.wm.app.Components.CustomTransitionAnimations.RIGHT_EDGE_EXTENSION;
+import static android.server.wm.app.Components.CustomTransitionAnimations.TOP_EDGE_EXTENSION;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.ColorSpace;
+import android.graphics.Rect;
+import android.platform.test.annotations.Presubmit;
+
+import org.junit.Test;
+
+/**
+ * Build/Install/Run:
+ * atest CtsWindowManagerDeviceTestCases:AnimationEdgeExtensionTests
+ */
+@Presubmit
+@android.server.wm.annotation.Group1
+public class AnimationEdgeExtensionTests extends CustomActivityTransitionTestBase {
+
+    // We need to allow for some variation stemming from color conversions
+    private static final float COLOR_VALUE_VARIANCE_TOLERANCE = 0.03f;
+
+    /**
+     * Checks that when an activity transition with a left edge extension is run that the animating
+     * activity is extended on the left side by clamping the edge pixels of the activity.
+     *
+     * The test runs an activity transition where the animating activities are X scaled to 50%,
+     * positioned of the right side of the screen, and edge extended on the left. Because the
+     * animating activities are half red half blue (split at the middle of the X axis of the
+     * activity). We expect first 75% pixel columns of the screen to be red (50% from the edge
+     * extension and the next 25% from from the activity) and the remaining 25% columns after that
+     * to be blue (from the activity).
+     */
+    @Test
+    public void testLeftEdgeExtensionWorksDuringActivityTransition() {
+        final Bitmap screenshot = runAndScreenshotTransition(LEFT_EDGE_EXTENSION);
+        final Rect fullyVisibleBounds = getActivityFullyVisibleRegion();
+        assertColorChangeXIndex(screenshot,
+                (fullyVisibleBounds.left + fullyVisibleBounds.right) / 4 * 3);
+    }
+
+    /**
+     * Checks that when an activity transition with a top edge extension is run that the animating
+     * activity is extended on the left side by clamping the edge pixels of the activity.
+     *
+     * The test runs an activity transition where the animating activities are Y scaled to 50%,
+     * positioned of the bottom of the screen, and edge extended on the top. Because the
+     * animating activities are half red half blue (split at the middle of the X axis of the
+     * activity). We expect first 50% pixel columns of the screen to be red (the top half from the
+     * extension and the bottom half from the activity) and the remaining 50% columns after that
+     * to be blue (the top half from the extension and the bottom half from the activity).
+     */
+    @Test
+    public void testTopEdgeExtensionWorksDuringActivityTransition() {
+        final Bitmap screenshot = runAndScreenshotTransition(TOP_EDGE_EXTENSION);
+        final Rect fullyVisibleBounds = getActivityFullyVisibleRegion();
+        assertColorChangeXIndex(screenshot,
+                (fullyVisibleBounds.left + fullyVisibleBounds.right) / 2);
+    }
+
+    /**
+     * Checks that when an activity transition with a right edge extension is run that the animating
+     * activity is extended on the right side by clamping the edge pixels of the activity.
+     *
+     * The test runs an activity transition where the animating activities are X scaled to 50% and
+     * edge extended on the right. Because the animating activities are half red half blue. We
+     * expect first 25% pixel columns of the screen to be red (from the activity) and the remaining
+     * 75% columns after that to be blue (25% from the activity and 50% from the edge extension
+     * which should be extending the right edge pixel (so red pixels).
+     */
+    @Test
+    public void testRightEdgeExtensionWorksDuringActivityTransition() {
+        final Bitmap screenshot = runAndScreenshotTransition(RIGHT_EDGE_EXTENSION);
+        final Rect fullyVisibleBounds = getActivityFullyVisibleRegion();
+        assertColorChangeXIndex(screenshot,
+                (fullyVisibleBounds.left + fullyVisibleBounds.right) / 4);
+    }
+
+    /**
+     * Checks that when an activity transition with a bottom edge extension is run that the
+     * animating activity is extended on the bottom side by clamping the edge pixels of the
+     * activity.
+     *
+     * The test runs an activity transition where the animating activities are Y scaled to 50%,
+     * positioned of the top of the screen, and edge extended on the bottom. Because the
+     * animating activities are half red half blue (split at the middle of the X axis of the
+     * activity). We expect first 50% pixel columns of the screen to be red (the top half from the
+     * activity and the bottom half from the extensions) and the remaining 50% columns after that
+     * to be blue (the top half from the activity and the bottom half from the extension).
+     */
+    @Test
+    public void testBottomEdgeExtensionWorksDuringActivityTransition() {
+        final Bitmap screenshot = runAndScreenshotTransition(BOTTOM_EDGE_EXTENSION);
+        final Rect fullyVisibleBounds = getActivityFullyVisibleRegion();
+        assertColorChangeXIndex(screenshot,
+                (fullyVisibleBounds.left + fullyVisibleBounds.right) / 2);
+    }
+
+    private Bitmap runAndScreenshotTransition(String transition) {
+        launchCustomTransition(transition, 0);
+        return screenshotTransition();
+    }
+
+    private void assertColorChangeXIndex(Bitmap screen, int xIndex) {
+        final int colorChangeXIndex = getColorChangeXIndex(screen);
+        final Rect fullyVisibleBounds = getActivityFullyVisibleRegion();
+        // Check to make sure the activity was scaled for an extension to be visible on screen
+        assertEquals(xIndex, colorChangeXIndex);
+
+        // The activity we are extending is a half red, half blue.
+        // We are scaling the activity in the animation so if the extension doesn't work we should
+        // have a blue, then red, then black section, and if it does work we should see on a blue,
+        // followed by an extended red section.
+        for (int x = 0; x < screen.getWidth(); x++) {
+            for (int y = fullyVisibleBounds.top;
+                    y < fullyVisibleBounds.bottom; y++) {
+                final Color expectedColor;
+                if (x < xIndex) {
+                    expectedColor = Color.valueOf(Color.BLUE);
+                } else {
+                    expectedColor = Color.valueOf(Color.RED);
+                }
+
+                final Color rawColor = screen.getColor(x, y);
+                final Color sRgbColor;
+                if (!rawColor.getColorSpace().equals(ColorSpace.get(ColorSpace.Named.SRGB))) {
+                    // Conversion is required because the color space of the screenshot may be in
+                    // the DCI-P3 color space or some other color space and we want to compare the
+                    // color against once in the SRGB color space, so we must convert the color back
+                    // to the SRGB color space.
+                    sRgbColor = screen.getColor(x, y)
+                            .convert(ColorSpace.get(ColorSpace.Named.SRGB));
+                } else {
+                    sRgbColor = rawColor;
+                }
+
+                assertArrayEquals("Screen pixel (" + x + ", " + y + ") is not the right color",
+                        new float[] {
+                                expectedColor.red(), expectedColor.green(), expectedColor.blue() },
+                        new float[] { sRgbColor.red(), sRgbColor.green(), sRgbColor.blue() },
+                        COLOR_VALUE_VARIANCE_TOLERANCE);
+            }
+        }
+    }
+
+    private int getColorChangeXIndex(Bitmap screen) {
+        // Look for color changing index at middle of app
+        final int y =
+                (getActivityFullyVisibleRegion().top + getActivityFullyVisibleRegion().bottom) / 2;
+
+        Color prevColor = screen.getColor(0, y)
+                .convert(ColorSpace.get(ColorSpace.Named.SRGB));
+        for (int x = 0; x < screen.getWidth(); x++) {
+            final Color c = screen.getColor(x, y)
+                    .convert(ColorSpace.get(ColorSpace.Named.SRGB));
+
+            if (!colorsEqual(prevColor, c)) {
+                return x;
+            }
+        }
+
+        throw new RuntimeException("Failed to find color change index");
+    }
+
+    private boolean colorsEqual(Color c1, Color c2) {
+        return almostEquals(c1.red(), c2.red(), COLOR_VALUE_VARIANCE_TOLERANCE)
+                && almostEquals(c1.green(), c2.green(), COLOR_VALUE_VARIANCE_TOLERANCE)
+                && almostEquals(c1.blue(), c2.blue(), COLOR_VALUE_VARIANCE_TOLERANCE);
+    }
+
+    private boolean almostEquals(float a, float b, float delta) {
+        return Math.abs(a - b) < delta;
+    }
+}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java b/tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java
index 4f03eb2..b2790bb 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/AppConfigurationTests.java
@@ -48,9 +48,9 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.lessThan;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
@@ -58,7 +58,6 @@
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.hardware.display.DisplayManager;
@@ -69,7 +68,6 @@
 import android.server.wm.CommandSession.ConfigInfo;
 import android.server.wm.CommandSession.SizeInfo;
 import android.server.wm.TestJournalProvider.TestJournalContainer;
-import android.util.DisplayMetrics;
 import android.view.Display;
 import android.window.WindowContainerTransaction;
 
@@ -141,6 +139,8 @@
     @Test
     public void testConfigurationUpdatesWhenRotatingWhileFullscreen() {
         assumeTrue("Skipping test: no rotation support", supportsRotation());
+        // TODO(b/209920544) remove assumeFalse after issue fix.
+        assumeFalse(ENABLE_SHELL_TRANSITIONS);
 
         final RotationSession rotationSession = createManagedRotationSession();
         rotationSession.set(ROTATION_0);
@@ -164,6 +164,8 @@
     public void testConfigurationUpdatesWhenRotatingWhileDocked() {
         assumeTrue("Skipping test: no multi-window support", supportsSplitScreenMultiWindow());
 
+        // TODO(b/209920544) remove assumeFalse after issue fix.
+        assumeFalse(ENABLE_SHELL_TRANSITIONS);
         final ActivitySessionClient resizeableActivityClient = createManagedActivityClientSession();
         final RotationSession rotationSession = createManagedRotationSession();
         rotationSession.set(ROTATION_0);
@@ -190,6 +192,8 @@
     public void testConfigurationUpdatesWhenRotatingToSideFromDocked() {
         assumeTrue("Skipping test: no multi-window support", supportsSplitScreenMultiWindow());
 
+        // TODO(b/209920544) remove assumeFalse after issue fix.
+        assumeFalse(ENABLE_SHELL_TRANSITIONS);
         final ActivitySessionClient resizeableActivityClient = createManagedActivityClientSession();
         final RotationSession rotationSession = createManagedRotationSession();
         rotationSession.set(ROTATION_0);
@@ -362,9 +366,7 @@
     @Test
     public void testTranslucentAppOrientationRequests() {
         assumeTrue("Skipping test: no orientation request support", supportsOrientationRequest());
-
-        // Disable fixed to user rotation by creating a rotation session
-        createManagedRotationSession();
+        disableIgnoreOrientationRequest();
 
         separateTestJournal();
         launchActivity(PORTRAIT_ORIENTATION_ACTIVITY, WINDOWING_MODE_FULLSCREEN);
@@ -374,6 +376,9 @@
                 ORIENTATION_PORTRAIT, initialReportedSizes.orientation);
         assertTrue("portrait activity should have height >= width",
                 initialReportedSizes.heightDp >= initialReportedSizes.widthDp);
+        assumeFalse("Skipping test: device is fixed to user rotation",
+                mWmState.isFixedToUserRotation());
+
         separateTestJournal();
 
         launchActivity(SDK26_TRANSLUCENT_LANDSCAPE_ACTIVITY, WINDOWING_MODE_FULLSCREEN);
@@ -502,11 +507,10 @@
         assertEquals("The last reported size should be the same as the one from onCreate",
                 reportedSizes, onCreateConfigInfo.sizeInfo);
 
-        final Display display = mDm.getDisplay(Display.DEFAULT_DISPLAY);
-        final Point expectedRealDisplaySize = new Point();
-        display.getRealSize(expectedRealDisplaySize);
-
-        final int expectedRotation = display.getRotation();
+        final WindowManagerState.DisplayContent dc = mWmState.getDisplay(Display.DEFAULT_DISPLAY);
+        final Point expectedRealDisplaySize =
+                new Point(dc.getDisplayRect().width(), dc.getDisplayRect().height());
+        final int expectedRotation = mWmState.getRotation();
         assertEquals("The activity should get the final display rotation in onCreate",
                 expectedRotation, onCreateConfigInfo.rotation);
         assertEquals("The application should get the final display rotation in onCreate",
@@ -525,16 +529,16 @@
                 appConfigInfo.sizeInfo.displayWidth > appConfigInfo.sizeInfo.displayHeight);
         assertEquals("The app display metrics must be landscape", isLandscape,
                 appConfigInfo.sizeInfo.metricsWidth > appConfigInfo.sizeInfo.metricsHeight);
-
-        final DisplayMetrics globalMetrics = Resources.getSystem().getDisplayMetrics();
-        assertEquals("The display metrics of system resources must be landscape",
-                new Point(globalMetrics.widthPixels, globalMetrics.heightPixels),
-                new Point(globalSizeInfo.metricsWidth, globalSizeInfo.metricsHeight));
+        assertEquals("The display metrics of system resources must be landscape", isLandscape,
+                globalSizeInfo.metricsWidth > globalSizeInfo.metricsHeight);
     }
 
     @Test
     public void testTranslucentActivityPermitted() throws Exception {
         assumeTrue("Skipping test: no orientation request support", supportsOrientationRequest());
+        // TODO(b/209920544) remove assumeFalse after issue fix.
+        assumeFalse(ENABLE_SHELL_TRANSITIONS);
+        disableIgnoreOrientationRequest();
 
         final RotationSession rotationSession = createManagedRotationSession();
         rotationSession.set(ROTATION_0);
@@ -553,9 +557,12 @@
     @Test
     public void testTaskCloseRestoreFixedOrientation() {
         assumeTrue("Skipping test: no orientation request support", supportsOrientationRequest());
+        disableIgnoreOrientationRequest();
 
         // Start landscape activity.
         launchActivity(LANDSCAPE_ORIENTATION_ACTIVITY, WINDOWING_MODE_FULLSCREEN);
+        assumeFalse("Skipping test: device is fixed to user rotation",
+                mWmState.isFixedToUserRotation());
         mWmState.assertVisibility(LANDSCAPE_ORIENTATION_ACTIVITY, true /* visible */);
         mWmState.waitAndAssertLastOrientation("Fullscreen app requested landscape orientation",
                 SCREEN_ORIENTATION_LANDSCAPE);
@@ -631,6 +638,8 @@
     public void testAppOrientationWhenRotating() throws Exception {
         assumeTrue("Skipping test: no rotation support", supportsRotation());
 
+        // TODO(b/209920544) remove assumeFalse after issue fix.
+        assumeFalse(ENABLE_SHELL_TRANSITIONS);
         // Start resizeable activity that handles configuration changes.
         separateTestJournal();
         launchActivity(TEST_ACTIVITY, WINDOWING_MODE_FULLSCREEN);
@@ -702,6 +711,8 @@
      */
     private void assertDisplayContextDoesntChangeOrientationWhenRotating(
             Function<Activity, Context> baseContextSupplier) {
+        // TODO(b/209920544) remove assumeFalse after issue fix.
+        assumeFalse(ENABLE_SHELL_TRANSITIONS);
         RotationSession rotationSession = createManagedRotationSession();
         rotationSession.set(ROTATION_0);
 
@@ -752,6 +763,7 @@
         // TODO(b/110533226): Fix test on devices with display cutout
         assumeFalse("Skipping test: display cutout present, can't predict exact lifecycle",
                 hasDisplayCutout());
+        disableIgnoreOrientationRequest();
 
         // Start portrait-fixed activity
         separateTestJournal();
@@ -795,15 +807,24 @@
     @Test
     public void testTaskMoveToBackOrientation() {
         assumeTrue("Skipping test: no orientation request support", supportsOrientationRequest());
-
-        // Disable fixed to user rotation by creating a rotation session
-        createManagedRotationSession();
+        disableIgnoreOrientationRequest();
 
         // Start landscape activity.
         launchActivity(LANDSCAPE_ORIENTATION_ACTIVITY, WINDOWING_MODE_FULLSCREEN);
         mWmState.assertVisibility(LANDSCAPE_ORIENTATION_ACTIVITY, true /* visible */);
-        mWmState.waitAndAssertLastOrientation("Fullscreen app requested landscape orientation",
-                SCREEN_ORIENTATION_LANDSCAPE);
+        final boolean isFixedToUserRotation = mWmState.isFixedToUserRotation();
+        if (!isFixedToUserRotation) {
+            mWmState.waitAndAssertLastOrientation(
+                        "Fullscreen app requested landscape orientation",
+                        SCREEN_ORIENTATION_LANDSCAPE);
+        } else {
+            final SizeInfo reportedSizes =
+                    getLastReportedSizesForActivity(LANDSCAPE_ORIENTATION_ACTIVITY);
+            assertEquals("landscape activity should be in landscape",
+                    ORIENTATION_LANDSCAPE, reportedSizes.orientation);
+            assertTrue("landscape activity should have height < width",
+                    reportedSizes.heightDp < reportedSizes.widthDp);
+        }
 
         // Start another activity in a different task.
         launchActivityInNewTask(BROADCAST_RECEIVER_ACTIVITY);
@@ -818,8 +839,18 @@
 
         // Verify that activity brought to front is in originally requested orientation.
         mWmState.waitForValidState(LANDSCAPE_ORIENTATION_ACTIVITY);
-        mWmState.waitAndAssertLastOrientation("Should return to app in landscape orientation",
-                SCREEN_ORIENTATION_LANDSCAPE);
+        if (!isFixedToUserRotation) {
+            mWmState.waitAndAssertLastOrientation(
+                        "Fullscreen app requested landscape orientation",
+                        SCREEN_ORIENTATION_LANDSCAPE);
+        } else {
+            final SizeInfo reportedSizes =
+                    getLastReportedSizesForActivity(LANDSCAPE_ORIENTATION_ACTIVITY);
+            assertEquals("landscape activity should be in landscape",
+                    ORIENTATION_LANDSCAPE, reportedSizes.orientation);
+            assertTrue("landscape activity should have height < width",
+                    reportedSizes.heightDp < reportedSizes.widthDp);
+        }
     }
 
     /**
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/AspectRatioTestsBase.java b/tests/framework/base/windowmanager/src/android/server/wm/AspectRatioTestsBase.java
index 96cf5c2..20e4c79 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/AspectRatioTestsBase.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/AspectRatioTestsBase.java
@@ -30,7 +30,7 @@
 
 import androidx.test.rule.ActivityTestRule;
 
-import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.hamcrest.Matcher;
 import org.junit.Before;
@@ -66,7 +66,7 @@
     void runAspectRatioTest(final ActivityTestRule activityRule,
             final AssertAspectRatioCallback callback) {
         final Activity activity = launchActivity(activityRule);
-        PollingCheck.waitFor(activity::hasWindowFocus);
+        WindowUtil.waitForFocus(activity);
         try {
             final Point displaySize = new Point();
             getDisplay(activity).getSize(displaySize);
@@ -108,7 +108,8 @@
 
     int getMinimalTaskSize(ComponentName componentName) {
         final int displayId = mWmState.getDisplayByActivity(componentName);
-        return mWmState.defaultMinimalTaskSize(displayId);
+        final WindowManagerState.DisplayContent displayContent = mWmState.getDisplay(displayId);
+        return displayContent.mMinSizeOfResizeableTaskDp;
     }
 
     static float getDefaultDisplayAspectRatio() {
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/BackNavigationActivity.java b/tests/framework/base/windowmanager/src/android/server/wm/BackNavigationActivity.java
new file mode 100644
index 0000000..0a66a4a5
--- /dev/null
+++ b/tests/framework/base/windowmanager/src/android/server/wm/BackNavigationActivity.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.View;
+
+import androidx.annotation.Nullable;
+
+public class BackNavigationActivity extends Activity {
+
+    boolean mOnBackPressedCalled;
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    public void onBackPressed() {
+        mOnBackPressedCalled = true;
+        super.onBackPressed();
+    }
+}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/BackNavigationLegacyTest.java b/tests/framework/base/windowmanager/src/android/server/wm/BackNavigationLegacyTest.java
new file mode 100644
index 0000000..38d9e62
--- /dev/null
+++ b/tests/framework/base/windowmanager/src/android/server/wm/BackNavigationLegacyTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm;
+
+import static android.server.wm.WindowManagerState.STATE_RESUMED;
+import static android.server.wm.backlegacyapp.Components.BACK_LEGACY;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Instrumentation;
+import android.server.wm.TestJournalProvider.TestJournalContainer;
+import android.server.wm.backlegacyapp.Components;
+import android.support.test.uiautomator.UiDevice;
+import android.view.KeyEvent;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Integration test for back navigation legacy mode
+ */
+public class BackNavigationLegacyTest extends ActivityManagerTestBase {
+    private Instrumentation mInstrumentation;
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+
+    }
+
+    @Test
+    public void receiveOnBackPressed() {
+        TestJournalContainer.start();
+        launchActivity(BACK_LEGACY);
+        mWmState.assertActivityDisplayed(BACK_LEGACY);
+        waitAndAssertActivityState(BACK_LEGACY, STATE_RESUMED, "Activity should be resumed");
+        UiDevice.getInstance(mInstrumentation).pressKeyCode(KeyEvent.KEYCODE_BACK);
+        assertTrue("OnBackPressed should have been called",
+                TestJournalContainer.get(BACK_LEGACY).extras.getBoolean(
+                        Components.KEY_ON_BACK_PRESSED_CALLED));
+        assertFalse("OnBackInvoked should not have been called",
+                TestJournalContainer.get(BACK_LEGACY).extras.getBoolean(
+                        Components.KEY_ON_BACK_INVOKED_CALLED));
+    }
+}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/BackNavigationTests.java b/tests/framework/base/windowmanager/src/android/server/wm/BackNavigationTests.java
new file mode 100644
index 0000000..5e9bed9
--- /dev/null
+++ b/tests/framework/base/windowmanager/src/android/server/wm/BackNavigationTests.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.app.Instrumentation;
+import android.os.RemoteException;
+import android.platform.test.annotations.Presubmit;
+import android.support.test.uiautomator.UiDevice;
+import android.view.KeyEvent;
+
+import androidx.lifecycle.Lifecycle;
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+/**
+ * Integration test for back navigation
+ */
+@Presubmit
+public class BackNavigationTests {
+    @Rule
+    public final ActivityScenarioRule<BackNavigationActivity> mScenarioRule =
+            new ActivityScenarioRule<>(BackNavigationActivity.class);
+    private ActivityScenario<BackNavigationActivity> mScenario;
+    private Instrumentation mInstrumentation;
+
+    @Before
+    public void setup() {
+        mScenario = mScenarioRule.getScenario();
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        try {
+            UiDevice.getInstance(mInstrumentation).wakeUp();
+        } catch (RemoteException ignored) {
+        }
+        mInstrumentation.getUiAutomation().adoptShellPermissionIdentity();
+    }
+
+    @Test
+    public void registerCallback_initialized() {
+        CountDownLatch latch = registerBackCallback();
+        mScenario.moveToState(Lifecycle.State.RESUMED);
+        invokeBackAndAssertCallbackIsCalled(latch);
+    }
+
+    @Test
+    public void registerCallback_created() {
+        mScenario.moveToState(Lifecycle.State.CREATED);
+        CountDownLatch latch = registerBackCallback();
+        mScenario.moveToState(Lifecycle.State.STARTED);
+        mScenario.moveToState(Lifecycle.State.RESUMED);
+        invokeBackAndAssertCallbackIsCalled(latch);
+    }
+
+    @Test
+    public void registerCallback_resumed() {
+        mScenario.moveToState(Lifecycle.State.CREATED);
+        mScenario.moveToState(Lifecycle.State.STARTED);
+        mScenario.moveToState(Lifecycle.State.RESUMED);
+        CountDownLatch latch = registerBackCallback();
+        invokeBackAndAssertCallbackIsCalled(latch);
+    }
+
+    @Test
+    public void onBackPressedNotCalled() {
+        mScenario.moveToState(Lifecycle.State.CREATED)
+                .moveToState(Lifecycle.State.STARTED)
+                .moveToState(Lifecycle.State.RESUMED);
+        CountDownLatch latch = registerBackCallback();
+        invokeBackAndAssertCallbackIsCalled(latch);
+        mScenario.onActivity((activity) ->
+                assertFalse("Activity.onBackPressed should not be called",
+                        activity.mOnBackPressedCalled));
+    }
+
+    private void invokeBackAndAssertCallbackIsCalled(CountDownLatch latch) {
+        try {
+            mInstrumentation.getUiAutomation().waitForIdle(500, 1000);
+            UiDevice.getInstance(mInstrumentation).pressKeyCode(
+                    KeyEvent.KEYCODE_BACK);
+            assertTrue("OnBackInvokedCallback.onBackInvoked() was not called",
+                    latch.await(500, TimeUnit.MILLISECONDS));
+        } catch (InterruptedException ex) {
+            fail("Application died before invoking the callback.\n" + ex.getMessage());
+        } catch (TimeoutException ex) {
+            fail(ex.getMessage());
+        }
+    }
+
+    private CountDownLatch registerBackCallback() {
+        CountDownLatch backInvokedLatch = new CountDownLatch(1);
+        CountDownLatch backRegisteredLatch = new CountDownLatch(1);
+        mScenario.onActivity(activity -> {
+            activity.getOnBackInvokedDispatcher().registerOnBackInvokedCallback(
+                    0, backInvokedLatch::countDown);
+            backRegisteredLatch.countDown();
+        });
+        try {
+            if (!backRegisteredLatch.await(100, TimeUnit.MILLISECONDS)) {
+                fail("Back callback was not registered on the Activity thread. This might be "
+                        + "an error with the test itself.");
+            }
+        } catch (InterruptedException e) {
+            fail(e.getMessage());
+        }
+        return backInvokedLatch;
+    }
+}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/BlurTests.java b/tests/framework/base/windowmanager/src/android/server/wm/BlurTests.java
index 23e47c2..297eaf0 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/BlurTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/BlurTests.java
@@ -363,10 +363,11 @@
     }
 
     private static void assertBackgroundBlurOverBlurBehind(Bitmap screenshot, Rect windowFrame) {
-        // We are assuming that the background blur will become bigger by roughly half of the blur
-        // behind radius
-        assertBlur(screenshot, BACKGROUND_BLUR_PX + ((int) (BLUR_BEHIND_PX*0.5f)),
-                windowFrame.top, windowFrame.bottom);
+        assertBlur(
+                screenshot,
+                (int) Math.sqrt(Math.pow(BACKGROUND_BLUR_PX, 2.f) + Math.pow(BLUR_BEHIND_PX, 2.f)),
+                windowFrame.top,
+                windowFrame.bottom);
     }
 
     private static void assertNoBlurBehind(Bitmap screenshot, Rect windowFrame) {
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/CloseOnOutsideTests.java b/tests/framework/base/windowmanager/src/android/server/wm/CloseOnOutsideTests.java
index f41307b..cd6c6fe 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/CloseOnOutsideTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/CloseOnOutsideTests.java
@@ -16,17 +16,17 @@
 
 package android.server.wm;
 
+import static android.server.wm.ActivityManagerTestBase.createFullscreenActivityScenarioRule;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-import android.app.ActivityOptions;
 import android.app.Instrumentation;
-import android.app.WindowConfiguration;
 import android.util.DisplayMetrics;
 
 import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.runner.AndroidJUnit4;
 
 import com.android.compatibility.common.util.ShellUtils;
 
@@ -43,18 +43,13 @@
 
     @Rule
     public final ActivityScenarioRule<CloseOnOutsideTestActivity> mScenarioRule =
-            new ActivityScenarioRule<>(CloseOnOutsideTestActivity.class);
+            createFullscreenActivityScenarioRule(CloseOnOutsideTestActivity.class);
 
     private CloseOnOutsideTestActivity mTestActivity;
 
     @Before
     public void setup() {
-        ActivityOptions options = ActivityOptions.makeBasic();
-        options.setLaunchWindowingMode(WindowConfiguration.WINDOWING_MODE_FULLSCREEN);
-        mScenarioRule.getScenario().launch(CloseOnOutsideTestActivity.class, options.toBundle())
-            .onActivity(activity -> {
-                mTestActivity = activity;
-            });
+        mScenarioRule.getScenario().onActivity(activity -> mTestActivity = activity);
     }
 
     @Test
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/CompatChangeTests.java b/tests/framework/base/windowmanager/src/android/server/wm/CompatChangeTests.java
index 16bdeb6..d53a168 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/CompatChangeTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/CompatChangeTests.java
@@ -55,11 +55,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.List;
 
 /**
  * The test is focused on compatibility changes that have an effect on WM logic, and tests that
@@ -76,7 +71,6 @@
  * atest CtsWindowManagerDeviceTestCases:CompatChangeTests
  */
 @Presubmit
-@RunWith(Parameterized.class)
 public final class CompatChangeTests extends MultiDisplayTestBase {
     private static final ComponentName RESIZEABLE_PORTRAIT_ACTIVITY =
             component(ResizeablePortraitActivity.class);
@@ -93,6 +87,8 @@
     private static final ComponentName SUPPORTS_SIZE_CHANGES_PORTRAIT_ACTIVITY =
             component(SupportsSizeChangesPortraitActivity.class);
 
+    // Fixed orientation min aspect ratio
+    private static final float FIXED_ORIENTATION_MIN_ASPECT_RATIO = 1.03f;
     // The min aspect ratio of NON_RESIZEABLE_ASPECT_RATIO_ACTIVITY (as defined in the manifest).
     private static final float ACTIVITY_MIN_ASPECT_RATIO = 1.6f;
     // The min aspect ratio of NON_RESIZEABLE_LARGE_ASPECT_RATIO_ACTIVITY (as defined in the
@@ -102,14 +98,6 @@
 
     private static final float FLOAT_EQUALITY_DELTA = 0.01f;
 
-    @Parameterized.Parameters(name= "{0}")
-    public static List<Double> data() {
-        return Arrays.asList(0.5, 2.0);
-    }
-
-    @Parameterized.Parameter(0)
-    public double resizeRatio;
-
     @Rule
     public TestRule compatChangeRule = new PlatformCompatChangeRule();
 
@@ -122,7 +110,8 @@
 
         mDisplayMetricsSession =
                 createManagedDisplayMetricsSession(DEFAULT_DISPLAY);
-        createManagedIgnoreOrientationRequestSession(DEFAULT_DISPLAY, /* value=  */ true);
+        createManagedLetterboxAspectRatioSession(DEFAULT_DISPLAY,
+                FIXED_ORIENTATION_MIN_ASPECT_RATIO);
         createManagedConstrainDisplayApisFlagsSession();
     }
 
@@ -504,7 +493,10 @@
         mWmState.computeState();
         WindowManagerState.DisplayContent originalDC = mWmState.getDisplay(DEFAULT_DISPLAY);
 
-        runSizeCompatTest(activity, windowingMode, resizeRatio,
+        runSizeCompatTest(activity, windowingMode, /* resizeRatio= */ 0.5,
+                inSizeCompatModeAfterResize);
+        waitForRestoreDisplay(originalDC);
+        runSizeCompatTest(activity, windowingMode, /* resizeRatio= */ 2,
                 inSizeCompatModeAfterResize);
     }
 
@@ -570,7 +562,11 @@
         mWmState.computeState();
         WindowManagerState.DisplayContent originalDC = mWmState.getDisplay(DEFAULT_DISPLAY);
 
-        runSizeCompatTest(activity, WINDOWING_MODE_FULLSCREEN, resizeRatio,
+        runSizeCompatTest(activity, WINDOWING_MODE_FULLSCREEN, /* resizeRatio= */ 0.5,
+                inSizeCompatModeAfterResize);
+        assertSandboxedByProvidesMaxBounds(activity, isSandboxed);
+        waitForRestoreDisplay(originalDC);
+        runSizeCompatTest(activity, WINDOWING_MODE_FULLSCREEN, /* resizeRatio=*/ 2,
                 inSizeCompatModeAfterResize);
         assertSandboxedByProvidesMaxBounds(activity, isSandboxed);
     }
@@ -710,6 +706,16 @@
     }
 
     /**
+     * Restore the display size and ensure configuration changes are complete.
+     */
+    private void restoreDisplay(ComponentName activity) {
+        final Rect originalBounds = mWmState.getActivity(activity).getBounds();
+        mDisplayMetricsSession.restoreDisplayMetrics();
+        // Ensure configuration changes are complete after resizing the display.
+        waitForActivityBoundsChanged(activity, originalBounds);
+    }
+
+    /**
      * Wait for the display to be restored to the original display content.
      */
     private void waitForRestoreDisplay(WindowManagerState.DisplayContent originalDisplayContent) {
@@ -720,6 +726,7 @@
         }, "waiting for display to be restored");
     }
 
+
     /**
      * Resize the display and ensure configuration changes are complete.
      */
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/ConfigChangeTests.java b/tests/framework/base/windowmanager/src/android/server/wm/ConfigChangeTests.java
index 0ea1d95..b7ace72 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/ConfigChangeTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/ConfigChangeTests.java
@@ -40,7 +40,10 @@
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
+import android.app.Activity;
 import android.content.ComponentName;
+import android.content.res.Configuration;
+import android.graphics.Rect;
 import android.os.Bundle;
 import android.platform.test.annotations.Presubmit;
 import android.server.wm.CommandSession.ActivityCallback;
@@ -314,4 +317,34 @@
                         android.os.Process.myUserHandle().getIdentifier())
         );
     }
+
+    /**
+     * Verifies if Activity receives {@link Activity#onConfigurationChanged(Configuration)} even if
+     * the size change is small.
+     */
+    @Test
+    public void testResizeWithoutCrossingSizeBucket() {
+        launchActivity(NO_RELAUNCH_ACTIVITY);
+
+        waitAndAssertResumedActivity(NO_RELAUNCH_ACTIVITY, "Activity must be resumed");
+        final int taskId = mWmState.getTaskByActivity(NO_RELAUNCH_ACTIVITY).mTaskId;
+
+        separateTestJournal();
+        mTaskOrganizer.putTaskInSplitPrimary(taskId);
+
+        // It is expected a config change callback because the Activity goes to split mode.
+        assertRelaunchOrConfigChanged(NO_RELAUNCH_ACTIVITY, 0 /* numRelaunch */,
+                1 /* numConfigChange */);
+
+        // Resize task a little and verify if the Activity still receive config changes.
+        separateTestJournal();
+        final Rect taskBounds = mTaskOrganizer.getPrimaryTaskBounds();
+        taskBounds.set(taskBounds.left, taskBounds.top, taskBounds.right, taskBounds.bottom + 10);
+        mTaskOrganizer.setRootPrimaryTaskBounds(taskBounds);
+
+        mWmState.waitForValidState(NO_RELAUNCH_ACTIVITY);
+
+        assertRelaunchOrConfigChanged(NO_RELAUNCH_ACTIVITY, 0 /* numRelaunch */,
+                1 /* numConfigChange */);
+    }
 }
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/CustomActivityTransitionTestBase.java b/tests/framework/base/windowmanager/src/android/server/wm/CustomActivityTransitionTestBase.java
new file mode 100644
index 0000000..504b4ac
--- /dev/null
+++ b/tests/framework/base/windowmanager/src/android/server/wm/CustomActivityTransitionTestBase.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm;
+
+import static android.server.wm.ComponentNameUtils.getActivityName;
+import static android.server.wm.app.Components.BackgroundActivityTransition.TRANSITION_REQUESTED;
+import static android.server.wm.app.Components.CUSTOM_TRANSITION_EXIT_ACTIVITY;
+
+import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.ColorSpace;
+import android.graphics.Rect;
+import android.os.SystemClock;
+import android.platform.test.annotations.Presubmit;
+
+import androidx.test.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.TestUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
+
+@Presubmit
+@android.server.wm.annotation.Group1
+public class CustomActivityTransitionTestBase extends ActivityManagerTestBase {
+
+    private boolean mAnimationScaleResetRequired = false;
+    private String mInitialWindowAnimationScale;
+    private String mInitialTransitionAnimationScale;
+    private String mInitialAnimatorDurationScale;
+
+    @Rule
+    public final DumpOnFailure dumpOnFailure = new DumpOnFailure();
+
+    @Before
+    public void setUp() throws Exception {
+        assumeTrue(ENABLE_SHELL_TRANSITIONS);
+        super.setUp();
+        setDefaultAnimationScale();
+        mWmState.setSanityCheckWithFocusedWindow(false);
+        mWmState.waitForDisplayUnfrozen();
+    }
+
+    @After
+    public void tearDown() {
+        restoreAnimationScale();
+        mWmState.setSanityCheckWithFocusedWindow(true);
+    }
+
+    /**
+     * @param transitionType the type of transition to run.
+     *                       See CustomTransitionEnterActivity for supported types.
+     * @param backgroundColorOverride a background color override of 0 means we are not going to
+     *                                override the background color and just fallback on the default
+     *                                value
+     */
+    protected void launchCustomTransition(String transitionType, int backgroundColorOverride) {
+        TestJournalProvider.TestJournalContainer.start();
+        final String startActivityCommand = "am start -n "
+                + getActivityName(CUSTOM_TRANSITION_EXIT_ACTIVITY) + " "
+                + "--es transitionType " + transitionType + " "
+                + "--ei backgroundColorOverride " + backgroundColorOverride;
+        executeShellCommand(startActivityCommand);
+        mWmState.waitForValidState(CUSTOM_TRANSITION_EXIT_ACTIVITY);
+    }
+
+    protected Bitmap screenshotTransition() {
+        final TestJournalProvider.TestJournal journal = TestJournalProvider.TestJournalContainer
+                .get(CUSTOM_TRANSITION_EXIT_ACTIVITY);
+        try {
+            TestUtils.waitUntil("Waiting for app to request transition",
+                    15 /* timeoutSecond */,
+                    () -> journal.extras.getBoolean(TRANSITION_REQUESTED));
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+
+        // The activity transition is set to last 5 seconds, wait half a second to make sure
+        // the activity transition has started after we receive confirmation through the test
+        // journal that we have requested to start a new activity.
+        SystemClock.sleep(500);
+
+        // Take a screenshot during the transition where we hide both the activities to just
+        // show the background of the transition which is set to be white.
+        return takeScreenshot();
+    }
+
+    protected void assertAppRegionOfScreenIsColor(Bitmap screen, int color) {
+        final Rect fullyVisibleBounds = getActivityFullyVisibleRegion();
+
+        for (int x = 0; x < screen.getWidth(); x++) {
+            for (int y = fullyVisibleBounds.top;
+                    y < fullyVisibleBounds.bottom; y++) {
+                final Color rawColor = screen.getColor(x, y);
+                final Color sRgbColor;
+                if (!rawColor.getColorSpace().equals(ColorSpace.get(ColorSpace.Named.SRGB))) {
+                    // Conversion is required because the color space of the screenshot may be in
+                    // the DCI-P3 color space or some other color space and we want to compare the
+                    // color against once in the SRGB color space, so we must convert the color back
+                    // to the SRGB color space.
+                    sRgbColor = screen.getColor(x, y)
+                            .convert(ColorSpace.get(ColorSpace.Named.SRGB));
+                } else {
+                    sRgbColor = rawColor;
+                }
+                final Color expectedColor = Color.valueOf(color);
+                assertArrayEquals("Screen pixel (" + x + ", " + y + ") is not the right color",
+                        new float[] {
+                                expectedColor.red(), expectedColor.green(), expectedColor.blue() },
+                        new float[] { sRgbColor.red(), sRgbColor.green(), sRgbColor.blue() },
+                        0.03f); // need to allow for some variation stemming from conversions
+            }
+        }
+    }
+
+    protected Rect getActivityFullyVisibleRegion() {
+        final List<WindowManagerState.WindowState> windows = getWmState().getWindows();
+        Optional<WindowManagerState.WindowState> screenDecorOverlay =
+                windows.stream().filter(
+                        w -> w.getName().equals("ScreenDecorOverlay")).findFirst();
+        Optional<WindowManagerState.WindowState> screenDecorOverlayBottom =
+                windows.stream().filter(
+                        w -> w.getName().equals("ScreenDecorOverlayBottom")).findFirst();
+        getWmState().getWindowStateForAppToken("screenDecorOverlay");
+
+        final int screenDecorOverlayHeight = screenDecorOverlay.map(
+                WindowManagerState.WindowState::getRequestedHeight).orElse(0);
+        final int screenDecorOverlayBottomHeight = screenDecorOverlayBottom.map(
+                WindowManagerState.WindowState::getRequestedHeight).orElse(0);
+
+        final Rect activityBounds = getWmState().getActivity(CUSTOM_TRANSITION_EXIT_ACTIVITY)
+                .getBounds();
+
+        return new Rect(activityBounds.left, activityBounds.top + screenDecorOverlayHeight,
+                activityBounds.right, activityBounds.bottom - screenDecorOverlayBottomHeight);
+    }
+
+    private void setDefaultAnimationScale() {
+        mInitialWindowAnimationScale =
+                runShellCommandSafe("settings get global window_animation_scale");
+        mInitialTransitionAnimationScale =
+                runShellCommandSafe("settings get global transition_animation_scale");
+        mInitialAnimatorDurationScale =
+                runShellCommandSafe("settings get global animator_duration_scale");
+
+        if (!mInitialWindowAnimationScale.equals("1")
+                || !mInitialTransitionAnimationScale.equals("1")
+                || !mInitialAnimatorDurationScale.equals("1")) {
+            mAnimationScaleResetRequired = true;
+            runShellCommandSafe("settings put global window_animation_scale 1");
+            runShellCommandSafe("settings put global transition_animation_scale 1");
+            runShellCommandSafe("settings put global animator_duration_scale 1");
+        }
+    }
+
+    private void restoreAnimationScale() {
+        if (mAnimationScaleResetRequired) {
+            runShellCommandSafe("settings put global window_animation_scale "
+                    + mInitialWindowAnimationScale);
+            runShellCommandSafe("settings put global transition_animation_scale "
+                    + mInitialTransitionAnimationScale);
+            runShellCommandSafe("settings put global animator_duration_scale "
+                    + mInitialAnimatorDurationScale);
+        }
+    }
+
+    private static String runShellCommandSafe(String cmd) {
+        try {
+            return runShellCommand(InstrumentationRegistry.getInstrumentation(), cmd);
+        } catch (IOException e) {
+            fail("Failed reading command output: " + e);
+            return "";
+        }
+    }
+}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/DisplayCutoutTests.java b/tests/framework/base/windowmanager/src/android/server/wm/DisplayCutoutTests.java
index 832cec5..8ea08f3 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/DisplayCutoutTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/DisplayCutoutTests.java
@@ -21,13 +21,14 @@
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
+import static android.provider.Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS;
 import static android.server.wm.DisplayCutoutTests.TestActivity.EXTRA_CUTOUT_MODE;
 import static android.server.wm.DisplayCutoutTests.TestActivity.EXTRA_ORIENTATION;
 import static android.server.wm.DisplayCutoutTests.TestDef.Which.DISPATCHED;
 import static android.server.wm.DisplayCutoutTests.TestDef.Which.ROOT;
+import static android.util.DisplayMetrics.DENSITY_DEFAULT;
 import static android.view.Display.DEFAULT_DISPLAY;
 import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
-import static android.util.DisplayMetrics.DENSITY_DEFAULT;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_NEVER;
@@ -57,12 +58,11 @@
 import android.content.pm.PackageManager;
 import android.graphics.Insets;
 import android.graphics.Path;
-import android.graphics.Point;
 import android.graphics.Rect;
-import android.hardware.display.DisplayManager;
 import android.os.Bundle;
 import android.platform.test.annotations.Presubmit;
-import android.view.Display;
+import android.provider.Settings;
+import android.server.wm.settings.SettingsSession;
 import android.view.DisplayCutout;
 import android.view.View;
 import android.view.ViewGroup;
@@ -72,13 +72,15 @@
 
 import androidx.test.rule.ActivityTestRule;
 
-import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.hamcrest.CustomTypeSafeMatcher;
 import org.hamcrest.FeatureMatcher;
 import org.hamcrest.Matcher;
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ErrorCollector;
@@ -100,6 +102,8 @@
 @android.server.wm.annotation.Group3
 @RunWith(Parameterized.class)
 public class DisplayCutoutTests {
+    private static SettingsSession<String> sImmersiveModeConfirmationSetting;
+
     static final String LEFT = "left";
     static final String TOP = "top";
     static final String RIGHT = "right";
@@ -139,6 +143,21 @@
     // 16 dp with app windows/contents for the apps using DEFAULT and SHORT_EDGES.
     private int mMaximumSizeForNoLetterbox;
 
+    @BeforeClass
+    public static void setUpClass() {
+        sImmersiveModeConfirmationSetting = new SettingsSession<>(
+                Settings.Secure.getUriFor(IMMERSIVE_MODE_CONFIRMATIONS),
+                Settings.Secure::getString, Settings.Secure::putString);
+        sImmersiveModeConfirmationSetting.set("confirmed");
+    }
+
+    @AfterClass
+    public static void tearDownClass() {
+        if (sImmersiveModeConfirmationSetting != null) {
+            sImmersiveModeConfirmationSetting.close();
+        }
+    }
+
     @Before
     public void setUp() throws Exception {
         final Context context = getInstrumentation().getContext();
@@ -198,6 +217,38 @@
     }
 
     @Test
+    public void testBuilder() {
+        final Insets safeInsets = Insets.of(1, 2, 1, 0);
+        final Insets waterfallInsets = Insets.of(1, 0, 1, 0);
+        final Rect boundingLeft = new Rect(5, 6, 7, 8);
+        final Rect boundingRectTop = new Rect(9, 0, 10, 1);
+        final Rect boundingRight = new Rect(2, 3, 4, 5);
+        final Rect boundingBottom = new Rect(6, 7, 8, 9);
+        final Path cutoutPath = new Path();
+
+        final DisplayCutout displayCutout = new DisplayCutout.Builder()
+                .setSafeInsets(safeInsets)
+                .setWaterfallInsets(waterfallInsets)
+                .setBoundingRectLeft(boundingLeft)
+                .setBoundingRectTop(boundingRectTop)
+                .setBoundingRectRight(boundingRight)
+                .setBoundingRectBottom(boundingBottom)
+                .setCutoutPath(cutoutPath)
+                .build();
+
+        assertEquals(safeInsets.left, displayCutout.getSafeInsetLeft());
+        assertEquals(safeInsets.top, displayCutout.getSafeInsetTop());
+        assertEquals(safeInsets.right, displayCutout.getSafeInsetRight());
+        assertEquals(safeInsets.bottom, displayCutout.getSafeInsetBottom());
+        assertEquals(waterfallInsets, displayCutout.getWaterfallInsets());
+        assertEquals(boundingLeft, displayCutout.getBoundingRectLeft());
+        assertEquals(boundingRectTop, displayCutout.getBoundingRectTop());
+        assertEquals(boundingRight, displayCutout.getBoundingRectRight());
+        assertEquals(boundingBottom, displayCutout.getBoundingRectBottom());
+        assertEquals(cutoutPath, displayCutout.getCutoutPath());
+    }
+
+    @Test
     public void testDisplayCutout_default() {
         runTest(LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT,
                 (activity, insets, displayCutout, which) -> {
@@ -464,7 +515,7 @@
 
     private boolean canLayoutInDisplayCutoutWithoutLetterbox(int cutoutMode) {
         return cutoutMode == LAYOUT_IN_DISPLAY_CUTOUT_MODE_DEFAULT
-                ||cutoutMode == LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
+                || cutoutMode == LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
     }
 
     private boolean hasBound(String position, DisplayCutout cutout, Rect appBound) {
@@ -584,7 +635,7 @@
         final T activity = rule.launchActivity(
                 new Intent().putExtra(EXTRA_CUTOUT_MODE, cutoutMode)
                         .putExtra(EXTRA_ORIENTATION, orientation));
-        PollingCheck.waitFor(activity::hasWindowFocus);
+        WindowUtil.waitForFocus(activity);
         final WindowManagerStateHelper wmState = new WindowManagerStateHelper();
         wmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
         wmState.waitForDisplayUnfrozen();
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/DisplayHashManagerTest.java b/tests/framework/base/windowmanager/src/android/server/wm/DisplayHashManagerTest.java
index 366f4dd..590dd45 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/DisplayHashManagerTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/DisplayHashManagerTest.java
@@ -16,6 +16,9 @@
 
 package android.server.wm;
 
+import static android.server.wm.UiDeviceUtils.pressUnlockButton;
+import static android.server.wm.UiDeviceUtils.pressWakeupButton;
+import static android.view.Display.DEFAULT_DISPLAY;
 import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS;
 import static android.view.displayhash.DisplayHashResultCallback.DISPLAY_HASH_ERROR_INVALID_BOUNDS;
 import static android.view.displayhash.DisplayHashResultCallback.DISPLAY_HASH_ERROR_INVALID_HASH_ALGORITHM;
@@ -31,14 +34,19 @@
 
 import android.app.Activity;
 import android.app.Instrumentation;
+import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.os.Bundle;
+import android.os.PowerManager;
 import android.platform.test.annotations.Presubmit;
+import android.service.displayhash.DisplayHashParams;
+import android.util.Size;
 import android.view.Gravity;
+import android.view.SurfaceControl;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
@@ -61,6 +69,7 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
@@ -68,12 +77,9 @@
 
 @Presubmit
 public class DisplayHashManagerTest {
-    //TODO (b/195136026): There's currently know way to know when the buffer has been drawn in
-    // SurfaceFlinger. Use sleep for now to make sure it's been drawn. Once b/195136026 is
-    // completed, port this code to listen for the transaction complete so we can be sure the buffer
-    // has been latched.
-    private static final int SLEEP_TIME_MS = 1000;
+    private static final int WAIT_TIME_S = 5;
 
+    private final Point mCenter = new Point();
     private final Point mTestViewSize = new Point(200, 300);
 
     private Instrumentation mInstrumentation;
@@ -89,6 +95,8 @@
 
     private SyncDisplayHashResultCallback mSyncDisplayHashResultCallback;
 
+    protected WindowManagerStateHelper mWmState = new WindowManagerStateHelper();
+
     @Rule
     public ActivityTestRule<TestActivity> mActivityRule =
             new ActivityTestRule<>(TestActivity.class);
@@ -96,16 +104,27 @@
     @Before
     public void setUp() throws Exception {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        Context context = mInstrumentation.getContext();
+        final Context context = mInstrumentation.getContext();
+        final KeyguardManager km = context.getSystemService(KeyguardManager.class);
         Intent intent = new Intent(Intent.ACTION_MAIN);
         intent.setClass(context, TestActivity.class);
         mActivity = mActivityRule.getActivity();
 
+        if (km != null && km.isKeyguardLocked() || !Objects.requireNonNull(
+                context.getSystemService(PowerManager.class)).isInteractive()) {
+            pressWakeupButton();
+            pressUnlockButton();
+        }
+
         mActivity.runOnUiThread(() -> {
             mMainView = new RelativeLayout(mActivity);
             mActivity.setContentView(mMainView);
         });
         mInstrumentation.waitForIdleSync();
+        mActivity.runOnUiThread(() -> {
+            mCenter.set((mMainView.getWidth() - mTestViewSize.x) / 2,
+                    (mMainView.getHeight() - mTestViewSize.y) / 2);
+        });
         mDisplayHashManager = context.getSystemService(DisplayHashManager.class);
 
         Set<String> algorithms = mDisplayHashManager.getSupportedHashAlgorithms();
@@ -203,7 +222,10 @@
 
     @Test
     public void testGenerateDisplayHash_ViewOffscreen() {
-        final CountDownLatch viewLayoutLatch = new CountDownLatch(2);
+        final CountDownLatch committedCallbackLatch = new CountDownLatch(1);
+        final SurfaceControl.Transaction t = new SurfaceControl.Transaction();
+        t.addTransactionCommittedListener(mExecutor, committedCallbackLatch::countDown);
+
         mInstrumentation.runOnMainSync(() -> {
             final RelativeLayout.LayoutParams p = new RelativeLayout.LayoutParams(mTestViewSize.x,
                     mTestViewSize.y);
@@ -211,17 +233,12 @@
             mTestView.setBackgroundColor(Color.BLUE);
             mTestView.setX(-mTestViewSize.x);
 
-            ViewTreeObserver viewTreeObserver = mTestView.getViewTreeObserver();
-            viewTreeObserver.addOnGlobalLayoutListener(viewLayoutLatch::countDown);
-            viewTreeObserver.registerFrameCommitCallback(viewLayoutLatch::countDown);
-
             mMainView.addView(mTestView, p);
-            mMainView.invalidate();
+            mMainView.getRootSurfaceControl().applyTransactionOnDraw(t);
         });
         mInstrumentation.waitForIdleSync();
         try {
-            viewLayoutLatch.await(5, TimeUnit.SECONDS);
-            Thread.sleep(SLEEP_TIME_MS);
+            committedCallbackLatch.await(WAIT_TIME_S, TimeUnit.SECONDS);
         } catch (InterruptedException e) {
         }
 
@@ -237,7 +254,9 @@
         final WindowManager wm = mActivity.getWindowManager();
         final WindowManager.LayoutParams windowParams = new WindowManager.LayoutParams();
 
-        final CountDownLatch viewLayoutLatch = new CountDownLatch(2);
+        final CountDownLatch committedCallbackLatch = new CountDownLatch(1);
+        final SurfaceControl.Transaction t = new SurfaceControl.Transaction();
+        t.addTransactionCommittedListener(mExecutor, committedCallbackLatch::countDown);
         mInstrumentation.runOnMainSync(() -> {
             mMainView = new RelativeLayout(mActivity);
             windowParams.width = mTestViewSize.x;
@@ -246,21 +265,27 @@
             windowParams.flags = FLAG_LAYOUT_NO_LIMITS;
             mActivity.addWindow(mMainView, windowParams);
 
-            final RelativeLayout.LayoutParams p = new RelativeLayout.LayoutParams(mTestViewSize.x,
-                    mTestViewSize.y);
-            mTestView = new View(mActivity);
-            mTestView.setBackgroundColor(Color.BLUE);
+            mMainView.getViewTreeObserver().addOnWindowAttachListener(
+                    new ViewTreeObserver.OnWindowAttachListener() {
+                        @Override
+                        public void onWindowAttached() {
+                            final RelativeLayout.LayoutParams p = new RelativeLayout.LayoutParams(
+                                    mTestViewSize.x,
+                                    mTestViewSize.y);
+                            mTestView = new View(mActivity);
+                            mTestView.setBackgroundColor(Color.BLUE);
+                            mMainView.addView(mTestView, p);
+                            mMainView.getRootSurfaceControl().applyTransactionOnDraw(t);
+                        }
 
-            ViewTreeObserver viewTreeObserver = mTestView.getViewTreeObserver();
-            viewTreeObserver.addOnGlobalLayoutListener(viewLayoutLatch::countDown);
-            viewTreeObserver.registerFrameCommitCallback(viewLayoutLatch::countDown);
-
-            mMainView.addView(mTestView, p);
+                        @Override
+                        public void onWindowDetached() {
+                        }
+                    });
         });
         mInstrumentation.waitForIdleSync();
         try {
-            viewLayoutLatch.await(5, TimeUnit.SECONDS);
-            Thread.sleep(SLEEP_TIME_MS);
+            committedCallbackLatch.await(WAIT_TIME_S, TimeUnit.SECONDS);
         } catch (InterruptedException e) {
         }
 
@@ -357,7 +382,9 @@
 
     @Test
     public void testGenerateAndVerifyDisplayHash_MultiColor() {
-        final CountDownLatch viewLayoutLatch = new CountDownLatch(2);
+        final CountDownLatch committedCallbackLatch = new CountDownLatch(1);
+        final SurfaceControl.Transaction t = new SurfaceControl.Transaction();
+        t.addTransactionCommittedListener(mExecutor, committedCallbackLatch::countDown);
         mInstrumentation.runOnMainSync(() -> {
             final RelativeLayout.LayoutParams p = new RelativeLayout.LayoutParams(mTestViewSize.x,
                     mTestViewSize.y);
@@ -376,17 +403,15 @@
             linearLayout.addView(redView, redParams);
             mTestView = linearLayout;
 
-            ViewTreeObserver viewTreeObserver = mTestView.getViewTreeObserver();
-            viewTreeObserver.addOnGlobalLayoutListener(viewLayoutLatch::countDown);
-            viewTreeObserver.registerFrameCommitCallback(viewLayoutLatch::countDown);
-
+            mTestView.setX(mCenter.x);
+            mTestView.setY(mCenter.y);
             mMainView.addView(mTestView, p);
-            mMainView.invalidate();
+            mMainView.getRootSurfaceControl().applyTransactionOnDraw(t);
         });
         mInstrumentation.waitForIdleSync();
+        mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
         try {
-            viewLayoutLatch.await(5, TimeUnit.SECONDS);
-            Thread.sleep(SLEEP_TIME_MS);
+            committedCallbackLatch.await(WAIT_TIME_S, TimeUnit.SECONDS);
         } catch (InterruptedException e) {
         }
 
@@ -402,6 +427,22 @@
         assertArrayEquals(expectedImageHash, verifiedDisplayHash.getImageHash());
     }
 
+    @Test
+    public void testDisplayHashParams() {
+        int width = 10;
+        int height = 20;
+        boolean isGrayscale = true;
+        DisplayHashParams displayHashParams = new DisplayHashParams.Builder()
+                .setBufferSize(width, height)
+                .setGrayscaleBuffer(isGrayscale)
+                .build();
+
+        Size bufferSize = displayHashParams.getBufferSize();
+        assertEquals(width, bufferSize.getWidth());
+        assertEquals(height, bufferSize.getHeight());
+        assertEquals(isGrayscale, displayHashParams.isGrayscaleBuffer());
+    }
+
     private DisplayHash generateDisplayHash(Rect bounds) {
         mTestView.generateDisplayHash(mPhashAlgorithm, bounds, mExecutor,
                 mSyncDisplayHashResultCallback);
@@ -412,22 +453,23 @@
     }
 
     private void setupChildView() {
-        final CountDownLatch viewLayoutLatch = new CountDownLatch(2);
+        final CountDownLatch committedCallbackLatch = new CountDownLatch(1);
+        final SurfaceControl.Transaction t = new SurfaceControl.Transaction();
+        t.addTransactionCommittedListener(mExecutor, committedCallbackLatch::countDown);
+
         mInstrumentation.runOnMainSync(() -> {
             final RelativeLayout.LayoutParams p = new RelativeLayout.LayoutParams(mTestViewSize.x,
                     mTestViewSize.y);
             mTestView = new View(mActivity);
+            mTestView.setX(mCenter.x);
+            mTestView.setY(mCenter.y);
             mTestView.setBackgroundColor(Color.BLUE);
-            ViewTreeObserver viewTreeObserver = mTestView.getViewTreeObserver();
-            viewTreeObserver.addOnGlobalLayoutListener(viewLayoutLatch::countDown);
-            viewTreeObserver.registerFrameCommitCallback(viewLayoutLatch::countDown);
             mMainView.addView(mTestView, p);
-            mMainView.invalidate();
+            mMainView.getRootSurfaceControl().applyTransactionOnDraw(t);
         });
         mInstrumentation.waitForIdleSync();
         try {
-            viewLayoutLatch.await(5, TimeUnit.SECONDS);
-            Thread.sleep(SLEEP_TIME_MS);
+            committedCallbackLatch.await(WAIT_TIME_S, TimeUnit.SECONDS);
         } catch (InterruptedException e) {
         }
     }
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/DragDropTest.java b/tests/framework/base/windowmanager/src/android/server/wm/DragDropTest.java
index add17a9..7e40124 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/DragDropTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/DragDropTest.java
@@ -16,9 +16,10 @@
 
 package android.server.wm;
 
-import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
 
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -29,14 +30,16 @@
 import android.content.ClipData;
 import android.content.ClipDescription;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
 import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Point;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.os.SystemClock;
 import android.platform.test.annotations.Presubmit;
 import android.server.wm.cts.R;
-import android.util.MutableBoolean;
 import android.view.DragEvent;
 import android.view.InputDevice;
 import android.view.MotionEvent;
@@ -44,7 +47,6 @@
 import android.view.ViewGroup;
 
 import androidx.test.InstrumentationRegistry;
-import androidx.test.filters.FlakyTest;
 import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.After;
@@ -744,6 +746,45 @@
         }
     }
 
+    @Test
+    public void testDragShadowWhenPerformDrag() {
+        // Mouse down. Required for the drag to start.
+        injectMouseWithOffset(R.id.draggable, MotionEvent.ACTION_DOWN, 0);
+        final View v = mActivity.findViewById(R.id.draggable);
+        runOnMain(() -> {
+            // Start drag.
+            assertTrue("Couldn't start drag",
+                    v.startDragAndDrop(sClipData, new View.DragShadowBuilder(v) {
+                        @Override
+                        public void onProvideShadowMetrics(Point outShadowSize,
+                                Point outShadowTouchPoint) {
+                            outShadowSize.set(v.getWidth(), v.getHeight());
+                            outShadowTouchPoint.set(0, 0);
+                        }
+
+                        @Override
+                        public void onDrawShadow(Canvas canvas) {
+                            canvas.drawColor(Color.RED);
+                        }
+                    }, sLocalState, View.DRAG_FLAG_OPAQUE));
+        });
+        getInstrumentation().getUiAutomation().syncInputTransactions();
+
+        // Verify if the drag shadow present before any move event.
+        final Bitmap screenshot = mInstrumentation.getUiAutomation().takeScreenshot();
+        injectMouseWithOffset(R.id.draggable, MotionEvent.ACTION_UP, 0);
+
+        int [] viewLoc = new int[2];
+        v.getLocationOnScreen(viewLoc);
+
+        for (int x = viewLoc[0]; x < viewLoc[0] + v.getWidth(); x++) {
+            for (int y = viewLoc[1]; y < viewLoc[1] + v.getHeight(); y++) {
+                final Color color = screenshot.getColor(x, y);
+                assertTrue("Should show drag shadow", color.toArgb() == Color.RED);
+            }
+        }
+    }
+
     public static class DragDropActivity extends FocusableActivity {
         @Override
         protected void onCreate(Bundle savedInstanceState) {
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/DreamManagerServiceTests.java b/tests/framework/base/windowmanager/src/android/server/wm/DreamManagerServiceTests.java
index 07a0d56..c863331 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/DreamManagerServiceTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/DreamManagerServiceTests.java
@@ -17,30 +17,24 @@
 package android.server.wm;
 
 import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
+import static android.server.wm.ComponentNameUtils.getWindowName;
 import static android.server.wm.WindowManagerState.STATE_STOPPED;
 import static android.server.wm.app.Components.TEST_ACTIVITY;
 import static android.server.wm.app.Components.TEST_DREAM_SERVICE;
 import static android.server.wm.app.Components.TEST_STUBBORN_DREAM_SERVICE;
-import static android.server.wm.ComponentNameUtils.getWindowName;
+import static android.view.Display.DEFAULT_DISPLAY;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
-import static android.view.Display.DEFAULT_DISPLAY;
-
 import static org.junit.Assume.assumeTrue;
 
-import android.app.DreamManager;
 import android.content.ComponentName;
 import android.platform.test.annotations.Presubmit;
-import android.provider.Settings;
 import android.server.wm.app.Components;
 import android.view.Surface;
-import android.content.res.Resources;
 
 import androidx.test.filters.FlakyTest;
 
-import com.android.compatibility.common.util.SystemUtil;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -57,68 +51,16 @@
 
     private ComponentName mDreamActivityName;
 
-    private boolean mDefaultDreamServiceEnabled = true;
-
-    private static final ComponentName getDreamActivityName(ComponentName dream) {
-        return new ComponentName(dream.getPackageName(),
-                                 "android.service.dreams.DreamActivity");
-    }
+    private DreamCoordinator mDreamCoordinator = new DreamCoordinator(mContext);
 
     @Before
     public void setup() {
-        assumeTrue("Skipping test: no dream support", supportsDream());
-
-        mDefaultDreamServiceEnabled =
-                Settings.Secure.getInt(mContext.getContentResolver(),
-                                "screensaver_enabled", 1) != 0;
-        if (!mDefaultDreamServiceEnabled) {
-            SystemUtil.runWithShellPermissionIdentity(() -> {
-                Settings.Secure.putInt(mContext.getContentResolver(), "screensaver_enabled", 1);
-            });
-        }
+        mDreamCoordinator.setup();
     }
 
     @After
     public void reset()  {
-        if (!mDefaultDreamServiceEnabled) {
-            SystemUtil.runWithShellPermissionIdentity(() -> {
-                Settings.Secure.putInt(mContext.getContentResolver(), "screensaver_enabled", 0);
-            });
-        }
-    }
-
-    private void startDream(ComponentName name) {
-        DreamManager dreamer = mContext.getSystemService(DreamManager.class);
-        SystemUtil.runWithShellPermissionIdentity(() -> {
-            dreamer.startDream(name);
-        });
-    }
-
-    private void stopDream() {
-        DreamManager dreamer = mContext.getSystemService(DreamManager.class);
-        SystemUtil.runWithShellPermissionIdentity(() -> {
-            dreamer.stopDream();
-        });
-    }
-
-    private void setActiveDream(ComponentName dream) {
-        DreamManager dreamer = mContext.getSystemService(DreamManager.class);
-        SystemUtil.runWithShellPermissionIdentity(() -> {
-            dreamer.setActiveDream(dream);
-        });
-        mDreamActivityName = getDreamActivityName(dream);
-    }
-
-    private boolean getIsDreaming() {
-        DreamManager dreamer = mContext.getSystemService(DreamManager.class);
-        return SystemUtil.runWithShellPermissionIdentity(() -> {
-            return dreamer.isDreaming();
-        });
-    }
-
-    private boolean supportsDream() {
-        return mContext.getResources().getBoolean(
-                Resources.getSystem().getIdentifier("config_dreamsSupported", "bool", "android"));
+        mDreamCoordinator.restoreDefaults();
     }
 
     private void assertDreamActivityGone() {
@@ -137,9 +79,9 @@
     @Test
     public void testStartAndStopDream() throws Exception {
         startFullscreenTestActivity();
-        setActiveDream(TEST_DREAM_SERVICE);
+        mDreamActivityName = mDreamCoordinator.setActiveDream(TEST_DREAM_SERVICE);
 
-        startDream(TEST_DREAM_SERVICE);
+        mDreamCoordinator.startDream(TEST_DREAM_SERVICE);
         waitAndAssertTopResumedActivity(mDreamActivityName, DEFAULT_DISPLAY,
                 "Dream activity should be the top resumed activity");
         mWmState.waitForValidState(mWmState.getHomeActivityName());
@@ -147,9 +89,9 @@
         mWmState.waitForValidState(TEST_ACTIVITY);
         mWmState.assertVisibility(TEST_ACTIVITY, false);
 
-        assertTrue(getIsDreaming());
+        assertTrue(mDreamCoordinator.isDreaming());
 
-        stopDream();
+        mDreamCoordinator.stopDream();
         mWmState.waitAndAssertActivityRemoved(mDreamActivityName);
 
         waitAndAssertTopResumedActivity(TEST_ACTIVITY, DEFAULT_DISPLAY,
@@ -158,29 +100,29 @@
 
     @Test
     public void testDreamServiceStopsTimely() throws Exception {
-        setActiveDream(TEST_DREAM_SERVICE);
+        mDreamActivityName = mDreamCoordinator.setActiveDream(TEST_DREAM_SERVICE);
 
-        startDream(TEST_DREAM_SERVICE);
+        mDreamCoordinator.startDream(TEST_DREAM_SERVICE);
         waitAndAssertTopResumedActivity(mDreamActivityName, DEFAULT_DISPLAY,
                 "Dream activity should be the top resumed activity");
         mWmState.waitForValidState(mWmState.getHomeActivityName());
         mWmState.assertVisibility(mWmState.getHomeActivityName(), false);
-        assertTrue(getIsDreaming());
+        assertTrue(mDreamCoordinator.isDreaming());
 
-        stopDream();
+        mDreamCoordinator.stopDream();
 
         Thread.sleep(ACTIVITY_STOP_TIMEOUT);
 
         assertDreamActivityGone();
-        assertFalse(getIsDreaming());
+        assertFalse(mDreamCoordinator.isDreaming());
     }
 
     @Test
     public void testForceStopStubbornDream() throws Exception {
         startFullscreenTestActivity();
-        setActiveDream(TEST_STUBBORN_DREAM_SERVICE);
+        mDreamActivityName = mDreamCoordinator.setActiveDream(TEST_STUBBORN_DREAM_SERVICE);
 
-        startDream(TEST_STUBBORN_DREAM_SERVICE);
+        mDreamCoordinator.startDream(TEST_STUBBORN_DREAM_SERVICE);
         waitAndAssertTopResumedActivity(mDreamActivityName, DEFAULT_DISPLAY,
                 "Dream activity should be the top resumed activity");
         mWmState.waitForValidState(mWmState.getHomeActivityName());
@@ -188,12 +130,12 @@
         mWmState.waitForValidState(TEST_ACTIVITY);
         mWmState.assertVisibility(TEST_ACTIVITY, false);
 
-        stopDream();
+        mDreamCoordinator.stopDream();
 
         Thread.sleep(ACTIVITY_FORCE_STOP_TIMEOUT);
 
         assertDreamActivityGone();
-        assertFalse(getIsDreaming());
+        assertFalse(mDreamCoordinator.isDreaming());
         waitAndAssertTopResumedActivity(TEST_ACTIVITY, DEFAULT_DISPLAY,
                 "Previous top activity should show when dream is stopped");
     }
@@ -204,8 +146,8 @@
 
         final RotationSession rotationSession = createManagedRotationSession();
         rotationSession.set(Surface.ROTATION_0);
-        setActiveDream(TEST_DREAM_SERVICE);
-        startDream(TEST_DREAM_SERVICE);
+        mDreamActivityName = mDreamCoordinator.setActiveDream(TEST_DREAM_SERVICE);
+        mDreamCoordinator.startDream(TEST_DREAM_SERVICE);
         rotationSession.set(Surface.ROTATION_90);
 
         waitAndAssertTopResumedActivity(mDreamActivityName, DEFAULT_DISPLAY,
@@ -217,7 +159,7 @@
         try (DreamingState state = new DreamingState(TEST_DREAM_SERVICE)) {
             launchActivity(Components.TEST_ACTIVITY);
             mWmState.waitForActivityState(Components.TEST_ACTIVITY, STATE_STOPPED);
-            assertTrue(getIsDreaming());
+            assertTrue(mDreamCoordinator.isDreaming());
         }
     }
 
@@ -253,26 +195,26 @@
             launchActivityNoWait(Components.TEST_ACTIVITY);
             waitAndAssertActivityState(Components.TEST_ACTIVITY, STATE_STOPPED,
                 "Activity must be started and stopped");
-            assertTrue(getIsDreaming());
+            assertTrue(mDreamCoordinator.isDreaming());
 
             launchActivity(Components.TURN_SCREEN_ON_SHOW_ON_LOCK_ACTIVITY);
             state.waitForDreamGone();
             waitAndAssertTopResumedActivity(Components.TURN_SCREEN_ON_SHOW_ON_LOCK_ACTIVITY,
                     DEFAULT_DISPLAY, "TurnScreenOnShowOnLockActivity should resume through dream");
-            assertFalse(getIsDreaming());
+            assertFalse(mDreamCoordinator.isDreaming());
         }
     }
 
     private class DreamingState implements AutoCloseable {
         public DreamingState(ComponentName dream) {
-            setActiveDream(dream);
-            startDream(dream);
+            mDreamActivityName = mDreamCoordinator.setActiveDream(dream);
+            mDreamCoordinator.startDream(dream);
             waitAndAssertDreaming();
         }
 
         @Override
         public void close() {
-            stopDream();
+            mDreamCoordinator.stopDream();
         }
 
         public void waitAndAssertDreaming() {
@@ -280,12 +222,12 @@
                     "Dream activity should be the top resumed activity");
             mWmState.waitForValidState(mWmState.getHomeActivityName());
             mWmState.assertVisibility(mWmState.getHomeActivityName(), false);
-            assertTrue(getIsDreaming());
+            assertTrue(mDreamCoordinator.isDreaming());
         }
 
         public void waitForDreamGone() {
             mWmState.waitForDreamGone();
-            assertFalse(getIsDreaming());
+            assertFalse(mDreamCoordinator.isDreaming());
         }
     }
 }
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/HideOverlayWindowsTest.java b/tests/framework/base/windowmanager/src/android/server/wm/HideOverlayWindowsTest.java
index 4a49d9a..aa30d0c 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/HideOverlayWindowsTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/HideOverlayWindowsTest.java
@@ -65,7 +65,7 @@
     public void setUp() throws Exception {
         super.setUp();
         mPongReceiver = new PongReceiver();
-        mContext.registerReceiver(mPongReceiver, new IntentFilter(PONG));
+        mContext.registerReceiver(mPongReceiver, new IntentFilter(PONG), Context.RECEIVER_EXPORTED);
     }
 
     @After
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/KeepClearRectsTests.java b/tests/framework/base/windowmanager/src/android/server/wm/KeepClearRectsTests.java
new file mode 100644
index 0000000..5e7ea21
--- /dev/null
+++ b/tests/framework/base/windowmanager/src/android/server/wm/KeepClearRectsTests.java
@@ -0,0 +1,607 @@
+/*
+ * Copyright (C) 2021 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 android.server.wm;
+
+import static android.server.wm.app.Components.KEEP_CLEAR_RECTS_ACTIVITY;
+import static android.server.wm.app.Components.KEEP_CLEAR_RECTS_ACTIVITY2;
+import static android.server.wm.app.Components.KeepClearRectsActivity.EXTRA_KEEP_CLEAR_RECTS;
+import static android.view.Display.DEFAULT_DISPLAY;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import static java.util.Collections.EMPTY_LIST;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.platform.test.annotations.Presubmit;
+import android.server.wm.cts.R;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.RelativeLayout;
+import android.widget.RelativeLayout.LayoutParams;
+
+import androidx.test.filters.FlakyTest;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+@Presubmit
+@FlakyTest(detail = "Promote once confirmed non-flaky")
+public class KeepClearRectsTests extends WindowManagerTestBase {
+    private static final long FOCUS_VIEW_CHECK_TIMEOUT = 3000;
+    private static final List<Rect> TEST_KEEP_CLEAR_RECTS =
+            Arrays.asList(new Rect(0, 0, 25, 25),
+                          new Rect(30, 0, 50, 25),
+                          new Rect(25, 25, 50, 50),
+                          new Rect(10, 30, 20, 50));
+    private static final List<Rect> TEST_KEEP_CLEAR_RECTS_2 =
+            Arrays.asList(new Rect(55, 0, 75, 15),
+                          new Rect(50, 15, 60, 25),
+                          new Rect(75, 25, 90, 50),
+                          new Rect(90, 0, 100, 10));
+    private static final Rect TEST_VIEW_BOUNDS = new Rect(0, 0, 100, 100);
+    private static final String USE_KEEP_CLEAR_ATTR_LAYOUT = "use_keep_clear_attr_layout";
+
+    private TestActivitySession<TestActivity> mTestSession;
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        mTestSession = createManagedTestActivitySession();
+    }
+
+    @Test
+    public void testSetPreferKeepClearAttr() {
+        final Intent intent = new Intent(mContext, TestActivity.class);
+        intent.putExtra(USE_KEEP_CLEAR_ATTR_LAYOUT, true);
+        mTestSession.launchTestActivityOnDisplaySync(null, intent, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        // To be kept in sync with res/layout/keep_clear_attr_activity
+        final Rect keepClearRect = new Rect(0, 0, 25, 25);
+        assertSameElements(Arrays.asList(keepClearRect), getKeepClearRectsForActivity(activity));
+    }
+
+    @Test
+    public void testSetPreferKeepClearSingleView() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final Rect keepClearRect = new Rect(0, 0, 25, 25);
+        final View v = createTestViewInActivity(activity, keepClearRect);
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClear(true));
+
+        assertSameElements(Arrays.asList(keepClearRect), getKeepClearRectsForActivity(activity));
+    }
+
+    @Test
+    public void testSetPreferKeepClearTwoViews() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final Rect keepClearRect = new Rect(0, 0, 25, 25);
+        final View v = createTestViewInActivity(activity, keepClearRect);
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClear(true));
+
+        final List<Rect> expected = new ArrayList(Arrays.asList(keepClearRect));
+        assertSameElements(expected, getKeepClearRectsForActivity(activity));
+
+        final Rect keepClearRect2 = new Rect(25, 25, 50, 50);
+        final View v2 = createTestViewInActivity(activity, keepClearRect2);
+        mTestSession.runOnMainSyncAndWait(() -> v2.setPreferKeepClear(true));
+
+        expected.addAll(Arrays.asList(keepClearRect2));
+        assertSameElements(expected, getKeepClearRectsForActivity(activity));
+    }
+
+    @Test
+    public void testSetMultipleKeepClearRectsSingleView() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final View v = createTestViewInActivity(activity);
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS));
+
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, getKeepClearRectsForActivity(activity));
+    }
+
+    @Test
+    public void testSetMultipleKeepClearRectsTwoViews() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final View v1 = createTestViewInActivity(activity);
+        final View v2 = createTestViewInActivity(activity);
+        mTestSession.runOnMainSyncAndWait(() -> {
+            v1.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS);
+            v2.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS_2);
+        });
+
+        final List<Rect> expected = new ArrayList(TEST_KEEP_CLEAR_RECTS);
+        expected.addAll(TEST_KEEP_CLEAR_RECTS_2);
+        assertSameElements(expected, getKeepClearRectsForActivity(activity));
+    }
+
+    @Test
+    public void testIsPreferKeepClearSingleView() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final Rect viewBounds = new Rect(0, 0, 60, 60);
+        final View v = createTestViewInActivity(activity, viewBounds);
+        assertFalse(v.isPreferKeepClear());
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClear(true));
+        assertTrue(v.isPreferKeepClear());
+
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClear(false));
+        assertFalse(v.isPreferKeepClear());
+    }
+
+    @Test
+    public void testGetPreferKeepClearRectsSingleView() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final Rect viewBounds = new Rect(0, 0, 60, 60);
+        final View v = createTestViewInActivity(activity, viewBounds);
+        assertSameElements(EMPTY_LIST, v.getPreferKeepClearRects());
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS));
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, v.getPreferKeepClearRects());
+
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS_2));
+        assertSameElements(TEST_KEEP_CLEAR_RECTS_2, v.getPreferKeepClearRects());
+
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClearRects(EMPTY_LIST));
+        assertSameElements(EMPTY_LIST, v.getPreferKeepClearRects());
+    }
+
+    @Test
+    public void testGettersPreferKeepClearRectsTwoViews() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final Rect viewBounds1 = new Rect(0, 0, 60, 60);
+        final Rect viewBounds2 = new Rect(0, 0, 90, 90);
+        final View v1 = createTestViewInActivity(activity, viewBounds1);
+        final View v2 = createTestViewInActivity(activity, viewBounds2);
+        mTestSession.runOnMainSyncAndWait(() -> {
+            v1.setPreferKeepClear(true);
+            v2.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS);
+        });
+
+        assertTrue(v1.isPreferKeepClear());
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, v2.getPreferKeepClearRects());
+
+        mTestSession.runOnMainSyncAndWait(() -> v1.setPreferKeepClear(false));
+        assertFalse(v1.isPreferKeepClear());
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, v2.getPreferKeepClearRects());
+
+        mTestSession.runOnMainSyncAndWait(() -> {
+            v1.setPreferKeepClear(true);
+            v2.setPreferKeepClearRects(EMPTY_LIST);
+        });
+        assertTrue(v1.isPreferKeepClear());
+        assertSameElements(EMPTY_LIST, v2.getPreferKeepClearRects());
+    }
+
+    @Test
+    public void testSetPreferKeepClearCombinesWithMultipleRects() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final Rect viewBounds = new Rect(0, 0, 60, 60);
+        final View v = createTestViewInActivity(activity, viewBounds);
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS));
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClear(true));
+        final List<Rect> combinedRects = new ArrayList<>(TEST_KEEP_CLEAR_RECTS);
+        combinedRects.add(viewBounds);
+        assertSameElements(combinedRects, getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClear(false));
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, getKeepClearRectsForActivity(activity));
+    }
+
+    @Test
+    public void testIgnoreKeepClearRectsFromGoneViews() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final Rect viewBounds = new Rect(0, 0, 60, 60);
+        final View v = createTestViewInActivity(activity, viewBounds);
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClear(true));
+        assertSameElements(Arrays.asList(viewBounds), getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> v.setVisibility(View.GONE));
+        assertSameElements(EMPTY_LIST, getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> v.setVisibility(View.VISIBLE));
+        assertSameElements(Arrays.asList(viewBounds), getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> {
+            v.setPreferKeepClear(false);
+            v.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS);
+        });
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> v.setVisibility(View.GONE));
+        assertSameElements(EMPTY_LIST, getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> v.setVisibility(View.VISIBLE));
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, getKeepClearRectsForActivity(activity));
+
+        final Rect viewBounds2 = new Rect(60, 60, 90, 90);
+        final View v2 = createTestViewInActivity(activity, viewBounds2);
+        mTestSession.runOnMainSyncAndWait(() -> v2.setPreferKeepClear(true));
+
+        final List<Rect> expected = new ArrayList(TEST_KEEP_CLEAR_RECTS);
+        expected.add(viewBounds2);
+        assertSameElements(expected, getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> v.setVisibility(View.GONE));
+        assertSameElements(Arrays.asList(viewBounds2), getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> {
+            v.setVisibility(View.VISIBLE);
+            v2.setVisibility(View.GONE);
+        });
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> {
+            v.setVisibility(View.VISIBLE);
+            v2.setVisibility(View.VISIBLE);
+        });
+        assertSameElements(expected, getKeepClearRectsForActivity(activity));
+    }
+
+    @Test
+    public void testIgnoreKeepClearRectsFromDetachedViews() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final Rect viewBounds = new Rect(0, 0, 60, 60);
+        final View v = createTestViewInActivity(activity, viewBounds);
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClear(true));
+        assertSameElements(Arrays.asList(viewBounds), getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> ((ViewGroup) v.getParent()).removeView(v));
+        assertSameElements(EMPTY_LIST, getKeepClearRectsForActivity(activity));
+    }
+
+    @Test
+    public void testFocusedViewDeclaredAsKeepClearArea() throws Exception {
+        int preferKeepClearForFocusDelay = ViewConfiguration.get(
+                mContext).getPreferKeepClearForFocusDelay();
+
+        assumeTrue(preferKeepClearForFocusDelay >= 0);
+
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final Rect viewBounds = new Rect(0, 0, 60, 60);
+        final View v = createTestViewInActivity(activity, viewBounds);
+        assertSameElements(EMPTY_LIST, getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> {
+            v.setFocusable(true);
+            v.requestFocus();
+        });
+
+        PollingCheck.check("Expected focused view bounds as keep clear area",
+                preferKeepClearForFocusDelay + FOCUS_VIEW_CHECK_TIMEOUT,
+                () -> hasSameElements(Arrays.asList(viewBounds),
+                        getKeepClearRectsForActivity(activity)));
+
+        mTestSession.runOnMainSyncAndWait(() -> v.setFocusable(false));
+        PollingCheck.check("Expected no keep clear areas after clearing focus, but found some",
+                preferKeepClearForFocusDelay + FOCUS_VIEW_CHECK_TIMEOUT,
+                () -> hasSameElements(EMPTY_LIST, getKeepClearRectsForActivity(activity)));
+    }
+
+    @Test
+    public void testKeepClearRectsGetTranslatedToWindowSpace() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final Rect viewBounds = new Rect(30, 30, 60, 60);
+        final View v = createTestViewInActivity(activity, viewBounds);
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS));
+        final List<Rect> expected = new ArrayList();
+        for (Rect r : TEST_KEEP_CLEAR_RECTS) {
+            Rect newRect = new Rect(r);
+            newRect.offset(viewBounds.left, viewBounds.top);
+            expected.add(newRect);
+        }
+
+        assertSameElements(expected, getKeepClearRectsForActivity(activity));
+    }
+
+    @Test
+    public void testSetKeepClearRectsOnDisplaySingleWindow() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final Rect keepClearRect = new Rect(0, 0, 25, 25);
+        final View v = createTestViewInActivity(activity, keepClearRect);
+        mTestSession.runOnMainSyncAndWait(() -> v.setPreferKeepClear(true));
+        assertSameElements(Arrays.asList(keepClearRect), getKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> {
+            v.setPreferKeepClear(false);
+            v.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS);
+        });
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, getKeepClearRectsForActivity(activity));
+
+        final List<Rect> expectedRectsInScreenSpace =
+                getRectsInScreenSpace(TEST_KEEP_CLEAR_RECTS, activity.getComponentName());
+        assertSameElements(expectedRectsInScreenSpace, getKeepClearRectsOnDefaultDisplay());
+
+        activity.finishAndRemoveTask();
+        assertTrue(Collections.disjoint(
+                expectedRectsInScreenSpace,
+                getKeepClearRectsOnDefaultDisplay()));
+    }
+
+    @Test
+    public void testKeepClearRectsOnDisplayTwoWindows() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final Rect viewBounds = new Rect(0, 0, 25, 25);
+        final View v1 = createTestViewInActivity(activity, viewBounds);
+        mTestSession.runOnMainSyncAndWait(() -> v1.setPreferKeepClear(true));
+        assertSameElements(Arrays.asList(viewBounds), getKeepClearRectsForActivity(activity));
+
+        final String title = "KeepClearRectsTestWindow";
+        mTestSession.runOnMainSyncAndWait(() -> {
+            final View testView = new View(activity);
+            testView.setPreferKeepClear(true);
+            testView.setBackgroundColor(Color.argb(20, 255, 0, 0));
+            WindowManager.LayoutParams params = new WindowManager.LayoutParams();
+            params.gravity = Gravity.TOP | Gravity.START;
+            params.width = 50;
+            params.height = 50;
+            params.setTitle(title);
+            activity.getWindowManager().addView(testView, params);
+        });
+        mWmState.waitAndAssertWindowSurfaceShown(title, true);
+
+        assertSameElements(Arrays.asList(viewBounds), getKeepClearRectsForActivity(activity));
+    }
+
+    @Test
+    public void testKeepClearRectsOnDisplayTwoFullscreenActivities() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity1 = mTestSession.getActivity();
+
+        final Rect viewBounds = new Rect(0, 0, 25, 25);
+        final View v1 = createTestViewInActivity(activity1, viewBounds);
+        mTestSession.runOnMainSyncAndWait(() -> v1.setPreferKeepClear(true));
+        assertSameElements(Arrays.asList(viewBounds), getKeepClearRectsForActivity(activity1));
+
+        final TestActivitySession<TranslucentTestActivity> translucentTestSession =
+                createManagedTestActivitySession();
+        translucentTestSession.launchTestActivityOnDisplaySync(
+                TranslucentTestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity2 = translucentTestSession.getActivity();
+
+        final View v2 = createTestViewInActivity(activity2);
+        mTestSession.runOnMainSyncAndWait(() -> v2.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS));
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, getKeepClearRectsForActivity(activity2));
+
+        mWmState.assertVisibility(activity1.getComponentName(), true);
+        mWmState.assertVisibility(activity2.getComponentName(), true);
+
+        // Since both activities are fullscreen, WM only takes the keep clear areas from the top one
+        assertSameElements(getRectsInScreenSpace(TEST_KEEP_CLEAR_RECTS,
+                    activity2.getComponentName()), getKeepClearRectsOnDefaultDisplay());
+    }
+
+    @Test
+    public void testDisplayHasKeepClearRectsOnlyFromVisibleWindows() {
+        final TestActivitySession<TranslucentTestActivity> translucentTestSession =
+                createManagedTestActivitySession();
+        translucentTestSession.launchTestActivityOnDisplaySync(
+                TranslucentTestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity1 = translucentTestSession.getActivity();
+
+        final Rect viewBounds = new Rect(0, 0, 25, 25);
+        final View v1 = createTestViewInActivity(activity1, viewBounds);
+        translucentTestSession.runOnMainSyncAndWait(() -> v1.setPreferKeepClear(true));
+        assertSameElements(getRectsInScreenSpace(Arrays.asList(viewBounds),
+                                                 activity1.getComponentName()),
+                           getKeepClearRectsOnDefaultDisplay());
+
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity2 = mTestSession.getActivity();
+        final View v2 = createTestViewInActivity(activity2);
+        mTestSession.runOnMainSyncAndWait(() -> v2.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS));
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, getKeepClearRectsForActivity(activity2));
+
+        mWmState.waitAndAssertVisibilityGone(activity1.getComponentName());
+        mWmState.assertVisibility(activity2.getComponentName(), true);
+
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, getKeepClearRectsForActivity(activity2));
+    }
+
+    @Test
+    public void testDisplayHasKeepClearAreasFromTwoActivitiesInSplitscreen() {
+        assumeTrue("Skipping test: no split multi-window support",
+                supportsSplitScreenMultiWindow());
+
+        final LaunchActivityBuilder activityBuilder1 = getLaunchActivityBuilder()
+                .setUseInstrumentation()
+                .setIntentExtra(extra -> {
+                    extra.putParcelableArrayList(EXTRA_KEEP_CLEAR_RECTS,
+                            new ArrayList(TEST_KEEP_CLEAR_RECTS));
+                })
+                .setTargetActivity(KEEP_CLEAR_RECTS_ACTIVITY);
+
+        final LaunchActivityBuilder activityBuilder2 = getLaunchActivityBuilder()
+                .setUseInstrumentation()
+                .setIntentExtra(extra -> {
+                    extra.putParcelableArrayList(EXTRA_KEEP_CLEAR_RECTS,
+                            new ArrayList(TEST_KEEP_CLEAR_RECTS_2));
+                })
+                .setTargetActivity(KEEP_CLEAR_RECTS_ACTIVITY2);
+
+        launchActivitiesInSplitScreen(activityBuilder1, activityBuilder2);
+
+        waitAndAssertResumedActivity(KEEP_CLEAR_RECTS_ACTIVITY, KEEP_CLEAR_RECTS_ACTIVITY
+                + " must be resumed");
+        waitAndAssertResumedActivity(KEEP_CLEAR_RECTS_ACTIVITY2, KEEP_CLEAR_RECTS_ACTIVITY2
+                + " must be resumed");
+        mWmState.assertVisibility(KEEP_CLEAR_RECTS_ACTIVITY, true);
+        mWmState.assertVisibility(KEEP_CLEAR_RECTS_ACTIVITY2, true);
+
+        assertSameElements(TEST_KEEP_CLEAR_RECTS,
+                           getKeepClearRectsForActivity(KEEP_CLEAR_RECTS_ACTIVITY));
+        assertSameElements(TEST_KEEP_CLEAR_RECTS_2,
+                           getKeepClearRectsForActivity(KEEP_CLEAR_RECTS_ACTIVITY2));
+
+        final List<Rect> expected = new ArrayList();
+        expected.addAll(getRectsInScreenSpace(TEST_KEEP_CLEAR_RECTS, KEEP_CLEAR_RECTS_ACTIVITY));
+        expected.addAll(getRectsInScreenSpace(TEST_KEEP_CLEAR_RECTS_2, KEEP_CLEAR_RECTS_ACTIVITY2));
+        assertSameElements(expected, getKeepClearRectsOnDefaultDisplay());
+    }
+
+    @Test
+    public void testUnrestrictedKeepClearRects() {
+        mTestSession.launchTestActivityOnDisplaySync(TestActivity.class, DEFAULT_DISPLAY);
+        final TestActivity activity = mTestSession.getActivity();
+
+        final View v = createTestViewInActivity(activity);
+        mTestSession.runOnMainSyncAndWait(() -> {
+            v.setUnrestrictedPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS);
+        });
+
+        assertSameElements(EMPTY_LIST, getKeepClearRectsForActivity(activity));
+        assertSameElements(EMPTY_LIST, getUnrestrictedKeepClearRectsForActivity(activity));
+
+        mTestSession.runOnMainSyncAndWait(() -> {
+            v.setPreferKeepClearRects(TEST_KEEP_CLEAR_RECTS);
+        });
+
+        assertSameElements(TEST_KEEP_CLEAR_RECTS, getKeepClearRectsForActivity(activity));
+        assertSameElements(EMPTY_LIST, getUnrestrictedKeepClearRectsForActivity(activity));
+    }
+
+    private View createTestViewInActivity(TestActivity activity) {
+        return createTestViewInActivity(activity, new Rect(0, 0, 100, 100));
+    }
+
+    private View createTestViewInActivity(TestActivity activity, Rect viewBounds) {
+        final View newView = new View(activity);
+        final LayoutParams params = new LayoutParams(viewBounds.width(), viewBounds.height());
+        params.leftMargin = viewBounds.left;
+        params.topMargin = viewBounds.top;
+        mTestSession.runOnMainSyncAndWait(() -> {
+            activity.addView(newView, params);
+        });
+        return newView;
+    }
+
+    private List<Rect> getKeepClearRectsForActivity(Activity activity) {
+        return getKeepClearRectsForActivity(activity.getComponentName());
+    }
+
+    private List<Rect> getKeepClearRectsForActivity(ComponentName activityComponent) {
+        mWmState.computeState();
+        return mWmState.getWindowState(activityComponent).getKeepClearRects();
+    }
+
+    private List<Rect> getKeepClearRectsOnDefaultDisplay() {
+        mWmState.computeState();
+        return mWmState.getDisplay(DEFAULT_DISPLAY).getKeepClearRects();
+    }
+
+    private List<Rect> getUnrestrictedKeepClearRectsForActivity(Activity activity) {
+        mWmState.computeState();
+        return mWmState.getWindowState(activity.getComponentName()).getUnrestrictedKeepClearRects();
+    }
+
+    public static class TestActivity extends FocusableActivity {
+        private RelativeLayout mRootView;
+
+        public void addView(View v, LayoutParams params) {
+            mRootView.addView(v, params);
+        }
+
+        @Override
+        protected void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            if (getIntent().getBooleanExtra(USE_KEEP_CLEAR_ATTR_LAYOUT, false)) {
+                setContentView(R.layout.keep_clear_attr_activity);
+            } else {
+                setContentView(R.layout.keep_clear_rects_activity);
+            }
+            mRootView = findViewById(R.id.root);
+
+            getWindow().setDecorFitsSystemWindows(false);
+        }
+    }
+
+    public static class TranslucentTestActivity extends TestActivity {}
+
+    private List<Rect> getRectsInScreenSpace(List<Rect> rects, ComponentName componentName) {
+        mWmState.computeState();
+        final WindowManagerState.WindowState windowState =
+                mWmState.getWindowState(componentName);
+        final List<Rect> result = new ArrayList<>();
+        for (Rect r : rects) {
+            Rect rectInScreenSpace = new Rect(r);
+            rectInScreenSpace.offset(windowState.getFrame().left, windowState.getFrame().top);
+            result.add(rectInScreenSpace);
+        }
+        return result;
+    }
+
+    private static <T> void assertSameElements(List<T> expected, List<T> actual) {
+        if (!hasSameElements(expected, actual)) {
+            assertEquals(expected, actual);
+        }
+    }
+
+    private static <T> boolean hasSameElements(List<T> fst, List<T> snd) {
+        if (fst.size() != snd.size()) return false;
+
+        for (T a : fst) {
+            if (!snd.contains(a)) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardInputTests.java b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardInputTests.java
index 6ee0eb4..2dbc649 100755
--- a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardInputTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardInputTests.java
@@ -30,7 +30,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.rule.ActivityTestRule;
 
-import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -54,7 +54,7 @@
         assumeTrue(supportsInsecureLock());
 
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
     }
 
     /**
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardLockedTests.java b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardLockedTests.java
index 354807f..784003b 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardLockedTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardLockedTests.java
@@ -30,7 +30,6 @@
 import static android.server.wm.app.Components.PipActivity.EXTRA_SHOW_OVER_KEYGUARD;
 import static android.server.wm.app.Components.SHOW_WHEN_LOCKED_ACTIVITY;
 import static android.server.wm.app.Components.SHOW_WHEN_LOCKED_ATTR_IME_ACTIVITY;
-import static android.server.wm.app.Components.TURN_SCREEN_ON_ACTIVITY;
 import static android.server.wm.app.Components.TURN_SCREEN_ON_ATTR_DISMISS_KEYGUARD_ACTIVITY;
 import static android.view.Display.DEFAULT_DISPLAY;
 import static android.view.WindowInsets.Type.ime;
@@ -51,7 +50,6 @@
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.platform.test.annotations.Presubmit;
-import android.server.wm.app.Components;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.LinearLayout;
@@ -176,6 +174,20 @@
     }
 
     @Test
+    public void testDismissKeyguardIfInsecure_notAllowed() {
+        final LockScreenSession lockScreenSession = createManagedLockScreenSession();
+        lockScreenSession.setLockCredential().gotoKeyguard();
+
+        mWmState.assertKeyguardShowingAndNotOccluded();
+        launchActivityWithDismissKeyguardIfInsecure(SHOW_WHEN_LOCKED_ACTIVITY);
+        mWmState.computeState(SHOW_WHEN_LOCKED_ACTIVITY);
+        mWmState.assertVisibility(SHOW_WHEN_LOCKED_ACTIVITY, true);
+
+        // Make sure we stay on Keyguard.
+        mWmState.assertKeyguardShowingAndOccluded();
+    }
+
+    @Test
     public void testDismissKeyguardActivity_method() {
         final LockScreenSession lockScreenSession = createManagedLockScreenSession();
         lockScreenSession.setLockCredential();
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java
index dc7c308..3062980 100755
--- a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTests.java
@@ -46,8 +46,16 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
+import android.Manifest;
+import android.app.KeyguardManager.KeyguardLockedStateListener;
 import android.content.ComponentName;
 import android.content.res.Configuration;
 import android.platform.test.annotations.Presubmit;
@@ -187,6 +195,8 @@
      */
     @Test
     public void testTranslucentShowWhenLockedActivity() {
+        // TODO(b/209906849) remove assumeFalse after issue fix.
+        assumeFalse(ENABLE_SHELL_TRANSITIONS);
         final LockScreenSession lockScreenSession = createManagedLockScreenSession();
         launchActivity(SHOW_WHEN_LOCKED_TRANSLUCENT_ACTIVITY);
         mWmState.computeState(SHOW_WHEN_LOCKED_TRANSLUCENT_ACTIVITY);
@@ -219,6 +229,8 @@
 
     @Test
     public void testDialogShowWhenLockedActivity() {
+        // TODO(b/209906849) remove assumeFalse after issue fix.
+        assumeFalse(ENABLE_SHELL_TRANSITIONS);
         final LockScreenSession lockScreenSession = createManagedLockScreenSession();
         launchActivity(SHOW_WHEN_LOCKED_DIALOG_ACTIVITY);
         mWmState.computeState(SHOW_WHEN_LOCKED_DIALOG_ACTIVITY);
@@ -677,4 +689,68 @@
 
     }
 
+    @Test
+    public void testAddKeyguardLockedStateListener_hideToShow_callbackInvoked() {
+        mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
+                Manifest.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE);
+        final LockScreenSession lockScreenSession = createManagedLockScreenSession();
+        final KeyguardLockedStateListener listener = getTestKeyguardLockedStateListener();
+        mKeyguardManager.addKeyguardLockedStateListener(mContext.getMainExecutor(), listener);
+
+        lockScreenSession.gotoKeyguard();
+        lockScreenSession.gotoKeyguard();  // state not changed
+
+        verify(listener, times(1)).onKeyguardLockedStateChanged(true);
+        verify(listener, never()).onKeyguardLockedStateChanged(false);
+
+        mKeyguardManager.removeKeyguardLockedStateListener(listener);
+        mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+    }
+
+    @Test
+    public void testAddKeyguardLockedStateListener_showToHide_callbackInvoked() {
+        mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
+                Manifest.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE);
+        final LockScreenSession lockScreenSession = createManagedLockScreenSession();
+        final KeyguardLockedStateListener listener = getTestKeyguardLockedStateListener();
+        mKeyguardManager.addKeyguardLockedStateListener(mContext.getMainExecutor(), listener);
+
+        lockScreenSession.gotoKeyguard();
+        lockScreenSession.unlockDevice();
+        lockScreenSession.unlockDevice();  // state not changed
+
+        verify(listener, times(1)).onKeyguardLockedStateChanged(true);
+        verify(listener, times(1)).onKeyguardLockedStateChanged(false);
+
+        mKeyguardManager.removeKeyguardLockedStateListener(listener);
+        mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+    }
+
+    @Test
+    public void testAddRemoveKeyguardLockedStateListener_callbackNotInvoked() {
+        mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
+                Manifest.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE);
+        final LockScreenSession lockScreenSession = createManagedLockScreenSession();
+        final KeyguardLockedStateListener listener = getTestKeyguardLockedStateListener();
+        mKeyguardManager.addKeyguardLockedStateListener(mContext.getMainExecutor(), listener);
+        mKeyguardManager.removeKeyguardLockedStateListener(listener);
+
+        lockScreenSession.gotoKeyguard();
+        lockScreenSession.unlockDevice();
+        lockScreenSession.gotoKeyguard();
+
+        verify(listener, never()).onKeyguardLockedStateChanged(anyBoolean());
+
+        mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+    }
+
+    public KeyguardLockedStateListener getTestKeyguardLockedStateListener() {
+        return spy(new TestKeyguardLockedStateListener());
+    }
+
+    public static class TestKeyguardLockedStateListener implements KeyguardLockedStateListener {
+        @Override
+        public void onKeyguardLockedStateChanged(boolean isKeyguardLocked) {
+        }
+    }
 }
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTransitionTests.java b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTransitionTests.java
index b585c04..bac67d2 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTransitionTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/KeyguardTransitionTests.java
@@ -106,6 +106,15 @@
     }
 
     @Test
+    public void testDismissKeyguardIfInsecure() {
+        createManagedLockScreenSession().gotoKeyguard();
+        launchActivityWithDismissKeyguardIfInsecure(SHOW_WHEN_LOCKED_NO_PREVIEW_ACTIVITY);
+        mWmState.computeState(SHOW_WHEN_LOCKED_NO_PREVIEW_ACTIVITY);
+        assertEquals("Picked wrong transition", TRANSIT_KEYGUARD_GOING_AWAY,
+                mWmState.getDefaultDisplayLastTransition());
+    }
+
+    @Test
     public void testNewActivityDuringOccluded() {
         final LockScreenSession lockScreenSession = createManagedLockScreenSession();
         launchActivity(SHOW_WHEN_LOCKED_NO_PREVIEW_ACTIVITY);
@@ -117,6 +126,18 @@
     }
 
     @Test
+    public void testNewDismissKeyguardIfInsecureActivityDuringOccluded() {
+        final LockScreenSession lockScreenSession = createManagedLockScreenSession();
+        launchActivity(SHOW_WHEN_LOCKED_NO_PREVIEW_ACTIVITY);
+        lockScreenSession.gotoKeyguard(SHOW_WHEN_LOCKED_NO_PREVIEW_ACTIVITY);
+        launchActivityWithDismissKeyguardIfInsecure(
+                SHOW_WHEN_LOCKED_WITH_DIALOG_NO_PREVIEW_ACTIVITY);
+        mWmState.computeState(SHOW_WHEN_LOCKED_WITH_DIALOG_NO_PREVIEW_ACTIVITY);
+        assertEquals("Picked wrong transition", TRANSIT_ACTIVITY_OPEN,
+                mWmState.getDefaultDisplayLastTransition());
+    }
+
+    @Test
     public void testOccludeManifestAttr() {
         final LockScreenSession lockScreenSession = createManagedLockScreenSession();
         lockScreenSession.gotoKeyguard();
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/LocationInWindowTests.java b/tests/framework/base/windowmanager/src/android/server/wm/LocationInWindowTests.java
index a4b0e52..1b21043 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/LocationInWindowTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/LocationInWindowTests.java
@@ -45,6 +45,7 @@
 import androidx.test.rule.ActivityTestRule;
 
 import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.hamcrest.Matcher;
 import org.junit.Before;
@@ -162,7 +163,7 @@
             LayoutParams lp) {
         final T activity = rule.launchActivity(
                 new Intent().putExtra(EXTRA_LAYOUT_PARAMS, lp));
-        PollingCheck.waitFor(activity::hasWindowFocus);
+        WindowUtil.waitForFocus(activity);
         return activity;
     }
 
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/LocationOnScreenTests.java b/tests/framework/base/windowmanager/src/android/server/wm/LocationOnScreenTests.java
index 9c9491c..b7b8376 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/LocationOnScreenTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/LocationOnScreenTests.java
@@ -54,6 +54,7 @@
 
 import com.android.compatibility.common.util.BitmapUtils;
 import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.hamcrest.Matcher;
 import org.junit.Assert;
@@ -148,7 +149,7 @@
             LayoutParams lp) {
         final T activity = rule.launchActivity(
                 new Intent().putExtra(EXTRA_LAYOUT_PARAMS, lp));
-        PollingCheck.waitFor(activity::hasWindowFocus);
+        WindowUtil.waitForFocus(activity);
         return activity;
     }
 
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/ManifestLayoutTests.java b/tests/framework/base/windowmanager/src/android/server/wm/ManifestLayoutTests.java
index 3e5b5d6..b372d53 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/ManifestLayoutTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/ManifestLayoutTests.java
@@ -36,13 +36,13 @@
 import android.graphics.Rect;
 import android.platform.test.annotations.Presubmit;
 import android.server.wm.WindowManagerState.WindowState;
+import android.util.DisplayMetrics;
 import android.view.DisplayCutout;
 import android.view.WindowMetrics;
 
 import org.junit.Test;
 
 import java.util.List;
-import android.util.DisplayMetrics;
 
 /**
  * Build/Install/Run:
@@ -121,12 +121,11 @@
         // Use default density because ActivityInfo.WindowLayout is initialized by that.
         final int minWidth = dpToPx(MIN_WIDTH_DP, DisplayMetrics.DENSITY_DEVICE_STABLE);
         final int minHeight = dpToPx(MIN_HEIGHT_DP, DisplayMetrics.DENSITY_DEVICE_STABLE);
-        final Rect containingRect = mWindowState.getContainingFrame();
+        final Rect parentFrame = mWindowState.getParentFrame();
         final int cutoutSize = getCutoutSizeByHorGravity(GRAVITY_HOR_LEFT);
 
-        assertEquals("Min width is incorrect", minWidth,
-                containingRect.width() + cutoutSize);
-        assertEquals("Min height is incorrect", minHeight, containingRect.height());
+        assertEquals("Min width is incorrect", minWidth, parentFrame.width() + cutoutSize);
+        assertEquals("Min height is incorrect", minHeight, parentFrame.height());
     }
 
     private void testLayout(
@@ -147,7 +146,7 @@
 
         getDisplayAndWindowState(activityName, true);
 
-        final Rect containingRect = mWindowState.getContainingFrame();
+        final Rect parentFrame = mWindowState.getParentFrame();
         final WindowMetrics windowMetrics = mWm.getMaximumWindowMetrics();
         final Rect stableBounds = new Rect(windowMetrics.getBounds());
         stableBounds.inset(windowMetrics.getWindowInsets().getInsetsIgnoringVisibility(
@@ -166,7 +165,7 @@
         }
 
         verifyFrameSizeAndPosition(vGravity, hGravity, expectedWidthPx, expectedHeightPx,
-                containingRect, stableBounds);
+                parentFrame, stableBounds);
     }
 
     private void getDisplayAndWindowState(ComponentName activityName, boolean checkFocus)
@@ -196,24 +195,24 @@
 
     private void verifyFrameSizeAndPosition(
             int vGravity, int hGravity, int expectedWidthPx, int expectedHeightPx,
-            Rect containingFrame, Rect parentFrame) {
+            Rect parentFrame, Rect stableBounds) {
         final int cutoutSize = getCutoutSizeByHorGravity(hGravity);
         assertEquals("Width is incorrect",
-                expectedWidthPx, containingFrame.width() + cutoutSize);
-        assertEquals("Height is incorrect", expectedHeightPx, containingFrame.height());
+                expectedWidthPx, parentFrame.width() + cutoutSize);
+        assertEquals("Height is incorrect", expectedHeightPx, parentFrame.height());
 
         if (vGravity == GRAVITY_VER_TOP) {
-            assertEquals("Should be on the top", parentFrame.top, containingFrame.top);
+            assertEquals("Should be on the top", stableBounds.top, parentFrame.top);
         } else if (vGravity == GRAVITY_VER_BOTTOM) {
-            assertEquals("Should be on the bottom", parentFrame.bottom, containingFrame.bottom);
+            assertEquals("Should be on the bottom", stableBounds.bottom, parentFrame.bottom);
         }
 
         if (hGravity == GRAVITY_HOR_LEFT) {
             assertEquals("Should be on the left",
-                    parentFrame.left, containingFrame.left - cutoutSize);
+                    stableBounds.left, parentFrame.left - cutoutSize);
         } else if (hGravity == GRAVITY_HOR_RIGHT){
             assertEquals("Should be on the right",
-                    parentFrame.right, containingFrame.right + cutoutSize);
+                    stableBounds.right, parentFrame.right + cutoutSize);
         }
     }
 
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/MinimalPostProcessingTests.java b/tests/framework/base/windowmanager/src/android/server/wm/MinimalPostProcessingTests.java
index d468092..a061f8c 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/MinimalPostProcessingTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/MinimalPostProcessingTests.java
@@ -26,10 +26,8 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
 
 import android.content.ComponentName;
-import android.content.pm.PackageManager;
 import android.platform.test.annotations.Presubmit;
 
 import org.junit.Test;
@@ -68,21 +66,11 @@
 
     private void assertDisplayRequestedMinimalPostProcessing(ComponentName name, boolean on) {
         final int displayId = getDisplayId(name);
+
+        // TODO(b/202378408) verify that minimal post-processing is requested only if
+        // it's supported once we have a separate API for disabling on-device processing.
         boolean requested = isMinimalPostProcessingRequested(displayId);
-
-        PackageManager packageManager = mContext.getPackageManager();
-        // For TV Android S is requesting minimal post processing regardless if it's supported,
-        // because the same signal is used by HAL implementations to disable on-device processing.
-        final boolean isTv = packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK);
-        if (isTv) {
-            // TODO(b/202378408): Verify that minimal post-processing is requested only if
-            // it's supported once we have a separate API for disabling on-device processing.
-            assertEquals(requested, on);
-            return;
-        }
-
-        boolean supported = isMinimalPostProcessingSupported(displayId);
-        assertTrue(supported ? requested == on : !requested);
+        assertEquals(requested, on);
     }
 
     @Test
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/MultiDisplayPolicyTests.java b/tests/framework/base/windowmanager/src/android/server/wm/MultiDisplayPolicyTests.java
index 58df952..e7d6650 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/MultiDisplayPolicyTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/MultiDisplayPolicyTests.java
@@ -570,7 +570,9 @@
         waitAndAssertActivityStateOnDisplay(TEST_ACTIVITY, STATE_RESUMED, newDisplay.mId,
                 "Activity launched on secondary display must be resumed");
 
-        tapOnDisplayCenter(DEFAULT_DISPLAY);
+        // Tap on task center to switch focus between displays. Using task center instead of
+        // display center to cover the multi window scenario.
+        tapOnTaskCenter(mWmState.getTaskByActivity(VIRTUAL_DISPLAY_ACTIVITY));
 
         waitAndAssertTopResumedActivity(VIRTUAL_DISPLAY_ACTIVITY, DEFAULT_DISPLAY,
                 "Top activity must be on the primary display");
@@ -624,7 +626,9 @@
         assertBothDisplaysHaveResumedActivities(pair(DEFAULT_DISPLAY, RESIZEABLE_ACTIVITY),
                 pair(newDisplay.mId, TEST_ACTIVITY));
 
-        tapOnDisplayCenter(DEFAULT_DISPLAY);
+        // Tap on task center to switch focus between displays. Using task center instead of
+        // display center to cover the multi window scenario.
+        tapOnTaskCenter(mWmState.getTaskByActivity(RESIZEABLE_ACTIVITY));
 
         // Check that the activity on the primary display is the topmost resumed
         waitAndAssertTopResumedActivity(RESIZEABLE_ACTIVITY, DEFAULT_DISPLAY,
@@ -675,7 +679,9 @@
         mWmState.assertFocusedAppOnDisplay("Activity on second display must be focused.",
                 VIRTUAL_DISPLAY_ACTIVITY, newDisplay.mId);
 
-        tapOnDisplayCenter(DEFAULT_DISPLAY);
+        // Tap on task center to switch focus between displays. Using task center instead of
+        // display center to cover the multi window scenario.
+        tapOnTaskCenter(mWmState.getTaskByActivity(TEST_ACTIVITY));
 
         waitAndAssertTopResumedActivity(TEST_ACTIVITY, DEFAULT_DISPLAY,
                 "Activity should be top resumed when tapped.");
@@ -869,7 +875,9 @@
         waitAndAssertTopResumedActivity(SDK_27_TEST_ACTIVITY, newDisplay.mId,
                 "Activity launched on secondary display must be resumed and focused");
 
-        tapOnDisplayCenter(DEFAULT_DISPLAY);
+        // Tap on task center to switch focus between displays. Using task center instead of
+        // display center to cover the multi window scenario.
+        tapOnTaskCenter(mWmState.getTaskByActivity(SDK_27_LAUNCHING_ACTIVITY));
         waitAndAssertTopResumedActivity(SDK_27_LAUNCHING_ACTIVITY, DEFAULT_DISPLAY,
                 "Activity launched on default display must be resumed and focused");
         assertEquals("There must be only one resumed activity in the package.", 1,
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/MultiDisplaySystemDecorationTests.java b/tests/framework/base/windowmanager/src/android/server/wm/MultiDisplaySystemDecorationTests.java
index cb2fb3f..f38e646 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/MultiDisplaySystemDecorationTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/MultiDisplaySystemDecorationTests.java
@@ -17,6 +17,8 @@
 package android.server.wm;
 
 import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
+import static android.server.wm.BarTestUtils.assumeHasBars;
+import static android.server.wm.MockImeHelper.createManagedMockImeSession;
 import static android.server.wm.UiDeviceUtils.pressSleepButton;
 import static android.server.wm.UiDeviceUtils.pressUnlockButton;
 import static android.server.wm.UiDeviceUtils.pressWakeupButton;
@@ -28,12 +30,11 @@
 import static android.server.wm.app.Components.TEST_LIVE_WALLPAPER_SERVICE;
 import static android.server.wm.app.Components.TestLiveWallpaperKeys.COMPONENT;
 import static android.server.wm.app.Components.TestLiveWallpaperKeys.ENGINE_DISPLAY_ID;
-import static android.server.wm.BarTestUtils.assumeHasBars;
-import static android.server.wm.MockImeHelper.createManagedMockImeSession;
 import static android.view.Display.DEFAULT_DISPLAY;
 import static android.view.WindowManager.DISPLAY_IME_POLICY_FALLBACK_DISPLAY;
 import static android.view.WindowManager.DISPLAY_IME_POLICY_HIDE;
 import static android.view.WindowManager.DISPLAY_IME_POLICY_LOCAL;
+import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED;
 import static android.view.WindowManager.LayoutParams.TYPE_WALLPAPER;
 
 import static com.android.cts.mockime.ImeEventStreamTestUtils.editorMatcher;
@@ -64,11 +65,12 @@
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.platform.test.annotations.Presubmit;
-import android.server.wm.WindowManagerState.DisplayContent;
 import android.server.wm.TestJournalProvider.TestJournalContainer;
+import android.server.wm.WindowManagerState.DisplayContent;
 import android.server.wm.WindowManagerState.WindowState;
 import android.server.wm.intent.Activities;
 import android.text.TextUtils;
+import android.view.Window;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
@@ -76,7 +78,6 @@
 import android.widget.EditText;
 import android.widget.LinearLayout;
 
-import com.android.compatibility.common.util.ImeAwareEditText;
 import com.android.compatibility.common.util.SystemUtil;
 import com.android.compatibility.common.util.TestUtils;
 import com.android.cts.mockime.ImeCommand;
@@ -497,9 +498,11 @@
         final DisplayContent defDisplay = mWmState.getDisplay(DEFAULT_DISPLAY);
         final ImeEventStream stream = mockImeSession.openEventStream();
 
-        // Tap default display as top focused display & request focus on EditText to show
-        // soft input.
-        tapOnDisplayCenter(defDisplay.mId);
+        // Tap on the imeTestActivity task center instead of the display center because
+        // the activity might not be spanning the entire display
+        WindowManagerState.Task imeTestActivityTask = mWmState
+                .getTaskByActivity(imeTestActivitySession.getActivity().getComponentName());
+        tapOnTaskCenter(imeTestActivityTask);
         expectEvent(stream, editorMatcher("onStartInput",
                 imeTestActivitySession.getActivity().mEditText.getPrivateImeOptions()), TIMEOUT);
         showSoftInputAndAssertImeShownOnDisplay(defDisplay.mId, imeTestActivitySession, stream);
@@ -511,8 +514,11 @@
                 imeTestActivitySession2.getActivity().mEditText.getPrivateImeOptions()), TIMEOUT);
         showSoftInputAndAssertImeShownOnDisplay(newDisplay.mId, imeTestActivitySession2, stream);
 
-        // Tap default display again to make sure the IME window will come back.
-        tapOnDisplayCenter(defDisplay.mId);
+        // Tap on the imeTestActivity task center instead of the display center because
+        // the activity might not be spanning the entire display
+        imeTestActivityTask = mWmState
+                .getTaskByActivity(imeTestActivitySession.getActivity().getComponentName());
+        tapOnTaskCenter(imeTestActivityTask);
         expectEvent(stream, editorMatcher("onStartInput",
                 imeTestActivitySession.getActivity().mEditText.getPrivateImeOptions()), TIMEOUT);
         showSoftInputAndAssertImeShownOnDisplay(defDisplay.mId, imeTestActivitySession, stream);
@@ -698,13 +704,19 @@
                 .setDisplayId(DEFAULT_DISPLAY).execute();
         waitAndAssertTopResumedActivity(imeTestActivitySession.getActivity().getComponentName(),
                 DEFAULT_DISPLAY, "Activity launched on default display and on top");
-        final ImeEventStream stream = mockImeSession.openEventStream();
-        expectEvent(stream, editorMatcher("onStartInput",
-                imeTestActivitySession.getActivity().mEditText.getPrivateImeOptions()), TIMEOUT);
 
         // Activity is no longer on the secondary display
         assertThat(mWmState.hasActivityInDisplay(newDisplay.mId, imeTestActivityName)).isFalse();
 
+        // Tap on the imeTestActivity task center instead of the display center because
+        // the activity might not be spanning the entire display
+        final ImeEventStream stream = mockImeSession.openEventStream();
+        final WindowManagerState.Task testActivityTask = mWmState
+                .getTaskByActivity(imeTestActivitySession.getActivity().getComponentName());
+        tapOnTaskCenter(testActivityTask);
+        expectEvent(stream, editorMatcher("onStartInput",
+                imeTestActivitySession.getActivity().mEditText.getPrivateImeOptions()), TIMEOUT);
+
         // Verify the activity shows soft input on the default display.
         showSoftInputAndAssertImeShownOnDisplay(DEFAULT_DISPLAY, imeTestActivitySession, stream);
     }
@@ -721,10 +733,21 @@
                 .setShowSystemDecorations(true)
                 .setDisplayImePolicy(DISPLAY_IME_POLICY_LOCAL)
                 .setSimulateDisplay(true)
+                .setResizeDisplay(false)
                 .createDisplays(2);
         final DisplayContent firstDisplay = newDisplays.get(0);
         final DisplayContent secondDisplay = newDisplays.get(1);
 
+        // Skip if the test environment somehow didn't create 2 displays with identical size.
+        assumeTrue("Skip the test if the size of the created displays aren't identical",
+                firstDisplay.getDisplayRect().equals(secondDisplay.getDisplayRect()));
+
+        // Make firstDisplay the top focus display.
+        tapOnDisplayCenter(firstDisplay.mId);
+
+        mWmState.waitForWithAmState(state -> state.getFocusedDisplayId() == firstDisplay.mId,
+                "First display must be top focused.");
+
         // Initialize IME test environment
         final MockImeSession mockImeSession = createManagedMockImeSession(this);
         final TestActivitySession<ImeTestActivity> imeTestActivitySession =
@@ -734,8 +757,6 @@
         // display to the firstDisplay.
         ImeEventStream configChangeVerifyStream = clearOnConfigurationChangedFromStream(stream);
 
-        // Make firstDisplay the top focus display.
-        tapOnDisplayCenter(firstDisplay.mId);
         imeTestActivitySession.launchTestActivityOnDisplaySync(ImeTestActivity.class,
                 firstDisplay.mId);
         imeTestActivitySession.runOnMainSyncAndWait(
@@ -745,63 +766,73 @@
                 editorMatcher("onStartInput",
                         imeTestActivitySession.getActivity().mEditText.getPrivateImeOptions()),
                 event -> "showSoftInput".equals(event.getEventName()));
-        // Launch Ime must not lead to screen size changes.
-        waitAndAssertImeNoScreenSizeChanged(configChangeVerifyStream);
+        try {
+            // Launch Ime must not lead to screen size changes.
+            waitAndAssertImeNoScreenSizeChanged(configChangeVerifyStream);
 
-        final Rect currentBoundsOnFirstDisplay = expectCommand(stream,
-                mockImeSession.callGetCurrentWindowMetricsBounds(), TIMEOUT)
-                .getReturnParcelableValue();
+            final Rect currentBoundsOnFirstDisplay = expectCommand(stream,
+                    mockImeSession.callGetCurrentWindowMetricsBounds(), TIMEOUT)
+                    .getReturnParcelableValue();
 
-        // Clear onConfigurationChanged events before IME moves to the secondary display to prevent
-        // flaky because IME may receive configuration updates which we don't care about.
-        // An example is CONFIG_KEYBOARD_HIDDEN.
-        configChangeVerifyStream = clearOnConfigurationChangedFromStream(stream);
+            // Clear onConfigurationChanged events before IME moves to the secondary display to
+            // prevent flaky because IME may receive configuration updates which we don't care
+            // about. An example is CONFIG_KEYBOARD_HIDDEN.
+            configChangeVerifyStream = clearOnConfigurationChangedFromStream(stream);
 
-        // Tap secondDisplay to change it to the top focused display.
-        tapOnDisplayCenter(secondDisplay.mId);
+            // Tap secondDisplay to change it to the top focused display.
+            tapOnDisplayCenter(secondDisplay.mId);
 
-        // Move ImeTestActivity from firstDisplay to secondDisplay.
-        getLaunchActivityBuilder()
-                .setUseInstrumentation()
-                .setTargetActivity(imeTestActivitySession.getActivity().getComponentName())
-                .setIntentFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .allowMultipleInstances(false)
-                .setDisplayId(secondDisplay.mId).execute();
+            // Move ImeTestActivity from firstDisplay to secondDisplay.
+            getLaunchActivityBuilder()
+                    .setUseInstrumentation()
+                    .setTargetActivity(imeTestActivitySession.getActivity().getComponentName())
+                    .setIntentFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    .allowMultipleInstances(false)
+                    .setDisplayId(secondDisplay.mId).execute();
 
-        // Make sure ImeTestActivity is move from the firstDisplay to the secondDisplay
-        waitAndAssertTopResumedActivity(imeTestActivitySession.getActivity().getComponentName(),
-                secondDisplay.mId, "ImeTestActivity must be top-resumed on display#"
-                + secondDisplay.mId);
-        assertThat(mWmState.hasActivityInDisplay(firstDisplay.mId,
-                imeTestActivitySession.getActivity().getComponentName())).isFalse();
+            // Make sure ImeTestActivity is move from the firstDisplay to the secondDisplay
+            waitAndAssertTopResumedActivity(imeTestActivitySession.getActivity().getComponentName(),
+                    secondDisplay.mId, "ImeTestActivity must be top-resumed on display#"
+                            + secondDisplay.mId);
+            assertThat(mWmState.hasActivityInDisplay(firstDisplay.mId,
+                    imeTestActivitySession.getActivity().getComponentName())).isFalse();
 
-        // Show soft input again to trigger IME movement.
-        imeTestActivitySession.runOnMainSyncAndWait(
-                imeTestActivitySession.getActivity()::showSoftInput);
+            // Show soft input again to trigger IME movement.
+            imeTestActivitySession.runOnMainSyncAndWait(
+                    imeTestActivitySession.getActivity()::showSoftInput);
 
-        waitOrderedImeEventsThenAssertImeShown(stream, secondDisplay.mId,
-                editorMatcher("onStartInput",
-                        imeTestActivitySession.getActivity().mEditText.getPrivateImeOptions()),
-                event -> "showSoftInput".equals(event.getEventName()));
-        // Moving IME to the display with the same display metrics must not lead to
-        // screen size changes.
-        waitAndAssertImeNoScreenSizeChanged(configChangeVerifyStream);
+            waitOrderedImeEventsThenAssertImeShown(stream, secondDisplay.mId,
+                    editorMatcher("onStartInput",
+                            imeTestActivitySession.getActivity().mEditText.getPrivateImeOptions()),
+                    event -> "showSoftInput".equals(event.getEventName()));
 
-        final Rect currentBoundsOnSecondDisplay = expectCommand(stream,
-                mockImeSession.callGetCurrentWindowMetricsBounds(), TIMEOUT)
-                .getReturnParcelableValue();
+            // Moving IME to the display with the same display metrics must not lead to
+            // screen size changes.
+            waitAndAssertImeNoScreenSizeChanged(configChangeVerifyStream);
 
-        assertWithMessage("The current WindowMetrics bounds of IME must not be changed.")
-                .that(currentBoundsOnFirstDisplay).isEqualTo(currentBoundsOnSecondDisplay);
+            final Rect currentBoundsOnSecondDisplay = expectCommand(stream,
+                    mockImeSession.callGetCurrentWindowMetricsBounds(), TIMEOUT)
+                    .getReturnParcelableValue();
+
+            assertWithMessage("The current WindowMetrics bounds of IME must not be changed.")
+                    .that(currentBoundsOnFirstDisplay).isEqualTo(currentBoundsOnSecondDisplay);
+        } catch (AssertionError e) {
+            mWmState.computeState();
+            final Rect displayRect1 = mWmState.getDisplay(firstDisplay.mId).getDisplayRect();
+            final Rect displayRect2 = mWmState.getDisplay(secondDisplay.mId).getDisplayRect();
+            assumeTrue("Skip test since the size of one or both displays happens unexpected change",
+                    displayRect1.equals(displayRect2));
+            throw e;
+        }
     }
 
     public static class ImeTestActivity extends Activity {
-        ImeAwareEditText mEditText;
+        EditText mEditText;
 
         @Override
         protected void onCreate(Bundle icicle) {
             super.onCreate(icicle);
-            mEditText = new ImeAwareEditText(this);
+            mEditText = new EditText(this);
             // Set private IME option for editorMatcher to identify which TextView received
             // onStartInput event.
             resetPrivateImeOptionsIdentifier();
@@ -809,6 +840,9 @@
             layout.setOrientation(LinearLayout.VERTICAL);
             layout.addView(mEditText);
             mEditText.requestFocus();
+            // SOFT_INPUT_STATE_UNSPECIFIED may produced unexpected behavior for CTS. To make tests
+            // deterministic, using SOFT_INPUT_STATE_UNCHANGED instead.
+            setUnchangedSoftInputState();
             setContentView(layout);
         }
 
@@ -821,6 +855,15 @@
             mEditText.setPrivateImeOptions(
                     getClass().getName() + "/" + Long.toString(SystemClock.elapsedRealtimeNanos()));
         }
+
+        private void setUnchangedSoftInputState() {
+            final Window window = getWindow();
+            final int currentSoftInputMode = window.getAttributes().softInputMode;
+            final int newSoftInputMode =
+                    (currentSoftInputMode & ~WindowManager.LayoutParams.SOFT_INPUT_MASK_STATE)
+                            | SOFT_INPUT_STATE_UNCHANGED;
+            window.setSoftInputMode(newSoftInputMode);
+        }
     }
 
     public static class ImeTestActivity2 extends ImeTestActivity { }
@@ -876,15 +919,21 @@
 
     private void assertImeWindowAndDisplayConfiguration(
             WindowState imeWinState, DisplayContent display) {
+        // The IME window should inherit the configuration from the IME DisplayArea.
+        final WindowManagerState.DisplayArea imeContainerDisplayArea = display.getImeContainer();
         final Configuration configurationForIme = imeWinState.mMergedOverrideConfiguration;
-        final Configuration configurationForDisplay =  display.mMergedOverrideConfiguration;
+        final Configuration configurationForImeContainer =
+                imeContainerDisplayArea.mMergedOverrideConfiguration;
         final int displayDensityDpiForIme = configurationForIme.densityDpi;
-        final int displayDensityDpi = configurationForDisplay.densityDpi;
+        final int displayDensityDpiForImeContainer = configurationForImeContainer.densityDpi;
         final Rect displayBoundsForIme = configurationForIme.windowConfiguration.getBounds();
-        final Rect displayBounds = configurationForDisplay.windowConfiguration.getBounds();
+        final Rect displayBoundsForImeContainer =
+                configurationForImeContainer.windowConfiguration.getBounds();
 
-        assertEquals("Display density not the same", displayDensityDpi, displayDensityDpiForIme);
-        assertEquals("Display bounds not the same", displayBounds, displayBoundsForIme);
+        assertEquals("Display density not the same",
+                displayDensityDpiForImeContainer, displayDensityDpiForIme);
+        assertEquals("Display bounds not the same",
+                displayBoundsForImeContainer, displayBoundsForIme);
     }
 
     private void tapAndAssertEditorFocusedOnImeActivity(
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/MultiDisplayTestBase.java b/tests/framework/base/windowmanager/src/android/server/wm/MultiDisplayTestBase.java
index ae5284e..cf7fdaa 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/MultiDisplayTestBase.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/MultiDisplayTestBase.java
@@ -20,7 +20,6 @@
 import static android.content.pm.PackageManager.FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS;
 import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
 import static android.provider.Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS;
-import static android.server.wm.StateLogger.log;
 import static android.server.wm.UiDeviceUtils.pressSleepButton;
 import static android.server.wm.UiDeviceUtils.pressWakeupButton;
 import static android.server.wm.app.Components.VIRTUAL_DISPLAY_ACTIVITY;
@@ -50,7 +49,6 @@
 import static org.hamcrest.Matchers.hasSize;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
-import static org.junit.Assert.assertTrue;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -86,8 +84,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Base class for ActivityManager display tests.
@@ -175,108 +171,6 @@
         return result;
     }
 
-    public static class ReportedDisplayMetrics {
-        private static final String WM_SIZE = "wm size";
-        private static final String WM_DENSITY = "wm density";
-        private static final Pattern PHYSICAL_SIZE =
-                Pattern.compile("Physical size: (\\d+)x(\\d+)");
-        private static final Pattern OVERRIDE_SIZE =
-                Pattern.compile("Override size: (\\d+)x(\\d+)");
-        private static final Pattern PHYSICAL_DENSITY =
-                Pattern.compile("Physical density: (\\d+)");
-        private static final Pattern OVERRIDE_DENSITY =
-                Pattern.compile("Override density: (\\d+)");
-
-        /** The size of the physical display. */
-        @NonNull
-        final Size physicalSize;
-        /** The density of the physical display. */
-        final int physicalDensity;
-
-        /** The pre-existing size override applied to a logical display. */
-        @Nullable
-        final Size overrideSize;
-        /** The pre-existing density override applied to a logical display. */
-        @Nullable
-        final Integer overrideDensity;
-
-        final int mDisplayId;
-
-        /** Get physical and override display metrics from WM for specified display. */
-        public static ReportedDisplayMetrics getDisplayMetrics(int displayId) {
-            return new ReportedDisplayMetrics(executeShellCommand(WM_SIZE + " -d " + displayId)
-                            + executeShellCommand(WM_DENSITY + " -d " + displayId), displayId);
-        }
-
-        void setDisplayMetrics(final Size size, final int density) {
-            setSize(size);
-            setDensity(density);
-        }
-
-        void restoreDisplayMetrics() {
-            if (overrideSize != null) {
-                setSize(overrideSize);
-            } else {
-                executeShellCommand(WM_SIZE + " reset -d " + mDisplayId);
-            }
-            if (overrideDensity != null) {
-                setDensity(overrideDensity);
-            } else {
-                executeShellCommand(WM_DENSITY + " reset -d " + mDisplayId);
-            }
-        }
-
-        private void setSize(final Size size) {
-            executeShellCommand(
-                    WM_SIZE + " " + size.getWidth() + "x" + size.getHeight() + " -d " + mDisplayId);
-        }
-
-        private void setDensity(final int density) {
-            executeShellCommand(WM_DENSITY + " " + density + " -d " + mDisplayId);
-        }
-
-        /** Get display size that WM operates with. */
-        public Size getSize() {
-            return overrideSize != null ? overrideSize : physicalSize;
-        }
-
-        /** Get density that WM operates with. */
-        int getDensity() {
-            return overrideDensity != null ? overrideDensity : physicalDensity;
-        }
-
-        private ReportedDisplayMetrics(final String lines, int displayId) {
-            mDisplayId = displayId;
-            Matcher matcher = PHYSICAL_SIZE.matcher(lines);
-            assertTrue("Physical display size must be reported", matcher.find());
-            log(matcher.group());
-            physicalSize = new Size(
-                    Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)));
-
-            matcher = PHYSICAL_DENSITY.matcher(lines);
-            assertTrue("Physical display density must be reported", matcher.find());
-            log(matcher.group());
-            physicalDensity = Integer.parseInt(matcher.group(1));
-
-            matcher = OVERRIDE_SIZE.matcher(lines);
-            if (matcher.find()) {
-                log(matcher.group());
-                overrideSize = new Size(
-                        Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)));
-            } else {
-                overrideSize = null;
-            }
-
-            matcher = OVERRIDE_DENSITY.matcher(lines);
-            if (matcher.find()) {
-                log(matcher.group());
-                overrideDensity = Integer.parseInt(matcher.group(1));
-            } else {
-                overrideDensity = null;
-            }
-        }
-    }
-
     public static class DisplayMetricsSession implements AutoCloseable {
         private final ReportedDisplayMetrics mInitialDisplayMetrics;
         private final int mDisplayId;
@@ -350,10 +244,28 @@
         return mObjectTracker.manage(new DisplayMetricsSession(displayId));
     }
 
+    public static class LetterboxAspectRatioSession extends IgnoreOrientationRequestSession {
+        private static final String WM_SET_LETTERBOX_STYLE_ASPECT_RATIO =
+                "wm set-letterbox-style --aspectRatio ";
+        private static final String WM_RESET_LETTERBOX_STYLE_ASPECT_RATIO =
+                "wm reset-letterbox-style aspectRatio";
+
+        LetterboxAspectRatioSession(int displayId, float aspectRatio) {
+            super(displayId, true);
+            executeShellCommand(WM_SET_LETTERBOX_STYLE_ASPECT_RATIO + aspectRatio);
+        }
+
+        @Override
+        public void close() {
+            super.close();
+            executeShellCommand(WM_RESET_LETTERBOX_STYLE_ASPECT_RATIO);
+        }
+    }
+
     /** @see ObjectTracker#manage(AutoCloseable) */
-    protected IgnoreOrientationRequestSession createManagedIgnoreOrientationRequestSession(
-            int displayId, boolean value) {
-        return mObjectTracker.manage(new IgnoreOrientationRequestSession(displayId, value));
+    protected LetterboxAspectRatioSession createManagedLetterboxAspectRatioSession(int displayId,
+            float aspectRatio) {
+        return mObjectTracker.manage(new LetterboxAspectRatioSession(displayId, aspectRatio));
     }
 
     void waitForDisplayGone(Predicate<DisplayContent> displayPredicate) {
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
index 74a6e3a9..45a8699 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/PinnedStackTests.java
@@ -23,6 +23,8 @@
 import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
 import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
 import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
 import static android.server.wm.CliIntentExtra.extraBool;
 import static android.server.wm.CliIntentExtra.extraString;
 import static android.server.wm.ComponentNameUtils.getActivityName;
@@ -35,6 +37,8 @@
 import static android.server.wm.app.Components.ALWAYS_FOCUSABLE_PIP_ACTIVITY;
 import static android.server.wm.app.Components.LAUNCH_ENTER_PIP_ACTIVITY;
 import static android.server.wm.app.Components.LAUNCH_INTO_PINNED_STACK_PIP_ACTIVITY;
+import static android.server.wm.app.Components.LAUNCH_INTO_PIP_CONTAINER_ACTIVITY;
+import static android.server.wm.app.Components.LAUNCH_INTO_PIP_HOST_ACTIVITY;
 import static android.server.wm.app.Components.LAUNCH_PIP_ON_PIP_ACTIVITY;
 import static android.server.wm.app.Components.NON_RESIZEABLE_ACTIVITY;
 import static android.server.wm.app.Components.PIP_ACTIVITY;
@@ -45,16 +49,22 @@
 import static android.server.wm.app.Components.PIP_ON_STOP_ACTIVITY;
 import static android.server.wm.app.Components.PipActivity.ACTION_ENTER_PIP;
 import static android.server.wm.app.Components.PipActivity.ACTION_FINISH;
+import static android.server.wm.app.Components.PipActivity.ACTION_FINISH_LAUNCH_INTO_PIP_HOST;
+import static android.server.wm.app.Components.PipActivity.ACTION_LAUNCH_TRANSLUCENT_ACTIVITY;
 import static android.server.wm.app.Components.PipActivity.ACTION_MOVE_TO_BACK;
 import static android.server.wm.app.Components.PipActivity.ACTION_ON_PIP_REQUESTED;
+import static android.server.wm.app.Components.PipActivity.ACTION_START_LAUNCH_INTO_PIP_CONTAINER;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ALLOW_AUTO_PIP;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ASSERT_NO_ON_STOP_BEFORE_PIP;
+import static android.server.wm.app.Components.PipActivity.EXTRA_CLOSE_ACTION;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ENTER_PIP;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ENTER_PIP_ON_PAUSE;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ENTER_PIP_ON_PIP_REQUESTED;
 import static android.server.wm.app.Components.PipActivity.EXTRA_ENTER_PIP_ON_USER_LEAVE_HINT;
+import static android.server.wm.app.Components.PipActivity.EXTRA_EXPANDED_PIP_ASPECT_RATIO_DENOMINATOR;
+import static android.server.wm.app.Components.PipActivity.EXTRA_EXPANDED_PIP_ASPECT_RATIO_NUMERATOR;
 import static android.server.wm.app.Components.PipActivity.EXTRA_FINISH_SELF_ON_RESUME;
 import static android.server.wm.app.Components.PipActivity.EXTRA_IS_SEAMLESS_RESIZE_ENABLED;
 import static android.server.wm.app.Components.PipActivity.EXTRA_NUMBER_OF_CUSTOM_ACTIONS;
@@ -63,8 +73,10 @@
 import static android.server.wm.app.Components.PipActivity.EXTRA_SET_ASPECT_RATIO_DENOMINATOR;
 import static android.server.wm.app.Components.PipActivity.EXTRA_SET_ASPECT_RATIO_NUMERATOR;
 import static android.server.wm.app.Components.PipActivity.EXTRA_START_ACTIVITY;
+import static android.server.wm.app.Components.PipActivity.EXTRA_SUBTITLE;
 import static android.server.wm.app.Components.PipActivity.EXTRA_TAP_TO_FINISH;
-import static android.server.wm.app.Components.PipActivity.PIP_CALLBACK_RESULT_KEY;
+import static android.server.wm.app.Components.PipActivity.EXTRA_TITLE;
+import static android.server.wm.app.Components.PipActivity.UI_STATE_STASHED_RESULT;
 import static android.server.wm.app.Components.RESUME_WHILE_PAUSING_ACTIVITY;
 import static android.server.wm.app.Components.TEST_ACTIVITY;
 import static android.server.wm.app.Components.TEST_ACTIVITY_WITH_SAME_AFFINITY;
@@ -91,11 +103,13 @@
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
+import android.app.Activity;
 import android.app.ActivityTaskManager;
 import android.app.PictureInPictureParams;
 import android.app.TaskInfo;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -105,8 +119,8 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.os.RemoteCallback;
-import android.platform.test.annotations.Presubmit;
 import android.platform.test.annotations.AsbSecurityTest;
+import android.platform.test.annotations.Presubmit;
 import android.provider.Settings;
 import android.server.wm.CommandSession.ActivityCallback;
 import android.server.wm.CommandSession.SizeInfo;
@@ -126,7 +140,6 @@
 import org.junit.Test;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -148,11 +161,6 @@
     private static final int ROTATION_180 = 2;
     private static final int ROTATION_270 = 3;
 
-    // Corresponds to ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE
-    private static final int ORIENTATION_LANDSCAPE = 0;
-    // Corresponds to ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
-    private static final int ORIENTATION_PORTRAIT = 1;
-
     private static final float FLOAT_COMPARE_EPSILON = 0.005f;
 
     // Corresponds to com.android.internal.R.dimen.config_pictureInPictureMinAspectRatio
@@ -249,10 +257,10 @@
     public void testEnterPipToOtherOrientation() {
         // Launch a portrait only app on the fullscreen stack
         launchActivity(TEST_ACTIVITY,
-                extraString(EXTRA_FIXED_ORIENTATION, String.valueOf(ORIENTATION_PORTRAIT)));
+                extraString(EXTRA_FIXED_ORIENTATION, String.valueOf(SCREEN_ORIENTATION_PORTRAIT)));
         // Launch the PiP activity fixed as landscape
         launchActivity(PIP_ACTIVITY,
-                extraString(EXTRA_PIP_ORIENTATION, String.valueOf(ORIENTATION_LANDSCAPE)));
+                extraString(EXTRA_PIP_ORIENTATION, String.valueOf(SCREEN_ORIENTATION_LANDSCAPE)));
         // Enter PiP, and assert that the PiP is within bounds now that the device is back in
         // portrait
         mBroadcastActionTrigger.doAction(ACTION_ENTER_PIP);
@@ -294,7 +302,7 @@
         waitForEnterPipAnimationComplete(PIP_ACTIVITY_WITH_TINY_MINIMAL_SIZE);
         assertPinnedStackExists();
 
-        final WindowManagerState.WindowState windowState = getWindowState(
+        final WindowManagerState.WindowState windowState = mWmState.getWindowState(
                 PIP_ACTIVITY_WITH_TINY_MINIMAL_SIZE);
         final WindowManagerState.DisplayContent display = mWmState.getDisplay(
                 windowState.getDisplayId());
@@ -319,6 +327,92 @@
         testEnterPipAspectRatio(MAX_ASPECT_RATIO_NUMERATOR, MAX_ASPECT_RATIO_DENOMINATOR);
     }
 
+    @Test
+    public void testEnterExpandedPipAspectRatio() {
+        assumeTrue(supportsExpandedPip());
+        launchActivity(PIP_ACTIVITY,
+                extraString(EXTRA_ENTER_PIP, "true"),
+                extraString(EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(2)),
+                extraString(EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(1)),
+                extraString(EXTRA_EXPANDED_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(1)),
+                extraString(EXTRA_EXPANDED_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(4)));
+        // Wait for animation complete since we are comparing aspect ratio
+        waitForEnterPipAnimationComplete(PIP_ACTIVITY);
+        assertPinnedStackExists();
+        // Assert that we have entered PIP and that the aspect ratio is correct
+        final Rect bounds = getPinnedStackBounds();
+        assertFloatEquals((float) bounds.width() / bounds.height(), (float) 1.0f / 4.0f);
+    }
+
+    @Test
+    public void testEnterExpandedPipAspectRatioMaxHeight() {
+        assumeTrue(supportsExpandedPip());
+        launchActivity(PIP_ACTIVITY,
+                extraString(EXTRA_ENTER_PIP, "true"),
+                extraString(EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(2)),
+                extraString(EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(1)),
+                extraString(EXTRA_EXPANDED_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(1)),
+                extraString(EXTRA_EXPANDED_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(1000)));
+        // Wait for animation complete since we are comparing aspect ratio
+        waitForEnterPipAnimationComplete(PIP_ACTIVITY);
+        assertPinnedStackExists();
+        // Assert that we have entered PIP and that the aspect ratio is correct
+        final Rect bounds = getPinnedStackBounds();
+        final int displayHeight = mWmState.getDisplay(DEFAULT_DISPLAY).getDisplayRect().height();
+        assertTrue(bounds.height() <= displayHeight);
+    }
+
+    @Test
+    public void testEnterExpandedPipAspectRatioMaxWidth() {
+        assumeTrue(supportsExpandedPip());
+        launchActivity(PIP_ACTIVITY,
+                extraString(EXTRA_ENTER_PIP, "true"),
+                extraString(EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(2)),
+                extraString(EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(1)),
+                extraString(EXTRA_EXPANDED_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(1000)),
+                extraString(EXTRA_EXPANDED_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(1)));
+        // Wait for animation complete since we are comparing aspect ratio
+        waitForEnterPipAnimationComplete(PIP_ACTIVITY);
+        assertPinnedStackExists();
+        // Assert that we have entered PIP and that the aspect ratio is correct
+        final Rect bounds = getPinnedStackBounds();
+        final int displayWidth = mWmState.getDisplay(DEFAULT_DISPLAY).getDisplayRect().width();
+        assertTrue(bounds.width() <= displayWidth);
+    }
+
+    @Test
+    public void testEnterExpandedPipWithNormalAspectRatio() {
+        assumeTrue(supportsExpandedPip());
+        launchActivity(PIP_ACTIVITY,
+                extraString(EXTRA_ENTER_PIP, "true"),
+                extraString(EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(2)),
+                extraString(EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(1)),
+                extraString(EXTRA_EXPANDED_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(1)),
+                extraString(EXTRA_EXPANDED_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(2)));
+        assertPinnedStackDoesNotExist();
+
+        launchActivity(PIP_ACTIVITY,
+                extraString(EXTRA_ENTER_PIP, "true"),
+                extraString(EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(2)),
+                extraString(EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(1)),
+                extraString(EXTRA_EXPANDED_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(2)),
+                extraString(EXTRA_EXPANDED_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(1)));
+        assertPinnedStackDoesNotExist();
+    }
+
+    @Test
+    public void testChangeAspectRationWhenInPipMode() {
+        // Enter PiP mode with a 2:1 aspect ratio
+        testEnterPipAspectRatio(2, 1);
+
+        // Change the aspect ratio to 1:2
+        final int newNumerator = 1;
+        final int newDenominator = 2;
+        mBroadcastActionTrigger.changeAspectRatio(newNumerator, newDenominator);
+
+        waitForValidAspectRatio(newNumerator, newDenominator);
+    }
+
     private void testEnterPipAspectRatio(int num, int denom) {
         // Launch a test activity so that we're not over home
         launchActivity(TEST_ACTIVITY);
@@ -422,6 +516,52 @@
     }
 
     @Test
+    public void testShouldDockBigOverlaysWithExpandedPip() {
+        testShouldDockBigOverlaysWithExpandedPip(true);
+    }
+
+    @Test
+    public void testShouldNotDockBigOverlaysWithExpandedPip() {
+        testShouldDockBigOverlaysWithExpandedPip(false);
+    }
+
+    private void testShouldDockBigOverlaysWithExpandedPip(boolean shouldDock) {
+        assumeTrue(supportsExpandedPip());
+        TestActivitySession<TestActivity> testSession = createManagedTestActivitySession();
+        final Intent intent = new Intent(mContext, TestActivity.class);
+        testSession.launchTestActivityOnDisplaySync(null, intent, DEFAULT_DISPLAY);
+        final TestActivity activity = testSession.getActivity();
+        mWmState.assertResumedActivity("Activity must be resumed", activity.getComponentName());
+
+        launchActivity(PIP_ACTIVITY,
+                extraString(EXTRA_ENTER_PIP, "true"),
+                extraString(EXTRA_ENTER_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(2)),
+                extraString(EXTRA_ENTER_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(1)),
+                extraString(EXTRA_EXPANDED_PIP_ASPECT_RATIO_NUMERATOR, Integer.toString(1)),
+                extraString(EXTRA_EXPANDED_PIP_ASPECT_RATIO_DENOMINATOR, Integer.toString(4)));
+        waitForEnterPipAnimationComplete(PIP_ACTIVITY);
+        assertPinnedStackExists();
+
+        testSession.runOnMainSyncAndWait(() -> activity.setShouldDockBigOverlays(shouldDock));
+
+        mWmState.assertResumedActivity("Activity must be resumed", activity.getComponentName());
+        assertPinnedStackExists();
+        runWithShellPermission(() -> {
+            final Task task = mWmState.getTaskByActivity(activity.getComponentName());
+            final TaskInfo info = mTaskOrganizer.getTaskInfo(task.getTaskId());
+
+            assertEquals(shouldDock, info.shouldDockBigOverlays());
+        });
+
+        final boolean[] actual = new boolean[] {!shouldDock};
+        testSession.runOnMainSyncAndWait(() -> {
+            actual[0] = activity.shouldDockBigOverlays();
+        });
+
+        assertEquals(shouldDock, actual[0]);
+    }
+
+    @Test
     public void testDisallowPipLaunchFromStoppedActivity() {
         // Launch the bottom pip activity which will launch a new activity on top and attempt to
         // enter pip when it is stopped
@@ -435,6 +575,37 @@
     }
 
     @Test
+    public void testLaunchIntoPip() {
+        // Launch a Host activity for launch-into-pip
+        launchActivity(LAUNCH_INTO_PIP_HOST_ACTIVITY);
+
+        // Send broadcast to Host activity to start a launch-into-pip container activity
+        mBroadcastActionTrigger.doAction(ACTION_START_LAUNCH_INTO_PIP_CONTAINER);
+
+        // Verify the launch-into-pip container activity enters PiP
+        waitForEnterPipAnimationComplete(LAUNCH_INTO_PIP_CONTAINER_ACTIVITY);
+        assertPinnedStackExists();
+    }
+
+    @Test
+    public void testRemoveLaunchIntoPipHostActivity() {
+        // Launch a Host activity for launch-into-pip
+        launchActivity(LAUNCH_INTO_PIP_HOST_ACTIVITY);
+
+        // Send broadcast to Host activity to start a launch-into-pip container activity
+        mBroadcastActionTrigger.doAction(ACTION_START_LAUNCH_INTO_PIP_CONTAINER);
+
+        // Remove the Host activity / task by finishing the host activity
+        waitForEnterPipAnimationComplete(LAUNCH_INTO_PIP_CONTAINER_ACTIVITY);
+        assertPinnedStackExists();
+        mBroadcastActionTrigger.doAction(ACTION_FINISH_LAUNCH_INTO_PIP_HOST);
+
+        // Verify the launch-into-pip container activity finishes
+        waitForPinnedStackRemoved();
+        assertPinnedStackDoesNotExist();
+    }
+
+    @Test
     public void testAutoEnterPictureInPicture() {
         // Launch a test activity so that we're not over home
         launchActivity(TEST_ACTIVITY);
@@ -453,7 +624,7 @@
     public void testAutoEnterPictureInPictureOnUserLeaveHintWhenPipRequestedNotOverridden()
             {
         // Launch a test activity so that we're not over home
-        launchActivity(TEST_ACTIVITY);
+        launchActivity(TEST_ACTIVITY, WINDOWING_MODE_FULLSCREEN);
 
         // Launch the PIP activity that enters PIP on user leave hint, not on PIP requested
         launchActivity(PIP_ACTIVITY, extraString(EXTRA_ENTER_PIP_ON_USER_LEAVE_HINT, "true"));
@@ -1083,22 +1254,21 @@
         assumeTrue("Skipping test: no orientation request support", supportsOrientationRequest());
         // Launch the PiP activity fixed as portrait, and enter picture-in-picture
         launchActivity(PIP_ACTIVITY, WINDOWING_MODE_FULLSCREEN,
-                extraString(EXTRA_PIP_ORIENTATION, String.valueOf(ORIENTATION_PORTRAIT)),
+                extraString(EXTRA_PIP_ORIENTATION, String.valueOf(SCREEN_ORIENTATION_PORTRAIT)),
                 extraString(EXTRA_ENTER_PIP, "true"));
         waitForEnterPip(PIP_ACTIVITY);
         assertPinnedStackExists();
 
         // Request that the orientation is set to landscape
-        mBroadcastActionTrigger.requestOrientationForPip(ORIENTATION_LANDSCAPE);
+        mBroadcastActionTrigger.requestOrientationForPip(SCREEN_ORIENTATION_LANDSCAPE);
 
         // Launch the activity back into fullscreen and ensure that it is now in landscape
         launchActivity(PIP_ACTIVITY);
         waitForExitPipToFullscreen(PIP_ACTIVITY);
         assertPinnedStackDoesNotExist();
-        mWmState.waitForActivityOrientation(PIP_ACTIVITY, ORIENTATION_LANDSCAPE);
-
-        final Task pipActivityTask = mWmState.getTaskByActivity(PIP_ACTIVITY);
-        assertEquals(ORIENTATION_LANDSCAPE, pipActivityTask.mOverrideConfiguration.orientation);
+        assertTrue("The PiP activity in fullscreen must be landscape",
+                mWmState.waitForActivityOrientation(
+                        PIP_ACTIVITY, Configuration.ORIENTATION_LANDSCAPE));
     }
 
     @Test
@@ -1252,7 +1422,7 @@
     @Test
     public void testDisplayMetricsPinUnpin() {
         separateTestJournal();
-        launchActivity(TEST_ACTIVITY);
+        launchActivity(TEST_ACTIVITY, WINDOWING_MODE_FULLSCREEN);
         final int defaultWindowingMode = mWmState
                 .getTaskByActivity(TEST_ACTIVITY).getWindowingMode();
         final SizeInfo initialSizes = getLastReportedSizesForActivity(TEST_ACTIVITY);
@@ -1286,33 +1456,45 @@
     @Test
     public void testAutoPipAllowedBypassesExplicitEnterPip() {
         // Launch a test activity so that we're not over home.
-        launchActivity(TEST_ACTIVITY);
+        launchActivity(TEST_ACTIVITY, WINDOWING_MODE_FULLSCREEN);
 
         // Launch the PIP activity and set its pip params to allow auto-pip.
         launchActivity(PIP_ACTIVITY, extraString(EXTRA_ALLOW_AUTO_PIP, "true"));
         assertPinnedStackDoesNotExist();
 
         // Launch a new activity and ensure that there is a pinned stack.
-        launchActivity(RESUME_WHILE_PAUSING_ACTIVITY);
+        launchActivity(RESUME_WHILE_PAUSING_ACTIVITY, WINDOWING_MODE_FULLSCREEN);
         waitForEnterPip(PIP_ACTIVITY);
         assertPinnedStackExists();
         waitAndAssertActivityState(PIP_ACTIVITY, STATE_PAUSED, "activity must be paused");
     }
 
     @Test
-    public void testAutoPipOnLaunchingAnotherActivity() {
+    public void testAutoPipOnLaunchingRegularActivity() {
         // Launch the PIP activity and set its pip params to allow auto-pip.
         launchActivity(PIP_ACTIVITY, extraString(EXTRA_ALLOW_AUTO_PIP, "true"));
         assertPinnedStackDoesNotExist();
 
-        // Launch another and ensure that there is a pinned stack.
-        launchActivity(TEST_ACTIVITY);
+        // Launch a regular activity and ensure that there is a pinned stack.
+        launchActivity(TEST_ACTIVITY, WINDOWING_MODE_FULLSCREEN);
         waitForEnterPip(PIP_ACTIVITY);
         assertPinnedStackExists();
         waitAndAssertActivityState(PIP_ACTIVITY, STATE_PAUSED, "activity must be paused");
     }
 
     @Test
+    public void testAutoPipOnLaunchingTranslucentActivity() {
+        // Launch the PIP activity and set its pip params to allow auto-pip.
+        launchActivity(PIP_ACTIVITY, extraString(EXTRA_ALLOW_AUTO_PIP, "true"));
+        assertPinnedStackDoesNotExist();
+
+        // Launch a translucent activity from PipActivity itself and
+        // ensure that there is no pinned stack.
+        mBroadcastActionTrigger.doAction(ACTION_LAUNCH_TRANSLUCENT_ACTIVITY);
+        assertPinnedStackDoesNotExist();
+    }
+
+    @Test
     public void testMaxNumberOfActions() {
         final int maxNumberActions = ActivityTaskManager.getMaxNumPictureInPictureActions(mContext);
         assertThat(maxNumberActions, greaterThanOrEqualTo(3));
@@ -1341,6 +1523,20 @@
     }
 
     @Test
+    public void testCloseActionIsSet() {
+        launchActivity(PIP_ACTIVITY, extraBool(EXTRA_CLOSE_ACTION, true));
+        enterPipAndAssertPinnedTaskExists(PIP_ACTIVITY);
+
+        runWithShellPermission(() -> {
+            final Task task = mWmState.getTaskByActivity(PIP_ACTIVITY);
+            final TaskInfo info = mTaskOrganizer.getTaskInfo(task.getTaskId());
+            final PictureInPictureParams params = info.getPictureInPictureParams();
+
+            assertNotNull(params.getCloseAction());
+        });
+    }
+
+    @Test
     public void testIsSeamlessResizeEnabledDefaultToTrue() {
         // Launch the PIP activity with some random param without setting isSeamlessResizeEnabled
         // so the PictureInPictureParams acquired from TaskInfo is not null
@@ -1363,20 +1559,20 @@
     }
 
     @Test
-    public void testPictureInPictureStateChangeCallback() throws Exception {
+    public void testPictureInPictureUiStateChangedCallback() throws Exception {
         launchActivity(PIP_ACTIVITY);
         enterPipAndAssertPinnedTaskExists(PIP_ACTIVITY);
         waitForEnterPip(PIP_ACTIVITY);
 
         final CompletableFuture<Boolean> callbackReturn = new CompletableFuture<>();
         RemoteCallback cb = new RemoteCallback((Bundle result) ->
-                callbackReturn.complete(result.getBoolean(PIP_CALLBACK_RESULT_KEY)));
+                callbackReturn.complete(result.getBoolean(UI_STATE_STASHED_RESULT)));
         mBroadcastActionTrigger.sendPipStateUpdate(cb, true);
         Truth.assertThat(callbackReturn.get(5000, TimeUnit.MILLISECONDS)).isEqualTo(true);
 
         final CompletableFuture<Boolean> callbackReturnNotStashed = new CompletableFuture<>();
         RemoteCallback cbStashed = new RemoteCallback((Bundle result) ->
-                callbackReturnNotStashed.complete(result.getBoolean(PIP_CALLBACK_RESULT_KEY)));
+                callbackReturnNotStashed.complete(result.getBoolean(UI_STATE_STASHED_RESULT)));
         mBroadcastActionTrigger.sendPipStateUpdate(cbStashed, false);
         Truth.assertThat(callbackReturnNotStashed.get(5000, TimeUnit.MILLISECONDS))
                 .isEqualTo(false);
@@ -1392,6 +1588,40 @@
         });
     }
 
+    @Test
+    public void testTitleIsSet() {
+        // Launch the PIP activity with given title
+        String title = "PipTitle";
+        launchActivity(PIP_ACTIVITY, extraString(EXTRA_TITLE, title));
+        enterPipAndAssertPinnedTaskExists(PIP_ACTIVITY);
+
+        // Assert the title was set.
+        runWithShellPermission(() -> {
+            final Task task = mWmState.getTaskByActivity(PIP_ACTIVITY);
+            final TaskInfo info = mTaskOrganizer.getTaskInfo(task.getTaskId());
+            final PictureInPictureParams params = info.getPictureInPictureParams();
+
+            assertEquals(title, params.getTitle().toString());
+        });
+    }
+
+    @Test
+    public void testSubtitleIsSet() {
+        // Launch the PIP activity with given subtitle
+        String subtitle = "PipSubtitle";
+        launchActivity(PIP_ACTIVITY, extraString(EXTRA_SUBTITLE, subtitle));
+        enterPipAndAssertPinnedTaskExists(PIP_ACTIVITY);
+
+        // Assert the subtitle was set.
+        runWithShellPermission(() -> {
+            final Task task = mWmState.getTaskByActivity(PIP_ACTIVITY);
+            final TaskInfo info = mTaskOrganizer.getTaskInfo(task.getTaskId());
+            final PictureInPictureParams params = info.getPictureInPictureParams();
+
+            assertEquals(subtitle, params.getSubtitle().toString());
+        });
+    }
+
     private void assertNumberOfActions(ComponentName componentName, int numberOfActions) {
         runWithShellPermission(() -> {
             final Task task = mWmState.getTaskByActivity(componentName);
@@ -1441,7 +1671,7 @@
      * Asserts that the pinned stack bounds is contained in the display bounds.
      */
     private void assertPinnedStackActivityIsInDisplayBounds(ComponentName activityName) {
-        final WindowManagerState.WindowState windowState = getWindowState(activityName);
+        final WindowManagerState.WindowState windowState = mWmState.getWindowState(activityName);
         final WindowManagerState.DisplayContent display = mWmState.getDisplay(
                 windowState.getDisplayId());
         final Rect displayRect = display.getDisplayRect();
@@ -1541,6 +1771,9 @@
             return activity.getWindowingMode() == WINDOWING_MODE_PINNED
                     && activity.getState().equals(STATE_PAUSED);
         }, "checking activity windowing mode");
+        if (ENABLE_SHELL_TRANSITIONS) {
+            mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
+        }
     }
 
     /**
@@ -1593,17 +1826,6 @@
     }
 
     /**
-     * @return the window state for the given {@param activityName}'s window.
-     */
-    private WindowManagerState.WindowState getWindowState(ComponentName activityName) {
-        String windowName = getWindowName(activityName);
-        mWmState.computeState(activityName);
-        final List<WindowManagerState.WindowState> tempWindowList =
-                mWmState.getMatchingVisibleWindowState(windowName);
-        return tempWindowList.get(0);
-    }
-
-    /**
      * @return the current pinned stack.
      */
     private Task getPinnedStack() {
@@ -1727,4 +1949,6 @@
                     WINDOWING_MODE_PINNED, ACTIVITY_TYPE_STANDARD);
         }
     }
+
+    public static class TestActivity extends Activity { }
 }
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/PrivacyIndicatorBoundsTests.java b/tests/framework/base/windowmanager/src/android/server/wm/PrivacyIndicatorBoundsTests.java
index 49d2dba..c39aaa2 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/PrivacyIndicatorBoundsTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/PrivacyIndicatorBoundsTests.java
@@ -16,12 +16,13 @@
 
 package android.server.wm;
 
+import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
+import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
-import static android.content.pm.PackageManager.FEATURE_AUTOMOTIVE;
 import static android.server.wm.RoundedCornerTests.TestActivity.EXTRA_ORIENTATION;
 import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
 import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
@@ -29,14 +30,11 @@
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeFalse;
 
 import android.app.Activity;
-import android.app.AppOpsManager;
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
 import android.os.Bundle;
@@ -101,13 +99,24 @@
         final View childWindowRoot = activity.getChildWindowRoot();
         PollingCheck.waitFor(TIMEOUT_MS, () -> childWindowRoot.getWidth() > 0);
         PollingCheck.waitFor(TIMEOUT_MS, () -> activity.getDispatchedInsets() != null);
+        mWmState.waitForValidState(mTestActivity.getActivity().getComponentName());
         WindowInsets insets = activity.getDispatchedInsets();
         assertNotNull(insets);
         Rect screenBounds = activity.getScreenBounds();
         assertNotNull(screenBounds);
         Rect bounds = insets.getPrivacyIndicatorBounds();
         assertNotNull(bounds);
-        assertEquals(bounds.top, 0);
+        final int windowingMode = mWmState
+                .getTaskDisplayArea(mTestActivity.getActivity().getComponentName())
+                .getWindowingMode();
+        final boolean inMultiWindowMode = windowingMode != WINDOWING_MODE_FULLSCREEN
+                && windowingMode != WINDOWING_MODE_UNDEFINED;
+        if (!inMultiWindowMode) {
+            // Multi-window environments may place the indicator bounds somewhere other than the
+            // top (e.g. desktops may decide that the bottom-right corner has the highest visual
+            // priority). Other windowing modes
+            assertEquals(bounds.top, 0);
+        }
         // TODO 188788786: Figure out why the screen bounds are different in cuttlefish,
         // causing failures
         // assertTrue(bounds + " not contained in " + screenBounds, screenBounds.contains(bounds));
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/SnapshotTaskTests.java b/tests/framework/base/windowmanager/src/android/server/wm/SnapshotTaskTests.java
new file mode 100644
index 0000000..59a1a2b
--- /dev/null
+++ b/tests/framework/base/windowmanager/src/android/server/wm/SnapshotTaskTests.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm;
+
+import static android.server.wm.WindowManagerTestBase.startActivity;
+import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.app.UiAutomation;
+import android.content.ComponentName;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.view.SurfaceControl;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowInsets;
+import android.view.WindowInsetsController;
+import android.view.WindowManager;
+import android.view.cts.surfacevalidator.BitmapPixelChecker;
+import android.view.cts.surfacevalidator.PixelColor;
+import android.window.SplashScreen;
+
+import androidx.annotation.Nullable;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/* Build/Install/Run:
+ *     atest CtsWindowManagerDeviceTestCases:SnapshotTaskTests
+ */
+public class SnapshotTaskTests extends ActivityManagerTestBase {
+    private static final String TAG = "SnapshotTaskTests";
+    private static final ComponentName TEST_ACTIVITY = new ComponentName(
+            getInstrumentation().getContext(), TestActivity.class);
+
+    private TestActivity mActivity;
+    private WindowManager mWindowManager;
+    private UiAutomation mUiAutomation;
+
+    private static final int MATCHING_PIXEL_MISMATCH_ALLOWED = 100;
+
+    @Before
+    public void setup() throws Exception {
+        super.setUp();
+        mActivity = startActivity(TestActivity.class);
+
+        mWindowManager = mActivity.getSystemService(WindowManager.class);
+        mUiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        mUiAutomation.adoptShellPermissionIdentity();
+
+        InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+        mActivity.waitUntilReady();
+    }
+
+    @After
+    public void cleanup() {
+        mUiAutomation.dropShellPermissionIdentity();
+    }
+
+    @Test
+    public void testSetDisablePreviewScreenshots() throws Exception {
+        BitmapPixelChecker pixelChecker = new BitmapPixelChecker(PixelColor.RED);
+
+        int retries = 0;
+        boolean matchesPixels = false;
+        while (retries < 5) {
+            Bitmap bitmap = mWindowManager.snapshotTaskForRecents(mActivity.getTaskId());
+            if (bitmap != null) {
+                int expectedMatching =
+                        bitmap.getWidth() * bitmap.getHeight() - MATCHING_PIXEL_MISMATCH_ALLOWED;
+                Rect boundToCheck = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
+                int matchingPixels = pixelChecker.getNumMatchingPixels(bitmap, boundToCheck);
+                matchesPixels = matchingPixels >= expectedMatching;
+            }
+            if (matchesPixels) {
+                break;
+            }
+            retries++;
+            Thread.sleep(1000);
+        }
+
+        assertTrue(matchesPixels);
+
+        mActivity.setRecentsScreenshotEnabled(false);
+
+        retries = 0;
+        WindowManagerState.Activity activityContainer = null;
+        boolean enableScreenshot = true;
+        while (retries < 3) {
+            mWmState.computeState();
+            activityContainer = mWmState.getActivity(TEST_ACTIVITY);
+            if (activityContainer != null) {
+                enableScreenshot = activityContainer.enableRecentsScreenshot();
+            }
+            if (enableScreenshot) {
+                break;
+            }
+            retries++;
+            Thread.sleep(500);
+        }
+        assertFalse("Recents screenshots should be disabled", enableScreenshot);
+
+        Bitmap bitmap = mWindowManager.snapshotTaskForRecents(mActivity.getTaskId());
+        assertNotNull(bitmap);
+        Rect boundToCheck = new Rect(0, 0, bitmap.getWidth(), bitmap.getHeight());
+        int matchingPixels = pixelChecker.getNumMatchingPixels(bitmap, boundToCheck);
+        assertTrue("Expected <=" + MATCHING_PIXEL_MISMATCH_ALLOWED + " matched " + matchingPixels,
+                matchingPixels <= MATCHING_PIXEL_MISMATCH_ALLOWED);
+    }
+
+    public static class TestActivity extends WindowManagerTestBase.FocusableActivity {
+        private final CountDownLatch mReadyToStart = new CountDownLatch(3);
+
+        @Override
+        public void onEnterAnimationComplete() {
+            mReadyToStart.countDown();
+        }
+
+        public void waitUntilReady() throws InterruptedException {
+            mReadyToStart.await(5, TimeUnit.SECONDS);
+        }
+
+        @Override
+        public void onAttachedToWindow() {
+            super.onAttachedToWindow();
+
+            SurfaceControl.Transaction t = new SurfaceControl.Transaction();
+            t.addTransactionCommittedListener(getMainExecutor(),
+                    mReadyToStart::countDown);
+            getWindow().getDecorView().getRootSurfaceControl().applyTransactionOnDraw(t);
+        }
+
+        @Override
+        protected void onCreate(@Nullable Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+            View view = new View(this);
+            view.setBackgroundColor(Color.RED);
+            WindowManager.LayoutParams layoutParams = new WindowManager.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+            setContentView(view, layoutParams);
+
+            WindowInsetsController windowInsetsController = getWindow().getInsetsController();
+            windowInsetsController.hide(
+                    WindowInsets.Type.navigationBars() | WindowInsets.Type.statusBars());
+            WindowManager.LayoutParams params = getWindow().getAttributes();
+            params.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+            getWindow().setAttributes(params);
+            getWindow().setDecorFitsSystemWindows(false);
+
+            SplashScreen splashscreen = getSplashScreen();
+            splashscreen.setOnExitAnimationListener(splashView -> {
+                splashView.remove();
+                mReadyToStart.countDown();
+            });
+        }
+    }
+}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/SplashscreenTests.java b/tests/framework/base/windowmanager/src/android/server/wm/SplashscreenTests.java
index 9635923..7762a00 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/SplashscreenTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/SplashscreenTests.java
@@ -23,18 +23,20 @@
 import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
 import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
 import static android.content.Intent.ACTION_MAIN;
-import static android.content.Intent.CATEGORY_HOME;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.server.wm.CliIntentExtra.extraBool;
 import static android.server.wm.CliIntentExtra.extraString;
 import static android.server.wm.WindowManagerState.STATE_RESUMED;
 import static android.server.wm.app.Components.HANDLE_SPLASH_SCREEN_EXIT_ACTIVITY;
-import static android.server.wm.app.Components.HOME_ACTIVITY;
 import static android.server.wm.app.Components.SPLASHSCREEN_ACTIVITY;
 import static android.server.wm.app.Components.SPLASH_SCREEN_REPLACE_ICON_ACTIVITY;
 import static android.server.wm.app.Components.SPLASH_SCREEN_REPLACE_THEME_ACTIVITY;
+import static android.server.wm.app.Components.SPLASH_SCREEN_STYLE_THEME_ACTIVITY;
+import static android.server.wm.app.Components.TestActivity.COMMAND_START_ACTIVITIES;
 import static android.server.wm.app.Components.TestActivity.COMMAND_START_ACTIVITY;
 import static android.server.wm.app.Components.TestActivity.EXTRA_INTENT;
+import static android.server.wm.app.Components.TestActivity.EXTRA_INTENTS;
+import static android.server.wm.app.Components.TestActivity.EXTRA_OPTION;
 import static android.server.wm.app.Components.TestStartingWindowKeys.CANCEL_HANDLE_EXIT;
 import static android.server.wm.app.Components.TestStartingWindowKeys.CENTER_VIEW_IS_SURFACE_VIEW;
 import static android.server.wm.app.Components.TestStartingWindowKeys.CONTAINS_BRANDING_VIEW;
@@ -53,6 +55,7 @@
 import static android.server.wm.app.Components.TestStartingWindowKeys.REQUEST_HANDLE_EXIT_ON_CREATE;
 import static android.server.wm.app.Components.TestStartingWindowKeys.REQUEST_HANDLE_EXIT_ON_RESUME;
 import static android.server.wm.app.Components.TestStartingWindowKeys.REQUEST_SET_NIGHT_MODE_ON_CREATE;
+import static android.server.wm.app.Components.TestStartingWindowKeys.STYLE_THEME_COMPONENT;
 import static android.view.Display.DEFAULT_DISPLAY;
 import static android.view.WindowInsets.Type.captionBar;
 import static android.view.WindowInsets.Type.statusBars;
@@ -68,6 +71,7 @@
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
+import android.app.ActivityOptions;
 import android.app.UiModeManager;
 import android.content.ComponentName;
 import android.content.Intent;
@@ -83,6 +87,7 @@
 import android.platform.test.annotations.Presubmit;
 import android.view.WindowManager;
 import android.view.WindowMetrics;
+import android.window.SplashScreen;
 
 import androidx.core.graphics.ColorUtils;
 
@@ -105,6 +110,8 @@
 public class SplashscreenTests extends ActivityManagerTestBase {
 
     private static final int CENTER_ICON_SIZE = 192;
+    private static final int BRANDING_HEIGHT = 80;
+    private static final int BRANDING_DEFAULT_MARGIN = 60;
 
     @Rule
     public final DumpOnFailure dumpOnFailure = new DumpOnFailure();
@@ -121,17 +128,27 @@
         mWmState.setSanityCheckWithFocusedWindow(true);
     }
 
-    private CommandSession.ActivitySession prepareTestLauncher() {
-        createManagedHomeActivitySession(HOME_ACTIVITY);
+    /**
+     * @return The starter activity session to start the test activity
+     */
+    private CommandSession.ActivitySession prepareTestStarter() {
         return createManagedActivityClientSession()
-                .startActivity(new Intent(ACTION_MAIN)
-                        .addCategory(CATEGORY_HOME)
-                        .addFlags(FLAG_ACTIVITY_NEW_TASK)
-                        .setComponent(HOME_ACTIVITY));
+                .startActivity(getLaunchActivityBuilder().setUseInstrumentation());
     }
 
-    private void startActivityFromTestLauncher(CommandSession.ActivitySession homeActivity,
-            ComponentName componentName, Consumer<Intent> fillExtra) {
+    private void startActivitiesFromStarter(CommandSession.ActivitySession starter,
+            Intent[] intents, ActivityOptions options) {
+
+        final Bundle data = new Bundle();
+        data.putParcelableArray(EXTRA_INTENTS, intents);
+        if (options != null) {
+            data.putParcelable(EXTRA_OPTION, options.toBundle());
+        }
+        starter.sendCommand(COMMAND_START_ACTIVITIES, data);
+    }
+
+    private void startActivityFromStarter(CommandSession.ActivitySession starter,
+            ComponentName componentName, Consumer<Intent> fillExtra, ActivityOptions options) {
 
         final Bundle data = new Bundle();
         final Intent startIntent = new Intent();
@@ -139,7 +156,10 @@
         startIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
         fillExtra.accept(startIntent);
         data.putParcelable(EXTRA_INTENT, startIntent);
-        homeActivity.sendCommand(COMMAND_START_ACTIVITY, data);
+        if (options != null) {
+            data.putParcelable(EXTRA_OPTION, options.toBundle());
+        }
+        starter.sendCommand(COMMAND_START_ACTIVITY, data);
     }
 
     @Test
@@ -148,7 +168,14 @@
         // applied insets by system bars in AAOS.
         assumeFalse(isCar());
 
-        launchActivityNoWait(SPLASHSCREEN_ACTIVITY, WINDOWING_MODE_FULLSCREEN);
+        final CommandSession.ActivitySession starter = prepareTestStarter();
+        final ActivityOptions noIconOptions = ActivityOptions.makeBasic()
+                .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);
+        noIconOptions.setLaunchWindowingMode(WINDOWING_MODE_FULLSCREEN);
+
+        // launch from app with no-icon options
+        startActivityFromStarter(starter, SPLASHSCREEN_ACTIVITY,
+                intent -> {}, noIconOptions);
         // The windowSplashScreenContent attribute is set to RED. We check that it is ignored.
         testSplashScreenColor(SPLASHSCREEN_ACTIVITY, Color.BLUE, Color.WHITE);
     }
@@ -160,7 +187,13 @@
         assumeFalse(isCar());
         assumeTrue(supportsFreeform());
 
-        launchActivityNoWait(SPLASHSCREEN_ACTIVITY, WINDOWING_MODE_FREEFORM);
+        final CommandSession.ActivitySession starter = prepareTestStarter();
+        final ActivityOptions noIconOptions = ActivityOptions.makeBasic()
+                .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);
+        noIconOptions.setLaunchWindowingMode(WINDOWING_MODE_FREEFORM);
+        // launch from app with no-icon options
+        startActivityFromStarter(starter, SPLASHSCREEN_ACTIVITY,
+                intent -> {}, noIconOptions);
         // The windowSplashScreenContent attribute is set to RED. We check that it is ignored.
         testSplashScreenColor(SPLASHSCREEN_ACTIVITY, Color.BLUE, Color.WHITE);
     }
@@ -326,6 +359,19 @@
         result.setPixel(x + debugOffsetX, y, debugPixel);
     }
 
+    // Roughly check whether the height of the window is high enough to display the brand image.
+    private boolean canShowBranding() {
+        final int iconHeight = WindowManagerState.dpToPx(CENTER_ICON_SIZE,
+                mContext.getResources().getConfiguration().densityDpi);
+        final int brandingHeight = WindowManagerState.dpToPx(BRANDING_HEIGHT,
+                mContext.getResources().getConfiguration().densityDpi);
+        final int brandingDefaultMargin = WindowManagerState.dpToPx(BRANDING_DEFAULT_MARGIN,
+                mContext.getResources().getConfiguration().densityDpi);
+        final WindowMetrics windowMetrics = mWm.getMaximumWindowMetrics();
+        final Rect drawableBounds = new Rect(windowMetrics.getBounds());
+        final int leftHeight = (drawableBounds.height() - iconHeight) / 2;
+        return leftHeight > brandingHeight + brandingDefaultMargin;
+    }
     @Test
     public void testHandleExitAnimationOnCreate() throws Exception {
         assumeFalse(isLeanBack());
@@ -347,27 +393,17 @@
     private void launchRuntimeHandleExitAnimationActivity(boolean extraOnCreate,
             boolean extraOnResume, boolean extraCancel, boolean expectResult) throws Exception {
         TestJournalProvider.TestJournalContainer.start();
-        final CommandSession.ActivitySession homeActivity = prepareTestLauncher();
-        startActivityFromTestLauncher(homeActivity, HANDLE_SPLASH_SCREEN_EXIT_ACTIVITY, intent -> {
-            intent.putExtra(REQUEST_HANDLE_EXIT_ON_CREATE, extraOnCreate);
-            intent.putExtra(REQUEST_HANDLE_EXIT_ON_RESUME, extraOnResume);
-            intent.putExtra(CANCEL_HANDLE_EXIT, extraCancel);
-        });
+
+        launchActivityNoWait(HANDLE_SPLASH_SCREEN_EXIT_ACTIVITY,
+                extraBool(REQUEST_HANDLE_EXIT_ON_CREATE, extraOnCreate),
+                extraBool(REQUEST_HANDLE_EXIT_ON_RESUME, extraOnResume),
+                extraBool(CANCEL_HANDLE_EXIT, extraCancel));
 
         mWmState.computeState(HANDLE_SPLASH_SCREEN_EXIT_ACTIVITY);
         mWmState.assertVisibility(HANDLE_SPLASH_SCREEN_EXIT_ACTIVITY, true);
-        final TestJournalProvider.TestJournal journal =
-                TestJournalProvider.TestJournalContainer.get(HANDLE_SPLASH_SCREEN_EXIT);
         if (expectResult) {
-            TestUtils.waitUntil("Waiting for runtime onSplashScreenExit", 5 /* timeoutSecond */,
-                    () -> journal.extras.getBoolean(RECEIVE_SPLASH_SCREEN_EXIT));
-            assertTrue("No entry for CONTAINS_CENTER_VIEW",
-                    journal.extras.containsKey(CONTAINS_CENTER_VIEW));
-            assertTrue("No entry for CONTAINS_BRANDING_VIEW",
-                    journal.extras.containsKey(CONTAINS_BRANDING_VIEW));
-            assertTrue("Center View shouldn't be null", journal.extras.getBoolean(CONTAINS_CENTER_VIEW));
-            assertTrue(journal.extras.getBoolean(CONTAINS_BRANDING_VIEW));
-            assertEquals(Color.BLUE, journal.extras.getInt(ICON_BACKGROUND_COLOR, Color.YELLOW));
+            assertHandleExit(HANDLE_SPLASH_SCREEN_EXIT, true /* containsIcon */,
+                    true /* containsBranding */, false /* iconAnimatable */);
         }
     }
 
@@ -403,8 +439,15 @@
         // applied insets by system bars in AAOS.
         assumeFalse(isCar());
 
-        launchActivityNoWait(SPLASH_SCREEN_REPLACE_ICON_ACTIVITY, WINDOWING_MODE_FULLSCREEN,
-                extraBool(DELAY_RESUME, true));
+        final CommandSession.ActivitySession starter = prepareTestStarter();
+        final ActivityOptions noIconOptions = ActivityOptions.makeBasic()
+                .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);
+        noIconOptions.setLaunchWindowingMode(WINDOWING_MODE_FULLSCREEN);
+
+        // launch from app with no-icon options
+        startActivityFromStarter(starter, SPLASH_SCREEN_REPLACE_ICON_ACTIVITY,
+                intent -> intent.putExtra(DELAY_RESUME, true), noIconOptions);
+
         testSplashScreenColor(SPLASH_SCREEN_REPLACE_ICON_ACTIVITY, Color.BLUE, Color.WHITE);
     }
 
@@ -415,44 +458,41 @@
         assumeFalse(isCar());
         assumeTrue(supportsFreeform());
 
-        launchActivityNoWait(SPLASH_SCREEN_REPLACE_ICON_ACTIVITY, WINDOWING_MODE_FREEFORM,
-                extraBool(DELAY_RESUME, true));
+        final CommandSession.ActivitySession starter = prepareTestStarter();
+        final ActivityOptions noIconOptions = ActivityOptions.makeBasic()
+                .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);
+        noIconOptions.setLaunchWindowingMode(WINDOWING_MODE_FREEFORM);
+
+        // launch from app with no-icon options
+        startActivityFromStarter(starter, SPLASH_SCREEN_REPLACE_ICON_ACTIVITY,
+                intent -> intent.putExtra(DELAY_RESUME, true), noIconOptions);
+
         testSplashScreenColor(SPLASH_SCREEN_REPLACE_ICON_ACTIVITY, Color.BLUE, Color.WHITE);
     }
 
     @Test
     public void testHandleExitIconAnimatingActivity() throws Exception {
         assumeFalse(isLeanBack());
-        final CommandSession.ActivitySession homeActivity = prepareTestLauncher();
-        TestJournalProvider.TestJournalContainer.start();
 
-        startActivityFromTestLauncher(homeActivity, SPLASH_SCREEN_REPLACE_ICON_ACTIVITY, intent -> {
-            intent.putExtra(REQUEST_HANDLE_EXIT_ON_CREATE, true);
-        });
+        TestJournalProvider.TestJournalContainer.start();
+        launchActivityNoWait(SPLASH_SCREEN_REPLACE_ICON_ACTIVITY,
+                extraBool(REQUEST_HANDLE_EXIT_ON_CREATE, true));
         mWmState.computeState(SPLASH_SCREEN_REPLACE_ICON_ACTIVITY);
         mWmState.assertVisibility(SPLASH_SCREEN_REPLACE_ICON_ACTIVITY, true);
-        final TestJournalProvider.TestJournal journal =
-                TestJournalProvider.TestJournalContainer.get(REPLACE_ICON_EXIT);
-        TestUtils.waitUntil("Waiting for runtime onSplashScreenExit", 5 /* timeoutSecond */,
-                () -> journal.extras.getBoolean(RECEIVE_SPLASH_SCREEN_EXIT));
-        assertTrue(journal.extras.getBoolean(CONTAINS_CENTER_VIEW));
-        final long iconAnimationStart = journal.extras.getLong(ICON_ANIMATION_START);
-        final long iconAnimationDuration = journal.extras.getLong(ICON_ANIMATION_DURATION);
-        assertTrue(iconAnimationStart != 0);
-        assertEquals(iconAnimationDuration, 500);
-        assertFalse(journal.extras.getBoolean(CONTAINS_BRANDING_VIEW));
-        assertTrue(journal.extras.getBoolean(CENTER_VIEW_IS_SURFACE_VIEW));
+
+        assertHandleExit(REPLACE_ICON_EXIT, true /* containsIcon */, false /* containsBranding */,
+                true /* iconAnimatable */);
     }
 
     @Test
     public void testCancelHandleExitIconAnimatingActivity() {
         assumeFalse(isLeanBack());
-        final CommandSession.ActivitySession homeActivity = prepareTestLauncher();
+
         TestJournalProvider.TestJournalContainer.start();
-        startActivityFromTestLauncher(homeActivity, SPLASH_SCREEN_REPLACE_ICON_ACTIVITY, intent -> {
-            intent.putExtra(REQUEST_HANDLE_EXIT_ON_CREATE, true);
-            intent.putExtra(CANCEL_HANDLE_EXIT, true);
-        });
+        launchActivityNoWait(SPLASH_SCREEN_REPLACE_ICON_ACTIVITY,
+                extraBool(REQUEST_HANDLE_EXIT_ON_CREATE, true),
+                extraBool(CANCEL_HANDLE_EXIT, true));
+
         mWmState.waitForActivityState(SPLASH_SCREEN_REPLACE_ICON_ACTIVITY, STATE_RESUMED);
         mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
 
@@ -491,49 +531,200 @@
     }
 
     private void waitAndAssertOverrideThemeColor(int expectedColor) {
-        final ComponentName activity = SPLASH_SCREEN_REPLACE_THEME_ACTIVITY;
-        final Bundle resultExtras = Condition.waitForResult(
-                new Condition<Bundle>("splash screen theme color of " + activity)
-                        .setResultSupplier(() -> TestJournalProvider.TestJournalContainer.get(
-                                OVERRIDE_THEME_COMPONENT).extras)
-                        .setResultValidator(extras -> extras.containsKey(OVERRIDE_THEME_COLOR)));
-        if (resultExtras == null) {
-            fail("No reported override theme color from " + activity);
+        waitAndAssertForSelfFinishActivity(SPLASH_SCREEN_REPLACE_THEME_ACTIVITY,
+                OVERRIDE_THEME_COMPONENT, OVERRIDE_THEME_COLOR, result -> {
+                if (expectedColor > 0) {
+                    assertEquals("Override theme color must match",
+                            Integer.toHexString(expectedColor),
+                            Integer.toHexString(result.getInt(OVERRIDE_THEME_COLOR)));
+                }
+            });
+    }
+
+    @Test
+    public void testLaunchWithSolidColorOptions() throws Exception {
+        assumeFalse(isLeanBack());
+        final CommandSession.ActivitySession starter = prepareTestStarter();
+        TestJournalProvider.TestJournalContainer.start();
+        final ActivityOptions noIconOptions = ActivityOptions.makeBasic()
+                .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);
+        startActivityFromStarter(starter, SPLASH_SCREEN_REPLACE_ICON_ACTIVITY, intent ->
+                intent.putExtra(REQUEST_HANDLE_EXIT_ON_CREATE, true), noIconOptions);
+        mWmState.waitForActivityState(SPLASH_SCREEN_REPLACE_ICON_ACTIVITY, STATE_RESUMED);
+        mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
+
+        assertHandleExit(REPLACE_ICON_EXIT, false /* containsIcon */, false /* containsBranding */,
+                false /* iconAnimatable */);
+    }
+
+    @Test
+    public void testLaunchAppWithIconOptions() throws Exception {
+        final Bundle bundle = ActivityOptions.makeBasic()
+                .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON).toBundle();
+        TestJournalProvider.TestJournalContainer.start();
+        final Intent intent = new Intent(Intent.ACTION_VIEW)
+                .setComponent(HANDLE_SPLASH_SCREEN_EXIT_ACTIVITY)
+                .setFlags(FLAG_ACTIVITY_NEW_TASK);
+        intent.putExtra(REQUEST_HANDLE_EXIT_ON_CREATE, true);
+        mContext.startActivity(intent, bundle);
+
+        mWmState.waitForActivityState(HANDLE_SPLASH_SCREEN_EXIT_ACTIVITY, STATE_RESUMED);
+        mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
+
+        assertHandleExit(HANDLE_SPLASH_SCREEN_EXIT, true /* containsIcon */,
+                true /* containsBranding */, false /* iconAnimatable */);
+    }
+
+    private void launchActivitiesFromStarterWithOptions(Intent[] intents,
+            ActivityOptions options, ComponentName waitResumeComponent) {
+        assumeFalse(isLeanBack());
+        final CommandSession.ActivitySession starter = prepareTestStarter();
+        TestJournalProvider.TestJournalContainer.start();
+
+        startActivitiesFromStarter(starter, intents, options);
+
+        mWmState.waitForActivityState(waitResumeComponent, STATE_RESUMED);
+        mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
+    }
+
+    @Test
+    public void testLaunchActivitiesWithIconOptions() throws Exception {
+        final ActivityOptions options = ActivityOptions.makeBasic()
+                .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);
+        final Intent[] intents = new Intent[] {
+                new Intent().setComponent(HANDLE_SPLASH_SCREEN_EXIT_ACTIVITY)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK),
+                new Intent().setComponent(SPLASH_SCREEN_REPLACE_ICON_ACTIVITY)
+                        .putExtra(REQUEST_HANDLE_EXIT_ON_CREATE, true)
+        };
+        launchActivitiesFromStarterWithOptions(intents, options,
+                SPLASH_SCREEN_REPLACE_ICON_ACTIVITY);
+        assertHandleExit(REPLACE_ICON_EXIT, true /* containsIcon */, false /* containsBranding */,
+                true /* iconAnimatable */);
+    }
+
+    @Test
+    public void testLaunchActivitiesWithSolidColorOptions() throws Exception {
+        final ActivityOptions options = ActivityOptions.makeBasic()
+                .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);
+
+        final Intent[] intents = new Intent[] {
+                new Intent().setComponent(HANDLE_SPLASH_SCREEN_EXIT_ACTIVITY)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                        .putExtra(REQUEST_HANDLE_EXIT_ON_CREATE, true),
+                new Intent().setComponent(SPLASH_SCREEN_REPLACE_ICON_ACTIVITY)
+                        .putExtra(REQUEST_HANDLE_EXIT_ON_CREATE, true)
+        };
+        launchActivitiesFromStarterWithOptions(intents, options,
+                SPLASH_SCREEN_REPLACE_ICON_ACTIVITY);
+        assertHandleExit(REPLACE_ICON_EXIT, false /* containsIcon */, false /* containsBranding */,
+                false /* iconAnimatable */);
+    }
+
+    private void assertHandleExit(String journalOwner,
+            boolean containsIcon, boolean containsBranding, boolean iconAnimatable)
+            throws Exception {
+        final TestJournalProvider.TestJournal journal = TestJournalProvider.TestJournalContainer
+                .get(journalOwner);
+        TestUtils.waitUntil("Waiting for runtime onSplashScreenExit", 5 /* timeoutSecond */,
+                () -> journal.extras.getBoolean(RECEIVE_SPLASH_SCREEN_EXIT));
+        assertTrue("No entry for CONTAINS_CENTER_VIEW",
+                journal.extras.containsKey(CONTAINS_CENTER_VIEW));
+        assertTrue("No entry for CONTAINS_BRANDING_VIEW",
+                journal.extras.containsKey(CONTAINS_BRANDING_VIEW));
+
+        final long iconAnimationStart = journal.extras.getLong(ICON_ANIMATION_START);
+        final long iconAnimationDuration = journal.extras.getLong(ICON_ANIMATION_DURATION);
+        assertEquals(containsIcon, journal.extras.getBoolean(CONTAINS_CENTER_VIEW));
+        assertEquals(iconAnimatable, journal.extras.getBoolean(CENTER_VIEW_IS_SURFACE_VIEW));
+        assertEquals(iconAnimatable, (iconAnimationStart != 0));
+        assertEquals(iconAnimatable ? 500 : 0, iconAnimationDuration);
+        if (containsBranding && canShowBranding()) {
+            assertEquals(containsBranding, journal.extras.getBoolean(CONTAINS_BRANDING_VIEW));
         }
-        if (expectedColor > 0) {
-            assertEquals("Override theme color must match",
-                    Integer.toHexString(expectedColor),
-                    Integer.toHexString(resultExtras.getInt(OVERRIDE_THEME_COLOR)));
+        if (containsIcon && !iconAnimatable) {
+            assertEquals(Color.BLUE, journal.extras.getInt(ICON_BACKGROUND_COLOR, Color.YELLOW));
+        } else {
+            assertEquals(Color.TRANSPARENT,
+                    journal.extras.getInt(ICON_BACKGROUND_COLOR, Color.TRANSPARENT));
         }
-        mWmState.waitForActivityRemoved(activity);
-        separateTestJournal();
     }
 
     @Test
     public void testOverrideSplashscreenTheme() {
         assumeFalse(isLeanBack());
-        final CommandSession.ActivitySession homeActivity = prepareTestLauncher();
-
         // Pre-launch the activity to ensure status is cleared on the device
-        startActivityFromTestLauncher(homeActivity, SPLASH_SCREEN_REPLACE_THEME_ACTIVITY,
-                intent -> {});
+        launchActivityNoWait(SPLASH_SCREEN_REPLACE_THEME_ACTIVITY);
+        mWmState.waitForActivityState(SPLASH_SCREEN_REPLACE_THEME_ACTIVITY, STATE_RESUMED);
+        mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
         waitAndAssertOverrideThemeColor(0 /* ignore */);
 
         // Launch the activity a first time, check that the splashscreen use the default theme,
         // and override the theme for the next launch
-        startActivityFromTestLauncher(homeActivity, SPLASH_SCREEN_REPLACE_THEME_ACTIVITY,
-                intent -> intent.putExtra(OVERRIDE_THEME_ENABLED, true));
+        launchActivityNoWait(SPLASH_SCREEN_REPLACE_THEME_ACTIVITY,
+                extraBool(OVERRIDE_THEME_ENABLED, true));
+        mWmState.waitForActivityState(SPLASH_SCREEN_REPLACE_THEME_ACTIVITY, STATE_RESUMED);
+        mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
         waitAndAssertOverrideThemeColor(Color.BLUE);
 
         // Launch the activity a second time, check that the theme has been overridden and reset
         // to the default theme
-        startActivityFromTestLauncher(homeActivity, SPLASH_SCREEN_REPLACE_THEME_ACTIVITY,
-                intent -> {});
+        launchActivityNoWait(SPLASH_SCREEN_REPLACE_THEME_ACTIVITY);
+        mWmState.waitForActivityState(SPLASH_SCREEN_REPLACE_THEME_ACTIVITY, STATE_RESUMED);
+        mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
         waitAndAssertOverrideThemeColor(Color.RED);
 
         // Launch the activity a third time just to check that the theme has indeed been reset.
-        startActivityFromTestLauncher(homeActivity, SPLASH_SCREEN_REPLACE_THEME_ACTIVITY,
-                intent -> {});
+        launchActivityNoWait(SPLASH_SCREEN_REPLACE_THEME_ACTIVITY);
+        mWmState.waitForActivityState(SPLASH_SCREEN_REPLACE_THEME_ACTIVITY, STATE_RESUMED);
+        mWmState.waitForAppTransitionIdleOnDisplay(DEFAULT_DISPLAY);
         waitAndAssertOverrideThemeColor(Color.BLUE);
     }
+
+    private void waitAndAssertForSelfFinishActivity(ComponentName activity, String component,
+            String validateKey, Consumer<Bundle> assertConsumer) {
+        final Bundle resultExtras = Condition.waitForResult(
+                new Condition<Bundle>("splash screen of " + activity)
+                        .setResultSupplier(() -> TestJournalProvider.TestJournalContainer.get(
+                                component).extras)
+                        .setResultValidator(extras -> extras.containsKey(validateKey)));
+        if (resultExtras == null) {
+            fail("No reported validate key from " + activity);
+        }
+        assertConsumer.accept(resultExtras);
+        mWmState.waitForActivityRemoved(activity);
+        separateTestJournal();
+    }
+
+    private void waitAndAssertStyleThemeIcon(boolean expectContainIcon) {
+        waitAndAssertForSelfFinishActivity(SPLASH_SCREEN_STYLE_THEME_ACTIVITY,
+                STYLE_THEME_COMPONENT, CONTAINS_CENTER_VIEW,
+                result -> assertEquals("Splash screen style must match",
+                        expectContainIcon, result.getBoolean(CONTAINS_CENTER_VIEW)));
+    }
+
+    @Test
+    public void testDefineSplashScreenStyleFromTheme() {
+        assumeFalse(isLeanBack());
+        final CommandSession.ActivitySession starter = prepareTestStarter();
+        final ActivityOptions noIconOptions = ActivityOptions.makeBasic()
+                .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_SOLID_COLOR);
+
+        // launch from app with sold color options
+        startActivityFromStarter(starter, SPLASH_SCREEN_STYLE_THEME_ACTIVITY,
+                intent -> {}, noIconOptions);
+        waitAndAssertStyleThemeIcon(false);
+
+        // launch from app with icon options
+        final ActivityOptions iconOptions = ActivityOptions.makeBasic()
+                .setSplashScreenStyle(SplashScreen.SPLASH_SCREEN_STYLE_ICON);
+        startActivityFromStarter(starter, SPLASH_SCREEN_STYLE_THEME_ACTIVITY,
+                intent -> {}, iconOptions);
+        waitAndAssertStyleThemeIcon(true);
+
+        // launch from app without activity options
+        startActivityFromStarter(starter, SPLASH_SCREEN_STYLE_THEME_ACTIVITY,
+                intent -> {}, null /* options */);
+        waitAndAssertStyleThemeIcon(true);
+    }
 }
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/SplitActivityLifecycleTest.java b/tests/framework/base/windowmanager/src/android/server/wm/SplitActivityLifecycleTest.java
index 2fa3ec8..ffd7d95 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/SplitActivityLifecycleTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/SplitActivityLifecycleTest.java
@@ -44,7 +44,6 @@
 import android.window.WindowContainerToken;
 import android.window.WindowContainerTransaction;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -60,8 +59,6 @@
  */
 @Presubmit
 public class SplitActivityLifecycleTest extends TaskFragmentOrganizerTestBase {
-    private Activity mOwnerActivity;
-    private IBinder mOwnerToken;
     private final Rect mPrimaryBounds = new Rect();
     private final Rect mSideBounds = new Rect();
     private TaskFragmentRecord mTaskFragA;
@@ -72,13 +69,11 @@
     private final Intent mIntent = new Intent().setComponent(mActivityC);
 
     @Override
-    public void setUp() throws Exception {
-        super.setUp();
+    Activity setUpOwnerActivity() {
         // Launch activities in fullscreen, otherwise, some tests fail on devices which use freeform
         // as the default windowing mode, because tests' prerequisite are that activity A, B, and C
         // need to overlay completely, but they can be partially overlay as freeform windows.
-        mOwnerActivity = startActivityInWindowingModeFullScreen(ActivityA.class);
-        mOwnerToken = getActivityToken(mOwnerActivity);
+        return startActivityInWindowingModeFullScreen(ActivityA.class);
     }
 
     /** Launch two Activities in two adjacent TaskFragments side-by-side. */
@@ -393,32 +388,6 @@
         testActivityLaunchInExpandedTaskFragmentInternal();
     }
 
-    /**
-     * Verifies the behavior to launch Activity in expanded TaskFragment and occludes the embedded
-     * Task.
-     * <p>
-     * For example, given that Activity A and B are showed side-by-side, which Activity B is in
-     * embedded Task, this test verifies the behavior to launch Activity C in the TaskFragment which
-     * fills the Task bounds of owner Activity:
-     * <pre class="prettyprint">
-     *     - Fullscreen -
-     *     TaskFragmentC
-     *       - ActivityC <---- new started Activity
-     * - Left -      - Right -
-     * TaskFragmentA TaskFragmentB
-     *   - ActivityA   - Embedded Task
-     *                   - ActivityB
-     * </pre></p>
-     */
-    @Test
-    @Ignore("b/197364677")
-    public void testActivityLaunchInExpandedTaskFragment_AboveEmbeddedTask() {
-        // Initialize test environment by launching Activity A and B side-by-side.
-        initializeSplitActivities(true /* verifyEmbeddedTask */);
-
-        testActivityLaunchInExpandedTaskFragmentInternal();
-    }
-
     private void testActivityLaunchInExpandedTaskFragmentInternal() {
 
         final TaskFragmentCreationParams fullScreenParamsC = mTaskFragmentOrganizer
@@ -444,91 +413,6 @@
     }
 
     /**
-     * Verifies the behavior to launch Activity above the embedded Task in TaskFragment.
-     * <p>
-     * For example, given that Activity A and B are showed side-by-side, which Activity B is in
-     * embedded Task, this test verifies the behavior to launch Activity C on top of the embedded
-     * Task in the same TaskFragment as Activity B:
-     * <pre class="prettyprint">
-     * - Left -      - Right -
-     * TaskFragmentA TaskFragmentB
-     *   - ActivityA   - ActivityC <---- new started Activity
-     *                 - Embedded Task
-     *                   - ActivityB
-     * </pre></p>
-     */
-    @Test
-    @Ignore("b/197364677")
-    public void testActivityLaunchAboveEmbeddedTaskInTaskFragment() {
-        // Initialize test environment by launching Activity A and B side-by-side.
-        initializeSplitActivities(true /* verifyEmbeddedTask */);
-
-        final IBinder taskFragTokenB = mTaskFragB.getTaskFragToken();
-
-        WindowContainerTransaction wct = new WindowContainerTransaction()
-                .startActivityInTaskFragment(taskFragTokenB, mOwnerToken, mIntent,
-                        null /* activityOptions */);
-
-        mTaskFragmentOrganizer.applyTransaction(wct);
-
-        mTaskFragmentOrganizer.waitForTaskFragmentInfoChanged();
-
-        final TaskFragmentInfo infoB = mTaskFragmentOrganizer.getTaskFragmentInfo(taskFragTokenB);
-
-        assertNotEmptyTaskFragment(infoB, taskFragTokenB);
-
-        waitAndAssertResumedActivity(mActivityC, "Activity C must be resumed.");
-        waitAndAssertResumedActivity(mActivityA, "Activity A must be resumed.");
-        waitAndAssertActivityState(mActivityB, WindowManagerState.STATE_STOPPED,
-                "Activity B is occluded by Activity C, so it must be stopped.");
-
-        final TaskFragment taskFragmentB = mWmState.getTaskFragmentByActivity(mActivityB);
-        assertWithMessage("TaskFragmentB must contain Activity C")
-                .that(taskFragmentB.mActivities).containsExactly(mWmState.getActivity(mActivityC));
-    }
-
-    /**
-     * Verifies the behavior to launch Activity to the embedded Task in TaskFragment.
-     * <p>
-     * For example, given that Activity A and B are showed side-by-side, which Activity B is in
-     * embedded Task, this test verifies the behavior to launch Activity C to the embedded Task
-     * and on top of Activity B:
-     * <pre class="prettyprint">
-     * - Left -      - Right -
-     * TaskFragmentA TaskFragmentB
-     *   - ActivityA   - Embedded Task
-     *                   - ActivityC <---- new started Activity
-     *                   - ActivityB
-     * </pre></p>
-     */
-    @Test
-    @Ignore("b/197364677")
-    public void testActivityLaunchToEmbeddedTaskInTaskFragment() {
-        // Initialize test environment by launching Activity A and B side-by-side.
-        initializeSplitActivities(true /* verifyEmbeddedTask */);
-
-        final IBinder taskFragTokenB = mTaskFragB.getTaskFragToken();
-        // Make Activity C launch to the embedded Task.
-        final Intent intent = new Intent(mIntent).addFlags(FLAG_ACTIVITY_NEW_TASK);
-
-        WindowContainerTransaction wct = new WindowContainerTransaction()
-                .startActivityInTaskFragment(taskFragTokenB, mOwnerToken, intent,
-                        null /* activityOptions */);
-
-        mTaskFragmentOrganizer.applyTransaction(wct);
-
-        waitAndAssertResumedActivity(mActivityC, "Activity C must be resumed.");
-        waitAndAssertResumedActivity(mActivityA, "Activity A must be resumed.");
-        waitAndAssertActivityState(mActivityB, STATE_STOPPED,
-                "Activity B is occluded by Activity C, so it must be stopped.");
-
-        final Task embeddedTask = mWmState.getTaskByActivity(mActivityB);
-        assertWithMessage("Embedded Task must contain Activity B and Activity C")
-                .that(embeddedTask.mActivities).containsExactly(mWmState.getActivity(mActivityB),
-                mWmState.getActivity(mActivityC));
-    }
-
-    /**
      * Verifies the show-when-locked behavior while launch embedded activities. Don't show the
      * embedded activities even if one of Activity has showWhenLocked flag.
      */
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/StartActivityAsUserTests.java b/tests/framework/base/windowmanager/src/android/server/wm/StartActivityAsUserTests.java
index b1975db..2453065 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/StartActivityAsUserTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/StartActivityAsUserTests.java
@@ -24,6 +24,7 @@
 import static org.junit.Assume.assumeTrue;
 
 import android.app.ActivityManager;
+import android.app.ActivityOptions;
 import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
@@ -37,8 +38,9 @@
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import org.junit.After;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.util.concurrent.CountDownLatch;
@@ -57,28 +59,62 @@
     private final Context mContext = InstrumentationRegistry.getInstrumentation().getContext();
     private final ActivityManager mAm = mContext.getSystemService(ActivityManager.class);
 
-    private int mSecondUserId;
+    private static int sSecondUserId;
     private WindowManagerStateHelper mAmWmState = new WindowManagerStateHelper();
 
-    @Before
-    public void createSecondUser() {
-        assumeTrue(SUPPORTS_MULTIPLE_USERS);
+    @BeforeClass
+    public static void createSecondUser() {
+        if (!SUPPORTS_MULTIPLE_USERS) {
+            return;
+        }
 
-        final String output = runShellCommand("pm create-user --profileOf " + mContext.getUserId()
+        final Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        final String output = runShellCommand("pm create-user --profileOf " + context.getUserId()
                 + " user2");
-        mSecondUserId = Integer.parseInt(output.substring(output.lastIndexOf(" ")).trim());
-        assertThat(mSecondUserId).isNotEqualTo(0);
-        runShellCommand("pm install-existing --user " + mSecondUserId + " android.server.wm.cts");
+        sSecondUserId = Integer.parseInt(output.substring(output.lastIndexOf(" ")).trim());
+        if (sSecondUserId == 0) {
+            return;
+        }
+        runShellCommand("pm install-existing --user " + sSecondUserId + " android.server.wm.cts");
     }
 
-    @After
-    public void removeSecondUser() {
-        runShellCommand("pm remove-user " + mSecondUserId);
+    @AfterClass
+    public static void removeSecondUser() {
+        if (sSecondUserId == 0) {
+            return;
+        }
+        runShellCommand("pm remove-user " + sSecondUserId);
+        sSecondUserId = 0;
+    }
+
+    @Before
+    public void checkMultipleUsersNotSupportedOrSecondUserCreated() {
+        assumeTrue(SUPPORTS_MULTIPLE_USERS);
+        assertThat(sSecondUserId).isNotEqualTo(0);
     }
 
     @Test
     public void startActivityValidUser() throws Throwable {
-        int[] secondUser= {-1};
+        verifyStartActivityAsValidUser(false /* withOptions */);
+    }
+
+    @Test
+    public void startActivityInvalidUser() {
+        verifyStartActivityAsInvalidUser(false /* withOptions */);
+    }
+
+    @Test
+    public void startActivityAsValidUserWithOptions() throws Throwable {
+        verifyStartActivityAsValidUser(true /* withOptions */);
+    }
+
+    @Test
+    public void startActivityAsInvalidUserWithOptions() {
+        verifyStartActivityAsInvalidUser(true /* withOptions */);
+    }
+
+    private void verifyStartActivityAsValidUser(boolean withOptions) throws Throwable {
+        int[] secondUser = {-1};
         CountDownLatch latch = new CountDownLatch(1);
         RemoteCallback cb = new RemoteCallback((Bundle result) -> {
             secondUser[0] = result.getInt(KEY_USER_ID);
@@ -98,11 +134,16 @@
             }
         }, new IntentFilter(Intent.ACTION_USER_FOREGROUND));
 
-        UserHandle secondUserHandle = UserHandle.of(mSecondUserId);
+        UserHandle secondUserHandle = UserHandle.of(sSecondUserId);
 
         try {
             runWithShellPermissionIdentity(() -> {
-                mContext.startActivityAsUser(intent, secondUserHandle);
+                if (withOptions) {
+                    mContext.startActivityAsUser(intent, ActivityOptions.makeBasic().toBundle(),
+                            secondUserHandle);
+                } else {
+                    mContext.startActivityAsUser(intent, secondUserHandle);
+                }
                 mAm.switchUser(secondUserHandle);
                 try {
                     latch.await(5, TimeUnit.SECONDS);
@@ -114,22 +155,26 @@
             throw e.getCause();
         }
 
-        assertThat(secondUser[0]).isEqualTo(mSecondUserId);
+        assertThat(secondUser[0]).isEqualTo(sSecondUserId);
 
         // Avoid the race between switch-user and remove-user.
         returnToOriginalUserLatch.await(20, TimeUnit.SECONDS);
     }
 
-    @Test
-    public void startActivityInvalidUser() {
-        UserHandle secondUserHandle = UserHandle.of(mSecondUserId * 100);
+    private void verifyStartActivityAsInvalidUser(boolean withOptions) {
+        UserHandle secondUserHandle = UserHandle.of(sSecondUserId * 100);
         int[] stackId = {-1};
 
         final Intent intent = new Intent(mContext, StartActivityAsUserActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 
         runWithShellPermissionIdentity(() -> {
-            mContext.startActivityAsUser(intent, secondUserHandle);
+            if (withOptions) {
+                mContext.startActivityAsUser(intent, ActivityOptions.makeBasic().toBundle(),
+                        secondUserHandle);
+            } else {
+                mContext.startActivityAsUser(intent, secondUserHandle);
+            }
             WindowManagerState amState = mAmWmState;
             amState.computeState();
             ComponentName componentName = ComponentName.createRelative(PACKAGE, CLASS);
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java b/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java
index 6552273..6ec900c 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java
@@ -21,7 +21,10 @@
 import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
 import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
 import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.server.wm.WindowManagerState.STATE_INITIALIZING;
 import static android.server.wm.WindowManagerState.STATE_STOPPED;
 import static android.server.wm.app.Components.BROADCAST_RECEIVER_ACTIVITY;
@@ -373,6 +376,60 @@
     }
 
     /**
+     * Test the activity launched with ActivityOptions#setTaskOverlay should not be finished after
+     * launch another activity with clear_task flag.
+     */
+    @Test
+    public void testStartActivitiesTaskOverlayWithClearTask() {
+        verifyStartActivitiesTaskOverlayWithLaunchFlags(
+                FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);
+    }
+
+    /**
+     * Test the activity launched with ActivityOptions#setTaskOverlay should not be finished after
+     * launch another activity with clear_top flag.
+     */
+    @Test
+    public void testStartActivitiesTaskOverlayWithClearTop() {
+        verifyStartActivitiesTaskOverlayWithLaunchFlags(FLAG_ACTIVITY_CLEAR_TOP);
+    }
+
+    private void verifyStartActivitiesTaskOverlayWithLaunchFlags(int flags) {
+        // Launch a regular activity
+        final Intent baseIntent = new Intent(mContext, Activities.RegularActivity.class);
+        final String regularActivityName = Activities.RegularActivity.class.getName();
+        final TestActivitySession<Activities.RegularActivity> activitySession =
+                createManagedTestActivitySession();
+        activitySession.launchTestActivityOnDisplaySync(regularActivityName, baseIntent,
+                DEFAULT_DISPLAY);
+        mWmState.computeState(baseIntent.getComponent());
+        final int taskId = mWmState.getTaskByActivity(baseIntent.getComponent()).getTaskId();
+        final Activity baseActivity = activitySession.getActivity();
+
+        // Launch a taskOverlay activity
+        final ActivityOptions overlayOptions = ActivityOptions.makeBasic();
+        overlayOptions.setTaskOverlay(true, true);
+        overlayOptions.setLaunchTaskId(taskId);
+        final Intent taskOverlay = new Intent().setComponent(SECOND_ACTIVITY);
+        runWithShellPermission(() ->
+                baseActivity.startActivity(taskOverlay, overlayOptions.toBundle()));
+        waitAndAssertResumedActivity(taskOverlay.getComponent(),
+                "taskOverlay activity on top");
+
+        // Launch the regular activity with specific flags
+        final Intent intent = new Intent(mContext, Activities.RegularActivity.class)
+                .addFlags(flags);
+        baseActivity.startActivity(intent);
+
+        waitAndAssertResumedActivity(taskOverlay.getComponent(),
+                "taskOverlay activity on top");
+        assertEquals("Instance of the taskOverlay activity must exist", 1,
+                mWmState.getActivityCountInTask(taskId, taskOverlay.getComponent()));
+        assertEquals("Activity must be in same task.", taskId,
+                mWmState.getTaskByActivity(intent.getComponent()).getTaskId());
+    }
+
+    /**
      * Invokes {@link android.app.Activity#startActivities} from {@link #TEST_ACTIVITY} and returns
      * the task id of each started activity (the index 0 will be the caller {@link #TEST_ACTIVITY}).
      */
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/SurfaceControlTest.java b/tests/framework/base/windowmanager/src/android/server/wm/SurfaceControlTest.java
index 9e00b08..c08f13c 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/SurfaceControlTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/SurfaceControlTest.java
@@ -41,6 +41,8 @@
 import org.junit.Test;
 import org.junit.rules.TestName;
 
+import java.util.concurrent.Executor;
+
 @Presubmit
 public class SurfaceControlTest {
     private static final int DEFAULT_SURFACE_SIZE = 100;
@@ -77,8 +79,9 @@
         public void surfaceDestroyed(@NonNull SurfaceHolder holder) {}
     }
 
-    private void verifyTest(SurfaceHolder.Callback callback, PixelChecker pixelChecker) {
-        mActivity.verifyTest(callback, pixelChecker);
+    private void verifyTest(SurfaceHolder.Callback callback, PixelChecker pixelChecker,
+            int numOfTransaction) {
+        mActivity.verifyTest(callback, pixelChecker, mName, numOfTransaction);
     }
 
     @Before
@@ -119,7 +122,7 @@
     void fillWithColor(SurfaceControl sc, int color) {
         Surface s = new Surface(sc);
 
-        Canvas c = s.lockHardwareCanvas();
+        Canvas c = s.lockCanvas(null);
         c.drawColor(color);
         s.unlockCanvasAndPost(c);
     }
@@ -154,12 +157,12 @@
                     public void addChildren(SurfaceControl parent) {
                         final SurfaceControl sc = buildDefaultRedSurface(parent);
 
-                        new SurfaceControl.Transaction().setVisibility(sc, true).apply();
+                        makeTransactionWithListener().setVisibility(sc, true).apply();
 
                         sc.release();
                     }
                 },
-                new RectChecker(DEFAULT_RECT, PixelColor.RED));
+                new RectChecker(DEFAULT_RECT, PixelColor.RED), 1);
     }
 
     /**
@@ -173,12 +176,12 @@
                     public void addChildren(SurfaceControl parent) {
                         final SurfaceControl sc = buildDefaultRedSurface(parent);
 
-                        new SurfaceControl.Transaction().setVisibility(sc, false).apply();
+                        makeTransactionWithListener().setVisibility(sc, false).apply();
 
                         sc.release();
                     }
                 },
-                new RectChecker(DEFAULT_RECT, PixelColor.BLACK));
+                new RectChecker(DEFAULT_RECT, PixelColor.BLACK), 1);
     }
 
     /**
@@ -191,11 +194,11 @@
                 new SurfaceHolderCallback () {
                     @Override
                     public void addChildren(SurfaceControl parent) {
-                        new SurfaceControl.Transaction().reparent(sc, parent).apply();
-                        new SurfaceControl.Transaction().reparent(sc, null).apply();
+                        makeTransactionWithListener().reparent(sc, parent).apply();
+                        makeTransactionWithListener().reparent(sc, null).apply();
                     }
                 },
-                new RectChecker(DEFAULT_RECT, PixelColor.BLACK));
+                new RectChecker(DEFAULT_RECT, PixelColor.BLACK), 2);
       // Since the SurfaceControl is parented off-screen, if we release our reference
       // it may completely die. If this occurs while the render thread is still rendering
       // the RED background we could trigger a crash. For this test defer destroying the
@@ -216,14 +219,14 @@
                     public void addChildren(SurfaceControl parent) {
                         final SurfaceControl sc = buildDefaultRedSurface(null);
 
-                        new SurfaceControl.Transaction().setVisibility(sc, true)
+                        makeTransactionWithListener().setVisibility(sc, true)
                             .reparent(sc, parent)
                             .apply();
 
                         sc.release();
                     }
                 },
-                new RectChecker(DEFAULT_RECT, PixelColor.RED));
+                new RectChecker(DEFAULT_RECT, PixelColor.RED), 1);
     }
 
     /**
@@ -238,7 +241,7 @@
                         final SurfaceControl sc = buildDefaultRedSurface(parent);
                         final SurfaceControl sc2 = buildDefaultSurface(parent, Color.GREEN);
 
-                        new SurfaceControl.Transaction().setVisibility(sc, true)
+                        makeTransactionWithListener().setVisibility(sc, true)
                             .setVisibility(sc2, true)
                             .setLayer(sc, 1)
                             .setLayer(sc2, 2)
@@ -247,7 +250,7 @@
                         sc.release();
                     }
                 },
-                new RectChecker(DEFAULT_RECT, PixelColor.GREEN));
+                new RectChecker(DEFAULT_RECT, PixelColor.GREEN), 1);
     }
 
     /**
@@ -260,7 +263,7 @@
                     @Override
                     public void addChildren(SurfaceControl parent) {
                         final SurfaceControl sc = buildDefaultRedSurface(parent);
-                        new SurfaceControl.Transaction().setVisibility(sc, true)
+                        makeTransactionWithListener().setVisibility(sc, true)
                             .setGeometry(sc, null, new Rect(-50, -50, 50, 50), Surface.ROTATION_0)
                             .apply();
                         sc.release();
@@ -279,7 +282,7 @@
                             return black;
                         }
                     }
-                });
+                }, 1);
     }
 
     /**
@@ -292,7 +295,7 @@
                     @Override
                     public void addChildren(SurfaceControl parent) {
                         final SurfaceControl sc = buildDefaultRedSurface(parent);
-                        new SurfaceControl.Transaction().setVisibility(sc, true)
+                        makeTransactionWithListener().setVisibility(sc, true)
                             .setGeometry(sc, null, new Rect(50, 50, 150, 150), Surface.ROTATION_0)
                             .apply();
 
@@ -312,7 +315,7 @@
                             return black;
                         }
                     }
-                });
+                }, 1);
     }
 
     /**
@@ -325,7 +328,7 @@
                     @Override
                     public void addChildren(SurfaceControl parent) {
                         final SurfaceControl sc = buildSmallRedSurface(parent);
-                        new SurfaceControl.Transaction().setVisibility(sc, true)
+                        makeTransactionWithListener().setVisibility(sc, true)
                             .setGeometry(sc, new Rect(0, 0, DEFAULT_SURFACE_SIZE / 2, DEFAULT_SURFACE_SIZE / 2),
                                     new Rect(0, 0, DEFAULT_SURFACE_SIZE , DEFAULT_SURFACE_SIZE),
                                     Surface.ROTATION_0)
@@ -334,6 +337,22 @@
                     }
                 },
 
-                new RectChecker(DEFAULT_RECT, PixelColor.RED));
+                new RectChecker(DEFAULT_RECT, PixelColor.RED), 1);
+    }
+
+    private SurfaceControl.Transaction makeTransactionWithListener() {
+        return new SurfaceControl.Transaction().addTransactionCommittedListener(
+                new Executor() {
+                    @Override
+                    public void execute(Runnable command) {
+                        command.run();
+                    }
+                }, new SurfaceControl.TransactionCommittedListener() {
+                    @Override
+                    public void onTransactionCommitted() {
+                        mActivity.transactionCommitted();
+                    }
+                }
+        );
     }
 }
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/SurfaceControlViewHostTests.java b/tests/framework/base/windowmanager/src/android/server/wm/SurfaceControlViewHostTests.java
index 12cc716..0635661 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/SurfaceControlViewHostTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/SurfaceControlViewHostTests.java
@@ -16,28 +16,43 @@
 
 package android.server.wm;
 
-import static android.server.wm.UiDeviceUtils.pressHomeButton;
-import static android.server.wm.UiDeviceUtils.pressUnlockButton;
-import static android.server.wm.UiDeviceUtils.pressWakeupButton;
+import static android.server.wm.MockImeHelper.createManagedMockImeSession;
 import static android.view.SurfaceControlViewHost.SurfacePackage;
 import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
 import static android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE;
 
+import static com.android.cts.mockime.ImeEventStreamTestUtils.editorMatcher;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEvent;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.Instrumentation;
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.Intent;
 import android.content.pm.ConfigurationInfo;
 import android.content.pm.FeatureInfo;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.Color;
 import android.graphics.PixelFormat;
+import android.graphics.Rect;
+import android.graphics.Region;
+import android.os.Binder;
 import android.platform.test.annotations.Presubmit;
 import android.platform.test.annotations.RequiresDevice;
+import android.server.wm.ActivityManagerTestBase;
+import android.server.wm.scvh.Components;
+import android.util.ArrayMap;
 import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.SurfaceControlViewHost;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
@@ -46,7 +61,11 @@
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.widget.Button;
+import android.widget.EditText;
 import android.widget.FrameLayout;
+import android.widget.PopupWindow;
+
+import android.server.wm.shared.ICrossProcessSurfaceControlViewHostTestService;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.FlakyTest;
@@ -55,9 +74,14 @@
 import com.android.compatibility.common.util.CtsTouchUtils;
 import com.android.compatibility.common.util.WidgetTestUtils;
 
+import com.android.cts.mockime.ImeEventStream;
+import com.android.cts.mockime.MockImeSession;
+
 import org.junit.Before;
+import org.junit.After;
 import org.junit.Test;
 
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
@@ -69,18 +93,30 @@
  *     atest CtsWindowManagerDeviceTestCases:SurfaceControlViewHostTests
  */
 @Presubmit
-public class SurfaceControlViewHostTests implements SurfaceHolder.Callback {
-    private final ActivityTestRule<Activity> mActivityRule = new ActivityTestRule<>(Activity.class);
+public class SurfaceControlViewHostTests extends ActivityManagerTestBase implements SurfaceHolder.Callback {
+    private final ActivityTestRule<ConfigChangeHandlingActivity> mActivityRule =
+        new ActivityTestRule<>(ConfigChangeHandlingActivity.class);
 
     private Instrumentation mInstrumentation;
     private Activity mActivity;
     private SurfaceView mSurfaceView;
+    private ViewGroup mViewParent;
 
     private SurfaceControlViewHost mVr;
     private View mEmbeddedView;
     private WindowManager.LayoutParams mEmbeddedLayoutParams;
 
     private volatile boolean mClicked = false;
+    private volatile boolean mPopupClicked = false;
+    private PopupWindow mPopupWindow;
+
+    private SurfaceControlViewHost.SurfacePackage mRemoteSurfacePackage;
+
+    private final Map<String,
+        FutureConnection<ICrossProcessSurfaceControlViewHostTestService>> mConnections =
+            new ArrayMap<>();
+    private ICrossProcessSurfaceControlViewHostTestService mTestService = null;
+    private static final long TIMEOUT_MS = 3000L;
 
     /*
      * Configurable state to control how the surfaceCreated callback
@@ -91,28 +127,45 @@
 
     private static final int DEFAULT_SURFACE_VIEW_WIDTH = 100;
     private static final int DEFAULT_SURFACE_VIEW_HEIGHT = 100;
+    MockImeSession mImeSession;
 
     @Before
-    public void setUp() {
-        pressWakeupButton();
-        pressUnlockButton();
-        pressHomeButton();
-
+    public void setUp() throws Exception {
+        super.setUp();
         mClicked = false;
         mEmbeddedLayoutParams = null;
+        mRemoteSurfacePackage = null;
+
+        if (supportsInstallableIme()) {
+            mImeSession = createManagedMockImeSession(this);
+        }
 
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mActivity = mActivityRule.launchActivity(null);
         mInstrumentation.waitForIdleSync();
     }
 
+    @After
+    public void tearDown() throws Throwable {
+        for (FutureConnection<ICrossProcessSurfaceControlViewHostTestService> connection :
+                 mConnections.values()) {
+            mInstrumentation.getContext().unbindService(connection);
+        }
+        mConnections.clear();
+    }
+
     private void addSurfaceView(int width, int height) throws Throwable {
+        addSurfaceView(width, height, true);
+    }
+
+    private void addSurfaceView(int width, int height, boolean onTop) throws Throwable {
         mActivityRule.runOnUiThread(() -> {
             final FrameLayout content = new FrameLayout(mActivity);
             mSurfaceView = new SurfaceView(mActivity);
-            mSurfaceView.setZOrderOnTop(true);
+            mSurfaceView.setZOrderOnTop(onTop);
             content.addView(mSurfaceView, new FrameLayout.LayoutParams(
                 width, height, Gravity.LEFT | Gravity.TOP));
+            mViewParent = content;
             mActivity.setContentView(content, new ViewGroup.LayoutParams(width, height));
             mSurfaceView.getHolder().addCallback(this);
         });
@@ -186,8 +239,18 @@
 
     @Override
     public void surfaceCreated(SurfaceHolder holder) {
-        addViewToSurfaceView(mSurfaceView, mEmbeddedView,
+        if (mTestService == null) {
+            addViewToSurfaceView(mSurfaceView, mEmbeddedView,
                 mEmbeddedViewWidth, mEmbeddedViewHeight);
+        } else if (mRemoteSurfacePackage == null) {
+            try {
+                mRemoteSurfacePackage = mTestService.getSurfacePackage(mSurfaceView.getHostToken());
+            } catch (Exception e) {
+            }
+            mSurfaceView.setChildSurfacePackage(mRemoteSurfacePackage);
+        } else {
+            mSurfaceView.setChildSurfacePackage(mRemoteSurfacePackage);
+        }
     }
 
     @Override
@@ -361,6 +424,30 @@
     }
 
     @Test
+    public void testImeVisible() throws Throwable {
+        assumeTrue(MSG_NO_MOCK_IME, supportsInstallableIme());
+        EditText editText = new EditText(mActivity);
+
+        mEmbeddedView = editText;
+        editText.setBackgroundColor(Color.BLUE);
+        editText.setPrivateImeOptions("Hello reader! This is a random string");
+        addSurfaceView(DEFAULT_SURFACE_VIEW_WIDTH, DEFAULT_SURFACE_VIEW_HEIGHT);
+        mInstrumentation.waitForIdleSync();
+        waitUntilEmbeddedViewDrawn();
+
+        // When surface view is focused, it should transfer focus to the embedded view.
+        requestSurfaceViewFocus();
+        assertWindowFocused(mEmbeddedView, true);
+        // assert host does not have focus
+        assertWindowFocused(mSurfaceView, false);
+
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mActivityRule, mSurfaceView);
+        final ImeEventStream stream = mImeSession.openEventStream();
+        expectEvent(stream, editorMatcher("onStartInputView",
+            editText.getPrivateImeOptions()), TIMEOUT_MS);
+    }
+
+    @Test
     public void testNotFocusable() throws Throwable {
         mEmbeddedView = new Button(mActivity);
         addSurfaceView(DEFAULT_SURFACE_VIEW_WIDTH, DEFAULT_SURFACE_VIEW_HEIGHT);
@@ -519,4 +606,353 @@
         assertTrue(mClicked);
     }
 
+    @Test
+    public void testCanReplaceSurfacePackage() throws Throwable {
+        // Create a surface view and wait for its surface to be created.
+        {
+            CountDownLatch surfaceCreated = new CountDownLatch(1);
+            mActivityRule.runOnUiThread(() -> {
+                final FrameLayout content = new FrameLayout(mActivity);
+                mSurfaceView = new SurfaceView(mActivity);
+                mSurfaceView.setZOrderOnTop(true);
+                content.addView(mSurfaceView, new FrameLayout.LayoutParams(
+                        DEFAULT_SURFACE_VIEW_WIDTH, DEFAULT_SURFACE_VIEW_HEIGHT, 
+                        Gravity.LEFT | Gravity.TOP));
+                mActivity.setContentView(content, new ViewGroup.LayoutParams(
+                        DEFAULT_SURFACE_VIEW_WIDTH, DEFAULT_SURFACE_VIEW_HEIGHT));
+                mSurfaceView.getHolder().addCallback(new SurfaceCreatedCallback(surfaceCreated));
+
+                // Create an embedded view without click handling.
+                mVr = new SurfaceControlViewHost(mActivity, mActivity.getDisplay(),
+                        mSurfaceView.getHostToken());
+                mEmbeddedView = new Button(mActivity);
+                mVr.setView(mEmbeddedView, mEmbeddedViewWidth, mEmbeddedViewHeight);
+
+            });
+            surfaceCreated.await();
+            mSurfaceView.setChildSurfacePackage(mVr.getSurfacePackage());
+            mInstrumentation.waitForIdleSync();
+            waitUntilEmbeddedViewDrawn();
+        }
+
+        {
+            CountDownLatch hostReady = new CountDownLatch(1);
+            // Create a second surface view and wait for its surface to be created.
+            mActivityRule.runOnUiThread(() -> {
+                // Create an embedded view.
+                mVr = new SurfaceControlViewHost(mActivity, mActivity.getDisplay(),
+                        mSurfaceView.getHostToken());
+                mEmbeddedView = new Button(mActivity);
+                mEmbeddedView.setOnClickListener((View v) -> mClicked = true);
+                mVr.setView(mEmbeddedView, mEmbeddedViewWidth, mEmbeddedViewHeight);
+                hostReady.countDown();
+
+            });
+            hostReady.await();
+            mSurfaceView.setChildSurfacePackage(mVr.getSurfacePackage());
+            mInstrumentation.waitForIdleSync();
+            waitUntilEmbeddedViewDrawn();
+        }
+
+        // Check to see if the click went through - this only would happen if the surface package
+        // was replaced
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mActivityRule, mSurfaceView);
+        assertTrue(mClicked);
+    }
+
+    class MotionRecordingSurfaceView extends SurfaceView {
+        boolean mGotEvent = false;
+        MotionRecordingSurfaceView(Context c) {
+            super(c);
+        }
+        public boolean onTouchEvent(MotionEvent e) {
+            super.onTouchEvent(e);
+            synchronized (this) {
+                mGotEvent = true;
+            }
+            return true;
+        }
+        boolean gotEvent() {
+            synchronized (this) {
+                return mGotEvent;
+            }
+        }
+        void reset() {
+            synchronized (this) {
+                mGotEvent = false;
+            }
+        }
+    }
+
+    class TouchPunchingView extends View {
+        public TouchPunchingView(Context context) {
+            super(context);
+        }
+
+        void punchHoleInTouchableRegion() {
+            getRootSurfaceControl().setTouchableRegion(new Region());
+        }
+    }
+
+    private void addMotionRecordingSurfaceView(int width, int height) throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            final FrameLayout content = new FrameLayout(mActivity);
+            mSurfaceView = new MotionRecordingSurfaceView(mActivity);
+            mSurfaceView.setZOrderOnTop(true);
+            content.addView(mSurfaceView, new FrameLayout.LayoutParams(
+                width, height, Gravity.LEFT | Gravity.TOP));
+            mActivity.setContentView(content, new ViewGroup.LayoutParams(width, height));
+            mSurfaceView.getHolder().addCallback(this);
+        });
+    }
+
+    class ForwardingSurfaceView extends SurfaceView {
+        SurfaceControlViewHost.SurfacePackage mPackage;
+
+        ForwardingSurfaceView(Context c) {
+            super(c);
+        }
+
+        @Override
+        protected void onDetachedFromWindow() {
+            mPackage.notifyDetachedFromWindow();
+        }
+
+        @Override
+        protected void onConfigurationChanged(Configuration newConfig) {
+            super.onConfigurationChanged(newConfig);
+            mPackage.notifyConfigurationChanged(newConfig);
+        }
+
+        @Override
+        public void setChildSurfacePackage(SurfaceControlViewHost.SurfacePackage p) {
+            super.setChildSurfacePackage(p);
+            mPackage = p;
+        }
+    }
+
+    class DetachRecordingView extends View {
+        boolean mDetached = false;
+        DetachRecordingView(Context c) {
+            super(c);
+        }
+
+        @Override
+        protected void onDetachedFromWindow() {
+            mDetached = true;
+        }
+    }
+
+    class ConfigRecordingView extends View {
+        CountDownLatch mLatch;
+        ConfigRecordingView(Context c, CountDownLatch latch) {
+            super(c);
+            mLatch = latch;
+        }
+
+        @Override
+        protected void onConfigurationChanged(Configuration newConfig) {
+            mLatch.countDown();
+        }
+    }
+
+    private void addForwardingSurfaceView(int width, int height) throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            final FrameLayout content = new FrameLayout(mActivity);
+            mSurfaceView = new ForwardingSurfaceView(mActivity);
+            mSurfaceView.setZOrderOnTop(true);
+            content.addView(mSurfaceView, new FrameLayout.LayoutParams(
+                width, height, Gravity.LEFT | Gravity.TOP));
+            mViewParent = content;
+            mActivity.setContentView(content, new ViewGroup.LayoutParams(width, height));
+            mSurfaceView.getHolder().addCallback(this);
+        });
+    }
+
+    @Test
+    public void testEmbeddedViewCanSetTouchableRegion() throws Throwable {
+        TouchPunchingView tpv;
+        mEmbeddedView = tpv = new TouchPunchingView(mActivity);
+
+        addMotionRecordingSurfaceView(DEFAULT_SURFACE_VIEW_WIDTH, DEFAULT_SURFACE_VIEW_HEIGHT);
+        mInstrumentation.waitForIdleSync();
+        waitUntilEmbeddedViewDrawn();
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mActivityRule, mSurfaceView);
+        mInstrumentation.waitForIdleSync();
+
+        MotionRecordingSurfaceView mrsv = (MotionRecordingSurfaceView)mSurfaceView;
+        assertFalse(mrsv.gotEvent());
+        mActivityRule.runOnUiThread(() -> {
+            tpv.punchHoleInTouchableRegion();
+        });
+        mInstrumentation.waitForIdleSync();
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mActivityRule, mSurfaceView);
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mrsv.gotEvent());
+    }
+
+    @Test
+    public void forwardDetachedFromWindow() throws Throwable {
+        DetachRecordingView drv = new DetachRecordingView(mActivity);
+        mEmbeddedView = drv;
+        addForwardingSurfaceView(100, 100);
+        mInstrumentation.waitForIdleSync();
+        waitUntilEmbeddedViewDrawn();
+        
+        assertFalse(drv.mDetached);
+        mActivityRule.runOnUiThread(() -> {
+            mViewParent.removeView(mSurfaceView);
+        });
+        mInstrumentation.waitForIdleSync();
+        assertTrue(drv.mDetached);
+    }
+
+    @Test
+    public void forwardConfigurationChange() throws Throwable {
+        if (!supportsOrientationRequest()) {
+            return;
+        }
+        final CountDownLatch embeddedConfigLatch = new CountDownLatch(1);
+        ConfigRecordingView crv = new ConfigRecordingView(mActivity, embeddedConfigLatch);
+        mEmbeddedView = crv;
+        addForwardingSurfaceView(100, 100);
+        mInstrumentation.waitForIdleSync();
+        waitUntilEmbeddedViewDrawn();
+        mActivityRule.runOnUiThread(() -> {
+            int orientation = mActivity.getResources().getConfiguration().orientation;
+            if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+                orientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+            } else {
+                orientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
+            }
+            mActivity.setRequestedOrientation(orientation);
+        });
+        embeddedConfigLatch.await(3, TimeUnit.SECONDS);
+        mInstrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> {
+                assertEquals(mEmbeddedView.getResources().getConfiguration().orientation,
+                             mSurfaceView.getResources().getConfiguration().orientation);
+        });
+    }
+
+    @Test
+    public void testEmbeddedViewReceivesInputOnBottom() throws Throwable {
+        mEmbeddedView = new Button(mActivity);
+        mEmbeddedView.setOnClickListener((View v) -> {
+            mClicked = true;
+        });
+
+        addSurfaceView(DEFAULT_SURFACE_VIEW_WIDTH, DEFAULT_SURFACE_VIEW_HEIGHT, false);
+        mInstrumentation.waitForIdleSync();
+        waitUntilEmbeddedViewDrawn();
+
+        // We should receive no input until we punch a hole
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mActivityRule, mSurfaceView);
+        mInstrumentation.waitForIdleSync();
+        assertFalse(mClicked);
+
+        mActivityRule.runOnUiThread(() -> {
+            mSurfaceView.getRootSurfaceControl().setTouchableRegion(new Region(0,0,1,1));
+        });
+        mInstrumentation.waitForIdleSync();
+
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mActivityRule, mSurfaceView);
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mClicked);
+    }
+
+    private ICrossProcessSurfaceControlViewHostTestService getService() throws Exception {
+        return mConnections.computeIfAbsent("android.server.wm.scvh", this::connect).get(TIMEOUT_MS);
+    }
+
+    private static ComponentName repackage(String packageName, ComponentName baseComponent) {
+        return new ComponentName(packageName, baseComponent.getClassName());
+    }
+
+    private FutureConnection<ICrossProcessSurfaceControlViewHostTestService> connect(
+            String packageName) {
+        FutureConnection<ICrossProcessSurfaceControlViewHostTestService> connection =
+                new FutureConnection<>(
+                    ICrossProcessSurfaceControlViewHostTestService.Stub::asInterface);
+        Intent intent = new Intent();
+        intent.setComponent(repackage(packageName,
+            Components.CrossProcessSurfaceControlViewHostTestService.COMPONENT));
+        assertTrue(mInstrumentation.getContext().bindService(intent,
+            connection, Context.BIND_AUTO_CREATE));
+        return connection;
+    }
+
+    @Test
+    public void testHostInputTokenAllowsObscuredTouches() throws Throwable {
+        SurfaceControlViewHost.SurfacePackage p = null;
+
+        mTestService = getService();
+        assertTrue(mTestService != null);
+
+        addSurfaceView(DEFAULT_SURFACE_VIEW_WIDTH, DEFAULT_SURFACE_VIEW_HEIGHT, false);
+        mActivityRule.runOnUiThread(() -> {
+            mSurfaceView.getRootSurfaceControl().setTouchableRegion(new Region());
+        });
+        mInstrumentation.waitForIdleSync();
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mActivityRule, mSurfaceView);
+        mInstrumentation.waitForIdleSync();
+
+        assertTrue(mTestService.getViewIsTouchedAndObscured());
+    }
+
+    @Test
+    public void testNoHostInputTokenDisallowsObscuredTouches() throws Throwable {
+        mTestService = getService();
+        mRemoteSurfacePackage = mTestService.getSurfacePackage(new Binder());
+        assertTrue(mRemoteSurfacePackage != null);
+
+        addSurfaceView(DEFAULT_SURFACE_VIEW_WIDTH, DEFAULT_SURFACE_VIEW_HEIGHT, false);
+        mActivityRule.runOnUiThread(() -> {
+            mSurfaceView.getRootSurfaceControl().setTouchableRegion(new Region());
+        });
+        mInstrumentation.waitForIdleSync();
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mActivityRule, mSurfaceView);
+        mInstrumentation.waitForIdleSync();
+
+        assertFalse(mTestService.getViewIsTouched());
+    }
+
+    @Test
+    public void testPopupWindowReceivesInput() throws Throwable {
+        mEmbeddedView = new Button(mActivity);
+        mEmbeddedView.setOnClickListener((View v) -> {
+            mClicked = true;
+        });
+        addSurfaceView(DEFAULT_SURFACE_VIEW_WIDTH, DEFAULT_SURFACE_VIEW_HEIGHT);
+        mInstrumentation.waitForIdleSync();
+        waitUntilEmbeddedViewDrawn();
+
+        mActivityRule.runOnUiThread(() -> {
+            PopupWindow pw = new PopupWindow();
+            mPopupWindow = pw;
+            Button popupButton = new Button(mActivity);
+            popupButton.setOnClickListener((View v) -> {
+                mPopupClicked = true;
+            });
+            pw.setWidth(DEFAULT_SURFACE_VIEW_WIDTH);
+            pw.setHeight(DEFAULT_SURFACE_VIEW_HEIGHT);
+            pw.setContentView(popupButton);
+            pw.showAsDropDown(mEmbeddedView);
+        });
+        mInstrumentation.waitForIdleSync();
+
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mActivityRule, mSurfaceView);
+        assertTrue(mPopupClicked);
+        assertFalse(mClicked);
+
+        mActivityRule.runOnUiThread(() -> {
+            mPopupWindow.dismiss();
+        });
+        mInstrumentation.waitForIdleSync();
+
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mActivityRule, mSurfaceView);
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mClicked);
+    }
 }
+
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/SurfacePackageFlickerTest.java b/tests/framework/base/windowmanager/src/android/server/wm/SurfacePackageFlickerTest.java
new file mode 100644
index 0000000..b654c73
--- /dev/null
+++ b/tests/framework/base/windowmanager/src/android/server/wm/SurfacePackageFlickerTest.java
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2019 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 android.server.wm;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import static android.server.wm.ActivityManagerTestBase.createFullscreenActivityScenarioRule;
+import static android.server.wm.WindowManagerState.getLogicalDisplaySize;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.os.Binder;
+import android.support.test.uiautomator.UiObjectNotFoundException;
+import android.view.cts.surfacevalidator.AnimationFactory;
+import android.view.cts.surfacevalidator.CapturedActivity;
+import android.view.cts.surfacevalidator.ISurfaceValidatorTestCase;
+import android.view.cts.surfacevalidator.PixelChecker;
+import android.view.cts.surfacevalidator.PixelColor;
+import android.view.cts.surfacevalidator.SurfaceControlTestCase;
+import android.view.Gravity;
+import android.view.SurfaceControl;
+import android.view.SurfaceControlViewHost;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.View;
+import android.view.ViewTreeObserver;
+import android.widget.FrameLayout;
+
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+
+import java.util.concurrent.CountDownLatch;
+
+public class SurfacePackageFlickerTest {
+    private static final int DEFAULT_LAYOUT_WIDTH = 100;
+    private static final int DEFAULT_LAYOUT_HEIGHT = 100;
+    private static final int DEFAULT_BUFFER_WIDTH = 640;
+    private static final int DEFAULT_BUFFER_HEIGHT = 480;
+
+    @Rule
+    public final ActivityScenarioRule<CapturedActivity> mActivityRule =
+                createFullscreenActivityScenarioRule(CapturedActivity.class);
+
+    @Rule
+    public TestName mName = new TestName();
+    private CapturedActivity mActivity;
+
+    @Before
+    public void setup() {
+        mActivityRule.getScenario().onActivity(activity -> mActivity = activity);
+        mActivity.dismissPermissionDialog();
+        mActivity.setLogicalDisplaySize(getLogicalDisplaySize());
+    }
+
+    /**
+     * Want to be especially sure we don't leave up the permission dialog, so try and dismiss
+     * after test.
+     */
+    @After
+    public void tearDown() throws UiObjectNotFoundException {
+        mActivity.dismissPermissionDialog();
+    }
+
+    class SurfacePackageTestCase implements ISurfaceValidatorTestCase {
+        private final FrameLayout.LayoutParams mLayoutParams;
+        private final PixelChecker mPixelChecker;
+        private SurfaceView mSurfaceView;
+        private SurfaceControlViewHost mSurfaceControlViewHost;
+        private FrameLayout mParent;
+        private final CountDownLatch mFirstDrawLatch = new CountDownLatch(1);
+
+
+        private final Runnable mRecreateSurfaceViewCallback = new Runnable() {
+                public void run() {
+                    if (mSurfaceControlViewHost == null) {
+                        return;
+                    }
+                    mParent.removeView(mSurfaceView);
+                    mSurfaceView = new SurfaceView(mActivity);
+                    mSurfaceView.setZOrderOnTop(true);
+                    mParent.addView(mSurfaceView, mLayoutParams);
+                    mSurfaceView.setChildSurfacePackage(mSurfaceControlViewHost.getSurfacePackage());
+                    mParent.post(mRecreateSurfaceViewCallback);
+                }
+        };
+
+        public SurfacePackageTestCase(PixelChecker pixelChecker,
+                                      int layoutWidth, int layoutHeight) {
+            mLayoutParams = new FrameLayout.LayoutParams(layoutWidth, layoutHeight,
+                Gravity.LEFT | Gravity.TOP);
+            mPixelChecker = pixelChecker;
+        }
+
+        @Override
+        public void start(Context context, FrameLayout parent) {
+            mParent = parent;
+            mSurfaceView = new SurfaceView(context);
+            mSurfaceView.setZOrderOnTop(true);
+            mParent.addView(mSurfaceView, mLayoutParams);
+
+            final View v = new View(mActivity);
+            v.setBackgroundColor(Color.GREEN);
+
+            mSurfaceControlViewHost = new SurfaceControlViewHost(mActivity, mActivity.getDisplay(),
+                new Binder());
+            mSurfaceControlViewHost.setView(v, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT);
+            mSurfaceView.setChildSurfacePackage(mSurfaceControlViewHost.getSurfacePackage());
+
+            v.getViewTreeObserver().registerFrameCommitCallback(() -> {
+                parent.post(mRecreateSurfaceViewCallback);
+                mFirstDrawLatch.countDown();
+            });
+        }
+
+        public void waitForReady() {
+            try {
+                mFirstDrawLatch.await();
+            } catch (Exception e) {
+                // Oh well
+            }
+        }
+
+        @Override
+        public void end() {
+            mSurfaceControlViewHost.release();
+            mParent.removeAllViews();
+            mSurfaceControlViewHost = null;
+        }
+
+        @Override
+        public boolean hasAnimation() {
+            return true;
+        }
+
+        @Override
+        public PixelChecker getChecker() {
+            return mPixelChecker;
+        }
+
+        @Override
+        public Rect getBoundsToCheck(FrameLayout parent) {
+            View boundsView = mParent;
+            Rect boundsToCheck = new Rect(0, 0, boundsView.getWidth(), boundsView.getHeight());
+            int[] topLeft = new int[2];
+            boundsView.getLocationOnScreen(topLeft);
+            boundsToCheck.offset(topLeft[0], topLeft[1]);
+            return boundsToCheck;
+        }
+    }
+
+    @Test
+    public void testSurfacePackageNoFlicker() throws Throwable {
+        // The basic operation of this test is to continually recreate
+        // SurfaceViews hosting a single green SurfacePackage.
+        // We verify that removing the old SurfaceView at the
+        // "same time" as reparenting the SurfacePackage to the new one
+        // results in a flicker free process.
+        PixelChecker pixelChecker = new PixelChecker(PixelColor.GREEN) {
+            @Override
+            public boolean checkPixels(int pixelCount, int width, int height) {
+                return pixelCount == DEFAULT_LAYOUT_WIDTH*DEFAULT_LAYOUT_HEIGHT;
+            }
+        };
+        SurfacePackageTestCase t = new SurfacePackageTestCase(
+                pixelChecker, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT);
+        mActivity.verifyTest(t, mName);
+    }
+}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/SurfaceViewTest.java b/tests/framework/base/windowmanager/src/android/server/wm/SurfaceViewTest.java
index 767650d..7e15846 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/SurfaceViewTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/SurfaceViewTest.java
@@ -39,6 +39,7 @@
 import com.android.compatibility.common.util.CtsKeyEventUtil;
 import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -61,7 +62,7 @@
     public void setup() {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
         mMockSurfaceView = mActivity.getSurfaceView();
     }
 
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerPolicyTest.java b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerPolicyTest.java
index 9f8d6e0..318e6f7 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerPolicyTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerPolicyTest.java
@@ -19,7 +19,6 @@
 import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
 import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
 import static android.server.wm.TaskFragmentOrganizerTestBase.assertEmptyTaskFragment;
-import static android.server.wm.TaskFragmentOrganizerTestBase.assertNotEmptyTaskFragment;
 import static android.server.wm.TaskFragmentOrganizerTestBase.getActivityToken;
 import static android.server.wm.WindowManagerState.STATE_RESUMED;
 import static android.server.wm.app.Components.LAUNCHING_ACTIVITY;
@@ -53,7 +52,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -177,16 +175,10 @@
     }
 
     /**
-     * Verifies the behavior to start Activity from another process in a new created Task under
-     * TaskFragment with {@link android.permission#ACTIVITY_EMBEDDING}.
-     * <p>
-     * If the application to start Activity holds the permission, the activity is allowed to start
-     * on the Task. Otherwise, the TaskFragment should remain empty.
-     * </p>
+     * Verifies the behavior to start Activity in a new created Task in TaskFragment is forbidden.
      */
     @Test
-    @Ignore("b/197364677")
-    public void testStartActivityFromAnotherProcessInEmbeddedTask() {
+    public void testStartActivityFromAnotherProcessInNewTask_ThrowException() {
         final Activity activity = startNewActivity();
         final IBinder ownerToken = getActivityToken(activity);
         final TaskFragmentCreationParams params = mTaskFragmentOrganizer.generateTaskFragParams(
@@ -209,29 +201,13 @@
 
         TaskFragmentInfo info = mTaskFragmentOrganizer.getTaskFragmentInfo(taskFragToken);
 
-        // TaskFragment must remain empty because we don't hold EMBEDDING_ACTIVITY permission to
-        // launch Activity in the embedded Task.
+        // TaskFragment must remain empty because embedding activities in a new task is not allowed.
         assertEmptyTaskFragment(info, taskFragToken);
 
         mTaskFragmentOrganizer.waitForTaskFragmentError();
 
         assertThat(mTaskFragmentOrganizer.getThrowable()).isInstanceOf(SecurityException.class);
         assertThat(mTaskFragmentOrganizer.getErrorCallbackToken()).isEqualTo(errorCallbackToken);
-
-        final WindowContainerTransaction wctWithPermission = new WindowContainerTransaction()
-                .startActivityInTaskFragment(taskFragToken, ownerToken, intent,
-                        null /* activityOptions */);
-
-        NestedShellPermission.run(() -> mTaskFragmentOrganizer.applyTransaction(wctWithPermission),
-                "android.permission.ACTIVITY_EMBEDDING");
-
-        mTaskFragmentOrganizer.waitForTaskFragmentInfoChanged();
-
-        info = mTaskFragmentOrganizer.getTaskFragmentInfo(taskFragToken);
-
-        // The new started Activity must be launched in the new created Task under the TaskFragment
-        // with token taskFragToken.
-        assertNotEmptyTaskFragment(info, taskFragToken);
     }
 
     /**
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTest.java b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTest.java
index def5b0b..a667c96 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTest.java
@@ -17,13 +17,14 @@
 package android.server.wm;
 
 import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;
-import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
-import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
-import static android.server.wm.app.Components.LAUNCHING_ACTIVITY;
+import static android.server.wm.WindowManagerState.STATE_RESUMED;
+import static android.server.wm.WindowManagerState.STATE_STOPPED;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
+import static org.junit.Assert.assertThrows;
+
 import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
@@ -32,20 +33,17 @@
 import android.os.Bundle;
 import android.os.IBinder;
 import android.platform.test.annotations.Presubmit;
-import android.server.wm.WindowContextTests.TestActivity;
 import android.server.wm.WindowManagerState.Task;
 import android.server.wm.WindowManagerState.TaskFragment;
+import android.view.SurfaceControl;
 import android.window.TaskFragmentCreationParams;
 import android.window.TaskFragmentInfo;
 import android.window.TaskFragmentOrganizer;
 import android.window.WindowContainerToken;
 import android.window.WindowContainerTransaction;
 
-import androidx.annotation.NonNull;
-
-import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
+
 /**
  * Tests that verify the behavior of {@link TaskFragmentOrganizer}.
  *
@@ -54,23 +52,9 @@
  */
 @Presubmit
 public class TaskFragmentOrganizerTest extends TaskFragmentOrganizerTestBase {
-    private Activity mOwnerActivity;
-    private IBinder mOwnerToken;
-    private ComponentName mOwnerActivityName;
-    private int mOwnerTaskId;
     private final ComponentName mLaunchingActivity = new ComponentName(mContext,
             WindowMetricsActivityTests.MetricsActivity.class);
 
-    @Before
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        mOwnerActivity = startActivity(TestActivity.class);
-        mOwnerToken = getActivityToken(mOwnerActivity);
-        mOwnerActivityName = mOwnerActivity.getComponentName();
-        mOwnerTaskId = mOwnerActivity.getTaskId();
-    }
-
     /**
      * Verifies the behavior of
      * {@link WindowContainerTransaction#createTaskFragment(TaskFragmentCreationParams)} to create
@@ -132,7 +116,7 @@
         assertNotEmptyTaskFragment(mTaskFragmentOrganizer.getTaskFragmentInfo(taskFragToken),
                 taskFragToken, mOwnerToken);
 
-        mWmState.waitForActivityState(mOwnerActivityName, WindowManagerState.STATE_RESUMED);
+        mWmState.waitForActivityState(mOwnerActivityName, STATE_RESUMED);
 
         final Task parentTask = mWmState.getTaskByActivity(mOwnerActivityName);
         final TaskFragment taskFragment = mWmState.getTaskFragmentByActivity(mOwnerActivityName);
@@ -150,7 +134,6 @@
      * Bundle)} to start Activity in TaskFragment without creating new Task.
      */
     @Test
-    @Ignore("b/197364677")
     public void testStartActivityInTaskFragment_reuseTask() {
         final TaskFragmentCreationParams params = generateTaskFragCreationParams();
         final IBinder taskFragToken = params.getFragmentToken();
@@ -165,7 +148,7 @@
         TaskFragmentInfo info = mTaskFragmentOrganizer.getTaskFragmentInfo(taskFragToken);
         assertNotEmptyTaskFragment(info, taskFragToken);
 
-        mWmState.waitForActivityState(mLaunchingActivity, WindowManagerState.STATE_RESUMED);
+        mWmState.waitForActivityState(mLaunchingActivity, STATE_RESUMED);
 
         Task parentTask = mWmState.getRootTask(mOwnerActivity.getTaskId());
         TaskFragment taskFragment = mWmState.getTaskFragmentByActivity(mLaunchingActivity);
@@ -184,68 +167,21 @@
 
     /**
      * Verifies the behavior of
-     * {@link WindowContainerTransaction#startActivityInTaskFragment(IBinder, IBinder, Intent,
-     * Bundle)} to start Activity on new created Task.
-     */
-    @Test
-    @Ignore("b/197364677")
-    public void testStartActivityInTaskFragment_createNewTask() {
-        final TaskFragmentCreationParams params = generateTaskFragCreationParams();
-        final IBinder taskFragToken = params.getFragmentToken();
-        final Intent intent = new Intent()
-                .setComponent(mLaunchingActivity)
-                .addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_MULTIPLE_TASK);
-        final WindowContainerTransaction wct = new WindowContainerTransaction()
-                .createTaskFragment(params)
-                .startActivityInTaskFragment(taskFragToken, mOwnerToken, intent,
-                        null /* activityOptions */);
-        mTaskFragmentOrganizer.applyTransaction(wct);
-
-        mTaskFragmentOrganizer.waitForTaskFragmentCreated();
-
-        TaskFragmentInfo info = mTaskFragmentOrganizer.getTaskFragmentInfo(taskFragToken);
-        assertNotEmptyTaskFragment(info, taskFragToken);
-
-        mWmState.waitForActivityState(mLaunchingActivity, WindowManagerState.STATE_RESUMED);
-
-        Task parentTask = mWmState.getRootTask(mOwnerActivity.getTaskId());
-        TaskFragment taskFragment = mWmState.getTaskFragmentByActivity(mLaunchingActivity);
-        Task childTask = mWmState.getTaskByActivity(mLaunchingActivity);
-
-        // Assert window hierarchy must be as follows
-        // - owner Activity's Task (parentTask)
-        //   - taskFragment
-        //     - new created Task
-        //       - LAUNCHING_ACTIVITY
-        //   - owner Activity
-        assertWindowHierarchy(parentTask, taskFragment, childTask,
-                mWmState.getActivity(mLaunchingActivity));
-        assertWindowHierarchy(parentTask, mWmState.getActivity(mOwnerActivityName));
-    }
-
-    /**
-     * Verifies the behavior of
      * {@link WindowContainerTransaction#deleteTaskFragment(WindowContainerToken)} to remove
      * the organized TaskFragment.
      */
     @Test
     public void testDeleteTaskFragment() {
-        final TaskFragmentCreationParams params = generateTaskFragCreationParams();
-        final IBinder taskFragToken = params.getFragmentToken();
-
-        WindowContainerTransaction wct = new WindowContainerTransaction()
-                .createTaskFragment(params);
-        mTaskFragmentOrganizer.applyTransaction(wct);
-        mTaskFragmentOrganizer.waitForTaskFragmentCreated();
-
-        TaskFragmentInfo info = mTaskFragmentOrganizer.getTaskFragmentInfo(taskFragToken);
-        assertEmptyTaskFragment(info, taskFragToken);
+        final TaskFragmentInfo taskFragmentInfo = createTaskFragment(null);
+        final IBinder taskFragToken = taskFragmentInfo.getFragmentToken();
+        assertEmptyTaskFragment(taskFragmentInfo, taskFragmentInfo.getFragmentToken());
 
         mWmState.computeState(mOwnerActivityName);
         final int originalTaskFragCount = mWmState.getRootTask(mOwnerTaskId).getTaskFragments()
                 .size();
 
-        wct = new WindowContainerTransaction().deleteTaskFragment(info.getToken());
+        WindowContainerTransaction wct = new WindowContainerTransaction()
+                .deleteTaskFragment(taskFragmentInfo.getToken());
         mTaskFragmentOrganizer.applyTransaction(wct);
 
         mTaskFragmentOrganizer.waitForTaskFragmentRemoved();
@@ -277,7 +213,7 @@
         mTaskFragmentOrganizer.applyTransaction(wct);
         mTaskFragmentOrganizer.waitForTaskFragmentCreated();
         // The activity below must be occluded and stopped.
-        waitAndAssertActivityState(mOwnerActivityName, WindowManagerState.STATE_STOPPED,
+        waitAndAssertActivityState(mOwnerActivityName, STATE_STOPPED,
                 "Activity must be stopped");
 
         // Finishing the top activity and remain the TaskFragment on top. The next top activity
@@ -286,8 +222,29 @@
         waitAndAssertResumedActivity(mOwnerActivityName, "Activity must be resumed");
     }
 
-    @NonNull
-    private TaskFragmentCreationParams generateTaskFragCreationParams() {
-        return mTaskFragmentOrganizer.generateTaskFragParams(mOwnerToken);
+    /**
+     * Verifies that config changes with {@link WindowContainerTransaction.Change#getChangeMask()}
+     * are disallowed for embedded TaskFragments.
+     */
+    @Test
+    public void testTaskFragmentConfigChange_disallowChangeMaskChanges() {
+        final TaskFragmentInfo taskFragmentInfo = createTaskFragment(mLaunchingActivity);
+        final WindowContainerToken token = taskFragmentInfo.getToken();
+
+        final WindowContainerTransaction wct0 = new WindowContainerTransaction()
+                .scheduleFinishEnterPip(token, new Rect(0, 0, 100, 100));
+        assertThrows(SecurityException.class, () -> mTaskFragmentOrganizer.applyTransaction(wct0));
+
+        final WindowContainerTransaction wct1 = new WindowContainerTransaction()
+                .setBoundsChangeTransaction(token, new SurfaceControl.Transaction());
+        assertThrows(SecurityException.class, () -> mTaskFragmentOrganizer.applyTransaction(wct1));
+
+        final WindowContainerTransaction wct3 = new WindowContainerTransaction()
+                .setFocusable(token, false /* focusable */);
+        assertThrows(SecurityException.class, () -> mTaskFragmentOrganizer.applyTransaction(wct3));
+
+        final WindowContainerTransaction wct4 = new WindowContainerTransaction()
+                .setHidden(token, false /* hidden */);
+        assertThrows(SecurityException.class, () -> mTaskFragmentOrganizer.applyTransaction(wct4));
     }
 }
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTestBase.java b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTestBase.java
index 34a16a5..49586c4 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTestBase.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentOrganizerTestBase.java
@@ -17,6 +17,7 @@
 package android.server.wm;
 
 import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
+import static android.server.wm.WindowManagerState.STATE_RESUMED;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
@@ -24,10 +25,13 @@
 import static org.junit.Assert.fail;
 
 import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
 import android.content.res.Configuration;
 import android.graphics.Rect;
 import android.os.Binder;
 import android.os.IBinder;
+import android.server.wm.WindowContextTests.TestActivity;
 import android.server.wm.WindowManagerState.WindowContainer;
 import android.util.ArrayMap;
 import android.window.TaskFragmentCreationParams;
@@ -48,6 +52,10 @@
 
 public class TaskFragmentOrganizerTestBase extends WindowManagerTestBase {
     public BasicTaskFragmentOrganizer mTaskFragmentOrganizer;
+    Activity mOwnerActivity;
+    IBinder mOwnerToken;
+    ComponentName mOwnerActivityName;
+    int mOwnerTaskId;
 
     @Before
     @Override
@@ -55,6 +63,21 @@
         super.setUp();
         mTaskFragmentOrganizer = new BasicTaskFragmentOrganizer();
         mTaskFragmentOrganizer.registerOrganizer();
+        mOwnerActivity = setUpOwnerActivity();
+        mOwnerToken = getActivityToken(mOwnerActivity);
+        mOwnerActivityName = mOwnerActivity.getComponentName();
+        mOwnerTaskId = mOwnerActivity.getTaskId();
+        // Make sure the activity is launched and resumed, otherwise the window state may not be
+        // stable.
+        waitAndAssertResumedActivity(mOwnerActivity.getComponentName(),
+                "The owner activity must be resumed.");
+    }
+
+    /** Setups the owner activity of the organized TaskFragment. */
+    Activity setUpOwnerActivity() {
+        // Launch activities in fullscreen in case the device may use freeform as the default
+        // windowing mode.
+        return startActivityInWindowingModeFullScreen(TestActivity.class);
     }
 
     @After
@@ -121,6 +144,58 @@
         }
     }
 
+    /**
+     * Builds, runs and waits for completion of task fragment creation transaction.
+     * @param componentName name of the activity to launch in the TF, or {@code null} if none.
+     * @return token of the created task fragment.
+     */
+    TaskFragmentInfo createTaskFragment(@Nullable ComponentName componentName) {
+        return createTaskFragment(componentName, new Rect());
+    }
+
+    /**
+     * Same as {@link #createTaskFragment(ComponentName)}, but allows to specify the bounds for the
+     * new task fragment.
+     */
+    TaskFragmentInfo createTaskFragment(@Nullable ComponentName componentName,
+            @NonNull Rect bounds) {
+        return createTaskFragment(componentName, bounds, new WindowContainerTransaction());
+    }
+
+    /**
+     * Same as {@link #createTaskFragment(ComponentName, Rect)}, but allows to specify the
+     * {@link WindowContainerTransaction} to use.
+     */
+    TaskFragmentInfo createTaskFragment(@Nullable ComponentName componentName,
+            @NonNull Rect bounds, @NonNull WindowContainerTransaction wct) {
+        final TaskFragmentCreationParams params = generateTaskFragCreationParams(bounds);
+        final IBinder taskFragToken = params.getFragmentToken();
+        wct.createTaskFragment(params);
+        if (componentName != null) {
+            wct.startActivityInTaskFragment(taskFragToken, mOwnerToken,
+                    new Intent().setComponent(componentName), null /* activityOptions */);
+        }
+        mTaskFragmentOrganizer.applyTransaction(wct);
+        mTaskFragmentOrganizer.waitForTaskFragmentCreated();
+
+        if (componentName != null) {
+            mWmState.waitForActivityState(componentName, STATE_RESUMED);
+        }
+
+        return mTaskFragmentOrganizer.getTaskFragmentInfo(taskFragToken);
+    }
+
+    @NonNull
+    TaskFragmentCreationParams generateTaskFragCreationParams() {
+        return mTaskFragmentOrganizer.generateTaskFragParams(mOwnerToken);
+    }
+
+    @NonNull
+    TaskFragmentCreationParams generateTaskFragCreationParams(@NonNull Rect bounds) {
+        return mTaskFragmentOrganizer.generateTaskFragParams(mOwnerToken, bounds,
+                WINDOWING_MODE_UNDEFINED);
+    }
+
     public static class BasicTaskFragmentOrganizer extends TaskFragmentOrganizer {
         private final static int WAIT_TIMEOUT_IN_SECOND = 10;
 
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentTrustedModeTest.java b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentTrustedModeTest.java
new file mode 100644
index 0000000..385a5af
--- /dev/null
+++ b/tests/framework/base/windowmanager/src/android/server/wm/TaskFragmentTrustedModeTest.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm;
+
+import static android.server.wm.WindowManagerState.STATE_RESUMED;
+import static android.server.wm.jetpack.second.Components.SECOND_UNTRUSTED_EMBEDDING_ACTIVITY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.graphics.Rect;
+import android.os.Binder;
+import android.os.IBinder;
+import android.server.wm.WindowManagerState.Task;
+import android.window.TaskFragmentCreationParams;
+import android.window.TaskFragmentInfo;
+import android.window.WindowContainerTransaction;
+
+import androidx.annotation.NonNull;
+
+import org.junit.Test;
+
+/**
+ * Tests that verifies the behaviors of embedding activities in different trusted modes.
+ *
+ * Build/Install/Run:
+ *     atest CtsWindowManagerDeviceTestCases:TaskFragmentTrustedModeTest
+ */
+public class TaskFragmentTrustedModeTest extends TaskFragmentOrganizerTestBase {
+
+    private final ComponentName mTranslucentActivity = new ComponentName(mContext,
+            TranslucentActivity.class);
+
+    /**
+     * Verifies the visibility of a task fragment that has overlays on top of activities embedded
+     * in untrusted mode when there is an overlay over the task fragment.
+     */
+    @Test
+    public void testUntrustedModeTaskFragmentVisibility_overlayTaskFragment() {
+        // Create a task fragment with activity in untrusted mode.
+        final TaskFragmentInfo tf = createTaskFragment(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY);
+
+        // Start a translucent activity over the TaskFragment.
+        createTaskFragment(mTranslucentActivity, partialOverlayBounds(tf));
+        waitAndAssertResumedActivity(mTranslucentActivity, "Translucent activity must be resumed.");
+
+        // The task fragment must be made invisible when there is an overlay activity in it.
+        final String overlayMessage = "Activities embedded in untrusted mode should be made "
+                + "invisible in a task fragment with overlay";
+        waitAndAssertStoppedActivity(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY, overlayMessage);
+        assertFalse(overlayMessage, mWmState.getTaskFragmentByActivity(
+                SECOND_UNTRUSTED_EMBEDDING_ACTIVITY).isVisible());
+
+        // The activity that appeared on top would stay resumed
+        assertTrue(overlayMessage, mWmState.hasActivityState(mTranslucentActivity, STATE_RESUMED));
+        assertTrue(overlayMessage, mWmState.isActivityVisible(mTranslucentActivity));
+        assertTrue(overlayMessage, mWmState.getTaskFragmentByActivity(
+                mTranslucentActivity).isVisible());
+    }
+
+    /**
+     * Verifies the visibility of a task fragment that has overlays on top of activities embedded
+     * in untrusted mode when an activity from another process is started on top.
+     */
+    @Test
+    public void testUntrustedModeTaskFragmentVisibility_startActivityInTaskFragment() {
+        // Create a task fragment with activity in untrusted mode.
+        final TaskFragmentInfo taskFragmentInfo = createTaskFragment(
+                SECOND_UNTRUSTED_EMBEDDING_ACTIVITY);
+
+        // Start an activity with a different UID in the TaskFragment.
+        final WindowContainerTransaction wct = new WindowContainerTransaction()
+                .startActivityInTaskFragment(taskFragmentInfo.getFragmentToken(), mOwnerToken,
+                        new Intent().setComponent(mTranslucentActivity),
+                        null /* activityOptions */);
+        mTaskFragmentOrganizer.applyTransaction(wct);
+        waitAndAssertResumedActivity(mTranslucentActivity, "Translucent activity must be resumed.");
+
+        // Some activities in the task fragment must be made invisible when there is an overlay.
+        final String overlayMessage = "Activities embedded in untrusted mode should be made "
+                + "invisible in a task fragment with overlay";
+        waitAndAssertStoppedActivity(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY, overlayMessage);
+
+        // The activity that appeared on top would stay resumed, and the task fragment is still
+        // visible.
+        assertTrue(overlayMessage, mWmState.hasActivityState(mTranslucentActivity, STATE_RESUMED));
+        assertTrue(overlayMessage, mWmState.isActivityVisible(mTranslucentActivity));
+        assertTrue(overlayMessage, mWmState.getTaskFragmentByActivity(
+                SECOND_UNTRUSTED_EMBEDDING_ACTIVITY).isVisible());
+    }
+
+    /**
+     * Verifies the visibility of a task fragment that has overlays on top of activities embedded
+     * in untrusted mode when an activity from another process is reparented on top.
+     */
+    @Test
+    public void testUntrustedModeTaskFragmentVisibility_reparentActivityInTaskFragment() {
+        final Activity translucentActivity = startActivity(TranslucentActivity.class);
+
+        // Create a task fragment with activity in untrusted mode.
+        final TaskFragmentInfo taskFragmentInfo = createTaskFragment(
+                SECOND_UNTRUSTED_EMBEDDING_ACTIVITY);
+
+        // Reparent a translucent activity with a different UID to the TaskFragment.
+        final IBinder embeddedActivityToken = getActivityToken(translucentActivity);
+        final WindowContainerTransaction wct = new WindowContainerTransaction()
+                .reparentActivityToTaskFragment(taskFragmentInfo.getFragmentToken(),
+                        embeddedActivityToken);
+        mTaskFragmentOrganizer.applyTransaction(wct);
+        waitAndAssertResumedActivity(mTranslucentActivity, "Translucent activity must be resumed.");
+
+        // Some activities in the task fragment must be made invisible when there is an overlay.
+        final String overlayMessage = "Activities embedded in untrusted mode should be made "
+                + "invisible in a task fragment with overlay";
+        waitAndAssertStoppedActivity(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY, overlayMessage);
+
+        // The activity that appeared on top would stay resumed, and the task fragment is still
+        // visible
+        assertTrue(overlayMessage, mWmState.hasActivityState(mTranslucentActivity, STATE_RESUMED));
+        assertTrue(overlayMessage, mWmState.isActivityVisible(mTranslucentActivity));
+        assertTrue(overlayMessage, mWmState.getTaskFragmentByActivity(
+                SECOND_UNTRUSTED_EMBEDDING_ACTIVITY).isVisible());
+
+        // Finishing the overlay activity must make TaskFragment visible again.
+        translucentActivity.finish();
+        waitAndAssertResumedActivity(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY,
+                "Activity must be resumed without overlays");
+        assertTrue("Activity must be visible without overlays",
+                mWmState.isActivityVisible(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY));
+    }
+
+    /**
+     * Verifies that when the TaskFragment has embedded activities in untrusted mode, it is
+     * disallowed to set bounds that is outside of its parent bounds.
+     */
+    @Test
+    public void testUntrustedModeTaskFragment_setBoundsOutsideOfParentBounds() {
+        final Task parentTask = mWmState.getRootTask(mOwnerTaskId);
+        final Rect parentBounds = new Rect(parentTask.getBounds());
+        // Create a TaskFragment with activity embedded in untrusted mode.
+        final TaskFragmentInfo info = createTaskFragment(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY);
+
+        // Try to set bounds that is outside of its parent bounds.
+        mTaskFragmentOrganizer.resetLatch();
+        final Rect taskFragBounds = new Rect(parentBounds);
+        taskFragBounds.right++;
+        final WindowContainerTransaction wct = new WindowContainerTransaction()
+                .setBounds(info.getToken(), taskFragBounds);
+
+        // It is disallowed to set TaskFragment bounds to outside of its parent bounds.
+        assertThrows(SecurityException.class, () -> mTaskFragmentOrganizer.applyTransaction(wct));
+    }
+
+    /**
+     * Verifies that when the TaskFragment has embedded activities in untrusted mode, it is
+     * disallowed to set app bounds that is outside of its parent app bounds.
+     */
+    @Test
+    public void testUntrustedModeTaskFragment_setAppBoundsOutsideOfParentAppBounds() {
+        final Task parentTask = mWmState.getRootTask(mOwnerTaskId);
+        final Rect parentAppBounds =
+                new Rect(parentTask.mFullConfiguration.windowConfiguration.getAppBounds());
+        // Create a TaskFragment with activity embedded in untrusted mode.
+        final TaskFragmentInfo info = createTaskFragment(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY);
+
+        // Try to set app bounds that is outside of its parent app bounds.
+        mTaskFragmentOrganizer.resetLatch();
+        final Rect taskFragAppBounds = new Rect(parentAppBounds);
+        taskFragAppBounds.right++;
+        final WindowContainerTransaction wct = new WindowContainerTransaction()
+                .setAppBounds(info.getToken(), taskFragAppBounds);
+
+        // It is disallowed to set TaskFragment app bounds to outside of its parent app bounds.
+        assertThrows(SecurityException.class, () -> mTaskFragmentOrganizer.applyTransaction(wct));
+    }
+
+    /**
+     * Verifies that when the TaskFragment has embedded activities in untrusted mode, it is
+     * disallowed to set screenWidthDp/screenHeightDp/smallestScreenWidthDp greater than parent's.
+     */
+    @Test
+    public void testUntrustedModeTaskFragment_setSetScreenWidthHeightGreaterThanParent() {
+        final Task parentTask = mWmState.getRootTask(mOwnerTaskId);
+        final int screenWidthDp = parentTask.mFullConfiguration.screenWidthDp;
+        final int screenHeightDp = parentTask.mFullConfiguration.screenHeightDp;
+        final int smallestScreenWidthDp = parentTask.mFullConfiguration.smallestScreenWidthDp;
+        // Create a TaskFragment with activity embedded in untrusted mode.
+        final TaskFragmentInfo info = createTaskFragment(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY);
+
+        // Try to set screenWidthDp greater than parent's.
+        mTaskFragmentOrganizer.resetLatch();
+        final WindowContainerTransaction wct0 = new WindowContainerTransaction()
+                .setScreenSizeDp(info.getToken(), screenWidthDp + 1, screenHeightDp);
+
+        // It is disallowed to set TaskFragment screenWidthDp to be greater than parent's.
+        assertThrows(SecurityException.class, () -> mTaskFragmentOrganizer.applyTransaction(wct0));
+
+        // Try to set screenHeightDp greater than parent's.
+        mTaskFragmentOrganizer.resetLatch();
+        final WindowContainerTransaction wct1 = new WindowContainerTransaction()
+                .setScreenSizeDp(info.getToken(), screenWidthDp, screenHeightDp + 1);
+
+        // It is disallowed to set TaskFragment screenHeightDp to be greater than parent's.
+        assertThrows(SecurityException.class, () -> mTaskFragmentOrganizer.applyTransaction(wct1));
+
+        // Try to set smallestScreenWidthDp greater than parent's.
+        mTaskFragmentOrganizer.resetLatch();
+        final WindowContainerTransaction wct2 = new WindowContainerTransaction()
+                .setSmallestScreenWidthDp(info.getToken(), smallestScreenWidthDp + 1);
+
+        // It is disallowed to set TaskFragment smallestScreenWidthDp to be greater than parent's.
+        assertThrows(SecurityException.class, () -> mTaskFragmentOrganizer.applyTransaction(wct2));
+    }
+
+    /**
+     * Verifies that when the TaskFragment bounds is outside of its parent bounds, it is disallowed
+     * to start activity in untrusted mode.
+     */
+    @Test
+    public void testUntrustedModeTaskFragment_startActivityInTaskFragmentOutsideOfParentBounds() {
+        final Task parentTask = mWmState.getRootTask(mOwnerTaskId);
+        final Rect parentBounds = new Rect(parentTask.getBounds());
+        final IBinder errorCallbackToken = new Binder();
+        final WindowContainerTransaction wct = new WindowContainerTransaction()
+                .setErrorCallbackToken(errorCallbackToken);
+
+        // We check if the TaskFragment bounds is in its parent bounds before launching activity in
+        // untrusted mode.
+        final Rect taskFragBounds = new Rect(parentBounds);
+        taskFragBounds.right++;
+        createTaskFragment(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY, taskFragBounds, wct);
+
+        // It is disallowed to start activity to TaskFragment with bounds outside of its parent
+        // in untrusted mode.
+        assertTaskFragmentError(errorCallbackToken, SecurityException.class);
+        mWmState.waitForAppTransitionIdleOnDisplay(mOwnerActivity.getDisplayId());
+        mWmState.assertNotExist(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY);
+    }
+
+    /**
+     * Verifies that when the TaskFragment bounds is outside of its parent bounds, it is disallowed
+     * to reparent children of a TaskFragment to another in untrusted mode.
+     */
+    @Test
+    public void testUntrustedModeTaskFragment_reparentChildrenOutsideOfParentBounds() {
+        // Create a TaskFragment with activity in trusted mode with bounds outside of its parent.
+        final Task parentTask = mWmState.getRootTask(mOwnerTaskId);
+        final Rect parentBounds = new Rect(parentTask.getBounds());
+        final Rect taskFragBounds = new Rect(parentBounds);
+        taskFragBounds.right++;
+        final TaskFragmentCreationParams params1 = generateTaskFragCreationParams(
+                taskFragBounds);
+        final IBinder taskFragToken = params1.getFragmentToken();
+        final WindowContainerTransaction wct1 = new WindowContainerTransaction()
+                .createTaskFragment(params1)
+                .reparentActivityToTaskFragment(taskFragToken, mOwnerToken);
+        mTaskFragmentOrganizer.applyTransaction(wct1);
+        mTaskFragmentOrganizer.waitForTaskFragmentCreated();
+        final TaskFragmentInfo info1 = mTaskFragmentOrganizer.getTaskFragmentInfo(taskFragToken);
+
+        // Create a TaskFragment with activity in untrusted mode.
+        mTaskFragmentOrganizer.resetLatch();
+        final TaskFragmentInfo info2 = createTaskFragment(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY);
+        waitAndAssertResumedActivity(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY,
+                "Untrusted embedding activity must be resumed.");
+        final Rect activityBounds = new Rect(mWmState
+                .getActivity(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY).getBounds());
+
+        // Reparent children of the untrusted TaskFragment to the TaskFragment with larger bounds.
+        mTaskFragmentOrganizer.resetLatch();
+        final IBinder errorCallbackToken = new Binder();
+        final WindowContainerTransaction wct2 = new WindowContainerTransaction()
+                .setErrorCallbackToken(errorCallbackToken)
+                .reparentChildren(info2.getToken(), info1.getToken());
+        mTaskFragmentOrganizer.applyTransaction(wct2);
+
+        // It is disallowed to reparent children to TaskFragment with bounds outside of its parent
+        // in untrusted mode.
+        assertTaskFragmentError(errorCallbackToken, SecurityException.class);
+        mWmState.waitForAppTransitionIdleOnDisplay(mOwnerActivity.getDisplayId());
+        assertEquals(activityBounds,
+                mWmState.getActivity(SECOND_UNTRUSTED_EMBEDDING_ACTIVITY).getBounds());
+    }
+
+    /**
+     * Creates bounds for a container that would appear on top and partially occlude the provided
+     * one.
+     */
+    @NonNull
+    private Rect partialOverlayBounds(@NonNull TaskFragmentInfo info) {
+        final Rect baseBounds = info.getConfiguration().windowConfiguration.getBounds();
+        final Rect result = new Rect(baseBounds);
+        result.inset(50 /* left */, 50 /* top */, 50 /* right */, 50 /* bottom */);
+        return result;
+    }
+
+    /** Asserts that the organizer received an error callback. */
+    private void assertTaskFragmentError(@NonNull IBinder errorCallbackToken,
+            @NonNull Class<? extends Throwable> exceptionClass) {
+        mTaskFragmentOrganizer.waitForTaskFragmentError();
+        assertThat(mTaskFragmentOrganizer.getThrowable()).isInstanceOf(exceptionClass);
+        assertThat(mTaskFragmentOrganizer.getErrorCallbackToken()).isEqualTo(errorCallbackToken);
+    }
+
+    public static class TranslucentActivity extends FocusableActivity {}
+}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/ToastWindowTest.java b/tests/framework/base/windowmanager/src/android/server/wm/ToastWindowTest.java
index db90054..4741f39 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/ToastWindowTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/ToastWindowTest.java
@@ -19,10 +19,7 @@
 import static android.server.wm.app.Components.ClickableToastActivity.ACTION_TOAST_DISPLAYED;
 import static android.server.wm.app.Components.ClickableToastActivity.ACTION_TOAST_TAP_DETECTED;
 
-import static com.google.common.truth.Truth.assertThat;
-
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
@@ -92,7 +89,7 @@
         IntentFilter filter = new IntentFilter();
         filter.addAction(ACTION_TOAST_DISPLAYED);
         filter.addAction(ACTION_TOAST_TAP_DETECTED);
-        mContext.registerReceiver(mAppCommunicator, filter);
+        mContext.registerReceiver(mAppCommunicator, filter, Context.RECEIVER_EXPORTED);
     }
 
     @After
@@ -134,7 +131,7 @@
         WindowState toastWindow = wmState.findFirstWindowWithType(LayoutParams.TYPE_TOAST);
         assertNotNull("Couldn't retrieve toast window", toastWindow);
 
-        tapOnCenter(toastWindow.getContainingFrame(), toastWindow.getDisplayId());
+        tapOnCenter(toastWindow.getParentFrame(), toastWindow.getDisplayId());
 
         boolean toastClicked = getBroadcastReceivedVariable(ACTION_TOAST_TAP_DETECTED).block(
                 TOAST_TAP_TIMEOUT_MS);
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInputTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInputTests.java
index 322355f..2e29a74 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInputTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInputTests.java
@@ -73,12 +73,11 @@
 import java.util.ArrayList;
 import java.util.Random;
 import java.util.Set;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeoutException;
 
 /**
  * Ensure moving windows and tapping is done synchronously.
@@ -728,9 +727,10 @@
         eventHover.setSource(InputDevice.SOURCE_MOUSE);
         try {
             mInstrumentation.sendPointerSync(eventHover);
-            fail("Not allowed to inject event to the window from another process.");
-        } catch (SecurityException e) {
-            // Should not be allowed to inject event to the window from another process.
+            fail("Not allowed to inject to windows owned by another uid from Instrumentation.");
+        } catch (RuntimeException e) {
+            // Should not be allowed to inject event to a window owned by another uid from the
+            // Instrumentation class.
         }
     }
 
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationSynchronicityTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationSynchronicityTests.java
index 8e28903..20bce66 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationSynchronicityTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsAnimationSynchronicityTests.java
@@ -62,6 +62,7 @@
 
 import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.SystemUtil;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -96,7 +97,7 @@
         try (ImeSession imeSession = new ImeSession(SimpleIme.getName(mContext))) {
             TestActivity activity = launchActivity();
             activity.setUseControlApi(useControlApi);
-            PollingCheck.waitFor(activity::hasWindowFocus);
+            WindowUtil.waitForFocus(activity);
             activity.setEvaluator(() -> {
                 // This runs from time to time on the UI thread.
                 Bitmap screenshot = getInstrumentation().getUiAutomation().takeScreenshot();
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsControllerTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsControllerTests.java
index 054da4c..aa19b08 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsControllerTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsControllerTests.java
@@ -28,6 +28,8 @@
 import static android.view.WindowInsets.Type.statusBars;
 import static android.view.WindowInsets.Type.systemBars;
 import static android.view.WindowInsets.Type.systemGestures;
+import static android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS;
+import static android.view.WindowInsetsController.APPEARANCE_LIGHT_STATUS_BARS;
 import static android.view.WindowInsetsController.BEHAVIOR_DEFAULT;
 import static android.view.WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE;
 import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
@@ -63,13 +65,11 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.ViewParent;
 import android.view.Window;
 import android.view.WindowInsets;
 import android.view.WindowInsetsAnimation;
 import android.view.WindowInsetsController;
 import android.view.WindowManager;
-import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -247,6 +247,42 @@
     }
 
     @Test
+    public void testSetSystemBarsAppearance() {
+        final TestActivity activity = startActivity(TestActivity.class);
+        final View rootView = activity.getWindow().getDecorView();
+        final WindowInsetsController controller = rootView.getWindowInsetsController();
+        getInstrumentation().runOnMainSync(() -> {
+            // Set APPEARANCE_LIGHT_STATUS_BARS.
+            controller.setSystemBarsAppearance(
+                    APPEARANCE_LIGHT_STATUS_BARS, APPEARANCE_LIGHT_STATUS_BARS);
+
+            // Clear APPEARANCE_LIGHT_NAVIGATION_BARS.
+            controller.setSystemBarsAppearance(
+                    0 /* appearance */, APPEARANCE_LIGHT_NAVIGATION_BARS);
+        });
+        waitForIdle();
+
+        // We must have APPEARANCE_LIGHT_STATUS_BARS, but not APPEARANCE_LIGHT_NAVIGATION_BARS.
+        assertEquals(APPEARANCE_LIGHT_STATUS_BARS,
+                controller.getSystemBarsAppearance()
+                        & (APPEARANCE_LIGHT_STATUS_BARS | APPEARANCE_LIGHT_NAVIGATION_BARS));
+
+        final boolean[] onPreDrawCalled = { false };
+        rootView.getViewTreeObserver().addOnPreDrawListener(() -> {
+            onPreDrawCalled[0] = true;
+            return true;
+        });
+
+        // Clear APPEARANCE_LIGHT_NAVIGATION_BARS again.
+        getInstrumentation().runOnMainSync(() -> controller.setSystemBarsAppearance(
+                0 /* appearance */, APPEARANCE_LIGHT_NAVIGATION_BARS));
+        waitForIdle();
+
+        assertFalse("Setting the same appearance must not cause a new traversal",
+                onPreDrawCalled[0]);
+    }
+
+    @Test
     public void testSetSystemBarsBehavior_default() throws InterruptedException {
         final TestActivity activity = startActivityInWindowingModeFullScreen(TestActivity.class);
         final View rootView = activity.getWindow().getDecorView();
@@ -521,7 +557,8 @@
 
     @Test
     public void testHideOnCreate() throws Exception {
-        final TestHideOnCreateActivity activity = startActivity(TestHideOnCreateActivity.class);
+        final TestHideOnCreateActivity activity =
+                startActivityInWindowingModeFullScreen(TestHideOnCreateActivity.class);
         final View rootView = activity.getWindow().getDecorView();
         ANIMATION_CALLBACK.waitForFinishing();
         PollingCheck.waitFor(TIMEOUT,
@@ -641,7 +678,8 @@
 
     @Test
     public void testWindowInsetsController_availableAfterAddView() throws Exception {
-        final TestHideOnCreateActivity activity = startActivity(TestHideOnCreateActivity.class);
+        final TestHideOnCreateActivity activity =
+                startActivityInWindowingModeFullScreen(TestHideOnCreateActivity.class);
         final View rootView = activity.getWindow().getDecorView();
         ANIMATION_CALLBACK.waitForFinishing();
         PollingCheck.waitFor(TIMEOUT,
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsPolicyTest.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsPolicyTest.java
index ab057d7..806cee5 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsPolicyTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowInsetsPolicyTest.java
@@ -17,6 +17,7 @@
 package android.server.wm;
 
 import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
+import static android.provider.Settings.Secure.IMMERSIVE_MODE_CONFIRMATIONS;
 import static android.server.wm.app.Components.LAUNCHING_ACTIVITY;
 import static android.view.Surface.ROTATION_0;
 import static android.view.Surface.ROTATION_180;
@@ -38,6 +39,8 @@
 import android.graphics.Insets;
 import android.os.Bundle;
 import android.platform.test.annotations.Presubmit;
+import android.provider.Settings;
+import android.server.wm.settings.SettingsSession;
 import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
@@ -47,10 +50,11 @@
 
 import androidx.test.rule.ActivityTestRule;
 
-import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.hamcrest.CustomTypeSafeMatcher;
 import org.hamcrest.Matcher;
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
@@ -65,6 +69,8 @@
 
     private ComponentName mTestActivityComponentName;
 
+    private SettingsSession<String> mImmersiveModeConfirmationSetting;
+
     @Rule
     public final ErrorCollector mErrorCollector = new ErrorCollector();
 
@@ -93,6 +99,18 @@
     public void setUp() throws Exception {
         super.setUp();
         mTestActivityComponentName = new ComponentName(mContext, TestActivity.class);
+        mImmersiveModeConfirmationSetting = new SettingsSession<>(
+                Settings.Secure.getUriFor(IMMERSIVE_MODE_CONFIRMATIONS),
+                Settings.Secure::getString, Settings.Secure::putString);
+        mImmersiveModeConfirmationSetting.set("confirmed");
+
+    }
+
+    @After
+    public void tearDown() {
+        if (mImmersiveModeConfirmationSetting != null) {
+            mImmersiveModeConfirmationSetting.close();
+        }
     }
 
     @Test
@@ -259,7 +277,7 @@
 
     private <T extends Activity> T launchAndWait(ActivityTestRule<T> rule) {
         final T activity = rule.launchActivity(null);
-        PollingCheck.waitFor(activity::hasWindowFocus);
+        WindowUtil.waitForFocus(activity);
         return activity;
     }
 
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowMetricsTestHelper.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowMetricsTestHelper.java
index 6fbfe36..eb99a02 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowMetricsTestHelper.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowMetricsTestHelper.java
@@ -17,6 +17,7 @@
 package android.server.wm;
 
 import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
+import static android.server.wm.ActivityManagerTestBase.isTablet;
 import static android.view.WindowInsets.Type.displayCutout;
 import static android.view.WindowInsets.Type.navigationBars;
 import static android.view.WindowInsets.Type.statusBars;
@@ -119,6 +120,11 @@
      * @param display the display to compare bounds against
      */
     static void assertBoundsMatchDisplay(Rect maxBounds, Rect currentBounds, Display display) {
+        // TODO(b/224404595): remove the logic after we can revert ag/17076728 back.
+        if (isTablet()) {
+            return;
+        }
+
         // Check window bounds
         final Point displaySize = new Point();
         display.getSize(displaySize);
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java
index 0791f78..f3ed79f 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowTest.java
@@ -315,7 +315,7 @@
         v.clearFocus();
         assertNull(mWindow.getCurrentFocus());
 
-        v.setFocusable(true);
+        v.setFocusableInTouchMode(true);
         assertTrue(v.isFocusable());
         assertTrue(v.requestFocus());
         View focus = mWindow.getCurrentFocus();
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowUntrustedTouchTest.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowUntrustedTouchTest.java
index a4c163a..2c458e9 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowUntrustedTouchTest.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowUntrustedTouchTest.java
@@ -22,7 +22,6 @@
 import static android.server.wm.UiDeviceUtils.pressUnlockButton;
 import static android.server.wm.UiDeviceUtils.pressWakeupButton;
 import static android.server.wm.WindowManagerState.STATE_RESUMED;
-import static android.server.wm.overlay.Components.OverlayActivity.EXTRA_TOKEN;
 import static android.view.WindowInsets.Type.navigationBars;
 
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
@@ -237,10 +236,10 @@
     }
 
     @Test
-    public void testWhenFeatureInDisabledModeAndActivityWindowAbove_allowsTouch()
+    public void testWhenFeatureInDisabledModeAndOneSawWindowAbove_allowsTouch()
             throws Throwable {
         setBlockUntrustedTouchesMode(FEATURE_MODE_DISABLED);
-        addActivityOverlay(APP_A, /* opacity */ .9f);
+        addSawOverlay(APP_A, WINDOW_1, /* opacity */ .9f);
 
         mTouchHelper.tapOnViewCenter(mContainer);
 
@@ -248,10 +247,10 @@
     }
 
     @Test
-    public void testWhenFeatureInPermissiveModeAndActivityWindowAbove_allowsTouch()
+    public void testWhenFeatureInPermissiveModeAndOneSawWindowAbove_allowsTouch()
             throws Throwable {
         setBlockUntrustedTouchesMode(FEATURE_MODE_PERMISSIVE);
-        addActivityOverlay(APP_A, /* opacity */ .9f);
+        addSawOverlay(APP_A, WINDOW_1, /* opacity */ .9f);
 
         mTouchHelper.tapOnViewCenter(mContainer);
 
@@ -518,14 +517,15 @@
         assertTouchNotReceived();
     }
 
+    /** Blocked due to b/194480991 */
     @Test
-    public void testWhenOneActivityWindowWithZeroOpacity_allowsTouch()
+    public void testWhenOneActivityWindowWithZeroOpacity_blocksTouch()
             throws Throwable {
         addActivityOverlay(APP_A, /* opacity */ 0f);
 
         mTouchHelper.tapOnViewCenter(mContainer);
 
-        assertTouchReceived();
+        assertTouchNotReceived();
     }
 
     @Test
@@ -549,8 +549,9 @@
     }
 
     @Test
-    public void testWhenOneSelfActivityWindow_allowsTouch() throws Throwable {
-        addActivityOverlay(APP_SELF, /* opacity */ .9f);
+    public void testWhenOneSelfActivityChildWindow_allowsTouch() throws Throwable {
+        IBinder token = mActivity.getWindow().getAttributes().token;
+        addActivityChildWindow(APP_SELF, WINDOW_1, token);
 
         mTouchHelper.tapOnViewCenter(mContainer);
 
@@ -637,39 +638,6 @@
         assertTouchReceived();
     }
 
-    @Test
-    public void testWhenActivityChildWindowWithDifferentTokenFromDifferentApp_blocksTouch()
-            throws Exception {
-        // Creates a new activity with 0 opacity
-        BlockingResultReceiver receiver = new BlockingResultReceiver();
-        addActivityOverlay(APP_A, /* opacity */ 0f, receiver);
-        // Verify it allows touches
-        mTouchHelper.tapOnViewCenter(mContainer);
-        assertTouchReceived();
-        // Now get its token and put a child window from another app with it
-        IBinder token = receiver.getData(TIMEOUT_MS).getBinder(EXTRA_TOKEN);
-        addActivityChildWindow(APP_B, WINDOW_1, token);
-
-        mTouchHelper.tapOnViewCenter(mContainer);
-
-        assertTouchNotReceived();
-    }
-
-    @Test
-    public void testWhenActivityChildWindowWithDifferentTokenFromSameApp_allowsTouch()
-            throws Exception {
-        // Creates a new activity with 0 opacity
-        BlockingResultReceiver receiver = new BlockingResultReceiver();
-        addActivityOverlay(APP_A, /* opacity */ 0f, receiver);
-        // Now get its token and put a child window owned by us
-        IBinder token = receiver.getData(TIMEOUT_MS).getBinder(EXTRA_TOKEN);
-        addActivityChildWindow(APP_SELF, WINDOW_1, token);
-
-        mTouchHelper.tapOnViewCenter(mContainer);
-
-        assertTouchReceived();
-    }
-
     /** Activity transitions */
 
     @Test
@@ -693,6 +661,13 @@
         assertThat(durationSet).isGreaterThan(
                 MAX_ANIMATION_DURATION_MS + ANIMATION_DURATION_TOLERANCE_MS);
         addExitAnimationActivity(APP_A);
+
+        // Wait for ExitAnimationActivity open transition to complete to avoid counting this
+        // transition in the duration of the exit animation below. Otherwise
+        // waitForAppTransitionRunningOnDisplay might return immediately if this transition is not
+        // done by then instead of waiting for the exit animation to start running.
+        assertTrue(mWmState.waitForAppTransitionIdleOnDisplay(Display.DEFAULT_DISPLAY));
+
         sendFinishToExitAnimationActivity(APP_A,
                 Components.ExitAnimationActivityReceiver.EXTRA_VALUE_LONG_ANIMATION_0_7);
         assertTrue(mWmState.waitForAppTransitionRunningOnDisplay(Display.DEFAULT_DISPLAY));
@@ -739,6 +714,12 @@
     @Test
     public void testWhenExitAnimationBelowThreshold_allowsTouch() {
         addExitAnimationActivity(APP_A);
+
+        // Wait for ExitAnimationActivity open transition to complete to avoid
+        // waitForAppTransitionRunningOnDisplay returning immediately if this transition is not
+        // done by then instead of waiting for the exit animation to start running.
+        assertTrue(mWmState.waitForAppTransitionIdleOnDisplay(Display.DEFAULT_DISPLAY));
+
         sendFinishToExitAnimationActivity(APP_A,
                 Components.ExitAnimationActivityReceiver.EXTRA_VALUE_ANIMATION_0_7);
         assertTrue(mWmState.waitForAppTransitionRunningOnDisplay(Display.DEFAULT_DISPLAY));
@@ -851,10 +832,11 @@
     }
 
     @Test
-    public void testWhenOneSelfCustomToastWindowOneSelfActivityWindowAndOneSawBelowThreshold_allowsTouch()
+    public void testWhenOneSelfCustomToastOneSelfActivityChildAndOneSawBelowThreshold_allowsTouch()
             throws Throwable {
-        addActivityOverlay(APP_SELF, /* opacity */ .9f);
-        addSawOverlay(APP_A, WINDOW_1, .5f);
+        IBinder token = mActivity.getWindow().getAttributes().token;
+        addActivityChildWindow(APP_SELF, WINDOW_1, token);
+        addSawOverlay(APP_A, WINDOW_2, .5f);
         addToastOverlay(APP_SELF, /* custom */ true);
 
         mTouchHelper.tapOnViewCenter(mContainer);
@@ -972,7 +954,7 @@
             @AnimRes int enterAnim, @AnimRes int exitAnim) {
         ConditionVariable animationsStarted = new ConditionVariable(false);
         ActivityOptions options = ActivityOptions.makeCustomAnimation(mContext, enterAnim, exitAnim,
-                mMainHandler, animationsStarted::open, /* finishedListener */ null);
+                0, mMainHandler, animationsStarted::open, /* finishedListener */ null);
         // We're testing the opacity coming from the animation here, not the one declared in the
         // activity, so we set its opacity to 1
         addActivityOverlay(packageName, /* opacity */ 1, touchable, options.toBundle());
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/lifecycle/ActivityStarterTests.java b/tests/framework/base/windowmanager/src/android/server/wm/lifecycle/ActivityStarterTests.java
index 7571a56..22ef041 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/lifecycle/ActivityStarterTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/lifecycle/ActivityStarterTests.java
@@ -32,7 +32,6 @@
 import static android.server.wm.app.Components.SHOW_WHEN_LOCKED_TRANSLUCENT_ACTIVITY;
 import static android.server.wm.app.Components.TEST_ACTIVITY;
 import static android.server.wm.lifecycle.LifecycleLog.ActivityCallback.ON_STOP;
-import static android.view.Display.DEFAULT_DISPLAY;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -40,22 +39,15 @@
 import static org.junit.Assume.assumeTrue;
 
 import android.app.Activity;
-import android.app.WindowConfiguration;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.Bundle;
 import android.platform.test.annotations.Presubmit;
 import android.server.wm.ActivityLauncher;
-import android.server.wm.WindowManagerState;
 import android.server.wm.app.Components;
-import android.util.Log;
-import android.view.WindowManager;
 
 import org.junit.Test;
 
-import java.util.List;
-import java.util.function.Predicate;
-
 /**
  * Build/Install/Run:
  *     atest CtsWindowManagerDeviceTestCases:ActivityStarterTests
diff --git a/tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java b/tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java
index 331db92..1b11bd2 100644
--- a/tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java
+++ b/tests/framework/base/windowmanager/util/src/android/server/wm/ActivityManagerTestBase.java
@@ -34,6 +34,7 @@
 import static android.content.pm.PackageManager.FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS;
 import static android.content.pm.PackageManager.FEATURE_AUTOMOTIVE;
 import static android.content.pm.PackageManager.FEATURE_EMBEDDED;
+import static android.content.pm.PackageManager.FEATURE_EXPANDED_PICTURE_IN_PICTURE;
 import static android.content.pm.PackageManager.FEATURE_FREEFORM_WINDOW_MANAGEMENT;
 import static android.content.pm.PackageManager.FEATURE_INPUT_METHODS;
 import static android.content.pm.PackageManager.FEATURE_LEANBACK;
@@ -45,6 +46,7 @@
 import static android.content.pm.PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE;
 import static android.content.pm.PackageManager.FEATURE_WATCH;
 import static android.content.pm.PackageManager.MATCH_DEFAULT_ONLY;
+import static android.os.UserHandle.USER_SYSTEM;
 import static android.server.wm.ActivityLauncher.KEY_ACTIVITY_TYPE;
 import static android.server.wm.ActivityLauncher.KEY_DISPLAY_ID;
 import static android.server.wm.ActivityLauncher.KEY_INTENT_EXTRAS;
@@ -75,6 +77,7 @@
 import static android.server.wm.UiDeviceUtils.pressWakeupButton;
 import static android.server.wm.UiDeviceUtils.waitForDeviceIdle;
 import static android.server.wm.WindowManagerState.STATE_RESUMED;
+import static android.server.wm.WindowManagerState.STATE_STOPPED;
 import static android.server.wm.app.Components.BROADCAST_RECEIVER_ACTIVITY;
 import static android.server.wm.app.Components.BroadcastReceiverActivity.ACTION_TRIGGER_BROADCAST;
 import static android.server.wm.app.Components.BroadcastReceiverActivity.EXTRA_BROADCAST_ORIENTATION;
@@ -85,10 +88,13 @@
 import static android.server.wm.app.Components.BroadcastReceiverActivity.EXTRA_MOVE_BROADCAST_TO_BACK;
 import static android.server.wm.app.Components.LAUNCHING_ACTIVITY;
 import static android.server.wm.app.Components.LaunchingActivity.KEY_FINISH_BEFORE_LAUNCH;
+import static android.server.wm.app.Components.PipActivity.ACTION_CHANGE_ASPECT_RATIO;
 import static android.server.wm.app.Components.PipActivity.ACTION_EXPAND_PIP;
 import static android.server.wm.app.Components.PipActivity.ACTION_SET_REQUESTED_ORIENTATION;
 import static android.server.wm.app.Components.PipActivity.ACTION_UPDATE_PIP_STATE;
 import static android.server.wm.app.Components.PipActivity.EXTRA_PIP_ORIENTATION;
+import static android.server.wm.app.Components.PipActivity.EXTRA_SET_ASPECT_RATIO_DENOMINATOR;
+import static android.server.wm.app.Components.PipActivity.EXTRA_SET_ASPECT_RATIO_NUMERATOR;
 import static android.server.wm.app.Components.PipActivity.EXTRA_SET_ASPECT_RATIO_WITH_DELAY_DENOMINATOR;
 import static android.server.wm.app.Components.PipActivity.EXTRA_SET_ASPECT_RATIO_WITH_DELAY_NUMERATOR;
 import static android.server.wm.app.Components.PipActivity.EXTRA_SET_PIP_CALLBACK;
@@ -99,12 +105,12 @@
 import static android.view.Display.DEFAULT_DISPLAY;
 import static android.view.Display.INVALID_DISPLAY;
 import static android.view.Surface.ROTATION_0;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
 import static android.view.WindowManager.LayoutParams.TYPE_BASE_APPLICATION;
 
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -154,12 +160,14 @@
 import android.util.DisplayMetrics;
 import android.util.EventLog;
 import android.util.EventLog.Event;
+import android.util.Size;
 import android.view.Display;
 import android.view.View;
 import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 
 import com.android.compatibility.common.util.AppOpsUtils;
@@ -177,10 +185,8 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Objects;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -213,6 +219,7 @@
         testPackages.add(THIRD_TEST_PACKAGE);
         testPackages.add("android.server.wm.cts");
         testPackages.add("android.server.wm.jetpack");
+        testPackages.add("android.server.wm.jetpack.second");
         TEST_PACKAGES = Collections.unmodifiableList(testPackages);
     }
 
@@ -231,12 +238,13 @@
     private static final int UI_MODE_TYPE_VR_HEADSET = 0x07;
 
     static final boolean ENABLE_SHELL_TRANSITIONS =
-            SystemProperties.getBoolean("persist.debug.shell_transit", false);
+            SystemProperties.getBoolean("persist.wm.debug.shell_transit", false);
 
     private static Boolean sHasHomeScreen = null;
     private static Boolean sSupportsSystemDecorsOnSecondaryDisplays = null;
     private static Boolean sSupportsInsecureLockScreen = null;
     private static Boolean sIsAssistantOnTop = null;
+    private static Boolean sIsTablet = null;
     private static boolean sIllegalTaskStateFound;
 
     protected static final int INVALID_DEVICE_ROTATION = -1;
@@ -323,6 +331,11 @@
         return "am start --activity-task-on-home -n " + getActivityName(activityName);
     }
 
+    protected static String getAmStartCmdWithDismissKeyguardIfInsecure(
+            final ComponentName activityName) {
+        return "am start --dismiss-keyguard-if-insecure -n " + getActivityName(activityName);
+    }
+
     protected WindowManagerStateHelper mWmState = new WindowManagerStateHelper();
     protected TouchHelper mTouchHelper = new TouchHelper(mInstrumentation, mWmState);
     // Initialized in setUp to execute with proper permission, such as MANAGE_ACTIVITY_TASKS
@@ -422,6 +435,12 @@
             mContext.sendBroadcast(createIntentWithAction(ACTION_SET_REQUESTED_ORIENTATION)
                     .putExtra(EXTRA_PIP_ORIENTATION, String.valueOf(orientation)));
         }
+
+        void changeAspectRatio(int numerator, int denominator) {
+            mContext.sendBroadcast(createIntentWithAction(ACTION_CHANGE_ASPECT_RATIO)
+                    .putExtra(EXTRA_SET_ASPECT_RATIO_NUMERATOR, Integer.toString(numerator))
+                    .putExtra(EXTRA_SET_ASPECT_RATIO_DENOMINATOR, Integer.toString(denominator)));
+        }
     }
 
     /**
@@ -781,6 +800,11 @@
         mWmState.waitForValidState(activityName);
     }
 
+    protected void launchActivityWithDismissKeyguardIfInsecure(final ComponentName activityName) {
+        executeShellCommand(getAmStartCmdWithDismissKeyguardIfInsecure(activityName));
+        mWmState.waitForValidState(activityName);
+    }
+
     protected static void waitForIdle() {
         getInstrumentation().waitForIdleSync();
     }
@@ -997,6 +1021,10 @@
                 || PRETEND_DEVICE_SUPPORTS_PIP;
     }
 
+    protected boolean supportsExpandedPip() {
+        return hasDeviceFeature(FEATURE_EXPANDED_PICTURE_IN_PICTURE);
+    }
+
     protected boolean supportsFreeform() {
         return hasDeviceFeature(FEATURE_FREEFORM_WINDOW_MANAGEMENT)
                 || PRETEND_DEVICE_SUPPORTS_FREEFORM;
@@ -1038,9 +1066,20 @@
         return hasDeviceFeature(FEATURE_TELEVISION);
     }
 
-    protected boolean isTablet() {
-        // Larger than approx 7" tablets
-        return mContext.getResources().getConfiguration().smallestScreenWidthDp >= 600;
+    public static boolean isTablet() {
+        if (sIsTablet == null) {
+            // Use WindowContext with type application overlay to prevent the metrics overridden by
+            // activity bounds. Note that process configuration may still be overridden by
+            // foreground Activity.
+            final Context appContext = ApplicationProvider.getApplicationContext();
+            final Display defaultDisplay = appContext.getSystemService(DisplayManager.class)
+                    .getDisplay(DEFAULT_DISPLAY);
+            final Context windowContext = appContext.createWindowContext(defaultDisplay,
+                    TYPE_APPLICATION_OVERLAY, null /* options */);
+            sIsTablet = windowContext.getResources()
+                    .getConfiguration().smallestScreenWidthDp >= 600;
+        }
+        return sIsTablet;
     }
 
     protected boolean isOperatorTierDevice() {
@@ -1099,6 +1138,21 @@
         mWmState.assertVisibility(activityName, true /* visible */);
     }
 
+    /**
+     * Waits and asserts that the activity represented by the given activity name is stopped and
+     * invisible.
+     *
+     * @param activityName the activity name
+     * @param message the error message
+     */
+    public void waitAndAssertStoppedActivity(ComponentName activityName, String message) {
+        mWmState.waitForValidState(activityName);
+        mWmState.waitForActivityState(activityName, STATE_STOPPED);
+        mWmState.assertValidity();
+        assertTrue(message, mWmState.hasActivityState(activityName, STATE_STOPPED));
+        mWmState.assertVisibility(activityName, false /* visible */);
+    }
+
     // TODO: Switch to using a feature flag, when available.
     protected static boolean isUiModeLockedToVrHeadset() {
         final String output = runCommandAndPrintOutput("dumpsys uimode");
@@ -1302,31 +1356,20 @@
         return mObjectTracker.manage(new FontScaleSession());
     }
 
+    /** Allows requesting orientation in case ignore_orientation_request is set to true. */
+    protected void disableIgnoreOrientationRequest() {
+        mObjectTracker.manage(new IgnoreOrientationRequestSession(DEFAULT_DISPLAY, false));
+    }
+
     /**
      * Test @Rule class that disables screen doze settings before each test method running and
      * restoring to initial values after test method finished.
      */
-    protected static class DisableScreenDozeRule implements TestRule {
+    protected class DisableScreenDozeRule implements TestRule {
+        AmbientDisplayConfiguration mConfig;
 
-        /** Copied from android.provider.Settings.Secure since these keys are hidden. */
-        private static final String[] DOZE_SETTINGS = {
-                "doze_enabled",
-                "doze_always_on",
-                "doze_pulse_on_pick_up",
-                "doze_pulse_on_long_press",
-                "doze_pulse_on_double_tap",
-                "doze_wake_screen_gesture",
-                "doze_wake_display_gesture",
-                "doze_tap_gesture",
-                "doze_quick_pickup_gesture"
-        };
-
-        private String get(String key) {
-            return executeShellCommand("settings get secure " + key).trim();
-        }
-
-        private void put(String key, String value) {
-            executeShellCommand("settings put secure " + key + " " + value);
+        DisableScreenDozeRule() {
+            mConfig = new AmbientDisplayConfiguration(mContext);
         }
 
         @Override
@@ -1334,13 +1377,18 @@
             return new Statement() {
                 @Override
                 public void evaluate() throws Throwable {
-                    final Map<String, String> initialValues = new HashMap<>();
-                    Arrays.stream(DOZE_SETTINGS).forEach(k -> initialValues.put(k, get(k)));
                     try {
-                        Arrays.stream(DOZE_SETTINGS).forEach(k -> put(k, "0"));
+                        SystemUtil.runWithShellPermissionIdentity(() -> {
+                            // disable current doze settings
+                            mConfig.disableDozeSettings(true /* shouldDisableNonUserConfigurable */,
+                                    USER_SYSTEM);
+                        });
                         base.evaluate();
                     } finally {
-                        Arrays.stream(DOZE_SETTINGS).forEach(k -> put(k, initialValues.get(k)));
+                        SystemUtil.runWithShellPermissionIdentity(() -> {
+                            // restore doze settings
+                            mConfig.restoreDozeSettings(USER_SYSTEM);
+                        });
                     }
                 }
             };
@@ -1472,7 +1520,7 @@
             return this;
         }
 
-        LockScreenSession unlockDevice() {
+        public LockScreenSession unlockDevice() {
             // Make sure the unlock button event is send to the default display.
             touchAndCancelOnDisplayCenterSync(DEFAULT_DISPLAY);
 
@@ -2689,4 +2737,106 @@
                             + mDisplayId);
         }
     }
+
+    public static class ReportedDisplayMetrics {
+        private static final String WM_SIZE = "wm size";
+        private static final String WM_DENSITY = "wm density";
+        private static final Pattern PHYSICAL_SIZE =
+                Pattern.compile("Physical size: (\\d+)x(\\d+)");
+        private static final Pattern OVERRIDE_SIZE =
+                Pattern.compile("Override size: (\\d+)x(\\d+)");
+        private static final Pattern PHYSICAL_DENSITY =
+                Pattern.compile("Physical density: (\\d+)");
+        private static final Pattern OVERRIDE_DENSITY =
+                Pattern.compile("Override density: (\\d+)");
+
+        /** The size of the physical display. */
+        @NonNull
+        final Size physicalSize;
+        /** The density of the physical display. */
+        final int physicalDensity;
+
+        /** The pre-existing size override applied to a logical display. */
+        @Nullable
+        final Size overrideSize;
+        /** The pre-existing density override applied to a logical display. */
+        @Nullable
+        final Integer overrideDensity;
+
+        final int mDisplayId;
+
+        /** Get physical and override display metrics from WM for specified display. */
+        public static ReportedDisplayMetrics getDisplayMetrics(int displayId) {
+            return new ReportedDisplayMetrics(executeShellCommand(WM_SIZE + " -d " + displayId)
+                    + executeShellCommand(WM_DENSITY + " -d " + displayId), displayId);
+        }
+
+        public void setDisplayMetrics(final Size size, final int density) {
+            setSize(size);
+            setDensity(density);
+        }
+
+        public void restoreDisplayMetrics() {
+            if (overrideSize != null) {
+                setSize(overrideSize);
+            } else {
+                executeShellCommand(WM_SIZE + " reset -d " + mDisplayId);
+            }
+            if (overrideDensity != null) {
+                setDensity(overrideDensity);
+            } else {
+                executeShellCommand(WM_DENSITY + " reset -d " + mDisplayId);
+            }
+        }
+
+        public void setSize(final Size size) {
+            executeShellCommand(
+                    WM_SIZE + " " + size.getWidth() + "x" + size.getHeight() + " -d " + mDisplayId);
+        }
+
+        public void setDensity(final int density) {
+            executeShellCommand(WM_DENSITY + " " + density + " -d " + mDisplayId);
+        }
+
+        /** Get display size that WM operates with. */
+        public Size getSize() {
+            return overrideSize != null ? overrideSize : physicalSize;
+        }
+
+        /** Get density that WM operates with. */
+        public int getDensity() {
+            return overrideDensity != null ? overrideDensity : physicalDensity;
+        }
+
+        private ReportedDisplayMetrics(final String lines, int displayId) {
+            mDisplayId = displayId;
+            Matcher matcher = PHYSICAL_SIZE.matcher(lines);
+            assertTrue("Physical display size must be reported", matcher.find());
+            log(matcher.group());
+            physicalSize = new Size(
+                    Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)));
+
+            matcher = PHYSICAL_DENSITY.matcher(lines);
+            assertTrue("Physical display density must be reported", matcher.find());
+            log(matcher.group());
+            physicalDensity = Integer.parseInt(matcher.group(1));
+
+            matcher = OVERRIDE_SIZE.matcher(lines);
+            if (matcher.find()) {
+                log(matcher.group());
+                overrideSize = new Size(
+                        Integer.parseInt(matcher.group(1)), Integer.parseInt(matcher.group(2)));
+            } else {
+                overrideSize = null;
+            }
+
+            matcher = OVERRIDE_DENSITY.matcher(lines);
+            if (matcher.find()) {
+                log(matcher.group());
+                overrideDensity = Integer.parseInt(matcher.group(1));
+            } else {
+                overrideDensity = null;
+            }
+        }
+    }
 }
diff --git a/tests/framework/base/windowmanager/util/src/android/server/wm/CommandSession.java b/tests/framework/base/windowmanager/util/src/android/server/wm/CommandSession.java
index b56b748..a98f546 100644
--- a/tests/framework/base/windowmanager/util/src/android/server/wm/CommandSession.java
+++ b/tests/framework/base/windowmanager/util/src/android/server/wm/CommandSession.java
@@ -403,7 +403,8 @@
             mThread = new HandlerThread(mClientId);
             mThread.start();
             context.registerReceiver(this, new IntentFilter(mClientId),
-                    null /* broadcastPermission */, new Handler(mThread.getLooper()));
+                    null /* broadcastPermission */, new Handler(mThread.getLooper()),
+                    Context.RECEIVER_EXPORTED);
         }
 
         /** Start the activity by the given intent and wait it becomes idle. */
@@ -558,7 +559,7 @@
             mHostId = hostId;
             mClientId = clientId;
             mCallback = callback;
-            context.registerReceiver(this, new IntentFilter(hostId));
+            context.registerReceiver(this, new IntentFilter(hostId), Context.RECEIVER_EXPORTED);
         }
 
         @Override
diff --git a/tests/framework/base/windowmanager/util/src/android/server/wm/DreamCoordinator.java b/tests/framework/base/windowmanager/util/src/android/server/wm/DreamCoordinator.java
new file mode 100644
index 0000000..f1015a5
--- /dev/null
+++ b/tests/framework/base/windowmanager/util/src/android/server/wm/DreamCoordinator.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2022 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 android.server.wm;
+
+import android.app.DreamManager;
+import android.content.ComponentName;
+import android.content.Context;
+
+import static org.junit.Assume.assumeTrue;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+public class DreamCoordinator {
+    private Context mContext;
+    private boolean mSetup;
+    private boolean mDefaultDreamServiceEnabled;
+    private DreamManager mDreamManager;
+
+    public DreamCoordinator(Context context) {
+        mContext = context;
+        mDreamManager = mContext.getSystemService(DreamManager.class);
+    }
+
+    public final ComponentName getDreamActivityName(ComponentName dream) {
+        return new ComponentName(dream.getPackageName(),
+                "android.service.dreams.DreamActivity");
+    }
+
+    /**
+     * Sets up the system to show dreams. If system doesn't support dreams, returns {@code false}.
+     */
+    public void setup() {
+        assumeTrue(mDreamManager.areDreamsSupported());
+
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            mDefaultDreamServiceEnabled = mDreamManager.isScreensaverEnabled();
+            if (!mDefaultDreamServiceEnabled) {
+                mDreamManager.setScreensaverEnabled(true);
+            }
+        });
+
+        mSetup = true;
+    }
+
+    /**
+     * Restores any settings changed by {@link #setup()}.
+     */
+    public void restoreDefaults() {
+        // If we have not setup the coordinator, do not do anything.
+        if (!mSetup) {
+            return;
+        }
+
+        mSetup = false;
+
+        // Nothing to restore if dreams are enabled by default.
+        if (mDefaultDreamServiceEnabled) {
+            return;
+        }
+
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> mDreamManager.setScreensaverEnabled(false));
+    }
+
+    public void startDream(ComponentName name) {
+        SystemUtil.runWithShellPermissionIdentity(() -> mDreamManager.startDream(name));
+    }
+
+    public void stopDream() {
+        SystemUtil.runWithShellPermissionIdentity(() -> mDreamManager.stopDream());
+    }
+
+    public  ComponentName setActiveDream(ComponentName dream) {
+        SystemUtil.runWithShellPermissionIdentity(() -> mDreamManager.setActiveDream(dream));
+        return getDreamActivityName(dream);
+    }
+
+    public boolean isDreaming() {
+        return SystemUtil.runWithShellPermissionIdentity(() -> mDreamManager.isDreaming());
+    }
+}
diff --git a/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerState.java b/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerState.java
index 55b2b62..6d84290 100644
--- a/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerState.java
+++ b/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerState.java
@@ -29,6 +29,7 @@
 import static android.server.wm.TestTaskOrganizer.INVALID_TASK_ID;
 import static android.util.DisplayMetrics.DENSITY_DEFAULT;
 import static android.view.Display.DEFAULT_DISPLAY;
+import static android.window.DisplayAreaOrganizer.FEATURE_IME;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
@@ -42,10 +43,10 @@
 import android.content.res.Configuration;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.graphics.nano.RectProto;
 import android.os.ParcelFileDescriptor;
 import android.os.SystemClock;
 import android.util.SparseArray;
-import android.view.WindowManager;
 import android.view.nano.DisplayInfoProto;
 import android.view.nano.ViewProtoEnums;
 
@@ -144,7 +145,6 @@
     private String mFocusedWindow = null;
     private String mFocusedApp = null;
     private Boolean mIsHomeRecentsComponent;
-    private int mDefaultMinSizeOfResizableTaskDp;
     private String mTopResumedActivityRecord = null;
     final List<String> mResumedActivitiesInRootTasks = new ArrayList<>();
     final List<String> mResumedActivitiesInDisplays = new ArrayList<>();
@@ -153,6 +153,7 @@
     private String mInputMethodWindowAppToken = null;
     private boolean mDisplayFrozen;
     private boolean mSanityCheckFocusedWindow = true;
+    private boolean mWindowFramesValid;
 
     static String appStateToString(int appState) {
         switch (appState) {
@@ -323,6 +324,7 @@
 
             retry = mRootTasks.isEmpty() || mTopFocusedTaskId == -1 || mWindowStates.isEmpty()
                     || mFocusedApp == null || (mSanityCheckFocusedWindow && mFocusedWindow == null)
+                    || !mWindowFramesValid
                     || (mTopResumedActivityRecord == null
                     || mResumedActivitiesInRootTasks.isEmpty())
                     && !mKeyguardControllerState.keyguardShowing;
@@ -349,6 +351,9 @@
         if (mFocusedApp == null) {
             logE("No Focused App...");
         }
+        if (!mWindowFramesValid) {
+            logE("Window Frames Invalid...");
+        }
     }
 
     private byte[] executeShellCommand(String cmd) {
@@ -421,7 +426,6 @@
             mTopResumedActivityRecord = focusedDisplay.mResumedActivity;
         }
         mIsHomeRecentsComponent = new Boolean(root.isHomeRecentsComponent);
-        mDefaultMinSizeOfResizableTaskDp = root.defaultMinSizeResizableTask;
 
         for (int i = 0; i < root.pendingActivities.length; i++) {
             mPendingActivities.add(root.pendingActivities[i].title);
@@ -433,6 +437,7 @@
             mInputMethodWindowAppToken = Integer.toHexString(state.inputMethodWindow.hashCode);
         }
         mDisplayFrozen = state.displayFrozen;
+        mWindowFramesValid = state.windowFramesValid;
     }
 
     private void reset() {
@@ -454,6 +459,7 @@
         mPinnedStackMovementBounds.setEmpty();
         mInputMethodWindowAppToken = null;
         mDisplayFrozen = false;
+        mWindowFramesValid = false;
     }
 
     public String getFocusedApp() {
@@ -511,6 +517,15 @@
         return result.stream().findFirst().orElse(null);
     }
 
+    @Nullable
+    public DisplayArea getImeContainer(int displayId) {
+        final DisplayContent displayContent = getDisplay(displayId);
+        if (displayContent == null) {
+            return null;
+        }
+        return displayContent.getImeContainer();
+    }
+
     int getFrontRootTaskId(int displayId) {
         return getDisplay(displayId).mRootTasks.get(0).mRootTaskId;
     }
@@ -1095,6 +1110,10 @@
         return mFocusedDisplayId;
     }
 
+    public boolean isFixedToUserRotation() {
+        return getDisplay(DEFAULT_DISPLAY).mIsFixedToUserRotation;
+    }
+
     public static class DisplayContent extends DisplayArea {
         public int mId;
         ArrayList<Task> mRootTasks = new ArrayList<>();
@@ -1103,6 +1122,7 @@
         boolean mSingleTaskInstance;
         Rect mDefaultPinnedStackBounds = null;
         Rect mPinnedStackMovementBounds = null;
+        int mMinSizeOfResizeableTaskDp;
 
         private Rect mDisplayRect = new Rect();
         private Rect mAppRect = new Rect();
@@ -1118,6 +1138,8 @@
         private int mUserRotation;
         private int mFixedToUserRotationMode;
         private int mLastOrientation;
+        private boolean mIsFixedToUserRotation;
+        private List<Rect> mKeepClearRects;
 
         DisplayContent(DisplayContentProto proto) {
             super(proto.rootDisplayArea);
@@ -1140,6 +1162,7 @@
             final DisplayFramesProto displayFramesProto = proto.displayFrames;
             mSurfaceSize = proto.surfaceSize;
             mFocusedApp = proto.focusedApp;
+            mMinSizeOfResizeableTaskDp = proto.minSizeOfResizeableTaskDp;
 
             final AppTransitionProto appTransitionProto = proto.appTransition;
             int appState = 0;
@@ -1164,6 +1187,11 @@
                 mUserRotation = rotationProto.userRotation;
                 mFixedToUserRotationMode = rotationProto.fixedToUserRotationMode;
                 mLastOrientation = rotationProto.lastOrientation;
+                mIsFixedToUserRotation = rotationProto.isFixedToUserRotation;
+            }
+            mKeepClearRects = new ArrayList();
+            for (RectProto r : proto.keepClearAreas) {
+                mKeepClearRects.add(new Rect(r.left, r.top, r.right, r.bottom));
             }
         }
 
@@ -1251,6 +1279,18 @@
             return result.stream().findFirst().orElse(null);
         }
 
+        @NonNull
+        DisplayArea getImeContainer() {
+            final List<DisplayArea> imeContainers = new ArrayList<>();
+            final Predicate<DisplayArea> p = da -> da.getFeatureId() == FEATURE_IME;
+            collectDescendantsOfTypeIf(DisplayArea.class, p, this, imeContainers);
+
+            assertWithMessage("There must be exactly one ImeContainer per DisplayContent.")
+                    .that(imeContainers.size()).isEqualTo(1);
+
+            return imeContainers.get(0);
+        }
+
         ArrayList<Task> getRootTasks() {
             return mRootTasks;
         }
@@ -1283,6 +1323,8 @@
 
         String getAppTransitionState() { return mAppTransitionState; }
 
+        List<Rect> getKeepClearRects() { return mKeepClearRects; }
+
         @Override
         public String toString() {
             return "Display #" + mId + ": name=" + mName + " mDisplayRect=" + mDisplayRect
@@ -1316,7 +1358,8 @@
                 && dc.mFrozenToUserRotation == mFrozenToUserRotation
                 && dc.mUserRotation == mUserRotation
                 && dc.mFixedToUserRotationMode == mFixedToUserRotationMode
-                && dc.mLastOrientation == mLastOrientation;
+                && dc.mLastOrientation == mLastOrientation
+                && dc.mIsFixedToUserRotation == mIsFixedToUserRotation;
         }
 
         @Override
@@ -1342,6 +1385,7 @@
             result = 31 * result + mUserRotation;
             result = 31 * result + mFixedToUserRotationMode;
             result = 31 * result + mLastOrientation;
+            result = 31 * result + Boolean.hashCode(mIsFixedToUserRotation);
             return result;
         }
     }
@@ -1605,6 +1649,7 @@
         int procId = -1;
         public boolean translucent;
         private WindowContainer mParent;
+        private boolean mEnableRecentsScreenshot;
 
         Activity(ActivityRecordProto proto, WindowContainer parent) {
             super(proto.windowToken.windowContainer);
@@ -1619,6 +1664,7 @@
                 procId = proto.procId;
             }
             translucent = proto.translucent;
+            mEnableRecentsScreenshot = proto.enableRecentsScreenshot;
             mParent = parent;
         }
 
@@ -1658,6 +1704,10 @@
             return providesMaxBounds;
         }
 
+        public boolean enableRecentsScreenshot() {
+            return mEnableRecentsScreenshot;
+        }
+
         @Override
         public Rect getBounds() {
             if (mBounds == null) {
@@ -1712,9 +1762,9 @@
             if (proto != null) {
                 aodShowing = proto.aodShowing;
                 keyguardShowing = proto.keyguardShowing;
-                for (int i = 0;  i < proto.keyguardOccludedStates.length; i++) {
-                    mKeyguardOccludedStates.append(proto.keyguardOccludedStates[i].displayId,
-                            proto.keyguardOccludedStates[i].keyguardOccluded);
+                for (int i = 0;  i < proto.keyguardPerDisplay.length; i++) {
+                    mKeyguardOccludedStates.append(proto.keyguardPerDisplay[i].displayId,
+                            proto.keyguardPerDisplay[i].keyguardOccluded);
                 }
             }
         }
@@ -1801,7 +1851,7 @@
             return mFeatureId;
         }
 
-        boolean isOrganized() {
+        public boolean isOrganized() {
             return mIsOrganized;
         }
 
@@ -1960,17 +2010,18 @@
         private int mStackId;
         private int mLayer;
         private boolean mShown;
-        private Rect mContainingFrame;
         private Rect mParentFrame;
         private Rect mFrame;
         private Rect mCompatFrame;
-        private Rect mSurfaceInsets = new Rect();
-        private Rect mGivenContentInsets = new Rect();
+        private Rect mSurfaceInsets;
+        private Rect mGivenContentInsets;
         private Rect mCrop = new Rect();
         private boolean mHasCompatScale;
         private float mGlobalScale;
         private int mRequestedWidth;
         private int mRequestedHeight;
+        private List<Rect> mKeepClearRects;
+        private List<Rect> mUnrestrictedKeepClearRects;
 
         WindowState(WindowStateProto proto) {
             super(proto.windowContainer);
@@ -1992,7 +2043,6 @@
             WindowFramesProto windowFramesProto = proto.windowFrames;
             if (windowFramesProto != null) {
                 mFrame = extract(windowFramesProto.frame);
-                mContainingFrame = extract(windowFramesProto.containingFrame);
                 mParentFrame = extract(windowFramesProto.parentFrame);
                 mCompatFrame = extract(windowFramesProto.compatFrame);
             }
@@ -2014,6 +2064,14 @@
             mGlobalScale = proto.globalScale;
             mRequestedWidth = proto.requestedWidth;
             mRequestedHeight = proto.requestedHeight;
+            mKeepClearRects = new ArrayList();
+            for (RectProto r : proto.keepClearAreas) {
+                mKeepClearRects.add(new Rect(r.left, r.top, r.right, r.bottom));
+            }
+            mUnrestrictedKeepClearRects = new ArrayList();
+            for (RectProto r : proto.unrestrictedKeepClearAreas) {
+                mUnrestrictedKeepClearRects.add(new Rect(r.left, r.top, r.right, r.bottom));
+            }
         }
 
         boolean isStartingWindow() {
@@ -2036,10 +2094,6 @@
             return mStackId;
         }
 
-        Rect getContainingFrame() {
-            return mContainingFrame;
-        }
-
         public Rect getFrame() {
             return mFrame;
         }
@@ -2088,6 +2142,14 @@
             return mRequestedHeight;
         }
 
+        public List<Rect> getKeepClearRects() {
+            return mKeepClearRects;
+        }
+
+        public List<Rect> getUnrestrictedKeepClearRects() {
+            return mUnrestrictedKeepClearRects;
+        }
+
         private String getWindowTypeSuffix(int windowType) {
             switch (windowType) {
                 case WINDOW_TYPE_STARTING:
@@ -2106,7 +2168,7 @@
         public String toString() {
             return "WindowState: {" + mAppToken + " " + mName
                     + getWindowTypeSuffix(mWindowType) + "}" + " type=" + mType
-                    + " cf=" + mContainingFrame + " pf=" + mParentFrame;
+                    + " pf=" + mParentFrame;
         }
 
         public String toLongString() {
@@ -2120,7 +2182,8 @@
     }
 
     int defaultMinimalTaskSize(int displayId) {
-        return dpToPx(mDefaultMinSizeOfResizableTaskDp, getDisplay(displayId).getDpi());
+        final DisplayContent dc = getDisplay(displayId);
+        return dpToPx(dc.mMinSizeOfResizeableTaskDp, dc.getDpi());
     }
 
     int defaultMinimalDisplaySizeForSplitScreen(int displayId) {
diff --git a/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerStateHelper.java b/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerStateHelper.java
index 0f0e512..c6d96f4 100644
--- a/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerStateHelper.java
+++ b/tests/framework/base/windowmanager/util/src/android/server/wm/WindowManagerStateHelper.java
@@ -227,16 +227,13 @@
     }
 
     /**
-     * Wait for orientation for the Activity
+     * Wait for the configuration orientation of the Activity.
      */
-    public void waitForActivityOrientation(ComponentName activityName, int orientation) {
-        waitForWithAmState(amState -> {
-            final Task task = amState.getTaskByActivity(activityName);
-            if (task == null) {
-                return false;
-            }
-            return task.mFullConfiguration.orientation == orientation;
-        }, "orientation of " + getActivityName(activityName) + " to be " + orientation);
+    public boolean waitForActivityOrientation(ComponentName activityName, int configOrientation) {
+        return waitForWithAmState(amState -> {
+            final Activity activity = amState.getActivity(activityName);
+            return activity != null && activity.mFullConfiguration.orientation == configOrientation;
+        }, "orientation of " + getActivityName(activityName) + " to be " + configOrientation);
     }
 
     public void waitForDisplayUnfrozen() {
@@ -320,7 +317,7 @@
         }, windowName + "'s surface is disappeared");
     }
 
-    void waitAndAssertWindowSurfaceShown(String windowName, boolean shown) {
+    public void waitAndAssertWindowSurfaceShown(String windowName, boolean shown) {
         assertTrue(
                 waitForWithAmState(state -> state.isWindowSurfaceShown(windowName) == shown,
                         windowName + "'s  isWindowSurfaceShown to return " + shown));
@@ -668,7 +665,7 @@
     }
 
     /**
-     * Asserts that the device default display minimim width is larger than the minimum task width.
+     * Asserts that the device default display minimum width is larger than the minimum task width.
      */
     void assertDeviceDefaultDisplaySizeForMultiWindow(String errorMessage) {
         computeState();
@@ -779,6 +776,17 @@
         return getInputMethodWindowState();
     }
 
+    /**
+     * @return the window state for the given {@param activityName}'s window.
+     */
+    WindowState getWindowState(ComponentName activityName) {
+        String windowName = getWindowName(activityName);
+        computeState(activityName);
+        final List<WindowManagerState.WindowState> tempWindowList =
+                getMatchingVisibleWindowState(windowName);
+        return tempWindowList.get(0);
+    }
+
     boolean isScreenPortrait(int displayId) {
         final Rect displayRect = getDisplay(displayId).getDisplayRect();
         return displayRect.height() > displayRect.width();
diff --git a/tests/input/AndroidManifest.xml b/tests/input/AndroidManifest.xml
index f019c8f..01adb86 100644
--- a/tests/input/AndroidManifest.xml
+++ b/tests/input/AndroidManifest.xml
@@ -39,11 +39,19 @@
 
         <activity android:name="android.input.cts.IncompleteMotionActivity"
                   android:label="IncompleteMotion activity"
-                  android:turnScreenOn="true">
+                  android:turnScreenOn="true"
+                  android:exported="true">
         </activity>
         <activity android:name="android.input.cts.CaptureEventActivity"
                   android:label="Capture events"
-                  android:turnScreenOn="true">
+                  android:configChanges="orientation|screenSize|screenLayout|keyboardHidden|uiMode|navigation|keyboard|density|fontScale|layoutDirection|locale|mcc|mnc|smallestScreenSize"
+                  android:turnScreenOn="true"
+                  android:exported="true">
+        </activity>
+        <activity android:name="android.app.Activity"
+                  android:label="Empty activity for simple tests"
+                  android:turnScreenOn="true"
+                  android:exported="true">
         </activity>
     </application>
 
diff --git a/tests/input/res/raw/test_keyboard_register.json b/tests/input/res/raw/test_keyboard_register.json
new file mode 100644
index 0000000..bc2e4a4
--- /dev/null
+++ b/tests/input/res/raw/test_keyboard_register.json
@@ -0,0 +1,14 @@
+{
+    "id": 1,
+    "type": "uinput",
+    "command": "register",
+    "name": "Test Keyboard (USB)",
+    "vid": 0x18d1,
+    "pid": 0xabcd,
+    "bus": "usb",
+    "configuration":[
+        {"type": 100, "data": [1]},  // UI_SET_EVBIT : EV_KEY
+        // UI_SET_KEYBIT : KEY_Q, KEY_W, KEY_E, KEY_A, KEY_B, KEY_C
+        {"type": 101, "data": [16, 17, 18, 30, 48, 46]}
+    ]
+}
diff --git a/tests/input/src/android/input/cts/AppKeyCombinationsTest.kt b/tests/input/src/android/input/cts/AppKeyCombinationsTest.kt
new file mode 100644
index 0000000..53f70d1
--- /dev/null
+++ b/tests/input/src/android/input/cts/AppKeyCombinationsTest.kt
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2021 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 android.input.cts
+
+import android.view.KeyEvent
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SmallTest
+import androidx.test.platform.app.InstrumentationRegistry
+import com.android.compatibility.common.util.PollingCheck
+import com.android.compatibility.common.util.ShellUtils
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.Assert.assertEquals
+
+/**
+ * Tests for the common key combinations should be consumed by app first.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4::class)
+class AppKeyCombinationsTest {
+    @get:Rule
+    var activityRule = ActivityScenarioRule(CaptureEventActivity::class.java)
+    private lateinit var activity: CaptureEventActivity
+    private val instrumentation = InstrumentationRegistry.getInstrumentation()
+
+    @Before
+    fun setUp() {
+        activityRule.getScenario().onActivity {
+            activity = it
+        }
+        PollingCheck.waitFor { activity.hasWindowFocus() }
+        instrumentation.uiAutomation.syncInputTransactions()
+    }
+
+    @Test
+    fun testCtrlSpace() {
+        ShellUtils.runShellCommand("input keycombination CTRL_LEFT SPACE")
+        assertKeyEvent(KeyEvent.KEYCODE_CTRL_LEFT, KeyEvent.ACTION_DOWN, 0)
+        assertKeyEvent(KeyEvent.KEYCODE_SPACE, KeyEvent.ACTION_DOWN, META_CTRL)
+        assertKeyEvent(KeyEvent.KEYCODE_CTRL_LEFT, KeyEvent.ACTION_UP, META_CTRL)
+        assertKeyEvent(KeyEvent.KEYCODE_SPACE, KeyEvent.ACTION_UP, 0)
+    }
+
+    @Test
+    fun testCtrlAltZ() {
+        ShellUtils.runShellCommand("input keycombination CTRL_LEFT ALT_LEFT Z")
+        assertKeyEvent(KeyEvent.KEYCODE_CTRL_LEFT, KeyEvent.ACTION_DOWN, 0)
+        assertKeyEvent(KeyEvent.KEYCODE_ALT_LEFT, KeyEvent.ACTION_DOWN, META_CTRL)
+        assertKeyEvent(KeyEvent.KEYCODE_Z, KeyEvent.ACTION_DOWN, META_CTRL or META_ALT)
+        assertKeyEvent(KeyEvent.KEYCODE_CTRL_LEFT, KeyEvent.ACTION_UP, META_CTRL or META_ALT)
+        assertKeyEvent(KeyEvent.KEYCODE_ALT_LEFT, KeyEvent.ACTION_UP, META_ALT)
+        assertKeyEvent(KeyEvent.KEYCODE_Z, KeyEvent.ACTION_UP, 0)
+    }
+
+    @Test
+    fun testSYSRQ() {
+        ShellUtils.runShellCommand("input keyevent KEYCODE_SYSRQ")
+        assertKeyEvent(KeyEvent.KEYCODE_SYSRQ, KeyEvent.ACTION_DOWN, 0)
+        assertKeyEvent(KeyEvent.KEYCODE_SYSRQ, KeyEvent.ACTION_UP, 0)
+    }
+
+    private fun assertKeyEvent(keyCode: Int, action: Int, metaState: Int) {
+        val event = activity.getInputEvent() as KeyEvent
+        assertEquals(keyCode, event.keyCode)
+        assertEquals(action, event.action)
+        assertEquals(0, event.flags)
+        assertEquals(metaState, event.metaState)
+    }
+
+    companion object {
+        const val META_CTRL = KeyEvent.META_CTRL_ON or KeyEvent.META_CTRL_LEFT_ON
+        const val META_ALT = KeyEvent.META_ALT_ON or KeyEvent.META_ALT_LEFT_ON
+    }
+}
diff --git a/tests/input/src/android/input/cts/CaptureEventActivity.kt b/tests/input/src/android/input/cts/CaptureEventActivity.kt
index 4f5caad..73c911d 100644
--- a/tests/input/src/android/input/cts/CaptureEventActivity.kt
+++ b/tests/input/src/android/input/cts/CaptureEventActivity.kt
@@ -24,29 +24,29 @@
 import java.util.concurrent.TimeUnit
 
 class CaptureEventActivity : Activity() {
-    private val mEvents = LinkedBlockingQueue<InputEvent>()
+    private val events = LinkedBlockingQueue<InputEvent>()
 
     override fun dispatchGenericMotionEvent(ev: MotionEvent?): Boolean {
-        mEvents.add(MotionEvent.obtain(ev))
+        events.add(MotionEvent.obtain(ev))
         return true
     }
 
     override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
-        mEvents.add(MotionEvent.obtain(ev))
+        events.add(MotionEvent.obtain(ev))
         return true
     }
 
     override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
-        mEvents.add(KeyEvent(event))
+        events.add(KeyEvent(event))
         return true
     }
 
     override fun dispatchTrackballEvent(ev: MotionEvent?): Boolean {
-        mEvents.add(MotionEvent.obtain(ev))
+        events.add(MotionEvent.obtain(ev))
         return true
     }
 
-    fun getLastInputEvent(): InputEvent? {
-        return mEvents.poll(5, TimeUnit.SECONDS)
+    fun getInputEvent(): InputEvent? {
+        return events.poll(5, TimeUnit.SECONDS)
     }
 }
diff --git a/tests/input/src/android/input/cts/GamepadWithAccessibilityTest.kt b/tests/input/src/android/input/cts/GamepadWithAccessibilityTest.kt
index 4b8adaa..7fbac02 100644
--- a/tests/input/src/android/input/cts/GamepadWithAccessibilityTest.kt
+++ b/tests/input/src/android/input/cts/GamepadWithAccessibilityTest.kt
@@ -22,11 +22,12 @@
 import android.view.InputDevice
 import android.view.KeyCharacterMap.VIRTUAL_KEYBOARD
 import android.view.KeyEvent
+import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.ActivityTestRule
 import com.android.compatibility.common.util.PollingCheck
+import com.android.cts.input.UinputDevice
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
@@ -37,12 +38,9 @@
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import com.android.cts.input.InputJsonParser
-import com.android.cts.input.UinputDevice
-
 private fun setTouchExplorationEnabled(instrumentation: Instrumentation, enabled: Boolean) {
         val TIMEOUT_FOR_SERVICE_ENABLE_MILLIS: Long = 10_000 // 10s
-        var manager: AccessibilityManager =
+        val manager: AccessibilityManager =
             instrumentation.getTargetContext().getSystemService(AccessibilityManager::class.java)
 
         val uiAutomation = instrumentation.getUiAutomation()
@@ -70,21 +68,22 @@
 @RunWith(AndroidJUnit4::class)
 class GamepadWithAccessibilityTest {
     @get:Rule
-    var mActivityRule: ActivityTestRule<CaptureEventActivity> =
-            ActivityTestRule(CaptureEventActivity::class.java)
-    lateinit var mActivity: CaptureEventActivity
-    val mInstrumentation = InstrumentationRegistry.getInstrumentation()
+    val activityRule = ActivityScenarioRule(CaptureEventActivity::class.java)
+    private lateinit var activity: CaptureEventActivity
+    private val instrumentation = InstrumentationRegistry.getInstrumentation()
 
     @Before
     fun setUp() {
-        mActivity = mActivityRule.getActivity()
-        PollingCheck.waitFor { mActivity.hasWindowFocus() }
-        setTouchExplorationEnabled(mInstrumentation, true)
+        activityRule.getScenario().onActivity {
+            activity = it
+        }
+        PollingCheck.waitFor { activity.hasWindowFocus() }
+        setTouchExplorationEnabled(instrumentation, true)
     }
 
     @After
     fun tearDown() {
-        setTouchExplorationEnabled(mInstrumentation, false)
+        setTouchExplorationEnabled(instrumentation, false)
     }
 
     /**
@@ -93,14 +92,8 @@
      */
     @Test
     fun testDeviceId() {
-        val resourceId = R.raw.google_gamepad_register
-
-        val parser = InputJsonParser(mInstrumentation.getTargetContext())
-        val resourceDeviceId = parser.readDeviceId(resourceId)
-        val registerCommand = parser.readRegisterCommand(resourceId)
-        val uInputDevice = UinputDevice(mInstrumentation, resourceDeviceId,
-                parser.readVendorId(resourceId), parser.readProductId(resourceId),
-                InputDevice.SOURCE_KEYBOARD, registerCommand)
+        val uinputDevice = UinputDevice.create(instrumentation, R.raw.google_gamepad_register,
+                InputDevice.SOURCE_KEYBOARD)
 
         val EV_SYN = 0
         val SYN_REPORT = 0
@@ -109,14 +102,14 @@
         val EV_KEY_UP = 0
         val BTN_GAMEPAD = 0x130
         val evdevEventsDown = intArrayOf(EV_KEY, BTN_GAMEPAD, EV_KEY_DOWN, EV_SYN, SYN_REPORT, 0)
-        uInputDevice.injectEvents(evdevEventsDown.joinToString(prefix = "[", postfix = "]",
+        uinputDevice.injectEvents(evdevEventsDown.joinToString(prefix = "[", postfix = "]",
                 separator = ","))
 
         val evdevEventsUp = intArrayOf(EV_KEY, BTN_GAMEPAD, EV_KEY_UP, EV_SYN, SYN_REPORT, 0)
-        uInputDevice.injectEvents(evdevEventsUp.joinToString(prefix = "[", postfix = "]",
+        uinputDevice.injectEvents(evdevEventsUp.joinToString(prefix = "[", postfix = "]",
                 separator = ","))
 
-        val lastInputEvent = mActivity.getLastInputEvent()
+        val lastInputEvent = activity.getInputEvent()
         assertNotNull(lastInputEvent)
         assertTrue(lastInputEvent is KeyEvent)
         val keyEvent = lastInputEvent as KeyEvent
@@ -124,6 +117,6 @@
         // KeyEvent.FLAG_IS_ACCESSIBILITY_EVENT in getFlags()
         assertEquals(KeyEvent.FLAG_FROM_SYSTEM, keyEvent.getFlags())
         assertNotEquals(keyEvent.getDeviceId(), VIRTUAL_KEYBOARD)
-        assertEquals(keyEvent.getDeviceId(), uInputDevice.getDeviceId())
+        assertEquals(keyEvent.getDeviceId(), uinputDevice.getDeviceId())
     }
 }
diff --git a/tests/input/src/android/input/cts/IncompleteMotionActivity.kt b/tests/input/src/android/input/cts/IncompleteMotionActivity.kt
index ac7cc3b..706619d 100644
--- a/tests/input/src/android/input/cts/IncompleteMotionActivity.kt
+++ b/tests/input/src/android/input/cts/IncompleteMotionActivity.kt
@@ -21,15 +21,15 @@
 import java.util.concurrent.atomic.AtomicBoolean
 
 class IncompleteMotionActivity : Activity() {
-    private val mReceivedMove = AtomicBoolean(false)
+    private val receivedMove = AtomicBoolean(false)
     override fun onTouchEvent(event: MotionEvent): Boolean {
         if (event.action == MotionEvent.ACTION_MOVE) {
-            mReceivedMove.set(true)
+            receivedMove.set(true)
         }
         return true
     }
 
     fun receivedMove(): Boolean {
-        return mReceivedMove.get()
+        return receivedMove.get()
     }
 }
diff --git a/tests/input/src/android/input/cts/IncompleteMotionTest.kt b/tests/input/src/android/input/cts/IncompleteMotionTest.kt
index 26ae69a..d39958e 100644
--- a/tests/input/src/android/input/cts/IncompleteMotionTest.kt
+++ b/tests/input/src/android/input/cts/IncompleteMotionTest.kt
@@ -28,10 +28,10 @@
 import android.view.MotionEvent.ACTION_DOWN
 import android.view.MotionEvent.ACTION_MOVE
 import android.view.View
+import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.ActivityTestRule
 import com.android.compatibility.common.util.PollingCheck
 import org.junit.Before
 import org.junit.Rule
@@ -54,13 +54,13 @@
  * When OverlayActivity receives focus, it will send out the OVERLAY_ACTIVITY_FOCUSED broadcast.
  */
 class OverlayFocusedBroadcastReceiver : BroadcastReceiver() {
-    private val mIsFocused = AtomicBoolean(false)
+    private val isFocused = AtomicBoolean(false)
     override fun onReceive(context: Context, intent: Intent) {
-        mIsFocused.set(true)
+        isFocused.set(true)
     }
 
     fun overlayActivityIsFocused(): Boolean {
-        return mIsFocused.get()
+        return isFocused.get()
     }
 }
 
@@ -78,15 +78,16 @@
 @RunWith(AndroidJUnit4::class)
 class IncompleteMotionTest {
     @get:Rule
-    var mActivityRule: ActivityTestRule<IncompleteMotionActivity> =
-            ActivityTestRule(IncompleteMotionActivity::class.java)
-    lateinit var mActivity: IncompleteMotionActivity
-    val mInstrumentation = InstrumentationRegistry.getInstrumentation()
+    val activityRule = ActivityScenarioRule(IncompleteMotionActivity::class.java)
+    private lateinit var activity: IncompleteMotionActivity
+    private val instrumentation = InstrumentationRegistry.getInstrumentation()
 
     @Before
     fun setUp() {
-        mActivity = mActivityRule.getActivity()
-        PollingCheck.waitFor { mActivity.hasWindowFocus() }
+        activityRule.getScenario().onActivity {
+            activity = it
+        }
+        PollingCheck.waitFor { activity.hasWindowFocus() }
     }
 
     /**
@@ -95,13 +96,13 @@
     @Test
     fun testIncompleteMotion() {
         val downTime = SystemClock.uptimeMillis()
-        val (x, y) = getViewCenterOnScreen(mActivity.window.decorView)
+        val (x, y) = getViewCenterOnScreen(activity.window.decorView)
 
         // Start a valid touch stream
         sendEvent(downTime, ACTION_DOWN, x, y, true /*sync*/)
         // Lock up the UI thread. This ensures that the motion event that we will write will
         // not get processed by the app right away.
-        mActivity.runOnUiThread {
+        activity.runOnUiThread {
             val sendMoveAndFocus = thread(start = true) {
                 sendEvent(downTime, ACTION_MOVE, x, y + 10, false /*sync*/)
                 // The MOVE event is sent async because the UI thread is blocked.
@@ -114,12 +115,12 @@
                 val handler = Handler(looper)
                 val receiver = OverlayFocusedBroadcastReceiver()
                 val intentFilter = IntentFilter(OVERLAY_ACTIVITY_FOCUSED)
-                mActivity.registerReceiver(receiver, intentFilter, null, handler)
+                activity.registerReceiver(receiver, intentFilter, null, handler)
 
                 // Now send hasFocus=false event to the app by launching a new focusable window
                 startOverlayActivity()
                 PollingCheck.waitFor { receiver.overlayActivityIsFocused() }
-                mActivity.unregisterReceiver(receiver)
+                activity.unregisterReceiver(receiver)
                 handlerThread.quit()
                 // We need to ensure that the focus event has been written to the app's socket
                 // before unblocking the UI thread. Having the overlay activity receive
@@ -130,14 +131,14 @@
             }
             sendMoveAndFocus.join()
         }
-        PollingCheck.waitFor { !mActivity.hasWindowFocus() }
+        PollingCheck.waitFor { !activity.hasWindowFocus() }
         // If the platform implementation has a bug, it would consume both MOVE and FOCUS events,
         // but will only call 'finish' for the focus event.
         // The MOVE event would not be propagated to the app, because the Choreographer
         // callback never gets scheduled
         // If we wait too long here, we will cause ANR (if the platform has a bug).
         // If the MOVE event is received, however, we can stop the test.
-        PollingCheck.waitFor { mActivity.receivedMove() }
+        PollingCheck.waitFor { activity.receivedMove() }
     }
 
     private fun sendEvent(downTime: Long, action: Int, x: Float, y: Float, sync: Boolean) {
@@ -147,7 +148,7 @@
         }
         val event = MotionEvent.obtain(downTime, eventTime, action, x, y, 0 /*metaState*/)
         event.source = InputDevice.SOURCE_TOUCHSCREEN
-        mInstrumentation.uiAutomation.injectInputEvent(event, sync)
+        instrumentation.uiAutomation.injectInputEvent(event, sync)
     }
 
     /**
@@ -161,6 +162,6 @@
     private fun startOverlayActivity() {
         val flags = " -W -n "
         val startCmd = "am start $flags android.input.cts/.OverlayActivity"
-        mInstrumentation.uiAutomation.executeShellCommand(startCmd)
+        instrumentation.uiAutomation.executeShellCommand(startCmd)
     }
 }
diff --git a/tests/input/src/android/input/cts/InputEventTest.kt b/tests/input/src/android/input/cts/InputEventTest.kt
new file mode 100644
index 0000000..fd20ac2
--- /dev/null
+++ b/tests/input/src/android/input/cts/InputEventTest.kt
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2020 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 android.input.cts
+
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+
+import android.text.TextUtils
+import android.util.ArrayMap
+import android.view.KeyEvent
+import android.view.MotionEvent
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.SmallTest
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@SmallTest
+@RunWith(AndroidJUnit4::class)
+class InputEventTest {
+
+    @Test
+    fun testKeyCodeToString() {
+        assertEquals("KEYCODE_UNKNOWN", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_UNKNOWN))
+        assertEquals("KEYCODE_HOME", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_HOME))
+        assertEquals("KEYCODE_0", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_0))
+        assertEquals("KEYCODE_POWER", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_POWER))
+        assertEquals("KEYCODE_A", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_A))
+        assertEquals("KEYCODE_SPACE", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_SPACE))
+        assertEquals("KEYCODE_MENU", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_MENU))
+        assertEquals("KEYCODE_BACK", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_BACK))
+        assertEquals("KEYCODE_BUTTON_A", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_BUTTON_A))
+        assertEquals("KEYCODE_PROFILE_SWITCH",
+                        KeyEvent.keyCodeToString(KeyEvent.KEYCODE_PROFILE_SWITCH))
+    }
+
+    @Test
+    fun testAxisFromToString() {
+        val axes = ArrayMap<Int, String>()
+        axes.put(MotionEvent.AXIS_X, "AXIS_X")
+        axes.put(MotionEvent.AXIS_Y, "AXIS_Y")
+        axes.put(MotionEvent.AXIS_PRESSURE, "AXIS_PRESSURE")
+        axes.put(MotionEvent.AXIS_SIZE, "AXIS_SIZE")
+        axes.put(MotionEvent.AXIS_TOUCH_MAJOR, "AXIS_TOUCH_MAJOR")
+        axes.put(MotionEvent.AXIS_TOUCH_MINOR, "AXIS_TOUCH_MINOR")
+        axes.put(MotionEvent.AXIS_TOOL_MAJOR, "AXIS_TOOL_MAJOR")
+        axes.put(MotionEvent.AXIS_TOOL_MINOR, "AXIS_TOOL_MINOR")
+        axes.put(MotionEvent.AXIS_ORIENTATION, "AXIS_ORIENTATION")
+        axes.put(MotionEvent.AXIS_VSCROLL, "AXIS_VSCROLL")
+        axes.put(MotionEvent.AXIS_HSCROLL, "AXIS_HSCROLL")
+        axes.put(MotionEvent.AXIS_Z, "AXIS_Z")
+        axes.put(MotionEvent.AXIS_RX, "AXIS_RX")
+        axes.put(MotionEvent.AXIS_RY, "AXIS_RY")
+        axes.put(MotionEvent.AXIS_RZ, "AXIS_RZ")
+        axes.put(MotionEvent.AXIS_HAT_X, "AXIS_HAT_X")
+        axes.put(MotionEvent.AXIS_HAT_Y, "AXIS_HAT_Y")
+        axes.put(MotionEvent.AXIS_LTRIGGER, "AXIS_LTRIGGER")
+        axes.put(MotionEvent.AXIS_RTRIGGER, "AXIS_RTRIGGER")
+        axes.put(MotionEvent.AXIS_THROTTLE, "AXIS_THROTTLE")
+        axes.put(MotionEvent.AXIS_RUDDER, "AXIS_RUDDER")
+        axes.put(MotionEvent.AXIS_WHEEL, "AXIS_WHEEL")
+        axes.put(MotionEvent.AXIS_GAS, "AXIS_GAS")
+        axes.put(MotionEvent.AXIS_BRAKE, "AXIS_BRAKE")
+        axes.put(MotionEvent.AXIS_DISTANCE, "AXIS_DISTANCE")
+        axes.put(MotionEvent.AXIS_TILT, "AXIS_TILT")
+        axes.put(MotionEvent.AXIS_SCROLL, "AXIS_SCROLL")
+        axes.put(MotionEvent.AXIS_RELATIVE_X, "AXIS_RELATIVE_X")
+        axes.put(MotionEvent.AXIS_RELATIVE_Y, "AXIS_RELATIVE_Y")
+        axes.put(MotionEvent.AXIS_GENERIC_1, "AXIS_GENERIC_1")
+        axes.put(MotionEvent.AXIS_GENERIC_2, "AXIS_GENERIC_2")
+        axes.put(MotionEvent.AXIS_GENERIC_3, "AXIS_GENERIC_3")
+        axes.put(MotionEvent.AXIS_GENERIC_4, "AXIS_GENERIC_4")
+        axes.put(MotionEvent.AXIS_GENERIC_5, "AXIS_GENERIC_5")
+        axes.put(MotionEvent.AXIS_GENERIC_6, "AXIS_GENERIC_6")
+        axes.put(MotionEvent.AXIS_GENERIC_7, "AXIS_GENERIC_7")
+        axes.put(MotionEvent.AXIS_GENERIC_8, "AXIS_GENERIC_8")
+        axes.put(MotionEvent.AXIS_GENERIC_9, "AXIS_GENERIC_9")
+        axes.put(MotionEvent.AXIS_GENERIC_10, "AXIS_GENERIC_10")
+        axes.put(MotionEvent.AXIS_GENERIC_11, "AXIS_GENERIC_11")
+        axes.put(MotionEvent.AXIS_GENERIC_12, "AXIS_GENERIC_12")
+        axes.put(MotionEvent.AXIS_GENERIC_13, "AXIS_GENERIC_13")
+        axes.put(MotionEvent.AXIS_GENERIC_14, "AXIS_GENERIC_14")
+        axes.put(MotionEvent.AXIS_GENERIC_15, "AXIS_GENERIC_15")
+        axes.put(MotionEvent.AXIS_GENERIC_16, "AXIS_GENERIC_16")
+        // As Axes values definition is not continuous from AXIS_RELATIVE_Y to AXIS_GENERIC_1,
+        // Need to verify MotionEvent.axisToString returns axis name correctly.
+        // Also verify that we are not crashing on those calls, and that the return result on each
+        // is not empty. We do expect the two-way call chain of to/from to get us back to the
+        // original integer value.
+        for (entry in axes.entries) {
+            val axis = entry.key
+            val axisToString = MotionEvent.axisToString(axis)
+            assertFalse(TextUtils.isEmpty(axisToString))
+            assertEquals(axisToString, entry.value)
+            assertEquals(axis, MotionEvent.axisFromString(axisToString))
+        }
+    }
+}
diff --git a/tests/input/src/android/input/cts/InputShellCommandTest.kt b/tests/input/src/android/input/cts/InputShellCommandTest.kt
index 4555b5d..c075204 100644
--- a/tests/input/src/android/input/cts/InputShellCommandTest.kt
+++ b/tests/input/src/android/input/cts/InputShellCommandTest.kt
@@ -17,10 +17,10 @@
 
 import android.view.MotionEvent
 import android.view.View
+import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.MediumTest
 import androidx.test.platform.app.InstrumentationRegistry
-import androidx.test.rule.ActivityTestRule
 import com.android.compatibility.common.util.PollingCheck
 import com.android.compatibility.common.util.ShellUtils
 import com.google.common.truth.Truth.assertThat
@@ -44,15 +44,17 @@
 @RunWith(AndroidJUnit4::class)
 class InputShellCommandTest {
     @get:Rule
-    var mActivityRule: ActivityTestRule<CaptureEventActivity> =
-            ActivityTestRule(CaptureEventActivity::class.java)
-    lateinit var mActivity: CaptureEventActivity
-    val mInstrumentation = InstrumentationRegistry.getInstrumentation()
+    val activityRule = ActivityScenarioRule(CaptureEventActivity::class.java)
+    private val instrumentation = InstrumentationRegistry.getInstrumentation()
+    private lateinit var activity: CaptureEventActivity
 
     @Before
     fun setUp() {
-        mActivity = mActivityRule.getActivity()
-        PollingCheck.waitFor { mActivity.hasWindowFocus() }
+        activityRule.getScenario().onActivity {
+            activity = it
+        }
+        PollingCheck.waitFor { activity.hasWindowFocus() }
+        instrumentation.uiAutomation.syncInputTransactions()
     }
 
     /**
@@ -60,7 +62,7 @@
      */
     @Test
     fun testDefaultToolType() {
-        val (x, y) = getViewCenterOnScreen(mActivity.window.decorView)
+        val (x, y) = getViewCenterOnScreen(activity.window.decorView)
 
         ShellUtils.runShellCommand("input tap $x $y")
         assertTapToolType(MotionEvent.TOOL_TYPE_FINGER)
@@ -71,7 +73,7 @@
      */
     @Test
     fun testToolType() {
-        val (x, y) = getViewCenterOnScreen(mActivity.window.decorView)
+        val (x, y) = getViewCenterOnScreen(activity.window.decorView)
 
         ShellUtils.runShellCommand("input touchscreen tap $x $y")
         assertTapToolType(MotionEvent.TOOL_TYPE_FINGER)
@@ -96,7 +98,7 @@
     }
 
     private fun getMotionEvent(): MotionEvent {
-        val event = mActivity.getLastInputEvent()
+        val event = activity.getInputEvent()
         assertThat(event).isNotNull()
         assertThat(event).isInstanceOf(MotionEvent::class.java)
         return event as MotionEvent
@@ -111,12 +113,12 @@
     }
 
     private fun assertTapToolType(toolType: Int) {
-        var event = getMotionEvent()
-        assertThat(event.action).isEqualTo(MotionEvent.ACTION_DOWN)
-        assertToolType(event, toolType)
+        val downEvent = getMotionEvent()
+        assertThat(downEvent.action).isEqualTo(MotionEvent.ACTION_DOWN)
+        assertToolType(downEvent, toolType)
 
-        event = getMotionEvent()
-        assertThat(event.action).isEqualTo(MotionEvent.ACTION_UP)
-        assertToolType(event, toolType)
+        val upEvent = getMotionEvent()
+        assertThat(upEvent.action).isEqualTo(MotionEvent.ACTION_UP)
+        assertToolType(upEvent, toolType)
     }
 }
diff --git a/tests/input/src/android/input/cts/PointerCancelTest.kt b/tests/input/src/android/input/cts/PointerCancelTest.kt
new file mode 100644
index 0000000..af7ca56
--- /dev/null
+++ b/tests/input/src/android/input/cts/PointerCancelTest.kt
@@ -0,0 +1,240 @@
+/*
+ * Copyright (C) 2021 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 android.input.cts
+
+import android.graphics.PointF
+import android.os.SystemClock
+import android.view.Gravity
+import android.view.InputDevice
+import android.view.InputEvent
+import android.view.MotionEvent
+import android.view.View
+import android.view.WindowManager
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import androidx.test.platform.app.InstrumentationRegistry
+import com.android.compatibility.common.util.PollingCheck
+import org.junit.Assert.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.LinkedBlockingQueue
+import java.util.concurrent.TimeUnit
+
+private fun getViewCenterOnScreen(v: View): PointF {
+    val location = IntArray(2)
+    v.getLocationOnScreen(location)
+    val x = location[0].toFloat() + v.width / 2
+    val y = location[1].toFloat() + v.height / 2
+    return PointF(x, y)
+}
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+class PointerCancelTest {
+    @get:Rule
+    val activityRule = ActivityScenarioRule<CaptureEventActivity>(CaptureEventActivity::class.java)
+    private lateinit var activity: CaptureEventActivity
+    private val instrumentation = InstrumentationRegistry.getInstrumentation()
+    private lateinit var verifier: EventVerifier
+    @Before
+    fun setUp() {
+        activityRule.getScenario().onActivity {
+            activity = it
+        }
+        PollingCheck.waitFor { activity.hasWindowFocus() }
+        instrumentation.uiAutomation.syncInputTransactions()
+        verifier = EventVerifier(activity::getInputEvent)
+    }
+
+    /**
+     * Check that pointer cancel is received by the activity via injectInputEvent.
+     */
+    @Test
+    fun testPointerCancelMotion() {
+        val downTime = SystemClock.uptimeMillis()
+        val pointerInDecorView = getViewCenterOnScreen(activity.window.decorView)
+
+        // Start a valid touch stream
+        sendEvent(downTime, MotionEvent.ACTION_DOWN, pointerInDecorView, true /*sync*/)
+        verifier.assertReceivedDown()
+
+        pointerInDecorView.offset(0f, 1f)
+        sendEvent(downTime, MotionEvent.ACTION_MOVE, pointerInDecorView, true /*sync*/)
+        verifier.assertReceivedMove()
+
+        val secondPointer = PointF(pointerInDecorView.x + 1, pointerInDecorView.y + 1)
+        sendPointersEvent(downTime, ACTION_POINTER_1_DOWN,
+                arrayOf(pointerInDecorView, secondPointer),
+                0 /*flags*/, true /*sync*/)
+        verifier.assertReceivedPointerDown()
+
+        sendPointersEvent(downTime, ACTION_POINTER_1_UP,
+                arrayOf(pointerInDecorView, secondPointer),
+                MotionEvent.FLAG_CANCELED, true /*sync*/)
+        verifier.assertReceivedPointerCancel()
+
+        sendEvent(downTime, MotionEvent.ACTION_UP, pointerInDecorView, true /*sync*/)
+        verifier.assertReceivedUp()
+    }
+
+    @Test
+    fun testPointerCancelForSplitTouch() {
+        val view = addFloatingWindow()
+        val pointerInFloating = getViewCenterOnScreen(view)
+        val downTime = SystemClock.uptimeMillis()
+        val pointerOutsideFloating = PointF(pointerInFloating.x + view.width / 2 + 1,
+                pointerInFloating.y + view.height / 2 + 1)
+
+        val eventsInFloating = LinkedBlockingQueue<InputEvent>()
+        view.setOnTouchListener { v, event ->
+            eventsInFloating.add(MotionEvent.obtain(event))
+        }
+        val verifierForFloating = EventVerifier { eventsInFloating.poll(5, TimeUnit.SECONDS) }
+
+        // First finger down (floating window)
+        sendEvent(downTime, MotionEvent.ACTION_DOWN, pointerInFloating, true /*sync*/)
+        verifierForFloating.assertReceivedDown()
+
+        // First finger move (floating window)
+        pointerInFloating.offset(0f, 1f)
+        sendEvent(downTime, MotionEvent.ACTION_MOVE, pointerInFloating, true /*sync*/)
+        verifierForFloating.assertReceivedMove()
+
+        // Second finger down (activity window)
+        sendPointersEvent(downTime, ACTION_POINTER_1_DOWN,
+                arrayOf(pointerInFloating, pointerOutsideFloating),
+                0 /*flags*/, true /*sync*/)
+        verifier.assertReceivedDown()
+        verifierForFloating.assertReceivedMove()
+
+        // ACTION_CANCEL with cancel flag (activity window)
+        sendPointersEvent(downTime, ACTION_POINTER_1_UP,
+                arrayOf(pointerInFloating, pointerOutsideFloating),
+                MotionEvent.FLAG_CANCELED, true /*sync*/)
+        verifier.assertReceivedCancel()
+        verifierForFloating.assertReceivedMove()
+
+        // First finger up (floating window)
+        sendEvent(downTime, MotionEvent.ACTION_UP, pointerInFloating, true /*sync*/)
+        verifierForFloating.assertReceivedUp()
+    }
+
+    private fun sendEvent(downTime: Long, action: Int, pt: PointF, sync: Boolean) {
+        val eventTime = when (action) {
+            MotionEvent.ACTION_DOWN -> downTime
+            else -> SystemClock.uptimeMillis()
+        }
+        val event = MotionEvent.obtain(downTime, eventTime, action, pt.x, pt.y, 0 /*metaState*/)
+        event.source = InputDevice.SOURCE_TOUCHSCREEN
+        instrumentation.uiAutomation.injectInputEvent(event, sync)
+    }
+
+    private fun sendPointersEvent(
+        downTime: Long,
+        action: Int,
+        pointers: Array<PointF>,
+        flags: Int,
+        sync: Boolean
+    ) {
+        val eventTime = SystemClock.uptimeMillis()
+        val pointerCount = pointers.size
+        val properties = arrayOfNulls<MotionEvent.PointerProperties>(pointerCount)
+        val coords = arrayOfNulls<MotionEvent.PointerCoords>(pointerCount)
+
+        for (i in 0 until pointerCount) {
+            properties[i] = MotionEvent.PointerProperties()
+            properties[i]!!.id = i
+            properties[i]!!.toolType = MotionEvent.TOOL_TYPE_FINGER
+            coords[i] = MotionEvent.PointerCoords()
+            coords[i]!!.x = pointers[i].x
+            coords[i]!!.y = pointers[i].y
+        }
+
+        val event = MotionEvent.obtain(downTime, eventTime, action, pointerCount,
+                properties, coords, 0 /*metaState*/, 0 /*buttonState*/,
+                0f /*xPrecision*/, 0f /*yPrecision*/, 0 /*deviceId*/, 0 /*edgeFlags*/,
+                InputDevice.SOURCE_TOUCHSCREEN, flags)
+        instrumentation.uiAutomation.injectInputEvent(event, sync)
+    }
+
+    private fun addFloatingWindow(): View {
+        val view = View(instrumentation.targetContext)
+        val layoutParams = WindowManager.LayoutParams(
+                WindowManager.LayoutParams.TYPE_APPLICATION,
+                WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+                        or WindowManager.LayoutParams.FLAG_SPLIT_TOUCH)
+        layoutParams.x = 0
+        layoutParams.y = 0
+        layoutParams.width = 100
+        layoutParams.height = 100
+        layoutParams.gravity = Gravity.LEFT or Gravity.CENTER_VERTICAL
+
+        activity.runOnUiThread {
+            view.setBackgroundColor(android.graphics.Color.RED)
+            activity.windowManager.addView(view, layoutParams)
+        }
+
+        PollingCheck.waitFor {
+            view.hasWindowFocus()
+        }
+        instrumentation.uiAutomation.syncInputTransactions()
+        return view
+    }
+
+    inner class EventVerifier(val getInputEvent: () -> InputEvent?) {
+        fun assertReceivedPointerCancel() {
+            val event = getInputEvent() as MotionEvent
+            assertEquals(MotionEvent.ACTION_POINTER_UP, event.actionMasked)
+            assertEquals(MotionEvent.FLAG_CANCELED, event.flags and MotionEvent.FLAG_CANCELED)
+        }
+
+        fun assertReceivedCancel() {
+            val event = getInputEvent() as MotionEvent
+            assertEquals(MotionEvent.ACTION_CANCEL, event.actionMasked)
+            assertEquals(MotionEvent.FLAG_CANCELED, event.flags and MotionEvent.FLAG_CANCELED)
+        }
+
+        fun assertReceivedDown() {
+            val event = getInputEvent() as MotionEvent
+            assertEquals(MotionEvent.ACTION_DOWN, event.actionMasked)
+        }
+
+        fun assertReceivedPointerDown() {
+            val event = getInputEvent() as MotionEvent
+            assertEquals(MotionEvent.ACTION_POINTER_DOWN, event.actionMasked)
+        }
+
+        fun assertReceivedMove() {
+            val event = getInputEvent() as MotionEvent
+            assertEquals(MotionEvent.ACTION_MOVE, event.actionMasked)
+        }
+
+        fun assertReceivedUp() {
+            val event = getInputEvent() as MotionEvent
+            assertEquals(MotionEvent.ACTION_UP, event.actionMasked)
+        }
+    }
+
+    companion object {
+        val ACTION_POINTER_1_DOWN = (1 shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) or
+                MotionEvent.ACTION_POINTER_DOWN
+        val ACTION_POINTER_1_UP = (1 shl MotionEvent.ACTION_POINTER_INDEX_SHIFT) or
+                MotionEvent.ACTION_POINTER_UP
+    }
+}
diff --git a/tests/input/src/android/input/cts/TouchModeTest.kt b/tests/input/src/android/input/cts/TouchModeTest.kt
new file mode 100644
index 0000000..493e2e0
--- /dev/null
+++ b/tests/input/src/android/input/cts/TouchModeTest.kt
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2022 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 android.input.cts
+
+import android.app.Activity
+import android.app.Instrumentation
+import android.os.SystemClock
+import android.support.test.uiautomator.UiDevice
+import android.view.ViewTreeObserver
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import androidx.test.platform.app.InstrumentationRegistry
+import com.android.compatibility.common.util.PollingCheck
+import com.android.compatibility.common.util.WindowUtil
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
+
+private const val TOUCH_MODE_PROPAGATION_TIMEOUT_MILLIS: Long = 5000 // 5 sec
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+class TouchModeTest {
+    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
+    private val uiDevice: UiDevice = UiDevice.getInstance(instrumentation)
+
+    @get:Rule
+    val activityRule = ActivityScenarioRule<Activity>(Activity::class.java)
+    private lateinit var activity: Activity
+
+    @Before
+    fun setUp() {
+        activityRule.scenario.onActivity {
+            activity = it
+        }
+        WindowUtil.waitForFocus(activity)
+        instrumentation.setInTouchMode(false)
+    }
+
+    fun isInTouchMode(): Boolean {
+        return activity.window.decorView.isInTouchMode
+    }
+
+    @Test
+    fun testFocusedWindowOwnerCanChangeTouchMode() {
+        instrumentation.setInTouchMode(true)
+        PollingCheck.waitFor { isInTouchMode() }
+        assertTrue(isInTouchMode())
+    }
+
+    @Test
+    fun testOnTouchModeChangeNotification() {
+        val touchModeChangeListener = OnTouchModeChangeListenerImpl()
+        var observer = activity.window.decorView.rootView.viewTreeObserver
+        observer.addOnTouchModeChangeListener(touchModeChangeListener)
+        val newTouchMode = !isInTouchMode()
+
+        instrumentation.setInTouchMode(newTouchMode)
+        try {
+            assertTrue(touchModeChangeListener.countDownLatch.await(
+                    TOUCH_MODE_PROPAGATION_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS))
+        } catch (e: InterruptedException) {
+            throw RuntimeException(e)
+        }
+
+        assertEquals(newTouchMode, touchModeChangeListener.isInTouchMode)
+    }
+
+    private class OnTouchModeChangeListenerImpl : ViewTreeObserver.OnTouchModeChangeListener {
+        val countDownLatch = CountDownLatch(1)
+        var isInTouchMode = false
+
+        override fun onTouchModeChanged(mode: Boolean) {
+            isInTouchMode = mode
+            countDownLatch.countDown()
+        }
+    }
+
+    @Test
+    fun testNonFocusedWindowOwnerCannotChangeTouchMode() {
+        // It takes 400-500 milliseconds in average for DecorView to receive the touch mode changed
+        // event on 2021 hardware, so we set the timeout to 10x that. It's still possible that a
+        // test would fail, but we don't have a better way to check that an event does not occur.
+        // Due to the 2 expected touch mode events to occur, this test may take few seconds to run.
+        uiDevice.pressHome()
+        PollingCheck.waitFor { !activity.hasWindowFocus() }
+
+        instrumentation.setInTouchMode(true)
+
+        SystemClock.sleep(TOUCH_MODE_PROPAGATION_TIMEOUT_MILLIS)
+        assertFalse(isInTouchMode())
+    }
+}
diff --git a/tests/input/src/android/input/cts/VerifyHardwareKeyEventTest.kt b/tests/input/src/android/input/cts/VerifyHardwareKeyEventTest.kt
new file mode 100644
index 0000000..b6f5a3c
--- /dev/null
+++ b/tests/input/src/android/input/cts/VerifyHardwareKeyEventTest.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2021 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 android.input.cts
+
+import android.hardware.input.InputManager
+import android.view.InputDevice
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import androidx.test.platform.app.InstrumentationRegistry
+import com.android.compatibility.common.util.PollingCheck
+import com.android.cts.input.UinputDevice
+import org.junit.Assert.assertNotNull
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+private fun injectEvents(device: UinputDevice, events: IntArray) {
+    device.injectEvents(events.joinToString(prefix = "[", postfix = "]", separator = ","))
+}
+
+/**
+ * Create a virtual keyboard and inject a 'hardware' key event. Ensure that the event can be
+ * verified using the InputManager::verifyInputEvent api.
+ */
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+class VerifyHardwareKeyEventTest {
+    private val instrumentation = InstrumentationRegistry.getInstrumentation()
+
+    @get:Rule
+    val rule = ActivityScenarioRule<CaptureEventActivity>(CaptureEventActivity::class.java)
+
+    private lateinit var activity: CaptureEventActivity
+    private lateinit var inputManager: InputManager
+
+    @Before
+    fun setUp() {
+        rule.getScenario().onActivity {
+            inputManager = it.getSystemService(InputManager::class.java)
+            activity = it
+        }
+        PollingCheck.waitFor { activity.hasWindowFocus() }
+    }
+
+    fun assertReceivedEventsCanBeVerified(numEvents: Int) {
+        for (i in 1..numEvents) {
+            val lastInputEvent = activity.getInputEvent()
+            assertNotNull("Event number $i is null!", lastInputEvent)
+            assertNotNull(inputManager.verifyInputEvent(lastInputEvent!!))
+        }
+    }
+
+    /**
+     * Send a hardware key event and check that InputManager::verifyInputEvent returns non-null
+     * result.
+     */
+    @Test
+    fun testVerifyHardwareKeyEvent() {
+        val keyboardDevice = UinputDevice.create(instrumentation, R.raw.test_keyboard_register,
+                InputDevice.SOURCE_KEYBOARD)
+
+        val EV_SYN = 0
+        val SYN_REPORT = 0
+        val EV_KEY = 1
+        val EV_KEY_DOWN = 1
+        val EV_KEY_UP = 0
+        val KEY_A = 30
+
+        injectEvents(keyboardDevice, intArrayOf(EV_KEY, KEY_A, EV_KEY_DOWN, EV_SYN, SYN_REPORT, 0))
+        // Send the UP event right away to avoid key repeat
+        injectEvents(keyboardDevice, intArrayOf(EV_KEY, KEY_A, EV_KEY_UP, EV_SYN, SYN_REPORT, 0))
+
+        assertReceivedEventsCanBeVerified(2 /*numEvents*/)
+    }
+}
diff --git a/tests/inputmethod/Android.bp b/tests/inputmethod/Android.bp
index ceb6d02..f5bdd50 100644
--- a/tests/inputmethod/Android.bp
+++ b/tests/inputmethod/Android.bp
@@ -27,14 +27,19 @@
     compile_multilib: "both",
     libs: ["android.test.runner"],
     static_libs: [
+        "androidx.test.ext.junit",
         "androidx.test.rules",
         "androidx.test.uiautomator_uiautomator",
         "compatibility-device-util-axt",
+        "cts-wm-util",
+        "cts-inputmethod-util",
         "ctstestrunner-axt",
         "CtsMockInputMethodLib",
         "CtsMockSpellCheckerLib",
+        "CtsLegacyImeClientTestLib",
         "testng",
         "kotlin-test",
+        "cts-wm-util",
     ],
     srcs: [
         "src/**/*.java",
diff --git a/tests/inputmethod/AndroidManifest.xml b/tests/inputmethod/AndroidManifest.xml
index 18c6ebf..e757f79 100644
--- a/tests/inputmethod/AndroidManifest.xml
+++ b/tests/inputmethod/AndroidManifest.xml
@@ -19,55 +19,16 @@
      package="android.view.inputmethod.cts"
      android:targetSandboxVersion="2">
 
+    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
     <application android:label="CtsInputMethodTestCases"
          android:multiArch="true"
-         android:supportsRtl="true">
+         android:supportsRtl="true"
+         android:testOnly="true">
 
         <uses-library android:name="android.test.runner"/>
 
-        <activity android:name="android.view.inputmethod.cts.util.TestActivity"
-             android:theme="@style/no_starting_window"
-             android:label="TestActivity"
-             android:configChanges="fontScale|smallestScreenSize|screenSize|screenLayout"
-             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
-            </intent-filter>
-        </activity>
-        <activity android:name="android.view.inputmethod.cts.util.TestActivity2"
-                  android:theme="@style/no_starting_window"
-                  android:label="TestActivity2"
-                  android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
-            </intent-filter>
-        </activity>
-
-        <activity android:name="android.view.inputmethod.cts.util.StateInitializeActivity"
-             android:theme="@style/no_starting_window"
-             android:label="StateInitializeActivity"
-             android:configChanges="fontScale"
-             android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
-            </intent-filter>
-        </activity>
-
-        <!--
-                      In order to test window-focus-stealing from other process, let this service run in a
-                      separate process. -->
-        <service android:name="android.view.inputmethod.cts.util.WindowFocusStealerService"
-             android:process=":focusstealer"
-             android:exported="false">
-        </service>
-
-        <service android:name="android.view.inputmethod.cts.util.WindowFocusHandleService"
-             android:exported="false">
-        </service>
+        <!-- TestActivity etc are merged from util/AndroidManifest.xml -->
 
     </application>
 
diff --git a/tests/inputmethod/AndroidTest.xml b/tests/inputmethod/AndroidTest.xml
index 23e26e4..69316c1 100644
--- a/tests/inputmethod/AndroidTest.xml
+++ b/tests/inputmethod/AndroidTest.xml
@@ -96,6 +96,7 @@
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
+        <option name="install-arg" value="-t" />
         <option name="test-file-name" value="CtsInputMethodTestCases.apk" />
     </target_preparer>
     <!-- Enabling change id ALLOW_TEST_API_ACCESS allows that package to access @TestApi methods -->
diff --git a/tests/inputmethod/legacyimeclienttestlib/Android.bp b/tests/inputmethod/legacyimeclienttestlib/Android.bp
new file mode 100644
index 0000000..59d7782
--- /dev/null
+++ b/tests/inputmethod/legacyimeclienttestlib/Android.bp
@@ -0,0 +1,32 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_test_helper_library {
+    name: "CtsLegacyImeClientTestLib",
+
+    // Ideally we want to use SDK version 3, but it's not available.
+    // Note that several new APIs were added into InputConnection in API 9.
+    sdk_version: "4",
+
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.annotation_annotation",
+    ],
+}
diff --git a/tests/inputmethod/legacyimeclienttestlib/src/com/android/cts/inputmethod/LegacyImeClientTestUtils.java b/tests/inputmethod/legacyimeclienttestlib/src/com/android/cts/inputmethod/LegacyImeClientTestUtils.java
new file mode 100644
index 0000000..2c4a0da
--- /dev/null
+++ b/tests/inputmethod/legacyimeclienttestlib/src/com/android/cts/inputmethod/LegacyImeClientTestUtils.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright (C) 2021 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.cts.inputmethod;
+
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.inputmethod.CompletionInfo;
+import android.view.inputmethod.ExtractedText;
+import android.view.inputmethod.ExtractedTextRequest;
+import android.view.inputmethod.InputConnection;
+
+import androidx.annotation.AnyThread;
+
+/**
+ * A utility class to test compatibility with legacy apps that were built with old SDKs.
+ */
+public final class LegacyImeClientTestUtils {
+
+    /**
+     * Not intented to be instantiated.
+     */
+    private LegacyImeClientTestUtils() {
+    }
+
+    private static final class MinimallyImplementedNoOpInputConnection implements InputConnection {
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public CharSequence getTextBeforeCursor(int n, int flags) {
+            return null;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public CharSequence getTextAfterCursor(int n, int flags) {
+            return null;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public int getCursorCapsMode(int reqModes) {
+            return 0;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
+            return null;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean setComposingText(CharSequence text, int newCursorPosition) {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean finishComposingText() {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean commitText(CharSequence text, int newCursorPosition) {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean commitCompletion(CompletionInfo text) {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean setSelection(int start, int end) {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean performEditorAction(int editorAction) {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean performContextMenuAction(int id) {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean beginBatchEdit() {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean endBatchEdit() {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean sendKeyEvent(KeyEvent event) {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean clearMetaKeyStates(int states) {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean reportFullscreenMode(boolean enabled) {
+            return false;
+        }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public boolean performPrivateCommand(String action, Bundle data) {
+            return false;
+        }
+    }
+
+    /**
+     * @return an instance of {@link InputConnection} that implements only methods that were
+     * available in {@link android.os.Build.VERSION_CODES#CUPCAKE}.
+     */
+    @AnyThread
+    public static InputConnection createMinimallyImplementedNoOpInputConnection() {
+        return new MinimallyImplementedNoOpInputConnection();
+    }
+}
diff --git a/tests/inputmethod/mockime/res/xml/method.xml b/tests/inputmethod/mockime/res/xml/method.xml
index 48f4a78..91b9144 100644
--- a/tests/inputmethod/mockime/res/xml/method.xml
+++ b/tests/inputmethod/mockime/res/xml/method.xml
@@ -17,5 +17,7 @@
 
 <input-method xmlns:android="http://schemas.android.com/apk/res/android"
               android:supportsInlineSuggestions="true"
-              android:configChanges="fontScale">
+              android:supportsInlineSuggestionsWithTouchExploration="true"
+              android:configChanges="fontScale"
+              android:supportsStylusHandwriting="true">
 </input-method>
diff --git a/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeEvent.java b/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeEvent.java
index abfae95..fceb11f 100644
--- a/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeEvent.java
+++ b/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeEvent.java
@@ -21,10 +21,14 @@
 import android.os.Handler;
 import android.os.Parcelable;
 import android.view.View;
+import android.view.inputmethod.TextSnapshot;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * An immutable object that stores event happened in the {@link MockIme}.
  */
@@ -40,6 +44,7 @@
         CharSequence,
         Exception,
         Parcelable,
+        List
     }
 
     /**
@@ -63,6 +68,9 @@
         if (object instanceof Handler) {
             return ReturnType.KnownUnsupportedType;
         }
+        if (object instanceof TextSnapshot) {
+            return ReturnType.KnownUnsupportedType;
+        }
         if (object instanceof Boolean) {
             return ReturnType.Boolean;
         }
@@ -81,6 +89,9 @@
         if (object instanceof Parcelable) {
             return ReturnType.Parcelable;
         }
+        if (object instanceof List) {
+            return ReturnType.List;
+        }
         throw new UnsupportedOperationException("Unsupported return type=" + object);
     }
 
@@ -153,6 +164,9 @@
             case Parcelable:
                 bundle.putParcelable("mReturnValue", getReturnParcelableValue());
                 break;
+            case List:
+                bundle.putParcelableArrayList("mReturnValue", getReturnParcelableArrayListValue());
+                break;
             default:
                 throw new UnsupportedOperationException("Unsupported type=" + mReturnType);
         }
@@ -199,6 +213,9 @@
             case Parcelable:
                 result = bundle.getParcelable("mReturnValue");
                 break;
+            case List:
+                result = bundle.getParcelableArrayList("mReturnValue");
+                break;
             default:
                 throw new UnsupportedOperationException("Unsupported type=" + returnType);
         }
@@ -410,6 +427,22 @@
     }
 
     /**
+     * @return result value of this event.
+     * @throws NullPointerException if the return value is {@code null}
+     * @throws ClassCastException if the return value is non-{@code null} object that is different
+     *                            from {@link ArrayList<? extends Parcelable>}
+     */
+    public <T extends Parcelable> ArrayList<T> getReturnParcelableArrayListValue() {
+        if (mReturnType == ReturnType.Null) {
+            throw new NullPointerException();
+        }
+        if (mReturnType != ReturnType.List) {
+            throw new ClassCastException();
+        }
+        return (ArrayList<T>) mReturnValue;
+    }
+
+    /**
      * @return {@code true} when the result value is an {@link Exception}.
      */
     public boolean isExceptionReturnValue() {
diff --git a/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeEventStreamTestUtils.java b/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeEventStreamTestUtils.java
index bf301d6..cb49460 100644
--- a/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeEventStreamTestUtils.java
+++ b/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeEventStreamTestUtils.java
@@ -18,6 +18,7 @@
 
 import android.os.SystemClock;
 import android.text.TextUtils;
+import android.util.Pair;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputBinding;
 
@@ -332,6 +333,63 @@
     }
 
     /**
+     * Assert that the {@link MockIme} will not be terminated abruptly with executing a command to
+     * check if it's still alive and verify the number of create/destroy callback should be paired.
+     *
+     * @param session {@link MockImeSession} to be checked.
+     * @param timeout timeout in millisecond to check if {@link MockIme} is still alive.
+     * @throws Exception
+     */
+    public static void expectNoImeCrash(@NonNull MockImeSession session, long timeout)
+            throws Exception {
+        // Issue any trivial command to make sure that the MockIme is still alive.
+        final ImeCommand command = session.callGetDisplayId();
+        expectCommand(session.openEventStream(), command, timeout);
+        // A filter that matches exit events of "onCreate", "onDestroy", and the *command* above.
+        final Predicate<ImeEvent> matcher = event -> {
+            if (!event.isEnterEvent()) {
+                return false;
+            }
+            switch (event.getEventName()) {
+                case "onHandleCommand": {
+                    final ImeCommand eventCommand =
+                            ImeCommand.fromBundle(event.getArguments().getBundle("command"));
+                    return eventCommand.getId() == command.getId();
+                }
+                case "onCreate":
+                case "onDestroy":
+                    return true;
+                default:
+                    return false;
+            }
+        };
+        final ImeEventStream stream = session.openEventStream();
+        String lastEventName = null;
+        // Allowed pairs of (lastEventName, eventName):
+        //  - (null, "onCreate")
+        //  - ("onCreate", "onDestroy")
+        //  - ("onCreate", "onHandleCommand") -> then stop searching
+        //  - ("onDestroy", "onCreate")
+        while (true) {
+            final String eventName =
+                    stream.seekToFirst(matcher).map(ImeEvent::getEventName).orElse("");
+            final Pair<String, String> pair = Pair.create(lastEventName, eventName);
+            if (pair.equals(Pair.create("onCreate", "onHandleCommand"))) {
+                break;  // Done!
+            }
+            if (pair.equals(Pair.create(null, "onCreate"))
+                    || pair.equals(Pair.create("onCreate", "onDestroy"))
+                    || pair.equals(Pair.create("onDestroy", "onCreate"))) {
+                lastEventName = eventName;
+                stream.skip(1);
+                continue;
+            }
+            throw new AssertionError("IME might have crashed. lastEventName="
+                    + lastEventName + " eventName=" + eventName + "\n" + stream.dump());
+        }
+    }
+
+    /**
      * Waits until {@code MockIme} does not send {@code "onInputViewLayoutChanged"} event
      * for a certain period of time ({@code stableThresholdTime} msec).
      *
diff --git a/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeLayoutInfo.java b/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeLayoutInfo.java
index 40bdc3f..7f38f44 100644
--- a/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeLayoutInfo.java
+++ b/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeLayoutInfo.java
@@ -21,7 +21,6 @@
 import android.os.Bundle;
 import android.view.Display;
 import android.view.View;
-import android.view.WindowInsets;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -37,8 +36,6 @@
     private static final String OLD_LAYOUT_KEY = "oldLayout";
     private static final String VIEW_ORIGIN_ON_SCREEN_KEY = "viewOriginOnScreen";
     private static final String DISPLAY_SIZE_KEY = "displaySize";
-    private static final String SYSTEM_WINDOW_INSET_KEY = "systemWindowInset";
-    private static final String STABLE_INSET_KEY = "stableInset";
 
     @NonNull
     private final Rect mNewLayout;
@@ -48,10 +45,6 @@
     private Point mViewOriginOnScreen;
     @Nullable
     private Point mDisplaySize;
-    @Nullable
-    private Rect mSystemWindowInset;
-    @Nullable
-    private Rect mStableInset;
 
     /**
      * Returns the bounding box of the {@link View} passed to
@@ -71,71 +64,12 @@
                 mViewOriginOnScreen.y + mNewLayout.height());
     }
 
-    /**
-     * Returns the screen area in screen coordinates that does not overlap with the system
-     * window inset, which represents the area of a full-screen window that is partially or
-     * fully obscured by the status bar, navigation bar, IME or other system windows.
-     *
-     * <p>May return {@code null} when this information is not yet ready.</p>
-     *
-     * @return Region in screen coordinates. {@code null} when it is not available
-     *
-     * @see WindowInsets#hasSystemWindowInsets()
-     * @see WindowInsets#getSystemWindowInsetBottom()
-     * @see WindowInsets#getSystemWindowInsetLeft()
-     * @see WindowInsets#getSystemWindowInsetRight()
-     * @see WindowInsets#getSystemWindowInsetTop()
-     */
-    @Nullable
-    public Rect getScreenRectWithoutSystemWindowInset() {
-        if (mDisplaySize == null) {
-            return null;
-        }
-        if (mSystemWindowInset == null) {
-            return new Rect(0, 0, mDisplaySize.x, mDisplaySize.y);
-        }
-        return new Rect(mSystemWindowInset.left, mSystemWindowInset.top,
-                mDisplaySize.x - mSystemWindowInset.right,
-                mDisplaySize.y - mSystemWindowInset.bottom);
-    }
-
-    /**
-     * Returns the screen area in screen coordinates that does not overlap with the stable
-     * inset, which represents the area of a full-screen window that <b>may</b> be partially or
-     * fully obscured by the system UI elements.
-     *
-     * <p>May return {@code null} when this information is not yet ready.</p>
-     *
-     * @return Region in screen coordinates. {@code null} when it is not available
-     *
-     * @see WindowInsets#hasStableInsets()
-     * @see WindowInsets#getStableInsetBottom()
-     * @see WindowInsets#getStableInsetLeft()
-     * @see WindowInsets#getStableInsetRight()
-     * @see WindowInsets#getStableInsetTop()
-     */
-    @Nullable
-    public Rect getScreenRectWithoutStableInset() {
-        if (mDisplaySize == null) {
-            return null;
-        }
-        if (mStableInset == null) {
-            return new Rect(0, 0, mDisplaySize.x, mDisplaySize.y);
-        }
-        return new Rect(mStableInset.left, mStableInset.top,
-                mDisplaySize.x - mStableInset.right,
-                mDisplaySize.y - mStableInset.bottom);
-    }
-
     ImeLayoutInfo(@NonNull Rect newLayout, @NonNull Rect oldLayout,
-            @NonNull Point viewOriginOnScreen, @Nullable Point displaySize,
-            @Nullable Rect systemWindowInset, @Nullable Rect stableInset) {
+            @NonNull Point viewOriginOnScreen, @Nullable Point displaySize) {
         mNewLayout = new Rect(newLayout);
         mOldLayout = new Rect(oldLayout);
         mViewOriginOnScreen = new Point(viewOriginOnScreen);
         mDisplaySize = new Point(displaySize);
-        mSystemWindowInset = systemWindowInset;
-        mStableInset = stableInset;
     }
 
     void writeToBundle(@NonNull Bundle bundle) {
@@ -143,8 +77,6 @@
         bundle.putParcelable(OLD_LAYOUT_KEY, mOldLayout);
         bundle.putParcelable(VIEW_ORIGIN_ON_SCREEN_KEY, mViewOriginOnScreen);
         bundle.putParcelable(DISPLAY_SIZE_KEY, mDisplaySize);
-        bundle.putParcelable(SYSTEM_WINDOW_INSET_KEY, mSystemWindowInset);
-        bundle.putParcelable(STABLE_INSET_KEY, mStableInset);
     }
 
     static ImeLayoutInfo readFromBundle(@NonNull Bundle bundle) {
@@ -152,11 +84,8 @@
         final Rect oldLayout = bundle.getParcelable(OLD_LAYOUT_KEY);
         final Point viewOrigin = bundle.getParcelable(VIEW_ORIGIN_ON_SCREEN_KEY);
         final Point displaySize = bundle.getParcelable(DISPLAY_SIZE_KEY);
-        final Rect systemWindowInset = bundle.getParcelable(SYSTEM_WINDOW_INSET_KEY);
-        final Rect stableInset = bundle.getParcelable(STABLE_INSET_KEY);
 
-        return new ImeLayoutInfo(newLayout, oldLayout, viewOrigin, displaySize, systemWindowInset,
-                stableInset);
+        return new ImeLayoutInfo(newLayout, oldLayout, viewOrigin, displaySize);
     }
 
     static ImeLayoutInfo fromLayoutListenerCallback(View v, int left, int top, int right,
@@ -174,25 +103,6 @@
         } else {
             displaySize = null;
         }
-        final WindowInsets windowInsets = v.getRootWindowInsets();
-        final Rect systemWindowInset;
-        if (windowInsets != null && windowInsets.hasSystemWindowInsets()) {
-            systemWindowInset = new Rect(
-                    windowInsets.getSystemWindowInsetLeft(), windowInsets.getSystemWindowInsetTop(),
-                    windowInsets.getSystemWindowInsetRight(),
-                    windowInsets.getSystemWindowInsetBottom());
-        } else {
-            systemWindowInset = null;
-        }
-        final Rect stableInset;
-        if (windowInsets != null && windowInsets.hasStableInsets()) {
-            stableInset = new Rect(
-                    windowInsets.getStableInsetLeft(), windowInsets.getStableInsetTop(),
-                    windowInsets.getStableInsetRight(), windowInsets.getStableInsetBottom());
-        } else {
-            stableInset = null;
-        }
-        return new ImeLayoutInfo(newLayout, oldLayout, viewOrigin, displaySize, systemWindowInset,
-                stableInset);
+        return new ImeLayoutInfo(newLayout, oldLayout, viewOrigin, displaySize);
     }
 }
diff --git a/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeSettings.java b/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeSettings.java
index 5757750..be709b4 100644
--- a/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeSettings.java
+++ b/tests/inputmethod/mockime/src/com/android/cts/mockime/ImeSettings.java
@@ -16,13 +16,18 @@
 
 package com.android.cts.mockime;
 
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
 import android.os.Bundle;
 import android.os.PersistableBundle;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import java.lang.annotation.Retention;
+
 /**
  * An immutable data store to control the behavior of {@link MockIme}.
  */
@@ -44,9 +49,10 @@
     private static final String DRAWS_BEHIND_NAV_BAR = "drawsBehindNavBar";
     private static final String WINDOW_FLAGS = "WindowFlags";
     private static final String WINDOW_FLAGS_MASK = "WindowFlagsMask";
-    private static final String FULLSCREEN_MODE_ALLOWED = "FullscreenModeAllowed";
+    private static final String FULLSCREEN_MODE_POLICY = "FullscreenModePolicy";
     private static final String INPUT_VIEW_SYSTEM_UI_VISIBILITY = "InputViewSystemUiVisibility";
     private static final String WATERMARK_ENABLED = "WatermarkEnabled";
+    private static final String WATERMARK_GRAVITY = "WatermarkGravity";
     private static final String HARD_KEYBOARD_CONFIGURATION_BEHAVIOR_ALLOWED =
             "HardKeyboardConfigurationBehaviorAllowed";
     private static final String INLINE_SUGGESTIONS_ENABLED = "InlineSuggestionsEnabled";
@@ -58,6 +64,40 @@
     @NonNull
     private final PersistableBundle mBundle;
 
+
+    @Retention(SOURCE)
+    @IntDef(value = {
+            FullscreenModePolicy.NO_FULLSCREEN,
+            FullscreenModePolicy.FORCE_FULLSCREEN,
+            FullscreenModePolicy.OS_DEFAULT,
+    })
+    public @interface FullscreenModePolicy {
+        /**
+         * Let {@link MockIme} always return {@code false} from
+         * {@link android.inputmethodservice.InputMethodService#onEvaluateFullscreenMode()}.
+         *
+         * <p>This is chosen to be the default behavior of {@link MockIme} to make CTS tests most
+         * deterministic.</p>
+         */
+        int NO_FULLSCREEN = 0;
+
+        /**
+         * Let {@link MockIme} always return {@code true} from
+         * {@link android.inputmethodservice.InputMethodService#onEvaluateFullscreenMode()}.
+         *
+         * <p>This can be used to test the behaviors when a full-screen IME is running.</p>
+         */
+        int FORCE_FULLSCREEN = 1;
+
+        /**
+         * Let {@link MockIme} always return the default behavior of
+         * {@link android.inputmethodservice.InputMethodService#onEvaluateFullscreenMode()}.
+         *
+         * <p>This can be used to test the default behavior of that public API.</p>
+         */
+        int OS_DEFAULT = 2;
+    }
+
     ImeSettings(@NonNull String clientPackageName, @NonNull Bundle bundle) {
         mClientPackageName = clientPackageName;
         mEventCallbackActionName = bundle.getString(EVENT_CALLBACK_INTENT_ACTION_KEY);
@@ -74,8 +114,9 @@
         return mClientPackageName;
     }
 
-    public boolean fullscreenModeAllowed(boolean defaultValue) {
-        return mBundle.getBoolean(FULLSCREEN_MODE_ALLOWED, defaultValue);
+    @FullscreenModePolicy
+    public int fullscreenModePolicy() {
+        return mBundle.getInt(FULLSCREEN_MODE_POLICY);
     }
 
     @ColorInt
@@ -116,6 +157,10 @@
         return mBundle.getBoolean(WATERMARK_ENABLED, defaultValue);
     }
 
+    public int getWatermarkGravity(int defaultValue) {
+        return mBundle.getInt(WATERMARK_GRAVITY, defaultValue);
+    }
+
     public boolean getHardKeyboardConfigurationBehaviorAllowed(boolean defaultValue) {
         return mBundle.getBoolean(HARD_KEYBOARD_CONFIGURATION_BEHAVIOR_ALLOWED, defaultValue);
     }
@@ -152,15 +197,14 @@
         private final PersistableBundle mBundle = new PersistableBundle();
 
         /**
-         * Controls whether fullscreen mode is allowed or not.
+         * Controls how MockIme reacts to
+         * {@link android.inputmethodservice.InputMethodService#onEvaluateFullscreenMode()}.
          *
-         * <p>By default, fullscreen mode is not allowed in {@link MockIme}.</p>
-         *
-         * @param allowed {@code true} if fullscreen mode is allowed
+         * @param policy one of {@link FullscreenModePolicy}
          * @see MockIme#onEvaluateFullscreenMode()
          */
-        public Builder setFullscreenModeAllowed(boolean allowed) {
-            mBundle.putBoolean(FULLSCREEN_MODE_ALLOWED, allowed);
+        public Builder setFullscreenModePolicy(@FullscreenModePolicy int policy) {
+            mBundle.putInt(FULLSCREEN_MODE_POLICY, policy);
             return this;
         }
 
@@ -246,6 +290,18 @@
         }
 
         /**
+         * Sets the {@link android.view.Gravity} flags for the watermark image.
+         *
+         * <p>{@link android.view.Gravity#CENTER} will be used if not set.</p>
+         *
+         * @param gravity {@code true} {@link android.view.Gravity} flags to be set.
+         */
+        public Builder setWatermarkGravity(int gravity) {
+            mBundle.putInt(WATERMARK_GRAVITY, gravity);
+            return this;
+        }
+
+        /**
          * Controls whether {@link MockIme} is allowed to change the behavior based on
          * {@link android.content.res.Configuration#keyboard} and
          * {@link android.content.res.Configuration#hardKeyboardHidden}.
diff --git a/tests/inputmethod/mockime/src/com/android/cts/mockime/MockIme.java b/tests/inputmethod/mockime/src/com/android/cts/mockime/MockIme.java
index 342ab91..daccbb0 100644
--- a/tests/inputmethod/mockime/src/com/android/cts/mockime/MockIme.java
+++ b/tests/inputmethod/mockime/src/com/android/cts/mockime/MockIme.java
@@ -47,6 +47,7 @@
 import android.view.GestureDetector;
 import android.view.Gravity;
 import android.view.KeyEvent;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.Window;
@@ -64,6 +65,7 @@
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputContentInfo;
 import android.view.inputmethod.InputMethod;
+import android.view.inputmethod.TextAttribute;
 import android.widget.FrameLayout;
 import android.widget.HorizontalScrollView;
 import android.widget.ImageView;
@@ -99,6 +101,9 @@
     private static final String TAG = "MockIme";
 
     private static final String PACKAGE_NAME = "com.android.cts.mockime";
+    private ArrayList<MotionEvent> mEvents;
+
+    private View mExtractView;
 
     static ComponentName getComponentName() {
         return new ComponentName(PACKAGE_NAME, MockIme.class.getName());
@@ -178,6 +183,26 @@
                 // UI component accesses on a display context must throw strict mode violations.
                 final Context displayContext = createDisplayContext(getDisplay());
                 switch (command.getName()) {
+                    case "suspendCreateSession": {
+                        if (!Looper.getMainLooper().isCurrentThread()) {
+                            return new UnsupportedOperationException("suspendCreateSession can be"
+                                    + " requested only for the main thread.");
+                        }
+                        mSuspendCreateSession = true;
+                        return ImeEvent.RETURN_VALUE_UNAVAILABLE;
+                    }
+                    case "resumeCreateSession": {
+                        if (!Looper.getMainLooper().isCurrentThread()) {
+                            return new UnsupportedOperationException("resumeCreateSession can be"
+                                    + " requested only for the main thread.");
+                        }
+                        if (mSuspendedCreateSession != null) {
+                            mSuspendedCreateSession.run();
+                            mSuspendedCreateSession = null;
+                        }
+                        mSuspendCreateSession = false;
+                        return ImeEvent.RETURN_VALUE_UNAVAILABLE;
+                    }
                     case "memorizeCurrentInputConnection": {
                         if (!Looper.getMainLooper().isCurrentThread()) {
                             return new UnsupportedOperationException(
@@ -210,6 +235,13 @@
                         final int flag = command.getExtras().getInt("flag");
                         return getMemorizedOrCurrentInputConnection().getSelectedText(flag);
                     }
+                    case "getSurroundingText": {
+                        final int beforeLength = command.getExtras().getInt("beforeLength");
+                        final int afterLength = command.getExtras().getInt("afterLength");
+                        final int flags = command.getExtras().getInt("flags");
+                        return getMemorizedOrCurrentInputConnection().getSurroundingText(
+                                beforeLength, afterLength, flags);
+                    }
                     case "getCursorCapsMode": {
                         final int reqModes = command.getExtras().getInt("reqModes");
                         return getMemorizedOrCurrentInputConnection().getCursorCapsMode(reqModes);
@@ -233,28 +265,54 @@
                         return getMemorizedOrCurrentInputConnection()
                                 .deleteSurroundingTextInCodePoints(beforeLength, afterLength);
                     }
-                    case "setComposingText": {
+                    case "setComposingText(CharSequence,int)": {
                         final CharSequence text = command.getExtras().getCharSequence("text");
                         final int newCursorPosition =
                                 command.getExtras().getInt("newCursorPosition");
                         return getMemorizedOrCurrentInputConnection().setComposingText(
                                 text, newCursorPosition);
                     }
-                    case "setComposingRegion": {
+                    case "setComposingText(CharSequence,int,TextAttribute)": {
+                        final CharSequence text = command.getExtras().getCharSequence("text");
+                        final int newCursorPosition =
+                                command.getExtras().getInt("newCursorPosition");
+                        final TextAttribute textAttribute =
+                                command.getExtras().getParcelable("textAttribute");
+                        return getMemorizedOrCurrentInputConnection()
+                                .setComposingText(text, newCursorPosition, textAttribute);
+                    }
+                    case "setComposingRegion(int,int)": {
                         final int start = command.getExtras().getInt("start");
                         final int end = command.getExtras().getInt("end");
                         return getMemorizedOrCurrentInputConnection().setComposingRegion(start,
                                 end);
                     }
+                    case "setComposingRegion(int,int,TextAttribute)": {
+                        final int start = command.getExtras().getInt("start");
+                        final int end = command.getExtras().getInt("end");
+                        final TextAttribute textAttribute =
+                                command.getExtras().getParcelable("textAttribute");
+                        return getMemorizedOrCurrentInputConnection()
+                                .setComposingRegion(start, end, textAttribute);
+                    }
                     case "finishComposingText":
                         return getMemorizedOrCurrentInputConnection().finishComposingText();
-                    case "commitText": {
+                    case "commitText(CharSequence,int)": {
                         final CharSequence text = command.getExtras().getCharSequence("text");
                         final int newCursorPosition =
                                 command.getExtras().getInt("newCursorPosition");
                         return getMemorizedOrCurrentInputConnection().commitText(text,
                                 newCursorPosition);
                     }
+                    case "commitText(CharSequence,int,TextAttribute)": {
+                        final CharSequence text = command.getExtras().getCharSequence("text");
+                        final int newCursorPosition =
+                                command.getExtras().getInt("newCursorPosition");
+                        final TextAttribute textAttribute =
+                                command.getExtras().getParcelable("textAttribute");
+                        return getMemorizedOrCurrentInputConnection()
+                                .commitText(text, newCursorPosition, textAttribute);
+                    }
                     case "commitCompletion": {
                         final CompletionInfo text = command.getExtras().getParcelable("text");
                         return getMemorizedOrCurrentInputConnection().commitCompletion(text);
@@ -298,6 +356,9 @@
                     case "performSpellCheck": {
                         return getMemorizedOrCurrentInputConnection().performSpellCheck();
                     }
+                    case "takeSnapshot": {
+                        return getMemorizedOrCurrentInputConnection().takeSnapshot();
+                    }
                     case "performPrivateCommand": {
                         final String action = command.getExtras().getString("action");
                         final Bundle data = command.getExtras().getBundle("data");
@@ -306,8 +367,15 @@
                     }
                     case "requestCursorUpdates": {
                         final int cursorUpdateMode = command.getExtras().getInt("cursorUpdateMode");
-                        return getMemorizedOrCurrentInputConnection().requestCursorUpdates(
-                                cursorUpdateMode);
+                        final int cursorUpdateFilter =
+                                command.getExtras().getInt("cursorUpdateFilter", -1);
+                        if (cursorUpdateFilter == -1) {
+                            return getMemorizedOrCurrentInputConnection().requestCursorUpdates(
+                                    cursorUpdateMode);
+                        } else {
+                            return getMemorizedOrCurrentInputConnection().requestCursorUpdates(
+                                    cursorUpdateMode, cursorUpdateFilter);
+                        }
                     }
                     case "getHandler":
                         return getMemorizedOrCurrentInputConnection().getHandler();
@@ -322,6 +390,12 @@
                         return getMemorizedOrCurrentInputConnection().commitContent(
                                 inputContentInfo, flags, opts);
                     }
+                    case "setImeConsumesInput": {
+                        final boolean imeConsumesInput =
+                                command.getExtras().getBoolean("imeConsumesInput");
+                        return getMemorizedOrCurrentInputConnection().setImeConsumesInput(
+                                imeConsumesInput);
+                    }
                     case "setBackDisposition": {
                         final int backDisposition =
                                 command.getExtras().getInt("backDisposition");
@@ -363,6 +437,17 @@
                     case "setInlineSuggestionsExtras":
                         mInlineSuggestionsExtras = command.getExtras();
                         return ImeEvent.RETURN_VALUE_UNAVAILABLE;
+                    case "verifyExtractViewNotNull":
+                        if (mExtractView == null) {
+                            return false;
+                        } else {
+                            return mExtractView.findViewById(android.R.id.inputExtractAction)
+                                    != null
+                                    && mExtractView.findViewById(
+                                            android.R.id.inputExtractAccessories) != null
+                                    && mExtractView.findViewById(
+                                            android.R.id.inputExtractEditText) != null;
+                        }
                     case "verifyGetDisplay":
                         try {
                             return verifyGetDisplay();
@@ -424,6 +509,26 @@
 
                         return ImeEvent.RETURN_VALUE_UNAVAILABLE;
                     }
+                    case "getStylusHandwritingWindowVisibility": {
+                        View decorView = getStylusHandwritingWindow().getDecorView();
+                        return decorView != null && decorView.isAttachedToWindow()
+                                && decorView.getVisibility() == View.VISIBLE;
+                    }
+                    case "setStylusHandwritingInkView": {
+                        View inkView = new View(attrContext);
+                        getStylusHandwritingWindow().setContentView(inkView);
+                        mEvents = new ArrayList<>();
+                        inkView.setOnTouchListener((view, event) ->
+                                mEvents.add(MotionEvent.obtain(event)));
+                        return true;
+                    }
+                    case "getStylusHandwritingEvents": {
+                        return mEvents;
+                    }
+                    case "finishStylusHandwriting": {
+                        finishStylusHandwriting();
+                        return ImeEvent.RETURN_VALUE_UNAVAILABLE;
+                    }
                     case "getCurrentWindowMetricsBounds": {
                         return getSystemService(WindowManager.class)
                                 .getCurrentWindowMetrics().getBounds();
@@ -481,6 +586,25 @@
         return mClientPackageName.get();
     }
 
+    private boolean mDestroying;
+
+    /**
+     * {@code true} if {@link MockInputMethodImpl#createSession(InputMethod.SessionCallback)}
+     * needs to be suspended.
+     *
+     * <p>Must be touched from the main thread.</p>
+     */
+    private boolean mSuspendCreateSession = false;
+
+    /**
+     * The suspended {@link MockInputMethodImpl#createSession(InputMethod.SessionCallback)} callback
+     * operation.
+     *
+     * <p>Must be touched from the main thread.</p>
+     */
+    @Nullable
+    Runnable mSuspendedCreateSession;
+
     private class MockInputMethodImpl extends InputMethodImpl {
         @Override
         public void showSoftInput(int flags, ResultReceiver resultReceiver) {
@@ -495,6 +619,25 @@
         }
 
         @Override
+        public void createSession(SessionCallback callback) {
+            getTracer().createSession(() -> {
+                if (mSuspendCreateSession) {
+                    if (mSuspendedCreateSession != null) {
+                        throw new IllegalStateException("suspendCreateSession() must be "
+                                + "called before receiving another createSession()");
+                    }
+                    mSuspendedCreateSession = () -> {
+                        if (!mDestroying) {
+                            super.createSession(callback);
+                        }
+                    };
+                } else {
+                    super.createSession(callback);
+                }
+            });
+        }
+
+        @Override
         public void attachToken(IBinder token) {
             getTracer().attachToken(token, () -> super.attachToken(token));
         }
@@ -541,7 +684,7 @@
             final Handler handler = new Handler(mHandlerThread.getLooper());
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 registerReceiver(mCommandReceiver, filter, null /* broadcastPermission */, handler,
-                        Context.RECEIVER_VISIBLE_TO_INSTANT_APPS);
+                        Context.RECEIVER_VISIBLE_TO_INSTANT_APPS | Context.RECEIVER_EXPORTED);
             } else {
                 registerReceiver(mCommandReceiver, filter, null /* broadcastPermission */, handler);
             }
@@ -589,8 +732,26 @@
 
     @Override
     public boolean onEvaluateFullscreenMode() {
-        return getTracer().onEvaluateFullscreenMode(() ->
-                mSettings.fullscreenModeAllowed(false) && super.onEvaluateFullscreenMode());
+        return getTracer().onEvaluateFullscreenMode(() -> {
+            final int policy = mSettings.fullscreenModePolicy();
+            switch (policy) {
+                case ImeSettings.FullscreenModePolicy.NO_FULLSCREEN:
+                    return false;
+                case ImeSettings.FullscreenModePolicy.FORCE_FULLSCREEN:
+                    return true;
+                case ImeSettings.FullscreenModePolicy.OS_DEFAULT:
+                    return super.onEvaluateFullscreenMode();
+                default:
+                    Log.e(TAG, "unknown FullscreenModePolicy=" + policy);
+                    return false;
+            }
+        });
+    }
+
+    @Override
+    public View onCreateExtractTextView() {
+        mExtractView =  super.onCreateExtractTextView();
+        return mExtractView;
     }
 
     private static final class KeyboardLayoutView extends LinearLayout {
@@ -663,7 +824,7 @@
                     imageView.setImageBitmap(bitmap);
                     secondaryLayout.addView(imageView,
                             new FrameLayout.LayoutParams(bitmap.getWidth(), bitmap.getHeight(),
-                                    Gravity.CENTER));
+                                    mSettings.getWatermarkGravity(Gravity.CENTER)));
                 }
 
                 mLayout.addView(secondaryLayout);
@@ -793,6 +954,37 @@
                 () -> super.onStartInputView(editorInfo, restarting));
     }
 
+
+    @Override
+    public void onPrepareStylusHandwriting() {
+        getTracer().onPrepareStylusHandwriting(() -> super.onPrepareStylusHandwriting());
+    }
+
+    @Override
+    public boolean onStartStylusHandwriting() {
+        if (mEvents != null) {
+            mEvents.clear();
+        }
+        getTracer().onStartStylusHandwriting(() -> super.onStartStylusHandwriting());
+        return true;
+    }
+
+    @Override
+    public void onStylusHandwritingMotionEvent(@NonNull MotionEvent motionEvent) {
+        if (mEvents == null) {
+            mEvents = new ArrayList<>();
+        }
+        mEvents.add(MotionEvent.obtain(motionEvent));
+        getTracer().onStylusHandwritingMotionEvent(()
+                -> super.onStylusHandwritingMotionEvent(motionEvent));
+    }
+
+    @Override
+    public void onFinishStylusHandwriting() {
+        getTracer().onFinishStylusHandwriting(() -> super.onFinishStylusHandwriting());
+    }
+
+
     @Override
     public void onFinishInputView(boolean finishingInput) {
         getTracer().onFinishInputView(finishingInput,
@@ -862,6 +1054,7 @@
     @Override
     public void onDestroy() {
         getTracer().onDestroy(() -> {
+            mDestroying = true;
             super.onDestroy();
             unregisterReceiver(mCommandReceiver);
             mHandlerThread.quitSafely();
@@ -917,8 +1110,18 @@
         stylesBuilder.addStyle(InlineSuggestionUi.newStyleBuilder().build());
         Bundle styles = stylesBuilder.build();
 
+
+        final boolean supportedInlineSuggestions;
         if (mInlineSuggestionsExtras != null) {
             styles.putAll(mInlineSuggestionsExtras);
+            supportedInlineSuggestions =
+                    mInlineSuggestionsExtras.getBoolean("InlineSuggestions", true);
+        } else {
+            supportedInlineSuggestions = true;
+        }
+
+        if (!supportedInlineSuggestions) {
+            return null;
         }
 
         return getTracer().onCreateInlineSuggestionsRequest(() -> {
@@ -1094,6 +1297,10 @@
             recordEventInternal("onCreate", runnable);
         }
 
+        void createSession(@NonNull Runnable runnable) {
+            recordEventInternal("createSession", runnable);
+        }
+
         void onVerify(String name, @NonNull BooleanSupplier supplier) {
             final Bundle arguments = new Bundle();
             arguments.putString("name", name);
@@ -1141,6 +1348,28 @@
             recordEventInternal("onStartInputView", runnable, arguments);
         }
 
+        void onPrepareStylusHandwriting(@NonNull Runnable runnable) {
+            final Bundle arguments = new Bundle();
+            arguments.putParcelable("editorInfo", mIme.getCurrentInputEditorInfo());
+            recordEventInternal("onPrepareStylusHandwriting", runnable, arguments);
+        }
+
+        void onStartStylusHandwriting(@NonNull Runnable runnable) {
+            final Bundle arguments = new Bundle();
+            arguments.putParcelable("editorInfo", mIme.getCurrentInputEditorInfo());
+            recordEventInternal("onStartStylusHandwriting", runnable, arguments);
+        }
+
+        void onStylusHandwritingMotionEvent(@NonNull Runnable runnable) {
+            recordEventInternal("onStylusMotionEvent", runnable);
+        }
+
+        void onFinishStylusHandwriting(@NonNull Runnable runnable) {
+            final Bundle arguments = new Bundle();
+            arguments.putParcelable("editorInfo", mIme.getCurrentInputEditorInfo());
+            recordEventInternal("onFinishStylusHandwriting", runnable, arguments);
+        }
+
         void onFinishInputView(boolean finishingInput, @NonNull Runnable runnable) {
             final Bundle arguments = new Bundle();
             arguments.putBoolean("finishingInput", finishingInput);
diff --git a/tests/inputmethod/mockime/src/com/android/cts/mockime/MockImeSession.java b/tests/inputmethod/mockime/src/com/android/cts/mockime/MockImeSession.java
index 2aa20c1..87cd773 100644
--- a/tests/inputmethod/mockime/src/com/android/cts/mockime/MockImeSession.java
+++ b/tests/inputmethod/mockime/src/com/android/cts/mockime/MockImeSession.java
@@ -30,6 +30,7 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -45,8 +46,11 @@
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputContentInfo;
 import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.TextAttribute;
 
+import androidx.annotation.AnyThread;
 import androidx.annotation.GuardedBy;
+import androidx.annotation.IntRange;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -76,6 +80,9 @@
     @NonNull
     private final UiAutomation mUiAutomation;
 
+    @NonNull
+    private final AtomicBoolean mActive = new AtomicBoolean(true);
+
     private final HandlerThread mHandlerThread = new HandlerThread("EventReceiver");
 
     private static final class EventStore {
@@ -211,9 +218,15 @@
         writeMockImeSettings(mContext, mImeEventActionName, imeSettings);
 
         mHandlerThread.start();
-        mContext.registerReceiver(mEventReceiver,
-                new IntentFilter(mImeEventActionName), null /* broadcastPermission */,
-                new Handler(mHandlerThread.getLooper()));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            mContext.registerReceiver(mEventReceiver,
+                    new IntentFilter(mImeEventActionName), null /* broadcastPermission */,
+                    new Handler(mHandlerThread.getLooper()), Context.RECEIVER_EXPORTED);
+        } else {
+            mContext.registerReceiver(mEventReceiver,
+                    new IntentFilter(mImeEventActionName), null /* broadcastPermission */,
+                    new Handler(mHandlerThread.getLooper()));
+        }
 
         executeShellCommand(mUiAutomation, "ime enable " + getMockImeId());
         executeShellCommand(mUiAutomation, "ime set " + getMockImeId());
@@ -292,10 +305,20 @@
     }
 
     /**
+     * @return {@code true} until {@link #close()} gets called.
+     */
+    @AnyThread
+    public boolean isActive() {
+        return mActive.get();
+    }
+
+    /**
      * Closes the active session and de-selects {@link MockIme}. Currently which IME will be
      * selected next is up to the system.
      */
     public void close() throws Exception {
+        mActive.set(false);
+
         executeShellCommand(mUiAutomation, "ime reset");
 
         PollingCheck.check("Make sure that MockIME becomes unavailable", TIMEOUT, () ->
@@ -331,6 +354,42 @@
     }
 
     /**
+     * Lets {@link MockIme} suspend {@link MockIme.AbstractInputMethodImpl#createSession(
+     * android.view.inputmethod.InputMethod.SessionCallback)} until {@link #resumeCreateSession()}.
+     *
+     * <p>This is useful to test a tricky timing issue that the IME client initiated the
+     * IME session but {@link android.view.inputmethod.InputMethodSession} is not available
+     * yet.</p>
+     *
+     * <p>For simplicity and stability, {@link #suspendCreateSession()} must be called before
+     * {@link MockIme.AbstractInputMethodImpl#createSession(
+     * android.view.inputmethod.InputMethod.SessionCallback)} gets called again.</p>
+     *
+     * @return {@link ImeCommand} object that can be passed to
+     *         {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to
+     *         wait until this event is handled by {@link MockIme}.
+     */
+    @NonNull
+    public ImeCommand suspendCreateSession() {
+        return callCommandInternal("suspendCreateSession", new Bundle());
+    }
+
+    /**
+     * Lets {@link MockIme} resume suspended {@link MockIme.AbstractInputMethodImpl#createSession(
+     * android.view.inputmethod.InputMethod.SessionCallback)}.
+     *
+     * <p>Does nothing if {@link #suspendCreateSession()} was not called.</p>
+     *
+     * @return {@link ImeCommand} object that can be passed to
+     *         {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to
+     *         wait until this event is handled by {@link MockIme}.
+     */
+    @NonNull
+    public ImeCommand resumeCreateSession() {
+        return callCommandInternal("resumeCreateSession", new Bundle());
+    }
+
+    /**
      * Lets {@link MockIme} to call
      * {@link android.inputmethodservice.InputMethodService#getCurrentInputConnection()} and
      * memorize  it for later {@link InputConnection}-related operations.
@@ -440,6 +499,36 @@
     }
 
     /**
+     * Lets {@link MockIme} to call {@link InputConnection#getSurroundingText(int, int, int)} with
+     * the given parameters.
+     *
+     * <p>This triggers {@code getCurrentInputConnection().getSurroundingText(int, int, int)}.</p>
+     *
+     * <p>Use {@link ImeEvent#getReturnParcelableValue()} for {@link ImeEvent} returned from
+     * {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to see the
+     * value returned from the API.</p>
+     *
+     * <p>This can be affected by {@link #memorizeCurrentInputConnection()}.</p>
+     *
+     * @param beforeLength The expected length of the text before the cursor.
+     * @param afterLength The expected length of the text after the cursor.
+     * @param flags Supplies additional options controlling how the text is returned. May be either
+     *              {@code 0} or {@link InputConnection#GET_TEXT_WITH_STYLES}.
+     * @return {@link ImeCommand} object that can be passed to
+     *         {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to
+     *         wait until this event is handled by {@link MockIme}.
+     */
+    @NonNull
+    public ImeCommand callGetSurroundingText(@IntRange(from = 0) int beforeLength,
+            @IntRange(from = 0) int afterLength, int flags) {
+        final Bundle params = new Bundle();
+        params.putInt("beforeLength", beforeLength);
+        params.putInt("afterLength", afterLength);
+        params.putInt("flags", flags);
+        return callCommandInternal("getSurroundingText", params);
+    }
+
+    /**
      * Lets {@link MockIme} to call {@link InputConnection#getCursorCapsMode(int)} with the given
      * parameters.
      *
@@ -569,7 +658,39 @@
         final Bundle params = new Bundle();
         params.putCharSequence("text", text);
         params.putInt("newCursorPosition", newCursorPosition);
-        return callCommandInternal("setComposingText", params);
+        return callCommandInternal("setComposingText(CharSequence,int)", params);
+    }
+
+    /**
+     * Lets {@link MockIme} to call
+     * {@link InputConnection#setComposingText(CharSequence, int, TextAttribute)} with the given
+     * parameters.
+     *
+     * <p>This triggers
+     * {@code getCurrentInputConnection().setComposingText(text, newCursorPosition, textAttribute)}.
+     * </p>
+     *
+     * <p>Use {@link ImeEvent#getReturnBooleanValue()} for {@link ImeEvent} returned from
+     * {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to see the
+     * value returned from the API.</p>
+     *
+     * <p>This can be affected by {@link #memorizeCurrentInputConnection()}.</p>
+     *
+     * @param text to be passed as the {@code text} parameter
+     * @param newCursorPosition to be passed as the {@code newCursorPosition} parameter
+     * @param textAttribute to be passed as the {@code textAttribute} parameter
+     * @return {@link ImeCommand} object that can be passed to
+     *         {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to
+     *         wait until this event is handled by {@link MockIme}
+     */
+    @NonNull
+    public ImeCommand callSetComposingText(@Nullable CharSequence text, int newCursorPosition,
+            @Nullable TextAttribute textAttribute) {
+        final Bundle params = new Bundle();
+        params.putCharSequence("text", text);
+        params.putInt("newCursorPosition", newCursorPosition);
+        params.putParcelable("textAttribute", textAttribute);
+        return callCommandInternal("setComposingText(CharSequence,int,TextAttribute)", params);
     }
 
     /**
@@ -595,7 +716,37 @@
         final Bundle params = new Bundle();
         params.putInt("start", start);
         params.putInt("end", end);
-        return callCommandInternal("setComposingRegion", params);
+        return callCommandInternal("setComposingRegion(int,int)", params);
+    }
+
+    /**
+     * Lets {@link MockIme} to call
+     * {@link InputConnection#setComposingRegion(int, int, TextAttribute)} with the given
+     * parameters.
+     *
+     * <p>This triggers
+     * {@code getCurrentInputConnection().setComposingRegion(start, end, TextAttribute)}.</p>
+     *
+     * <p>Use {@link ImeEvent#getReturnBooleanValue()} for {@link ImeEvent} returned from
+     * {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to see the
+     * value returned from the API.</p>
+     *
+     * <p>This can be affected by {@link #memorizeCurrentInputConnection()}.</p>
+     *
+     * @param start to be passed as the {@code start} parameter
+     * @param end to be passed as the {@code end} parameter
+     * @return {@link ImeCommand} object that can be passed to
+     *         {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to
+     *         wait until this event is handled by {@link MockIme}.
+     */
+    @NonNull
+    public ImeCommand callSetComposingRegion(int start, int end,
+            @Nullable TextAttribute textAttribute) {
+        final Bundle params = new Bundle();
+        params.putInt("start", start);
+        params.putInt("end", end);
+        params.putParcelable("textAttribute", textAttribute);
+        return callCommandInternal("setComposingRegion(int,int,TextAttribute)", params);
     }
 
     /**
@@ -643,7 +794,37 @@
         final Bundle params = new Bundle();
         params.putCharSequence("text", text);
         params.putInt("newCursorPosition", newCursorPosition);
-        return callCommandInternal("commitText", params);
+        return callCommandInternal("commitText(CharSequence,int)", params);
+    }
+
+    /**
+     * Lets {@link MockIme} to call
+     * {@link InputConnection#commitText(CharSequence, int, TextAttribute)} with the given
+     * parameters.
+     *
+     * <p>This triggers
+     * {@code getCurrentInputConnection().commitText(text, newCursorPosition, TextAttribute)}.</p>
+     *
+     * <p>Use {@link ImeEvent#getReturnBooleanValue()} for {@link ImeEvent} returned from
+     * {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to see the
+     * value returned from the API.</p>
+     *
+     * <p>This can be affected by {@link #memorizeCurrentInputConnection()}.</p>
+     *
+     * @param text to be passed as the {@code text} parameter
+     * @param newCursorPosition to be passed as the {@code newCursorPosition} parameter
+     * @return {@link ImeCommand} object that can be passed to
+     *         {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to
+     *         wait until this event is handled by {@link MockIme}
+     */
+    @NonNull
+    public ImeCommand callCommitText(@Nullable CharSequence text, int newCursorPosition,
+            @Nullable TextAttribute textAttribute) {
+        final Bundle params = new Bundle();
+        params.putCharSequence("text", text);
+        params.putInt("newCursorPosition", newCursorPosition);
+        params.putParcelable("textAttribute", textAttribute);
+        return callCommandInternal("commitText(CharSequence,int,TextAttribute)", params);
     }
 
     /**
@@ -853,6 +1034,22 @@
     }
 
     /**
+     * Lets {@link MockIme} to call {@link InputConnection#takeSnapshot()}.
+     *
+     * <p>This triggers {@code getCurrentInputConnection().takeSnapshot()}.</p>
+     *
+     * <p>This can be affected by {@link #memorizeCurrentInputConnection()}.</p>
+
+     * @return {@link ImeCommand} object that can be passed to
+     *         {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to
+     *         wait until this event is handled by {@link MockIme}
+     */
+    @NonNull
+    public ImeCommand callTakeSnapshot() {
+        return callCommandInternal("takeSnapshot", new Bundle());
+    }
+
+    /**
      * Lets {@link MockIme} to call {@link InputConnection#clearMetaKeyStates(int)} with the given
      * parameters.
      *
@@ -952,6 +1149,34 @@
     }
 
     /**
+     * Lets {@link MockIme} to call {@link InputConnection#requestCursorUpdates(int, int)} with the
+     * given parameters.
+     *
+     * <p>This triggers {@code getCurrentInputConnection().requestCursorUpdates(
+     * cursorUpdateMode, cursorUpdateFilter)}.
+     * </p>
+     *
+     * <p>Use {@link ImeEvent#getReturnBooleanValue()} for {@link ImeEvent} returned from
+     * {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to see the
+     * value returned from the API.</p>
+     *
+     * <p>This can be affected by {@link #memorizeCurrentInputConnection()}.</p>
+     *
+     * @param cursorUpdateMode to be passed as the {@code cursorUpdateMode} parameter
+     * @param cursorUpdateFilter to be passed as the {@code cursorUpdateFilter} parameter
+     * @return {@link ImeCommand} object that can be passed to
+     *         {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to
+     *         wait until this event is handled by {@link MockIme}
+     */
+    @NonNull
+    public ImeCommand callRequestCursorUpdates(int cursorUpdateMode, int cursorUpdateFilter) {
+        final Bundle params = new Bundle();
+        params.putInt("cursorUpdateMode", cursorUpdateMode);
+        params.putInt("cursorUpdateFilter", cursorUpdateFilter);
+        return callCommandInternal("requestCursorUpdates", params);
+    }
+
+    /**
      * Lets {@link MockIme} to call {@link InputConnection#getHandler()} with the given parameters.
      *
      * <p>This triggers {@code getCurrentInputConnection().getHandler()}.</p>
@@ -1024,6 +1249,30 @@
     }
 
     /**
+     * Lets {@link MockIme} to call {@link InputConnection#setImeConsumesInput(boolean)} with the
+     * given parameters.
+     *
+     * <p>This triggers {@code getCurrentInputConnection().setImeConsumesInput(boolean)}.</p>
+     *
+     * <p>Use {@link ImeEvent#getReturnBooleanValue()} for {@link ImeEvent} returned from
+     * {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to see the
+     * value returned from the API.</p>
+     *
+     * <p>This can be affected by {@link #memorizeCurrentInputConnection()}.</p>
+     *
+     * @param imeConsumesInput to be passed as the {@code imeConsumesInput} parameter
+     * @return {@link ImeCommand} object that can be passed to
+     *         {@link ImeEventStreamTestUtils#expectCommand(ImeEventStream, ImeCommand, long)} to
+     *         wait until this event is handled by {@link MockIme}
+     */
+    @NonNull
+    public ImeCommand callSetImeConsumesInput(boolean imeConsumesInput) {
+        final Bundle params = new Bundle();
+        params.putBoolean("imeConsumesInput", imeConsumesInput);
+        return callCommandInternal("setImeConsumesInput", params);
+    }
+
+    /**
      * Lets {@link MockIme} to call
      * {@link android.inputmethodservice.InputMethodService#setBackDisposition(int)} with the given
      * parameters.
@@ -1151,6 +1400,11 @@
     }
 
     @NonNull
+    public ImeCommand callVerifyExtractViewNotNull() {
+        return callCommandInternal("verifyExtractViewNotNull", new Bundle());
+    }
+
+    @NonNull
     public ImeCommand callVerifyGetDisplay() {
         return callCommandInternal("verifyGetDisplay", new Bundle());
     }
@@ -1191,6 +1445,26 @@
     }
 
     @NonNull
+    public ImeCommand callGetStylusHandwritingWindowVisibility() {
+        return callCommandInternal("getStylusHandwritingWindowVisibility", new Bundle());
+    }
+
+    @NonNull
+    public ImeCommand callSetStylusHandwritingInkView() {
+        return callCommandInternal("setStylusHandwritingInkView", new Bundle());
+    }
+
+    @NonNull
+    public ImeCommand callGetStylusHandwritingEvents() {
+        return callCommandInternal("getStylusHandwritingEvents", new Bundle());
+    }
+
+    @NonNull
+    public ImeCommand callFinishStylusHandwriting() {
+        return callCommandInternal("finishStylusHandwriting", new Bundle());
+    }
+
+    @NonNull
     public ImeCommand callGetCurrentWindowMetricsBounds() {
         return callCommandInternal("getCurrentWindowMetricsBounds", new Bundle());
     }
diff --git a/tests/inputmethod/res/values/colors.xml b/tests/inputmethod/res/values/colors.xml
deleted file mode 100644
index 1d87ea8..0000000
--- a/tests/inputmethod/res/values/colors.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2017 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.
- -->
-
-<resources>
-    <drawable name="blue">#770000ff</drawable>
-</resources>
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/BaseInputConnectionTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
index f3bd570..8833f41 100644
--- a/tests/inputmethod/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/BaseInputConnectionTest.java
@@ -16,6 +16,8 @@
 
 package android.view.inputmethod.cts;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -40,8 +42,10 @@
 import android.view.inputmethod.InputContentInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.SurroundingText;
+import android.view.inputmethod.TextSnapshot;
 import android.view.inputmethod.cts.util.InputConnectionTestUtils;
 
+import androidx.annotation.NonNull;
 import androidx.test.filters.MediumTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
@@ -53,6 +57,9 @@
 @RunWith(AndroidJUnit4.class)
 public class BaseInputConnectionTest {
 
+    private static final int CAPS_MODE_MASK = TextUtils.CAP_MODE_CHARACTERS
+            | TextUtils.CAP_MODE_WORDS | TextUtils.CAP_MODE_SENTENCES;
+
     private static BaseInputConnection createBaseInputConnection() {
         final View view = new View(InstrumentationRegistry.getInstrumentation().getTargetContext());
         return new BaseInputConnection(view, true);
@@ -189,6 +196,23 @@
     }
 
     /**
+     * An utility method to create an instance of {@link BaseInputConnection} from {@link Editable}.
+     *
+     * @param editable the initial text.
+     * @return {@link BaseInputConnection} instantiated in the full editor mode with
+     *         {@code editable}.
+     */
+    private static BaseInputConnection createConnection(@NonNull Editable editable) {
+        final View view = new View(InstrumentationRegistry.getInstrumentation().getTargetContext());
+        return new BaseInputConnection(view, true) {
+            @Override
+            public Editable getEditable() {
+                return editable;
+            }
+        };
+    }
+
+    /**
      * An utility method to create an instance of {@link BaseInputConnection} in the full editor
      * mode with an initial text and selection range.
      *
@@ -201,13 +225,7 @@
         final int selectionEnd = Selection.getSelectionEnd(source);
         final Editable editable = Editable.Factory.getInstance().newEditable(source);
         Selection.setSelection(editable, selectionStart, selectionEnd);
-        final View view = new View(InstrumentationRegistry.getInstrumentation().getTargetContext());
-        return new BaseInputConnection(view, true) {
-            @Override
-            public Editable getEditable() {
-                return editable;
-            }
-        };
+        return createConnection(editable);
     }
 
     private static void verifyDeleteSurroundingTextMain(final String initialState,
@@ -616,4 +634,44 @@
                 100, BaseInputConnection.GET_TEXT_WITH_STYLES).toString());
         expectThrows(IllegalArgumentException.class, ()-> connection.getTextAfterCursor(-1, 0));
     }
+
+    @Test
+    public void testTakeSnapshot() {
+        final BaseInputConnection connection = createConnectionWithSelection(
+                InputConnectionTestUtils.formatString("0123[456]789"));
+
+        verifyTextSnapshot(connection);
+
+        connection.setSelection(10, 10);
+        verifyTextSnapshot(connection);
+
+        connection.setComposingRegion(3, 10);
+        verifyTextSnapshot(connection);
+
+        connection.finishComposingText();
+        verifyTextSnapshot(connection);
+    }
+
+    @Test
+    public void testTakeSnapshotForNoSelection() {
+        final BaseInputConnection connection = createConnection(
+                Editable.Factory.getInstance().newEditable("test"));
+        // null should be returned for text with no selection.
+        assertThat(connection.takeSnapshot()).isNull();
+    }
+
+    private void verifyTextSnapshot(@NonNull BaseInputConnection connection) {
+        final Editable editable = connection.getEditable();
+
+        final TextSnapshot snapshot = connection.takeSnapshot();
+        assertThat(snapshot).isNotNull();
+        assertThat(snapshot.getSelectionStart()).isEqualTo(Selection.getSelectionStart(editable));
+        assertThat(snapshot.getSelectionEnd()).isEqualTo(Selection.getSelectionEnd(editable));
+        assertThat(snapshot.getCompositionStart())
+                .isEqualTo(BaseInputConnection.getComposingSpanStart(editable));
+        assertThat(snapshot.getCompositionEnd())
+                .isEqualTo(BaseInputConnection.getComposingSpanEnd(editable));
+        assertThat(snapshot.getCursorCapsMode()).isEqualTo(
+                connection.getCursorCapsMode(CAPS_MODE_MASK));
+    }
 }
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/CursorAnchorInfoTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/CursorAnchorInfoTest.java
index 466a7cd..d8128a8 100644
--- a/tests/inputmethod/src/android/view/inputmethod/cts/CursorAnchorInfoTest.java
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/CursorAnchorInfoTest.java
@@ -32,6 +32,7 @@
 import android.text.TextUtils;
 import android.view.inputmethod.CursorAnchorInfo;
 import android.view.inputmethod.CursorAnchorInfo.Builder;
+import android.view.inputmethod.EditorBoundsInfo;
 
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
@@ -103,12 +104,17 @@
         Matrix transformMatrix = new Matrix();
         transformMatrix.setScale(10.0f, 20.0f);
 
+        final EditorBoundsInfo boundsInfo =
+                new EditorBoundsInfo.Builder().setEditorBounds(MANY_BOUNDS[0])
+                        .setHandwritingBounds(MANY_BOUNDS[1]).build();
+
         final Builder builder = new Builder();
         builder.setSelectionRange(selectionStart, selectionEnd)
                 .setComposingText(composingTextStart, composingText)
                 .setInsertionMarkerLocation(insertionMarkerHorizontal, insertionMarkerTop,
                         insertionMarkerBaseline, insertionMarkerBottom, insertionMarkerFlags)
-                .setMatrix(transformMatrix);
+                .setMatrix(transformMatrix)
+                .setEditorBoundsInfo(boundsInfo);
         for (int i = 0; i < MANY_BOUNDS.length; i++) {
             final RectF bounds = MANY_BOUNDS[i];
             final int flags = MANY_FLAGS_ARRAY[i];
@@ -127,6 +133,11 @@
         assertEquals(insertionMarkerBaseline, info.getInsertionMarkerBaseline(), EPSILON);
         assertEquals(insertionMarkerBottom, info.getInsertionMarkerBottom(), EPSILON);
         assertEquals(transformMatrix, info.getMatrix());
+        assertEquals(boundsInfo, info.getEditorBoundsInfo());
+        assertEquals(MANY_BOUNDS[0],
+                info.getEditorBoundsInfo().getEditorBounds());
+        assertEquals(MANY_BOUNDS[1],
+                info.getEditorBoundsInfo().getHandwritingBounds());
         for (int i = 0; i < MANY_BOUNDS.length; i++) {
             final RectF expectedBounds = MANY_BOUNDS[i];
             assertEquals(expectedBounds, info.getCharacterBounds(i));
@@ -151,6 +162,7 @@
         assertEquals(insertionMarkerTop, info2.getInsertionMarkerTop(), EPSILON);
         assertEquals(insertionMarkerBaseline, info2.getInsertionMarkerBaseline(), EPSILON);
         assertEquals(insertionMarkerBottom, info2.getInsertionMarkerBottom(), EPSILON);
+        assertEquals(boundsInfo, info2.getEditorBoundsInfo());
         assertEquals(transformMatrix, info2.getMatrix());
         for (int i = 0; i < MANY_BOUNDS.length; i++) {
             final RectF expectedBounds = MANY_BOUNDS[i];
@@ -178,6 +190,7 @@
         assertEquals(insertionMarkerTop, info3.getInsertionMarkerTop(), EPSILON);
         assertEquals(insertionMarkerBaseline, info3.getInsertionMarkerBaseline(), EPSILON);
         assertEquals(insertionMarkerBottom, info3.getInsertionMarkerBottom(), EPSILON);
+        assertEquals(boundsInfo, info3.getEditorBoundsInfo());
         assertEquals(transformMatrix, info3.getMatrix());
         for (int i = 0; i < MANY_BOUNDS.length; i++) {
             final RectF expectedBounds = MANY_BOUNDS[i];
@@ -204,6 +217,7 @@
         assertEquals(Float.NaN, uninitializedInfo.getInsertionMarkerTop(), EPSILON);
         assertEquals(Float.NaN, uninitializedInfo.getInsertionMarkerBaseline(), EPSILON);
         assertEquals(Float.NaN, uninitializedInfo.getInsertionMarkerBottom(), EPSILON);
+        assertEquals(null, uninitializedInfo.getEditorBoundsInfo());
         assertEquals(new Matrix(), uninitializedInfo.getMatrix());
     }
 
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/EditTextImeSupportTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/EditTextImeSupportTest.java
index b1e0c1d..66c27f3 100644
--- a/tests/inputmethod/src/android/view/inputmethod/cts/EditTextImeSupportTest.java
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/EditTextImeSupportTest.java
@@ -30,7 +30,10 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import android.graphics.Color;
 import android.os.SystemClock;
+import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.SurroundingText;
@@ -198,6 +201,109 @@
     }
 
     /**
+     * Test when to see {@link EditorInfo#IME_FLAG_NAVIGATE_NEXT} and
+     * {@link EditorInfo#IME_FLAG_NAVIGATE_PREVIOUS}.
+     *
+     * <p>This is also a regression test for Bug 31099943.</p>
+     */
+    @Test
+    public void testNavigateFlags() throws Exception {
+        try (MockImeSession imeSession = MockImeSession.create(
+                InstrumentationRegistry.getInstrumentation().getContext(),
+                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            // For a single EditText, there should be no navigate flag
+            verifyNavigateFlags(stream, new Control[]{
+                    Control.FOCUSED_EDIT_TEXT,
+            }, false /* navigateNext */, false /* navigatePrevious */);
+
+            // For two EditText controls, there should be one navigate flag depending on the
+            // geometry.
+            verifyNavigateFlags(stream, new Control[]{
+                    Control.FOCUSED_EDIT_TEXT,
+                    Control.EDIT_TEXT,
+            }, true /* navigateNext */, false /* navigatePrevious */);
+            verifyNavigateFlags(stream, new Control[]{
+                    Control.EDIT_TEXT,
+                    Control.FOCUSED_EDIT_TEXT,
+            }, false /* navigateNext */, true /* navigatePrevious */);
+
+            // Non focusable View controls should be ignored when determining navigation flags.
+            verifyNavigateFlags(stream, new Control[]{
+                    Control.NON_FOCUSABLE_VIEW,
+                    Control.FOCUSED_EDIT_TEXT,
+                    Control.NON_FOCUSABLE_VIEW,
+            }, false /* navigateNext */, false /* navigatePrevious */);
+
+            // Even focusable View controls should be ignored when determining navigation flags if
+            // View#onCheckIsTextEditor() returns false. (Regression test for Bug 31099943)
+            verifyNavigateFlags(stream, new Control[]{
+                    Control.FOCUSABLE_VIEW,
+                    Control.FOCUSED_EDIT_TEXT,
+                    Control.FOCUSABLE_VIEW,
+            }, false /* navigateNext */, false /* navigatePrevious */);
+        }
+    }
+
+    private enum Control {
+        EDIT_TEXT,
+        FOCUSED_EDIT_TEXT,
+        FOCUSABLE_VIEW,
+        NON_FOCUSABLE_VIEW,
+    }
+
+    private void verifyNavigateFlags(@NonNull ImeEventStream stream, @NonNull Control[] controls,
+            boolean navigateNext, boolean navigatePrevious) throws Exception {
+        final String marker = getTestMarker();
+        TestActivity.startSync(activity-> {
+            final LinearLayout layout = new LinearLayout(activity);
+            layout.setOrientation(LinearLayout.VERTICAL);
+            for (Control control : controls) {
+                switch (control) {
+                    case EDIT_TEXT:
+                    case FOCUSED_EDIT_TEXT: {
+                        final boolean focused = (Control.FOCUSED_EDIT_TEXT == control);
+                        final EditText editText = new EditText(activity);
+                        editText.setHint("editText");
+                        layout.addView(editText);
+                        if (focused) {
+                            editText.setPrivateImeOptions(marker);
+                            editText.requestFocus();
+                        }
+                        break;
+                    }
+                    case FOCUSABLE_VIEW:
+                    case NON_FOCUSABLE_VIEW: {
+                        final boolean focusable = (Control.FOCUSABLE_VIEW == control);
+                        final View view = new View(activity);
+                        view.setBackgroundColor(focusable ? Color.YELLOW : Color.RED);
+                        view.setFocusable(focusable);
+                        view.setFocusableInTouchMode(focusable);
+                        view.setLayoutParams(new ViewGroup.LayoutParams(
+                                ViewGroup.LayoutParams.MATCH_PARENT, 10 /* height */));
+                        layout.addView(view);
+                        break;
+                    }
+                    default:
+                        throw new UnsupportedOperationException("Unknown control=" + control);
+                }
+            }
+            return layout;
+        });
+
+        final ImeEvent startInput = expectEvent(stream,
+                editorMatcher("onStartInput", marker), TIMEOUT);
+        final EditorInfo editorInfo = startInput.getArguments().getParcelable("editorInfo");
+        assertThat(editorInfo).isNotNull();
+        assertThat(editorInfo.imeOptions & EditorInfo.IME_FLAG_NAVIGATE_NEXT)
+                .isEqualTo(navigateNext ? EditorInfo.IME_FLAG_NAVIGATE_NEXT : 0);
+        assertThat(editorInfo.imeOptions & EditorInfo.IME_FLAG_NAVIGATE_PREVIOUS)
+                .isEqualTo(navigatePrevious ? EditorInfo.IME_FLAG_NAVIGATE_PREVIOUS : 0);
+    }
+
+    /**
      * Regression test for Bug 209958658.
      */
     @Test
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/FocusHandlingTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/FocusHandlingTest.java
index 34d4443..9cf7875 100644
--- a/tests/inputmethod/src/android/view/inputmethod/cts/FocusHandlingTest.java
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/FocusHandlingTest.java
@@ -17,10 +17,16 @@
 package android.view.inputmethod.cts;
 
 import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
+import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN;
 import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE;
+import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN;
+import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED;
+import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE;
 import static android.view.inputmethod.cts.util.InputMethodVisibilityVerifier.expectImeInvisible;
 import static android.view.inputmethod.cts.util.InputMethodVisibilityVerifier.expectImeVisible;
+import static android.view.inputmethod.cts.util.TestUtils.getOnMainSync;
 import static android.view.inputmethod.cts.util.TestUtils.runOnMainSync;
+import static android.view.inputmethod.cts.util.TestUtils.waitOnMainUntil;
 import static android.widget.PopupWindow.INPUT_METHOD_NEEDED;
 import static android.widget.PopupWindow.INPUT_METHOD_NOT_NEEDED;
 
@@ -32,6 +38,7 @@
 import static com.android.cts.mockime.ImeEventStreamTestUtils.notExpectEvent;
 
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -47,6 +54,7 @@
 import android.platform.test.annotations.AppModeFull;
 import android.text.TextUtils;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
@@ -54,6 +62,7 @@
 import android.view.inputmethod.cts.util.AutoCloseableWrapper;
 import android.view.inputmethod.cts.util.EndToEndImeTestBase;
 import android.view.inputmethod.cts.util.TestActivity;
+import android.view.inputmethod.cts.util.TestActivity2;
 import android.view.inputmethod.cts.util.TestUtils;
 import android.view.inputmethod.cts.util.UnlockScreenRule;
 import android.view.inputmethod.cts.util.WindowFocusHandleService;
@@ -76,6 +85,7 @@
 import com.android.cts.mockime.ImeSettings;
 import com.android.cts.mockime.MockImeSession;
 
+import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -136,10 +146,7 @@
     @FlakyTest(bugId = 149246840)
     @Test
     public void testOnStartInputCalledOnceIme() throws Exception {
-        try (MockImeSession imeSession = MockImeSession.create(
-                InstrumentationRegistry.getInstrumentation().getContext(),
-                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
-                new ImeSettings.Builder())) {
+        try (MockImeSession imeSession = createTestImeSession()) {
             final ImeEventStream stream = imeSession.openEventStream();
 
             final String marker = getTestMarker();
@@ -167,10 +174,7 @@
 
     @Test
     public void testSoftInputStateAlwaysVisibleWithoutFocusedEditorView() throws Exception {
-        try (MockImeSession imeSession = MockImeSession.create(
-                InstrumentationRegistry.getInstrumentation().getContext(),
-                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
-                new ImeSettings.Builder())) {
+        try (MockImeSession imeSession = createTestImeSession()) {
             final ImeEventStream stream = imeSession.openEventStream();
 
             final String marker = getTestMarker();
@@ -209,11 +213,69 @@
     }
 
     @Test
+    public void testNoEditorNoStartInput() throws Exception {
+        Assume.assumeTrue(isPreventImeStartup());
+        try (MockImeSession imeSession = createTestImeSession()) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String marker = getTestMarker();
+            TestActivity.startSync(activity -> {
+                final LinearLayout layout = new LinearLayout(activity);
+                layout.setOrientation(LinearLayout.VERTICAL);
+
+                final TextView textView = new TextView(activity) {
+                    @Override
+                    public boolean onCheckIsTextEditor() {
+                        return false;
+                    }
+                };
+                textView.setText("textView");
+                textView.requestFocus();
+                textView.setPrivateImeOptions(marker);
+                layout.addView(textView);
+                return layout;
+            });
+
+            // Input shouldn't start
+            notExpectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+        }
+    }
+
+    @Test
+    public void testDelayedAddEditorStartsInput() throws Exception {
+        Assume.assumeTrue(isPreventImeStartup());
+        try (MockImeSession imeSession = createTestImeSession()) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final AtomicReference<LinearLayout> layoutRef = new AtomicReference<>();
+            final TestActivity testActivity = TestActivity.startSync(activity -> {
+                final LinearLayout layout = new LinearLayout(activity);
+                layout.setOrientation(LinearLayout.VERTICAL);
+                layoutRef.set(layout);
+
+                return layout;
+            });
+
+            // Activity adds EditText at a later point.
+            TestUtils.waitOnMainUntil(() -> layoutRef.get().hasWindowFocus(), TIMEOUT);
+            InstrumentationRegistry.getInstrumentation().waitForIdleSync();
+            final String marker = getTestMarker();
+            testActivity.runOnUiThread(() -> {
+                final EditText editText = new EditText(testActivity);
+                editText.setText("Editable");
+                editText.setPrivateImeOptions(marker);
+                layoutRef.get().addView(editText);
+                editText.requestFocus();
+            });
+
+            // Input should start
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+        }
+    }
+
+    @Test
     public void testEditorStartsInput() throws Exception {
-        try (MockImeSession imeSession = MockImeSession.create(
-                InstrumentationRegistry.getInstrumentation().getContext(),
-                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
-                new ImeSettings.Builder())) {
+        try (MockImeSession imeSession = createTestImeSession()) {
             final ImeEventStream stream = imeSession.openEventStream();
 
             final String marker = getTestMarker();
@@ -236,10 +298,7 @@
 
     @Test
     public void testSoftInputStateAlwaysVisibleFocusedEditorView() throws Exception {
-        try (MockImeSession imeSession = MockImeSession.create(
-                InstrumentationRegistry.getInstrumentation().getContext(),
-                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
-                new ImeSettings.Builder())) {
+        try (MockImeSession imeSession = createTestImeSession()) {
             final ImeEventStream stream = imeSession.openEventStream();
 
             TestActivity.startSync(activity -> {
@@ -277,15 +336,12 @@
     @Test
     public void testFocusableWindowDoesNotInvalidateExistingInputConnection() throws Exception {
         final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        try (MockImeSession imeSession = MockImeSession.create(
-                instrumentation.getContext(),
-                instrumentation.getUiAutomation(),
-                new ImeSettings.Builder())) {
+        try (MockImeSession imeSession = createTestImeSession()) {
             final ImeEventStream stream = imeSession.openEventStream();
 
             final String marker = getTestMarker();
             final EditText editText = launchTestActivity(marker);
-            instrumentation.runOnMainSync(() -> editText.requestFocus());
+            instrumentation.runOnMainSync(editText::requestFocus);
 
             // Wait until the MockIme gets bound to the TestActivity.
             expectBindInput(stream, Process.myPid(), TIMEOUT);
@@ -359,7 +415,7 @@
             instrumentation.waitForIdleSync();
 
             // Make sure that the EditText now has window-focus again.
-            TestUtils.waitOnMainUntil(() -> editText.hasWindowFocus(), TIMEOUT);
+            TestUtils.waitOnMainUntil(editText::hasWindowFocus, TIMEOUT);
 
             // Make sure that InputConnection#commitText() works.
             final ImeCommand commit4 = imeSession.callCommitText("Done!", 1);
@@ -379,10 +435,7 @@
     @Test
     public void testNonFocusablePopupWindowDoesNotAffectImeVisibility() throws Exception {
         final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        try (MockImeSession imeSession = MockImeSession.create(
-                instrumentation.getContext(),
-                instrumentation.getUiAutomation(),
-                new ImeSettings.Builder())) {
+        try (MockImeSession imeSession = createTestImeSession()) {
             final ImeEventStream stream = imeSession.openEventStream();
 
             final String marker = getTestMarker();
@@ -440,15 +493,12 @@
     @Test
     public void testRestartInputWhileOtherProcessHasWindowFocus() throws Exception {
         final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        try (MockImeSession imeSession = MockImeSession.create(
-                instrumentation.getContext(),
-                instrumentation.getUiAutomation(),
-                new ImeSettings.Builder())) {
+        try (MockImeSession imeSession = createTestImeSession()) {
             final ImeEventStream stream = imeSession.openEventStream();
 
             final String marker = getTestMarker();
             final EditText editText = launchTestActivity(marker);
-            instrumentation.runOnMainSync(() -> editText.requestFocus());
+            instrumentation.runOnMainSync(editText::requestFocus);
 
             // Wait until the MockIme gets bound to the TestActivity.
             expectBindInput(stream, Process.myPid(), TIMEOUT);
@@ -457,7 +507,7 @@
 
             // Get app window token
             final IBinder appWindowToken = TestUtils.getOnMainSync(
-                    () -> editText.getApplicationWindowToken());
+                    editText::getApplicationWindowToken);
 
             try (WindowFocusStealer focusStealer =
                          WindowFocusStealer.connect(instrumentation.getTargetContext(), TIMEOUT)) {
@@ -476,7 +526,7 @@
             }
 
             // Wait until the edit text gains window focus again.
-            TestUtils.waitOnMainUntil(() -> editText.hasWindowFocus(), TIMEOUT);
+            TestUtils.waitOnMainUntil(editText::hasWindowFocus, TIMEOUT);
 
             // Make sure that InputConnection#commitText() still works.
             final ImeCommand command = imeSession.callCommitText("test commit", 1);
@@ -492,10 +542,7 @@
      */
     @Test
     public void testSetShowInputOnFocus() throws Exception {
-        try (MockImeSession imeSession = MockImeSession.create(
-                InstrumentationRegistry.getInstrumentation().getContext(),
-                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
-                new ImeSettings.Builder())) {
+        try (MockImeSession imeSession = createTestImeSession()) {
             final ImeEventStream stream = imeSession.openEventStream();
 
             final String marker = getTestMarker();
@@ -520,9 +567,7 @@
     public void testMultiWindowFocusHandleOnDifferentUiThread() throws Exception {
         final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
         try (CloseOnce session = CloseOnce.of(new ServiceSession(instrumentation.getContext()));
-             MockImeSession imeSession = MockImeSession.create(
-                     instrumentation.getContext(), instrumentation.getUiAutomation(),
-                     new ImeSettings.Builder())) {
+             MockImeSession imeSession = createTestImeSession()) {
             final ImeEventStream stream = imeSession.openEventStream();
             final AtomicBoolean popupTextHasWindowFocus = new AtomicBoolean(false);
             final AtomicBoolean popupTextHasViewFocus = new AtomicBoolean(false);
@@ -537,7 +582,7 @@
 
             // Emulate tap event
             CtsTouchUtils.emulateTapOnViewCenter(instrumentation, null, editText);
-            TestUtils.waitOnMainUntil(() -> editTextHasWindowFocus.get(), TIMEOUT);
+            TestUtils.waitOnMainUntil(editTextHasWindowFocus::get, TIMEOUT);
 
             expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
             expectEvent(stream, event -> "showSoftInput".equals(event.getEventName()), TIMEOUT);
@@ -546,8 +591,8 @@
             final ServiceSession serviceSession = (ServiceSession) session.mAutoCloseable;
             final EditText popupTextView = serviceSession.getService().getPopupTextView(
                     popupTextHasWindowFocus);
-            assertTrue(popupTextView.getHandler().getLooper()
-                    != serviceSession.getService().getMainLooper());
+            assertNotSame(popupTextView.getHandler().getLooper(),
+                    serviceSession.getService().getMainLooper());
 
             // Verify popupTextView will also receive window focus change and soft keyboard shown
             // after tapping the view.
@@ -556,7 +601,7 @@
                 popupTextView.setPrivateImeOptions(marker1);
                 popupTextHasViewFocus.set(popupTextView.requestFocus());
             });
-            TestUtils.waitOnMainUntil(() -> popupTextHasViewFocus.get(), TIMEOUT);
+            TestUtils.waitOnMainUntil(popupTextHasViewFocus::get, TIMEOUT);
 
             CtsTouchUtils.emulateTapOnViewCenter(instrumentation, null, popupTextView);
             TestUtils.waitOnMainUntil(() -> popupTextHasWindowFocus.get()
@@ -575,7 +620,7 @@
             // Remove the popTextView window and back to test activity, and then verify if
             // commitText is still workable.
             session.close();
-            TestUtils.waitOnMainUntil(() -> editText.hasWindowFocus(), TIMEOUT);
+            TestUtils.waitOnMainUntil(editText::hasWindowFocus, TIMEOUT);
             final ImeCommand commit = imeSession.callCommitText("test commit", 1);
             expectCommand(stream, commit, TIMEOUT);
             TestUtils.waitOnMainUntil(
@@ -586,9 +631,7 @@
     @Test
     public void testKeyboardStateAfterImeFocusableFlagChanged() throws Exception {
         final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        try (MockImeSession imeSession = MockImeSession.create(
-                     instrumentation.getContext(), instrumentation.getUiAutomation(),
-                     new ImeSettings.Builder())) {
+        try (MockImeSession imeSession = createTestImeSession()) {
             final ImeEventStream stream = imeSession.openEventStream();
             final AtomicReference<EditText> editTextRef = new AtomicReference<>();
             final String marker = getTestMarker();
@@ -666,10 +709,7 @@
     @Test
     public void testRequestFocusOnWindowFocusChanged() throws Exception {
         final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        try (MockImeSession imeSession = MockImeSession.create(
-                instrumentation.getContext(),
-                instrumentation.getUiAutomation(),
-                new ImeSettings.Builder())) {
+        try (MockImeSession imeSession = createTestImeSession()) {
             final ImeEventStream stream = imeSession.openEventStream();
             final String marker = getTestMarker();
             final AtomicReference<EditText> editTextRef = new AtomicReference<>();
@@ -711,6 +751,172 @@
         }
     }
 
+    /**
+     * Start an activity with a focused test editor and wait for the IME to become visible,
+     * then start another activity with the given {@code softInputMode} and an <b>unfocused</b>
+     * test editor.
+     *
+     * @return the event stream positioned before the second app is launched
+     */
+    private ImeEventStream startFocusedEditorActivity_thenAnotherUnfocusedEditorActivity(
+            int softInputMode)
+            throws Exception {
+        try (MockImeSession imeSession = createTestImeSession()) {
+            final String marker = getTestMarker();
+
+            // Launch an activity with a text edit and request focus
+            TestActivity.startSync(activity -> {
+                final LinearLayout layout = new LinearLayout(activity);
+                layout.setOrientation(LinearLayout.VERTICAL);
+
+                final EditText editText = new EditText(activity);
+                editText.setText("editText");
+                editText.setPrivateImeOptions(marker);
+                editText.requestFocus();
+
+                activity.getWindow().setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+                layout.addView(editText);
+                return layout;
+            });
+
+            ImeEventStream stream = imeSession.openEventStream();
+
+            // Wait until the MockIme gets bound and started for the TestActivity.
+            expectBindInput(stream, Process.myPid(), TIMEOUT);
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+            expectImeVisible(TIMEOUT);
+
+            // Skip events relating to showStateInitializeActivity() and TestActivity1
+            stream.skipAll();
+
+            // Launch another activity without a text edit but with the requested softInputMode set
+            TestActivity2.startSync(activity -> {
+                activity.getWindow().setSoftInputMode(softInputMode);
+
+                final LinearLayout layout = new LinearLayout(activity);
+                layout.setOrientation(LinearLayout.VERTICAL);
+
+                final EditText editText = new EditText(activity);
+                // Do not request focus for the editText
+                editText.setText("Unfocused editText");
+                layout.addView(editText);
+                return layout;
+            });
+
+            return stream;
+        }
+    }
+
+    @Test
+    public void testUnfocusedEditor_stateUnspecified_hidesIme() throws Exception {
+        ImeEventStream stream = startFocusedEditorActivity_thenAnotherUnfocusedEditorActivity(
+                SOFT_INPUT_STATE_UNSPECIFIED);
+        expectImeHidden(stream);
+        expectOnFinishInput(stream);
+    }
+
+    @Test
+    public void testUnfocusedEditor_stateHidden_hidesIme() throws Exception {
+        ImeEventStream stream = startFocusedEditorActivity_thenAnotherUnfocusedEditorActivity(
+                SOFT_INPUT_STATE_HIDDEN);
+        expectImeHidden(stream);
+        expectOnFinishInput(stream);
+    }
+
+    @Test
+    public void testUnfocusedEditor_stateAlwaysHidden_hidesIme() throws Exception {
+        ImeEventStream stream = startFocusedEditorActivity_thenAnotherUnfocusedEditorActivity(
+                SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+        expectImeHidden(stream);
+        expectOnFinishInput(stream);
+    }
+
+    @Test
+    public void testUnfocusedEditor_stateVisible_startsIme() throws Exception {
+        ImeEventStream stream = startFocusedEditorActivity_thenAnotherUnfocusedEditorActivity(
+                SOFT_INPUT_STATE_VISIBLE);
+        // The previous IME should be finished
+        expectOnFinishInput(stream);
+
+        // Input should be started and shown
+        expectEvent(stream, event -> "onStartInput".equals(event.getEventName()),
+                EXPECT_TIMEOUT);
+        expectEvent(stream, event -> "showSoftInput".equals(event.getEventName()),
+                EXPECT_TIMEOUT);
+    }
+
+    @Test
+    public void testUnfocusedEditor_stateAlwaysVisible_startsIme() throws Exception {
+        ImeEventStream stream = startFocusedEditorActivity_thenAnotherUnfocusedEditorActivity(
+                SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        // The previous IME should be finished
+        expectOnFinishInput(stream);
+
+        // Input should be started and shown
+        expectEvent(stream, event -> "onStartInput".equals(event.getEventName()),
+                EXPECT_TIMEOUT);
+        expectEvent(stream, event -> "showSoftInput".equals(event.getEventName()),
+                EXPECT_TIMEOUT);
+    }
+
+    @Test
+    public void detachServed_withDifferentNextServed_b211105987() throws Exception {
+        final AtomicReference<ViewGroup> layoutRef = new AtomicReference<>();
+        final AtomicReference<EditText> firstEditorRef = new AtomicReference<>();
+        final AtomicReference<EditText> secondEditorRef = new AtomicReference<>();
+        final AtomicReference<InputMethodManager> imm = new AtomicReference<>();
+
+        TestActivity.startSync(activity -> {
+            final LinearLayout layout = new LinearLayout(activity);
+            layout.setOrientation(LinearLayout.VERTICAL);
+            layoutRef.set(layout);
+
+            final EditText editText = new EditText(activity);
+            editText.requestFocus();
+            firstEditorRef.set(editText);
+            layout.addView(editText);
+            imm.set(activity.getSystemService(InputMethodManager.class));
+            return layout;
+        });
+
+        waitOnMainUntil(() -> imm.get().isActive(firstEditorRef.get()), TIMEOUT);
+
+        runOnMainSync(() -> {
+            final ViewGroup layout = layoutRef.get();
+
+            final EditText editText = new EditText(layout.getContext());
+            secondEditorRef.set(editText);
+            layout.addView(editText);
+        });
+
+        waitOnMainUntil(() -> secondEditorRef.get().isLaidOut(), TIMEOUT);
+
+        runOnMainSync(() -> {
+            secondEditorRef.get().requestFocus();
+            layoutRef.get().removeView(firstEditorRef.get());
+        });
+
+        assertTrue(getOnMainSync(() -> imm.get().isActive(secondEditorRef.get())));
+    }
+
+    private static void expectImeHidden(@NonNull ImeEventStream stream) throws TimeoutException {
+        expectEvent(stream, event -> "hideSoftInput".equals(event.getEventName()), EXPECT_TIMEOUT);
+    }
+
+    private static void expectOnFinishInput(@NonNull ImeEventStream stream)
+            throws TimeoutException {
+        expectEvent(stream, event -> "onFinishInput".equals(event.getEventName()), EXPECT_TIMEOUT);
+    }
+
+    @NonNull
+    private static MockImeSession createTestImeSession() throws Exception {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        return MockImeSession.create(
+                instrumentation.getContext(),
+                instrumentation.getUiAutomation(),
+                new ImeSettings.Builder());
+    }
+
     private static class ServiceSession implements ServiceConnection, AutoCloseable {
         private final Context mContext;
 
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/ImeInsetsVisibilityTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/ImeInsetsVisibilityTest.java
index 1eac684..34de0c0 100644
--- a/tests/inputmethod/src/android/view/inputmethod/cts/ImeInsetsVisibilityTest.java
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/ImeInsetsVisibilityTest.java
@@ -22,8 +22,6 @@
 import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
 import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN;
 import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
-import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
-import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_PANEL;
 import static android.view.inputmethod.cts.util.InputMethodVisibilityVerifier.expectImeInvisible;
 import static android.view.inputmethod.cts.util.InputMethodVisibilityVerifier.expectImeVisible;
 
@@ -56,6 +54,7 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import androidx.annotation.AnyThread;
 import androidx.annotation.NonNull;
 import androidx.test.filters.MediumTest;
 import androidx.test.platform.app.InstrumentationRegistry;
@@ -122,26 +121,19 @@
                     () -> editText.getRootWindowInsets().isVisible(WindowInsets.Type.ime()));
             expectImeVisible(TIMEOUT);
 
-            final View[] childViewRoot = new View[1];
-            TestUtils.runOnMainSync(() -> {
-                final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams();
-                attrs.token = activity.getWindow().getAttributes().token;
-                attrs.type = TYPE_APPLICATION;
-                attrs.width = 200;
-                attrs.height = 200;
-                attrs.format = PixelFormat.TRANSPARENT;
-                attrs.flags = FLAG_NOT_FOCUSABLE | FLAG_ALT_FOCUSABLE_IM;
-                attrs.setFitInsetsTypes(WindowInsets.Type.ime() | WindowInsets.Type.statusBars()
-                        | WindowInsets.Type.navigationBars());
-                childViewRoot[0] = addChildWindow(activity, attrs);
-                childViewRoot[0].setVisibility(View.VISIBLE);
-            });
-            TestUtils.waitOnMainUntil(() -> childViewRoot[0] != null
-                    && childViewRoot[0].getVisibility() == View.VISIBLE, TIMEOUT);
-
-            PollingCheck.check("Ime insets should be visible", TIMEOUT,
-                    () -> editText.getRootWindowInsets().isVisible(WindowInsets.Type.ime()));
-            expectImeVisible(TIMEOUT);
+            try (ChildWindowHolder childWindow = createChildTransparentApplicationWindowOnMain(
+                    activity, 200 /* width */, 200 /* height */,
+                    FLAG_NOT_FOCUSABLE | FLAG_ALT_FOCUSABLE_IM,
+                    WindowInsets.Type.ime() | WindowInsets.Type.statusBars()
+                            | WindowInsets.Type.navigationBars())) {
+                // The window will be shown above (in y-axis) the IME.
+                TestUtils.runOnMainSync(
+                        () -> childWindow.getRootView().setVisibility(View.VISIBLE));
+                TestUtils.waitOnMainUntil(
+                        () -> editText.getRootWindowInsets().isVisible(WindowInsets.Type.ime()),
+                        TIMEOUT, "Ime insets should be visible");
+                expectImeVisible(TIMEOUT);
+            }
         }
     }
 
@@ -171,26 +163,22 @@
                     () -> editText.getRootWindowInsets().isVisible(WindowInsets.Type.ime()));
             expectImeVisible(TIMEOUT);
 
-            final View[] childViewRoot = new View[1];
-            TestUtils.runOnMainSync(() -> {
-                final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams();
-                attrs.type = TYPE_APPLICATION_PANEL;
-                attrs.width = MATCH_PARENT;
-                attrs.height = NEW_KEYBOARD_HEIGHT;
-                attrs.gravity = Gravity.BOTTOM;
-                attrs.flags = FLAG_NOT_FOCUSABLE | FLAG_ALT_FOCUSABLE_IM;
-                childViewRoot[0] = addChildWindow(activity, attrs);
-                childViewRoot[0].setBackgroundColor(Color.RED);
-                childViewRoot[0].setVisibility(View.VISIBLE);
-            });
-            // The window will be shown above (in y-axis) the IME.
-            TestUtils.waitOnMainUntil(() -> childViewRoot[0] != null
-                    && childViewRoot[0].getVisibility() == View.VISIBLE, TIMEOUT);
-            // IME should be on screen without reset.
-            notExpectEvent(stream, editorMatcher("onStartInputView", marker), TIMEOUT);
-            PollingCheck.check("Ime insets should be visible", TIMEOUT,
-                    () -> editText.getRootWindowInsets().isVisible(WindowInsets.Type.ime()));
-            expectImeVisible(TIMEOUT);
+            try (ChildWindowHolder childWindow = createChildBottomPanelWindowOnMain(activity,
+                    MATCH_PARENT /* width */, NEW_KEYBOARD_HEIGHT /* height */,
+                    FLAG_NOT_FOCUSABLE | FLAG_ALT_FOCUSABLE_IM)) {
+                // The window will be shown above (in y-axis) the IME.
+                TestUtils.runOnMainSync(() -> {
+                    childWindow.getRootView().setBackgroundColor(Color.RED);
+                    childWindow.getRootView().setVisibility(View.VISIBLE);
+                });
+                // IME should be on screen without reset.
+                notExpectEvent(stream, editorMatcher("onStartInputView", marker), TIMEOUT);
+
+                TestUtils.waitOnMainUntil(
+                        () -> editText.getRootWindowInsets().isVisible(WindowInsets.Type.ime()),
+                        TIMEOUT, "Ime insets should be visible");
+                expectImeVisible(TIMEOUT);
+            }
         }
     }
 
@@ -220,26 +208,22 @@
                     () -> editText.getRootWindowInsets().isVisible(WindowInsets.Type.ime()));
             expectImeVisible(TIMEOUT);
 
-            final View[] childViewRoot = new View[1];
-            TestUtils.runOnMainSync(() -> {
-                final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams();
-                attrs.type = TYPE_APPLICATION_PANEL;
-                attrs.width = MATCH_PARENT;
-                attrs.height = NEW_KEYBOARD_HEIGHT;
-                attrs.gravity = Gravity.BOTTOM;
-                attrs.flags = FLAG_NOT_FOCUSABLE | FLAG_ALT_FOCUSABLE_IM | FLAG_LAYOUT_IN_SCREEN;
-                childViewRoot[0] = addChildWindow(activity, attrs);
-                childViewRoot[0].setBackgroundColor(Color.RED);
-                childViewRoot[0].setVisibility(View.VISIBLE);
-            });
-            // The window will be shown behind (in z-axis) the IME.
-            TestUtils.waitOnMainUntil(() -> childViewRoot[0] != null
-                    && childViewRoot[0].getVisibility() == View.VISIBLE, TIMEOUT);
-            // IME should be on screen without reset.
-            notExpectEvent(stream, editorMatcher("onStartInputView", marker), TIMEOUT);
-            PollingCheck.check("Ime insets should be visible", TIMEOUT,
-                    () -> editText.getRootWindowInsets().isVisible(WindowInsets.Type.ime()));
-            expectImeVisible(TIMEOUT);
+            try (ChildWindowHolder childWindow = createChildBottomPanelWindowOnMain(activity,
+                    MATCH_PARENT /* width */, NEW_KEYBOARD_HEIGHT /* height */,
+                    FLAG_NOT_FOCUSABLE | FLAG_ALT_FOCUSABLE_IM | FLAG_LAYOUT_IN_SCREEN)) {
+                // The window will be shown behind (in z-axis) the IME.
+                TestUtils.runOnMainSync(() -> {
+                    childWindow.getRootView().setBackgroundColor(Color.RED);
+                    childWindow.getRootView().setVisibility(View.VISIBLE);
+                });
+                // IME should be on screen without reset.
+                notExpectEvent(stream, editorMatcher("onStartInputView", marker), TIMEOUT);
+
+                TestUtils.waitOnMainUntil(
+                        () -> editText.getRootWindowInsets().isVisible(WindowInsets.Type.ime()),
+                        TIMEOUT, "Ime insets should be visible");
+                expectImeVisible(TIMEOUT);
+            }
         }
     }
 
@@ -448,11 +432,64 @@
         return new Pair<>(focusedEditTextRef.get(), testActivityRef.get());
     }
 
-    private View addChildWindow(Activity activity, WindowManager.LayoutParams attrs) {
-        final WindowManager wm = activity.getSystemService(WindowManager.class);
-        final View childViewRoot = new View(activity);
-        childViewRoot.setVisibility(View.GONE);
-        wm.addView(childViewRoot, attrs);
-        return childViewRoot;
+    /**
+     * A utility class to pack the root {@link View} and its clean-up operation that is compatible
+     * with {@link AutoCloseable} protocol.
+     */
+    private static final class ChildWindowHolder implements AutoCloseable {
+        @NonNull
+        private final View mRootView;
+
+        private ChildWindowHolder(@NonNull View rootView) {
+            mRootView = rootView;
+        }
+
+        @NonNull
+        @AnyThread
+        View getRootView() {
+            return mRootView;
+        }
+
+        @Override
+        public void close() {
+            TestUtils.runOnMainSync(() -> mRootView.getContext()
+                    .getSystemService(WindowManager.class).removeView(mRootView));
+        }
+    }
+
+    @NonNull
+    private ChildWindowHolder createChildBottomPanelWindowOnMain(Activity activity, int width,
+            int height, int windowFlags) {
+        return TestUtils.getOnMainSync(() -> {
+            final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams();
+            attrs.token = null;
+            attrs.type = WindowManager.LayoutParams.TYPE_APPLICATION_PANEL;
+            attrs.width = width;
+            attrs.height = height;
+            attrs.gravity = Gravity.BOTTOM;
+            attrs.flags = windowFlags;
+            final View childViewRoot = new View(activity);
+            activity.getSystemService(WindowManager.class).addView(childViewRoot, attrs);
+            return new ChildWindowHolder(childViewRoot);
+        });
+    }
+
+    @NonNull
+    private ChildWindowHolder createChildTransparentApplicationWindowOnMain(Activity activity,
+            int width, int height, int windowFlags, int fitInsetsTypes) {
+        return TestUtils.getOnMainSync(() -> {
+            final WindowManager.LayoutParams attrs = new WindowManager.LayoutParams();
+            attrs.token = activity.getWindow().getAttributes().token;
+            attrs.type = WindowManager.LayoutParams.TYPE_APPLICATION;
+            attrs.width = width;
+            attrs.height = height;
+            attrs.format = PixelFormat.TRANSPARENT;
+            attrs.gravity = Gravity.NO_GRAVITY;
+            attrs.flags = windowFlags;
+            attrs.setFitInsetsTypes(fitInsetsTypes);
+            final View childViewRoot = new View(activity);
+            activity.getSystemService(WindowManager.class).addView(childViewRoot, attrs);
+            return new ChildWindowHolder(childViewRoot);
+        });
     }
 }
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputConnectionBlockingMethodTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputConnectionBlockingMethodTest.java
deleted file mode 100644
index 2ac8a33..0000000
--- a/tests/inputmethod/src/android/view/inputmethod/cts/InputConnectionBlockingMethodTest.java
+++ /dev/null
@@ -1,956 +0,0 @@
-/*
- * Copyright (C) 2020 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 android.view.inputmethod.cts;
-
-import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE;
-
-import static com.android.cts.mockime.ImeEventStreamTestUtils.editorMatcher;
-import static com.android.cts.mockime.ImeEventStreamTestUtils.expectBindInput;
-import static com.android.cts.mockime.ImeEventStreamTestUtils.expectCommand;
-import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEvent;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import android.content.ClipDescription;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Process;
-import android.os.SystemClock;
-import android.text.TextUtils;
-import android.view.inputmethod.EditorInfo;
-import android.view.inputmethod.ExtractedText;
-import android.view.inputmethod.ExtractedTextRequest;
-import android.view.inputmethod.InputConnection;
-import android.view.inputmethod.InputConnectionWrapper;
-import android.view.inputmethod.InputContentInfo;
-import android.view.inputmethod.cts.util.EndToEndImeTestBase;
-import android.view.inputmethod.cts.util.MockTestActivityUtil;
-import android.view.inputmethod.cts.util.TestActivity;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.test.filters.LargeTest;
-import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.cts.mockime.ImeCommand;
-import com.android.cts.mockime.ImeEvent;
-import com.android.cts.mockime.ImeEventStream;
-import com.android.cts.mockime.ImeSettings;
-import com.android.cts.mockime.MockImeSession;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Function;
-
-/**
- * Ensures that blocking APIs in {@link InputConnection} are working as expected.
- *
- * <p>TODO(b/129012881): Reduce boilerplate code.</p>
- */
-@LargeTest
-@RunWith(AndroidJUnit4.class)
-public class InputConnectionBlockingMethodTest extends EndToEndImeTestBase {
-    private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(5);
-    private static final long LONG_TIMEOUT = TimeUnit.SECONDS.toMillis(30);
-    private static final long IMMEDIATE_TIMEOUT_NANO = TimeUnit.MILLISECONDS.toNanos(200);
-
-    private static final String TEST_MARKER_PREFIX =
-            "android.view.inputmethod.cts.InputConnectionBlockingMethodTest";
-
-    private static String getTestMarker() {
-        return TEST_MARKER_PREFIX + "/"  + SystemClock.elapsedRealtimeNanos();
-    }
-
-    /**
-     * A utility method to verify a method is called within a certain timeout period then block
-     * it by {@link BlockingMethodVerifier#close()} is called.
-     */
-    private static final class BlockingMethodVerifier implements AutoCloseable {
-        private final CountDownLatch mWaitUntilMethodCalled = new CountDownLatch(1);
-        private final CountDownLatch mWaitUntilTestFinished = new CountDownLatch(1);
-
-        /**
-         * Used to notify when a method to be tested is called.
-         */
-        void onMethodCalled() {
-            try {
-                mWaitUntilMethodCalled.countDown();
-                mWaitUntilTestFinished.await();
-            } catch (InterruptedException e) {
-            }
-        }
-
-        /**
-         * Ensures that the method to be tested is called within {@param timeout}.
-         *
-         * @param message Message to be shown when the method is not called despite the expectation.
-         * @param timeout Timeout in milliseconds.
-         */
-        void expectMethodCalled(@NonNull String message, long timeout) {
-            try {
-                assertTrue(message, mWaitUntilMethodCalled.await(timeout, TimeUnit.MILLISECONDS));
-            } catch (InterruptedException e) {
-                fail(message + e);
-            }
-        }
-
-        /**
-         * Unblock the method to be tested to avoid the test from being blocked forever.
-         */
-        @Override
-        public void close() throws Exception {
-            mWaitUntilTestFinished.countDown();
-        }
-    }
-
-    /**
-     * A test procedure definition for
-     * {@link #testInputConnection(Function, TestProcedure, AutoCloseable)}.
-     */
-    @FunctionalInterface
-    interface TestProcedure {
-        /**
-         * The test body of {@link #testInputConnection(Function, TestProcedure, AutoCloseable)}
-         *
-         * @param session {@link MockImeSession} to be used during this test.
-         * @param stream {@link ImeEventStream} associated with {@code session}.
-         */
-        void run(@NonNull MockImeSession session, @NonNull ImeEventStream stream) throws Exception;
-    }
-
-    /**
-     * Tries to trigger {@link com.android.cts.mockime.MockIme#onUnbindInput()} by showing another
-     * Activity in a different process.
-     */
-    private void triggerUnbindInput() {
-        final boolean isInstant = InstrumentationRegistry.getInstrumentation().getTargetContext()
-                .getPackageManager().isInstantApp();
-        MockTestActivityUtil.launchSync(isInstant, TIMEOUT);
-    }
-
-    /**
-     * A utility method to run a unit test for {@link InputConnection}.
-     *
-     * <p>This utility method enables you to avoid boilerplate code when writing unit tests for
-     * {@link InputConnection}.</p>
-     *
-     * @param inputConnectionWrapperProvider {@link Function} to install custom hooks to the
-     *                                       original {@link InputConnection}.
-     * @param testProcedure Test body.
-     */
-    private void testInputConnection(
-            Function<InputConnection, InputConnection> inputConnectionWrapperProvider,
-            TestProcedure testProcedure) throws Exception {
-        testInputConnection(inputConnectionWrapperProvider, testProcedure, null);
-    }
-
-    /**
-     * A utility method to run a unit test for {@link InputConnection}.
-     *
-     * <p>This utility method enables you to avoid boilerplate code when writing unit tests for
-     * {@link InputConnection}.</p>
-     *
-     * @param inputConnectionWrapperProvider {@link Function} to install custom hooks to the
-     *                                       original {@link InputConnection}.
-     * @param testProcedure Test body.
-     * @param closeable {@link AutoCloseable} object to be cleaned up after running test.
-     */
-    private void testInputConnection(
-            Function<InputConnection, InputConnection> inputConnectionWrapperProvider,
-            TestProcedure testProcedure, @Nullable AutoCloseable closeable) throws Exception {
-        try (AutoCloseable closeableHolder = closeable;
-             MockImeSession imeSession = MockImeSession.create(
-                     InstrumentationRegistry.getInstrumentation().getContext(),
-                     InstrumentationRegistry.getInstrumentation().getUiAutomation(),
-                     new ImeSettings.Builder())) {
-            final AtomicBoolean isTestRunning = new AtomicBoolean(true);
-            try {
-                final ImeEventStream stream = imeSession.openEventStream();
-
-                final String marker = getTestMarker();
-                TestActivity.startSync(activity -> {
-                    final LinearLayout layout = new LinearLayout(activity);
-                    layout.setOrientation(LinearLayout.VERTICAL);
-                    final EditText editText = new EditText(activity) {
-                        @Override
-                        public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
-                            final InputConnection ic = super.onCreateInputConnection(outAttrs);
-                            // Fall back to the original InputConnection once the test is done.
-                            return isTestRunning.get()
-                                    ? inputConnectionWrapperProvider.apply(ic) : ic;
-                        }
-                    };
-                    editText.setPrivateImeOptions(marker);
-                    editText.setHint("editText");
-                    editText.requestFocus();
-
-                    layout.addView(editText);
-                    activity.getWindow().setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE);
-                    return layout;
-                });
-
-                // Wait until the MockIme gets bound to the TestActivity.
-                expectBindInput(stream, Process.myPid(), TIMEOUT);
-
-                // Wait until "onStartInput" gets called for the EditText.
-                expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
-
-                testProcedure.run(imeSession, stream);
-            } finally {
-                isTestRunning.set(false);
-            }
-        }
-    }
-
-    /**
-     * Ensures that {@code event}'s elapse time is less than the given threshold.
-     *
-     * @param event {@link ImeEvent} to be tested.
-     * @param elapseNanoTimeThreshold threshold in nano sec.
-     */
-    private static void expectElapseTimeLessThan(@NonNull ImeEvent event,
-            long elapseNanoTimeThreshold) {
-        final long elapseNanoTime = event.getExitTimestamp() - event.getEnterTimestamp();
-        if (elapseNanoTime > elapseNanoTimeThreshold) {
-            fail(event.getEventName() + " took " + elapseNanoTime + " nsec,"
-                    + " which must be less than" + elapseNanoTimeThreshold + " nsec.");
-        }
-    }
-
-    /**
-     * Test {@link InputConnection#getTextAfterCursor(int, int)} works as expected.
-     */
-    @Test
-    public void testGetTextAfterCursor() throws Exception {
-        final int expectedN = 3;
-        final int expectedFlags = InputConnection.GET_TEXT_WITH_STYLES;
-        final String expectedResult = "89";
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public CharSequence getTextAfterCursor(int n, int flags) {
-                assertEquals(expectedN, n);
-                assertEquals(expectedFlags, flags);
-                return expectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command = session.callGetTextAfterCursor(expectedN, expectedFlags);
-            final CharSequence result =
-                    expectCommand(stream, command, TIMEOUT).getReturnCharSequenceValue();
-            assertEquals(expectedResult, result);
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#getTextAfterCursor(int, int)} fails after a system-defined
-     * time-out even if the target app does not respond.
-     */
-    @Test
-    public void testGetTextAfterCursorFailWithTimeout() throws Exception {
-        final String unexpectedResult = "89";
-        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public CharSequence getTextAfterCursor(int n, int flags) {
-                blocker.onMethodCalled();
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command = session.callGetTextAfterCursor(
-                    unexpectedResult.length(), InputConnection.GET_TEXT_WITH_STYLES);
-            blocker.expectMethodCalled("IC#getTextAfterCursor() must be called back", TIMEOUT);
-            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
-            assertTrue("When timeout happens, IC#getTextAfterCursor() returns null",
-                    result.isNullReturnValue());
-        }, blocker);
-    }
-
-    /**
-     * Test {@link InputConnection#getTextAfterCursor(int, int)} fail-fasts once unbindInput() is
-     * issued.
-     */
-    @Test
-    public void testGetTextAfterCursorFailFastAfterUnbindInput() throws Exception {
-        final String unexpectedResult = "89";
-        final AtomicBoolean methodCalled = new AtomicBoolean(false);
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public CharSequence getTextAfterCursor(int n, int flags) {
-                methodCalled.set(true);
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            // Memorize the current InputConnection.
-            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
-
-            // Let unbindInput happen.
-            triggerUnbindInput();
-            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
-
-            // Now IC#getTextAfterCursor() for the memorized IC should fail fast.
-            final ImeEvent result = expectCommand(stream, session.callGetTextAfterCursor(
-                    unexpectedResult.length(), InputConnection.GET_TEXT_WITH_STYLES), TIMEOUT);
-            assertTrue("Once unbindInput() happened, IC#getTextAfterCursor() returns null",
-                    result.isNullReturnValue());
-            assertFalse("Once unbindInput() happened, IC#getTextAfterCursor() fails fast.",
-                    methodCalled.get());
-            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#getTextBeforeCursor(int, int)} works as expected.
-     */
-    @Test
-    public void testGetTextBeforeCursor() throws Exception {
-        final int expectedN = 3;
-        final int expectedFlags = InputConnection.GET_TEXT_WITH_STYLES;
-        final String expectedResult = "123";
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public CharSequence getTextBeforeCursor(int n, int flags) {
-                assertEquals(expectedN, n);
-                assertEquals(expectedFlags, flags);
-                return expectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command = session.callGetTextBeforeCursor(expectedN, expectedFlags);
-            final CharSequence result =
-                    expectCommand(stream, command, TIMEOUT).getReturnCharSequenceValue();
-            assertEquals(expectedResult, result);
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#getTextBeforeCursor(int, int)} fails after a system-defined
-     * time-out even if the target app does not respond.
-     */
-    @Test
-    public void testGetTextBeforeCursorFailWithTimeout() throws Exception {
-        final String unexpectedResult = "123";
-        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public CharSequence getTextBeforeCursor(int n, int flags) {
-                blocker.onMethodCalled();
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command = session.callGetTextBeforeCursor(
-                    unexpectedResult.length(), InputConnection.GET_TEXT_WITH_STYLES);
-            blocker.expectMethodCalled("IC#getTextBeforeCursor() must be called back", TIMEOUT);
-            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
-            assertTrue("When timeout happens, IC#getTextBeforeCursor() returns null",
-                    result.isNullReturnValue());
-        }, blocker);
-    }
-
-    /**
-     * Test {@link InputConnection#getTextBeforeCursor(int, int)} fail-fasts once unbindInput() is
-     * issued.
-     */
-    @Test
-    public void testGetTextBeforeCursorFailFastAfterUnbindInput() throws Exception {
-        final String unexpectedResult = "123";
-        final AtomicBoolean methodCalled = new AtomicBoolean(false);
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public CharSequence getTextBeforeCursor(int n, int flags) {
-                methodCalled.set(true);
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            // Memorize the current InputConnection.
-            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
-
-            // Let unbindInput happen.
-            triggerUnbindInput();
-            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
-
-            // Now IC#getTextBeforeCursor() for the memorized IC should fail fast.
-            final ImeEvent result = expectCommand(stream, session.callGetTextBeforeCursor(
-                    unexpectedResult.length(), InputConnection.GET_TEXT_WITH_STYLES), TIMEOUT);
-            assertTrue("Once unbindInput() happened, IC#getTextBeforeCursor() returns null",
-                    result.isNullReturnValue());
-            assertFalse("Once unbindInput() happened, IC#getTextBeforeCursor() fails fast.",
-                    methodCalled.get());
-            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#getSelectedText(int)} works as expected.
-     */
-    @Test
-    public void testGetSelectedText() throws Exception {
-        final int expectedFlags = InputConnection.GET_TEXT_WITH_STYLES;
-        final String expectedResult = "4567";
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public CharSequence getSelectedText(int flags) {
-                assertEquals(expectedFlags, flags);
-                return expectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command = session.callGetSelectedText(expectedFlags);
-            final CharSequence result =
-                    expectCommand(stream, command, TIMEOUT).getReturnCharSequenceValue();
-            assertEquals(expectedResult, result);
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#getSelectedText(int)} fails after a system-defined time-out even
-     * if the target app does not respond.
-     */
-    @Test
-    public void testGetSelectedTextFailWithTimeout() throws Exception {
-        final String unexpectedResult = "4567";
-        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public CharSequence getSelectedText(int flags) {
-                blocker.onMethodCalled();
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command =
-                    session.callGetSelectedText(InputConnection.GET_TEXT_WITH_STYLES);
-            blocker.expectMethodCalled("IC#getSelectedText() must be called back", TIMEOUT);
-            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
-            assertTrue("When timeout happens, IC#getSelectedText() returns null",
-                    result.isNullReturnValue());
-        }, blocker);
-    }
-
-    /**
-     * Test {@link InputConnection#getSelectedText(int)} fail-fasts once unbindInput() is issued.
-     */
-    @Test
-    public void testGetSelectedTextFailFastAfterUnbindInput() throws Exception {
-        final String unexpectedResult = "4567";
-        final AtomicBoolean methodCalled = new AtomicBoolean(false);
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public CharSequence getSelectedText(int flags) {
-                methodCalled.set(true);
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            // Memorize the current InputConnection.
-            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
-
-            // Let unbindInput happen.
-            triggerUnbindInput();
-            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
-
-            // Now IC#getSelectedText() for the memorized IC should fail fast.
-            final ImeEvent result = expectCommand(stream, session.callGetSelectedText(
-                    InputConnection.GET_TEXT_WITH_STYLES), TIMEOUT);
-            assertTrue("Once unbindInput() happened, IC#getSelectedText() returns null",
-                    result.isNullReturnValue());
-            assertFalse("Once unbindInput() happened, IC#getSelectedText() fails fast.",
-                    methodCalled.get());
-            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#getCursorCapsMode(int)} works as expected.
-     */
-    @Test
-    public void testGetCursorCapsMode() throws Exception {
-        final int expectedResult = EditorInfo.TYPE_TEXT_FLAG_CAP_SENTENCES;
-        final int expectedReqMode = TextUtils.CAP_MODE_SENTENCES | TextUtils.CAP_MODE_CHARACTERS
-                | TextUtils.CAP_MODE_WORDS;
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public int getCursorCapsMode(int reqModes) {
-                assertEquals(expectedReqMode, reqModes);
-                return expectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command = session.callGetCursorCapsMode(expectedReqMode);
-            final int result = expectCommand(stream, command, TIMEOUT).getReturnIntegerValue();
-            assertEquals(expectedResult, result);
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#getCursorCapsMode(int)} fails after a system-defined time-out
-     * even if the target app does not respond.
-     */
-    @Test
-    public void testGetCursorCapsModeFailWithTimeout() throws Exception {
-        final int unexpectedResult = EditorInfo.TYPE_TEXT_FLAG_CAP_WORDS;
-        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public int getCursorCapsMode(int reqModes) {
-                blocker.onMethodCalled();
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command = session.callGetCursorCapsMode(TextUtils.CAP_MODE_WORDS);
-            blocker.expectMethodCalled("IC#getCursorCapsMode() must be called back", TIMEOUT);
-            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
-            assertEquals("When timeout happens, IC#getCursorCapsMode() returns 0",
-                    0, result.getReturnIntegerValue());
-        }, blocker);
-    }
-
-    /**
-     * Test {@link InputConnection#getCursorCapsMode(int)} fail-fasts once unbindInput() is issued.
-     */
-    @Test
-    public void testGetCursorCapsModeFailFastAfterUnbindInput() throws Exception {
-        final int unexpectedResult = EditorInfo.TYPE_TEXT_FLAG_CAP_WORDS;
-        final AtomicBoolean methodCalled = new AtomicBoolean(false);
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public int getCursorCapsMode(int reqModes) {
-                methodCalled.set(true);
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            // Memorize the current InputConnection.
-            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
-
-            // Let unbindInput happen.
-            triggerUnbindInput();
-            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
-
-            // Now IC#getCursorCapsMode() for the memorized IC should fail fast.
-            final ImeEvent result = expectCommand(stream,
-                    session.callGetCursorCapsMode(TextUtils.CAP_MODE_WORDS), TIMEOUT);
-            assertEquals("Once unbindInput() happened, IC#getCursorCapsMode() returns 0",
-                    0, result.getReturnIntegerValue());
-            assertFalse("Once unbindInput() happened, IC#getCursorCapsMode() fails fast.",
-                    methodCalled.get());
-            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#getExtractedText(ExtractedTextRequest, int)} works as expected.
-     */
-    @Test
-    public void testGetExtractedText() throws Exception {
-        final ExtractedTextRequest expectedRequest = ExtractedTextRequestTest.createForTest();
-        final int expectedFlags = InputConnection.GET_EXTRACTED_TEXT_MONITOR;
-        final ExtractedText expectedResult = ExtractedTextTest.createForTest();
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
-                assertEquals(expectedFlags, flags);
-                ExtractedTextRequestTest.assertTestInstance(request);
-                return expectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command = session.callGetExtractedText(expectedRequest, expectedFlags);
-            final ExtractedText result =
-                    expectCommand(stream, command, TIMEOUT).getReturnParcelableValue();
-            ExtractedTextTest.assertTestInstance(result);
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#getExtractedText(ExtractedTextRequest, int)} fails after a
-     * system-defined time-out even if the target app does not respond.
-     */
-    @Test
-    public void testGetExtractedTextFailWithTimeout() throws Exception {
-        final ExtractedText unexpectedResult = ExtractedTextTest.createForTest();
-        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
-                blocker.onMethodCalled();
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command = session.callGetExtractedText(
-                    ExtractedTextRequestTest.createForTest(),
-                    InputConnection.GET_EXTRACTED_TEXT_MONITOR);
-            blocker.expectMethodCalled("IC#getExtractedText() must be called back", TIMEOUT);
-            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
-            assertTrue("When timeout happens, IC#getExtractedText() returns null",
-                    result.isNullReturnValue());
-        }, blocker);
-    }
-
-    /**
-     * Test {@link InputConnection#getExtractedText(ExtractedTextRequest, int)} fail-fasts once
-     * unbindInput() is issued.
-     */
-    @Test
-    public void testGetExtractedTextFailFastAfterUnbindInput() throws Exception {
-        final ExtractedText unexpectedResult = ExtractedTextTest.createForTest();
-        final AtomicBoolean methodCalled = new AtomicBoolean(false);
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
-                methodCalled.set(true);
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            // Memorize the current InputConnection.
-            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
-
-            // Let unbindInput happen.
-            triggerUnbindInput();
-            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
-
-            // Now IC#getExtractedText() for the memorized IC should fail fast.
-            final ImeEvent result = expectCommand(stream, session.callGetExtractedText(
-                    ExtractedTextRequestTest.createForTest(),
-                    InputConnection.GET_EXTRACTED_TEXT_MONITOR), TIMEOUT);
-            assertTrue("Once unbindInput() happened, IC#getExtractedText() returns null",
-                    result.isNullReturnValue());
-            assertFalse("Once unbindInput() happened, IC#getExtractedText() fails fast.",
-                    methodCalled.get());
-            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#requestCursorUpdates(int)} works as expected.
-     */
-    @Test
-    public void testRequestCursorUpdates() throws Exception {
-        final int expectedFlags = InputConnection.CURSOR_UPDATE_IMMEDIATE;
-        final boolean expectedResult = true;
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public boolean requestCursorUpdates(int cursorUpdateMode) {
-                assertEquals(expectedFlags, cursorUpdateMode);
-                return expectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command = session.callRequestCursorUpdates(expectedFlags);
-            assertTrue(expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#requestCursorUpdates(int)} fails after a system-defined time-out
-     * even if the target app does not respond.
-     */
-    @Test
-    public void testRequestCursorUpdatesFailWithTimeout() throws Exception {
-        final boolean unexpectedResult = true;
-        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public boolean requestCursorUpdates(int cursorUpdateMode) {
-                blocker.onMethodCalled();
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command = session.callRequestCursorUpdates(
-                    InputConnection.CURSOR_UPDATE_IMMEDIATE);
-            blocker.expectMethodCalled("IC#requestCursorUpdates() must be called back", TIMEOUT);
-            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
-            assertFalse("When timeout happens, IC#requestCursorUpdates() returns false",
-                    result.getReturnBooleanValue());
-        }, blocker);
-    }
-
-    /**
-     * Test {@link InputConnection#requestCursorUpdates(int)} fail-fasts once unbindInput() is
-     * issued.
-     */
-    @Test
-    public void testRequestCursorUpdatesFailFastAfterUnbindInput() throws Exception {
-        final boolean unexpectedResult = true;
-        final AtomicBoolean methodCalled = new AtomicBoolean(false);
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public boolean requestCursorUpdates(int cursorUpdateMode) {
-                methodCalled.set(true);
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            // Memorize the current InputConnection.
-            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
-
-            // Let unbindInput happen.
-            triggerUnbindInput();
-            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
-
-            // Now IC#requestCursorUpdates() for the memorized IC should fail fast.
-            final ImeEvent result = expectCommand(stream, session.callRequestCursorUpdates(
-                    InputConnection.CURSOR_UPDATE_IMMEDIATE), TIMEOUT);
-            assertFalse("Once unbindInput() happened, IC#requestCursorUpdates() returns false",
-                    result.getReturnBooleanValue());
-            assertFalse("Once unbindInput() happened, IC#requestCursorUpdates() fails fast.",
-                    methodCalled.get());
-            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#commitContent(InputContentInfo, int, Bundle)} works as expected.
-     */
-    @Test
-    public void testCommitContent() throws Exception {
-        final InputContentInfo expectedInputContentInfo = new InputContentInfo(
-                Uri.parse("content://com.example/path"),
-                new ClipDescription("sample content", new String[]{"image/png"}),
-                Uri.parse("https://example.com"));
-        final Bundle expectedOpt = new Bundle();
-        final String expectedOptKey = "testKey";
-        final int expectedOptValue = 42;
-        expectedOpt.putInt(expectedOptKey, expectedOptValue);
-        final int expectedFlags = InputConnection.INPUT_CONTENT_GRANT_READ_URI_PERMISSION;
-        final boolean expectedResult = true;
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public boolean commitContent(InputContentInfo inputContentInfo, int flags,
-                    Bundle opts) {
-                assertEquals(expectedInputContentInfo.getContentUri(),
-                        inputContentInfo.getContentUri());
-                assertEquals(expectedFlags, flags);
-                assertEquals(expectedOpt.getInt(expectedOptKey), opts.getInt(expectedOptKey));
-                return expectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command =
-                    session.callCommitContent(expectedInputContentInfo, expectedFlags, expectedOpt);
-            assertTrue(expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
-        });
-    }
-
-    /**
-     * Test {@link InputConnection#commitContent(InputContentInfo, int, Bundle)} fails after a
-     * system-defined time-out even if the target app does not respond.
-     */
-    @Test
-    public void testCommitContentFailWithTimeout() throws Exception {
-        final boolean unexpectedResult = true;
-        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public boolean commitContent(InputContentInfo inputContentInfo, int flags,
-                    Bundle opts) {
-                blocker.onMethodCalled();
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            final ImeCommand command = session.callCommitContent(
-                    new InputContentInfo(Uri.parse("content://com.example/path"),
-                            new ClipDescription("sample content", new String[]{"image/png"}),
-                            Uri.parse("https://example.com")), 0, null);
-            blocker.expectMethodCalled("IC#commitContent() must be called back", TIMEOUT);
-            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
-            assertFalse("When timeout happens, IC#commitContent() returns false",
-                    result.getReturnBooleanValue());
-        }, blocker);
-    }
-
-    /**
-     * Test {@link InputConnection#commitContent(InputContentInfo, int, Bundle)} fail-fasts once
-     * unbindInput() is issued.
-     */
-    @Test
-    public void testCommitContentFailFastAfterUnbindInput() throws Exception {
-        final boolean unexpectedResult = true;
-        final AtomicBoolean methodCalled = new AtomicBoolean(false);
-
-        final class Wrapper extends InputConnectionWrapper {
-            private Wrapper(InputConnection target) {
-                super(target, false);
-            }
-
-            @Override
-            public boolean commitContent(InputContentInfo inputContentInfo, int flags,
-                    Bundle opts) {
-                methodCalled.set(true);
-                return unexpectedResult;
-            }
-        }
-
-        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
-            // Memorize the current InputConnection.
-            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
-
-            // Let unbindInput happen.
-            triggerUnbindInput();
-            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
-
-            // Now IC#getTextAfterCursor() for the memorized IC should fail fast.
-            final ImeEvent result = expectCommand(stream, session.callCommitContent(
-                    new InputContentInfo(Uri.parse("content://com.example/path"),
-                            new ClipDescription("sample content", new String[]{"image/png"}),
-                            Uri.parse("https://example.com")), 0, null), TIMEOUT);
-            assertFalse("Once unbindInput() happened, IC#commitContent() returns false",
-                    result.getReturnBooleanValue());
-            assertFalse("Once unbindInput() happened, IC#commitContent() fails fast.",
-                    methodCalled.get());
-            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
-        });
-    }
-}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputConnectionEndToEndTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputConnectionEndToEndTest.java
new file mode 100644
index 0000000..28e9f92
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/InputConnectionEndToEndTest.java
@@ -0,0 +1,3891 @@
+/*
+ * Copyright (C) 2020 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 android.view.inputmethod.cts;
+
+import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE;
+
+import static com.android.cts.mockime.ImeEventStreamTestUtils.editorMatcher;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectBindInput;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectCommand;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEvent;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.content.ClipDescription;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Process;
+import android.os.SystemClock;
+import android.text.Annotation;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.util.Pair;
+import android.view.KeyEvent;
+import android.view.inputmethod.CompletionInfo;
+import android.view.inputmethod.CorrectionInfo;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.ExtractedText;
+import android.view.inputmethod.ExtractedTextRequest;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputConnectionWrapper;
+import android.view.inputmethod.InputContentInfo;
+import android.view.inputmethod.SurroundingText;
+import android.view.inputmethod.TextAttribute;
+import android.view.inputmethod.TextSnapshot;
+import android.view.inputmethod.cts.util.EndToEndImeTestBase;
+import android.view.inputmethod.cts.util.MockTestActivityUtil;
+import android.view.inputmethod.cts.util.TestActivity;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.filters.LargeTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.cts.inputmethod.LegacyImeClientTestUtils;
+import com.android.cts.mockime.ImeCommand;
+import com.android.cts.mockime.ImeEvent;
+import com.android.cts.mockime.ImeEventStream;
+import com.android.cts.mockime.ImeSettings;
+import com.android.cts.mockime.MockImeSession;
+
+import com.google.common.truth.Correspondence;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/**
+ * Provides basic tests for APIs defined in {@link InputConnection}.
+ *
+ * <p>TODO(b/193535269): Clean up boilerplate code around mocking InputConnection.</p>
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class InputConnectionEndToEndTest extends EndToEndImeTestBase {
+    private static final long TIME_SLICE = TimeUnit.MILLISECONDS.toMillis(125);
+    private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(5);
+    private static final long EXPECTED_NOT_CALLED_TIMEOUT = TimeUnit.SECONDS.toMillis(1);
+    private static final long LONG_TIMEOUT = TimeUnit.SECONDS.toMillis(30);
+    private static final long IMMEDIATE_TIMEOUT_NANO = TimeUnit.MILLISECONDS.toNanos(200);
+
+    private static final String TEST_MARKER_PREFIX =
+            "android.view.inputmethod.cts.InputConnectionEndToEndTest";
+
+    private static String getTestMarker() {
+        return TEST_MARKER_PREFIX + "/"  + SystemClock.elapsedRealtimeNanos();
+    }
+
+    /**
+     * A utility method to verify a method is called within a certain timeout period then block
+     * it by {@link BlockingMethodVerifier#close()} is called.
+     */
+    private static final class BlockingMethodVerifier implements AutoCloseable {
+        private final CountDownLatch mWaitUntilMethodCalled = new CountDownLatch(1);
+        private final CountDownLatch mWaitUntilTestFinished = new CountDownLatch(1);
+
+        /**
+         * Used to notify when a method to be tested is called.
+         */
+        void onMethodCalled() {
+            try {
+                mWaitUntilMethodCalled.countDown();
+                mWaitUntilTestFinished.await();
+            } catch (InterruptedException e) {
+            }
+        }
+
+        /**
+         * Ensures that the method to be tested is called within {@param timeout}.
+         *
+         * @param message Message to be shown when the method is not called despite the expectation.
+         * @param timeout Timeout in milliseconds.
+         */
+        void expectMethodCalled(@NonNull String message, long timeout) {
+            try {
+                assertTrue(message, mWaitUntilMethodCalled.await(timeout, TimeUnit.MILLISECONDS));
+            } catch (InterruptedException e) {
+                fail(message + e);
+            }
+        }
+
+        /**
+         * Unblock the method to be tested to avoid the test from being blocked forever.
+         */
+        @Override
+        public void close() throws Exception {
+            mWaitUntilTestFinished.countDown();
+        }
+    }
+
+    /**
+     * A utility method to verify that a method is called with a certain set of parameters.
+     */
+    private static final class MethodCallVerifier {
+        private final AtomicReference<Bundle> mArgs = new AtomicReference<>();
+        private final AtomicInteger mCallCount = new AtomicInteger(0);
+
+        @AnyThread
+        void reset() {
+            mArgs.set(null);
+            mCallCount.set(0);
+        }
+
+        /**
+         * Used to record when a method to be tested is called.
+         *
+         * @param argumentsRecorder a {@link Consumer} to capture method parameters.
+         */
+        void onMethodCalled(@NonNull Consumer<Bundle> argumentsRecorder) {
+            final Bundle bundle = new Bundle();
+            argumentsRecorder.accept(bundle);
+            mArgs.set(bundle);
+            mCallCount.incrementAndGet();
+        }
+
+        /**
+         * Used to assert captured parameters later.
+         *
+         * @param argumentsVerifier a {@link Consumer} to verify method arguments.
+         * @throws AssertionError when {@link #onMethodCalled(Consumer)} was not called only once.
+         */
+        void assertCalledOnce(@NonNull Consumer<Bundle> argumentsVerifier) {
+            assertEquals(1, mCallCount.get());
+            final Bundle bundle = mArgs.get();
+            assertNotNull(bundle);
+            argumentsVerifier.accept(bundle);
+        }
+
+        /**
+         * Ensures that the method to be tested is called within {@param timeout}.
+         *
+         * @param argumentsVerifier a {@link Consumer} to verify method arguments.
+         * @param timeout timeout in millisecond
+         * @throws AssertionError when {@link #onMethodCalled(Consumer)} was not called only once.
+         */
+        void expectCalledOnce(@NonNull Consumer<Bundle> argumentsVerifier, long timeout) {
+            // Currently using busy-wait because CountDownLatch is not compatible with reset().
+            // TODO: Consider using other more efficient operation.
+            long remainingTime = timeout;
+            while (mCallCount.get() == 0) {
+                if (remainingTime < 0) {
+                    fail("The method must be called, but was not within" + timeout + " msec.");
+                }
+                SystemClock.sleep(TIME_SLICE);
+                remainingTime -= TIME_SLICE;
+            }
+            assertEquals(1, mCallCount.get());
+            final Bundle bundle = mArgs.get();
+            assertNotNull(bundle);
+            argumentsVerifier.accept(bundle);
+        }
+
+        /**
+         * Used to assert that {@link #onMethodCalled(Consumer)} was never called.
+         *
+         * @param callCountVerificationMessage A message to be used when the assertion fails.
+         */
+        void assertNotCalled(@Nullable String callCountVerificationMessage) {
+            if (callCountVerificationMessage != null) {
+                assertEquals(callCountVerificationMessage, 0, mCallCount.get());
+            } else {
+                assertEquals(0, mCallCount.get());
+            }
+        }
+
+        /**
+         * Ensures that the method to be tested is not called within {@param timeout}.
+         *
+         * @param callCountVerificationMessage A message to be used when the assertion fails.
+         * @param timeout timeout in millisecond
+         */
+        void expectNotCalled(@Nullable String callCountVerificationMessage, long timeout) {
+            // Currently using busy-wait because CountDownLatch is not compatible with reset().
+            // TODO: Consider using other more efficient operation.
+            long remainingTime = timeout;
+            while (true) {
+                if (mCallCount.get() != 0) {
+                    fail("The method must not be called. params=" + evaluateBundle(mArgs.get()));
+                }
+                if (remainingTime < 0) {
+                    break;  // This is indeed an expected scenario, not an error.
+                }
+                SystemClock.sleep(TIME_SLICE);
+                remainingTime -= TIME_SLICE;
+            }
+            if (callCountVerificationMessage != null) {
+                assertEquals(callCountVerificationMessage, 0, mCallCount.get());
+            } else {
+                assertEquals(0, mCallCount.get());
+            }
+        }
+
+        /**
+         * Recursively evaluate {@link Bundle} so that {@link Bundle#toString()} can print all the
+         * nested {@link Bundle} objects.
+         *
+         * @param bundle {@link Bundle} to recursively evaluate.
+         * @return the {@code bundle} object passed.
+         */
+        @Nullable
+        private static Bundle evaluateBundle(@Nullable Bundle bundle) {
+            if (bundle != null) {
+                for (String key : bundle.keySet()) {
+                    final Object value = bundle.get(key);
+                    if (value instanceof Bundle) {
+                        evaluateBundle((Bundle) value);
+                    }
+                }
+            }
+            return bundle;
+        }
+    }
+
+    /**
+     * A test procedure definition for
+     * {@link #testInputConnection(Function, TestProcedure, AutoCloseable)}.
+     */
+    @FunctionalInterface
+    interface TestProcedure {
+        /**
+         * The test body of {@link #testInputConnection(Function, TestProcedure, AutoCloseable)}
+         *
+         * @param session {@link MockImeSession} to be used during this test.
+         * @param stream {@link ImeEventStream} associated with {@code session}.
+         */
+        void run(@NonNull MockImeSession session, @NonNull ImeEventStream stream) throws Exception;
+    }
+
+    /**
+     * Tries to trigger {@link com.android.cts.mockime.MockIme#onUnbindInput()} by showing another
+     * Activity in a different process.
+     */
+    private void triggerUnbindInput() {
+        final boolean isInstant = InstrumentationRegistry.getInstrumentation().getTargetContext()
+                .getPackageManager().isInstantApp();
+        MockTestActivityUtil.launchSync(isInstant, TIMEOUT);
+    }
+
+    /**
+     * A utility method to run a unit test for {@link InputConnection}.
+     *
+     * <p>This utility method enables you to avoid boilerplate code when writing unit tests for
+     * {@link InputConnection}.</p>
+     *
+     * @param inputConnectionWrapperProvider {@link Function} to install custom hooks to the
+     *                                       original {@link InputConnection}.
+     * @param testProcedure Test body.
+     */
+    private void testInputConnection(
+            Function<InputConnection, InputConnection> inputConnectionWrapperProvider,
+            TestProcedure testProcedure) throws Exception {
+        testInputConnection(inputConnectionWrapperProvider, testProcedure, null);
+    }
+
+    /**
+     * A utility method to run a unit test for {@link InputConnection} that is as-if built with
+     * {@link android.os.Build.VERSION_CODES#CUPCAKE} SDK.
+     *
+     * <p>This helps you to test the situation where IMEs' calling newly added
+     * {@link InputConnection} APIs would be fallen back to its default interface method or could be
+     * causing {@link java.lang.AbstractMethodError} unless specially handled.
+     *
+     * @param testProcedure Test body.
+     */
+    private void testMinimallyImplementedInputConnection(TestProcedure testProcedure)
+            throws Exception {
+        testInputConnection(
+                ic -> LegacyImeClientTestUtils.createMinimallyImplementedNoOpInputConnection(),
+                testProcedure, null);
+    }
+
+    /**
+     * A utility method to run a unit test for {@link InputConnection}.
+     *
+     * <p>This utility method enables you to avoid boilerplate code when writing unit tests for
+     * {@link InputConnection}.</p>
+     *
+     * @param inputConnectionWrapperProvider {@link Function} to install custom hooks to the
+     *                                       original {@link InputConnection}.
+     * @param testProcedure Test body.
+     * @param closeable {@link AutoCloseable} object to be cleaned up after running test.
+     */
+    private void testInputConnection(
+            Function<InputConnection, InputConnection> inputConnectionWrapperProvider,
+            TestProcedure testProcedure, @Nullable AutoCloseable closeable) throws Exception {
+        try (AutoCloseable closeableHolder = closeable;
+             MockImeSession imeSession = MockImeSession.create(
+                     InstrumentationRegistry.getInstrumentation().getContext(),
+                     InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                     new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String marker = getTestMarker();
+            TestActivity.startSync(activity -> {
+                final LinearLayout layout = new LinearLayout(activity);
+                layout.setOrientation(LinearLayout.VERTICAL);
+
+                // Just to be conservative, we explicitly check MockImeSession#isActive() here when
+                // injecting our custom InputConnection implementation.
+                final EditText editText = new EditText(activity) {
+                    @Override
+                    public boolean onCheckIsTextEditor() {
+                        return imeSession.isActive();
+                    }
+
+                    @Override
+                    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+                        if (imeSession.isActive()) {
+                            final InputConnection ic = super.onCreateInputConnection(outAttrs);
+                            return inputConnectionWrapperProvider.apply(ic);
+                        }
+                        return null;
+                    }
+                };
+
+                editText.setPrivateImeOptions(marker);
+                editText.setHint("editText");
+                editText.requestFocus();
+
+                layout.addView(editText);
+                activity.getWindow().setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+                return layout;
+            });
+
+            // Wait until the MockIme gets bound to the TestActivity.
+            expectBindInput(stream, Process.myPid(), TIMEOUT);
+
+            // Wait until "onStartInput" gets called for the EditText.
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+
+            testProcedure.run(imeSession, stream);
+        }
+    }
+
+    /**
+     * Ensures that {@code event}'s elapse time is less than the given threshold.
+     *
+     * @param event {@link ImeEvent} to be tested.
+     * @param elapseNanoTimeThreshold threshold in nano sec.
+     */
+    private static void expectElapseTimeLessThan(@NonNull ImeEvent event,
+            long elapseNanoTimeThreshold) {
+        final long elapseNanoTime = event.getExitTimestamp() - event.getEnterTimestamp();
+        if (elapseNanoTime > elapseNanoTimeThreshold) {
+            fail(event.getEventName() + " took " + elapseNanoTime + " nsec,"
+                    + " which must be less than" + elapseNanoTimeThreshold + " nsec.");
+        }
+    }
+
+    @Nullable
+    private static CharSequence createTestCharSequence(@Nullable String text,
+            @Nullable Annotation annotation) {
+        if (text == null) {
+            return null;
+        }
+        final SpannableStringBuilder sb = new SpannableStringBuilder(text);
+        if (annotation != null) {
+            sb.setSpan(annotation, 0, sb.length(), Spanned.SPAN_INCLUSIVE_INCLUSIVE);
+        }
+        return sb;
+    }
+
+    private static void assertEqualsForTestCharSequence(@Nullable CharSequence expected,
+            @Nullable CharSequence actual) {
+        assertEquals(Objects.toString(expected), Objects.toString(actual));
+        final Function<CharSequence, List<Annotation>> toAnnotations = cs -> {
+            if (cs instanceof Spanned) {
+                final Spanned spanned = (Spanned) cs;
+                return Arrays.asList(spanned.getSpans(0, cs.length(), Annotation.class));
+            }
+            return Collections.emptyList();
+        };
+        assertThat(toAnnotations.apply(actual)).comparingElementsUsing(Correspondence.transforming(
+                (Annotation annotation) -> Pair.create(annotation.getKey(), annotation.getValue()),
+                (Annotation annotation) -> Pair.create(annotation.getKey(), annotation.getValue()),
+                "has the same Key/Value as"))
+                .containsExactlyElementsIn(toAnnotations.apply(expected));
+    }
+
+    /**
+     * Test {@link InputConnection#getTextAfterCursor(int, int)} works as expected.
+     */
+    @Test
+    public void testGetTextAfterCursor() throws Exception {
+        final int expectedN = 3;
+        final int expectedFlags = InputConnection.GET_TEXT_WITH_STYLES;
+        final CharSequence expectedResult =
+                createTestCharSequence("89", new Annotation("command", "getTextAfterCursor"));
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public CharSequence getTextAfterCursor(int n, int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("n", n);
+                    args.putInt("flags", flags);
+                });
+                return expectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetTextAfterCursor(expectedN, expectedFlags);
+            final CharSequence result =
+                    expectCommand(stream, command, TIMEOUT).getReturnCharSequenceValue();
+            assertEqualsForTestCharSequence(expectedResult, result);
+            methodCallVerifier.assertCalledOnce(args -> {
+                assertEquals(expectedN, args.get("n"));
+                assertEquals(expectedFlags, args.get("flags"));
+            });
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getTextAfterCursor(int, int)} fails when a negative
+     * {@code length} is passed.  See Bug 169114026 for background.
+     */
+    @Test
+    public void testGetTextAfterCursorFailWithNegativeLength() throws Exception {
+        final String unexpectedResult = "123";
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public CharSequence getTextAfterCursor(int n, int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("n", n);
+                    args.putInt("flags", flags);
+                });
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetTextAfterCursor(-1, 0);
+            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
+            assertTrue("IC#getTextAfterCursor() returns null for a negative length.",
+                    result.isNullReturnValue());
+            methodCallVerifier.expectNotCalled(
+                    "IC#getTextAfterCursor() will not be triggered with a negative length.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getTextAfterCursor(int, int)} fails after a system-defined
+     * time-out even if the target app does not respond.
+     */
+    @Test
+    public void testGetTextAfterCursorFailWithTimeout() throws Exception {
+        final int expectedN = 3;
+        final int expectedFlags = InputConnection.GET_TEXT_WITH_STYLES;
+        final String unexpectedResult = "89";
+        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public CharSequence getTextAfterCursor(int n, int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("n", n);
+                    args.putInt("flags", flags);
+                });
+                blocker.onMethodCalled();
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetTextAfterCursor(expectedN, expectedFlags);
+            blocker.expectMethodCalled("IC#getTextAfterCursor() must be called back", TIMEOUT);
+            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
+            assertTrue("When timeout happens, IC#getTextAfterCursor() returns null",
+                    result.isNullReturnValue());
+            methodCallVerifier.assertCalledOnce(args -> {
+                assertEquals(expectedN, args.get("n"));
+                assertEquals(expectedFlags, args.get("flags"));
+            });
+        }, blocker);
+    }
+
+    /**
+     * Test {@link InputConnection#getTextAfterCursor(int, int)} fail-fasts once unbindInput() is
+     * issued.
+     */
+    @Test
+    public void testGetTextAfterCursorFailFastAfterUnbindInput() throws Exception {
+        final String unexpectedResult = "89";
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public CharSequence getTextAfterCursor(int n, int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("n", n);
+                    args.putInt("flags", flags);
+                });
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now IC#getTextAfterCursor() for the memorized IC should fail fast.
+            final ImeEvent result = expectCommand(stream, session.callGetTextAfterCursor(
+                    unexpectedResult.length(), InputConnection.GET_TEXT_WITH_STYLES), TIMEOUT);
+            assertTrue("Once unbindInput() happened, IC#getTextAfterCursor() returns null",
+                    result.isNullReturnValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+            methodCallVerifier.assertNotCalled(
+                    "Once unbindInput() happened, IC#getTextAfterCursor() fails fast.");
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getTextBeforeCursor(int, int)} works as expected.
+     */
+    @Test
+    public void testGetTextBeforeCursor() throws Exception {
+        final int expectedN = 3;
+        final int expectedFlags = InputConnection.GET_TEXT_WITH_STYLES;
+        final CharSequence expectedResult =
+                createTestCharSequence("123", new Annotation("command", "getTextBeforeCursor"));
+
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public CharSequence getTextBeforeCursor(int n, int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("n", n);
+                    args.putInt("flags", flags);
+                });
+                return expectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetTextBeforeCursor(expectedN, expectedFlags);
+            final CharSequence result =
+                    expectCommand(stream, command, TIMEOUT).getReturnCharSequenceValue();
+            assertEqualsForTestCharSequence(expectedResult, result);
+            methodCallVerifier.assertCalledOnce(args -> {
+                assertEquals(expectedN, args.get("n"));
+                assertEquals(expectedFlags, args.get("flags"));
+            });
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getTextBeforeCursor(int, int)} fails when a negative
+     * {@code length} is passed.  See Bug 169114026 for background.
+     */
+    @Test
+    public void testGetTextBeforeCursorFailWithNegativeLength() throws Exception {
+        final String unexpectedResult = "123";
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public CharSequence getTextBeforeCursor(int n, int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("n", n);
+                    args.putInt("flags", flags);
+                });
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetTextBeforeCursor(-1, 0);
+            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
+            assertTrue("IC#getTextBeforeCursor() returns null for a negative length.",
+                    result.isNullReturnValue());
+            methodCallVerifier.expectNotCalled(
+                    "IC#getTextBeforeCursor() will not be triggered with a negative length.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getTextBeforeCursor(int, int)} fails after a system-defined
+     * time-out even if the target app does not respond.
+     */
+    @Test
+    public void testGetTextBeforeCursorFailWithTimeout() throws Exception {
+        final int expectedN = 3;
+        final int expectedFlags = InputConnection.GET_TEXT_WITH_STYLES;
+        final String unexpectedResult = "123";
+        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public CharSequence getTextBeforeCursor(int n, int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("n", n);
+                    args.putInt("flags", flags);
+                });
+                blocker.onMethodCalled();
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetTextBeforeCursor(expectedN, expectedFlags);
+            blocker.expectMethodCalled("IC#getTextBeforeCursor() must be called back", TIMEOUT);
+            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
+            assertTrue("When timeout happens, IC#getTextBeforeCursor() returns null",
+                    result.isNullReturnValue());
+            methodCallVerifier.assertCalledOnce(args -> {
+                assertEquals(expectedN, args.get("n"));
+                assertEquals(expectedFlags, args.get("flags"));
+            });
+        }, blocker);
+    }
+
+    /**
+     * Test {@link InputConnection#getTextBeforeCursor(int, int)} fail-fasts once unbindInput() is
+     * issued.
+     */
+    @Test
+    public void testGetTextBeforeCursorFailFastAfterUnbindInput() throws Exception {
+        final String unexpectedResult = "123";
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public CharSequence getTextBeforeCursor(int n, int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("n", n);
+                    args.putInt("flags", flags);
+                });
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now IC#getTextBeforeCursor() for the memorized IC should fail fast.
+            final ImeEvent result = expectCommand(stream, session.callGetTextBeforeCursor(
+                    unexpectedResult.length(), InputConnection.GET_TEXT_WITH_STYLES), TIMEOUT);
+            assertTrue("Once unbindInput() happened, IC#getTextBeforeCursor() returns null",
+                    result.isNullReturnValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+            methodCallVerifier.assertNotCalled(
+                    "Once unbindInput() happened, IC#getTextBeforeCursor() fails fast.");
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getSelectedText(int)} works as expected.
+     */
+    @Test
+    public void testGetSelectedText() throws Exception {
+        final int expectedFlags = InputConnection.GET_TEXT_WITH_STYLES;
+        final CharSequence expectedResult =
+                createTestCharSequence("4567", new Annotation("command", "getSelectedText"));
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public CharSequence getSelectedText(int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("flags", flags);
+                });
+                assertEquals(expectedFlags, flags);
+                return expectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetSelectedText(expectedFlags);
+            final CharSequence result =
+                    expectCommand(stream, command, TIMEOUT).getReturnCharSequenceValue();
+            assertEqualsForTestCharSequence(expectedResult, result);
+            methodCallVerifier.assertCalledOnce(args -> {
+                assertEquals(expectedFlags, args.get("flags"));
+            });
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getSelectedText(int)} fails after a system-defined time-out even
+     * if the target app does not respond.
+     */
+    @Test
+    public void testGetSelectedTextFailWithTimeout() throws Exception {
+        final int expectedFlags = InputConnection.GET_TEXT_WITH_STYLES;
+        final String unexpectedResult = "4567";
+        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public CharSequence getSelectedText(int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("flags", flags);
+                });
+                blocker.onMethodCalled();
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command =
+                    session.callGetSelectedText(InputConnection.GET_TEXT_WITH_STYLES);
+            blocker.expectMethodCalled("IC#getSelectedText() must be called back", TIMEOUT);
+            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
+            assertTrue("When timeout happens, IC#getSelectedText() returns null",
+                    result.isNullReturnValue());
+            methodCallVerifier.assertCalledOnce(args -> {
+                assertEquals(expectedFlags, args.get("flags"));
+            });
+        }, blocker);
+    }
+
+    /**
+     * Test {@link InputConnection#getSelectedText(int)} fail-fasts once unbindInput() is issued.
+     */
+    @Test
+    public void testGetSelectedTextFailFastAfterUnbindInput() throws Exception {
+        final String unexpectedResult = "4567";
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public CharSequence getSelectedText(int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("flags", flags);
+                });
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now IC#getSelectedText() for the memorized IC should fail fast.
+            final ImeEvent result = expectCommand(stream, session.callGetSelectedText(
+                    InputConnection.GET_TEXT_WITH_STYLES), TIMEOUT);
+            assertTrue("Once unbindInput() happened, IC#getSelectedText() returns null",
+                    result.isNullReturnValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+            methodCallVerifier.assertNotCalled(
+                    "Once unbindInput() happened, IC#getSelectedText() fails fast.");
+        });
+    }
+
+    /**
+     * Verify that {@link InputConnection#getSelectedText(int)} returns {@code null} when the target
+     * app does not implement it.  This can happen if the app was built before
+     * {@link android.os.Build.VERSION_CODES#GINGERBREAD}.
+     */
+    @Test
+    public void testGetSelectedTextFailWithMethodMissing() throws Exception {
+        testMinimallyImplementedInputConnection((MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetSelectedText(0);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            assertTrue("Currently getSelectedText() returns null when the target app does not"
+                    + " implement it.", result.isNullReturnValue());
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getSurroundingText(int, int, int)} works as expected.
+     */
+    @Test
+    public void testGetSurroundingText() throws Exception {
+        final int expectedBeforeLength = 3;
+        final int expectedAfterLength = 4;
+        final int expectedFlags = InputConnection.GET_TEXT_WITH_STYLES;
+        final CharSequence expectedText =
+                createTestCharSequence("012345", new Annotation("command", "getSurroundingText"));
+        final SurroundingText expectedResult = new SurroundingText(expectedText, 1, 2, 0);
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public SurroundingText getSurroundingText(int beforeLength, int afterLength,
+                    int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("beforeLength", beforeLength);
+                    args.putInt("afterLength", afterLength);
+                    args.putInt("flags", flags);
+                });
+                return expectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetSurroundingText(expectedBeforeLength,
+                    expectedAfterLength, expectedFlags);
+            final SurroundingText result =
+                    expectCommand(stream, command, TIMEOUT).getReturnParcelableValue();
+            assertEqualsForTestCharSequence(expectedResult.getText(), result.getText());
+            assertEquals(expectedResult.getSelectionStart(), result.getSelectionStart());
+            assertEquals(expectedResult.getSelectionEnd(), result.getSelectionEnd());
+            assertEquals(expectedResult.getOffset(), result.getOffset());
+            methodCallVerifier.assertCalledOnce(args -> {
+                assertEquals(expectedBeforeLength, args.get("beforeLength"));
+                assertEquals(expectedAfterLength, args.get("afterLength"));
+                assertEquals(expectedFlags, args.get("flags"));
+            });
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getSurroundingText(int, int, int)} fails when a nagative
+     * {@code afterLength} is passed.  See Bug 169114026 for background.
+     */
+    @Test
+    public void testGetSurroundingTextFailWithNegativeAfterLength() throws Exception {
+        final SurroundingText unexpectedResult = new SurroundingText("012345", 1, 2, 0);
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public SurroundingText getSurroundingText(int beforeLength, int afterLength,
+                    int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("beforeLength", beforeLength);
+                    args.putInt("afterLength", afterLength);
+                    args.putInt("flags", flags);
+                });
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetSurroundingText(1, -1, 0);
+            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
+            assertTrue("IC#getSurroundingText() returns null for a negative afterLength.",
+                    result.isNullReturnValue());
+            methodCallVerifier.expectNotCalled(
+                    "IC#getSurroundingText() will not be triggered with a negative afterLength.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getSurroundingText(int, int, int)} fails when a negative
+     * {@code beforeLength} is passed.  See Bug 169114026 for background.
+     */
+    @Test
+    public void testGetSurroundingTextFailWithNegativeBeforeLength() throws Exception {
+        final SurroundingText unexpectedResult = new SurroundingText("012345", 1, 2, 0);
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public SurroundingText getSurroundingText(int beforeLength, int afterLength,
+                    int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("beforeLength", beforeLength);
+                    args.putInt("afterLength", afterLength);
+                    args.putInt("flags", flags);
+                });
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetSurroundingText(-1, 1, 0);
+            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
+            assertTrue("IC#getSurroundingText() returns null for a negative beforeLength.",
+                    result.isNullReturnValue());
+            methodCallVerifier.expectNotCalled(
+                    "IC#getSurroundingText() will not be triggered with a negative beforeLength.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getSurroundingText(int, int, int)} fails after a system-defined
+     * time-out even if the target app does not respond.
+     */
+    @Test
+    public void testGetSurroundingTextFailWithTimeout() throws Exception {
+        final int expectedBeforeLength = 3;
+        final int expectedAfterLength = 4;
+        final int expectedFlags = InputConnection.GET_TEXT_WITH_STYLES;
+        final SurroundingText unexpectedResult = new SurroundingText("012345", 1, 2, 0);
+
+        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public SurroundingText getSurroundingText(int beforeLength, int afterLength,
+                    int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("beforeLength", beforeLength);
+                    args.putInt("afterLength", afterLength);
+                    args.putInt("flags", flags);
+                });
+                blocker.onMethodCalled();
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetSurroundingText(expectedBeforeLength,
+                    expectedAfterLength, expectedFlags);
+            blocker.expectMethodCalled("IC#getSurroundingText() must be called back", TIMEOUT);
+            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
+            assertTrue("When timeout happens, IC#getSurroundingText() returns null",
+                    result.isNullReturnValue());
+            methodCallVerifier.assertCalledOnce(args -> {
+                assertEquals(expectedBeforeLength, args.get("beforeLength"));
+                assertEquals(expectedAfterLength, args.get("afterLength"));
+                assertEquals(expectedFlags, args.get("flags"));
+            });
+        }, blocker);
+    }
+
+    /**
+     * Test {@link InputConnection#getSurroundingText(int, int, int)} fail-fasts once unbindInput()
+     * is issued.
+     */
+    @Test
+    public void testGetSurroundingTextFailFastAfterUnbindInput() throws Exception {
+        final int beforeLength = 3;
+        final int afterLength = 4;
+        final int flags = InputConnection.GET_TEXT_WITH_STYLES;
+        final SurroundingText unexpectedResult = new SurroundingText("012345", 1, 2, 0);
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public SurroundingText getSurroundingText(int beforeLength, int afterLength,
+                    int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("beforeLength", beforeLength);
+                    args.putInt("afterLength", afterLength);
+                    args.putInt("flags", flags);
+                });
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now IC#getTextBeforeCursor() for the memorized IC should fail fast.
+            final ImeEvent result = expectCommand(stream, session.callGetSurroundingText(
+                    beforeLength, afterLength, flags), TIMEOUT);
+            assertTrue("Once unbindInput() happened, IC#getSurroundingText() returns null",
+                    result.isNullReturnValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+            methodCallVerifier.assertNotCalled(
+                    "Once unbindInput() happened, IC#getSurroundingText() fails fast.");
+        });
+    }
+
+    /**
+     * Verify that the default implementation of
+     * {@link InputConnection#getSurroundingText(int, int, int)} returns {@code null} without any
+     * crash even when the target app does not override it .
+     */
+    @Test
+    public void testGetSurroundingTextDefaultMethod() throws Exception {
+        testMinimallyImplementedInputConnection((MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetSurroundingText(1, 2, 0);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            assertTrue("Default IC#getSurroundingText() returns null.",
+                    result.isNullReturnValue());
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getCursorCapsMode(int)} works as expected.
+     */
+    @Test
+    public void testGetCursorCapsMode() throws Exception {
+        final int expectedReqMode = TextUtils.CAP_MODE_SENTENCES | TextUtils.CAP_MODE_CHARACTERS
+                | TextUtils.CAP_MODE_WORDS;
+        final int expectedResult = EditorInfo.TYPE_TEXT_FLAG_CAP_SENTENCES;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public int getCursorCapsMode(int reqModes) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("reqModes", reqModes);
+                });
+                return expectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetCursorCapsMode(expectedReqMode);
+            final int result = expectCommand(stream, command, TIMEOUT).getReturnIntegerValue();
+            assertEquals(expectedResult, result);
+            methodCallVerifier.assertCalledOnce(args -> {
+                assertEquals(expectedReqMode, args.getInt("reqModes"));
+            });
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getCursorCapsMode(int)} fails after a system-defined time-out
+     * even if the target app does not respond.
+     */
+    @Test
+    public void testGetCursorCapsModeFailWithTimeout() throws Exception {
+        final int expectedReqMode = TextUtils.CAP_MODE_SENTENCES | TextUtils.CAP_MODE_CHARACTERS
+                | TextUtils.CAP_MODE_WORDS;
+        final int unexpectedResult = EditorInfo.TYPE_TEXT_FLAG_CAP_WORDS;
+        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public int getCursorCapsMode(int reqModes) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("reqModes", reqModes);
+                });
+                blocker.onMethodCalled();
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetCursorCapsMode(expectedReqMode);
+            blocker.expectMethodCalled("IC#getCursorCapsMode() must be called back", TIMEOUT);
+            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
+            assertEquals("When timeout happens, IC#getCursorCapsMode() returns 0",
+                    0, result.getReturnIntegerValue());
+            methodCallVerifier.assertCalledOnce(args -> {
+                assertEquals(expectedReqMode, args.getInt("reqModes"));
+            });
+        }, blocker);
+    }
+
+    /**
+     * Test {@link InputConnection#getCursorCapsMode(int)} fail-fasts once unbindInput() is issued.
+     */
+    @Test
+    public void testGetCursorCapsModeFailFastAfterUnbindInput() throws Exception {
+        final int unexpectedResult = EditorInfo.TYPE_TEXT_FLAG_CAP_WORDS;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public int getCursorCapsMode(int reqModes) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("reqModes", reqModes);
+                });
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now IC#getCursorCapsMode() for the memorized IC should fail fast.
+            final ImeEvent result = expectCommand(stream,
+                    session.callGetCursorCapsMode(TextUtils.CAP_MODE_WORDS), TIMEOUT);
+            assertEquals("Once unbindInput() happened, IC#getCursorCapsMode() returns 0",
+                    0, result.getReturnIntegerValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+            methodCallVerifier.assertNotCalled(
+                    "Once unbindInput() happened, IC#getCursorCapsMode() fails fast.");
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getExtractedText(ExtractedTextRequest, int)} works as expected.
+     */
+    @Test
+    public void testGetExtractedText() throws Exception {
+        final ExtractedTextRequest expectedRequest = ExtractedTextRequestTest.createForTest();
+        final int expectedFlags = InputConnection.GET_EXTRACTED_TEXT_MONITOR;
+        final ExtractedText expectedResult = ExtractedTextTest.createForTest();
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putParcelable("request", request);
+                    args.putInt("flags", flags);
+                });
+                return expectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetExtractedText(expectedRequest, expectedFlags);
+            final ExtractedText result =
+                    expectCommand(stream, command, TIMEOUT).getReturnParcelableValue();
+            ExtractedTextTest.assertTestInstance(result);
+            methodCallVerifier.assertCalledOnce(args -> {
+                ExtractedTextRequestTest.assertTestInstance(args.getParcelable("request"));
+                assertEquals(expectedFlags, args.getInt("flags"));
+            });
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getExtractedText(ExtractedTextRequest, int)} fails after a
+     * system-defined time-out even if the target app does not respond.
+     */
+    @Test
+    public void testGetExtractedTextFailWithTimeout() throws Exception {
+        final ExtractedTextRequest expectedRequest = ExtractedTextRequestTest.createForTest();
+        final int expectedFlags = InputConnection.GET_EXTRACTED_TEXT_MONITOR;
+        final ExtractedText unexpectedResult = ExtractedTextTest.createForTest();
+        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putParcelable("request", request);
+                    args.putInt("flags", flags);
+                });
+                blocker.onMethodCalled();
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetExtractedText(expectedRequest, expectedFlags);
+            blocker.expectMethodCalled("IC#getExtractedText() must be called back", TIMEOUT);
+            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
+            assertTrue("When timeout happens, IC#getExtractedText() returns null",
+                    result.isNullReturnValue());
+            methodCallVerifier.assertCalledOnce(args -> {
+                ExtractedTextRequestTest.assertTestInstance(args.getParcelable("request"));
+                assertEquals(expectedFlags, args.getInt("flags"));
+            });
+        }, blocker);
+    }
+
+    /**
+     * Test {@link InputConnection#getExtractedText(ExtractedTextRequest, int)} fail-fasts once
+     * unbindInput() is issued.
+     */
+    @Test
+    public void testGetExtractedTextFailFastAfterUnbindInput() throws Exception {
+        final ExtractedText unexpectedResult = ExtractedTextTest.createForTest();
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putParcelable("request", request);
+                    args.putInt("flags", flags);
+                });
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now IC#getExtractedText() for the memorized IC should fail fast.
+            final ImeEvent result = expectCommand(stream, session.callGetExtractedText(
+                    ExtractedTextRequestTest.createForTest(),
+                    InputConnection.GET_EXTRACTED_TEXT_MONITOR), TIMEOUT);
+            assertTrue("Once unbindInput() happened, IC#getExtractedText() returns null",
+                    result.isNullReturnValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+            methodCallVerifier.assertNotCalled(
+                    "Once unbindInput() happened, IC#getExtractedText() fails fast.");
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#requestCursorUpdates(int)} works as expected.
+     */
+    @Test
+    public void testRequestCursorUpdates() throws Exception {
+        final int expectedFlags = InputConnection.CURSOR_UPDATE_IMMEDIATE;
+        final boolean expectedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean requestCursorUpdates(int cursorUpdateMode) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("cursorUpdateMode", cursorUpdateMode);
+                });
+                assertEquals(expectedFlags, cursorUpdateMode);
+                return expectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callRequestCursorUpdates(expectedFlags);
+            assertTrue(expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.assertCalledOnce(args -> {
+                assertEquals(expectedFlags, args.getInt("cursorUpdateMode"));
+            });
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#requestCursorUpdates(int)} fails after a system-defined time-out
+     * even if the target app does not respond.
+     */
+    @Test
+    public void testRequestCursorUpdatesFailWithTimeout() throws Exception {
+        final int expectedFlags = InputConnection.CURSOR_UPDATE_IMMEDIATE;
+        final boolean unexpectedResult = true;
+        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean requestCursorUpdates(int cursorUpdateMode) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("cursorUpdateMode", cursorUpdateMode);
+                });
+                blocker.onMethodCalled();
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callRequestCursorUpdates(
+                    InputConnection.CURSOR_UPDATE_IMMEDIATE);
+            blocker.expectMethodCalled("IC#requestCursorUpdates() must be called back", TIMEOUT);
+            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
+            assertFalse("When timeout happens, IC#requestCursorUpdates() returns false",
+                    result.getReturnBooleanValue());
+            methodCallVerifier.assertCalledOnce(args -> {
+                assertEquals(expectedFlags, args.getInt("cursorUpdateMode"));
+            });
+        }, blocker);
+    }
+
+    /**
+     * Test {@link InputConnection#requestCursorUpdates(int)} fail-fasts once unbindInput() is
+     * issued.
+     */
+    @Test
+    public void testRequestCursorUpdatesFailFastAfterUnbindInput() throws Exception {
+        final boolean unexpectedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean requestCursorUpdates(int cursorUpdateMode) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("cursorUpdateMode", cursorUpdateMode);
+                });
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now IC#requestCursorUpdates() for the memorized IC should fail fast.
+            final ImeEvent result = expectCommand(stream, session.callRequestCursorUpdates(
+                    InputConnection.CURSOR_UPDATE_IMMEDIATE), TIMEOUT);
+            assertFalse("Once unbindInput() happened, IC#requestCursorUpdates() returns false",
+                    result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+            methodCallVerifier.assertNotCalled(
+                    "Once unbindInput() happened, IC#requestCursorUpdates() fails fast.");
+        });
+    }
+
+    /**
+     * Verify that {@link InputConnection#requestCursorUpdates(int)} fails when the target app does
+     * not implement it. This can happen if the app was built before
+     * {@link android.os.Build.VERSION_CODES#LOLLIPOP}.
+     */
+    @Test
+    public void testRequestCursorUpdatesFailWithMethodMissing() throws Exception {
+        testMinimallyImplementedInputConnection((MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callRequestCursorUpdates(
+                    InputConnection.CURSOR_UPDATE_IMMEDIATE);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            assertFalse("IC#requestCursorUpdates() returns false when the target app does not "
+                    + " implement it.", result.getReturnBooleanValue());
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#commitContent(InputContentInfo, int, Bundle)} works as expected.
+     */
+    @Test
+    public void testCommitContent() throws Exception {
+        final InputContentInfo expectedInputContentInfo = new InputContentInfo(
+                Uri.parse("content://com.example/path"),
+                new ClipDescription("sample content", new String[]{"image/png"}),
+                Uri.parse("https://example.com"));
+        final Bundle expectedOpt = new Bundle();
+        final String expectedOptKey = "testKey";
+        final int expectedOptValue = 42;
+        expectedOpt.putInt(expectedOptKey, expectedOptValue);
+        final int expectedFlags = InputConnection.INPUT_CONTENT_GRANT_READ_URI_PERMISSION;
+        final boolean expectedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean commitContent(InputContentInfo inputContentInfo, int flags,
+                    Bundle opts) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putParcelable("inputContentInfo", inputContentInfo);
+                    args.putInt("flags", flags);
+                    args.putBundle("opts", opts);
+                });
+                return expectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command =
+                    session.callCommitContent(expectedInputContentInfo, expectedFlags, expectedOpt);
+            assertTrue(expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.assertCalledOnce(args -> {
+                final InputContentInfo inputContentInfo = args.getParcelable("inputContentInfo");
+                final Bundle opts = args.getBundle("opts");
+                assertNotNull(inputContentInfo);
+                assertEquals(expectedInputContentInfo.getContentUri(),
+                        inputContentInfo.getContentUri());
+                assertEquals(expectedFlags, args.getInt("flags"));
+                assertNotNull(opts);
+                assertEquals(expectedOpt.getInt(expectedOptKey), opts.getInt(expectedOptKey));
+            });
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#commitContent(InputContentInfo, int, Bundle)} fails after a
+     * system-defined time-out even if the target app does not respond.
+     */
+    @Test
+    public void testCommitContentFailWithTimeout() throws Exception {
+        final InputContentInfo expectedInputContentInfo = new InputContentInfo(
+                Uri.parse("content://com.example/path"),
+                new ClipDescription("sample content", new String[]{"image/png"}),
+                Uri.parse("https://example.com"));
+        final Bundle expectedOpt = new Bundle();
+        final String expectedOptKey = "testKey";
+        final int expectedOptValue = 42;
+        expectedOpt.putInt(expectedOptKey, expectedOptValue);
+        final int expectedFlags = InputConnection.INPUT_CONTENT_GRANT_READ_URI_PERMISSION;
+        final boolean unexpectedResult = true;
+        final BlockingMethodVerifier blocker = new BlockingMethodVerifier();
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean commitContent(InputContentInfo inputContentInfo, int flags,
+                    Bundle opts) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putParcelable("inputContentInfo", inputContentInfo);
+                    args.putInt("flags", flags);
+                    args.putBundle("opts", opts);
+                });
+                blocker.onMethodCalled();
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command =
+                    session.callCommitContent(expectedInputContentInfo, expectedFlags, expectedOpt);
+            blocker.expectMethodCalled("IC#commitContent() must be called back", TIMEOUT);
+            final ImeEvent result = expectCommand(stream, command, LONG_TIMEOUT);
+            assertFalse("When timeout happens, IC#commitContent() returns false",
+                    result.getReturnBooleanValue());
+            methodCallVerifier.assertCalledOnce(args -> {
+                final InputContentInfo inputContentInfo = args.getParcelable("inputContentInfo");
+                final Bundle opts = args.getBundle("opts");
+                assertNotNull(inputContentInfo);
+                assertEquals(expectedInputContentInfo.getContentUri(),
+                        inputContentInfo.getContentUri());
+                assertEquals(expectedFlags, args.getInt("flags"));
+                assertNotNull(opts);
+                assertEquals(expectedOpt.getInt(expectedOptKey), opts.getInt(expectedOptKey));
+            });
+        }, blocker);
+    }
+
+    /**
+     * Test {@link InputConnection#commitContent(InputContentInfo, int, Bundle)} fail-fasts once
+     * unbindInput() is issued.
+     */
+    @Test
+    public void testCommitContentFailFastAfterUnbindInput() throws Exception {
+        final boolean unexpectedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean commitContent(InputContentInfo inputContentInfo, int flags,
+                    Bundle opts) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putParcelable("inputContentInfo", inputContentInfo);
+                    args.putInt("flags", flags);
+                    args.putBundle("opts", opts);
+                });
+                return unexpectedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now IC#getTextAfterCursor() for the memorized IC should fail fast.
+            final ImeEvent result = expectCommand(stream, session.callCommitContent(
+                    new InputContentInfo(Uri.parse("content://com.example/path"),
+                            new ClipDescription("sample content", new String[]{"image/png"}),
+                            Uri.parse("https://example.com")), 0, null), TIMEOUT);
+            assertFalse("Once unbindInput() happened, IC#commitContent() returns false",
+                    result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+            methodCallVerifier.assertNotCalled(
+                    "Once unbindInput() happened, IC#commitContent() fails fast.");
+        });
+    }
+
+    /**
+     * Verify that {@link InputConnection#commitContent(InputContentInfo, int, Bundle)} fails when
+     * the target app does not implement it. This can happen if the app was built before
+     * {@link android.os.Build.VERSION_CODES#N_MR1}.
+     */
+    @Test
+    public void testCommitContentFailWithMethodMissing() throws Exception {
+        testMinimallyImplementedInputConnection((MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callCommitContent(
+                    new InputContentInfo(Uri.parse("content://com.example/path"),
+                            new ClipDescription("sample content", new String[]{"image/png"}),
+                            Uri.parse("https://example.com")), 0, null);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertFalse("Currently IC#commitContent() returns false when the target app does not"
+                    + " implement it.", result.getReturnBooleanValue());
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#deleteSurroundingText(int, int)} works as expected.
+     */
+    @Test
+    public void testDeleteSurroundingText() throws Exception {
+        final int expectedBeforeLength = 5;
+        final int expectedAfterLength = 4;
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("beforeLength", beforeLength);
+                    args.putInt("afterLength", afterLength);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command =
+                    session.callDeleteSurroundingText(expectedBeforeLength, expectedAfterLength);
+            assertTrue("deleteSurroundingText() always returns true unless RemoteException is"
+                    + " thrown", expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                assertEquals(expectedBeforeLength, args.getInt("beforeLength"));
+                assertEquals(expectedAfterLength, args.getInt("afterLength"));
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#deleteSurroundingText(int, int)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testDeleteSurroundingTextAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("beforeLength", beforeLength);
+                    args.putInt("afterLength", afterLength);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now IC#deleteSurroundingText() for the memorized IC should fail fast.
+            final ImeCommand command = session.callDeleteSurroundingText(3, 4);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#deleteSurroundingText() still returns true even after"
+                    + " unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#deleteSurroundingText() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#deleteSurroundingTextInCodePoints(int, int)} works as expected.
+     */
+    @Test
+    public void testDeleteSurroundingTextInCodePoints() throws Exception {
+        final int expectedBeforeLength = 5;
+        final int expectedAfterLength = 4;
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean deleteSurroundingTextInCodePoints(int beforeLength, int afterLength) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("beforeLength", beforeLength);
+                    args.putInt("afterLength", afterLength);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callDeleteSurroundingTextInCodePoints(
+                    expectedBeforeLength, expectedAfterLength);
+            assertTrue("deleteSurroundingText() always returns true unless RemoteException is"
+                    + " thrown", expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                assertEquals(expectedBeforeLength, args.getInt("beforeLength"));
+                assertEquals(expectedAfterLength, args.getInt("afterLength"));
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#deleteSurroundingTextInCodePoints(int, int)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testDeleteSurroundingTextInCodePointsAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean deleteSurroundingTextInCodePoints(int beforeLength, int afterLength) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("beforeLength", beforeLength);
+                    args.putInt("afterLength", afterLength);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now IC#deleteSurroundingTextInCodePoints() for the memorized IC should fail fast.
+            final ImeCommand command = session.callDeleteSurroundingTextInCodePoints(3, 4);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#deleteSurroundingTextInCodePoints() still returns true even"
+                    + " after unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#deleteSurroundingTextInCodePoints() fails"
+                    + " fast.", EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Verify that the app does not crash even if it does not implement
+     * {@link InputConnection#deleteSurroundingTextInCodePoints(int, int)}, which can happen if the
+     * app was built before {@link android.os.Build.VERSION_CODES#N}.
+     */
+    @Test
+    public void testDeleteSurroundingTextInCodePointsFailWithMethodMissing() throws Exception {
+        testMinimallyImplementedInputConnection((MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callDeleteSurroundingTextInCodePoints(1, 2);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            assertTrue("IC#deleteSurroundingTextInCodePoints() returns true even when the target"
+                    + " app does not implement it.", result.getReturnBooleanValue());
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#commitText(CharSequence, int)} works as expected.
+     */
+    @Test
+    public void testCommitText() throws Exception {
+        final Annotation expectedSpan = new Annotation("expectedKey", "expectedValue");
+        final CharSequence expectedText = createTestCharSequence("expectedText", expectedSpan);
+        final int expectedNewCursorPosition = 123;
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean commitText(CharSequence text, int newCursorPosition) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putCharSequence("text", text);
+                    args.putInt("newCursorPosition", newCursorPosition);
+                });
+
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command =
+                    session.callCommitText(expectedText, expectedNewCursorPosition);
+            assertTrue("commitText() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                assertEqualsForTestCharSequence(expectedText, args.getCharSequence("text"));
+                assertEquals(expectedNewCursorPosition, args.getInt("newCursorPosition"));
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#commitText(CharSequence, int)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testCommitTextAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean commitText(CharSequence text, int newCursorPosition) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putCharSequence("text", text);
+                    args.putInt("newCursorPosition", newCursorPosition);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now IC#getTextAfterCursor() for the memorized IC should fail fast.
+            final ImeEvent result = expectCommand(stream,
+                    session.callCommitText("text", 1), TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#commitText() still returns true even after unbindInput().",
+                    result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#commitText() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#commitText(CharSequence, int, TextAttribute)} works as expected.
+     */
+    @Test
+    public void testCommitTextWithTextAttribute() throws Exception {
+        final Annotation expectedSpan = new Annotation("expectedKey", "expectedValue");
+        final CharSequence expectedText = createTestCharSequence("expectedText", expectedSpan);
+        final int expectedNewCursorPosition = 123;
+        final ArrayList<String> expectedSuggestions = new ArrayList<>();
+        expectedSuggestions.add("test");
+        final TextAttribute expectedTextAttribute = new TextAttribute.Builder()
+                .setTextConversionSuggestions(expectedSuggestions).build();
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean commitText(
+                    CharSequence text, int newCursorPosition, TextAttribute textAttribute) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putCharSequence("text", text);
+                    args.putInt("newCursorPosition", newCursorPosition);
+                    args.putParcelable("textAttribute", textAttribute);
+                });
+
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callCommitText(
+                    expectedText, expectedNewCursorPosition, expectedTextAttribute);
+            assertTrue("commitText() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                assertEqualsForTestCharSequence(expectedText, args.getCharSequence("text"));
+                assertEquals(expectedNewCursorPosition, args.getInt("newCursorPosition"));
+                final TextAttribute textAttribute = args.getParcelable("textAttribute");
+                assertThat(textAttribute).isNotNull();
+                assertThat(textAttribute.getTextConversionSuggestions())
+                        .containsExactlyElementsIn(expectedSuggestions);
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#commitText(CharSequence, int, TextAttribute)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testCommitTextAfterUnbindInputWithTextAttribute() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean commitText(
+                    CharSequence text, int newCursorPosition, TextAttribute textAttribute) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putCharSequence("text", text);
+                    args.putInt("newCursorPosition", newCursorPosition);
+                    args.putParcelable("textAttribute", textAttribute);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now IC#getTextAfterCursor() for the memorized IC should fail fast.
+            final ImeEvent result = expectCommand(stream,
+                    session.callCommitText("text", 1,
+                            new TextAttribute.Builder().setTextConversionSuggestions(
+                                    Collections.singletonList("test")).build()),
+                    TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#commitText() still returns true even after unbindInput().",
+                    result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#commitText() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#setComposingText(CharSequence, int)} works as expected.
+     */
+    @Test
+    public void testSetComposingText() throws Exception {
+        final Annotation expectedSpan = new Annotation("expectedKey", "expectedValue");
+        final CharSequence expectedText = createTestCharSequence("expectedText", expectedSpan);
+        final int expectedNewCursorPosition = 123;
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean setComposingText(CharSequence text, int newCursorPosition) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putCharSequence("text", text);
+                    args.putInt("newCursorPosition", newCursorPosition);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command =
+                    session.callSetComposingText(expectedText, expectedNewCursorPosition);
+            assertTrue("setComposingText() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                assertEqualsForTestCharSequence(expectedText, args.getCharSequence("text"));
+                assertEquals(expectedNewCursorPosition, args.getInt("newCursorPosition"));
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#setComposingText(CharSequence, int)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testSetComposingTextAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean setComposingText(CharSequence text, int newCursorPosition) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putCharSequence("text", text);
+                    args.putInt("newCursorPosition", newCursorPosition);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callSetComposingText("text", 1);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#setComposingText() still returns true even after "
+                    + "unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#setComposingText() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#setComposingText(CharSequence, int, TextAttribute)}
+     * works as expected.
+     */
+    @Test
+    public void testSetComposingTextWithTextAttribute() throws Exception {
+        final Annotation expectedSpan = new Annotation("expectedKey", "expectedValue");
+        final CharSequence expectedText = createTestCharSequence("expectedText", expectedSpan);
+        final int expectedNewCursorPosition = 123;
+        final ArrayList<String> expectedSuggestions = new ArrayList<>();
+        expectedSuggestions.add("test");
+        final TextAttribute expectedTextAttribute = new TextAttribute.Builder()
+                .setTextConversionSuggestions(expectedSuggestions).build();
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean setComposingText(CharSequence text, int newCursorPosition,
+                    TextAttribute textAttribute) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putCharSequence("text", text);
+                    args.putInt("newCursorPosition", newCursorPosition);
+                    args.putParcelable("textAttribute", textAttribute);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callSetComposingText(
+                    expectedText, expectedNewCursorPosition, expectedTextAttribute);
+            assertTrue("testSetComposingTextWithTextAttribute() always returns true unless"
+                            + " RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                assertEqualsForTestCharSequence(expectedText, args.getCharSequence("text"));
+                assertEquals(expectedNewCursorPosition, args.getInt("newCursorPosition"));
+                final TextAttribute textAttribute = args.getParcelable("textAttribute");
+                assertThat(textAttribute).isNotNull();
+                assertThat(textAttribute.getTextConversionSuggestions())
+                        .containsExactlyElementsIn(expectedSuggestions);
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#setComposingText(CharSequence, int, TextAttribute)} fails fast
+     * once {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testSetComposingTextAfterUnbindInputWithTextAttribute() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean setComposingText(CharSequence text, int newCursorPosition,
+                    TextAttribute textAttribute) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putCharSequence("text", text);
+                    args.putInt("newCursorPosition", newCursorPosition);
+                    args.putParcelable("textAttribute", textAttribute);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callSetComposingText(
+                    "text", 1, new TextAttribute.Builder()
+                            .setTextConversionSuggestions(Collections.singletonList("test"))
+                            .build());
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#setComposingText() still returns true even after "
+                    + "unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#setComposingText() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#setComposingRegion(int, int)} works as expected.
+     */
+    @Test
+    public void testSetComposingRegion() throws Exception {
+        final int expectedStart = 3;
+        final int expectedEnd = 17;
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean setComposingRegion(int start, int end) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("start", start);
+                    args.putInt("end", end);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callSetComposingRegion(expectedStart, expectedEnd);
+            assertTrue("setComposingRegion() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                assertEquals(expectedStart, args.getInt("start"));
+                assertEquals(expectedEnd, args.getInt("end"));
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#setComposingRegion(int, int)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testSetComposingRegionTextAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean setComposingRegion(int start, int end) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("start", start);
+                    args.putInt("end", end);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callSetComposingRegion(1, 23);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#setComposingRegion() still returns true even after"
+                    + " unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#setComposingRegion() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Verify that the app does not crash even if it does not implement
+     * {@link InputConnection#setComposingRegion(int, int)}, which can happen if the app was built
+     * before {@link android.os.Build.VERSION_CODES#GINGERBREAD}.
+     */
+    @Test
+    public void testSetComposingRegionFailWithMethodMissing() throws Exception {
+        testMinimallyImplementedInputConnection((MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callSetComposingRegion(1, 23);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            assertTrue("IC#setComposingRegion() returns true even when the target app does not"
+                    + " implement it.", result.getReturnBooleanValue());
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#setComposingRegion} works as expected.
+     */
+    @Test
+    public void testSetComposingRegionWithTextAttribute() throws Exception {
+        final int expectedStart = 3;
+        final int expectedEnd = 17;
+        final ArrayList<String> expectedSuggestions = new ArrayList<>();
+        expectedSuggestions.add("test");
+        final TextAttribute expectedTextAttribute = new TextAttribute.Builder()
+                .setTextConversionSuggestions(expectedSuggestions).build();
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean setComposingRegion(
+                    int start, int end, TextAttribute textAttribute) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("start", start);
+                    args.putInt("end", end);
+                    args.putParcelable("textAttribute", textAttribute);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callSetComposingRegion(
+                    expectedStart, expectedEnd, expectedTextAttribute);
+            assertTrue("setComposingRegion() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                assertEquals(expectedStart, args.getInt("start"));
+                assertEquals(expectedEnd, args.getInt("end"));
+                final TextAttribute textAttribute = args.getParcelable("textAttribute");
+                assertThat(textAttribute).isNotNull();
+                assertThat(textAttribute.getTextConversionSuggestions())
+                        .containsExactlyElementsIn(expectedSuggestions);
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#setComposingRegion(int, int, TextAttribute)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testSetComposingRegionTextAfterUnbindInputWithTextAttribute() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean setComposingRegion(int start, int end, TextAttribute textAttribute) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("start", start);
+                    args.putInt("end", end);
+                    args.putParcelable("textAttribute", textAttribute);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callSetComposingRegion(1, 23,
+                    new TextAttribute.Builder().setTextConversionSuggestions(
+                            Collections.singletonList("test")).build());
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#setComposingRegion() still returns true even after"
+                    + " unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#setComposingRegion() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#finishComposingText()} works as expected.
+     */
+    @Test
+    public void testFinishComposingText() throws Exception {
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean finishComposingText() {
+                methodCallVerifier.onMethodCalled(bundle -> { });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callFinishComposingText();
+            assertTrue("finishComposingText() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> { }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#finishComposingText()} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testFinishComposingTextAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean finishComposingText() {
+                methodCallVerifier.onMethodCalled(bundle -> { });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // The system internally calls "finishComposingText". So wait for a while then reset
+            // the verifier before our calling "finishComposingText".
+            SystemClock.sleep(TIMEOUT);
+            methodCallVerifier.reset();
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callFinishComposingText();
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#finishComposingText() still returns true even after"
+                    + " unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#finishComposingText() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#commitCompletion(CompletionInfo)} works as expected.
+     */
+    @Test
+    public void testCommitCompletion() throws Exception {
+        final CompletionInfo expectedCompletionInfo = new CompletionInfo(0x12345678, 0x87654321,
+                createTestCharSequence("testText", new Annotation("param", "text")),
+                createTestCharSequence("testLabel", new Annotation("param", "label")));
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean commitCompletion(CompletionInfo text) {
+                methodCallVerifier.onMethodCalled(bundle -> {
+                    bundle.putParcelable("text", text);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callCommitCompletion(expectedCompletionInfo);
+            assertTrue("commitCompletion() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                final CompletionInfo actualCompletionInfo = args.getParcelable("text");
+                assertNotNull(actualCompletionInfo);
+                assertEquals(expectedCompletionInfo.getId(), actualCompletionInfo.getId());
+                assertEquals(expectedCompletionInfo.getPosition(),
+                        actualCompletionInfo.getPosition());
+                assertEqualsForTestCharSequence(expectedCompletionInfo.getText(),
+                        actualCompletionInfo.getText());
+                assertEqualsForTestCharSequence(expectedCompletionInfo.getLabel(),
+                        actualCompletionInfo.getLabel());
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#commitCompletion(CompletionInfo)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testCommitCompletionAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean commitCompletion(CompletionInfo text) {
+                methodCallVerifier.onMethodCalled(bundle -> {
+                    bundle.putParcelable("text", text);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callCommitCompletion(new CompletionInfo(
+                    0x12345678, 0x87654321,
+                    createTestCharSequence("testText", new Annotation("param", "text")),
+                    createTestCharSequence("testLabel", new Annotation("param", "label"))));
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#commitCompletion() still returns true even after"
+                    + " unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#commitCompletion() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#commitCorrection(CorrectionInfo)} works as expected.
+     */
+    @Test
+    public void testCommitCorrection() throws Exception {
+        final CorrectionInfo expectedCorrectionInfo = new CorrectionInfo(0x11111111,
+                createTestCharSequence("testOldText", new Annotation("param", "oldText")),
+                createTestCharSequence("testNewText", new Annotation("param", "newText")));
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean commitCorrection(CorrectionInfo correctionInfo) {
+                methodCallVerifier.onMethodCalled(bundle -> {
+                    bundle.putParcelable("correctionInfo", correctionInfo);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callCommitCorrection(expectedCorrectionInfo);
+            assertTrue("commitCorrection() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                final CorrectionInfo actualCorrectionInfo = args.getParcelable("correctionInfo");
+                assertNotNull(actualCorrectionInfo);
+                assertEquals(expectedCorrectionInfo.getOffset(),
+                        actualCorrectionInfo.getOffset());
+                assertEqualsForTestCharSequence(expectedCorrectionInfo.getOldText(),
+                        actualCorrectionInfo.getOldText());
+                assertEqualsForTestCharSequence(expectedCorrectionInfo.getNewText(),
+                        actualCorrectionInfo.getNewText());
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#commitCorrection(CorrectionInfo)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testCommitCorrectionAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean commitCorrection(CorrectionInfo correctionInfo) {
+                methodCallVerifier.onMethodCalled(bundle -> {
+                    bundle.putParcelable("correctionInfo", correctionInfo);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callCommitCorrection(new CorrectionInfo(0x11111111,
+                    createTestCharSequence("testOldText", new Annotation("param", "oldText")),
+                    createTestCharSequence("testNewText", new Annotation("param", "newText"))));
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#commitCorrection() still returns true even after"
+                    + " unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#commitCorrection() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Verify that the app does not crash even if it does not implement
+     * {@link InputConnection#commitCorrection(CorrectionInfo)}, which can happen if the app was
+     * built before {@link android.os.Build.VERSION_CODES#HONEYCOMB}.
+     */
+    @Test
+    public void testCommitCorrectionFailWithMethodMissing() throws Exception {
+        testMinimallyImplementedInputConnection((MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callCommitCorrection(new CorrectionInfo(0x11111111,
+                    createTestCharSequence("testOldText", new Annotation("param", "oldText")),
+                    createTestCharSequence("testNewText", new Annotation("param", "newText"))));
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            assertTrue("IC#commitCorrection() returns true even when the target app does not"
+                    + " implement it.", result.getReturnBooleanValue());
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#setSelection(int, int)} works as expected.
+     */
+    @Test
+    public void testSetSelection() throws Exception {
+        final int expectedStart = 123;
+        final int expectedEnd = 456;
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean setSelection(int start, int end) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("start", start);
+                    args.putInt("end", end);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callSetSelection(expectedStart, expectedEnd);
+            assertTrue("setSelection() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                assertEquals(expectedStart, args.getInt("start"));
+                assertEquals(expectedEnd, args.getInt("end"));
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#setSelection(int, int)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testSetSelectionTextAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean setSelection(int start, int end) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("start", start);
+                    args.putInt("end", end);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callSetSelection(123, 456);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#setSelection() still returns true even after unbindInput().",
+                    result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#setSelection() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#performEditorAction(int)} works as expected.
+     */
+    @Test
+    public void testPerformEditorAction() throws Exception {
+        final int expectedEditorAction = EditorInfo.IME_ACTION_GO;
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean performEditorAction(int editorAction) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("editorAction", editorAction);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callPerformEditorAction(expectedEditorAction);
+            assertTrue("performEditorAction() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                assertEquals(expectedEditorAction, args.getInt("editorAction"));
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#performEditorAction(int)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testPerformEditorActionAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean performEditorAction(int editorAction) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("editorAction", editorAction);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callPerformEditorAction(EditorInfo.IME_ACTION_GO);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#performEditorAction() still returns true even after "
+                    + "unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#performEditorAction() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#performContextMenuAction(int)} works as expected.
+     */
+    @Test
+    public void testPerformContextMenuAction() throws Exception {
+        final int expectedId = android.R.id.selectAll;
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean performContextMenuAction(int id) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("id", id);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callPerformContextMenuAction(expectedId);
+            assertTrue("performContextMenuAction() always returns true unless RemoteException is "
+                            + "thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                assertEquals(expectedId, args.getInt("id"));
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#performContextMenuAction(int)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testPerformContextMenuActionAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean performContextMenuAction(int id) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("id", id);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callPerformEditorAction(EditorInfo.IME_ACTION_GO);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#performContextMenuAction() still returns true even after "
+                    + "unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#performContextMenuAction() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#beginBatchEdit()} works as expected.
+     */
+    @Test
+    public void testBeginBatchEdit() throws Exception {
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean beginBatchEdit() {
+                methodCallVerifier.onMethodCalled(args -> { });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callBeginBatchEdit();
+            assertTrue("beginBatchEdit() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> { }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#beginBatchEdit()} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testBeginBatchEditAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean beginBatchEdit() {
+                methodCallVerifier.onMethodCalled(args -> { });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callBeginBatchEdit();
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#beginBatchEdit() still returns true even after unbindInput().",
+                    result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#beginBatchEdit() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#endBatchEdit()} works as expected.
+     */
+    @Test
+    public void testEndBatchEdit() throws Exception {
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean endBatchEdit() {
+                methodCallVerifier.onMethodCalled(args -> { });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callEndBatchEdit();
+            assertTrue("endBatchEdit() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> { }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#endBatchEdit()} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testEndBatchEditAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean endBatchEdit() {
+                methodCallVerifier.onMethodCalled(args -> { });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callEndBatchEdit();
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#endBatchEdit() still returns true even after unbindInput().",
+                    result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#endBatchEdit() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#sendKeyEvent(KeyEvent)} works as expected.
+     */
+    @Test
+    public void testSendKeyEvent() throws Exception {
+        final KeyEvent expectedKeyEvent = new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_X);
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean sendKeyEvent(KeyEvent event) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putParcelable("event", event);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callSendKeyEvent(expectedKeyEvent);
+            assertTrue("sendKeyEvent() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                final KeyEvent actualKeyEvent = args.getParcelable("event");
+                assertNotNull(actualKeyEvent);
+                assertEquals(expectedKeyEvent.getAction(), actualKeyEvent.getAction());
+                assertEquals(expectedKeyEvent.getKeyCode(), actualKeyEvent.getKeyCode());
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#sendKeyEvent(KeyEvent)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testSendKeyEventAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean sendKeyEvent(KeyEvent event) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putParcelable("event", event);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callSendKeyEvent(
+                    new KeyEvent(KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_X));
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#sendKeyEvent() still returns true even after unbindInput().",
+                    result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#sendKeyEvent() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#clearMetaKeyStates(int)} works as expected.
+     */
+    @Test
+    public void testClearMetaKeyStates() throws Exception {
+        final int expectedStates = KeyEvent.META_ALT_MASK;
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean clearMetaKeyStates(int states) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("states", states);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callClearMetaKeyStates(expectedStates);
+            assertTrue("clearMetaKeyStates() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                final int actualStates = args.getInt("states");
+                assertEquals(expectedStates, actualStates);
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#clearMetaKeyStates(int)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testClearMetaKeyStatesAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean clearMetaKeyStates(int states) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putInt("states", states);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callClearMetaKeyStates(KeyEvent.META_ALT_MASK);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#clearMetaKeyStates() still returns true even after "
+                    + "unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#clearMetaKeyStates() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#reportFullscreenMode(boolean)} is ignored as expected.
+     */
+    @Test
+    public void testReportFullscreenMode() throws Exception {
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean reportFullscreenMode(boolean enabled) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putBoolean("enabled", enabled);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callReportFullscreenMode(true);
+            assertFalse("reportFullscreenMode() always returns false on API 26+",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "IC#reportFullscreenMode() must be ignored on API 26+",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#reportFullscreenMode(boolean)} is ignored as expected even after
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testReportFullscreenModeAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean reportFullscreenMode(boolean enabled) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putBoolean("enabled", enabled);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callReportFullscreenMode(true);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            assertFalse("reportFullscreenMode() always returns false on API 26+",
+                    result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled("IC#reportFullscreenMode() must be ignored on "
+                    + "API 26+ even after unbindInput().", EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#performSpellCheck()} works as expected.
+     */
+    @Test
+    public void testPerformSpellCheck() throws Exception {
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean performSpellCheck() {
+                methodCallVerifier.onMethodCalled(args -> { });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callPerformSpellCheck();
+            assertTrue("performSpellCheck() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> { }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#performSpellCheck()} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testPerformSpellCheckAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean performSpellCheck() {
+                methodCallVerifier.onMethodCalled(args -> { });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callPerformSpellCheck();
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#performSpellCheck() still returns true even after "
+                    + "unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#performSpellCheck() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Verify that the default implementation of {@link InputConnection#performSpellCheck()}
+     * returns {@code true} without any crash even when the target app does not override it.
+     */
+    @Test
+    public void testPerformSpellCheckDefaultMethod() throws Exception {
+        testMinimallyImplementedInputConnection((MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callPerformSpellCheck();
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            assertTrue("IC#performSpellCheck() still returns true even when the target "
+                    + "application does not implement it.", result.getReturnBooleanValue());
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#performPrivateCommand(String, Bundle)} works as expected.
+     */
+    @Test
+    public void testPerformPrivateCommand() throws Exception {
+        final String expectedAction = "myAction";
+        final Bundle expectedData = new Bundle();
+        final String expectedDataKey = "testKey";
+        final int expectedDataValue = 42;
+        expectedData.putInt(expectedDataKey, expectedDataValue);
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean performPrivateCommand(String action, Bundle data) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putString("action", action);
+                    args.putBundle("data", data);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command =
+                    session.callPerformPrivateCommand(expectedAction, expectedData);
+            assertTrue("performPrivateCommand() always returns true unless RemoteException is "
+                    + "thrown", expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                final String actualAction = args.getString("action");
+                final Bundle actualData = args.getBundle("data");
+                assertEquals(expectedAction, actualAction);
+                assertNotNull(actualData);
+                assertEquals(expectedData.get(expectedDataKey), actualData.getInt(expectedDataKey));
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#performPrivateCommand(String, Bundle)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testPerformPrivateCommandAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean performPrivateCommand(String action, Bundle data) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putString("action", action);
+                    args.putBundle("data", data);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callPerformPrivateCommand("myAction", null);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#performPrivateCommand() still returns true even after "
+                    + "unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#performPrivateCommand() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getHandler()} is ignored as expected.
+     */
+    @Test
+    public void testGetHandler() throws Exception {
+        final Handler returnedResult = null;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public Handler getHandler() {
+                methodCallVerifier.onMethodCalled(args -> { });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // The system internally calls "getHandler". So reset the verifier before our calling
+            // "callGetHandler".
+            methodCallVerifier.reset();
+            final ImeCommand command = session.callGetHandler();
+            assertTrue("getHandler() always returns null",
+                    expectCommand(stream, command, TIMEOUT).isNullReturnValue());
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled("IC#getHandler() must be ignored.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#getHandler()} is ignored as expected even after
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testGetHandlerAfterUnbindInput() throws Exception {
+        final Handler returnedResult = null;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public Handler getHandler() {
+                methodCallVerifier.onMethodCalled(args -> { });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // The system internally calls "getHandler". So reset the verifier before our calling
+            // "callGetHandler".
+            methodCallVerifier.reset();
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callGetHandler();
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            assertTrue("getHandler() always returns null", result.isNullReturnValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "IC#getHandler() must be ignored even after unbindInput().",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Verify that applications that do not implement {@link InputConnection#getHandler()} will not
+     * crash.  This can happen if the app was built before {@link android.os.Build.VERSION_CODES#N}.
+     */
+    @Test
+    public void testGetHandlerWithMethodMissing() throws Exception {
+        testMinimallyImplementedInputConnection((MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callGetHandler();
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            assertTrue("IC#getHandler() still returns null even when the target app does not"
+                    + " implement it.", result.isNullReturnValue());
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#closeConnection()} is ignored as expected.
+     */
+    @Test
+    public void testCloseConnection() throws Exception {
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public void closeConnection() {
+                methodCallVerifier.onMethodCalled(args -> { });
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callCloseConnection();
+            expectCommand(stream, command, TIMEOUT);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled("IC#getHandler() must be ignored.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#closeConnection()} is ignored as expected even after
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testCloseConnectionAfterUnbindInput() throws Exception {
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+        final CountDownLatch latch = new CountDownLatch(1);
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public void closeConnection() {
+                methodCallVerifier.onMethodCalled(args -> { });
+                latch.countDown();
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // The system internally calls "closeConnection". So wait for it to happen then reset
+            // the verifier before our calling "closeConnection".
+            assertTrue("closeConnection() must be called by the system.",
+                    latch.await(TIMEOUT, TimeUnit.MILLISECONDS));
+            methodCallVerifier.reset();
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callCloseConnection();
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "IC#closeConnection() must be ignored even after unbindInput().",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Verify that applications that do not implement {@link InputConnection#closeConnection()}
+     * will not crash. This can happen if the app was built before
+     * {@link android.os.Build.VERSION_CODES#N}.
+     */
+    @Test
+    public void testCloseConnectionWithMethodMissing() throws Exception {
+        testMinimallyImplementedInputConnection((MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callCloseConnection();
+            expectCommand(stream, command, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#setImeConsumesInput(boolean)} works as expected.
+     */
+    @Test
+    public void testSetImeConsumesInput() throws Exception {
+        final boolean expectedImeConsumesInput = true;
+        // Intentionally let the app return "false" to confirm that IME still receives "true".
+        final boolean returnedResult = false;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean setImeConsumesInput(boolean imeConsumesInput) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putBoolean("imeConsumesInput", imeConsumesInput);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callSetImeConsumesInput(expectedImeConsumesInput);
+            assertTrue("setImeConsumesInput() always returns true unless RemoteException is thrown",
+                    expectCommand(stream, command, TIMEOUT).getReturnBooleanValue());
+            methodCallVerifier.expectCalledOnce(args -> {
+                final boolean actualImeConsumesInput = args.getBoolean("imeConsumesInput");
+                assertEquals(expectedImeConsumesInput, actualImeConsumesInput);
+            }, TIMEOUT);
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#setImeConsumesInput(boolean)} fails fast once
+     * {@link android.view.inputmethod.InputMethod#unbindInput()} is issued.
+     */
+    @Test
+    public void testSetImeConsumesInputAfterUnbindInput() throws Exception {
+        final boolean returnedResult = true;
+
+        final MethodCallVerifier methodCallVerifier = new MethodCallVerifier();
+
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public boolean setImeConsumesInput(boolean imeConsumesInput) {
+                methodCallVerifier.onMethodCalled(args -> {
+                    args.putBoolean("imeConsumesInput", imeConsumesInput);
+                });
+                return returnedResult;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            // Memorize the current InputConnection.
+            expectCommand(stream, session.memorizeCurrentInputConnection(), TIMEOUT);
+
+            // Let unbindInput happen.
+            triggerUnbindInput();
+            expectEvent(stream, event -> "unbindInput".equals(event.getEventName()), TIMEOUT);
+
+            // Now this API call on the memorized IC should fail fast.
+            final ImeCommand command = session.callSetImeConsumesInput(true);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            // CAVEAT: this behavior is a bit questionable and may change in a future version.
+            assertTrue("Currently IC#setImeConsumesInput() still returns true even after "
+                    + "unbindInput().", result.getReturnBooleanValue());
+            expectElapseTimeLessThan(result, IMMEDIATE_TIMEOUT_NANO);
+
+            // Make sure that the app does not receive the call (for a while).
+            methodCallVerifier.expectNotCalled(
+                    "Once unbindInput() happened, IC#setImeConsumesInput() fails fast.",
+                    EXPECTED_NOT_CALLED_TIMEOUT);
+        });
+    }
+
+    /**
+     * Verify that the default implementation of
+     * {@link InputConnection#setImeConsumesInput(boolean)} returns {@code true} without any crash
+     * even when the target app does not override it.
+     */
+    @Test
+    public void testSetImeConsumesInputDefaultMethod() throws Exception {
+        testMinimallyImplementedInputConnection((MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callSetImeConsumesInput(true);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+            assertTrue("IC#setImeConsumesInput() still returns true even when the target "
+                    + "application does not implement it.", result.getReturnBooleanValue());
+        });
+    }
+
+    /**
+     * Test {@link InputConnection#takeSnapshot()} is ignored as expected.
+     */
+    @Test
+    public void testTakeSnapshot() throws Exception {
+        final TextSnapshot returnedTextSnapshot = new TextSnapshot(
+                new SurroundingText("test", 4, 4, 0), -1, -1, 0);
+        final class Wrapper extends InputConnectionWrapper {
+            private Wrapper(InputConnection target) {
+                super(target, false);
+            }
+
+            @Override
+            public TextSnapshot takeSnapshot() {
+                return returnedTextSnapshot;
+            }
+        }
+
+        testInputConnection(Wrapper::new, (MockImeSession session, ImeEventStream stream) -> {
+            final ImeCommand command = session.callTakeSnapshot();
+            assertTrue("takeSnapshot() always returns null",
+                    expectCommand(stream, command, TIMEOUT).isNullReturnValue());
+        });
+    }
+
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputConnectionHandlerTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputConnectionHandlerTest.java
new file mode 100644
index 0000000..8ec3969
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/InputConnectionHandlerTest.java
@@ -0,0 +1,467 @@
+/*
+ * Copyright (C) 2021 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 android.view.inputmethod.cts;
+
+import static android.view.inputmethod.cts.util.TestUtils.getOnMainSync;
+import static android.view.inputmethod.cts.util.TestUtils.runOnMainSync;
+
+import static com.android.cts.mockime.ImeEventStreamTestUtils.editorMatcher;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectBindInput;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectCommand;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEvent;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Process;
+import android.os.SystemClock;
+import android.platform.test.annotations.LargeTest;
+import android.system.Os;
+import android.text.InputType;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.SurroundingText;
+import android.view.inputmethod.cts.util.EndToEndImeTestBase;
+import android.view.inputmethod.cts.util.HandlerInputConnection;
+import android.view.inputmethod.cts.util.TestActivity;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.cts.mockime.ImeCommand;
+import com.android.cts.mockime.ImeEvent;
+import com.android.cts.mockime.ImeEventStream;
+import com.android.cts.mockime.ImeSettings;
+import com.android.cts.mockime.MockImeSession;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * Tests the thread-affinity in {@link InputConnection} callbacks provided by
+ * {@link InputConnection#getHandler()}.
+ *
+ * <p>TODO: Add more tests.</p>
+ */
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class InputConnectionHandlerTest extends EndToEndImeTestBase {
+    private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(5);
+
+    /**
+     * The value used in android.inputmethodservice.RemoteInputConnection#MAX_WAIT_TIME_MILLIS.
+     *
+     * <p>Although this is not a strictly-enforced timeout for all the Android devices, hopefully
+     * it'd be acceptable to assume that IMEs can receive result within 2 second even on slower
+     * devices.</p>
+     *
+     * <p>TODO: Consider making this as a test API.</p>
+     */
+    private static final long TIMEOUT_IN_REMOTE_INPUT_CONNECTION =
+            TimeUnit.MILLISECONDS.toMillis(2000);
+
+    private static final int TEST_VIEW_HEIGHT = 10;
+
+    private static final String TEST_MARKER_PREFIX =
+            "android.view.inputmethod.cts.InputConnectionHandlerTest";
+
+    private static String getTestMarker() {
+        return TEST_MARKER_PREFIX + "/"  + SystemClock.elapsedRealtimeNanos();
+    }
+
+    private static final class InputConnectionHandlingThread extends HandlerThread
+            implements AutoCloseable {
+
+        private final Handler mHandler;
+
+        InputConnectionHandlingThread() {
+            super("IC-callback");
+            start();
+            mHandler = Handler.createAsync(getLooper());
+        }
+
+        @NonNull
+        Handler getHandler() {
+            return mHandler;
+        }
+
+        @Override
+        public void close() {
+            quitSafely();
+            try {
+                join(TIMEOUT);
+            } catch (InterruptedException e) {
+                fail("Failed to stop the thread: " + e);
+            }
+        }
+    }
+
+    /**
+     * A mostly-minimum implementation of {@link View} that can be used to test custom
+     * implementations of {@link View#onCreateInputConnection(EditorInfo)}.
+     */
+    static class TestEditor extends View {
+        TestEditor(@NonNull Context context) {
+            super(context);
+            setBackgroundColor(Color.YELLOW);
+            setFocusableInTouchMode(true);
+            setFocusable(true);
+            setLayoutParams(new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, TEST_VIEW_HEIGHT));
+        }
+    }
+
+    /**
+     * Test {@link InputConnection#commitText(CharSequence, int)} respects
+     * {@link InputConnection#getHandler()}.
+     */
+    @Test
+    public void testCommitText() throws Exception {
+        try (InputConnectionHandlingThread thread = new InputConnectionHandlingThread();
+             MockImeSession imeSession = MockImeSession.create(
+                     InstrumentationRegistry.getInstrumentation().getContext(),
+                     InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                     new ImeSettings.Builder())) {
+
+            final AtomicInteger callingThreadId = new AtomicInteger(0);
+            final CountDownLatch latch = new CountDownLatch(1);
+
+            final class MyInputConnection extends HandlerInputConnection {
+                MyInputConnection() {
+                    super(thread.getHandler());
+                }
+
+                @Override
+                public boolean commitText(CharSequence text, int newCursorPosition) {
+                    callingThreadId.set(Os.gettid());
+                    latch.countDown();
+                    return super.commitText(text, newCursorPosition);
+                }
+            }
+
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String marker = getTestMarker();
+
+            TestActivity.startSync(activity -> {
+                final LinearLayout layout = new LinearLayout(activity);
+                layout.setOrientation(LinearLayout.VERTICAL);
+
+                // Just to be conservative, we explicitly check MockImeSession#isActive() here when
+                // injecting our custom InputConnection implementation.
+                final TestEditor testEditor = new TestEditor(activity) {
+                    @Override
+                    public boolean onCheckIsTextEditor() {
+                        return imeSession.isActive();
+                    }
+
+                    @Override
+                    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+                        if (imeSession.isActive()) {
+                            outAttrs.inputType = InputType.TYPE_CLASS_TEXT;
+                            outAttrs.privateImeOptions = marker;
+                            return new MyInputConnection();
+                        }
+                        return null;
+                    }
+                };
+
+                testEditor.requestFocus();
+                layout.addView(testEditor);
+                return layout;
+            });
+
+            // Wait until the MockIme gets bound to the TestActivity.
+            expectBindInput(stream, Process.myPid(), TIMEOUT);
+
+            // Wait until "onStartInput" gets called for the EditText.
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+
+            final ImeCommand command = imeSession.callCommitText("", 1);
+            expectCommand(stream, command, TIMEOUT);
+
+            assertTrue("commitText() must be called", latch.await(TIMEOUT, TimeUnit.MILLISECONDS));
+
+            assertEquals("commitText() must happen on the handler thread",
+                    thread.getThreadId(), callingThreadId.get());
+        }
+    }
+
+    /**
+     * Test {@link InputConnection#reportFullscreenMode(boolean)} respects
+     * {@link InputConnection#getHandler()}.
+     */
+    @Test
+    public void testReportFullscreenMode() throws Exception {
+        try (InputConnectionHandlingThread thread = new InputConnectionHandlingThread();
+             MockImeSession imeSession = MockImeSession.create(
+                     InstrumentationRegistry.getInstrumentation().getContext(),
+                     InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                     new ImeSettings.Builder().setFullscreenModePolicy(
+                             ImeSettings.FullscreenModePolicy.FORCE_FULLSCREEN))) {
+
+            final AtomicInteger callingThreadId = new AtomicInteger(0);
+            final CountDownLatch latch = new CountDownLatch(1);
+
+            final class MyInputConnection extends HandlerInputConnection {
+                MyInputConnection() {
+                    super(thread.getHandler());
+                }
+
+                @Override
+                public boolean reportFullscreenMode(boolean enabled) {
+                    callingThreadId.set(Os.gettid());
+                    latch.countDown();
+                    return true;
+                }
+            }
+
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String marker = getTestMarker();
+
+            final AtomicReference<View> testEditorViewRef = new AtomicReference<>();
+            TestActivity.startSync(activity -> {
+                final LinearLayout layout = new LinearLayout(activity);
+                layout.setOrientation(LinearLayout.VERTICAL);
+
+                // Just to be conservative, we explicitly check MockImeSession#isActive() here when
+                // injecting our custom InputConnection implementation.
+                final TestEditor testEditor = new TestEditor(activity) {
+                    @Override
+                    public boolean onCheckIsTextEditor() {
+                        return imeSession.isActive();
+                    }
+
+                    @Override
+                    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+                        if (imeSession.isActive()) {
+                            outAttrs.inputType = InputType.TYPE_CLASS_TEXT;
+                            outAttrs.privateImeOptions = marker;
+                            return new MyInputConnection();
+                        }
+                        return null;
+                    }
+                };
+
+                testEditor.requestFocus();
+                testEditorViewRef.set(testEditor);
+                layout.addView(testEditor);
+                return layout;
+            });
+
+            // Wait until the MockIme gets bound to the TestActivity.
+            expectBindInput(stream, Process.myPid(), TIMEOUT);
+
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+
+            assertFalse("InputMethodManager#isFullscreenMode() must return false",
+                    getOnMainSync(() -> InstrumentationRegistry.getInstrumentation().getContext()
+                            .getSystemService(InputMethodManager.class).isFullscreenMode()));
+
+            // In order to have an IME be shown in the fullscreen mode,
+            // SOFT_INPUT_STATE_ALWAYS_VISIBLE is insufficient.  An explicit API call is necessary.
+            runOnMainSync(() -> {
+                final View editor = testEditorViewRef.get();
+                editor.getContext().getSystemService(InputMethodManager.class)
+                        .showSoftInput(editor, 0);
+            });
+
+            expectEvent(stream, editorMatcher("onStartInputView", marker), TIMEOUT);
+
+            assertTrue("reportFullscreenMode() must be called",
+                    latch.await(TIMEOUT, TimeUnit.MILLISECONDS));
+
+            assertEquals("reportFullscreenMode() must happen on the handler thread",
+                    thread.getThreadId(), callingThreadId.get());
+
+            assertTrue("InputMethodManager#isFullscreenMode() must return true",
+                    getOnMainSync(() -> InstrumentationRegistry.getInstrumentation().getContext()
+                            .getSystemService(InputMethodManager.class).isFullscreenMode()));
+            assertTrue(expectCommand(stream, imeSession.callVerifyExtractViewNotNull(), TIMEOUT)
+                    .getReturnBooleanValue());
+        }
+    }
+
+    /**
+     * A holder of {@link Handler} that is bound to a background {@link Looper} where
+     * {@link Throwable} thrown from tasks running there will be just ignored instead of triggering
+     * process crashes.
+     */
+    private static final class ErrorSwallowingHandlerThread implements AutoCloseable {
+        @NonNull
+        private final Handler mHandler;
+
+        @NonNull
+        Handler getHandler() {
+            return mHandler;
+        }
+
+        @NonNull
+        static ErrorSwallowingHandlerThread create() {
+            final CountDownLatch latch = new CountDownLatch(1);
+            final AtomicReference<Looper> mLooperRef = new AtomicReference<>();
+            new Thread(() -> {
+                Looper.prepare();
+                mLooperRef.set(Looper.myLooper());
+                latch.countDown();
+
+                while (true) {
+                    try {
+                        Looper.loop();
+                        return;
+                    } catch (Throwable ignore) {
+                    }
+                }
+            }).start();
+
+            try {
+                assertTrue(latch.await(TIMEOUT, TimeUnit.MILLISECONDS));
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                fail("Failed to create a Handler thread");
+            }
+
+            final Handler handler = Handler.createAsync(mLooperRef.get());
+            return new ErrorSwallowingHandlerThread(handler);
+        }
+
+        private ErrorSwallowingHandlerThread(@NonNull Handler handler) {
+            mHandler = handler;
+        }
+
+        @Override
+        public void close() {
+            mHandler.getLooper().quitSafely();
+            try {
+                mHandler.getLooper().getThread().join(TIMEOUT);
+            } catch (InterruptedException e) {
+                fail("Failed to terminate the thread");
+            }
+        }
+    }
+
+    /**
+     * Ensures that {@code event}'s elapse time is less than the given threshold.
+     *
+     * @param event {@link ImeEvent} to be tested.
+     * @param elapseThresholdInMilliSecond threshold in milli sec.
+     */
+    private static void expectElapseTimeLessThan(@NonNull ImeEvent event,
+            long elapseThresholdInMilliSecond) {
+        final long elapseTimeInMilli = TimeUnit.NANOSECONDS.toMillis(
+                event.getExitTimestamp() - event.getEnterTimestamp());
+        if (elapseTimeInMilli > elapseThresholdInMilliSecond) {
+            fail(event.getEventName() + " took " + elapseTimeInMilli + " msec,"
+                    + " which must be less than " + elapseThresholdInMilliSecond + " msec.");
+        }
+    }
+
+    /**
+     * Test {@link InputConnection#getSurroundingText(int, int, int)} that throws an exception.
+     */
+    @Test
+    public void testExceptionFromGetSurroundingText() throws Exception {
+        try (ErrorSwallowingHandlerThread handlerThread = ErrorSwallowingHandlerThread.create();
+             MockImeSession imeSession = MockImeSession.create(
+                     InstrumentationRegistry.getInstrumentation().getContext(),
+                     InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                     new ImeSettings.Builder())) {
+
+            final CountDownLatch latch = new CountDownLatch(1);
+
+            final class MyInputConnection extends HandlerInputConnection {
+                MyInputConnection() {
+                    super(handlerThread.getHandler());
+                }
+
+                @Override
+                public SurroundingText getSurroundingText(int beforeLength, int afterLength,
+                        int flags) {
+                    latch.countDown();
+                    throw new RuntimeException("Exception!");
+                }
+
+            }
+
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String marker = getTestMarker();
+
+            TestActivity.startSync(activity -> {
+                final LinearLayout layout = new LinearLayout(activity);
+                layout.setOrientation(LinearLayout.VERTICAL);
+
+                // Just to be conservative, we explicitly check MockImeSession#isActive() here when
+                // injecting our custom InputConnection implementation.
+                final TestEditor testEditor = new TestEditor(activity) {
+                    @Override
+                    public boolean onCheckIsTextEditor() {
+                        return imeSession.isActive();
+                    }
+
+                    @Override
+                    public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+                        if (imeSession.isActive()) {
+                            outAttrs.inputType = InputType.TYPE_CLASS_TEXT;
+                            outAttrs.privateImeOptions = marker;
+                            return new MyInputConnection();
+                        }
+                        return null;
+                    }
+                };
+
+                testEditor.requestFocus();
+                layout.addView(testEditor);
+                return layout;
+            });
+
+            // Wait until the MockIme gets bound to the TestActivity.
+            expectBindInput(stream, Process.myPid(), TIMEOUT);
+
+            // Wait until "onStartInput" gets called for the EditText.
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+
+            final ImeCommand command = imeSession.callGetSurroundingText(1, 1, 0);
+            final ImeEvent result = expectCommand(stream, command, TIMEOUT);
+
+            assertTrue("IC#getSurroundingText() must be called",
+                    latch.await(TIMEOUT, TimeUnit.MILLISECONDS));
+
+            assertTrue("Exceptions from IC#getSurroundingText() must be interpreted as null.",
+                    result.isNullReturnValue());
+            expectElapseTimeLessThan(result, TIMEOUT_IN_REMOTE_INPUT_CONNECTION);
+        }
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodManagerTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodManagerTest.java
index 5eaa32e..9b1c836 100644
--- a/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodManagerTest.java
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodManagerTest.java
@@ -207,7 +207,7 @@
                 PackageManager.FEATURE_INPUT_METHODS));
         enableImes(MOCK_IME_ID, HIDDEN_FROM_PICKER_IME_ID);
 
-        final TestActivity testActivity = TestActivity.startSync(activity -> {
+        TestActivity.startSync(activity -> {
             final View view = new View(activity);
             view.setLayoutParams(new LayoutParams(
                     LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
@@ -222,9 +222,8 @@
 
         // Test InputMethodManager#showInputMethodPicker() works as expected.
         mImManager.showInputMethodPicker();
-        waitOnMainUntil(() -> mImManager.isInputMethodPickerShown()
-                        && !testActivity.hasWindowFocus(), TIMEOUT,
-                "InputMethod picker should be shown and test activity lost focus");
+        waitOnMainUntil(() -> mImManager.isInputMethodPickerShown(), TIMEOUT,
+                "InputMethod picker should be shown");
         final UiDevice uiDevice =
                 UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
         assertThat(uiDevice.wait(Until.hasObject(By.text(MOCK_IME_LABEL)), TIMEOUT)).isTrue();
@@ -235,8 +234,6 @@
                 new Intent(ACTION_CLOSE_SYSTEM_DIALOGS).setFlags(FLAG_RECEIVER_FOREGROUND));
         waitOnMainUntil(() -> !mImManager.isInputMethodPickerShown(), TIMEOUT,
                 "InputMethod picker should be closed");
-        waitOnMainUntil(() -> testActivity.hasWindowFocus(), TIMEOUT,
-                "Activity should be focused after picker dismissed");
     }
 
     private void enableImes(String... ids) {
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodPickerTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodPickerTest.java
new file mode 100644
index 0000000..3064c30
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodPickerTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2021 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 android.view.inputmethod.cts;
+
+import static android.content.Intent.ACTION_CLOSE_SYSTEM_DIALOGS;
+import static android.content.Intent.FLAG_RECEIVER_FOREGROUND;
+import static android.content.pm.PackageManager.FEATURE_INPUT_METHODS;
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.inputmethod.cts.util.TestUtils.waitOnMainUntil;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.content.Intent;
+import android.platform.test.annotations.AppModeFull;
+import android.platform.test.annotations.SecurityTest;
+import android.server.wm.ActivityManagerTestBase;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.cts.util.TestActivity;
+import android.widget.LinearLayout;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.TimeUnit;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class InputMethodPickerTest extends ActivityManagerTestBase {
+
+    private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(5);
+
+    private InputMethodManager mImManager;
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        mImManager = mContext.getSystemService(InputMethodManager.class);
+
+        closeSystemDialogsAndWait();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        closeSystemDialogsAndWait();
+    }
+
+    @AppModeFull(reason = "Instant apps cannot rely on ACTION_CLOSE_SYSTEM_DIALOGS")
+    @SecurityTest(minPatchLevel = "unknown")
+    @Test
+    public void testInputMethodPicker_hidesUntrustedOverlays() throws Exception {
+        assumeTrue(mContext.getPackageManager().hasSystemFeature(FEATURE_INPUT_METHODS));
+        TestActivity testActivity = TestActivity.startSync(activity -> {
+            final View view = new View(activity);
+            view.setLayoutParams(new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT));
+            return view;
+        });
+
+        // Test setup: Show overlay and verify that it worked.
+        getInstrumentation().runOnMainSync(() -> {
+            testActivity.showOverlayWindow();
+        });
+        mWmState.waitAndAssertWindowSurfaceShown(TestActivity.OVERLAY_WINDOW_NAME, true);
+
+        // Test setup: Show the IME picker and verify that it worked.
+        getInstrumentation().runOnMainSync(() -> {
+            mImManager.showInputMethodPicker();
+        });
+        waitOnMainUntil(() -> mImManager.isInputMethodPickerShown(), TIMEOUT,
+                "Test setup failed: InputMethod picker should be shown");
+
+        // Actual Test: Make sure the IME picker hides app overlays.
+        mWmState.waitAndAssertWindowSurfaceShown(TestActivity.OVERLAY_WINDOW_NAME, false);
+    }
+
+    private void closeSystemDialogsAndWait() throws Exception {
+        mContext.sendBroadcast(
+                new Intent(ACTION_CLOSE_SYSTEM_DIALOGS).setFlags(FLAG_RECEIVER_FOREGROUND));
+        waitOnMainUntil(() -> !mImManager.isInputMethodPickerShown(), TIMEOUT,
+                "Test assertion failed: InputMethod picker should be closed but isn't");
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodServiceTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodServiceTest.java
index 6eeb1da..8e18ec1 100644
--- a/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodServiceTest.java
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodServiceTest.java
@@ -18,6 +18,8 @@
 
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
 import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
+import static android.view.Display.DEFAULT_DISPLAY;
+import static android.view.WindowManager.DISPLAY_IME_POLICY_LOCAL;
 import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN;
 import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE;
 import static android.view.inputmethod.cts.util.InputMethodVisibilityVerifier.expectImeInvisible;
@@ -31,6 +33,7 @@
 import static com.android.cts.mockime.ImeEventStreamTestUtils.expectCommand;
 import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEvent;
 import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEventWithKeyValue;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectNoImeCrash;
 import static com.android.cts.mockime.ImeEventStreamTestUtils.notExpectEvent;
 import static com.android.cts.mockime.ImeEventStreamTestUtils.verificationMatcher;
 
@@ -43,6 +46,7 @@
 import android.app.Instrumentation;
 import android.content.Intent;
 import android.graphics.Matrix;
+import android.graphics.RectF;
 import android.inputmethodservice.InputMethodService;
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -52,11 +56,14 @@
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.inputmethod.CursorAnchorInfo;
+import android.view.inputmethod.EditorBoundsInfo;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputConnectionWrapper;
+import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.view.inputmethod.cts.util.EndToEndImeTestBase;
+import android.view.inputmethod.cts.util.SimulatedVirtualDisplaySession;
 import android.view.inputmethod.cts.util.TestActivity;
 import android.view.inputmethod.cts.util.TestActivity2;
 import android.view.inputmethod.cts.util.TestUtils;
@@ -66,6 +73,7 @@
 import android.widget.EditText;
 import android.widget.LinearLayout;
 
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.MediumTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
@@ -84,6 +92,7 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -98,6 +107,8 @@
 public class InputMethodServiceTest extends EndToEndImeTestBase {
     private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(20);
     private static final long EXPECTED_TIMEOUT = TimeUnit.SECONDS.toMillis(2);
+    private static final long ACTIVITY_LAUNCH_INTERVAL = 500;  // msec
+
 
     private static final String ERASE_FONT_SCALE_CMD = "settings delete system font_scale";
     // 1.2 is an arbitrary value.
@@ -126,11 +137,15 @@
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
     }
 
-    private TestActivity createTestActivity(final int windowFlags) {
+    private TestActivity createTestActivity(int windowFlags) {
         return TestActivity.startSync(activity -> createLayout(windowFlags, activity));
     }
 
-    private TestActivity createTestActivity2(final int windowFlags) {
+    private TestActivity createTestActivity(int windowFlags, int displayId) throws Exception {
+        return TestActivity.startSync(displayId, activity -> createLayout(windowFlags, activity));
+    }
+
+    private TestActivity createTestActivity2(int windowFlags) {
         return TestActivity2.startSync(activity -> createLayout(windowFlags, activity));
     }
 
@@ -264,6 +279,7 @@
         }
     }
 
+    @FlakyTest(bugId = 210680326)
     @Test
     public void testHandlesConfigChanges() throws Exception {
         try (MockImeSession imeSession = MockImeSession.create(
@@ -440,6 +456,7 @@
 
             final AtomicReference<EditText> editTextRef = new AtomicReference<>();
             final AtomicInteger requestCursorUpdatesCallCount = new AtomicInteger();
+            final AtomicInteger requestCursorUpdatesWithFilterCallCount = new AtomicInteger();
             TestActivity.startSync(activity -> {
                 final LinearLayout layout = new LinearLayout(activity);
                 layout.setOrientation(LinearLayout.VERTICAL);
@@ -451,12 +468,20 @@
                         return new InputConnectionWrapper(original, false) {
                             @Override
                             public boolean requestCursorUpdates(int cursorUpdateMode) {
-                                if (cursorUpdateMode == InputConnection.CURSOR_UPDATE_IMMEDIATE) {
+                                if ((cursorUpdateMode & InputConnection.CURSOR_UPDATE_IMMEDIATE)
+                                        != 0) {
                                     requestCursorUpdatesCallCount.incrementAndGet();
                                     return true;
                                 }
                                 return false;
                             }
+
+                            @Override
+                            public boolean requestCursorUpdates(
+                                    int cursorUpdateMode, int cursorUpdateFilter) {
+                                requestCursorUpdatesWithFilterCallCount.incrementAndGet();
+                                return requestCursorUpdates(cursorUpdateMode | cursorUpdateFilter);
+                            }
                         };
                     }
                 };
@@ -493,6 +518,67 @@
                     TIMEOUT).getArguments().getParcelable("cursorAnchorInfo");
             assertNotNull(receivedCursorAnchorInfo);
             assertEquals(receivedCursorAnchorInfo, originalCursorAnchorInfo);
+
+            requestCursorUpdatesCallCount.set(0);
+            // Request Cursor updates with Filter
+            // Make sure that InputConnection#requestCursorUpdates() returns true with data filter.
+            assertTrue(expectCommand(stream,
+                    imeSession.callRequestCursorUpdates(
+                            InputConnection.CURSOR_UPDATE_IMMEDIATE
+                            | InputConnection.CURSOR_UPDATE_FILTER_EDITOR_BOUNDS
+                            | InputConnection.CURSOR_UPDATE_FILTER_CHARACTER_BOUNDS
+                            | InputConnection.CURSOR_UPDATE_FILTER_INSERTION_MARKER),
+                    TIMEOUT).getReturnBooleanValue());
+
+            // Also make sure that requestCursorUpdates() actually gets called only once.
+            assertEquals(1, requestCursorUpdatesCallCount.get());
+
+            EditorBoundsInfo.Builder builder = new EditorBoundsInfo.Builder();
+            builder.setEditorBounds(new RectF(0f, 1f, 2f, 3f));
+            final CursorAnchorInfo originalCursorAnchorInfo1 = new CursorAnchorInfo.Builder()
+                    .setMatrix(new Matrix())
+                    .setEditorBoundsInfo(builder.build())
+                    .build();
+
+            runOnMainSync(() -> editText.getContext().getSystemService(InputMethodManager.class)
+                    .updateCursorAnchorInfo(editText, originalCursorAnchorInfo1));
+
+            final CursorAnchorInfo receivedCursorAnchorInfo1 = expectEvent(stream,
+                    event -> "onUpdateCursorAnchorInfo".equals(event.getEventName()),
+                    TIMEOUT).getArguments().getParcelable("cursorAnchorInfo");
+            assertNotNull(receivedCursorAnchorInfo1);
+            assertEquals(receivedCursorAnchorInfo1, originalCursorAnchorInfo1);
+
+            requestCursorUpdatesCallCount.set(0);
+            requestCursorUpdatesWithFilterCallCount.set(0);
+            // Request Cursor updates with Mode and Filter
+            // Make sure that InputConnection#requestCursorUpdates() returns true with mode and
+            // data filter.
+            builder = new EditorBoundsInfo.Builder();
+            builder.setEditorBounds(new RectF(1f, 1f, 2f, 3f));
+            final CursorAnchorInfo originalCursorAnchorInfo2 = new CursorAnchorInfo.Builder()
+                    .setMatrix(new Matrix())
+                    .setEditorBoundsInfo(builder.build())
+                    .build();
+            assertTrue(expectCommand(stream,
+                    imeSession.callRequestCursorUpdates(
+                            InputConnection.CURSOR_UPDATE_IMMEDIATE,
+                                    InputConnection.CURSOR_UPDATE_FILTER_EDITOR_BOUNDS
+                                    | InputConnection.CURSOR_UPDATE_FILTER_CHARACTER_BOUNDS
+                                    | InputConnection.CURSOR_UPDATE_FILTER_INSERTION_MARKER),
+                    TIMEOUT).getReturnBooleanValue());
+
+            // Make sure that requestCursorUpdates() actually gets called only once.
+            assertEquals(1, requestCursorUpdatesCallCount.get());
+            assertEquals(1, requestCursorUpdatesWithFilterCallCount.get());
+            runOnMainSync(() -> editText.getContext().getSystemService(InputMethodManager.class)
+                    .updateCursorAnchorInfo(editText, originalCursorAnchorInfo2));
+
+            final CursorAnchorInfo receivedCursorAnchorInfo2 = expectEvent(stream,
+                    event -> "onUpdateCursorAnchorInfo".equals(event.getEventName()),
+                    TIMEOUT).getArguments().getParcelable("cursorAnchorInfo");
+            assertNotNull(receivedCursorAnchorInfo2);
+            assertEquals(receivedCursorAnchorInfo2, originalCursorAnchorInfo2);
         }
     }
 
@@ -502,6 +588,7 @@
         try (MockImeSession imeSession = MockImeSession.create(
                 mInstrumentation.getContext(), mInstrumentation.getUiAutomation(),
                 new ImeSettings.Builder().setVerifyUiContextApisInOnCreate(true))) {
+            ensureImeRunning();
             final ImeEventStream stream = imeSession.openEventStream();
 
             // Verify if getDisplay doesn't throw exception before InputMethodService's
@@ -699,6 +786,7 @@
         try (MockImeSession imeSession = MockImeSession.create(
                 mInstrumentation.getContext(), mInstrumentation.getUiAutomation(),
                 new ImeSettings.Builder().setVerifyUiContextApisInOnCreate(true))) {
+            ensureImeRunning();
             final ImeEventStream stream = imeSession.openEventStream();
 
             // Verify if InputMethodService#isUiContext returns true in #onCreate
@@ -730,6 +818,52 @@
         }
     }
 
+    @Test
+    public void testNoExceptionWhenSwitchingDisplaysWithImeReCreate() throws Exception {
+        try (SimulatedVirtualDisplaySession displaySession = SimulatedVirtualDisplaySession.create(
+                mInstrumentation.getContext(), 800, 600, 240, DISPLAY_IME_POLICY_LOCAL);
+                     MockImeSession imeSession = MockImeSession.create(
+                             mInstrumentation.getContext(), mInstrumentation.getUiAutomation(),
+                             new ImeSettings.Builder())) {
+            // Launch activity repeatedly with re-create / showing IME on different displays
+            for (int i = 0; i < 10; i++) {
+                int displayId = (i % 2 == 0) ? displaySession.getDisplayId() : DEFAULT_DISPLAY;
+                createTestActivity(SOFT_INPUT_STATE_ALWAYS_VISIBLE, displayId);
+                SystemClock.sleep(ACTIVITY_LAUNCH_INTERVAL);
+            }
+            // Verify no crash and onCreate / onDestroy keeps paired from MockIme event stream
+            expectNoImeCrash(imeSession, TIMEOUT);
+        }
+    }
+
+    @Test
+    public void testShowSoftInput_whenAllImesDisabled() {
+        final InputMethodManager inputManager =
+                mInstrumentation.getTargetContext().getSystemService(InputMethodManager.class);
+        assertNotNull(inputManager);
+        final List<InputMethodInfo> enabledImes = inputManager.getEnabledInputMethodList();
+
+        try {
+            // disable all IMEs
+            for (InputMethodInfo ime : enabledImes) {
+                SystemUtil.runShellCommand("ime disable " + ime.getId());
+            }
+
+            // start a test activity and expect it not to crash
+            createTestActivity(SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        } finally {
+            // restore all previous IMEs
+            SystemUtil.runShellCommand("ime reset");
+        }
+    }
+
+    /** Explicitly start-up the IME process if it would have been prevented. */
+    protected void ensureImeRunning() {
+        if (isPreventImeStartup()) {
+            createTestActivity(SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+        }
+    }
+
     /** Test case for committing and setting composing region after cursor. */
     private static UpdateSelectionTest getCommitAndSetComposingRegionTest(
             long timeout, String makerPrefix) throws Exception {
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodStartInputLifecycleTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodStartInputLifecycleTest.java
index 4eb6573..ae376e3 100644
--- a/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodStartInputLifecycleTest.java
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/InputMethodStartInputLifecycleTest.java
@@ -27,6 +27,8 @@
 import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEvent;
 import static com.android.cts.mockime.ImeEventStreamTestUtils.notExpectEvent;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
@@ -34,16 +36,26 @@
 import android.app.Instrumentation;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.graphics.Color;
 import android.inputmethodservice.InputMethodService;
 import android.os.IBinder;
 import android.os.Process;
 import android.os.SystemClock;
 import android.platform.test.annotations.AppModeFull;
+import android.text.Editable;
+import android.text.InputType;
+import android.text.Selection;
 import android.text.TextUtils;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.BaseInputConnection;
 import android.view.inputmethod.EditorInfo;
+import android.view.inputmethod.InputConnection;
 import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.TextSnapshot;
 import android.view.inputmethod.cts.util.DisableScreenDozeRule;
 import android.view.inputmethod.cts.util.EndToEndImeTestBase;
+import android.view.inputmethod.cts.util.MockTestActivityUtil;
 import android.view.inputmethod.cts.util.RequireImeCompatFlagRule;
 import android.view.inputmethod.cts.util.TestActivity;
 import android.view.inputmethod.cts.util.TestUtils;
@@ -52,6 +64,7 @@
 import android.widget.EditText;
 import android.widget.LinearLayout;
 
+import androidx.annotation.NonNull;
 import androidx.test.filters.MediumTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
@@ -67,9 +80,11 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiFunction;
 import java.util.function.Predicate;
 
 @MediumTest
@@ -84,6 +99,14 @@
             FINISH_INPUT_NO_FALLBACK_CONNECTION, true);
 
     private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(5);
+    private static final long NOT_EXPECT_TIMEOUT = TimeUnit.SECONDS.toMillis(1);
+
+    private static final String TEST_MARKER_PREFIX =
+            "android.view.inputmethod.cts.FocusHandlingTest";
+
+    private static String getTestMarker() {
+        return TEST_MARKER_PREFIX + "/"  + SystemClock.elapsedRealtimeNanos();
+    }
 
     @AppModeFull(reason = "KeyguardManager is not accessible from instant apps")
     @Test
@@ -99,8 +122,7 @@
                 context, instrumentation.getUiAutomation(), new ImeSettings.Builder())) {
             final ImeEventStream stream = imeSession.openEventStream();
 
-            final String marker = InputMethodManagerTest.class.getName() + "/"
-                    + SystemClock.elapsedRealtimeNanos();
+            final String marker = getTestMarker();
             final AtomicInteger screenStateCallbackRef = new AtomicInteger(-1);
             TestActivity.startSync(activity -> {
                 final LinearLayout layout = new LinearLayout(activity);
@@ -187,8 +209,7 @@
                 new ImeSettings.Builder())) {
             final ImeEventStream stream = imeSession.openEventStream();
 
-            final String marker = InputMethodStartInputLifecycleTest.class.getName() + "/"
-                    + SystemClock.elapsedRealtimeNanos();
+            final String marker = getTestMarker();
             final EditText editText = launchTestActivity(marker);
             TestUtils.runOnMainSync(() -> editText.requestFocus());
 
@@ -243,6 +264,301 @@
         return editTextRef.get();
     }
 
+    /**
+     * A mostly-minimum implementation of {@link View} that can be used to test custom
+     * implementations of {@link View#onCreateInputConnection(EditorInfo)}.
+     */
+    static class TestEditor extends View {
+        TestEditor(@NonNull Context context) {
+            super(context);
+            setBackgroundColor(Color.YELLOW);
+            setFocusableInTouchMode(true);
+            setFocusable(true);
+            setLayoutParams(new ViewGroup.LayoutParams(
+                    ViewGroup.LayoutParams.MATCH_PARENT, 10 /* height */));
+        }
+    }
+
+    private abstract static class TestInputConnection extends BaseInputConnection {
+        @NonNull
+        private final Editable mEditable;
+
+        TestInputConnection(@NonNull View view, @NonNull Editable editable) {
+            super(view, true /* fullEditor */);
+            mEditable = editable;
+        }
+
+        @NonNull
+        @Override
+        public final Editable getEditable() {
+            return mEditable;
+        }
+    }
+
+    /**
+     * Regression test for Bug 213350732.
+     *
+     * <p>Make sure that calling {@link InputMethodManager#invalidateInput(View)} before
+     * {@link android.view.inputmethod.InputMethodSession} is delivered to the IME client does not
+     * result in {@link NullPointerException}.</p>
+     */
+    @Test
+    public void testInvalidateInputBeforeInputMethodSessionBecomesAvailable() throws Exception {
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        final boolean instant =
+                instrumentation.getTargetContext().getPackageManager().isInstantApp();
+        final String marker1 = getTestMarker();
+        try (AutoCloseable closeable = MockTestActivityUtil.launchSync(instant,
+                TIMEOUT, Map.of(MockTestActivityUtil.EXTRA_KEY_PRIVATE_IME_OPTIONS, marker1))) {
+
+            try (MockImeSession imeSession = MockImeSession.create(
+                    instrumentation.getContext(),
+                    instrumentation.getUiAutomation(),
+                    new ImeSettings.Builder())) {
+                final ImeEventStream stream = imeSession.openEventStream();
+
+                expectEvent(stream, editorMatcher("onStartInput", marker1), TIMEOUT);
+
+                expectCommand(stream, imeSession.suspendCreateSession(), TIMEOUT);
+
+                final String marker2 = getTestMarker();
+                final EditText editText = launchTestActivity(marker2);
+                TestUtils.runOnMainSync(() -> editText.getContext().getSystemService(
+                        InputMethodManager.class).invalidateInput(editText));
+
+                expectCommand(stream, imeSession.resumeCreateSession(), TIMEOUT);
+            }
+        }
+    }
+
+    @Test
+    public void testInvalidateInput() throws Exception {
+        // If IC#takeSnapshot() returns true, it should work, even if IC#{begin,end}BatchEdit()
+        // always return false.
+        expectNativeInvalidateInput((view, editable) -> new TestInputConnection(view, editable) {
+            @Override
+            public boolean beginBatchEdit() {
+                return false;
+            }
+            @Override
+            public boolean endBatchEdit() {
+                return false;
+            }
+        });
+
+        // Of course IMM#invalidateInput() should just work for ICs that support
+        // {begin,end}BatchEdit().
+        expectNativeInvalidateInput((view, editable) -> new TestInputConnection(view, editable) {
+            private int mBatchEditCount = 0;
+            @Override
+            public boolean beginBatchEdit() {
+                ++mBatchEditCount;
+                return true;
+            }
+            @Override
+            public boolean endBatchEdit() {
+                if (mBatchEditCount <= 0) {
+                    return false;
+                }
+                --mBatchEditCount;
+                return mBatchEditCount > 0;
+            }
+        });
+
+        // If IC#takeSnapshot() returns false, then fall back to IMM#restartInput()
+        expectFallbackInvalidateInput((view, editable) -> new TestInputConnection(view, editable) {
+            @Override
+            public boolean beginBatchEdit() {
+                return false;
+            }
+            @Override
+            public boolean endBatchEdit() {
+                return false;
+            }
+            @Override
+            public TextSnapshot takeSnapshot() {
+                return null;
+            }
+        });
+
+        // Bug 209958658 should not prevent the system from using the native invalidateInput().
+        expectNativeInvalidateInput((view, editable) -> new TestInputConnection(view, editable) {
+            private int mBatchEditCount = 0;
+
+            @Override
+            public boolean beginBatchEdit() {
+                ++mBatchEditCount;
+                return true;
+            }
+            @Override
+            public boolean endBatchEdit() {
+                if (mBatchEditCount <= 0) {
+                    return false;
+                }
+                --mBatchEditCount;
+                // This violates the spec. See Bug 209958658 for instance.
+                return true;
+            }
+        });
+
+        // Even if IC#endBatchEdit() never returns false, the system should be able to fall back
+        // to IMM#restartInput().  This is a regression test for Bug 208941904.
+        expectFallbackInvalidateInput((view, editable) -> new TestInputConnection(view, editable) {
+            @Override
+            public boolean beginBatchEdit() {
+                return true;
+            }
+            @Override
+            public boolean endBatchEdit() {
+                return true;
+            }
+        });
+    }
+
+    private void expectNativeInvalidateInput(
+            BiFunction<View, Editable, InputConnection> inputConnectionProvider) throws Exception {
+        testInvalidateInputMain(true, inputConnectionProvider);
+    }
+
+    private void expectFallbackInvalidateInput(
+            BiFunction<View, Editable, InputConnection> inputConnectionProvider) throws Exception {
+        testInvalidateInputMain(false, inputConnectionProvider);
+    }
+
+    private void testInvalidateInputMain(boolean expectNativeInvalidateInput,
+            BiFunction<View, Editable, InputConnection> inputConnectionProvider) throws Exception {
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        try (MockImeSession imeSession = MockImeSession.create(
+                instrumentation.getContext(),
+                instrumentation.getUiAutomation(),
+                new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String marker = getTestMarker();
+            final int initialSelStart = 3;
+            final int initialSelEnd = 7;
+            final int initialCapsMode = TextUtils.CAP_MODE_SENTENCES;
+
+            final AtomicInteger onCreateConnectionCount = new AtomicInteger(0);
+            class MyTestEditor extends TestEditor {
+                final Editable mEditable;
+
+                MyTestEditor(Context context, @NonNull Editable editable) {
+                    super(context);
+                    mEditable = editable;
+                }
+
+                @Override
+                public boolean onCheckIsTextEditor() {
+                    return true;
+                }
+
+                @Override
+                public InputConnection onCreateInputConnection(EditorInfo outAttrs) {
+                    onCreateConnectionCount.incrementAndGet();
+                    outAttrs.inputType =
+                            InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES;
+                    outAttrs.initialSelStart = Selection.getSelectionStart(mEditable);
+                    outAttrs.initialSelEnd = Selection.getSelectionEnd(mEditable);
+                    outAttrs.initialCapsMode = initialCapsMode;
+                    outAttrs.privateImeOptions = marker;
+                    outAttrs.setInitialSurroundingText(mEditable);
+                    return inputConnectionProvider.apply(this, mEditable);
+                }
+            }
+
+            final AtomicReference<MyTestEditor> myEditorRef = new AtomicReference<>();
+            TestActivity.startSync(activity -> {
+                final LinearLayout layout = new LinearLayout(activity);
+                layout.setOrientation(LinearLayout.VERTICAL);
+
+                final Editable editable =
+                        Editable.Factory.getInstance().newEditable("0123456789");
+                Selection.setSelection(editable, initialSelStart, initialSelEnd);
+
+                final MyTestEditor editor = new MyTestEditor(activity, editable);
+                editor.requestFocus();
+                myEditorRef.set(editor);
+
+                layout.addView(editor);
+                return layout;
+            });
+            final MyTestEditor myEditor = myEditorRef.get();
+
+            // Wait until the MockIme gets bound to the TestActivity.
+            expectBindInput(stream, Process.myPid(), TIMEOUT);
+
+            {
+                final ImeEvent startInputEvent =
+                        expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+                final EditorInfo editorInfo =
+                        startInputEvent.getArguments().getParcelable("editorInfo");
+                assertThat(editorInfo).isNotNull();
+                assertThat(editorInfo.initialSelStart).isEqualTo(initialSelStart);
+                assertThat(editorInfo.initialSelEnd).isEqualTo(initialSelEnd);
+                assertThat(editorInfo.getInitialSelectedText(0).toString()).isEqualTo("3456");
+            }
+
+            stream.skipAll();
+            final ImeEventStream forkedStream = stream.copy();
+
+            final int prevOnCreateInputConnectionCount = onCreateConnectionCount.get();
+
+            final int newSelStart = 1;
+            final int newSelEnd = 3;
+            TestUtils.runOnMainSync(() -> {
+                Selection.setSelection(myEditor.mEditable, newSelStart, newSelEnd);
+                final InputMethodManager imm = myEditor.getContext().getSystemService(
+                        InputMethodManager.class);
+                imm.invalidateInput(myEditor);
+            });
+
+            // Verify that InputMethodService#onStartInput() is triggered as if IMM#restartInput()
+            // was called.
+            {
+                final ImeEvent startInputEvent =
+                        expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+                final boolean restarting = startInputEvent.getArguments().getBoolean("restarting");
+                assertThat(restarting).isTrue();
+                final EditorInfo editorInfo =
+                        startInputEvent.getArguments().getParcelable("editorInfo");
+                assertThat(editorInfo).isNotNull();
+                assertThat(editorInfo.initialSelStart).isEqualTo(newSelStart);
+                assertThat(editorInfo.initialSelEnd).isEqualTo(newSelEnd);
+                assertThat(editorInfo.getInitialSelectedText(0).toString()).isEqualTo("12");
+            }
+
+            if (expectNativeInvalidateInput) {
+                // If InputMethodManager#interruptInput() is expected to be natively supported,
+                // additional View#onCreateInputConnection() must not happen.
+                assertThat(onCreateConnectionCount.get()).isEqualTo(
+                        prevOnCreateInputConnectionCount);
+            } else {
+                // InputMethodManager#interruptInput() is expected to be falling back into
+                // InputMethodManager#restartInput(), which triggers View#onCreateInputConnection()
+                // as a consequence.
+                assertThat(onCreateConnectionCount.get()).isGreaterThan(
+                        prevOnCreateInputConnectionCount);
+            }
+
+            // For historical reasons, InputMethodService#onFinishInput() will not be triggered when
+            // restarting an input connection.
+            assertThat(forkedStream.findFirst(onFinishInputMatcher()).isPresent()).isFalse();
+
+            // Make sure that InputMethodManager#updateSelection() will be ignored when there is
+            // no change from the last call of InputMethodManager#interruptInput().
+            TestUtils.runOnMainSync(() -> {
+                Selection.setSelection(myEditor.mEditable, newSelStart, newSelEnd);
+                final InputMethodManager imm = myEditor.getContext().getSystemService(
+                        InputMethodManager.class);
+                imm.updateSelection(myEditor, newSelStart, newSelEnd, -1, -1);
+            });
+
+            notExpectEvent(stream, event -> "onUpdateSelection".equals(event.getEventName()),
+                    NOT_EXPECT_TIMEOUT);
+        }
+    }
+
     private static Predicate<ImeEvent> onFinishInputMatcher() {
         return event -> TextUtils.equals("onFinishInput", event.getEventName());
     }
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/KeyboardVisibilityControlTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/KeyboardVisibilityControlTest.java
index 673c87a..68b7e5c 100644
--- a/tests/inputmethod/src/android/view/inputmethod/cts/KeyboardVisibilityControlTest.java
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/KeyboardVisibilityControlTest.java
@@ -17,7 +17,9 @@
 package android.view.inputmethod.cts;
 
 import static android.inputmethodservice.InputMethodService.FINISH_INPUT_NO_FALLBACK_CONNECTION;
+import static android.view.Display.DEFAULT_DISPLAY;
 import static android.view.View.VISIBLE;
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
 import static android.view.WindowInsets.Type.ime;
 import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
 import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN;
@@ -25,11 +27,15 @@
 import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN;
 import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNSPECIFIED;
 import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE;
+import static android.view.inputmethod.InputMethodManager.CLEAR_SHOW_FORCED_FLAG_WHEN_LEAVING;
+import static android.view.inputmethod.InputMethodManager.SHOW_FORCED;
 import static android.view.inputmethod.cts.util.InputMethodVisibilityVerifier.expectImeInvisible;
 import static android.view.inputmethod.cts.util.InputMethodVisibilityVerifier.expectImeVisible;
 import static android.view.inputmethod.cts.util.TestUtils.getOnMainSync;
 import static android.view.inputmethod.cts.util.TestUtils.runOnMainSync;
+import static android.widget.PopupWindow.INPUT_METHOD_NOT_NEEDED;
 
+import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
 import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEvent;
 import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEventWithKeyValue;
 import static com.android.cts.mockime.ImeEventStreamTestUtils.notExpectEvent;
@@ -39,15 +45,20 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
 import android.app.AlertDialog;
 import android.app.Instrumentation;
+import android.app.compat.CompatChanges;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
+import android.graphics.Insets;
 import android.os.SystemClock;
+import android.os.UserHandle;
 import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.AppModeInstant;
+import android.server.wm.WindowManagerState;
 import android.support.test.uiautomator.UiObject2;
 import android.text.TextUtils;
 import android.util.Log;
@@ -55,6 +66,7 @@
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
+import android.view.WindowInsets;
 import android.view.WindowInsetsController;
 import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
@@ -70,25 +82,35 @@
 import android.view.inputmethod.cts.util.UnlockScreenRule;
 import android.widget.EditText;
 import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.test.filters.MediumTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
+import androidx.test.uiautomator.By;
+import androidx.test.uiautomator.BySelector;
+import androidx.test.uiautomator.UiDevice;
+import androidx.test.uiautomator.Until;
 
+import com.android.compatibility.common.util.FeatureUtil;
 import com.android.cts.mockime.ImeEvent;
 import com.android.cts.mockime.ImeEventStream;
 import com.android.cts.mockime.ImeLayoutInfo;
 import com.android.cts.mockime.ImeSettings;
 import com.android.cts.mockime.MockImeSession;
 
+import org.junit.Assume;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Predicate;
 
@@ -317,6 +339,76 @@
     }
 
     @Test
+    public void testShowSoftInputWithShowForcedFlagWhenAppIsLeaving() throws Exception {
+        final InputMethodManager imm = InstrumentationRegistry.getInstrumentation()
+                .getTargetContext().getSystemService(InputMethodManager.class);
+
+        try (MockImeSession imeSession = MockImeSession.create(
+                InstrumentationRegistry.getInstrumentation().getContext(),
+                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            // Launch a simple test activity
+            final TestActivity testActivity = TestActivity.startSync(activity -> {
+                activity.getWindow().setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_HIDDEN);
+                return new LinearLayout(activity);
+            });
+            assertTrue("test activity should be in resume state",
+                    getOnMainSync(testActivity::hasWindowFocus));
+
+            // Launch a test editor activity
+            final String marker = getTestMarker();
+            final AtomicReference<EditText> ediTextRef = new AtomicReference<>();
+            final TestActivity testEditorActivity =
+                    TestActivity.startNewTaskSync(activity -> {
+                        final LinearLayout layout = new LinearLayout(activity);
+                        layout.setOrientation(LinearLayout.VERTICAL);
+
+                        final EditText focusedEditText = new EditText(activity);
+                        focusedEditText.setHint("focused editText");
+                        focusedEditText.setPrivateImeOptions(marker);
+                        focusedEditText.requestFocus();
+                        layout.addView(focusedEditText);
+                        ediTextRef.set(focusedEditText);
+                        return layout;
+                    });
+
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+            notExpectEvent(stream, editorMatcher("onStartInputView", marker), NOT_EXPECT_TIMEOUT);
+            expectImeInvisible(TIMEOUT);
+
+            assertTrue("isActive() must return true if the View has IME focus",
+                    getOnMainSync(() -> imm.isActive(ediTextRef.get())));
+
+            // Test showSoftInput() flow with adding SHOW_FORCED flag
+            assertTrue("showSoftInput must success if the View has IME focus",
+                    getOnMainSync(() -> imm.showSoftInput(ediTextRef.get(), SHOW_FORCED)));
+
+            expectEvent(stream, showSoftInputMatcher(InputMethod.SHOW_EXPLICIT), TIMEOUT);
+            expectEvent(stream, editorMatcher("onStartInputView", marker), TIMEOUT);
+            expectEventWithKeyValue(stream, "onWindowVisibilityChanged", "visible",
+                    View.VISIBLE, TIMEOUT);
+            expectImeVisible(TIMEOUT);
+
+            // Finish testEditorActivity
+            runOnMainSync(testEditorActivity::finish);
+
+            // Verify soft-keyboard will not visible when enabling the platform compat flag to
+            // clear SHOW_FOCED flag. Otherwise, keeping the legacy behavior of SHOW_FOCED that
+            // soft-keyboard remains visible if there is no explicit hiding request.
+            if (isClearShowForcedFlagEnabled(testActivity.getPackageName())) {
+                notExpectEvent(stream, event -> "showSoftInput".equals(event.getEventName()),
+                        NOT_EXPECT_TIMEOUT);
+                expectImeInvisible(TIMEOUT);
+            } else {
+                expectEvent(stream, event -> "showSoftInput".equals(event.getEventName()), TIMEOUT);
+                expectImeVisible(TIMEOUT);
+            }
+        }
+    }
+
+    @Test
     public void testFloatingImeHideKeyboardAfterBackPressed() throws Exception {
         final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
         final InputMethodManager imm = instrumentation.getTargetContext().getSystemService(
@@ -358,21 +450,16 @@
     }
 
     @Test
-    public void testImeVisibilityWhenDismisingDialogWithImeFocused() throws Exception {
+    public void testImeVisibilityWhenDismissingDialogWithImeFocused() throws Exception {
         final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        final InputMethodManager imm = instrumentation.getTargetContext().getSystemService(
-                InputMethodManager.class);
         try (MockImeSession imeSession = MockImeSession.create(
-                InstrumentationRegistry.getInstrumentation().getContext(),
-                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                instrumentation.getContext(),
+                instrumentation.getUiAutomation(),
                 new ImeSettings.Builder())) {
             final ImeEventStream stream = imeSession.openEventStream();
 
             // Launch a simple test activity
-            final TestActivity testActivity = TestActivity.startSync(activity -> {
-                final LinearLayout layout = new LinearLayout(activity);
-                return layout;
-            });
+            final TestActivity testActivity = TestActivity.startSync(LinearLayout::new);
 
             // Launch a dialog
             final String marker = getTestMarker();
@@ -427,11 +514,14 @@
             expectImeInvisible(TIMEOUT);
 
             // Expect fallback input connection started and keyboard invisible after activity
-            // focused.
-            final ImeEvent onStart = expectEvent(stream,
-                    event -> "onStartInput".equals(event.getEventName()), TIMEOUT);
-            assertTrue(onStart.getEnterState().hasFallbackInputConnection());
-            TestUtils.waitOnMainUntil(() -> testActivity.hasWindowFocus(), TIMEOUT);
+            // focused unless avoidable keyboard startup is desired,
+            // in which case, no fallback will be started.
+            if (!isPreventImeStartup()) {
+                final ImeEvent onStart = expectEvent(stream,
+                        event -> "onStartInput".equals(event.getEventName()), TIMEOUT);
+                assertTrue(onStart.getEnterState().hasFallbackInputConnection());
+            }
+            TestUtils.waitOnMainUntil(testActivity::hasWindowFocus, TIMEOUT);
             expectEventWithKeyValue(stream, "onWindowVisibilityChanged", "visible",
                     View.GONE, TIMEOUT);
             expectImeInvisible(TIMEOUT);
@@ -503,14 +593,16 @@
                 dialogRef.set(dialog);
             });
 
-            try (AutoCloseableWrapper dialogCloseWrapper = AutoCloseableWrapper.create(
+            try (AutoCloseableWrapper<AlertDialog> dialogCloseWrapper = AutoCloseableWrapper.create(
                     dialogRef.get(), dialog -> TestUtils.runOnMainSync(dialog::dismiss))) {
                 TestUtils.waitOnMainUntil(() -> dialogRef.get().isShowing()
                         && editTextRef.get().hasFocus(), TIMEOUT);
                 expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
                 expectEvent(stream, event -> "showSoftInput".equals(event.getEventName()), TIMEOUT);
-                expectEvent(stream, editorMatcher("onStartInputView", marker), TIMEOUT);
-                expectEventWithKeyValue(stream, "onWindowVisibilityChanged", "visible",
+                // Copy the event stream to verify both events in case expectEvent missed the
+                // event verification if the actual event sequence has flipped.
+                expectEvent(stream.copy(), editorMatcher("onStartInputView", marker), TIMEOUT);
+                expectEventWithKeyValue(stream.copy(), "onWindowVisibilityChanged", "visible",
                         View.VISIBLE, TIMEOUT);
                 expectImeVisible(TIMEOUT);
 
@@ -560,12 +652,16 @@
     @AppModeFull
     @Test
     public void testImeVisibilityWhenImeTransitionBetweenActivities_Full() throws Exception {
+        // TODO(b/210041952): Temporary disable testing on TV platform until realize how to address.
+        Assume.assumeFalse(FeatureUtil.isTV());
         runImeVisibilityWhenImeTransitionBetweenActivities(false /* instant */);
     }
 
     @AppModeInstant
     @Test
     public void testImeVisibilityWhenImeTransitionBetweenActivities_Instant() throws Exception {
+        // TODO(b/210041952): Temporary disable testing on TV platform until realize how to address.
+        Assume.assumeFalse(FeatureUtil.isTV());
         runImeVisibilityWhenImeTransitionBetweenActivities(true /* instant */);
     }
 
@@ -583,6 +679,8 @@
 
     @Test
     public void testRestoreImeVisibility() throws Exception {
+        // TODO(b/226110728): Remove after we can send ime restore signal to DisplayAreaOrganizer.
+        assumeFalse(isImeOrganized(DEFAULT_DISPLAY));
         runRestoreImeVisibility(TestSoftInputMode.UNCHANGED_WITH_BACKWARD_NAV, true);
     }
 
@@ -596,6 +694,67 @@
         runRestoreImeVisibility(TestSoftInputMode.HIDDEN_WITH_FORWARD_NAV, false);
     }
 
+    /**
+     * Test case for Bug 225028378.
+     *
+     * <p>This test ensures that showing a non-ime-focusable {@link PopupWindow} with
+     * {@link PopupWindow#INPUT_METHOD_NOT_NEEDED} will be on top of the IME.</p>
+     */
+    @Test
+    public void testNonImeFocusablePopupWindow_onTopOfIme() throws Exception {
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        try (MockImeSession imeSession = MockImeSession.create(
+                InstrumentationRegistry.getInstrumentation().getContext(),
+                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+            final String marker = getTestMarker();
+            final AtomicReference<EditText> editorRef = new AtomicReference<>();
+            TestActivity.startSync(activity -> {
+                final LinearLayout layout = new LinearLayout(activity);
+                layout.setOrientation(LinearLayout.VERTICAL);
+                layout.setGravity(Gravity.BOTTOM);
+                final EditText editText = new EditText(activity);
+                editorRef.set(editText);
+                editText.setHint("focused editText");
+                editText.setPrivateImeOptions(marker);
+                editText.requestFocus();
+                layout.addView(editText);
+                return layout;
+            });
+            // Show IME.
+            runOnMainSync(() -> editorRef.get().getContext().getSystemService(
+                    InputMethodManager.class).showSoftInput(editorRef.get(), 0));
+
+            expectEvent(stream, editorMatcher("onStartInputView", marker), TIMEOUT);
+            expectImeVisible(TIMEOUT);
+
+            // Create then show a non-ime-focusable PopupWindow with INPUT_METHOD_NOT_NEEDED.
+            try (AutoCloseableWrapper<PopupWindow> popupWindowWrapper = AutoCloseableWrapper.create(
+                    TestUtils.getOnMainSync(() -> {
+                        final PopupWindow popup = new PopupWindow(editorRef.get().getContext());
+                        popup.setInputMethodMode(INPUT_METHOD_NOT_NEEDED);
+                        final TextView textView = new TextView(editorRef.get().getContext());
+                        textView.setText("Popup");
+                        popup.setContentView(textView);
+                        popup.setWidth(MATCH_PARENT);
+                        popup.setHeight(MATCH_PARENT);
+                        // Show the popup window.
+                        popup.showAsDropDown(textView);
+                        return popup;
+                    }), popup -> TestUtils.runOnMainSync(popup::dismiss))
+            ) {
+                instrumentation.waitForIdleSync();
+                // Verify IME became invisible when the non-ime-focusable PopupWindow is shown.
+                expectImeInvisible(NOT_EXPECT_TIMEOUT);
+
+                runOnMainSync(() ->popupWindowWrapper.get().dismiss());
+                // Verify IME became visible when the non-ime-focusable PopupWindow has dismissed.
+                expectImeVisible(TIMEOUT);
+            }
+        }
+    }
+
     private enum TestSoftInputMode {
         UNCHANGED_WITH_BACKWARD_NAV,
         ALWAYS_HIDDEN_WITH_BACKWARD_NAV,
@@ -718,20 +877,33 @@
                     View.VISIBLE, TIMEOUT);
             expectImeVisible(TIMEOUT);
 
-            // Launcher another test activity from another process with popup dialog.
+            // Launch another test activity from another process with popup dialog.
             MockTestActivityUtil.launchSync(instant, TIMEOUT,
                     Map.of(MockTestActivityUtil.EXTRA_KEY_SHOW_DIALOG, "true"));
+            BySelector dialogSelector = By.clazz(AlertDialog.class).depth(0);
+            UiDevice uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+            assertNotNull(uiDevice.wait(Until.hasObject(dialogSelector), TIMEOUT));
+
             // Dismiss dialog and back to original test activity
             MockTestActivityUtil.sendBroadcastAction(MockTestActivityUtil.EXTRA_DISMISS_DIALOG);
 
+            final CountDownLatch imeVisibilityUpdateLatch = new CountDownLatch(1);
+            AtomicReference<Boolean> imeInsetsVisible = new AtomicReference<>();
+            TestUtils.runOnMainSync(
+                    () -> testActivity.getWindow().getDecorView().setOnApplyWindowInsetsListener(
+                            (v, insets) -> {
+                                if (insets.getInsets(WindowInsets.Type.ime()) != Insets.NONE) {
+                                    imeInsetsVisible.set(insets.isVisible(WindowInsets.Type.ime()));
+                                    imeVisibilityUpdateLatch.countDown();
+                                }
+                                return v.onApplyWindowInsets(insets);
+                            }));
             // Verify keyboard visibility should aligned with IME insets visibility.
             TestUtils.waitOnMainUntil(
                     () -> testActivity.getWindow().getDecorView().getVisibility() == VISIBLE
                             && testActivity.getWindow().getDecorView().hasWindowFocus(), TIMEOUT);
-
-            AtomicReference<Boolean> imeInsetsVisible = new AtomicReference<>();
-            TestUtils.runOnMainSync(() ->
-                    imeInsetsVisible.set(editTextRef.get().getRootWindowInsets().isVisible(ime())));
+            assertTrue("Waiting for onApplyWindowInsets timed out",
+                    imeVisibilityUpdateLatch.await(5, TimeUnit.SECONDS));
 
             if (imeInsetsVisible.get()) {
                 expectImeVisible(TIMEOUT);
@@ -792,4 +964,27 @@
         builder.setNavigationBarColor(navigationBarColor);
         return builder;
     }
+
+    /**
+     * Whether enabling a compatibility flag to clear {@link InputMethodManager#SHOW_FORCED} flag
+     * for the given {@code packageName} of the app when it's leaving.
+     *
+     * @return {@code true} if the compatibility flag is enabled.
+     */
+    private static boolean isClearShowForcedFlagEnabled(String packageName) {
+        AtomicBoolean result = new AtomicBoolean();
+        runWithShellPermissionIdentity(() -> result.set(
+                CompatChanges.isChangeEnabled(CLEAR_SHOW_FORCED_FLAG_WHEN_LEAVING, packageName,
+                        UserHandle.CURRENT)));
+        return result.get();
+    }
+
+    /** Whether the IME DisplayArea is organized by WM Shell. */
+    private static boolean isImeOrganized(int displayId) {
+        final WindowManagerState wmState = new WindowManagerState();
+        wmState.computeState();
+        WindowManagerState.DisplayArea imeContainer =  wmState.getImeContainer(displayId);
+        assertNotNull("ImeContainer not found for display id: " + displayId, imeContainer);
+        return imeContainer.isOrganized();
+    }
 }
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/NavigationBarColorTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/NavigationBarColorTest.java
index 162c428..7470047 100644
--- a/tests/inputmethod/src/android/view/inputmethod/cts/NavigationBarColorTest.java
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/NavigationBarColorTest.java
@@ -17,6 +17,7 @@
 package android.view.inputmethod.cts;
 
 import static android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR;
+import static android.view.WindowInsets.Type.ime;
 import static android.view.WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
 import static android.view.WindowManager.LayoutParams.FLAG_DIM_BEHIND;
 import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;
@@ -48,6 +49,7 @@
 import android.view.inputmethod.cts.util.NavigationBarInfo;
 import android.view.inputmethod.cts.util.TestActivity;
 import android.view.inputmethod.cts.util.UnlockScreenRule;
+import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -58,7 +60,6 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.compatibility.common.util.ImeAwareEditText;
 import com.android.cts.mockime.ImeEventStream;
 import com.android.cts.mockime.ImeLayoutInfo;
 import com.android.cts.mockime.ImeSettings;
@@ -140,12 +141,12 @@
                 case DIMMING_DIALOG_ABOVE_IME: {
                     final LinearLayout layout = new LinearLayout(activity);
                     layout.setOrientation(LinearLayout.VERTICAL);
-                    final ImeAwareEditText editText = new ImeAwareEditText(activity);
+                    final EditText editText = new EditText(activity);
                     editText.setPrivateImeOptions(TEST_MARKER);
                     editText.setHint("editText");
                     editText.requestFocus();
-                    editText.scheduleShowSoftInput();
                     layout.addView(editText);
+                    activity.getWindow().getDecorView().getWindowInsetsController().show(ime());
                     contentView = layout;
                     break;
                 }
@@ -193,17 +194,17 @@
             }
             case DIMMING_DIALOG_BEHIND_IME: {
                 final AlertDialog alertDialog = getOnMainSync(() -> {
-                    final ImeAwareEditText editText = new ImeAwareEditText(activity);
+                    final EditText editText = new EditText(activity);
                     editText.setPrivateImeOptions(TEST_MARKER);
                     editText.setHint("editText");
                     editText.requestFocus();
-                    editText.scheduleShowSoftInput();
                     final AlertDialog dialog = new AlertDialog.Builder(activity)
                             .setView(editText)
                             .create();
                     dialog.getWindow().setFlags(FLAG_DIM_BEHIND,
                             FLAG_DIM_BEHIND | FLAG_NOT_FOCUSABLE | FLAG_ALT_FOCUSABLE_IM);
                     dialog.show();
+                    activity.getWindow().getDecorView().getWindowInsetsController().show(ime());
                     return dialog;
                 });
                 // Note: Dialog#dismiss() is a thread safe method so we don't need to call this from
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/OnScreenPositionTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/OnScreenPositionTest.java
index 92594d3..614851d 100644
--- a/tests/inputmethod/src/android/view/inputmethod/cts/OnScreenPositionTest.java
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/OnScreenPositionTest.java
@@ -16,18 +16,14 @@
 
 package android.view.inputmethod.cts;
 
-import static com.android.cts.mockime.ImeEventStreamTestUtils.expectBindInput;
+import static android.view.inputmethod.cts.util.InputMethodVisibilityVerifier.expectImeVisible;
+
+import static com.android.cts.mockime.ImeEventStreamTestUtils.editorMatcher;
 import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEvent;
-import static com.android.cts.mockime.ImeEventStreamTestUtils.waitForInputViewLayoutStable;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import android.graphics.Rect;
-import android.os.Process;
-import android.text.TextUtils;
-import android.view.inputmethod.EditorInfo;
+import android.os.SystemClock;
+import android.view.Gravity;
+import android.view.WindowManager;
 import android.view.inputmethod.cts.util.EndToEndImeTestBase;
 import android.view.inputmethod.cts.util.TestActivity;
 import android.view.inputmethod.cts.util.UnlockScreenRule;
@@ -38,9 +34,7 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.compatibility.common.util.CtsTouchUtils;
 import com.android.cts.mockime.ImeEventStream;
-import com.android.cts.mockime.ImeLayoutInfo;
 import com.android.cts.mockime.ImeSettings;
 import com.android.cts.mockime.MockImeSession;
 
@@ -49,41 +43,27 @@
 import org.junit.runner.RunWith;
 
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
 
 @MediumTest
 @RunWith(AndroidJUnit4.class)
 public class OnScreenPositionTest extends EndToEndImeTestBase {
     private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(5);
-    private static final long LAYOUT_STABLE_THRESHOLD = TimeUnit.SECONDS.toMillis(3);
 
-    private static final String TEST_MARKER = "android.view.inputmethod.cts.OnScreenPositionTest";
+    private static final String TEST_MARKER_PREFIX =
+            "android.view.inputmethod.cts.OnScreenPositionTest";
+
+    private static String getTestMarker() {
+        return TEST_MARKER_PREFIX + "/"  + SystemClock.elapsedRealtimeNanos();
+    }
 
     @Rule
     public final UnlockScreenRule mUnlockScreenRule = new UnlockScreenRule();
 
-    public EditText launchTestActivity() {
-        final AtomicReference<EditText> editTextRef = new AtomicReference<>();
-        TestActivity.startSync(activity -> {
-            final LinearLayout layout = new LinearLayout(activity);
-            layout.setOrientation(LinearLayout.VERTICAL);
-
-            final EditText editText = new EditText(activity);
-            editText.setPrivateImeOptions(TEST_MARKER);
-            editText.setHint("editText");
-            editText.requestFocus();
-            editTextRef.set(editText);
-
-            layout.addView(editText);
-            return layout;
-        });
-        return editTextRef.get();
-    }
-
-    private static final int EXPECTED_KEYBOARD_HEIGHT = 100;
-
     /**
      * Regression test for Bug 33308065.
+     *
+     * <p>Verify that {@link com.android.cts.mockime.Watermark} is visible even if it's placed
+     * at the bottom of the IME content area.</p>
      */
     @Test
     public void testImeIsNotBehindNavBar() throws Exception {
@@ -91,51 +71,29 @@
                 InstrumentationRegistry.getInstrumentation().getContext(),
                 InstrumentationRegistry.getInstrumentation().getUiAutomation(),
                 new ImeSettings.Builder()
-                        .setInputViewHeight(EXPECTED_KEYBOARD_HEIGHT))) {
+                        .setWatermarkGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM))) {
             final ImeEventStream stream = imeSession.openEventStream();
 
-            final EditText editText = launchTestActivity();
+            final String marker = getTestMarker();
+            TestActivity.startSync(activity -> {
+                activity.getWindow().setSoftInputMode(
+                        WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
 
-            // Wait until the MockIme gets bound to the TestActivity.
-            expectBindInput(stream, Process.myPid(), TIMEOUT);
+                final LinearLayout layout = new LinearLayout(activity);
+                layout.setOrientation(LinearLayout.VERTICAL);
 
-            // Emulate tap event
-            CtsTouchUtils.emulateTapOnViewCenter(
-                    InstrumentationRegistry.getInstrumentation(), null, editText);
+                final EditText editText = new EditText(activity);
+                editText.setPrivateImeOptions(marker);
+                editText.setHint("editText");
+                editText.requestFocus();
 
-            // Wait until "onStartInput" gets called for the EditText.
-            expectEvent(stream, event -> {
-                if (!TextUtils.equals("onStartInputView", event.getEventName())) {
-                    return false;
-                }
-                final EditorInfo editorInfo = event.getArguments().getParcelable("editorInfo");
-                return TextUtils.equals(TEST_MARKER, editorInfo.privateImeOptions);
-            }, TIMEOUT);
+                layout.addView(editText);
+                return layout;
+            });
 
-            // Wait until MockIme's layout becomes stable.
-            final ImeLayoutInfo lastLayout =
-                    waitForInputViewLayoutStable(stream, LAYOUT_STABLE_THRESHOLD);
-            assertNotNull(lastLayout);
+            expectEvent(stream, editorMatcher("onStartInputView", marker), TIMEOUT);
 
-            // We consider that the screenRectWithoutNavBar is a union of those two rects.
-            // See the following methods for details.
-            //  - DecorView#getColorViewTopInset(int, int)
-            //  - DecorView#getColorViewBottomInset(int, int)
-            //  - DecorView#getColorViewRightInset(int, int)
-            //  - DecorView#getColorViewLeftInset(int, int)
-            final Rect screenRectWithoutNavBar = lastLayout.getScreenRectWithoutStableInset();
-            screenRectWithoutNavBar.union(lastLayout.getScreenRectWithoutSystemWindowInset());
-
-            final Rect keyboardViewBounds = lastLayout.getInputViewBoundsInScreen();
-            // By default, the above region must contain the keyboard view region.
-            assertTrue("screenRectWithoutNavBar(" + screenRectWithoutNavBar + ") must"
-                    + " contain keyboardViewBounds(" + keyboardViewBounds + ")",
-                    screenRectWithoutNavBar.contains(keyboardViewBounds));
-
-            // Make sure that the keyboard height is expected.  Here we assume that the expected
-            // height is small enough for all the Android-based devices to show.
-            assertEquals(EXPECTED_KEYBOARD_HEIGHT,
-                    lastLayout.getInputViewBoundsInScreen().height());
+            expectImeVisible(TIMEOUT);
         }
     }
 }
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/StylusHandwritingTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/StylusHandwritingTest.java
new file mode 100644
index 0000000..30d7eb4
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/StylusHandwritingTest.java
@@ -0,0 +1,591 @@
+/*
+ * Copyright (C) 2021 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 android.view.inputmethod.cts;
+
+import static android.provider.Settings.Global.STYLUS_HANDWRITING_ENABLED;
+
+import static com.android.cts.mockime.ImeEventStreamTestUtils.editorMatcher;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectCommand;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEvent;
+import static com.android.cts.mockime.ImeEventStreamTestUtils.notExpectEvent;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.Manifest;
+import android.content.Context;
+import android.inputmethodservice.InputMethodService;
+import android.os.SystemClock;
+import android.provider.Settings;
+import android.util.Pair;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+import android.view.inputmethod.InputMethodManager;
+import android.view.inputmethod.cts.util.EndToEndImeTestBase;
+import android.view.inputmethod.cts.util.TestActivity;
+import android.view.inputmethod.cts.util.TestUtils;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.test.filters.FlakyTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.AdoptShellPermissionsRule;
+import com.android.cts.mockime.ImeEventStream;
+import com.android.cts.mockime.ImeSettings;
+import com.android.cts.mockime.MockImeSession;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * IMF and end-to-end Stylus handwriting tests.
+ */
+public class StylusHandwritingTest extends EndToEndImeTestBase {
+    private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(5);
+    private static final long NOT_EXPECT_TIMEOUT = TimeUnit.SECONDS.toMillis(1);
+    private static final int SETTING_VALUE_ON = 1;
+    private static final int SETTING_VALUE_OFF = 0;
+    private static final String TEST_MARKER_PREFIX =
+            "android.view.inputmethod.cts.StylusHandwritingTest";
+
+    private Context mContext;
+    private int mHwInitialState;
+    private boolean mShouldRestoreInitialHwState;
+
+    @Rule
+    public AdoptShellPermissionsRule mAdoptShellPermissionsRule = new AdoptShellPermissionsRule(
+            InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+            Manifest.permission.WRITE_SECURE_SETTINGS);
+
+    @Before
+    public void setup() {
+        mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        mHwInitialState = Settings.Global.getInt(mContext.getContentResolver(),
+                STYLUS_HANDWRITING_ENABLED, SETTING_VALUE_OFF);
+        if (mHwInitialState != SETTING_VALUE_ON) {
+            Settings.Global.putInt(mContext.getContentResolver(),
+                    STYLUS_HANDWRITING_ENABLED, SETTING_VALUE_ON);
+            mShouldRestoreInitialHwState = true;
+        }
+    }
+
+    @After
+    public void tearDown() {
+        if (mShouldRestoreInitialHwState) {
+            mShouldRestoreInitialHwState = false;
+            Settings.Global.putInt(mContext.getContentResolver(),
+                    STYLUS_HANDWRITING_ENABLED, mHwInitialState);
+        }
+    }
+
+    @Test
+    public void testHandwritingDoesNotStartWhenNoStylusDown() throws Exception {
+        final InputMethodManager imm = mContext.getSystemService(InputMethodManager.class);
+        try (MockImeSession imeSession = MockImeSession.create(
+                InstrumentationRegistry.getInstrumentation().getContext(),
+                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String marker = getTestMarker();
+            final EditText editText = launchTestActivity(marker);
+
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", marker),
+                    NOT_EXPECT_TIMEOUT);
+
+            imm.startStylusHandwriting(editText);
+
+            // Handwriting should not start
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartStylusHandwriting", marker),
+                    NOT_EXPECT_TIMEOUT);
+
+            // Verify Stylus Handwriting window is not shown
+            assertFalse(expectCommand(
+                    stream, imeSession.callGetStylusHandwritingWindowVisibility(), TIMEOUT)
+                    .getReturnBooleanValue());
+        }
+    }
+
+    @Test
+    public void testHandwritingStartAndFinish() throws Exception {
+        final InputMethodManager imm = mContext.getSystemService(InputMethodManager.class);
+        try (MockImeSession imeSession = MockImeSession.create(
+                InstrumentationRegistry.getInstrumentation().getContext(),
+                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String marker = getTestMarker();
+            final EditText editText = launchTestActivity(marker);
+
+            // Touch down with a stylus
+            final int x = 10;
+            final int y = 10;
+            TestUtils.injectStylusDownEvent(editText, x, y);
+
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", marker),
+                    NOT_EXPECT_TIMEOUT);
+            imm.startStylusHandwriting(editText);
+            // keyboard shouldn't show up.
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", marker),
+                    NOT_EXPECT_TIMEOUT);
+
+            // Handwriting should start
+            expectEvent(
+                    stream,
+                    editorMatcher("onPrepareStylusHandwriting", marker),
+                    TIMEOUT);
+            expectEvent(
+                    stream,
+                    editorMatcher("onStartStylusHandwriting", marker),
+                    TIMEOUT);
+
+            // Verify Stylus Handwriting window is shown
+            assertTrue(expectCommand(
+                    stream, imeSession.callGetStylusHandwritingWindowVisibility(), TIMEOUT)
+                            .getReturnBooleanValue());
+
+            // Release the stylus pointer
+            TestUtils.injectStylusUpEvent(editText, x, y);
+
+            // Verify calling finishStylusHandwriting() calls onFinishStylusHandwriting().
+            imeSession.callFinishStylusHandwriting();
+            expectEvent(
+                    stream,
+                    editorMatcher("onFinishStylusHandwriting", marker),
+                    TIMEOUT);
+        }
+    }
+
+    /**
+     * Call {@link InputMethodManager#startStylusHandwriting(View)} and inject Stylus touch events
+     * on screen. Make sure {@link InputMethodService#onStylusHandwritingMotionEvent(MotionEvent)}
+     * receives those events via Spy window surface.
+     * @throws Exception
+     */
+    @Test
+    public void testHandwritingStylusEvents_onStylusHandwritingMotionEvent() throws Exception {
+        testHandwritingStylusEvents(false /* verifyOnInkView */);
+    }
+
+    /**
+     * Call {@link InputMethodManager#startStylusHandwriting(View)} and inject Stylus touch events
+     * on screen. Make sure Inking view receives those events via Spy window surface.
+     * @throws Exception
+     */
+    @Test
+    public void testHandwritingStylusEvents_dispatchToInkView() throws Exception {
+        testHandwritingStylusEvents(false /* verifyOnInkView */);
+    }
+
+    private void testHandwritingStylusEvents(boolean verifyOnInkView) throws Exception {
+        final InputMethodManager imm = InstrumentationRegistry.getInstrumentation()
+                .getTargetContext().getSystemService(InputMethodManager.class);
+        try (MockImeSession imeSession = MockImeSession.create(
+                InstrumentationRegistry.getInstrumentation().getContext(),
+                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String marker = getTestMarker();
+            final EditText editText = launchTestActivity(marker);
+
+            final List<MotionEvent> injectedEvents = new ArrayList<>();
+            // Touch down with a stylus
+            final int startX = 10;
+            final int startY = 10;
+            injectedEvents.add(TestUtils.injectStylusDownEvent(editText, startX, startY));
+
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", marker),
+                    NOT_EXPECT_TIMEOUT);
+            imm.startStylusHandwriting(editText);
+
+            // Handwriting should start
+            expectEvent(
+                    stream,
+                    editorMatcher("onStartStylusHandwriting", marker),
+                    TIMEOUT);
+
+            // Verify Stylus Handwriting window is shown
+            assertTrue(expectCommand(
+                    stream, imeSession.callGetStylusHandwritingWindowVisibility(), TIMEOUT)
+                    .getReturnBooleanValue());
+
+            if (verifyOnInkView) {
+                // Verify IME stylus Ink view receives the motion Event.
+                assertTrue(expectCommand(
+                        stream,
+                        imeSession.callSetStylusHandwritingInkView(),
+                        TIMEOUT).getReturnBooleanValue());
+            }
+
+            final int endX = startX + 500;
+            final int endY = startY + 500;
+            injectedEvents.addAll(
+                    TestUtils.injectStylusMoveEvents(editText, startX, startY, endX, endY, 10));
+            injectedEvents.add(TestUtils.injectStylusUpEvent(editText, endX, endY));
+
+            expectEvent(
+                    stream, event -> "onStylusMotionEvent".equals(event.getEventName()), TIMEOUT);
+
+            // get Stylus events from Ink view, splitting any batched events.
+            final ArrayList<MotionEvent> capturedBatchedEvents = expectCommand(
+                    stream, imeSession.callGetStylusHandwritingEvents(), TIMEOUT)
+                    .getReturnParcelableArrayListValue();
+            assertNotNull(capturedBatchedEvents);
+            final ArrayList<MotionEvent> capturedEvents =  new ArrayList<>();
+            capturedBatchedEvents.forEach(
+                    e -> capturedEvents.addAll(TestUtils.splitBatchedMotionEvent(e)));
+
+            // captured events should be same as injected.
+            assertEquals(injectedEvents.size(), capturedEvents.size());
+
+            // Verify MotionEvents as well.
+            // Note: we cannot just use equals() since some MotionEvent fields can change after
+            // dispatch.
+            Iterator<MotionEvent> capturedIt = capturedEvents.iterator();
+            Iterator<MotionEvent> injectedIt = injectedEvents.iterator();
+            while (injectedIt.hasNext() && capturedIt.hasNext()) {
+                MotionEvent injected = injectedIt.next();
+                MotionEvent captured = capturedIt.next();
+                assertEquals("X should be same for MotionEvent", injected.getX(), captured.getX(),
+                        5.0f);
+                assertEquals("Y should be same for MotionEvent", injected.getY(), captured.getY(),
+                        5.0f);
+                assertEquals("Action should be same for MotionEvent",
+                        injected.getAction(), captured.getAction());
+            }
+        }
+    }
+
+    @FlakyTest(bugId = 210039666)
+    @Test
+    /**
+     * Inject Stylus events on top of focused editor and verify Handwriting is started and InkWindow
+     * is displayed.
+     */
+    public void testHandwritingEndToEnd() throws Exception {
+        try (MockImeSession imeSession = MockImeSession.create(
+                InstrumentationRegistry.getInstrumentation().getContext(),
+                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String marker = getTestMarker();
+            final EditText editText = launchTestActivity(marker);
+
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", marker),
+                    NOT_EXPECT_TIMEOUT);
+
+            final int touchSlop = getTouchSlop();
+            final int startX = 50;
+            final int startY = 50;
+            final int endX = startX + 2 * touchSlop;
+            final int endY = startY + 2 * touchSlop;
+            final int number = 10;
+            TestUtils.injectStylusDownEvent(editText, startX, startY);
+            TestUtils.injectStylusMoveEvents(editText, startX, startY,
+                    endX, endY, number);
+            // Handwriting should already be initiated before ACTION_UP.
+            // keyboard shouldn't show up.
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", marker),
+                    NOT_EXPECT_TIMEOUT);
+            // Handwriting should start
+            expectEvent(
+                    stream,
+                    editorMatcher("onStartStylusHandwriting", marker),
+                    TIMEOUT);
+
+            // Verify Stylus Handwriting window is shown
+            assertTrue(expectCommand(
+                    stream, imeSession.callGetStylusHandwritingWindowVisibility(), TIMEOUT)
+                            .getReturnBooleanValue());
+
+            TestUtils.injectStylusUpEvent(editText, endX, endY);
+        }
+    }
+
+    @Test
+    /**
+     * Inject stylus events to a focused EditText that disables autoHandwriting.
+     * {@link InputMethodManager#startStylusHandwriting(View)} should not be called.
+     */
+    public void testAutoHandwritingDisabled() throws Exception {
+        try (MockImeSession imeSession = MockImeSession.create(
+                InstrumentationRegistry.getInstrumentation().getContext(),
+                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String marker = getTestMarker();
+            final EditText editText = launchTestActivity(marker);
+            editText.setAutoHandwritingEnabled(false);
+
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", marker),
+                    NOT_EXPECT_TIMEOUT);
+
+            TestUtils.injectStylusEvents(editText);
+
+            // TODO(215439842): check that keyboard is not shown.
+            // Handwriting should not start
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartStylusHandwriting", marker),
+                    NOT_EXPECT_TIMEOUT);
+
+            // Verify Stylus Handwriting window is not shown
+            assertFalse(expectCommand(
+                    stream, imeSession.callGetStylusHandwritingWindowVisibility(), TIMEOUT)
+                    .getReturnBooleanValue());
+        }
+    }
+
+    @Test
+    /**
+     * Inject stylus events out of a focused editor's view bound.
+     * {@link InputMethodManager#startStylusHandwriting(View)} should not be called for this editor.
+     */
+    public void testAutoHandwritingOutOfBound() throws Exception {
+        try (MockImeSession imeSession = MockImeSession.create(
+                InstrumentationRegistry.getInstrumentation().getContext(),
+                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String marker = getTestMarker();
+            final EditText editText = launchTestActivity(marker);
+            editText.setAutoHandwritingEnabled(false);
+
+            expectEvent(stream, editorMatcher("onStartInput", marker), TIMEOUT);
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", marker),
+                    NOT_EXPECT_TIMEOUT);
+
+            // Inject stylus events out of the editor boundary.
+            TestUtils.injectStylusEvents(editText, 50, -50);
+            // keyboard shouldn't show up.
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", marker),
+                    NOT_EXPECT_TIMEOUT);
+            // Handwriting should not start
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartStylusHandwriting", marker),
+                    NOT_EXPECT_TIMEOUT);
+
+            // Verify Stylus Handwriting window is not shown
+            assertFalse(expectCommand(
+                    stream, imeSession.callGetStylusHandwritingWindowVisibility(), TIMEOUT)
+                    .getReturnBooleanValue());
+        }
+    }
+
+    @Test
+    /**
+     * Inject Stylus events on top of an unfocused editor and verify Handwriting is started and
+     * InkWindow is displayed.
+     */
+    public void testHandwriting_unfocusedEditText() throws Exception {
+        try (MockImeSession imeSession = MockImeSession.create(
+                InstrumentationRegistry.getInstrumentation().getContext(),
+                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String focusedMarker = getTestMarker();
+            final String unfocusedMarker = getTestMarker();
+            final Pair<EditText, EditText> editTextPair =
+                    launchTestActivity(focusedMarker, unfocusedMarker);
+            final EditText unfocusedEditText = editTextPair.second;
+
+            expectEvent(stream, editorMatcher("onStartInput", focusedMarker), TIMEOUT);
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", focusedMarker),
+                    NOT_EXPECT_TIMEOUT);
+
+            final int touchSlop = getTouchSlop();
+            final int startX = 50;
+            final int startY = 2 * touchSlop;
+            // (endX, endY) is out of bound to avoid that unfocusedEditText is focused due to the
+            // stylus touch.
+            final int endX = -2 * touchSlop;
+            final int endY = 50;
+            final int number = 10;
+
+            TestUtils.injectStylusDownEvent(unfocusedEditText, startX, startY);
+            TestUtils.injectStylusMoveEvents(unfocusedEditText, startX, startY,
+                    endX, endY, number);
+            // Handwriting should already be initiated before ACTION_UP.
+            // unfocusedEditor is focused and triggers onStartInput.
+            expectEvent(stream, editorMatcher("onStartInput", unfocusedMarker), TIMEOUT);
+            // keyboard shouldn't show up.
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", unfocusedMarker),
+                    NOT_EXPECT_TIMEOUT);
+            // Handwriting should start on the unfocused EditText.
+            expectEvent(
+                    stream,
+                    editorMatcher("onStartStylusHandwriting", unfocusedMarker),
+                    TIMEOUT);
+
+            // Verify Stylus Handwriting window is shown
+            assertTrue(expectCommand(
+                    stream, imeSession.callGetStylusHandwritingWindowVisibility(), TIMEOUT)
+                    .getReturnBooleanValue());
+
+            TestUtils.injectStylusUpEvent(unfocusedEditText, endX, endY);
+        }
+    }
+
+    @Test
+    /**
+     * Inject Stylus events on top of an unfocused editor which disabled the autoHandwriting and
+     * verify Handwriting is not started and InkWindow is not displayed.
+     */
+    public void testHandwriting_unfocusedEditText_autoHandwritingDisabled() throws Exception {
+        try (MockImeSession imeSession = MockImeSession.create(
+                InstrumentationRegistry.getInstrumentation().getContext(),
+                InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                new ImeSettings.Builder())) {
+            final ImeEventStream stream = imeSession.openEventStream();
+
+            final String focusedMarker = getTestMarker();
+            final String unfocusedMarker = getTestMarker();
+            final Pair<EditText, EditText> editTextPair =
+                    launchTestActivity(focusedMarker, unfocusedMarker);
+            final EditText unfocusedEditText = editTextPair.second;
+            unfocusedEditText.setAutoHandwritingEnabled(false);
+
+            expectEvent(stream, editorMatcher("onStartInput", focusedMarker), TIMEOUT);
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", focusedMarker),
+                    NOT_EXPECT_TIMEOUT);
+
+            final int touchSlop = getTouchSlop();
+            final int startX = 50;
+            final int startY = 2 * touchSlop;
+            // (endX, endY) is out of bound to avoid that unfocusedEditText is focused due to the
+            // stylus touch.
+            final int endX = -2 * touchSlop;
+            final int endY = 50;
+            final int number = 10;
+            TestUtils.injectStylusDownEvent(unfocusedEditText, startX, startY);
+            TestUtils.injectStylusMoveEvents(unfocusedEditText, startX, startY,
+                    endX, endY, number);
+            TestUtils.injectStylusUpEvent(unfocusedEditText, endX, endY);
+
+            // unfocusedEditor opts out autoHandwriting, so it won't trigger onStartInput.
+            notExpectEvent(stream, editorMatcher("onStartInput", unfocusedMarker), TIMEOUT);
+            // keyboard shouldn't show up.
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartInputView", unfocusedMarker),
+                    NOT_EXPECT_TIMEOUT);
+            // Handwriting should not start
+            notExpectEvent(
+                    stream,
+                    editorMatcher("onStartStylusHandwriting", unfocusedMarker),
+                    NOT_EXPECT_TIMEOUT);
+
+            // Verify Stylus Handwriting window is not shown
+            assertFalse(expectCommand(
+                    stream, imeSession.callGetStylusHandwritingWindowVisibility(), TIMEOUT)
+                    .getReturnBooleanValue());
+        }
+    }
+
+    private EditText launchTestActivity(@NonNull String marker) {
+        return launchTestActivity(marker, getTestMarker()).first;
+    }
+
+    private static String getTestMarker() {
+        return TEST_MARKER_PREFIX + "/"  + SystemClock.elapsedRealtimeNanos();
+    }
+
+    private static int getTouchSlop() {
+        final Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        return ViewConfiguration.get(context).getScaledTouchSlop();
+    }
+
+    private Pair<EditText, EditText> launchTestActivity(@NonNull String focusedMarker,
+            @NonNull String nonFocusedMarker) {
+        final AtomicReference<EditText> focusedEditTextRef = new AtomicReference<>();
+        final AtomicReference<EditText> nonFocusedEditTextRef = new AtomicReference<>();
+        TestActivity.startSync(activity -> {
+            final LinearLayout layout = new LinearLayout(activity);
+            layout.setOrientation(LinearLayout.VERTICAL);
+            // Adding some top padding tests that inject stylus event out of the view boundary.
+            layout.setPadding(0, 100, 0, 0);
+
+            final EditText focusedEditText = new EditText(activity);
+            focusedEditText.setHint("focused editText");
+            focusedEditText.setPrivateImeOptions(focusedMarker);
+            focusedEditText.requestFocus();
+            focusedEditText.setAutoHandwritingEnabled(true);
+            focusedEditTextRef.set(focusedEditText);
+            layout.addView(focusedEditText);
+
+            final EditText nonFocusedEditText = new EditText(activity);
+            nonFocusedEditText.setPrivateImeOptions(nonFocusedMarker);
+            nonFocusedEditText.setHint("target editText");
+            nonFocusedEditText.setAutoHandwritingEnabled(true);
+            nonFocusedEditTextRef.set(nonFocusedEditText);
+            layout.addView(nonFocusedEditText);
+            return layout;
+        });
+        return new Pair<>(focusedEditTextRef.get(), nonFocusedEditTextRef.get());
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/TextAttributeTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/TextAttributeTest.java
new file mode 100644
index 0000000..3615e1f
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/TextAttributeTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2021 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 android.view.inputmethod.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Parcel;
+import android.os.PersistableBundle;
+import android.view.inputmethod.TextAttribute;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Collections;
+import java.util.List;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class TextAttributeTest {
+    private static final String SUGGESTION = "suggestion";
+    private static final String EXTRAS_KEY = "extras_key";
+    private static final String EXTRAS_VALUE = "extras_value";
+
+    private static final List<String> SUGGESTIONS = Collections.singletonList(SUGGESTION);
+    private static final PersistableBundle EXTRA_BUNDLE;
+    static {
+        final PersistableBundle bundle = new PersistableBundle();
+        bundle.putString(EXTRAS_KEY, EXTRAS_VALUE);
+        EXTRA_BUNDLE = bundle;
+    }
+
+    @Test
+    public void testTextAttribute() {
+        final TextAttribute textAttribute = new TextAttribute.Builder()
+                .setTextConversionSuggestions(SUGGESTIONS)
+                .setExtras(EXTRA_BUNDLE)
+                .build();
+        assertTextAttribute(textAttribute);
+    }
+
+    @Test
+    public void testWriteToParcel() {
+        final TextAttribute textAttribute = new TextAttribute.Builder()
+                .setTextConversionSuggestions(SUGGESTIONS)
+                .setExtras(EXTRA_BUNDLE)
+                .build();
+
+        assertTextAttribute(cloneViaParcel(textAttribute));
+    }
+
+    private static void assertTextAttribute(TextAttribute info) {
+        assertThat(info.getTextConversionSuggestions()).containsExactlyElementsIn(SUGGESTIONS);
+        assertThat(info.getExtras().getString(EXTRAS_KEY)).isEqualTo(EXTRAS_VALUE);
+    }
+
+    private static TextAttribute cloneViaParcel(TextAttribute src) {
+        final Parcel parcel = Parcel.obtain();
+        try {
+            src.writeToParcel(parcel, 0);
+            parcel.setDataPosition(0);
+            return TextAttribute.CREATOR.createFromParcel(parcel);
+        } finally {
+            parcel.recycle();
+        }
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/TextSnapshotTest.java b/tests/inputmethod/src/android/view/inputmethod/cts/TextSnapshotTest.java
new file mode 100644
index 0000000..afd5c73
--- /dev/null
+++ b/tests/inputmethod/src/android/view/inputmethod/cts/TextSnapshotTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2021 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 android.view.inputmethod.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.text.InputType;
+import android.text.Selection;
+import android.view.inputmethod.SurroundingText;
+import android.view.inputmethod.TextSnapshot;
+import android.view.inputmethod.cts.util.InputConnectionTestUtils;
+
+import androidx.annotation.NonNull;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public final class TextSnapshotTest {
+
+    @Test
+    public void testConstruction() {
+        // Empty text
+        verify(surroundingText("[]", 0), -1, -1, InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+
+        // A single character
+        verify(surroundingText("0[]]", 0), -1, -1, InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+
+        verify(surroundingText("012[345]6789", 0), -1, -1, InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+        verify(surroundingText("012[345]6789", 1), -1, -1, InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+        verify(surroundingText("012[345]6789", 2), -1, -1, InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+
+        verify(surroundingText("012[345]6789", 0), -1, -1, InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+        verify(surroundingText("012[345]6789", 0), 3, 6, InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+        verify(surroundingText("012[345]6789", 2), 3, 6, InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testNullSurroundingText1() {
+        new TextSnapshot(null, -1, -1, InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInvalidComposeRegion() {
+        new TextSnapshot(surroundingText("012[345]6789", 0), -2, -2,
+                InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInvalidComposeRegion2() {
+        new TextSnapshot(surroundingText("012[345]6789", 0), 0, -2,
+                InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInvalidComposeRegion3() {
+        new TextSnapshot(surroundingText("012[345]6789", 0), -2, 0,
+                InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testInvalidComposeRegion4() {
+        new TextSnapshot(surroundingText("012[345]6789", 0), 2, 1,
+                InputType.TYPE_TEXT_FLAG_CAP_WORDS);
+    }
+
+    private static SurroundingText surroundingText(@NonNull String formatString, int offset) {
+        final CharSequence text = InputConnectionTestUtils.formatString(formatString);
+        final int selectionStart = Selection.getSelectionStart(text);
+        assertThat(selectionStart).isGreaterThan(-1);
+        final int selectionEnd = Selection.getSelectionEnd(text);
+        assertThat(selectionEnd).isGreaterThan(-1);
+        return new SurroundingText(text.subSequence(offset, text.length() - offset),
+                selectionStart - offset, selectionEnd - offset, offset);
+    }
+
+    private static void verify(@NonNull SurroundingText surroundingText, int compositionStart,
+            int compositionEnd, int cursorCapsMode) {
+        final TextSnapshot snapshot =
+                new TextSnapshot(surroundingText, compositionStart, compositionEnd, cursorCapsMode);
+
+        assertThat(snapshot.getSurroundingText().getText()).isEqualTo(surroundingText.getText());
+        assertThat(snapshot.getSurroundingText().getOffset())
+                .isEqualTo(surroundingText.getOffset());
+        assertThat(snapshot.getSurroundingText().getSelectionStart())
+                .isEqualTo(surroundingText.getSelectionStart());
+        assertThat(snapshot.getSurroundingText().getSelectionEnd())
+                .isEqualTo(surroundingText.getSelectionEnd());
+
+        assertThat(snapshot.getSelectionStart())
+                .isEqualTo(surroundingText.getSelectionStart() + surroundingText.getOffset());
+        assertThat(snapshot.getSelectionEnd())
+                .isEqualTo(surroundingText.getSelectionEnd() + surroundingText.getOffset());
+
+        assertThat(snapshot.getCompositionStart()).isEqualTo(compositionStart);
+        assertThat(snapshot.getCompositionEnd()).isEqualTo(compositionEnd);
+
+        assertThat(snapshot.getCursorCapsMode()).isEqualTo(cursorCapsMode);
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/AutoCloseableWrapper.java b/tests/inputmethod/src/android/view/inputmethod/cts/util/AutoCloseableWrapper.java
deleted file mode 100644
index 90dd247..0000000
--- a/tests/inputmethod/src/android/view/inputmethod/cts/util/AutoCloseableWrapper.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2021 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 android.view.inputmethod.cts.util;
-
-import androidx.annotation.AnyThread;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.Objects;
-
-/**
- * A utility class to mix-in cleanup operations into any existing class by using
- * {@link AutoCloseable} protocol.
- *
- * @param <T> Class to be cleaned up.
- */
-public final class AutoCloseableWrapper<T> implements AutoCloseable {
-
-    /**
-     * Instantiates {@link AutoCloseableWrapper} object.
-     *
-     * @param object Object that needs to be cleaned up.
-     * @param closingFunction Operation to clean up the object.
-     * @param <U> Type of the object to be cleaned up.
-     * @return {@link AutoCloseableWrapper} that wraps {@code object}.
-     */
-    @AnyThread
-    public static <U> AutoCloseableWrapper create(@Nullable U object,
-            @NonNull ClosingFunction<U> closingFunction) {
-        Objects.requireNonNull(object, "object cannot be null");
-        Objects.requireNonNull(closingFunction, "closingFunction cannot be null");
-        return new AutoCloseableWrapper<>(object, closingFunction);
-    }
-
-    /**
-     * An internal utility interface in case the closing operation throws {@link Exception}.
-     *
-     * @param <U> Class to be cleaned up.
-     */
-    @FunctionalInterface
-    public interface ClosingFunction<U> {
-        /**
-         * Perform cleanup operation.
-         *
-         * @param object Object to be cleaned up.
-         * @throws Exception For whatever reason this operations has failed.
-         */
-        void close(U object) throws Exception;
-    }
-
-    @NonNull
-    private final T mObject;
-
-    @NonNull
-    private final ClosingFunction<T> mCloser;
-
-    private AutoCloseableWrapper(@NonNull T object, @NonNull ClosingFunction<T> closer) {
-        mObject = object;
-        mCloser = closer;
-    }
-
-    /**
-     * @return The wrapped object.
-     */
-    @AnyThread
-    @NonNull
-    public T get() {
-        return mObject;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void close() throws Exception {
-        mCloser.close(mObject);
-    }
-}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/DisableScreenDozeRule.java b/tests/inputmethod/src/android/view/inputmethod/cts/util/DisableScreenDozeRule.java
deleted file mode 100644
index 206fdc8..0000000
--- a/tests/inputmethod/src/android/view/inputmethod/cts/util/DisableScreenDozeRule.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2020 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 android.view.inputmethod.cts.util;
-
-import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
-
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * {@link TestRule} class that disables screen doze settings before each test method running and
- * restoring to initial values after test method finished.
- */
-public class DisableScreenDozeRule implements TestRule {
-
-    /** Copied from ActivityManagerTestBase since these keys are hidden. */
-    private static final String[] DOZE_SETTINGS = {
-            "doze_enabled",
-            "doze_always_on",
-            "doze_pulse_on_pick_up",
-            "doze_pulse_on_long_press",
-            "doze_pulse_on_double_tap",
-            "doze_wake_screen_gesture",
-            "doze_wake_display_gesture",
-            "doze_tap_gesture"
-    };
-
-    private String getSecureSetting(String key) {
-        return runShellCommand("settings get secure " + key).trim();
-    }
-
-    private void putSecureSetting(String key, String value) {
-        runShellCommand("settings put secure " + key + " " + value);
-    }
-
-    @Override
-    public Statement apply(Statement base, Description description) {
-        return new Statement() {
-            @Override
-            public void evaluate() throws Throwable {
-                final Map<String, String> initialValues = new HashMap<>();
-                Arrays.stream(DOZE_SETTINGS).forEach(
-                        k -> initialValues.put(k, getSecureSetting(k)));
-                try {
-                    Arrays.stream(DOZE_SETTINGS).forEach(k -> putSecureSetting(k, "0"));
-                    base.evaluate();
-                } finally {
-                    Arrays.stream(DOZE_SETTINGS).forEach(
-                            k -> putSecureSetting(k, initialValues.get(k)));
-                }
-            }
-        };
-    }
-}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/EndToEndImeTestBase.java b/tests/inputmethod/src/android/view/inputmethod/cts/util/EndToEndImeTestBase.java
deleted file mode 100644
index f2a64c4..0000000
--- a/tests/inputmethod/src/android/view/inputmethod/cts/util/EndToEndImeTestBase.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (C) 2017 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 android.view.inputmethod.cts.util;
-
-import static org.junit.Assert.fail;
-import static org.junit.Assume.assumeFalse;
-import static org.junit.Assume.assumeTrue;
-
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.platform.test.annotations.AppModeFull;
-import android.platform.test.annotations.AppModeInstant;
-
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
-
-import java.lang.reflect.Method;
-
-public class EndToEndImeTestBase {
-    @Rule
-    public TestName mTestName = new TestName();
-
-    /**
-     * Our own safeguard in case "atest" command is regressed and start running tests with
-     * {@link AppModeInstant} even when {@code --instant} option is not specified.
-     *
-     * <p>Unfortunately this scenario had regressed at least 3 times.  That's why we also check
-     * this in our side.  See Bug 158617529, Bug 187211725 and Bug 187222205 for examples.</p>
-     */
-    @Before
-    public void verifyAppModeConsistency() {
-        final Class<?> thisClass = this.getClass();
-        final String testMethodName = mTestName.getMethodName();
-        final String fullTestMethodName = thisClass.getSimpleName() + "#" + testMethodName;
-
-        final Method testMethod;
-        try {
-            testMethod = thisClass.getMethod(testMethodName);
-        } catch (NoSuchMethodException e) {
-            throw new IllegalStateException("Failed to find " + fullTestMethodName, e);
-        }
-
-        final boolean hasAppModeFull = testMethod.getAnnotation(AppModeFull.class) != null;
-        final boolean hasAppModeInstant = testMethod.getAnnotation(AppModeInstant.class) != null;
-
-        if (hasAppModeFull && hasAppModeInstant) {
-            fail("Both @AppModeFull and @AppModeInstant are found in " + fullTestMethodName
-                    + ", which does not make sense. "
-                    + "Remove both to make it clear that this test is app-mode agnostic, "
-                    + "or specify one of them otherwise.");
-        }
-
-        // We want to explicitly check this condition in case tests are executed with atest
-        // command.  See Bug 158617529 for details.
-        if (hasAppModeFull) {
-            assumeFalse("This test should run under and only under the full app mode.",
-                    InstrumentationRegistry.getInstrumentation().getTargetContext()
-                            .getPackageManager().isInstantApp());
-        }
-        if (hasAppModeInstant) {
-            assumeTrue("This test should run under and only under the instant app mode.",
-                    InstrumentationRegistry.getInstrumentation().getTargetContext()
-                            .getPackageManager().isInstantApp());
-        }
-    }
-
-    @Before
-    public void showStateInitializeActivity() {
-        // TODO(b/37502066): Move this back to @BeforeClass once b/37502066 is fixed.
-        assumeTrue("MockIme cannot be used for devices that do not support installable IMEs",
-                InstrumentationRegistry.getInstrumentation().getContext().getPackageManager()
-                        .hasSystemFeature(PackageManager.FEATURE_INPUT_METHODS));
-
-        final Intent intent = new Intent()
-                .setAction(Intent.ACTION_MAIN)
-                .setClass(InstrumentationRegistry.getInstrumentation().getTargetContext(),
-                        StateInitializeActivity.class)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
-                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
-        InstrumentationRegistry.getInstrumentation().startActivitySync(intent);
-    }
-}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/InputMethodVisibilityVerifier.java b/tests/inputmethod/src/android/view/inputmethod/cts/util/InputMethodVisibilityVerifier.java
deleted file mode 100644
index c245b9a1..0000000
--- a/tests/inputmethod/src/android/view/inputmethod/cts/util/InputMethodVisibilityVerifier.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2020 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 android.view.inputmethod.cts.util;
-
-import static org.junit.Assert.assertTrue;
-
-import android.app.Instrumentation;
-import android.app.UiAutomation;
-import android.os.SystemClock;
-
-import androidx.annotation.NonNull;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import com.android.cts.mockime.Watermark;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
-
-/**
- * Provides utility methods to test whether test IMEs are visible to the user or not.
- */
-public final class InputMethodVisibilityVerifier {
-
-    private static final long SCREENSHOT_DELAY = 100;  // msec
-    private static final long SCREENSHOT_TIME_SLICE = 500;  // msec
-
-    /**
-     * Not intended to be instantiated.
-     */
-    private InputMethodVisibilityVerifier() {
-    }
-
-    @NonNull
-    private static boolean containsWatermark(@NonNull UiAutomation uiAutomation) {
-        return Watermark.detect(uiAutomation.takeScreenshot());
-    }
-
-    @NonNull
-    private static boolean notContainsWatermark(@NonNull UiAutomation uiAutomation) {
-        return !Watermark.detect(uiAutomation.takeScreenshot());
-    }
-
-    private static boolean waitUntil(long timeout, @NonNull Predicate<UiAutomation> condition) {
-        final long startTime = SystemClock.elapsedRealtime();
-        SystemClock.sleep(SCREENSHOT_DELAY);
-
-        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-
-        // Wait until the main thread becomes idle.
-        final CountDownLatch latch = new CountDownLatch(1);
-        instrumentation.waitForIdle(latch::countDown);
-        try {
-            if (!latch.await(timeout, TimeUnit.MILLISECONDS)) {
-                return false;
-            }
-        } catch (InterruptedException e) {
-        }
-
-        final UiAutomation uiAutomation = instrumentation.getUiAutomation();
-        if (condition.test(uiAutomation)) {
-            return true;
-        }
-        while ((SystemClock.elapsedRealtime() - startTime) < timeout) {
-            SystemClock.sleep(SCREENSHOT_TIME_SLICE);
-            if (condition.test(uiAutomation)) {
-                return true;
-            }
-        }
-        return condition.test(uiAutomation);
-    }
-
-    /**
-     * Asserts that {@link com.android.cts.mockime.MockIme} is visible to the user.
-     *
-     * <p>This never succeeds when
-     * {@link com.android.cts.mockime.ImeSettings.Builder#setWatermarkEnabled(boolean)} is
-     * explicitly called with {@code false}.</p>
-     *
-     * @param timeout timeout in milliseconds.
-     */
-    public static void expectImeVisible(long timeout) {
-        assertTrue(waitUntil(timeout, InputMethodVisibilityVerifier::containsWatermark));
-    }
-
-    /**
-     * Asserts that {@link com.android.cts.mockime.MockIme} is not visible to the user.
-     *
-     * <p>This always succeeds when
-     * {@link com.android.cts.mockime.ImeSettings.Builder#setWatermarkEnabled(boolean)} is
-     * explicitly called with {@code false}.</p>
-     *
-     * @param timeout timeout in milliseconds.
-     */
-    public static void expectImeInvisible(long timeout) {
-        assertTrue(waitUntil(timeout, InputMethodVisibilityVerifier::notContainsWatermark));
-    }
-}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/TestActivity.java b/tests/inputmethod/src/android/view/inputmethod/cts/util/TestActivity.java
deleted file mode 100644
index 398e7b6..0000000
--- a/tests/inputmethod/src/android/view/inputmethod/cts/util/TestActivity.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright (C) 2017 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 android.view.inputmethod.cts.util;
-
-import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.Window;
-import android.view.WindowManager;
-
-import androidx.annotation.AnyThread;
-import androidx.annotation.NonNull;
-import androidx.annotation.UiThread;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Function;
-
-public class TestActivity extends Activity {
-
-    private static final AtomicReference<Function<TestActivity, View>> sInitializer =
-            new AtomicReference<>();
-
-    private Function<TestActivity, View> mInitializer = null;
-
-    private AtomicBoolean mIgnoreBackKey = new AtomicBoolean();
-
-    private long mOnBackPressedCallCount;
-
-    /**
-     * Controls how {@link #onBackPressed()} behaves.
-     *
-     * <p>TODO: Use {@link android.app.AppComponentFactory} instead to customise the behavior of
-     * {@link TestActivity}.</p>
-     *
-     * @param ignore {@code true} when {@link TestActivity} should do nothing when
-     *               {@link #onBackPressed()} is called
-     */
-    @AnyThread
-    public void setIgnoreBackKey(boolean ignore) {
-        mIgnoreBackKey.set(ignore);
-    }
-
-    @UiThread
-    public long getOnBackPressedCallCount() {
-        return mOnBackPressedCallCount;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (mInitializer == null) {
-            mInitializer = sInitializer.get();
-        }
-        // Currently SOFT_INPUT_STATE_UNSPECIFIED isn't appropriate for CTS test because there is no
-        // clear spec about how it behaves.  In order to make our tests deterministic, currently we
-        // must use SOFT_INPUT_STATE_UNCHANGED.
-        // TODO(Bug 77152727): Remove the following code once we define how
-        // SOFT_INPUT_STATE_UNSPECIFIED actually behaves.
-        setSoftInputState(SOFT_INPUT_STATE_UNCHANGED);
-        setContentView(mInitializer.apply(this));
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void onBackPressed() {
-        ++mOnBackPressedCallCount;
-        if (mIgnoreBackKey.get()) {
-            return;
-        }
-        super.onBackPressed();
-    }
-
-    /**
-     * Launches {@link TestActivity} with the given initialization logic for content view.
-     *
-     * <p>As long as you are using {@link androidx.test.runner.AndroidJUnitRunner}, the test
-     * runner automatically calls {@link Activity#finish()} for the {@link Activity} launched when
-     * the test finished.  You do not need to explicitly call {@link Activity#finish()}.</p>
-     *
-     * @param activityInitializer initializer to supply {@link View} to be passed to
-     *                           {@link Activity#setContentView(View)}
-     * @return {@link TestActivity} launched
-     */
-    public static TestActivity startSync(
-            @NonNull Function<TestActivity, View> activityInitializer) {
-        return startSync(activityInitializer, 0 /* noAnimation */);
-    }
-
-    /**
-     * Launches {@link TestActivity} with the given initialization logic for content view.
-     *
-     * <p>As long as you are using {@link androidx.test.runner.AndroidJUnitRunner}, the test
-     * runner automatically calls {@link Activity#finish()} for the {@link Activity} launched when
-     * the test finished.  You do not need to explicitly call {@link Activity#finish()}.</p>
-     *
-     * @param activityInitializer initializer to supply {@link View} to be passed to
-     *                           {@link Activity#setContentView(View)}
-     * @param additionalFlags flags to be set to {@link Intent#setFlags(int)}
-     * @return {@link TestActivity} launched
-     */
-    public static TestActivity startSync(
-            @NonNull Function<TestActivity, View> activityInitializer,
-            int additionalFlags) {
-        sInitializer.set(activityInitializer);
-        final Intent intent = new Intent()
-                .setAction(Intent.ACTION_MAIN)
-                .setClass(InstrumentationRegistry.getInstrumentation().getContext(),
-                        TestActivity.class)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
-                .addFlags(additionalFlags);
-        return (TestActivity) InstrumentationRegistry
-                .getInstrumentation().startActivitySync(intent);
-    }
-
-    public static TestActivity startNewTaskSync(
-            @NonNull Function<TestActivity, View> activityInitializer) {
-        sInitializer.set(activityInitializer);
-        final Intent intent = new Intent()
-                .setAction(Intent.ACTION_MAIN)
-                .setClass(InstrumentationRegistry.getInstrumentation().getContext(),
-                        TestActivity.class)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
-        return (TestActivity) InstrumentationRegistry
-                .getInstrumentation().startActivitySync(intent);
-    }
-
-
-    public static TestActivity startSameTaskAndClearTopSync(
-            @NonNull Function<TestActivity, View> activityInitializer) {
-        sInitializer.set(activityInitializer);
-        final Intent intent = new Intent()
-                .setAction(Intent.ACTION_MAIN)
-                .setClass(InstrumentationRegistry.getInstrumentation().getContext(),
-                        TestActivity.class)
-                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        return (TestActivity) InstrumentationRegistry
-                .getInstrumentation().startActivitySync(intent);
-    }
-
-    /**
-     * Updates {@link WindowManager.LayoutParams#softInputMode}.
-     *
-     * @param newState One of {@link WindowManager.LayoutParams#SOFT_INPUT_STATE_UNSPECIFIED},
-     *                 {@link WindowManager.LayoutParams#SOFT_INPUT_STATE_UNCHANGED},
-     *                 {@link WindowManager.LayoutParams#SOFT_INPUT_STATE_HIDDEN},
-     *                 {@link WindowManager.LayoutParams#SOFT_INPUT_STATE_ALWAYS_HIDDEN},
-     *                 {@link WindowManager.LayoutParams#SOFT_INPUT_STATE_VISIBLE},
-     *                 {@link WindowManager.LayoutParams#SOFT_INPUT_STATE_ALWAYS_VISIBLE}
-     */
-    private void setSoftInputState(int newState) {
-        final Window window = getWindow();
-        final int currentSoftInputMode = window.getAttributes().softInputMode;
-        final int newSoftInputMode =
-                (currentSoftInputMode & ~WindowManager.LayoutParams.SOFT_INPUT_MASK_STATE)
-                        | newState;
-        window.setSoftInputMode(newSoftInputMode);
-    }
-}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/TestUtils.java b/tests/inputmethod/src/android/view/inputmethod/cts/util/TestUtils.java
deleted file mode 100644
index cc61682..0000000
--- a/tests/inputmethod/src/android/view/inputmethod/cts/util/TestUtils.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
- * Copyright (C) 2017 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 android.view.inputmethod.cts.util;
-
-import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
-import static com.android.compatibility.common.util.SystemUtil.runShellCommandOrThrow;
-import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
-
-import static org.junit.Assert.assertFalse;
-
-import android.app.Instrumentation;
-import android.app.KeyguardManager;
-import android.content.Context;
-import android.os.PowerManager;
-import android.view.KeyEvent;
-
-import androidx.annotation.NonNull;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import com.android.compatibility.common.util.CommonTestUtils;
-import com.android.compatibility.common.util.SystemUtil;
-
-import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.BooleanSupplier;
-import java.util.function.Supplier;
-
-public final class TestUtils {
-    private static final long TIME_SLICE = 100;  // msec
-
-    /**
-     * Executes a call on the application's main thread, blocking until it is complete.
-     *
-     * <p>A simple wrapper for {@link Instrumentation#runOnMainSync(Runnable)}.</p>
-     *
-     * @param task task to be called on the UI thread
-     */
-    public static void runOnMainSync(@NonNull Runnable task) {
-        InstrumentationRegistry.getInstrumentation().runOnMainSync(task);
-    }
-
-    /**
-     * Retrieves a value that needs to be obtained on the main thread.
-     *
-     * <p>A simple utility method that helps to return an object from the UI thread.</p>
-     *
-     * @param supplier callback to be called on the UI thread to return a value
-     * @param <T> Type of the value to be returned
-     * @return Value returned from {@code supplier}
-     */
-    public static <T> T getOnMainSync(@NonNull Supplier<T> supplier) {
-        final AtomicReference<T> result = new AtomicReference<>();
-        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        instrumentation.runOnMainSync(() -> result.set(supplier.get()));
-        return result.get();
-    }
-
-    /**
-     * Does polling loop on the UI thread to wait until the given condition is met.
-     *
-     * @param condition Condition to be satisfied. This is guaranteed to run on the UI thread.
-     * @param timeout timeout in millisecond
-     * @param message message to display when timeout occurs.
-     * @throws TimeoutException when the no event is matched to the given condition within
-     *                          {@code timeout}
-     */
-    public static void waitOnMainUntil(
-            @NonNull BooleanSupplier condition, long timeout, String message)
-            throws TimeoutException {
-        final AtomicBoolean result = new AtomicBoolean();
-
-        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        while (!result.get()) {
-            if (timeout < 0) {
-                throw new TimeoutException(message);
-            }
-            instrumentation.runOnMainSync(() -> {
-                if (condition.getAsBoolean()) {
-                    result.set(true);
-                }
-            });
-            try {
-                Thread.sleep(TIME_SLICE);
-            } catch (InterruptedException e) {
-                throw new IllegalStateException(e);
-            }
-            timeout -= TIME_SLICE;
-        }
-    }
-
-    /**
-     * Does polling loop on the UI thread to wait until the given condition is met.
-     *
-     * @param condition Condition to be satisfied. This is guaranteed to run on the UI thread.
-     * @param timeout timeout in millisecond
-     * @throws TimeoutException when the no event is matched to the given condition within
-     *                          {@code timeout}
-     */
-    public static void waitOnMainUntil(@NonNull BooleanSupplier condition, long timeout)
-            throws TimeoutException {
-        waitOnMainUntil(condition, timeout, "");
-    }
-
-    /**
-     * Call a command to turn screen On.
-     *
-     * This method will wait until the power state is interactive with {@link
-     * PowerManager#isInteractive()}.
-     */
-    public static void turnScreenOn() throws Exception {
-        final Context context = InstrumentationRegistry.getInstrumentation().getContext();
-        final PowerManager pm = context.getSystemService(PowerManager.class);
-        runShellCommand("input keyevent KEYCODE_WAKEUP");
-        CommonTestUtils.waitUntil("Device does not wake up after 5 seconds", 5,
-                () -> pm != null && pm.isInteractive());
-    }
-
-    /**
-     * Call a command to turn screen off.
-     *
-     * This method will wait until the power state is *NOT* interactive with
-     * {@link PowerManager#isInteractive()}.
-     * Note that {@link PowerManager#isInteractive()} may not return {@code true} when the device
-     * enables Aod mode, recommend to add (@link DisableScreenDozeRule} in the test to disable Aod
-     * for making power state reliable.
-     */
-    public static void turnScreenOff() throws Exception {
-        final Context context = InstrumentationRegistry.getInstrumentation().getContext();
-        final PowerManager pm = context.getSystemService(PowerManager.class);
-        runShellCommand("input keyevent KEYCODE_SLEEP");
-        CommonTestUtils.waitUntil("Device does not sleep after 5 seconds", 5,
-                () -> pm != null && !pm.isInteractive());
-    }
-
-    /**
-     * Simulates a {@link KeyEvent#KEYCODE_MENU} event to unlock screen.
-     *
-     * This method will retry until {@link KeyguardManager#isKeyguardLocked()} return {@code false}
-     * in given timeout.
-     *
-     * Note that {@link KeyguardManager} is not accessible in instant mode due to security concern,
-     * so this method always throw exception with instant app.
-     */
-    public static void unlockScreen() throws Exception {
-        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        final Context context = instrumentation.getContext();
-        final KeyguardManager kgm = context.getSystemService(KeyguardManager.class);
-
-        assertFalse("This method is currently not supported in instant apps.",
-                context.getPackageManager().isInstantApp());
-        CommonTestUtils.waitUntil("Device does not unlock after 3 seconds", 3,
-                () -> {
-                    SystemUtil.runWithShellPermissionIdentity(
-                            () -> instrumentation.sendKeyDownUpSync((KeyEvent.KEYCODE_MENU)));
-                    return kgm != null && !kgm.isKeyguardLocked();
-                });
-    }
-
-    /**
-     * Call a command to force stop the given application package.
-     *
-     * @param pkg The name of the package to be stopped.
-     */
-    public static void forceStopPackage(@NonNull String pkg) {
-        runWithShellPermissionIdentity(() -> {
-            runShellCommandOrThrow("am force-stop " + pkg);
-        });
-    }
-}
diff --git a/tests/inputmethod/testapp/src/android/view/inputmethod/ctstestapp/MainActivity.java b/tests/inputmethod/testapp/src/android/view/inputmethod/ctstestapp/MainActivity.java
index 207c440..3963132 100644
--- a/tests/inputmethod/testapp/src/android/view/inputmethod/ctstestapp/MainActivity.java
+++ b/tests/inputmethod/testapp/src/android/view/inputmethod/ctstestapp/MainActivity.java
@@ -77,7 +77,8 @@
             }
             return uri.getBooleanQueryParameter(key, false);
         }
-        return getIntent().getBooleanExtra(key, false);
+        return getIntent().getBooleanExtra(key, false)
+                || "true".equals(getIntent().getStringExtra(key));
     }
 
     @Override
@@ -141,7 +142,8 @@
                 }
             }
         };
-        registerReceiver(mBroadcastReceiver, new IntentFilter(ACTION_TRIGGER));
+        registerReceiver(mBroadcastReceiver, new IntentFilter(ACTION_TRIGGER),
+                Context.RECEIVER_EXPORTED);
     }
 
     @Override
diff --git a/tests/inputmethod/tests32/Android.bp b/tests/inputmethod/tests32/Android.bp
new file mode 100644
index 0000000..fa09833
--- /dev/null
+++ b/tests/inputmethod/tests32/Android.bp
@@ -0,0 +1,52 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsInputMethodTestCases32",
+    defaults: ["cts_defaults"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    compile_multilib: "both",
+    libs: ["android.test.runner"],
+    static_libs: [
+        "androidx.test.ext.junit",
+        "androidx.test.rules",
+        "androidx.test.uiautomator_uiautomator",
+        "compatibility-device-util-axt",
+        "cts-wm-util",
+        "cts-inputmethod-util",
+        "ctstestrunner-axt",
+        "CtsMockInputMethodLib",
+        "CtsMockSpellCheckerLib",
+        "CtsLegacyImeClientTestLib",
+        "testng",
+        "kotlin-test",
+    ],
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.kt",
+        "src/**/I*.aidl",
+    ],
+    aidl: {
+        local_include_dirs: ["src"],
+    },
+    sdk_version: "test_current",
+}
diff --git a/tests/inputmethod/tests32/AndroidManifest.xml b/tests/inputmethod/tests32/AndroidManifest.xml
new file mode 100644
index 0000000..3813e47
--- /dev/null
+++ b/tests/inputmethod/tests32/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.view.inputmethod.cts.sdk32">
+
+    <uses-sdk android:targetSdkVersion="32" />
+
+    <application android:label="CtsInputMethodSdk28TestCases" />
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.view.inputmethod.cts.sdk32" />
+
+</manifest>
diff --git a/tests/inputmethod/tests32/AndroidTest.xml b/tests/inputmethod/tests32/AndroidTest.xml
new file mode 100644
index 0000000..9c5b128
--- /dev/null
+++ b/tests/inputmethod/tests32/AndroidTest.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<configuration description="Config for CTS InputMethodFramework SDK 32 compatibility test cases">
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="inputmethod" />
+    <option name="config-descriptor:metadata" key="parameter" value="all_foldable_states" />
+    <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsInputMethodTestCases32.apk" />
+    </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <!--
+            MockIME always needs to be installed as a full package, even when CTS is running
+            for instant apps.
+        -->
+        <option name="force-install-mode" value="FULL"/>
+        <option name="test-file-name" value="CtsMockInputMethod.apk" />
+    </target_preparer>
+    <!--
+        TODO(yukawa): come up with a proper way to take care of devices that do not support
+        installable IMEs.  Ideally target_preparer should have an option to annotate required
+        features, e.g. android.software.input_methods so that we can conditionally install APKs
+        based on the feature supported in the target device.
+    -->
+
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="input keyevent KEYCODE_WAKEUP" />
+        <option name="run-command" value="wm dismiss-keyguard" />
+    </target_preparer>
+
+    <!--
+        A (separate) standalone test app APK is needed to test implicit app-visibility from the IME
+        process to the IME target process, because if the IME target process is directly interacting
+        with MockIme process via MockImeSession, then the system would already give the MockIme an
+        implicit app-visibility back to the test app.  To fully test app-visibility scenario,
+        MockImeSession cannot be used in the process where the focused Activity is hosted.
+    -->
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <!--
+            In order to simulate the scenario where the IME client process is normally
+            installed, explicitly set false here.  Otherwise, the test APP will be installed under
+            force-queryable mode, which makes the test useless.
+        -->
+        <option name="force-queryable" value="false" />
+        <option name="test-file-name" value="CtsInputMethodStandaloneTestApp.apk" />
+    </target_preparer>
+
+    <!-- Enabling change id ALLOW_TEST_API_ACCESS allows that package to access @TestApi methods -->
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="am compat enable ALLOW_TEST_API_ACCESS com.android.cts.mockime"  />
+        <option name="teardown-command" value="am compat reset ALLOW_TEST_API_ACCESS com.android.cts.mockime" />
+        <option name="run-command" value="am compat enable ALLOW_TEST_API_ACCESS android.view.inputmethod.ctstestapp"  />
+        <option name="teardown-command" value="am compat reset ALLOW_TEST_API_ACCESS android.view.inputmethod.ctstestapp" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest">
+        <option name="package" value="android.view.inputmethod.cts.sdk32" />
+        <option name="runtime-hint" value="1m" />
+    </test>
+</configuration>
diff --git a/tests/inputmethod/tests32/src/android/view/inputmethod/cts/sdk32/InputMethodManagerTest.kt b/tests/inputmethod/tests32/src/android/view/inputmethod/cts/sdk32/InputMethodManagerTest.kt
new file mode 100644
index 0000000..6d1907c
--- /dev/null
+++ b/tests/inputmethod/tests32/src/android/view/inputmethod/cts/sdk32/InputMethodManagerTest.kt
@@ -0,0 +1,70 @@
+/*
+ * Copyright (C) 2022 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 android.view.inputmethod.cts.sdk32
+
+import android.content.Context
+import android.view.inputmethod.InputMethodManager
+import android.view.inputmethod.cts.util.EndToEndImeTestBase
+import android.view.inputmethod.cts.util.InputMethodVisibilityVerifier.expectImeVisible
+import android.view.inputmethod.cts.util.MockTestActivityUtil
+import androidx.test.filters.MediumTest
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.runner.AndroidJUnit4
+import com.android.cts.mockime.ImeSettings
+import com.android.cts.mockime.MockImeSession
+import org.junit.Assert.assertEquals
+import org.junit.AssumptionViolatedException
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+class InputMethodManagerTest : EndToEndImeTestBase() {
+
+    val context: Context = InstrumentationRegistry.getInstrumentation().getContext()
+    val uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation()
+
+    @Test
+    fun getInputMethodWindowVisibleHeight_returnsZeroIfNotFocused() {
+        val imm = context.getSystemService(InputMethodManager::class.java)!!
+        MockImeSession.create(context, uiAutomation, ImeSettings.Builder()).use { session ->
+            MockTestActivityUtil.launchSync(false /* instant */, TIMEOUT).use {
+                session.callRequestShowSelf(0)
+                expectImeVisible(TIMEOUT)
+                assertEquals(
+                        "Only IME target UID may observe the visible height of the IME",
+                        0,
+                        imm.reflectivelyGetInputMethodWindowVisibleHeight()
+                )
+            }
+        }
+    }
+
+    fun InputMethodManager.reflectivelyGetInputMethodWindowVisibleHeight() =
+        try {
+            InputMethodManager::class.java
+                    .getMethod("getInputMethodWindowVisibleHeight")
+                    .invoke(this) as Int
+        } catch (_: NoSuchMethodError) {
+            throw AssumptionViolatedException("getInputMethodWindowVisibleHeight doesn't exist")
+        }
+
+    companion object {
+        val TIMEOUT = TimeUnit.SECONDS.toMillis(5)
+    }
+}
diff --git a/tests/inputmethod/util/Android.bp b/tests/inputmethod/util/Android.bp
new file mode 100644
index 0000000..5637f79
--- /dev/null
+++ b/tests/inputmethod/util/Android.bp
@@ -0,0 +1,44 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_library {
+    name: "cts-inputmethod-util",
+    defaults: ["cts_defaults"],
+    static_libs: [
+        "androidx.test.ext.junit",
+        "androidx.test.rules",
+        "androidx.test.uiautomator_uiautomator",
+        "compatibility-device-util-axt",
+        "cts-wm-util",
+        "ctstestrunner-axt",
+        "CtsMockInputMethodLib",
+        "CtsMockSpellCheckerLib",
+        "CtsLegacyImeClientTestLib",
+        "testng",
+        "kotlin-test",
+    ],
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.kt",
+        "src/**/I*.aidl",
+    ],
+    aidl: {
+        local_include_dirs: ["src"],
+    },
+    sdk_version: "test_current",
+}
diff --git a/tests/inputmethod/util/AndroidManifest.xml b/tests/inputmethod/util/AndroidManifest.xml
new file mode 100644
index 0000000..fecb46b
--- /dev/null
+++ b/tests/inputmethod/util/AndroidManifest.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="android.view.inputmethod.cts.util"
+     android:targetSandboxVersion="2">
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <application
+         android:multiArch="true"
+         android:supportsRtl="true">
+
+        <activity android:name="android.view.inputmethod.cts.util.TestActivity"
+            android:theme="@style/no_starting_window"
+            android:label="TestActivity"
+            android:configChanges="fontScale|smallestScreenSize|screenSize|screenLayout|orientation"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+        <activity android:name="android.view.inputmethod.cts.util.TestActivity2"
+            android:theme="@style/no_starting_window"
+            android:label="TestActivity2"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.inputmethod.cts.util.StateInitializeActivity"
+            android:theme="@style/no_starting_window"
+            android:label="StateInitializeActivity"
+            android:configChanges="fontScale"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+
+        <!-- In order to test window-focus-stealing from other process, let this service run in a
+             separate process. -->
+        <service android:name="android.view.inputmethod.cts.util.WindowFocusStealerService"
+            android:process=":focusstealer"
+            android:exported="false">
+        </service>
+
+        <service android:name="android.view.inputmethod.cts.util.WindowFocusHandleService"
+            android:exported="false">
+        </service>
+
+    </application>
+
+</manifest>
diff --git a/tests/inputmethod/res/values/styles.xml b/tests/inputmethod/util/res/values/styles.xml
similarity index 100%
rename from tests/inputmethod/res/values/styles.xml
rename to tests/inputmethod/util/res/values/styles.xml
diff --git a/tests/inputmethod/util/src/android/view/inputmethod/cts/util/AutoCloseableWrapper.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/AutoCloseableWrapper.java
new file mode 100644
index 0000000..1bd5eab
--- /dev/null
+++ b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/AutoCloseableWrapper.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2021 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 android.view.inputmethod.cts.util;
+
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.Objects;
+
+/**
+ * A utility class to mix-in cleanup operations into any existing class by using
+ * {@link AutoCloseable} protocol.
+ *
+ * @param <T> Class to be cleaned up.
+ */
+public final class AutoCloseableWrapper<T> implements AutoCloseable {
+
+    /**
+     * Instantiates {@link AutoCloseableWrapper} object.
+     *
+     * @param object Object that needs to be cleaned up.
+     * @param closingFunction Operation to clean up the object.
+     * @param <U> Type of the object to be cleaned up.
+     * @return {@link AutoCloseableWrapper} that wraps {@code object}.
+     */
+    @AnyThread
+    public static <U> AutoCloseableWrapper<U> create(@Nullable U object,
+            @NonNull ClosingFunction<U> closingFunction) {
+        Objects.requireNonNull(object, "object cannot be null");
+        Objects.requireNonNull(closingFunction, "closingFunction cannot be null");
+        return new AutoCloseableWrapper<>(object, closingFunction);
+    }
+
+    /**
+     * An internal utility interface in case the closing operation throws {@link Exception}.
+     *
+     * @param <U> Class to be cleaned up.
+     */
+    @FunctionalInterface
+    public interface ClosingFunction<U> {
+        /**
+         * Perform cleanup operation.
+         *
+         * @param object Object to be cleaned up.
+         * @throws Exception For whatever reason this operations has failed.
+         */
+        void close(U object) throws Exception;
+    }
+
+    @NonNull
+    private final T mObject;
+
+    @NonNull
+    private final ClosingFunction<T> mCloser;
+
+    private AutoCloseableWrapper(@NonNull T object, @NonNull ClosingFunction<T> closer) {
+        mObject = object;
+        mCloser = closer;
+    }
+
+    /**
+     * @return The wrapped object.
+     */
+    @AnyThread
+    @NonNull
+    public T get() {
+        return mObject;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void close() throws Exception {
+        mCloser.close(mObject);
+    }
+}
diff --git a/tests/inputmethod/util/src/android/view/inputmethod/cts/util/DisableScreenDozeRule.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/DisableScreenDozeRule.java
new file mode 100644
index 0000000..ed86d8e
--- /dev/null
+++ b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/DisableScreenDozeRule.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2020 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 android.view.inputmethod.cts.util;
+
+import static android.os.UserHandle.USER_SYSTEM;
+
+import android.content.Context;
+import android.hardware.display.AmbientDisplayConfiguration;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.rules.TestRule;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+/**
+ * {@link TestRule} class that disables screen doze settings before each test method running and
+ * restoring to initial values after test method finished.
+ */
+public class DisableScreenDozeRule implements TestRule {
+
+    private final AmbientDisplayConfiguration mConfig;
+    private final Context mContext;
+
+    public DisableScreenDozeRule() {
+        mContext = InstrumentationRegistry.getInstrumentation().getContext();
+        mConfig = new AmbientDisplayConfiguration(mContext);
+    }
+
+    @Override
+    public Statement apply(final Statement base, final Description description) {
+        return new Statement() {
+            @Override
+            public void evaluate() throws Throwable {
+                try {
+                    SystemUtil.runWithShellPermissionIdentity(() -> {
+                        // disable current doze settings
+                        mConfig.disableDozeSettings(true /* shouldDisableNonUserConfigurable */,
+                                USER_SYSTEM);
+                    });
+                    base.evaluate();
+                } finally {
+                    SystemUtil.runWithShellPermissionIdentity(() -> {
+                        // restore doze settings
+                        mConfig.restoreDozeSettings(USER_SYSTEM);
+                    });
+                }
+            }
+        };
+    }
+}
diff --git a/tests/inputmethod/util/src/android/view/inputmethod/cts/util/EndToEndImeTestBase.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/EndToEndImeTestBase.java
new file mode 100644
index 0000000..03ab576
--- /dev/null
+++ b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/EndToEndImeTestBase.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright (C) 2017 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 android.view.inputmethod.cts.util;
+
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
+import android.platform.test.annotations.AppModeFull;
+import android.platform.test.annotations.AppModeInstant;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.rules.TestName;
+
+import java.lang.reflect.Method;
+
+public class EndToEndImeTestBase {
+    @Rule
+    public TestName mTestName = new TestName();
+
+    /**
+     * Enters touch mode when instrumenting.
+     *
+     * Making the view focus state in instrumentation process more reliable in case when
+     * {@link android.view.View#clearFocus()} invoked but system may reFocus again when the view
+     * was not in touch mode. (i.e {@link android.view.View#isInTouchMode()} is {@code false}).
+     */
+    @Before
+    public final void enterTouchMode() {
+        InstrumentationRegistry.getInstrumentation().setInTouchMode(true);
+    }
+
+    /**
+     * Restore to the default touch mode state after the test.
+     */
+    @After
+    public final void restoreTouchMode() {
+        InstrumentationRegistry.getInstrumentation().resetInTouchMode();
+    }
+
+    /**
+     * Our own safeguard in case "atest" command is regressed and start running tests with
+     * {@link AppModeInstant} even when {@code --instant} option is not specified.
+     *
+     * <p>Unfortunately this scenario had regressed at least 3 times.  That's why we also check
+     * this in our side.  See Bug 158617529, Bug 187211725 and Bug 187222205 for examples.</p>
+     */
+    @Before
+    public void verifyAppModeConsistency() {
+        final Class<?> thisClass = this.getClass();
+        final String testMethodName = mTestName.getMethodName();
+        final String fullTestMethodName = thisClass.getSimpleName() + "#" + testMethodName;
+
+        final Method testMethod;
+        try {
+            testMethod = thisClass.getMethod(testMethodName);
+        } catch (NoSuchMethodException e) {
+            throw new IllegalStateException("Failed to find " + fullTestMethodName, e);
+        }
+
+        final boolean hasAppModeFull = testMethod.getAnnotation(AppModeFull.class) != null;
+        final boolean hasAppModeInstant = testMethod.getAnnotation(AppModeInstant.class) != null;
+
+        if (hasAppModeFull && hasAppModeInstant) {
+            fail("Both @AppModeFull and @AppModeInstant are found in " + fullTestMethodName
+                    + ", which does not make sense. "
+                    + "Remove both to make it clear that this test is app-mode agnostic, "
+                    + "or specify one of them otherwise.");
+        }
+
+        // We want to explicitly check this condition in case tests are executed with atest
+        // command.  See Bug 158617529 for details.
+        if (hasAppModeFull) {
+            assumeFalse("This test should run under and only under the full app mode.",
+                    InstrumentationRegistry.getInstrumentation().getTargetContext()
+                            .getPackageManager().isInstantApp());
+        }
+        if (hasAppModeInstant) {
+            assumeTrue("This test should run under and only under the instant app mode.",
+                    InstrumentationRegistry.getInstrumentation().getTargetContext()
+                            .getPackageManager().isInstantApp());
+        }
+    }
+
+    @Before
+    public void showStateInitializeActivity() {
+        // TODO(b/37502066): Move this back to @BeforeClass once b/37502066 is fixed.
+        assumeTrue("MockIme cannot be used for devices that do not support installable IMEs",
+                InstrumentationRegistry.getInstrumentation().getContext().getPackageManager()
+                        .hasSystemFeature(PackageManager.FEATURE_INPUT_METHODS));
+
+        final Intent intent = new Intent()
+                .setAction(Intent.ACTION_MAIN)
+                .setClass(InstrumentationRegistry.getInstrumentation().getTargetContext(),
+                        StateInitializeActivity.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION)
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        InstrumentationRegistry.getInstrumentation().startActivitySync(intent);
+    }
+
+    protected static boolean isPreventImeStartup() {
+        final Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        try {
+            return context.getResources().getBoolean(
+                    android.R.bool.config_preventImeStartupUnlessTextEditor);
+        } catch (Resources.NotFoundException e) {
+            // Assume this is not enabled.
+            return false;
+        }
+    }
+}
diff --git a/tests/inputmethod/util/src/android/view/inputmethod/cts/util/HandlerInputConnection.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/HandlerInputConnection.java
new file mode 100644
index 0000000..2a673ee
--- /dev/null
+++ b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/HandlerInputConnection.java
@@ -0,0 +1,195 @@
+/*
+ * Copyright (C) 2021 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 android.view.inputmethod.cts.util;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.KeyEvent;
+import android.view.inputmethod.CompletionInfo;
+import android.view.inputmethod.CorrectionInfo;
+import android.view.inputmethod.ExtractedText;
+import android.view.inputmethod.ExtractedTextRequest;
+import android.view.inputmethod.InputConnection;
+import android.view.inputmethod.InputContentInfo;
+import android.view.inputmethod.SurroundingText;
+
+import androidx.annotation.Nullable;
+
+/**
+ * A null implementation of {@link InputConnection} except for {@link InputConnection#getHandler()}.
+ *
+ * <p>This is useful when testing callbacks on {@link InputConnection} are happening on the thread
+ * specified by {@link InputConnection#getHandler()}.</p>
+ */
+public class HandlerInputConnection implements InputConnection {
+    @Nullable
+    private final Handler mHandler;
+
+    protected HandlerInputConnection(@Nullable Handler handler) {
+        mHandler = handler;
+    }
+
+    @Override
+    public CharSequence getTextBeforeCursor(int n, int flags) {
+        return null;
+    }
+
+    @Override
+    public CharSequence getTextAfterCursor(int n, int flags) {
+        return null;
+    }
+
+    @Override
+    public CharSequence getSelectedText(int flags) {
+        return null;
+    }
+
+    @Override
+    public SurroundingText getSurroundingText(int beforeLength, int afterLength, int flags) {
+        return null;
+    }
+
+    @Override
+    public int getCursorCapsMode(int reqModes) {
+        return 0;
+    }
+
+    @Override
+    public ExtractedText getExtractedText(ExtractedTextRequest request, int flags) {
+        return null;
+    }
+
+    @Override
+    public boolean deleteSurroundingText(int beforeLength, int afterLength) {
+        return false;
+    }
+
+    @Override
+    public boolean deleteSurroundingTextInCodePoints(int beforeLength, int afterLength) {
+        return false;
+    }
+
+    @Override
+    public boolean setComposingText(CharSequence text, int newCursorPosition) {
+        return false;
+    }
+
+    @Override
+    public boolean setComposingRegion(int start, int end) {
+        return false;
+    }
+
+    @Override
+    public boolean finishComposingText() {
+        return false;
+    }
+
+    @Override
+    public boolean commitText(CharSequence text, int newCursorPosition) {
+        return false;
+    }
+
+    @Override
+    public boolean commitCompletion(CompletionInfo text) {
+        return false;
+    }
+
+    @Override
+    public boolean commitCorrection(CorrectionInfo correctionInfo) {
+        return false;
+    }
+
+    @Override
+    public boolean setSelection(int start, int end) {
+        return false;
+    }
+
+    @Override
+    public boolean performEditorAction(int editorAction) {
+        return false;
+    }
+
+    @Override
+    public boolean performContextMenuAction(int id) {
+        return false;
+    }
+
+    @Override
+    public boolean beginBatchEdit() {
+        return false;
+    }
+
+    @Override
+    public boolean endBatchEdit() {
+        return false;
+    }
+
+    @Override
+    public boolean sendKeyEvent(KeyEvent event) {
+        return false;
+    }
+
+    @Override
+    public boolean clearMetaKeyStates(int states) {
+        return false;
+    }
+
+    @Override
+    public boolean reportFullscreenMode(boolean enabled) {
+        return false;
+    }
+
+    @Override
+    public boolean performSpellCheck() {
+        return false;
+    }
+
+    @Override
+    public boolean performPrivateCommand(String action, Bundle data) {
+        return false;
+    }
+
+    @Override
+    public boolean requestCursorUpdates(int cursorUpdateMode) {
+        return false;
+    }
+
+    @Override
+    public boolean requestCursorUpdates(int cursorUpdateMode, int cursorUpdateFilter) {
+        return false;
+    }
+
+    @Nullable
+    @Override
+    public Handler getHandler() {
+        return mHandler;
+    }
+
+    @Override
+    public void closeConnection() {
+    }
+
+    @Override
+    public boolean commitContent(InputContentInfo inputContentInfo, int flags, Bundle opts) {
+        return false;
+    }
+
+    @Override
+    public boolean setImeConsumesInput(boolean imeConsumesInput) {
+        return false;
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/IWindowFocusStealer.aidl b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/IWindowFocusStealer.aidl
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/IWindowFocusStealer.aidl
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/IWindowFocusStealer.aidl
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/InputConnectionTestUtils.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/InputConnectionTestUtils.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/InputConnectionTestUtils.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/InputConnectionTestUtils.java
diff --git a/tests/inputmethod/util/src/android/view/inputmethod/cts/util/InputMethodVisibilityVerifier.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/InputMethodVisibilityVerifier.java
new file mode 100644
index 0000000..c04035a
--- /dev/null
+++ b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/InputMethodVisibilityVerifier.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2020 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 android.view.inputmethod.cts.util;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.graphics.Bitmap;
+import android.os.SystemClock;
+
+import androidx.annotation.NonNull;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.cts.mockime.Watermark;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+
+/**
+ * Provides utility methods to test whether test IMEs are visible to the user or not.
+ */
+public final class InputMethodVisibilityVerifier {
+
+    private static final long SCREENSHOT_DELAY = 100;  // msec
+    private static final long SCREENSHOT_TIME_SLICE = 500;  // msec
+
+    /**
+     * Not intended to be instantiated.
+     */
+    private InputMethodVisibilityVerifier() {
+    }
+
+    @NonNull
+    private static boolean containsWatermark(@NonNull UiAutomation uiAutomation) {
+        final Bitmap screenshot = uiAutomation.takeScreenshot();
+        assertNotNull(screenshot);
+        return Watermark.detect(screenshot);
+    }
+
+    @NonNull
+    private static boolean notContainsWatermark(@NonNull UiAutomation uiAutomation) {
+        return !containsWatermark(uiAutomation);
+    }
+
+    private static boolean waitUntil(long timeout, @NonNull Predicate<UiAutomation> condition) {
+        final long startTime = SystemClock.elapsedRealtime();
+        SystemClock.sleep(SCREENSHOT_DELAY);
+
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+
+        // Wait until the main thread becomes idle.
+        final CountDownLatch latch = new CountDownLatch(1);
+        instrumentation.waitForIdle(latch::countDown);
+        try {
+            if (!latch.await(timeout, TimeUnit.MILLISECONDS)) {
+                return false;
+            }
+        } catch (InterruptedException e) {
+        }
+
+        final UiAutomation uiAutomation = instrumentation.getUiAutomation();
+        if (condition.test(uiAutomation)) {
+            return true;
+        }
+        while ((SystemClock.elapsedRealtime() - startTime) < timeout) {
+            SystemClock.sleep(SCREENSHOT_TIME_SLICE);
+            if (condition.test(uiAutomation)) {
+                return true;
+            }
+        }
+        return condition.test(uiAutomation);
+    }
+
+    /**
+     * Asserts that {@link com.android.cts.mockime.MockIme} is visible to the user.
+     *
+     * <p>This never succeeds when
+     * {@link com.android.cts.mockime.ImeSettings.Builder#setWatermarkEnabled(boolean)} is
+     * explicitly called with {@code false}.</p>
+     *
+     * @param timeout timeout in milliseconds.
+     */
+    public static void expectImeVisible(long timeout) {
+        assertTrue(waitUntil(timeout, InputMethodVisibilityVerifier::containsWatermark));
+    }
+
+    /**
+     * Asserts that {@link com.android.cts.mockime.MockIme} is not visible to the user.
+     *
+     * <p>This always succeeds when
+     * {@link com.android.cts.mockime.ImeSettings.Builder#setWatermarkEnabled(boolean)} is
+     * explicitly called with {@code false}.</p>
+     *
+     * @param timeout timeout in milliseconds.
+     */
+    public static void expectImeInvisible(long timeout) {
+        assertTrue(waitUntil(timeout, InputMethodVisibilityVerifier::notContainsWatermark));
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/LightNavigationBarVerifier.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/LightNavigationBarVerifier.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/LightNavigationBarVerifier.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/LightNavigationBarVerifier.java
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/MockTestActivityUtil.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/MockTestActivityUtil.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/MockTestActivityUtil.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/MockTestActivityUtil.java
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/NavigationBarColorVerifier.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/NavigationBarColorVerifier.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/NavigationBarColorVerifier.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/NavigationBarColorVerifier.java
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/NavigationBarInfo.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/NavigationBarInfo.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/NavigationBarInfo.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/NavigationBarInfo.java
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/RequireImeCompatFlagRule.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/RequireImeCompatFlagRule.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/RequireImeCompatFlagRule.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/RequireImeCompatFlagRule.java
diff --git a/tests/inputmethod/util/src/android/view/inputmethod/cts/util/SimulatedVirtualDisplaySession.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/SimulatedVirtualDisplaySession.java
new file mode 100644
index 0000000..84e9d18
--- /dev/null
+++ b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/SimulatedVirtualDisplaySession.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright (C) 2021 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 android.view.inputmethod.cts.util;
+
+import static android.hardware.display.DisplayManager.DISPLAY_CATEGORY_PRESENTATION;
+import static android.provider.Settings.Global.OVERLAY_DISPLAY_DEVICES;
+import static android.view.Display.FLAG_TRUSTED;
+
+import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
+
+import android.content.Context;
+import android.hardware.display.DisplayManager;
+import android.util.Size;
+import android.view.Display;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+
+import com.android.compatibility.common.util.CommonTestUtils;
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.util.StringJoiner;
+import java.util.concurrent.atomic.AtomicReference;
+
+/**
+ * A session to create/close the simulated overlay display for testing multi-display behavior.
+ */
+public final class SimulatedVirtualDisplaySession implements AutoCloseable {
+
+    private static final String OVERLAY_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS =
+            "should_show_system_decorations";
+
+    private final Display mDisplay;
+    private SimulatedVirtualDisplaySession(@NonNull Display display) {
+        mDisplay = display;
+    }
+
+    public static SimulatedVirtualDisplaySession create(@NonNull Context context,
+            int width, int height, int density, int displayImePolicy) {
+        final String displaySettingsStr = new StringJoiner(",")
+                // Display size/density configuration
+                .add(new Size(width, height) + "/" + density)
+                // Support system decoration to show IME on the simulated display by default
+                .add(OVERLAY_DISPLAY_FLAG_SHOULD_SHOW_SYSTEM_DECORATIONS)
+                .toString();
+        putGlobalSetting(OVERLAY_DISPLAY_DEVICES, displaySettingsStr);
+
+        final DisplayManager dm = context.getSystemService(DisplayManager.class);
+        final WindowManager wm = context.getSystemService(WindowManager.class);
+        AtomicReference<Display> simulatedDisplay = new AtomicReference();
+
+        try {
+            CommonTestUtils.waitUntil("No simulated display found", 5,
+                    () -> {
+                        final Display[] displays = dm.getDisplays(DISPLAY_CATEGORY_PRESENTATION);
+                        for (Display display : displays) {
+                            final boolean isTrusted =
+                                    (display.getFlags() & FLAG_TRUSTED) == FLAG_TRUSTED;
+                            if (isTrusted && display.getType() == Display.TYPE_OVERLAY) {
+                                SystemUtil.runWithShellPermissionIdentity(() -> {
+                                    wm.setDisplayImePolicy(display.getDisplayId(),
+                                            displayImePolicy);
+                                    simulatedDisplay.set(display);
+                                });
+                                return true;
+                            }
+                        }
+                        return false;
+                    });
+        } catch (AssertionError | Exception e) {
+            deleteGlobalSetting(OVERLAY_DISPLAY_DEVICES);
+            throw new RuntimeException("Exception!", e);
+        }
+        return new SimulatedVirtualDisplaySession(simulatedDisplay.get());
+    }
+
+    private static void putGlobalSetting(String key, String value) {
+        runShellCommand("settings put global " + key + " " + value);
+    }
+
+    private static void deleteGlobalSetting(String key) {
+        runShellCommand("settings delete global " + key);
+    }
+
+    public int getDisplayId() {
+        return mDisplay.getDisplayId();
+    }
+
+    @Override
+    public void close() throws Exception {
+        deleteGlobalSetting(OVERLAY_DISPLAY_DEVICES);
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/StateInitializeActivity.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/StateInitializeActivity.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/StateInitializeActivity.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/StateInitializeActivity.java
diff --git a/tests/inputmethod/util/src/android/view/inputmethod/cts/util/TestActivity.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/TestActivity.java
new file mode 100644
index 0000000..66ef1e2
--- /dev/null
+++ b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/TestActivity.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright (C) 2017 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 android.view.inputmethod.cts.util;
+
+import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;
+import static android.view.WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+import static android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_UNCHANGED;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.PixelFormat;
+import android.os.Bundle;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.widget.TextView;
+
+import androidx.annotation.AnyThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.UiThread;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Function;
+
+public class TestActivity extends Activity {
+
+    public static final String OVERLAY_WINDOW_NAME = "TestActivity.APP_OVERLAY_WINDOW";
+    private static final AtomicReference<Function<TestActivity, View>> sInitializer =
+            new AtomicReference<>();
+
+    private Function<TestActivity, View> mInitializer = null;
+
+    private AtomicBoolean mIgnoreBackKey = new AtomicBoolean();
+
+    private long mOnBackPressedCallCount;
+
+    private TextView mOverlayView;
+
+    /**
+     * Controls how {@link #onBackPressed()} behaves.
+     *
+     * <p>TODO: Use {@link android.app.AppComponentFactory} instead to customise the behavior of
+     * {@link TestActivity}.</p>
+     *
+     * @param ignore {@code true} when {@link TestActivity} should do nothing when
+     *               {@link #onBackPressed()} is called
+     */
+    @AnyThread
+    public void setIgnoreBackKey(boolean ignore) {
+        mIgnoreBackKey.set(ignore);
+    }
+
+    @UiThread
+    public long getOnBackPressedCallCount() {
+        return mOnBackPressedCallCount;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        if (mInitializer == null) {
+            mInitializer = sInitializer.get();
+        }
+        // Currently SOFT_INPUT_STATE_UNSPECIFIED isn't appropriate for CTS test because there is no
+        // clear spec about how it behaves.  In order to make our tests deterministic, currently we
+        // must use SOFT_INPUT_STATE_UNCHANGED.
+        // TODO(Bug 77152727): Remove the following code once we define how
+        // SOFT_INPUT_STATE_UNSPECIFIED actually behaves.
+        setSoftInputState(SOFT_INPUT_STATE_UNCHANGED);
+        setContentView(mInitializer.apply(this));
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        if (mOverlayView != null) {
+            mOverlayView.getContext()
+                    .getSystemService(WindowManager.class).removeView(mOverlayView);
+            mOverlayView = null;
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onBackPressed() {
+        ++mOnBackPressedCallCount;
+        if (mIgnoreBackKey.get()) {
+            return;
+        }
+        super.onBackPressed();
+    }
+
+    public void showOverlayWindow() {
+        if (mOverlayView != null) {
+            throw new IllegalStateException("can only show one overlay at a time.");
+        }
+        Context overlayContext = getApplicationContext().createWindowContext(getDisplay(),
+                TYPE_APPLICATION_OVERLAY, null);
+        mOverlayView = new TextView(overlayContext);
+        WindowManager.LayoutParams params =
+                new WindowManager.LayoutParams(MATCH_PARENT, MATCH_PARENT,
+                        TYPE_APPLICATION_OVERLAY, FLAG_NOT_FOCUSABLE, PixelFormat.TRANSLUCENT);
+        params.setTitle(OVERLAY_WINDOW_NAME);
+        mOverlayView.setLayoutParams(params);
+        mOverlayView.setText("IME CTS TestActivity OverlayView");
+        mOverlayView.setBackgroundColor(0x77FFFF00);
+        overlayContext.getSystemService(WindowManager.class).addView(mOverlayView, params);
+    }
+
+    /**
+     * Launches {@link TestActivity} with the given initialization logic for content view.
+     *
+     * <p>As long as you are using {@link androidx.test.runner.AndroidJUnitRunner}, the test
+     * runner automatically calls {@link Activity#finish()} for the {@link Activity} launched when
+     * the test finished.  You do not need to explicitly call {@link Activity#finish()}.</p>
+     *
+     * @param activityInitializer initializer to supply {@link View} to be passed to
+     *                           {@link Activity#setContentView(View)}
+     * @return {@link TestActivity} launched
+     */
+    public static TestActivity startSync(
+            @NonNull Function<TestActivity, View> activityInitializer) {
+        return startSync(activityInitializer, 0 /* noAnimation */);
+    }
+
+    /**
+     * Similar to {@link TestActivity#startSync(Function)}, but with the given display ID to
+     * specify the launching target display.
+     * @param displayId The ID of the display
+     * @param activityInitializer initializer to supply {@link View} to be passed to
+     *                            {@link Activity#setContentView(View)}
+     * @return {@link TestActivity} launched
+     */
+    public static TestActivity startSync(int displayId,
+            @NonNull Function<TestActivity, View> activityInitializer) throws Exception {
+        sInitializer.set(activityInitializer);
+        final ActivityOptions options = ActivityOptions.makeBasic();
+        options.setLaunchDisplayId(displayId);
+        final Intent intent = new Intent()
+                .setAction(Intent.ACTION_MAIN)
+                .setClass(InstrumentationRegistry.getInstrumentation().getContext(),
+                        TestActivity.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        return SystemUtil.callWithShellPermissionIdentity(
+                () -> (TestActivity) InstrumentationRegistry.getInstrumentation().startActivitySync(
+                        intent, options.toBundle()));
+    }
+
+    /**
+     * Launches {@link TestActivity} with the given initialization logic for content view.
+     *
+     * <p>As long as you are using {@link androidx.test.runner.AndroidJUnitRunner}, the test
+     * runner automatically calls {@link Activity#finish()} for the {@link Activity} launched when
+     * the test finished.  You do not need to explicitly call {@link Activity#finish()}.</p>
+     *
+     * @param activityInitializer initializer to supply {@link View} to be passed to
+     *                           {@link Activity#setContentView(View)}
+     * @param additionalFlags flags to be set to {@link Intent#setFlags(int)}
+     * @return {@link TestActivity} launched
+     */
+    public static TestActivity startSync(
+            @NonNull Function<TestActivity, View> activityInitializer,
+            int additionalFlags) {
+        sInitializer.set(activityInitializer);
+        final Intent intent = new Intent()
+                .setAction(Intent.ACTION_MAIN)
+                .setClass(InstrumentationRegistry.getInstrumentation().getContext(),
+                        TestActivity.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+                .addFlags(additionalFlags);
+        return (TestActivity) InstrumentationRegistry
+                .getInstrumentation().startActivitySync(intent);
+    }
+
+    public static TestActivity startNewTaskSync(
+            @NonNull Function<TestActivity, View> activityInitializer) {
+        sInitializer.set(activityInitializer);
+        final Intent intent = new Intent()
+                .setAction(Intent.ACTION_MAIN)
+                .setClass(InstrumentationRegistry.getInstrumentation().getContext(),
+                        TestActivity.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
+        return (TestActivity) InstrumentationRegistry
+                .getInstrumentation().startActivitySync(intent);
+    }
+
+
+    public static TestActivity startSameTaskAndClearTopSync(
+            @NonNull Function<TestActivity, View> activityInitializer) {
+        sInitializer.set(activityInitializer);
+        final Intent intent = new Intent()
+                .setAction(Intent.ACTION_MAIN)
+                .setClass(InstrumentationRegistry.getInstrumentation().getContext(),
+                        TestActivity.class)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        return (TestActivity) InstrumentationRegistry
+                .getInstrumentation().startActivitySync(intent);
+    }
+
+    /**
+     * Updates {@link WindowManager.LayoutParams#softInputMode}.
+     *
+     * @param newState One of {@link WindowManager.LayoutParams#SOFT_INPUT_STATE_UNSPECIFIED},
+     *                 {@link WindowManager.LayoutParams#SOFT_INPUT_STATE_UNCHANGED},
+     *                 {@link WindowManager.LayoutParams#SOFT_INPUT_STATE_HIDDEN},
+     *                 {@link WindowManager.LayoutParams#SOFT_INPUT_STATE_ALWAYS_HIDDEN},
+     *                 {@link WindowManager.LayoutParams#SOFT_INPUT_STATE_VISIBLE},
+     *                 {@link WindowManager.LayoutParams#SOFT_INPUT_STATE_ALWAYS_VISIBLE}
+     */
+    private void setSoftInputState(int newState) {
+        final Window window = getWindow();
+        final int currentSoftInputMode = window.getAttributes().softInputMode;
+        final int newSoftInputMode =
+                (currentSoftInputMode & ~WindowManager.LayoutParams.SOFT_INPUT_MASK_STATE)
+                        | newState;
+        window.setSoftInputMode(newSoftInputMode);
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/TestActivity2.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/TestActivity2.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/TestActivity2.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/TestActivity2.java
diff --git a/tests/inputmethod/util/src/android/view/inputmethod/cts/util/TestUtils.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/TestUtils.java
new file mode 100644
index 0000000..317bd6c
--- /dev/null
+++ b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/TestUtils.java
@@ -0,0 +1,394 @@
+/*
+ * Copyright (C) 2017 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 android.view.inputmethod.cts.util;
+
+import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
+import static com.android.compatibility.common.util.SystemUtil.runShellCommandOrThrow;
+import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
+
+import static org.junit.Assert.assertFalse;
+
+import android.app.Instrumentation;
+import android.app.KeyguardManager;
+import android.content.Context;
+import android.os.PowerManager;
+import android.os.SystemClock;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewConfiguration;
+
+import androidx.annotation.NonNull;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.CommonTestUtils;
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BooleanSupplier;
+import java.util.function.Supplier;
+
+public final class TestUtils {
+    private static final long TIME_SLICE = 100;  // msec
+    /**
+     * Executes a call on the application's main thread, blocking until it is complete.
+     *
+     * <p>A simple wrapper for {@link Instrumentation#runOnMainSync(Runnable)}.</p>
+     *
+     * @param task task to be called on the UI thread
+     */
+    public static void runOnMainSync(@NonNull Runnable task) {
+        InstrumentationRegistry.getInstrumentation().runOnMainSync(task);
+    }
+
+    /**
+     * Retrieves a value that needs to be obtained on the main thread.
+     *
+     * <p>A simple utility method that helps to return an object from the UI thread.</p>
+     *
+     * @param supplier callback to be called on the UI thread to return a value
+     * @param <T> Type of the value to be returned
+     * @return Value returned from {@code supplier}
+     */
+    public static <T> T getOnMainSync(@NonNull Supplier<T> supplier) {
+        final AtomicReference<T> result = new AtomicReference<>();
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        instrumentation.runOnMainSync(() -> result.set(supplier.get()));
+        return result.get();
+    }
+
+    /**
+     * Does polling loop on the UI thread to wait until the given condition is met.
+     *
+     * @param condition Condition to be satisfied. This is guaranteed to run on the UI thread.
+     * @param timeout timeout in millisecond
+     * @param message message to display when timeout occurs.
+     * @throws TimeoutException when the no event is matched to the given condition within
+     *                          {@code timeout}
+     */
+    public static void waitOnMainUntil(
+            @NonNull BooleanSupplier condition, long timeout, String message)
+            throws TimeoutException {
+        final AtomicBoolean result = new AtomicBoolean();
+
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        while (!result.get()) {
+            if (timeout < 0) {
+                throw new TimeoutException(message);
+            }
+            instrumentation.runOnMainSync(() -> {
+                if (condition.getAsBoolean()) {
+                    result.set(true);
+                }
+            });
+            try {
+                Thread.sleep(TIME_SLICE);
+            } catch (InterruptedException e) {
+                throw new IllegalStateException(e);
+            }
+            timeout -= TIME_SLICE;
+        }
+    }
+
+    /**
+     * Does polling loop on the UI thread to wait until the given condition is met.
+     *
+     * @param condition Condition to be satisfied. This is guaranteed to run on the UI thread.
+     * @param timeout timeout in millisecond
+     * @throws TimeoutException when the no event is matched to the given condition within
+     *                          {@code timeout}
+     */
+    public static void waitOnMainUntil(@NonNull BooleanSupplier condition, long timeout)
+            throws TimeoutException {
+        waitOnMainUntil(condition, timeout, "");
+    }
+
+    /**
+     * Call a command to turn screen On.
+     *
+     * This method will wait until the power state is interactive with {@link
+     * PowerManager#isInteractive()}.
+     */
+    public static void turnScreenOn() throws Exception {
+        final Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        final PowerManager pm = context.getSystemService(PowerManager.class);
+        runShellCommand("input keyevent KEYCODE_WAKEUP");
+        CommonTestUtils.waitUntil("Device does not wake up after 5 seconds", 5,
+                () -> pm != null && pm.isInteractive());
+    }
+
+    /**
+     * Call a command to turn screen off.
+     *
+     * This method will wait until the power state is *NOT* interactive with
+     * {@link PowerManager#isInteractive()}.
+     * Note that {@link PowerManager#isInteractive()} may not return {@code true} when the device
+     * enables Aod mode, recommend to add (@link DisableScreenDozeRule} in the test to disable Aod
+     * for making power state reliable.
+     */
+    public static void turnScreenOff() throws Exception {
+        final Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        final PowerManager pm = context.getSystemService(PowerManager.class);
+        runShellCommand("input keyevent KEYCODE_SLEEP");
+        CommonTestUtils.waitUntil("Device does not sleep after 5 seconds", 5,
+                () -> pm != null && !pm.isInteractive());
+    }
+
+    /**
+     * Simulates a {@link KeyEvent#KEYCODE_MENU} event to unlock screen.
+     *
+     * This method will retry until {@link KeyguardManager#isKeyguardLocked()} return {@code false}
+     * in given timeout.
+     *
+     * Note that {@link KeyguardManager} is not accessible in instant mode due to security concern,
+     * so this method always throw exception with instant app.
+     */
+    public static void unlockScreen() throws Exception {
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        final Context context = instrumentation.getContext();
+        final KeyguardManager kgm = context.getSystemService(KeyguardManager.class);
+
+        assertFalse("This method is currently not supported in instant apps.",
+                context.getPackageManager().isInstantApp());
+        CommonTestUtils.waitUntil("Device does not unlock after 3 seconds", 3,
+                () -> {
+                    SystemUtil.runWithShellPermissionIdentity(
+                            () -> instrumentation.sendKeyDownUpSync((KeyEvent.KEYCODE_MENU)));
+                    return kgm != null && !kgm.isKeyguardLocked();
+                });
+    }
+
+    /**
+     * Call a command to force stop the given application package.
+     *
+     * @param pkg The name of the package to be stopped.
+     */
+    public static void forceStopPackage(@NonNull String pkg) {
+        runWithShellPermissionIdentity(() -> {
+            runShellCommandOrThrow("am force-stop " + pkg);
+        });
+    }
+
+
+    /**
+     * Inject Stylus move on the Display inside view coordinates so that initiation can happen.
+     * @param view view on which stylus events should be overlapped.
+     */
+    public static void injectStylusEvents(@NonNull View view) {
+        int offsetX = view.getWidth() / 2;
+        int offsetY = view.getHeight() / 2;
+        injectStylusEvents(view, offsetX, offsetY);
+    }
+
+    /**
+     * Inject a stylus ACTION_DOWN event to the screen using given view's coordinates.
+     * @param view  view whose coordinates are used to compute the event location.
+     * @param x the x coordinates of the stylus event in the view's location coordinates.
+     * @param y the y coordinates of the stylus event in the view's location coordinates.
+     * @return the injected MotionEvent.
+     */
+    public static MotionEvent injectStylusDownEvent(@NonNull View view, int x, int y) {
+        int[] xy = new int[2];
+        view.getLocationOnScreen(xy);
+        x += xy[0];
+        y += xy[1];
+
+        // Inject stylus ACTION_DOWN
+        long downTime = SystemClock.uptimeMillis();
+        final MotionEvent downEvent =
+                getMotionEvent(downTime, downTime, MotionEvent.ACTION_DOWN, x, y);
+        injectMotionEvent(downEvent, true /* sync */);
+        return downEvent;
+    }
+
+    /**
+     * Inject a stylus ACTION_UP event to the screen using given view's coordinates.
+     * @param view  view whose coordinates are used to compute the event location.
+     * @param x the x coordinates of the stylus event in the view's location coordinates.
+     * @param y the y coordinates of the stylus event in the view's location coordinates.
+     * @return the injected MotionEvent.
+     */
+    public static MotionEvent injectStylusUpEvent(@NonNull View view, int x, int y) {
+        int[] xy = new int[2];
+        view.getLocationOnScreen(xy);
+        x += xy[0];
+        y += xy[1];
+
+        // Inject stylus ACTION_DOWN
+        long downTime = SystemClock.uptimeMillis();
+        final MotionEvent upEvent = getMotionEvent(downTime, downTime, MotionEvent.ACTION_UP, x, y);
+        injectMotionEvent(upEvent, true /* sync */);
+        return upEvent;
+    }
+
+    /**
+     * Inject Stylus ACTION_MOVE events to the screen using the given view's coordinates.
+     *
+     * @param view  view whose coordinates are used to compute the event location.
+     * @param startX the start x coordinates of the stylus event in the view's local coordinates.
+     * @param startY the start y coordinates of the stylus event in the view's local coordinates.
+     * @param endX the end x coordinates of the stylus event in the view's local coordinates.
+     * @param endY the end y coordinates of the stylus event in the view's local coordinates.
+     * @param number the number of the motion events injected to the view.
+     * @return the injected MotionEvents.
+     */
+    public static List<MotionEvent> injectStylusMoveEvents(@NonNull View view, int startX,
+            int startY, int endX, int endY, int number) {
+        int[] xy = new int[2];
+        view.getLocationOnScreen(xy);
+
+        final float incrementX = ((float) (endX - startX)) / (number - 1);
+        final float incrementY = ((float) (endY - startY)) / (number - 1);
+
+        final List<MotionEvent> injectedEvents = new ArrayList<>(number);
+        // Inject stylus ACTION_MOVE
+        for (int i = 0; i < number; i++) {
+            long time = SystemClock.uptimeMillis();
+            float x = startX + incrementX * i;
+            float y = startY + incrementY * i;
+            final MotionEvent moveEvent =
+                    getMotionEvent(time, time, MotionEvent.ACTION_MOVE, x, y);
+            injectMotionEvent(moveEvent, true /* sync */);
+            injectedEvents.add(moveEvent);
+        }
+        return injectedEvents;
+    }
+
+    /**
+     * Inject stylus move on the display at the given position defined in the given view's
+     * coordinates.
+     *
+     * @param view view whose coordinates are used to compute the event location.
+     * @param x the initial x coordinates of the injected stylus events in the view's
+     *          local coordinates.
+     * @param y the initial y coordinates of the injected stylus events in the view's
+     *          local coordinates.
+     */
+    public static void injectStylusEvents(@NonNull View view, int x, int y) {
+        injectStylusDownEvent(view, x, y);
+        // Larger than the touchSlop.
+        int endX = x + getTouchSlop(view.getContext()) * 5;
+        injectStylusMoveEvents(view, x, y, endX, y, 10);
+        injectStylusUpEvent(view, endX, y);
+
+    }
+
+    private static MotionEvent getMotionEvent(long downTime, long eventTime, int action,
+            float x, float y) {
+        return getMotionEvent(downTime, eventTime, action, (int) x, (int) y, 0);
+    }
+
+    private static MotionEvent getMotionEvent(long downTime, long eventTime, int action,
+            int x, int y, int displayId) {
+        // Stylus related properties.
+        MotionEvent.PointerProperties[] properties =
+                new MotionEvent.PointerProperties[] { new MotionEvent.PointerProperties() };
+        properties[0].toolType = MotionEvent.TOOL_TYPE_STYLUS;
+        properties[0].id = 1;
+        MotionEvent.PointerCoords[] coords =
+                new MotionEvent.PointerCoords[] { new MotionEvent.PointerCoords() };
+        coords[0].x = x;
+        coords[0].y = y;
+        coords[0].pressure = 1;
+
+        final MotionEvent event = MotionEvent.obtain(downTime, eventTime, action,
+                1 /* pointerCount */, properties, coords, 0 /* metaState */,
+                0 /* buttonState */, 1 /* xPrecision */, 1 /* yPrecision */, 0 /* deviceId */,
+                0 /* edgeFlags */, InputDevice.SOURCE_STYLUS, 0 /* flags */);
+        event.setDisplayId(displayId);
+        return event;
+    }
+
+    private static void injectMotionEvent(MotionEvent event, boolean sync) {
+        InstrumentationRegistry.getInstrumentation().getUiAutomation().injectInputEvent(
+                event, sync, false /* waitAnimations */);
+    }
+
+    public static void injectAll(List<MotionEvent> events) {
+        for (MotionEvent event : events) {
+            injectMotionEvent(event, true /* sync */);
+        }
+        InstrumentationRegistry.getInstrumentation().getUiAutomation().syncInputTransactions(false);
+    }
+    private static int getTouchSlop(Context context) {
+        return ViewConfiguration.get(context).getScaledTouchSlop();
+    }
+
+    /**
+     * Since MotionEvents are batched together based on overall system timings (i.e. vsync), we
+     * can't rely on them always showing up batched in the same way. In order to make sure our
+     * test results are consistent, we instead split up the batches so they end up in a
+     * consistent and reproducible stream.
+     *
+     * Note, however, that this ignores the problem of resampling, as we still don't know how to
+     * distinguish resampled events from real events. Only the latter will be consistent and
+     * reproducible.
+     *
+     * @param event The (potentially) batched MotionEvent
+     * @return List of MotionEvents, with each event guaranteed to have zero history size, and
+     * should otherwise be equivalent to the original batch MotionEvent.
+     */
+    public static List<MotionEvent> splitBatchedMotionEvent(MotionEvent event) {
+        final List<MotionEvent> events = new ArrayList<>();
+        final int historySize = event.getHistorySize();
+        final int pointerCount = event.getPointerCount();
+        final MotionEvent.PointerProperties[] properties =
+                new MotionEvent.PointerProperties[pointerCount];
+        final MotionEvent.PointerCoords[] currentCoords =
+                new MotionEvent.PointerCoords[pointerCount];
+        for (int p = 0; p < pointerCount; p++) {
+            properties[p] = new MotionEvent.PointerProperties();
+            event.getPointerProperties(p, properties[p]);
+            currentCoords[p] = new MotionEvent.PointerCoords();
+            event.getPointerCoords(p, currentCoords[p]);
+        }
+        for (int h = 0; h < historySize; h++) {
+            final long eventTime = event.getHistoricalEventTime(h);
+            MotionEvent.PointerCoords[] coords = new MotionEvent.PointerCoords[pointerCount];
+
+            for (int p = 0; p < pointerCount; p++) {
+                coords[p] = new MotionEvent.PointerCoords();
+                event.getHistoricalPointerCoords(p, h, coords[p]);
+            }
+            final MotionEvent singleEvent =
+                    MotionEvent.obtain(event.getDownTime(), eventTime, event.getAction(),
+                            pointerCount, properties, coords,
+                            event.getMetaState(), event.getButtonState(),
+                            event.getXPrecision(), event.getYPrecision(),
+                            event.getDeviceId(), event.getEdgeFlags(),
+                            event.getSource(), event.getFlags());
+            singleEvent.setActionButton(event.getActionButton());
+            events.add(singleEvent);
+        }
+
+        final MotionEvent singleEvent =
+                MotionEvent.obtain(event.getDownTime(), event.getEventTime(), event.getAction(),
+                        pointerCount, properties, currentCoords,
+                        event.getMetaState(), event.getButtonState(),
+                        event.getXPrecision(), event.getYPrecision(),
+                        event.getDeviceId(), event.getEdgeFlags(),
+                        event.getSource(), event.getFlags());
+        singleEvent.setActionButton(event.getActionButton());
+        events.add(singleEvent);
+        return events;
+    }
+}
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/TestWebView.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/TestWebView.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/TestWebView.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/TestWebView.java
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/UnlockScreenRule.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/UnlockScreenRule.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/UnlockScreenRule.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/UnlockScreenRule.java
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/WindowFocusHandleService.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/WindowFocusHandleService.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/WindowFocusHandleService.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/WindowFocusHandleService.java
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/WindowFocusStealer.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/WindowFocusStealer.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/WindowFocusStealer.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/WindowFocusStealer.java
diff --git a/tests/inputmethod/src/android/view/inputmethod/cts/util/WindowFocusStealerService.java b/tests/inputmethod/util/src/android/view/inputmethod/cts/util/WindowFocusStealerService.java
similarity index 100%
rename from tests/inputmethod/src/android/view/inputmethod/cts/util/WindowFocusStealerService.java
rename to tests/inputmethod/util/src/android/view/inputmethod/cts/util/WindowFocusStealerService.java
diff --git a/tests/leanbackjank/app/src/android/leanbackjank/app/Utils.java b/tests/leanbackjank/app/src/android/leanbackjank/app/Utils.java
deleted file mode 100644
index 1926c0d..0000000
--- a/tests/leanbackjank/app/src/android/leanbackjank/app/Utils.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2015 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 android.leanbackjank.app;
-
-import com.android.compatibility.common.util.ApiLevelUtil;
-
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Point;
-import android.media.MediaMetadataRetriever;
-import android.os.Build;
-import android.util.DisplayMetrics;
-import android.view.Display;
-import android.view.WindowManager;
-import android.widget.FrameLayout;
-import android.widget.Toast;
-import android.widget.VideoView;
-
-import java.util.HashMap;
-
-/**
- * A collection of utility methods, all static.
- */
-public class Utils {
-
-    public interface MediaDimensions {
-        double MEDIA_HEIGHT = 0.95;
-        double MEDIA_WIDTH = 0.95;
-        double MEDIA_TOP_MARGIN = 0.025;
-        double MEDIA_RIGHT_MARGIN = 0.025;
-        double MEDIA_BOTTOM_MARGIN = 0.025;
-        double MEDIA_LEFT_MARGIN = 0.025;
-    }
-
-    /*
-     * Making sure public utility methods remain static
-     */
-    private Utils() {
-    }
-
-    /**
-     * Returns the screen/display size
-     */
-    public static Point getDisplaySize(Context context) {
-        WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        Display display = wm.getDefaultDisplay();
-        Point size = new Point();
-        display.getSize(size);
-        return size;
-    }
-
-    /**
-     * Shows a (long) toast
-     */
-    public static void showToast(Context context, String msg) {
-        Toast.makeText(context, msg, Toast.LENGTH_LONG).show();
-    }
-
-    /**
-     * Shows a (long) toast.
-     */
-    public static void showToast(Context context, int resourceId) {
-        Toast.makeText(context, context.getString(resourceId), Toast.LENGTH_LONG).show();
-    }
-
-    public static int convertDpToPixel(Context ctx, int dp) {
-        float density = ctx.getResources().getDisplayMetrics().density;
-        return Math.round((float) dp * density);
-    }
-
-
-    /**
-     * Example for handling resizing content for overscan.  Typically you won't need to resize
-     * when using the Leanback support library.
-     */
-    public void overScan(Activity activity, VideoView videoView) {
-        DisplayMetrics metrics = new DisplayMetrics();
-        activity.getWindowManager().getDefaultDisplay().getMetrics(metrics);
-        int w = (int) (metrics.widthPixels * MediaDimensions.MEDIA_WIDTH);
-        int h = (int) (metrics.heightPixels * MediaDimensions.MEDIA_HEIGHT);
-        int marginLeft = (int) (metrics.widthPixels * MediaDimensions.MEDIA_LEFT_MARGIN);
-        int marginTop = (int) (metrics.heightPixels * MediaDimensions.MEDIA_TOP_MARGIN);
-        int marginRight = (int) (metrics.widthPixels * MediaDimensions.MEDIA_RIGHT_MARGIN);
-        int marginBottom = (int) (metrics.heightPixels * MediaDimensions.MEDIA_BOTTOM_MARGIN);
-        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(w, h);
-        lp.setMargins(marginLeft, marginTop, marginRight, marginBottom);
-        videoView.setLayoutParams(lp);
-    }
-
-
-    public static long getDuration(String videoUrl) {
-        MediaMetadataRetriever mmr = new MediaMetadataRetriever();
-        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.ICE_CREAM_SANDWICH)) {
-            mmr.setDataSource(videoUrl, new HashMap<String, String>());
-        } else {
-            mmr.setDataSource(videoUrl);
-        }
-        return Long.parseLong(mmr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION));
-    }
-}
diff --git a/tests/libcore/jsr166/Android.bp b/tests/libcore/jsr166/Android.bp
index 1addbfd..5a84d94 100644
--- a/tests/libcore/jsr166/Android.bp
+++ b/tests/libcore/jsr166/Android.bp
@@ -33,6 +33,8 @@
     optimize: {
         enabled: false,
     },
+    min_sdk_version: "31",
+    target_sdk_version: "31",
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
diff --git a/tests/libcore/luni/Android.bp b/tests/libcore/luni/Android.bp
index 78ea004..9046641 100644
--- a/tests/libcore/luni/Android.bp
+++ b/tests/libcore/luni/Android.bp
@@ -53,6 +53,8 @@
     compile_multilib: "both",
     // This test requires cts-dalvik-host-test-runner to be built to run via Atest.
     host_required: ["cts-dalvik-host-test-runner"],
+    min_sdk_version: "31",
+    target_sdk_version: "31",
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
diff --git a/tests/libcore/ojluni/Android.bp b/tests/libcore/ojluni/Android.bp
index 1276621..5a9691b 100644
--- a/tests/libcore/ojluni/Android.bp
+++ b/tests/libcore/ojluni/Android.bp
@@ -37,6 +37,8 @@
     // Include both the 32 and 64 bit versions of libjavacoretests,
     // where applicable.
     compile_multilib: "both",
+    min_sdk_version: "31",
+    target_sdk_version: "31",
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
diff --git a/tests/libcore/runner/Android.bp b/tests/libcore/runner/Android.bp
index 4e0742f..12d3496 100644
--- a/tests/libcore/runner/Android.bp
+++ b/tests/libcore/runner/Android.bp
@@ -27,6 +27,8 @@
     optimize: {
         enabled: false,
     },
+    min_sdk_version: "31",
+    target_sdk_version: "31",
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
diff --git a/tests/libcore/wycheproof-bc/Android.bp b/tests/libcore/wycheproof-bc/Android.bp
index 9f31747..c2c58dd 100644
--- a/tests/libcore/wycheproof-bc/Android.bp
+++ b/tests/libcore/wycheproof-bc/Android.bp
@@ -39,6 +39,8 @@
     // Include both the 32 and 64 bit versions of libjavacoretests,
     // where applicable.
     compile_multilib: "both",
+    min_sdk_version: "31",
+    target_sdk_version: "31",
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
diff --git a/tests/location/common/src/android/location/cts/common/BroadcastCapture.java b/tests/location/common/src/android/location/cts/common/BroadcastCapture.java
index f2ea3ae..6ea51f7 100644
--- a/tests/location/common/src/android/location/cts/common/BroadcastCapture.java
+++ b/tests/location/common/src/android/location/cts/common/BroadcastCapture.java
@@ -41,7 +41,8 @@
     }
 
     protected void register(String action) {
-        mContext.registerReceiver(this, new IntentFilter(action));
+        mContext.registerReceiver(this, new IntentFilter(action),
+                Context.RECEIVER_EXPORTED_UNAUDITED);
     }
 
     public Intent getNextIntent(long timeoutMs) throws InterruptedException {
diff --git a/tests/location/common/src/android/location/cts/common/TestGnssStatusCallback.java b/tests/location/common/src/android/location/cts/common/TestGnssStatusCallback.java
new file mode 100644
index 0000000..906a502
--- /dev/null
+++ b/tests/location/common/src/android/location/cts/common/TestGnssStatusCallback.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2022 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 android.location.cts.common;
+
+import android.location.GnssStatus;
+import android.util.Log;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * Used for receiving notifications when GNSS status has changed.
+ */
+public class TestGnssStatusCallback extends GnssStatus.Callback {
+
+    private final String mTag;
+    private GnssStatus mGnssStatus = null;
+    // Timeout in sec for count down latch wait
+    private static final int TIMEOUT_IN_SEC = 90;
+    private final CountDownLatch mLatchStart;
+    private final CountDownLatch mLatchStatus;
+    private final CountDownLatch mLatchTtff;
+    private final CountDownLatch mLatchStop;
+
+    // Store list of Satellites including Gnss Band, constellation & SvId
+    private Set<String> mGnssUsedSvStringIds;
+
+    private final Set<Float> mCarrierFrequencies;
+
+    public TestGnssStatusCallback(String tag, int gpsStatusCountToCollect) {
+        this.mTag = tag;
+        mLatchStart = new CountDownLatch(1);
+        mLatchStatus = new CountDownLatch(gpsStatusCountToCollect);
+        mLatchTtff = new CountDownLatch(1);
+        mLatchStop = new CountDownLatch(1);
+        mGnssUsedSvStringIds = new HashSet<>();
+        mCarrierFrequencies = new HashSet<>();
+    }
+
+    @Override
+    public void onStarted() {
+        Log.i(mTag, "Gnss Status Listener Started");
+        mLatchStart.countDown();
+    }
+
+    @Override
+    public void onStopped() {
+        Log.i(mTag, "Gnss Status Listener Stopped");
+        mLatchStop.countDown();
+    }
+
+    @Override
+    public void onFirstFix(int ttffMillis) {
+        Log.i(mTag, "Gnss Status Listener Received TTFF");
+        mLatchTtff.countDown();
+    }
+
+    @Override
+    public void onSatelliteStatusChanged(GnssStatus status) {
+        Log.i(mTag, "Gnss Status Listener Received Status Update");
+        mGnssStatus = status;
+        for (int i = 0; i < status.getSatelliteCount(); i++) {
+            mCarrierFrequencies.add(status.getCarrierFrequencyHz(i));
+            if (!status.usedInFix(i)) {
+                continue;
+            }
+            if (status.hasCarrierFrequencyHz(i)) {
+                mGnssUsedSvStringIds.add(
+                        TestMeasurementUtil.getUniqueSvStringId(status.getConstellationType(i),
+                                status.getSvid(i), status.getCarrierFrequencyHz(i)));
+            } else {
+                mGnssUsedSvStringIds.add(
+                        TestMeasurementUtil.getUniqueSvStringId(status.getConstellationType(i),
+                                status.getSvid(i)));
+            }
+        }
+        mLatchStatus.countDown();
+    }
+
+    /**
+     * Returns the list of SV String Ids which were used in fix during the collect
+     *
+     * @return mGnssUsedSvStringIds - Set of SV string Ids
+     */
+    public Set<String> getGnssUsedSvStringIds() {
+        return mGnssUsedSvStringIds;
+    }
+
+    /**
+     * Returns the list of carrier frequencies of the received GnssStatus.
+     *
+     * @return mCarrierFrequencies - a set of carrier frequencies
+     */
+    public float[] getCarrierFrequencies() {
+        float[] result = new float[mCarrierFrequencies.size()];
+        int i = 0;
+        for (Float freq : mCarrierFrequencies) {
+            result[i++] = freq;
+        }
+        return result;
+    }
+
+    /**
+     * Get GNSS Status.
+     *
+     * @return mGnssStatus GNSS Status
+     */
+    public GnssStatus getGnssStatus() {
+        return mGnssStatus;
+    }
+
+    public boolean awaitStart() throws InterruptedException {
+        return TestUtils.waitFor(mLatchStart, TIMEOUT_IN_SEC);
+    }
+
+    public boolean awaitStatus() throws InterruptedException {
+        return TestUtils.waitFor(mLatchStatus, TIMEOUT_IN_SEC);
+    }
+
+    public boolean awaitTtff() throws InterruptedException {
+        return TestUtils.waitFor(mLatchTtff, TIMEOUT_IN_SEC);
+    }
+
+    public boolean awaitStop() throws InterruptedException {
+        return TestUtils.waitFor(mLatchStop, TIMEOUT_IN_SEC);
+    }
+}
diff --git a/tests/location/location_fine/src/android/location/cts/fine/GeocoderTest.java b/tests/location/location_fine/src/android/location/cts/fine/GeocoderTest.java
index 69b1f0c..08ddca1 100644
--- a/tests/location/location_fine/src/android/location/cts/fine/GeocoderTest.java
+++ b/tests/location/location_fine/src/android/location/cts/fine/GeocoderTest.java
@@ -16,56 +16,57 @@
 
 package android.location.cts.fine;
 
+import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;
+import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
 
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.ResolveInfoFlags;
 import android.location.Geocoder;
+import android.location.Geocoder.GeocodeListener;
 
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 
+import com.android.compatibility.common.util.RetryRule;
+
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.io.IOException;
 import java.util.Locale;
 
 @RunWith(AndroidJUnit4.class)
 public class GeocoderTest {
 
-    private static final int MAX_NUM_RETRIES = 2;
-    private static final int TIME_BETWEEN_RETRIES_MS = 2000;
+    // retry just in case of network failure
+    @Rule
+    public final RetryRule mRetryRule = new RetryRule(2);
 
     private Context mContext;
+    private Geocoder mGeocoder;
 
     @Before
     public void setUp() {
         mContext = ApplicationProvider.getApplicationContext();
-    }
-
-    @Test
-    public void testConstructor() {
-        new Geocoder(mContext);
-
-        new Geocoder(mContext, Locale.ENGLISH);
-
-        try {
-            new Geocoder(mContext, null);
-            fail("should throw NullPointerException.");
-        } catch (NullPointerException e) {
-            // expected.
-        }
+        mGeocoder = new Geocoder(mContext, Locale.US);
     }
 
     @Test
     public void testIsPresent() {
-        if (isServiceMissing()) {
+        if (mContext.getPackageManager().queryIntentServices(
+                new Intent("com.android.location.service.GeocodeProvider"), ResolveInfoFlags.of(
+                        MATCH_DIRECT_BOOT_AWARE | MATCH_DIRECT_BOOT_UNAWARE)).isEmpty()) {
             assertFalse(Geocoder.isPresent());
         } else {
             assertTrue(Geocoder.isPresent());
@@ -73,129 +74,62 @@
     }
 
     @Test
-    public void testGetFromLocation() throws IOException, InterruptedException {
-        Geocoder geocoder = new Geocoder(mContext);
+    public void testGetFromLocation() {
+        assumeTrue(Geocoder.isPresent());
 
-        // There is no guarantee that geocoder.getFromLocation returns accurate results
-        // Thus only test that calling the method with valid arguments doesn't produce
-        // an unexpected exception
-        // Note: there is a risk this test will fail if device under test does not have
-        // a network connection. This is why we try the geocode 5 times if it fails due
-        // to a network error.
-        int numRetries = 0;
-        while (numRetries < MAX_NUM_RETRIES) {
-            try {
-                geocoder.getFromLocation(60, 30, 5);
-                break;
-            } catch (IOException e) {
-                Thread.sleep(TIME_BETWEEN_RETRIES_MS);
-                numRetries++;
-            }
-        }
-        if (numRetries >= MAX_NUM_RETRIES) {
-            fail("Failed to geocode location " + MAX_NUM_RETRIES + " times.");
-        }
-
-
-        try {
-            // latitude is less than -90
-            geocoder.getFromLocation(-91, 30, 5);
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // pass
-        }
-
-        try {
-            // latitude is greater than 90
-            geocoder.getFromLocation(91, 30, 5);
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // pass
-        }
-
-        try {
-            // longitude is less than -180
-            geocoder.getFromLocation(10, -181, 5);
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // pass
-        }
-
-        try {
-            // longitude is greater than 180
-            geocoder.getFromLocation(10, 181, 5);
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // pass
-        }
+        GeocodeListener listener = mock(GeocodeListener.class);
+        mGeocoder.getFromLocation(60, 30, 5, listener);
+        verify(listener, timeout(10000)).onGeocode(anyList());
     }
 
     @Test
-    public void testGetFromLocationName() throws IOException, InterruptedException {
-        Geocoder geocoder = new Geocoder(mContext, Locale.US);
+    public void testGetFromLocation_sync() throws Exception {
+        assumeTrue(Geocoder.isPresent());
 
-        // There is no guarantee that geocoder.getFromLocationName returns accurate results.
-        // Thus only test that calling the method with valid arguments doesn't produce
-        // an unexpected exception
-        // Note: there is a risk this test will fail if device under test does not have
-        // a network connection. This is why we try the geocode 5 times if it fails due
-        // to a network error.
-        int numRetries = 0;
-        while (numRetries < MAX_NUM_RETRIES) {
-            try {
-                geocoder.getFromLocationName("Dalvik,Iceland", 5);
-                break;
-            } catch (IOException e) {
-                Thread.sleep(TIME_BETWEEN_RETRIES_MS);
-                numRetries++;
-            }
-        }
-        if (numRetries >= MAX_NUM_RETRIES) {
-            fail("Failed to geocode location name " + MAX_NUM_RETRIES + " times.");
-        }
-
-        try {
-            geocoder.getFromLocationName(null, 5);
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // pass
-        }
-
-        try {
-            geocoder.getFromLocationName("Beijing", 5, -91, 100, 45, 130);
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // pass
-        }
-
-        try {
-            geocoder.getFromLocationName("Beijing", 5, 25, 190, 45, 130);
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // pass
-        }
-
-        try {
-            geocoder.getFromLocationName("Beijing", 5, 25, 100, 91, 130);
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // pass
-        }
-
-        try {
-            geocoder.getFromLocationName("Beijing", 5, 25, 100, 45, -181);
-            fail("should throw IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // pass
-        }
+        mGeocoder.getFromLocation(60, 30, 5);
     }
 
-    private boolean isServiceMissing() {
-        PackageManager pm = mContext.getPackageManager();
+    @Test
+    public void testGetFromLocation_badInput() {
+        GeocodeListener listener = mock(GeocodeListener.class);
+        assertThrows(IllegalArgumentException.class,
+                () -> mGeocoder.getFromLocation(-91, 30, 5, listener));
+        assertThrows(IllegalArgumentException.class,
+                () -> mGeocoder.getFromLocation(91, 30, 5, listener));
+        assertThrows(IllegalArgumentException.class,
+                () -> mGeocoder.getFromLocation(10, -181, 5, listener));
+        assertThrows(IllegalArgumentException.class,
+                () -> mGeocoder.getFromLocation(10, 181, 5, listener));
+    }
 
-        final Intent intent = new Intent("com.android.location.service.GeocodeProvider");
-        final int flags = PackageManager.MATCH_DIRECT_BOOT_AWARE
-                | PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
-        return pm.queryIntentServices(intent, flags).isEmpty();
+    @Test
+    public void testGetFromLocationName() {
+        assumeTrue(Geocoder.isPresent());
+
+        GeocodeListener listener = mock(GeocodeListener.class);
+        mGeocoder.getFromLocationName("Dalvik,Iceland", 5, listener);
+        verify(listener, timeout(10000)).onGeocode(anyList());
+    }
+
+    @Test
+    public void testGetFromLocationName_sync() throws Exception {
+        assumeTrue(Geocoder.isPresent());
+
+        mGeocoder.getFromLocationName("Dalvik,Iceland", 5);
+    }
+
+    @Test
+    public void testGetFromLocationName_badInput() {
+        GeocodeListener listener = mock(GeocodeListener.class);
+        assertThrows(IllegalArgumentException.class,
+                () -> mGeocoder.getFromLocationName(null, 5, listener));
+        assertThrows(IllegalArgumentException.class,
+                () -> mGeocoder.getFromLocationName("Beijing", 5, -91, 100, 45, 130, listener));
+        assertThrows(IllegalArgumentException.class,
+                () -> mGeocoder.getFromLocationName("Beijing", 5, 25, 190, 45, 130, listener));
+        assertThrows(IllegalArgumentException.class,
+                () -> mGeocoder.getFromLocationName("Beijing", 5, 25, 100, 91, 130, listener));
+        assertThrows(IllegalArgumentException.class,
+                () -> mGeocoder.getFromLocationName("Beijing", 5, 25, 100, 45, -181, listener));
     }
 }
diff --git a/tests/location/location_fine/src/android/location/cts/fine/LocationManagerFineTest.java b/tests/location/location_fine/src/android/location/cts/fine/LocationManagerFineTest.java
index fffe877..81fdb5a 100644
--- a/tests/location/location_fine/src/android/location/cts/fine/LocationManagerFineTest.java
+++ b/tests/location/location_fine/src/android/location/cts/fine/LocationManagerFineTest.java
@@ -16,6 +16,7 @@
 
 package android.location.cts.fine;
 
+import static android.Manifest.permission.LOCATION_BYPASS;
 import static android.Manifest.permission.WRITE_SECURE_SETTINGS;
 import static android.app.AppOpsManager.OPSTR_MONITOR_HIGH_POWER_LOCATION;
 import static android.app.AppOpsManager.OPSTR_MONITOR_LOCATION;
@@ -59,6 +60,7 @@
 import android.location.GnssMeasurementsEvent;
 import android.location.GnssNavigationMessage;
 import android.location.GnssStatus;
+import android.location.LastLocationRequest;
 import android.location.Location;
 import android.location.LocationListener;
 import android.location.LocationManager;
@@ -125,6 +127,7 @@
             "invalid_location_attribution_tag";
 
     private static final String IGNORE_SETTINGS_ALLOWLIST = "ignore_settings_allowlist";
+    private static final String ADAS_SETTINGS_ALLOWLIST = "adas_settings_allowlist";
 
     private Random mRandom;
     private Context mContext;
@@ -234,6 +237,110 @@
     }
 
     @Test
+    public void testGetLastKnownLocation_AdasLocationSettings_ReturnsLocation() throws Exception {
+        assumeTrue(mContext.getPackageManager().hasSystemFeature(FEATURE_AUTOMOTIVE));
+
+        try (LocationListenerCapture capture = new LocationListenerCapture(mContext);
+             DeviceConfigStateHelper locationDeviceConfigStateHelper =
+                     new DeviceConfigStateHelper(DeviceConfig.NAMESPACE_LOCATION)) {
+
+            locationDeviceConfigStateHelper.set(ADAS_SETTINGS_ALLOWLIST,
+                    mContext.getPackageName());
+
+            mManager.addTestProvider(
+                    GPS_PROVIDER,
+                    false,
+                    true,
+                    false,
+                    false,
+                    true,
+                    true,
+                    true,
+                    Criteria.POWER_HIGH,
+                    Criteria.ACCURACY_FINE);
+
+            Location loc = createLocation(GPS_PROVIDER, mRandom);
+            mManager.setTestProviderLocation(GPS_PROVIDER, loc);
+
+            mManager.setTestProviderEnabled(GPS_PROVIDER, true);
+
+            getInstrumentation()
+                    .getUiAutomation()
+                    .adoptShellPermissionIdentity(LOCATION_BYPASS, WRITE_SECURE_SETTINGS);
+
+            try {
+                // Returns loc when ADAS toggle is on.
+                mManager.setLocationEnabledForUser(false, mContext.getUser());
+                mManager.setAdasGnssLocationEnabled(true);
+                assertThat(
+                        mManager.getLastKnownLocation(
+                                GPS_PROVIDER,
+                                new LastLocationRequest.Builder()
+                                        .setAdasGnssBypass(true)
+                                        .build()))
+                        .isEqualTo(loc);
+
+            } finally {
+                mManager.setLocationEnabledForUser(true, android.os.Process.myUserHandle());
+                getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
+            }
+        }
+    }
+
+    @Test
+    public void testGetLastKnownLocation_AdasLocationSettings_ReturnsNull() throws Exception {
+        assumeTrue(mContext.getPackageManager().hasSystemFeature(FEATURE_AUTOMOTIVE));
+
+        try (LocationListenerCapture capture = new LocationListenerCapture(mContext);
+             DeviceConfigStateHelper locationDeviceConfigStateHelper =
+                     new DeviceConfigStateHelper(DeviceConfig.NAMESPACE_LOCATION)) {
+
+            locationDeviceConfigStateHelper.set(ADAS_SETTINGS_ALLOWLIST,
+                    mContext.getPackageName());
+
+            mManager.addTestProvider(
+                    GPS_PROVIDER,
+                    false,
+                    true,
+                    false,
+                    false,
+                    true,
+                    true,
+                    true,
+                    Criteria.POWER_HIGH,
+                    Criteria.ACCURACY_FINE);
+
+            Location loc = createLocation(GPS_PROVIDER, mRandom);
+            mManager.setTestProviderLocation(GPS_PROVIDER, loc);
+
+            mManager.setTestProviderEnabled(GPS_PROVIDER, true);
+
+            getInstrumentation()
+                    .getUiAutomation()
+                    .adoptShellPermissionIdentity(LOCATION_BYPASS, WRITE_SECURE_SETTINGS);
+
+            try {
+                // Returns null when ADAS toggle is off
+                mManager.setAdasGnssLocationEnabled(false);
+                mManager.setLocationEnabledForUser(false, mContext.getUser());
+
+                assertThat(
+                        mManager.getLastKnownLocation(
+                                GPS_PROVIDER,
+                                new LastLocationRequest.Builder()
+                                        .setAdasGnssBypass(true)
+                                        .build()))
+                        .isNull();
+
+            } finally {
+                mManager.setLocationEnabledForUser(true, android.os.Process.myUserHandle());
+                mManager.setAdasGnssLocationEnabled(true);
+                getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
+            }
+        }
+    }
+
+    @Test
     public void testGetLastKnownLocation_RemoveProvider() {
         Location loc1 = createLocation(TEST_PROVIDER, mRandom);
 
@@ -816,7 +923,7 @@
                     mContext.getPackageName());
 
             getInstrumentation().getUiAutomation()
-                    .adoptShellPermissionIdentity(WRITE_SECURE_SETTINGS);
+                    .adoptShellPermissionIdentity(LOCATION_BYPASS);
             try {
                 mManager.requestLocationUpdates(
                         TEST_PROVIDER,
@@ -843,6 +950,56 @@
     }
 
     @Test
+    public void testRequestLocationUpdates_AdasGnssBypass() throws Exception {
+        assumeTrue(mContext.getPackageManager().hasSystemFeature(FEATURE_AUTOMOTIVE));
+
+        try (LocationListenerCapture capture = new LocationListenerCapture(mContext);
+             DeviceConfigStateHelper locationDeviceConfigStateHelper =
+                     new DeviceConfigStateHelper(DeviceConfig.NAMESPACE_LOCATION)) {
+
+            locationDeviceConfigStateHelper.set(ADAS_SETTINGS_ALLOWLIST,
+                    mContext.getPackageName());
+
+            mManager.addTestProvider(
+                    GPS_PROVIDER,
+                    false,
+                    true,
+                    false,
+                    false,
+                    true,
+                    true,
+                    true,
+                    Criteria.POWER_HIGH,
+                    Criteria.ACCURACY_FINE);
+
+            getInstrumentation().getUiAutomation()
+                    .adoptShellPermissionIdentity(LOCATION_BYPASS);
+            try {
+                mManager.requestLocationUpdates(
+                        GPS_PROVIDER,
+                        new LocationRequest.Builder(0)
+                                .setAdasGnssBypass(true)
+                                .build(),
+                        Executors.newSingleThreadExecutor(),
+                        capture);
+            } finally {
+                getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
+            }
+
+            // turn off provider
+            mManager.setTestProviderEnabled(GPS_PROVIDER, false);
+
+            // test that all restrictions are bypassed
+            Location loc = createLocation(GPS_PROVIDER, mRandom);
+            mManager.setTestProviderLocation(GPS_PROVIDER, loc);
+            assertThat(capture.getNextLocation(FAILURE_TIMEOUT_MS)).isEqualTo(loc);
+            loc = createLocation(GPS_PROVIDER, mRandom);
+            mManager.setTestProviderLocation(GPS_PROVIDER, loc);
+            assertThat(capture.getNextLocation(FAILURE_TIMEOUT_MS)).isEqualTo(loc);
+        }
+    }
+
+    @Test
     public void testMonitoring() throws Exception {
         AppOpsManager appOps = Objects.requireNonNull(
                 mContext.getSystemService(AppOpsManager.class));
diff --git a/tests/location/location_fine/src/android/location/cts/fine/ScanningSettingsTest.java b/tests/location/location_fine/src/android/location/cts/fine/ScanningSettingsTest.java
index 6d0ac08..af9ecff 100644
--- a/tests/location/location_fine/src/android/location/cts/fine/ScanningSettingsTest.java
+++ b/tests/location/location_fine/src/android/location/cts/fine/ScanningSettingsTest.java
@@ -155,6 +155,9 @@
             // Scrolling can fail if the UI is not scrollable
         }
 
+        // Wait for the preference to appear
+        mDevice.wait(Until.hasObject(By.text(res.getString(resId))), TIMEOUT);
+
         UiObject2 pref = mDevice.findObject(By.text(res.getString(resId)));
         // Click the preference to show the Scanning fragment
         pref.click();
diff --git a/tests/location/location_gnss/src/android/location/cts/gnss/GnssAntennaInfoTest.java b/tests/location/location_gnss/src/android/location/cts/gnss/GnssAntennaInfoTest.java
index 2fe0ccf..d937498 100644
--- a/tests/location/location_gnss/src/android/location/cts/gnss/GnssAntennaInfoTest.java
+++ b/tests/location/location_gnss/src/android/location/cts/gnss/GnssAntennaInfoTest.java
@@ -9,6 +9,7 @@
 import android.location.GnssAntennaInfo;
 import android.location.LocationListener;
 import android.location.LocationManager;
+import android.location.cts.common.TestGnssStatusCallback;
 import android.location.cts.common.TestLocationManager;
 import android.location.cts.common.TestMeasurementUtil;
 import android.os.Looper;
diff --git a/tests/location/location_gnss/src/android/location/cts/gnss/GnssMeasurementRegistrationTest.java b/tests/location/location_gnss/src/android/location/cts/gnss/GnssMeasurementRegistrationTest.java
index f615d51..eb21832 100644
--- a/tests/location/location_gnss/src/android/location/cts/gnss/GnssMeasurementRegistrationTest.java
+++ b/tests/location/location_gnss/src/android/location/cts/gnss/GnssMeasurementRegistrationTest.java
@@ -16,18 +16,30 @@
 
 package android.location.cts.gnss;
 
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+
+import android.content.Context;
 import android.location.GnssMeasurement;
 import android.location.GnssMeasurementRequest;
 import android.location.GnssMeasurementsEvent;
 import android.location.GnssStatus;
-import android.location.cts.common.GnssTestCase;
 import android.location.cts.common.SoftAssert;
 import android.location.cts.common.TestGnssMeasurementListener;
+import android.location.cts.common.TestGnssStatusCallback;
 import android.location.cts.common.TestLocationListener;
 import android.location.cts.common.TestLocationManager;
 import android.location.cts.common.TestMeasurementUtil;
 import android.util.Log;
 
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
 import java.util.List;
 
 /**
@@ -50,23 +62,25 @@
  *              Android Q, it is mandatory to report GnssMeasurement even if a location has not
  *              yet been reported. Therefore, the test fails.
  */
-public class GnssMeasurementRegistrationTest extends GnssTestCase {
+@RunWith(JUnit4.class)
+public class GnssMeasurementRegistrationTest {
 
     private static final String TAG = "GnssMeasRegTest";
     private static final int EVENTS_COUNT = 5;
     private static final int GPS_EVENTS_COUNT = 1;
     private TestLocationListener mLocationListener;
     private TestGnssMeasurementListener mMeasurementListener;
+    private TestLocationManager mTestLocationManager;
+    private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        mTestLocationManager = new TestLocationManager(getContext());
+    @Before
+    public void setUp() throws Exception {
+        mContext = ApplicationProvider.getApplicationContext();
+        mTestLocationManager = new TestLocationManager(mContext);
     }
 
-    @Override
-    protected void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
         // Unregister listeners
         if (mLocationListener != null) {
             mTestLocationManager.removeLocationUpdates(mLocationListener);
@@ -74,22 +88,16 @@
         if (mMeasurementListener != null) {
             mTestLocationManager.unregisterGnssMeasurementCallback(mMeasurementListener);
         }
-        super.tearDown();
     }
 
     /**
      * Test GPS measurements registration.
      */
+    @Test
     public void testGnssMeasurementRegistration() throws Exception {
-        // Checks if GPS hardware feature is present, skips test (pass) if not
-        if (!TestMeasurementUtil.canTestRunOnCurrentDevice(mTestLocationManager, TAG)) {
-            return;
-        }
-
-        if (TestMeasurementUtil.isAutomotiveDevice(getContext())) {
-            Log.i(TAG, "Test is being skipped because the system has the AUTOMOTIVE feature.");
-            return;
-        }
+        assumeTrue(TestMeasurementUtil.canTestRunOnCurrentDevice(mTestLocationManager, TAG));
+        assumeFalse("Test is being skipped because the system has the AUTOMOTIVE feature.",
+                TestMeasurementUtil.isAutomotiveDevice(mContext));
 
         // Register for GPS measurements.
         mMeasurementListener = new TestGnssMeasurementListener(TAG, GPS_EVENTS_COUNT);
@@ -101,16 +109,11 @@
     /**
      * Test GPS measurements registration with full tracking enabled.
      */
+    @Test
     public void testGnssMeasurementRegistration_enableFullTracking() throws Exception {
-        // Checks if GPS hardware feature is present, skips test (pass) if not,
-        if (!TestMeasurementUtil.canTestRunOnCurrentDevice(mTestLocationManager, TAG)) {
-            return;
-        }
-
-        if (TestMeasurementUtil.isAutomotiveDevice(getContext())) {
-            Log.i(TAG, "Test is being skipped because the system has the AUTOMOTIVE feature.");
-            return;
-        }
+        assumeTrue(TestMeasurementUtil.canTestRunOnCurrentDevice(mTestLocationManager, TAG));
+        assumeFalse("Test is being skipped because the system has the AUTOMOTIVE feature.",
+                TestMeasurementUtil.isAutomotiveDevice(mContext));
 
         // Register for GPS measurements.
         mMeasurementListener = new TestGnssMeasurementListener(TAG, GPS_EVENTS_COUNT);
@@ -120,6 +123,23 @@
         verifyGnssMeasurementsReceived();
     }
 
+    /**
+     * Test GPS measurements registration with 2s interval.
+     */
+    @Test
+    public void testGnssMeasurementRegistration_2secInterval() throws Exception {
+        assumeTrue(TestMeasurementUtil.canTestRunOnCurrentDevice(mTestLocationManager, TAG));
+        assumeFalse("Test is being skipped because the system has the AUTOMOTIVE feature.",
+                TestMeasurementUtil.isAutomotiveDevice(mContext));
+
+        // Register for GPS measurements.
+        mMeasurementListener = new TestGnssMeasurementListener(TAG, GPS_EVENTS_COUNT);
+        mTestLocationManager.registerGnssMeasurementCallback(mMeasurementListener,
+                new GnssMeasurementRequest.Builder().setIntervalMillis(2000).build());
+
+        verifyGnssMeasurementsReceived();
+    }
+
     private void verifyGnssMeasurementsReceived() throws InterruptedException {
         mMeasurementListener.await();
 
diff --git a/tests/location/location_gnss/src/android/location/cts/gnss/GnssMeasurementValuesTest.java b/tests/location/location_gnss/src/android/location/cts/gnss/GnssMeasurementValuesTest.java
index 20357c1..17673f5 100644
--- a/tests/location/location_gnss/src/android/location/cts/gnss/GnssMeasurementValuesTest.java
+++ b/tests/location/location_gnss/src/android/location/cts/gnss/GnssMeasurementValuesTest.java
@@ -21,6 +21,7 @@
 import android.location.cts.common.GnssTestCase;
 import android.location.cts.common.SoftAssert;
 import android.location.cts.common.TestGnssMeasurementListener;
+import android.location.cts.common.TestGnssStatusCallback;
 import android.location.cts.common.TestLocationListener;
 import android.location.cts.common.TestLocationManager;
 import android.location.cts.common.TestMeasurementUtil;
diff --git a/tests/location/location_gnss/src/android/location/cts/gnss/GnssMeasurementWhenNoLocationTest.java b/tests/location/location_gnss/src/android/location/cts/gnss/GnssMeasurementWhenNoLocationTest.java
index 9acc4af..2a3dee6 100644
--- a/tests/location/location_gnss/src/android/location/cts/gnss/GnssMeasurementWhenNoLocationTest.java
+++ b/tests/location/location_gnss/src/android/location/cts/gnss/GnssMeasurementWhenNoLocationTest.java
@@ -20,14 +20,15 @@
 import android.location.GnssMeasurementsEvent;
 import android.location.GnssStatus;
 import android.location.cts.common.GnssTestCase;
+import android.location.cts.common.SoftAssert;
 import android.location.cts.common.TestGnssMeasurementListener;
+import android.location.cts.common.TestGnssStatusCallback;
 import android.location.cts.common.TestLocationListener;
+import android.location.cts.common.TestLocationManager;
+import android.location.cts.common.TestMeasurementUtil;
+import android.location.cts.common.TestUtils;
 import android.platform.test.annotations.AppModeFull;
 import android.util.Log;
-import android.location.cts.common.TestUtils;
-import android.location.cts.common.TestMeasurementUtil;
-import android.location.cts.common.SoftAssert;
-import android.location.cts.common.TestLocationManager;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/tests/location/location_gnss/src/android/location/cts/gnss/GnssNavigationMessageRegistrationTest.java b/tests/location/location_gnss/src/android/location/cts/gnss/GnssNavigationMessageRegistrationTest.java
index ee77f36..02766fb 100644
--- a/tests/location/location_gnss/src/android/location/cts/gnss/GnssNavigationMessageRegistrationTest.java
+++ b/tests/location/location_gnss/src/android/location/cts/gnss/GnssNavigationMessageRegistrationTest.java
@@ -19,6 +19,7 @@
 import android.location.GnssNavigationMessage;
 import android.location.cts.common.GnssTestCase;
 import android.location.cts.common.SoftAssert;
+import android.location.cts.common.TestGnssStatusCallback;
 import android.location.cts.common.TestLocationListener;
 import android.location.cts.common.TestLocationManager;
 import android.location.cts.common.TestMeasurementUtil;
diff --git a/tests/location/location_gnss/src/android/location/cts/gnss/GnssStatusTest.java b/tests/location/location_gnss/src/android/location/cts/gnss/GnssStatusTest.java
index c872070..76a89a9 100644
--- a/tests/location/location_gnss/src/android/location/cts/gnss/GnssStatusTest.java
+++ b/tests/location/location_gnss/src/android/location/cts/gnss/GnssStatusTest.java
@@ -7,11 +7,11 @@
 import android.app.UiAutomation;
 import android.content.Context;
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.location.GnssStatus;
 import android.location.cts.common.GnssTestCase;
 import android.location.cts.common.SoftAssert;
+import android.location.cts.common.TestGnssStatusCallback;
 import android.location.cts.common.TestLocationListener;
 import android.location.cts.common.TestLocationManager;
 import android.location.cts.common.TestMeasurementUtil;
diff --git a/tests/location/location_gnss/src/android/location/cts/gnss/GnssTtffTests.java b/tests/location/location_gnss/src/android/location/cts/gnss/GnssTtffTests.java
index 2c6be79..1930c1a 100644
--- a/tests/location/location_gnss/src/android/location/cts/gnss/GnssTtffTests.java
+++ b/tests/location/location_gnss/src/android/location/cts/gnss/GnssTtffTests.java
@@ -2,6 +2,7 @@
 
 import android.location.cts.common.GnssTestCase;
 import android.location.cts.common.SoftAssert;
+import android.location.cts.common.TestGnssStatusCallback;
 import android.location.cts.common.TestLocationListener;
 import android.location.cts.common.TestLocationManager;
 import android.location.cts.common.TestUtils;
diff --git a/tests/location/location_gnss/src/android/location/cts/gnss/TestGnssStatusCallback.java b/tests/location/location_gnss/src/android/location/cts/gnss/TestGnssStatusCallback.java
deleted file mode 100644
index 8c68748..0000000
--- a/tests/location/location_gnss/src/android/location/cts/gnss/TestGnssStatusCallback.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2016 Google Inc.
- *
- * 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 android.location.cts.gnss;
-
-import android.location.GnssStatus;
-import android.location.cts.common.TestMeasurementUtil;
-import android.location.cts.common.TestUtils;
-import android.util.Log;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.CountDownLatch;
-
-/**
- * Used for receiving notifications when GNSS status has changed.
- */
-public class TestGnssStatusCallback extends GnssStatus.Callback {
-
-    private final String mTag;
-    private GnssStatus mGnssStatus = null;
-    // Timeout in sec for count down latch wait
-    private static final int TIMEOUT_IN_SEC = 90;
-    private final CountDownLatch mLatchStart;
-    private final CountDownLatch mLatchStatus;
-    private final CountDownLatch mLatchTtff;
-    private final CountDownLatch mLatchStop;
-
-    // Store list of Satellites including Gnss Band, constellation & SvId
-    private Set<String> mGnssUsedSvStringIds;
-
-    private final Set<Float> mCarrierFrequencies;
-
-    public TestGnssStatusCallback(String tag, int gpsStatusCountToCollect) {
-        this.mTag = tag;
-        mLatchStart = new CountDownLatch(1);
-        mLatchStatus = new CountDownLatch(gpsStatusCountToCollect);
-        mLatchTtff = new CountDownLatch(1);
-        mLatchStop = new CountDownLatch(1);
-        mGnssUsedSvStringIds = new HashSet<>();
-        mCarrierFrequencies = new HashSet<>();
-    }
-
-    @Override
-    public void onStarted() {
-        Log.i(mTag, "Gnss Status Listener Started");
-        mLatchStart.countDown();
-    }
-
-    @Override
-    public void onStopped() {
-        Log.i(mTag, "Gnss Status Listener Stopped");
-        mLatchStop.countDown();
-    }
-
-    @Override
-    public void onFirstFix(int ttffMillis) {
-        Log.i(mTag, "Gnss Status Listener Received TTFF");
-        mLatchTtff.countDown();
-    }
-
-    @Override
-    public void onSatelliteStatusChanged(GnssStatus status) {
-        Log.i(mTag, "Gnss Status Listener Received Status Update");
-        mGnssStatus = status;
-        for (int i = 0; i < status.getSatelliteCount(); i++) {
-            mCarrierFrequencies.add(status.getCarrierFrequencyHz(i));
-            if (!status.usedInFix(i)) {
-                continue;
-            }
-            if (status.hasCarrierFrequencyHz(i)) {
-                mGnssUsedSvStringIds.add(
-                    TestMeasurementUtil.getUniqueSvStringId(status.getConstellationType(i),
-                        status.getSvid(i), status.getCarrierFrequencyHz(i)));
-            } else {
-                mGnssUsedSvStringIds.add(
-                    TestMeasurementUtil.getUniqueSvStringId(status.getConstellationType(i),
-                        status.getSvid(i)));
-            }
-        }
-        mLatchStatus.countDown();
-    }
-
-    /**
-     * Returns the list of SV String Ids which were used in fix during the collect
-     *
-     * @return mGnssUsedSvStringIds - Set of SV string Ids
-     */
-    public Set<String> getGnssUsedSvStringIds() {
-        return mGnssUsedSvStringIds;
-    }
-
-    /**
-     * Returns the list of carrier frequencies of the received GnssStatus.
-     *
-     * @return mCarrierFrequencies - a set of carrier frequencies
-     */
-    public float[] getCarrierFrequencies() {
-        float[] result = new float[mCarrierFrequencies.size()];
-        int i = 0;
-        for (Float freq : mCarrierFrequencies) {
-            result[i++] = freq;
-        }
-        return result;
-    }
-
-    /**
-     * Get GNSS Status.
-     *
-     * @return mGnssStatus GNSS Status
-     */
-    public GnssStatus getGnssStatus() {
-        return mGnssStatus;
-    }
-
-    public boolean awaitStart() throws InterruptedException {
-        return TestUtils.waitFor(mLatchStart, TIMEOUT_IN_SEC);
-    }
-
-    public boolean awaitStatus() throws InterruptedException {
-        return TestUtils.waitFor(mLatchStatus, TIMEOUT_IN_SEC);
-    }
-
-    public boolean awaitTtff() throws InterruptedException {
-        return TestUtils.waitFor(mLatchTtff, TIMEOUT_IN_SEC);
-    }
-
-    public boolean awaitStop() throws InterruptedException {
-        return TestUtils.waitFor(mLatchStop, TIMEOUT_IN_SEC);
-    }
-}
diff --git a/tests/location/location_none/src/android/location/cts/none/GnssAntennaInfoTest.java b/tests/location/location_none/src/android/location/cts/none/GnssAntennaInfoTest.java
index 584a26e..640ecf6 100644
--- a/tests/location/location_none/src/android/location/cts/none/GnssAntennaInfoTest.java
+++ b/tests/location/location_none/src/android/location/cts/none/GnssAntennaInfoTest.java
@@ -118,6 +118,24 @@
         verifyPartialGnssAntennaInfoValuesAndGetters(gnssAntennaInfo);
     }
 
+    @Test
+    public void testGnssAntennaInfoCopyBuilder() {
+        GnssAntennaInfo gnssAntennaInfo = createFullTestGnssAntennaInfo();
+        GnssAntennaInfo gnssAntennaInfoCopy = new GnssAntennaInfo.Builder(gnssAntennaInfo).build();
+
+        verifyFullGnssAntennaInfoValuesAndGetters(gnssAntennaInfoCopy);
+    }
+
+    @Test
+    public void testGnssAntennaInfoBuilderWithArguments() {
+        GnssAntennaInfo gnssAntennaInfo = createPartialTestGnssAntennaInfo();
+        GnssAntennaInfo gnssAntennaInfoCopy = new GnssAntennaInfo.Builder(
+                gnssAntennaInfo.getCarrierFrequencyMHz(),
+                gnssAntennaInfo.getPhaseCenterOffset()).build();
+
+        verifyPartialGnssAntennaInfoValuesAndGetters(gnssAntennaInfoCopy);
+    }
+
     private static GnssAntennaInfo createFullTestGnssAntennaInfo() {
         double carrierFrequencyMHz = 13758.0;
 
diff --git a/tests/location/location_none/src/android/location/cts/none/GnssAutomaticGainControlTest.java b/tests/location/location_none/src/android/location/cts/none/GnssAutomaticGainControlTest.java
new file mode 100644
index 0000000..8e8f112
--- /dev/null
+++ b/tests/location/location_none/src/android/location/cts/none/GnssAutomaticGainControlTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2022 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 android.location.cts.none;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
+import android.location.GnssAutomaticGainControl;
+import android.location.GnssStatus;
+import android.os.Parcel;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests fundamental functionality of {@link GnssAutomaticGainControl} class. This includes writing
+ * and reading from parcel, and verifying computed values and getters.
+ */
+@RunWith(AndroidJUnit4.class)
+public class GnssAutomaticGainControlTest {
+    private static final float DELTA = 1e-3f;
+
+    @Test
+    public void testGetValues() {
+        GnssAutomaticGainControl agc = new GnssAutomaticGainControl.Builder().setCarrierFrequencyHz(
+                1575420000).setConstellationType(GnssStatus.CONSTELLATION_GPS).setLevelDb(
+                3.5).build();
+        assertEquals(GnssStatus.CONSTELLATION_GPS, agc.getConstellationType());
+        assertEquals(1575420000, agc.getCarrierFrequencyHz());
+        assertEquals(3.5, agc.getLevelDb(), DELTA);
+    }
+
+    @Test
+    public void testDescribeContents() {
+        GnssAutomaticGainControl agc = new GnssAutomaticGainControl.Builder().build();
+        assertEquals(agc.describeContents(), 0);
+    }
+
+    @Test
+    public void testWriteToParcel() {
+        GnssAutomaticGainControl agc = new GnssAutomaticGainControl.Builder().setCarrierFrequencyHz(
+                1575420000).setConstellationType(GnssStatus.CONSTELLATION_GPS).setLevelDb(
+                3.5).build();
+
+        Parcel parcel = Parcel.obtain();
+        agc.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        GnssAutomaticGainControl fromParcel = GnssAutomaticGainControl.CREATOR.createFromParcel(
+                parcel);
+
+        assertEquals(agc, fromParcel);
+    }
+
+    @Test
+    public void testEquals() {
+        GnssAutomaticGainControl agc1 =
+                new GnssAutomaticGainControl.Builder().setCarrierFrequencyHz(
+                        1575420000).setConstellationType(GnssStatus.CONSTELLATION_GPS).setLevelDb(
+                        3.5).build();
+        GnssAutomaticGainControl agc2 = new GnssAutomaticGainControl.Builder(agc1).build();
+        GnssAutomaticGainControl agc3 =
+                new GnssAutomaticGainControl.Builder().setCarrierFrequencyHz(
+                        1602000000).setConstellationType(
+                        GnssStatus.CONSTELLATION_GLONASS).setLevelDb(-2.8).build();
+
+        assertEquals(agc1, agc2);
+        assertNotEquals(agc1, agc3);
+    }
+}
diff --git a/tests/location/location_none/src/android/location/cts/none/GnssMeasurementRequestTest.java b/tests/location/location_none/src/android/location/cts/none/GnssMeasurementRequestTest.java
index feb44d8..2971052 100644
--- a/tests/location/location_none/src/android/location/cts/none/GnssMeasurementRequestTest.java
+++ b/tests/location/location_none/src/android/location/cts/none/GnssMeasurementRequestTest.java
@@ -1,5 +1,7 @@
 package android.location.cts.none;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -19,30 +21,33 @@
  */
 @RunWith(AndroidJUnit4.class)
 public class GnssMeasurementRequestTest {
-
-    private GnssMeasurementRequest getTestGnssMeasurementRequest(boolean fullTracking) {
-        GnssMeasurementRequest.Builder builder = new GnssMeasurementRequest.Builder();
-        builder.setFullTracking(fullTracking);
-        return builder.build();
-    }
+    private static final int TEST_INTERVAL_MS = 2000;
 
     @Test
     public void testGetValues() {
-        GnssMeasurementRequest request1 = getTestGnssMeasurementRequest(true);
+        GnssMeasurementRequest request1 =
+                new GnssMeasurementRequest.Builder().setFullTracking(true).build();
         assertTrue(request1.isFullTracking());
-        GnssMeasurementRequest request2 = getTestGnssMeasurementRequest(false);
+        GnssMeasurementRequest request2 =
+                new GnssMeasurementRequest.Builder().setFullTracking(false).build();
         assertFalse(request2.isFullTracking());
+
+        GnssMeasurementRequest request3 =
+                new GnssMeasurementRequest.Builder().setIntervalMillis(TEST_INTERVAL_MS).build();
+        assertThat(request3.getIntervalMillis()).isEqualTo(TEST_INTERVAL_MS);
     }
 
     @Test
     public void testDescribeContents() {
-        GnssMeasurementRequest request = getTestGnssMeasurementRequest(true);
+        GnssMeasurementRequest request =
+                new GnssMeasurementRequest.Builder().setFullTracking(true).build();
         assertEquals(request.describeContents(), 0);
     }
 
     @Test
     public void testWriteToParcel() {
-        GnssMeasurementRequest request = getTestGnssMeasurementRequest(true);
+        GnssMeasurementRequest request =
+                new GnssMeasurementRequest.Builder().setFullTracking(true).build();
 
         Parcel parcel = Parcel.obtain();
         request.writeToParcel(parcel, 0);
@@ -54,10 +59,15 @@
 
     @Test
     public void testEquals() {
-        GnssMeasurementRequest request1 = getTestGnssMeasurementRequest(true);
+        GnssMeasurementRequest request1 =
+                new GnssMeasurementRequest.Builder().setFullTracking(true).build();
         GnssMeasurementRequest request2 = new GnssMeasurementRequest.Builder(request1).build();
-        GnssMeasurementRequest request3 = getTestGnssMeasurementRequest(false);
+        GnssMeasurementRequest request3 =
+                new GnssMeasurementRequest.Builder().setFullTracking(false).build();
+        GnssMeasurementRequest request4 =
+                new GnssMeasurementRequest.Builder().setIntervalMillis(TEST_INTERVAL_MS).build();
         assertEquals(request1, request2);
         assertNotEquals(request3, request2);
+        assertNotEquals(request4, request3);
     }
 }
diff --git a/tests/location/location_none/src/android/location/cts/none/GnssMeasurementsEventTest.java b/tests/location/location_none/src/android/location/cts/none/GnssMeasurementsEventTest.java
index dc1c56f..6d6cbd0 100644
--- a/tests/location/location_none/src/android/location/cts/none/GnssMeasurementsEventTest.java
+++ b/tests/location/location_none/src/android/location/cts/none/GnssMeasurementsEventTest.java
@@ -18,6 +18,7 @@
 
 import static org.junit.Assert.assertEquals;
 
+import android.location.GnssAutomaticGainControl;
 import android.location.GnssClock;
 import android.location.GnssMeasurement;
 import android.location.GnssMeasurementsEvent;
@@ -31,34 +32,40 @@
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 
 @RunWith(AndroidJUnit4.class)
 public class GnssMeasurementsEventTest {
 
+    private static final  GnssAutomaticGainControl AGC_1 =
+            new GnssAutomaticGainControl.Builder().setCarrierFrequencyHz(
+                    1575420000).setConstellationType(
+                    GnssStatus.CONSTELLATION_GPS).setLevelDb(3.5).build();
+    private static final GnssAutomaticGainControl AGC_2 =
+            new GnssAutomaticGainControl.Builder().setCarrierFrequencyHz(
+                    1602000000).setConstellationType(
+                    GnssStatus.CONSTELLATION_GLONASS).setLevelDb(-2.8).build();
+
     @Test
     public void testDescribeContents() {
         GnssClock clock = new GnssClock();
         GnssMeasurement m1 = new GnssMeasurement();
         GnssMeasurement m2 = new GnssMeasurement();
-        GnssMeasurementsEvent event = new GnssMeasurementsEvent(
-                clock, new GnssMeasurement[] {m1, m2});
+        GnssAutomaticGainControl agc = new GnssAutomaticGainControl.Builder().build();
+        GnssMeasurementsEvent event = new GnssMeasurementsEvent.Builder().setClock(clock)
+                .setMeasurements(List.of(m1, m2))
+                .setGnssAutomaticGainControls(List.of(agc)).build();
         assertEquals(0, event.describeContents());
     }
 
     @Test
     public void testWriteToParcel() {
-        GnssClock clock = new GnssClock();
-        clock.setLeapSecond(100);
-        GnssMeasurement m1 = new GnssMeasurement();
-        m1.setConstellationType(GnssStatus.CONSTELLATION_GLONASS);
-        GnssMeasurement m2 = new GnssMeasurement();
-        m2.setReceivedSvTimeNanos(43999);
-        GnssMeasurementsEvent event = new GnssMeasurementsEvent(
-                clock, new GnssMeasurement[] {m1, m2});
+        GnssMeasurementsEvent event = getTestEvent();
         Parcel parcel = Parcel.obtain();
         event.writeToParcel(parcel, 0);
         parcel.setDataPosition(0);
         GnssMeasurementsEvent newEvent = GnssMeasurementsEvent.CREATOR.createFromParcel(parcel);
+
         assertEquals(100, newEvent.getClock().getLeapSecond());
         Collection<GnssMeasurement> measurements = newEvent.getMeasurements();
         assertEquals(2, measurements.size());
@@ -67,5 +74,32 @@
         assertEquals(GnssStatus.CONSTELLATION_GLONASS, newM1.getConstellationType());
         GnssMeasurement newM2 = iterator.next();
         assertEquals(43999, newM2.getReceivedSvTimeNanos());
+
+        Collection<GnssAutomaticGainControl> agcs = newEvent.getGnssAutomaticGainControls();
+        assertEquals(2, agcs.size());
+        Iterator<GnssAutomaticGainControl> gnssAgcIterator = agcs.iterator();
+        GnssAutomaticGainControl newAgc1 = gnssAgcIterator.next();
+        assertEquals(newAgc1, AGC_1);
+        GnssAutomaticGainControl newAgc2 = gnssAgcIterator.next();
+        assertEquals(newAgc2, AGC_2);
+    }
+
+    @Test
+    public void testBuilder() {
+        GnssMeasurementsEvent event1 = getTestEvent();
+        GnssMeasurementsEvent event2 = new GnssMeasurementsEvent.Builder(event1).build();
+        assertEquals(event1.toString(), event2.toString());
+    }
+
+    private GnssMeasurementsEvent getTestEvent() {
+        GnssClock clock = new GnssClock();
+        clock.setLeapSecond(100);
+        GnssMeasurement m1 = new GnssMeasurement();
+        m1.setConstellationType(GnssStatus.CONSTELLATION_GLONASS);
+        GnssMeasurement m2 = new GnssMeasurement();
+        m2.setReceivedSvTimeNanos(43999);
+        return new GnssMeasurementsEvent.Builder().setClock(clock)
+                .setMeasurements(List.of(m1, m2))
+                .setGnssAutomaticGainControls(List.of(AGC_1, AGC_2)).build();
     }
 }
diff --git a/tests/location/location_none/src/android/location/cts/none/LastLocationRequestTest.java b/tests/location/location_none/src/android/location/cts/none/LastLocationRequestTest.java
index 670b536..ed2c11c 100644
--- a/tests/location/location_none/src/android/location/cts/none/LastLocationRequestTest.java
+++ b/tests/location/location_none/src/android/location/cts/none/LastLocationRequestTest.java
@@ -33,6 +33,7 @@
     public void testBuild_Defaults() {
         LastLocationRequest request = new LastLocationRequest.Builder().build();
         assertThat(request.isHiddenFromAppOps()).isEqualTo(false);
+        assertThat(request.isAdasGnssBypass()).isEqualTo(false);
         assertThat(request.isLocationSettingsIgnored()).isEqualTo(false);
     }
 
@@ -40,9 +41,11 @@
     public void testBuild_Explicit() {
         LastLocationRequest request = new LastLocationRequest.Builder()
                 .setHiddenFromAppOps(true)
+                .setAdasGnssBypass(true)
                 .setLocationSettingsIgnored(true)
                 .build();
         assertThat(request.isHiddenFromAppOps()).isEqualTo(true);
+        assertThat(request.isAdasGnssBypass()).isEqualTo(true);
         assertThat(request.isLocationSettingsIgnored()).isEqualTo(true);
     }
 
@@ -50,10 +53,12 @@
     public void testBuild_Copy() {
         LastLocationRequest original = new LastLocationRequest.Builder()
                 .setHiddenFromAppOps(true)
+                .setAdasGnssBypass(true)
                 .setLocationSettingsIgnored(true)
                 .build();
         LastLocationRequest copy = new LastLocationRequest.Builder(original).build();
         assertThat(copy.isHiddenFromAppOps()).isEqualTo(true);
+        assertThat(copy.isAdasGnssBypass()).isEqualTo(true);
         assertThat(copy.isLocationSettingsIgnored()).isEqualTo(true);
         assertThat(copy).isEqualTo(original);
     }
@@ -68,6 +73,7 @@
     public void testParcelRoundtrip() {
         LastLocationRequest request = new LastLocationRequest.Builder()
                 .setHiddenFromAppOps(true)
+                .setAdasGnssBypass(true)
                 .setLocationSettingsIgnored(true)
                 .build();
 
diff --git a/tests/location/location_none/src/android/location/cts/none/LocationRequestTest.java b/tests/location/location_none/src/android/location/cts/none/LocationRequestTest.java
index 97b57af..8f6dd3f 100644
--- a/tests/location/location_none/src/android/location/cts/none/LocationRequestTest.java
+++ b/tests/location/location_none/src/android/location/cts/none/LocationRequestTest.java
@@ -43,6 +43,7 @@
         assertThat(request.getMaxUpdates()).isEqualTo(Integer.MAX_VALUE);
         assertThat(request.getMinUpdateDistanceMeters()).isEqualTo(0f);
         assertThat(request.isHiddenFromAppOps()).isEqualTo(false);
+        assertThat(request.isAdasGnssBypass()).isEqualTo(false);
         assertThat(request.isLocationSettingsIgnored()).isEqualTo(false);
         assertThat(request.isLowPower()).isEqualTo(false);
     }
@@ -56,6 +57,7 @@
                 .setMaxUpdates(7000)
                 .setMinUpdateDistanceMeters(8000f)
                 .setHiddenFromAppOps(true)
+                .setAdasGnssBypass(true)
                 .setLocationSettingsIgnored(true)
                 .setLowPower(true)
                 .build();
@@ -66,6 +68,7 @@
         assertThat(request.getMaxUpdates()).isEqualTo(7000);
         assertThat(request.getMinUpdateDistanceMeters()).isEqualTo(8000f);
         assertThat(request.isHiddenFromAppOps()).isEqualTo(true);
+        assertThat(request.isAdasGnssBypass()).isEqualTo(true);
         assertThat(request.isLocationSettingsIgnored()).isEqualTo(true);
         assertThat(request.isLowPower()).isEqualTo(true);
     }
@@ -79,6 +82,7 @@
                 .setMaxUpdates(7000)
                 .setMinUpdateDistanceMeters(8000f)
                 .setHiddenFromAppOps(true)
+                .setAdasGnssBypass(true)
                 .setLocationSettingsIgnored(true)
                 .setLowPower(true)
                 .build();
@@ -90,6 +94,7 @@
         assertThat(copy.getMaxUpdates()).isEqualTo(7000);
         assertThat(copy.getMinUpdateDistanceMeters()).isEqualTo(8000f);
         assertThat(copy.isHiddenFromAppOps()).isEqualTo(true);
+        assertThat(copy.isAdasGnssBypass()).isEqualTo(true);
         assertThat(copy.isLocationSettingsIgnored()).isEqualTo(true);
         assertThat(copy.isLowPower()).isEqualTo(true);
         assertThat(copy).isEqualTo(original);
@@ -178,6 +183,7 @@
                 .setMaxUpdates(7000)
                 .setMinUpdateDistanceMeters(8000f)
                 .setHiddenFromAppOps(true)
+                .setAdasGnssBypass(true)
                 .setLocationSettingsIgnored(true)
                 .setLowPower(true)
                 .build();
diff --git a/tests/location/location_none/src/android/location/cts/none/LocationTest.java b/tests/location/location_none/src/android/location/cts/none/LocationTest.java
index 12b93046..87a15b8 100644
--- a/tests/location/location_none/src/android/location/cts/none/LocationTest.java
+++ b/tests/location/location_none/src/android/location/cts/none/LocationTest.java
@@ -16,11 +16,10 @@
 
 package android.location.cts.none;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import android.location.Location;
@@ -38,90 +37,143 @@
 @RunWith(AndroidJUnit4.class)
 public class LocationTest {
 
-    private static final float DELTA = 0.1f;
-    private final float TEST_ACCURACY = 1.0f;
-    private final float TEST_VERTICAL_ACCURACY = 2.0f;
-    private final float TEST_SPEED_ACCURACY = 3.0f;
-    private final float TEST_BEARING_ACCURACY = 4.0f;
-    private final double TEST_ALTITUDE = 1.0;
-    private final double TEST_LATITUDE = 50;
-    private final float TEST_BEARING = 1.0f;
-    private final double TEST_LONGITUDE = 20;
-    private final float TEST_SPEED = 5.0f;
-    private final long TEST_TIME = 100;
-    private final String TEST_PROVIDER = "LocationProvider";
-    private final String TEST_KEY1NAME = "key1";
-    private final String TEST_KEY2NAME = "key2";
-    private final boolean TEST_KEY1VALUE = false;
-    private final byte TEST_KEY2VALUE = 10;
+    private static final float DELTA = 0.01f;
 
     @Test
-    public void testConstructor() {
-        new Location("LocationProvider");
+    public void testConstructor_Defaults() {
+        Location l = new Location("provider");
 
-        Location l = createTestLocation();
-        Location location = new Location(l);
-        assertTestLocation(location);
+        assertThat(l.getProvider()).isEqualTo("provider");
+        assertThat(l.getTime()).isEqualTo(0);
+        assertThat(l.getElapsedRealtimeNanos()).isEqualTo(0);
+        assertThat(l.hasElapsedRealtimeUncertaintyNanos()).isFalse();
+        assertThat(l.getLatitude()).isEqualTo(0);
+        assertThat(l.getLongitude()).isEqualTo(0);
+        assertThat(l.hasAltitude()).isFalse();
+        assertThat(l.hasSpeed()).isFalse();
+        assertThat(l.hasBearing()).isFalse();
+        assertThat(l.hasVerticalAccuracy()).isFalse();
+        assertThat(l.hasSpeedAccuracy()).isFalse();
+        assertThat(l.hasBearingAccuracy()).isFalse();
+        assertThat(l.isMock()).isFalse();
+        assertThat(l.getExtras()).isNull();
+    }
 
-        try {
-            new Location((Location) null);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-            // expected.
-        }
+    @Test
+    public void testSet() {
+        Location location = new Location("");
+
+        Location l = new Location("test");
+        l.setTime(1);
+        l.setElapsedRealtimeNanos(2);
+        l.setElapsedRealtimeUncertaintyNanos(3);
+        l.setLatitude(-90);
+        l.setLongitude(90);
+        l.setAltitude(100);
+        l.setVerticalAccuracyMeters(90);
+        l.setSpeed(1000);
+        l.setSpeedAccuracyMetersPerSecond(9);
+        l.setBearing(7);
+        l.setBearingAccuracyDegrees(11);
+        l.setMock(true);
+        Bundle b = new Bundle();
+        b.putString("key", "value");
+        l.setExtras(b);
+
+        location.set(l);
+        assertThat(location).isEqualTo(l);
+    }
+
+    @Test
+    public void testValues() {
+        Location l = new Location("provider");
+
+        l.setProvider("test");
+        assertThat(l.getProvider()).isEqualTo("test");
+
+        l.setTime(1);
+        assertThat(l.getTime()).isEqualTo(1);
+        l.setTime(Long.MAX_VALUE);
+        assertThat(l.getTime()).isEqualTo(Long.MAX_VALUE);
+
+        l.setElapsedRealtimeNanos(1);
+        assertThat(l.getElapsedRealtimeNanos()).isEqualTo(1);
+        l.setElapsedRealtimeNanos(Long.MAX_VALUE);
+        assertThat(l.getElapsedRealtimeNanos()).isEqualTo(Long.MAX_VALUE);
+
+        l.setElapsedRealtimeUncertaintyNanos(1);
+        assertThat(l.hasElapsedRealtimeUncertaintyNanos()).isTrue();
+        assertThat(l.getElapsedRealtimeUncertaintyNanos()).isEqualTo(1);
+        l.removeElapsedRealtimeUncertaintyNanos();
+        assertThat(l.hasElapsedRealtimeUncertaintyNanos()).isFalse();
+
+        l.setLatitude(-90);
+        assertThat(l.getLatitude()).isEqualTo(-90);
+
+        l.setLongitude(90);
+        assertThat(l.getLongitude()).isEqualTo(90);
+
+        l.setAltitude(100);
+        assertThat(l.hasAltitude()).isTrue();
+        assertThat(l.getAltitude()).isEqualTo(100);
+        l.removeAltitude();
+        assertThat(l.hasAltitude()).isFalse();
+
+        l.setVerticalAccuracyMeters(90);
+        assertThat(l.hasVerticalAccuracy()).isTrue();
+        assertThat(l.getVerticalAccuracyMeters()).isEqualTo(90);
+        l.removeVerticalAccuracy();
+        assertThat(l.hasVerticalAccuracy()).isFalse();
+
+        l.setSpeed(1000);
+        assertThat(l.hasSpeed()).isTrue();
+        assertThat(l.getSpeed()).isEqualTo(1000);
+        l.removeSpeed();
+        assertThat(l.hasSpeed()).isFalse();
+
+        l.setSpeedAccuracyMetersPerSecond(9);
+        assertThat(l.hasSpeedAccuracy()).isTrue();
+        assertThat(l.getSpeedAccuracyMetersPerSecond()).isEqualTo(9);
+        l.removeSpeedAccuracy();
+        assertThat(l.hasSpeedAccuracy()).isFalse();
+
+        l.setBearing(7);
+        assertThat(l.hasBearing()).isTrue();
+        assertThat(l.getBearing()).isEqualTo(7);
+        l.setBearing(Float.MAX_VALUE);
+        assertThat(l.getBearing()).isEqualTo(0);
+        l.setBearing((Float.MAX_VALUE - 1) * -1);
+        assertThat(l.getBearing()).isEqualTo(0);
+        l.setBearing(371);
+        assertThat(l.getBearing()).isEqualTo(11f);
+        l.setBearing(-371);
+        assertThat(l.getBearing()).isEqualTo(349f);
+        l.removeBearing();
+        assertThat(l.hasBearing()).isFalse();
+
+        l.setBearingAccuracyDegrees(11);
+        assertThat(l.hasBearingAccuracy()).isTrue();
+        assertThat(l.getBearingAccuracyDegrees()).isEqualTo(11);
+        l.removeBearingAccuracy();
+        assertThat(l.hasBearingAccuracy()).isFalse();
+
+        l.setMock(true);
+        assertThat(l.isMock()).isTrue();
+        l.setMock(false);
+        assertThat(l.isMock()).isFalse();
+
+        l.setExtras(new Bundle());
+        assertThat(l.getExtras()).isNotNull();
     }
 
     @Test
     public void testDump() {
         StringBuilder sb = new StringBuilder();
-        StringBuilderPrinter printer = new StringBuilderPrinter(sb);
-        Location location = new Location("LocationProvider");
-        location.dump(printer, "");
+        new Location("").dump(new StringBuilderPrinter(sb), "");
         assertNotNull(sb.toString());
     }
 
     @Test
-    public void testBearingTo() {
-        Location location = new Location("");
-        Location dest = new Location("");
-
-        // set the location to Beijing
-        location.setLatitude(39.9);
-        location.setLongitude(116.4);
-        // set the destination to Chengdu
-        dest.setLatitude(30.7);
-        dest.setLongitude(104.1);
-        assertEquals(-128.66, location.bearingTo(dest), DELTA);
-
-        float bearing;
-        Location zeroLocation = new Location("");
-        zeroLocation.setLatitude(0);
-        zeroLocation.setLongitude(0);
-
-        Location testLocation = new Location("");
-        testLocation.setLatitude(0);
-        testLocation.setLongitude(150);
-
-        bearing = zeroLocation.bearingTo(zeroLocation);
-        assertEquals(0.0f, bearing, DELTA);
-
-        bearing = zeroLocation.bearingTo(testLocation);
-        assertEquals(90.0f, bearing, DELTA);
-
-        testLocation.setLatitude(90);
-        testLocation.setLongitude(0);
-        bearing = zeroLocation.bearingTo(testLocation);
-        assertEquals(0.0f, bearing, DELTA);
-
-        try {
-            location.bearingTo(null);
-            fail("should throw NullPointerException");
-        } catch (NullPointerException e) {
-            // expected.
-        }
-    }
-
-    @Test
     public void testConvert_CoordinateToRepresentation() {
         DecimalFormat df = new DecimalFormat("###.#####");
         String result;
@@ -219,12 +271,6 @@
     }
 
     @Test
-    public void testDescribeContents() {
-        Location location = new Location("");
-        location.describeContents();
-    }
-
-    @Test
     public void testDistanceBetween() {
         float[] result = new float[3];
         Location.distanceBetween(0, 0, 0, 0, result);
@@ -271,278 +317,72 @@
     }
 
     @Test
-    public void testAccessAccuracy() {
+    public void testBearingTo() {
         Location location = new Location("");
-        assertFalse(location.hasAccuracy());
+        Location dest = new Location("");
 
-        location.setAccuracy(1.0f);
-        assertEquals(1.0, location.getAccuracy(), DELTA);
-        assertTrue(location.hasAccuracy());
+        // set the location to Beijing
+        location.setLatitude(39.9);
+        location.setLongitude(116.4);
+        // set the destination to Chengdu
+        dest.setLatitude(30.7);
+        dest.setLongitude(104.1);
+        assertEquals(-128.66, location.bearingTo(dest), DELTA);
+
+        float bearing;
+        Location zeroLocation = new Location("");
+        zeroLocation.setLatitude(0);
+        zeroLocation.setLongitude(0);
+
+        Location testLocation = new Location("");
+        testLocation.setLatitude(0);
+        testLocation.setLongitude(150);
+
+        bearing = zeroLocation.bearingTo(zeroLocation);
+        assertEquals(0.0f, bearing, DELTA);
+
+        bearing = zeroLocation.bearingTo(testLocation);
+        assertEquals(90.0f, bearing, DELTA);
+
+        testLocation.setLatitude(90);
+        testLocation.setLongitude(0);
+        bearing = zeroLocation.bearingTo(testLocation);
+        assertEquals(0.0f, bearing, DELTA);
+
+        try {
+            location.bearingTo(null);
+            fail("should throw NullPointerException");
+        } catch (NullPointerException e) {
+            // expected.
+        }
     }
 
     @Test
-    public void testAccessVerticalAccuracy() {
-        Location location = new Location("");
-        assertFalse(location.hasVerticalAccuracy());
-
-        location.setVerticalAccuracyMeters(1.0f);
-        assertEquals(1.0, location.getVerticalAccuracyMeters(), DELTA);
-        assertTrue(location.hasVerticalAccuracy());
-    }
-
-    @Test
-    public void testAccessSpeedAccuracy() {
-        Location location = new Location("");
-        assertFalse(location.hasSpeedAccuracy());
-
-        location.setSpeedAccuracyMetersPerSecond(1.0f);
-        assertEquals(1.0, location.getSpeedAccuracyMetersPerSecond(), DELTA);
-        assertTrue(location.hasSpeedAccuracy());
-    }
-
-    @Test
-    public void testAccessBearingAccuracy() {
-        Location location = new Location("");
-        assertFalse(location.hasBearingAccuracy());
-
-        location.setBearingAccuracyDegrees(1.0f);
-        assertEquals(1.0, location.getBearingAccuracyDegrees(), DELTA);
-        assertTrue(location.hasBearingAccuracy());
-    }
-
-
-    @Test
-    public void testAccessAltitude() {
-        Location location = new Location("");
-        assertFalse(location.hasAltitude());
-
-        location.setAltitude(1.0);
-        assertEquals(1.0, location.getAltitude(), DELTA);
-        assertTrue(location.hasAltitude());
-    }
-
-    @Test
-    public void testAccessBearing() {
-        Location location = new Location("");
-        assertFalse(location.hasBearing());
-
-        location.setBearing(1.0f);
-        assertEquals(1.0, location.getBearing(), DELTA);
-        assertTrue(location.hasBearing());
-
-        location.setBearing(371.0f);
-        assertEquals(11.0, location.getBearing(), DELTA);
-        assertTrue(location.hasBearing());
-
-        location.setBearing(-361.0f);
-        assertEquals(359.0, location.getBearing(), DELTA);
-        assertTrue(location.hasBearing());
-    }
-
-    @Test
-    public void testAccessExtras() {
-        Location location = createTestLocation();
-
-        assertTestBundle(location.getExtras());
-
-        location.setExtras(null);
-        assertNull(location.getExtras());
-    }
-
-    @Test
-    public void testAccessLatitude() {
-        Location location = new Location("");
-
-        location.setLatitude(0);
-        assertEquals(0, location.getLatitude(), DELTA);
-
-        location.setLatitude(90);
-        assertEquals(90, location.getLatitude(), DELTA);
-
-        location.setLatitude(-90);
-        assertEquals(-90, location.getLatitude(), DELTA);
-    }
-
-    @Test
-    public void testAccessLongitude() {
-        Location location = new Location("");
-
-        location.setLongitude(0);
-        assertEquals(0, location.getLongitude(), DELTA);
-
-        location.setLongitude(180);
-        assertEquals(180, location.getLongitude(), DELTA);
-
-        location.setLongitude(-180);
-        assertEquals(-180, location.getLongitude(), DELTA);
-    }
-
-    @Test
-    public void testAccessProvider() {
-        Location location = new Location("");
-
-        String provider = "Location Provider";
-        location.setProvider(provider);
-        assertEquals(provider, location.getProvider());
-
-        location.setProvider(null);
-        assertNull(location.getProvider());
-    }
-
-    @Test
-    public void testAccessSpeed() {
-        Location location = new Location("");
-        assertFalse(location.hasSpeed());
-
-        location.setSpeed(234.0045f);
-        assertEquals(234.0045, location.getSpeed(), DELTA);
-        assertTrue(location.hasSpeed());
-    }
-
-    @Test
-    public void testAccessTime() {
-        Location location = new Location("");
-
-        location.setTime(0);
-        assertEquals(0, location.getTime());
-
-        location.setTime(Long.MAX_VALUE);
-        assertEquals(Long.MAX_VALUE, location.getTime());
-
-        location.setTime(12000);
-        assertEquals(12000, location.getTime());
-    }
-
-    @Test
-    public void testAccessElapsedRealtime() {
-        Location location = new Location("");
-
-        location.setElapsedRealtimeNanos(0);
-        assertEquals(0, location.getElapsedRealtimeNanos());
-
-        location.setElapsedRealtimeNanos(Long.MAX_VALUE);
-        assertEquals(Long.MAX_VALUE, location.getElapsedRealtimeNanos());
-
-        location.setElapsedRealtimeNanos(12000);
-        assertEquals(12000, location.getElapsedRealtimeNanos());
-    }
-
-    @Test
-    public void testAccessElapsedRealtimeUncertaintyNanos() {
-        Location location = new Location("");
-        assertFalse(location.hasElapsedRealtimeUncertaintyNanos());
-        assertEquals(0.0, location.getElapsedRealtimeUncertaintyNanos(), DELTA);
-
-        location.setElapsedRealtimeUncertaintyNanos(12000.0);
-        assertEquals(12000.0, location.getElapsedRealtimeUncertaintyNanos(), DELTA);
-        assertTrue(location.hasElapsedRealtimeUncertaintyNanos());
-
-        location.reset();
-        assertFalse(location.hasElapsedRealtimeUncertaintyNanos());
-        assertEquals(0.0, location.getElapsedRealtimeUncertaintyNanos(), DELTA);
-    }
-
-    @Test
-    public void testSetMock() {
-        Location location = new Location("");
-        assertFalse(location.isMock());
-        location.setMock(true);
-        assertTrue(location.isMock());
-    }
-
-    @Test
-    public void testSet() {
-        Location location = new Location("");
-
-        Location loc = createTestLocation();
-
-        location.set(loc);
-        assertTestLocation(location);
-
-        location.reset();
-        assertNull(location.getProvider());
-        assertEquals(0, location.getTime());
-        assertEquals(0, location.getLatitude(), DELTA);
-        assertEquals(0, location.getLongitude(), DELTA);
-        assertEquals(0, location.getAltitude(), DELTA);
-        assertFalse(location.hasAltitude());
-        assertEquals(0, location.getSpeed(), DELTA);
-        assertFalse(location.hasSpeed());
-        assertEquals(0, location.getBearing(), DELTA);
-        assertFalse(location.hasBearing());
-        assertEquals(0, location.getAccuracy(), DELTA);
-        assertFalse(location.hasAccuracy());
-
-        assertEquals(0, location.getVerticalAccuracyMeters(), DELTA);
-        assertEquals(0, location.getSpeedAccuracyMetersPerSecond(), DELTA);
-        assertEquals(0, location.getBearingAccuracyDegrees(), DELTA);
-
-        assertFalse(location.hasVerticalAccuracy());
-        assertFalse(location.hasSpeedAccuracy());
-        assertFalse(location.hasBearingAccuracy());
-
-        assertNull(location.getExtras());
-    }
-
-    @Test
-    public void testToString() {
-        Location location = createTestLocation();
-
-        assertNotNull(location.toString());
-    }
-
-    @Test
-    public void testWriteToParcel() {
-        Location location = createTestLocation();
+    public void testParcelRoundtrip() {
+        Location l = new Location("test");
+        l.setTime(1);
+        l.setElapsedRealtimeNanos(2);
+        l.setElapsedRealtimeUncertaintyNanos(3);
+        l.setLatitude(-90);
+        l.setLongitude(90);
+        l.setAltitude(100);
+        l.setVerticalAccuracyMeters(90);
+        l.setSpeed(1000);
+        l.setSpeedAccuracyMetersPerSecond(9);
+        l.setBearing(7);
+        l.setBearingAccuracyDegrees(11);
+        l.setMock(true);
+        Bundle b = new Bundle();
+        b.putString("key", "value");
+        l.setExtras(b);
 
         Parcel parcel = Parcel.obtain();
-        location.writeToParcel(parcel, 0);
-        parcel.setDataPosition(0);
-        Location newLocation = Location.CREATOR.createFromParcel(parcel);
-        assertTestLocation(newLocation);
-
-        parcel.recycle();
-    }
-
-    private void assertTestLocation(Location l) {
-        assertNotNull(l);
-        assertEquals(TEST_PROVIDER, l.getProvider());
-        assertEquals(TEST_ACCURACY, l.getAccuracy(), DELTA);
-        assertEquals(TEST_VERTICAL_ACCURACY, l.getVerticalAccuracyMeters(), DELTA);
-        assertEquals(TEST_SPEED_ACCURACY, l.getSpeedAccuracyMetersPerSecond(), DELTA);
-        assertEquals(TEST_BEARING_ACCURACY, l.getBearingAccuracyDegrees(), DELTA);
-        assertEquals(TEST_ALTITUDE, l.getAltitude(), DELTA);
-        assertEquals(TEST_LATITUDE, l.getLatitude(), DELTA);
-        assertEquals(TEST_BEARING, l.getBearing(), DELTA);
-        assertEquals(TEST_LONGITUDE, l.getLongitude(), DELTA);
-        assertEquals(TEST_SPEED, l.getSpeed(), DELTA);
-        assertEquals(TEST_TIME, l.getTime());
-        assertTestBundle(l.getExtras());
-    }
-
-    private Location createTestLocation() {
-        Location l = new Location(TEST_PROVIDER);
-        l.setAccuracy(TEST_ACCURACY);
-        l.setVerticalAccuracyMeters(TEST_VERTICAL_ACCURACY);
-        l.setSpeedAccuracyMetersPerSecond(TEST_SPEED_ACCURACY);
-        l.setBearingAccuracyDegrees(TEST_BEARING_ACCURACY);
-
-        l.setAltitude(TEST_ALTITUDE);
-        l.setLatitude(TEST_LATITUDE);
-        l.setBearing(TEST_BEARING);
-        l.setLongitude(TEST_LONGITUDE);
-        l.setSpeed(TEST_SPEED);
-        l.setTime(TEST_TIME);
-        Bundle bundle = new Bundle();
-        bundle.putBoolean(TEST_KEY1NAME, TEST_KEY1VALUE);
-        bundle.putByte(TEST_KEY2NAME, TEST_KEY2VALUE);
-        l.setExtras(bundle);
-
-        return l;
-    }
-
-    private void assertTestBundle(Bundle bundle) {
-        assertFalse(bundle.getBoolean(TEST_KEY1NAME));
-        assertEquals(TEST_KEY2VALUE, bundle.getByte(TEST_KEY2NAME));
+        try {
+            l.writeToParcel(parcel, 0);
+            parcel.setDataPosition(0);
+            assertThat(Location.CREATOR.createFromParcel(parcel)).isEqualTo(l);
+        } finally {
+            parcel.recycle();
+        }
     }
 }
diff --git a/tests/location/location_privileged/src/android/location/cts/privileged/GnssExcessPathInfoTest.java b/tests/location/location_privileged/src/android/location/cts/privileged/GnssExcessPathInfoTest.java
new file mode 100644
index 0000000..3c2b8e7
--- /dev/null
+++ b/tests/location/location_privileged/src/android/location/cts/privileged/GnssExcessPathInfoTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2022 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 android.location.cts.privileged;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.location.GnssExcessPathInfo;
+import android.os.Parcel;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests fundamental functionality of {@link GnssExcessPathInfo}. This includes writing and reading
+ * from parcel, and verifying setters.
+ */
+@RunWith(AndroidJUnit4.class)
+public class GnssExcessPathInfoTest {
+
+    private static final double DELTA = 0.000001;
+
+    @Test
+    public void testGetValues() {
+        GnssExcessPathInfo GnssExcessPathInfo = createTestGnssExcessPathInfo();
+        verifyTestValues(GnssExcessPathInfo);
+    }
+
+    @Test
+    public void testWriteToParcel() {
+        GnssExcessPathInfo gnssExcessPathInfo = createTestGnssExcessPathInfo();
+        Parcel parcel = Parcel.obtain();
+        gnssExcessPathInfo.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        GnssExcessPathInfo newGnssExcessPathInfo =
+                GnssExcessPathInfo.CREATOR.createFromParcel(parcel);
+        verifyTestValues(newGnssExcessPathInfo);
+        parcel.recycle();
+    }
+
+    @Test
+    public void testClear() {
+        GnssExcessPathInfo.Builder builder = createTestGnssExcessPathInfoBuilder();
+        builder.clearExcessPathLengthMeters();
+        builder.clearExcessPathLengthUncertaintyMeters();
+        builder.setReflectingPlane(null);
+        builder.clearAttenuationDb();
+        GnssExcessPathInfo gnssExcessPathInfo = builder.build();
+
+        assertFalse(gnssExcessPathInfo.hasExcessPathLength());
+        assertFalse(gnssExcessPathInfo.hasExcessPathLengthUncertainty());
+        assertFalse(gnssExcessPathInfo.hasReflectingPlane());
+        assertFalse(gnssExcessPathInfo.hasAttenuation());
+    }
+
+    private static GnssExcessPathInfo.Builder createTestGnssExcessPathInfoBuilder() {
+        return new GnssExcessPathInfo.Builder()
+                .setExcessPathLengthMeters(10.5f)
+                .setExcessPathLengthUncertaintyMeters(5.2f)
+                .setReflectingPlane(
+                        GnssSingleSatCorrectionTest.createTestReflectingPlane())
+                .setAttenuationDb(2.9f);
+    }
+
+    static GnssExcessPathInfo createTestGnssExcessPathInfo() {
+        return createTestGnssExcessPathInfoBuilder().build();
+    }
+
+    static void verifyTestValues(GnssExcessPathInfo gnssExcessPathInfo) {
+        assertTrue(gnssExcessPathInfo.hasExcessPathLength());
+        assertTrue(gnssExcessPathInfo.hasExcessPathLengthUncertainty());
+        assertTrue(gnssExcessPathInfo.hasReflectingPlane());
+        assertTrue(gnssExcessPathInfo.hasAttenuation());
+
+        assertEquals(10.5f, gnssExcessPathInfo.getExcessPathLengthMeters(), DELTA);
+        assertEquals(5.2f, gnssExcessPathInfo.getExcessPathLengthUncertaintyMeters(), DELTA);
+        assertEquals(GnssSingleSatCorrectionTest.createTestReflectingPlane(),
+                gnssExcessPathInfo.getReflectingPlane());
+        assertEquals(2.9f, gnssExcessPathInfo.getAttenuationDb(), DELTA);
+    }
+}
diff --git a/tests/location/location_privileged/src/android/location/cts/privileged/GnssMeasurementCorrectionsInjectionTest.java b/tests/location/location_privileged/src/android/location/cts/privileged/GnssMeasurementCorrectionsInjectionTest.java
new file mode 100644
index 0000000..21f3d2b
--- /dev/null
+++ b/tests/location/location_privileged/src/android/location/cts/privileged/GnssMeasurementCorrectionsInjectionTest.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2022 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 android.location.cts.privileged;
+
+import android.Manifest;
+import android.content.Context;
+import android.location.GnssMeasurementCorrections;
+import android.location.GnssSingleSatCorrection;
+import android.location.GnssStatus;
+import android.location.Location;
+import android.location.cts.common.TestGnssStatusCallback;
+import android.location.cts.common.TestLocationListener;
+import android.location.cts.common.TestLocationManager;
+import android.location.cts.common.TestMeasurementUtil;
+import android.util.Log;
+
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assume.assumeTrue;
+
+/**
+ * Tests for {@link GnssMeasurementCorrections} injection.
+ *
+ * This class tests {@link GnssMeasurementCorrections} injection by requesting GNSS locations and
+ * GnssStatus, constructing {@link GnssMeasurementCorrections}, and injecting them via calling
+ * {@link android.location.LocationManager#injectGnssMeasurementCorrections()} API.
+ */
+@RunWith(AndroidJUnit4.class)
+public class GnssMeasurementCorrectionsInjectionTest {
+
+    private static final String TAG = "GnssMeasCorrTest";
+    private static final int LOCATION_TO_COLLECT_COUNT = 1;
+    private static final int STATUS_TO_COLLECT_COUNT = 3;
+    private TestLocationManager mTestLocationManager;
+
+    @Before
+    public void setUp() throws Exception {
+        Context context = ApplicationProvider.getApplicationContext();
+        mTestLocationManager = new TestLocationManager(context);
+        InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation()
+                .adoptShellPermissionIdentity(Manifest.permission.LOCATION_HARDWARE);
+        assumeTrue(TestMeasurementUtil.canTestRunOnCurrentDevice(mTestLocationManager, TAG));
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation()
+                .dropShellPermissionIdentity();
+    }
+
+    /**
+     * Tests {@link android.location.LocationManager#injectGnssMeasurementCorrections()}.
+     *
+     * Test steps:
+     * 1. Requests and waits for a GNSS location and GnssStatus.
+     * 2. Constructs a {@link GnssMeasurementCorrections} with the received location and GnssStatus
+     *    by setting all the satellites as line-of-sight of 1.0 probability.
+     * 3. Injects the constructed {@link GnssMeasurementCorrections} via
+     *    {@link android.location.LocationManager#injectGnssMeasurementCorrections()}.
+     */
+    @Test
+    public void testInjectGnssMeasurementCorrections() throws InterruptedException {
+        TestGnssStatusCallback testGnssStatusCallback =
+                new TestGnssStatusCallback(TAG, STATUS_TO_COLLECT_COUNT);
+        mTestLocationManager.registerGnssStatusCallback(testGnssStatusCallback);
+
+        TestLocationListener locationListener = new TestLocationListener(LOCATION_TO_COLLECT_COUNT);
+        mTestLocationManager.requestLocationUpdates(locationListener);
+
+        boolean success = testGnssStatusCallback.awaitStatus() && testGnssStatusCallback.awaitTtff()
+                && locationListener.await();
+        mTestLocationManager.removeLocationUpdates(locationListener);
+        mTestLocationManager.unregisterGnssStatusCallback(testGnssStatusCallback);
+
+        if (success) {
+            Log.i(TAG, "Successfully received " + LOCATION_TO_COLLECT_COUNT
+                    + " GNSS locations.");
+        }
+
+        Assert.assertTrue("Time elapsed without getting enough regular GNSS locations."
+                + " Possibly, the test has been run deep indoors."
+                + " Consider retrying test outdoors.", success);
+
+        GnssStatus gnssStatus = testGnssStatusCallback.getGnssStatus();
+        List<GnssSingleSatCorrection> singleSatCorrectionList = getGnssSingleSatCorrectionList(
+                gnssStatus);
+
+        List<Location> locations = locationListener.getReceivedLocationList();
+        Log.i(TAG, "Received location list size = " + locations.size());
+        Assert.assertTrue("Received location list must be non-empty.", locations.size() > 0);
+        for (Location location : locations) {
+            GnssMeasurementCorrections corrections = new GnssMeasurementCorrections.Builder()
+                    .setLatitudeDegrees(location.getLatitude())
+                    .setLongitudeDegrees(location.getLongitude())
+                    .setAltitudeMeters(location.getAltitude())
+                    .setSingleSatelliteCorrectionList(singleSatCorrectionList)
+                    .build();
+            mTestLocationManager.getLocationManager().injectGnssMeasurementCorrections(corrections);
+        }
+    }
+
+    private static List<GnssSingleSatCorrection> getGnssSingleSatCorrectionList(
+            GnssStatus gnssStatus) {
+        List<GnssSingleSatCorrection> list = new ArrayList<>(gnssStatus.getSatelliteCount());
+        for (int i = 0; i < gnssStatus.getSatelliteCount(); i++) {
+            GnssSingleSatCorrection correction = new GnssSingleSatCorrection.Builder()
+                    .setConstellationType(gnssStatus.getConstellationType(i))
+                    .setCarrierFrequencyHz(gnssStatus.getCarrierFrequencyHz(i))
+                    .setSatelliteId(gnssStatus.getSvid(i))
+                    .setProbabilityLineOfSight(1.0f) // assume all satellites are in line-of-sight
+                    .build();
+            list.add(correction);
+        }
+        return list;
+    }
+}
diff --git a/tests/location/location_privileged/src/android/location/cts/privileged/GnssSingleSatCorrectionTest.java b/tests/location/location_privileged/src/android/location/cts/privileged/GnssSingleSatCorrectionTest.java
new file mode 100644
index 0000000..24691b4
--- /dev/null
+++ b/tests/location/location_privileged/src/android/location/cts/privileged/GnssSingleSatCorrectionTest.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2022 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 android.location.cts.privileged;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.location.GnssExcessPathInfo;
+import android.location.GnssReflectingPlane;
+import android.location.GnssSingleSatCorrection;
+import android.location.GnssStatus;
+import android.os.Parcel;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+
+/**
+ * Tests fundamental functionality of {@link GnssSingleSatCorrection}. This includes writing and
+ * reading from parcel, and verifying setters.
+ */
+@RunWith(AndroidJUnit4.class)
+public class GnssSingleSatCorrectionTest {
+    private static final double DELTA = 0.000001;
+
+    @Test
+    public void testGetValues() {
+        GnssSingleSatCorrection gnssSingleSatCorrection = createTestSingleSatCorrection();
+        verifyTestValues(gnssSingleSatCorrection);
+    }
+
+    @Test
+    public void testWriteToParcel() {
+        GnssSingleSatCorrection gnssSingleSatCorrection = createTestSingleSatCorrection();
+        Parcel parcel = Parcel.obtain();
+        gnssSingleSatCorrection.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        GnssSingleSatCorrection newGnssSingleSatCorrection =
+                GnssSingleSatCorrection.CREATOR.createFromParcel(parcel);
+        verifyTestValues(newGnssSingleSatCorrection);
+        assertEquals(newGnssSingleSatCorrection, gnssSingleSatCorrection);
+        parcel.recycle();
+    }
+
+    @Test
+    public void testWriteToParcelWithoutSomeOptionalFields() {
+        GnssSingleSatCorrection object = new GnssSingleSatCorrection.Builder()
+                .setConstellationType(GnssStatus.CONSTELLATION_GALILEO)
+                .setSatelliteId(12)
+                .setCarrierFrequencyHz(1575420000f)
+                .setProbabilityLineOfSight(0.1f)
+                .build();
+        Parcel parcel = Parcel.obtain();
+        object.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        GnssSingleSatCorrection fromParcel =
+                GnssSingleSatCorrection.CREATOR.createFromParcel(parcel);
+        assertEquals(object, fromParcel);
+        parcel.recycle();
+    }
+
+    @Test
+    public void testClear() {
+        GnssSingleSatCorrection.Builder builder = createTestSingleSatCorrectionBuilder();
+        builder.clearProbabilityLineOfSight();
+        builder.clearExcessPathLengthMeters();
+        builder.clearExcessPathLengthUncertaintyMeters();
+        builder.clearCombinedAttenuationDb();
+        GnssSingleSatCorrection singleSatCorrection = builder.build();
+
+        assertFalse(singleSatCorrection.hasValidSatelliteLineOfSight());
+        assertFalse(singleSatCorrection.hasExcessPathLength());
+        assertFalse(singleSatCorrection.hasExcessPathLengthUncertainty());
+        assertFalse(singleSatCorrection.hasCombinedAttenuation());
+    }
+
+    private static GnssSingleSatCorrection.Builder createTestSingleSatCorrectionBuilder() {
+        return new GnssSingleSatCorrection.Builder()
+                        .setConstellationType(GnssStatus.CONSTELLATION_GALILEO)
+                        .setSatelliteId(12)
+                        .setCarrierFrequencyHz(1575420000f)
+                        .setProbabilityLineOfSight(0.1f)
+                        .setExcessPathLengthMeters(10.0f)
+                        .setExcessPathLengthUncertaintyMeters(5.0f)
+                        .setCombinedAttenuationDb(2.1f)
+                        .setGnssExcessPathInfoList(List.of(GnssExcessPathInfoTest
+                                .createTestGnssExcessPathInfo()));
+    }
+
+    static GnssSingleSatCorrection createTestSingleSatCorrection() {
+        return createTestSingleSatCorrectionBuilder().build();
+    }
+
+    static GnssReflectingPlane createTestReflectingPlane() {
+        GnssReflectingPlane.Builder reflectingPlane =
+                new GnssReflectingPlane.Builder()
+                        .setLatitudeDegrees(37.386052)
+                        .setLongitudeDegrees(-122.083853)
+                        .setAltitudeMeters(100.0)
+                        .setAzimuthDegrees(123.0);
+        return reflectingPlane.build();
+    }
+
+    private static void verifyTestValues(GnssSingleSatCorrection singleSatCorrection) {
+        assertTrue(singleSatCorrection.hasValidSatelliteLineOfSight());
+        assertTrue(singleSatCorrection.hasExcessPathLength());
+        assertTrue(singleSatCorrection.hasExcessPathLengthUncertainty());
+        assertTrue(singleSatCorrection.hasCombinedAttenuation());
+        assertEquals(GnssStatus.CONSTELLATION_GALILEO,
+                singleSatCorrection.getConstellationType());
+        assertEquals(12, singleSatCorrection.getSatelliteId());
+        assertEquals(1575420000f, singleSatCorrection.getCarrierFrequencyHz(), DELTA);
+        assertEquals(0.1f, singleSatCorrection.getProbabilityLineOfSight(), DELTA);
+        assertEquals(10.0f, singleSatCorrection.getExcessPathLengthMeters(), DELTA);
+        assertEquals(5.0f, singleSatCorrection.getExcessPathLengthUncertaintyMeters(), DELTA);
+        assertEquals(2.1f, singleSatCorrection.getCombinedAttenuationDb(), DELTA);
+        List<GnssExcessPathInfo> gnssExcessPathInfos =
+                singleSatCorrection.getGnssExcessPathInfoList();
+        assertEquals(1, gnssExcessPathInfos.size());
+        GnssExcessPathInfoTest.verifyTestValues(gnssExcessPathInfos.get(0));
+    }
+}
diff --git a/tests/location/location_privileged/src/android/location/cts/privileged/SatellitePvtTest.java b/tests/location/location_privileged/src/android/location/cts/privileged/SatellitePvtTest.java
index 7495d5b..e2dad29 100644
--- a/tests/location/location_privileged/src/android/location/cts/privileged/SatellitePvtTest.java
+++ b/tests/location/location_privileged/src/android/location/cts/privileged/SatellitePvtTest.java
@@ -17,11 +17,12 @@
 package android.location.cts.privileged;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import android.location.SatellitePvt;
+import android.location.SatellitePvt.ClockInfo;
 import android.location.SatellitePvt.PositionEcef;
 import android.location.SatellitePvt.VelocityEcef;
-import android.location.SatellitePvt.ClockInfo;
 import android.os.Parcel;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -46,8 +47,13 @@
     @Test
     public void testWriteToParcel() {
         SatellitePvt satellitePvt1 = createTestSatellitePvt(POSITION_ECEF_M, VELOCITY_ECEF_MPS,
-                                        CLOCK_INFO, /*ionoDelayMeters=*/ 12.0,
-                                        /*tropoDelayMeters=*/ 13.0);
+                CLOCK_INFO, /*ionoDelayMeters=*/ 12.0,
+                /*tropoDelayMeters=*/ 13.0,
+                /* timeOfClock= */ 1234,
+                /* timeOfEphemeris= */ 2345,
+                /* issueOfDataClock= */ 45,
+                /* issueOfDataEphemeris= */ 234,
+                /* ephemerisSource= */ 2);
         Parcel parcel = Parcel.obtain();
         satellitePvt1.writeToParcel(parcel, 0);
         parcel.setDataPosition(0);
@@ -81,17 +87,37 @@
                      satPvt2.getClockInfo().getClockDriftMetersPerSecond(), DELTA);
         assertEquals(satPvt1.getIonoDelayMeters(), satPvt2.getIonoDelayMeters(), DELTA);
         assertEquals(satPvt1.getTropoDelayMeters(), satPvt2.getTropoDelayMeters(), DELTA);
+
+        assertTrue(satPvt1.hasTimeOfClockSeconds());
+        assertTrue(satPvt2.hasTimeOfClockSeconds());
+        assertEquals(satPvt1.getTimeOfClockSeconds(), satPvt2.getTimeOfClockSeconds());
+        assertTrue(satPvt1.hasTimeOfEphemerisSeconds());
+        assertTrue(satPvt2.hasTimeOfEphemerisSeconds());
+        assertEquals(satPvt1.getTimeOfEphemerisSeconds(), satPvt2.getTimeOfEphemerisSeconds());
+        assertTrue(satPvt1.hasIssueOfDataClock());
+        assertTrue(satPvt2.hasIssueOfDataClock());
+        assertEquals(satPvt1.getIssueOfDataClock(), satPvt2.getIssueOfDataClock());
+        assertTrue(satPvt1.hasIssueOfDataEphemeris());
+        assertTrue(satPvt2.hasIssueOfDataEphemeris());
+        assertEquals(satPvt1.getIssueOfDataEphemeris(), satPvt2.getIssueOfDataEphemeris());
+        assertEquals(satPvt1.getEphemerisSource(), satPvt2.getEphemerisSource());
     }
 
-    private static SatellitePvt createTestSatellitePvt (
+    private static SatellitePvt createTestSatellitePvt(
             PositionEcef positionEcef, VelocityEcef velocityEcef, ClockInfo clockInfo,
-                    double ionoDelayMeters, double tropoDelayMeters) {
+            double ionoDelayMeters, double tropoDelayMeters, int timeOfClock, int timeOfEphemeris,
+            int issueOfDataClock, int issueOfDataEphemeris, int ephemerisSource) {
         return new SatellitePvt.Builder()
                 .setPositionEcef(positionEcef)
                 .setVelocityEcef(velocityEcef)
                 .setClockInfo(clockInfo)
                 .setIonoDelayMeters(ionoDelayMeters)
                 .setTropoDelayMeters(tropoDelayMeters)
+                .setTimeOfClockSeconds(timeOfClock)
+                .setTimeOfEphemerisSeconds(timeOfEphemeris)
+                .setIssueOfDataClock(issueOfDataClock)
+                .setIssueOfDataEphemeris(issueOfDataEphemeris)
+                .setEphemerisSource(ephemerisSource)
                 .build();
     }
 }
diff --git a/tests/media/jni/Android.bp b/tests/media/jni/Android.bp
index 95fb613..9810212 100644
--- a/tests/media/jni/Android.bp
+++ b/tests/media/jni/Android.bp
@@ -28,9 +28,6 @@
         "liblog",
     ],
     header_libs: ["liblog_headers"],
-    include_dirs: [
-        "frameworks/av/media/ndk/include/media",
-    ],
     stl: "libc++_static",
     cflags: [
         "-Werror",
@@ -53,9 +50,6 @@
         "libz",
     ],
     header_libs: ["liblog_headers"],
-    include_dirs: [
-        "frameworks/av/media/ndk/include/media",
-    ],
     stl: "libc++_static",
     cflags: [
         "-Werror",
@@ -82,9 +76,6 @@
         "libz",
     ],
     header_libs: ["liblog_headers"],
-    include_dirs: [
-        "frameworks/av/media/ndk/include/media",
-    ],
     stl: "libc++_static",
     cflags: [
         "-Werror",
@@ -104,9 +95,6 @@
         "liblog",
     ],
     header_libs: ["liblog_headers"],
-    include_dirs: [
-        "frameworks/av/media/ndk/include/media",
-    ],
     stl: "libc++_static",
     cflags: [
         "-Werror",
diff --git a/tests/media/jni/NativeCodecDecoderTest.cpp b/tests/media/jni/NativeCodecDecoderTest.cpp
index 4112d17..9a34ce8 100644
--- a/tests/media/jni/NativeCodecDecoderTest.cpp
+++ b/tests/media/jni/NativeCodecDecoderTest.cpp
@@ -17,9 +17,10 @@
 //#define LOG_NDEBUG 0
 #define LOG_TAG "NativeCodecDecoderTest"
 #include <log/log.h>
+
 #include <android/native_window_jni.h>
-#include <NdkMediaExtractor.h>
 #include <jni.h>
+#include <media/NdkMediaExtractor.h>
 #include <sys/stat.h>
 
 #include <array>
diff --git a/tests/media/jni/NativeCodecEncoderSurfaceTest.cpp b/tests/media/jni/NativeCodecEncoderSurfaceTest.cpp
index b8825bc..69e264a 100644
--- a/tests/media/jni/NativeCodecEncoderSurfaceTest.cpp
+++ b/tests/media/jni/NativeCodecEncoderSurfaceTest.cpp
@@ -17,10 +17,11 @@
 //#define LOG_NDEBUG 0
 #define LOG_TAG "NativeCodecEncoderSurfaceTest"
 #include <log/log.h>
+
 #include <android/native_window_jni.h>
-#include <NdkMediaExtractor.h>
-#include <NdkMediaMuxer.h>
 #include <jni.h>
+#include <media/NdkMediaExtractor.h>
+#include <media/NdkMediaMuxer.h>
 #include <sys/stat.h>
 
 #include "NativeCodecTestBase.h"
diff --git a/tests/media/jni/NativeCodecTestBase.h b/tests/media/jni/NativeCodecTestBase.h
index d8256a8..9a22108 100644
--- a/tests/media/jni/NativeCodecTestBase.h
+++ b/tests/media/jni/NativeCodecTestBase.h
@@ -17,7 +17,7 @@
 #ifndef MEDIACTSNATIVE_NATIVE_CODEC_TEST_BASE_H
 #define MEDIACTSNATIVE_NATIVE_CODEC_TEST_BASE_H
 
-#include <NdkMediaCodec.h>
+#include <media/NdkMediaCodec.h>
 #include <zlib.h>
 
 #include <cmath>
diff --git a/tests/media/jni/NativeCodecUnitTest.cpp b/tests/media/jni/NativeCodecUnitTest.cpp
index aa27619..71045f741 100644
--- a/tests/media/jni/NativeCodecUnitTest.cpp
+++ b/tests/media/jni/NativeCodecUnitTest.cpp
@@ -16,9 +16,10 @@
 
 //#define LOG_NDEBUG 0
 #define LOG_TAG "NativeCodecUnitTest"
-#include <NdkMediaExtractor.h>
-#include <jni.h>
 #include <log/log.h>
+
+#include <jni.h>
+#include <media/NdkMediaExtractor.h>
 #include <sys/stat.h>
 
 #include <thread>
diff --git a/tests/media/jni/NativeExtractorTest.cpp b/tests/media/jni/NativeExtractorTest.cpp
index de0fae8..bf88f28 100644
--- a/tests/media/jni/NativeExtractorTest.cpp
+++ b/tests/media/jni/NativeExtractorTest.cpp
@@ -18,8 +18,8 @@
 #define LOG_TAG "NativeExtractorTest"
 #include <log/log.h>
 
-#include <NdkMediaExtractor.h>
 #include <jni.h>
+#include <media/NdkMediaExtractor.h>
 #include <sys/stat.h>
 #include <zlib.h>
 
diff --git a/tests/media/jni/NativeExtractorUnitTest.cpp b/tests/media/jni/NativeExtractorUnitTest.cpp
index 1c7792a..72809f3 100644
--- a/tests/media/jni/NativeExtractorUnitTest.cpp
+++ b/tests/media/jni/NativeExtractorUnitTest.cpp
@@ -18,8 +18,8 @@
 #define LOG_TAG "NativeExtractorUnitTest"
 #include <log/log.h>
 
-#include <NdkMediaExtractor.h>
 #include <jni.h>
+#include <media/NdkMediaExtractor.h>
 #include <sys/stat.h>
 
 #include <cstdlib>
diff --git a/tests/media/jni/NativeMediaCommon.h b/tests/media/jni/NativeMediaCommon.h
index ca969e4..fd8aba1 100644
--- a/tests/media/jni/NativeMediaCommon.h
+++ b/tests/media/jni/NativeMediaCommon.h
@@ -18,7 +18,7 @@
 #define MEDIACTSNATIVE_NATIVE_MEDIA_COMMON_H
 
 #include <inttypes.h>
-#include <NdkMediaFormat.h>
+#include <media/NdkMediaFormat.h>
 
 extern const char* AMEDIA_MIMETYPE_VIDEO_VP8;
 extern const char* AMEDIA_MIMETYPE_VIDEO_VP9;
diff --git a/tests/media/jni/NativeMediaFormatUnitTest.cpp b/tests/media/jni/NativeMediaFormatUnitTest.cpp
index e3241a3..3caf939 100644
--- a/tests/media/jni/NativeMediaFormatUnitTest.cpp
+++ b/tests/media/jni/NativeMediaFormatUnitTest.cpp
@@ -17,8 +17,9 @@
 //#define LOG_NDEBUG 0
 #define LOG_TAG "NativeMediaFormatUnitTest"
 #include <log/log.h>
+
 #include <jni.h>
-#include <NdkMediaFormat.h>
+#include <media/NdkMediaFormat.h>
 
 #include <cinttypes>
 #include <map>
diff --git a/tests/media/jni/NativeMuxerTest.cpp b/tests/media/jni/NativeMuxerTest.cpp
index 28e575b..a9fb1aa 100644
--- a/tests/media/jni/NativeMuxerTest.cpp
+++ b/tests/media/jni/NativeMuxerTest.cpp
@@ -18,14 +18,14 @@
 #define LOG_TAG "NativeMuxerTest"
 #include <log/log.h>
 
-#include <NdkMediaExtractor.h>
-#include <NdkMediaFormat.h>
-#include <NdkMediaMuxer.h>
+#include <dlfcn.h>
 #include <fcntl.h>
 #include <jni.h>
+#include <media/NdkMediaExtractor.h>
+#include <media/NdkMediaFormat.h>
+#include <media/NdkMediaMuxer.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <dlfcn.h>
 
 #include <cmath>
 #include <cstring>
diff --git a/tests/media/jni/NativeMuxerUnitTest.cpp b/tests/media/jni/NativeMuxerUnitTest.cpp
index 78af59d..10eef1c 100644
--- a/tests/media/jni/NativeMuxerUnitTest.cpp
+++ b/tests/media/jni/NativeMuxerUnitTest.cpp
@@ -18,11 +18,11 @@
 #define LOG_TAG "NativeMuxerUnitTest"
 #include <log/log.h>
 
-#include <NdkMediaExtractor.h>
-#include <NdkMediaFormat.h>
-#include <NdkMediaMuxer.h>
 #include <fcntl.h>
 #include <jni.h>
+#include <media/NdkMediaExtractor.h>
+#include <media/NdkMediaFormat.h>
+#include <media/NdkMediaMuxer.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
diff --git a/tests/media/src/android/mediav2/cts/MuxerTest.java b/tests/media/src/android/mediav2/cts/MuxerTest.java
index 10bfb68..33c6fdb 100644
--- a/tests/media/src/android/mediav2/cts/MuxerTest.java
+++ b/tests/media/src/android/mediav2/cts/MuxerTest.java
@@ -481,7 +481,7 @@
         private native boolean nativeTestGetTrackFormat(String srcPath, String outPath,
                 int outFormat);
 
-        private void verifyLocationInFile(String fileName) {
+        private void verifyLocationInFile(String fileName) throws IOException {
             if (mOutFormat != MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4 &&
                     mOutFormat != MediaMuxer.OutputFormat.MUXER_OUTPUT_3GPP) return;
             MediaMetadataRetriever retriever = new MediaMetadataRetriever();
@@ -514,7 +514,7 @@
             retriever.release();
         }
 
-        private void verifyOrientation(String fileName) {
+        private void verifyOrientation(String fileName) throws IOException {
             if (mOutFormat != MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4 &&
                     mOutFormat != MediaMuxer.OutputFormat.MUXER_OUTPUT_3GPP) return;
             MediaMetadataRetriever retriever = new MediaMetadataRetriever();
@@ -695,14 +695,14 @@
         }
 
         @Test
-        public void testSetLocationNative() {
+        public void testSetLocationNative() throws IOException {
             Assume.assumeTrue(shouldRunTest(mOutFormat));
             assertTrue(nativeTestSetLocation(mOutFormat, mInpPath, mOutPath));
             verifyLocationInFile(mOutPath);
         }
 
         @Test
-        public void testSetOrientationHintNative() {
+        public void testSetOrientationHintNative() throws IOException {
             Assume.assumeTrue(shouldRunTest(mOutFormat));
             assertTrue(nativeTestSetOrientationHint(mOutFormat, mInpPath, mOutPath));
             verifyOrientation(mOutPath);
diff --git a/tests/mediapc/OWNERS b/tests/mediapc/OWNERS
index 091c4df..d61c4a2 100644
--- a/tests/mediapc/OWNERS
+++ b/tests/mediapc/OWNERS
@@ -1,7 +1,6 @@
 # Bug component: 1344
 # include media developers and framework video team
 include platform/frameworks/av:/media/OWNERS
-chz@google.com
 dichenzhang@google.com
 essick@google.com
 gokrishnan@google.com
diff --git a/tests/ondevicepersonalization/Android.bp b/tests/ondevicepersonalization/Android.bp
new file mode 100644
index 0000000..738effe
--- /dev/null
+++ b/tests/ondevicepersonalization/Android.bp
@@ -0,0 +1,44 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsOnDevicePersonalizationTestCases",
+    defaults: [
+        "cts_defaults",
+        "framework-ondevicepersonalization-cts-defaults",
+    ],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+        "mts-ondevicepersonalization",
+    ],
+    libs: [
+        "android.test.runner",
+    ],
+    static_libs: [
+        "androidx.test.ext.junit",
+        "ctstestrunner-axt",
+        "compatibility-device-util-axt",
+        "mockito-target-minus-junit4",
+    ],
+    srcs: [
+        "src/**/*.java",
+    ],
+    platform_apis: false,
+}
diff --git a/tests/ondevicepersonalization/AndroidManifest.xml b/tests/ondevicepersonalization/AndroidManifest.xml
new file mode 100644
index 0000000..8016e92
--- /dev/null
+++ b/tests/ondevicepersonalization/AndroidManifest.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2022 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.ondevicepersonalization.cts">
+
+    <!--  self-instrumenting test package. -->
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:label="CTS tests for android.ondevicepersonalization"
+        android:targetPackage="android.ondevicepersonalization.cts" >
+    </instrumentation>
+</manifest>
diff --git a/tests/ondevicepersonalization/AndroidTest.xml b/tests/ondevicepersonalization/AndroidTest.xml
new file mode 100644
index 0000000..1ca3ae6
--- /dev/null
+++ b/tests/ondevicepersonalization/AndroidTest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<configuration description="Config for CTS OnDevicePersonalization test cases">
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.ondevicepersonalization.apex" />
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsOnDevicePersonalizationTestCases.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.ondevicepersonalization.cts" />
+        <option name="hidden-api-checks" value="false" />
+    </test>
+
+    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+        <option name="mainline-module-package-name" value="com.google.android.ondevicepersonalization" />
+    </object>
+</configuration>
\ No newline at end of file
diff --git a/tests/ondevicepersonalization/OWNERS b/tests/ondevicepersonalization/OWNERS
new file mode 100644
index 0000000..57cdbaf
--- /dev/null
+++ b/tests/ondevicepersonalization/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 1117807
+include platform/packages/modules/OnDevicePersonalization:/OWNERS
\ No newline at end of file
diff --git a/tests/ondevicepersonalization/src/android/ondevicepersonalization/cts/OnDevicePersonalizationServiceTest.java b/tests/ondevicepersonalization/src/android/ondevicepersonalization/cts/OnDevicePersonalizationServiceTest.java
new file mode 100644
index 0000000..16db9a9
--- /dev/null
+++ b/tests/ondevicepersonalization/src/android/ondevicepersonalization/cts/OnDevicePersonalizationServiceTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2022 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 android.ondevicepersonalization.cts;
+
+import static org.junit.Assert.assertEquals;
+
+import android.content.Context;
+import android.ondevicepersonalization.OnDevicePersonalizationManager;
+
+import androidx.test.core.app.ApplicationProvider;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ * Test of {@link OnDevicePersonalizationManager}
+ */
+@RunWith(JUnit4.class)
+public class OnDevicePersonalizationServiceTest {
+    private Context mContext;
+    private OnDevicePersonalizationManager mService;
+
+    @Before
+    public void setup() throws Exception {
+        mContext = ApplicationProvider.getApplicationContext();
+        mService = new OnDevicePersonalizationManager(mContext);
+    }
+
+    @Test
+    public void testVersion() throws Exception {
+        assertEquals(mService.getVersion(), "1.0");
+    }
+}
diff --git a/tests/process/Android.bp b/tests/process/Android.bp
new file mode 100644
index 0000000..a70625f
--- /dev/null
+++ b/tests/process/Android.bp
@@ -0,0 +1,101 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+// We build the main test APK and helper APKs from the same source code,
+// just so they can easily share the constants, etc.
+
+java_library {
+    name: "CtsProcessTestCore",
+    static_libs: [
+        "androidx.test.ext.junit",
+        "androidx.test.rules",
+        "compatibility-device-util-axt",
+        "guava",
+        "truth-prebuilt",
+        "testng",
+    ],
+    libs: ["android.test.base"],
+    srcs: [
+        "src/**/*.java",
+    ],
+}
+
+java_defaults {
+    name: "CtsProcessTest_default",
+    static_libs: [
+        "CtsProcessTestCore",
+    ],
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    sdk_version: "test_current",
+}
+
+android_test {
+    name: "CtsProcessTest",
+    defaults: [
+        "cts_defaults",
+        "CtsProcessTest_default",
+    ],
+    manifest: "AndroidManifest_main.xml",
+}
+
+android_test_helper_app {
+    name: "CtsProcessTestHelper1",
+    defaults: ["CtsProcessTest_default"],
+
+    manifest: "AndroidManifest_helper1.xml",
+    additional_manifests: [
+        "AndroidManifest_helper.xml",
+    ],
+    package_name: "android.os.cts.process.helper1",
+}
+
+android_test_helper_app {
+    name: "CtsProcessTestHelper2",
+    defaults: ["CtsProcessTest_default"],
+
+    manifest: "AndroidManifest_helper2.xml",
+    additional_manifests: [
+        "AndroidManifest_helper.xml",
+    ],
+    package_name: "android.os.cts.process.helper2",
+}
+
+android_test_helper_app {
+    name: "CtsProcessTestHelper3",
+    defaults: ["CtsProcessTest_default"],
+
+    manifest: "AndroidManifest_helper3.xml",
+    additional_manifests: [
+        "AndroidManifest_helper.xml",
+    ],
+    package_name: "android.os.cts.process.helper3",
+}
+
+android_test_helper_app {
+    name: "CtsProcessTestHelper4",
+    defaults: ["CtsProcessTest_default"],
+
+    manifest: "AndroidManifest_helper4.xml",
+    additional_manifests: [
+        "AndroidManifest_helper.xml",
+    ],
+    package_name: "android.os.cts.process.helper4",
+}
diff --git a/tests/process/AndroidManifest_helper.xml b/tests/process/AndroidManifest_helper.xml
new file mode 100644
index 0000000..45ac951
--- /dev/null
+++ b/tests/process/AndroidManifest_helper.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.os.cts.process.helper" >
+
+    <application>
+        <receiver android:name=".MyReceiver0"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="ACTION_SEND_BACK_START_TIME" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".MyReceiver1"
+            android:exported="true"
+            android:process=":sub1">
+            <intent-filter>
+                <action android:name="ACTION_SEND_BACK_START_TIME" />
+            </intent-filter>
+        </receiver>
+        <receiver android:name=".MyReceiver2"
+            android:exported="true"
+            android:process=":sub2">
+            <intent-filter>
+                <action android:name="ACTION_SEND_BACK_START_TIME" />
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/process/AndroidManifest_helper1.xml b/tests/process/AndroidManifest_helper1.xml
new file mode 100644
index 0000000..b59ea1b
--- /dev/null
+++ b/tests/process/AndroidManifest_helper1.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.os.cts.process.helper" >
+
+    <application>
+        <processes>
+            <process /> <!-- For the main process -->
+            <process android:process=":sub1" android:name=".Application1" />
+            <process android:process=":sub2"/>
+        </processes>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/process/AndroidManifest_helper2.xml b/tests/process/AndroidManifest_helper2.xml
new file mode 100644
index 0000000..89346bd
--- /dev/null
+++ b/tests/process/AndroidManifest_helper2.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.os.cts.process.helper" >
+
+    <application android:name=".Application1" >
+        <processes>
+            <process /> <!-- For the main process -->
+            <process android:process=":sub1" android:name=".Application1b" />
+            <process android:process=":sub2" android:name=".Application2b" />
+        </processes>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/process/AndroidManifest_helper3.xml b/tests/process/AndroidManifest_helper3.xml
new file mode 100644
index 0000000..9b9ef69
--- /dev/null
+++ b/tests/process/AndroidManifest_helper3.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.os.cts.process.helper"
+    android:sharedUserId="android.os.cts.process.helper.shared">
+
+    <application android:process="android.os.cts.process.helper.shared_process">
+        <processes>
+            <process android:process="android.os.cts.process.helper.shared_process" />
+            <process android:process=":sub1" android:name=".Application1c" />
+            <process android:process=":sub2"/>
+            <process android:process="android.os.cts.process.helper.shared.sub3" android:name=".Application3" />
+        </processes>
+        <receiver android:name=".MyReceiver3"
+            android:exported="true"
+            android:process="android.os.cts.process.helper.shared.sub3">
+            <intent-filter>
+                <action android:name="ACTION_SEND_BACK_START_TIME" />
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/process/AndroidManifest_helper4.xml b/tests/process/AndroidManifest_helper4.xml
new file mode 100644
index 0000000..508dae2
--- /dev/null
+++ b/tests/process/AndroidManifest_helper4.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.os.cts.process.helper"
+    android:sharedUserId="android.os.cts.process.helper.shared">
+
+    <application android:process="android.os.cts.process.helper.shared_process"
+            android:name=".Application1" >
+        <processes>
+            <process android:process="android.os.cts.process.helper.shared_process" />
+            <process android:process=":sub1"/>
+            <process android:process=":sub2" android:name=".Application2" />
+            <process android:process="android.os.cts.process.helper.shared.sub3" android:name=".Application3b" />
+        </processes>
+        <receiver android:name=".MyReceiver3"
+            android:exported="true"
+            android:process="android.os.cts.process.helper.shared.sub3">
+            <intent-filter>
+                <action android:name="ACTION_SEND_BACK_START_TIME" />
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/process/AndroidManifest_main.xml b/tests/process/AndroidManifest_main.xml
new file mode 100644
index 0000000..3ce892e
--- /dev/null
+++ b/tests/process/AndroidManifest_main.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.os.cts.process" >
+
+    <application>
+        <uses-library android:name="android.test.runner"/>
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.os.cts.process" />
+</manifest>
\ No newline at end of file
diff --git a/tests/process/AndroidTest.xml b/tests/process/AndroidTest.xml
new file mode 100644
index 0000000..e3e9897
--- /dev/null
+++ b/tests/process/AndroidTest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<configuration description="Config for CTS BlobStore test cases">
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsProcessTest.apk" />
+        <option name="test-file-name" value="CtsProcessTestHelper1.apk" />
+        <option name="test-file-name" value="CtsProcessTestHelper2.apk" />
+        <option name="test-file-name" value="CtsProcessTestHelper3.apk" />
+        <option name="test-file-name" value="CtsProcessTestHelper4.apk" />
+    </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="am wait-for-broadcast-idle" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.os.cts.process" />
+    </test>
+</configuration>
diff --git a/tests/process/OWNERS b/tests/process/OWNERS
new file mode 100644
index 0000000..3b15c95
--- /dev/null
+++ b/tests/process/OWNERS
@@ -0,0 +1,2 @@
+# Bug component: 316234
+include platform/frameworks/base:/services/core/java/com/android/server/am/OWNERS
diff --git a/tests/process/src/android/os/cts/process/ProcessTest2.java b/tests/process/src/android/os/cts/process/ProcessTest2.java
new file mode 100644
index 0000000..c45577e
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/ProcessTest2.java
@@ -0,0 +1,305 @@
+/*
+ * Copyright 2021 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 android.os.cts.process;
+
+import static android.os.cts.process.common.Consts.HELPER1_RECEIVER0;
+import static android.os.cts.process.common.Consts.HELPER1_RECEIVER1;
+import static android.os.cts.process.common.Consts.HELPER1_RECEIVER2;
+import static android.os.cts.process.common.Consts.HELPER2_RECEIVER0;
+import static android.os.cts.process.common.Consts.HELPER2_RECEIVER1;
+import static android.os.cts.process.common.Consts.HELPER2_RECEIVER2;
+import static android.os.cts.process.common.Consts.HELPER3_RECEIVER0;
+import static android.os.cts.process.common.Consts.HELPER3_RECEIVER1;
+import static android.os.cts.process.common.Consts.HELPER3_RECEIVER2;
+import static android.os.cts.process.common.Consts.HELPER3_RECEIVER3;
+import static android.os.cts.process.common.Consts.HELPER4_RECEIVER0;
+import static android.os.cts.process.common.Consts.HELPER4_RECEIVER1;
+import static android.os.cts.process.common.Consts.HELPER4_RECEIVER2;
+import static android.os.cts.process.common.Consts.HELPER4_RECEIVER3;
+import static android.os.cts.process.common.Consts.HELPER_SHARED_PROCESS_NAME;
+import static android.os.cts.process.common.Consts.PACKAGE_HELPER1;
+import static android.os.cts.process.common.Consts.PACKAGE_HELPER2;
+import static android.os.cts.process.common.Consts.PACKAGE_HELPER3;
+import static android.os.cts.process.common.Consts.PACKAGE_HELPER4;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.os.Process;
+import android.os.SystemClock;
+import android.os.cts.process.common.Consts;
+import android.os.cts.process.common.Message;
+import android.util.Log;
+import android.util.LogPrinter;
+import android.util.Printer;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
+
+import com.android.compatibility.common.util.BroadcastMessenger.Receiver;
+import com.android.compatibility.common.util.ShellUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * CTS for {@link android.os.Process}.
+ *
+ * We have more test in cts/tests/tests/os too.
+ */
+@RunWith(AndroidJUnit4ClassRunner.class)
+public class ProcessTest2 {
+    protected static final Context sContext = InstrumentationRegistry.getTargetContext();
+
+    /** Tell all the helper app processes to stop */
+    private static void stopAllHelperApps() throws Exception {
+        // Make sure all the broadcasts are delivered.
+        ShellUtils.runShellCommand("am wait-for-broadcast-idle");
+        Thread.sleep(500); // Just give the system a bit time to breathe.
+        ShellUtils.runShellCommand("am force-stop " + PACKAGE_HELPER1);
+        ShellUtils.runShellCommand("am force-stop " + PACKAGE_HELPER2);
+        ShellUtils.runShellCommand("am force-stop " + PACKAGE_HELPER3);
+        ShellUtils.runShellCommand("am force-stop " + PACKAGE_HELPER4);
+        Thread.sleep(500); // Just give the system a bit time to breathe.
+    }
+
+    public void checkStartTime(ComponentName cn, String expectedProcessName) throws Exception {
+        // Start the target process by sending a broadcast, and get back the results
+        // from the target APIs.
+        try (Receiver<Message> receiver = new Receiver<>(sContext, Consts.TAG)) {
+
+            // Start the first process.
+            Intent intent = new Intent(Consts.ACTION_SEND_BACK_START_TIME)
+                    .setComponent(cn)
+                    .setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+
+            final long beforeStartElapsedRealtime = SystemClock.elapsedRealtime();
+            final long beforeStartUptimeMillis = SystemClock.uptimeMillis();
+
+            sContext.sendBroadcast(intent);
+
+            final Message m = receiver.waitForNextMessage();
+
+            // Check the start times.
+            assertThat(m.startRequestedElapsedRealtime).isAtLeast(beforeStartElapsedRealtime);
+            assertThat(m.startElapsedRealtime).isAtLeast(m.startRequestedElapsedRealtime);
+
+            assertThat(m.startRequestedUptimeMillis).isAtLeast(beforeStartUptimeMillis);
+            assertThat(m.startUptimeMillis).isAtLeast(m.startRequestedUptimeMillis);
+
+            // Check the process name.
+            assertThat(m.processName).isEqualTo(expectedProcessName);
+
+            // There may be more message, if the process has a custom app class, but ignore that.
+        }
+    }
+
+    /**
+     * Test for:
+     * {@link Process#getStartElapsedRealtime()}
+     * {@link Process#getStartUptimeMillis()}
+     * {@link Process#getStartRequestedElapsedRealtime()}
+     * {@link Process#getStartRequestedUptimeMillis()}
+     */
+    @Test
+    public void testStartTime() throws Exception {
+        stopAllHelperApps();
+
+        // Main process.
+        checkStartTime(HELPER1_RECEIVER0, PACKAGE_HELPER1);
+
+        // Sub process.
+        checkStartTime(HELPER1_RECEIVER1, PACKAGE_HELPER1 + ":sub1");
+    }
+
+    /**
+     * Test for:
+     * {@link Process#getStartElapsedRealtime()}
+     * {@link Process#getStartUptimeMillis()}
+     * {@link Process#getStartRequestedElapsedRealtime()}
+     * {@link Process#getStartRequestedUptimeMillis()}
+     *
+     * but for a shared process.
+     */
+    @Test
+    public void testStartTime_sharedProcess() throws Exception {
+        stopAllHelperApps();
+
+        try (Receiver<Message> receiver = new Receiver<>(sContext, Consts.TAG)) {
+
+            // Bring up the first package on the same process.
+            final Intent intent = new Intent(Consts.ACTION_SEND_BACK_START_TIME)
+                    .setComponent(Consts.HELPER3_RECEIVER0)
+                    .setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+
+            final long beforeStartElapsedRealtime = SystemClock.elapsedRealtime();
+            final long beforeStartUptimeMillis = SystemClock.uptimeMillis();
+
+            sContext.sendBroadcast(intent);
+
+            final Message m = receiver.waitForNextMessage();
+
+            // Check the start times.
+
+            assertThat(m.startRequestedElapsedRealtime).isAtLeast(beforeStartElapsedRealtime);
+            assertThat(m.startElapsedRealtime).isAtLeast(m.startRequestedElapsedRealtime);
+
+            assertThat(m.startRequestedUptimeMillis).isAtLeast(beforeStartUptimeMillis);
+            assertThat(m.startUptimeMillis).isAtLeast(m.startRequestedUptimeMillis);
+
+            // Check the process name.
+            assertThat(m.processName).isEqualTo(HELPER_SHARED_PROCESS_NAME);
+
+            // Bring up the first package on the same process.
+            // The start request time should still be the same as the above result.
+            final Intent intent2 = new Intent(Consts.ACTION_SEND_BACK_START_TIME)
+                    .setComponent(Consts.HELPER4_RECEIVER0)
+                    .setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+
+            sContext.sendBroadcast(intent);
+
+            final Message m2 = receiver.waitForNextMessage();
+
+            assertThat(m2.startRequestedElapsedRealtime)
+                    .isEqualTo(m.startRequestedElapsedRealtime);
+            assertThat(m2.startRequestedUptimeMillis)
+                    .isEqualTo(m.startRequestedUptimeMillis);
+
+            assertThat(m2.processName).isEqualTo(HELPER_SHARED_PROCESS_NAME);
+
+            receiver.ensureNoMoreMessages();
+        }
+    }
+
+    private void checkApplicationClass(ComponentName receiverComponent,
+            @NonNull String expectedPackageName, @NonNull String expectedProcessName,
+            @Nullable String expectedApplicationClassName) throws Exception {
+
+        // Start the target process by sending a receiver, and get back the results
+        // from the target APIs.
+        try (Receiver<Message> receiver = new Receiver<>(sContext, Consts.TAG)) {
+
+            // Start the first process.
+            Intent intent = new Intent(Consts.ACTION_SEND_BACK_START_TIME)
+                    .setComponent(receiverComponent)
+                    .setFlags(Intent.FLAG_RECEIVER_FOREGROUND);
+
+            sContext.sendBroadcast(intent);
+
+            // If the process has a custom application class, then the first message should be from
+            // the application class.
+            if (expectedApplicationClassName != null) {
+                final Message m = receiver.waitForNextMessage();
+                Log.i(Consts.TAG, "Message (which is supposed to be from the application class): "
+                        + m);
+
+                assertThat(m.packageName).isEqualTo(expectedPackageName);
+                assertThat(m.processName).isEqualTo(expectedProcessName);
+                assertThat(m.applicationClassName).isEqualTo(expectedApplicationClassName);
+            }
+
+            // Then there should be a message from the receiver.
+            final Message m = receiver.waitForNextMessage();
+            Log.i(Consts.TAG, "Message (which is supposed to be from the receiver): " + m);
+
+            assertThat(m.packageName).isEqualTo(expectedPackageName);
+            assertThat(m.processName).isEqualTo(expectedProcessName);
+
+            if (expectedApplicationClassName != null) {
+                assertThat(m.applicationContextClassName).isEqualTo(expectedApplicationClassName);
+            } else {
+                // No custom app class, so the default app class should be used.
+                assertThat(m.applicationContextClassName)
+                        .isEqualTo(android.app.Application.class.getCanonicalName());
+            }
+
+            receiver.ensureNoMoreMessages();
+        }
+    }
+
+    /**
+     * Make sure the correct app class is instantiated in the app processes.
+     */
+    @Test
+    public void testApplicationClass() throws Exception {
+        stopAllHelperApps();
+
+        // Each receiver in each helper package runs on different processes, which may or may
+        // not have a custom application class.
+        checkApplicationClass(HELPER1_RECEIVER0, PACKAGE_HELPER1, PACKAGE_HELPER1,
+                null);
+        checkApplicationClass(HELPER1_RECEIVER1, PACKAGE_HELPER1, PACKAGE_HELPER1 + ":sub1",
+                "android.os.cts.process.helper.Application1");
+        checkApplicationClass(HELPER1_RECEIVER2, PACKAGE_HELPER1, PACKAGE_HELPER1 + ":sub2",
+                null);
+
+        checkApplicationClass(HELPER2_RECEIVER0, PACKAGE_HELPER2, PACKAGE_HELPER2,
+                "android.os.cts.process.helper.Application1");
+        checkApplicationClass(HELPER2_RECEIVER1, PACKAGE_HELPER2, PACKAGE_HELPER2 + ":sub1",
+                "android.os.cts.process.helper.Application1b");
+        checkApplicationClass(HELPER2_RECEIVER2, PACKAGE_HELPER2, PACKAGE_HELPER2 + ":sub2",
+                "android.os.cts.process.helper.Application2b");
+
+        checkApplicationClass(HELPER3_RECEIVER0, PACKAGE_HELPER3,
+                "android.os.cts.process.helper.shared_process",
+                null);
+        checkApplicationClass(HELPER3_RECEIVER1, PACKAGE_HELPER3, PACKAGE_HELPER3 + ":sub1",
+                "android.os.cts.process.helper.Application1c");
+        checkApplicationClass(HELPER3_RECEIVER2, PACKAGE_HELPER3, PACKAGE_HELPER3 + ":sub2",
+                null);
+        checkApplicationClass(HELPER3_RECEIVER3, PACKAGE_HELPER3,
+                "android.os.cts.process.helper.shared.sub3",
+                "android.os.cts.process.helper.Application3");
+
+        checkApplicationClass(HELPER4_RECEIVER0, PACKAGE_HELPER4,
+                "android.os.cts.process.helper.shared_process",
+                "android.os.cts.process.helper.Application1");
+        checkApplicationClass(HELPER4_RECEIVER1, PACKAGE_HELPER4, PACKAGE_HELPER4 + ":sub1",
+                "android.os.cts.process.helper.Application1");
+        checkApplicationClass(HELPER4_RECEIVER2, PACKAGE_HELPER4, PACKAGE_HELPER4 + ":sub2",
+                "android.os.cts.process.helper.Application2");
+        checkApplicationClass(HELPER4_RECEIVER3, PACKAGE_HELPER4,
+                "android.os.cts.process.helper.shared.sub3",
+                "android.os.cts.process.helper.Application3b");
+    }
+
+    /**
+     * This doesn't do any assertions, but just dump the ApplicationInfo's for the helper APKs
+     * on logcat, so if some of the tests fail, we can look at the log and verify the
+     * ApplicationInfo is correct.
+     *
+     * (`dumpsys package` doesn't have a way to dump ApplicationInfo at the moment.)
+     */
+    @Test
+    public void dumpApplicationInfo() throws Exception {
+        LogPrinter pw = new LogPrinter(Log.VERBOSE, Consts.TAG);
+        dumpApplicationInfo(pw, PACKAGE_HELPER1);
+        dumpApplicationInfo(pw, Consts.PACKAGE_HELPER2);
+        dumpApplicationInfo(pw, Consts.PACKAGE_HELPER3);
+        dumpApplicationInfo(pw, Consts.PACKAGE_HELPER4);
+    }
+
+    private void dumpApplicationInfo(Printer pw, String packageName) throws Exception {
+        ApplicationInfo ai = sContext.getPackageManager().getApplicationInfo(packageName, 0);
+        pw.println("Dumping " + packageName);
+        ai.dump(pw, "    ");
+    }
+}
diff --git a/tests/process/src/android/os/cts/process/common/Consts.java b/tests/process/src/android/os/cts/process/common/Consts.java
new file mode 100644
index 0000000..dc7409f
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/common/Consts.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2021 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 android.os.cts.process.common;
+
+import android.content.ComponentName;
+import android.os.cts.process.helper.MyReceiver0;
+import android.os.cts.process.helper.MyReceiver1;
+import android.os.cts.process.helper.MyReceiver2;
+import android.os.cts.process.helper.MyReceiver3;
+
+public class Consts {
+    private Consts() {
+    }
+
+    public static final String TAG = "CtsProcessTest";
+
+    public static final String PACKAGE_HELPER1 = "android.os.cts.process.helper1";
+    public static final String PACKAGE_HELPER2 = "android.os.cts.process.helper2";
+    public static final String PACKAGE_HELPER3 = "android.os.cts.process.helper3";
+    public static final String PACKAGE_HELPER4 = "android.os.cts.process.helper4";
+
+    public static final String HELPER_SHARED_PROCESS_NAME =
+            "android.os.cts.process.helper.shared_process";
+
+    private static ComponentName buildReceiver(String packageName, int receiverId) {
+        switch (receiverId) {
+            case 0:
+                return new ComponentName(packageName, MyReceiver0.class.getName());
+            case 1:
+                return new ComponentName(packageName, MyReceiver1.class.getName());
+            case 2:
+                return new ComponentName(packageName, MyReceiver2.class.getName());
+            case 3:
+                return new ComponentName(packageName, MyReceiver3.class.getName());
+            default:
+                throw new RuntimeException("Unsupported ID detected: " + receiverId);
+        }
+    }
+
+    public static final ComponentName HELPER1_RECEIVER0 = buildReceiver(PACKAGE_HELPER1, 0);
+    public static final ComponentName HELPER1_RECEIVER1 = buildReceiver(PACKAGE_HELPER1, 1);
+    public static final ComponentName HELPER1_RECEIVER2 = buildReceiver(PACKAGE_HELPER1, 2);
+
+    public static final ComponentName HELPER2_RECEIVER0 = buildReceiver(PACKAGE_HELPER2, 0);
+    public static final ComponentName HELPER2_RECEIVER1 = buildReceiver(PACKAGE_HELPER2, 1);
+    public static final ComponentName HELPER2_RECEIVER2 = buildReceiver(PACKAGE_HELPER2, 2);
+
+    public static final ComponentName HELPER3_RECEIVER0 = buildReceiver(PACKAGE_HELPER3, 0);
+    public static final ComponentName HELPER3_RECEIVER1 = buildReceiver(PACKAGE_HELPER3, 1);
+    public static final ComponentName HELPER3_RECEIVER2 = buildReceiver(PACKAGE_HELPER3, 2);
+    public static final ComponentName HELPER3_RECEIVER3 = buildReceiver(PACKAGE_HELPER3, 3);
+
+    public static final ComponentName HELPER4_RECEIVER0 = buildReceiver(PACKAGE_HELPER4, 0);
+    public static final ComponentName HELPER4_RECEIVER1 = buildReceiver(PACKAGE_HELPER4, 1);
+    public static final ComponentName HELPER4_RECEIVER2 = buildReceiver(PACKAGE_HELPER4, 2);
+    public static final ComponentName HELPER4_RECEIVER3 = buildReceiver(PACKAGE_HELPER4, 3);
+
+    public static final String ACTION_SEND_BACK_START_TIME = "ACTION_SEND_BACK_START_TIME";
+}
diff --git a/tests/process/src/android/os/cts/process/common/Message.java b/tests/process/src/android/os/cts/process/common/Message.java
new file mode 100644
index 0000000..f7b7773
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/common/Message.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2021 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 android.os.cts.process.common;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.os.Parcelable;
+import android.os.Process;
+import android.os.SystemClock;
+
+import com.android.internal.util.DataClass;
+
+/**
+ * codegen ${ANDROID_BUILD_TOP}/cts/tests/process/src/android/os/cts/process/common/Message.java
+ */
+@DataClass(
+        genConstructor = false,
+        genSetters = false,
+        genToString = true,
+        genAidl = false)
+public class Message implements Parcelable {
+    public Message() {
+    }
+
+    public void fillInBasicInfo(Context context) {
+        // codegen fails for whatever reason if it's after the fields.
+        packageName = context.getPackageName();
+        processName = Process.myProcessName();
+
+        applicationContextClassName = context.getApplicationContext().getClass().getCanonicalName();
+
+        nowElapsedRealtime = SystemClock.elapsedRealtime();
+        nowUptimeMillis = SystemClock.uptimeMillis();
+
+        startElapsedRealtime = Process.getStartElapsedRealtime();
+        startUptimeMillis = Process.getStartUptimeMillis();
+        startRequestedElapsedRealtime = Process.getStartRequestedElapsedRealtime();
+        startRequestedUptimeMillis = Process.getStartRequestedUptimeMillis();
+    }
+
+    @Nullable
+    public String packageName;
+    @Nullable
+    public String applicationClassName;
+    @Nullable
+    public String receiverClassName;
+    @Nullable
+    public String applicationContextClassName;
+    @Nullable
+    public String processName;
+    public long startElapsedRealtime;
+    public long startUptimeMillis;
+    public long startRequestedElapsedRealtime;
+    public long startRequestedUptimeMillis;
+    public long nowElapsedRealtime;
+    public long nowUptimeMillis;
+
+
+
+    // Code below generated by codegen v1.0.23.
+    //
+    // DO NOT MODIFY!
+    // CHECKSTYLE:OFF Generated code
+    //
+    // To regenerate run:
+    // $ codegen $ANDROID_BUILD_TOP/cts/tests/process/src/android/os/cts/process/common/Message.java
+    //
+    // To exclude the generated code from IntelliJ auto-formatting enable (one-time):
+    //   Settings > Editor > Code Style > Formatter Control
+    //@formatter:off
+
+
+    @Override
+    @DataClass.Generated.Member
+    public String toString() {
+        // You can override field toString logic by defining methods like:
+        // String fieldNameToString() { ... }
+
+        return "Message { " +
+                "packageName = " + packageName + ", " +
+                "applicationClassName = " + applicationClassName + ", " +
+                "receiverClassName = " + receiverClassName + ", " +
+                "applicationContextClassName = " + applicationContextClassName + ", " +
+                "processName = " + processName + ", " +
+                "startElapsedRealtime = " + startElapsedRealtime + ", " +
+                "startUptimeMillis = " + startUptimeMillis + ", " +
+                "startRequestedElapsedRealtime = " + startRequestedElapsedRealtime + ", " +
+                "startRequestedUptimeMillis = " + startRequestedUptimeMillis + ", " +
+                "nowElapsedRealtime = " + nowElapsedRealtime + ", " +
+                "nowUptimeMillis = " + nowUptimeMillis +
+        " }";
+    }
+
+    @Override
+    @DataClass.Generated.Member
+    public void writeToParcel(@android.annotation.NonNull android.os.Parcel dest, int flags) {
+        // You can override field parcelling by defining methods like:
+        // void parcelFieldName(Parcel dest, int flags) { ... }
+
+        int flg = 0;
+        if (packageName != null) flg |= 0x1;
+        if (applicationClassName != null) flg |= 0x2;
+        if (receiverClassName != null) flg |= 0x4;
+        if (applicationContextClassName != null) flg |= 0x8;
+        if (processName != null) flg |= 0x10;
+        dest.writeInt(flg);
+        if (packageName != null) dest.writeString(packageName);
+        if (applicationClassName != null) dest.writeString(applicationClassName);
+        if (receiverClassName != null) dest.writeString(receiverClassName);
+        if (applicationContextClassName != null) dest.writeString(applicationContextClassName);
+        if (processName != null) dest.writeString(processName);
+        dest.writeLong(startElapsedRealtime);
+        dest.writeLong(startUptimeMillis);
+        dest.writeLong(startRequestedElapsedRealtime);
+        dest.writeLong(startRequestedUptimeMillis);
+        dest.writeLong(nowElapsedRealtime);
+        dest.writeLong(nowUptimeMillis);
+    }
+
+    @Override
+    @DataClass.Generated.Member
+    public int describeContents() { return 0; }
+
+    /** @hide */
+    @SuppressWarnings({"unchecked", "RedundantCast"})
+    @DataClass.Generated.Member
+    protected Message(@android.annotation.NonNull android.os.Parcel in) {
+        // You can override field unparcelling by defining methods like:
+        // static FieldType unparcelFieldName(Parcel in) { ... }
+
+        int flg = in.readInt();
+        String _packageName = (flg & 0x1) == 0 ? null : in.readString();
+        String _applicationClassName = (flg & 0x2) == 0 ? null : in.readString();
+        String _receiverClassName = (flg & 0x4) == 0 ? null : in.readString();
+        String _applicationContextClassName = (flg & 0x8) == 0 ? null : in.readString();
+        String _processName = (flg & 0x10) == 0 ? null : in.readString();
+        long _startElapsedRealtime = in.readLong();
+        long _startUptimeMillis = in.readLong();
+        long _startRequestedElapsedRealtime = in.readLong();
+        long _startRequestedUptimeMillis = in.readLong();
+        long _nowElapsedRealtime = in.readLong();
+        long _nowUptimeMillis = in.readLong();
+
+        this.packageName = _packageName;
+        this.applicationClassName = _applicationClassName;
+        this.receiverClassName = _receiverClassName;
+        this.applicationContextClassName = _applicationContextClassName;
+        this.processName = _processName;
+        this.startElapsedRealtime = _startElapsedRealtime;
+        this.startUptimeMillis = _startUptimeMillis;
+        this.startRequestedElapsedRealtime = _startRequestedElapsedRealtime;
+        this.startRequestedUptimeMillis = _startRequestedUptimeMillis;
+        this.nowElapsedRealtime = _nowElapsedRealtime;
+        this.nowUptimeMillis = _nowUptimeMillis;
+
+        // onConstructed(); // You can define this method to get a callback
+    }
+
+    @DataClass.Generated.Member
+    public static final @android.annotation.NonNull Parcelable.Creator<Message> CREATOR
+            = new Parcelable.Creator<Message>() {
+        @Override
+        public Message[] newArray(int size) {
+            return new Message[size];
+        }
+
+        @Override
+        public Message createFromParcel(@android.annotation.NonNull android.os.Parcel in) {
+            return new Message(in);
+        }
+    };
+
+    @DataClass.Generated(
+            time = 1639154672715L,
+            codegenVersion = "1.0.23",
+            sourceFile = "cts/tests/process/src/android/os/cts/process/common/Message.java",
+            inputSignatures = "public @android.annotation.Nullable java.lang.String packageName\npublic @android.annotation.Nullable java.lang.String applicationClassName\npublic @android.annotation.Nullable java.lang.String receiverClassName\npublic @android.annotation.Nullable java.lang.String applicationContextClassName\npublic @android.annotation.Nullable java.lang.String processName\npublic  long startElapsedRealtime\npublic  long startUptimeMillis\npublic  long startRequestedElapsedRealtime\npublic  long startRequestedUptimeMillis\npublic  long nowElapsedRealtime\npublic  long nowUptimeMillis\npublic  void fillInBasicInfo(android.content.Context)\nclass Message extends java.lang.Object implements [android.os.Parcelable]\n@com.android.internal.util.DataClass(genConstructor=false, genSetters=false, genToString=true, genAidl=false)")
+    @Deprecated
+    private void __metadata() {}
+
+
+    //@formatter:on
+    // End of generated code
+
+}
diff --git a/tests/process/src/android/os/cts/process/helper/Application0.java b/tests/process/src/android/os/cts/process/helper/Application0.java
new file mode 100644
index 0000000..8c9a860
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/Application0.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 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 android.os.cts.process.helper;
+
+public class Application0 extends BaseApplication {
+}
diff --git a/tests/process/src/android/os/cts/process/helper/Application1.java b/tests/process/src/android/os/cts/process/helper/Application1.java
new file mode 100644
index 0000000..4deae2c
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/Application1.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 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 android.os.cts.process.helper;
+
+public class Application1 extends BaseApplication {
+}
diff --git a/tests/process/src/android/os/cts/process/helper/Application1b.java b/tests/process/src/android/os/cts/process/helper/Application1b.java
new file mode 100644
index 0000000..28efd23
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/Application1b.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 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 android.os.cts.process.helper;
+
+public class Application1b extends BaseApplication {
+}
diff --git a/tests/process/src/android/os/cts/process/helper/Application1c.java b/tests/process/src/android/os/cts/process/helper/Application1c.java
new file mode 100644
index 0000000..b083e26
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/Application1c.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 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 android.os.cts.process.helper;
+
+public class Application1c extends BaseApplication {
+}
diff --git a/tests/process/src/android/os/cts/process/helper/Application2.java b/tests/process/src/android/os/cts/process/helper/Application2.java
new file mode 100644
index 0000000..396ef79
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/Application2.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 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 android.os.cts.process.helper;
+
+public class Application2 extends BaseApplication {
+}
diff --git a/tests/process/src/android/os/cts/process/helper/Application2b.java b/tests/process/src/android/os/cts/process/helper/Application2b.java
new file mode 100644
index 0000000..c88300f
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/Application2b.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 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 android.os.cts.process.helper;
+
+public class Application2b extends BaseApplication {
+}
diff --git a/tests/process/src/android/os/cts/process/helper/Application3.java b/tests/process/src/android/os/cts/process/helper/Application3.java
new file mode 100644
index 0000000..b238f51
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/Application3.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 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 android.os.cts.process.helper;
+
+public class Application3 extends BaseApplication {
+}
diff --git a/tests/process/src/android/os/cts/process/helper/Application3b.java b/tests/process/src/android/os/cts/process/helper/Application3b.java
new file mode 100644
index 0000000..ab7eef9
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/Application3b.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2022 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 android.os.cts.process.helper;
+
+public class Application3b extends BaseApplication {
+}
diff --git a/tests/process/src/android/os/cts/process/helper/BaseApplication.java b/tests/process/src/android/os/cts/process/helper/BaseApplication.java
new file mode 100644
index 0000000..a9aa1f9
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/BaseApplication.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021 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 android.os.cts.process.helper;
+
+import android.app.Application;
+import android.os.cts.process.common.Consts;
+import android.os.cts.process.common.Message;
+import android.util.Log;
+
+import com.android.compatibility.common.util.BroadcastMessenger;
+
+public abstract class BaseApplication extends Application {
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        Log.i(Consts.TAG, "onCreate: this=" + this);
+
+        sendBackApplicationCreated();
+    }
+
+    private void sendBackApplicationCreated() {
+        Message m = new Message();
+
+        m.fillInBasicInfo(this);
+
+        m.applicationClassName = this.getClass().getCanonicalName();
+
+        BroadcastMessenger.send(this, Consts.TAG, m);
+    }
+}
diff --git a/tests/process/src/android/os/cts/process/helper/BaseReceiver.java b/tests/process/src/android/os/cts/process/helper/BaseReceiver.java
new file mode 100644
index 0000000..0e4f8e1
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/BaseReceiver.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2021 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 android.os.cts.process.helper;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.cts.process.common.Consts;
+import android.os.cts.process.common.Message;
+import android.util.Log;
+
+import com.android.compatibility.common.util.BroadcastMessenger;
+
+public class BaseReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        Log.i(Consts.TAG, "onReceive: " + intent);
+        switch (intent.getAction()) {
+            case Consts.ACTION_SEND_BACK_START_TIME:
+                sendBackStartTime(context);
+                break;
+        }
+    }
+
+    private void sendBackStartTime(Context context) {
+        Message m = new Message();
+
+        m.fillInBasicInfo(context);
+
+        m.receiverClassName = this.getClass().getCanonicalName();
+
+        BroadcastMessenger.send(context, Consts.TAG, m);
+    }
+}
diff --git a/tests/process/src/android/os/cts/process/helper/MyReceiver0.java b/tests/process/src/android/os/cts/process/helper/MyReceiver0.java
new file mode 100644
index 0000000..a5237a2
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/MyReceiver0.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2021 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 android.os.cts.process.helper;
+
+public class MyReceiver0 extends BaseReceiver {
+}
diff --git a/tests/process/src/android/os/cts/process/helper/MyReceiver1.java b/tests/process/src/android/os/cts/process/helper/MyReceiver1.java
new file mode 100644
index 0000000..a349fab
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/MyReceiver1.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2021 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 android.os.cts.process.helper;
+
+public class MyReceiver1 extends BaseReceiver {
+}
diff --git a/tests/process/src/android/os/cts/process/helper/MyReceiver2.java b/tests/process/src/android/os/cts/process/helper/MyReceiver2.java
new file mode 100644
index 0000000..d3b41a3
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/MyReceiver2.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2021 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 android.os.cts.process.helper;
+
+public class MyReceiver2 extends BaseReceiver {
+}
diff --git a/tests/process/src/android/os/cts/process/helper/MyReceiver3.java b/tests/process/src/android/os/cts/process/helper/MyReceiver3.java
new file mode 100644
index 0000000..075b796
--- /dev/null
+++ b/tests/process/src/android/os/cts/process/helper/MyReceiver3.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2021 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 android.os.cts.process.helper;
+
+public class MyReceiver3 extends BaseReceiver {
+}
diff --git a/tests/providerui/AndroidManifest.xml b/tests/providerui/AndroidManifest.xml
index 2f1f791..a14df70 100644
--- a/tests/providerui/AndroidManifest.xml
+++ b/tests/providerui/AndroidManifest.xml
@@ -23,9 +23,7 @@
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />
 
     <!--
@@ -42,7 +40,7 @@
         </intent>
     </queries>
 
-    <application android:requestLegacyExternalStorage = "true">
+    <application>
         <uses-library android:name="android.test.runner"/>
         <activity android:name="android.providerui.cts.GetResultActivity" />
 
diff --git a/tests/providerui/src/android/providerui/cts/MediaStoreUiTest.java b/tests/providerui/src/android/providerui/cts/MediaStoreUiTest.java
index 4342810..542b3aa 100644
--- a/tests/providerui/src/android/providerui/cts/MediaStoreUiTest.java
+++ b/tests/providerui/src/android/providerui/cts/MediaStoreUiTest.java
@@ -16,6 +16,8 @@
 
 package android.providerui.cts;
 
+import static android.provider.cts.ProviderTestUtils.resolveVolumeName;
+
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -26,12 +28,12 @@
 import android.app.Instrumentation;
 import android.app.UiAutomation;
 import android.content.ContentResolver;
+import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
 import android.content.UriPermission;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
-import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Environment;
@@ -39,7 +41,6 @@
 import android.os.ParcelFileDescriptor;
 import android.os.storage.StorageManager;
 import android.os.storage.StorageVolume;
-import android.os.UserManager;
 import android.provider.DocumentsContract;
 import android.provider.MediaStore;
 import android.provider.cts.ProviderTestUtils;
@@ -50,12 +51,12 @@
 import android.support.test.uiautomator.UiObject;
 import android.support.test.uiautomator.UiObject2;
 import android.support.test.uiautomator.UiObjectNotFoundException;
-import android.support.test.uiautomator.UiScrollable;
 import android.support.test.uiautomator.UiSelector;
 import android.support.test.uiautomator.Until;
 import android.system.Os;
 import android.text.format.DateUtils;
 import android.util.Log;
+import android.util.Pair;
 
 import androidx.test.InstrumentationRegistry;
 
@@ -68,6 +69,7 @@
 import org.junit.runners.Parameterized.Parameters;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -122,6 +124,7 @@
         mActivity = (GetResultActivity) mInstrumentation.startActivitySync(intent);
         mInstrumentation.waitForIdleSync();
         mActivity.clearResult();
+        mDevice.wakeUp();
     }
 
     @After
@@ -147,6 +150,7 @@
         if (!supportsHardware()) return;
 
         prepareFile();
+        clearDocumentsUi();
 
         final Uri treeUri = acquireAccess(mFile, Environment.DIRECTORY_DOCUMENTS);
         assertNotNull(treeUri);
@@ -171,10 +175,11 @@
     }
 
     @Test
-    public void testGetDocumentUri_ThrowsWithoutPermission() throws Exception {
+    public void testGetDocumentUri_throwsWithoutPermission() throws Exception {
         if (!supportsHardware()) return;
 
         prepareFile();
+        clearDocumentsUi();
 
         try {
             MediaStore.getDocumentUri(mActivity, mMediaStoreUri);
@@ -185,10 +190,11 @@
     }
 
     @Test
-    public void testGetDocumentUri_Symmetry_ExternalStorageProvider() throws Exception {
+    public void testGetDocumentUri_symmetry_externalStorageProvider() throws Exception {
         if (!supportsHardware()) return;
 
         prepareFile();
+        clearDocumentsUi();
 
         final Uri treeUri = acquireAccess(mFile, Environment.DIRECTORY_DOCUMENTS);
         Log.v(TAG, "Tree " + treeUri);
@@ -207,10 +213,10 @@
     }
 
     @Test
-    public void testGetMediaUriAccess_MediaDocumentsProvider() throws Exception {
+    public void testGetMediaUriAccess_mediaDocumentsProvider() throws Exception {
         if (!supportsHardware()) return;
 
-        prepareFile();
+        prepareFile("TEST");
         clearDocumentsUi();
         final Intent intent = new Intent();
         intent.setAction(Intent.ACTION_OPEN_DOCUMENT);
@@ -228,6 +234,104 @@
         assertAccessToMediaUri(mediaUri, mFile);
     }
 
+    @Test
+    public void testOpenFile_onMediaDocumentsProvider_success() throws Exception {
+        if (!supportsHardware()) return;
+
+        final String rawText = "TEST";
+        // Stage a text file which contains raw text "TEST"
+        prepareFile(rawText);
+        clearDocumentsUi();
+        final Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_OPEN_DOCUMENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+        mDevice.waitForIdle();
+
+        findDocument(mFile.getName()).click();
+        final Result result = mActivity.getResult();
+        final Uri uri = result.data.getData();
+        assertEquals(MEDIA_DOCUMENTS_PROVIDER_AUTHORITY, uri.getAuthority());
+
+        // Test reading
+        final byte[] expected = rawText.getBytes();
+        final byte[] actual = new byte[4];
+        try (ParcelFileDescriptor fd = mContext.getContentResolver()
+                .openFileDescriptor(uri, "r")) {
+            Os.read(fd.getFileDescriptor(), actual, 0, actual.length);
+            assertArrayEquals(expected, actual);
+        }
+
+        // Test write and read after it
+        final byte[] writtenText = "Hello World".getBytes();
+        final byte[] readText = new byte[11];
+        try (ParcelFileDescriptor fd = mContext.getContentResolver()
+                .openFileDescriptor(uri, "wt")) {
+            Os.write(fd.getFileDescriptor(), writtenText, 0, writtenText.length);
+        }
+        try (ParcelFileDescriptor fd = mContext.getContentResolver()
+                .openFileDescriptor(uri, "r")) {
+            Os.read(fd.getFileDescriptor(), readText, 0, readText.length);
+            assertArrayEquals(writtenText, readText);
+        }
+    }
+
+    @Test
+    public void testOpenFile_onMediaDocumentsProvider_failsWithoutAccess() throws Exception {
+        if (!supportsHardware()) return;
+
+        clearDocumentsUi();
+        final Intent intent = new Intent();
+        intent.setAction(Intent.ACTION_OPEN_DOCUMENT);
+        intent.addCategory(Intent.CATEGORY_OPENABLE);
+        intent.setType("*/*");
+        mActivity.startActivityForResult(intent, REQUEST_CODE);
+        mDevice.waitForIdle();
+
+        String rawText = "TEST";
+        // Read and write grants will be provided to the file associated with this pair.
+        // Stages a text file which contains raw text "TEST"
+        Pair<Uri, File> uriFilePairWithGrants =  prepareFileAndFetchDetails(rawText);
+        // Read and write grants will not be provided to the file associated with this pair
+        // Stages a text file which contains raw text "TEST"
+        Pair<Uri, File> uriFilePairWithoutGrants =  prepareFileAndFetchDetails(rawText);
+        // Get access grants
+        findDocument(uriFilePairWithGrants.second.getName()).click();
+        final Result result = mActivity.getResult();
+        final Uri docUriOfFileWithAccess = result.data.getData();
+        // Creating doc URI for file by string replacement
+        Uri docUriOfFileWithoutAccess = Uri.parse(docUriOfFileWithAccess.toSafeString().replaceAll(
+                String.valueOf(ContentUris.parseId(uriFilePairWithGrants.first)),
+                String.valueOf(ContentUris.parseId(uriFilePairWithoutGrants.first))));
+
+        try {
+            assertEquals(MEDIA_DOCUMENTS_PROVIDER_AUTHORITY, docUriOfFileWithAccess.getAuthority());
+            assertEquals(MEDIA_DOCUMENTS_PROVIDER_AUTHORITY,
+                    docUriOfFileWithoutAccess.getAuthority());
+            // Test reading
+            try (ParcelFileDescriptor fd = mContext.getContentResolver().openFileDescriptor(
+                    docUriOfFileWithoutAccess, "r")) {
+                fail("Expecting security exception as file does not have read grants which "
+                        + "are provided through ACTION_OPEN_DOCUMENT intent.");
+            } catch (SecurityException expected) {
+                // Expected security exception as file does not have read grants
+            }
+            // Test writing
+            try (ParcelFileDescriptor fd = mContext.getContentResolver().openFileDescriptor(
+                    docUriOfFileWithoutAccess, "wt")) {
+                fail("Expecting security exception as file does not have write grants which "
+                        + "are provided through ACTION_OPEN_DOCUMENT intent.");
+            } catch (SecurityException expected) {
+                // Expected security exception as file does not have write grants
+            }
+        } finally {
+            // Deleting files
+            uriFilePairWithGrants.second.delete();
+            uriFilePairWithoutGrants.second.delete();
+        }
+    }
+
     private void assertAccessToMediaUri(Uri mediaUri, File file) {
         final String[] projection = {MediaStore.MediaColumns.DISPLAY_NAME};
         try (Cursor c = mContext.getContentResolver().query(
@@ -310,7 +414,7 @@
     }
 
     private void prepareFile() throws Exception {
-        final File dir = new File(getVolumePath(mVolumeName),
+        final File dir = new File(getVolumePath(resolveVolumeName(mVolumeName)),
                 Environment.DIRECTORY_DOCUMENTS);
         final File file = new File(dir, "cts" + System.nanoTime() + ".txt");
 
@@ -320,6 +424,29 @@
         Log.v(TAG, "Staged " + mFile + " as " + mMediaStoreUri);
     }
 
+    private void prepareFile(String rawText) throws Exception {
+        final File dir = new File(getVolumePath(resolveVolumeName(mVolumeName)),
+                Environment.DIRECTORY_DOCUMENTS);
+        final File file = new File(dir, "cts" + System.nanoTime() + ".txt");
+
+        mFile = stageFileWithRawText(rawText, file);
+        mMediaStoreUri = MediaStore.scanFile(mContext.getContentResolver(), mFile);
+
+        Log.v(TAG, "Staged " + mFile + " as " + mMediaStoreUri);
+    }
+
+    private Pair<Uri, File> prepareFileAndFetchDetails(String rawText) throws Exception {
+        final File dir = new File(getVolumePath(resolveVolumeName(mVolumeName)),
+                Environment.DIRECTORY_DOCUMENTS);
+        final File file = new File(dir, "cts" + System.nanoTime() + ".txt");
+
+        File stagedFile = stageFileWithRawText(rawText, file);
+
+        Uri uri = MediaStore.scanFile(mContext.getContentResolver(), stagedFile);
+        Log.v(TAG, "Staged " + stagedFile + " as " + uri);
+        return Pair.create(uri, stagedFile);
+    }
+
     private void assertToolbarTitleEquals(String targetPackageName, String label)
             throws UiObjectNotFoundException {
         final UiSelector toolbarUiSelector = new UiSelector().resourceId(
@@ -427,32 +554,28 @@
         // The caller may be trying to stage into a location only available to
         // the shell user, so we need to perform the entire copy as the shell
         final Context context = InstrumentationRegistry.getTargetContext();
-        UserManager userManager = context.getSystemService(UserManager.class);
-        if (userManager.isSystemUser() &&
-                 FileUtils.contains(Environment.getStorageDirectory(), file)) {
-            executeShellCommand("mkdir -p " + file.getParent());
+        final File dir = file.getParentFile();
+        dir.mkdirs();
+        if (!dir.exists()) {
+            throw new FileNotFoundException("Failed to create parent for " + file);
+        }
+        try (InputStream source = context.getResources().openRawResource(resId);
+             OutputStream target = new FileOutputStream(file)) {
+            FileUtils.copy(source, target);
+        }
+        return file;
+    }
 
-            try (AssetFileDescriptor afd = context.getResources().openRawResourceFd(resId)) {
-                final File source = ParcelFileDescriptor.getFile(afd.getFileDescriptor());
-                final long skip = afd.getStartOffset();
-                final long count = afd.getLength();
-
-                executeShellCommand(String.format("dd bs=1 if=%s skip=%d count=%d of=%s",
-                        source.getAbsolutePath(), skip, count, file.getAbsolutePath()));
-
-                // Force sync to try updating other views
-                executeShellCommand("sync");
-            }
-        } else {
-            final File dir = file.getParentFile();
-            dir.mkdirs();
-            if (!dir.exists()) {
-                throw new FileNotFoundException("Failed to create parent for " + file);
-            }
-            try (InputStream source = context.getResources().openRawResource(resId);
-                    OutputStream target = new FileOutputStream(file)) {
-                FileUtils.copy(source, target);
-            }
+    static File stageFileWithRawText(String rawText, File file) throws IOException {
+        final File dir = file.getParentFile();
+        dir.mkdirs();
+        if (!dir.exists()) {
+            throw new FileNotFoundException("Failed to create parent for " + file);
+        }
+        try (InputStream source = new ByteArrayInputStream(
+                rawText.getBytes(StandardCharsets.UTF_8));
+             OutputStream target = new FileOutputStream(file)) {
+            FileUtils.copy(source, target);
         }
         return file;
     }
diff --git a/tests/quickaccesswallet/Android.bp b/tests/quickaccesswallet/Android.bp
index 14c79f3..ff557d8 100644
--- a/tests/quickaccesswallet/Android.bp
+++ b/tests/quickaccesswallet/Android.bp
@@ -41,5 +41,8 @@
         "cts",
         "general-tests",
     ],
+    data: [
+        ":CtsQuickAccessWalletSampleApp",
+    ],
     sdk_version: "test_current",
 }
diff --git a/tests/quickaccesswallet/AndroidManifest.xml b/tests/quickaccesswallet/AndroidManifest.xml
index d8e38d1..6f0b083 100755
--- a/tests/quickaccesswallet/AndroidManifest.xml
+++ b/tests/quickaccesswallet/AndroidManifest.xml
@@ -43,6 +43,15 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="android.quickaccesswallet.delegate.QuickAccessWalletDelegateTargetActivity"
+                  android:exported="false"
+                  android:enabled="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
         <service android:name="android.quickaccesswallet.TestHostApduService"
              android:exported="true"
              android:permission="android.permission.BIND_NFC_SERVICE"
@@ -69,6 +78,22 @@
                  android:resource="@xml/quickaccesswallet_configuration"/>;
         </service>
 
+
+        <service android:name="android.quickaccesswallet.QuickAccessWalletDelegateTargetActivityService"
+                 android:enabled="false"
+                 android:label="@string/app_name"
+                 android:icon="@drawable/android"
+                 android:permission="android.permission.BIND_QUICK_ACCESS_WALLET_SERVICE"
+                 android:exported="true">
+            <intent-filter>
+                <action android:name="android.service.quickaccesswallet.QuickAccessWalletService"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+            <meta-data android:name="android.quickaccesswallet"
+                       android:resource="@xml/quickaccesswallet_configuration"/>
+        </service>
+
+
         <service android:name="android.quickaccesswallet.NoPermissionQuickAccessWalletService"
              android:enabled="false"
              android:label="@string/app_name"
diff --git a/tests/quickaccesswallet/AndroidTest.xml b/tests/quickaccesswallet/AndroidTest.xml
index 3f7a774..98876d7 100644
--- a/tests/quickaccesswallet/AndroidTest.xml
+++ b/tests/quickaccesswallet/AndroidTest.xml
@@ -20,6 +20,11 @@
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="install-arg" value="-t -r" />
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsQuickAccessWalletSampleApp.apk" />
+    </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="install-arg" value="-t" />
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsQuickAccessWalletTestCases.apk" />
diff --git a/tests/quickaccesswallet/app/Android.bp b/tests/quickaccesswallet/app/Android.bp
new file mode 100644
index 0000000..7d88dd5
--- /dev/null
+++ b/tests/quickaccesswallet/app/Android.bp
@@ -0,0 +1,24 @@
+// Copyright 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsQuickAccessWalletSampleApp",
+    defaults: ["cts_defaults"],
+    srcs: ["src/**/*.java"],
+    sdk_version: "current",
+}
diff --git a/tests/quickaccesswallet/app/AndroidManifest.xml b/tests/quickaccesswallet/app/AndroidManifest.xml
new file mode 100644
index 0000000..faf67d4
--- /dev/null
+++ b/tests/quickaccesswallet/app/AndroidManifest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.sample.quickaccesswallet.app">
+
+    <application>
+        <activity  android:label="QAW Sample App"
+            android:name="android.sample.quickaccesswallet.app.QuickAccessWalletDelegateTargetActivity"
+                  android:exported="false"
+                   android:enabled="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/tests/quickaccesswallet/app/src/android/sample/quickaccesswallet/app/QuickAccessWalletDelegateTargetActivity.java b/tests/quickaccesswallet/app/src/android/sample/quickaccesswallet/app/QuickAccessWalletDelegateTargetActivity.java
new file mode 100644
index 0000000..06557c4
--- /dev/null
+++ b/tests/quickaccesswallet/app/src/android/sample/quickaccesswallet/app/QuickAccessWalletDelegateTargetActivity.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 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 android.sample.quickaccesswallet.app;
+
+import android.app.Activity;
+
+/**
+ * A simple activity that would show the wallet
+ */
+public class QuickAccessWalletDelegateTargetActivity extends Activity {}
diff --git a/tests/quickaccesswallet/src/android/quickaccesswallet/QuickAccessWalletDelegateTargetActivityService.java b/tests/quickaccesswallet/src/android/quickaccesswallet/QuickAccessWalletDelegateTargetActivityService.java
new file mode 100644
index 0000000..aa6ea95
--- /dev/null
+++ b/tests/quickaccesswallet/src/android/quickaccesswallet/QuickAccessWalletDelegateTargetActivityService.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2022 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 android.quickaccesswallet;
+
+import android.app.PendingIntent;
+import android.content.Intent;
+
+import androidx.annotation.Nullable;
+
+/**
+ * Extends {@link TestQuickAccessWalletService} to allow for a different manifest configuration.
+ */
+public class QuickAccessWalletDelegateTargetActivityService extends TestQuickAccessWalletService {
+
+    @Nullable
+    @Override
+    public PendingIntent getTargetActivityPendingIntent() {
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setClassName("android.sample.quickaccesswallet.app",
+                "android.sample.quickaccesswallet.app.QuickAccessWalletDelegateTargetActivity");
+        return PendingIntent.getActivity(this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
+    }
+}
diff --git a/tests/quickaccesswallet/src/android/quickaccesswallet/cts/QuickAccessWalletClientTest.java b/tests/quickaccesswallet/src/android/quickaccesswallet/cts/QuickAccessWalletClientTest.java
index 6ca29ca..8a5d528 100755
--- a/tests/quickaccesswallet/src/android/quickaccesswallet/cts/QuickAccessWalletClientTest.java
+++ b/tests/quickaccesswallet/src/android/quickaccesswallet/cts/QuickAccessWalletClientTest.java
@@ -25,9 +25,13 @@
 import android.content.pm.PackageManager;
 import android.graphics.Bitmap;
 import android.graphics.drawable.Icon;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.provider.Settings;
 import android.quickaccesswallet.NoPermissionQuickAccessWalletService;
 import android.quickaccesswallet.QuickAccessWalletActivity;
+import android.quickaccesswallet.QuickAccessWalletDelegateTargetActivityService;
 import android.quickaccesswallet.QuickAccessWalletSettingsActivity;
 import android.quickaccesswallet.TestHostApduService;
 import android.quickaccesswallet.TestQuickAccessWalletService;
@@ -35,12 +39,14 @@
 import android.service.quickaccesswallet.GetWalletCardsRequest;
 import android.service.quickaccesswallet.GetWalletCardsResponse;
 import android.service.quickaccesswallet.QuickAccessWalletClient;
+import android.service.quickaccesswallet.QuickAccessWalletClient.WalletPendingIntentCallback;
 import android.service.quickaccesswallet.QuickAccessWalletClient.WalletServiceEventListener;
 import android.service.quickaccesswallet.QuickAccessWalletService;
 import android.service.quickaccesswallet.SelectWalletCardRequest;
 import android.service.quickaccesswallet.WalletCard;
 import android.service.quickaccesswallet.WalletServiceEvent;
 
+import androidx.annotation.Nullable;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
@@ -99,6 +105,8 @@
                 PackageManager.COMPONENT_ENABLED_STATE_DEFAULT);
         setServiceState(NoPermissionQuickAccessWalletService.class,
                 PackageManager.COMPONENT_ENABLED_STATE_DEFAULT);
+        setServiceState(QuickAccessWalletDelegateTargetActivityService.class,
+                PackageManager.COMPONENT_ENABLED_STATE_DEFAULT);
         TestQuickAccessWalletService.resetStaticFields();
     }
 
@@ -130,6 +138,51 @@
     }
 
     @Test
+    public void testGetWalletPendingIntent_serviceWithOverride_notNull_ableToSend()
+            throws Exception {
+        setServiceState(QuickAccessWalletDelegateTargetActivityService.class,
+                PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+        setServiceState(TestQuickAccessWalletService.class,
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
+
+        QuickAccessWalletClient client = QuickAccessWalletClient.create(mContext);
+
+        TestPendingIntentListener testPendingIntentListener = new TestPendingIntentListener();
+
+        client.getWalletPendingIntent(mContext.getMainExecutor(), testPendingIntentListener);
+        testPendingIntentListener.await(3, TimeUnit.SECONDS);
+        assertThat(testPendingIntentListener.mPendingIntent).isNotNull();
+
+        TestPendingIntentSentListener intentSentListener = new TestPendingIntentSentListener();
+
+        testPendingIntentListener.mPendingIntent.send(0, intentSentListener,
+                new Handler(Looper.getMainLooper()));
+
+        intentSentListener.await(3, TimeUnit.SECONDS);
+
+        String targetActivityPackage = "android.sample.quickaccesswallet.app";
+        String targetActivityComponent =
+                targetActivityPackage + ".QuickAccessWalletDelegateTargetActivity";
+
+        assertThat(intentSentListener.mIntent).isNotNull();
+        assertThat(intentSentListener.mIntent.getComponent())
+                .isEqualTo(new ComponentName(targetActivityPackage, targetActivityComponent));
+
+
+    }
+
+    @Test
+    public void testGetWalletPendingIntent_serviceWithNoOverride_isNull() throws Exception {
+        QuickAccessWalletClient client = QuickAccessWalletClient.create(mContext);
+
+        TestPendingIntentListener testPendingIntentListener = new TestPendingIntentListener();
+
+        client.getWalletPendingIntent(mContext.getMainExecutor(), testPendingIntentListener);
+        testPendingIntentListener.await(3, TimeUnit.SECONDS);
+        assertThat(testPendingIntentListener.mPendingIntent).isNull();
+    }
+
+    @Test
     public void testGetWalletCards_success() throws Exception {
         QuickAccessWalletClient client = QuickAccessWalletClient.create(mContext);
         assertThat(client.isWalletServiceAvailable()).isTrue();
@@ -443,7 +496,8 @@
 
     private PendingIntent createPendingIntent() {
         Intent intent = new Intent(mContext, QuickAccessWalletActivity.class);
-        return PendingIntent.getActivity(mContext, 0, intent, PendingIntent.FLAG_IMMUTABLE);
+        return PendingIntent
+                .getActivity(mContext, 0, intent, PendingIntent.FLAG_IMMUTABLE);
     }
 
     private static class TestCallback implements
@@ -486,4 +540,37 @@
             mLatch.await(time, unit);
         }
     }
+
+    private static class TestPendingIntentListener implements WalletPendingIntentCallback {
+
+        private PendingIntent mPendingIntent;
+        private final CountDownLatch mLatch = new CountDownLatch(1);
+
+        @Override
+        public void onWalletPendingIntentRetrieved(@Nullable PendingIntent walletPendingIntent) {
+            mPendingIntent = walletPendingIntent;
+            mLatch.countDown();
+        }
+
+        public void await(int time, TimeUnit unit) throws InterruptedException {
+            mLatch.await(time, unit);
+        }
+    }
+
+    private static class TestPendingIntentSentListener implements PendingIntent.OnFinished {
+
+        private Intent mIntent;
+        private final CountDownLatch mLatch = new CountDownLatch(1);
+
+        @Override
+        public void onSendFinished(PendingIntent pendingIntent, Intent intent, int resultCode,
+                String resultData, Bundle resultExtras) {
+            mIntent = intent;
+            mLatch.countDown();
+        }
+
+        public void await(int time, TimeUnit unit) throws InterruptedException {
+            mLatch.await(time, unit);
+        }
+    }
 }
diff --git a/tests/quicksettings/Android.bp b/tests/quicksettings/Android.bp
new file mode 100644
index 0000000..7246788
--- /dev/null
+++ b/tests/quicksettings/Android.bp
@@ -0,0 +1,43 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsTileServiceTestCases",
+    defaults: ["cts_defaults"],
+
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+
+    static_libs: [
+        "androidx.test.rules",
+        "androidx.test.ext.junit",
+        "androidx.test.uiautomator_uiautomator",
+        "compatibility-device-util-axt",
+     ],
+
+    libs: [
+        "android.test.mock",
+        "android.test.runner",
+        "android.test.base",
+    ],
+
+    srcs: ["src/**/*.java"],
+    sdk_version: "test_current",
+}
diff --git a/tests/quicksettings/AndroidManifest.xml b/tests/quicksettings/AndroidManifest.xml
new file mode 100644
index 0000000..225042d
--- /dev/null
+++ b/tests/quicksettings/AndroidManifest.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="android.quicksettings.cts">
+
+    <application>
+        <uses-library android:name="android.test.runner"/>
+        <service android:name=".TestTileService"
+                 android:exported="true"
+                 android:label="TestTileService"
+                 android:icon="@drawable/robot"
+                 android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+            </intent-filter>
+        </service>
+
+        <service android:name=".ToggleableTestTileService"
+                 android:exported="true"
+                 android:label="BooleanTestTileService"
+                 android:icon="@drawable/robot"
+                 android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE"/>
+            </intent-filter>
+            <meta-data android:name="android.service.quicksettings.TOGGLEABLE_TILE"
+                       android:value="true"/>
+        </service>
+    </application>
+
+    <!--  self-instrumenting test package. -->
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+         android:targetPackage="android.quicksettings.cts">
+    </instrumentation>
+</manifest>
diff --git a/tests/quicksettings/AndroidTest.xml b/tests/quicksettings/AndroidTest.xml
new file mode 100644
index 0000000..2a2acd9
--- /dev/null
+++ b/tests/quicksettings/AndroidTest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<configuration description="Config for CtsTileServiceTestCases">
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsTileServiceTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.quicksettings.cts" />
+    </test>
+</configuration>
diff --git a/tests/quicksettings/OWNERS b/tests/quicksettings/OWNERS
new file mode 100644
index 0000000..43c3658
--- /dev/null
+++ b/tests/quicksettings/OWNERS
@@ -0,0 +1,4 @@
+# Bug component: 78930
+kozynski@google.com
+juliacr@google.com
+evanlaird@google.com
\ No newline at end of file
diff --git a/tests/quicksettings/TEST_MAPPING b/tests/quicksettings/TEST_MAPPING
new file mode 100644
index 0000000..8feb0b3
--- /dev/null
+++ b/tests/quicksettings/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsTileServiceTestCases"
+    }
+  ]
+}
diff --git a/tests/quicksettings/res/drawable/robot.png b/tests/quicksettings/res/drawable/robot.png
new file mode 100644
index 0000000..8a9e698
--- /dev/null
+++ b/tests/quicksettings/res/drawable/robot.png
Binary files differ
diff --git a/tests/quicksettings/src/android/quicksettings/cts/BaseTileServiceTest.java b/tests/quicksettings/src/android/quicksettings/cts/BaseTileServiceTest.java
new file mode 100644
index 0000000..8ef5807
--- /dev/null
+++ b/tests/quicksettings/src/android/quicksettings/cts/BaseTileServiceTest.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright (C) 2021 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 android.quicksettings.cts;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assume.assumeTrue;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.service.quicksettings.TileService;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+
+@RunWith(AndroidJUnit4.class)
+public abstract class BaseTileServiceTest {
+
+    protected abstract String getTag();
+    protected abstract String getComponentName();
+    protected abstract TileService getTileServiceInstance();
+    protected abstract void waitForConnected(boolean state) throws InterruptedException;
+    protected abstract void waitForListening(boolean state) throws InterruptedException;
+    protected Context mContext;
+
+    final static String DUMP_COMMAND =
+            "dumpsys activity service com.android.systemui/.SystemUIService QSTileHost";
+
+    // Time between checks for state we expect.
+    protected static final long CHECK_DELAY = 250;
+    // Number of times to check before failing. This is set so the maximum wait time is about 4s,
+    // as some tests were observed to take around 3s.
+    protected static final long CHECK_RETRIES = 15;
+    // Timeout to wait for launcher
+    protected static final long TIMEOUT = 8000;
+
+    protected TileService mTileService;
+    private Intent homeIntent;
+    private String mLauncherPackage;
+
+    @Before
+    public void setUp() throws Exception {
+        assumeTrue(TileService.isQuickSettingsSupported());
+        mContext = InstrumentationRegistry.getContext();
+        homeIntent = new Intent(Intent.ACTION_MAIN);
+        homeIntent.addCategory(Intent.CATEGORY_HOME);
+
+        mLauncherPackage = mContext.getPackageManager().resolveActivity(homeIntent,
+                PackageManager.MATCH_DEFAULT_ONLY).activityInfo.packageName;
+
+        // Wait for home
+        UiDevice device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        device.pressHome();
+        device.wait(Until.hasObject(By.pkg(mLauncherPackage).depth(0)), TIMEOUT);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        expandSettings(false);
+        toggleServiceAccess(getComponentName(), false);
+        waitForConnected(false);
+        assertNull(TestTileService.getInstance());
+    }
+
+    protected void startTileService() throws Exception {
+        toggleServiceAccess(getComponentName(), true);
+        waitForConnected(true); // wait for service to be bound
+        mTileService = getTileServiceInstance();
+        assertNotNull(mTileService);
+    }
+
+    protected void toggleServiceAccess(String componentName, boolean on) throws Exception {
+        String command = " cmd statusbar " + (on ? "add-tile " : "remove-tile ")
+                + componentName;
+
+        executeShellCommand(command);
+    }
+
+    public String executeShellCommand(String command) throws IOException {
+        Log.i(getTag(), "Shell command: " + command);
+        try {
+            return SystemUtil.runShellCommand(getInstrumentation(), command);
+        } catch (IOException e) {
+            //bubble it up
+            Log.e(getTag(), "Error running shell command: " + command);
+            throw new IOException(e);
+        }
+    }
+
+    protected void expandSettings(boolean expand) throws Exception {
+        executeShellCommand(" cmd statusbar " + (expand ? "expand-settings" : "collapse"));
+        Thread.sleep(600); // wait for animation
+    }
+
+    protected void initializeAndListen() throws Exception {
+        startTileService();
+        expandSettings(true);
+        waitForListening(true);
+    }
+
+    /**
+     * Find a line containing {@code label} in {@code lines}.
+     */
+    protected String findLine(String[] lines, CharSequence label) {
+        for (String line: lines) {
+            if (line.contains(label)) {
+                return line;
+            }
+        }
+        return null;
+    }
+}
diff --git a/tests/quicksettings/src/android/quicksettings/cts/BooleanTileServiceTest.java b/tests/quicksettings/src/android/quicksettings/cts/BooleanTileServiceTest.java
new file mode 100644
index 0000000..0f6d56e
--- /dev/null
+++ b/tests/quicksettings/src/android/quicksettings/cts/BooleanTileServiceTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2021 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 android.quicksettings.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
+
+import org.junit.Test;
+
+public class BooleanTileServiceTest extends BaseTileServiceTest {
+    private final static String TAG = "BooleanTileServiceTest";
+
+    @Test
+    public void testTileIsBoundAndListening() throws Exception {
+        startTileService();
+        expandSettings(true);
+        waitForListening(true);
+    }
+
+    @Test
+    public void testTileInDumpAndHasBooleanState() throws Exception {
+        initializeAndListen();
+
+        final CharSequence tileLabel = mTileService.getQsTile().getLabel();
+
+        final String[] dumpLines = executeShellCommand(DUMP_COMMAND).split("\n");
+        final String line = findLine(dumpLines, tileLabel);
+        assertNotNull(line);
+        assertTrue(line.trim().startsWith("BooleanState"));
+    }
+
+    @Test
+    public void testTileStartsInactive() throws Exception {
+        initializeAndListen();
+
+        assertEquals(Tile.STATE_INACTIVE, mTileService.getQsTile().getState());
+    }
+
+    @Test
+    public void testValueTracksState() throws Exception {
+        initializeAndListen();
+
+        final CharSequence tileLabel = mTileService.getQsTile().getLabel();
+
+        String[] dumpLines = executeShellCommand(DUMP_COMMAND).split("\n");
+        String line = findLine(dumpLines, tileLabel);
+
+        // Tile starts inactive
+        assertTrue(line.contains("value=false"));
+
+        ((ToggleableTestTileService) mTileService).toggleState();
+
+        // Close and open QS to make sure that state is refreshed
+        expandSettings(false);
+        waitForListening(false);
+        expandSettings(true);
+        waitForListening(true);
+
+        assertEquals(Tile.STATE_ACTIVE, mTileService.getQsTile().getState());
+
+        dumpLines = executeShellCommand(DUMP_COMMAND).split("\n");
+        line = findLine(dumpLines, tileLabel);
+
+        assertTrue(line.contains("value=true"));
+    }
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected String getComponentName() {
+        return ToggleableTestTileService.getComponentName().flattenToString();
+    }
+
+    @Override
+    protected TileService getTileServiceInstance() {
+        return ToggleableTestTileService.getInstance();
+    }
+
+    /**
+     * Waits for the TileService to be in the expected listening state. If it times out, it fails
+     * the test
+     * @param state desired listening state
+     * @throws InterruptedException
+     */
+    @Override
+    protected void waitForListening(boolean state) throws InterruptedException {
+        int ct = 0;
+        while (ToggleableTestTileService.isListening() != state && (ct++ < CHECK_RETRIES)) {
+            Thread.sleep(CHECK_DELAY);
+        }
+        assertEquals(state, ToggleableTestTileService.isListening());
+    }
+
+    /**
+     * Waits for the TileService to be in the expected connected state. If it times out, it fails
+     * the test
+     * @param state desired connected state
+     * @throws InterruptedException
+     */
+    @Override
+    protected void waitForConnected(boolean state) throws InterruptedException {
+        int ct = 0;
+        while (ToggleableTestTileService.isConnected() != state && (ct++ < CHECK_RETRIES)) {
+            Thread.sleep(CHECK_DELAY);
+        }
+        assertEquals(state, ToggleableTestTileService.isConnected());
+    }
+}
diff --git a/tests/quicksettings/src/android/quicksettings/cts/TestTileService.java b/tests/quicksettings/src/android/quicksettings/cts/TestTileService.java
new file mode 100644
index 0000000..0e6d099
--- /dev/null
+++ b/tests/quicksettings/src/android/quicksettings/cts/TestTileService.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2021 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 android.quicksettings.cts;
+
+import android.content.ComponentName;
+import android.service.quicksettings.TileService;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class TestTileService extends TileService {
+
+    public static final String TAG = "TestTileService";
+    public static final String PKG = "android.app.stubs";
+    public static final int ICON_ID = R.drawable.robot;
+
+    private static TestTileService sTestTileService = null;
+    AtomicBoolean isConnected = new AtomicBoolean(false);
+    AtomicBoolean isListening = new AtomicBoolean(false);
+    AtomicBoolean hasBeenClicked = new AtomicBoolean(false);
+
+    public static String getId() {
+        return String.format("%s/%s", TestTileService.class.getPackage().getName(),
+                TestTileService.class.getName());
+    }
+
+    public static ComponentName getComponentName() {
+        return new ComponentName(TestTileService.class.getPackage().getName(),
+                TestTileService.class.getName());
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+    }
+
+    public static TestTileService getInstance() {
+        return TestTileService.sTestTileService;
+    }
+
+    public void setInstance(TestTileService tile) {
+        sTestTileService = tile;
+    }
+
+    public static boolean isConnected() {
+        return getInstance() != null && getInstance().isConnected.get();
+    }
+
+    public static boolean isListening() {
+        return getInstance().isListening.get();
+    }
+
+    public static boolean hasBeenClicked() {
+        return getInstance().hasBeenClicked.get();
+    }
+
+    @Override
+    public void onStartListening() {
+        super.onStartListening();
+        isListening.set(true);
+    }
+
+    @Override
+    public void onStopListening() {
+        super.onStopListening();
+        isListening.set(false);
+    }
+
+    @Override
+    public void onClick() {
+        super.onClick();
+        hasBeenClicked.set(true);
+    }
+
+    @Override
+    public void onTileAdded() {
+        super.onTileAdded();
+        setInstance(this);
+        isConnected.set(true);
+    }
+
+    @Override
+    public void onTileRemoved() {
+        super.onTileRemoved();
+        setInstance(null);
+        isConnected.set(false);
+        isListening.set(false);
+        hasBeenClicked.set(false);
+    }
+}
diff --git a/tests/quicksettings/src/android/quicksettings/cts/TileServiceTest.java b/tests/quicksettings/src/android/quicksettings/cts/TileServiceTest.java
new file mode 100644
index 0000000..2ccab0c
--- /dev/null
+++ b/tests/quicksettings/src/android/quicksettings/cts/TileServiceTest.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2021 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 android.quicksettings.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.os.Looper;
+import android.service.quicksettings.Tile;
+import android.service.quicksettings.TileService;
+
+import org.junit.Test;
+
+public class TileServiceTest extends BaseTileServiceTest {
+    private final static String TAG = "TileServiceTest";
+
+    @Test
+    public void testCreateTileService() {
+        final TileService tileService = new TileService();
+    }
+
+    @Test
+    public void testListening() throws Exception {
+        initializeAndListen();
+    }
+
+    @Test
+    public void testListening_stopped() throws Exception {
+        initializeAndListen();
+        expandSettings(false);
+        waitForListening(false);
+    }
+
+    @Test
+    public void testLocked_deviceNotLocked() throws Exception {
+        initializeAndListen();
+        assertFalse(mTileService.isLocked());
+    }
+
+    @Test
+    public void testSecure_deviceNotSecure() throws Exception {
+        initializeAndListen();
+        assertFalse(mTileService.isSecure());
+    }
+
+    @Test
+    public void testTile_hasCorrectIcon() throws Exception {
+        initializeAndListen();
+        Tile tile = mTileService.getQsTile();
+        assertEquals(TestTileService.ICON_ID, tile.getIcon().getResId());
+    }
+
+    @Test
+    public void testTile_hasCorrectSubtitle() throws Exception {
+        initializeAndListen();
+
+        Tile tile = mTileService.getQsTile();
+        tile.setSubtitle("test_subtitle");
+        tile.updateTile();
+        assertEquals("test_subtitle", tile.getSubtitle());
+    }
+
+    @Test
+    public void testTile_hasCorrectStateDescription() throws Exception {
+        initializeAndListen();
+
+        Tile tile = mTileService.getQsTile();
+        tile.setStateDescription("test_stateDescription");
+        tile.updateTile();
+        assertEquals("test_stateDescription", tile.getStateDescription());
+    }
+
+    @Test
+    public void testShowDialog() throws Exception {
+        Looper.prepare();
+        Dialog dialog = new AlertDialog.Builder(mContext).create();
+        initializeAndListen();
+        clickTile(TestTileService.getComponentName().flattenToString());
+        waitForClick();
+
+        mTileService.showDialog(dialog);
+
+        assertTrue(dialog.isShowing());
+        dialog.dismiss();
+    }
+
+    @Test
+    public void testUnlockAndRun_phoneIsUnlockedActivityIsRun() throws Exception {
+        initializeAndListen();
+        assertFalse(mTileService.isLocked());
+
+        TestRunnable testRunnable = new TestRunnable();
+
+        mTileService.unlockAndRun(testRunnable);
+        Thread.sleep(100); // wait for activity to run
+        waitForRun(testRunnable);
+    }
+
+    @Test
+    public void testTileInDumpAndHasState() throws Exception {
+        initializeAndListen();
+
+        final CharSequence tileLabel = mTileService.getQsTile().getLabel();
+
+        final String[] dumpLines = executeShellCommand(DUMP_COMMAND).split("\n");
+        final String line = findLine(dumpLines, tileLabel);
+        assertNotNull(line);
+        assertTrue(line.trim().startsWith("State")); // Not BooleanState
+    }
+
+    private void clickTile(String componentName) throws Exception {
+        executeShellCommand(" cmd statusbar click-tile " + componentName);
+    }
+
+    /**
+     * Waits for the TileService to receive the clicked event. If it times out it fails the test.
+     * @throws InterruptedException
+     */
+    private void waitForClick() throws InterruptedException {
+        int ct = 0;
+        while (!TestTileService.hasBeenClicked() && (ct++ < CHECK_RETRIES)) {
+            Thread.sleep(CHECK_DELAY);
+        }
+        assertTrue(TestTileService.hasBeenClicked());
+    }
+
+    /**
+     * Waits for the runnable to be run. If it times out it fails the test.
+     * @throws InterruptedException
+     */
+    private void waitForRun(TestRunnable t) throws InterruptedException {
+        int ct = 0;
+        while (!t.hasRan && (ct++ < CHECK_RETRIES)) {
+            Thread.sleep(CHECK_DELAY);
+        }
+        assertTrue(t.hasRan);
+    }
+
+    @Override
+    protected void waitForListening(boolean state) throws InterruptedException {
+        int ct = 0;
+        while (TestTileService.isListening() != state && (ct++ < CHECK_RETRIES)) {
+            Thread.sleep(CHECK_DELAY);
+        }
+        assertEquals(state, TestTileService.isListening());
+    }
+
+    /**
+     * Waits for the TileService to be in the expected connected state. If it times out, it fails
+     * the test
+     * @param state desired connected state
+     * @throws InterruptedException
+     */
+    @Override
+    protected void waitForConnected(boolean state) throws InterruptedException {
+        int ct = 0;
+        while (TestTileService.isConnected() != state && (ct++ < CHECK_RETRIES)) {
+            Thread.sleep(CHECK_DELAY);
+        }
+        assertEquals(state, TestTileService.isConnected());
+    }
+
+    @Override
+    protected String getTag() {
+        return TAG;
+    }
+
+    @Override
+    protected String getComponentName() {
+        return TestTileService.getComponentName().flattenToString();
+    }
+
+    @Override
+    protected TileService getTileServiceInstance() {
+        return TestTileService.getInstance();
+    }
+
+    class TestRunnable implements Runnable {
+        boolean hasRan = false;
+
+        @Override
+        public void run() {
+            hasRan = true;
+        }
+    }
+}
diff --git a/tests/quicksettings/src/android/quicksettings/cts/ToggleableTestTileService.java b/tests/quicksettings/src/android/quicksettings/cts/ToggleableTestTileService.java
new file mode 100644
index 0000000..0e2e660
--- /dev/null
+++ b/tests/quicksettings/src/android/quicksettings/cts/ToggleableTestTileService.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2019 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 android.quicksettings.cts;
+
+import android.content.ComponentName;
+import android.service.quicksettings.Tile;
+
+public class ToggleableTestTileService extends TestTileService {
+    public static final String TAG = "ToggleableTestTileService";
+    public static final String PKG = "android.app.stubs";
+    public static final int ICON_ID = R.drawable.robot;
+
+    private static TestTileService sTestTileService = null;
+
+    public static boolean isConnected() {
+        return getInstance() != null && getInstance().isConnected.get();
+    }
+
+    public static boolean isListening() {
+        return getInstance().isListening.get();
+    }
+
+    public static TestTileService getInstance() {
+        return ToggleableTestTileService.sTestTileService;
+    }
+
+    @Override
+    public void setInstance(TestTileService tile) {
+        sTestTileService = tile;
+    }
+
+    public static String getId() {
+        return String.format("%s/%s", ToggleableTestTileService.class.getPackage().getName(),
+                ToggleableTestTileService.class.getName());
+    }
+
+    public static ComponentName getComponentName() {
+        return new ComponentName(ToggleableTestTileService.class.getPackage().getName(),
+                ToggleableTestTileService.class.getName());
+    }
+
+    public void toggleState() {
+        if (isListening()) {
+            Tile tile = getInstance().getQsTile();
+            switch(tile.getState()) {
+                case Tile.STATE_ACTIVE:
+                    tile.setState(Tile.STATE_INACTIVE);
+                    break;
+                case Tile.STATE_INACTIVE:
+                    tile.setState(Tile.STATE_ACTIVE);
+                    break;
+                default:
+                    break;
+            }
+            tile.updateTile();
+        }
+    }
+}
diff --git a/tests/rollback/AndroidTest.xml b/tests/rollback/AndroidTest.xml
index 534ed1e..0194557 100644
--- a/tests/rollback/AndroidTest.xml
+++ b/tests/rollback/AndroidTest.xml
@@ -24,7 +24,11 @@
     </target_preparer>
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.A" />
+        <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.B" />
+        <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.C" />
         <option name="teardown-command" value="pm uninstall com.android.cts.install.lib.testapp.A" />
+        <option name="teardown-command" value="pm uninstall com.android.cts.install.lib.testapp.B" />
+        <option name="teardown-command" value="pm uninstall com.android.cts.install.lib.testapp.C" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="com.android.cts.rollback"/>
diff --git a/tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java b/tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java
index af23ff5..05c4ca7 100644
--- a/tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java
+++ b/tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java
@@ -21,17 +21,24 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.junit.Assert.fail;
+
 import android.Manifest;
+import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.rollback.RollbackInfo;
+import android.content.rollback.RollbackManager;
 import android.provider.DeviceConfig;
 
 import androidx.test.InstrumentationRegistry;
 
 import com.android.cts.install.lib.Install;
 import com.android.cts.install.lib.InstallUtils;
+import com.android.cts.install.lib.LocalIntentSender;
 import com.android.cts.install.lib.TestApp;
 import com.android.cts.install.lib.Uninstall;
 import com.android.cts.rollback.lib.Rollback;
+import com.android.cts.rollback.lib.RollbackBroadcastReceiver;
 import com.android.cts.rollback.lib.RollbackUtils;
 
 import org.junit.After;
@@ -41,12 +48,19 @@
 import org.junit.runners.JUnit4;
 
 import java.io.IOException;
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
 
 /**
  * CTS Tests for RollbackManager APIs.
  */
 @RunWith(JUnit4.class)
 public class RollbackManagerTest {
+    // TODO: use PackageManager.RollbackDataPolicy.* when they are system API
+    private static final int ROLLBACK_DATA_POLICY_RESTORE = 0;
+    private static final int ROLLBACK_DATA_POLICY_WIPE = 1;
+
+    private static final String PROPERTY_ENABLE_ROLLBACK_TIMEOUT_MILLIS = "enable_rollback_timeout";
 
     /**
      * Adopts common permissions needed to test rollbacks and uninstalls the
@@ -58,11 +72,14 @@
                 .adoptShellPermissionIdentity(
                     Manifest.permission.INSTALL_PACKAGES,
                     Manifest.permission.DELETE_PACKAGES,
+                    Manifest.permission.MANAGE_ROLLBACKS,
                     Manifest.permission.TEST_MANAGE_ROLLBACKS,
                     Manifest.permission.READ_DEVICE_CONFIG,
-                    Manifest.permission.WRITE_DEVICE_CONFIG);
+                    Manifest.permission.WRITE_DEVICE_CONFIG,
+                    Manifest.permission.FORCE_STOP_PACKAGES,
+                    Manifest.permission.SET_TIME);
 
-        Uninstall.packages(TestApp.A);
+        Uninstall.packages(TestApp.A, TestApp.B, TestApp.C);
     }
 
     /**
@@ -70,7 +87,7 @@
      */
     @After
     public void teardown() throws InterruptedException, IOException {
-        Uninstall.packages(TestApp.A);
+        Uninstall.packages(TestApp.A, TestApp.B, TestApp.C);
 
         InstrumentationRegistry.getInstrumentation().getUiAutomation()
                 .dropShellPermissionIdentity();
@@ -110,12 +127,227 @@
         assertThat(committed).causePackagesContainsExactly(TestApp.A2);
     }
 
+    /**
+     * Tests rollback of multi-package installs is implemented.
+     */
+    @Test
+    public void testBasic_MultiPackage() throws Exception {
+        // Prep installation of the test apps.
+        Install.multi(TestApp.A1, TestApp.B1).commit();
+        Install.multi(TestApp.A2, TestApp.B2).setEnableRollback().commit();
+        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);
+        assertThat(InstallUtils.getInstalledVersion(TestApp.B)).isEqualTo(2);
+
+        // TestApp.A should now be available for rollback.
+        RollbackInfo rollback = RollbackUtils.waitForAvailableRollback(TestApp.A);
+        assertThat(rollback).isNotNull();
+        assertThat(rollback).packagesContainsExactly(
+                Rollback.from(TestApp.A2).to(TestApp.A1),
+                Rollback.from(TestApp.B2).to(TestApp.B1));
+
+        // Rollback the app. It should cause both test apps to be rolled back.
+        RollbackUtils.rollback(rollback.getRollbackId());
+        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);
+        assertThat(InstallUtils.getInstalledVersion(TestApp.B)).isEqualTo(1);
+
+        // We should see recent rollbacks listed for both A and B.
+        RollbackInfo rollbackA = RollbackUtils.getCommittedRollback(TestApp.A);
+        RollbackInfo rollbackB = RollbackUtils.getCommittedRollback(TestApp.B);
+        assertThat(rollbackA).packagesContainsExactly(
+                Rollback.from(TestApp.A2).to(TestApp.A1),
+                Rollback.from(TestApp.B2).to(TestApp.B1));
+        assertThat(rollbackA).hasRollbackId(rollback.getRollbackId());
+        assertThat(rollbackB).hasRollbackId(rollback.getRollbackId());
+    }
+
+    /**
+     * Tests rollbacks are properly persisted.
+     */
+    @Test
+    public void testSingleRollbackPersistence() throws Exception {
+        RollbackManager rm = RollbackUtils.getRollbackManager();
+
+        Install.single(TestApp.A1).commit();
+        Install.single(TestApp.A2).setEnableRollback().commit();
+        RollbackInfo rollbackA = RollbackUtils.waitForAvailableRollback(TestApp.A);
+        assertThat(rollbackA).isNotNull();
+
+        // Check the available rollback is persisted correctly
+        rm.reloadPersistedData();
+        rollbackA = RollbackUtils.getAvailableRollback(TestApp.A);
+        assertThat(rollbackA).packagesContainsExactly(Rollback.from(TestApp.A2).to(TestApp.A1));
+
+        // Rollback the app
+        TestApp cause = new TestApp("Foo", "com.android.tests.rollback.testapp.Foo",
+                /*versionCode*/ 42, /*isApex*/ false);
+        RollbackUtils.rollback(rollbackA.getRollbackId(), cause);
+        RollbackInfo committed = RollbackUtils.getCommittedRollback(TestApp.A);
+        assertThat(committed).isNotNull();
+
+        // Check the committed rollback is persisted correctly
+        rm.reloadPersistedData();
+        committed = RollbackUtils.getCommittedRollback(TestApp.A);
+        assertThat(committed).hasRollbackId(rollbackA.getRollbackId());
+        assertThat(committed).isNotStaged();
+        assertThat(committed).packagesContainsExactly(Rollback.from(TestApp.A2).to(TestApp.A1));
+        assertThat(committed).causePackagesContainsExactly(cause);
+    }
+
+    /**
+     * Tests rollbacks are properly persisted.
+     */
+    @Test
+    public void testMultiRollbackPersistence() throws Exception {
+        RollbackManager rm = RollbackUtils.getRollbackManager();
+
+        Install.multi(TestApp.A1, TestApp.B1).commit();
+        Install.multi(TestApp.A2, TestApp.B2).setEnableRollback().commit();
+        RollbackInfo rollbackA = RollbackUtils.waitForAvailableRollback(TestApp.A);
+        RollbackInfo rollbackB = RollbackUtils.waitForAvailableRollback(TestApp.B);
+        assertThat(rollbackA).isNotNull();
+        assertThat(rollbackB).isNotNull();
+
+        // Check the available rollback is persisted correctly
+        rm.reloadPersistedData();
+        rollbackA = RollbackUtils.getAvailableRollback(TestApp.A);
+        rollbackB = RollbackUtils.getAvailableRollback(TestApp.B);
+        assertThat(rollbackB).hasRollbackId(rollbackA.getRollbackId());
+        assertThat(rollbackA).packagesContainsExactly(
+                Rollback.from(TestApp.A2).to(TestApp.A1),
+                Rollback.from(TestApp.B2).to(TestApp.B1));
+
+        // Rollback the app
+        RollbackUtils.rollback(rollbackA.getRollbackId());
+        RollbackInfo committedA = RollbackUtils.getCommittedRollback(TestApp.A);
+        RollbackInfo committedB = RollbackUtils.getCommittedRollback(TestApp.B);
+        assertThat(committedA).isNotNull();
+        assertThat(committedB).isNotNull();
+
+        // Check the committed rollback is persisted correctly
+        rm.reloadPersistedData();
+        committedA = RollbackUtils.getCommittedRollback(TestApp.A);
+        committedB = RollbackUtils.getCommittedRollback(TestApp.B);
+        assertThat(committedA).hasRollbackId(rollbackA.getRollbackId());
+        assertThat(committedB).hasRollbackId(rollbackA.getRollbackId());
+        assertThat(committedA).isNotStaged();
+        assertThat(committedA).packagesContainsExactly(
+                Rollback.from(TestApp.A2).to(TestApp.A1),
+                Rollback.from(TestApp.B2).to(TestApp.B1));
+    }
+
+    /**
+     * Tests that the MANAGE_ROLLBACKS permission is required to call
+     * RollbackManager APIs.
+     */
+    @Test
+    public void testManageRollbacksPermission() throws Exception {
+        // We shouldn't be allowed to call any of the RollbackManager APIs
+        // without the MANAGE_ROLLBACKS permission.
+        InstallUtils.dropShellPermissionIdentity();
+        RollbackManager rm = RollbackUtils.getRollbackManager();
+
+        try {
+            rm.getAvailableRollbacks();
+            fail("expected SecurityException");
+        } catch (SecurityException e) {
+            // Expected.
+        }
+
+        try {
+            rm.getRecentlyCommittedRollbacks();
+            fail("expected SecurityException");
+        } catch (SecurityException e) {
+            // Expected.
+        }
+
+        try {
+            LocalIntentSender sender = new LocalIntentSender();
+            rm.commitRollback(0, Collections.emptyList(), sender.getIntentSender());
+            fail("expected SecurityException");
+        } catch (SecurityException e) {
+            // Expected.
+        }
+
+        try {
+            rm.reloadPersistedData();
+            fail("expected SecurityException");
+        } catch (SecurityException e) {
+            // Expected.
+        }
+
+        try {
+            rm.expireRollbackForPackage(TestApp.A);
+            fail("expected SecurityException");
+        } catch (SecurityException e) {
+            // Expected.
+        }
+    }
+
+    /**
+     * Tests that you cannot enable rollback for a package without the
+     * MANAGE_ROLLBACKS permission.
+     */
+    @Test
+    public void testEnableRollbackPermission() throws Exception {
+        InstallUtils.adoptShellPermissionIdentity(
+                Manifest.permission.INSTALL_PACKAGES,
+                Manifest.permission.DELETE_PACKAGES);
+
+        Install.single(TestApp.A1).commit();
+        Install.single(TestApp.A2).setEnableRollback().commit();
+
+        // We expect v2 of the app was installed, but rollback has not
+        // been enabled.
+        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);
+        InstallUtils.adoptShellPermissionIdentity(
+                Manifest.permission.MANAGE_ROLLBACKS,
+                Manifest.permission.INSTALL_PACKAGES,
+                Manifest.permission.DELETE_PACKAGES);
+        assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull();
+    }
+
+    /**
+     * Tests that you cannot enable rollback for a non-module package when
+     * holding the MANAGE_ROLLBACKS permission without TEST_MANAGE_ROLLBACKS.
+     */
+    @Test
+    public void testNonModuleEnableRollback() throws Exception {
+        InstallUtils.adoptShellPermissionIdentity(
+                Manifest.permission.INSTALL_PACKAGES,
+                Manifest.permission.DELETE_PACKAGES,
+                Manifest.permission.MANAGE_ROLLBACKS);
+
+        Install.single(TestApp.A1).commit();
+        Install.single(TestApp.A2).setEnableRollback().commit();
+
+        // We expect v2 of the app was installed, but rollback has not
+        // been enabled because the test app is not a module.
+        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);
+        assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull();
+    }
+
+    /**
+     * Tests failure to enable rollback for multi-package installs.
+     * If any one of the packages fail to enable rollback, we shouldn't enable
+     * rollback for any package.
+     */
+    @Test
+    public void testMultiPackageEnableFail() throws Exception {
+        Install.single(TestApp.A1).commit();
+        // We should fail to enable rollback here because TestApp B is not
+        // already installed.
+        Install.multi(TestApp.A2, TestApp.B2).setEnableRollback().commit();
+
+        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);
+        assertThat(InstallUtils.getInstalledVersion(TestApp.B)).isEqualTo(2);
+
+        assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull();
+        assertThat(RollbackUtils.getAvailableRollback(TestApp.B)).isNull();
+    }
+
     @Test
     public void testGetRollbackDataPolicy() throws Exception {
-        // TODO: To change to the following statement when
-        // PackageManager.RollbackDataPolicy.WIPE is available.
-        // final int rollBackDataPolicy = PackageManager.RollbackDataPolicy.WIPE;
-        final int rollBackDataPolicy = 1;
+        final int rollBackDataPolicy = ROLLBACK_DATA_POLICY_WIPE;
 
         Install.single(TestApp.A1).commit();
         assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);
@@ -181,4 +413,345 @@
         RollbackUtils.rollback(available.getRollbackId(), TestApp.ARotated2);
         assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);
     }
+
+    /**
+     * Test we can't enable rollback for non-allowlisted app without
+     * TEST_MANAGE_ROLLBACKS permission
+     */
+    @Test
+    public void testNonRollbackAllowlistedApp() throws Exception {
+        InstallUtils.dropShellPermissionIdentity();
+        InstallUtils.adoptShellPermissionIdentity(
+                Manifest.permission.INSTALL_PACKAGES,
+                Manifest.permission.DELETE_PACKAGES,
+                Manifest.permission.MANAGE_ROLLBACKS);
+
+        Install.single(TestApp.A1).commit();
+        assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull();
+
+        Install.single(TestApp.A2).setEnableRollback().commit();
+        Thread.sleep(TimeUnit.SECONDS.toMillis(2));
+        assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull();
+    }
+
+    /**
+     * Tests user data is restored according to the preset rollback data policy.
+     */
+    @Test
+    public void testRollbackDataPolicy() throws Exception {
+        Install.multi(TestApp.A1, TestApp.B1, TestApp.C1).commit();
+        // Write user data version = 1
+        InstallUtils.processUserData(TestApp.A);
+        InstallUtils.processUserData(TestApp.B);
+        InstallUtils.processUserData(TestApp.C);
+
+        Install a2 = Install.single(TestApp.A2)
+                .setEnableRollback(PackageManager.ROLLBACK_DATA_POLICY_WIPE);
+        Install b2 = Install.single(TestApp.B2)
+                .setEnableRollback(PackageManager.ROLLBACK_DATA_POLICY_RESTORE);
+        Install c2 = Install.single(TestApp.C2)
+                .setEnableRollback(PackageManager.ROLLBACK_DATA_POLICY_RETAIN);
+        Install.multi(a2, b2, c2).setEnableRollback().commit();
+        // Write user data version = 2
+        InstallUtils.processUserData(TestApp.A);
+        InstallUtils.processUserData(TestApp.B);
+        InstallUtils.processUserData(TestApp.C);
+
+        RollbackInfo info = RollbackUtils.getAvailableRollback(TestApp.A);
+        RollbackUtils.rollback(info.getRollbackId());
+        // Read user data version from userdata.txt
+        // A's user data version is -1 for user data is wiped.
+        // B's user data version is 1 for user data is restored.
+        // C's user data version is 2 for user data is retained.
+        assertThat(InstallUtils.getUserDataVersion(TestApp.A)).isEqualTo(-1);
+        assertThat(InstallUtils.getUserDataVersion(TestApp.B)).isEqualTo(1);
+        assertThat(InstallUtils.getUserDataVersion(TestApp.C)).isEqualTo(2);
+    }
+
+    /**
+     * Tests user data is restored according to the rollback data policy defined in the manifest.
+     */
+    @Test
+    public void testRollbackDataPolicy_Manifest() throws Exception {
+        Install.multi(TestApp.A1, TestApp.B1, TestApp.C1).commit();
+        // Write user data version = 1
+        InstallUtils.processUserData(TestApp.A);
+        InstallUtils.processUserData(TestApp.B);
+        InstallUtils.processUserData(TestApp.C);
+
+        Install a2 = Install.single(TestApp.ARollbackWipe2).setEnableRollback();
+        Install b2 = Install.single(TestApp.BRollbackRestore2).setEnableRollback();
+        Install c2 = Install.single(TestApp.CRollbackRetain2).setEnableRollback();
+        Install.multi(a2, b2, c2).setEnableRollback().commit();
+        // Write user data version = 2
+        InstallUtils.processUserData(TestApp.A);
+        InstallUtils.processUserData(TestApp.B);
+        InstallUtils.processUserData(TestApp.C);
+
+        RollbackInfo info = RollbackUtils.getAvailableRollback(TestApp.A);
+        RollbackUtils.rollback(info.getRollbackId());
+        // Read user data version from userdata.txt
+        // A's user data version is -1 for user data is wiped.
+        // B's user data version is 1 for user data is restored.
+        // C's user data version is 2 for user data is retained.
+        assertThat(InstallUtils.getUserDataVersion(TestApp.A)).isEqualTo(-1);
+        assertThat(InstallUtils.getUserDataVersion(TestApp.B)).isEqualTo(1);
+        assertThat(InstallUtils.getUserDataVersion(TestApp.C)).isEqualTo(2);
+    }
+
+    /**
+     * Test explicit expiration of rollbacks.
+     * Does not test the scheduling aspects of rollback expiration.
+     */
+    @Test
+    public void testRollbackExpiration() throws Exception {
+        Install.single(TestApp.A1).commit();
+        Install.single(TestApp.A2).setEnableRollback().commit();
+        RollbackUtils.waitForAvailableRollback(TestApp.A);
+
+        // Expire the rollback.
+        RollbackUtils.getRollbackManager().expireRollbackForPackage(TestApp.A);
+
+        // The rollback should no longer be available.
+        assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull();
+    }
+
+    /**
+     * Test restrictions on rollback broadcast sender.
+     * A random app should not be able to send a ROLLBACK_COMMITTED broadcast.
+     */
+    @Test
+    public void testRollbackBroadcastRestrictions() throws Exception {
+        RollbackBroadcastReceiver broadcastReceiver = new RollbackBroadcastReceiver();
+        Intent broadcast = new Intent(Intent.ACTION_ROLLBACK_COMMITTED);
+        try {
+            InstrumentationRegistry.getContext().sendBroadcast(broadcast);
+            fail("Succeeded in sending restricted broadcast from app context.");
+        } catch (SecurityException se) {
+            // Expected behavior.
+        }
+
+        // Confirm that we really haven't received the broadcast.
+        // TODO: How long to wait for the expected timeout?
+        assertThat(broadcastReceiver.poll(5, TimeUnit.SECONDS)).isNull();
+
+        // TODO: Do we need to do this? Do we need to ensure this is always
+        // called, even when the test fails?
+        broadcastReceiver.unregister();
+    }
+
+    /**
+     * Test rollback of apks involving splits.
+     */
+    @Test
+    public void testRollbackWithSplits() throws Exception {
+        Install.single(TestApp.ASplit1).commit();
+        Install.single(TestApp.ASplit2).setEnableRollback().commit();
+        RollbackInfo rollback = RollbackUtils.waitForAvailableRollback(TestApp.A);
+        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);
+
+        RollbackUtils.rollback(rollback.getRollbackId());
+        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);
+    }
+
+    /**
+     * Test bad update automatic rollback.
+     */
+    @Test
+    public void testBadUpdateRollback() throws Exception {
+        // Prep installation of the test apps.
+        Install.single(TestApp.A1).commit();
+        Install.single(TestApp.ACrashing2).setEnableRollback().commit();
+        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);
+
+        Install.single(TestApp.B1).commit();
+        Install.single(TestApp.B2).setEnableRollback().commit();
+        assertThat(InstallUtils.getInstalledVersion(TestApp.B)).isEqualTo(2);
+
+        // Both test apps should now be available for rollback, and the
+        // targetPackage returned for rollback should be correct.
+        RollbackInfo rollbackA = RollbackUtils.waitForAvailableRollback(TestApp.A);
+        assertThat(rollbackA).packagesContainsExactly(Rollback.from(TestApp.A2).to(TestApp.A1));
+        RollbackInfo rollbackB = RollbackUtils.waitForAvailableRollback(TestApp.B);
+        assertThat(rollbackB).packagesContainsExactly(Rollback.from(TestApp.B2).to(TestApp.B1));
+
+        // Register rollback committed receiver
+        RollbackBroadcastReceiver rollbackReceiver = new RollbackBroadcastReceiver();
+
+        // Crash TestApp.A PackageWatchdog#TRIGGER_FAILURE_COUNT times to trigger rollback
+        RollbackUtils.sendCrashBroadcast(TestApp.A, 5);
+
+        // Verify we received a broadcast for the rollback.
+        assertThat(rollbackReceiver.poll(1, TimeUnit.MINUTES)).isNotNull();
+
+        // TestApp.A is automatically rolled back by the RollbackPackageHealthObserver
+        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);
+        // Instrumented app is still the package installer
+        String installer = InstrumentationRegistry.getContext().getPackageManager()
+                .getInstallerPackageName(TestApp.A);
+        assertThat(installer).isEqualTo(getClass().getPackageName());
+        // TestApp.B is untouched
+        assertThat(InstallUtils.getInstalledVersion(TestApp.B)).isEqualTo(2);
+    }
+
+    /**
+     * Tests we fail to enable rollbacks if enable-rollback times out.
+     */
+    @Test
+    public void testEnableRollbackTimeoutFailsRollback() throws Exception {
+        //setting the timeout to a very short amount that will definitely be triggered
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,
+                PROPERTY_ENABLE_ROLLBACK_TIMEOUT_MILLIS,
+                Long.toString(0), false /* makeDefault*/);
+
+        try {
+            Install.single(TestApp.A1).commit();
+            RollbackUtils.waitForUnavailableRollback(TestApp.A);
+
+            // Block the RollbackManager to make extra sure it will not be
+            // able to enable the rollback in time.
+            RollbackManager rm = RollbackUtils.getRollbackManager();
+            rm.blockRollbackManager(TimeUnit.SECONDS.toMillis(1));
+            Install.single(TestApp.A2).setEnableRollback().commit();
+            assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);
+
+            // Give plenty of time for RollbackManager to unblock and attempt
+            // to make the rollback available before asserting that the
+            // rollback was not made available.
+            Thread.sleep(TimeUnit.SECONDS.toMillis(2));
+            assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull();
+        } finally {
+            //setting the timeout back to default
+            DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,
+                    PROPERTY_ENABLE_ROLLBACK_TIMEOUT_MILLIS,
+                    null, false /* makeDefault*/);
+        }
+    }
+
+    /**
+     * Tests we fail to enable rollbacks if enable-rollback times out for any child session.
+     */
+    @Test
+    public void testEnableRollbackTimeoutFailsRollback_MultiPackage() throws Exception {
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,
+                PROPERTY_ENABLE_ROLLBACK_TIMEOUT_MILLIS,
+                Long.toString(5000), false /* makeDefault*/);
+
+        try {
+            Install.multi(TestApp.A1, TestApp.B1).commit();
+            RollbackUtils.waitForUnavailableRollback(TestApp.A);
+
+            // Block the 2nd session for 10s so it will not be able to enable the rollback in time.
+            RollbackManager rm = RollbackUtils.getRollbackManager();
+            rm.blockRollbackManager(TimeUnit.SECONDS.toMillis(0));
+            rm.blockRollbackManager(TimeUnit.SECONDS.toMillis(10));
+            Install.multi(TestApp.A2, TestApp.B2).setEnableRollback().commit();
+            assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);
+            assertThat(InstallUtils.getInstalledVersion(TestApp.B)).isEqualTo(2);
+
+            // Give plenty of time for RollbackManager to unblock and attempt
+            // to make the rollback available before asserting that the
+            // rollback was not made available.
+            Thread.sleep(TimeUnit.SECONDS.toMillis(2));
+            assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull();
+            assertThat(RollbackUtils.getAvailableRollback(TestApp.B)).isNull();
+        } finally {
+            //setting the timeout back to default
+            DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK,
+                    PROPERTY_ENABLE_ROLLBACK_TIMEOUT_MILLIS,
+                    null, false /* makeDefault*/);
+        }
+    }
+
+    /**
+     * Test the scheduling aspect of rollback expiration.
+     */
+    @Test
+    public void testRollbackExpiresAfterLifetime() throws Exception {
+        long expirationTime = TimeUnit.SECONDS.toMillis(30);
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK_BOOT,
+                RollbackManager.PROPERTY_ROLLBACK_LIFETIME_MILLIS,
+                Long.toString(expirationTime), false /* makeDefault*/);
+
+        try {
+            Install.single(TestApp.A1).commit();
+            Install.single(TestApp.A2).setEnableRollback().commit();
+            RollbackUtils.waitForAvailableRollback(TestApp.A);
+
+            // Give it a little more time, but still not long enough to expire
+            Thread.sleep(expirationTime / 2);
+            assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNotNull();
+
+            // Check that the data has expired after the expiration time (with a buffer of 1 second)
+            Thread.sleep(expirationTime / 2 + TimeUnit.SECONDS.toMillis(1));
+            assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull();
+        } finally {
+            // Restore default config values
+            DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK_BOOT,
+                    RollbackManager.PROPERTY_ROLLBACK_LIFETIME_MILLIS,
+                    null, false /* makeDefault*/);
+        }
+    }
+
+    /**
+     * Test that available rollbacks should expire correctly when the property
+     * {@link RollbackManager#PROPERTY_ROLLBACK_LIFETIME_MILLIS} is changed
+     */
+    @Test
+    public void testRollbackExpiresWhenLifetimeChanges() throws Exception {
+        Install.single(TestApp.A1).commit();
+        Install.single(TestApp.A2).setEnableRollback().commit();
+        RollbackUtils.waitForAvailableRollback(TestApp.A);
+
+        // Change the lifetime to 0 which should expire rollbacks immediately
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK_BOOT,
+                RollbackManager.PROPERTY_ROLLBACK_LIFETIME_MILLIS,
+                Long.toString(0), false /* makeDefault*/);
+
+        try {
+            RollbackUtils.waitForUnavailableRollback(TestApp.A);
+        } finally {
+            // Restore default config values
+            DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK_BOOT,
+                    RollbackManager.PROPERTY_ROLLBACK_LIFETIME_MILLIS,
+                    null, false /* makeDefault*/);
+        }
+    }
+
+    /**
+     * Test that changing time on device does not affect the duration of time that we keep
+     * rollback available
+     */
+    @Test
+    public void testTimeChangeDoesNotAffectLifetime() throws Exception {
+        long expirationTime = TimeUnit.SECONDS.toMillis(30);
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK_BOOT,
+                RollbackManager.PROPERTY_ROLLBACK_LIFETIME_MILLIS,
+                Long.toString(expirationTime), false /* makeDefault*/);
+
+        try {
+            Install.single(TestApp.A1).commit();
+            Install.single(TestApp.A2).setEnableRollback().commit();
+            RollbackUtils.waitForAvailableRollback(TestApp.A);
+            RollbackUtils.forwardTimeBy(expirationTime);
+
+            try {
+                // The rollback should be still available after forwarding time
+                assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNotNull();
+                // The rollback shouldn't expire when half of the expiration time elapses
+                Thread.sleep(expirationTime / 2);
+                assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNotNull();
+                // The rollback now should expire
+                Thread.sleep(expirationTime / 2 + TimeUnit.SECONDS.toMillis(1));
+                assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull();
+            } finally {
+                RollbackUtils.forwardTimeBy(-expirationTime);
+            }
+        } finally {
+            // Restore default config values
+            DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK_BOOT,
+                    RollbackManager.PROPERTY_ROLLBACK_LIFETIME_MILLIS,
+                    null, false /* makeDefault*/);
+        }
+    }
 }
diff --git a/tests/rotationresolverservice/src/android/rotationresolverservice/cts/CtsRotationResolverServiceDeviceTest.java b/tests/rotationresolverservice/src/android/rotationresolverservice/cts/CtsRotationResolverServiceDeviceTest.java
index 7576ae8..8ab556c 100644
--- a/tests/rotationresolverservice/src/android/rotationresolverservice/cts/CtsRotationResolverServiceDeviceTest.java
+++ b/tests/rotationresolverservice/src/android/rotationresolverservice/cts/CtsRotationResolverServiceDeviceTest.java
@@ -62,6 +62,7 @@
     private static final boolean FAKE_SHOULD_USE_CAMERA = true;
     private static final long FAKE_TIME_OUT = 1000L;
     private static final long TEMPORARY_SERVICE_DURATION = 5000L;
+    private static final String USER_ID = "0";
 
     private final boolean isTestable =
             !TextUtils.isEmpty(getRotationResolverServiceComponent());
@@ -150,7 +151,7 @@
     }
 
     private String getRotationResolverServiceComponent() {
-        return runShellCommand("cmd resolver get-bound-package");
+        return runShellCommand("cmd resolver get-bound-package %s", USER_ID);
     }
 
     private int getLastTestCallbackCode() {
@@ -164,16 +165,17 @@
      * in our test service w/ CountDownLatch(s).
      */
     private void callResolveRotation() {
-        runShellCommand("cmd resolver resolve-rotation");
+        runShellCommand("cmd resolver resolve-rotation %s", USER_ID);
         CtsTestRotationResolverService.onReceivedResponse();
     }
 
     private void setTestableRotationResolverService(String service) {
-        runShellCommand("cmd resolver set-temporary-service %s %s", service, TEMPORARY_SERVICE_DURATION);
+        runShellCommand("cmd resolver set-temporary-service %s %s %s",
+                USER_ID, service, TEMPORARY_SERVICE_DURATION);
     }
 
     private void clearTestableRotationResolverService() {
-        runShellCommand("cmd resolver set-temporary-service");
+        runShellCommand("cmd resolver set-temporary-service %s", USER_ID);
     }
 
 }
diff --git a/tests/sensor/jni/SensorTestCases.cpp b/tests/sensor/jni/SensorTestCases.cpp
index 43e07a4..68163e7 100644
--- a/tests/sensor/jni/SensorTestCases.cpp
+++ b/tests/sensor/jni/SensorTestCases.cpp
@@ -30,6 +30,8 @@
     ASensorList dummyList;
     ASSERT_EQ(ASensorManager_getSensorList(nullptr, nullptr), -EINVAL);
     ASSERT_EQ(ASensorManager_getSensorList(nullptr, &dummyList), -EINVAL);
+    ASSERT_EQ(ASensorManager_getDynamicSensorList(nullptr, nullptr), -EINVAL);
+    ASSERT_EQ(ASensorManager_getDynamicSensorList(nullptr, &dummyList), -EINVAL);
 
     ASSERT_EQ(ASensorManager_getDefaultSensor(nullptr, ASENSOR_TYPE_ACCELEROMETER), nullptr);
 
diff --git a/tests/sensor/src/android/hardware/cts/SensorBatchingTests.java b/tests/sensor/src/android/hardware/cts/SensorBatchingTests.java
index 41ba9d0..e9ba985 100644
--- a/tests/sensor/src/android/hardware/cts/SensorBatchingTests.java
+++ b/tests/sensor/src/android/hardware/cts/SensorBatchingTests.java
@@ -96,6 +96,58 @@
         runFlushSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_50HZ, BATCHING_PERIOD);
     }
 
+    public void testAccelerometerLimitedAxes_fastest_batching() throws Throwable {
+        runBatchingSensorTest(
+                Sensor.TYPE_ACCELEROMETER_LIMITED_AXES,
+                RATE_FASTEST,
+                BATCHING_PERIOD);
+    }
+
+    public void testAccelerometerLimitedAxes_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testAccelerometerLimitedAxes_fastest_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testAccelerometerLimitedAxes_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED,
+                              RATE_FASTEST,
+                              BATCHING_PERIOD);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED,
+                              RATE_FASTEST,
+                              BATCHING_PERIOD);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_50hz_batching() throws Throwable {
+        runBatchingSensorTest(
+                Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED,
+                RATE_50HZ,
+                BATCHING_PERIOD);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_fastest_flush() throws Throwable {
+        runFlushSensorTest(
+                Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED,
+                RATE_FASTEST,
+                BATCHING_PERIOD);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_50hz_flush() throws Throwable {
+        runFlushSensorTest(
+                Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED,
+                RATE_50HZ,
+                BATCHING_PERIOD);
+    }
+
     public void testMagneticField_fastest_batching() throws Throwable {
         runBatchingSensorTest(Sensor.TYPE_MAGNETIC_FIELD, RATE_FASTEST, BATCHING_PERIOD);
     }
@@ -141,13 +193,35 @@
     }
 
     public void testGyroscope_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_GYROSCOPE, SensorManager.SENSOR_DELAY_FASTEST, BATCHING_PERIOD);
+        runFlushSensorTest(
+                Sensor.TYPE_GYROSCOPE,
+                SensorManager.SENSOR_DELAY_FASTEST,
+                BATCHING_PERIOD);
     }
 
     public void testGyroscope_50hz_flush() throws Throwable {
         runFlushSensorTest(Sensor.TYPE_GYROSCOPE, RATE_50HZ, BATCHING_PERIOD);
     }
 
+    public void testGyroscopeLimitedAxes_fastest_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, RATE_FASTEST, BATCHING_PERIOD);
+    }
+
+    public void testGyroscopeLimitedAxes_50hz_batching() throws Throwable {
+        runBatchingSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, RATE_50HZ, BATCHING_PERIOD);
+    }
+
+    public void testGyroscopeLimitedAxes_fastest_flush() throws Throwable {
+        runFlushSensorTest(
+                Sensor.TYPE_GYROSCOPE_LIMITED_AXES,
+                SensorManager.SENSOR_DELAY_FASTEST,
+                BATCHING_PERIOD);
+    }
+
+    public void testGyroscopeLimitedAxes_50hz_flush() throws Throwable {
+        runFlushSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, RATE_50HZ, BATCHING_PERIOD);
+    }
+
     public void testPressure_fastest_batching() throws Throwable {
         runBatchingSensorTest(Sensor.TYPE_PRESSURE, RATE_FASTEST, BATCHING_PERIOD);
     }
@@ -157,7 +231,10 @@
     }
 
     public void testPressure_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_PRESSURE, SensorManager.SENSOR_DELAY_FASTEST, BATCHING_PERIOD);
+        runFlushSensorTest(
+                Sensor.TYPE_PRESSURE,
+                SensorManager.SENSOR_DELAY_FASTEST,
+                BATCHING_PERIOD);
     }
 
     public void testPressure_50hz_flush() throws Throwable {
@@ -173,7 +250,10 @@
     }
 
     public void testGravity_fastest_flush() throws Throwable {
-        runFlushSensorTest(Sensor.TYPE_GRAVITY, SensorManager.SENSOR_DELAY_FASTEST, BATCHING_PERIOD);
+        runFlushSensorTest(
+                Sensor.TYPE_GRAVITY,
+                SensorManager.SENSOR_DELAY_FASTEST,
+                BATCHING_PERIOD);
     }
 
     public void testGravity_50hz_flush() throws Throwable {
@@ -197,7 +277,10 @@
     }
 
     public void testMagneticFieldUncalibrated_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED, RATE_FASTEST, BATCHING_PERIOD);
+        runBatchingSensorTest(
+                Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED,
+                RATE_FASTEST,
+                BATCHING_PERIOD);
     }
 
     public void testMagneticFieldUncalibrated_50hz_batching() throws Throwable {
@@ -244,6 +327,34 @@
         runFlushSensorTest(Sensor.TYPE_GYROSCOPE_UNCALIBRATED, RATE_50HZ, BATCHING_PERIOD);
     }
 
+    public void testGyroscopeLimitedAxesUncalibrated_fastest_batching() throws Throwable {
+        runBatchingSensorTest(
+                Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED,
+                RATE_FASTEST,
+                BATCHING_PERIOD);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibrated_50hz_batching() throws Throwable {
+        runBatchingSensorTest(
+                Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED,
+                RATE_50HZ,
+                BATCHING_PERIOD);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibrated_fastest_flush() throws Throwable {
+        runFlushSensorTest(
+                Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED,
+                RATE_FASTEST,
+                BATCHING_PERIOD);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibrated_50hz_flush() throws Throwable {
+        runFlushSensorTest(
+                Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED,
+                RATE_50HZ,
+                BATCHING_PERIOD);
+    }
+
     public void testLinearAcceleration_fastest_batching() throws Throwable {
         runBatchingSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_FASTEST, BATCHING_PERIOD);
     }
@@ -261,7 +372,10 @@
     }
 
     public void testGeomagneticRotationVector_fastest_batching() throws Throwable {
-        runBatchingSensorTest(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR, RATE_FASTEST, BATCHING_PERIOD);
+        runBatchingSensorTest(
+                Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR,
+                RATE_FASTEST,
+                BATCHING_PERIOD);
     }
 
     public void testGeomagneticRotationVector_50hz_batching() throws Throwable {
diff --git a/tests/sensor/src/android/hardware/cts/SensorIntegrationTests.java b/tests/sensor/src/android/hardware/cts/SensorIntegrationTests.java
index 904289b..050c7bb 100644
--- a/tests/sensor/src/android/hardware/cts/SensorIntegrationTests.java
+++ b/tests/sensor/src/android/hardware/cts/SensorIntegrationTests.java
@@ -21,7 +21,6 @@
 import android.hardware.cts.helpers.SensorCtsHelper;
 import android.hardware.cts.helpers.SensorNotSupportedException;
 import android.hardware.cts.helpers.TestSensorEnvironment;
-import android.hardware.cts.helpers.sensoroperations.DelaySensorOperation;
 import android.hardware.cts.helpers.sensoroperations.ParallelSensorOperation;
 import android.hardware.cts.helpers.sensoroperations.RepeatingSensorOperation;
 import android.hardware.cts.helpers.sensoroperations.SequentialSensorOperation;
@@ -215,6 +214,22 @@
         verifySensorReconfigureWhileActive(Sensor.TYPE_GEOMAGNETIC_ROTATION_VECTOR);
     }
 
+    public void testAccelerometerLimitedAxesReconfigureWhileActive() throws Throwable {
+        verifySensorReconfigureWhileActive(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibratedReconfigureWhileActive() throws Throwable {
+        verifySensorReconfigureWhileActive(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED);
+    }
+
+    public void testGyroscopeLimitedAxesReconfigureWhileActive() throws Throwable {
+        verifySensorReconfigureWhileActive(Sensor.TYPE_GYROSCOPE_LIMITED_AXES);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibratedReconfigureWhileActive() throws Throwable {
+        verifySensorReconfigureWhileActive(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED);
+    }
+
     /**
      * This test focuses on ensuring that an active sensor is able to be reconfigured when a new
      * client requests a different sampling rate.
@@ -333,6 +348,46 @@
         verifySensorStoppingInteraction(Sensor.TYPE_MAGNETIC_FIELD, Sensor.TYPE_MAGNETIC_FIELD);
     }
 
+    public void testAccelerometerLimitedAxesAccelerometerLimitedAxesStopping()  throws Throwable {
+        verifySensorStoppingInteraction(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES,
+                Sensor.TYPE_ACCELEROMETER_LIMITED_AXES);
+    }
+
+    public void testAccelerometerLimitedAxesGyroscopeLimitedAxesStopping()  throws Throwable {
+        verifySensorStoppingInteraction(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES,
+                Sensor.TYPE_GYROSCOPE_LIMITED_AXES);
+    }
+
+    public void testAccelerometerLimitedAxesMagneticFieldStopping()  throws Throwable {
+        verifySensorStoppingInteraction(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES,
+                Sensor.TYPE_MAGNETIC_FIELD);
+    }
+
+    public void testGyroscopeLimitedAxesAccelerometerLimitedAxesStopping()  throws Throwable {
+        verifySensorStoppingInteraction(Sensor.TYPE_GYROSCOPE_LIMITED_AXES,
+                Sensor.TYPE_ACCELEROMETER_LIMITED_AXES);
+    }
+
+    public void testGyroscopeLimitedAxesGyroscopeLimitedAxesStopping()  throws Throwable {
+        verifySensorStoppingInteraction(Sensor.TYPE_GYROSCOPE_LIMITED_AXES,
+                Sensor.TYPE_GYROSCOPE_LIMITED_AXES);
+    }
+
+    public void testGyroscopeLimitedAxesMagneticFieldStopping()  throws Throwable {
+        verifySensorStoppingInteraction(Sensor.TYPE_GYROSCOPE_LIMITED_AXES,
+                Sensor.TYPE_MAGNETIC_FIELD);
+    }
+
+    public void testMagneticFieldAccelerometerLimitedAxesStopping()  throws Throwable {
+        verifySensorStoppingInteraction(Sensor.TYPE_MAGNETIC_FIELD,
+                Sensor.TYPE_ACCELEROMETER_LIMITED_AXES);
+    }
+
+    public void testMagneticFieldGyroscopeLimitedAxesStopping()  throws Throwable {
+        verifySensorStoppingInteraction(Sensor.TYPE_MAGNETIC_FIELD,
+                Sensor.TYPE_GYROSCOPE_LIMITED_AXES);
+    }
+
     /**
      * This test verifies that starting/stopping a particular Sensor client in the System does not
      * affect other sensor clients.
diff --git a/tests/sensor/src/android/hardware/cts/SensorTest.java b/tests/sensor/src/android/hardware/cts/SensorTest.java
index d640244..c73f581 100644
--- a/tests/sensor/src/android/hardware/cts/SensorTest.java
+++ b/tests/sensor/src/android/hardware/cts/SensorTest.java
@@ -45,9 +45,11 @@
 import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.Presubmit;
 import android.util.Log;
+
+import com.android.compatibility.common.util.PropertyUtil;
+
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-import com.android.compatibility.common.util.PropertyUtil;
 
 import junit.framework.Assert;
 
@@ -224,6 +226,54 @@
         } else {
             assertNull(sensor);
         }
+
+        validateLimitedAxesImuSensorType(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES,
+                PackageManager.FEATURE_SENSOR_ACCELEROMETER_LIMITED_AXES);
+
+        validateLimitedAxesImuSensorType(Sensor.TYPE_GYROSCOPE_LIMITED_AXES,
+                PackageManager.FEATURE_SENSOR_GYROSCOPE_LIMITED_AXES);
+
+        validateLimitedAxesImuSensorType(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED,
+                PackageManager.FEATURE_SENSOR_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED);
+
+        validateLimitedAxesImuSensorType(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED,
+                PackageManager.FEATURE_SENSOR_GYROSCOPE_LIMITED_AXES_UNCALIBRATED);
+
+        sensor =  mSensorManager.getDefaultSensor(Sensor.TYPE_HEADING);
+        boolean hasHeadingSensor = getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_SENSOR_HEADING);
+        boolean isAutomotive = mContext.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_AUTOMOTIVE);
+        if (isAutomotive && hasHeadingSensor) {
+            assertNotNull(sensor);
+            assertEquals(Sensor.TYPE_HEADING, sensor.getType());
+            assertSensorValues(sensor);
+            assertTrue("Max range must not be greater or equal to 360. Range="
+                    + sensor.getMaximumRange() + " " + sensor.getName(),
+                    sensor.getMaximumRange() < 360);
+        } else if (isAutomotive) {
+            assertNull(sensor);
+        } else {
+            // There isn't good test coverage for heading, particularly for non-automotive devices.
+            // So if a non-automotive device wants to implement this, requirements for the sensor
+            // and how to test for those requirements should be re-discussed.
+            assertNull("If the heading sensor is being implemented on a non-automotive device, "
+                    + "the team would love to hear from you. Please reach out!", sensor);
+        }
+    }
+
+    private void validateLimitedAxesImuSensorType(int sensorType, String systemFeature) {
+        Sensor sensor = mSensorManager.getDefaultSensor(sensorType);
+        boolean hasSensorFeature = getContext().getPackageManager().hasSystemFeature(systemFeature);
+        if (hasSensorFeature) {
+            assertNotNull(sensor);
+        }
+
+        // Virtual sensors might exist but not have a package manager feature defined.
+        if (sensor != null) {
+            assertEquals(sensorType, sensor.getType());
+            assertSensorValues(sensor);
+        }
     }
 
     @AppModeFull(reason = "Instant apps cannot access body sensors")
diff --git a/tests/sensor/src/android/hardware/cts/SingleSensorTests.java b/tests/sensor/src/android/hardware/cts/SingleSensorTests.java
index 62bad39..a782eb6 100644
--- a/tests/sensor/src/android/hardware/cts/SingleSensorTests.java
+++ b/tests/sensor/src/android/hardware/cts/SingleSensorTests.java
@@ -17,13 +17,13 @@
 package android.hardware.cts;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.hardware.cts.helpers.SensorCtsHelper;
 import android.hardware.cts.helpers.SensorStats;
 import android.hardware.cts.helpers.TestSensorEnvironment;
 import android.hardware.cts.helpers.sensoroperations.TestSensorOperation;
-import android.content.pm.PackageManager;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -116,6 +116,12 @@
                 expectedProperties.put(Sensor.TYPE_GYROSCOPE, new Object[]{10000});
         }
         expectedProperties.put(Sensor.TYPE_MAGNETIC_FIELD, new Object[]{100000});
+        expectedProperties.put(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, new Object[]{10000});
+        expectedProperties.put(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED,
+                new Object[]{10000});
+        expectedProperties.put(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, new Object[]{10000});
+        expectedProperties.put(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED,
+                new Object[]{10000});
 
         SensorManager sensorManager =
                 (SensorManager) getContext().getSystemService(Context.SENSOR_SERVICE);
@@ -175,7 +181,7 @@
     }
 
     public void testAccelerometer_automotive() throws Throwable {
-        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_25HZ, true);
+        runSensorTest(Sensor.TYPE_ACCELEROMETER, RATE_100HZ, true);
     }
 
     public void testAccelUncalibrated_fastest() throws Throwable {
@@ -214,6 +220,10 @@
         runSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_1HZ);
     }
 
+    public void testAccelUncalibrated_automotive() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED, RATE_100HZ, true);
+    }
+
     public void testMagneticField_fastest() throws Throwable {
         runSensorTest(Sensor.TYPE_MAGNETIC_FIELD, SensorManager.SENSOR_DELAY_FASTEST);
     }
@@ -582,6 +592,160 @@
         runSensorTest(Sensor.TYPE_LINEAR_ACCELERATION, RATE_1HZ);
     }
 
+    public void testAccelerometerLimitedAxes_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testAccelerometerLimitedAxes_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, RATE_200HZ);
+    }
+
+    public void testAccelerometerLimitedAxes_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, RATE_100HZ);
+    }
+
+    public void testAccelerometerLimitedAxes_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, RATE_50HZ);
+    }
+
+    public void testAccelerometerLimitedAxes_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, RATE_25HZ);
+    }
+
+    public void testAccelerometerLimitedAxes_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, RATE_15HZ);
+    }
+
+    public void testAccelerometerLimitedAxes_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, RATE_10HZ);
+    }
+
+    public void testAccelerometerLimitedAxes_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, RATE_5HZ);
+    }
+
+    public void testAccelerometerLimitedAxes_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, RATE_1HZ);
+    }
+
+    public void testAccelerometerLimitedAxes_automotive() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES, RATE_100HZ, true);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED,
+                SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED, RATE_200HZ);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED, RATE_100HZ);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED, RATE_50HZ);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED, RATE_25HZ);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED, RATE_15HZ);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED, RATE_10HZ);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED, RATE_5HZ);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED, RATE_1HZ);
+    }
+
+    public void testAccelerometerLimitedAxesUncalibrated_automotive() throws Throwable {
+        runSensorTest(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED, RATE_100HZ, true);
+    }
+
+    public void testGyroscopeLimitedAxes_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testGyroscopeLimitedAxes_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, RATE_200HZ);
+    }
+
+    public void testGyroscopeLimitedAxes_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, RATE_100HZ);
+    }
+
+    public void testGyroscopeLimitedAxes_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, RATE_50HZ);
+    }
+
+    public void testGyroscopeLimitedAxes_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, RATE_25HZ);
+    }
+
+    public void testGyroscopeLimitedAxes_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, RATE_15HZ);
+    }
+
+    public void testGyroscopeLimitedAxes_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, RATE_10HZ);
+    }
+
+    public void testGyroscopeLimitedAxes_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, RATE_5HZ);
+    }
+
+    public void testGyroscopeLimitedAxes_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES, RATE_1HZ);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibrated_fastest() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED,
+                SensorManager.SENSOR_DELAY_FASTEST);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibrated_200hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED, RATE_200HZ);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibrated_100hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED, RATE_100HZ);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibrated_50hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED, RATE_50HZ);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibrated_25hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED, RATE_25HZ);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibrated_15hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED, RATE_15HZ);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibrated_10hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED, RATE_10HZ);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibrated_5hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED, RATE_5HZ);
+    }
+
+    public void testGyroscopeLimitedAxesUncalibrated_1hz() throws Throwable {
+        runSensorTest(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED, RATE_1HZ);
+    }
+
     private void runSensorTest(int sensorType, int rateUs) throws Throwable {
         runSensorTest(sensorType, rateUs, false);
     }
diff --git a/tests/sensor/src/android/hardware/cts/helpers/SensorCtsHelper.java b/tests/sensor/src/android/hardware/cts/helpers/SensorCtsHelper.java
index 366e148..6e37f60 100644
--- a/tests/sensor/src/android/hardware/cts/helpers/SensorCtsHelper.java
+++ b/tests/sensor/src/android/hardware/cts/helpers/SensorCtsHelper.java
@@ -321,12 +321,16 @@
     public static String getUnitsForSensor(Sensor sensor) {
         switch(sensor.getType()) {
             case Sensor.TYPE_ACCELEROMETER:
+            case Sensor.TYPE_ACCELEROMETER_LIMITED_AXES:
+            case Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED:
                 return "m/s^2";
             case Sensor.TYPE_MAGNETIC_FIELD:
             case Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED:
                 return "uT";
             case Sensor.TYPE_GYROSCOPE:
             case Sensor.TYPE_GYROSCOPE_UNCALIBRATED:
+            case Sensor.TYPE_GYROSCOPE_LIMITED_AXES:
+            case Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED:
                 return "radians/sec";
             case Sensor.TYPE_PRESSURE:
                 return "hPa";
@@ -338,8 +342,12 @@
         switch (sensor.getType()) {
             case Sensor.TYPE_ACCELEROMETER:
             case Sensor.TYPE_ACCELEROMETER_UNCALIBRATED:
+            case Sensor.TYPE_ACCELEROMETER_LIMITED_AXES:
+            case Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED:
             case Sensor.TYPE_GYROSCOPE:
             case Sensor.TYPE_GYROSCOPE_UNCALIBRATED:
+            case Sensor.TYPE_GYROSCOPE_LIMITED_AXES:
+            case Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED:
             case Sensor.TYPE_MAGNETIC_FIELD:
             case Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED:
             case Sensor.TYPE_HINGE_ANGLE:
@@ -364,8 +372,12 @@
         switch (sensor.getType()) {
             case Sensor.TYPE_ACCELEROMETER:
             case Sensor.TYPE_ACCELEROMETER_UNCALIBRATED:
+            case Sensor.TYPE_ACCELEROMETER_LIMITED_AXES:
+            case Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED:
             case Sensor.TYPE_GYROSCOPE:
             case Sensor.TYPE_GYROSCOPE_UNCALIBRATED:
+            case Sensor.TYPE_GYROSCOPE_LIMITED_AXES:
+            case Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED:
                 // Accelerometer and gyroscope must have at least 12 bits
                 // of resolution. The maximum resolution calculation uses
                 // slightly more than twice the maximum range because
@@ -402,8 +414,12 @@
         switch (sensor.getType()) {
             case Sensor.TYPE_ACCELEROMETER:
             case Sensor.TYPE_ACCELEROMETER_UNCALIBRATED:
+            case Sensor.TYPE_ACCELEROMETER_LIMITED_AXES:
+            case Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED:
             case Sensor.TYPE_GYROSCOPE:
             case Sensor.TYPE_GYROSCOPE_UNCALIBRATED:
+            case Sensor.TYPE_GYROSCOPE_LIMITED_AXES:
+            case Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED:
             case Sensor.TYPE_MAGNETIC_FIELD:
             case Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED:
             case Sensor.TYPE_SIGNIFICANT_MOTION:
@@ -422,8 +438,12 @@
         switch (sensor.getType()) {
             case Sensor.TYPE_ACCELEROMETER:
             case Sensor.TYPE_ACCELEROMETER_UNCALIBRATED:
+            case Sensor.TYPE_ACCELEROMETER_LIMITED_AXES:
+            case Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED:
             case Sensor.TYPE_GYROSCOPE:
             case Sensor.TYPE_GYROSCOPE_UNCALIBRATED:
+            case Sensor.TYPE_GYROSCOPE_LIMITED_AXES:
+            case Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED:
             case Sensor.TYPE_MAGNETIC_FIELD:
             case Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED:
                 // Accelerometer, gyroscope, and mag are expected to have at most 24 bits of
@@ -453,6 +473,14 @@
                 return "UncalGyro";
             case Sensor.TYPE_MAGNETIC_FIELD_UNCALIBRATED:
                 return "UncalMag";
+            case Sensor.TYPE_ACCELEROMETER_LIMITED_AXES:
+                return "LimitedAccel";
+            case Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED:
+                return "UncalLimitedAccel";
+            case Sensor.TYPE_GYROSCOPE_LIMITED_AXES:
+                return "LimitedGyro";
+            case Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED:
+                return "UncalLimitedGyro";
             default:
                 return "Type_" + type;
         }
diff --git a/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/AlarmOperation.java b/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/AlarmOperation.java
index 74f28ba..8bc910d 100644
--- a/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/AlarmOperation.java
+++ b/tests/sensor/src/android/hardware/cts/helpers/sensoroperations/AlarmOperation.java
@@ -85,7 +85,8 @@
                 acquireWakeLock();
             }
         };
-        mContext.registerReceiver(receiver, intentFilter);
+        mContext.registerReceiver(receiver, intentFilter,
+                Context.RECEIVER_NOT_EXPORTED);
 
         AlarmManager am = (AlarmManager) mContext.getSystemService(Context.ALARM_SERVICE);
         long wakeupTimeMs = (System.currentTimeMillis()
diff --git a/tests/sensor/src/android/hardware/cts/helpers/sensorverification/MeanVerification.java b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/MeanVerification.java
index c66eb30..c66d2c3 100644
--- a/tests/sensor/src/android/hardware/cts/helpers/sensorverification/MeanVerification.java
+++ b/tests/sensor/src/android/hardware/cts/helpers/sensorverification/MeanVerification.java
@@ -16,14 +16,14 @@
 
 package android.hardware.cts.helpers.sensorverification;
 
-import junit.framework.Assert;
-
+import android.content.pm.PackageManager;
 import android.hardware.Sensor;
 import android.hardware.SensorManager;
 import android.hardware.cts.helpers.SensorCtsHelper;
 import android.hardware.cts.helpers.SensorStats;
 import android.hardware.cts.helpers.TestSensorEnvironment;
-import android.content.pm.PackageManager;
+
+import junit.framework.Assert;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -201,6 +201,98 @@
                                                         Float.MAX_VALUE,
                                                         Float.MAX_VALUE,
                                                         Float.MAX_VALUE}));
+        // Limited axes gyroscope should be 0 for a static device.
+        DEFAULTS.put(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES,
+                new ExpectedValuesAndThresholds(
+                        new float[]{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f},
+                        new float[]{Float.MAX_VALUE,
+                                    Float.MAX_VALUE,
+                                    Float.MAX_VALUE,
+                                    1.0f,
+                                    1.0f,
+                                    1.0f},
+                        new float[]{Float.MAX_VALUE,
+                                    Float.MAX_VALUE,
+                                    Float.MAX_VALUE,
+                                    0.0f,
+                                    0.0f,
+                                    0.0f}));
+        // Uncalibrated limited axes gyroscope should be 0 for a static device.
+        DEFAULTS.put(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED,
+                new ExpectedValuesAndThresholds(
+                    new float[]{0.0f,
+                                0.0f,
+                                0.0f,
+                                0.0f,
+                                0.0f,
+                                0.0f,
+                                0.0f,
+                                0.0f,
+                                0.0f},
+                    new float[]{Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                1.0f,
+                                1.0f,
+                                1.0f},
+                    new float[]{Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                0.0f,
+                                0.0f,
+                                0.0f}));
+        // Limited axes gyroscope should be 0 for a static device.
+        DEFAULTS.put(Sensor.TYPE_GYROSCOPE_LIMITED_AXES,
+                new ExpectedValuesAndThresholds(
+                    new float[]{0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f},
+                    new float[]{Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                1.0f,
+                                1.0f,
+                                1.0f},
+                    new float[]{Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                0.0f,
+                                0.0f,
+                                0.0f}));
+        // Uncalibrated limited axes gyroscope should be 0 for a static device.
+        DEFAULTS.put(Sensor.TYPE_GYROSCOPE_LIMITED_AXES_UNCALIBRATED,
+                new ExpectedValuesAndThresholds(
+                    new float[]{0.0f,
+                                0.0f,
+                                0.0f,
+                                0.0f,
+                                0.0f,
+                                0.0f,
+                                0.0f,
+                                0.0f,
+                                0.0f},
+                    new float[]{Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                1.0f,
+                                1.0f,
+                                1.0f},
+                    new float[]{Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                Float.MAX_VALUE,
+                                0.0f,
+                                0.0f,
+                                0.0f}));
     }
 
     @SuppressWarnings("deprecation")
@@ -215,6 +307,56 @@
                         new float[]{0.0f, 0.0f, SensorManager.STANDARD_GRAVITY},
                         new float[]{1.95f, 1.95f, 1.95f} /* m / s^2 */,
                         new float[]{1.95f, 1.95f, 1.95f} /* m / s^2 */));
+        defaults.put(Sensor.TYPE_ACCELEROMETER_UNCALIBRATED,
+                new ExpectedValuesAndThresholds(
+                        new float[]{0.0f, 0.0f, SensorManager.STANDARD_GRAVITY, 0.0f, 0.0f, 0.0f},
+                        new float[]{1.95f,
+                                    1.95f,
+                                    1.95f,
+                                    Float.MAX_VALUE,
+                                    Float.MAX_VALUE,
+                                    Float.MAX_VALUE},
+                        new float[]{1.95f,
+                                    1.95f,
+                                    1.95f,
+                                    Float.MAX_VALUE,
+                                    Float.MAX_VALUE,
+                                    Float.MAX_VALUE}));
+
+        defaults.put(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES,
+                new ExpectedValuesAndThresholds(
+                        new float[]{0.0f, 0.0f, SensorManager.STANDARD_GRAVITY, 0.0f, 0.0f, 0.0f},
+                        new float[]{1.95f, 1.95f, 1.95f, 1.0f, 1.0f, 1.0f},
+                        new float[]{1.95f, 1.95f, 1.95f, 0.0f, 0.0f, 0.0f}));
+        defaults.put(Sensor.TYPE_ACCELEROMETER_LIMITED_AXES_UNCALIBRATED,
+                new ExpectedValuesAndThresholds(
+                        new float[]{0.0f,
+                                    0.0f,
+                                    SensorManager.STANDARD_GRAVITY,
+                                    0.0f,
+                                    0.0f,
+                                    0.0f,
+                                    0.0f,
+                                    0.0f,
+                                    0.0f},
+                        new float[]{1.95f,
+                                    1.95f,
+                                    1.95f,
+                                    Float.MAX_VALUE,
+                                    Float.MAX_VALUE,
+                                    Float.MAX_VALUE,
+                                    1.0f,
+                                    1.0f,
+                                    1.0f},
+                        new float[]{1.95f,
+                                    1.95f,
+                                    1.95f,
+                                    Float.MAX_VALUE,
+                                    Float.MAX_VALUE,
+                                    Float.MAX_VALUE,
+                                    0.0f,
+                                    0.0f,
+                                    0.0f}));
     }
 
     private static final class ExpectedValuesAndThresholds {
diff --git a/tests/signature/intent-check/DynamicConfig.xml b/tests/signature/intent-check/DynamicConfig.xml
index bb12c58..b72af1f 100644
--- a/tests/signature/intent-check/DynamicConfig.xml
+++ b/tests/signature/intent-check/DynamicConfig.xml
@@ -26,9 +26,6 @@
     Bug: 150153196 android.intent.action.LOAD_DATA (system in API 30)
     Bug: 150153196 android.intent.action.PACKAGE_UNSUSPENDED_MANUALLY (system in API 30)
     Bug: 186495404 android.intent.action.REBOOT_READY
-    Bug: 206897736 android.intent.action.MANAGE_PERMISSION_USAGE
-    Bug: 206897736 android.intent.action.VIEW_APP_FEATURES
-    Bug: 209528070 android.intent.action.APPLICATION_LOCALE_CHANGED
     Bug: 218245704 android.intent.action.ACTION_PACKAGE_CHANGED (fixed in TTS 20220209)
 -->
 <dynamicConfig>
@@ -44,9 +41,6 @@
       <value>android.intent.action.LOAD_DATA</value>
       <value>android.intent.action.PACKAGE_UNSUSPENDED_MANUALLY</value>
       <value>android.intent.action.REBOOT_READY</value>
-      <value>android.intent.action.MANAGE_PERMISSION_USAGE</value>
-      <value>android.intent.action.VIEW_APP_FEATURES</value>
-      <value>android.intent.action.APPLICATION_LOCALE_CHANGED</value>
       <value>android.intent.action.ACTION_PACKAGE_CHANGED</value>
     </entry>
 </dynamicConfig>
diff --git a/tests/signature/lib/android/src/android/signature/cts/DexMemberChecker.java b/tests/signature/lib/android/src/android/signature/cts/DexMemberChecker.java
index fa839af..328ed39 100644
--- a/tests/signature/lib/android/src/android/signature/cts/DexMemberChecker.java
+++ b/tests/signature/lib/android/src/android/signature/cts/DexMemberChecker.java
@@ -17,7 +17,7 @@
 package android.signature.cts;
 
 import android.util.Log;
-import java.lang.reflect.Constructor;
+
 import java.lang.reflect.Executable;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -97,11 +97,8 @@
             if (jni) {
                 try {
                     observer.fieldAccessibleViaJni(hasMatchingField_JNI(klass, field), field);
-                } catch (ClassNotFoundException | ExceptionInInitializerError | UnsatisfiedLinkError
-                        | NoClassDefFoundError e) {
-                    if ((e instanceof NoClassDefFoundError)
-                            && !(e.getCause() instanceof ExceptionInInitializerError)
-                            && !(e.getCause() instanceof UnsatisfiedLinkError)) {
+                } catch (ClassNotFoundException | Error e) {
+                    if ((e instanceof NoClassDefFoundError) && !(e.getCause() instanceof Error)) {
                         throw (NoClassDefFoundError) e;
                     }
 
@@ -122,11 +119,8 @@
             if (jni) {
                 try {
                     observer.methodAccessibleViaJni(hasMatchingMethod_JNI(klass, method), method);
-                } catch (ExceptionInInitializerError | UnsatisfiedLinkError
-                        | NoClassDefFoundError e) {
-                    if ((e instanceof NoClassDefFoundError)
-                            && !(e.getCause() instanceof ExceptionInInitializerError)
-                            && !(e.getCause() instanceof UnsatisfiedLinkError)) {
+                } catch (Error e) {
+                    if ((e instanceof NoClassDefFoundError) && !(e.getCause() instanceof Error)) {
                         throw e;
                     }
 
diff --git a/tests/signature/lib/common/src/android/signature/cts/ApiComplianceChecker.java b/tests/signature/lib/common/src/android/signature/cts/ApiComplianceChecker.java
index d38e51e..cdb9698 100644
--- a/tests/signature/lib/common/src/android/signature/cts/ApiComplianceChecker.java
+++ b/tests/signature/lib/common/src/android/signature/cts/ApiComplianceChecker.java
@@ -22,7 +22,9 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.Formatter;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
@@ -31,6 +33,46 @@
  */
 public class ApiComplianceChecker extends ApiPresenceChecker {
 
+    /**
+     * A set of field values signatures whose value modifier should be ignored.
+     *
+     * <p>If a field value is intended to be changed to correct its value, that change should be
+     * allowed. The field name is the key of the ignoring map, and a FieldValuePair which is a pair
+     * of the old value and the new value is the value of the ignoring map.
+     * WARNING: Entries should only be added after consulting API council.
+     */
+    private static class FieldValuePair {
+        private String oldValue;
+        private String newValue;
+
+        private FieldValuePair(String oldValue, String newValue) {
+            this.oldValue = oldValue;
+            this.newValue = newValue;
+        }
+    };
+    private static final Map<String, FieldValuePair> IGNORE_FIELD_VALUES_MODIFIER_ALLOWED_LIST =
+            new HashMap<String, FieldValuePair>();
+    static {
+        // This field value was previously wrong. As the CtsSystemApiSignatureTestCases package
+        // tests both the old and new specifications with both old and new values, this needs to be
+        // ignored.
+        IGNORE_FIELD_VALUES_MODIFIER_ALLOWED_LIST.put(
+                "android.media.tv.tuner.frontend.FrontendSettings#FEC_28_45(long)",
+                new FieldValuePair("-2147483648", "2147483648"));
+        IGNORE_FIELD_VALUES_MODIFIER_ALLOWED_LIST.put(
+                "android.media.tv.tuner.frontend.FrontendSettings#FEC_29_45(long)",
+                new FieldValuePair("1", "4294967296"));
+        IGNORE_FIELD_VALUES_MODIFIER_ALLOWED_LIST.put(
+                "android.media.tv.tuner.frontend.FrontendSettings#FEC_31_45(long)",
+                new FieldValuePair("2", "8589934592"));
+        IGNORE_FIELD_VALUES_MODIFIER_ALLOWED_LIST.put(
+                "android.media.tv.tuner.frontend.FrontendSettings#FEC_32_45(long)",
+                new FieldValuePair("4", "17179869184"));
+        IGNORE_FIELD_VALUES_MODIFIER_ALLOWED_LIST.put(
+                "android.media.tv.tuner.frontend.FrontendSettings#FEC_77_90(long)",
+                new FieldValuePair("8", "34359738368"));
+    }
+
     /** Indicates that the class is an annotation. */
     private static final int CLASS_MODIFIER_ANNOTATION = 0x00002000;
 
@@ -362,7 +404,7 @@
                             expectedFieldType, actualFieldType));
         }
 
-        String message = checkFieldValueCompliance(fieldDescription, field);
+        String message = checkFieldValueCompliance(classDescription, fieldDescription, field);
         if (message != null) {
             resultObserver.notifyFailure(FailureType.MISMATCH_FIELD,
                     fieldDescription.toReadableString(classDescription.getAbsoluteClassName()),
@@ -414,7 +456,8 @@
      * @param apiField The field as defined by the platform API.
      * @param deviceField The field as defined by the device under test.
      */
-    private static String checkFieldValueCompliance(JDiffField apiField, Field deviceField) {
+    private static String checkFieldValueCompliance(
+            JDiffClassDescription classDescription, JDiffField apiField, Field deviceField) {
         if ((apiField.mModifier & Modifier.FINAL) == 0 ||
                 (apiField.mModifier & Modifier.STATIC) == 0) {
             // Only final static fields can have fixed values.
@@ -434,6 +477,14 @@
 
         String deviceFieldValue = getFieldValueAsString(deviceField);
         if (!Objects.equals(apiFieldValue, deviceFieldValue)) {
+            String fieldName = apiField.toReadableString(classDescription.getAbsoluteClassName());
+            if (IGNORE_FIELD_VALUES_MODIFIER_ALLOWED_LIST.containsKey(fieldName)
+                    && IGNORE_FIELD_VALUES_MODIFIER_ALLOWED_LIST.get(fieldName).oldValue.equals(
+                            apiFieldValue)
+                    && IGNORE_FIELD_VALUES_MODIFIER_ALLOWED_LIST.get(fieldName).newValue.equals(
+                            deviceFieldValue)) {
+                return null;
+            }
             return String.format("Incorrect field value, expected <%s>, found <%s>",
                     apiFieldValue, deviceFieldValue);
 
diff --git a/tests/smartspace/src/android/smartspace/cts/BaseTemplateDataTest.java b/tests/smartspace/src/android/smartspace/cts/BaseTemplateDataTest.java
new file mode 100644
index 0000000..04c5225
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/BaseTemplateDataTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.uitemplatedata.BaseTemplateData;
+import android.app.smartspace.uitemplatedata.BaseTemplateData.SubItemInfo;
+import android.app.smartspace.uitemplatedata.BaseTemplateData.SubItemLoggingInfo;
+import android.app.smartspace.uitemplatedata.Text;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link BaseTemplateDataTest}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class BaseTemplateDataTest {
+
+    private static final String TAG = "BaseTemplateDataTest";
+
+    @Test
+    public void testCreateBaseTemplateData() {
+        SubItemInfo primaryItem = new SubItemInfo.Builder()
+                .setText(new Text.Builder("title").build())
+                .setIcon(SmartspaceTestUtils.createSmartspaceIcon("title icon"))
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                "primary action"))
+                .setLoggingInfo(new SubItemLoggingInfo.Builder(0, 0).setPackageName(
+                        "package name 0").build())
+                .build();
+        SubItemInfo subtitleItem = new SubItemInfo.Builder()
+                .setText(new Text.Builder("subtitle").build())
+                .setIcon(SmartspaceTestUtils.createSmartspaceIcon("subtitle icon"))
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                "subtitle action"))
+                .setLoggingInfo(new SubItemLoggingInfo.Builder(1, 1).setPackageName(
+                        "package name 1").build())
+                .build();
+        SubItemInfo subtitleSupplementalItem = new SubItemInfo.Builder()
+                .setText(new Text.Builder("subtitle supplemental").build())
+                .setIcon(SmartspaceTestUtils.createSmartspaceIcon(
+                        "subtitle supplemental icon"))
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                "subtitle supplemental action"))
+                .setLoggingInfo(new SubItemLoggingInfo.Builder(2, 2).setPackageName(
+                        "package name 2").build())
+                .build();
+        SubItemInfo supplementalLineItem = new SubItemInfo.Builder()
+                .setText(new Text.Builder("supplemental line").build())
+                .setIcon(SmartspaceTestUtils.createSmartspaceIcon(
+                        "supplemental line icon"))
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                "supplemental line action"))
+                .setLoggingInfo(new SubItemLoggingInfo.Builder(3, 3).setPackageName(
+                        "package name 3").build())
+                .build();
+        SubItemInfo supplementalAlarmItem = new SubItemInfo.Builder()
+                .setText(new Text.Builder("alarm supplemental").build())
+                .setIcon(SmartspaceTestUtils.createSmartspaceIcon("alarm icon"))
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                "alarm action"))
+                .setLoggingInfo(new SubItemLoggingInfo.Builder(4, 4).setPackageName(
+                        "package name 4").build())
+                .build();
+
+        BaseTemplateData baseTemplateData = new BaseTemplateData.Builder(
+                SmartspaceTarget.UI_TEMPLATE_DEFAULT)
+                .setPrimaryItem(primaryItem)
+                .setSubtitleItem(subtitleItem)
+                .setSubtitleSupplementalItem(subtitleSupplementalItem)
+                .setSupplementalLineItem(supplementalLineItem)
+                .setSupplementalAlarmItem(supplementalAlarmItem)
+                .setLayoutWeight(1)
+                .build();
+
+        assertThat(baseTemplateData.getTemplateType())
+                .isEqualTo(SmartspaceTarget.UI_TEMPLATE_DEFAULT);
+        assertThat(baseTemplateData.getPrimaryItem()).isEqualTo(primaryItem);
+        assertThat(baseTemplateData.getSubtitleItem()).isEqualTo(subtitleItem);
+        assertThat(baseTemplateData.getSubtitleSupplementalItem()).isEqualTo(
+                subtitleSupplementalItem);
+        assertThat(baseTemplateData.getSupplementalLineItem()).isEqualTo(supplementalLineItem);
+        assertThat(baseTemplateData.getSupplementalAlarmItem()).isEqualTo(supplementalAlarmItem);
+        assertThat(baseTemplateData.getLayoutWeight()).isEqualTo(1);
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        baseTemplateData.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        BaseTemplateData copyData = BaseTemplateData.CREATOR.createFromParcel(parcel);
+        assertThat(baseTemplateData).isEqualTo(copyData);
+        parcel.recycle();
+    }
+}
diff --git a/tests/smartspace/src/android/smartspace/cts/CarouselItemTest.java b/tests/smartspace/src/android/smartspace/cts/CarouselItemTest.java
new file mode 100644
index 0000000..a5d4101
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/CarouselItemTest.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.smartspace.uitemplatedata.CarouselTemplateData.CarouselItem;
+import android.app.smartspace.uitemplatedata.Text;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link CarouselItem}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class CarouselItemTest {
+
+    private static final String TAG = "CarouselItemTest";
+
+    @Test
+    public void testCreateCarouselItem() {
+        CarouselItem item = new CarouselItem.Builder()
+                .setUpperText(new Text.Builder("upper").build())
+                .setImage(SmartspaceTestUtils.createSmartspaceIcon("icon"))
+                .setLowerText(new Text.Builder("lower").build())
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "item tap"))
+                .build();
+
+        assertThat(item.getUpperText()).isEqualTo(new Text.Builder("upper").build());
+        assertThat(item.getImage()).isEqualTo(SmartspaceTestUtils.createSmartspaceIcon("icon"));
+        assertThat(item.getLowerText()).isEqualTo(new Text.Builder("lower").build());
+        assertThat(item.getTapAction()).isEqualTo(
+                SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "item tap"));
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        item.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        CarouselItem copyItem = CarouselItem.CREATOR.createFromParcel(parcel);
+        assertThat(item).isEqualTo(copyItem);
+        parcel.recycle();
+    }
+}
diff --git a/tests/smartspace/src/android/smartspace/cts/CarouselTemplateDataTest.java b/tests/smartspace/src/android/smartspace/cts/CarouselTemplateDataTest.java
new file mode 100644
index 0000000..4128e85
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/CarouselTemplateDataTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.smartspace.uitemplatedata.CarouselTemplateData;
+import android.app.smartspace.uitemplatedata.CarouselTemplateData.CarouselItem;
+import android.app.smartspace.uitemplatedata.Text;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tests for {@link CarouselTemplateData}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class CarouselTemplateDataTest {
+
+    private static final String TAG = "CarouselTemplateDataTest";
+
+    @Test
+    public void testCreateCarouselTemplateData() {
+        List<CarouselItem> items = new ArrayList<>();
+        items.add(createCarouselItem());
+        items.add(createCarouselItem());
+        CarouselTemplateData carouselTemplateData = new CarouselTemplateData.Builder(items)
+                .setCarouselAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "card tap"))
+                .build();
+
+        assertThat(carouselTemplateData.getCarouselItems()).isEqualTo(items);
+        assertThat(carouselTemplateData.getCarouselAction()).isEqualTo(
+                SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "card tap"));
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        carouselTemplateData.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        CarouselTemplateData copyData =
+                CarouselTemplateData.CREATOR.createFromParcel(parcel);
+        assertThat(carouselTemplateData).isEqualTo(copyData);
+        parcel.recycle();
+    }
+
+    private CarouselItem createCarouselItem() {
+        return new CarouselItem.Builder()
+                .setUpperText(new Text.Builder("upper").build())
+                .setImage(SmartspaceTestUtils.createSmartspaceIcon("icon"))
+                .setLowerText(new Text.Builder("lower").build())
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "item tap"))
+                .build();
+    }
+}
diff --git a/tests/smartspace/src/android/smartspace/cts/CombinedCardsTemplateDataTest.java b/tests/smartspace/src/android/smartspace/cts/CombinedCardsTemplateDataTest.java
new file mode 100644
index 0000000..1c8416f
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/CombinedCardsTemplateDataTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.uitemplatedata.BaseTemplateData;
+import android.app.smartspace.uitemplatedata.BaseTemplateData.SubItemInfo;
+import android.app.smartspace.uitemplatedata.BaseTemplateData.SubItemLoggingInfo;
+import android.app.smartspace.uitemplatedata.CombinedCardsTemplateData;
+import android.app.smartspace.uitemplatedata.Text;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tests for {@link CombinedCardsTemplateData}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class CombinedCardsTemplateDataTest {
+
+    private static final String TAG = "CombinedCardsTemplateDataTest";
+
+    @Test
+    public void testCreateCombinedCardsTemplateData() {
+        List<BaseTemplateData> dataList = new ArrayList<>();
+        dataList.add(createBaseTemplateData());
+        dataList.add(createBaseTemplateData());
+        CombinedCardsTemplateData combinedCardsTemplateData =
+                new CombinedCardsTemplateData.Builder(dataList).build();
+
+        assertThat(combinedCardsTemplateData.getCombinedCardDataList()).isEqualTo(dataList);
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        combinedCardsTemplateData.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        CombinedCardsTemplateData copyData =
+                CombinedCardsTemplateData.CREATOR.createFromParcel(parcel);
+        assertThat(combinedCardsTemplateData).isEqualTo(copyData);
+        parcel.recycle();
+    }
+
+    private BaseTemplateData createBaseTemplateData() {
+        return new BaseTemplateData.Builder(SmartspaceTarget.UI_TEMPLATE_DEFAULT)
+                .setPrimaryItem(new SubItemInfo.Builder()
+                        .setText(new Text.Builder("title").build())
+                        .setIcon(SmartspaceTestUtils.createSmartspaceIcon("title icon"))
+                        .setTapAction(
+                                SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                        "primary action"))
+                        .setLoggingInfo(new SubItemLoggingInfo.Builder(0, 0).setPackageName(
+                                "package name 0").build())
+                        .build())
+                .setSubtitleItem(new SubItemInfo.Builder()
+                        .setText(new Text.Builder("subtitle").build())
+                        .setIcon(SmartspaceTestUtils.createSmartspaceIcon("subtitle icon"))
+                        .setTapAction(
+                                SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                        "subtitle action"))
+                        .setLoggingInfo(new SubItemLoggingInfo.Builder(1, 1).setPackageName(
+                                "package name 1").build())
+                        .build())
+                .setSubtitleSupplementalItem(new SubItemInfo.Builder()
+                        .setText(new Text.Builder("subtitle supplemental").build())
+                        .setIcon(SmartspaceTestUtils.createSmartspaceIcon(
+                                "subtitle supplemental icon"))
+                        .setTapAction(
+                                SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                        "subtitle supplemental action"))
+                        .setLoggingInfo(new SubItemLoggingInfo.Builder(2, 2).setPackageName(
+                                "package name 2").build())
+                        .build())
+                .setSupplementalLineItem(new SubItemInfo.Builder()
+                        .setText(new Text.Builder("supplemental line").build())
+                        .setIcon(SmartspaceTestUtils.createSmartspaceIcon(
+                                "supplemental line icon"))
+                        .setTapAction(
+                                SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                        "supplemental line action"))
+                        .setLoggingInfo(new SubItemLoggingInfo.Builder(3, 3).setPackageName(
+                                "package name 3").build())
+                        .build())
+                .setSupplementalAlarmItem(new SubItemInfo.Builder()
+                        .setText(new Text.Builder("alarm supplemental").build())
+                        .setIcon(SmartspaceTestUtils.createSmartspaceIcon("alarm icon"))
+                        .setTapAction(
+                                SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                        "alarm action"))
+                        .setLoggingInfo(new SubItemLoggingInfo.Builder(4, 4).setPackageName(
+                                "package name 4").build())
+                        .build())
+                .setLayoutWeight(1)
+                .build();
+    }
+}
diff --git a/tests/smartspace/src/android/smartspace/cts/HeadToHeadTemplateDataTest.java b/tests/smartspace/src/android/smartspace/cts/HeadToHeadTemplateDataTest.java
new file mode 100644
index 0000000..73f0970
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/HeadToHeadTemplateDataTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.smartspace.uitemplatedata.HeadToHeadTemplateData;
+import android.app.smartspace.uitemplatedata.Text;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link HeadToHeadTemplateData}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class HeadToHeadTemplateDataTest {
+
+    private static final String TAG = "HeadToHeadTemplateDataTest";
+
+    @Test
+    public void testCreateHeadToHeadTemplateData() {
+        HeadToHeadTemplateData headToHeadTemplateData =
+                new HeadToHeadTemplateData.Builder()
+                        .setHeadToHeadTitle(new Text.Builder("title").build())
+                        .setHeadToHeadFirstCompetitorIcon(
+                                SmartspaceTestUtils.createSmartspaceIcon("icon1"))
+                        .setHeadToHeadSecondCompetitorIcon(
+                                SmartspaceTestUtils.createSmartspaceIcon("icon2"))
+                        .setHeadToHeadFirstCompetitorText(new Text.Builder("text1").build())
+                        .setHeadToHeadSecondCompetitorText(new Text.Builder("text1").build())
+                        .setHeadToHeadAction(
+                                SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "tap"))
+                        .build();
+
+        assertThat(headToHeadTemplateData.getHeadToHeadTitle()).isEqualTo(
+                new Text.Builder("title").build());
+        assertThat(headToHeadTemplateData.getHeadToHeadFirstCompetitorIcon()).isEqualTo(
+                SmartspaceTestUtils.createSmartspaceIcon("icon1"));
+        assertThat(headToHeadTemplateData.getHeadToHeadSecondCompetitorIcon()).isEqualTo(
+                SmartspaceTestUtils.createSmartspaceIcon("icon2"));
+        assertThat(headToHeadTemplateData.getHeadToHeadFirstCompetitorText()).isEqualTo(
+                new Text.Builder("text1").build());
+        assertThat(headToHeadTemplateData.getHeadToHeadSecondCompetitorText()).isEqualTo(
+                new Text.Builder("text1").build());
+        assertThat(headToHeadTemplateData.getHeadToHeadAction()).isEqualTo(
+                SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "tap"));
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        headToHeadTemplateData.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        HeadToHeadTemplateData copyData =
+                HeadToHeadTemplateData.CREATOR.createFromParcel(parcel);
+        assertThat(headToHeadTemplateData).isEqualTo(copyData);
+        parcel.recycle();
+    }
+}
diff --git a/tests/smartspace/src/android/smartspace/cts/IconTest.java b/tests/smartspace/src/android/smartspace/cts/IconTest.java
new file mode 100644
index 0000000..ce9639b
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/IconTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.smartspace.uitemplatedata.Icon;
+import android.graphics.Bitmap;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link Icon}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class IconTest {
+
+    private static final String TAG = "IconTest";
+
+    @Test
+    public void testCreateIcon() {
+        android.graphics.drawable.Icon icon = android.graphics.drawable.Icon.createWithBitmap(
+                Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8));
+        Icon smartspaceIcon = new Icon.Builder(icon).setContentDescription(
+                "test content").setShouldTint(false).build();
+
+        assertThat(smartspaceIcon.getIcon()).isEqualTo(icon);
+        assertThat(smartspaceIcon.getContentDescription()).isEqualTo("test content");
+        assertThat(smartspaceIcon.shouldTint()).isFalse();
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        smartspaceIcon.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        Icon copyIcon = Icon.CREATOR.createFromParcel(parcel);
+        assertThat(smartspaceIcon).isEqualTo(copyIcon);
+        parcel.recycle();
+    }
+}
diff --git a/tests/smartspace/src/android/smartspace/cts/SmartspaceTargetTest.java b/tests/smartspace/src/android/smartspace/cts/SmartspaceTargetTest.java
index fe63d6a..ab35e56 100644
--- a/tests/smartspace/src/android/smartspace/cts/SmartspaceTargetTest.java
+++ b/tests/smartspace/src/android/smartspace/cts/SmartspaceTargetTest.java
@@ -17,10 +17,16 @@
 
 import static android.app.smartspace.SmartspaceTarget.FEATURE_ALARM;
 
+import static androidx.test.InstrumentationRegistry.getContext;
+
 import static com.google.common.truth.Truth.assertThat;
 
 import android.app.smartspace.SmartspaceAction;
 import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.uitemplatedata.BaseTemplateData;
+import android.app.smartspace.uitemplatedata.BaseTemplateData.SubItemInfo;
+import android.app.smartspace.uitemplatedata.BaseTemplateData.SubItemLoggingInfo;
+import android.app.smartspace.uitemplatedata.Text;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
 import android.net.Uri;
@@ -65,6 +71,7 @@
                 .setSourceNotificationKey("source_notification_key")
                 .setAssociatedSmartspaceTargetId("associated_target_id")
                 .setSliceUri(Uri.EMPTY)
+                .setTemplateData(createBaseTemplateData())
                 .build();
 
 
@@ -86,6 +93,7 @@
         assertThat(testTarget.getComponentName()).isEqualTo(testComponentName);
         assertThat(testTarget.getUserHandle()).isEqualTo(Process.myUserHandle());
         assertThat(testTarget.getSliceUri()).isEqualTo(Uri.EMPTY);
+        assertThat(testTarget.getTemplateData()).isEqualTo(createBaseTemplateData());
         Parcel parcel = Parcel.obtain();
         parcel.setDataPosition(0);
         testTarget.writeToParcel(parcel, 0);
@@ -118,4 +126,63 @@
         return new SmartspaceAction.Builder(id, "test title").build();
     }
 
+    private BaseTemplateData createBaseTemplateData() {
+        SubItemInfo primaryItem = new SubItemInfo.Builder()
+                .setText(new Text.Builder("title").build())
+                .setIcon(SmartspaceTestUtils.createSmartspaceIcon("title icon"))
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                "primary action"))
+                .setLoggingInfo(new SubItemLoggingInfo.Builder(0, 0).setPackageName(
+                        "package name 0").build())
+                .build();
+        SubItemInfo subtitleItem = new SubItemInfo.Builder()
+                .setText(new Text.Builder("subtitle").build())
+                .setIcon(SmartspaceTestUtils.createSmartspaceIcon("subtitle icon"))
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                "subtitle action"))
+                .setLoggingInfo(new SubItemLoggingInfo.Builder(1, 1).setPackageName(
+                        "package name 1").build())
+                .build();
+        SubItemInfo subtitleSupplementalItem = new SubItemInfo.Builder()
+                .setText(new Text.Builder("subtitle supplemental").build())
+                .setIcon(SmartspaceTestUtils.createSmartspaceIcon(
+                        "subtitle supplemental icon"))
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                "subtitle supplemental action"))
+                .setLoggingInfo(new SubItemLoggingInfo.Builder(2, 2).setPackageName(
+                        "package name 2").build())
+                .build();
+        SubItemInfo supplementalLineItem = new SubItemInfo.Builder()
+                .setText(new Text.Builder("supplemental line").build())
+                .setIcon(SmartspaceTestUtils.createSmartspaceIcon(
+                        "supplemental line icon"))
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                "supplemental line action"))
+                .setLoggingInfo(new SubItemLoggingInfo.Builder(3, 3).setPackageName(
+                        "package name 3").build())
+                .build();
+        SubItemInfo supplementalAlarmItem = new SubItemInfo.Builder()
+                .setText(new Text.Builder("alarm supplemental").build())
+                .setIcon(SmartspaceTestUtils.createSmartspaceIcon("alarm icon"))
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(),
+                                "alarm action"))
+                .setLoggingInfo(new SubItemLoggingInfo.Builder(4, 4).setPackageName(
+                        "package name 4").build())
+                .build();
+
+        return new BaseTemplateData.Builder(
+                SmartspaceTarget.UI_TEMPLATE_DEFAULT)
+                .setPrimaryItem(primaryItem)
+                .setSubtitleItem(subtitleItem)
+                .setSubtitleSupplementalItem(subtitleSupplementalItem)
+                .setSupplementalLineItem(supplementalLineItem)
+                .setSupplementalAlarmItem(supplementalAlarmItem)
+                .setLayoutWeight(1)
+                .build();
+    }
 }
diff --git a/tests/smartspace/src/android/smartspace/cts/SmartspaceTestUtils.java b/tests/smartspace/src/android/smartspace/cts/SmartspaceTestUtils.java
index d2a5ffb..6902ec1 100644
--- a/tests/smartspace/src/android/smartspace/cts/SmartspaceTestUtils.java
+++ b/tests/smartspace/src/android/smartspace/cts/SmartspaceTestUtils.java
@@ -16,16 +16,48 @@
 
 package android.smartspace.cts;
 
+import android.app.PendingIntent;
+import android.app.TaskStackBuilder;
 import android.app.smartspace.SmartspaceTarget;
+import android.app.smartspace.uitemplatedata.Icon;
+import android.app.smartspace.uitemplatedata.TapAction;
 import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.os.Process;
 import android.os.UserHandle;
 
 public class SmartspaceTestUtils {
-    public static SmartspaceTarget getBasicSmartspaceTarget(String id, ComponentName componentName, UserHandle userHandle){
+    public static SmartspaceTarget getBasicSmartspaceTarget(String id, ComponentName componentName,
+            UserHandle userHandle) {
         return new SmartspaceTarget.Builder(id, componentName, userHandle).build();
     }
 
     public static ComponentName getTestComponentName() {
         return new ComponentName("package name", "class name");
     }
+
+    public static Icon createSmartspaceIcon(String contentDescription) {
+        android.graphics.drawable.Icon icon = android.graphics.drawable.Icon.createWithBitmap(
+                Bitmap.createBitmap(1, 1, Bitmap.Config.ALPHA_8));
+        return new Icon.Builder(icon).setContentDescription(contentDescription).build();
+    }
+
+    public static TapAction createSmartspaceTapAction(Context context, CharSequence id) {
+        Bundle extras = new Bundle();
+        extras.putString("key", "value");
+
+        Intent intent = new Intent();
+        PendingIntent pendingIntent = TaskStackBuilder.create(context)
+                .addNextIntent(intent)
+                .getPendingIntent(0, PendingIntent.FLAG_IMMUTABLE);
+
+        return new TapAction.Builder(id)
+                .setIntent(intent)
+                .setPendingIntent(pendingIntent)
+                .setUserHandle(Process.myUserHandle())
+                .setExtras(extras).build();
+    }
 }
diff --git a/tests/smartspace/src/android/smartspace/cts/SubCardTemplateDataTest.java b/tests/smartspace/src/android/smartspace/cts/SubCardTemplateDataTest.java
new file mode 100644
index 0000000..4c061b3
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/SubCardTemplateDataTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.smartspace.uitemplatedata.SubCardTemplateData;
+import android.app.smartspace.uitemplatedata.Text;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link SubCardTemplateData}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class SubCardTemplateDataTest {
+
+    private static final String TAG = "SubCardTemplateDataTest";
+
+    @Test
+    public void testCreateSubCardTemplateData() {
+        SubCardTemplateData subCardTemplateData =
+                new SubCardTemplateData.Builder(
+                        SmartspaceTestUtils.createSmartspaceIcon("icon"))
+                        .setSubCardText(new Text.Builder("text").build())
+                        .setSubCardAction(
+                                SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "tap"))
+                        .build();
+
+        assertThat(subCardTemplateData.getSubCardIcon()).isEqualTo(
+                SmartspaceTestUtils.createSmartspaceIcon("icon"));
+        assertThat(subCardTemplateData.getSubCardText()).isEqualTo(
+                new Text.Builder("text").build());
+        assertThat(subCardTemplateData.getSubCardAction()).isEqualTo(
+                SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "tap"));
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        subCardTemplateData.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        SubCardTemplateData copyData =
+                SubCardTemplateData.CREATOR.createFromParcel(parcel);
+        assertThat(subCardTemplateData).isEqualTo(copyData);
+        parcel.recycle();
+    }
+}
diff --git a/tests/smartspace/src/android/smartspace/cts/SubImageTemplateDataTest.java b/tests/smartspace/src/android/smartspace/cts/SubImageTemplateDataTest.java
new file mode 100644
index 0000000..af2c669
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/SubImageTemplateDataTest.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.smartspace.uitemplatedata.Icon;
+import android.app.smartspace.uitemplatedata.SubImageTemplateData;
+import android.app.smartspace.uitemplatedata.Text;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tests for {@link SubImageTemplateData}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class SubImageTemplateDataTest {
+
+    private static final String TAG = "SubImageTemplateDataTest";
+
+    @Test
+    public void testCreateSubImageTemplateData() {
+        List<Text> texts = new ArrayList<>();
+        texts.add(new Text.Builder("text1").build());
+        texts.add(new Text.Builder("text2").build());
+
+        List<Icon> images = new ArrayList<>();
+        images.add(SmartspaceTestUtils.createSmartspaceIcon("icon1"));
+        images.add(SmartspaceTestUtils.createSmartspaceIcon("icon2"));
+        images.add(SmartspaceTestUtils.createSmartspaceIcon("icon3"));
+
+        SubImageTemplateData subImageTemplateData =
+                new SubImageTemplateData.Builder(texts, images)
+                        .setSubImageAction(
+                                SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "tap"))
+                        .build();
+
+        assertThat(subImageTemplateData.getSubImageTexts()).isEqualTo(texts);
+        assertThat(subImageTemplateData.getSubImages()).isEqualTo(images);
+        assertThat(subImageTemplateData.getSubImageAction()).isEqualTo(
+                SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "tap"));
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        subImageTemplateData.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        SubImageTemplateData copyData =
+                SubImageTemplateData.CREATOR.createFromParcel(parcel);
+        assertThat(subImageTemplateData).isEqualTo(copyData);
+        parcel.recycle();
+    }
+}
diff --git a/tests/smartspace/src/android/smartspace/cts/SubItemInfoTest.java b/tests/smartspace/src/android/smartspace/cts/SubItemInfoTest.java
new file mode 100644
index 0000000..a338abe
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/SubItemInfoTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.smartspace.uitemplatedata.BaseTemplateData.SubItemInfo;
+import android.app.smartspace.uitemplatedata.BaseTemplateData.SubItemLoggingInfo;
+import android.app.smartspace.uitemplatedata.Text;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link SubItemInfo}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class SubItemInfoTest {
+
+    private static final String TAG = "SubItemInfoTest";
+
+    @Test
+    public void testCreateCarouselItem() {
+        SubItemInfo itemInfo = new SubItemInfo.Builder()
+                .setText(new Text.Builder("test").build())
+                .setIcon(SmartspaceTestUtils.createSmartspaceIcon("icon"))
+                .setTapAction(
+                        SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "action"))
+                .setLoggingInfo(new SubItemLoggingInfo.Builder(0, 0)
+                        .setPackageName("package name").build())
+                .build();
+
+        assertThat(itemInfo.getText()).isEqualTo(new Text.Builder("test").build());
+        assertThat(itemInfo.getIcon()).isEqualTo(SmartspaceTestUtils.createSmartspaceIcon("icon"));
+        assertThat(itemInfo.getTapAction()).isEqualTo(
+                SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "action"));
+        assertThat(itemInfo.getLoggingInfo()).isEqualTo(new SubItemLoggingInfo.Builder(0, 0)
+                .setPackageName("package name").build());
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        itemInfo.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        SubItemInfo copyItemInfo = SubItemInfo.CREATOR.createFromParcel(parcel);
+        assertThat(itemInfo).isEqualTo(copyItemInfo);
+        parcel.recycle();
+    }
+}
diff --git a/tests/smartspace/src/android/smartspace/cts/SubItemLoggingInfoTest.java b/tests/smartspace/src/android/smartspace/cts/SubItemLoggingInfoTest.java
new file mode 100644
index 0000000..e1ddafd
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/SubItemLoggingInfoTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.smartspace.uitemplatedata.BaseTemplateData.SubItemLoggingInfo;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link SubItemLoggingInfo}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class SubItemLoggingInfoTest {
+
+    private static final String TAG = "SubItemLoggingInfoTest";
+
+    @Test
+    public void testCreateSubItemLoggingInfo() {
+        SubItemLoggingInfo itemLoggingInfo = new SubItemLoggingInfo.Builder(1, 1)
+                .setPackageName("package name").build();
+
+        assertThat(itemLoggingInfo.getInstanceId()).isEqualTo(1);
+        assertThat(itemLoggingInfo.getFeatureType()).isEqualTo(1);
+        assertThat(itemLoggingInfo.getPackageName()).isEqualTo("package name");
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        itemLoggingInfo.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        SubItemLoggingInfo copyItemLoggingInfo = SubItemLoggingInfo.CREATOR.createFromParcel(
+                parcel);
+        assertThat(itemLoggingInfo).isEqualTo(copyItemLoggingInfo);
+        parcel.recycle();
+    }
+}
diff --git a/tests/smartspace/src/android/smartspace/cts/SubListTemplateDataTest.java b/tests/smartspace/src/android/smartspace/cts/SubListTemplateDataTest.java
new file mode 100644
index 0000000..1807e15
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/SubListTemplateDataTest.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.smartspace.uitemplatedata.SubListTemplateData;
+import android.app.smartspace.uitemplatedata.Text;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tests for {@link SubListTemplateData}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class SubListTemplateDataTest {
+
+    private static final String TAG = "SubListTemplateDataTest";
+
+    @Test
+    public void testCreateSubListTemplateData() {
+        List<Text> texts = new ArrayList<>();
+        texts.add(new Text.Builder("text1").build());
+        texts.add(new Text.Builder("text2").build());
+
+        SubListTemplateData subListTemplateData =
+                new SubListTemplateData.Builder(texts)
+                        .setSubListIcon(SmartspaceTestUtils.createSmartspaceIcon("icon"))
+                        .setSubListAction(
+                                SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "tap"))
+                        .build();
+
+        assertThat(subListTemplateData.getSubListIcon()).isEqualTo(
+                SmartspaceTestUtils.createSmartspaceIcon("icon"));
+        assertThat(subListTemplateData.getSubListTexts()).isEqualTo(texts);
+        assertThat(subListTemplateData.getSubListAction()).isEqualTo(
+                SmartspaceTestUtils.createSmartspaceTapAction(getContext(), "tap"));
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        subListTemplateData.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        SubListTemplateData copyData =
+                SubListTemplateData.CREATOR.createFromParcel(parcel);
+        assertThat(subListTemplateData).isEqualTo(copyData);
+        parcel.recycle();
+    }
+}
diff --git a/tests/smartspace/src/android/smartspace/cts/TapActionTest.java b/tests/smartspace/src/android/smartspace/cts/TapActionTest.java
new file mode 100644
index 0000000..f07b4f8
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/TapActionTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.PendingIntent;
+import android.app.TaskStackBuilder;
+import android.app.smartspace.uitemplatedata.TapAction;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Process;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link TapAction}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class TapActionTest {
+
+    private static final String TAG = "TapActionTest";
+
+    @Test
+    public void testCreateTapAction() {
+        Bundle extras = new Bundle();
+        extras.putString("key", "value");
+
+        Intent intent = new Intent();
+        PendingIntent pendingIntent = TaskStackBuilder.create(getContext())
+                .addNextIntent(intent)
+                .getPendingIntent(0, PendingIntent.FLAG_IMMUTABLE);
+
+        TapAction tapAction = new TapAction.Builder("id")
+                .setIntent(intent)
+                .setPendingIntent(pendingIntent)
+                .setUserHandle(Process.myUserHandle())
+                .setExtras(extras)
+                .setShouldShowOnLockscreen(true)
+                .build();
+
+        assertThat(tapAction.getId()).isEqualTo("id");
+        assertThat(tapAction.getIntent()).isEqualTo(intent);
+        assertThat(tapAction.getPendingIntent()).isEqualTo(pendingIntent);
+        assertThat(tapAction.getUserHandle()).isEqualTo(Process.myUserHandle());
+        assertThat(tapAction.getExtras()).isEqualTo(extras);
+        assertThat(tapAction.shouldShowOnLockscreen()).isEqualTo(true);
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        tapAction.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        TapAction copyTapAction = TapAction.CREATOR.createFromParcel(parcel);
+        assertThat(tapAction).isEqualTo(copyTapAction);
+        parcel.recycle();
+    }
+}
diff --git a/tests/smartspace/src/android/smartspace/cts/TextTest.java b/tests/smartspace/src/android/smartspace/cts/TextTest.java
new file mode 100644
index 0000000..8056bf3
--- /dev/null
+++ b/tests/smartspace/src/android/smartspace/cts/TextTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2022 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 android.smartspace.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.smartspace.uitemplatedata.Text;
+import android.os.Parcel;
+import android.text.TextUtils;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link Text}
+ *
+ * atest CtsSmartspaceServiceTestCases
+ */
+@RunWith(AndroidJUnit4.class)
+public class TextTest {
+
+    private static final String TAG = "TextTest";
+
+    @Test
+    public void testCreateText_defaultValues() {
+        Text text = new Text.Builder("test").build();
+
+        assertThat(text.getText()).isEqualTo("test");
+        assertThat(text.getTruncateAtType()).isEqualTo(TextUtils.TruncateAt.END);
+        assertThat(text.getMaxLines()).isEqualTo(1);
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        text.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        Text copyText = Text.CREATOR.createFromParcel(parcel);
+        assertThat(text).isEqualTo(copyText);
+        parcel.recycle();
+    }
+
+    @Test
+    public void testCreateText_marqueeTrunctAtType_maxLinesTwo() {
+        Text text = new Text.Builder("test")
+                .setTruncateAtType(TextUtils.TruncateAt.MARQUEE).setMaxLines(2).build();
+
+        assertThat(text.getText()).isEqualTo("test");
+        assertThat(text.getTruncateAtType()).isEqualTo(TextUtils.TruncateAt.MARQUEE);
+        assertThat(text.getMaxLines()).isEqualTo(2);
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        text.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        Text copyText = Text.CREATOR.createFromParcel(parcel);
+        assertThat(text).isEqualTo(copyText);
+        parcel.recycle();
+    }
+}
diff --git a/tests/tests/accounts/OWNERS b/tests/tests/accounts/OWNERS
index 695530b..0ca6900 100644
--- a/tests/tests/accounts/OWNERS
+++ b/tests/tests/accounts/OWNERS
@@ -1,5 +1,4 @@
 # Bug component: 82728
-carlosvaldivia@google.com
-dementyev@google.com
-sandrakwan@google.com
 aseemk@google.com
+dementyev@google.com
+mpape@google.com
diff --git a/tests/tests/activityrecognition/AndroidTest.xml b/tests/tests/activityrecognition/AndroidTest.xml
index db27940..1a4e661 100644
--- a/tests/tests/activityrecognition/AndroidTest.xml
+++ b/tests/tests/activityrecognition/AndroidTest.xml
@@ -21,6 +21,7 @@
     <option name="test-suite-tag" value="cts" />
 
     <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
diff --git a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
index d12ec40..26940a9 100644
--- a/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ObjectAnimatorTest.java
@@ -32,6 +32,7 @@
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
 import android.animation.TypeConverter;
+import android.animation.TypeEvaluator;
 import android.animation.ValueAnimator;
 import android.app.Instrumentation;
 import android.graphics.Color;
@@ -203,6 +204,37 @@
     }
 
     @Test
+    public void testOfObject_generic() throws Throwable {
+        final AnimTarget target = new AnimTarget();
+        Property<AnimTarget, Float> property = AnimTarget.TEST_VALUE;
+        TypeEvaluator<Float> evaluator = new TypeEvaluator<Float>() {
+            public Float evaluate(float fraction, Float startValue, Float endValue) {
+                return startValue + fraction * (endValue - startValue);
+            }
+        };
+
+        int startValue = 5;
+        int endValue = 10;
+        Float[] values = {new Float(startValue), new Float(endValue)};
+        final ObjectAnimator animator = ObjectAnimator.ofObject(target, property,
+                evaluator, values);
+
+        target.setTestValue(startValue);
+        final float startValueExpected = (Float) property.get(target);
+        animator.setupStartValues();
+        target.setTestValue(endValue);
+        final float endValueExpected = (Float) property.get(target);
+        animator.setupEndValues();
+        mActivityRule.runOnUiThread(() -> {
+            animator.start();
+            assertEquals(startValueExpected, (float) animator.getAnimatedValue(), 0.0f);
+            animator.setCurrentFraction(1);
+            assertEquals(endValueExpected, (float) animator.getAnimatedValue(), 0.0f);
+            animator.cancel();
+        });
+    }
+
+    @Test
     public void testOfPropertyValuesHolder() throws Throwable {
         Object object = mActivity.view.newBall;
         String propertyName = "scrollX";
diff --git a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
index 14b822b..259e002 100644
--- a/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
+++ b/tests/tests/animation/src/android/animation/cts/ValueAnimatorTest.java
@@ -776,6 +776,56 @@
         });
     }
 
+    @Test
+    public void testRegisterAndUnregisterDurationScaleListener() {
+        ValueAnimator.DurationScaleChangeListener listener = scale -> {
+            return;
+        };
+        assertTrue("Listener not registered",
+                ValueAnimator.registerDurationScaleChangeListener(listener));
+        assertFalse("Listener was registered again",
+                ValueAnimator.registerDurationScaleChangeListener(listener));
+        assertTrue("Listener not unregistered",
+                ValueAnimator.unregisterDurationScaleChangeListener(listener));
+        assertFalse("Listener was unregistered again",
+                ValueAnimator.unregisterDurationScaleChangeListener(listener));
+    }
+
+    @Test
+    public void testGetDurationScale() {
+        float currentDurationScale = ValueAnimator.getDurationScale();
+        try {
+            ValueAnimator.setDurationScale(0f);
+            assertEquals(0f, ValueAnimator.getDurationScale(), 0.0f);
+        } finally {
+            // restore scale value to avoid messing up future tests
+            ValueAnimator.setDurationScale(currentDurationScale);
+        }
+
+    }
+
+    @Test
+    public void testDurationScaleListenerOnChange() throws InterruptedException {
+        float currentDurationScale = ValueAnimator.getDurationScale();
+
+        ValueAnimator.setDurationScale(1f);
+        final CountDownLatch durationScaleUpdateLatch = new CountDownLatch(1);
+        ValueAnimator.DurationScaleChangeListener listener = scale -> {
+            assertEquals(0f, ValueAnimator.getDurationScale(), 0.0f);
+            durationScaleUpdateLatch.countDown();
+        };
+
+        try {
+            ValueAnimator.registerDurationScaleChangeListener(listener);
+            ValueAnimator.setDurationScale(0f);
+            assertTrue(durationScaleUpdateLatch.await(100, TimeUnit.MILLISECONDS));
+        } finally {
+            ValueAnimator.unregisterDurationScaleChangeListener(listener);
+            // restore scale value to avoid messing up future tests
+            ValueAnimator.setDurationScale(currentDurationScale);
+        }
+    }
+
     private ValueAnimator getAnimator() {
         Object object = mActivity.view.newBall;
         String property = "y";
diff --git a/tests/tests/app.usage/Android.bp b/tests/tests/app.usage/Android.bp
index 29ba591..d2774db 100644
--- a/tests/tests/app.usage/Android.bp
+++ b/tests/tests/app.usage/Android.bp
@@ -26,16 +26,83 @@
         "ctstestrunner-axt",
         "cts-wm-util",
         "junit",
+        "permission-test-util-lib",
         "ub-uiautomator",
     ],
     libs: [
         "android.test.base",
         "android.test.runner",
     ],
-    srcs: ["src/**/*.java", "TestApp1/**/*.java", "TestApp1/**/*.aidl", "TestApp2/**/*.java"],
+    srcs: [
+        "src/**/*.java",
+        "TestApp1/**/*.java",
+        "TestApp1/**/*.aidl",
+        "TestApp2/**/*.java",
+    ],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
 }
+
+java_defaults {
+    name: "test_app_defaults",
+    defaults: ["cts_defaults"],
+    platform_apis: true,
+    static_libs: [
+        "androidx.test.rules",
+        "compatibility-device-util-axt",
+        "ctstestrunner-axt",
+        "cts-wm-util",
+        "junit",
+        "ub-uiautomator",
+    ],
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+    srcs: [
+        "TestApp1/src/**/*.java",
+        "TestApp1/aidl/**/*.aidl",
+    ],
+    manifest: "TestApp1/AndroidManifest.xml",
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    sdk_version: "test_current",
+}
+
+android_test_helper_app {
+    name: "CtsUsageStatsTestApp1",
+    resource_dirs: [
+        "TestApp1/res",
+    ],
+    defaults: ["test_app_defaults"],
+}
+
+android_test_helper_app {
+    name: "CtsUsageStatsTestApp3",
+    defaults: ["test_app_defaults"],
+    resource_dirs: [
+        "TestApp1/res",
+        "TestApp3/res",
+    ],
+    aaptflags: [
+        "--rename-manifest-package android.app.usage.cts.test3",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsUsageStatsTestApp4",
+    defaults: ["test_app_defaults"],
+    resource_dirs: [
+        "TestApp1/res",
+        "TestApp4/res",
+    ],
+    aaptflags: [
+        "--rename-manifest-package android.app.usage.cts.test4",
+    ],
+}
diff --git a/tests/tests/app.usage/AndroidManifest.xml b/tests/tests/app.usage/AndroidManifest.xml
index 141a9af..6b55f8d 100644
--- a/tests/tests/app.usage/AndroidManifest.xml
+++ b/tests/tests/app.usage/AndroidManifest.xml
@@ -28,9 +28,14 @@
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_BROADCAST_RESPONSE_STATS" />
 
     <application android:usesCleartextTraffic="true"
-            android:networkSecurityConfig="@xml/network_security_config">
+            android:networkSecurityConfig="@xml/network_security_config"
+            android:debuggable="true" >
         <uses-library android:name="android.test.runner"/>
 
         <activity android:name=".Activities$ActivityOne"
diff --git a/tests/tests/app.usage/AndroidTest.xml b/tests/tests/app.usage/AndroidTest.xml
index 9854d57..e616180f 100644
--- a/tests/tests/app.usage/AndroidTest.xml
+++ b/tests/tests/app.usage/AndroidTest.xml
@@ -27,10 +27,17 @@
         <option name="test-file-name" value="CtsUsageStatsTestCases.apk" />
         <option name="test-file-name" value="CtsUsageStatsTestApp1.apk" />
         <option name="test-file-name" value="CtsUsageStatsTestApp2.apk" />
+        <option name="test-file-name" value="CtsUsageStatsTestApp3.apk" />
+        <option name="test-file-name" value="CtsUsageStatsTestApp4.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.app.usage.cts" />
         <option name="runtime-hint" value="1m47s" />
         <option name="hidden-api-checks" value="false" />
+        <option name="isolated-storage" value="false" />
     </test>
+    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
+        <option name="directory-keys" value="/sdcard/CtsUsageStatsTestCases" />
+        <option name="collect-on-run-ended-only" value="true" />
+    </metrics_collector>
 </configuration>
diff --git a/tests/tests/app.usage/TestApp1/Android.bp b/tests/tests/app.usage/TestApp1/Android.bp
deleted file mode 100644
index cba5df5..0000000
--- a/tests/tests/app.usage/TestApp1/Android.bp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (C) 2019 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-android_test_helper_app {
-    name: "CtsUsageStatsTestApp1",
-    defaults: ["cts_defaults"],
-    platform_apis: true,
-    static_libs: [
-        "androidx.test.rules",
-        "compatibility-device-util-axt",
-        "ctstestrunner-axt",
-        "cts-wm-util",
-        "junit",
-        "ub-uiautomator",
-    ],
-    libs: [
-        "android.test.base",
-        "android.test.runner",
-    ],
-    srcs: ["src/**/*.java", "aidl/**/*.aidl"],
-    // Tag this module as a cts test artifact
-    test_suites: [
-        "cts",
-        "general-tests",
-    ],
-    sdk_version: "test_current"
-}
diff --git a/tests/tests/app.usage/TestApp1/AndroidManifest.xml b/tests/tests/app.usage/TestApp1/AndroidManifest.xml
index 06ddfad..e8f341d 100644
--- a/tests/tests/app.usage/TestApp1/AndroidManifest.xml
+++ b/tests/tests/app.usage/TestApp1/AndroidManifest.xml
@@ -17,10 +17,10 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.app.usage.cts.test1">
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
 
     <application>
-        <activity android:name=".SomeActivity"
-                  android:exported="true"
+        <activity android:name=".SomeActivity" android:exported="true"
         />
         <activity android:name=".SomeActivityWithLocus"
                   android:exported="true"
@@ -32,7 +32,7 @@
                   android:exported="true"
         />
         <provider android:name=".TestContentProvider"
-            android:authorities="android.app.usage.cts.test1.provider"
+            android:authorities="@string/authority"
             android:exported="true"
         />
     </application>
diff --git a/tests/tests/app.usage/TestApp1/aidl/android/app/usage/cts/ITestReceiver.aidl b/tests/tests/app.usage/TestApp1/aidl/android/app/usage/cts/ITestReceiver.aidl
index d16a12b..9cd8924 100644
--- a/tests/tests/app.usage/TestApp1/aidl/android/app/usage/cts/ITestReceiver.aidl
+++ b/tests/tests/app.usage/TestApp1/aidl/android/app/usage/cts/ITestReceiver.aidl
@@ -15,6 +15,12 @@
  */
 package android.app.usage.cts;
 
+import android.app.Notification;
+
 interface ITestReceiver {
     boolean isAppInactive(String pkg);
+    void createNotificationChannel(String channelId, String channelName, String channelDescription);
+    void postNotification(int notificationId, in Notification notification);
+    void cancelNotification(int notificationId);
+    void cancelAll();
 }
\ No newline at end of file
diff --git a/tests/tests/app.usage/TestApp1/res/values/config.xml b/tests/tests/app.usage/TestApp1/res/values/config.xml
new file mode 100644
index 0000000..de69312
--- /dev/null
+++ b/tests/tests/app.usage/TestApp1/res/values/config.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="authority" translatable="false">android.app.usage.cts.test1.provider</string>
+</resources>
\ No newline at end of file
diff --git a/tests/tests/app.usage/TestApp1/src/android/app/usage/cts/test1/SomeActivity.java b/tests/tests/app.usage/TestApp1/src/android/app/usage/cts/test1/SomeActivity.java
index c68e4fe..0f8d195 100644
--- a/tests/tests/app.usage/TestApp1/src/android/app/usage/cts/test1/SomeActivity.java
+++ b/tests/tests/app.usage/TestApp1/src/android/app/usage/cts/test1/SomeActivity.java
@@ -15,15 +15,37 @@
  */
 package android.app.usage.cts.test1;
 
-import androidx.annotation.Nullable;
+import static android.content.Intent.EXTRA_REMOTE_CALLBACK;
+
 import android.app.Activity;
+import android.content.Intent;
 import android.os.Bundle;
+import android.os.RemoteCallback;
+import android.util.Log;
 import android.view.WindowManager;
 
+import androidx.annotation.Nullable;
+
 public final class SomeActivity extends Activity {
+    private static final String TAG = "SomeActivity";
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+
+        Log.d(TAG, "onCreate(): " + getIntent());
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
     }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        final Intent intent = getIntent();
+        Log.d(TAG, "onResume(): " + intent);
+        if (intent.hasExtra(EXTRA_REMOTE_CALLBACK)) {
+            final RemoteCallback remoteCallback = intent.getParcelableExtra(EXTRA_REMOTE_CALLBACK);
+            remoteCallback.sendResult(null);
+        }
+    }
 }
diff --git a/tests/tests/app.usage/TestApp1/src/android/app/usage/cts/test1/TestBroadcastReceiver.java b/tests/tests/app.usage/TestApp1/src/android/app/usage/cts/test1/TestBroadcastReceiver.java
index cfa7e2f..63a1ddd 100644
--- a/tests/tests/app.usage/TestApp1/src/android/app/usage/cts/test1/TestBroadcastReceiver.java
+++ b/tests/tests/app.usage/TestApp1/src/android/app/usage/cts/test1/TestBroadcastReceiver.java
@@ -16,11 +16,23 @@
 
 package android.app.usage.cts.test1;
 
+import static android.content.Intent.EXTRA_REMOTE_CALLBACK;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.os.RemoteCallback;
+import android.util.Log;
 
 public final class TestBroadcastReceiver extends BroadcastReceiver {
+    private static final String TAG = "TestBroadcastReceiver";
+
     @Override
-    public void onReceive(Context context, Intent intent) {}
+    public void onReceive(Context context, Intent intent) {
+        Log.d(TAG, "Received broadcast: " + intent);
+        if (intent.hasExtra(EXTRA_REMOTE_CALLBACK)) {
+            final RemoteCallback remoteCallback = intent.getParcelableExtra(EXTRA_REMOTE_CALLBACK);
+            remoteCallback.sendResult(null);
+        }
+    }
 }
diff --git a/tests/tests/app.usage/TestApp1/src/android/app/usage/cts/test1/TestService.java b/tests/tests/app.usage/TestApp1/src/android/app/usage/cts/test1/TestService.java
index eb34e95..acda1c4 100644
--- a/tests/tests/app.usage/TestApp1/src/android/app/usage/cts/test1/TestService.java
+++ b/tests/tests/app.usage/TestApp1/src/android/app/usage/cts/test1/TestService.java
@@ -16,14 +16,17 @@
 
 package android.app.usage.cts.test1;
 
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
 import android.app.Service;
 import android.app.usage.UsageStatsManager;
 import android.app.usage.cts.ITestReceiver;
-import android.content.Context;
 import android.content.Intent;
 import android.os.IBinder;
 
 public class TestService extends Service {
+
     @Override
     public IBinder onBind(Intent intent) {
         return new TestReceiver();
@@ -32,9 +35,36 @@
     private class TestReceiver extends ITestReceiver.Stub {
         @Override
         public boolean isAppInactive(String pkg) {
-            UsageStatsManager usm = (UsageStatsManager) getSystemService(
-                    Context.USAGE_STATS_SERVICE);
+            UsageStatsManager usm = getSystemService(UsageStatsManager.class);
             return usm.isAppInactive(pkg);
         }
+
+        @Override
+        public void createNotificationChannel(String channelId, String channelName,
+                String channelDescription) {
+            final NotificationChannel channel = new NotificationChannel(channelId, channelName,
+                    NotificationManager.IMPORTANCE_DEFAULT);
+            channel.setDescription(channelDescription);
+            getNotificationManager().createNotificationChannel(channel);
+        }
+
+        @Override
+        public void postNotification(int notificationId, Notification notification) {
+            getNotificationManager().notify(notificationId, notification);
+        }
+
+        @Override
+        public void cancelNotification(int notificationId) {
+            getNotificationManager().cancel(notificationId);
+        }
+
+        @Override
+        public void cancelAll() {
+            getNotificationManager().cancelAll();
+        }
+
+        private NotificationManager getNotificationManager() {
+            return getSystemService(NotificationManager.class);
+        }
     }
 }
diff --git a/tests/tests/app.usage/TestApp3/res/values/config.xml b/tests/tests/app.usage/TestApp3/res/values/config.xml
new file mode 100644
index 0000000..e0628a2
--- /dev/null
+++ b/tests/tests/app.usage/TestApp3/res/values/config.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="authority" translatable="false">android.app.usage.cts.test3.provider</string>
+</resources>
\ No newline at end of file
diff --git a/tests/tests/app.usage/TestApp4/res/values/config.xml b/tests/tests/app.usage/TestApp4/res/values/config.xml
new file mode 100644
index 0000000..3899433
--- /dev/null
+++ b/tests/tests/app.usage/TestApp4/res/values/config.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="authority" translatable="false">android.app.usage.cts.test4.provider</string>
+</resources>
\ No newline at end of file
diff --git a/tests/tests/app.usage/src/android/app/usage/cts/DumpOnFailureRule.java b/tests/tests/app.usage/src/android/app/usage/cts/DumpOnFailureRule.java
new file mode 100644
index 0000000..f381e51
--- /dev/null
+++ b/tests/tests/app.usage/src/android/app/usage/cts/DumpOnFailureRule.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2022 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 android.app.usage.cts;
+
+import static android.app.usage.cts.UsageStatsTest.TAG;
+
+import android.os.Environment;
+import android.os.FileUtils;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.OnFailureRule;
+
+import org.junit.AssumptionViolatedException;
+import org.junit.runner.Description;
+import org.junit.runners.model.Statement;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+public class DumpOnFailureRule extends OnFailureRule {
+    private File mDumpDir = new File(Environment.getExternalStorageDirectory(),
+            "CtsUsageStatsTestCases");
+
+    @Override
+    public void onTestFailure(Statement base, Description description, Throwable throwable) {
+        if (throwable instanceof AssumptionViolatedException) {
+            final String testName = description.getClassName() + "_" + description.getMethodName();
+            Log.d(TAG, "Skipping test " + testName + ": " + throwable);
+            return;
+        }
+
+        prepareDumpRootDir();
+        final File dumpFile = new File(mDumpDir, "dump-" + getShortenedTestName(description));
+        Log.i(TAG, "Dumping debug info for " + description + ": " + dumpFile.getPath());
+        try (FileOutputStream out = new FileOutputStream(dumpFile)) {
+            dumpCommandOutput(out, "dumpsys usagestats");
+        } catch (FileNotFoundException e) {
+            Log.e(TAG, "Error opening file: " + dumpFile, e);
+        } catch (IOException e) {
+            Log.e(TAG, "Error closing file: " + dumpFile, e);
+        }
+    }
+
+    private String getShortenedTestName(Description description) {
+        final String qualifiedClassName = description.getClassName();
+        final String className = qualifiedClassName.substring(
+                qualifiedClassName.lastIndexOf(".") + 1);
+        final String shortenedClassName = className.chars()
+                .filter(Character::isUpperCase)
+                .collect(StringBuilder::new, StringBuilder::appendCodePoint, StringBuilder::append)
+                .toString();
+        return shortenedClassName + "_" + description.getMethodName();
+    }
+
+    void dumpCommandOutput(FileOutputStream out, String cmd) {
+        final ParcelFileDescriptor pfd = InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation().executeShellCommand(cmd);
+        try (FileInputStream in = new ParcelFileDescriptor.AutoCloseInputStream(pfd)) {
+            out.write(("Output of '" + cmd + "':\n").getBytes(StandardCharsets.UTF_8));
+            FileUtils.copy(in, out);
+            out.write("\n\n=================================================================\n\n"
+                    .getBytes(StandardCharsets.UTF_8));
+        } catch (IOException e) {
+            Log.e(TAG, "Error dumping '" + cmd + "'", e);
+        }
+    }
+
+    void prepareDumpRootDir() {
+        if (!mDumpDir.exists() && !mDumpDir.mkdir()) {
+            Log.e(TAG, "Error creating " + mDumpDir);
+        }
+    }
+}
diff --git a/tests/tests/app.usage/src/android/app/usage/cts/TestJob.java b/tests/tests/app.usage/src/android/app/usage/cts/TestJob.java
index decc9d8..0efa65f 100644
--- a/tests/tests/app.usage/src/android/app/usage/cts/TestJob.java
+++ b/tests/tests/app.usage/src/android/app/usage/cts/TestJob.java
@@ -23,19 +23,14 @@
 import android.content.ComponentName;
 import android.content.Context;
 
-import java.util.function.BooleanSupplier;
+import java.util.function.Supplier;
 
 public final class TestJob extends JobService {
 
     public static final int TEST_JOB_ID = 1;
     public static final String NOTIFICATION_CHANNEL_ID = TestJob.class.getSimpleName();
     private static boolean sJobStarted;
-    public static BooleanSupplier hasJobStarted = new BooleanSupplier() {
-        @Override
-        public boolean getAsBoolean() {
-            return sJobStarted;
-        }
-    };
+    public static Supplier<Boolean> hasJobStarted = () -> sJobStarted;
 
     @Override
     public boolean onStartJob(JobParameters params) {
diff --git a/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java b/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java
index a20a8f9..85f2177 100644
--- a/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java
+++ b/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTest.java
@@ -16,23 +16,37 @@
 
 package android.app.usage.cts;
 
+import static android.Manifest.permission.ACCESS_BROADCAST_RESPONSE_STATS;
+import static android.Manifest.permission.POST_NOTIFICATIONS;
+import static android.Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL;
+import static android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS;
+import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_FREQUENT;
+import static android.app.usage.UsageStatsManager.STANDBY_BUCKET_RARE;
+import static android.content.Intent.EXTRA_REMOTE_CALLBACK;
+import static android.provider.DeviceConfig.NAMESPACE_APP_STANDBY;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeFalse;
 import static org.junit.Assume.assumeTrue;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.ActivityManager;
 import android.app.AppOpsManager;
+import android.app.BroadcastOptions;
 import android.app.KeyguardManager;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
+import android.app.UiAutomation;
+import android.app.usage.BroadcastResponseStats;
 import android.app.usage.EventStats;
 import android.app.usage.UsageEvents;
 import android.app.usage.UsageEvents.Event;
@@ -47,11 +61,16 @@
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Parcel;
+import android.os.Process;
+import android.os.RemoteCallback;
 import android.os.SystemClock;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.permission.PermissionManager;
+import android.permission.cts.PermissionUtils;
 import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.AppModeInstant;
 import android.provider.Settings;
@@ -61,16 +80,19 @@
 import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.Until;
 import android.text.format.DateUtils;
+import android.util.ArrayMap;
 import android.util.Log;
 import android.util.SparseArray;
 import android.util.SparseLongArray;
 import android.view.KeyEvent;
 
 import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.filters.MediumTest;
 
 import com.android.compatibility.common.util.AppStandbyUtils;
 import com.android.compatibility.common.util.BatteryUtils;
+import com.android.compatibility.common.util.DeviceConfigStateHelper;
+import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.SystemUtil;
 
 import org.junit.After;
@@ -84,13 +106,16 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
-import java.util.function.BooleanSupplier;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 /**
  * Test the UsageStats API. It is difficult to test the entire surface area
@@ -106,13 +131,14 @@
  *   along with the new time.
  * - Proper eviction of old data.
  */
-@RunWith(AndroidJUnit4.class)
+@RunWith(UsageStatsTestRunner.class)
 public class UsageStatsTest {
     private static final boolean DEBUG = false;
-    private static final String TAG = "UsageStatsTest";
+    static final String TAG = "UsageStatsTest";
 
     private static final String APPOPS_SET_SHELL_COMMAND = "appops set {0} " +
             AppOpsManager.OPSTR_GET_USAGE_STATS + " {1}";
+    private static final String APPOPS_RESET_SHELL_COMMAND = "appops reset {0}";
 
     private static final String GET_SHELL_COMMAND = "settings get global ";
 
@@ -123,6 +149,7 @@
     private static final String JOBSCHEDULER_RUN_SHELL_COMMAND = "cmd jobscheduler run";
 
     private static final String TEST_APP_PKG = "android.app.usage.cts.test1";
+
     private static final String TEST_APP_CLASS = "android.app.usage.cts.test1.SomeActivity";
     private static final String TEST_APP_CLASS_LOCUS
             = "android.app.usage.cts.test1.SomeActivityWithLocus";
@@ -140,6 +167,25 @@
     private static final ComponentName TEST_APP2_PIP_COMPONENT = new ComponentName(TEST_APP2_PKG,
             TEST_APP2_CLASS_PIP);
 
+    private static final String TEST_APP3_PKG = "android.app.usage.cts.test3";
+    private static final String TEST_APP4_PKG = "android.app.usage.cts.test4";
+
+    // TODO(206518483): Define these constants in UsageStatsManager to avoid hardcoding here.
+    private static final String KEY_NOTIFICATION_SEEN_HOLD_DURATION =
+            "notification_seen_duration";
+    private static final String KEY_NOTIFICATION_SEEN_PROMOTED_BUCKET =
+            "notification_seen_promoted_bucket";
+    private static final String KEY_BROADCAST_RESPONSE_WINDOW_DURATION_MS =
+            "broadcast_response_window_timeout_ms";
+    private static final String KEY_BROADCAST_RESPONSE_FG_THRESHOLD_STATE =
+            "broadcast_response_fg_threshold_state";
+
+    private static final int DEFAULT_TIMEOUT_MS = 10_000;
+    // For tests that are verifying a certain event doesn't occur, wait for some time
+    // to ensure the event doesn't really occur. Otherwise, we cannot be sure if the event didn't
+    // occur or the verification was done too early before the event occurred.
+    private static final int WAIT_TIME_FOR_NEGATIVE_TESTS_MS = 500;
+
     private static final long TIMEOUT = TimeUnit.SECONDS.toMillis(5);
     private static final long MINUTE = TimeUnit.MINUTES.toMillis(1);
     private static final long DAY = TimeUnit.DAYS.toMillis(1);
@@ -151,6 +197,19 @@
 
     private static final long TIMEOUT_BINDER_SERVICE_SEC = 2;
 
+    private static final long TEST_RESPONSE_STATS_ID_1 = 11;
+    private static final long TEST_RESPONSE_STATS_ID_2 = 22;
+
+    private static final String TEST_NOTIFICATION_CHANNEL_ID = "test-channel-id";
+    private static final String TEST_NOTIFICATION_CHANNEL_NAME = "test-channel-name";
+    private static final String TEST_NOTIFICATION_CHANNEL_DESC = "test-channel-description";
+
+    private static final int TEST_NOTIFICATION_ID_1 = 10;
+    private static final int TEST_NOTIFICATION_ID_2 = 20;
+    private static final String TEST_NOTIFICATION_TITLE_FMT = "Test title; id=%s";
+    private static final String TEST_NOTIFICATION_TEXT_1 = "Test content 1";
+    private static final String TEST_NOTIFICATION_TEXT_2 = "Test content 2";
+
     private Context mContext;
     private UiDevice mUiDevice;
     private ActivityManager mAm;
@@ -173,6 +232,7 @@
                 Context.USAGE_STATS_SERVICE);
         mKeyguardManager = mContext.getSystemService(KeyguardManager.class);
         mTargetPackage = mContext.getPackageName();
+        PermissionUtils.grantPermission(mTargetPackage, POST_NOTIFICATIONS);
 
         mWMStateHelper = new WindowManagerStateHelper();
 
@@ -200,8 +260,27 @@
             removeUser(mOtherUser);
             mOtherUser = 0;
         }
+        // Use test API to prevent PermissionManager from killing the test process when revoking
+        // permission.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> mContext.getSystemService(PermissionManager.class)
+                        .revokePostNotificationPermissionWithoutKillForTest(
+                                mTargetPackage,
+                                Process.myUserHandle().getIdentifier()),
+                REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL,
+                REVOKE_RUNTIME_PERMISSIONS);
+
+        // Clear broadcast response stats
+        setAppOpsMode("allow");
+        try {
+            mUsageStatsManager.clearBroadcastEvents();
+            mUsageStatsManager.clearBroadcastResponseStats(null /* packageName */, 0 /* id */);
+        } finally {
+            resetAppOpsMode();
+        }
     }
 
+
     private static void assertLessThan(long left, long right) {
         assertTrue("Expected " + left + " to be less than " + right, left < right);
     }
@@ -214,6 +293,10 @@
         executeShellCmd(MessageFormat.format(APPOPS_SET_SHELL_COMMAND, mTargetPackage, mode));
     }
 
+    private void resetAppOpsMode() throws Exception {
+        executeShellCmd(MessageFormat.format(APPOPS_RESET_SHELL_COMMAND, mTargetPackage));
+    }
+
     private String getSetting(String name) throws Exception {
         return executeShellCmd(GET_SHELL_COMMAND + name);
     }
@@ -251,6 +334,21 @@
         mUiDevice.wait(Until.hasObject(By.clazz(pkgName, className)), TIMEOUT);
     }
 
+    private void launchTestActivityAndWaitToBeResumed(String pkgName, String className)
+            throws Exception {
+        // Make sure the screen is awake and unlocked. Otherwise, the app activity won't be resumed.
+        mUiDevice.wakeUp();
+        dismissKeyguard();
+
+        final Intent intent = createTestActivityIntent(pkgName, className);
+        final CountDownLatch latch = new CountDownLatch(1);
+        intent.putExtra(EXTRA_REMOTE_CALLBACK, new RemoteCallback(result -> latch.countDown()));
+        mContext.startActivity(intent);
+        if (!latch.await(DEFAULT_TIMEOUT_MS, TimeUnit.SECONDS)) {
+            fail("Timed out waiting for the test app activity to be resumed");
+        }
+    }
+
     private void launchSubActivities(Class<? extends Activity>[] activityClasses) {
         for (Class<? extends Activity> clazz : activityClasses) {
             launchSubActivity(clazz);
@@ -259,6 +357,19 @@
 
     @AppModeFull(reason = "No usage events access in instant apps")
     @Test
+    public void testLastTimeVisible_launchActivityShouldBeDetected() throws Exception {
+        mUiDevice.wakeUp();
+        dismissKeyguard(); // also want to start out with the keyguard dismissed.
+
+        final long startTime = System.currentTimeMillis();
+        launchSubActivity(Activities.ActivityOne.class);
+        final long endTime = System.currentTimeMillis();
+
+        verifyLastTimeVisibleWithinRange(startTime, endTime, mTargetPackage);
+    }
+
+    @AppModeFull(reason = "No usage events access in instant apps")
+    @Test
     public void testLastTimeAnyComponentUsed_launchActivityShouldBeDetected() throws Exception {
         mUiDevice.wakeUp();
         dismissKeyguard(); // also want to start out with the keyguard dismissed.
@@ -311,6 +422,17 @@
         verifyLastTimeAnyComponentUsedWithinRange(startTime, endTime, TEST_APP_PKG);
     }
 
+    private void verifyLastTimeVisibleWithinRange(
+            long startTime, long endTime, String targetPackage) {
+        final Map<String, UsageStats> map = mUsageStatsManager.queryAndAggregateUsageStats(
+                startTime, endTime);
+        final UsageStats stats = map.get(targetPackage);
+        assertNotNull(stats);
+        final long lastTimeVisible = stats.getLastTimeVisible();
+        assertLessThanOrEqual(startTime, lastTimeVisible);
+        assertLessThanOrEqual(lastTimeVisible, endTime);
+    }
+
     private void verifyLastTimeAnyComponentUsedWithinRange(
             long startTime, long endTime, String targetPackage) {
         final Map<String, UsageStats> map = mUsageStatsManager.queryAndAggregateUsageStats(
@@ -475,7 +597,10 @@
                 startTime, endTime);
         stats = events.get(mTargetPackage);
         assertEquals(startingCount + 1, stats.getAppLaunchCount());
-        mUiDevice.pressHome();
+
+        // Launch a new activity so the other sub activities go into a paused state.
+        launchTestActivity(TEST_APP_PKG, TEST_APP_CLASS);
+
         launchSubActivity(Activities.ActivityOne.class);
         launchSubActivity(Activities.ActivityTwo.class);
         launchSubActivity(Activities.ActivityThree.class);
@@ -501,7 +626,7 @@
             UsageEvents.Event event = new UsageEvents.Event();
             assertTrue(events.getNextEvent(event));
             if (event.getEventType() == UsageEvents.Event.STANDBY_BUCKET_CHANGED) {
-                found |= event.getAppStandbyBucket() == UsageStatsManager.STANDBY_BUCKET_RARE;
+                found |= event.getAppStandbyBucket() == STANDBY_BUCKET_RARE;
             }
         }
 
@@ -521,7 +646,7 @@
             assertTrue("No bucket data returned", bucketMap.size() > 0);
             final int bucket = bucketMap.getOrDefault(mTargetPackage, -1);
             assertEquals("Incorrect bucket returned for " + mTargetPackage, bucket,
-                    UsageStatsManager.STANDBY_BUCKET_RARE);
+                    STANDBY_BUCKET_RARE);
         } finally {
             AppStandbyUtils.setAppStandbyEnabledAtRuntime(origValue);
         }
@@ -554,7 +679,7 @@
             numEvents++;
             assertEquals("Event for a different package", mTargetPackage, event.getPackageName());
             if (event.getEventType() == Event.STANDBY_BUCKET_CHANGED) {
-                if (event.getAppStandbyBucket() == UsageStatsManager.STANDBY_BUCKET_RARE) {
+                if (event.getAppStandbyBucket() == STANDBY_BUCKET_RARE) {
                     rareTimeStamp = event.getTimeStamp();
                 }
                 else if (event.getAppStandbyBucket() == UsageStatsManager
@@ -736,7 +861,7 @@
     public void testNotificationSeen() throws Exception {
         final long startTime = System.currentTimeMillis();
 
-        // Skip the test for wearable devices, televisions and automotives; neither has
+        // Skip the test for wearable devices, televisions and automotives; none of them have
         // a notification shade, as notifications are shown via a different path than phones
         assumeFalse("Test cannot run on a watch- notification shade is not shown",
                 mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH));
@@ -780,11 +905,1561 @@
     }
 
     @AppModeFull(reason = "No usage events access in instant apps")
+    @MediumTest
+    @Test
+    public void testNotificationSeen_verifyBucket() throws Exception {
+        // Skip the test for wearable devices, televisions and automotives; none of them have
+        // a notification shade, as notifications are shown via a different path than phones
+        assumeFalse("Test cannot run on a watch- notification shade is not shown",
+                mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH));
+        assumeFalse("Test cannot run on a television- notifications are not shown",
+                mContext.getPackageManager().hasSystemFeature(
+                        PackageManager.FEATURE_LEANBACK_ONLY));
+        assumeFalse("Test cannot run on an automotive - notification shade is not shown",
+                mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE));
+
+        final long promotedBucketHoldDurationMs = TimeUnit.MINUTES.toMillis(2);
+        try (DeviceConfigStateHelper deviceConfigStateHelper =
+                     new DeviceConfigStateHelper(NAMESPACE_APP_STANDBY)) {
+            deviceConfigStateHelper.set(KEY_NOTIFICATION_SEEN_PROMOTED_BUCKET,
+                    String.valueOf(STANDBY_BUCKET_FREQUENT));
+            deviceConfigStateHelper.set(KEY_NOTIFICATION_SEEN_HOLD_DURATION,
+                    String.valueOf(promotedBucketHoldDurationMs));
+
+            mUiDevice.wakeUp();
+            dismissKeyguard();
+            final TestServiceConnection connection = bindToTestServiceAndGetConnection();
+            try {
+                ITestReceiver testReceiver = connection.getITestReceiver();
+                testReceiver.cancelAll();
+                testReceiver.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                        TEST_NOTIFICATION_CHANNEL_NAME,
+                        TEST_NOTIFICATION_CHANNEL_DESC);
+                testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                        buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                                TEST_NOTIFICATION_TEXT_1));
+            } finally {
+                connection.unbind();
+            }
+            setStandByBucket(TEST_APP_PKG, "rare");
+            executeShellCmd("cmd usagestats clear-last-used-timestamps " + TEST_APP_PKG);
+            waitUntil(() -> mUsageStatsManager.getAppStandbyBucket(TEST_APP_PKG),
+                    STANDBY_BUCKET_RARE);
+            mUiDevice.openNotification();
+            waitUntil(() -> mUsageStatsManager.getAppStandbyBucket(TEST_APP_PKG),
+                    STANDBY_BUCKET_FREQUENT);
+            SystemClock.sleep(promotedBucketHoldDurationMs);
+            // Verify that after the promoted duration expires, the app drops into a
+            // lower standby bucket.
+            // Note: "set-standby-bucket" command only updates the bucket of the app and not
+            // it's last used timestamps. So, it is possible when the standby bucket is calculated
+            // the app is not going to be back in RARE bucket we set earlier. So, just verify
+            // the app gets demoted to some lower bucket.
+            waitUntil(() -> mUsageStatsManager.getAppStandbyBucket(TEST_APP_PKG),
+                    result -> result > STANDBY_BUCKET_FREQUENT,
+                    "bucket should be > FREQUENT");
+            mUiDevice.pressHome();
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastOptions_noPermission() throws Exception {
+        final BroadcastOptions options = BroadcastOptions.makeBasic();
+        options.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+        final Intent intent = new Intent().setComponent(new ComponentName(
+                TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+        sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+        final UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation();
+        uiAutomation.revokeRuntimePermission(mTargetPackage, ACCESS_BROADCAST_RESPONSE_STATS);
+        setAppOpsMode("ignore");
+        try {
+            assertThrows(SecurityException.class, () -> {
+                sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+            });
+        } finally {
+            resetAppOpsMode();
+            uiAutomation.grantRuntimePermission(mTargetPackage, ACCESS_BROADCAST_RESPONSE_STATS);
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testQueryBroadcastResponseStats_noPermission() throws Exception {
+        mUsageStatsManager.queryBroadcastResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1);
+
+        final UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation();
+        uiAutomation.revokeRuntimePermission(mTargetPackage, ACCESS_BROADCAST_RESPONSE_STATS);
+        setAppOpsMode("ignore");
+        try {
+            assertThrows(SecurityException.class, () -> {
+                mUsageStatsManager.queryBroadcastResponseStats(TEST_APP_PKG,
+                        TEST_RESPONSE_STATS_ID_1);
+            });
+        } finally {
+            resetAppOpsMode();
+            uiAutomation.grantRuntimePermission(mTargetPackage, ACCESS_BROADCAST_RESPONSE_STATS);
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testClearBroadcastResponseStats_noPermission() throws Exception {
+        mUsageStatsManager.clearBroadcastResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1);
+
+        final UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation();
+        uiAutomation.revokeRuntimePermission(mTargetPackage, ACCESS_BROADCAST_RESPONSE_STATS);
+        setAppOpsMode("ignore");
+        try {
+            assertThrows(SecurityException.class, () -> {
+                mUsageStatsManager.clearBroadcastResponseStats(TEST_APP_PKG,
+                        TEST_RESPONSE_STATS_ID_1);
+            });
+        } finally {
+            resetAppOpsMode();
+            uiAutomation.grantRuntimePermission(mTargetPackage, ACCESS_BROADCAST_RESPONSE_STATS);
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastResponseStats_broadcastDispatchedCount() throws Exception {
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+
+        final TestServiceConnection connection = bindToTestServiceAndGetConnection();
+        try {
+            ITestReceiver testReceiver = connection.getITestReceiver();
+            testReceiver.cancelAll();
+
+            // Send a normal broadcast and verify none of the counts get incremented.
+            final Intent intent = new Intent().setComponent(new ComponentName(
+                    TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            sendBroadcastAndWaitForReceipt(intent, null);
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Send a broadcast with a request to record response and verify broadcast-sent
+            // count gets incremented.
+            final BroadcastOptions options = BroadcastOptions.makeBasic();
+            options.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+            sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Trigger a notification from test app and verify notification-posted count gets
+            // incremented.
+            testReceiver.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    1 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            testReceiver.cancelAll();
+        } finally {
+            connection.unbind();
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastResponseStats_notificationPostedCount() throws Exception {
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+
+        final TestServiceConnection connection = bindToTestServiceAndGetConnection();
+        try {
+            ITestReceiver testReceiver = connection.getITestReceiver();
+            testReceiver.cancelAll();
+
+            // Send a normal broadcast and verify none of the counts get incremented.
+            final Intent intent = new Intent().setComponent(new ComponentName(
+                    TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            sendBroadcastAndWaitForReceipt(intent, null);
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Send a broadcast with a request to record response and verify broadcast-sent
+            // count gets incremented.
+            final BroadcastOptions options = BroadcastOptions.makeBasic();
+            options.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+            sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Trigger a notification from test app and verify notification-posted count gets
+            // incremented.
+            testReceiver.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    1 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            mUsageStatsManager.clearBroadcastResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            testReceiver.cancelAll();
+        } finally {
+            connection.unbind();
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastResponseStats_notificationUpdatedCount() throws Exception {
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+
+        final TestServiceConnection connection = bindToTestServiceAndGetConnection();
+        try {
+            ITestReceiver testReceiver = connection.getITestReceiver();
+            testReceiver.cancelAll();
+
+            // Post a notification (before sending any broadcast) and verify none of the counts
+            // get incremented.
+            testReceiver.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Send a broadcast with a request to record response and verify broadcast-sent
+            // count gets incremented.
+            final Intent intent = new Intent().setComponent(new ComponentName(
+                    TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            final BroadcastOptions options = BroadcastOptions.makeBasic();
+            options.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+            sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Update a previously posted notification (change content text) and verify
+            // notification-updated count gets incremented.
+            testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_2));
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    1 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            mUsageStatsManager.clearBroadcastResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            testReceiver.cancelAll();
+        } finally {
+            connection.unbind();
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastResponseStats_notificationCancelledCount() throws Exception {
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+
+        final TestServiceConnection connection = bindToTestServiceAndGetConnection();
+        try {
+            ITestReceiver testReceiver = connection.getITestReceiver();
+            testReceiver.cancelAll();
+
+            // Post a notification (before sending any broadcast) and verify none of the counts
+            // get incremented.
+            testReceiver.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Send a broadcast with a request to record response and verify broadcast-sent
+            // count gets incremented.
+            final Intent intent = new Intent().setComponent(new ComponentName(
+                    TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            sendBroadcastAndWaitForReceipt(intent, null);
+            final BroadcastOptions options = BroadcastOptions.makeBasic();
+            options.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+            sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Cancel a previously posted notification (change content text) and verify
+            // notification-cancelled count gets incremented.
+            testReceiver.cancelNotification(TEST_NOTIFICATION_ID_1);
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    1 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            mUsageStatsManager.clearBroadcastResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            testReceiver.cancelAll();
+        } finally {
+            connection.unbind();
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastResponseStats_multipleEvents() throws Exception {
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+
+        final TestServiceConnection connection = bindToTestServiceAndGetConnection();
+        try {
+            ITestReceiver testReceiver = connection.getITestReceiver();
+            testReceiver.cancelAll();
+
+            // Send a normal broadcast and verify none of the counts get incremented.
+            final Intent intent = new Intent().setComponent(new ComponentName(
+                    TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            sendBroadcastAndWaitForReceipt(intent, null);
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Send a broadcast with a request to record response and verify broadcast-sent
+            // count gets incremented.
+            final BroadcastOptions options = BroadcastOptions.makeBasic();
+            options.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+            sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Trigger a notification from test app and verify notification-posted count gets
+            // incremented.
+            testReceiver.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    1 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Send another broadcast and trigger another notification.
+            sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+            testReceiver.postNotification(TEST_NOTIFICATION_ID_2,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_2,
+                            TEST_NOTIFICATION_TEXT_2));
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    2 /* broadcastCount */,
+                    2 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Send another broadcast with a different ID and update a previously posted
+            // notification.
+            options.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_2);
+            sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+            testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_2));
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    2 /* broadcastCount */,
+                    2 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    1 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    1 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Update/cancel a previously posted notifications and verify there is
+            // no change in counts.
+            testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+            testReceiver.cancelNotification(TEST_NOTIFICATION_ID_2);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    2 /* broadcastCount */,
+                    2 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    1 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    1 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            mUsageStatsManager.clearBroadcastResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    1 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    1 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            mUsageStatsManager.clearBroadcastResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            testReceiver.cancelAll();
+        } finally {
+            connection.unbind();
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastResponseStats_clearCounts() throws Exception {
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+
+        final TestServiceConnection connection = bindToTestServiceAndGetConnection();
+        try {
+            ITestReceiver testReceiver = connection.getITestReceiver();
+            testReceiver.cancelAll();
+
+            // Send a broadcast with a request to record response and verify broadcast-sent
+            // count gets incremented.
+            final Intent intent = new Intent().setComponent(new ComponentName(
+                    TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            final BroadcastOptions options = BroadcastOptions.makeBasic();
+            options.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+            sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Trigger a notification from test app and verify notification-posted count gets
+            // incremented.
+            testReceiver.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    1 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            mUsageStatsManager.clearBroadcastResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            // Send the broadcast again after clearing counts and verify counts get incremented
+            // as expected.
+            sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+            testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_2));
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    1 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    1 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+            testReceiver.cancelNotification(TEST_NOTIFICATION_ID_1);
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    2 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    1 /* notificationUpdatedCount */,
+                    1 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            testReceiver.cancelAll();
+        } finally {
+            connection.unbind();
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @MediumTest
+    @Test
+    public void testBroadcastResponseStats_changeResponseWindowDuration() throws Exception {
+        final long broadcastResponseWindowDurationMs = TimeUnit.MINUTES.toMillis(2);
+        try (DeviceConfigStateHelper deviceConfigStateHelper =
+                new DeviceConfigStateHelper(NAMESPACE_APP_STANDBY)) {
+            updateFlagWithDelay(deviceConfigStateHelper,
+                    KEY_BROADCAST_RESPONSE_WINDOW_DURATION_MS,
+                    String.valueOf(broadcastResponseWindowDurationMs));
+
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+            assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                    0 /* broadcastCount */,
+                    0 /* notificationPostedCount */,
+                    0 /* notificationUpdatedCount */,
+                    0 /* notificationCancelledCount */);
+
+            final TestServiceConnection connection = bindToTestServiceAndGetConnection();
+            try {
+                ITestReceiver testReceiver = connection.getITestReceiver();
+                testReceiver.cancelAll();
+
+                // Send a broadcast with a request to record response and verify broadcast-sent
+                // count gets incremented.
+                final Intent intent = new Intent().setComponent(new ComponentName(
+                        TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+                final BroadcastOptions options = BroadcastOptions.makeBasic();
+                options.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+                sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                        1 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                        0 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+
+                // Trigger a notification from test app and verify notification-posted count gets
+                // incremented.
+                testReceiver.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                        TEST_NOTIFICATION_CHANNEL_NAME,
+                        TEST_NOTIFICATION_CHANNEL_DESC);
+                testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                        buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                                TEST_NOTIFICATION_TEXT_1));
+
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                        1 /* broadcastCount */,
+                        1 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                        0 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+
+                testReceiver.cancelNotification(TEST_NOTIFICATION_ID_1);
+                mUsageStatsManager.clearBroadcastResponseStats(TEST_APP_PKG,
+                        TEST_RESPONSE_STATS_ID_1);
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                        0 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                        0 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+
+                sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                        1 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                        0 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+
+                SystemClock.sleep(broadcastResponseWindowDurationMs);
+                // Trigger a notification from test app but verify counts do not get
+                // incremented as the notification is posted after the window durations is expired.
+                testReceiver.postNotification(TEST_NOTIFICATION_ID_1,
+                        buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                                TEST_NOTIFICATION_TEXT_1));
+
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                        1 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                        0 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+
+                testReceiver.cancelAll();
+            } finally {
+                connection.unbind();
+            }
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastResponseStats_appNotInForeground() throws Exception {
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+        assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                0 /* broadcastCount */,
+                0 /* notificationPostedCount */,
+                0 /* notificationUpdatedCount */,
+                0 /* notificationCancelledCount */);
+
+        try (DeviceConfigStateHelper deviceConfigStateHelper =
+                     new DeviceConfigStateHelper(NAMESPACE_APP_STANDBY)) {
+            final TestServiceConnection connection = bindToTestServiceAndGetConnection();
+            try {
+                updateFlagWithDelay(deviceConfigStateHelper,
+                        KEY_BROADCAST_RESPONSE_FG_THRESHOLD_STATE,
+                        String.valueOf(ActivityManager.PROCESS_STATE_TOP));
+
+                ITestReceiver testReceiver = connection.getITestReceiver();
+                testReceiver.cancelAll();
+
+                // Send a broadcast with a request to record response and verify broadcast-sent
+                // count gets incremented.
+                final Intent intent = new Intent().setComponent(new ComponentName(
+                        TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+                final BroadcastOptions options = BroadcastOptions.makeBasic();
+                options.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+                sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                        1 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                        0 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+
+                // Bring the test app to the foreground, send the broadcast again and verify that
+                // counts do not change.
+                launchTestActivityAndWaitToBeResumed(TEST_APP_PKG, TEST_APP_CLASS);
+                sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                        1 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                        0 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+
+                // Change the threshold to something lower than TOP, send the broadcast again
+                // and verify that counts get incremented.
+                updateFlagWithDelay(deviceConfigStateHelper,
+                        KEY_BROADCAST_RESPONSE_FG_THRESHOLD_STATE,
+                        String.valueOf(ActivityManager.PROCESS_STATE_PERSISTENT));
+                sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                        2 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                        0 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+
+                mUiDevice.pressHome();
+                // Change the threshold to a process state higher than RECEIVER, send the
+                // broadcast again and verify that counts do not change.
+                updateFlagWithDelay(deviceConfigStateHelper,
+                        KEY_BROADCAST_RESPONSE_FG_THRESHOLD_STATE,
+                        String.valueOf(ActivityManager.PROCESS_STATE_HOME));
+                sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_1,
+                        2 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+                assertResponseStats(TEST_APP_PKG, TEST_RESPONSE_STATS_ID_2,
+                        0 /* broadcastCount */,
+                        0 /* notificationPostedCount */,
+                        0 /* notificationUpdatedCount */,
+                        0 /* notificationCancelledCount */);
+
+                testReceiver.cancelAll();
+            } finally {
+                connection.unbind();
+            }
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastResponseStats_multiplePackages() throws Exception {
+        final ArrayMap<String, BroadcastResponseStats> expectedStats = new ArrayMap<>();
+        // Initially all the counts should be empty
+        assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStats);
+
+        final TestServiceConnection connection1 = bindToTestServiceAndGetConnection(TEST_APP_PKG);
+        final TestServiceConnection connection3 = bindToTestServiceAndGetConnection(TEST_APP3_PKG);
+        final TestServiceConnection connection4 = bindToTestServiceAndGetConnection(TEST_APP4_PKG);
+        try {
+            ITestReceiver testReceiver1 = connection1.getITestReceiver();
+            ITestReceiver testReceiver3 = connection3.getITestReceiver();
+            ITestReceiver testReceiver4 = connection4.getITestReceiver();
+
+            testReceiver1.cancelAll();
+            testReceiver3.cancelAll();
+            testReceiver4.cancelAll();
+
+            final Intent intent = new Intent().setComponent(new ComponentName(
+                    TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            final Intent intent3 = new Intent().setComponent(new ComponentName(
+                    TEST_APP3_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            final Intent intent4 = new Intent().setComponent(new ComponentName(
+                    TEST_APP4_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+
+            // Send a broadcast to test-pkg1 with a request to record response and verify
+            // broadcast-sent count gets incremented.
+            final BroadcastOptions options = BroadcastOptions.makeBasic();
+            options.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+            sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+
+            expectedStats.put(TEST_APP_PKG, new BroadcastResponseStats(TEST_APP_PKG,
+                    TEST_RESPONSE_STATS_ID_1));
+            expectedStats.get(TEST_APP_PKG).incrementBroadcastsDispatchedCount(1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStats);
+
+            // Send a broadcast to test-pkg3 with a request to record response and verify
+            // broadcast-sent count gets incremented.
+            sendBroadcastAndWaitForReceipt(intent3, options.toBundle());
+            expectedStats.put(TEST_APP3_PKG, new BroadcastResponseStats(TEST_APP3_PKG,
+                    TEST_RESPONSE_STATS_ID_1));
+            expectedStats.get(TEST_APP3_PKG).incrementBroadcastsDispatchedCount(1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStats);
+
+            // Trigger a notification from test-pkg1 and verify notification-posted count gets
+            // incremented.
+            testReceiver1.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver1.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            expectedStats.get(TEST_APP_PKG).incrementNotificationsPostedCount(1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStats);
+
+            // Trigger a notification from test-pkg3 and verify notification-posted count gets
+            // incremented.
+            testReceiver3.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver3.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            expectedStats.get(TEST_APP3_PKG).incrementNotificationsPostedCount(1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStats);
+
+            // Send a broadcast to test-pkg1 with a request to record response and verify
+            // broadcast-sent count gets incremented.
+            sendBroadcastAndWaitForReceipt(intent, options.toBundle());
+            testReceiver1.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_2));
+            expectedStats.get(TEST_APP_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStats.get(TEST_APP_PKG).incrementNotificationsUpdatedCount(1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStats);
+
+            // Trigger a notification from test-pkg3 and verify stats remain the same
+            testReceiver4.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver4.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStats);
+
+            // Send a broadcast to test-pkg4 with a request to record response and verify
+            // broadcast-send count gets incremented.
+            sendBroadcastAndWaitForReceipt(intent4, options.toBundle());
+            testReceiver4.cancelNotification(TEST_NOTIFICATION_ID_1);
+            expectedStats.put(TEST_APP4_PKG, new BroadcastResponseStats(TEST_APP4_PKG,
+                    TEST_RESPONSE_STATS_ID_1));
+            expectedStats.get(TEST_APP4_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStats.get(TEST_APP4_PKG).incrementNotificationsCancelledCount(1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStats);
+
+            mUsageStatsManager.clearBroadcastResponseStats(null, TEST_RESPONSE_STATS_ID_1);
+            expectedStats.clear();
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStats);
+
+            testReceiver1.cancelAll();
+            testReceiver3.cancelAll();
+            testReceiver4.cancelAll();
+        } finally {
+            connection1.unbind();
+            connection3.unbind();
+            connection4.unbind();
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastResponseStats_multiplePackages_multipleIds() throws Exception {
+        final ArrayMap<String, BroadcastResponseStats> expectedStatsForId1 = new ArrayMap<>();
+        final ArrayMap<String, BroadcastResponseStats> expectedStatsForId2 = new ArrayMap<>();
+        // Initially all the counts should be empty
+        assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+        assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+        final TestServiceConnection connection1 = bindToTestServiceAndGetConnection(TEST_APP_PKG);
+        final TestServiceConnection connection3 = bindToTestServiceAndGetConnection(TEST_APP3_PKG);
+        final TestServiceConnection connection4 = bindToTestServiceAndGetConnection(TEST_APP4_PKG);
+        try {
+            ITestReceiver testReceiver1 = connection1.getITestReceiver();
+            ITestReceiver testReceiver3 = connection3.getITestReceiver();
+            ITestReceiver testReceiver4 = connection4.getITestReceiver();
+
+            testReceiver1.cancelAll();
+            testReceiver3.cancelAll();
+            testReceiver4.cancelAll();
+
+            final Intent intent = new Intent().setComponent(new ComponentName(
+                    TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            final Intent intent3 = new Intent().setComponent(new ComponentName(
+                    TEST_APP3_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            final Intent intent4 = new Intent().setComponent(new ComponentName(
+                    TEST_APP4_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+
+            final BroadcastOptions options1 = BroadcastOptions.makeBasic();
+            options1.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+            final BroadcastOptions options2 = BroadcastOptions.makeBasic();
+            options2.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_2);
+
+            // Send a broadcast to test-pkg1 with a request to record response and verify
+            // broadcast-sent count gets incremented.
+            sendBroadcastAndWaitForReceipt(intent, options1.toBundle());
+            sendBroadcastAndWaitForReceipt(intent3, options2.toBundle());
+
+            // Trigger a notification from test-pkg1 and verify notification-posted count gets
+            // incremented.
+            testReceiver1.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver1.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            expectedStatsForId1.put(TEST_APP_PKG, new BroadcastResponseStats(TEST_APP_PKG,
+                    TEST_RESPONSE_STATS_ID_1));
+            expectedStatsForId1.get(TEST_APP_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId1.get(TEST_APP_PKG).incrementNotificationsPostedCount(1);
+            expectedStatsForId2.put(TEST_APP3_PKG, new BroadcastResponseStats(TEST_APP3_PKG,
+                    TEST_RESPONSE_STATS_ID_2));
+            expectedStatsForId2.get(TEST_APP3_PKG).incrementBroadcastsDispatchedCount(1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            mUsageStatsManager.clearBroadcastEvents();
+            // Trigger a notification from test-pkg4 and verify notification-posted count gets
+            // incremented.
+            testReceiver4.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver4.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            sendBroadcastAndWaitForReceipt(intent4, options2.toBundle());
+            expectedStatsForId2.put(TEST_APP4_PKG, new BroadcastResponseStats(TEST_APP4_PKG,
+                    TEST_RESPONSE_STATS_ID_2));
+            expectedStatsForId2.get(TEST_APP4_PKG).incrementBroadcastsDispatchedCount(1);
+
+            testReceiver3.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver3.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+            testReceiver4.cancelNotification(TEST_NOTIFICATION_ID_1);
+            expectedStatsForId2.get(TEST_APP4_PKG).incrementNotificationsCancelledCount(1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            mUsageStatsManager.clearBroadcastResponseStats(null, TEST_RESPONSE_STATS_ID_1);
+            expectedStatsForId1.clear();
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            testReceiver1.cancelAll();
+            testReceiver3.cancelAll();
+            testReceiver4.cancelAll();
+        } finally {
+            connection1.unbind();
+            connection3.unbind();
+            connection4.unbind();
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastResponseStats_clearCounts_multiplePackages() throws Exception {
+        final ArrayMap<String, BroadcastResponseStats> expectedStatsForId1 = new ArrayMap<>();
+        final ArrayMap<String, BroadcastResponseStats> expectedStatsForId2 = new ArrayMap<>();
+        // Initially all the counts should be empty
+        assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+        assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+        final TestServiceConnection connection1 = bindToTestServiceAndGetConnection(TEST_APP_PKG);
+        final TestServiceConnection connection3 = bindToTestServiceAndGetConnection(TEST_APP3_PKG);
+        try {
+            ITestReceiver testReceiver1 = connection1.getITestReceiver();
+            ITestReceiver testReceiver3 = connection3.getITestReceiver();
+
+            testReceiver1.cancelAll();
+            testReceiver3.cancelAll();
+
+            final Intent intent = new Intent().setComponent(new ComponentName(
+                    TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            final Intent intent3 = new Intent().setComponent(new ComponentName(
+                    TEST_APP3_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            final BroadcastOptions options1 = BroadcastOptions.makeBasic();
+            options1.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+            final BroadcastOptions options2 = BroadcastOptions.makeBasic();
+            options2.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_2);
+
+            testReceiver1.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver3.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+
+            // Send a broadcast to test-pkg1 with a request to record response and verify
+            // broadcast-sent count gets incremented.
+            sendBroadcastAndWaitForReceipt(intent, options1.toBundle());
+            sendBroadcastAndWaitForReceipt(intent3, options1.toBundle());
+
+            testReceiver1.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+            testReceiver3.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            expectedStatsForId1.put(TEST_APP_PKG, new BroadcastResponseStats(TEST_APP_PKG,
+                    TEST_RESPONSE_STATS_ID_1));
+            expectedStatsForId1.put(TEST_APP3_PKG, new BroadcastResponseStats(TEST_APP3_PKG,
+                    TEST_RESPONSE_STATS_ID_1));
+            expectedStatsForId1.get(TEST_APP_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId1.get(TEST_APP_PKG).incrementNotificationsPostedCount(1);
+            expectedStatsForId1.get(TEST_APP3_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId1.get(TEST_APP3_PKG).incrementNotificationsPostedCount(1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            sendBroadcastAndWaitForReceipt(intent, options1.toBundle());
+            sendBroadcastAndWaitForReceipt(intent3, options2.toBundle());
+
+            testReceiver1.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_2));
+            testReceiver3.cancelNotification(TEST_NOTIFICATION_ID_1);
+
+            expectedStatsForId1.get(TEST_APP_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId1.get(TEST_APP_PKG).incrementNotificationsUpdatedCount(1);
+            expectedStatsForId2.put(TEST_APP3_PKG, new BroadcastResponseStats(TEST_APP3_PKG,
+                    TEST_RESPONSE_STATS_ID_2));
+            expectedStatsForId2.get(TEST_APP3_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId2.get(TEST_APP3_PKG).incrementNotificationsCancelledCount(1);
+
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            mUsageStatsManager.clearBroadcastResponseStats(null /* packageName */,
+                    TEST_RESPONSE_STATS_ID_1);
+            expectedStatsForId1.clear();
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            mUsageStatsManager.clearBroadcastResponseStats(null /* packageName */,
+                    TEST_RESPONSE_STATS_ID_2);
+            expectedStatsForId2.clear();
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            testReceiver1.cancelAll();
+            testReceiver3.cancelAll();
+        } finally {
+            connection1.unbind();
+            connection3.unbind();
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastResponseStats_clearCounts_multipleIds() throws Exception {
+        final ArrayMap<String, BroadcastResponseStats> expectedStatsForId1 = new ArrayMap<>();
+        final ArrayMap<String, BroadcastResponseStats> expectedStatsForId2 = new ArrayMap<>();
+        // Initially all the counts should be empty
+        assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+        assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+        final TestServiceConnection connection1 = bindToTestServiceAndGetConnection(TEST_APP_PKG);
+        final TestServiceConnection connection3 = bindToTestServiceAndGetConnection(TEST_APP3_PKG);
+        try {
+            ITestReceiver testReceiver1 = connection1.getITestReceiver();
+            ITestReceiver testReceiver3 = connection3.getITestReceiver();
+
+            testReceiver1.cancelAll();
+            testReceiver3.cancelAll();
+
+            final Intent intent = new Intent().setComponent(new ComponentName(
+                    TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            final Intent intent3 = new Intent().setComponent(new ComponentName(
+                    TEST_APP3_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            final BroadcastOptions options1 = BroadcastOptions.makeBasic();
+            options1.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+            final BroadcastOptions options2 = BroadcastOptions.makeBasic();
+            options2.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_2);
+
+            testReceiver1.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver3.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+
+            // Send a broadcast to test-pkg1 with a request to record response and verify
+            // broadcast-sent count gets incremented.
+            sendBroadcastAndWaitForReceipt(intent, options1.toBundle());
+            sendBroadcastAndWaitForReceipt(intent3, options1.toBundle());
+
+            testReceiver1.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+            testReceiver3.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            expectedStatsForId1.put(TEST_APP_PKG, new BroadcastResponseStats(TEST_APP_PKG,
+                    TEST_RESPONSE_STATS_ID_1));
+            expectedStatsForId1.put(TEST_APP3_PKG, new BroadcastResponseStats(TEST_APP3_PKG,
+                    TEST_RESPONSE_STATS_ID_1));
+            expectedStatsForId1.get(TEST_APP_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId1.get(TEST_APP_PKG).incrementNotificationsPostedCount(1);
+            expectedStatsForId1.get(TEST_APP3_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId1.get(TEST_APP3_PKG).incrementNotificationsPostedCount(1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            sendBroadcastAndWaitForReceipt(intent, options1.toBundle());
+            sendBroadcastAndWaitForReceipt(intent3, options2.toBundle());
+
+            testReceiver1.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_2));
+            testReceiver3.cancelNotification(TEST_NOTIFICATION_ID_1);
+
+            expectedStatsForId1.get(TEST_APP_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId1.get(TEST_APP_PKG).incrementNotificationsUpdatedCount(1);
+            expectedStatsForId2.put(TEST_APP3_PKG, new BroadcastResponseStats(TEST_APP3_PKG,
+                    TEST_RESPONSE_STATS_ID_2));
+            expectedStatsForId2.get(TEST_APP3_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId2.get(TEST_APP3_PKG).incrementNotificationsCancelledCount(1);
+
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            mUsageStatsManager.clearBroadcastResponseStats(TEST_APP_PKG, 0 /* id */);
+            expectedStatsForId1.remove(TEST_APP_PKG);
+            expectedStatsForId2.remove(TEST_APP_PKG);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            mUsageStatsManager.clearBroadcastResponseStats(TEST_APP3_PKG, 0 /* id */);
+            expectedStatsForId1.remove(TEST_APP3_PKG);
+            expectedStatsForId2.remove(TEST_APP3_PKG);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            testReceiver1.cancelAll();
+            testReceiver3.cancelAll();
+        } finally {
+            connection1.unbind();
+            connection3.unbind();
+        }
+    }
+
+    @AppModeFull(reason = "No broadcast message response stats in instant apps")
+    @Test
+    public void testBroadcastResponseStats_clearAllCounts() throws Exception {
+        final ArrayMap<String, BroadcastResponseStats> expectedStatsForId1 = new ArrayMap<>();
+        final ArrayMap<String, BroadcastResponseStats> expectedStatsForId2 = new ArrayMap<>();
+        // Initially all the counts should be empty
+        assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+        assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+        final TestServiceConnection connection1 = bindToTestServiceAndGetConnection(TEST_APP_PKG);
+        final TestServiceConnection connection3 = bindToTestServiceAndGetConnection(TEST_APP3_PKG);
+        try {
+            ITestReceiver testReceiver1 = connection1.getITestReceiver();
+            ITestReceiver testReceiver3 = connection3.getITestReceiver();
+
+            testReceiver1.cancelAll();
+            testReceiver3.cancelAll();
+
+            final Intent intent = new Intent().setComponent(new ComponentName(
+                    TEST_APP_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            final Intent intent3 = new Intent().setComponent(new ComponentName(
+                    TEST_APP3_PKG, TEST_APP_CLASS_BROADCAST_RECEIVER));
+            final BroadcastOptions options1 = BroadcastOptions.makeBasic();
+            options1.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_1);
+            final BroadcastOptions options2 = BroadcastOptions.makeBasic();
+            options2.recordResponseEventWhileInBackground(TEST_RESPONSE_STATS_ID_2);
+
+            testReceiver1.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+            testReceiver3.createNotificationChannel(TEST_NOTIFICATION_CHANNEL_ID,
+                    TEST_NOTIFICATION_CHANNEL_NAME,
+                    TEST_NOTIFICATION_CHANNEL_DESC);
+
+            // Send a broadcast to test-pkg1 with a request to record response and verify
+            // broadcast-sent count gets incremented.
+            sendBroadcastAndWaitForReceipt(intent, options1.toBundle());
+            sendBroadcastAndWaitForReceipt(intent3, options1.toBundle());
+
+            testReceiver1.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+            testReceiver3.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_1));
+
+            expectedStatsForId1.put(TEST_APP_PKG, new BroadcastResponseStats(TEST_APP_PKG,
+                    TEST_RESPONSE_STATS_ID_1));
+            expectedStatsForId1.put(TEST_APP3_PKG, new BroadcastResponseStats(TEST_APP3_PKG,
+                    TEST_RESPONSE_STATS_ID_1));
+            expectedStatsForId1.get(TEST_APP_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId1.get(TEST_APP_PKG).incrementNotificationsPostedCount(1);
+            expectedStatsForId1.get(TEST_APP3_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId1.get(TEST_APP3_PKG).incrementNotificationsPostedCount(1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            sendBroadcastAndWaitForReceipt(intent, options1.toBundle());
+            sendBroadcastAndWaitForReceipt(intent3, options2.toBundle());
+
+            testReceiver1.postNotification(TEST_NOTIFICATION_ID_1,
+                    buildNotification(TEST_NOTIFICATION_CHANNEL_ID, TEST_NOTIFICATION_ID_1,
+                            TEST_NOTIFICATION_TEXT_2));
+            testReceiver3.cancelNotification(TEST_NOTIFICATION_ID_1);
+
+            expectedStatsForId1.get(TEST_APP_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId1.get(TEST_APP_PKG).incrementNotificationsUpdatedCount(1);
+            expectedStatsForId2.put(TEST_APP3_PKG, new BroadcastResponseStats(TEST_APP3_PKG,
+                    TEST_RESPONSE_STATS_ID_2));
+            expectedStatsForId2.get(TEST_APP3_PKG).incrementBroadcastsDispatchedCount(1);
+            expectedStatsForId2.get(TEST_APP3_PKG).incrementNotificationsCancelledCount(1);
+
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            mUsageStatsManager.clearBroadcastResponseStats(null /* packageName */, 0 /* id */);
+            expectedStatsForId1.clear();
+            expectedStatsForId2.clear();
+            assertResponseStats(TEST_RESPONSE_STATS_ID_1, expectedStatsForId1);
+            assertResponseStats(TEST_RESPONSE_STATS_ID_2, expectedStatsForId2);
+
+            testReceiver1.cancelAll();
+            testReceiver3.cancelAll();
+        } finally {
+            connection1.unbind();
+            connection3.unbind();
+        }
+    }
+
+    private void updateFlagWithDelay(DeviceConfigStateHelper deviceConfigStateHelper,
+            String key, String value) {
+        deviceConfigStateHelper.set(key, value);
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            final String actualValue = PollingCheck.waitFor(DEFAULT_TIMEOUT_MS,
+                    () -> mUsageStatsManager.getAppStandbyConstant(key),
+                    result -> value.equals(result));
+            assertEquals("Error changing the value of " + key, value, actualValue);
+        });
+    }
+
+    private Notification buildNotification(String channelId, int notificationId,
+            String notificationText) {
+        return new Notification.Builder(mContext, channelId)
+                .setSmallIcon(android.R.drawable.ic_info)
+                .setContentTitle(String.format(TEST_NOTIFICATION_TITLE_FMT, notificationId))
+                .setContentText(notificationText)
+                .build();
+    }
+
+    private void sendBroadcastAndWaitForReceipt(Intent intent, Bundle options)
+            throws Exception {
+        final CountDownLatch latch = new CountDownLatch(1);
+        intent.putExtra(EXTRA_REMOTE_CALLBACK, new RemoteCallback(result -> latch.countDown()));
+        mContext.sendBroadcast(intent, null /* receiverPermission */, options);
+        if (!latch.await(DEFAULT_TIMEOUT_MS, TimeUnit.SECONDS)) {
+            fail("Timed out waiting for the test app to receive the broadcast");
+        }
+    }
+
+    private void assertResponseStats(String packageName, long id, int... expectedCounts) {
+        final BroadcastResponseStats expectedStats = new BroadcastResponseStats(packageName, id);
+        expectedStats.incrementBroadcastsDispatchedCount(expectedCounts[0]);
+        expectedStats.incrementNotificationsPostedCount(expectedCounts[1]);
+        expectedStats.incrementNotificationsUpdatedCount(expectedCounts[2]);
+        expectedStats.incrementNotificationsCancelledCount(expectedCounts[3]);
+        assertResponseStats(packageName, id, expectedStats);
+    }
+
+    private void assertResponseStats(String packageName, long id,
+            BroadcastResponseStats expectedStats) {
+        List<BroadcastResponseStats> actualStats = mUsageStatsManager
+                .queryBroadcastResponseStats(packageName, id);
+        if (compareStats(expectedStats, actualStats)) {
+            SystemClock.sleep(WAIT_TIME_FOR_NEGATIVE_TESTS_MS);
+        }
+
+        actualStats = PollingCheck.waitFor(DEFAULT_TIMEOUT_MS,
+                () -> mUsageStatsManager.queryBroadcastResponseStats(packageName, id),
+                result -> compareStats(expectedStats, result));
+        actualStats.sort(Comparator.comparing(BroadcastResponseStats::getPackageName));
+        final String errorMsg = String.format("\nEXPECTED(%d)=%s\nACTUAL(%d)=%s\n",
+                1, expectedStats,
+                actualStats.size(), Arrays.toString(actualStats.toArray()));
+        assertTrue(errorMsg, compareStats(expectedStats, actualStats));
+    }
+
+    private void assertResponseStats(long id,
+            ArrayMap<String, BroadcastResponseStats> expectedStats) {
+        // TODO: Call into the above assertResponseStats() method instead of duplicating
+        // the logic.
+        List<BroadcastResponseStats> actualStats = mUsageStatsManager
+                .queryBroadcastResponseStats(null /* packageName */, id);
+        if (compareStats(expectedStats, actualStats)) {
+            SystemClock.sleep(WAIT_TIME_FOR_NEGATIVE_TESTS_MS);
+        }
+
+        actualStats = PollingCheck.waitFor(DEFAULT_TIMEOUT_MS,
+                () -> mUsageStatsManager.queryBroadcastResponseStats(null /* packageName */, id),
+                result -> compareStats(expectedStats, result));
+        actualStats.sort(Comparator.comparing(BroadcastResponseStats::getPackageName));
+        final String errorMsg = String.format("\nEXPECTED(%d)=%s\nACTUAL(%d)=%s\n",
+                expectedStats.size(), expectedStats,
+                actualStats.size(), Arrays.toString(actualStats.toArray()));
+        assertTrue(errorMsg, compareStats(expectedStats, actualStats));
+    }
+
+    private boolean compareStats(ArrayMap<String, BroadcastResponseStats> expectedStats,
+            List<BroadcastResponseStats> actualStats) {
+        if (expectedStats.size() != actualStats.size()) {
+            return false;
+        }
+        for (int i = 0; i < actualStats.size(); ++i) {
+            final BroadcastResponseStats actualPackageStats = actualStats.get(i);
+            final String packageName = actualPackageStats.getPackageName();
+            if (!actualPackageStats.equals(expectedStats.get(packageName))) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    private boolean compareStats(BroadcastResponseStats expectedStats,
+            List<BroadcastResponseStats> actualStats) {
+        if (actualStats.size() > 1) {
+            return false;
+        }
+        final BroadcastResponseStats stats = (actualStats == null || actualStats.isEmpty())
+                ? new BroadcastResponseStats(expectedStats.getPackageName(), expectedStats.getId())
+                : actualStats.get(0);
+        return expectedStats.equals(stats);
+    }
+
+    @AppModeFull(reason = "No usage events access in instant apps")
     @Test
     public void testNotificationInterruptionEventsObfuscation() throws Exception {
         final long startTime = System.currentTimeMillis();
 
-        // Skip the test for wearable devices and televisions; neither has a notification shade.
+        // Skip the test for wearable devices and televisions; none of them have a
+        // notification shade.
         assumeFalse("Test cannot run on a watch- notification shade is not shown",
                 mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH));
         assumeFalse("Test cannot run on a television- notifications are not shown",
@@ -1011,6 +2686,28 @@
         }
     }
 
+    @Test
+    public void testSetEstimatedLaunchTime_NotUsableByShell() {
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            try {
+                mUsageStatsManager.setEstimatedLaunchTimeMillis(TEST_APP_PKG,
+                        System.currentTimeMillis() + 1000);
+                fail("Shell was able to set an app's estimated launch time");
+            } catch (SecurityException expected) {
+                // Success
+            }
+
+            try {
+                Map<String, Long> estimatedLaunchTime = new ArrayMap<>();
+                estimatedLaunchTime.put(TEST_APP_PKG, System.currentTimeMillis() + 10_000);
+                mUsageStatsManager.setEstimatedLaunchTimesMillis(estimatedLaunchTime);
+                fail("Shell was able to set an app's estimated launch time");
+            } catch (SecurityException expected) {
+                // Success
+            }
+        }, Manifest.permission.CHANGE_APP_LAUNCH_TIME_ESTIMATE);
+    }
+
     private static final int[] INTERACTIVE_EVENTS = new int[] {
             Event.SCREEN_INTERACTIVE,
             Event.SCREEN_NON_INTERACTIVE
@@ -1099,16 +2796,19 @@
         return events;
     }
 
-    private void waitUntil(BooleanSupplier condition, boolean expected) throws Exception {
-        final long sleepTimeMs = 500;
-        final int count = 10;
-        for (int i = 0; i < count; ++i) {
-            if (condition.getAsBoolean() == expected) {
-                return;
-            }
-            Thread.sleep(sleepTimeMs);
-        }
-        fail("Condition wasn't satisfied after " + (sleepTimeMs * count) + "ms");
+    private <T> void waitUntil(Supplier<T> resultSupplier, T expectedResult) {
+        final T actualResult = PollingCheck.waitFor(DEFAULT_TIMEOUT_MS, resultSupplier,
+                result -> Objects.equals(expectedResult, result));
+        assertEquals(expectedResult, actualResult);
+    }
+
+    private <T> void waitUntil(Supplier<T> resultSupplier, Function<T, Boolean> condition,
+            String conditionDesc) {
+        final T actualResult = PollingCheck.waitFor(DEFAULT_TIMEOUT_MS, resultSupplier,
+                condition);
+        Log.d(TAG, "Expecting '" + conditionDesc + "'; actual result=" + actualResult);
+        assertTrue("Timed out waiting for '" + conditionDesc + "', actual=" + actualResult,
+                condition.apply(actualResult));
     }
 
     static class AggrEventData {
@@ -1832,11 +3532,21 @@
     }
 
     private ITestReceiver bindToTestService() throws Exception {
+        final TestServiceConnection connection = bindToTestServiceAndGetConnection();
+        return connection.getITestReceiver();
+    }
+
+    private TestServiceConnection bindToTestServiceAndGetConnection(String packageName)
+            throws Exception {
         final TestServiceConnection connection = new TestServiceConnection();
         final Intent intent = new Intent().setComponent(
-                new ComponentName(TEST_APP_PKG, TEST_APP_CLASS_SERVICE));
+                new ComponentName(packageName, TEST_APP_CLASS_SERVICE));
         mContext.bindService(intent, connection, Context.BIND_AUTO_CREATE);
-        return ITestReceiver.Stub.asInterface(connection.getService());
+        return connection;
+    }
+
+    private TestServiceConnection bindToTestServiceAndGetConnection() throws Exception {
+        return bindToTestServiceAndGetConnection(TEST_APP_PKG);
     }
 
     /**
@@ -1900,6 +3610,14 @@
                     TimeUnit.SECONDS);
             return service;
         }
+
+        public ITestReceiver getITestReceiver() throws Exception {
+            return ITestReceiver.Stub.asInterface(getService());
+        }
+
+        public void unbind() {
+            mContext.unbindService(this);
+        }
     }
 
     private void runJobImmediately() throws Exception {
diff --git a/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTestRunner.java b/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTestRunner.java
new file mode 100644
index 0000000..090d19c
--- /dev/null
+++ b/tests/tests/app.usage/src/android/app/usage/cts/UsageStatsTestRunner.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2022 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 android.app.usage.cts;
+
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
+
+import org.junit.rules.RunRules;
+import org.junit.rules.TestRule;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.junit.runners.model.Statement;
+
+import java.util.List;
+
+/**
+ * Custom runner to allow dumping logs after a test failure before the @After methods get to run.
+ */
+public class UsageStatsTestRunner extends AndroidJUnit4ClassRunner {
+    private TestRule mDumpOnFailureRule = new DumpOnFailureRule();
+
+    public UsageStatsTestRunner(Class<?> klass) throws InitializationError {
+        super(klass);
+    }
+
+    @Override
+    public Statement methodInvoker(FrameworkMethod method, Object test) {
+        return new RunRules(super.methodInvoker(method, test), List.of(mDumpOnFailureRule),
+                describeChild(method));
+    }
+}
diff --git a/tests/tests/app/Android.bp b/tests/tests/app/Android.bp
index 3c9e5bf..927a7fc 100644
--- a/tests/tests/app/Android.bp
+++ b/tests/tests/app/Android.bp
@@ -25,9 +25,12 @@
         "android.test.base",
     ],
     static_libs: [
+        "compatibility-device-util-axt",
         "ctstestrunner-axt",
+        "androidx.test.ext.junit",
         "androidx.test.rules",
         "junit",
+        "mockito-target-minus-junit4",
     ],
     srcs: ["src/**/*.java"],
     // Tag this module as a cts test artifact
diff --git a/tests/tests/app/src/android/app/cts/KeyguardWeakEscrowTokenTest.java b/tests/tests/app/src/android/app/cts/KeyguardWeakEscrowTokenTest.java
new file mode 100644
index 0000000..20b52f4
--- /dev/null
+++ b/tests/tests/app/src/android/app/cts/KeyguardWeakEscrowTokenTest.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright (C) 2022 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 android.app.cts;
+
+import static android.Manifest.permission.MANAGE_WEAK_ESCROW_TOKEN;
+import static android.os.Process.myUserHandle;
+
+import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
+import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+import android.app.KeyguardManager;
+import android.app.KeyguardManager.WeakEscrowTokenActivatedListener;
+import android.app.KeyguardManager.WeakEscrowTokenRemovedListener;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.Executor;
+
+@RunWith(AndroidJUnit4.class)
+public class KeyguardWeakEscrowTokenTest {
+    private static final String TEST_PIN1 = "1234";
+    private static final String TEST_PIN2 = "4321";
+
+    private final byte[] mTestToken1 = "test_token1".getBytes(StandardCharsets.UTF_8);
+    private final byte[] mTestToken2 = "test_token2".getBytes(StandardCharsets.UTF_8);
+    private final Executor mTestExecutor = Runnable::run;
+
+    private Context mContext;
+    private UserHandle mTestUser;
+    private KeyguardManager mKeyguardManager;
+    private WeakEscrowTokenActivatedListener mMockTokenActivatedListener;
+    private WeakEscrowTokenRemovedListener mMockTokenRemovedListener;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getInstrumentation().getContext();
+        mKeyguardManager = mContext.getSystemService(KeyguardManager.class);
+        mTestUser = myUserHandle();
+        mMockTokenActivatedListener = mock(WeakEscrowTokenActivatedListener.class);
+        mMockTokenRemovedListener = mock(WeakEscrowTokenRemovedListener.class);
+    }
+
+    @After
+    public void cleanUp() throws IOException {
+        if (!isAutomotiveDevice() || mKeyguardManager == null) return;
+        runWithShellPermissionIdentity(() -> {
+            try {
+                mKeyguardManager
+                        .unregisterWeakEscrowTokenRemovedListener(mMockTokenRemovedListener);
+            } catch (IllegalArgumentException e) {
+                // Mock listener was not registered before.
+            }
+        }, MANAGE_WEAK_ESCROW_TOKEN);
+        removeLockCredential(TEST_PIN1);
+        removeLockCredential(TEST_PIN2);
+    }
+
+    @Test
+    public void testAddWeakEscrowToken_noCredentialSetUp_tokenActivatedImmediately() {
+        assumeIsAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+
+        runWithShellPermissionIdentity(() -> {
+            long handle = mKeyguardManager.addWeakEscrowToken(mTestToken1, mTestUser, mTestExecutor,
+                    mMockTokenActivatedListener);
+            boolean isActive = mKeyguardManager.isWeakEscrowTokenActive(handle, mTestUser);
+            boolean isValid = mKeyguardManager.isWeakEscrowTokenValid(handle, mTestToken1,
+                    mTestUser);
+
+            assertThat(isActive).isTrue();
+            assertThat(isValid).isTrue();
+            verify(mMockTokenActivatedListener).onWeakEscrowTokenActivated(eq(handle),
+                    eq(mTestUser));
+
+            // Clean up
+            mKeyguardManager.removeWeakEscrowToken(handle, mTestUser);
+        }, MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    @Test
+    public void testAddWeakEscrowToken_hasCredentialSetUp_tokenActivatedAfterVerification() {
+        assumeIsAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+
+        runWithShellPermissionIdentity(() -> {
+            setLockCredential(TEST_PIN1);
+            long handle = mKeyguardManager.addWeakEscrowToken(mTestToken1, mTestUser, mTestExecutor,
+                    mMockTokenActivatedListener);
+            boolean isActiveBeforeVerification = mKeyguardManager.isWeakEscrowTokenActive(handle,
+                    mTestUser);
+            verifyCredential(TEST_PIN1);
+            boolean isActiveAfterVerification = mKeyguardManager.isWeakEscrowTokenActive(handle,
+                    mTestUser);
+
+            assertThat(isActiveBeforeVerification).isFalse();
+            assertThat(isActiveAfterVerification).isTrue();
+
+            // Clean up
+            mKeyguardManager.removeWeakEscrowToken(handle, mTestUser);
+        }, MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    @Test
+    public void testRemoveWeakEscrowToken_tokenRemoved() {
+        assumeIsAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+
+        runWithShellPermissionIdentity(() -> {
+            long handle = mKeyguardManager.addWeakEscrowToken(mTestToken1, mTestUser, mTestExecutor,
+                    mMockTokenActivatedListener);
+            boolean isActiveBeforeRemove = mKeyguardManager.isWeakEscrowTokenActive(handle,
+                    mTestUser);
+            mKeyguardManager.removeWeakEscrowToken(handle, mTestUser);
+            boolean isActiveAfterRemove = mKeyguardManager.isWeakEscrowTokenActive(handle,
+                    mTestUser);
+
+            assertThat(isActiveBeforeRemove).isTrue();
+            assertThat(isActiveAfterRemove).isFalse();
+        }, MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    @Test
+    public void testRegisterWeakEscrowTokenRemovedListener_listenerRegistered() {
+        assumeIsAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+
+        runWithShellPermissionIdentity(() -> {
+            mKeyguardManager.registerWeakEscrowTokenRemovedListener(mTestExecutor,
+                    mMockTokenRemovedListener);
+            long handle = mKeyguardManager.addWeakEscrowToken(mTestToken1, mTestUser,
+                    mTestExecutor, mMockTokenActivatedListener);
+            mKeyguardManager.removeWeakEscrowToken(handle, mTestUser);
+
+            verify(mMockTokenRemovedListener).onWeakEscrowTokenRemoved(eq(handle), eq(mTestUser));
+        }, MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    @Test
+    public void testUnregisterWeakEscrowTokenRemovedListener_listenerUnregistered() {
+        assumeIsAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+
+        runWithShellPermissionIdentity(() -> {
+            mKeyguardManager.registerWeakEscrowTokenRemovedListener(mTestExecutor,
+                    mMockTokenRemovedListener);
+            long handle0 = mKeyguardManager.addWeakEscrowToken(mTestToken1, mTestUser,
+                    mTestExecutor, mMockTokenActivatedListener);
+            long handle1 = mKeyguardManager.addWeakEscrowToken(mTestToken2, mTestUser,
+                    mTestExecutor, mMockTokenActivatedListener);
+            mKeyguardManager.removeWeakEscrowToken(handle0, mTestUser);
+            mKeyguardManager.unregisterWeakEscrowTokenRemovedListener(mMockTokenRemovedListener);
+            mKeyguardManager.removeWeakEscrowToken(handle1, mTestUser);
+
+            verify(mMockTokenRemovedListener).onWeakEscrowTokenRemoved(eq(handle0), eq(mTestUser));
+            verify(mMockTokenRemovedListener, never()).onWeakEscrowTokenRemoved(eq(handle1),
+                    eq(mTestUser));
+        }, MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    @Test
+    public void testWeakEscrowTokenRemovedWhenCredentialChanged() {
+        assumeIsAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+
+        runWithShellPermissionIdentity(() -> {
+            long handle = mKeyguardManager.addWeakEscrowToken(mTestToken1, mTestUser, mTestExecutor,
+                    mMockTokenActivatedListener);
+            setLockCredential(TEST_PIN1);
+            boolean isActiveBeforeCredentialChange = mKeyguardManager
+                    .isWeakEscrowTokenActive(handle, mTestUser);
+            updateLockCredential(TEST_PIN1, TEST_PIN2);
+            boolean isActiveAfterCredentialChange = mKeyguardManager.isWeakEscrowTokenActive(handle,
+                    mTestUser);
+
+            assertThat(isActiveBeforeCredentialChange).isTrue();
+            assertThat(isActiveAfterCredentialChange).isFalse();
+        }, MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    @Test
+    public void testAutoEscrowTokenRemovedWhenCredentialRemoved() {
+        assumeIsAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+
+        runWithShellPermissionIdentity(() -> {
+            long handle = mKeyguardManager.addWeakEscrowToken(mTestToken1, mTestUser, mTestExecutor,
+                    mMockTokenActivatedListener);
+            setLockCredential(TEST_PIN1);
+            boolean isActiveBeforeCredentialRemove = mKeyguardManager
+                    .isWeakEscrowTokenActive(handle, mTestUser);
+            removeLockCredential(TEST_PIN1);
+            boolean isActiveAfterCredentialRemove = mKeyguardManager.isWeakEscrowTokenActive(handle,
+                    mTestUser);
+
+            assertThat(isActiveBeforeCredentialRemove).isTrue();
+            assertThat(isActiveAfterCredentialRemove).isFalse();
+        }, MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    private void assumeIsAutomotiveDevice() {
+        assumeTrue("Test skipped because it's not running on automotive device.",
+                isAutomotiveDevice());
+    }
+
+    private boolean isAutomotiveDevice() {
+        return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
+    }
+
+    private void assumeKeyguardManagerAvailable() {
+        assumeFalse("Test skipped because KeyguardManager is not available.",
+                mKeyguardManager == null);
+    }
+
+    private static void removeLockCredential(String oldCredential) throws IOException {
+        runShellCommand(InstrumentationRegistry.getInstrumentation(), "locksettings clear --old "
+                + oldCredential);
+    }
+
+    private static void updateLockCredential(String oldCredential, String credential)
+            throws IOException {
+        runShellCommand(InstrumentationRegistry.getInstrumentation(),
+                String.format("locksettings set-pin --old %s %s", oldCredential, credential));
+    }
+
+    private static void setLockCredential(String credential) throws IOException {
+        runShellCommand(InstrumentationRegistry.getInstrumentation(), "locksettings set-pin "
+                + credential);
+    }
+
+    private static void verifyCredential(String credential) throws IOException {
+        runShellCommand(InstrumentationRegistry.getInstrumentation(), "locksettings verify --old "
+                + credential);
+    }
+}
diff --git a/tests/tests/app/src/android/app/cts/NoWeakEscrowTokenPermissionTest.java b/tests/tests/app/src/android/app/cts/NoWeakEscrowTokenPermissionTest.java
new file mode 100644
index 0000000..d4aad33
--- /dev/null
+++ b/tests/tests/app/src/android/app/cts/NoWeakEscrowTokenPermissionTest.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2022 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 android.app.cts;
+
+import static android.Manifest.permission.MANAGE_WEAK_ESCROW_TOKEN;
+
+import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
+
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
+import static org.mockito.Mockito.mock;
+
+import android.app.KeyguardManager;
+import android.app.KeyguardManager.WeakEscrowTokenActivatedListener;
+import android.app.KeyguardManager.WeakEscrowTokenRemovedListener;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.Executor;
+
+/**
+ * Verify the weak escrow token related operations require specific permission.
+ */
+@RunWith(AndroidJUnit4.class)
+public class NoWeakEscrowTokenPermissionTest {
+    private static final UserHandle TEST_USER = UserHandle.of(10);
+    private static final long TEST_HANDLE = 10L;
+
+    private final byte[] mTestToken = "test_token".getBytes(StandardCharsets.UTF_8);
+    private final Executor mTestExecutor = Runnable::run;
+
+    private Context mContext;
+    private KeyguardManager mKeyguardManager;
+    private WeakEscrowTokenActivatedListener mMockTokenActivatedListener;
+    private WeakEscrowTokenRemovedListener mMockTokenRemovedListener;
+
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getInstrumentation().getContext();
+        mKeyguardManager = mContext.getSystemService(KeyguardManager.class);
+        mMockTokenActivatedListener = mock(WeakEscrowTokenActivatedListener.class);
+        mMockTokenRemovedListener = mock(WeakEscrowTokenRemovedListener.class);
+    }
+
+    @After
+    public void cleanUp() {
+        if (!isAutomotiveDevice() || mKeyguardManager == null) return;
+        runWithShellPermissionIdentity(() -> {
+            try {
+                mKeyguardManager
+                        .unregisterWeakEscrowTokenRemovedListener(mMockTokenRemovedListener);
+            } catch (IllegalArgumentException e) {
+                // Mock listener was not registered before.
+            }
+        }, MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    @Test
+    public void testAddWeakEscrowToken() {
+        assumeKeyguardManagerAvailable();
+        assertThrows(SecurityException.class, () ->
+                mKeyguardManager.addWeakEscrowToken(mTestToken, TEST_USER, mTestExecutor,
+                        mMockTokenActivatedListener));
+    }
+
+    @Test
+    public void testRemoveWeakEscrowToken() {
+        assumeKeyguardManagerAvailable();
+        assertThrows(SecurityException.class, () ->
+                mKeyguardManager.addWeakEscrowToken(mTestToken, TEST_USER, mTestExecutor,
+                        mMockTokenActivatedListener));
+    }
+
+    @Test
+    public void testIsWeakEscrowTokenActive() {
+        assumeKeyguardManagerAvailable();
+        assertThrows(SecurityException.class, () ->
+                mKeyguardManager.isWeakEscrowTokenActive(TEST_HANDLE, TEST_USER));
+    }
+
+    @Test
+    public void testIsWeakEscrowTokenValid() {
+        assumeKeyguardManagerAvailable();
+        assertThrows(SecurityException.class, () ->
+                mKeyguardManager.isWeakEscrowTokenValid(TEST_HANDLE, mTestToken, TEST_USER));
+    }
+
+    @Test
+    public void testRegisterWeakEscrowTokenRemovedListener() {
+        assumeKeyguardManagerAvailable();
+        assertThrows(SecurityException.class, () ->
+                mKeyguardManager.registerWeakEscrowTokenRemovedListener(mTestExecutor,
+                        mMockTokenRemovedListener));
+    }
+
+    @Test
+    public void testUnregisterWeakEscrowTokenRemovedListener() {
+        assumeIsAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+        runWithShellPermissionIdentity(() -> {
+            mKeyguardManager.registerWeakEscrowTokenRemovedListener(mTestExecutor,
+                    mMockTokenRemovedListener);
+        }, MANAGE_WEAK_ESCROW_TOKEN);
+
+        assertThrows(SecurityException.class, () -> mKeyguardManager
+                .unregisterWeakEscrowTokenRemovedListener(mMockTokenRemovedListener));
+    }
+
+    private void assumeIsAutomotiveDevice() {
+        assumeTrue("Test skipped because it's not running on automotive device.",
+                isAutomotiveDevice());
+    }
+
+    private boolean isAutomotiveDevice() {
+        return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
+    }
+
+    private void assumeKeyguardManagerAvailable() {
+        assumeFalse("Test skipped because KeyguardManager is not available.",
+                mKeyguardManager == null);
+    }
+}
diff --git a/tests/tests/app/src/android/app/cts/PictureInPictureParamsBuilderTest.java b/tests/tests/app/src/android/app/cts/PictureInPictureParamsBuilderTest.java
index 4b12120..a99f176 100644
--- a/tests/tests/app/src/android/app/cts/PictureInPictureParamsBuilderTest.java
+++ b/tests/tests/app/src/android/app/cts/PictureInPictureParamsBuilderTest.java
@@ -16,6 +16,7 @@
 package android.app.cts;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
@@ -48,7 +49,7 @@
                 .setSourceRectHint(new Rect(0, 0, 100, 100));
 
         PictureInPictureParams params = builder.build();
-        assertTrue(Float.compare(0.5f, params.getAspectRatio()) == 0);
+        assertTrue(Float.compare(0.5f, params.getAspectRatioFloat()) == 0);
         assertTrue(params.getActions().isEmpty());
         assertEquals(new Rect(0, 0, 100, 100), params.getSourceRectHint());
 
@@ -58,8 +59,40 @@
                 .setSourceRectHint(null);
         params = builder.build();
 
-        assertTrue(Float.compare(0f, params.getAspectRatio()) == 0);
-        assertNull(params.getActions());
+        assertTrue(Float.compare(0f, params.getAspectRatioFloat()) == 0);
+        assertTrue(params.getActions().isEmpty());
         assertNull(params.getSourceRectHint());
     }
+
+    @Test
+    public void testBuilderDefaultCtor() {
+        // Construct the params with default Builder constructor
+        PictureInPictureParams params = new Builder().build();
+
+        // Ensures the PictureInPictureParams constructed has nothing being set
+        assertFalse(params.hasSetAspectRatio());
+        assertFalse(params.hasSetExpandedAspectRatio());
+        assertFalse(params.hasSetActions());
+        assertFalse(params.hasSetCloseAction());
+        assertFalse(params.hasSetTitle());
+        assertFalse(params.hasSetSubtitle());
+    }
+
+    @Test
+    public void testBuilderCopyCtor() {
+        // Construct a PictureInPictureParams with some parameters being set
+        PictureInPictureParams params = new Builder()
+                .setAspectRatio(new Rational(1, 2))
+                .setActions(new ArrayList<>())
+                .setSourceRectHint(new Rect(0, 0, 100, 100))
+                .build();
+
+        // Build a new PictureInPictureParams using the copy constructor
+        PictureInPictureParams newParams = new Builder(params).build();
+
+        // Ensures the two PictureInPictureParams share the same parameters
+        assertEquals(params.getAspectRatio(), newParams.getAspectRatio());
+        assertEquals(params.getActions(), params.getActions());
+        assertEquals(params.getSourceRectHint(), params.getSourceRectHint());
+    }
 }
diff --git a/tests/tests/app/src/android/app/cts/WeakEscrowTokenAutoFeatureTest.java b/tests/tests/app/src/android/app/cts/WeakEscrowTokenAutoFeatureTest.java
new file mode 100644
index 0000000..efbec4b
--- /dev/null
+++ b/tests/tests/app/src/android/app/cts/WeakEscrowTokenAutoFeatureTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2022 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 android.app.cts;
+
+import static android.Manifest.permission.MANAGE_WEAK_ESCROW_TOKEN;
+
+import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
+
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assume.assumeFalse;
+import static org.mockito.Mockito.mock;
+
+import android.app.KeyguardManager;
+import android.app.KeyguardManager.WeakEscrowTokenActivatedListener;
+import android.app.KeyguardManager.WeakEscrowTokenRemovedListener;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.Executor;
+
+@RunWith(AndroidJUnit4.class)
+public class WeakEscrowTokenAutoFeatureTest {
+    private static final UserHandle TEST_USER = UserHandle.of(10);
+    private static final long TEST_HANDLE = 10L;
+
+    private final byte[] mTestToken = "test_token".getBytes(StandardCharsets.UTF_8);
+    private final Executor mTestExecutor = Runnable::run;
+
+    private Context mContext;
+    private KeyguardManager mKeyguardManager;
+    private WeakEscrowTokenActivatedListener mMockTokenActivatedListener;
+    private WeakEscrowTokenRemovedListener mMockTokenRemovedListener;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getInstrumentation().getContext();
+        mKeyguardManager = mContext.getSystemService(KeyguardManager.class);
+        mMockTokenActivatedListener = mock(WeakEscrowTokenActivatedListener.class);
+        mMockTokenRemovedListener = mock(WeakEscrowTokenRemovedListener.class);
+    }
+
+    @Test
+    public void testAddWeakEscrowToken() {
+        assumeIsNotAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+        runWithShellPermissionIdentity(() ->
+                assertThrows(IllegalArgumentException.class, () ->
+                        mKeyguardManager.addWeakEscrowToken(mTestToken, TEST_USER, mTestExecutor,
+                                mMockTokenActivatedListener)),
+                MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    @Test
+    public void testRemoveWeakEscrowToken() {
+        assumeIsNotAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+        runWithShellPermissionIdentity(() ->
+                        assertThrows(IllegalArgumentException.class, () ->
+                                mKeyguardManager.removeWeakEscrowToken(TEST_HANDLE, TEST_USER)),
+                MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    @Test
+    public void testIsWeakEscrowTokenActive() {
+        assumeIsNotAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+        runWithShellPermissionIdentity(() ->
+                        assertThrows(IllegalArgumentException.class, () ->
+                                mKeyguardManager.isWeakEscrowTokenActive(TEST_HANDLE, TEST_USER)),
+                MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    @Test
+    public void testIsWeakEscrowTokenValid() {
+        assumeIsNotAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+        runWithShellPermissionIdentity(
+                () -> assertThrows(
+                        IllegalArgumentException.class,
+                        () -> mKeyguardManager.isWeakEscrowTokenValid(TEST_HANDLE, mTestToken,
+                                TEST_USER)),
+                MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    @Test
+    public void testRegisterWeakEscrowTokenRemovedListener() {
+        assumeIsNotAutomotiveDevice();
+        assumeKeyguardManagerAvailable();
+        runWithShellPermissionIdentity(
+                () -> assertThrows(
+                        IllegalArgumentException.class,
+                        () -> mKeyguardManager.registerWeakEscrowTokenRemovedListener(mTestExecutor,
+                                mMockTokenRemovedListener)),
+                MANAGE_WEAK_ESCROW_TOKEN);
+    }
+
+    private void assumeIsNotAutomotiveDevice() {
+        assumeFalse("Test skipped because it's running on automotive device.",
+                mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE));
+    }
+
+    private void assumeKeyguardManagerAvailable() {
+        assumeFalse("Test skipped because KeyguardManager is not available.",
+                mKeyguardManager == null);
+    }
+}
diff --git a/tests/tests/appenumeration/Android.bp b/tests/tests/appenumeration/Android.bp
index 5d510eb..cb6df44 100644
--- a/tests/tests/appenumeration/Android.bp
+++ b/tests/tests/appenumeration/Android.bp
@@ -30,6 +30,7 @@
 	    "androidx.test.ext.junit",
         "hamcrest-library",
 	    "CtsAppEnumerationTestLib",
+	    "cts-install-lib",
     ],
 
     srcs: ["src/**/*.java"],
diff --git a/tests/tests/appenumeration/AndroidManifest.xml b/tests/tests/appenumeration/AndroidManifest.xml
index 9018766..a71c273 100644
--- a/tests/tests/appenumeration/AndroidManifest.xml
+++ b/tests/tests/appenumeration/AndroidManifest.xml
@@ -17,9 +17,16 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.appenumeration.cts">
-
-    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
-
+    <!-- Use specific package names instead of QUERY_ALL_PACKAGES to let AppEnumerationTests
+         live with default visibility -->
+    <queries>
+        <package android:name="android.appenumeration.filters" />
+        <package android:name="android.appenumeration.noapi" />
+        <package android:name="android.appenumeration.noapi.shareduid" />
+        <package android:name="android.appenumeration.queries.activity.action" />
+        <package android:name="android.appenumeration.queries.nothing" />
+        <package android:name="android.appenumeration.stub" />
+    </queries>
     <application>
       <uses-library android:name="android.test.runner" />
     </application>
diff --git a/tests/tests/appenumeration/AndroidTest.xml b/tests/tests/appenumeration/AndroidTest.xml
index d73484d..f2cd10d 100644
--- a/tests/tests/appenumeration/AndroidTest.xml
+++ b/tests/tests/appenumeration/AndroidTest.xml
@@ -35,6 +35,7 @@
         <option name="test-file-name" value="CtsAppEnumerationDocumentsActivityTarget.apk" />
         <option name="test-file-name" value="CtsAppEnumerationShareActivityTarget.apk" />
         <option name="test-file-name" value="CtsAppEnumerationWebActivityTarget.apk" />
+        <option name="test-file-name" value="CtsAppEnumerationPrefixWildcardWebActivityTarget.apk" />
         <option name="test-file-name" value="CtsAppEnumerationBrowserActivityTarget.apk" />
         <option name="test-file-name" value="CtsAppEnumerationBrowserWildcardActivityTarget.apk" />
         <option name="test-file-name" value="CtsAppEnumerationSharedUidSource.apk" />
@@ -52,6 +53,7 @@
         <option name="test-file-name" value="CtsAppEnumerationQueriesUnexportedProviderViaAuthority.apk" />
         <option name="test-file-name" value="CtsAppEnumerationQueriesUnexportedProviderViaAction.apk" />
         <option name="test-file-name" value="CtsAppEnumerationQueriesPackage.apk" />
+        <option name="test-file-name" value="CtsAppEnumerationQueriesPackageHasProvider.apk" />
         <option name="test-file-name" value="CtsAppEnumerationQueriesNothingTargetsQ.apk" />
         <option name="test-file-name" value="CtsAppEnumerationQueriesNothingHasPermission.apk" />
         <option name="test-file-name" value="CtsAppEnumerationQueriesNothingUsesLibrary.apk" />
@@ -68,6 +70,8 @@
         <option name="test-file-name" value="CtsAppEnumerationAppWidgetProviderTarget.apk" />
         <option name="test-file-name" value="CtsAppEnumerationAppWidgetProviderSharedUidTarget.apk" />
         <option name="test-file-name" value="CtsAppEnumerationPreferredActivityTarget.apk" />
+        <option name="test-file-name" value="CtsAppEnumerationQueriesNothingReceivesPersistableUri.apk" />
+        <option name="test-file-name" value="CtsAppEnumerationQueriesNothingReceivesNonPersistableUri.apk" />
     </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
@@ -96,6 +100,8 @@
         <option name="push" value="CtsAppEnumerationStub.apk->/data/local/tmp/cts/appenumeration/CtsAppEnumerationStub.apk" />
         <option name="push" value="CtsAppEnumerationFilters.apk->/data/local/tmp/cts/appenumeration/CtsAppEnumerationFilters.apk" />
         <option name="push" value="CtsAppEnumerationQueriesNothingSeesInstaller.apk->/data/local/tmp/cts/appenumeration/CtsAppEnumerationQueriesNothingSeesInstaller.apk" />
+        <option name="push" value="CtsAppEnumerationQueriesNothingReceivesPersistableUri.apk->/data/local/tmp/cts/appenumeration/CtsAppEnumerationQueriesNothingReceivesPersistableUri.apk" />
+        <option name="push" value="CtsAppEnumerationQueriesNothingReceivesNonPersistableUri.apk->/data/local/tmp/cts/appenumeration/CtsAppEnumerationQueriesNothingReceivesNonPersistableUri.apk" />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
diff --git a/tests/tests/appenumeration/OWNERS b/tests/tests/appenumeration/OWNERS
index 8a44fb2..d1eff73 100644
--- a/tests/tests/appenumeration/OWNERS
+++ b/tests/tests/appenumeration/OWNERS
@@ -2,4 +2,4 @@
 patb@google.com
 toddke@google.com
 chiuwinson@google.com
-rtmitchell@google.com
+zyy@google.com
diff --git a/tests/tests/appenumeration/app/source/Android.bp b/tests/tests/appenumeration/app/source/Android.bp
index deee2f4..2f88d57 100644
--- a/tests/tests/appenumeration/app/source/Android.bp
+++ b/tests/tests/appenumeration/app/source/Android.bp
@@ -18,6 +18,7 @@
 
 java_defaults {
     name: "CtsAppEnumerationQueriesDefaults",
+    defaults: ["cts_support_defaults"],
     srcs: ["src/**/*.java"],
     static_libs: ["CtsAppEnumerationTestLib"],
     sdk_version: "test_current",
@@ -57,6 +58,28 @@
 }
 
 android_test_helper_app {
+    name: "CtsAppEnumerationQueriesNothingReceivesPersistableUri",
+    manifest: "AndroidManifest-queriesNothing-receivesPersistableUri.xml",
+    defaults: ["CtsAppEnumerationQueriesDefaults"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsAppEnumerationQueriesNothingReceivesNonPersistableUri",
+    manifest: "AndroidManifest-queriesNothing-receivesNonPersistableUri.xml",
+    defaults: ["CtsAppEnumerationQueriesDefaults"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
     name: "CtsAppEnumerationQueriesNothingSeesInstaller",
     manifest: "AndroidManifest-queriesNothing-seesInstaller.xml",
     defaults: ["CtsAppEnumerationQueriesDefaults"],
@@ -167,6 +190,17 @@
 }
 
 android_test_helper_app {
+    name: "CtsAppEnumerationQueriesPackageHasProvider",
+    manifest: "AndroidManifest-queriesPackage-hasProvider.xml",
+    defaults: ["CtsAppEnumerationQueriesDefaults"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
     name: "CtsAppEnumerationQueriesNothingTargetsQ",
     manifest: "AndroidManifest-queriesNothing-targetsQ.xml",
     defaults: ["CtsAppEnumerationQueriesDefaults"],
@@ -242,6 +276,7 @@
         "general-tests",
     ],
 }
+
 android_test_helper_app {
     name: "CtsAppEnumerationWildcardBrowsableActivitySource",
     manifest: "AndroidManifest-queriesWildcard-browsableActivity.xml",
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesActivityAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesActivityAction.xml
index 6641c9a..73bd8f3 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesActivityAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesActivityAction.xml
@@ -26,7 +26,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasPermission.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasPermission.xml
index 7e84769..5a8933e 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasPermission.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasPermission.xml
@@ -22,7 +22,7 @@
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
         <provider android:name="android.appenumeration.cts.query.TestProvider"
                   android:exported="true"
@@ -32,5 +32,9 @@
                   android:readPermission="android.appenumeration.queries.nothing.haspermission.READ"
                   android:grantUriPermissions="true"
                   android:authorities="android.appenumeration.queries.nothing.haspermission2" />
+        <provider android:name="android.appenumeration.cts.query.TestProvider"
+                  android:exported="false"
+                  android:grantUriPermissions="true"
+                  android:authorities="android.appenumeration.queries.nothing.haspermission3" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasProvider.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasProvider.xml
index d046e70..2cf2f6a 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasProvider.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-hasProvider.xml
@@ -19,7 +19,7 @@
     package="android.appenumeration.queries.nothing.hasprovider">
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
         <provider android:name="android.appenumeration.cts.query.TestProvider"
                   android:authorities="android.appenumeration.queries.nothing.hasprovider"
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesNonPersistableUri.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesNonPersistableUri.xml
new file mode 100644
index 0000000..9b64bf2
--- /dev/null
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesNonPersistableUri.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  - Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.appenumeration.queries.nothing.receives.nonpersistable.uri">
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
+    </application>
+</manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesPermissionProtectedUri.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesPermissionProtectedUri.xml
index da644a8..5512d23 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesPermissionProtectedUri.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesPermissionProtectedUri.xml
@@ -19,7 +19,7 @@
     package="android.appenumeration.queries.nothing.receives.perm.uri">
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesPersistableUri.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesPersistableUri.xml
new file mode 100644
index 0000000..420056d
--- /dev/null
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesPersistableUri.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  - Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.appenumeration.queries.nothing.receives.persistable.uri">
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
+    </application>
+</manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesUri.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesUri.xml
index 18ab7ef..8c7ffd7 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesUri.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-receivesUri.xml
@@ -19,7 +19,7 @@
     package="android.appenumeration.queries.nothing.receives.uri">
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-seesInstaller.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-seesInstaller.xml
index 1d5f0bc..bfc855f 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-seesInstaller.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-seesInstaller.xml
@@ -19,7 +19,7 @@
     package="android.appenumeration.queries.nothing.sees.installer">
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-sharedUser.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-sharedUser.xml
index 90db3e6..5f50b62 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-sharedUser.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-sharedUser.xml
@@ -20,7 +20,7 @@
           android:sharedUserId="android.appenumeration.shareduid">
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-targetsQ.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-targetsQ.xml
index 60a0c2d..638d9fa 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-targetsQ.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-targetsQ.xml
@@ -20,7 +20,7 @@
     <uses-sdk android:targetSdkVersion="29" />
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-usesLibrary.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-usesLibrary.xml
index 99edef0..3a7ef8a 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-usesLibrary.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-usesLibrary.xml
@@ -20,7 +20,7 @@
     <application>
         <uses-library android:name="android.test.runner" />
         <uses-library android:name="com.android.cts.ctsshim.shared_library" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-usesOptionalLibrary.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-usesOptionalLibrary.xml
index 87b7738..65dde1f 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-usesOptionalLibrary.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing-usesOptionalLibrary.xml
@@ -21,7 +21,7 @@
         <uses-library android:name="android.test.runner" />
         <uses-library android:name="com.android.cts.ctsshim.shared_library"
                       android:required="false" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing.xml
index e5e160a..3bda428 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesNothing.xml
@@ -19,7 +19,7 @@
     package="android.appenumeration.queries.nothing">
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesPackage-hasProvider.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesPackage-hasProvider.xml
new file mode 100644
index 0000000..2225d1f
--- /dev/null
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesPackage-hasProvider.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.appenumeration.queries.pkg.hasprovider">
+
+    <queries>
+        <package android:name="android.appenumeration.noapi" />
+    </queries>
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
+        <provider android:name="android.appenumeration.cts.query.TestProvider"
+                  android:authorities="android.appenumeration.queries.pkg.hasprovider"
+                  android:grantUriPermissions="true"
+                  android:exported="false" >
+        </provider>
+    </application>
+</manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesPackage.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesPackage.xml
index 4588f53..956fc04 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesPackage.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesPackage.xml
@@ -24,11 +24,12 @@
         <package android:name="android.appenumeration.syncadapter" />
         <package android:name="android.appenumeration.appwidgetprovider" />
         <package android:name="android.appenumeration.preferred.activity" />
+        <package android:name="com.android.cts.install.lib.testapp.A" />
     </queries>
 
     <application android:debuggable="true">
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAction.xml
index 2f1cf69..6d7567f 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAction.xml
@@ -26,7 +26,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAuthority.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAuthority.xml
index 7fb4191..9a17108 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAuthority.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesProviderAuthority.xml
@@ -24,7 +24,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesServiceAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesServiceAction.xml
index dab3e2e..78fd937 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesServiceAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesServiceAction.xml
@@ -26,7 +26,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedActivityAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedActivityAction.xml
index aabb703..a930b3c 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedActivityAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedActivityAction.xml
@@ -26,7 +26,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAction.xml
index 72dfa6b..40732bf 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAction.xml
@@ -26,7 +26,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAuthority.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAuthority.xml
index 09755f0..d92cfbd 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAuthority.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedProviderAuthority.xml
@@ -24,7 +24,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedServiceAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedServiceAction.xml
index d1fdd13..32b6d13 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedServiceAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesUnexportedServiceAction.xml
@@ -26,7 +26,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-browsableActivity.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-browsableActivity.xml
index b08cc12..823dcd0 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-browsableActivity.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-browsableActivity.xml
@@ -28,7 +28,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-browserActivity.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-browserActivity.xml
index b6f96aa..6230245 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-browserActivity.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-browserActivity.xml
@@ -33,7 +33,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-contactsActivity.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-contactsActivity.xml
index 80138c5..c3e754b 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-contactsActivity.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-contactsActivity.xml
@@ -29,7 +29,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-documentEditorActivity.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-documentEditorActivity.xml
index 0f7e971..48191b1 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-documentEditorActivity.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-documentEditorActivity.xml
@@ -28,7 +28,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-shareActivity.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-shareActivity.xml
index e9a051b..ceed8e9 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-shareActivity.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-shareActivity.xml
@@ -27,7 +27,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-webActivity.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-webActivity.xml
index 74412cc..9f0f2d2 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-webActivity.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcard-webActivity.xml
@@ -33,7 +33,7 @@
 
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcardAction.xml b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcardAction.xml
index 64e3af3..c538cc4 100644
--- a/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcardAction.xml
+++ b/tests/tests/appenumeration/app/source/AndroidManifest-queriesWildcardAction.xml
@@ -24,7 +24,7 @@
     </queries>
     <application>
         <uses-library android:name="android.test.runner" />
-        <activity android:name="android.appenumeration.cts.query.TestActivity"
+        <activity android:name="android.appenumeration.cts.TestActivity"
                   android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/source/src/android/appenumeration/cts/query/TestActivity.java b/tests/tests/appenumeration/app/source/src/android/appenumeration/cts/query/TestActivity.java
deleted file mode 100644
index bcbbc53..0000000
--- a/tests/tests/appenumeration/app/source/src/android/appenumeration/cts/query/TestActivity.java
+++ /dev/null
@@ -1,685 +0,0 @@
-/*
- * Copyright (C) 2019 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 android.appenumeration.cts.query;
-
-import static android.appenumeration.cts.Constants.ACTION_CHECK_SIGNATURES;
-import static android.appenumeration.cts.Constants.ACTION_GET_INSTALLED_PACKAGES;
-import static android.appenumeration.cts.Constants.ACTION_GET_NAMES_FOR_UIDS;
-import static android.appenumeration.cts.Constants.ACTION_GET_NAME_FOR_UID;
-import static android.appenumeration.cts.Constants.ACTION_GET_PACKAGES_FOR_UID;
-import static android.appenumeration.cts.Constants.ACTION_GET_PACKAGE_INFO;
-import static android.appenumeration.cts.Constants.ACTION_HAS_SIGNING_CERTIFICATE;
-import static android.appenumeration.cts.Constants.ACTION_JUST_FINISH;
-import static android.appenumeration.cts.Constants.ACTION_QUERY_ACTIVITIES;
-import static android.appenumeration.cts.Constants.ACTION_QUERY_PROVIDERS;
-import static android.appenumeration.cts.Constants.ACTION_QUERY_SERVICES;
-import static android.appenumeration.cts.Constants.ACTION_SEND_RESULT;
-import static android.appenumeration.cts.Constants.ACTION_START_DIRECTLY;
-import static android.appenumeration.cts.Constants.ACTION_START_FOR_RESULT;
-import static android.appenumeration.cts.Constants.ACTION_START_SENDER_FOR_RESULT;
-import static android.appenumeration.cts.Constants.CALLBACK_EVENT_INVALID;
-import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGES_AVAILABLE;
-import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGES_SUSPENDED;
-import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGES_UNAVAILABLE;
-import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGES_UNSUSPENDED;
-import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGE_ADDED;
-import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGE_CHANGED;
-import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGE_REMOVED;
-import static android.appenumeration.cts.Constants.EXTRA_AUTHORITY;
-import static android.appenumeration.cts.Constants.EXTRA_CERT;
-import static android.appenumeration.cts.Constants.EXTRA_DATA;
-import static android.appenumeration.cts.Constants.EXTRA_ERROR;
-import static android.appenumeration.cts.Constants.EXTRA_FLAGS;
-import static android.appenumeration.cts.Constants.EXTRA_REMOTE_CALLBACK;
-import static android.appenumeration.cts.Constants.EXTRA_REMOTE_READY_CALLBACK;
-import static android.content.Intent.EXTRA_COMPONENT_NAME;
-import static android.content.Intent.EXTRA_PACKAGES;
-import static android.content.Intent.EXTRA_RETURN_RESULT;
-import static android.content.pm.PackageManager.CERT_INPUT_RAW_X509;
-import static android.os.Process.INVALID_UID;
-
-import android.app.Activity;
-import android.app.PendingIntent;
-import android.appenumeration.cts.Constants;
-import android.appenumeration.cts.MissingBroadcastException;
-import android.appwidget.AppWidgetManager;
-import android.appwidget.AppWidgetProviderInfo;
-import android.content.ActivityNotFoundException;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.IntentSender;
-import android.content.ServiceConnection;
-import android.content.SyncAdapterType;
-import android.content.pm.LauncherApps;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.SharedLibraryInfo;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.os.IBinder;
-import android.os.Parcelable;
-import android.os.PatternMatcher;
-import android.os.Process;
-import android.os.RemoteCallback;
-import android.os.UserHandle;
-import android.util.SparseArray;
-import android.view.accessibility.AccessibilityManager;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class TestActivity extends Activity {
-
-    private final static long TIMEOUT_MS = 3000;
-
-    /**
-     * Extending the timeout time of non broadcast receivers, avoid not
-     * receiving callbacks in time on some common low-end platforms and
-     * do not affect the situation that callback can be received in advance.
-     */
-    private final static long EXTENDED_TIMEOUT_MS = 5000;
-
-    SparseArray<RemoteCallback> callbacks = new SparseArray<>();
-
-    private Handler mainHandler;
-    private Handler backgroundHandler;
-    private HandlerThread backgroundThread;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        mainHandler = new Handler(getMainLooper());
-        backgroundThread = new HandlerThread("testBackground");
-        backgroundThread.start();
-        backgroundHandler = new Handler(backgroundThread.getLooper());
-        super.onCreate(savedInstanceState);
-        handleIntent(getIntent());
-        onCommandReady(getIntent());
-    }
-
-    @Override
-    protected void onDestroy() {
-        backgroundThread.quitSafely();
-        super.onDestroy();
-    }
-
-    private void handleIntent(Intent intent) {
-        RemoteCallback remoteCallback = intent.getParcelableExtra(EXTRA_REMOTE_CALLBACK);
-        try {
-            final String action = intent.getAction();
-            final Intent queryIntent = intent.getParcelableExtra(Intent.EXTRA_INTENT);
-            if (ACTION_GET_PACKAGE_INFO.equals(action)) {
-                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
-                sendPackageInfo(remoteCallback, packageName);
-            } else if (ACTION_GET_PACKAGES_FOR_UID.equals(action)) {
-                final int uid = intent.getIntExtra(Intent.EXTRA_UID, INVALID_UID);
-                sendPackagesForUid(remoteCallback, uid);
-            } else if (ACTION_GET_NAME_FOR_UID.equals(action)) {
-                final int uid = intent.getIntExtra(Intent.EXTRA_UID, INVALID_UID);
-                sendNameForUid(remoteCallback, uid);
-            } else if (ACTION_GET_NAMES_FOR_UIDS.equals(action)) {
-                final int uid = intent.getIntExtra(Intent.EXTRA_UID, INVALID_UID);
-                sendNamesForUids(remoteCallback, uid);
-            } else if (ACTION_CHECK_SIGNATURES.equals(action)) {
-                final int uid1 = getPackageManager().getApplicationInfo(
-                        getPackageName(), /* flags */ 0).uid;
-                final int uid2 = intent.getIntExtra(Intent.EXTRA_UID, INVALID_UID);
-                sendCheckSignatures(remoteCallback, uid1, uid2);
-            } else if (ACTION_HAS_SIGNING_CERTIFICATE.equals(action)) {
-                final int uid = intent.getIntExtra(Intent.EXTRA_UID, INVALID_UID);
-                final byte[] cert = intent.getBundleExtra(EXTRA_DATA).getByteArray(EXTRA_CERT);
-                sendHasSigningCertificate(remoteCallback, uid, cert, CERT_INPUT_RAW_X509);
-            } else if (ACTION_START_FOR_RESULT.equals(action)) {
-                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
-                int requestCode = RESULT_FIRST_USER + callbacks.size();
-                callbacks.put(requestCode, remoteCallback);
-                startActivityForResult(
-                        new Intent(ACTION_SEND_RESULT).setComponent(
-                                new ComponentName(packageName, getClass().getCanonicalName())),
-                        requestCode);
-                // don't send anything... await result callback
-            } else if (ACTION_SEND_RESULT.equals(action)) {
-                try {
-                    setResult(RESULT_OK,
-                            getIntent().putExtra(
-                                    Intent.EXTRA_RETURN_RESULT,
-                                    getPackageManager().getPackageInfo(getCallingPackage(), 0)));
-                } catch (PackageManager.NameNotFoundException e) {
-                    setResult(RESULT_FIRST_USER, new Intent().putExtra("error", e));
-                }
-                finish();
-            } else if (ACTION_QUERY_ACTIVITIES.equals(action)) {
-                sendQueryIntentActivities(remoteCallback, queryIntent);
-            } else if (ACTION_QUERY_SERVICES.equals(action)) {
-                sendQueryIntentServices(remoteCallback, queryIntent);
-            } else if (ACTION_QUERY_PROVIDERS.equals(action)) {
-                sendQueryIntentProviders(remoteCallback, queryIntent);
-            } else if (ACTION_START_DIRECTLY.equals(action)) {
-                try {
-                    startActivity(queryIntent);
-                    remoteCallback.sendResult(new Bundle());
-                } catch (ActivityNotFoundException e) {
-                    sendError(remoteCallback, e);
-                }
-                finish();
-            } else if (ACTION_JUST_FINISH.equals(action)) {
-                finish();
-            } else if (ACTION_GET_INSTALLED_PACKAGES.equals(action)) {
-                sendGetInstalledPackages(remoteCallback, queryIntent.getIntExtra(EXTRA_FLAGS, 0));
-            } else if (ACTION_START_SENDER_FOR_RESULT.equals(action)) {
-                PendingIntent pendingIntent = intent.getParcelableExtra("pendingIntent");
-                int requestCode = RESULT_FIRST_USER + callbacks.size();
-                callbacks.put(requestCode, remoteCallback);
-                try {
-                    startIntentSenderForResult(pendingIntent.getIntentSender(), requestCode, null,
-                            0, 0, 0);
-                } catch (IntentSender.SendIntentException e) {
-                    sendError(remoteCallback, e);
-                }
-            } else if (Constants.ACTION_AWAIT_PACKAGE_REMOVED.equals(action)) {
-                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
-                awaitPackageBroadcast(
-                        remoteCallback, packageName, Intent.ACTION_PACKAGE_REMOVED, TIMEOUT_MS);
-            } else if (Constants.ACTION_AWAIT_PACKAGE_ADDED.equals(action)) {
-                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
-                awaitPackageBroadcast(
-                        remoteCallback, packageName, Intent.ACTION_PACKAGE_ADDED, TIMEOUT_MS);
-            } else if (Constants.ACTION_QUERY_RESOLVER.equals(action)) {
-                final String authority = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
-                queryResolverForVisiblePackages(remoteCallback, authority);
-            } else if (Constants.ACTION_BIND_SERVICE.equals(action)) {
-                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
-                bindService(remoteCallback, packageName);
-            } else if (Constants.ACTION_GET_SYNCADAPTER_TYPES.equals(action)) {
-                sendSyncAdapterTypes(remoteCallback);
-            } else if (Constants.ACTION_GET_INSTALLED_APPWIDGET_PROVIDERS.equals(action)) {
-                sendInstalledAppWidgetProviders(remoteCallback);
-            } else if (Constants.ACTION_AWAIT_PACKAGES_SUSPENDED.equals(action)) {
-                final String[] awaitPackages = intent.getBundleExtra(EXTRA_DATA)
-                        .getStringArray(EXTRA_PACKAGES);
-                awaitSuspendedPackagesBroadcast(remoteCallback, Arrays.asList(awaitPackages),
-                        Intent.ACTION_PACKAGES_SUSPENDED, TIMEOUT_MS);
-            } else if (Constants.ACTION_LAUNCHER_APPS_IS_ACTIVITY_ENABLED.equals(action)) {
-                final String componentName = intent.getBundleExtra(EXTRA_DATA)
-                        .getString(EXTRA_COMPONENT_NAME);
-                sendIsActivityEnabled(remoteCallback, ComponentName.unflattenFromString(
-                        componentName));
-            } else if (Constants.ACTION_GET_SYNCADAPTER_PACKAGES_FOR_AUTHORITY.equals(action)) {
-                final String authority = intent.getBundleExtra(EXTRA_DATA)
-                        .getString(EXTRA_AUTHORITY);
-                final int userId = intent.getBundleExtra(EXTRA_DATA)
-                        .getInt(Intent.EXTRA_USER);
-                sendSyncAdapterPackagesForAuthorityAsUser(remoteCallback, authority, userId);
-            } else if (Constants.ACTION_AWAIT_LAUNCHER_APPS_CALLBACK.equals(action)) {
-                final int expectedEventCode = intent.getBundleExtra(EXTRA_DATA)
-                        .getInt(EXTRA_FLAGS, CALLBACK_EVENT_INVALID);
-                awaitLauncherAppsCallback(remoteCallback, expectedEventCode, EXTENDED_TIMEOUT_MS);
-            } else if (Constants.ACTION_GET_SHAREDLIBRARY_DEPENDENT_PACKAGES.equals(action)) {
-                final String sharedLibName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
-                sendGetSharedLibraryDependentPackages(remoteCallback, sharedLibName);
-            } else if (Constants.ACTION_GET_PREFERRED_ACTIVITIES.equals(action)) {
-                sendGetPreferredActivities(remoteCallback);
-            } else if (Constants.ACTION_SET_INSTALLER_PACKAGE_NAME.equals(action)) {
-                final String targetPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
-                final String installerPackageName = intent.getBundleExtra(EXTRA_DATA)
-                        .getString(Intent.EXTRA_INSTALLER_PACKAGE_NAME);
-                sendSetInstallerPackageName(remoteCallback, targetPackageName,
-                        installerPackageName);
-            } else if (Constants.ACTION_GET_INSTALLED_ACCESSIBILITYSERVICES_PACKAGES.equals(
-                    action)) {
-                sendGetInstalledAccessibilityServicePackages(remoteCallback);
-            } else {
-                sendError(remoteCallback, new Exception("unknown action " + action));
-            }
-        } catch (Exception e) {
-            sendError(remoteCallback, e);
-        }
-    }
-
-    private void sendGetInstalledAccessibilityServicePackages(RemoteCallback remoteCallback) {
-        final String[] packages = getSystemService(
-                AccessibilityManager.class).getInstalledAccessibilityServiceList().stream().map(
-                p -> p.getComponentName().getPackageName()).distinct().toArray(String[]::new);
-        final Bundle result = new Bundle();
-        result.putStringArray(EXTRA_RETURN_RESULT, packages);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void onCommandReady(Intent intent) {
-        final RemoteCallback callback = intent.getParcelableExtra(EXTRA_REMOTE_READY_CALLBACK);
-        if (callback != null) {
-            callback.sendResult(null);
-        }
-    }
-
-    private void awaitPackageBroadcast(RemoteCallback remoteCallback, String packageName,
-            String action, long timeoutMs) {
-        final IntentFilter filter = new IntentFilter(action);
-        filter.addDataScheme("package");
-        filter.addDataSchemeSpecificPart(packageName, PatternMatcher.PATTERN_LITERAL);
-        final Object token = new Object();
-        registerReceiver(new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                final Bundle result = new Bundle();
-                result.putString(EXTRA_DATA, intent.getDataString());
-                remoteCallback.sendResult(result);
-                mainHandler.removeCallbacksAndMessages(token);
-                finish();
-            }
-        }, filter);
-        mainHandler.postDelayed(
-                () -> sendError(remoteCallback,
-                        new MissingBroadcastException(action, timeoutMs)),
-                token, timeoutMs);
-    }
-
-    private void awaitSuspendedPackagesBroadcast(RemoteCallback remoteCallback,
-            List<String> awaitList, String action, long timeoutMs) {
-        final IntentFilter filter = new IntentFilter(action);
-        final ArrayList<String> suspendedList = new ArrayList<>();
-        final Object token = new Object();
-        final Runnable sendResult = () -> {
-            final Bundle result = new Bundle();
-            result.putStringArray(EXTRA_PACKAGES, suspendedList.toArray(new String[] {}));
-            remoteCallback.sendResult(result);
-            finish();
-        };
-        registerReceiver(new BroadcastReceiver() {
-            @Override
-            public void onReceive(Context context, Intent intent) {
-                final Bundle extras = intent.getExtras();
-                final String[] changedList = extras.getStringArray(
-                        Intent.EXTRA_CHANGED_PACKAGE_LIST);
-                suspendedList.addAll(Arrays.stream(changedList).filter(
-                        p -> awaitList.contains(p)).collect(Collectors.toList()));
-                if (suspendedList.size() == awaitList.size()) {
-                    mainHandler.removeCallbacksAndMessages(token);
-                    sendResult.run();
-                }
-            }
-        }, filter);
-        mainHandler.postDelayed(() -> sendResult.run(), token, timeoutMs);
-    }
-
-    private void awaitLauncherAppsCallback(RemoteCallback remoteCallback, int expectedEventCode,
-            long timeoutMs) {
-        final Object token = new Object();
-        final Bundle result = new Bundle();
-        final LauncherApps launcherApps = getSystemService(LauncherApps.class);
-        final LauncherApps.Callback launcherAppsCallback = new LauncherApps.Callback() {
-
-            private void onPackageStateUpdated(String[] packageNames, int resultCode) {
-                if (resultCode != expectedEventCode) {
-                    return;
-                }
-
-                mainHandler.removeCallbacksAndMessages(token);
-                result.putStringArray(EXTRA_PACKAGES, packageNames);
-                result.putInt(EXTRA_FLAGS, resultCode);
-                remoteCallback.sendResult(result);
-
-                launcherApps.unregisterCallback(this);
-                finish();
-            }
-
-            @Override
-            public void onPackageRemoved(String packageName, UserHandle user) {
-                onPackageStateUpdated(new String[]{packageName}, CALLBACK_EVENT_PACKAGE_REMOVED);
-            }
-
-            @Override
-            public void onPackageAdded(String packageName, UserHandle user) {
-                onPackageStateUpdated(new String[]{packageName}, CALLBACK_EVENT_PACKAGE_ADDED);
-            }
-
-            @Override
-            public void onPackageChanged(String packageName, UserHandle user) {
-                onPackageStateUpdated(new String[]{packageName}, CALLBACK_EVENT_PACKAGE_CHANGED);
-            }
-
-            @Override
-            public void onPackagesAvailable(String[] packageNames, UserHandle user,
-                    boolean replacing) {
-                onPackageStateUpdated(packageNames, CALLBACK_EVENT_PACKAGES_AVAILABLE);
-            }
-
-            @Override
-            public void onPackagesUnavailable(String[] packageNames, UserHandle user,
-                    boolean replacing) {
-                onPackageStateUpdated(packageNames, CALLBACK_EVENT_PACKAGES_UNAVAILABLE);
-            }
-
-            @Override
-            public void onPackagesSuspended(String[] packageNames, UserHandle user) {
-                onPackageStateUpdated(packageNames, CALLBACK_EVENT_PACKAGES_SUSPENDED);
-                super.onPackagesSuspended(packageNames, user);
-            }
-
-            @Override
-            public void onPackagesUnsuspended(String[] packageNames, UserHandle user) {
-                onPackageStateUpdated(packageNames, CALLBACK_EVENT_PACKAGES_UNSUSPENDED);
-                super.onPackagesUnsuspended(packageNames, user);
-            }
-        };
-
-        launcherApps.registerCallback(launcherAppsCallback);
-
-        mainHandler.postDelayed(() -> {
-            result.putStringArray(EXTRA_PACKAGES, new String[]{});
-            result.putInt(EXTRA_FLAGS, CALLBACK_EVENT_INVALID);
-            remoteCallback.sendResult(result);
-
-            launcherApps.unregisterCallback(launcherAppsCallback);
-            finish();
-        }, token, timeoutMs);
-    }
-
-    private void sendGetInstalledPackages(RemoteCallback remoteCallback, int flags) {
-        String[] packages =
-                getPackageManager().getInstalledPackages(flags)
-                        .stream().map(p -> p.packageName).distinct().toArray(String[]::new);
-        Bundle result = new Bundle();
-        result.putStringArray(EXTRA_RETURN_RESULT, packages);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendQueryIntentActivities(RemoteCallback remoteCallback, Intent queryIntent) {
-        final String[] resolveInfos = getPackageManager().queryIntentActivities(
-                queryIntent, 0 /* flags */).stream()
-                .map(ri -> ri.activityInfo.applicationInfo.packageName)
-                .distinct()
-                .toArray(String[]::new);
-        Bundle result = new Bundle();
-        result.putStringArray(EXTRA_RETURN_RESULT, resolveInfos);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendQueryIntentServices(RemoteCallback remoteCallback, Intent queryIntent) {
-        final String[] resolveInfos = getPackageManager().queryIntentServices(
-                queryIntent, 0 /* flags */).stream()
-                .map(ri -> ri.serviceInfo.applicationInfo.packageName)
-                .distinct()
-                .toArray(String[]::new);
-        Bundle result = new Bundle();
-        result.putStringArray(EXTRA_RETURN_RESULT, resolveInfos);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendQueryIntentProviders(RemoteCallback remoteCallback, Intent queryIntent) {
-        final String[] resolveInfos = getPackageManager().queryIntentContentProviders(
-                queryIntent, 0 /* flags */).stream()
-                .map(ri -> ri.providerInfo.applicationInfo.packageName)
-                .distinct()
-                .toArray(String[]::new);
-        Bundle result = new Bundle();
-        result.putStringArray(EXTRA_RETURN_RESULT, resolveInfos);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void queryResolverForVisiblePackages(RemoteCallback remoteCallback, String authority) {
-        backgroundHandler.post(() -> {
-            Uri queryUri = Uri.parse("content://" + authority + "/test");
-            Cursor query = getContentResolver().query(queryUri, null, null, null, null);
-            if (query == null || !query.moveToFirst()) {
-                sendError(remoteCallback,
-                        new IllegalStateException(
-                                "Query of " + queryUri + " could not be completed"));
-                return;
-            }
-            ArrayList<String> visiblePackages = new ArrayList<>();
-            while (!query.isAfterLast()) {
-                visiblePackages.add(query.getString(0));
-                query.moveToNext();
-            }
-            query.close();
-
-            mainHandler.post(() -> {
-                Bundle result = new Bundle();
-                result.putStringArray(EXTRA_RETURN_RESULT, visiblePackages.toArray(new String[]{}));
-                remoteCallback.sendResult(result);
-                finish();
-            });
-
-        });
-    }
-
-    private void sendError(RemoteCallback remoteCallback, Exception failure) {
-        Bundle result = new Bundle();
-        result.putSerializable(EXTRA_ERROR, failure);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendPackageInfo(RemoteCallback remoteCallback, String packageName) {
-        final PackageInfo pi;
-        try {
-            pi = getPackageManager().getPackageInfo(packageName, 0);
-        } catch (PackageManager.NameNotFoundException e) {
-            sendError(remoteCallback, e);
-            return;
-        }
-        Bundle result = new Bundle();
-        result.putParcelable(EXTRA_RETURN_RESULT, pi);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendPackagesForUid(RemoteCallback remoteCallback, int uid) {
-        final String[] packages = getPackageManager().getPackagesForUid(uid);
-        final Bundle result = new Bundle();
-        result.putStringArray(EXTRA_RETURN_RESULT, packages);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendNameForUid(RemoteCallback remoteCallback, int uid) {
-        final String name = getPackageManager().getNameForUid(uid);
-        final Bundle result = new Bundle();
-        result.putString(EXTRA_RETURN_RESULT, name);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendNamesForUids(RemoteCallback remoteCallback, int uid) {
-        final String[] names = getPackageManager().getNamesForUids(new int[]{uid});
-        final Bundle result = new Bundle();
-        result.putStringArray(EXTRA_RETURN_RESULT, names);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendCheckSignatures(RemoteCallback remoteCallback, int uid1, int uid2) {
-        final int signatureResult = getPackageManager().checkSignatures(uid1, uid2);
-        final Bundle result = new Bundle();
-        result.putInt(EXTRA_RETURN_RESULT, signatureResult);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendHasSigningCertificate(RemoteCallback remoteCallback, int uid, byte[] cert,
-            int type) {
-        final boolean signatureResult = getPackageManager().hasSigningCertificate(uid, cert, type);
-        final Bundle result = new Bundle();
-        result.putBoolean(EXTRA_RETURN_RESULT, signatureResult);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    /**
-     * Instead of sending a list of package names, this function sends a List of
-     * {@link SyncAdapterType}, since the {@link SyncAdapterType#getPackageName()} is a test api
-     * which can only be invoked in the instrumentation.
-     */
-    private void sendSyncAdapterTypes(RemoteCallback remoteCallback) {
-        final SyncAdapterType[] types = ContentResolver.getSyncAdapterTypes();
-        final ArrayList<Parcelable> parcelables = new ArrayList<>();
-        for (SyncAdapterType type : types) {
-            parcelables.add(type);
-        }
-        final Bundle result = new Bundle();
-        result.putParcelableArrayList(EXTRA_RETURN_RESULT, parcelables);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendIsActivityEnabled(RemoteCallback remoteCallback, ComponentName componentName) {
-        final LauncherApps launcherApps = getSystemService(LauncherApps.class);
-        final Bundle result = new Bundle();
-        try {
-            result.putBoolean(EXTRA_RETURN_RESULT, launcherApps.isActivityEnabled(componentName,
-                    Process.myUserHandle()));
-        } catch (IllegalArgumentException e) {
-        }
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendInstalledAppWidgetProviders(RemoteCallback remoteCallback) {
-        final AppWidgetManager appWidgetManager = getSystemService(AppWidgetManager.class);
-        final List<AppWidgetProviderInfo> providers = appWidgetManager.getInstalledProviders();
-        final ArrayList<Parcelable> parcelables = new ArrayList<>();
-        for (AppWidgetProviderInfo info : providers) {
-            parcelables.add(info);
-        }
-        final Bundle result = new Bundle();
-        result.putParcelableArrayList(EXTRA_RETURN_RESULT, parcelables);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendSyncAdapterPackagesForAuthorityAsUser(RemoteCallback remoteCallback,
-            String authority, int userId) {
-        final String[] syncAdapterPackages = ContentResolver
-                .getSyncAdapterPackagesForAuthorityAsUser(authority, userId);
-        final Bundle result = new Bundle();
-        result.putStringArray(Intent.EXTRA_PACKAGES, syncAdapterPackages);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendGetSharedLibraryDependentPackages(RemoteCallback remoteCallback,
-            String sharedLibName) {
-        final List<SharedLibraryInfo> sharedLibraryInfos = getPackageManager()
-                .getSharedLibraries(0 /* flags */);
-        SharedLibraryInfo sharedLibraryInfo = sharedLibraryInfos.stream().filter(
-                info -> sharedLibName.equals(info.getName())).findAny().orElse(null);
-        final String[] dependentPackages = sharedLibraryInfo == null ? null
-                : sharedLibraryInfo.getDependentPackages().stream()
-                        .map(versionedPackage -> versionedPackage.getPackageName())
-                        .distinct().collect(Collectors.toList()).toArray(new String[]{});
-        final Bundle result = new Bundle();
-        result.putStringArray(Intent.EXTRA_PACKAGES, dependentPackages);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendGetPreferredActivities(RemoteCallback remoteCallback) {
-        final List<IntentFilter> filters = new ArrayList<>();
-        final List<ComponentName> activities = new ArrayList<>();
-        getPackageManager().getPreferredActivities(filters, activities, null /* packageName*/);
-        final String[] packages = activities.stream()
-                .map(componentName -> componentName.getPackageName()).distinct()
-                .collect(Collectors.toList()).toArray(new String[]{});
-        final Bundle result = new Bundle();
-        result.putStringArray(Intent.EXTRA_PACKAGES, packages);
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void sendSetInstallerPackageName(RemoteCallback remoteCallback,
-            String targetPackageName, String installerPackageName) {
-        try {
-            getPackageManager().setInstallerPackageName(targetPackageName, installerPackageName);
-            remoteCallback.sendResult(null);
-            finish();
-        } catch (Exception e) {
-            sendError(remoteCallback, e);
-        }
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        final RemoteCallback remoteCallback = callbacks.get(requestCode);
-        if (resultCode != RESULT_OK) {
-            Exception e = (Exception) data.getSerializableExtra(EXTRA_ERROR);
-            sendError(remoteCallback, e == null ? new Exception("Result was " + resultCode) : e);
-            return;
-        }
-        final Bundle result = new Bundle();
-        result.putParcelable(EXTRA_RETURN_RESULT, data.getParcelableExtra(EXTRA_RETURN_RESULT));
-        remoteCallback.sendResult(result);
-        finish();
-    }
-
-    private void bindService(RemoteCallback remoteCallback, String packageName) {
-        final String SERVICE_NAME = "android.appenumeration.testapp.DummyService";
-        final Intent intent = new Intent();
-        intent.setClassName(packageName, SERVICE_NAME);
-        final ServiceConnection serviceConnection = new ServiceConnection() {
-            @Override
-            public void onServiceConnected(ComponentName className, IBinder service) {
-                // No-op
-            }
-
-            @Override
-            public void onServiceDisconnected(ComponentName className) {
-                // No-op
-            }
-
-            @Override
-            public void onBindingDied(ComponentName name) {
-                // Remote service die
-                finish();
-            }
-
-            @Override
-            public void onNullBinding(ComponentName name) {
-                // Since the DummyService doesn't implement onBind, it returns null and
-                // onNullBinding would be called. Use postDelayed to keep this service
-                // connection alive for 3 seconds.
-                mainHandler.postDelayed(() -> {
-                    unbindService(this);
-                    finish();
-                }, TIMEOUT_MS);
-            }
-        };
-
-        final boolean bound = bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
-        final Bundle result = new Bundle();
-        result.putBoolean(EXTRA_RETURN_RESULT, bound);
-        remoteCallback.sendResult(result);
-        // Don't invoke finish() right here if service is bound successfully to keep the service
-        // connection alive since the ServiceRecord would be remove from the ServiceMap once no
-        // client is binding the service.
-        if (!bound) finish();
-    }
-}
diff --git a/tests/tests/appenumeration/app/target/Android.bp b/tests/tests/appenumeration/app/target/Android.bp
index d3d8bd2..8b81354 100644
--- a/tests/tests/appenumeration/app/target/Android.bp
+++ b/tests/tests/appenumeration/app/target/Android.bp
@@ -16,228 +16,209 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+java_defaults {
+    name: "CtsAppEnumerationTargetDefaults",
+    defaults: ["cts_support_defaults"],
+    srcs: ["src/**/*.java"],
+    resource_dirs: ["res"],
+    static_libs: ["CtsAppEnumerationTestLib"],
+    sdk_version: "test_current",
+}
+
 android_test_helper_app {
     name: "CtsAppEnumerationForceQueryable",
     manifest: "AndroidManifest-forceQueryable.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationForceQueryableNormalInstall",
     manifest: "AndroidManifest-forceQueryable-normalInstall.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationFilters",
     manifest: "AndroidManifest-filters.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationNoApi",
     manifest: "AndroidManifest-noapi.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationStub",
     manifest: "AndroidManifest-stub.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationSharedUidTarget",
     manifest: "AndroidManifest-noapi-sharedUser.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationContactsActivityTarget",
     manifest: "AndroidManifest-contactsActivity.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationDocumentsActivityTarget",
     manifest: "AndroidManifest-documentEditorActivity.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationShareActivityTarget",
     manifest: "AndroidManifest-shareActivity.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationWebActivityTarget",
     manifest: "AndroidManifest-webActivity.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
+}
+
+android_test_helper_app {
+    name: "CtsAppEnumerationPrefixWildcardWebActivityTarget",
+    manifest: "AndroidManifest-prefixWildcardWebActivity.xml",
+    defaults: ["CtsAppEnumerationTargetDefaults"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationBrowserActivityTarget",
     manifest: "AndroidManifest-browserActivity.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationBrowserWildcardActivityTarget",
     manifest: "AndroidManifest-browserWildcardActivity.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationSyncadapterTarget",
     manifest: "AndroidManifest-syncadapter.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
-    resource_dirs: ["res"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationSyncadapterSharedUidTarget",
     manifest: "AndroidManifest-syncadapter-sharedUser.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
-    resource_dirs: ["res"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationAppWidgetProviderTarget",
     manifest: "AndroidManifest-appWidgetProvider.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
-    resource_dirs: ["res"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationAppWidgetProviderSharedUidTarget",
     manifest: "AndroidManifest-appWidgetProvider-sharedUser.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
-    resource_dirs: ["res"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
 }
 
 android_test_helper_app {
     name: "CtsAppEnumerationPreferredActivityTarget",
     manifest: "AndroidManifest-preferredActivity.xml",
-    defaults: ["cts_support_defaults"],
-    srcs: ["src/**/*.java"],
-    resource_dirs: ["res"],
+    defaults: ["CtsAppEnumerationTargetDefaults"],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
     ],
-    sdk_version: "test_current",
-}
\ No newline at end of file
+}
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-appWidgetProvider-sharedUser.xml b/tests/tests/appenumeration/app/target/AndroidManifest-appWidgetProvider-sharedUser.xml
index 153894c..0f91979 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-appWidgetProvider-sharedUser.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-appWidgetProvider-sharedUser.xml
@@ -20,6 +20,8 @@
           android:sharedUserId="android.appenumeration.shareduid">
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
 
         <receiver android:name="android.appenumeration.MockAppWidgetProvider"
                   android:exported="true">
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-appWidgetProvider.xml b/tests/tests/appenumeration/app/target/AndroidManifest-appWidgetProvider.xml
index 836acda..100f821 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-appWidgetProvider.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-appWidgetProvider.xml
@@ -19,6 +19,8 @@
     package="android.appenumeration.appwidgetprovider">
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
 
         <receiver android:name="android.appenumeration.MockAppWidgetProvider"
                  android:exported="true">
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-browserActivity.xml b/tests/tests/appenumeration/app/target/AndroidManifest-browserActivity.xml
index f4aecba..8a0cf23 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-browserActivity.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-browserActivity.xml
@@ -19,6 +19,8 @@
     package="android.appenumeration.browser.activity">
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
         <activity android:name="android.appenumeration.WebBrowser"
             android:exported="true">
             <intent-filter>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-browserWildcardActivity.xml b/tests/tests/appenumeration/app/target/AndroidManifest-browserWildcardActivity.xml
index 97b0d9b..c165ba8 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-browserWildcardActivity.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-browserWildcardActivity.xml
@@ -19,6 +19,8 @@
     package="android.appenumeration.browser.wildcard.activity">
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
         <activity android:name="android.appenumeration.WebBrowser"
             android:exported="true">
             <intent-filter>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-contactsActivity.xml b/tests/tests/appenumeration/app/target/AndroidManifest-contactsActivity.xml
index 0bff9cc..fdd9081 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-contactsActivity.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-contactsActivity.xml
@@ -19,6 +19,8 @@
     package="android.appenumeration.contacts.activity">
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
         <activity android:name="android.appenumeration.ContactsActivity"
                   android:exported="true">
             <intent-filter>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-documentEditorActivity.xml b/tests/tests/appenumeration/app/target/AndroidManifest-documentEditorActivity.xml
index 6795cf7..011f59b 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-documentEditorActivity.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-documentEditorActivity.xml
@@ -19,6 +19,8 @@
      package="android.appenumeration.editor.activity">
     <application>
         <uses-library android:name="android.test.runner"/>
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
         <activity android:name="android.appenumeration.EditorActivity"
              android:exported="true">
             <intent-filter>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-filters.xml b/tests/tests/appenumeration/app/target/AndroidManifest-filters.xml
index eeb3170..9f89655 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-filters.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-filters.xml
@@ -19,6 +19,8 @@
      package="android.appenumeration.filters">
     <application>
         <uses-library android:name="android.test.runner"/>
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
         <activity android:name="android.appenumeration.testapp.DummyActivity"
              android:visibleToInstantApps="true"
              android:exported="true">
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-forceQueryable-normalInstall.xml b/tests/tests/appenumeration/app/target/AndroidManifest-forceQueryable-normalInstall.xml
index 2918e37..178b6fa 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-forceQueryable-normalInstall.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-forceQueryable-normalInstall.xml
@@ -21,5 +21,7 @@
         <!-- This app will not be a system app and should be installed as a normal app (not
              forceQueryable) to ensure it's not visible by default -->
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-forceQueryable.xml b/tests/tests/appenumeration/app/target/AndroidManifest-forceQueryable.xml
index 3778b04..e835b52 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-forceQueryable.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-forceQueryable.xml
@@ -21,5 +21,7 @@
         <!-- This app will not be a system app and so must be installed as forceQueryable by the
              test framework -->
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-noapi-sharedUser.xml b/tests/tests/appenumeration/app/target/AndroidManifest-noapi-sharedUser.xml
index 3b5be22..6630f68 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-noapi-sharedUser.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-noapi-sharedUser.xml
@@ -20,5 +20,7 @@
           android:sharedUserId="android.appenumeration.shareduid">
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-noapi.xml b/tests/tests/appenumeration/app/target/AndroidManifest-noapi.xml
index fc2835e..ced7705 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-noapi.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-noapi.xml
@@ -19,5 +19,7 @@
     package="android.appenumeration.noapi">
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-preferredActivity.xml b/tests/tests/appenumeration/app/target/AndroidManifest-preferredActivity.xml
index fb9e796..8a86825 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-preferredActivity.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-preferredActivity.xml
@@ -19,6 +19,8 @@
           package="android.appenumeration.preferred.activity">
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
         <activity android:name="android.appenumeration.testapp.DummyActivity"
                   android:exported="true">
             <intent-filter>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-prefixWildcardWebActivity.xml b/tests/tests/appenumeration/app/target/AndroidManifest-prefixWildcardWebActivity.xml
new file mode 100644
index 0000000..f5bd1aa
--- /dev/null
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-prefixWildcardWebActivity.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="android.appenumeration.prefix.wildcard.web.activity">
+    <application>
+        <uses-library android:name="android.test.runner"/>
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
+        <activity android:name="android.appenumeration.WebActivity"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <data android:scheme="http"
+                     android:host="*.appenumeration.android"/>
+                <data android:scheme="https"
+                     android:host="*.appenumeration.android"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-shareActivity.xml b/tests/tests/appenumeration/app/target/AndroidManifest-shareActivity.xml
index 148fa29..af9e57b 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-shareActivity.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-shareActivity.xml
@@ -19,6 +19,8 @@
      package="android.appenumeration.share.activity">
     <application>
         <uses-library android:name="android.test.runner"/>
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
         <activity android:name="android.appenumeration.ShareActivity"
              android:exported="true">
             <intent-filter>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-stub.xml b/tests/tests/appenumeration/app/target/AndroidManifest-stub.xml
index af8daa4..630358e 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-stub.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-stub.xml
@@ -19,5 +19,7 @@
           package="android.appenumeration.stub">
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-syncadapter-sharedUser.xml b/tests/tests/appenumeration/app/target/AndroidManifest-syncadapter-sharedUser.xml
index 158067d..8c8dd09 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-syncadapter-sharedUser.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-syncadapter-sharedUser.xml
@@ -20,8 +20,18 @@
           android:sharedUserId="android.appenumeration.shareduid">
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
 
-        <service android:name="android.appenumeration.MockSyncAdapterService"
+        <service android:name="android.appenumeration.testapp.MockAuthenticatorService"
+                 android:exported="false">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+            <meta-data android:name="android.accounts.AccountAuthenticator"
+                       android:resource="@xml/authenticator_shareduser" />
+        </service>
+        <service android:name="android.appenumeration.testapp.MockSyncAdapterService"
                  android:exported="true">
             <intent-filter>
                 <action android:name="android.content.SyncAdapter"/>
@@ -29,5 +39,9 @@
             <meta-data android:name="android.content.SyncAdapter"
                        android:resource="@xml/syncadapter_shareduser"/>
         </service>
+
+        <provider android:name="android.appenumeration.testapp.DummyProvider"
+                  android:authorities="android.appenumeration.syncadapter.shareduid.authority"
+                  android:exported="false" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-syncadapter.xml b/tests/tests/appenumeration/app/target/AndroidManifest-syncadapter.xml
index f1177df..4529f10 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-syncadapter.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-syncadapter.xml
@@ -19,8 +19,18 @@
     package="android.appenumeration.syncadapter">
     <application>
         <uses-library android:name="android.test.runner" />
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
 
-        <service android:name="android.appenumeration.MockSyncAdapterService"
+        <service android:name="android.appenumeration.testapp.MockAuthenticatorService"
+                 android:exported="false">
+            <intent-filter>
+                <action android:name="android.accounts.AccountAuthenticator" />
+            </intent-filter>
+            <meta-data android:name="android.accounts.AccountAuthenticator"
+                       android:resource="@xml/authenticator" />
+        </service>
+        <service android:name="android.appenumeration.testapp.MockSyncAdapterService"
                  android:exported="true">
             <intent-filter>
                 <action android:name="android.content.SyncAdapter"/>
@@ -28,5 +38,9 @@
             <meta-data android:name="android.content.SyncAdapter"
                        android:resource="@xml/syncadapter"/>
         </service>
+
+        <provider android:name="android.appenumeration.testapp.DummyProvider"
+                  android:authorities="android.appenumeration.syncadapter.authority"
+                  android:exported="false" />
     </application>
 </manifest>
diff --git a/tests/tests/appenumeration/app/target/AndroidManifest-webActivity.xml b/tests/tests/appenumeration/app/target/AndroidManifest-webActivity.xml
index 31fe275..bbb5275 100644
--- a/tests/tests/appenumeration/app/target/AndroidManifest-webActivity.xml
+++ b/tests/tests/appenumeration/app/target/AndroidManifest-webActivity.xml
@@ -19,6 +19,8 @@
      package="android.appenumeration.web.activity">
     <application>
         <uses-library android:name="android.test.runner"/>
+        <activity android:name="android.appenumeration.cts.TestActivity"
+                  android:exported="true" />
         <activity android:name="android.appenumeration.WebActivity"
              android:exported="true">
             <intent-filter>
diff --git a/tests/tests/appenumeration/app/target/res/xml/authenticator.xml b/tests/tests/appenumeration/app/target/res/xml/authenticator.xml
new file mode 100644
index 0000000..d3853b7
--- /dev/null
+++ b/tests/tests/appenumeration/app/target/res/xml/authenticator.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="android.appenumeration.account.type"
+    android:label="Mock Account" />
diff --git a/tests/tests/appenumeration/app/target/res/xml/authenticator_shareduser.xml b/tests/tests/appenumeration/app/target/res/xml/authenticator_shareduser.xml
new file mode 100644
index 0000000..8c7936c
--- /dev/null
+++ b/tests/tests/appenumeration/app/target/res/xml/authenticator_shareduser.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
+    android:accountType="android.appenumeration.shareduid.account.type"
+    android:label="Mock Shared User Account" />
diff --git a/tests/tests/appenumeration/app/target/res/xml/syncadapter_shareduser.xml b/tests/tests/appenumeration/app/target/res/xml/syncadapter_shareduser.xml
index fd47011..2ca7cbe 100644
--- a/tests/tests/appenumeration/app/target/res/xml/syncadapter_shareduser.xml
+++ b/tests/tests/appenumeration/app/target/res/xml/syncadapter_shareduser.xml
@@ -15,5 +15,5 @@
 -->
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
     android:contentAuthority="android.appenumeration.syncadapter.shareduid.authority"
-    android:accountType="android.appenumeration.account.type"
+    android:accountType="android.appenumeration.shareduid.account.type"
 />
diff --git a/tests/tests/appenumeration/app/target/src/android/appenumeration/testapp/DummyProvider.java b/tests/tests/appenumeration/app/target/src/android/appenumeration/testapp/DummyProvider.java
new file mode 100644
index 0000000..250c6f2
--- /dev/null
+++ b/tests/tests/appenumeration/app/target/src/android/appenumeration/testapp/DummyProvider.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2021 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 android.appenumeration.testapp;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+
+public class DummyProvider extends ContentProvider {
+    @Override
+    public boolean onCreate() {
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection,
+            String[] selectionArgs, String sortOrder) {
+        return null;
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        return null;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        return 0;
+    }
+}
diff --git a/tests/tests/appenumeration/app/target/src/android/appenumeration/testapp/MockAuthenticatorService.java b/tests/tests/appenumeration/app/target/src/android/appenumeration/testapp/MockAuthenticatorService.java
new file mode 100644
index 0000000..45600ea
--- /dev/null
+++ b/tests/tests/appenumeration/app/target/src/android/appenumeration/testapp/MockAuthenticatorService.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2021 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 android.appenumeration.testapp;
+
+import android.accounts.AbstractAccountAuthenticator;
+import android.accounts.Account;
+import android.accounts.AccountAuthenticatorResponse;
+import android.accounts.NetworkErrorException;
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.os.IBinder;
+
+public class MockAuthenticatorService extends Service {
+
+    private static Authenticator sInstance;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        if (sInstance == null) {
+            sInstance = new Authenticator(getApplicationContext());
+        }
+        return sInstance.getIBinder();
+    }
+
+    private static class Authenticator extends AbstractAccountAuthenticator {
+
+        public Authenticator(Context context) {
+            super(context);
+        }
+
+        @Override
+        public Bundle editProperties(AccountAuthenticatorResponse response, String accountType) {
+            return null;
+        }
+
+        @Override
+        public Bundle addAccount(AccountAuthenticatorResponse response, String accountType,
+                String authTokenType, String[] requiredFeatures, Bundle options)
+                throws NetworkErrorException {
+            return null;
+        }
+
+        @Override
+        public Bundle confirmCredentials(AccountAuthenticatorResponse response, Account account,
+                Bundle options) throws NetworkErrorException {
+            return null;
+        }
+
+        @Override
+        public Bundle getAuthToken(AccountAuthenticatorResponse response, Account account,
+                String authTokenType, Bundle options) throws NetworkErrorException {
+            return null;
+        }
+
+        @Override
+        public String getAuthTokenLabel(String authTokenType) {
+            return null;
+        }
+
+        @Override
+        public Bundle updateCredentials(AccountAuthenticatorResponse response, Account account,
+                String authTokenType, Bundle options) throws NetworkErrorException {
+            return null;
+        }
+
+        @Override
+        public Bundle hasFeatures(AccountAuthenticatorResponse response, Account account,
+                String[] features) throws NetworkErrorException {
+            return null;
+        }
+    }
+}
diff --git a/tests/tests/appenumeration/app/target/src/android/appenumeration/testapp/MockSyncAdapterService.java b/tests/tests/appenumeration/app/target/src/android/appenumeration/testapp/MockSyncAdapterService.java
new file mode 100644
index 0000000..41fb62d
--- /dev/null
+++ b/tests/tests/appenumeration/app/target/src/android/appenumeration/testapp/MockSyncAdapterService.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 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 android.appenumeration.testapp;
+
+import android.accounts.Account;
+import android.app.Service;
+import android.content.AbstractThreadedSyncAdapter;
+import android.content.ContentProviderClient;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SyncResult;
+import android.os.Bundle;
+import android.os.IBinder;
+
+public class MockSyncAdapterService extends Service {
+
+    private static SyncAdapter sInstance;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        if (sInstance == null) {
+            sInstance = new SyncAdapter(getApplicationContext());
+        }
+        return sInstance.getSyncAdapterBinder();
+    }
+
+    static class SyncAdapter extends AbstractThreadedSyncAdapter {
+
+        public SyncAdapter(Context context) {
+            super(context, false /* autoInitialize */);
+        }
+
+        @Override
+        public void onPerformSync(Account account, Bundle extras, String authority,
+                ContentProviderClient provider, SyncResult syncResult) {
+        }
+    }
+}
diff --git a/tests/tests/appenumeration/lib/Android.bp b/tests/tests/appenumeration/lib/Android.bp
index c608d2c..841f404 100644
--- a/tests/tests/appenumeration/lib/Android.bp
+++ b/tests/tests/appenumeration/lib/Android.bp
@@ -18,10 +18,6 @@
 
 java_library {
     name: "CtsAppEnumerationTestLib",
-    srcs: ["src/**/*.java"],
-}
-
-java_library_host {
-    name: "CtsAppEnumerationTestLibHost",
+    defaults: ["cts_support_defaults"],
     srcs: ["src/**/*.java"],
 }
diff --git a/tests/tests/appenumeration/lib/src/android/appenumeration/cts/Constants.java b/tests/tests/appenumeration/lib/src/android/appenumeration/cts/Constants.java
index c93016b..3910691 100644
--- a/tests/tests/appenumeration/lib/src/android/appenumeration/cts/Constants.java
+++ b/tests/tests/appenumeration/lib/src/android/appenumeration/cts/Constants.java
@@ -22,6 +22,8 @@
 
     /** A package that queries for {@link #TARGET_NO_API} package */
     public static final String QUERIES_PACKAGE = PKG_BASE + "queries.pkg";
+    /** A package has a provider that queries for {@link #TARGET_NO_API} package */
+    public static final String QUERIES_PACKAGE_PROVIDER = PKG_BASE + "queries.pkg.hasprovider";
     /** Queries for the unexported authority in {@link #TARGET_FILTERS} provider */
     public static final String QUERIES_UNEXPORTED_PROVIDER_AUTH =
             PKG_BASE + "queries.provider.authority.unexported";
@@ -55,6 +57,10 @@
             PKG_BASE + "queries.nothing.receives.uri";
     public static final String QUERIES_NOTHING_RECEIVES_PERM_URI =
             PKG_BASE + "queries.nothing.receives.perm.uri";
+    public static final String QUERIES_NOTHING_RECEIVES_PERSISTABLE_URI =
+            PKG_BASE + "queries.nothing.receives.persistable.uri";
+    public static final String QUERIES_NOTHING_RECEIVES_NON_PERSISTABLE_URI =
+            PKG_BASE + "queries.nothing.receives.nonpersistable.uri";
     /** Another package that has no queries tag or permission to query any specific packages */
     public static final String QUERIES_NOTHING_SEES_INSTALLER =
             PKG_BASE + "queries.nothing.sees.installer";
@@ -104,6 +110,9 @@
     public static final String TARGET_SHARE = PKG_BASE + "share.activity";
     /** A package that offers an activity that handles browsable web intents for a specific host */
     public static final String TARGET_WEB = PKG_BASE + "web.activity";
+    /** A package that offers an activity acts as a browser, but use a prefix wildcard for host */
+    public static final String TARGET_PREFIX_WILDCARD_WEB =
+            PKG_BASE + "prefix.wildcard.web.activity";
     /** A package that offers an activity acts as a browser with host undefined */
     public static final String TARGET_BROWSER = PKG_BASE + "browser.activity";
     /** A package that offers an activity acts as a browser, but uses a wildcard for host */
@@ -129,6 +138,10 @@
     public static final String TARGET_FILTERS_APK = BASE_PATH + "CtsAppEnumerationFilters.apk";
     public static final String QUERIES_NOTHING_SEES_INSTALLER_APK =
             BASE_PATH + "CtsAppEnumerationQueriesNothingSeesInstaller.apk";
+    public static final String QUERIES_NOTHING_RECEIVES_PERSISTABLE_URI_APK =
+            BASE_PATH + "CtsAppEnumerationQueriesNothingReceivesPersistableUri.apk";
+    public static final String QUERIES_NOTHING_RECEIVES_NON_PERSISTABLE_URI_APK =
+            BASE_PATH + "CtsAppEnumerationQueriesNothingReceivesNonPersistableUri.apk";
 
     public static final String[] ALL_QUERIES_TARGETING_R_PACKAGES = {
             QUERIES_NOTHING,
@@ -149,7 +162,7 @@
             QUERIES_WILDCARD_WEB,
     };
 
-    public static final String ACTIVITY_CLASS_TEST = PKG_BASE + "cts.query.TestActivity";
+    public static final String ACTIVITY_CLASS_TEST = PKG_BASE + "cts.TestActivity";
     public static final String ACTIVITY_CLASS_DUMMY_ACTIVITY = PKG_BASE + "testapp.DummyActivity";
 
     public static final String ACTION_MANIFEST_ACTIVITY = PKG_BASE + "action.ACTIVITY";
@@ -173,7 +186,10 @@
             PKG_BASE + "cts.action.AWAIT_PACKAGE_REMOVED";
     public static final String ACTION_AWAIT_PACKAGE_ADDED =
             PKG_BASE + "cts.action.AWAIT_PACKAGE_ADDED";
-
+    public static final String ACTION_AWAIT_PACKAGE_FULLY_REMOVED =
+            PKG_BASE + "cts.action.AWAIT_PACKAGE_FULLY_REMOVED";
+    public static final String ACTION_AWAIT_PACKAGE_DATA_CLEARED =
+            PKG_BASE + "cts.action.AWAIT_PACKAGE_DATA_CLEARED";
     public static final String ACTION_QUERY_ACTIVITIES =
             PKG_BASE + "cts.action.QUERY_INTENT_ACTIVITIES";
     public static final String ACTION_QUERY_SERVICES =
@@ -193,10 +209,14 @@
             PKG_BASE + "cts.action.GET_SYNCADAPTER_PACKAGES_FOR_AUTHORITY";
     public static final String ACTION_GET_INSTALLED_APPWIDGET_PROVIDERS =
             PKG_BASE + "cts.action.GET_INSTALLED_APPWIDGET_PROVIDERS";
+    public static final String ACTION_REQUEST_SYNC_AND_AWAIT_STATUS =
+            PKG_BASE + "cts.action.REQUEST_SYNC_AND_AWAIT_STATUS";
     public static final String ACTION_AWAIT_PACKAGES_SUSPENDED =
             PKG_BASE + "cts.action.AWAIT_PACKAGES_SUSPENDED";
     public static final String ACTION_LAUNCHER_APPS_IS_ACTIVITY_ENABLED =
             PKG_BASE + "cts.action.LAUNCHER_APPS_IS_ACTIVITY_ENABLED";
+    public static final String ACTION_LAUNCHER_APPS_GET_SUSPENDED_PACKAGE_LAUNCHER_EXTRAS =
+            PKG_BASE + "cts.action.LAUNCHER_APPS_GET_SUSPENDED_PACKAGE_LAUNCHER_EXTRAS";
     public static final String ACTION_AWAIT_LAUNCHER_APPS_CALLBACK =
             PKG_BASE + "cts.action.AWAIT_LAUNCHER_APPS_CALLBACK";
     public static final String ACTION_GET_SHAREDLIBRARY_DEPENDENT_PACKAGES =
@@ -207,6 +227,35 @@
             PKG_BASE + "cts.action.SET_INSTALLER_PACKAGE_NAME";
     public static final String ACTION_GET_INSTALLED_ACCESSIBILITYSERVICES_PACKAGES =
             PKG_BASE + "cts.action.GET_INSTALLED_ACCESSIBILITYSERVICES_PACKAGES";
+    public static final String ACTION_LAUNCHER_APPS_SHOULD_HIDE_FROM_SUGGESTIONS =
+            PKG_BASE + "cts.action.LAUNCHER_APPS_SHOULD_HIDE_FROM_SUGGESTIONS";
+    public static final String ACTION_CHECK_URI_PERMISSION =
+            PKG_BASE + "cts.action.CHECK_URI_PERMISSION";
+    public static final String ACTION_TAKE_PERSISTABLE_URI_PERMISSION =
+            PKG_BASE + "cts.action.TAKE_PERSISTABLE_URI_PERMISSION";
+    public static final String ACTION_CAN_PACKAGE_QUERY =
+            PKG_BASE + "cts.action.CAN_PACKAGE_QUERY";
+    public static final String ACTION_GET_ALL_PACKAGE_INSTALLER_SESSIONS =
+            PKG_BASE + "cts.action.GET_ALL_PACKAGE_INSTALLER_SESSIONS";
+    public static final String ACTION_AWAIT_LAUNCHER_APPS_SESSION_CALLBACK =
+            PKG_BASE + "cts.action.AWAIT_LAUNCHER_APPS_SESSION_CALLBACK";
+    public static final String ACTION_GET_SESSION_INFO =
+            PKG_BASE + "cts.action.GET_SESSION_INFO";
+    public static final String ACTION_GET_STAGED_SESSIONS =
+            PKG_BASE + "cts.action.GET_STAGED_SESSIONS";
+    public static final String ACTION_GET_ALL_SESSIONS =
+            PKG_BASE + "cts.action.GET_ALL_SESSIONS";
+    public static final String ACTION_PENDING_INTENT_GET_ACTIVITY =
+            PKG_BASE + "cts.action.PENDING_INTENT_GET_ACTIVITY";
+    public static final String ACTION_PENDING_INTENT_GET_CREATOR_PACKAGE =
+            PKG_BASE + "cts.action.PENDING_INTENT_GET_CREATOR_PACKAGE";
+    public static final String ACTION_CHECK_PACKAGE =
+            PKG_BASE + "cts.action.CHECK_PACKAGE";
+    public static final String ACTION_GRANT_URI_PERMISSION =
+            PKG_BASE + "cts.action.GRANT_URI_PERMISSION";
+    public static final String ACTION_REVOKE_URI_PERMISSION =
+            PKG_BASE + "cts.action.REVOKE_URI_PERMISSION";
+
     public static final String EXTRA_REMOTE_CALLBACK = "remoteCallback";
     public static final String EXTRA_REMOTE_READY_CALLBACK = "remoteReadyCallback";
     public static final String EXTRA_ERROR = "error";
@@ -214,6 +263,9 @@
     public static final String EXTRA_DATA = "data";
     public static final String EXTRA_CERT = "cert";
     public static final String EXTRA_AUTHORITY = "authority";
+    public static final String EXTRA_ACCOUNT = "account";
+    public static final String EXTRA_ID = "id";
+    public static final String EXTRA_PENDING_INTENT = "pendingIntent";
 
     public static final int CALLBACK_EVENT_INVALID = -1;
     public static final int CALLBACK_EVENT_PACKAGE_ADDED = 0;
diff --git a/tests/tests/appenumeration/lib/src/android/appenumeration/cts/MissingCallbackException.java b/tests/tests/appenumeration/lib/src/android/appenumeration/cts/MissingCallbackException.java
new file mode 100644
index 0000000..1efe1b7
--- /dev/null
+++ b/tests/tests/appenumeration/lib/src/android/appenumeration/cts/MissingCallbackException.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 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 android.appenumeration.cts;
+
+public class MissingCallbackException extends Exception {
+
+    public MissingCallbackException(String action, long timeoutMs) {
+        super("The callback of " + action + " was not received within " + timeoutMs + "ms");
+    }
+}
diff --git a/tests/tests/appenumeration/lib/src/android/appenumeration/cts/TestActivity.java b/tests/tests/appenumeration/lib/src/android/appenumeration/cts/TestActivity.java
new file mode 100644
index 0000000..3c315a5
--- /dev/null
+++ b/tests/tests/appenumeration/lib/src/android/appenumeration/cts/TestActivity.java
@@ -0,0 +1,972 @@
+/*
+ * Copyright (C) 2019 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 android.appenumeration.cts;
+
+import static android.appenumeration.cts.Constants.ACTION_CHECK_SIGNATURES;
+import static android.appenumeration.cts.Constants.ACTION_GET_INSTALLED_PACKAGES;
+import static android.appenumeration.cts.Constants.ACTION_GET_NAMES_FOR_UIDS;
+import static android.appenumeration.cts.Constants.ACTION_GET_NAME_FOR_UID;
+import static android.appenumeration.cts.Constants.ACTION_GET_PACKAGES_FOR_UID;
+import static android.appenumeration.cts.Constants.ACTION_GET_PACKAGE_INFO;
+import static android.appenumeration.cts.Constants.ACTION_HAS_SIGNING_CERTIFICATE;
+import static android.appenumeration.cts.Constants.ACTION_JUST_FINISH;
+import static android.appenumeration.cts.Constants.ACTION_QUERY_ACTIVITIES;
+import static android.appenumeration.cts.Constants.ACTION_QUERY_PROVIDERS;
+import static android.appenumeration.cts.Constants.ACTION_QUERY_SERVICES;
+import static android.appenumeration.cts.Constants.ACTION_SEND_RESULT;
+import static android.appenumeration.cts.Constants.ACTION_START_DIRECTLY;
+import static android.appenumeration.cts.Constants.ACTION_START_FOR_RESULT;
+import static android.appenumeration.cts.Constants.ACTION_START_SENDER_FOR_RESULT;
+import static android.appenumeration.cts.Constants.CALLBACK_EVENT_INVALID;
+import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGES_AVAILABLE;
+import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGES_SUSPENDED;
+import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGES_UNAVAILABLE;
+import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGES_UNSUSPENDED;
+import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGE_ADDED;
+import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGE_CHANGED;
+import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGE_REMOVED;
+import static android.appenumeration.cts.Constants.EXTRA_ACCOUNT;
+import static android.appenumeration.cts.Constants.EXTRA_AUTHORITY;
+import static android.appenumeration.cts.Constants.EXTRA_CERT;
+import static android.appenumeration.cts.Constants.EXTRA_DATA;
+import static android.appenumeration.cts.Constants.EXTRA_ERROR;
+import static android.appenumeration.cts.Constants.EXTRA_FLAGS;
+import static android.appenumeration.cts.Constants.EXTRA_ID;
+import static android.appenumeration.cts.Constants.EXTRA_PENDING_INTENT;
+import static android.appenumeration.cts.Constants.EXTRA_REMOTE_CALLBACK;
+import static android.appenumeration.cts.Constants.EXTRA_REMOTE_READY_CALLBACK;
+import static android.content.Intent.EXTRA_COMPONENT_NAME;
+import static android.content.Intent.EXTRA_PACKAGES;
+import static android.content.Intent.EXTRA_RETURN_RESULT;
+import static android.content.Intent.EXTRA_UID;
+import static android.content.pm.PackageManager.CERT_INPUT_RAW_X509;
+import static android.os.Process.INVALID_UID;
+import static android.os.Process.ROOT_UID;
+
+import android.accounts.Account;
+import android.app.Activity;
+import android.app.AppOpsManager;
+import android.app.PendingIntent;
+import android.appwidget.AppWidgetManager;
+import android.appwidget.AppWidgetProviderInfo;
+import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.IntentSender;
+import android.content.ServiceConnection;
+import android.content.SyncAdapterType;
+import android.content.SyncStatusObserver;
+import android.content.pm.LauncherApps;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageInstaller.SessionCallback;
+import android.content.pm.PackageInstaller.SessionInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.SharedLibraryInfo;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.Parcelable;
+import android.os.PatternMatcher;
+import android.os.Process;
+import android.os.RemoteCallback;
+import android.os.UserHandle;
+import android.util.SparseArray;
+import android.view.accessibility.AccessibilityManager;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ *  A test activity running in the query and target applications.
+ */
+public class TestActivity extends Activity {
+
+    private final static long TIMEOUT_MS = 3000;
+
+    /**
+     * Extending the timeout time of non broadcast receivers, avoid not
+     * receiving callbacks in time on some common low-end platforms and
+     * do not affect the situation that callback can be received in advance.
+     */
+    private final static long EXTENDED_TIMEOUT_MS = 5000;
+
+    SparseArray<RemoteCallback> callbacks = new SparseArray<>();
+
+    private Handler mainHandler;
+    private Handler backgroundHandler;
+    private HandlerThread backgroundThread;
+    private Object syncStatusHandle;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        mainHandler = new Handler(getMainLooper());
+        backgroundThread = new HandlerThread("testBackground");
+        backgroundThread.start();
+        backgroundHandler = new Handler(backgroundThread.getLooper());
+        super.onCreate(savedInstanceState);
+        handleIntent(getIntent());
+        onCommandReady(getIntent());
+    }
+
+    @Override
+    protected void onDestroy() {
+        if (syncStatusHandle != null) {
+            ContentResolver.removeStatusChangeListener(syncStatusHandle);
+        }
+        backgroundThread.quitSafely();
+        super.onDestroy();
+    }
+
+    private void handleIntent(Intent intent) {
+        RemoteCallback remoteCallback = intent.getParcelableExtra(EXTRA_REMOTE_CALLBACK);
+        try {
+            final String action = intent.getAction();
+            final Intent queryIntent = intent.getParcelableExtra(Intent.EXTRA_INTENT);
+            if (ACTION_GET_PACKAGE_INFO.equals(action)) {
+                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                sendPackageInfo(remoteCallback, packageName);
+            } else if (ACTION_GET_PACKAGES_FOR_UID.equals(action)) {
+                final int uid = intent.getIntExtra(EXTRA_UID, INVALID_UID);
+                sendPackagesForUid(remoteCallback, uid);
+            } else if (ACTION_GET_NAME_FOR_UID.equals(action)) {
+                final int uid = intent.getIntExtra(EXTRA_UID, INVALID_UID);
+                sendNameForUid(remoteCallback, uid);
+            } else if (ACTION_GET_NAMES_FOR_UIDS.equals(action)) {
+                final int uid = intent.getIntExtra(EXTRA_UID, INVALID_UID);
+                sendNamesForUids(remoteCallback, uid);
+            } else if (ACTION_CHECK_SIGNATURES.equals(action)) {
+                final int uid1 = getPackageManager().getApplicationInfo(
+                        getPackageName(), /* flags */ 0).uid;
+                final int uid2 = intent.getIntExtra(EXTRA_UID, INVALID_UID);
+                sendCheckSignatures(remoteCallback, uid1, uid2);
+            } else if (ACTION_HAS_SIGNING_CERTIFICATE.equals(action)) {
+                final int uid = intent.getIntExtra(EXTRA_UID, INVALID_UID);
+                final byte[] cert = intent.getBundleExtra(EXTRA_DATA).getByteArray(EXTRA_CERT);
+                sendHasSigningCertificate(remoteCallback, uid, cert, CERT_INPUT_RAW_X509);
+            } else if (ACTION_START_FOR_RESULT.equals(action)) {
+                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                int requestCode = RESULT_FIRST_USER + callbacks.size();
+                callbacks.put(requestCode, remoteCallback);
+                startActivityForResult(
+                        new Intent(ACTION_SEND_RESULT).setComponent(
+                                new ComponentName(packageName, getClass().getCanonicalName())),
+                        requestCode);
+                // don't send anything... await result callback
+            } else if (ACTION_SEND_RESULT.equals(action)) {
+                try {
+                    setResult(RESULT_OK,
+                            getIntent().putExtra(
+                                    Intent.EXTRA_RETURN_RESULT,
+                                    getPackageManager().getPackageInfo(getCallingPackage(), 0)));
+                } catch (PackageManager.NameNotFoundException e) {
+                    setResult(RESULT_FIRST_USER, new Intent().putExtra("error", e));
+                }
+                finish();
+            } else if (ACTION_QUERY_ACTIVITIES.equals(action)) {
+                sendQueryIntentActivities(remoteCallback, queryIntent);
+            } else if (ACTION_QUERY_SERVICES.equals(action)) {
+                sendQueryIntentServices(remoteCallback, queryIntent);
+            } else if (ACTION_QUERY_PROVIDERS.equals(action)) {
+                sendQueryIntentProviders(remoteCallback, queryIntent);
+            } else if (ACTION_START_DIRECTLY.equals(action)) {
+                try {
+                    startActivity(queryIntent);
+                    remoteCallback.sendResult(new Bundle());
+                } catch (ActivityNotFoundException e) {
+                    sendError(remoteCallback, e);
+                }
+                finish();
+            } else if (ACTION_JUST_FINISH.equals(action)) {
+                finish();
+            } else if (ACTION_GET_INSTALLED_PACKAGES.equals(action)) {
+                sendGetInstalledPackages(remoteCallback, queryIntent.getIntExtra(EXTRA_FLAGS, 0));
+            } else if (ACTION_START_SENDER_FOR_RESULT.equals(action)) {
+                PendingIntent pendingIntent = intent.getParcelableExtra(EXTRA_PENDING_INTENT);
+                int requestCode = RESULT_FIRST_USER + callbacks.size();
+                callbacks.put(requestCode, remoteCallback);
+                try {
+                    startIntentSenderForResult(pendingIntent.getIntentSender(), requestCode, null,
+                            0, 0, 0);
+                } catch (IntentSender.SendIntentException e) {
+                    sendError(remoteCallback, e);
+                }
+            } else if (Constants.ACTION_AWAIT_PACKAGE_REMOVED.equals(action)) {
+                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                awaitPackageBroadcast(
+                        remoteCallback, packageName, Intent.ACTION_PACKAGE_REMOVED, TIMEOUT_MS);
+            } else if (Constants.ACTION_AWAIT_PACKAGE_ADDED.equals(action)) {
+                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                awaitPackageBroadcast(
+                        remoteCallback, packageName, Intent.ACTION_PACKAGE_ADDED, TIMEOUT_MS);
+            } else if (Constants.ACTION_AWAIT_PACKAGE_FULLY_REMOVED.equals(action)) {
+                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                awaitPackageBroadcast(remoteCallback, packageName,
+                        Intent.ACTION_PACKAGE_FULLY_REMOVED, TIMEOUT_MS);
+            } else if (Constants.ACTION_AWAIT_PACKAGE_DATA_CLEARED.equals(action)) {
+                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                awaitPackageBroadcast(remoteCallback, packageName,
+                        Intent.ACTION_PACKAGE_DATA_CLEARED, TIMEOUT_MS);
+            } else if (Constants.ACTION_QUERY_RESOLVER.equals(action)) {
+                final String authority = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                queryResolverForVisiblePackages(remoteCallback, authority);
+            } else if (Constants.ACTION_BIND_SERVICE.equals(action)) {
+                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                bindService(remoteCallback, packageName);
+            } else if (Constants.ACTION_GET_SYNCADAPTER_TYPES.equals(action)) {
+                sendSyncAdapterTypes(remoteCallback);
+            } else if (Constants.ACTION_GET_INSTALLED_APPWIDGET_PROVIDERS.equals(action)) {
+                sendInstalledAppWidgetProviders(remoteCallback);
+            } else if (Constants.ACTION_AWAIT_PACKAGES_SUSPENDED.equals(action)) {
+                final String[] awaitPackages = intent.getBundleExtra(EXTRA_DATA)
+                        .getStringArray(EXTRA_PACKAGES);
+                awaitSuspendedPackagesBroadcast(remoteCallback, Arrays.asList(awaitPackages),
+                        Intent.ACTION_PACKAGES_SUSPENDED, TIMEOUT_MS);
+            } else if (Constants.ACTION_LAUNCHER_APPS_IS_ACTIVITY_ENABLED.equals(action)) {
+                final String componentName = intent.getBundleExtra(EXTRA_DATA)
+                        .getString(EXTRA_COMPONENT_NAME);
+                sendIsActivityEnabled(remoteCallback, ComponentName.unflattenFromString(
+                        componentName));
+            } else if (Constants.ACTION_LAUNCHER_APPS_GET_SUSPENDED_PACKAGE_LAUNCHER_EXTRAS.equals(
+                    action)) {
+                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                sendGetSuspendedPackageLauncherExtras(remoteCallback, packageName);
+            } else if (Constants.ACTION_GET_SYNCADAPTER_PACKAGES_FOR_AUTHORITY.equals(action)) {
+                final String authority = intent.getBundleExtra(EXTRA_DATA)
+                        .getString(EXTRA_AUTHORITY);
+                final int userId = intent.getBundleExtra(EXTRA_DATA)
+                        .getInt(Intent.EXTRA_USER);
+                sendSyncAdapterPackagesForAuthorityAsUser(remoteCallback, authority, userId);
+            } else if (Constants.ACTION_REQUEST_SYNC_AND_AWAIT_STATUS.equals(action)) {
+                final String authority = intent.getBundleExtra(EXTRA_DATA)
+                        .getString(EXTRA_AUTHORITY);
+                final Account account = intent.getBundleExtra(EXTRA_DATA)
+                        .getParcelable(EXTRA_ACCOUNT);
+                awaitRequestSyncStatus(remoteCallback, action, account, authority,
+                        EXTENDED_TIMEOUT_MS);
+            } else if (Constants.ACTION_AWAIT_LAUNCHER_APPS_CALLBACK.equals(action)) {
+                final int expectedEventCode = intent.getBundleExtra(EXTRA_DATA)
+                        .getInt(EXTRA_FLAGS, CALLBACK_EVENT_INVALID);
+                awaitLauncherAppsCallback(remoteCallback, expectedEventCode, EXTENDED_TIMEOUT_MS);
+            } else if (Constants.ACTION_GET_SHAREDLIBRARY_DEPENDENT_PACKAGES.equals(action)) {
+                final String sharedLibName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                sendGetSharedLibraryDependentPackages(remoteCallback, sharedLibName);
+            } else if (Constants.ACTION_GET_PREFERRED_ACTIVITIES.equals(action)) {
+                sendGetPreferredActivities(remoteCallback);
+            } else if (Constants.ACTION_SET_INSTALLER_PACKAGE_NAME.equals(action)) {
+                final String targetPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                final String installerPackageName = intent.getBundleExtra(EXTRA_DATA)
+                        .getString(Intent.EXTRA_INSTALLER_PACKAGE_NAME);
+                sendSetInstallerPackageName(remoteCallback, targetPackageName,
+                        installerPackageName);
+            } else if (Constants.ACTION_GET_INSTALLED_ACCESSIBILITYSERVICES_PACKAGES.equals(
+                    action)) {
+                sendGetInstalledAccessibilityServicePackages(remoteCallback);
+            } else if (Constants.ACTION_LAUNCHER_APPS_SHOULD_HIDE_FROM_SUGGESTIONS.equals(action)) {
+                final String targetPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                final int userId = intent.getBundleExtra(EXTRA_DATA).getInt(Intent.EXTRA_USER);
+                sendLauncherAppsShouldHideFromSuggestions(remoteCallback, targetPackageName,
+                        userId);
+            } else if (Constants.ACTION_CHECK_URI_PERMISSION.equals(action)) {
+                final String targetPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                final int targetUid = intent.getIntExtra(EXTRA_UID, INVALID_UID);
+                final String sourceAuthority = intent.getBundleExtra(EXTRA_DATA)
+                        .getString(EXTRA_AUTHORITY);
+                sendCheckUriPermission(remoteCallback, sourceAuthority, targetPackageName,
+                        targetUid);
+            } else if (Constants.ACTION_TAKE_PERSISTABLE_URI_PERMISSION.equals(action)) {
+                final Uri uri = intent.getData();
+                final int modeFlags = intent.getFlags();
+                if (uri != null) {
+                    getContentResolver().takePersistableUriPermission(uri, modeFlags);
+                }
+                finish();
+            } else if (Constants.ACTION_CAN_PACKAGE_QUERY.equals(action)) {
+                final String sourcePackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                final String targetPackageName = intent.getBundleExtra(EXTRA_DATA)
+                        .getString(Intent.EXTRA_PACKAGE_NAME);
+                sendCanPackageQuery(remoteCallback, sourcePackageName, targetPackageName);
+            } else if (Constants.ACTION_GET_ALL_PACKAGE_INSTALLER_SESSIONS.equals(action)) {
+                final List<SessionInfo> infos = getSystemService(LauncherApps.class)
+                        .getAllPackageInstallerSessions();
+                sendSessionInfosListResult(remoteCallback, infos);
+            } else if (Constants.ACTION_AWAIT_LAUNCHER_APPS_SESSION_CALLBACK.equals(action)) {
+                final int expectedEventCode = intent.getBundleExtra(EXTRA_DATA)
+                        .getInt(EXTRA_ID, SessionInfo.INVALID_ID);
+                awaitLauncherAppsSessionCallback(remoteCallback, expectedEventCode,
+                        EXTENDED_TIMEOUT_MS);
+            } else if (Constants.ACTION_GET_SESSION_INFO.equals(action)) {
+                final int sessionId = intent.getBundleExtra(EXTRA_DATA)
+                        .getInt(EXTRA_ID, SessionInfo.INVALID_ID);
+                final List<SessionInfo> infos = Arrays.asList(getPackageManager()
+                        .getPackageInstaller()
+                        .getSessionInfo(sessionId));
+                sendSessionInfosListResult(remoteCallback, infos);
+            } else if (Constants.ACTION_GET_STAGED_SESSIONS.equals(action)) {
+                final List<SessionInfo> infos = getPackageManager().getPackageInstaller()
+                        .getStagedSessions();
+                sendSessionInfosListResult(remoteCallback, infos);
+            } else if (Constants.ACTION_GET_ALL_SESSIONS.equals(action)) {
+                final List<SessionInfo> infos = getPackageManager().getPackageInstaller()
+                        .getAllSessions();
+                sendSessionInfosListResult(remoteCallback, infos);
+            } else if (Constants.ACTION_PENDING_INTENT_GET_ACTIVITY.equals(action)) {
+                sendPendingIntentGetActivity(remoteCallback);
+            } else if (Constants.ACTION_PENDING_INTENT_GET_CREATOR_PACKAGE.equals(action)) {
+                sendPendingIntentGetCreatorPackage(remoteCallback,
+                        intent.getParcelableExtra(EXTRA_PENDING_INTENT));
+            } else if (Constants.ACTION_CHECK_PACKAGE.equals(action)) {
+                // Using ROOT_UID as default value here to pass the check in #verifyAndGetBypass,
+                // this is intended by design.
+                final int uid = intent.getIntExtra(EXTRA_UID, ROOT_UID);
+                final String packageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                sendCheckPackageResult(remoteCallback, packageName, uid);
+            } else if (Constants.ACTION_GRANT_URI_PERMISSION.equals(action)) {
+                final String targetPackageName = intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME);
+                final String sourceAuthority = intent.getBundleExtra(EXTRA_DATA)
+                        .getString(EXTRA_AUTHORITY);
+                sendGrantUriPermission(remoteCallback, sourceAuthority, targetPackageName);
+            } else if (Constants.ACTION_REVOKE_URI_PERMISSION.equals(action)) {
+                final String sourceAuthority = intent.getBundleExtra(EXTRA_DATA)
+                        .getString(EXTRA_AUTHORITY);
+                sendRevokeUriPermission(remoteCallback, sourceAuthority);
+            } else {
+                sendError(remoteCallback, new Exception("unknown action " + action));
+            }
+        } catch (Exception e) {
+            sendError(remoteCallback, e);
+        }
+    }
+
+    private void sendGetInstalledAccessibilityServicePackages(RemoteCallback remoteCallback) {
+        final String[] packages = getSystemService(
+                AccessibilityManager.class).getInstalledAccessibilityServiceList().stream().map(
+                p -> p.getComponentName().getPackageName()).distinct().toArray(String[]::new);
+        final Bundle result = new Bundle();
+        result.putStringArray(EXTRA_RETURN_RESULT, packages);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void onCommandReady(Intent intent) {
+        final RemoteCallback callback = intent.getParcelableExtra(EXTRA_REMOTE_READY_CALLBACK);
+        if (callback != null) {
+            callback.sendResult(null);
+        }
+    }
+
+    private void awaitPackageBroadcast(RemoteCallback remoteCallback, String packageName,
+            String action, long timeoutMs) {
+        final IntentFilter filter = new IntentFilter(action);
+        filter.addDataScheme("package");
+        filter.addDataSchemeSpecificPart(packageName, PatternMatcher.PATTERN_LITERAL);
+        final Object token = new Object();
+        registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                final Bundle result = new Bundle();
+                result.putString(EXTRA_DATA, intent.getDataString());
+                remoteCallback.sendResult(result);
+                mainHandler.removeCallbacksAndMessages(token);
+                finish();
+            }
+        }, filter, Context.RECEIVER_EXPORTED_UNAUDITED);
+        mainHandler.postDelayed(
+                () -> sendError(remoteCallback,
+                        new MissingBroadcastException(action, timeoutMs)),
+                token, timeoutMs);
+    }
+
+    private void awaitSuspendedPackagesBroadcast(RemoteCallback remoteCallback,
+            List<String> awaitList, String action, long timeoutMs) {
+        final IntentFilter filter = new IntentFilter(action);
+        final ArrayList<String> suspendedList = new ArrayList<>();
+        final Object token = new Object();
+        final Runnable sendResult = () -> {
+            final Bundle result = new Bundle();
+            result.putStringArray(EXTRA_PACKAGES, suspendedList.toArray(new String[] {}));
+            remoteCallback.sendResult(result);
+            finish();
+        };
+        registerReceiver(new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                final Bundle extras = intent.getExtras();
+                final String[] changedList = extras.getStringArray(
+                        Intent.EXTRA_CHANGED_PACKAGE_LIST);
+                suspendedList.addAll(Arrays.stream(changedList).filter(
+                        p -> awaitList.contains(p)).collect(Collectors.toList()));
+                if (suspendedList.size() == awaitList.size()) {
+                    mainHandler.removeCallbacksAndMessages(token);
+                    sendResult.run();
+                }
+            }
+        }, filter, Context.RECEIVER_EXPORTED_UNAUDITED);
+        mainHandler.postDelayed(() -> sendResult.run(), token, timeoutMs);
+    }
+
+    private void awaitLauncherAppsCallback(RemoteCallback remoteCallback, int expectedEventCode,
+            long timeoutMs) {
+        final Object token = new Object();
+        final Bundle result = new Bundle();
+        final LauncherApps launcherApps = getSystemService(LauncherApps.class);
+        final LauncherApps.Callback launcherAppsCallback = new LauncherApps.Callback() {
+
+            private void onPackageStateUpdated(String[] packageNames, int resultCode) {
+                if (resultCode != expectedEventCode) {
+                    return;
+                }
+
+                mainHandler.removeCallbacksAndMessages(token);
+                result.putStringArray(EXTRA_PACKAGES, packageNames);
+                result.putInt(EXTRA_FLAGS, resultCode);
+                remoteCallback.sendResult(result);
+
+                launcherApps.unregisterCallback(this);
+                finish();
+            }
+
+            @Override
+            public void onPackageRemoved(String packageName, UserHandle user) {
+                onPackageStateUpdated(new String[]{packageName}, CALLBACK_EVENT_PACKAGE_REMOVED);
+            }
+
+            @Override
+            public void onPackageAdded(String packageName, UserHandle user) {
+                onPackageStateUpdated(new String[]{packageName}, CALLBACK_EVENT_PACKAGE_ADDED);
+            }
+
+            @Override
+            public void onPackageChanged(String packageName, UserHandle user) {
+                onPackageStateUpdated(new String[]{packageName}, CALLBACK_EVENT_PACKAGE_CHANGED);
+            }
+
+            @Override
+            public void onPackagesAvailable(String[] packageNames, UserHandle user,
+                    boolean replacing) {
+                onPackageStateUpdated(packageNames, CALLBACK_EVENT_PACKAGES_AVAILABLE);
+            }
+
+            @Override
+            public void onPackagesUnavailable(String[] packageNames, UserHandle user,
+                    boolean replacing) {
+                onPackageStateUpdated(packageNames, CALLBACK_EVENT_PACKAGES_UNAVAILABLE);
+            }
+
+            @Override
+            public void onPackagesSuspended(String[] packageNames, UserHandle user) {
+                onPackageStateUpdated(packageNames, CALLBACK_EVENT_PACKAGES_SUSPENDED);
+                super.onPackagesSuspended(packageNames, user);
+            }
+
+            @Override
+            public void onPackagesUnsuspended(String[] packageNames, UserHandle user) {
+                onPackageStateUpdated(packageNames, CALLBACK_EVENT_PACKAGES_UNSUSPENDED);
+                super.onPackagesUnsuspended(packageNames, user);
+            }
+        };
+
+        launcherApps.registerCallback(launcherAppsCallback);
+
+        mainHandler.postDelayed(() -> {
+            result.putStringArray(EXTRA_PACKAGES, new String[]{});
+            result.putInt(EXTRA_FLAGS, CALLBACK_EVENT_INVALID);
+            remoteCallback.sendResult(result);
+
+            launcherApps.unregisterCallback(launcherAppsCallback);
+            finish();
+        }, token, timeoutMs);
+    }
+
+    private void sendGetInstalledPackages(RemoteCallback remoteCallback, int flags) {
+        String[] packages =
+                getPackageManager().getInstalledPackages(flags)
+                        .stream().map(p -> p.packageName).distinct().toArray(String[]::new);
+        Bundle result = new Bundle();
+        result.putStringArray(EXTRA_RETURN_RESULT, packages);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendQueryIntentActivities(RemoteCallback remoteCallback, Intent queryIntent) {
+        final String[] resolveInfos = getPackageManager().queryIntentActivities(
+                queryIntent, 0 /* flags */).stream()
+                .map(ri -> ri.activityInfo.applicationInfo.packageName)
+                .distinct()
+                .toArray(String[]::new);
+        Bundle result = new Bundle();
+        result.putStringArray(EXTRA_RETURN_RESULT, resolveInfos);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendQueryIntentServices(RemoteCallback remoteCallback, Intent queryIntent) {
+        final String[] resolveInfos = getPackageManager().queryIntentServices(
+                queryIntent, 0 /* flags */).stream()
+                .map(ri -> ri.serviceInfo.applicationInfo.packageName)
+                .distinct()
+                .toArray(String[]::new);
+        Bundle result = new Bundle();
+        result.putStringArray(EXTRA_RETURN_RESULT, resolveInfos);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendQueryIntentProviders(RemoteCallback remoteCallback, Intent queryIntent) {
+        final String[] resolveInfos = getPackageManager().queryIntentContentProviders(
+                queryIntent, 0 /* flags */).stream()
+                .map(ri -> ri.providerInfo.applicationInfo.packageName)
+                .distinct()
+                .toArray(String[]::new);
+        Bundle result = new Bundle();
+        result.putStringArray(EXTRA_RETURN_RESULT, resolveInfos);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void queryResolverForVisiblePackages(RemoteCallback remoteCallback, String authority) {
+        backgroundHandler.post(() -> {
+            Uri queryUri = Uri.parse("content://" + authority + "/test");
+            Cursor query = getContentResolver().query(queryUri, null, null, null, null);
+            if (query == null || !query.moveToFirst()) {
+                sendError(remoteCallback,
+                        new IllegalStateException(
+                                "Query of " + queryUri + " could not be completed"));
+                return;
+            }
+            ArrayList<String> visiblePackages = new ArrayList<>();
+            while (!query.isAfterLast()) {
+                visiblePackages.add(query.getString(0));
+                query.moveToNext();
+            }
+            query.close();
+
+            mainHandler.post(() -> {
+                Bundle result = new Bundle();
+                result.putStringArray(EXTRA_RETURN_RESULT, visiblePackages.toArray(new String[]{}));
+                remoteCallback.sendResult(result);
+                finish();
+            });
+
+        });
+    }
+
+    private void sendError(RemoteCallback remoteCallback, Exception failure) {
+        Bundle result = new Bundle();
+        result.putSerializable(EXTRA_ERROR, failure);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendPackageInfo(RemoteCallback remoteCallback, String packageName) {
+        final PackageInfo pi;
+        try {
+            pi = getPackageManager().getPackageInfo(packageName, 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            sendError(remoteCallback, e);
+            return;
+        }
+        Bundle result = new Bundle();
+        result.putParcelable(EXTRA_RETURN_RESULT, pi);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendPackagesForUid(RemoteCallback remoteCallback, int uid) {
+        final String[] packages = getPackageManager().getPackagesForUid(uid);
+        final Bundle result = new Bundle();
+        result.putStringArray(EXTRA_RETURN_RESULT, packages);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendNameForUid(RemoteCallback remoteCallback, int uid) {
+        final String name = getPackageManager().getNameForUid(uid);
+        final Bundle result = new Bundle();
+        result.putString(EXTRA_RETURN_RESULT, name);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendNamesForUids(RemoteCallback remoteCallback, int uid) {
+        final String[] names = getPackageManager().getNamesForUids(new int[]{uid});
+        final Bundle result = new Bundle();
+        result.putStringArray(EXTRA_RETURN_RESULT, names);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendCheckSignatures(RemoteCallback remoteCallback, int uid1, int uid2) {
+        final int signatureResult = getPackageManager().checkSignatures(uid1, uid2);
+        final Bundle result = new Bundle();
+        result.putInt(EXTRA_RETURN_RESULT, signatureResult);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendHasSigningCertificate(RemoteCallback remoteCallback, int uid, byte[] cert,
+            int type) {
+        final boolean signatureResult = getPackageManager().hasSigningCertificate(uid, cert, type);
+        final Bundle result = new Bundle();
+        result.putBoolean(EXTRA_RETURN_RESULT, signatureResult);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    /**
+     * Instead of sending a list of package names, this function sends a List of
+     * {@link SyncAdapterType}, since the {@link SyncAdapterType#getPackageName()} is a test api
+     * which can only be invoked in the instrumentation.
+     */
+    private void sendSyncAdapterTypes(RemoteCallback remoteCallback) {
+        final SyncAdapterType[] types = ContentResolver.getSyncAdapterTypes();
+        final ArrayList<Parcelable> parcelables = new ArrayList<>();
+        for (SyncAdapterType type : types) {
+            parcelables.add(type);
+        }
+        final Bundle result = new Bundle();
+        result.putParcelableArrayList(EXTRA_RETURN_RESULT, parcelables);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendIsActivityEnabled(RemoteCallback remoteCallback, ComponentName componentName) {
+        final LauncherApps launcherApps = getSystemService(LauncherApps.class);
+        final Bundle result = new Bundle();
+        try {
+            result.putBoolean(EXTRA_RETURN_RESULT, launcherApps.isActivityEnabled(componentName,
+                    Process.myUserHandle()));
+        } catch (IllegalArgumentException e) {
+        }
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendGetSuspendedPackageLauncherExtras(RemoteCallback remoteCallback,
+            String packageName) {
+        final LauncherApps launcherApps = getSystemService(LauncherApps.class);
+        final Bundle result = new Bundle();
+        try {
+            result.putBundle(EXTRA_RETURN_RESULT,
+                    launcherApps.getSuspendedPackageLauncherExtras(packageName,
+                            Process.myUserHandle()));
+        } catch (IllegalArgumentException e) {
+        }
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendInstalledAppWidgetProviders(RemoteCallback remoteCallback) {
+        final AppWidgetManager appWidgetManager = getSystemService(AppWidgetManager.class);
+        final List<AppWidgetProviderInfo> providers = appWidgetManager.getInstalledProviders();
+        final ArrayList<Parcelable> parcelables = new ArrayList<>();
+        for (AppWidgetProviderInfo info : providers) {
+            parcelables.add(info);
+        }
+        final Bundle result = new Bundle();
+        result.putParcelableArrayList(EXTRA_RETURN_RESULT, parcelables);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendSyncAdapterPackagesForAuthorityAsUser(RemoteCallback remoteCallback,
+            String authority, int userId) {
+        final String[] syncAdapterPackages = ContentResolver
+                .getSyncAdapterPackagesForAuthorityAsUser(authority, userId);
+        final Bundle result = new Bundle();
+        result.putStringArray(Intent.EXTRA_PACKAGES, syncAdapterPackages);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void awaitRequestSyncStatus(RemoteCallback remoteCallback, String action,
+            Account account, String authority, long timeoutMs) {
+        ContentResolver.cancelSync(account, authority);
+        final Object token = new Object();
+        final SyncStatusObserver observer = which -> {
+            final Bundle result = new Bundle();
+            result.putBoolean(EXTRA_RETURN_RESULT, true);
+            remoteCallback.sendResult(result);
+            mainHandler.removeCallbacksAndMessages(token);
+            finish();
+        };
+        syncStatusHandle = ContentResolver.addStatusChangeListener(
+                ContentResolver.SYNC_OBSERVER_TYPE_ACTIVE
+                        | ContentResolver.SYNC_OBSERVER_TYPE_SETTINGS
+                        | ContentResolver.SYNC_OBSERVER_TYPE_PENDING, observer);
+
+        ContentResolver.requestSync(account, authority, new Bundle());
+        mainHandler.postDelayed(
+                () -> sendError(remoteCallback, new MissingCallbackException(action, timeoutMs)),
+                token, timeoutMs);
+    }
+
+    private void sendGetSharedLibraryDependentPackages(RemoteCallback remoteCallback,
+            String sharedLibName) {
+        final List<SharedLibraryInfo> sharedLibraryInfos = getPackageManager()
+                .getSharedLibraries(0 /* flags */);
+        SharedLibraryInfo sharedLibraryInfo = sharedLibraryInfos.stream().filter(
+                info -> sharedLibName.equals(info.getName())).findAny().orElse(null);
+        final String[] dependentPackages = sharedLibraryInfo == null ? null
+                : sharedLibraryInfo.getDependentPackages().stream()
+                        .map(versionedPackage -> versionedPackage.getPackageName())
+                        .distinct().collect(Collectors.toList()).toArray(new String[]{});
+        final Bundle result = new Bundle();
+        result.putStringArray(Intent.EXTRA_PACKAGES, dependentPackages);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendGetPreferredActivities(RemoteCallback remoteCallback) {
+        final List<IntentFilter> filters = new ArrayList<>();
+        final List<ComponentName> activities = new ArrayList<>();
+        getPackageManager().getPreferredActivities(filters, activities, null /* packageName*/);
+        final String[] packages = activities.stream()
+                .map(componentName -> componentName.getPackageName()).distinct()
+                .collect(Collectors.toList()).toArray(new String[]{});
+        final Bundle result = new Bundle();
+        result.putStringArray(Intent.EXTRA_PACKAGES, packages);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendSetInstallerPackageName(RemoteCallback remoteCallback,
+            String targetPackageName, String installerPackageName) {
+        try {
+            getPackageManager().setInstallerPackageName(targetPackageName, installerPackageName);
+            remoteCallback.sendResult(null);
+            finish();
+        } catch (Exception e) {
+            sendError(remoteCallback, e);
+        }
+    }
+
+    private void sendLauncherAppsShouldHideFromSuggestions(RemoteCallback remoteCallback,
+            String targetPackageName, int userId) {
+        final LauncherApps launcherApps = getSystemService(LauncherApps.class);
+        final boolean hideFromSuggestions = launcherApps.shouldHideFromSuggestions(
+                targetPackageName, UserHandle.of(userId));
+        final Bundle result = new Bundle();
+        result.putBoolean(EXTRA_RETURN_RESULT, hideFromSuggestions);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendCheckUriPermission(RemoteCallback remoteCallback, String sourceAuthority,
+            String targetPackageName, int targetUid) {
+        final Uri uri = Uri.parse("content://" + sourceAuthority);
+        grantUriPermission(targetPackageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        final int permissionResult = checkUriPermission(uri, 0 /* pid */, targetUid,
+                Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        revokeUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        final Bundle result = new Bundle();
+        result.putInt(EXTRA_RETURN_RESULT, permissionResult);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendGrantUriPermission(RemoteCallback remoteCallback, String sourceAuthority,
+            String targetPackageName) {
+        final Uri uri = Uri.parse("content://" + sourceAuthority);
+        grantUriPermission(targetPackageName, uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        remoteCallback.sendResult(null);
+        finish();
+    }
+
+    private void sendRevokeUriPermission(RemoteCallback remoteCallback, String sourceAuthority) {
+        final Uri uri = Uri.parse("content://" + sourceAuthority);
+        revokeUriPermission(uri, Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        remoteCallback.sendResult(null);
+        finish();
+    }
+
+    private void sendCanPackageQuery(RemoteCallback remoteCallback, String sourcePackageName,
+            String targetPackageName) {
+        try {
+            final boolean visibility = getPackageManager().canPackageQuery(sourcePackageName,
+                    targetPackageName);
+            final Bundle result = new Bundle();
+            result.putBoolean(EXTRA_RETURN_RESULT, visibility);
+            remoteCallback.sendResult(result);
+            finish();
+        } catch (PackageManager.NameNotFoundException e) {
+            sendError(remoteCallback, e);
+        }
+    }
+
+    private void sendSessionInfosListResult(RemoteCallback remoteCallback,
+            List<SessionInfo> infos) {
+        final ArrayList<Parcelable> parcelables = new ArrayList<>(infos);
+        for (SessionInfo info : infos) {
+            parcelables.add(info);
+        }
+        final Bundle result = new Bundle();
+        result.putParcelableArrayList(EXTRA_RETURN_RESULT, parcelables);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void awaitLauncherAppsSessionCallback(RemoteCallback remoteCallback,
+            int expectedSessionId, long timeoutMs) {
+        final Object token = new Object();
+        final Bundle result = new Bundle();
+        final LauncherApps launcherApps = getSystemService(LauncherApps.class);
+        final SessionCallback sessionCallback = new SessionCallback() {
+
+            @Override
+            public void onCreated(int sessionId) {
+                // No-op
+            }
+
+            @Override
+            public void onBadgingChanged(int sessionId) {
+                // No-op
+            }
+
+            @Override
+            public void onActiveChanged(int sessionId, boolean active) {
+                // No-op
+            }
+
+            @Override
+            public void onProgressChanged(int sessionId, float progress) {
+                // No-op
+            }
+
+            @Override
+            public void onFinished(int sessionId, boolean success) {
+                if (sessionId != expectedSessionId) {
+                    return;
+                }
+
+                mainHandler.removeCallbacksAndMessages(token);
+                result.putInt(EXTRA_ID, sessionId);
+                remoteCallback.sendResult(result);
+
+                launcherApps.unregisterPackageInstallerSessionCallback(this);
+                finish();
+            }
+        };
+
+        launcherApps.registerPackageInstallerSessionCallback(this.getMainExecutor(),
+                sessionCallback);
+
+        mainHandler.postDelayed(() -> {
+            result.putInt(EXTRA_ID, SessionInfo.INVALID_ID);
+            remoteCallback.sendResult(result);
+
+            launcherApps.unregisterPackageInstallerSessionCallback(sessionCallback);
+            finish();
+        }, token, timeoutMs);
+    }
+
+    private void sendPendingIntentGetActivity(RemoteCallback remoteCallback) {
+        final PendingIntent pendingIntent = PendingIntent.getActivity(this, 0 /* requestCode */,
+                new Intent(this, TestActivity.class), PendingIntent.FLAG_IMMUTABLE);
+        final Bundle result = new Bundle();
+        result.putParcelable(EXTRA_PENDING_INTENT, pendingIntent);
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendPendingIntentGetCreatorPackage(RemoteCallback remoteCallback,
+            PendingIntent pendingIntent) {
+        final Bundle result = new Bundle();
+        result.putString(Intent.EXTRA_PACKAGE_NAME, pendingIntent.getCreatorPackage());
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void sendCheckPackageResult(RemoteCallback remoteCallback, String packageName,
+            int uid) {
+        try {
+            getSystemService(AppOpsManager.class).checkPackage(uid, packageName);
+            final Bundle result = new Bundle();
+            result.putBoolean(EXTRA_RETURN_RESULT, true);
+            remoteCallback.sendResult(result);
+            finish();
+        } catch (SecurityException e) {
+            sendError(remoteCallback, e);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        final RemoteCallback remoteCallback = callbacks.get(requestCode);
+        if (resultCode != RESULT_OK) {
+            Exception e = (Exception) data.getSerializableExtra(EXTRA_ERROR);
+            sendError(remoteCallback, e == null ? new Exception("Result was " + resultCode) : e);
+            return;
+        }
+        final Bundle result = new Bundle();
+        result.putParcelable(EXTRA_RETURN_RESULT, data.getParcelableExtra(EXTRA_RETURN_RESULT));
+        remoteCallback.sendResult(result);
+        finish();
+    }
+
+    private void bindService(RemoteCallback remoteCallback, String packageName) {
+        final String SERVICE_NAME = "android.appenumeration.testapp.DummyService";
+        final Intent intent = new Intent();
+        intent.setClassName(packageName, SERVICE_NAME);
+        final ServiceConnection serviceConnection = new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName className, IBinder service) {
+                // No-op
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName className) {
+                // No-op
+            }
+
+            @Override
+            public void onBindingDied(ComponentName name) {
+                // Remote service die
+                finish();
+            }
+
+            @Override
+            public void onNullBinding(ComponentName name) {
+                // Since the DummyService doesn't implement onBind, it returns null and
+                // onNullBinding would be called. Use postDelayed to keep this service
+                // connection alive for 3 seconds.
+                mainHandler.postDelayed(() -> {
+                    unbindService(this);
+                    finish();
+                }, TIMEOUT_MS);
+            }
+        };
+
+        final boolean bound = bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE);
+        final Bundle result = new Bundle();
+        result.putBoolean(EXTRA_RETURN_RESULT, bound);
+        remoteCallback.sendResult(result);
+        // Don't invoke finish() right here if service is bound successfully to keep the service
+        // connection alive since the ServiceRecord would be remove from the ServiceMap once no
+        // client is binding the service.
+        if (!bound) finish();
+    }
+}
diff --git a/tests/tests/appenumeration/src/android/appenumeration/cts/AppEnumerationTests.java b/tests/tests/appenumeration/src/android/appenumeration/cts/AppEnumerationTests.java
index 0f1d10f..9f2d821 100644
--- a/tests/tests/appenumeration/src/android/appenumeration/cts/AppEnumerationTests.java
+++ b/tests/tests/appenumeration/src/android/appenumeration/cts/AppEnumerationTests.java
@@ -18,8 +18,14 @@
 
 import static android.Manifest.permission.SET_PREFERRED_APPLICATIONS;
 import static android.appenumeration.cts.Constants.ACTION_AWAIT_LAUNCHER_APPS_CALLBACK;
+import static android.appenumeration.cts.Constants.ACTION_AWAIT_LAUNCHER_APPS_SESSION_CALLBACK;
 import static android.appenumeration.cts.Constants.ACTION_BIND_SERVICE;
+import static android.appenumeration.cts.Constants.ACTION_CAN_PACKAGE_QUERY;
+import static android.appenumeration.cts.Constants.ACTION_CHECK_PACKAGE;
 import static android.appenumeration.cts.Constants.ACTION_CHECK_SIGNATURES;
+import static android.appenumeration.cts.Constants.ACTION_CHECK_URI_PERMISSION;
+import static android.appenumeration.cts.Constants.ACTION_GET_ALL_PACKAGE_INSTALLER_SESSIONS;
+import static android.appenumeration.cts.Constants.ACTION_GET_ALL_SESSIONS;
 import static android.appenumeration.cts.Constants.ACTION_GET_INSTALLED_ACCESSIBILITYSERVICES_PACKAGES;
 import static android.appenumeration.cts.Constants.ACTION_GET_INSTALLED_APPWIDGET_PROVIDERS;
 import static android.appenumeration.cts.Constants.ACTION_GET_INSTALLED_PACKAGES;
@@ -28,22 +34,32 @@
 import static android.appenumeration.cts.Constants.ACTION_GET_PACKAGES_FOR_UID;
 import static android.appenumeration.cts.Constants.ACTION_GET_PACKAGE_INFO;
 import static android.appenumeration.cts.Constants.ACTION_GET_PREFERRED_ACTIVITIES;
+import static android.appenumeration.cts.Constants.ACTION_GET_SESSION_INFO;
 import static android.appenumeration.cts.Constants.ACTION_GET_SHAREDLIBRARY_DEPENDENT_PACKAGES;
+import static android.appenumeration.cts.Constants.ACTION_GET_STAGED_SESSIONS;
 import static android.appenumeration.cts.Constants.ACTION_GET_SYNCADAPTER_PACKAGES_FOR_AUTHORITY;
 import static android.appenumeration.cts.Constants.ACTION_GET_SYNCADAPTER_TYPES;
+import static android.appenumeration.cts.Constants.ACTION_GRANT_URI_PERMISSION;
 import static android.appenumeration.cts.Constants.ACTION_HAS_SIGNING_CERTIFICATE;
 import static android.appenumeration.cts.Constants.ACTION_JUST_FINISH;
+import static android.appenumeration.cts.Constants.ACTION_LAUNCHER_APPS_GET_SUSPENDED_PACKAGE_LAUNCHER_EXTRAS;
 import static android.appenumeration.cts.Constants.ACTION_LAUNCHER_APPS_IS_ACTIVITY_ENABLED;
+import static android.appenumeration.cts.Constants.ACTION_LAUNCHER_APPS_SHOULD_HIDE_FROM_SUGGESTIONS;
 import static android.appenumeration.cts.Constants.ACTION_MANIFEST_ACTIVITY;
 import static android.appenumeration.cts.Constants.ACTION_MANIFEST_PROVIDER;
 import static android.appenumeration.cts.Constants.ACTION_MANIFEST_SERVICE;
+import static android.appenumeration.cts.Constants.ACTION_PENDING_INTENT_GET_ACTIVITY;
+import static android.appenumeration.cts.Constants.ACTION_PENDING_INTENT_GET_CREATOR_PACKAGE;
 import static android.appenumeration.cts.Constants.ACTION_QUERY_ACTIVITIES;
 import static android.appenumeration.cts.Constants.ACTION_QUERY_PROVIDERS;
 import static android.appenumeration.cts.Constants.ACTION_QUERY_RESOLVER;
 import static android.appenumeration.cts.Constants.ACTION_QUERY_SERVICES;
+import static android.appenumeration.cts.Constants.ACTION_REQUEST_SYNC_AND_AWAIT_STATUS;
+import static android.appenumeration.cts.Constants.ACTION_REVOKE_URI_PERMISSION;
 import static android.appenumeration.cts.Constants.ACTION_SET_INSTALLER_PACKAGE_NAME;
 import static android.appenumeration.cts.Constants.ACTION_START_DIRECTLY;
 import static android.appenumeration.cts.Constants.ACTION_START_FOR_RESULT;
+import static android.appenumeration.cts.Constants.ACTION_TAKE_PERSISTABLE_URI_PERMISSION;
 import static android.appenumeration.cts.Constants.ACTIVITY_CLASS_DUMMY_ACTIVITY;
 import static android.appenumeration.cts.Constants.ACTIVITY_CLASS_TEST;
 import static android.appenumeration.cts.Constants.CALLBACK_EVENT_INVALID;
@@ -52,11 +68,14 @@
 import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGE_ADDED;
 import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGE_CHANGED;
 import static android.appenumeration.cts.Constants.CALLBACK_EVENT_PACKAGE_REMOVED;
+import static android.appenumeration.cts.Constants.EXTRA_ACCOUNT;
 import static android.appenumeration.cts.Constants.EXTRA_AUTHORITY;
 import static android.appenumeration.cts.Constants.EXTRA_CERT;
 import static android.appenumeration.cts.Constants.EXTRA_DATA;
 import static android.appenumeration.cts.Constants.EXTRA_ERROR;
 import static android.appenumeration.cts.Constants.EXTRA_FLAGS;
+import static android.appenumeration.cts.Constants.EXTRA_ID;
+import static android.appenumeration.cts.Constants.EXTRA_PENDING_INTENT;
 import static android.appenumeration.cts.Constants.EXTRA_REMOTE_CALLBACK;
 import static android.appenumeration.cts.Constants.EXTRA_REMOTE_READY_CALLBACK;
 import static android.appenumeration.cts.Constants.QUERIES_ACTIVITY_ACTION;
@@ -64,7 +83,11 @@
 import static android.appenumeration.cts.Constants.QUERIES_NOTHING_PERM;
 import static android.appenumeration.cts.Constants.QUERIES_NOTHING_PROVIDER;
 import static android.appenumeration.cts.Constants.QUERIES_NOTHING_Q;
+import static android.appenumeration.cts.Constants.QUERIES_NOTHING_RECEIVES_NON_PERSISTABLE_URI;
+import static android.appenumeration.cts.Constants.QUERIES_NOTHING_RECEIVES_NON_PERSISTABLE_URI_APK;
 import static android.appenumeration.cts.Constants.QUERIES_NOTHING_RECEIVES_PERM_URI;
+import static android.appenumeration.cts.Constants.QUERIES_NOTHING_RECEIVES_PERSISTABLE_URI;
+import static android.appenumeration.cts.Constants.QUERIES_NOTHING_RECEIVES_PERSISTABLE_URI_APK;
 import static android.appenumeration.cts.Constants.QUERIES_NOTHING_RECEIVES_URI;
 import static android.appenumeration.cts.Constants.QUERIES_NOTHING_SEES_INSTALLER;
 import static android.appenumeration.cts.Constants.QUERIES_NOTHING_SEES_INSTALLER_APK;
@@ -72,6 +95,7 @@
 import static android.appenumeration.cts.Constants.QUERIES_NOTHING_USES_LIBRARY;
 import static android.appenumeration.cts.Constants.QUERIES_NOTHING_USES_OPTIONAL_LIBRARY;
 import static android.appenumeration.cts.Constants.QUERIES_PACKAGE;
+import static android.appenumeration.cts.Constants.QUERIES_PACKAGE_PROVIDER;
 import static android.appenumeration.cts.Constants.QUERIES_PROVIDER_ACTION;
 import static android.appenumeration.cts.Constants.QUERIES_PROVIDER_AUTH;
 import static android.appenumeration.cts.Constants.QUERIES_SERVICE_ACTION;
@@ -98,6 +122,7 @@
 import static android.appenumeration.cts.Constants.TARGET_FORCEQUERYABLE_NORMAL;
 import static android.appenumeration.cts.Constants.TARGET_NO_API;
 import static android.appenumeration.cts.Constants.TARGET_PREFERRED_ACTIVITY;
+import static android.appenumeration.cts.Constants.TARGET_PREFIX_WILDCARD_WEB;
 import static android.appenumeration.cts.Constants.TARGET_SHARE;
 import static android.appenumeration.cts.Constants.TARGET_SHARED_LIBRARY_PACKAGE;
 import static android.appenumeration.cts.Constants.TARGET_SHARED_USER;
@@ -107,11 +132,13 @@
 import static android.appenumeration.cts.Constants.TARGET_SYNCADAPTER_SHARED_USER;
 import static android.appenumeration.cts.Constants.TARGET_WEB;
 import static android.content.Intent.EXTRA_PACKAGES;
+import static android.content.Intent.EXTRA_UID;
 import static android.content.pm.PackageManager.GET_SIGNING_CERTIFICATES;
 import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
 import static android.content.pm.PackageManager.SIGNATURE_MATCH;
 import static android.content.pm.PackageManager.SIGNATURE_UNKNOWN_PACKAGE;
 import static android.os.Process.INVALID_UID;
+import static android.os.Process.ROOT_UID;
 
 import static com.android.compatibility.common.util.ShellUtils.runShellCommand;
 
@@ -119,6 +146,7 @@
 import static org.hamcrest.Matchers.arrayContainingInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.emptyArray;
+import static org.hamcrest.Matchers.emptyOrNullString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
@@ -132,13 +160,20 @@
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
+import android.Manifest;
+import android.accounts.Account;
+import android.accounts.AccountManager;
 import android.app.PendingIntent;
 import android.appwidget.AppWidgetProviderInfo;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SyncAdapterType;
+import android.content.pm.LauncherApps;
 import android.content.pm.PackageInfo;
+import android.content.pm.PackageInstaller;
+import android.content.pm.PackageInstaller.SessionInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.Signature;
 import android.content.res.Resources;
@@ -155,8 +190,12 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.android.compatibility.common.util.SystemUtil;
 import com.android.compatibility.common.util.AmUtils;
+import com.android.compatibility.common.util.SystemUtil;
+import com.android.cts.install.lib.Install;
+import com.android.cts.install.lib.InstallUtils;
+import com.android.cts.install.lib.LocalIntentSender;
+import com.android.cts.install.lib.TestApp;
 
 import org.hamcrest.core.IsNull;
 import org.junit.AfterClass;
@@ -177,6 +216,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicReference;
@@ -189,9 +229,17 @@
     private static boolean sGlobalFeatureEnabled;
 
     private static PackageManager sPm;
+    private static AccountManager sAccountManager;
 
     // The shared library for getting dependent packages
     private static final String TEST_SHARED_LIB_NAME = "android.test.runner";
+    private static final String TEST_NONEXISTENT_PACKAGE_NAME_1 = "com.android.cts.nonexistent1";
+    private static final String TEST_NONEXISTENT_PACKAGE_NAME_2 = "com.android.cts.nonexistent2";
+
+    private static final Account ACCOUNT_SYNCADAPTER = new Account(
+            TARGET_SYNCADAPTER, "android.appenumeration.account.type");
+    private static final Account ACCOUNT_SYNCADAPTER_SHARED_USER = new Account(
+            TARGET_SYNCADAPTER_SHARED_USER, "android.appenumeration.shareduid.account.type");
 
     @Rule
     public TestName name = new TestName();
@@ -216,12 +264,24 @@
         sResponseHandler = new Handler(sResponseThread.getLooper());
 
         sPm = InstrumentationRegistry.getInstrumentation().getContext().getPackageManager();
+        sAccountManager = AccountManager.get(
+                InstrumentationRegistry.getInstrumentation().getContext());
+
+        assertThat(sAccountManager.addAccountExplicitly(ACCOUNT_SYNCADAPTER,
+                null /* password */, null /* userdata */), is(true));
+        assertThat(sAccountManager.addAccountExplicitly(ACCOUNT_SYNCADAPTER_SHARED_USER,
+                null /* password */, null /* userdata */), is(true));
     }
 
     @AfterClass
     public static void tearDown() {
         if (!sGlobalFeatureEnabled) return;
         sResponseThread.quit();
+
+        assertThat(sAccountManager.removeAccountExplicitly(ACCOUNT_SYNCADAPTER),
+                is(true));
+        assertThat(sAccountManager.removeAccountExplicitly(ACCOUNT_SYNCADAPTER_SHARED_USER),
+                is(true));
     }
 
     @Test
@@ -312,6 +372,45 @@
         assertVisible(QUERIES_NOTHING_RECEIVES_PERM_URI, QUERIES_NOTHING_PERM);
     }
 
+    @Test
+    public void startActivityWithUriGrant_cannotSeeProviderAfterUpdated() throws Exception {
+        assertNotVisible(QUERIES_NOTHING_RECEIVES_NON_PERSISTABLE_URI, QUERIES_NOTHING_PERM);
+
+        // send with uri grant flags; should be visible
+        startExplicitActivityWithIntent(QUERIES_NOTHING_PERM,
+                QUERIES_NOTHING_RECEIVES_NON_PERSISTABLE_URI,
+                new Intent(ACTION_JUST_FINISH)
+                        .setData(Uri.parse("content://" + QUERIES_NOTHING_PERM + "3/test"))
+                        .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION));
+        assertVisible(QUERIES_NOTHING_RECEIVES_NON_PERSISTABLE_URI, QUERIES_NOTHING_PERM);
+
+        // update the package; shouldn't be visible
+        runShellCommand("pm install " + QUERIES_NOTHING_RECEIVES_NON_PERSISTABLE_URI_APK);
+        // Wait until the updating is done
+        AmUtils.waitForBroadcastIdle();
+        assertNotVisible(QUERIES_NOTHING_RECEIVES_NON_PERSISTABLE_URI, QUERIES_NOTHING_PERM);
+    }
+
+    @Test
+    public void startActivityWithPersistableUriGrant_canSeeProviderAfterUpdated() throws Exception {
+        assertNotVisible(QUERIES_NOTHING_RECEIVES_PERSISTABLE_URI, QUERIES_NOTHING_PERM);
+
+        // send with persistable uri grant flags; should be visible
+        startExplicitActivityWithIntent(QUERIES_NOTHING_PERM,
+                QUERIES_NOTHING_RECEIVES_PERSISTABLE_URI,
+                new Intent(ACTION_TAKE_PERSISTABLE_URI_PERMISSION)
+                        .setData(Uri.parse("content://" + QUERIES_NOTHING_PERM + "3/test"))
+                        .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION
+                                | Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION));
+        assertVisible(QUERIES_NOTHING_RECEIVES_PERSISTABLE_URI, QUERIES_NOTHING_PERM);
+
+        // update the package; should be still visible
+        runShellCommand("pm install " + QUERIES_NOTHING_RECEIVES_PERSISTABLE_URI_APK);
+        // Wait until the updating is done
+        AmUtils.waitForBroadcastIdle();
+        assertVisible(QUERIES_NOTHING_RECEIVES_PERSISTABLE_URI, QUERIES_NOTHING_PERM);
+    }
+
     private void startExplicitActivityWithIntent(
             String sourcePackageName, String targetPackageName, Intent intent) throws Exception {
         sendCommandBlocking(sourcePackageName, targetPackageName,
@@ -639,6 +738,18 @@
         assertVisible(QUERIES_WILDCARD_BROWSER, TARGET_BROWSER_WILDCARD);
     }
 
+    @Test
+    public void queriesWildcardWeb_canSeePrefixWildcardWeb() throws Exception {
+        assertNotVisible(QUERIES_NOTHING, TARGET_PREFIX_WILDCARD_WEB);
+        assertVisible(QUERIES_WILDCARD_BROWSABLE, TARGET_PREFIX_WILDCARD_WEB);
+        assertVisible(QUERIES_WILDCARD_WEB, TARGET_PREFIX_WILDCARD_WEB);
+    }
+
+    @Test
+    public void queriesWildcardBrowser_cannotseePrefixWildcardWeb() throws Exception {
+        assertNotVisible(QUERIES_NOTHING, TARGET_PREFIX_WILDCARD_WEB);
+        assertNotVisible(QUERIES_WILDCARD_BROWSER, TARGET_PREFIX_WILDCARD_WEB);
+    }
 
     @Test
     public void queriesWildcardEditor() throws Exception {
@@ -761,6 +872,66 @@
     }
 
     @Test
+    public void uninstallTarget_broadcastFullyRemoved_notVisibleDoesNotReceive() throws Exception {
+        ensurePackageIsInstalled(TARGET_STUB, TARGET_STUB_APK);
+        final Result result = sendCommand(QUERIES_NOTHING, TARGET_STUB,
+                /* targetUid */ INVALID_UID, /* intentExtra */ null,
+                Constants.ACTION_AWAIT_PACKAGE_FULLY_REMOVED, /* waitForReady */ true);
+        runShellCommand("pm uninstall " + TARGET_STUB);
+        try {
+            result.await();
+            fail();
+        } catch (MissingBroadcastException e) {
+            // hooray
+        }
+    }
+
+    @Test
+    public void uninstallTarget_broadcastFullyRemoved_visibleReceives() throws Exception {
+        ensurePackageIsInstalled(TARGET_STUB, TARGET_STUB_APK);
+        final Result result = sendCommand(QUERIES_NOTHING_PERM, TARGET_STUB,
+                /* targetUid */ INVALID_UID, /* intentExtra */ null,
+                Constants.ACTION_AWAIT_PACKAGE_FULLY_REMOVED, /* waitForReady */ true);
+        runShellCommand("pm uninstall " + TARGET_STUB);
+        try {
+            Assert.assertEquals(TARGET_STUB,
+                    Uri.parse(result.await().getString(EXTRA_DATA)).getSchemeSpecificPart());
+        } catch (MissingBroadcastException e) {
+            fail();
+        }
+    }
+
+    @Test
+    public void clearTargetData_broadcastDataCleared_notVisibleDoesNotReceive() throws Exception {
+        ensurePackageIsInstalled(TARGET_STUB, TARGET_STUB_APK);
+        final Result result = sendCommand(QUERIES_NOTHING, TARGET_STUB,
+                /* targetUid */ INVALID_UID, /* intentExtra */ null,
+                Constants.ACTION_AWAIT_PACKAGE_DATA_CLEARED, /* waitForReady */ true);
+        runShellCommand("pm clear --user cur " + TARGET_STUB);
+        try {
+            result.await();
+            fail();
+        } catch (MissingBroadcastException e) {
+            // hooray
+        }
+    }
+
+    @Test
+    public void clearTargetData_broadcastDataCleared_visibleReceives() throws Exception {
+        ensurePackageIsInstalled(TARGET_STUB, TARGET_STUB_APK);
+        final Result result = sendCommand(QUERIES_NOTHING_PERM, TARGET_STUB,
+                /* targetUid */ INVALID_UID, /* intentExtra */ null,
+                Constants.ACTION_AWAIT_PACKAGE_DATA_CLEARED, /* waitForReady */ true);
+        runShellCommand("pm clear --user cur " + TARGET_STUB);
+        try {
+            Assert.assertEquals(TARGET_STUB,
+                    Uri.parse(result.await().getString(EXTRA_DATA)).getSchemeSpecificPart());
+        } catch (MissingBroadcastException e) {
+            fail();
+        }
+    }
+
+    @Test
     public void broadcastSuspended_visibleReceives() throws Exception {
         assertBroadcastSuspendedVisible(QUERIES_PACKAGE,
                 Arrays.asList(TARGET_NO_API, TARGET_SYNCADAPTER),
@@ -923,6 +1094,546 @@
     }
 
     @Test
+    public void launcherAppsSessionCallback_queriesNothing_cannotSeeSession() throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Result result = sendCommandAndWaitForLauncherAppsSessionCallback(
+                    QUERIES_NOTHING, sessionId);
+            commitSession(sessionId);
+            final Bundle response = result.await();
+            assertThat(response.getInt(EXTRA_ID), equalTo(SessionInfo.INVALID_ID));
+        } finally {
+            runShellCommand("pm uninstall " + TestApp.A);
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void launcherAppsSessionCallback_queriesNothingHasPermission_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Result result = sendCommandAndWaitForLauncherAppsSessionCallback(
+                    QUERIES_NOTHING_PERM, sessionId);
+            commitSession(sessionId);
+            final Bundle response = result.await();
+            assertThat(response.getInt(EXTRA_ID), equalTo(sessionId));
+        } finally {
+            runShellCommand("pm uninstall " + TestApp.A);
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void launcherAppsSessionCallback_queriesPackage_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Result result = sendCommandAndWaitForLauncherAppsSessionCallback(
+                    QUERIES_PACKAGE, sessionId);
+            commitSession(sessionId);
+            final Bundle response = result.await();
+            assertThat(response.getInt(EXTRA_ID), equalTo(sessionId));
+        } finally {
+            runShellCommand("pm uninstall " + TestApp.A);
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void launcherAppsSessionCallback_queriesNothingTargetsQ_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Result result = sendCommandAndWaitForLauncherAppsSessionCallback(
+                    QUERIES_NOTHING_Q, sessionId);
+            commitSession(sessionId);
+            final Bundle response = result.await();
+            assertThat(response.getInt(EXTRA_ID), equalTo(sessionId));
+        } finally {
+            runShellCommand("pm uninstall " + TestApp.A);
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void launcherAppsSessionCallback_sessionOwner_canSeeSession() throws Exception {
+        try {
+            adoptShellPermissions();
+            final CountDownLatch countDownLatch = new CountDownLatch(1);
+            final int expectedSessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Context context = InstrumentationRegistry
+                    .getInstrumentation()
+                    .getContext();
+            final LauncherApps launcherApps = context.getSystemService(LauncherApps.class);
+            final PackageInstaller.SessionCallback
+                    sessionCallback = new PackageInstaller.SessionCallback() {
+
+                @Override
+                public void onCreated(int sessionId) {
+                    // No-op
+                }
+
+                @Override
+                public void onBadgingChanged(int sessionId) {
+                    // No-op
+                }
+
+                @Override
+                public void onActiveChanged(int sessionId, boolean active) {
+                    // No-op
+                }
+
+                @Override
+                public void onProgressChanged(int sessionId, float progress) {
+                    // No-op
+                }
+
+                @Override
+                public void onFinished(int sessionId, boolean success) {
+                    if (sessionId != expectedSessionId) {
+                        return;
+                    }
+
+                    launcherApps.unregisterPackageInstallerSessionCallback(this);
+                    countDownLatch.countDown();
+                }
+            };
+
+            launcherApps.registerPackageInstallerSessionCallback(context.getMainExecutor(),
+                    sessionCallback);
+
+            commitSession(expectedSessionId);
+            assertTrue(countDownLatch.await(5, TimeUnit.SECONDS));
+        } finally {
+            runShellCommand("pm uninstall " + TestApp.A);
+            dropShellPermissions();
+        }
+    }
+
+    private Result sendCommandAndWaitForLauncherAppsSessionCallback(String sourcePackageName,
+            int expectedSessionId) throws Exception {
+        final Bundle extra = new Bundle();
+        extra.putInt(EXTRA_ID, expectedSessionId);
+        final Result result = sendCommand(sourcePackageName, /* targetPackageName */ null,
+                /* targetUid */ INVALID_UID, extra, ACTION_AWAIT_LAUNCHER_APPS_SESSION_CALLBACK,
+                /* waitForReady */ true);
+        return result;
+    }
+
+    @Test
+    public void launcherApps_getAllPkgInstallerSessions_queriesNothing_cannotSeeSessions()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_ALL_PACKAGE_INSTALLER_SESSIONS,
+                    QUERIES_NOTHING, SessionInfo.INVALID_ID);
+            assertSessionNotVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void launcherApps_getAllPkgInstallerSessions_queriesNothingHasPermission_canSeeSessions()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_ALL_PACKAGE_INSTALLER_SESSIONS,
+                    QUERIES_NOTHING_PERM, SessionInfo.INVALID_ID);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void launcherApps_getAllPkgInstallerSessions_queriesPackage_canSeeSessions()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_ALL_PACKAGE_INSTALLER_SESSIONS,
+                    QUERIES_PACKAGE, SessionInfo.INVALID_ID);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void launcherApps_getAllPkgInstallerSessions_queriesNothingTargetsQ_canSeeSessions()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_ALL_PACKAGE_INSTALLER_SESSIONS,
+                    QUERIES_NOTHING_Q, SessionInfo.INVALID_ID);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void launcherApps_getAllPkgInstallerSessions_sessionOwner_canSeeSessions()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final LauncherApps launcherApps = InstrumentationRegistry
+                    .getInstrumentation()
+                    .getContext()
+                    .getSystemService(LauncherApps.class);
+            final Integer[] sessionIds = launcherApps.getAllPackageInstallerSessions().stream()
+                    .map(i -> i.getSessionId())
+                    .distinct()
+                    .toArray(Integer[]::new);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getSessionInfo_queriesNothing_cannotSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_SESSION_INFO,
+                    QUERIES_NOTHING, sessionId);
+            assertSessionNotVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getSessionInfo_queriesNothingHasPermission_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_SESSION_INFO,
+                    QUERIES_NOTHING_PERM, sessionId);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getSessionInfo_queriesPackage_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_SESSION_INFO,
+                    QUERIES_PACKAGE, sessionId);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getSessionInfo_queriesNothingTargetsQ_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_SESSION_INFO,
+                    QUERIES_NOTHING_Q, sessionId);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getSessionInfo_sessionOwner_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final PackageInstaller installer = InstrumentationRegistry
+                    .getInstrumentation()
+                    .getContext()
+                    .getPackageManager()
+                    .getPackageInstaller();
+            final SessionInfo info = installer.getSessionInfo(sessionId);
+            assertThat(info, IsNull.notNullValue());
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getStagedSessions_queriesNothing_cannotSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A).setStaged()
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_STAGED_SESSIONS,
+                    QUERIES_NOTHING, sessionId);
+            assertSessionNotVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getStagedSessions_queriesNothingHasPermission_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A).setStaged()
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_STAGED_SESSIONS,
+                    QUERIES_NOTHING_PERM, sessionId);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getStagedSessions_queriesPackage_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A).setStaged()
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_STAGED_SESSIONS,
+                    QUERIES_PACKAGE, sessionId);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getStagedSessions_queriesNothingTargetsQ_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A).setStaged()
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_STAGED_SESSIONS,
+                    QUERIES_NOTHING_Q, sessionId);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getStagedSessions_sessionOwner_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A).setStaged()
+                    .createSession();
+            final PackageInstaller installer = InstrumentationRegistry
+                    .getInstrumentation()
+                    .getContext()
+                    .getPackageManager()
+                    .getPackageInstaller();
+            final Integer[] sessionIds = installer.getStagedSessions().stream()
+                    .map(i -> i.getSessionId())
+                    .distinct()
+                    .toArray(Integer[]::new);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getAllSessions_queriesNothing_cannotSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_ALL_SESSIONS,
+                    QUERIES_NOTHING, sessionId);
+            assertSessionNotVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getAllSessions_queriesNothingHasPermission_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_ALL_SESSIONS,
+                    QUERIES_NOTHING_PERM, sessionId);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getAllSessions_queriesPackage_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_ALL_SESSIONS,
+                    QUERIES_PACKAGE, sessionId);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getAllSessions_queriesNothingTargetsQ_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final Integer[] sessionIds = getSessionInfos(ACTION_GET_ALL_SESSIONS,
+                    QUERIES_NOTHING_Q, sessionId);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    @Test
+    public void packageInstaller_getAllSessions_sessionOwner_canSeeSession()
+            throws Exception {
+        try {
+            adoptShellPermissions();
+            final int sessionId = Install.single(TestApp.A1).setPackageName(TestApp.A)
+                    .createSession();
+            final PackageInstaller installer = InstrumentationRegistry
+                    .getInstrumentation()
+                    .getContext()
+                    .getPackageManager()
+                    .getPackageInstaller();
+            final Integer[] sessionIds = installer.getAllSessions().stream()
+                    .map(i -> i.getSessionId())
+                    .distinct()
+                    .toArray(Integer[]::new);
+            assertSessionVisible(sessionIds, sessionId);
+        } finally {
+            cleanUpSessions();
+            dropShellPermissions();
+        }
+    }
+
+    private Integer[] getSessionInfos(String action, String sourcePackageName, int sessionId)
+            throws Exception {
+        final Bundle extraData = new Bundle();
+        extraData.putInt(EXTRA_ID, sessionId);
+        final Bundle response = sendCommandBlocking(sourcePackageName, /* targetPackageName */ null,
+                extraData, action);
+        final List<Parcelable> parcelables = response.getParcelableArrayList(
+                Intent.EXTRA_RETURN_RESULT);
+        return parcelables.stream()
+                .map(i -> (i == null ? SessionInfo.INVALID_ID : ((SessionInfo) i).getSessionId()))
+                .distinct()
+                .toArray(Integer[]::new);
+    }
+
+    private void assertSessionVisible(Integer[] sessionIds, int sessionId) {
+        if (!sGlobalFeatureEnabled) {
+            return;
+        }
+        assertThat(sessionIds, hasItemInArray(sessionId));
+    }
+
+    private void assertSessionNotVisible(Integer[] sessionIds, int sessionId) {
+        if (!sGlobalFeatureEnabled) {
+            return;
+        }
+        assertThat(sessionIds, not(hasItemInArray(sessionId)));
+    }
+
+    private static void commitSession(int sessionId) throws Exception {
+        final PackageInstaller.Session session =
+                InstallUtils.openPackageInstallerSession(sessionId);
+        final LocalIntentSender sender = new LocalIntentSender();
+        session.commit(sender.getIntentSender());
+        InstallUtils.assertStatusSuccess(sender.getResult());
+    }
+
+    private void adoptShellPermissions() {
+        InstrumentationRegistry
+                .getInstrumentation()
+                .getUiAutomation()
+                .adoptShellPermissionIdentity(Manifest.permission.INSTALL_PACKAGES);
+    }
+
+    private void dropShellPermissions() {
+        InstrumentationRegistry
+                .getInstrumentation()
+                .getUiAutomation()
+                .dropShellPermissionIdentity();
+    }
+
+    private void cleanUpSessions() {
+        InstallUtils.getPackageInstaller().getMySessions().forEach(info -> {
+            try {
+                InstallUtils.getPackageInstaller().abandonSession(info.getSessionId());
+            } catch (Exception ignore) {
+            }
+        });
+    }
+
+    @Test
     public void queriesResolver_grantsVisibilityToProvider() throws Exception {
         assertNotVisible(QUERIES_NOTHING_PROVIDER, QUERIES_NOTHING_PERM);
 
@@ -983,6 +1694,32 @@
     }
 
     @Test
+    public void queriesPackage_requestSync_canSeeSyncadapterTarget()
+            throws Exception {
+        assertThat(requestSyncAndAwaitStatus(QUERIES_PACKAGE,
+                        ACCOUNT_SYNCADAPTER, TARGET_SYNCADAPTER),
+                is(true));
+    }
+
+    @Test
+    public void queriesNothingSharedUser_requestSync_canSeeSyncadapterSharedUserTarget()
+            throws Exception {
+        assertThat(requestSyncAndAwaitStatus(QUERIES_NOTHING_SHARED_USER,
+                        ACCOUNT_SYNCADAPTER_SHARED_USER, TARGET_SYNCADAPTER_SHARED_USER),
+                is(true));
+    }
+
+    @Test
+    public void queriesNothing_requestSync_cannotSeeSyncadapterTarget() {
+        assertThrows(MissingCallbackException.class,
+                () -> requestSyncAndAwaitStatus(QUERIES_NOTHING,
+                        ACCOUNT_SYNCADAPTER, TARGET_SYNCADAPTER));
+        assertThrows(MissingCallbackException.class,
+                () -> requestSyncAndAwaitStatus(QUERIES_NOTHING,
+                        ACCOUNT_SYNCADAPTER_SHARED_USER, TARGET_SYNCADAPTER_SHARED_USER));
+    }
+
+    @Test
     public void queriesNothingSharedUser_getSyncAdapterPackages_canSeeSyncadapterSharedUserTarget()
             throws Exception {
         assertVisible(QUERIES_NOTHING_SHARED_USER, TARGET_SYNCADAPTER_SHARED_USER,
@@ -1010,6 +1747,64 @@
     }
 
     @Test
+    public void launcherAppsGetSuspendedPackageLauncherExtras_queriesNothingHasPerm_canGetExtras()
+            throws Exception {
+        try {
+            setPackagesSuspendedWithLauncherExtras(/* suspend */ true,
+                    Arrays.asList(TARGET_NO_API), /* extras */ true);
+            Assert.assertNotNull(launcherAppsGetSuspendedPackageLauncherExtras(QUERIES_NOTHING_PERM,
+                            TARGET_NO_API));
+        } finally {
+            setPackagesSuspended(/* suspend */ false, Arrays.asList(TARGET_NO_API));
+        }
+    }
+
+    @Test
+    public void launcherAppsGetSuspendedPackageLauncherExtras_queriesNothing_cannotGetExtras()
+            throws Exception {
+        try {
+            setPackagesSuspendedWithLauncherExtras(/* suspend */ true,
+                    Arrays.asList(TARGET_NO_API), /* extras */ true);
+            Assert.assertNull(launcherAppsGetSuspendedPackageLauncherExtras(QUERIES_NOTHING,
+                    TARGET_NO_API));
+        } finally {
+            setPackagesSuspended(/* suspend */ false, Arrays.asList(TARGET_NO_API));
+        }
+    }
+
+    @Test
+    public void launcherAppsShouldHideFromSuggestions_queriesPackage_canSeeNoApi()
+            throws Exception {
+        setDistractingPackageRestrictions(new String[]{TARGET_NO_API},
+                PackageManager.RESTRICTION_HIDE_FROM_SUGGESTIONS);
+
+        try {
+            final boolean hideFromSuggestions = shouldHideFromSuggestions(
+                    QUERIES_PACKAGE, TARGET_NO_API);
+            assertThat(hideFromSuggestions, is(true));
+        } finally {
+            setDistractingPackageRestrictions(new String[]{TARGET_NO_API},
+                    PackageManager.RESTRICTION_NONE);
+        }
+    }
+
+    @Test
+    public void launcherAppsShouldHideFromSuggestions_queriesNothing_cannotSeeNoApi()
+            throws Exception {
+        setDistractingPackageRestrictions(new String[]{TARGET_NO_API},
+                PackageManager.RESTRICTION_HIDE_FROM_SUGGESTIONS);
+
+        try {
+            final boolean hideFromSuggestions = shouldHideFromSuggestions(
+                    QUERIES_NOTHING, TARGET_NO_API);
+            assertThat(hideFromSuggestions, is(false));
+        } finally {
+            setDistractingPackageRestrictions(new String[]{TARGET_NO_API},
+                    PackageManager.RESTRICTION_NONE);
+        }
+    }
+
+    @Test
     public void queriesPackage_canSeeAppWidgetProviderTarget() throws Exception {
         assumeTrue(InstrumentationRegistry.getInstrumentation().getContext().getPackageManager()
                 .hasSystemFeature(PackageManager.FEATURE_APP_WIDGETS));
@@ -1097,6 +1892,160 @@
         assertThat(ex.getMessage(), containsString(TARGET_NO_API));
     }
 
+    @Test
+    public void queriesPackageHasProvider_checkUriPermission_canSeeNoApi() throws Exception {
+        final int permissionResult = checkUriPermission(QUERIES_PACKAGE_PROVIDER, TARGET_NO_API);
+        assertThat(permissionResult, is(PackageManager.PERMISSION_GRANTED));
+    }
+
+    @Test
+    public void queriesPackageHasProvider_checkUriPermission_cannotSeeFilters() throws Exception {
+        final int permissionResult = checkUriPermission(QUERIES_PACKAGE_PROVIDER, TARGET_FILTERS);
+        assertThat(permissionResult, is(PackageManager.PERMISSION_DENIED));
+    }
+
+    @Test
+    public void queriesPackageHasProvider_grantUriPermission_canSeeNoApi() throws Exception {
+        try {
+            grantUriPermission(QUERIES_PACKAGE_PROVIDER, TARGET_NO_API);
+            assertThat(InstrumentationRegistry.getInstrumentation().getContext()
+                    .checkUriPermission(
+                            Uri.parse("content://" + QUERIES_PACKAGE_PROVIDER),
+                            0 /* pid */,
+                            sPm.getPackageUid(TARGET_NO_API, 0 /* flags */),
+                            Intent.FLAG_GRANT_READ_URI_PERMISSION),
+                    is(PackageManager.PERMISSION_GRANTED));
+        } finally {
+            revokeUriPermission(QUERIES_PACKAGE_PROVIDER);
+        }
+    }
+
+    @Test
+    public void queriesPackageHasProvider_grantUriPermission_cannotSeeFilters() throws Exception {
+        try {
+            grantUriPermission(QUERIES_PACKAGE_PROVIDER, TARGET_FILTERS);
+            assertThat(InstrumentationRegistry.getInstrumentation().getContext()
+                            .checkUriPermission(
+                                    Uri.parse("content://" + QUERIES_PACKAGE_PROVIDER),
+                                    0 /* pid */,
+                                    sPm.getPackageUid(TARGET_FILTERS, 0 /* flags */),
+                                    Intent.FLAG_GRANT_READ_URI_PERMISSION),
+                    is(PackageManager.PERMISSION_DENIED));
+        } finally {
+            revokeUriPermission(QUERIES_PACKAGE_PROVIDER);
+        }
+    }
+
+    @Test
+    public void canPackageQuery_queriesActivityAction_canSeeFilters() throws Exception {
+        assertThat(sPm.canPackageQuery(QUERIES_ACTIVITY_ACTION, TARGET_FILTERS),
+                is(true));
+    }
+
+    @Test
+    public void canPackageQuery_queriesNothing_cannotSeeFilters() throws Exception {
+        assertThat(sPm.canPackageQuery(QUERIES_NOTHING, TARGET_FILTERS),
+                is(false));
+    }
+
+    @Test
+    public void canPackageQuery_withNonexistentPackages() {
+        assertThrows(PackageManager.NameNotFoundException.class,
+                () -> sPm.canPackageQuery(
+                        TEST_NONEXISTENT_PACKAGE_NAME_1, TEST_NONEXISTENT_PACKAGE_NAME_2));
+        assertThrows(PackageManager.NameNotFoundException.class,
+                () -> sPm.canPackageQuery(
+                        QUERIES_NOTHING_PERM, TEST_NONEXISTENT_PACKAGE_NAME_2));
+        assertThrows(PackageManager.NameNotFoundException.class,
+                () -> sPm.canPackageQuery(
+                        TEST_NONEXISTENT_PACKAGE_NAME_1, TARGET_FILTERS));
+    }
+
+    @Test
+    public void canPackageQuery_callerHasNoPackageVisibility() {
+        assertThrows(PackageManager.NameNotFoundException.class,
+                () -> canPackageQuery(
+                        QUERIES_NOTHING, QUERIES_ACTIVITY_ACTION, TARGET_FILTERS));
+        assertThrows(PackageManager.NameNotFoundException.class,
+                () -> canPackageQuery(
+                        QUERIES_NOTHING_SHARED_USER, QUERIES_PACKAGE, TARGET_SHARED_USER));
+    }
+
+    @Test
+    public void checkPackage_queriesNothing_validateFailed() {
+        // Using ROOT_UID here to pass the check in #verifyAndGetBypass, this is intended by design.
+        assertThrows(SecurityException.class,
+                () -> checkPackage(QUERIES_NOTHING, TARGET_FILTERS, ROOT_UID));
+    }
+
+    @Test
+    public void checkPackage_queriesNothing_targetIsNotExisting_validateFailed() {
+        // Using ROOT_UID here to pass the check in #verifyAndGetBypass, this is intended by design.
+        assertThrows(SecurityException.class,
+                () -> checkPackage(QUERIES_NOTHING, TEST_NONEXISTENT_PACKAGE_NAME_1, ROOT_UID));
+    }
+
+    @Test
+    public void checkPackage_queriesNothingHasPerm_validateSuccessful() throws Exception {
+        // Using ROOT_UID here to pass the check in #verifyAndGetBypass, this is intended by design.
+        assertThat(checkPackage(QUERIES_NOTHING_PERM, TARGET_FILTERS, ROOT_UID), is(true));
+    }
+
+    @Test
+    public void checkPackage_queriesNothingHasPerm_targetIsNotExisting_validateFailed()
+            throws Exception {
+        // Using ROOT_UID here to pass the check in #verifyAndGetBypass, this is intended by design.
+        assertThrows(SecurityException.class,
+                () -> checkPackage(QUERIES_NOTHING_PERM, TEST_NONEXISTENT_PACKAGE_NAME_1,
+                        ROOT_UID));
+    }
+
+    @Test
+    public void pendingIntent_getCreatorPackage_queriesPackage_canSeeNoApi()
+            throws Exception {
+        final PendingIntent pendingIntent = getPendingIntentActivity(TARGET_NO_API);
+        assertThat(getPendingIntentCreatorPackage(QUERIES_PACKAGE, pendingIntent),
+                is(TARGET_NO_API));
+    }
+
+    @Test
+    public void pendingIntent_getCreatorPackage_queriesNothing_cannotSeeNoApi()
+            throws Exception {
+        final PendingIntent pendingIntent = getPendingIntentActivity(TARGET_NO_API);
+        assertThat(getPendingIntentCreatorPackage(QUERIES_NOTHING, pendingIntent),
+                is(emptyOrNullString()));
+    }
+
+    @Test
+    public void makeUidVisible_throwsException() throws Exception {
+        final int recipientUid = sPm.getPackageUid(
+                QUERIES_NOTHING, PackageManager.PackageInfoFlags.of(0));
+        final int visibleUid = sPm.getPackageUid(
+                TARGET_NO_API, PackageManager.PackageInfoFlags.of(0));
+        assertThrows(SecurityException.class,
+                () -> sPm.makeUidVisible(recipientUid, visibleUid));
+    }
+
+    @Test
+    public void makeUidVisible_queriesNothing_canSeeStub() throws Exception {
+        ensurePackageIsInstalled(TARGET_STUB, TARGET_STUB_APK);
+        try {
+            assertNotVisible(QUERIES_NOTHING, TARGET_STUB);
+
+            final int recipientUid = sPm.getPackageUid(
+                    QUERIES_NOTHING, PackageManager.PackageInfoFlags.of(0));
+            final int visibleUid = sPm.getPackageUid(
+                    TARGET_STUB, PackageManager.PackageInfoFlags.of(0));
+            SystemUtil.runWithShellPermissionIdentity(
+                    () -> sPm.makeUidVisible(recipientUid, visibleUid),
+                            Manifest.permission.MAKE_UID_VISIBLE);
+
+            assertVisible(QUERIES_NOTHING, TARGET_STUB);
+        } finally {
+            ensurePackageIsNotInstalled(TARGET_STUB);
+        }
+    }
+
     private void assertNotVisible(String sourcePackageName, String targetPackageName)
             throws Exception {
         if (!sGlobalFeatureEnabled) return;
@@ -1270,6 +2219,15 @@
         return certs;
     }
 
+    private boolean checkPackage(String sourcePackageName, String targetPackageName, int targetUid)
+            throws Exception {
+        final Bundle extra = new Bundle();
+        extra.putInt(EXTRA_UID, targetUid);
+        final Bundle response = sendCommandBlocking(sourcePackageName, targetPackageName, extra,
+                ACTION_CHECK_PACKAGE);
+        return response.getBoolean(Intent.EXTRA_RETURN_RESULT);
+    }
+
     private PackageInfo startForResult(String sourcePackageName, String targetPackageName)
             throws Exception {
         Bundle response = sendCommandBlocking(sourcePackageName, targetPackageName,
@@ -1283,7 +2241,7 @@
                 InstrumentationRegistry.getInstrumentation().getContext(), 100,
                 new Intent("android.appenumeration.cts.action.SEND_RESULT").setComponent(
                         new ComponentName(targetPackageName,
-                                "android.appenumeration.cts.query.TestActivity")),
+                                "android.appenumeration.cts.TestActivity")),
                 PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_IMMUTABLE);
 
         Bundle response = sendCommandBlocking(sourcePackageName, targetPackageName,
@@ -1377,7 +2335,22 @@
         return response.getStringArray(Intent.EXTRA_PACKAGES);
     }
 
+    private boolean requestSyncAndAwaitStatus(String sourcePackageName, Account account,
+            String targetPackageName) throws Exception {
+        final Bundle extraData = new Bundle();
+        extraData.putParcelable(EXTRA_ACCOUNT, account);
+        extraData.putString(EXTRA_AUTHORITY, targetPackageName + ".authority");
+        final Bundle response = sendCommandBlocking(sourcePackageName, /* targetPackageName */ null,
+                extraData, ACTION_REQUEST_SYNC_AND_AWAIT_STATUS);
+        return response.getBoolean(Intent.EXTRA_RETURN_RESULT);
+    }
+
     private void setPackagesSuspended(boolean suspend, List<String> packages) {
+        setPackagesSuspendedWithLauncherExtras(suspend, packages, /* persistableBundle */ false);
+    }
+
+    private void setPackagesSuspendedWithLauncherExtras(boolean suspend, List<String> packages,
+            boolean extras) {
         final StringBuilder cmd = new StringBuilder("pm ");
         if (suspend) {
             cmd.append("suspend");
@@ -1385,6 +2358,9 @@
             cmd.append("unsuspend");
         }
         cmd.append(" --user cur");
+        if (extras) {
+            cmd.append(" --les foo bar");
+        }
         packages.stream().forEach(p -> cmd.append(" ").append(p));
         runShellCommand(cmd.toString());
     }
@@ -1398,6 +2374,13 @@
         return response.getBoolean(Intent.EXTRA_RETURN_RESULT);
     }
 
+    private Bundle launcherAppsGetSuspendedPackageLauncherExtras(String sourcePackageName,
+            String targetPackageName) throws Exception {
+        final Bundle response = sendCommandBlocking(sourcePackageName, targetPackageName,
+                /* extraData */ null, ACTION_LAUNCHER_APPS_GET_SUSPENDED_PACKAGE_LAUNCHER_EXTRAS);
+        return response.getBundle(Intent.EXTRA_RETURN_RESULT);
+    }
+
     private String[] getSharedLibraryDependentPackages(String sourcePackageName) throws Exception {
         final Bundle extraData = new Bundle();
         final Bundle response = sendCommandBlocking(sourcePackageName, TEST_SHARED_LIB_NAME,
@@ -1420,6 +2403,70 @@
                 extraData, ACTION_SET_INSTALLER_PACKAGE_NAME);
     }
 
+    private void setDistractingPackageRestrictions(String[] packagesToRestrict,
+            int distractionFlags) throws Exception {
+        final String[] failed = SystemUtil.callWithShellPermissionIdentity(
+                () -> sPm.setDistractingPackageRestrictions(packagesToRestrict, distractionFlags));
+        assertThat(failed, emptyArray());
+    }
+
+    private boolean shouldHideFromSuggestions(String sourcePackageName, String targetPackageName)
+            throws Exception {
+        final Bundle extraData = new Bundle();
+        extraData.putInt(Intent.EXTRA_USER, Process.myUserHandle().getIdentifier());
+        final Bundle response = sendCommandBlocking(sourcePackageName, targetPackageName, extraData,
+                ACTION_LAUNCHER_APPS_SHOULD_HIDE_FROM_SUGGESTIONS);
+        return response.getBoolean(Intent.EXTRA_RETURN_RESULT);
+    }
+
+    private int checkUriPermission(String sourcePackageName, String targetPackageName)
+            throws Exception {
+        final int targetUid = sPm.getPackageUid(targetPackageName, /* flags */ 0);
+        final Bundle extraData = new Bundle();
+        extraData.putString(EXTRA_AUTHORITY, sourcePackageName);
+        final Result result = sendCommand(sourcePackageName, targetPackageName, targetUid,
+                extraData, ACTION_CHECK_URI_PERMISSION, /* waitForReady */ false);
+        final Bundle response = result.await();
+        return response.getInt(Intent.EXTRA_RETURN_RESULT);
+    }
+
+    private void grantUriPermission(String providerPackageName, String targetPackageName)
+            throws Exception {
+        final Bundle extraData = new Bundle();
+        extraData.putString(EXTRA_AUTHORITY, providerPackageName);
+        sendCommandBlocking(providerPackageName, targetPackageName, extraData,
+                ACTION_GRANT_URI_PERMISSION);
+    }
+
+    private void revokeUriPermission(String providerPackageName) throws Exception {
+        final Bundle extraData = new Bundle();
+        extraData.putString(EXTRA_AUTHORITY, providerPackageName);
+        sendCommandBlocking(providerPackageName, null /* targetPackageName */, extraData,
+                ACTION_REVOKE_URI_PERMISSION);
+    }
+
+    private boolean canPackageQuery(String callerPackageName, String sourcePackageName,
+            String targetPackageName) throws Exception {
+        final Bundle extraData = new Bundle();
+        extraData.putString(Intent.EXTRA_PACKAGE_NAME, targetPackageName);
+        final Bundle response = sendCommandBlocking(callerPackageName, sourcePackageName,
+                extraData, ACTION_CAN_PACKAGE_QUERY);
+        return response.getBoolean(Intent.EXTRA_RETURN_RESULT);
+    }
+
+    private PendingIntent getPendingIntentActivity(String sourcePackageName) throws Exception  {
+        final Bundle bundle = sendCommandBlocking(sourcePackageName, null /* targetPackageName */,
+                null /* intentExtra */, ACTION_PENDING_INTENT_GET_ACTIVITY);
+        return bundle.getParcelable(EXTRA_PENDING_INTENT);
+    }
+
+    private String getPendingIntentCreatorPackage(String sourcePackageName,
+            PendingIntent pendingIntent) throws Exception  {
+        final Bundle bundle = sendCommandBlocking(sourcePackageName, null /* targetPackageName */,
+                pendingIntent, ACTION_PENDING_INTENT_GET_CREATOR_PACKAGE);
+        return bundle.getString(Intent.EXTRA_PACKAGE_NAME);
+    }
+
     interface Result {
         Bundle await() throws Exception;
     }
@@ -1443,7 +2490,7 @@
             if (intentExtra instanceof Intent) {
                 intent.putExtra(Intent.EXTRA_INTENT, intentExtra);
             } else if (intentExtra instanceof PendingIntent) {
-                intent.putExtra("pendingIntent", intentExtra);
+                intent.putExtra(EXTRA_PENDING_INTENT, intentExtra);
             } else if (intentExtra instanceof Bundle) {
                 intent.putExtra(EXTRA_DATA, intentExtra);
             }
diff --git a/tests/tests/appop/AndroidTest.xml b/tests/tests/appop/AndroidTest.xml
index f817422..b25d2b8 100644
--- a/tests/tests/appop/AndroidTest.xml
+++ b/tests/tests/appop/AndroidTest.xml
@@ -17,6 +17,7 @@
     <option name="config-descriptor:metadata" key="component" value="framework" />
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk30ModuleController" />
 
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 b1e5966..bb4e6e3 100644
--- a/tests/tests/appop/src/android/app/appops/cts/AppOpsTest.kt
+++ b/tests/tests/appop/src/android/app/appops/cts/AppOpsTest.kt
@@ -599,7 +599,7 @@
         val pm = mContext.packageManager
         assumeTrue(pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) ||
                 pm.hasSystemFeature(PackageManager.FEATURE_MICROPHONE) ||
-                pm.hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE))
+                pm.hasSystemFeature(PackageManager.FEATURE_TELECOM))
         val micReturn = mAppOps.noteOp(OPSTR_PHONE_CALL_MICROPHONE, Process.myUid(), mOpPackageName,
                 null, null)
         assertEquals(MODE_IGNORED, micReturn)
diff --git a/tests/tests/appop2/AndroidTest.xml b/tests/tests/appop2/AndroidTest.xml
index fc10a83..aa3b23f6 100644
--- a/tests/tests/appop2/AndroidTest.xml
+++ b/tests/tests/appop2/AndroidTest.xml
@@ -18,6 +18,7 @@
     <option name="config-descriptor:metadata" key="component" value="framework" />
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
diff --git a/tests/tests/assist/service/src/android/assist/service/MainInteractionService.java b/tests/tests/assist/service/src/android/assist/service/MainInteractionService.java
index 5b468e4..d10f477 100644
--- a/tests/tests/assist/service/src/android/assist/service/MainInteractionService.java
+++ b/tests/tests/assist/service/src/android/assist/service/MainInteractionService.java
@@ -87,7 +87,8 @@
                         IntentFilter filter = new IntentFilter();
                         filter.addAction(Utils.BROADCAST_INTENT_START_ASSIST);
                         registerReceiver(mBroadcastReceiver, filter,
-                                Context.RECEIVER_VISIBLE_TO_INSTANT_APPS);
+                                Context.RECEIVER_VISIBLE_TO_INSTANT_APPS
+                                | Context.RECEIVER_EXPORTED);
                         Log.i(TAG, "Registered receiver to start session later");
                     }
                     notify(Utils.ASSIST_RECEIVER_REGISTERED);
diff --git a/tests/tests/assist/service/src/android/assist/service/MainInteractionSession.java b/tests/tests/assist/service/src/android/assist/service/MainInteractionSession.java
index 265da81..671078d 100644
--- a/tests/tests/assist/service/src/android/assist/service/MainInteractionSession.java
+++ b/tests/tests/assist/service/src/android/assist/service/MainInteractionSession.java
@@ -16,6 +16,9 @@
 
 package android.assist.service;
 
+import static android.view.WindowInsets.Type.displayCutout;
+import static android.view.WindowInsets.Type.statusBars;
+
 import android.app.assist.AssistContent;
 import android.app.assist.AssistStructure;
 import android.assist.common.Utils;
@@ -27,6 +30,7 @@
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Point;
+import android.graphics.Rect;
 import android.os.Bundle;
 import android.os.RemoteCallback;
 import android.service.voice.VoiceInteractionSession;
@@ -36,6 +40,9 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewTreeObserver;
+import android.view.WindowInsets;
+import android.view.WindowManager;
+import android.view.WindowMetrics;
 
 public class MainInteractionSession extends VoiceInteractionSession {
     static final String TAG = "MainInteractionSession";
@@ -125,7 +132,26 @@
                     mContentView.getViewTreeObserver().removeOnPreDrawListener(this);
                     Display d = mContentView.getDisplay();
                     Point displayPoint = new Point();
-                    d.getRealSize(displayPoint);
+                    // The voice interaction window layer is higher than keyguard, status bar,
+                    // nav bar now. So we should take both status bar, nav bar into consideration.
+                    // The voice interaction hide the nav bar, so the height only need to consider
+                    // status bar. The status bar may contain display cutout but the display cutout
+                    // is device specific, we need to check it.
+                    WindowManager wm = mContext.getSystemService(WindowManager.class);
+                    WindowMetrics windowMetrics = wm.getCurrentWindowMetrics();
+                    Rect bound = windowMetrics.getBounds();
+                    WindowInsets windowInsets = windowMetrics.getWindowInsets();
+                    android.graphics.Insets statusBarInsets =
+                            windowInsets.getInsets(statusBars());
+                    android.graphics.Insets displayCutoutInsets =
+                            windowInsets.getInsets(displayCutout());
+                    android.graphics.Insets min =
+                            android.graphics.Insets.min(statusBarInsets, displayCutoutInsets);
+                    boolean statusBarContainsCutout = !android.graphics.Insets.NONE.equals(min);
+                    Log.d(TAG, "statusBarContainsCutout=" + statusBarContainsCutout);
+                    displayPoint.y = statusBarContainsCutout
+                            ? bound.height() - min.top - min.bottom : bound.height();
+                    displayPoint.x = bound.width();
                     DisplayCutout dc = d.getCutout();
                     if (dc != null) {
                         // Means the device has a cutout area
@@ -138,7 +164,8 @@
                         }
                     }
                     Bundle bundle = new Bundle();
-                    bundle.putString(Utils.EXTRA_REMOTE_CALLBACK_ACTION, Utils.BROADCAST_CONTENT_VIEW_HEIGHT);
+                    bundle.putString(Utils.EXTRA_REMOTE_CALLBACK_ACTION,
+                            Utils.BROADCAST_CONTENT_VIEW_HEIGHT);
                     bundle.putInt(Utils.EXTRA_CONTENT_VIEW_HEIGHT, mContentView.getHeight());
                     bundle.putInt(Utils.EXTRA_CONTENT_VIEW_WIDTH, mContentView.getWidth());
                     bundle.putParcelable(Utils.EXTRA_DISPLAY_POINT, displayPoint);
diff --git a/tests/tests/assist/src/android/assist/cts/ActivityIdTest.java b/tests/tests/assist/src/android/assist/cts/ActivityIdTest.java
new file mode 100644
index 0000000..d804d80
--- /dev/null
+++ b/tests/tests/assist/src/android/assist/cts/ActivityIdTest.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2022 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 android.assist.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.assist.ActivityId;
+import android.os.Binder;
+import android.os.IBinder;
+import android.os.Parcel;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link android.app.assist.ActivityId}.
+ *
+ * <p>To run: {@code atest CtsAssistTestCases:ActivityIdTest}
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ActivityIdTest {
+
+    @Test
+    public void testParcel() throws Exception {
+        int taskId = 6;
+        IBinder activityId = new Binder();
+        ActivityId original = new ActivityId(taskId, activityId);
+
+        ActivityId fromParcel = parcelAndUnparcel(original);
+        assertThat(fromParcel.getTaskId()).isEqualTo(taskId);
+        assertThat(fromParcel.getToken()).isSameInstanceAs(activityId);
+    }
+
+    private static ActivityId parcelAndUnparcel(ActivityId activityId) {
+        Parcel parcel = Parcel.obtain();
+        activityId.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        return ActivityId.CREATOR.createFromParcel(parcel);
+    }
+}
diff --git a/tests/tests/batterysaving/src/android/os/cts/deviceidle/DeviceIdleTest.java b/tests/tests/batterysaving/src/android/os/cts/deviceidle/DeviceIdleTest.java
index 20410e7..6d96eca 100644
--- a/tests/tests/batterysaving/src/android/os/cts/deviceidle/DeviceIdleTest.java
+++ b/tests/tests/batterysaving/src/android/os/cts/deviceidle/DeviceIdleTest.java
@@ -15,23 +15,48 @@
  */
 package android.os.cts.deviceidle;
 
+import static com.android.compatibility.common.util.TestUtils.waitUntil;
+
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
+import android.annotation.NonNull;
 import android.content.Context;
+import android.content.IntentFilter;
 import android.os.PowerManager;
+import android.support.test.uiautomator.UiDevice;
 
 import androidx.test.filters.SmallTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.BatteryUtils;
+import com.android.compatibility.common.util.CallbackAsserter;
+
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class DeviceIdleTest {
+
+    private UiDevice mUiDevice;
+
+    @Before
+    public void setUp() {
+        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        BatteryUtils.runDumpsysBatteryReset();
+    }
+
     @Test
     public void testDeviceIdleManager() {
         Context context = InstrumentationRegistry.getInstrumentation().getContext();
@@ -39,6 +64,62 @@
     }
 
     @Test
+    public void testLightIdleMode() throws Exception {
+        final String output = mUiDevice.executeShellCommand("cmd deviceidle enabled light").trim();
+        final boolean isEnabled = Integer.parseInt(output) != 0;
+        assumeTrue("device idle not enabled", isEnabled);
+
+        // Reset idle state.
+        setScreenState(true);
+        BatteryUtils.runDumpsysBatteryUnplug();
+        setScreenState(false);
+        PowerManager powerManager = InstrumentationRegistry.getInstrumentation().getContext()
+                .getSystemService(PowerManager.class);
+        waitUntil("Never made it to IDLE state", 30 /* seconds */, () -> {
+            final CallbackAsserter idleModeChangedBroadcastAsserter = CallbackAsserter.forBroadcast(
+                    new IntentFilter(PowerManager.ACTION_DEVICE_LIGHT_IDLE_MODE_CHANGED));
+            stepIdleState("light");
+            final String state = getIdleState("light");
+            if ("IDLE".equals(state)) {
+                idleModeChangedBroadcastAsserter.assertCalled(
+                        "Didn't get light idle mode changed broadcast", 15 /* 15 seconds */);
+                assertTrue(powerManager.isDeviceLightIdleMode());
+                return true;
+            } else {
+                assertFalse("Returned true even though state is " + state,
+                        powerManager.isDeviceLightIdleMode());
+                return false;
+            }
+        });
+
+        // We're IDLE. Step to IDLE_MAINTENANCE and confirm false is returned.
+        CallbackAsserter idleModeChangedBroadcastAsserter = CallbackAsserter.forBroadcast(
+                new IntentFilter(PowerManager.ACTION_DEVICE_LIGHT_IDLE_MODE_CHANGED));
+        stepIdleState("light");
+        idleModeChangedBroadcastAsserter.assertCalled(
+                "Didn't get light idle mode changed broadcast", 15 /* 15 seconds */);
+        String state = getIdleState("light");
+        assertEquals("IDLE_MAINTENANCE", state);
+        assertFalse(powerManager.isDeviceLightIdleMode());
+
+        idleModeChangedBroadcastAsserter = CallbackAsserter.forBroadcast(
+                new IntentFilter(PowerManager.ACTION_DEVICE_LIGHT_IDLE_MODE_CHANGED));
+        stepIdleState("light");
+        idleModeChangedBroadcastAsserter.assertCalled(
+                "Didn't get light idle mode changed broadcast", 15 /* 15 seconds */);
+        state = getIdleState("light");
+        assertEquals("IDLE", state);
+        assertTrue(powerManager.isDeviceLightIdleMode());
+
+        idleModeChangedBroadcastAsserter = CallbackAsserter.forBroadcast(
+                new IntentFilter(PowerManager.ACTION_DEVICE_LIGHT_IDLE_MODE_CHANGED));
+        setScreenState(true);
+        idleModeChangedBroadcastAsserter.assertCalled(
+                "Didn't get light idle mode changed broadcast", 15 /* 15 seconds */);
+        assertFalse(powerManager.isDeviceLightIdleMode());
+    }
+
+    @Test
     public void testPowerManagerIgnoringBatteryOptimizations() {
         Context context = InstrumentationRegistry.getInstrumentation().getContext();
 
@@ -48,4 +129,26 @@
                 .isIgnoringBatteryOptimizations("no.such.package.!!!"));
     }
 
+    @NonNull
+    private String getIdleState(String level) throws Exception {
+        return mUiDevice.executeShellCommand("cmd deviceidle get " + level).trim();
+    }
+
+    private void stepIdleState(String level) throws Exception {
+        mUiDevice.executeShellCommand("cmd deviceidle step " + level);
+    }
+
+    /**
+     * Set the screen state.
+     */
+    private void setScreenState(boolean on) throws Exception {
+        if (on) {
+            mUiDevice.executeShellCommand("input keyevent KEYCODE_WAKEUP");
+            mUiDevice.executeShellCommand("wm dismiss-keyguard");
+        } else {
+            mUiDevice.executeShellCommand("input keyevent KEYCODE_SLEEP");
+        }
+        // Wait a little bit to make sure the screen state has changed.
+        Thread.sleep(2_000);
+    }
 }
diff --git a/tests/tests/bluetooth/bluetoothTestUtilLib/Android.bp b/tests/tests/bluetooth/bluetoothTestUtilLib/Android.bp
index 124c0a2..0bf1be1 100644
--- a/tests/tests/bluetooth/bluetoothTestUtilLib/Android.bp
+++ b/tests/tests/bluetooth/bluetoothTestUtilLib/Android.bp
@@ -21,9 +21,10 @@
 
     static_libs: [
         "junit",
+        "compatibility-device-util-axt",
     ],
 
     srcs: ["src/**/*.java"],
 
-    sdk_version: "current",
+    sdk_version: "test_current",
 }
diff --git a/tests/tests/bluetooth/bluetoothTestUtilLib/src/android/bluetooth/cts/BTAdapterUtils.java b/tests/tests/bluetooth/bluetoothTestUtilLib/src/android/bluetooth/cts/BTAdapterUtils.java
index 9954f054..14891e0 100644
--- a/tests/tests/bluetooth/bluetoothTestUtilLib/src/android/bluetooth/cts/BTAdapterUtils.java
+++ b/tests/tests/bluetooth/bluetoothTestUtilLib/src/android/bluetooth/cts/BTAdapterUtils.java
@@ -16,21 +16,18 @@
 
 package android.bluetooth.cts;
 
+import android.app.UiAutomation;
 import android.bluetooth.BluetoothAdapter;
-import android.bluetooth.le.ScanRecord;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.provider.Settings;
 import android.util.Log;
 
-import junit.framework.Assert;
+import androidx.test.InstrumentationRegistry;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.Condition;
 import java.util.concurrent.locks.ReentrantLock;
@@ -95,6 +92,11 @@
         if (bluetoothAdapter.isEnabled()) return true;
 
         Log.d(TAG, "Enabling bluetooth adapter");
+        UiAutomation auto = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        Set<String> permissions = new HashSet(auto.getAdoptedShellPermissions());
+        Set<String> savedPermissions = Set.copyOf(permissions);
+        permissions.add(android.Manifest.permission.NETWORK_SETTINGS);
+        auto.adoptShellPermissionIdentity(permissions.toArray(new String[permissions.size()]));
         bluetoothAdapter.enable();
         mAdapterStateEnablinglock.lock();
         try {
@@ -110,8 +112,11 @@
         } catch(InterruptedException e) {
             Log.e(TAG, "enableAdapter: interrrupted");
         } finally {
+            auto.adoptShellPermissionIdentity(savedPermissions.toArray(
+                    new String[savedPermissions.size()]));
             mAdapterStateEnablinglock.unlock();
         }
+
         return bluetoothAdapter.isEnabled();
     }
 
@@ -124,6 +129,11 @@
         if (bluetoothAdapter.getState() == BluetoothAdapter.STATE_OFF) return true;
 
         Log.d(TAG, "Disabling bluetooth adapter");
+        UiAutomation auto = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        Set<String> permissions = new HashSet(auto.getAdoptedShellPermissions());
+        Set<String> savedPermissions = Set.copyOf(permissions);
+        permissions.add(android.Manifest.permission.NETWORK_SETTINGS);
+        auto.adoptShellPermissionIdentity(permissions.toArray(new String[permissions.size()]));
         bluetoothAdapter.disable();
         mAdapterStateDisablinglock.lock();
         try {
@@ -139,6 +149,8 @@
         } catch(InterruptedException e) {
             Log.e(TAG, "enableAdapter: interrrupted");
         } finally {
+            auto.adoptShellPermissionIdentity(savedPermissions.toArray(
+                    new String[savedPermissions.size()]));
             mAdapterStateDisablinglock.unlock();
         }
         return bluetoothAdapter.getState() == BluetoothAdapter.STATE_OFF;
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothA2dpSinkTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothA2dpSinkTest.java
index aef247b..f3918c7 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothA2dpSinkTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothA2dpSinkTest.java
@@ -63,9 +63,9 @@
         if (!mHasBluetooth) return;
 
         Resources bluetoothResources = mContext.getPackageManager().getResourcesForApplication(
-                "com.android.bluetooth");
+                "com.android.bluetooth.services");
         int a2dpSinkSupportId = bluetoothResources.getIdentifier(
-                PROFILE_SUPPORTED_A2DP_SINK, "bool", "com.android.bluetooth");
+                PROFILE_SUPPORTED_A2DP_SINK, "bool", "com.android.bluetooth.services");
         assertTrue("resource profile_supported_a2dp not found", a2dpSinkSupportId != 0);
         mIsA2dpSinkSupported = bluetoothResources.getBoolean(a2dpSinkSupportId);
         if (!mIsA2dpSinkSupported) return;
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothA2dpTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothA2dpTest.java
index ec46c51..191c4a2 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothA2dpTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothA2dpTest.java
@@ -73,9 +73,9 @@
         mBluetoothA2dp = null;
 
         Resources bluetoothResources = mContext.getPackageManager().getResourcesForApplication(
-                "com.android.bluetooth");
+                "com.android.bluetooth.services");
         int a2dpSupportId = bluetoothResources.getIdentifier(
-                PROFILE_SUPPORTED_A2DP, "bool", "com.android.bluetooth");
+                PROFILE_SUPPORTED_A2DP, "bool", "com.android.bluetooth.services");
         assertTrue("resource profile_supported_a2dp not found", a2dpSupportId != 0);
         mIsA2dpSupported = bluetoothResources.getBoolean(a2dpSupportId);
         if (!mIsA2dpSupported) return;
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothAdapterTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothAdapterTest.java
index 28eb7a8..9e9459c 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothAdapterTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothAdapterTest.java
@@ -333,10 +333,10 @@
         int maxConnectedAudioDevicesConfig = 0;
         try {
             Resources bluetoothRes = mContext.getPackageManager()
-                    .getResourcesForApplication("com.android.bluetooth");
+                    .getResourcesForApplication("com.android.bluetooth.services");
             maxConnectedAudioDevicesConfig = bluetoothRes.getInteger(
                     bluetoothRes.getIdentifier("config_bluetooth_max_connected_audio_devices",
-                    "integer", "com.android.bluetooth"));
+                    "integer", "com.android.bluetooth.services"));
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
         }
@@ -375,11 +375,11 @@
             return;
         }
         assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
-        assertEquals(-1, mAdapter.getDiscoverableTimeout());
+        assertEquals(null, mAdapter.getDiscoverableTimeout());
         assertTrue(BTAdapterUtils.enableAdapter(mAdapter, mContext));
 
         mUiAutomation.dropShellPermissionIdentity();
-        assertEquals(120, mAdapter.getDiscoverableTimeout());
+        assertEquals(120, mAdapter.getDiscoverableTimeout().toSeconds());
     }
 
     public void test_getConnectionState() {
@@ -444,7 +444,7 @@
 
     public void test_BluetoothConnectionCallback_disconnectReasonText() {
         assertEquals("Reason unknown", BluetoothAdapter.BluetoothConnectionCallback
-                .disconnectReasonText(BluetoothStatusCodes.ERROR_UNKNOWN));
+                .disconnectReasonToString(BluetoothStatusCodes.ERROR_UNKNOWN));
     }
 
     public void test_registerBluetoothConnectionCallback() {
@@ -483,25 +483,6 @@
                 mAdapter.unregisterBluetoothConnectionCallback(callback));
     }
 
-    public void test_registerServiceLifecycleCallback() {
-        if (!mHasBluetooth) return;
-
-        BluetoothAdapter.ServiceLifecycleCallback callback =
-                new BluetoothAdapter.ServiceLifecycleCallback() {
-                    @Override
-                    public void onBluetoothServiceUp() {}
-                    @Override
-                    public void onBluetoothServiceDown() {}
-                };
-
-        // Verify parameter
-        assertThrows(NullPointerException.class,
-                () -> mAdapter.registerServiceLifecycleCallback(null));
-
-        assertThrows(NullPointerException.class,
-                () -> mAdapter.unregisterServiceLifecycleCallback(null));
-    }
-
     public void test_requestControllerActivityEnergyInfo() {
         if (!mHasBluetooth) return;
 
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothDeviceTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothDeviceTest.java
index a615df3..15c15eb 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothDeviceTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothDeviceTest.java
@@ -17,6 +17,12 @@
 package android.bluetooth.cts;
 
 import static android.Manifest.permission.BLUETOOTH_CONNECT;
+import static android.bluetooth.BluetoothDevice.ACCESS_ALLOWED;
+import static android.bluetooth.BluetoothDevice.ACCESS_REJECTED;
+import static android.bluetooth.BluetoothDevice.ACCESS_UNKNOWN;
+import static android.bluetooth.BluetoothDevice.TRANSPORT_AUTO;
+import static android.bluetooth.BluetoothDevice.TRANSPORT_BREDR;
+import static android.bluetooth.BluetoothDevice.TRANSPORT_LE;
 
 import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
 
@@ -27,12 +33,15 @@
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothManager;
 import android.bluetooth.BluetoothStatusCodes;
+import android.bluetooth.OobData;
 import android.content.AttributionSource;
 import android.content.pm.PackageManager;
 import android.test.AndroidTestCase;
 
 import androidx.test.InstrumentationRegistry;
 
+import java.io.UnsupportedEncodingException;
+
 public class BluetoothDeviceTest extends AndroidTestCase {
 
     private boolean mHasBluetooth;
@@ -40,6 +49,9 @@
     private BluetoothAdapter mAdapter;
     private UiAutomation mUiAutomation;;
 
+    private final String mFakeDeviceAddress = "00:11:22:AA:BB:CC";
+    private BluetoothDevice mFakeDevice;
+
     @Override
     public void setUp() throws Exception {
         super.setUp();
@@ -55,6 +67,7 @@
             mUiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
             mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
             assertTrue(BTAdapterUtils.enableAdapter(mAdapter, mContext));
+            mFakeDevice = mAdapter.getRemoteDevice(mFakeDeviceAddress);
         }
     }
 
@@ -76,29 +89,28 @@
 
         int userId = mContext.getUser().getIdentifier();
         String packageName = mContext.getOpPackageName();
-        String deviceAddress = "00:11:22:AA:BB:CC";
 
         AttributionSource source = AttributionSource.myAttributionSource();
         assertEquals("android.bluetooth.cts", source.getPackageName());
 
-        BluetoothDevice device = mAdapter.getRemoteDevice(deviceAddress);
         // Verifies that when there is no alias, we return the device name
-        assertNull(device.getAlias());
+        assertNull(mFakeDevice.getAlias());
 
-        assertThrows(IllegalArgumentException.class, () -> device.setAlias(""));
+        assertThrows(IllegalArgumentException.class, () -> mFakeDevice.setAlias(""));
 
         String testDeviceAlias = "Test Device Alias";
 
         // This should throw a SecurityException because there is no CDM association
         assertThrows("BluetoothDevice.setAlias without"
                 + " a CDM association or BLUETOOTH_PRIVILEGED permission",
-                SecurityException.class, () -> device.setAlias(testDeviceAlias));
+                SecurityException.class, () -> mFakeDevice.setAlias(testDeviceAlias));
 
         runShellCommand(String.format(
-                "cmd companiondevice associate %d %s %s", userId, packageName, deviceAddress));
+                "cmd companiondevice associate %d %s %s", userId, packageName, mFakeDeviceAddress));
         String output = runShellCommand("dumpsys companiondevice");
         assertTrue("Package name missing from output", output.contains(packageName));
-        assertTrue("Device address missing from output", output.contains(deviceAddress));
+        assertTrue("Device address missing from output",
+                output.toLowerCase().contains(mFakeDeviceAddress.toLowerCase()));
 
         // Takes time to update the CDM cache, so sleep to ensure the association is cached
         try {
@@ -111,9 +123,26 @@
          * Device properties don't exist for non-existent BluetoothDevice, so calling setAlias with
          * permissions should return false
          */
-        assertEquals(BluetoothStatusCodes.ERROR_DEVICE_NOT_BONDED, device.setAlias(testDeviceAlias));
-        runShellCommand(String.format(
-                "cmd companiondevice disassociate %d %s %s", userId, packageName, deviceAddress));
+        assertEquals(BluetoothStatusCodes.ERROR_DEVICE_NOT_BONDED, mFakeDevice
+                .setAlias(testDeviceAlias));
+        runShellCommand(String.format("cmd companiondevice disassociate %d %s %s", userId,
+                    packageName, mFakeDeviceAddress));
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertNull(mFakeDevice.getAlias());
+        assertEquals(BluetoothStatusCodes.ERROR_BLUETOOTH_NOT_ENABLED,
+                mFakeDevice.setAlias(testDeviceAlias));
+    }
+
+    public void test_getIdentityAddress() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        // This should throw a SecurityException because no BLUETOOTH_PRIVILEGED permission
+        assertThrows("No BLUETOOTH_PRIVILEGED permission",
+                SecurityException.class, () -> mFakeDevice.getIdentityAddress());
     }
 
     public void test_getAnonymizedAddress() {
@@ -121,9 +150,8 @@
             // Skip the test if bluetooth or companion device are not present.
             return;
         }
-        String deviceAddress = "00:11:22:AA:BB:CC";
-        BluetoothDevice device = mAdapter.getRemoteDevice(deviceAddress);
-        assertEquals(device.getAnonymizedAddress(), "XX:XX:XX:AA:BB:CC");
+
+        assertEquals(mFakeDevice.getAnonymizedAddress(), "XX:XX:XX:AA:BB:CC");
     }
 
     public void test_getBatteryLevel() {
@@ -131,13 +159,15 @@
             // Skip the test if bluetooth or companion device are not present.
             return;
         }
-        String deviceAddress = "00:11:22:AA:BB:CC";
-        BluetoothDevice device = mAdapter.getRemoteDevice(deviceAddress);
-        assertEquals(BluetoothDevice.BATTERY_LEVEL_UNKNOWN, device.getBatteryLevel());
+
+        assertEquals(BluetoothDevice.BATTERY_LEVEL_UNKNOWN, mFakeDevice.getBatteryLevel());
 
         mUiAutomation.dropShellPermissionIdentity();
-        assertThrows(SecurityException.class, () -> device.getBatteryLevel());
+        assertThrows(SecurityException.class, () -> mFakeDevice.getBatteryLevel());
         mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertEquals(BluetoothDevice.BATTERY_LEVEL_BLUETOOTH_OFF, mFakeDevice.getBatteryLevel());
     }
 
     public void test_getMessageAccessPermission() {
@@ -145,13 +175,15 @@
             // Skip the test if bluetooth or companion device are not present.
             return;
         }
-        String deviceAddress = "00:11:22:AA:BB:CC";
-        BluetoothDevice device = mAdapter.getRemoteDevice(deviceAddress);
-        assertEquals(BluetoothDevice.ACCESS_UNKNOWN, device.getMessageAccessPermission());
+
+        assertEquals(BluetoothDevice.ACCESS_UNKNOWN, mFakeDevice.getMessageAccessPermission());
 
         mUiAutomation.dropShellPermissionIdentity();
-        assertThrows(SecurityException.class, () -> device.getMessageAccessPermission());
+        assertThrows(SecurityException.class, () -> mFakeDevice.getMessageAccessPermission());
         mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertEquals(BluetoothDevice.ACCESS_UNKNOWN, mFakeDevice.getMessageAccessPermission());
     }
 
     public void test_getPhonebookAccessPermission() {
@@ -159,13 +191,15 @@
             // Skip the test if bluetooth or companion device are not present.
             return;
         }
-        String deviceAddress = "00:11:22:AA:BB:CC";
-        BluetoothDevice device = mAdapter.getRemoteDevice(deviceAddress);
-        assertEquals(BluetoothDevice.ACCESS_UNKNOWN, device.getPhonebookAccessPermission());
+
+        assertEquals(BluetoothDevice.ACCESS_UNKNOWN, mFakeDevice.getPhonebookAccessPermission());
 
         mUiAutomation.dropShellPermissionIdentity();
-        assertThrows(SecurityException.class, () -> device.getPhonebookAccessPermission());
+        assertThrows(SecurityException.class, () -> mFakeDevice.getPhonebookAccessPermission());
         mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertEquals(BluetoothDevice.ACCESS_UNKNOWN, mFakeDevice.getPhonebookAccessPermission());
     }
 
     public void test_isBondingInitiatedLocally() {
@@ -173,13 +207,15 @@
             // Skip the test if bluetooth or companion device are not present.
             return;
         }
-        String deviceAddress = "00:11:22:AA:BB:CC";
-        BluetoothDevice device = mAdapter.getRemoteDevice(deviceAddress);
-        assertFalse(device.isBondingInitiatedLocally());
+
+        assertFalse(mFakeDevice.isBondingInitiatedLocally());
 
         mUiAutomation.dropShellPermissionIdentity();
-        assertThrows(SecurityException.class, () -> device.isBondingInitiatedLocally());
+        assertThrows(SecurityException.class, () -> mFakeDevice.isBondingInitiatedLocally());
         mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertFalse(mFakeDevice.isBondingInitiatedLocally());
     }
 
     public void test_prepareToEnterProcess() {
@@ -187,9 +223,8 @@
             // Skip the test if bluetooth or companion device are not present.
             return;
         }
-        String deviceAddress = "00:11:22:AA:BB:CC";
-        BluetoothDevice device = mAdapter.getRemoteDevice(deviceAddress);
-        device.prepareToEnterProcess(null);
+
+        mFakeDevice.prepareToEnterProcess(null);
     }
 
     public void test_setPin() {
@@ -197,17 +232,18 @@
             // Skip the test if bluetooth or companion device are not present.
             return;
         }
-        String deviceAddress = "00:11:22:AA:BB:CC";
-        BluetoothDevice device = mAdapter.getRemoteDevice(deviceAddress);
 
-        assertFalse(device.setPin((String) null));
-        assertFalse(device.setPin("12345678901234567")); // check PIN too big
+        assertFalse(mFakeDevice.setPin((String) null));
+        assertFalse(mFakeDevice.setPin("12345678901234567")); // check PIN too big
 
-        assertFalse(device.setPin("123456")); //device is not bonding
+        assertFalse(mFakeDevice.setPin("123456")); //device is not bonding
 
         mUiAutomation.dropShellPermissionIdentity();
-        assertThrows(SecurityException.class, () -> device.setPin("123456"));
+        assertThrows(SecurityException.class, () -> mFakeDevice.setPin("123456"));
         mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertFalse(mFakeDevice.setPin("123456"));
     }
 
     public void test_connect_disconnect() {
@@ -215,11 +251,233 @@
             // Skip the test if bluetooth or companion device are not present.
             return;
         }
-        String deviceAddress = "00:11:22:AA:BB:CC";
-        BluetoothDevice device = mAdapter.getRemoteDevice(deviceAddress);
 
         // This should throw a SecurityException because no BLUETOOTH_PRIVILEGED permission
-        assertThrows(SecurityException.class, () -> device.connect());
-        assertThrows(SecurityException.class, () -> device.disconnect());
+        assertThrows(SecurityException.class, () -> mFakeDevice.connect());
+        assertThrows(SecurityException.class, () -> mFakeDevice.disconnect());
+    }
+
+    public void test_cancelBondProcess() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        mUiAutomation.dropShellPermissionIdentity();
+        assertThrows(SecurityException.class, () -> mFakeDevice.cancelBondProcess());
+        mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertFalse(mFakeDevice.cancelBondProcess());
+    }
+
+    public void test_createBond() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        mUiAutomation.dropShellPermissionIdentity();
+        assertThrows(SecurityException.class, () -> mFakeDevice.createBond(TRANSPORT_AUTO));
+        mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertFalse(mFakeDevice.createBond(TRANSPORT_AUTO));
+    }
+
+    public void test_createBondOutOfBand() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        OobData data = new OobData.ClassicBuilder(
+                new byte[16], new byte[2], new byte[7]).build();
+
+        assertThrows(IllegalArgumentException.class, () -> mFakeDevice.createBondOutOfBand(
+                TRANSPORT_AUTO, null, null));
+
+        mUiAutomation.dropShellPermissionIdentity();
+        assertThrows(SecurityException.class, () -> mFakeDevice
+                .createBondOutOfBand(TRANSPORT_AUTO, data, null));
+        mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+    }
+
+    public void test_getSimAccessPermission() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        //Access is unknown as device is not bonded
+        assertEquals(ACCESS_UNKNOWN, mFakeDevice.getSimAccessPermission());
+
+        mUiAutomation.dropShellPermissionIdentity();
+        assertThrows(SecurityException.class, () -> mFakeDevice.getSimAccessPermission());
+        mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertEquals(ACCESS_UNKNOWN, mFakeDevice.getSimAccessPermission());
+    }
+
+    public void test_getUuids() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        assertNotNull(mFakeDevice.getUuids());
+        assertEquals(0, mFakeDevice.getUuids().length);
+        mUiAutomation.dropShellPermissionIdentity();
+        assertThrows(SecurityException.class, () -> mFakeDevice.getUuids());
+        mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertNull(mFakeDevice.getUuids());
+    }
+
+    public void test_isEncrypted() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        //Device is not connected
+        assertFalse(mFakeDevice.isEncrypted());
+
+        mUiAutomation.dropShellPermissionIdentity();
+        assertThrows(SecurityException.class, () -> mFakeDevice.isEncrypted());
+        mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertFalse(mFakeDevice.isEncrypted());
+    }
+
+    public void test_removeBond() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        //Device is not bonded
+        assertFalse(mFakeDevice.removeBond());
+
+        mUiAutomation.dropShellPermissionIdentity();
+        assertThrows(SecurityException.class, () -> mFakeDevice.removeBond());
+        mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertFalse(mFakeDevice.removeBond());
+    }
+
+    public void test_setPinByteArray() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        assertThrows(NullPointerException.class, () -> mFakeDevice.setPin((byte[]) null));
+
+        // check PIN too big
+        assertFalse(mFakeDevice.setPin(convertPinToBytes("12345678901234567")));
+        assertFalse(mFakeDevice.setPin(convertPinToBytes("123456"))); // device is not bonding
+
+        mUiAutomation.dropShellPermissionIdentity();
+        assertThrows(SecurityException.class, () -> mFakeDevice
+                .setPin(convertPinToBytes("123456")));
+        mUiAutomation.adoptShellPermissionIdentity(BLUETOOTH_CONNECT);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertFalse(mFakeDevice.setPin(convertPinToBytes("123456")));
+    }
+
+    public void test_connectGatt() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        assertThrows(NullPointerException.class, () -> mFakeDevice
+                .connectGatt(getContext(), false, null,
+                TRANSPORT_AUTO, BluetoothDevice.PHY_LE_1M_MASK));
+
+        assertThrows(NullPointerException.class, () ->
+                mFakeDevice.connectGatt(getContext(), false, null,
+                TRANSPORT_AUTO, BluetoothDevice.PHY_LE_1M_MASK, null));
+    }
+
+    public void test_fetchUuidsWithSdp() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        // TRANSPORT_AUTO doesn't need BLUETOOTH_PRIVILEGED permission
+        assertTrue(mFakeDevice.fetchUuidsWithSdp(TRANSPORT_AUTO));
+
+        // This should throw a SecurityException because no BLUETOOTH_PRIVILEGED permission
+        assertThrows(SecurityException.class, () -> mFakeDevice.fetchUuidsWithSdp(TRANSPORT_BREDR));
+        assertThrows(SecurityException.class, () -> mFakeDevice.fetchUuidsWithSdp(TRANSPORT_LE));
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+        assertFalse(mFakeDevice.fetchUuidsWithSdp(TRANSPORT_AUTO));
+    }
+
+    public void test_setMessageAccessPermission() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        // This should throw a SecurityException because no BLUETOOTH_PRIVILEGED permission
+        assertThrows(SecurityException.class, () -> mFakeDevice
+                .setMessageAccessPermission(ACCESS_ALLOWED));
+        assertThrows(SecurityException.class, () -> mFakeDevice
+                .setMessageAccessPermission(ACCESS_UNKNOWN));
+        assertThrows(SecurityException.class, () -> mFakeDevice
+                .setMessageAccessPermission(ACCESS_REJECTED));
+    }
+
+    public void test_setPhonebookAccessPermission() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        // This should throw a SecurityException because no BLUETOOTH_PRIVILEGED permission
+        assertThrows(SecurityException.class, () -> mFakeDevice
+                .setPhonebookAccessPermission(ACCESS_ALLOWED));
+        assertThrows(SecurityException.class, () -> mFakeDevice
+                .setPhonebookAccessPermission(ACCESS_UNKNOWN));
+        assertThrows(SecurityException.class, () -> mFakeDevice
+                .setPhonebookAccessPermission(ACCESS_REJECTED));
+    }
+
+    public void test_setSimAccessPermission() {
+        if (!mHasBluetooth || !mHasCompanionDevice) {
+            // Skip the test if bluetooth or companion device are not present.
+            return;
+        }
+
+        // This should throw a SecurityException because no BLUETOOTH_PRIVILEGED permission
+        assertThrows(SecurityException.class, () -> mFakeDevice
+                .setSimAccessPermission(ACCESS_ALLOWED));
+        assertThrows(SecurityException.class, () -> mFakeDevice
+                .setSimAccessPermission(ACCESS_UNKNOWN));
+        assertThrows(SecurityException.class, () -> mFakeDevice
+                .setSimAccessPermission(ACCESS_REJECTED));
+    }
+
+    private byte[] convertPinToBytes(String pin) {
+        if (pin == null) {
+            return null;
+        }
+        byte[] pinBytes;
+        try {
+            pinBytes = pin.getBytes("UTF-8");
+        } catch (UnsupportedEncodingException uee) {
+            return null;
+        }
+        return pinBytes;
     }
 }
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothFrameworkInitializerTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothFrameworkInitializerTest.java
new file mode 100644
index 0000000..d5597ac
--- /dev/null
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothFrameworkInitializerTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2022 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 android.bluetooth.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.bluetooth.BluetoothFrameworkInitializer;
+import android.os.BluetoothServiceManager;
+import android.test.AndroidTestCase;
+
+import java.util.function.Consumer;
+
+public class BluetoothFrameworkInitializerTest extends AndroidTestCase {
+
+    /**
+     * BluetoothFrameworkInitializer.registerServiceWrappers() should only be called by
+     * SystemServiceRegistry during boot up when Bluetooth is first initialized. Calling this API at
+     * any other time should throw an exception.
+     */
+    public void test_RegisterServiceWrappers_failsWhenCalledOutsideOfSystemServiceRegistry() {
+        assertThrows(IllegalStateException.class,
+                () -> BluetoothFrameworkInitializer.registerServiceWrappers());
+    }
+
+    public void test_SetBluetoothServiceManager() {
+        assertThrows(IllegalStateException.class,
+                () -> BluetoothFrameworkInitializer.setBluetoothServiceManager(
+                    new BluetoothServiceManager()));
+    }
+
+    public void test_SetBinderCallsStatsInitializer() {
+        assertThrows(IllegalStateException.class,
+                () -> BluetoothFrameworkInitializer.setBinderCallsStatsInitializer(new Consumer() {
+                        @Override
+                        public void accept(Object o) {
+                        }
+                }));
+    }
+
+    // org.junit.Assume.assertThrows is not available until JUnit 4.13
+    private static void assertThrows(Class<? extends Exception> exceptionClass, Runnable r) {
+        try {
+            r.run();
+            fail("Expected " + exceptionClass + " to be thrown.");
+        } catch (Exception exception) {
+            assertThat(exception).isInstanceOf(exceptionClass);
+        }
+    }
+}
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothHeadsetTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothHeadsetTest.java
index 8536e9d..cf8f1a2 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothHeadsetTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothHeadsetTest.java
@@ -72,9 +72,9 @@
         mBluetoothHeadset = null;
 
         Resources bluetoothResources = mContext.getPackageManager().getResourcesForApplication(
-                "com.android.bluetooth");
+                "com.android.bluetooth.services");
         int headsetSupportId = bluetoothResources.getIdentifier(
-                PROFILE_SUPPORTED_HEADSET, "bool", "com.android.bluetooth");
+                PROFILE_SUPPORTED_HEADSET, "bool", "com.android.bluetooth.services");
         assertTrue("resource profile_supported_hs_hfp not found", headsetSupportId != 0);
         mIsHeadsetSupported = bluetoothResources.getBoolean(headsetSupportId);
         if (!mIsHeadsetSupported) return;
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothHidDeviceTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothHidDeviceTest.java
index e512d25..857e12c 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothHidDeviceTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothHidDeviceTest.java
@@ -90,9 +90,9 @@
         mExecutor = Executors.newSingleThreadExecutor();
 
         Resources bluetoothResources = mContext.getPackageManager().getResourcesForApplication(
-                "com.android.bluetooth");
+                "com.android.bluetooth.services");
         int hidSupportId = bluetoothResources.getIdentifier(PROFILE_SUPPORTED_HID_DEVICE, "bool",
-                "com.android.bluetooth");
+                "com.android.bluetooth.services");
         mIsHidSupported = bluetoothResources.getBoolean(hidSupportId);
         if (!mIsHidSupported) return;
 
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothLeAudioTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothLeAudioTest.java
index 35ca2a1..9f0185c 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothLeAudioTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothLeAudioTest.java
@@ -16,25 +16,26 @@
 
 package android.bluetooth.cts;
 
+import static android.Manifest.permission.BLUETOOTH_CONNECT;
+import static android.Manifest.permission.BLUETOOTH_PRIVILEGED;
+
 import static org.junit.Assert.assertThrows;
 
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothLeAudio;
-import android.bluetooth.BluetoothLeAudioCodecStatus;
 import android.bluetooth.BluetoothLeAudioCodecConfig;
+import android.bluetooth.BluetoothLeAudioCodecStatus;
 import android.bluetooth.BluetoothManager;
 import android.bluetooth.BluetoothProfile;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.os.Build;
 import android.test.AndroidTestCase;
 import android.util.Log;
 
-import androidx.test.InstrumentationRegistry;
-
 import com.android.compatibility.common.util.ApiLevelUtil;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
@@ -45,8 +46,6 @@
     private static final String TAG = BluetoothLeAudioTest.class.getSimpleName();
 
     private static final int PROXY_CONNECTION_TIMEOUT_MS = 500;  // ms timeout for Proxy Connect
-    private static final String PROFILE_SUPPORTED_LE_AUDIO = "profile_supported_leaudio";
-    private static final int LE_AUDIO_PROFILE_CONSTANT = 22;
 
     private boolean mHasBluetooth;
     private BluetoothAdapter mAdapter;
@@ -56,17 +55,69 @@
     private boolean mIsProfileReady;
     private Condition mConditionProfileIsConnected;
     private ReentrantLock mProfileConnectedlock;
+    private Executor mTestExecutor;
+    private TestCallback mTestCallback;
+    private boolean mCodecConfigChangedCalled;
+    private boolean mGroupNodeAddedCalled;
+    private boolean mGroupNodeRemovedCalled;
+    private boolean mGroupStatusChangedCalled;
+    private BluetoothDevice mTestDevice;
+    private int mTestGroupId;
+    private int mTestGroupStatus;
+
+    private static final BluetoothLeAudioCodecConfig LC3_16KHZ_CONFIG =
+            new BluetoothLeAudioCodecConfig.Builder()
+                    .setCodecType(BluetoothLeAudioCodecConfig.SOURCE_CODEC_TYPE_LC3)
+                    .setSampleRate(BluetoothLeAudioCodecConfig.SAMPLE_RATE_16000)
+                    .build();
+
+    private static final List<BluetoothLeAudioCodecConfig> TEST_CODEC_CAPA_CONFIG =
+            new ArrayList() {{
+                    add(LC3_16KHZ_CONFIG);
+            }};
+
+    private static final BluetoothLeAudioCodecStatus TEST_CODEC_STATUS =
+            new BluetoothLeAudioCodecStatus(LC3_16KHZ_CONFIG, LC3_16KHZ_CONFIG,
+                    TEST_CODEC_CAPA_CONFIG, TEST_CODEC_CAPA_CONFIG,
+                    TEST_CODEC_CAPA_CONFIG, TEST_CODEC_CAPA_CONFIG);
+
+    class TestCallback implements BluetoothLeAudio.Callback {
+        @Override
+        public void onCodecConfigChanged(int groupId,
+                                         BluetoothLeAudioCodecStatus status) {
+            mCodecConfigChangedCalled = true;
+            assertTrue(groupId == mTestGroupId);
+            assertTrue(status == TEST_CODEC_STATUS);
+        }
+        @Override
+        public void onGroupNodeAdded(BluetoothDevice device, int groupId) {
+            mGroupNodeAddedCalled = true;
+            assertTrue(groupId == mTestGroupId);
+            assertTrue(device == mTestDevice);
+        }
+        @Override
+        public void onGroupNodeRemoved(BluetoothDevice device, int groupId) {
+            mGroupNodeRemovedCalled = true;
+            assertTrue(groupId == mTestGroupId);
+            assertTrue(device == mTestDevice);
+        }
+        @Override
+        public void onGroupStatusChanged(int groupId, int groupStatus) {
+            mGroupStatusChangedCalled = true;
+            assertTrue(groupId == mTestGroupId);
+            assertTrue(groupStatus == mTestGroupStatus);
+        }
+    };
 
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.S)) {
+        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)) {
             mHasBluetooth = getContext().getPackageManager().hasSystemFeature(
                     PackageManager.FEATURE_BLUETOOTH);
 
             if (!mHasBluetooth) return;
-            InstrumentationRegistry.getInstrumentation().getUiAutomation()
-                .adoptShellPermissionIdentity(android.Manifest.permission.BLUETOOTH_CONNECT);
+            TestUtils.adoptPermissionAsShellUid(BLUETOOTH_CONNECT, BLUETOOTH_PRIVILEGED);
 
             BluetoothManager manager = getContext().getSystemService(BluetoothManager.class);
             mAdapter = manager.getAdapter();
@@ -77,16 +128,14 @@
             mIsProfileReady = false;
             mBluetoothLeAudio = null;
 
-            Resources bluetoothResources = mContext.getPackageManager().getResourcesForApplication(
-                    "com.android.bluetooth");
-            int leAudioSupportId = bluetoothResources.getIdentifier(
-                    PROFILE_SUPPORTED_LE_AUDIO, "bool", "com.android.bluetooth");
-            if (leAudioSupportId == 0) return;
-            mIsLeAudioSupported = bluetoothResources.getBoolean(leAudioSupportId);
+            mIsLeAudioSupported =  TestUtils.getProfileConfigValueOrDie(BluetoothProfile.LE_AUDIO);
             if (!mIsLeAudioSupported) return;
 
             mAdapter.getProfileProxy(getContext(), new BluetoothLeAudioServiceListener(),
-                    LE_AUDIO_PROFILE_CONSTANT);
+                    BluetoothProfile.LE_AUDIO);
+
+            mTestExecutor = mContext.getMainExecutor();
+            mTestCallback = new TestCallback();
         }
     }
 
@@ -94,15 +143,16 @@
     public void tearDown() throws Exception {
         super.tearDown();
         if (mHasBluetooth) {
-            if (mAdapter != null && mBluetoothLeAudio != null) {
+            if (mBluetoothLeAudio != null) {
                 mBluetoothLeAudio.close();
                 mBluetoothLeAudio = null;
                 mIsProfileReady = false;
             }
-            assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
-            InstrumentationRegistry.getInstrumentation().getUiAutomation()
-                .dropShellPermissionIdentity();
-            mAdapter = null;
+            if (mAdapter != null) {
+                assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+                mAdapter = null;
+            }
+            TestUtils.dropPermissionAsShellUid();
         }
     }
 
@@ -139,7 +189,7 @@
         assertTrue(waitForProfileConnect());
         assertNotNull(mBluetoothLeAudio);
 
-        BluetoothDevice testDevice = mAdapter.getRemoteDevice("00:11:22:AA:BB:CC");
+        mTestDevice = mAdapter.getRemoteDevice("00:11:22:AA:BB:CC");
 
         // Verify returns false when invalid input is given
         assertEquals(BluetoothProfile.STATE_DISCONNECTED,
@@ -149,7 +199,7 @@
 
         // Verify returns false if bluetooth is not enabled
         assertEquals(BluetoothProfile.STATE_DISCONNECTED,
-                mBluetoothLeAudio.getConnectionState(testDevice));
+                mBluetoothLeAudio.getConnectionState(mTestDevice));
     }
 
     public void testGetAudioLocation() {
@@ -158,13 +208,13 @@
         assertTrue(waitForProfileConnect());
         assertNotNull(mBluetoothLeAudio);
 
-        BluetoothDevice testDevice = mAdapter.getRemoteDevice("00:11:22:AA:BB:CC");
+        mTestDevice = mAdapter.getRemoteDevice("00:11:22:AA:BB:CC");
 
         assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
 
         // Verify returns false if bluetooth is not enabled
         assertEquals(BluetoothLeAudio.AUDIO_LOCATION_INVALID,
-                mBluetoothLeAudio.getAudioLocation(testDevice));
+                mBluetoothLeAudio.getAudioLocation(mTestDevice));
     }
 
     public void test_setgetConnectionPolicy() {
@@ -178,33 +228,86 @@
                 mBluetoothLeAudio.getConnectionPolicy(null));
     }
 
-    public void testRegisterCallback() {
+    public void testRegisterCallbackNoPermission() {
+        if (!(mHasBluetooth && mIsLeAudioSupported)) return;
+
+        TestUtils.dropPermissionAsShellUid();
+        assertTrue(waitForProfileConnect());
+        assertNotNull(mBluetoothLeAudio);
+
+        // Verify throws SecurityException without permission.BLUETOOTH_PRIVILEGED
+        assertThrows(SecurityException.class,
+                () -> mBluetoothLeAudio.registerCallback(mTestExecutor, mTestCallback));
+
+        TestUtils.adoptPermissionAsShellUid(BLUETOOTH_CONNECT, BLUETOOTH_PRIVILEGED);
+    }
+
+    public void testRegisterUnregisterCallback() {
         if (!(mHasBluetooth && mIsLeAudioSupported)) return;
 
         assertTrue(waitForProfileConnect());
         assertNotNull(mBluetoothLeAudio);
 
-        Executor executor = mContext.getMainExecutor();
-        BluetoothLeAudio.Callback callback =
-                new BluetoothLeAudio.Callback() {
-                    @Override
-                    public void onCodecConfigChanged(int groupId,
-                                                     BluetoothLeAudioCodecStatus status) {}
-                    @Override
-                    public void onGroupNodeAdded(BluetoothDevice device, int groupId) {}
-                    @Override
-                    public void onGroupNodeRemoved(BluetoothDevice device, int groupId) {}
-                    @Override
-                    public void onGroupStatusChanged(int groupId, int groupStatus) {}
-                };
-
         // Verify parameter
         assertThrows(NullPointerException.class, () ->
-                mBluetoothLeAudio.registerCallback(null, callback));
+                mBluetoothLeAudio.registerCallback(null, mTestCallback));
         assertThrows(NullPointerException.class, () ->
-                mBluetoothLeAudio.registerCallback(executor, null));
+                mBluetoothLeAudio.registerCallback(mTestExecutor, null));
         assertThrows(NullPointerException.class, () ->
                 mBluetoothLeAudio.unregisterCallback(null));
+
+        // Test success register unregister
+        try {
+            mBluetoothLeAudio.registerCallback(mTestExecutor, mTestCallback);
+        } catch (Exception e) {
+            fail("Exception caught from register(): " + e.toString());
+        }
+
+        try {
+            mBluetoothLeAudio.unregisterCallback(mTestCallback);
+        } catch (Exception e) {
+            fail("Exception caught from unregister(): " + e.toString());
+        }
+    }
+
+    public void testCallback() {
+        if (!(mHasBluetooth && mIsLeAudioSupported)) return;
+
+        assertTrue(waitForProfileConnect());
+        assertNotNull(mBluetoothLeAudio);
+
+        mTestGroupId = 1;
+        mTestDevice = mAdapter.getRemoteDevice("00:11:22:AA:BB:CC");
+        mTestGroupStatus = 0;
+
+        mCodecConfigChangedCalled = false;
+        mGroupNodeAddedCalled = false;
+        mGroupStatusChangedCalled = false;
+        mGroupNodeRemovedCalled = false;
+
+        mTestCallback.onCodecConfigChanged(mTestGroupId, TEST_CODEC_STATUS);
+        mTestCallback.onGroupNodeAdded(mTestDevice, mTestGroupId);
+        mTestCallback.onGroupNodeRemoved(mTestDevice, mTestGroupId);
+        mTestCallback.onGroupStatusChanged(mTestGroupId, mTestGroupStatus);
+
+        assertTrue(mCodecConfigChangedCalled);
+        assertTrue(mGroupNodeAddedCalled);
+        assertTrue(mGroupNodeRemovedCalled);
+        assertTrue(mGroupStatusChangedCalled);
+    }
+
+    public void testGetConnectedGroupLeadDevice() {
+        if (!(mHasBluetooth && mIsLeAudioSupported)) return;
+
+        assertTrue(waitForProfileConnect());
+        assertNotNull(mBluetoothLeAudio);
+
+        assertTrue(BTAdapterUtils.disableAdapter(mAdapter, mContext));
+
+        int groupId = 1;
+
+        // Verify returns null for unknown group id
+        assertEquals(null, mBluetoothLeAudio.getConnectedGroupLeadDevice(groupId));
     }
 
     private boolean waitForProfileConnect() {
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothServiceManagerTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothServiceManagerTest.java
new file mode 100644
index 0000000..9f7179e
--- /dev/null
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/BluetoothServiceManagerTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2022 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 android.bluetooth.cts;
+
+import static org.junit.Assert.assertThrows;
+
+import android.content.pm.PackageManager;
+import android.os.BluetoothServiceManager;
+import android.os.BluetoothServiceManager.ServiceNotFoundException;
+import android.os.BluetoothServiceManager.ServiceRegisterer;
+import android.os.IBinder;
+import android.os.ServiceManager;
+import android.test.AndroidTestCase;
+
+public class BluetoothServiceManagerTest extends AndroidTestCase {
+
+    private boolean mHasBluetooth;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mHasBluetooth = getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_BLUETOOTH);
+    }
+
+    public void test_ServiceRegisterer() {
+        if (!mHasBluetooth) {
+            return;
+        }
+        BluetoothServiceManager serviceManager = new BluetoothServiceManager();
+        ServiceRegisterer serviceRegisterer =
+                serviceManager.getBluetoothManagerServiceRegisterer();
+
+        assertThrows(SecurityException.class, () ->
+                serviceRegisterer.register(serviceRegisterer.get()));
+
+        IBinder bluetoothServiceBinder = serviceRegisterer.get();
+        assertNotNull(bluetoothServiceBinder);
+
+        bluetoothServiceBinder = serviceRegisterer.tryGet();
+        assertNotNull(bluetoothServiceBinder);
+
+        try {
+            bluetoothServiceBinder = serviceRegisterer.getOrThrow();
+            assertNotNull(bluetoothServiceBinder);
+        } catch (ServiceNotFoundException exception) {
+            fail("ServiceNotFoundException should not be thrown");
+        }
+    }
+
+    public void test_ServiceNotFoundException() {
+        ServiceManager.ServiceNotFoundException baseException =
+                new ServiceManager.ServiceNotFoundException("");
+        String exceptionDescription = "description test";
+        String baseExceptionDescription = baseException.getMessage();
+        ServiceNotFoundException newException =
+                new ServiceNotFoundException(exceptionDescription);
+        assertEquals(baseExceptionDescription + exceptionDescription, newException.getMessage());
+        try {
+            throw newException;
+        } catch (ServiceNotFoundException exception) {
+            assertEquals(baseExceptionDescription + exceptionDescription, exception.getMessage());
+        }
+    }
+}
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/HearingAidProfileTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/HearingAidProfileTest.java
index 570633e..7a227fc 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/HearingAidProfileTest.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/HearingAidProfileTest.java
@@ -134,17 +134,18 @@
         assertTrue(mIsProfileReady);
         assertNotNull(mService);
 
-        // Create a dummy device
+        // Create a fake device
         BluetoothDevice device = mBluetoothAdapter.getRemoteDevice("00:11:22:AA:BB:CC");
         assertNotNull(device);
 
         int connectionState = mService.getConnectionState(device);
-        // Dummy device should be disconnected
+        // Fake device should be disconnected
         assertEquals(connectionState, BluetoothProfile.STATE_DISCONNECTED);
     }
 
     /**
-     * Basic test case to make sure that a fictional device is disconnected.
+     * Basic test case to make sure that a fictional device throw a SecurityException when setting
+     * volume.
      */
     @MediumTest
     public void test_setVolume() {
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/TestUtils.java b/tests/tests/bluetooth/src/android/bluetooth/cts/TestUtils.java
index a0ed839..75dfba6 100644
--- a/tests/tests/bluetooth/src/android/bluetooth/cts/TestUtils.java
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/TestUtils.java
@@ -47,7 +47,7 @@
     /**
      * Bluetooth package name
      */
-    static final String BLUETOOTH_PACKAGE_NAME = "com.android.bluetooth";
+    static final String BLUETOOTH_PACKAGE_NAME = "com.android.bluetooth.services";
 
     /**
      * Get the Config.xml name tag for a particular Bluetooth profile
@@ -258,4 +258,4 @@
             Log.e(TestUtils.class.getSimpleName(), "interrupted", e);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/tests/bluetooth/src/android/bluetooth/cts/UidTrafficTest.java b/tests/tests/bluetooth/src/android/bluetooth/cts/UidTrafficTest.java
new file mode 100644
index 0000000..34eebe0
--- /dev/null
+++ b/tests/tests/bluetooth/src/android/bluetooth/cts/UidTrafficTest.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2022 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 android.bluetooth.cts;
+
+
+import android.bluetooth.UidTraffic;
+import android.os.Parcel;
+import android.test.AndroidTestCase;
+
+
+public class UidTrafficTest extends AndroidTestCase {
+
+    UidTraffic mUidTraffic;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        final Parcel uidTrafficParcel = Parcel.obtain();
+        uidTrafficParcel.writeInt(1000);
+        uidTrafficParcel.writeLong(2000);
+        uidTrafficParcel.writeLong(3000);
+        uidTrafficParcel.setDataPosition(0);
+        mUidTraffic = UidTraffic.CREATOR.createFromParcel(uidTrafficParcel);
+        uidTrafficParcel.recycle();
+    }
+
+    public void test_UidTrafficClone() {
+        assertNotNull(mUidTraffic);
+        UidTraffic clonedUidTraffic = mUidTraffic.clone();
+        assertNotNull(clonedUidTraffic);
+        assertEquals(mUidTraffic.getUid(), clonedUidTraffic.getUid());
+        assertEquals(mUidTraffic.getRxBytes(), clonedUidTraffic.getRxBytes());
+        assertEquals(mUidTraffic.getTxBytes(), clonedUidTraffic.getTxBytes());
+    }
+
+    public void test_UidTrafficGet() {
+        assertNotNull(mUidTraffic);
+        assertEquals(mUidTraffic.getUid(), 1000);
+        assertEquals(mUidTraffic.getRxBytes(), 2000);
+        assertEquals(mUidTraffic.getTxBytes(), 3000);
+    }
+}
diff --git a/tests/tests/car/Android.bp b/tests/tests/car/Android.bp
index 56699e2..2c03fb8 100644
--- a/tests/tests/car/Android.bp
+++ b/tests/tests/car/Android.bp
@@ -35,6 +35,7 @@
     ],
     srcs: [
         "src/**/*.java",
+        ":cartelemetryservice-proto-srcs",
         ":rotary-service-proto-source",
     ],
     // Tag this module as a cts test artifact
diff --git a/tests/tests/car/AndroidManifest.xml b/tests/tests/car/AndroidManifest.xml
index 70e8b8a..a0326fc 100644
--- a/tests/tests/car/AndroidManifest.xml
+++ b/tests/tests/car/AndroidManifest.xml
@@ -26,6 +26,7 @@
     <uses-permission android:name="android.car.permission.CONTROL_CAR_DISPLAY_UNITS" />
     <uses-permission android:name="android.car.permission.READ_CAR_DISPLAY_UNITS" />
     <uses-permission android:name="android.car.permission.READ_CAR_POWER_POLICY" />
+    <uses-permission android:name="android.car.permission.USE_CAR_TELEMETRY_SERVICE" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADVERTISE"/>
diff --git a/tests/tests/car/AndroidTest.xml b/tests/tests/car/AndroidTest.xml
index f3d0aa7..0142d9d 100644
--- a/tests/tests/car/AndroidTest.xml
+++ b/tests/tests/car/AndroidTest.xml
@@ -35,6 +35,11 @@
         <option name="test-file-name" value="CtsCarPermissionCarPowertrainTest.apk"/>
         <option name="test-file-name" value="CtsCarPermissionCarEnergyPortsTest.apk"/>
     </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="setprop log.tag.CAR.TEST VERBOSE" />
+        <!-- Can't find the way to specify the empty string in 'value', so set the highest level -->
+        <option name="teardown-command" value="setprop log.tag.CAR.TEST ASSERT" />
+    </target_preparer>
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="android.car.cts"/>
diff --git a/tests/tests/car/PermissionReadCarDisplayUnits/src/android/car/cts/permissionreadcardisplayunits/PermissionReadCarDisplayUnitsTest.java b/tests/tests/car/PermissionReadCarDisplayUnits/src/android/car/cts/permissionreadcardisplayunits/PermissionReadCarDisplayUnitsTest.java
index 54c68e7..23c549f 100644
--- a/tests/tests/car/PermissionReadCarDisplayUnits/src/android/car/cts/permissionreadcardisplayunits/PermissionReadCarDisplayUnitsTest.java
+++ b/tests/tests/car/PermissionReadCarDisplayUnits/src/android/car/cts/permissionreadcardisplayunits/PermissionReadCarDisplayUnitsTest.java
@@ -45,7 +45,7 @@
                     VehiclePropertyIds.FUEL_VOLUME_DISPLAY_UNITS,
                     VehiclePropertyIds.TIRE_PRESSURE_DISPLAY_UNITS,
                     VehiclePropertyIds.EV_BATTERY_DISPLAY_UNITS,
-                    /*VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS=*/ 289408516,
+                    VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS,
                     VehiclePropertyIds.FUEL_CONSUMPTION_UNITS_DISTANCE_OVER_VOLUME)
                     .build();
 
@@ -69,4 +69,4 @@
                     PERMISSION_READ_CAR_DISPLAY_UNITS_PROPERTIES);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tests/tests/car/src/android/car/cts/CarApiTestBase.java b/tests/tests/car/src/android/car/cts/CarApiTestBase.java
index 771978c..7cb3c89 100644
--- a/tests/tests/car/src/android/car/cts/CarApiTestBase.java
+++ b/tests/tests/car/src/android/car/cts/CarApiTestBase.java
@@ -78,6 +78,10 @@
         }
     }
 
+    public void startUser(int userId) throws Exception {
+        executeShellCommand("am start-user %d", userId);
+    }
+
     protected synchronized Car getCar() {
         return mCar;
     }
diff --git a/tests/tests/car/src/android/car/cts/CarBluetoothTest.java b/tests/tests/car/src/android/car/cts/CarBluetoothTest.java
index b739f86..f4bf6a1 100644
--- a/tests/tests/car/src/android/car/cts/CarBluetoothTest.java
+++ b/tests/tests/car/src/android/car/cts/CarBluetoothTest.java
@@ -40,6 +40,7 @@
 import com.android.compatibility.common.util.CddTest;
 import com.android.compatibility.common.util.FeatureUtil;
 import com.android.compatibility.common.util.RequiredFeatureRule;
+import com.android.compatibility.common.util.ShellIdentityUtils;
 
 import org.junit.After;
 import org.junit.Before;
@@ -140,9 +141,9 @@
             // Update the desired state so that we'll signal when we get there
             mDesiredState = desiredState;
             if (desiredState == BluetoothAdapter.STATE_ON) {
-                mBluetoothAdapter.enable();
+                ShellIdentityUtils.invokeWithShellPermissions(() -> mBluetoothAdapter.enable());
             } else {
-                mBluetoothAdapter.disable();
+                ShellIdentityUtils.invokeWithShellPermissions(() -> mBluetoothAdapter.disable());
             }
 
             // Wait until we're reached that desired state
diff --git a/tests/tests/car/src/android/car/cts/CarPropertyManagerTest.java b/tests/tests/car/src/android/car/cts/CarPropertyManagerTest.java
index ac17aac..5a63009 100644
--- a/tests/tests/car/src/android/car/cts/CarPropertyManagerTest.java
+++ b/tests/tests/car/src/android/car/cts/CarPropertyManagerTest.java
@@ -29,7 +29,9 @@
 import android.car.VehicleAreaType;
 import android.car.VehicleAreaWheel;
 import android.car.VehicleGear;
+import android.car.VehicleIgnitionState;
 import android.car.VehiclePropertyIds;
+import android.car.VehicleUnit;
 import android.car.cts.utils.VehiclePropertyVerifier;
 import android.car.hardware.CarPropertyConfig;
 import android.car.hardware.CarPropertyValue;
@@ -86,29 +88,20 @@
                     VehicleGear.GEAR_SEVENTH, VehicleGear.GEAR_EIGHTH,
                     VehicleGear.GEAR_NINTH).build();
     private static final ImmutableSet<Integer> DISTANCE_DISPLAY_UNITS =
-            ImmutableSet.<Integer>builder().add(/*VehicleUnit.MILLIMETER=*/
-                    0x20, /*VehicleUnit.METER=*/ 0x21,
-                    /*VehicleUnit.KILOMETER=*/0x23, /*VehicleUnit.MILE=*/0x24).build();
+            ImmutableSet.<Integer>builder().add(VehicleUnit.MILLIMETER, VehicleUnit.METER,
+                    VehicleUnit.KILOMETER, VehicleUnit.MILE).build();
     private static final ImmutableSet<Integer> VOLUME_DISPLAY_UNITS =
-            ImmutableSet.<Integer>builder().add(/*VehicleUnit.MILLILITER=*/
-                    0x40, /*VehicleUnit.LITER=*/0x41,
-                    /*VehicleUnit.US_GALLON=*/0x42, /*VehicleUnit.IMPERIAL_GALLON=*/0x43).build();
+            ImmutableSet.<Integer>builder().add(VehicleUnit.MILLILITER, VehicleUnit.LITER,
+                    VehicleUnit.US_GALLON, VehicleUnit.IMPERIAL_GALLON).build();
     private static final ImmutableSet<Integer> PRESSURE_DISPLAY_UNITS =
-            ImmutableSet.<Integer>builder().add(/*VehicleUnit.KILOPASCAL=*/
-                    0x70, /*VehicleUnit.PSI=*/0x71,
-                    /*VehicleUnit.BAR=*/0x72).build();
+            ImmutableSet.<Integer>builder().add(VehicleUnit.KILOPASCAL, VehicleUnit.PSI,
+                    VehicleUnit.BAR).build();
     private static final ImmutableSet<Integer> BATTERY_DISPLAY_UNITS =
-            ImmutableSet.<Integer>builder().add(
-                    /*VehicleUnit.MILLIAMPERE=*/ 0x61,
-                    /*VehicleUnit.MILLIVOLT=*/ 0x62,
-                    /*VehicleUnit.MILLIWATTS=*/ 0x63,
-                    /*VehicleUnit.WATT_HOUR=*/ 0x60,
-                    /*VehicleUnit.AMPERE_HOURS=*/ 0x64,
-                    /*VehicleUnit.KILOWATT_HOUR=*/ 0x65).build();
+            ImmutableSet.<Integer>builder().add(VehicleUnit.WATT_HOUR, VehicleUnit.AMPERE_HOURS,
+                    VehicleUnit.KILOWATT_HOUR).build();
     private static final ImmutableSet<Integer> SPEED_DISPLAY_UNITS =
-            ImmutableSet.<Integer>builder().add(/*VehicleUnit.METER_PER_SEC=*/0x01,
-                    /*VehicleUnit.MILES_PER_HOUR=*/ 0x90,
-                    /*VehicleUnit.KILOMETERS_PER_HOUR=*/ 0x91).build();
+            ImmutableSet.<Integer>builder().add(VehicleUnit.METER_PER_SEC,
+                    VehicleUnit.MILES_PER_HOUR, VehicleUnit.KILOMETERS_PER_HOUR).build();
     /** contains property Ids for the properties required by CDD */
     private final ArraySet<Integer> mPropertyIds = new ArraySet<>();
     private CarPropertyManager mCarPropertyManager;
@@ -292,7 +285,7 @@
                             "WHEEL_TICK config array first element specifies which wheels are"
                                     + " supported")
                             .that(supportedWheels).isGreaterThan(
-                            VehicleAreaWheel.WHEEL_UNKNOWN);
+                                    VehicleAreaWheel.WHEEL_UNKNOWN);
                     assertWithMessage(
                             "WHEEL_TICK config array first element specifies which wheels are"
                                     + " supported")
@@ -317,8 +310,7 @@
 
                     Long[] wheelTicks = (Long[]) carPropertyValue.getValue();
                     assertWithMessage("WHEEL_TICK Long[] value must be size 5").that(
-                            wheelTicks.length)
-                            .isEqualTo(5);
+                            wheelTicks.length).isEqualTo(5);
 
                     verifyWheelTickValue(supportedWheels, VehicleAreaWheel.WHEEL_LEFT_FRONT, 1,
                             wheelTicks[1]);
@@ -500,20 +492,18 @@
                 Integer.class).setCarPropertyValueVerifier(
                 (carPropertyConfig, carPropertyValue) -> {
                     Integer driverSeat = (Integer) carPropertyValue.getValue();
-                    assertWithMessage(
-                            "INFO_DRIVER_SEAT must be a defined front seat location: "
-                                    + driverSeat).that(
-                            driverSeat).isIn(
+                    assertWithMessage("INFO_DRIVER_SEAT must be a defined front seat location: "
+                            + driverSeat).that(driverSeat).isIn(
                             ImmutableSet.builder().add(VehicleAreaSeat.SEAT_UNKNOWN,
                                     VehicleAreaSeat.SEAT_ROW_1_LEFT,
                                     VehicleAreaSeat.SEAT_ROW_1_CENTER,
                                     VehicleAreaSeat.SEAT_ROW_1_RIGHT).build());
                 }).setAreaIdsVerifier(areaIds -> assertWithMessage(
                 "Even though INFO_DRIVER_SEAT is VEHICLE_AREA_TYPE_SEAT, it is meant to be "
-                        + "VEHICLE_AREA_TYPE_GLOBAL, so its AreaIds must contain a single 0")
-                .that(areaIds).isEqualTo(
-                        new int[]{VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL})).build()
-                .verify(mCarPropertyManager);
+                        + "VEHICLE_AREA_TYPE_GLOBAL, so its AreaIds must contain a single 0").that(
+                areaIds).isEqualTo(
+                new int[]{VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL})).build().verify(
+                mCarPropertyManager);
     }
 
     @Test
@@ -625,13 +615,10 @@
                     assertWithMessage(
                             "IGNITION_STATE must be a defined ignition state: "
                                     + ignitionState).that(
-                            ignitionState).isIn(ImmutableSet.of(
-                            /*VehicleIgnitionState.UNDEFINED=*/0,
-                            /*VehicleIgnitionState.LOCK=*/1,
-                            /*VehicleIgnitionState.OFF=*/2,
-                            /*VehicleIgnitionState.ACC=*/3,
-                            /*VehicleIgnitionState.ON=*/4,
-                            /*VehicleIgnitionState.START=*/5));
+                            ignitionState).isIn(ImmutableSet.of(VehicleIgnitionState.UNDEFINED,
+                            VehicleIgnitionState.LOCK, VehicleIgnitionState.OFF,
+                            VehicleIgnitionState.ACC, VehicleIgnitionState.ON,
+                            VehicleIgnitionState.START));
                 }).build().verify(mCarPropertyManager);
     }
 
@@ -681,8 +668,7 @@
 
     @Test
     public void testVehicleSpeedDisplayUnitsIfSupported() {
-        VehiclePropertyVerifier.newBuilder(/*VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS=*/
-                289408516,
+        VehiclePropertyVerifier.newBuilder(VehiclePropertyIds.VEHICLE_SPEED_DISPLAY_UNITS,
                 CarPropertyConfig.VEHICLE_PROPERTY_ACCESS_READ_WRITE,
                 VehicleAreaType.VEHICLE_AREA_TYPE_GLOBAL,
                 CarPropertyConfig.VEHICLE_PROPERTY_CHANGE_MODE_ONCHANGE,
diff --git a/tests/tests/car/src/android/car/cts/CarServiceHelperServiceUpdatableTest.java b/tests/tests/car/src/android/car/cts/CarServiceHelperServiceUpdatableTest.java
new file mode 100644
index 0000000..0b744d8
--- /dev/null
+++ b/tests/tests/car/src/android/car/cts/CarServiceHelperServiceUpdatableTest.java
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.hamcrest.CoreMatchers.containsStringIgnoringCase;
+import static org.junit.Assume.assumeThat;
+import static org.testng.Assert.fail;
+
+import android.app.UiAutomation;
+import android.car.Car;
+import android.car.user.CarUserManager;
+import android.car.user.CarUserManager.UserLifecycleEvent;
+import android.car.user.CarUserManager.UserLifecycleListener;
+import android.os.NewUserRequest;
+import android.os.NewUserResponse;
+import android.os.ParcelFileDescriptor;
+import android.os.SystemClock;
+import android.os.UserManager;
+import android.util.Log;
+
+import androidx.test.filters.FlakyTest;
+import androidx.test.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.BufferedReader;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.List;
+
+public final class CarServiceHelperServiceUpdatableTest extends CarApiTestBase {
+
+    private static final String TAG = CarServiceHelperServiceUpdatableTest.class.getSimpleName();
+    private static final int TIMEOUT_MS = 60_000;
+    private static final int WAIT_TIME_MS = 1_000;
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        SystemUtil.runShellCommand("logcat -b all -c");
+    }
+
+    @Test
+    public void testCarServiceHelperServiceDump() throws Exception {
+        assumeThat("System_server_dumper not implemented.",
+                executeShellCommand("service check system_server_dumper"),
+                containsStringIgnoringCase("system_server_dumper: found"));
+
+        assertWithMessage("System server dumper")
+                .that(executeShellCommand("dumpsys system_server_dumper --list"))
+                .contains("CarServiceHelper");
+
+        assertWithMessage("CarServiceHelperService dump")
+                .that(executeShellCommand("dumpsys system_server_dumper --name CarServiceHelper"))
+                .contains("CarServiceProxy");
+
+        // Test setSafeMode
+        try {
+            executeShellCommand("cmd car_service emulate-driving-state drive");
+
+            assertWithMessage("CarServiceHelperService dump")
+                    .that(executeShellCommand(
+                            "dumpsys system_server_dumper --name CarServiceHelper"))
+                    .contains("Safe to run device policy operations: false");
+        } finally {
+            executeShellCommand("cmd car_service emulate-driving-state park");
+        }
+
+        assertWithMessage("CarServiceHelperService dump")
+                .that(executeShellCommand("dumpsys system_server_dumper --name CarServiceHelper"))
+                .contains("Safe to run device policy operations: true");
+
+        // Test dumpServiceStacks
+        assertWithMessage("CarServiceHelperService dump")
+                .that(executeShellCommand("dumpsys system_server_dumper --name CarServiceHelper"
+                        + " --dump-service-stacks"))
+                .contains("dumpServiceStacks ANR file path=/data/anr/anr_");
+    }
+
+    @FlakyTest(bugId = 222167696)
+    @Test
+    public void testSendUserLifecycleEventAndOnUserRemoved() throws Exception {
+        // Add listener to check if user started
+        CarUserManager carUserManager = (CarUserManager) getCar()
+                .getCarManager(Car.CAR_USER_SERVICE);
+        LifecycleListener listener = new LifecycleListener();
+        carUserManager.addListener(Runnable::run, listener);
+
+        NewUserResponse response = null;
+        UserManager userManager = null;
+        boolean userRemoved = false;
+        try {
+            // get create User permissions
+            InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                    .adoptShellPermissionIdentity(android.Manifest.permission.CREATE_USERS);
+
+            // CreateUser
+            userManager = mContext.getSystemService(UserManager.class);
+            response = userManager.createUser(new NewUserRequest.Builder().build());
+            assertThat(response.isSuccessful()).isTrue();
+
+            int userId = response.getUser().getIdentifier();
+            startUser(userId);
+            listener.assertEventReceived(userId, CarUserManager.USER_LIFECYCLE_EVENT_TYPE_STARTING);
+
+            // TestOnUserRemoved call
+            userRemoved = userManager.removeUser(response.getUser());
+            // check the dump stack
+            assertLastUserRemoved(userId);
+        } finally {
+            if (!userRemoved && response != null && response.isSuccessful()) {
+                userManager.removeUser(response.getUser());
+            }
+            carUserManager.removeListener(listener);
+            InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                    .dropShellPermissionIdentity();
+        }
+    }
+
+    private void assertLastUserRemoved(int userId) throws Exception {
+        // check for the logcat
+        // TODO(b/210874444): Use logcat helper from
+        // cts/tests/tests/car_builtin/src/android/car/cts/builtin/util/LogcatHelper.java
+        String match = "car_service_on_user_removed: " + userId;
+        long timeout = 60_000;
+        long startTime = SystemClock.elapsedRealtime();
+        UiAutomation automation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        String command = "logcat -b events";
+        ParcelFileDescriptor output = automation.executeShellCommand(command);
+        FileDescriptor fd = output.getFileDescriptor();
+        FileInputStream fileInputStream = new FileInputStream(fd);
+        try (BufferedReader bufferedReader = new BufferedReader(
+                new InputStreamReader(fileInputStream))) {
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                if (line.contains(match)) {
+                    return;
+                }
+                if ((SystemClock.elapsedRealtime() - startTime) > timeout) {
+                    fail("match '" + match + "' was not found, Timeout: " + timeout + " ms");
+                }
+            }
+        } catch (IOException e) {
+            fail("match '" + match + "' was not found, IO exception: " + e);
+        }
+
+    }
+
+    // TODO(214100537): Improve listener by removing sleep.
+    private final class LifecycleListener implements UserLifecycleListener {
+
+        private final List<UserLifecycleEvent> mEvents =
+                new ArrayList<CarUserManager.UserLifecycleEvent>();
+
+        private final Object mLock = new Object();
+
+        @Override
+        public void onEvent(UserLifecycleEvent event) {
+            Log.d(TAG, "Event received: " + event);
+            synchronized (mLock) {
+                mEvents.add(event);
+            }
+        }
+
+        public void assertEventReceived(int userId, int eventType)
+                throws InterruptedException {
+            long startTime = SystemClock.elapsedRealtime();
+            while (SystemClock.elapsedRealtime() - startTime < TIMEOUT_MS) {
+                boolean result = checkEvent(userId, eventType);
+                if (result) return;
+                Thread.sleep(WAIT_TIME_MS);
+            }
+
+            fail("Event" + eventType + " was not received within timeoutMs: " + TIMEOUT_MS);
+        }
+
+        private boolean checkEvent(int userId, int eventType) {
+            synchronized (mLock) {
+                for (int i = 0; i < mEvents.size(); i++) {
+                    if (mEvents.get(i).getUserHandle().getIdentifier() == userId
+                            && mEvents.get(i).getEventType() == eventType) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        }
+    }
+}
diff --git a/tests/tests/car/src/android/car/cts/CarTelemetryManagerTest.java b/tests/tests/car/src/android/car/cts/CarTelemetryManagerTest.java
new file mode 100644
index 0000000..9d18368
--- /dev/null
+++ b/tests/tests/car/src/android/car/cts/CarTelemetryManagerTest.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assume.assumeTrue;
+
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.car.Car;
+import android.car.VehiclePropertyIds;
+import android.car.telemetry.CarTelemetryManager;
+import android.car.telemetry.TelemetryProto;
+import android.os.PersistableBundle;
+import android.platform.test.annotations.RequiresDevice;
+import android.util.ArrayMap;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Map;
+import java.util.concurrent.Semaphore;
+
+@RequiresDevice
+@RunWith(AndroidJUnit4.class)
+public class CarTelemetryManagerTest extends CarApiTestBase {
+
+    /** Test MetricsConfig that does nothing. */
+    private static final TelemetryProto.MetricsConfig TEST_CONFIG =
+            TelemetryProto.MetricsConfig.newBuilder()
+                    .setName("test_config")
+                    .setVersion(1)
+                    .setScript("no-op")
+                    .build();
+    private static final String TEST_CONFIG_NAME = TEST_CONFIG.getName();
+
+    /** MetricsConfig with simple script that listens for parking brake change. */
+    private static final String PARKING_BRAKE_CHANGE_SCRIPT = new StringBuilder()
+            .append("function onParkingBrakeChange(published_data, saved_state)\n")
+            .append("    result = {data = \"Hello World!\"}\n")
+            .append("    on_script_finished(result)\n")
+            .append("end\n")
+            .toString();
+    private static final TelemetryProto.Publisher PARKING_BRAKE_PROPERTY_PUBLISHER =
+            TelemetryProto.Publisher.newBuilder()
+                    .setVehicleProperty(
+                            TelemetryProto.VehiclePropertyPublisher.newBuilder()
+                                    .setVehiclePropertyId(VehiclePropertyIds.PARKING_BRAKE_ON)
+                                    .setReadRate(0f))
+                    .build();
+    private static final TelemetryProto.Subscriber PARKING_BRAKE_PROPERTY_SUBSCRIBER =
+            TelemetryProto.Subscriber.newBuilder()
+                    .setHandler("onParkingBrakeChange")
+                    .setPublisher(PARKING_BRAKE_PROPERTY_PUBLISHER)
+                    .setPriority(0)
+                    .build();
+    private static final TelemetryProto.MetricsConfig PARKING_BRAKE_CONFIG =
+            TelemetryProto.MetricsConfig.newBuilder()
+                    .setName("parking_brake_config")
+                    .setVersion(1)
+                    .setScript(PARKING_BRAKE_CHANGE_SCRIPT)
+                    .addSubscribers(PARKING_BRAKE_PROPERTY_SUBSCRIBER)
+                    .build();
+    private static final String PARKING_BRAKE_CONFIG_NAME = PARKING_BRAKE_CONFIG.getName();
+
+    /**
+     * MetricsConfig with a bad script that listens for parking brake change, will produce error.
+     */
+    private static final TelemetryProto.MetricsConfig ERROR_CONFIG =
+            TelemetryProto.MetricsConfig.newBuilder()
+                    .setName("error_config")
+                    .setVersion(1)
+                    .setScript("a bad script that should produce a runtime error")
+                    .addSubscribers(PARKING_BRAKE_PROPERTY_SUBSCRIBER)
+                    .build();
+    private static final String ERROR_CONFIG_NAME = ERROR_CONFIG.getName();
+
+    private CarTelemetryManager mCarTelemetryManager;
+    private UiAutomation mUiAutomation;
+
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+        assumeTrue("CarTelemetryService is not enabled, skipping test",
+                getCar().isFeatureEnabled(Car.CAR_TELEMETRY_SERVICE));
+
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        mUiAutomation = instrumentation.getUiAutomation();
+        mUiAutomation.adoptShellPermissionIdentity(
+                "android.car.permission.USE_CAR_TELEMETRY_SERVICE");
+        mCarTelemetryManager = (CarTelemetryManager) Car.createCar(
+                instrumentation.getContext()).getCarManager(Car.CAR_TELEMETRY_SERVICE);
+        assertThat(mCarTelemetryManager).isNotNull();
+
+        // start from a clean state
+        mCarTelemetryManager.clearReportReadyListener();
+        mCarTelemetryManager.removeAllMetricsConfigs();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        // end in a clean state
+        mCarTelemetryManager.clearReportReadyListener();
+        mCarTelemetryManager.removeAllMetricsConfigs();
+        mUiAutomation.dropShellPermissionIdentity();
+    }
+
+    @Test
+    public void testAddRemoveMetricsConfig() throws Exception {
+        // Test: add new MetricsConfig. Expect: SUCCESS
+        AddMetricsConfigCallbackImpl callback = new AddMetricsConfigCallbackImpl();
+        mCarTelemetryManager.addMetricsConfig(TEST_CONFIG_NAME, TEST_CONFIG.toByteArray(),
+                Runnable::run, callback);
+        callback.mSemaphore.acquire();
+        assertThat(callback.mAddConfigStatusMap.get(TEST_CONFIG_NAME))
+                .isEqualTo(CarTelemetryManager.STATUS_ADD_METRICS_CONFIG_SUCCEEDED);
+
+        // Test: add a duplicate MetricsConfig. Expect: ALREADY_EXISTS status code
+        mCarTelemetryManager.addMetricsConfig(TEST_CONFIG_NAME, TEST_CONFIG.toByteArray(),
+                Runnable::run, callback);
+        callback.mSemaphore.acquire();
+        assertThat(callback.mAddConfigStatusMap.get(TEST_CONFIG_NAME))
+                .isEqualTo(CarTelemetryManager.STATUS_ADD_METRICS_CONFIG_ALREADY_EXISTS);
+
+        // Test: remove a MetricsConfig. Expect: the next add should return SUCCESS
+        mCarTelemetryManager.removeMetricsConfig(TEST_CONFIG_NAME);
+        mCarTelemetryManager.addMetricsConfig(TEST_CONFIG_NAME, TEST_CONFIG.toByteArray(),
+                Runnable::run, callback);
+        callback.mSemaphore.acquire();
+        assertThat(callback.mAddConfigStatusMap.get(TEST_CONFIG_NAME))
+                .isEqualTo(CarTelemetryManager.STATUS_ADD_METRICS_CONFIG_SUCCEEDED);
+    }
+
+    @Test
+    public void testEndToEndScriptExecution_getFinishedReport() throws Exception {
+        // set listener to receive report ready notification
+        Semaphore reportReadySemaphore = new Semaphore(0);
+        mCarTelemetryManager.setReportReadyListener(Runnable::run, metricsConfigName -> {
+            if (metricsConfigName.equals(PARKING_BRAKE_CONFIG_NAME)) {
+                reportReadySemaphore.release();
+            }
+        });
+
+        // add metrics config and assert success
+        AddMetricsConfigCallbackImpl callback = new AddMetricsConfigCallbackImpl();
+        mCarTelemetryManager.addMetricsConfig(PARKING_BRAKE_CONFIG_NAME,
+                PARKING_BRAKE_CONFIG.toByteArray(), Runnable::run, callback);
+        callback.mSemaphore.acquire();
+        assertThat(callback.mAddConfigStatusMap.get(PARKING_BRAKE_CONFIG_NAME))
+                .isEqualTo(CarTelemetryManager.STATUS_ADD_METRICS_CONFIG_SUCCEEDED);
+
+        // inject event to set parking brake on, triggering script execution
+        executeShellCommand("cmd car_service inject-vhal-event %d %s",
+                VehiclePropertyIds.PARKING_BRAKE_ON, true);
+
+        // wait for report ready notification, then call getFinishedReport()
+        reportReadySemaphore.acquire();
+        FinishedReportListenerImpl reportListener = new FinishedReportListenerImpl();
+        mCarTelemetryManager.getFinishedReport(
+                PARKING_BRAKE_CONFIG_NAME, Runnable::run, reportListener);
+        reportListener.mSemaphore.acquire();
+        assertThat(reportListener.mReportMap.get(PARKING_BRAKE_CONFIG_NAME)).isNotNull();
+        assertThat(reportListener.mStatusMap.get(PARKING_BRAKE_CONFIG_NAME))
+                .isEqualTo(CarTelemetryManager.STATUS_GET_METRICS_CONFIG_FINISHED);
+    }
+
+    @Test
+    public void testEndToEndScriptExecution_getAllFinishedReports() throws Exception {
+        // set listener to receive report ready notification
+        Semaphore reportReadySemaphore = new Semaphore(0);
+        mCarTelemetryManager.setReportReadyListener(
+                Runnable::run, metricsConfigName -> reportReadySemaphore.release());
+
+        // add 2 metrics configs, one will produce a final report and one will error
+        AddMetricsConfigCallbackImpl callback = new AddMetricsConfigCallbackImpl();
+        mCarTelemetryManager.addMetricsConfig(PARKING_BRAKE_CONFIG_NAME,
+                PARKING_BRAKE_CONFIG.toByteArray(), Runnable::run, callback);
+        mCarTelemetryManager.addMetricsConfig(ERROR_CONFIG_NAME, ERROR_CONFIG.toByteArray(),
+                Runnable::run, callback);
+        callback.mSemaphore.acquire(2);
+        assertThat(callback.mAddConfigStatusMap.get(PARKING_BRAKE_CONFIG_NAME))
+                .isEqualTo(CarTelemetryManager.STATUS_ADD_METRICS_CONFIG_SUCCEEDED);
+        assertThat(callback.mAddConfigStatusMap.get(ERROR_CONFIG_NAME))
+                .isEqualTo(CarTelemetryManager.STATUS_ADD_METRICS_CONFIG_SUCCEEDED);
+
+        // inject event to set parking brake on, triggering both scripts
+        executeShellCommand("cmd car_service inject-vhal-event %d %s",
+                VehiclePropertyIds.PARKING_BRAKE_ON, true);
+
+        // wait for report ready notification, then call getFinishedReport()
+        reportReadySemaphore.acquire(2);
+
+        // get all reports
+        FinishedReportListenerImpl reportListener = new FinishedReportListenerImpl();
+        mCarTelemetryManager.getAllFinishedReports(Runnable::run, reportListener);
+
+        // semaphore should be released 2 times, one for each report
+        reportListener.mSemaphore.acquire(2);
+        assertThat(reportListener.mReportMap.get(PARKING_BRAKE_CONFIG_NAME)).isNotNull();
+        assertThat(reportListener.mStatusMap.get(PARKING_BRAKE_CONFIG_NAME))
+                .isEqualTo(CarTelemetryManager.STATUS_GET_METRICS_CONFIG_FINISHED);
+        assertThat(reportListener.mErrorMap.get(ERROR_CONFIG_NAME)).isNotNull();
+        assertThat(reportListener.mStatusMap.get(ERROR_CONFIG_NAME))
+                .isEqualTo(CarTelemetryManager.STATUS_GET_METRICS_CONFIG_RUNTIME_ERROR);
+    }
+
+    @Test
+    public void testSetClearReportReadyListener() {
+        CarTelemetryManager.ReportReadyListener listener = metricsConfigName -> { };
+
+        // test clearReportReadyListener, should not error
+        mCarTelemetryManager.setReportReadyListener(Runnable::run, listener);
+
+        // setListener multiple times should fail
+        assertThrows(IllegalStateException.class,
+                () -> mCarTelemetryManager.setReportReadyListener(Runnable::run, listener));
+
+        // test clearReportReadyListener, a successful "clear" should allow for a successful "set"
+        mCarTelemetryManager.clearReportReadyListener();
+        mCarTelemetryManager.setReportReadyListener(Runnable::run, listener);
+    }
+
+    private final class AddMetricsConfigCallbackImpl
+            implements CarTelemetryManager.AddMetricsConfigCallback {
+
+        private final Semaphore mSemaphore = new Semaphore(0);
+        private final Map<String, Integer> mAddConfigStatusMap = new ArrayMap<>();
+
+        @Override
+        public void onAddMetricsConfigStatus(@NonNull String metricsConfigName, int statusCode) {
+            mAddConfigStatusMap.put(metricsConfigName, statusCode);
+            mSemaphore.release();
+        }
+    }
+
+    private final class FinishedReportListenerImpl
+            implements CarTelemetryManager.MetricsReportCallback {
+
+        private final Semaphore mSemaphore = new Semaphore(0);
+        private final Map<String, byte[]> mErrorMap = new ArrayMap<>();
+        private final Map<String, PersistableBundle> mReportMap = new ArrayMap<>();
+        private final Map<String, Integer> mStatusMap = new ArrayMap<>();
+
+        @Override
+        public void onResult(@NonNull String metricsConfigName, @Nullable PersistableBundle report,
+                @Nullable byte[] error, int status) {
+            mReportMap.put(metricsConfigName, report);
+            mErrorMap.put(metricsConfigName, error);
+            mStatusMap.put(metricsConfigName, status);
+            mSemaphore.release();
+        }
+    }
+}
diff --git a/tests/tests/car/src/android/car/cts/CarTest.java b/tests/tests/car/src/android/car/cts/CarTest.java
index 8527189..3c9fff5 100644
--- a/tests/tests/car/src/android/car/cts/CarTest.java
+++ b/tests/tests/car/src/android/car/cts/CarTest.java
@@ -23,6 +23,7 @@
 import android.content.Context;
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.IBinder;
 import android.platform.test.annotations.AppModeFull;
 import android.test.suitebuilder.annotation.SmallTest;
@@ -118,6 +119,31 @@
         listenerImpl.waitForReady(DEFAULT_WAIT_TIMEOUT_MS);
     }
 
+    @Test
+    public void testApiVersion() throws Exception {
+        int ApiVersionTooHigh = 1000000;
+        int MinorApiVersionTooHigh = 1000000;
+        assertThat(Car.isApiVersionAtLeast(Car.API_VERSION_MAJOR_INT)).isTrue();
+        assertThat(Car.isApiVersionAtLeast(ApiVersionTooHigh)).isFalse();
+
+        assertThat(Car.isApiVersionAtLeast(Car.API_VERSION_MAJOR_INT -1 ,
+                MinorApiVersionTooHigh)).isTrue();
+        assertThat(Car.isApiVersionAtLeast(Car.API_VERSION_MAJOR_INT,
+                Car.API_VERSION_MINOR_INT)).isTrue();
+        assertThat(Car.isApiVersionAtLeast(Car.API_VERSION_MAJOR_INT,
+                MinorApiVersionTooHigh)).isFalse();
+        assertThat(Car.isApiVersionAtLeast(ApiVersionTooHigh, 0)).isFalse();
+
+        assertThat(Car.isApiAndPlatformVersionAtLeast(Car.API_VERSION_MAJOR_INT,
+                Build.VERSION.SDK_INT)).isTrue();
+        assertThat(Car.isApiAndPlatformVersionAtLeast(Car.API_VERSION_MAJOR_INT,
+                Build.VERSION.SDK_INT + 1)).isFalse();
+        assertThat(Car.isApiAndPlatformVersionAtLeast(Car.API_VERSION_MAJOR_INT,
+                Car.API_VERSION_MINOR_INT, Build.VERSION.SDK_INT)).isTrue();
+        assertThat(Car.isApiAndPlatformVersionAtLeast(Car.API_VERSION_MAJOR_INT,
+                Car.API_VERSION_MINOR_INT, Build.VERSION.SDK_INT + 1)).isFalse();
+    }
+
     private static void assertConnectedCar(Car car) {
         assertThat(car).isNotNull();
         assertThat(car.isConnected()).isTrue();
diff --git a/tests/tests/car/src/android/car/cts/EvChargingConnectorTypeTest.java b/tests/tests/car/src/android/car/cts/EvChargingConnectorTypeTest.java
new file mode 100644
index 0000000..ac009e0
--- /dev/null
+++ b/tests/tests/car/src/android/car/cts/EvChargingConnectorTypeTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.VehiclePropertyIds;
+import android.car.cts.utils.VehiclePropertyUtils;
+import android.car.hardware.property.EvChargingConnectorType;
+
+import org.junit.Test;
+
+import java.util.List;
+
+
+public class EvChargingConnectorTypeTest {
+
+    /**
+     * Test for {@link EvChargingConnectorType#toString()}
+     */
+    @Test
+    public void testToString() {
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.UNKNOWN))
+                .isEqualTo("UNKNOWN");
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.IEC_TYPE_1_AC))
+                .isEqualTo("IEC_TYPE_1_AC");
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.IEC_TYPE_2_AC))
+                .isEqualTo("IEC_TYPE_2_AC");
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.IEC_TYPE_3_AC))
+                .isEqualTo("IEC_TYPE_3_AC");
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.IEC_TYPE_4_DC))
+                .isEqualTo("IEC_TYPE_4_DC");
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.IEC_TYPE_1_CCS_DC))
+                .isEqualTo("IEC_TYPE_1_CCS_DC");
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.IEC_TYPE_2_CCS_DC))
+                .isEqualTo("IEC_TYPE_2_CCS_DC");
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.TESLA_HPWC))
+                .isEqualTo("TESLA_HPWC");
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.TESLA_ROADSTER))
+                .isEqualTo("TESLA_ROADSTER");
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.TESLA_SUPERCHARGER))
+                .isEqualTo("TESLA_SUPERCHARGER");
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.GBT_AC))
+                .isEqualTo("GBT_AC");
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.GBT_DC))
+                .isEqualTo("GBT_DC");
+        assertThat(EvChargingConnectorType.toString(EvChargingConnectorType.OTHER))
+                .isEqualTo("OTHER");
+        assertThat(EvChargingConnectorType.toString(0x999)).isEqualTo("0x999");
+    }
+
+    /**
+     * Test if all system properties have a mapped string value.
+     */
+    @Test
+    public void testAllConnectorTypesAreMappedInToString() {
+        List<Integer> connectorTypes =
+                VehiclePropertyUtils.getIntegersFromDataEnums(EvChargingConnectorType.class);
+        for (int connectorType : connectorTypes) {
+            String propertyString = EvChargingConnectorType.toString(connectorType);
+            assertThat(propertyString.startsWith("0x")).isFalse();
+        }
+    }
+}
diff --git a/tests/tests/car/src/android/car/cts/VehicleGearTest.java b/tests/tests/car/src/android/car/cts/VehicleGearTest.java
index 5601757..319c7ed 100644
--- a/tests/tests/car/src/android/car/cts/VehicleGearTest.java
+++ b/tests/tests/car/src/android/car/cts/VehicleGearTest.java
@@ -19,13 +19,10 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.car.VehicleGear;
-import android.car.VehiclePropertyIds;
-import android.util.Log;
+import android.car.cts.utils.VehiclePropertyUtils;
 
 import org.junit.Test;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.List;
 
 public class VehicleGearTest {
@@ -60,25 +57,10 @@
      */
     @Test
     public void testAllGearsAreMappedInToString() {
-        List<Integer> gears = getIntegersFromDataEnums(VehicleGear.class);
+        List<Integer> gears = VehiclePropertyUtils.getIntegersFromDataEnums(VehicleGear.class);
         for (int gear : gears) {
             String gearString = VehicleGear.toString(gear);
             assertThat(gearString.startsWith("0x")).isFalse();
         }
     }
-    // Get all enums from the class.
-    private static List<Integer> getIntegersFromDataEnums(Class clazz) {
-        Field[] fields = clazz.getDeclaredFields();
-        List<Integer> integerList = new ArrayList<>(5);
-        for (Field f : fields) {
-            if (f.getType() == int.class) {
-                try {
-                    integerList.add(f.getInt(clazz));
-                } catch (IllegalAccessException | RuntimeException e) {
-                    Log.w(TAG, "Failed to get value");
-                }
-            }
-        }
-        return integerList;
-    }
 }
diff --git a/tests/tests/car/src/android/car/cts/VehicleIgnitionStateTest.java b/tests/tests/car/src/android/car/cts/VehicleIgnitionStateTest.java
new file mode 100644
index 0000000..fe4e14c
--- /dev/null
+++ b/tests/tests/car/src/android/car/cts/VehicleIgnitionStateTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.car.VehicleIgnitionState;
+import android.car.cts.utils.VehiclePropertyUtils;
+
+import org.junit.Test;
+
+import java.util.List;
+
+public final class VehicleIgnitionStateTest {
+
+    @Test
+    public void testToString() {
+        assertThat(VehicleIgnitionState.toString(VehicleIgnitionState.UNDEFINED))
+                .isEqualTo("UNDEFINED");
+        assertThat(VehicleIgnitionState.toString(VehicleIgnitionState.LOCK)).isEqualTo("LOCK");
+        assertThat(VehicleIgnitionState.toString(VehicleIgnitionState.OFF)).isEqualTo("OFF");
+        assertThat(VehicleIgnitionState.toString(VehicleIgnitionState.ACC)).isEqualTo("ACC");
+        assertThat(VehicleIgnitionState.toString(VehicleIgnitionState.ON)).isEqualTo("ON");
+        assertThat(VehicleIgnitionState.toString(VehicleIgnitionState.START)).isEqualTo("START");
+    }
+
+    @Test
+    public void testAllIgnitionStatesAreMappedInToString() {
+        List<Integer> ignitionStates =
+                VehiclePropertyUtils.getIntegersFromDataEnums(VehicleIgnitionState.class);
+        for (Integer ignitionState : ignitionStates) {
+            String ignitionStateString = VehicleIgnitionState.toString(ignitionState);
+            assertWithMessage("%s starts with 0x", ignitionStateString)
+                    .that(ignitionStateString.startsWith("0x")).isFalse();
+        }
+    }
+}
+
diff --git a/tests/tests/car/src/android/car/cts/VehiclePropertyIdsTest.java b/tests/tests/car/src/android/car/cts/VehiclePropertyIdsTest.java
index 4d00ea9..1e68b01 100644
--- a/tests/tests/car/src/android/car/cts/VehiclePropertyIdsTest.java
+++ b/tests/tests/car/src/android/car/cts/VehiclePropertyIdsTest.java
@@ -19,40 +19,21 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import android.car.VehiclePropertyIds;
+import android.car.cts.utils.VehiclePropertyUtils;
 import android.platform.test.annotations.RequiresDevice;
 import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Log;
 
 import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import java.lang.reflect.Field;
-import java.util.ArrayList;
 import java.util.List;
 
 @SmallTest
 @RequiresDevice
 @RunWith(AndroidJUnit4.class)
 public class VehiclePropertyIdsTest {
-    private static final String TAG = "VehiclePropertyIdsTest";
-
-    // Get all enums from the class.
-    private static List<Integer> getIntegersFromDataEnums() {
-        Field[] fields = VehiclePropertyIds.class.getDeclaredFields();
-        List<Integer> integerList = new ArrayList<>(5);
-        for (Field f : fields) {
-            if (f.getType() == int.class) {
-                try {
-                    integerList.add(f.getInt(VehiclePropertyIds.class));
-                } catch (IllegalAccessException | RuntimeException e) {
-                    Log.w(TAG, "Failed to get value");
-                }
-            }
-        }
-        return integerList;
-    }
 
     /**
      * Test for {@link VehiclePropertyIds#toString()}
@@ -132,6 +113,22 @@
                 .isEqualTo("EV_CHARGE_PORT_CONNECTED");
         assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.EV_CHARGE_PORT_OPEN))
                 .isEqualTo("EV_CHARGE_PORT_OPEN");
+        assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.EV_CHARGE_CURRENT_DRAW_LIMIT))
+                .isEqualTo("EV_CHARGE_CURRENT_DRAW_LIMIT");
+        assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.EV_CHARGE_PERCENT_LIMIT))
+                .isEqualTo("EV_CHARGE_PERCENT_LIMIT");
+        assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.EV_CHARGE_SWITCH))
+                .isEqualTo("EV_CHARGE_SWITCH");
+        assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.EV_CHARGE_STATE))
+                .isEqualTo("EV_CHARGE_STATE");
+        assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.EV_CHARGE_TIME_REMAINING))
+                .isEqualTo("EV_CHARGE_TIME_REMAINING");
+        assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.EV_REGENERATIVE_BRAKING_STATE))
+                .isEqualTo("EV_REGENERATIVE_BRAKING_STATE");
+        assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.VEHICLE_CURB_WEIGHT))
+                .isEqualTo("VEHICLE_CURB_WEIGHT");
+        assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.TRAILER_PRESENT))
+                .isEqualTo("TRAILER_PRESENT");
         assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.RANGE_REMAINING))
                 .isEqualTo("RANGE_REMAINING");
         assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.TIRE_PRESSURE)).
@@ -310,6 +307,14 @@
                 .isEqualTo("FOG_LIGHTS_STATE");
         assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.FOG_LIGHTS_SWITCH))
                 .isEqualTo("FOG_LIGHTS_SWITCH");
+        assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.FRONT_FOG_LIGHTS_STATE))
+                .isEqualTo("FRONT_FOG_LIGHTS_STATE");
+        assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.FRONT_FOG_LIGHTS_SWITCH))
+                .isEqualTo("FRONT_FOG_LIGHTS_SWITCH");
+        assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.REAR_FOG_LIGHTS_STATE))
+                .isEqualTo("REAR_FOG_LIGHTS_STATE");
+        assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.REAR_FOG_LIGHTS_SWITCH))
+                .isEqualTo("REAR_FOG_LIGHTS_SWITCH");
         assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.HAZARD_LIGHTS_STATE))
                 .isEqualTo("HAZARD_LIGHTS_STATE");
         assertThat(VehiclePropertyIds.toString(VehiclePropertyIds.HAZARD_LIGHTS_SWITCH))
@@ -331,7 +336,8 @@
      */
     @Test
     public void testAllPropertiesAreMappedInToString() {
-        List<Integer> systemProperties = getIntegersFromDataEnums();
+        List<Integer> systemProperties =
+                VehiclePropertyUtils.getIntegersFromDataEnums(VehiclePropertyIds.class);
         for (int propertyId : systemProperties) {
             String propertyString = VehiclePropertyIds.toString(propertyId);
             assertThat(propertyString.startsWith("0x")).isFalse();
diff --git a/tests/tests/car/src/android/car/cts/utils/VehiclePropertyUtils.java b/tests/tests/car/src/android/car/cts/utils/VehiclePropertyUtils.java
new file mode 100644
index 0000000..ad88306
--- /dev/null
+++ b/tests/tests/car/src/android/car/cts/utils/VehiclePropertyUtils.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.utils;
+
+import android.util.Log;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+public class VehiclePropertyUtils {
+
+    private VehiclePropertyUtils() {
+    }
+
+    /** Returns all integer type enums from the class */
+    public static List<Integer> getIntegersFromDataEnums(Class<?> clazz) {
+        Field[] fields = clazz.getDeclaredFields();
+        List<Integer> integerList = new ArrayList<>(5);
+        for (Field f : fields) {
+            if (f.getType() == int.class) {
+                try {
+                    integerList.add(f.getInt(clazz));
+                } catch (IllegalAccessException | RuntimeException e) {
+                    Log.w(clazz.getSimpleName(), "Failed to get value");
+                }
+            }
+        }
+        return integerList;
+    }
+}
diff --git a/tests/tests/car_builtin/Android.bp b/tests/tests/car_builtin/Android.bp
new file mode 100644
index 0000000..1c035ad
--- /dev/null
+++ b/tests/tests/car_builtin/Android.bp
@@ -0,0 +1,48 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsCarBuiltinApiTestCases",
+    defaults: ["cts_defaults"],
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.aidl",
+    ],
+    resource_dirs: ["res"],
+    libs: [
+        "android.car",
+        "android.car.builtin",
+        "android.test.base",
+    ],
+    static_libs: [
+        "androidx.test.rules",
+        "androidx.test.ext.truth",
+        "compatibility-device-util-axt",
+        "ctstestrunner-axt",
+        "cts-wm-util",
+        "testng",
+    ],
+
+    platform_apis: true,
+    sdk_version: "module_current",
+}
diff --git a/tests/tests/car_builtin/AndroidManifest.xml b/tests/tests/car_builtin/AndroidManifest.xml
new file mode 100644
index 0000000..40e5e09
--- /dev/null
+++ b/tests/tests/car_builtin/AndroidManifest.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.car.cts.builtin">
+    <uses-feature android:name="android.hardware.type.automotive" />
+
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
+    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
+
+    <application android:description="@string/app_description">
+        <uses-library android:name="android.test.runner" />
+
+        <activity android:name="android.car.cts.builtin.activity.SimpleActivity"
+                  android:exported="true">
+        </activity>
+
+        <activity android:name="android.car.cts.builtin.activity.VirtualDisplayIdTestActivity"
+                  android:exported="true">
+        </activity>
+
+        <activity android:name="android.car.cts.builtin.activity.TaskInfoTestActivity"
+                  android:label="@string/task_info_test_activity"
+                  android:taskAffinity=""
+                  android:exported="true">
+        </activity>
+
+        <service android:name="android.car.cts.builtin.os.SharedMemoryTestService"
+            android:process=":shdmemservice">
+        </service>
+
+        <activity android:name="android.car.cts.builtin.app.ActivityManagerHelperTest$ActivityA"
+                  android:taskAffinity="android.car.cts.builtin.amTestTask1"
+                  android:exported="true">
+        </activity>
+
+        <activity android:name="android.car.cts.builtin.app.ActivityManagerHelperTest$ActivityB"
+                  android:taskAffinity="android.car.cts.builtin.amTestTask1"
+                  android:exported="true">
+        </activity>
+
+        <activity android:name="android.car.cts.builtin.app.ActivityManagerHelperTest$ActivityC"
+                  android:taskAffinity="android.car.cts.builtin.amTestTask2"
+                  android:exported="true">
+        </activity>
+
+        <service android:name="android.car.cts.builtin.os.ServiceManagerTestService"
+            android:process=":testservice">
+        </service>
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="android.car.cts.builtin"
+                     android:label="CTS tests for car builtin api">
+        <meta-data android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+</manifest>
+
diff --git a/tests/tests/car_builtin/AndroidTest.xml b/tests/tests/car_builtin/AndroidTest.xml
new file mode 100644
index 0000000..2ace59c
--- /dev/null
+++ b/tests/tests/car_builtin/AndroidTest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<configuration description="Config for CTS car builtin api test cases">
+    <object class="com.android.tradefed.testtype.suite.module.CarModuleController"
+            type="module_controller"/>
+    <option name="test-suite-tag" value="cts"/>
+    <option name="config-descriptor:metadata" key="component" value="auto"/>
+    <option name="config-descriptor:metadata" key="parameter" value="instant_app"/>
+    <option name="config-descriptor:metadata" key="parameter" value="multi_abi"/>
+
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user"/>
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true"/>
+        <option name="test-file-name" value="CtsCarBuiltinApiTestCases.apk"/>
+        <option name="test-file-name" value="CtsCarBuiltinSimpleApp.apk"/>
+    </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="setprop log.tag.CAR.TEST VERBOSE" />
+        <!-- Can't find the way to specify the empty string in 'value', so set the highest level -->
+        <option name="teardown-command" value="setprop log.tag.CAR.TEST ASSERT" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest">
+        <option name="package" value="android.car.cts.builtin"/>
+    </test>
+</configuration>
diff --git a/tests/tests/car_builtin/OWNERS b/tests/tests/car_builtin/OWNERS
new file mode 100644
index 0000000..a8e927d
--- /dev/null
+++ b/tests/tests/car_builtin/OWNERS
@@ -0,0 +1,4 @@
+# Bug component: 526266
+keunyoung@google.com
+felipeal@google.com
+gurunagarajan@google.com
diff --git a/tests/tests/car_builtin/apps/SimpleApp/Android.bp b/tests/tests/car_builtin/apps/SimpleApp/Android.bp
new file mode 100644
index 0000000..9e79dc4
--- /dev/null
+++ b/tests/tests/car_builtin/apps/SimpleApp/Android.bp
@@ -0,0 +1,40 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsCarBuiltinSimpleApp",
+    defaults: ["cts_defaults"],
+    sdk_version: "current",
+    srcs: [
+        "src/**/*.java",
+    ],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    static_libs: [
+        "compatibility-device-util-axt",
+        "truth-prebuilt",
+        "ctstestrunner-axt",
+    ],
+    libs: [
+        "android.test.base",
+        "android.car-test-stubs",
+    ],
+}
diff --git a/tests/tests/car_builtin/apps/SimpleApp/AndroidManifest.xml b/tests/tests/car_builtin/apps/SimpleApp/AndroidManifest.xml
new file mode 100644
index 0000000..1a03ca5
--- /dev/null
+++ b/tests/tests/car_builtin/apps/SimpleApp/AndroidManifest.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.car.cts.builtin.apps.simple">
+    <application>
+        <activity android:name="android.car.cts.builtin.apps.simple.SimpleActivity"
+                  android:exported="true">
+        </activity>
+    </application>
+</manifest>
+
diff --git a/tests/tests/car_builtin/apps/SimpleApp/src/android/car/cts/builtin/apps/simple/SimpleActivity.java b/tests/tests/car_builtin/apps/SimpleApp/src/android/car/cts/builtin/apps/simple/SimpleActivity.java
new file mode 100644
index 0000000..1bf376f
--- /dev/null
+++ b/tests/tests/car_builtin/apps/SimpleApp/src/android/car/cts/builtin/apps/simple/SimpleActivity.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.apps.simple;
+
+import android.app.Activity;
+
+/**
+ * A very simple activity for testing PackageManagerHelper.
+ */
+public final class SimpleActivity extends Activity {
+}
diff --git a/tests/tests/car_builtin/res/values/strings.xml b/tests/tests/car_builtin/res/values/strings.xml
new file mode 100644
index 0000000..e761831
--- /dev/null
+++ b/tests/tests/car_builtin/res/values/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_description">CTS Tests for Car Builtin APIs</string>
+    <string name="task_info_test_activity">TaskInfoTestActivity</string>
+</resources>
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/CarBuiltinTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/CarBuiltinTest.java
new file mode 100644
index 0000000..f083327
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/CarBuiltinTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.builtin.CarBuiltin;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class CarBuiltinTest {
+    @Test
+    public void testMinorVersion() {
+        assertThat(CarBuiltin.PLATFORM_VERSION_MINOR_INT).isAtLeast(0);
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/PermissionHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/PermissionHelperTest.java
new file mode 100644
index 0000000..fdc07b7
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/PermissionHelperTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.builtin.PermissionHelper;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class PermissionHelperTest {
+
+    private static final String EXPECTED_MONITOR_INPUT_PERMISSION_STRING =
+            "android.permission.MONITOR_INPUT";
+
+    @Test
+    public void testMonitorInputPermissionString() {
+        assertThat(PermissionHelper.MONITOR_INPUT)
+                .isEqualTo(EXPECTED_MONITOR_INPUT_PERMISSION_STRING);
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/activity/ActivityManagerTestActivityBase.java b/tests/tests/car_builtin/src/android/car/cts/builtin/activity/ActivityManagerTestActivityBase.java
new file mode 100644
index 0000000..38df2b8
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/activity/ActivityManagerTestActivityBase.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.activity;
+
+import android.app.Activity;
+import android.util.Log;
+
+public abstract class ActivityManagerTestActivityBase extends Activity {
+    public static final String TAG = ActivityManagerTestActivityBase.class.getSimpleName();
+
+    private volatile boolean mIsVisible;
+    private volatile boolean mHasFocus;
+
+    public boolean isVisible() {
+        return mIsVisible;
+    }
+
+    public boolean hasFocus() {
+        return mHasFocus;
+    }
+
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        mHasFocus = hasFocus;
+        Log.d(TAG, "hasFocus: " + hasFocus);
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        mIsVisible = true;
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        mIsVisible = false;
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/activity/SimpleActivity.java b/tests/tests/car_builtin/src/android/car/cts/builtin/activity/SimpleActivity.java
new file mode 100644
index 0000000..d111f71
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/activity/SimpleActivity.java
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.activity;
+
+import android.app.Activity;
+
+/**
+ * A very simple activity for testing PackageManagerHelper.
+ */
+public final class SimpleActivity extends Activity {
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/activity/TaskInfoTestActivity.java b/tests/tests/car_builtin/src/android/car/cts/builtin/activity/TaskInfoTestActivity.java
new file mode 100644
index 0000000..71e4780
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/activity/TaskInfoTestActivity.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.activity;
+
+import android.app.Activity;
+import android.os.UserHandle;
+
+public final class TaskInfoTestActivity extends Activity {
+    private volatile boolean mIsVisible = false;
+
+    // expose the hidden API from the ContextWrapper class
+    public int getDisplayId() {
+        return getDisplay().getDisplayId();
+    }
+
+    // expose the hidden API from the ContextWrapper class
+    public int getUserId() {
+        return UserHandle.myUserId();
+    }
+
+    public boolean isVisible() {
+        return mIsVisible;
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        mIsVisible = true;
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        mIsVisible = false;
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/activity/VirtualDisplayIdTestActivity.java b/tests/tests/car_builtin/src/android/car/cts/builtin/activity/VirtualDisplayIdTestActivity.java
new file mode 100644
index 0000000..03542eb
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/activity/VirtualDisplayIdTestActivity.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.activity;
+
+import android.app.Activity;
+import android.car.builtin.content.ContextHelper;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.Display;
+
+public final class VirtualDisplayIdTestActivity extends Activity {
+    public static final String TAG = VirtualDisplayIdTestActivity.class.getSimpleName();
+
+    private static int sDisplayId = Display.INVALID_DISPLAY;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        sDisplayId = ContextHelper.getDisplayId(this);
+        Log.d(TAG, "onCreate: sDisplayId=" + sDisplayId);
+    }
+
+    public static int getDisplayId() {
+        return sDisplayId;
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/app/ActivityManagerHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/app/ActivityManagerHelperTest.java
new file mode 100644
index 0000000..7c23b4d
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/app/ActivityManagerHelperTest.java
@@ -0,0 +1,344 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.app;
+
+import static android.car.builtin.app.ActivityManagerHelper.ProcessObserverCallback;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.view.Display.DEFAULT_DISPLAY;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.ActivityOptions;
+import android.app.Instrumentation;
+import android.app.TaskInfo;
+import android.car.builtin.app.ActivityManagerHelper;
+import android.car.cts.builtin.activity.ActivityManagerTestActivityBase;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Rect;
+import android.os.Process;
+import android.os.UserHandle;
+import android.server.wm.ActivityManagerTestBase;
+import android.util.Log;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+public final class ActivityManagerHelperTest extends ActivityManagerTestBase {
+
+    private static final String TAG = ActivityManagerHelperTest.class.getSimpleName();
+
+    private static final String PERMISSION_SET_ACTIVITY_WATCHER =
+            "android.permission.SET_ACTIVITY_WATCHER";
+    private static final String NOT_REQUESTED_PERMISSION_CAR_MILEAGE =
+            "android.car.permission.CAR_MILEAGE";
+    private static final String NOT_REQUESTED_PERMISSION_READ_CAR_POWER_POLICY =
+            "android.car.permission.READ_CAR_POWER_POLICY";
+
+    private static final String GRANTED_PERMISSION_INTERACT_ACROSS_USERS =
+            "android.permission.INTERACT_ACROSS_USERS";
+    private static final String PERMISSION_REMOVE_TASKS = "android.permission.REMOVE_TASKS";
+    private static final String PERMISSION_GET_TASKS = "android.permission.GET_TASKS";
+    private static final String PERMISSION_MANAGE_ACTIVITY_TASKS =
+            "android.permission.MANAGE_ACTIVITY_TASKS";
+
+    private static final String SIMPLE_APP_PACKAGE_NAME = "android.car.cts.builtin.apps.simple";
+    private static final String SIMPLE_ACTIVITY_NAME = "SimpleActivity";
+    private static final String START_SIMPLE_ACTIVITY_COMMAND = "am start -W -n "
+            + SIMPLE_APP_PACKAGE_NAME + "/." + SIMPLE_ACTIVITY_NAME;
+
+    private static final int OWNING_UID = UserHandle.ALL.getIdentifier();
+    private static final int MAX_NUM_TASKS = 1_000;
+    private static final int TIMEOUT_MS = 20_000;
+
+    // x coordinate of the left boundary line of the animation rectangle
+    private static final int ANIMATION_RECT_LEFT = 0;
+    // y coordinate of the top boundary line of the animation rectangle
+    private static final int ANIMATION_RECT_TOP = 200;
+    // x coordinate of the right boundary line of the animation rectangle
+    private static final int ANIMATION_RECT_RIGHT = 400;
+    // y coordinate of the bottom boundary line of the animation rectangle
+    private static final int ANIMATION_RECT_BOTTOM = 0;
+
+    private static final int RANDOM_NON_DEFAULT_DISPLAY_ID = 1;
+    private static final boolean NON_DEFAULT_LOCK_TASK_MODE = true;
+    private static final boolean
+            NON_DEFAULT_PENDING_INTENT_BACKGROUND_ACTIVITY_LAUNCH_ALLOWED = true;
+
+
+    private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
+    private final Context mContext = mInstrumentation.getContext();
+
+    @Test
+    public void testCheckComponentPermission() throws Exception {
+        // not requested from Manifest
+        assertComponentPermissionNotGranted(NOT_REQUESTED_PERMISSION_CAR_MILEAGE);
+        assertComponentPermissionNotGranted(NOT_REQUESTED_PERMISSION_READ_CAR_POWER_POLICY);
+
+        // requested from Manifest and granted
+        assertComponentPermissionGranted(GRANTED_PERMISSION_INTERACT_ACROSS_USERS);
+    }
+
+    @Test
+    public void testSetFocusedRootTask() throws Exception {
+        // setup
+        ActivityA task1BottomActivity = launchTestActivity(ActivityA.class);
+        ActivityB task1TopActivity = launchTestActivity(ActivityB.class);
+        ActivityC task2TopActivity = launchTestActivity(ActivityC.class);
+
+        logActivityStack("amTestActivitys ",
+                task1BottomActivity, task1TopActivity, task2TopActivity);
+
+        assertWithMessage("bottom activity is the task root")
+                .that(task1BottomActivity.isTaskRoot()).isTrue();
+        assertWithMessage("task id of the top activity in the task1")
+                .that(task1TopActivity.getTaskId()).isEqualTo(task1BottomActivity.getTaskId());
+        assertWithMessage("task id of the top activity in the task2")
+                .that(task2TopActivity.getTaskId()).isNotEqualTo(task1TopActivity.getTaskId());
+        assertWithMessage("task1 top activity is visible")
+                .that(task1TopActivity.isVisible()).isFalse();
+        assertWithMessage("task2 top activity is visible")
+                .that(task2TopActivity.isVisible()).isTrue();
+
+        // execute
+        try {
+            mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
+                    PERMISSION_MANAGE_ACTIVITY_TASKS);
+
+            ActivityManagerHelper.setFocusedRootTask(task1BottomActivity.getTaskId());
+        } finally {
+            mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+        }
+
+
+        // assert
+        ComponentName activityName = task1TopActivity.getComponentName();
+        waitAndAssertTopResumedActivity(activityName, DEFAULT_DISPLAY,
+                "Activity must be resumed");
+        assertWithMessage("task1 top activity has focus")
+                .that(task1TopActivity.hasFocus()).isTrue();
+        assertWithMessage("task1 top activity is visible")
+                .that(task1TopActivity.isVisible()).isTrue();
+
+        // teardown
+        task1TopActivity.finish();
+        task1BottomActivity.finish();
+        task2TopActivity.finish();
+    }
+
+    @Test
+    public void testRemoveTask() throws Exception {
+        // setup
+        ActivityC testActivity = launchTestActivity(ActivityC.class);
+        int taskId = testActivity.getTaskId();
+        assertThat(doesTaskExist(taskId)).isTrue();
+
+        // execute
+        try {
+            mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
+                    PERMISSION_REMOVE_TASKS);
+
+            ActivityManagerHelper.removeTask(taskId);
+        } finally {
+            mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+        }
+
+        // assert
+        PollingCheck.waitFor(TIMEOUT_MS, () -> testActivity.isDestroyed());
+        assertThat(doesTaskExist(taskId)).isFalse();
+    }
+
+    @Test
+    public void testProcessObserverCallback() throws Exception {
+        // setup
+        ProcessObserverCallbackTestImpl callbackImpl = new ProcessObserverCallbackTestImpl();
+        launchSimpleActivity();
+
+        // execute
+        try {
+            mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
+                        PERMISSION_SET_ACTIVITY_WATCHER);
+
+            ActivityManagerHelper.registerProcessObserverCallback(callbackImpl);
+
+            ArrayList<Integer> appTasks = getAppTasks(SIMPLE_APP_PACKAGE_NAME);
+            appTasks.forEach((taskId) -> ActivityManagerHelper.removeTask(taskId));
+
+            // assert
+            assertThat(callbackImpl.isProcessDiedObserved()).isTrue();
+        } finally {
+            // teardown
+            ActivityManagerHelper.unregisterProcessObserverCallback(callbackImpl);
+            mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testCreateActivityOptions() {
+        Rect expectedRect = new Rect(ANIMATION_RECT_LEFT,
+                ANIMATION_RECT_TOP,
+                ANIMATION_RECT_RIGHT,
+                ANIMATION_RECT_BOTTOM);
+        int expectedDisplayId = RANDOM_NON_DEFAULT_DISPLAY_ID;
+        boolean expectedLockTaskMode = NON_DEFAULT_LOCK_TASK_MODE;
+        boolean expectedLaunchAllowed =
+                NON_DEFAULT_PENDING_INTENT_BACKGROUND_ACTIVITY_LAUNCH_ALLOWED;
+
+        ActivityOptions originalOptions =
+                ActivityOptions.makeCustomAnimation(mContext,
+                /* entResId= */ android.R.anim.fade_in,
+                /* exitResId= */ android.R.anim.fade_out);
+        originalOptions.setLaunchBounds(expectedRect);
+        originalOptions.setLaunchDisplayId(expectedDisplayId);
+        originalOptions.setLockTaskEnabled(expectedLockTaskMode);
+        originalOptions.setPendingIntentBackgroundActivityLaunchAllowed(expectedLaunchAllowed);
+
+        ActivityOptions createdOptions =
+                ActivityManagerHelper.createActivityOptions(originalOptions.toBundle());
+
+        assertThat(createdOptions.getLaunchBounds()).isEqualTo(expectedRect);
+        assertThat(createdOptions.getLaunchDisplayId()).isEqualTo(expectedDisplayId);
+        assertThat(createdOptions.getLockTaskMode()).isEqualTo(expectedLockTaskMode);
+        assertThat(createdOptions.isPendingIntentBackgroundActivityLaunchAllowed())
+                .isEqualTo(expectedLaunchAllowed);
+    }
+
+    private void assertComponentPermissionGranted(String permission) throws Exception {
+        assertThat(ActivityManagerHelper.checkComponentPermission(permission,
+                Process.myUid(), /* owningUid= */ OWNING_UID, /* exported= */ true))
+                .isEqualTo(PackageManager.PERMISSION_GRANTED);
+    }
+
+    private void assertComponentPermissionNotGranted(String permission) throws Exception {
+        assertThat(ActivityManagerHelper.checkComponentPermission(permission,
+                Process.myUid(), /* owningUid= */ OWNING_UID, /* exported= */ true))
+                .isEqualTo(PackageManager.PERMISSION_DENIED);
+    }
+
+    private static final class ProcessObserverCallbackTestImpl extends ProcessObserverCallback {
+        private final CountDownLatch mLatch = new CountDownLatch(1);
+
+        private int mObservedPid = -1;
+        private int mObservedUid = -1;
+        private boolean mProcessDiedObserved;
+
+        @Override
+        public void onProcessDied(int pid, int uid) {
+            mProcessDiedObserved = true;
+            Log.d(TAG, "ProcessDied: pid " + pid + " uid " + uid);
+            mLatch.countDown();
+        }
+
+        public boolean isProcessDiedObserved() throws Exception {
+            if (!mLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+                throw new Exception("process died is not observed in " + TIMEOUT_MS + " ms)");
+            }
+            return mProcessDiedObserved;
+        }
+    }
+
+    private void launchSimpleActivity() {
+        SystemUtil.runShellCommand(START_SIMPLE_ACTIVITY_COMMAND);
+    }
+
+    private ArrayList<Integer> getAppTasks(String pkgName) {
+        ActivityManager am = mContext.getSystemService(ActivityManager.class);
+
+        List<ActivityManager.RunningTaskInfo> runningTasks = am.getRunningTasks(MAX_NUM_TASKS);
+        ArrayList<Integer> appTasks = new ArrayList<>();
+        for (ActivityManager.RunningTaskInfo taskInfo : runningTasks) {
+            String taskPackageName = taskInfo.baseActivity.getPackageName();
+            int taskId = taskInfo.taskId;
+            Log.d(TAG, "tasks package name: " + taskPackageName);
+            if (taskPackageName.equals(pkgName)) {
+                Log.d(TAG, "getAppTask(): adding " + SIMPLE_APP_PACKAGE_NAME + " task " + taskId);
+                appTasks.add(taskId);
+            }
+        }
+
+        return appTasks;
+    }
+
+    private <T> T launchTestActivity(Class<T> type) {
+        Intent startIntent = new Intent(mContext, type)
+                .addFlags(FLAG_ACTIVITY_NEW_TASK);
+
+        Activity testActivity = (Activity) mInstrumentation
+                .startActivitySync(startIntent, /* options = */ null);
+
+        ComponentName testActivityName = testActivity.getComponentName();
+        waitAndAssertTopResumedActivity(testActivityName, DEFAULT_DISPLAY,
+                "Activity must be resumed");
+
+        return type.cast(testActivity);
+    }
+
+    // The logging order of the Activities follows the stack order. The first Activity
+    // in the parameter list is logged at last.
+    private static void logActivityStack(String msg, Activity... activityStack) {
+        for (int index = activityStack.length - 1; index >= 0; index--) {
+            String logMsg = String.format("%s\tindex=%d taskId=%d",
+                    msg, index, activityStack[index].getTaskId());
+            Log.d(TAG, logMsg);
+        }
+    }
+
+    private boolean doesTaskExist(int taskId) {
+        boolean retVal = false;
+        try {
+            mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
+                    PERMISSION_REMOVE_TASKS);
+            ActivityManager am = mContext.getSystemService(ActivityManager.class);
+            List<ActivityManager.RunningTaskInfo> taskList = am.getRunningTasks(MAX_NUM_TASKS);
+            for (TaskInfo taskInfo : taskList) {
+                if (taskInfo.taskId == taskId) {
+                    retVal = true;
+                    break;
+                }
+            }
+        } finally {
+            mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+        }
+        return retVal;
+    }
+
+    public static final class ActivityA extends ActivityManagerTestActivityBase {
+    }
+
+    public static final class ActivityB extends ActivityManagerTestActivityBase {
+    }
+
+    public static final class ActivityC extends ActivityManagerTestActivityBase {
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/app/DisplayUtils.java b/tests/tests/car_builtin/src/android/car/cts/builtin/app/DisplayUtils.java
new file mode 100644
index 0000000..b2448c3
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/app/DisplayUtils.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.app;
+
+import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY;
+import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_PUBLIC;
+import static android.view.Display.DEFAULT_DISPLAY;
+
+import android.content.Context;
+import android.graphics.PixelFormat;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.VirtualDisplay;
+import android.media.ImageReader;
+import android.os.Looper;
+import android.util.DisplayMetrics;
+import android.view.Display;
+
+import com.android.compatibility.common.util.TestUtils;
+
+/**
+ * Utilities needed when interacting with the display
+ */
+public class DisplayUtils {
+    private static final int DISPLAY_ADDED_TIMEOUT_MS = 10_000;
+    private static final String CONTEXT_HELPER_CTS_DISPLAY_NAME = "ContextHelperCtsVirtualDisplay";
+
+    public static class VirtualDisplaySession implements AutoCloseable {
+        private VirtualDisplay mVirtualDisplay;
+        private ImageReader mReader;
+
+        /**
+         * Creates a virtual display having same size with default display and waits until it's
+         * in display list. The density of the virtual display is based on
+         * {@link DisplayMetrics#xdpi} so that the threshold of gesture detection is same as
+         * the default display's.
+         *
+         * @param context
+         * @param isPrivate if this display is a private display.
+         * @return virtual display.
+         *
+         * @throws IllegalStateException if called from main thread.
+         */
+        public Display createDisplayWithDefaultDisplayMetricsAndWait(Context context,
+                boolean isPrivate) {
+            if (Looper.myLooper() == Looper.getMainLooper()) {
+                throw new IllegalStateException("Should not call from main thread");
+            }
+
+            if (mReader != null) {
+                throw new IllegalStateException(
+                        "Only one display can be created during this session.");
+            }
+
+            DisplayManager displayManager = context.getSystemService(DisplayManager.class);
+            DisplayMetrics metrics = new DisplayMetrics();
+            displayManager.getDisplay(DEFAULT_DISPLAY).getRealMetrics(metrics);
+
+            mReader = ImageReader.newInstance(metrics.widthPixels, metrics.heightPixels,
+                    PixelFormat.RGBA_8888, 1 /* maxImages */);
+
+            Object waitObject = new Object();
+            DisplayManager.DisplayListener listener = new DisplayManager.DisplayListener() {
+                @Override
+                public void onDisplayAdded(int i) {
+                    synchronized (waitObject) {
+                        waitObject.notifyAll();
+                    }
+                }
+
+                @Override
+                public void onDisplayRemoved(int i) {
+                }
+
+                @Override
+                public void onDisplayChanged(int i) {
+                }
+            };
+
+            displayManager.registerDisplayListener(listener, null);
+
+            int flags = isPrivate ? 0
+                    : (VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY | VIRTUAL_DISPLAY_FLAG_PUBLIC);
+
+            mVirtualDisplay = displayManager.createVirtualDisplay(CONTEXT_HELPER_CTS_DISPLAY_NAME,
+                    metrics.widthPixels, metrics.heightPixels, (int) metrics.xdpi,
+                    mReader.getSurface(), flags);
+
+            try {
+                int theNewDisplayId = mVirtualDisplay.getDisplay().getDisplayId();
+                TestUtils.waitOn(waitObject,
+                        () -> displayManager.getDisplay(theNewDisplayId) != null,
+                        DISPLAY_ADDED_TIMEOUT_MS,
+                        String.format("wait for virtual display %d adding", theNewDisplayId));
+            } finally {
+                displayManager.unregisterDisplayListener(listener);
+            }
+
+            return mVirtualDisplay.getDisplay();
+        }
+
+        @Override
+        public void close() {
+            if (mVirtualDisplay != null) {
+                mVirtualDisplay.release();
+            }
+            if (mReader != null) {
+                mReader.close();
+            }
+        }
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/app/KeyguardManagerHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/app/KeyguardManagerHelperTest.java
new file mode 100644
index 0000000..6cc2071
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/app/KeyguardManagerHelperTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.app;
+
+import static android.server.wm.UiDeviceUtils.pressUnlockButton;
+import static android.view.Display.DEFAULT_DISPLAY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.car.builtin.app.KeyguardManagerHelper;
+import android.server.wm.ActivityManagerTestBase;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class KeyguardManagerHelperTest extends ActivityManagerTestBase {
+
+    private static final String TAG = KeyguardManagerHelperTest.class.getSimpleName();
+
+    @Before
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        assumeTrue(supportsSecureLock());
+    }
+
+    @Test
+    public void testIsKeyguardLocked() throws Exception {
+        try (LockScreenSession lockScreenSession = createManagedLockScreenSession()) {
+            lockScreenSession.setLockCredential().gotoKeyguard();
+            assertThat(KeyguardManagerHelper.isKeyguardLocked()).isTrue();
+
+            unlockDevice();
+            lockScreenSession.enterAndConfirmLockCredential();
+            mWmState.waitAndAssertKeyguardGone();
+            assertThat(KeyguardManagerHelper.isKeyguardLocked()).isFalse();
+        }
+    }
+
+    private void unlockDevice() {
+        touchAndCancelOnDisplayCenterSync(DEFAULT_DISPLAY);
+        pressUnlockButton();
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/app/TaskInfoHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/app/TaskInfoHelperTest.java
new file mode 100644
index 0000000..8d31b9d
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/app/TaskInfoHelperTest.java
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.app;
+
+import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+import static android.view.Display.DEFAULT_DISPLAY;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.ActivityManager;
+import android.app.ActivityManager.AppTask;
+import android.app.Instrumentation;
+import android.app.TaskInfo;
+import android.car.builtin.app.TaskInfoHelper;
+import android.car.cts.builtin.activity.TaskInfoTestActivity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.server.wm.ActivityManagerTestBase;
+import android.util.Log;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@RunWith(AndroidJUnit4.class)
+public final class TaskInfoHelperTest extends ActivityManagerTestBase {
+
+    private static final String TAG = TaskInfoHelperTest.class.getSimpleName();
+    private static final String NULL_STRING = "null";
+    private static final String TO_STRING_PREFIX = "TaskInfo{";
+    private static final Pattern TASK_ID_FIELD_PATTERN =
+            Pattern.compile("taskId=[0-9]+");
+
+    private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
+    private final Context mTargetContext = mInstrumentation.getTargetContext();
+
+    private TaskInfoTestActivity mTestActivity = null;
+    private ActivityManager mAm = null;
+
+    @Before
+    public void setup() throws Exception {
+        mAm = mTargetContext.getSystemService(ActivityManager.class);
+        mTestActivity = launchTestActivity();
+    }
+
+    @After
+    public void teardown() throws Exception {
+        if (mTestActivity != null) {
+            mTestActivity.finish();
+        }
+    }
+
+    @Test
+    public void testDisplayIdAndUserId() throws Exception {
+        // setup
+        int taskId = mTestActivity.getTaskId();
+        TaskInfo taskInfo = getTaskInfo(taskId);
+
+        // execution and assert
+        assertThat(taskInfo).isNotNull();
+        assertThat(TaskInfoHelper.getDisplayId(taskInfo)).isEqualTo(mTestActivity.getDisplayId());
+        assertThat(TaskInfoHelper.getUserId(taskInfo)).isEqualTo(mTestActivity.getUserId());
+    }
+
+    @Test
+    public void testTaskVisibility() throws Exception {
+        // setup
+        int taskId = mTestActivity.getTaskId();
+        TaskInfo taskInfo = getTaskInfo(taskId);
+
+        // execution and assert
+        assertThat(TaskInfoHelper.isVisible(taskInfo)).isEqualTo(mTestActivity.isVisible());
+
+        // start a new TestActivity in a different task so that the previous task is
+        // in background and invisible
+        TaskInfoTestActivity secondActivity = launchTestActivity();
+        assertThat(taskId).isNotEqualTo(secondActivity.getTaskId());
+        taskInfo = getTaskInfo(taskId);
+        assertThat(TaskInfoHelper.isVisible(taskInfo)).isFalse();
+        secondActivity.finish();
+    }
+
+    @Test
+    public void testToString() throws Exception {
+        // setup
+        TaskInfo taskInfo = getTaskInfo(mTestActivity.getTaskId());
+        String taskInfoString = taskInfo.toString();
+        Log.d(TAG, taskInfoString);
+
+        // execution and assert
+        assertThat(TaskInfoHelper.toString(null)).isEqualTo(NULL_STRING);
+
+        String helperString = TaskInfoHelper.toString(taskInfo);
+        assertThat(helperString).startsWith(TO_STRING_PREFIX);
+
+        Matcher fieldMatcher = TASK_ID_FIELD_PATTERN.matcher(helperString);
+        assertThat(fieldMatcher.find()).isTrue();
+        assertThat(taskInfoString).contains(fieldMatcher.group());
+    }
+
+    private TaskInfo getTaskInfo(int taskId) {
+        List<AppTask> appTasks = mAm.getAppTasks();
+        for (AppTask task : appTasks) {
+            TaskInfo taskInfo = task.getTaskInfo();
+            if (taskInfo.taskId == taskId) {
+                return taskInfo;
+            }
+        }
+        return null;
+    }
+
+    private TaskInfoTestActivity launchTestActivity() {
+        Intent startIntent = new Intent(mTargetContext, TaskInfoTestActivity.class)
+                .addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_MULTIPLE_TASK);
+
+        TaskInfoTestActivity testActivity = (TaskInfoTestActivity) mInstrumentation
+                .startActivitySync(startIntent, /* options= */null);
+
+        ComponentName testActivityName = testActivity.getComponentName();
+        waitAndAssertTopResumedActivity(testActivityName, DEFAULT_DISPLAY,
+                "Activity must be resumed");
+
+        return testActivity;
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/app/VoiceInteractionHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/app/VoiceInteractionHelperTest.java
new file mode 100644
index 0000000..c9ef41f
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/app/VoiceInteractionHelperTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.app;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.UiAutomation;
+import android.car.builtin.app.VoiceInteractionHelper;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.ShellUtils;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@RunWith(AndroidJUnit4.class)
+public final class VoiceInteractionHelperTest {
+
+    private static final String PERMISSION_ACCESS_VOICE_INTERACTION_SERVICE =
+            "android.permission.ACCESS_VOICE_INTERACTION_SERVICE";
+
+    @Test
+    public void testSetEnabled() throws Exception {
+        UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        uiAutomation.adoptShellPermissionIdentity(PERMISSION_ACCESS_VOICE_INTERACTION_SERVICE);
+
+        try {
+            VoiceInteractionHelper.setEnabled(/* enabled= */ true);
+            assertWithMessage("VoiceInteraction enabled")
+                    .that(isVoiceInteractionDisabledFromDump()).isFalse();
+
+            VoiceInteractionHelper.setEnabled(/* enabled= */ false);
+            assertWithMessage("VoiceInteraction enabled")
+                    .that(isVoiceInteractionDisabledFromDump()).isTrue();
+
+            VoiceInteractionHelper.setEnabled(/* enabled= */ true);
+            assertWithMessage("VoiceInteraction enabled")
+                    .that(isVoiceInteractionDisabledFromDump()).isFalse();
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    // TODO(b/218551697): add a TestApi to VoiceInteractionService which returns
+    // mTemporarilyDisabled of VoiceInteractionManagerService.
+    private boolean isVoiceInteractionDisabledFromDump() {
+        String dump = ShellUtils.runShellCommand("dumpsys voiceinteraction");
+        Matcher matchDisabled = Pattern.compile("mTemporarilyDisabled: *(true|false)")
+                .matcher(dump);
+        assertWithMessage("inclusion of mTemporarilyDisabled in dump").that(matchDisabled.find())
+                .isTrue();
+        return matchDisabled.group(1).equals("true");
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/content/ContextHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/content/ContextHelperTest.java
new file mode 100644
index 0000000..927f9a6
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/content/ContextHelperTest.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.content;
+
+import static android.car.cts.builtin.app.DisplayUtils.VirtualDisplaySession;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assume.assumeTrue;
+
+import android.car.builtin.content.ContextHelper;
+import android.car.cts.builtin.activity.VirtualDisplayIdTestActivity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.server.wm.ActivityManagerTestBase;
+import android.view.Display;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class ContextHelperTest extends ActivityManagerTestBase {
+    private static final int ACTIVITY_FOCUS_TIMEOUT_MS = 10_000;
+
+    private final Context mContext = InstrumentationRegistry.getInstrumentation().getContext();
+
+    @Test
+    public void testDefaultDisplayId() throws Exception {
+        // execution and assertion
+        assertThat(ContextHelper.getDisplayId(mContext)).isEqualTo(Display.DEFAULT_DISPLAY);
+    }
+
+    @Test
+    public void testVirtualDisplayId() throws Exception {
+        // check the assumption
+        String requiredFeature = PackageManager.FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS;
+        assumeTrue(mContext.getPackageManager().hasSystemFeature(requiredFeature));
+
+        try (VirtualDisplaySession session = new VirtualDisplaySession()) {
+            // setup: create a virtual display
+            int createdVirtualDisplayId = session
+                    .createDisplayWithDefaultDisplayMetricsAndWait(mContext, true).getDisplayId();
+
+            assertNotEquals(createdVirtualDisplayId, Display.DEFAULT_DISPLAY);
+            assertNotEquals(createdVirtualDisplayId, Display.INVALID_DISPLAY);
+
+            // execution: launch VirtualDisplayIdActivity in the virtual display
+            launchVirtualDisplayIdTestActivity(createdVirtualDisplayId, mContext.getPackageName(),
+                    VirtualDisplayIdTestActivity.class.getName());
+
+            // assertion
+            assertEquals(createdVirtualDisplayId, VirtualDisplayIdTestActivity.getDisplayId());
+        }
+    }
+
+    private void launchVirtualDisplayIdTestActivity(int displayId,
+            String pkgName, String activityClassName) {
+        ComponentName testActivity = new ComponentName(pkgName, activityClassName);
+        launchActivityOnDisplay(testActivity, displayId);
+        waitForActivityFocused(ACTIVITY_FOCUS_TIMEOUT_MS, testActivity);
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/content/pm/PackageManagerHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/content/pm/PackageManagerHelperTest.java
new file mode 100644
index 0000000..9b30f5b
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/content/pm/PackageManagerHelperTest.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.content.pm;
+
+import static android.car.builtin.content.pm.PackageManagerHelper.PROPERTY_CAR_SERVICE_PACKAGE_NAME;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.car.builtin.content.pm.PackageManagerHelper;
+import android.car.cts.builtin.R;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ServiceInfo;
+import android.os.Process;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.util.ArraySet;
+import android.util.Log;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import java.util.function.ToIntFunction;
+
+@RunWith(AndroidJUnit4.class)
+public final class PackageManagerHelperTest {
+
+    private static final String TAG = PackageManagerHelperTest.class.getSimpleName();
+    private static final String ANDROID_CAR_PKG = "com.android.car";
+    private static final String ANDROID_CAR_SHELL_PKG = "com.android.shell";
+    private static final String ANDROID_CAR_SHELL_PKG_SHARED = "shared:android.uid.shell";
+    private static final String CAR_BUILTIN_CTS_PKG = "android.car.cts.builtin";
+    private static final String[] CAR_BUILTIN_CTS_SERVICE_NAMES = {
+        "android.car.cts.builtin.os.SharedMemoryTestService",
+        "android.car.cts.builtin.os.ServiceManagerTestService"
+    };
+
+    private final Context mContext = InstrumentationRegistry.getInstrumentation().getContext();
+    private final PackageManager mPackageManager = mContext.getPackageManager();
+
+    @Test
+    public void testGetPackageInfoAsUser() throws Exception {
+        String expectedActivityName = "android.car.cts.builtin.activity.SimpleActivity";
+        int flags = PackageManager.GET_ACTIVITIES | PackageManager.GET_INSTRUMENTATION
+                | PackageManager.GET_SERVICES;
+        int curUser = UserHandle.myUserId();
+
+        PackageInfo pkgInfoUser = PackageManagerHelper.getPackageInfoAsUser(mPackageManager,
+                CAR_BUILTIN_CTS_PKG, flags, curUser);
+        ApplicationInfo appInfo = pkgInfoUser.applicationInfo;
+        ActivityInfo[] activities = pkgInfoUser.activities;
+        ServiceInfo[] services = pkgInfoUser.services;
+
+        assertThat(appInfo).isNotNull();
+        assertThat(appInfo.descriptionRes).isEqualTo(R.string.app_description);
+        assertThat(activities).isNotNull();
+        assertThat(hasActivity(expectedActivityName, activities)).isTrue();
+        assertThat(services).isNotNull();
+    }
+
+    @Test
+    public void testAppTypeChecking() throws Exception {
+        ApplicationInfo systemApp = mPackageManager
+                .getApplicationInfo(ANDROID_CAR_PKG, /* flags= */ 0);
+        ApplicationInfo ctsApp = mPackageManager
+                .getApplicationInfo(CAR_BUILTIN_CTS_PKG, /* flags= */ 0);
+
+        assertThat(PackageManagerHelper.isSystemApp(systemApp)).isTrue();
+        assertThat(PackageManagerHelper.isUpdatedSystemApp(systemApp)).isFalse();
+        assertThat(PackageManagerHelper.isSystemExtApp(systemApp)).isFalse();
+        assertThat(PackageManagerHelper.isOemApp(systemApp)).isFalse();
+        assertThat(PackageManagerHelper.isOdmApp(systemApp)).isFalse();
+        assertThat(PackageManagerHelper.isVendorApp(systemApp)).isFalse();
+        assertThat(PackageManagerHelper.isProductApp(systemApp)).isFalse();
+
+        assertThat(PackageManagerHelper.isSystemApp(ctsApp)).isFalse();
+        assertThat(PackageManagerHelper.isUpdatedSystemApp(ctsApp)).isFalse();
+        assertThat(PackageManagerHelper.isSystemExtApp(ctsApp)).isFalse();
+        assertThat(PackageManagerHelper.isOemApp(ctsApp)).isFalse();
+        assertThat(PackageManagerHelper.isOdmApp(ctsApp)).isFalse();
+        assertThat(PackageManagerHelper.isVendorApp(ctsApp)).isFalse();
+        assertThat(PackageManagerHelper.isProductApp(ctsApp)).isFalse();
+    }
+
+    @Test
+    public void testGetSystemUiPackageName() throws Exception {
+        String systemuiPackageName = PackageManagerHelper.getSystemUiPackageName(mContext);
+        // The default SystemUI package name is com.android.systemui. But OEMs can override
+        // it via com.android.internal.R.string.config_systemUIServiceComponent.So, it can
+        // not assert with respect to a specific (constant) value.
+        Log.d(TAG, "System UI package name=" + systemuiPackageName);
+        assertThat(systemuiPackageName).isNotNull();
+    }
+
+    @Test
+    public void testGetNamesForUids() throws Exception {
+        String[] initPackageNames = {ANDROID_CAR_SHELL_PKG, CAR_BUILTIN_CTS_PKG};
+        // The CarShell has package name as com.android.shell but it also has sharedUserId as
+        // android.uid.shell. Therefore, the return from Android framework should be
+        // shared:com.android.shell instead of com.android.shell
+        String[][] expectedPackageNames = {
+            {ANDROID_CAR_SHELL_PKG_SHARED, CAR_BUILTIN_CTS_PKG},
+            {ANDROID_CAR_SHELL_PKG_SHARED},
+            {CAR_BUILTIN_CTS_PKG}
+        };
+
+        int[] packageUids = convertPackageNamesToUids(initPackageNames);
+        int[][] packageUidsList = {
+            packageUids,
+            {packageUids[0]},
+            {packageUids[1]}
+        };
+
+        for (int index = 0; index < expectedPackageNames.length; index++) {
+            String[] packageNames = PackageManagerHelper
+                    .getNamesForUids(mPackageManager, packageUidsList[index]);
+            assertThat(packageNames).isEqualTo(expectedPackageNames[index]);
+        }
+    }
+
+    @Test
+    public void testGetPackageUidAsUser() throws Exception {
+        int userId = UserHandle.SYSTEM.getIdentifier();
+        int expectedUid = UserHandle.SYSTEM.getUid(Process.SYSTEM_UID);
+
+        // com.android.car package has the shared SYSTEM_UID
+        int actualUid = PackageManagerHelper
+                .getPackageUidAsUser(mPackageManager, ANDROID_CAR_PKG, userId);
+
+        assertThat(actualUid).isEqualTo(expectedUid);
+    }
+
+    @Test
+    public void testGetComponentName() throws Exception {
+        int flags = PackageManager.GET_ACTIVITIES | PackageManager.GET_INSTRUMENTATION
+                | PackageManager.GET_SERVICES;
+        int curUser = UserHandle.myUserId();
+        PackageInfo pkgInfoUser = PackageManagerHelper.getPackageInfoAsUser(mPackageManager,
+                CAR_BUILTIN_CTS_PKG, flags, curUser);
+        ServiceInfo[] serviceInfos = pkgInfoUser.services;
+
+        assertThat(serviceInfos).isNotNull();
+        ArraySet<String> serviceClassSet = new ArraySet<>();
+        for (ServiceInfo info : serviceInfos) {
+            ComponentName componentName = PackageManagerHelper.getComponentName(info);
+            Log.d(TAG, "class name: " + componentName.flattenToString());
+            assertThat(componentName).isNotNull();
+            assertThat(componentName.getPackageName()).isEqualTo(CAR_BUILTIN_CTS_PKG);
+            serviceClassSet.add(componentName.getClassName());
+        }
+
+        assertThat(serviceClassSet.containsAll(Arrays.asList(CAR_BUILTIN_CTS_SERVICE_NAMES)))
+                .isTrue();
+    }
+
+    @Test
+    public void testCarServicePackageName() throws Exception {
+        // The property must exist.
+        String packageName = SystemProperties.get(
+                PROPERTY_CAR_SERVICE_PACKAGE_NAME, /* def= */null);
+
+        assertWithMessage("Property %s not defined", PROPERTY_CAR_SERVICE_PACKAGE_NAME).that(
+                packageName).isNotNull();
+
+        // The package must exist.
+        PackageInfo info = mPackageManager.getPackageInfo(packageName, /* flags= */ 0);
+
+        assertWithMessage("Package %s not found", packageName).that(info).isNotNull();
+    }
+
+    private boolean hasActivity(String activityName, ActivityInfo[] activities) {
+        return Arrays.stream(activities).anyMatch(a -> activityName.equals(a.name));
+    }
+
+    private int[] convertPackageNamesToUids(String[] packageNames) {
+        ToIntFunction<String> packageNameToUid = (pkgName) -> {
+            int uid = Process.INVALID_UID;
+            try {
+                uid = mPackageManager.getPackageUid(pkgName, /* flags= */0);
+            } catch (PackageManager.NameNotFoundException e) {
+                Log.wtf(TAG, pkgName + " does not exist", e);
+            }
+            return uid;
+        };
+        return Arrays.stream(packageNames).mapToInt(packageNameToUid).toArray();
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/os/BuildHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/os/BuildHelperTest.java
new file mode 100644
index 0000000..218486b
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/os/BuildHelperTest.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.os;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.car.builtin.os.BuildHelper;
+import android.os.Build;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class BuildHelperTest {
+
+    private static final String TAG = BuildHelperTest.class.getSimpleName();
+    private static final String BUILD_TYPE_USER = "user";
+    private static final String BUILD_TYPE_ENG = "eng";
+    private static final String BUILD_TYPE_USER_DEBUG = "userdebug";
+
+    @Test
+    public void testBuildTypeCheck() throws Exception {
+        switch (Build.TYPE) {
+            case BUILD_TYPE_USER:
+                assertTrue(BuildHelper.isUserBuild());
+                assertFalse(BuildHelper.isUserDebugBuild());
+                assertFalse(BuildHelper.isEngBuild());
+                break;
+            case BUILD_TYPE_USER_DEBUG:
+                assertFalse(BuildHelper.isUserBuild());
+                assertTrue(BuildHelper.isUserDebugBuild());
+                assertFalse(BuildHelper.isEngBuild());
+                assertTrue(BuildHelper.isDebuggableBuild());
+                break;
+            case BUILD_TYPE_ENG:
+                assertFalse(BuildHelper.isUserBuild());
+                assertFalse(BuildHelper.isUserDebugBuild());
+                assertTrue(BuildHelper.isEngBuild());
+                assertTrue(BuildHelper.isDebuggableBuild());
+                break;
+            default:
+                throw new IllegalArgumentException("Unknown Build Type: " + Build.TYPE);
+        }
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/os/IServiceManagerTestService.aidl b/tests/tests/car_builtin/src/android/car/cts/builtin/os/IServiceManagerTestService.aidl
new file mode 100644
index 0000000..52aa34d
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/os/IServiceManagerTestService.aidl
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.os;
+
+interface IServiceManagerTestService {
+    int echo(in int val);
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/os/ISharedMemoryTestService.aidl b/tests/tests/car_builtin/src/android/car/cts/builtin/os/ISharedMemoryTestService.aidl
new file mode 100644
index 0000000..b36aecde
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/os/ISharedMemoryTestService.aidl
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.os;
+
+import android.os.ParcelFileDescriptor;
+
+interface ISharedMemoryTestService {
+    int readBufData(in ParcelFileDescriptor pfd);
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/os/ParcelHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/os/ParcelHelperTest.java
new file mode 100644
index 0000000..b46e26d
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/os/ParcelHelperTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.os;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.builtin.os.ParcelHelper;
+import android.os.Parcel;
+import android.test.suitebuilder.annotation.SmallTest;
+import android.util.ArraySet;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import java.util.Arrays;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public final class ParcelHelperTest {
+
+    private static final String TAG = ParcelHelperTest.class.getSimpleName();
+    private final String[] mInitData = {"Hello, ", "Android", "Auto", "!"};
+
+    @Test
+    public void testBlobAccess() {
+        String blobContent = "Hello, Android Auto!";
+        Parcel p = Parcel.obtain();
+
+        // setup
+        byte[] inBlob = blobContent.getBytes();
+        ParcelHelper.writeBlob(p, inBlob);
+        p.setDataPosition(0);
+
+        // execution
+        byte[] outBlob = ParcelHelper.readBlob(p);
+
+        // assertion
+        assertThat(outBlob).isEqualTo(inBlob);
+    }
+
+    @Test
+    public void testArraySetAccess() {
+        ArraySet<Object> inputSet = new ArraySet<>(mInitData);
+        ArraySet<?> outputSet = null;
+        Parcel p = Parcel.obtain();
+
+        // setup
+        ArraySet emptySet = ParcelHelper.readArraySet(p, /* loader = */ null);
+        assertThat(emptySet.size()).isEqualTo(0);
+        ParcelHelper.writeArraySet(p, inputSet);
+        p.setDataPosition(0);
+
+        // execution
+        outputSet = ParcelHelper.readArraySet(p, String.class.getClassLoader());
+
+        // assertion
+        assertThat(outputSet).containsExactlyElementsIn(inputSet);
+    }
+
+    @Test
+    public void testStringArrayAccess() {
+        String[] inputArray = mInitData;
+        Parcel p = Parcel.obtain();
+
+        // setup
+        p.writeStringArray(inputArray);
+        p.setDataPosition(0);
+
+        // execution
+        String[] outputArray = ParcelHelper.readStringArray(p);
+
+        // assertion
+        assertThat(outputArray).isEqualTo(inputArray);
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/os/ServiceManagerHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/os/ServiceManagerHelperTest.java
new file mode 100644
index 0000000..91e1d7f
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/os/ServiceManagerHelperTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.os;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import android.app.Instrumentation;
+import android.car.Car;
+import android.car.builtin.os.ServiceManagerHelper;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import java.util.Random;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class ServiceManagerHelperTest {
+
+    private static final String SERVICE_PACKAGE_NAME = "android.car.cts.builtin";
+    private static final String CAR_SERVICE_NAME = "car_service";
+    private static final String SERVICE_LIST_COMMAND = "cmd -l";
+    private static final String SERVICE_LIST_SPLITTER_REGEX = "\\p{Blank}*\n\\p{Blank}*";
+
+    private static final String[] SYSTEM_SERVICES = {
+        Context.ACTIVITY_SERVICE,
+        Context.ALARM_SERVICE,
+        Context.AUDIO_SERVICE,
+        Context.DISPLAY_SERVICE,
+        Context.INPUT_SERVICE,
+        Context.JOB_SCHEDULER_SERVICE,
+        Context.LOCATION_SERVICE,
+        Context.POWER_SERVICE,
+        Context.WINDOW_SERVICE
+    };
+    private static final int TIMEOUT = 20_000;
+
+    private Instrumentation mInstrumentation;
+    private PeerConnection mRemoteConnection;
+    private IServiceManagerTestService mRemoteService;
+
+    public static class PeerConnection implements ServiceConnection {
+        private final CountDownLatch mServiceReadyLatch = new CountDownLatch(1);
+
+        private IServiceManagerTestService mService;
+
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mService = IServiceManagerTestService.Stub.asInterface(service);
+            mServiceReadyLatch.countDown();
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+        }
+
+        public void waitForServiceReady() throws Exception {
+            mServiceReadyLatch.await(TIMEOUT, TimeUnit.MILLISECONDS);
+        }
+
+        public IServiceManagerTestService getService() {
+            return mService;
+        }
+    }
+
+    @Test
+    public void testInitServiceCache() throws Exception {
+        // The service manager keeps a cache of system services during
+        // initialization
+        for (String serviceName : SYSTEM_SERVICES) {
+            assertNotNull(ServiceManagerHelper.checkService(serviceName));
+            assertNotNull(ServiceManagerHelper.getService(serviceName));
+        }
+    }
+
+    @Test
+    public void testServiceCacheWithCreatedService() throws Exception {
+        // setup a new service
+        String testServiceName = ServiceManagerTestService.class.getName();
+        Random randomGenerator = new Random();
+        int maxCount = 10;
+
+        setUpService();
+
+        // assert the new service works
+        for (int i = 0; i < maxCount; i++) {
+            int val = randomGenerator.nextInt();
+            assertEquals(val, mRemoteService.echo(val));
+        }
+
+        // assert the newly created service is not in the ServiceManager cache
+        assertNull(ServiceManagerHelper.checkService(testServiceName));
+        assertNull(ServiceManagerHelper.getService(testServiceName));
+    }
+
+    // In the ICar binder service and CarService initialization, both waitForDeclaredService
+    // and addService APIs are called. So the existence of CarService valids the correct
+    // behavior of the APIs and code coverage
+    @Test
+    public void testCarServiceExistence() throws Exception {
+        Car theCar = Car.createCar(getContext());
+        assertThat(theCar).isNotNull();
+
+        String[] serviceList = SystemUtil
+                .runShellCommand(SERVICE_LIST_COMMAND).trim().split(SERVICE_LIST_SPLITTER_REGEX);
+        Predicate<String> checkCarServiceName = (serviceName) -> {
+            return CAR_SERVICE_NAME.equals(serviceName);
+        };
+        assertThat(Arrays.stream(serviceList).anyMatch(checkCarServiceName)).isTrue();
+    }
+
+    private void setUpService() throws Exception {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        Context context = mInstrumentation.getContext();
+        // Bring up both remote processes and wire them to each other
+        Intent remoteIntent = new Intent();
+        remoteIntent.setComponent(new ComponentName(SERVICE_PACKAGE_NAME,
+                ServiceManagerTestService.class.getName()));
+        mRemoteConnection = new PeerConnection();
+        getContext().bindService(remoteIntent, mRemoteConnection,
+                Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT);
+
+        mRemoteConnection.waitForServiceReady();
+        mRemoteService = mRemoteConnection.getService();
+        assertNotNull(mRemoteService);
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/os/ServiceManagerTestService.java b/tests/tests/car_builtin/src/android/car/cts/builtin/os/ServiceManagerTestService.java
new file mode 100644
index 0000000..8a8d15a
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/os/ServiceManagerTestService.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.os;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.os.RemoteException;
+
+public final class ServiceManagerTestService extends Service {
+    @Override
+    public IBinder onBind(Intent intent) {
+        return new ServiceImpl();
+    }
+
+    private static class ServiceImpl extends IServiceManagerTestService.Stub {
+        @Override
+        public int echo(int val) throws RemoteException {
+            return val;
+        }
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/os/SharedMemoryFileDescriptorTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/os/SharedMemoryFileDescriptorTest.java
new file mode 100644
index 0000000..7f1c517
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/os/SharedMemoryFileDescriptorTest.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.os;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import android.app.Instrumentation;
+import android.car.builtin.os.SharedMemoryHelper;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
+import android.os.SharedMemory;
+import android.system.ErrnoException;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.MediumTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class SharedMemoryFileDescriptorTest {
+
+    private static final int TIMEOUT = 20_000;
+    private Instrumentation mInstrumentation;
+    private Intent mRemoteIntent;
+    private PeerConnection mRemoteConnection;
+    private ISharedMemoryTestService mRemote;
+
+    public static class PeerConnection implements ServiceConnection {
+        private final CountDownLatch mServiceReadyLatch = new CountDownLatch(1);
+
+        private ISharedMemoryTestService mTestService = null;
+
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mTestService = ISharedMemoryTestService.Stub.asInterface(service);
+            mServiceReadyLatch.countDown();
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+        }
+
+        public ISharedMemoryTestService get() throws Exception {
+            mServiceReadyLatch.await(TIMEOUT, TimeUnit.MILLISECONDS);
+            return mTestService;
+        }
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        Context context = mInstrumentation.getContext();
+        // Bring up both remote processes and wire them to each other
+        mRemoteIntent = new Intent();
+        mRemoteIntent.setComponent(new ComponentName(
+                "android.car.cts.builtin", "android.car.cts.builtin.os.SharedMemoryTestService"));
+        mRemoteConnection = new PeerConnection();
+        getContext().bindService(mRemoteIntent, mRemoteConnection,
+                Context.BIND_AUTO_CREATE | Context.BIND_IMPORTANT);
+
+        mRemote = mRemoteConnection.get();
+        assertNotNull(mRemote);
+    }
+
+    @After
+    public void tearDown() {
+        Context context = mInstrumentation.getContext();
+        context.unbindService(mRemoteConnection);
+    }
+
+    @Test
+    public void testReadBufData() throws RemoteException, ErrnoException, IOException {
+        // setup
+        int memSize = 32 * 1024;
+
+        SharedMemory sharedMem = SharedMemory.create(/* name */ null, memSize);
+        ByteBuffer buffer = null;
+        try {
+            buffer = sharedMem.mapReadWrite();
+            int checksum = 0;
+            for (int i = 0; i < memSize; i++) {
+                buffer.put((byte) i);
+                checksum += (byte) i;
+            }
+
+            // execution
+            ParcelFileDescriptor pfd = SharedMemoryHelper.createParcelFileDescriptor(sharedMem);
+            int returnedChecksum = mRemote.readBufData(pfd);
+
+            // assertion
+            assertEquals(checksum, returnedChecksum);
+        } finally {
+            // teardown
+            SharedMemory.unmap(buffer);
+        }
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/os/SharedMemoryHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/os/SharedMemoryHelperTest.java
new file mode 100644
index 0000000..a231bbe
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/os/SharedMemoryHelperTest.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.os;
+
+import static org.junit.Assert.assertEquals;
+
+import android.car.builtin.os.SharedMemoryHelper;
+import android.os.Parcel;
+import android.os.ParcelFileDescriptor;
+import android.os.ParcelFileDescriptor.AutoCloseInputStream;
+import android.os.SharedMemory;
+import android.system.OsConstants;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.nio.ByteBuffer;
+
+@RunWith(AndroidJUnit4.class)
+public final class SharedMemoryHelperTest {
+    private static final String TAG = SharedMemoryHelperTest.class.getSimpleName();
+
+    @Test
+    public void testCreateParcelFileDescriptor() throws Exception {
+        // setup
+        int memSize = 32 * 1024;
+        int bufSize = memSize / 4;
+        SharedMemory sm = SharedMemory.create(/* name */ null, memSize);
+        ByteBuffer bb = sm.map(OsConstants.PROT_READ | OsConstants.PROT_WRITE, 0, bufSize);
+        populateBufferSequentially(bb, bufSize);
+
+        // execution
+        ParcelFileDescriptor pfd = SharedMemoryHelper.createParcelFileDescriptor(sm);
+
+        // assertion
+        try (AutoCloseInputStream in = new AutoCloseInputStream(pfd)) {
+            bb.rewind();
+            for (int i = 0; i < bufSize; i++) {
+                assertEquals(bb.get(), (byte) in.read());
+            }
+        }
+
+        // teardown
+        SharedMemory.unmap(bb);
+    }
+
+    @Test
+    public void testSharedMemoryCreation() throws Exception {
+        // setup
+        int memSize = 32 * 1024;
+        int bufSize = memSize / 4;
+        SharedMemory sm1 = SharedMemory.create(/* name */ null, memSize);
+        ByteBuffer bb1 = sm1.map(OsConstants.PROT_READ | OsConstants.PROT_WRITE, 0, bufSize);
+        populateBufferSequentially(bb1, bufSize);
+
+        // execution
+        ParcelFileDescriptor pfd = SharedMemoryHelper.createParcelFileDescriptor(sm1);
+        Parcel p = Parcel.obtain();
+        p.writeFileDescriptor(pfd.getFileDescriptor());
+        p.setDataPosition(0);
+        SharedMemory sm2 = SharedMemory.CREATOR.createFromParcel(p);
+        ByteBuffer bb2 = sm2.map(OsConstants.PROT_READ | OsConstants.PROT_WRITE, 0, bufSize);
+
+        // assertion
+        bb1.rewind();
+        assertEquals(bb1, bb2);
+
+        // teardown
+        SharedMemory.unmap(bb1);
+        SharedMemory.unmap(bb2);
+    }
+
+    private void populateBufferSequentially(ByteBuffer buf, int length) {
+        for (int i = 0; i < length; i++) {
+            buf.put((byte) i);
+        }
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/os/SharedMemoryTestService.java b/tests/tests/car_builtin/src/android/car/cts/builtin/os/SharedMemoryTestService.java
new file mode 100644
index 0000000..7f95ec8
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/os/SharedMemoryTestService.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.os;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.os.ParcelFileDescriptor;
+import android.os.RemoteException;
+import android.os.SharedMemory;
+import android.system.ErrnoException;
+
+import java.nio.ByteBuffer;
+
+public class SharedMemoryTestService extends Service {
+    @Override
+    public IBinder onBind(Intent intent) {
+        return new ServiceImpl();
+    }
+
+    private static class ServiceImpl extends ISharedMemoryTestService.Stub {
+        @Override
+        public int readBufData(ParcelFileDescriptor pfd) throws RemoteException {
+            int checksum = 0;
+            SharedMemory sharedMemory = null;
+            ByteBuffer mappedBuffer = null;
+
+            try {
+                sharedMemory = SharedMemory.fromFileDescriptor(pfd);
+                mappedBuffer = sharedMemory.mapReadOnly();
+                for (int i = 0; i < sharedMemory.getSize(); i++) {
+                    checksum += mappedBuffer.get();
+                }
+            } catch (ErrnoException ex) {
+                throw new RuntimeException(ex);
+            } finally {
+                SharedMemory.unmap(mappedBuffer);
+            }
+
+            return checksum;
+        }
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/os/SystemPropertiesHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/os/SystemPropertiesHelperTest.java
new file mode 100644
index 0000000..9b915f3
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/os/SystemPropertiesHelperTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.os;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.builtin.os.SystemPropertiesHelper;
+import android.os.SystemProperties;
+import android.util.Log;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class SystemPropertiesHelperTest {
+    private static final String TAG = SystemPropertiesHelperTest.class.getSimpleName();
+
+    // a temporary SystemProperty for CTS. it will be cleared after device reboot.
+    private static final String CTS_TEST_PROPERTY_KEY = "cts.car.builtin_property_helper.String";
+    private static final String CTS_TEST_PROPERTY_VAL = "SystemPropertiesHelperTest";
+
+    @Test
+    public void testSet() {
+        SystemPropertiesHelper.set(CTS_TEST_PROPERTY_KEY, CTS_TEST_PROPERTY_VAL);
+        String val = SystemProperties.get(CTS_TEST_PROPERTY_KEY);
+        Log.d(TAG, val);
+        assertThat(val).isEqualTo(CTS_TEST_PROPERTY_VAL);
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/os/TraceHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/os/TraceHelperTest.java
new file mode 100644
index 0000000..2bdd069
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/os/TraceHelperTest.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.os;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.builtin.os.TraceHelper;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class TraceHelperTest {
+
+    // the value is from frameworks/base/core/java/android/os/Trace.java
+    private static final long EXPECTED_CAR_SERVICE_TRACE_TAG = 1L << 19;
+
+    @Test
+    public void testCarServiceTraceTag() {
+        assertThat(TraceHelper.TRACE_TAG_CAR_SERVICE).isEqualTo(EXPECTED_CAR_SERVICE_TRACE_TAG);
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/os/UserManagerHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/os/UserManagerHelperTest.java
new file mode 100644
index 0000000..8a37c088
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/os/UserManagerHelperTest.java
@@ -0,0 +1,318 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.os;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.fail;
+import static org.testng.Assert.assertThrows;
+
+import android.app.ActivityManager;
+import android.app.Instrumentation;
+import android.car.builtin.os.UserManagerHelper;
+import android.content.Context;
+import android.os.Binder;
+import android.os.NewUserRequest;
+import android.os.NewUserResponse;
+import android.os.SystemClock;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+
+public final class UserManagerHelperTest {
+
+    private static final String TAG = UserManagerHelperTest.class.getSimpleName();
+
+    private static final int WAIT_TIME_FOR_OPERATION_MS = 60_000;
+    private static final int WAIT_TIME_BEFORE_RETRY_MS = 1_000;
+    private static final int WAIT_TIME_FOR_NEGATIVE_RESULT_MS = 30_000;
+
+    private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
+
+    private Context mContext;
+    private UserManager mUserManager;
+    private UserHandle mUserToRemove;
+
+    @Before
+    public void setup() {
+        mContext = mInstrumentation.getContext();
+        mUserManager = mContext.getSystemService(UserManager.class);
+        mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
+                android.Manifest.permission.CREATE_USERS);
+        removeAnyPreCreatedUser();
+    }
+
+    private void removeAnyPreCreatedUser() {
+        // Existing pre-created user can interfere with the test logic. Remove all existing
+        // pre-created Users.
+        List<UserHandle> allUsersHandles = UserManagerHelper.getUserHandles(mUserManager,
+                /* excludePartial= */ true, /* excludeDying= */ true,
+                /* excludePreCreated= */ false);
+        for (UserHandle userHandle : allUsersHandles) {
+            if (UserManagerHelper.isPreCreatedUser(mUserManager, userHandle)) {
+                Log.v(TAG, "Removing pre-craeted user " + userHandle);
+                boolean result = mUserManager.removeUser(userHandle);
+                Log.v(TAG, "Pre-created user: " + userHandle + " Removed: " + result);
+            }
+        }
+    }
+
+    @After
+    public void cleanUp() throws Exception {
+        try {
+            if (mUserToRemove != null) {
+                Log.v(TAG, "Removing user created during test. User " + mUserToRemove);
+                boolean result = mUserManager.removeUser(mUserToRemove);
+                Log.v(TAG, "User: " + mUserToRemove + " Removed: " + result);
+            }
+        } catch (Exception e) {
+            Log.v(TAG, "Cannot remove User:" + mUserToRemove + ". Exception: " + e);
+        } finally {
+            mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testMultiplePropertiesForCurrentUser() {
+        // Current user should not be ephemeral because test runs as secondary user.
+        UserHandle currentUser = UserHandle.of(ActivityManager.getCurrentUser());
+        assertThat(UserManagerHelper.isEphemeralUser(mUserManager, currentUser)).isFalse();
+
+        // Current user should be enabled.
+        assertThat(UserManagerHelper.isEnabledUser(mUserManager, currentUser)).isTrue();
+
+        // Current user should not be preCreated
+        assertThat(UserManagerHelper.isPreCreatedUser(mUserManager, currentUser)).isFalse();
+
+        // Current should be initialized, otherwise test would be running
+        assertThat(UserManagerHelper.isInitializedUser(mUserManager, currentUser)).isTrue();
+
+        // Current should be part of getUserHandles
+        assertGetUserHandlesHasUser(currentUser);
+    }
+
+
+    @Test
+    public void testMultiplePropertiesForGuestUser() throws Exception {
+        UserHandle guestUser = createGuestUser();
+
+        // Should be ephemeral
+        assertThat(UserManagerHelper.isEphemeralUser(mUserManager, guestUser)).isTrue();
+
+        // User should be enabled.
+        assertThat(UserManagerHelper.isEnabledUser(mUserManager, guestUser)).isTrue();
+
+        // User should not be preCreated
+        assertThat(UserManagerHelper.isPreCreatedUser(mUserManager, guestUser)).isFalse();
+
+        // User should be initialized, but to confirm, we should wait for some time as
+        // Initialization flag is set later on. Any better option?
+        Thread.sleep(WAIT_TIME_FOR_NEGATIVE_RESULT_MS);
+        assertThat(UserManagerHelper.isInitializedUser(mUserManager, guestUser)).isFalse();
+
+        // User should be part of getUserHandles
+        assertGetUserHandlesHasUser(guestUser);
+    }
+
+    @Test
+    public void testMultiplePropertiesForSecondaryFullUser() throws Exception {
+        UserHandle fullUser = createSecondaryUser();
+
+        // Should not be ephemeral
+        assertThat(UserManagerHelper.isEphemeralUser(mUserManager, fullUser)).isFalse();
+
+        // User should be enabled.
+        assertThat(UserManagerHelper.isEnabledUser(mUserManager, fullUser)).isTrue();
+
+        // User should not be preCreated
+        assertThat(UserManagerHelper.isPreCreatedUser(mUserManager, fullUser)).isFalse();
+
+        // User should be initialized, but to confirm, we should wait for some time as
+        // Initialization flag is set later on. Any better option?
+        Thread.sleep(WAIT_TIME_FOR_NEGATIVE_RESULT_MS);
+        assertThat(UserManagerHelper.isInitializedUser(mUserManager, fullUser)).isFalse();
+
+        // User should be part of getUserHandles
+        assertGetUserHandlesHasUser(fullUser);
+    }
+
+    @Test
+    public void testMultiplePropertiesForPreCreatedGuestUser() throws Exception {
+        UserHandle preCreateUser = preCreateUserTest(UserManager.USER_TYPE_FULL_SECONDARY);
+
+        // User should not be ephemeral
+        assertThat(UserManagerHelper.isEphemeralUser(mUserManager, preCreateUser)).isFalse();
+
+        // User should be enabled.
+        assertThat(UserManagerHelper.isEnabledUser(mUserManager, preCreateUser)).isTrue();
+
+        // User should be preCreated
+        assertThat(UserManagerHelper.isPreCreatedUser(mUserManager, preCreateUser)).isTrue();
+
+        // User should be initialized, wait for it.
+        waitForUserToInitialize(preCreateUser);
+        assertThat(UserManagerHelper.isInitializedUser(mUserManager, preCreateUser)).isTrue();
+
+        // User should be part of getUserHandles
+        assertGetUserHandlesHasUser(preCreateUser);
+    }
+
+    @Test
+    public void testMultiplePropertiesForPreCreatedFullUser() throws Exception {
+        UserHandle preCreateUser = preCreateUserTest(UserManager.USER_TYPE_FULL_GUEST);
+
+        // Should not be ephemeral, will be ephemeral after promoted
+        assertThat(UserManagerHelper.isEphemeralUser(mUserManager, preCreateUser)).isFalse();
+
+        // User should be enabled.
+        assertThat(UserManagerHelper.isEnabledUser(mUserManager, preCreateUser)).isTrue();
+
+        // User should be preCreated
+        assertThat(UserManagerHelper.isPreCreatedUser(mUserManager, preCreateUser)).isTrue();
+
+        // User should be initialized, wait for it.
+        waitForUserToInitialize(preCreateUser);
+        assertThat(UserManagerHelper.isInitializedUser(mUserManager, preCreateUser)).isTrue();
+
+        // User should be part of getUserHandles
+        assertGetUserHandlesHasUser(preCreateUser);
+    }
+
+    @Test
+    public void testGetDefaultUserTypeForUserInfoFlags() {
+        // Simple example.
+        assertThat(UserManagerHelper
+                .getDefaultUserTypeForUserInfoFlags(UserManagerHelper.FLAG_MANAGED_PROFILE))
+                        .isEqualTo(UserManager.USER_TYPE_PROFILE_MANAGED);
+
+        // Type plus a non-type flag.
+        assertThat(UserManagerHelper
+                .getDefaultUserTypeForUserInfoFlags(
+                        UserManagerHelper.FLAG_GUEST | UserManagerHelper.FLAG_EPHEMERAL))
+                                .isEqualTo(UserManager.USER_TYPE_FULL_GUEST);
+
+        // Two types, which is illegal.
+        assertThrows(IllegalArgumentException.class, () -> UserManagerHelper
+                .getDefaultUserTypeForUserInfoFlags(
+                        UserManagerHelper.FLAG_MANAGED_PROFILE | UserManagerHelper.FLAG_GUEST));
+
+        // No type, which defaults to {@link UserManager#USER_TYPE_FULL_SECONDARY}.
+        assertThat(UserManagerHelper
+                .getDefaultUserTypeForUserInfoFlags(UserManagerHelper.FLAG_EPHEMERAL))
+                        .isEqualTo(UserManager.USER_TYPE_FULL_SECONDARY);
+    }
+
+    @Test
+    public void testGetDefaultUserName() {
+        assertThat(UserManagerHelper.getDefaultUserName(mContext)).isNotNull();
+    }
+
+    @Test
+    public void testGetMaxRunningUsers() {
+        assertThat(UserManagerHelper.getMaxRunningUsers(mContext)).isGreaterThan(0);
+    }
+
+    @Test
+    public void testGetUserId() {
+        assertThat(UserManagerHelper.getUserId(Binder.getCallingUid()))
+                .isEqualTo(Binder.getCallingUserHandle().getIdentifier());
+    }
+
+    private void assertGetUserHandlesHasUser(UserHandle user) {
+        List<UserHandle> allUsersHandles = UserManagerHelper.getUserHandles(mUserManager,
+                /* excludePartial= */ false, /* excludeDying= */ false,
+                /* excludePreCreated= */ false);
+        assertThat(allUsersHandles).contains(user);
+    }
+
+    private void waitForUserToInitialize(UserHandle preCreateUser) throws Exception {
+        long startTime = SystemClock.elapsedRealtime();
+        long waitTime = SystemClock.elapsedRealtime() - startTime;
+        while (!UserManagerHelper.isInitializedUser(mUserManager, preCreateUser)
+                && waitTime < WAIT_TIME_FOR_OPERATION_MS) {
+            waitTime = SystemClock.elapsedRealtime() - startTime;
+            Log.v(TAG, "Waiting for user to initialize. Wait time in MS:" + waitTime);
+            Thread.sleep(WAIT_TIME_BEFORE_RETRY_MS);
+        }
+    }
+
+    private UserHandle createGuestUser() {
+        NewUserRequest request = new NewUserRequest.Builder()
+                .setUserType(UserManager.USER_TYPE_FULL_GUEST).setEphemeral().build();
+        NewUserResponse response = mUserManager.createUser(request);
+        if (response.isSuccessful()) {
+            mUserToRemove = response.getUser();
+            return mUserToRemove;
+        }
+        fail("Could not create guest User. Response: " + response);
+        return null;
+    }
+
+    private UserHandle createSecondaryUser() {
+        NewUserRequest request = new NewUserRequest.Builder()
+                .setUserType(UserManager.USER_TYPE_FULL_SECONDARY).build();
+        NewUserResponse response = mUserManager.createUser(request);
+        if (response.isSuccessful()) {
+            mUserToRemove = response.getUser();
+            return mUserToRemove;
+        }
+        fail("Could not create secondary User. Response: " + response);
+        return null;
+    }
+
+    private UserHandle createPreCreatedUser(String type) {
+        mUserToRemove = UserManagerHelper.preCreateUser(mUserManager, type);
+        if (mUserToRemove == null) {
+            fail("Could not create precreated User of type:" + type);
+        }
+        return mUserToRemove;
+    }
+
+    private UserHandle preCreateUserTest(String type) {
+        UserHandle user = createPreCreatedUser(type);
+        assertPrecreatedUserExists(user, type);
+        return user;
+    }
+
+    private void assertPrecreatedUserExists(UserHandle user, String type) {
+        String allUsers = SystemUtil.runShellCommand("cmd user list --all -v");
+        String[] result = allUsers.split("\n");
+        for (int i = 0; i < result.length; i++) {
+            if (result[i].contains("id=" + user.getIdentifier())) {
+                assertThat(result[i]).contains("(pre-created)");
+                if (type == UserManager.USER_TYPE_FULL_SECONDARY) {
+                    assertThat(result[i]).contains("type=full.SECONDARY");
+                }
+                if (type == UserManager.USER_TYPE_FULL_GUEST) {
+                    assertThat(result[i]).contains("type=full.GUEST");
+                }
+                return;
+            }
+        }
+        fail("User not found. All users: " + allUsers + ". Expected user: " + user);
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/power/PowerManagerHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/power/PowerManagerHelperTest.java
new file mode 100644
index 0000000..9217465
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/power/PowerManagerHelperTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.power;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Instrumentation;
+import android.app.UiAutomation;
+import android.car.builtin.power.PowerManagerHelper;
+import android.content.Context;
+import android.os.PowerManager;
+import android.os.SystemClock;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class PowerManagerHelperTest {
+
+    @Test
+    public void testSetDisplayState() {
+        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        Context context = instrumentation.getContext();
+        PowerManager powerManager = context.getSystemService(PowerManager.class);
+        UiAutomation uiAutomation = instrumentation.getUiAutomation();
+
+        uiAutomation.adoptShellPermissionIdentity(android.Manifest.permission.DEVICE_POWER);
+
+        try {
+            PowerManagerHelper.setDisplayState(context, /* on= */ true, SystemClock.uptimeMillis());
+            assertWithMessage("Screen on").that(powerManager.isInteractive()).isTrue();
+
+            PowerManagerHelper.setDisplayState(context, /* on= */ false,
+                    SystemClock.uptimeMillis());
+            assertWithMessage("Screen on").that(powerManager.isInteractive()).isFalse();
+
+            PowerManagerHelper.setDisplayState(context, /* on= */ true, SystemClock.uptimeMillis());
+            assertWithMessage("Screen on").that(powerManager.isInteractive()).isTrue();
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/provider/SettingsHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/provider/SettingsHelperTest.java
new file mode 100644
index 0000000..e6c21f2
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/provider/SettingsHelperTest.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.provider;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.car.builtin.provider.SettingsHelper;
+
+import org.junit.Test;
+
+public final class SettingsHelperTest {
+
+    @Test
+    public void testConstants() {
+        assertWithMessage("SYSTEM_LOCALES").that(SettingsHelper.SYSTEM_LOCALES)
+                .isEqualTo("system_locales");
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/util/AssistUtilsHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/util/AssistUtilsHelperTest.java
new file mode 100644
index 0000000..eb5b0e9
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/util/AssistUtilsHelperTest.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.util;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Instrumentation;
+import android.car.builtin.util.AssistUtilsHelper;
+import android.content.Context;
+import android.util.Log;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+public final class AssistUtilsHelperTest {
+    private static final String TAG = AssistUtilsHelper.class.getSimpleName();
+    private static final String PERMISSION_ACCESS_VOICE_INTERACTION_SERVICE =
+            "android.permission.ACCESS_VOICE_INTERACTION_SERVICE";
+    private static final int TIMEOUT = 20_000;
+
+    private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
+    private final Context mContext = mInstrumentation.getContext();
+
+    @Before
+    public void setUp() throws Exception {
+        mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
+                PERMISSION_ACCESS_VOICE_INTERACTION_SERVICE);
+    }
+
+    @After
+    public void cleanUp() {
+        mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+    }
+
+    @Test
+    public void testOnShownCallback() throws Exception {
+        SessionShowCallbackHelperImpl callbackHelperImpl = new SessionShowCallbackHelperImpl();
+        AssistUtilsHelper.showPushToTalkSessionForActiveService(mContext, callbackHelperImpl);
+        callbackHelperImpl.waitForCallback();
+
+        assertWithMessage("Voice session shown")
+                .that(callbackHelperImpl.isSessionOnShown()).isTrue();
+
+        hideSessionAndWait();
+    }
+
+    @Test
+    public void testOnFailedCallback() throws Exception {
+        // TODO (b/200609382): setup a failure scenario to cover session failed case and
+        // call onFailed API
+    }
+
+    @Test
+    public void isSessionRunning_whenSessionIsShown_succeeds() throws Exception {
+        SessionShowCallbackHelperImpl callbackHelperImpl = new SessionShowCallbackHelperImpl();
+        AssistUtilsHelper.showPushToTalkSessionForActiveService(mContext, callbackHelperImpl);
+        callbackHelperImpl.waitForCallback();
+
+        assertWithMessage("Voice interaction session running")
+                .that(AssistUtilsHelper.isSessionRunning(mContext)).isTrue();
+
+        hideSessionAndWait();
+    }
+
+    @Test
+    public void registerVoiceInteractionSessionListenerHelper_onShowSession() throws Exception {
+        VoiceInteractionSessionListener listener = new VoiceInteractionSessionListener();
+        AssistUtilsHelper.registerVoiceInteractionSessionListenerHelper(mContext, listener);
+
+        SessionShowCallbackHelperImpl callbackHelperImpl = new SessionShowCallbackHelperImpl();
+        AssistUtilsHelper.showPushToTalkSessionForActiveService(mContext, callbackHelperImpl);
+        callbackHelperImpl.waitForCallback();
+
+        listener.waitForSessionChange();
+
+        assertWithMessage("Voice interaction session shown")
+                .that(listener.mIsSessionShown).isTrue();
+
+        hideSessionAndWait();
+    }
+
+    @Test
+    public void registerVoiceInteractionSessionListenerHelper_hideCurrentSession()
+            throws Exception {
+        VoiceInteractionSessionListener listener = new VoiceInteractionSessionListener();
+        AssistUtilsHelper.registerVoiceInteractionSessionListenerHelper(mContext, listener);
+
+        SessionShowCallbackHelperImpl callbackHelperImpl = new SessionShowCallbackHelperImpl();
+        AssistUtilsHelper.showPushToTalkSessionForActiveService(mContext, callbackHelperImpl);
+        callbackHelperImpl.waitForCallback();
+
+        listener.waitForSessionChange();
+        listener.reset();
+
+        AssistUtilsHelper.hideCurrentSession(mContext);
+        listener.waitForSessionChange();
+
+        assertWithMessage("Voice interaction session shown")
+                .that(listener.mIsSessionShown).isFalse();
+    }
+
+    private void hideSessionAndWait() throws Exception {
+        if (!AssistUtilsHelper.isSessionRunning(mContext)) {
+            return;
+        }
+        VoiceInteractionSessionListener listener = new VoiceInteractionSessionListener();
+        AssistUtilsHelper.registerVoiceInteractionSessionListenerHelper(mContext, listener);
+
+        listener.reset();
+        listener.waitForSessionChange();
+    }
+
+    private static final class VoiceInteractionSessionListener implements
+            AssistUtilsHelper.VoiceInteractionSessionListenerHelper {
+
+        private final Semaphore mChangeWait = new Semaphore(0);
+        private boolean mIsSessionShown;
+
+        @Override
+        public void onVoiceSessionShown() {
+            mIsSessionShown = true;
+            Log.d(TAG, "onVoiceSessionShown is called");
+            mChangeWait.release();
+        }
+
+        @Override
+        public void onVoiceSessionHidden() {
+            mIsSessionShown = false;
+            Log.d(TAG, "onVoiceSessionHidden is called");
+            mChangeWait.release();
+        }
+
+        private void waitForSessionChange() throws Exception {
+            if (!mChangeWait.tryAcquire(TIMEOUT, TimeUnit.MILLISECONDS)) {
+                throw new IllegalStateException("Timed out waiting for session change");
+            }
+        }
+
+        private void reset() {
+            mChangeWait.drainPermits();
+        }
+    }
+
+    private static final class SessionShowCallbackHelperImpl implements
+            AssistUtilsHelper.VoiceInteractionSessionShowCallbackHelper {
+
+        private final CountDownLatch mCallbackLatch = new CountDownLatch(1);
+        private boolean mIsSessionOnShown = false;
+
+        public void onShown() {
+            mIsSessionOnShown = true;
+            Log.d(TAG, "onShown is called");
+            mCallbackLatch.countDown();
+        }
+
+        public void onFailed() {
+            Log.d(TAG, "onFailed");
+        }
+
+        private boolean isSessionOnShown() {
+            return mIsSessionOnShown;
+        }
+
+        private void waitForCallback() throws Exception {
+            mCallbackLatch.await(TIMEOUT, TimeUnit.MILLISECONDS);
+        }
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/util/AtomicFileHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/util/AtomicFileHelperTest.java
new file mode 100644
index 0000000..1add30c
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/util/AtomicFileHelperTest.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.car.builtin.util.AtomicFileHelper;
+import android.content.Context;
+import android.util.AtomicFile;
+import android.util.Log;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.FileReader;
+
+@RunWith(AndroidJUnit4.class)
+public final class AtomicFileHelperTest {
+    private static final String TAG = AtomicFileHelperTest.class.getSimpleName();
+
+    private static final String PRE_EXIST_TEST_FILE_NAME = "TestFilePreExist";
+    private static final String NEWLY_CREATED_TEST_FILE_NAME = "TestFileNewlyCreated";
+    private static final String FAILED_TEST_FILE_NAME = "TestFileFailed";
+    private static final String REWRITE_TEST_FILE_NAME = "TestFileRewriteCreated";
+    private static final String TEST_FILE_CONTENT = "AtomicFileHelper CTS TEST FILE CONTENT";
+    private static final String REWRITE_CONTENT = "CTS TEST ATOMIC FILE REWRITE";
+
+    private final Context mContext = InstrumentationRegistry.getInstrumentation().getContext();
+
+    @Test
+    public void testAtomicFileWithPreExistedBaseFile() throws Exception {
+        File appPrivateFileDir = mContext.getFilesDir();
+
+        // create a private file
+        mContext.openFileOutput(PRE_EXIST_TEST_FILE_NAME, Context.MODE_PRIVATE);
+
+        // create a File object to point to the newly created private file
+        File baseFile = new File(/* parent= */appPrivateFileDir, PRE_EXIST_TEST_FILE_NAME);
+        AtomicFile atomicFile = new AtomicFile(baseFile);
+
+        // execution and assertion
+        assertTrue(AtomicFileHelper.exists(atomicFile));
+        baseFile.delete();
+        assertFalse(AtomicFileHelper.exists(atomicFile));
+    }
+
+    @Test
+    public void testAtomicFileWithNonExistedBaseFile() throws Exception {
+        // setup
+        File appPrivateFileDir = mContext.getFilesDir();
+        File baseFile = new File(/* parent= */appPrivateFileDir, NEWLY_CREATED_TEST_FILE_NAME);
+        if (baseFile.exists()) {
+            baseFile.delete();
+        }
+        AtomicFile atomicFile = new AtomicFile(baseFile);
+
+        // execution and assertion
+        // 1. the base file does not exist yet
+        assertFalse(AtomicFileHelper.exists(atomicFile));
+
+        // 2. write into the atomic file and result a new base file
+        FileOutputStream fos = atomicFile.startWrite();
+        fos.write(TEST_FILE_CONTENT.getBytes());
+        atomicFile.finishWrite(fos);
+        assertTrue(AtomicFileHelper.exists(atomicFile));
+
+        // 3. check if the content match by directly read from the base file
+        BufferedReader br = new BufferedReader(new FileReader(baseFile));
+        String fileContent = br.readLine();
+        Log.d(TAG, fileContent);
+        assertEquals(TEST_FILE_CONTENT, fileContent);
+        br.close();
+
+        // 4. delete the base file;
+        baseFile.delete();
+        assertFalse(AtomicFileHelper.exists(atomicFile));
+    }
+
+    @Test
+    public void testAtomicFileWithFailedWrite() throws Exception {
+        // setup
+        File appPrivateFileDir = mContext.getFilesDir();
+        File baseFile = new File(/* parent= */appPrivateFileDir, REWRITE_TEST_FILE_NAME);
+        if (baseFile.exists()) {
+            baseFile.delete();
+        }
+        AtomicFile atomicFile = new AtomicFile(baseFile);
+
+        // execution and assertion
+        // 1. the base file does not exist yet
+        assertFalse(AtomicFileHelper.exists(atomicFile));
+
+        // 2. write into the atomic file and result a new base file
+        FileOutputStream fos = atomicFile.startWrite();
+        fos.write(TEST_FILE_CONTENT.getBytes());
+        atomicFile.failWrite(fos);
+        assertFalse(AtomicFileHelper.exists(atomicFile));
+    }
+
+    @Test
+    public void testAtomicFileRewrite() throws Exception {
+        // setup
+        File appPrivateFileDir = mContext.getFilesDir();
+        File baseFile = new File(/* parent= */appPrivateFileDir, NEWLY_CREATED_TEST_FILE_NAME);
+        if (baseFile.exists()) {
+            baseFile.delete();
+        }
+
+        // execution and assertion
+        // 1. write into the atomic file and result a new base file
+        AtomicFile atomicFile1 = new AtomicFile(baseFile);
+        FileOutputStream fos1 = atomicFile1.startWrite();
+        fos1.write(TEST_FILE_CONTENT.getBytes());
+        atomicFile1.finishWrite(fos1);
+        assertTrue(AtomicFileHelper.exists(atomicFile1));
+        fos1.close();
+
+        // 2. create a new AtomicFile and rewrite new content
+        AtomicFile atomicFile2 = new AtomicFile(baseFile);
+        FileOutputStream fos2 = atomicFile2.startWrite();
+        fos2.write(REWRITE_CONTENT.getBytes());
+        atomicFile2.finishWrite(fos2);
+        assertTrue(AtomicFileHelper.exists(atomicFile1));
+        fos2.close();
+
+        // 3. reopen the atomic file and read out the content
+        AtomicFile atomicFile3 = new AtomicFile(baseFile);
+        FileInputStream fis = atomicFile3.openRead();
+        String atomicFileReadContent = new String(atomicFile3.readFully());
+        Log.d(TAG, atomicFileReadContent);
+        assertEquals(atomicFileReadContent, REWRITE_CONTENT);
+        fis.close();
+
+        // 4. test if AtomicFile read is the same as base file read
+        BufferedReader br = new BufferedReader(new FileReader(baseFile));
+        String baseFileReadContent = br.readLine();
+        Log.d(TAG, baseFileReadContent);
+        assertEquals(atomicFileReadContent, baseFileReadContent);
+        br.close();
+
+        // 5. delete the base file;
+        baseFile.delete();
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/util/EventLogHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/util/EventLogHelperTest.java
new file mode 100644
index 0000000..62b7d83
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/util/EventLogHelperTest.java
@@ -0,0 +1,722 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.util;
+
+import static android.car.cts.builtin.util.LogcatHelper.Buffer.EVENTS;
+import static android.car.cts.builtin.util.LogcatHelper.Level.INFO;
+import static android.car.cts.builtin.util.LogcatHelper.assertLogcatMessage;
+import static android.car.cts.builtin.util.LogcatHelper.clearLog;
+
+import android.car.builtin.util.EventLogHelper;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public final class EventLogHelperTest {
+
+    private static final int TIMEOUT_MS = 10_000;
+
+    @Before
+    public void setup() {
+        clearLog();
+    }
+
+    @Test
+    public void testWriteCarHelperStart() {
+        EventLogHelper.writeCarHelperStart();
+
+        assertLogMessage("car_helper_start");
+    }
+
+    @Test
+    public void testWriteCarHelperBootPhase() {
+        EventLogHelper.writeCarHelperBootPhase(1);
+
+        assertLogMessage("car_helper_boot_phase", "1");
+    }
+
+    @Test
+    public void testWriteCarHelperUserStarting() {
+        EventLogHelper.writeCarHelperUserStarting(100);
+
+        assertLogMessage("car_helper_user_starting", "100");
+    }
+
+    @Test
+    public void testWriteCarHelperUserSwitching() {
+        EventLogHelper.writeCarHelperUserSwitching(100, 101);
+
+        assertLogMessage("car_helper_user_switching", "[100,101]");
+    }
+
+    @Test
+    public void testWriteCarHelperUserUnlocking() {
+        EventLogHelper.writeCarHelperUserUnlocking(100);
+
+        assertLogMessage("car_helper_user_unlocking", "100");
+    }
+
+    @Test
+    public void testWriteCarHelperUserUnlocked() {
+        EventLogHelper.writeCarHelperUserUnlocked(100);
+
+        assertLogMessage("car_helper_user_unlocked", "100");
+    }
+
+    @Test
+    public void testWriteCarHelperUserStopping() {
+        EventLogHelper.writeCarHelperUserStopping(100);
+
+        assertLogMessage("car_helper_user_stopping", "100");
+    }
+
+    @Test
+    public void testWriteCarHelperUserStopped() {
+        EventLogHelper.writeCarHelperUserStopped(100);
+
+        assertLogMessage("car_helper_user_stopped", "100");
+    }
+
+    @Test
+    public void testWriteCarHelperServiceConnected() {
+        EventLogHelper.writeCarHelperServiceConnected();
+
+        assertLogMessage("car_helper_svc_connected");
+    }
+
+    @Test
+    public void testWriteCarServiceInit() {
+        EventLogHelper.writeCarServiceInit(101);
+
+        assertLogMessage("car_service_init", "101");
+    }
+
+    @Test
+    public void testWriteCarServiceVhalReconnected() {
+        EventLogHelper.writeCarServiceVhalReconnected(101);
+
+        assertLogMessage("car_service_vhal_reconnected", "101");
+    }
+
+    @Test
+    public void testWriteCarServiceSetCarServiceHelper() {
+        EventLogHelper.writeCarServiceSetCarServiceHelper(101);
+
+        assertLogMessage("car_service_set_car_service_helper", "101");
+    }
+
+    @Test
+    public void testWriteCarServiceOnUserLifecycle() {
+        EventLogHelper.writeCarServiceOnUserLifecycle(1, 2, 3);
+
+        assertLogMessage("car_service_on_user_lifecycle", "[1,2,3]");
+    }
+
+    @Test
+    public void testWriteCarServiceCreate() {
+        EventLogHelper.writeCarServiceCreate(true);
+
+        assertLogMessage("car_service_create", "1");
+    }
+
+    @Test
+    public void testWriteCarServiceConnected() {
+        EventLogHelper.writeCarServiceConnected("testString");
+
+        assertLogMessage("car_service_connected", "testString");
+    }
+
+    @Test
+    public void testWriteCarServiceDestroy() {
+        EventLogHelper.writeCarServiceDestroy(true);
+
+        assertLogMessage("car_service_destroy", "1");
+    }
+
+    @Test
+    public void testWriteCarServiceVhalDied() {
+        EventLogHelper.writeCarServiceVhalDied(101);
+
+        assertLogMessage("car_service_vhal_died", "101");
+    }
+
+    @Test
+    public void testWriteCarServiceInitBootUser() {
+        EventLogHelper.writeCarServiceInitBootUser();
+
+        assertLogMessage("car_service_init_boot_user");
+    }
+
+    @Test
+    public void testWriteCarServiceOnUserRemoved() {
+        EventLogHelper.writeCarServiceOnUserRemoved(101);
+
+        assertLogMessage("car_service_on_user_removed", "101");
+    }
+
+    @Test
+    public void testWriteCarUserServiceInitialUserInfoReq() {
+        EventLogHelper.writeCarUserServiceInitialUserInfoReq(1, 2, 3, 4, 5);
+
+        assertLogMessage("car_user_svc_initial_user_info_req", "[1,2,3,4,5]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceInitialUserInfoResp() {
+        EventLogHelper.writeCarUserServiceInitialUserInfoResp(1, 2, 3, 4, "string1", "string2");
+
+        assertLogMessage("car_user_svc_initial_user_info_resp", "[1,2,3,4,string1,string2]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceSetInitialUser() {
+        EventLogHelper.writeCarUserServiceSetInitialUser(101);
+
+        assertLogMessage("car_user_svc_set_initial_user", "101");
+    }
+
+    @Test
+    public void testWriteCarUserServiceSetLifecycleListener() {
+        EventLogHelper.writeCarUserServiceSetLifecycleListener(101, "string1");
+
+        assertLogMessage("car_user_svc_set_lifecycle_listener", "[101,string1]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceResetLifecycleListener() {
+        EventLogHelper.writeCarUserServiceResetLifecycleListener(101, "string1");
+
+        assertLogMessage("car_user_svc_reset_lifecycle_listener", "[101,string1]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceSwitchUserReq() {
+        EventLogHelper.writeCarUserServiceSwitchUserReq(101, 102);
+
+        assertLogMessage("car_user_svc_switch_user_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceSwitchUserResp() {
+        EventLogHelper.writeCarUserServiceSwitchUserResp(101, 102, "string");
+
+        assertLogMessage("car_user_svc_switch_user_resp", "[101,102,string]");
+    }
+
+    @Test
+    public void testWriteCarUserServicePostSwitchUserReq() {
+        EventLogHelper.writeCarUserServicePostSwitchUserReq(101, 102);
+
+        assertLogMessage("car_user_svc_post_switch_user_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceGetUserAuthReq() {
+        EventLogHelper.writeCarUserServiceGetUserAuthReq(101, 102, 103);
+
+        assertLogMessage("car_user_svc_get_user_auth_req", "[101,102,103]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceLogoutUserReq() {
+        EventLogHelper.writeCarUserServiceLogoutUserReq(101, 102);
+
+        assertLogMessage("car_user_svc_logout_user_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceLogoutUserResp() {
+        EventLogHelper.writeCarUserServiceLogoutUserResp(101, 102, "string");
+
+        assertLogMessage("car_user_svc_logout_user_resp", "[101,102,string]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceGetUserAuthResp() {
+        EventLogHelper.writeCarUserServiceGetUserAuthResp(101);
+
+        assertLogMessage("car_user_svc_get_user_auth_resp", "101");
+    }
+
+    @Test
+    public void testWriteCarUserServiceSwitchUserUiReq() {
+        EventLogHelper.writeCarUserServiceSwitchUserUiReq(101);
+
+        assertLogMessage("car_user_svc_switch_user_ui_req", "101");
+    }
+
+    @Test
+    public void testWriteCarUserServiceSwitchUserFromHalReq() {
+        EventLogHelper.writeCarUserServiceSwitchUserFromHalReq(101, 102);
+
+        assertLogMessage("car_user_svc_switch_user_from_hal_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceSetUserAuthReq() {
+        EventLogHelper.writeCarUserServiceSetUserAuthReq(101, 102, 103);
+
+        assertLogMessage("car_user_svc_set_user_auth_req", "[101,102,103]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceSetUserAuthResp() {
+        EventLogHelper.writeCarUserServiceSetUserAuthResp(101, "string");
+
+        assertLogMessage("car_user_svc_set_user_auth_resp", "[101,string]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceCreateUserReq() {
+        EventLogHelper.writeCarUserServiceCreateUserReq("string1", "string2", 101, 102, 103);
+
+        assertLogMessage("car_user_svc_create_user_req", "[string1,string2,101,102,103]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceCreateUserResp() {
+        EventLogHelper.writeCarUserServiceCreateUserResp(101, 102, "string");
+
+        assertLogMessage("car_user_svc_create_user_resp", "[101,102,string]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceCreateUserUserCreated() {
+        EventLogHelper.writeCarUserServiceCreateUserUserCreated(101, "string1", "string2", 102);
+
+        assertLogMessage("car_user_svc_create_user_user_created", "[101,string1,string2,102]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceCreateUserUserRemoved() {
+        EventLogHelper.writeCarUserServiceCreateUserUserRemoved(101, "string");
+
+        assertLogMessage("car_user_svc_create_user_user_removed", "[101,string]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceRemoveUserReq() {
+        EventLogHelper.writeCarUserServiceRemoveUserReq(101, 102);
+
+        assertLogMessage("car_user_svc_remove_user_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceRemoveUserResp() {
+        EventLogHelper.writeCarUserServiceRemoveUserResp(101, 102);
+
+        assertLogMessage("car_user_svc_remove_user_resp", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceNotifyAppLifecycleListener() {
+        EventLogHelper.writeCarUserServiceNotifyAppLifecycleListener(101, "string", 102, 103, 104);
+
+        assertLogMessage("car_user_svc_notify_app_lifecycle_listener", "[101,string,102,103,104]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceNotifyInternalLifecycleListener() {
+        EventLogHelper.writeCarUserServiceNotifyInternalLifecycleListener("string", 102, 103, 104);
+
+        assertLogMessage("car_user_svc_notify_internal_lifecycle_listener", "[string,102,103,104]");
+    }
+
+    @Test
+    public void testWriteCarUserServicePreCreationRequested() {
+        EventLogHelper.writeCarUserServicePreCreationRequested(101, 102);
+
+        assertLogMessage("car_user_svc_pre_creation_requested", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserServicePreCreationStatus() {
+        EventLogHelper.writeCarUserServicePreCreationStatus(101, 102, 103, 104, 105, 106, 107);
+
+        assertLogMessage("car_user_svc_pre_creation_status", "[101,102,103,104,105,106,107]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceStartUserInBackgroundReq() {
+        EventLogHelper.writeCarUserServiceStartUserInBackgroundReq(101);
+
+        assertLogMessage("car_user_svc_start_user_in_background_req", "101");
+    }
+
+    @Test
+    public void testWriteCarUserServiceStartUserInBackgroundResp() {
+        EventLogHelper.writeCarUserServiceStartUserInBackgroundResp(101, 102);
+
+        assertLogMessage("car_user_svc_start_user_in_background_resp", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceStopUserReq() {
+        EventLogHelper.writeCarUserServiceStopUserReq(101);
+
+        assertLogMessage("car_user_svc_stop_user_req", "101");
+    }
+
+    @Test
+    public void testWriteCarUserServiceStopUserResp() {
+        EventLogHelper.writeCarUserServiceStopUserResp(101, 102);
+
+        assertLogMessage("car_user_svc_stop_user_resp", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserServiceInitialUserInfoReqComplete() {
+        EventLogHelper.writeCarUserServiceInitialUserInfoReqComplete(101);
+
+        assertLogMessage("car_user_svc_initial_user_info_req_complete", "101");
+    }
+
+    @Test
+    public void testWriteCarUserHalInitialUserInfoReq() {
+        EventLogHelper.writeCarUserHalInitialUserInfoReq(101, 102, 103);
+
+        assertLogMessage("car_user_hal_initial_user_info_req", "[101,102,103]");
+    }
+
+    @Test
+    public void testWriteCarUserHalInitialUserInfoResp() {
+        EventLogHelper.writeCarUserHalInitialUserInfoResp(101, 102, 103, 104, 105, "string1",
+                "string2");
+
+        assertLogMessage("car_user_hal_initial_user_info_resp",
+                "[101,102,103,104,105,string1,string2]");
+    }
+
+    @Test
+    public void testWriteCarUserHalSwitchUserReq() {
+        EventLogHelper.writeCarUserHalSwitchUserReq(101, 102, 103, 104);
+
+        assertLogMessage("car_user_hal_switch_user_req", "[101,102,103,104]");
+    }
+
+    @Test
+    public void testWriteCarUserHalSwitchUserResp() {
+        EventLogHelper.writeCarUserHalSwitchUserResp(101, 102, 103, "string");
+
+        assertLogMessage("car_user_hal_switch_user_resp", "[101,102,103,string]");
+    }
+
+    @Test
+    public void testWriteCarUserHalPostSwitchUserReq() {
+        EventLogHelper.writeCarUserHalPostSwitchUserReq(101, 102, 103);
+
+        assertLogMessage("car_user_hal_post_switch_user_req", "[101,102,103]");
+    }
+
+    @Test
+    public void writeCarUserHalGetUserAuthReq() {
+        Object[] objectArray = new Object[] {
+                101, 102, 103, "string", 104
+        };
+        EventLogHelper.writeCarUserHalGetUserAuthReq(objectArray);
+
+        assertLogMessage("car_user_hal_get_user_auth_req", "[101,102,103,string,104]");
+    }
+
+    @Test
+    public void testWriteCarUserHalGetUserAuthResp() {
+        Object[] objectArray = new Object[] {
+                101, 102, 103, "string", 104
+        };
+        EventLogHelper.writeCarUserHalGetUserAuthResp(objectArray);
+
+        assertLogMessage("car_user_hal_get_user_auth_resp", "[101,102,103,string,104]");
+    }
+
+    @Test
+    public void testWriteCarUserHalLegacySwitchUserReq() {
+        EventLogHelper.writeCarUserHalLegacySwitchUserReq(101, 102, 103);
+
+        assertLogMessage("car_user_hal_legacy_switch_user_req", "[101,102,103]");
+    }
+
+    @Test
+    public void testWriteCarUserHalSetUserAuthReq() {
+        Object[] objectArray = new Object[] {
+                101, 102, 103, "string", 104
+        };
+        EventLogHelper.writeCarUserHalSetUserAuthReq(objectArray);
+
+        assertLogMessage("car_user_hal_set_user_auth_req", "[101,102,103,string,104]");
+    }
+
+    @Test
+    public void testWriteCarUserHalSetUserAuthResp() {
+        Object[] objectArray = new Object[] {
+                101, 102, 103, "string", 104
+        };
+        EventLogHelper.writeCarUserHalSetUserAuthResp(objectArray);
+
+        assertLogMessage("car_user_hal_set_user_auth_resp", "[101,102,103,string,104]");
+    }
+
+    @Test
+    public void testWriteCarUserHalOemSwitchUserReq() {
+        EventLogHelper.writeCarUserHalOemSwitchUserReq(101, 102);
+
+        assertLogMessage("car_user_hal_oem_switch_user_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserHalCreateUserReq() {
+        EventLogHelper.writeCarUserHalCreateUserReq(101, "string", 102, 103);
+
+        assertLogMessage("car_user_hal_create_user_req", "[101,string,102,103]");
+    }
+
+    @Test
+    public void testWriteCarUserHalCreateUserResp() {
+        EventLogHelper.writeCarUserHalCreateUserResp(101, 102, 103, "string");
+
+        assertLogMessage("car_user_hal_create_user_resp", "[101,102,103,string]");
+    }
+
+    @Test
+    public void testWriteCarUserHalRemoveUserReq() {
+        EventLogHelper.writeCarUserHalRemoveUserReq(101, 102);
+
+        assertLogMessage("car_user_hal_remove_user_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerAddListener() {
+        EventLogHelper.writeCarUserManagerAddListener(101, "string", true);
+
+        assertLogMessage("car_user_mgr_add_listener", "[101,string,1]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerRemoveListener() {
+        EventLogHelper.writeCarUserManagerRemoveListener(101, "string");
+
+        assertLogMessage("car_user_mgr_remove_listener", "[101,string]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerDisconnected() {
+        EventLogHelper.writeCarUserManagerDisconnected(101);
+
+        assertLogMessage("car_user_mgr_disconnected", "101");
+    }
+
+    @Test
+    public void testWriteCarUserManagerSwitchUserReq() {
+        EventLogHelper.writeCarUserManagerSwitchUserReq(101, 102);
+
+        assertLogMessage("car_user_mgr_switch_user_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerSwitchUserResp() {
+        EventLogHelper.writeCarUserManagerSwitchUserResp(101, 102, "string");
+
+        assertLogMessage("car_user_mgr_switch_user_resp", "[101,102,string]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerLogoutUserReq() {
+        EventLogHelper.writeCarUserManagerLogoutUserReq(42108);
+
+        assertLogMessage("car_user_mgr_logout_user_req", "42108");
+    }
+
+    @Test
+    public void testWriteCarUserManagerLogoutUserResp() {
+        EventLogHelper.writeCarUserManagerLogoutUserResp(42108, 1, "D'OH!");
+
+        assertLogMessage("car_user_mgr_logout_user_resp", "[42108,1,D'OH!]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerGetUserAuthReq() {
+        Object[] objectArray = new Object[] {
+                101, 102, 103, "string", 104
+        };
+        EventLogHelper.writeCarUserManagerGetUserAuthReq(objectArray);
+
+        assertLogMessage("car_user_mgr_get_user_auth_req", "[101,102,103,string,104]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerGetUserAuthResp() {
+        Object[] objectArray = new Object[] {
+                101, 102, 103, "string", 104
+        };
+        EventLogHelper.writeCarUserManagerGetUserAuthResp(objectArray);
+
+        assertLogMessage("car_user_mgr_get_user_auth_resp", "[101,102,103,string,104]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerSetUserAuthReq() {
+        Object[] objectArray = new Object[] {
+                101, 102, 103, "string", 104
+        };
+        EventLogHelper.writeCarUserManagerSetUserAuthReq(objectArray);
+
+        assertLogMessage("car_user_mgr_set_user_auth_req", "[101,102,103,string,104]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerSetUserAuthResp() {
+        Object[] objectArray = new Object[] {
+                101, 102, 103, "string", 104
+        };
+        EventLogHelper.writeCarUserManagerSetUserAuthResp(objectArray);
+
+        assertLogMessage("car_user_mgr_set_user_auth_resp", "[101,102,103,string,104]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerCreateUserReq() {
+        EventLogHelper.writeCarUserManagerCreateUserReq(101, "string1", "string2", 102);
+
+        assertLogMessage("car_user_mgr_create_user_req", "[101,string1,string2,102]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerCreateUserResp() {
+        EventLogHelper.writeCarUserManagerCreateUserResp(101, 102, "string");
+
+        assertLogMessage("car_user_mgr_create_user_resp", "[101,102,string]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerRemoveUserReq() {
+        EventLogHelper.writeCarUserManagerRemoveUserReq(101, 102);
+
+        assertLogMessage("car_user_mgr_remove_user_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerRemoveUserResp() {
+        EventLogHelper.writeCarUserManagerRemoveUserResp(101, 102);
+
+        assertLogMessage("car_user_mgr_remove_user_resp", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerNotifyLifecycleListener() {
+        EventLogHelper.writeCarUserManagerNotifyLifecycleListener(101, 102, 103, 104);
+
+        assertLogMessage("car_user_mgr_notify_lifecycle_listener", "[101,102,103,104]");
+    }
+
+    @Test
+    public void testWriteCarUserManagerPreCreateUserReq() {
+        EventLogHelper.writeCarUserManagerPreCreateUserReq(101);
+
+        assertLogMessage("car_user_mgr_pre_create_user_req", "101");
+    }
+
+    @Test
+    public void testWriteCarDevicePolicyManagerRemoveUserReq() {
+        EventLogHelper.writeCarDevicePolicyManagerRemoveUserReq(101, 102);
+
+        assertLogMessage("car_dp_mgr_remove_user_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarDevicePolicyManagerRemoveUserResp() {
+        EventLogHelper.writeCarDevicePolicyManagerRemoveUserResp(101, 102);
+
+        assertLogMessage("car_dp_mgr_remove_user_resp", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarDevicePolicyManagerCreateUserReq() {
+        EventLogHelper.writeCarDevicePolicyManagerCreateUserReq(101, "string", 102);
+
+        assertLogMessage("car_dp_mgr_create_user_req", "[101,string,102]");
+    }
+
+    @Test
+    public void testWriteCarDevicePolicyManagerCreateUserResp() {
+        EventLogHelper.writeCarDevicePolicyManagerCreateUserResp(101, 102);
+
+        assertLogMessage("car_dp_mgr_create_user_resp", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarDevicePolicyManagerStartUserInBackgroundReq() {
+        EventLogHelper.writeCarDevicePolicyManagerStartUserInBackgroundReq(101, 102);
+
+        assertLogMessage("car_dp_mgr_start_user_in_background_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarDevicePolicyManagerStartUserInBackgroundResp() {
+        EventLogHelper.writeCarDevicePolicyManagerStartUserInBackgroundResp(101, 102);
+
+        assertLogMessage("car_dp_mgr_start_user_in_background_resp", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarDevicePolicyManagerStopUserReq() {
+        EventLogHelper.writeCarDevicePolicyManagerStopUserReq(101, 102);
+
+        assertLogMessage("car_dp_mgr_stop_user_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteCarDevicePolicyManagerStopUserResp() {
+        EventLogHelper.writeCarDevicePolicyManagerStopUserResp(101, 102);
+
+        assertLogMessage("car_dp_mgr_stop_user_resp", "[101,102]");
+    }
+
+    @Test
+    public void testWritePowerPolicyChange() {
+        EventLogHelper.writePowerPolicyChange("string");
+
+        assertLogMessage("car_pwr_mgr_pwr_policy_change", "string");
+    }
+
+    @Test
+    public void testWriteCarPowerManagerStateChange() {
+        EventLogHelper.writeCarPowerManagerStateChange(101);
+
+        assertLogMessage("car_pwr_mgr_state_change", "101");
+    }
+
+    @Test
+    public void testWriteCarPowerManagerStateRequest() {
+        EventLogHelper.writeCarPowerManagerStateRequest(101, 102);
+
+        assertLogMessage("car_pwr_mgr_state_req", "[101,102]");
+    }
+
+    @Test
+    public void testWriteGarageModeEvent() {
+        EventLogHelper.writeGarageModeEvent(101);
+
+        assertLogMessage("car_pwr_mgr_garage_mode", "101");
+    }
+
+    private void assertLogMessage(String event, String values) {
+        assertLogcatMessage(EVENTS, INFO, event, values, TIMEOUT_MS);
+    }
+
+    private void assertLogMessage(String event) {
+        assertLogMessage(event, /* values=*/ "");
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/util/LogcatHelper.java b/tests/tests/car_builtin/src/android/car/cts/builtin/util/LogcatHelper.java
new file mode 100644
index 0000000..4293f20
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/util/LogcatHelper.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.util;
+
+import static org.junit.Assert.fail;
+
+import android.app.UiAutomation;
+import android.car.cts.builtin.util.LogcatHelper.Level;
+import android.os.ParcelFileDescriptor;
+import android.os.SystemClock;
+import android.util.Log;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.io.BufferedReader;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+public final class LogcatHelper {
+
+    private static final String TAG = LogcatHelper.class.getSimpleName();
+
+    private static final boolean VERBOSE = false;
+
+    private static final int DEFAULT_TIMEOUT_MS = 60_000;
+
+    private LogcatHelper() {}
+
+    /**
+     * Logcat buffers to search.
+     */
+    public enum Buffer{
+        EVENTS, MAIN, SYSTEM, ALL;
+    }
+
+    /**
+     * Logcat levels to search.
+     */
+    public enum Level {
+        VERBOSE("V"), DEBUG("D"), INFO("I"), WARN("W"), ERROR("E"), ASSERT("A");
+
+        private String mValue;
+
+        public String getValue() {
+            return mValue;
+        }
+
+        Level(String v) {
+            mValue = v;
+        }
+    }
+
+    /**
+     * Asserts that a message appears on {@code logcat}, using a default timeout.
+     *
+     * @param buffer logcat buffer to search
+     * @param level expected log level
+     * @parma tag expected log tag
+     * @param message substring of the expected message
+     * @param timeout for waiting the message
+     */
+    public static void assertLogcatMessage(Buffer buffer, Level level, String tag, String message) {
+        assertLogcatMessage(buffer, level, tag, message, DEFAULT_TIMEOUT_MS);
+    }
+
+    /**
+     * Asserts that a message appears on {@code logcat}.
+     *
+     * @param buffer logcat buffer to search
+     * @param level expected log level
+     * @parma tag expected log tag
+     * @param message substring of the expected message
+     * @param timeout for waiting the message
+     */
+    public static void assertLogcatMessage(Buffer buffer, Level level, String tag, String message,
+            int timeout) {
+        String match = String.format("%s %s: %s", level.mValue, tag, message);
+        long startTime = SystemClock.elapsedRealtime();
+        UiAutomation automation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        String command = "logcat -b " + buffer.name().toLowerCase();
+        ParcelFileDescriptor output = automation.executeShellCommand(command);
+        Log.d(TAG, "ran '" + command + "'; will now look for '" + match + "'");
+        FileDescriptor fd = output.getFileDescriptor();
+        FileInputStream fileInputStream = new FileInputStream(fd);
+        try (BufferedReader bufferedReader = new BufferedReader(
+                new InputStreamReader(fileInputStream))) {
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                if (VERBOSE) {
+                    Log.v(TAG, "Checking line '" + line + "'");
+                }
+                if (line.contains(match)) {
+                    Log.d(TAG, "Found match on line '" + line + "', returning");
+                    return;
+                }
+                if ((SystemClock.elapsedRealtime() - startTime) > timeout) {
+                    fail("match '" + match + "' was not found, Timeout: " + timeout + " ms");
+                }
+            }
+        } catch (IOException e) {
+            fail("match '" + match + "' was not found, IO exception: " + e);
+        }
+    }
+
+    /**
+     * Asserts that a message DOESN'T appears on {@code logcat}.
+     *
+     * @param buffer is logcat buffer to search
+     * @param level expected log level
+     * @parma tag expected log tag
+     * @param message substring of the message that shouldn't appeard
+     * @param timeout for waiting the message
+     */
+    public static void assertNoLogcatMessage(Buffer buffer, Level level, String tag, String message,
+            int timeout) throws Exception {
+        String match = String.format("%s %s: %s", level.mValue, tag, message);
+        long startTime = SystemClock.elapsedRealtime();
+        UiAutomation automation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        ParcelFileDescriptor output = automation.executeShellCommand("logcat -b all");
+        FileDescriptor fd = output.getFileDescriptor();
+        FileInputStream fileInputStream = new FileInputStream(fd);
+        try (BufferedReader bufferedReader = new BufferedReader(
+                new InputStreamReader(fileInputStream))) {
+            String line;
+            while ((line = bufferedReader.readLine()) != null) {
+                if (line.contains(match)) {
+                    fail("Match was not expected, but found: " + match);
+                }
+                if ((SystemClock.elapsedRealtime() - startTime) > timeout) {
+                    return;
+                }
+            }
+        } catch (IOException e) {
+            fail("match was not found, IO exception: " + e);
+        }
+    }
+
+    /**
+     * Clears all logs.
+     */
+    public static void clearLog() {
+        if (VERBOSE) {
+            Log.d(TAG, "Clearing logcat logs");
+        }
+        SystemUtil.runShellCommand("logcat -b all -c");
+    }
+
+    /**
+     * Sets the log level of the given tag.
+     */
+    public static void setLogLevel(String tag, Level level) {
+        SystemUtil.runShellCommand("setprop log.tag." + tag + " " + level.getValue());
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/util/SlogfTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/util/SlogfTest.java
new file mode 100644
index 0000000..1740eb5
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/util/SlogfTest.java
@@ -0,0 +1,437 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.util;
+
+import static android.car.cts.builtin.util.LogcatHelper.Level.ASSERT;
+import static android.car.cts.builtin.util.LogcatHelper.Level.DEBUG;
+import static android.car.cts.builtin.util.LogcatHelper.Level.ERROR;
+import static android.car.cts.builtin.util.LogcatHelper.Level.INFO;
+import static android.car.cts.builtin.util.LogcatHelper.Level.VERBOSE;
+import static android.car.cts.builtin.util.LogcatHelper.Level.WARN;
+import static android.car.cts.builtin.util.LogcatHelper.clearLog;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.builtin.util.Slogf;
+import android.car.cts.builtin.util.LogcatHelper.Level;
+import android.util.Log;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public final class SlogfTest {
+    private static final String TAG = SlogfTest.class.getSimpleName();
+
+    private static final int TIMEOUT_MS = 10_000;
+    // All Slogf would be logged to system buffer.
+    private static final LogcatHelper.Buffer BUFFER = LogcatHelper.Buffer.SYSTEM;
+    // wait time for waiting to make sure msg is not logged. Should not be a high value as tests
+    // waits for this much time.
+    private static final int NOT_LOGGED_WAIT_TIME_MS = 5_000;
+    private static final String LOGCAT_LINE_FORMAT = "%s %s: %s";
+
+    private static final String LOGGED_MSG = "This message should exist in logcat.";
+    private static final String NOT_LOGGED_MSG = "This message should not exist in logcat.";
+    private static final String FORMATTED_MSG = "This message is a format with two args %s and %s.";
+    private static final String EXCEPTION_MSG = "This message should exist in logcat.";
+
+    @Before
+    public void setup() {
+        setLogLevel(VERBOSE);
+        clearLog();
+    }
+
+    @After
+    public void reset() {
+        setLogLevel(VERBOSE);
+        clearLog();
+    }
+
+    @Test
+    public void testV_msg1() {
+        Slogf.v(TAG, LOGGED_MSG);
+
+        assertLogcatMessage(VERBOSE, LOGGED_MSG);
+    }
+
+    @Test
+    public void testV_msg2() throws Exception {
+        Throwable throwable = new Throwable(EXCEPTION_MSG);
+
+        Slogf.v(TAG, LOGGED_MSG, throwable);
+
+        assertLogcatMessage(VERBOSE, LOGGED_MSG);
+        assertLogcatMessage(VERBOSE, "java.lang.Throwable: " + EXCEPTION_MSG);
+        assertLogcatStackTrace(VERBOSE, throwable);
+
+    }
+
+    @Test
+    public void testV_msg3() {
+        Slogf.v(TAG, FORMATTED_MSG, "input1", "input2");
+
+        assertLogcatMessage(VERBOSE, FORMATTED_MSG, "input1", "input2");
+    }
+
+    @Test
+    public void testV_noMsg1() throws Exception {
+        setLogLevel(ERROR);
+
+        Slogf.v(TAG, NOT_LOGGED_MSG);
+
+        assertNoLogcatMessage(VERBOSE, NOT_LOGGED_MSG);
+    }
+
+    @Test
+    public void testV_noMsg2() throws Exception {
+        setLogLevel(ERROR);
+
+        Slogf.v(TAG, FORMATTED_MSG, "input1", "input2");
+
+        assertNoLogcatMessage(VERBOSE, FORMATTED_MSG, "input1", "input2");
+    }
+
+    @Test
+    public void testD_msg1() {
+        Slogf.d(TAG, LOGGED_MSG);
+
+        assertLogcatMessage(DEBUG, LOGGED_MSG);
+    }
+
+    @Test
+    public void testD_msg2() {
+        Throwable throwable = new Throwable(EXCEPTION_MSG);
+        Slogf.d(TAG, LOGGED_MSG, throwable);
+
+        assertLogcatMessage(DEBUG, LOGGED_MSG);
+        assertLogcatMessage(DEBUG, "java.lang.Throwable: " + EXCEPTION_MSG);
+        assertLogcatStackTrace(DEBUG, throwable);
+    }
+
+    @Test
+    public void testD_msg3() {
+        Slogf.d(TAG, FORMATTED_MSG, "input1", "input2");
+
+        assertLogcatMessage(DEBUG, FORMATTED_MSG, "input1", "input2");
+    }
+
+    @Test
+    public void testD_noMsg1() throws Exception {
+        setLogLevel(ERROR);
+
+        Slogf.d(TAG, NOT_LOGGED_MSG);
+
+        assertNoLogcatMessage(DEBUG, NOT_LOGGED_MSG);
+    }
+
+    @Test
+    public void testD_noMsg2() throws Exception {
+        setLogLevel(ERROR);
+
+        Slogf.d(TAG, FORMATTED_MSG, "input1", "input2");
+
+        assertNoLogcatMessage(DEBUG, FORMATTED_MSG, "input1", "input2");
+    }
+
+    @Test
+    public void testI_msg1() {
+        Slogf.i(TAG, LOGGED_MSG);
+
+        assertLogcatMessage(INFO, LOGGED_MSG);
+    }
+
+    @Test
+    public void testI_msg2() throws Exception {
+        Throwable throwable = new Throwable(EXCEPTION_MSG);
+
+        Slogf.i(TAG, LOGGED_MSG, throwable);
+
+        assertLogcatMessage(INFO, LOGGED_MSG);
+        assertLogcatMessage(INFO, "java.lang.Throwable: " + EXCEPTION_MSG);
+        assertLogcatStackTrace(INFO, throwable);
+
+    }
+
+    @Test
+    public void testI_msg3() {
+        Slogf.i(TAG, FORMATTED_MSG, "input1", "input2");
+
+        assertLogcatMessage(INFO, FORMATTED_MSG, "input1", "input2");
+    }
+
+    @Test
+    public void testI_noMsg1() throws Exception {
+        setLogLevel(ERROR);
+
+        Slogf.i(TAG, NOT_LOGGED_MSG);
+
+        assertNoLogcatMessage(INFO, NOT_LOGGED_MSG);
+    }
+
+    @Test
+    public void testI_noMsg2() throws Exception {
+        setLogLevel(ERROR);
+
+        Slogf.i(TAG, FORMATTED_MSG, "input1", "input2");
+
+        assertNoLogcatMessage(INFO, FORMATTED_MSG, "input1", "input2");
+    }
+
+    @Test
+    public void testW_msg1() {
+        Slogf.w(TAG, LOGGED_MSG);
+
+        assertLogcatMessage(WARN, LOGGED_MSG);
+    }
+
+    @Test
+    public void testW_msg2() throws Exception {
+        Throwable throwable = new Throwable(EXCEPTION_MSG);
+
+        Slogf.w(TAG, LOGGED_MSG, throwable);
+
+        assertLogcatMessage(WARN, LOGGED_MSG);
+        assertLogcatMessage(WARN, "java.lang.Throwable: " + EXCEPTION_MSG);
+        assertLogcatStackTrace(WARN, throwable);
+
+    }
+
+    @Test
+    public void testW_msg3() {
+        Slogf.w(TAG, FORMATTED_MSG, "input1", "input2");
+
+        assertLogcatMessage(WARN, FORMATTED_MSG, "input1", "input2");
+    }
+
+    @Test
+    public void testW_msg4() throws Exception {
+        Throwable throwable = new Throwable(EXCEPTION_MSG);
+
+        Slogf.w(TAG, throwable);
+
+        assertLogcatMessage(WARN, "java.lang.Throwable: " + EXCEPTION_MSG);
+        assertLogcatStackTrace(WARN, throwable);
+    }
+
+    @Test
+    public void testW_msg5() {
+        Exception exception = new Exception(EXCEPTION_MSG);
+
+        Slogf.w(TAG, exception, FORMATTED_MSG, "input1", "input2");
+
+        assertLogcatMessage(WARN, FORMATTED_MSG, "input1", "input2");
+        assertLogcatMessage(WARN, "java.lang.Exception: " + EXCEPTION_MSG);
+        assertLogcatStackTrace(WARN, exception);
+    }
+
+    @Test
+    public void testW_noMsg1() throws Exception {
+        setLogLevel(ERROR);
+
+        Slogf.w(TAG, NOT_LOGGED_MSG);
+
+        assertNoLogcatMessage(WARN, NOT_LOGGED_MSG);
+    }
+
+    @Test
+    public void testW_noMsg2() throws Exception {
+        setLogLevel(ERROR);
+
+        Slogf.w(TAG, FORMATTED_MSG, "input1", "input2");
+
+        assertNoLogcatMessage(WARN, FORMATTED_MSG, "input1", "input2");
+    }
+
+    @Test
+    public void testE_msg1() {
+        Slogf.e(TAG, LOGGED_MSG);
+
+        assertLogcatMessage(ERROR, LOGGED_MSG);
+    }
+
+    @Test
+    public void testE_msg2() throws Exception {
+        Throwable throwable = new Throwable(EXCEPTION_MSG);
+
+        Slogf.e(TAG, LOGGED_MSG, throwable);
+
+        assertLogcatMessage(ERROR, LOGGED_MSG);
+        assertLogcatMessage(ERROR, "java.lang.Throwable: " + EXCEPTION_MSG);
+        assertLogcatStackTrace(ERROR, throwable);
+
+    }
+
+    @Test
+    public void testE_msg3() {
+        Slogf.e(TAG, FORMATTED_MSG, "input1", "input2");
+
+        assertLogcatMessage(ERROR, FORMATTED_MSG, "input1", "input2");
+    }
+
+    @Test
+    public void testE_msg4() {
+        Exception exception = new Exception(EXCEPTION_MSG);
+
+        Slogf.e(TAG, exception, FORMATTED_MSG, "input1", "input2");
+
+        assertLogcatMessage(ERROR, FORMATTED_MSG, "input1", "input2");
+        assertLogcatMessage(ERROR, "java.lang.Exception: " + EXCEPTION_MSG);
+        assertLogcatStackTrace(ERROR, exception);
+    }
+
+    @Test
+    public void testE_noMsg1() throws Exception {
+        setLogLevel(ASSERT);
+
+        Slogf.e(TAG, NOT_LOGGED_MSG);
+
+        assertNoLogcatMessage(ERROR, NOT_LOGGED_MSG);
+    }
+
+    @Test
+    public void testE_noMsg2() throws Exception {
+        setLogLevel(ASSERT);
+
+        Slogf.e(TAG, FORMATTED_MSG, "input1", "input2");
+
+        assertNoLogcatMessage(ERROR, FORMATTED_MSG, "input1", "input2");
+    }
+
+    @Test
+    public void testWTF_msg1() {
+        Slogf.wtf(TAG, LOGGED_MSG);
+
+        // WTF is logged as ERROR
+        assertLogcatMessage(ERROR, LOGGED_MSG);
+    }
+
+    @Test
+    public void testWTF_msg2() throws Exception {
+        Throwable throwable = new Throwable(EXCEPTION_MSG);
+
+        Slogf.wtf(TAG, LOGGED_MSG, throwable);
+
+        // WTF is logged as ERROR
+        assertLogcatMessage(ERROR, LOGGED_MSG);
+        assertLogcatMessage(ERROR, "java.lang.Throwable: " + EXCEPTION_MSG);
+        assertLogcatStackTrace(ERROR, throwable);
+
+    }
+
+    @Test
+    public void testWTF_msg3() {
+        Slogf.wtf(TAG, FORMATTED_MSG, "input1", "input2");
+
+        // WTF is logged as ERROR
+        assertLogcatMessage(ERROR, FORMATTED_MSG, "input1", "input2");
+    }
+
+    @Test
+    public void testWTF_msg4() throws Exception {
+        Throwable throwable = new Throwable(EXCEPTION_MSG);
+
+        Slogf.wtf(TAG, throwable);
+
+        // WTF is logged as ERROR
+        assertLogcatMessage(ERROR, "java.lang.Throwable: " + EXCEPTION_MSG);
+        assertLogcatStackTrace(ERROR, throwable);
+    }
+
+    @Test
+    public void testWTF_msg5() {
+        Exception exception = new Exception(EXCEPTION_MSG);
+
+        Slogf.wtf(TAG, exception, FORMATTED_MSG, "input1", "input2");
+
+        // WTF is logged as ERROR
+        assertLogcatMessage(ERROR, FORMATTED_MSG, "input1", "input2");
+        assertLogcatMessage(ERROR, "java.lang.Exception: " + EXCEPTION_MSG);
+        assertLogcatStackTrace(ERROR, exception);
+    }
+
+    @Test
+    public void testIsLoggableTrue() throws Exception {
+        setLogLevel(VERBOSE);
+
+        assertThat(Slogf.isLoggable(TAG, Log.VERBOSE)).isTrue();
+    }
+
+    @Test
+    public void testIsLoggableFalse() throws Exception {
+        setLogLevel(ERROR);
+        setCarTestTagLogLevel(ASSERT);
+
+        assertThat(Slogf.isLoggable(TAG, Log.VERBOSE)).isFalse();
+    }
+
+    @Test
+    public void testIsLoggableFalse_withCarTestTagEnabled() throws Exception {
+        setLogLevel(ERROR);
+        setCarTestTagLogLevel(VERBOSE);
+
+        assertThat(Slogf.isLoggable(TAG, Log.VERBOSE)).isTrue();
+    }
+
+    @Test
+    public void testSlogfIsfLoggableWorksSameAsLogIsLoggable() throws Exception {
+        setLogLevel(INFO);
+        // Emulate the tag as if it's not in the car tests.
+        setCarTestTagLogLevel(ASSERT);
+
+        assertThat(Log.isLoggable(TAG, Log.DEBUG)).isFalse();
+        assertThat(Slogf.isLoggable(TAG, Log.DEBUG)).isFalse();
+
+        assertThat(Log.isLoggable(TAG, Log.INFO)).isTrue();
+        assertThat(Slogf.isLoggable(TAG, Log.INFO)).isTrue();
+    }
+
+    @Test
+    public void testSlogfIsfLoggableEnabledInCarTests() throws Exception {
+        setLogLevel(INFO);
+
+        assertThat(Log.isLoggable(TAG, Log.DEBUG)).isFalse();
+        assertThat(Slogf.isLoggable(TAG, Log.DEBUG)).isTrue();
+    }
+
+    private void setLogLevel(Level level) {
+        LogcatHelper.setLogLevel(TAG, level);
+    }
+
+    private void setCarTestTagLogLevel(Level level) {
+        // CAR.TEST Comes from Slogf.CAR_TEST_TAG;
+        LogcatHelper.setLogLevel("CAR.TEST", level);
+    }
+
+    private void assertNoLogcatMessage(Level level, String format, Object... args)
+            throws Exception {
+        String message = String.format(format, args);
+        LogcatHelper.assertNoLogcatMessage(BUFFER, level, TAG, message, NOT_LOGGED_WAIT_TIME_MS);
+    }
+
+    private void assertLogcatMessage(Level level, String format, Object... args) {
+        String message = String.format(format, args);
+        LogcatHelper.assertLogcatMessage(BUFFER, level, TAG, message, TIMEOUT_MS);
+    }
+
+    private void assertLogcatStackTrace(Level level, Throwable throwable) {
+        StackTraceElement[] elements = throwable.getStackTrace();
+        for (int i = 0; i < elements.length; i++) {
+            assertLogcatMessage(level, "\tat " + elements[i]);
+        }
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/util/TimeUtilsTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/util/TimeUtilsTest.java
new file mode 100644
index 0000000..099b5ad
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/util/TimeUtilsTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.util;
+
+import static android.car.cts.builtin.util.LogcatHelper.Buffer.MAIN;
+import static android.car.cts.builtin.util.LogcatHelper.Level.INFO;
+import static android.car.cts.builtin.util.LogcatHelper.assertLogcatMessage;
+import static android.car.cts.builtin.util.LogcatHelper.clearLog;
+
+import android.car.builtin.util.TimeUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.PrintWriter;
+
+public final class TimeUtilsTest {
+
+    private final PrintWriter mWriter = new PrintWriter(System.out);
+
+    @Before
+    public void clearLogcat() {
+        clearLog();
+    }
+
+    @Test
+    public void testDumpTime() {
+        TimeUtils.dumpTime(mWriter, 179);
+        mWriter.flush();
+
+        // Time utils change long into date-time format.
+        assertLogMessage("1970-01-01 00:00:00.179");
+    }
+
+    @Test
+    public void testFormatDuration() {
+        TimeUtils.formatDuration(789, mWriter);
+        mWriter.flush();
+
+        // Time utils change long into human readable text.
+        assertLogMessage("+789ms");
+    }
+
+    private void assertLogMessage(String message) {
+        assertLogcatMessage(MAIN, INFO, "System.out", message);
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/util/TimingsTraceLogTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/util/TimingsTraceLogTest.java
new file mode 100644
index 0000000..eafef35
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/util/TimingsTraceLogTest.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.util;
+
+import static android.car.cts.builtin.util.LogcatHelper.Buffer.SYSTEM;
+import static android.car.cts.builtin.util.LogcatHelper.Level.VERBOSE;
+import static android.car.cts.builtin.util.LogcatHelper.assertLogcatMessage;
+import static android.car.cts.builtin.util.LogcatHelper.clearLog;
+
+import android.car.builtin.os.TraceHelper;
+import android.car.builtin.util.TimingsTraceLog;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public final class TimingsTraceLogTest {
+
+    private static final String TAG = TimingsTraceLogTest.class.getSimpleName();
+
+    @Before
+    public void clearLogcat() {
+        clearLog();
+    }
+
+    @Test
+    public void testTimingsTraceLog() {
+        TimingsTraceLog timingsTraceLog =
+                new TimingsTraceLog(TAG, TraceHelper.TRACE_TAG_CAR_SERVICE);
+        timingsTraceLog.traceBegin("testTimingsTraceLog");
+        timingsTraceLog.traceEnd();
+
+        assertLogMessage("testTimingsTraceLog took to complete");
+    }
+
+    @Test
+    public void testTimingsTraceLogDuration() {
+        TimingsTraceLog timingsTraceLog =
+                new TimingsTraceLog(TAG, TraceHelper.TRACE_TAG_CAR_SERVICE);
+        timingsTraceLog.logDuration("testTimingsTraceLogDuration", 159);
+
+        assertLogMessage("testTimingsTraceLogDuration took to complete: 159ms");
+    }
+
+    private void assertLogMessage(String message) {
+        assertLogcatMessage(SYSTEM, VERBOSE, TAG, message);
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/util/ValidationHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/util/ValidationHelperTest.java
new file mode 100644
index 0000000..7fb1da3
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/util/ValidationHelperTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.util;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.car.builtin.util.ValidationHelper;
+import android.os.Process;
+import android.os.UserHandle;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class ValidationHelperTest {
+    // constants from android.os.UserHandle
+    private static final int USER_NULL = -10000;
+    private static final int USER_CURRENT_OR_SELF = -3;
+    private static final int USER_CURRENT = -2;
+    private static final int USER_ALL = -1;
+    private static final int USER_SYSTEM = 0;
+    private static final int PER_USER_RANGE = 100000;
+
+    @Test
+    public void testUserIdValidation() {
+        // setup
+        int maxUserId = Integer.MAX_VALUE / PER_USER_RANGE;
+        int invalidUserId = maxUserId + 1;
+
+        // assert pre-defined user ids
+        assertTrue(ValidationHelper.isUserIdValid(USER_NULL));
+        assertTrue(ValidationHelper.isUserIdValid(USER_CURRENT_OR_SELF));
+        assertTrue(ValidationHelper.isUserIdValid(USER_CURRENT));
+        assertTrue(ValidationHelper.isUserIdValid(USER_ALL));
+        assertTrue(ValidationHelper.isUserIdValid(USER_SYSTEM));
+        assertTrue(ValidationHelper.isUserIdValid(maxUserId));
+
+        // assert dynamical user ids
+        assertTrue(ValidationHelper.isUserIdValid(UserHandle.myUserId()));
+
+        // assert boundary conditions
+        assertFalse(ValidationHelper.isUserIdValid(invalidUserId));
+    }
+
+    @Test
+    public void testAppIdValidation() {
+        // setup
+        int outOfRangeAppId = PER_USER_RANGE + 1;
+
+        // assert pre-defined app ids
+        assertTrue(ValidationHelper.isAppIdValid(Process.FIRST_APPLICATION_UID));
+        assertTrue(ValidationHelper.isAppIdValid(Process.LAST_APPLICATION_UID));
+        assertTrue(ValidationHelper.isAppIdValid(Process.ROOT_UID));
+        assertTrue(ValidationHelper.isAppIdValid(Process.SYSTEM_UID));
+        assertTrue(ValidationHelper.isAppIdValid(Process.SHELL_UID));
+
+        // assert dynamical app ids
+        assertTrue(ValidationHelper.isAppIdValid(Process.myUid() % PER_USER_RANGE));
+        assertTrue(ValidationHelper.isAppIdValid(Process.FIRST_APPLICATION_UID + 1));
+        assertTrue(ValidationHelper.isAppIdValid(Process.LAST_APPLICATION_UID - 1));
+
+        // assert boundary conditions
+        assertFalse(ValidationHelper.isAppIdValid(Process.INVALID_UID));
+        assertFalse(ValidationHelper.isAppIdValid(outOfRangeAppId));
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/view/DisplayHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/view/DisplayHelperTest.java
new file mode 100644
index 0000000..5ac7527
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/view/DisplayHelperTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2021 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 android.car.cts.builtin.view;
+
+import static android.car.cts.builtin.app.DisplayUtils.VirtualDisplaySession;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.car.builtin.view.DisplayHelper;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.hardware.display.DisplayManager;
+import android.util.Log;
+import android.view.Display;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+
+@RunWith(AndroidJUnit4.class)
+public final class DisplayHelperTest {
+
+    private static final String TAG = DisplayHelperTest.class.getSimpleName();
+
+    // the constant comes from com.android.server.display.LocalDisplayAdapter.UNIQUE_ID_PREFIX
+    private static final String DISPLAY_ID_PREFIX_LOCAL = "local:";
+    // the constant comes from com.android.server.display.VirtualDisplayAdapter.UNIQUE_ID_PREFIX
+    private static final String DISPLAY_ID_PREFIX_VIRTUAL = "virtual:";
+
+    private final Context mContext = InstrumentationRegistry.getInstrumentation().getContext();
+
+    @Test
+    public void testLocalDisplayPhysicalPort() throws Exception {
+        // setup
+        ArrayList<Display> allLocalDisplays = getAllLocalDisplays();
+
+        // assert that there is at least one local display
+        assertThat(allLocalDisplays.size()).isGreaterThan(0);
+
+        // execution and assertion
+        for (Display d : allLocalDisplays) {
+            int physicalPort = DisplayHelper.getPhysicalPort(d);
+            Log.d(TAG, "Display Physical Port: " + physicalPort);
+            assertThat(physicalPort).isNotEqualTo(DisplayHelper.INVALID_PORT);
+
+            String uniqueId = DisplayHelper.getUniqueId(d);
+            assertThat(physicalPort).isEqualTo(getPhysicalPortFromId(uniqueId));
+        }
+    }
+
+    @Test
+    public void testVirtualDisplayPhysicalPort() throws Exception {
+        // check the assumption
+        String requiredFeature = PackageManager.FEATURE_ACTIVITIES_ON_SECONDARY_DISPLAYS;
+        assumeTrue(mContext.getPackageManager().hasSystemFeature(requiredFeature));
+
+        try (VirtualDisplaySession session = new VirtualDisplaySession()) {
+            Display vDisplay =
+                    session.createDisplayWithDefaultDisplayMetricsAndWait(mContext, true);
+            assertThat(DisplayHelper.getPhysicalPort(vDisplay))
+                    .isEqualTo(DisplayHelper.INVALID_PORT);
+        }
+    }
+
+    private ArrayList<Display> getAllLocalDisplays() {
+        DisplayManager displayManager = mContext.getSystemService(DisplayManager.class);
+        Display[] allDisplays = displayManager.getDisplays();
+
+        ArrayList<Display> localDisplays = new ArrayList<>();
+        for (Display d : allDisplays) {
+            if (isDisplayLocal(d)) {
+                localDisplays.add(d);
+            }
+        }
+
+        return localDisplays;
+    }
+
+    private boolean isDisplayLocal(Display display) {
+        String uniqueId = DisplayHelper.getUniqueId(display);
+        return uniqueId.startsWith(DISPLAY_ID_PREFIX_LOCAL);
+    }
+
+    private int getPhysicalPortFromId(String displayUniqueId) throws Exception {
+        if (displayUniqueId == null) {
+            throw new IllegalArgumentException("null displayId string");
+        }
+
+        int startIndex = DISPLAY_ID_PREFIX_LOCAL.length();
+        long physicalDisplayId = Long.parseLong(displayUniqueId.substring(startIndex));
+        return (int) (physicalDisplayId & 0xFF);
+    }
+}
diff --git a/tests/tests/car_builtin/src/android/car/cts/builtin/window/DisplayAreaOrganizerHelperTest.java b/tests/tests/car_builtin/src/android/car/cts/builtin/window/DisplayAreaOrganizerHelperTest.java
new file mode 100644
index 0000000..668b56d
--- /dev/null
+++ b/tests/tests/car_builtin/src/android/car/cts/builtin/window/DisplayAreaOrganizerHelperTest.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2022 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 android.car.cts.builtin.window;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.car.builtin.window.DisplayAreaOrganizerHelper;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public final class DisplayAreaOrganizerHelperTest {
+
+    // the constant value comes from android.window.DisplayAreaOrganizer.FEATURE_UNDEFINED
+    private static final int EXPECTED_FEATURE_UNDEFINED = -1;
+
+    @Test
+    public void testFeatureUndefinedValue() throws Exception {
+        assertThat(DisplayAreaOrganizerHelper.FEATURE_UNDEFINED)
+                .isEqualTo(EXPECTED_FEATURE_UNDEFINED);
+    }
+}
diff --git a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
index 1058fe4..e4fbee6 100644
--- a/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
+++ b/tests/tests/carrierapi/src/android/carrierapi/cts/CarrierApiTest.java
@@ -742,11 +742,21 @@
         assertThat(mTelephonyManager.iccCloseLogicalChannel(response.getChannel())).isTrue();
 
         // Close opened channel twice.
-        assertThat(mTelephonyManager.iccCloseLogicalChannel(response.getChannel())).isFalse();
+        try {
+            boolean result = mTelephonyManager.iccCloseLogicalChannel(response.getChannel());
+            assertThat(result).isFalse();
+        } catch (IllegalArgumentException ex) {
+            //IllegalArgumentException is expected sometimes because of different behaviour of modem
+        }
 
         // Channel 0 is guaranteed to be always available and cannot be closed, per TS 102 221
         // Section 11.1.17
-        assertThat(mTelephonyManager.iccCloseLogicalChannel(0)).isFalse();
+        try {
+            mTelephonyManager.iccCloseLogicalChannel(0);
+            fail("Expected IllegalArgumentException");
+        } catch (IllegalArgumentException ex) {
+            // IllegalArgumentException is expected
+        }
     }
 
     /**
diff --git a/tests/tests/carrierapi/src/android/carrierapi/cts/NetworkScanApiTest.java b/tests/tests/carrierapi/src/android/carrierapi/cts/NetworkScanApiTest.java
index d13c2b7..36c1217 100644
--- a/tests/tests/carrierapi/src/android/carrierapi/cts/NetworkScanApiTest.java
+++ b/tests/tests/carrierapi/src/android/carrierapi/cts/NetworkScanApiTest.java
@@ -218,11 +218,11 @@
                                                 .adoptShellPermissionIdentity();
                                     }
                                     try {
-                                        mNetworkScan =
-                                                mTelephonyManager.requestNetworkScan(
-                                                        true, mNetworkScanRequest,
-                                                        AsyncTask.SERIAL_EXECUTOR,
-                                                        mNetworkScanCallback);
+                                        mNetworkScan = mTelephonyManager.requestNetworkScan(
+                                                TelephonyManager.INCLUDE_LOCATION_DATA_NONE,
+                                                mNetworkScanRequest,
+                                                AsyncTask.SERIAL_EXECUTOR,
+                                                mNetworkScanCallback);
                                         if (mNetworkScan == null) {
                                             mNetworkScanStatus = EVENT_SCAN_DENIED;
                                             setReady(true);
diff --git a/tests/tests/companion/Android.bp b/tests/tests/companion/Android.bp
new file mode 100644
index 0000000..6d465ce
--- /dev/null
+++ b/tests/tests/companion/Android.bp
@@ -0,0 +1,143 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_library {
+    name: "cts-companion-common",
+    srcs: [
+        "common/src/**/*.kt",
+    ],
+    manifest: "common/AndroidManifest.xml",
+
+    platform_apis: true,
+    static_libs: [
+        "androidx.test.ext.junit",
+        "compatibility-device-util-axt",
+        "ctstestrunner-axt",
+        "junit",
+        "kotlin-test",
+    ],
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+
+    // TODO(b/211264986) Change both SDK versions to T (33) once it's formally defined.
+    min_sdk_version: "current",
+    target_sdk_version: "current",
+}
+
+android_test {
+    name: "CtsCompanionDeviceManagerCoreTestCases",
+    srcs: [
+        "core/src/**/*.kt",
+    ],
+    manifest: "core/AndroidManifest.xml",
+    test_config: "core/AndroidTest.xml",
+
+    platform_apis: true,
+    static_libs: [
+        "androidx.test.ext.junit",
+        "compatibility-device-util-axt",
+        "cts-companion-common",
+        "ctstestrunner-axt",
+        "junit",
+        "kotlin-test",
+    ],
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+
+    defaults: ["cts_defaults"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+
+    // TODO(b/211264986) Change both SDK versions to T (33) once it's formally defined.
+    min_sdk_version: "current",
+    target_sdk_version: "current",
+}
+
+android_test {
+    name: "CtsCompanionDeviceManagerNoCompanionServicesTestCases",
+    srcs: [
+        "noservices/src/**/*.kt",
+    ],
+    manifest: "noservices/AndroidManifest.xml",
+    test_config: "noservices/AndroidTest.xml",
+
+    platform_apis: true,
+    static_libs: [
+        "androidx.test.ext.junit",
+        "cts-companion-common",
+        "junit",
+        "kotlin-test",
+    ],
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+
+    defaults: ["cts_defaults"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+
+    // TODO(b/211264986) Change both SDK versions to T (33) once it's formally defined.
+    min_sdk_version: "current",
+    target_sdk_version: "current",
+}
+
+android_test {
+    name: "CtsCompanionDeviceManagerUiAutomationTestCases",
+    srcs: [
+        "uiautomation/src/**/*.kt",
+    ],
+    manifest: "uiautomation/AndroidManifest.xml",
+    test_config: "uiautomation/AndroidTest.xml",
+
+    platform_apis: true,
+    static_libs: [
+        "androidx.test.ext.junit",
+        "androidx.test.uiautomator",
+        "compatibility-device-util-axt",
+        "cts-companion-common",
+        "ctstestrunner-axt",
+        "junit",
+        "kotlin-test",
+    ],
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+
+    defaults: ["cts_defaults"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+
+    // TODO(b/211264986) Change both SDK versions to T (33) once it's formally defined.
+    min_sdk_version: "current",
+    target_sdk_version: "current",
+}
diff --git a/tests/tests/companion/OWNERS b/tests/tests/companion/OWNERS
new file mode 100644
index 0000000..23e30ab
--- /dev/null
+++ b/tests/tests/companion/OWNERS
@@ -0,0 +1,5 @@
+# Bug component: 708992
+evanxinchen@google.com
+ewol@google.com
+guojing@google.com
+sergeynv@google.com
diff --git a/tests/tests/companion/README.md b/tests/tests/companion/README.md
new file mode 100644
index 0000000..560f8f7
--- /dev/null
+++ b/tests/tests/companion/README.md
@@ -0,0 +1,14 @@
+CTS tests for `CompanionDeviceManager` are split into 2 modules:
+`CtsCompanionDeviceManagerCoreTestCases` (a.k.a. "Core Tests") and
+`CtsCompanionDeviceManagerUiAutomationTestCases` (a.k.a. "UiAutomation Tests").
+
+The core difference between the two test modules is that `CtsCompanionDeviceManager_Core_TestCases`
+does NOT use `UiAutomation` which makes it:
+- faster
+- suitable for to run on NFFs
+- less prone to flakiness
+- better suitable to run in `PRESUBMIT`.
+
+`CtsCompanionDeviceManager_UiAutomation_TestCases`, on the other hand, uses `UiAutomation` in order
+to test CDM flows end-to-end and is (at least for now) designed to run only on the mobile
+form-factor and requires a discoverable BT device nearby.
diff --git a/tests/tests/companion/common/AndroidManifest.xml b/tests/tests/companion/common/AndroidManifest.xml
new file mode 100644
index 0000000..febd8a0
--- /dev/null
+++ b/tests/tests/companion/common/AndroidManifest.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2016 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.companion.cts.common">
+
+    <uses-feature android:name="android.software.companion_device_setup" />
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+
+        <service
+                android:name=".PrimaryCompanionService"
+                android:exported="true"
+                android:label="Primary Companion Service"
+                android:permission="android.permission.BIND_COMPANION_DEVICE_SERVICE">
+            <intent-filter>
+                <action android:name="android.companion.CompanionDeviceService" />
+            </intent-filter>
+
+            <property android:name="android.companion.PROPERTY_PRIMARY_COMPANION_DEVICE_SERVICE"
+                      android:value="true" />
+        </service>
+
+        <service
+                android:name=".SecondaryCompanionService"
+                android:exported="true"
+                android:label="Secondary Companion Service"
+                android:permission="android.permission.BIND_COMPANION_DEVICE_SERVICE">
+            <intent-filter>
+                <action android:name="android.companion.CompanionDeviceService" />
+            </intent-filter>
+        </service>
+
+        <!-- Service does not require BIND_COMPANION_DEVICE_SERVICE -->
+        <service
+                android:name=".MissingPermissionCompanionService"
+                android:exported="true"
+                android:label="Secondary Companion Service">
+            <intent-filter>
+                <action android:name="android.companion.CompanionDeviceService" />
+            </intent-filter>
+        </service>
+
+        <!--
+        Service does not declare an intent-filter for "android.companion.CompanionDeviceService"
+        action
+        -->
+        <service
+                android:name=".MissingIntentFilterActionCompanionService"
+                android:exported="true"
+                android:label="Primary Companion Service"
+                android:permission="android.permission.BIND_COMPANION_DEVICE_SERVICE"/>
+
+        <activity
+                android:name=".CompanionActivity"
+                android:exported="false"
+                android:label="Companion Activity"
+                android:launchMode="singleInstance"
+                android:excludeFromRecents="true"/>
+    </application>
+
+</manifest>
+
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/AppHelper.kt b/tests/tests/companion/common/src/android/companion/cts/common/AppHelper.kt
new file mode 100644
index 0000000..31fe4d6
--- /dev/null
+++ b/tests/tests/companion/common/src/android/companion/cts/common/AppHelper.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.common
+
+import android.app.Instrumentation
+import android.net.MacAddress
+import java.lang.UnsupportedOperationException
+
+/** Utility class for interacting with applications via Shell */
+class AppHelper(
+    private val instrumentation: Instrumentation,
+    val userId: Int,
+    val packageName: String,
+    private val apkPath: String? = null
+) {
+    fun associate(macAddress: MacAddress) =
+            runShellCommand("cmd companiondevice associate $userId $packageName $macAddress")
+
+    fun disassociate(macAddress: MacAddress) =
+            runShellCommand("cmd companiondevice disassociate $userId $packageName $macAddress")
+
+    fun isInstalled(): Boolean =
+            runShellCommand("pm list packages --user $userId $packageName").isNotBlank()
+
+    fun install() = apkPath?.let { runShellCommand("pm install --user $userId $apkPath") }
+            ?: throw UnsupportedOperationException("APK path is not provided.")
+
+    fun uninstall() = runShellCommand("pm uninstall --user $userId $packageName")
+
+    fun clearData() = runShellCommand("pm clear --user $userId $packageName")
+
+    fun addToHoldersOfRole(role: String) =
+            runShellCommand("cmd role add-role-holder --user $userId $role $packageName")
+
+    fun removeFromHoldersOfRole(role: String) =
+            runShellCommand("cmd role remove-role-holder --user $userId $role $packageName")
+
+    fun withRole(role: String, block: () -> Unit) {
+        addToHoldersOfRole(role)
+        try {
+            block()
+        } finally {
+            removeFromHoldersOfRole(role)
+        }
+    }
+
+    private fun runShellCommand(cmd: String) = instrumentation.runShellCommand(cmd)
+}
\ No newline at end of file
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/CompanionActivity.kt b/tests/tests/companion/common/src/android/companion/cts/common/CompanionActivity.kt
new file mode 100644
index 0000000..833e718
--- /dev/null
+++ b/tests/tests/companion/common/src/android/companion/cts/common/CompanionActivity.kt
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.common
+
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.content.Intent.FLAG_ACTIVITY_NEW_TASK
+import android.content.IntentSender
+import android.os.Bundle
+import android.util.Log
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * An [Activity] for launching confirmation UI via an [android.content.IntentSender.sendIntent] and
+ * receiving result in [onActivityResult].
+ */
+class CompanionActivity : Activity() {
+    private var result: Pair<Int, Intent?>? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        Log.d(TAG, "$this.onCreate()")
+        super.onCreate(savedInstanceState)
+        unsafeInstance = this
+    }
+
+    override fun onDestroy() {
+        Log.d(TAG, "$this.onDestroy()")
+        unsafeInstance = null
+        super.onDestroy()
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        Log.i(TAG, "onActivityResult() code=${resultCode.codeToString()}, " +
+                "data=${intent.extras}")
+        result = resultCode to data
+    }
+
+    companion object {
+        private var unsafeInstance: CompanionActivity? = null
+        val instance: CompanionActivity
+            get() = unsafeInstance ?: error("There is no CompanionActivity")
+
+        fun launchAndWait(context: Context) {
+            val intent = Intent(context, CompanionActivity::class.java)
+            intent.addFlags(FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
+
+            waitForResult(timeout = 3.seconds, interval = 100.milliseconds) {
+                unsafeInstance?.takeIf { it.isResumed }
+            } ?: error("CompanionActivity has not appeared")
+        }
+
+        fun startIntentSender(intentSender: IntentSender) =
+                instance.startIntentSenderForResult(intentSender, 0, null, 0, 0, 0)
+
+        fun waitForActivityResult() =
+                waitForResult(timeout = 1.seconds, interval = 100.milliseconds) { instance.result }
+                    ?: error("onActivityResult() has not been invoked")
+
+        fun finish() = instance.finish()
+
+        fun safeFinish() = unsafeInstance?.finish()
+
+        fun waitUntilGone() = waitFor { unsafeInstance == null }
+    }
+}
+
+private fun Int.codeToString() = when (this) {
+    Activity.RESULT_OK -> "RESULT_OK"
+    Activity.RESULT_CANCELED -> "RESULT_CANCELED"
+    else -> "Unknown"
+} + "($this)"
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/CompanionService.kt b/tests/tests/companion/common/src/android/companion/cts/common/CompanionService.kt
new file mode 100644
index 0000000..4d09333
--- /dev/null
+++ b/tests/tests/companion/common/src/android/companion/cts/common/CompanionService.kt
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.common
+
+import android.companion.AssociationInfo
+import android.companion.CompanionDeviceService
+import android.content.Intent
+import android.os.Handler
+import android.util.Log
+import java.util.Collections.synchronizedMap
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+sealed class CompanionService<T : CompanionService<T>>(
+    private val instanceHolder: InstanceHolder<T>
+) : CompanionDeviceService() {
+    @Volatile var isBound: Boolean = false
+        private set(isBound) {
+            Log.d(TAG, "$this.isBound=$isBound")
+            if (!isBound && !connectedDevices.isEmpty())
+                error("Unbinding while there are connected devices")
+            field = isBound
+        }
+
+    val connectedDevices: Collection<AssociationInfo>
+        get() = _connectedDevices.values
+
+    val associationIdsForConnectedDevices: Collection<Int>
+        get() = _connectedDevices.keys
+
+    private val _connectedDevices: MutableMap<Int, AssociationInfo> =
+            synchronizedMap(mutableMapOf())
+
+    override fun onCreate() {
+        Log.d(TAG, "$this.onCreate()")
+        super.onCreate()
+        instanceHolder.instance = this as T
+    }
+
+    override fun onBindCompanionDeviceService(intent: Intent) {
+        Log.d(TAG, "$this.onBindCompanionDeviceService()")
+        isBound = true
+    }
+
+    override fun onDeviceAppeared(associationInfo: AssociationInfo) {
+        Log.d(TAG, "$this.onDevice_Appeared(), association=$associationInfo")
+        _connectedDevices[associationInfo.id] = associationInfo
+        super.onDeviceAppeared(associationInfo)
+    }
+
+    override fun onDeviceDisappeared(associationInfo: AssociationInfo) {
+        Log.d(TAG, "$this.onDevice_Disappeared(), association=$associationInfo")
+        _connectedDevices.remove(associationInfo.id)
+                ?: error("onDeviceAppeared() has not been called for association with id " +
+                        "${associationInfo.id}")
+
+        super.onDeviceDisappeared(associationInfo)
+    }
+
+    // For now, we need to "post" a Runnable that sets isBound to false to the Main Thread's
+    // Handler, because this may be called between invocations of
+    // CompanionDeviceService.Stub.onDeviceAppeared() and the "real"
+    // CompanionDeviceService.onDeviceAppeared(), which would cause an error() in isBound setter.
+    override fun onUnbind(intent: Intent?) = super.onUnbind(intent)
+            .also {
+                Log.d(TAG, "$this.onUnbind()")
+                Handler.getMain().post { isBound = false }
+            }
+
+    override fun onDestroy() {
+        Log.d(TAG, "$this.onDestroy()")
+        instanceHolder.instance = null
+        super.onDestroy()
+    }
+}
+
+sealed class InstanceHolder<T : CompanionService<T>> {
+    // Need synchronization, because the setter will be called from the Main thread, while the
+    // getter is expected to be called mostly from the instrumentation thread.
+    var instance: T? = null
+        @Synchronized internal set
+        @Synchronized get
+
+    val isBound: Boolean
+        get() = instance?.isBound ?: false
+
+    val connectedDevices: Collection<AssociationInfo>
+        get() = instance?.connectedDevices ?: emptySet()
+
+    val associationIdsForConnectedDevices: Collection<Int>
+        get() = instance?.associationIdsForConnectedDevices ?: emptySet()
+
+    fun waitForBind(timeout: Duration = 1.seconds) {
+        if (!waitFor(timeout) { isBound })
+            throw AssertionError("Service hasn't been bound")
+    }
+
+    fun waitForUnbind(timeout: Duration) {
+        if (!waitFor(timeout) { !isBound })
+            throw AssertionError("Service hasn't been unbound")
+    }
+
+    fun waitAssociationToAppear(associationId: Int, timeout: Duration = 1.seconds) {
+        val appeared = waitFor(timeout) {
+            associationIdsForConnectedDevices.contains(associationId)
+        }
+        if (!appeared) throw AssertionError("""Association with $associationId hasn't "appeared"""")
+    }
+
+    fun waitAssociationToDisappear(associationId: Int, timeout: Duration = 1.seconds) {
+        val gone = waitFor(timeout) {
+            !associationIdsForConnectedDevices.contains(associationId)
+        }
+        if (!gone) throw AssertionError("""Association with $associationId hasn't "disappeared"""")
+    }
+}
+
+class PrimaryCompanionService : CompanionService<PrimaryCompanionService>(Companion) {
+    companion object : InstanceHolder<PrimaryCompanionService>()
+}
+
+class SecondaryCompanionService : CompanionService<SecondaryCompanionService>(Companion) {
+    companion object : InstanceHolder<SecondaryCompanionService>()
+}
+
+class MissingPermissionCompanionService
+    : CompanionService<MissingPermissionCompanionService>(Companion) {
+    companion object : InstanceHolder<MissingPermissionCompanionService>()
+}
+
+class MissingIntentFilterActionCompanionService
+    : CompanionService<MissingIntentFilterActionCompanionService>(Companion) {
+    companion object : InstanceHolder<MissingIntentFilterActionCompanionService>()
+}
\ No newline at end of file
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/Constants.kt b/tests/tests/companion/common/src/android/companion/cts/common/Constants.kt
new file mode 100644
index 0000000..c0d3631
--- /dev/null
+++ b/tests/tests/companion/common/src/android/companion/cts/common/Constants.kt
@@ -0,0 +1,58 @@
+package android.companion.cts.common
+
+import android.Manifest
+import android.companion.AssociationRequest.DEVICE_PROFILE_APP_STREAMING
+import android.companion.AssociationRequest.DEVICE_PROFILE_AUTOMOTIVE_PROJECTION
+import android.companion.AssociationRequest.DEVICE_PROFILE_COMPUTER
+import android.companion.AssociationRequest.DEVICE_PROFILE_WATCH
+import android.net.MacAddress
+import android.os.Handler
+import android.os.HandlerThread
+import java.util.concurrent.Executor
+
+/** Set of all supported CDM Device Profiles. */
+val DEVICE_PROFILES = setOf(
+        DEVICE_PROFILE_WATCH,
+        DEVICE_PROFILE_COMPUTER,
+        DEVICE_PROFILE_APP_STREAMING,
+        DEVICE_PROFILE_AUTOMOTIVE_PROJECTION
+)
+
+val DEVICE_PROFILE_TO_NAME = mapOf(
+        DEVICE_PROFILE_WATCH to "WATCH",
+        DEVICE_PROFILE_COMPUTER to "COMPUTER",
+        DEVICE_PROFILE_APP_STREAMING to "APP_STREAMING",
+        DEVICE_PROFILE_AUTOMOTIVE_PROJECTION to "AUTOMOTIVE_PROJECTION"
+)
+
+val DEVICE_PROFILE_TO_PERMISSION = mapOf(
+        DEVICE_PROFILE_WATCH to Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH,
+        DEVICE_PROFILE_APP_STREAMING to
+                Manifest.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING,
+        DEVICE_PROFILE_AUTOMOTIVE_PROJECTION to
+                Manifest.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION,
+        DEVICE_PROFILE_COMPUTER to
+                Manifest.permission.REQUEST_COMPANION_PROFILE_COMPUTER
+)
+
+val MAC_ADDRESS_A = MacAddress.fromString("00:00:00:00:00:AA")
+val MAC_ADDRESS_B = MacAddress.fromString("00:00:00:00:00:BB")
+val MAC_ADDRESS_C = MacAddress.fromString("00:00:00:00:00:CC")
+
+const val DEVICE_DISPLAY_NAME_A = "Device A"
+const val DEVICE_DISPLAY_NAME_B = "Device B"
+
+val SIMPLE_EXECUTOR: Executor by lazy { Executor { it.run() } }
+
+val MAIN_THREAD_EXECUTOR: Executor by lazy {
+    Executor {
+        with(Handler.getMain()) { post(it) }
+    }
+}
+
+val BACKGROUND_THREAD_EXECUTOR: Executor by lazy {
+    with(HandlerThread("CdmTestBackgroundThread")) {
+        start()
+        Executor { threadHandler.post(it) }
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/InvocationTracker.kt b/tests/tests/companion/common/src/android/companion/cts/common/InvocationTracker.kt
new file mode 100644
index 0000000..4f7ed66
--- /dev/null
+++ b/tests/tests/companion/common/src/android/companion/cts/common/InvocationTracker.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2022 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 android.companion.cts.common
+
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+interface InvocationTracker<T> {
+    val invocations: List<T>
+
+    /**
+     * Await invocations of this callback by the given [actions].
+     */
+    fun assertInvokedByActions(
+        timeout: Duration = 1.seconds,
+        minOccurrences: Int = 1,
+        actions: () -> Unit
+    ) {
+        require(minOccurrences > 0) {
+            "Must expect at least one callback occurrence. (Given $minOccurrences)"
+        }
+        val expectedInvocationCount = invocations.size + minOccurrences
+        actions()
+        if (!waitFor(timeout, interval = 100.milliseconds) {
+                invocations.size >= expectedInvocationCount
+        }) {
+            throw AssertionError(
+                "Callback was invoked ${invocations.size} times after $timeout ms! " +
+                        "Expected at least $minOccurrences times."
+            )
+        }
+    }
+
+    fun clearRecordedInvocations()
+
+    fun recordInvocation(invocation: T)
+}
+
+internal class InvocationContainer<T> : InvocationTracker<T> {
+    private val _invocations: MutableList<T> = mutableListOf()
+    override val invocations: List<T>
+        @Synchronized
+        get() = _invocations
+
+    @Synchronized
+    override fun clearRecordedInvocations() = _invocations.clear()
+
+    @Synchronized
+    override fun recordInvocation(invocation: T) {
+        _invocations.add(invocation)
+    }
+}
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/RecordingCallback.kt b/tests/tests/companion/common/src/android/companion/cts/common/RecordingCallback.kt
new file mode 100644
index 0000000..52a4610
--- /dev/null
+++ b/tests/tests/companion/common/src/android/companion/cts/common/RecordingCallback.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.common
+
+import android.companion.AssociationInfo
+import android.companion.CompanionDeviceManager
+import android.content.IntentSender
+import android.util.Log
+
+class RecordingCallback
+private constructor(container: InvocationContainer<CallbackInvocation>) :
+    CompanionDeviceManager.Callback(),
+    InvocationTracker<RecordingCallback.CallbackInvocation> by container {
+
+    constructor() : this(InvocationContainer())
+
+    override fun onDeviceFound(intentSender: IntentSender) =
+        logAndRecordInvocation(OnDeviceFound(intentSender))
+
+    override fun onAssociationPending(intentSender: IntentSender) =
+        logAndRecordInvocation(OnAssociationPending(intentSender))
+
+    override fun onAssociationCreated(associationInfo: AssociationInfo) =
+        logAndRecordInvocation(OnAssociationCreated(associationInfo))
+
+    override fun onFailure(error: CharSequence?) = logAndRecordInvocation(OnFailure(error))
+
+    private fun logAndRecordInvocation(invocation: CallbackInvocation) {
+        Log.d(TAG, "Callback: $invocation")
+        recordInvocation(invocation)
+    }
+
+    sealed interface CallbackInvocation
+    data class OnDeviceFound(val intentSender: IntentSender) : CallbackInvocation
+    data class OnAssociationPending(val intentSender: IntentSender) : CallbackInvocation
+    data class OnAssociationCreated(val associationInfo: AssociationInfo) : CallbackInvocation
+    data class OnFailure(val error: CharSequence?) : CallbackInvocation
+}
\ No newline at end of file
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/RecordingCdmEventObserver.kt b/tests/tests/companion/common/src/android/companion/cts/common/RecordingCdmEventObserver.kt
new file mode 100644
index 0000000..7ba5552
--- /dev/null
+++ b/tests/tests/companion/common/src/android/companion/cts/common/RecordingCdmEventObserver.kt
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2022 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 android.companion.cts.common
+
+import android.companion.AssociationInfo
+import android.companion.CompanionDeviceManager
+import android.companion.cts.common.RecordingCallback.CallbackInvocation
+import android.companion.cts.common.RecordingCallback.OnAssociationCreated
+import android.companion.cts.common.RecordingCallback.OnAssociationPending
+import android.companion.cts.common.RecordingCallback.OnDeviceFound
+import android.companion.cts.common.RecordingCallback.OnFailure
+import android.content.IntentSender
+
+/**
+ * This class is a combination of a
+ * [android.companion.CompanionDeviceManager.OnAssociationsChangedListener] and a
+ * [android.companion.CompanionDeviceManager.Callback].
+ *
+ * It can simultaneously serve as both an association change listener and a CDM callback,
+ * enabling it to make assertions on the order of all externally observable CDM events.
+ */
+class RecordingCdmEventObserver
+private constructor(container: InvocationContainer<CdmEvent>) :
+    CompanionDeviceManager.Callback(),
+    CompanionDeviceManager.OnAssociationsChangedListener,
+    InvocationTracker<RecordingCdmEventObserver.CdmEvent> by container {
+
+    constructor() : this(InvocationContainer())
+
+    // association change listener behavior
+
+    override fun onAssociationsChanged(associations: List<AssociationInfo>) =
+        recordInvocation(AssociationChange(associations))
+
+    // CDM callback behavior
+
+    override fun onDeviceFound(intentSender: IntentSender) =
+        recordInvocation(CdmCallback(OnDeviceFound(intentSender)))
+
+    override fun onAssociationPending(intentSender: IntentSender) =
+        recordInvocation(CdmCallback(OnAssociationPending(intentSender)))
+
+    override fun onAssociationCreated(associationInfo: AssociationInfo) =
+        recordInvocation(CdmCallback(OnAssociationCreated(associationInfo)))
+
+    override fun onFailure(error: CharSequence?) =
+        recordInvocation(CdmCallback(OnFailure(error)))
+
+    sealed interface CdmEvent
+    data class AssociationChange(val associations: List<AssociationInfo>) : CdmEvent
+    data class CdmCallback(val invocation: CallbackInvocation) : CdmEvent
+}
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/RecordingOnAssociationsChangedListener.kt b/tests/tests/companion/common/src/android/companion/cts/common/RecordingOnAssociationsChangedListener.kt
new file mode 100644
index 0000000..c024a79
--- /dev/null
+++ b/tests/tests/companion/common/src/android/companion/cts/common/RecordingOnAssociationsChangedListener.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.common
+
+import android.companion.AssociationInfo
+import android.companion.CompanionDeviceManager
+
+class RecordingOnAssociationsChangedListener
+private constructor(container: InvocationContainer<List<AssociationInfo>>) :
+    CompanionDeviceManager.OnAssociationsChangedListener,
+    InvocationTracker<List<AssociationInfo>> by container {
+
+    constructor() : this(InvocationContainer())
+
+    override fun onAssociationsChanged(associations: List<AssociationInfo>) =
+        recordInvocation(associations)
+}
\ No newline at end of file
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/Repeat.kt b/tests/tests/companion/common/src/android/companion/cts/common/Repeat.kt
new file mode 100644
index 0000000..c0370bf
--- /dev/null
+++ b/tests/tests/companion/common/src/android/companion/cts/common/Repeat.kt
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2022 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 android.companion.cts.common
+
+import org.junit.rules.TestRule
+import org.junit.runner.Description
+import org.junit.runners.model.Statement
+
+/**
+ * Repeats the execution of the annotated test method the given number of times (10 by default).
+ *
+ * Note that a [RepeatRule] must be present in the class for the annotation to take effect.
+ *
+ * For an example, see the following code:
+ * ```
+ * @get:Rule
+ * val repeatRule = RepeatRule()
+ *
+ * @Test
+ * @Repeat(5)
+ * fun myTest() {
+ *   ...
+ * }
+ * ```
+ */
+@Retention(AnnotationRetention.RUNTIME)
+@Target(AnnotationTarget.FUNCTION)
+annotation class Repeat(val times: Int = 10)
+
+/**
+ * Use this rule together with the [Repeat] annotation to automatically
+ * repeat the execution of annotated tests.
+ */
+class RepeatRule : TestRule {
+    override fun apply(base: Statement, description: Description): Statement =
+        description.getAnnotation(Repeat::class.java)?.let { repeat ->
+            object : Statement() {
+                @Throws(Throwable::class)
+                override fun evaluate() = repeat(repeat.times) { base.evaluate() }
+            }
+        } ?: base
+}
diff --git a/tests/tests/companion/common/src/android/companion/cts/common/TestBase.kt b/tests/tests/companion/common/src/android/companion/cts/common/TestBase.kt
new file mode 100644
index 0000000..b650324
--- /dev/null
+++ b/tests/tests/companion/common/src/android/companion/cts/common/TestBase.kt
@@ -0,0 +1,196 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.common
+
+import android.Manifest
+import android.annotation.CallSuper
+import android.app.Instrumentation
+import android.app.UiAutomation
+import android.companion.AssociationInfo
+import android.companion.AssociationRequest
+import android.companion.CompanionDeviceManager
+import android.content.Context
+import android.content.pm.PackageManager
+import android.net.MacAddress
+import android.os.SystemClock.sleep
+import android.os.SystemClock.uptimeMillis
+import android.util.Log
+import androidx.test.platform.app.InstrumentationRegistry
+import com.android.compatibility.common.util.SystemUtil
+import org.junit.After
+import org.junit.Assume.assumeTrue
+import org.junit.AssumptionViolatedException
+import org.junit.Before
+import java.io.IOException
+import kotlin.test.assertEquals
+import kotlin.test.assertFalse
+import kotlin.test.assertIs
+import kotlin.test.assertTrue
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * A base class for CompanionDeviceManager [Tests][org.junit.Test] to extend.
+ */
+abstract class TestBase {
+    protected val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
+    protected val uiAutomation: UiAutomation = instrumentation.uiAutomation
+
+    protected val context: Context = instrumentation.context
+    protected val userId = context.userId
+    protected val targetPackageName = instrumentation.targetContext.packageName
+
+    protected val targetApp = AppHelper(instrumentation, userId, targetPackageName)
+
+    protected val pm: PackageManager by lazy { context.packageManager!! }
+    private val hasCompanionDeviceSetupFeature by lazy {
+        pm.hasSystemFeature(PackageManager.FEATURE_COMPANION_DEVICE_SETUP)
+    }
+
+    protected val cdm: CompanionDeviceManager by lazy {
+        context.getSystemService(CompanionDeviceManager::class.java)!!
+    }
+
+    @Before
+    fun base_setUp() {
+        assumeTrue(hasCompanionDeviceSetupFeature)
+
+        // Remove all existing associations (for the user).
+        assertEmpty(withShellPermissionIdentity {
+            cdm.disassociateAll()
+            cdm.allAssociations
+        })
+
+        // Make sure CompanionDeviceServices are not bound.
+        assertFalse(PrimaryCompanionService.isBound)
+        assertFalse(SecondaryCompanionService.isBound)
+
+        setUp()
+    }
+
+    @After
+    fun base_tearDown() {
+        if (!hasCompanionDeviceSetupFeature) return
+
+        tearDown()
+
+        // Remove all existing associations (for the user).
+        withShellPermissionIdentity { cdm.disassociateAll() }
+    }
+
+    @CallSuper
+    protected open fun setUp() {}
+
+    @CallSuper
+    protected open fun tearDown() {}
+
+    protected fun <T> withShellPermissionIdentity(
+        vararg permissions: String,
+        block: () -> T
+    ): T {
+        if (permissions.isNotEmpty()) {
+            uiAutomation.adoptShellPermissionIdentity(*permissions)
+        } else {
+            uiAutomation.adoptShellPermissionIdentity()
+        }
+
+        try {
+            return block()
+        } finally {
+            uiAutomation.dropShellPermissionIdentity()
+        }
+    }
+
+    protected fun createSelfManagedAssociation(displayName: String): Int {
+        val callback = RecordingCallback()
+        val request: AssociationRequest = AssociationRequest.Builder()
+                .setSelfManaged(true)
+                .setDisplayName(displayName)
+                .build()
+        callback.assertInvokedByActions {
+            withShellPermissionIdentity(Manifest.permission.REQUEST_COMPANION_SELF_MANAGED) {
+                cdm.associate(request, SIMPLE_EXECUTOR, callback)
+            }
+        }
+
+        val callbackInvocation = callback.invocations.first()
+        assertIs<RecordingCallback.OnAssociationCreated>(callbackInvocation)
+        return callbackInvocation.associationInfo.id
+    }
+
+    private fun CompanionDeviceManager.disassociateAll() =
+            allAssociations.forEach { disassociate(it.id) }
+}
+
+const val TAG = "CtsCompanionDeviceManagerTestCases"
+
+fun <T> assumeThat(message: String, obj: T, assumption: (T) -> Boolean) {
+    if (!assumption(obj)) throw AssumptionViolatedException(message)
+}
+
+fun <T> assertEmpty(list: Collection<T>) = assertTrue("Collection is not empty") { list.isEmpty() }
+
+fun assertAssociations(
+    actual: List<AssociationInfo>,
+    expected: Set<Pair<String, MacAddress?>>
+) = assertEquals(actual = actual.map { it.packageName to it.deviceMacAddress }.toSet(),
+        expected = expected)
+
+/**
+ * @return whether the condition was met before time ran out.
+ */
+fun waitFor(
+    timeout: Duration = 10.seconds,
+    interval: Duration = 1.seconds,
+    condition: () -> Boolean
+): Boolean {
+    val startTime = uptimeMillis()
+    while (!condition()) {
+        if (uptimeMillis() - startTime > timeout.inWholeMilliseconds) return false
+        sleep(interval.inWholeMilliseconds)
+    }
+    return true
+}
+
+fun <R> waitForResult(
+    timeout: Duration = 10.seconds,
+    interval: Duration = 1.seconds,
+    block: () -> R
+): R? {
+    val startTime = uptimeMillis()
+    while (true) {
+        val result: R = block()
+        if (result != null) return result
+        sleep(interval.inWholeMilliseconds)
+        if (uptimeMillis() - startTime > timeout.inWholeMilliseconds) return null
+    }
+}
+
+fun Instrumentation.runShellCommand(cmd: String): String {
+    Log.i(TAG, "Running shell command: '$cmd'")
+    try {
+        val out = SystemUtil.runShellCommand(this, cmd)
+        Log.i(TAG, "Out:\n$out")
+        return out
+    } catch (e: IOException) {
+        Log.e(TAG, "Error running shell command: $cmd")
+        throw e
+    }
+}
+
+fun Instrumentation.setSystemProp(name: String, value: String) =
+        runShellCommand("setprop $name $value")
\ No newline at end of file
diff --git a/tests/tests/companion/core/AndroidManifest.xml b/tests/tests/companion/core/AndroidManifest.xml
new file mode 100644
index 0000000..048558a
--- /dev/null
+++ b/tests/tests/companion/core/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2021 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.companion.cts.core">
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.companion.cts.core"
+        android:label="CompanionDeviceManager Core CTS tests">
+
+        <meta-data
+            android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
+
diff --git a/tests/tests/companion/core/AndroidTest.xml b/tests/tests/companion/core/AndroidTest.xml
new file mode 100644
index 0000000..21d3dd63
--- /dev/null
+++ b/tests/tests/companion/core/AndroidTest.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<configuration description="Configuration for Core CTS tests for CompanionDeviceManager">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+    <option name="not-shardable" value="true" />
+    <option name="test-suite-tag" value="cts" />
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsCompanionDeviceManagerCoreTestCases.apk" />
+        <option name="test-file-name" value="CtsCompanionTestApp.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.companion.cts.core" />
+        <option name="runtime-hint" value="1s" />
+    </test>
+
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <!-- Create a temporary directory for test APKs.  -->
+        <option name="run-command" value="mkdir -p /data/local/tmp/cts/companion" />
+        <option name="teardown-command" value="rm -rf /data/local/tmp/cts/companion" />
+
+        <option name="run-command" value="am wait-for-broadcast-idle" />
+    </target_preparer>
+
+    <!-- Push test APKs into the temporary directory. -->
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="push" value="CtsCompanionTestApp.apk->/data/local/tmp/cts/companion/CtsCompanionTestApp.apk" />
+    </target_preparer>
+</configuration>
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/AssociateSelfManagedTest.kt b/tests/tests/companion/core/src/android/companion/cts/core/AssociateSelfManagedTest.kt
new file mode 100644
index 0000000..b7a70f2
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/AssociateSelfManagedTest.kt
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.core
+
+import android.Manifest.permission.REQUEST_COMPANION_PROFILE_WATCH
+import android.Manifest.permission.REQUEST_COMPANION_SELF_MANAGED
+import android.companion.AssociationRequest
+import android.companion.AssociationRequest.DEVICE_PROFILE_WATCH
+import android.companion.cts.common.RecordingCallback
+import android.companion.cts.common.RecordingCallback.OnAssociationCreated
+import android.companion.cts.common.SIMPLE_EXECUTOR
+import android.companion.cts.common.assertEmpty
+import android.platform.test.annotations.AppModeFull
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertIs
+import kotlin.test.assertNull
+
+/**
+ * Test CDM APIs for requesting establishing new associations.
+ *
+ * Run: atest CtsCompanionDeviceManagerCoreTestCases:AssociateSelfManagedTest
+ *
+ * @see android.companion.CompanionDeviceManager.associate
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(AndroidJUnit4::class)
+class AssociateSelfManagedTest : CoreTestBase() {
+
+    @Test
+    fun test_associate_selfManaged_requiresPermission() {
+        val request: AssociationRequest = AssociationRequest.Builder()
+                .setSelfManaged(true)
+                .setDisplayName(DEVICE_DISPLAY_NAME)
+                .build()
+        val callback = RecordingCallback()
+
+        // Attempts to create a "self-managed" association without the MANAGE_COMPANION_DEVICES
+        // permission should lead to a SecurityException being thrown.
+        assertFailsWith(SecurityException::class) {
+            cdm.associate(request, SIMPLE_EXECUTOR, callback)
+        }
+        assertEmpty(callback.invocations)
+
+        // Same call with the MANAGE_COMPANION_DEVICES permissions should succeed.
+        withShellPermissionIdentity(REQUEST_COMPANION_SELF_MANAGED) {
+            cdm.associate(request, SIMPLE_EXECUTOR, callback)
+        }
+    }
+
+    @Test
+    fun test_associate_selfManaged_nullProfile_leadsToNoUiFlow() {
+        val request: AssociationRequest = AssociationRequest.Builder()
+                .setSelfManaged(true)
+                .setDisplayName(DEVICE_DISPLAY_NAME)
+                .build()
+        val callback = RecordingCallback()
+
+        callback.assertInvokedByActions {
+            withShellPermissionIdentity(REQUEST_COMPANION_SELF_MANAGED) {
+                cdm.associate(request, SIMPLE_EXECUTOR, callback)
+            }
+        }
+
+        // Check callback invocations: there should have been exactly 1 invocation of the
+        // onAssociationCreated() method.
+        assertEquals(1, callback.invocations.size)
+        val associationInvocation = callback.invocations.first()
+        assertIs<OnAssociationCreated>(associationInvocation)
+        with(associationInvocation.associationInfo) {
+            assertEquals(actual = displayName, expected = DEVICE_DISPLAY_NAME)
+            assertNull(deviceProfile)
+        }
+
+        // Check that the newly created association is included in
+        // CompanionDeviceManager.getMyAssociations()
+        assertContentEquals(
+            actual = cdm.myAssociations,
+            expected = listOf(associationInvocation.associationInfo)
+        )
+    }
+
+    @Test
+    fun test_associate_selfManaged_alreadyRoleHolder_leadsToNoUiFlow() =
+            targetApp.withRole(ROLE_WATCH) {
+                val request: AssociationRequest = AssociationRequest.Builder()
+                        .setSelfManaged(true)
+                        .setDeviceProfile(DEVICE_PROFILE_WATCH)
+                        .setDisplayName(DEVICE_DISPLAY_NAME)
+                        .build()
+                val callback = RecordingCallback()
+
+                callback.assertInvokedByActions {
+                    withShellPermissionIdentity(
+                        REQUEST_COMPANION_SELF_MANAGED,
+                        REQUEST_COMPANION_PROFILE_WATCH
+                    ) {
+                        cdm.associate(request, SIMPLE_EXECUTOR, callback)
+                    }
+                }
+
+                // Check callback invocations: there should have been exactly 1 invocation of the
+                // onAssociationCreated().
+                assertEquals(1, callback.invocations.size)
+                val associationInvocation = callback.invocations.first()
+                assertIs<OnAssociationCreated>(associationInvocation)
+                with(associationInvocation.associationInfo) {
+                    assertEquals(actual = displayName, expected = DEVICE_DISPLAY_NAME)
+                    assertEquals(actual = deviceProfile, expected = ROLE_WATCH)
+                }
+
+                // Check that the newly created association is included in
+                // CompanionDeviceManager.getMyAssociations()
+                assertContentEquals(
+                    actual = cdm.myAssociations,
+                    expected = listOf(associationInvocation.associationInfo)
+                )
+            }
+
+    override fun tearDown() {
+        targetApp.removeFromHoldersOfRole(ROLE_WATCH)
+        super.tearDown()
+    }
+
+    companion object {
+        private const val DEVICE_DISPLAY_NAME = "My device"
+        private const val ROLE_WATCH = DEVICE_PROFILE_WATCH
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/AssociateTest.kt b/tests/tests/companion/core/src/android/companion/cts/core/AssociateTest.kt
new file mode 100644
index 0000000..8e0e90d
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/AssociateTest.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.core
+
+import android.companion.AssociationRequest
+import android.companion.cts.common.RecordingCallback
+import android.companion.cts.common.RecordingCallback.OnAssociationPending
+import android.companion.cts.common.SIMPLE_EXECUTOR
+import android.platform.test.annotations.AppModeFull
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+
+/**
+ * Test CDM APIs for requesting establishing new associations.
+ *
+ * Run: atest CtsCompanionDeviceManagerCoreTestCases:AssociateTest
+ *
+ * @see android.companion.CompanionDeviceManager.associate
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(AndroidJUnit4::class)
+class AssociateTest : CoreTestBase() {
+
+    @Test
+    fun test_associate() {
+        val request: AssociationRequest = AssociationRequest.Builder()
+                .build()
+        val callback = RecordingCallback()
+
+        callback.assertInvokedByActions {
+            cdm.associate(request, SIMPLE_EXECUTOR, callback)
+        }
+        // Check callback invocations: there should have been exactly 1 invocation of the
+        // onAssociationPending() method.
+        assertEquals(1, callback.invocations.size)
+        assertIs<OnAssociationPending>(callback.invocations.first())
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/AssociationRequestBuilderTest.kt b/tests/tests/companion/core/src/android/companion/cts/core/AssociationRequestBuilderTest.kt
new file mode 100644
index 0000000..e999c86
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/AssociationRequestBuilderTest.kt
@@ -0,0 +1,102 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.core
+
+import android.companion.AssociationRequest
+import android.companion.AssociationRequest.DEVICE_PROFILE_WATCH
+import android.companion.BluetoothDeviceFilter
+import android.companion.cts.common.assertEmpty
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.test.assertNotNull
+import kotlin.test.assertNull
+import kotlin.test.assertTrue
+
+/**
+ * Test [android.companion.AssociationRequest.Builder].
+ *
+ * Run: atest CtsCompanionDeviceManagerCoreTestCases:AssociationRequestBuilderTest
+ */
+@RunWith(AndroidJUnit4::class)
+class AssociationRequestBuilderTest {
+
+    @Test
+    fun test_defaultValues() {
+        val request = AssociationRequest.Builder()
+                .build()
+
+        request.apply {
+            assertNull(deviceProfile)
+            assertNull(displayName)
+
+            assertNotNull(deviceFilters)
+            assertEmpty(deviceFilters)
+
+            assertFalse(isSelfManaged)
+            assertFalse(isForceConfirmation)
+            assertFalse(isSingleDevice)
+        }
+    }
+
+    @Test
+    fun test_setters() {
+        val deviceFilterA = createBluetoothDeviceFilter("00:00:00:00:00:AA")
+        val deviceFilterB = createBluetoothDeviceFilter("00:00:00:00:00:BB")
+        val request = AssociationRequest.Builder()
+                .setDeviceProfile(DEVICE_PROFILE_WATCH)
+                .setDisplayName(DISPLAY_NAME)
+                .setSelfManaged(true)
+                .setForceConfirmation(true)
+                .setSingleDevice(true)
+                .addDeviceFilter(deviceFilterA)
+                .addDeviceFilter(deviceFilterB)
+                .build()
+
+        request.apply {
+            assertEquals(actual = deviceProfile, expected = DEVICE_PROFILE_WATCH)
+            assertEquals(actual = displayName, expected = DISPLAY_NAME)
+            assertContentEquals(
+                    actual = deviceFilters,
+                    expected = listOf(deviceFilterA, deviceFilterB))
+            assertTrue(isSelfManaged)
+            assertTrue(isForceConfirmation)
+            assertTrue(isSingleDevice)
+        }
+    }
+
+    @Test
+    fun test_selfManaged_require_displayName() {
+        assertFailsWith<IllegalStateException> {
+            AssociationRequest.Builder()
+                    .setSelfManaged(true)
+                    .build()
+        }
+    }
+
+    companion object {
+        private const val DISPLAY_NAME = "My Device"
+    }
+}
+
+private fun createBluetoothDeviceFilter(address: String) = BluetoothDeviceFilter.Builder()
+        .setAddress(address)
+        .build()
\ No newline at end of file
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/AssociationsChangedListenerTest.kt b/tests/tests/companion/core/src/android/companion/cts/core/AssociationsChangedListenerTest.kt
new file mode 100644
index 0000000..a523a62
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/AssociationsChangedListenerTest.kt
@@ -0,0 +1,155 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.core
+
+import android.Manifest.permission.MANAGE_COMPANION_DEVICES
+import android.Manifest.permission.REQUEST_COMPANION_SELF_MANAGED
+import android.companion.AssociationRequest
+import android.companion.cts.common.BACKGROUND_THREAD_EXECUTOR
+import android.companion.cts.common.DEVICE_DISPLAY_NAME_A
+import android.companion.cts.common.MAC_ADDRESS_A
+import android.companion.cts.common.RecordingCallback.OnAssociationCreated
+import android.companion.cts.common.RecordingCdmEventObserver
+import android.companion.cts.common.RecordingCdmEventObserver.AssociationChange
+import android.companion.cts.common.RecordingCdmEventObserver.CdmCallback
+import android.companion.cts.common.RecordingOnAssociationsChangedListener
+import android.companion.cts.common.Repeat
+import android.companion.cts.common.RepeatRule
+import android.companion.cts.common.SIMPLE_EXECUTOR
+import android.companion.cts.common.assertEmpty
+import android.platform.test.annotations.AppModeFull
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertIs
+
+/**
+ * Test CDM APIs for listening for changes to [android.companion.AssociationInfo].
+ *
+ * Run: atest CtsCompanionDeviceManagerCoreTestCases:AssociationsChangedListenerTest
+ *
+ * @see android.companion.CompanionDeviceManager.OnAssociationsChangedListener
+ * @see android.companion.CompanionDeviceManager.addOnAssociationsChangedListener
+ * @see android.companion.CompanionDeviceManager.removeOnAssociationsChangedListener
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(AndroidJUnit4::class)
+class AssociationsChangedListenerTest : CoreTestBase() {
+    @get:Rule
+    val repeatRule = RepeatRule()
+
+    @Test
+    fun test_addOnAssociationsChangedListener_requiresPermission() {
+        /**
+         * Attempts to add a listener without [MANAGE_COMPANION_DEVICES] permission should
+         * throw a [SecurityException] and should not change the existing associations.
+         */
+        assertFailsWith(SecurityException::class) {
+            cdm.addOnAssociationsChangedListener(SIMPLE_EXECUTOR, NO_OP_LISTENER)
+        }
+
+        /** Re-running with [MANAGE_COMPANION_DEVICES] permissions: now should succeed */
+        withShellPermissionIdentity(MANAGE_COMPANION_DEVICES) {
+            cdm.addOnAssociationsChangedListener(SIMPLE_EXECUTOR, NO_OP_LISTENER)
+
+            /** Succeeded, now remove. */
+            cdm.removeOnAssociationsChangedListener(NO_OP_LISTENER)
+        }
+    }
+
+    @Test
+    fun test_addOnAssociationsChangedListener() {
+        val listener = RecordingOnAssociationsChangedListener()
+
+        withShellPermissionIdentity(MANAGE_COMPANION_DEVICES) {
+            cdm.addOnAssociationsChangedListener(SIMPLE_EXECUTOR, listener)
+        }
+
+        listener.assertInvokedByActions {
+            testApp.associate(MAC_ADDRESS_A)
+        }
+
+        listener.invocations[0].let { associations ->
+            assertEquals(actual = associations.size, expected = 1)
+            assertEquals(actual = associations[0].deviceMacAddress, expected = MAC_ADDRESS_A)
+            assertEquals(actual = associations[0].packageName, expected = TEST_APP_PACKAGE_NAME)
+        }
+
+        listener.clearRecordedInvocations()
+
+        withShellPermissionIdentity(MANAGE_COMPANION_DEVICES) {
+            cdm.removeOnAssociationsChangedListener(listener)
+        }
+
+        testApp.disassociate(MAC_ADDRESS_A)
+        // The listener shouldn't get involved after removed the onAssociationsChangedListener.
+        assertEmpty(listener.invocations)
+    }
+
+    @Test
+    @Repeat(10)
+    fun test_associationChangeListener_notifiedBefore_cdmCallback() {
+        val request: AssociationRequest = AssociationRequest.Builder()
+            .setSelfManaged(true)
+            .setDisplayName(DEVICE_DISPLAY_NAME_A)
+            .build()
+
+        val observer = RecordingCdmEventObserver()
+
+        // preparation: register the observer as an association change listener
+        withShellPermissionIdentity(MANAGE_COMPANION_DEVICES) {
+            cdm.addOnAssociationsChangedListener(BACKGROUND_THREAD_EXECUTOR, observer)
+        }
+
+        // test scenario: carry out an association and assert that
+        // the association listener is notified BEFORE the CDM observer
+        observer.assertInvokedByActions(minOccurrences = 2) {
+            withShellPermissionIdentity(REQUEST_COMPANION_SELF_MANAGED) {
+                // in order to make sure the OnAssociationsChangedListener and
+                // CompanionDeviceManager.Callback callbacks are recorded in the right order use
+                // the same Executor - BACKGROUND_THREAD_EXECUTOR - here that we used for
+                // addOnAssociationsChangedListener above.
+                cdm.associate(request, BACKGROUND_THREAD_EXECUTOR, observer)
+            }
+        }
+
+        // we should have observed exactly two events
+        assertEquals(2, observer.invocations.size)
+        val (event1, event2) = observer.invocations
+
+        // the event we observed first should be an association change
+        assertIs<AssociationChange>(event1)
+        // there should be exactly one association
+        assertEquals(1, event1.associations.size)
+        val associationInfoFromListener = event1.associations.first()
+        assertEquals(
+            actual = associationInfoFromListener.displayName,
+            expected = DEVICE_DISPLAY_NAME_A
+        )
+
+        // the second event should be the callback invocation
+        assertIs<CdmCallback>(event2)
+        val callbackInvocation = event2.invocation
+        assertIs<OnAssociationCreated>(callbackInvocation)
+
+        val associationInfoFromCallback = callbackInvocation.associationInfo
+        assertEquals(associationInfoFromListener, associationInfoFromCallback)
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/AssociationsCleanUpTest.kt b/tests/tests/companion/core/src/android/companion/cts/core/AssociationsCleanUpTest.kt
new file mode 100644
index 0000000..332816a
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/AssociationsCleanUpTest.kt
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.core
+
+import android.annotation.UserIdInt
+import android.companion.AssociationInfo
+import android.companion.CompanionDeviceManager
+import android.companion.cts.common.AppHelper
+import android.companion.cts.common.MAC_ADDRESS_A
+import android.companion.cts.common.MAC_ADDRESS_B
+import android.companion.cts.common.MAC_ADDRESS_C
+import android.companion.cts.common.assertAssociations
+import android.companion.cts.common.waitFor
+import android.platform.test.annotations.AppModeFull
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * Tests if associations that belong to a package are removed when the package is uninstalled or its
+ * data is cleared.
+ *
+ * Build/Install/Run: atest CtsCompanionDeviceManagerCoreTestCases:AssociationsCleanUpTest
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(AndroidJUnit4::class)
+class AssociationsCleanUpTest : CoreTestBase() {
+
+    @Test
+    fun test_associationsRemoved_onPackageDataCleared() {
+        testApp.associate(MAC_ADDRESS_A)
+        testApp.associate(MAC_ADDRESS_B)
+        targetApp.associate(MAC_ADDRESS_C)
+
+        assertAssociations(
+                actual = withShellPermissionIdentity { cdm.allAssociations },
+                expected = setOf(
+                        testApp.packageName to MAC_ADDRESS_A,
+                        testApp.packageName to MAC_ADDRESS_B,
+                        targetApp.packageName to MAC_ADDRESS_C
+                ))
+
+        /** Clear test app's data. */
+        testApp.clearData()
+        assertAssociationsRemovedFor(testApp)
+
+        /** Only Test App's associations should have been removed. Others - should remain. */
+        assertAssociations(
+                actual = withShellPermissionIdentity { cdm.allAssociations },
+                expected = setOf(
+                        targetApp.packageName to MAC_ADDRESS_C
+                ))
+    }
+
+    @Test
+    fun test_associationsRemoved_onPackageRemoved() {
+        testApp.associate(MAC_ADDRESS_A)
+        testApp.associate(MAC_ADDRESS_B)
+        targetApp.associate(MAC_ADDRESS_C)
+
+        assertAssociations(
+                actual = withShellPermissionIdentity { cdm.allAssociations },
+                expected = setOf(
+                        testApp.packageName to MAC_ADDRESS_A,
+                        testApp.packageName to MAC_ADDRESS_B,
+                        targetApp.packageName to MAC_ADDRESS_C
+                ))
+
+        /** Uninstall test app. */
+        testApp.uninstall()
+        assertAssociationsRemovedFor(testApp)
+
+        /** Only Test App's associations should have been removed. Others - should remain. */
+        assertAssociations(
+                actual = withShellPermissionIdentity { cdm.allAssociations },
+                expected = setOf(
+                        targetApp.packageName to MAC_ADDRESS_C
+                ))
+    }
+
+    private fun assertAssociationsRemovedFor(app: AppHelper) = waitFor {
+        withShellPermissionIdentity {
+            cdm.getAssociationForPackage(app.userId, app.packageName).isEmpty()
+        }
+    }.let { removed ->
+        if (!removed)
+            throw AssertionError("Associations for ${app.packageName} were not removed.")
+    }
+}
+
+private fun CompanionDeviceManager.getAssociationForPackage(
+    @UserIdInt userId: Int,
+    packageName: String
+): List<AssociationInfo> = allAssociations.filter { it.belongsToPackage(userId, packageName) }
\ No newline at end of file
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/BasicTest.kt b/tests/tests/companion/core/src/android/companion/cts/core/BasicTest.kt
new file mode 100644
index 0000000..198c4ad
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/BasicTest.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.core
+
+import android.platform.test.annotations.AppModeFull
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertNotNull
+
+/**
+ * Tests most basic CDM APis.
+ *
+ * Build/Install/Run: atest CtsCompanionDeviceManagerCoreTestCases:BasicTest
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(AndroidJUnit4::class)
+class BasicTest : CoreTestBase() {
+    @Test
+    fun test_manager_isNotNull() {
+        assertNotNull(cdm)
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/Constants.kt b/tests/tests/companion/core/src/android/companion/cts/core/Constants.kt
new file mode 100644
index 0000000..a25ee93
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/Constants.kt
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.core
+
+const val TEST_APP_PACKAGE_NAME = "android.os.cts.companiontestapp"
+const val TEST_APP_APK_PATH = "/data/local/tmp/cts/companion/CtsCompanionTestApp.apk"
\ No newline at end of file
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/CoreTestBase.kt b/tests/tests/companion/core/src/android/companion/cts/core/CoreTestBase.kt
new file mode 100644
index 0000000..07795fd
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/CoreTestBase.kt
@@ -0,0 +1,31 @@
+package android.companion.cts.core
+
+import android.annotation.CallSuper
+import android.companion.CompanionDeviceManager
+import android.companion.cts.common.AppHelper
+import android.companion.cts.common.TestBase
+import kotlin.test.assertTrue
+
+open class CoreTestBase : TestBase() {
+    protected val testApp = AppHelper(
+            instrumentation, userId, TEST_APP_PACKAGE_NAME, TEST_APP_APK_PATH)
+
+    @CallSuper
+    override fun setUp() {
+        super.setUp()
+
+        // Make sure test app is installed.
+        with(testApp) {
+            if (!isInstalled()) install()
+            assertTrue("Test app $packageName is not installed") { isInstalled() }
+        }
+    }
+
+    protected val NO_OP_LISTENER: CompanionDeviceManager.OnAssociationsChangedListener =
+        CompanionDeviceManager.OnAssociationsChangedListener { }
+
+    protected val NO_OP_CALLBACK: CompanionDeviceManager.Callback =
+        object : CompanionDeviceManager.Callback() {
+            override fun onFailure(error: CharSequence?) = Unit
+        }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/DeviceProfilesTest.kt b/tests/tests/companion/core/src/android/companion/cts/core/DeviceProfilesTest.kt
new file mode 100644
index 0000000..dff8565
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/DeviceProfilesTest.kt
@@ -0,0 +1,126 @@
+package android.companion.cts.core
+
+import android.app.role.RoleManager.ROLE_ASSISTANT
+import android.app.role.RoleManager.ROLE_BROWSER
+import android.app.role.RoleManager.ROLE_CALL_REDIRECTION
+import android.app.role.RoleManager.ROLE_CALL_SCREENING
+import android.app.role.RoleManager.ROLE_DIALER
+import android.app.role.RoleManager.ROLE_EMERGENCY
+import android.app.role.RoleManager.ROLE_HOME
+import android.app.role.RoleManager.ROLE_SMS
+import android.app.role.RoleManager.ROLE_SYSTEM_SUPERVISION
+import android.app.role.RoleManager.ROLE_SYSTEM_WELLBEING
+import android.companion.AssociationRequest
+import android.companion.cts.common.DEVICE_PROFILE_TO_PERMISSION
+import android.companion.cts.common.RecordingCallback
+import android.companion.cts.common.RecordingCallback.OnAssociationPending
+import android.companion.cts.common.SIMPLE_EXECUTOR
+import android.companion.cts.common.assertEmpty
+import android.platform.test.annotations.AppModeFull
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+
+/**
+ * Test CDM device profiles.
+ *
+ * Run: atest CtsCompanionDeviceManagerCoreTestCases:DeviceProfilesTest
+ *
+ * @see android.companion.AssociationRequest.DEVICE_PROFILE_APP_STREAMING
+ * @see android.companion.AssociationRequest.DEVICE_PROFILE_AUTOMOTIVE_PROJECTION
+ * @see android.companion.AssociationRequest.DEVICE_PROFILE_WATCH
+ * @see android.companion.CompanionDeviceManager.associate
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(AndroidJUnit4::class)
+class DeviceProfilesTest : CoreTestBase() {
+    /** Test that all supported device profiles require a permission. */
+    @Test
+    fun test_supportedProfiles() {
+        val callback = RecordingCallback()
+        DEVICE_PROFILE_TO_PERMISSION.forEach { (profile, permission) ->
+            callback.clearRecordedInvocations()
+            val request = buildRequest(deviceProfile = profile)
+
+            // Should fail if called without the required permissions.
+            assertFailsWith(SecurityException::class) {
+                cdm.associate(request, SIMPLE_EXECUTOR, callback)
+            }
+            // Make sure callback wasn't invoked.
+            assertEmpty(callback.invocations)
+
+            // Should succeed when called with the required permission.
+            assertNotNull(permission, "Profile should require a permission")
+            // Associate and wait for callback.
+            callback.assertInvokedByActions {
+                withShellPermissionIdentity(permission) {
+                    cdm.associate(request, SIMPLE_EXECUTOR, callback)
+                }
+            }
+            // Make sure it's the right callback.
+            assertEquals(1, callback.invocations.size)
+            assertIs<OnAssociationPending>(callback.invocations.first())
+        }
+    }
+
+    /** Test that CDM rejects "arbitrary" profiles. */
+    @Test
+    fun test_unsupportedProfiles() = withShellPermissionIdentity {
+        val callback = RecordingCallback()
+        UNSUPPORTED_PROFILES.forEach { profile ->
+            val request = buildRequest(deviceProfile = profile)
+            // Should fail if called without the required permissions.
+            assertFailsWith(IllegalArgumentException::class) {
+                cdm.associate(request, SIMPLE_EXECUTOR, callback)
+            }
+            // Make sure callback wasn't invoked.
+            assertEmpty(callback.invocations)
+        }
+    }
+
+    /** Test that the null profile is supported and does not require a permission. */
+    @Test
+    fun test_nullProfile() {
+        val callback = RecordingCallback()
+        val request = buildRequest(deviceProfile = null)
+
+        callback.assertInvokedByActions {
+            // Should not require a permission.
+            cdm.associate(request, SIMPLE_EXECUTOR, callback)
+        }
+        // Make sure it's the right callback.
+        assertEquals(1, callback.invocations.size)
+        assertIs<OnAssociationPending>(callback.invocations.first())
+    }
+
+    private fun buildRequest(deviceProfile: String?) = AssociationRequest.Builder()
+            .apply { deviceProfile?.let { setDeviceProfile(it) } }
+            .build()
+
+    companion object {
+        val UNSUPPORTED_PROFILES = setOf(
+                // Each supported device profile is backed by a role. However, other roles should
+                // not be treated as device profiles.
+                ROLE_ASSISTANT,
+                ROLE_BROWSER,
+                ROLE_DIALER,
+                ROLE_SMS,
+                ROLE_EMERGENCY,
+                ROLE_HOME,
+                ROLE_CALL_REDIRECTION,
+                ROLE_CALL_SCREENING,
+                ROLE_SYSTEM_WELLBEING,
+                ROLE_SYSTEM_SUPERVISION,
+                // Other arbitrarily Strings should not be supported either.
+                "watch",
+                "auto",
+                "computer",
+                "companion_device",
+                ""
+        )
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/DisassociateTest.kt b/tests/tests/companion/core/src/android/companion/cts/core/DisassociateTest.kt
new file mode 100644
index 0000000..2184fdc
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/DisassociateTest.kt
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.core
+
+import android.Manifest.permission.MANAGE_COMPANION_DEVICES
+import android.annotation.UserIdInt
+import android.companion.AssociationInfo
+import android.companion.CompanionDeviceManager
+import android.companion.cts.common.MAC_ADDRESS_A
+import android.companion.cts.common.MAC_ADDRESS_B
+import android.companion.cts.common.MAC_ADDRESS_C
+import android.companion.cts.common.assertAssociations
+import android.companion.cts.common.assertEmpty
+import android.net.MacAddress
+import android.platform.test.annotations.AppModeFull
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertFailsWith
+import kotlin.test.fail
+
+/**
+ * Test CDM APIs for removing existing associations.
+ *
+ * Run: atest CtsCompanionDeviceManagerCoreTestCases:DisassociateTest
+ *
+ * @see android.companion.CompanionDeviceManager.disassociate
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(AndroidJUnit4::class)
+class DisassociateTest : CoreTestBase() {
+    @Test
+    fun test_disassociate_sameApp_singleAssociation() = with(targetApp) {
+        associate(MAC_ADDRESS_A)
+
+        val associations = cdm.myAssociations
+        assertAssociations(
+                actual = associations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A
+                ))
+
+        cdm.disassociate(associations[0].id)
+        assertEmpty(cdm.myAssociations)
+    }
+
+    @Test
+    fun test_disassociate_sameApp_multipleAssociations() = with(targetApp) {
+        associate(MAC_ADDRESS_A)
+        associate(MAC_ADDRESS_B)
+        associate(MAC_ADDRESS_C)
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A,
+                        packageName to MAC_ADDRESS_B,
+                        packageName to MAC_ADDRESS_C
+                ))
+
+        cdm.disassociate(cdm.getMyAssociationLinkedTo(MAC_ADDRESS_A).id)
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_B,
+                        packageName to MAC_ADDRESS_C
+                ))
+
+        cdm.disassociate(cdm.getMyAssociationLinkedTo(MAC_ADDRESS_B).id)
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_C
+                ))
+
+        cdm.disassociate(cdm.getMyAssociationLinkedTo(MAC_ADDRESS_C).id)
+        assertEmpty(cdm.myAssociations)
+    }
+
+    @Test
+    fun test_disassociate_anotherApp_requiresPermission() = with(testApp) {
+        associate(MAC_ADDRESS_A)
+        assertAssociations(
+                actual = withShellPermissionIdentity { cdm.allAssociations },
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A
+                ))
+
+        val association = withShellPermissionIdentity {
+            cdm.getAssociationForPackage(userId, packageName, MAC_ADDRESS_A)
+        }
+
+        /**
+         * Attempts to remove another app's association without [MANAGE_COMPANION_DEVICES]
+         * permission should throw an Exception and should not change the existing associations.
+         */
+        assertFailsWith(IllegalArgumentException::class) {
+            cdm.disassociate(association.id)
+        }
+        assertAssociations(
+                actual = withShellPermissionIdentity { cdm.allAssociations },
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A
+                ))
+
+        /**
+         * Re-running with [MANAGE_COMPANION_DEVICES] permissions: now should succeed and remove
+         * the association.
+         */
+        withShellPermissionIdentity(MANAGE_COMPANION_DEVICES) {
+            cdm.disassociate(association.id)
+        }
+        assertEmpty(
+                withShellPermissionIdentity {
+                    cdm.allAssociations
+                })
+    }
+
+    @Test
+    fun test_disassociate_invalidId() {
+        assertEmpty(
+                withShellPermissionIdentity {
+                    cdm.allAssociations
+                })
+
+        assertFailsWith(IllegalArgumentException::class) { cdm.disassociate(0) }
+        assertFailsWith(IllegalArgumentException::class) { cdm.disassociate(1) }
+        assertFailsWith(IllegalArgumentException::class) { cdm.disassociate(-1) }
+    }
+
+    private fun CompanionDeviceManager.getMyAssociationLinkedTo(
+        macAddress: MacAddress
+    ): AssociationInfo = myAssociations.find { it.deviceMacAddress == macAddress }
+                    ?: fail("Association linked to address $macAddress does not exist")
+
+    private fun CompanionDeviceManager.getAssociationForPackage(
+        @UserIdInt userId: Int,
+        packageName: String,
+        macAddress: MacAddress
+    ): AssociationInfo = allAssociations.find {
+        it.belongsToPackage(userId, packageName) && it.deviceMacAddress == macAddress
+    } ?: fail("Association for u$userId/$packageName linked to address $macAddress does not exist")
+}
\ No newline at end of file
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/LegacyDisassociateTest.kt b/tests/tests/companion/core/src/android/companion/cts/core/LegacyDisassociateTest.kt
new file mode 100644
index 0000000..56fe2b3
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/LegacyDisassociateTest.kt
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.core
+
+import android.Manifest.permission.MANAGE_COMPANION_DEVICES
+import android.companion.cts.common.MAC_ADDRESS_A
+import android.companion.cts.common.MAC_ADDRESS_B
+import android.companion.cts.common.MAC_ADDRESS_C
+import android.companion.cts.common.assertAssociations
+import android.companion.cts.common.assertEmpty
+import android.platform.test.annotations.AppModeFull
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertFailsWith
+
+/**
+ * Test legacy CDM APIs for removing existing associations (via MAC address)
+ *
+ * Run: atest CtsCompanionDeviceManagerCoreTestCases:DisassociateTest
+ *
+ * @see android.companion.CompanionDeviceManager.disassociate
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(AndroidJUnit4::class)
+class LegacyDisassociateTest : CoreTestBase() {
+    @Test
+    fun test_legacy_disassociate_sameApp() = with(targetApp) {
+        associate(MAC_ADDRESS_A)
+        associate(MAC_ADDRESS_B)
+        associate(MAC_ADDRESS_C)
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A,
+                        packageName to MAC_ADDRESS_B,
+                        packageName to MAC_ADDRESS_C
+                ))
+
+        cdm.disassociate(MAC_ADDRESS_A.toString())
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_B,
+                        packageName to MAC_ADDRESS_C
+                ))
+
+        cdm.disassociate(MAC_ADDRESS_B.toString())
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_C
+                ))
+
+        cdm.disassociate(MAC_ADDRESS_C.toString())
+        assertEmpty(cdm.myAssociations)
+    }
+
+    @Test
+    fun test_legacy_disassociate_anotherApp() = with(testApp) {
+        associate(MAC_ADDRESS_A)
+        assertAssociations(
+                actual = withShellPermissionIdentity { cdm.allAssociations },
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A
+                ))
+
+        /** Cannot remove another app's association by MAC address. */
+        assertFailsWith(IllegalArgumentException::class) {
+            cdm.disassociate(MAC_ADDRESS_A.toString())
+        }
+        assertAssociations(
+                actual = withShellPermissionIdentity { cdm.allAssociations },
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A
+                ))
+
+        /** ...not even with [MANAGE_COMPANION_DEVICES] permission. */
+        assertFailsWith(IllegalArgumentException::class) {
+            withShellPermissionIdentity(MANAGE_COMPANION_DEVICES) {
+                cdm.disassociate(MAC_ADDRESS_A.toString())
+            }
+        }
+        assertAssociations(
+                actual = withShellPermissionIdentity { cdm.allAssociations },
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A
+                ))
+    }
+
+    @Test
+    fun test_disassociate_invalidId() {
+        assertEmpty(
+                withShellPermissionIdentity {
+                    cdm.allAssociations
+                })
+
+        assertFailsWith(IllegalArgumentException::class) {
+            cdm.disassociate(MAC_ADDRESS_A.toString())
+        }
+        assertFailsWith(IllegalArgumentException::class) {
+            cdm.disassociate(MAC_ADDRESS_B.toString())
+        }
+        assertFailsWith(IllegalArgumentException::class) {
+            cdm.disassociate(MAC_ADDRESS_C.toString())
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/RetrieveAssociationsTest.kt b/tests/tests/companion/core/src/android/companion/cts/core/RetrieveAssociationsTest.kt
new file mode 100644
index 0000000..538cfa9
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/RetrieveAssociationsTest.kt
@@ -0,0 +1,235 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.core
+
+import android.Manifest
+import android.Manifest.permission.MANAGE_COMPANION_DEVICES
+import android.companion.cts.common.MAC_ADDRESS_A
+import android.companion.cts.common.MAC_ADDRESS_B
+import android.companion.cts.common.MAC_ADDRESS_C
+import android.companion.cts.common.assertAssociations
+import android.companion.cts.common.assertEmpty
+import android.companion.cts.common.runShellCommand
+import android.platform.test.annotations.AppModeFull
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertNotEquals
+import kotlin.test.assertNotNull
+
+/**
+ * Test CDM APIs for retrieving the list of existing associations.
+ *
+ * Run: atest CtsCompanionDeviceManagerCoreTestCases:RetrieveAssociationsTest
+ *
+ * @see android.companion.CompanionDeviceManager.getAllAssociations
+ * @see android.companion.CompanionDeviceManager.getMyAssociations
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(AndroidJUnit4::class)
+class RetrieveAssociationsTest : CoreTestBase() {
+
+    @Test
+    fun test_getMyAssociations_singleAssociation() = with(targetApp) {
+        assertEmpty(cdm.myAssociations)
+
+        associate(MAC_ADDRESS_A)
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A
+                ))
+
+        disassociate(MAC_ADDRESS_A)
+        assertEmpty(cdm.myAssociations)
+    }
+
+    @Test
+    fun test_getMyAssociations_multipleAssociations() = with(targetApp) {
+        assertEmpty(cdm.myAssociations)
+
+        associate(MAC_ADDRESS_A)
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A
+                ))
+
+        associate(MAC_ADDRESS_B)
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A,
+                        packageName to MAC_ADDRESS_B
+                ))
+
+        associate(MAC_ADDRESS_C)
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A,
+                        packageName to MAC_ADDRESS_B,
+                        packageName to MAC_ADDRESS_C
+                ))
+
+        disassociate(MAC_ADDRESS_A)
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_B,
+                        packageName to MAC_ADDRESS_C
+                ))
+
+        disassociate(MAC_ADDRESS_B)
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(
+                        packageName to MAC_ADDRESS_C
+                ))
+
+        disassociate(MAC_ADDRESS_C)
+        assertEmpty(cdm.myAssociations)
+    }
+
+    @Test
+    fun test_getMyAssociations_otherPackages_NotIncluded() {
+        testApp.associate(MAC_ADDRESS_A)
+        assertEmpty(cdm.myAssociations)
+
+        targetApp.associate(MAC_ADDRESS_B)
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(targetApp.packageName to MAC_ADDRESS_B))
+
+        testApp.associate(MAC_ADDRESS_C)
+        assertAssociations(
+                actual = cdm.myAssociations,
+                expected = setOf(targetApp.packageName to MAC_ADDRESS_B))
+
+        targetApp.disassociate(MAC_ADDRESS_B)
+        assertEmpty(cdm.myAssociations)
+    }
+
+    @Test
+    fun test_getAllAssociations_requiresPermission() {
+        /**
+         * Attempts to get the list of all associations for the (current) user without
+         * [MANAGE_COMPANION_DEVICES] permission should throw a [SecurityException].
+         */
+        assertFailsWith(SecurityException::class) {
+            cdm.allAssociations
+        }
+
+        /**
+         * Re-running with [MANAGE_COMPANION_DEVICES] permissions: now should succeed and return a
+         * non-null list.
+         */
+        assertNotNull(
+                withShellPermissionIdentity(MANAGE_COMPANION_DEVICES) {
+                    cdm.allAssociations
+                })
+    }
+
+    @Test
+    fun test_getAllAssociations_sameApp() = with(targetApp) {
+        associate(MAC_ADDRESS_A)
+        assertAssociations(
+                actual = withShellPermissionIdentity { cdm.allAssociations },
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A
+                ))
+
+        disassociate(MAC_ADDRESS_A)
+        assertEmpty(withShellPermissionIdentity { cdm.allAssociations })
+    }
+
+    @Test
+    fun test_getAllAssociations_otherApps() = with(testApp) {
+        associate(MAC_ADDRESS_A)
+        assertAssociations(
+                actual = withShellPermissionIdentity { cdm.allAssociations },
+                expected = setOf(
+                        packageName to MAC_ADDRESS_A
+                ))
+
+        disassociate(MAC_ADDRESS_A)
+        assertEmpty(withShellPermissionIdentity { cdm.allAssociations })
+    }
+
+    @Test
+    fun test_getAllAssociations_sameAndOtherApps() {
+        targetApp.associate(MAC_ADDRESS_A)
+        testApp.associate(MAC_ADDRESS_B)
+
+        assertAssociations(
+                actual = withShellPermissionIdentity { cdm.allAssociations },
+                expected = setOf(
+                        targetApp.packageName to MAC_ADDRESS_A,
+                        testApp.packageName to MAC_ADDRESS_B
+                ))
+    }
+
+    @Test
+    fun test_ObservePresence_updatesAssociationInfo() {
+        targetApp.associate(MAC_ADDRESS_A)
+
+        // Ensure the new association is stored in the CDM
+        val associationsBeforeChange = cdm.myAssociations
+        assertEquals(1, associationsBeforeChange.size)
+        val associationInfo = cdm.myAssociations.first()
+
+        // update the underlying association
+        withShellPermissionIdentity(Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) {
+            cdm.startObservingDevicePresence(MAC_ADDRESS_A.toString())
+        }
+
+        // Assert the association change was reflected
+        val associationsAfterUpdate = cdm.myAssociations
+        assertEquals(1, associationsAfterUpdate.size)
+        assertNotEquals(
+            actual = associationsAfterUpdate.first(),
+            illegal = associationInfo
+        )
+    }
+
+    @Test
+    fun test_associationChanges_persistCorrectly() {
+        targetApp.associate(MAC_ADDRESS_A)
+
+        // update the association
+        withShellPermissionIdentity(Manifest.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE) {
+            cdm.startObservingDevicePresence(MAC_ADDRESS_A.toString())
+        }
+
+        val associationsBeforeClearCache = cdm.myAssociations
+        assertEquals(1, associationsBeforeClearCache.size)
+
+        // drop the in-memory association cache of the cdm
+        // and force it to re-read from persistent storage
+        instrumentation.runShellCommand("cmd companiondevice clear-association-memory-cache")
+
+        val associationsAfterClearCache = cdm.myAssociations
+        assertEquals(1, associationsAfterClearCache.size)
+        assertContentEquals(
+            actual = associationsAfterClearCache,
+            expected = associationsBeforeClearCache
+        )
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/core/src/android/companion/cts/core/SelfPresenceReportingTest.kt b/tests/tests/companion/core/src/android/companion/cts/core/SelfPresenceReportingTest.kt
new file mode 100644
index 0000000..54cc1e6
--- /dev/null
+++ b/tests/tests/companion/core/src/android/companion/cts/core/SelfPresenceReportingTest.kt
@@ -0,0 +1,207 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.core
+
+import android.Manifest.permission.REQUEST_COMPANION_SELF_MANAGED
+import android.companion.cts.common.DEVICE_DISPLAY_NAME_A
+import android.companion.cts.common.DEVICE_DISPLAY_NAME_B
+import android.companion.cts.common.MAC_ADDRESS_A
+import android.companion.cts.common.MissingIntentFilterActionCompanionService
+import android.companion.cts.common.MissingPermissionCompanionService
+import android.companion.cts.common.PrimaryCompanionService
+import android.companion.cts.common.SecondaryCompanionService
+import android.companion.cts.common.assertEmpty
+import android.companion.cts.common.waitFor
+import android.os.SystemClock.sleep
+import android.platform.test.annotations.AppModeFull
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertContentEquals
+import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * Tests CDM APIs for notifying the presence of status of the companion devices for self-managed
+ * associations.
+ *
+ * Build/Install/Run: atest CtsCompanionDeviceManagerCoreTestCases:SelfPresenceReportingTest
+ *
+ * @see android.companion.CompanionDeviceManager.notifyDeviceAppeared
+ * @see android.companion.CompanionDeviceManager.notifyDeviceDisappeared
+ * @see android.companion.CompanionDeviceService.onDeviceAppeared
+ * @see android.companion.CompanionDeviceService.onDeviceDisappeared
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(AndroidJUnit4::class)
+class SelfPresenceReportingTest : CoreTestBase() {
+
+    @Test
+    fun test_selfReporting_singleDevice_multipleServices() =
+            withShellPermissionIdentity(REQUEST_COMPANION_SELF_MANAGED) {
+        val associationId = createSelfManagedAssociation(DEVICE_DISPLAY_NAME_A)
+
+        cdm.notifyDeviceAppeared(associationId)
+
+        assertTrue("Both valid CompanionDeviceServices - Primary and Secondary - should be bound " +
+                "now") {
+            waitFor(timeout = 1.seconds, interval = 100.milliseconds) {
+                PrimaryCompanionService.isBound && SecondaryCompanionService.isBound
+            }
+        }
+        assertFalse("CompanionDeviceServices that do not require " +
+                "BIND_COMPANION_DEVICE_SERVICE permission or do not declare an intent-filter for " +
+                "\"android.companion.CompanionDeviceService\" action should not be bound") {
+            MissingPermissionCompanionService.isBound ||
+                    MissingIntentFilterActionCompanionService.isBound
+        }
+
+        // Check that only the primary CompanionDeviceService has received the onDeviceAppeared()
+        // callback...
+        PrimaryCompanionService.waitAssociationToAppear(associationId)
+        assertContentEquals(
+                actual = PrimaryCompanionService.associationIdsForConnectedDevices,
+                expected = setOf(associationId)
+        )
+        // ... while neither the non-primary nor incorrectly defined CompanionDeviceServices -
+        // have NOT. (Give it 1 more second.)
+        sleep(1000)
+        assertEmpty(SecondaryCompanionService.connectedDevices)
+        assertEmpty(MissingPermissionCompanionService.connectedDevices)
+        assertEmpty(MissingIntentFilterActionCompanionService.connectedDevices)
+
+        assertFalse("Both valid CompanionDeviceServices - Primary and Secondary - should stay " +
+                "bound ") {
+            waitFor(timeout = 1.seconds, interval = 100.milliseconds) {
+                !PrimaryCompanionService.isBound || !SecondaryCompanionService.isBound
+            }
+        }
+
+        cdm.notifyDeviceDisappeared(associationId)
+
+        // Check that only the primary services has received the onDeviceDisappeared() callback.
+        PrimaryCompanionService.waitAssociationToDisappear(associationId)
+        assertEmpty(PrimaryCompanionService.connectedDevices)
+
+        assertTrue("Both Services - Primary and Secondary - should be unbound now") {
+            waitFor(timeout = 1.seconds, interval = 100.milliseconds) {
+                !PrimaryCompanionService.isBound && !SecondaryCompanionService.isBound
+            }
+        }
+    }
+
+    @Test
+    fun test_selfReporting_multipleDevices_multipleServices() {
+        val idA = createSelfManagedAssociation(DEVICE_DISPLAY_NAME_A)
+        val idB = createSelfManagedAssociation(DEVICE_DISPLAY_NAME_B)
+
+        cdm.notifyDeviceAppeared(idA)
+
+        assertTrue("Both valid CompanionDeviceServices - Primary and Secondary - should be bound " +
+                "now") {
+            waitFor(timeout = 1.seconds, interval = 100.milliseconds) {
+                PrimaryCompanionService.isBound && SecondaryCompanionService.isBound
+            }
+        }
+        assertFalse("CompanionDeviceServices that do not require " +
+                "BIND_COMPANION_DEVICE_SERVICE permission or do not declare an intent-filter for " +
+                "\"android.companion.CompanionDeviceService\" action should not be bound") {
+            MissingPermissionCompanionService.isBound ||
+                    MissingIntentFilterActionCompanionService.isBound
+        }
+
+        // Check that only the primary services has received the onDeviceAppeared() callback...
+        PrimaryCompanionService.waitAssociationToAppear(idA)
+        assertContentEquals(
+            actual = PrimaryCompanionService.associationIdsForConnectedDevices,
+            expected = setOf(idA)
+        )
+        // ... while neither the non-primary nor incorrectly defined CompanionDeviceServices -
+        // have NOT. (Give it 1 more second.)
+        sleep(1000)
+        assertEmpty(SecondaryCompanionService.connectedDevices)
+        assertEmpty(MissingPermissionCompanionService.connectedDevices)
+        assertEmpty(MissingIntentFilterActionCompanionService.connectedDevices)
+
+        cdm.notifyDeviceAppeared(idB)
+
+        // Check that only the primary services has received the onDeviceAppeared() callback.
+        PrimaryCompanionService.waitAssociationToAppear(idB)
+        assertContentEquals(
+            actual = PrimaryCompanionService.associationIdsForConnectedDevices,
+            expected = setOf(idA, idB)
+        )
+
+        // Make sure both valid services stay bound.
+        assertFalse("Both valid CompanionDeviceServices - Primary and Secondary - should stay " +
+                "bound ") {
+            waitFor(timeout = 1.seconds, interval = 100.milliseconds) {
+                !PrimaryCompanionService.isBound || !SecondaryCompanionService.isBound
+            }
+        }
+
+        // "Disconnect" first device (A).
+        cdm.notifyDeviceDisappeared(idA)
+
+        PrimaryCompanionService.waitAssociationToDisappear(idA)
+        // Both valid services should stay bound for as long as there is at least one connected
+        // device - device B in this case.
+        assertFalse("Both valid CompanionDeviceServices - Primary and Secondary - should stay " +
+                "bound ") {
+            waitFor(timeout = 3.seconds, interval = 1.milliseconds) {
+                !PrimaryCompanionService.isBound || !SecondaryCompanionService.isBound
+            }
+        }
+
+        // "Disconnect" second device (B).
+        cdm.notifyDeviceDisappeared(idB)
+
+        PrimaryCompanionService.waitAssociationToDisappear(idB)
+        assertTrue("Both Services - Primary and Secondary - should be unbound now") {
+            waitFor(timeout = 1.seconds, interval = 100.milliseconds) {
+                !PrimaryCompanionService.isBound && !SecondaryCompanionService.isBound
+            }
+        }
+    }
+
+    @Test
+    fun test_notifyAppearAndDisappear_invalidId() {
+        assertFailsWith(IllegalArgumentException::class) { cdm.notifyDeviceAppeared(-1) }
+        assertFailsWith(IllegalArgumentException::class) { cdm.notifyDeviceAppeared(0) }
+        assertFailsWith(IllegalArgumentException::class) { cdm.notifyDeviceAppeared(1) }
+
+        assertFailsWith(IllegalArgumentException::class) { cdm.notifyDeviceDisappeared(-1) }
+        assertFailsWith(IllegalArgumentException::class) { cdm.notifyDeviceDisappeared(0) }
+        assertFailsWith(IllegalArgumentException::class) { cdm.notifyDeviceDisappeared(1) }
+    }
+
+    @Test
+    fun test_notifyAppears_requires_selfManagedAssociation() {
+        // Create NOT "self-managed" association
+        targetApp.associate(MAC_ADDRESS_A)
+
+        val id = cdm.myAssociations[0].id
+
+        // notifyDeviceAppeared can only be called for self-managed associations.
+        assertFailsWith(IllegalArgumentException::class) {
+            cdm.notifyDeviceAppeared(id)
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/noservices/AndroidManifest.xml b/tests/tests/companion/noservices/AndroidManifest.xml
new file mode 100644
index 0000000..a851ff4
--- /dev/null
+++ b/tests/tests/companion/noservices/AndroidManifest.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2022 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.companion.cts.noservices">
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.companion.cts.noservices"
+        android:label="CompanionDeviceManager No-CompanionDeviceServices CTS tests">
+
+        <meta-data
+            android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+    <application>
+        <!--
+        "Re-define" PrimaryCompanionService and SecondaryCompanionService services defined in
+        common/AndroidManifest.xml. This should leave the package without any valid
+        CompanionDeviceServices.
+        -->
+        <service
+            android:name="android.companion.cts.common.PrimaryCompanionService"
+            android:enabled="false" />
+        <service
+            android:name="android.companion.cts.common.SecondaryCompanionService"
+            android:enabled="false" />
+    </application>
+
+</manifest>
+
diff --git a/tests/tests/companion/noservices/AndroidTest.xml b/tests/tests/companion/noservices/AndroidTest.xml
new file mode 100644
index 0000000..fd7a954
--- /dev/null
+++ b/tests/tests/companion/noservices/AndroidTest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<configuration description="Configuration for No-Companion-Devices-Services CTS tests for CompanionDeviceManager">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+    <option name="not-shardable" value="true" />
+    <option name="test-suite-tag" value="cts" />
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsCompanionDeviceManagerNoCompanionServicesTestCases.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.companion.cts.noservices" />
+        <option name="runtime-hint" value="1s" />
+    </test>
+
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="am wait-for-broadcast-idle" />
+    </target_preparer>
+</configuration>
diff --git a/tests/tests/companion/noservices/src/android/companion/cts/noservices/NoCompanionDeviceServiceTest.kt b/tests/tests/companion/noservices/src/android/companion/cts/noservices/NoCompanionDeviceServiceTest.kt
new file mode 100644
index 0000000..92d468c
--- /dev/null
+++ b/tests/tests/companion/noservices/src/android/companion/cts/noservices/NoCompanionDeviceServiceTest.kt
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2022 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 android.companion.cts.noservices
+
+import android.Manifest.permission.REQUEST_COMPANION_SELF_MANAGED
+import android.companion.cts.common.DEVICE_DISPLAY_NAME_A
+import android.companion.cts.common.MissingIntentFilterActionCompanionService
+import android.companion.cts.common.MissingPermissionCompanionService
+import android.companion.cts.common.PrimaryCompanionService
+import android.companion.cts.common.SecondaryCompanionService
+import android.companion.cts.common.TestBase
+import android.companion.cts.common.waitFor
+import android.platform.test.annotations.AppModeFull
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Test
+import org.junit.runner.RunWith
+import kotlin.test.assertFalse
+import kotlin.time.Duration.Companion.milliseconds
+import kotlin.time.Duration.Companion.seconds
+
+/**
+ * Tests CDM handling the case when the companion application does not define a valid
+ * [CompanionDeviceService][android.companion.CompanionDeviceService].
+ *
+ * Build/Install/Run:
+ * atest CtsCompanionDeviceManagerNoCompanionServicesTestCases:NoCompanionDeviceServiceTest
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(AndroidJUnit4::class)
+class NoCompanionDeviceServiceTest : TestBase() {
+
+    /**
+     * Ensures that CDM service DOES NOT try to bind
+     * [CompanionDeviceServices][android.companion.CompanionDeviceService] that do not meet all the
+     * requirements, as well as that the system's stability in case when the companion applications
+     * do not define any valid CompanionDeviceServices.
+     */
+    @Test
+    fun test_noService() =
+            withShellPermissionIdentity(REQUEST_COMPANION_SELF_MANAGED) {
+                val associationId = createSelfManagedAssociation(DEVICE_DISPLAY_NAME_A)
+
+                // This should neither throw an Exception nor cause system to crash, even when the
+                // companion application does not define any valid CompanionDeviceServices.
+                // (If the system crashes this instrumentation test won't complete).
+                cdm.notifyDeviceAppeared(associationId)
+
+                // Every 100ms check if any of the services is bound or received a callback.
+                assertFalse("None of the services should be bound or receive a callback") {
+                    waitFor(timeout = 1.seconds, interval = 100.milliseconds) {
+                        val isBound = PrimaryCompanionService.isBound ||
+                                SecondaryCompanionService.isBound ||
+                                MissingPermissionCompanionService.isBound ||
+                                MissingIntentFilterActionCompanionService.isBound
+                        val receivedCallback =
+                                PrimaryCompanionService.connectedDevices.isNotEmpty() ||
+                                SecondaryCompanionService.connectedDevices.isNotEmpty() ||
+                                MissingPermissionCompanionService.connectedDevices.isNotEmpty() ||
+                                MissingIntentFilterActionCompanionService.connectedDevices
+                                        .isNotEmpty()
+                        return@waitFor isBound || receivedCallback
+                    }
+                }
+
+                // This should neither throw an Exception nor cause system to crash, even when the
+                // companion application does not define any valid CompanionDeviceServices.
+                // (If the system crashes this instrumentation test won't complete).
+                cdm.notifyDeviceDisappeared(associationId)
+            }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/uiautomation/AndroidManifest.xml b/tests/tests/companion/uiautomation/AndroidManifest.xml
new file mode 100644
index 0000000..a6052fe
--- /dev/null
+++ b/tests/tests/companion/uiautomation/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2016 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.companion.cts.uiautomation">
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.companion.cts.uiautomation"
+        android:label="CompanionDeviceManager UiAutomation CTS tests">
+
+        <meta-data
+            android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
+
diff --git a/tests/tests/companion/uiautomation/AndroidTest.xml b/tests/tests/companion/uiautomation/AndroidTest.xml
new file mode 100644
index 0000000..9982689
--- /dev/null
+++ b/tests/tests/companion/uiautomation/AndroidTest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<configuration description="Configuration for UiAutomation CTS tests for CompanionDeviceManager">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+    <option name="not-shardable" value="true" />
+    <option name="test-suite-tag" value="cts" />
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsCompanionDeviceManagerUiAutomationTestCases.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.companion.cts.uiautomation" />
+    </test>
+
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="input keyevent KEYCODE_WAKEUP" />
+        <option name="run-command" value="wm dismiss-keyguard" />
+        <option name="run-command" value="am wait-for-broadcast-idle" />
+    </target_preparer>
+</configuration>
diff --git a/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/AssociationEndToEndSelfManagedTest.kt b/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/AssociationEndToEndSelfManagedTest.kt
new file mode 100644
index 0000000..ca63dd2
--- /dev/null
+++ b/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/AssociationEndToEndSelfManagedTest.kt
@@ -0,0 +1,101 @@
+package android.companion.cts.uiautomation
+
+import android.app.Activity
+import android.companion.AssociationInfo
+import android.companion.AssociationRequest.DEVICE_PROFILE_WATCH
+import android.companion.CompanionDeviceManager
+import android.companion.cts.common.CompanionActivity
+import android.companion.cts.common.RecordingCallback.OnAssociationCreated
+import android.content.Intent
+import android.platform.test.annotations.AppModeFull
+import org.junit.Assume.assumeFalse
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+
+/**
+ * Tests the Association Flow end-to-end.
+ *
+ * Build/Install/Run:
+ * atest CtsCompanionDeviceManagerUiAutomationTestCases:AssociationEndToEndSelfManagedTest
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(Parameterized::class)
+class AssociationEndToEndSelfManagedTest(
+    profile: String?,
+    profilePermission: String?,
+    profileName: String // Used only by the Parameterized test runner for tagging.
+) : UiAutomationTestBase(profile, profilePermission) {
+
+    override fun setUp() {
+        super.setUp()
+
+        // TODO(b/211602270): Add support for WATCH and "null" profiles in the
+        // confirmation UI (the "self-managed" flow variant).
+        assumeFalse(profile == null)
+        assumeFalse(profile == DEVICE_PROFILE_WATCH)
+    }
+
+    @Test
+    fun test_userRejected() = super.test_userRejected(
+            singleDevice = false, selfManaged = true, displayName = DEVICE_DISPLAY_NAME)
+
+    @Test
+    fun test_userDismissed() = super.test_userDismissed(
+            singleDevice = false, selfManaged = true, displayName = DEVICE_DISPLAY_NAME)
+
+    @Test
+    fun test_userConfirmed() {
+        sendRequestAndLaunchConfirmation(selfManaged = true, displayName = DEVICE_DISPLAY_NAME)
+
+        callback.assertInvokedByActions {
+            // User "approves" the request.
+            confirmationUi.clickPositiveButton()
+        }
+        // Check callback invocations: there should have been exactly 1 invocation of the
+        // OnAssociationCreated() method.
+        assertEquals(1, callback.invocations.size)
+        val associationInvocation = callback.invocations.first()
+        assertIs<OnAssociationCreated>(associationInvocation)
+        val associationFromCallback = associationInvocation.associationInfo
+        assertEquals(actual = associationFromCallback.displayName, expected = DEVICE_DISPLAY_NAME)
+
+        // Wait until the Confirmation UI goes away.
+        confirmationUi.waitUntilGone()
+
+        // Check the result code and the data delivered via onActivityResult()
+        val (resultCode: Int, data: Intent?) = CompanionActivity.waitForActivityResult()
+        assertEquals(actual = resultCode, expected = Activity.RESULT_OK)
+        assertNotNull(data)
+        val associationFromActivityResult: AssociationInfo? =
+                data.getParcelableExtra(CompanionDeviceManager.EXTRA_ASSOCIATION)
+        assertNotNull(associationFromActivityResult)
+        // Check that the association reported back via the callback same as the association
+        // delivered via onActivityResult().
+        assertEquals(associationFromCallback, associationFromActivityResult)
+
+        // Make sure getMyAssociations() returns the same association we received via the callback
+        // as well as in onActivityResult()
+        assertContentEquals(actual = cdm.myAssociations, expected = listOf(associationFromCallback))
+
+        // Make sure that the role (for the current CDM device profile) was granted.
+        assertIsProfileRoleHolder()
+    }
+
+    companion object {
+        /**
+         * List of (profile, permission, name) tuples that represent all supported profiles and
+         * null.
+         * Each test will be suffixed with "[profile=<NAME>]", e.g.: "[profile=WATCH]".
+         */
+        @Parameterized.Parameters(name = "profile={2}")
+        @JvmStatic
+        fun parameters() = supportedProfilesAndNull()
+
+        private const val DEVICE_DISPLAY_NAME = "My Device"
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/AssociationEndToEndSingleDeviceTest.kt b/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/AssociationEndToEndSingleDeviceTest.kt
new file mode 100644
index 0000000..92e1b49
--- /dev/null
+++ b/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/AssociationEndToEndSingleDeviceTest.kt
@@ -0,0 +1,67 @@
+package android.companion.cts.uiautomation
+
+import android.companion.AssociationRequest.DEVICE_PROFILE_APP_STREAMING
+import android.companion.AssociationRequest.DEVICE_PROFILE_AUTOMOTIVE_PROJECTION
+import android.companion.AssociationRequest.DEVICE_PROFILE_COMPUTER
+
+import android.platform.test.annotations.AppModeFull
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+
+import org.junit.Assume.assumeFalse
+
+/**
+ * Tests the Association Flow end-to-end.
+ *
+ * Build/Install/Run:
+ * atest CtsCompanionDeviceManagerUiAutomationTestCases:AssociationEndToEndSingleDeviceTest
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(Parameterized::class)
+class AssociationEndToEndSingleDeviceTest(
+    profile: String?,
+    profilePermission: String?,
+    profileName: String // Used only by the Parameterized test runner for tagging.
+) : UiAutomationTestBase(profile, profilePermission) {
+
+    override fun setUp() {
+        super.setUp()
+
+        // TODO(b/211722613): Add support for DEVICE_PROFILE_APP_STREAMING
+        // DEVICE_PROFILE_COMPUTER and DEVICE_PROFILE_AUTOMOTIVE_PROJECTION
+        // profiles in the confirmation UI (the "single_device" flow variant).
+        assumeFalse(profile == DEVICE_PROFILE_COMPUTER)
+        assumeFalse(profile == DEVICE_PROFILE_APP_STREAMING)
+        assumeFalse(profile == DEVICE_PROFILE_AUTOMOTIVE_PROJECTION)
+    }
+
+    @Test
+    fun test_userRejected() =
+            super.test_userRejected(singleDevice = true, selfManaged = false, displayName = null)
+
+    @Test
+    fun test_userDismissed() =
+            super.test_userDismissed(singleDevice = true, selfManaged = false, displayName = null)
+
+    @Test
+    fun test_timeout() = super.test_timeout(singleDevice = true)
+
+    @Test
+    fun test_userConfirmed() = super.test_userConfirmed_foundDevice(singleDevice = true) {
+        // Wait until a device is found, which should activate the "positive" button, and click on
+        // the button.
+        confirmationUi.waitUntilPositiveButtonIsEnabledAndClick()
+    }
+
+    companion object {
+        /**
+         * List of (profile, permission, name) tuples that represent all supported profiles and
+         * null.
+         * Each test will be suffixed with "[profile=<NAME>]", e.g.: "[profile=WATCH]".
+         */
+        @Parameterized.Parameters(name = "profile={2}")
+        @JvmStatic
+        fun parameters() = supportedProfilesAndNull()
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/AssociationEndToEndTest.kt b/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/AssociationEndToEndTest.kt
new file mode 100644
index 0000000..ffc52eb
--- /dev/null
+++ b/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/AssociationEndToEndTest.kt
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.uiautomation
+
+import android.companion.AssociationRequest.DEVICE_PROFILE_APP_STREAMING
+import android.companion.AssociationRequest.DEVICE_PROFILE_AUTOMOTIVE_PROJECTION
+import android.companion.AssociationRequest.DEVICE_PROFILE_COMPUTER
+import android.platform.test.annotations.AppModeFull
+import org.junit.Assume.assumeFalse
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+
+/**
+ * Tests the Association Flow end-to-end.
+ *
+ * Build/Install/Run: atest CtsCompanionDeviceManagerUiAutomationTestCases:AssociationEndToEndTest
+ */
+@AppModeFull(reason = "CompanionDeviceManager APIs are not available to the instant apps.")
+@RunWith(Parameterized::class)
+class AssociationEndToEndTest(
+    profile: String?,
+    profilePermission: String?,
+    profileName: String // Used only by the Parameterized test runner for tagging.
+) : UiAutomationTestBase(profile, profilePermission) {
+
+    override fun setUp() {
+        super.setUp()
+
+        // TODO(b/211590680): Add support for APP_STREAMING, AUTOMOTIVE_PROJECTION and COMPUTER
+        // in the confirmation UI (the "multiple devices" flow variant).
+        assumeFalse(profile == DEVICE_PROFILE_COMPUTER)
+        assumeFalse(profile == DEVICE_PROFILE_APP_STREAMING)
+        assumeFalse(profile == DEVICE_PROFILE_AUTOMOTIVE_PROJECTION)
+    }
+
+    @Test
+    fun test_userRejected() =
+            super.test_userRejected(singleDevice = false, selfManaged = false, displayName = null)
+
+    @Test
+    fun test_userDismissed() =
+            super.test_userDismissed(singleDevice = false, selfManaged = false, displayName = null)
+
+    @Test
+    fun test_userConfirmed() = super.test_userConfirmed_foundDevice(singleDevice = false) {
+        // Wait until at least one device is found and click on it.
+        confirmationUi.waitAndClickOnFirstFoundDevice()
+    }
+
+    @Test
+    fun test_timeout() = super.test_timeout(singleDevice = false)
+
+    companion object {
+        /**
+         * List of (profile, permission, name) tuples that represent all supported profiles and
+         * null.
+         * Each test will be suffixed with "[profile=<NAME>]", e.g.: "[profile=WATCH]".
+         */
+        @Parameterized.Parameters(name = "profile={2}")
+        @JvmStatic
+        fun parameters() = supportedProfilesAndNull()
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/CompanionDeviceManagerUi.kt b/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/CompanionDeviceManagerUi.kt
new file mode 100644
index 0000000..8b8ead8
--- /dev/null
+++ b/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/CompanionDeviceManagerUi.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2021 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 android.companion.cts.uiautomation
+
+import androidx.test.uiautomator.By
+import androidx.test.uiautomator.BySelector
+import androidx.test.uiautomator.SearchCondition
+import androidx.test.uiautomator.UiDevice
+import androidx.test.uiautomator.UiObject2
+import androidx.test.uiautomator.Until
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+class CompanionDeviceManagerUi(private val ui: UiDevice) {
+    val isVisible: Boolean
+        get() = ui.hasObject(CONFIRMATION_UI)
+
+    fun dismiss() {
+        if (!isVisible) return
+        // Pressing back button should close (cancel) confirmation UI.
+        ui.pressBack()
+        waitUntilGone()
+    }
+
+    fun waitUntilVisible() = ui.wait(Until.hasObject(CONFIRMATION_UI), "CDM UI has not appeared.")
+
+    fun waitUntilGone() = ui.waitShort(Until.gone(CONFIRMATION_UI), "CDM UI has not disappeared")
+
+    fun waitAndClickOnFirstFoundDevice() = ui.waitLongAndFind(
+            Until.findObject(DEVICE_LIST_WITH_ITEMS), "Device List not found or empty")
+                    .children[0].click()
+
+    fun waitUntilPositiveButtonIsEnabledAndClick() = ui.waitLongAndFind(
+        Until.findObject(POSITIVE_BUTTON), "Positive button not found or not clickable")
+            .click()
+
+    fun clickPositiveButton() = click(POSITIVE_BUTTON, "Positive button")
+
+    fun clickNegativeButton() = click(NEGATIVE_BUTTON, "Negative button")
+
+    fun clickNegativeButtonMultipleDevices() = click(
+            NEGATIVE_BUTTON_MULTIPLE_DEVICES, "Negative button for multiple devices")
+
+    private fun click(selector: BySelector, description: String) = ui.waitShortAndFind(
+            Until.findObject(selector), "$description  is not found")
+            .click()
+
+    companion object {
+        private const val PACKAGE_NAME = "com.android.companiondevicemanager"
+
+        private val CONFIRMATION_UI = By.pkg(PACKAGE_NAME)
+                .res(PACKAGE_NAME, "activity_confirmation")
+
+        private val CLICKABLE_BUTTON =
+                By.pkg(PACKAGE_NAME).clazz(".Button").clickable(true)
+        private val POSITIVE_BUTTON = By.copy(CLICKABLE_BUTTON).res(PACKAGE_NAME, "btn_positive")
+        private val NEGATIVE_BUTTON = By.copy(CLICKABLE_BUTTON).res(PACKAGE_NAME, "btn_negative")
+        private val NEGATIVE_BUTTON_MULTIPLE_DEVICES = By.copy(CLICKABLE_BUTTON)
+                .res(PACKAGE_NAME, "btn_negative_multiple_devices")
+
+        private val DEVICE_LIST = By.pkg(PACKAGE_NAME)
+            .clazz("androidx.recyclerview.widget.RecyclerView")
+                .res(PACKAGE_NAME, "device_list")
+        private val DEVICE_LIST_ITEM = By.pkg(PACKAGE_NAME)
+                .res(PACKAGE_NAME, "list_item_device")
+        private val DEVICE_LIST_WITH_ITEMS = By.copy(DEVICE_LIST)
+                .hasChild(DEVICE_LIST_ITEM)
+    }
+
+    private fun UiDevice.wait(
+        condition: SearchCondition<Boolean>,
+        message: String,
+        timeout: Duration = 3.seconds
+    ) {
+        if (!wait(condition, timeout.inWholeMilliseconds)) error(message)
+    }
+
+    private fun UiDevice.waitShort(condition: SearchCondition<Boolean>, message: String) =
+            wait(condition, message, 1.seconds)
+
+    private fun UiDevice.waitAndFind(
+        condition: SearchCondition<UiObject2>,
+        message: String,
+        timeout: Duration = 3.seconds
+    ): UiObject2 =
+            wait(condition, timeout.inWholeMilliseconds) ?: error(message)
+
+    private fun UiDevice.waitShortAndFind(
+        condition: SearchCondition<UiObject2>,
+        message: String
+    ): UiObject2 = waitAndFind(condition, message, 1.seconds)
+
+    private fun UiDevice.waitLongAndFind(
+        condition: SearchCondition<UiObject2>,
+        message: String
+    ): UiObject2 = waitAndFind(condition, message, 10.seconds)
+}
\ No newline at end of file
diff --git a/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/UiAutomationTestBase.kt b/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/UiAutomationTestBase.kt
new file mode 100644
index 0000000..eca3280
--- /dev/null
+++ b/tests/tests/companion/uiautomation/src/android/companion/cts/uiautomation/UiAutomationTestBase.kt
@@ -0,0 +1,332 @@
+package android.companion.cts.uiautomation
+
+import android.Manifest
+import android.annotation.CallSuper
+import android.app.Activity
+import android.app.Activity.RESULT_CANCELED
+import android.app.role.RoleManager
+import android.companion.AssociationInfo
+import android.companion.AssociationRequest
+import android.companion.BluetoothDeviceFilter
+import android.companion.BluetoothDeviceFilterUtils
+import android.companion.CompanionDeviceManager
+import android.companion.CompanionDeviceManager.REASON_USER_REJECTED
+import android.companion.CompanionDeviceManager.REASON_DISCOVERY_TIMEOUT
+import android.companion.CompanionDeviceManager.REASON_CANCELED
+import android.companion.CompanionDeviceManager.RESULT_USER_REJECTED
+import android.companion.CompanionDeviceManager.RESULT_DISCOVERY_TIMEOUT
+import android.companion.DeviceFilter
+import android.companion.cts.common.CompanionActivity
+import android.companion.cts.common.DEVICE_PROFILES
+import android.companion.cts.common.DEVICE_PROFILE_TO_NAME
+import android.companion.cts.common.DEVICE_PROFILE_TO_PERMISSION
+import android.companion.cts.common.RecordingCallback
+import android.companion.cts.common.RecordingCallback.OnAssociationCreated
+import android.companion.cts.common.RecordingCallback.OnAssociationPending
+import android.companion.cts.common.RecordingCallback.OnFailure
+import android.companion.cts.common.SIMPLE_EXECUTOR
+import android.companion.cts.common.TestBase
+import android.companion.cts.common.assertEmpty
+import android.companion.cts.common.setSystemProp
+import android.content.Intent
+import android.net.MacAddress
+import android.os.Parcelable
+import androidx.test.uiautomator.UiDevice
+import org.junit.Assume
+import org.junit.Assume.assumeFalse
+import java.util.regex.Pattern
+import kotlin.test.assertContains
+import kotlin.test.assertContentEquals
+import kotlin.test.assertEquals
+import kotlin.test.assertIs
+import kotlin.test.assertNotNull
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.ZERO
+import kotlin.time.Duration.Companion.seconds
+
+open class UiAutomationTestBase(
+    protected val profile: String?,
+    private val profilePermission: String?
+) : TestBase() {
+    private val roleManager: RoleManager by lazy {
+        context.getSystemService(RoleManager::class.java)!!
+    }
+
+    private val uiDevice: UiDevice by lazy { UiDevice.getInstance(instrumentation) }
+    protected val confirmationUi by lazy { CompanionDeviceManagerUi(uiDevice) }
+    protected val callback by lazy { RecordingCallback() }
+
+    @CallSuper
+    override fun setUp() {
+        super.setUp()
+
+        assumeFalse(confirmationUi.isVisible)
+        Assume.assumeTrue(CompanionActivity.waitUntilGone())
+        uiDevice.waitForIdle()
+
+        callback.clearRecordedInvocations()
+
+        // Make RoleManager bypass role qualification, which would allow this self-instrumenting
+        // test package to hold "systemOnly"" CDM roles (e.g. COMPANION_DEVICE_APP_STREAMING and
+        // SYSTEM_AUTOMOTIVE_PROJECTION)
+        withShellPermissionIdentity { roleManager.isBypassingRoleQualification = true }
+    }
+
+    @CallSuper
+    override fun tearDown() {
+        // If the profile (role) is not null: remove the app from the role holders.
+        // Do it via Shell (using the targetApp) because RoleManager takes way too many arguments.
+        profile?.let { roleName -> targetApp.removeFromHoldersOfRole(roleName) }
+
+        // Restore disallowing role qualifications.
+        withShellPermissionIdentity { roleManager.isBypassingRoleQualification = false }
+
+        CompanionActivity.safeFinish()
+        confirmationUi.dismiss()
+
+        restoreDiscoveryTimeout()
+
+        super.tearDown()
+    }
+
+    protected fun test_userRejected(
+        singleDevice: Boolean = false,
+        selfManaged: Boolean = false,
+        displayName: String? = null
+    ) = test_cancelled(singleDevice, selfManaged, userRejected = true, displayName) {
+            // User "rejects" the request.
+            if (singleDevice || selfManaged) {
+                confirmationUi.clickNegativeButton()
+            } else {
+                confirmationUi.clickNegativeButtonMultipleDevices()
+            }
+        }
+
+    protected fun test_userDismissed(
+        singleDevice: Boolean = false,
+        selfManaged: Boolean = false,
+        displayName: String? = null
+    ) = test_cancelled(singleDevice, selfManaged, userRejected = false, displayName) {
+            // User "dismisses" the request.
+            uiDevice.pressBack()
+        }
+
+    private fun test_cancelled(
+        singleDevice: Boolean,
+        selfManaged: Boolean,
+        userRejected: Boolean,
+        displayName: String?,
+        cancelAction: () -> Unit
+    ) {
+        sendRequestAndLaunchConfirmation(singleDevice, selfManaged, displayName)
+
+        callback.assertInvokedByActions {
+            cancelAction()
+        }
+        // Check callback invocations: there should have been exactly 1 invocation of the
+        // onFailure() method.
+        val expectedError = if (userRejected) REASON_USER_REJECTED else REASON_CANCELED
+        assertContentEquals(
+            actual = callback.invocations,
+            expected = listOf(OnFailure(expectedError))
+        )
+        // Wait until the Confirmation UI goes away.
+        confirmationUi.waitUntilGone()
+
+        // Check the result code delivered via onActivityResult()
+        val (resultCode: Int, _) = CompanionActivity.waitForActivityResult()
+        val expectedResultCode = if (userRejected) RESULT_USER_REJECTED else RESULT_CANCELED
+        assertEquals(actual = resultCode, expected = expectedResultCode)
+        // Make sure no Associations were created.
+        assertEmpty(cdm.myAssociations)
+    }
+
+    protected fun test_timeout(singleDevice: Boolean = false) {
+        setDiscoveryTimeout(1.seconds)
+
+        // The discovery timeout is 1 sec, but let's give it 2.
+        callback.assertInvokedByActions(2.seconds) {
+            // Make sure no device will match the request
+            sendRequestAndLaunchConfirmation(
+                singleDevice = singleDevice,
+                deviceFilter = UNMATCHABLE_BT_FILTER
+            )
+        }
+
+        // Check callback invocations: there should have been exactly 1 invocation of the
+        // onFailure() method.
+        assertContentEquals(
+            actual = callback.invocations,
+            expected = listOf(OnFailure(REASON_DISCOVERY_TIMEOUT))
+        )
+
+        // Wait until the Confirmation UI goes away.
+        confirmationUi.waitUntilGone()
+
+        // Check the result code delivered via onActivityResult()
+        val (resultCode: Int, _) = CompanionActivity.waitForActivityResult()
+        assertEquals(actual = resultCode, expected = RESULT_DISCOVERY_TIMEOUT)
+
+        // Make sure no Associations were created.
+        assertEmpty(cdm.myAssociations)
+    }
+
+    protected fun test_userConfirmed_foundDevice(
+        singleDevice: Boolean,
+        confirmationAction: () -> Unit
+    ) {
+        sendRequestAndLaunchConfirmation(singleDevice = singleDevice)
+
+        callback.assertInvokedByActions {
+            confirmationAction()
+        }
+        // Check callback invocations: there should have been exactly 1 invocation of the
+        // OnAssociationCreated() method.
+        assertEquals(1, callback.invocations.size)
+        val associationInvocation = callback.invocations.first()
+        assertIs<OnAssociationCreated>(associationInvocation)
+        val associationFromCallback = associationInvocation.associationInfo
+
+        // Wait until the Confirmation UI goes away.
+        confirmationUi.waitUntilGone()
+
+        // Check the result code and the data delivered via onActivityResult()
+        val (resultCode: Int, data: Intent?) = CompanionActivity.waitForActivityResult()
+        assertEquals(actual = resultCode, expected = Activity.RESULT_OK)
+        assertNotNull(data)
+        val associationFromActivityResult: AssociationInfo? =
+                data.getParcelableExtra(CompanionDeviceManager.EXTRA_ASSOCIATION)
+        assertNotNull(associationFromActivityResult)
+        // Check that the association reported back via the callback same as the association
+        // delivered via onActivityResult().
+        assertEquals(associationFromCallback, associationFromActivityResult)
+
+        // Make sure "device data" was included (for backwards compatibility), and that the
+        // MAC address extracted from this data matches the MAC address from AssociationInfo.
+        val deviceFromActivityResult: Parcelable? =
+                data.getParcelableExtra(CompanionDeviceManager.EXTRA_DEVICE)
+        assertNotNull(deviceFromActivityResult)
+
+        val deviceMacAddress =
+                BluetoothDeviceFilterUtils.getDeviceMacAddress(deviceFromActivityResult)
+        assertEquals(actual = MacAddress.fromString(deviceMacAddress),
+                expected = associationFromCallback.deviceMacAddress)
+
+        // Make sure getMyAssociations() returns the same association we received via the callback
+        // as well as in onActivityResult()
+        assertContentEquals(actual = cdm.myAssociations, expected = listOf(associationFromCallback))
+
+        // Make sure that the role (for the current CDM device profile) was granted.
+        assertIsProfileRoleHolder()
+    }
+
+    protected fun sendRequestAndLaunchConfirmation(
+        singleDevice: Boolean = false,
+        selfManaged: Boolean = false,
+        displayName: String? = null,
+        deviceFilter: DeviceFilter<*>? = null
+    ) {
+        val request = AssociationRequest.Builder()
+                .apply {
+                    // Set the single-device flag.
+                    setSingleDevice(singleDevice)
+
+                    // Set the self-managed flag.
+                    setSelfManaged(selfManaged)
+
+                    // Set profile if not null.
+                    profile?.let { setDeviceProfile(it) }
+
+                    // Set display name if not null.
+                    displayName?.let { setDisplayName(it) }
+
+                    // Add device filter if not null.
+                    deviceFilter?.let { addDeviceFilter(it) }
+                }
+                .build()
+        callback.clearRecordedInvocations()
+
+        callback.assertInvokedByActions {
+            // If the REQUEST_COMPANION_SELF_MANAGED and/or the profile permission is required:
+            // run with these permissions as the Shell;
+            // otherwise: just call associate().
+            with(getRequiredPermissions(selfManaged)) {
+                if (isNotEmpty()) {
+                    withShellPermissionIdentity(*toTypedArray()) {
+                        cdm.associate(request, SIMPLE_EXECUTOR, callback)
+                    }
+                } else {
+                    cdm.associate(request, SIMPLE_EXECUTOR, callback)
+                }
+            }
+        }
+        // Check callback invocations: there should have been exactly 1 invocation of the
+        // onAssociationPending() method.
+
+        assertEquals(1, callback.invocations.size)
+        val associationInvocation = callback.invocations.first()
+        assertIs<OnAssociationPending>(associationInvocation)
+
+        // Get intent sender and clear callback invocations.
+        val pendingConfirmation = associationInvocation.intentSender
+        callback.clearRecordedInvocations()
+
+        // Launch CompanionActivity, and then launch confirmation UI from it.
+        CompanionActivity.launchAndWait(context)
+        CompanionActivity.startIntentSender(pendingConfirmation)
+
+        confirmationUi.waitUntilVisible()
+    }
+
+    /**
+     * If the current CDM Device [profile] is not null, check that the application was "granted"
+     * the corresponding role (all CDM device profiles are "backed up" by roles).
+     */
+    protected fun assertIsProfileRoleHolder() = profile?.let { roleName ->
+        val roleHolders = withShellPermissionIdentity(Manifest.permission.MANAGE_ROLE_HOLDERS) {
+            roleManager.getRoleHolders(roleName)
+        }
+        assertContains(roleHolders, targetPackageName, "Not a holder of $roleName")
+    }
+
+    private fun getRequiredPermissions(selfManaged: Boolean): List<String> =
+            mutableListOf<String>().also {
+                if (selfManaged) it += Manifest.permission.REQUEST_COMPANION_SELF_MANAGED
+                if (profilePermission != null) it += profilePermission
+            }
+
+    private fun setDiscoveryTimeout(timeout: Duration) =
+        instrumentation.setSystemProp(
+            SYS_PROP_DEBUG_TIMEOUT,
+            timeout.inWholeMilliseconds.toString()
+        )
+
+    private fun restoreDiscoveryTimeout() = setDiscoveryTimeout(ZERO)
+
+    companion object {
+        /**
+         * List of (profile, permission, name) tuples that represent all supported profiles and
+         * null.
+         */
+        @JvmStatic
+        protected fun supportedProfilesAndNull() = mutableListOf<Array<String?>>().apply {
+            add(arrayOf(null, null, "null"))
+            addAll(supportedProfiles())
+        }
+
+        /** List of (profile, permission, name) tuples that represent all supported profiles. */
+        private fun supportedProfiles(): Collection<Array<String?>> = DEVICE_PROFILES.map {
+            profile ->
+            arrayOf(profile,
+                    DEVICE_PROFILE_TO_PERMISSION[profile]!!,
+                    DEVICE_PROFILE_TO_NAME[profile]!!)
+        }
+
+        private val UNMATCHABLE_BT_FILTER = BluetoothDeviceFilter.Builder()
+                .setAddress("FF:FF:FF:FF:FF:FF")
+                .setNamePattern(Pattern.compile("This Device Does Not Exist"))
+                .build()
+
+        private const val SYS_PROP_DEBUG_TIMEOUT = "debug.cdm.discovery_timeout"
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContractIntentsTest.java b/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContractIntentsTest.java
index b8391d7..488547d 100644
--- a/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContractIntentsTest.java
+++ b/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContractIntentsTest.java
@@ -17,6 +17,7 @@
 package android.provider.cts.contacts;
 
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.provider.ContactsContract;
 import android.test.AndroidTestCase;
@@ -53,4 +54,21 @@
         intent.setType(ContactsContract.Contacts.CONTENT_ITEM_TYPE);
         assertCanBeHandled(intent);
     }
+
+    public void testSetDefaultAccount() {
+        Intent intent = new Intent(ContactsContract.Settings.ACTION_SET_DEFAULT_ACCOUNT);
+        PackageManager packageManager = getContext().getPackageManager();
+        List<ResolveInfo> resolveInfoList = packageManager.queryIntentActivities(intent, 0);
+        assertNotNull("Missing ResolveInfo", resolveInfoList);
+        int handlerCount = 0;
+        for (ResolveInfo resolveInfo : resolveInfoList) {
+            String packageName = resolveInfo.activityInfo.packageName;
+            if (packageManager.checkPermission(
+                    android.Manifest.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS, packageName)
+                    == PackageManager.PERMISSION_GRANTED) {
+                handlerCount++;
+            }
+        }
+        assertEquals(1, handlerCount);
+    }
 }
diff --git a/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_AllUriTest.java b/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_AllUriTest.java
index dfeaad1..57c3006 100644
--- a/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_AllUriTest.java
+++ b/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_AllUriTest.java
@@ -35,6 +35,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
 
 @LargeTest
 public class ContactsContract_AllUriTest extends AndroidTestCase {
@@ -144,7 +146,7 @@
             {"content://com.android.contacts/phone_lookup/XXX"},
             {"content://com.android.contacts/phone_lookup_enterprise/XXX"},
             {"content://com.android.contacts/aggregation_exceptions", "u"},
-            {"content://com.android.contacts/settings", "ud"},
+            {"content://com.android.contacts/settings", "iud"},
             {"content://com.android.contacts/status_updates", "ud"},
             {"content://com.android.contacts/status_updates/1"},
             {"content://com.android.contacts/search_suggest_query"},
@@ -178,8 +180,26 @@
             {"content://com.android.contacts/directory_file_enterprise/XXX?directory=0", "-"},
     };
 
+    // Contains entries for Uris that require specific values when inserting
+    private static final Map<String, ContentValues> URI_INSERT_VALUES;
+
     private static final String[] ARG1 = {"-1"};
 
+    static {
+        URI_INSERT_VALUES = new HashMap<>();
+        ContentValues values = new ContentValues();
+        values.put(SyncState.ACCOUNT_NAME, "abc");
+        values.put(SyncState.ACCOUNT_TYPE, "def");
+        URI_INSERT_VALUES.put("content://com.android.contacts/syncstate", values);
+        URI_INSERT_VALUES.put("content://com.android.contacts/syncstate/1", values);
+        URI_INSERT_VALUES.put("content://com.android.contacts/profile/syncstate", values);
+
+        values = new ContentValues();
+        values.put(ContactsContract.Settings.ACCOUNT_NAME, "abc");
+        values.put(ContactsContract.Settings.ACCOUNT_TYPE, "def");
+        URI_INSERT_VALUES.put("content://com.android.contacts/settings", values);
+    }
+
     private ContentResolver mResolver;
 
     private ArrayList<String> mFailures;
@@ -627,15 +647,13 @@
             final Uri uri = getUri(path);
 
             cv.clear();
-            if (supportsQuery(path)) {
+            if (URI_INSERT_VALUES.containsKey(path[0])) {
+                cv.putAll(URI_INSERT_VALUES.get(path[0]));
+            } else if (supportsQuery(path)) {
                 cv.put(getColumns(uri)[0], 1);
             } else {
                 cv.put("_id", 1);
             }
-            if (uri.toString().contains("syncstate")) {
-                cv.put(SyncState.ACCOUNT_NAME, "abc");
-                cv.put(SyncState.ACCOUNT_TYPE, "def");
-            }
 
             checkExecutable("insert", uri, supportsInsert(path), () -> {
                 final Uri newUri = mResolver.insert(uri, cv);
diff --git a/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_ContactsTest.java b/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_ContactsTest.java
index cb3a2a6..4b98883 100644
--- a/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_ContactsTest.java
+++ b/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_ContactsTest.java
@@ -142,8 +142,8 @@
         DatabaseAsserts.ContactIdPair ids = assertContactCreateDelete();
 
         String[] projection = new String[] {
-                ContactsContract.RawContacts.DIRTY,
-                ContactsContract.RawContacts.DELETED
+                RawContacts.DIRTY,
+                RawContacts.DELETED
         };
         List<String[]> records = RawContactUtil.queryByContactId(mResolver, ids.mContactId,
                 projection);
@@ -229,8 +229,8 @@
 
         // Assert that the non-local raw contact was marked DELETED=1
         String[] projection = new String[]{
-                ContactsContract.RawContacts.DIRTY,
-                ContactsContract.RawContacts.DELETED
+                RawContacts.DIRTY,
+                RawContacts.DELETED
         };
         List<String[]> records = RawContactUtil.queryByContactId(mResolver, ids2.mContactId,
                 projection);
@@ -335,6 +335,20 @@
         assertEquals(0, rawContact.getLong(Contacts.TIMES_CONTACTED));
     }
 
+    /** Make sure local contacts are visible by default. */
+    public void testContactQuery_localContactVisibleByDefault() throws Exception {
+        // Raw contacts without an account specified are created in the local account
+        final TestRawContact localRawContact = mBuilder.newRawContact().insert().load();
+        final TestContact contact = localRawContact.getContact().load();
+
+        assertEquals(RawContacts.getLocalAccountName(mContext),
+                localRawContact.getString(RawContacts.ACCOUNT_NAME));
+        assertEquals(RawContacts.getLocalAccountType(mContext),
+                localRawContact.getString(RawContacts.ACCOUNT_TYPE));
+        assertNull(localRawContact.getString(RawContacts.DATA_SET));
+        assertEquals(1, contact.getLong(Contacts.IN_VISIBLE_GROUP));
+    }
+
     public void testProjection() throws Exception {
         final TestRawContact rawContact = mBuilder.newRawContact().insert().load();
         rawContact.newDataRow(StructuredName.CONTENT_ITEM_TYPE)
diff --git a/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_RawContactsTest.java b/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_RawContactsTest.java
index 2ec7ec8..bc6ea56 100644
--- a/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_RawContactsTest.java
+++ b/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_RawContactsTest.java
@@ -228,7 +228,7 @@
      *
      * <p>See {@link #testRawContactCreate_noAccountUsesLocalAccount()}
      */
-    @CddTest(requirement="3.18/C-1-1,C-1-2,C-1-3")
+    @CddTest(requirement = "3.18/C-1-1,C-1-2,C-1-3")
     public void testRawContactCreate_nullAccountUsesLocalAccount() throws Exception {
         // Save a raw contact using the default local account
         TestRawContact rawContact = mBuilder.newRawContact()
diff --git a/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_SettingsTest.java b/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_SettingsTest.java
new file mode 100644
index 0000000..1adde79
--- /dev/null
+++ b/tests/tests/contactsprovider/src/android/provider/cts/contacts/ContactsContract_SettingsTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2021 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 android.provider.cts.contacts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.ContentResolver;
+import android.provider.ContactsContract.Settings;
+import android.provider.ContactsContract.SimAccount;
+import android.provider.ContactsContract.SimContacts;
+import android.provider.cts.contacts.account.StaticAccountAuthenticator;
+import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.MediumTest;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+@MediumTest
+public class ContactsContract_SettingsTest extends AndroidTestCase {
+    // Using unique account name and type because these tests may break or be broken by
+    // other tests running. No other tests should use the following accounts.
+    private static final Account ACCT_1 = new Account("test for default account1",
+            StaticAccountAuthenticator.TYPE);
+    private static final Account ACCT_2 = new Account("test for default account2",
+            StaticAccountAuthenticator.TYPE);
+
+    private static final String SIM_ACCT_NAME = "sim account name for default account test";
+    private static final String SIM_ACCT_TYPE = "sim account type for default account test";
+    private static final int SIM_SLOT_0 = 0;
+
+    private ContentResolver mResolver;
+    private AccountManager mAccountManager;
+    private Account mInitialDefaultAccount;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        mResolver = getContext().getContentResolver();
+        mAccountManager = AccountManager.get(getContext());
+
+        mAccountManager.addAccountExplicitly(ACCT_1, null, null);
+        mAccountManager.addAccountExplicitly(ACCT_2, null, null);
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            SimContacts.addSimAccount(mResolver, SIM_ACCT_NAME, SIM_ACCT_TYPE, SIM_SLOT_0,
+                    SimAccount.ADN_EF_TYPE);
+        });
+
+        mInitialDefaultAccount = Settings.getDefaultAccount(mResolver);
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        mAccountManager.removeAccount(ACCT_1, null, null);
+        mAccountManager.removeAccount(ACCT_2, null, null);
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            SimContacts.removeSimAccounts(mResolver, SIM_SLOT_0);
+        });
+
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            Settings.setDefaultAccount(mResolver, mInitialDefaultAccount);
+        });
+
+    }
+
+    /**
+     * Default account set by
+     * {@link Settings#setDefaultAccount(ContentResolver, Account)} should be
+     * returned by {@link Settings#getDefaultAccount(ContentResolver)}
+     */
+    public void testSetDefaultAccount_returnedByGetDefaultAccount() {
+        // Set default account to a system account and call get to check.
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            Settings.setDefaultAccount(mResolver, ACCT_1);
+        });
+
+        Account defaultAccount = Settings.getDefaultAccount(mResolver);
+        assertThat(defaultAccount.name).isEqualTo("test for default account1");
+        assertThat(defaultAccount.type).isEqualTo(StaticAccountAuthenticator.TYPE);
+
+        // Update default account to system account and call get to check.
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            Settings.setDefaultAccount(mResolver, ACCT_2);
+        });
+
+        defaultAccount = Settings.getDefaultAccount(mResolver);
+        assertThat(defaultAccount.name).isEqualTo("test for default account2");
+        assertThat(defaultAccount.type).isEqualTo(StaticAccountAuthenticator.TYPE);
+
+        // Update default account to NULL and check.
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            Settings.setDefaultAccount(mResolver, null);
+        });
+
+        defaultAccount = Settings.getDefaultAccount(mResolver);
+        assertThat(defaultAccount).isNull();
+
+        // Update default account to sim account and check.
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            Settings.setDefaultAccount(mResolver, new Account(SIM_ACCT_NAME, SIM_ACCT_TYPE));
+        });
+
+        defaultAccount = Settings.getDefaultAccount(mResolver);
+        assertThat(defaultAccount.name).isEqualTo(SIM_ACCT_NAME);
+        assertThat(defaultAccount.type).isEqualTo(SIM_ACCT_TYPE);
+    }
+
+    public void testSetDefaultAccount_invalidAccount() {
+        // Setting an invalid account will throw exception.
+        try {
+            SystemUtil.runWithShellPermissionIdentity(() -> {
+                Settings.setDefaultAccount(mResolver, new Account("a", "b"));
+            });
+            fail();
+        } catch (RuntimeException expected) {
+        }
+
+        Account defaultAccount = Settings.getDefaultAccount(mResolver);
+        assertThat(defaultAccount).isEqualTo(mInitialDefaultAccount);
+    }
+}
+
diff --git a/tests/tests/content/Android.bp b/tests/tests/content/Android.bp
index b78ccbe..f937a77 100644
--- a/tests/tests/content/Android.bp
+++ b/tests/tests/content/Android.bp
@@ -77,6 +77,25 @@
         "src/**/*.kt",
         "BinderPermissionTestService/**/I*.aidl",
     ],
+    required: [
+        "HelloWorld5",
+        "HelloWorld5Profileable",
+        "HelloWorld7",
+        "HelloWorldNoAppStorage",
+        "HelloWorldResHardening",
+        "HelloWorldSdk1",
+        "HelloWorldSdk1DifferentSigner",
+        "HelloWorldSdk1MajorVersion2",
+        "HelloWorldSdk1Updated",
+        "HelloWorldSdk2",
+        "HelloWorldSdk2Updated",
+        "HelloWorldSdk3UsingSdk1",
+        "HelloWorldSdk3UsingSdk1And2",
+        "HelloWorldShell",
+        "HelloWorldUsingSdk1",
+        "HelloWorldUsingSdk1And2",
+        "HelloWorldUsingSdk3",
+    ],
     data: [
         // v1/v2/v3/v4 signed version of android.appsecurity.cts.tinyapp to keep checksums stable
         "data/CtsPkgInstallTinyAppV1.apk",
diff --git a/tests/tests/content/AndroidManifest.xml b/tests/tests/content/AndroidManifest.xml
index 556add2..7b59702 100644
--- a/tests/tests/content/AndroidManifest.xml
+++ b/tests/tests/content/AndroidManifest.xml
@@ -368,7 +368,6 @@
              android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
-                <category android:name="android.intent.category.INFO"/>
             </intent-filter>
         </activity>
         <!--Test for PackageManager-->
@@ -392,6 +391,7 @@
              android:exported="true">
             <intent-filter android:priority="-10">
                 <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.INFO"/>
                 <category android:name="android.intent.category.HOME"/>
                 <category android:name="android.intent.category.DEFAULT"/>
             </intent-filter>
diff --git a/tests/tests/content/AndroidTest.xml b/tests/tests/content/AndroidTest.xml
index 1b757e3..9b18f72 100644
--- a/tests/tests/content/AndroidTest.xml
+++ b/tests/tests/content/AndroidTest.xml
@@ -41,7 +41,9 @@
         <option name="push" value="CtsContentLongSharedUserIdTestApp.apk->/data/local/tmp/cts/content/CtsContentLongSharedUserIdTestApp.apk" />
         <option name="push" value="CtsContentMaxPackageNameTestApp.apk->/data/local/tmp/cts/content/CtsContentMaxPackageNameTestApp.apk" />
         <option name="push" value="CtsContentMaxSharedUserIdTestApp.apk->/data/local/tmp/cts/content/CtsContentMaxSharedUserIdTestApp.apk" />
+        <option name="push" value="CtsContentMockLauncherTestApp.apk->/data/local/tmp/cts/content/CtsContentMockLauncherTestApp.apk" />
         <option name="push" value="CtsContentLongLabelNameTestApp.apk->/data/local/tmp/cts/content/CtsContentLongLabelNameTestApp.apk" />
+        <option name="push" value="CtsSyncAccountAccessStubs.apk->/data/local/tmp/cts/content/CtsSyncAccountAccessStubs.apk" />
     </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer">
@@ -101,6 +103,30 @@
         <option name="push-file" key="HelloWorldResHardening_mdpi-v4.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldResHardening_mdpi-v4.apk.idsig" />
         <option name="push-file" key="malformed.apk.idsig" value="/data/local/tmp/cts/content/malformed.apk.idsig" />
         <option name="push-file" key="test-cert.x509.pem" value="/data/local/tmp/cts/content/test-cert.x509.pem" />
+        <option name="push-file" key="HelloWorldSdk1.apk" value="/data/local/tmp/cts/content/HelloWorldSdk1.apk" />
+        <option name="push-file" key="HelloWorldSdk1.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldSdk1.apk.idsig" />
+        <option name="push-file" key="HelloWorldSdk1Updated.apk" value="/data/local/tmp/cts/content/HelloWorldSdk1Updated.apk" />
+        <option name="push-file" key="HelloWorldSdk1Updated.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldSdk1Updated.apk.idsig" />
+        <option name="push-file" key="HelloWorldSdk1MajorVersion2.apk" value="/data/local/tmp/cts/content/HelloWorldSdk1MajorVersion2.apk" />
+        <option name="push-file" key="HelloWorldSdk1MajorVersion2.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldSdk1MajorVersion2.apk.idsig" />
+        <option name="push-file" key="HelloWorldSdk1DifferentSigner.apk" value="/data/local/tmp/cts/content/HelloWorldSdk1DifferentSigner.apk" />
+        <option name="push-file" key="HelloWorldSdk1DifferentSigner.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldSdk1DifferentSigner.apk.idsig" />
+        <option name="push-file" key="HelloWorldSdk2.apk" value="/data/local/tmp/cts/content/HelloWorldSdk2.apk" />
+        <option name="push-file" key="HelloWorldSdk2.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldSdk2.apk.idsig" />
+        <option name="push-file" key="HelloWorldSdk2Updated.apk" value="/data/local/tmp/cts/content/HelloWorldSdk2Updated.apk" />
+        <option name="push-file" key="HelloWorldSdk2Updated.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldSdk2Updated.apk.idsig" />
+        <option name="push-file" key="HelloWorldSdk3UsingSdk1.apk" value="/data/local/tmp/cts/content/HelloWorldSdk3UsingSdk1.apk" />
+        <option name="push-file" key="HelloWorldSdk3UsingSdk1.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldSdk3UsingSdk1.apk.idsig" />
+        <option name="push-file" key="HelloWorldSdk3UsingSdk1And2.apk" value="/data/local/tmp/cts/content/HelloWorldSdk3UsingSdk1And2.apk" />
+        <option name="push-file" key="HelloWorldSdk3UsingSdk1And2.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldSdk3UsingSdk1And2.apk.idsig" />
+        <option name="push-file" key="HelloWorldUsingSdk1.apk" value="/data/local/tmp/cts/content/HelloWorldUsingSdk1.apk" />
+        <option name="push-file" key="HelloWorldUsingSdk1.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldUsingSdk1.apk.idsig" />
+        <option name="push-file" key="HelloWorldUsingSdk1And2.apk" value="/data/local/tmp/cts/content/HelloWorldUsingSdk1And2.apk" />
+        <option name="push-file" key="HelloWorldUsingSdk1And2.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldUsingSdk1And2.apk.idsig" />
+        <option name="push-file" key="HelloWorldUsingSdk3.apk" value="/data/local/tmp/cts/content/HelloWorldUsingSdk3.apk" />
+        <option name="push-file" key="HelloWorldUsingSdk3.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldUsingSdk3.apk.idsig" />
+        <option name="push-file" key="HelloWorldNoAppStorage.apk" value="/data/local/tmp/cts/content/HelloWorldNoAppStorage.apk" />
+        <option name="push-file" key="HelloWorldNoAppStorage.apk.idsig" value="/data/local/tmp/cts/content/HelloWorldNoAppStorage.apk.idsig" />
     </target_preparer>
 
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
@@ -110,6 +136,9 @@
         <option name="test-file-name" value="CtsContentPartiallyDirectBootAwareTestApp.apk" />
         <option name="test-file-name" value="CtsSyncAccountAccessStubs.apk" />
         <option name="test-file-name" value="CtsBinderPermissionTestService.apk" />
+        <option name="test-file-name" value="CtsIntentResolutionTestApp.apk" />
+        <option name="test-file-name" value="CtsIntentResolutionTestAppApi30.apk" />
+        <option name="test-file-name" value="CtsContentNoApplicationTestApp.apk" />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
diff --git a/tests/tests/content/BinderPermissionTestService/Android.bp b/tests/tests/content/BinderPermissionTestService/Android.bp
index 928e532..8ba2432 100644
--- a/tests/tests/content/BinderPermissionTestService/Android.bp
+++ b/tests/tests/content/BinderPermissionTestService/Android.bp
@@ -27,6 +27,7 @@
         "aidl/**/I*.aidl",
     ],
     test_suites: [
+        "mts",
         "cts",
         "general-tests",
     ],
diff --git a/tests/tests/content/DirectBootUnawareTestApp/Android.bp b/tests/tests/content/DirectBootUnawareTestApp/Android.bp
index 4a1a9bb..8c35eb4 100644
--- a/tests/tests/content/DirectBootUnawareTestApp/Android.bp
+++ b/tests/tests/content/DirectBootUnawareTestApp/Android.bp
@@ -22,6 +22,7 @@
     sdk_version: "current",
     // tag this module as a cts test artifact
     test_suites: [
+        "mts",
         "cts",
         "general-tests",
     ],
diff --git a/tests/tests/content/HelloWorldApp/Android.bp b/tests/tests/content/HelloWorldApp/Android.bp
index e3c2de5..e3496a3 100644
--- a/tests/tests/content/HelloWorldApp/Android.bp
+++ b/tests/tests/content/HelloWorldApp/Android.bp
@@ -42,6 +42,7 @@
     srcs: ["src5/**/*.java"],
     // tag this module as a cts test artifact
     test_suites: [
+        "mts",
         "cts",
         "general-tests",
     ],
@@ -56,6 +57,7 @@
     manifest: "AndroidManifestProfileable.xml",
     // tag this module as a cts test artifact
     test_suites: [
+        "mts",
         "cts",
         "vts10",
         "general-tests",
@@ -70,6 +72,7 @@
     srcs: ["src7/**/*.java"],
     // tag this module as a cts test artifact
     test_suites: [
+        "mts",
         "cts",
         "general-tests",
     ],
@@ -105,6 +108,7 @@
     ],
     // tag this module as a cts test artifact
     test_suites: [
+        "mts",
         "cts",
         "general-tests",
     ],
@@ -120,6 +124,200 @@
     manifest: "AndroidManifestShell.xml",
     // tag this module as a cts test artifact
     test_suites: [
+        "mts",
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+    v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
+    name: "HelloWorldSdk1",
+    defaults: ["hello_world_defaults"],
+    srcs: ["sdk1/**/*.java"],
+    manifest: "AndroidManifestSdk1.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "mts",
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+    v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
+    name: "HelloWorldSdk1Updated",
+    defaults: ["hello_world_defaults"],
+    srcs: ["sdk1/**/*.java"],
+    manifest: "AndroidManifestSdk1Updated.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "mts",
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+    v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
+    name: "HelloWorldSdk1MajorVersion2",
+    defaults: ["hello_world_defaults"],
+    srcs: ["sdk1/**/*.java"],
+    manifest: "AndroidManifestSdk1MajorVersion2.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "mts",
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+    v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
+    name: "HelloWorldSdk1DifferentSigner",
+    defaults: ["hello_world_defaults"],
+    srcs: ["sdk1/**/*.java"],
+    manifest: "AndroidManifestSdk1.xml",
+    certificate: ":cts-testkey1",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "mts",
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+    v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
+    name: "HelloWorldSdk2",
+    defaults: ["hello_world_defaults"],
+    srcs: ["sdk2/**/*.java"],
+    manifest: "AndroidManifestSdk2.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "mts",
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+    v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
+    name: "HelloWorldSdk2Updated",
+    defaults: ["hello_world_defaults"],
+    srcs: ["sdk2/**/*.java"],
+    manifest: "AndroidManifestSdk2Updated.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "mts",
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+    v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
+    name: "HelloWorldSdk3UsingSdk1",
+    defaults: ["hello_world_defaults"],
+    srcs: ["sdk3/**/*.java"],
+    manifest: "AndroidManifestSdk3UsingSdk1.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "mts",
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+    v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
+    name: "HelloWorldSdk3UsingSdk1And2",
+    defaults: ["hello_world_defaults"],
+    srcs: ["sdk3/**/*.java"],
+    manifest: "AndroidManifestSdk3UsingSdk1And2.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "mts",
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+    v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
+    name: "HelloWorldUsingSdk1",
+    defaults: ["hello_world_defaults"],
+    srcs: ["sdk_user/**/*.java"],
+    manifest: "AndroidManifestUsingSdk1.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "mts",
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+    v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
+    name: "HelloWorldUsingSdk1And2",
+    defaults: ["hello_world_defaults"],
+    srcs: ["sdk_user/**/*.java"],
+    manifest: "AndroidManifestUsingSdk1And2.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "mts",
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+    v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
+    name: "HelloWorldUsingSdk3",
+    defaults: ["hello_world_defaults"],
+    srcs: ["sdk_user/**/*.java"],
+    manifest: "AndroidManifestUsingSdk3.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "mts",
+        "cts",
+        "vts10",
+        "general-tests",
+    ],
+    v4_signature: true,
+}
+
+//-----------------------------------------------------------
+android_test {
+    name: "HelloWorldNoAppStorage",
+    defaults: ["hello_world_defaults"],
+    srcs: ["src5/**/*.java"],
+    manifest: "AndroidManifestNoAppStorage.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "mts",
         "cts",
         "vts10",
         "general-tests",
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestNoAppStorage.xml b/tests/tests/content/HelloWorldApp/AndroidManifestNoAppStorage.xml
new file mode 100644
index 0000000..ff95116
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestNoAppStorage.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.example.helloworld">
+
+    <application android:allowBackup="true"
+         android:debuggable="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:roundIcon="@mipmap/ic_launcher_round"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme"
+         android:forceQueryable="true">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             android:theme="@style/AppTheme.NoActionBar"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <property android:name="android.internal.PROPERTY_NO_APP_DATA_STORAGE"
+                  android:value="true" />
+        <!-- (b/197936012) Remove startup provider due to test timeout issue -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+    </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestSdk1.xml b/tests/tests/content/HelloWorldApp/AndroidManifestSdk1.xml
new file mode 100644
index 0000000..3c10917
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestSdk1.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.test.sdk1_1"
+     android:versionCode="2">
+
+    <application android:allowBackup="true"
+         android:debuggable="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:roundIcon="@mipmap/ic_launcher_round"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             android:theme="@style/AppTheme.NoActionBar"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <sdk-library android:name="com.test.sdk1" android:versionMajor="1" />
+
+        <!-- (b/197936012) Remove startup provider due to test timeout issue -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
+    </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestSdk1MajorVersion2.xml b/tests/tests/content/HelloWorldApp/AndroidManifestSdk1MajorVersion2.xml
new file mode 100644
index 0000000..b2e6527
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestSdk1MajorVersion2.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.test.sdk1_2"
+     android:versionCode="2">
+
+    <application android:allowBackup="true"
+         android:debuggable="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:roundIcon="@mipmap/ic_launcher_round"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             android:theme="@style/AppTheme.NoActionBar"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <sdk-library android:name="com.test.sdk1" android:versionMajor="2" />
+
+        <!-- (b/197936012) Remove startup provider due to test timeout issue -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
+    </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestSdk1Updated.xml b/tests/tests/content/HelloWorldApp/AndroidManifestSdk1Updated.xml
new file mode 100644
index 0000000..7946cbd
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestSdk1Updated.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.test.sdk1_1"
+     android:versionCode="1">
+
+    <application android:allowBackup="true"
+         android:debuggable="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:roundIcon="@mipmap/ic_launcher_round"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             android:theme="@style/AppTheme.NoActionBar"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <sdk-library android:name="com.test.sdk1" android:versionMajor="1" />
+
+        <!-- (b/197936012) Remove startup provider due to test timeout issue -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
+    </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestSdk2.xml b/tests/tests/content/HelloWorldApp/AndroidManifestSdk2.xml
new file mode 100644
index 0000000..4e5f4dc
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestSdk2.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.test.sdk2_2"
+     android:versionCode="1">
+
+    <application android:allowBackup="true"
+         android:debuggable="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:roundIcon="@mipmap/ic_launcher_round"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             android:theme="@style/AppTheme.NoActionBar"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <sdk-library android:name="com.test.sdk2" android:versionMajor="2" />
+
+        <!-- (b/197936012) Remove startup provider due to test timeout issue -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
+    </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestSdk2Updated.xml b/tests/tests/content/HelloWorldApp/AndroidManifestSdk2Updated.xml
new file mode 100644
index 0000000..7ac1f2f
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestSdk2Updated.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.test.sdk2_2"
+     android:versionCode="2">
+
+    <application android:allowBackup="true"
+         android:debuggable="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:roundIcon="@mipmap/ic_launcher_round"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             android:theme="@style/AppTheme.NoActionBar"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <sdk-library android:name="com.test.sdk2" android:versionMajor="2" />
+
+        <!-- (b/197936012) Remove startup provider due to test timeout issue -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
+    </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestSdk3UsingSdk1.xml b/tests/tests/content/HelloWorldApp/AndroidManifestSdk3UsingSdk1.xml
new file mode 100644
index 0000000..cb57d19
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestSdk3UsingSdk1.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.test.sdk3_3"
+     android:versionCode="10">
+
+    <application android:allowBackup="true"
+         android:debuggable="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:roundIcon="@mipmap/ic_launcher_round"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             android:theme="@style/AppTheme.NoActionBar"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <sdk-library android:name="com.test.sdk3" android:versionMajor="3" />
+
+        <uses-sdk-library android:name="com.test.sdk1" android:versionMajor="1" android:certDigest="" />
+
+        <!-- (b/197936012) Remove startup provider due to test timeout issue -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
+    </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestSdk3UsingSdk1And2.xml b/tests/tests/content/HelloWorldApp/AndroidManifestSdk3UsingSdk1And2.xml
new file mode 100644
index 0000000..b8a8d96
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestSdk3UsingSdk1And2.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.test.sdk3_3"
+     android:versionCode="5">
+
+    <application android:allowBackup="true"
+         android:debuggable="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:roundIcon="@mipmap/ic_launcher_round"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             android:theme="@style/AppTheme.NoActionBar"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <sdk-library android:name="com.test.sdk3" android:versionMajor="3" />
+
+        <uses-sdk-library android:name="com.test.sdk1" android:versionMajor="1" android:certDigest="" />
+        <uses-sdk-library android:name="com.test.sdk2" android:versionMajor="2" android:certDigest="" />
+
+        <!-- (b/197936012) Remove startup provider due to test timeout issue -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
+    </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestUsingSdk1.xml b/tests/tests/content/HelloWorldApp/AndroidManifestUsingSdk1.xml
new file mode 100644
index 0000000..d24276b
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestUsingSdk1.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.test.sdk.user">
+
+    <application android:allowBackup="true"
+         android:debuggable="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:roundIcon="@mipmap/ic_launcher_round"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             android:theme="@style/AppTheme.NoActionBar"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <uses-sdk-library android:name="com.test.sdk1" android:versionMajor="1" android:certDigest="" />
+
+        <!-- (b/197936012) Remove startup provider due to test timeout issue -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
+    </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestUsingSdk1And2.xml b/tests/tests/content/HelloWorldApp/AndroidManifestUsingSdk1And2.xml
new file mode 100644
index 0000000..2e60a85
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestUsingSdk1And2.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.test.sdk.user">
+
+    <application android:allowBackup="true"
+         android:debuggable="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:roundIcon="@mipmap/ic_launcher_round"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             android:theme="@style/AppTheme.NoActionBar"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <uses-sdk-library android:name="com.test.sdk1" android:versionMajor="1" android:certDigest="" />
+        <uses-sdk-library android:name="com.test.sdk2" android:versionMajor="2" android:certDigest="" />
+
+        <!-- (b/197936012) Remove startup provider due to test timeout issue -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
+    </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/AndroidManifestUsingSdk3.xml b/tests/tests/content/HelloWorldApp/AndroidManifestUsingSdk3.xml
new file mode 100644
index 0000000..8601b88
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/AndroidManifestUsingSdk3.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     xmlns:tools="http://schemas.android.com/tools"
+     package="com.test.sdk.user">
+
+    <application android:allowBackup="true"
+         android:debuggable="true"
+         android:icon="@mipmap/ic_launcher"
+         android:label="@string/app_name"
+         android:roundIcon="@mipmap/ic_launcher_round"
+         android:supportsRtl="true"
+         android:theme="@style/AppTheme">
+        <activity android:name=".MainActivity"
+             android:label="@string/app_name"
+             android:theme="@style/AppTheme.NoActionBar"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+
+                <category android:name="android.intent.category.LAUNCHER"/>
+            </intent-filter>
+        </activity>
+
+        <uses-sdk-library android:name="com.test.sdk3" android:versionMajor="3" android:certDigest="" />
+
+        <!-- (b/197936012) Remove startup provider due to test timeout issue -->
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            tools:node="remove" />
+
+    </application>
+
+</manifest>
diff --git a/tests/tests/content/HelloWorldApp/sdk1/com/example/helloworld/MainActivity.java b/tests/tests/content/HelloWorldApp/sdk1/com/example/helloworld/MainActivity.java
new file mode 100644
index 0000000..3104534
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/sdk1/com/example/helloworld/MainActivity.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 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.test.sdk1_1;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        System.exit(5);
+    }
+}
diff --git a/tests/tests/content/HelloWorldApp/sdk2/com/example/helloworld/MainActivity.java b/tests/tests/content/HelloWorldApp/sdk2/com/example/helloworld/MainActivity.java
new file mode 100644
index 0000000..f060455
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/sdk2/com/example/helloworld/MainActivity.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 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.test.sdk2_2;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        System.exit(5);
+    }
+}
diff --git a/tests/tests/content/HelloWorldApp/sdk3/com/example/helloworld/MainActivity.java b/tests/tests/content/HelloWorldApp/sdk3/com/example/helloworld/MainActivity.java
new file mode 100644
index 0000000..5945d02
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/sdk3/com/example/helloworld/MainActivity.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 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.test.sdk3_3;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        System.exit(5);
+    }
+}
diff --git a/tests/tests/content/HelloWorldApp/sdk_user/com/example/helloworld/MainActivity.java b/tests/tests/content/HelloWorldApp/sdk_user/com/example/helloworld/MainActivity.java
new file mode 100644
index 0000000..4ffb930
--- /dev/null
+++ b/tests/tests/content/HelloWorldApp/sdk_user/com/example/helloworld/MainActivity.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 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.test.sdk.user;
+
+import android.os.Bundle;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        System.exit(5);
+    }
+}
diff --git a/tests/tests/content/IntentResolutionTestApp/Android.bp b/tests/tests/content/IntentResolutionTestApp/Android.bp
new file mode 100644
index 0000000..16159cf
--- /dev/null
+++ b/tests/tests/content/IntentResolutionTestApp/Android.bp
@@ -0,0 +1,44 @@
+// Copyright (C) 2017 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsIntentResolutionTestApp",
+    defaults: ["cts_defaults"],
+    sdk_version: "current",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    min_sdk_version: "29",
+}
+
+// Same app but with lower target SDK version and different package_name
+android_test_helper_app {
+    name: "CtsIntentResolutionTestAppApi30",
+    package_name: "android.content.cts.IntentResolutionTestApi30",
+    defaults: ["cts_defaults"],
+    sdk_version: "current",
+    target_sdk_version: "30",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    min_sdk_version: "29",
+}
diff --git a/tests/tests/content/IntentResolutionTestApp/AndroidManifest.xml b/tests/tests/content/IntentResolutionTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..ac50cb1
--- /dev/null
+++ b/tests/tests/content/IntentResolutionTestApp/AndroidManifest.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="android.content.cts.IntentResolutionTest" >
+    <application android:hasCode="false">
+        <activity android:name="android.content.pm.cts.TestPmActivity"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.RESOLUTION_TEST"/>
+                <action android:name="android.intent.action.SELECTORTEST"/>
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.RESOLUTION_TEST2"/>
+                <data android:scheme="http" android:mimeType="*/*" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.RESOLUTION_TEST2"/>
+                <data android:scheme="content" android:mimeType="text/plain" />
+            </intent-filter>
+        </activity>
+        <service android:name="android.content.pm.cts.TestPmService"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.RESOLUTION_TEST"/>
+                <action android:name="android.intent.action.SELECTORTEST"/>
+            </intent-filter>
+        </service>
+        <receiver android:name="android.content.pm.cts.PmTestReceiver"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.RESOLUTION_TEST"/>
+                <action android:name="android.intent.action.SELECTORTEST"/>
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
diff --git a/tests/tests/content/MockLauncherApp/Android.bp b/tests/tests/content/MockLauncherApp/Android.bp
new file mode 100644
index 0000000..050dab1
--- /dev/null
+++ b/tests/tests/content/MockLauncherApp/Android.bp
@@ -0,0 +1,29 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsContentMockLauncherTestApp",
+    defaults: ["cts_defaults"],
+    srcs: ["src/**/*.java"],
+    sdk_version: "current",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
diff --git a/tests/tests/content/MockLauncherApp/AndroidManifest.xml b/tests/tests/content/MockLauncherApp/AndroidManifest.xml
new file mode 100644
index 0000000..cfac8f4
--- /dev/null
+++ b/tests/tests/content/MockLauncherApp/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="android.content.cts.mocklauncherapp">
+    <application android:resetEnabledSettingsOnAppDataCleared="true">
+        <uses-library android:name="android.test.runner"/>
+
+        <activity android:name="android.content.cts.mocklauncherapp.Launcher"
+                  android:enabled="true"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.HOME"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+        </activity>
+
+        <!-- Tests for attribute of resetEnabledSetting -->
+        <activity android:name=".MockActivity" android:exported="false"
+                  android:enabled="false" />
+        <receiver android:name=".MockReceiver" android:exported="false"
+                  android:enabled="false" />
+        <service android:name=".MockService" android:exported="false"
+                 android:enabled="false" />
+        <provider android:authorities="android.content.cts.mocklauncherapp"
+                  android:name=".MockProvider" android:exported="false"
+                  android:enabled="false" />
+    </application>
+</manifest>
diff --git a/tests/tests/content/MockLauncherApp/src/android/content/cts/mocklauncherapp/Launcher.java b/tests/tests/content/MockLauncherApp/src/android/content/cts/mocklauncherapp/Launcher.java
new file mode 100644
index 0000000..ddd30e1
--- /dev/null
+++ b/tests/tests/content/MockLauncherApp/src/android/content/cts/mocklauncherapp/Launcher.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2021 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 android.content.cts.mocklauncherapp;
+
+import android.app.Activity;
+
+public class Launcher extends Activity {
+}
diff --git a/tests/tests/content/PartiallyDirectBootAwareTestApp/Android.bp b/tests/tests/content/PartiallyDirectBootAwareTestApp/Android.bp
index c24d69a..c211c0c 100644
--- a/tests/tests/content/PartiallyDirectBootAwareTestApp/Android.bp
+++ b/tests/tests/content/PartiallyDirectBootAwareTestApp/Android.bp
@@ -22,6 +22,7 @@
     sdk_version: "current",
     // tag this module as a cts test artifact
     test_suites: [
+        "mts",
         "cts",
         "general-tests",
     ],
diff --git a/tests/tests/content/SyncAccountAccessStubs/Android.bp b/tests/tests/content/SyncAccountAccessStubs/Android.bp
index e8904d7..9f1e9ab 100644
--- a/tests/tests/content/SyncAccountAccessStubs/Android.bp
+++ b/tests/tests/content/SyncAccountAccessStubs/Android.bp
@@ -25,6 +25,7 @@
     srcs: ["src/**/*.java"],
     sdk_version: "current",
     test_suites: [
+        "mts",
         "cts",
         "general-tests",
     ],
diff --git a/tests/tests/content/SyncAccountAccessStubs/AndroidManifest.xml b/tests/tests/content/SyncAccountAccessStubs/AndroidManifest.xml
index 8423733..1712e43 100644
--- a/tests/tests/content/SyncAccountAccessStubs/AndroidManifest.xml
+++ b/tests/tests/content/SyncAccountAccessStubs/AndroidManifest.xml
@@ -18,6 +18,10 @@
      package="com.android.cts.stub">
 
     <application>
+        <activity android:name=".StubActivity" android:exported="true" />
+
+        <service android:name=".StubService" android:exported="true" />
+
         <service android:name=".StubAuthenticator"
              android:exported="true">
             <intent-filter>
diff --git a/tests/tests/content/SyncAccountAccessStubs/src/com/android/cts/stub/StubService.java b/tests/tests/content/SyncAccountAccessStubs/src/com/android/cts/stub/StubService.java
new file mode 100644
index 0000000..29face6
--- /dev/null
+++ b/tests/tests/content/SyncAccountAccessStubs/src/com/android/cts/stub/StubService.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2021 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.cts.stub;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+
+public class StubService extends Service {
+    private Binder mBinder = new Binder();
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+}
diff --git a/tests/tests/content/TEST_MAPPING b/tests/tests/content/TEST_MAPPING
index 7f588e4..65b6edf 100644
--- a/tests/tests/content/TEST_MAPPING
+++ b/tests/tests/content/TEST_MAPPING
@@ -1,17 +1,4 @@
 {
-  "presubmit": [
-    {
-      "name": "FrameworksCoreTests",
-      "options": [
-        {
-          "include-filter": "android.content.pm.PackageManagerTests"
-        },
-        {
-          "exclude-annotation": "androidx.test.filters.Suppress"
-        }
-      ]
-    }
-  ],
   "presubmit-large": [
     {
       "name": "CtsContentTestCases",
diff --git a/tests/tests/content/emptytestapp/Android.bp b/tests/tests/content/emptytestapp/Android.bp
index f66ccdf..bfcb0c6 100644
--- a/tests/tests/content/emptytestapp/Android.bp
+++ b/tests/tests/content/emptytestapp/Android.bp
@@ -22,10 +22,11 @@
     sdk_version: "current",
     // tag this module as a cts test artifact
     test_suites: [
+        "mts",
         "cts",
         "general-tests",
     ],
-    min_sdk_version : "29"
+    min_sdk_version: "29",
 }
 
 android_test_helper_app {
@@ -35,10 +36,11 @@
     manifest: "AndroidManifestLongPackageName.xml",
     // tag this module as a cts test artifact
     test_suites: [
+        "mts",
         "cts",
         "general-tests",
     ],
-    aaptflags: ["--warn-manifest-validation"]
+    aaptflags: ["--warn-manifest-validation"],
 }
 
 android_test_helper_app {
@@ -48,10 +50,11 @@
     manifest: "AndroidManifestLongSharedUserId.xml",
     // tag this module as a cts test artifact
     test_suites: [
+        "mts",
         "cts",
         "general-tests",
     ],
-    aaptflags: ["--warn-manifest-validation"]
+    aaptflags: ["--warn-manifest-validation"],
 }
 
 android_test_helper_app {
@@ -61,6 +64,7 @@
     manifest: "AndroidManifestMaxPackageName.xml",
     // tag this module as a cts test artifact
     test_suites: [
+        "mts",
         "cts",
         "general-tests",
     ],
@@ -73,6 +77,7 @@
     manifest: "AndroidManifestMaxSharedUserId.xml",
     // tag this module as a cts test artifact
     test_suites: [
+        "mts",
         "cts",
         "general-tests",
     ],
@@ -88,5 +93,21 @@
         "cts",
         "general-tests",
     ],
-    min_sdk_version : "29"
+    min_sdk_version: "29",
+}
+
+android_test_helper_app {
+    name: "CtsContentNoApplicationTestApp",
+    defaults: ["cts_defaults"],
+    sdk_version: "current",
+    manifest: "AndroidManifestEmpty.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    // using 22 (< 23) to avoid soong adds application tag with attr extract-native-libs
+    min_sdk_version: "22",
+    // using 29 (< 30) to allow install an app without application tag
+    target_sdk_version: "29",
 }
diff --git a/tests/tests/content/emptytestapp/AndroidManifestEmpty.xml b/tests/tests/content/emptytestapp/AndroidManifestEmpty.xml
new file mode 100644
index 0000000..ee6d279
--- /dev/null
+++ b/tests/tests/content/emptytestapp/AndroidManifestEmpty.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.content.cts.emptytestapp.stub" >
+</manifest>
diff --git a/tests/tests/content/pm/SecureFrp/src/com/android/tests/securefrpinstall/SecureFrpInstallTest.java b/tests/tests/content/pm/SecureFrp/src/com/android/tests/securefrpinstall/SecureFrpInstallTest.java
index e2712e6..f715c2c 100644
--- a/tests/tests/content/pm/SecureFrp/src/com/android/tests/securefrpinstall/SecureFrpInstallTest.java
+++ b/tests/tests/content/pm/SecureFrp/src/com/android/tests/securefrpinstall/SecureFrpInstallTest.java
@@ -64,12 +64,12 @@
     }
 
     private static void assertInstalled() throws Exception {
-        sPackageManager.getPackageInfo(TestApp.A, 0);
+        sPackageManager.getPackageInfo(TestApp.A, PackageManager.PackageInfoFlags.of(0));
     }
 
     private static void assertNotInstalled() {
         try {
-            sPackageManager.getPackageInfo(TestApp.A, 0);
+            sPackageManager.getPackageInfo(TestApp.A, PackageManager.PackageInfoFlags.of(0));
             fail("Package should not be installed");
         } catch (PackageManager.NameNotFoundException expected) {
         }
diff --git a/tests/tests/content/res/xml/file_paths.xml b/tests/tests/content/res/xml/file_paths.xml
index e8d2861..0653305 100644
--- a/tests/tests/content/res/xml/file_paths.xml
+++ b/tests/tests/content/res/xml/file_paths.xml
@@ -4,4 +4,5 @@
 <!-- Specify the storage area and path used in file provider. -->
 <paths xmlns:android="http://schemas.android.com/apk/res/android">
     <files-path name="debug" path="debug/"/>
-</paths>
\ No newline at end of file
+    <files-path name="files" path="/" />
+</paths>
diff --git a/tests/tests/content/src/android/content/cts/ClipboardAutoClearTest.java b/tests/tests/content/src/android/content/cts/ClipboardAutoClearTest.java
new file mode 100644
index 0000000..ba275e2
--- /dev/null
+++ b/tests/tests/content/src/android/content/cts/ClipboardAutoClearTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2021 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 android.content.cts;
+
+import static com.android.server.clipboard.ClipboardService.PROPERTY_AUTO_CLEAR_ENABLED;
+import static com.android.server.clipboard.ClipboardService.PROPERTY_AUTO_CLEAR_TIMEOUT;
+import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.retryUntil;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.provider.DeviceConfig;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.server.clipboard.ClipboardService;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class ClipboardAutoClearTest {
+    private final Context mContext = InstrumentationRegistry.getTargetContext();
+    private ClipboardManager mClipboardManager;
+    private UiDevice mUiDevice;
+    private final int mLatency = 100;
+    private final String mTestLatency = Integer.toString(mLatency);
+    private static final String LOG_TAG = "ClipboardAutoClearTest";
+    private final long mDefaultTimeout = 3600000;
+
+
+    @Before
+    public void setUp() throws Exception {
+        assumeTrue("Skipping Test: Wear-Os does not support ClipboardService",
+                hasAutoFillFeature());
+        mClipboardManager = mContext.getSystemService(ClipboardManager.class);
+        InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation().adoptShellPermissionIdentity();
+        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        mUiDevice.wakeUp();
+        launchActivity(MockActivity.class);
+    }
+
+    private void launchActivity(Class<? extends Activity> clazz) {
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setClassName(mContext.getPackageName(), clazz.getName());
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        mContext.startActivity(intent);
+        mUiDevice.wait(Until.hasObject(By.pkg(clazz.getPackageName())), 15000);
+    }
+
+    @After
+    public void cleanUp() {
+        mClipboardManager.clearPrimaryClip();
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .dropShellPermissionIdentity();
+    }
+
+
+    @Test
+    public void testAutoClearEnabledDefault() {
+        String enabled = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_CLIPBOARD,
+                PROPERTY_AUTO_CLEAR_ENABLED);
+
+        if (enabled != null) {
+            DeviceConfig.deleteProperty(DeviceConfig.NAMESPACE_CLIPBOARD,
+                    PROPERTY_AUTO_CLEAR_ENABLED);
+        }
+
+        ClipboardManager clipboardManager = mClipboardManager;
+        clipboardManager.setPrimaryClip(
+                ClipData.newPlainText("Test label", "Test string"));
+        assertTrue(clipboardManager.hasPrimaryClip());
+
+        try {
+            Thread.sleep(mLatency * 10);
+        } catch (InterruptedException e) {
+            Log.w(LOG_TAG, e);
+        }
+
+        assertTrue(clipboardManager.hasPrimaryClip());
+        clipboardManager.clearPrimaryClip();
+
+        if (enabled != null) {
+            DeviceConfig.setProperty(DeviceConfig.NAMESPACE_CLIPBOARD,
+                    PROPERTY_AUTO_CLEAR_ENABLED, enabled, false);
+        }
+    }
+
+    @Test
+    public void testAutoClearJob() throws Exception {
+        String enabled = getAndSetProperty(
+                PROPERTY_AUTO_CLEAR_ENABLED, "true");
+        String latency = getAndSetProperty(
+                PROPERTY_AUTO_CLEAR_TIMEOUT, mTestLatency);
+
+        ClipboardManager clipboardManager = mClipboardManager;
+        clipboardManager.setPrimaryClip(
+                ClipData.newPlainText("Test label", "Test string"));
+
+        assertTrue(clipboardManager.hasPrimaryClip());
+
+        retryUntil(() -> !clipboardManager.hasPrimaryClip(), "Auto clear did not run",
+                mLatency / 10);
+
+        getAndSetProperty(PROPERTY_AUTO_CLEAR_ENABLED, enabled);
+        getAndSetProperty(PROPERTY_AUTO_CLEAR_TIMEOUT, latency);
+
+        clipboardManager.clearPrimaryClip();
+    }
+
+    @Test
+    public void testDefaultAutoClearDuration() {
+        assertEquals(mDefaultTimeout, ClipboardService.DEFAULT_CLIPBOARD_TIMEOUT_MILLIS);
+    }
+
+    /**
+     * Sets new value for clipboard auto clear property
+     *
+     * @return old value for the property
+     */
+    private String getAndSetProperty(String property, String newPropertyValue) {
+        String originalPropertyValue = DeviceConfig.getProperty(DeviceConfig.NAMESPACE_CLIPBOARD,
+                property);
+        DeviceConfig.setProperty(DeviceConfig.NAMESPACE_CLIPBOARD, property,
+                newPropertyValue, false);
+        return originalPropertyValue;
+    }
+
+    private boolean hasAutoFillFeature() {
+        return mContext.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_AUTOFILL);
+    }
+}
diff --git a/tests/tests/content/src/android/content/cts/ClipboardManagerTest.java b/tests/tests/content/src/android/content/cts/ClipboardManagerTest.java
index c139b25..10df304 100644
--- a/tests/tests/content/src/android/content/cts/ClipboardManagerTest.java
+++ b/tests/tests/content/src/android/content/cts/ClipboardManagerTest.java
@@ -44,6 +44,8 @@
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.SystemUtil;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -70,6 +72,7 @@
 
     @After
     public void cleanUp() {
+        mClipboardManager.clearPrimaryClip();
         InstrumentationRegistry.getInstrumentation().getUiAutomation()
                 .dropShellPermissionIdentity();
     }
@@ -293,6 +296,32 @@
     }
 
     @Test
+    public void testReadInBackgroundRequiresPermission() throws Exception {
+        ClipData clip = ClipData.newPlainText("TextLabel", "Text1");
+        mClipboardManager.setPrimaryClip(clip);
+
+        // Press the home button to unfocus the app.
+        mUiDevice.pressHome();
+        mUiDevice.wait(Until.gone(By.pkg(MockActivity.class.getPackageName())), 5000);
+
+        // Without the READ_CLIPBOARD_IN_BACKGROUND permission, we should see an empty clipboard.
+        assertThat(mClipboardManager.hasPrimaryClip()).isFalse();
+        assertThat(mClipboardManager.hasText()).isFalse();
+        assertThat(mClipboardManager.getPrimaryClip()).isNull();
+        assertThat(mClipboardManager.getPrimaryClipDescription()).isNull();
+
+        // Having the READ_CLIPBOARD_IN_BACKGROUND permission should allow us to read the clipboard
+        // even when we are not in the foreground. We use the shell identity to simulate holding
+        // this permission; in practice, only privileged system apps can hold this permission (e.g.
+        // an app that has the SYSTEM_TEXT_INTELLIGENCE role).
+        ClipData actual = SystemUtil.callWithShellPermissionIdentity(
+                () -> mClipboardManager.getPrimaryClip(),
+                android.Manifest.permission.READ_CLIPBOARD_IN_BACKGROUND);
+        assertThat(actual).isNotNull();
+        assertThat(actual.getItemAt(0).getText()).isEqualTo("Text1");
+    }
+
+    @Test
     public void testClipSourceRecordedWhenClipSet() {
         ClipData clipData = ClipData.newPlainText("TextLabel", "Text1");
         mClipboardManager.setPrimaryClip(clipData);
diff --git a/tests/tests/content/src/android/content/cts/ContentResolverTest.java b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
index 1a719eb..71bffc7 100644
--- a/tests/tests/content/src/android/content/cts/ContentResolverTest.java
+++ b/tests/tests/content/src/android/content/cts/ContentResolverTest.java
@@ -20,6 +20,8 @@
 import static android.content.ContentResolver.NOTIFY_UPDATE;
 
 import android.accounts.Account;
+import android.annotation.NonNull;
+import android.annotation.UserIdInt;
 import android.content.ContentProviderClient;
 import android.content.ContentResolver;
 import android.content.ContentResolver.MimeTypeInfo;
@@ -38,6 +40,7 @@
 import android.os.OperationCanceledException;
 import android.os.ParcelFileDescriptor;
 import android.os.RemoteException;
+import android.os.UserHandle;
 import android.platform.test.annotations.AppModeFull;
 import android.test.AndroidTestCase;
 import android.util.Log;
@@ -45,6 +48,8 @@
 import androidx.test.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.ShellIdentityUtils;
+import com.android.internal.annotations.GuardedBy;
 import com.android.internal.util.ArrayUtils;
 
 import java.io.File;
@@ -1182,6 +1187,105 @@
             //expected.
         }
     }
+    // Tests registerContentObserverForAllUsers without INTERACT_ACROSS_USERS_FULL: verify
+    // SecurityException.
+    public void testRegisterContentObserverForAllUsersWithoutPermission() {
+        final MockContentObserver mco = new MockContentObserver();
+        try {
+            mContentResolver.registerContentObserverAsUser(TABLE1_URI, true, mco, UserHandle.ALL);
+            fail("testRegisterContentObserverForAllUsers: "
+                    + "SecurityException expected on testRegisterContentObserverForAllUsers");
+        } catch (SecurityException se) {
+            // expected
+        }
+    }
+
+    public void testRegisterContentObserverAsUser() {
+        final MockContentObserver mco = new MockContentObserver();
+
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                mContentResolver,
+                (cr) -> cr.registerContentObserverAsUser(TABLE1_URI, true, mco, mContext.getUser())
+        );
+        assertFalse(mco.hadOnChanged());
+
+        ContentValues values = new ContentValues();
+        values.put(COLUMN_KEY_NAME, "key10");
+        values.put(COLUMN_VALUE_NAME, 10);
+        mContentResolver.update(TABLE1_URI, values, null, null);
+        new PollingCheck() {
+            @Override
+            protected boolean check() {
+                return mco.hadOnChanged();
+            }
+        }.run();
+
+        mco.reset();
+        mContentResolver.unregisterContentObserver(mco);
+        assertFalse(mco.hadOnChanged());
+        mContentResolver.update(TABLE1_URI, values, null, null);
+
+        assertFalse(mco.hadOnChanged());
+    }
+
+    public void testRegisterContentObserverForAllUsers() {
+        final MockContentObserver mco = new MockContentObserver();
+
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                mContentResolver,
+                (cr) -> cr.registerContentObserverAsUser(TABLE1_URI, true, mco, UserHandle.ALL)
+        );
+        assertFalse(mco.hadOnChanged());
+
+        ContentValues values = new ContentValues();
+        values.put(COLUMN_KEY_NAME, "key10");
+        values.put(COLUMN_VALUE_NAME, 10);
+        mContentResolver.update(TABLE1_URI, values, null, null);
+        new PollingCheck() {
+            @Override
+            protected boolean check() {
+                return mco.hadOnChanged();
+            }
+        }.run();
+
+        mco.reset();
+        mContentResolver.unregisterContentObserver(mco);
+        assertFalse(mco.hadOnChanged());
+        mContentResolver.update(TABLE1_URI, values, null, null);
+
+        assertFalse(mco.hadOnChanged());
+
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                    mContentResolver,
+                    (cr) -> cr.registerContentObserverAsUser(null, false, mco, UserHandle.ALL)
+            );
+            fail("did not throw NullPointerException or IllegalArgumentException when uri is null"
+                    + ".");
+        } catch (NullPointerException e) {
+            //expected.
+        } catch (IllegalArgumentException e) {
+            // also expected
+        }
+
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                    mContentResolver,
+                    (cr) -> cr.registerContentObserverAsUser(TABLE1_URI, false, null,
+                            UserHandle.ALL)
+            );
+            fail("did not throw NullPointerException when register null content observer.");
+        } catch (NullPointerException e) {
+            //expected.
+        }
+
+        try {
+            mContentResolver.unregisterContentObserver(null);
+            fail("did not throw NullPointerException when unregister null content observer.");
+        } catch (NullPointerException e) {
+            //expected.
+        }
+    }
 
     public void testRegisterContentObserverDescendantBehavior() throws Exception {
         final MockContentObserver mco1 = new MockContentObserver();
@@ -1230,6 +1334,59 @@
         assertFalse(mco2.hadOnChanged());
     }
 
+    public void testRegisterContentObserverForAllUsersDescendantBehavior() throws Exception {
+        final MockContentObserver mco1 = new MockContentObserver();
+        final MockContentObserver mco2 = new MockContentObserver();
+
+        // Register one content observer with notifyDescendants set to false, and
+        // another with true.
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                mContentResolver,
+                (cr) -> cr.registerContentObserverAsUser(LEVEL2_URI, false, mco1, UserHandle.ALL)
+        );
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                mContentResolver,
+                (cr) -> cr.registerContentObserverAsUser(LEVEL2_URI, true, mco2, UserHandle.ALL)
+        );
+
+        // Initially nothing has happened.
+        assertFalse(mco1.hadOnChanged());
+        assertFalse(mco2.hadOnChanged());
+
+        // Fire a change with the exact URI.
+        // Should signal both observers due to exact match, notifyDescendants doesn't matter.
+        mContentResolver.notifyChange(LEVEL2_URI, null);
+        Thread.sleep(200);
+        assertTrue(mco1.hadOnChanged());
+        assertTrue(mco2.hadOnChanged());
+        mco1.reset();
+        mco2.reset();
+
+        // Fire a change with a descendant URI.
+        // Should only signal observer with notifyDescendants set to true.
+        mContentResolver.notifyChange(LEVEL3_URI, null);
+        Thread.sleep(200);
+        assertFalse(mco1.hadOnChanged());
+        assertTrue(mco2.hadOnChanged());
+        mco2.reset();
+
+        // Fire a change with an ancestor URI.
+        // Should signal both observers due to ancestry, notifyDescendants doesn't matter.
+        mContentResolver.notifyChange(LEVEL1_URI, null);
+        Thread.sleep(200);
+        assertTrue(mco1.hadOnChanged());
+        assertTrue(mco2.hadOnChanged());
+        mco1.reset();
+        mco2.reset();
+
+        // Fire a change with an unrelated URI.
+        // Should signal neither observer.
+        mContentResolver.notifyChange(TABLE1_URI, null);
+        Thread.sleep(200);
+        assertFalse(mco1.hadOnChanged());
+        assertFalse(mco2.hadOnChanged());
+    }
+
     public void testNotifyChange1() {
         final MockContentObserver mco = new MockContentObserver();
 
@@ -1489,17 +1646,27 @@
         public final boolean selfChange;
         public final Iterable<Uri> uris;
         public final int flags;
+        @UserIdInt
+        public final int userId;
 
         public Change(boolean selfChange, Iterable<Uri> uris, int flags) {
             this.selfChange = selfChange;
             this.uris = uris;
             this.flags = flags;
+            this.userId = -1;
+        }
+
+        public Change(boolean selfChange, Iterable<Uri> uris, int flags, @UserIdInt int userId) {
+            this.selfChange = selfChange;
+            this.uris = uris;
+            this.flags = flags;
+            this.userId = userId;
         }
 
         @Override
         public String toString() {
-            return String.format("onChange(%b, %s, %d)",
-                    selfChange, asSet(uris).toString(), flags);
+            return String.format("onChange(%b, %s, %d, %d)",
+                    selfChange, asSet(uris).toString(), flags, userId);
         }
 
         @Override
@@ -1508,7 +1675,7 @@
                 final Change change = (Change) other;
                 return change.selfChange == selfChange &&
                         Objects.equals(asSet(change.uris), asSet(uris)) &&
-                        change.flags == flags;
+                        change.flags == flags && change.userId == userId;
             } else {
                 return false;
             }
@@ -1536,11 +1703,13 @@
 
         @Override
         public synchronized void onChange(boolean selfChange, Collection<Uri> uris, int flags) {
-            final Change change = new Change(selfChange, uris, flags);
-            Log.v(TAG, change.toString());
+            doOnChangeLocked(selfChange, uris, flags, /*userId=*/ -1);
+        }
 
-            mHadOnChanged = true;
-            mChanges.add(change);
+        @Override
+        public synchronized void onChange(boolean selfChange, @NonNull Collection<Uri> uris,
+                @ContentResolver.NotifyFlags int flags, UserHandle user) {
+            doOnChangeLocked(selfChange, uris, flags, user.getIdentifier());
         }
 
         public synchronized boolean hadOnChanged() {
@@ -1554,5 +1723,15 @@
         public synchronized boolean hadChanges(Collection<Change> changes) {
             return mChanges.containsAll(changes);
         }
+
+        @GuardedBy("this")
+        private void doOnChangeLocked(boolean selfChange, @NonNull Collection<Uri> uris,
+                @ContentResolver.NotifyFlags int flags, @UserIdInt int userId) {
+            final Change change = new Change(selfChange, uris, flags, userId);
+            Log.v(TAG, change.toString());
+
+            mHadOnChanged = true;
+            mChanges.add(change);
+        }
     }
 }
diff --git a/tests/tests/content/src/android/content/cts/ContextTest.java b/tests/tests/content/src/android/content/cts/ContextTest.java
index a32a6c1..b742cc9 100644
--- a/tests/tests/content/src/android/content/cts/ContextTest.java
+++ b/tests/tests/content/src/android/content/cts/ContextTest.java
@@ -23,6 +23,7 @@
 
 import android.app.Activity;
 import android.app.AppOpsManager;
+import android.app.BroadcastOptions;
 import android.app.Instrumentation;
 import android.app.WallpaperManager;
 import android.content.ActivityNotFoundException;
@@ -59,6 +60,7 @@
 import android.platform.test.annotations.AppModeFull;
 import android.preference.PreferenceManager;
 import android.test.AndroidTestCase;
+import android.test.suitebuilder.annotation.Suppress;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
@@ -114,6 +116,13 @@
     private static final int BROADCAST_TIMEOUT = 10000;
     private static final int ROOT_UID = 0;
 
+    /**
+     * Shell command to broadcast {@link ResultReceiver#MOCK_ACTION} as an external app.
+     */
+    private static final String EXTERNAL_APP_BROADCAST_COMMAND =
+            "am broadcast -a " + ResultReceiver.MOCK_ACTION + " -f "
+                    + Intent.FLAG_RECEIVER_FOREGROUND;
+
     private Object mLockObj;
 
     private ArrayList<BroadcastReceiver> mRegisteredReceiverList;
@@ -595,7 +604,14 @@
     }
 
     private void registerBroadcastReceiver(BroadcastReceiver receiver, IntentFilter filter) {
-        mContext.registerReceiver(receiver, filter);
+        // All of the broadcasts for tests that use this method are sent by the local app, so by
+        // default all receivers can be registered as not exported.
+        registerBroadcastReceiver(receiver, filter, Context.RECEIVER_NOT_EXPORTED);
+    }
+
+    private void registerBroadcastReceiver(BroadcastReceiver receiver, IntentFilter filter,
+            int flags) {
+        mContext.registerReceiver(receiver, filter, flags);
 
         mRegisteredReceiverList.add(receiver);
     }
@@ -1545,6 +1561,105 @@
         }.run();
     }
 
+    /**
+     * Verify the receiver should get the broadcast since it has all of the required permissions.
+     */
+    public void testSendBroadcastRequireAllOfPermissions_receiverHasAllPermissions()
+            throws Exception {
+        final ResultReceiver receiver = new ResultReceiver();
+
+        registerBroadcastReceiver(receiver, new IntentFilter(ResultReceiver.MOCK_ACTION));
+        BroadcastOptions options = BroadcastOptions.makeBasic();
+        options.setRequireAllOfPermissions(
+                new String[] { // this test APK has both these permissions
+                        android.Manifest.permission.ACCESS_WIFI_STATE,
+                        android.Manifest.permission.ACCESS_NETWORK_STATE
+                });
+        mContext.sendBroadcast(new Intent(ResultReceiver.MOCK_ACTION), null,
+                options.toBundle());
+
+        new PollingCheck(BROADCAST_TIMEOUT) {
+            @Override
+            protected boolean check() {
+                return receiver.hasReceivedBroadCast();
+            }
+        }.run();
+    }
+
+    /** The receiver should not get the broadcast if it does not have all the permissions. */
+    public void testSendBroadcastRequireAllOfPermissions_receiverHasSomePermissions()
+            throws Exception {
+        final ResultReceiver receiver = new ResultReceiver();
+
+        registerBroadcastReceiver(receiver, new IntentFilter(ResultReceiver.MOCK_ACTION));
+        BroadcastOptions options = BroadcastOptions.makeBasic();
+        options.setRequireAllOfPermissions(
+                new String[] { // this test APK only has ACCESS_WIFI_STATE
+                        android.Manifest.permission.ACCESS_WIFI_STATE,
+                        android.Manifest.permission.NETWORK_STACK,
+                });
+
+        mContext.sendBroadcast(
+                new Intent(ResultReceiver.MOCK_ACTION), null,
+                options.toBundle());
+
+        Thread.sleep(BROADCAST_TIMEOUT);
+        assertFalse(receiver.hasReceivedBroadCast());
+    }
+
+    /**
+     * Verify the receiver will get the broadcast since it has none of the excluded permissions.
+     */
+    public void testSendBroadcastRequireNoneOfPermissions_receiverHasNoneOfExcludedPermissions()
+            throws Exception {
+        final ResultReceiver receiver = new ResultReceiver();
+
+        registerBroadcastReceiver(receiver, new IntentFilter(ResultReceiver.MOCK_ACTION));
+        BroadcastOptions options = BroadcastOptions.makeBasic();
+        options.setRequireAllOfPermissions(
+                new String[] { // this test APK has both these permissions
+                        android.Manifest.permission.ACCESS_WIFI_STATE,
+                        android.Manifest.permission.ACCESS_NETWORK_STATE
+                });
+        options.setRequireNoneOfPermissions(
+                new String[] { // test package does not have NETWORK_STACK
+                        android.Manifest.permission.NETWORK_STACK
+                });
+        mContext.sendBroadcast(new Intent(ResultReceiver.MOCK_ACTION), null,
+                options.toBundle());
+
+        new PollingCheck(BROADCAST_TIMEOUT) {
+            @Override
+            protected boolean check() {
+                return receiver.hasReceivedBroadCast();
+            }
+        }.run();
+    }
+
+    /**
+     * Verify the receiver will not get the broadcast since it has one of the excluded permissions.
+     */
+    public void testSendBroadcastRequireNoneOfPermissions_receiverHasExcludedPermissions()
+            throws Exception {
+        final ResultReceiver receiver = new ResultReceiver();
+
+        registerBroadcastReceiver(receiver, new IntentFilter(ResultReceiver.MOCK_ACTION));
+        BroadcastOptions options = BroadcastOptions.makeBasic();
+        options.setRequireAllOfPermissions(
+                new String[] { // this test APK has ACCESS_WIFI_STATE
+                        android.Manifest.permission.ACCESS_WIFI_STATE
+                });
+        options.setRequireNoneOfPermissions(
+                new String[] { // test package has ACCESS_NETWORK_STATE
+                        android.Manifest.permission.ACCESS_NETWORK_STATE
+                });
+        mContext.sendBroadcast(new Intent(ResultReceiver.MOCK_ACTION), null,
+                options.toBundle());
+
+        Thread.sleep(BROADCAST_TIMEOUT);
+        assertFalse(receiver.hasReceivedBroadCast());
+    }
+
     /** The receiver should get the broadcast if it has all the permissions. */
     public void testSendBroadcastWithMultiplePermissions_receiverHasAllPermissions()
             throws Exception {
@@ -1603,6 +1718,142 @@
         assertFalse(receiver.hasReceivedBroadCast());
     }
 
+    /**
+     * Starting from Android 13, a SecurityException is thrown for apps targeting this
+     * release or later that do not specify {@link Context#RECEIVER_EXPORTED} or {@link
+     * Context#RECEIVER_NOT_EXPORTED} when registering for non-system broadcasts.
+     */
+    // TODO(b/206699109): Re-enable test when instrumentation workaround is removed; without a flag
+    // specified the instrumentation workaround automatically adds RECEIVER_EXPORTED.
+    @Suppress
+    public void testRegisterReceiver_noFlags_exceptionThrown() throws Exception {
+        try {
+            final ResultReceiver receiver = new ResultReceiver();
+
+            registerBroadcastReceiver(receiver, new IntentFilter(ResultReceiver.MOCK_ACTION), 0);
+
+            fail("An app targeting Android 13 and registering a dynamic receiver for a "
+                    + "non-system broadcast must receive a SecurityException if "
+                    + "RECEIVER_EXPORTED or RECEIVER_NOT_EXPORTED is not specified");
+        } catch (SecurityException expected) {
+        }
+    }
+
+    /**
+     * An app targeting Android 13 or later can register for system broadcasts without specifying
+     * {@link Context#RECEIVER_EXPORTED} or {@link Context@RECEIVER_NOT_EXPORTED}.
+     */
+    public void testRegisterReceiver_noFlagsProtectedBroadcast_noExceptionThrown()
+            throws Exception {
+        final ResultReceiver receiver = new ResultReceiver();
+
+        // Intent.ACTION_SCREEN_OFF is a system broadcast and thus should not require a flag
+        // indicating whether the receiver is exported.
+        registerBroadcastReceiver(receiver, new IntentFilter(Intent.ACTION_SCREEN_OFF), 0);
+    }
+
+    /**
+     * An app targeting Android 13 or later can request a sticky broadcast via
+     * {@code Context#registerReceiver} without specifying {@link Context#RECEIVER_EXPORTED} or
+     * {@link Context#RECEIVER_NOT_EXPORTED}.
+     */
+    public void testRegisterReceiver_noFlagsStickyBroadcast_noExceptionThrown() throws Exception {
+        // If a null receiver is specified to Context#registerReceiver, it indicates the caller
+        // is requesting a sticky broadcast without actually registering a receiver; a flag
+        // must not be required in this case.
+        mContext.registerReceiver(null, new IntentFilter(ResultReceiver.MOCK_ACTION), 0);
+    }
+
+    /**
+     * Starting from Android 13, an app targeting this release or later must specify one of either
+     * {@link Context#RECEIVER_EXPORTED} or {@link Context#RECEIVER_NOT_EXPORTED} when registering
+     * a receiver for non-system broadcasts; however if both are specified then an
+     * {@link IllegalArgumentException} should be thrown.
+     */
+    public void testRegisterReceiver_bothFlags_exceptionThrown() throws Exception {
+        try {
+            final ResultReceiver receiver = new ResultReceiver();
+
+            registerBroadcastReceiver(receiver, new IntentFilter(ResultReceiver.MOCK_ACTION),
+                    Context.RECEIVER_EXPORTED | Context.RECEIVER_NOT_EXPORTED);
+
+            fail("An app invoke invoking Context#registerReceiver with both RECEIVER_EXPORTED and"
+                    + " RECEIVER_NOT_EXPORTED set must receive an IllegalArgumentException");
+        } catch (IllegalArgumentException expected) {
+        }
+    }
+
+    /**
+     * Verifies a receiver registered with {@link Context#RECEIVER_EXPORTED} can receive a
+     * broadcast from an external app.
+     *
+     * <p>The broadcast is sent as a shell command since this most closely simulates sending a
+     * broadcast from an external app; sending the broadcast via {@code
+     * ShellIdentityUtils#invokeMethodWithShellPermissionsNoReturn} is still delivered even to
+     * apps that use {@link Context#RECEIVER_NOT_EXPORTED}.
+     */
+    public void testRegisterReceiver_exported_broadcastReceived() throws Exception {
+        final ResultReceiver receiver = new ResultReceiver();
+        registerBroadcastReceiver(receiver, new IntentFilter(ResultReceiver.MOCK_ACTION),
+                Context.RECEIVER_EXPORTED);
+
+        SystemUtil.runShellCommand(EXTERNAL_APP_BROADCAST_COMMAND);
+
+        new PollingCheck(BROADCAST_TIMEOUT, "The broadcast to the exported receiver"
+                + " was not received within the timeout window") {
+            @Override
+            protected boolean check() {
+                return receiver.hasReceivedBroadCast();
+            }
+        }.run();
+    }
+
+    /**
+     * Verifies a receiver registered with {@link Context#RECEIVER_EXPORTED_UNAUDITED} can receive
+     * a broadcast from an external app.
+     *
+     * <p>{@code Context#RECEIVER_EXPORTED_UNAUDITED} is only intended to be applied to receivers
+     * that have not yet been audited to determine their intended exported state; this test ensures
+     * this flag maintains the existing behavior of exporting the receiver until it can be
+     * evaluated.
+     */
+    public void testRegisterReceiver_exportedUnaudited_broadcastReceived() throws Exception {
+        final ResultReceiver receiver = new ResultReceiver();
+        registerBroadcastReceiver(receiver, new IntentFilter(ResultReceiver.MOCK_ACTION),
+                Context.RECEIVER_EXPORTED_UNAUDITED);
+
+        SystemUtil.runShellCommand(EXTERNAL_APP_BROADCAST_COMMAND);
+
+        new PollingCheck(BROADCAST_TIMEOUT, "The broadcast to the exported receiver"
+                + " was not received within the timeout window") {
+            @Override
+            protected boolean check() {
+                return receiver.hasReceivedBroadCast();
+            }
+        }.run();
+    }
+
+    /**
+     * Verifies a receiver registered with {@link Context#RECEIVER_NOT_EXPORTED} does not receive
+     * a broadcast from an external app.
+     */
+    // TODO(b/206699109): Re-enable this test once the skip for an external app sending a broadcast
+    // to an unexported receiver is restored in BroadcastQueue.
+    @Suppress
+    public void testRegisterReceiver_notExported_broadcastNotReceived() throws Exception {
+        final ResultReceiver receiver = new ResultReceiver();
+        registerBroadcastReceiver(receiver, new IntentFilter(ResultReceiver.MOCK_ACTION),
+                Context.RECEIVER_NOT_EXPORTED);
+
+        SystemUtil.runShellCommand(EXTERNAL_APP_BROADCAST_COMMAND);
+
+        Thread.sleep(BROADCAST_TIMEOUT);
+        assertFalse(
+                "An external app must not be able to send a broadcast to a dynamic receiver "
+                        + "registered with RECEIVER_NOT_EXPORTED",
+                receiver.hasReceivedBroadCast());
+    }
+
     public void testEnforceCallingOrSelfUriPermission() {
         try {
             Uri uri = Uri.parse("content://ctstest");
diff --git a/tests/tests/content/src/android/content/cts/IntentFilterTest.java b/tests/tests/content/src/android/content/cts/IntentFilterTest.java
index 663cbfa..b5c061d 100644
--- a/tests/tests/content/src/android/content/cts/IntentFilterTest.java
+++ b/tests/tests/content/src/android/content/cts/IntentFilterTest.java
@@ -60,6 +60,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
+import java.util.function.Predicate;
 
 
 public class IntentFilterTest extends AndroidTestCase {
@@ -975,6 +976,14 @@
                 new String[]{"some.app.domain"},
                 null);
 
+        IntentFilter appWithWildcardWebLink = new Match(
+                new String[]{Intent.ACTION_VIEW},
+                new String[]{Intent.CATEGORY_BROWSABLE},
+                null,
+                new String[]{"http", "https"},
+                new String[]{"*.app.domain"},
+                null);
+
         IntentFilter browserFilterWithWildcard = new Match(
                 new String[]{Intent.ACTION_VIEW},
                 new String[]{Intent.CATEGORY_BROWSABLE},
@@ -1012,6 +1021,13 @@
                 null,
                 "https://",
                 true));
+        checkMatches(appWithWildcardWebLink,
+                new MatchCondition(NO_MATCH_DATA,
+                Intent.ACTION_VIEW,
+                new String[]{Intent.CATEGORY_BROWSABLE},
+                null,
+                "https://",
+                true));
     }
 
     public void testWriteToXml() throws IllegalArgumentException, IllegalStateException,
@@ -1774,4 +1790,20 @@
             isPrintlnCalled = true;
         }
     }
-}
\ No newline at end of file
+
+    public void testAsPredicate() throws Exception {
+        final Predicate<Intent> pred = new IntentFilter(ACTION).asPredicate();
+
+        assertTrue(pred.test(new Intent(ACTION)));
+        assertFalse(pred.test(new Intent(CATEGORY)));
+    }
+
+    public void testAsPredicateWithTypeResolution() throws Exception {
+        final ContentResolver resolver = mContext.getContentResolver();
+        final Predicate<Intent> pred = new IntentFilter(ACTION, DATA_STATIC_TYPE)
+                .asPredicateWithTypeResolution(resolver);
+
+        assertTrue(pred.test(new Intent(ACTION).setDataAndType(URI, DATA_STATIC_TYPE)));
+        assertFalse(pred.test(new Intent(ACTION).setDataAndType(URI, DATA_DYNAMIC_TYPE)));
+    }
+}
diff --git a/tests/tests/content/src/android/content/cts/SharedPreferencesTest.java b/tests/tests/content/src/android/content/cts/SharedPreferencesTest.java
index 67ec257..45b9005 100644
--- a/tests/tests/content/src/android/content/cts/SharedPreferencesTest.java
+++ b/tests/tests/content/src/android/content/cts/SharedPreferencesTest.java
@@ -22,11 +22,10 @@
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.os.StrictMode;
-import android.os.StrictMode.ViolationInfo;
-import android.os.StrictMode.ViolationLogger;
 import android.preference.PreferenceManager;
 import android.test.AndroidTestCase;
 import android.util.Log;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -56,7 +55,7 @@
         prefs.edit().clear().commit();
         try {
             ApplicationInfo applicationInfo = mContext.getPackageManager().getApplicationInfo(
-                    mContext.getPackageName(), 0);
+                    mContext.getPackageName(), PackageManager.ApplicationInfoFlags.of(0));
             mPrefsFile = new File(applicationInfo.dataDir,
                     "shared_prefs/android.content.cts_preferences.xml");
         } catch (PackageManager.NameNotFoundException e) {
diff --git a/tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java b/tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java
index a77433f..02ee351 100644
--- a/tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ApplicationInfoTest.java
@@ -38,6 +38,7 @@
 import android.content.cts.R;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.Build;
 import android.os.Environment;
@@ -67,6 +68,8 @@
             "android.content.cts.directbootunaware";
     private static final String PARTIALLY_DIRECT_BOOT_AWARE_PACKAGE_NAME =
             "android.content.cts.partiallydirectbootaware";
+    private static final String NO_APPLICATION_PACKAGE_NAME =
+            "android.content.cts.emptytestapp.stub";
 
     private ApplicationInfo mApplicationInfo;
     private String mPackageName;
@@ -92,7 +95,8 @@
 
     @Test
     public void testWriteToParcel() throws NameNotFoundException {
-        mApplicationInfo = getContext().getPackageManager().getApplicationInfo(mPackageName, 0);
+        mApplicationInfo = getContext().getPackageManager().getApplicationInfo(mPackageName,
+                PackageManager.ApplicationInfoFlags.of(0));
 
         Parcel p = Parcel.obtain();
         mApplicationInfo.writeToParcel(p, 0);
@@ -123,7 +127,8 @@
 
     @Test
     public void testDescribeContents() throws NameNotFoundException {
-       mApplicationInfo = getContext().getPackageManager().getApplicationInfo(mPackageName, 0);
+        mApplicationInfo = getContext().getPackageManager().getApplicationInfo(mPackageName,
+               PackageManager.ApplicationInfoFlags.of(0));
 
         assertEquals(0, mApplicationInfo.describeContents());
     }
@@ -144,7 +149,8 @@
 
     @Test
     public void testLoadDescription() throws NameNotFoundException {
-        mApplicationInfo = getContext().getPackageManager().getApplicationInfo(mPackageName, 0);
+        mApplicationInfo = getContext().getPackageManager().getApplicationInfo(mPackageName,
+                PackageManager.ApplicationInfoFlags.of(0));
 
         assertNull(mApplicationInfo.loadDescription(getContext().getPackageManager()));
 
@@ -155,7 +161,8 @@
 
     @Test
     public void verifyOwnInfo() throws NameNotFoundException {
-        mApplicationInfo = getContext().getPackageManager().getApplicationInfo(mPackageName, 0);
+        mApplicationInfo = getContext().getPackageManager().getApplicationInfo(mPackageName,
+                PackageManager.ApplicationInfoFlags.of(0));
 
         assertEquals("Android TestCase", mApplicationInfo.nonLocalizedLabel);
         assertEquals(R.drawable.size_48x48, mApplicationInfo.icon);
@@ -169,7 +176,7 @@
     public void verifyDefaultValues() throws NameNotFoundException {
         // The application "com.android.cts.stub" does not have any attributes set
         mApplicationInfo = getContext().getPackageManager().getApplicationInfo(
-                SYNC_ACCOUNT_ACCESS_STUB_PACKAGE_NAME, 0);
+                SYNC_ACCOUNT_ACCESS_STUB_PACKAGE_NAME, PackageManager.ApplicationInfoFlags.of(0));
         int currentUserId = Process.myUserHandle().getIdentifier();
 
         assertNull(mApplicationInfo.className);
@@ -215,21 +222,29 @@
     @Test
     public void testDirectBootUnawareAppIsNotEncryptionAware() throws Exception {
         ApplicationInfo applicationInfo = getContext().getPackageManager().getApplicationInfo(
-                DIRECT_BOOT_UNAWARE_PACKAGE_NAME, 0);
+                DIRECT_BOOT_UNAWARE_PACKAGE_NAME, PackageManager.ApplicationInfoFlags.of(0));
         assertFalse(applicationInfo.isEncryptionAware());
     }
 
     @Test
     public void testDirectBootUnawareAppCategoryIsAccessibility() throws Exception {
         mApplicationInfo = getContext().getPackageManager().getApplicationInfo(
-                DIRECT_BOOT_UNAWARE_PACKAGE_NAME, 0);
+                DIRECT_BOOT_UNAWARE_PACKAGE_NAME, PackageManager.ApplicationInfoFlags.of(0));
         assertEquals(CATEGORY_ACCESSIBILITY, mApplicationInfo.category);
     }
 
     @Test
+    public void testDefaultAppCategoryIsUndefined() throws Exception {
+        final ApplicationInfo applicationInfo = getContext().getPackageManager().getApplicationInfo(
+                NO_APPLICATION_PACKAGE_NAME, PackageManager.ApplicationInfoFlags.of(0));
+        assertEquals(CATEGORY_UNDEFINED, applicationInfo.category);
+    }
+
+    @Test
     public void testPartiallyDirectBootAwareAppIsEncryptionAware() throws Exception {
         ApplicationInfo applicationInfo = getContext().getPackageManager().getApplicationInfo(
-                PARTIALLY_DIRECT_BOOT_AWARE_PACKAGE_NAME, 0);
+                PARTIALLY_DIRECT_BOOT_AWARE_PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
         assertTrue(applicationInfo.isEncryptionAware());
     }
 
@@ -238,7 +253,8 @@
         // Make sure ApplicationInfo.writeToParcel() doesn't do the "squashing",
         // because Parcel.allowSquashing() isn't called.
 
-        mApplicationInfo = getContext().getPackageManager().getApplicationInfo(mPackageName, 0);
+        mApplicationInfo = getContext().getPackageManager().getApplicationInfo(mPackageName,
+                PackageManager.ApplicationInfoFlags.of(0));
 
         final Parcel p = Parcel.obtain();
         mApplicationInfo.writeToParcel(p, 0);
@@ -270,7 +286,8 @@
         // Make sure ApplicationInfo.writeToParcel() does the "squashing", after
         // Parcel.allowSquashing() is called.
 
-        mApplicationInfo = getContext().getPackageManager().getApplicationInfo(mPackageName, 0);
+        mApplicationInfo = getContext().getPackageManager().getApplicationInfo(mPackageName,
+                PackageManager.ApplicationInfoFlags.of(0));
 
         final Parcel p = Parcel.obtain();
 
@@ -317,7 +334,7 @@
                 + systemPath + vendorPath, packageName);
 
         final PackageInfo info = getContext().getPackageManager().getPackageInfo(
-                packageName.trim(), 0 /* flags */);
+                packageName.trim(), PackageManager.PackageInfoFlags.of(0));
         assertTrue(packageName + " is not vendor package.", info.applicationInfo.isVendor());
     }
 
@@ -330,7 +347,7 @@
         assumeNotNull(packageName);
 
         final PackageInfo info = getContext().getPackageManager().getPackageInfo(
-                packageName.trim(), 0 /* flags */);
+                packageName.trim(), PackageManager.PackageInfoFlags.of(0));
         assertTrue(packageName + " is not oem package.", info.applicationInfo.isOem());
     }
 
diff --git a/tests/tests/content/src/android/content/pm/cts/ApplicationInfo_DisplayNameComparatorTest.java b/tests/tests/content/src/android/content/pm/cts/ApplicationInfo_DisplayNameComparatorTest.java
index 713c60b..c60fffe 100644
--- a/tests/tests/content/src/android/content/pm/cts/ApplicationInfo_DisplayNameComparatorTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ApplicationInfo_DisplayNameComparatorTest.java
@@ -17,8 +17,8 @@
 package android.content.pm.cts;
 
 import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
 import android.content.pm.ApplicationInfo.DisplayNameComparator;
+import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.test.AndroidTestCase;
 
@@ -52,13 +52,15 @@
         info2.packageName = PACKAGE_NAME;
         assertEquals(0, mDisplayNameComparator.compare(info1, info2));
 
-        info1 = mContext.getPackageManager().getApplicationInfo(PACKAGE_NAME, 0);
+        info1 = mContext.getPackageManager().getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
         info2.packageName = PACKAGE_NAME + ".2";
         assertTrue((mDisplayNameComparator.compare(info1, info2) < 0));
 
         info1 = new ApplicationInfo();
         info1.packageName = PACKAGE_NAME + ".1";
-        info2 = mContext.getPackageManager().getApplicationInfo(PACKAGE_NAME, 0);
+        info2 = mContext.getPackageManager().getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
         assertTrue((mDisplayNameComparator.compare(info1, info2) > 0));
 
         try {
diff --git a/tests/tests/content/src/android/content/pm/cts/AttributionTest.java b/tests/tests/content/src/android/content/pm/cts/AttributionTest.java
index c1354f7..e7692bb 100644
--- a/tests/tests/content/src/android/content/pm/cts/AttributionTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/AttributionTest.java
@@ -50,7 +50,8 @@
 
     @Test
     public void dontGetAttributions() throws Exception {
-        PackageInfo packageInfo = sContext.getPackageManager().getPackageInfo(PACKAGE_NAME, 0);
+        PackageInfo packageInfo = sContext.getPackageManager().getPackageInfo(PACKAGE_NAME,
+                PackageManager.PackageInfoFlags.of(0));
         assertNotNull(packageInfo);
         assertNull(packageInfo.attributions);
     }
@@ -58,7 +59,7 @@
     @Test
     public void getAttributionsAndVerify() throws Exception {
         PackageInfo packageInfo = sContext.getPackageManager().getPackageInfo(PACKAGE_NAME,
-                PackageManager.GET_ATTRIBUTIONS);
+                PackageManager.PackageInfoFlags.of(PackageManager.GET_ATTRIBUTIONS));
         assertNotNull(packageInfo);
         assertNotNull(packageInfo.attributions);
         assertEquals(packageInfo.attributions.length, NUM_ATTRIBUTIONS);
diff --git a/tests/tests/content/src/android/content/pm/cts/ChecksumsTest.java b/tests/tests/content/src/android/content/pm/cts/ChecksumsTest.java
index fa9f14e..f5f296c 100644
--- a/tests/tests/content/src/android/content/pm/cts/ChecksumsTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ChecksumsTest.java
@@ -33,9 +33,11 @@
 import static org.junit.Assert.assertTrue;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertThrows;
 
 import android.app.UiAutomation;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.IIntentReceiver;
 import android.content.IIntentSender;
 import android.content.Intent;
@@ -51,6 +53,7 @@
 import android.content.pm.Signature;
 import android.content.pm.cts.util.AbandonAllPackageSessionsRule;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
 import android.platform.test.annotations.AppModeFull;
@@ -153,8 +156,12 @@
         return InstrumentationRegistry.getInstrumentation().getUiAutomation();
     }
 
+    private static Context getContext() {
+        return InstrumentationRegistry.getContext();
+    }
+
     private static PackageManager getPackageManager() {
-        return InstrumentationRegistry.getContext().getPackageManager();
+        return getContext().getPackageManager();
     }
 
     private static PackageInstaller getPackageInstaller() {
@@ -181,6 +188,14 @@
     }
 
     @Test
+    public void testNameNotFound() throws Exception {
+        LocalListener receiver = new LocalListener();
+        PackageManager pm = getPackageManager();
+        assertThrows(PackageManager.NameNotFoundException.class,
+                () -> pm.requestChecksums(V4_PACKAGE_NAME, true, 0, TRUST_NONE, receiver));
+    }
+
+    @Test
     public void testReadWriteChecksums() throws Exception {
         // Read checksums from file and confirm they are the same as hardcoded.
         checkStoredChecksums(TEST_FIXED_APK_DIGESTS, TEST_FIXED_APK_DIGESTS_FILE);
@@ -457,6 +472,7 @@
                         + "5f2888afcb71524196dda0d6dd16a6a3292bb75b431b8ff74fb60d796e882f80");
     }
 
+
     @Test
     public void testInstallerChecksumsTrustNone() throws Exception {
         installApkWithChecksums(TEST_FIXED_APK_DIGESTS);
@@ -495,6 +511,7 @@
         try {
             final PackageInstaller installer = getPackageInstaller();
             final SessionParams params = new SessionParams(SessionParams.MODE_FULL_INSTALL);
+            params.installFlags |= PackageManager.INSTALL_REPLACE_EXISTING;
 
             final int sessionId = installer.createSession(params);
             Session session = installer.openSession(sessionId);
@@ -602,7 +619,8 @@
 
         // Using the installer's certificate(s).
         PackageManager pm = getPackageManager();
-        PackageInfo packageInfo = pm.getPackageInfo(CTS_PACKAGE_NAME, GET_SIGNING_CERTIFICATES);
+        PackageInfo packageInfo = pm.getPackageInfo(CTS_PACKAGE_NAME,
+                PackageManager.PackageInfoFlags.of(GET_SIGNING_CERTIFICATES));
         final List<Certificate> signatures = convertSignaturesToCertificates(
                 packageInfo.signingInfo.getApkContentsSigners());
 
@@ -628,13 +646,107 @@
         assertNull(checksums[2].getInstallerCertificate());
     }
 
+    @LargeTest
+    @Test
+    public void testInstallerFileChecksumsDuringInstall() throws Exception {
+        Checksum[] digestsBase = new Checksum[]{new Checksum(TYPE_WHOLE_SHA256, hexStringToBytes(
+                "ed8c7ae1220fe16d558e00cfc37256e6f7088ab90eb04c1bfcb39922a8a5248e")),
+                new Checksum(TYPE_WHOLE_MD5, hexStringToBytes("dd93e23bb8cdab0382fdca0d21a4f1cb"))};
+        Checksum[] digestsSplit0 = new Checksum[]{new Checksum(TYPE_WHOLE_SHA256, hexStringToBytes(
+                "bd9b095a49a9068498b018ce8cb7cc18d411b13a5a5f7fb417d2ff9808ae838e")),
+                new Checksum(TYPE_WHOLE_MD5, hexStringToBytes("f6430e1b795ce2658c49e68d15316b2d"))};
+
+        final Certificate installerCertificate = getInstallerCertificate();
+
+        getUiAutomation().adoptShellPermissionIdentity();
+        PackageInstaller installer = null;
+        int sessionId = -1;
+        try {
+            installer = getPackageInstaller();
+            final SessionParams params = new SessionParams(SessionParams.MODE_FULL_INSTALL);
+            params.installFlags |= PackageManager.INSTALL_REPLACE_EXISTING;
+
+            sessionId = installer.createSession(params);
+            final Session session = installer.openSession(sessionId);
+
+            writeFileToSession(session, "hw5.apk", TEST_V4_APK);
+            session.setChecksums("hw5.apk", Arrays.asList(digestsBase), NO_SIGNATURE);
+
+            writeFileToSession(session, "hw5_split0.apk", TEST_V4_SPLIT0);
+            session.setChecksums("hw5_split0.apk", Arrays.asList(digestsSplit0), NO_SIGNATURE);
+
+            // Workaround to emulate .digests file present in installation.
+            writeChecksumsToSession(session, "hw5.digests", digestsBase);
+            writeChecksumsToSession(session, "hw5_split0.digests", digestsSplit0);
+
+            File dataApp = Environment.getDataAppDirectory(null);
+
+            {
+                LocalListener receiver = new LocalListener();
+
+                session.requestChecksums("hw5.apk", 0, TRUST_ALL, getContext().getMainExecutor(),
+                        receiver);
+                ApkChecksum[] checksums = receiver.getResult();
+                assertNotNull(checksums);
+                assertEquals(checksums.length, 3);
+                // base
+                assertEquals(checksums[0].getType(), TYPE_WHOLE_MD5);
+                assertEquals(checksums[0].getSplitName(), null);
+                assertEquals(bytesToHexString(checksums[0].getValue()),
+                        "dd93e23bb8cdab0382fdca0d21a4f1cb");
+                assertEquals(checksums[0].getInstallerPackageName(), CTS_PACKAGE_NAME);
+                assertEquals(checksums[0].getInstallerCertificate(), installerCertificate);
+                assertEquals(checksums[1].getType(), TYPE_WHOLE_SHA256);
+                assertEquals(checksums[1].getSplitName(), null);
+                assertEquals(bytesToHexString(checksums[1].getValue()),
+                        "ed8c7ae1220fe16d558e00cfc37256e6f7088ab90eb04c1bfcb39922a8a5248e");
+                assertEquals(checksums[1].getInstallerPackageName(), CTS_PACKAGE_NAME);
+                assertEquals(checksums[1].getInstallerCertificate(), installerCertificate);
+                assertEquals(checksums[2].getSplitName(), null);
+                assertEquals(checksums[2].getType(), TYPE_PARTIAL_MERKLE_ROOT_1M_SHA256);
+                assertNull(checksums[2].getInstallerPackageName());
+                assertNull(checksums[2].getInstallerCertificate());
+            }
+            {
+                LocalListener receiver = new LocalListener();
+
+                session.requestChecksums("hw5_split0.apk", 0, TRUST_ALL,
+                        getContext().getMainExecutor(), receiver);
+                ApkChecksum[] checksums = receiver.getResult();
+                assertNotNull(checksums);
+                assertEquals(checksums.length, 3);
+                // split0
+                assertEquals(checksums[0].getType(), TYPE_WHOLE_MD5);
+                assertEquals(checksums[0].getSplitName(), null);
+                assertEquals(bytesToHexString(checksums[0].getValue()),
+                        "f6430e1b795ce2658c49e68d15316b2d");
+                assertEquals(checksums[0].getInstallerPackageName(), CTS_PACKAGE_NAME);
+                assertEquals(checksums[0].getInstallerCertificate(), installerCertificate);
+                assertEquals(checksums[1].getType(), TYPE_WHOLE_SHA256);
+                assertEquals(checksums[1].getSplitName(), null);
+                assertEquals(bytesToHexString(checksums[1].getValue()),
+                        "bd9b095a49a9068498b018ce8cb7cc18d411b13a5a5f7fb417d2ff9808ae838e");
+                assertEquals(checksums[1].getInstallerPackageName(), CTS_PACKAGE_NAME);
+                assertEquals(checksums[1].getInstallerCertificate(), installerCertificate);
+                assertEquals(checksums[2].getSplitName(), null);
+                assertEquals(checksums[2].getType(), TYPE_PARTIAL_MERKLE_ROOT_1M_SHA256);
+                assertNull(checksums[2].getInstallerPackageName());
+                assertNull(checksums[2].getInstallerCertificate());
+            }
+        } finally {
+            installer.abandonSession(sessionId);
+            getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
+
     @Test
     public void testInstallerChecksumsTrustWrongInstaller() throws Exception {
         installApkWithChecksums(TEST_FIXED_APK_DIGESTS);
 
         // Using certificates from a security app, not the installer (us).
         PackageManager pm = getPackageManager();
-        PackageInfo packageInfo = pm.getPackageInfo(FIXED_PACKAGE_NAME, GET_SIGNING_CERTIFICATES);
+        PackageInfo packageInfo = pm.getPackageInfo(FIXED_PACKAGE_NAME,
+                PackageManager.PackageInfoFlags.of(GET_SIGNING_CERTIFICATES));
         final List<Certificate> signatures = convertSignaturesToCertificates(
                 packageInfo.signingInfo.getApkContentsSigners());
 
@@ -1019,7 +1131,8 @@
         installPackageIncrementally(TEST_FIXED_APK);
 
         PackageManager pm = getPackageManager();
-        PackageInfo packageInfo = pm.getPackageInfo(FIXED_PACKAGE_NAME, 0);
+        PackageInfo packageInfo = pm.getPackageInfo(FIXED_PACKAGE_NAME,
+                PackageManager.PackageInfoFlags.of(0));
         final String inPath = packageInfo.applicationInfo.getBaseCodePath();
 
         installApkWithChecksumsIncrementally(inPath);
@@ -1053,7 +1166,8 @@
 
         installPackageIncrementally(TEST_FIXED_APK);
 
-        PackageInfo packageInfo = getPackageManager().getPackageInfo(FIXED_PACKAGE_NAME, 0);
+        PackageInfo packageInfo = getPackageManager().getPackageInfo(FIXED_PACKAGE_NAME,
+                PackageManager.PackageInfoFlags.of(0));
         final String inPath = packageInfo.applicationInfo.getBaseCodePath();
 
         final byte[] signature = readSignature();
@@ -1092,7 +1206,8 @@
 
         installPackageIncrementally(TEST_FIXED_APK);
 
-        PackageInfo packageInfo = getPackageManager().getPackageInfo(FIXED_PACKAGE_NAME, 0);
+        PackageInfo packageInfo = getPackageManager().getPackageInfo(FIXED_PACKAGE_NAME,
+                PackageManager.PackageInfoFlags.of(0));
         final String inPath = packageInfo.applicationInfo.getBaseCodePath();
 
         installApkWithChecksumsIncrementally(inPath);
@@ -1194,6 +1309,7 @@
         try {
             final PackageInstaller installer = getPackageInstaller();
             final SessionParams params = new SessionParams(SessionParams.MODE_FULL_INSTALL);
+            params.installFlags |= PackageManager.INSTALL_REPLACE_EXISTING;
             params.setDataLoaderParams(DataLoaderParams.forIncremental(new ComponentName("android",
                     PackageManagerShellCommandDataLoader.class.getName()), ""));
 
@@ -1283,6 +1399,15 @@
         }
     }
 
+    private static void writeChecksumsToSession(PackageInstaller.Session session, String name,
+            Checksum[] checksums) throws IOException {
+        try (DataOutputStream dos = new DataOutputStream(session.openWrite(name, 0, -1))) {
+            for (Checksum checksum : checksums) {
+                Checksum.writeToStream(dos, checksum);
+            }
+        }
+    }
+
     private String uninstallPackageSilently(String packageName) throws IOException {
         return executeShellCommand("pm uninstall " + packageName);
     }
@@ -1294,6 +1419,16 @@
                 .anyMatch(line -> line.substring(prefixLength).equals(packageName));
     }
 
+    private String getAppCodePath(String packageName) throws IOException {
+        final String commandResult = executeShellCommand("pm dump " + packageName);
+        final String prefix = "    codePath=";
+        final int prefixLength = prefix.length();
+        return Arrays.stream(commandResult.split("\\r?\\n"))
+                .filter(line -> line.startsWith(prefix))
+                .map(line -> line.substring(prefixLength))
+                .findFirst().get();
+    }
+
     @Nonnull
     private static String bytesToHexString(byte[] bytes) {
         return HexDump.toHexString(bytes, 0, bytes.length, /*upperCase=*/ false);
@@ -1326,7 +1461,7 @@
     private Certificate getInstallerCertificate() throws Exception {
         PackageManager pm = getPackageManager();
         PackageInfo installerPackageInfo = pm.getPackageInfo(CTS_PACKAGE_NAME,
-                GET_SIGNING_CERTIFICATES);
+                PackageManager.PackageInfoFlags.of(GET_SIGNING_CERTIFICATES));
         final List<Certificate> signatures = convertSignaturesToCertificates(
                 installerPackageInfo.signingInfo.getApkContentsSigners());
         return signatures.get(0);
diff --git a/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java b/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
index c937e2a..c74760b 100644
--- a/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ComponentInfoTest.java
@@ -16,6 +16,7 @@
 
 package android.content.pm.cts;
 
+import android.content.cts.R;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.ComponentInfo;
 import android.content.pm.PackageManager;
@@ -30,8 +31,6 @@
 
 import com.android.compatibility.common.util.WidgetTestUtils;
 
-import android.content.cts.R;
-
 
 /**
  * Test {@link ComponentInfo}.
@@ -205,7 +204,8 @@
         assertEquals("name", mComponentInfo.loadLabel(pm));
 
         mComponentInfo.applicationInfo =
-                mContext.getPackageManager().getApplicationInfo(PACKAGE_NAME, 0);
+                mContext.getPackageManager().getApplicationInfo(PACKAGE_NAME,
+                        PackageManager.ApplicationInfoFlags.of(0));
 
         mComponentInfo.nonLocalizedLabel = null;
         mComponentInfo.labelRes = R.string.hello_android;
diff --git a/tests/tests/content/src/android/content/pm/cts/ConfigurationInfoTest.java b/tests/tests/content/src/android/content/pm/cts/ConfigurationInfoTest.java
index f24590b..07c2ca6 100644
--- a/tests/tests/content/src/android/content/pm/cts/ConfigurationInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ConfigurationInfoTest.java
@@ -33,7 +33,7 @@
         // Test constructors
         new ConfigurationInfo();
         PackageInfo pkgInfo = pm.getPackageInfo(getContext().getPackageName(),
-                PackageManager.GET_CONFIGURATIONS);
+                PackageManager.PackageInfoFlags.of(PackageManager.GET_CONFIGURATIONS));
         ConfigurationInfo[] configInfoArray = pkgInfo.configPreferences;
         assertTrue(configInfoArray.length > 0);
         ConfigurationInfo configInfo = configInfoArray[0];
diff --git a/tests/tests/content/src/android/content/pm/cts/FeatureGroupInfoTest.java b/tests/tests/content/src/android/content/pm/cts/FeatureGroupInfoTest.java
index da77b0e..92628db 100644
--- a/tests/tests/content/src/android/content/pm/cts/FeatureGroupInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/FeatureGroupInfoTest.java
@@ -56,7 +56,7 @@
         };
 
         PackageInfo pi = mPackageManager.getPackageInfo(getContext().getPackageName(),
-                PackageManager.GET_CONFIGURATIONS);
+                PackageManager.PackageInfoFlags.of(PackageManager.GET_CONFIGURATIONS));
         assertNotNull(pi);
         assertNotNull(pi.reqFeatures);
         assertNotNull(pi.featureGroups);
diff --git a/tests/tests/content/src/android/content/pm/cts/InstallSessionParamsUnitTest.java b/tests/tests/content/src/android/content/pm/cts/InstallSessionParamsUnitTest.java
index d7af7a8..0a42329 100644
--- a/tests/tests/content/src/android/content/pm/cts/InstallSessionParamsUnitTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/InstallSessionParamsUnitTest.java
@@ -89,6 +89,8 @@
     @Parameterized.Parameter(10)
     public Optional<Integer> installScenario;
     @Parameterized.Parameter(11)
+    public Optional<Integer> packageSource;
+    @Parameterized.Parameter(12)
     public boolean expectFailure;
 
     private PackageInstaller mInstaller = InstrumentationRegistry.getInstrumentation()
@@ -164,7 +166,14 @@
                         /* parame is not verified */ 0xfff}, {}},
          /*installScenario*/
                 {{INSTALL_SCENARIO_DEFAULT, INSTALL_SCENARIO_FAST, INSTALL_SCENARIO_BULK,
-                        INSTALL_SCENARIO_BULK_SECONDARY}, {}}};
+                        INSTALL_SCENARIO_BULK_SECONDARY}, {}},
+         /*packageSource*/
+                {{PackageInstaller.PACKAGE_SOURCE_UNSPECIFIED,
+                        PackageInstaller.PACKAGE_SOURCE_OTHER,
+                        PackageInstaller.PACKAGE_SOURCE_STORE,
+                        PackageInstaller.PACKAGE_SOURCE_LOCAL_FILE,
+                        PackageInstaller.PACKAGE_SOURCE_DOWNLOADED_FILE}, {}}
+        };
 
         ArrayList<Object[]> allTestParams = new ArrayList<>();
 
@@ -229,6 +238,7 @@
         referredUri.ifPresent(params::setReferrerUri);
         installReason.ifPresent(params::setInstallReason);
         installScenario.ifPresent(params::setInstallScenario);
+        packageSource.ifPresent(params::setPackageSource);
 
         int sessionId;
         try {
@@ -248,6 +258,7 @@
         SessionInfo info = getSessionInfo(sessionId);
 
         assertThat(info.getMode()).isEqualTo(mode.get());
+        packageSource.ifPresent(i -> assertThat(info.getPackageSource()).isEqualTo(i));
         installLocation.ifPresent(i -> assertThat(info.getInstallLocation()).isEqualTo(i));
         size.ifPresent(i -> assertThat(info.getSize()).isEqualTo(i));
         appPackageName.ifPresent(s -> assertThat(info.getAppPackageName()).isEqualTo(s));
diff --git a/tests/tests/content/src/android/content/pm/cts/InstantAppTest.java b/tests/tests/content/src/android/content/pm/cts/InstantAppTest.java
index 2548e86..4bc7a40 100644
--- a/tests/tests/content/src/android/content/pm/cts/InstantAppTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/InstantAppTest.java
@@ -17,8 +17,6 @@
 package android.content.pm.cts;
 
 
-import android.content.cts.MockActivity;
-
 import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_AWARE;
 import static android.content.pm.PackageManager.MATCH_DIRECT_BOOT_UNAWARE;
 import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
@@ -32,7 +30,6 @@
 
 import java.io.File;
 import java.util.List;
-import java.util.Set;
 
 /**
  * Test instant apps.
@@ -57,7 +54,8 @@
                 | MATCH_DIRECT_BOOT_UNAWARE
                 | MATCH_SYSTEM_ONLY;
         final List<ResolveInfo> matches =
-                mPackageManager.queryIntentServices(resolverIntent, resolveFlags);
+                mPackageManager.queryIntentServices(resolverIntent,
+                        PackageManager.ResolveInfoFlags.of(resolveFlags));
         assertTrue(matches == null || matches.size() <= 1);
     }
 
@@ -71,7 +69,8 @@
                 | MATCH_DIRECT_BOOT_UNAWARE
                 | MATCH_SYSTEM_ONLY;
         final List<ResolveInfo> matches =
-                mPackageManager.queryIntentActivities(intent, resolveFlags);
+                mPackageManager.queryIntentActivities(intent,
+                        PackageManager.ResolveInfoFlags.of(resolveFlags));
         assertTrue(matches == null || matches.size() <= 1);
     }
 }
diff --git a/tests/tests/content/src/android/content/pm/cts/PackageInfoTest.java b/tests/tests/content/src/android/content/pm/cts/PackageInfoTest.java
index facc981..fd1b5d2f 100644
--- a/tests/tests/content/src/android/content/pm/cts/PackageInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/PackageInfoTest.java
@@ -43,12 +43,16 @@
     protected void setUp() throws Exception {
         super.setUp();
         mPackageManager = getContext().getPackageManager();
-        mPackageInfo = mPackageManager.getPackageInfo(PACKAGE_NAME, PackageManager.GET_ACTIVITIES
-                | PackageManager.GET_GIDS | PackageManager.GET_CONFIGURATIONS
-                | PackageManager.GET_INSTRUMENTATION | PackageManager.GET_PERMISSIONS
-                | PackageManager.GET_PROVIDERS | PackageManager.GET_RECEIVERS
-                | PackageManager.GET_SERVICES | PackageManager.GET_ATTRIBUTIONS
-                | PackageManager.GET_SIGNATURES | PackageManager.GET_UNINSTALLED_PACKAGES);
+        mPackageInfo = mPackageManager.getPackageInfo(PACKAGE_NAME,
+                PackageManager.PackageInfoFlags.of(
+                        PackageManager.GET_ACTIVITIES | PackageManager.GET_GIDS
+                                | PackageManager.GET_CONFIGURATIONS
+                                | PackageManager.GET_INSTRUMENTATION
+                                | PackageManager.GET_PERMISSIONS
+                                | PackageManager.GET_PROVIDERS | PackageManager.GET_RECEIVERS
+                                | PackageManager.GET_SERVICES | PackageManager.GET_ATTRIBUTIONS
+                                | PackageManager.GET_SIGNATURES
+                                | PackageManager.GET_UNINSTALLED_PACKAGES));
     }
 
     public void testPackageInfoOp() {
diff --git a/tests/tests/content/src/android/content/pm/cts/PackageItemInfoIconTest.java b/tests/tests/content/src/android/content/pm/cts/PackageItemInfoIconTest.java
index c5d5a04..8131b3e 100644
--- a/tests/tests/content/src/android/content/pm/cts/PackageItemInfoIconTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/PackageItemInfoIconTest.java
@@ -75,7 +75,8 @@
         // size_48x48 is defined as the application icon in this test's AndroidManifest.xml
         Drawable expectedIcon = mContext.getDrawable(R.drawable.size_48x48);
 
-        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME, 0);
+        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
         PackageItemInfo itemInfo = new PackageItemInfo();
         itemInfo.icon = 0;
 
@@ -89,7 +90,8 @@
         // start is defined as the Activity icon in this test's AndroidManifest.xml
         Drawable expectedIcon = mContext.getDrawable(R.drawable.start);
 
-        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME, 0);
+        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
         PackageItemInfo itemInfo = getTestItemInfo();
 
         assertEquals(R.drawable.start, itemInfo.icon);
@@ -117,7 +119,8 @@
         // size_48x48 is defined as the app icon in this test's AndroidManifest.xml
         Drawable expectedIcon = mContext.getDrawable(R.drawable.size_48x48);
 
-        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME, 0);
+        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
 
         Drawable icon = appInfo.loadUnbadgedIcon(mPackageManager);
 
@@ -140,7 +143,8 @@
 
     private PackageItemInfo getTestItemInfo() throws PackageManager.NameNotFoundException {
         ComponentName componentName = new ComponentName(PACKAGE_NAME, ACTIVITY_NAME);
-        return mPackageManager.getActivityInfo(componentName, 0);
+        return mPackageManager.getActivityInfo(componentName,
+                PackageManager.ComponentInfoFlags.of(0));
     }
 
     private boolean comparePixelData(Drawable one, Drawable two) {
diff --git a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
index 37a8f76..980ef5e 100644
--- a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandIncrementalTest.java
@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import android.annotation.NonNull;
 import android.app.UiAutomation;
@@ -28,12 +29,16 @@
 import android.content.pm.PackageManager;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
+import android.os.Process;
 import android.os.SystemClock;
+import android.os.UserHandle;
 import android.platform.test.annotations.AppModeFull;
+import android.platform.test.annotations.Presubmit;
 import android.provider.DeviceConfig;
 import android.service.dataloader.DataLoaderService;
 import android.system.Os;
 import android.text.TextUtils;
+import android.util.ArrayMap;
 import android.util.Log;
 
 import androidx.test.InstrumentationRegistry;
@@ -78,6 +83,7 @@
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -85,6 +91,7 @@
 @RunWith(AndroidJUnit4.class)
 @AppModeFull
 @LargeTest
+@Presubmit
 public class PackageManagerShellCommandIncrementalTest {
     private static final String TAG = "PackageManagerShellCommandIncrementalTest";
 
@@ -104,6 +111,21 @@
     private static final String TEST_APK_SPLIT2_IDSIG = "HelloWorld5_xhdpi-v4.apk.idsig";
     private static final String TEST_APK_MALFORMED = "malformed.apk";
 
+    private static final String TEST_HW7 = "HelloWorld7.apk";
+    private static final String TEST_HW7_IDSIG = "HelloWorld7.apk.idsig";
+    private static final String TEST_HW7_SPLIT0 = "HelloWorld7_hdpi-v4.apk";
+    private static final String TEST_HW7_SPLIT0_IDSIG = "HelloWorld7_hdpi-v4.apk.idsig";
+    private static final String TEST_HW7_SPLIT1 = "HelloWorld7_mdpi-v4.apk";
+    private static final String TEST_HW7_SPLIT1_IDSIG = "HelloWorld7_mdpi-v4.apk.idsig";
+    private static final String TEST_HW7_SPLIT2 = "HelloWorld7_xhdpi-v4.apk";
+    private static final String TEST_HW7_SPLIT2_IDSIG = "HelloWorld7_xhdpi-v4.apk.idsig";
+    private static final String TEST_HW7_SPLIT3 = "HelloWorld7_xxhdpi-v4.apk";
+    private static final String TEST_HW7_SPLIT3_IDSIG = "HelloWorld7_xxhdpi-v4.apk.idsig";
+    private static final String TEST_HW7_SPLIT4 = "HelloWorld7_xxxhdpi-v4.apk";
+    private static final String TEST_HW7_SPLIT4_IDSIG = "HelloWorld7_xxxhdpi-v4.apk.idsig";
+
+    private static final boolean CHECK_BASE_APK_DIGESTION = false;
+
     private static final long EXPECTED_READ_TIME = 1000L;
 
     private IncrementalInstallSession mSession = null;
@@ -202,6 +224,8 @@
         final long blockSize = Os.statvfs("/data/incremental").f_bsize;
         final long preAllocatedBlocks = Os.statvfs("/data/incremental").f_bfree;
 
+        final AtomicLong freeSpaceDifference = new AtomicLong(-1L);
+
         mSession =
                 new IncrementalInstallSession.Builder()
                         .addApk(Paths.get(apk), Paths.get(idsig))
@@ -216,10 +240,8 @@
                             try {
                                 final long postAllocatedBlocks =
                                         Os.statvfs("/data/incremental").f_bfree;
-                                final long freeSpaceDifference =
-                                        (preAllocatedBlocks - postAllocatedBlocks) * blockSize;
-                                assertTrue(freeSpaceDifference
-                                        >= ((appFileSize * 1.015) + blockSize * 8));
+                                freeSpaceDifference.set(
+                                        (preAllocatedBlocks - postAllocatedBlocks) * blockSize);
                             } catch (Exception e) {
                                 Log.i(TAG, "ErrnoException: ", e);
                                 throw new AssertionError(e);
@@ -239,6 +261,10 @@
 
         assertTrue(isAppInstalled(TEST_APP_PACKAGE));
 
+        final double freeSpaceExpectedDifference = ((appFileSize * 1.015) + blockSize * 8);
+        assertTrue(freeSpaceDifference.get() + " >= " + freeSpaceExpectedDifference,
+                freeSpaceDifference.get() >= freeSpaceExpectedDifference);
+
         String installPath = executeShellCommand(String.format("pm path %s", TEST_APP_PACKAGE))
                                         .replaceFirst("package:", "")
                                         .trim();
@@ -721,6 +747,153 @@
         assertEquals(2764243, extractTimestamp(
                 "<...>-2777  ( 1639) [006] ....  2764.243225: tracing_mark_write: "
                         + "B|1639|missing_page_reads: count=132"));
+        assertEquals(114176, extractTimestamp(
+                "DataLoaderManag-8339    (   1780) [004] ....   114.176342: tracing_mark_write: "
+                        + "B|1780|page_read: index=1846 count=21 file=0 appid=10151 userid=0"));
+    }
+    static class AppReads {
+        public final String packageName;
+        public final int reads;
+
+        AppReads(String packageName, int reads) {
+            this.packageName = packageName;
+            this.reads = reads;
+        }
+    }
+
+    @LargeTest
+    @Test
+    public void testInstallWithIdSigNoDigesting() throws Exception {
+        // Overall timeout of 3secs in 100ms intervals.
+        final int installIterations = 1;
+        final int atraceDumpIterations = 30;
+        final int atraceDumpDelayMs = 100;
+        final int blockSize = 4096;
+
+        final String[] apks =
+                new String[]{TEST_HW7, TEST_HW7_SPLIT0, TEST_HW7_SPLIT1, TEST_HW7_SPLIT2,
+                        TEST_HW7_SPLIT3, TEST_HW7_SPLIT4};
+        final boolean[][] touched = new boolean[apks.length][];
+        final int[] blocks = new int[apks.length];
+        final AtomicLong[] totalTouchedBlocks = new AtomicLong[apks.length];
+        for (int i = 0, size = apks.length; i < size; ++i) {
+            final String apkName = apks[i];
+            final File apkfile = new File(createApkPath(apkName));
+            blocks[i] = (int) ((apkfile.length() + blockSize - 1) / blockSize);
+            touched[i] = new boolean[blocks[i]];
+            totalTouchedBlocks[i] = new AtomicLong(0);
+        }
+
+        final ArrayMap<Integer, Integer> uids = new ArrayMap<>();
+
+        checkSysTrace(
+                installIterations,
+                atraceDumpIterations,
+                atraceDumpDelayMs,
+                () -> {
+                    mSession =
+                            new IncrementalInstallSession.Builder()
+                                    .addApk(Paths.get(createApkPath(TEST_HW7)),
+                                            Paths.get(createApkPath(TEST_HW7_IDSIG)))
+                                    .addApk(Paths.get(createApkPath(TEST_HW7_SPLIT0)),
+                                            Paths.get(createApkPath(TEST_HW7_SPLIT0_IDSIG)))
+                                    .addApk(Paths.get(createApkPath(TEST_HW7_SPLIT1)),
+                                            Paths.get(createApkPath(TEST_HW7_SPLIT1_IDSIG)))
+                                    .addApk(Paths.get(createApkPath(TEST_HW7_SPLIT2)),
+                                            Paths.get(createApkPath(TEST_HW7_SPLIT2_IDSIG)))
+                                    .addApk(Paths.get(createApkPath(TEST_HW7_SPLIT3)),
+                                            Paths.get(createApkPath(TEST_HW7_SPLIT3_IDSIG)))
+                                    .addApk(Paths.get(createApkPath(TEST_HW7_SPLIT4)),
+                                            Paths.get(createApkPath(TEST_HW7_SPLIT4_IDSIG)))
+                                    .addExtraArgs("-t", "-i", CTS_PACKAGE_NAME,
+                                            "--skip-verification")
+                                    .setLogger(new IncrementalDeviceConnection.Logger())
+                                    .build();
+                    getUiAutomation().adoptShellPermissionIdentity();
+                    try {
+                        mSession.start(Executors.newSingleThreadExecutor(),
+                                IncrementalDeviceConnection.Factory.reliable());
+                        mSession.waitForInstallCompleted(30, TimeUnit.SECONDS);
+                        assertEquals(
+                                "base, config.hdpi, config.mdpi, config.xhdpi, config.xxhdpi, "
+                                        + "config.xxxhdpi",
+                                getSplits(TEST_APP_PACKAGE));
+                    } finally {
+                        getUiAutomation().dropShellPermissionIdentity();
+                    }
+                    return null;
+                },
+                (stdout) -> {
+                    try (Scanner scanner = new Scanner(stdout)) {
+                        while (scanner.hasNextLine()) {
+                            String line = scanner.nextLine();
+                            final ReadLogEntry readLogEntry = ReadLogEntry.parse(line);
+                            if (readLogEntry == null) {
+                                continue;
+                            }
+                            int fileIdx = readLogEntry.fileIdx;
+                            for (int i = 0, count = readLogEntry.count; i < count; ++i) {
+                                int blockIdx = readLogEntry.blockIdx + i;
+                                if (touched[fileIdx][blockIdx]) {
+                                    continue;
+                                }
+
+                                touched[fileIdx][blockIdx] = true;
+
+                                int uid = UserHandle.getUid(readLogEntry.userId,
+                                        readLogEntry.appId);
+                                Integer touchedByUid = uids.get(uid);
+                                uids.put(uid, touchedByUid == null ? 1 : touchedByUid + 1);
+
+                                long totalTouched = totalTouchedBlocks[fileIdx].incrementAndGet();
+                                if (totalTouched >= blocks[fileIdx]) {
+                                    return true;
+                                }
+                            }
+                        }
+                        return false;
+                    }
+                });
+
+        int firstFileIdx = CHECK_BASE_APK_DIGESTION ? 0 : 1;
+
+        boolean found = false;
+        for (int i = firstFileIdx, size = blocks.length; i < size; ++i) {
+            if (totalTouchedBlocks[i].get() >= blocks[i]) {
+                found = true;
+                break;
+            }
+        }
+        if (!found) {
+            return;
+        }
+
+        PackageManager pm = getPackageManager();
+
+        AppReads[] appIdReads = new AppReads[uids.size()];
+        for (int i = 0, size = uids.size(); i < size; ++i) {
+            final int uid = uids.keyAt(i);
+            final int appId = UserHandle.getAppId(uid);
+            final int userId = UserHandle.getUserId(uid);
+
+            final String packageName;
+            if (appId < Process.FIRST_APPLICATION_UID) {
+                packageName = "<system>";
+            } else {
+                String[] packages = pm.getPackagesForUid(uid);
+                if (packages == null || packages.length == 0) {
+                    packageName = "<unknown package, appId=" + appId + ", userId=" + userId + ">";
+                } else {
+                    packageName = "[" + String.join(",", packages) + "]";
+                }
+            }
+            appIdReads[i] = new AppReads(packageName, uids.valueAt(i));
+        }
+        Arrays.sort(appIdReads, (lhs, rhs) -> Integer.compare(rhs.reads, lhs.reads));
+
+        final String packages = String.join("\n", Arrays.stream(appIdReads).map(
+                item -> item.packageName + " : " + item.reads + " blocks").toArray(String[]::new));
+        fail("Digesting detected, list of packages: " + packages);
     }
 
     @LargeTest
@@ -741,46 +914,71 @@
     @LargeTest
     @Test
     public void testInstallWithIdSigStreamPerUidTimeoutsIncompleteData() throws Exception {
+        // To disable verification.
+        installNonIncremental(TEST_APK);
+
         checkIncrementalDeliveryV2Feature();
 
         mSession =
                 new IncrementalInstallSession.Builder()
-                        .addApk(Paths.get(createApkPath(TEST_APK)),
-                                Paths.get(createApkPath(TEST_APK_IDSIG)))
-                        .addApk(Paths.get(createApkPath(TEST_APK_SPLIT0)),
-                                Paths.get(createApkPath(TEST_APK_SPLIT0_IDSIG)))
-                        .addApk(Paths.get(createApkPath(TEST_APK_SPLIT1)),
-                                Paths.get(createApkPath(TEST_APK_SPLIT1_IDSIG)))
-                        .addExtraArgs("-t", "-i", CTS_PACKAGE_NAME)
+                        .addApk(Paths.get(createApkPath(TEST_HW7)),
+                                Paths.get(createApkPath(TEST_HW7_IDSIG)))
+                        .addApk(Paths.get(createApkPath(TEST_HW7_SPLIT0)),
+                                Paths.get(createApkPath(TEST_HW7_SPLIT0_IDSIG)))
+                        .addApk(Paths.get(createApkPath(TEST_HW7_SPLIT1)),
+                                Paths.get(createApkPath(TEST_HW7_SPLIT1_IDSIG)))
+                        .addApk(Paths.get(createApkPath(TEST_HW7_SPLIT2)),
+                                Paths.get(createApkPath(TEST_HW7_SPLIT2_IDSIG)))
+                        .addApk(Paths.get(createApkPath(TEST_HW7_SPLIT3)),
+                                Paths.get(createApkPath(TEST_HW7_SPLIT3_IDSIG)))
+                        .addApk(Paths.get(createApkPath(TEST_HW7_SPLIT4)),
+                                Paths.get(createApkPath(TEST_HW7_SPLIT4_IDSIG)))
+                        .addExtraArgs("-t", "-i", CTS_PACKAGE_NAME, "--skip-verification")
                         .setLogger(new IncrementalDeviceConnection.Logger())
                         .build();
 
-        executeShellCommand("atrace --async_start -b 1024 -c adb");
+        executeShellCommand("atrace --async_start -b 10240 -c adb");
         try {
-            setDeviceProperty("incfs_default_timeouts", "5000000:5000000:5000000");
+            setDeviceProperty("incfs_default_timeouts", "20000000:20000000:20000000");
             setDeviceProperty("known_digesters_list", CTS_PACKAGE_NAME);
 
             final int beforeReadDelayMs = 1000;
             Thread.currentThread().sleep(beforeReadDelayMs);
 
-            // Partially install the apk+split0+split1.
+            // Partially install the apk+split0/1/2/3/4.
             getUiAutomation().adoptShellPermissionIdentity();
             try {
                 mSession.start(Executors.newSingleThreadExecutor(),
                         IncrementalDeviceConnection.Factory.reliable());
                 mSession.waitForInstallCompleted(30, TimeUnit.SECONDS);
-                assertEquals("base, config.hdpi, config.mdpi", getSplits(TEST_APP_PACKAGE));
+                assertEquals(
+                        "base, config.hdpi, config.mdpi, config.xhdpi, config.xxhdpi, config"
+                                + ".xxxhdpi",
+                        getSplits(TEST_APP_PACKAGE));
             } finally {
                 getUiAutomation().dropShellPermissionIdentity();
             }
 
-            // Try to read a split and see if we are throttled.
-            final File apkToRead = getSplit("split_config.mdpi.apk");
-            final long readTime0 = readAndReportTime(apkToRead, 1000);
+            final String packagePath = getCodePath(TEST_APP_PACKAGE);
 
-            assertTrue(
-                    "Must take longer than " + EXPECTED_READ_TIME + "ms: time0=" + readTime0 + "ms",
-                    readTime0 >= EXPECTED_READ_TIME);
+            // Try to read splits and see if we are throttled at least once.
+            long maxReadTime = 0;
+            for (String splitName : new String[]{"split_config.hdpi.apk", "split_config.mdpi.apk",
+                    "split_config.xhdpi.apk", "split_config.xxxhdpi.apk",
+                    "split_config.xxxhdpi.apk"}) {
+                final File apkToRead = new File(packagePath, splitName);
+                final long readTime0 = readAndReportTime(apkToRead, 1000);
+
+                if (readTime0 < EXPECTED_READ_TIME) {
+                    executeShellCommand("atrace --async_dump");
+                }
+                maxReadTime = Math.max(maxReadTime, readTime0);
+                if (maxReadTime >= EXPECTED_READ_TIME) {
+                    break;
+                }
+            }
+            assertTrue("Must take longer than " + EXPECTED_READ_TIME + "ms: time0=" + maxReadTime
+                    + "ms", maxReadTime >= EXPECTED_READ_TIME);
         } finally {
             executeShellCommand("atrace --async_stop");
         }
@@ -984,7 +1182,13 @@
         return TEST_APK_PATH + baseName;
     }
 
-    private Void installPackage(String baseName) throws IOException {
+    static void installNonIncremental(String baseName) throws IOException {
+        File file = new File(createApkPath(baseName));
+        assertEquals("Success\n",
+                executeShellCommand("pm install -t -g " + file.getPath()));
+    }
+
+    static Void installPackage(String baseName) throws IOException {
         File file = new File(createApkPath(baseName));
         assertEquals("Success\n",
                 executeShellCommand("pm install-incremental -t -g " + file.getPath()));
@@ -1030,19 +1234,18 @@
     }
 
     private long readAndReportTime(File file, long borderTime) throws Exception {
-        assertTrue(file.toString(), file.exists());
         final long startTime = SystemClock.uptimeMillis();
-        long readTime = 0;
+        assertTrue(file.toString(), file.exists());
         try (InputStream baseApkStream = new FileInputStream(file)) {
             final byte[] buffer = new byte[128 * 1024];
             while (baseApkStream.read(buffer) != -1) {
-                readTime = SystemClock.uptimeMillis() - startTime;
+                long readTime = SystemClock.uptimeMillis() - startTime;
                 if (readTime >= borderTime) {
                     break;
                 }
             }
         }
-        return readTime;
+        return SystemClock.uptimeMillis() - startTime;
     }
 
     static String uninstallPackageSilently(String packageName) throws IOException {
@@ -1137,7 +1340,7 @@
         mSession = null;
     }
 
-    private void setDeviceProperty(String name, String value) {
+    static void setDeviceProperty(String name, String value) {
         getUiAutomation().adoptShellPermissionIdentity();
         try {
             DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PACKAGE_MANAGER_SERVICE, name, value,
@@ -1147,7 +1350,7 @@
         }
     }
 
-    private void setSystemProperty(String name, String value) throws Exception {
+    static void setSystemProperty(String name, String value) throws Exception {
         executeShellCommand("setprop " + name + " " + value);
     }
 
diff --git a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandMultiUserTest.kt b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandMultiUserTest.kt
new file mode 100644
index 0000000..2129f3b
--- /dev/null
+++ b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandMultiUserTest.kt
@@ -0,0 +1,347 @@
+/*
+ * Copyright (C) 2022 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 android.content.pm.cts
+
+import android.Manifest
+import android.app.UiAutomation
+import android.content.Context
+import android.content.Context.RECEIVER_EXPORTED
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageManager
+import android.content.pm.cts.PackageManagerShellCommandTest.FullyRemovedBroadcastReceiver
+import android.content.pm.cts.util.AbandonAllPackageSessionsRule
+import android.os.Handler
+import android.os.HandlerThread
+import android.platform.test.annotations.AppModeFull
+import androidx.test.InstrumentationRegistry
+import com.android.bedstead.harrier.BedsteadJUnit4
+import com.android.bedstead.harrier.DeviceState
+import com.android.bedstead.harrier.annotations.EnsureHasSecondaryUser
+import com.android.bedstead.harrier.annotations.StringTestParameter
+import com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_USERS
+import com.android.bedstead.nene.permissions.CommonPermissions.INTERACT_ACROSS_USERS_FULL
+import com.android.bedstead.nene.users.UserReference
+import com.android.compatibility.common.util.SystemUtil
+import com.google.common.truth.Truth.assertThat
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.ClassRule
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import java.io.File
+
+@EnsureHasSecondaryUser
+@RunWith(BedsteadJUnit4::class)
+@AppModeFull(reason = "Cannot query other apps if instant")
+class PackageManagerShellCommandMultiUserTest {
+
+    companion object {
+
+        private const val TEST_APP_PACKAGE = PackageManagerShellCommandTest.TEST_APP_PACKAGE
+        private const val TEST_HW5 = PackageManagerShellCommandTest.TEST_HW5
+
+        @JvmField
+        @ClassRule
+        @Rule
+        val deviceState = DeviceState()
+
+        @JvmField
+        @ClassRule
+        var mAbandonSessionsRule = AbandonAllPackageSessionsRule()
+
+        private val context: Context = InstrumentationRegistry.getContext()
+        private val uiAutomation: UiAutomation =
+            InstrumentationRegistry.getInstrumentation().getUiAutomation()
+
+        private var backgroundThread = HandlerThread("PackageManagerShellCommandMultiUserTest")
+    }
+
+    private lateinit var primaryUser: UserReference
+    private lateinit var secondaryUser: UserReference
+
+    @Before
+    fun cacheUsers() {
+        primaryUser = deviceState.primaryUser()
+        secondaryUser = deviceState.secondaryUser()
+    }
+
+    private var mPackageVerifier: String? = null
+    private var mStreamingVerificationTimeoutMs =
+        PackageManagerShellCommandTest.DEFAULT_STREAMING_VERIFICATION_TIMEOUT
+
+    @Before
+    fun setup() {
+        uninstallPackageSilently(TEST_APP_PACKAGE)
+        assertFalse(PackageManagerShellCommandTest.isAppInstalled(TEST_APP_PACKAGE))
+        mPackageVerifier =
+            SystemUtil.runShellCommand("settings get global verifier_verify_adb_installs")
+        // Disable the package verifier for non-incremental installations to avoid the dialog
+        // when installing an app.
+        SystemUtil.runShellCommand("settings put global verifier_verify_adb_installs 0")
+        mStreamingVerificationTimeoutMs = SystemUtil.runShellCommand(
+            "settings get global streaming_verifier_timeout"
+        )
+            .toLongOrNull()
+            ?: PackageManagerShellCommandTest.DEFAULT_STREAMING_VERIFICATION_TIMEOUT
+    }
+
+    @After
+    fun reset() {
+        uninstallPackageSilently(TEST_APP_PACKAGE)
+        assertFalse(PackageManagerShellCommandTest.isAppInstalled(TEST_APP_PACKAGE))
+        assertEquals(null, PackageManagerShellCommandTest.getSplits(TEST_APP_PACKAGE))
+
+        // Reset the global settings to their original values.
+        SystemUtil.runShellCommand(
+            "settings put global verifier_verify_adb_installs $mPackageVerifier"
+        )
+
+        // Set the test override to invalid.
+        setSystemProperty("debug.pm.uses_sdk_library_default_cert_digest", "invalid")
+        setSystemProperty("debug.pm.prune_unused_shared_libraries_delay", "invalid")
+        setSystemProperty("debug.pm.adb_verifier_override_package", "invalid")
+    }
+
+    @Test
+    fun testGetFirstInstallTime(
+        @StringTestParameter(
+            "install",
+            "install-streaming",
+            "install-incremental"
+        ) installTypeString: String
+    ) {
+        val startTimeMillisForPrimaryUser = System.currentTimeMillis()
+        installPackageAsUser(TEST_HW5, primaryUser, installTypeString)
+        assertTrue(isAppInstalledForUser(TEST_APP_PACKAGE, primaryUser))
+        val origFirstInstallTimeForPrimaryUser =
+            getFirstInstallTimeAsUser(TEST_APP_PACKAGE, primaryUser)
+        // Validate the timestamp
+        assertTrue(origFirstInstallTimeForPrimaryUser > 0)
+        assertTrue(startTimeMillisForPrimaryUser < origFirstInstallTimeForPrimaryUser)
+        assertTrue(System.currentTimeMillis() > origFirstInstallTimeForPrimaryUser)
+
+        // Install again with replace and the firstInstallTime should remain the same
+        installPackage(TEST_HW5, installTypeString)
+        var firstInstallTimeForPrimaryUser =
+            getFirstInstallTimeAsUser(TEST_APP_PACKAGE, primaryUser)
+        assertEquals(origFirstInstallTimeForPrimaryUser, firstInstallTimeForPrimaryUser)
+
+        // Start another user and install this test itself for that user
+        var startTimeMillisForSecondaryUser = System.currentTimeMillis()
+        installExistingPackageAsUser(context.packageName, secondaryUser)
+        assertTrue(isAppInstalledForUser(context.packageName, secondaryUser))
+        // Install test package with replace
+        installPackageAsUser(TEST_HW5, secondaryUser, installTypeString)
+        assertTrue(isAppInstalledForUser(TEST_APP_PACKAGE, secondaryUser))
+        firstInstallTimeForPrimaryUser = getFirstInstallTimeAsUser(TEST_APP_PACKAGE, primaryUser)
+        // firstInstallTime should remain unchanged for the current user
+        assertEquals(origFirstInstallTimeForPrimaryUser, firstInstallTimeForPrimaryUser)
+        var firstInstallTimeForSecondaryUser =
+            getFirstInstallTimeAsUser(TEST_APP_PACKAGE, secondaryUser)
+        // firstInstallTime for the other user should be different
+        assertNotEquals(firstInstallTimeForPrimaryUser, firstInstallTimeForSecondaryUser)
+        assertTrue(startTimeMillisForSecondaryUser < firstInstallTimeForSecondaryUser)
+        assertTrue(System.currentTimeMillis() > firstInstallTimeForSecondaryUser)
+
+        // Uninstall for the other user
+        uninstallPackageAsUser(TEST_APP_PACKAGE, secondaryUser)
+        assertFalse(isAppInstalledForUser(TEST_APP_PACKAGE, secondaryUser))
+        // Install test package as an existing package
+        startTimeMillisForSecondaryUser = System.currentTimeMillis()
+        installExistingPackageAsUser(TEST_APP_PACKAGE, secondaryUser)
+        assertTrue(isAppInstalledForUser(TEST_APP_PACKAGE, secondaryUser))
+        firstInstallTimeForPrimaryUser = getFirstInstallTimeAsUser(TEST_APP_PACKAGE, primaryUser)
+        // firstInstallTime still remains unchanged for the current user
+        assertEquals(origFirstInstallTimeForPrimaryUser, firstInstallTimeForPrimaryUser)
+        firstInstallTimeForSecondaryUser =
+            getFirstInstallTimeAsUser(TEST_APP_PACKAGE, secondaryUser)
+        // firstInstallTime for the other user should be different
+        assertNotEquals(firstInstallTimeForPrimaryUser, firstInstallTimeForSecondaryUser)
+        assertTrue(startTimeMillisForSecondaryUser < firstInstallTimeForSecondaryUser)
+        assertTrue(System.currentTimeMillis() > firstInstallTimeForSecondaryUser)
+
+        // Uninstall for all users
+        uninstallPackageSilently(TEST_APP_PACKAGE)
+        assertFalse(isAppInstalledForUser(TEST_APP_PACKAGE, primaryUser))
+        assertFalse(isAppInstalledForUser(TEST_APP_PACKAGE, secondaryUser))
+        // Reinstall for all users
+        installPackage(TEST_HW5, installTypeString)
+        assertTrue(isAppInstalledForUser(TEST_APP_PACKAGE, primaryUser))
+        assertTrue(isAppInstalledForUser(TEST_APP_PACKAGE, secondaryUser))
+        firstInstallTimeForPrimaryUser = getFirstInstallTimeAsUser(TEST_APP_PACKAGE, primaryUser)
+        // First install time is now different because the package was fully uninstalled
+        assertNotEquals(origFirstInstallTimeForPrimaryUser, firstInstallTimeForPrimaryUser)
+        firstInstallTimeForSecondaryUser =
+            getFirstInstallTimeAsUser(TEST_APP_PACKAGE, secondaryUser)
+        // Same firstInstallTime because package was installed for both users at the same time
+        assertEquals(firstInstallTimeForPrimaryUser, firstInstallTimeForSecondaryUser)
+    }
+
+    @Test
+    fun testPackageFullyRemovedBroadcastAfterUninstall(
+        @StringTestParameter(
+            "install",
+            "install-streaming",
+            "install-incremental"
+        ) installTypeString: String
+    ) {
+        if (!backgroundThread.isAlive) {
+            backgroundThread.start()
+        }
+        val backgroundHandler = Handler(backgroundThread.getLooper())
+        installExistingPackageAsUser(context.packageName, secondaryUser)
+        installPackage(TEST_HW5, installTypeString)
+        assertTrue(isAppInstalledForUser(context.packageName, primaryUser))
+        assertTrue(isAppInstalledForUser(context.packageName, secondaryUser))
+        assertTrue(isAppInstalledForUser(TEST_APP_PACKAGE, primaryUser))
+        assertTrue(isAppInstalledForUser(TEST_APP_PACKAGE, secondaryUser))
+        val broadcastReceiverForPrimaryUser =
+            FullyRemovedBroadcastReceiver(TEST_APP_PACKAGE, primaryUser.id())
+        val broadcastReceiverForSecondaryUser =
+            FullyRemovedBroadcastReceiver(TEST_APP_PACKAGE, secondaryUser.id())
+        val intentFilter = IntentFilter()
+        intentFilter.addAction(Intent.ACTION_PACKAGE_FULLY_REMOVED)
+        intentFilter.addDataScheme("package")
+        context.registerReceiver(
+            broadcastReceiverForPrimaryUser,
+            intentFilter,
+            null,
+            backgroundHandler,
+            RECEIVER_EXPORTED
+        )
+        uiAutomation.adoptShellPermissionIdentity(
+            Manifest.permission.INTERACT_ACROSS_USERS,
+            Manifest.permission.INTERACT_ACROSS_USERS_FULL
+        )
+        try {
+            context.createContextAsUser(secondaryUser.userHandle(), 0).registerReceiver(
+                broadcastReceiverForSecondaryUser,
+                intentFilter,
+                null,
+                backgroundHandler,
+                RECEIVER_EXPORTED
+            )
+        } finally {
+            uiAutomation.dropShellPermissionIdentity()
+        }
+        // Verify that uninstall with "keep data" doesn't send the broadcast
+        uninstallPackageWithKeepData(TEST_APP_PACKAGE, secondaryUser)
+        broadcastReceiverForSecondaryUser.assertBroadcastNotReceived()
+        installExistingPackageAsUser(TEST_APP_PACKAGE, secondaryUser)
+        // Verify that uninstall on a specific user only sends the broadcast to the user
+        uninstallPackageAsUser(TEST_APP_PACKAGE, secondaryUser)
+        broadcastReceiverForSecondaryUser.assertBroadcastReceived()
+        broadcastReceiverForPrimaryUser.assertBroadcastNotReceived()
+        uninstallPackageSilently(TEST_APP_PACKAGE)
+        broadcastReceiverForPrimaryUser.assertBroadcastReceived()
+    }
+
+    @Test
+    fun testListPackageDefaultAllUsers(
+        @StringTestParameter(
+            "install",
+            "install-streaming",
+            "install-incremental"
+        ) installTypeString: String
+    ) {
+        installPackageAsUser(TEST_HW5, primaryUser, installTypeString)
+        assertTrue(isAppInstalledForUser(TEST_APP_PACKAGE, primaryUser))
+        assertFalse(isAppInstalledForUser(TEST_APP_PACKAGE, secondaryUser))
+        var out = SystemUtil.runShellCommand(
+                    "pm list packages -U --user ${primaryUser.id()} $TEST_APP_PACKAGE"
+                ).replace("\n", "")
+        assertTrue(out.split(":").last().split(",").size == 1)
+        out = SystemUtil.runShellCommand(
+                    "pm list packages -U --user ${secondaryUser.id()} $TEST_APP_PACKAGE"
+                ).replace("\n", "")
+        assertEquals("", out)
+        out = SystemUtil.runShellCommand("pm list packages -U $TEST_APP_PACKAGE")
+                .replace("\n", "")
+        assertTrue(out.split(":").last().split(",").size == 1)
+        installExistingPackageAsUser(TEST_APP_PACKAGE, secondaryUser)
+        assertTrue(isAppInstalledForUser(TEST_APP_PACKAGE, primaryUser))
+        assertTrue(isAppInstalledForUser(TEST_APP_PACKAGE, secondaryUser))
+        out = SystemUtil.runShellCommand("pm list packages -U $TEST_APP_PACKAGE")
+                .replace("\n", "")
+        assertTrue(out.split(":").last().split(",").size == 2)
+        out = SystemUtil.runShellCommand(
+                    "pm list packages -U --user ${primaryUser.id()} $TEST_APP_PACKAGE"
+                ).replace("\n", "")
+        assertTrue(out.split(":").last().split(",").size == 1)
+        out = SystemUtil.runShellCommand(
+                    "pm list packages -U --user ${secondaryUser.id()} $TEST_APP_PACKAGE"
+                ).replace("\n", "")
+        assertTrue(out.split(":").last().split(",").size == 1)
+    }
+
+    private fun getFirstInstallTimeAsUser(packageName: String, user: UserReference) =
+        context.createContextAsUser(user.userHandle(), 0)
+            .packageManager
+            .getPackageInfo(packageName, PackageManager.PackageInfoFlags.of(0))
+            .firstInstallTime
+
+    private fun installPackage(baseName: String, installTypeString: String) {
+        val file = File(PackageManagerShellCommandTest.createApkPath(baseName))
+        assertThat(SystemUtil.runShellCommand("pm $installTypeString -t -g ${file.path}"))
+            .isEqualTo("Success\n")
+    }
+
+    private fun installExistingPackageAsUser(packageName: String, user: UserReference) {
+        val userId = user.id()
+        assertThat(SystemUtil.runShellCommand("pm install-existing --user $userId $packageName"))
+            .isEqualTo("Package $packageName installed for user: $userId\n")
+    }
+
+    private fun installPackageAsUser(
+        baseName: String,
+        user: UserReference,
+        installTypeString: String
+    ) {
+        val file = File(PackageManagerShellCommandTest.createApkPath(baseName))
+        assertThat(
+            SystemUtil.runShellCommand(
+                "pm $installTypeString -t -g --user ${user.id()} ${file.path}"
+            )
+        )
+            .isEqualTo("Success\n")
+    }
+
+    private fun uninstallPackageAsUser(packageName: String, user: UserReference) =
+        assertThat(SystemUtil.runShellCommand("pm uninstall --user ${user.id()} $packageName"))
+            .isEqualTo("Success\n")
+
+    private fun uninstallPackageWithKeepData(packageName: String, user: UserReference) =
+        SystemUtil.runShellCommand("pm uninstall -k --user ${user.id()} $packageName")
+
+    private fun uninstallPackageSilently(packageName: String) =
+        SystemUtil.runShellCommand("pm uninstall $packageName")
+
+    private fun isAppInstalledForUser(packageName: String, user: UserReference) =
+        SystemUtil.runShellCommand("pm list packages --user ${user.id()} $packageName")
+            .split("\\r?\\n".toRegex())
+            .any { it == "package:$packageName" }
+
+    private fun setSystemProperty(name: String, value: String) =
+        assertThat(SystemUtil.runShellCommand("setprop $name $value"))
+            .isEmpty()
+}
diff --git a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandTest.java b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandTest.java
index df40ea9..ffe417c 100644
--- a/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/PackageManagerShellCommandTest.java
@@ -16,16 +16,32 @@
 
 package android.content.pm.cts;
 
+import static android.content.Context.RECEIVER_EXPORTED;
+import static android.content.pm.Checksum.TYPE_PARTIAL_MERKLE_ROOT_1M_SHA256;
+import static android.content.pm.Checksum.TYPE_WHOLE_MERKLE_ROOT_4K_SHA256;
 import static android.content.pm.PackageInstaller.DATA_LOADER_TYPE_INCREMENTAL;
 import static android.content.pm.PackageInstaller.DATA_LOADER_TYPE_NONE;
 import static android.content.pm.PackageInstaller.DATA_LOADER_TYPE_STREAMING;
+import static android.content.pm.PackageInstaller.EXTRA_DATA_LOADER_TYPE;
+import static android.content.pm.PackageInstaller.EXTRA_SESSION_ID;
 import static android.content.pm.PackageInstaller.LOCATION_DATA_APP;
+import static android.content.pm.PackageManager.EXTRA_VERIFICATION_ID;
+import static android.content.pm.PackageManager.EXTRA_VERIFICATION_ROOT_HASH;
+import static android.content.pm.PackageManager.GET_SHARED_LIBRARY_FILES;
+import static android.content.pm.PackageManager.GET_SIGNING_CERTIFICATES;
+import static android.content.pm.PackageManager.MATCH_STATIC_SHARED_AND_SDK_LIBRARIES;
+import static android.content.pm.PackageManager.VERIFICATION_ALLOW;
+import static android.content.pm.PackageManager.VERIFICATION_REJECT;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import android.app.UiAutomation;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.IIntentReceiver;
@@ -36,20 +52,29 @@
 import android.content.pm.ApkChecksum;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.DataLoaderParams;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageInstaller;
 import android.content.pm.PackageInstaller.SessionParams;
 import android.content.pm.PackageManager;
+import android.content.pm.SharedLibraryInfo;
+import android.content.pm.Signature;
+import android.content.pm.SigningInfo;
 import android.content.pm.cts.util.AbandonAllPackageSessionsRule;
 import android.os.Bundle;
-import android.os.ConditionVariable;
 import android.os.IBinder;
 import android.os.ParcelFileDescriptor;
 import android.os.Process;
 import android.os.RemoteException;
-import android.os.UserHandle;
 import android.platform.test.annotations.AppModeFull;
+import android.util.PackageUtils;
 
 import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+
+import com.android.internal.util.ConcurrentUtils;
+import com.android.internal.util.HexDump;
+
+import libcore.util.HexEncoding;
 
 import org.junit.After;
 import org.junit.Before;
@@ -67,22 +92,31 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.security.cert.CertificateEncodingException;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Optional;
 import java.util.Random;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BiConsumer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 @RunWith(Parameterized.class)
 @AppModeFull
 public class PackageManagerShellCommandTest {
-    private static final String TEST_APP_PACKAGE = "com.example.helloworld";
+    static final String TEST_APP_PACKAGE = "com.example.helloworld";
+
+    private static final String CTS_PACKAGE_NAME = "android.content.cts";
 
     private static final String TEST_APK_PATH = "/data/local/tmp/cts/content/";
-    private static final String TEST_HW5 = "HelloWorld5.apk";
+    static final String TEST_HW5 = "HelloWorld5.apk";
     private static final String TEST_HW5_SPLIT0 = "HelloWorld5_hdpi-v4.apk";
     private static final String TEST_HW5_SPLIT1 = "HelloWorld5_mdpi-v4.apk";
     private static final String TEST_HW5_SPLIT2 = "HelloWorld5_xhdpi-v4.apk";
@@ -95,6 +129,35 @@
     private static final String TEST_HW7_SPLIT3 = "HelloWorld7_xxhdpi-v4.apk";
     private static final String TEST_HW7_SPLIT4 = "HelloWorld7_xxxhdpi-v4.apk";
 
+    private static final String TEST_SDK1_PACKAGE = "com.test.sdk1_1";
+    private static final String TEST_SDK1_MAJOR_VERSION2_PACKAGE = "com.test.sdk1_2";
+    private static final String TEST_SDK2_PACKAGE = "com.test.sdk2_2";
+    private static final String TEST_SDK3_PACKAGE = "com.test.sdk3_3";
+    private static final String TEST_SDK_USER_PACKAGE = "com.test.sdk.user";
+
+    private static final String TEST_SDK1_NAME = "com.test.sdk1";
+    private static final String TEST_SDK2_NAME = "com.test.sdk2";
+    private static final String TEST_SDK3_NAME = "com.test.sdk3";
+
+    private static final String TEST_SDK1 = "HelloWorldSdk1.apk";
+    private static final String TEST_SDK1_UPDATED = "HelloWorldSdk1Updated.apk";
+    private static final String TEST_SDK1_MAJOR_VERSION2 = "HelloWorldSdk1MajorVersion2.apk";
+    private static final String TEST_SDK1_DIFFERENT_SIGNER = "HelloWorldSdk1DifferentSigner.apk";
+    private static final String TEST_SDK2 = "HelloWorldSdk2.apk";
+    private static final String TEST_SDK2_UPDATED = "HelloWorldSdk2Updated.apk";
+    private static final String TEST_USING_SDK1 = "HelloWorldUsingSdk1.apk";
+    private static final String TEST_USING_SDK1_AND_SDK2 = "HelloWorldUsingSdk1And2.apk";
+
+    private static final String TEST_SDK3_USING_SDK1 = "HelloWorldSdk3UsingSdk1.apk";
+    private static final String TEST_SDK3_USING_SDK1_AND_SDK2 = "HelloWorldSdk3UsingSdk1And2.apk";
+    private static final String TEST_USING_SDK3 = "HelloWorldUsingSdk3.apk";
+
+    private static final String TEST_HW_NO_APP_STORAGE = "HelloWorldNoAppStorage.apk";
+
+    private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
+
+    static final long DEFAULT_STREAMING_VERIFICATION_TIMEOUT = 3 * 1000;
+
     @Rule
     public AbandonAllPackageSessionsRule mAbandonSessionsRule = new AbandonAllPackageSessionsRule();
 
@@ -111,9 +174,20 @@
     private boolean mIncremental = false;
     private String mInstall = "";
     private String mPackageVerifier = null;
+    private String mUnusedStaticSharedLibsMinCachePeriod = null;
+    private long mStreamingVerificationTimeoutMs = DEFAULT_STREAMING_VERIFICATION_TIMEOUT;
+    private int mSecondUser = -1;
 
     private static PackageInstaller getPackageInstaller() {
-        return InstrumentationRegistry.getContext().getPackageManager().getPackageInstaller();
+        return getPackageManager().getPackageInstaller();
+    }
+
+    private static PackageManager getPackageManager() {
+        return InstrumentationRegistry.getContext().getPackageManager();
+    }
+
+    private static Context getContext() {
+        return InstrumentationRegistry.getContext();
     }
 
     private static UiAutomation getUiAutomation() {
@@ -196,9 +270,25 @@
         uninstallPackageSilently(TEST_APP_PACKAGE);
         assertFalse(isAppInstalled(TEST_APP_PACKAGE));
 
-        // Disable the package verifier to avoid the dialog when installing an app.
+        uninstallPackageSilently(TEST_SDK_USER_PACKAGE);
+        uninstallPackageSilently(TEST_SDK3_PACKAGE);
+        uninstallPackageSilently(TEST_SDK2_PACKAGE);
+        uninstallPackageSilently(TEST_SDK1_PACKAGE);
+        uninstallPackageSilently(TEST_SDK1_MAJOR_VERSION2_PACKAGE);
+
         mPackageVerifier = executeShellCommand("settings get global verifier_verify_adb_installs");
+        // Disable the package verifier for non-incremental installations to avoid the dialog
+        // when installing an app.
         executeShellCommand("settings put global verifier_verify_adb_installs 0");
+
+        mUnusedStaticSharedLibsMinCachePeriod = executeShellCommand(
+                "settings get global unused_static_shared_lib_min_cache_period");
+
+        try {
+            mStreamingVerificationTimeoutMs = Long.parseUnsignedLong(
+                    executeShellCommand("settings get global streaming_verifier_timeout"));
+        } catch (NumberFormatException ignore) {
+        }
     }
 
     @After
@@ -207,8 +297,26 @@
         assertFalse(isAppInstalled(TEST_APP_PACKAGE));
         assertEquals(null, getSplits(TEST_APP_PACKAGE));
 
-        // Reset the package verifier setting to its original value.
+        uninstallPackageSilently(TEST_SDK_USER_PACKAGE);
+        uninstallPackageSilently(TEST_SDK3_PACKAGE);
+        uninstallPackageSilently(TEST_SDK2_PACKAGE);
+        uninstallPackageSilently(TEST_SDK1_PACKAGE);
+        uninstallPackageSilently(TEST_SDK1_MAJOR_VERSION2_PACKAGE);
+
+        // Reset the global settings to their original values.
         executeShellCommand("settings put global verifier_verify_adb_installs " + mPackageVerifier);
+        executeShellCommand("settings put global unused_static_shared_lib_min_cache_period "
+                + mUnusedStaticSharedLibsMinCachePeriod);
+
+        // Set the test override to invalid.
+        setSystemProperty("debug.pm.uses_sdk_library_default_cert_digest", "invalid");
+        setSystemProperty("debug.pm.prune_unused_shared_libraries_delay", "invalid");
+        setSystemProperty("debug.pm.adb_verifier_override_package", "invalid");
+
+        if (mSecondUser != -1) {
+            stopUser(mSecondUser);
+            removeUser(mSecondUser);
+        }
     }
 
     private boolean checkIncrementalDeliveryFeature() {
@@ -673,6 +781,768 @@
         }
     }
 
+    @Test
+    public void testSdkInstallAndUpdate() throws Exception {
+        installPackage(TEST_SDK1);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+
+        // Same APK.
+        installPackage(TEST_SDK1);
+
+        // Updated APK.
+        installPackage(TEST_SDK1_UPDATED);
+
+        // Reverted APK.
+        installPackage(TEST_SDK1);
+
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+    }
+
+    @Test
+    public void testSdkInstallMultipleMajorVersions() throws Exception {
+        // Major version 1.
+        installPackage(TEST_SDK1);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+
+        // Major version 2.
+        installPackage(TEST_SDK1_MAJOR_VERSION2);
+
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 2));
+    }
+
+    @Test
+    public void testSdkInstallMultipleMinorVersionsWrongSignature() throws Exception {
+        // Major version 1.
+        installPackage(TEST_SDK1);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+
+        // Major version 1, different signer.
+        installPackage(TEST_SDK1_DIFFERENT_SIGNER,
+                "Failure [INSTALL_FAILED_UPDATE_INCOMPATIBLE: Existing package com.test.sdk1_1 "
+                        + "signatures do not match newer version");
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+    }
+
+    @Test
+    public void testSdkInstallMultipleMajorVersionsWrongSignature() throws Exception {
+        // Major version 1.
+        installPackage(TEST_SDK1_DIFFERENT_SIGNER);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+
+        // Major version 2.
+        installPackage(TEST_SDK1_MAJOR_VERSION2,
+                "Failure [INSTALL_FAILED_UPDATE_INCOMPATIBLE: Existing package com.test.sdk1_1 "
+                        + "signatures do not match newer version");
+
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+    }
+
+    @Test
+    public void testSdkInstallAndUpdateTwoMajorVersions() throws Exception {
+        installPackage(TEST_SDK1);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+
+        installPackage(TEST_SDK2);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+        assertTrue(isSdkInstalled(TEST_SDK2_NAME, 2));
+
+        // Same APK.
+        installPackage(TEST_SDK1);
+        installPackage(TEST_SDK2);
+
+        // Updated APK.
+        installPackage(TEST_SDK1_UPDATED);
+        installPackage(TEST_SDK2_UPDATED);
+
+        // Reverted APK.
+        installPackage(TEST_SDK1);
+        installPackage(TEST_SDK2);
+
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+        assertTrue(isSdkInstalled(TEST_SDK2_NAME, 2));
+    }
+
+    @Test
+    public void testAppUsingSdkInstallAndUpdate() throws Exception {
+        // Try to install without required SDK1.
+        installPackage(TEST_USING_SDK1, "Failure [INSTALL_FAILED_MISSING_SHARED_LIBRARY");
+        assertFalse(isAppInstalled(TEST_SDK_USER_PACKAGE));
+
+        // Now install the required SDK1.
+        installPackage(TEST_SDK1);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+
+        setSystemProperty("debug.pm.uses_sdk_library_default_cert_digest",
+                getPackageCertDigest(TEST_SDK1_PACKAGE));
+
+        // Install and uninstall.
+        installPackage(TEST_USING_SDK1);
+        uninstallPackageSilently(TEST_SDK_USER_PACKAGE);
+
+        // Update SDK1.
+        installPackage(TEST_SDK1_UPDATED);
+
+        // Install again.
+        installPackage(TEST_USING_SDK1);
+
+        // Check resolution API.
+        getUiAutomation().adoptShellPermissionIdentity();
+        try {
+            ApplicationInfo appInfo = getPackageManager().getApplicationInfo(TEST_SDK_USER_PACKAGE,
+                    PackageManager.ApplicationInfoFlags.of(GET_SHARED_LIBRARY_FILES));
+            assertEquals(1, appInfo.sharedLibraryInfos.size());
+            SharedLibraryInfo libInfo = appInfo.sharedLibraryInfos.get(0);
+            assertEquals("com.test.sdk1", libInfo.getName());
+            assertEquals(1, libInfo.getLongVersion());
+        } finally {
+            getUiAutomation().dropShellPermissionIdentity();
+        }
+
+        // Try to install without required SDK2.
+        installPackage(TEST_USING_SDK1_AND_SDK2, "Failure [INSTALL_FAILED_MISSING_SHARED_LIBRARY");
+
+        // Now install the required SDK2.
+        installPackage(TEST_SDK2);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+        assertTrue(isSdkInstalled(TEST_SDK2_NAME, 2));
+
+        // Install and uninstall.
+        installPackage(TEST_USING_SDK1_AND_SDK2);
+        uninstallPackageSilently(TEST_SDK_USER_PACKAGE);
+
+        // Update both SDKs.
+        installPackage(TEST_SDK1_UPDATED);
+        installPackage(TEST_SDK2_UPDATED);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+        assertTrue(isSdkInstalled(TEST_SDK2_NAME, 2));
+
+        // Install again.
+        installPackage(TEST_USING_SDK1_AND_SDK2);
+
+        // Check resolution API.
+        getUiAutomation().adoptShellPermissionIdentity();
+        try {
+            ApplicationInfo appInfo = getPackageManager().getApplicationInfo(TEST_SDK_USER_PACKAGE,
+                    PackageManager.ApplicationInfoFlags.of(GET_SHARED_LIBRARY_FILES));
+            assertEquals(2, appInfo.sharedLibraryInfos.size());
+            assertEquals("com.test.sdk1", appInfo.sharedLibraryInfos.get(0).getName());
+            assertEquals(1, appInfo.sharedLibraryInfos.get(0).getLongVersion());
+            assertEquals("com.test.sdk2", appInfo.sharedLibraryInfos.get(1).getName());
+            assertEquals(2, appInfo.sharedLibraryInfos.get(1).getLongVersion());
+        } finally {
+            getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testInstallFailsMismatchingCertificate() throws Exception {
+        // Install the required SDK1.
+        installPackage(TEST_SDK1);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+
+        // Try to install the package with empty digest.
+        installPackage(TEST_USING_SDK1, "Failure [INSTALL_FAILED_MISSING_SHARED_LIBRARY");
+    }
+
+    @Test
+    public void testUninstallSdkWhileAppUsing() throws Exception {
+        // Install the required SDK1.
+        installPackage(TEST_SDK1);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+
+        setSystemProperty("debug.pm.uses_sdk_library_default_cert_digest",
+                getPackageCertDigest(TEST_SDK1_PACKAGE));
+
+        // Install the package.
+        installPackage(TEST_USING_SDK1);
+
+        uninstallPackage(TEST_SDK1_PACKAGE, "Failure [DELETE_FAILED_USED_SHARED_LIBRARY]");
+    }
+
+    @Test
+    public void testGetSharedLibraries() throws Exception {
+        // Install the SDK1.
+        installPackage(TEST_SDK1);
+        {
+            List<SharedLibraryInfo> libs = getSharedLibraries();
+            SharedLibraryInfo sdk1 = findLibrary(libs, "com.test.sdk1", 1);
+            assertNotNull(sdk1);
+            SharedLibraryInfo sdk2 = findLibrary(libs, "com.test.sdk2", 2);
+            assertNull(sdk2);
+        }
+
+        // Install the SDK2.
+        installPackage(TEST_SDK2);
+        {
+            List<SharedLibraryInfo> libs = getSharedLibraries();
+            SharedLibraryInfo sdk1 = findLibrary(libs, "com.test.sdk1", 1);
+            assertNotNull(sdk1);
+            SharedLibraryInfo sdk2 = findLibrary(libs, "com.test.sdk2", 2);
+            assertNotNull(sdk2);
+        }
+
+        // Install and uninstall the user package.
+        {
+            setSystemProperty("debug.pm.uses_sdk_library_default_cert_digest",
+                    getPackageCertDigest(TEST_SDK1_PACKAGE));
+
+            installPackage(TEST_USING_SDK1_AND_SDK2);
+
+            List<SharedLibraryInfo> libs = getSharedLibraries();
+            SharedLibraryInfo sdk1 = findLibrary(libs, "com.test.sdk1", 1);
+            assertNotNull(sdk1);
+            SharedLibraryInfo sdk2 = findLibrary(libs, "com.test.sdk2", 2);
+            assertNotNull(sdk2);
+
+            assertEquals(TEST_SDK_USER_PACKAGE,
+                    sdk1.getDependentPackages().get(0).getPackageName());
+            assertEquals(TEST_SDK_USER_PACKAGE,
+                    sdk2.getDependentPackages().get(0).getPackageName());
+
+            uninstallPackageSilently(TEST_SDK_USER_PACKAGE);
+        }
+
+        // Uninstall the SDK1.
+        uninstallPackageSilently(TEST_SDK1_PACKAGE);
+        {
+            List<SharedLibraryInfo> libs = getSharedLibraries();
+            SharedLibraryInfo sdk1 = findLibrary(libs, "com.test.sdk1", 1);
+            assertNull(sdk1);
+            SharedLibraryInfo sdk2 = findLibrary(libs, "com.test.sdk2", 2);
+            assertNotNull(sdk2);
+        }
+
+        // Uninstall the SDK2.
+        uninstallPackageSilently(TEST_SDK2_PACKAGE);
+        {
+            List<SharedLibraryInfo> libs = getSharedLibraries();
+            SharedLibraryInfo sdk1 = findLibrary(libs, "com.test.sdk1", 1);
+            assertNull(sdk1);
+            SharedLibraryInfo sdk2 = findLibrary(libs, "com.test.sdk2", 2);
+            assertNull(sdk2);
+        }
+    }
+
+    @Test
+    public void testUninstallUnusedSdks() throws Exception {
+        installPackage(TEST_SDK1);
+        installPackage(TEST_SDK2);
+
+        setSystemProperty("debug.pm.uses_sdk_library_default_cert_digest",
+                getPackageCertDigest(TEST_SDK1_PACKAGE));
+        installPackage(TEST_USING_SDK1_AND_SDK2);
+
+        setSystemProperty("debug.pm.prune_unused_shared_libraries_delay", "0");
+        executeShellCommand("settings put global unused_static_shared_lib_min_cache_period 0");
+        uninstallPackageSilently(TEST_SDK_USER_PACKAGE);
+
+        // Wait for 3secs max.
+        for (int i = 0; i < 30; ++i) {
+            if (!isSdkInstalled(TEST_SDK1_NAME, 1) && !isSdkInstalled(TEST_SDK2_NAME, 2)) {
+                break;
+            }
+            final int beforeRetryDelayMs = 100;
+            Thread.currentThread().sleep(beforeRetryDelayMs);
+        }
+        assertFalse(isSdkInstalled(TEST_SDK1_NAME, 1));
+        assertFalse(isSdkInstalled(TEST_SDK2_NAME, 2));
+    }
+
+    @Test
+    public void testAppUsingSdkUsingSdkInstallAndUpdate() throws Exception {
+        // Try to install without required SDK1.
+        installPackage(TEST_USING_SDK3, "Failure [INSTALL_FAILED_MISSING_SHARED_LIBRARY");
+        assertFalse(isAppInstalled(TEST_SDK_USER_PACKAGE));
+
+        // Try to install SDK3 without required SDK1.
+        installPackage(TEST_SDK3_USING_SDK1, "Failure [INSTALL_FAILED_MISSING_SHARED_LIBRARY");
+        assertFalse(isSdkInstalled(TEST_SDK3_NAME, 3));
+
+        // Now install the required SDK1.
+        installPackage(TEST_SDK1);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+
+        setSystemProperty("debug.pm.uses_sdk_library_default_cert_digest",
+                getPackageCertDigest(TEST_SDK1_PACKAGE));
+
+        // Now install the required SDK3.
+        installPackage(TEST_SDK3_USING_SDK1);
+        assertTrue(isSdkInstalled(TEST_SDK3_NAME, 3));
+
+        // Install and uninstall.
+        installPackage(TEST_USING_SDK3);
+        uninstallPackageSilently(TEST_SDK_USER_PACKAGE);
+
+        // Update SDK1.
+        installPackage(TEST_SDK1_UPDATED);
+
+        // Install again.
+        installPackage(TEST_USING_SDK3);
+
+        // Check resolution API.
+        getUiAutomation().adoptShellPermissionIdentity();
+        try {
+            ApplicationInfo appInfo = getPackageManager().getApplicationInfo(TEST_SDK_USER_PACKAGE,
+                    PackageManager.ApplicationInfoFlags.of(GET_SHARED_LIBRARY_FILES));
+            assertEquals(1, appInfo.sharedLibraryInfos.size());
+            SharedLibraryInfo libInfo = appInfo.sharedLibraryInfos.get(0);
+            assertEquals("com.test.sdk3", libInfo.getName());
+            assertEquals(3, libInfo.getLongVersion());
+        } finally {
+            getUiAutomation().dropShellPermissionIdentity();
+        }
+
+        // Try to install updated SDK3 without required SDK2.
+        installPackage(TEST_SDK3_USING_SDK1_AND_SDK2,
+                "Failure [INSTALL_FAILED_MISSING_SHARED_LIBRARY");
+
+        // Now install the required SDK2.
+        installPackage(TEST_SDK2);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+        assertTrue(isSdkInstalled(TEST_SDK2_NAME, 2));
+
+        installPackage(TEST_SDK3_USING_SDK1_AND_SDK2);
+        assertTrue(isSdkInstalled(TEST_SDK3_NAME, 3));
+
+        // Install and uninstall.
+        installPackage(TEST_USING_SDK3);
+        uninstallPackageSilently(TEST_SDK_USER_PACKAGE);
+
+        // Update both SDKs.
+        installPackage(TEST_SDK1_UPDATED);
+        installPackage(TEST_SDK2_UPDATED);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+        assertTrue(isSdkInstalled(TEST_SDK2_NAME, 2));
+
+        // Install again.
+        installPackage(TEST_USING_SDK3);
+
+        // Check resolution API.
+        getUiAutomation().adoptShellPermissionIdentity();
+        try {
+            ApplicationInfo appInfo = getPackageManager().getApplicationInfo(TEST_SDK_USER_PACKAGE,
+                    PackageManager.ApplicationInfoFlags.of(GET_SHARED_LIBRARY_FILES));
+            assertEquals(1, appInfo.sharedLibraryInfos.size());
+            assertEquals("com.test.sdk3", appInfo.sharedLibraryInfos.get(0).getName());
+            assertEquals(3, appInfo.sharedLibraryInfos.get(0).getLongVersion());
+        } finally {
+            getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testSdkUsingSdkInstallAndUpdate() throws Exception {
+        // Try to install without required SDK1.
+        installPackage(TEST_SDK3_USING_SDK1, "Failure [INSTALL_FAILED_MISSING_SHARED_LIBRARY");
+        assertFalse(isSdkInstalled(TEST_SDK3_NAME, 3));
+
+        // Now install the required SDK1.
+        installPackage(TEST_SDK1);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+
+        setSystemProperty("debug.pm.uses_sdk_library_default_cert_digest",
+                getPackageCertDigest(TEST_SDK1_PACKAGE));
+
+        // Install and uninstall.
+        installPackage(TEST_SDK3_USING_SDK1);
+        uninstallPackageSilently(TEST_SDK3_PACKAGE);
+
+        // Update SDK1.
+        installPackage(TEST_SDK1_UPDATED);
+
+        // Install again.
+        installPackage(TEST_SDK3_USING_SDK1);
+
+        // Check resolution API.
+        {
+            List<SharedLibraryInfo> libs = getSharedLibraries();
+            SharedLibraryInfo sdk3 = findLibrary(libs, "com.test.sdk3", 3);
+            assertNotNull(sdk3);
+            List<SharedLibraryInfo> deps = sdk3.getDependencies();
+            assertEquals(1, deps.size());
+            SharedLibraryInfo libInfo = deps.get(0);
+            assertEquals("com.test.sdk1", libInfo.getName());
+            assertEquals(1, libInfo.getLongVersion());
+        }
+
+        // Try to install without required SDK2.
+        installPackage(TEST_SDK3_USING_SDK1_AND_SDK2,
+                "Failure [INSTALL_FAILED_MISSING_SHARED_LIBRARY");
+
+        // Now install the required SDK2.
+        installPackage(TEST_SDK2);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+        assertTrue(isSdkInstalled(TEST_SDK2_NAME, 2));
+
+        // Install and uninstall.
+        installPackage(TEST_SDK3_USING_SDK1_AND_SDK2);
+        uninstallPackageSilently(TEST_SDK3_PACKAGE);
+
+        // Update both SDKs.
+        installPackage(TEST_SDK1_UPDATED);
+        installPackage(TEST_SDK2_UPDATED);
+        assertTrue(isSdkInstalled(TEST_SDK1_NAME, 1));
+        assertTrue(isSdkInstalled(TEST_SDK2_NAME, 2));
+
+        // Install again.
+        installPackage(TEST_SDK3_USING_SDK1_AND_SDK2);
+
+        // Check resolution API.
+        {
+            List<SharedLibraryInfo> libs = getSharedLibraries();
+            SharedLibraryInfo sdk3 = findLibrary(libs, "com.test.sdk3", 3);
+            assertNotNull(sdk3);
+            List<SharedLibraryInfo> deps = sdk3.getDependencies();
+            assertEquals(2, deps.size());
+            assertEquals("com.test.sdk1", deps.get(0).getName());
+            assertEquals(1, deps.get(0).getLongVersion());
+            assertEquals("com.test.sdk2", deps.get(1).getName());
+            assertEquals(2, deps.get(1).getLongVersion());
+        }
+    }
+
+    private void runPackageVerifierTest(BiConsumer<Context, Intent> onBroadcast)
+            throws Exception {
+        runPackageVerifierTest("Success", onBroadcast);
+    }
+
+    private void runPackageVerifierTest(String expectedResultStartsWith,
+            BiConsumer<Context, Intent> onBroadcast) throws Exception {
+        AtomicReference<Thread> onBroadcastThread = new AtomicReference<>();
+
+        runPackageVerifierTestSync(expectedResultStartsWith, (context, intent) -> {
+            Thread thread = new Thread(() -> onBroadcast.accept(context, intent));
+            thread.start();
+            onBroadcastThread.set(thread);
+        });
+
+        onBroadcastThread.get().join();
+    }
+
+    private void runPackageVerifierTestSync(String expectedResultStartsWith,
+            BiConsumer<Context, Intent> onBroadcast) throws Exception {
+        // Install a package.
+        installPackage(TEST_HW5);
+        assertTrue(isAppInstalled(TEST_APP_PACKAGE));
+
+        getUiAutomation().adoptShellPermissionIdentity(
+                android.Manifest.permission.PACKAGE_VERIFICATION_AGENT);
+
+        // Create a single-use broadcast receiver
+        BroadcastReceiver broadcastReceiver = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                context.unregisterReceiver(this);
+                onBroadcast.accept(context, intent);
+            }
+        };
+        // Create an intent-filter and register the receiver
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);
+        intentFilter.addDataType(PACKAGE_MIME_TYPE);
+        getContext().registerReceiver(broadcastReceiver, intentFilter, RECEIVER_EXPORTED);
+
+        // Enable verification.
+        executeShellCommand("settings put global verifier_verify_adb_installs 1");
+        // Override verifier for updates of debuggable apps.
+        setSystemProperty("debug.pm.adb_verifier_override_package", CTS_PACKAGE_NAME);
+
+        // Update the package, should trigger verifier override.
+        installPackage(TEST_HW7, expectedResultStartsWith);
+    }
+
+    @Test
+    public void testPackageVerifierAllow() throws Exception {
+        AtomicInteger dataLoaderType = new AtomicInteger(-1);
+
+        runPackageVerifierTest((context, intent) -> {
+            int verificationId = intent.getIntExtra(EXTRA_VERIFICATION_ID, -1);
+            assertNotEquals(-1, verificationId);
+
+            dataLoaderType.set(intent.getIntExtra(EXTRA_DATA_LOADER_TYPE, -1));
+            int sessionId = intent.getIntExtra(EXTRA_SESSION_ID, -1);
+            assertNotEquals(-1, sessionId);
+
+            getPackageManager().verifyPendingInstall(verificationId, VERIFICATION_ALLOW);
+        });
+
+        assertEquals(mDataLoaderType, dataLoaderType.get());
+    }
+
+    @Test
+    public void testPackageVerifierReject() throws Exception {
+        AtomicInteger dataLoaderType = new AtomicInteger(-1);
+
+        runPackageVerifierTest("Failure [INSTALL_FAILED_VERIFICATION_FAILURE: Install not allowed]",
+                (context, intent) -> {
+                    int verificationId = intent.getIntExtra(EXTRA_VERIFICATION_ID, -1);
+                    assertNotEquals(-1, verificationId);
+
+                    dataLoaderType.set(intent.getIntExtra(EXTRA_DATA_LOADER_TYPE, -1));
+                    int sessionId = intent.getIntExtra(EXTRA_SESSION_ID, -1);
+                    assertNotEquals(-1, sessionId);
+
+                    getPackageManager().verifyPendingInstall(verificationId, VERIFICATION_REJECT);
+                });
+
+        assertEquals(mDataLoaderType, dataLoaderType.get());
+    }
+
+    @Test
+    public void testPackageVerifierRejectAfterTimeout() throws Exception {
+        AtomicInteger dataLoaderType = new AtomicInteger(-1);
+
+        runPackageVerifierTestSync("Success", (context, intent) -> {
+            int verificationId = intent.getIntExtra(EXTRA_VERIFICATION_ID, -1);
+            assertNotEquals(-1, verificationId);
+
+            dataLoaderType.set(intent.getIntExtra(EXTRA_DATA_LOADER_TYPE, -1));
+            int sessionId = intent.getIntExtra(EXTRA_SESSION_ID, -1);
+            assertNotEquals(-1, sessionId);
+
+            try {
+                if (mDataLoaderType == DATA_LOADER_TYPE_INCREMENTAL) {
+                    // For streaming installations, the timeout is fixed at 3secs and always
+                    // allow the install. Try to extend the timeout and then reject after
+                    // much shorter time.
+                    getPackageManager().extendVerificationTimeout(verificationId,
+                            VERIFICATION_REJECT, mStreamingVerificationTimeoutMs * 3);
+                    Thread.sleep(mStreamingVerificationTimeoutMs * 2);
+                    getPackageManager().verifyPendingInstall(verificationId,
+                            VERIFICATION_REJECT);
+                } else {
+                    getPackageManager().verifyPendingInstall(verificationId,
+                            VERIFICATION_ALLOW);
+                }
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        assertEquals(mDataLoaderType, dataLoaderType.get());
+    }
+
+    @Test
+    public void testPackageVerifierWithExtensionAndTimeout() throws Exception {
+        AtomicInteger dataLoaderType = new AtomicInteger(-1);
+
+        runPackageVerifierTest((context, intent) -> {
+            int verificationId = intent.getIntExtra(EXTRA_VERIFICATION_ID, -1);
+            assertNotEquals(-1, verificationId);
+
+            dataLoaderType.set(intent.getIntExtra(EXTRA_DATA_LOADER_TYPE, -1));
+            int sessionId = intent.getIntExtra(EXTRA_SESSION_ID, -1);
+            assertNotEquals(-1, sessionId);
+
+            try {
+                if (mDataLoaderType == DATA_LOADER_TYPE_INCREMENTAL) {
+                    // For streaming installations, the timeout is fixed at 3secs and always
+                    // allow the install. Try to extend the timeout and then reject after
+                    // much shorter time.
+                    getPackageManager().extendVerificationTimeout(verificationId,
+                            VERIFICATION_REJECT, mStreamingVerificationTimeoutMs * 3);
+                    Thread.sleep(mStreamingVerificationTimeoutMs * 2);
+                    getPackageManager().verifyPendingInstall(verificationId,
+                            VERIFICATION_REJECT);
+                } else {
+                    getPackageManager().verifyPendingInstall(verificationId,
+                            VERIFICATION_ALLOW);
+                }
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        assertEquals(mDataLoaderType, dataLoaderType.get());
+    }
+
+    @Test
+    public void testPackageVerifierWithChecksums() throws Exception {
+        AtomicInteger dataLoaderType = new AtomicInteger(-1);
+        List<ApkChecksum> checksums = new ArrayList<>();
+        StringBuilder rootHash = new StringBuilder();
+
+        runPackageVerifierTest((context, intent) -> {
+            int verificationId = intent.getIntExtra(EXTRA_VERIFICATION_ID, -1);
+            assertNotEquals(-1, verificationId);
+
+            dataLoaderType.set(intent.getIntExtra(EXTRA_DATA_LOADER_TYPE, -1));
+            int sessionId = intent.getIntExtra(EXTRA_SESSION_ID, -1);
+            assertNotEquals(-1, sessionId);
+
+            try {
+                PackageInstaller.Session session = getPackageInstaller().openSession(sessionId);
+                assertNotNull(session);
+
+                rootHash.append(intent.getStringExtra(EXTRA_VERIFICATION_ROOT_HASH));
+
+                String[] names = session.getNames();
+                assertEquals(1, names.length);
+                session.requestChecksums(names[0], 0, PackageManager.TRUST_ALL,
+                        ConcurrentUtils.DIRECT_EXECUTOR,
+                        result -> checksums.addAll(result));
+            } catch (IOException | CertificateEncodingException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        assertEquals(mDataLoaderType, dataLoaderType.get());
+
+        assertEquals(1, checksums.size());
+
+        if (mDataLoaderType == DATA_LOADER_TYPE_INCREMENTAL) {
+            assertEquals(TYPE_WHOLE_MERKLE_ROOT_4K_SHA256, checksums.get(0).getType());
+            assertEquals(rootHash.toString(),
+                    "base.apk:" + HexDump.toHexString(checksums.get(0).getValue()));
+        } else {
+            assertEquals(TYPE_PARTIAL_MERKLE_ROOT_1M_SHA256, checksums.get(0).getType());
+        }
+    }
+
+    @Test
+    public void testAppWithNoAppStorageUpdateSuccess() throws Exception {
+        installPackage(TEST_HW_NO_APP_STORAGE);
+        assertTrue(isAppInstalled(TEST_APP_PACKAGE));
+        // Updates that don't change value of NO_APP_DATA_STORAGE property are allowed.
+        installPackage(TEST_HW_NO_APP_STORAGE);
+        assertTrue(isAppInstalled(TEST_APP_PACKAGE));
+    }
+
+    @Test
+    public void testAppUpdateAddsNoAppDataStorageProperty() throws Exception {
+        installPackage(TEST_HW5);
+        assertTrue(isAppInstalled(TEST_APP_PACKAGE));
+        installPackage(
+                TEST_HW_NO_APP_STORAGE,
+                "Failure [INSTALL_FAILED_UPDATE_INCOMPATIBLE: Update "
+                        + "attempted to change value of "
+                        + "android.internal.PROPERTY_NO_APP_DATA_STORAGE");
+    }
+
+    @Test
+    public void testAppUpdateRemovesNoAppDataStorageProperty() throws Exception {
+        installPackage(TEST_HW_NO_APP_STORAGE);
+        assertTrue(isAppInstalled(TEST_APP_PACKAGE));
+        installPackage(
+                TEST_HW5,
+                "Failure [INSTALL_FAILED_UPDATE_INCOMPATIBLE: Update "
+                        + "attempted to change value of "
+                        + "android.internal.PROPERTY_NO_APP_DATA_STORAGE");
+    }
+
+    @Test
+    public void testNoAppDataStoragePropertyCanChangeAfterUninstall() throws Exception {
+        installPackage(TEST_HW_NO_APP_STORAGE);
+        assertTrue(isAppInstalled(TEST_APP_PACKAGE));
+        uninstallPackageSilently(TEST_APP_PACKAGE);
+        // After app is uninstalled new install can change the value of the property.
+        installPackage(TEST_HW5);
+        assertTrue(isAppInstalled(TEST_APP_PACKAGE));
+    }
+
+    @Test
+    public void testQuerySdkSandboxPackageName() throws Exception {
+        final PackageManager pm = getPackageManager();
+        final String name = pm.getSdkSandboxPackageName();
+        assertNotNull(name);
+        final ApplicationInfo info = pm.getApplicationInfo(
+                name, PackageManager.ApplicationInfoFlags.of(PackageManager.MATCH_SYSTEM_ONLY));
+        assertEquals(ApplicationInfo.FLAG_SYSTEM, info.flags & ApplicationInfo.FLAG_SYSTEM);
+        assertTrue(info.sourceDir.startsWith("/apex/com.android.adservices"));
+    }
+
+    @Test
+    public void testGetPackagesForUid_sdkSandboxUid() throws Exception {
+        final PackageManager pm = getPackageManager();
+        final String[] pkgs = pm.getPackagesForUid(Process.toSdkSandboxUid(10239));
+        assertEquals(1, pkgs.length);
+        assertEquals(pm.getSdkSandboxPackageName(), pkgs[0]);
+    }
+
+    @Test
+    public void testGetNameForUid_sdkSandboxUid() throws Exception {
+        final PackageManager pm = getPackageManager();
+        final String pkgName = pm.getNameForUid(Process.toSdkSandboxUid(11543));
+        assertEquals(pm.getSdkSandboxPackageName(), pkgName);
+    }
+
+    @Test
+    public void testGetNamesForUids_sdkSandboxUids() throws Exception {
+        final PackageManager pm = getPackageManager();
+        final int[] uids = new int[]{Process.toSdkSandboxUid(10101)};
+        final String[] names = pm.getNamesForUids(uids);
+        assertEquals(1, names.length);
+        assertEquals(pm.getSdkSandboxPackageName(), names[0]);
+    }
+
+    @LargeTest
+    @Test
+    public void testCreateUserCurAsType() throws Exception {
+        Pattern pattern = Pattern.compile("Success: created user id (\\d+)\\R*");
+        String commandResult = executeShellCommand("pm create-user --profileOf cur "
+                + "--user-type android.os.usertype.profile.CLONE test");
+        Matcher matcher = pattern.matcher(commandResult);
+        assertTrue(matcher.find());
+        commandResult = executeShellCommand("pm remove-user " + matcher.group(1));
+        assertEquals("Success: removed user\n", commandResult);
+        commandResult = executeShellCommand("pm create-user --profileOf current "
+                + "--user-type android.os.usertype.profile.CLONE test");
+        matcher = pattern.matcher(commandResult);
+        assertTrue(matcher.find());
+        commandResult = executeShellCommand("pm remove-user " + matcher.group(1));
+        assertEquals("Success: removed user\n", commandResult);
+    }
+
+    static class FullyRemovedBroadcastReceiver extends BroadcastReceiver {
+        private final String mTargetPackage;
+        private final int mTargetUserId;
+        private final CompletableFuture<Boolean> mUserReceivedBroadcast = new CompletableFuture<>();
+        FullyRemovedBroadcastReceiver(String packageName, int targetUserId) {
+            mTargetPackage = packageName;
+            mTargetUserId = targetUserId;
+        }
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            final String packageName = intent.getData().getEncodedSchemeSpecificPart();
+            final int userId = context.getUserId();
+            if (intent.getAction().equals(Intent.ACTION_PACKAGE_FULLY_REMOVED)
+                    && packageName.equals(mTargetPackage) && userId == mTargetUserId) {
+                mUserReceivedBroadcast.complete(true);
+                context.unregisterReceiver(this);
+            }
+        }
+        public void assertBroadcastReceived() throws Exception {
+            assertTrue(mUserReceivedBroadcast.get(2, TimeUnit.SECONDS));
+        }
+        public void assertBroadcastNotReceived() throws Exception {
+            try {
+                assertFalse(mUserReceivedBroadcast.get(2, TimeUnit.SECONDS));
+            } catch (TimeoutException ignored) {
+                // expected
+            }
+        }
+    }
+
+    private List<SharedLibraryInfo> getSharedLibraries() {
+        getUiAutomation().adoptShellPermissionIdentity();
+        try {
+            return getPackageManager().getSharedLibraries(PackageManager.PackageInfoFlags.of(0));
+        } finally {
+            getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
+
+    private SharedLibraryInfo findLibrary(List<SharedLibraryInfo> libs, String name, long version) {
+        for (int i = 0, size = libs.size(); i < size; ++i) {
+            SharedLibraryInfo lib = libs.get(i);
+            if (name.equals(lib.getName()) && version == lib.getLongVersion()) {
+                return lib;
+            }
+        }
+        return null;
+    }
+
     private String createUpdateSession(String packageName) throws IOException {
         return createSession("-p " + packageName);
     }
@@ -722,14 +1592,40 @@
         assertEquals("Success\n", executeShellCommand("pm install-commit " + sessionId));
     }
 
-    private boolean isAppInstalled(String packageName) throws IOException {
+    static boolean isAppInstalled(String packageName) throws IOException {
         final String commandResult = executeShellCommand("pm list packages");
         final int prefixLength = "package:".length();
-        return Arrays.stream(commandResult.split("\\r?\\n"))
-                .anyMatch(line -> line.substring(prefixLength).equals(packageName));
+        return Arrays.stream(commandResult.split("\\r?\\n")).anyMatch(
+                line -> line.length() > prefixLength && line.substring(prefixLength).equals(
+                        packageName));
     }
 
-    private String getSplits(String packageName) throws IOException {
+    private boolean isSdkInstalled(String name, int versionMajor) throws IOException {
+        final String sdkString = name + ":" + versionMajor;
+        final String commandResult = executeShellCommand("pm list sdks");
+        final int prefixLength = "sdk:".length();
+        return Arrays.stream(commandResult.split("\\r?\\n"))
+                .anyMatch(line -> line.length() > prefixLength && line.substring(
+                        prefixLength).equals(sdkString));
+    }
+
+    private String getPackageCertDigest(String packageName) throws Exception {
+        getUiAutomation().adoptShellPermissionIdentity();
+        try {
+            PackageInfo sdkPackageInfo = getPackageManager().getPackageInfo(packageName,
+                    PackageManager.PackageInfoFlags.of(
+                            GET_SIGNING_CERTIFICATES | MATCH_STATIC_SHARED_AND_SDK_LIBRARIES));
+            SigningInfo signingInfo = sdkPackageInfo.signingInfo;
+            Signature[] signatures =
+                    signingInfo != null ? signingInfo.getSigningCertificateHistory() : null;
+            byte[] digest = PackageUtils.computeSha256DigestBytes(signatures[0].toByteArray());
+            return new String(HexEncoding.encode(digest));
+        } finally {
+            getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
+
+    static String getSplits(String packageName) throws IOException {
         final String commandResult = executeShellCommand("pm dump " + packageName);
         final String prefix = "    splits=[";
         final int prefixLength = prefix.length();
@@ -742,16 +1638,24 @@
         return splits.substring(prefixLength, splits.length() - 1);
     }
 
-    private static String createApkPath(String baseName) {
+    static String createApkPath(String baseName) {
         return TEST_APK_PATH + baseName;
     }
 
+    /* Install for all the users */
     private void installPackage(String baseName) throws IOException {
         File file = new File(createApkPath(baseName));
         assertEquals("Success\n", executeShellCommand(
                 "pm " + mInstall + " -t -g " + file.getPath()));
     }
 
+    private void installPackage(String baseName, String expectedResultStartsWith)
+            throws IOException {
+        File file = new File(createApkPath(baseName));
+        String result = executeShellCommand("pm " + mInstall + " -t -g " + file.getPath());
+        assertTrue(result, result.startsWith(expectedResultStartsWith));
+    }
+
     private void updatePackage(String packageName, String baseName) throws IOException {
         File file = new File(createApkPath(baseName));
         assertEquals("Success\n", executeShellCommand(
@@ -828,6 +1732,12 @@
                         splits)));
     }
 
+    private void uninstallPackage(String packageName, String expectedResultStartsWith)
+            throws IOException {
+        String result = uninstallPackageSilently(packageName);
+        assertTrue(result, result.startsWith(expectedResultStartsWith));
+    }
+
     private String uninstallPackageSilently(String packageName) throws IOException {
         return executeShellCommand("pm uninstall " + packageName);
     }
@@ -843,5 +1753,35 @@
         assertEquals("Success\n", executeShellCommand(
                 "pm uninstall " + packageName + " " + String.join(" ", splitNames)));
     }
+
+    private void setSystemProperty(String name, String value) throws Exception {
+        assertEquals("", executeShellCommand("setprop " + name + " " + value));
+    }
+
+    private int createUser(String name) throws IOException {
+        final String output = executeShellCommand("pm create-user " + name);
+        if (output.startsWith("Success")) {
+            return Integer.parseInt(output.substring(output.lastIndexOf(" ")).trim());
+        }
+        throw new IllegalStateException(String.format("Failed to create user: %s", output));
+    }
+
+    private void removeUser(int userId) throws IOException {
+        executeShellCommand("pm remove-user " + userId);
+    }
+
+    private boolean startUser(int userId) throws IOException {
+        String cmd = "am start-user -w " + userId;
+        final String output = executeShellCommand(cmd);
+        if (output.startsWith("Error")) {
+            return false;
+        }
+        String state = executeShellCommand("am get-started-user-state " + userId);
+        return state.contains("RUNNING_UNLOCKED");
+    }
+
+    private void stopUser(int userId) throws IOException {
+        executeShellCommand("am stop-user -w -f " + userId);
+    }
 }
 
diff --git a/tests/tests/content/src/android/content/pm/cts/PackageManagerTest.java b/tests/tests/content/src/android/content/pm/cts/PackageManagerTest.java
index 262c687..bff425b 100644
--- a/tests/tests/content/src/android/content/pm/cts/PackageManagerTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/PackageManagerTest.java
@@ -20,6 +20,10 @@
 import static android.content.pm.ApplicationInfo.FLAG_HAS_CODE;
 import static android.content.pm.ApplicationInfo.FLAG_INSTALLED;
 import static android.content.pm.ApplicationInfo.FLAG_SYSTEM;
+import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DEFAULT;
+import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_DISABLED;
+import static android.content.pm.PackageManager.COMPONENT_ENABLED_STATE_ENABLED;
+import static android.content.pm.PackageManager.DONT_KILL_APP;
 import static android.content.pm.PackageManager.GET_ACTIVITIES;
 import static android.content.pm.PackageManager.GET_META_DATA;
 import static android.content.pm.PackageManager.GET_PERMISSIONS;
@@ -37,6 +41,8 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
+import com.google.common.truth.Expect;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -48,10 +54,15 @@
 import static org.testng.Assert.assertThrows;
 
 import android.annotation.NonNull;
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.BroadcastReceiver;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.IntentSender;
+import android.content.ServiceConnection;
 import android.content.cts.MockActivity;
 import android.content.cts.MockContentProvider;
 import android.content.cts.MockReceiver;
@@ -64,18 +75,22 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageItemInfo;
 import android.content.pm.PackageManager;
+import android.content.pm.PackageManager.ComponentEnabledSetting;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.PermissionGroupInfo;
 import android.content.pm.PermissionInfo;
 import android.content.pm.ProviderInfo;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
+import android.content.pm.SharedLibraryInfo;
 import android.content.pm.Signature;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
+import android.net.Uri;
 import android.os.Bundle;
+import android.os.IBinder;
 import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.os.UserHandle;
@@ -83,18 +98,26 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.core.content.FileProvider;
 import androidx.test.InstrumentationRegistry;
+import androidx.test.rule.ServiceTestRule;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.SystemUtil;
+import com.android.compatibility.common.util.TestUtils;
+
+import junit.framework.AssertionFailedError;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -102,6 +125,10 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -117,13 +144,16 @@
 
     private Context mContext;
     private PackageManager mPackageManager;
+    private Instrumentation mInstrumentation;
     private static final String PACKAGE_NAME = "android.content.cts";
-    private static final String CONTENT_PKG_NAME = "android.content.cts";
+    private static final String STUB_PACKAGE_NAME = "com.android.cts.stub";
     private static final String APPLICATION_NAME = "android.content.cts.MockApplication";
     private static final String ACTIVITY_ACTION_NAME = "android.intent.action.PMTEST";
     private static final String MAIN_ACTION_NAME = "android.intent.action.MAIN";
     private static final String SERVICE_ACTION_NAME =
-                                "android.content.pm.cts.activity.PMTEST_SERVICE";
+            "android.content.pm.cts.activity.PMTEST_SERVICE";
+    private static final String RECEIVER_ACTION_NAME =
+            "android.content.pm.cts.PackageManagerTest.PMTEST_RECEIVER";
     private static final String GRANTED_PERMISSION_NAME = "android.permission.INTERNET";
     private static final String NOT_GRANTED_PERMISSION_NAME = "android.permission.HARDWARE_TEST";
     private static final String ACTIVITY_NAME = "android.content.pm.cts.TestPmActivity";
@@ -138,6 +168,7 @@
             "android.content.cts.permission.TEST_DYNAMIC";
     // Number of activities/activity-alias in AndroidManifest
     private static final int NUM_OF_ACTIVITIES_IN_MANIFEST = 12;
+    public static final long TIMEOUT_MS = TimeUnit.SECONDS.toMillis(10);
 
     private static final String SHIM_APEX_PACKAGE_NAME = "com.android.apex.cts.shim";
 
@@ -146,6 +177,8 @@
             MATCH_APEX, MATCH_HIDDEN_UNTIL_INSTALLED_COMPONENTS};
 
     private static final String SAMPLE_APK_BASE = "/data/local/tmp/cts/content/";
+    private static final String EMPTY_APP_APK = SAMPLE_APK_BASE
+            + "CtsContentEmptyTestApp.apk";
     private static final String LONG_PACKAGE_NAME_APK = SAMPLE_APK_BASE
             + "CtsContentLongPackageNameTestApp.apk";
     private static final String LONG_SHARED_USER_ID_APK = SAMPLE_APK_BASE
@@ -164,13 +197,50 @@
     private static final String SHELL_PACKAGE_NAME = "com.android.shell";
     private static final String HELLO_WORLD_PACKAGE_NAME = "com.example.helloworld";
     private static final String HELLO_WORLD_APK = SAMPLE_APK_BASE + "HelloWorld5.apk";
+    private static final String MOCK_LAUNCHER_PACKAGE_NAME = "android.content.cts.mocklauncherapp";
+    private static final String MOCK_LAUNCHER_APK = SAMPLE_APK_BASE
+            + "CtsContentMockLauncherTestApp.apk";
+    private static final String NON_EXISTENT_PACKAGE_NAME = "android.content.cts.nonexistent.pkg";
+    private static final String STUB_PACKAGE_APK = SAMPLE_APK_BASE
+            + "CtsSyncAccountAccessStubs.apk";
 
     private static final int MAX_SAFE_LABEL_LENGTH = 1000;
 
+    // For intent resolution tests
+    private static final String NON_EXISTENT_ACTION_NAME = "android.intent.action.cts.NON_EXISTENT";
+    private static final String INTENT_RESOLUTION_TEST_PKG_NAME =
+            "android.content.cts.IntentResolutionTest";
+    private static final String RESOLUTION_TEST_ACTION_NAME =
+            "android.intent.action.RESOLUTION_TEST";
+    private static final String SELECTOR_ACTION_NAME = "android.intent.action.SELECTORTEST";
+    private static final String FILE_PROVIDER_AUTHORITY = "android.content.cts.fileprovider";
+
+    private static final ComponentName ACTIVITY_COMPONENT = new ComponentName(
+            PACKAGE_NAME, ACTIVITY_NAME);
+    private static final ComponentName SERVICE_COMPONENT = new ComponentName(
+            PACKAGE_NAME, SERVICE_NAME);
+    private static final ComponentName STUB_ACTIVITY_COMPONENT = ComponentName.createRelative(
+            STUB_PACKAGE_NAME, ".StubActivity");
+    private static final ComponentName STUB_SERVICE_COMPONENT = ComponentName.createRelative(
+            STUB_PACKAGE_NAME, ".StubService");
+    private static final ComponentName RESET_ENABLED_SETTING_ACTIVITY_COMPONENT =
+            ComponentName.createRelative(MOCK_LAUNCHER_PACKAGE_NAME, ".MockActivity");
+    private static final ComponentName RESET_ENABLED_SETTING_RECEIVER_COMPONENT =
+            ComponentName.createRelative(MOCK_LAUNCHER_PACKAGE_NAME, ".MockReceiver");
+    private static final ComponentName RESET_ENABLED_SETTING_SERVICE_COMPONENT =
+            ComponentName.createRelative(MOCK_LAUNCHER_PACKAGE_NAME, ".MockService");
+    private static final ComponentName RESET_ENABLED_SETTING_PROVIDER_COMPONENT =
+            ComponentName.createRelative(MOCK_LAUNCHER_PACKAGE_NAME, ".MockProvider");
+
+    private final ServiceTestRule mServiceTestRule = new ServiceTestRule();
+
+    @Rule public final Expect expect = Expect.create();
+
     @Before
     public void setup() throws Exception {
         mContext = InstrumentationRegistry.getContext();
         mPackageManager = mContext.getPackageManager();
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
     }
 
     @After
@@ -178,6 +248,7 @@
         uninstallPackage(EMPTY_APP_PACKAGE_NAME);
         uninstallPackage(EMPTY_APP_MAX_PACKAGE_NAME);
         uninstallPackage(HELLO_WORLD_PACKAGE_NAME);
+        uninstallPackage(MOCK_LAUNCHER_PACKAGE_NAME);
     }
 
     @Test
@@ -188,17 +259,20 @@
         String cmpActivityName = "android.content.pm.cts.TestPmCompare";
         // List with different activities and the filter doesn't work,
         List<ResolveInfo> listWithDiff = mPackageManager.queryIntentActivityOptions(
-                new ComponentName(PACKAGE_NAME, cmpActivityName), null, activityIntent, 0);
+                new ComponentName(PACKAGE_NAME, cmpActivityName), null, activityIntent,
+                PackageManager.ResolveInfoFlags.of(0));
         checkActivityInfoName(ACTIVITY_NAME, listWithDiff);
 
         // List with the same activities to make filter work
         List<ResolveInfo> listInSame = mPackageManager.queryIntentActivityOptions(
-                new ComponentName(PACKAGE_NAME, ACTIVITY_NAME), null, activityIntent, 0);
+                new ComponentName(PACKAGE_NAME, ACTIVITY_NAME), null, activityIntent,
+                PackageManager.ResolveInfoFlags.of(0));
         assertEquals(0, listInSame.size());
 
         // Test queryIntentActivities
         List<ResolveInfo> intentActivities =
-                mPackageManager.queryIntentActivities(activityIntent, 0);
+                mPackageManager.queryIntentActivities(activityIntent,
+                        PackageManager.ResolveInfoFlags.of(0));
         assertTrue(intentActivities.size() > 0);
         checkActivityInfoName(ACTIVITY_NAME, intentActivities);
 
@@ -213,14 +287,14 @@
         // Test queryIntentServices
         Intent serviceIntent = new Intent(SERVICE_ACTION_NAME);
         List<ResolveInfo> services = mPackageManager.queryIntentServices(serviceIntent,
-                0 /*flags*/);
+                PackageManager.ResolveInfoFlags.of(0));
         checkServiceInfoName(SERVICE_NAME, services);
 
         // Test queryBroadcastReceivers
-        String receiverActionName = "android.content.pm.cts.PackageManagerTest.PMTEST_RECEIVER";
-        Intent broadcastIntent = new Intent(receiverActionName);
-        List<ResolveInfo> broadcastReceivers = new ArrayList<ResolveInfo>();
-        broadcastReceivers = mPackageManager.queryBroadcastReceivers(broadcastIntent, 0);
+        Intent broadcastIntent = new Intent(RECEIVER_ACTION_NAME);
+        List<ResolveInfo> broadcastReceivers =
+                mPackageManager.queryBroadcastReceivers(broadcastIntent,
+                        PackageManager.ResolveInfoFlags.of(0));
         checkActivityInfoName(RECEIVER_NAME, broadcastReceivers);
 
         // Test queryPermissionsByGroup, queryContentProviders
@@ -229,12 +303,208 @@
                 testPermissionsGroup, PackageManager.GET_META_DATA);
         checkPermissionInfoName(CALL_ABROAD_PERMISSION_NAME, permissions);
 
-        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME, 0);
+        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
         List<ProviderInfo> providers = mPackageManager.queryContentProviders(PACKAGE_NAME,
-                appInfo.uid, 0);
+                appInfo.uid, PackageManager.ComponentInfoFlags.of(0));
         checkProviderInfoName(PROVIDER_NAME, providers);
     }
 
+    @Test
+    public void testEnforceIntentToMatchIntentFilter() {
+        Intent intent = new Intent();
+        List<ResolveInfo> results;
+
+        /* Implicit intent tests */
+
+        intent.setPackage(INTENT_RESOLUTION_TEST_PKG_NAME);
+
+        // Implicit intents with matching intent filter
+        intent.setAction(RESOLUTION_TEST_ACTION_NAME);
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+        results = mPackageManager.queryIntentServices(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+        results = mPackageManager.queryBroadcastReceivers(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+
+        // Implicit intents with non-matching intent filter
+        intent.setAction(NON_EXISTENT_ACTION_NAME);
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+        results = mPackageManager.queryIntentServices(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+        results = mPackageManager.queryBroadcastReceivers(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+
+        /* Explicit intent tests */
+
+        intent = new Intent();
+        ComponentName comp;
+
+        // Explicit intents with matching intent filter
+        intent.setAction(RESOLUTION_TEST_ACTION_NAME);
+        comp = new ComponentName(INTENT_RESOLUTION_TEST_PKG_NAME, ACTIVITY_NAME);
+        intent.setComponent(comp);
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+        comp = new ComponentName(INTENT_RESOLUTION_TEST_PKG_NAME, SERVICE_NAME);
+        intent.setComponent(comp);
+        results = mPackageManager.queryIntentServices(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+        comp = new ComponentName(INTENT_RESOLUTION_TEST_PKG_NAME, RECEIVER_NAME);
+        intent.setComponent(comp);
+        results = mPackageManager.queryBroadcastReceivers(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+
+        // Explicit intents with non-matching intent filter on target T+
+        intent.setAction(NON_EXISTENT_ACTION_NAME);
+        comp = new ComponentName(INTENT_RESOLUTION_TEST_PKG_NAME, ACTIVITY_NAME);
+        intent.setComponent(comp);
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+        comp = new ComponentName(INTENT_RESOLUTION_TEST_PKG_NAME, SERVICE_NAME);
+        intent.setComponent(comp);
+        results = mPackageManager.queryIntentServices(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+        comp = new ComponentName(INTENT_RESOLUTION_TEST_PKG_NAME, RECEIVER_NAME);
+        intent.setComponent(comp);
+        results = mPackageManager.queryBroadcastReceivers(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+
+        // More comprehensive intent matching tests on target T+
+        intent = new Intent();
+        comp = new ComponentName(INTENT_RESOLUTION_TEST_PKG_NAME, ACTIVITY_NAME);
+        intent.setComponent(comp);
+        intent.setAction(RESOLUTION_TEST_ACTION_NAME + "2");
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+        intent.setType("*/*");
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+        intent.setData(Uri.parse("http://example.com"));
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+        intent.setDataAndType(Uri.parse("http://example.com"), "*/*");
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+        File file = new File(mContext.getFilesDir(), "test.txt");
+        try {
+            file.createNewFile();
+        } catch (IOException e) {
+            fail(e.getMessage());
+        }
+        Uri uri = FileProvider.getUriForFile(mContext, FILE_PROVIDER_AUTHORITY, file);
+        intent.setData(uri);
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+        file.delete();
+        intent.addCategory(Intent.CATEGORY_APP_BROWSER);
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+
+        // Explicit intents with non-matching intent filter on target < T
+        final String api30Pkg = INTENT_RESOLUTION_TEST_PKG_NAME + "Api30";
+        intent.setAction(NON_EXISTENT_ACTION_NAME);
+        comp = new ComponentName(api30Pkg, ACTIVITY_NAME);
+        intent.setComponent(comp);
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+        comp = new ComponentName(api30Pkg, SERVICE_NAME);
+        intent.setComponent(comp);
+        results = mPackageManager.queryIntentServices(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+        comp = new ComponentName(api30Pkg, RECEIVER_NAME);
+        intent.setComponent(comp);
+        results = mPackageManager.queryBroadcastReceivers(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+
+        // Explicit intents with non-matching intent filter on our own package
+        intent.setAction(NON_EXISTENT_ACTION_NAME);
+        comp = new ComponentName(PACKAGE_NAME, ACTIVITY_NAME);
+        intent.setComponent(comp);
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+        comp = new ComponentName(PACKAGE_NAME, SERVICE_NAME);
+        intent.setComponent(comp);
+        results = mPackageManager.queryIntentServices(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+        comp = new ComponentName(PACKAGE_NAME, RECEIVER_NAME);
+        intent.setComponent(comp);
+        results = mPackageManager.queryBroadcastReceivers(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+
+        /* Intent selector tests */
+
+        Intent selector = new Intent();
+        selector.setPackage(INTENT_RESOLUTION_TEST_PKG_NAME);
+        intent = new Intent();
+        intent.setSelector(selector);
+
+        // Matching intent and matching selector
+        selector.setAction(SELECTOR_ACTION_NAME);
+        intent.setAction(RESOLUTION_TEST_ACTION_NAME);
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+        results = mPackageManager.queryIntentServices(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+        results = mPackageManager.queryBroadcastReceivers(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(1, results.size());
+
+        // Matching intent and non-matching selector
+        selector.setAction(NON_EXISTENT_ACTION_NAME);
+        intent.setAction(RESOLUTION_TEST_ACTION_NAME);
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+        results = mPackageManager.queryIntentServices(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+        results = mPackageManager.queryBroadcastReceivers(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+
+        // Non-matching intent and matching selector
+        selector.setAction(SELECTOR_ACTION_NAME);
+        intent.setAction(NON_EXISTENT_ACTION_NAME);
+        results = mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+        results = mPackageManager.queryIntentServices(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+        results = mPackageManager.queryBroadcastReceivers(intent,
+                PackageManager.ResolveInfoFlags.of(0));
+        assertEquals(0, results.size());
+    }
+
     private void checkActivityInfoName(String expectedName, List<ResolveInfo> resolves) {
         // Flag for checking if the name is contained in list array.
         boolean isContained = false;
@@ -305,7 +575,8 @@
     @Test
     public void testGetInfo() throws NameNotFoundException {
         // Test getApplicationInfo, getText
-        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME, 0);
+        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
         int discriptionRes = R.string.hello_android;
         String expectedDisciptionRes = "Hello, Android!";
         CharSequence appText = mPackageManager.getText(PACKAGE_NAME, discriptionRes, appInfo);
@@ -317,7 +588,7 @@
 
         // Test getPackageInfo
         PackageInfo packageInfo = mPackageManager.getPackageInfo(PACKAGE_NAME,
-                PackageManager.GET_INSTRUMENTATION);
+                PackageManager.PackageInfoFlags.of(PackageManager.GET_INSTRUMENTATION));
         assertEquals(PACKAGE_NAME, packageInfo.packageName);
 
         // Test getApplicationInfo, getApplicationLabel
@@ -327,22 +598,25 @@
 
         // Test getServiceInfo
         assertEquals(SERVICE_NAME, mPackageManager.getServiceInfo(serviceName,
-                PackageManager.GET_META_DATA).name);
+                PackageManager.ComponentInfoFlags.of(PackageManager.GET_META_DATA)).name);
 
         // Test getReceiverInfo
-        assertEquals(RECEIVER_NAME, mPackageManager.getReceiverInfo(receiverName, 0).name);
+        assertEquals(RECEIVER_NAME, mPackageManager.getReceiverInfo(receiverName,
+                PackageManager.ComponentInfoFlags.of(0)).name);
 
         // Test getPackageArchiveInfo
         final String apkRoute = mContext.getPackageCodePath();
         final String apkName = mContext.getPackageName();
-        assertEquals(apkName, mPackageManager.getPackageArchiveInfo(apkRoute, 0).packageName);
+        assertEquals(apkName, mPackageManager.getPackageArchiveInfo(apkRoute,
+                PackageManager.PackageInfoFlags.of(0)).packageName);
 
         // Test getPackagesForUid, getNameForUid
         checkPackagesNameForUid(PACKAGE_NAME, mPackageManager.getPackagesForUid(appInfo.uid));
         assertEquals(PACKAGE_NAME, mPackageManager.getNameForUid(appInfo.uid));
 
         // Test getActivityInfo
-        assertEquals(ACTIVITY_NAME, mPackageManager.getActivityInfo(activityName, 0).name);
+        assertEquals(ACTIVITY_NAME, mPackageManager.getActivityInfo(activityName,
+                PackageManager.ComponentInfoFlags.of(0)).name);
 
         // Test getPackageGids
         assertTrue(mPackageManager.getPackageGids(PACKAGE_NAME).length > 0);
@@ -360,10 +634,12 @@
         checkPermissionGroupInfoName(PERMISSIONGROUP_NAME, permissionGroups);
 
         // Test getInstalledApplications
-        assertTrue(mPackageManager.getInstalledApplications(PackageManager.GET_META_DATA).size() > 0);
+        assertTrue(mPackageManager.getInstalledApplications(
+                PackageManager.ApplicationInfoFlags.of(PackageManager.GET_META_DATA)).size() > 0);
 
         // Test getInstalledPacakge
-        assertTrue(mPackageManager.getInstalledPackages(0).size() > 0);
+        assertTrue(mPackageManager.getInstalledPackages(
+                PackageManager.PackageInfoFlags.of(0)).size() > 0);
 
         // Test getInstrumentationInfo
         assertEquals(INSTRUMENT_NAME, mPackageManager.getInstrumentationInfo(instrName, 0).name);
@@ -383,8 +659,8 @@
         assertFalse(mPackageManager.isSafeMode());
 
         // Test getTargetSdkVersion
-        int expectedTargetSdk = mPackageManager.getApplicationInfo(PACKAGE_NAME, 0)
-                .targetSdkVersion;
+        int expectedTargetSdk = mPackageManager.getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0)).targetSdkVersion;
         assertEquals(expectedTargetSdk, mPackageManager.getTargetSdkVersion(PACKAGE_NAME));
         assertThrows(PackageManager.NameNotFoundException.class,
                 () -> mPackageManager.getTargetSdkVersion(
@@ -422,6 +698,7 @@
      * Simple test for {@link PackageManager#getPreferredActivities(List, List, String)} that tests
      * calling it has no effect. The method is essentially a no-op because no preferred activities
      * can be added.
+     *
      * @see PackageManager#addPreferredActivity(IntentFilter, int, ComponentName[], ComponentName)
      */
     @Test
@@ -508,14 +785,14 @@
     @Test
     public void testAccessEnabledSetting() {
         mPackageManager.setApplicationEnabledSetting(PACKAGE_NAME,
-                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
-        assertEquals(PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+                COMPONENT_ENABLED_STATE_ENABLED, DONT_KILL_APP);
+        assertEquals(COMPONENT_ENABLED_STATE_ENABLED,
                 mPackageManager.getApplicationEnabledSetting(PACKAGE_NAME));
 
         ComponentName componentName = new ComponentName(PACKAGE_NAME, ACTIVITY_NAME);
         mPackageManager.setComponentEnabledSetting(componentName,
-                PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP);
-        assertEquals(PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+                COMPONENT_ENABLED_STATE_ENABLED, DONT_KILL_APP);
+        assertEquals(COMPONENT_ENABLED_STATE_ENABLED,
                 mPackageManager.getComponentEnabledSetting(componentName));
     }
 
@@ -549,7 +826,8 @@
         // getDrawable is called by ComponentInfo.loadIcon() which called by getActivityIcon()
         // method of PackageMaganer. Here is just assurance for its functionality.
         int iconRes = R.drawable.start;
-        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME, 0);
+        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
         assertNotNull(mPackageManager.getDrawable(PACKAGE_NAME, iconRes, appInfo));
     }
 
@@ -568,8 +846,10 @@
     public void testCheckSignaturesMatch_byUid() throws NameNotFoundException {
         // Compare the signature of this package to another package installed by this test suite
         // (see AndroidTest.xml). Their signatures must match.
-        int uid1 = mPackageManager.getPackageInfo(PACKAGE_NAME, 0).applicationInfo.uid;
-        int uid2 = mPackageManager.getPackageInfo("com.android.cts.stub", 0).applicationInfo.uid;
+        int uid1 = mPackageManager.getPackageInfo(PACKAGE_NAME,
+                PackageManager.PackageInfoFlags.of(0)).applicationInfo.uid;
+        int uid2 = mPackageManager.getPackageInfo("com.android.cts.stub",
+                PackageManager.PackageInfoFlags.of(0)).applicationInfo.uid;
         assertEquals(PackageManager.SIGNATURE_MATCH, mPackageManager.checkSignatures(uid1, uid2));
 
         // A UID's signature should match its own signature.
@@ -586,8 +866,10 @@
     @Test
     public void testCheckSignaturesNoMatch_byUid() throws NameNotFoundException {
         // This test package's signature shouldn't match the system's signature.
-        int uid1 = mPackageManager.getPackageInfo(PACKAGE_NAME, 0).applicationInfo.uid;
-        int uid2 = mPackageManager.getPackageInfo("android", 0).applicationInfo.uid;
+        int uid1 = mPackageManager.getPackageInfo(PACKAGE_NAME,
+                PackageManager.PackageInfoFlags.of(0)).applicationInfo.uid;
+        int uid2 = mPackageManager.getPackageInfo("android",
+                PackageManager.PackageInfoFlags.of(0)).applicationInfo.uid;
         assertEquals(PackageManager.SIGNATURE_NO_MATCH,
                 mPackageManager.checkSignatures(uid1, uid2));
     }
@@ -616,18 +898,21 @@
         Intent intent = new Intent(ACTIVITY_ACTION_NAME);
         intent.setComponent(new ComponentName(PACKAGE_NAME, ACTIVITY_NAME));
         assertEquals(ACTIVITY_NAME, mPackageManager.resolveActivity(intent,
-                PackageManager.MATCH_DEFAULT_ONLY).activityInfo.name);
+                PackageManager.ResolveInfoFlags.of(PackageManager.MATCH_DEFAULT_ONLY))
+                .activityInfo.name);
 
         // Test resolveService
         intent = new Intent(SERVICE_ACTION_NAME);
         intent.setComponent(new ComponentName(PACKAGE_NAME, SERVICE_NAME));
-        ResolveInfo resolveInfo = mPackageManager.resolveService(intent, 0 /*flags*/);
+        ResolveInfo resolveInfo = mPackageManager.resolveService(intent,
+                PackageManager.ResolveInfoFlags.of(0));
         assertEquals(SERVICE_NAME, resolveInfo.serviceInfo.name);
 
         // Test resolveContentProvider
         String providerAuthorities = "ctstest";
         assertEquals(PROVIDER_NAME,
-                mPackageManager.resolveContentProvider(providerAuthorities, 0).name);
+                mPackageManager.resolveContentProvider(providerAuthorities,
+                        PackageManager.ComponentInfoFlags.of(0)).name);
     }
 
     @Test
@@ -635,7 +920,8 @@
         ComponentName componentName = new ComponentName(PACKAGE_NAME, ACTIVITY_NAME);
         int resourceId = R.xml.pm_test;
         String xmlName = "android.content.cts:xml/pm_test";
-        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME, 0);
+        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
         assertNotNull(mPackageManager.getXml(PACKAGE_NAME, resourceId, appInfo));
         assertEquals(xmlName, mPackageManager.getResourcesForActivity(componentName)
                 .getResourceName(resourceId));
@@ -648,7 +934,8 @@
     @Test
     public void testGetResources_withConfig() throws NameNotFoundException {
         int resourceId = R.string.config_overridden_string;
-        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME, 0);
+        ApplicationInfo appInfo = mPackageManager.getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
 
         Configuration c1 = new Configuration(mContext.getResources().getConfiguration());
         c1.orientation = Configuration.ORIENTATION_PORTRAIT;
@@ -668,7 +955,8 @@
 
         final int flags = PackageManager.GET_SIGNATURES;
 
-        final PackageInfo pkgInfo = mPackageManager.getPackageArchiveInfo(apkPath, flags);
+        final PackageInfo pkgInfo = mPackageManager.getPackageArchiveInfo(apkPath,
+                PackageManager.PackageInfoFlags.of(flags));
 
         assertEquals("getPackageArchiveInfo should return the correct package name",
                 apkName, pkgInfo.packageName);
@@ -690,8 +978,9 @@
     @Test
     public void testGetNamesForUids_valid() throws Exception {
         final int shimId =
-                mPackageManager.getApplicationInfo("com.android.cts.ctsshim", 0 /*flags*/).uid;
-        final int[] uids = new int[] {
+                mPackageManager.getApplicationInfo("com.android.cts.ctsshim",
+                        PackageManager.ApplicationInfoFlags.of(0)).uid;
+        final int[] uids = new int[]{
                 1000,
                 Integer.MAX_VALUE,
                 shimId,
@@ -710,10 +999,13 @@
         int userId = mContext.getUserId();
         int expectedUid = UserHandle.getUid(userId, 1000);
 
-        assertEquals(expectedUid, mPackageManager.getPackageUid("android", 0));
+        assertEquals(expectedUid, mPackageManager.getPackageUid("android",
+                PackageManager.PackageInfoFlags.of(0)));
 
-        int uid = mPackageManager.getApplicationInfo("com.android.cts.ctsshim", 0 /*flags*/).uid;
-        assertEquals(uid, mPackageManager.getPackageUid("com.android.cts.ctsshim", 0));
+        int uid = mPackageManager.getApplicationInfo("com.android.cts.ctsshim",
+                PackageManager.ApplicationInfoFlags.of(0)).uid;
+        assertEquals(uid, mPackageManager.getPackageUid("com.android.cts.ctsshim",
+                PackageManager.PackageInfoFlags.of(0)));
     }
 
     @Test
@@ -726,7 +1018,8 @@
     @Test
     public void testGetPackageInfo_notFound() {
         try {
-            mPackageManager.getPackageInfo("this.package.does.not.exist", 0);
+            mPackageManager.getPackageInfo("this.package.does.not.exist",
+                    PackageManager.PackageInfoFlags.of(0));
             fail("Exception expected");
         } catch (NameNotFoundException expected) {
         }
@@ -734,8 +1027,10 @@
 
     @Test
     public void testGetInstalledPackages() throws Exception {
-        List<PackageInfo> pkgs = mPackageManager.getInstalledPackages(GET_META_DATA
-                | GET_PERMISSIONS | GET_ACTIVITIES | GET_PROVIDERS | GET_SERVICES | GET_RECEIVERS);
+        List<PackageInfo> pkgs = mPackageManager.getInstalledPackages(
+                PackageManager.PackageInfoFlags.of(
+                        GET_META_DATA | GET_PERMISSIONS | GET_ACTIVITIES | GET_PROVIDERS
+                                | GET_SERVICES | GET_RECEIVERS));
 
         PackageInfo pkgInfo = findPackageOrFail(pkgs, PACKAGE_NAME);
         assertTestPackageInfo(pkgInfo);
@@ -819,7 +1114,8 @@
     // Tests that other packages can be queried.
     @Test
     public void testGetInstalledPackages_OtherPackages() throws Exception {
-        List<PackageInfo> pkgInfos = mPackageManager.getInstalledPackages(0);
+        List<PackageInfo> pkgInfos = mPackageManager.getInstalledPackages(
+                PackageManager.PackageInfoFlags.of(0));
 
         // Check a normal package.
         PackageInfo pkgInfo = findPackageOrFail(pkgInfos, "com.android.cts.stub"); // A test package
@@ -832,10 +1128,11 @@
 
     @Test
     public void testGetInstalledApplications() throws Exception {
-        List<ApplicationInfo> apps = mPackageManager.getInstalledApplications(GET_META_DATA);
+        List<ApplicationInfo> apps = mPackageManager.getInstalledApplications(
+                PackageManager.ApplicationInfoFlags.of(GET_META_DATA));
 
         ApplicationInfo app = findPackageItemOrFail(
-                apps.toArray(new ApplicationInfo[] {}), APPLICATION_NAME);
+                apps.toArray(new ApplicationInfo[]{}), APPLICATION_NAME);
 
         assertEquals(APPLICATION_NAME, app.name);
         assertEquals("Android TestCase", app.loadLabel(mPackageManager));
@@ -868,11 +1165,12 @@
     @Test
     public void testGetPackagesHoldingPermissions() {
         List<PackageInfo> pkgInfos = mPackageManager.getPackagesHoldingPermissions(
-                new String[] { GRANTED_PERMISSION_NAME }, 0);
+                new String[]{GRANTED_PERMISSION_NAME}, PackageManager.PackageInfoFlags.of(0));
         findPackageOrFail(pkgInfos, PACKAGE_NAME);
 
         pkgInfos = mPackageManager.getPackagesHoldingPermissions(
-                new String[] { NOT_GRANTED_PERMISSION_NAME }, 0);
+                new String[]{NOT_GRANTED_PERMISSION_NAME},
+                PackageManager.PackageInfoFlags.of(0));
         for (PackageInfo pkgInfo : pkgInfos) {
             if (PACKAGE_NAME.equals(pkgInfo.packageName)) {
                 fail("Must not return package " + PACKAGE_NAME);
@@ -999,7 +1297,8 @@
             boolean isAppStillVisible = true;
             while (SystemClock.elapsedRealtime() < startTimeMs + timeoutMs) {
                 try {
-                    mPackageManager.getPackageInfo(packageToManipulate, MATCH_SYSTEM_ONLY);
+                    mPackageManager.getPackageInfo(packageToManipulate,
+                            PackageManager.PackageInfoFlags.of(MATCH_SYSTEM_ONLY));
                 } catch (NameNotFoundException e) {
                     // expected, stop polling
                     isAppStillVisible = false;
@@ -1018,7 +1317,8 @@
                     mPackageManager.setSystemAppState(packageToManipulate,
                             PackageManager.SYSTEM_APP_STATE_HIDDEN_UNTIL_INSTALLED_VISIBLE));
             try {
-                mPackageManager.getPackageInfo(packageToManipulate, MATCH_SYSTEM_ONLY);
+                mPackageManager.getPackageInfo(packageToManipulate,
+                        PackageManager.PackageInfoFlags.of(MATCH_SYSTEM_ONLY));
             } catch (NameNotFoundException e) {
                 fail(packageToManipulate
                         + " should be found via getPackageInfo after re-enabling.");
@@ -1031,7 +1331,8 @@
         assumeTrue("Device doesn't support updating APEX", isUpdatingApexSupported());
 
         PackageInfo packageInfo = mPackageManager.getPackageInfo(SHIM_APEX_PACKAGE_NAME,
-                PackageManager.MATCH_APEX | PackageManager.MATCH_FACTORY_ONLY);
+                PackageManager.PackageInfoFlags.of(
+                        PackageManager.MATCH_APEX | PackageManager.MATCH_FACTORY_ONLY));
         assertShimApexInfoIsCorrect(packageInfo);
     }
 
@@ -1040,7 +1341,8 @@
         assumeTrue("Device doesn't support updating APEX", isUpdatingApexSupported());
 
         try {
-            mPackageManager.getPackageInfo(SHIM_APEX_PACKAGE_NAME, 0 /* flags */);
+            mPackageManager.getPackageInfo(SHIM_APEX_PACKAGE_NAME,
+                    PackageManager.PackageInfoFlags.of(0));
             fail("NameNotFoundException expected");
         } catch (NameNotFoundException expected) {
         }
@@ -1051,7 +1353,8 @@
         assumeFalse("Device supports updating APEX", isUpdatingApexSupported());
 
         try {
-            mPackageManager.getPackageInfo(SHIM_APEX_PACKAGE_NAME, PackageManager.MATCH_APEX);
+            mPackageManager.getPackageInfo(SHIM_APEX_PACKAGE_NAME,
+                    PackageManager.PackageInfoFlags.of(PackageManager.MATCH_APEX));
             fail("NameNotFoundException expected");
         } catch (NameNotFoundException expected) {
         }
@@ -1062,7 +1365,8 @@
         assumeFalse("Device supports updating APEX", isUpdatingApexSupported());
 
         try {
-            mPackageManager.getPackageInfo(SHIM_APEX_PACKAGE_NAME, 0);
+            mPackageManager.getPackageInfo(SHIM_APEX_PACKAGE_NAME,
+                    PackageManager.PackageInfoFlags.of(0));
             fail("NameNotFoundException expected");
         } catch (NameNotFoundException expected) {
         }
@@ -1073,7 +1377,8 @@
         assumeTrue("Device doesn't support updating APEX", isUpdatingApexSupported());
 
         List<PackageInfo> installedPackages = mPackageManager.getInstalledPackages(
-                PackageManager.MATCH_APEX | PackageManager.MATCH_FACTORY_ONLY);
+                PackageManager.PackageInfoFlags.of(
+                        PackageManager.MATCH_APEX | PackageManager.MATCH_FACTORY_ONLY));
         List<PackageInfo> shimApex = installedPackages.stream().filter(
                 packageInfo -> packageInfo.packageName.equals(SHIM_APEX_PACKAGE_NAME)).collect(
                 Collectors.toList());
@@ -1085,7 +1390,8 @@
     public void testGetInstalledPackages_ApexSupported_DoesNotMatchApex() {
         assumeTrue("Device doesn't support updating APEX", isUpdatingApexSupported());
 
-        List<PackageInfo> installedPackages = mPackageManager.getInstalledPackages(0);
+        List<PackageInfo> installedPackages = mPackageManager.getInstalledPackages(
+                PackageManager.PackageInfoFlags.of(0));
         List<PackageInfo> shimApex = installedPackages.stream().filter(
                 packageInfo -> packageInfo.packageName.equals(SHIM_APEX_PACKAGE_NAME)).collect(
                 Collectors.toList());
@@ -1097,7 +1403,7 @@
         assumeFalse("Device supports updating APEX", isUpdatingApexSupported());
 
         List<PackageInfo> installedPackages = mPackageManager.getInstalledPackages(
-                PackageManager.MATCH_APEX);
+                PackageManager.PackageInfoFlags.of(PackageManager.MATCH_APEX));
         List<PackageInfo> shimApex = installedPackages.stream().filter(
                 packageInfo -> packageInfo.packageName.equals(SHIM_APEX_PACKAGE_NAME)).collect(
                 Collectors.toList());
@@ -1108,7 +1414,8 @@
     public void testGetInstalledPackages_ApexNotSupported_DoesNotMatchApex() {
         assumeFalse("Device supports updating APEX", isUpdatingApexSupported());
 
-        List<PackageInfo> installedPackages = mPackageManager.getInstalledPackages(0);
+        List<PackageInfo> installedPackages = mPackageManager.getInstalledPackages(
+                PackageManager.PackageInfoFlags.of(0));
         List<PackageInfo> shimApex = installedPackages.stream().filter(
                 packageInfo -> packageInfo.packageName.equals(SHIM_APEX_PACKAGE_NAME)).collect(
                 Collectors.toList());
@@ -1122,7 +1429,8 @@
     @Test
     public void testGetInfo_noMetaData_InPackage() throws Exception {
         final PackageInfo info = mPackageManager.getPackageInfo(PACKAGE_NAME,
-                GET_ACTIVITIES | GET_SERVICES | GET_RECEIVERS | GET_PROVIDERS);
+                PackageManager.PackageInfoFlags.of(
+                        GET_ACTIVITIES | GET_SERVICES | GET_RECEIVERS | GET_PROVIDERS));
 
         assertThat(info.applicationInfo.metaData).isNull();
         Arrays.stream(info.activities).forEach(i -> assertThat(i.metaData).isNull());
@@ -1137,7 +1445,8 @@
      */
     @Test
     public void testGetInfo_noMetaData_InApplication() throws Exception {
-        final ApplicationInfo ai = mPackageManager.getApplicationInfo(PACKAGE_NAME, /* flags */ 0);
+        final ApplicationInfo ai = mPackageManager.getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
         assertThat(ai.metaData).isNull();
     }
 
@@ -1148,7 +1457,8 @@
     @Test
     public void testGetInfo_noMetaData_InActivity() throws Exception {
         final ComponentName componentName = new ComponentName(mContext, MockActivity.class);
-        final ActivityInfo info = mPackageManager.getActivityInfo(componentName, /* flags */ 0);
+        final ActivityInfo info = mPackageManager.getActivityInfo(componentName,
+                PackageManager.ComponentInfoFlags.of(0));
         assertThat(info.metaData).isNull();
     }
 
@@ -1159,7 +1469,8 @@
     @Test
     public void testGetInfo_noMetaData_InService() throws Exception {
         final ComponentName componentName = new ComponentName(mContext, MockService.class);
-        final ServiceInfo info = mPackageManager.getServiceInfo(componentName, /* flags */ 0);
+        final ServiceInfo info = mPackageManager.getServiceInfo(componentName,
+                PackageManager.ComponentInfoFlags.of(0));
         assertThat(info.metaData).isNull();
     }
 
@@ -1170,7 +1481,8 @@
     @Test
     public void testGetInfo_noMetaData_InBroadcastReceiver() throws Exception {
         final ComponentName componentName = new ComponentName(mContext, MockReceiver.class);
-        final ActivityInfo info = mPackageManager.getReceiverInfo(componentName, /* flags */ 0);
+        final ActivityInfo info = mPackageManager.getReceiverInfo(componentName,
+                PackageManager.ComponentInfoFlags.of(0));
         assertThat(info.metaData).isNull();
     }
 
@@ -1181,7 +1493,8 @@
     @Test
     public void testGetInfo_noMetaData_InContentProvider() throws Exception {
         final ComponentName componentName = new ComponentName(mContext, MockContentProvider.class);
-        final ProviderInfo info = mPackageManager.getProviderInfo(componentName, /* flags */ 0);
+        final ProviderInfo info = mPackageManager.getProviderInfo(componentName,
+                PackageManager.ComponentInfoFlags.of(0));
         assertThat(info.metaData).isNull();
     }
 
@@ -1192,7 +1505,9 @@
     @Test
     public void testGetInfo_checkMetaData_InPackage() throws Exception {
         final PackageInfo info = mPackageManager.getPackageInfo(PACKAGE_NAME,
-                GET_META_DATA | GET_ACTIVITIES | GET_SERVICES | GET_RECEIVERS | GET_PROVIDERS);
+                PackageManager.PackageInfoFlags.of(
+                        GET_META_DATA | GET_ACTIVITIES | GET_SERVICES | GET_RECEIVERS
+                                | GET_PROVIDERS));
 
         checkMetaData(new PackageItemInfo(info.applicationInfo));
         checkMetaData(new PackageItemInfo(
@@ -1211,7 +1526,8 @@
      */
     @Test
     public void testGetInfo_checkMetaData_InApplication() throws Exception {
-        final ApplicationInfo ai = mPackageManager.getApplicationInfo(PACKAGE_NAME, GET_META_DATA);
+        final ApplicationInfo ai = mPackageManager.getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(GET_META_DATA));
         checkMetaData(new PackageItemInfo(ai));
     }
 
@@ -1222,7 +1538,8 @@
     @Test
     public void testGetInfo_checkMetaData_InActivity() throws Exception {
         final ComponentName componentName = new ComponentName(mContext, MockActivity.class);
-        final ActivityInfo ai = mPackageManager.getActivityInfo(componentName, GET_META_DATA);
+        final ActivityInfo ai = mPackageManager.getActivityInfo(componentName,
+                PackageManager.ComponentInfoFlags.of(GET_META_DATA));
         checkMetaData(new PackageItemInfo(ai));
     }
 
@@ -1233,7 +1550,8 @@
     @Test
     public void testGetInfo_checkMetaData_InService() throws Exception {
         final ComponentName componentName = new ComponentName(mContext, MockService.class);
-        final ServiceInfo info = mPackageManager.getServiceInfo(componentName, GET_META_DATA);
+        final ServiceInfo info = mPackageManager.getServiceInfo(componentName,
+                PackageManager.ComponentInfoFlags.of(GET_META_DATA));
         checkMetaData(new PackageItemInfo(info));
     }
 
@@ -1244,7 +1562,8 @@
     @Test
     public void testGetInfo_checkMetaData_InBroadcastReceiver() throws Exception {
         final ComponentName componentName = new ComponentName(mContext, MockReceiver.class);
-        final ActivityInfo info = mPackageManager.getReceiverInfo(componentName, GET_META_DATA);
+        final ActivityInfo info = mPackageManager.getReceiverInfo(componentName,
+                PackageManager.ComponentInfoFlags.of(GET_META_DATA));
         checkMetaData(new PackageItemInfo(info));
     }
 
@@ -1255,7 +1574,8 @@
     @Test
     public void testGetInfo_checkMetaData_InContentProvider() throws Exception {
         final ComponentName componentName = new ComponentName(mContext, MockContentProvider.class);
-        final ProviderInfo info = mPackageManager.getProviderInfo(componentName, GET_META_DATA);
+        final ProviderInfo info = mPackageManager.getProviderInfo(componentName,
+                PackageManager.ComponentInfoFlags.of(GET_META_DATA));
         checkMetaData(new PackageItemInfo(info));
     }
 
@@ -1290,7 +1610,7 @@
             assertThat(xml.getAttributeIntValue(null, "rawColor", 0)).isEqualTo(0xffffff00);
             assertThat(xml.getAttributeValue(null, "rawColor")).isEqualTo("#ffffff00");
 
-            a = res.obtainAttributes(xml, new int[] {android.R.attr.text, android.R.attr.color});
+            a = res.obtainAttributes(xml, new int[]{android.R.attr.text, android.R.attr.color});
             assertThat(a.getString(0)).isEqualTo("metadata text");
             assertThat(a.getColor(1, 0)).isEqualTo(0xffff0000);
             assertThat(a.getString(1)).isEqualTo("#ffff0000");
@@ -1309,7 +1629,8 @@
         assumeTrue("Device doesn't support updating APEX", isUpdatingApexSupported());
 
         ApplicationInfo ai = mPackageManager.getApplicationInfo(
-                SHIM_APEX_PACKAGE_NAME, PackageManager.MATCH_APEX);
+                SHIM_APEX_PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(PackageManager.MATCH_APEX));
         assertThat(ai.sourceDir).isEqualTo("/system/apex/com.android.apex.cts.shim.apex");
         assertThat(ai.publicSourceDir).isEqualTo(ai.sourceDir);
         assertThat(ai.flags & ApplicationInfo.FLAG_SYSTEM).isEqualTo(ApplicationInfo.FLAG_SYSTEM);
@@ -1323,7 +1644,7 @@
         final boolean useRoundIcon = mContext.getResources().getBoolean(
                 mContext.getResources().getIdentifier("config_useRoundIcon", "bool", "android"));
         final ApplicationInfo info = mPackageManager.getApplicationInfo(HELLO_WORLD_PACKAGE_NAME,
-                0 /*flags*/);
+                PackageManager.ApplicationInfoFlags.of(0));
         assertThat(info.icon).isEqualTo((useRoundIcon ? info.roundIconRes : info.iconRes));
     }
 
@@ -1348,8 +1669,9 @@
 
     /**
      * Runs a test for all combinations of a set of flags
+     *
      * @param flagValues Which flags to use
-     * @param test The test
+     * @param test       The test
      */
     public void runTestWithFlags(int[] flagValues, Consumer<Integer> test) {
         for (int i = 0; i < (1 << flagValues.length); i++) {
@@ -1377,10 +1699,12 @@
         runTestWithFlags(PACKAGE_INFO_MATCH_FLAGS,
                 this::testGetInstalledPackages_WithFactoryFlag_IsSubset);
     }
+
     public void testGetInstalledPackages_WithFactoryFlag_IsSubset(int flags) {
-        List<PackageInfo> packageInfos = mPackageManager.getInstalledPackages(flags);
+        List<PackageInfo> packageInfos = mPackageManager.getInstalledPackages(
+                PackageManager.PackageInfoFlags.of(flags));
         List<PackageInfo> packageInfos2 = mPackageManager.getInstalledPackages(
-                flags | MATCH_FACTORY_ONLY);
+                PackageManager.PackageInfoFlags.of(flags | MATCH_FACTORY_ONLY));
         Set<String> supersetNames =
                 packageInfos.stream().map(pi -> pi.packageName).collect(Collectors.toSet());
 
@@ -1401,9 +1725,11 @@
         runTestWithFlags(PACKAGE_INFO_MATCH_FLAGS,
                 this::testGetInstalledPackages_WithFactoryFlag_ImpliesSystem);
     }
+
     public void testGetInstalledPackages_WithFactoryFlag_ImpliesSystem(int flags) {
         List<PackageInfo> packageInfos =
-                mPackageManager.getInstalledPackages(flags | MATCH_FACTORY_ONLY);
+                mPackageManager.getInstalledPackages(
+                        PackageManager.PackageInfoFlags.of(flags | MATCH_FACTORY_ONLY));
         for (PackageInfo pi : packageInfos) {
             if (!pi.applicationInfo.isSystemApp()) {
                 throw new AssertionError(pi.packageName + " is not a system app.");
@@ -1417,42 +1743,33 @@
      */
     @Test
     public void testGetInstalledPackages_WithFactoryFlag_ContainsNoDuplicates() {
+        final Set<String> packageNames = new HashSet<>();
         runTestWithFlags(PACKAGE_INFO_MATCH_FLAGS,
-                this::testGetInstalledPackages_WithFactoryFlag_ContainsNoDuplicates);
+                flags -> testGetInstalledPackages_WithFactoryFlag_ContainsNoDuplicates(flags,
+                        packageNames));
     }
 
-    // TODO(b/200519752): Remove once the bug is fixed
-    private boolean containsUpdatedApex() {
-        List<PackageInfo> installedApexPackages =
-                mPackageManager.getInstalledPackages(PackageManager.MATCH_APEX);
-        return installedApexPackages.stream().anyMatch(
-                p -> p.applicationInfo.sourceDir.startsWith("/data/apex"));
-    }
-
-    public void testGetInstalledPackages_WithFactoryFlag_ContainsNoDuplicates(int flags) {
-        // TODO(b/200519752): Due to the bug, if there are updated APEX modules, then test will fail
-        // for flag: 0x40002000 and its superset. Skip under that specific condition.
-        int flagToSkip = MATCH_UNINSTALLED_PACKAGES | MATCH_APEX;
-        if (containsUpdatedApex() && (flags & flagToSkip) == flagToSkip) {
-            // Return silently so that the test still gets run for other flag combination.
-            return;
-        }
-
+    public void testGetInstalledPackages_WithFactoryFlag_ContainsNoDuplicates(int flags,
+            Set<String> packageNames) {
         List<PackageInfo> packageInfos =
-                mPackageManager.getInstalledPackages(flags | MATCH_FACTORY_ONLY);
-        Set<String> foundPackages = new HashSet<>();
+                mPackageManager.getInstalledPackages(
+                        PackageManager.PackageInfoFlags.of(flags | MATCH_FACTORY_ONLY));
+
+        final Set<String> localPackageNames = new HashSet<>();
         for (PackageInfo pi : packageInfos) {
-            if (foundPackages.contains(pi.packageName)) {
-                throw new AssertionError(pi.packageName + " is listed at least twice.");
+            final String packageName = pi.packageName;
+            // Duplicate: already in local.
+            // Dedup error messages: not in global.
+            if (!localPackageNames.add(pi.packageName) && packageNames.add(packageName)) {
+                expect.withMessage("Duplicate package " + packageName + " detected").fail();
             }
-            foundPackages.add(pi.packageName);
         }
     }
 
     @Test
     public void testInstallTestOnlyPackagePermission_onlyGrantedToShell() {
         List<PackageInfo> packages = mPackageManager.getPackagesHoldingPermissions(
-                new String[]{INSTALL_TEST_ONLY_PACKAGE}, /* flags= */ 0);
+                new String[]{INSTALL_TEST_ONLY_PACKAGE}, PackageManager.PackageInfoFlags.of(0));
 
         assertThat(packages).hasSize(1);
         assertThat(packages.get(0).packageName).isEqualTo(SHELL_PACKAGE_NAME);
@@ -1479,7 +1796,12 @@
     }
 
     private boolean installPackage(String apkPath) {
-        return SystemUtil.runShellCommand("pm install -t " + apkPath).equals("Success\n");
+        return installPackage(apkPath, false /* dontKill */);
+    }
+
+    private boolean installPackage(String apkPath, boolean dontKill) {
+        return SystemUtil.runShellCommand(
+                "pm install -t " + (dontKill ? "--dont-kill " : "") + apkPath).equals("Success\n");
     }
 
     private void uninstallPackage(String packageName) {
@@ -1487,10 +1809,117 @@
     }
 
     @Test
+    public void testGetLaunchIntentSenderForPackage() throws Exception {
+        final Instrumentation.ActivityMonitor monitor = new Instrumentation.ActivityMonitor(
+                LauncherMockActivity.class.getName(), null /* result */, false /* block */);
+        mInstrumentation.addMonitor(monitor);
+
+        try {
+            final IntentSender intentSender = mPackageManager.getLaunchIntentSenderForPackage(
+                    PACKAGE_NAME);
+            assertThat(intentSender.getCreatorPackage()).isEqualTo(PACKAGE_NAME);
+            assertThat(intentSender.getCreatorUid()).isEqualTo(mContext.getApplicationInfo().uid);
+
+            intentSender.sendIntent(mContext, 0 /* code */, null /* intent */,
+                    null /* onFinished */, null /* handler */);
+            final Activity activity = monitor.waitForActivityWithTimeout(TIMEOUT_MS);
+            assertThat(activity).isNotNull();
+            activity.finish();
+        } finally {
+            mInstrumentation.removeMonitor(monitor);
+        }
+    }
+
+    @Test(expected = IntentSender.SendIntentException.class)
+    public void testGetLaunchIntentSenderForPackage_noMainActivity() throws Exception {
+        assertThat(installPackage(EMPTY_APP_APK)).isTrue();
+        final PackageInfo packageInfo = mPackageManager.getPackageInfo(EMPTY_APP_PACKAGE_NAME,
+                PackageManager.PackageInfoFlags.of(0));
+        assertThat(packageInfo.packageName).isEqualTo(EMPTY_APP_PACKAGE_NAME);
+        final Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setPackage(EMPTY_APP_PACKAGE_NAME);
+        assertThat(mPackageManager.queryIntentActivities(intent,
+                PackageManager.ResolveInfoFlags.of(0))).isEmpty();
+
+        final IntentSender intentSender = mPackageManager.getLaunchIntentSenderForPackage(
+                EMPTY_APP_PACKAGE_NAME);
+        assertThat(intentSender.getCreatorPackage()).isEqualTo(PACKAGE_NAME);
+        assertThat(intentSender.getCreatorUid()).isEqualTo(mContext.getApplicationInfo().uid);
+
+        intentSender.sendIntent(mContext, 0 /* code */, null /* intent */,
+                null /* onFinished */, null /* handler */);
+    }
+
+    @Test(expected = IntentSender.SendIntentException.class)
+    public void testGetLaunchIntentSenderForPackage_packageNotExist() throws Exception {
+        try {
+            mPackageManager.getPackageInfo(EMPTY_APP_PACKAGE_NAME,
+                    PackageManager.PackageInfoFlags.of(0));
+            fail(EMPTY_APP_PACKAGE_NAME + " should not exist in the device");
+        } catch (NameNotFoundException e) {
+        }
+        final IntentSender intentSender = mPackageManager.getLaunchIntentSenderForPackage(
+                EMPTY_APP_PACKAGE_NAME);
+        assertThat(intentSender.getCreatorPackage()).isEqualTo(PACKAGE_NAME);
+        assertThat(intentSender.getCreatorUid()).isEqualTo(mContext.getApplicationInfo().uid);
+
+        intentSender.sendIntent(mContext, 0 /* code */, null /* intent */,
+                null /* onFinished */, null /* handler */);
+    }
+
+    @Test
+    public void testDefaultHomeActivity_doesntChange_whenInstallAnotherLauncher() throws Exception {
+        final Intent homeIntent = new Intent(Intent.ACTION_MAIN)
+                .addCategory(Intent.CATEGORY_HOME);
+        final String currentHomeActivity =
+                mPackageManager.resolveActivity(homeIntent,
+                        PackageManager.ResolveInfoFlags.of(0)).activityInfo.name;
+
+        // Install another launcher app.
+        assertThat(installPackage(MOCK_LAUNCHER_APK)).isTrue();
+
+        // There is an async operation to re-set the default home activity in Role with no way
+        // to listen for completion once a package installed, so poll until the default home
+        // activity is set.
+        PollingCheck.waitFor(() -> currentHomeActivity.equals(
+                mPackageManager.resolveActivity(homeIntent,
+                        PackageManager.ResolveInfoFlags.of(0)).activityInfo.name));
+        final List<String> homeApps =
+                mPackageManager.queryIntentActivities(homeIntent,
+                                PackageManager.ResolveInfoFlags.of(0)).stream()
+                        .map(i -> i.activityInfo.packageName).collect(Collectors.toList());
+        assertThat(homeApps.contains(MOCK_LAUNCHER_PACKAGE_NAME)).isTrue();
+    }
+
+    @Test
+    public void setComponentEnabledSetting_nonExistentPackage_withoutPermission() {
+        final ComponentName componentName = ComponentName.createRelative(
+                NON_EXISTENT_PACKAGE_NAME, "ClassName");
+        assertThrows(SecurityException.class, () -> mPackageManager.setComponentEnabledSetting(
+                componentName, COMPONENT_ENABLED_STATE_ENABLED, 0 /* flags */));
+    }
+
+    @Test
+    public void setComponentEnabledSetting_nonExistentPackage_hasPermission() {
+        final ComponentName componentName = ComponentName.createRelative(
+                NON_EXISTENT_PACKAGE_NAME, "ClassName");
+        mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
+                android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE);
+
+        try {
+            assertThrows(IllegalArgumentException.class,
+                    () -> mPackageManager.setComponentEnabledSetting(componentName,
+                            COMPONENT_ENABLED_STATE_ENABLED, 0 /* flags */));
+        } finally {
+            mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
     public void loadApplicationLabel_withLongLabelName_truncated() throws Exception {
         assertThat(installPackage(LONG_LABEL_NAME_APK)).isTrue();
         final ApplicationInfo info = mPackageManager.getApplicationInfo(
-                EMPTY_APP_PACKAGE_NAME, 0 /* flags */);
+                EMPTY_APP_PACKAGE_NAME, PackageManager.ApplicationInfoFlags.of(0));
         final CharSequence resLabel = mPackageManager.getText(
                 EMPTY_APP_PACKAGE_NAME, info.labelRes, info);
 
@@ -1504,9 +1933,9 @@
         final ComponentName componentName = ComponentName.createRelative(
                 EMPTY_APP_PACKAGE_NAME, ".MockActivity");
         final ApplicationInfo appInfo = mPackageManager.getApplicationInfo(
-                EMPTY_APP_PACKAGE_NAME, 0 /* flags */);
+                EMPTY_APP_PACKAGE_NAME, PackageManager.ApplicationInfoFlags.of(0));
         final ActivityInfo activityInfo = mPackageManager.getActivityInfo(
-                componentName, 0 /* flags */);
+                componentName, PackageManager.ComponentInfoFlags.of(0));
         final CharSequence resLabel = mPackageManager.getText(
                 EMPTY_APP_PACKAGE_NAME, activityInfo.labelRes, appInfo);
 
@@ -1514,4 +1943,298 @@
         assertThat(activityInfo.loadLabel(mPackageManager).length())
                 .isEqualTo(MAX_SAFE_LABEL_LENGTH);
     }
+
+    @Test
+    public void setComponentEnabledSettings_withDuplicatedComponent() {
+        final List<ComponentEnabledSetting> enabledSettings = List.of(
+                new ComponentEnabledSetting(
+                        ACTIVITY_COMPONENT, COMPONENT_ENABLED_STATE_DISABLED, DONT_KILL_APP),
+                new ComponentEnabledSetting(
+                        ACTIVITY_COMPONENT, COMPONENT_ENABLED_STATE_DISABLED, DONT_KILL_APP));
+
+        assertThrows(IllegalArgumentException.class,
+                () -> mPackageManager.setComponentEnabledSettings(enabledSettings));
+    }
+
+    @Test
+    public void setComponentEnabledSettings_flagDontKillAppConflict() {
+        final List<ComponentEnabledSetting> enabledSettings = List.of(
+                new ComponentEnabledSetting(
+                        ACTIVITY_COMPONENT, COMPONENT_ENABLED_STATE_DISABLED, DONT_KILL_APP),
+                new ComponentEnabledSetting(
+                        SERVICE_COMPONENT, COMPONENT_ENABLED_STATE_DISABLED, 0));
+
+        assertThrows(IllegalArgumentException.class,
+                () -> mPackageManager.setComponentEnabledSettings(enabledSettings));
+    }
+
+    @Test
+    public void setComponentEnabledSettings_disableSelfAndStubApp_withoutPermission() {
+        final List<ComponentEnabledSetting> enabledSettings = List.of(
+                new ComponentEnabledSetting(
+                        ACTIVITY_COMPONENT, COMPONENT_ENABLED_STATE_DISABLED, DONT_KILL_APP),
+                new ComponentEnabledSetting(
+                        STUB_ACTIVITY_COMPONENT, COMPONENT_ENABLED_STATE_DISABLED, 0));
+
+        assertThrows(SecurityException.class,
+                () -> mPackageManager.setComponentEnabledSettings(enabledSettings));
+    }
+
+    @Test
+    public void setComponentEnabledSettings_disableSelf() throws Exception {
+        final int activityState = mPackageManager.getComponentEnabledSetting(ACTIVITY_COMPONENT);
+        final int serviceState = mPackageManager.getComponentEnabledSetting(SERVICE_COMPONENT);
+        assertThat(activityState).isAnyOf(
+                COMPONENT_ENABLED_STATE_DEFAULT, COMPONENT_ENABLED_STATE_ENABLED);
+        assertThat(serviceState).isAnyOf(
+                COMPONENT_ENABLED_STATE_DEFAULT, COMPONENT_ENABLED_STATE_ENABLED);
+
+        try {
+            final List<ComponentEnabledSetting> enabledSettings = List.of(
+                    new ComponentEnabledSetting(
+                            ACTIVITY_COMPONENT, COMPONENT_ENABLED_STATE_DISABLED, DONT_KILL_APP),
+                    new ComponentEnabledSetting(
+                            SERVICE_COMPONENT, COMPONENT_ENABLED_STATE_DISABLED, DONT_KILL_APP));
+            setComponentEnabledSettingsAndWaitForBroadcasts(enabledSettings);
+        } finally {
+            final List<ComponentEnabledSetting> enabledSettings = List.of(
+                    new ComponentEnabledSetting(ACTIVITY_COMPONENT, activityState, DONT_KILL_APP),
+                    new ComponentEnabledSetting(SERVICE_COMPONENT, serviceState, DONT_KILL_APP));
+            setComponentEnabledSettingsAndWaitForBroadcasts(enabledSettings);
+        }
+    }
+
+    @Test
+    public void setComponentEnabledSettings_disableSelfAndStubApp_killStubApp()
+            throws Exception {
+        final int activityState = mPackageManager.getComponentEnabledSetting(ACTIVITY_COMPONENT);
+        final int stubState = mPackageManager.getComponentEnabledSetting(STUB_ACTIVITY_COMPONENT);
+        assertThat(activityState).isAnyOf(
+                COMPONENT_ENABLED_STATE_DEFAULT, COMPONENT_ENABLED_STATE_ENABLED);
+        assertThat(stubState).isAnyOf(
+                COMPONENT_ENABLED_STATE_DEFAULT, COMPONENT_ENABLED_STATE_ENABLED);
+
+        final Intent intent = new Intent();
+        intent.setComponent(STUB_SERVICE_COMPONENT);
+        final AtomicBoolean killed = new AtomicBoolean();
+        mServiceTestRule.bindService(intent, new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                killed.set(true);
+            }
+        }, Context.BIND_AUTO_CREATE);
+        mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
+                android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE);
+
+        try {
+            final List<ComponentEnabledSetting> enabledSettings = List.of(
+                    new ComponentEnabledSetting(
+                            ACTIVITY_COMPONENT, COMPONENT_ENABLED_STATE_DISABLED, DONT_KILL_APP),
+                    new ComponentEnabledSetting(
+                            STUB_ACTIVITY_COMPONENT, COMPONENT_ENABLED_STATE_DISABLED, 0));
+            setComponentEnabledSettingsAndWaitForBroadcasts(enabledSettings);
+            TestUtils.waitUntil("Waiting for the process " + STUB_PACKAGE_NAME
+                    + " to die", () -> killed.get());
+        } finally {
+            final List<ComponentEnabledSetting> enabledSettings = List.of(
+                    new ComponentEnabledSetting(ACTIVITY_COMPONENT, activityState, DONT_KILL_APP),
+                    new ComponentEnabledSetting(STUB_ACTIVITY_COMPONENT, stubState, 0));
+            setComponentEnabledSettingsAndWaitForBroadcasts(enabledSettings);
+            mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void setComponentEnabledSettings_noStateChanged_noBroadcastReceived() {
+        final int activityState = mPackageManager.getComponentEnabledSetting(ACTIVITY_COMPONENT);
+        final int serviceState = mPackageManager.getComponentEnabledSetting(SERVICE_COMPONENT);
+        final List<ComponentEnabledSetting> enabledSettings = List.of(
+                new ComponentEnabledSetting(ACTIVITY_COMPONENT, activityState, DONT_KILL_APP),
+                new ComponentEnabledSetting(SERVICE_COMPONENT, serviceState, DONT_KILL_APP));
+
+        assertThrows(TimeoutException.class,
+                () -> setComponentEnabledSettingsAndWaitForBroadcasts(enabledSettings));
+    }
+
+    @Test
+    public void clearApplicationUserData_resetComponentEnabledSettings() throws Exception {
+        assertThat(installPackage(MOCK_LAUNCHER_APK)).isTrue();
+        final List<ComponentEnabledSetting> settings = List.of(
+                new ComponentEnabledSetting(RESET_ENABLED_SETTING_ACTIVITY_COMPONENT,
+                        COMPONENT_ENABLED_STATE_ENABLED, 0 /* flags */),
+                new ComponentEnabledSetting(RESET_ENABLED_SETTING_RECEIVER_COMPONENT,
+                        COMPONENT_ENABLED_STATE_ENABLED, 0 /* flags */),
+                new ComponentEnabledSetting(RESET_ENABLED_SETTING_SERVICE_COMPONENT,
+                        COMPONENT_ENABLED_STATE_ENABLED, 0 /* flags */),
+                new ComponentEnabledSetting(RESET_ENABLED_SETTING_PROVIDER_COMPONENT,
+                        COMPONENT_ENABLED_STATE_ENABLED, 0 /* flags */));
+
+        try {
+            mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
+                    android.Manifest.permission.CHANGE_COMPONENT_ENABLED_STATE);
+            // update component enabled settings
+            setComponentEnabledSettingsAndWaitForBroadcasts(settings);
+
+            clearApplicationUserData(MOCK_LAUNCHER_PACKAGE_NAME);
+
+            assertThat(mPackageManager
+                    .getComponentEnabledSetting(RESET_ENABLED_SETTING_ACTIVITY_COMPONENT))
+                    .isEqualTo(COMPONENT_ENABLED_STATE_DEFAULT);
+            assertThat(mPackageManager
+                    .getComponentEnabledSetting(RESET_ENABLED_SETTING_RECEIVER_COMPONENT))
+                    .isEqualTo(COMPONENT_ENABLED_STATE_DEFAULT);
+            assertThat(mPackageManager
+                    .getComponentEnabledSetting(RESET_ENABLED_SETTING_SERVICE_COMPONENT))
+                    .isEqualTo(COMPONENT_ENABLED_STATE_DEFAULT);
+            assertThat(mPackageManager
+                    .getComponentEnabledSetting(RESET_ENABLED_SETTING_PROVIDER_COMPONENT))
+                    .isEqualTo(COMPONENT_ENABLED_STATE_DEFAULT);
+        } finally {
+            mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
+
+    private void setComponentEnabledSettingsAndWaitForBroadcasts(
+            List<ComponentEnabledSetting> enabledSettings)
+            throws InterruptedException, TimeoutException {
+        final List<ComponentName> componentsToWait = enabledSettings.stream()
+                .map(enabledSetting -> enabledSetting.getComponentName())
+                .collect(Collectors.toList());
+        final IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
+        filter.addDataScheme("package");
+        final CountDownLatch latch = new CountDownLatch(1 /* count */);
+        final BroadcastReceiver br = new BroadcastReceiver() {
+            @Override
+            public void onReceive(Context context, Intent intent) {
+                final String packageName = intent.getData() != null
+                        ? intent.getData().getSchemeSpecificPart() : null;
+                final String[] receivedComponents = intent.getStringArrayExtra(
+                        Intent.EXTRA_CHANGED_COMPONENT_NAME_LIST);
+                if (packageName == null || receivedComponents == null) {
+                    return;
+                }
+                for (String componentString : receivedComponents) {
+                    componentsToWait.remove(new ComponentName(packageName, componentString));
+                }
+                if (componentsToWait.isEmpty()) {
+                    latch.countDown();
+                }
+            }
+        };
+        mContext.registerReceiver(br, filter);
+        try {
+            mPackageManager.setComponentEnabledSettings(enabledSettings);
+            if (!latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS)) {
+                throw new TimeoutException("Package changed broadcasts for " + componentsToWait
+                        + " not received in " + TIMEOUT_MS + "ms");
+            }
+            for (ComponentEnabledSetting enabledSetting : enabledSettings) {
+                assertThat(mPackageManager.getComponentEnabledSetting(
+                        enabledSetting.getComponentName()))
+                        .isEqualTo(enabledSetting.getEnabledState());
+            }
+        } finally {
+            mContext.unregisterReceiver(br);
+        }
+    }
+
+    private void clearApplicationUserData(String packageName) {
+        final StringBuilder cmd = new StringBuilder("pm clear --user ");
+        cmd.append(UserHandle.myUserId()).append(" ");
+        cmd.append(packageName);
+        SystemUtil.runShellCommand(cmd.toString());
+    }
+
+    @Test
+    public void testPrebuiltSharedLibraries_existOnDevice() {
+        final List<SharedLibraryInfo> infos =
+                mPackageManager.getSharedLibraries(PackageManager.PackageInfoFlags.of(0)).stream()
+                        .filter(info -> info.isBuiltin() && !info.isNative())
+                        .collect(Collectors.toList());
+        assertThat(infos).isNotEmpty();
+
+        final List<SharedLibraryInfo> fileNotExistInfos = infos.stream()
+                .filter(info -> !(new File(info.getPath()).exists())).collect(
+                        Collectors.toList());
+        assertThat(fileNotExistInfos).isEmpty();
+    }
+
+    @Test
+    public void testInstallUpdate_applicationIsKilled() throws Exception {
+        final Intent intent = new Intent();
+        intent.setComponent(STUB_SERVICE_COMPONENT);
+        final AtomicBoolean killed = new AtomicBoolean();
+        mServiceTestRule.bindService(intent, new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                killed.set(true);
+            }
+        }, Context.BIND_AUTO_CREATE);
+
+        installPackage(STUB_PACKAGE_APK);
+        // The application should be killed after updating.
+        TestUtils.waitUntil("Waiting for the process " + STUB_PACKAGE_NAME + " to die",
+                10 /* timeoutSecond */, () -> killed.get());
+    }
+
+    @Test
+    public void testInstallUpdate_dontKill_applicationIsNotKilled() throws Exception {
+        final Intent intent = new Intent();
+        intent.setComponent(STUB_SERVICE_COMPONENT);
+        final AtomicBoolean killed = new AtomicBoolean();
+        mServiceTestRule.bindService(intent, new ServiceConnection() {
+            @Override
+            public void onServiceConnected(ComponentName name, IBinder service) {
+            }
+
+            @Override
+            public void onServiceDisconnected(ComponentName name) {
+                killed.set(true);
+            }
+        }, Context.BIND_AUTO_CREATE);
+
+        installPackage(STUB_PACKAGE_APK, true /* dontKill */);
+        // The application shouldn't be killed after updating with --dont-kill.
+        assertThrows(AssertionFailedError.class,
+                () -> TestUtils.waitUntil(
+                        "Waiting for the process " + STUB_PACKAGE_NAME + " to die",
+                        10 /* timeoutSecond */, () -> killed.get()));
+    }
+
+    @Test
+    public void testPackageInfoFlags() {
+        final long rawFlags = PackageManager.GET_ACTIVITIES | PackageManager.GET_GIDS
+                | PackageManager.GET_CONFIGURATIONS;
+        assertEquals(rawFlags, PackageManager.PackageInfoFlags.of(rawFlags).getValue());
+    }
+
+    @Test
+    public void testApplicationInfoFlags() {
+        final long rawFlags = PackageManager.GET_SHARED_LIBRARY_FILES
+                | PackageManager.MATCH_UNINSTALLED_PACKAGES;
+        assertEquals(rawFlags, PackageManager.ApplicationInfoFlags.of(rawFlags).getValue());
+    }
+
+    @Test
+    public void testResolveInfoFlags() {
+        final long rawFlags = PackageManager.MATCH_DIRECT_BOOT_AWARE
+                | PackageManager.MATCH_DIRECT_BOOT_UNAWARE
+                | PackageManager.MATCH_SYSTEM_ONLY;
+        assertEquals(rawFlags, PackageManager.ResolveInfoFlags.of(rawFlags).getValue());
+    }
+
+    @Test
+    public void testComponentInfoFlags() {
+        final long rawFlags = PackageManager.GET_META_DATA;
+        assertEquals(rawFlags, PackageManager.ComponentInfoFlags.of(rawFlags).getValue());
+    }
 }
diff --git a/tests/tests/content/src/android/content/pm/cts/ProviderInfoListTest.java b/tests/tests/content/src/android/content/pm/cts/ProviderInfoListTest.java
index 2578058..1a6d78b 100644
--- a/tests/tests/content/src/android/content/pm/cts/ProviderInfoListTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ProviderInfoListTest.java
@@ -33,7 +33,8 @@
     public void testApplicationInfoSquashed() throws Exception {
         final PackageManager pm = getContext().getPackageManager();
         final PackageInfo pi = pm.getPackageInfo(PACKAGE_NAME,
-                PackageManager.GET_PROVIDERS | PackageManager.GET_UNINSTALLED_PACKAGES);
+                PackageManager.PackageInfoFlags.of(
+                        PackageManager.GET_PROVIDERS | PackageManager.GET_UNINSTALLED_PACKAGES));
 
         // Make sure the package contains more than 1 providers.
         assertNotNull(pi);
diff --git a/tests/tests/content/src/android/content/pm/cts/ProviderInfoTest.java b/tests/tests/content/src/android/content/pm/cts/ProviderInfoTest.java
index b99e294..c3a0e83 100644
--- a/tests/tests/content/src/android/content/pm/cts/ProviderInfoTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ProviderInfoTest.java
@@ -19,8 +19,8 @@
 
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.content.pm.ProviderInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ProviderInfo;
 import android.content.res.XmlResourceParser;
 import android.os.Parcel;
 import android.platform.test.annotations.AppModeFull;
@@ -42,8 +42,10 @@
         // Test ProviderInfo()
         new ProviderInfo();
         // Test other methods
-        ApplicationInfo appInfo = pm.getApplicationInfo(PACKAGE_NAME, 0);
-        List<ProviderInfo> providers = pm.queryContentProviders(PACKAGE_NAME, appInfo.uid, 0);
+        ApplicationInfo appInfo = pm.getApplicationInfo(PACKAGE_NAME,
+                PackageManager.ApplicationInfoFlags.of(0));
+        List<ProviderInfo> providers = pm.queryContentProviders(PACKAGE_NAME, appInfo.uid,
+                PackageManager.ComponentInfoFlags.of(0));
         Iterator<ProviderInfo> providerIterator = providers.iterator();
         ProviderInfo current;
         while (providerIterator.hasNext()) {
@@ -58,7 +60,7 @@
     public void testProviderMetaData() {
         final ProviderInfo info = getContext().getPackageManager()
                 .resolveContentProvider("android.content.cts.fileprovider",
-                        PackageManager.GET_META_DATA);
+                        PackageManager.ComponentInfoFlags.of(PackageManager.GET_META_DATA));
         final XmlResourceParser in = info.loadXmlMetaData(
                 getContext().getPackageManager(), "android.support.FILE_PROVIDER_PATHS");
         try {
diff --git a/tests/tests/content/src/android/content/pm/cts/ResourcesHardeningTest.java b/tests/tests/content/src/android/content/pm/cts/ResourcesHardeningTest.java
index 5385577..98de3ee 100644
--- a/tests/tests/content/src/android/content/pm/cts/ResourcesHardeningTest.java
+++ b/tests/tests/content/src/android/content/pm/cts/ResourcesHardeningTest.java
@@ -17,7 +17,10 @@
 package android.content.pm.cts;
 
 import static android.content.pm.cts.PackageManagerShellCommandIncrementalTest.checkIncrementalDeliveryFeature;
+import static android.content.pm.cts.PackageManagerShellCommandIncrementalTest.installNonIncremental;
 import static android.content.pm.cts.PackageManagerShellCommandIncrementalTest.isAppInstalledForUser;
+import static android.content.pm.cts.PackageManagerShellCommandIncrementalTest.setDeviceProperty;
+import static android.content.pm.cts.PackageManagerShellCommandIncrementalTest.setSystemProperty;
 import static android.content.pm.cts.PackageManagerShellCommandIncrementalTest.uninstallPackageSilently;
 
 import static org.hamcrest.core.IsInstanceOf.instanceOf;
@@ -47,6 +50,7 @@
 
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipFile;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -83,6 +87,12 @@
     public void onBefore() throws Exception {
         checkIncrementalDeliveryFeature();
 
+        setDeviceProperty("incfs_default_timeouts", "1:1:1");
+        setDeviceProperty("known_digesters_list", TestUtils.TEST_APP_PACKAGE);
+        setSystemProperty("debug.incremental.always_enable_read_timeouts_for_system_dataloaders",
+                "0");
+        setSystemProperty("debug.incremental.enable_read_timeouts_after_install", "0");
+
         // Set up the blocks that need to be restricted in order to test resource hardening.
         if (!mRestrictedRanges.isEmpty()) {
             return;
@@ -119,6 +129,14 @@
         }
     }
 
+    @After
+    public void onAfter() throws Exception {
+        setSystemProperty("debug.incremental.always_enable_read_timeouts_for_system_dataloaders",
+                "1");
+        setSystemProperty("debug.incremental.enable_read_timeouts_after_install", "1");
+    }
+
+    @LargeTest
     @Test
     public void checkGetIdentifier() throws Exception {
         testIncrementalForeignPackageResources(TestUtils::checkGetIdentifier);
@@ -252,6 +270,8 @@
         try (ShellInstallSession session = startInstallSession()) {
             test.apply(session.getPackageResources(), TestUtils.AssertionType.ASSERT_SUCCESS);
         }
+        // To disable verification.
+        installNonIncremental(TEST_APKS[0]);
         try (ShellInstallSession session = startInstallSession()) {
             session.enableBlockRestrictions();
             test.apply(session.getPackageResources(), TestUtils.AssertionType.ASSERT_READ_FAILURE);
@@ -268,7 +288,8 @@
             session.mSession.getPackageResources();
             session.start(true /* assertSuccess */);
         }
-
+        // To disable verification.
+        installNonIncremental(TEST_APKS[0]);
         try (RemoteTest session = new RemoteTest(startInstallSession(), testName)) {
             session.mSession.getPackageResources();
             session.mSession.enableBlockRestrictions();
@@ -327,7 +348,7 @@
 
             // Start the test app and indicate which test to run.
             try (pidDetector; finishDetector) {
-                final Intent launchIntent = new Intent(Intent.ACTION_VIEW);
+                final Intent launchIntent = new Intent(Intent.ACTION_MAIN);
                 launchIntent.setClassName(TestUtils.TEST_APP_PACKAGE, TestUtils.TEST_ACTIVITY_NAME);
                 launchIntent.putExtra(TestUtils.TEST_NAME_EXTRA_KEY, mTestName);
                 launchIntent.putExtra(TestUtils.TEST_ASSERT_SUCCESS_EXTRA_KEY, assertSuccess);
@@ -374,7 +395,8 @@
         final TestBlockFilter filter = new TestBlockFilter();
         final IncrementalInstallSession.Builder builder = new IncrementalInstallSession.Builder()
                 .addExtraArgs("--user", String.valueOf(getContext().getUserId()),
-                              "-t", "-i", getContext().getPackageName())
+                              "-t", "-i", getContext().getPackageName(),
+                              "--skip-verification")
                 .setLogger(new IncrementalDeviceConnection.Logger())
                 .setBlockFilter(filter);
         for (final String apk : apks) {
diff --git a/tests/tests/content/src/android/content/res/cts/AssetFileDescriptorTest.java b/tests/tests/content/src/android/content/res/cts/AssetFileDescriptorTest.java
index b617164..14580eb 100644
--- a/tests/tests/content/src/android/content/res/cts/AssetFileDescriptorTest.java
+++ b/tests/tests/content/src/android/content/res/cts/AssetFileDescriptorTest.java
@@ -16,13 +16,6 @@
 
 package android.content.res.cts;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.Arrays;
-
 import android.content.res.AssetFileDescriptor;
 import android.os.Bundle;
 import android.os.Parcel;
@@ -30,6 +23,13 @@
 import android.test.AndroidTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.Arrays;
+
 public class AssetFileDescriptorTest extends AndroidTestCase {
     private static final long START_OFFSET = 0;
     private static final long LENGTH = 100;
@@ -114,12 +114,6 @@
         } catch (IOException e) {
             // expect
         }
-        try {
-            mInputStream = mAssetFileDes.createInputStream();
-            fail("Should throw IOException");
-        } catch (IOException e) {
-            // expect
-        }
         mAssetFileDes.close();
         mAssetFileDes = null;
 
@@ -140,12 +134,6 @@
         mInputStream.close();
         mInputStream = null;
         try {
-            mInputStream = mAssetFileDes.createInputStream();
-            fail("Should throw IOException");
-        } catch (IOException e) {
-            // expect
-        }
-        try {
             mOutputStream = mAssetFileDes.createOutputStream();
             fail("Should throw IOException");
         } catch (IOException e) {
diff --git a/tests/tests/content/src/android/content/res/cts/AssetFileDescriptor_AutoCloseInputStreamTest.java b/tests/tests/content/src/android/content/res/cts/AssetFileDescriptor_AutoCloseInputStreamTest.java
index 58af714..106ee4e 100644
--- a/tests/tests/content/src/android/content/res/cts/AssetFileDescriptor_AutoCloseInputStreamTest.java
+++ b/tests/tests/content/src/android/content/res/cts/AssetFileDescriptor_AutoCloseInputStreamTest.java
@@ -152,6 +152,24 @@
         assertEquals(FILE_DATA[2], mInput.read());
     }
 
+    public void testTwoFileDescriptorsWorkIndependently() throws IOException {
+        openInput(0, FILE_LENGTH);
+
+        AssetFileDescriptor fd2 = new AssetFileDescriptor(mFd.getParcelFileDescriptor(),
+                0,
+                FILE_LENGTH);
+        AssetFileDescriptor.AutoCloseInputStream input2 =
+                new AssetFileDescriptor.AutoCloseInputStream(fd2);
+
+        input2.skip(2);
+        input2.read();
+
+        for (int i = 0; i < FILE_LENGTH; i++) {
+            assertEquals(FILE_DATA[i], mInput.read());
+        }
+        assertEquals(FILE_END, mInput.read());
+    }
+
     private void openInput(long startOffset, long length)
             throws IOException {
         if (mFd != null) {
diff --git a/tests/tests/content/src/android/content/res/cts/ConfigTest.java b/tests/tests/content/src/android/content/res/cts/ConfigTest.java
index e07164f..b61dfe8 100644
--- a/tests/tests/content/src/android/content/res/cts/ConfigTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ConfigTest.java
@@ -258,7 +258,8 @@
         mContext = InstrumentationRegistry.getContext();
         final PackageManager pm = mContext.getPackageManager();
         try {
-            ApplicationInfo appInfo = pm.getApplicationInfo(TEST_PACKAGE, 0);
+            ApplicationInfo appInfo = pm.getApplicationInfo(TEST_PACKAGE,
+                    PackageManager.ApplicationInfoFlags.of(0));
             mTargetSdkVersion = appInfo.targetSdkVersion;
         } catch (NameNotFoundException e) {
             fail("Should be able to find application info for this package");
@@ -704,13 +705,8 @@
     
     @Test
     public void testDensity() throws Exception {
-        // have 32, 240 and the default 160 content.
-        // rule is that closest wins, with down scaling (larger content)
-        // being twice as nice as upscaling.
-        // transition at H/2 * (-1 +/- sqrt(1+8L/H))
-        // SO, X < 49 goes to 32
-        // 49 >= X < 182 goes to 160
-        // X >= 182 goes to 240
+        // Have 32, 240 and the default 160 content.
+        // Rule is that next highest wins.
         TotalConfig config = makeClassicConfig();
         config.setProperty(Properties.DENSITY, 2);
         Resources res = config.getResources();
@@ -728,13 +724,6 @@
         config = makeClassicConfig();
         config.setProperty(Properties.DENSITY, 48);
         res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple 32dpi");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag 32dpi"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 49);
-        res = config.getResources();
         checkValue(res, R.configVarying.simple, "simple default");
         checkValue(res, R.configVarying.bag,
                 R.styleable.TestConfig, new String[]{"bag default"});
@@ -749,13 +738,6 @@
         config = makeClassicConfig();
         config.setProperty(Properties.DENSITY, 181);
         res = config.getResources();
-        checkValue(res, R.configVarying.simple, "simple default");
-        checkValue(res, R.configVarying.bag,
-                R.styleable.TestConfig, new String[]{"bag default"});
-
-        config = makeClassicConfig();
-        config.setProperty(Properties.DENSITY, 182);
-        res = config.getResources();
         checkValue(res, R.configVarying.simple, "simple 240dpi");
         checkValue(res, R.configVarying.bag,
                 R.styleable.TestConfig, new String[]{"bag 240dpi"});
diff --git a/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java b/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
index bf43777..84a80dd 100644
--- a/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ConfigurationTest.java
@@ -181,6 +181,87 @@
         assertEquals(1, cfg1.compareTo(cfg2));
     }
 
+    public void testGenerateDiff() {
+        Configuration cfg1 = new Configuration();
+        Configuration cfg2 = new Configuration();
+
+        cfg1.fontScale = 2;
+        cfg2.fontScale = 3;
+
+        cfg1.mcc = 2;
+        cfg2.mcc = 3;
+
+        cfg1.mnc = 2;
+        cfg2.mnc = 3;
+
+        cfg1.locale = new Locale("1", "2", "3");
+        cfg1.locale = new Locale("3", "2", "1");
+
+        cfg1.touchscreen = 2;
+        cfg2.touchscreen = 3;
+
+        cfg1.keyboard = 2;
+        cfg2.keyboard = 3;
+
+        cfg1.keyboardHidden = 2;
+        cfg2.keyboardHidden = 3;
+
+        cfg1.navigation = 2;
+        cfg2.navigation = 3;
+
+        cfg1.navigationHidden = 3;
+        cfg2.navigationHidden = 2;
+
+        cfg1.orientation = 3;
+        cfg2.orientation = 2;
+
+        cfg1.screenLayout = Configuration.SCREENLAYOUT_SIZE_NORMAL
+                | Configuration.SCREENLAYOUT_LAYOUTDIR_RTL
+                | Configuration.SCREENLAYOUT_LONG_NO
+                | Configuration.SCREENLAYOUT_ROUND_YES;
+        cfg2.screenLayout = Configuration.SCREENLAYOUT_SIZE_LARGE
+                | Configuration.SCREENLAYOUT_LAYOUTDIR_LTR
+                | Configuration.SCREENLAYOUT_LONG_YES
+                | Configuration.SCREENLAYOUT_ROUND_NO;
+
+        cfg1.colorMode = Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_YES
+                | Configuration.COLOR_MODE_HDR_NO;
+        cfg2.colorMode = Configuration.COLOR_MODE_WIDE_COLOR_GAMUT_NO
+                | Configuration.COLOR_MODE_HDR_YES;
+
+        cfg1.uiMode = Configuration.UI_MODE_TYPE_WATCH
+                | Configuration.UI_MODE_NIGHT_NO;
+        cfg2.uiMode = Configuration.UI_MODE_TYPE_NORMAL
+                | Configuration.UI_MODE_NIGHT_YES;
+
+        cfg1.screenWidthDp = 500;
+        cfg2.screenWidthDp = 600;
+
+        cfg1.screenHeightDp = 920;
+        cfg2.screenHeightDp = 900;
+
+        cfg1.smallestScreenWidthDp = 500;
+        cfg2.smallestScreenWidthDp = 600;
+
+        cfg1.densityDpi = 200;
+        cfg2.densityDpi = 220;
+
+        cfg1.assetsSeq = 4;
+        cfg2.assetsSeq = 5;
+
+        cfg1.fontWeightAdjustment = 2;
+        cfg1.fontWeightAdjustment = 3;
+
+        Configuration delta = Configuration.generateDelta(cfg1, cfg2);
+        assertEquals(cfg2, delta);
+
+        delta = Configuration.generateDelta(cfg2, cfg1);
+        assertEquals(cfg1, delta);
+
+        delta = Configuration.generateDelta(cfg1, cfg1);
+        assertEquals(new Configuration(), delta);
+    }
+
     public void testDescribeContents() {
         assertEquals(0, mConfigDefault.describeContents());
     }
diff --git a/tests/tests/content/src/android/content/res/cts/ResourcesTest.java b/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
index 45b2216..99dfe58 100644
--- a/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
+++ b/tests/tests/content/src/android/content/res/cts/ResourcesTest.java
@@ -1043,4 +1043,27 @@
         Typeface typeface = mResources.getFont(R.font.sample_downloadable_font);
         assertEquals(typeface, Typeface.create("sans-serif", Typeface.NORMAL));
     }
+
+    public void testThemeCompare() {
+        Resources.Theme t1 = mResources.newTheme();
+        Resources.Theme t2 = mResources.newTheme();
+        assertTrue(t1.equals(t1));
+        assertTrue(t1.equals(t2));
+        assertTrue(t1.hashCode() == t2.hashCode());
+        assertFalse(t1.equals(null));
+        assertFalse(t1.equals(this));
+
+        t1.applyStyle(1, false);
+        assertFalse(t1.equals(t2));
+        assertFalse(t1.hashCode() == t2.hashCode());
+        t2.applyStyle(1, false);
+        assertTrue(t1.equals(t2));
+        assertTrue(t1.hashCode() == t2.hashCode());
+        t1.applyStyle(2, true);
+        assertFalse(t1.hashCode() == t2.hashCode());
+        assertFalse(t1.equals(t2));
+        t2.applyStyle(2, false);
+        assertFalse(t1.equals(t2));
+        assertFalse(t1.hashCode() == t2.hashCode());
+    }
 }
diff --git a/tests/tests/content/src/android/content/wm/cts/ContextRegisterComponentCallbacksTest.java b/tests/tests/content/src/android/content/wm/cts/ContextRegisterComponentCallbacksTest.java
new file mode 100644
index 0000000..df20447
--- /dev/null
+++ b/tests/tests/content/src/android/content/wm/cts/ContextRegisterComponentCallbacksTest.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright (C) 2022 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 android.content.wm.cts;
+
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.app.Activity;
+import android.app.WindowConfiguration;
+import android.content.ComponentCallbacks;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.res.Configuration;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.platform.test.annotations.Presubmit;
+import android.util.DisplayMetrics;
+import android.view.Display;
+
+import androidx.annotation.NonNull;
+import androidx.test.filters.SmallTest;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Test for {@link Context#registerComponentCallbacks(ComponentCallbacks)}}.
+ * <p>Test context type listed below:</p>
+ * <ul>
+ *     <li>{@link Activity} - The {@link ComponentCallbacks} should be added to Activity.</li>
+ *     <li>Context derived from {@link Activity}
+ *     - The The {@link ComponentCallbacks} should be added to
+ *     {@link Context#getApplicationContext() Application Context}.</li>
+ *     <li>{@link ContextWrapper} - get The {@link ComponentCallbacks} should be added to
+ *     {@link ContextWrapper#getBaseContext() base Context}.</li>
+ *     <li>Context via {@link Context#createWindowContext(int, Bundle)}
+ *     - The {@link ComponentCallbacks} should be added to the Window Context.</li>
+ * </ul>
+ *
+ * <p>Build/Install/Run:
+ *     atest CtsContentTestCases:ContextRegisterComponentCallbacksTest
+ */
+@Presubmit
+@SmallTest
+public class ContextRegisterComponentCallbacksTest extends ContextTestBase {
+    private Context mTestContext;
+    private TestComponentCallbacks mTestCallbacks;
+
+    @Before
+    public void setUp() {
+        super.setUp();
+        mTestCallbacks = new TestComponentCallbacks();
+    }
+
+    @After
+    public void tearDown() {
+        mTestContext.unregisterComponentCallbacks(mTestCallbacks);
+    }
+
+    /**
+     * Verifies if {@link ComponentCallbacks} is added to the {@link Activity}
+     * via {@link Activity#registerComponentCallbacks(ComponentCallbacks)}.
+     */
+    @Test
+    public void testRegisterComponentCallbacksOnActivity() throws Throwable {
+        final Activity activity = getTestActivity();
+        initializeTestContext(activity);
+
+        final Configuration config = new Configuration();
+        config.fontScale = 1.2f;
+        config.windowConfiguration.setWindowingMode(
+                WindowConfiguration.WINDOWING_MODE_FREEFORM);
+        config.windowConfiguration.setBounds(new Rect(0, 0, 100, 100));
+
+        mActivityRule.runOnUiThread(() -> activity.onConfigurationChanged(config));
+
+        mTestCallbacks.waitForConfigChanged();
+
+        assertWithMessage("The dispatched Configuration must be the same")
+                .that(mTestCallbacks.mConfiguration).isEqualTo(config);
+
+    }
+
+    /**
+     * Verifies if {@link ComponentCallbacks} is added to the
+     * {@link ContextWrapper#getBaseContext() base Context of ContextWrapper}
+     * via {@link ContextWrapper#registerComponentCallbacks(ComponentCallbacks)}.
+     */
+    @Test
+    public void testRegisterComponentCallbacksOnContextWrapper() throws Throwable {
+        final Activity activity = getTestActivity();
+        final Context contextWrapper = new ContextWrapper(activity);
+        initializeTestContext(contextWrapper);
+
+        final Configuration config = new Configuration();
+        config.fontScale = 1.2f;
+        config.windowConfiguration.setWindowingMode(
+                WindowConfiguration.WINDOWING_MODE_FREEFORM);
+        config.windowConfiguration.setBounds(new Rect(0, 0, 100, 100));
+
+        // Make the Activity dispatch #onConfigurationChanged and verify if the
+        // ComponentCallbacks receives the config change.
+        mActivityRule.runOnUiThread(() -> activity.onConfigurationChanged(config));
+
+        mTestCallbacks.waitForConfigChanged();
+
+        assertWithMessage("The dispatched Configuration must be the same")
+                .that(mTestCallbacks.mConfiguration).isEqualTo(config);
+    }
+
+    /**
+     * Verifies if {@link ComponentCallbacks} is added to {@link Context#getApplicationContext()}
+     * for Context without overriding
+     * {@link Context#registerComponentCallbacks(ComponentCallbacks)}.
+     */
+    @Test
+    public void testRegisterComponentCallbacksOnContextWithoutOverriding() throws Throwable {
+        final Activity activity = getTestActivity();
+        final Context contextWithoutOverriding = activity.createAttributionContext("");
+        initializeTestContext(contextWithoutOverriding);
+
+        final Configuration config = new Configuration();
+        config.fontScale = 1.2f;
+        config.windowConfiguration.setWindowingMode(
+                WindowConfiguration.WINDOWING_MODE_FREEFORM);
+        config.windowConfiguration.setBounds(new Rect(0, 0, 100, 100));
+
+        mActivityRule.runOnUiThread(() -> activity.onConfigurationChanged(config));
+
+        assertThat(mTestCallbacks.mLatch.await(1, TimeUnit.SECONDS)).isFalse();
+
+        assertWithMessage("#onConfigurationChanged must not dispatched.")
+                .that(mTestCallbacks.mConfiguration).isNull();
+    }
+
+    /**
+     * Verifies if {@link ComponentCallbacks} is added to the Window Context
+     * via {@link Activity#registerComponentCallbacks(ComponentCallbacks)}.
+     */
+    @Test
+    public void testRegisterComponentCallbacksOnWindowContext() throws Throwable {
+        // Create a WindowContext on secondary display.
+        final Display secondaryDisplay = getSecondaryDisplay();
+        final Context windowContext = mApplicationContext.createWindowContext(secondaryDisplay,
+                TYPE_APPLICATION_OVERLAY, null /* options */);
+        initializeTestContext(windowContext);
+
+        final DisplayMetrics displayMetrics = new DisplayMetrics();
+        secondaryDisplay.getMetrics(displayMetrics);
+
+        final int newWidth = displayMetrics.widthPixels + 10;
+        final int newHeight = displayMetrics.heightPixels + 10;
+        // Resize display to update WindowContext's configuration.
+        resizeSecondaryDisplay(newWidth, newHeight, displayMetrics.densityDpi);
+
+        mTestCallbacks.waitForConfigChanged();
+
+        final Rect bounds = mTestCallbacks.mConfiguration.windowConfiguration.getBounds();
+        assertWithMessage("WindowContext width must match resized display")
+                .that(bounds.width()).isEqualTo(newWidth);
+        assertWithMessage("WindowContext height must match resized display")
+                .that(bounds.height()).isEqualTo(newHeight);
+    }
+
+    private void initializeTestContext(Context context) {
+        mTestContext = context;
+        mTestContext.registerComponentCallbacks(mTestCallbacks);
+    }
+
+    private static class TestComponentCallbacks implements ComponentCallbacks {
+        private Configuration mConfiguration;
+        private final CountDownLatch mLatch = new CountDownLatch(1);
+
+        private void waitForConfigChanged() {
+            try {
+                assertThat(mLatch.await(4, TimeUnit.SECONDS)).isTrue();
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+        }
+
+        @Override
+        public void onConfigurationChanged(@NonNull Configuration newConfig) {
+            mConfiguration = newConfig;
+            mLatch.countDown();
+        }
+
+        @Override
+        public void onLowMemory() {}
+    }
+}
diff --git a/tests/tests/content/src/android/content/wm/cts/ContextTestBase.java b/tests/tests/content/src/android/content/wm/cts/ContextTestBase.java
index 1bcbd40..14c43a6 100644
--- a/tests/tests/content/src/android/content/wm/cts/ContextTestBase.java
+++ b/tests/tests/content/src/android/content/wm/cts/ContextTestBase.java
@@ -55,20 +55,20 @@
 public class ContextTestBase {
     public Context mApplicationContext = ApplicationProvider.getApplicationContext();
     private Display mDefaultDisplay;
-    private Display mSecondaryDisplay;
+    private VirtualDisplay mSecondaryDisplay;
 
     @Rule
     public final ActivityTestRule<MockActivity> mActivityRule =
             new ActivityTestRule<>(MockActivity.class);
 
     @Before
-    public final void setUp() {
+    public void setUp() {
         final DisplayManager dm = mApplicationContext.getSystemService(DisplayManager.class);
         mDefaultDisplay = dm.getDisplay(DEFAULT_DISPLAY);
         mSecondaryDisplay = createSecondaryDisplay();
     }
 
-    private Display createSecondaryDisplay() {
+    private VirtualDisplay createSecondaryDisplay() {
         final DisplayManager displayManager = mApplicationContext
                 .getSystemService(DisplayManager.class);
         final int width = 800;
@@ -79,7 +79,7 @@
         VirtualDisplay virtualDisplay = displayManager.createVirtualDisplay(
                 ContextTest.class.getName(), width, height, density, reader.getSurface(),
                 VIRTUAL_DISPLAY_FLAG_PUBLIC | VIRTUAL_DISPLAY_FLAG_OWN_CONTENT_ONLY);
-        return virtualDisplay.getDisplay();
+        return virtualDisplay;
     }
 
     public Display getDefaultDisplay() {
@@ -87,7 +87,11 @@
     }
 
     public Display getSecondaryDisplay() {
-        return mSecondaryDisplay;
+        return mSecondaryDisplay.getDisplay();
+    }
+
+    public void resizeSecondaryDisplay(int width, int height, int densityDpi) {
+        mSecondaryDisplay.resize(width, height, densityDpi);
     }
 
     public Context createWindowContext() {
diff --git a/tests/tests/cronet/Android.bp b/tests/tests/cronet/Android.bp
index 947d5c0..fc8ec7f 100644
--- a/tests/tests/cronet/Android.bp
+++ b/tests/tests/cronet/Android.bp
@@ -34,7 +34,7 @@
     test_suites: [
         "cts",
         "general-tests",
-        "mts",
+        "mts-cronet",
     ],
 
 }
diff --git a/tests/tests/database/src/android/database/cts/CursorWindowTest.java b/tests/tests/database/src/android/database/cts/CursorWindowTest.java
index cae9d51..9d7558c 100644
--- a/tests/tests/database/src/android/database/cts/CursorWindowTest.java
+++ b/tests/tests/database/src/android/database/cts/CursorWindowTest.java
@@ -25,6 +25,7 @@
 
 import android.database.CharArrayBuffer;
 import android.database.CursorWindow;
+import android.database.CursorWindowAllocationException;
 import android.database.MatrixCursor;
 import android.database.sqlite.SQLiteException;
 import android.os.Parcel;
@@ -438,15 +439,11 @@
         Exception actual = null;
         try {
             new CursorWindow("test", -1);
-        } catch (RuntimeException caught) {
+        } catch (IllegalArgumentException caught) {
             Log.i(TAG, "Received: " + caught);
-            actual = caught;
-            // CursorWindowAllocationException is hidden, so let's just check the message.
-            if (actual.getMessage().contains("Could not allocate CursorWindow")) {
-                return;
-            }
+            return;
         }
-        fail("Didn't catch CursorWindowAllocationException: actual=" + actual);
+        fail("Didn't catch IllegalArgumentException: actual=" + actual);
     }
 
     @Test
@@ -454,17 +451,26 @@
         Exception actual = null;
         try {
             CursorWindow.CREATOR.createFromParcel(Parcel.obtain());
-        } catch (RuntimeException caught) {
+        } catch (CursorWindowAllocationException caught) {
             Log.i(TAG, "Received: " + caught);
-            actual = caught;
-            // CursorWindowAllocationException is hidden, so let's just check the message.
-            if (actual.getMessage().contains("Could not create CursorWindow")) {
-                return;
-            }
+            return;
         }
         fail("Didn't catch CursorWindowAllocationException: actual=" + actual);
     }
 
+    @Test
+    public void testCursorWindowAllocationException() {
+        String exceptionDescription = "description test";
+        CursorWindowAllocationException newException =
+                new CursorWindowAllocationException(exceptionDescription);
+        assertEquals(exceptionDescription, newException.getMessage());
+        try {
+            throw newException;
+        } catch (CursorWindowAllocationException exception) {
+            assertEquals(exceptionDescription, exception.getMessage());
+        }
+    }
+
     private class MockCursorWindow extends CursorWindow {
         private boolean mHasReleasedAllReferences = false;
 
diff --git a/tests/tests/database/src/android/database/sqlite/cts/DatabaseStatementTest.java b/tests/tests/database/src/android/database/sqlite/cts/DatabaseStatementTest.java
index 247039a..31180c0 100644
--- a/tests/tests/database/src/android/database/sqlite/cts/DatabaseStatementTest.java
+++ b/tests/tests/database/src/android/database/sqlite/cts/DatabaseStatementTest.java
@@ -90,6 +90,19 @@
     }
 
     @MediumTest
+    public void testExecutePragmaStatement() {
+        SQLiteStatement statement = mDatabase.compileStatement("PRAGMA busy_timeout = 12000");
+        statement.execute();
+        statement.close();
+
+        // Assert connection has busy timeout configured
+        try (Cursor c = mDatabase.rawQuery("PRAGMA busy_timeout;", null)) {
+            assertTrue(c.moveToNext());
+            assertEquals(c.getInt(0), 12000);
+        }
+    }
+
+    @MediumTest
     public void testSimpleQuery() throws Exception {
         mDatabase.execSQL("CREATE TABLE test (num INTEGER NOT NULL, str TEXT NOT NULL);");
         mDatabase.execSQL("INSERT INTO test VALUES (1234, 'hello');");
diff --git a/tests/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseTest.java b/tests/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseTest.java
index 81d3657d..935bd49 100644
--- a/tests/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseTest.java
+++ b/tests/tests/database/src/android/database/sqlite/cts/SQLiteDatabaseTest.java
@@ -25,6 +25,7 @@
 import android.database.Cursor;
 import android.database.DatabaseUtils;
 import android.database.SQLException;
+import android.database.sqlite.SQLiteCantOpenDatabaseException;
 import android.database.sqlite.SQLiteCursor;
 import android.database.sqlite.SQLiteCursorDriver;
 import android.database.sqlite.SQLiteDatabase;
@@ -135,6 +136,70 @@
         db.close();
     }
 
+    public void testOpenDatabase_fail_no_path() {
+        CursorFactory factory = MockSQLiteCursor::new;
+        SQLiteDatabase db = null;
+        try {
+            db = SQLiteDatabase.openDatabase("filename.db",
+                    factory, SQLiteDatabase.CREATE_IF_NECESSARY);
+        } catch (SQLiteCantOpenDatabaseException e) {
+            assertTrue(
+                    "Wrong exception message: " + e.getMessage(),
+                    e.getMessage().contains("Directory not specified in the file path"));
+            assertFalse(
+                    "Wrong exception message: " + e.getMessage(),
+                    e.getMessage().contains("Unknown reason"));
+        } finally {
+            if (db != null) {
+                db.close();
+            }
+        }
+    }
+
+    public void testOpenDatabase_fail_root_path_create_if_necessary() {
+        CursorFactory factory = MockSQLiteCursor::new;
+        SQLiteDatabase db = null;
+        try {
+            db = SQLiteDatabase.openDatabase("/filename.db",
+                    factory, SQLiteDatabase.CREATE_IF_NECESSARY);
+        } catch (SQLiteCantOpenDatabaseException e) {
+            assertTrue(
+                    "Wrong exception message: " + e.getMessage(),
+                    e.getMessage().contains(
+                            "File /filename.db doesn't exist and CREATE_IF_NECESSARY is set"));
+            assertFalse(
+                    "Wrong exception message: " + e.getMessage(),
+                    e.getMessage().contains("Unknown reason"));
+        } finally {
+            if (db != null) {
+                db.close();
+            }
+        }
+    }
+
+    public void testOpenDatabase_fail_root_path_no_create() {
+        CursorFactory factory = MockSQLiteCursor::new;
+        SQLiteDatabase db = null;
+        try {
+            db = SQLiteDatabase.openDatabase("/filename.db",
+                    factory, 0);
+        } catch (SQLiteCantOpenDatabaseException e) {
+            assertTrue(
+                    "Wrong exception message: " + e.getMessage(),
+                    e.getMessage().contains("File /filename.db doesn't exist"));
+            assertFalse(
+                    "Wrong exception message: " + e.getMessage(),
+                    e.getMessage().contains("CREATE_IF_NECESSARY"));
+            assertFalse(
+                    "Wrong exception message: " + e.getMessage(),
+                    e.getMessage().contains("Unknown reason"));
+        } finally {
+            if (db != null) {
+                db.close();
+            }
+        }
+    }
+
     public void testDeleteDatabase() throws IOException {
         File dbFile = new File(mDatabaseDir, "database_test12345678.db");
         File journalFile = new File(dbFile.getPath() + "-journal");
@@ -560,6 +625,16 @@
         }
     }
 
+    public void testExecPerConnectionSQLPragma() {
+        mDatabase.execPerConnectionSQL("PRAGMA busy_timeout = 12000;", null);
+
+        // Assert connection has busy timeout configured
+        try (Cursor c = mDatabase.rawQuery("PRAGMA busy_timeout;", null)) {
+            assertTrue(c.moveToNext());
+            assertEquals(c.getInt(0), 12000);
+        }
+    }
+
     public void testFindEditTable() {
         String tables = "table1 table2 table3";
         assertEquals("table1", SQLiteDatabase.findEditTable(tables));
diff --git a/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiPermissionTests.java b/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiPermissionTests.java
index 6d77ebb..c378f48 100644
--- a/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiPermissionTests.java
+++ b/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiPermissionTests.java
@@ -66,6 +66,7 @@
         // setters without write permission
         trySetPropertyWithoutWritePermission(violations);
         trySetPropertiesWithoutWritePermission(violations);
+        tryDeletePropertyWithoutWritePermission(violations);
 
         // getters without read permission
         tryGetPropertyWithoutReadPermission(violations);
@@ -120,6 +121,7 @@
         // setters without write permission
         trySetPropertyWithoutWritePermission(violations);
         trySetPropertiesWithoutWritePermission(violations);
+        tryDeletePropertyWithoutWritePermission(violations);
 
         // getters with read permission
         tryGetPropertyWithReadPermission(violations);
@@ -278,6 +280,15 @@
         }
     }
 
+    private void tryDeletePropertyWithoutWritePermission(StringBuilder violations) {
+        try {
+            DeviceConfig.deleteProperty(NAMESPACE, KEY);
+            violations.append("DeviceConfig.deleteProperty() must not be accessible without "
+                    + "WRITE_DEVICE_CONFIG permission.\n");
+        } catch (SecurityException e) {
+        }
+    }
+
     private void tryGetPropertyWithoutReadPermission(StringBuilder violations) {
         try {
             DeviceConfig.getProperty(NAMESPACE, KEY);
diff --git a/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiTests.java b/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiTests.java
index c1cbbad..cacaa29 100644
--- a/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiTests.java
+++ b/tests/tests/deviceconfig/src/android/deviceconfig/cts/DeviceConfigApiTests.java
@@ -20,6 +20,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assume.assumeTrue;
 import static org.junit.Assert.fail;
 
@@ -816,6 +817,106 @@
                 + " getProperty() when property is not null", DEFAULT_FLOAT, result, 0.0f);
     }
 
+    @Test
+    public void testDeleteProperty_nullNamespace() {
+        try {
+            DeviceConfig.deleteProperty(null, KEY1);
+            fail("DeviceConfig.deleteProperty() with null namespace must result in "
+                    + "NullPointerException");
+        } catch (NullPointerException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void testDeleteProperty_nullName() {
+        try {
+            DeviceConfig.deleteProperty(NAMESPACE1, null);
+            fail("DeviceConfig.deleteProperty() with null name must result in "
+                    + "NullPointerException");
+        } catch (NullPointerException e) {
+            // expected
+        }
+    }
+
+    @Test
+    public void testDeletePropertyString() {
+        setPropertiesAndAssertSuccessfulChange(NAMESPACE1, KEY1, VALUE1);
+        deletePropertyAndAssertSuccessfulChange(NAMESPACE1, KEY1);
+        assertEquals("DeviceConfig.Properties.getString() must return default value if "
+                + "property is deleted", DEFAULT_VALUE,
+                DeviceConfig.getProperties(NAMESPACE1, KEY1).getString(KEY1, DEFAULT_VALUE));
+    }
+
+    @Test
+    public void testDeletePropertyBoolean() {
+        setPropertiesAndAssertSuccessfulChange(NAMESPACE1, KEY1, String.valueOf(BOOLEAN_TRUE));
+        deletePropertyAndAssertSuccessfulChange(NAMESPACE1, KEY1);
+        assertEquals("DeviceConfig.Properties.getBoolean() must return default value if "
+                        + "property is deleted", BOOLEAN_FALSE,
+                DeviceConfig.getProperties(NAMESPACE1, KEY1).getBoolean(KEY1,
+                        DEFAULT_BOOLEAN_FALSE));
+    }
+
+    @Test
+    public void testDeletePropertyInt() {
+        setPropertiesAndAssertSuccessfulChange(NAMESPACE1, KEY1, String.valueOf(VALID_INT));
+        deletePropertyAndAssertSuccessfulChange(NAMESPACE1, KEY1);
+        assertEquals("DeviceConfig.Properties.getInt() must return default value if "
+                        + "property is deleted", DEFAULT_INT,
+                DeviceConfig.getProperties(NAMESPACE1, KEY1).getInt(KEY1, DEFAULT_INT));
+    }
+
+    @Test
+    public void testDeletePropertyLong() {
+        setPropertiesAndAssertSuccessfulChange(NAMESPACE1, KEY1, String.valueOf(VALID_LONG));
+        deletePropertyAndAssertSuccessfulChange(NAMESPACE1, KEY1);
+        assertEquals("DeviceConfig.Properties.getLong() must return default value if "
+                        + "property is deleted", DEFAULT_LONG,
+                DeviceConfig.getProperties(NAMESPACE1, KEY1).getLong(KEY1, DEFAULT_LONG));
+    }
+
+    @Test
+    public void testDeletePropertyFloat() {
+        setPropertiesAndAssertSuccessfulChange(NAMESPACE1, KEY1, String.valueOf(VALID_FLOAT));
+        deletePropertyAndAssertSuccessfulChange(NAMESPACE1, KEY1);
+        assertEquals("DeviceConfig.Properties.getString() must return default value if "
+                        + "property is deleted", DEFAULT_FLOAT,
+                DeviceConfig.getProperties(NAMESPACE1, KEY1).getFloat(KEY1, DEFAULT_FLOAT), 0.0f);
+    }
+
+    @Test
+    public void testDeleteProperty_withNonExistingProperty() {
+        assertNull(DeviceConfig.getProperty(NAMESPACE1, KEY1));
+        // Test that deletion returns true when the key doesn't exist
+        deletePropertyAndAssertSuccessfulChange(NAMESPACE1, KEY1);
+    }
+
+    @Test
+    public void testDeleteProperty_withUndeletedProperty() {
+        setPropertiesAndAssertSuccessfulChange(NAMESPACE1, KEY1, VALUE1);
+        setPropertiesAndAssertSuccessfulChange(NAMESPACE1, KEY2, VALUE2);
+        assertEquals(VALUE1, DeviceConfig.getProperty(NAMESPACE1, KEY1));
+        assertEquals(VALUE2, DeviceConfig.getProperty(NAMESPACE1, KEY2));
+        final Properties propertiesBeforeDeletion = DeviceConfig.getProperties(
+                NAMESPACE1, KEY1, KEY2);
+        assertEquals(VALUE1, propertiesBeforeDeletion.getString(KEY1, DEFAULT_VALUE));
+        assertEquals(VALUE2, propertiesBeforeDeletion.getString(KEY2, DEFAULT_VALUE));
+        // Only delete one property, leaving another one undeleted
+        final Properties propertiesAfterDeletion = deletePropertyAndAssertSuccessfulChange(
+                NAMESPACE1, KEY1);
+        final String result = DeviceConfig.getString(NAMESPACE1, KEY1, DEFAULT_VALUE);
+        assertEquals("DeviceConfig.getString() must return default value if property is "
+                + "deleted", DEFAULT_VALUE, result);
+        assertNull("DeviceConfig.getProperty() must return null if property is deleted",
+                DeviceConfig.getProperty(NAMESPACE1, KEY1));
+        assertEquals(VALUE2, DeviceConfig.getProperty(NAMESPACE1, KEY2));
+        assertEquals("DeviceConfig.Properties.getString() must return default value if "
+                + "property is deleted", DEFAULT_VALUE, propertiesAfterDeletion.getString(KEY1,
+                DEFAULT_VALUE));
+        assertEquals(VALUE2, propertiesBeforeDeletion.getString(KEY2, DEFAULT_VALUE));
+    }
+
     /**
      * Test that properties listener is successfully registered and provides callbacks on value
      * change when DeviceConfig.setProperty is called.
@@ -837,6 +938,16 @@
     }
 
     /**
+     * Test that properties listener is successfully registered and provides callbacks on value
+     * change when DeviceConfig.deleteProperty is called.
+     */
+    @Test
+    public void testPropertiesListener_deleteProperty() {
+        setPropertiesAndAssertSuccessfulChange(NAMESPACE1, KEY1, VALUE1);
+        deletePropertyAndAssertSuccessfulChange(NAMESPACE1, KEY1);
+    }
+
+    /**
      * Test that two properties listeners subscribed to the same namespace are successfully
      * registered and unregistered while receiving correct updates in all states.
      */
@@ -1082,6 +1193,26 @@
         return propertiesUpdate.properties;
     }
 
+    private Properties deletePropertyAndAssertSuccessfulChange(String namespace, String name) {
+        final List<PropertyUpdate> receivedUpdates = new ArrayList<>();
+        OnPropertiesChangedListener changeListener = createOnPropertiesChangedListener(receivedUpdates);
+
+        DeviceConfig.addOnPropertiesChangedListener(namespace, EXECUTOR, changeListener);
+
+        assertTrue(DeviceConfig.deleteProperty(namespace, name));
+        assertNull("DeviceConfig.getProperty() must return null if property is deleted",
+                DeviceConfig.getProperty(namespace, name));
+        waitForListenerUpdateOrTimeout(receivedUpdates, 1);
+        DeviceConfig.removeOnPropertiesChangedListener(changeListener);
+
+        assertEquals("Failed to receive update to OnPropertiesChangedListener",
+                receivedUpdates.size(), 1);
+        PropertyUpdate propertiesUpdate = receivedUpdates.get(0);
+        propertiesUpdate.assertEqual(namespace, name, null);
+
+        return propertiesUpdate.properties;
+    }
+
     private void nullifyProperty(String namespace, String key) {
         if (DeviceConfig.getString(namespace, key, null) != null) {
             setPropertiesAndAssertSuccessfulChange(namespace, key, null);
diff --git a/tests/tests/display/src/android/display/cts/BrightnessTest.java b/tests/tests/display/src/android/display/cts/BrightnessTest.java
index 95c7b5e..59f008e 100644
--- a/tests/tests/display/src/android/display/cts/BrightnessTest.java
+++ b/tests/tests/display/src/android/display/cts/BrightnessTest.java
@@ -22,6 +22,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeNotNull;
 import static org.junit.Assume.assumeTrue;
 
 import android.Manifest;
@@ -66,12 +67,14 @@
     private DisplayManager mDisplayManager;
     private PowerManager.WakeLock mWakeLock;
     private Context mContext;
+    private PackageManager mPackageManager;
 
     @Before
     public void setUp() {
         mContext = InstrumentationRegistry.getContext();
         mDisplayManager = mContext.getSystemService(DisplayManager.class);
         PowerManager pm = mContext.getSystemService(PowerManager.class);
+        mPackageManager = mContext.getPackageManager();
 
         mWakeLock = pm.newWakeLock(
                 PowerManager.SCREEN_BRIGHT_WAKE_LOCK | PowerManager.ACQUIRE_CAUSES_WAKEUP,
@@ -91,6 +94,9 @@
 
     @Test
     public void testBrightnessSliderTracking() throws InterruptedException {
+        // Only run if we have a valid ambient light sensor.
+        assumeTrue(mPackageManager.hasSystemFeature(PackageManager.FEATURE_SENSOR_LIGHT));
+
         // Don't run as there is no app that has permission to access slider usage.
         assumeTrue(
                 numberOfSystemAppsWithPermission(Manifest.permission.BRIGHTNESS_SLIDER_USAGE) > 0);
@@ -174,6 +180,9 @@
 
     @Test
     public void testNoColorSampleData() throws InterruptedException {
+        // Only run if we have a valid ambient light sensor.
+        assumeTrue(mPackageManager.hasSystemFeature(PackageManager.FEATURE_SENSOR_LIGHT));
+
           // Don't run as there is no app that has permission to access slider usage.
         assumeTrue(
                 numberOfSystemAppsWithPermission(Manifest.permission.BRIGHTNESS_SLIDER_USAGE) > 0);
@@ -254,6 +263,9 @@
 
     @Test
     public void testSetGetSimpleCurve() {
+        // Only run if we have a valid ambient light sensor.
+        assumeTrue(mPackageManager.hasSystemFeature(PackageManager.FEATURE_SENSOR_LIGHT));
+
         // Don't run as there is no app that has permission to push curves.
         assumeTrue(numberOfSystemAppsWithPermission(
                 Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) > 0);
@@ -261,6 +273,8 @@
         grantPermission(Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS);
 
         BrightnessConfiguration defaultConfig = mDisplayManager.getDefaultBrightnessConfiguration();
+        // This might be null, meaning that the device doesn't support brightness configuration
+        assumeNotNull(defaultConfig);
 
         BrightnessConfiguration config =
                 new BrightnessConfiguration.Builder(
@@ -330,6 +344,9 @@
 
     @Test
     public void testSliderEventsReflectCurves() throws InterruptedException {
+        // Only run if we have a valid ambient light sensor.
+        assumeTrue(mPackageManager.hasSystemFeature(PackageManager.FEATURE_SENSOR_LIGHT));
+
         // Don't run as there is no app that has permission to access slider usage.
         assumeTrue(
                 numberOfSystemAppsWithPermission(Manifest.permission.BRIGHTNESS_SLIDER_USAGE) > 0);
@@ -426,6 +443,9 @@
 
     @Test
     public void testSetAndGetPerDisplay() throws InterruptedException{
+        // Only run if we have a valid ambient light sensor.
+        assumeTrue(mPackageManager.hasSystemFeature(PackageManager.FEATURE_SENSOR_LIGHT));
+
         assumeTrue(numberOfSystemAppsWithPermission(
                 Manifest.permission.CONFIGURE_DISPLAY_BRIGHTNESS) > 0);
 
diff --git a/tests/tests/display/src/android/display/cts/DefaultDisplayModeTest.java b/tests/tests/display/src/android/display/cts/DefaultDisplayModeTest.java
new file mode 100644
index 0000000..71d8513
--- /dev/null
+++ b/tests/tests/display/src/android/display/cts/DefaultDisplayModeTest.java
@@ -0,0 +1,468 @@
+/*
+ * Copyright (C) 2021 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 android.display.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import android.Manifest;
+import android.content.Context;
+import android.graphics.Point;
+import android.hardware.display.DisplayManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.Display;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.AdoptShellPermissionsRule;
+import com.android.compatibility.common.util.DisplayUtil;
+import com.android.compatibility.common.util.FeatureUtil;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.time.Duration;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.function.Predicate;
+
+@RunWith(AndroidJUnit4.class)
+public class DefaultDisplayModeTest {
+    private final static int DISPLAY_CHANGE_TIMEOUT_SECS = 3;
+
+    private DisplayManager mDisplayManager;
+    private Display mDefaultDisplay;
+    private Display.Mode mOriginalGlobalDisplayModeSettings;
+    private Display.Mode mOriginalDisplaySpecificModeSettings;
+
+    @Rule
+    public AdoptShellPermissionsRule mAdoptShellPermissionsRule = new AdoptShellPermissionsRule(
+            InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+            Manifest.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE,
+            Manifest.permission.HDMI_CEC);
+
+    @Before
+    public void setUp() throws Exception {
+        Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        assumeTrue("Need an Android TV device to run this test.", FeatureUtil.isTV());
+        assertTrue("Physical display is expected.", DisplayUtil.isDisplayConnected(context));
+
+        mDisplayManager = context.getSystemService(DisplayManager.class);
+        mDefaultDisplay = mDisplayManager.getDisplay(Display.DEFAULT_DISPLAY);
+        cacheOriginalUserPreferredModeSetting();
+        mDisplayManager.clearGlobalUserPreferredDisplayMode();
+        mDefaultDisplay.clearUserPreferredDisplayMode();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        restoreOriginalDisplayModeSettings();
+    }
+
+    @Test
+    public void testSetUserPreferredDisplayModeThrowsExceptionWithInvalidMode() {
+        assertThrows(
+                "The mode is invalid. Width, height and refresh rate should be positive.",
+                IllegalArgumentException.class,
+                () -> mDisplayManager.setGlobalUserPreferredDisplayMode(
+                        new Display.Mode(-1, 1080, 120.0f)));
+
+        assertThrows(
+                "The mode is invalid. Width, height and refresh rate should be positive.",
+                IllegalArgumentException.class,
+                () -> mDisplayManager.setGlobalUserPreferredDisplayMode(
+                        new Display.Mode(720, 1080, 0.0f)));
+    }
+
+    @Test
+    public void testSetAndClearUserPreferredDisplayModeGeneratesDisplayChangedEvents()
+            throws Exception {
+        Display.Mode[] modes = mDefaultDisplay.getSupportedModes();
+        assumeTrue("Need two or more display modes to exercise switching.", modes.length > 1);
+
+        // Test set
+        Display.Mode initialDefaultMode = mDefaultDisplay.getDefaultMode();
+
+        Display.Mode newDefaultMode = findNonDefaultMode(mDefaultDisplay);
+        assertNotNull(newDefaultMode);
+        final CountDownLatch setUserPrefModeSignal = new CountDownLatch(1);
+        DisplayManager.DisplayListener listener = new DisplayManager.DisplayListener() {
+            @Override
+            public void onDisplayAdded(int displayId) {}
+
+            @Override
+            public void onDisplayRemoved(int displayId) {}
+
+            @Override
+            public void onDisplayChanged(int displayId) {
+                if (displayId != mDefaultDisplay.getDisplayId()) {
+                    return;
+                }
+                if (newDefaultMode.getModeId() == mDefaultDisplay.getDefaultMode().getModeId()) {
+                    setUserPrefModeSignal.countDown();
+                }
+            }
+        };
+        Handler handler = new Handler(Looper.getMainLooper());
+        mDisplayManager.registerDisplayListener(listener, handler);
+        try {
+            mDisplayManager.setGlobalUserPreferredDisplayMode(newDefaultMode);
+            // Wait until the display change is effective.
+            assertTrue(setUserPrefModeSignal.await(DISPLAY_CHANGE_TIMEOUT_SECS, TimeUnit.SECONDS));
+        } finally {
+            mDisplayManager.unregisterDisplayListener(listener);
+        }
+
+        // Test clear
+        final CountDownLatch clearUserPrefModeSignal = new CountDownLatch(1);
+        listener = new DisplayManager.DisplayListener() {
+            @Override
+            public void onDisplayAdded(int displayId) {}
+
+            @Override
+            public void onDisplayRemoved(int displayId) {}
+
+            @Override
+            public void onDisplayChanged(int displayId) {
+                if (displayId != mDefaultDisplay.getDisplayId()) {
+                    return;
+                }
+                if (initialDefaultMode.getModeId()
+                        == mDefaultDisplay.getDefaultMode().getModeId()) {
+                    clearUserPrefModeSignal.countDown();
+                }
+            }
+        };
+        mDisplayManager.registerDisplayListener(listener, handler);
+        try {
+            mDisplayManager.clearGlobalUserPreferredDisplayMode();
+            // Wait until the display change is effective.
+            assertTrue(clearUserPrefModeSignal.await(DISPLAY_CHANGE_TIMEOUT_SECS,
+                    TimeUnit.SECONDS));
+        } finally {
+            mDisplayManager.unregisterDisplayListener(listener);
+        }
+    }
+
+    @Test
+    public void
+            testSetAndClearUserPreferredDisplayModeForSpecificDisplayGeneratesDisplayChangedEvents()
+            throws Exception {
+        Display.Mode[] modes = mDefaultDisplay.getSupportedModes();
+        assumeTrue("Need two or more display modes to exercise switching.", modes.length > 1);
+
+        // Test set
+        Display.Mode initialDefaultMode = mDefaultDisplay.getDefaultMode();
+
+        Display.Mode newDefaultMode = findNonDefaultMode(mDefaultDisplay);
+        assertNotNull(newDefaultMode);
+        final CountDownLatch setUserPrefModeSignal = new CountDownLatch(1);
+        DisplayManager.DisplayListener listener = new DisplayManager.DisplayListener() {
+            @Override
+            public void onDisplayAdded(int displayId) {}
+
+            @Override
+            public void onDisplayRemoved(int displayId) {}
+
+            @Override
+            public void onDisplayChanged(int displayId) {
+                if (displayId != mDefaultDisplay.getDisplayId()) {
+                    return;
+                }
+                if (newDefaultMode.getModeId()
+                        == mDefaultDisplay.getDefaultMode().getModeId()) {
+                    setUserPrefModeSignal.countDown();
+                }
+            }
+        };
+        Handler handler = new Handler(Looper.getMainLooper());
+        mDisplayManager.registerDisplayListener(listener, handler);
+        try {
+            mDefaultDisplay.setUserPreferredDisplayMode(newDefaultMode);
+            // Wait until the display change is effective.
+            assertTrue(setUserPrefModeSignal.await(DISPLAY_CHANGE_TIMEOUT_SECS, TimeUnit.SECONDS));
+        } finally {
+            mDisplayManager.unregisterDisplayListener(listener);
+        }
+
+        // Test clear
+        final CountDownLatch clearUserPrefModeSignal = new CountDownLatch(1);
+        listener = new DisplayManager.DisplayListener() {
+            @Override
+            public void onDisplayAdded(int displayId) {}
+
+            @Override
+            public void onDisplayRemoved(int displayId) {}
+
+            @Override
+            public void onDisplayChanged(int displayId) {
+                if (displayId != mDefaultDisplay.getDisplayId()) {
+                    return;
+                }
+                if (initialDefaultMode.getModeId()
+                        == mDefaultDisplay.getDefaultMode().getModeId()) {
+                    clearUserPrefModeSignal.countDown();
+                }
+            }
+        };
+        mDisplayManager.registerDisplayListener(listener, handler);
+        try {
+            mDefaultDisplay.clearUserPreferredDisplayMode();
+            // Wait until the display change is effective.
+            assertTrue(clearUserPrefModeSignal.await(DISPLAY_CHANGE_TIMEOUT_SECS,
+                    TimeUnit.SECONDS));
+        } finally {
+            mDisplayManager.unregisterDisplayListener(listener);
+        }
+    }
+
+    @Test
+    public void testSetUserPreferredDisplayModeForSpecificDisplay() {
+        Display.Mode[] modes = mDefaultDisplay.getSupportedModes();
+        assumeTrue("Need two or more display modes to exercise switching.", modes.length > 1);
+
+        // Set a display mode which is different from default display mode
+        Display.Mode newDefaultMode = findNonDefaultMode(mDefaultDisplay);
+        assertNotNull(newDefaultMode);
+        mDefaultDisplay.setUserPreferredDisplayMode(newDefaultMode);
+        assertTrue(mDefaultDisplay.getUserPreferredDisplayMode()
+                .matches(newDefaultMode.getPhysicalWidth(),
+                        newDefaultMode.getPhysicalHeight(),
+                        newDefaultMode.getRefreshRate()));
+
+        mDefaultDisplay.clearUserPreferredDisplayMode();
+        assertNull(mDefaultDisplay.getUserPreferredDisplayMode());
+    }
+
+    @Test
+    public void testSetUserPreferredRefreshRateForSpecificDisplay() {
+        Display.Mode[] modes = mDefaultDisplay.getSupportedModes();
+        assumeTrue("Need two or more display modes to exercise switching.", modes.length > 1);
+
+        // Set a refresh rate which is different from default display refresh rate
+        float refreshRate = findNonDefaultRefreshRate(mDefaultDisplay);
+        assumeTrue("Need two or more refresh rates to exercise switching.", refreshRate != 0.0f);
+
+        mDefaultDisplay.setUserPreferredDisplayMode(
+                new Display.Mode.Builder().setRefreshRate(refreshRate).build());
+        assertNotNull(mDefaultDisplay.getUserPreferredDisplayMode());
+        assertEquals(
+                refreshRate,
+                mDefaultDisplay.getUserPreferredDisplayMode().getRefreshRate(),
+                0.00001 /* delta */);
+
+        mDefaultDisplay.clearUserPreferredDisplayMode();
+        assertNull(mDefaultDisplay.getUserPreferredDisplayMode());
+    }
+
+    @Test
+    public void testSetUserPreferredResolutionForSpecificDisplay() {
+        Display.Mode[] modes = mDefaultDisplay.getSupportedModes();
+        assumeTrue("Need two or more display modes to exercise switching.", modes.length > 1);
+
+        // Set a refresh rate which is different from default display refresh rate
+        Point resolution = findNonDefaultResolution(mDefaultDisplay);
+        assumeTrue("Need two or more resolutions to exercise switching.",
+                resolution.x != -1 && resolution.y != -1);
+
+        mDefaultDisplay.setUserPreferredDisplayMode(
+                new Display.Mode.Builder().setResolution(resolution.x, resolution.y).build());
+        assertNotNull(mDefaultDisplay.getUserPreferredDisplayMode());
+        assertEquals(resolution.x,
+                mDefaultDisplay.getUserPreferredDisplayMode().getPhysicalWidth());
+        assertEquals(resolution.y,
+                mDefaultDisplay.getUserPreferredDisplayMode().getPhysicalHeight());
+
+        mDefaultDisplay.clearUserPreferredDisplayMode();
+        assertNull(mDefaultDisplay.getUserPreferredDisplayMode());
+    }
+
+    @Test
+    public void testGetUserPreferredDisplayMode() {
+        Display.Mode[] modes = mDefaultDisplay.getSupportedModes();
+        assumeTrue("Need two or more display modes to exercise switching.", modes.length > 1);
+
+        // Set a display mode which is different from default display mode
+        Display.Mode newDefaultMode = findNonDefaultMode(mDefaultDisplay);
+        assertNotNull(newDefaultMode);
+        mDisplayManager.setGlobalUserPreferredDisplayMode(newDefaultMode);
+        assertTrue(mDisplayManager.getGlobalUserPreferredDisplayMode()
+                .matches(newDefaultMode.getPhysicalWidth(),
+                        newDefaultMode.getPhysicalHeight(),
+                        newDefaultMode.getRefreshRate()));
+
+        mDisplayManager.clearGlobalUserPreferredDisplayMode();
+        assertNull(mDisplayManager.getGlobalUserPreferredDisplayMode());
+    }
+
+    @Test
+    public void testSetUserPreferredDisplayModePrioritizesDisplaySpecificMode()
+            throws InterruptedException {
+        Display.Mode[] modes = mDefaultDisplay.getSupportedModes();
+        assumeTrue("Need two or more display modes to exercise switching.", modes.length > 1);
+
+        // Set the global display mode which is different from default display mode
+        Display.Mode globalDefaultMode = findNonDefaultMode(mDefaultDisplay);
+        assertNotNull(globalDefaultMode);
+        mDisplayManager.setGlobalUserPreferredDisplayMode(globalDefaultMode);
+        waitUntil(mDefaultDisplay,
+                mDefaultDisplay -> mDefaultDisplay.getDefaultMode().getModeId()
+                        == globalDefaultMode.getModeId(),
+                Duration.ofSeconds(5));
+        assertTrue(mDefaultDisplay.getDefaultMode()
+                .matches(globalDefaultMode.getPhysicalWidth(),
+                        globalDefaultMode.getPhysicalHeight(),
+                        globalDefaultMode.getRefreshRate()));
+
+        // Set a display mode, only for a specific display which is different from default display
+        // mode
+        Display.Mode displaySpecificMode = findNonDefaultMode(mDefaultDisplay);
+        assertNotNull(displaySpecificMode);
+        mDefaultDisplay.setUserPreferredDisplayMode(displaySpecificMode);
+        waitUntil(mDefaultDisplay,
+                mDefaultDisplay -> mDefaultDisplay.getDefaultMode().getModeId()
+                        == displaySpecificMode.getModeId(),
+                Duration.ofSeconds(5));
+        assertTrue(mDefaultDisplay.getDefaultMode()
+                .matches(displaySpecificMode.getPhysicalWidth(),
+                        displaySpecificMode.getPhysicalHeight(),
+                        displaySpecificMode.getRefreshRate()));
+        assertFalse(mDefaultDisplay.getDefaultMode()
+                .matches(globalDefaultMode.getPhysicalWidth(),
+                        globalDefaultMode.getPhysicalHeight(),
+                        globalDefaultMode.getRefreshRate()));
+
+        mDisplayManager.setGlobalUserPreferredDisplayMode(globalDefaultMode);
+        // This should never happen. The display specific mode has priority over global
+        // display mode.
+        waitUntil(mDefaultDisplay,
+                mDefaultDisplay -> mDefaultDisplay.getDefaultMode().getModeId()
+                        == globalDefaultMode.getModeId(),
+                Duration.ofSeconds(5));
+        assertTrue(mDefaultDisplay.getDefaultMode()
+                .matches(displaySpecificMode.getPhysicalWidth(),
+                        displaySpecificMode.getPhysicalHeight(),
+                        displaySpecificMode.getRefreshRate()));
+        assertFalse(mDefaultDisplay.getDefaultMode()
+                .matches(globalDefaultMode.getPhysicalWidth(),
+                        globalDefaultMode.getPhysicalHeight(),
+                        globalDefaultMode.getRefreshRate()));
+    }
+
+    private void cacheOriginalUserPreferredModeSetting() {
+        mOriginalGlobalDisplayModeSettings =
+                mDisplayManager.getGlobalUserPreferredDisplayMode();
+        mOriginalDisplaySpecificModeSettings = mDefaultDisplay.getUserPreferredDisplayMode();
+    }
+
+    private void restoreOriginalDisplayModeSettings() {
+        // mDisplayManager can be null if the test assumptions if setUp have failed.
+        if (mDisplayManager == null) {
+            return;
+        }
+        if (mOriginalGlobalDisplayModeSettings == null) {
+            mDisplayManager.clearGlobalUserPreferredDisplayMode();
+        } else {
+            mDisplayManager.setGlobalUserPreferredDisplayMode(mOriginalGlobalDisplayModeSettings);
+        }
+        if (mOriginalDisplaySpecificModeSettings == null) {
+            mDefaultDisplay.clearUserPreferredDisplayMode();
+        } else {
+            mDefaultDisplay.setUserPreferredDisplayMode(mOriginalDisplaySpecificModeSettings);
+        }
+    }
+
+    private Display.Mode findNonDefaultMode(Display display) {
+        for (Display.Mode mode : display.getSupportedModes()) {
+            if (mode.getModeId() != display.getDefaultMode().getModeId()) {
+                return mode;
+            }
+        }
+        return null;
+    }
+
+    private float findNonDefaultRefreshRate(Display display) {
+        for (Display.Mode mode : display.getSupportedModes()) {
+            if (mode.getRefreshRate() != display.getDefaultMode().getRefreshRate()) {
+                return mode.getRefreshRate();
+            }
+        }
+        return 0.0f;
+    }
+
+    private Point findNonDefaultResolution(Display display) {
+        for (Display.Mode mode : display.getSupportedModes()) {
+            if (mode.getPhysicalWidth() != display.getDefaultMode().getPhysicalWidth()
+                    || mode.getPhysicalHeight() != display.getDefaultMode().getPhysicalHeight()) {
+                return new Point(mode.getPhysicalWidth(), mode.getPhysicalHeight());
+            }
+        }
+        return new Point(-1, -1);
+    }
+
+    private void waitUntil(Display display, Predicate<Display> pred, Duration maxWait)
+            throws InterruptedException {
+        final int id = display.getDisplayId();
+        final Lock lock = new ReentrantLock();
+        final Condition displayChanged = lock.newCondition();
+        DisplayManager.DisplayListener listener = new DisplayManager.DisplayListener() {
+            @Override
+            public void onDisplayChanged(int displayId) {
+                if (displayId != id) {
+                    return;
+                }
+                lock.lock();
+                try {
+                    displayChanged.signal();
+                } finally {
+                    lock.unlock();
+                }
+            }
+            @Override
+            public void onDisplayAdded(int displayId) {}
+            @Override
+            public void onDisplayRemoved(int displayId) {}
+        };
+        Handler handler = new Handler(Looper.getMainLooper());
+        mDisplayManager.registerDisplayListener(listener, handler);
+        long remainingNanos = maxWait.toNanos();
+        lock.lock();
+        try {
+            while (!pred.test(display)) {
+                if (remainingNanos <= 0L) {
+                    return;
+                }
+                remainingNanos = displayChanged.awaitNanos(remainingNanos);
+            }
+        } finally {
+            lock.unlock();
+        }
+    }
+}
diff --git a/tests/tests/dreams/Android.bp b/tests/tests/dreams/Android.bp
index 00fc883..b3b7810 100644
--- a/tests/tests/dreams/Android.bp
+++ b/tests/tests/dreams/Android.bp
@@ -20,7 +20,9 @@
     name: "CtsDreamsTestCases",
     defaults: ["cts_defaults"],
     static_libs: [
+        "compatibility-device-util-axt",
         "ctstestrunner-axt",
+        "cts-wm-util",
         "junit",
     ],
     libs: [
@@ -36,4 +38,7 @@
         "cts",
         "general-tests",
     ],
+    data: [
+        ":CtsDreamOverlayTestApp",
+    ],
 }
diff --git a/tests/tests/dreams/AndroidTest.xml b/tests/tests/dreams/AndroidTest.xml
index f6bd05a..18f7891 100644
--- a/tests/tests/dreams/AndroidTest.xml
+++ b/tests/tests/dreams/AndroidTest.xml
@@ -19,10 +19,12 @@
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="all_foldable_states" />
     <option name="not-shardable" value="true" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsDreamsTestCases.apk" />
+        <option name="test-file-name" value="CtsDreamOverlayTestApp.apk" />
     </target_preparer>
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.dreams.cts" />
diff --git a/tests/tests/dreams/CtsDreamOverlayTestApp/Android.bp b/tests/tests/dreams/CtsDreamOverlayTestApp/Android.bp
new file mode 100644
index 0000000..d905df0
--- /dev/null
+++ b/tests/tests/dreams/CtsDreamOverlayTestApp/Android.bp
@@ -0,0 +1,26 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsDreamOverlayTestApp",
+    defaults: ["mts-target-sdk-version-current"],
+    min_sdk_version: "current",
+    srcs: [
+        "src/**/*.java",
+    ],
+}
diff --git a/tests/tests/dreams/CtsDreamOverlayTestApp/AndroidManifest.xml b/tests/tests/dreams/CtsDreamOverlayTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..cf4eabb
--- /dev/null
+++ b/tests/tests/dreams/CtsDreamOverlayTestApp/AndroidManifest.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.app.dream.cts.app">
+    <application android:label="CtsDreamTestApp">
+        <service
+            android:name=".DreamOverlayService"
+            android:exported="true">
+        </service>
+        <service
+            android:name=".TestDreamService"
+            android:exported="true"
+            android:permission="android.permission.BIND_DREAM_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.dreams.DreamService" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </service>
+        <service
+            android:name=".SeparateProcessDreamService"
+            android:exported="true"
+            android:process=":separate"
+            android:permission="android.permission.BIND_DREAM_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.dreams.DreamService" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </service>
+    </application>
+</manifest>
diff --git a/tests/tests/dreams/CtsDreamOverlayTestApp/src/android/app/dream/cts/app/DreamOverlayService.java b/tests/tests/dreams/CtsDreamOverlayTestApp/src/android/app/dream/cts/app/DreamOverlayService.java
new file mode 100644
index 0000000..e3e37aa
--- /dev/null
+++ b/tests/tests/dreams/CtsDreamOverlayTestApp/src/android/app/dream/cts/app/DreamOverlayService.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2021 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 android.app.dream.cts.app;
+
+import android.annotation.NonNull;
+import android.content.Intent;
+import android.graphics.Color;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.WindowManager;
+import android.widget.FrameLayout;
+
+/**
+ * {@link DreamOverlayService} provides a test implementation of
+ * {@link android.service.dreams.DreamOverlayService}. When informed of the dream state, the service
+ * populates a child window with a simple view.Once that view's visibility changes, the dream
+ * broadcasts an action that tests wait upon as a signal the overlay has been displayed.
+ */
+public class DreamOverlayService extends android.service.dreams.DreamOverlayService {
+    public static final String ACTION_DREAM_OVERLAY_SHOWN =
+            "android.app.dream.cts.app.action.overlay_shown";
+    public static final String TEST_PACKAGE = "android.dreams.cts";
+
+    @Override
+    public void onStartDream(@NonNull WindowManager.LayoutParams layoutParams) {
+        addWindowOverlay(layoutParams);
+    }
+
+    private void addWindowOverlay(WindowManager.LayoutParams layoutParams) {
+        FrameLayout layout = new FrameLayout(this);
+        layout.setBackgroundColor(Color.YELLOW);
+        layout.setLayoutParams(new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
+
+        // Add a listener for when the root layout becomes visible. We use this event to signal the
+        // dream overlay has been shown.
+        layout.getViewTreeObserver().addOnGlobalLayoutListener(() -> {
+            if (layout.getVisibility() == View.VISIBLE) {
+                final Intent intent = new Intent();
+                intent.setPackage(TEST_PACKAGE);
+                intent.setAction(ACTION_DREAM_OVERLAY_SHOWN);
+                sendBroadcast(intent);
+                requestExit();
+            }
+        });
+
+        final WindowManager wm = getSystemService(WindowManager.class);
+        wm.addView(layout, layoutParams);
+    }
+}
diff --git a/tests/tests/dreams/CtsDreamOverlayTestApp/src/android/app/dream/cts/app/SeparateProcessDreamService.java b/tests/tests/dreams/CtsDreamOverlayTestApp/src/android/app/dream/cts/app/SeparateProcessDreamService.java
new file mode 100644
index 0000000..1d96ec8
--- /dev/null
+++ b/tests/tests/dreams/CtsDreamOverlayTestApp/src/android/app/dream/cts/app/SeparateProcessDreamService.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 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 android.app.dream.cts.app;
+
+/**
+ * A {@link android.service.dreams.DreamService} that is specified to be in a different process in
+ * the manifest.
+ */
+public class SeparateProcessDreamService extends TestDreamService {
+}
diff --git a/tests/tests/dreams/CtsDreamOverlayTestApp/src/android/app/dream/cts/app/TestDreamService.java b/tests/tests/dreams/CtsDreamOverlayTestApp/src/android/app/dream/cts/app/TestDreamService.java
new file mode 100644
index 0000000..0508b00
--- /dev/null
+++ b/tests/tests/dreams/CtsDreamOverlayTestApp/src/android/app/dream/cts/app/TestDreamService.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 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 android.app.dream.cts.app;
+
+import android.graphics.Color;
+import android.service.dreams.DreamService;
+import android.widget.FrameLayout;
+
+/**
+ * {@link TestDreamService} is a minimal concrete {@link DreamService} implementation that sets
+ * the entire window to be blue.
+ */
+public class TestDreamService extends DreamService {
+    public void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        setInteractive(false);
+        setFullscreen(true);
+
+        final FrameLayout frameLayout = new FrameLayout(getApplicationContext());
+        frameLayout.setBackgroundColor(Color.BLUE);
+        setContentView(frameLayout);
+    }
+}
diff --git a/tests/tests/dreams/src/android/service/dreams/cts/DreamOverlayTest.java b/tests/tests/dreams/src/android/service/dreams/cts/DreamOverlayTest.java
new file mode 100644
index 0000000..be82ebf
--- /dev/null
+++ b/tests/tests/dreams/src/android/service/dreams/cts/DreamOverlayTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2021 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 android.service.dreams.cts;
+
+import android.Manifest;
+import android.app.DreamManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.ServiceManager;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.AdoptShellPermissionsRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class DreamOverlayTest  {
+    private static final String DREAM_OVERLAY_SERVICE_COMPONENT =
+            "android.app.dream.cts.app/.DreamOverlayService";
+    private static final String DREAM_SERVICE_COMPONENT =
+            "android.app.dream.cts.app/.TestDreamService";
+    private static final String ACTION_DREAM_OVERLAY_SHOWN =
+            "android.app.dream.cts.app.action.overlay_shown";
+
+    private static final int TIMEOUT_SECONDS = 5;
+
+    private static final ComponentName DREAM_COMPONENT_NAME = ComponentName.unflattenFromString(
+            DREAM_SERVICE_COMPONENT);
+
+    private DreamManager mDreamManager;
+    /**
+     * A simple {@link BroadcastReceiver} implementation that counts down a
+     * {@link CountDownLatch} when a matching message is received
+     */
+    static final class OverlayVisibilityReceiver extends BroadcastReceiver {
+        final CountDownLatch mLatch;
+
+        OverlayVisibilityReceiver(CountDownLatch latch) {
+            mLatch = latch;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            mLatch.countDown();
+        }
+    }
+
+    @Rule
+    public AdoptShellPermissionsRule mAdoptShellPermissionsRule = new AdoptShellPermissionsRule(
+            InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+            Manifest.permission.INTERACT_ACROSS_USERS,  Manifest.permission.WRITE_DREAM_STATE);
+
+    @Before
+    public void setup() throws ServiceManager.ServiceNotFoundException {
+        mDreamManager = new DreamManager(InstrumentationRegistry.getTargetContext());
+
+        mDreamManager.setActiveDream(DREAM_COMPONENT_NAME);
+
+        // Register the overlay service.
+        mDreamManager.setDreamOverlay(ComponentName.unflattenFromString(
+                DREAM_OVERLAY_SERVICE_COMPONENT));
+    }
+
+    @After
+    public void teardown() {
+        mDreamManager.setActiveDream(null);
+
+        // Unregister overlay service.
+        mDreamManager.setDreamOverlay(null);
+    }
+
+    @Test
+    public void testDreamOverlayAppearance() throws Exception {
+        // Listen for the overlay to be shown
+        final CountDownLatch countDownLatch = new CountDownLatch(1);
+        InstrumentationRegistry.getTargetContext().registerReceiver(
+                new OverlayVisibilityReceiver(countDownLatch),
+                new IntentFilter(ACTION_DREAM_OVERLAY_SHOWN));
+
+        mDreamManager.startDream(DREAM_COMPONENT_NAME);
+
+        // Wait on count down latch.
+        assert (countDownLatch.await(TIMEOUT_SECONDS, TimeUnit.SECONDS));
+    }
+}
diff --git a/tests/tests/dreams/src/android/service/dreams/cts/DreamServiceTest.java b/tests/tests/dreams/src/android/service/dreams/cts/DreamServiceTest.java
index fcf6558..3702971 100644
--- a/tests/tests/dreams/src/android/service/dreams/cts/DreamServiceTest.java
+++ b/tests/tests/dreams/src/android/service/dreams/cts/DreamServiceTest.java
@@ -15,28 +15,67 @@
  */
 package android.service.dreams.cts;
 
-import android.service.dreams.DreamService;
-import android.test.InstrumentationTestCase;
-import android.test.UiThreadTest;
-import android.view.ActionMode;
+import static org.junit.Assert.assertEquals;
 
-public class DreamServiceTest extends InstrumentationTestCase {
-    @UiThreadTest
+import android.content.ComponentName;
+import android.server.wm.ActivityManagerTestBase;
+import android.server.wm.DreamCoordinator;
+import android.service.dreams.DreamService;
+import android.view.ActionMode;
+import android.view.Display;
+
+import androidx.test.filters.FlakyTest;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+@FlakyTest(detail = "Promote once confirmed non-flaky")
+public class DreamServiceTest extends ActivityManagerTestBase {
+    private static final String DREAM_SERVICE_COMPONENT =
+            "android.app.dream.cts.app/.SeparateProcessDreamService";
+
+    private DreamCoordinator mDreamCoordinator = new DreamCoordinator(mContext);
+
+    @Before
+    public void setup() {
+        mDreamCoordinator.setup();
+    }
+
+    @After
+    public void reset()  {
+        mDreamCoordinator.restoreDefaults();
+    }
+
+    @Test
     public void testOnWindowStartingActionMode() {
         DreamService dreamService = new DreamService();
 
         ActionMode actionMode = dreamService.onWindowStartingActionMode(null);
 
-        assertNull(actionMode);
+        assertEquals(actionMode, null);
     }
 
-    @UiThreadTest
+    @Test
     public void testOnWindowStartingActionModeTyped() {
         DreamService dreamService = new DreamService();
 
         ActionMode actionMode = dreamService.onWindowStartingActionMode(
                 null, ActionMode.TYPE_FLOATING);
 
-        assertNull(actionMode);
+        assertEquals(actionMode, null);
     }
+
+    @Test
+    public void testDreamInSeparateProcess() {
+        final ComponentName dreamService =
+                ComponentName.unflattenFromString(DREAM_SERVICE_COMPONENT);
+        final ComponentName dreamActivity = mDreamCoordinator.setActiveDream(dreamService);
+
+        mDreamCoordinator.startDream(dreamService);
+        waitAndAssertTopResumedActivity(dreamActivity, Display.DEFAULT_DISPLAY,
+                "Dream activity should be the top resumed activity");
+        mDreamCoordinator.stopDream();
+    }
+
 }
diff --git a/tests/tests/gamemanager/Android.bp b/tests/tests/gamemanager/Android.bp
index 99ec4b6..4e8b4b7 100644
--- a/tests/tests/gamemanager/Android.bp
+++ b/tests/tests/gamemanager/Android.bp
@@ -1,4 +1,3 @@
-
 package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
@@ -14,11 +13,12 @@
 
     libs: [
         "android.test.base",
-        "android.test.runner"
+        "android.test.runner",
     ],
 
     static_libs: [
         "androidx.test.core",
+        "compatibility-device-util-axt",
         "ctsdeviceutillegacy-axt",
         "ctstestrunner-axt",
         "ctstestserver",
@@ -26,6 +26,14 @@
         "truth-prebuilt",
     ],
 
+    data: [
+        ":CtsGameTestApp",
+        ":CtsGameTestAppWithBatteryMode",
+        ":CtsGameTestAppWithPerformanceMode",
+        ":CtsLegacyGameTestApp",
+        ":CtsNotGameTestApp",
+    ],
+
     srcs: ["src/**/*.java"],
 
     sdk_version: "test_current",
diff --git a/tests/tests/gamemanager/AndroidManifest.xml b/tests/tests/gamemanager/AndroidManifest.xml
index ca874b9..29bdbc0 100644
--- a/tests/tests/gamemanager/AndroidManifest.xml
+++ b/tests/tests/gamemanager/AndroidManifest.xml
@@ -20,11 +20,15 @@
 
     <application android:appCategory="game">
         <uses-library android:name="android.test.runner"/>
+        <meta-data android:name="android.game_mode_config"
+                   android:resource="@xml/game_mode_config" />
         <activity android:name=".GameManagerCtsActivity"
                   android:label="GameManagerCtsActivity"
+                  android:visibleToInstantApps="true"
                   android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
             </intent-filter>
         </activity>
diff --git a/tests/tests/gamemanager/AndroidTest.xml b/tests/tests/gamemanager/AndroidTest.xml
index 52dab5b..fb23c6c 100644
--- a/tests/tests/gamemanager/AndroidTest.xml
+++ b/tests/tests/gamemanager/AndroidTest.xml
@@ -25,6 +25,15 @@
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsGameManagerTestCases.apk" />
     </target_preparer>
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="push" value="CtsLegacyGameTestApp.apk->/data/local/tmp/cts/gamemanager/test/apps/CtsLegacyGameTestApp.apk" />
+        <option name="push" value="CtsNotGameTestApp.apk->/data/local/tmp/cts/gamemanager/test/apps/CtsNotGameTestApp.apk" />
+        <option name="push" value="CtsGameTestApp.apk->/data/local/tmp/cts/gamemanager/test/apps/CtsGameTestApp.apk" />
+        <option name="push" value="CtsGameTestAppWithBatteryMode.apk->/data/local/tmp/cts/gamemanager/test/apps/CtsGameTestAppWithBatteryMode.apk" />
+        <option name="push" value="CtsGameTestAppWithPerformanceMode.apk->/data/local/tmp/cts/gamemanager/test/apps/CtsGameTestAppWithPerformanceMode.apk" />
+    </target_preparer>
+
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.gamemanager.cts" />
     </test>
diff --git a/tests/tests/gamemanager/GameTestApp/Android.bp b/tests/tests/gamemanager/GameTestApp/Android.bp
new file mode 100644
index 0000000..204cfe0
--- /dev/null
+++ b/tests/tests/gamemanager/GameTestApp/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsGameTestApp",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.annotation_annotation",
+        "guava",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+}
diff --git a/tests/tests/gamemanager/GameTestApp/AndroidManifest.xml b/tests/tests/gamemanager/GameTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..cd14a83
--- /dev/null
+++ b/tests/tests/gamemanager/GameTestApp/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.gamemanager.cts.app.gametestapp">
+
+    <application android:appCategory="game">
+        <uses-library android:name="android.test.runner"/>
+        <meta-data android:name="android.game_mode_config"
+                   android:resource="@xml/game_mode_config" />
+        <activity android:name=".GameTestAppMainActivity"
+                  android:label="GameTestAppMainActivity"
+                  android:visibleToInstantApps="true"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/tests/gamemanager/GameTestApp/res/xml/game_mode_config.xml b/tests/tests/gamemanager/GameTestApp/res/xml/game_mode_config.xml
new file mode 100644
index 0000000..e013590
--- /dev/null
+++ b/tests/tests/gamemanager/GameTestApp/res/xml/game_mode_config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<game-mode-config
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:supportsBatteryGameMode="true"
+    android:supportsPerformanceGameMode="true"
+    android:allowGameAngleDriver="true"
+    android:allowGameDownscaling="true"
+/>
diff --git a/tests/tests/gamemanager/GameTestApp/src/android/gamemanager/cts/app/GameTestAppMainActivity.java b/tests/tests/gamemanager/GameTestApp/src/android/gamemanager/cts/app/GameTestAppMainActivity.java
new file mode 100644
index 0000000..7e2536c
--- /dev/null
+++ b/tests/tests/gamemanager/GameTestApp/src/android/gamemanager/cts/app/GameTestAppMainActivity.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 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 android.gamemanager.cts.app;
+
+import android.app.Activity;
+import android.app.GameManager;
+import android.content.Context;
+import android.os.Bundle;
+
+public class GameTestAppMainActivity extends Activity {
+
+    private static final String TAG = "GameTestAppMainActivity";
+
+    Context mContext;
+    GameManager mGameManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContext = getApplicationContext();
+        mGameManager = mContext.getSystemService(GameManager.class);
+    }
+
+    public String getPackageName() {
+        return mContext.getPackageName();
+    }
+
+    public int getGameMode() {
+        return mGameManager.getGameMode();
+    }
+}
diff --git a/tests/tests/gamemanager/GameTestAppWithBatteryMode/Android.bp b/tests/tests/gamemanager/GameTestAppWithBatteryMode/Android.bp
new file mode 100644
index 0000000..b428860
--- /dev/null
+++ b/tests/tests/gamemanager/GameTestAppWithBatteryMode/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsGameTestAppWithBatteryMode",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.annotation_annotation",
+        "guava",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+}
diff --git a/tests/tests/gamemanager/GameTestAppWithBatteryMode/AndroidManifest.xml b/tests/tests/gamemanager/GameTestAppWithBatteryMode/AndroidManifest.xml
new file mode 100644
index 0000000..9834584
--- /dev/null
+++ b/tests/tests/gamemanager/GameTestAppWithBatteryMode/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.gamemanager.cts.app.gametestapp.battery">
+
+    <application android:appCategory="game">
+        <uses-library android:name="android.test.runner"/>
+        <meta-data android:name="android.game_mode_config"
+                   android:resource="@xml/game_mode_config" />
+        <activity android:name=".GameTestAppMainActivity"
+                  android:label="GameTestAppMainActivity"
+                  android:visibleToInstantApps="true"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/tests/gamemanager/GameTestAppWithBatteryMode/res/xml/game_mode_config.xml b/tests/tests/gamemanager/GameTestAppWithBatteryMode/res/xml/game_mode_config.xml
new file mode 100644
index 0000000..a1991a1
--- /dev/null
+++ b/tests/tests/gamemanager/GameTestAppWithBatteryMode/res/xml/game_mode_config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<game-mode-config
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:supportsBatteryGameMode="true"
+    android:supportsPerformanceGameMode="false"
+    android:allowGameAngleDriver="true"
+    android:allowGameDownscaling="true"
+/>
diff --git a/tests/tests/gamemanager/GameTestAppWithBatteryMode/src/android/gamemanager/cts/app/GameTestAppMainActivity.java b/tests/tests/gamemanager/GameTestAppWithBatteryMode/src/android/gamemanager/cts/app/GameTestAppMainActivity.java
new file mode 100644
index 0000000..7e2536c
--- /dev/null
+++ b/tests/tests/gamemanager/GameTestAppWithBatteryMode/src/android/gamemanager/cts/app/GameTestAppMainActivity.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 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 android.gamemanager.cts.app;
+
+import android.app.Activity;
+import android.app.GameManager;
+import android.content.Context;
+import android.os.Bundle;
+
+public class GameTestAppMainActivity extends Activity {
+
+    private static final String TAG = "GameTestAppMainActivity";
+
+    Context mContext;
+    GameManager mGameManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContext = getApplicationContext();
+        mGameManager = mContext.getSystemService(GameManager.class);
+    }
+
+    public String getPackageName() {
+        return mContext.getPackageName();
+    }
+
+    public int getGameMode() {
+        return mGameManager.getGameMode();
+    }
+}
diff --git a/tests/tests/gamemanager/GameTestAppWithPerformanceMode/Android.bp b/tests/tests/gamemanager/GameTestAppWithPerformanceMode/Android.bp
new file mode 100644
index 0000000..b783a75
--- /dev/null
+++ b/tests/tests/gamemanager/GameTestAppWithPerformanceMode/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsGameTestAppWithPerformanceMode",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.annotation_annotation",
+        "guava",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+}
diff --git a/tests/tests/gamemanager/GameTestAppWithPerformanceMode/AndroidManifest.xml b/tests/tests/gamemanager/GameTestAppWithPerformanceMode/AndroidManifest.xml
new file mode 100644
index 0000000..a6174b9
--- /dev/null
+++ b/tests/tests/gamemanager/GameTestAppWithPerformanceMode/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.gamemanager.cts.app.gametestapp.performance">
+
+    <application android:appCategory="game">
+        <uses-library android:name="android.test.runner"/>
+        <meta-data android:name="android.game_mode_config"
+                   android:resource="@xml/game_mode_config" />
+        <activity android:name=".GameTestAppMainActivity"
+                  android:label="GameTestAppMainActivity"
+                  android:visibleToInstantApps="true"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/tests/gamemanager/GameTestAppWithPerformanceMode/res/xml/game_mode_config.xml b/tests/tests/gamemanager/GameTestAppWithPerformanceMode/res/xml/game_mode_config.xml
new file mode 100644
index 0000000..492075c9
--- /dev/null
+++ b/tests/tests/gamemanager/GameTestAppWithPerformanceMode/res/xml/game_mode_config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<game-mode-config
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:supportsBatteryGameMode="false"
+    android:supportsPerformanceGameMode="true"
+    android:allowGameAngleDriver="true"
+    android:allowGameDownscaling="true"
+/>
diff --git a/tests/tests/gamemanager/GameTestAppWithPerformanceMode/src/android/gamemanager/cts/app/GameTestAppMainActivity.java b/tests/tests/gamemanager/GameTestAppWithPerformanceMode/src/android/gamemanager/cts/app/GameTestAppMainActivity.java
new file mode 100644
index 0000000..7e2536c
--- /dev/null
+++ b/tests/tests/gamemanager/GameTestAppWithPerformanceMode/src/android/gamemanager/cts/app/GameTestAppMainActivity.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 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 android.gamemanager.cts.app;
+
+import android.app.Activity;
+import android.app.GameManager;
+import android.content.Context;
+import android.os.Bundle;
+
+public class GameTestAppMainActivity extends Activity {
+
+    private static final String TAG = "GameTestAppMainActivity";
+
+    Context mContext;
+    GameManager mGameManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContext = getApplicationContext();
+        mGameManager = mContext.getSystemService(GameManager.class);
+    }
+
+    public String getPackageName() {
+        return mContext.getPackageName();
+    }
+
+    public int getGameMode() {
+        return mGameManager.getGameMode();
+    }
+}
diff --git a/tests/tests/gamemanager/LegacyGameTestApp/Android.bp b/tests/tests/gamemanager/LegacyGameTestApp/Android.bp
new file mode 100644
index 0000000..5cc3b71
--- /dev/null
+++ b/tests/tests/gamemanager/LegacyGameTestApp/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsLegacyGameTestApp",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.annotation_annotation",
+        "guava",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+}
diff --git a/tests/tests/gamemanager/LegacyGameTestApp/AndroidManifest.xml b/tests/tests/gamemanager/LegacyGameTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..3771e09
--- /dev/null
+++ b/tests/tests/gamemanager/LegacyGameTestApp/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.gamemanager.cts.app.legacygametestapp">
+
+    <application android:appCategory="game">
+        <uses-library android:name="android.test.runner"/>
+        <meta-data android:name="com.android.app.gamemode.performance.enabled"
+                   android:value="true"/>
+        <meta-data android:name="com.android.app.gamemode.battery.enabled"
+                   android:value="true"/>
+        <activity android:name=".LegacyGameTestAppMainActivity"
+                  android:label="LegacyGameTestAppMainActivity"
+                  android:visibleToInstantApps="true"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/tests/gamemanager/LegacyGameTestApp/src/android/gamemanager/cts/app/LegacyGameTestAppMainActivity.java b/tests/tests/gamemanager/LegacyGameTestApp/src/android/gamemanager/cts/app/LegacyGameTestAppMainActivity.java
new file mode 100644
index 0000000..72815aa
--- /dev/null
+++ b/tests/tests/gamemanager/LegacyGameTestApp/src/android/gamemanager/cts/app/LegacyGameTestAppMainActivity.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2022 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 android.gamemanager.cts.app;
+
+import android.app.Activity;
+import android.app.GameManager;
+import android.content.Context;
+import android.os.Bundle;
+
+public class LegacyGameTestAppMainActivity extends Activity {
+
+    private static final String TAG = "LegacyGameTestAppMainActivity";
+
+    Context mContext;
+    GameManager mGameManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContext = getApplicationContext();
+        mGameManager = mContext.getSystemService(GameManager.class);
+    }
+
+    public String getPackageName() {
+        return mContext.getPackageName();
+    }
+
+    public int getGameMode() {
+        return mGameManager.getGameMode();
+    }
+
+}
diff --git a/tests/tests/gamemanager/NotGameTestApp/Android.bp b/tests/tests/gamemanager/NotGameTestApp/Android.bp
new file mode 100644
index 0000000..4d1fd28
--- /dev/null
+++ b/tests/tests/gamemanager/NotGameTestApp/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsNotGameTestApp",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.annotation_annotation",
+        "guava",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+}
diff --git a/tests/tests/gamemanager/NotGameTestApp/AndroidManifest.xml b/tests/tests/gamemanager/NotGameTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..fda99ee
--- /dev/null
+++ b/tests/tests/gamemanager/NotGameTestApp/AndroidManifest.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.gamemanager.cts.app.notgametestapp">
+
+    <application>
+        <uses-library android:name="android.test.runner"/>
+        <activity android:name=".NotGameTestAppMainActivity"
+                  android:label="NotGameTestAppMainActivity"
+                  android:visibleToInstantApps="true"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/tests/gamemanager/NotGameTestApp/src/android/gamemanager/cts/app/NotGameTestAppMainActivity.java b/tests/tests/gamemanager/NotGameTestApp/src/android/gamemanager/cts/app/NotGameTestAppMainActivity.java
new file mode 100644
index 0000000..e04c996
--- /dev/null
+++ b/tests/tests/gamemanager/NotGameTestApp/src/android/gamemanager/cts/app/NotGameTestAppMainActivity.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2022 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 android.gamemanager.cts.app;
+
+import android.app.Activity;
+import android.app.GameManager;
+import android.content.Context;
+import android.os.Bundle;
+
+public class NotGameTestAppMainActivity extends Activity {
+
+    private static final String TAG = "NotGameTestAppMainActivity";
+
+    Context mContext;
+    GameManager mGameManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mContext = getApplicationContext();
+        mGameManager = mContext.getSystemService(GameManager.class);
+    }
+
+    public String getPackageName() {
+        return mContext.getPackageName();
+    }
+
+    public int getGameMode() {
+        return mGameManager.getGameMode();
+    }
+}
diff --git a/tests/tests/gamemanager/OWNERS b/tests/tests/gamemanager/OWNERS
index 986180d..d0186b0 100644
--- a/tests/tests/gamemanager/OWNERS
+++ b/tests/tests/gamemanager/OWNERS
@@ -1,3 +1,3 @@
 # Bug component: 878256
 lpy@google.com
-timvp@google.com
+xwxw@google.com
diff --git a/tests/tests/gamemanager/TEST_MAPPING b/tests/tests/gamemanager/TEST_MAPPING
new file mode 100644
index 0000000..a5f7827
--- /dev/null
+++ b/tests/tests/gamemanager/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsGameManagerTestCases"
+    }
+  ]
+}
+
diff --git a/tests/tests/gamemanager/res/xml/game_mode_config.xml b/tests/tests/gamemanager/res/xml/game_mode_config.xml
new file mode 100644
index 0000000..e013590
--- /dev/null
+++ b/tests/tests/gamemanager/res/xml/game_mode_config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<game-mode-config
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:supportsBatteryGameMode="true"
+    android:supportsPerformanceGameMode="true"
+    android:allowGameAngleDriver="true"
+    android:allowGameDownscaling="true"
+/>
diff --git a/tests/tests/gamemanager/src/android/gamemanager/cts/GameManagerLegacyTest.java b/tests/tests/gamemanager/src/android/gamemanager/cts/GameManagerLegacyTest.java
new file mode 100644
index 0000000..50a3ce9
--- /dev/null
+++ b/tests/tests/gamemanager/src/android/gamemanager/cts/GameManagerLegacyTest.java
@@ -0,0 +1,120 @@
+/*
+ * Copyright (C) 2022 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 android.gamemanager.cts;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import android.app.GameManager;
+import android.app.Instrumentation;
+import android.content.Context;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.ShellIdentityUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test the legacy behaviour of GameManager where the opt-in method is via using the
+ * meta-data fields.
+ */
+@RunWith(AndroidJUnit4.class)
+public class GameManagerLegacyTest {
+    private static final String TAG = "GameManagerLegacyTest";
+
+    private static final String APK_DIRECTORY = "/data/local/tmp/cts/gamemanager/test/apps/";
+    private static final String LEGACY_GAME_TEST_APP_APK_PATH =
+            APK_DIRECTORY + "CtsLegacyGameTestApp.apk";
+    private static final String LEGACY_GAME_TEST_APP_PACKAGE_NAME =
+            "android.gamemanager.cts.app.legacygametestapp";
+
+    private Context mContext;
+    private GameManager mGameManager;
+
+    @Before
+    public void setUp() {
+        TestUtil.uninstallPackage(LEGACY_GAME_TEST_APP_PACKAGE_NAME);
+
+        final Instrumentation instrumentation = getInstrumentation();
+        mContext = instrumentation.getContext();
+        mGameManager = mContext.getSystemService(GameManager.class);
+    }
+
+    @After
+    public void tearDown() {
+        TestUtil.uninstallPackage(LEGACY_GAME_TEST_APP_PACKAGE_NAME);
+    }
+
+    /**
+     * Test that GameManager::getGameMode() returns the correct value when an app is a game with
+     * all game modes enabled using the legacy metadata.
+     */
+    @Test
+    public void testGetGameMode() throws InterruptedException {
+        assertTrue(TestUtil.installPackage(LEGACY_GAME_TEST_APP_APK_PATH));
+        Thread.sleep(500);
+
+        // Without any change, the default behaviour should be STANDARD for a game.
+        int gameMode =
+                ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                        (gameManager) -> gameManager.getGameMode(LEGACY_GAME_TEST_APP_PACKAGE_NAME),
+                        "android.permission.MANAGE_GAME_MODE");
+        assertEquals("Game Manager returned incorrect value for "
+                + LEGACY_GAME_TEST_APP_PACKAGE_NAME, GameManager.GAME_MODE_STANDARD, gameMode);
+
+        // Attempt to set the game mode to performance.
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(LEGACY_GAME_TEST_APP_PACKAGE_NAME,
+                        GameManager.GAME_MODE_PERFORMANCE));
+        gameMode = ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                (gameManager) -> gameManager.getGameMode(LEGACY_GAME_TEST_APP_PACKAGE_NAME),
+                "android.permission.MANAGE_GAME_MODE");
+        assertEquals("Game Manager returned incorrect value for "
+                        + LEGACY_GAME_TEST_APP_PACKAGE_NAME,
+                GameManager.GAME_MODE_PERFORMANCE, gameMode);
+
+        // Attempt to set the game mode to battery.
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(LEGACY_GAME_TEST_APP_PACKAGE_NAME,
+                        GameManager.GAME_MODE_BATTERY));
+        gameMode = ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                (gameManager) -> gameManager.getGameMode(LEGACY_GAME_TEST_APP_PACKAGE_NAME),
+                "android.permission.MANAGE_GAME_MODE");
+        assertEquals("Game Manager returned incorrect value for "
+                        + LEGACY_GAME_TEST_APP_PACKAGE_NAME,
+                GameManager.GAME_MODE_BATTERY, gameMode);
+
+        // Attempt to set the game mode to standard.
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(LEGACY_GAME_TEST_APP_PACKAGE_NAME,
+                        GameManager.GAME_MODE_STANDARD));
+        gameMode = ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                (gameManager) -> gameManager.getGameMode(LEGACY_GAME_TEST_APP_PACKAGE_NAME),
+                "android.permission.MANAGE_GAME_MODE");
+        assertEquals("Game Manager returned incorrect value for "
+                        + LEGACY_GAME_TEST_APP_PACKAGE_NAME,
+                GameManager.GAME_MODE_STANDARD, gameMode);
+
+        TestUtil.uninstallPackage(LEGACY_GAME_TEST_APP_PACKAGE_NAME);
+    }
+}
diff --git a/tests/tests/gamemanager/src/android/gamemanager/cts/GameManagerTest.java b/tests/tests/gamemanager/src/android/gamemanager/cts/GameManagerTest.java
index 2ad0f22..f6c14be 100644
--- a/tests/tests/gamemanager/src/android/gamemanager/cts/GameManagerTest.java
+++ b/tests/tests/gamemanager/src/android/gamemanager/cts/GameManagerTest.java
@@ -16,35 +16,72 @@
 
 package android.gamemanager.cts;
 
-import static com.google.common.truth.Truth.assertThat;
-
-import android.app.GameManager;
-import android.content.Context;
-import android.util.Log;
-
-import androidx.test.ext.junit.rules.ActivityScenarioRule;
-
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
-import androidx.test.InstrumentationRegistry;
+import static com.android.compatibility.common.util.ShellUtils.runShellCommand;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import android.app.GameManager;
+import android.app.GameModeInfo;
+import android.app.GameState;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.support.test.uiautomator.UiDevice;
+
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.compatibility.common.util.ShellIdentityUtils;
-import com.android.compatibility.common.util.SystemUtil;
 
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.IOException;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@RunWith(AndroidJUnit4.class)
 public class GameManagerTest {
     private static final String TAG = "GameManagerTest";
+    private static final String POWER_DUMPSYS_CMD = "dumpsys android.hardware.power.IPower/default";
+    private static final Pattern GAME_LOADING_REGEX =
+            Pattern.compile("^GAME_LOADING\\t(\\d*)\\t\\d*$", Pattern.MULTILINE);
+    private static final String APK_DIRECTORY = "/data/local/tmp/cts/gamemanager/test/apps/";
+
+    private static final String NOT_GAME_TEST_APP_APK_PATH =
+            APK_DIRECTORY + "CtsNotGameTestApp.apk";
+    private static final String NOT_GAME_TEST_APP_PACKAGE_NAME =
+            "android.gamemanager.cts.app.notgametestapp";
+
+    private static final String GAME_TEST_APP_APK_PATH =
+            APK_DIRECTORY + "CtsGameTestApp.apk";
+    private static final String GAME_TEST_APP_PACKAGE_NAME =
+            "android.gamemanager.cts.app.gametestapp";
+
+    private static final String GAME_TEST_APP_WITH_BATTERY_APK_PATH =
+            APK_DIRECTORY + "CtsGameTestAppWithBatteryMode.apk";
+    private static final String GAME_TEST_APP_WITH_BATTERY_PACKAGE_NAME =
+            "android.gamemanager.cts.app.gametestapp.battery";
+
+    private static final String GAME_TEST_APP_WITH_PERFORMANCE_APK_PATH =
+            APK_DIRECTORY + "CtsGameTestAppWithPerformanceMode.apk";
+    private static final String GAME_TEST_APP_WITH_PERFORMANCE_PACKAGE_NAME =
+            "android.gamemanager.cts.app.gametestapp.performance";
+
+    private static final int TEST_LABEL = 1;
+    private static final int TEST_QUALITY = 2;
 
     private GameManagerCtsActivity mActivity;
     private Context mContext;
     private GameManager mGameManager;
+    private UiDevice mUiDevice;
 
     @Rule
     public ActivityScenarioRule<GameManagerCtsActivity> mActivityRule =
@@ -52,12 +89,106 @@
 
     @Before
     public void setUp() {
+        TestUtil.uninstallPackage(NOT_GAME_TEST_APP_PACKAGE_NAME);
+        TestUtil.uninstallPackage(GAME_TEST_APP_PACKAGE_NAME);
+        TestUtil.uninstallPackage(GAME_TEST_APP_WITH_BATTERY_PACKAGE_NAME);
+        TestUtil.uninstallPackage(GAME_TEST_APP_WITH_PERFORMANCE_PACKAGE_NAME);
+
         mActivityRule.getScenario().onActivity(activity -> {
             mActivity = activity;
         });
 
-        mContext = getInstrumentation().getContext();
+        final Instrumentation instrumentation = getInstrumentation();
+        mContext = instrumentation.getContext();
         mGameManager = mContext.getSystemService(GameManager.class);
+        mUiDevice = UiDevice.getInstance(instrumentation);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        TestUtil.uninstallPackage(NOT_GAME_TEST_APP_PACKAGE_NAME);
+        TestUtil.uninstallPackage(GAME_TEST_APP_PACKAGE_NAME);
+        TestUtil.uninstallPackage(GAME_TEST_APP_WITH_BATTERY_PACKAGE_NAME);
+        TestUtil.uninstallPackage(GAME_TEST_APP_WITH_PERFORMANCE_PACKAGE_NAME);
+    }
+
+    @Test
+    public void testIsAngleEnabled() throws Exception {
+        final String packageName = GAME_TEST_APP_WITH_PERFORMANCE_PACKAGE_NAME;
+        assertTrue(TestUtil.installPackage(GAME_TEST_APP_WITH_PERFORMANCE_APK_PATH));
+        Thread.sleep(500);
+
+        // enable Angle for BATTERY mode.
+        runShellCommand("device_config put game_overlay " + packageName
+                + " mode=3,useAngle=true");
+        Thread.sleep(500);
+
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(packageName,
+                        GameManager.GAME_MODE_BATTERY), "android.permission.MANAGE_GAME_MODE");
+        assertTrue(ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                (gameManager) -> gameManager.isAngleEnabled(packageName),
+                "android.permission.MANAGE_GAME_MODE"));
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(packageName,
+                        GameManager.GAME_MODE_PERFORMANCE), "android.permission.MANAGE_GAME_MODE");
+        assertFalse(ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                (gameManager) -> gameManager.isAngleEnabled(packageName),
+                "android.permission.MANAGE_GAME_MODE"));
+
+        TestUtil.uninstallPackage(packageName);
+    }
+
+    /**
+     * Test that GameManager::getGameMode() returns the UNSUPPORTED when an app is not a game.
+     */
+    @Test
+    public void testGetGameModeUnsupportedOnNotGame() throws InterruptedException {
+        assertTrue(TestUtil.installPackage(NOT_GAME_TEST_APP_APK_PATH));
+        Thread.sleep(500);
+
+        int gameMode =
+                ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                        (gameManager) -> gameManager.getGameMode(NOT_GAME_TEST_APP_PACKAGE_NAME),
+                        "android.permission.MANAGE_GAME_MODE");
+
+        assertEquals("Game Manager returned incorrect value for "
+                + NOT_GAME_TEST_APP_PACKAGE_NAME, GameManager.GAME_MODE_UNSUPPORTED, gameMode);
+
+        // Attempt to set the game mode to standard.
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(NOT_GAME_TEST_APP_PACKAGE_NAME,
+                        GameManager.GAME_MODE_STANDARD));
+        gameMode = ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                (gameManager) -> gameManager.getGameMode(NOT_GAME_TEST_APP_PACKAGE_NAME),
+                "android.permission.MANAGE_GAME_MODE");
+        assertEquals("Game Manager returned incorrect value for "
+                        + NOT_GAME_TEST_APP_PACKAGE_NAME,
+                GameManager.GAME_MODE_UNSUPPORTED, gameMode);
+
+        // Attempt to set the game mode to performance.
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(NOT_GAME_TEST_APP_PACKAGE_NAME,
+                        GameManager.GAME_MODE_PERFORMANCE));
+        gameMode = ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                (gameManager) -> gameManager.getGameMode(NOT_GAME_TEST_APP_PACKAGE_NAME),
+                "android.permission.MANAGE_GAME_MODE");
+        assertEquals("Game Manager returned incorrect value for "
+                        + NOT_GAME_TEST_APP_PACKAGE_NAME,
+                GameManager.GAME_MODE_UNSUPPORTED, gameMode);
+
+        // Attempt to set the game mode to battery.
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(NOT_GAME_TEST_APP_PACKAGE_NAME,
+                        GameManager.GAME_MODE_BATTERY));
+        gameMode = ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                (gameManager) -> gameManager.getGameMode(NOT_GAME_TEST_APP_PACKAGE_NAME),
+                "android.permission.MANAGE_GAME_MODE");
+        assertEquals("Game Manager returned incorrect value for "
+                        + NOT_GAME_TEST_APP_PACKAGE_NAME,
+                GameManager.GAME_MODE_UNSUPPORTED, gameMode);
+
+        TestUtil.uninstallPackage(NOT_GAME_TEST_APP_PACKAGE_NAME);
     }
 
     /**
@@ -72,7 +203,7 @@
 
         int gameMode = mActivity.getGameMode();
 
-        Assert.assertEquals("Game Manager returned incorrect value.",
+        assertEquals("Game Manager returned incorrect value.",
                 GameManager.GAME_MODE_UNSUPPORTED, gameMode);
     }
 
@@ -88,7 +219,7 @@
 
         int gameMode = mActivity.getGameMode();
 
-        Assert.assertEquals("Game Manager returned incorrect value.",
+        assertEquals("Game Manager returned incorrect value.",
                 GameManager.GAME_MODE_STANDARD, gameMode);
     }
 
@@ -104,7 +235,7 @@
 
         int gameMode = mActivity.getGameMode();
 
-        Assert.assertEquals("Game Manager returned incorrect value.",
+        assertEquals("Game Manager returned incorrect value.",
                 GameManager.GAME_MODE_PERFORMANCE, gameMode);
     }
 
@@ -120,7 +251,158 @@
 
         int gameMode = mActivity.getGameMode();
 
-        Assert.assertEquals("Game Manager returned incorrect value.",
+        assertEquals("Game Manager returned incorrect value.",
                 GameManager.GAME_MODE_BATTERY, gameMode);
     }
+
+    private int getGameLoadingCount() throws IOException {
+        final Matcher matcher =
+                GAME_LOADING_REGEX.matcher(mUiDevice.executeShellCommand(POWER_DUMPSYS_CMD));
+        assumeTrue(matcher.find());
+        return Integer.parseInt(matcher.group(1));
+    }
+
+    /**
+     * Test that GameManager::setGameState() with an 'isLoading' state does not invokes the mode
+     * on the PowerHAL when performance mode is not invoked.
+     */
+    @Test
+    public void testSetGameStateStandardMode() throws IOException, InterruptedException {
+        final int gameLoadingCountBefore = getGameLoadingCount();
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(mActivity.getPackageName(),
+                GameManager.GAME_MODE_STANDARD));
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager, (gameManager) ->
+                gameManager.setGameState(new GameState(true, GameState.MODE_NONE)));
+        Thread.sleep(500);  // Wait for change to take effect.
+        assertEquals(gameLoadingCountBefore, getGameLoadingCount());
+    }
+
+    /**
+     * Test that GameManager::setGameState() with an 'isLoading' state actually invokes the mode
+     * on the PowerHAL when performance mode is invoked.
+     */
+    @Test
+    public void testSetGameStatePerformanceMode() throws IOException, InterruptedException {
+        final int gameLoadingCountBefore = getGameLoadingCount();
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(mActivity.getPackageName(),
+                GameManager.GAME_MODE_PERFORMANCE));
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager, (gameManager) ->
+                gameManager.setGameState(new GameState(true, GameState.MODE_NONE)));
+        Thread.sleep(500);  // Wait for change to take effect.
+        assertEquals(gameLoadingCountBefore + 1, getGameLoadingCount());
+    }
+
+    /**
+     * Test that GameManager::setGameState() with an 'isLoading' state and labels
+     * actually invokes the mode on the PowerHAL when performance mode is invoked.
+     */
+    @Test
+    public void testSetGameStatePerformanceMode_withParams()
+            throws IOException, InterruptedException {
+        final int gameLoadingCountBefore = getGameLoadingCount();
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(mActivity.getPackageName(),
+                        GameManager.GAME_MODE_PERFORMANCE));
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager, (gameManager) ->
+                gameManager.setGameState(
+                        new GameState(true, GameState.MODE_NONE, TEST_LABEL, TEST_QUALITY)));
+        Thread.sleep(500);  // Wait for change to take effect.
+        assertEquals(gameLoadingCountBefore + 1, getGameLoadingCount());
+    }
+
+    /**
+     * Test that GameManager::getGameModeInfo() returns correct values for a game.
+     */
+    @Test
+    public void testGetGameModeInfoWithTwoGameModes() throws InterruptedException {
+        assertTrue(TestUtil.installPackage(GAME_TEST_APP_APK_PATH));
+        // When an app is installed, some propagation work for the configuration will
+        // be set up asynchronously, hence wait for 500ms here.
+        Thread.sleep(500);
+
+        GameModeInfo gameModeInfo =
+                ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                        (gameManager) -> gameManager.getGameModeInfo(GAME_TEST_APP_PACKAGE_NAME),
+                        "android.permission.MANAGE_GAME_MODE");
+        assertEquals("GameManager#getGameModeInfo returned incorrect available game modes.",
+                3, gameModeInfo.getAvailableGameModes().length);
+        assertEquals("GameManager#getGameModeInfo returned incorrect active game mode.",
+                GameManager.GAME_MODE_STANDARD, gameModeInfo.getActiveGameMode());
+
+        // Attempt to set the game mode to standard.
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(GAME_TEST_APP_PACKAGE_NAME,
+                        GameManager.GAME_MODE_STANDARD));
+        gameModeInfo = ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                (gameManager) -> gameManager.getGameModeInfo(GAME_TEST_APP_PACKAGE_NAME),
+                "android.permission.MANAGE_GAME_MODE");
+        assertEquals("GameManager#getGameModeInfo returned incorrect available game modes.",
+                3, gameModeInfo.getAvailableGameModes().length);
+        assertEquals("GameManager#getGameModeInfo returned incorrect active game mode.",
+                GameManager.GAME_MODE_STANDARD, gameModeInfo.getActiveGameMode());
+
+        // Attempt to set the game mode to performance.
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(GAME_TEST_APP_PACKAGE_NAME,
+                        GameManager.GAME_MODE_PERFORMANCE));
+        gameModeInfo = ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                (gameManager) -> gameManager.getGameModeInfo(GAME_TEST_APP_PACKAGE_NAME),
+                "android.permission.MANAGE_GAME_MODE");
+        assertEquals("GameManager#getGameModeInfo returned incorrect available game modes.",
+                3, gameModeInfo.getAvailableGameModes().length);
+        assertEquals("GameManager#getGameModeInfo returned incorrect active game mode.",
+                GameManager.GAME_MODE_PERFORMANCE, gameModeInfo.getActiveGameMode());
+
+        // Attempt to set the game mode to battery.
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(GAME_TEST_APP_PACKAGE_NAME,
+                        GameManager.GAME_MODE_BATTERY));
+        gameModeInfo = ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                (gameManager) -> gameManager.getGameModeInfo(GAME_TEST_APP_PACKAGE_NAME),
+                "android.permission.MANAGE_GAME_MODE");
+        assertEquals("GameManager#getGameModeInfo returned incorrect available game modes.",
+                3, gameModeInfo.getAvailableGameModes().length);
+        assertEquals("GameManager#getGameModeInfo returned incorrect active game mode.",
+                GameManager.GAME_MODE_BATTERY, gameModeInfo.getActiveGameMode());
+
+        TestUtil.uninstallPackage(GAME_TEST_APP_PACKAGE_NAME);
+    }
+
+    /**
+     * Test that GameManager::getGameModeInfo() returns correct values for a game when it only
+     * supports battery mode.
+     */
+    @Test
+    public void testGetGameModeInfoWithBatteryMode() throws InterruptedException {
+        final String packageName = GAME_TEST_APP_WITH_BATTERY_PACKAGE_NAME;
+        assertTrue(TestUtil.installPackage(GAME_TEST_APP_WITH_BATTERY_APK_PATH));
+        // When an app is installed, some propagation work for the configuration will
+        // be set up asynchronously, hence wait for 500ms here.
+        Thread.sleep(500);
+
+        GameModeInfo gameModeInfo =
+                ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                        (gameManager) -> gameManager.getGameModeInfo(packageName),
+                        "android.permission.MANAGE_GAME_MODE");
+        assertEquals("GameManager#getGameModeInfo returned incorrect available game modes.",
+                2, gameModeInfo.getAvailableGameModes().length);
+        assertEquals("GameManager#getGameModeInfo returned incorrect active game mode.",
+                GameManager.GAME_MODE_STANDARD, gameModeInfo.getActiveGameMode());
+
+        // Attempt to set the game mode to battery.
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mGameManager,
+                (gameManager) -> gameManager.setGameMode(packageName,
+                        GameManager.GAME_MODE_BATTERY));
+        gameModeInfo = ShellIdentityUtils.invokeMethodWithShellPermissions(mGameManager,
+                (gameManager) -> gameManager.getGameModeInfo(packageName),
+                "android.permission.MANAGE_GAME_MODE");
+        assertEquals("GameManager#getGameModeInfo returned incorrect available game modes.",
+                2, gameModeInfo.getAvailableGameModes().length);
+        assertEquals("GameManager#getGameModeInfo returned incorrect active game mode.",
+                GameManager.GAME_MODE_BATTERY, gameModeInfo.getActiveGameMode());
+
+        TestUtil.uninstallPackage(packageName);
+    }
 }
diff --git a/tests/tests/gamemanager/src/android/gamemanager/cts/TestUtil.java b/tests/tests/gamemanager/src/android/gamemanager/cts/TestUtil.java
new file mode 100644
index 0000000..643f35f
--- /dev/null
+++ b/tests/tests/gamemanager/src/android/gamemanager/cts/TestUtil.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2022 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 android.gamemanager.cts;
+
+import static com.android.compatibility.common.util.ShellUtils.runShellCommand;
+
+import androidx.annotation.NonNull;
+
+public final class TestUtil {
+
+    // When an app is installed, some propagation work of the configuration will
+    // be set up asynchronously, hence it is recommended to put the thread into sleep
+    // to wait for the propagation finishes for a few hundred milliseconds.
+    public static boolean installPackage(@NonNull String apkPath) {
+        return runShellCommand("pm install --force-queryable -t " + apkPath).equals("Success");
+    }
+
+    public static void uninstallPackage(@NonNull String packageName) {
+        runShellCommand("pm uninstall " + packageName);
+    }
+}
diff --git a/tests/tests/gameservice/Android.bp b/tests/tests/gameservice/Android.bp
new file mode 100644
index 0000000..a9499f9
--- /dev/null
+++ b/tests/tests/gameservice/Android.bp
@@ -0,0 +1,51 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsGameServiceTestCases",
+    srcs: [
+        "src/**/*.aidl",
+        "src/**/*.java",
+    ],
+    data: [
+        ":CtsGameServiceFalsePositiveGame",
+        ":CtsGameServiceGame",
+        ":CtsGameServiceNotGame",
+        ":CtsGameServiceRestartGameVerifier",
+        ":CtsGameServiceStartActivityVerifier",
+        ":CtsGameServiceSystemBarVerifier",
+        ":CtsGameServiceTakeScreenshotVerifier",
+        ":CtsGameServiceTouchVerifier",
+    ],
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+    static_libs: [
+        "androidx.test.core",
+        "compatibility-device-util-axt",
+        "ctstestrunner-axt",
+        "junit",
+        "truth-prebuilt",
+    ],
+    sdk_version: "test_current",
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
diff --git a/tests/tests/gameservice/AndroidManifest.xml b/tests/tests/gameservice/AndroidManifest.xml
new file mode 100644
index 0000000..936184b
--- /dev/null
+++ b/tests/tests/gameservice/AndroidManifest.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.gameservice.cts">
+
+    <uses-permission android:name="android.permission.MANAGE_GAME_ACTIVITY"/>
+    <uses-permission android:name="android.service.games.cts.TEST_START_ACTIVITY"/>
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.MANAGE_MEDIA"/>
+
+    <application android:label="CtsGameServiceTestApp">
+
+        <service
+            android:name="android.service.games.TestGameService"
+            android:exported="true"
+            android:permission="android.permission.BIND_GAME_SERVICE">
+            <meta-data android:name="android.game_service" android:resource="@xml/game_service"/>
+            <intent-filter>
+                <action android:name="android.service.games.action.GAME_SERVICE"/>
+            </intent-filter>
+        </service>
+
+        <service
+            android:name="android.service.games.TestGameSessionService"
+            android:exported="true"
+            android:permission="android.permission.BIND_GAME_SERVICE"/>
+
+        <service
+            android:name="android.service.games.GameServiceTestService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="android.service.games.action.TEST_SERVICE"/>
+            </intent-filter>
+        </service>
+
+        <uses-library android:name="android.test.runner" />
+        <activity android:name="android.service.games.testing.GetResultActivity"/>
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="android.gameservice.cts"
+                     android:label="CTS tests for Android Game Service">
+        <meta-data android:name="listener"
+                   android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
diff --git a/tests/tests/gameservice/AndroidTest.xml b/tests/tests/gameservice/AndroidTest.xml
new file mode 100644
index 0000000..cba2827
--- /dev/null
+++ b/tests/tests/gameservice/AndroidTest.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<configuration description="Runs Game Service Tests.">
+    <option name="test-suite-tag" value="cts" />
+
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsGameServiceGame.apk" />
+        <option name="test-file-name" value="CtsGameServiceFalsePositiveGame.apk" />
+        <option name="test-file-name" value="CtsGameServiceNotGame.apk" />
+        <option name="test-file-name" value="CtsGameServiceStartActivityVerifier.apk" />
+        <option name="test-file-name" value="CtsGameServiceSystemBarVerifier.apk" />
+        <option name="test-file-name" value="CtsGameServiceTouchVerifier.apk" />
+        <option name="test-file-name" value="CtsGameServiceRestartGameVerifier.apk" />
+        <option name="test-file-name" value="CtsGameServiceTakeScreenshotVerifier.apk" />
+        <option name="test-file-name" value="CtsGameServiceTestCases.apk" />
+    </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="input keyevent KEYCODE_WAKEUP" />
+        <option name="run-command" value="wm dismiss-keyguard" />
+        <option name="run-command" value="settings put secure immersive_mode_confirmations confirmed" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.gameservice.cts" />
+    </test>
+</configuration>
diff --git a/tests/tests/gameservice/CtsGameServiceFalsePositiveGame/Android.bp b/tests/tests/gameservice/CtsGameServiceFalsePositiveGame/Android.bp
new file mode 100644
index 0000000..58eae22
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceFalsePositiveGame/Android.bp
@@ -0,0 +1,29 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsGameServiceFalsePositiveGame",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.appcompat_appcompat",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+}
diff --git a/tests/tests/gameservice/CtsGameServiceFalsePositiveGame/AndroidManifest.xml b/tests/tests/gameservice/CtsGameServiceFalsePositiveGame/AndroidManifest.xml
new file mode 100644
index 0000000..5ee5086
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceFalsePositiveGame/AndroidManifest.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.service.games.cts.falsepositive">
+    <!-- This is marked as a game in the manifest, so that the TestGameService can filter it out
+         later. -->
+    <application
+        android:appCategory="game"
+        android:label="CtsGameServiceFalsePositiveGame">
+
+        <activity
+            android:name="android.service.games.cts.falsepositive.MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+</manifest>
diff --git a/tests/tests/gameservice/CtsGameServiceFalsePositiveGame/src/android/service/games/cts/falsepositive/MainActivity.java b/tests/tests/gameservice/CtsGameServiceFalsePositiveGame/src/android/service/games/cts/falsepositive/MainActivity.java
new file mode 100644
index 0000000..1c228ac
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceFalsePositiveGame/src/android/service/games/cts/falsepositive/MainActivity.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.cts.falsepositive;
+
+import android.os.Bundle;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public final class MainActivity extends AppCompatActivity {
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        TextView textView = new TextView(this);
+        textView.setText("This is a game that should be filtered out by the game service");
+        setContentView(textView);
+    }
+}
diff --git a/tests/tests/gameservice/CtsGameServiceGame/Android.bp b/tests/tests/gameservice/CtsGameServiceGame/Android.bp
new file mode 100644
index 0000000..f4a321a
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceGame/Android.bp
@@ -0,0 +1,29 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsGameServiceGame",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.appcompat_appcompat",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+}
diff --git a/tests/tests/gameservice/CtsGameServiceGame/AndroidManifest.xml b/tests/tests/gameservice/CtsGameServiceGame/AndroidManifest.xml
new file mode 100644
index 0000000..5bea502
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceGame/AndroidManifest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.service.games.cts.game">
+    <application
+        android:appCategory="game"
+        android:label="CtsGameServiceGame">
+
+        <activity
+            android:name="android.service.games.cts.game.MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+</manifest>
diff --git a/tests/tests/gameservice/CtsGameServiceGame/src/android/service/games/cts/game/MainActivity.java b/tests/tests/gameservice/CtsGameServiceGame/src/android/service/games/cts/game/MainActivity.java
new file mode 100644
index 0000000..6472fb6
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceGame/src/android/service/games/cts/game/MainActivity.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.cts.game;
+
+import android.os.Bundle;
+import android.view.WindowInsets;
+import android.view.WindowInsetsController;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public final class MainActivity extends AppCompatActivity {
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        TextView textView = new TextView(this);
+        textView.setText("This is a game");
+        setContentView(textView);
+
+        WindowInsetsController windowInsetsController = textView.getWindowInsetsController();
+        windowInsetsController.setSystemBarsBehavior(
+                WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        );
+        windowInsetsController.hide(WindowInsets.Type.systemBars());
+    }
+}
diff --git a/tests/tests/gameservice/CtsGameServiceNotGame/Android.bp b/tests/tests/gameservice/CtsGameServiceNotGame/Android.bp
new file mode 100644
index 0000000..849097c
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceNotGame/Android.bp
@@ -0,0 +1,29 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsGameServiceNotGame",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.appcompat_appcompat",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+}
diff --git a/tests/tests/gameservice/CtsGameServiceNotGame/AndroidManifest.xml b/tests/tests/gameservice/CtsGameServiceNotGame/AndroidManifest.xml
new file mode 100644
index 0000000..e79235d
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceNotGame/AndroidManifest.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.service.games.cts.notgame">
+    <application
+        android:label="CtsGameServiceNotGame">
+
+        <activity
+            android:name="android.service.games.cts.notgame.MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+</manifest>
diff --git a/tests/tests/gameservice/CtsGameServiceNotGame/src/android/service/games/cts/notgame/MainActivity.java b/tests/tests/gameservice/CtsGameServiceNotGame/src/android/service/games/cts/notgame/MainActivity.java
new file mode 100644
index 0000000..224f4ae
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceNotGame/src/android/service/games/cts/notgame/MainActivity.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.cts.notgame;
+
+import android.os.Bundle;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public final class MainActivity extends AppCompatActivity {
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        TextView textView = new TextView(this);
+        textView.setText("This is not a game");
+        setContentView(textView);
+    }
+}
diff --git a/tests/tests/gameservice/CtsGameServiceRestartGameVerifier/Android.bp b/tests/tests/gameservice/CtsGameServiceRestartGameVerifier/Android.bp
new file mode 100644
index 0000000..8416baa
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceRestartGameVerifier/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsGameServiceRestartGameVerifier",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.appcompat_appcompat",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+    resource_dirs: ["res"],
+}
diff --git a/tests/tests/gameservice/CtsGameServiceRestartGameVerifier/AndroidManifest.xml b/tests/tests/gameservice/CtsGameServiceRestartGameVerifier/AndroidManifest.xml
new file mode 100644
index 0000000..d3546bf
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceRestartGameVerifier/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+    <!--
+      ~ Copyright (C) 2022 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.
+      -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.service.games.cts.restartgameverifier">
+
+    <application
+        android:appCategory="game"
+        android:label="CtsGameServiceRestartGameVerifier">
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+</manifest>
diff --git a/tests/tests/gameservice/CtsGameServiceRestartGameVerifier/res/layout/activity_layout.xml b/tests/tests/gameservice/CtsGameServiceRestartGameVerifier/res/layout/activity_layout.xml
new file mode 100644
index 0000000..d670ec7
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceRestartGameVerifier/res/layout/activity_layout.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="horizontal">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="4dp"
+        android:text="Times started: "/>
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/times_started"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/gameservice/CtsGameServiceRestartGameVerifier/src/android/service/games/cts/restartgameverifier/MainActivity.java b/tests/tests/gameservice/CtsGameServiceRestartGameVerifier/src/android/service/games/cts/restartgameverifier/MainActivity.java
new file mode 100644
index 0000000..a91ec44
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceRestartGameVerifier/src/android/service/games/cts/restartgameverifier/MainActivity.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.cts.restartgameverifier;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public final class MainActivity extends AppCompatActivity {
+
+    private static final String TIMES_STARTED_KEY = "times_started_key";
+
+    private int incrementTimesStarted() {
+        SharedPreferences sharedPrefs = getPreferences(Context.MODE_PRIVATE);
+
+        int timesStarted = sharedPrefs.getInt(TIMES_STARTED_KEY, 0) + 1;
+
+        sharedPrefs.edit().putInt(TIMES_STARTED_KEY, timesStarted).commit();
+
+        return timesStarted;
+    }
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_layout);
+
+        final TextView timesStartedView = findViewById(R.id.times_started);
+        timesStartedView.setText(Integer.toString(incrementTimesStarted()));
+    }
+}
diff --git a/tests/tests/gameservice/CtsGameServiceStartActivityVerifier/Android.bp b/tests/tests/gameservice/CtsGameServiceStartActivityVerifier/Android.bp
new file mode 100644
index 0000000..c88cb866
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceStartActivityVerifier/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsGameServiceStartActivityVerifier",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.appcompat_appcompat",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+    resource_dirs: ["res"],
+}
diff --git a/tests/tests/gameservice/CtsGameServiceStartActivityVerifier/AndroidManifest.xml b/tests/tests/gameservice/CtsGameServiceStartActivityVerifier/AndroidManifest.xml
new file mode 100644
index 0000000..62ed0db
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceStartActivityVerifier/AndroidManifest.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.service.games.cts.startactivityverifier">
+
+    <permission
+        android:name="android.service.games.cts.TEST_START_ACTIVITY"
+        android:protectionLevel="normal" />
+
+    <application
+        android:label="CtsGameServiceStartActivityVerifier">
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:permission="android.service.games.cts.TEST_START_ACTIVITY"
+            android:theme="@style/Theme.AppCompat.DayNight">
+            <intent-filter>
+                <action android:name="android.service.games.cts.startactivityverifier.START" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <!-- Alias blocked on an arbitrary permission that the system holds, to test that game
+             service providers can't call activities with system permissions. -->
+        <activity-alias
+            android:name=".BlockedActivity"
+            android:exported="true"
+            android:permission="android.permission.BIND_GAME_SERVICE"
+            android:targetActivity=".MainActivity">
+            <intent-filter>
+                <action android:name="android.service.games.cts.startactivityverifier.START_BLOCKED" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity-alias>
+
+    </application>
+</manifest>
diff --git a/tests/tests/gameservice/CtsGameServiceStartActivityVerifier/res/layout/activity_layout.xml b/tests/tests/gameservice/CtsGameServiceStartActivityVerifier/res/layout/activity_layout.xml
new file mode 100644
index 0000000..b18859c
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceStartActivityVerifier/res/layout/activity_layout.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="result code"
+        android:id="@+id/result_code_edit_text"/>
+    <EditText
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="result data"
+        android:id="@+id/result_data_edit_text"/>
+    <Button
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        android:id="@+id/send_result_button"
+        android:text="Send activity result"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/gameservice/CtsGameServiceStartActivityVerifier/src/android/service/games/cts/startactivityverifier/MainActivity.java b/tests/tests/gameservice/CtsGameServiceStartActivityVerifier/src/android/service/games/cts/startactivityverifier/MainActivity.java
new file mode 100644
index 0000000..535cc71
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceStartActivityVerifier/src/android/service/games/cts/startactivityverifier/MainActivity.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.cts.startactivityverifier;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.util.Log;
+import android.widget.Button;
+import android.widget.EditText;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public final class MainActivity extends AppCompatActivity {
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_layout);
+
+        final EditText resultCodeEditable = findViewById(R.id.result_code_edit_text);
+        final EditText resultDataEditable = findViewById(R.id.result_data_edit_text);
+        final Button sendResultButton = findViewById(R.id.send_result_button);
+        sendResultButton.setOnClickListener(unused -> {
+            int resultCode;
+            try {
+                resultCode = Integer.parseInt(resultCodeEditable.getText().toString());
+            } catch (NumberFormatException e) {
+                Log.w("StartActivityVerifier", "Failed to parse result code", e);
+                finish();
+                return;
+            }
+            final String resultData = resultDataEditable.getText().toString();
+            if (TextUtils.isEmpty(resultData)) {
+                setResult(resultCode);
+            } else {
+                final Intent data = new Intent();
+                data.putExtra("data", resultData);
+                setResult(resultCode, data);
+            }
+
+            finish();
+        });
+    }
+}
diff --git a/tests/tests/gameservice/CtsGameServiceSystemBarVerifier/Android.bp b/tests/tests/gameservice/CtsGameServiceSystemBarVerifier/Android.bp
new file mode 100644
index 0000000..5c303c4
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceSystemBarVerifier/Android.bp
@@ -0,0 +1,29 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsGameServiceSystemBarVerifier",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.appcompat_appcompat",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+}
diff --git a/tests/tests/gameservice/CtsGameServiceSystemBarVerifier/AndroidManifest.xml b/tests/tests/gameservice/CtsGameServiceSystemBarVerifier/AndroidManifest.xml
new file mode 100644
index 0000000..2e60120
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceSystemBarVerifier/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.service.games.cts.systembarverifier">
+
+    <application
+        android:appCategory="game"
+        android:label="CtsGameServiceSystemBarVerifier">
+
+        <activity
+            android:name="android.service.games.cts.systembarverifier.MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+</manifest>
diff --git a/tests/tests/gameservice/CtsGameServiceSystemBarVerifier/src/android/service/games/cts/systembarverifier/MainActivity.java b/tests/tests/gameservice/CtsGameServiceSystemBarVerifier/src/android/service/games/cts/systembarverifier/MainActivity.java
new file mode 100644
index 0000000..79a847c
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceSystemBarVerifier/src/android/service/games/cts/systembarverifier/MainActivity.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.cts.systembarverifier;
+
+import android.os.Bundle;
+import android.view.WindowInsets;
+import android.view.WindowInsetsController;
+import android.widget.Button;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public final class MainActivity extends AppCompatActivity {
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Button button = new Button(this);
+        button.setText("Show system bars permanently");
+        button.setAllCaps(false);
+        setContentView(button);
+
+        final WindowInsetsController windowInsetsController = button.getWindowInsetsController();
+        windowInsetsController.setSystemBarsBehavior(
+                WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE);
+        windowInsetsController.hide(WindowInsets.Type.systemBars());
+
+        button.setOnClickListener(v -> {
+            windowInsetsController.setSystemBarsBehavior(WindowInsetsController.BEHAVIOR_DEFAULT);
+            windowInsetsController.show(WindowInsets.Type.systemBars());
+        });
+    }
+}
diff --git a/tests/tests/gameservice/CtsGameServiceTakeScreenshotVerifier/Android.bp b/tests/tests/gameservice/CtsGameServiceTakeScreenshotVerifier/Android.bp
new file mode 100644
index 0000000..3f9fc4d
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceTakeScreenshotVerifier/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsGameServiceTakeScreenshotVerifier",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.appcompat_appcompat",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+    resource_dirs: ["res"],
+}
diff --git a/tests/tests/gameservice/CtsGameServiceTakeScreenshotVerifier/AndroidManifest.xml b/tests/tests/gameservice/CtsGameServiceTakeScreenshotVerifier/AndroidManifest.xml
new file mode 100644
index 0000000..bcf3c80
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceTakeScreenshotVerifier/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.service.games.cts.takescreenshotverifier">
+
+    <application
+        android:appCategory="game"
+        android:label="CtsGameServiceTakeScreenshotVerifier">
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+</manifest>
diff --git a/tests/tests/gameservice/CtsGameServiceTakeScreenshotVerifier/res/layout/activity_layout.xml b/tests/tests/gameservice/CtsGameServiceTakeScreenshotVerifier/res/layout/activity_layout.xml
new file mode 100644
index 0000000..243c7cb
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceTakeScreenshotVerifier/res/layout/activity_layout.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent"
+             android:background="#FF0000">
+</FrameLayout>
diff --git a/tests/tests/gameservice/CtsGameServiceTakeScreenshotVerifier/src/android/service/games/cts/takescreenshotverifier/MainActivity.java b/tests/tests/gameservice/CtsGameServiceTakeScreenshotVerifier/src/android/service/games/cts/takescreenshotverifier/MainActivity.java
new file mode 100644
index 0000000..693ce40
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceTakeScreenshotVerifier/src/android/service/games/cts/takescreenshotverifier/MainActivity.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.cts.takescreenshotverifier;
+
+import android.os.Bundle;
+import android.view.View;
+import android.view.WindowManager;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public final class MainActivity extends AppCompatActivity {
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_layout);
+
+        // Make sure that the activity is completely fullscreen (i.e., no system views are
+        // rendered on top of the game).
+        getWindow()
+                .getDecorView()
+                .setSystemUiVisibility(
+                        View.SYSTEM_UI_FLAG_IMMERSIVE
+                                | View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                                | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+                                | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                                | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+                                | View.SYSTEM_UI_FLAG_FULLSCREEN);
+        getWindow().getAttributes().layoutInDisplayCutoutMode =
+                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
+    }
+}
diff --git a/tests/tests/gameservice/CtsGameServiceTouchVerifier/Android.bp b/tests/tests/gameservice/CtsGameServiceTouchVerifier/Android.bp
new file mode 100644
index 0000000..fe6c5d5
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceTouchVerifier/Android.bp
@@ -0,0 +1,30 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsGameServiceTouchVerifier",
+    srcs: [
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.appcompat_appcompat",
+    ],
+    defaults: ["cts_support_defaults"],
+    min_sdk_version: "current",
+    resource_dirs: ["res"],
+}
diff --git a/tests/tests/gameservice/CtsGameServiceTouchVerifier/AndroidManifest.xml b/tests/tests/gameservice/CtsGameServiceTouchVerifier/AndroidManifest.xml
new file mode 100644
index 0000000..bcd3dce
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceTouchVerifier/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.service.games.cts.touchverifier">
+
+    <application
+        android:appCategory="game"
+        android:label="CtsGameServiceTouchVerifier">
+
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AppCompat.DayNight">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+
+    </application>
+</manifest>
diff --git a/tests/tests/gameservice/CtsGameServiceTouchVerifier/res/layout/activity_layout.xml b/tests/tests/gameservice/CtsGameServiceTouchVerifier/res/layout/activity_layout.xml
new file mode 100644
index 0000000..83d4202
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceTouchVerifier/res/layout/activity_layout.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:id="@+id/root_view">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="4dp"
+            android:text="Times clicked: "/>
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/times_clicked"/>
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/tests/tests/gameservice/CtsGameServiceTouchVerifier/src/android/service/games/cts/touchverifier/MainActivity.java b/tests/tests/gameservice/CtsGameServiceTouchVerifier/src/android/service/games/cts/touchverifier/MainActivity.java
new file mode 100644
index 0000000..948ebcc
--- /dev/null
+++ b/tests/tests/gameservice/CtsGameServiceTouchVerifier/src/android/service/games/cts/touchverifier/MainActivity.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.cts.touchverifier;
+
+import android.os.Bundle;
+import android.view.View;
+import android.view.WindowInsets;
+import android.view.WindowInsetsController;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public final class MainActivity extends AppCompatActivity {
+    private int mTimesClicked = 0;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        setContentView(R.layout.activity_layout);
+
+        final View rootView = findViewById(R.id.root_view);
+        final TextView timesClickedView = findViewById(R.id.times_clicked);
+        timesClickedView.setText(Integer.toString(mTimesClicked));
+
+        rootView.setOnClickListener(v -> {
+            mTimesClicked++;
+            timesClickedView.setText(Integer.toString(mTimesClicked));
+        });
+
+        WindowInsetsController windowInsetsController = rootView.getWindowInsetsController();
+        windowInsetsController.setSystemBarsBehavior(
+                WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
+        );
+        windowInsetsController.hide(WindowInsets.Type.systemBars());
+    }
+}
diff --git a/tests/tests/gameservice/OWNERS b/tests/tests/gameservice/OWNERS
new file mode 100644
index 0000000..8591f34
--- /dev/null
+++ b/tests/tests/gameservice/OWNERS
@@ -0,0 +1,3 @@
+# Bug component: 878256
+lpy@google.com
+timvp@google.com
\ No newline at end of file
diff --git a/tests/tests/gameservice/TEST_MAPPING b/tests/tests/gameservice/TEST_MAPPING
new file mode 100644
index 0000000..8d6b802
--- /dev/null
+++ b/tests/tests/gameservice/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsGameServiceTestCases"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/tests/gameservice/res/xml/game_service.xml b/tests/tests/gameservice/res/xml/game_service.xml
new file mode 100644
index 0000000..c4d2295
--- /dev/null
+++ b/tests/tests/gameservice/res/xml/game_service.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<game-service xmlns:android="http://schemas.android.com/apk/res/android"
+      android:gameSessionService="android.service.games.TestGameSessionService"/>
\ No newline at end of file
diff --git a/tests/tests/gameservice/src/android/service/games/GameServiceTest.java b/tests/tests/gameservice/src/android/service/games/GameServiceTest.java
new file mode 100644
index 0000000..f83a8cc
--- /dev/null
+++ b/tests/tests/gameservice/src/android/service/games/GameServiceTest.java
@@ -0,0 +1,677 @@
+/*
+ * Copyright (C) 2021 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 android.service.games;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
+import android.app.Activity;
+import android.app.GameManager;
+import android.app.Instrumentation;
+import android.app.PendingIntent;
+import android.content.ActivityNotFoundException;
+import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.ImageDecoder;
+import android.graphics.Rect;
+import android.net.Uri;
+import android.os.IBinder;
+import android.os.RemoteException;
+import android.provider.MediaStore;
+import android.service.games.testing.ActivityResult;
+import android.service.games.testing.GetResultActivity;
+import android.service.games.testing.IGameServiceTestService;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject;
+import android.support.test.uiautomator.UiSelector;
+import android.support.test.uiautomator.Until;
+import android.util.Log;
+import android.util.Size;
+import android.view.WindowManager;
+import android.view.WindowMetrics;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.ShellIdentityUtils;
+import com.android.compatibility.common.util.ShellUtils;
+import com.android.compatibility.common.util.UiAutomatorUtils;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized.Parameter;
+
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * CTS tests for {@link android.service.games.GameService}.
+ */
+@RunWith(AndroidJUnit4.class)
+public final class GameServiceTest {
+    static final String TAG = "GameServiceTest";
+
+    private static final String GAME_PACKAGE_NAME = "android.service.games.cts.game";
+    private static final String FALSE_POSITIVE_GAME_PACKAGE_NAME =
+            "android.service.games.cts.falsepositive";
+    private static final String NOT_GAME_PACKAGE_NAME = "android.service.games.cts.notgame";
+    private static final String RESTART_GAME_VERIFIER_PACKAGE_NAME =
+            "android.service.games.cts.restartgameverifier";
+    private static final String START_ACTIVITY_VERIFIER_PACKAGE_NAME =
+            "android.service.games.cts.startactivityverifier";
+    private static final String SYSTEM_BAR_VERIFIER_PACKAGE_NAME =
+            "android.service.games.cts.systembarverifier";
+    private static final String TAKE_SCREENSHOT_VERIFIER_PACKAGE_NAME =
+            "android.service.games.cts.takescreenshotverifier";
+    private static final String TOUCH_VERIFIER_PACKAGE_NAME =
+            "android.service.games.cts.touchverifier";
+
+    @Parameter(0)
+    public String mVolumeName;
+
+    private ServiceConnection mServiceConnection;
+    private ContentResolver mContentResolver;
+
+    @Before
+    public void setUp() throws Exception {
+        mServiceConnection = new ServiceConnection();
+        assertThat(
+                getInstrumentation().getContext().bindService(
+                        new Intent("android.service.games.action.TEST_SERVICE").setPackage(
+                                getInstrumentation().getContext().getPackageName()),
+                        mServiceConnection,
+                        Context.BIND_AUTO_CREATE)).isTrue();
+        mServiceConnection.waitForConnection(10, TimeUnit.SECONDS);
+
+        getTestService().setGamePackageNames(
+                ImmutableList.of(
+                        GAME_PACKAGE_NAME,
+                        RESTART_GAME_VERIFIER_PACKAGE_NAME,
+                        SYSTEM_BAR_VERIFIER_PACKAGE_NAME,
+                        TAKE_SCREENSHOT_VERIFIER_PACKAGE_NAME,
+                        TOUCH_VERIFIER_PACKAGE_NAME));
+
+        GameManager gameManager =
+                getInstrumentation().getContext().getSystemService(GameManager.class);
+
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(gameManager,
+                manager -> manager.setGameServiceProvider(
+                        getInstrumentation().getContext().getPackageName()));
+        mContentResolver = getInstrumentation().getContext().getContentResolver();
+
+        if (gameServiceFeaturePresent()) {
+            waitForGameServiceConnected();
+        }
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        forceStop(GAME_PACKAGE_NAME);
+        forceStop(NOT_GAME_PACKAGE_NAME);
+        forceStop(FALSE_POSITIVE_GAME_PACKAGE_NAME);
+        forceStop(RESTART_GAME_VERIFIER_PACKAGE_NAME);
+        forceStop(START_ACTIVITY_VERIFIER_PACKAGE_NAME);
+        forceStop(SYSTEM_BAR_VERIFIER_PACKAGE_NAME);
+        forceStop(TAKE_SCREENSHOT_VERIFIER_PACKAGE_NAME);
+        forceStop(TOUCH_VERIFIER_PACKAGE_NAME);
+
+        GameManager gameManager =
+                getInstrumentation().getContext().getSystemService(GameManager.class);
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(gameManager,
+                manager -> manager.setGameServiceProvider(""));
+
+        getTestService().resetState();
+    }
+
+    @Test
+    public void gameService_connectsOnStartup() throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        waitForGameServiceConnected();
+        assertThat(isGameServiceConnected()).isTrue();
+    }
+
+    @Test
+    public void gameService_connectsWhenGameServiceComponentIsEnabled() throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        waitForGameServiceConnected();
+
+        getTestService().setGameServiceComponentEnabled(false);
+        waitForGameServiceDisconnected();
+
+        getTestService().setGameServiceComponentEnabled(true);
+        waitForGameServiceConnected();
+    }
+
+    @Test
+    public void gameService_connectsWhenGameSessionServiceComponentIsEnabled() throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        waitForGameServiceConnected();
+
+        getTestService().setGameSessionServiceComponentEnabled(false);
+        waitForGameServiceDisconnected();
+
+        getTestService().setGameSessionServiceComponentEnabled(true);
+        waitForGameServiceConnected();
+    }
+
+    @Test
+    public void gameService_startsGameSessionsForGames() throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        launchAndWaitForPackage(NOT_GAME_PACKAGE_NAME);
+        launchAndWaitForPackage(GAME_PACKAGE_NAME);
+        launchAndWaitForPackage(FALSE_POSITIVE_GAME_PACKAGE_NAME);
+
+        assertThat(getTestService().getActiveSessions()).containsExactly(
+                GAME_PACKAGE_NAME);
+    }
+
+    @Test
+    public void getTaskId_returnsTaskIdOfGame() throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        launchAndWaitForPackage(GAME_PACKAGE_NAME);
+
+        int taskId = getTestService().getFocusedTaskId();
+
+        assertThat(taskId).isEqualTo(
+                getActivityTaskId(GAME_PACKAGE_NAME, GAME_PACKAGE_NAME + ".MainActivity"));
+    }
+
+    @Test
+    public void setTaskOverlayView_addsViewsToOverlay() throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        launchAndWaitForPackage(GAME_PACKAGE_NAME);
+
+        waitForTouchableOverlayBounds();
+
+        assertThat(UiAutomatorUtils.getUiDevice().findObject(
+                By.text("Overlay was rendered on: " + GAME_PACKAGE_NAME))).isNotNull();
+    }
+
+    @Test
+    public void setTaskOverlayView_passesTouchesOutsideOverlayToGame() throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        launchAndWaitForPackage(TOUCH_VERIFIER_PACKAGE_NAME);
+
+        Rect touchableBounds = waitForTouchableOverlayBounds();
+        UiAutomatorUtils.getUiDevice().click(touchableBounds.centerX(), touchableBounds.centerY());
+
+        UiAutomatorUtils.waitFindObject(
+                By.res(TOUCH_VERIFIER_PACKAGE_NAME, "times_clicked").text("0"));
+
+        UiAutomatorUtils.getUiDevice().click(touchableBounds.centerX(), touchableBounds.top - 30);
+        UiAutomatorUtils.waitFindObject(
+                By.res(TOUCH_VERIFIER_PACKAGE_NAME, "times_clicked").text("1"));
+
+        UiAutomatorUtils.getUiDevice()
+                .click(touchableBounds.centerX(), touchableBounds.bottom + 30);
+        UiAutomatorUtils.waitFindObject(
+                By.res(TOUCH_VERIFIER_PACKAGE_NAME, "times_clicked").text("2"));
+
+        UiAutomatorUtils.getUiDevice().click(touchableBounds.left - 30, touchableBounds.centerY());
+        UiAutomatorUtils.waitFindObject(
+                By.res(TOUCH_VERIFIER_PACKAGE_NAME, "times_clicked").text("3"));
+
+        UiAutomatorUtils.getUiDevice().click(touchableBounds.right + 30, touchableBounds.centerY());
+        UiAutomatorUtils.waitFindObject(
+                By.res(TOUCH_VERIFIER_PACKAGE_NAME, "times_clicked").text("4"));
+    }
+
+    @Test
+    public void onTransientSystemBarVisibilityChanged_nonTransient_doesNotDispatchShow()
+            throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        launchAndWaitForPackage(SYSTEM_BAR_VERIFIER_PACKAGE_NAME);
+
+        UiAutomatorUtils.getUiDevice().findObject(
+                        By.text("Show system bars permanently")
+                                .pkg(SYSTEM_BAR_VERIFIER_PACKAGE_NAME))
+                .click();
+
+        assertThat(
+                getTestService().getOnSystemBarVisibilityChangedInfo().getTimesShown())
+                .isEqualTo(0);
+    }
+
+    @Test
+    public void onTransientSystemBarVisibilityFromRevealGestureChanged_dispatchesHideEvent()
+            throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        launchAndWaitForPackage(GAME_PACKAGE_NAME);
+        swipeFromTopEdgeToShowSystemBars();
+
+        assertThat(
+                getTestService().getOnSystemBarVisibilityChangedInfo().getTimesShown())
+                .isEqualTo(1);
+
+        PollingCheck.waitFor(
+                () -> {
+                    try {
+                        return getTestService().getOnSystemBarVisibilityChangedInfo()
+                                .getTimesHidden() > 0;
+                    } catch (RemoteException e) {
+                        return false;
+                    }
+                });
+        assertThat(
+                getTestService().getOnSystemBarVisibilityChangedInfo().getTimesHidden())
+                .isEqualTo(1);
+    }
+
+    @Test
+    public void startActivityForResult_startsActivityAndReceivesResultWithData() throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        launchAndWaitForPackage(GAME_PACKAGE_NAME);
+
+        getTestService().startGameSessionActivity(
+                new Intent("android.service.games.cts.startactivityverifier.START"), null);
+
+        setText(START_ACTIVITY_VERIFIER_PACKAGE_NAME, "result_code_edit_text", "10");
+        setText(START_ACTIVITY_VERIFIER_PACKAGE_NAME, "result_data_edit_text", "foobar");
+        click(START_ACTIVITY_VERIFIER_PACKAGE_NAME, "send_result_button");
+
+        ActivityResult result = getTestService().getLastActivityResult();
+
+        assertThat(result.getGameSessionPackageName()).isEqualTo(GAME_PACKAGE_NAME);
+        assertThat(result.getSuccess().getResultCode()).isEqualTo(10);
+        assertThat(result.getSuccess().getData().getStringExtra("data")).isEqualTo("foobar");
+    }
+
+    @Test
+    public void startActivityForResult_startsActivityAndReceivesResultWithNoData()
+            throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        launchAndWaitForPackage(GAME_PACKAGE_NAME);
+
+        getTestService().startGameSessionActivity(
+                new Intent("android.service.games.cts.startactivityverifier.START"), null);
+
+        setText(START_ACTIVITY_VERIFIER_PACKAGE_NAME, "result_code_edit_text", "10");
+        click(START_ACTIVITY_VERIFIER_PACKAGE_NAME, "send_result_button");
+
+        ActivityResult result = getTestService().getLastActivityResult();
+
+        assertThat(result.getGameSessionPackageName()).isEqualTo(GAME_PACKAGE_NAME);
+        assertThat(result.getSuccess().getResultCode()).isEqualTo(10);
+        assertThat(result.getSuccess().getData()).isNull();
+    }
+
+    @Test
+    public void startActivityForResult_cannotStartBlockedActivities() throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        launchAndWaitForPackage(GAME_PACKAGE_NAME);
+
+        getTestService().startGameSessionActivity(
+                new Intent("android.service.games.cts.startactivityverifier.START_BLOCKED"), null);
+
+        ActivityResult result = getTestService().getLastActivityResult();
+
+        assertThat(result.getGameSessionPackageName()).isEqualTo(GAME_PACKAGE_NAME);
+        assertThat(result.getFailure().getClazz()).isEqualTo(SecurityException.class);
+    }
+
+    @Test
+    public void startActivityForResult_propagatesActivityNotFoundException() throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        launchAndWaitForPackage(GAME_PACKAGE_NAME);
+
+        getTestService().startGameSessionActivity(new Intent("NO_ACTION"), null);
+
+        ActivityResult result = getTestService().getLastActivityResult();
+
+        assertThat(result.getGameSessionPackageName()).isEqualTo(GAME_PACKAGE_NAME);
+        assertThat(result.getFailure().getClazz()).isEqualTo(ActivityNotFoundException.class);
+    }
+
+    @Test
+    public void restartGame_gameAppIsRestarted() throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        launchAndWaitForPackage(RESTART_GAME_VERIFIER_PACKAGE_NAME);
+
+        UiAutomatorUtils.waitFindObject(
+                By.res(RESTART_GAME_VERIFIER_PACKAGE_NAME, "times_started").text("1"));
+
+        getTestService().restartFocusedGameSession();
+
+        UiAutomatorUtils.waitFindObject(
+                By.res(RESTART_GAME_VERIFIER_PACKAGE_NAME, "times_started").text("2"));
+
+        getTestService().restartFocusedGameSession();
+
+        UiAutomatorUtils.waitFindObject(
+                By.res(RESTART_GAME_VERIFIER_PACKAGE_NAME, "times_started").text("3"));
+    }
+
+    @Test
+    public void takeScreenshot_expectedScreenshotSaved() throws Exception {
+        assumeGameServiceFeaturePresent();
+
+        launchAndWaitForPackage(TAKE_SCREENSHOT_VERIFIER_PACKAGE_NAME);
+
+        // Make sure that the overlay is shown so that assertions can be made to check that
+        // the overlay is excluded from the game screenshot.
+        final Rect overlayBounds = waitForTouchableOverlayBounds();
+
+        long startTimeSecs = Instant.now().getEpochSecond();
+        final boolean ret = getTestService().takeScreenshotForFocusedGameSession();
+
+        // Make sure a screenshot was taken, saved in media, and has the same dimensions as the
+        // device screen.
+        assertTrue(ret);
+
+        List<Uri> screenshotUris = PollingCheck.waitFor(TimeUnit.SECONDS.toMillis(5),
+                () -> getScreenshotsFromLastFiveSeconds(startTimeSecs), uris -> !uris.isEmpty());
+        for (Uri screenshotUri : screenshotUris) {
+            final ImageDecoder.Source source = ImageDecoder.createSource(mContentResolver,
+                    screenshotUri);
+            // convert the hardware bitmap to a mutable 4-byte bitmap to get/compare pixel
+            final Bitmap gameScreenshot = ImageDecoder.decodeBitmap(source).copy(
+                    Bitmap.Config.ARGB_8888, true);
+
+            final Size screenSize = getScreenSize();
+            assertThat(gameScreenshot.getWidth()).isEqualTo(screenSize.getWidth());
+            assertThat(gameScreenshot.getHeight()).isEqualTo(screenSize.getHeight());
+
+            // The test game is always fullscreen red. It is too expensive to verify that
+            // the entire bitmap is red, so spot check certain areas.
+
+            // 1. Make sure that the overlay is excluded from the screenshot by checking
+            // pixels within the overlay bounds:
+
+            // top-left of overlay bounds:
+            assertThat(
+                    gameScreenshot.getPixel(overlayBounds.left + 1,
+                            overlayBounds.top + 1)).isEqualTo(
+                    Color.RED);
+            // bottom-left corner of overlay bounds:
+            assertThat(gameScreenshot.getPixel(overlayBounds.left + 1,
+                    overlayBounds.bottom - 1)).isEqualTo(Color.RED);
+            // top-right corner of overlay bounds:
+            assertThat(
+                    gameScreenshot.getPixel(overlayBounds.right - 1,
+                            overlayBounds.top + 1)).isEqualTo(
+                    Color.RED);
+            // bottom-right corner of overlay bounds:
+            assertThat(gameScreenshot.getPixel(overlayBounds.right - 1,
+                    overlayBounds.bottom - 1)).isEqualTo(Color.RED);
+            // middle corner of overlay bounds:
+            assertThat(
+                    gameScreenshot.getPixel((overlayBounds.left + overlayBounds.right) / 2,
+                            (overlayBounds.top + overlayBounds.bottom) / 2)).isEqualTo(
+                    Color.RED);
+
+            // 2. Also check some pixels between the edge of the screen and the overlay
+            // bounds:
+
+            // above and to the left of the overlay
+            assertThat(
+                    gameScreenshot.getPixel(overlayBounds.left / 2,
+                            overlayBounds.top / 2)).isEqualTo(
+                    Color.RED);
+            // below and to the left of the overlay
+            assertThat(gameScreenshot.getPixel(overlayBounds.left / 2,
+                    (overlayBounds.bottom + gameScreenshot.getHeight()) / 2)).isEqualTo(
+                    Color.RED);
+            // above and to the right of the overlay
+            assertThat(gameScreenshot.getPixel(
+                    (overlayBounds.left + gameScreenshot.getWidth()) / 2,
+                    overlayBounds.top / 2)).isEqualTo(Color.RED);
+            // below and to the right of the overlay
+            assertThat(gameScreenshot.getPixel(
+                    (overlayBounds.left + gameScreenshot.getWidth()) / 2,
+                    (overlayBounds.bottom + gameScreenshot.getHeight()) / 2)).isEqualTo(
+                    Color.RED);
+
+            // 3. Finally check some pixels at the corners of the screen:
+
+            // top-left corner of screen
+            assertThat(gameScreenshot.getPixel(0, 0)).isEqualTo(Color.RED);
+            // bottom-left corner of screen
+            assertThat(
+                    gameScreenshot.getPixel(0, gameScreenshot.getHeight() - 1)).isEqualTo(
+                    Color.RED);
+            // top-right corner of screen
+            assertThat(gameScreenshot.getPixel(gameScreenshot.getWidth() - 1, 0)).isEqualTo(
+                    Color.RED);
+            // bottom-right corner of screen
+            assertThat(gameScreenshot.getPixel(gameScreenshot.getWidth() - 1,
+                    gameScreenshot.getHeight() - 1)).isEqualTo(Color.RED);
+            final PendingIntent pi = MediaStore.createDeleteRequest(mContentResolver,
+                    ImmutableList.of(screenshotUri));
+            final GetResultActivity.Result result = startIntentWithGrant(pi);
+            assertEquals(Activity.RESULT_OK, result.resultCode);
+        }
+    }
+
+    private List<Uri> getScreenshotsFromLastFiveSeconds(long startTimeSecs) {
+        final Uri contentUri = MediaStore.Images.Media.EXTERNAL_CONTENT_URI;
+        final List<Uri> screenshotUris = new ArrayList<>();
+        try (Cursor cursor = mContentResolver.query(contentUri,
+                new String[]{MediaStore.MediaColumns._ID, MediaStore.MediaColumns.DISPLAY_NAME,
+                        MediaStore.MediaColumns.DATE_ADDED}, null, null,
+                MediaStore.MediaColumns.DATE_ADDED + " DESC")) {
+            while (cursor.moveToNext()) {
+                final long addedTimeSecs = cursor.getLong(2);
+                // try to find the latest screenshot file created within 5s
+                if (addedTimeSecs >= startTimeSecs && addedTimeSecs - startTimeSecs < 5) {
+                    final long id = cursor.getLong(0);
+                    final Uri screenshotUri = ContentUris.withAppendedId(contentUri, id);
+                    final String name = cursor.getString(1);
+                    Log.d(TAG, "Found screenshot with name " + name);
+                    screenshotUris.add(screenshotUri);
+                }
+            }
+        }
+        return screenshotUris;
+    }
+
+    private GetResultActivity.Result startIntentWithGrant(PendingIntent pi) throws Exception {
+        final Instrumentation inst = InstrumentationRegistry.getInstrumentation();
+        final Intent intent = new Intent(inst.getContext(), GetResultActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
+        final UiDevice device = UiDevice.getInstance(inst);
+        final GetResultActivity activity = (GetResultActivity) inst.startActivitySync(intent);
+        inst.waitForIdleSync();
+        activity.mResult.clear();
+        device.waitForIdle();
+        activity.startIntentSenderForResult(pi.getIntentSender(), 42, null, 0, 0, 0);
+        device.waitForIdle();
+        final UiSelector grant = new UiSelector().textMatches("(?i)Allow");
+        final boolean grantExists = new UiObject(grant).waitForExists(5000);
+        if (grantExists) {
+            device.findObject(grant).click();
+        }
+        return activity.getResult();
+    }
+
+    private IGameServiceTestService getTestService() {
+        return mServiceConnection.mService;
+    }
+
+    private static void assumeGameServiceFeaturePresent() {
+        assumeTrue(gameServiceFeaturePresent());
+    }
+
+    private static boolean gameServiceFeaturePresent() {
+        return getInstrumentation().getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_GAME_SERVICE);
+    }
+
+    private static void launchAndWaitForPackage(String packageName) throws Exception {
+        PackageManager packageManager = getInstrumentation().getContext().getPackageManager();
+        getInstrumentation().getContext().startActivity(
+                packageManager.getLaunchIntentForPackage(packageName));
+        UiAutomatorUtils.waitFindObject(By.pkg(packageName).depth(0));
+    }
+
+    private static void setText(String resourcePackage, String resourceId, String text)
+            throws Exception {
+        UiAutomatorUtils.waitFindObject(By.res(resourcePackage, resourceId))
+                .setText(text);
+    }
+
+    private static void click(String resourcePackage, String resourceId) throws Exception {
+        UiAutomatorUtils.waitFindObject(By.res(resourcePackage, resourceId))
+                .click();
+    }
+
+    private static void swipeFromTopEdgeToShowSystemBars() {
+        UiDevice uiDevice = UiAutomatorUtils.getUiDevice();
+        uiDevice.swipe(
+                uiDevice.getDisplayWidth() / 2, 20,
+                uiDevice.getDisplayWidth() / 2, uiDevice.getDisplayHeight() / 2,
+                10);
+    }
+
+    private void waitForGameServiceConnected() {
+        PollingCheck.waitFor(TimeUnit.SECONDS.toMillis(5), () -> isGameServiceConnected(),
+                "Timed out waiting for game service to connect");
+    }
+
+    private void waitForGameServiceDisconnected() {
+        PollingCheck.waitFor(TimeUnit.SECONDS.toMillis(5), () -> !isGameServiceConnected(),
+                "Timed out waiting for game service to disconnect");
+    }
+
+    private boolean isGameServiceConnected() {
+        try {
+            return getTestService().isGameServiceConnected();
+        } catch (RemoteException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private Rect waitForTouchableOverlayBounds() {
+        return PollingCheck.waitFor(
+                TimeUnit.SECONDS.toMillis(5),
+                () -> {
+                    try {
+                        return getTestService().getTouchableOverlayBounds();
+                    } catch (RemoteException e) {
+                        throw new RuntimeException(e);
+                    }
+                },
+                bounds -> bounds != null && !bounds.isEmpty());
+    }
+
+    private void assertOverlayDoesNotAppear() {
+        assertThat(waitForTouchableOverlayBounds().isEmpty()).isTrue();
+    }
+
+    private Rect waitForOverlayToDisappear() {
+        return PollingCheck.waitFor(
+                TimeUnit.SECONDS.toMillis(20),
+                () -> {
+                    try {
+                        return getTestService().getTouchableOverlayBounds();
+                    } catch (RemoteException e) {
+                        throw new RuntimeException(e);
+                    }
+                },
+                Rect::isEmpty);
+    }
+
+    private static void forceStop(String packageName) {
+        ShellUtils.runShellCommand("am force-stop %s", packageName);
+        UiAutomatorUtils.getUiDevice().wait(Until.gone(By.pkg(packageName).depth(0)),
+                TimeUnit.SECONDS.toMillis(20));
+    }
+
+    private static int getActivityTaskId(String packageName, String componentName) {
+        final String output = ShellUtils.runShellCommand("am stack list");
+        final Pattern pattern = Pattern.compile(
+                String.format(".*taskId=([0-9]+): %s/%s.*", packageName, componentName));
+
+        for (String line : output.split("\\n")) {
+            Matcher matcher = pattern.matcher(line);
+            if (matcher.matches()) {
+                String taskId = matcher.group(1);
+                return Integer.parseInt(taskId);
+            }
+        }
+
+        return -1;
+    }
+
+    private static Size getScreenSize() {
+        WindowManager wm =
+                (WindowManager)
+                        InstrumentationRegistry.getInstrumentation()
+                                .getContext()
+                                .getSystemService(Context.WINDOW_SERVICE);
+        WindowMetrics windowMetrics = wm.getCurrentWindowMetrics();
+        Rect windowBounds = windowMetrics.getBounds();
+        return new Size(windowBounds.width(), windowBounds.height());
+    }
+
+    private static final class ServiceConnection implements android.content.ServiceConnection {
+        private final Semaphore mSemaphore = new Semaphore(0);
+        private IGameServiceTestService mService;
+
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mService = IGameServiceTestService.Stub.asInterface(service);
+            mSemaphore.release();
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            mService = null;
+        }
+
+        public void waitForConnection(int timeout, TimeUnit timeUnit) throws Exception {
+            assertThat(mSemaphore.tryAcquire(timeout, timeUnit)).isTrue();
+        }
+    }
+}
diff --git a/tests/tests/gameservice/src/android/service/games/GameServiceTestService.java b/tests/tests/gameservice/src/android/service/games/GameServiceTestService.java
new file mode 100644
index 0000000..a907340
--- /dev/null
+++ b/tests/tests/gameservice/src/android/service/games/GameServiceTestService.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright (C) 2022 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 android.service.games;
+
+import android.app.Service;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.service.games.GameSession.ScreenshotCallback;
+import android.service.games.TestGameSessionService.TestGameSession;
+import android.service.games.testing.ActivityResult;
+import android.service.games.testing.IGameServiceTestService;
+import android.service.games.testing.OnSystemBarVisibilityChangedInfo;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.android.compatibility.common.util.PollingCheck;
+
+import com.google.common.collect.ImmutableList;
+
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Service allowing external apps to verify the state of {@link TestGameService} and {@link
+ * TestGameSessionService}.
+ */
+public final class GameServiceTestService extends Service {
+
+    private static final long SCREENSHOT_CALLBACK_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(15);
+
+    @Nullable
+    private ActivityResult mLastActivityResult;
+    private final IGameServiceTestService.Stub mStub = new IGameServiceTestService.Stub() {
+        private final Handler mHandler = new Handler(Looper.getMainLooper());
+
+        @Override
+        public boolean isGameServiceConnected() {
+            return TestGameService.isConnected();
+        }
+
+        @Override
+        public void setGamePackageNames(List<String> gamePackageNames) {
+            TestGameService.setGamePackages(gamePackageNames);
+        }
+
+        @Override
+        public List<String> getActiveSessions() {
+            return ImmutableList.copyOf(TestGameSessionService.getActiveSessions());
+        }
+
+        @Override
+        public void resetState() {
+            TestGameService.reset();
+            mLastActivityResult = null;
+
+            setGameServiceComponentEnabled(true);
+            setGameSessionServiceComponentEnabled(true);
+        }
+
+        @Override
+        public int getFocusedTaskId() {
+            TestGameSession focusedGameSession = TestGameSessionService.getFocusedSession();
+            if (focusedGameSession == null) {
+                return -1;
+            }
+
+            return focusedGameSession.getTaskId();
+        }
+
+        @Override
+        public void startGameSessionActivity(Intent intent, Bundle options) {
+            TestGameSession focusedGameSession = TestGameSessionService.getFocusedSession();
+            if (focusedGameSession == null) {
+                return;
+            }
+
+            focusedGameSession.startActivityFromGameSessionForResult(intent, options,
+                    mHandler::post, new GameSessionActivityCallback() {
+                        @Override
+                        public void onActivityResult(int resultCode,
+                                @Nullable Intent data) {
+                            mLastActivityResult = ActivityResult.forSuccess(
+                                    focusedGameSession.getPackageName(),
+                                    resultCode,
+                                    data);
+                        }
+
+                        @Override
+                        public void onActivityStartFailed(@NonNull Throwable t) {
+                            mLastActivityResult = ActivityResult.forError(
+                                    focusedGameSession.getPackageName(), t);
+                        }
+                    });
+        }
+
+        @Override
+        public ActivityResult getLastActivityResult() {
+            if (mLastActivityResult == null) {
+                PollingCheck.waitFor(() -> mLastActivityResult != null);
+            }
+
+            return mLastActivityResult;
+        }
+
+        @Override
+        public Rect getTouchableOverlayBounds() {
+            TestGameSession focusedGameSession = TestGameSessionService.getFocusedSession();
+            if (focusedGameSession == null) {
+                return null;
+            }
+
+            return focusedGameSession.getTouchableBounds();
+        }
+
+        @Override
+        public void restartFocusedGameSession() {
+            TestGameSession focusedGameSession = TestGameSessionService.getFocusedSession();
+            if (focusedGameSession == null) {
+                return;
+            }
+            focusedGameSession.restartGame();
+        }
+
+        @Override
+        public boolean takeScreenshotForFocusedGameSession() {
+            boolean result = false;
+            TestGameSession focusedGameSession = TestGameSessionService.getFocusedSession();
+            if (focusedGameSession != null) {
+                CountDownLatch countDownLatch = new CountDownLatch(1);
+                final boolean[] ret = new boolean[1];
+                ScreenshotCallback callback =
+                        new ScreenshotCallback() {
+                            @Override
+                            public void onFailure(int statusCode) {
+                                ret[0] = false;
+                                countDownLatch.countDown();
+                            }
+
+                            @Override
+                            public void onSuccess() {
+                                ret[0] = true;
+                                countDownLatch.countDown();
+                            }
+                        };
+                focusedGameSession.takeScreenshot(Runnable::run, callback);
+                try {
+                    countDownLatch.await(
+                            SCREENSHOT_CALLBACK_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+                } catch (InterruptedException e) {
+                    return false;
+                }
+                result = ret[0];
+            }
+            return result;
+        }
+
+        public OnSystemBarVisibilityChangedInfo getOnSystemBarVisibilityChangedInfo() {
+            TestGameSession focusedGameSession = TestGameSessionService.getFocusedSession();
+            if (focusedGameSession == null) {
+                return null;
+            }
+            return focusedGameSession.getOnSystemBarVisibilityChangedInfo();
+        }
+
+        public void setGameServiceComponentEnabled(boolean enabled) {
+            getPackageManager().setComponentEnabledSetting(
+                    new ComponentName(getApplicationContext(), TestGameService.class),
+                    enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                            : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                    PackageManager.DONT_KILL_APP | PackageManager.SYNCHRONOUS);
+
+            if (enabled) {
+                return;
+            }
+
+            // Wait for package changes to propagate and then reset the TestGameService connection
+            // state.
+            try {
+                Thread.sleep(3_000L);
+            } catch (InterruptedException e) {
+                // Do nothing.
+            }
+            TestGameService.reset();
+        }
+
+        public void setGameSessionServiceComponentEnabled(boolean enabled) {
+            getPackageManager().setComponentEnabledSetting(
+                    new ComponentName(getApplicationContext(), TestGameSessionService.class),
+                    enabled ? PackageManager.COMPONENT_ENABLED_STATE_ENABLED
+                            : PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                    PackageManager.DONT_KILL_APP | PackageManager.SYNCHRONOUS);
+        }
+    };
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mStub.asBinder();
+    }
+}
diff --git a/tests/tests/gameservice/src/android/service/games/TestGameService.java b/tests/tests/gameservice/src/android/service/games/TestGameService.java
new file mode 100644
index 0000000..7abbd61
--- /dev/null
+++ b/tests/tests/gameservice/src/android/service/games/TestGameService.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2022 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 android.service.games;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import android.Manifest;
+
+import androidx.annotation.GuardedBy;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+
+import java.util.Set;
+
+
+/**
+ * Test implementation of {@link GameService}.
+ */
+public final class TestGameService extends GameService {
+    private static final Object sLock = new Object();
+    @GuardedBy("sLock")
+    private static boolean sIsConnected = false;
+    @GuardedBy("sLock")
+    private static Set<String> sGamePackages = ImmutableSet.of();
+
+    @Override
+    public void onConnected() {
+        getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
+                Manifest.permission.MANAGE_GAME_ACTIVITY);
+
+        synchronized (sLock) {
+            sIsConnected = true;
+        }
+    }
+
+    @Override
+    public void onDisconnected() {
+        synchronized (sLock) {
+            sIsConnected = false;
+        }
+
+        getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
+    }
+
+    @Override
+    public void onGameStarted(GameStartedEvent gameStartedEvent) {
+        boolean isGame;
+        synchronized (sLock) {
+            isGame = sGamePackages.contains(gameStartedEvent.getPackageName());
+        }
+        if (isGame) {
+            createGameSession(gameStartedEvent.getTaskId());
+        }
+    }
+
+    static void reset() {
+        synchronized (sLock) {
+            sIsConnected = false;
+        }
+        setGamePackages(ImmutableList.of());
+    }
+
+    static boolean isConnected() {
+        synchronized (sLock) {
+            return sIsConnected;
+        }
+    }
+
+    static void setGamePackages(Iterable<String> gamePackages) {
+        synchronized (sLock) {
+            sGamePackages = ImmutableSet.copyOf(gamePackages);
+        }
+    }
+}
+
diff --git a/tests/tests/gameservice/src/android/service/games/TestGameSessionService.java b/tests/tests/gameservice/src/android/service/games/TestGameSessionService.java
new file mode 100644
index 0000000..9ea4ae5
--- /dev/null
+++ b/tests/tests/gameservice/src/android/service/games/TestGameSessionService.java
@@ -0,0 +1,174 @@
+/*
+ * Copyright (C) 2022 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 android.service.games;
+
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.graphics.Region;
+import android.service.games.testing.OnSystemBarVisibilityChangedInfo;
+import android.view.Gravity;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.annotation.GuardedBy;
+import androidx.annotation.Nullable;
+
+import java.util.HashSet;
+import java.util.Set;
+
+
+/**
+ * Test implementation of {@link GameSessionService}.
+ */
+public final class TestGameSessionService extends GameSessionService {
+    private static final Object sLock = new Object();
+    @GuardedBy("sLock")
+    private static final Set<String> sActiveSessions = new HashSet<>();
+    @GuardedBy("sLock")
+    @Nullable
+    private static TestGameSession sFocusedSession;
+
+    @Override
+    public GameSession onNewSession(CreateGameSessionRequest createGameSessionRequest) {
+        return new TestGameSession(this, createGameSessionRequest.getGamePackageName(),
+                createGameSessionRequest.getTaskId());
+    }
+
+    static Set<String> getActiveSessions() {
+        synchronized (sLock) {
+            return sActiveSessions;
+        }
+    }
+
+    @Nullable
+    static TestGameSession getFocusedSession() {
+        synchronized (sLock) {
+            return sFocusedSession;
+        }
+    }
+
+    static final class TestGameSession extends GameSession {
+        private final Context mContext;
+        private final String mPackageName;
+        private final int mTaskId;
+        private final Rect mTouchableBounds = new Rect();
+        private final FrameLayout mRootView;
+        private final OnSystemBarVisibilityChangedInfo mOnSystemBarVisibilityChangedInfo;
+
+        private TestGameSession(Context context, String packageName, int taskId) {
+            mContext = context;
+            mPackageName = packageName;
+            mTaskId = taskId;
+            mRootView = new FrameLayout(context);
+            mOnSystemBarVisibilityChangedInfo = new OnSystemBarVisibilityChangedInfo();
+        }
+
+        String getPackageName() {
+            return mPackageName;
+        }
+
+        int getTaskId() {
+            return mTaskId;
+        }
+
+        Rect getTouchableBounds() {
+            return new Rect(mTouchableBounds);
+        }
+
+        OnSystemBarVisibilityChangedInfo getOnSystemBarVisibilityChangedInfo() {
+            return mOnSystemBarVisibilityChangedInfo;
+        }
+
+        @Override
+        public void onCreate() {
+            synchronized (sLock) {
+                sActiveSessions.add(mPackageName);
+            }
+
+            final TextView textView = new TextView(mContext);
+            textView.setText("Overlay was rendered on: " + mPackageName);
+            textView.setBackgroundColor(Color.MAGENTA);
+            final FrameLayout.LayoutParams textViewLayoutParams =
+                    new FrameLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT,
+                            ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
+            textViewLayoutParams.leftMargin = 100;
+            textViewLayoutParams.rightMargin = 100;
+            textView.setLayoutParams(textViewLayoutParams);
+            mRootView.addView(textView);
+
+            setTaskOverlayView(mRootView,
+                    new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
+                            ViewGroup.LayoutParams.MATCH_PARENT));
+
+            mRootView.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
+                @Override
+                public void onViewAttachedToWindow(View v) {
+                    v.getRootSurfaceControl().setTouchableRegion(new Region());
+                    v.removeOnAttachStateChangeListener(this);
+                }
+
+                @Override
+                public void onViewDetachedFromWindow(View v) {
+                }
+            });
+            textView.addOnLayoutChangeListener(
+                    (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> {
+                        boolean isViewVisible = v.getGlobalVisibleRect(mTouchableBounds);
+                        if (!isViewVisible) {
+                            mTouchableBounds.setEmpty();
+                        }
+                        v.getRootSurfaceControl().setTouchableRegion(new Region(mTouchableBounds));
+                    });
+        }
+
+        @Override
+        public void onTransientSystemBarVisibilityFromRevealGestureChanged(
+                boolean visibleDueToGesture) {
+            if (visibleDueToGesture) {
+                mOnSystemBarVisibilityChangedInfo.incrementTimesShown();
+            } else {
+                mOnSystemBarVisibilityChangedInfo.incrementTimesHidden();
+            }
+        }
+
+        @Override
+        public void onGameTaskFocusChanged(boolean focused) {
+            if (focused) {
+                synchronized (sLock) {
+                    sFocusedSession = this;
+                }
+                return;
+            }
+
+            synchronized (sLock) {
+                if (sFocusedSession == this) {
+                    sFocusedSession = null;
+                }
+            }
+        }
+
+        @Override
+        public void onDestroy() {
+            synchronized (sLock) {
+                sActiveSessions.remove(mPackageName);
+            }
+        }
+    }
+}
diff --git a/tests/tests/gameservice/src/android/service/games/testing/ActivityResult.aidl b/tests/tests/gameservice/src/android/service/games/testing/ActivityResult.aidl
new file mode 100644
index 0000000..bdcc0f2
--- /dev/null
+++ b/tests/tests/gameservice/src/android/service/games/testing/ActivityResult.aidl
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.testing;
+
+parcelable ActivityResult;
\ No newline at end of file
diff --git a/tests/tests/gameservice/src/android/service/games/testing/ActivityResult.java b/tests/tests/gameservice/src/android/service/games/testing/ActivityResult.java
new file mode 100644
index 0000000..05f9706
--- /dev/null
+++ b/tests/tests/gameservice/src/android/service/games/testing/ActivityResult.java
@@ -0,0 +1,184 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.testing;
+
+import android.content.Intent;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.common.base.Preconditions;
+
+public final class ActivityResult implements Parcelable {
+    private final String mGameSessionPackageName;
+    @Nullable
+    private final Success mSuccess;
+    @Nullable
+    private final Failure mFailure;
+
+    public static final Creator<ActivityResult> CREATOR = new Creator<ActivityResult>() {
+        @Override
+        public ActivityResult createFromParcel(Parcel in) {
+            String gameSessionPackageName = in.readString();
+            Success success = in.readParcelable(Success.class.getClassLoader(), Success.class);
+            Failure failure = in.readParcelable(Failure.class.getClassLoader(), Failure.class);
+            return new ActivityResult(gameSessionPackageName, success, failure);
+        }
+
+        @Override
+        public ActivityResult[] newArray(int size) {
+            return new ActivityResult[size];
+        }
+    };
+
+    public static ActivityResult forSuccess(String gameSessionPackageName, int resultCode,
+            @Nullable Intent data) {
+        return new ActivityResult(gameSessionPackageName, new Success(resultCode, data), null);
+    }
+
+    public static ActivityResult forError(String gameSessionPackageName, Throwable t) {
+        return new ActivityResult(gameSessionPackageName, null,
+                new Failure(t.getClass(), t.getMessage()));
+    }
+
+    private ActivityResult(String gameSessionPackageName, @Nullable Success success,
+            @Nullable Failure failure) {
+        mGameSessionPackageName = gameSessionPackageName;
+        mSuccess = success;
+        mFailure = failure;
+    }
+
+    public String getGameSessionPackageName() {
+        return mGameSessionPackageName;
+    }
+
+    public boolean isSuccess() {
+        return mSuccess != null;
+    }
+
+    public Success getSuccess() {
+        Preconditions.checkState(isSuccess());
+        return mSuccess;
+    }
+
+    public Failure getFailure() {
+        Preconditions.checkState(!isSuccess());
+        return mFailure;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        dest.writeString(mGameSessionPackageName);
+        dest.writeParcelable(mSuccess, flags);
+        dest.writeParcelable(mFailure, flags);
+    }
+
+    public static final class Success implements Parcelable {
+        public static final Creator<Success> CREATOR = new Creator<Success>() {
+            @Override
+            public Success createFromParcel(Parcel source) {
+                int resultCode = source.readInt();
+                Intent data = source.readParcelable(Intent.class.getClassLoader(), Intent.class);
+                return new Success(resultCode, data);
+            }
+
+            @Override
+            public Success[] newArray(int size) {
+                return new Success[0];
+            }
+        };
+
+        private final int mResultCode;
+        @Nullable
+        private final Intent mData;
+
+        Success(int resultCode, @Nullable Intent data) {
+            mResultCode = resultCode;
+            mData = data;
+        }
+
+        public int getResultCode() {
+            return mResultCode;
+        }
+
+        @Nullable
+        public Intent getData() {
+            return mData;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(@NonNull Parcel dest, int flags) {
+            dest.writeInt(mResultCode);
+            dest.writeParcelable(mData, flags);
+        }
+    }
+
+    public static final class Failure implements Parcelable {
+        public static final Creator<Failure> CREATOR = new Creator<Failure>() {
+            @Override
+            public Failure createFromParcel(Parcel source) {
+                Class<?> clazz = source.readSerializable(Class.class.getClassLoader(), Class.class);
+                String message = source.readString();
+                return new Failure(clazz, message);
+            }
+
+            @Override
+            public Failure[] newArray(int size) {
+                return new Failure[0];
+            }
+        };
+
+        private final Class<?> mClazz;
+        private final String mMessage;
+
+        Failure(Class<?> clazz, String message) {
+            mClazz = clazz;
+            mMessage = message;
+        }
+
+        public Class<?> getClazz() {
+            return mClazz;
+        }
+
+        public String getMessage() {
+            return mMessage;
+        }
+
+        @Override
+        public int describeContents() {
+            return 0;
+        }
+
+        @Override
+        public void writeToParcel(@NonNull Parcel dest, int flags) {
+            dest.writeSerializable(mClazz);
+            dest.writeString(mMessage);
+        }
+    }
+}
diff --git a/tests/tests/gameservice/src/android/service/games/testing/GetResultActivity.java b/tests/tests/gameservice/src/android/service/games/testing/GetResultActivity.java
new file mode 100644
index 0000000..87f42dd
--- /dev/null
+++ b/tests/tests/gameservice/src/android/service/games/testing/GetResultActivity.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.testing;
+
+import android.app.Activity;
+import android.content.Intent;
+
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+public class GetResultActivity extends Activity {
+    public static class Result {
+        public final int requestCode;
+        public final int resultCode;
+        public final Intent data;
+
+        public Result(int requestCode, int resultCode, Intent data) {
+            this.requestCode = requestCode;
+            this.resultCode = resultCode;
+            this.data = data;
+        }
+    }
+    public LinkedBlockingQueue<Result> mResult = new LinkedBlockingQueue<>();
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        mResult.offer(new Result(requestCode, resultCode, data));
+        finish();
+    }
+
+    public Result getResult() {
+        final Result result;
+        try {
+            result = mResult.poll(20, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        if (result == null) {
+            throw new IllegalStateException("Activity didn't receive a Result in 20 seconds");
+        }
+        return result;
+    }
+}
diff --git a/tests/tests/gameservice/src/android/service/games/testing/IGameServiceTestService.aidl b/tests/tests/gameservice/src/android/service/games/testing/IGameServiceTestService.aidl
new file mode 100644
index 0000000..9edfdfd
--- /dev/null
+++ b/tests/tests/gameservice/src/android/service/games/testing/IGameServiceTestService.aidl
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.testing;
+
+import android.content.Intent;
+import android.graphics.Rect;
+import android.os.Bundle;
+import android.service.games.testing.ActivityResult;
+import android.service.games.testing.OnSystemBarVisibilityChangedInfo;
+
+interface IGameServiceTestService {
+    boolean isGameServiceConnected();
+
+    void setGamePackageNames(in List<String> packageNames);
+
+    List<String> getActiveSessions();
+
+    void resetState();
+
+    int getFocusedTaskId();
+
+    void startGameSessionActivity(in Intent intent, in Bundle options);
+
+    ActivityResult getLastActivityResult();
+
+    Rect getTouchableOverlayBounds();
+
+    void restartFocusedGameSession();
+
+    boolean takeScreenshotForFocusedGameSession();
+
+    OnSystemBarVisibilityChangedInfo getOnSystemBarVisibilityChangedInfo();
+
+    void setGameServiceComponentEnabled(boolean enabled);
+
+    void setGameSessionServiceComponentEnabled(boolean enabled);
+}
\ No newline at end of file
diff --git a/tests/tests/gameservice/src/android/service/games/testing/OnSystemBarVisibilityChangedInfo.aidl b/tests/tests/gameservice/src/android/service/games/testing/OnSystemBarVisibilityChangedInfo.aidl
new file mode 100644
index 0000000..f24a6ec
--- /dev/null
+++ b/tests/tests/gameservice/src/android/service/games/testing/OnSystemBarVisibilityChangedInfo.aidl
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.testing;
+
+parcelable OnSystemBarVisibilityChangedInfo;
\ No newline at end of file
diff --git a/tests/tests/gameservice/src/android/service/games/testing/OnSystemBarVisibilityChangedInfo.java b/tests/tests/gameservice/src/android/service/games/testing/OnSystemBarVisibilityChangedInfo.java
new file mode 100644
index 0000000..8d004cb
--- /dev/null
+++ b/tests/tests/gameservice/src/android/service/games/testing/OnSystemBarVisibilityChangedInfo.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2022 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 android.service.games.testing;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+
+public final class OnSystemBarVisibilityChangedInfo implements Parcelable {
+    private int mTimesShown;
+    private int mTimesHidden;
+
+    public static final Creator<OnSystemBarVisibilityChangedInfo> CREATOR =
+            new Creator<OnSystemBarVisibilityChangedInfo>() {
+                @Override
+                public OnSystemBarVisibilityChangedInfo createFromParcel(Parcel in) {
+                    int timesShown = in.readInt();
+                    int timesHidden = in.readInt();
+                    return new OnSystemBarVisibilityChangedInfo(timesShown, timesHidden);
+                }
+
+                @Override
+                public OnSystemBarVisibilityChangedInfo[] newArray(int size) {
+                    return new OnSystemBarVisibilityChangedInfo[size];
+                }
+            };
+
+    public OnSystemBarVisibilityChangedInfo() {
+        this(0, 0);
+    }
+
+    public OnSystemBarVisibilityChangedInfo(int timesShown,
+            int timesHidden) {
+        mTimesShown = timesShown;
+        mTimesHidden = timesHidden;
+    }
+
+    public void incrementTimesShown() {
+        mTimesShown++;
+    }
+
+    public void incrementTimesHidden() {
+        mTimesHidden++;
+    }
+
+    public int getTimesShown() {
+        return mTimesShown;
+    }
+
+    public int getTimesHidden() {
+        return mTimesHidden;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        dest.writeInt(mTimesShown);
+        dest.writeInt(mTimesHidden);
+    }
+}
diff --git a/tests/tests/graphics/Android.bp b/tests/tests/graphics/Android.bp
index 7a3cdab..a6ba312 100644
--- a/tests/tests/graphics/Android.bp
+++ b/tests/tests/graphics/Android.bp
@@ -31,6 +31,7 @@
         "ctsdeviceutillegacy-axt",
         "ctstestrunner-axt",
         "androidx.annotation_annotation",
+        "hamcrest-library",
         "junit",
         "junit-params",
         "testng",
diff --git a/tests/tests/graphics/assets/fonts/layout/hyphenation.ttx b/tests/tests/graphics/assets/fonts/layout/hyphenation.ttx
index 20ca0e7..82c4fa7 100644
--- a/tests/tests/graphics/assets/fonts/layout/hyphenation.ttx
+++ b/tests/tests/graphics/assets/fonts/layout/hyphenation.ttx
@@ -157,6 +157,68 @@
         <map code="0x0079" name="1em" /> <!-- y -->
         <map code="0x007A" name="1em" /> <!-- z -->
 
+        <map code="0X00ED" name="1em" /> <!-- á -->
+        <map code="0X00ED" name="1em" /> <!-- í -->
+
+        <map code="0X00F6" name="1em" /> <!-- ö -->
+
+        <map code="0X0101" name="1em" /> <!-- ā -->
+
+        <map code="0X016B" name="1em" /> <!-- ū -->
+
+        <map code="0X03B1" name="1em" /> <!-- α -->
+        <map code="0X03B3" name="1em" /> <!-- γ -->
+        <map code="0X03B5" name="1em" /> <!-- ε -->
+        <map code="0X03B6" name="1em" /> <!-- ζ -->
+        <map code="0X03BC" name="1em" /> <!-- μ -->
+        <map code="0X03BD" name="1em" /> <!-- ν -->
+        <map code="0X03BF" name="1em" /> <!-- ο -->
+        <map code="0X03C1" name="1em" /> <!-- ρ -->
+        <map code="0X03C2" name="1em" /> <!-- ς -->
+        <map code="0X03C5" name="1em" /> <!-- υ -->
+        <map code="0X03CC" name="1em" /> <!-- ό -->
+
+        <map code="0X0432" name="1em" /> <!-- в -->
+        <map code="0X043A" name="1em" /> <!-- к -->
+        <map code="0X043C" name="1em" /> <!-- м -->
+        <map code="0X043D" name="1em" /> <!-- п -->
+        <map code="0X0440" name="1em" /> <!-- р -->
+        <map code="0X043D" name="1em" /> <!-- н -->
+        <map code="0X0442" name="1em" /> <!-- т -->
+        <map code="0X044C" name="1em" /> <!-- ь -->
+        <map code="0X0456" name="1em" /> <!-- і -->
+
+        <map code="0X0423" name="1em" /> <!-- У -->
+        <map code="0X0432" name="1em" /> <!-- в -->
+        <map code="0X0435" name="1em" /> <!-- е -->
+        <map code="0X0437" name="1em" /> <!-- з -->
+        <map code="0X043A" name="1em" /> <!-- к -->
+        <map code="0X043C" name="1em" /> <!-- м -->
+        <map code="0X043D" name="1em" /> <!-- н -->
+        <map code="0X043E" name="1em" /> <!-- о -->
+        <map code="0X0441" name="1em" /> <!-- с -->
+        <map code="0X0442" name="1em" /> <!-- т -->
+        <map code="0X044C" name="1em" /> <!-- ь -->
+        <map code="0X0456" name="1em" /> <!-- і -->
+
+        <map code="0X10D0" name="1em" /> <!-- ა -->
+        <map code="0X10D7" name="1em" /> <!-- თ -->
+        <map code="0X10D8" name="1em" /> <!-- ი -->
+        <map code="0X10DB" name="1em" /> <!-- მ -->
+        <map code="0X10DC" name="1em" /> <!-- ნ -->
+        <map code="0X10DD" name="1em" /> <!-- ო -->
+        <map code="0X10E0" name="1em" /> <!-- რ -->
+        <map code="0X10E4" name="1em" /> <!-- ფ -->
+        <map code="0X10EA" name="1em" /> <!-- ც -->
+
+        <map code="0x1218" name="1em" /> <!-- መ -->
+        <map code="0x1260" name="1em" /> <!-- በ -->
+        <map code="0x1278" name="1em" /> <!-- ቸ -->
+        <map code="0x1295" name="1em" /> <!-- ን -->
+        <map code="0x12CD" name="1em" /> <!-- ው -->
+        <map code="0x12DB" name="1em" /> <!-- ዛ -->
+        <map code="0x130B" name="1em" /> <!-- ጋ -->
+
         <map code="0x2010" name="2em" /> <!-- HYPHEN -->
         <map code="0x058A" name="3em" /> <!-- ARMENIAN HYPHEN -->
         <map code="0x05BE" name="4em" /> <!-- MAQAF -->
diff --git a/tests/tests/graphics/assets/fonts/layout/linebreak.ttf b/tests/tests/graphics/assets/fonts/layout/linebreak.ttf
index eb18c0a..24087c1 100644
--- a/tests/tests/graphics/assets/fonts/layout/linebreak.ttf
+++ b/tests/tests/graphics/assets/fonts/layout/linebreak.ttf
Binary files differ
diff --git a/tests/tests/graphics/assets/fonts/layout/linebreak.ttx b/tests/tests/graphics/assets/fonts/layout/linebreak.ttx
index 18a82a9..f8759b9 100644
--- a/tests/tests/graphics/assets/fonts/layout/linebreak.ttx
+++ b/tests/tests/graphics/assets/fonts/layout/linebreak.ttx
@@ -179,6 +179,7 @@
         <map code="0x0078" name="1em" /> <!-- x -->
         <map code="0x0079" name="1em" /> <!-- y -->
         <map code="0x007A" name="1em" /> <!-- z -->
+        <map code="0x2010" name="1em" /> <!-- hyphen -->
     </cmap_format_4>
   </cmap>
 
diff --git a/tests/tests/graphics/jni/VulkanTestHelpers.cpp b/tests/tests/graphics/jni/VulkanTestHelpers.cpp
index ea16aea..89049e0 100644
--- a/tests/tests/graphics/jni/VulkanTestHelpers.cpp
+++ b/tests/tests/graphics/jni/VulkanTestHelpers.cpp
@@ -121,6 +121,18 @@
   ASSERT(status == VK_SUCCESS || status == VK_INCOMPLETE);
   ASSERT(gpuCount > 0);
 
+  VkPhysicalDeviceSamplerYcbcrConversionFeaturesKHR ycbcrFeatures = {
+      .sType =
+          VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES_KHR,
+      .pNext = nullptr,
+  };
+  VkPhysicalDeviceFeatures2KHR physicalDeviceFeatures = {
+      .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR,
+      .pNext = &ycbcrFeatures,
+  };
+  vkGetPhysicalDeviceFeatures2(mGpu, &physicalDeviceFeatures);
+  ASSERT(ycbcrFeatures.samplerYcbcrConversion == VK_TRUE);
+
   VkPhysicalDeviceProperties physicalDeviceProperties;
   vkGetPhysicalDeviceProperties(mGpu, &physicalDeviceProperties);
   std::vector<const char *> deviceExt;
@@ -182,7 +194,7 @@
 
   VkDeviceCreateInfo deviceCreateInfo{
       .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
-      .pNext = nullptr,
+      .pNext = &ycbcrFeatures,
       .queueCreateInfoCount = 1,
       .pQueueCreateInfos = &queueCreateInfo,
       .enabledLayerCount = 0,
@@ -226,18 +238,6 @@
           (PFN_vkImportSemaphoreFdKHR)vkGetDeviceProcAddr(mDevice, "vkImportSemaphoreFdKHR");
   ASSERT(mPfnImportSemaphoreFd);
 
-  VkPhysicalDeviceSamplerYcbcrConversionFeaturesKHR ycbcrFeatures{
-      .sType =
-          VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES_KHR,
-      .pNext = nullptr,
-  };
-  VkPhysicalDeviceFeatures2KHR physicalDeviceFeatures{
-      .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2_KHR,
-      .pNext = &ycbcrFeatures,
-  };
-  vkGetPhysicalDeviceFeatures2(mGpu, &physicalDeviceFeatures);
-  ASSERT(ycbcrFeatures.samplerYcbcrConversion == VK_TRUE);
-
   vkGetDeviceQueue(mDevice, 0, 0, &mQueue);
   vkGetPhysicalDeviceMemoryProperties(mGpu, &mMemoryProperties);
 
diff --git a/tests/tests/graphics/jni/android_graphics_cts_BitmapTest.cpp b/tests/tests/graphics/jni/android_graphics_cts_BitmapTest.cpp
index a0a0e28..141a710 100644
--- a/tests/tests/graphics/jni/android_graphics_cts_BitmapTest.cpp
+++ b/tests/tests/graphics/jni/android_graphics_cts_BitmapTest.cpp
@@ -342,7 +342,7 @@
                 mBadInfo.format = 6;
                 break;
             case 12:
-                mBadInfo.format = 10;
+                mBadInfo.format = 11;
                 break;
             case 13:
                 mBadInfo.width = static_cast<uint32_t>(kMaxInt32) + 1;
diff --git a/tests/tests/graphics/jni/android_graphics_cts_FrameRateCtsActivity.cpp b/tests/tests/graphics/jni/android_graphics_cts_FrameRateCtsActivity.cpp
index f9a0995..522b84f 100644
--- a/tests/tests/graphics/jni/android_graphics_cts_FrameRateCtsActivity.cpp
+++ b/tests/tests/graphics/jni/android_graphics_cts_FrameRateCtsActivity.cpp
@@ -173,6 +173,10 @@
     if (jSurface) {
         window.mNw = ANativeWindow_fromSurface(env, jSurface);
     }
+    if (changeFrameRateStrategy == ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS) {
+        return ANativeWindow_setFrameRate(window.mNw, frameRate, compatibility);
+    }
+
     return ANativeWindow_setFrameRateWithChangeStrategy(window.mNw, frameRate, compatibility,
             changeFrameRateStrategy);
 }
@@ -212,8 +216,13 @@
     ASurfaceControl* surfaceControl =
             reinterpret_cast<Surface*>(surfaceControlLong)->getSurfaceControl();
     ASurfaceTransaction* transaction = ASurfaceTransaction_create();
-    ASurfaceTransaction_setFrameRateWithChangeStrategy(transaction, surfaceControl, frameRate,
+    if (changeFrameRateStrategy == ANATIVEWINDOW_CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS) {
+        ASurfaceTransaction_setFrameRate(transaction, surfaceControl, frameRate,
+            compatibility);
+    } else {
+        ASurfaceTransaction_setFrameRateWithChangeStrategy(transaction, surfaceControl, frameRate,
             compatibility, changeFrameRateStrategy);
+    }
     ASurfaceTransaction_apply(transaction);
     ASurfaceTransaction_delete(transaction);
 }
diff --git a/tests/tests/graphics/res/color/colorPrimaryDark_csl_with_theme_attr.xml b/tests/tests/graphics/res/color/colorPrimaryDark_csl_with_theme_attr.xml
new file mode 100644
index 0000000..28f3b20
--- /dev/null
+++ b/tests/tests/graphics/res/color/colorPrimaryDark_csl_with_theme_attr.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="?attr/colorPrimaryDark"/>
+</selector>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/color/colorPrimary_csl_with_theme_attr.xml b/tests/tests/graphics/res/color/colorPrimary_csl_with_theme_attr.xml
new file mode 100644
index 0000000..cccd6dd
--- /dev/null
+++ b/tests/tests/graphics/res/color/colorPrimary_csl_with_theme_attr.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:color="?attr/colorPrimary"/>
+</selector>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/drawable-nodpi/vector_icon_clip_path_1_golden.png b/tests/tests/graphics/res/drawable-nodpi/vector_icon_clip_path_1_golden.png
index 2663f3c..7c51385 100644
--- a/tests/tests/graphics/res/drawable-nodpi/vector_icon_clip_path_1_golden.png
+++ b/tests/tests/graphics/res/drawable-nodpi/vector_icon_clip_path_1_golden.png
Binary files differ
diff --git a/tests/tests/graphics/res/drawable/adaptiveicondrawable.xml b/tests/tests/graphics/res/drawable/adaptiveicondrawable.xml
new file mode 100644
index 0000000..1ffe9d5
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/adaptiveicondrawable.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2021 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.
+ -->
+
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@android:color/white"/>
+    <foreground android:drawable="@android:color/black"/>
+    <monochrome android:drawable="@android:color/system_accent2_800"/>
+</adaptive-icon>
diff --git a/tests/tests/graphics/res/drawable/gradientdrawable_color_all_theme.xml b/tests/tests/graphics/res/drawable/gradientdrawable_color_all_theme.xml
new file mode 100644
index 0000000..75cdb82
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/gradientdrawable_color_all_theme.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:startColor="@color/colorPrimary_csl_with_theme_attr"
+        android:centerColor="@color/colorPrimaryDark_csl_with_theme_attr"
+        android:endColor="@color/colorPrimaryDark_csl_with_theme_attr"/>
+</shape>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/drawable/gradientdrawable_color_mix_theme.xml b/tests/tests/graphics/res/drawable/gradientdrawable_color_mix_theme.xml
new file mode 100644
index 0000000..db2d2fc
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/gradientdrawable_color_mix_theme.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:startColor="?attr/colorAccent"
+        android:centerColor="@color/colorPrimary_csl_with_theme_attr"
+        android:endColor="?attr/colorPrimaryDark"/>
+</shape>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/drawable/gradientdrawable_noCenterColor_all_theme.xml b/tests/tests/graphics/res/drawable/gradientdrawable_noCenterColor_all_theme.xml
new file mode 100644
index 0000000..63115ae
--- /dev/null
+++ b/tests/tests/graphics/res/drawable/gradientdrawable_noCenterColor_all_theme.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <gradient
+        android:startColor="@color/colorPrimary_csl_with_theme_attr"
+        android:endColor="@color/colorPrimaryDark_csl_with_theme_attr"/>
+</shape>
\ No newline at end of file
diff --git a/tests/tests/graphics/res/xml/valid_themes.xml b/tests/tests/graphics/res/xml/valid_themes.xml
new file mode 100644
index 0000000..f6a24a3
--- /dev/null
+++ b/tests/tests/graphics/res/xml/valid_themes.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+<!-- Auto generated by: atest ColorSchemeTest#generateThemeStyles -->
+<themes>
+    <theme color="ffb9567a">
+        <spritz>ffffff,fffbfa,ffecf1,f9dbe2,dcc0c6,c0a4ab,a48a91,877076,6f595e,564147,3e2b31,27171c,000000,ffffff,fffbfa,ffecf1,f2dee2,d5c2c6,b9a6aa,9e8c90,827276,6a5a5e,514347,392d30,23191b,000000,ffffff,fffbfa,ffecf1,ffd9e2,e2bdc6,c5a2ab,a98891,8d6e76,74565f,5b3f47,422a31,2b151c,000000,ffffff,fffbfa,f6efef,e8e1e1,cbc5c5,b0aaaa,958f90,7a7575,625d5e,4a4646,333030,1e1b1b,000000,ffffff,fffbfa,f6efef,e8e1e1,cbc5c5,b0aaaa,958f90,7a7575,625d5e,4a4646,333030,1e1b1b,000000</spritz>
+        <tonal_spot>ffffff,fffbfa,ffecf1,ffd9e4,ffb0ca,e495ad,c57b93,a76078,8c4a60,703349,541d32,39071d,000000,ffffff,fffbfa,ffecf1,ffd9e2,e2bdc6,c5a2ab,a98891,8d6e76,74565f,5b3f47,422a31,2b151c,000000,ffffff,fffbfa,ffeddf,ffdcbf,efbc94,d1a27a,b48762,976d4a,7c5635,623f20,48290b,2f1500,000000,ffffff,fffbfa,faeeef,ebe0e1,cfc4c5,b3a8aa,988f90,7d7475,655c5e,4c4546,352f30,201a1c,000000,ffffff,fffbfa,ffecf1,f2dee2,d5c2c6,b9a6aa,9e8c90,827276,6a5a5e,514347,392d30,23191b,000000</tonal_spot>
+        <vibrant>ffffff,fffbfa,ffecf1,ffd9e4,ffb0ca,f48aae,d57294,b55779,984061,7b2849,5e1033,3e001c,000000,ffffff,fffbfa,ffedea,ffdad5,f5b7b1,d79d97,ba837d,9c6963,81524d,673b37,4c2522,32110e,000000,ffffff,fffbfa,ffedea,ffdad5,ffb3ab,e49790,c67d77,a7635d,8b4d47,6f3631,53201d,380c0a,000000,ffffff,fffbfa,fdedef,efdee1,d2c3c5,b6a8aa,9b8d90,807376,675b5e,4e4446,372e30,22191c,000000,ffffff,fffbfa,ffecf1,f9dbe2,dcc0c6,c0a4ab,a48a91,877076,6f595e,564147,3e2b31,27171c,000000</vibrant>
+        <expressive>ffffff,fafcff,e4f2ff,c7e7ff,8bcefd,6eb3e0,5297c4,337da7,0b648e,004c6f,00344e,001e2f,000000,ffffff,fffbfa,ffedea,ffdad5,f5b7b1,d79d97,ba837d,9c6963,81524d,673b37,4c2522,32110e,000000,ffffff,fffbfa,ffedea,ffdad5,ffb3aa,f09289,d07870,b15f57,944841,77312c,5a1b18,3d0606,000000,ffffff,fffbfa,ffeded,f4ddde,d7c1c2,bba7a7,9f8c8d,837272,6b5b5b,534344,3b2d2d,241919,000000,ffffff,fffbfa,ffeced,fcdbdb,debfc0,c2a4a5,a68a8b,8a6f70,715859,574142,402b2c,281718,000000</expressive>
+        <rainbow>ffffff,fffbfa,ffecf1,ffd9e4,ffb0ca,f48aae,d57294,b55779,984061,7b2849,5e1033,3e001c,000000,ffffff,fffbfa,ffecf1,ffd9e2,e2bdc6,c5a2ab,a98891,8d6e76,74565f,5b3f47,422a31,2b151c,000000,ffffff,fffbfa,ffeddf,ffdcbf,efbc94,d1a27a,b48762,976d4a,7c5635,623f20,48290b,2f1500,000000,ffffff,fcfcfc,f1f1f1,e2e2e2,c6c6c6,ababab,919191,767676,5e5e5e,474747,303030,1b1b1b,000000,ffffff,fcfcfc,f1f1f1,e2e2e2,c6c6c6,ababab,919191,767676,5e5e5e,474747,303030,1b1b1b,000000</rainbow>
+        <fruit_salad>ffffff,fffbfb,faecff,f1dbff,deb8ff,c499f1,a97ed4,8c64b7,734c9d,5b3383,431a6b,2b0053,000000,ffffff,fffbfb,faecff,f1dbff,dabaf9,be9edc,a384c0,866aa4,6e538b,553b71,3d2458,270d42,000000,ffffff,fffbfa,ffecf1,ffd9e4,ffb0ca,e495ad,c57b93,a76078,8c4a60,703349,541d32,39071d,000000,ffffff,fffbfa,ffecf1,f6dce2,d9c0c6,bca5ab,a18b91,857175,6c5a5e,534247,3c2c31,25181c,000000,ffffff,fffbfa,ffecf1,ffd9e2,e2bdc6,c5a2ab,a98891,8d6e76,74565f,5b3f47,422a31,2b151c,000000</fruit_salad>
+    </theme>
+    <theme color="ffb16307">
+        <spritz>ffffff,fffbfa,ffeddf,faddc9,dcc2ae,c0a794,a48c7a,887261,6f5b4a,564334,3e2d1f,27180c,000000,ffffff,fffbfa,ffede0,f3dfd1,d5c3b6,baa89c,9e8e82,837368,6a5b51,51443b,3a2e26,231a12,000000,ffffff,fffbfa,ffeddf,ffdcc1,e2c0a5,c5a58b,aa8b72,8d705a,745943,5a422d,412c19,2a1707,000000,ffffff,fffbfa,f7efec,e8e1de,ccc5c2,b0aaa7,958f8d,7a7572,625e5b,4a4643,33302d,1d1b19,000000,ffffff,fffbfa,f7efec,e8e1de,ccc5c2,b0aaa7,958f8d,7a7572,625e5b,4a4643,33302d,1d1b19,000000</spritz>
+        <tonal_spot>ffffff,fffbfa,ffeddf,ffdcbf,ffb879,e19d61,c28349,a46932,88521c,6b3b05,4d2700,2f1500,000000,ffffff,fffbfa,ffeddf,ffdcc1,e2c0a5,c5a58b,aa8b72,8d705a,745943,5a422d,412c19,2a1707,000000,ffffff,fdffd7,eef5be,e0e8b1,c4cb97,a8af7e,8e9565,727a4d,5b6238,444a22,2d330e,191e00,000000,ffffff,fffbfa,faeee8,ece0da,cfc4be,b3a9a3,988f89,7d746f,655d58,4c4641,362f2b,201a16,000000,ffffff,fffbfa,ffede0,f3dfd1,d5c3b6,baa89c,9e8e82,837368,6a5b51,51443b,3a2e26,231a12,000000</tonal_spot>
+        <vibrant>ffffff,fffbfa,ffeddf,ffdcbf,ffb776,ee9744,cf7d2c,af6311,8f4d00,6d3900,4d2700,2f1500,000000,ffffff,fffbfa,ffede1,ffdbc4,f1bb98,d4a07e,b68666,996c4e,7f5538,643e23,49280f,301400,000000,ffffff,fffbfa,ffede1,ffdbc4,feb787,df9d6e,c08357,a2693f,86522a,6a3b15,4f2502,311300,000000,ffffff,fffbfa,fdeee3,efe0d5,d2c4ba,b6a99f,9b8e86,7f746b,675c55,4f453d,372f28,221a14,000000,ffffff,fffbfa,ffeddf,faddc9,dcc2ae,c0a794,a48c7a,887261,6f5b4a,564334,3e2d1f,27180c,000000</vibrant>
+        <expressive>ffffff,fffbfd,f7edff,eadcff,d1bcff,b5a0e8,9a85cc,7e6baf,665395,4e3c7c,372464,220b4e,000000,ffffff,fffbfa,ffede1,ffdbc4,f1bb98,d4a07e,b68666,996c4e,7f5538,643e23,49280f,301400,000000,ffffff,fffbfa,ffede1,ffdbc4,ffb683,e9995e,ca7e47,ab652f,8e4e1a,713702,502400,311300,000000,ffffff,fffbf9,feeedd,efe0cf,d3c4b5,b7a99a,9b8f80,807467,675d50,4f4539,382f24,221a10,000000,ffffff,fffbf9,ffeed9,f5dfc6,d8c4ab,bca891,a08e77,84745e,6b5c48,534432,3b2e1d,241a0a,000000</expressive>
+        <rainbow>ffffff,fffbfa,ffeddf,ffdcbf,ffb776,ee9744,cf7d2c,af6311,8f4d00,6d3900,4d2700,2f1500,000000,ffffff,fffbfa,ffeddf,ffdcc1,e2c0a5,c5a58b,aa8b72,8d705a,745943,5a422d,412c19,2a1707,000000,ffffff,fdffd7,eef5be,e0e8b1,c4cb97,a8af7e,8e9565,727a4d,5b6238,444a22,2d330e,191e00,000000,ffffff,fcfcfc,f1f1f1,e2e2e2,c6c6c6,ababab,919191,767676,5e5e5e,474747,303030,1b1b1b,000000,ffffff,fcfcfc,f1f1f1,e2e2e2,c6c6c6,ababab,919191,767676,5e5e5e,474747,303030,1b1b1b,000000</rainbow>
+        <fruit_salad>ffffff,fffbfa,ffedef,ffdadf,ffb2be,f98b9c,d97082,b85769,9c4052,7d293b,5f1126,400012,000000,ffffff,fffbfa,ffedef,ffdadf,ffb2be,e894a0,c97a86,aa606c,8e4a55,72333e,561c28,3b0714,000000,ffffff,fffbfa,ffeddf,ffdcbf,ffb879,e19d61,c28349,a46932,88521c,6b3b05,4d2700,2f1500,000000,ffffff,fffbfa,ffeddf,f6decd,d9c2b2,bda798,a18d7e,857264,6c5b4e,534437,3c2d22,26190f,000000,ffffff,fffbfa,ffeddf,ffdcc1,e2c0a5,c5a58b,aa8b72,8d705a,745943,5a422d,412c19,2a1707,000000</fruit_salad>
+    </theme>
+    <theme color="ff6e7e0f">
+        <spritz>ffffff,fdfee4,f1f2d8,e3e4cb,c7c8b0,abad96,90927c,757862,5e604c,464835,2f3220,1a1d0d,000000,ffffff,fefdec,f2f2e0,e4e4d3,c7c7b7,acac9d,919283,767769,5e6052,46483b,303126,1b1c12,000000,ffffff,fcffdc,f0f3d0,e2e5c2,c6c9a8,aaae8e,909375,74795b,5c6145,454930,2f321b,1a1d08,000000,ffffff,fffbf7,f4f0ec,e5e2dd,c9c6c2,adaba7,92918d,777672,605e5b,474744,31302e,1c1b19,000000,ffffff,fffbf7,f4f0ec,e5e2dd,c9c6c2,adaba7,92918d,777672,605e5b,474744,31302e,1c1b19,000000</spritz>
+        <tonal_spot>ffffff,fcffd5,ebf8a4,ddea96,c1cd7d,a5b264,8b974d,707c35,596320,414b08,2b3400,181e00,000000,ffffff,fcffdc,f0f3d0,e2e5c2,c6c9a8,aaae8e,909375,74795b,5c6145,454930,2f321b,1a1d08,000000,ffffff,f0fffa,cbfbed,bdeddf,a1d0c3,87b4a8,6d9a8e,527e73,3b665c,224e45,05372f,002019,000000,ffffff,fffcf4,f3f1e8,e5e3da,c8c7bf,adaba4,929189,777670,5f5f58,474741,30312b,1c1c17,000000,ffffff,fefdec,f2f2e0,e4e4d3,c7c7b7,acac9d,919283,767769,5e6052,46483b,303126,1b1c12,000000</tonal_spot>
+        <vibrant>ffffff,fdffd7,eaf99a,daec7b,becf61,a2b449,889931,6e7d16,566500,404c00,2b3400,181e00,000000,ffffff,ffffc9,f3f4bb,e5e6ad,c8ca94,adaf7b,929462,77794a,5f6135,47491f,31320a,1c1d00,000000,ffffff,ffffc8,f3f5a8,e5e79b,c8cb82,adaf69,929551,777a39,5f6224,474a0d,303300,1c1d00,000000,ffffff,fefcf0,f3f1e5,e4e3d6,c8c7bb,acaca0,929187,76776c,5e5f55,47473e,303129,1c1c15,000000,ffffff,fdfee4,f1f2d8,e3e4cb,c7c8b0,abad96,90927c,757862,5e604c,464835,2f3220,1a1d0d,000000</vibrant>
+        <expressive>ffffff,fffbfa,ffecf1,ffd9e4,ffb0ca,e992ae,cb7793,ac5e78,904761,732f49,581933,3c031e,000000,ffffff,ffffc9,f3f4bb,e5e6ad,c8ca94,adaf7b,929462,77794a,5f6135,47491f,31320a,1c1d00,000000,ffffff,ffffc8,f2f794,e4e887,c8cc6f,acb156,92963e,777a26,5f620e,474a00,303300,1b1d00,000000,ffffff,fafeef,eff2e4,e1e4d6,c4c8bb,a8ad9f,8e9286,73786b,5b6055,44483e,2d3228,181d14,000000,ffffff,f9ffea,ebf4dd,dde5cf,c1cab4,a6ae9a,8b9380,707966,59614f,424939,2b3324,171e10,000000</expressive>
+        <rainbow>ffffff,fdffd7,eaf99a,daec7b,becf61,a2b449,889931,6e7d16,566500,404c00,2b3400,181e00,000000,ffffff,fcffdc,f0f3d0,e2e5c2,c6c9a8,aaae8e,909375,74795b,5c6145,454930,2f321b,1a1d08,000000,ffffff,f0fffa,cbfbed,bdeddf,a1d0c3,87b4a8,6d9a8e,527e73,3b665c,224e45,05372f,002019,000000,ffffff,fcfcfc,f1f1f1,e2e2e2,c6c6c6,ababab,919191,767676,5e5e5e,474747,303030,1b1b1b,000000,ffffff,fcfcfc,f1f1f1,e2e2e2,c6c6c6,ababab,919191,767676,5e5e5e,474747,303030,1b1b1b,000000</rainbow>
+        <fruit_salad>ffffff,fffbf9,ffeedc,ffddb6,ffb85d,e69c38,c7821d,a76800,875300,663d00,482a00,2b1700,000000,ffffff,fffbf9,ffeedc,ffddb6,f8bb71,daa059,bc8641,9e6b2a,825414,663d00,482a00,2b1700,000000,ffffff,fcffd5,ebf8a4,ddea96,c1cd7d,a5b264,8b974d,707c35,596320,414b08,2b3400,181e00,000000,ffffff,fdfee7,f2f2dd,e3e4ce,c7c8b3,abad99,919280,767766,5e604f,464839,2f3223,1a1d0f,000000,ffffff,fcffdc,f0f3d0,e2e5c2,c6c9a8,aaae8e,909375,74795b,5c6145,454930,2f321b,1a1d08,000000</fruit_salad>
+    </theme>
+    <theme color="ff008772">
+        <spritz>ffffff,f0fffa,e2f5ed,d4e7df,b8cbc4,9dafa9,83958e,687a74,51625c,3a4a45,23342f,0f1e1a,000000,ffffff,f4fefa,e9f3ef,dae5e0,bec9c4,a3ada9,88938f,6e7875,57615d,3f4945,29322f,141d1b,000000,ffffff,f0fffa,dbf7ed,cde9df,b1ccc3,96b1a8,7d968e,627b74,4b635c,334b45,1c352e,06201a,000000,ffffff,fdfcfb,f2f1ef,e3e2e1,c7c7c5,ababaa,90918f,767675,5e5e5d,464746,2f3130,1a1c1b,000000,ffffff,fdfcfb,f2f1ef,e3e2e1,c7c7c5,ababaa,90918f,767675,5e5e5d,464746,2f3130,1a1c1b,000000</spritz>
+        <tonal_spot>ffffff,f0fffa,b3ffec,a1f2dd,85d5c1,69baa6,4e9e8c,308372,086b5a,005143,00382d,002019,000000,ffffff,f0fffa,dbf7ed,cde9df,b1ccc3,96b1a8,7d968e,627b74,4b635c,334b45,1c352e,06201a,000000,ffffff,fafcff,e4f3ff,c6e7ff,aacae3,8fafc8,7594ac,5a7a90,426278,2a4a5f,103447,001e2f,000000,ffffff,fafdfa,eff1ef,e0e3e0,c4c7c5,a8aca9,8e918f,737775,5c5f5d,444846,2e3130,191c1b,000000,ffffff,f4fefa,e9f3ef,dae5e0,bec9c4,a3ada9,88938f,6e7875,57615d,3f4945,29322f,141d1b,000000</tonal_spot>
+        <vibrant>ffffff,f0fffa,b3ffec,79f8da,5bdbbf,37bfa4,00a38a,00856f,006b59,005143,00382d,002019,000000,ffffff,f1fff8,cdfbe7,bfedda,a3d0be,89b5a3,6f9a89,547f6f,3d6658,254e41,0a372b,002117,000000,ffffff,f3fff9,bbffe5,aef0d7,92d4bb,77b8a1,5c9d86,41826c,286956,03513e,003829,002117,000000,ffffff,f7fefa,ecf2ef,dde4e0,c2c8c4,a6ada9,8c928f,717775,59605d,424846,2b322f,161d1b,000000,ffffff,f0fffa,e2f5ed,d4e7df,b8cbc4,9dafa9,83958e,687a74,51625c,3a4a45,23342f,0f1e1a,000000</vibrant>
+        <expressive>ffffff,fffbfa,ffede0,ffdcc0,ffb778,e69a59,c78041,a86729,8b5013,6e3900,4d2600,2f1500,000000,ffffff,f1fff8,cdfbe7,bfedda,a3d0be,89b5a3,6f9a89,547f6f,3d6658,254e41,0a372b,002117,000000,ffffff,f1fff8,b7ffe5,9af4d4,7dd8b9,61bc9e,45a084,23856a,006c53,00513d,003829,002117,000000,ffffff,f4fffd,e9f3f1,dae5e3,bec9c7,a3adac,889391,6e7877,566060,3f4848,293232,141d1d,000000,ffffff,effffe,e2f5f3,d4e6e5,b8cac9,9dafad,829493,687978,506260,394a48,233333,0e1e1e,000000</expressive>
+        <rainbow>ffffff,f0fffa,b3ffec,79f8da,5bdbbf,37bfa4,00a38a,00856f,006b59,005143,00382d,002019,000000,ffffff,f0fffa,dbf7ed,cde9df,b1ccc3,96b1a8,7d968e,627b74,4b635c,334b45,1c352e,06201a,000000,ffffff,fafcff,e4f3ff,c6e7ff,aacae3,8fafc8,7594ac,5a7a90,426278,2a4a5f,103447,001e2f,000000,ffffff,fcfcfc,f1f1f1,e2e2e2,c6c6c6,ababab,919191,767676,5e5e5e,474747,303030,1b1b1b,000000,ffffff,fcfcfc,f1f1f1,e2e2e2,c6c6c6,ababab,919191,767676,5e5e5e,474747,303030,1b1b1b,000000</rainbow>
+        <fruit_salad>ffffff,f9ffe1,ddfca5,c9ef88,aed36f,93b757,799c3e,608026,48680d,334f00,213600,121f00,000000,ffffff,f9ffe1,dffbad,d1eca0,b5d086,9ab46e,809956,667e3e,4f6628,384d13,233600,121f00,000000,ffffff,f0fffa,b3ffec,a1f2dd,85d5c1,69baa6,4e9e8c,308372,086b5a,005143,00382d,002019,000000,ffffff,f1fffa,e5f4ee,d7e6e0,bbcac4,a0aea9,86948e,6c7974,54615d,3d4945,26332f,111e1a,000000,ffffff,f0fffa,dbf7ed,cde9df,b1ccc3,96b1a8,7d968e,627b74,4b635c,334b45,1c352e,06201a,000000</fruit_salad>
+    </theme>
+    <theme color="ff007fb6">
+        <spritz>ffffff,fafcff,e6f2fe,d8e4ef,bcc8d3,a1adb7,86929d,6c7882,546069,3d4852,27323a,111d25,000000,ffffff,fafcff,ecf1f9,dee3ea,c2c7ce,a6acb2,8b9198,70777d,595f65,41474d,2b3137,171c21,000000,ffffff,fafcff,e4f2ff,d3e5f5,b7c9d8,9caebd,8193a1,677887,50606e,384956,22323f,0c1d29,000000,ffffff,fefcfc,f2f0f1,e4e2e3,c7c6c7,acabab,919192,767677,5e5e5f,464748,303031,1b1b1c,000000,ffffff,fefcfc,f2f0f1,e4e2e3,c7c6c7,acabab,919192,767677,5e5e5f,464748,303031,1b1b1c,000000</spritz>
+        <tonal_spot>ffffff,fafcff,e4f2ff,c7e6ff,94cdf7,79b1da,5e97be,417ca2,256489,004b6f,00344f,001e30,000000,ffffff,fafcff,e4f2ff,d3e5f5,b7c9d8,9caebd,8193a1,677887,50606e,384956,22323f,0c1d29,000000,ffffff,fffbfd,f7edff,ebdcff,cfc0e9,b2a5cc,978bb0,7c7095,64597b,4c4163,352b4a,201634,000000,ffffff,fbfcff,f0f0f3,e2e2e5,c6c6c9,aaabae,909194,757679,5c5e61,454749,2f3032,191c1e,000000,ffffff,fafcff,ecf1f9,dee3ea,c2c7ce,a6acb2,8b9198,70777d,595f65,41474d,2b3137,171c21,000000</tonal_spot>
+        <vibrant>ffffff,fafcff,e4f2ff,c7e6ff,86ceff,57b4ee,3599d2,007db5,006492,004b6f,00344f,001e30,000000,ffffff,f9fcff,e1f3ff,c4e8ff,a9cbe2,8db0c6,7395ab,597a8f,416376,284b5e,0d3446,001e2d,000000,ffffff,f9fcff,e1f3ff,c3e8ff,99cdee,7db2d1,6397b5,477c99,2d6480,0b4c67,00344a,001e2d,000000,ffffff,fafcff,eef1f5,e0e3e8,c3c7cb,a8abb0,8d9196,73767a,5b5f63,43474c,2d3134,181c20,000000,ffffff,fafcff,e6f2fe,d8e4ef,bcc8d3,a1adb7,86929d,6c7882,546069,3d4852,27323a,111d25,000000</vibrant>
+        <expressive>ffffff,fcffd8,e8fa9c,d9eb8f,bdcf76,a3b35d,889846,6e7c2e,566417,3f4c00,2a3500,171e00,000000,ffffff,f9fcff,e1f3ff,c4e8ff,a9cbe2,8db0c6,7395ab,597a8f,416376,284b5e,0d3446,001e2d,000000,ffffff,f9fcff,e1f3ff,c3e8ff,86cffa,69b4dd,4c99c1,2b7ea4,00658b,004c6a,00344a,001e2d,000000,ffffff,fdfcff,edf0fa,dfe2eb,c3c7cf,a8abb4,8d9099,72767e,5a5e66,43474e,2d3137,171c22,000000,ffffff,fdfcff,e9f1ff,dbe3f1,bfc7d5,a4acb9,8a919f,6f7783,575f6b,404753,29313b,141c26,000000</expressive>
+        <rainbow>ffffff,fafcff,e4f2ff,c7e6ff,86ceff,57b4ee,3599d2,007db5,006492,004b6f,00344f,001e30,000000,ffffff,fafcff,e4f2ff,d3e5f5,b7c9d8,9caebd,8193a1,677887,50606e,384956,22323f,0c1d29,000000,ffffff,fffbfd,f7edff,ebdcff,cfc0e9,b2a5cc,978bb0,7c7095,64597b,4c4163,352b4a,201634,000000,ffffff,fcfcfc,f1f1f1,e2e2e2,c6c6c6,ababab,919191,767676,5e5e5e,474747,303030,1b1b1b,000000,ffffff,fcfcfc,f1f1f1,e2e2e2,c6c6c6,ababab,919191,767676,5e5e5e,474747,303030,1b1b1b,000000</rainbow>
+        <fruit_salad>ffffff,effffd,affff9,71f7ee,4fdbd2,24beb6,00a29a,00847d,006a64,00504b,003733,00201e,000000,ffffff,effffd,affff9,9df1ea,80d5ce,65b9b3,489e98,27837d,006a65,00504b,003734,00201e,000000,ffffff,fafcff,e4f2ff,c7e6ff,94cdf7,79b1da,5e97be,417ca2,256489,004b6f,00344f,001e30,000000,ffffff,fafcff,e9f1fb,dbe4ed,bfc8d1,a4acb5,89919a,6e777f,576067,3f484f,293138,141c23,000000,ffffff,fafcff,e4f2ff,d3e5f5,b7c9d8,9caebd,8193a1,677887,50606e,384956,22323f,0c1d29,000000</fruit_salad>
+    </theme>
+    <theme color="ff8267c2">
+        <spritz>ffffff,fffbfd,f6eeff,e8dff1,cbc4d5,b0a8ba,958e9e,7a7383,615c6b,4a4453,332e3c,1d1a26,000000,ffffff,fffbfd,f5eefa,e7e0eb,cbc4cf,afa9b4,948f99,79747e,615c66,49454f,322f37,1d1a22,000000,ffffff,fffbfd,f7edff,e9def8,ccc3dc,b1a7c0,958da4,7a7389,625b71,4a4358,332d41,1e182b,000000,ffffff,fffbfd,f4eff1,e6e1e3,cac5c7,aeaaac,939091,787577,605e5f,484648,313031,1c1b1d,000000,ffffff,fffbfd,f4eff1,e6e1e3,cac5c7,aeaaac,939091,787577,605e5f,484648,313031,1c1b1d,000000</spritz>
+        <tonal_spot>ffffff,fffbfd,f7edff,ebddff,d1bcfe,b5a1e1,9987c4,7e6da8,66558e,4d3d75,37265d,211047,000000,ffffff,fffbfd,f7edff,e9def8,ccc3dc,b1a7c0,958da4,7a7389,625b71,4a4358,332d41,1e182b,000000,ffffff,fffbfa,ffecf0,ffd8e3,f0b7c7,d29dab,b68391,986976,7e525f,633b48,4a2531,31101c,000000,ffffff,fffbfd,f5eff4,e6e1e5,c9c5c9,aeaaae,939094,787579,605d62,484649,313033,1c1b1e,000000,ffffff,fffbfd,f5eefa,e7e0eb,cbc4cf,afa9b4,948f99,79747e,615c66,49454f,322f37,1d1a22,000000</tonal_spot>
+        <vibrant>ffffff,fffbfd,f7edff,ebddff,d2bcff,b79df7,9c82da,8167be,684fa3,503789,391d72,22005c,000000,ffffff,fffbff,f5eeff,e7deff,cac1ea,aea6ce,938cb1,787196,605a7c,484264,312c4c,1c1736,000000,ffffff,fffbff,f5eeff,e7deff,cabff8,afa4db,938abf,796fa3,605889,484070,322958,1c1442,000000,ffffff,fffbfd,f5eff7,e7e1e9,cac4cc,aeaab1,948f96,78747c,605d64,48454c,322f36,1d1a20,000000,ffffff,fffbfd,f6eeff,e8dff1,cbc4d5,b0a8ba,958e9e,7a7383,615c6b,4a4453,332e3c,1d1a26,000000</vibrant>
+        <expressive>ffffff,f0fffa,b5ffee,95f4de,78d8c2,5bbca7,3ea08d,168572,006b5a,005144,00382e,00201a,000000,ffffff,fffbff,f5eeff,e7deff,cac1ea,aea6ce,938cb1,787196,605a7c,484264,312c4c,1c1736,000000,ffffff,fffbff,f5eeff,e7deff,cbbeff,aea2ea,9487ce,786db1,615597,483d7e,322665,1c0d50,000000,ffffff,fffbfb,f8eef8,eadfea,cdc4ce,b2a8b3,968e98,7b747d,645c65,4b454d,342f37,1f1a21,000000,ffffff,fffbfb,fbecfd,ecdeef,d0c2d3,b4a7b7,998d9c,7e7282,655b69,4d4451,362d3b,201925,000000</expressive>
+        <rainbow>ffffff,fffbfd,f7edff,ebddff,d2bcff,b79df7,9c82da,8167be,684fa3,503789,391d72,22005c,000000,ffffff,fffbfd,f7edff,e9def8,ccc3dc,b1a7c0,958da4,7a7389,625b71,4a4358,332d41,1e182b,000000,ffffff,fffbfa,ffecf0,ffd8e3,f0b7c7,d29dab,b68391,986976,7e525f,633b48,4a2531,31101c,000000,ffffff,fcfcfc,f1f1f1,e2e2e2,c6c6c6,ababab,919191,767676,5e5e5e,474747,303030,1b1b1b,000000,ffffff,fcfcfc,f1f1f1,e2e2e2,c6c6c6,ababab,919191,767676,5e5e5e,474747,303030,1b1b1b,000000</rainbow>
+        <fruit_salad>ffffff,fcfcff,e8f2ff,cee5ff,97cbff,68b1f4,4a96d8,277bbb,00629f,004a7a,003355,001d35,000000,ffffff,fcfcff,e8f2ff,cee5ff,9dcbfb,82afdf,6795c2,4b7aa6,31628d,124a73,003355,001d35,000000,ffffff,fffbfd,f7edff,ebddff,d1bcfe,b5a1e1,9987c4,7e6da8,66558e,4d3d75,37265d,211047,000000,ffffff,fffbfd,f5eefd,e7e0ee,cbc3d2,afa8b6,948e9c,797480,615c69,494550,322f3a,1d1a24,000000,ffffff,fffbfd,f7edff,e9def8,ccc3dc,b1a7c0,958da4,7a7389,625b71,4a4358,332d41,1e182b,000000</fruit_salad>
+    </theme>
+</themes>
\ No newline at end of file
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapColorSpaceTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapColorSpaceTest.java
index 6e7c5c9..7dd6caa 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapColorSpaceTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapColorSpaceTest.java
@@ -78,6 +78,7 @@
                 Bitmap.Config.RGB_565,
                 Bitmap.Config.ARGB_4444,
                 Bitmap.Config.RGBA_F16,
+                Bitmap.Config.RGBA_1010102,
         };
         // in most cases, createBitmap respects the ColorSpace
         for (Bitmap.Config config : configs) {
@@ -184,6 +185,7 @@
                     Bitmap.Config.ALPHA_8,
                     Bitmap.Config.ARGB_4444,
                     Bitmap.Config.RGBA_F16,
+                    Bitmap.Config.RGBA_1010102,
             };
             for (Bitmap.Config config : configs) {
                 Bitmap orig = Bitmap.createBitmap(32, 32, config, false, rgb);
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
index 6fcc5c0..1917b2d 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapFactoryTest.java
@@ -34,6 +34,7 @@
 import android.graphics.BitmapFactory.Options;
 import android.graphics.Color;
 import android.graphics.Rect;
+import android.media.MediaFormat;
 import android.os.Parcel;
 import android.os.ParcelFileDescriptor;
 import android.platform.test.annotations.LargeTest;
@@ -47,6 +48,7 @@
 
 import com.android.compatibility.common.util.BitmapUtils;
 import com.android.compatibility.common.util.CddTest;
+import com.android.compatibility.common.util.MediaUtils;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -60,6 +62,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.RandomAccessFile;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.concurrent.CountDownLatch;
 
 import junitparams.JUnitParamsRunner;
@@ -84,13 +88,18 @@
     }
 
     private Object[] testImages() {
-        return new Object[] {
+        ArrayList<Object> testImages = new ArrayList<>(Arrays.asList(new Object[] {
                 new TestImage(R.drawable.baseline_jpeg, 1280, 960),
                 new TestImage(R.drawable.png_test, 640, 480),
                 new TestImage(R.drawable.gif_test, 320, 240),
                 new TestImage(R.drawable.bmp_test, 320, 240),
-                new TestImage(R.drawable.webp_test, 640, 480),
-        };
+                new TestImage(R.drawable.webp_test, 640, 480)
+        }));
+        if (MediaUtils.hasDecoder(MediaFormat.MIMETYPE_VIDEO_HEVC)) {
+            // HEIF support is optional when HEVC decoder is not supported.
+            testImages.add(new TestImage(R.raw.heifwriter_input, 1920, 1080));
+        }
+        return testImages.toArray(new Object[] {});
     }
 
     private static final int[] RAW_COLORS = new int[] {
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapShaderTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapShaderTest.java
index 5b3dedf..3eb78b5 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapShaderTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapShaderTest.java
@@ -18,22 +18,26 @@
 import static org.junit.Assert.assertEquals;
 
 import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
 import android.graphics.BitmapShader;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Shader;
 
 import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.ColorUtils;
 
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+
 @SmallTest
-@RunWith(AndroidJUnit4.class)
+@RunWith(JUnitParamsRunner.class)
 public class BitmapShaderTest {
     private static final int TILE_WIDTH = 20;
     private static final int TILE_HEIGHT = 20;
@@ -42,9 +46,17 @@
     private static final int CENTER_COLOR = Color.RED;
     private static final int NUM_TILES = 4;
 
+    private Object[] testConfigs() {
+        return new Object[] {
+            Bitmap.Config.ARGB_8888,
+            Bitmap.Config.RGBA_1010102
+        };
+    }
+
     @Test
-    public void testBitmapShader() {
-        Bitmap tile = Bitmap.createBitmap(TILE_WIDTH, TILE_HEIGHT, Config.ARGB_8888);
+    @Parameters(method = "testConfigs")
+    public void testBitmapShader(Bitmap.Config config) {
+        Bitmap tile = Bitmap.createBitmap(TILE_WIDTH, TILE_HEIGHT, config);
         tile.eraseColor(BORDER_COLOR);
         Canvas c = new Canvas(tile);
         Paint p = new Paint();
@@ -57,7 +69,7 @@
         paint.setShader(shader);
         // create a bitmap that fits (NUM_TILES - 0.5) tiles in both directions
         Bitmap b = Bitmap.createBitmap(NUM_TILES * TILE_WIDTH - TILE_WIDTH / 2,
-                NUM_TILES * TILE_HEIGHT - TILE_HEIGHT / 2, Config.ARGB_8888);
+                NUM_TILES * TILE_HEIGHT - TILE_HEIGHT / 2, config);
         b.eraseColor(Color.BLACK);
         Canvas canvas = new Canvas(b);
         canvas.drawPaint(paint);
@@ -98,15 +110,16 @@
     }
 
     @Test
-    public void testClamp() {
-        Bitmap bitmap = Bitmap.createBitmap(2, 1, Config.ARGB_8888);
+    @Parameters(method = "testConfigs")
+    public void testClamp(Bitmap.Config config) {
+        Bitmap bitmap = Bitmap.createBitmap(2, 1, config);
         bitmap.setPixel(0, 0, Color.RED);
         bitmap.setPixel(1, 0, Color.BLUE);
 
         BitmapShader shader = new BitmapShader(bitmap,
                 Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
 
-        Bitmap dstBitmap = Bitmap.createBitmap(4, 1, Config.ARGB_8888);
+        Bitmap dstBitmap = Bitmap.createBitmap(4, 1, config);
         Canvas canvas = new Canvas(dstBitmap);
         Paint paint = new Paint();
         paint.setShader(shader);
@@ -120,15 +133,16 @@
     }
 
     @Test
-    public void testRepeat() {
-        Bitmap bitmap = Bitmap.createBitmap(2, 1, Config.ARGB_8888);
+    @Parameters(method = "testConfigs")
+    public void testRepeat(Bitmap.Config config) {
+        Bitmap bitmap = Bitmap.createBitmap(2, 1, config);
         bitmap.setPixel(0, 0, Color.RED);
         bitmap.setPixel(1, 0, Color.BLUE);
 
         BitmapShader shader = new BitmapShader(bitmap,
                 Shader.TileMode.REPEAT, Shader.TileMode.REPEAT);
 
-        Bitmap dstBitmap = Bitmap.createBitmap(4, 1, Config.ARGB_8888);
+        Bitmap dstBitmap = Bitmap.createBitmap(4, 1, config);
         Canvas canvas = new Canvas(dstBitmap);
         Paint paint = new Paint();
         paint.setShader(shader);
@@ -142,15 +156,16 @@
     }
 
     @Test
-    public void testMirror() {
-        Bitmap bitmap = Bitmap.createBitmap(2, 1, Config.ARGB_8888);
+    @Parameters(method = "testConfigs")
+    public void testMirror(Bitmap.Config config) {
+        Bitmap bitmap = Bitmap.createBitmap(2, 1, config);
         bitmap.setPixel(0, 0, Color.RED);
         bitmap.setPixel(1, 0, Color.BLUE);
 
         BitmapShader shader = new BitmapShader(bitmap,
                 Shader.TileMode.MIRROR, Shader.TileMode.MIRROR);
 
-        Bitmap dstBitmap = Bitmap.createBitmap(4, 1, Config.ARGB_8888);
+        Bitmap dstBitmap = Bitmap.createBitmap(4, 1, config);
         Canvas canvas = new Canvas(dstBitmap);
         Paint paint = new Paint();
         paint.setShader(shader);
@@ -162,4 +177,48 @@
         Assert.assertArrayEquals(new int[] { Color.RED, Color.BLUE, Color.BLUE, Color.RED },
                 pixels);
     }
+
+    @Test
+    @Parameters(method = "testConfigs")
+    public void testFiltering(Bitmap.Config config) {
+        Bitmap bitmap = Bitmap.createBitmap(2, 2, config);
+        bitmap.setPixel(0, 0, Color.RED);
+        bitmap.setPixel(1, 0, Color.BLUE);
+        bitmap.setPixel(0, 1, Color.BLUE);
+        bitmap.setPixel(1, 1, Color.RED);
+
+        BitmapShader shader = new BitmapShader(bitmap,
+                Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
+        Assert.assertEquals(BitmapShader.FILTER_MODE_DEFAULT, shader.getFilterMode());
+
+        // use slightly left than half to avoid any confusion on which pixel
+        // is sampled with FILTER_MODE_NEAREST
+        Matrix matrix = new Matrix();
+        matrix.postScale(0.49f, 0.49f);
+        shader.setLocalMatrix(matrix);
+
+        Bitmap dstBitmap = Bitmap.createBitmap(1, 1, config);
+        Canvas canvas = new Canvas(dstBitmap);
+        Paint paint = new Paint();
+        paint.setShader(shader);
+
+        paint.setFilterBitmap(false);
+        canvas.drawPaint(paint);
+        ColorUtils.verifyColor("expected solid red color", Color.RED, dstBitmap.getPixel(0, 0), 0);
+
+        paint.setFilterBitmap(true);
+        canvas.drawPaint(paint);
+        ColorUtils.verifyColor("color should be a blue/red mix", Color.valueOf(0.5f, 0.0f, 0.5f),
+                dstBitmap.getColor(0, 0), 0.05f);
+
+        shader.setFilterMode(BitmapShader.FILTER_MODE_NEAREST);
+        canvas.drawPaint(paint);
+        ColorUtils.verifyColor("expected solid red color", Color.RED, dstBitmap.getPixel(0, 0), 0);
+
+        shader.setFilterMode(BitmapShader.FILTER_MODE_LINEAR);
+        paint.setFilterBitmap(false);
+        canvas.drawPaint(paint);
+        ColorUtils.verifyColor("color should be a blue/red mix", Color.valueOf(0.5f, 0.0f, 0.5f),
+                dstBitmap.getColor(0, 0), 0.05f);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
index 0e76d36..e9258f9 100644
--- a/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/BitmapTest.java
@@ -23,6 +23,8 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeNoException;
+import static org.junit.Assume.assumeNotNull;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -676,6 +678,26 @@
         }
     }
 
+    @Test
+    public void testWrapHardwareBufferFor1010102BufferSucceeds() {
+        HardwareBuffer hwBufferMaybe = null;
+
+        try {
+            hwBufferMaybe = HardwareBuffer.create(128, 128, HardwareBuffer.RGBA_1010102, 1,
+                    HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE);
+        } catch (IllegalArgumentException e) {
+            assumeNoException("Creating a 1010102 HW buffer was not supported", e);
+        }
+
+        assumeNotNull(hwBufferMaybe);
+
+        try (HardwareBuffer buffer = hwBufferMaybe) {
+            Bitmap bitmap = Bitmap.wrapHardwareBuffer(buffer, ColorSpace.get(Named.SRGB));
+            assertNotNull(bitmap);
+            bitmap.recycle();
+        }
+    }
+
     private void assertMatches(HardwareBuffer hwBuffer, HardwareBuffer hwBuffer2) {
         assertEquals(hwBuffer, hwBuffer2);
         assertEquals(hwBuffer.hashCode(), hwBuffer2.hashCode());
@@ -2517,12 +2539,11 @@
             Bitmap bm = Bitmap.createBitmap(10, 10, pair.config);
             bm = bm.copy(Bitmap.Config.HARDWARE, false);
 
-            // ALPHA_8 is not supported in HARDWARE.
+            // ALPHA_8 may not be supported in HARDWARE.
             if (bm == null) {
                 assertEquals(Bitmap.Config.ALPHA_8, pair.config);
                 continue;
             }
-            assertNotEquals(Bitmap.Config.ALPHA_8, pair.config);
 
             int nativeFormat = nGetFormat(bm);
             if (pair.config == Bitmap.Config.RGBA_F16) {
@@ -2530,6 +2551,10 @@
                 // In that case, it will fall back to ARGB_8888.
                 assertTrue(nativeFormat == ANDROID_BITMAP_FORMAT_RGBA_8888
                         || nativeFormat == ANDROID_BITMAP_FORMAT_RGBA_F16);
+            } else if (pair.config == Bitmap.Config.RGBA_1010102) {
+                // Devices not supporting RGBA_1010102 in hardware should fallback to ARGB_8888
+                assertTrue(nativeFormat == ANDROID_BITMAP_FORMAT_RGBA_8888
+                        || nativeFormat == ANDROID_BITMAP_FORMAT_RGBA_1010102);
             } else {
                 assertEquals("Config: " + pair.config, pair.format, nativeFormat);
             }
@@ -2548,6 +2573,7 @@
             new Object[] { Config.ARGB_8888, ANDROID_BITMAP_FORMAT_RGBA_8888 },
             new Object[] { Config.RGB_565,   ANDROID_BITMAP_FORMAT_RGB_565 },
             new Object[] { Config.RGBA_F16,  ANDROID_BITMAP_FORMAT_RGBA_F16 },
+            new Object[] { Config.RGBA_1010102,  ANDROID_BITMAP_FORMAT_RGBA_1010102 },
         };
     }
 
@@ -2565,18 +2591,18 @@
                 nTestInfo(bm, expectedFormat, width, height, bm.hasAlpha(),
                         bm.isPremultiplied(), false);
                 Bitmap hwBitmap = bm.copy(Bitmap.Config.HARDWARE, false);
-                if (config == Bitmap.Config.ALPHA_8) {
-                    // ALPHA_8 is not supported in HARDWARE. b/141480329
-                    assertNull(hwBitmap);
+                if (hwBitmap == null) {
+                    // Some devices do not support ALPHA_8 + HARDWARE.
+                    assertEquals(Bitmap.Config.ALPHA_8, config);
                 } else {
-                    assertNotNull(hwBitmap);
-
-                    // Some devices do not support F16 + HARDWARE. These fall back to 8888, and can
-                    // be identified by their use of SRGB instead of EXTENDED_SRGB.
+                    // Some devices do not support (F16 | 1010102) + HARDWARE. These fall back to
+                    // 8888. Check the HWB to confirm.
                     int tempExpectedFormat = expectedFormat;
-                    if (config == Config.RGBA_F16 && hwBitmap.getColorSpace() == ColorSpace.get(
-                            ColorSpace.Named.SRGB)) {
-                        tempExpectedFormat = ANDROID_BITMAP_FORMAT_RGBA_8888;
+                    if (config == Config.RGBA_F16 || config == Config.RGBA_1010102) {
+                        HardwareBuffer buffer = hwBitmap.getHardwareBuffer();
+                        if (buffer.getFormat() == HardwareBuffer.RGBA_8888) {
+                            tempExpectedFormat = ANDROID_BITMAP_FORMAT_RGBA_8888;
+                        }
                     }
                     nTestInfo(hwBitmap, tempExpectedFormat, width, height, hwBitmap.hasAlpha(),
                             hwBitmap.isPremultiplied(), true);
@@ -2872,6 +2898,7 @@
     private static final int ANDROID_BITMAP_FORMAT_RGB_565 = 4;
     private static final int ANDROID_BITMAP_FORMAT_A_8 = 8;
     private static final int ANDROID_BITMAP_FORMAT_RGBA_F16 = 9;
+    private static final int ANDROID_BITMAP_FORMAT_RGBA_1010102 = 10;
 
     private static class ConfigToFormat {
         public final Config config;
@@ -2899,6 +2926,7 @@
         new ConfigToFormat(Bitmap.Config.RGB_565, ANDROID_BITMAP_FORMAT_RGB_565),
         new ConfigToFormat(Bitmap.Config.ALPHA_8, ANDROID_BITMAP_FORMAT_A_8),
         new ConfigToFormat(Bitmap.Config.RGBA_F16, ANDROID_BITMAP_FORMAT_RGBA_F16),
+        new ConfigToFormat(Bitmap.Config.RGBA_1010102, ANDROID_BITMAP_FORMAT_RGBA_1010102),
     };
 
     static native int nGetFormat(Bitmap bitmap);
@@ -2941,4 +2969,17 @@
         options.inPreferredConfig = Config.HARDWARE;
         return options;
     }
+
+    @Test
+    public void testCopyAlpha8ToHardware() {
+        Bitmap bm = Bitmap.createBitmap(10, 10, Bitmap.Config.ALPHA_8);
+        assertNotNull(bm);
+        Bitmap hwBitmap = bm.copy(Bitmap.Config.HARDWARE, false /* mutable */);
+        // Some devices may not support ALPHA_8 + HARDWARE
+        if (hwBitmap != null) {
+            assertNull(hwBitmap.getColorSpace());
+        }
+
+        bm.recycle();
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java b/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java
index 5ef145a..a2e000a 100644
--- a/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/Bitmap_ConfigTest.java
@@ -38,19 +38,21 @@
         assertEquals(Config.ARGB_4444, Config.valueOf("ARGB_4444"));
         assertEquals(Config.ARGB_8888, Config.valueOf("ARGB_8888"));
         assertEquals(Config.RGBA_F16, Config.valueOf("RGBA_F16"));
+        assertEquals(Config.RGBA_1010102, Config.valueOf("RGBA_1010102"));
     }
 
     @Test
     public void testValues(){
         Config[] config = Config.values();
 
-        assertTrue(config.length >= 6);
+        assertTrue(config.length >= 7);
         assertEquals(Config.ALPHA_8, config[0]);
         assertEquals(Config.RGB_565, config[1]);
         assertEquals(Config.ARGB_4444, config[2]);
         assertEquals(Config.ARGB_8888, config[3]);
         assertEquals(Config.RGBA_F16, config[4]);
         assertEquals(Config.HARDWARE, config[5]);
+        assertEquals(Config.RGBA_1010102, config[6]);
 
         // Config is used as a argument here for all the methods that use it
         assertNotNull(Bitmap.createBitmap(10, 24, Config.ALPHA_8));
@@ -58,5 +60,6 @@
         assertNotNull(Bitmap.createBitmap(10, 24, Config.ARGB_8888));
         assertNotNull(Bitmap.createBitmap(10, 24, Config.RGB_565));
         assertNotNull(Bitmap.createBitmap(10, 24, Config.RGBA_F16));
+        assertNotNull(Bitmap.createBitmap(10, 24, Config.RGBA_1010102));
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/ColorSpaceTest.java b/tests/tests/graphics/src/android/graphics/cts/ColorSpaceTest.java
index 3d7561c..d52643f 100644
--- a/tests/tests/graphics/src/android/graphics/cts/ColorSpaceTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/ColorSpaceTest.java
@@ -24,6 +24,7 @@
 import static org.junit.Assert.fail;
 
 import android.graphics.ColorSpace;
+import android.hardware.DataSpace;
 
 import androidx.test.filters.SmallTest;
 
@@ -938,6 +939,25 @@
         }
     }
 
+    @Test
+    public void getDataSpaceFromColorSpace() {
+        ColorSpace cs = ColorSpace.get(ColorSpace.Named.BT709);
+        assertNotNull(cs);
+        assertEquals(DataSpace.DATASPACE_BT709, cs.getDataSpace());
+
+        cs = ColorSpace.get(ColorSpace.Named.ACES);
+        assertEquals(DataSpace.DATASPACE_UNKNOWN, cs.getDataSpace());
+    }
+
+    @Test
+    public void getColorSpaceFromDataSpace() {
+        ColorSpace cs = ColorSpace.getFromDataSpace(DataSpace.DATASPACE_SRGB);
+        assertNotNull(cs);
+        assertEquals(DataSpace.DATASPACE_SRGB, cs.getDataSpace());
+
+        assertNull(ColorSpace.getFromDataSpace(DataSpace.DATASPACE_JFIF));
+    }
+
     @SuppressWarnings("SameParameterValue")
     private void assertArrayNotEquals(float[] a, float[] b, float eps) {
         for (int i = 0; i < a.length; i++) {
diff --git a/tests/tests/graphics/src/android/graphics/cts/EGL15Test.java b/tests/tests/graphics/src/android/graphics/cts/EGL15Test.java
index 5377afb..e60b8cf 100644
--- a/tests/tests/graphics/src/android/graphics/cts/EGL15Test.java
+++ b/tests/tests/graphics/src/android/graphics/cts/EGL15Test.java
@@ -16,15 +16,24 @@
 
 package android.graphics.cts;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.lessThan;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
 
-//import static android.opengl.EGL14.*;
-//import static android.opengl.EGL15.*;
+import android.hardware.SyncFence;
 import android.opengl.EGL14;
 import android.opengl.EGL15;
 import android.opengl.EGLConfig;
 import android.opengl.EGLContext;
 import android.opengl.EGLDisplay;
+import android.opengl.EGLExt;
 import android.opengl.EGLImage;
 import android.opengl.EGLSurface;
 import android.opengl.EGLSync;
@@ -182,6 +191,59 @@
     }
 
     @Test
+    public void testEGL15AndroidNativeFence() {
+        if (mEglVersion < 15) {
+            return;
+        }
+        String eglExtensions = EGL14.eglQueryString(mEglDisplay, EGL14.EGL_EXTENSIONS);
+        if (!eglExtensions.contains("EGL_ANDROID_native_fence_sync")) {
+            return;
+        }
+        long before = System.nanoTime();
+        EGLSync sync = EGL15.eglCreateSync(mEglDisplay, EGLExt.EGL_SYNC_NATIVE_FENCE_ANDROID,
+                new long[] {
+                        EGL14.EGL_NONE },
+                0);
+        assertNotEquals(sync, EGL15.EGL_NO_SYNC);
+        assertEquals(EGL14.EGL_SUCCESS, EGL14.eglGetError());
+
+        SyncFence nativeFence = EGLExt.eglDupNativeFenceFDANDROID(mEglDisplay, sync);
+        assertNotNull(nativeFence);
+        assertEquals(EGL14.EGL_SUCCESS, EGL14.eglGetError());
+        // If the fence isn't valid, trigger a flush & try again
+        if (!nativeFence.isValid()) {
+            GLES20.glFlush();
+            assertEquals(GLES20.GL_NO_ERROR, GLES20.glGetError());
+
+            // Have flushed, native fence should be populated
+            nativeFence = EGLExt.eglDupNativeFenceFDANDROID(mEglDisplay, sync);
+            assertNotNull(nativeFence);
+            assertTrue(nativeFence.isValid());
+            assertEquals(EGL14.EGL_SUCCESS, EGL14.eglGetError());
+        }
+
+        long signaledTime = nativeFence.getSignalTime();
+        // We don't know if the fence has or hasn't signaled yet. But either way it must be
+        // greater than before the fence was created (either signaled, or PENDING which is LONG_MAX)
+        assertThat("getSignalTime before waiting", signaledTime, greaterThan(before));
+        // Similarly, if the fence has signaled it must be less than now
+        assertThat("getSignalTime before waiting", signaledTime,
+                anyOf(equalTo(SyncFence.SIGNAL_TIME_PENDING), lessThan(System.nanoTime())));
+
+        assertTrue(EGL15.eglDestroySync(mEglDisplay, sync));
+        assertEquals(EGL14.EGL_SUCCESS, EGL14.eglGetError());
+
+        assertTrue(nativeFence.awaitForever());
+        signaledTime = nativeFence.getSignalTime();
+        assertNotEquals(SyncFence.SIGNAL_TIME_INVALID, signaledTime);
+        assertThat("getSignalTime after waiting", signaledTime, greaterThan(before));
+
+        nativeFence.close();
+        assertFalse(nativeFence.isValid());
+        assertEquals(SyncFence.SIGNAL_TIME_INVALID, nativeFence.getSignalTime());
+    }
+
+    @Test
     public void testEGL15GetSyncType() {
         if (mEglVersion < 15) {
             return;
diff --git a/tests/tests/graphics/src/android/graphics/cts/FrameRateCtsActivity.java b/tests/tests/graphics/src/android/graphics/cts/FrameRateCtsActivity.java
index 13a549d..607d7c1 100644
--- a/tests/tests/graphics/src/android/graphics/cts/FrameRateCtsActivity.java
+++ b/tests/tests/graphics/src/android/graphics/cts/FrameRateCtsActivity.java
@@ -19,6 +19,8 @@
 import static android.system.OsConstants.EINVAL;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertTrue;
 
 import android.app.Activity;
@@ -44,7 +46,6 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -56,19 +57,25 @@
         System.loadLibrary("ctsgraphics_jni");
     }
 
-    private static String TAG = "FrameRateCtsActivity";
+    private static final String TAG = "FrameRateCtsActivity";
     private static final long FRAME_RATE_SWITCH_GRACE_PERIOD_SECONDS = 2;
     private static final long STABLE_FRAME_RATE_WAIT_SECONDS = 1;
     private static final long POST_BUFFER_INTERVAL_MILLIS = 500;
     private static final int PRECONDITION_WAIT_MAX_ATTEMPTS = 5;
     private static final long PRECONDITION_WAIT_TIMEOUT_SECONDS = 20;
     private static final long PRECONDITION_VIOLATION_WAIT_TIMEOUT_SECONDS = 3;
-    private static final float FRAME_RATE_TOLERANCE = 0.01f;
+    private static final float FRAME_RATE_TOLERANCE_STRICT = 0.01f;
+
+    // Tolerance which doesn't differentiate between the fractional refresh rate pairs, e.g.
+    // 59.94 and 60 will be considered the same refresh rate.
+    // Use this tolerance to verify the refresh rate after calling setFrameRate with
+    // {@Surface.FRAME_RATE_COMPATIBILITY_DEFAULT}.
+    private static final float FRAME_RATE_TOLERANCE_RELAXED = 0.1f;
 
     private DisplayManager mDisplayManager;
     private SurfaceView mSurfaceView;
     private Handler mHandler = new Handler(Looper.getMainLooper());
-    private Object mLock = new Object();
+    private final Object mLock = new Object();
     private Surface mSurface = null;
     private float mDeviceFrameRate;
     private ModeChangedEvents mModeChangedEvents = new ModeChangedEvents();
@@ -193,23 +200,20 @@
             mColor = color;
 
             if (mApi == Api.SURFACE || mApi == Api.ANATIVE_WINDOW || mApi == Api.SURFACE_CONTROL) {
-                assertTrue("No parent surface", parentSurfaceControl != null);
+                assertNotNull("No parent surface", parentSurfaceControl);
                 mSurfaceControl = new SurfaceControl.Builder()
                                           .setParent(parentSurfaceControl)
                                           .setName(mName)
                                           .setBufferSize(destFrame.right - destFrame.left,
                                                   destFrame.bottom - destFrame.top)
                                           .build();
-                SurfaceControl.Transaction transaction = new SurfaceControl.Transaction();
-                try {
+                try (SurfaceControl.Transaction transaction = new SurfaceControl.Transaction()) {
                     transaction.setGeometry(mSurfaceControl, null, destFrame, Surface.ROTATION_0)
                             .apply();
-                } finally {
-                    transaction.close();
                 }
                 mSurface = new Surface(mSurfaceControl);
             } else if (mApi == Api.NATIVE_SURFACE_CONTROL) {
-                assertTrue("No parent surface", parentSurface != null);
+                assertNotNull("No parent surface", parentSurface);
                 mNativeSurfaceControl = nativeSurfaceControlCreate(parentSurface, mName,
                         destFrame.left, destFrame.top, destFrame.right, destFrame.bottom);
                 assertTrue("Failed to create a native SurfaceControl", mNativeSurfaceControl != 0);
@@ -226,19 +230,25 @@
 
             int rc = 0;
             if (mApi == Api.SURFACE) {
-                mSurface.setFrameRate(frameRate, compatibility, changeFrameRateStrategy);
+                if (changeFrameRateStrategy == Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS) {
+                    mSurface.setFrameRate(frameRate, compatibility);
+                } else {
+                    mSurface.setFrameRate(frameRate, compatibility, changeFrameRateStrategy);
+                }
             } else if (mApi == Api.ANATIVE_WINDOW) {
                 rc = nativeWindowSetFrameRate(mSurface, frameRate, compatibility,
                         changeFrameRateStrategy);
             } else if (mApi == Api.SURFACE_CONTROL) {
-                SurfaceControl.Transaction transaction = new SurfaceControl.Transaction();
-                try {
-                    transaction
-                        .setFrameRate(mSurfaceControl, frameRate, compatibility,
-                                changeFrameRateStrategy)
-                        .apply();
-                } finally {
-                    transaction.close();
+                try (SurfaceControl.Transaction transaction = new SurfaceControl.Transaction()) {
+                    if (changeFrameRateStrategy == Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS) {
+                        transaction
+                                .setFrameRate(mSurfaceControl, frameRate, compatibility);
+                    } else {
+                        transaction
+                                .setFrameRate(mSurfaceControl, frameRate, compatibility,
+                                        changeFrameRateStrategy);
+                    }
+                    transaction.apply();
                 }
             } else if (mApi == Api.NATIVE_SURFACE_CONTROL) {
                 nativeSurfaceControlSetFrameRate(mNativeSurfaceControl, frameRate, compatibility,
@@ -262,9 +272,8 @@
             } else {
                 int rc = setFrameRate(frameRate, compatibility, changeFrameRateStrategy);
                 if (mApi == Api.ANATIVE_WINDOW) {
-                    assertTrue("Expected -EINVAL return value from invalid call to"
-                                    + " ANativeWindow_setFrameRate()",
-                            rc == -EINVAL);
+                    assertEquals("Expected -EINVAL return value from invalid call to"
+                            + " ANativeWindow_setFrameRate()", rc, -EINVAL);
                 }
             }
         }
@@ -274,11 +283,8 @@
                     String.format("Setting visibility for %s: %s", mName,
                             visible ? "visible" : "hidden"));
             if (mApi == Api.SURFACE || mApi == Api.ANATIVE_WINDOW || mApi == Api.SURFACE_CONTROL) {
-                SurfaceControl.Transaction transaction = new SurfaceControl.Transaction();
-                try {
+                try (SurfaceControl.Transaction transaction = new SurfaceControl.Transaction()) {
                     transaction.setVisibility(mSurfaceControl, visible).apply();
-                } finally {
-                    transaction.close();
                 }
             } else if (mApi == Api.NATIVE_SURFACE_CONTROL) {
                 nativeSurfaceControlSetVisibility(mNativeSurfaceControl, visible);
@@ -309,11 +315,8 @@
                 mSurface = null;
             }
             if (mSurfaceControl != null) {
-                SurfaceControl.Transaction transaction = new SurfaceControl.Transaction();
-                try {
+                try (SurfaceControl.Transaction transaction = new SurfaceControl.Transaction()) {
                     transaction.reparent(mSurfaceControl, null).apply();
-                } finally {
-                    transaction.close();
                 }
                 mSurfaceControl.release();
                 mSurfaceControl = null;
@@ -407,7 +410,7 @@
         for (float frameRate : frameRates) {
             if (uniqueFrameRates.isEmpty()
                     || frameRate - uniqueFrameRates.get(uniqueFrameRates.size() - 1)
-                            >= FRAME_RATE_TOLERANCE) {
+                            >= FRAME_RATE_TOLERANCE_STRICT) {
                 uniqueFrameRates.add(frameRate);
             }
         }
@@ -430,12 +433,12 @@
                 && mode1.getPhysicalWidth() == mode2.getPhysicalWidth();
     }
 
-    private boolean isFrameRateMultiple(float higherFrameRate, float lowerFrameRate) {
+    private boolean isFrameRateMultiple(
+            float higherFrameRate, float lowerFrameRate, float tolerance) {
         float multiple = higherFrameRate / lowerFrameRate;
         int roundedMultiple = Math.round(multiple);
         return roundedMultiple > 0
-                && Math.abs(roundedMultiple * lowerFrameRate - higherFrameRate)
-                    <= FRAME_RATE_TOLERANCE;
+                && Math.abs(roundedMultiple * lowerFrameRate - higherFrameRate) <= tolerance;
     }
 
     // Returns two device-supported frame rates that aren't multiples of each other, or null if no
@@ -446,7 +449,8 @@
         for (int i = 0; i < frameRates.size(); i++) {
             for (int j = i + 1; j < frameRates.size(); j++) {
                 if (!isFrameRateMultiple(Math.max(frameRates.get(i), frameRates.get(j)),
-                            Math.min(frameRates.get(i), frameRates.get(j)))) {
+                            Math.min(frameRates.get(i), frameRates.get(j)),
+                            FRAME_RATE_TOLERANCE_RELAXED)) {
                     return new float[] {frameRates.get(i), frameRates.get(j)};
                 }
             }
@@ -456,8 +460,8 @@
 
     // Waits until our SurfaceHolder has a surface and the activity is resumed.
     private void waitForPreconditions() throws InterruptedException {
-        assertTrue(
-                "Activity was unexpectedly destroyed", mActivityState != ActivityState.DESTROYED);
+        assertNotSame("Activity was unexpectedly destroyed", mActivityState,
+                ActivityState.DESTROYED);
         if (mSurface == null || mActivityState != ActivityState.RUNNING) {
             Log.i(TAG,
                     String.format(
@@ -473,8 +477,8 @@
                                mSurface != null, mActivityState == ActivityState.RUNNING),
                     timeRemainingMillis > 0);
             mLock.wait(timeRemainingMillis);
-            assertTrue("Activity was unexpectedly destroyed",
-                    mActivityState != ActivityState.DESTROYED);
+            assertNotSame("Activity was unexpectedly destroyed", mActivityState,
+                    ActivityState.DESTROYED);
             nowNanos = System.nanoTime();
         }
         // Make sure any previous mode changes are completed.
@@ -483,8 +487,8 @@
 
     // Returns true if we encounter a precondition violation, false otherwise.
     private boolean waitForPreconditionViolation() throws InterruptedException {
-        assertTrue(
-                "Activity was unexpectedly destroyed", mActivityState != ActivityState.DESTROYED);
+        assertNotSame("Activity was unexpectedly destroyed", mActivityState,
+                ActivityState.DESTROYED);
         long nowNanos = System.nanoTime();
         long endTimeNanos = nowNanos + PRECONDITION_VIOLATION_WAIT_TIMEOUT_SECONDS * 1_000_000_000L;
         while (mSurface != null && mActivityState == ActivityState.RUNNING) {
@@ -493,8 +497,8 @@
                 break;
             }
             mLock.wait(timeRemainingMillis);
-            assertTrue("Activity was unexpectedly destroyed",
-                    mActivityState != ActivityState.DESTROYED);
+            assertNotSame("Activity was unexpectedly destroyed", mActivityState,
+                    ActivityState.DESTROYED);
             nowNanos = System.nanoTime();
         }
         return mSurface == null || mActivityState != ActivityState.RUNNING;
@@ -507,7 +511,7 @@
     }
 
     // Returns true if we reached waitUntilNanos, false if some other event occurred.
-    private boolean waitForEvents(long waitUntilNanos, List<TestSurface> surfaces)
+    private boolean waitForEvents(long waitUntilNanos, TestSurface[] surfaces)
             throws InterruptedException {
         int numModeChangedEvents = mModeChangedEvents.size();
         long nowNanos = System.nanoTime();
@@ -539,21 +543,21 @@
         return true;
     }
 
-    private void waitForStableFrameRate() throws InterruptedException {
-        verifyCompatibleAndStableFrameRate(0, new ArrayList<>());
+    private void waitForStableFrameRate(TestSurface... surfaces) throws InterruptedException {
+        verifyCompatibleAndStableFrameRate(0, FRAME_RATE_TOLERANCE_STRICT, surfaces);
     }
 
     // Set expectedFrameRate to 0.0 to verify only stable frame rate.
-    private void verifyCompatibleAndStableFrameRate(float expectedFrameRate,
-            List<TestSurface> surfaces) throws InterruptedException {
+    private void verifyCompatibleAndStableFrameRate(float expectedFrameRate, float tolerance,
+            TestSurface... surfaces) throws InterruptedException {
         Log.i(TAG, "Verifying compatible and stable frame rate");
         long nowNanos = System.nanoTime();
         long gracePeriodEndTimeNanos =
                 nowNanos + FRAME_RATE_SWITCH_GRACE_PERIOD_SECONDS * 1_000_000_000L;
         while (true) {
-            if (expectedFrameRate > FRAME_RATE_TOLERANCE) { // expectedFrameRate > 0
+            if (expectedFrameRate > tolerance) { // expectedFrameRate > 0
                 // Wait until we switch to a compatible frame rate.
-                while (!isFrameRateMultiple(mDeviceFrameRate, expectedFrameRate)
+                while (!isFrameRateMultiple(mDeviceFrameRate, expectedFrameRate, tolerance)
                         && !waitForEvents(gracePeriodEndTimeNanos, surfaces)) {
                     // Empty
                 }
@@ -698,7 +702,8 @@
                     int initialNumEvents = mModeChangedEvents.size();
                     surface.setFrameRate(frameRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
                             Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);
-                    verifyCompatibleAndStableFrameRate(frameRate, Arrays.asList(surface));
+                    verifyCompatibleAndStableFrameRate(frameRate, FRAME_RATE_TOLERANCE_RELAXED,
+                            surface);
                     verifyModeSwitchesAreSeamless(initialNumEvents, mModeChangedEvents.size());
                     verifyModeSwitchesDontChangeResolution(initialNumEvents,
                             mModeChangedEvents.size());
@@ -707,7 +712,7 @@
                 surface.setFrameRate(0.f, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
                         Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS);
                 // Wait for potential mode switches
-                verifyCompatibleAndStableFrameRate(0, Arrays.asList(surface));
+                waitForStableFrameRate(surface);
                 currentMode = display.getMode();
 
                 // Seamed rates should never generate a seamed switch.
@@ -727,7 +732,8 @@
                     int initialNumEvents = mModeChangedEvents.size();
                     surface.setFrameRate(frameRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
                             Surface.CHANGE_FRAME_RATE_ALWAYS);
-                    verifyCompatibleAndStableFrameRate(frameRate, Arrays.asList(surface));
+                    verifyCompatibleAndStableFrameRate(frameRate, FRAME_RATE_TOLERANCE_RELAXED,
+                            surface);
                     verifyModeSwitchesDontChangeResolution(initialNumEvents,
                             mModeChangedEvents.size());
                 }
@@ -781,14 +787,11 @@
             surfaceB.setFrameRate(frameRateB, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,
                     changeFrameRateStrategy);
 
-            ArrayList<TestSurface> surfaces = new ArrayList<>();
-            surfaces.add(surfaceA);
-            surfaces.add(surfaceB);
-
             if (changeFrameRateStrategy == Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS) {
                 verifyModeSwitchesAreSeamless(initialNumEvents, mModeChangedEvents.size());
             } else {
-                verifyCompatibleAndStableFrameRate(frameRateA, surfaces);
+                verifyCompatibleAndStableFrameRate(frameRateA, FRAME_RATE_TOLERANCE_STRICT,
+                        surfaceA, surfaceB);
             }
 
             verifyModeSwitchesDontChangeResolution(initialNumEvents,
@@ -800,7 +803,8 @@
             if (changeFrameRateStrategy == Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS) {
                 verifyModeSwitchesAreSeamless(initialNumEvents, mModeChangedEvents.size());
             } else {
-                verifyCompatibleAndStableFrameRate(frameRateB, surfaces);
+                verifyCompatibleAndStableFrameRate(frameRateB, FRAME_RATE_TOLERANCE_STRICT,
+                        surfaceA, surfaceB);
             }
             verifyModeSwitchesDontChangeResolution(initialNumEvents,
                     mModeChangedEvents.size());
@@ -850,7 +854,7 @@
     }
 
     public void testInvalidParams() throws InterruptedException {
-        runTestsWithPreconditions(api -> testInvalidParams(api), "invalid params behavior");
+        runTestsWithPreconditions(this::testInvalidParams, "invalid params behavior");
     }
 
     private void runOneSurfaceTest(Api api, OneSurfaceTestInterface test)
@@ -861,9 +865,6 @@
                     "testSurface", mSurfaceView.getHolder().getSurfaceFrame(),
                     /*visible=*/true, Color.RED);
 
-            ArrayList<TestSurface> surfaces = new ArrayList<>();
-            surfaces.add(surface);
-
             test.run(surface);
         } finally {
             if (surface != null) {
@@ -872,24 +873,6 @@
         }
     }
 
-    private void testSwitching(TestSurface surface, List<Float> frameRates, boolean expectSwitch,
-            int changeFrameRateStrategy) throws InterruptedException {
-        for (float frameRate : frameRates) {
-            int initialNumEvents = mModeChangedEvents.size();
-            surface.setFrameRate(frameRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
-                    changeFrameRateStrategy);
-
-            if (expectSwitch) {
-                verifyCompatibleAndStableFrameRate(frameRate, Arrays.asList(surface));
-            }
-            if (changeFrameRateStrategy == Surface.CHANGE_FRAME_RATE_ONLY_IF_SEAMLESS) {
-                verifyModeSwitchesAreSeamless(initialNumEvents, mModeChangedEvents.size());
-            }
-            verifyModeSwitchesDontChangeResolution(initialNumEvents,
-                    mModeChangedEvents.size());
-        }
-    }
-
     private void testMatchContentFramerate_None(Api api) throws InterruptedException {
         runOneSurfaceTest(api, (TestSurface surface) -> {
             Display display = getDisplay();
@@ -898,18 +881,18 @@
 
             for (float frameRate : frameRates) {
                 int initialNumEvents = mModeChangedEvents.size();
-                surface.setFrameRate(frameRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
+                surface.setFrameRate(frameRate, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,
                         Surface.CHANGE_FRAME_RATE_ALWAYS);
 
-                assertTrue("Mode switches are not expected but these were detected "
-                        + modeSwitchesToString(initialNumEvents, mModeChangedEvents.size()),
-                        mModeChangedEvents.size() == initialNumEvents);
+                assertEquals("Mode switches are not expected but these were detected "
+                                + modeSwitchesToString(initialNumEvents, mModeChangedEvents.size()),
+                        mModeChangedEvents.size(), initialNumEvents);
             }
         });
     }
 
     public void testMatchContentFramerate_None() throws InterruptedException {
-        runTestsWithPreconditions(api -> testMatchContentFramerate_None(api),
+        runTestsWithPreconditions(this::testMatchContentFramerate_None,
                 "testMatchContentFramerate_None");
     }
 
@@ -922,27 +905,27 @@
 
             for (float frameRate : frameRatesToTest) {
                 int initialNumEvents = mModeChangedEvents.size();
-                surface.setFrameRate(frameRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
+                surface.setFrameRate(frameRate, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,
                         Surface.CHANGE_FRAME_RATE_ALWAYS);
 
-                verifyCompatibleAndStableFrameRate(frameRate, Arrays.asList(surface));
+                verifyCompatibleAndStableFrameRate(frameRate, FRAME_RATE_TOLERANCE_STRICT, surface);
                 verifyModeSwitchesDontChangeResolution(initialNumEvents,
                         mModeChangedEvents.size());
             }
 
             // Reset to default
-            surface.setFrameRate(0.f, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
+            surface.setFrameRate(0.f, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,
                     Surface.CHANGE_FRAME_RATE_ALWAYS);
 
             // Wait for potential mode switches.
-            verifyCompatibleAndStableFrameRate(0, Arrays.asList(surface));
+            waitForStableFrameRate(surface);
 
             currentMode = display.getMode();
             List<Float> seamedRefreshRates = getSeamedRefreshRates(currentMode, display);
 
             for (float frameRate : seamedRefreshRates) {
                 int initialNumEvents = mModeChangedEvents.size();
-                surface.setFrameRate(frameRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
+                surface.setFrameRate(frameRate, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,
                         Surface.CHANGE_FRAME_RATE_ALWAYS);
 
                 // Mode switches may have occurred, make sure they were all seamless.
@@ -954,7 +937,7 @@
     }
 
     public void testMatchContentFramerate_Auto() throws InterruptedException {
-        runTestsWithPreconditions(api -> testMatchContentFramerate_Auto(api),
+        runTestsWithPreconditions(this::testMatchContentFramerate_Auto,
                 "testMatchContentFramerate_Auto");
     }
 
@@ -964,10 +947,10 @@
             List<Float> frameRates = getRefreshRates(display.getMode(), display);
             for (float frameRate : frameRates) {
                 int initialNumEvents = mModeChangedEvents.size();
-                surface.setFrameRate(frameRate, Surface.FRAME_RATE_COMPATIBILITY_DEFAULT,
+                surface.setFrameRate(frameRate, Surface.FRAME_RATE_COMPATIBILITY_FIXED_SOURCE,
                         Surface.CHANGE_FRAME_RATE_ALWAYS);
 
-                verifyCompatibleAndStableFrameRate(frameRate, Arrays.asList(surface));
+                verifyCompatibleAndStableFrameRate(frameRate, FRAME_RATE_TOLERANCE_STRICT, surface);
                 verifyModeSwitchesDontChangeResolution(initialNumEvents,
                         mModeChangedEvents.size());
             }
@@ -975,7 +958,7 @@
     }
 
     public void testMatchContentFramerate_Always() throws InterruptedException {
-        runTestsWithPreconditions(api -> testMatchContentFramerate_Always(api),
+        runTestsWithPreconditions(this::testMatchContentFramerate_Always,
                 "testMatchContentFramerate_Always");
     }
 
diff --git a/tests/tests/graphics/src/android/graphics/cts/HardwareRendererTest.java b/tests/tests/graphics/src/android/graphics/cts/HardwareRendererTest.java
new file mode 100644
index 0000000..7ec4fa9
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/cts/HardwareRendererTest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2021 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 android.graphics.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.graphics.HardwareRenderer;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class HardwareRendererTest {
+
+    @Test
+    public void isDrawingEnabled_defaultsTrue() {
+        assertThat(HardwareRenderer.isDrawingEnabled()).isTrue();
+    }
+
+    @Test
+    public void setDrawingEnabled() {
+        HardwareRenderer.setDrawingEnabled(false);
+
+        assertThat(HardwareRenderer.isDrawingEnabled()).isFalse();
+
+        HardwareRenderer.setDrawingEnabled(true);
+        assertThat(HardwareRenderer.isDrawingEnabled()).isTrue();
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java b/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java
index a4915b7..f829e80 100644
--- a/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/NinePatchTest.java
@@ -86,6 +86,16 @@
         mNinePatch = new NinePatch(mBitmap, mChunk, NAME);
         assertEquals(mBitmap, mNinePatch.getBitmap());
         assertEquals(NAME, mNinePatch.getName());
+
+        boolean caughtException = false;
+        try {
+            mNinePatch = new NinePatch(mBitmap, null);
+        } catch (Exception e) {
+            // No need to catch it, just asserting that it was thrown
+            caughtException = true;
+        } finally {
+            assertTrue(caughtException);
+        }
     }
 
     @Test
diff --git a/tests/tests/graphics/src/android/graphics/cts/OutlineTest.java b/tests/tests/graphics/src/android/graphics/cts/OutlineTest.java
index d53cec7..7fb066a 100644
--- a/tests/tests/graphics/src/android/graphics/cts/OutlineTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/OutlineTest.java
@@ -162,17 +162,17 @@
         Rect outRect = new Rect();
         outline.setOval(0, 0, 50, 51); // different x & y radii, so not round rect
         assertFalse(outline.getRect(outRect)); // not round rect, doesn't work
-        assertFalse(outline.canClip()); // not round rect, doesn't work
+        assertTrue(outline.canClip());
         assertFalse(outline.isEmpty());
 
         outline.setOval(0, 0, 50, 50); // same x & y radii, so round rect
         assertTrue(outline.getRect(outRect)); // is round rect, so works
-        assertTrue(outline.canClip()); // is round rect, so works
+        assertTrue(outline.canClip());
         assertFalse(outline.isEmpty());
 
         outline.setOval(new Rect(0, 0, 50, 50)); // same x & y radii, so round rect
         assertTrue(outline.getRect(outRect)); // is round rect, so works
-        assertTrue(outline.canClip()); // is round rect, so works
+        assertTrue(outline.canClip());
         assertFalse(outline.isEmpty());
     }
 
@@ -187,6 +187,8 @@
 
         path.addCircle(50, 50, 50, Path.Direction.CW);
         outline.setPath(path);
+        assertTrue(outline.canClip());
+
         assertFalse(outline.isEmpty());
     }
 
@@ -239,5 +241,10 @@
         outline.offset(-5, -10);
         assertTrue(outline.getRect(outRect));
         assertEquals(new Rect(0, 0, 10, 10), outRect);
+
+        // Test cumulative effects
+        outline.offset(-5, -10);
+        assertTrue(outline.getRect(outRect));
+        assertEquals(new Rect(-5, -10, 5, 0), outRect);
     }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/SystemPaletteTest.java b/tests/tests/graphics/src/android/graphics/cts/SystemPaletteTest.java
index e5a3ed7..fb3d7ed 100644
--- a/tests/tests/graphics/src/android/graphics/cts/SystemPaletteTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/SystemPaletteTest.java
@@ -18,36 +18,40 @@
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
+import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
+
 import static com.google.common.truth.Truth.assertWithMessage;
 
 import android.R;
 import android.content.Context;
 import android.graphics.Color;
-import android.graphics.cts.utils.Cam;
+import android.provider.Settings;
+import android.util.Log;
 import android.util.Pair;
 
-
 import androidx.annotation.ColorInt;
 import androidx.core.graphics.ColorUtils;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.PollingCheck;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
 
-import java.util.ArrayList;
+import java.io.IOException;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
-
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class SystemPaletteTest {
 
-    // Hue goes from 0 to 360
-    private static final int MAX_HUE_DISTANCE = 15;
+    private static final boolean DEBUG = true;
+    private static final String TAG = "SystemPaletteTest";
 
     @Test
     public void testShades0and1000() {
@@ -70,78 +74,71 @@
     }
 
     @Test
-    public void testAllColorsBelongToSameFamily() {
+    public void testThemeStyles() {
         final Context context = getInstrumentation().getTargetContext();
-        List<int[]> allPalettes = Arrays.asList(getAllAccent1Colors(context),
-                getAllAccent2Colors(context), getAllAccent3Colors(context),
-                getAllNeutral1Colors(context), getAllNeutral2Colors(context));
+        forEachThemeDefinition((color, style, expectedPalette) -> {
+            // Update setting, so system colors will change
+            runWithShellPermissionIdentity(() -> {
+                Settings.Secure.putString(context.getContentResolver(),
+                        Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
+                        "{\"android.theme.customization.system_palette\":\"" + color
+                                + "\",\"android.theme.customization.theme_style\":\"" + style
+                                + "\"}");
+            });
 
-        final float[] tones = {100, 99, 95, 90, 80, 70, 60, 49, 40, 30, 20, 10, 0};
-        for (int[] palette : allPalettes) {
-            // Determine the median hue of the palette. Each color in the palette colors will have
-            // its hue measured against the median hue. If the difference is too large, the test
-            // fails.
-            List<Float> hues = new ArrayList<>();
-            for (int i = 0; i < palette.length - 1; i++) {
-                // Avoid measuring hue of colors above 90 or below 10 in tone.
-                //
-                // Converting from HCT to sRGB from display quantizes colors - i.e. not every
-                // HCT color can be expressed in sRGB. As colors approach the extreme tones, white
-                // at 100 and black at 0, hues begin overlapping overlay - made up example: hues
-                // 110 to 128 at tone 95, when mapped to sRGB for display, all end up being measured
-                // as hue 114.
-                final float tone = tones[i];
-                if (tone <= 10.0 || tone > 90.0) {
-                    continue;
-                }
-                final Cam cam = Cam.fromInt(palette[i]);
-                hues.add(cam.getHue());
-            }
-            Collections.sort(hues);
-            final float medianHue = hues.get(hues.size() / 2);
+            final int[] allColors = new int[65];
+            new PollingCheck(15_000L, "Invalid tonal palettes for " + color + " " + style) {
+                @Override
+                protected boolean check() {
 
-            // Measure the hue of each color in the palette against the median hue.
-            for (int i = 0; i < palette.length - 1; i++) {
-                final float tone = tones[i];
-                // Skip testing hue of extreme tones, due to overlap due to quantization that occurs
-                // when converting from HCT to sRGB for display.
-                if (tone <= 10.0 || tone > 90.0) {
-                    continue;
+                    System.arraycopy(getAllAccent1Colors(context), 0, allColors, 0, 13);
+                    System.arraycopy(getAllAccent2Colors(context), 0, allColors, 13, 13);
+                    System.arraycopy(getAllAccent3Colors(context), 0, allColors, 26, 13);
+                    System.arraycopy(getAllNeutral1Colors(context), 0, allColors, 39, 13);
+                    System.arraycopy(getAllNeutral2Colors(context), 0, allColors, 52, 13);
+
+                    if (DEBUG) {
+                        final String setting = Settings.Secure
+                                .getString(context.getContentResolver(),
+                                        Settings.Secure.THEME_CUSTOMIZATION_OVERLAY_PACKAGES);
+                        Log.d(TAG, "Expected:\n" + Arrays.toString(expectedPalette)
+                                        + "\nActual:\n" + Arrays.toString(allColors)
+                                        + "\nSetting:\n" + setting);
+                    }
+
+                    return Arrays.equals(allColors, expectedPalette);
                 }
-                final Cam cam = Cam.fromInt(palette[i]);
-                final float hue = cam.getHue();
-                final boolean hueWithinTolerance = deltaHueWithinTolerance(hue, medianHue);
-                assertWithMessage("Color " + toHctString(cam)
-                        + " has different hue compared to median hue " + Math.round(medianHue)
-                        + " of palette: " + Arrays.toString(palette))
-                        .that(hueWithinTolerance).isTrue();
+            }.run();
+        });
+    }
+
+    private void forEachThemeDefinition(ThemeEvaluator evaluator) {
+        final Context context = getInstrumentation().getTargetContext();
+        final XmlPullParser parser = context.getResources()
+                .getXml(android.graphics.cts.R.xml.valid_themes);
+        try {
+            parser.next();
+            parser.next();
+            parser.require(XmlPullParser.START_TAG, null, "themes");
+            while (parser.next() != XmlPullParser.END_TAG) {
+                parser.require(XmlPullParser.START_TAG, null, "theme");
+                final String color = parser.getAttributeValue(null, "color");
+                while (parser.next() != XmlPullParser.END_TAG) {
+                    String styleName = parser.getName();
+                    parser.next();
+                    int[] colors = Arrays.stream(parser.getText().split(","))
+                            .mapToInt(s -> Color.parseColor("#" + s))
+                            .toArray();
+                    parser.next();
+                    parser.require(XmlPullParser.END_TAG, null, styleName);
+                    evaluator.apply(color, styleName.toUpperCase(), colors);
+                }
             }
+        } catch (XmlPullParserException | IOException e) {
+            throw new RuntimeException("Error parsing xml", e);
         }
     }
 
-    private static String toHctString(Cam cam) {
-        final double[] labColor = new double[3];
-        ColorUtils.colorToLAB(cam.viewedInSrgb(), labColor);
-        return "H" + Math.round(cam.getHue()) + " C" + Math.round(cam.getChroma()) + " T"
-                + Math.round(labColor[0]);
-    }
-
-    /**
-     * Compare if color A and B have similar hue, in gCAM space.
-     *
-     * @param colorA Color 1
-     * @param colorB Color 2
-     * @return True when colors have similar hue.
-     */
-    private boolean deltaHueWithinTolerance(float hueA, float hueB) {
-
-        float hue1 = Math.max(hueA, hueB);
-        float hue2 = Math.min(hueA, hueB);
-
-        float diffDegrees = 180.0f - Math.abs(Math.abs(hue1 - hue2) - 180.0f);
-        return diffDegrees < MAX_HUE_DISTANCE;
-    }
-
     @Test
     public void testColorsMatchExpectedLuminance() {
         final Context context = getInstrumentation().getTargetContext();
@@ -318,4 +315,8 @@
         colors[12] = context.getColor(R.color.system_neutral2_1000);
         return colors;
     }
+
+    private interface ThemeEvaluator {
+        void apply(String color, String style, int[] expectedPalette);
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java b/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java
index 8fbdd2f..f86641f 100644
--- a/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java
+++ b/tests/tests/graphics/src/android/graphics/cts/VulkanFeaturesTest.java
@@ -59,6 +59,8 @@
     // and there was an important bugfix relative to 1.0.2.
     private static final int VULKAN_1_0 = 0x00400003; // 1.0.3
     private static final int VULKAN_1_1 = 0x00401000; // 1.1.0
+    private static final int VULKAN_1_2 = 0x00402000; // 1.2.0
+    private static final int VULKAN_1_3 = 0x00403000; // 1.3.0
 
     private static final String VK_ANDROID_EXTERNAL_MEMORY_ANDROID_HARDWARE_BUFFER_EXTENSION_NAME =
             "VK_ANDROID_external_memory_android_hardware_buffer";
@@ -244,6 +246,14 @@
         assertNoVulkanDeviceExtension("VK_KHR_video_encode_queue");
     }
 
+    @CddTest(requirement = "7.1.4.2")
+    @Test
+    public void testVulkanVariantSupport() throws JSONException {
+        int expectedVariant = 0x0;
+        int actualVariant = (mVulkanHardwareVersion.version >> 29) & 0x7;
+        assertEquals(expectedVariant, actualVariant);
+    }
+
     private JSONObject getBestDevice() throws JSONException {
         JSONObject bestDevice = null;
         int bestDeviceLevel = -1;
@@ -343,15 +353,18 @@
     }
 
     private boolean isVersionCompatible(int expected, int actual) {
-        int expectedMajor = (expected >> 22) & 0x3FF;
-        int expectedMinor = (expected >> 12) & 0x3FF;
-        int expectedPatch = (expected >>  0) & 0xFFF;
-        int actualMajor = (actual >> 22) & 0x3FF;
-        int actualMinor = (actual >> 12) & 0x3FF;
-        int actualPatch = (actual >>  0) & 0xFFF;
-        return (actualMajor == expectedMajor) &&
-               (actualMinor == expectedMinor) &&
-               (actualPatch <= expectedPatch);
+        int expectedVariant = (expected >> 29) & 0x7;
+        int expectedMajor   = (expected >> 22) & 0x7F;
+        int expectedMinor   = (expected >> 12) & 0x3FF;
+        int expectedPatch   = (expected >>  0) & 0xFFF;
+        int actualVariant = (actual >> 29) & 0x7;
+        int actualMajor   = (actual >> 22) & 0x7F;
+        int actualMinor   = (actual >> 12) & 0x3FF;
+        int actualPatch   = (actual >>  0) & 0xFFF;
+        return (actualVariant == expectedVariant)
+            && (actualMajor == expectedMajor)
+            && (actualMinor == expectedMinor)
+            && (actualPatch <= expectedPatch);
     }
 
     private boolean isHardwareVersionAllowed(int actual) {
@@ -365,6 +378,8 @@
         final int[] ALLOWED_HARDWARE_VERSIONS = {
             VULKAN_1_0,
             VULKAN_1_1,
+            VULKAN_1_2,
+            VULKAN_1_3,
         };
         for (int expected : ALLOWED_HARDWARE_VERSIONS) {
             if (actual == expected) {
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AdaptiveIconDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AdaptiveIconDrawableTest.java
index a0ba34b..fce9b34 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/AdaptiveIconDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AdaptiveIconDrawableTest.java
@@ -55,6 +55,7 @@
     @Test
     public void testConstructor() {
         new AdaptiveIconDrawable(null, null);
+        new AdaptiveIconDrawable(null, null, null);
     }
 
     @Test
@@ -142,6 +143,21 @@
         assertEquals(128, iconDrawable.getAlpha());
     }
 
+    @Test
+    public void testGetMonochrome() {
+        ColorDrawable drawable = new ColorDrawable(Color.RED);
+        AdaptiveIconDrawable iconDrawable = new AdaptiveIconDrawable(null, null, drawable);
+        assertEquals(drawable, iconDrawable.getMonochrome());
+    }
+
+    @Test
+    public void testMonochromeInflated() {
+        Resources r = InstrumentationRegistry.getTargetContext().getResources();
+        AdaptiveIconDrawable iconDrawable = (AdaptiveIconDrawable) r.getDrawable(
+                R.drawable.adaptiveicondrawable);
+        assertNotNull(iconDrawable.getMonochrome());
+    }
+
     /**
      * When setBound isn't called before draw method is called.
      * Nothing is drawn.
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedImageDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedImageDrawableTest.java
index da2eb16..92c8428 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedImageDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/AnimatedImageDrawableTest.java
@@ -48,8 +48,8 @@
 import androidx.test.rule.ActivityTestRule;
 
 import com.android.compatibility.common.util.BitmapUtils;
-import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -92,7 +92,7 @@
 
     private void setupActivity() {
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
         mImageView = mActivity.findViewById(R.id.animated_image);
     }
 
diff --git a/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java b/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java
index d2fbcf8..a8e6d75 100644
--- a/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java
+++ b/tests/tests/graphics/src/android/graphics/drawable/cts/GradientDrawableTest.java
@@ -715,6 +715,62 @@
     }
 
     @Test
+    public void testGradientColorInflationWithThemeAndNonThemeResources() {
+        final Context context = InstrumentationRegistry.getTargetContext();
+        final Theme theme = context.getResources().newTheme();
+        theme.applyStyle(R.style.Theme_MixedGradientTheme, true);
+        final Theme ctxTheme = context.getTheme();
+        ctxTheme.setTo(theme);
+
+        GradientDrawable drawable = (GradientDrawable)
+                ctxTheme.getDrawable(R.drawable.gradientdrawable_color_mix_theme);
+
+        int[] colors = drawable.getColors();
+        drawable.setColors(colors);
+        assertEquals(3, colors.length);
+        assertEquals(context.getColor(R.color.colorAccent), colors[0]);
+        assertEquals(context.getColor(R.color.colorPrimary), colors[1]);
+        assertEquals(context.getColor(R.color.colorPrimaryDark), colors[2]);
+    }
+
+    @Test
+    public void testGradientColorInflationWithAllThemeResources() {
+        final Context context = InstrumentationRegistry.getTargetContext();
+        final Theme theme = context.getResources().newTheme();
+        theme.applyStyle(R.style.Theme_MixedGradientTheme, true);
+        final Theme ctxTheme = context.getTheme();
+        ctxTheme.setTo(theme);
+
+        GradientDrawable drawable = (GradientDrawable)
+                ctxTheme.getDrawable(R.drawable.gradientdrawable_color_all_theme);
+
+        int[] colors = drawable.getColors();
+        drawable.setColors(colors);
+        assertEquals(3, colors.length);
+        assertEquals(context.getColor(R.color.colorPrimary), colors[0]);
+        assertEquals(context.getColor(R.color.colorPrimaryDark), colors[1]);
+        assertEquals(context.getColor(R.color.colorPrimaryDark), colors[2]);
+    }
+
+    @Test
+    public void testGradientColorNoCenterColorInflationWithThemeAndNonThemeResources() {
+        final Context context = InstrumentationRegistry.getTargetContext();
+        final Theme theme = context.getResources().newTheme();
+        theme.applyStyle(R.style.Theme_MixedGradientTheme, true);
+        final Theme ctxTheme = context.getTheme();
+        ctxTheme.setTo(theme);
+
+        GradientDrawable drawable = (GradientDrawable)
+                ctxTheme.getDrawable(R.drawable.gradientdrawable_noCenterColor_all_theme);
+
+        int[] colors = drawable.getColors();
+        drawable.setColors(colors);
+        assertEquals(2, colors.length);
+        assertEquals(context.getColor(R.color.colorPrimary), colors[0]);
+        assertEquals(context.getColor(R.color.colorPrimaryDark), colors[1]);
+    }
+
+    @Test
     public void testRadialInflationWithThemeAndNonThemeResources() {
         final Context context = new ContextThemeWrapper(InstrumentationRegistry.getTargetContext(),
                 R.style.Theme_MixedGradientTheme);
diff --git a/tests/tests/graphics/src/android/graphics/fonts/FontManagerTest.java b/tests/tests/graphics/src/android/graphics/fonts/FontManagerTest.java
index 0e2711d..7725e9f 100644
--- a/tests/tests/graphics/src/android/graphics/fonts/FontManagerTest.java
+++ b/tests/tests/graphics/src/android/graphics/fonts/FontManagerTest.java
@@ -20,6 +20,7 @@
 import static android.graphics.fonts.FontStyle.FONT_WEIGHT_NORMAL;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import static org.junit.Assert.fail;
 
@@ -271,5 +272,27 @@
         }
     }
 
+    @Test
+    public void fontManager_NotoColorEmojiAvailable() throws IOException {
+        FontConfig fontConfig = getFontConfig();
+        boolean hasNotoColorEmoji = false;
+
+        for (FontConfig.FontFamily family : fontConfig.getFontFamilies()) {
+
+            if (family.getLocaleList().size() == 1
+                    && "Zsye".equals(family.getLocaleList().get(0).getScript())) {
+                if ("NotoColorEmoji".equals(family.getFontList().get(0).getPostScriptName())) {
+                    hasNotoColorEmoji = true;
+                }
+            }
+        }
+
+        assertWithMessage("NotoColorEmoji must be included."
+                + "If you include your own font, place your emoji just before the "
+                + "NotoColorEmoji.ttf")
+            .that(hasNotoColorEmoji)
+                .isTrue();
+    }
+
     // TODO: Add more tests once we sign test fonts.
 }
diff --git a/tests/tests/graphics/src/android/graphics/fonts/SystemEmojiTest.java b/tests/tests/graphics/src/android/graphics/fonts/SystemEmojiTest.java
index 436c1dc..bc52867 100644
--- a/tests/tests/graphics/src/android/graphics/fonts/SystemEmojiTest.java
+++ b/tests/tests/graphics/src/android/graphics/fonts/SystemEmojiTest.java
@@ -18,6 +18,9 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import android.graphics.Paint;
+import android.graphics.text.PositionedGlyphs;
+import android.graphics.text.TextRunShaper;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import androidx.test.runner.AndroidJUnit4;
@@ -46,4 +49,31 @@
 
         assertThat(FontFileTestUtil.containsEmojiCompatMetadata(emojiFont)).isTrue();
     }
+
+    public String getFontName(String chars) {
+        Paint paint = new Paint();
+
+        PositionedGlyphs glyphs = TextRunShaper.shapeTextRun(
+                chars, 0, chars.length(), 0, chars.length(), 0f, 0f, false, paint);
+        assertThat(glyphs.glyphCount()).isEqualTo(1);
+        assertThat(glyphs.getFont(0)).isNotNull();
+        File file = glyphs.getFont(0).getFile();
+        assertThat(file).isNotNull();
+        assertThat(file.getParent()).isEqualTo("/system/fonts");
+
+        return file.getName();
+    }
+
+    @Test
+    public void doNotDrawLegacy() {
+        assertThat(getFontName("\u263A")).isNotEqualTo("NotoColorEmojiLegacy.ttf");
+    }
+
+    @Test
+    public void doNotRemoveLegacyFont() {
+        File legacyFile = new File("/system/fonts", "NotoColorEmojiLegacy.ttf");
+        assertThat(legacyFile.exists()).isTrue();
+        assertThat(legacyFile.isFile()).isTrue();
+        assertThat(legacyFile.canRead()).isTrue();
+    }
 }
diff --git a/tests/tests/graphics/src/android/graphics/text/cts/HyphenationTest.java b/tests/tests/graphics/src/android/graphics/text/cts/HyphenationTest.java
new file mode 100644
index 0000000..23d5625
--- /dev/null
+++ b/tests/tests/graphics/src/android/graphics/text/cts/HyphenationTest.java
@@ -0,0 +1,455 @@
+/*
+ * Copyright (C) 2021 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 android.graphics.text.cts;
+
+import static android.graphics.text.LineBreaker.BREAK_STRATEGY_BALANCED;
+import static android.graphics.text.LineBreaker.HYPHENATION_FREQUENCY_FULL;
+
+import static org.junit.Assert.assertEquals;
+
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.graphics.Paint;
+import android.graphics.Typeface;
+import android.graphics.text.LineBreaker;
+import android.graphics.text.MeasuredText;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Locale;
+
+/**
+ * Verify the hyphenation pattern works as expected.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class HyphenationTest {
+    private static Paint sPaint;
+
+    @BeforeClass
+    public static void classSetUp() {
+        sPaint = new Paint();
+        Context context = InstrumentationRegistry.getTargetContext();
+        AssetManager am = context.getAssets();
+        Typeface tf = new Typeface.Builder(am, "fonts/layout/linebreak.ttf").build();
+        sPaint.setTypeface(tf);
+    }
+
+    @Test
+    public void testAfrikaansPattern() {
+        final String locale = "af";
+        final String text = "zastavila zastavila zastavila zastavila";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | zastavila zas- |
+        // | tavila zasta-  |
+        // | vila zastavila |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(3, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+    }
+
+    @Test
+    public void testAlbanianPattern() {
+        final String locale = "sq";
+        final String text = "vazhduar vazhduar vazhduar vazhduar";
+        final float textSize = 15.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | vazhdu-     |
+        // | ar vazhdu-  |
+        // | ar vazhdu-  |
+        // | ar vazhduar |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(4, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(2));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(3));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(3));
+    }
+
+    @Test
+    public void testAmharicPattern() {
+        final String locale = "am";
+        final String text = "መጋበዛቸውን መጋበዛቸውን መጋበዛቸውን መጋበዛቸውን መጋበዛቸውን";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | መጋበዛቸውን መጋበዛቸ-  |
+        // | ውን መጋበዛቸውን መ-  |
+        // | ጋበዛቸውን መጋበዛቸውን  |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(3, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+    }
+
+    @Test
+    public void testCzechPattern() {
+        final String locale = "cs";
+        final String text = "epidemiologická epidemiologická epidemiologická";
+        final float textSize = 15.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | epidemiolo-  |
+        // | gická epi-   |
+        // | demiolo-     |
+        // | gická epide- |
+        // | miologická   |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(5, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(2));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(3));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(3));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(4));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(4));
+    }
+
+    @Test
+    public void testDutchPattern() {
+        final String locale = "nl";
+        final String text = "beschuldigt beschuldigt beschuldigt beschuldigt";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | beschuldigt be-    |
+        // | schuldigt beschul- |
+        // | digt beschuldigt   |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(3, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+    }
+
+    @Test
+    public void testEnglishPattern() {
+        final String locale = "en";
+        final String text = "hyphenation hyphenation hyphenation hyphenation";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | hyphenation hy-   |
+        // | phenation hyphen- |
+        // | ation hyphenation |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(3, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+    }
+
+    @Test
+    public void testGalicianPattern() {
+        final String locale = "gl";
+        final String text = "tecnoloxía tecnoloxía tecnoloxía";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | tecnoloxía tecno- |
+        // | loxía tecnoloxía  |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(2, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(1));
+    }
+
+    @Test
+    public void testGeorgianPattern() {
+        final String locale = "ka";
+        final String text = "ინფორმაციით ინფორმაციით ინფორმაციით ინფორმაციით";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | ინფორმაცი-     |
+        // | ით ინფორმაცი-  |
+        // | ით ინფორმაცი-  |
+        // | ით ინფორმაციით |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(3, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+    }
+
+    @Test
+    public void testGreekPattern() {
+        final String locale = "el";
+        final String text = "εργαζόμενους εργαζόμενους εργαζόμενους";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | εργαζόμενους ερ- |
+        // | γαζόμενους ερ-   |
+        // | γαζόμενους       |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(3, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+    }
+
+    @Test
+    public void testItalianPattern() {
+        final String locale = "it";
+        final String text = "Assicurati Assicurati Assicurati Assicurati";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | Assicurati Assi- |
+        // | curati Assicu-   |
+        // | rati Assicurati  |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(3, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+    }
+
+    @Test
+    public void testLatvianPattern() {
+        final String locale = "lv";
+        final String text = "verifikāciju verifikāciju verifikāciju verifikāciju";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | verifikāciju veri- |
+        // | fikāciju verifikā- |
+        // | ciju verifikāciju  |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(3, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+    }
+
+    @Test
+    public void testLithuanianPattern() {
+        final String locale = "lt";
+        final String text = "Pasirūpinkite Pasirūpinkite Pasirūpinkite Pasirūpinkite";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | Pasirūpinki-     |
+        // | te Pasirūpinki-  |
+        // | te Pasirūpinki-  |
+        // | te Pasirūpinkite |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(4, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(2));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(3));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(3));
+    }
+
+    @Test
+    public void testRussianPattern() {
+        final String locale = "ru";
+        final String text = "проекте проекте проекте проекте проекте";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | проекте проек-  |
+        // | те проекте про- |
+        // | екте проекте    |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(3, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+    }
+
+    @Test
+    public void testSlovakPattern() {
+        final String locale = "sk";
+        final String text = "epidemiologická epidemiologická epidemiologická";
+        final float textSize = 15.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | epidemiolo-  |
+        // | gická epi-   |
+        // | demiolo-     |
+        // | gická epide- |
+        // | miologická   |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(5, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(2));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(3));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(3));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(4));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(4));
+    }
+
+    @Test
+    public void testSwedishPattern() {
+        final String locale = "sv";
+        final String text = "nederbörd nederbörd nederbörd nederbörd";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | nederbörd ne-  |
+        // | derbörd neder- |
+        // | börd nederbörd |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(3, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+    }
+
+    @Test
+    public void testUkrainianPattern() {
+        final String locale = "uk";
+        final String text = "Увімкніть Увімкніть Увімкніть Увімкніть";
+        final float textSize = 10.0f;
+        sPaint.setTextLocale(new Locale(locale));
+        sPaint.setTextSize(textSize);
+
+        // The visual BALANCED line break output is like
+        // | Увімкніть Уві-   |
+        // | мкніть Уві-      |
+        // | мкніть Увімкніть |
+        final LineBreaker.Result r = computeLineBreaks(text);
+
+        assertEquals(3, r.getLineCount());
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+    }
+
+    private LineBreaker.Result computeLineBreaks(String text) {
+        final LineBreaker lb = new LineBreaker.Builder()
+                .setBreakStrategy(BREAK_STRATEGY_BALANCED)
+                .setHyphenationFrequency(HYPHENATION_FREQUENCY_FULL)
+                .build();
+        final LineBreaker.ParagraphConstraints c = new LineBreaker.ParagraphConstraints();
+        c.setWidth(180f);
+        MeasuredText mt = new MeasuredText.Builder(text.toCharArray())
+                .setComputeHyphenation(MeasuredText.Builder.HYPHENATION_MODE_NORMAL)
+                .appendStyleRun(sPaint, text.length(), false)
+                .build();
+        return lb.computeLineBreaks(mt, c, 0);
+    }
+}
diff --git a/tests/tests/graphics/src/android/graphics/text/cts/LineBreakerTest.java b/tests/tests/graphics/src/android/graphics/text/cts/LineBreakerTest.java
index 5a20570..c02f052 100644
--- a/tests/tests/graphics/src/android/graphics/text/cts/LineBreakerTest.java
+++ b/tests/tests/graphics/src/android/graphics/text/cts/LineBreakerTest.java
@@ -584,6 +584,80 @@
     }
 
     @Test
+    public void testLineBreak_Balanced_Hyphenation() {
+        // The visual BALANCED line break output is like
+        // |hyphenation hy-   |
+        // |phenation hyphen- |
+        // |ation hyphenation |
+        final String text = "hyphenation hyphenation hyphenation hyphenation";
+        final LineBreaker lb = new LineBreaker.Builder()
+                .setBreakStrategy(BREAK_STRATEGY_BALANCED)
+                .setHyphenationFrequency(HYPHENATION_FREQUENCY_FULL)
+                .build();
+        final ParagraphConstraints c = new ParagraphConstraints();
+        c.setWidth(180f);
+        MeasuredText mt = new MeasuredText.Builder(text.toCharArray())
+                .setComputeHyphenation(MeasuredText.Builder.HYPHENATION_MODE_NORMAL)
+                .appendStyleRun(sPaint, text.length(), false)
+                .build();
+        final Result r = lb.computeLineBreaks(mt, c, 0);
+        assertEquals(3, r.getLineCount());
+        assertEquals(14, r.getLineBreakOffset(0));
+        assertEquals(30, r.getLineBreakOffset(1));
+        assertEquals(47, r.getLineBreakOffset(2));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+        assertFalse(r.hasLineTab(0));
+        assertFalse(r.hasLineTab(1));
+        assertFalse(r.hasLineTab(2));
+        assertEquals(150.0f, r.getLineWidth(0), 0.0f);
+        assertEquals(170.0f, r.getLineWidth(1), 0.0f);
+        assertEquals(170.0f, r.getLineWidth(2), 0.0f);
+    }
+
+    @Test
+    public void testLineBreak_Balanced_Hyphenation_IgnoreKerning() {
+        // The visual BALANCED line break output is like
+        // |hyphenation hy-   |
+        // |phenation hyphen- |
+        // |ation hyphenation |
+        //
+        // Note: The line break result should be same to non-fast version.
+        final String text = "hyphenation hyphenation hyphenation hyphenation";
+        final LineBreaker lb = new LineBreaker.Builder()
+                .setBreakStrategy(BREAK_STRATEGY_BALANCED)
+                .setHyphenationFrequency(HYPHENATION_FREQUENCY_FULL)
+                .build();
+        final ParagraphConstraints c = new ParagraphConstraints();
+        c.setWidth(180f);
+        MeasuredText mt = new MeasuredText.Builder(text.toCharArray())
+                .setComputeHyphenation(MeasuredText.Builder.HYPHENATION_MODE_FAST)
+                .appendStyleRun(sPaint, text.length(), false)
+                .build();
+        final Result r = lb.computeLineBreaks(mt, c, 0);
+        assertEquals(3, r.getLineCount());
+        assertEquals(14, r.getLineBreakOffset(0));
+        assertEquals(30, r.getLineBreakOffset(1));
+        assertEquals(47, r.getLineBreakOffset(2));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(0));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(0));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(1));
+        assertEquals(Paint.END_HYPHEN_EDIT_INSERT_HYPHEN, r.getEndLineHyphenEdit(1));
+        assertEquals(Paint.START_HYPHEN_EDIT_NO_EDIT, r.getStartLineHyphenEdit(2));
+        assertEquals(Paint.END_HYPHEN_EDIT_NO_EDIT, r.getEndLineHyphenEdit(2));
+        assertFalse(r.hasLineTab(0));
+        assertFalse(r.hasLineTab(1));
+        assertFalse(r.hasLineTab(2));
+        assertEquals(150.0f, r.getLineWidth(0), 0.0f);
+        assertEquals(170.0f, r.getLineWidth(1), 0.0f);
+        assertEquals(170.0f, r.getLineWidth(2), 0.0f);
+    }
+
+    @Test
     public void testLineBreak_ZeroWidthTab() {
         final String text = "Hi, \tWorld.";
         final LineBreaker lb = new LineBreaker.Builder()
diff --git a/tests/tests/graphics/src/android/graphics/text/cts/MeasuredTextTest.java b/tests/tests/graphics/src/android/graphics/text/cts/MeasuredTextTest.java
index 52a2a74..089ce23 100644
--- a/tests/tests/graphics/src/android/graphics/text/cts/MeasuredTextTest.java
+++ b/tests/tests/graphics/src/android/graphics/text/cts/MeasuredTextTest.java
@@ -28,6 +28,7 @@
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Typeface;
+import android.graphics.text.LineBreakConfig;
 import android.graphics.text.MeasuredText;
 import android.text.PrecomputedText;
 import android.text.SpannableStringBuilder;
@@ -61,6 +62,12 @@
         String text = "Hello, World";
         new MeasuredText.Builder(text.toCharArray())
                 .appendStyleRun(sPaint, text.length(), false /* isRtl */).build();
+
+        LineBreakConfig config = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_LOOSE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE).build();
+        new MeasuredText.Builder(text.toCharArray())
+                .appendStyleRun(sPaint, config, text.length(), false /* isRtl */).build();
     }
 
     @Test
diff --git a/tests/tests/hardware/Android.bp b/tests/tests/hardware/Android.bp
index 7617806..81f02a4 100644
--- a/tests/tests/hardware/Android.bp
+++ b/tests/tests/hardware/Android.bp
@@ -44,6 +44,9 @@
         "libctshardware_jni",
         "libnativehelper_compat_libc++",
     ],
-    srcs: ["src/**/*.java"],
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.kt",
+    ],
     sdk_version: "test_current",
 }
diff --git a/tests/tests/hardware/AndroidManifest.xml b/tests/tests/hardware/AndroidManifest.xml
index 081672b..6ac6d52 100644
--- a/tests/tests/hardware/AndroidManifest.xml
+++ b/tests/tests/hardware/AndroidManifest.xml
@@ -18,6 +18,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="android.hardware.cts">
 
+    <uses-feature android:name="android.software.companion_device_setup" />
+
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE" />
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
@@ -28,6 +30,7 @@
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application>
         <uses-library android:name="android.test.runner" />
diff --git a/tests/tests/hardware/res/raw/google_pixelusbcearbuds_keyeventtests.json b/tests/tests/hardware/res/raw/google_pixelusbcearbuds_keyeventtests.json
new file mode 100644
index 0000000..1ab4894
--- /dev/null
+++ b/tests/tests/hardware/res/raw/google_pixelusbcearbuds_keyeventtests.json
@@ -0,0 +1,51 @@
+[
+  {
+    "name": "Initial check - no events should be produced",
+    "reports": [
+      [0x01, 0x00],
+      [0x01, 0x00]
+    ],
+    "source": "KEYBOARD",
+    "events": [
+    ]
+  },
+
+  {
+    "name": "Press VOLUME_UP",
+    "reports": [
+      [0x01, 0x01],
+      [0x01, 0x00]
+    ],
+    "source": "KEYBOARD",
+    "events": [
+      {"action": "DOWN", "keycode": "VOLUME_UP"},
+      {"action": "UP", "keycode": "VOLUME_UP"}
+    ]
+  },
+
+  {
+    "name": "Press VOLUME_DOWN",
+    "reports": [
+      [0x01, 0x02],
+      [0x01, 0x00]
+    ],
+    "source": "KEYBOARD",
+    "events": [
+      {"action": "DOWN", "keycode": "VOLUME_DOWN"},
+      {"action": "UP", "keycode": "VOLUME_DOWN"}
+    ]
+  },
+
+  {
+    "name": "Press play/pause (black round middle button)",
+    "reports": [
+      [0x01, 0x04],
+      [0x01, 0x00]
+    ],
+    "source": "KEYBOARD",
+    "events": [
+      {"action": "DOWN", "keycode": "MEDIA_PLAY_PAUSE"},
+      {"action": "UP", "keycode": "MEDIA_PLAY_PAUSE"}
+    ]
+  }
+]
diff --git a/tests/tests/hardware/res/raw/google_pixelusbcearbuds_register.json b/tests/tests/hardware/res/raw/google_pixelusbcearbuds_register.json
new file mode 100644
index 0000000..1b87f57
--- /dev/null
+++ b/tests/tests/hardware/res/raw/google_pixelusbcearbuds_register.json
@@ -0,0 +1,13 @@
+{
+  "id": 1,
+  "command": "register",
+  "name": "Google Pixel USB-C earbuds",
+  "vid": 0x18d1,
+  "pid": 0x5003,
+  "bus": "usb",
+  "source": "KEYBOARD",
+  "descriptor": [0x05, 0x0c, 0x09, 0x01, 0xa1, 0x01, 0x85, 0x01, 0x15, 0x00, 0x25, 0x01, 0x75,
+    0x01, 0x95, 0x02, 0x09, 0xe9, 0x09, 0xea, 0x81, 0x02, 0x95, 0x01, 0x09, 0xcd, 0x81, 0x02,
+    0x95, 0x05, 0x81, 0x01, 0x85, 0x04, 0x09, 0x00, 0x75, 0x08, 0x95, 0x26, 0x91, 0x02, 0x85,
+    0x05, 0x09, 0x00, 0x95, 0x22, 0x81, 0x02, 0xc0]
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/DataSpaceTest.java b/tests/tests/hardware/src/android/hardware/cts/DataSpaceTest.java
new file mode 100644
index 0000000..ebbfd30
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/cts/DataSpaceTest.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright 2021 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 android.hardware.cts;
+
+import static android.opengl.GLES20.glDeleteTextures;
+import static android.opengl.GLES20.glGenTextures;
+
+import static org.junit.Assert.assertEquals;
+
+import android.graphics.ImageFormat;
+import android.graphics.SurfaceTexture;
+import android.hardware.DataSpace;
+import android.media.Image;
+import android.media.ImageReader;
+import android.media.ImageWriter;
+import android.opengl.EGL14;
+import android.opengl.EGLConfig;
+import android.opengl.EGLContext;
+import android.opengl.EGLDisplay;
+import android.opengl.EGLSurface;
+import android.view.Surface;
+
+import androidx.test.annotation.UiThreadTest;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+@SmallTest
+public class DataSpaceTest {
+    private SurfaceTexture mSurfaceTexture;
+    private Surface mSurface;
+    private int[] mTex;
+    private ImageWriter mWriter;
+    private ImageReader mReader;
+
+    private EGLDisplay mEglDisplay = EGL14.EGL_NO_DISPLAY;
+    private EGLConfig mEglConfig = null;
+    private EGLSurface mEglSurface = EGL14.EGL_NO_SURFACE;
+    private EGLContext mEglContext = EGL14.EGL_NO_CONTEXT;
+
+    @UiThreadTest
+    @Before
+    public void setUp() throws Throwable {
+        mEglDisplay = EGL14.eglGetDisplay(EGL14.EGL_DEFAULT_DISPLAY);
+        if (mEglDisplay == EGL14.EGL_NO_DISPLAY) {
+            throw new RuntimeException("no EGL display");
+        }
+        int[] major = new int[1];
+        int[] minor = new int[1];
+        if (!EGL14.eglInitialize(mEglDisplay, major, 0, minor, 0)) {
+            throw new RuntimeException("error in eglInitialize");
+        }
+
+        // If we could rely on having EGL_KHR_surfaceless_context and EGL_KHR_context_no_config, we
+        // wouldn't have to create a config or pbuffer at all.
+
+        int[] numConfigs = new int[1];
+        EGLConfig[] configs = new EGLConfig[1];
+        if (!EGL14.eglChooseConfig(mEglDisplay, new int[] {
+                EGL14.EGL_RENDERABLE_TYPE, EGL14.EGL_OPENGL_ES2_BIT,
+                EGL14.EGL_SURFACE_TYPE, EGL14.EGL_PBUFFER_BIT,
+                EGL14.EGL_NONE}, 0, configs, 0, 1, numConfigs, 0)) {
+            throw new RuntimeException("eglChooseConfig failed");
+        }
+        mEglConfig = configs[0];
+
+        mEglSurface = EGL14.eglCreatePbufferSurface(mEglDisplay, mEglConfig,
+            new int[] {EGL14.EGL_WIDTH, 1, EGL14.EGL_HEIGHT, 1, EGL14.EGL_NONE}, 0);
+        if (mEglSurface == EGL14.EGL_NO_SURFACE) {
+            throw new RuntimeException("eglCreatePbufferSurface failed");
+        }
+
+        mEglContext = EGL14.eglCreateContext(mEglDisplay, mEglConfig, EGL14.EGL_NO_CONTEXT,
+            new int[] {EGL14.EGL_CONTEXT_CLIENT_VERSION, 2, EGL14.EGL_NONE}, 0);
+        if (mEglContext == EGL14.EGL_NO_CONTEXT) {
+            throw new RuntimeException("eglCreateContext failed");
+        }
+
+        if (!EGL14.eglMakeCurrent(mEglDisplay, mEglSurface, mEglSurface, mEglContext)) {
+            throw new RuntimeException("eglMakeCurrent failed");
+        }
+    }
+
+    @After
+    public void tearDown() throws Throwable {
+        if (mReader != null) {
+            mReader.close();
+            mReader = null;
+        }
+        if (mWriter != null) {
+            mWriter.close();
+            mWriter = null;
+        }
+        if (mSurface != null) {
+            mSurface.release();
+            mSurface = null;
+        }
+        if (mSurfaceTexture != null) {
+            mSurfaceTexture.release();
+            mSurfaceTexture = null;
+            glDeleteTextures(1, mTex, 0);
+        }
+        if (mEglDisplay != EGL14.EGL_NO_DISPLAY) {
+            EGL14.eglDestroyContext(mEglDisplay, mEglContext);
+            EGL14.eglDestroySurface(mEglDisplay, mEglSurface);
+            EGL14.eglTerminate(mEglDisplay);
+        }
+        mEglDisplay = EGL14.EGL_NO_DISPLAY;
+        mEglContext = EGL14.EGL_NO_CONTEXT;
+        mEglSurface = EGL14.EGL_NO_SURFACE;
+    }
+
+    @UiThreadTest
+    @Test
+    public void getDataSpace() {
+        mTex = new int[1];
+        glGenTextures(1, mTex, 0);
+
+        // create a surfaceTexture attached to mTex[0]
+        mSurfaceTexture = new SurfaceTexture(mTex[0]);
+        mSurfaceTexture.setDefaultBufferSize(16, 16);
+
+        mSurface = new Surface(mSurfaceTexture);
+        mWriter = new ImageWriter.Builder(mSurface).build();
+
+        int dataSpace = DataSpace.pack(DataSpace.STANDARD_BT709,
+                                        DataSpace.TRANSFER_SMPTE_170M,
+                                        DataSpace.RANGE_LIMITED);
+        Image inputImage = null;
+        try {
+            inputImage = mWriter.dequeueInputImage();
+            inputImage.setDataSpace(dataSpace);
+            assertEquals(dataSpace, inputImage.getDataSpace());
+
+            mWriter.queueInputImage(inputImage);
+
+            mSurfaceTexture.updateTexImage();
+            int outDataSpace = mSurfaceTexture.getDataSpace();
+
+            assertEquals(dataSpace, outDataSpace);
+            assertEquals(DataSpace.STANDARD_BT709, DataSpace.getStandard(outDataSpace));
+            assertEquals(DataSpace.TRANSFER_SMPTE_170M, DataSpace.getTransfer(outDataSpace));
+            assertEquals(DataSpace.RANGE_LIMITED, DataSpace.getRange(outDataSpace));
+        } finally {
+            if (inputImage != null) {
+                inputImage.close();
+                inputImage = null;
+            }
+        }
+    }
+
+    @UiThreadTest
+    @Test
+    public void getDataSpaceWithoutSetDataSpace() {
+        mTex = new int[1];
+        glGenTextures(1, mTex, 0);
+
+        // create a surfaceTexture attached to mTex[0]
+        mSurfaceTexture = new SurfaceTexture(mTex[0]);
+        mSurfaceTexture.setDefaultBufferSize(16, 16);
+
+        mSurface = new Surface(mSurfaceTexture);
+        mWriter = ImageWriter.newInstance(mSurface, 1);
+
+        Image inputImage = null;
+        try {
+            inputImage = mWriter.dequeueInputImage();
+            mWriter.queueInputImage(inputImage);
+
+            mSurfaceTexture.updateTexImage();
+
+            assertEquals(DataSpace.DATASPACE_UNKNOWN, mSurfaceTexture.getDataSpace());
+        } finally {
+            if (inputImage != null) {
+                inputImage.close();
+                inputImage = null;
+            }
+        }
+    }
+
+    @UiThreadTest
+    @Test
+    public void getDataSpaceWithFormatYUV420_888() {
+        mTex = new int[1];
+        glGenTextures(1, mTex, 0);
+
+        // create a surfaceTexture attached to mTex[0]
+        mSurfaceTexture = new SurfaceTexture(mTex[0]);
+        mSurfaceTexture.setDefaultBufferSize(16, 16);
+
+        mSurface = new Surface(mSurfaceTexture);
+        mWriter = new ImageWriter.Builder(mSurface)
+                .setImageFormat(ImageFormat.YUV_420_888)
+                .build();
+
+        Image inputImage = null;
+        try {
+            inputImage = mWriter.dequeueInputImage();
+            mWriter.queueInputImage(inputImage);
+
+            mSurfaceTexture.updateTexImage();
+
+            // test default dataspace value of ImageFormat.YUV_420_888 format.
+            assertEquals(DataSpace.DATASPACE_JFIF, mSurfaceTexture.getDataSpace());
+        } finally {
+            if (inputImage != null) {
+                inputImage.close();
+                inputImage = null;
+            }
+        }
+    }
+
+    @UiThreadTest
+    @Test
+    public void getDataSpaceFromImageReaderNextImage() {
+        mReader = ImageReader.newInstance(100, 100, ImageFormat.YUV_420_888, 1);
+        mWriter = ImageWriter.newInstance(mReader.getSurface(), 1);
+
+        int dataSpace = DataSpace.pack(DataSpace.STANDARD_BT601_625,
+                                        DataSpace.TRANSFER_SMPTE_170M,
+                                        DataSpace.RANGE_FULL);
+
+        Image outputImage = null;
+        Image nextImage = null;
+        try {
+            outputImage = mWriter.dequeueInputImage();
+            outputImage.setDataSpace(dataSpace);
+            assertEquals(dataSpace, outputImage.getDataSpace());
+
+            mWriter.queueInputImage(outputImage);
+
+            nextImage = mReader.acquireLatestImage();
+            assertEquals(dataSpace, nextImage.getDataSpace());
+        } finally {
+            if (outputImage != null) {
+                outputImage.close();
+                outputImage = null;
+            }
+            if (nextImage != null) {
+                nextImage.close();
+                nextImage = null;
+            }
+        }
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/cts/HardwareBufferTest.java b/tests/tests/hardware/src/android/hardware/cts/HardwareBufferTest.java
index a511e76..eaa6162 100644
--- a/tests/tests/hardware/src/android/hardware/cts/HardwareBufferTest.java
+++ b/tests/tests/hardware/src/android/hardware/cts/HardwareBufferTest.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import android.hardware.HardwareBuffer;
 
@@ -121,4 +122,21 @@
         assertFalse(HardwareBuffer.isSupported(1, 1, HardwareBuffer.BLOB,
                 1, HardwareBuffer.USAGE_GPU_SAMPLED_IMAGE | HardwareBuffer.USAGE_GPU_COLOR_OUTPUT));
     }
+
+    @Test
+    public void testInvalidUsage() {
+        final int dimen = 100;
+        final long usage = HardwareBuffer.USAGE_CPU_READ_RARELY | (1L << 46);
+
+        try {
+            HardwareBuffer buffer = HardwareBuffer.create(dimen, dimen, HardwareBuffer.RGBA_8888,
+                    1, usage);
+            fail("Allocation should have failed; instead got " + buffer);
+        } catch (IllegalArgumentException ex) {
+            // Pass
+        }
+
+        assertFalse("Cannot claim a buffer is supported that was unable to be allocated.",
+                HardwareBuffer.isSupported(dimen, dimen, HardwareBuffer.RGBA_8888, 1, usage));
+    }
 }
diff --git a/tests/tests/hardware/src/android/hardware/hdmi/cts/HdmiControlManagerTest.java b/tests/tests/hardware/src/android/hardware/hdmi/cts/HdmiControlManagerTest.java
index 9c0dfae..f74e666 100644
--- a/tests/tests/hardware/src/android/hardware/hdmi/cts/HdmiControlManagerTest.java
+++ b/tests/tests/hardware/src/android/hardware/hdmi/cts/HdmiControlManagerTest.java
@@ -44,8 +44,11 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
@@ -321,6 +324,27 @@
     }
 
     @Test
+    public void testHdmiCecConfig_RoutingControl() throws Exception {
+        // Save original value
+        int originalValue = mHdmiControlManager.getRoutingControl();
+        if (!mHdmiControlManager.getUserCecSettings().contains(
+                HdmiControlManager.CEC_SETTING_NAME_ROUTING_CONTROL)) {
+            return;
+        }
+        try {
+            for (int value : mHdmiControlManager.getAllowedCecSettingIntValues(
+                    HdmiControlManager.CEC_SETTING_NAME_ROUTING_CONTROL)) {
+                mHdmiControlManager.setRoutingControl(value);
+                assertThat(mHdmiControlManager.getRoutingControl()).isEqualTo(value);
+            }
+        } finally {
+            // Restore original value
+            mHdmiControlManager.setRoutingControl(originalValue);
+            assertThat(mHdmiControlManager.getRoutingControl()).isEqualTo(originalValue);
+        }
+    }
+
+    @Test
     public void testHdmiCecConfig_HdmiCecVolumeControlEnabled() throws Exception {
         // Save original value
         int originalValue = mHdmiControlManager.getHdmiCecVolumeControlEnabled();
@@ -387,6 +411,27 @@
     }
 
     @Test
+    public void testHdmiCecConfig_SystemAudioControl() throws Exception {
+        // Save original value
+        int originalValue = mHdmiControlManager.getSystemAudioControl();
+        if (!mHdmiControlManager.getUserCecSettings().contains(
+                HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_CONTROL)) {
+            return;
+        }
+        try {
+            for (int value : mHdmiControlManager.getAllowedCecSettingIntValues(
+                    HdmiControlManager.CEC_SETTING_NAME_SYSTEM_AUDIO_CONTROL)) {
+                mHdmiControlManager.setSystemAudioControl(value);
+                assertThat(mHdmiControlManager.getSystemAudioControl()).isEqualTo(value);
+            }
+        } finally {
+            // Restore original value
+            mHdmiControlManager.setSystemAudioControl(originalValue);
+            assertThat(mHdmiControlManager.getSystemAudioControl()).isEqualTo(originalValue);
+        }
+    }
+
+    @Test
     public void testHdmiCecConfig_SystemAudioModeMuting() throws Exception {
         // Save original value
         int originalValue = mHdmiControlManager.getSystemAudioModeMuting();
@@ -450,4 +495,59 @@
                     originalValue);
         }
     }
+
+    @Test
+    public void testHdmiCecConfig_SadsToQuery() throws Exception {
+        List<String> settings = new ArrayList<String>(Arrays.asList(
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_LPCM,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_DD,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_MPEG1,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_MP3,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_MPEG2,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_AAC,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_DTS,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_ATRAC,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_ONEBITAUDIO,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_DDP,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_DTSHD,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_TRUEHD,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_DST,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_WMAPRO,
+                HdmiControlManager.CEC_SETTING_NAME_QUERY_SAD_MAX));
+        // User-configurable settings
+        List<String> userConfigurableSettings = new ArrayList<>();
+        // Map from user-configurable settings to original values
+        Map<String, Integer> originalValues = new HashMap<>();
+        for (String setting : settings) {
+            if (mHdmiControlManager.getUserCecSettings().contains(setting)) {
+                userConfigurableSettings.add(setting);
+                originalValues.put(setting, mHdmiControlManager.getSadPresenceInQuery(setting));
+            }
+        }
+        if (userConfigurableSettings.size() == 0) {
+            return;
+        }
+        try {
+            for (String setting : userConfigurableSettings) {
+                for (int value : mHdmiControlManager.getAllowedCecSettingIntValues(setting)) {
+                    mHdmiControlManager.setSadsPresenceInQuery(
+                            new ArrayList<String>(Arrays.asList(setting)), value);
+                    assertThat(mHdmiControlManager.getSadPresenceInQuery(setting)).isEqualTo(value);
+                }
+            }
+            for (String setting : userConfigurableSettings) {
+                for (int value : mHdmiControlManager.getAllowedCecSettingIntValues(setting)) {
+                    mHdmiControlManager.setSadPresenceInQuery(setting, value);
+                    assertThat(mHdmiControlManager.getSadPresenceInQuery(setting)).isEqualTo(value);
+                }
+            }
+        } finally {
+            // Restore original values
+            for (String setting : originalValues.keySet()) {
+                mHdmiControlManager.setSadPresenceInQuery(setting, originalValues.get(setting));
+                assertThat(mHdmiControlManager.getSadPresenceInQuery(setting)).isEqualTo(
+                        originalValues.get(setting));
+            }
+        }
+    }
 }
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/GlobalKeyMapping.java b/tests/tests/hardware/src/android/hardware/input/cts/GlobalKeyMapping.java
index 297031a..b53cefa 100644
--- a/tests/tests/hardware/src/android/hardware/input/cts/GlobalKeyMapping.java
+++ b/tests/tests/hardware/src/android/hardware/input/cts/GlobalKeyMapping.java
@@ -20,7 +20,6 @@
 import android.content.res.Resources;
 import android.content.res.XmlResourceParser;
 import android.util.Log;
-import android.view.InputEvent;
 import android.view.KeyEvent;
 
 import org.xmlpull.v1.XmlPullParser;
@@ -79,12 +78,8 @@
         }
     }
 
-    public boolean isGlobalKey(InputEvent e) {
-        if (GLOBAL_KEYS.isEmpty() || !(e instanceof KeyEvent)) {
-            return false;
-        }
-        KeyEvent keyEvent = (KeyEvent) e;
-        return GLOBAL_KEYS.contains(keyEvent.getKeyCode());
+    public boolean isGlobalKey(int keyCode) {
+        return GLOBAL_KEYS.contains(keyCode);
     }
 
     /** Ported from com.android.internal.util.XmlUtils */
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/GoogleAtvReferenceRemoteControlTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/GoogleAtvReferenceRemoteControlTest.java
index 1afad38..4200bc4 100755
--- a/tests/tests/hardware/src/android/hardware/input/cts/tests/GoogleAtvReferenceRemoteControlTest.java
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/GoogleAtvReferenceRemoteControlTest.java
@@ -16,7 +16,6 @@
 
 package android.hardware.input.cts.tests;
 
-import android.content.Intent;
 import android.hardware.cts.R;
 import android.server.wm.WindowManagerStateHelper;
 
@@ -49,11 +48,6 @@
     public void testHomeKey() {
         testInputEvents(R.raw.google_atvreferenceremote_homekey);
         WindowManagerStateHelper wmStateHelper = new WindowManagerStateHelper();
-        Intent intent = new Intent();
-        intent.addCategory(Intent.CATEGORY_HOME);
-        intent.setAction(Intent.ACTION_MAIN);
-        mActivityRule.getActivity().startActivity(intent);
-
         wmStateHelper.waitForHomeActivityVisible();
         wmStateHelper.assertHomeActivityVisible(true);
     }
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/GooglePixelUsbCEarbudsTest.kt b/tests/tests/hardware/src/android/hardware/input/cts/tests/GooglePixelUsbCEarbudsTest.kt
new file mode 100644
index 0000000..5672b81
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/GooglePixelUsbCEarbudsTest.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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 android.hardware.input.cts.tests
+
+import android.hardware.cts.R
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+public class GooglePixelUsbCEarbudsTest : InputHidTestCase(R.raw.google_pixelusbcearbuds_register) {
+
+    @Test
+    fun testAllKeys() {
+        testInputEvents(R.raw.google_pixelusbcearbuds_keyeventtests)
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/InputHidTestCase.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/InputHidTestCase.java
index 07a080a..677053c 100644
--- a/tests/tests/hardware/src/android/hardware/input/cts/tests/InputHidTestCase.java
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/InputHidTestCase.java
@@ -29,6 +29,9 @@
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.res.Resources;
 import android.hardware.BatteryState;
 import android.hardware.input.InputManager;
 import android.hardware.input.cts.GlobalKeyMapping;
@@ -44,8 +47,7 @@
 import android.util.Log;
 import android.util.Pair;
 import android.view.InputDevice;
-
-import androidx.annotation.CallSuper;
+import android.view.KeyEvent;
 
 import com.android.cts.input.HidBatteryTestData;
 import com.android.cts.input.HidDevice;
@@ -53,6 +55,7 @@
 import com.android.cts.input.HidResultData;
 import com.android.cts.input.HidTestData;
 import com.android.cts.input.HidVibratorTestData;
+import com.android.cts.input.InputJsonParser;
 
 import org.junit.Rule;
 import org.mockito.Mock;
@@ -66,18 +69,24 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public class InputHidTestCase extends InputTestCase {
+public abstract class InputHidTestCase extends InputTestCase {
+
     private static final String TAG = "InputHidTestCase";
     // Sync with linux uhid_event_type::UHID_OUTPUT
     private static final byte UHID_EVENT_TYPE_UHID_OUTPUT = 6;
     private static final long CALLBACK_TIMEOUT_MILLIS = 5000;
 
-    private HidDevice mHidDevice;
-    private final GlobalKeyMapping mGlobalKeyMapping = new GlobalKeyMapping(
-            mInstrumentation.getTargetContext());
-    private int mDeviceId;
     private final int mRegisterResourceId;
+    private final GlobalKeyMapping mGlobalKeyMapping;
+    private final boolean mIsLeanback;
+    private final boolean mVolumeKeysHandledInWindowManager;
+
+    private HidDevice mHidDevice;
+    private int mDeviceId;
     private boolean mDelayAfterSetup = false;
+    private InputJsonParser mParser;
+    private int mVid;
+    private int mPid;
 
     @Rule
     public MockitoRule rule = MockitoJUnit.rule();
@@ -85,14 +94,28 @@
     private OnVibratorStateChangedListener mListener;
 
     InputHidTestCase(int registerResourceId) {
-        super(registerResourceId);
         mRegisterResourceId = registerResourceId;
+        Context context = mInstrumentation.getTargetContext();
+        mGlobalKeyMapping = new GlobalKeyMapping(context);
+        mIsLeanback = context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK);
+        mVolumeKeysHandledInWindowManager = context.getResources().getBoolean(
+                Resources.getSystem().getIdentifier("config_handleVolumeKeysInWindowManager",
+                        "bool", "android"));
     }
 
-    @CallSuper
     @Override
-    public void setUp() throws Exception {
-        super.setUp();
+    void onSetUp() {
+        mParser = new InputJsonParser(mInstrumentation.getTargetContext());
+        mVid = mParser.readVendorId(mRegisterResourceId);
+        mPid = mParser.readProductId(mRegisterResourceId);
+        mDeviceId = mParser.readDeviceId(mRegisterResourceId);
+        mHidDevice = new HidDevice(mInstrumentation,
+                mDeviceId,
+                mVid,
+                mPid,
+                mParser.readSources(mRegisterResourceId),
+                mParser.readRegisterCommand(mRegisterResourceId));
+        assertNotNull(mHidDevice);
         // Even though we already wait for all possible callbacks such as UHID_START and UHID_OPEN,
         // and wait for the correct device to appear by specifying expected source type in the
         // register command, some devices, perhaps due to splitting, do not produce events as soon
@@ -102,6 +125,13 @@
         }
     }
 
+    @Override
+    void onTearDown() {
+        if (mHidDevice != null) {
+            mHidDevice.close();
+        }
+    }
+
     protected void addDelayAfterSetup() {
         mDelayAfterSetup = true;
     }
@@ -143,8 +173,25 @@
         return compareMajorMinorVersion(actualVersion, version) > 0;
     }
 
+    private boolean isForwardedToApps(KeyEvent e) {
+        int keyCode = e.getKeyCode();
+        if (mGlobalKeyMapping.isGlobalKey(keyCode)) {
+            return false;
+        }
+        if (isVolumeKey(keyCode) && (mIsLeanback || mVolumeKeysHandledInWindowManager)) {
+            return false;
+        }
+        return true;
+    }
+
+    private boolean isVolumeKey(int keyCode) {
+        return keyCode == KeyEvent.KEYCODE_VOLUME_UP
+                || keyCode == KeyEvent.KEYCODE_VOLUME_DOWN
+                || keyCode == KeyEvent.KEYCODE_VOLUME_MUTE;
+    }
+
     /** Gets an input device with specific capability */
-    private InputDevice getInputDevice(Capability capability) {
+    protected InputDevice getInputDevice(Capability capability) {
         final InputManager inputManager =
                 mInstrumentation.getTargetContext().getSystemService(InputManager.class);
         final int[] inputDeviceIds = inputManager.getInputDeviceIds();
@@ -198,29 +245,11 @@
         return inputDevice.getLightsManager();
     }
 
-    @Override
-    protected void setUpDevice(int id, int vendorId, int productId, int sources,
-            String registerCommand) {
-        mDeviceId = id;
-        mHidDevice = new HidDevice(mInstrumentation, id, vendorId, productId, sources,
-                registerCommand);
-        assertNotNull(mHidDevice);
-    }
-
-    @Override
-    protected void tearDownDevice() {
-        if (mHidDevice != null) {
-            mHidDevice.close();
-        }
-    }
-
-    @Override
-    protected void testInputDeviceEvents(int resourceId) {
+    protected void testInputEvents(int resourceId) {
         List<HidTestData> tests = mParser.getHidTestData(resourceId);
-        // Global keys are handled by the framework and do not reach apps.
-        // The set of global keys is vendor-specific.
-        // Remove tests which contain global keys because we can't test them
-        tests.removeIf(testData -> testData.events.removeIf(mGlobalKeyMapping::isGlobalKey));
+        // Remove tests which contain keys that are not forwarded to apps
+        tests.removeIf(testData -> testData.events.stream().anyMatch(
+                e -> e instanceof KeyEvent && !isForwardedToApps((KeyEvent) e)));
 
         for (HidTestData testData: tests) {
             mCurrentTestCase = testData.name;
@@ -231,6 +260,7 @@
             }
             verifyEvents(testData.events);
         }
+        assertNoMoreEvents();
     }
 
     private boolean verifyVibratorReportData(HidVibratorTestData test, HidResultData result) {
@@ -477,5 +507,4 @@
             }
         }
     }
-
 }
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/InputTestCase.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/InputTestCase.java
index 209b912..61799d6 100644
--- a/tests/tests/hardware/src/android/hardware/input/cts/tests/InputTestCase.java
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/InputTestCase.java
@@ -24,6 +24,7 @@
 import android.app.Instrumentation;
 import android.hardware.input.cts.InputCallback;
 import android.hardware.input.cts.InputCtsActivity;
+import android.os.Bundle;
 import android.util.Log;
 import android.view.InputDevice;
 import android.view.InputEvent;
@@ -32,11 +33,11 @@
 import android.view.View;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.platform.app.InstrumentationRegistry;
-import androidx.test.rule.ActivityTestRule;
 
 import com.android.compatibility.common.util.PollingCheck;
-import com.android.cts.input.InputJsonParser;
 
 import org.junit.After;
 import org.junit.Before;
@@ -59,54 +60,61 @@
     private InputListener mInputListener;
     private View mDecorView;
 
-    protected InputJsonParser mParser;
     // Stores the name of the currently running test
     protected String mCurrentTestCase;
-    private int mRegisterResourceId; // raw resource that contains json for registering a hid device
-    protected int mVid;
-    protected int mPid;
 
     // State used for motion events
     private int mLastButtonState;
 
-    InputTestCase(int registerResourceId) {
+    protected InputCtsActivity mTestActivity;
+
+    InputTestCase() {
         mEvents = new LinkedBlockingQueue<>();
         mInputListener = new InputListener();
-        mRegisterResourceId = registerResourceId;
     }
 
     @Rule
-    public ActivityTestRule<InputCtsActivity> mActivityRule =
-        new ActivityTestRule<>(InputCtsActivity.class);
+    public ActivityScenarioRule<InputCtsActivity> mActivityRule =
+            new ActivityScenarioRule<>(InputCtsActivity.class);
 
     @Before
     public void setUp() throws Exception {
-        mActivityRule.getActivity().clearUnhandleKeyCode();
-        mActivityRule.getActivity().setInputCallback(mInputListener);
-        mDecorView = mActivityRule.getActivity().getWindow().getDecorView();
-        mParser = new InputJsonParser(mInstrumentation.getTargetContext());
-        mVid = mParser.readVendorId(mRegisterResourceId);
-        mPid = mParser.readProductId(mRegisterResourceId);
-        int deviceId = mParser.readDeviceId(mRegisterResourceId);
-        String registerCommand = mParser.readRegisterCommand(mRegisterResourceId);
-        setUpDevice(deviceId, mParser.readVendorId(mRegisterResourceId),
-                mParser.readProductId(mRegisterResourceId),
-                mParser.readSources(mRegisterResourceId), registerCommand);
+        onBeforeLaunchActivity();
+
+        mActivityRule.getScenario().launch(InputCtsActivity.class, getActivityOptions())
+                .onActivity(activity -> mTestActivity = activity);
+        mTestActivity.clearUnhandleKeyCode();
+        mTestActivity.setInputCallback(mInputListener);
+        mDecorView = mTestActivity.getWindow().getDecorView();
+
+        onSetUp();
+
+        PollingCheck.waitFor(mTestActivity::hasWindowFocus);
+        assertTrue(mCurrentTestCase + ": Activity window must have focus",
+                mTestActivity.hasWindowFocus());
+
         mEvents.clear();
     }
 
     @After
     public void tearDown() throws Exception {
-        tearDownDevice();
+        onTearDown();
     }
 
-    // To be implemented by device specific test case.
-    protected abstract void setUpDevice(int id, int vendorId, int productId, int sources,
-            String registerCommand);
+    /** Optional setup logic performed before the test activity is launched. */
+    void onBeforeLaunchActivity() {}
 
-    protected abstract void tearDownDevice();
+    abstract void onSetUp();
 
-    protected abstract void testInputDeviceEvents(int resourceId);
+    abstract void onTearDown();
+
+    /**
+     * Get the activity options to launch the activity with.
+     * @return the activity options or null.
+     */
+    @Nullable Bundle getActivityOptions() {
+        return null;
+    }
 
     /**
      * Asserts that the application received a {@link android.view.KeyEvent} with the given
@@ -126,7 +134,9 @@
         assertEquals(mCurrentTestCase + " (action)",
                 expectedKeyEvent.getAction(), receivedKeyEvent.getAction());
         assertSource(mCurrentTestCase, expectedKeyEvent, receivedKeyEvent);
-        assertEquals(mCurrentTestCase + " (keycode)",
+        assertEquals(mCurrentTestCase + " (keycode) expected: "
+                + KeyEvent.keyCodeToString(expectedKeyEvent.getKeyCode()) + " received: "
+                + KeyEvent.keyCodeToString(receivedKeyEvent.getKeyCode()),
                 expectedKeyEvent.getKeyCode(), receivedKeyEvent.getKeyCode());
         assertMetaState(mCurrentTestCase, expectedKeyEvent.getMetaState(),
                 receivedKeyEvent.getMetaState());
@@ -170,8 +180,8 @@
      * Asserts motion event axis values. Separate this into a different method to allow individual
      * test case to specify it.
      *
-     * @param expectedSource expected source flag specified in JSON files.
-     * @param actualSource actual source flag received in the test app.
+     * @param expectedEvent expected event flag specified in JSON files.
+     * @param actualEvent actual event flag received in the test app.
      */
     void assertAxis(String testCase, MotionEvent expectedEvent, MotionEvent actualEvent) {
         for (int i = 0; i < actualEvent.getPointerCount(); i++) {
@@ -219,7 +229,7 @@
      *
      * If any more events have been received by the application, this will cause failure.
      */
-    private void assertNoMoreEvents() {
+    protected void assertNoMoreEvents() {
         mInstrumentation.waitForIdleSync();
         InputEvent event = mEvents.poll();
         if (event == null) {
@@ -258,11 +268,6 @@
         assertNoMoreEvents();
     }
 
-    protected void testInputEvents(int resourceId) {
-        testInputDeviceEvents(resourceId);
-        assertNoMoreEvents();
-    }
-
     private InputEvent waitForEvent() {
         try {
             return mEvents.poll(1, TimeUnit.SECONDS);
@@ -392,18 +397,8 @@
         }
     }
 
-    protected void requestFocusSync() {
-        mActivityRule.getActivity().runOnUiThread(() -> {
-            mDecorView.setFocusable(true);
-            mDecorView.setFocusableInTouchMode(true);
-            mDecorView.requestFocus();
-        });
-        PollingCheck.waitFor(mDecorView::hasFocus);
-    }
-
     protected class PointerCaptureSession implements AutoCloseable {
         protected PointerCaptureSession() {
-            requestFocusSync();
             ensurePointerCaptureState(true);
         }
 
@@ -414,12 +409,12 @@
 
         private void ensurePointerCaptureState(boolean enable) {
             final CountDownLatch latch = new CountDownLatch(1);
-            mActivityRule.getActivity().setPointerCaptureCallback(hasCapture -> {
+            mTestActivity.setPointerCaptureCallback(hasCapture -> {
                 if (enable == hasCapture) {
                     latch.countDown();
                 }
             });
-            mActivityRule.getActivity().runOnUiThread(enable ? mDecorView::requestPointerCapture
+            mTestActivity.runOnUiThread(enable ? mDecorView::requestPointerCapture
                     : mDecorView::releasePointerCapture);
             try {
                 if (!latch.await(60, TimeUnit.SECONDS)) {
@@ -432,7 +427,7 @@
                 throw new IllegalStateException(
                         "Interrupted while waiting for Pointer Capture state.");
             } finally {
-                mActivityRule.getActivity().setPointerCaptureCallback(null);
+                mTestActivity.setPointerCaptureCallback(null);
             }
             assertEquals("The view's Pointer Capture state did not match.", enable,
                     mDecorView.hasPointerCapture());
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/InputUinputTestCase.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/InputUinputTestCase.java
deleted file mode 100644
index ec4e384..0000000
--- a/tests/tests/hardware/src/android/hardware/input/cts/tests/InputUinputTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright 2020 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 android.hardware.input.cts.tests;
-
-import com.android.cts.input.UinputDevice;
-import com.android.cts.input.UinputTestData;
-
-import java.util.List;
-
-public class InputUinputTestCase extends InputTestCase {
-    private static final String TAG = "InputUinputTestCase";
-    private UinputDevice mUinputDevice;
-
-    InputUinputTestCase(int registerResourceId) {
-        super(registerResourceId);
-    }
-
-    @Override
-    protected void setUpDevice(int id, int vendorId, int productId, int sources,
-            String registerCommand) {
-        mUinputDevice = new UinputDevice(mInstrumentation, id, vendorId, productId, sources,
-                registerCommand);
-    }
-
-    @Override
-    protected void tearDownDevice() {
-        if (mUinputDevice != null) {
-            mUinputDevice.close();
-        }
-    }
-
-    @Override
-    protected void testInputDeviceEvents(int resourceId) {
-        List<UinputTestData> tests = mParser.getUinputTestData(resourceId);
-
-        for (UinputTestData testData: tests) {
-            mCurrentTestCase = testData.name;
-
-            // Send all of the evdev Events
-            for (int i = 0; i < testData.evdevEvents.size(); i++) {
-                final String injections = testData.evdevEvents.get(i);
-                mUinputDevice.injectEvents(injections);
-            }
-            verifyEvents(testData.events);
-        }
-    }
-}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/KeyboardLayoutChangeTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/KeyboardLayoutChangeTest.java
new file mode 100644
index 0000000..3df8484
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/KeyboardLayoutChangeTest.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright (C) 2022 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 android.hardware.input.cts.tests;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+
+import android.Manifest;
+import android.hardware.cts.R;
+import android.hardware.input.InputManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class KeyboardLayoutChangeTest extends InputHidTestCase {
+
+    private static final long KEYBOARD_LAYOUT_CHANGE_TIMEOUT = 500;
+
+    private InputManager mInputManager;
+    @Mock private InputManager.InputDeviceListener mInputDeviceChangedListener;
+
+
+    // this test needs any physical keyboard to test the keyboard layout change
+    public KeyboardLayoutChangeTest() {
+        super(R.raw.microsoft_designer_keyboard_register);
+    }
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        MockitoAnnotations.initMocks(this);
+        mInputManager = mInstrumentation.getTargetContext().getSystemService(InputManager.class);
+        assertNotNull(mInputManager);
+        mInputManager.registerInputDeviceListener(mInputDeviceChangedListener,
+                new Handler(Looper.getMainLooper()));
+    }
+
+    @Test
+    public void testKeyboardLayoutChanges() {
+        final InputDevice device = getInputDevice(
+                (d) -> d.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC);
+        assertNotNull(device);
+        final String germanLayoutId = getKeyboardLayoutId(device, "german");
+        final String englishLayoutId = getKeyboardLayoutId(device, "english_us");
+        final String frenchLayoutId = getKeyboardLayoutId(device, "french");
+        final String layoutError = "The %s layout descriptor is non-existent / empty.";
+        assertNotEquals(String.format(layoutError, "German"), "", germanLayoutId);
+        assertNotEquals(String.format(layoutError, "English (US)"), "", englishLayoutId);
+        assertNotEquals(String.format(layoutError, "French"), "", frenchLayoutId);
+        try {
+            setCurrentKeyboardLayout(device, germanLayoutId);
+            assertEquals("Key location KEYCODE_Q should map to KEYCODE_Q on a German layout.",
+                    KeyEvent.KEYCODE_Q, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_Q));
+            assertEquals("Key location KEYCODE_W should map to KEYCODE_W on a German layout.",
+                    KeyEvent.KEYCODE_W, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_W));
+            assertEquals("Key location KEYCODE_E should map to KEYCODE_E on a German layout.",
+                    KeyEvent.KEYCODE_E, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_E));
+            assertEquals("Key location KEYCODE_R should map to KEYCODE_R on a German layout.",
+                    KeyEvent.KEYCODE_R, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_R));
+            assertEquals("Key location KEYCODE_T should map to KEYCODE_T on a German layout.",
+                    KeyEvent.KEYCODE_T, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_T));
+            assertEquals("Key location KEYCODE_Y should map to KEYCODE_Z on a German layout.",
+                    KeyEvent.KEYCODE_Z, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_Y));
+
+            setCurrentKeyboardLayout(device, englishLayoutId);
+            assertEquals(
+                    "Key location KEYCODE_Q should map to KEYCODE_Q on an English (US) layout.",
+                    KeyEvent.KEYCODE_Q, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_Q));
+            assertEquals(
+                    "Key location KEYCODE_W should map to KEYCODE_W on an English (US) layout.",
+                    KeyEvent.KEYCODE_W, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_W));
+            assertEquals(
+                    "Key location KEYCODE_E should map to KEYCODE_E on an English (US) layout.",
+                    KeyEvent.KEYCODE_E, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_E));
+            assertEquals(
+                    "Key location KEYCODE_R should map to KEYCODE_R on an English (US) layout.",
+                    KeyEvent.KEYCODE_R, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_R));
+            assertEquals(
+                    "Key location KEYCODE_T should map to KEYCODE_T on an English (US) layout.",
+                    KeyEvent.KEYCODE_T, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_T));
+            assertEquals(
+                    "Key location KEYCODE_Y should map to KEYCODE_Y on an English (US) layout.",
+                    KeyEvent.KEYCODE_Y, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_Y));
+
+            setCurrentKeyboardLayout(device, frenchLayoutId);
+            assertEquals("Key location KEYCODE_Q should map to KEYCODE_A on a French layout.",
+                    KeyEvent.KEYCODE_A, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_Q));
+            assertEquals("Key location KEYCODE_W should map to KEYCODE_Z on a French layout.",
+                    KeyEvent.KEYCODE_Z, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_W));
+            assertEquals("Key location KEYCODE_E should map to KEYCODE_E on a French layout.",
+                    KeyEvent.KEYCODE_E, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_E));
+            assertEquals("Key location KEYCODE_R should map to KEYCODE_R on a French layout.",
+                    KeyEvent.KEYCODE_R, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_R));
+            assertEquals("Key location KEYCODE_T should map to KEYCODE_T on a French layout.",
+                    KeyEvent.KEYCODE_T, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_T));
+            assertEquals("Key location KEYCODE_Y should map to KEYCODE_Y on a French layout.",
+                    KeyEvent.KEYCODE_Y, device.getKeyCodeForKeyLocation(KeyEvent.KEYCODE_Y));
+        } finally {
+            // clean up to make sure this test doesn't affect other test cases
+            removeKeyboardLayout(device, germanLayoutId);
+            removeKeyboardLayout(device, englishLayoutId);
+            removeKeyboardLayout(device, frenchLayoutId);
+            assertNull(
+                    mInputManager.getCurrentKeyboardLayoutForInputDevice(device.getIdentifier()));
+        }
+    }
+
+    @Test
+    public void testGetKeyCodeForKeyLocationWithInvalidKeyCode() {
+        final InputDevice device = getInputDevice(
+                (d) -> d.getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC);
+        assertNotNull(device);
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN, device.getKeyCodeForKeyLocation(-10));
+        assertEquals(KeyEvent.KEYCODE_UNKNOWN,
+                device.getKeyCodeForKeyLocation(KeyEvent.getMaxKeyCode() + 1));
+    }
+
+    /**
+     * Removes the specified keyboard layout for the given input device.
+     *
+     * @param device The input device for which the specified keyboard layout shall be removed.
+     * @param layoutDescriptor the layout descriptor.
+     */
+    private void removeKeyboardLayout(InputDevice device, String layoutDescriptor) {
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            mInputManager.removeKeyboardLayoutForInputDevice(device.getIdentifier(),
+                    layoutDescriptor);
+        }, Manifest.permission.SET_KEYBOARD_LAYOUT);
+    }
+
+    /**
+     * Returns the first matching keyboard layout id that is supported by the provided input device
+     * and matches the provided language.
+     *
+     * @param device The input device for which to query the keyboard layouts.
+     * @param language The language to query for.
+     * @return The first matching keyboard layout descriptor or an empty string if none was found.
+     */
+    private String getKeyboardLayoutId(InputDevice device, String language) {
+        for (String kl : mInputManager.getKeyboardLayoutDescriptorsForInputDevice(device)) {
+            if (kl.endsWith(language)) {
+                return kl;
+            }
+        }
+        fail("Failed to get keyboard layout for language " + language);
+        return "";
+    }
+
+    /**
+     * Sets the current keyboard layout for the given input device.
+     *
+     * @param device The input device for which the current keyboard layout is changed.
+     * @param layoutDescriptor The layout to which the current keyboard layout is set to.
+     */
+    private void setCurrentKeyboardLayout(InputDevice device, String layoutDescriptor) {
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            mInputManager.setCurrentKeyboardLayoutForInputDevice(device.getIdentifier(),
+                    layoutDescriptor);
+        }, Manifest.permission.SET_KEYBOARD_LAYOUT);
+        // The input devices will be reconfigured (async) after changing the keyboard layout.
+        // Once the device state is updated, the callback should be called
+        verify(mInputDeviceChangedListener,
+                timeout(KEYBOARD_LAYOUT_CHANGE_TIMEOUT).atLeastOnce()).onInputDeviceChanged(
+                eq(device.getId()));
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerRaijuMobileBluetoothTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerRaijuMobileBluetoothTest.java
index d27c96c..11e879a 100644
--- a/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerRaijuMobileBluetoothTest.java
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerRaijuMobileBluetoothTest.java
@@ -16,7 +16,6 @@
 
 package android.hardware.input.cts.tests;
 
-import android.content.Intent;
 import android.hardware.cts.R;
 import android.server.wm.WindowManagerStateHelper;
 import android.view.KeyEvent;
@@ -53,14 +52,8 @@
      */
     @Test
     public void testHomeKey() throws Exception {
-        mActivityRule.getActivity().addUnhandleKeyCode(KeyEvent.KEYCODE_BUTTON_MODE);
+        mTestActivity.addUnhandleKeyCode(KeyEvent.KEYCODE_BUTTON_MODE);
         testInputEvents(R.raw.razer_raiju_mobile_bluetooth_homekey);
-        // Put DUT on home screen
-        Intent intent = new Intent();
-        intent.addCategory(Intent.CATEGORY_HOME);
-        intent.setAction(Intent.ACTION_MAIN);
-        mActivityRule.getActivity().startActivity(intent);
-
 
         WindowManagerStateHelper wmStateHelper = new WindowManagerStateHelper();
 
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerServalTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerServalTest.java
index 1405530..030c030 100644
--- a/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerServalTest.java
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/RazerServalTest.java
@@ -16,7 +16,6 @@
 
 package android.hardware.input.cts.tests;
 
-import android.content.Intent;
 import android.hardware.cts.R;
 import android.server.wm.WindowManagerStateHelper;
 
@@ -55,12 +54,6 @@
     public void testHomeKey() {
         testInputEvents(R.raw.razer_serval_homekey);
         WindowManagerStateHelper wmStateHelper = new WindowManagerStateHelper();
-        // Put DUT on home screen
-        Intent intent = new Intent();
-        intent.addCategory(Intent.CATEGORY_HOME);
-        intent.setAction(Intent.ACTION_MAIN);
-        mActivityRule.getActivity().startActivity(intent);
-
 
         wmStateHelper.waitForHomeActivityVisible();
         wmStateHelper.assertHomeActivityVisible(true);
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/UsbVoiceCommandTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/UsbVoiceCommandTest.java
index 09e30cf..a834b0d 100644
--- a/tests/tests/hardware/src/android/hardware/input/cts/tests/UsbVoiceCommandTest.java
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/UsbVoiceCommandTest.java
@@ -93,8 +93,7 @@
 
         for (int i = 0; i < list.size(); i++) {
             ResolveInfo info = list.get(i);
-            if (!info.activityInfo.packageName.equals(
-                    mActivityRule.getActivity().getPackageName())) {
+            if (!info.activityInfo.packageName.equals(mTestActivity.getPackageName())) {
                 mExcludedPackages.add(info.activityInfo.packageName);
             }
         }
@@ -146,7 +145,7 @@
 
         /* InputAssistantActivity should be visible */
         final ComponentName inputAssistant =
-                new ComponentName(mActivityRule.getActivity().getPackageName(),
+                new ComponentName(mTestActivity.getPackageName(),
                         InputAssistantActivity.class.getName());
         wmStateHelper.waitForValidState(inputAssistant);
         wmStateHelper.assertActivityDisplayed(inputAssistant);
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualDeviceTestCase.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualDeviceTestCase.java
new file mode 100644
index 0000000..b8d3f6f
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualDeviceTestCase.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (C) 2022 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 android.hardware.input.cts.tests;
+
+import static android.content.pm.PackageManager.FEATURE_COMPANION_DEVICE_SETUP;
+
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+import android.app.ActivityOptions;
+import android.companion.AssociationInfo;
+import android.companion.CompanionDeviceManager;
+import android.companion.virtual.VirtualDeviceManager;
+import android.companion.virtual.VirtualDeviceParams;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.graphics.Point;
+import android.graphics.SurfaceTexture;
+import android.hardware.display.VirtualDisplay;
+import android.hardware.input.InputManager;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.SystemClock;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.AdoptShellPermissionsRule;
+import com.android.compatibility.common.util.SystemUtil;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.Rule;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public abstract class VirtualDeviceTestCase extends InputTestCase {
+
+    private static final int ARBITRARY_SURFACE_TEX_ID = 1;
+
+    static final int DISPLAY_WIDTH = 100;
+    static final int DISPLAY_HEIGHT = 100;
+
+    // Uses:
+    // Manifest.permission.CREATE_VIRTUAL_DEVICE,
+    // Manifest.permission.ADD_TRUSTED_DISPLAY
+    // These cannot be specified as part of the call as ADD_TRUSTED_DISPLAY is hidden and therefore
+    // not visible to CTS.
+    @Rule
+    public AdoptShellPermissionsRule mAdoptShellPermissionsRule = new AdoptShellPermissionsRule(
+            InstrumentationRegistry.getInstrumentation().getUiAutomation());
+
+    private final CountDownLatch mLatch = new CountDownLatch(1);
+    private final InputManager.InputDeviceListener mInputDeviceListener =
+            new InputManager.InputDeviceListener() {
+                @Override
+                public void onInputDeviceAdded(int deviceId) {
+                    mLatch.countDown();
+                }
+
+                @Override
+                public void onInputDeviceRemoved(int deviceId) {
+                }
+
+                @Override
+                public void onInputDeviceChanged(int deviceId) {
+                }
+            };
+
+    VirtualDeviceManager.VirtualDevice mVirtualDevice;
+    VirtualDisplay mVirtualDisplay;
+
+    @Override
+    void onBeforeLaunchActivity() {
+        final Context context = InstrumentationRegistry.getTargetContext();
+        final PackageManager packageManager = context.getPackageManager();
+        // TVs do not support companion
+        assumeTrue(packageManager.hasSystemFeature(PackageManager.FEATURE_COMPANION_DEVICE_SETUP));
+
+        final String packageName = context.getPackageName();
+        associateCompanionDevice(packageName);
+        AssociationInfo associationInfo = null;
+        for (AssociationInfo ai : context.getSystemService(CompanionDeviceManager.class)
+                .getMyAssociations()) {
+            if (packageName.equals(ai.getPackageName())) {
+                associationInfo = ai;
+                break;
+            }
+        }
+        if (associationInfo == null) {
+            fail("Could not create association for test");
+            return;
+        }
+        final VirtualDeviceManager virtualDeviceManager =
+                context.getSystemService(VirtualDeviceManager.class);
+        mVirtualDevice = virtualDeviceManager.createVirtualDevice(associationInfo.getId(),
+                new VirtualDeviceParams.Builder().build());
+        mVirtualDisplay = mVirtualDevice.createVirtualDisplay(
+                /* width= */ DISPLAY_WIDTH,
+                /* height= */ DISPLAY_HEIGHT,
+                /* dpi= */ 50,
+                /* surface= */ new Surface(new SurfaceTexture(ARBITRARY_SURFACE_TEX_ID)),
+                /* flags= */ 0,
+                /* executor= */ Runnable::run,
+                /* callback= */ null);
+        if (mVirtualDisplay == null) {
+            fail("Could not create virtual display");
+        }
+    }
+
+    @Override
+    void onSetUp() {
+        InstrumentationRegistry.getTargetContext().getSystemService(InputManager.class)
+                .registerInputDeviceListener(mInputDeviceListener,
+                        new Handler(Looper.getMainLooper()));
+        onSetUpVirtualInputDevice();
+        try {
+            mLatch.await(1, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+            fail("Virtual input device setup was interrupted");
+        }
+        // Tap to gain window focus on the activity
+        tapActivityToFocus();
+        // Wait for everything to settle. Like see in InputHidTestCase, registered input devices
+        // don't always seem to produce events right away. Adding a bit of slack here decreases
+        // the flake rate.
+        SystemClock.sleep(1000L);
+    }
+
+    abstract void onSetUpVirtualInputDevice();
+
+    abstract void onTearDownVirtualInputDevice();
+
+    @Override
+    void onTearDown() {
+        try {
+            onTearDownVirtualInputDevice();
+        } finally {
+            if (mTestActivity != null) {
+                mTestActivity.finish();
+            }
+            if (mVirtualDisplay != null) {
+                mVirtualDisplay.release();
+            }
+            if (mVirtualDevice != null) {
+                mVirtualDevice.close();
+            }
+            InstrumentationRegistry.getTargetContext().getSystemService(InputManager.class)
+                    .unregisterInputDeviceListener(mInputDeviceListener);
+            disassociateCompanionDevice();
+        }
+    }
+
+    @Override
+    @Nullable Bundle getActivityOptions() {
+        return ActivityOptions.makeBasic()
+                .setLaunchDisplayId(mVirtualDisplay.getDisplay().getDisplayId())
+                .toBundle();
+    }
+
+    private void associateCompanionDevice(String packageName) {
+        // Associate this package for user 0 with a zeroed-out MAC address (not used in this test)
+        SystemUtil.runShellCommand(
+                String.format("cmd companiondevice associate 0 %s 00:00:00:00:00:00", packageName));
+    }
+
+    private void disassociateCompanionDevice() {
+        SystemUtil.runShellCommand("cmd companiondevice disassociate 0 "
+                + InstrumentationRegistry.getTargetContext().getPackageName()
+                + " 00:00:00:00:00:00");
+    }
+
+    private void tapActivityToFocus() {
+        final Point p = getViewCenterOnScreen(mTestActivity.getWindow().getDecorView());
+        final int displayId = mTestActivity.getDisplayId();
+
+        final long downTime = SystemClock.elapsedRealtime();
+        final MotionEvent downEvent = MotionEvent.obtain(downTime, downTime,
+                MotionEvent.ACTION_DOWN, p.x, p.y, 0 /* metaState */);
+        downEvent.setDisplayId(displayId);
+        mInstrumentation.sendPointerSync(downEvent);
+        final MotionEvent upEvent = MotionEvent.obtain(downTime, SystemClock.elapsedRealtime(),
+                MotionEvent.ACTION_UP, p.x, p.y, 0 /* metaState */);
+        upEvent.setDisplayId(displayId);
+        mInstrumentation.sendPointerSync(upEvent);
+
+        verifyEvents(ImmutableList.of(downEvent, upEvent));
+    }
+
+    private static Point getViewCenterOnScreen(@NonNull View view) {
+        final int[] location = new int[2];
+        view.getLocationOnScreen(location);
+        return new Point(location[0] + view.getWidth() / 2,
+                location[1] + view.getHeight() / 2);
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualKeyEventTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualKeyEventTest.java
new file mode 100644
index 0000000..d40cd3b
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualKeyEventTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2022 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 android.hardware.input.cts.tests;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.assertThrows;
+
+import android.hardware.input.VirtualKeyEvent;
+import android.os.Parcel;
+import android.view.KeyEvent;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class VirtualKeyEventTest {
+
+    @Test
+    public void parcelAndUnparcel_matches() {
+        final VirtualKeyEvent originalEvent = new VirtualKeyEvent.Builder()
+                .setAction(VirtualKeyEvent.ACTION_DOWN)
+                .setKeyCode(KeyEvent.KEYCODE_ENTER).build();
+        final Parcel parcel = Parcel.obtain();
+        originalEvent.writeToParcel(parcel, /* flags= */ 0);
+        parcel.setDataPosition(0);
+        final VirtualKeyEvent recreatedEvent =
+                VirtualKeyEvent.CREATOR.createFromParcel(parcel);
+        assertWithMessage("Recreated event has different action").that(originalEvent.getAction())
+                .isEqualTo(recreatedEvent.getAction());
+        assertWithMessage("Recreated event has different key code").that(originalEvent.getKeyCode())
+                .isEqualTo(recreatedEvent.getKeyCode());
+    }
+
+    @Test
+    public void keyEvent_emptyBuilder_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualKeyEvent.Builder().build());
+    }
+
+    @Test
+    public void keyEvent_noKeyCode_throwsIae() {
+        assertThrows(IllegalArgumentException.class,
+                () -> new VirtualKeyEvent.Builder().setAction(VirtualKeyEvent.ACTION_DOWN).build());
+    }
+
+    @Test
+    public void keyEvent_noAction_throwsIae() {
+        assertThrows(IllegalArgumentException.class,
+                () -> new VirtualKeyEvent.Builder().setKeyCode(KeyEvent.KEYCODE_A).build());
+    }
+
+    @Test
+    public void keyEvent_valid_created() {
+        final VirtualKeyEvent event = new VirtualKeyEvent.Builder()
+                .setAction(VirtualKeyEvent.ACTION_DOWN)
+                .setKeyCode(KeyEvent.KEYCODE_A).build();
+        assertWithMessage("Incorrect key code").that(event.getKeyCode()).isEqualTo(
+                KeyEvent.KEYCODE_A);
+        assertWithMessage("Incorrect action").that(event.getAction()).isEqualTo(
+                VirtualKeyEvent.ACTION_DOWN);
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualKeyboardTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualKeyboardTest.java
new file mode 100644
index 0000000..741116b
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualKeyboardTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2022 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 android.hardware.input.cts.tests;
+
+import android.hardware.input.VirtualKeyEvent;
+import android.hardware.input.VirtualKeyboard;
+import android.view.InputDevice;
+import android.view.KeyEvent;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class VirtualKeyboardTest extends VirtualDeviceTestCase {
+
+    private static final String DEVICE_NAME = "CtsVirtualKeyboardTestDevice";
+    private VirtualKeyboard mVirtualKeyboard;
+
+    @Override
+    void onSetUpVirtualInputDevice() {
+        mVirtualKeyboard = mVirtualDevice.createVirtualKeyboard(mVirtualDisplay, DEVICE_NAME,
+                /* vendorId= */ 1, /* productId= */ 1);
+    }
+
+    @Override
+    void onTearDownVirtualInputDevice() {
+        if (mVirtualKeyboard != null) {
+            mVirtualKeyboard.close();
+        }
+    }
+
+    @Test
+    public void sendKeyEvent() {
+        mVirtualKeyboard.sendKeyEvent(new VirtualKeyEvent.Builder()
+                .setKeyCode(KeyEvent.KEYCODE_A)
+                .setAction(VirtualKeyEvent.ACTION_DOWN).build());
+        mVirtualKeyboard.sendKeyEvent(new VirtualKeyEvent.Builder()
+                .setKeyCode(KeyEvent.KEYCODE_A)
+                .setAction(VirtualKeyEvent.ACTION_UP).build());
+        verifyEvents(Arrays.asList(new KeyEvent(
+                        /* downTime= */ 0,
+                        /* eventTime= */ 0,
+                        KeyEvent.ACTION_DOWN,
+                        KeyEvent.KEYCODE_A,
+                        /* repeat= */ 0,
+                        /* metaState= */ KeyEvent.META_NUM_LOCK_ON,
+                        /* deviceId= */ 0,
+                        /* scancode= */ 0,
+                        /* flags= */ 0,
+                        /* source= */ InputDevice.SOURCE_KEYBOARD),
+                new KeyEvent(
+                        /* downTime= */ 0,
+                        /* eventTime= */ 0,
+                        KeyEvent.ACTION_UP,
+                        KeyEvent.KEYCODE_A,
+                        /* repeat= */ 0,
+                        /* metaState= */ KeyEvent.META_NUM_LOCK_ON,
+                        /* deviceId= */ 0,
+                        /* scancode= */ 0,
+                        /* flags= */ 0,
+                        /* source= */ InputDevice.SOURCE_KEYBOARD)));
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualMouseButtonEventTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualMouseButtonEventTest.java
new file mode 100644
index 0000000..02f7a08
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualMouseButtonEventTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2022 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 android.hardware.input.cts.tests;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.assertThrows;
+
+import android.hardware.input.VirtualMouseButtonEvent;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class VirtualMouseButtonEventTest {
+
+    @Test
+    public void parcelAndUnparcel_matches() {
+        final VirtualMouseButtonEvent originalEvent = new VirtualMouseButtonEvent.Builder()
+                .setAction(VirtualMouseButtonEvent.ACTION_BUTTON_PRESS)
+                .setButtonCode(VirtualMouseButtonEvent.BUTTON_PRIMARY).build();
+        final Parcel parcel = Parcel.obtain();
+        originalEvent.writeToParcel(parcel, /* flags= */ 0);
+        parcel.setDataPosition(0);
+        final VirtualMouseButtonEvent recreatedEvent =
+                VirtualMouseButtonEvent.CREATOR.createFromParcel(parcel);
+        assertWithMessage("Recreated event has different action").that(originalEvent.getAction())
+                .isEqualTo(recreatedEvent.getAction());
+        assertWithMessage("Recreated event has different button code")
+                .that(originalEvent.getButtonCode()).isEqualTo(recreatedEvent.getButtonCode());
+    }
+
+    @Test
+    public void buttonEvent_emptyBuilder_throwsIae() {
+        assertThrows(IllegalArgumentException.class,
+                () -> new VirtualMouseButtonEvent.Builder().build());
+    }
+
+    @Test
+    public void buttonEvent_noButtonCode_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualMouseButtonEvent.Builder()
+                .setAction(VirtualMouseButtonEvent.ACTION_BUTTON_RELEASE).build());
+    }
+
+    @Test
+    public void buttonEvent_noAction_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualMouseButtonEvent.Builder()
+                .setButtonCode(VirtualMouseButtonEvent.BUTTON_BACK).build());
+    }
+
+    @Test
+    public void buttonEvent_valid_created() {
+        final VirtualMouseButtonEvent event = new VirtualMouseButtonEvent.Builder()
+                .setAction(VirtualMouseButtonEvent.ACTION_BUTTON_PRESS)
+                .setButtonCode(VirtualMouseButtonEvent.BUTTON_BACK).build();
+        assertWithMessage("Incorrect button code").that(event.getButtonCode()).isEqualTo(
+                VirtualMouseButtonEvent.BUTTON_BACK);
+        assertWithMessage("Incorrect action").that(event.getAction()).isEqualTo(
+                VirtualMouseButtonEvent.ACTION_BUTTON_PRESS);
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualMouseRelativeEventTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualMouseRelativeEventTest.java
new file mode 100644
index 0000000..2bd9bef
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualMouseRelativeEventTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2022 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 android.hardware.input.cts.tests;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.hardware.input.VirtualMouseRelativeEvent;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class VirtualMouseRelativeEventTest {
+
+    @Test
+    public void parcelAndUnparcel_matches() {
+        final float x = 100f;
+        final float y = 4f;
+        final VirtualMouseRelativeEvent originalEvent = new VirtualMouseRelativeEvent.Builder()
+                .setRelativeX(x)
+                .setRelativeY(y).build();
+        final Parcel parcel = Parcel.obtain();
+        originalEvent.writeToParcel(parcel, /* flags= */ 0);
+        parcel.setDataPosition(0);
+        final VirtualMouseRelativeEvent recreatedEvent =
+                VirtualMouseRelativeEvent.CREATOR.createFromParcel(parcel);
+        assertWithMessage("Recreated event has different x").that(originalEvent.getRelativeX())
+                .isEqualTo(recreatedEvent.getRelativeX());
+        assertWithMessage("Recreated event has different y")
+                .that(originalEvent.getRelativeY()).isEqualTo(recreatedEvent.getRelativeY());
+    }
+
+    @Test
+    public void relativeEvent_valid_created() {
+        final float x = -50f;
+        final float y = 83f;
+        final VirtualMouseRelativeEvent event = new VirtualMouseRelativeEvent.Builder()
+                .setRelativeX(x)
+                .setRelativeY(y).build();
+        assertWithMessage("Incorrect x value").that(event.getRelativeX()).isEqualTo(x);
+        assertWithMessage("Incorrect y value").that(event.getRelativeY()).isEqualTo(y);
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualMouseScrollEventTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualMouseScrollEventTest.java
new file mode 100644
index 0000000..4c8d4dd
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualMouseScrollEventTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2022 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 android.hardware.input.cts.tests;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.assertThrows;
+
+import android.hardware.input.VirtualMouseScrollEvent;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class VirtualMouseScrollEventTest {
+
+    @Test
+    public void parcelAndUnparcel_matches() {
+        final float x = 0.5f;
+        final float y = -0.2f;
+        final VirtualMouseScrollEvent originalEvent = new VirtualMouseScrollEvent.Builder()
+                .setXAxisMovement(x)
+                .setYAxisMovement(y).build();
+        final Parcel parcel = Parcel.obtain();
+        originalEvent.writeToParcel(parcel, /* flags= */ 0);
+        parcel.setDataPosition(0);
+        final VirtualMouseScrollEvent recreatedEvent =
+                VirtualMouseScrollEvent.CREATOR.createFromParcel(parcel);
+        assertWithMessage("Recreated event has different x").that(originalEvent.getXAxisMovement())
+                .isEqualTo(recreatedEvent.getXAxisMovement());
+        assertWithMessage("Recreated event has different y")
+                .that(originalEvent.getYAxisMovement())
+                .isEqualTo(recreatedEvent.getYAxisMovement());
+    }
+
+    @Test
+    public void scrollEvent_xOutOfRange_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualMouseScrollEvent.Builder()
+                .setXAxisMovement(1.5f)
+                .setYAxisMovement(1.0f));
+    }
+
+    @Test
+    public void scrollEvent_yOutOfRange_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualMouseScrollEvent.Builder()
+                .setXAxisMovement(0.5f)
+                .setYAxisMovement(1.1f));
+    }
+
+    @Test
+    public void scrollEvent_valid_created() {
+        final float x = -1f;
+        final float y = 1f;
+        final VirtualMouseScrollEvent event = new VirtualMouseScrollEvent.Builder()
+                .setXAxisMovement(x)
+                .setYAxisMovement(y).build();
+        assertWithMessage("Incorrect x value").that(event.getXAxisMovement()).isEqualTo(x);
+        assertWithMessage("Incorrect y value").that(event.getYAxisMovement()).isEqualTo(y);
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualMouseTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualMouseTest.java
new file mode 100644
index 0000000..eb54097
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualMouseTest.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright (C) 2022 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 android.hardware.input.cts.tests;
+
+import static org.junit.Assert.assertEquals;
+
+import android.graphics.PointF;
+import android.hardware.input.VirtualMouse;
+import android.hardware.input.VirtualMouseButtonEvent;
+import android.hardware.input.VirtualMouseRelativeEvent;
+import android.hardware.input.VirtualMouseScrollEvent;
+import android.view.InputDevice;
+import android.view.MotionEvent;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class VirtualMouseTest extends VirtualDeviceTestCase {
+
+    private static final String DEVICE_NAME = "CtsVirtualMouseTestDevice";
+
+    // TODO(b/216792538): while the start position is deterministic, it would be nice to test it at
+    // runtime. The virtual display is 100x100px, running from [0,99]. Half of this is 49.5, and
+    // we assume the pointer for a new display begins at the center.
+    private static final PointF START_POSITION = new PointF((DISPLAY_WIDTH - 1) / 2f,
+            (DISPLAY_HEIGHT - 1) / 2f);
+
+    private VirtualMouse mVirtualMouse;
+
+    @Override
+    void onSetUpVirtualInputDevice() {
+        mVirtualMouse = mVirtualDevice.createVirtualMouse(mVirtualDisplay, DEVICE_NAME,
+                /* vendorId= */ 1, /* productId= */ 1);
+    }
+
+    @Override
+    void onTearDownVirtualInputDevice() {
+        if (mVirtualMouse != null) {
+            mVirtualMouse.close();
+        }
+    }
+
+    @Test
+    public void sendButtonEvent() {
+        mVirtualMouse.sendButtonEvent(new VirtualMouseButtonEvent.Builder()
+                .setAction(VirtualMouseButtonEvent.ACTION_BUTTON_PRESS)
+                .setButtonCode(VirtualMouseButtonEvent.BUTTON_PRIMARY)
+                .build());
+        mVirtualMouse.sendButtonEvent(new VirtualMouseButtonEvent.Builder()
+                .setAction(VirtualMouseButtonEvent.ACTION_BUTTON_RELEASE)
+                .setButtonCode(VirtualMouseButtonEvent.BUTTON_PRIMARY)
+                .build());
+        final MotionEvent buttonPressEvent = createMotionEvent(MotionEvent.ACTION_BUTTON_PRESS,
+                START_POSITION.x, START_POSITION.y, /* relativeX= */ 0f, /* relativeY= */ 0f,
+                /* vScroll= */ 0f, /* hScroll= */ 0f, MotionEvent.BUTTON_PRIMARY,
+                /* pressure= */ 1.0f);
+        buttonPressEvent.setActionButton(MotionEvent.BUTTON_PRIMARY);
+        final MotionEvent buttonReleaseEvent = createMotionEvent(MotionEvent.ACTION_BUTTON_RELEASE,
+                START_POSITION.x, START_POSITION.y, /* relativeX= */ 0f, /* relativeY= */ 0f,
+                /* vScroll= */ 0f, /* hScroll= */ 0f, /* buttonState= */ 0, /* pressure= */ 0.0f);
+        buttonReleaseEvent.setActionButton(MotionEvent.BUTTON_PRIMARY);
+        verifyEvents(Arrays.asList(
+                createMotionEvent(MotionEvent.ACTION_DOWN, START_POSITION.x, START_POSITION.y,
+                        /* relativeX= */ 0f, /* relativeY= */ 0f, /* vScroll= */ 0f,
+                        /* hScroll= */ 0f, MotionEvent.BUTTON_PRIMARY, /* pressure= */ 1.0f),
+                buttonPressEvent,
+                buttonReleaseEvent,
+                createMotionEvent(MotionEvent.ACTION_UP, START_POSITION.x, START_POSITION.y,
+                        /* relativeX= */ 0f, /* relativeY= */ 0f, /* vScroll= */ 0f,
+                        /* hScroll= */ 0f, /* buttonState= */ 0, /* pressure= */ 0.0f),
+                createMotionEvent(MotionEvent.ACTION_HOVER_ENTER, START_POSITION.x,
+                        START_POSITION.y, /* relativeX= */ 0f, /* relativeY= */ 0f,
+                        /* vScroll= */ 0f, /* hScroll= */ 0f, /* buttonState= */ 0,
+                        /* pressure= */ 0.0f)));
+    }
+
+    @Test
+    public void sendRelativeEvent() {
+        final float relativeChangeX = 25f;
+        final float relativeChangeY = 35f;
+        mVirtualMouse.sendRelativeEvent(new VirtualMouseRelativeEvent.Builder()
+                .setRelativeY(relativeChangeY)
+                .setRelativeX(relativeChangeX)
+                .build());
+        mVirtualMouse.sendRelativeEvent(new VirtualMouseRelativeEvent.Builder()
+                .setRelativeY(-relativeChangeY)
+                .setRelativeX(-relativeChangeX)
+                .build());
+        final float firstStopPositionX = START_POSITION.x + relativeChangeX;
+        final float firstStopPositionY = START_POSITION.y + relativeChangeY;
+        final float secondStopPositionX = firstStopPositionX - relativeChangeX;
+        final float secondStopPositionY = firstStopPositionY - relativeChangeY;
+        verifyEvents(Arrays.asList(
+                createMotionEvent(MotionEvent.ACTION_HOVER_ENTER, firstStopPositionX,
+                        firstStopPositionY, relativeChangeX, relativeChangeY, /* vScroll= */ 0f,
+                        /* hScroll= */ 0f, /* buttonState= */ 0, /* pressure= */ 0.0f),
+                createMotionEvent(MotionEvent.ACTION_HOVER_MOVE, firstStopPositionX,
+                        firstStopPositionY, relativeChangeX, relativeChangeY, /* vScroll= */ 0f,
+                        /* hScroll= */ 0f, /* buttonState= */ 0, /* pressure= */ 0.0f),
+                createMotionEvent(MotionEvent.ACTION_HOVER_MOVE, secondStopPositionX,
+                        secondStopPositionY, -relativeChangeX, -relativeChangeY, /* vScroll= */ 0f,
+                        /* hScroll= */ 0f, /* buttonState= */ 0, /* pressure= */ 0.0f)));
+    }
+
+    @Test
+    public void sendScrollEvent() {
+        final float moveX = 0f;
+        final float moveY = 1f;
+        mVirtualMouse.sendScrollEvent(new VirtualMouseScrollEvent.Builder()
+                .setYAxisMovement(moveY)
+                .setXAxisMovement(moveX)
+                .build());
+        verifyEvents(Arrays.asList(
+                createMotionEvent(MotionEvent.ACTION_HOVER_ENTER, START_POSITION.x,
+                        START_POSITION.y, /* relativeX= */ 0f, /* relativeY= */ 0f,
+                        /* vScroll= */ 0f, /* hScroll= */ 0f, /* buttonState= */ 0,
+                        /* pressure= */ 0f),
+                createMotionEvent(MotionEvent.ACTION_HOVER_MOVE, START_POSITION.x,
+                        START_POSITION.y, /* relativeX= */ 0f, /* relativeY= */ 0f,
+                        /* vScroll= */ 0f, /* hScroll= */ 0f, /* buttonState= */ 0,
+                        /* pressure= */ 0f),
+                createMotionEvent(MotionEvent.ACTION_SCROLL, START_POSITION.x,
+                        START_POSITION.y, /* relativeX= */ 0f, /* relativeY= */ 0f,
+                        /* vScroll= */ 1f, /* hScroll= */ 0f, /* buttonState= */ 0,
+                        /* pressure= */ 0f)));
+    }
+
+    @Test
+    public void getCursorPosition() {
+        // Trigger a position update without moving the cursor off the starting position.
+        mVirtualMouse.sendButtonEvent(new VirtualMouseButtonEvent.Builder()
+                .setAction(VirtualMouseButtonEvent.ACTION_BUTTON_PRESS)
+                .setButtonCode(VirtualMouseButtonEvent.BUTTON_PRIMARY)
+                .build());
+        final MotionEvent buttonPressEvent = createMotionEvent(MotionEvent.ACTION_BUTTON_PRESS,
+                START_POSITION.x, START_POSITION.y, /* relativeX= */ 0f, /* relativeY= */ 0f,
+                /* vScroll= */ 0f, /* hScroll= */ 0f, MotionEvent.BUTTON_PRIMARY,
+                /* pressure= */ 1.0f);
+        buttonPressEvent.setActionButton(MotionEvent.BUTTON_PRIMARY);
+        verifyEvents(Arrays.asList(
+                createMotionEvent(MotionEvent.ACTION_DOWN, START_POSITION.x, START_POSITION.y,
+                        /* relativeX= */ 0f, /* relativeY= */ 0f, /* vScroll= */ 0f,
+                        /* hScroll= */ 0f, MotionEvent.BUTTON_PRIMARY, /* pressure= */ 1.0f),
+                buttonPressEvent));
+
+        final PointF position = mVirtualMouse.getCursorPosition();
+
+        assertEquals("Cursor position x differs", START_POSITION.x, position.x, 0.0001f);
+        assertEquals("Cursor position y differs", START_POSITION.y, position.y, 0.0001f);
+    }
+
+    private MotionEvent createMotionEvent(int action, float x, float y, float relativeX,
+            float relativeY, float vScroll, float hScroll, int buttonState, float pressure) {
+        final MotionEvent.PointerProperties pointerProperties = new MotionEvent.PointerProperties();
+        pointerProperties.toolType = MotionEvent.TOOL_TYPE_MOUSE;
+        final MotionEvent.PointerCoords pointerCoords = new MotionEvent.PointerCoords();
+        pointerCoords.setAxisValue(MotionEvent.AXIS_X, x);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_Y, y);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_RELATIVE_X, relativeX);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_RELATIVE_Y, relativeY);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_PRESSURE, pressure);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_VSCROLL, vScroll);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_HSCROLL, hScroll);
+        return MotionEvent.obtain(
+                /* downTime= */ 0,
+                /* eventTime= */ 0,
+                action,
+                /* pointerCount= */ 1,
+                new MotionEvent.PointerProperties[]{pointerProperties},
+                new MotionEvent.PointerCoords[]{pointerCoords},
+                /* metaState= */ 0,
+                buttonState,
+                /* xPrecision= */ 1f,
+                /* yPrecision= */ 1f,
+                /* deviceId= */ 0,
+                /* edgeFlags= */ 0,
+                InputDevice.SOURCE_MOUSE,
+                /* flags= */ 0);
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualTouchEventTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualTouchEventTest.java
new file mode 100644
index 0000000..ade36ab
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualTouchEventTest.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright (C) 2022 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 android.hardware.input.cts.tests;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.assertThrows;
+
+import android.hardware.input.VirtualTouchEvent;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class VirtualTouchEventTest {
+
+    @Test
+    public void parcelAndUnparcel_matches() {
+        final float x = 50f;
+        final float y = 800f;
+        final int pointerId = 1;
+        final float pressure = 0.5f;
+        final float majorAxisSize = 10f;
+        final VirtualTouchEvent originalEvent = new VirtualTouchEvent.Builder()
+                .setAction(VirtualTouchEvent.ACTION_DOWN)
+                .setToolType(VirtualTouchEvent.TOOL_TYPE_FINGER)
+                .setX(x)
+                .setY(y)
+                .setPointerId(pointerId)
+                .setPressure(pressure)
+                .setMajorAxisSize(majorAxisSize)
+                .build();
+        final Parcel parcel = Parcel.obtain();
+        originalEvent.writeToParcel(parcel, /* flags= */ 0);
+        parcel.setDataPosition(0);
+        final VirtualTouchEvent recreatedEvent = VirtualTouchEvent.CREATOR.createFromParcel(parcel);
+        assertWithMessage("Recreated event has different action").that(originalEvent.getAction())
+                .isEqualTo(recreatedEvent.getAction());
+        assertWithMessage("Recreated event has different tool type")
+                .that(originalEvent.getToolType()).isEqualTo(recreatedEvent.getToolType());
+        assertWithMessage("Recreated event has different x").that(originalEvent.getX())
+                .isEqualTo(recreatedEvent.getX());
+        assertWithMessage("Recreated event has different y").that(originalEvent.getY())
+                .isEqualTo(recreatedEvent.getY());
+        assertWithMessage("Recreated event has different pointer id")
+                .that(originalEvent.getPointerId()).isEqualTo(recreatedEvent.getPointerId());
+        assertWithMessage("Recreated event has different pressure")
+                .that(originalEvent.getPressure()).isEqualTo(recreatedEvent.getPressure());
+        assertWithMessage("Recreated event has different major axis size")
+                .that(originalEvent.getMajorAxisSize())
+                .isEqualTo(recreatedEvent.getMajorAxisSize());
+    }
+
+    @Test
+    public void touchEvent_emptyBuilder_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualTouchEvent.Builder().build());
+    }
+
+    @Test
+    public void touchEvent_noAction_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualTouchEvent.Builder()
+                .setToolType(VirtualTouchEvent.TOOL_TYPE_FINGER)
+                .setX(0f)
+                .setY(1f)
+                .setPointerId(1)
+                .build());
+    }
+
+    @Test
+    public void touchEvent_noPointerId_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualTouchEvent.Builder()
+                .setAction(VirtualTouchEvent.ACTION_DOWN)
+                .setToolType(VirtualTouchEvent.TOOL_TYPE_FINGER)
+                .setX(0f)
+                .setY(1f)
+                .build());
+    }
+
+    @Test
+    public void touchEvent_noToolType_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualTouchEvent.Builder()
+                .setAction(VirtualTouchEvent.ACTION_DOWN)
+                .setX(0f)
+                .setY(1f)
+                .setPointerId(1)
+                .build());
+    }
+
+    @Test
+    public void touchEvent_noX_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualTouchEvent.Builder()
+                .setAction(VirtualTouchEvent.ACTION_DOWN)
+                .setToolType(VirtualTouchEvent.TOOL_TYPE_FINGER)
+                .setY(1f)
+                .setPointerId(1)
+                .build());
+    }
+
+    @Test
+    public void touchEvent_noY_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualTouchEvent.Builder()
+                .setAction(VirtualTouchEvent.ACTION_DOWN)
+                .setToolType(VirtualTouchEvent.TOOL_TYPE_FINGER)
+                .setX(0f)
+                .setPointerId(1)
+                .build());
+    }
+
+    @Test
+    public void touchEvent_cancelUsedImproperly_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualTouchEvent.Builder()
+                .setAction(VirtualTouchEvent.ACTION_CANCEL)
+                .setToolType(VirtualTouchEvent.TOOL_TYPE_FINGER)
+                .setX(0f)
+                .setY(1f)
+                .setPointerId(1)
+                .build());
+    }
+
+    @Test
+    public void touchEvent_palmUsedImproperly_throwsIae() {
+        assertThrows(IllegalArgumentException.class, () -> new VirtualTouchEvent.Builder()
+                .setAction(VirtualTouchEvent.ACTION_MOVE)
+                .setToolType(VirtualTouchEvent.TOOL_TYPE_PALM)
+                .setX(0f)
+                .setY(1f)
+                .setPointerId(1)
+                .build());
+    }
+
+    @Test
+    public void touchEvent_palmAndCancelUsedProperly() {
+        final float x = 0f;
+        final float y = 1f;
+        final int pointerId = 1;
+        final float pressure = 0.5f;
+        final float majorAxisSize = 10f;
+        final VirtualTouchEvent event = new VirtualTouchEvent.Builder()
+                .setAction(VirtualTouchEvent.ACTION_CANCEL)
+                .setToolType(VirtualTouchEvent.TOOL_TYPE_PALM)
+                .setX(x)
+                .setY(y)
+                .setPointerId(pointerId)
+                .setPressure(pressure)
+                .setMajorAxisSize(majorAxisSize)
+                .build();
+        assertWithMessage("Incorrect action").that(event.getAction()).isEqualTo(
+                VirtualTouchEvent.ACTION_CANCEL);
+        assertWithMessage("Incorrect tool type").that(event.getToolType()).isEqualTo(
+                VirtualTouchEvent.TOOL_TYPE_PALM);
+        assertWithMessage("Incorrect x").that(event.getX()).isEqualTo(x);
+        assertWithMessage("Incorrect y").that(event.getY()).isEqualTo(y);
+        assertWithMessage("Incorrect pointer id").that(event.getPointerId()).isEqualTo(pointerId);
+        assertWithMessage("Incorrect pressure").that(event.getPressure()).isEqualTo(pressure);
+        assertWithMessage("Incorrect major axis size").that(event.getMajorAxisSize()).isEqualTo(
+                majorAxisSize);
+    }
+
+    @Test
+    public void touchEvent_valid_created() {
+        final float x = 0f;
+        final float y = 1f;
+        final int pointerId = 1;
+        final VirtualTouchEvent event = new VirtualTouchEvent.Builder()
+                .setAction(VirtualTouchEvent.ACTION_DOWN)
+                .setToolType(VirtualTouchEvent.TOOL_TYPE_FINGER)
+                .setX(x)
+                .setY(y)
+                .setPointerId(pointerId)
+                .build();
+        assertWithMessage("Incorrect action").that(event.getAction()).isEqualTo(
+                VirtualTouchEvent.ACTION_DOWN);
+        assertWithMessage("Incorrect tool type").that(event.getToolType()).isEqualTo(
+                VirtualTouchEvent.TOOL_TYPE_FINGER);
+        assertWithMessage("Incorrect x").that(event.getX()).isEqualTo(x);
+        assertWithMessage("Incorrect y").that(event.getY()).isEqualTo(y);
+        assertWithMessage("Incorrect pointer id").that(event.getPointerId()).isEqualTo(pointerId);
+    }
+
+    @Test
+    public void touchEvent_validWithPressureAndAxis_created() {
+        final float x = 0f;
+        final float y = 1f;
+        final int pointerId = 1;
+        final float pressure = 0.5f;
+        final float majorAxisSize = 10f;
+        final VirtualTouchEvent event = new VirtualTouchEvent.Builder()
+                .setAction(VirtualTouchEvent.ACTION_DOWN)
+                .setToolType(VirtualTouchEvent.TOOL_TYPE_FINGER)
+                .setX(x)
+                .setY(y)
+                .setPointerId(pointerId)
+                .setPressure(pressure)
+                .setMajorAxisSize(majorAxisSize)
+                .build();
+        assertWithMessage("Incorrect action").that(event.getAction()).isEqualTo(
+                VirtualTouchEvent.ACTION_DOWN);
+        assertWithMessage("Incorrect tool type").that(event.getToolType()).isEqualTo(
+                VirtualTouchEvent.TOOL_TYPE_FINGER);
+        assertWithMessage("Incorrect x").that(event.getX()).isEqualTo(x);
+        assertWithMessage("Incorrect y").that(event.getY()).isEqualTo(y);
+        assertWithMessage("Incorrect pointer id").that(event.getPointerId()).isEqualTo(pointerId);
+        assertWithMessage("Incorrect pressure").that(event.getPressure()).isEqualTo(pressure);
+        assertWithMessage("Incorrect major axis size").that(event.getMajorAxisSize()).isEqualTo(
+                majorAxisSize);
+    }
+}
diff --git a/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualTouchscreenTest.java b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualTouchscreenTest.java
new file mode 100644
index 0000000..7bd7b46
--- /dev/null
+++ b/tests/tests/hardware/src/android/hardware/input/cts/tests/VirtualTouchscreenTest.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2022 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 android.hardware.input.cts.tests;
+
+import android.hardware.input.VirtualTouchEvent;
+import android.hardware.input.VirtualTouchscreen;
+import android.view.InputDevice;
+import android.view.MotionEvent;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class VirtualTouchscreenTest extends VirtualDeviceTestCase {
+
+    private static final String DEVICE_NAME = "CtsVirtualTouchscreenTestDevice";
+
+    private VirtualTouchscreen mVirtualTouchscreen;
+
+    @Override
+    void onSetUpVirtualInputDevice() {
+        mVirtualTouchscreen = mVirtualDevice.createVirtualTouchscreen(mVirtualDisplay, DEVICE_NAME,
+                /* vendorId= */ 1, /* productId= */ 1);
+    }
+
+    @Override
+    void onTearDownVirtualInputDevice() {
+        if (mVirtualTouchscreen != null) {
+            mVirtualTouchscreen.close();
+        }
+    }
+
+    @Test
+    public void sendTouchEvent() {
+        final float inputSize = 1f;
+        final float x = 50f;
+        final float y = 50f;
+        mVirtualTouchscreen.sendTouchEvent(new VirtualTouchEvent.Builder()
+                .setAction(VirtualTouchEvent.ACTION_DOWN)
+                .setPointerId(1)
+                .setX(x)
+                .setY(y)
+                .setPressure(255f)
+                .setMajorAxisSize(inputSize)
+                .setToolType(VirtualTouchEvent.TOOL_TYPE_FINGER)
+                .build());
+        mVirtualTouchscreen.sendTouchEvent(new VirtualTouchEvent.Builder()
+                .setAction(VirtualTouchEvent.ACTION_UP)
+                .setPointerId(1)
+                .setX(x)
+                .setY(y)
+                .setToolType(VirtualTouchEvent.TOOL_TYPE_FINGER)
+                .build());
+        // Convert the input axis size to its equivalent fraction of the total screen.
+        final float computedSize = inputSize / (DISPLAY_WIDTH - 1f);
+        // TODO(b/216638606): Investigate why a ACTION_HOVER_ENTER event is produced
+        verifyEvents(Arrays.asList(
+                createMotionEvent(MotionEvent.ACTION_DOWN, /* x= */ x, /* y= */ y,
+                        /* pressure= */ 1f, /* size= */ computedSize, /* axisSize= */ inputSize),
+                createMotionEvent(MotionEvent.ACTION_UP, /* x= */ x, /* y= */ y,
+                        /* pressure= */ 1f, /* size= */ computedSize, /* axisSize= */ inputSize),
+                createMotionEvent(MotionEvent.ACTION_HOVER_ENTER, /* x= */ 0f, /* y= */ 0f,
+                        /* pressure= */ 0f, /* size= */ 0f, /* axisSize= */ 0f)));
+    }
+
+    private MotionEvent createMotionEvent(int action, float x, float y, float pressure, float size,
+            float axisSize) {
+        final MotionEvent.PointerProperties pointerProperties = new MotionEvent.PointerProperties();
+        pointerProperties.toolType = MotionEvent.TOOL_TYPE_MOUSE;
+        final MotionEvent.PointerCoords pointerCoords = new MotionEvent.PointerCoords();
+        pointerCoords.setAxisValue(MotionEvent.AXIS_X, x);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_Y, y);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_PRESSURE, pressure);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_SIZE, size);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_TOUCH_MAJOR, axisSize);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_TOUCH_MINOR, axisSize);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_TOOL_MAJOR, axisSize);
+        pointerCoords.setAxisValue(MotionEvent.AXIS_TOOL_MINOR, axisSize);
+        return MotionEvent.obtain(
+                /* downTime= */ 0,
+                /* eventTime= */ 0,
+                action,
+                /* pointerCount= */ 1,
+                new MotionEvent.PointerProperties[]{pointerProperties},
+                new MotionEvent.PointerCoords[]{pointerCoords},
+                /* metaState= */ 0,
+                /* buttonState= */ 0,
+                /* xPrecision= */ 1f,
+                /* yPrecision= */ 1f,
+                /* deviceId= */ 0,
+                /* edgeFlags= */ 0,
+                InputDevice.SOURCE_TOUCHSCREEN,
+                /* flags= */ 0);
+    }
+}
diff --git a/tests/tests/keystore/src/android/keystore/cts/KeyPairGeneratorTest.java b/tests/tests/keystore/src/android/keystore/cts/KeyPairGeneratorTest.java
index 0773d7c..0611d24 100644
--- a/tests/tests/keystore/src/android/keystore/cts/KeyPairGeneratorTest.java
+++ b/tests/tests/keystore/src/android/keystore/cts/KeyPairGeneratorTest.java
@@ -30,11 +30,20 @@
 import android.security.keystore.KeyProperties;
 import android.test.MoreAsserts;
 import android.util.Log;
+
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.internal.util.HexDump;
 
+import libcore.java.security.TestKeyStore;
+import libcore.javax.net.ssl.TestKeyManager;
+import libcore.javax.net.ssl.TestSSLContext;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.math.BigInteger;
 import java.net.InetAddress;
 import java.net.Socket;
@@ -47,10 +56,10 @@
 import java.security.Principal;
 import java.security.PrivateKey;
 import java.security.Provider;
+import java.security.Provider.Service;
 import java.security.PublicKey;
 import java.security.SecureRandom;
 import java.security.Security;
-import java.security.Provider.Service;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 import java.security.interfaces.ECKey;
@@ -60,6 +69,7 @@
 import java.security.spec.ECGenParameterSpec;
 import java.security.spec.ECParameterSpec;
 import java.security.spec.RSAKeyGenParameterSpec;
+import java.text.DecimalFormatSymbols;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -74,7 +84,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.text.DecimalFormatSymbols;
 
 import javax.net.ssl.KeyManager;
 import javax.net.ssl.SSLContext;
@@ -84,16 +93,11 @@
 import javax.net.ssl.X509ExtendedKeyManager;
 import javax.security.auth.x500.X500Principal;
 
-import libcore.java.security.TestKeyStore;
-import libcore.javax.net.ssl.TestKeyManager;
-import libcore.javax.net.ssl.TestSSLContext;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
 @RunWith(AndroidJUnit4.class)
 public class KeyPairGeneratorTest {
+
+    private static final String TAG = "KeyPairGeneratorTest";
+
     private KeyStore mKeyStore;
 
     private CountingSecureRandom mRng;
@@ -813,6 +817,130 @@
     }
 
     @Test
+    public void testRSA_Key_Quality() throws NoSuchAlgorithmException, NoSuchProviderException,
+            InvalidAlgorithmParameterException {
+        final int numKeysToGenerate = 10;
+        testRSA_Key_QualityHelper(numKeysToGenerate, false /* useStrongbox */);
+        if (TestUtils.hasStrongBox(getContext())) {
+            testRSA_Key_QualityHelper(numKeysToGenerate, true /* useStrongbox */);
+        }
+    }
+
+    private void testRSA_Key_QualityHelper(int numKeysToGenerate, boolean useStrongbox)
+            throws NoSuchAlgorithmException, NoSuchProviderException,
+                    InvalidAlgorithmParameterException {
+        Log.w(TAG, "Starting key quality testing");
+        List<PublicKey> publicKeys = getPublicKeys(numKeysToGenerate, useStrongbox);
+
+        testRSA_Key_Quality_All_DifferentHelper(publicKeys);
+        testRSA_Key_Quality_Not_Too_Many_ZerosHelper(publicKeys);
+        // Run the GCD test after verifying all keys are distinct. (Identical keys have a trivial
+        // common divisor greater than one.)
+        testRSA_Key_Quality_Not_Perfect_SquareHelper(publicKeys);
+        testRSA_Key_Quality_Public_Modulus_GCD_Is_One_Helper(publicKeys);
+    }
+
+    private void testRSA_Key_Quality_Not_Perfect_SquareHelper(Iterable<PublicKey> publicKeys) {
+        for (PublicKey publicKey : publicKeys) {
+            RSAPublicKey rsaPublicKey = (RSAPublicKey) publicKey;
+            BigInteger publicModulus = rsaPublicKey.getModulus();
+            BigInteger[] sqrtAndRemainder = publicModulus.sqrtAndRemainder();
+            BigInteger sqrt = sqrtAndRemainder[0];
+            BigInteger remainder = sqrtAndRemainder[1];
+            if (remainder.equals(BigInteger.ZERO)) {
+                fail(
+                        "RSA key public modulus is perfect square. "
+                                + HexDump.dumpHexString(publicKey.getEncoded()));
+            }
+        }
+    }
+
+    private void testRSA_Key_Quality_Public_Modulus_GCD_Is_One_Helper(
+            Iterable<PublicKey> publicKeys) {
+        // Inspired by Heninger et al 2012 ( https://factorable.net/paper.html ).
+
+        // First, compute the product of all public moduli.
+        BigInteger allProduct = BigInteger.ONE;
+        for (PublicKey publicKey : publicKeys) {
+            RSAPublicKey rsaPublicKey = (RSAPublicKey) publicKey;
+            BigInteger publicModulus = rsaPublicKey.getModulus();
+            allProduct = allProduct.multiply(publicModulus);
+        }
+        // There are better batch GCD algorithms (eg Bernstein 2004
+        // (https://cr.yp.to/factorization/smoothparts-20040510.pdf)).
+        // Since we are dealing with a small set of keys, we just use BigInteger.gcd().
+        for (PublicKey publicKey : publicKeys) {
+            RSAPublicKey rsaPublicKey = (RSAPublicKey) publicKey;
+            BigInteger publicModulus = rsaPublicKey.getModulus();
+            BigInteger gcd = allProduct.divide(publicModulus).gcd(publicModulus);
+
+            if (!gcd.equals(BigInteger.ONE)) {
+                Log.i(TAG, "Common factor found");
+                Log.i(TAG, "Key: " + HexDump.dumpHexString(publicKey.getEncoded()));
+                Log.i(TAG, "GCD : " + gcd.toString(16));
+                fail(
+                        "RSA keys have shared prime factor. Key: "
+                                + HexDump.dumpHexString(publicKey.getEncoded())
+                                + " GCD: "
+                                + gcd.toString());
+            }
+        }
+    }
+
+    private List<PublicKey> getPublicKeys(int numKeysToGenerate, boolean useStrongbox)
+            throws NoSuchAlgorithmException, NoSuchProviderException,
+                    InvalidAlgorithmParameterException {
+        List<PublicKey> publicKeys = new ArrayList<PublicKey>();
+        KeyPairGenerator generator = getRsaGenerator();
+        for (int i = 0; i < numKeysToGenerate; i++) {
+            generator.initialize(
+                    new KeyGenParameterSpec.Builder(
+                                    "test" + Integer.toString(i), KeyProperties.PURPOSE_SIGN)
+                            .setIsStrongBoxBacked(useStrongbox)
+                            .build());
+            KeyPair kp = generator.generateKeyPair();
+            PublicKey pk = kp.getPublic();
+            publicKeys.add(pk);
+            Log.v(TAG, "Key generation round " + Integer.toString(i));
+        }
+        return publicKeys;
+    }
+
+    public void testRSA_Key_Quality_All_DifferentHelper(Iterable<PublicKey> publicKeys) {
+        Log.d(TAG, "Testing all keys different.");
+        Set<Integer> keyHashSet = new HashSet<Integer>();
+        for (PublicKey pk : publicKeys) {
+            int keyHash = java.util.Arrays.hashCode(pk.getEncoded());
+            if (keyHashSet.contains(keyHash)) {
+                fail(
+                        "The same RSA key was generated twice. Key: "
+                                + HexDump.dumpHexString(pk.getEncoded()));
+            }
+            keyHashSet.add(keyHash);
+        }
+    }
+
+    public void testRSA_Key_Quality_Not_Too_Many_ZerosHelper(Iterable<PublicKey> publicKeys) {
+        // For 256 random bytes, there is less than a 1 in 10^16 chance of there being 17
+        // or more zero bytes.
+        int maxZerosAllowed = 17;
+
+        for (PublicKey pk : publicKeys) {
+            byte[] keyBytes = pk.getEncoded();
+            int zeroCount = 0;
+            for (int i = 0; i < keyBytes.length; i++) {
+                if (keyBytes[i] == 0x00) {
+                    zeroCount++;
+                }
+            }
+            if (zeroCount >= maxZerosAllowed) {
+                fail("RSA public key has " + Integer.toString(zeroCount)
+                        + " zeros. Key: " + HexDump.dumpHexString(keyBytes));
+            }
+        }
+    }
+
+    @Test
     public void testGenerate_EC_ModernSpec_Defaults() throws Exception {
         testGenerate_EC_ModernSpec_DefaultsHelper(false /* useStrongbox */);
         if (TestUtils.hasStrongBox(getContext())) {
@@ -1703,7 +1831,7 @@
 
     private static void assertSelfSignedCertificateSignatureVerifies(Certificate certificate) {
         try {
-            Log.i("KeyPairGeneratorTest", HexDump.dumpHexString(certificate.getEncoded()));
+            Log.i(TAG, HexDump.dumpHexString(certificate.getEncoded()));
             certificate.verify(certificate.getPublicKey());
         } catch (Exception e) {
             throw new RuntimeException("Failed to verify self-signed certificate signature", e);
diff --git a/tests/tests/libcoreapievolution/Android.bp b/tests/tests/libcoreapievolution/Android.bp
index eed4fc3..954f3a2 100644
--- a/tests/tests/libcoreapievolution/Android.bp
+++ b/tests/tests/libcoreapievolution/Android.bp
@@ -26,6 +26,8 @@
     libs: ["android.test.base"],
     srcs: ["src/**/*.java"],
     sdk_version: "current",
+    min_sdk_version: "31",
+    target_sdk_version: "31",
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
diff --git a/tests/tests/libcorefileio/Android.bp b/tests/tests/libcorefileio/Android.bp
index 3febb32..b9db7d2 100644
--- a/tests/tests/libcorefileio/Android.bp
+++ b/tests/tests/libcorefileio/Android.bp
@@ -26,6 +26,8 @@
     libs: ["android.test.base"],
     srcs: ["src/**/*.java"],
     sdk_version: "current",
+    min_sdk_version: "31",
+    target_sdk_version: "31",
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
diff --git a/tests/tests/match_flags/OWNERS b/tests/tests/match_flags/OWNERS
index 8a44fb2..d1eff73 100644
--- a/tests/tests/match_flags/OWNERS
+++ b/tests/tests/match_flags/OWNERS
@@ -2,4 +2,4 @@
 patb@google.com
 toddke@google.com
 chiuwinson@google.com
-rtmitchell@google.com
+zyy@google.com
diff --git a/tests/tests/media/audio/Android.bp b/tests/tests/media/audio/Android.bp
index e7f1363..c319d5a 100644
--- a/tests/tests/media/audio/Android.bp
+++ b/tests/tests/media/audio/Android.bp
@@ -40,9 +40,11 @@
         "jni/audio-track-native.cpp",
         "jni/sl-utils.cpp",
     ],
-    include_dirs: ["frameworks/wilhelm/include",
-                   "frameworks/wilhelm/src/android",
-                   "system/core/include"],
+    include_dirs: [
+        "frameworks/wilhelm/include",
+        "frameworks/wilhelm/src/android",
+        "system/core/include",
+    ],
     shared_libs: [
         "libandroid",
         "liblog",
@@ -86,6 +88,7 @@
     resource_dirs: ["res"],
     srcs: [
         "src/**/*.java",
+        "src/**/*.kt",
     ],
     platform_apis: true,
     jni_uses_sdk_apis: true,
diff --git a/tests/tests/media/audio/AndroidManifest.xml b/tests/tests/media/audio/AndroidManifest.xml
index 161a852..d5de5dd 100644
--- a/tests/tests/media/audio/AndroidManifest.xml
+++ b/tests/tests/media/audio/AndroidManifest.xml
@@ -23,6 +23,7 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.INSTANT_APP_FOREGROUND_SERVICE"/>
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.RECORD_AUDIO"/>
 
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/AudioAttributesTest.java b/tests/tests/media/audio/src/android/media/audio/cts/AudioAttributesTest.java
index 8d8d000..6499337 100644
--- a/tests/tests/media/audio/src/android/media/audio/cts/AudioAttributesTest.java
+++ b/tests/tests/media/audio/src/android/media/audio/cts/AudioAttributesTest.java
@@ -90,6 +90,15 @@
         }
     }
 
+    // Test case 4: verify the Ultrasound content APIs for AudioAttributes
+    public void testSetUltrasoundContentType() throws Exception {
+        final AudioAttributes internalContentApiAttr = new AudioAttributes.Builder()
+                .setInternalContentType(AudioAttributes.CONTENT_TYPE_ULTRASOUND)
+                .build();
+
+        assertEquals("Ultrasound by setInternalContentType doesn't match",
+                internalContentApiAttr.getContentType(), AudioAttributes.CONTENT_TYPE_ULTRASOUND);
+    }
     // -----------------------------------------------------------------
     // Builder tests
     // ----------------------------------
@@ -208,6 +217,34 @@
     }
 
     // -----------------------------------------------------------------
+    // Deprecation tests
+    // ----------------------------------
+    private int[] DEPRECATED_USAGES = { AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_REQUEST,
+            AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_DELAYED,
+            AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT };
+
+    public void testDeprecationNotificationUsagesBuilder() throws Exception {
+        for (int deprecatedNotifUsage : DEPRECATED_USAGES) {
+            final AudioAttributes aa = new AudioAttributes.Builder()
+                    .setUsage(deprecatedNotifUsage)
+                    .build();
+            assertEquals("Deprecated notification usage value not remapped",
+                    AudioAttributes.USAGE_NOTIFICATION, aa.getUsage());
+        }
+    }
+
+    public void testDeprecationNotificationUsagesCopyBuilder() throws Exception {
+        for (int deprecatedNotifUsage : DEPRECATED_USAGES) {
+            final AudioAttributes aa = new AudioAttributes.Builder()
+                    .setUsage(deprecatedNotifUsage)
+                    .build();
+            final AudioAttributes copy = new AudioAttributes.Builder(aa).build();
+            assertEquals("Deprecated notification usage value not remapped",
+                    AudioAttributes.USAGE_NOTIFICATION, copy.getUsage());
+        }
+    }
+
+    // -----------------------------------------------------------------
     // Regression tests
     // ----------------------------------
     // Test against regression where setLegacyStreamType() was creating a different Builder
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/AudioDescriptorTest.java b/tests/tests/media/audio/src/android/media/audio/cts/AudioDescriptorTest.java
new file mode 100755
index 0000000..f448fe0
--- /dev/null
+++ b/tests/tests/media/audio/src/android/media/audio/cts/AudioDescriptorTest.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2021 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 android.media.audio.cts;
+
+import android.media.AudioDescriptor;
+import android.media.AudioProfile;
+import android.os.Parcel;
+
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
+import java.util.Arrays;
+
+public class AudioDescriptorTest extends CtsAndroidTestCase {
+    // -----------------------------------------------------------------
+    // AUDIODESCRIPTOR TESTS:
+    // ----------------------------------
+
+    // -----------------------------------------------------------------
+    // Parcelable tests
+    // ----------------------------------
+
+    // Test case 1: call describeContents(), not used yet, but needs to be exercised
+    public void testParcelableDescribeContents() throws Exception {
+        final AudioDescriptor ad = new AudioDescriptor(AudioDescriptor.STANDARD_EDID,
+                AudioProfile.AUDIO_ENCAPSULATION_TYPE_IEC61937, new byte[]{0x05, 0x18, 0x4A});
+        assertNotNull("Failure to create the AudioDescriptor", ad);
+        assertEquals(0, ad.describeContents());
+    }
+
+    // Test case 2: create an instance, marshall it and create a new instance,
+    //      check for equality, both by comparing fields, and with the equals(Object) method
+    public void testParcelableWriteToParcelCreate() throws Exception {
+        final AudioDescriptor srcDescr = new AudioDescriptor(AudioDescriptor.STANDARD_EDID,
+                AudioProfile.AUDIO_ENCAPSULATION_TYPE_IEC61937, new byte[]{0x05, 0x18, 0x4A});
+        final Parcel srcParcel = Parcel.obtain();
+        final Parcel dstParcel = Parcel.obtain();
+        final byte[] mbytes;
+
+        srcDescr.writeToParcel(srcParcel, 0);
+        mbytes = srcParcel.marshall();
+        dstParcel.unmarshall(mbytes, 0, mbytes.length);
+        dstParcel.setDataPosition(0);
+        final AudioDescriptor targetDescr = AudioDescriptor.CREATOR.createFromParcel(dstParcel);
+        assertEquals("Marshalled/restored standard doesn't match",
+                srcDescr.getStandard(), targetDescr.getStandard());
+        assertTrue("Marshalled/restored descriptor doesn't match",
+                Arrays.equals(srcDescr.getDescriptor(), targetDescr.getDescriptor()));
+        assertEquals("Marshalled/restored encapsulation type don't match",
+                srcDescr.getEncapsulationType(), targetDescr.getEncapsulationType());
+        assertTrue("Source and target AudioDescriptors are not considered equal",
+                srcDescr.equals(targetDescr));
+    }
+}
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/AudioDeviceInfoTest.java b/tests/tests/media/audio/src/android/media/audio/cts/AudioDeviceInfoTest.java
index 764e3d0..e034b95 100644
--- a/tests/tests/media/audio/src/android/media/audio/cts/AudioDeviceInfoTest.java
+++ b/tests/tests/media/audio/src/android/media/audio/cts/AudioDeviceInfoTest.java
@@ -80,7 +80,8 @@
         AudioDeviceInfo.TYPE_HEARING_AID,
         AudioDeviceInfo.TYPE_BUILTIN_SPEAKER_SAFE,
         AudioDeviceInfo.TYPE_BLE_HEADSET,
-        AudioDeviceInfo.TYPE_BLE_SPEAKER)
+        AudioDeviceInfo.TYPE_BLE_SPEAKER,
+        AudioDeviceInfo.TYPE_BLE_BROADCAST)
             .collect(Collectors.toCollection(HashSet::new));
 
     private static int MAX_TYPE;
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/AudioDevicesForAttributesTest.kt b/tests/tests/media/audio/src/android/media/audio/cts/AudioDevicesForAttributesTest.kt
new file mode 100644
index 0000000..9e3231f
--- /dev/null
+++ b/tests/tests/media/audio/src/android/media/audio/cts/AudioDevicesForAttributesTest.kt
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2021 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 android.media.audio.cts
+
+import android.content.pm.PackageManager
+import android.media.AudioAttributes
+import android.media.AudioDeviceInfo
+import android.media.AudioManager
+import android.media.cts.NonMediaMainlineTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertTrue
+import org.junit.Assume.assumeTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@NonMediaMainlineTest
+@RunWith(AndroidJUnit4::class)
+class AudioDevicesForAttributesTest {
+    /**
+     * Test that getAudioDevicesForAttributes reports the output audio device(s)
+     */
+    @Test
+    fun testGetAudioDevicesForAttributes() {
+        val context = InstrumentationRegistry.getInstrumentation().context
+        assumeTrue(
+            context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUDIO_OUTPUT)
+        )
+
+        val audioManager = context.getSystemService(AudioManager::class.java)
+        val allOutDevices = audioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS)
+        var hasAtLeastOneDeviceForAttributes = false
+
+        for (usage in AudioAttributes.getSdkUsages()) {
+            val audioAttributes = AudioAttributes.Builder()
+                .setUsage(usage)
+                .build()
+
+            val audioDevicesForAttributes: List<AudioDeviceInfo> =
+                audioManager.getAudioDevicesForAttributes(audioAttributes)
+
+            assertTrue(
+                "Unknown device for attributes!",
+                allOutDevices.toList().containsAll(audioDevicesForAttributes)
+            )
+
+            if (audioDevicesForAttributes.isNotEmpty()) {
+                hasAtLeastOneDeviceForAttributes = true
+            }
+        }
+
+        if (allOutDevices.isNotEmpty()) {
+            assertTrue(
+                "No device for any AudioAttributes, though output device exists.",
+                hasAtLeastOneDeviceForAttributes
+            )
+        }
+    }
+}
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/AudioFocusTest.java b/tests/tests/media/audio/src/android/media/audio/cts/AudioFocusTest.java
index f84e680..c9b107c 100644
--- a/tests/tests/media/audio/src/android/media/audio/cts/AudioFocusTest.java
+++ b/tests/tests/media/audio/src/android/media/audio/cts/AudioFocusTest.java
@@ -57,6 +57,7 @@
             .setContentType(AudioAttributes.CONTENT_TYPE_SPEECH)
             .build();
 
+    private static final String TEST_CALL_ID = "fake call";
 
     public void testInvalidAudioFocusRequestDelayNoListener() throws Exception {
         AudioFocusRequest req = null;
@@ -215,10 +216,160 @@
         // verify a request that is "force duck"'d still causes loss of focus because it doesn't
         // come from an A11y service, and requests are from same uid
         final AudioAttributes[] attributes = {ATTR_MEDIA, ATTR_A11Y};
-        doTestTwoPlayersGainLoss(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK, attributes,
+        doTestTwoPlayersGainLoss(AudioManager.AUDIOFOCUS_GAIN,
+                AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK, attributes,
                 false /*no handler*/, true /* forceDucking */);
     }
 
+    public void testAudioFocusRequestA11y() throws Exception {
+        final AudioAttributes[] attributes = {ATTR_DRIVE_DIR, ATTR_A11Y};
+        doTestTwoPlayersGainLoss(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE,
+                AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE, attributes,
+                false /*no handler*/, false /* forceDucking */);
+    }
+
+    /**
+     * Test delayed focus behaviors with the sequence:
+     * 1/ media requests FOCUS_GAIN
+     * 2/ (simulated) call with focus lock: media gets FOCUS_LOSS_TRANSIENT
+     * 3/ drive dir requests FOCUS_GAIN + delay OK: is delayed + media gets FOCUS_LOSS
+     * 4/ call ends: drive dir gets FOCUS_GAIN
+     * @throws Exception when failing
+     */
+    public void testAudioFocusDelayedByCall() throws Exception {
+        Log.i(TAG, "testAudioFocusDelayedByCall");
+        final AudioManager am = new AudioManager(getContext());
+        final HandlerThread handlerThread = new HandlerThread(TAG);
+        handlerThread.start();
+        final Handler handler = new Handler(handlerThread.getLooper());
+
+        final AudioFocusRequest callFocusReq =
+                new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT)
+                        .setLocksFocus(true).build();
+        final FocusChangeListener mediaListener = new FocusChangeListener();
+        final AudioFocusRequest mediaFocusReq =
+                new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+                        .setAudioAttributes(ATTR_MEDIA)
+                        .setOnAudioFocusChangeListener(mediaListener, handler)
+                        .build();
+        final FocusChangeListener driveListener = new FocusChangeListener();
+        final AudioFocusRequest driveFocusReq =
+                new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+                        .setAudioAttributes(ATTR_DRIVE_DIR)
+                        .setAcceptsDelayedFocusGain(true)
+                        .setOnAudioFocusChangeListener(driveListener, handler)
+                        .build();
+
+        // for focus request/abandon test methods
+        getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
+                Manifest.permission.QUERY_AUDIO_STATE);
+        try {
+            // media requests audio focus
+            int res = am.requestAudioFocus(mediaFocusReq);
+            assertEquals("media request failed", AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
+            // call requests audio focus
+            am.requestAudioFocusForTest(callFocusReq, TEST_CALL_ID, 1977, Build.VERSION_CODES.S);
+            assertEquals("call request failed", AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
+            // verify media lost focus with LOSS_TRANSIENT
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+            assertEquals("Focus loss not dispatched to media after call start",
+                    AudioManager.AUDIOFOCUS_LOSS_TRANSIENT, mediaListener.getFocusChangeAndReset());
+            // drive dir requests audio focus, verify it's delayed
+            res = am.requestAudioFocus(driveFocusReq);
+            assertEquals("Focus request from drive dir. wasn't delayed",
+                    AudioManager.AUDIOFOCUS_REQUEST_DELAYED, res);
+            // verify media lost focus with LOSS as it's being kicked out of the focus stack
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+            assertEquals("Focus loss not dispatched to media after drive dir delayed focus",
+                    AudioManager.AUDIOFOCUS_LOSS, mediaListener.getFocusChangeAndReset());
+            // end the call, verify drive dir gets focus
+            am.abandonAudioFocusForTest(callFocusReq, TEST_CALL_ID);
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+            assertEquals("Focus gain not dispatched to drive dir after call",
+                    AudioManager.AUDIOFOCUS_GAIN, driveListener.getFocusChangeAndReset());
+        } finally {
+            am.abandonAudioFocusForTest(callFocusReq, TEST_CALL_ID);
+            am.abandonAudioFocusRequest(driveFocusReq);
+            am.abandonAudioFocusRequest(mediaFocusReq);
+            handler.getLooper().quit();
+            handlerThread.quitSafely();
+            getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
+
+    /**
+     * Test delayed focus behaviors with the sequence:
+     * 1/ media requests FOCUS_GAIN
+     * 2/ (simulated) call with focus lock: media gets FOCUS_LOSS_TRANSIENT
+     * 3/ drive dir requests AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK + delay OK: is delayed
+     * 4/ call ends: drive dir gets FOCUS_GAIN
+     * 5/ drive dir ends: media gets FOCUS_GAIN (because it was still in the stack,
+     *                    unlike in testAudioFocusDelayedByCall)
+     * @throws Exception when failing
+     */
+    public void testAudioFocusTransientDelayedByCall() throws Exception {
+        Log.i(TAG, "testAudioFocusDelayedByCall");
+        final AudioManager am = new AudioManager(getContext());
+        final HandlerThread handlerThread = new HandlerThread(TAG);
+        handlerThread.start();
+        final Handler handler = new Handler(handlerThread.getLooper());
+
+        final AudioFocusRequest callFocusReq =
+                new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT)
+                        .setLocksFocus(true).build();
+        final FocusChangeListener mediaListener = new FocusChangeListener();
+        final AudioFocusRequest mediaFocusReq =
+                new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN)
+                        .setAudioAttributes(ATTR_MEDIA)
+                        .setOnAudioFocusChangeListener(mediaListener, handler)
+                        .build();
+        final FocusChangeListener driveListener = new FocusChangeListener();
+        final AudioFocusRequest driveFocusReq =
+                new AudioFocusRequest.Builder(AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK)
+                        .setAudioAttributes(ATTR_DRIVE_DIR)
+                        .setAcceptsDelayedFocusGain(true)
+                        .setOnAudioFocusChangeListener(driveListener, handler)
+                        .build();
+
+        // for focus request/abandon test methods
+        getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
+                Manifest.permission.QUERY_AUDIO_STATE);
+        try {
+            // media requests audio focus
+            int res = am.requestAudioFocus(mediaFocusReq);
+            assertEquals("media request failed", AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
+            // call requests audio focus
+            am.requestAudioFocusForTest(callFocusReq, TEST_CALL_ID, 1977, Build.VERSION_CODES.S);
+            assertEquals("call request failed", AudioManager.AUDIOFOCUS_REQUEST_GRANTED, res);
+            // verify media lost focus with LOSS_TRANSIENT
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+            assertEquals("Focus loss not dispatched to media after call start",
+                    AudioManager.AUDIOFOCUS_LOSS_TRANSIENT, mediaListener.getFocusChangeAndReset());
+            // drive dir requests audio focus, verify it's delayed
+            res = am.requestAudioFocus(driveFocusReq);
+            assertEquals("Focus request from drive dir. wasn't delayed",
+                    AudioManager.AUDIOFOCUS_REQUEST_DELAYED, res);
+            // end the call, verify drive dir gets focus, and media didn't get focus change
+            am.abandonAudioFocusForTest(callFocusReq, TEST_CALL_ID);
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+            assertEquals("Focus gain not dispatched to drive dir after call",
+                    AudioManager.AUDIOFOCUS_GAIN, driveListener.getFocusChangeAndReset());
+            assertEquals("Focus change was dispatched to media",
+                    AudioManager.AUDIOFOCUS_NONE, mediaListener.getFocusChangeAndReset());
+            // end the drive dir, verify media gets focus
+            am.abandonAudioFocusRequest(driveFocusReq);
+            Thread.sleep(TEST_TIMING_TOLERANCE_MS);
+            assertEquals("Focus gain not dispatched to media after drive dir",
+                    AudioManager.AUDIOFOCUS_GAIN, mediaListener.getFocusChangeAndReset());
+        } finally {
+            am.abandonAudioFocusForTest(callFocusReq, TEST_CALL_ID);
+            am.abandonAudioFocusRequest(driveFocusReq);
+            am.abandonAudioFocusRequest(mediaFocusReq);
+            handler.getLooper().quit();
+            handlerThread.quitSafely();
+            getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
     /**
      * Determine if automotive feature is available
      * @param context context to query
@@ -438,35 +589,38 @@
      */
     private void doTestTwoPlayersGainLoss(int gainType, AudioAttributes[] attributes,
             boolean useHandlerInListener) throws Exception {
-        doTestTwoPlayersGainLoss(gainType, attributes, useHandlerInListener,
-                false /*forceDucking*/);
+        doTestTwoPlayersGainLoss(AudioManager.AUDIOFOCUS_GAIN, gainType, attributes,
+                useHandlerInListener, false /*forceDucking*/);
     }
 
     /**
      * Same as {@link #doTestTwoPlayersGainLoss(int, AudioAttributes[], boolean)} with forceDucking
      *   set to false.
-     * @param gainType
-     * @param attributes
+     * @param gainTypeForFirstPlayer focus gain of the focus owner on bottom (== 1st focus request)
+     * @param gainTypeForSecondPlayer focus gain of the focus owner on top (== 2nd focus request)
+     * @param attributes Audio attributes for first and second player, in order.
      * @param useHandlerInListener
      * @param forceDucking value used for setForceDucking in request for focus requester at top of
      *   stack (second requester in test).
      * @throws Exception
      */
-    private void doTestTwoPlayersGainLoss(int gainType, AudioAttributes[] attributes,
-            boolean useHandlerInListener, boolean forceDucking) throws Exception {
+    private void doTestTwoPlayersGainLoss(int gainTypeForFirstPlayer, int gainTypeForSecondPlayer,
+            AudioAttributes[] attributes, boolean useHandlerInListener,
+            boolean forceDucking) throws Exception {
         final int NB_FOCUS_OWNERS = 2;
         if (NB_FOCUS_OWNERS != attributes.length) {
             throw new IllegalArgumentException("Invalid test: invalid number of attributes");
         }
         final AudioFocusRequest[] focusRequests = new AudioFocusRequest[NB_FOCUS_OWNERS];
         final FocusChangeListener[] focusListeners = new FocusChangeListener[NB_FOCUS_OWNERS];
-        final int[] focusGains = { AudioManager.AUDIOFOCUS_GAIN, gainType };
+        final int[] focusGains = { gainTypeForFirstPlayer, gainTypeForSecondPlayer };
         int expectedLoss = 0;
-        switch (gainType) {
+        switch (gainTypeForSecondPlayer) {
             case AudioManager.AUDIOFOCUS_GAIN:
                 expectedLoss = AudioManager.AUDIOFOCUS_LOSS;
                 break;
             case AudioManager.AUDIOFOCUS_GAIN_TRANSIENT:
+            case AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE:
                 expectedLoss = AudioManager.AUDIOFOCUS_LOSS_TRANSIENT;
                 break;
             case AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_MAY_DUCK:
@@ -521,7 +675,7 @@
             focusRequests[1] = null;
             Thread.sleep(TEST_TIMING_TOLERANCE_MS);
             // when focus was lost because it was requested with GAIN, focus is not given back
-            if (gainType != AudioManager.AUDIOFOCUS_GAIN) {
+            if (gainTypeForSecondPlayer != AudioManager.AUDIOFOCUS_GAIN) {
                 assertEquals("Focus gain not dispatched", AudioManager.AUDIOFOCUS_GAIN,
                         focusListeners[0].getFocusChangeAndReset());
             } else {
@@ -581,6 +735,7 @@
 
         @Override
         public void onAudioFocusChange(int focusChange) {
+            Log.i(TAG, "onAudioFocusChange:" + focusChange + " listener:" + this);
             synchronized (mLock) {
                 mFocusChange = focusChange;
             }
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/AudioManagerTest.java b/tests/tests/media/audio/src/android/media/audio/cts/AudioManagerTest.java
index 7d8743c..5ba8f7e 100644
--- a/tests/tests/media/audio/src/android/media/audio/cts/AudioManagerTest.java
+++ b/tests/tests/media/audio/src/android/media/audio/cts/AudioManagerTest.java
@@ -16,8 +16,6 @@
 
 package android.media.audio.cts;
 
-import static org.junit.Assert.assertNotEquals;
-
 import static android.media.AudioManager.ADJUST_LOWER;
 import static android.media.AudioManager.ADJUST_RAISE;
 import static android.media.AudioManager.ADJUST_SAME;
@@ -42,8 +40,11 @@
 import static android.media.AudioManager.VIBRATE_SETTING_ONLY_SILENT;
 import static android.media.AudioManager.VIBRATE_TYPE_NOTIFICATION;
 import static android.media.AudioManager.VIBRATE_TYPE_RINGER;
+import static android.provider.Settings.Global.APPLY_RAMPING_RINGER;
 import static android.provider.Settings.System.SOUND_EFFECTS_ENABLED;
 
+import static org.junit.Assert.assertNotEquals;
+
 import android.Manifest;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
@@ -54,12 +55,13 @@
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.media.AudioAttributes;
+import android.media.AudioDescriptor;
 import android.media.AudioDeviceAttributes;
 import android.media.AudioDeviceInfo;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioProfile;
-import android.media.AudioDescriptor;
+import android.media.AudioTrack;
 import android.media.MediaPlayer;
 import android.media.MediaRecorder;
 import android.media.MicrophoneInfo;
@@ -67,7 +69,6 @@
 import android.media.audiopolicy.AudioProductStrategy;
 import android.media.cts.NonMediaMainlineTest;
 import android.media.cts.Utils;
-
 import android.os.Build;
 import android.os.SystemClock;
 import android.os.Vibrator;
@@ -123,6 +124,15 @@
             add(AudioDescriptor.STANDARD_NONE);
             add(AudioDescriptor.STANDARD_EDID);
     }};
+    private static final HashMap<Integer, Integer> DIRECT_OFFLOAD_MAP = new HashMap<>() {{
+            put(AudioManager.PLAYBACK_OFFLOAD_NOT_SUPPORTED,
+                    AudioManager.DIRECT_PLAYBACK_NOT_SUPPORTED);
+            put(AudioManager.PLAYBACK_OFFLOAD_SUPPORTED,
+                    AudioManager.DIRECT_PLAYBACK_OFFLOAD_SUPPORTED);
+            put(AudioManager.PLAYBACK_OFFLOAD_GAPLESS_SUPPORTED,
+                    AudioManager.DIRECT_PLAYBACK_OFFLOAD_GAPLESS_SUPPORTED);
+        }};
+    private static final int INVALID_DIRECT_PLAYBACK_MODE = -1;
     private AudioManager mAudioManager;
     private NotificationManager mNm;
     private boolean mHasVibrator;
@@ -685,6 +695,33 @@
         }
     }
 
+    public void testAccessRampingRinger() {
+        boolean originalEnabledState = mAudioManager.isRampingRingerEnabled();
+        try {
+            mAudioManager.setRampingRingerEnabled(false);
+            assertFalse(mAudioManager.isRampingRingerEnabled());
+
+            mAudioManager.setRampingRingerEnabled(true);
+            assertTrue(mAudioManager.isRampingRingerEnabled());
+        } finally {
+            mAudioManager.setRampingRingerEnabled(originalEnabledState);
+        }
+    }
+
+    public void testRampingRingerSetting() {
+        boolean originalEnabledState = mAudioManager.isRampingRingerEnabled();
+        try {
+            // Deprecated public setting should still be supported and affect the setting getter.
+            Settings.Global.putInt(mContext.getContentResolver(), APPLY_RAMPING_RINGER, 0);
+            assertFalse(mAudioManager.isRampingRingerEnabled());
+
+            Settings.Global.putInt(mContext.getContentResolver(), APPLY_RAMPING_RINGER, 1);
+            assertTrue(mAudioManager.isRampingRingerEnabled());
+        } finally {
+            mAudioManager.setRampingRingerEnabled(originalEnabledState);
+        }
+    }
+
     public void testVolume() throws Exception {
         if (MediaUtils.check(mIsTelevision, "No volume test due to fixed/full vol devices"))
             return;
@@ -1661,6 +1698,15 @@
         Log.i(TAG, "isHapticPlaybackSupported: " + AudioManager.isHapticPlaybackSupported());
     }
 
+    public void testIsUltrasoundSupported() {
+        // Calling the API to make sure it must crash due to no permission.
+        try {
+            mAudioManager.isUltrasoundSupported();
+            fail("isUltrasoundSupported must fail due to no permission");
+        } catch (SecurityException e) {
+        }
+    }
+
     public void testGetAudioHwSyncForSession() {
         // AudioManager.getAudioHwSyncForSession is not supported before S
         if (ApiLevelUtil.isAtMost(Build.VERSION_CODES.R)) {
@@ -1905,6 +1951,89 @@
         }
     }
 
+    public void testGetDirectPlaybackSupport() {
+        assertEquals(AudioManager.DIRECT_PLAYBACK_NOT_SUPPORTED,
+                AudioManager.getDirectPlaybackSupport(
+                        new AudioFormat.Builder().build(),
+                        new AudioAttributes.Builder().build()));
+        AudioDeviceInfo[] devices = mAudioManager.getDevices(AudioManager.GET_DEVICES_OUTPUTS);
+        AudioAttributes attr = new AudioAttributes.Builder()
+                .setUsage(AudioAttributes.USAGE_MEDIA)
+                .setLegacyStreamType(STREAM_MUSIC).build();
+        for (AudioDeviceInfo device : devices) {
+            for (int encoding : device.getEncodings()) {
+                for (int channelMask : device.getChannelMasks()) {
+                    for (int sampleRate : device.getSampleRates()) {
+                        AudioFormat format = new AudioFormat.Builder()
+                                .setEncoding(encoding)
+                                .setChannelMask(channelMask)
+                                .setSampleRate(sampleRate).build();
+                        final int directPlaybackSupport =
+                                AudioManager.getDirectPlaybackSupport(format, attr);
+                        assertEquals(
+                                AudioTrack.isDirectPlaybackSupported(format, attr),
+                                directPlaybackSupport
+                                        != AudioManager.DIRECT_PLAYBACK_NOT_SUPPORTED);
+                        if (directPlaybackSupport == AudioManager.DIRECT_PLAYBACK_NOT_SUPPORTED) {
+                            assertEquals(
+                                    DIRECT_OFFLOAD_MAP.getOrDefault(
+                                            AudioManager.getPlaybackOffloadSupport(format, attr),
+                                            INVALID_DIRECT_PLAYBACK_MODE).intValue(),
+                                    directPlaybackSupport);
+                        } else if ((directPlaybackSupport
+                                & AudioManager.DIRECT_PLAYBACK_OFFLOAD_SUPPORTED)
+                                != AudioManager.DIRECT_PLAYBACK_NOT_SUPPORTED) {
+                            // AudioManager.getPlaybackOffloadSupport can only query offload
+                            // support but not other direct support like passthrough.
+                            assertNotEquals(
+                                    AudioManager.DIRECT_PLAYBACK_NOT_SUPPORTED,
+                                    DIRECT_OFFLOAD_MAP.getOrDefault(
+                                            AudioManager.getPlaybackOffloadSupport(format, attr),
+                                            AudioManager.DIRECT_PLAYBACK_NOT_SUPPORTED)
+                                            & directPlaybackSupport);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    public void testAssistantUidRouting() {
+        try {
+            mAudioManager.addAssistantServicesUids(new int[0]);
+            fail("addAssistantServicesUids must fail due to no permission");
+        } catch (SecurityException e) {
+        }
+
+        try {
+            mAudioManager.removeAssistantServicesUids(new int[0]);
+            fail("removeAssistantServicesUids must fail due to no permission");
+        } catch (SecurityException e) {
+        }
+
+        try {
+            int[] uids = mAudioManager.getAssistantServicesUids();
+            fail("getAssistantServicesUids must fail due to no permission");
+        } catch (SecurityException e) {
+        }
+
+        try {
+            mAudioManager.setActiveAssistantServiceUids(new int[0]);
+            fail("setActiveAssistantServiceUids must fail due to no permission");
+        } catch (SecurityException e) {
+        }
+
+        try {
+            int[] activeUids = mAudioManager.getActiveAssistantServicesUids();
+            fail("getActiveAssistantServicesUids must fail due to no permission");
+        } catch (SecurityException e) {
+        }
+    }
+
+    public void testGetHalVersion() {
+        assertNotEquals(null, AudioManager.getHalVersion());
+    }
+
     private void assertStreamVolumeEquals(int stream, int expectedVolume) throws Exception {
         assertStreamVolumeEquals(stream, expectedVolume,
                 "Unexpected stream volume for stream=" + stream);
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/AudioNativeTest.java b/tests/tests/media/audio/src/android/media/audio/cts/AudioNativeTest.java
index 1fbabbf..1061ae1 100644
--- a/tests/tests/media/audio/src/android/media/audio/cts/AudioNativeTest.java
+++ b/tests/tests/media/audio/src/android/media/audio/cts/AudioNativeTest.java
@@ -26,6 +26,7 @@
 import android.media.cts.AudioHelper;
 import android.media.cts.NonMediaMainlineTest;
 import android.os.Build;
+import android.platform.test.annotations.Presubmit;
 
 import com.android.compatibility.common.util.ApiLevelUtil;
 import com.android.compatibility.common.util.CtsAndroidTestCase;
@@ -43,6 +44,7 @@
         nativeAppendixBBufferQueue();
     }
 
+    @Presubmit
     public void testAppendixBRecording() {
         // better to detect presence of microphone here.
         if (!hasMicrophone()) {
@@ -51,12 +53,14 @@
         nativeAppendixBRecording();
     }
 
+    @Presubmit
     public void testStereo16Playback() {
         assertTrue(AudioTrackNative.test(
                 2 /* numChannels */, 48000 /* sampleRate */, false /* useFloat */,
                 20 /* msecPerBuffer */, 8 /* numBuffers */));
     }
 
+    @Presubmit
     public void testStereo16Record() {
         if (!hasMicrophone()) {
             return;
@@ -209,6 +213,7 @@
         }
     }
 
+    @Presubmit
     public void testRecordAudit() throws Exception {
         if (!hasMicrophone()) {
             return;
@@ -218,6 +223,7 @@
                 1000 /* segmentDurationMs */, 10 /* numSegments */);
     }
 
+    @Presubmit
     public void testOutputChannelMasks() {
         if (!hasAudioOutput()) {
             return;
@@ -242,6 +248,7 @@
         }
     }
 
+    @Presubmit
     public void testInputChannelMasks() {
         if (!hasMicrophone()) {
             return;
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/AudioPlaybackCaptureTest.java b/tests/tests/media/audio/src/android/media/audio/cts/AudioPlaybackCaptureTest.java
index 4ab67a5..9171312 100644
--- a/tests/tests/media/audio/src/android/media/audio/cts/AudioPlaybackCaptureTest.java
+++ b/tests/tests/media/audio/src/android/media/audio/cts/AudioPlaybackCaptureTest.java
@@ -275,6 +275,7 @@
     private static final boolean EXPECT_DATA = true;
     private static final boolean EXPECT_SILENCE = false;
 
+    // We have explicit tests per usage testCaptureMatchingAllowedUsage*
     private static final @AttributeUsage int[] ALLOWED_USAGES = new int[]{
             AudioAttributes.USAGE_UNKNOWN,
             AudioAttributes.USAGE_MEDIA,
@@ -323,17 +324,30 @@
         testPlaybackCapture(OPT_IN, AudioAttributes.USAGE_UNKNOWN, EXPECT_SILENCE);
     }
 
+    // Allowed usage tests done individually to isolate failure and keep test duration < 30s.
     @Test
-    public void testCaptureMatchingAllowedUsage() throws Exception {
-        for (int usage : ALLOWED_USAGES) {
-            mAPCTestConfig.matchingUsages = new int[]{ usage };
-            testPlaybackCapture(OPT_IN, usage, EXPECT_DATA);
-            testPlaybackCapture(OPT_OUT, usage, EXPECT_SILENCE);
+    public void testCaptureMatchingAllowedUsageUnknown() throws Exception {
+        doTestCaptureMatchingAllowedUsage(AudioAttributes.USAGE_UNKNOWN);
+    }
 
-            mAPCTestConfig.matchingUsages = ALLOWED_USAGES;
-            testPlaybackCapture(OPT_IN, usage, EXPECT_DATA);
-            testPlaybackCapture(OPT_OUT, usage, EXPECT_SILENCE);
-        }
+    @Test
+    public void testCaptureMatchingAllowedUsageMedia() throws Exception {
+        doTestCaptureMatchingAllowedUsage(AudioAttributes.USAGE_MEDIA);
+    }
+
+    @Test
+    public void testCaptureMatchingAllowedUsageGame() throws Exception {
+        doTestCaptureMatchingAllowedUsage(AudioAttributes.USAGE_GAME);
+    }
+
+    private void doTestCaptureMatchingAllowedUsage(int usage) throws Exception {
+        mAPCTestConfig.matchingUsages = new int[]{ usage };
+        testPlaybackCapture(OPT_IN, usage, EXPECT_DATA);
+        testPlaybackCapture(OPT_OUT, usage, EXPECT_SILENCE);
+
+        mAPCTestConfig.matchingUsages = ALLOWED_USAGES;
+        testPlaybackCapture(OPT_IN, usage, EXPECT_DATA);
+        testPlaybackCapture(OPT_OUT, usage, EXPECT_SILENCE);
     }
 
     @Test
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/AudioProfileTest.java b/tests/tests/media/audio/src/android/media/audio/cts/AudioProfileTest.java
new file mode 100755
index 0000000..4a1eb7f
--- /dev/null
+++ b/tests/tests/media/audio/src/android/media/audio/cts/AudioProfileTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2021 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 android.media.audio.cts;
+
+import android.media.AudioFormat;
+import android.media.AudioProfile;
+import android.os.Parcel;
+
+import com.android.compatibility.common.util.CtsAndroidTestCase;
+
+import java.util.Arrays;
+
+public class AudioProfileTest extends CtsAndroidTestCase {
+    // -----------------------------------------------------------------
+    // AUDIOPROFILE TESTS:
+    // ----------------------------------
+
+    // -----------------------------------------------------------------
+    // Parcelable tests
+    // ----------------------------------
+
+    // Test case 1: call describeContents(), not used yet, but needs to be exercised
+    public void testParcelableDescribeContents() throws Exception {
+        final AudioProfile ap = new AudioProfile(AudioFormat.ENCODING_DTS,
+                /* sampling rates */ new int[]{32000, 44100, 48000, 88200, 96000, 176400},
+                /* channel masks */ new int[]{0x00000001, 0x00000008},
+                /* channel index masks */ new int[]{0xa, 0x5},
+                AudioProfile.AUDIO_ENCAPSULATION_TYPE_IEC61937);
+        assertNotNull("Failure to create the AudioProfile", ap);
+        assertEquals(0, ap.describeContents());
+    }
+
+    // Test case 2: create an instance, marshall it and create a new instance,
+    //      check for equality, both by comparing fields, and with the equals(Object) method
+    public void testParcelableWriteToParcelCreate() throws Exception {
+        final AudioProfile srcProf = new AudioProfile(AudioFormat.ENCODING_DTS,
+                /* sampling rates */ new int[]{32000, 44100, 48000, 88200, 96000, 176400},
+                /* channel masks */ new int[]{0x00000001, 0x00000008},
+                /* channel index masks */ new int[]{0xa, 0x5},
+                AudioProfile.AUDIO_ENCAPSULATION_TYPE_IEC61937);
+        final Parcel srcParcel = Parcel.obtain();
+        final Parcel dstParcel = Parcel.obtain();
+        final byte[] mbytes;
+
+        srcProf.writeToParcel(srcParcel, 0);
+        mbytes = srcParcel.marshall();
+        dstParcel.unmarshall(mbytes, 0, mbytes.length);
+        dstParcel.setDataPosition(0);
+        final AudioProfile targetProf = AudioProfile.CREATOR.createFromParcel(dstParcel);
+        assertEquals("Marshalled/restored format doesn't match",
+                srcProf.getFormat(), targetProf.getFormat());
+        assertTrue("Marshalled/restored channel masks don't match",
+                Arrays.equals(srcProf.getChannelMasks(), targetProf.getChannelMasks()));
+        assertTrue("Marshalled/restored channel index masks don't match",
+                Arrays.equals(srcProf.getChannelIndexMasks(), targetProf.getChannelIndexMasks()));
+        assertTrue("Marshalled/restored sample rates don't match",
+                Arrays.equals(srcProf.getSampleRates(), targetProf.getSampleRates()));
+        assertEquals("Marshalled/restored encapsulation type don't match",
+                srcProf.getEncapsulationType(), targetProf.getEncapsulationType());
+        assertTrue("Source and target AudioProfiles are not considered equal",
+                srcProf.equals(targetProf));
+    }
+}
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/AudioRecordTest.java b/tests/tests/media/audio/src/android/media/audio/cts/AudioRecordTest.java
index ee5f0da..9451efd 100644
--- a/tests/tests/media/audio/src/android/media/audio/cts/AudioRecordTest.java
+++ b/tests/tests/media/audio/src/android/media/audio/cts/AudioRecordTest.java
@@ -27,6 +27,7 @@
 import android.app.ActivityManager;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.media.AudioDeviceInfo;
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioRecord;
@@ -35,12 +36,14 @@
 import android.media.AudioSystem;
 import android.media.AudioTimestamp;
 import android.media.AudioTrack;
+import android.media.MediaFormat;
 import android.media.MediaRecorder;
 import android.media.MediaSyncEvent;
 import android.media.MicrophoneDirection;
 import android.media.MicrophoneInfo;
 import android.media.cts.AudioHelper;
 import android.media.cts.NonMediaMainlineTest;
+import android.media.cts.StreamUtils;
 import android.media.metrics.LogSessionId;
 import android.media.metrics.MediaMetricsManager;
 import android.media.metrics.RecordingSession;
@@ -73,7 +76,7 @@
 import java.util.ArrayList;
 import java.util.concurrent.Executor;
 import java.util.List;
-
+import java.util.function.BiFunction;
 
 @NonMediaMainlineTest
 @RunWith(AndroidJUnit4.class)
@@ -81,6 +84,7 @@
     private final static String TAG = "AudioRecordTest";
     private static final String REPORT_LOG_NAME = "CtsMediaAudioTestCases";
     private AudioRecord mAudioRecord;
+    private AudioManager mAudioManager;
     private static final int SAMPLING_RATE_HZ = 44100;
     private boolean mIsOnMarkerReachedCalled;
     private boolean mIsOnPeriodicNotificationCalled;
@@ -104,7 +108,8 @@
         if (!hasMicrophone()) {
             return;
         }
-
+        mAudioManager = InstrumentationRegistry .getInstrumentation()
+                                               .getContext().getSystemService(AudioManager.class);
         /*
          * InstrumentationTestRunner.onStart() calls Looper.prepare(), which creates a looper
          * for the current thread. However, since we don't actually call loop() in the test,
@@ -180,7 +185,7 @@
             return;
         }
         final int SLEEP_TIME = 10;
-        final int RECORD_TIME = 10000;
+        final int RECORD_TIME = 5000;
         assertEquals(AudioRecord.STATE_INITIALIZED, mAudioRecord.getState());
 
         int markerInFrames = mAudioRecord.getSampleRate() / 2;
@@ -1009,7 +1014,7 @@
             boolean useByteBuffer, boolean blocking,
             final boolean auditRecording, final boolean isChannelIndex,
             final int TEST_SR, final int TEST_CONF, final int TEST_FORMAT) throws Exception {
-        final int TEST_TIME_MS = auditRecording ? 60000 : 2000;
+        final int TEST_TIME_MS = auditRecording ? 10000 : 2000;
         doTest(reportName, localRecord, customHandler, periodsPerSecond, markerPeriodsPerSecond,
                 useByteBuffer, blocking, auditRecording, isChannelIndex,
                 TEST_SR, TEST_CONF, TEST_FORMAT, TEST_TIME_MS);
@@ -1099,6 +1104,7 @@
             AudioTimestamp startTs = new AudioTimestamp();
             assertEquals(AudioRecord.ERROR_INVALID_OPERATION,
                     record.getTimestamp(startTs, AudioTimestamp.TIMEBASE_MONOTONIC));
+            assertEquals("invalid getTimestamp doesn't affect nanoTime", 0, startTs.nanoTime);
 
             listener.start(TEST_SR);
             record.startRecording();
@@ -1118,17 +1124,19 @@
             final int BUFFER_SAMPLES = BUFFER_FRAMES * numChannels;
             // TODO: verify behavior when buffer size is not a multiple of frame size.
 
-            int startTimeAtFrame = 0;
             int samplesRead = 0;
+            // abstract out the buffer type used with lambda.
+            final byte[] byteData = new byte[BUFFER_SAMPLES];
+            final short[] shortData = new short[BUFFER_SAMPLES];
+            final float[] floatData = new float[BUFFER_SAMPLES];
+            final ByteBuffer byteBuffer =
+                    ByteBuffer.allocateDirect(BUFFER_SAMPLES * bytesPerSample);
+            BiFunction<Integer, Boolean, Integer> reader = null;
+
+            // depending on the options, create a lambda to read data.
             if (useByteBuffer) {
-                ByteBuffer byteBuffer =
-                        ByteBuffer.allocateDirect(BUFFER_SAMPLES * bytesPerSample);
-                while (samplesRead < targetSamples) {
-                    // the first time through, we read a single frame.
-                    // this sets the recording anchor position.
-                    int amount = samplesRead == 0 ? numChannels :
-                        Math.min(BUFFER_SAMPLES, targetSamples - samplesRead);
-                    amount *= bytesPerSample;    // in bytes
+                reader = (samples, blockForData) -> {
+                    final int amount = samples * bytesPerSample;    // in bytes
                     // read always places data at the start of the byte buffer with
                     // position and limit are ignored.  test this by setting
                     // position and limit to arbitrary values here.
@@ -1136,112 +1144,58 @@
                     final int lastLimit = 13;
                     byteBuffer.position(lastPosition);
                     byteBuffer.limit(lastLimit);
-                    int ret = blocking ? record.read(byteBuffer, amount) :
-                        record.read(byteBuffer, amount, AudioRecord.READ_NON_BLOCKING);
-                    // so long as amount requested in bytes is a multiple of the frame size
-                    // we expect the byte buffer request to be filled.  Caution: the
-                    // byte buffer data will be in native endian order, not Java order.
-                    if (blocking) {
-                        assertEquals(amount, ret);
-                    } else {
-                        assertTrue("0 <= " + ret + " <= " + amount,
-                                0 <= ret && ret <= amount);
-                    }
-                    // position, limit are not changed by read().
-                    assertEquals(lastPosition, byteBuffer.position());
-                    assertEquals(lastLimit, byteBuffer.limit());
-                    if (samplesRead == 0 && ret > 0) {
-                        firstSampleTime = System.currentTimeMillis();
-                    }
-                    samplesRead += ret / bytesPerSample;
-                    if (startTimeAtFrame == 0 && ret > 0 &&
-                            record.getTimestamp(startTs, AudioTimestamp.TIMEBASE_MONOTONIC) ==
-                            AudioRecord.SUCCESS) {
-                        startTimeAtFrame = samplesRead / numChannels;
-                    }
-                }
+                    final int ret = blockForData ? record.read(byteBuffer, amount) :
+                            record.read(byteBuffer, amount, AudioRecord.READ_NON_BLOCKING);
+                    return ret / bytesPerSample;
+                };
             } else {
                 switch (TEST_FORMAT) {
-                case AudioFormat.ENCODING_PCM_8BIT: {
-                    // For 8 bit data, use bytes
-                    byte[] byteData = new byte[BUFFER_SAMPLES];
-                    while (samplesRead < targetSamples) {
-                        // the first time through, we read a single frame.
-                        // this sets the recording anchor position.
-                        int amount = samplesRead == 0 ? numChannels :
-                            Math.min(BUFFER_SAMPLES, targetSamples - samplesRead);
-                        int ret = blocking ? record.read(byteData, 0, amount) :
-                            record.read(byteData, 0, amount, AudioRecord.READ_NON_BLOCKING);
-                        if (blocking) {
-                            assertEquals(amount, ret);
-                        } else {
-                            assertTrue("0 <= " + ret + " <= " + amount,
-                                    0 <= ret && ret <= amount);
-                        }
-                        if (samplesRead == 0 && ret > 0) {
-                            firstSampleTime = System.currentTimeMillis();
-                        }
-                        samplesRead += ret;
-                        if (startTimeAtFrame == 0 && ret > 0 &&
-                                record.getTimestamp(startTs, AudioTimestamp.TIMEBASE_MONOTONIC) ==
-                                AudioRecord.SUCCESS) {
-                            startTimeAtFrame = samplesRead / numChannels;
-                        }
-                    }
-                } break;
-                case AudioFormat.ENCODING_PCM_16BIT: {
-                    // For 16 bit data, use shorts
-                    short[] shortData = new short[BUFFER_SAMPLES];
-                    while (samplesRead < targetSamples) {
-                        // the first time through, we read a single frame.
-                        // this sets the recording anchor position.
-                        int amount = samplesRead == 0 ? numChannels :
-                            Math.min(BUFFER_SAMPLES, targetSamples - samplesRead);
-                        int ret = blocking ? record.read(shortData, 0, amount) :
-                            record.read(shortData, 0, amount, AudioRecord.READ_NON_BLOCKING);
-                        if (blocking) {
-                            assertEquals(amount, ret);
-                        } else {
-                            assertTrue("0 <= " + ret + " <= " + amount,
-                                    0 <= ret && ret <= amount);
-                        }
-                        if (samplesRead == 0 && ret > 0) {
-                            firstSampleTime = System.currentTimeMillis();
-                        }
-                        samplesRead += ret;
-                        if (startTimeAtFrame == 0 && ret > 0 &&
-                                record.getTimestamp(startTs, AudioTimestamp.TIMEBASE_MONOTONIC) ==
-                                AudioRecord.SUCCESS) {
-                            startTimeAtFrame = samplesRead / numChannels;
-                        }
-                    }
-                } break;
-                case AudioFormat.ENCODING_PCM_FLOAT: {
-                    float[] floatData = new float[BUFFER_SAMPLES];
-                    while (samplesRead < targetSamples) {
-                        // the first time through, we read a single frame.
-                        // this sets the recording anchor position.
-                        int amount = samplesRead == 0 ? numChannels :
-                            Math.min(BUFFER_SAMPLES, targetSamples - samplesRead);
-                        int ret = record.read(floatData, 0, amount, blocking ?
-                                AudioRecord.READ_BLOCKING : AudioRecord.READ_NON_BLOCKING);
-                        if (blocking) {
-                            assertEquals(amount, ret);
-                        } else {
-                            assertTrue("0 <= " + ret + " <= " + amount,
-                                    0 <= ret && ret <= amount);
-                        }
-                        if (samplesRead == 0 && ret > 0) {
-                            firstSampleTime = System.currentTimeMillis();
-                        }
-                        samplesRead += ret;
-                        if (startTimeAtFrame == 0 && ret > 0 &&
-                                record.getTimestamp(startTs, AudioTimestamp.TIMEBASE_MONOTONIC) ==
-                                AudioRecord.SUCCESS) {
-                            startTimeAtFrame = samplesRead / numChannels;
-                        }
-                    }
-                } break;
+                    case AudioFormat.ENCODING_PCM_8BIT:
+                        reader = (samples, blockForData) -> {
+                            return blockForData ? record.read(byteData, 0, samples) :
+                                    record.read(byteData, 0, samples,
+                                            AudioRecord.READ_NON_BLOCKING);
+                        };
+                        break;
+                    case AudioFormat.ENCODING_PCM_16BIT:
+                        reader = (samples, blockForData) -> {
+                            return blockForData ? record.read(shortData, 0, samples) :
+                                    record.read(shortData, 0, samples,
+                                            AudioRecord.READ_NON_BLOCKING);
+                        };
+                        break;
+                    case AudioFormat.ENCODING_PCM_FLOAT:
+                        reader = (samples, blockForData) -> {
+                            return record.read(floatData, 0, samples,
+                                    blockForData ? AudioRecord.READ_BLOCKING
+                                            : AudioRecord.READ_NON_BLOCKING);
+                        };
+                        break;
+                }
+            }
+
+            while (samplesRead < targetSamples) {
+                // the first time through, we read a single frame.
+                // this sets the recording anchor position.
+                final int amount = samplesRead == 0 ? numChannels :
+                    Math.min(BUFFER_SAMPLES, targetSamples - samplesRead);
+                final int ret = reader.apply(amount, blocking);
+                if (blocking) {
+                    assertEquals("blocking reads should return amount requested", amount, ret);
+                } else {
+                    assertTrue("non-blocking reads should return amount in range: " +
+                            "0 <= " + ret + " <= " + amount,
+                            0 <= ret && ret <= amount);
+                }
+                if (samplesRead == 0 && ret > 0) {
+                    firstSampleTime = System.currentTimeMillis();
+                }
+                samplesRead += ret;
+                if (startTs.nanoTime == 0 && ret > 0 &&
+                        record.getTimestamp(startTs, AudioTimestamp.TIMEBASE_MONOTONIC)
+                                == AudioRecord.SUCCESS) {
+                    assertTrue("expecting valid timestamp with nonzero nanoTime",
+                            startTs.nanoTime > 0);
                 }
             }
 
@@ -1259,11 +1213,17 @@
                 Log.w(TAG, "cold input start time too long "
                         + coldInputStartTime + " > 100ms");
             }
-            assertTrue(coldInputStartTime < 5000); // must start within 5 seconds.
+
+            final int COLD_INPUT_START_TIME_LIMIT_MS = 5000;
+            assertTrue("track must start within " + COLD_INPUT_START_TIME_LIMIT_MS + " millis",
+                    coldInputStartTime < COLD_INPUT_START_TIME_LIMIT_MS);
 
             // Verify recording completes within 50 ms of expected test time (typical 20ms)
-            assertEquals(TEST_TIME_MS, endTime - firstSampleTime, auditRecording ?
-                (isLowLatencyDevice() ? 1000 : 2000) : (isLowLatencyDevice() ? 50 : 400));
+            final int RECORDING_TIME_TOLERANCE_MS = auditRecording ?
+                (isLowLatencyDevice() ? 1000 : 2000) : (isLowLatencyDevice() ? 50 : 400);
+            assertEquals("recording must complete within " + RECORDING_TIME_TOLERANCE_MS
+                    + " of expected test time",
+                    TEST_TIME_MS, endTime - firstSampleTime, RECORDING_TIME_TOLERANCE_MS);
 
             // Even though we've read all the frames we want, the events may not be sent to
             // the listeners (events are handled through a separate internal callback thread).
@@ -1272,7 +1232,8 @@
 
             stopRequestTime = System.currentTimeMillis();
             record.stop();
-            assertEquals(AudioRecord.RECORDSTATE_STOPPED, record.getRecordingState());
+            assertEquals("state should be RECORDSTATE_STOPPED after stop()",
+                    AudioRecord.RECORDSTATE_STOPPED, record.getRecordingState());
 
             stopTime = System.currentTimeMillis();
 
@@ -1290,10 +1251,12 @@
 
             // get stop timestamp
             AudioTimestamp stopTs = new AudioTimestamp();
-            assertEquals(AudioRecord.SUCCESS,
+            assertEquals("should successfully get timestamp after stop",
+                    AudioRecord.SUCCESS,
                     record.getTimestamp(stopTs, AudioTimestamp.TIMEBASE_MONOTONIC));
             AudioTimestamp stopTsBoot = new AudioTimestamp();
-            assertEquals(AudioRecord.SUCCESS,
+            assertEquals("should successfully get boottime timestamp after stop",
+                    AudioRecord.SUCCESS,
                     record.getTimestamp(stopTsBoot, AudioTimestamp.TIMEBASE_BOOTTIME));
 
             // printTimestamp("startTs", startTs);
@@ -1303,13 +1266,16 @@
             // Log.d(TAG, "time Boottime " + SystemClock.elapsedRealtimeNanos());
 
             // stop should not reset timestamps
-            assertTrue(stopTs.framePosition >= targetFrames);
-            assertEquals(stopTs.framePosition, stopTsBoot.framePosition);
-            assertTrue(stopTs.nanoTime > 0);
+            assertTrue("stop timestamp position should be no less than frames read",
+                    stopTs.framePosition >= targetFrames);
+            assertEquals("stop timestamp position should be same "
+                    + "between monotonic and boot timestamps",
+                    stopTs.framePosition, stopTsBoot.framePosition);
+            assertTrue("stop timestamp nanoTime must be set", stopTs.nanoTime > 0);
 
             // timestamps follow a different path than data, so it is conceivable
             // that first data arrives before the first timestamp is ready.
-            assertTrue(startTimeAtFrame > 0); // we read a start timestamp
+            assertTrue("no start timestamp read", startTs.nanoTime > 0);
 
             verifyContinuousTimestamps(startTs, stopTs, TEST_SR);
 
@@ -1324,9 +1290,7 @@
             // resource needed for other tests.
             record.release();
         }
-        if (auditRecording) { // don't check timing if auditing (messes up timing)
-            return;
-        }
+
         final int markerPeriods = markerPeriodsPerSecond * TEST_TIME_MS / 1000;
         final int updatePeriods = periodsPerSecond * TEST_TIME_MS / 1000;
         final int markerPeriodsMax =
@@ -1647,6 +1611,124 @@
         return;
     }
 
+    /**
+     * Test AudioRecord Builder error handling.
+     *
+     * @throws Exception
+     */
+    @Test
+    public void testAudioRecordBuilderError() throws Exception {
+        if (!hasMicrophone()) {
+            return;
+        }
+
+        final AudioRecord[] audioRecord = new AudioRecord[1]; // pointer to AudioRecord.
+        final int BIGNUM = Integer.MAX_VALUE; // large value that should be invalid.
+        final int INVALID_SESSION_ID = 1024;  // can never occur (wrong type in 3 lsbs)
+        final int INVALID_CHANNEL_MASK = -1;
+
+        try {
+            // NOTE:
+            // AudioFormat tested in AudioFormatTest#testAudioFormatBuilderError.
+
+            // We must be able to create the AudioRecord.
+            audioRecord[0] = new AudioRecord.Builder().build();
+            audioRecord[0].release();
+
+            // Out of bounds buffer size.  A large size will fail in AudioRecord creation.
+            assertThrows(UnsupportedOperationException.class, () -> {
+                audioRecord[0] = new AudioRecord.Builder()
+                        .setBufferSizeInBytes(BIGNUM)
+                        .build();
+            });
+
+            // 0 and negative buffer size throw IllegalArgumentException
+            for (int bufferSize : new int[] {-BIGNUM, -1, 0}) {
+                assertThrows(IllegalArgumentException.class, () -> {
+                    audioRecord[0] = new AudioRecord.Builder()
+                            .setBufferSizeInBytes(bufferSize)
+                            .build();
+                });
+            }
+
+            assertThrows(IllegalArgumentException.class, () -> {
+                audioRecord[0] = new AudioRecord.Builder()
+                        .setAudioSource(BIGNUM)
+                        .build();
+            });
+
+            assertThrows(IllegalArgumentException.class, () -> {
+                audioRecord[0] = new AudioRecord.Builder()
+                        .setAudioSource(-2)
+                        .build();
+            });
+
+            // Invalid session id that is positive.
+            // (logcat error message vague)
+            assertThrows(UnsupportedOperationException.class, () -> {
+                audioRecord[0] = new AudioRecord.Builder()
+                        .setSessionId(INVALID_SESSION_ID)
+                        .build();
+            });
+
+            // Specialty AudioRecord tests
+            assertThrows(NullPointerException.class, () -> {
+                audioRecord[0] = new AudioRecord.Builder()
+                        .setAudioPlaybackCaptureConfig(null)
+                        .build();
+            });
+
+            assertThrows(NullPointerException.class, () -> {
+                audioRecord[0] = new AudioRecord.Builder()
+                        .setContext(null)
+                        .build();
+            });
+
+            // Bad audio encoding DRA expected unsupported.
+            try {
+                audioRecord[0] = new AudioRecord.Builder()
+                        .setAudioFormat(new AudioFormat.Builder()
+                                .setChannelMask(AudioFormat.CHANNEL_OUT_STEREO)
+                                .setEncoding(AudioFormat.ENCODING_DRA)
+                                .build())
+                        .build();
+                // Don't throw an exception, maybe it is supported somehow, but warn.
+                Log.w(TAG, "ENCODING_DRA is expected to be unsupported");
+                audioRecord[0].release();
+                audioRecord[0] = null;
+            } catch (UnsupportedOperationException e) {
+                ; // OK expected
+            }
+
+            // Sample rate out of bounds.
+            // System levels caught on AudioFormat.
+            assertThrows(IllegalArgumentException.class, () -> {
+                audioRecord[0] = new AudioRecord.Builder()
+                        .setAudioFormat(new AudioFormat.Builder()
+                                .setSampleRate(BIGNUM)
+                                .build())
+                        .build();
+            });
+
+            // Invalid channel mask
+            // This is a UOE for AudioRecord vs IAE for AudioTrack.
+            assertThrows(UnsupportedOperationException.class, () -> {
+                audioRecord[0] = new AudioRecord.Builder()
+                        .setAudioFormat(new AudioFormat.Builder()
+                                .setChannelMask(INVALID_CHANNEL_MASK)
+                                .build())
+                        .build();
+            });
+        } finally {
+            // Did we successfully complete for some reason but did not
+            // release?
+            if (audioRecord[0] != null) {
+                audioRecord[0].release();
+                audioRecord[0] = null;
+            }
+        }
+    }
+
     @Test
     public void testPrivacySensitiveBuilder() throws Exception {
         if (!hasMicrophone()) {
@@ -1732,4 +1814,80 @@
             }
         }
     }
+
+    @Test
+    public void testCompressedCaptureAAC() throws Exception {
+        final int ENCODING = AudioFormat.ENCODING_AAC_LC;
+        final String MIMETYPE = MediaFormat.MIMETYPE_AUDIO_AAC;
+        final int BUFFER_SIZE = 16000;
+        if (!hasMicrophone()) {
+            return;
+        }
+        AudioDeviceInfo[] devices = mAudioManager.getDevices(AudioManager.GET_DEVICES_INPUTS);
+        // TODO test multiple supporting devices if available
+        AudioDeviceInfo supportingDevice = null;
+        for (AudioDeviceInfo device : devices) {
+            for (int encoding : device.getEncodings()) {
+                if (encoding == ENCODING) {
+                    supportingDevice = device;
+                    break;
+                }
+            }
+            if (supportingDevice != null) break;
+        }
+        if (supportingDevice == null) {
+            Log.i(TAG, "Compressed audio (AAC) not supported");
+            return; // Compressed Audio is not supported
+        }
+        Log.i(TAG, "Compressed audio (AAC) supported");
+        AudioRecord audioRecord = null;
+        try {
+            audioRecord = new AudioRecord.Builder()
+                    .setAudioFormat(new AudioFormat.Builder()
+                            .setEncoding(ENCODING)
+                            .setChannelMask(AudioFormat.CHANNEL_IN_MONO)
+                            .build())
+                    .build();
+            audioRecord.setPreferredDevice(supportingDevice);
+            class ByteBufferImpl extends StreamUtils.ByteBufferStream {
+                @Override
+                public ByteBuffer read() throws IOException {
+                    if (mCount < 1 /* only one buffer */) {
+                        ++mCount;
+                        return mByteBuffer;
+                    }
+                    return null;
+                }
+                public ByteBuffer mByteBuffer = ByteBuffer.allocateDirect(BUFFER_SIZE);
+                private int mCount = 0;
+            }
+
+            ByteBufferImpl byteBufferImpl = new ByteBufferImpl();
+            audioRecord.startRecording();
+            audioRecord.read(byteBufferImpl.mByteBuffer, BUFFER_SIZE);
+            audioRecord.stop();
+            // Attempt to decode compressed data
+            //sample rate/ch count not needed
+            final MediaFormat format = MediaFormat.createAudioFormat(MIMETYPE, 0, 0);
+            final StreamUtils.MediaCodecStream decodingStream
+                = new StreamUtils.MediaCodecStream(byteBufferImpl, format, false);
+            ByteBuffer decoded =  decodingStream.read();
+            int totalDecoded = 0;
+            while (decoded != null) {
+                // TODO validate actual data
+                totalDecoded += decoded.remaining();
+                decoded = decodingStream.read();
+            }
+            Log.i(TAG, "Decoded size:" + String.valueOf(totalDecoded));
+        // TODO rethrow following exceptions on verification
+        } catch (UnsupportedOperationException e) {
+            Log.w(TAG, "Compressed AudioRecord unable to be built");
+        } catch (IllegalStateException e) {
+            Log.w(TAG, "Compressed AudioRecord unable to be started");
+        } finally {
+            if (audioRecord != null) {
+                audioRecord.release();
+            }
+        }
+    }
 }
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/AudioTrackTest.java b/tests/tests/media/audio/src/android/media/audio/cts/AudioTrackTest.java
index bcc48a9..4575fdd 100644
--- a/tests/tests/media/audio/src/android/media/audio/cts/AudioTrackTest.java
+++ b/tests/tests/media/audio/src/android/media/audio/cts/AudioTrackTest.java
@@ -1580,19 +1580,27 @@
     }
 
     @Test
-    public void testPlayStaticData() throws Exception {
+    public void testPlayStaticByteArray() throws Exception {
+        doTestPlayStaticData("testPlayStaticByteArray", AudioFormat.ENCODING_PCM_8BIT);
+    }
+
+    @Test
+    public void testPlayStaticShortArray() throws Exception {
+        doTestPlayStaticData("testPlayStaticShortArray", AudioFormat.ENCODING_PCM_16BIT);
+    }
+
+    @Test
+    public void testPlayStaticFloatArray() throws Exception {
+        doTestPlayStaticData("testPlayStaticFloatArray", AudioFormat.ENCODING_PCM_FLOAT);
+    }
+
+    private void doTestPlayStaticData(String testName, int testFormat) throws Exception {
         if (!hasAudioOutput()) {
             Log.w(TAG,"AUDIO_OUTPUT feature not found. This system might not have a valid "
                     + "audio output HAL");
             return;
         }
         // constants for test
-        final String TEST_NAME = "testPlayStaticData";
-        final int TEST_FORMAT_ARRAY[] = {  // 6 chirps repeated (TEST_LOOPS+1) times, 3 times
-                AudioFormat.ENCODING_PCM_8BIT,
-                AudioFormat.ENCODING_PCM_16BIT,
-                AudioFormat.ENCODING_PCM_FLOAT,
-        };
         final int TEST_SR_ARRAY[] = {
                 12055, // Note multichannel tracks will sound very short at low sample rates
                 48000,
@@ -1613,16 +1621,15 @@
         // 200 ms less for low latency devices.
         final long WAIT_TIME_MS = isLowLatencyDevice() ? WAIT_MSEC : 500;
 
-        for (int TEST_FORMAT : TEST_FORMAT_ARRAY) {
-            double frequency = 400; // frequency changes for each test
-            for (int TEST_SR : TEST_SR_ARRAY) {
-                for (int TEST_CONF : TEST_CONF_ARRAY) {
-                    playOnceStaticData(TEST_NAME, TEST_MODE, TEST_STREAM_TYPE, TEST_SWEEP,
-                            TEST_LOOPS, TEST_FORMAT, frequency, TEST_SR, TEST_CONF, WAIT_TIME_MS,
-                            TEST_LOOP_DURATION, TEST_ADDITIONAL_DRAIN_MS);
+        double frequency = 400; // frequency changes for each test
+        for (int testSampleRate : TEST_SR_ARRAY) {
+            for (int testChannelConfiguration : TEST_CONF_ARRAY) {
+                playOnceStaticData(testName, TEST_MODE, TEST_STREAM_TYPE, TEST_SWEEP,
+                        TEST_LOOPS, testFormat, frequency, testSampleRate,
+                        testChannelConfiguration, WAIT_TIME_MS,
+                        TEST_LOOP_DURATION, TEST_ADDITIONAL_DRAIN_MS);
 
-                    frequency += 70; // increment test tone frequency
-                }
+                frequency += 70; // increment test tone frequency
             }
         }
     }
@@ -1726,14 +1733,22 @@
     }
 
     @Test
-    public void testPlayStreamData() throws Exception {
+    public void testPlayStreamByteArray() throws Exception {
+        doTestPlayStreamData("testPlayStreamByteArray", AudioFormat.ENCODING_PCM_8BIT);
+    }
+
+    @Test
+    public void testPlayStreamShortArray() throws Exception {
+        doTestPlayStreamData("testPlayStreamShortArray", AudioFormat.ENCODING_PCM_16BIT);
+    }
+
+    @Test
+    public void testPlayStreamFloatArray() throws Exception {
+        doTestPlayStreamData("testPlayStreamFloatArray", AudioFormat.ENCODING_PCM_FLOAT);
+    }
+
+    private void doTestPlayStreamData(String testName, int testFormat) throws Exception {
         // constants for test
-        final String TEST_NAME = "testPlayStreamData";
-        final int TEST_FORMAT_ARRAY[] = {  // should hear 40 increasing frequency tones, 3 times
-                AudioFormat.ENCODING_PCM_8BIT,
-                AudioFormat.ENCODING_PCM_16BIT,
-                AudioFormat.ENCODING_PCM_FLOAT,
-        };
         // due to downmixer algorithmic latency, source channels greater than 2 may
         // sound shorter in duration at 4kHz sampling rate.
         final int TEST_SR_ARRAY[] = {
@@ -1758,15 +1773,14 @@
         final float TEST_SWEEP = 0; // sine wave only
         final boolean TEST_IS_LOW_RAM_DEVICE = isLowRamDevice();
 
-        for (int TEST_FORMAT : TEST_FORMAT_ARRAY) {
-            double frequency = 400; // frequency changes for each test
-            for (int TEST_SR : TEST_SR_ARRAY) {
-                for (int TEST_CONF : TEST_CONF_ARRAY) {
-                    playOnceStreamData(TEST_NAME, TEST_MODE, TEST_STREAM_TYPE, TEST_SWEEP,
-                            TEST_IS_LOW_RAM_DEVICE, TEST_FORMAT, frequency, TEST_SR, TEST_CONF,
-                            WAIT_MSEC, 0 /* mask */);
-                    frequency += 50; // increment test tone frequency
-                }
+        double frequency = 400; // frequency changes for each test
+        for (int testSampleRate : TEST_SR_ARRAY) {
+            for (int testChannelConfiguration : TEST_CONF_ARRAY) {
+                playOnceStreamData(testName, TEST_MODE, TEST_STREAM_TYPE, TEST_SWEEP,
+                        TEST_IS_LOW_RAM_DEVICE, testFormat, frequency,
+                        testSampleRate, testChannelConfiguration,
+                        WAIT_MSEC, 0 /* mask */);
+                frequency += 50; // increment test tone frequency
             }
         }
     }
@@ -1794,7 +1808,7 @@
         assertEquals(testName, channelCount, format.getChannelCount());
         assertEquals(testName, testFormat, format.getEncoding());
         // duration of test tones
-        final int frames = AudioHelper.frameCountFromMsec(500 /* ms */, format);
+        final int frames = AudioHelper.frameCountFromMsec(300 /* ms */, format);
         final int sourceSamples = channelCount * frames;
         final double frequency = testFrequency / channelCount;
 
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/CallAudioInterceptionTest.java b/tests/tests/media/audio/src/android/media/audio/cts/CallAudioInterceptionTest.java
new file mode 100644
index 0000000..af4dc75
--- /dev/null
+++ b/tests/tests/media/audio/src/android/media/audio/cts/CallAudioInterceptionTest.java
@@ -0,0 +1,314 @@
+/*
+ * Copyright (C) 2021 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 android.media.audio.cts;
+
+import static org.junit.Assert.*;
+import static org.junit.Assume.assumeTrue;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioRecord;
+import android.media.AudioTrack;
+import android.platform.test.annotations.AppModeFull;
+// TODO: b/189472651 uncomment when TM version code is published
+//  import android.os.Build;
+import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+// TODO: b/189472651 uncomment when TM version code is published
+//  import com.android.compatibility.common.util.ApiLevelUtil;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Class to exercise AudioManager.getDevicesForAttributes()
+ */
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = "Instant apps cannot hold android.permission.CALL_AUDIO_INTERCEPTION")
+public class CallAudioInterceptionTest {
+    private static final String TAG = CallAudioInterceptionTest.class.getSimpleName();
+    private static final int SET_MODE_DELAY_MS = 300;
+
+    private AudioManager mAudioManager;
+
+    /** Test setup */
+    @Before
+    public void setUp() throws Exception {
+        Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
+
+        mAudioManager = context.getSystemService(AudioManager.class);
+        mAudioManager.setMode(AudioManager.MODE_NORMAL);
+
+        InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation()
+                .adoptShellPermissionIdentity(Manifest.permission.CALL_AUDIO_INTERCEPTION,
+                        Manifest.permission.MODIFY_PHONE_STATE);
+
+        assumeTrue(context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEPHONY));
+    }
+
+    /** Test teardown */
+    @After
+    public void tearDown() {
+        mAudioManager.setMode(AudioManager.MODE_NORMAL);
+        InstrumentationRegistry.getInstrumentation()
+              .getUiAutomation()
+              .dropShellPermissionIdentity();
+    }
+
+    /**
+     * Test AudioManager.isPstnCallAudioInterceptable() API is implemented
+     */
+    @Test
+    public void testIsIsPstnCallAudioInterceptable() throws Exception {
+        skipIfCallredirectNotAvailable();
+
+        try {
+            boolean result = mAudioManager.isPstnCallAudioInterceptable();
+            Log.i(TAG, "isPstnCallAudioInterceptable: " + result);
+        } catch (Exception e) {
+            fail("isPstnCallAudioInterceptable() exception: " + e);
+        }
+    }
+
+    /**
+     * Test AudioManager.getCallUplinkInjectionAudioTrack() fails when success conditions are
+     * not met.
+     */
+    @Test
+    public void testGetCallUplinkInjectionAudioTrackFail() throws Exception {
+        skipIfCallredirectNotAvailable();
+
+        try {
+            AudioTrack track = mAudioManager.getCallUplinkInjectionAudioTrack(null);
+            fail("getCallUplinkInjectionAudioTrack should throw NullPointerException");
+        } catch (NullPointerException e) {
+        }
+        AudioFormat format = new AudioFormat.Builder().setSampleRate(16000)
+                .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                .setChannelMask(AudioFormat.CHANNEL_OUT_MONO).build();
+        setAudioMode(AudioManager.MODE_NORMAL);
+        try {
+            AudioTrack track = mAudioManager.getCallUplinkInjectionAudioTrack(format);
+            fail("getCallUplinkInjectionAudioTrack should throw IllegalStateException "
+                    + "in mode NORMAL");
+        } catch (IllegalStateException e) {
+        }
+
+        if (setAudioMode(AudioManager.MODE_IN_CALL)) {
+            try {
+                AudioTrack track = mAudioManager.getCallUplinkInjectionAudioTrack(format);
+                if (!mAudioManager.isPstnCallAudioInterceptable()) {
+                    fail("getCallUplinkInjectionAudioTrack should throw"
+                            + "UnsupportedOperationException in mode IN_CALL");
+                }
+            } catch (UnsupportedOperationException e) {
+                if (mAudioManager.isPstnCallAudioInterceptable()) {
+                    fail("getCallUplinkInjectionAudioTrack should not throw"
+                            + "UnsupportedOperationException in mode IN_CALL");
+                }
+            }
+        } else {
+            Log.i(TAG, "Cannot set mode to MODE_IN_CALL");
+        }
+
+        if (setAudioMode(AudioManager.MODE_IN_COMMUNICATION)) {
+            try {
+                format = new AudioFormat.Builder().setSampleRate(96000)
+                        .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                        .setChannelMask(AudioFormat.CHANNEL_OUT_MONO).build();
+                AudioTrack track = mAudioManager.getCallUplinkInjectionAudioTrack(format);
+                fail("getCallUplinkInjectionAudioTrack should throw"
+                        + "UnsupportedOperationException for 96000Hz");
+                format = new AudioFormat.Builder().setSampleRate(16000)
+                        .setEncoding(AudioFormat.ENCODING_MP3)
+                        .setChannelMask(AudioFormat.CHANNEL_OUT_MONO).build();
+                track = mAudioManager.getCallUplinkInjectionAudioTrack(format);
+                fail("getCallUplinkInjectionAudioTrack should throw"
+                        + "UnsupportedOperationException for MP3 encoding");
+                format = new AudioFormat.Builder().setSampleRate(16000)
+                        .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                        .setChannelMask(AudioFormat.CHANNEL_OUT_5POINT1).build();
+                track = mAudioManager.getCallUplinkInjectionAudioTrack(format);
+                fail("getCallUplinkInjectionAudioTrack should throw"
+                        + "UnsupportedOperationException for 5.1 channels");
+            } catch (UnsupportedOperationException e) {
+            }
+        } else {
+            Log.i(TAG, "Cannot set mode to MODE_IN_COMMUNICATION");
+        }
+    }
+
+    /**
+     * Test AudioManager.getCallUplinkInjectionAudioTrack() succeeds when success conditions are
+     * met.
+     */
+    @Test
+    public void testGetCallUplinkInjectionAudioTrackSuccess() throws Exception {
+        skipIfCallredirectNotAvailable();
+
+        AudioFormat format = new AudioFormat.Builder().setSampleRate(16000)
+                .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                .setChannelMask(AudioFormat.CHANNEL_OUT_MONO).build();
+        final int[] TEST_MODES = new int[] { AudioManager.MODE_IN_CALL,
+                AudioManager.MODE_IN_COMMUNICATION,
+                AudioManager.MODE_CALL_REDIRECT,
+                AudioManager.MODE_COMMUNICATION_REDIRECT
+        };
+
+        for (int mode : TEST_MODES) {
+            if (setAudioMode(mode)) {
+                if ((mode != AudioManager.MODE_IN_CALL && mode != AudioManager.MODE_CALL_REDIRECT)
+                        || mAudioManager.isPstnCallAudioInterceptable()) {
+                    try {
+                        Log.i(TAG, "testing mode: " + mode);
+                        AudioTrack track = mAudioManager.getCallUplinkInjectionAudioTrack(format);
+                    } catch (Exception e) {
+                        fail("getCallUplinkInjectionAudioTrack should not throw " + e);
+                    }
+                }
+            } else {
+                Log.i(TAG, "Cannot set mode to: " + mode);
+            }
+        }
+    }
+
+    /**
+     * Test AudioManager.getCallDownlinkExtractionAudioRecord() fails when success conditions are
+     * not met.
+     */
+    @Test
+    public void testGetCallDownlinkExtractionAudioRecordFail() throws Exception {
+        skipIfCallredirectNotAvailable();
+
+        try {
+            AudioRecord record = mAudioManager.getCallDownlinkExtractionAudioRecord(null);
+            fail("getCallDownlinkExtractionAudioRecord should throw NullPointerException");
+        } catch (NullPointerException e) {
+        }
+        AudioFormat format = new AudioFormat.Builder().setSampleRate(16000)
+                .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                .setChannelMask(AudioFormat.CHANNEL_IN_MONO).build();
+        setAudioMode(AudioManager.MODE_NORMAL);
+        try {
+            AudioRecord record = mAudioManager.getCallDownlinkExtractionAudioRecord(format);
+            fail("getCallDownlinkExtractionAudioRecord should throw IllegalStateException "
+                    + "in mode NORMAL");
+        } catch (IllegalStateException e) {
+        }
+
+        if (setAudioMode(AudioManager.MODE_IN_CALL)) {
+            try {
+                AudioRecord record = mAudioManager.getCallDownlinkExtractionAudioRecord(format);
+                if (!mAudioManager.isPstnCallAudioInterceptable()) {
+                    fail("getCallDownlinkExtractionAudioRecord should throw"
+                            + "UnsupportedOperationException in mode IN_CALL");
+                }
+            } catch (UnsupportedOperationException e) {
+                if (mAudioManager.isPstnCallAudioInterceptable()) {
+                    fail("getCallDownlinkExtractionAudioRecord should not throw"
+                            + " UnsupportedOperationException in mode IN_CALL: " + e);
+                }
+            }
+        } else {
+            Log.i(TAG, "Cannot set mode to MODE_IN_CALL");
+        }
+        if (setAudioMode(AudioManager.MODE_IN_COMMUNICATION)) {
+            try {
+                format = new AudioFormat.Builder().setSampleRate(96000)
+                        .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                        .setChannelMask(AudioFormat.CHANNEL_IN_MONO).build();
+                AudioRecord record = mAudioManager.getCallDownlinkExtractionAudioRecord(format);
+                fail("getCallDownlinkExtractionAudioRecord should throw"
+                        + "UnsupportedOperationException for 96000Hz");
+                format = new AudioFormat.Builder().setSampleRate(16000)
+                        .setEncoding(AudioFormat.ENCODING_MP3)
+                        .setChannelMask(AudioFormat.CHANNEL_IN_MONO).build();
+                record = mAudioManager.getCallDownlinkExtractionAudioRecord(format);
+                fail("getCallDownlinkExtractionAudioRecord should throw"
+                        + "UnsupportedOperationException for MP3 encoding");
+                format = new AudioFormat.Builder().setSampleRate(16000)
+                        .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                        .setChannelMask(AudioFormat.CHANNEL_IN_5POINT1).build();
+                record = mAudioManager.getCallDownlinkExtractionAudioRecord(format);
+                fail("getCallDownlinkExtractionAudioRecord should throw"
+                        + "UnsupportedOperationException for 5.1 channels");
+            } catch (UnsupportedOperationException e) {
+            }
+        } else {
+            Log.i(TAG, "Cannot set mode to MODE_IN_COMMUNICATION");
+        }
+    }
+
+    /**
+     * Test AudioManager.getCallDownlinkExtractionAudioRecord() succeeds when success conditions are
+     * met.
+     */
+    @Test
+    public void testGetCallDownlinkExtractionAudioRecordSuccess() throws Exception {
+        skipIfCallredirectNotAvailable();
+
+        AudioFormat format = new AudioFormat.Builder().setSampleRate(16000)
+                .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                .setChannelMask(AudioFormat.CHANNEL_IN_MONO).build();
+        final int[] TEST_MODES = new int[] { AudioManager.MODE_IN_CALL,
+                AudioManager.MODE_IN_COMMUNICATION,
+                AudioManager.MODE_CALL_REDIRECT,
+                AudioManager.MODE_COMMUNICATION_REDIRECT
+        };
+
+        for (int mode : TEST_MODES) {
+            if (setAudioMode(mode)) {
+                if ((mode != AudioManager.MODE_IN_CALL && mode != AudioManager.MODE_CALL_REDIRECT)
+                        || mAudioManager.isPstnCallAudioInterceptable()) {
+                    try {
+                        AudioRecord record =
+                                mAudioManager.getCallDownlinkExtractionAudioRecord(format);
+                    } catch (Exception e) {
+                        fail("getCallDownlinkExtractionAudioRecord should not throw " + e);
+                    }
+                }
+            } else {
+                Log.i(TAG, "Cannot set mode to: " + mode);
+            }
+        }
+    }
+
+    private boolean setAudioMode(int mode) {
+        mAudioManager.setMode(mode);
+        try {
+            Thread.sleep(SET_MODE_DELAY_MS);
+        } catch (InterruptedException e) {
+
+        }
+        return mAudioManager.getMode() == mode;
+    }
+
+    private void skipIfCallredirectNotAvailable() {
+// TODO: b/189472651 uncomment when TM version code is published
+//        assumeTrue(" Call redirection not available",
+//                ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU));
+    }
+}
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/DirectAudioProfilesForAttributesTest.kt b/tests/tests/media/audio/src/android/media/audio/cts/DirectAudioProfilesForAttributesTest.kt
new file mode 100644
index 0000000..a2ecbb4
--- /dev/null
+++ b/tests/tests/media/audio/src/android/media/audio/cts/DirectAudioProfilesForAttributesTest.kt
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2022 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 android.media.audio.cts
+
+import android.content.pm.PackageManager
+import android.media.AudioAttributes
+import android.media.AudioFormat
+import android.media.AudioManager
+import android.media.AudioProfile
+import android.media.AudioTrack
+import android.media.cts.NonMediaMainlineTest
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.fail
+import org.junit.Assume.assumeTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@NonMediaMainlineTest
+@RunWith(AndroidJUnit4::class)
+class DirectAudioProfilesForAttributesTest {
+
+    private lateinit var audioManager: AudioManager
+
+    @Before
+    fun setup() {
+        val context = InstrumentationRegistry.getInstrumentation().context
+        assumeTrue(
+            context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUDIO_OUTPUT)
+        )
+
+        audioManager = context.getSystemService(AudioManager::class.java)
+    }
+
+    /**
+     * Test that only AudioProfiles returned in getDirectProfilesForAttributes can create direct
+     * AudioTracks
+     */
+    @Test
+    fun testCreateDirectAudioTracksOnlyForGetDirectProfilesForAttributes() {
+        for (usage in AudioAttributes.getSdkUsages()) {
+            val audioAttributes = AudioAttributes.Builder()
+                .setUsage(usage)
+                .build()
+            val allProfilesForAttributes =
+                audioManager.getAudioDevicesForAttributes(audioAttributes).map { it.audioProfiles }
+                    .flatten()
+            val directProfiles = audioManager.getDirectProfilesForAttributes(audioAttributes)
+            val nonDirectProfiles = allProfilesForAttributes.subtractAll(directProfiles)
+
+            // All compressed format (non pcm) profiles can create direct AudioTracks.
+            // getDirectProfilesForAttributes does not include profiles supporting
+            // compressed playback in offload mode, so it is expected that all creation
+            // succeeds even if the audio track is not explicitly created in offload mode.
+            val compressedProfiles = directProfiles.filterOutPcmFormats()
+            for (directProfile in compressedProfiles) {
+                checkCreateAudioTracks(audioAttributes, directProfile, true)
+            }
+
+            // Any other available but not returned compressed format profile
+            // can't create any direct AudioTrack
+            val otherCompressedProfiles = nonDirectProfiles.filterOutPcmFormats()
+            for (nonDirectProfile in otherCompressedProfiles) {
+                checkCreateAudioTracks(audioAttributes, nonDirectProfile, false)
+            }
+        }
+    }
+
+    // Returns true if all the AudioTracks with all combinations of parameters that can be derived
+    // from the passed audio profile can be created with the expected result.
+    // Doesn't start the tracks.
+    private fun checkCreateAudioTracks(
+        audioAttributes: AudioAttributes,
+        audioProfile: AudioProfile,
+        expectedCreationSuccess: Boolean
+    ) {
+        for (audioFormat in audioProfile.getAllAudioFormats()) {
+            try {
+                AudioTrack.Builder()
+                    .setAudioAttributes(audioAttributes)
+                    .setAudioFormat(audioFormat)
+                    .build()
+                    .release()
+                // allow a short time to free the AudioTrack resources
+                Thread.sleep(150)
+                if (!expectedCreationSuccess) {
+                    fail(
+                        "Created AudioTrack for attributes ($audioAttributes) and " +
+                                "audio format ($audioFormat)!"
+                    )
+                }
+            } catch (e: Exception) {
+                if (expectedCreationSuccess) {
+                    fail(
+                        "Failed to create AudioTrack for attributes ($audioAttributes) and " +
+                                "audio format ($audioFormat) with exception ($e)!"
+                    )
+                }
+            }
+        }
+    }
+
+    // Utils
+    private fun AudioProfile.isSame(profile: AudioProfile) =
+        format == profile.format &&
+                encapsulationType == profile.encapsulationType &&
+                sampleRates.contentEquals(profile.sampleRates) &&
+                channelMasks.contentEquals(profile.channelMasks) &&
+                channelIndexMasks.contentEquals(profile.channelIndexMasks)
+
+    private fun AudioProfile.getAllAudioFormats() =
+        sampleRates.map { sampleRate ->
+            channelMasks.map { channelMask ->
+                AudioFormat.Builder()
+                    .setEncoding(format)
+                    .setSampleRate(sampleRate)
+                    .setChannelMask(channelMask)
+                    .build()
+            }.plus(
+                channelIndexMasks.map { channelIndexMask ->
+                    AudioFormat.Builder()
+                        .setEncoding(format)
+                        .setSampleRate(sampleRate)
+                        .setChannelIndexMask(channelIndexMask)
+                        .build()
+                }
+            )
+        }.flatten()
+
+    private fun List<AudioProfile>.subtractAll(elements: List<AudioProfile>) =
+        filter { profile -> elements.none { it.isSame(profile) } }
+
+    private fun List<AudioProfile>.includesAll(elements: List<AudioProfile>) =
+        elements.all { profile -> this@includesAll.any { it.isSame(profile) } }
+
+    private fun List<AudioProfile>.filterOutPcmFormats() = filter { it.format !in pcmFormats }
+
+    companion object {
+        private val pcmFormats = listOf(
+            AudioFormat.ENCODING_PCM_8BIT,
+            AudioFormat.ENCODING_PCM_16BIT,
+            AudioFormat.ENCODING_PCM_FLOAT,
+            AudioFormat.ENCODING_PCM_24BIT_PACKED,
+            AudioFormat.ENCODING_PCM_32BIT
+        )
+    }
+}
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/MidiSoloTest.java b/tests/tests/media/audio/src/android/media/audio/cts/MidiSoloTest.java
index 95b1b78..187fda4 100644
--- a/tests/tests/media/audio/src/android/media/audio/cts/MidiSoloTest.java
+++ b/tests/tests/media/audio/src/android/media/audio/cts/MidiSoloTest.java
@@ -16,25 +16,21 @@
 
 package android.media.audio.cts;
 
-import android.platform.test.annotations.AppModeFull;
-import java.io.IOException;
-
-
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.media.midi.MidiDevice;
-import android.media.midi.MidiDevice.MidiConnection;
 import android.media.midi.MidiDeviceInfo;
-import android.media.midi.MidiDeviceStatus;
-import android.media.midi.MidiInputPort;
 import android.media.midi.MidiManager;
 import android.media.midi.MidiReceiver;
-import android.media.midi.MidiSender;
 import android.os.Handler;
 import android.os.Looper;
+import android.platform.test.annotations.AppModeFull;
 
 import com.android.compatibility.common.util.CtsAndroidTestCase;
 
+import java.io.IOException;
+import java.util.Collection;
+import java.util.concurrent.Executor;
+
 /**
  * Test MIDI when there may be no MIDI devices available. There is not much we
  * can test without a device.
@@ -96,6 +92,12 @@
 
         MidiDeviceInfo[] infos = midiManager.getDevices();
         assertTrue("Device list was null.", infos != null);
+        Collection<MidiDeviceInfo> legacyDeviceInfos = midiManager.getDevicesForTransport(
+                MidiManager.TRANSPORT_MIDI_BYTE_STREAM);
+        assertTrue("Legacy Device list was null.", legacyDeviceInfos != null);
+        Collection<MidiDeviceInfo> universalDeviceInfos = midiManager.getDevicesForTransport(
+                MidiManager.TRANSPORT_UNIVERSAL_MIDI_PACKETS);
+        assertTrue("Universal Device list was null.", universalDeviceInfos != null);
 
         MidiManager.DeviceCallback callback = new MidiManager.DeviceCallback();
 
@@ -105,6 +107,14 @@
         midiManager.unregisterDeviceCallback(callback);
         midiManager.registerDeviceCallback(callback, new Handler(Looper.getMainLooper()));
         midiManager.registerDeviceCallback(callback, new Handler(Looper.getMainLooper()));
+        final Handler handler = new Handler(Looper.getMainLooper());
+        final Executor executor = handler::post;
+        midiManager.registerDeviceCallback(MidiManager.TRANSPORT_MIDI_BYTE_STREAM,
+                executor, callback);
+        midiManager.registerDeviceCallback(MidiManager.TRANSPORT_UNIVERSAL_MIDI_PACKETS,
+                executor, callback);
+        midiManager.unregisterDeviceCallback(callback);
+        midiManager.unregisterDeviceCallback(callback);
         midiManager.unregisterDeviceCallback(callback);
         midiManager.unregisterDeviceCallback(callback);
         midiManager.unregisterDeviceCallback(callback);
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/RingtoneManagerTest.java b/tests/tests/media/audio/src/android/media/audio/cts/RingtoneManagerTest.java
index a2235ad..f130a7c 100644
--- a/tests/tests/media/audio/src/android/media/audio/cts/RingtoneManagerTest.java
+++ b/tests/tests/media/audio/src/android/media/audio/cts/RingtoneManagerTest.java
@@ -15,15 +15,11 @@
  */
 package android.media.audio.cts;
 
-import android.app.ActivityManager;
-import android.content.ContentResolver;
-import android.content.res.AssetFileDescriptor;
-import android.media.audio.cts.R;
-
-import android.app.Activity;
 import android.app.Instrumentation;
+import android.content.ContentResolver;
 import android.content.Context;
 import android.content.pm.PackageManager;
+import android.content.res.AssetFileDescriptor;
 import android.database.Cursor;
 import android.media.AudioManager;
 import android.media.Ringtone;
@@ -33,7 +29,6 @@
 import android.platform.test.annotations.AppModeFull;
 import android.provider.Settings;
 import android.test.ActivityInstrumentationTestCase2;
-import android.util.Log;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -219,5 +214,9 @@
                 mContext.getPackageName() + "/raw/";
         assertTrue(RingtoneManager.hasHapticChannels(Uri.parse(uriPrefix + "a_4_haptic")));
         assertFalse(RingtoneManager.hasHapticChannels(Uri.parse(uriPrefix + "a_4")));
+
+        assertTrue(RingtoneManager.hasHapticChannels(
+                mContext, Uri.parse(uriPrefix + "a_4_haptic")));
+        assertFalse(RingtoneManager.hasHapticChannels(mContext, Uri.parse(uriPrefix + "a_4")));
     }
 }
diff --git a/tests/tests/media/audio/src/android/media/audio/cts/SpatializerTest.java b/tests/tests/media/audio/src/android/media/audio/cts/SpatializerTest.java
index a304882..ea56aa5 100644
--- a/tests/tests/media/audio/src/android/media/audio/cts/SpatializerTest.java
+++ b/tests/tests/media/audio/src/android/media/audio/cts/SpatializerTest.java
@@ -90,6 +90,18 @@
         assertThrows("Able to call getCompatibleAudioDevice without permission",
                 SecurityException.class,
                 () -> spat.getCompatibleAudioDevices());
+        assertThrows("Able to call isAvailableForDevice without permission",
+                SecurityException.class,
+                () -> spat.isAvailableForDevice(device));
+        assertThrows("Able to call hasHeadTracker without permission",
+                SecurityException.class,
+                () -> spat.hasHeadTracker(device));
+        assertThrows("Able to call setHeadTrackerEnabled without permission",
+                SecurityException.class,
+                () -> spat.setHeadTrackerEnabled(true, device));
+        assertThrows("Able to call isHeadTrackerEnabled without permission",
+                SecurityException.class,
+                () -> spat.isHeadTrackerEnabled(device));
 
         // try again with permission, then add a device and remove it
         getInstrumentation().getUiAutomation()
@@ -98,6 +110,13 @@
         List<AudioDeviceAttributes> compatDevices = spat.getCompatibleAudioDevices();
         assertTrue("added device not in list of compatible devices",
                 compatDevices.contains(device));
+        assertTrue("compatible device should be available", spat.isAvailableForDevice(device));
+        if (spat.hasHeadTracker(device)) {
+            spat.setHeadTrackerEnabled(true, device);
+            assertTrue("head tracker not found enabled", spat.isHeadTrackerEnabled(device));
+            spat.setHeadTrackerEnabled(false, device);
+            assertFalse("head tracker not found disabled", spat.isHeadTrackerEnabled(device));
+        }
         spat.removeCompatibleAudioDevice(device);
         compatDevices = spat.getCompatibleAudioDevices();
         assertFalse("removed device still in list of compatible devices",
@@ -388,6 +407,57 @@
                 !spatEnabled, enabled.booleanValue());
     }
 
+    public void testHeadTrackerAvailable() throws Exception {
+        Spatializer spat = mAudioManager.getSpatializer();
+        if (spat.getImmersiveAudioLevel() == Spatializer.SPATIALIZER_IMMERSIVE_LEVEL_NONE) {
+            Log.i(TAG, "skipping testHeadTrackerAvailable, no Spatializer");
+            return;
+        }
+        final MyHeadTrackerAvailable htAvailableListener = new MyHeadTrackerAvailable();
+
+        assertThrows("null Executor allowed in addOnHeadTrackerAvailableListener",
+                IllegalArgumentException.class,
+                () -> spat.addOnHeadTrackerAvailableListener(null, htAvailableListener));
+        assertThrows("null listener allowed in addOnHeadTrackerAvailableListener",
+                IllegalArgumentException.class,
+                () -> spat.addOnHeadTrackerAvailableListener(Executors.newSingleThreadExecutor(),
+                        null));
+        final boolean enabled = spat.isEnabled();
+        // verify that with spatializer disabled, the head tracker is not available
+        if (!enabled) {
+            // spatializer not enabled
+            assertFalse("head tracker available despite spatializer disabled",
+                    spat.isHeadTrackerAvailable());
+        } else {
+            final MySpatStateListener stateListener = new MySpatStateListener();
+            spat.addOnSpatializerStateChangedListener(Executors.newSingleThreadExecutor(),
+                    stateListener);
+            // now disable the effect and check head tracker availability
+            getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
+                    "android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS");
+            spat.setEnabled(false);
+            getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
+            assertFalse("spatializer state listener not notified after disabling",
+                    stateListener.getEnabled());
+            assertFalse("head tracker available despite spatializer disabled",
+                    spat.isHeadTrackerAvailable());
+            // reset state and wait until done
+            getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
+                    "android.permission.MODIFY_DEFAULT_AUDIO_EFFECTS");
+            spat.setEnabled(true);
+            getInstrumentation().getUiAutomation().dropShellPermissionIdentity();
+            assertTrue("spatializer state listener not notified after enabling",
+                    stateListener.getEnabled());
+        }
+        assertThrows("null listener allowed in removeOnHeadTrackerAvailableListener",
+                IllegalArgumentException.class,
+                () -> spat.removeOnHeadTrackerAvailableListener(null));
+        spat.removeOnHeadTrackerAvailableListener(htAvailableListener);
+        assertThrows("able to remove listener twice in removeOnHeadTrackerAvailableListener",
+                IllegalArgumentException.class,
+                () -> spat.removeOnHeadTrackerAvailableListener(htAvailableListener));
+    }
+
     static class MySpatStateListener
             implements Spatializer.OnSpatializerStateChangedListener {
 
@@ -457,4 +527,11 @@
             Log.i(TAG, "onHeadToSoundstagePoseUpdated:" + Arrays.toString(pose));
         }
     }
+
+    static class MyHeadTrackerAvailable implements Spatializer.OnHeadTrackerAvailableListener {
+        @Override
+        public void onHeadTrackerAvailableChanged(Spatializer spatializer, boolean available) {
+            Log.i(TAG, "onHeadTrackerAvailable(" + available + ")");
+        }
+    }
 }
diff --git a/tests/tests/media/codec/AndroidManifest.xml b/tests/tests/media/codec/AndroidManifest.xml
index 328929a..c8511dd 100644
--- a/tests/tests/media/codec/AndroidManifest.xml
+++ b/tests/tests/media/codec/AndroidManifest.xml
@@ -38,6 +38,14 @@
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </service>
+
+        <service android:name="android.media.codec.cts.MediaCodecResourceTestLowPriorityService"
+             android:process=":MediaCodecResourceTestLowPriorityProcess">
+        </service>
+        <activity android:name="android.media.codec.cts.MediaCodecResourceTestHighPriorityActivity"
+             android:label="MediaCodecResourceTestHighPriorityActivity"
+             android:process=":MediaCodecResourceTestHighPriorityProcess">
+        </activity>
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
diff --git a/tests/tests/media/codec/res/drawable/icon_black.jpg b/tests/tests/media/codec/res/drawable/icon_black.jpg
new file mode 100644
index 0000000..4c9062a
--- /dev/null
+++ b/tests/tests/media/codec/res/drawable/icon_black.jpg
Binary files differ
diff --git a/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecResourceTest.java b/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecResourceTest.java
new file mode 100644
index 0000000..18fe0b5
--- /dev/null
+++ b/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecResourceTest.java
@@ -0,0 +1,339 @@
+/*
+ * Copyright (C) 2022 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 android.media.codec.cts;
+
+import static android.media.codec.cts.MediaCodecResourceTestHighPriorityActivity.ACTION_HIGH_PRIORITY_ACTIVITY_READY;
+import static android.media.codec.cts.MediaCodecResourceTestLowPriorityService.ACTION_LOW_PRIORITY_SERVICE_READY;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+import android.Manifest;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.media.MediaCodec;
+import android.media.MediaCodec.CodecException;
+import android.media.MediaCodecInfo;
+import android.media.MediaCodecInfo.CodecCapabilities;
+import android.media.MediaCodecInfo.VideoCapabilities;
+import android.media.MediaCodecList;
+import android.media.MediaFormat;
+import android.platform.test.annotations.Presubmit;
+import android.platform.test.annotations.RequiresDevice;
+import android.util.Log;
+
+import androidx.annotation.Nullable;
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+// This class verifies the resource management aspects of MediaCodecs.
+@Presubmit
+@SmallTest
+@RequiresDevice
+public class MediaCodecResourceTest {
+    private static final String TAG = "MediaCodecResourceTest";
+
+    // Codec information that is pertinent to creating codecs for resource management testing.
+    private static class CodecInfo {
+        CodecInfo(String name, int maxSupportedInstances, String mime, MediaFormat mediaFormat) {
+            this.name = name;
+            this.maxSupportedInstances = maxSupportedInstances;
+            this.mime = mime;
+            this.mediaFormat = mediaFormat;
+        }
+        public final String name;
+        public final int maxSupportedInstances;
+        public final String mime;
+        public final MediaFormat mediaFormat;
+    }
+
+    private static class ProcessInfo {
+        ProcessInfo(int pid, int uid) {
+            this.pid = pid;
+            this.uid = uid;
+        }
+        public final int pid;
+        public final int uid;
+    }
+
+    @Test
+    public void testCreateCodecForAnotherProcessWithoutPermissionsThrows() throws Exception {
+        CodecInfo codecInfo = getFirstVideoHardwareDecoder();
+        assumeTrue("No video hardware codec found.", codecInfo != null);
+        ProcessInfo processInfo = createLowPriorityProcess();
+        assertTrue("Unable to retrieve low priority process info.", processInfo != null);
+
+        boolean wasSecurityExceptionThrown = false;
+        try {
+            MediaCodec mediaCodec = MediaCodec.createByCodecNameForClient(codecInfo.name,
+                    processInfo.pid, processInfo.uid);
+            fail("No SecurityException thrown when creating a codec for another process");
+        } catch (SecurityException ex) {
+            // expected
+        }
+    }
+
+    // A process with lower priority (e.g. background app) should not be able to reclaim
+    // MediaCodec resources from a process with higher priority (e.g. foreground app).
+    @Test
+    public void testLowerPriorityProcessFailsToReclaimResources() throws Exception {
+        CodecInfo codecInfo = getFirstVideoHardwareDecoder();
+        assumeTrue("No video hardware codec found.", codecInfo != null);
+        assertTrue("Expected at least one max supported codec instance.",
+                codecInfo.maxSupportedInstances > 0);
+        ProcessInfo lowPriorityProcess = createLowPriorityProcess();
+        assertTrue("Unable to retrieve low priority process info.", lowPriorityProcess != null);
+        ProcessInfo highPriorityProcess = createHighPriorityProcess();
+        assertTrue("Unable to retrieve high priority process info.", highPriorityProcess != null);
+
+        List<MediaCodec> mediaCodecList = new ArrayList<>();
+        try {
+            // This permission is required to create MediaCodecs on behalf of other processes.
+            InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                    .adoptShellPermissionIdentity(Manifest.permission.MEDIA_RESOURCE_OVERRIDE_PID);
+
+            Log.i(TAG, "Creating MediaCodecs on behalf of pid " + highPriorityProcess.pid);
+            // Create more codecs than are supported by the device on behalf of a high-priority
+            // process.
+            boolean wasInitialInsufficientResourcesExceptionThrown = false;
+            for (int i = 0; i <= codecInfo.maxSupportedInstances; ++i) {
+                try {
+                    MediaCodec mediaCodec = MediaCodec.createByCodecNameForClient(codecInfo.name,
+                            highPriorityProcess.pid, highPriorityProcess.uid);
+                    mediaCodecList.add(mediaCodec);
+                    mediaCodec.configure(codecInfo.mediaFormat, /* surface= */ null,
+                            /* crypto= */ null, /* flags= */ 0);
+                    mediaCodec.start();
+                } catch (MediaCodec.CodecException ex) {
+                    if (ex.getErrorCode() == CodecException.ERROR_INSUFFICIENT_RESOURCE) {
+                        Log.i(TAG, "Exception received on MediaCodec #" +  i + ".");
+                        wasInitialInsufficientResourcesExceptionThrown = true;
+                    } else {
+                        Log.e(TAG, "Unexpected exception thrown", ex);
+                        throw ex;
+                    }
+                }
+            }
+            // For the same process, insufficient resources should be thrown.
+            assertTrue(String.format("No MediaCodec.Exception thrown with insufficient"
+                    + " resources after creating too many %d codecs for %s on behalf of the"
+                    + " same process", codecInfo.maxSupportedInstances, codecInfo.name),
+                    wasInitialInsufficientResourcesExceptionThrown);
+
+            Log.i(TAG, "Creating MediaCodecs on behalf of pid " + lowPriorityProcess.pid);
+            // Attempt to create the codec again, but this time, on behalf of a low priority
+            // process.
+            boolean wasLowPriorityInsufficientResourcesExceptionThrown = false;
+            try {
+                MediaCodec mediaCodec = MediaCodec.createByCodecNameForClient(codecInfo.name,
+                        lowPriorityProcess.pid, lowPriorityProcess.uid);
+                mediaCodecList.add(mediaCodec);
+                mediaCodec.configure(codecInfo.mediaFormat, /* surface= */ null, /* crypto= */ null,
+                        /* flags= */ 0);
+                mediaCodec.start();
+            } catch (MediaCodec.CodecException ex) {
+                if (ex.getErrorCode() == CodecException.ERROR_INSUFFICIENT_RESOURCE) {
+                    wasLowPriorityInsufficientResourcesExceptionThrown = true;
+                } else {
+                    Log.e(TAG, "Unexpected exception thrown", ex);
+                    throw ex;
+                }
+            }
+            assertTrue(String.format("No MediaCodec.Exception thrown with insufficient"
+                    + " resources after creating a follow-up codec for %s on behalf of a lower"
+                    + " priority process", codecInfo.mime),
+                    wasLowPriorityInsufficientResourcesExceptionThrown);
+        } finally {
+            Log.i(TAG, "Cleaning up MediaCodecs");
+            for (MediaCodec mediaCodec : mediaCodecList) {
+                mediaCodec.release();
+            }
+            InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                    .dropShellPermissionIdentity();
+        }
+    }
+
+    // A process with higher priority (e.g. foreground app) should be able to reclaim
+    // MediaCodec resources from a process with lower priority (e.g. background app).
+    @Test
+    public void testHigherPriorityProcessReclaimsResources() throws Exception {
+        CodecInfo codecInfo = getFirstVideoHardwareDecoder();
+        assumeTrue("No video hardware codec found.", codecInfo != null);
+        assertTrue("Expected at least one max supported codec instance.",
+                codecInfo.maxSupportedInstances > 0);
+        ProcessInfo lowPriorityProcess = createLowPriorityProcess();
+        assertTrue("Unable to retrieve low priority process info.", lowPriorityProcess != null);
+        ProcessInfo highPriorityProcess = createHighPriorityProcess();
+        assertTrue("Unable to retrieve high priority process info.", highPriorityProcess != null);
+
+        List<MediaCodec> mediaCodecList = new ArrayList<>();
+        try {
+            // This permission is required to create MediaCodecs on behalf of other processes.
+            InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                    .adoptShellPermissionIdentity(Manifest.permission.MEDIA_RESOURCE_OVERRIDE_PID);
+
+            Log.i(TAG, "Creating MediaCodecs on behalf of pid " + lowPriorityProcess.pid);
+            // Create more codecs than are supported by the device on behalf of a low-priority
+            // process.
+            boolean wasInitialInsufficientResourcesExceptionThrown = false;
+            for (int i = 0; i <= codecInfo.maxSupportedInstances; ++i) {
+                try {
+                    MediaCodec mediaCodec = MediaCodec.createByCodecNameForClient(codecInfo.name,
+                            lowPriorityProcess.pid, lowPriorityProcess.uid);
+                    mediaCodecList.add(mediaCodec);
+                    mediaCodec.configure(codecInfo.mediaFormat, /* surface= */ null,
+                            /* crypto= */ null, /* flags= */ 0);
+                    mediaCodec.start();
+                } catch (MediaCodec.CodecException ex) {
+                    if (ex.getErrorCode() == CodecException.ERROR_INSUFFICIENT_RESOURCE) {
+                        Log.i(TAG, "Exception received on MediaCodec #" +  i + ".");
+                        wasInitialInsufficientResourcesExceptionThrown = true;
+                    } else {
+                        Log.e(TAG, "Unexpected exception thrown", ex);
+                        throw ex;
+                    }
+                }
+            }
+            // For the same process, insufficient resources should be thrown.
+            assertTrue(String.format("No MediaCodec.Exception thrown with insufficient"
+                    + " resources after creating too many %d codecs for %s on behalf of the"
+                    + " same process", codecInfo.maxSupportedInstances, codecInfo.mime),
+                    wasInitialInsufficientResourcesExceptionThrown);
+
+            Log.i(TAG, "Creating final MediaCodec on behalf of pid " + highPriorityProcess.pid);
+            // Attempt to create the codec again, but this time, on behalf of a high-priority
+            // process.
+            boolean wasHighPriorityInsufficientResourcesExceptionThrown = false;
+            try {
+                MediaCodec mediaCodec = MediaCodec.createByCodecNameForClient(codecInfo.name,
+                        highPriorityProcess.pid, highPriorityProcess.uid);
+                mediaCodecList.add(mediaCodec);
+                mediaCodec.configure(codecInfo.mediaFormat, /* surface= */ null, /* crypto= */ null,
+                        /* flags= */ 0);
+                mediaCodec.start();
+            } catch (MediaCodec.CodecException ex) {
+                if (ex.getErrorCode() == CodecException.ERROR_INSUFFICIENT_RESOURCE) {
+                    wasHighPriorityInsufficientResourcesExceptionThrown = true;
+                } else {
+                    Log.e(TAG, "Unexpected exception thrown", ex);
+                    throw ex;
+                }
+            }
+            assertFalse(String.format("Resource reclaiming should occur when creating a"
+                    + " follow-up codec for %s on behalf of a higher priority process, but"
+                    + " received an insufficient resource CodecException instead",
+                    codecInfo.mime), wasHighPriorityInsufficientResourcesExceptionThrown);
+        } finally {
+            Log.i(TAG, "Cleaning up MediaCodecs");
+            for (MediaCodec mediaCodec : mediaCodecList) {
+                mediaCodec.release();
+            }
+            InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .dropShellPermissionIdentity();
+        }
+    }
+
+    // Find the first hardware video decoder and create a media format for it.
+    @Nullable
+    private CodecInfo getFirstVideoHardwareDecoder() {
+        MediaCodecList allMediaCodecList = new MediaCodecList(MediaCodecList.ALL_CODECS);
+        for (MediaCodecInfo mediaCodecInfo : allMediaCodecList.getCodecInfos()) {
+            if (mediaCodecInfo.isSoftwareOnly()) {
+                continue;
+            }
+            if (mediaCodecInfo.isEncoder()) {
+                continue;
+            }
+            String mime = mediaCodecInfo.getSupportedTypes()[0];
+            CodecCapabilities codecCapabilities = mediaCodecInfo.getCapabilitiesForType(mime);
+            VideoCapabilities videoCapabilities = codecCapabilities.getVideoCapabilities();
+            if (videoCapabilities != null) {
+                int height = videoCapabilities.getSupportedHeights().getLower();
+                int width = videoCapabilities.getSupportedWidthsFor(height).getLower();
+                MediaFormat mediaFormat = new MediaFormat();
+                mediaFormat.setString(MediaFormat.KEY_MIME, mime);
+                mediaFormat.setInteger(MediaFormat.KEY_HEIGHT, height);
+                mediaFormat.setInteger(MediaFormat.KEY_WIDTH, width);
+                return new CodecInfo(mediaCodecInfo.getName(),
+                        codecCapabilities.getMaxSupportedInstances(), mime, mediaFormat);
+            }
+        }
+        return null;
+    }
+
+    private ProcessInfo createLowPriorityProcess() {
+        Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        ProcessInfoBroadcastReceiver processInfoBroadcastReceiver =
+                new ProcessInfoBroadcastReceiver();
+        context.registerReceiver(processInfoBroadcastReceiver,
+                new IntentFilter(ACTION_LOW_PRIORITY_SERVICE_READY));
+        Intent intent = new Intent(context, MediaCodecResourceTestLowPriorityService.class);
+        context.startForegroundService(intent);
+        // Starting the service and receiving the broadcast should take less than 1 second
+        return processInfoBroadcastReceiver.waitForProcessInfoMs(1000);
+    }
+
+    private ProcessInfo createHighPriorityProcess() {
+        Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        ProcessInfoBroadcastReceiver processInfoBroadcastReceiver =
+                new ProcessInfoBroadcastReceiver();
+        context.registerReceiver(processInfoBroadcastReceiver,
+                new IntentFilter(ACTION_HIGH_PRIORITY_ACTIVITY_READY));
+        Intent intent = new Intent(context, MediaCodecResourceTestHighPriorityActivity.class);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        context.startActivity(intent);
+        // Starting the activity and receiving the broadcast should take less than 1 second
+        return processInfoBroadcastReceiver.waitForProcessInfoMs(1000);
+    }
+
+    private static class ProcessInfoBroadcastReceiver extends BroadcastReceiver {
+        private int mPid = -1;
+        private int mUid = -1;
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            synchronized (this) {
+                mPid = intent.getIntExtra("pid", -1);
+                mUid = intent.getIntExtra("uid", -1);
+                this.notify();
+            }
+        }
+
+        public ProcessInfo waitForProcessInfoMs(int milliseconds) {
+            synchronized (this) {
+                try {
+                    this.wait(milliseconds);
+                } catch (InterruptedException ex) {
+                    return null;
+                }
+            }
+            if (mPid == -1 || mUid == -1) {
+                return null;
+            }
+            return new ProcessInfo(mPid, mUid);
+        }
+    }
+}
diff --git a/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecResourceTestHighPriorityActivity.java b/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecResourceTestHighPriorityActivity.java
new file mode 100644
index 0000000..67ee3df
--- /dev/null
+++ b/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecResourceTestHighPriorityActivity.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2022 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 android.media.codec.cts;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Process;
+
+public class MediaCodecResourceTestHighPriorityActivity extends Activity {
+    public static final String ACTION_HIGH_PRIORITY_ACTIVITY_READY =
+            "android.media.codec.cts.HIGH_PRIORITY_TEST_ACTIVITY_READY";
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        Intent intent = new Intent();
+        intent.setAction(ACTION_HIGH_PRIORITY_ACTIVITY_READY);
+        intent.putExtra("pid", Process.myPid());
+        intent.putExtra("uid", Process.myUid());
+        sendBroadcast(intent);
+    }
+}
diff --git a/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecResourceTestLowPriorityService.java b/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecResourceTestLowPriorityService.java
new file mode 100644
index 0000000..94de9f5
--- /dev/null
+++ b/tests/tests/media/codec/src/android/media/codec/cts/MediaCodecResourceTestLowPriorityService.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2022 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 android.media.codec.cts;
+
+import android.app.Notification;
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.Service;
+import android.content.Intent;
+import android.os.Binder;
+import android.os.IBinder;
+import android.os.Process;
+
+public class MediaCodecResourceTestLowPriorityService extends Service {
+    public static final String ACTION_LOW_PRIORITY_SERVICE_READY =
+            "android.media.codec.cts.LOW_PRIORITY_SERVICE_READY";
+
+    public static final String NOTIFICATION_CHANNEL_ID =
+            "cts/MediaCodecResourceTestLowPriorityService";
+
+    private final IBinder mBinder = new LocalBinder();
+    public class LocalBinder extends Binder {
+        MediaCodecResourceTestLowPriorityService getService() {
+            return MediaCodecResourceTestLowPriorityService.this;
+        }
+    }
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
+    }
+
+    private int mNotificationId = 1;
+
+    @Override
+    public int onStartCommand(Intent otherIntent, int flags, int startId) {
+        Notification notification = showNotification();
+        startForeground(mNotificationId++, notification);
+
+        Intent intent = new Intent();
+        intent.setAction(ACTION_LOW_PRIORITY_SERVICE_READY);
+        intent.putExtra("pid", Process.myPid());
+        intent.putExtra("uid", Process.myUid());
+        sendBroadcast(intent);
+
+        return START_NOT_STICKY;
+    }
+
+    private Notification showNotification() {
+        NotificationManager notificationManager = getSystemService(NotificationManager.class);
+        notificationManager.createNotificationChannel(new NotificationChannel(
+                NOTIFICATION_CHANNEL_ID, NOTIFICATION_CHANNEL_ID,
+                NotificationManager.IMPORTANCE_DEFAULT));
+        return new Notification.Builder(getApplicationContext(), NOTIFICATION_CHANNEL_ID)
+                .setContentTitle("MediaCodecResourceTestLowPriorityService")
+                .setSmallIcon(R.drawable.icon_black)
+                .build();
+    }
+}
diff --git a/tests/tests/media/common/src/android/media/cts/AudioHelper.java b/tests/tests/media/common/src/android/media/cts/AudioHelper.java
index 995acda..a5f61fe 100644
--- a/tests/tests/media/common/src/android/media/cts/AudioHelper.java
+++ b/tests/tests/media/common/src/android/media/cts/AudioHelper.java
@@ -533,7 +533,7 @@
                                 .setBufferSizeInBytes(bufferOutSize)
                                 .build();
                 Assert.assertEquals(AudioTrack.STATE_INITIALIZED, mTrack.getState());
-                mPosition = 0;
+                mTrackPosition = 0;
                 mFinishAtMs = 0;
             }
         }
@@ -545,8 +545,9 @@
                     AudioFormat.ENCODING_PCM_8BIT, getAudioFormat());
             int samples = super.read(audioData, offsetInBytes, sizeInBytes);
             if (mTrack != null) {
-                Assert.assertEquals(samples, mTrack.write(audioData, offsetInBytes, samples));
-                mPosition += samples / mTrack.getChannelCount();
+                final int result = mTrack.write(audioData, offsetInBytes, samples,
+                        AudioTrack.WRITE_NON_BLOCKING);
+                mTrackPosition += result / mTrack.getChannelCount();
             }
             return samples;
         }
@@ -558,9 +559,9 @@
                     AudioFormat.ENCODING_PCM_8BIT, getAudioFormat());
             int samples = super.read(audioData, offsetInBytes, sizeInBytes, readMode);
             if (mTrack != null) {
-                Assert.assertEquals(samples, mTrack.write(audioData, offsetInBytes, samples,
-                        AudioTrack.WRITE_BLOCKING));
-                mPosition += samples / mTrack.getChannelCount();
+                final int result = mTrack.write(audioData, offsetInBytes, samples,
+                        AudioTrack.WRITE_NON_BLOCKING);
+                mTrackPosition += result / mTrack.getChannelCount();
             }
             return samples;
         }
@@ -572,8 +573,9 @@
                     AudioFormat.ENCODING_PCM_16BIT, getAudioFormat());
             int samples = super.read(audioData, offsetInShorts, sizeInShorts);
             if (mTrack != null) {
-                Assert.assertEquals(samples, mTrack.write(audioData, offsetInShorts, samples));
-                mPosition += samples / mTrack.getChannelCount();
+                final int result = mTrack.write(audioData, offsetInShorts, samples,
+                        AudioTrack.WRITE_NON_BLOCKING);
+                mTrackPosition += result / mTrack.getChannelCount();
             }
             return samples;
         }
@@ -585,9 +587,9 @@
                     AudioFormat.ENCODING_PCM_16BIT, getAudioFormat());
             int samples = super.read(audioData, offsetInShorts, sizeInShorts, readMode);
             if (mTrack != null) {
-                Assert.assertEquals(samples, mTrack.write(audioData, offsetInShorts, samples,
-                        AudioTrack.WRITE_BLOCKING));
-                mPosition += samples / mTrack.getChannelCount();
+                final int result = mTrack.write(audioData, offsetInShorts, samples,
+                        AudioTrack.WRITE_NON_BLOCKING);
+                mTrackPosition += result / mTrack.getChannelCount();
             }
             return samples;
         }
@@ -599,9 +601,9 @@
                     AudioFormat.ENCODING_PCM_FLOAT, getAudioFormat());
             int samples = super.read(audioData, offsetInFloats, sizeInFloats, readMode);
             if (mTrack != null) {
-                Assert.assertEquals(samples, mTrack.write(audioData, offsetInFloats, samples,
-                        AudioTrack.WRITE_BLOCKING));
-                mPosition += samples / mTrack.getChannelCount();
+                final int result = mTrack.write(audioData, offsetInFloats, samples,
+                        AudioTrack.WRITE_NON_BLOCKING);
+                mTrackPosition += result / mTrack.getChannelCount();
             }
             return samples;
         }
@@ -615,10 +617,9 @@
                 // which does check position and limit.
                 ByteBuffer copy = audioBuffer.duplicate();
                 copy.position(0).limit(bytes);  // read places data at the start of the buffer.
-                Assert.assertEquals(bytes, mTrack.write(copy, bytes, AudioTrack.WRITE_BLOCKING));
-                mPosition += bytes /
-                        (mTrack.getChannelCount()
-                                * AudioFormat.getBytesPerSample(mTrack.getAudioFormat()));
+                final int result =  mTrack.write(copy, bytes, AudioTrack.WRITE_NON_BLOCKING);
+                mTrackPosition += result / (mTrack.getChannelCount()
+                        * AudioFormat.getBytesPerSample(mTrack.getAudioFormat()));
             }
             return bytes;
         }
@@ -632,10 +633,9 @@
                 // which does check position and limit.
                 ByteBuffer copy = audioBuffer.duplicate();
                 copy.position(0).limit(bytes);  // read places data at the start of the buffer.
-                Assert.assertEquals(bytes, mTrack.write(copy, bytes, AudioTrack.WRITE_BLOCKING));
-                mPosition += bytes /
-                        (mTrack.getChannelCount()
-                                * AudioFormat.getBytesPerSample(mTrack.getAudioFormat()));
+                final int result = mTrack.write(copy, bytes, AudioTrack.WRITE_NON_BLOCKING);
+                mTrackPosition += result / (mTrack.getChannelCount()
+                        * AudioFormat.getBytesPerSample(mTrack.getAudioFormat()));
             }
             return bytes;
         }
@@ -652,11 +652,11 @@
         public void stop() {
             super.stop();
             if (mTrack != null) {
-                if (mPosition > 0) { // stop may be called multiple times.
-                    final int remainingFrames = mPosition - mTrack.getPlaybackHeadPosition();
+                if (mTrackPosition > 0) { // stop may be called multiple times.
+                    final int remainingFrames = mTrackPosition - mTrack.getPlaybackHeadPosition();
                     mFinishAtMs = System.currentTimeMillis()
                             + remainingFrames * 1000 / mTrack.getSampleRate();
-                    mPosition = 0;
+                    mTrackPosition = 0;
                 }
                 mTrack.stop(); // allows remaining data to play out
             }
@@ -681,7 +681,7 @@
 
         public AudioTrack mTrack;
         private final static String TAG = "AudioRecordAudit";
-        private int mPosition;
+        private int mTrackPosition;
         private long mFinishAtMs;
     }
 }
diff --git a/tests/tests/media/common/src/android/media/cts/MediaCodecTunneledPlayer.java b/tests/tests/media/common/src/android/media/cts/MediaCodecTunneledPlayer.java
index a602a13..e0cae51 100644
--- a/tests/tests/media/common/src/android/media/cts/MediaCodecTunneledPlayer.java
+++ b/tests/tests/media/common/src/android/media/cts/MediaCodecTunneledPlayer.java
@@ -670,11 +670,17 @@
 
     /**
      * Resume playback when paused.
+     *
+     * @throws IllegalStateException if playback is not paused or if there is no configured audio
+     *                               track.
      */
     public void resume() {
         Log.d(TAG, "resume");
-        if (mAudioTrackState == null || mState != STATE_PAUSED) {
-            return;
+        if (mAudioTrackState == null) {
+            throw new IllegalStateException("Resuming playback with no audio track");
+        }
+        if (mState != STATE_PAUSED) {
+            throw new IllegalStateException("Expected STATE_PAUSED, got " + mState);
         }
         mAudioTrackState.playAudioTrack();
         mState = STATE_PLAYING;
diff --git a/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTest.java b/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTest.java
index 6cf8802..cf0f9a9 100644
--- a/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTest.java
+++ b/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTest.java
@@ -4329,6 +4329,13 @@
             return;
         }
 
+        // Below are some timings used throughout this test.
+        //
+        // Maximum allowed time between start of playback and first frame displayed
+        final long maxAllowedTimeToFirstFrameMs = 500;
+        // Maximum allowed time between issuing a pause and the last frame being displayed
+        final long maxDrainTimeMs = 200;
+
         // Setup tunnel mode test media player
         AudioManager am = mContext.getSystemService(AudioManager.class);
         mMediaCodecPlayer = new MediaCodecTunneledPlayer(
@@ -4339,35 +4346,50 @@
         mMediaCodecPlayer.setVideoDataSource(mediaUri, null);
         assertTrue("MediaCodecPlayer.start() failed!", mMediaCodecPlayer.start());
         assertTrue("MediaCodecPlayer.prepare() failed!", mMediaCodecPlayer.prepare());
+        // Video peek might interfere with the test: we want to ensure that queuing more data during
+        // a pause does not cause displaying more video frames, which is precisely what video peek
+        // does.
+        mMediaCodecPlayer.setVideoPeek(false);
 
-        // start video playback
+        // Start playback
         mMediaCodecPlayer.startThread();
-        Thread.sleep(100);
-        assertNotEquals("Video playback stalled", CodecState.UNINITIALIZED_TIMESTAMP,
+        Thread.sleep(maxAllowedTimeToFirstFrameMs);
+        assertNotEquals(String.format("No frame displayed after %d ms",
+                        maxAllowedTimeToFirstFrameMs), CodecState.UNINITIALIZED_TIMESTAMP,
                 mMediaCodecPlayer.getCurrentPosition());
+        // Pause playback
         mMediaCodecPlayer.pause();
-        Thread.sleep(50);
+        // Ensure audio and video are in sync. We give some time to the codec to finish displaying
+        // queued images if need be.
+        Thread.sleep(maxDrainTimeMs);
         final long audioPositionUs = mMediaCodecPlayer.getAudioTrackPositionUs();
         final long videoPositionUs = mMediaCodecPlayer.getCurrentPosition();
         assertTrue(String.format("Video pts (%d) is ahead of audio pts (%d)",
                         videoPositionUs, audioPositionUs),
                 videoPositionUs <= audioPositionUs);
+        // Flush the video pipeline
         mMediaCodecPlayer.videoFlush();
-        mMediaCodecPlayer.videoSeekToBeginning(true /* shouldContinuePts */);
-        Thread.sleep(50);
+        // The flush should not cause any frame to be displayed.
+        // Wait for the max startup latency to see if one (incorrectly) arrives.
+        Thread.sleep(maxAllowedTimeToFirstFrameMs);
         assertEquals("Video frame rendered after flush", CodecState.UNINITIALIZED_TIMESTAMP,
                 mMediaCodecPlayer.getCurrentPosition());
         // We queue one frame, but expect it not to be rendered
+        mMediaCodecPlayer.videoSeekToBeginning(true /* shouldContinuePts */);
         Long queuedVideoTimestamp = mMediaCodecPlayer.queueOneVideoFrame();
         assertNotNull("Failed to queue a video frame", queuedVideoTimestamp);
-        Thread.sleep(50); // longer wait to account for buffer manipulation
+        // The enqueued frame should not propagate through the tunnel while we're paused.
+        // Wait for the max startup latency to see if it (incorrectly) arrives.
+        Thread.sleep(maxAllowedTimeToFirstFrameMs);
         assertEquals("Video frame rendered during pause", CodecState.UNINITIALIZED_TIMESTAMP,
                 mMediaCodecPlayer.getCurrentPosition());
+        // Resume playback
         mMediaCodecPlayer.resume();
-        Thread.sleep(100);
+        Thread.sleep(maxAllowedTimeToFirstFrameMs);
         ImmutableList<Long> renderedVideoTimestamps =
                 mMediaCodecPlayer.getRenderedVideoFrameTimestampList();
-        assertFalse("No new video timestamps", renderedVideoTimestamps.isEmpty());
+        assertFalse(String.format("No frame rendered after resume within %d ms",
+                        maxAllowedTimeToFirstFrameMs), renderedVideoTimestamps.isEmpty());
         assertEquals("First rendered video frame does not match first queued video frame",
                 renderedVideoTimestamps.get(0), queuedVideoTimestamp);
         // mMediaCodecPlayer.reset() handled in TearDown();
diff --git a/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTestAacFormat.java b/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTestAacFormat.java
index 7bb5b47..f001cf0 100644
--- a/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTestAacFormat.java
+++ b/tests/tests/media/decoder/src/android/media/decoder/cts/DecoderTestAacFormat.java
@@ -23,11 +23,11 @@
 
 import android.app.Instrumentation;
 import android.content.res.AssetFileDescriptor;
-import android.media.decoder.cts.DecoderTest.AudioParameter;
 import android.media.MediaCodec;
 import android.media.MediaExtractor;
 import android.media.MediaFormat;
 import android.media.cts.Preconditions;
+import android.media.decoder.cts.DecoderTest.AudioParameter;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
 import android.platform.test.annotations.AppModeFull;
@@ -53,6 +53,9 @@
     static final String mInpPrefix = WorkDir.getMediaDirString();
     private static final boolean sIsAndroidRAndAbove =
             ApiLevelUtil.isAtLeast(Build.VERSION_CODES.R);
+    // TODO: replace > Sv2 with >= T once T is assigned.
+    private static final boolean sIsAtLeastT =
+            ApiLevelUtil.isAfter(Build.VERSION_CODES.S_V2);
 
     @Before
     public void setUp() throws Exception {
@@ -81,17 +84,43 @@
                 // verify correct number of channels is observed without downmixing
                 AudioParameter chanParams = new AudioParameter();
                 decodeUpdateFormat(codecName, (String) sample[0] /*resource*/, chanParams,
-                        0 /*no downmix*/);
-                assertEquals("Number of channels differs for codec:" + codecName,
+                        0 /*no downmix*/, "" /*ignored*/);
+                assertEquals("Number of channels differs for codec:" + codecName
+                                +  " with no downmixing",
                         sample[1], chanParams.getNumChannels());
 
                 // verify correct number of channels is observed when downmixing to stereo
-                AudioParameter downmixParams = new AudioParameter();
-                decodeUpdateFormat(codecName, (String) sample[0] /* resource */, downmixParams,
-                        2 /*stereo downmix*/);
-                assertEquals("Number of channels differs for codec:" + codecName,
-                        2, downmixParams.getNumChannels());
+                // - with AAC specific key
+                AudioParameter aacDownmixParams = new AudioParameter();
+                decodeUpdateFormat(codecName, (String) sample[0] /* resource */, aacDownmixParams,
+                        2 /*stereo downmix*/,
+                        MediaFormat.KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT);
+                assertEquals("Number of channels differs for codec:" + codecName
+                                + " when downmixing with KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT",
+                        2, aacDownmixParams.getNumChannels());
 
+                if (sIsAtLeastT) {
+                    // KEY_MAX)OUTPUT_CHANNEL_COUNT introduced in T
+                    // - with codec-agnostic key
+                    AudioParameter downmixParams = new AudioParameter();
+                    decodeUpdateFormat(codecName, (String) sample[0] /* resource */, downmixParams,
+                            2 /*stereo downmix*/,
+                            MediaFormat.KEY_MAX_OUTPUT_CHANNEL_COUNT);
+                    assertEquals("Number of channels differs for codec:" + codecName
+                                    + " when downmixing with KEY_MAX_OUTPUT_CHANNEL_COUNT",
+                            2, downmixParams.getNumChannels());
+
+                    // verify setting value larger than actual channel count behaves like
+                    // no downmixing
+                    AudioParameter bigChanParams = new AudioParameter();
+                    final int tooManyChannels = ((Integer) sample[1]).intValue() + 99;
+                    decodeUpdateFormat(codecName, (String) sample[0] /*resource*/, bigChanParams,
+                            tooManyChannels, MediaFormat.KEY_MAX_OUTPUT_CHANNEL_COUNT);
+                    assertEquals("Number of channels differs for codec:" + codecName
+                                    + " when setting " + tooManyChannels
+                                    + " on KEY_MAX_OUTPUT_CHANNEL_COUNT",
+                            sample[1], bigChanParams.getNumChannels());
+                }
             }
         }
     }
@@ -103,10 +132,13 @@
      * @param audioParams
      * @param downmixChannelCount 0 if no downmix requested,
      *                           positive number for number of channels in requested downmix
+     * @param keyForChannelCountControl the key to use to control decoding when downmixChannelCount
+     *                                  is not 0
      * @throws IOException
      */
     private void decodeUpdateFormat(String decoderName, final String testInput,
-            AudioParameter audioParams, int downmixChannelCount)
+            AudioParameter audioParams, int downmixChannelCount,
+            String keyForChannelCountControl)
             throws IOException
     {
         Preconditions.assertTestFileExists(mInpPrefix + testInput);
@@ -134,8 +166,7 @@
 
         MediaFormat configFormat = format;
         if (downmixChannelCount > 0) {
-            configFormat.setInteger(
-                    MediaFormat.KEY_AAC_MAX_OUTPUT_CHANNEL_COUNT, downmixChannelCount);
+            configFormat.setInteger(keyForChannelCountControl, downmixChannelCount);
         }
 
         Log.v(TAG, "configuring with " + configFormat);
diff --git a/tests/tests/media/drmframework/Android.bp b/tests/tests/media/drmframework/Android.bp
index bad6a07..e7ebf7a 100644
--- a/tests/tests/media/drmframework/Android.bp
+++ b/tests/tests/media/drmframework/Android.bp
@@ -65,6 +65,7 @@
         "mts-media",
     ],
     host_required: ["cts-dynamic-config"],
-    min_sdk_version: "29",
-    target_sdk_version: "31",
+    // TODO(b/208938664) Change this sdk version suppression to T once it's defined to number (33).
+    min_sdk_version: "current",
+    target_sdk_version: "current",
 }
diff --git a/tests/tests/media/drmframework/AndroidTest.xml b/tests/tests/media/drmframework/AndroidTest.xml
index fc7b670..c6e311d 100644
--- a/tests/tests/media/drmframework/AndroidTest.xml
+++ b/tests/tests/media/drmframework/AndroidTest.xml
@@ -19,6 +19,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DynamicConfigPusher">
         <option name="target" value="host" />
         <option name="config-filename" value="CtsMediaDrmFrameworkTestCases" />
diff --git a/tests/tests/media/drmframework/OWNERS b/tests/tests/media/drmframework/OWNERS
index d4bb209..f20d2d9 100644
--- a/tests/tests/media/drmframework/OWNERS
+++ b/tests/tests/media/drmframework/OWNERS
@@ -1,9 +1,12 @@
 # Bug component: 1344
 # android-drm-team
+conglin@google.com
 edwinwong@google.com
 fredgc@google.com
+juce@google.com
 kylealexander@google.com
 mattfedd@google.com
 rfrias@google.com
 robertshih@google.com
 sigquit@google.com
+vickymin@google.com
diff --git a/tests/tests/media/drmframework/jni/Android.bp b/tests/tests/media/drmframework/jni/Android.bp
index 0dc55fa..3a755e5 100644
--- a/tests/tests/media/drmframework/jni/Android.bp
+++ b/tests/tests/media/drmframework/jni/Android.bp
@@ -42,5 +42,6 @@
     ],
     stl: "libc++_static",
     gtest: false,
-    sdk_version: "29",
+    // TODO(b/208938664) Change this sdk version suppression to T once it's defined to number (33).
+    sdk_version: "current",
 }
diff --git a/tests/tests/media/drmframework/jni/native-mediadrm-jni.cpp b/tests/tests/media/drmframework/jni/native-mediadrm-jni.cpp
index 66afdb0..630c7f6 100644
--- a/tests/tests/media/drmframework/jni/native-mediadrm-jni.cpp
+++ b/tests/tests/media/drmframework/jni/native-mediadrm-jni.cpp
@@ -27,7 +27,6 @@
 #include <jni.h>
 #include <nativehelper/JNIHelp.h>
 #include <sys/stat.h>
-
 #include <android/native_window_jni.h>
 
 #include "AMediaObjects.h"
@@ -62,7 +61,10 @@
 
 static const char kFileScheme[] = "file://";
 static constexpr size_t kFileSchemeStrLen = sizeof(kFileScheme) - 1;
-static constexpr size_t kPlayTimeSeconds = 30;
+// Test time must be under 30 seconds to meet CTS quality bar.
+// The first ten seconds in kPlayTimeSeconds plays the clear lead,
+// the next ten seconds verifies encrypted playback.
+static constexpr size_t kPlayTimeSeconds = 20;
 static constexpr size_t kUuidSize = 16;
 
 static const uint8_t kClearKeyUuid[kUuidSize] = {
@@ -103,6 +105,8 @@
     0x72, 0x79, 0x22, 0x7d
 };
 
+static const char kDefaultUrl[] = "https://default.url";
+
 static const size_t kKeyRequestSize = sizeof(kKeyRequestData);
 
 // base 64 encoded JSON response string, must not contain padding character '='
@@ -970,6 +974,98 @@
     return JNI_TRUE;
 }
 
+extern "C" jboolean testGetKeyRequestNative(
+    JNIEnv* env, jclass /*clazz*/, jbyteArray uuid, jobject playbackParams) {
+
+    if (NULL == uuid || NULL == playbackParams) {
+        jniThrowException(env, "java/lang/NullPointerException",
+                "null uuid or null playback parameters");
+        return JNI_FALSE;
+    }
+
+    Uuid juuid = jbyteArrayToUuid(env, uuid);
+    if (!isUuidSizeValid(juuid)) {
+        jniThrowExceptionFmt(env, "java/lang/IllegalArgumentException",
+                "invalid UUID size, expected %u bytes", kUuidSize);
+        return JNI_FALSE;
+    }
+
+    PlaybackParams params;
+    initPlaybackParams(env, playbackParams, params);
+
+    AMediaObjects aMediaObjects;
+    media_status_t status = AMEDIA_OK;
+    aMediaObjects.setDrm(AMediaDrm_createByUUID(&juuid[0]));
+    if (NULL == aMediaObjects.getDrm()) {
+        jniThrowException(env, "java/lang/RuntimeException", "null MediaDrm");
+        return JNI_FALSE;
+    }
+
+    AMediaDrmSessionId sessionId;
+    status = AMediaDrm_openSession(aMediaObjects.getDrm(), &sessionId);
+    if (status != AMEDIA_OK) {
+        jniThrowException(env, "java/lang/RuntimeException",
+                "openSession failed");
+        return JNI_FALSE;
+    }
+
+    // Pointer to keyRequest memory, which remains until the next
+    // AMediaDrm_getKeyRequest call or until the drm object is released.
+    const uint8_t* keyRequest;
+    size_t keyRequestSize = 0;
+    std::string errorMessage;
+
+    const char *defaultUrl;
+    AMediaDrmKeyRequestType keyRequestType;
+
+    // The server recognizes "video/mp4" but not "video/avc".
+    status = AMediaDrm_getKeyRequestWithDefaultUrlAndType(aMediaObjects.getDrm(),
+            &sessionId, kClearkeyPssh, sizeof(kClearkeyPssh),
+            "video/mp4" /*mimeType*/, KEY_TYPE_STREAMING,
+            NULL, 0, &keyRequest, &keyRequestSize, &defaultUrl, &keyRequestType);
+
+    if(status != AMEDIA_OK) return JNI_FALSE;
+
+    switch(keyRequestType) {
+        case KEY_REQUEST_TYPE_INITIAL:
+        case KEY_REQUEST_TYPE_RENEWAL:
+        case KEY_REQUEST_TYPE_RELEASE:
+        case KEY_REQUEST_TYPE_NONE:
+        case KEY_REQUEST_TYPE_UPDATE:
+            break;
+        default:
+            errorMessage.assign("keyRequestType returned is [%d], error = %d");
+            AMediaDrm_closeSession(aMediaObjects.getDrm(), &sessionId);
+            jniThrowExceptionFmt(env, "java/lang/RuntimeException", errorMessage.c_str(), keyRequestType, status);
+            return JNI_FALSE;
+    }
+
+    // Check service availability
+    const char *outValue = NULL;
+    status = AMediaDrm_getPropertyString(aMediaObjects.getDrm(),
+            "aidlVersion", &outValue);
+    if (status != AMEDIA_OK) {
+        // Drm service not using aidl interface, skip checking default url value
+        return JNI_TRUE;
+    }
+
+    ALOGD("aidlVersion is [%s]", outValue);
+
+    ALOGD("kDefaultUrl [%s], length %d, defaultUrl [%s], length %d",
+        kDefaultUrl,
+        (int)strlen(kDefaultUrl),
+        defaultUrl,
+        (int)strlen(defaultUrl));
+
+    if (strlen(kDefaultUrl) != strlen(defaultUrl) || strcmp(kDefaultUrl, defaultUrl) != 0) {
+        AMediaDrm_closeSession(aMediaObjects.getDrm(), &sessionId);
+        jniThrowExceptionFmt(env, "java/lang/RuntimeException", "Default Url is not correct [%s], error = %d", defaultUrl, status);
+        return JNI_FALSE;
+    }
+
+    return JNI_TRUE;
+}
+
 static JNINativeMethod gMethods[] = {
     { "isCryptoSchemeSupportedNative", "([B)Z",
             (void *)isCryptoSchemeSupportedNative },
@@ -994,6 +1090,10 @@
 
     { "testFindSessionIdNative", "([B)Z",
             (void *)testFindSessionIdNative },
+
+    { "testGetKeyRequestNative",
+            "([BLandroid/media/drmframework/cts/NativeMediaDrmClearkeyTest$PlaybackParams;)Z",
+            (void *)testGetKeyRequestNative},
 };
 
 int registerNativeMediaDrmClearkeyTest(JNIEnv* env) {
diff --git a/tests/tests/media/drmframework/src/android/media/drmframework/cts/MediaDrmClearkeyTest.java b/tests/tests/media/drmframework/src/android/media/drmframework/cts/MediaDrmClearkeyTest.java
index 3760588..1a1a46f 100644
--- a/tests/tests/media/drmframework/src/android/media/drmframework/cts/MediaDrmClearkeyTest.java
+++ b/tests/tests/media/drmframework/src/android/media/drmframework/cts/MediaDrmClearkeyTest.java
@@ -1643,6 +1643,9 @@
             assertFalse("ERROR_SESSION_NOT_OPENED requires new session", e.isTransient());
             assertEquals("Expected ERROR_SESSION_NOT_OPENED",
                     MediaDrm.ErrorCodes.ERROR_SESSION_NOT_OPENED, e.getErrorCode());
+            assertTrue("Expected ERROR_SESSION_NOT_OPENED value in info",
+                    e.getDiagnosticInfo().contains(
+                            String.valueOf(MediaDrm.ErrorCodes.ERROR_SESSION_NOT_OPENED)));
         }  finally {
             if (drm != null) {
                 drm.close();
diff --git a/tests/tests/media/drmframework/src/android/media/drmframework/cts/MediaPlayerDrmTestBase.java b/tests/tests/media/drmframework/src/android/media/drmframework/cts/MediaPlayerDrmTestBase.java
index 8f3f52e..45bcd3e 100644
--- a/tests/tests/media/drmframework/src/android/media/drmframework/cts/MediaPlayerDrmTestBase.java
+++ b/tests/tests/media/drmframework/src/android/media/drmframework/cts/MediaPlayerDrmTestBase.java
@@ -135,7 +135,12 @@
 
     private static final String TAG = "MediaPlayerDrmTestBase";
 
-    protected static final int PLAY_TIME_MS = 60 * 1000;
+    // PLAY_TIME_MS dictates the total run time of the playback
+    // tests. To meet the under 30 seconds CTS quality bar,
+    // the first ten seconds plays the clear lead,
+    // the next ten seconds verifies encrypted playback.
+    // This applies to both streaming and offline tests.
+    protected static final int PLAY_TIME_MS = 20 * 1000;
     protected byte[] mKeySetId;
     protected boolean mAudioOnly;
 
diff --git a/tests/tests/media/drmframework/src/android/media/drmframework/cts/NativeMediaDrmClearkeyTest.java b/tests/tests/media/drmframework/src/android/media/drmframework/cts/NativeMediaDrmClearkeyTest.java
index e438c25..0bb09ca 100644
--- a/tests/tests/media/drmframework/src/android/media/drmframework/cts/NativeMediaDrmClearkeyTest.java
+++ b/tests/tests/media/drmframework/src/android/media/drmframework/cts/NativeMediaDrmClearkeyTest.java
@@ -22,9 +22,13 @@
 import android.media.cts.MediaCodecBlockModelHelper;
 import android.media.cts.Utils;
 import android.net.Uri;
+import android.os.Build;
+import android.platform.test.annotations.FlakyTest;
+import android.platform.test.annotations.Presubmit;
 import android.platform.test.annotations.AppModeFull;
 import android.util.Log;
 import android.view.Surface;
+import androidx.test.filters.SdkSuppress;
 
 import com.android.compatibility.common.util.ApiLevelUtil;
 import com.android.compatibility.common.util.MediaUtils;
@@ -127,6 +131,7 @@
         return buffer.array();
     }
 
+    @Presubmit
     public void testIsCryptoSchemeSupported() throws Exception {
         if (watchHasNoClearkeySupport()) {
             return;
@@ -136,16 +141,19 @@
         assertTrue(isCryptoSchemeSupportedNative(uuidByteArray(CLEARKEY_SCHEME_UUID)));
     }
 
+    @Presubmit
     public void testIsCryptoSchemeNotSupported() throws Exception {
         assertFalse(isCryptoSchemeSupportedNative(uuidByteArray(BAD_SCHEME_UUID)));
     }
 
+    @Presubmit
     public void testPssh() throws Exception {
         // The test uses a canned PSSH that contains the common box UUID.
         assertTrue(testPsshNative(uuidByteArray(COMMON_PSSH_SCHEME_UUID),
                 Uri.parse(Utils.getMediaPath() + CENC_CLEARKEY_VIDEO_PATH).toString()));
     }
 
+    @Presubmit
     public void testQueryKeyStatus() throws Exception {
         if (watchHasNoClearkeySupport()) {
             return;
@@ -154,6 +162,7 @@
         assertTrue(testQueryKeyStatusNative(uuidByteArray(CLEARKEY_SCHEME_UUID)));
     }
 
+    @Presubmit
     public void testFindSessionId() throws Exception {
         if (watchHasNoClearkeySupport()) {
             return;
@@ -162,6 +171,7 @@
         assertTrue(testFindSessionIdNative(uuidByteArray(CLEARKEY_SCHEME_UUID)));
     }
 
+    @Presubmit
     public void testGetPropertyString() throws Exception {
         if (watchHasNoClearkeySupport()) {
             return;
@@ -176,6 +186,7 @@
         assertEquals("ClearKey CDM", value.toString());
     }
 
+    @Presubmit
     public void testPropertyByteArray() throws Exception {
         if (watchHasNoClearkeySupport()) {
             return;
@@ -184,6 +195,7 @@
         assertTrue(testPropertyByteArrayNative(uuidByteArray(CLEARKEY_SCHEME_UUID)));
     }
 
+    @Presubmit
     public void testUnknownPropertyString() throws Exception {
         StringBuffer value = new StringBuffer();
 
@@ -288,6 +300,9 @@
 
     private static native boolean testQueryKeyStatusNative(final byte[] uuid);
 
+    private static native boolean testGetKeyRequestNative(final byte[] uuid,
+            PlaybackParams params);
+
     public void testClearKeyPlaybackCenc() throws Exception {
         testClearKeyPlayback(
             COMMON_PSSH_SCHEME_UUID,
@@ -297,6 +312,8 @@
             VIDEO_WIDTH_CENC, VIDEO_HEIGHT_CENC);
     }
 
+    @FlakyTest(bugId = 173646795)
+    @Presubmit
     public void testClearKeyPlaybackCenc2() throws Exception {
         testClearKeyPlayback(
             CLEARKEY_SCHEME_UUID,
@@ -305,5 +322,20 @@
             Uri.parse(Utils.getMediaPath() + CENC_CLEARKEY_VIDEO_PATH),
             VIDEO_WIDTH_CENC, VIDEO_HEIGHT_CENC);
     }
+
+    // TODO(b/208938664) Change this sdk version suppression to T once it's defined to number (33).
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S_V2)
+    public void testClearKeyGetKeyRequest() throws Exception {
+        PlaybackParams params = new PlaybackParams();
+        params.surface = mActivity.getSurfaceHolder().getSurface();
+        params.mimeType = ISO_BMFF_VIDEO_MIME_TYPE;
+        params.audioUrl = Uri.parse(Utils.getMediaPath() + CENC_AUDIO_PATH).toString();
+        params.videoUrl = Uri.parse(Utils.getMediaPath() + CENC_CLEARKEY_VIDEO_PATH).toString();
+        boolean status = testGetKeyRequestNative(
+                uuidByteArray(CLEARKEY_SCHEME_UUID),
+                params);
+        assertTrue(status);
+        params.surface.release();
+    }
 }
 
diff --git a/tests/tests/media/misc/AndroidTest.xml b/tests/tests/media/misc/AndroidTest.xml
index a7ad967..58cea2c 100644
--- a/tests/tests/media/misc/AndroidTest.xml
+++ b/tests/tests/media/misc/AndroidTest.xml
@@ -19,7 +19,6 @@
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
-    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
         <option name="force-skip-system-props" value="true" /> <!-- avoid restarting device -->
         <option name="set-test-harness" value="false" />
diff --git a/tests/tests/media/misc/src/android/media/misc/cts/CamcorderProfileTest.java b/tests/tests/media/misc/src/android/media/misc/cts/CamcorderProfileTest.java
index c00407d..2d1d7cd 100644
--- a/tests/tests/media/misc/src/android/media/misc/cts/CamcorderProfileTest.java
+++ b/tests/tests/media/misc/src/android/media/misc/cts/CamcorderProfileTest.java
@@ -158,6 +158,14 @@
                 assertEquals(profile.videoBitRate, videoProfile.getBitrate());
                 assertEquals(profile.videoFrameRate, videoProfile.getFrameRate());
                 first = false;
+
+                // The first video profile must be a basic profile: YUV 4:2:0 8-bit SDR.
+                // This is to ensure backward compatibility with the corresponding
+                // CamcorderProfile, which is always a basic profile.
+                assertEquals(EncoderProfiles.VideoProfile.YUV_420,
+                             videoProfile.getChromaSubsampling());
+                assertEquals(EncoderProfiles.VideoProfile.HDR_NONE, videoProfile.getHdrFormat());
+                assertEquals(8, videoProfile.getBitDepth());
             }
             // all profiles must be the same size
             assertEquals(profile.videoFrameWidth, videoProfile.getWidth());
@@ -180,10 +188,21 @@
             case MediaRecorder.VideoEncoder.HEVC:
                   assertEquals(MediaFormat.MIMETYPE_VIDEO_HEVC, videoProfile.getMediaType());
                   break;
+            case MediaRecorder.VideoEncoder.VP9:
+                  assertEquals(MediaFormat.MIMETYPE_VIDEO_VP9, videoProfile.getMediaType());
+                  break;
+            case MediaRecorder.VideoEncoder.DOLBY_VISION:
+                  assertEquals(MediaFormat.MIMETYPE_VIDEO_DOLBY_VISION, videoProfile.getMediaType());
+                  break;
+            case MediaRecorder.VideoEncoder.AV1:
+                  assertEquals(MediaFormat.MIMETYPE_VIDEO_AV1, videoProfile.getMediaType());
+                  break;
             }
             // Cannot validate profile as vendors may use vendor specific profile. Just read it.
             int codecProfile = videoProfile.getProfile();
         }
+        // there must have been at least one video profile
+        assertFalse("no video profiles in getAll()", first);
         first = true;
         for (EncoderProfiles.AudioProfile audioProfile : allProfiles.getAudioProfiles()) {
             if (first) {
diff --git a/tests/tests/media/misc/src/android/media/misc/cts/HeifWriterTest.java b/tests/tests/media/misc/src/android/media/misc/cts/HeifWriterTest.java
index e855a76..7809a10 100644
--- a/tests/tests/media/misc/src/android/media/misc/cts/HeifWriterTest.java
+++ b/tests/tests/media/misc/src/android/media/misc/cts/HeifWriterTest.java
@@ -420,7 +420,11 @@
                 }
                 mWidth = mBitmaps[0].getWidth();
                 mHeight = mBitmaps[0].getHeight();
-                retriever.release();
+                try {
+                    retriever.release();
+                } catch (IOException e) {
+                    // Ignoring errors occurred while releasing the MediaMetadataRetriever.
+                }
             }
 
             private void cleanupStaleOutputs() {
diff --git a/tests/tests/media/misc/src/android/media/misc/cts/MediaActivityTest.java b/tests/tests/media/misc/src/android/media/misc/cts/MediaActivityTest.java
index 50365dd..f4a4e6e 100644
--- a/tests/tests/media/misc/src/android/media/misc/cts/MediaActivityTest.java
+++ b/tests/tests/media/misc/src/android/media/misc/cts/MediaActivityTest.java
@@ -103,7 +103,7 @@
         mAudioManager = (AudioManager) mContext.getSystemService(Context.AUDIO_SERVICE);
         mUseFixedVolume = mAudioManager.isVolumeFixed();
         mHdmiControlManager = mContext.getSystemService(HdmiControlManager.class);
-        if (mHdmiControlManager != null) {
+        if(mHdmiControlManager != null) {
             mHdmiEnableStatus = mHdmiControlManager.getHdmiCecEnabled();
             mHdmiControlManager.setHdmiCecEnabled(HdmiControlManager.HDMI_CEC_CONTROL_DISABLED);
         }
diff --git a/tests/tests/media/misc/src/android/media/misc/cts/MediaMetadataRetrieverTest.java b/tests/tests/media/misc/src/android/media/misc/cts/MediaMetadataRetrieverTest.java
index 70bf2b4..fe338db 100644
--- a/tests/tests/media/misc/src/android/media/misc/cts/MediaMetadataRetrieverTest.java
+++ b/tests/tests/media/misc/src/android/media/misc/cts/MediaMetadataRetrieverTest.java
@@ -157,6 +157,37 @@
         return ds;
     }
 
+    public void testExceptionWhileClosingMediaDataSource() throws IOException {
+        MediaDataSource backingMediaDataSource =
+                TestMediaDataSource.fromAssetFd(
+                        getAssetFileDescriptorFor("audio_with_metadata.mp3"));
+        MediaDataSource mediaDataSource = new MediaDataSource() {
+            @Override
+            public int readAt(long position, byte[] buffer, int offset, int size)
+                    throws IOException {
+                return backingMediaDataSource.readAt(position, buffer, offset, size);
+            }
+
+            @Override
+            public long getSize() throws IOException {
+                return backingMediaDataSource.getSize();
+            }
+
+            @Override
+            public void close() throws IOException {
+                backingMediaDataSource.close();
+                throw new IOException();
+            }
+        };
+        mRetriever.setDataSource(mediaDataSource);
+        try {
+            mRetriever.release();
+            fail("Expected IOException not thrown.");
+        } catch (IOException e) {
+            // Expected.
+        }
+    }
+
     public void testAudioMetadata() {
         setDataSourceCallback("audio_with_metadata.mp3");
 
@@ -391,13 +422,6 @@
     }
 
     public void testID3v240ExtHeader() {
-        if(!ApiLevelUtil.isAtLeast(Build.VERSION_CODES.R)) {
-            // The fix for b/154357105 was released in mainline release 30.09.007.01
-            // See https://android-build.googleplex.com/builds/treetop/googleplex-android-review/11174063
-            if (TestUtils.skipTestIfMainlineLessThan("com.google.android.media", 300900701)) {
-                return;
-            }
-        }
         setDataSourceFd("sinesweepid3v24ext.mp3");
         assertEquals("Mime type was other than expected",
                 "audio/mpeg",
diff --git a/tests/tests/media/misc/src/android/media/misc/cts/MediaRoute2InfoTest.java b/tests/tests/media/misc/src/android/media/misc/cts/MediaRoute2InfoTest.java
index 94d5883..0427118 100644
--- a/tests/tests/media/misc/src/android/media/misc/cts/MediaRoute2InfoTest.java
+++ b/tests/tests/media/misc/src/android/media/misc/cts/MediaRoute2InfoTest.java
@@ -17,7 +17,6 @@
 package android.media.misc.cts;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -30,15 +29,15 @@
 import android.os.Bundle;
 import android.os.Parcel;
 
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
 /**
  * Tests {@link MediaRoute2Info} and its {@link MediaRoute2Info.Builder builder}.
  */
diff --git a/tests/tests/media/misc/src/android/media/misc/cts/MediaRouter2Test.java b/tests/tests/media/misc/src/android/media/misc/cts/MediaRouter2Test.java
index 05cedf3..89d336c 100644
--- a/tests/tests/media/misc/src/android/media/misc/cts/MediaRouter2Test.java
+++ b/tests/tests/media/misc/src/android/media/misc/cts/MediaRouter2Test.java
@@ -19,7 +19,6 @@
 import static android.content.Context.AUDIO_SERVICE;
 import static android.media.MediaRoute2Info.FEATURE_LIVE_AUDIO;
 import static android.media.MediaRoute2Info.PLAYBACK_VOLUME_VARIABLE;
-import static android.media.misc.cts.StubMediaRoute2ProviderService.FEATURES_ALL;
 import static android.media.misc.cts.StubMediaRoute2ProviderService.FEATURES_SPECIAL;
 import static android.media.misc.cts.StubMediaRoute2ProviderService.FEATURE_SAMPLE;
 import static android.media.misc.cts.StubMediaRoute2ProviderService.ROUTE_ID1;
@@ -555,11 +554,11 @@
 
         try {
             mRouter2.registerTransferCallback(mExecutor, transferCallback);
-            mRouter2.transferTo(route);
-
             // Unregisters transfer callback
             mRouter2.unregisterTransferCallback(transferCallback);
 
+            mRouter2.transferTo(route);
+
             // No transfer callback methods should be called.
             assertFalse(successLatch.await(WAIT_MS, TimeUnit.MILLISECONDS));
             assertFalse(failureLatch.await(WAIT_MS, TimeUnit.MILLISECONDS));
@@ -1096,6 +1095,11 @@
 
     private Map<String, MediaRoute2Info> waitAndGetRoutes(List<String> routeTypes)
             throws Exception {
+        return waitAndGetRoutes(new RouteDiscoveryPreference.Builder(routeTypes, true).build());
+    }
+
+    private Map<String, MediaRoute2Info> waitAndGetRoutes(RouteDiscoveryPreference preference)
+            throws Exception {
         CountDownLatch latch = new CountDownLatch(1);
 
         RouteCallback routeCallback = new RouteCallback() {
@@ -1109,8 +1113,7 @@
             }
         };
 
-        mRouter2.registerRouteCallback(mExecutor, routeCallback,
-                new RouteDiscoveryPreference.Builder(routeTypes, true).build());
+        mRouter2.registerRouteCallback(mExecutor, routeCallback, preference);
         try {
             latch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS);
             return createRouteMap(mRouter2.getRoutes());
diff --git a/tests/tests/media/misc/src/android/media/misc/cts/MediaSessionManagerTest.java b/tests/tests/media/misc/src/android/media/misc/cts/MediaSessionManagerTest.java
index 41ebcae..6d4fede 100644
--- a/tests/tests/media/misc/src/android/media/misc/cts/MediaSessionManagerTest.java
+++ b/tests/tests/media/misc/src/android/media/misc/cts/MediaSessionManagerTest.java
@@ -40,6 +40,7 @@
 import android.provider.Settings;
 import android.test.InstrumentationTestCase;
 import android.test.UiThreadTest;
+import android.text.TextUtils;
 import android.view.KeyEvent;
 
 import com.android.compatibility.common.util.ApiLevelUtil;
@@ -581,6 +582,7 @@
         }
     }
 
+    @NonMediaMainlineTest
     public void testIsTrustedForMediaControl_withInvalidUid() throws Exception {
         List<String> packageNames = getEnabledNotificationListenerPackages();
         for (String packageName : packageNames) {
@@ -629,7 +631,7 @@
                 Settings.Secure.getString(
                         mContext.getContentResolver(),
                         ENABLED_NOTIFICATION_LISTENERS);
-        if (enabledNotificationListeners != null) {
+        if (!TextUtils.isEmpty(enabledNotificationListeners)) {
             String[] components = enabledNotificationListeners.split(":");
             for (String componentString : components) {
                 ComponentName component = ComponentName.unflattenFromString(componentString);
diff --git a/tests/tests/media/misc/src/android/media/misc/cts/RouteDiscoveryPreferenceTest.java b/tests/tests/media/misc/src/android/media/misc/cts/RouteDiscoveryPreferenceTest.java
index 68a5725..4be3843 100644
--- a/tests/tests/media/misc/src/android/media/misc/cts/RouteDiscoveryPreferenceTest.java
+++ b/tests/tests/media/misc/src/android/media/misc/cts/RouteDiscoveryPreferenceTest.java
@@ -26,15 +26,15 @@
 import android.media.cts.NonMediaMainlineTest;
 import android.os.Parcel;
 
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
 @RunWith(AndroidJUnit4.class)
 @SmallTest
 @NonMediaMainlineTest
@@ -43,6 +43,10 @@
     private static final String TEST_FEATURE_1 = "TEST_FEATURE_1";
     private static final String TEST_FEATURE_2 = "TEST_FEATURE_2";
 
+    private static final String TEST_PACKAGE_1 = "TEST_PACKAGE_1";
+    private static final String TEST_PACKAGE_2 = "TEST_PACKAGE_2";
+    private static final String TEST_PACKAGE_3 = "TEST_PACKAGE_3";
+
     @Test
     public void testBuilderConstructorWithNull() {
         // Tests null preferredFeatures
@@ -63,14 +67,26 @@
     }
 
     @Test
-    public void testGetters() {
-        final List<String> features = new ArrayList<>();
-        features.add(TEST_FEATURE_1);
-        features.add(TEST_FEATURE_2);
+    public void testDefaultValues() {
+        List<String> preferredFeatures = List.of(TEST_FEATURE_1, TEST_FEATURE_2);
 
         RouteDiscoveryPreference preference =
-                new RouteDiscoveryPreference.Builder(features, true /* isActiveScan */).build();
-        assertEquals(features, preference.getPreferredFeatures());
+                new RouteDiscoveryPreference.Builder(preferredFeatures, true /* isActiveScan */)
+                        .build();
+        assertEquals(preferredFeatures, preference.getPreferredFeatures());
+        assertTrue(preference.shouldPerformActiveScan());
+
+        assertEquals(0, preference.describeContents());
+    }
+
+    @Test
+    public void testGetters() {
+        List<String> preferredFeatures = List.of(TEST_FEATURE_1, TEST_FEATURE_2);
+
+        RouteDiscoveryPreference preference =
+                new RouteDiscoveryPreference.Builder(preferredFeatures, true /* isActiveScan */)
+                        .build();
+        assertEquals(preferredFeatures, preference.getPreferredFeatures());
         assertTrue(preference.shouldPerformActiveScan());
         assertEquals(0, preference.describeContents());
     }
@@ -116,27 +132,26 @@
 
     @Test
     public void testEqualsCreatedWithSameArguments() {
-        final List<String> features = new ArrayList<>();
-        features.add(TEST_FEATURE_1);
-        features.add(TEST_FEATURE_2);
+        List<String> preferredFeatures = List.of(TEST_FEATURE_1, TEST_FEATURE_2);
 
         RouteDiscoveryPreference preference1 =
-                new RouteDiscoveryPreference.Builder(features, true /* isActiveScan */).build();
+                new RouteDiscoveryPreference.Builder(preferredFeatures, true /* isActiveScan */)
+                        .build();
 
         RouteDiscoveryPreference preference2 =
-                new RouteDiscoveryPreference.Builder(features, true /* isActiveScan */).build();
+                new RouteDiscoveryPreference.Builder(preferredFeatures, true /* isActiveScan */)
+                        .build();
 
         assertEquals(preference1, preference2);
     }
 
     @Test
     public void testEqualsCreatedWithBuilderCopyConstructor() {
-        final List<String> features = new ArrayList<>();
-        features.add(TEST_FEATURE_1);
-        features.add(TEST_FEATURE_2);
+        List<String> preferredFeatures = List.of(TEST_FEATURE_1, TEST_FEATURE_2);
 
         RouteDiscoveryPreference preference1 =
-                new RouteDiscoveryPreference.Builder(features, true /* isActiveScan */).build();
+                new RouteDiscoveryPreference.Builder(preferredFeatures, true /* isActiveScan */)
+                        .build();
 
         RouteDiscoveryPreference preference2 =
                 new RouteDiscoveryPreference.Builder(preference1).build();
@@ -146,12 +161,11 @@
 
     @Test
     public void testEqualsReturnFalse() {
-        final List<String> features = new ArrayList<>();
-        features.add(TEST_FEATURE_1);
-        features.add(TEST_FEATURE_2);
+        List<String> preferredFeatures = List.of(TEST_FEATURE_1, TEST_FEATURE_2);
 
         RouteDiscoveryPreference preference =
-                new RouteDiscoveryPreference.Builder(features, true /* isActiveScan */).build();
+                new RouteDiscoveryPreference.Builder(preferredFeatures, true /* isActiveScan */)
+                        .build();
 
         RouteDiscoveryPreference preferenceWithDifferentFeatures =
                 new RouteDiscoveryPreference.Builder(new ArrayList<>(), true /* isActiveScan */)
@@ -159,19 +173,18 @@
         assertNotEquals(preference, preferenceWithDifferentFeatures);
 
         RouteDiscoveryPreference preferenceWithDifferentActiveScan =
-                new RouteDiscoveryPreference.Builder(features, false /* isActiveScan */)
+                new RouteDiscoveryPreference.Builder(preferredFeatures, false /* isActiveScan */)
                         .build();
         assertNotEquals(preference, preferenceWithDifferentActiveScan);
     }
 
     @Test
     public void testEqualsReturnFalseWithCopyConstructor() {
-        final List<String> features = new ArrayList<>();
-        features.add(TEST_FEATURE_1);
-        features.add(TEST_FEATURE_2);
+        List<String> preferredFeatures = List.of(TEST_FEATURE_1, TEST_FEATURE_2);
 
         RouteDiscoveryPreference preference =
-                new RouteDiscoveryPreference.Builder(features, true /* isActiveScan */).build();
+                new RouteDiscoveryPreference.Builder(preferredFeatures, true /* isActiveScan */)
+                        .build();
 
         final List<String> newFeatures = new ArrayList<>();
         newFeatures.add(TEST_FEATURE_1);
@@ -190,12 +203,11 @@
 
     @Test
     public void testParcelingAndUnParceling() {
-        final List<String> features = new ArrayList<>();
-        features.add(TEST_FEATURE_1);
-        features.add(TEST_FEATURE_2);
+        List<String> preferredFeatures = List.of(TEST_FEATURE_1, TEST_FEATURE_2);
 
         RouteDiscoveryPreference preference =
-                new RouteDiscoveryPreference.Builder(features, true /* isActiveScan */).build();
+                new RouteDiscoveryPreference.Builder(preferredFeatures, true /* isActiveScan */)
+                        .build();
 
         Parcel parcel = Parcel.obtain();
         parcel.writeParcelable(preference, 0);
diff --git a/tests/tests/media/misc/src/android/media/misc/cts/SystemMediaRouter2Test.java b/tests/tests/media/misc/src/android/media/misc/cts/SystemMediaRouter2Test.java
index 4126daf..7fb44ba 100644
--- a/tests/tests/media/misc/src/android/media/misc/cts/SystemMediaRouter2Test.java
+++ b/tests/tests/media/misc/src/android/media/misc/cts/SystemMediaRouter2Test.java
@@ -114,7 +114,8 @@
         mContext = InstrumentationRegistry.getTargetContext();
         mUiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
         mUiAutomation.adoptShellPermissionIdentity(Manifest.permission.MEDIA_CONTENT_CONTROL,
-                                                   Manifest.permission.QUERY_AUDIO_STATE);
+                Manifest.permission.MODIFY_AUDIO_ROUTING,
+                Manifest.permission.QUERY_AUDIO_STATE);
 
         mExecutor = Executors.newSingleThreadExecutor();
         mAudioManager = (AudioManager) mContext.getSystemService(AUDIO_SERVICE);
@@ -1024,7 +1025,7 @@
 
     private void releaseAllSessions() {
         MediaRouter2Manager manager = MediaRouter2Manager.getInstance(mContext);
-        for (RoutingSessionInfo session : manager.getActiveSessions()) {
+        for (RoutingSessionInfo session : manager.getRemoteSessions()) {
             manager.releaseSession(session);
         }
     }
diff --git a/tests/tests/media/muxer/Android.bp b/tests/tests/media/muxer/Android.bp
index 3eb38a6..85eab12 100644
--- a/tests/tests/media/muxer/Android.bp
+++ b/tests/tests/media/muxer/Android.bp
@@ -44,8 +44,9 @@
     // include both the 32 and 64 bit versions
     compile_multilib: "both",
     static_libs: [
-        "ctstestrunner-axt",
         "cts-media-common",
+        "ctstestrunner-axt",
+        "exoplayer-mediamuxer_tests",
     ],
     jni_libs: [
         "libctsmediamuxertest_jni",
diff --git a/tests/tests/media/muxer/src/android/media/muxer/cts/MediaMuxerTest.java b/tests/tests/media/muxer/src/android/media/muxer/cts/MediaMuxerTest.java
index 1fe887b..443d44b 100644
--- a/tests/tests/media/muxer/src/android/media/muxer/cts/MediaMuxerTest.java
+++ b/tests/tests/media/muxer/src/android/media/muxer/cts/MediaMuxerTest.java
@@ -34,6 +34,13 @@
 
 import com.android.compatibility.common.util.MediaUtils;
 
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.MediaItem;
+import com.google.android.exoplayer2.MetadataRetriever;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.video.ColorInfo;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -377,6 +384,75 @@
         checkTimestampsWithStartOffsets(startOffsetUsVect);
     }
 
+    public void testAdditionOfHdrStaticMetadata() throws Exception {
+        String outputFilePath =
+                File.createTempFile("MediaMuxerTest_testAdditionOfHdrStaticMetadata", ".mp4")
+                        .getAbsolutePath();
+        // HDR static metadata encoding the following information (format defined in CTA-861.3 -
+        // Static Metadata Descriptor, includes descriptor ID):
+        // Mastering display color primaries:
+        //   R: x=0.677980 y=0.321980, G: x=0.245000 y=0.703000, B: x=0.137980 y=0.052000,
+        //   White point: x=0.312680 y=0.328980
+        // Mastering display luminance min: 0.0000 cd/m2, max: 1000 cd/m2
+        // Maximum Content Light Level: 1100 cd/m2
+        // Maximum Frame-Average Light Level: 180 cd/m2
+        byte[] inputHdrStaticMetadata =
+                Util.getBytesFromHexString("006b84e33eda2f4e89f31a280a123d4140e80300004c04b400");
+        Function<MediaFormat, MediaFormat> staticMetadataAdditionFunction =
+                (mediaFormat) -> {
+                    if (!mediaFormat.getString(MediaFormat.KEY_MIME).startsWith("video/")) {
+                        return mediaFormat;
+                    }
+                    MediaFormat result = new MediaFormat(mediaFormat);
+                    result.setByteBuffer(
+                            MediaFormat.KEY_HDR_STATIC_INFO,
+                            ByteBuffer.wrap(inputHdrStaticMetadata));
+                    return result;
+                };
+        try {
+            cloneMediaUsingMuxer(
+                    /* srcMedia= */ "video_h264_main_b_frames.mp4",
+                    outputFilePath,
+                    /* expectedTrackCount= */ 2,
+                    /* degrees= */ 0,
+                    MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4,
+                    staticMetadataAdditionFunction);
+            assertArrayEquals(
+                    inputHdrStaticMetadata, getVideoColorInfo(outputFilePath).hdrStaticInfo);
+        } finally {
+            new File(outputFilePath).delete();
+        }
+    }
+
+    public void testAdditionOfInvalidHdrStaticMetadataIsIgnored() throws Exception {
+        String outputFilePath =
+                File.createTempFile(
+                                "MediaMuxerTest_testAdditionOfInvalidHdrStaticMetadataIsIgnored",
+                                ".mp4")
+                        .getAbsolutePath();
+        Function<MediaFormat, MediaFormat> staticMetadataAdditionFunction =
+                (mediaFormat) -> {
+                    MediaFormat result = new MediaFormat(mediaFormat);
+                    // The input static info should be ignored, because its size is invalid (26 vs
+                    // expected 25).
+                    result.setByteBuffer(
+                            MediaFormat.KEY_HDR_STATIC_INFO, ByteBuffer.allocateDirect(26));
+                    return result;
+                };
+        try {
+            cloneMediaUsingMuxer(
+                    /* srcMedia= */ "video_h264_main_b_frames.mp4",
+                    outputFilePath,
+                    /* expectedTrackCount= */ 2,
+                    /* degrees= */ 0,
+                    MediaMuxer.OutputFormat.MUXER_OUTPUT_MPEG_4,
+                    staticMetadataAdditionFunction);
+            assertNull(getVideoColorInfo(outputFilePath));
+        } finally {
+            new File(outputFilePath).delete();
+        }
+    }
+
     /**
      * Test: makes sure if audio/video muxing using MPEG4Writer works with B Frames
      * when video and audio samples start after different times.
@@ -673,7 +749,7 @@
         testFd.close();
     }
 
-    private void verifyLocationInFile(String fileName) {
+    private void verifyLocationInFile(String fileName) throws IOException {
         MediaMetadataRetriever retriever = new MediaMetadataRetriever();
         retriever.setDataSource(fileName);
         String location = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_LOCATION);
@@ -1244,5 +1320,19 @@
             fail("either audio track has not reached its last sample");
         }
     }
+
+    /** Returns the static HDR metadata in the given {@code file}, or null if not present. */
+    private ColorInfo getVideoColorInfo(String path)
+            throws ExecutionException, InterruptedException {
+        TrackGroupArray trackGroupArray =
+                MetadataRetriever.retrieveMetadata(getContext(), MediaItem.fromUri(path)).get();
+        for (int i = 0; i < trackGroupArray.length; i++) {
+            Format format = trackGroupArray.get(i).getFormat(0);
+            if (format.sampleMimeType.startsWith("video/")) {
+                return format.colorInfo;
+            }
+        }
+        return null;
+    }
 }
 
diff --git a/tests/tests/media/player/src/android/media/player/cts/MediaPlayerTest.java b/tests/tests/media/player/src/android/media/player/cts/MediaPlayerTest.java
index b530f66..b46366c 100644
--- a/tests/tests/media/player/src/android/media/player/cts/MediaPlayerTest.java
+++ b/tests/tests/media/player/src/android/media/player/cts/MediaPlayerTest.java
@@ -76,6 +76,7 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
@@ -1182,7 +1183,7 @@
         playVideoTest(file, displayWidth, displayHeight);
     }
 
-    private void checkVideoRotationAngle(int angle, String file) {
+    private void checkVideoRotationAngle(int angle, String file) throws IOException {
         MediaMetadataRetriever retriever = new MediaMetadataRetriever();
         retriever.setDataSource(file);
         String rotation = retriever.extractMetadata(
diff --git a/tests/tests/media/recorder/src/android/media/recorder/cts/MediaRecorderTest.java b/tests/tests/media/recorder/src/android/media/recorder/cts/MediaRecorderTest.java
index 5049978..ffc2dcf 100644
--- a/tests/tests/media/recorder/src/android/media/recorder/cts/MediaRecorderTest.java
+++ b/tests/tests/media/recorder/src/android/media/recorder/cts/MediaRecorderTest.java
@@ -514,7 +514,7 @@
         retriever = null;
     }
 
-    private boolean checkLocationInFile(String fileName) {
+    private boolean checkLocationInFile(String fileName) throws IOException {
         MediaMetadataRetriever retriever = new MediaMetadataRetriever();
         retriever.setDataSource(fileName);
         String location = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_LOCATION);
diff --git a/tests/tests/mediaparser/Android.bp b/tests/tests/mediaparser/Android.bp
index 138cb5a..d916d61 100644
--- a/tests/tests/mediaparser/Android.bp
+++ b/tests/tests/mediaparser/Android.bp
@@ -18,7 +18,10 @@
 
 android_test {
     name: "CtsMediaParserTestCases",
-    defaults: ["CtsMediaParserTestCasesDefaults", "cts_defaults"],
+    defaults: [
+        "CtsMediaParserTestCasesDefaults",
+        "cts_defaults",
+    ],
     min_sdk_version: "29",
     test_suites: [
         "cts",
@@ -39,8 +42,8 @@
     static_libs: [
         "ctstestrunner-axt",
         "androidx.test.ext.junit",
-        "exoplayer2-extractor-test-utils",
-        "exoplayer2-extractor-tests-assets",
+        "exoplayer-cts_media-test_assets",
+        "exoplayer-cts_media-test_utils",
     ],
     libs: [
         "android.test.base",
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java b/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
index d5d01c8..0df3b1b 100644
--- a/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
+++ b/tests/tests/mediastress/src/android/mediastress/cts/MediaPlayerStressTest.java
@@ -162,6 +162,8 @@
             }
         }
 
+        Preconditions.assertTestFileExists(mediaName);
+
         File playbackOutput = new File(WorkDir.getTopDir(), "PlaybackTestResult.txt");
         Writer output = new BufferedWriter(new FileWriter(playbackOutput, true));
 
diff --git a/tests/tests/mediastress/src/android/mediastress/cts/Preconditions.java b/tests/tests/mediastress/src/android/mediastress/cts/Preconditions.java
new file mode 100644
index 0000000..6fc2b8a
--- /dev/null
+++ b/tests/tests/mediastress/src/android/mediastress/cts/Preconditions.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2021 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 android.mediastress.cts;
+
+import java.io.File;
+
+import junit.framework.Assert;
+
+/**
+ * Static methods used to validate preconditions in the media CTS suite
+ * to simplify failure diagnosis.
+ */
+
+public final class Preconditions {
+    private static final String TAG = "Preconditions";
+
+    public static void assertTestFileExists(String pathName) {
+        File testFile = new File(pathName);
+        Assert.assertTrue("Test Setup Error, missing file: " + pathName, testFile.exists());
+    }
+
+    private Preconditions() {}
+}
diff --git a/tests/tests/mediatranscoding/Android.bp b/tests/tests/mediatranscoding/Android.bp
index 0b889ae..6a220a3 100644
--- a/tests/tests/mediatranscoding/Android.bp
+++ b/tests/tests/mediatranscoding/Android.bp
@@ -19,10 +19,12 @@
 android_test {
     name: "CtsMediaTranscodingTestCases",
     defaults: ["CtsMediaTranscodingTestCasesDefaults", "cts_defaults"],
-    min_sdk_version: "31",
+    // part of MTS, so we need compatibility back to Q/29
+    min_sdk_version: "29",
     test_suites: [
         "cts",
         "general-tests",
+        "mts-media",
         "mts",
     ],
     static_libs: [
@@ -43,5 +45,4 @@
         "android.test.base",
         "android.test.runner",
     ],
-    sdk_version: "test_current",
 }
diff --git a/tests/tests/mediatranscoding/AndroidManifest.xml b/tests/tests/mediatranscoding/AndroidManifest.xml
index 1618b00..c69754a 100644
--- a/tests/tests/mediatranscoding/AndroidManifest.xml
+++ b/tests/tests/mediatranscoding/AndroidManifest.xml
@@ -25,6 +25,12 @@
         <uses-library android:name="android.test.runner" />
     </application>
 
+    <!-- included in mainline testing, so must run back on 29.
+         Transcoding was introduced in 31 -->
+    <uses-sdk android:minSdkVersion="29"
+         android:targetSdkVersion="31"/>
+
+
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
             android:targetPackage="android.media.mediatranscoding.cts"
             android:label="Tests for MediaTranscoding.">
diff --git a/tests/tests/mediatranscoding/src/android/media/mediatranscoding/cts/ApplicationMediaCapabilitiesTest.java b/tests/tests/mediatranscoding/src/android/media/mediatranscoding/cts/ApplicationMediaCapabilitiesTest.java
index ba40ca5..6e63624 100644
--- a/tests/tests/mediatranscoding/src/android/media/mediatranscoding/cts/ApplicationMediaCapabilitiesTest.java
+++ b/tests/tests/mediatranscoding/src/android/media/mediatranscoding/cts/ApplicationMediaCapabilitiesTest.java
@@ -27,6 +27,8 @@
 import android.test.AndroidTestCase;
 import android.util.Xml;
 
+import androidx.test.filters.SdkSuppress;
+
 import org.junit.Test;
 import org.xmlpull.v1.XmlPullParser;
 
@@ -36,6 +38,7 @@
 
 @Presubmit
 @AppModeFull(reason = "Instant apps cannot access the SD card")
+@SdkSuppress(minSdkVersion = 31, codeName = "S")
 public class ApplicationMediaCapabilitiesTest extends AndroidTestCase {
     private static final String TAG = "ApplicationMediaCapabilitiesTest";
 
diff --git a/tests/tests/mediatranscoding/src/android/media/mediatranscoding/cts/MediaTranscodingManagerTest.java b/tests/tests/mediatranscoding/src/android/media/mediatranscoding/cts/MediaTranscodingManagerTest.java
index 78e7b33..fd99ed0 100644
--- a/tests/tests/mediatranscoding/src/android/media/mediatranscoding/cts/MediaTranscodingManagerTest.java
+++ b/tests/tests/mediatranscoding/src/android/media/mediatranscoding/cts/MediaTranscodingManagerTest.java
@@ -33,6 +33,7 @@
 import android.media.MediaTranscodingManager.TranscodingSession;
 import android.media.MediaTranscodingManager.VideoTranscodingRequest;
 import android.net.Uri;
+// import android.os.Build;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.FileUtils;
@@ -44,6 +45,7 @@
 import android.test.AndroidTestCase;
 import android.util.Log;
 
+import androidx.test.filters.SdkSuppress;
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.MediaUtils;
@@ -70,6 +72,7 @@
 @Presubmit
 @RequiresDevice
 @AppModeFull(reason = "Instant apps cannot access the SD card")
+@SdkSuppress(minSdkVersion = 31, codeName = "S")
 public class MediaTranscodingManagerTest extends AndroidTestCase {
     private static final String TAG = "MediaTranscodingManagerTest";
     /** The time to wait for the transcode operation to complete before failing the test. */
@@ -195,6 +198,7 @@
 
     // Skip the test for TV, Car and Watch devices.
     private boolean shouldSkip() {
+
         PackageManager pm =
                 InstrumentationRegistry.getInstrumentation().getTargetContext().getPackageManager();
         return pm.hasSystemFeature(pm.FEATURE_LEANBACK) || pm.hasSystemFeature(pm.FEATURE_WATCH)
diff --git a/tests/tests/midi/src/android/midi/cts/MidiEchoTest.java b/tests/tests/midi/src/android/midi/cts/MidiEchoTest.java
index 4ed2853..f9b6d01 100644
--- a/tests/tests/midi/src/android/midi/cts/MidiEchoTest.java
+++ b/tests/tests/midi/src/android/midi/cts/MidiEchoTest.java
@@ -18,25 +18,24 @@
 
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.media.midi.MidiManager;
-import android.media.midi.MidiOutputPort;
 import android.media.midi.MidiDevice;
-import android.media.midi.MidiDevice.MidiConnection;
 import android.media.midi.MidiDeviceInfo;
 import android.media.midi.MidiDeviceInfo.PortInfo;
 import android.media.midi.MidiDeviceStatus;
 import android.media.midi.MidiInputPort;
+import android.media.midi.MidiManager;
+import android.media.midi.MidiOutputPort;
 import android.media.midi.MidiReceiver;
-import android.media.midi.MidiSender;
 import android.os.Bundle;
-import android.util.Log;
 import android.test.AndroidTestCase;
+import android.util.Log;
 
 import com.android.midi.CTSMidiEchoTestService;
 import com.android.midi.MidiEchoTestService;
 
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Random;
 
 /**
@@ -307,6 +306,8 @@
 
         assertEquals("MIDI device type", MidiDeviceInfo.TYPE_VIRTUAL,
                 echoInfo.getType());
+        assertEquals("MIDI default protocol", MidiDeviceInfo.PROTOCOL_UNKNOWN,
+                echoInfo.getDefaultProtocol());
     }
 
     // Is the MidiManager supported?
@@ -324,6 +325,14 @@
         MidiDeviceInfo[] infos = midiManager.getDevices();
         assertTrue("device list was null", infos != null);
         assertTrue("device list was empty", infos.length >= 1);
+
+        Collection<MidiDeviceInfo> legacyDeviceInfos = midiManager.getDevicesForTransport(
+                MidiManager.TRANSPORT_MIDI_BYTE_STREAM);
+        assertTrue("Legacy Device list was null.", legacyDeviceInfos != null);
+        assertTrue("Legacy Device list was empty", legacyDeviceInfos.size() >= 1);
+        Collection<MidiDeviceInfo> universalDeviceInfos = midiManager.getDevicesForTransport(
+                MidiManager.TRANSPORT_UNIVERSAL_MIDI_PACKETS);
+        assertTrue("Universal Device list was null.", universalDeviceInfos != null);
     }
 
     public void testDeviceInfo() throws Exception {
@@ -554,7 +563,7 @@
 
     // Store history of status changes.
     private class MyDeviceCallback extends MidiManager.DeviceCallback {
-        private MidiDeviceStatus mStatus;
+        private volatile MidiDeviceStatus mStatus;
         private MidiDeviceInfo mInfo;
 
         public MyDeviceCallback(MidiDeviceInfo info) {
@@ -613,7 +622,19 @@
             midiManager.registerDeviceCallback(deviceCallback, null);
 
             MidiDeviceStatus status = deviceCallback.waitForStatus(TIMEOUT_STATUS_MSEC);
-            assertEquals("we should not have any status yet", null, status);
+            // The DeviceStatus callback is supposed to be "sticky".
+            // That means we expect to get the status of every device that is
+            // already available when we register for the callback.
+            // If it was not "sticky" then we would only get a callback when there
+            // was a change in the available devices.
+            // TODO Often this is null. But sometimes not. Why?
+            if (status == null) {
+                Log.d(TAG, "testDeviceCallback() first status was null!");
+            } else {
+                // InputPort should be closed because we have not opened it yet.
+                assertEquals("input port should be closed before we open it.",
+                             false, status.isInputPortOpen(0));
+            }
 
             // Open input port.
             MidiInputPort echoInputPort = echoDevice.openInputPort(0);
@@ -621,13 +642,13 @@
 
             status = deviceCallback.waitForStatus(TIMEOUT_STATUS_MSEC);
             assertTrue("should have status by now", null != status);
-            assertEquals("input port open?", true, status.isInputPortOpen(0));
+            assertEquals("input port should be open", true, status.isInputPortOpen(0));
 
             deviceCallback.clear();
             echoInputPort.close();
             status = deviceCallback.waitForStatus(TIMEOUT_STATUS_MSEC);
             assertTrue("should have status by now", null != status);
-            assertEquals("input port closed?", false, status.isInputPortOpen(0));
+            assertEquals("input port should be closed", false, status.isInputPortOpen(0));
 
             // Make sure we do NOT get called after unregistering.
             midiManager.unregisterDeviceCallback(deviceCallback);
diff --git a/tests/tests/multiuser/Android.bp b/tests/tests/multiuser/Android.bp
index c930a43..2ffc0f2 100644
--- a/tests/tests/multiuser/Android.bp
+++ b/tests/tests/multiuser/Android.bp
@@ -28,6 +28,9 @@
     static_libs: [
         "ctstestrunner-axt",
         "compatibility-device-util-axt",
+        "Nene",
+        "Harrier",
+        "TestApp",
     ],
     libs: ["android.test.base"],
     sdk_version: "test_current",
diff --git a/tests/tests/multiuser/AndroidManifest.xml b/tests/tests/multiuser/AndroidManifest.xml
index 17a71d7..b660662 100644
--- a/tests/tests/multiuser/AndroidManifest.xml
+++ b/tests/tests/multiuser/AndroidManifest.xml
@@ -19,8 +19,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="android.multiuser.cts"
           android:targetSandboxVersion="2">
-    <!-- Must be at least 30, otherwise some tests could be invalid. -->
-    <uses-sdk android:targetSdkVersion="30"/>
+    <!-- Must be at least 33, otherwise some tests could be invalid. -->
+    <uses-sdk android:targetSdkVersion="33"/>
 
     <application>
         <uses-library android:name="android.test.runner" />
diff --git a/tests/tests/multiuser/AndroidTest.xml b/tests/tests/multiuser/AndroidTest.xml
index df4a765..126708b 100644
--- a/tests/tests/multiuser/AndroidTest.xml
+++ b/tests/tests/multiuser/AndroidTest.xml
@@ -20,6 +20,8 @@
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="multiuser" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsMultiUserTestCases.apk" />
@@ -27,5 +29,7 @@
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.multiuser.cts" />
         <option name="runtime-hint" value="8m" />
+        <option name="exclude-annotation" value="com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile" />
+        <option name="exclude-annotation" value="com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser" />
     </test>
 </configuration>
diff --git a/tests/tests/multiuser/src/android/multiuser/cts/NewUserRequestTest.java b/tests/tests/multiuser/src/android/multiuser/cts/NewUserRequestTest.java
new file mode 100644
index 0000000..36d8acc
--- /dev/null
+++ b/tests/tests/multiuser/src/android/multiuser/cts/NewUserRequestTest.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright (C) 2021 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 android.multiuser.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.graphics.Bitmap;
+import android.os.NewUserRequest;
+import android.os.PersistableBundle;
+import android.os.UserManager;
+
+import org.junit.Test;
+
+public class NewUserRequestTest {
+
+    private final NewUserRequest.Builder mBuilder = new NewUserRequest.Builder();
+
+    private NewUserRequest build() {
+        return mBuilder.build();
+    }
+
+    @Test
+    public void testDefaultNameIsNull() {
+        assertThat(build().getName()).isNull();
+    }
+
+    @Test
+    public void testSetName() {
+        final String name = "test_name";
+        mBuilder.setName(name);
+        assertThat(build().getName()).isEqualTo(name);
+    }
+
+    @Test
+    public void testSetNameNull() {
+        mBuilder.setName(null);
+        assertThat(build().getName()).isNull();
+    }
+
+    @Test
+    public void testDefaultAdminIsFalse() {
+        assertThat(build().isAdmin()).isFalse();
+    }
+
+    @Test
+    public void testSetAdmin() {
+        mBuilder.setAdmin();
+        // Admin user can only be USER_TYPE_FULL_SECONDARY and default value of userType is that
+        assertThat(build().isAdmin()).isTrue();
+    }
+
+    @Test
+    public void testBuildThrowsWhenAdminIsNotUserTypeFullSecondary() {
+        mBuilder.setAdmin().setUserType("OTHER_THAN_" + UserManager.USER_TYPE_FULL_SECONDARY);
+        assertThrows(IllegalStateException.class, this::build);
+    }
+
+    @Test
+    public void testDefaultEphemeralIsFalse() {
+        assertThat(build().isEphemeral()).isFalse();
+    }
+
+    @Test
+    public void testSetEphemeral() {
+        mBuilder.setEphemeral();
+        assertThat(build().isEphemeral()).isTrue();
+    }
+
+    @Test
+    public void testDefaultUserTypeIsNotNull() {
+        assertThat(build().getUserType()).isNotNull();
+    }
+
+    @Test
+    public void testSetUserType() {
+        final String userType = "test_user_type";
+        mBuilder.setUserType(userType);
+        assertThat(build().getUserType()).isEqualTo(userType);
+    }
+
+    @Test
+    public void testBuildThrowsWhenUserTypeIsNull() {
+        mBuilder.setUserType(null);
+        assertThrows(IllegalStateException.class, this::build);
+    }
+
+    @Test
+    public void testDefaultUserIconIsNull() {
+        assertThat(build().getUserIcon()).isNull();
+    }
+
+    @Test
+    public void testSetUserIcon() {
+        final Bitmap icon = Bitmap.createBitmap(32, 32, Bitmap.Config.RGB_565);
+        mBuilder.setUserIcon(icon);
+        assertThat(build().getUserIcon()).isEqualTo(icon);
+    }
+
+    @Test
+    public void testSetUserIconNull() {
+        mBuilder.setUserIcon(null);
+        assertThat(build().getUserIcon()).isNull();
+    }
+
+    @Test
+    public void testDefaultAccountNameAndAccountTypeAreNull() {
+        final NewUserRequest request = build();
+        assertThat(request.getAccountName()).isNull();
+        assertThat(request.getAccountType()).isNull();
+    }
+
+    @Test
+    public void testSetAccountNameAndAccountType() {
+        final String accountName = "test_account_name";
+        final String accountType = "test_account_type";
+        mBuilder.setAccountName(accountName).setAccountType(accountType);
+        final NewUserRequest request = build();
+        assertThat(request.getAccountName()).isEqualTo(accountName);
+        assertThat(request.getAccountType()).isEqualTo(accountType);
+    }
+
+    @Test
+    public void testSetAccountNameAndAccountTypeNull() {
+        mBuilder.setAccountName(null).setAccountType(null);
+        final NewUserRequest request = build();
+        assertThat(request.getAccountName()).isNull();
+        assertThat(request.getAccountType()).isNull();
+    }
+
+    @Test
+    public void testBuildThrowsWhenAccountNameProvidedWithoutAccountType() {
+        mBuilder.setAccountName("test_account_name").setAccountType(null);
+        assertThrows(IllegalStateException.class, this::build);
+    }
+
+    @Test
+    public void testBuildThrowsWhenAccountTypeProvidedWithoutAccountName() {
+        mBuilder.setAccountName(null).setAccountType("test_account_type");
+        assertThrows(IllegalStateException.class, this::build);
+    }
+
+    @Test
+    public void testDefaultAccountOptionsIsNull() {
+        assertThat(build().getAccountOptions()).isNull();
+    }
+
+    @Test
+    public void testSetAccountOptions() {
+        final PersistableBundle accountOptions = new PersistableBundle();
+        accountOptions.putString("test_account_option_key", "test_account_option_value");
+        mBuilder.setAccountOptions(accountOptions);
+        assertThat(build().getAccountOptions()).isEqualTo(accountOptions);
+    }
+
+    @Test
+    public void testSetAccountOptionsNull() {
+        mBuilder.setAccountOptions(null);
+        assertThat(build().getAccountOptions()).isNull();
+    }
+}
diff --git a/tests/tests/multiuser/src/android/multiuser/cts/NewUserResponseTest.java b/tests/tests/multiuser/src/android/multiuser/cts/NewUserResponseTest.java
new file mode 100644
index 0000000..65447d3
--- /dev/null
+++ b/tests/tests/multiuser/src/android/multiuser/cts/NewUserResponseTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2022 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 android.multiuser.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.NewUserResponse;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import org.junit.Test;
+
+public final class NewUserResponseTest {
+
+    @Test
+    public void testNewUserResponseSuccessful() {
+        UserHandle userHandle = UserHandle.of(100);
+
+        NewUserResponse response =
+                new NewUserResponse(userHandle, UserManager.USER_OPERATION_SUCCESS);
+
+        assertThat(response.isSuccessful()).isTrue();
+        assertThat(response.getUser()).isEqualTo(userHandle);
+        assertThat(response.getOperationResult()).isEqualTo(UserManager.USER_OPERATION_SUCCESS);
+    }
+
+    @Test
+    public void testNewUserResponseUnsuccessful() {
+        NewUserResponse response = new NewUserResponse(/* user= */ null,
+                UserManager.USER_OPERATION_ERROR_UNKNOWN);
+
+        assertThat(response.isSuccessful()).isFalse();
+        assertThat(response.getUser()).isNull();
+        assertThat(response.getOperationResult())
+                .isEqualTo(UserManager.USER_OPERATION_ERROR_UNKNOWN);
+    }
+}
diff --git a/tests/tests/multiuser/src/android/multiuser/cts/PermissionHelper.java b/tests/tests/multiuser/src/android/multiuser/cts/PermissionHelper.java
new file mode 100644
index 0000000..5211498
--- /dev/null
+++ b/tests/tests/multiuser/src/android/multiuser/cts/PermissionHelper.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2021 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 android.multiuser.cts;
+
+import android.app.Instrumentation;
+
+public class PermissionHelper implements AutoCloseable {
+    private final Instrumentation mInstrumentation;
+
+    private PermissionHelper(Instrumentation instrumentation, String... permissions) {
+        if (instrumentation == null) {
+            throw new IllegalArgumentException("instrumentation must not be null");
+        }
+        mInstrumentation = instrumentation;
+        mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(permissions);
+    }
+
+    @Override
+    public void close() {
+        mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+    }
+
+    public static PermissionHelper adoptShellPermissionIdentity(
+            Instrumentation instrumentation, String... permissions) {
+        return new PermissionHelper(instrumentation, permissions);
+    }
+}
diff --git a/tests/tests/multiuser/src/android/multiuser/cts/UserManagerTest.java b/tests/tests/multiuser/src/android/multiuser/cts/UserManagerTest.java
index 78e0619..3345f56 100644
--- a/tests/tests/multiuser/src/android/multiuser/cts/UserManagerTest.java
+++ b/tests/tests/multiuser/src/android/multiuser/cts/UserManagerTest.java
@@ -16,46 +16,88 @@
 
 package android.multiuser.cts;
 
+import static android.Manifest.permission.CREATE_USERS;
+import static android.Manifest.permission.INTERACT_ACROSS_USERS;
+import static android.Manifest.permission.QUERY_USERS;
+import static android.content.pm.PackageManager.FEATURE_MANAGED_USERS;
+import static android.multiuser.cts.PermissionHelper.adoptShellPermissionIdentity;
 import static android.multiuser.cts.TestingUtils.getBooleanProperty;
+import static android.os.UserManager.USER_OPERATION_SUCCESS;
+import static android.os.UserManager.USER_TYPE_FULL_SECONDARY;
+import static android.os.UserManager.USER_TYPE_PROFILE_MANAGED;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
-import android.Manifest;
+import static org.junit.Assume.assumeTrue;
+
 import android.app.Instrumentation;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
+import android.graphics.Bitmap;
+import android.os.Build;
+import android.os.NewUserRequest;
+import android.os.NewUserResponse;
+import android.os.PersistableBundle;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.platform.test.annotations.AppModeFull;
 import android.platform.test.annotations.SystemUserOnly;
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.harrier.annotations.RequireFeature;
+import com.android.bedstead.nene.TestApis;
+import com.android.bedstead.nene.users.UserReference;
+import com.android.bedstead.nene.users.UserType;
+
 import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
+import java.util.ArrayDeque;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-@RunWith(JUnit4.class)
+@RunWith(BedsteadJUnit4.class)
 public final class UserManagerTest {
 
-    private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
-    private final Context mContext = mInstrumentation.getContext();
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
 
+    private static final Context sContext = TestApis.context().instrumentedContext();
+
+    private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
     private UserManager mUserManager;
 
-    @Before
-    public void setTestFixtures() {
-        mUserManager = mContext.getSystemService(UserManager.class);
+    private final String mAccountName = "test_account_name";
+    private final String mAccountType = "test_account_type";
 
+    @Before
+    public void setUp() {
+        mUserManager = sContext.getSystemService(UserManager.class);
         assertWithMessage("UserManager service").that(mUserManager).isNotNull();
     }
 
+    private void removeUser(UserHandle userHandle) {
+        if (userHandle == null) {
+            return;
+        }
+
+        try (PermissionHelper ph = adoptShellPermissionIdentity(mInstrumentation, CREATE_USERS)) {
+            assertThat(mUserManager.removeUser(userHandle)).isTrue();
+        }
+    }
+
     /**
      * Verify that the isUserAGoat() method always returns false for API level 30. This is
      * because apps targeting R no longer have access to package queries by default.
@@ -66,6 +108,28 @@
     }
 
     @Test
+    public void testIsRemoveResultSuccessful() {
+        assertThat(UserManager.isRemoveResultSuccessful(UserManager.REMOVE_RESULT_REMOVED))
+                .isTrue();
+        assertThat(UserManager.isRemoveResultSuccessful(UserManager.REMOVE_RESULT_DEFERRED))
+                .isTrue();
+        assertThat(UserManager
+                .isRemoveResultSuccessful(UserManager.REMOVE_RESULT_ALREADY_BEING_REMOVED))
+                        .isTrue();
+        assertThat(UserManager.isRemoveResultSuccessful(UserManager.REMOVE_RESULT_ERROR_UNKNOWN))
+                .isFalse();
+        assertThat(UserManager
+                .isRemoveResultSuccessful(UserManager.REMOVE_RESULT_ERROR_USER_RESTRICTION))
+                        .isFalse();
+        assertThat(UserManager
+                .isRemoveResultSuccessful(UserManager.REMOVE_RESULT_ERROR_USER_NOT_FOUND))
+                        .isFalse();
+        assertThat(
+                UserManager.isRemoveResultSuccessful(UserManager.REMOVE_RESULT_ERROR_SYSTEM_USER))
+                        .isFalse();
+    }
+
+    @Test
     public void testIsHeadlessSystemUserMode() throws Exception {
         boolean expected = getBooleanProperty(mInstrumentation,
                 "ro.fw.mu.headless_system_user");
@@ -83,31 +147,293 @@
 
     @Test
     @SystemUserOnly(reason = "Profiles are only supported on system user.")
-    public void testCloneUser() throws Exception {
-        // Need CREATE_USERS permission to create user in test
-        mInstrumentation.getUiAutomation().adoptShellPermissionIdentity(
-                Manifest.permission.CREATE_USERS, Manifest.permission.INTERACT_ACROSS_USERS);
-        Set<String> disallowedPackages = new HashSet<String>();
-        UserHandle userHandle = mUserManager.createProfile(
-                "Clone user", UserManager.USER_TYPE_PROFILE_CLONE, disallowedPackages);
-        assertThat(userHandle).isNotNull();
+    public void testCloneProfile() throws Exception {
+        UserHandle userHandle = null;
 
-        try {
-            final Context userContext = mContext.createPackageContextAsUser("system", 0,
+        // Need CREATE_USERS permission to create user in test
+        try (PermissionHelper ph = adoptShellPermissionIdentity(mInstrumentation, CREATE_USERS)) {
+            Set<String> disallowedPackages = new HashSet<String>();
+            userHandle = mUserManager.createProfile(
+                    "Clone profile", UserManager.USER_TYPE_PROFILE_CLONE, disallowedPackages);
+            assertThat(userHandle).isNotNull();
+
+            final Context userContext = sContext.createPackageContextAsUser("system", 0,
                     userHandle);
             final UserManager cloneUserManager = userContext.getSystemService(UserManager.class);
             assertThat(cloneUserManager.isMediaSharedWithParent()).isTrue();
+            assertThat(cloneUserManager.isCredentialSharableWithParent()).isTrue();
             assertThat(cloneUserManager.isCloneProfile()).isTrue();
+            assertThat(cloneUserManager.isProfile()).isTrue();
+            assertThat(cloneUserManager.isUserOfType(UserManager.USER_TYPE_PROFILE_CLONE)).isTrue();
 
-            List<UserInfo> list = mUserManager.getUsers(true, true, true);
-            List<UserInfo> cloneUsers = list.stream().filter(
-                    user -> (user.id == userHandle.getIdentifier()
+            final List<UserInfo> list = mUserManager.getUsers(true, true, true);
+            final UserHandle finalUserHandle = userHandle;
+            final List<UserInfo> cloneUsers = list.stream().filter(
+                    user -> (user.id == finalUserHandle.getIdentifier()
                             && user.isCloneProfile()))
                     .collect(Collectors.toList());
             assertThat(cloneUsers.size()).isEqualTo(1);
         } finally {
-            assertThat(mUserManager.removeUser(userHandle)).isTrue();
-            mInstrumentation.getUiAutomation().dropShellPermissionIdentity();
+            removeUser(userHandle);
+        }
+    }
+
+    @Test
+    @RequireFeature(FEATURE_MANAGED_USERS)
+    @EnsureHasPermission({CREATE_USERS, QUERY_USERS})
+    public void testManagedProfile() throws Exception {
+        UserHandle userHandle = null;
+
+        try {
+            userHandle = mUserManager.createProfile(
+                    "Managed profile", UserManager.USER_TYPE_PROFILE_MANAGED, new HashSet<>());
+
+            // Not all devices and user types support managed profiles; skip if this one doesn't.
+            assumeTrue("Couldn't create a managed profile", userHandle != null);
+
+            final UserManager umOfProfile = sContext
+                    .createPackageContextAsUser("android", 0, userHandle)
+                    .getSystemService(UserManager.class);
+
+            // TODO(b/222584163): Remove the if{} clause after v33 Sdk bump.
+            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.S_V2) {
+                assertThat(umOfProfile.isManagedProfile()).isTrue();
+            }
+            assertThat(umOfProfile.isManagedProfile(userHandle.getIdentifier())).isTrue();
+            assertThat(umOfProfile.isProfile()).isTrue();
+            assertThat(umOfProfile.isUserOfType(UserManager.USER_TYPE_PROFILE_MANAGED)).isTrue();
+        } finally {
+            removeUser(userHandle);
+        }
+    }
+
+    @Test
+    @EnsureHasPermission({QUERY_USERS})
+    public void testSystemUser() throws Exception {
+        final UserManager umOfSys = sContext
+                .createPackageContextAsUser("android", 0, UserHandle.SYSTEM)
+                .getSystemService(UserManager.class);
+
+        // TODO(b/222584163): Remove the if{} clause after v33 Sdk bump.
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.S_V2) {
+            assertThat(umOfSys.isSystemUser()).isTrue();
+        }
+
+        // We cannot demand what type of user SYSTEM is, but we can say some things it isn't.
+        assertThat(umOfSys.isUserOfType(UserManager.USER_TYPE_PROFILE_CLONE)).isFalse();
+        assertThat(umOfSys.isUserOfType(UserManager.USER_TYPE_PROFILE_MANAGED)).isFalse();
+        assertThat(umOfSys.isUserOfType(UserManager.USER_TYPE_FULL_GUEST)).isFalse();
+
+        assertThat(umOfSys.isProfile()).isFalse();
+        assertThat(umOfSys.isManagedProfile()).isFalse();
+        assertThat(umOfSys.isManagedProfile(UserHandle.USER_SYSTEM)).isFalse();
+        assertThat(umOfSys.isCloneProfile()).isFalse();
+    }
+
+    @Test
+    @SystemUserOnly(reason = "Restricted users are only supported on system user.")
+    public void testRestrictedUser() throws Exception {
+        UserHandle user = null;
+        try (PermissionHelper ph = adoptShellPermissionIdentity(mInstrumentation, CREATE_USERS)) {
+            // Check that the SYSTEM user is not restricted.
+            assertThat(mUserManager.isRestrictedProfile()).isFalse();
+            assertThat(mUserManager.isRestrictedProfile(UserHandle.SYSTEM)).isFalse();
+            assertThat(mUserManager.getRestrictedProfileParent()).isNull();
+
+            final UserInfo info = mUserManager.createRestrictedProfile("Restricted user");
+
+            // If the device supports Restricted users, it must report it correctly.
+            assumeTrue("Couldn't create a restricted profile", info != null);
+
+            user = UserHandle.of(info.id);
+            assertThat(mUserManager.isRestrictedProfile(user)).isTrue();
+
+            final Context userContext = sContext.createPackageContextAsUser("system", 0, user);
+            final UserManager userUm = userContext.getSystemService(UserManager.class);
+            // TODO(b/222584163): Remove the if{} clause after v33 Sdk bump.
+            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.S_V2) {
+                assertThat(userUm.isRestrictedProfile()).isTrue();
+            }
+            assertThat(userUm.getRestrictedProfileParent().isSystem()).isTrue();
+        } finally {
+            removeUser(user);
+        }
+    }
+
+    private NewUserRequest newUserRequest() {
+        final PersistableBundle accountOptions = new PersistableBundle();
+        accountOptions.putString("test_account_option_key", "test_account_option_value");
+
+        return new NewUserRequest.Builder()
+                .setName("test_user")
+                .setUserType(USER_TYPE_FULL_SECONDARY)
+                .setUserIcon(Bitmap.createBitmap(32, 32, Bitmap.Config.RGB_565))
+                .setAccountName(mAccountName)
+                .setAccountType(mAccountType)
+                .setAccountOptions(accountOptions)
+                .build();
+    }
+
+    @Test
+    public void testSomeUserHasAccount() {
+        UserHandle user = null;
+
+        try (PermissionHelper ph = adoptShellPermissionIdentity(mInstrumentation, CREATE_USERS)) {
+            assertThat(mUserManager.someUserHasAccount(mAccountName, mAccountType)).isFalse();
+            user = mUserManager.createUser(newUserRequest()).getUser();
+            assertThat(mUserManager.someUserHasAccount(mAccountName, mAccountType)).isTrue();
+        } finally {
+            removeUser(user);
+        }
+    }
+
+    @Test
+    public void testSomeUserHasAccount_shouldIgnoreToBeRemovedUsers() {
+        try (PermissionHelper ph = adoptShellPermissionIdentity(mInstrumentation, CREATE_USERS)) {
+            final NewUserResponse response = mUserManager.createUser(newUserRequest());
+            assertThat(response.getOperationResult()).isEqualTo(USER_OPERATION_SUCCESS);
+            mUserManager.removeUser(response.getUser());
+            assertThat(mUserManager.someUserHasAccount(mAccountName, mAccountType)).isFalse();
+        }
+    }
+
+    @Test
+    public void testCreateUser_withNewUserRequest_shouldCreateUserWithCorrectProperties()
+            throws PackageManager.NameNotFoundException {
+        UserHandle user = null;
+
+        try (PermissionHelper ph = adoptShellPermissionIdentity(mInstrumentation, CREATE_USERS)) {
+            final NewUserRequest request = newUserRequest();
+            final NewUserResponse response = mUserManager.createUser(request);
+            user = response.getUser();
+
+            assertThat(response.getOperationResult()).isEqualTo(USER_OPERATION_SUCCESS);
+            assertThat(response.isSuccessful()).isTrue();
+            assertThat(user).isNotNull();
+
+            UserManager userManagerOfNewUser = sContext
+                    .createPackageContextAsUser("android", 0, user)
+                    .getSystemService(UserManager.class);
+
+            assertThat(userManagerOfNewUser.getUserName()).isEqualTo(request.getName());
+            // TODO(b/222584163): Remove the if{} clause after v33 Sdk bump.
+            if (Build.VERSION.SDK_INT > Build.VERSION_CODES.S_V2) {
+                assertThat(userManagerOfNewUser.isUserNameSet()).isTrue();
+            }
+            assertThat(userManagerOfNewUser.getUserType()).isEqualTo(request.getUserType());
+            assertThat(userManagerOfNewUser.isUserOfType(request.getUserType())).isEqualTo(true);
+            // We can not test userIcon and accountOptions,
+            // because getters require MANAGE_USERS permission.
+            // And we are already testing accountName and accountType
+            // are set correctly in testSomeUserHasAccount method.
+        } finally {
+            removeUser(user);
+        }
+    }
+
+    @Test
+    public void testCreateUser_withNewUserRequest_shouldNotAllowDuplicateUserAccounts() {
+        UserHandle user1 = null;
+        UserHandle user2 = null;
+
+        try (PermissionHelper ph = adoptShellPermissionIdentity(mInstrumentation, CREATE_USERS)) {
+            final NewUserResponse response1 = mUserManager.createUser(newUserRequest());
+            user1 = response1.getUser();
+
+            assertThat(response1.getOperationResult()).isEqualTo(USER_OPERATION_SUCCESS);
+            assertThat(response1.isSuccessful()).isTrue();
+            assertThat(user1).isNotNull();
+
+            final NewUserResponse response2 = mUserManager.createUser(newUserRequest());
+            user2 = response2.getUser();
+
+            assertThat(response2.getOperationResult()).isEqualTo(
+                    UserManager.USER_OPERATION_ERROR_USER_ACCOUNT_ALREADY_EXISTS);
+            assertThat(response2.isSuccessful()).isFalse();
+            assertThat(user2).isNull();
+        } finally {
+            removeUser(user1);
+            removeUser(user2);
+        }
+    }
+
+    @Test
+    @AppModeFull
+    @RequireFeature(FEATURE_MANAGED_USERS)
+    @EnsureHasPermission(INTERACT_ACROSS_USERS)
+    public void getProfileParent_withNewlyCreatedProfile() {
+        final UserReference parent = TestApis.users().instrumented();
+        try (UserReference profile = TestApis.users().createUser()
+                .parent(parent)
+                .type(TestApis.users().supportedType(UserType.MANAGED_PROFILE_TYPE_NAME))
+                .createAndStart()) {
+            assertThat(mUserManager.getProfileParent(profile.userHandle()))
+                    .isEqualTo(parent.userHandle());
+        }
+    }
+
+    @Test
+    @AppModeFull
+    @EnsureHasPermission(INTERACT_ACROSS_USERS)
+    public void getProfileParent_returnsNullForNonProfile() {
+        assertThat(mUserManager.getProfileParent(TestApis.users().system().userHandle())).isNull();
+    }
+
+    @Test
+    @EnsureHasPermission({CREATE_USERS, QUERY_USERS})
+    public void testGetRemainingCreatableUserCount() {
+        final int maxAllowedIterations = 15;
+        final String userType = USER_TYPE_FULL_SECONDARY;
+        final NewUserRequest request = new NewUserRequest.Builder().build();
+        final ArrayDeque<UserHandle> usersCreated = new ArrayDeque<>();
+
+        try {
+            final int initialRemainingCount = mUserManager.getRemainingCreatableUserCount(userType);
+            assertThat(initialRemainingCount).isAtLeast(0);
+
+            final int numUsersToAdd = Math.min(maxAllowedIterations, initialRemainingCount);
+
+            for (int i = 0; i < numUsersToAdd; i++) {
+                usersCreated.push(mUserManager.createUser(request).getUser());
+                assertThat(mUserManager.getRemainingCreatableUserCount(userType))
+                        .isEqualTo(initialRemainingCount - usersCreated.size());
+            }
+            for (int i = 0; i < numUsersToAdd; i++) {
+                mUserManager.removeUser(usersCreated.pop());
+                assertThat(mUserManager.getRemainingCreatableUserCount(userType))
+                        .isEqualTo(initialRemainingCount - usersCreated.size());
+            }
+        } finally {
+            usersCreated.forEach(this::removeUser);
+        }
+    }
+
+    @Test
+    @EnsureHasPermission({CREATE_USERS, QUERY_USERS})
+    public void testGetRemainingCreatableProfileCount() {
+        final int maxAllowedIterations = 15;
+        final String type = USER_TYPE_PROFILE_MANAGED;
+        final ArrayDeque<UserHandle> profilesCreated = new ArrayDeque<>();
+        final Set<String> disallowedPackages = new HashSet<>();
+        try {
+            final int initialRemainingCount =
+                    mUserManager.getRemainingCreatableProfileCount(type);
+            assertThat(initialRemainingCount).isAtLeast(0);
+
+            final int numUsersToAdd = Math.min(maxAllowedIterations, initialRemainingCount);
+
+            for (int i = 0; i < numUsersToAdd; i++) {
+                profilesCreated.push(mUserManager.createProfile(null, type, disallowedPackages));
+                assertThat(mUserManager.getRemainingCreatableProfileCount(type))
+                        .isEqualTo(initialRemainingCount - profilesCreated.size());
+            }
+            for (int i = 0; i < numUsersToAdd; i++) {
+                mUserManager.removeUser(profilesCreated.pop());
+                assertThat(mUserManager.getRemainingCreatableProfileCount(type))
+                        .isEqualTo(initialRemainingCount - profilesCreated.size());
+            }
+        } finally {
+            profilesCreated.forEach(this::removeUser);
         }
     }
 }
diff --git a/tests/tests/nativehardware/jni/AHardwareBufferGLTest.cpp b/tests/tests/nativehardware/jni/AHardwareBufferGLTest.cpp
index c6573b9..429cc76 100644
--- a/tests/tests/nativehardware/jni/AHardwareBufferGLTest.cpp
+++ b/tests/tests/nativehardware/jni/AHardwareBufferGLTest.cpp
@@ -76,6 +76,7 @@
         FORMAT_CASE(D32_FLOAT_S8_UINT);
         FORMAT_CASE(S8_UINT);
         FORMAT_CASE(Y8Cb8Cr8_420);
+        FORMAT_CASE(R8_UNORM);
         GL_FORMAT_CASE(GL_RGB8);
         GL_FORMAT_CASE(GL_RGBA8);
         GL_FORMAT_CASE(GL_RGB565);
@@ -85,6 +86,7 @@
         GL_FORMAT_CASE(GL_DEPTH_COMPONENT16);
         GL_FORMAT_CASE(GL_DEPTH24_STENCIL8);
         GL_FORMAT_CASE(GL_STENCIL_INDEX8);
+        GL_FORMAT_CASE(GL_R8);
     }
     return "";
 }
@@ -2647,4 +2649,27 @@
         AHardwareBuffer_Desc{17, 23, 7, AHARDWAREBUFFER_FORMAT_D32_FLOAT_S8_UINT, 0, 0, 0, 0}),
     &GetTestName);
 
+class R8Test : public AHardwareBufferGLTest {};
+
+// Verify that if we can allocate an R8 AHB we can render to it.
+TEST_P(R8Test, Write) {
+    AHardwareBuffer_Desc desc = GetParam();
+    if (!SetUpBuffer(desc)) {
+        return;
+    }
+
+    ASSERT_NO_FATAL_FAILURE(SetUpFramebuffer(desc.width, desc.height, 0, kBufferAsRenderbuffer));
+    ASSERT_NO_FATAL_FAILURE(
+        SetUpProgram(kVertexShader, kColorFragmentShader, kPyramidPositions, 0.5f));
+
+    glDrawArrays(GL_TRIANGLES, 0, kPyramidVertexCount);
+    ASSERT_EQ(GLenum{GL_NO_ERROR}, glGetError());
+}
+
+INSTANTIATE_TEST_CASE_P(
+    SingleLayer, R8Test,
+    ::testing::Values(
+        AHardwareBuffer_Desc{57, 33, 1, AHARDWAREBUFFER_FORMAT_R8_UNORM, 0, 0, 0, 0}),
+    &GetTestName);
+
 }  // namespace android
diff --git a/tests/tests/nativemedia/aaudio/jni/Android.bp b/tests/tests/nativemedia/aaudio/jni/Android.bp
index 14e781d..7f694a0 100644
--- a/tests/tests/nativemedia/aaudio/jni/Android.bp
+++ b/tests/tests/nativemedia/aaudio/jni/Android.bp
@@ -25,6 +25,7 @@
     srcs: [
         "test_aaudio.cpp",
         "test_aaudio_attributes.cpp",
+        "test_aaudio_basic.cpp",
         "test_aaudio_callback.cpp",
         "test_aaudio_mmap.cpp",
         "test_aaudio_misc.cpp",
diff --git a/tests/tests/nativemedia/aaudio/jni/test_aaudio_basic.cpp b/tests/tests/nativemedia/aaudio/jni/test_aaudio_basic.cpp
new file mode 100644
index 0000000..dd13904
--- /dev/null
+++ b/tests/tests/nativemedia/aaudio/jni/test_aaudio_basic.cpp
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2022 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.
+ */
+
+// Tests basic AAudio input and output.
+
+#include <stdio.h>
+#include <unistd.h>
+
+#include <aaudio/AAudio.h>
+#include <gtest/gtest.h>
+
+#include "utils.h"
+
+using TestAAudioBasicParams = std::tuple<aaudio_performance_mode_t, aaudio_direction_t>;
+
+enum {
+    PARAM_PERFORMANCE_MODE = 0,
+    PARAM_DIRECTION,
+};
+
+class TestAAudioBasic : public ::testing::Test,
+                         public ::testing::WithParamInterface<TestAAudioBasicParams> {
+
+protected:
+    static void testConfiguration(aaudio_performance_mode_t perfMode,
+                                 aaudio_direction_t direction) {
+        if (direction == AAUDIO_DIRECTION_INPUT) {
+            if (!deviceSupportsFeature(FEATURE_RECORDING)) return;
+        } else {
+            if (!deviceSupportsFeature(FEATURE_PLAYBACK)) return;
+        }
+        float buffer[kNumFrames * kChannelCount] = {};
+
+        AAudioStreamBuilder *aaudioBuilder = nullptr;
+        AAudioStream *aaudioStream = nullptr;
+
+        // Use an AAudioStreamBuilder to contain requested parameters.
+        ASSERT_EQ(AAUDIO_OK, AAudio_createStreamBuilder(&aaudioBuilder));
+
+        // Request stream properties.
+        AAudioStreamBuilder_setPerformanceMode(aaudioBuilder, perfMode);
+        AAudioStreamBuilder_setDirection(aaudioBuilder, direction);
+        AAudioStreamBuilder_setChannelCount(aaudioBuilder, kChannelCount);
+        AAudioStreamBuilder_setFormat(aaudioBuilder, AAUDIO_FORMAT_PCM_FLOAT);
+
+        // Create an AAudioStream using the Builder.
+        ASSERT_EQ(AAUDIO_OK, AAudioStreamBuilder_openStream(aaudioBuilder, &aaudioStream));
+        AAudioStreamBuilder_delete(aaudioBuilder);
+
+        EXPECT_EQ(AAUDIO_OK, AAudioStream_requestStart(aaudioStream));
+
+        if (direction == AAUDIO_DIRECTION_INPUT) {
+            EXPECT_EQ(kNumFrames,
+                      AAudioStream_read(aaudioStream, &buffer, kNumFrames, kNanosPerSecond));
+        } else {
+            EXPECT_EQ(kNumFrames,
+                      AAudioStream_write(aaudioStream, &buffer, kNumFrames, kNanosPerSecond));
+        }
+
+        EXPECT_EQ(AAUDIO_OK, AAudioStream_requestStop(aaudioStream));
+
+        EXPECT_EQ(AAUDIO_OK, AAudioStream_close(aaudioStream));
+    }
+    static constexpr int64_t kNanosPerSecond = 1000000000;
+    static constexpr int kNumFrames = 256;
+    static constexpr int kChannelCount = 2;
+};
+
+const char* directionToString(aaudio_sharing_mode_t direction) {
+    switch (direction) {
+        case AAUDIO_DIRECTION_OUTPUT: return "OUTPUT";
+        case AAUDIO_DIRECTION_INPUT: return "INPUT";
+    }
+    return "UNKNOWN";
+}
+
+static std::string getTestName(const ::testing::TestParamInfo<TestAAudioBasicParams>& info) {
+    return std::string()
+            + performanceModeToString(std::get<PARAM_PERFORMANCE_MODE>(info.param))
+            + "__" + directionToString(std::get<PARAM_DIRECTION>(info.param));
+}
+
+TEST_P(TestAAudioBasic, TestBasic) {
+    testConfiguration(std::get<PARAM_PERFORMANCE_MODE>(GetParam()),
+            std::get<PARAM_DIRECTION>(GetParam()));
+}
+
+INSTANTIATE_TEST_SUITE_P(
+        AAudioBasic,
+        TestAAudioBasic,
+        ::testing::Values(
+                TestAAudioBasicParams({AAUDIO_PERFORMANCE_MODE_NONE, AAUDIO_DIRECTION_OUTPUT}),
+                TestAAudioBasicParams({AAUDIO_PERFORMANCE_MODE_NONE, AAUDIO_DIRECTION_INPUT}),
+                TestAAudioBasicParams({AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
+                                       AAUDIO_DIRECTION_OUTPUT}),
+                TestAAudioBasicParams({AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
+                                       AAUDIO_DIRECTION_INPUT})),
+        &getTestName
+);
\ No newline at end of file
diff --git a/tests/tests/nativemedia/aaudio/jni/test_aaudio_callback.cpp b/tests/tests/nativemedia/aaudio/jni/test_aaudio_callback.cpp
index 1b8cf44..0541943 100644
--- a/tests/tests/nativemedia/aaudio/jni/test_aaudio_callback.cpp
+++ b/tests/tests/nativemedia/aaudio/jni/test_aaudio_callback.cpp
@@ -142,6 +142,28 @@
         }
     };
 
+    void createAndVerifyHonoringMMap() {
+        aaudio_policy_t originalPolicy = AAUDIO_POLICY_AUTO;
+
+        // Turn off MMap if requested.
+        bool allowMMap = std::get<PARAM_ALLOW_MMAP>(GetParam()) == MMAP_ALLOWED;
+        if (AAudioExtensions::getInstance().isMMapSupported()) {
+            originalPolicy = AAudioExtensions::getInstance().getMMapPolicy();
+            AAudioExtensions::getInstance().setMMapEnabled(allowMMap);
+        }
+
+        mHelper->createAndVerifyStream(&mSetupSuccessful);
+
+        // Restore policy for next test.
+        if (AAudioExtensions::getInstance().isMMapSupported()) {
+            AAudioExtensions::getInstance().setMMapPolicy(originalPolicy);
+        }
+        // Make sure we do not get MMAP when we disable it.
+        if (mSetupSuccessful && !allowMMap) {
+            ASSERT_FALSE(AAudioExtensions::getInstance().isMMapUsed(mHelper->stream()));
+        }
+    }
+
     static void MyErrorCallbackProc(AAudioStream *stream, void *userData, aaudio_result_t error);
 
     AAudioStreamBuilder* builder() const { return mHelper->builder(); }
@@ -149,7 +171,7 @@
     const StreamBuilderHelper::Parameters& actual() const { return mHelper->actual(); }
 
     std::unique_ptr<T> mHelper;
-    bool mSetupSuccesful = false;
+    bool mSetupSuccessful = false;
     std::unique_ptr<AAudioCallbackTestData> mCbData;
 };
 
@@ -179,9 +201,8 @@
 }
 
 void AAudioInputStreamCallbackTest::SetUp() {
-    aaudio_policy_t originalPolicy = AAUDIO_POLICY_AUTO;
 
-    mSetupSuccesful = false;
+    mSetupSuccessful = false;
     if (!deviceSupportsFeature(FEATURE_RECORDING)) return;
     mHelper.reset(new InputStreamBuilderHelper(
                     std::get<PARAM_SHARING_MODE>(GetParam()),
@@ -198,28 +219,12 @@
         AAudioStreamBuilder_setFramesPerDataCallback(builder(), framesPerDataCallback);
     }
 
-    // Turn off MMap if requested.
-    int allowMMap = std::get<PARAM_ALLOW_MMAP>(GetParam()) == MMAP_ALLOWED;
-    if (AAudioExtensions::getInstance().isMMapSupported()) {
-        originalPolicy = AAudioExtensions::getInstance().getMMapPolicy();
-        AAudioExtensions::getInstance().setMMapEnabled(allowMMap);
-    }
-
-    mHelper->createAndVerifyStream(&mSetupSuccesful);
-
-    // Restore policy for next test.
-    if (AAudioExtensions::getInstance().isMMapSupported()) {
-        AAudioExtensions::getInstance().setMMapPolicy(originalPolicy);
-    }
-    if (!allowMMap) {
-        ASSERT_FALSE(AAudioExtensions::getInstance().isMMapUsed(mHelper->stream()));
-    }
-
+    createAndVerifyHonoringMMap();
 }
 
 // Test starting and stopping an INPUT AAudioStream that uses a Callback
 TEST_P(AAudioInputStreamCallbackTest, testRecording) {
-    if (!mSetupSuccesful) return;
+    if (!mSetupSuccessful) return;
 
     const int32_t framesPerDataCallback = std::get<PARAM_FRAMES_PER_CB>(GetParam());
     const int32_t streamFramesPerDataCallback = AAudioStream_getFramesPerDataCallback(stream());
@@ -346,7 +351,7 @@
 }
 
 void AAudioOutputStreamCallbackTest::SetUp() {
-    mSetupSuccesful = false;
+    mSetupSuccessful = false;
     if (!deviceSupportsFeature(FEATURE_PLAYBACK)) return;
     mHelper.reset(new OutputStreamBuilderHelper(
                     std::get<PARAM_SHARING_MODE>(GetParam()),
@@ -363,13 +368,13 @@
         AAudioStreamBuilder_setFramesPerDataCallback(builder(), framesPerDataCallback);
     }
 
-    mHelper->createAndVerifyStream(&mSetupSuccesful);
+    createAndVerifyHonoringMMap();
 
 }
 
 // Test starting and stopping an OUTPUT AAudioStream that uses a Callback
 TEST_P(AAudioOutputStreamCallbackTest, testPlayback) {
-    if (!mSetupSuccesful) return;
+    if (!mSetupSuccessful) return;
 
     const int32_t framesPerDataCallback = std::get<PARAM_FRAMES_PER_CB>(GetParam());
     const int32_t streamFramesPerDataCallback = AAudioStream_getFramesPerDataCallback(stream());
diff --git a/tests/tests/nativemedia/aaudio/jni/test_aaudio_stream_builder.cpp b/tests/tests/nativemedia/aaudio/jni/test_aaudio_stream_builder.cpp
index 3849f1f..006e432 100644
--- a/tests/tests/nativemedia/aaudio/jni/test_aaudio_stream_builder.cpp
+++ b/tests/tests/nativemedia/aaudio/jni/test_aaudio_stream_builder.cpp
@@ -53,6 +53,7 @@
 static void try_opening_audio_stream(AAudioStreamBuilder *aaudioBuilder, Expect expect) {
     // Create an AAudioStream using the Builder.
     AAudioStream *aaudioStream = nullptr;
+    int64_t beforeTimeNanos = getNanoseconds();
     aaudio_result_t result = AAudioStreamBuilder_openStream(aaudioBuilder, &aaudioStream);
     if (expect == Expect::FAIL) {
         ASSERT_NE(AAUDIO_OK, result);
@@ -65,10 +66,19 @@
                 || ((result == AAUDIO_OK) && (aaudioStream != nullptr)));
     }
 
+    // The stream should be open within one second.
+    static const int64_t kNanosPerSecond = 1e9;
+    ASSERT_LT(getNanoseconds() - beforeTimeNanos, kNanosPerSecond)
+            << "It took more than one second to open stream";
+
     // Cleanup
     ASSERT_EQ(AAUDIO_OK, AAudioStreamBuilder_delete(aaudioBuilder));
     if (aaudioStream != nullptr) {
+        beforeTimeNanos = getNanoseconds();
         ASSERT_EQ(AAUDIO_OK, AAudioStream_close(aaudioStream));
+        // The stream should be closed within one second.
+        ASSERT_LT(getNanoseconds() - beforeTimeNanos, kNanosPerSecond)
+                << "It took more than one second to close stream";
     }
 }
 
@@ -595,3 +605,67 @@
                 std::make_pair(AAUDIO_DIRECTION_INPUT, AAUDIO_CHANNEL_5POINT1),
                 std::make_pair(AAUDIO_DIRECTION_INPUT, AAUDIO_UNSPECIFIED)),
         &AAudioStreamBuilderChannelMaskAndCountTest::getTestName);
+
+using CommonCombinationTestParams = std::tuple<aaudio_direction_t,
+                                               aaudio_sharing_mode_t,
+                                               aaudio_performance_mode_t,
+                                               int32_t /*sample rate*/,
+                                               aaudio_format_t,
+                                               aaudio_channel_mask_t>;
+enum {
+    PARAM_DIRECTION = 0,
+    PARAM_SHARING_MODE,
+    PARAM_PERFORMANCE_MODE,
+    PARAM_SAMPLE_RATE,
+    PARAM_FORMAT,
+    PARAM_CHANNEL_MASK
+};
+class AAudioStreamBuilderCommonCombinationTest :
+        public ::testing::TestWithParam<CommonCombinationTestParams> {
+  public:
+    static std::string getTestName(
+            const ::testing::TestParamInfo<CommonCombinationTestParams>& info) {
+        std::stringstream ss;
+        ss << (std::get<PARAM_DIRECTION>(info.param) == AAUDIO_DIRECTION_INPUT ? "INPUT_"
+                                                                               : "OUTPUT_")
+           << sharingModeToString(std::get<PARAM_SHARING_MODE>(info.param)) << "_"
+           << performanceModeToString(std::get<PARAM_PERFORMANCE_MODE>(info.param)) << "_"
+           << "sampleRate_" << std::get<PARAM_SAMPLE_RATE>(info.param) << "_"
+           << "format_0x" << std::hex << std::get<PARAM_FORMAT>(info.param) << "_"
+           << "channelMask_0x" << std::get<PARAM_CHANNEL_MASK>(info.param) << "";
+        return ss.str();
+    }
+};
+
+TEST_P(AAudioStreamBuilderCommonCombinationTest, openStream) {
+    if (!deviceSupportsFeature(FEATURE_PLAYBACK)) return;
+    AAudioStreamBuilder *aaudioBuilder = nullptr;
+    create_stream_builder(&aaudioBuilder);
+    const auto param = GetParam();
+    AAudioStreamBuilder_setDirection(aaudioBuilder, std::get<PARAM_DIRECTION>(param));
+    AAudioStreamBuilder_setSharingMode(aaudioBuilder, std::get<PARAM_SHARING_MODE>(param));
+    AAudioStreamBuilder_setPerformanceMode(aaudioBuilder, std::get<PARAM_PERFORMANCE_MODE>(param));
+    AAudioStreamBuilder_setSampleRate(aaudioBuilder, std::get<PARAM_SAMPLE_RATE>(param));
+    AAudioStreamBuilder_setFormat(aaudioBuilder, std::get<PARAM_FORMAT>(param));
+    AAudioStreamBuilder_setChannelMask(aaudioBuilder, std::get<PARAM_CHANNEL_MASK>(param));
+    // All the test parameters all reasonable values with different combination. In that case,
+    // it is expected that the opening will be successful.
+    try_opening_audio_stream(aaudioBuilder, Expect::SUCCEED);
+}
+
+INSTANTIATE_TEST_CASE_P(CommonComb, AAudioStreamBuilderCommonCombinationTest,
+        ::testing::Combine(
+                ::testing::Values(AAUDIO_DIRECTION_OUTPUT, AAUDIO_DIRECTION_INPUT),
+                ::testing::Values(AAUDIO_SHARING_MODE_SHARED, AAUDIO_SHARING_MODE_EXCLUSIVE),
+                ::testing::Values(
+                        AAUDIO_PERFORMANCE_MODE_NONE,
+                        AAUDIO_PERFORMANCE_MODE_POWER_SAVING,
+                        AAUDIO_PERFORMANCE_MODE_LOW_LATENCY),
+                ::testing::Values(// Sample rate
+                        AAUDIO_UNSPECIFIED, 8000, 16000, 44100, 48000, 96000, 192000),
+                ::testing::Values(
+                        AAUDIO_UNSPECIFIED,
+                        AAUDIO_FORMAT_PCM_I16,
+                        AAUDIO_FORMAT_PCM_FLOAT),
+                ::testing::Values(AAUDIO_CHANNEL_MONO, AAUDIO_CHANNEL_STEREO)),
+        &AAudioStreamBuilderCommonCombinationTest::getTestName);
diff --git a/tests/tests/nativemedia/aaudio/jni/utils.cpp b/tests/tests/nativemedia/aaudio/jni/utils.cpp
index a9ed984..ebe2f56 100644
--- a/tests/tests/nativemedia/aaudio/jni/utils.cpp
+++ b/tests/tests/nativemedia/aaudio/jni/utils.cpp
@@ -214,13 +214,6 @@
     AAudioStreamBuilder_setBufferCapacityInFrames(mBuilder, kBufferCapacityFrames);
 }
 
-void OutputStreamBuilderHelper::createAndVerifyStream(bool *success) {
-    StreamBuilderHelper::createAndVerifyStream(success);
-    if (*success) {
-        ASSERT_GE(AAudioStream_getBufferCapacityInFrames(mStream), kBufferCapacityFrames);
-    }
-}
-
 AAudioExtensions::AAudioExtensions()
     : mMMapSupported(isPolicyEnabled(getMMapPolicyProperty()))
     , mMMapExclusiveSupported(isPolicyEnabled(getIntegerProperty(
@@ -267,4 +260,5 @@
     }
     mFunctionsLoaded = true;
     return mFunctionsLoaded;
-}
\ No newline at end of file
+}
+
diff --git a/tests/tests/nativemedia/aaudio/jni/utils.h b/tests/tests/nativemedia/aaudio/jni/utils.h
index 8294eca..5674496 100644
--- a/tests/tests/nativemedia/aaudio/jni/utils.h
+++ b/tests/tests/nativemedia/aaudio/jni/utils.h
@@ -115,7 +115,6 @@
             aaudio_performance_mode_t requestedPerfMode,
             aaudio_format_t requestedFormat = AAUDIO_FORMAT_PCM_I16);
     void initBuilder();
-    void createAndVerifyStream(bool *success);
 
   private:
     const int32_t kBufferCapacityFrames = 2000;
diff --git a/tests/tests/nativemedia/resourceobserver/OWNERS b/tests/tests/nativemedia/resourceobserver/OWNERS
index 5679184..167c365 100644
--- a/tests/tests/nativemedia/resourceobserver/OWNERS
+++ b/tests/tests/nativemedia/resourceobserver/OWNERS
@@ -1,4 +1,3 @@
 # Bug component: 1344
-chz@google.com
 wonsik@google.com
 lajos@google.com
diff --git a/tests/tests/nativemidi/java/android/nativemidi/cts/NativeMidiEchoTest.java b/tests/tests/nativemidi/java/android/nativemidi/cts/NativeMidiEchoTest.java
index 960149b..c8c6441 100644
--- a/tests/tests/nativemidi/java/android/nativemidi/cts/NativeMidiEchoTest.java
+++ b/tests/tests/nativemidi/java/android/nativemidi/cts/NativeMidiEchoTest.java
@@ -21,7 +21,6 @@
 import android.media.midi.MidiDevice;
 import android.media.midi.MidiDeviceInfo;
 import android.media.midi.MidiManager;
-import android.os.Bundle;
 import android.util.Log;
 
 import androidx.test.InstrumentationRegistry;
@@ -100,7 +99,7 @@
         for(int buffIndex = 0; buffIndex < numMessages; buffIndex++) {
             messageLen = (int)(mRandom.nextFloat() * (maxMessageLen-1)) + 1;
             buffers[buffIndex] = generateRandomMessage(messageLen);
-            timestamps[buffIndex] = mRandom.nextLong();
+            timestamps[buffIndex] = Math.abs(mRandom.nextLong());
         }
     }
 
@@ -474,6 +473,20 @@
         Assert.assertEquals("failed pure native latency test.", 0, result);
     }
 
+    /**
+     * Checks that getDefaultProtocol returns a valid value.
+     */
+    @Test
+    public void test_J_GetDefaultProtocol() throws Exception {
+        if (!hasMidiSupport()) {
+            return;
+        }
+
+        int defaultProtocol = getDefaultProtocol(mTestContext);
+        Assert.assertEquals("default protocol incorrect.",
+                MidiDeviceInfo.PROTOCOL_UNKNOWN, defaultProtocol);
+    }
+
     // Native Routines
     public static native void initN();
 
@@ -507,4 +520,7 @@
     // Pure Native Checks
     public native int matchNativeMessages(long ctx);
     public native int checkNativeLatency(long ctx, long maxLatencyNanos);
+
+    // AMidiDevice getters
+    public native int getDefaultProtocol(long ctx);
 }
diff --git a/tests/tests/nativemidi/jni/native-lib.cpp b/tests/tests/nativemidi/jni/native-lib.cpp
index 5a2f0ca..00cfb08 100644
--- a/tests/tests/nativemidi/jni/native-lib.cpp
+++ b/tests/tests/nativemidi/jni/native-lib.cpp
@@ -544,4 +544,13 @@
     return ((TestContext*)ctx)->checkInOutLatency(maxLatencyNanos);
 }
 
+JNIEXPORT jint JNICALL Java_android_nativemidi_cts_NativeMidiEchoTest_getDefaultProtocol(
+        JNIEnv*, jobject, jlong ctx) {
+
+    TestContext* context = (TestContext*)ctx;
+
+    return AMidiDevice_getDefaultProtocol(context->nativeDevice);
+}
+
+
 } // extern "C"
diff --git a/tests/tests/notificationlegacy/notificationlegacy20/Android.bp b/tests/tests/notificationlegacy/notificationlegacy20/Android.bp
index affcee1..5a0d2ad 100644
--- a/tests/tests/notificationlegacy/notificationlegacy20/Android.bp
+++ b/tests/tests/notificationlegacy/notificationlegacy20/Android.bp
@@ -25,6 +25,8 @@
         "ctstestrunner-axt",
         "androidx.test.rules",
         "junit",
+        "permission-test-util-lib",
+        "compatibility-device-util-axt",
     ],
     libs: [
         "android.test.runner",
diff --git a/tests/tests/notificationlegacy/notificationlegacy20/src/android/app/notification/legacy20/cts/LegacyNotificationManager20Test.java b/tests/tests/notificationlegacy/notificationlegacy20/src/android/app/notification/legacy20/cts/LegacyNotificationManager20Test.java
index 8d2931f..e5564e3 100644
--- a/tests/tests/notificationlegacy/notificationlegacy20/src/android/app/notification/legacy20/cts/LegacyNotificationManager20Test.java
+++ b/tests/tests/notificationlegacy/notificationlegacy20/src/android/app/notification/legacy20/cts/LegacyNotificationManager20Test.java
@@ -16,6 +16,10 @@
 
 package android.app.notification.legacy20.cts;
 
+import static android.Manifest.permission.POST_NOTIFICATIONS;
+import static android.Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL;
+import static android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS;
+
 import static junit.framework.Assert.fail;
 
 import static org.junit.Assert.assertNotNull;
@@ -33,6 +37,9 @@
 import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
+import android.os.Process;
+import android.permission.PermissionManager;
+import android.permission.cts.PermissionUtils;
 import android.provider.Telephony.Threads;
 import android.service.notification.StatusBarNotification;
 import android.util.Log;
@@ -40,6 +47,8 @@
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.SystemUtil;
+
 import junit.framework.Assert;
 
 import org.junit.After;
@@ -68,6 +77,7 @@
     @Before
     public void setUp() throws Exception {
         mContext = InstrumentationRegistry.getContext();
+        PermissionUtils.grantPermission(mContext.getPackageName(), POST_NOTIFICATIONS);
         toggleListenerAccess(TestNotificationListener.getId(),
                 InstrumentationRegistry.getInstrumentation(), false);
         mNotificationManager = (NotificationManager) mContext.getSystemService(
@@ -79,6 +89,15 @@
 
     @After
     public void tearDown() throws Exception {
+        // Use test API to prevent PermissionManager from killing the test process when revoking
+        // permission.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> mContext.getSystemService(PermissionManager.class)
+                        .revokePostNotificationPermissionWithoutKillForTest(
+                                mContext.getPackageName(),
+                                Process.myUserHandle().getIdentifier()),
+                REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL,
+                REVOKE_RUNTIME_PERMISSIONS);
         toggleListenerAccess(TestNotificationListener.getId(),
                 InstrumentationRegistry.getInstrumentation(), false);
         Thread.sleep(500); // wait for listener to disconnect
diff --git a/tests/tests/notificationlegacy/notificationlegacy27/Android.bp b/tests/tests/notificationlegacy/notificationlegacy27/Android.bp
index 144ceac..b6033e1 100644
--- a/tests/tests/notificationlegacy/notificationlegacy27/Android.bp
+++ b/tests/tests/notificationlegacy/notificationlegacy27/Android.bp
@@ -25,6 +25,8 @@
         "ctstestrunner-axt",
         "androidx.test.rules",
         "junit",
+        "permission-test-util-lib",
+        "compatibility-device-util-axt",
     ],
     libs: [
         "android.test.runner",
diff --git a/tests/tests/notificationlegacy/notificationlegacy27/src/android/app/notification/legacy/cts/LegacyNotificationManagerTest.java b/tests/tests/notificationlegacy/notificationlegacy27/src/android/app/notification/legacy/cts/LegacyNotificationManagerTest.java
index 642dc72..e4ba869 100644
--- a/tests/tests/notificationlegacy/notificationlegacy27/src/android/app/notification/legacy/cts/LegacyNotificationManagerTest.java
+++ b/tests/tests/notificationlegacy/notificationlegacy27/src/android/app/notification/legacy/cts/LegacyNotificationManagerTest.java
@@ -16,6 +16,7 @@
 
 package android.app.notification.legacy.cts;
 
+import static android.Manifest.permission.POST_NOTIFICATIONS;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_LIGHTS;
 import static android.app.NotificationManager.Policy.SUPPRESSED_EFFECT_NOTIFICATION_LIST;
@@ -28,17 +29,16 @@
 
 import static org.junit.Assert.assertTrue;
 
-import android.app.ActivityManager;
 import android.app.Instrumentation;
 import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.UiAutomation;
-import android.content.pm.PackageManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Build;
 import android.os.ParcelFileDescriptor;
 import android.provider.Telephony.Threads;
@@ -75,6 +75,8 @@
     @Before
     public void setUp() throws Exception {
         mContext = InstrumentationRegistry.getContext();
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .adoptShellPermissionIdentity(POST_NOTIFICATIONS);
         toggleListenerAccess(TestNotificationListener.getId(),
                 InstrumentationRegistry.getInstrumentation(), false);
         toggleListenerAccess(SecondaryNotificationListener.getId(),
@@ -87,6 +89,8 @@
 
     @After
     public void tearDown() throws Exception {
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .dropShellPermissionIdentity();
         toggleListenerAccess(TestNotificationListener.getId(),
                 InstrumentationRegistry.getInstrumentation(), false);
         toggleListenerAccess(SecondaryNotificationListener.getId(),
@@ -180,27 +184,25 @@
     public void testSuspendPackage() throws Exception {
         toggleListenerAccess(TestNotificationListener.getId(),
                 InstrumentationRegistry.getInstrumentation(), true);
-        Thread.sleep(500); // wait for listener to be allowed
+        Thread.sleep(1000); // wait for listener to be allowed
 
         mListener = TestNotificationListener.getInstance();
         Assert.assertNotNull(mListener);
 
         sendNotification(1, R.drawable.icon_black);
-        Thread.sleep(500); // wait for notification listener to receive notification
-        assertEquals(1, mListener.mPosted.size());
+        assertTrue(pollForPostedNotifications(1));
         mListener.resetData();
 
         // suspend package, listener receives onRemoved
         suspendPackage(mContext.getPackageName(), InstrumentationRegistry.getInstrumentation(),
                 true);
-        Thread.sleep(500); // wait for notification listener to get response
-        assertEquals(1, mListener.mRemoved.size());
+        Thread.sleep(1000); // wait for notification listener to get response
+        assertTrue(pollForRemovedNotifications(1));
 
         // unsuspend package, listener receives onPosted
         suspendPackage(mContext.getPackageName(), InstrumentationRegistry.getInstrumentation(),
                 false);
-        Thread.sleep(500); // wait for notification listener to get response
-        assertEquals(1, mListener.mPosted.size());
+        assertTrue(pollForPostedNotifications(1));
 
         toggleListenerAccess(TestNotificationListener.getId(),
                 InstrumentationRegistry.getInstrumentation(), false);
@@ -223,14 +225,13 @@
         Thread.sleep(500); // wait for notification listener to get response
 
         sendNotification(1, R.drawable.icon_black);
-        Thread.sleep(500); // wait for notification listener in case it receives notification
+        Thread.sleep(1000); // wait for notification listener in case it receives notification
         assertEquals(0, mListener.mPosted.size()); // shouldn't see any notifications posted
 
         // unsuspend package, listener should receive onPosted
         suspendPackage(mContext.getPackageName(), InstrumentationRegistry.getInstrumentation(),
                 false);
-        Thread.sleep(500); // wait for notification listener to get response
-        assertEquals(1, mListener.mPosted.size());
+        assertTrue(pollForPostedNotifications(1));
 
         toggleListenerAccess(TestNotificationListener.getId(),
                 InstrumentationRegistry.getInstrumentation(), false);
@@ -320,13 +321,13 @@
         assertEquals(Build.VERSION_CODES.O_MR1, mContext.getApplicationInfo().targetSdkVersion);
         toggleListenerAccess(TestNotificationListener.getId(),
                 InstrumentationRegistry.getInstrumentation(), true);
-        Thread.sleep(500); // wait for listener to be allowed
+        Thread.sleep(1000); // wait for listener to be allowed
         mListener = TestNotificationListener.getInstance();
 
         sendNotification(566, R.drawable.icon_black);
 
-        Thread.sleep(500); // wait for notification listener to receive notification
-        assertEquals(1, mListener.mPosted.size());
+        // wait for notification listener to receive notification
+        assertTrue(pollForPostedNotifications(1));
         String key = mListener.mPosted.get(0).getKey();
 
         mNotificationManager.deleteNotificationChannel(NOTIFICATION_CHANNEL_ID);
@@ -359,6 +360,36 @@
         mNotificationManager.notify(id, notification);
     }
 
+    // Wait for the listener to have received the specified number of posted notifications.
+    private boolean pollForPostedNotifications(int expected) {
+        for (int tries = 5; tries-- > 0; ) {
+            if (mListener.mPosted.size() >= expected) {
+                return true;
+            }
+            try {
+                Thread.sleep(2000);
+            } catch (InterruptedException ex) {
+                // pass
+            }
+        }
+        return false;
+    }
+
+    // Wait for the listener to have received the specified number of removed notifications.
+    private boolean pollForRemovedNotifications(int expected) {
+        for (int tries = 5; tries-- > 0; ) {
+            if (mListener.mRemoved.size() >= expected) {
+                return true;
+            }
+            try {
+                Thread.sleep(2000);
+            } catch (InterruptedException ex) {
+                // pass
+            }
+        }
+        return false;
+    }
+
     private int getCancellationReason(String key) {
         for (int tries = 3; tries-- > 0; ) {
             if (mListener.mRemoved.containsKey(key)) {
diff --git a/tests/tests/notificationlegacy/notificationlegacy28/Android.bp b/tests/tests/notificationlegacy/notificationlegacy28/Android.bp
index 6a52f46..794ecf4 100644
--- a/tests/tests/notificationlegacy/notificationlegacy28/Android.bp
+++ b/tests/tests/notificationlegacy/notificationlegacy28/Android.bp
@@ -25,6 +25,8 @@
         "ctstestrunner-axt",
         "androidx.test.rules",
         "junit",
+        "permission-test-util-lib",
+        "compatibility-device-util-axt",
     ],
     libs: [
         "android.test.runner",
diff --git a/tests/tests/notificationlegacy/notificationlegacy28/src/android/app/notification/legacy28/cts/NotificationManager28Test.java b/tests/tests/notificationlegacy/notificationlegacy28/src/android/app/notification/legacy28/cts/NotificationManager28Test.java
index cf8981d..828c356 100644
--- a/tests/tests/notificationlegacy/notificationlegacy28/src/android/app/notification/legacy28/cts/NotificationManager28Test.java
+++ b/tests/tests/notificationlegacy/notificationlegacy28/src/android/app/notification/legacy28/cts/NotificationManager28Test.java
@@ -16,6 +16,10 @@
 
 package android.app.notification.legacy28.cts;
 
+import static android.Manifest.permission.POST_NOTIFICATIONS;
+import static android.Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL;
+import static android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS;
+
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
 
@@ -25,12 +29,18 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Process;
+import android.permission.PermissionManager;
+import android.permission.cts.PermissionUtils;
 import android.service.notification.StatusBarNotification;
 import android.util.Log;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -49,13 +59,26 @@
     @Before
     public void setUp() throws Exception {
         mContext = InstrumentationRegistry.getContext();
-
+        PermissionUtils.grantPermission(mContext.getPackageName(), POST_NOTIFICATIONS);
         mNotificationManager = (NotificationManager) mContext.getSystemService(
                 Context.NOTIFICATION_SERVICE);
         mNotificationManager.createNotificationChannel(new NotificationChannel(
                 NOTIFICATION_CHANNEL_ID, "name", NotificationManager.IMPORTANCE_DEFAULT));
     }
 
+    @After
+    public void tearDown() throws Exception {
+        // Use test API to prevent PermissionManager from killing the test process when revoking
+        // permission.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> mContext.getSystemService(PermissionManager.class)
+                        .revokePostNotificationPermissionWithoutKillForTest(
+                                mContext.getPackageName(),
+                                Process.myUserHandle().getIdentifier()),
+                REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL,
+                REVOKE_RUNTIME_PERMISSIONS);
+    }
+
     @Test
     public void testPostFullScreenIntent_noPermission() {
         // No Full screen intent permission; but full screen intent should still be allowed
diff --git a/tests/tests/notificationlegacy/notificationlegacy29/Android.bp b/tests/tests/notificationlegacy/notificationlegacy29/Android.bp
index 0d01e20..ca03efa 100644
--- a/tests/tests/notificationlegacy/notificationlegacy29/Android.bp
+++ b/tests/tests/notificationlegacy/notificationlegacy29/Android.bp
@@ -24,6 +24,8 @@
         "ctstestrunner-axt",
         "androidx.test.rules",
         "junit",
+        "permission-test-util-lib",
+        "compatibility-device-util-axt",
     ],
     libs: [
         "android.test.runner",
diff --git a/tests/tests/notificationlegacy/notificationlegacy29/src/android/app/notification/legacy29/cts/NotificationAssistantServiceTest.java b/tests/tests/notificationlegacy/notificationlegacy29/src/android/app/notification/legacy29/cts/NotificationAssistantServiceTest.java
index c02c091..b5b7751 100644
--- a/tests/tests/notificationlegacy/notificationlegacy29/src/android/app/notification/legacy29/cts/NotificationAssistantServiceTest.java
+++ b/tests/tests/notificationlegacy/notificationlegacy29/src/android/app/notification/legacy29/cts/NotificationAssistantServiceTest.java
@@ -16,6 +16,9 @@
 
 package android.app.notification.legacy29.cts;
 
+import static android.Manifest.permission.POST_NOTIFICATIONS;
+import static android.Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL;
+import static android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS;
 import static android.service.notification.NotificationAssistantService.FEEDBACK_RATING;
 
 import static junit.framework.Assert.assertEquals;
@@ -41,7 +44,10 @@
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.ParcelFileDescriptor;
+import android.os.Process;
 import android.os.SystemClock;
+import android.permission.PermissionManager;
+import android.permission.cts.PermissionUtils;
 import android.provider.Telephony;
 import android.service.notification.Adjustment;
 import android.service.notification.NotificationAssistantService;
@@ -51,6 +57,8 @@
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.SystemUtil;
+
 import junit.framework.Assert;
 
 import org.junit.After;
@@ -85,9 +93,10 @@
     }
 
     @Before
-    public void setUp() throws IOException {
+    public void setUp() throws Exception {
         mUi = InstrumentationRegistry.getInstrumentation().getUiAutomation();
         mContext = InstrumentationRegistry.getContext();
+        PermissionUtils.grantPermission(mContext.getPackageName(), POST_NOTIFICATIONS);
         mNotificationManager = (NotificationManager) mContext.getSystemService(
                 Context.NOTIFICATION_SERVICE);
         mNotificationManager.createNotificationChannel(new NotificationChannel(
@@ -97,7 +106,16 @@
     }
 
     @After
-    public void tearDown() throws IOException {
+    public void tearDown() throws Exception {
+        // Use test API to prevent PermissionManager from killing the test process when revoking
+        // permission.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> mContext.getSystemService(PermissionManager.class)
+                        .revokePostNotificationPermissionWithoutKillForTest(
+                                mContext.getPackageName(),
+                                Process.myUserHandle().getIdentifier()),
+                REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL,
+                REVOKE_RUNTIME_PERMISSIONS);
         if (mNotificationListenerService != null) mNotificationListenerService.resetData();
 
         toggleListenerAccess(false);
@@ -692,6 +710,22 @@
         mUi.dropShellPermissionIdentity();
     }
 
+    @Test
+    public void testNotificationCancel_api29HasLegacyReason() throws Exception {
+        setUpListeners(); // also enables assistant
+
+        sendNotification(1, ICON_ID);
+        Thread.sleep(500); // wait for notification listener to receive notification
+
+        StatusBarNotification sbn = getFirstNotificationFromPackage(TestNotificationListener.PKG);
+
+        mNotificationAssistantService.cancelNotifications(new String[]{sbn.getKey()});
+        int reason = getAssistantCancellationReason(sbn.getKey());
+        if (reason != NotificationListenerService.REASON_LISTENER_CANCEL) {
+            fail("Failed cancellation from assistant: reason=" + reason);
+        }
+    }
+
     private StatusBarNotification getFirstNotificationFromPackage(String PKG)
             throws InterruptedException {
         StatusBarNotification sbn = mNotificationListenerService.mPosted.poll(SLEEP_TIME,
@@ -826,4 +860,18 @@
             }
         }
     }
+
+    private int getAssistantCancellationReason(String key) {
+        for (int tries = 3; tries-- > 0; ) {
+            if (mNotificationAssistantService.mRemoved.containsKey(key)) {
+                return mNotificationAssistantService.mRemoved.get(key);
+            }
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException ex) {
+                // pass
+            }
+        }
+        return -1;
+    }
 }
diff --git a/tests/tests/notificationlegacy/notificationlegacy29/src/android/app/notification/legacy29/cts/NotificationManager29Test.java b/tests/tests/notificationlegacy/notificationlegacy29/src/android/app/notification/legacy29/cts/NotificationManager29Test.java
index c164656..0a2021b 100644
--- a/tests/tests/notificationlegacy/notificationlegacy29/src/android/app/notification/legacy29/cts/NotificationManager29Test.java
+++ b/tests/tests/notificationlegacy/notificationlegacy29/src/android/app/notification/legacy29/cts/NotificationManager29Test.java
@@ -16,6 +16,9 @@
 
 package android.app.notification.legacy29.cts;
 
+import static android.Manifest.permission.POST_NOTIFICATIONS;
+import static android.Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL;
+import static android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS;
 import static android.app.NotificationManager.Policy.CONVERSATION_SENDERS_ANYONE;
 import static android.app.NotificationManager.Policy.PRIORITY_CATEGORY_CONVERSATIONS;
 
@@ -33,14 +36,20 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.ParcelFileDescriptor;
+import android.os.Process;
+import android.permission.PermissionManager;
+import android.permission.cts.PermissionUtils;
 import android.service.notification.StatusBarNotification;
 import android.util.Log;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.SystemUtil;
+
 import junit.framework.Assert;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -63,13 +72,26 @@
     @Before
     public void setUp() throws Exception {
         mContext = InstrumentationRegistry.getContext();
-
+        PermissionUtils.grantPermission(mContext.getPackageName(), POST_NOTIFICATIONS);
         mNotificationManager = (NotificationManager) mContext.getSystemService(
                 Context.NOTIFICATION_SERVICE);
         mNotificationManager.createNotificationChannel(new NotificationChannel(
                 NOTIFICATION_CHANNEL_ID, "name", NotificationManager.IMPORTANCE_DEFAULT));
     }
 
+    @After
+    public void tearDown() throws Exception {
+        // Use test API to prevent PermissionManager from killing the test process when revoking
+        // permission.
+        SystemUtil.runWithShellPermissionIdentity(
+                () -> mContext.getSystemService(PermissionManager.class)
+                        .revokePostNotificationPermissionWithoutKillForTest(
+                                mContext.getPackageName(),
+                                Process.myUserHandle().getIdentifier()),
+                REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL,
+                REVOKE_RUNTIME_PERMISSIONS);
+    }
+
     private void toggleNotificationPolicyAccess(String packageName,
             Instrumentation instrumentation, boolean on) throws IOException {
 
diff --git a/tests/tests/notificationlegacy/notificationlegacy29/src/android/app/notification/legacy29/cts/TestNotificationAssistant.java b/tests/tests/notificationlegacy/notificationlegacy29/src/android/app/notification/legacy29/cts/TestNotificationAssistant.java
index 04c50b0..b9f063e 100644
--- a/tests/tests/notificationlegacy/notificationlegacy29/src/android/app/notification/legacy29/cts/TestNotificationAssistant.java
+++ b/tests/tests/notificationlegacy/notificationlegacy29/src/android/app/notification/legacy29/cts/TestNotificationAssistant.java
@@ -24,7 +24,9 @@
 import android.service.notification.NotificationAssistantService;
 import android.service.notification.StatusBarNotification;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class TestNotificationAssistant extends NotificationAssistantService {
     public static final String TAG = "TestNotificationAssistant";
@@ -44,6 +46,8 @@
     String snoozedUntilContext;
     private NotificationManager mNotificationManager;
 
+    public Map<String, Integer> mRemoved = new HashMap<>();
+
     public static String getId() {
         return String.format("%s/%s", TestNotificationAssistant.class.getPackage().getName(),
                 TestNotificationAssistant.class.getName());
@@ -144,4 +148,12 @@
         notificationFeedback = feedback.getInt(FEEDBACK_RATING, 0);
     }
 
+    @Override
+    public void onNotificationRemoved(StatusBarNotification sbn, RankingMap rankingMap,
+            int reason) {
+        if (sbn == null) {
+            return;
+        }
+        mRemoved.put(sbn.getKey(), reason);
+    }
 }
\ No newline at end of file
diff --git a/tests/tests/os/Android.bp b/tests/tests/os/Android.bp
index 14815f2..a8116ac 100644
--- a/tests/tests/os/Android.bp
+++ b/tests/tests/os/Android.bp
@@ -35,9 +35,11 @@
         "truth-prebuilt",
         "guava",
         "junit",
+        "Harrier",
         "CtsMockInputMethodLib",
         "hamcrest-library",
         "modules-utils-build_system",
+        "platformprotosnano",
     ],
     jni_uses_platform_apis: true,
     jni_libs: [
diff --git a/tests/tests/os/CompanionTestApp/AndroidManifest.xml b/tests/tests/os/CompanionTestApp/AndroidManifest.xml
index 9cb2b99..0c5af7e 100644
--- a/tests/tests/os/CompanionTestApp/AndroidManifest.xml
+++ b/tests/tests/os/CompanionTestApp/AndroidManifest.xml
@@ -27,6 +27,8 @@
     <uses-permission android:name="android.permission.USE_ICC_AUTH_WITH_DEVICE_IDENTIFIER" />
     <uses-permission android:name="android.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE" />
     <uses-permission android:name="android.permission.REQUEST_COMPANION_PROFILE_WATCH" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <uses-feature android:name="android.software.companion_device_setup" />
 
diff --git a/tests/tests/os/CompanionTestApp/src/android/os/cts/companiontestapp/CompanionTestAppMainActivity.kt b/tests/tests/os/CompanionTestApp/src/android/os/cts/companiontestapp/CompanionTestAppMainActivity.kt
index 7da630e..50b84b7 100644
--- a/tests/tests/os/CompanionTestApp/src/android/os/cts/companiontestapp/CompanionTestAppMainActivity.kt
+++ b/tests/tests/os/CompanionTestApp/src/android/os/cts/companiontestapp/CompanionTestAppMainActivity.kt
@@ -16,6 +16,8 @@
 
 package android.os.cts.companiontestapp
 
+import android.Manifest.permission.ACCESS_COARSE_LOCATION
+import android.Manifest.permission.ACCESS_FINE_LOCATION
 import android.Manifest.permission.CALL_PHONE
 import android.app.Activity
 import android.bluetooth.BluetoothAdapter
@@ -129,6 +131,21 @@
                     }
                 }
             })
+
+            addView(Button(ctx).apply {
+                text = "Check location permission"
+                setOnClickListener {
+                    val locationAccess = ctx.checkSelfPermission(ACCESS_FINE_LOCATION)
+                    toast("location access: $locationAccess")
+                }
+            })
+
+            addView(Button(ctx).apply {
+                text = "Request location permission"
+                setOnClickListener {
+                    requestPermissions(arrayOf(ACCESS_FINE_LOCATION, ACCESS_COARSE_LOCATION), 10)
+                }
+            })
         })
     }
 
diff --git a/tests/tests/os/CtsOsTestCases.xml b/tests/tests/os/CtsOsTestCases.xml
index 812e2ea8..631b627 100644
--- a/tests/tests/os/CtsOsTestCases.xml
+++ b/tests/tests/os/CtsOsTestCases.xml
@@ -19,6 +19,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="multiuser" />
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk30ModuleController" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
@@ -27,12 +28,16 @@
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.os.cts" />
         <option name="runtime-hint" value="3m15s" />
+        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
+        <option name="exclude-annotation" value="com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile" />
+        <option name="exclude-annotation" value="com.android.bedstead.harrier.annotations.RequireRunOnSecondaryUser" />
         <!-- Do not disable hidden-api-checks for this test. This test includes
              StrictModeTest which relies on hidden API checks being enabled in
              order to function properly. Any APIs used by this test should be
              added to the light grey list, or made @TestApi instead.
         <option name="hidden-api-checks" value="false" />
         -->
+
     </test>
 
     <!-- Create Place to store apks -->
diff --git a/tests/tests/os/jni/Android.bp b/tests/tests/os/jni/Android.bp
index c4508c2..82fe0d1 100644
--- a/tests/tests/os/jni/Android.bp
+++ b/tests/tests/os/jni/Android.bp
@@ -46,6 +46,7 @@
         "android_os_cts_HardwareName.cpp",
         "android_os_cts_OSFeatures.cpp",
         "android_os_cts_NoExecutePermissionTest.cpp",
+        "android_os_cts_PerformanceHintManagerTest.cpp",
         "android_os_cts_SeccompTest.cpp",
         "android_os_cts_SharedMemory.cpp",
         "android_os_cts_SPMITest.cpp",
@@ -57,6 +58,10 @@
         "external_seccomp_tests",
     ],
 
+    shared_libs: [
+        "libandroid",
+    ],
+
     // This define controls the behavior of OSFeatures.needsSeccompSupport().
     cflags: ["-DARCH_SUPPORTS_SECCOMP"],
 }
diff --git a/tests/tests/os/jni/CtsOsJniOnLoad.cpp b/tests/tests/os/jni/CtsOsJniOnLoad.cpp
index 154f075..11e8434 100644
--- a/tests/tests/os/jni/CtsOsJniOnLoad.cpp
+++ b/tests/tests/os/jni/CtsOsJniOnLoad.cpp
@@ -29,6 +29,8 @@
 
 extern int register_android_os_cts_NoExecutePermissionTest(JNIEnv*);
 
+extern int register_android_os_cts_PerformanceHintManagerTest(JNIEnv*);
+
 extern int register_android_os_cts_SeccompTest(JNIEnv*);
 
 extern int register_android_os_cts_SharedMemoryTest(JNIEnv*);
@@ -62,6 +64,10 @@
         return JNI_ERR;
     }
 
+    if (register_android_os_cts_PerformanceHintManagerTest(env)) {
+        return JNI_ERR;
+    }
+
     if (register_android_os_cts_SeccompTest(env)) {
         return JNI_ERR;
     }
diff --git a/tests/tests/os/jni/android_os_cts_PerformanceHintManagerTest.cpp b/tests/tests/os/jni/android_os_cts_PerformanceHintManagerTest.cpp
new file mode 100644
index 0000000..83882e9
--- /dev/null
+++ b/tests/tests/os/jni/android_os_cts_PerformanceHintManagerTest.cpp
@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2022 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.
+ */
+
+#include <errno.h>
+#include <jni.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <android/performance_hint.h>
+
+static jstring toJString(JNIEnv *env, const char* c_str) {
+    return env->NewStringUTF(c_str);
+}
+
+constexpr int64_t DEFAULT_TARGET_NS = 16666666L;
+
+class SessionWrapper {
+public:
+    explicit SessionWrapper(APerformanceHintSession* session) : mSession(session) {}
+    SessionWrapper(SessionWrapper&& other) : mSession(other.mSession) {
+        other.mSession = nullptr;
+    }
+    ~SessionWrapper() {
+        if (mSession) {
+            APerformanceHint_closeSession(mSession);
+        }
+    }
+
+    SessionWrapper(const SessionWrapper&) = delete;
+    SessionWrapper& operator=(const SessionWrapper&) = delete;
+
+    APerformanceHintSession* session() const { return mSession; }
+
+private:
+    APerformanceHintSession* mSession;
+};
+
+static SessionWrapper createSession(APerformanceHintManager* manager) {
+    int32_t pid = getpid();
+    return SessionWrapper(APerformanceHint_createSession(manager, &pid, 1u, DEFAULT_TARGET_NS));
+}
+
+static jstring nativeTestCreateHintSession(JNIEnv *env, jobject) {
+    APerformanceHintManager* manager = APerformanceHint_getManager();
+    if (!manager) return toJString(env, "null manager");
+    SessionWrapper a = createSession(manager);
+    SessionWrapper b = createSession(manager);
+    if (a.session() == nullptr) {
+        if (b.session() != nullptr) {
+            return toJString(env, "b is not null");
+        }
+    } else if (b.session() == nullptr) {
+        if (a.session() != nullptr) {
+            return toJString(env, "a is not null");
+        }
+    } else if (a.session() == b.session()) {
+        return toJString(env, "a and b matches");
+    }
+    return nullptr;
+}
+
+static jstring nativeTestGetPreferredUpdateRateNanos(JNIEnv *env, jobject) {
+    APerformanceHintManager* manager = APerformanceHint_getManager();
+    if (!manager) return toJString(env, "null manager");
+    SessionWrapper wrapper = createSession(manager);
+    if (wrapper.session() != nullptr) {
+        bool positive = APerformanceHint_getPreferredUpdateRateNanos(manager) > 0;
+        if (!positive)
+          return toJString(env, "preferred rate is not positive");
+    } else {
+        if (APerformanceHint_getPreferredUpdateRateNanos(manager) != -1)
+          return toJString(env, "preferred rate is not -1");
+    }
+    return nullptr;
+}
+
+static jstring nativeUpdateTargetWorkDuration(JNIEnv *env, jobject) {
+    APerformanceHintManager* manager = APerformanceHint_getManager();
+    if (!manager) return toJString(env, "null manager");
+    SessionWrapper wrapper = createSession(manager);
+    if (wrapper.session() == nullptr) return nullptr;
+
+    int result = APerformanceHint_updateTargetWorkDuration(wrapper.session(), 100);
+    if (result != 0) {
+        return toJString(env, "updateTargetWorkDuration did not return 0");
+    }
+    return nullptr;
+}
+
+static jstring nativeUpdateTargetWorkDurationWithNegativeDuration(JNIEnv *env, jobject) {
+    APerformanceHintManager* manager = APerformanceHint_getManager();
+    if (!manager) return toJString(env, "null manager");
+    SessionWrapper wrapper = createSession(manager);
+    if (wrapper.session() == nullptr) return nullptr;
+
+    int result = APerformanceHint_updateTargetWorkDuration(wrapper.session(), -1);
+    if (result != EINVAL) {
+        return toJString(env, "updateTargetWorkDuration did not return EINVAL");
+    }
+    return nullptr;
+}
+
+static jstring nativeReportActualWorkDuration(JNIEnv *env, jobject) {
+    APerformanceHintManager* manager = APerformanceHint_getManager();
+    if (!manager) return toJString(env, "null manager");
+    SessionWrapper wrapper = createSession(manager);
+    if (wrapper.session() == nullptr) return nullptr;
+
+    int result = APerformanceHint_reportActualWorkDuration(wrapper.session(), 100);
+    if (result != 0) {
+        return toJString(env, "reportActualWorkDuration(100) did not return 0");
+    }
+
+    result = APerformanceHint_reportActualWorkDuration(wrapper.session(), 1);
+    if (result != 0) {
+        return toJString(env, "reportActualWorkDuration(1) did not return 0");
+    }
+
+    result = APerformanceHint_reportActualWorkDuration(wrapper.session(), 100);
+    if (result != 0) {
+        return toJString(env, "reportActualWorkDuration(100) did not return 0");
+    }
+
+    result = APerformanceHint_reportActualWorkDuration(wrapper.session(), 1000);
+    if (result != 0) {
+        return toJString(env, "reportActualWorkDuration(1000) did not return 0");
+    }
+
+    return nullptr;
+}
+
+static jstring nativeReportActualWorkDurationWithIllegalArgument(JNIEnv *env, jobject) {
+    APerformanceHintManager* manager = APerformanceHint_getManager();
+    if (!manager) return toJString(env, "null manager");
+    SessionWrapper wrapper = createSession(manager);
+    if (wrapper.session() == nullptr) return nullptr;
+
+    int result = APerformanceHint_reportActualWorkDuration(wrapper.session(), -1);
+    if (result != EINVAL) {
+        return toJString(env, "reportActualWorkDuration did not return EINVAL");
+    }
+    return nullptr;
+}
+
+
+static JNINativeMethod gMethods[] = {
+    {"nativeTestCreateHintSession", "()Ljava/lang/String;",
+     (void*)nativeTestCreateHintSession},
+    {"nativeTestGetPreferredUpdateRateNanos", "()Ljava/lang/String;",
+     (void*)nativeTestGetPreferredUpdateRateNanos},
+    {"nativeUpdateTargetWorkDuration", "()Ljava/lang/String;",
+     (void*)nativeUpdateTargetWorkDuration},
+    {"nativeUpdateTargetWorkDurationWithNegativeDuration", "()Ljava/lang/String;",
+     (void*)nativeUpdateTargetWorkDurationWithNegativeDuration},
+    {"nativeReportActualWorkDuration", "()Ljava/lang/String;",
+     (void*)nativeReportActualWorkDuration},
+    {"nativeReportActualWorkDurationWithIllegalArgument", "()Ljava/lang/String;",
+     (void*)nativeReportActualWorkDurationWithIllegalArgument},
+};
+
+int register_android_os_cts_PerformanceHintManagerTest(JNIEnv *env) {
+    jclass clazz = env->FindClass("android/os/cts/PerformanceHintManagerTest");
+
+    return env->RegisterNatives(clazz, gMethods,
+            sizeof(gMethods) / sizeof(JNINativeMethod));
+}
diff --git a/tests/tests/os/src/android/os/cts/AppHibernationIntegrationTest.kt b/tests/tests/os/src/android/os/cts/AppHibernationIntegrationTest.kt
index 7311878..0f71b58 100644
--- a/tests/tests/os/src/android/os/cts/AppHibernationIntegrationTest.kt
+++ b/tests/tests/os/src/android/os/cts/AppHibernationIntegrationTest.kt
@@ -20,13 +20,18 @@
 import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_GONE
 import android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_TOP_SLEEPING
 import android.app.Instrumentation
+import android.apphibernation.AppHibernationManager
 import android.content.Context
 import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Build
+import android.permission.PermissionControllerManager
+import android.permission.PermissionControllerManager.HIBERNATION_ELIGIBILITY_ELIGIBLE
+import android.permission.PermissionControllerManager.HIBERNATION_ELIGIBILITY_UNKNOWN
 import android.platform.test.annotations.AppModeFull
+import android.provider.DeviceConfig
 import android.provider.DeviceConfig.NAMESPACE_APP_HIBERNATION
 import android.provider.Settings
 import android.support.test.uiautomator.By
@@ -43,11 +48,15 @@
 import com.android.compatibility.common.util.SystemUtil
 import com.android.compatibility.common.util.SystemUtil.eventually
 import com.android.compatibility.common.util.SystemUtil.runShellCommandOrThrow
+import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
+import com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity
 import com.android.compatibility.common.util.UiAutomatorUtils
 import org.hamcrest.CoreMatchers
 import org.hamcrest.Matchers
 import org.junit.After
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertThat
 import org.junit.Assert.assertTrue
 import org.junit.Assume.assumeFalse
@@ -55,18 +64,23 @@
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.util.concurrent.CountDownLatch
+import java.util.concurrent.TimeUnit
 
 /**
  * Integration test for app hibernation.
  */
 @RunWith(AndroidJUnit4::class)
+@AppModeFull(reason = "Instant apps cannot access app hibernation")
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S, codeName = "S")
 class AppHibernationIntegrationTest {
     companion object {
         const val LOG_TAG = "AppHibernationIntegrationTest"
         const val WAIT_TIME_MS = 1000L
+        const val TIMEOUT_TIME_MS = 5000L
         const val MAX_SCROLL_ATTEMPTS = 3
         const val TEST_UNUSED_THRESHOLD = 1L
+        const val HIBERNATION_ENABLED_KEY = "app_hibernation_enabled"
 
         const val CMD_KILL = "am kill %s"
     }
@@ -74,6 +88,8 @@
     private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
 
     private lateinit var packageManager: PackageManager
+    private lateinit var permissionControllerManager: PermissionControllerManager
+    private var oldHibernationValue: String? = null
 
     @get:Rule
     val disableAnimationRule = DisableAnimationRule()
@@ -83,7 +99,16 @@
 
     @Before
     fun setup() {
+        oldHibernationValue = callWithShellPermissionIdentity {
+            DeviceConfig.getProperty(NAMESPACE_APP_HIBERNATION, HIBERNATION_ENABLED_KEY)
+        }
+        runWithShellPermissionIdentity {
+            DeviceConfig.setProperty(NAMESPACE_APP_HIBERNATION, HIBERNATION_ENABLED_KEY, "true",
+                false /* makeDefault */)
+        }
         packageManager = context.packageManager
+        permissionControllerManager =
+            context.getSystemService(PermissionControllerManager::class.java)!!
 
         // Collapse notifications
         assertThat(
@@ -98,37 +123,39 @@
     @After
     fun cleanUp() {
         goHome()
+        runWithShellPermissionIdentity {
+            DeviceConfig.setProperty(NAMESPACE_APP_HIBERNATION, HIBERNATION_ENABLED_KEY,
+                oldHibernationValue, false /* makeDefault */)
+        }
     }
 
     @Test
     fun testUnusedApp_getsForceStopped() {
-        withDeviceConfig(NAMESPACE_APP_HIBERNATION, "app_hibernation_enabled", "true") {
-            withUnusedThresholdMs(TEST_UNUSED_THRESHOLD) {
-                withApp(APK_PATH_S_APP, APK_PACKAGE_NAME_S_APP) {
-                    // Use app
-                    startApp(APK_PACKAGE_NAME_S_APP)
-                    leaveApp(APK_PACKAGE_NAME_S_APP)
-                    killApp(APK_PACKAGE_NAME_S_APP)
+        withUnusedThresholdMs(TEST_UNUSED_THRESHOLD) {
+            withApp(APK_PATH_S_APP, APK_PACKAGE_NAME_S_APP) {
+                // Use app
+                startApp(APK_PACKAGE_NAME_S_APP)
+                leaveApp(APK_PACKAGE_NAME_S_APP)
+                killApp(APK_PACKAGE_NAME_S_APP)
 
-                    // Wait for the unused threshold time to pass
-                    Thread.sleep(TEST_UNUSED_THRESHOLD)
+                // Wait for the unused threshold time to pass
+                Thread.sleep(TEST_UNUSED_THRESHOLD)
 
-                    // Run job
-                    runAppHibernationJob(context, LOG_TAG)
+                // Run job
+                runAppHibernationJob(context, LOG_TAG)
 
-                    // Verify
-                    val ai =
-                        packageManager.getApplicationInfo(APK_PACKAGE_NAME_S_APP, 0 /* flags */)
-                    val stopped = ((ai.flags and ApplicationInfo.FLAG_STOPPED) != 0)
-                    assertTrue(stopped)
+                // Verify
+                val ai =
+                    packageManager.getApplicationInfo(APK_PACKAGE_NAME_S_APP, 0 /* flags */)
+                val stopped = ((ai.flags and ApplicationInfo.FLAG_STOPPED) != 0)
+                assertTrue(stopped)
 
-                    if (hasFeatureTV()) {
-                        // Skip checking unused apps screen because it may be unavailable on TV
-                        return
-                    }
-                    openUnusedAppsNotification()
-                    waitFindObject(By.text(APK_PACKAGE_NAME_S_APP))
+                if (hasFeatureTV()) {
+                    // Skip checking unused apps screen because it may be unavailable on TV
+                    return
                 }
+                openUnusedAppsNotification()
+                waitFindObject(By.text(APK_PACKAGE_NAME_S_APP))
             }
         }
     }
@@ -160,44 +187,130 @@
         }
     }
 
-    @AppModeFull(reason = "Uses application details settings")
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    fun testUnusedAppCount() {
+        withUnusedThresholdMs(TEST_UNUSED_THRESHOLD) {
+            withApp(APK_PATH_S_APP, APK_PACKAGE_NAME_S_APP) {
+                // Use app
+                startApp(APK_PACKAGE_NAME_S_APP)
+                leaveApp(APK_PACKAGE_NAME_S_APP)
+                killApp(APK_PACKAGE_NAME_S_APP)
+
+                // Wait for the unused threshold time to pass
+                Thread.sleep(TEST_UNUSED_THRESHOLD)
+
+                // Run job
+                runAppHibernationJob(context, LOG_TAG)
+
+                // Verify unused app count pulled correctly
+                val countDownLatch = CountDownLatch(1)
+                var unusedAppCount = -1
+                runWithShellPermissionIdentity {
+                    permissionControllerManager.getUnusedAppCount({ r -> r.run() },
+                        { res ->
+                            unusedAppCount = res
+                            countDownLatch.countDown()
+                        })
+
+                    assertTrue("Timed out waiting for unused app count",
+                        countDownLatch.await(TIMEOUT_TIME_MS, TimeUnit.MILLISECONDS))
+                    assertTrue("Expected non-zero unused app count but is $unusedAppCount",
+                        unusedAppCount > 0)
+                }
+            }
+        }
+    }
+
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    fun testGetHibernationEligibility_eligibleByDefault() {
+        withApp(APK_PATH_S_APP, APK_PACKAGE_NAME_S_APP) {
+            // Verify app is eligible for hibernation
+            val countDownLatch = CountDownLatch(1)
+            var hibernationEligibility = HIBERNATION_ELIGIBILITY_UNKNOWN
+            runWithShellPermissionIdentity {
+                permissionControllerManager.getHibernationEligibility(APK_PACKAGE_NAME_S_APP,
+                    { r -> r.run() },
+                    { res ->
+                        hibernationEligibility = res
+                        countDownLatch.countDown()
+                    })
+
+                assertTrue("Timed out waiting for hibernation eligibility",
+                    countDownLatch.await(TIMEOUT_TIME_MS, TimeUnit.MILLISECONDS))
+                assertEquals("Expected test app to be eligible for hibernation but wasn't.",
+                    HIBERNATION_ELIGIBILITY_ELIGIBLE, hibernationEligibility)
+            }
+        }
+    }
+
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    fun testGetHibernationStatsForUser_getsStatsForIndividualPackages() {
+        val appHibernationManager = context.getSystemService(AppHibernationManager::class.java)!!
+        withApp(APK_PATH_S_APP, APK_PACKAGE_NAME_S_APP) {
+            runWithShellPermissionIdentity {
+                val stats =
+                    appHibernationManager.getHibernationStatsForUser(
+                        setOf(APK_PACKAGE_NAME_S_APP))
+
+                assertNotNull(stats[APK_PACKAGE_NAME_S_APP])
+                assertTrue(stats[APK_PACKAGE_NAME_S_APP]!!.diskBytesSaved >= 0)
+            }
+        }
+    }
+
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    fun testGetHibernationStatsForUser_getsStatsForAllPackages() {
+        val appHibernationManager = context.getSystemService(AppHibernationManager::class.java)!!
+        withApp(APK_PATH_S_APP, APK_PACKAGE_NAME_S_APP) {
+            runWithShellPermissionIdentity {
+                val stats = appHibernationManager.getHibernationStatsForUser()
+
+                assertFalse("Expected non-empty list of hibernation stats", stats.isEmpty())
+                assertTrue("Expected test package to be in list of returned savings but wasn't",
+                    stats.containsKey(APK_PACKAGE_NAME_S_APP))
+            }
+        }
+    }
+
     @Test
     fun testAppInfo_RemovePermissionsAndFreeUpSpaceToggleExists() {
         assumeFalse(
             "Remove permissions and free up space toggle may be unavailable on TV",
             hasFeatureTV())
-        withDeviceConfig(NAMESPACE_APP_HIBERNATION, "app_hibernation_enabled", "true") {
-            withApp(APK_PATH_S_APP, APK_PACKAGE_NAME_S_APP) {
-                // Open app info
-                val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
-                val uri = Uri.fromParts("package", APK_PACKAGE_NAME_S_APP, null /* fragment */)
-                intent.data = uri
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-                context.startActivity(intent)
+        withApp(APK_PATH_S_APP, APK_PACKAGE_NAME_S_APP) {
+            // Open app info
+            val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS)
+            val uri = Uri.fromParts("package", APK_PACKAGE_NAME_S_APP, null /* fragment */)
+            intent.data = uri
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
 
-                waitForIdle()
-                UiAutomatorUtils.getUiDevice()
+            waitForIdle()
+            UiAutomatorUtils.getUiDevice()
 
-                val packageManager = context.packageManager
-                val settingsPackage = intent.resolveActivity(packageManager).packageName
-                val res = packageManager.getResourcesForApplication(settingsPackage)
-                val title = res.getString(
-                    res.getIdentifier("unused_apps_switch", "string", settingsPackage))
+            val packageManager = context.packageManager
+            val settingsPackage = intent.resolveActivity(packageManager).packageName
+            val res = packageManager.getResourcesForApplication(settingsPackage)
+            val title = res.getString(
+                res.getIdentifier("unused_apps_switch", "string", settingsPackage))
 
-                // Settings can have multiple scrollable containers so all of them should be
-                // searched.
-                var toggleFound = UiDevice.getInstance(instrumentation)
-                    .findObject(UiSelector().text(title))
-                    .waitForExists(WAIT_TIME_MS)
-                var i = 0
-                var scrollableObject = UiScrollable(UiSelector().scrollable(true).instance(i))
-                while (!toggleFound && scrollableObject.waitForExists(WAIT_TIME_MS)) {
-                    toggleFound = scrollableObject.scrollTextIntoView(title)
-                    scrollableObject = UiScrollable(UiSelector().scrollable(true).instance(++i))
-                }
-
-                assertTrue("Remove permissions and free up space toggle not found", toggleFound)
+            // Settings can have multiple scrollable containers so all of them should be
+            // searched.
+            var toggleFound = UiDevice.getInstance(instrumentation)
+                .findObject(UiSelector().text(title))
+                .waitForExists(WAIT_TIME_MS)
+            var i = 0
+            var scrollableObject = UiScrollable(UiSelector().scrollable(true).instance(i))
+            while (!toggleFound && scrollableObject.waitForExists(WAIT_TIME_MS)) {
+                toggleFound = scrollableObject.scrollTextIntoView(title)
+                scrollableObject = UiScrollable(UiSelector().scrollable(true).instance(++i))
             }
+
+            assertTrue("Remove permissions and free up space toggle not found", toggleFound)
         }
     }
 
diff --git a/tests/tests/os/src/android/os/cts/BuildTest.java b/tests/tests/os/src/android/os/cts/BuildTest.java
index 2aedad2..df40fc4 100644
--- a/tests/tests/os/src/android/os/cts/BuildTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildTest.java
@@ -322,15 +322,12 @@
                         assertTrue("Expected " + fieldName + " value to be < " + CUR_DEVELOPMENT
                                 + ", got " + fieldValue, fieldValue < CUR_DEVELOPMENT);
                     }
-                    // KNOWN_CODENAMES only tracks Q+ codenames
-                    if (fieldValue >= Build.VERSION_CODES.Q) {
-                        // Remove all underscores to match build level codenames, e.g. S_V2 is Sv2.
-                        String name = fieldName.replaceAll("_", "");
-                        declaredCodenames.add(name);
-                        assertTrue("Expected " + name
+                    // Remove all underscores to match build level codenames, e.g. S_V2 is Sv2.
+                    String name = fieldName.replaceAll("_", "");
+                    declaredCodenames.add(name);
+                    assertTrue("Expected " + name
                                         + " to be declared in Build.VERSION.KNOWN_CODENAMES",
-                                knownCodenames.contains(name));
-                    }
+                            knownCodenames.contains(name));
                 }
             }
         }
diff --git a/tests/tests/os/src/android/os/cts/BuildVersionTest.java b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
index 070cc44..2430c6b 100644
--- a/tests/tests/os/src/android/os/cts/BuildVersionTest.java
+++ b/tests/tests/os/src/android/os/cts/BuildVersionTest.java
@@ -28,8 +28,8 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.util.HashSet;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
diff --git a/tests/tests/os/src/android/os/cts/CompanionDeviceManagerTest.kt b/tests/tests/os/src/android/os/cts/CompanionDeviceManagerTest.kt
index b0307f1..05b3717 100644
--- a/tests/tests/os/src/android/os/cts/CompanionDeviceManagerTest.kt
+++ b/tests/tests/os/src/android/os/cts/CompanionDeviceManagerTest.kt
@@ -22,7 +22,6 @@
 import android.content.pm.PackageManager.FEATURE_AUTOMOTIVE
 import android.content.pm.PackageManager.FEATURE_COMPANION_DEVICE_SETUP
 import android.content.pm.PackageManager.FEATURE_LEANBACK
-import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.net.MacAddress
 import android.os.Binder
 import android.os.Bundle
@@ -32,7 +31,6 @@
 import android.util.Size
 import android.util.SizeF
 import android.util.SparseArray
-import android.widget.TextView
 import androidx.test.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnit4
 import androidx.test.uiautomator.By
@@ -41,19 +39,14 @@
 import androidx.test.uiautomator.UiObject2
 import androidx.test.uiautomator.Until
 import com.android.compatibility.common.util.MatcherUtils.hasIdThat
-import com.android.compatibility.common.util.SystemUtil.eventually
 import com.android.compatibility.common.util.SystemUtil.getEventually
 import com.android.compatibility.common.util.SystemUtil.runShellCommand
 import com.android.compatibility.common.util.SystemUtil.runShellCommandOrThrow
 import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
 import com.android.compatibility.common.util.ThrowingSupplier
 import com.android.compatibility.common.util.UiAutomatorUtils.waitFindObject
-import com.android.compatibility.common.util.children
 import com.android.compatibility.common.util.click
-import java.io.Serializable
 import org.hamcrest.CoreMatchers.containsString
-import org.hamcrest.Matchers.empty
-import org.hamcrest.Matchers.not
 import org.junit.After
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertThat
@@ -63,6 +56,7 @@
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.io.Serializable
 
 /**
  * Test for [CompanionDeviceManager]
@@ -77,6 +71,13 @@
         const val SHELL_PACKAGE_NAME = "com.android.shell"
         const val TEST_APP_PACKAGE_NAME = "android.os.cts.companiontestapp"
         const val TEST_APP_APK_LOCATION = "/data/local/tmp/cts/os/CtsCompanionTestApp.apk"
+        const val CDM_UI_PACKAGE_NAME = "com.android.companiondevicemanager"
+        const val RECYCLER_VIEW_CLASS = "androidx.recyclerview.widget.RecyclerView"
+
+        val DEVICE_LIST_ITEM_SELECTOR: BySelector = By.res(CDM_UI_PACKAGE_NAME, "list_item_device")
+        val DEVICE_LIST_SELECTOR: BySelector = By.pkg(CDM_UI_PACKAGE_NAME)
+                .clazz(RECYCLER_VIEW_CLASS)
+                .hasChild(DEVICE_LIST_ITEM_SELECTOR)
     }
 
     private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
@@ -164,41 +165,6 @@
 
     @AppModeFull(reason = "Companion API for non-instant apps only")
     @Test
-    fun testProfiles() {
-        installApk("--user $userId $TEST_APP_APK_LOCATION")
-        startApp(TEST_APP_PACKAGE_NAME)
-
-        uiDevice.waitAndFind(By.desc("name filter")).text = ""
-        uiDevice.waitForIdle()
-
-        click("Watch")
-        val device = getEventually({
-            click("Associate")
-            waitFindNode(hasIdThat(containsString("device_list")),
-                    failMsg = "Test requires a discoverable bluetooth device nearby",
-                    timeoutMs = 9_000)
-                    .children
-                    .find { it.className == TextView::class.java.name }
-                    .assertNotNull { "Empty device list" }
-        }, 90_000)
-        device!!.click()
-
-        eventually {
-            assertThat(getAssociatedDevices(TEST_APP_PACKAGE_NAME), not(empty()))
-        }
-        val deviceAddress = getAssociatedDevices(TEST_APP_PACKAGE_NAME).last()
-
-        runShellCommandOrThrow("cmd companiondevice simulate_connect $deviceAddress")
-        assertPermission(
-                TEST_APP_PACKAGE_NAME, "android.permission.CALL_PHONE", PERMISSION_GRANTED)
-
-        runShellCommandOrThrow("cmd companiondevice simulate_disconnect $deviceAddress")
-        assertPermission(
-                TEST_APP_PACKAGE_NAME, "android.permission.CALL_PHONE", PERMISSION_GRANTED)
-    }
-
-    @AppModeFull(reason = "Companion API for non-instant apps only")
-    @Test
     fun testRequestNotifications() {
         // Skip this test for Android TV due to NotificationAccessConfirmationActivity only exists
         // in Settings but not in TvSettings for Android TV devices (b/199224565).
@@ -210,17 +176,12 @@
         uiDevice.waitAndFind(By.desc("name filter")).text = ""
         uiDevice.waitForIdle()
 
-        val deviceForAssociation = getEventually({
-            click("Associate")
-            waitFindNode(hasIdThat(containsString("device_list")),
-                    failMsg = "Test requires a discoverable bluetooth device nearby",
-                    timeoutMs = 5_000)
-                    .children
-                    .find { it.className == TextView::class.java.name }
-                    .assertNotNull { "Empty device list" }
-        }, 60_000)
+        click("Associate")
 
-        deviceForAssociation!!.click()
+        uiDevice.wait(Until.findObject(DEVICE_LIST_SELECTOR), 20_000)
+                ?.findObject(DEVICE_LIST_ITEM_SELECTOR)
+                ?.click()
+                ?: throw AssertionError("Empty device list")
 
         waitForIdle()
 
diff --git a/tests/tests/os/src/android/os/cts/IpcDataCacheTest.java b/tests/tests/os/src/android/os/cts/IpcDataCacheTest.java
new file mode 100644
index 0000000..b0113b7
--- /dev/null
+++ b/tests/tests/os/src/android/os/cts/IpcDataCacheTest.java
@@ -0,0 +1,340 @@
+/*
+ * Copyright (C) 2022 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 android.os.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+
+import android.os.IpcDataCache;
+
+import androidx.test.filters.SmallTest;
+
+import org.junit.After;
+import org.junit.Test;
+
+/**
+ * Test for verifying the behavior of {@link IpcDataCache}.  This test does
+ * not use any actual binder calls - it is entirely self-contained.  This test also relies
+ * on the test mode of {@link IpcDataCache} because Android SELinux rules do
+ * not grant test processes the permission to set system properties.
+ * <p>
+ * Build/Install/Run:
+ *  atest CtsOsTestCases:IpcDataCacheTest
+ */
+@SmallTest
+public class IpcDataCacheTest {
+
+    // Configuration for creating caches
+    private static final String MODULE = IpcDataCache.MODULE_TEST;
+    private static final String API = "testApi";
+
+    // This class is a proxy for binder calls.  It contains a counter that increments
+    // every time the class is queried.
+    private static class ServerProxy {
+        // The number of times this class was queried.
+        private int mCount = 0;
+
+        // A single query.  The key behavior is that the query count is incremented.
+        boolean query(int x) {
+            mCount++;
+            return value(x);
+        }
+
+        // Return the expected value of an input, without incrementing the query count.
+        boolean value(int x) {
+            return x % 3 == 0;
+        }
+
+        // Verify the count.
+        void verify(int x) {
+            assertEquals(x, mCount);
+        }
+    }
+
+    // The functions for querying the server.
+    private static class ServerQuery
+            extends IpcDataCache.QueryHandler<Integer, Boolean> {
+        private final ServerProxy mServer;
+
+        ServerQuery(ServerProxy server) {
+            mServer = server;
+        }
+
+        @Override
+        public Boolean apply(Integer x) {
+            return mServer.query(x);
+        }
+        @Override
+        public boolean shouldBypassCache(Integer x) {
+            return x % 13 == 0;
+        }
+    }
+
+    // Clear the test mode after every test, in case this process is used for other
+    // tests. This also resets the test property map.
+    @After
+    public void tearDown() throws Exception {
+        IpcDataCache.setTestMode(false);
+    }
+
+    // This test is disabled pending an sepolicy change that allows any app to set the
+    // test property.
+    @Test
+    public void testBasicCache() {
+
+        // A stand-in for the binder.  The test verifies that calls are passed through to
+        // this class properly.
+        ServerProxy tester = new ServerProxy();
+
+        // Create a cache that uses simple arithmetic to computer its values.
+        IpcDataCache<Integer, Boolean> testCache =
+                new IpcDataCache<>(4, MODULE, API, "testCache1",
+                        new ServerQuery(tester));
+
+        IpcDataCache.setTestMode(true);
+        testCache.testPropertyName();
+
+        tester.verify(0);
+        assertEquals(tester.value(3), testCache.query(3));
+        tester.verify(1);
+        assertEquals(tester.value(3), testCache.query(3));
+        tester.verify(2);
+        testCache.invalidateCache();
+        assertEquals(tester.value(3), testCache.query(3));
+        tester.verify(3);
+        assertEquals(tester.value(5), testCache.query(5));
+        tester.verify(4);
+        assertEquals(tester.value(5), testCache.query(5));
+        tester.verify(4);
+        assertEquals(tester.value(3), testCache.query(3));
+        tester.verify(4);
+
+        // Invalidate the cache, and verify that the next read on 3 goes to the server.
+        testCache.invalidateCache();
+        assertEquals(tester.value(3), testCache.query(3));
+        tester.verify(5);
+
+        // Test bypass.  The query for 13 always bypasses the cache.
+        assertEquals(tester.value(12), testCache.query(12));
+        assertEquals(tester.value(13), testCache.query(13));
+        assertEquals(tester.value(14), testCache.query(14));
+        tester.verify(8);
+        assertEquals(tester.value(12), testCache.query(12));
+        assertEquals(tester.value(13), testCache.query(13));
+        assertEquals(tester.value(14), testCache.query(14));
+        tester.verify(9);
+    }
+
+    @Test
+    public void testDisableCache() {
+
+        // A stand-in for the binder.  The test verifies that calls are passed through to
+        // this class properly.
+        ServerProxy tester = new ServerProxy();
+
+        // Three caches, all using the same system property but one uses a different name.
+        IpcDataCache<Integer, Boolean> cache1 =
+                new IpcDataCache<>(4, MODULE, API, "cacheA",
+                        new ServerQuery(tester));
+        IpcDataCache<Integer, Boolean> cache2 =
+                new IpcDataCache<>(4, MODULE, API, "cacheA",
+                        new ServerQuery(tester));
+        IpcDataCache<Integer, Boolean> cache3 =
+                new IpcDataCache<>(4, MODULE, API, "cacheB",
+                        new ServerQuery(tester));
+
+        // Caches are enabled upon creation.
+        assertEquals(false, cache1.getDisabledState());
+        assertEquals(false, cache2.getDisabledState());
+        assertEquals(false, cache3.getDisabledState());
+
+        // Disable the cache1 instance.  Only cache1 is disabled
+        cache1.disableInstance();
+        assertEquals(true, cache1.getDisabledState());
+        assertEquals(false, cache2.getDisabledState());
+        assertEquals(false, cache3.getDisabledState());
+
+        // Disable cache1.  This will disable cache1 and cache2 because they share the
+        // same name.  cache3 has a different name and will not be disabled.
+        cache1.disableForCurrentProcess();
+        assertEquals(true, cache1.getDisabledState());
+        assertEquals(true, cache2.getDisabledState());
+        assertEquals(false, cache3.getDisabledState());
+
+        // Create a new cache1.  Verify that the new instance is disabled.
+        cache1 = new IpcDataCache<>(4, MODULE, API, "cacheA",
+                new ServerQuery(tester));
+        assertEquals(true, cache1.getDisabledState());
+
+        // Remove the record of caches being locally disabled.  This is a clean-up step.
+        cache1.forgetDisableLocal();
+        assertEquals(true, cache1.getDisabledState());
+        assertEquals(true, cache2.getDisabledState());
+        assertEquals(false, cache3.getDisabledState());
+
+        // Create a new cache1.  Verify that the new instance is not disabled.
+        cache1 = new IpcDataCache<>(4, MODULE, API, "cacheA",
+                new ServerQuery(tester));
+        assertEquals(false, cache1.getDisabledState());
+    }
+
+    private static class TestQuery
+            extends IpcDataCache.QueryHandler<Integer, String> {
+
+        private int mRecomputeCount = 0;
+
+        @Override
+        public String apply(Integer qv) {
+            mRecomputeCount += 1;
+            return "foo" + qv.toString();
+        }
+
+        int getRecomputeCount() {
+            return mRecomputeCount;
+        }
+    }
+
+    private static class TestCache extends IpcDataCache<Integer, String> {
+        private final TestQuery mQuery;
+
+        TestCache(String module, String api) {
+            this(module, api, new TestQuery());
+        }
+
+        TestCache(String module, String api, TestQuery query) {
+            super(4, module, api, api, query);
+            mQuery = query;
+            setTestMode(true);
+            testPropertyName();
+        }
+
+        int getRecomputeCount() {
+            return mQuery.getRecomputeCount();
+        }
+    }
+
+    @Test
+    public void testCacheRecompute() {
+        final String api = "testCacheRecompute";
+        TestCache cache = new TestCache(MODULE, api);
+        cache.invalidateCache();
+        assertEquals(cache.isDisabled(), false);
+        assertEquals("foo5", cache.query(5));
+        assertEquals(1, cache.getRecomputeCount());
+        assertEquals("foo5", cache.query(5));
+        assertEquals(1, cache.getRecomputeCount());
+        assertEquals("foo6", cache.query(6));
+        assertEquals(2, cache.getRecomputeCount());
+        cache.invalidateCache();
+        assertEquals("foo5", cache.query(5));
+        assertEquals("foo5", cache.query(5));
+        assertEquals(3, cache.getRecomputeCount());
+        // Invalidate the cache with a direct call to the property.
+        IpcDataCache.invalidateCache(MODULE, api);
+        assertEquals("foo5", cache.query(5));
+        assertEquals("foo5", cache.query(5));
+        assertEquals(4, cache.getRecomputeCount());
+    }
+
+    @Test
+    public void testCacheInitialState() {
+        final String api = "testCacheInitialState";
+        TestCache cache = new TestCache(MODULE, api);
+        assertEquals("foo5", cache.query(5));
+        assertEquals("foo5", cache.query(5));
+        assertEquals(2, cache.getRecomputeCount());
+        cache.invalidateCache();
+        assertEquals("foo5", cache.query(5));
+        assertEquals("foo5", cache.query(5));
+        assertEquals(3, cache.getRecomputeCount());
+    }
+
+    @Test
+    public void testCachePropertyUnset() {
+        final String api = "testCachePropertyUnset";
+        TestCache cache = new TestCache(MODULE, api);
+        assertEquals("foo5", cache.query(5));
+        assertEquals("foo5", cache.query(5));
+        assertEquals(2, cache.getRecomputeCount());
+    }
+
+    @Test
+    public void testCacheDisableState() {
+        final String api = "testCacheDisableState";
+        TestCache cache = new TestCache(MODULE, api);
+        assertEquals("foo5", cache.query(5));
+        assertEquals("foo5", cache.query(5));
+        assertEquals(2, cache.getRecomputeCount());
+        cache.invalidateCache();
+        assertEquals("foo5", cache.query(5));
+        assertEquals("foo5", cache.query(5));
+        assertEquals(3, cache.getRecomputeCount());
+        cache.disableSystemWide();
+        assertEquals("foo5", cache.query(5));
+        assertEquals("foo5", cache.query(5));
+        assertEquals(5, cache.getRecomputeCount());
+        cache.invalidateCache();  // Should not reenable
+        assertEquals("foo5", cache.query(5));
+        assertEquals("foo5", cache.query(5));
+        assertEquals(7, cache.getRecomputeCount());
+    }
+
+    // Validate the member method disableForCurrentProcess().
+    @Test
+    public void testLocalProcessDisable1() {
+        final String api = "testLocalProcessDisable1";
+        TestCache cache = new TestCache(MODULE, api);
+        assertEquals(cache.isDisabled(), false);
+        cache.invalidateCache();
+        assertEquals("foo5", cache.query(5));
+        assertEquals(1, cache.getRecomputeCount());
+        assertEquals("foo5", cache.query(5));
+        assertEquals(1, cache.getRecomputeCount());
+        assertEquals(cache.isDisabled(), false);
+        cache.disableForCurrentProcess();
+        assertEquals(cache.isDisabled(), true);
+        assertEquals("foo5", cache.query(5));
+        assertEquals("foo5", cache.query(5));
+        assertEquals(3, cache.getRecomputeCount());
+
+        // Clean up so this test can be re-run
+        cache.forgetDisableLocal();
+    }
+
+    // Validate the static method disableForCurrentProcess(String).
+    @Test
+    public void testLocalProcessDisable2() {
+        final String api = "testLocalProcessDisable2";
+        TestCache cache = new TestCache(MODULE, api);
+        assertEquals(cache.isDisabled(), false);
+        cache.invalidateCache();
+        assertEquals("foo5", cache.query(5));
+        assertEquals(1, cache.getRecomputeCount());
+        assertEquals("foo5", cache.query(5));
+        assertEquals(1, cache.getRecomputeCount());
+        assertEquals(cache.isDisabled(), false);
+        IpcDataCache.disableForCurrentProcess(api);
+        assertEquals(cache.isDisabled(), true);
+        assertEquals("foo5", cache.query(5));
+        assertEquals("foo5", cache.query(5));
+        assertEquals(3, cache.getRecomputeCount());
+
+        // Clean up so this test can be re-run
+        cache.forgetDisableLocal();
+    }
+}
diff --git a/tests/tests/os/src/android/os/cts/LocaleListTest.java b/tests/tests/os/src/android/os/cts/LocaleListTest.java
index 3d05332..84cff45 100644
--- a/tests/tests/os/src/android/os/cts/LocaleListTest.java
+++ b/tests/tests/os/src/android/os/cts/LocaleListTest.java
@@ -530,4 +530,40 @@
         assertFalse(LocaleList.isPseudoLocale(ULocale.forLanguageTag("fr-CA")));
         assertFalse(LocaleList.isPseudoLocale((ULocale) null));
     }
+
+    public void testMatchesLanguageAndScript() {
+        assertTrue(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("fr-Latn-FR"),
+                Locale.forLanguageTag("fr-Latn")));
+        assertTrue(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("zh-Hans-CN"),
+                Locale.forLanguageTag("zh-Hans")));
+        assertTrue(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("zh-Hant-TW"),
+                Locale.forLanguageTag("zh-Hant")));
+        assertTrue(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("en-US"),
+                Locale.forLanguageTag("en-US")));
+        assertTrue(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("en-US"),
+                Locale.forLanguageTag("en-CA")));
+        assertTrue(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("ar-NA"),
+                Locale.forLanguageTag("ar-ZA")));
+        assertTrue(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("zh-CN"),
+                Locale.forLanguageTag("zh")));
+        assertTrue(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("zh-CN"),
+                Locale.forLanguageTag("zh-Hans")));
+        assertTrue(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("zh-TW"),
+                Locale.forLanguageTag("zh-Hant")));
+
+        assertFalse(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("zh-Hant-TW"),
+                Locale.forLanguageTag("zh-Hans")));
+        assertFalse(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("en-XA"),
+                Locale.forLanguageTag("en-US")));
+        assertFalse(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("ar-YE"),
+                Locale.forLanguageTag("ar-XB")));
+        assertFalse(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("en-US"),
+                Locale.forLanguageTag("zh-TW")));
+        assertFalse(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("zh-TW"),
+                Locale.forLanguageTag("zh")));
+        assertFalse(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("zh-CN"),
+                Locale.forLanguageTag("zh-Hant")));
+        assertFalse(LocaleList.matchesLanguageAndScript(Locale.forLanguageTag("zh-TW"),
+                Locale.forLanguageTag("zh-Hans")));
+    }
 }
diff --git a/tests/tests/os/src/android/os/cts/LowPowerStandbyTest.java b/tests/tests/os/src/android/os/cts/LowPowerStandbyTest.java
new file mode 100644
index 0000000..61e3cab
--- /dev/null
+++ b/tests/tests/os/src/android/os/cts/LowPowerStandbyTest.java
@@ -0,0 +1,369 @@
+/*
+ * Copyright (C) 2021 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 android.os.cts;
+
+import static android.os.PowerManager.PARTIAL_WAKE_LOCK;
+import static android.os.PowerManager.SYSTEM_WAKELOCK;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.os.PowerManager;
+import android.os.PowerManager.WakeLock;
+import android.platform.test.annotations.AppModeFull;
+
+import androidx.annotation.NonNull;
+import androidx.test.InstrumentationRegistry;
+import androidx.test.uiautomator.UiDevice;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.compatibility.common.util.BlockingBroadcastReceiver;
+import com.android.compatibility.common.util.CallbackAsserter;
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.ProtoUtils;
+import com.android.compatibility.common.util.SystemUtil;
+import com.android.server.power.nano.PowerManagerServiceDumpProto;
+import com.android.server.power.nano.WakeLockProto;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+@RunWith(BedsteadJUnit4.class)
+public class LowPowerStandbyTest {
+    private static final int BROADCAST_TIMEOUT_SEC = 3;
+    private static final long LOW_POWER_STANDBY_ACTIVATE_TIMEOUT = TimeUnit.MINUTES.toMillis(2);
+
+    private static final String SYSTEM_WAKE_LOCK_TAG = "LowPowerStandbyTest:KeepSystemAwake";
+    private static final String TEST_WAKE_LOCK_TAG = "LowPowerStandbyTest:TestWakeLock";
+
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private Context mContext;
+    private PowerManager mPowerManager;
+    private ConnectivityManager mConnectivityManager;
+    private boolean mOriginalEnabled;
+    private WakeLock mSystemWakeLock;
+
+    @Before
+    public void setUp() throws Exception {
+        mContext = InstrumentationRegistry.getInstrumentation().getContext();
+        mPowerManager = mContext.getSystemService(PowerManager.class);
+        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
+        mOriginalEnabled = mPowerManager.isLowPowerStandbyEnabled();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        if (mPowerManager != null) {
+            SystemUtil.runWithShellPermissionIdentity(() -> {
+                wakeUp();
+                mPowerManager.setLowPowerStandbyEnabled(mOriginalEnabled);
+                mPowerManager.forceLowPowerStandbyActive(false);
+            }, Manifest.permission.MANAGE_LOW_POWER_STANDBY);
+        }
+        unforceDoze();
+
+        if (mSystemWakeLock != null) {
+            mSystemWakeLock.release();
+        }
+    }
+
+    @Test
+    public void testSetLowPowerStandbyEnabled_withoutPermission_throwsSecurityException() {
+        try {
+            mPowerManager.setLowPowerStandbyEnabled(false);
+            fail("PowerManager.setLowPowerStandbyEnabled() didn't throw SecurityException as "
+                    + "expected");
+        } catch (SecurityException e) {
+            // expected
+        }
+    }
+
+    @Test
+    @AppModeFull(reason = "Instant apps cannot hold MANAGE_LOW_POWER_STANDBY permission")
+    @EnsureHasPermission(Manifest.permission.MANAGE_LOW_POWER_STANDBY)
+    public void testSetLowPowerStandbyEnabled_withPermission_doesNotThrowsSecurityException() {
+        mPowerManager.setLowPowerStandbyEnabled(false);
+    }
+
+    @Test
+    @AppModeFull(reason = "Instant apps cannot hold MANAGE_LOW_POWER_STANDBY permission")
+    @EnsureHasPermission(Manifest.permission.MANAGE_LOW_POWER_STANDBY)
+    public void testSetLowPowerStandbyEnabled_reflectedByIsLowPowerStandbyEnabled() {
+        assumeTrue(mPowerManager.isLowPowerStandbySupported());
+
+        mPowerManager.setLowPowerStandbyEnabled(true);
+        assertTrue(mPowerManager.isLowPowerStandbyEnabled());
+
+        mPowerManager.setLowPowerStandbyEnabled(false);
+        assertFalse(mPowerManager.isLowPowerStandbyEnabled());
+    }
+
+    @Test
+    @AppModeFull(reason = "Instant apps cannot hold MANAGE_LOW_POWER_STANDBY permission")
+    @EnsureHasPermission(Manifest.permission.MANAGE_LOW_POWER_STANDBY)
+    public void testSetLowPowerStandbyEnabled_sendsBroadcast() throws Exception {
+        assumeTrue(mPowerManager.isLowPowerStandbySupported());
+
+        mPowerManager.setLowPowerStandbyEnabled(false);
+
+        CallbackAsserter broadcastAsserter = CallbackAsserter.forBroadcast(
+                new IntentFilter(PowerManager.ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED));
+        mPowerManager.setLowPowerStandbyEnabled(true);
+        broadcastAsserter.assertCalled(
+                "ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED broadcast not received",
+                BROADCAST_TIMEOUT_SEC);
+
+        broadcastAsserter = CallbackAsserter.forBroadcast(
+                new IntentFilter(PowerManager.ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED));
+        mPowerManager.setLowPowerStandbyEnabled(false);
+        broadcastAsserter.assertCalled(
+                "ACTION_LOW_POWER_STANDBY_ENABLED_CHANGED broadcast not received",
+                BROADCAST_TIMEOUT_SEC);
+    }
+
+    @Test
+    @AppModeFull(reason = "Instant apps cannot hold MANAGE_LOW_POWER_STANDBY permission")
+    @EnsureHasPermission({Manifest.permission.MANAGE_LOW_POWER_STANDBY,
+            Manifest.permission.DEVICE_POWER})
+    public void testLowPowerStandby_wakelockIsDisabled() throws Exception {
+        assumeTrue(mPowerManager.isLowPowerStandbySupported());
+        keepSystemAwake();
+
+        // Acquire test wakelock, which should be disabled by LPS
+        WakeLock testWakeLock = mPowerManager.newWakeLock(PARTIAL_WAKE_LOCK, TEST_WAKE_LOCK_TAG);
+        testWakeLock.acquire();
+
+        mPowerManager.setLowPowerStandbyEnabled(true);
+        goToSleep();
+        mPowerManager.forceLowPowerStandbyActive(true);
+
+        assertFalse("System wakelock is disabled",
+                isWakeLockDisabled(SYSTEM_WAKE_LOCK_TAG));
+        assertTrue("Test wakelock not disabled", isWakeLockDisabled(TEST_WAKE_LOCK_TAG));
+    }
+
+    @Test
+    @AppModeFull(reason = "Instant apps cannot hold MANAGE_LOW_POWER_STANDBY permission")
+    @EnsureHasPermission({Manifest.permission.MANAGE_LOW_POWER_STANDBY,
+            Manifest.permission.DEVICE_POWER})
+    public void testSetLowPowerStandbyActiveDuringMaintenance() throws Exception {
+        assumeTrue(mPowerManager.isLowPowerStandbySupported());
+
+        // Keep system awake with system wakelock
+        WakeLock systemWakeLock = mPowerManager.newWakeLock(PARTIAL_WAKE_LOCK | SYSTEM_WAKELOCK,
+                SYSTEM_WAKE_LOCK_TAG);
+        systemWakeLock.acquire();
+
+        // Acquire test wakelock, which should be disabled by LPS
+        WakeLock testWakeLock = mPowerManager.newWakeLock(PARTIAL_WAKE_LOCK,
+                TEST_WAKE_LOCK_TAG);
+        testWakeLock.acquire();
+
+        mPowerManager.setLowPowerStandbyEnabled(true);
+        mPowerManager.setLowPowerStandbyActiveDuringMaintenance(true);
+
+        goToSleep();
+        forceDoze();
+
+        PollingCheck.check(
+                "Test wakelock still enabled, expected to be disabled by Low Power Standby",
+                LOW_POWER_STANDBY_ACTIVATE_TIMEOUT, () -> isWakeLockDisabled(TEST_WAKE_LOCK_TAG));
+
+        enterDozeMaintenance();
+
+        assertTrue(isWakeLockDisabled(TEST_WAKE_LOCK_TAG));
+
+        mPowerManager.setLowPowerStandbyActiveDuringMaintenance(false);
+        PollingCheck.check(
+                "Test wakelock disabled during doze maintenance, even though Low Power Standby "
+                        + "should not be active during maintenance",
+                500, () -> !isWakeLockDisabled(TEST_WAKE_LOCK_TAG));
+
+        mPowerManager.setLowPowerStandbyActiveDuringMaintenance(true);
+        PollingCheck.check(
+                "Test wakelock enabled during doze maintenance, even though Low Power Standby "
+                        + "should be active during maintenance",
+                500, () -> isWakeLockDisabled(TEST_WAKE_LOCK_TAG));
+    }
+
+    @Test
+    @AppModeFull(reason = "Instant apps cannot hold MANAGE_LOW_POWER_STANDBY permission")
+    @EnsureHasPermission({Manifest.permission.MANAGE_LOW_POWER_STANDBY,
+            Manifest.permission.ACCESS_NETWORK_STATE, Manifest.permission.DEVICE_POWER})
+    public void testLowPowerStandby_networkIsBlocked() throws Exception {
+        assumeTrue(mPowerManager.isLowPowerStandbySupported());
+        keepSystemAwake();
+
+        NetworkBlockedStateAsserter asserter = new NetworkBlockedStateAsserter(mContext);
+        asserter.register();
+
+        try {
+            mPowerManager.setLowPowerStandbyEnabled(true);
+            goToSleep();
+            mPowerManager.forceLowPowerStandbyActive(true);
+
+            asserter.assertNetworkBlocked("Network is not blocked", true);
+
+            wakeUp();
+            mPowerManager.forceLowPowerStandbyActive(false);
+
+            asserter.assertNetworkBlocked("Network is blocked after waking up", false);
+        } finally {
+            asserter.unregister();
+        }
+    }
+
+    private void goToSleep() throws Exception {
+        if (!mPowerManager.isInteractive()) {
+            return;
+        }
+
+        final BlockingBroadcastReceiver screenOffReceiver = new BlockingBroadcastReceiver(mContext,
+                Intent.ACTION_SCREEN_OFF);
+        screenOffReceiver.register();
+
+        executeShellCommand("input keyevent SLEEP");
+
+        screenOffReceiver.awaitForBroadcast(1000);
+        screenOffReceiver.unregisterQuietly();
+    }
+
+    private void wakeUp() throws Exception {
+        if (mPowerManager.isInteractive()) {
+            return;
+        }
+
+        final BlockingBroadcastReceiver screenOnReceiver = new BlockingBroadcastReceiver(mContext,
+                Intent.ACTION_SCREEN_ON);
+        screenOnReceiver.register();
+
+        executeShellCommand("input keyevent WAKEUP");
+
+        screenOnReceiver.awaitForBroadcast(1000);
+        screenOnReceiver.unregisterQuietly();
+    }
+
+    private void forceDoze() throws Exception {
+        executeShellCommand("dumpsys deviceidle force-idle deep");
+    }
+
+    private void unforceDoze() throws Exception {
+        executeShellCommand("dumpsys deviceidle unforce");
+    }
+
+    private void enterDozeMaintenance() throws Exception {
+        executeShellCommand("dumpsys deviceidle force-idle deep");
+
+        for (int i = 0; i < 4; i++) {
+            String stepResult = executeShellCommand("dumpsys deviceidle step deep");
+            if (stepResult != null && stepResult.contains("IDLE_MAINTENANCE")) {
+                return;
+            }
+        }
+
+        fail("Failed to enter doze maintenance mode");
+    }
+
+    private boolean isWakeLockDisabled(@NonNull String tag) throws Exception {
+        final PowerManagerServiceDumpProto powerManagerServiceDump = getPowerManagerDump();
+        for (WakeLockProto wakelock : powerManagerServiceDump.wakeLocks) {
+            if (tag.equals(wakelock.tag)) {
+                return wakelock.isDisabled;
+            }
+        }
+        return false;
+    }
+
+    private static PowerManagerServiceDumpProto getPowerManagerDump() throws Exception {
+        return ProtoUtils.getProto(InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+                PowerManagerServiceDumpProto.class, "dumpsys power --proto");
+    }
+
+    private void keepSystemAwake() {
+        mSystemWakeLock = mPowerManager.newWakeLock(PARTIAL_WAKE_LOCK | SYSTEM_WAKELOCK,
+                SYSTEM_WAKE_LOCK_TAG);
+        mSystemWakeLock.acquire();
+    }
+
+    private String executeShellCommand(String command) throws IOException {
+        UiDevice uiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        return uiDevice.executeShellCommand(command);
+    }
+
+    private static class NetworkBlockedStateAsserter {
+        private final ConnectivityManager mConnectivityManager;
+        private final ConnectivityManager.NetworkCallback mNetworkCallback;
+
+        private final Object mLock = new Object();
+        private boolean mIsBlocked = false;
+
+        NetworkBlockedStateAsserter(Context context) {
+            mConnectivityManager = context.getSystemService(ConnectivityManager.class);
+            mNetworkCallback =
+                    new ConnectivityManager.NetworkCallback() {
+                        @Override
+                        public void onBlockedStatusChanged(Network network, boolean blocked) {
+                            synchronized (mLock) {
+                                if (mIsBlocked != blocked) {
+                                    mIsBlocked = blocked;
+                                    mLock.notify();
+                                }
+                            }
+                        }
+                    };
+        }
+
+        private void register() {
+            mConnectivityManager.registerDefaultNetworkCallback(mNetworkCallback);
+        }
+
+        private void assertNetworkBlocked(String message, boolean expected) throws Exception {
+            synchronized (mLock) {
+                if (mIsBlocked == expected) {
+                    return;
+                }
+                mLock.wait(5000);
+                assertEquals(message, expected, mIsBlocked);
+            }
+        }
+
+        private void unregister() {
+            mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
+        }
+    }
+}
diff --git a/tests/tests/os/src/android/os/cts/ParcelTest.java b/tests/tests/os/src/android/os/cts/ParcelTest.java
index 6faf654..253693c 100644
--- a/tests/tests/os/src/android/os/cts/ParcelTest.java
+++ b/tests/tests/os/src/android/os/cts/ParcelTest.java
@@ -705,6 +705,43 @@
         p.recycle();
     }
 
+    public void testWriteBlob() {
+        Parcel p;
+
+        byte[] shortBytes = {(byte) 21};
+        // Create a byte array with 70 KiB to make sure it is large enough to be saved into Android
+        // Shared Memory. The native blob inplace limit is 16 KiB. Also make it larger than the
+        // IBinder.MAX_IPC_SIZE which is 64 KiB.
+        byte[] largeBytes = new byte[70 * 1024];
+        for (int i = 0; i < largeBytes.length; i++) {
+            largeBytes[i] = (byte) (i / Byte.MAX_VALUE);
+        }
+        // test write null
+        p = Parcel.obtain();
+        p.writeBlob(null, 0, 2);
+        p.setDataPosition(0);
+        byte[] outputBytes = p.readBlob();
+        assertNull(outputBytes);
+        p.recycle();
+
+        // test write short bytes
+        p = Parcel.obtain();
+        p.writeBlob(shortBytes, 0, 1);
+        p.setDataPosition(0);
+        assertEquals(shortBytes[0], p.readBlob()[0]);
+        p.recycle();
+
+        // test write large bytes
+        p = Parcel.obtain();
+        p.writeBlob(largeBytes, 0, largeBytes.length);
+        p.setDataPosition(0);
+        outputBytes = p.readBlob();
+        for (int i = 0; i < largeBytes.length; i++) {
+            assertEquals(largeBytes[i], outputBytes[i]);
+        }
+        p.recycle();
+    }
+
     public void testWriteByteArray() {
         Parcel p;
 
diff --git a/tests/tests/os/src/android/os/cts/PerformanceHintManagerTest.java b/tests/tests/os/src/android/os/cts/PerformanceHintManagerTest.java
index b47ebe8..66a2d0d 100644
--- a/tests/tests/os/src/android/os/cts/PerformanceHintManagerTest.java
+++ b/tests/tests/os/src/android/os/cts/PerformanceHintManagerTest.java
@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeNotNull;
 
 import android.os.PerformanceHintManager;
@@ -30,6 +31,8 @@
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.google.common.base.Strings;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -39,6 +42,10 @@
     private final long DEFAULT_TARGET_NS = 16666666L;
     private PerformanceHintManager mPerformanceHintManager;
 
+    static {
+        System.loadLibrary("ctsos_jni");
+    }
+
     @Before
     public void setUp() {
         mPerformanceHintManager =
@@ -57,12 +64,22 @@
         Session b = createSession();
         if (a == null) {
             assertNull(b);
+        } else if (b == null) {
+            assertNull(a);
         } else {
             assertNotEquals(a, b);
         }
     }
 
     @Test
+    public void testNativeCreateHintSession() {
+        final String failureMessage = nativeTestCreateHintSession();
+        if (!Strings.isNullOrEmpty(failureMessage)) {
+            fail(failureMessage);
+        }
+    }
+
+    @Test
     public void testGetPreferredUpdateRateNanos() {
         if (createSession() != null) {
             assertTrue(mPerformanceHintManager.getPreferredUpdateRateNanos() > 0);
@@ -72,6 +89,14 @@
     }
 
     @Test
+    public void testNativeGetPreferredUpdateRateNanos() {
+        final String failureMessage = nativeTestGetPreferredUpdateRateNanos();
+        if (!Strings.isNullOrEmpty(failureMessage)) {
+            fail(failureMessage);
+        }
+    }
+
+    @Test
     public void testUpdateTargetWorkDuration() {
         Session s = createSession();
         assumeNotNull(s);
@@ -79,6 +104,14 @@
     }
 
     @Test
+    public void testNativeUpdateTargetWorkDuration() {
+        final String failureMessage = nativeUpdateTargetWorkDuration();
+        if (!Strings.isNullOrEmpty(failureMessage)) {
+            fail(failureMessage);
+        }
+    }
+
+    @Test
     public void testUpdateTargetWorkDurationWithNegativeDuration() {
         Session s = createSession();
         assumeNotNull(s);
@@ -88,6 +121,14 @@
     }
 
     @Test
+    public void testNativeUpdateTargetWorkDurationWithNegativeDuration() {
+        final String failureMessage = nativeUpdateTargetWorkDurationWithNegativeDuration();
+        if (!Strings.isNullOrEmpty(failureMessage)) {
+            fail(failureMessage);
+        }
+    }
+
+    @Test
     public void testReportActualWorkDuration() {
         Session s = createSession();
         assumeNotNull(s);
@@ -98,6 +139,14 @@
     }
 
     @Test
+    public void testNativeReportActualWorkDuration() {
+        final String failureMessage = nativeReportActualWorkDuration();
+        if (!Strings.isNullOrEmpty(failureMessage)) {
+            fail(failureMessage);
+        }
+    }
+
+    @Test
     public void testReportActualWorkDurationWithIllegalArgument() {
         Session s = createSession();
         assumeNotNull(s);
@@ -108,9 +157,24 @@
     }
 
     @Test
+    public void testNativeReportActualWorkDurationWithIllegalArgument() {
+        final String failureMessage = nativeReportActualWorkDurationWithIllegalArgument();
+        if (!Strings.isNullOrEmpty(failureMessage)) {
+            fail(failureMessage);
+        }
+    }
+
+    @Test
     public void testCloseHintSession() {
         Session s = createSession();
         assumeNotNull(s);
         s.close();
     }
+
+    private native String nativeTestCreateHintSession();
+    private native String nativeTestGetPreferredUpdateRateNanos();
+    private native String nativeUpdateTargetWorkDuration();
+    private native String nativeUpdateTargetWorkDurationWithNegativeDuration();
+    private native String nativeReportActualWorkDuration();
+    private native String nativeReportActualWorkDurationWithIllegalArgument();
 }
diff --git a/tests/tests/os/src/android/os/cts/PowerManager_WakeLockTest.java b/tests/tests/os/src/android/os/cts/PowerManager_WakeLockTest.java
index 639493a..51f1970 100644
--- a/tests/tests/os/src/android/os/cts/PowerManager_WakeLockTest.java
+++ b/tests/tests/os/src/android/os/cts/PowerManager_WakeLockTest.java
@@ -16,15 +16,25 @@
 
 package android.os.cts;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 import android.content.Context;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
 import android.test.AndroidTestCase;
 
+import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Semaphore;
+
 public class PowerManager_WakeLockTest extends AndroidTestCase {
     private static final String TAG = "PowerManager_WakeLockTest";
 
+    private final Executor mExec = Executors.newSingleThreadExecutor();
+    boolean mCurrentState1;
+    boolean mCurrentState2;
+
     /**
      * Test points:
      * 1 Makes sure the device is on at the level you asked when you created the wake lock
@@ -77,4 +87,137 @@
 
         lock.release();
     }
+
+    /**
+     * setStateListener() is called before acquire(), the callback is sent to framework by
+     * acquire() call.
+     * @throws Exception
+     */
+    public void testWakeLockCallback() throws Exception {
+        final PowerManager pm = getContext().getSystemService(PowerManager.class);
+        final WakeLock lock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+        final Semaphore semaphore = new Semaphore(0);
+        lock.setStateListener(mExec, new PowerManager.WakeLockStateListener() {
+            @Override
+            public void onStateChanged(boolean enabled) {
+                mCurrentState1 = enabled;
+                semaphore.release();
+            }
+        });
+        lock.acquire();
+        assertTrue(semaphore.tryAcquire(5, SECONDS));
+        assertTrue(mCurrentState1);
+
+        lock.release();
+        assertTrue(semaphore.tryAcquire(5, SECONDS));
+        assertFalse(mCurrentState1);
+
+        lock.acquire();
+        assertTrue(semaphore.tryAcquire(5, SECONDS));
+        assertTrue(mCurrentState1);
+
+        lock.release();
+        assertTrue(semaphore.tryAcquire(5, SECONDS));
+        assertFalse(mCurrentState1);
+    }
+
+    /**
+     * setStateListener() can be called after acquire() call to change the listener.
+     * @throws Exception
+     */
+    public void testWakeLockCallback_changeListener() throws Exception {
+        final PowerManager pm = getContext().getSystemService(PowerManager.class);
+        final WakeLock lock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+        final Semaphore semaphore1 = new Semaphore(0);
+        final Semaphore semaphore2 = new Semaphore(0);
+        final PowerManager.WakeLockStateListener listener1 =
+                new PowerManager.WakeLockStateListener() {
+            @Override
+            public void onStateChanged(boolean enabled) {
+                mCurrentState1 = enabled;
+                semaphore1.release();
+            }
+        };
+        final PowerManager.WakeLockStateListener listener2 =
+                new PowerManager.WakeLockStateListener() {
+            @Override
+            public void onStateChanged(boolean enabled) {
+                mCurrentState2 = enabled;
+                semaphore2.release();
+            }
+        };
+
+        lock.setStateListener(mExec, listener1);
+        lock.setReferenceCounted(false);
+
+        lock.acquire();
+        assertTrue(semaphore1.tryAcquire(5, SECONDS));
+        assertTrue(mCurrentState1);
+
+        // setStateListener() is called after acquire() to change the listener.
+        lock.setStateListener(mExec, listener2);
+
+        // old listener is not notified.
+        assertFalse(semaphore1.tryAcquire(5, SECONDS));
+        // new listener is notified.
+        assertTrue(semaphore2.tryAcquire(5, SECONDS));
+        assertTrue(mCurrentState2);
+
+        lock.release();
+        assertTrue(semaphore2.tryAcquire(5, SECONDS));
+        assertFalse(mCurrentState2);
+
+        lock.acquire();
+        assertTrue(semaphore2.tryAcquire(5, SECONDS));
+        assertTrue(mCurrentState2);
+
+        // after acquire(), change back to listener1.
+        lock.setStateListener(mExec, listener1);
+        lock.acquire();
+        assertTrue(semaphore1.tryAcquire(5, SECONDS));
+        assertTrue(mCurrentState1);
+
+        lock.release();
+        assertTrue(semaphore1.tryAcquire(5, SECONDS));
+        assertFalse(mCurrentState1);
+    }
+
+    /**
+     * After acquire(), setStateListener() to a null listener.
+     * @throws Exception
+     */
+    public void testWakeLockCallback_nullListener() throws Exception {
+        final PowerManager pm = getContext().getSystemService(PowerManager.class);
+        final WakeLock lock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+        final Semaphore semaphore1 = new Semaphore(0);
+        final PowerManager.WakeLockStateListener listener1 =
+                new PowerManager.WakeLockStateListener() {
+                    @Override
+                    public void onStateChanged(boolean enabled) {
+                        mCurrentState1 = enabled;
+                        semaphore1.release();
+                    }
+                };
+        lock.setReferenceCounted(false);
+
+        lock.setStateListener(mExec, listener1);
+
+        lock.acquire();
+        assertTrue(semaphore1.tryAcquire(5, SECONDS));
+        assertTrue(mCurrentState1);
+
+        // set a null listener to cancel the listener.
+        lock.setStateListener(mExec, null);
+
+        lock.release();
+        // old listener does not get notified.
+        assertFalse(semaphore1.tryAcquire(5, SECONDS));
+
+        lock.setStateListener(mExec, listener1);
+        lock.acquire();
+        assertTrue(semaphore1.tryAcquire(5, SECONDS));
+
+        lock.release();
+        assertTrue(semaphore1.tryAcquire(5, SECONDS));
+    }
 }
diff --git a/tests/tests/os/src/android/os/cts/ProcessTest.java b/tests/tests/os/src/android/os/cts/ProcessTest.java
index 2ca0fd0..f72cd01 100644
--- a/tests/tests/os/src/android/os/cts/ProcessTest.java
+++ b/tests/tests/os/src/android/os/cts/ProcessTest.java
@@ -16,16 +16,38 @@
 
 package android.os.cts;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.pm.PackageManager;
 import android.os.IBinder;
 import android.os.Process;
-import android.test.AndroidTestCase;
 import android.util.Log;
 
-public class ProcessTest extends AndroidTestCase {
+import androidx.test.InstrumentationRegistry;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+
+/**
+ * CTS for {@link android.os.Process}.
+ *
+ * We have more test in cts/tests/process/ too.
+ */
+@RunWith(JUnit4.class)
+public class ProcessTest {
 
     public static final int THREAD_PRIORITY_HIGHEST = -20;
     private static final String NONE_EXISITENT_NAME = "abcdefcg";
@@ -33,6 +55,8 @@
     private static final String PROCESS_SHELL= "shell";
     private static final String PROCESS_CACHE= "cache";
     private static final String REMOTE_SERVICE = "android.app.REMOTESERVICE";
+    private static final int APP_UID = 10001;
+    private static final int SANDBOX_SDK_UID = 20001;
     private static final String TAG = "ProcessTest";
     private ISecondary mSecondaryService = null;
     private Intent mIntent;
@@ -40,10 +64,11 @@
     private boolean mHasConnected;
     private boolean mHasDisconnected;
     private ServiceConnection mSecondaryConnection;
+    private Context mContext;
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() throws Exception {
+        mContext = InstrumentationRegistry.getContext();
         mSync = new Object();
         mSecondaryConnection = new ServiceConnection() {
             public void onServiceConnected(ComponentName className,
@@ -67,12 +92,12 @@
             }
         };
         mIntent = new Intent(REMOTE_SERVICE);
-        mIntent.setPackage(getContext().getPackageName());
-        getContext().startService(mIntent);
+        mIntent.setPackage(mContext.getPackageName());
+        mContext.startService(mIntent);
 
         Intent secondaryIntent = new Intent(ISecondary.class.getName());
-        secondaryIntent.setPackage(getContext().getPackageName());
-        getContext().bindService(secondaryIntent, mSecondaryConnection,
+        secondaryIntent.setPackage(mContext.getPackageName());
+        mContext.bindService(secondaryIntent, mSecondaryConnection,
                 Context.BIND_AUTO_CREATE);
         synchronized (mSync) {
             if (!mHasConnected) {
@@ -84,17 +109,17 @@
         }
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
+    @After
+    public void tearDown() throws Exception {
         if (mIntent != null) {
-            getContext().stopService(mIntent);
+            mContext.stopService(mIntent);
         }
         if (mSecondaryConnection != null) {
-            getContext().unbindService(mSecondaryConnection);
+            mContext.unbindService(mSecondaryConnection);
         }
     }
 
+    @Test
     public void testMiscMethods() {
         /*
          * Test setThreadPriority(int) and setThreadPriority(int, int)
@@ -147,6 +172,8 @@
         assertEquals(0, Process.getGidForName("0"));
 
         assertTrue(Process.myUid() >= 0);
+
+        assertNotEquals(null, Process.getExclusiveCores());
     }
 
     /**
@@ -154,6 +181,7 @@
      * Only the process running the caller's packages/application
      * and any additional processes created by that app be able to kill each other's processes.
      */
+    @Test
     public void testKillProcess() throws Exception {
         long time = 0;
         int servicePid = 0;
@@ -161,7 +189,7 @@
             servicePid = mSecondaryService.getPid();
             time = mSecondaryService.getElapsedCpuTime();
         } finally {
-            getContext().stopService(mIntent);
+            mContext.stopService(mIntent);
             mIntent = null;
         }
 
@@ -187,12 +215,13 @@
      * Test sendSignal(int) point.
      * Send a signal to the given process.
      */
+    @Test
     public void testSendSignal() throws Exception {
         int servicePid = 0;
         try {
             servicePid = mSecondaryService.getPid();
         } finally {
-            getContext().stopService(mIntent);
+            mContext.stopService(mIntent);
             mIntent = null;
         }
         assertTrue(servicePid != 0);
@@ -208,4 +237,30 @@
         }
         assertTrue(mHasDisconnected);
     }
+
+    /**
+     * Tests APIs related to sdk sandbox uids.
+     */
+    @Test
+    public void testSdkSandboxUids() {
+        assertEquals(SANDBOX_SDK_UID, Process.toSdkSandboxUid(APP_UID));
+        assertEquals(APP_UID, Process.getAppUidForSdkSandboxUid(SANDBOX_SDK_UID));
+
+        assertFalse(Process.isSdkSandboxUid(APP_UID));
+        assertTrue(Process.isSdkSandboxUid(SANDBOX_SDK_UID));
+
+        assertFalse(Process.isSdkSandbox());
+    }
+
+    /**
+     * Tests that the reserved UID is not taken by an actual package.
+     */
+    @Test
+    public void testReservedVirtualUid() {
+        PackageManager pm = mContext.getPackageManager();
+        final String name = pm.getNameForUid(Process.SDK_SANDBOX_VIRTUAL_UID);
+        assertNull(name);
+        final String[] packages = pm.getPackagesForUid(Process.SDK_SANDBOX_VIRTUAL_UID);
+        assertNull(packages);
+    }
 }
diff --git a/tests/tests/os/src/android/os/cts/SharedMemoryFileDescriptorTest.java b/tests/tests/os/src/android/os/cts/SharedMemoryFileDescriptorTest.java
new file mode 100644
index 0000000..9668a61
--- /dev/null
+++ b/tests/tests/os/src/android/os/cts/SharedMemoryFileDescriptorTest.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright (C) 2021 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 android.os.cts;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.os.Parcel;
+import android.os.ParcelFileDescriptor;
+import android.os.SharedMemory;
+import android.system.OsConstants;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.nio.ByteBuffer;
+
+@RunWith(AndroidJUnit4.class)
+public final class SharedMemoryFileDescriptorTest {
+
+    private static final String TAG = SharedMemoryFileDescriptorTest.class.getSimpleName();
+
+    @Test
+    public void testCreation() throws Exception {
+        // setup
+        int memSize = 32 * 1024;
+        int bufSize = memSize / 4;
+        SharedMemory sharedMem1 = SharedMemory.create(/* name= */null, memSize);
+        try (ByteBufferSession buffer1 =
+                new ByteBufferSession(sharedMem1, /* offset= */ 0, bufSize)) {
+            buffer1.fillSequentialPattern();
+        }
+
+        Parcel p = Parcel.obtain();
+        sharedMem1.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        ParcelFileDescriptor fileDescriptor = p.readFileDescriptor();
+
+        // execution
+        SharedMemory sharedMem2 = SharedMemory.fromFileDescriptor(fileDescriptor);
+
+        // assertion
+        assertFalse(fileDescriptor.getFileDescriptor().valid());
+        try (ByteBufferSession buffer2 =
+                new ByteBufferSession(sharedMem2, /* offset= */ 0, bufSize)) {
+            assertTrue(buffer2.checkSequentialPattern());
+        }
+    }
+
+    @Test
+    public void testDuplication() throws Exception {
+        // setup
+        int memSize = 32 * 1024;
+        int bufSize = memSize / 4;
+        SharedMemory sharedMem1 = SharedMemory.create(/* name= */ null, memSize);
+        try (ByteBufferSession buffer1 =
+                new ByteBufferSession(sharedMem1, /* offset= */ 0, bufSize)) {
+            buffer1.fillSequentialPattern();
+        }
+
+        Parcel p = Parcel.obtain();
+        sharedMem1.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        ParcelFileDescriptor fileDescriptor = p.readFileDescriptor();
+        ParcelFileDescriptor dupFileDescriptor = fileDescriptor.dup();
+
+        // execution
+        SharedMemory sharedMem2 = SharedMemory.fromFileDescriptor(dupFileDescriptor);
+
+        // assertion
+        assertTrue(fileDescriptor.getFileDescriptor().valid());
+        try (ByteBufferSession buffer2 =
+                new ByteBufferSession(sharedMem2, /* offset= */ 0, bufSize)) {
+            assertTrue(buffer2.checkSequentialPattern());
+            buffer2.clearMemory();
+        }
+        try (ByteBufferSession buffer1 =
+                new ByteBufferSession(sharedMem1, /* offset= */ 0, bufSize)) {
+            // Clearing the shared RAM via sharedMem2 should be visible to sharedMem1
+            assertTrue(buffer1.hasCleanMemory());
+        }
+    }
+
+    private static final class ByteBufferSession implements AutoCloseable {
+        private final ByteBuffer mBuf;
+        private final int mSize;
+
+        ByteBufferSession(SharedMemory mem, int offset, int length)
+                throws Exception {
+            mBuf = mem.map(OsConstants.PROT_READ | OsConstants.PROT_WRITE, offset, length);
+            mSize = length;
+        }
+
+        @Override
+        public void close() {
+            SharedMemory.unmap(mBuf);
+        }
+
+        public void clearMemory() {
+            mBuf.clear();
+            for (int i = 0; i < mSize; i++) {
+                mBuf.put((byte) 0);
+            }
+        }
+
+        public boolean hasCleanMemory() throws Exception {
+            for (int i = 0; i < mSize; i++) {
+                if (mBuf.get() != 0) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public void fillSequentialPattern() {
+            for (int fillPos = 0; fillPos < mSize; fillPos++) {
+                mBuf.put(fillPos, (byte) fillPos);
+            }
+        }
+
+        public boolean checkSequentialPattern() {
+            for (int fillPos = 0; fillPos < mSize; fillPos++) {
+                if (mBuf.get() != (byte) fillPos) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+    }
+}
diff --git a/tests/tests/os/src/android/os/cts/VibrationAttributesTest.java b/tests/tests/os/src/android/os/cts/VibrationAttributesTest.java
index 966780b..9d64927 100644
--- a/tests/tests/os/src/android/os/cts/VibrationAttributesTest.java
+++ b/tests/tests/os/src/android/os/cts/VibrationAttributesTest.java
@@ -21,7 +21,6 @@
 
 import android.media.AudioAttributes;
 import android.os.VibrationAttributes;
-import android.os.VibrationEffect;
 
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
@@ -29,35 +28,73 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class VibrationAttributesTest {
-    private static final int TEST_USAGE = AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY;
+    private static final Map<Integer, Integer> AUDIO_TO_VIBRATION_USAGE_MAP;
+    static {
+        Map<Integer, Integer> map = new HashMap<>();
+        map.put(AudioAttributes.USAGE_ALARM, VibrationAttributes.USAGE_ALARM);
+        map.put(AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY,
+                VibrationAttributes.USAGE_ACCESSIBILITY);
+        map.put(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION, VibrationAttributes.USAGE_TOUCH);
+        map.put(AudioAttributes.USAGE_ASSISTANCE_NAVIGATION_GUIDANCE,
+                VibrationAttributes.USAGE_COMMUNICATION_REQUEST);
+        map.put(AudioAttributes.USAGE_ASSISTANT, VibrationAttributes.USAGE_COMMUNICATION_REQUEST);
+        map.put(AudioAttributes.USAGE_GAME, VibrationAttributes.USAGE_MEDIA);
+        map.put(AudioAttributes.USAGE_MEDIA, VibrationAttributes.USAGE_MEDIA);
+        map.put(AudioAttributes.USAGE_NOTIFICATION, VibrationAttributes.USAGE_NOTIFICATION);
+        map.put(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_DELAYED,
+                VibrationAttributes.USAGE_NOTIFICATION);
+        map.put(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_REQUEST,
+                VibrationAttributes.USAGE_NOTIFICATION);
+        map.put(AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT,
+                VibrationAttributes.USAGE_NOTIFICATION);
+        map.put(AudioAttributes.USAGE_NOTIFICATION_EVENT, VibrationAttributes.USAGE_NOTIFICATION);
+        map.put(AudioAttributes.USAGE_NOTIFICATION_RINGTONE, VibrationAttributes.USAGE_RINGTONE);
+        map.put(AudioAttributes.USAGE_UNKNOWN, VibrationAttributes.USAGE_UNKNOWN);
+        map.put(AudioAttributes.USAGE_VOICE_COMMUNICATION,
+                VibrationAttributes.USAGE_COMMUNICATION_REQUEST);
+        map.put(AudioAttributes.USAGE_VOICE_COMMUNICATION_SIGNALLING,
+                VibrationAttributes.USAGE_COMMUNICATION_REQUEST);
+        AUDIO_TO_VIBRATION_USAGE_MAP = map;
+    }
 
-    private static final int TEST_AMPLITUDE = 100;
-    private static final long TEST_TIMING_LONG = 5000;
-    private static final long TEST_TIMING_SHORT = 4999;
-    private static final long[] TEST_TIMINGS_LONG = new long[] { 100, 100, 4800 };
-    private static final long[] TEST_TIMINGS_SHORT = new long[] { 100, 100, 4799 };
-
-
-    private static final VibrationEffect TEST_ONE_SHOT_LONG =
-            VibrationEffect.createOneShot(TEST_TIMING_LONG, TEST_AMPLITUDE);
-    private static final VibrationEffect TEST_ONE_SHOT_SHORT =
-            VibrationEffect.createOneShot(TEST_TIMING_SHORT, TEST_AMPLITUDE);
-    private static final VibrationEffect TEST_WAVEFORM_LONG =
-            VibrationEffect.createWaveform(TEST_TIMINGS_LONG, -1);
-    private static final VibrationEffect TEST_WAVEFORM_SHORT =
-            VibrationEffect.createWaveform(TEST_TIMINGS_SHORT, -1);
-    private static final VibrationEffect TEST_PREBAKED =
-            VibrationEffect.get(VibrationEffect.EFFECT_CLICK, true);
+    private static final Map<Integer, Integer> VIBRATION_TO_AUDIO_USAGE_MAP;
+    static {
+        Map<Integer, Integer> map = new HashMap<>();
+        map.put(VibrationAttributes.USAGE_ALARM, AudioAttributes.USAGE_ALARM);
+        map.put(VibrationAttributes.USAGE_ACCESSIBILITY,
+                AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY);
+        map.put(VibrationAttributes.USAGE_COMMUNICATION_REQUEST,
+                AudioAttributes.USAGE_VOICE_COMMUNICATION);
+        map.put(VibrationAttributes.USAGE_HARDWARE_FEEDBACK, AudioAttributes.USAGE_UNKNOWN);
+        map.put(VibrationAttributes.USAGE_MEDIA, AudioAttributes.USAGE_MEDIA);
+        map.put(VibrationAttributes.USAGE_NOTIFICATION, AudioAttributes.USAGE_NOTIFICATION);
+        map.put(VibrationAttributes.USAGE_PHYSICAL_EMULATION, AudioAttributes.USAGE_UNKNOWN);
+        map.put(VibrationAttributes.USAGE_RINGTONE, AudioAttributes.USAGE_NOTIFICATION_RINGTONE);
+        map.put(VibrationAttributes.USAGE_TOUCH, AudioAttributes.USAGE_ASSISTANCE_SONIFICATION);
+        VIBRATION_TO_AUDIO_USAGE_MAP = map;
+    }
 
     @Test
-    public void testCreate() {
-        AudioAttributes tmp = new AudioAttributes.Builder()
-                .setUsage(AudioAttributes.USAGE_ALARM)
-                .build();
-        VibrationAttributes attr = new VibrationAttributes.Builder(tmp, null).build();
+    public void testCreateFromVibrationAttributes() {
+        VibrationAttributes tmp = VibrationAttributes.createForUsage(
+                VibrationAttributes.USAGE_TOUCH);
+        VibrationAttributes attr = new VibrationAttributes.Builder(tmp).build();
+        assertEquals(attr.getUsage(), VibrationAttributes.USAGE_TOUCH);
+        assertEquals(attr.getUsageClass(), VibrationAttributes.USAGE_CLASS_FEEDBACK);
+        assertEquals(attr.getFlags(), 0);
+        assertEquals(attr.getAudioUsage(), AudioAttributes.USAGE_ASSISTANCE_SONIFICATION);
+    }
+
+    @Test
+    public void testCreateFromAudioAttributes() {
+        AudioAttributes audioAttributes = createAudioAttributes(AudioAttributes.USAGE_ALARM);
+        VibrationAttributes attr = new VibrationAttributes.Builder(audioAttributes).build();
         assertEquals(attr.getUsage(), VibrationAttributes.USAGE_ALARM);
         assertEquals(attr.getUsageClass(), VibrationAttributes.USAGE_CLASS_ALARM);
         assertEquals(attr.getFlags(), 0);
@@ -65,90 +102,91 @@
     }
 
     @Test
+    public void testCreateForUsage() {
+        VibrationAttributes attr = VibrationAttributes.createForUsage(
+                VibrationAttributes.USAGE_RINGTONE);
+        assertEquals(attr.getUsage(), VibrationAttributes.USAGE_RINGTONE);
+        assertEquals(attr.getUsageClass(), VibrationAttributes.USAGE_CLASS_ALARM);
+        assertEquals(attr.getFlags(), 0);
+        assertEquals(attr.getAudioUsage(), AudioAttributes.USAGE_NOTIFICATION_RINGTONE);
+    }
+
+    @Test
     public void testGetAudioUsageReturnOriginalUsage() {
-        AudioAttributes tmp = new AudioAttributes.Builder()
-                .setUsage(AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY)
-                .build();
-        VibrationAttributes attr = new VibrationAttributes.Builder(tmp, null).build();
+        VibrationAttributes attr = createForAudioUsage(AudioAttributes.USAGE_VOICE_COMMUNICATION);
         assertEquals(attr.getUsage(), VibrationAttributes.USAGE_COMMUNICATION_REQUEST);
-        assertEquals(attr.getAudioUsage(), AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY);
+        assertEquals(attr.getAudioUsage(), AudioAttributes.USAGE_VOICE_COMMUNICATION);
     }
 
     @Test
     public void testGetAudioUsageUnknownReturnsBasedOnVibrationUsage() {
-        VibrationAttributes attr = new VibrationAttributes.Builder()
-                .setUsage(VibrationAttributes.USAGE_NOTIFICATION).build();
+        VibrationAttributes attr = VibrationAttributes.createForUsage(
+                VibrationAttributes.USAGE_NOTIFICATION);
         assertEquals(attr.getUsage(), VibrationAttributes.USAGE_NOTIFICATION);
         assertEquals(attr.getAudioUsage(), AudioAttributes.USAGE_NOTIFICATION);
     }
 
     @Test
+    public void testAudioToVibrationUsageMapping() {
+        for (Map.Entry<Integer, Integer> entry : AUDIO_TO_VIBRATION_USAGE_MAP.entrySet()) {
+            assertEquals(entry.getValue().intValue(), new VibrationAttributes.Builder(
+                    createForAudioUsage(entry.getKey())).build().getUsage());
+        }
+    }
+
+    @Test
+    public void testVibrationToAudioUsageMapping() {
+        for (Map.Entry<Integer, Integer> entry : VIBRATION_TO_AUDIO_USAGE_MAP.entrySet()) {
+            assertEquals(entry.getValue().intValue(),
+                    new VibrationAttributes.Builder()
+                            .setUsage(entry.getKey())
+                            .build()
+                            .getAudioUsage());
+        }
+    }
+
+    @Test
     public void testEquals() {
-        AudioAttributes tmp = createAudioAttributes(TEST_USAGE);
-        VibrationAttributes attr = new VibrationAttributes.Builder(tmp, null).build();
-        VibrationAttributes attr2 = new VibrationAttributes.Builder(tmp, null).build();
+        AudioAttributes audioAttributes = createAudioAttributes(
+                AudioAttributes.USAGE_ASSISTANCE_ACCESSIBILITY);
+        VibrationAttributes attr = new VibrationAttributes.Builder(audioAttributes).build();
+        VibrationAttributes attr2 = new VibrationAttributes.Builder(audioAttributes).build();
         assertEquals(attr, attr2);
     }
 
     @Test
     public void testNotEqualsDifferentAudioUsage() {
-        AudioAttributes tmp = createAudioAttributes(
-                AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_INSTANT);
-        VibrationAttributes attr = new VibrationAttributes.Builder(tmp, null).build();
-        AudioAttributes tmp2 = createAudioAttributes(
-                AudioAttributes.USAGE_NOTIFICATION_COMMUNICATION_DELAYED);
-        VibrationAttributes attr2 = new VibrationAttributes.Builder(tmp2, null).build();
+        VibrationAttributes attr = createForAudioUsage(AudioAttributes.USAGE_NOTIFICATION);
+        VibrationAttributes attr2 = createForAudioUsage(AudioAttributes.USAGE_NOTIFICATION_EVENT);
         assertEquals(attr.getUsage(), attr2.getUsage());
         assertNotEquals(attr, attr2);
     }
 
     @Test
     public void testNotEqualsDifferentVibrationUsage() {
-        VibrationAttributes attr = new VibrationAttributes.Builder()
-                .setUsage(VibrationAttributes.USAGE_TOUCH)
-                .build();
-        VibrationAttributes attr2 = new VibrationAttributes.Builder()
-                .setUsage(VibrationAttributes.USAGE_NOTIFICATION)
-                .build();
+        VibrationAttributes attr = VibrationAttributes.createForUsage(
+                VibrationAttributes.USAGE_TOUCH);
+        VibrationAttributes attr2 = VibrationAttributes.createForUsage(
+                VibrationAttributes.USAGE_NOTIFICATION);
         assertNotEquals(attr, attr2);
     }
 
     @Test
     public void testNotEqualsDifferentFlags() {
-        AudioAttributes tmp = createAudioAttributes(TEST_USAGE);
-        VibrationAttributes attr = new VibrationAttributes.Builder(tmp, null).build();
-        VibrationAttributes attr2 = new VibrationAttributes.Builder(tmp, null).setFlags(1, 1)
+        AudioAttributes audioAttributes = createAudioAttributes(
+                AudioAttributes.USAGE_ASSISTANCE_SONIFICATION);
+        VibrationAttributes attr = new VibrationAttributes.Builder(audioAttributes).build();
+        VibrationAttributes attr2 = new VibrationAttributes.Builder(audioAttributes).setFlags(1, 1)
                 .build();
         assertNotEquals(attr, attr2);
     }
 
-    @Test
-    public void testHeuristics() {
-        AudioAttributes tmp = createAudioAttributes(AudioAttributes.USAGE_UNKNOWN);
-        VibrationAttributes oneShotLong =
-            new VibrationAttributes.Builder(tmp, TEST_ONE_SHOT_LONG).build();
-        VibrationAttributes oneShotShort =
-            new VibrationAttributes.Builder(tmp, TEST_ONE_SHOT_SHORT).build();
-        VibrationAttributes waveformLong =
-            new VibrationAttributes.Builder(tmp, TEST_WAVEFORM_LONG).build();
-        VibrationAttributes waveformShort =
-            new VibrationAttributes.Builder(tmp, TEST_WAVEFORM_SHORT).build();
-        VibrationAttributes prebaked =
-            new VibrationAttributes.Builder(tmp, TEST_PREBAKED).build();
-        assertEquals(oneShotShort.getUsage(), VibrationAttributes.USAGE_TOUCH);
-        assertEquals(oneShotShort.getAudioUsage(), AudioAttributes.USAGE_ASSISTANCE_SONIFICATION);
-        assertEquals(waveformShort.getUsage(), VibrationAttributes.USAGE_TOUCH);
-        assertEquals(waveformShort.getAudioUsage(), AudioAttributes.USAGE_ASSISTANCE_SONIFICATION);
-        assertEquals(oneShotLong.getUsage(), VibrationAttributes.USAGE_UNKNOWN);
-        assertEquals(oneShotLong.getAudioUsage(), AudioAttributes.USAGE_UNKNOWN);
-        assertEquals(waveformLong.getUsage(), VibrationAttributes.USAGE_UNKNOWN);
-        assertEquals(waveformLong.getAudioUsage(), AudioAttributes.USAGE_UNKNOWN);
-        assertEquals(prebaked.getUsage(), VibrationAttributes.USAGE_TOUCH);
-        assertEquals(prebaked.getAudioUsage(), AudioAttributes.USAGE_ASSISTANCE_SONIFICATION);
+    private static AudioAttributes createAudioAttributes(int audioUsage) {
+        return new AudioAttributes.Builder().setUsage(audioUsage).build();
     }
 
-    private static AudioAttributes createAudioAttributes(int usage) {
-        return new AudioAttributes.Builder().setUsage(usage).build();
+    private static VibrationAttributes createForAudioUsage(int audioUsage) {
+        return new VibrationAttributes.Builder(createAudioAttributes(audioUsage)).build();
     }
 }
 
diff --git a/tests/tests/os/src/android/os/cts/VibrationEffectTest.java b/tests/tests/os/src/android/os/cts/VibrationEffectTest.java
index 0b0f5e4..a3799ce 100644
--- a/tests/tests/os/src/android/os/cts/VibrationEffectTest.java
+++ b/tests/tests/os/src/android/os/cts/VibrationEffectTest.java
@@ -16,9 +16,11 @@
 
 package android.os.cts;
 
+import static android.os.VibrationEffect.VibrationParameter.targetAmplitude;
+import static android.os.VibrationEffect.VibrationParameter.targetFrequency;
+
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
@@ -26,6 +28,7 @@
 
 import android.os.Parcel;
 import android.os.VibrationEffect;
+import android.os.VibrationEffect.Composition.UnreachableAfterRepeatingIndefinitelyException;
 import android.os.vibrator.PrebakedSegment;
 import android.os.vibrator.PrimitiveSegment;
 import android.os.vibrator.RampSegment;
@@ -38,6 +41,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.time.Duration;
 import java.util.Arrays;
 
 @SmallTest
@@ -50,9 +54,9 @@
 
     private static final long[] TEST_TIMINGS = new long[]{100, 100, 200};
     private static final int[] TEST_AMPLITUDES =
-            new int[]{255, 0, VibrationEffect.DEFAULT_AMPLITUDE};
+            new int[]{255, 0, 102};
     private static final float[] TEST_FLOAT_AMPLITUDES =
-            new float[]{1f, 0f, VibrationEffect.DEFAULT_AMPLITUDE};
+            new float[]{1f, 0f, 0.4f};
 
     private static final VibrationEffect TEST_ONE_SHOT =
             VibrationEffect.createOneShot(TEST_TIMING, TEST_AMPLITUDE);
@@ -61,11 +65,13 @@
     private static final VibrationEffect TEST_WAVEFORM_NO_AMPLITUDES =
             VibrationEffect.createWaveform(TEST_TIMINGS, -1);
     private static final VibrationEffect TEST_WAVEFORM_BUILT =
-            VibrationEffect.startWaveform()
-                    .addStep(/* amplitude= */ 0.5f, /* duration= */ 10)
-                    .addStep(/* amplitude= */ 0.8f, /* frequency= */ -1f, /* duration= */ 20)
-                    .addRamp(/* amplitude= */ 1f, /* duration= */ 100)
-                    .addRamp(/* amplitude= */ 0.2f, /* frequency= */ 1f, /* duration= */ 200)
+            VibrationEffect.startWaveform(targetAmplitude(0.5f))
+                    .addSustain(Duration.ofMillis(10))
+                    .addTransition(Duration.ZERO, targetAmplitude(0.8f), targetFrequency(100f))
+                    .addSustain(Duration.ofMillis(10))
+                    .addTransition(Duration.ofMillis(100), targetAmplitude(1))
+                    .addTransition(Duration.ofMillis(200),
+                            targetAmplitude(0.2f), targetFrequency(200f))
                     .build();
     private static final VibrationEffect TEST_PREBAKED =
             VibrationEffect.get(VibrationEffect.EFFECT_CLICK, true);
@@ -75,8 +81,10 @@
                     .addPrimitive(VibrationEffect.Composition.PRIMITIVE_SLOW_RISE, 0.8f)
                     .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK, 0.5f, /* delay= */ 10)
                     .addEffect(TEST_ONE_SHOT)
-                    .addEffect(TEST_WAVEFORM, /* delay= */ 10)
-                    .addEffect(TEST_WAVEFORM_BUILT, /* delay= */ 100)
+                    .addOffDuration(Duration.ofMillis(10))
+                    .addEffect(TEST_WAVEFORM)
+                    .addOffDuration(Duration.ofSeconds(1))
+                    .addEffect(TEST_WAVEFORM_BUILT)
                     .compose();
 
 
@@ -187,6 +195,10 @@
             assertAmplitude(TEST_FLOAT_AMPLITUDES[i], effect, i);
         }
 
+        effect = VibrationEffect.createWaveform(new long[] { 10 },
+                new int[] { VibrationEffect.DEFAULT_AMPLITUDE }, -1);
+        assertAmplitude(VibrationEffect.DEFAULT_AMPLITUDE, effect, /* index= */ 0);
+
         effect = VibrationEffect.createWaveform(TEST_TIMINGS, TEST_AMPLITUDES, 0);
         assertEquals(0, getRepeatIndex(effect));
 
@@ -418,14 +430,16 @@
     public void testComposedEquals() {
         VibrationEffect effect = VibrationEffect.startComposition()
                 .addPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK)
-                .addEffect(TEST_ONE_SHOT, /* delay= */ 10)
+                .addOffDuration(Duration.ofMillis(10))
+                .addEffect(TEST_ONE_SHOT)
                 .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK, 0.5f, 10)
                 .addEffect(TEST_WAVEFORM)
                 .compose();
 
         VibrationEffect otherEffect = VibrationEffect.startComposition()
                 .addPrimitive(VibrationEffect.Composition.PRIMITIVE_CLICK, 1f, 0)
-                .addEffect(TEST_ONE_SHOT, /* delay= */ 10)
+                .addOffDuration(Duration.ofMillis(10))
+                .addEffect(TEST_ONE_SHOT)
                 .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK, 0.5f, 10)
                 .addEffect(TEST_WAVEFORM)
                 .compose();
@@ -434,6 +448,23 @@
     }
 
     @Test
+    public void testComposedRepeatingAreEqualsAreEquals() {
+        VibrationEffect repeatingWaveform = VibrationEffect.createWaveform(
+                new long[] { 10, 20, 30}, new int[] { 50, 100, 150 }, /* repeatIndex= */ 0);
+        VibrationEffect nonRepeatingWaveform = VibrationEffect.createWaveform(
+                new long[] { 10, 20, 30}, new int[] { 50, 100, 150 }, /* repeatIndex= */ -1);
+
+        VibrationEffect effect = VibrationEffect.startComposition()
+                .addEffect(repeatingWaveform)
+                .compose();
+        VibrationEffect otherEffect = VibrationEffect.startComposition()
+                .repeatEffectIndefinitely(nonRepeatingWaveform)
+                .compose();
+        assertEquals(effect, otherEffect);
+        assertEquals(effect.hashCode(), otherEffect.hashCode());
+    }
+
+    @Test
     public void testComposedDifferentPrimitivesNotEquals() {
         VibrationEffect effect = VibrationEffect.startComposition()
                 .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK)
@@ -505,10 +536,12 @@
     @Test
     public void testComposedDifferentWaveformDelayNotEquals() {
         VibrationEffect effect = VibrationEffect.startComposition()
-                .addEffect(TEST_ONE_SHOT, /* delay= */ 10)
+                .addOffDuration(Duration.ofMillis(10))
+                .addEffect(TEST_ONE_SHOT)
                 .compose();
         VibrationEffect otherEffect = VibrationEffect.startComposition()
-                .addEffect(TEST_ONE_SHOT, /* delay= */ 100)
+                .addOffDuration(Duration.ofSeconds(10))
+                .addEffect(TEST_ONE_SHOT)
                 .compose();
         assertNotEquals(effect, otherEffect);
     }
@@ -527,11 +560,19 @@
                 .compose();
         assertEquals(TEST_ONE_SHOT.getDuration(), effect.getDuration());
 
+        effect = VibrationEffect.startComposition().addOffDuration(Duration.ofSeconds(2)).compose();
+        assertEquals(2_000, effect.getDuration());
+
         effect = VibrationEffect.startComposition()
                 .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK)
                 .addEffect(VibrationEffect.createWaveform(new long[]{10, 10}, /* repeat= */ 0))
                 .compose();
         assertEquals(Long.MAX_VALUE, effect.getDuration());
+
+        effect = VibrationEffect.startComposition()
+                .repeatEffectIndefinitely(TEST_ONE_SHOT)
+                .compose();
+        assertEquals(Long.MAX_VALUE, effect.getDuration());
     }
 
     @Test(expected = IllegalStateException.class)
@@ -539,17 +580,55 @@
         VibrationEffect.startComposition().compose();
     }
 
+    @Test(expected = IllegalArgumentException.class)
+    public void testComposeRepeatEffectWithRepeatingEffectIsInvalid() {
+        VibrationEffect.startComposition()
+                .repeatEffectIndefinitely(
+                        VibrationEffect.createWaveform(new long[] { 10 }, new int[] { 255 }, 0))
+                .compose();
+    }
+
+    @Test(expected = UnreachableAfterRepeatingIndefinitelyException.class)
+    public void testComposeAddOffDurationAfterRepeatingEffectIsInvalid() {
+        VibrationEffect.startComposition()
+                .repeatEffectIndefinitely(TEST_ONE_SHOT)
+                .addOffDuration(Duration.ofMillis(20));
+    }
+
+    @Test(expected = UnreachableAfterRepeatingIndefinitelyException.class)
+    public void testComposeAddRepeatingEffectAfterRepeatingEffectIsInvalid() {
+        VibrationEffect.startComposition()
+                .repeatEffectIndefinitely(TEST_ONE_SHOT)
+                .repeatEffectIndefinitely(TEST_ONE_SHOT);
+    }
+
+    @Test(expected = UnreachableAfterRepeatingIndefinitelyException.class)
+    public void testComposeAddEffectAfterRepeatingEffectIsInvalid() {
+        VibrationEffect.startComposition()
+                .addEffect(
+                        VibrationEffect.createWaveform(new long[] { 10 }, new int[] { 255 }, 0))
+                .addEffect(TEST_PREBAKED);
+    }
+
+    @Test(expected = UnreachableAfterRepeatingIndefinitelyException.class)
+    public void testComposeAddPrimitiveAfterRepeatingEffectIsInvalid() {
+        VibrationEffect.startComposition()
+                .repeatEffectIndefinitely(TEST_ONE_SHOT)
+                .addPrimitive(VibrationEffect.Composition.PRIMITIVE_TICK);
+    }
+
     @Test
     public void testStartWaveform() {
         VibrationEffect.WaveformBuilder first = VibrationEffect.startWaveform();
         VibrationEffect.WaveformBuilder other = VibrationEffect.startWaveform();
         assertNotEquals(first, other);
 
-        VibrationEffect effect = VibrationEffect.startWaveform()
-                .addStep(/* amplitude= */ 0.5f, /* duration= */ 10)
-                .addStep(/* amplitude= */ 0.8f, /* frequency= */ -1f, /* duration= */ 20)
-                .addRamp(/* amplitude= */ 1f, /* duration= */ 100)
-                .addRamp(/* amplitude= */ 0.2f, /* frequency= */ 1f, /* duration= */ 200)
+        VibrationEffect effect = VibrationEffect.startWaveform(targetAmplitude(0.5f))
+                .addSustain(Duration.ofMillis(10))
+                .addTransition(Duration.ZERO, targetAmplitude(0.8f), targetFrequency(100f))
+                .addSustain(Duration.ofMillis(20))
+                .addTransition(Duration.ofMillis(100), targetAmplitude(1))
+                .addTransition(Duration.ofMillis(200), targetAmplitude(0.2f), targetFrequency(200f))
                 .build();
 
         assertArrayEquals(new long[]{10, 20, 100, 200}, getTimings(effect));
@@ -559,54 +638,72 @@
 
         assertStepSegment(effect, 1);
         assertAmplitude(0.8f, effect, 1);
-        assertFrequency(-1f, effect, 1);
+        assertFrequency(100f, effect, 1);
 
         assertRampSegment(effect, 2);
         assertAmplitude(1f, effect, 2);
-        assertFrequency(-1f, effect, 2);
+        assertFrequency(100f, effect, 2);
 
         assertRampSegment(effect, 3);
         assertAmplitude(0.2f, effect, 3);
-        assertFrequency(1f, effect, 3);
+        assertFrequency(200f, effect, 3);
     }
 
     @Test
     public void testStartWaveformEquals() {
         VibrationEffect other = VibrationEffect.startWaveform()
-                .addStep(/* amplitude= */ 0.5f, /* duration= */ 10)
-                .addStep(/* amplitude= */ 0.8f, /* frequency= */ -1f, /* duration= */ 20)
-                .addRamp(/* amplitude= */ 1f, /* duration= */ 100)
-                .addRamp(/* amplitude= */ 0.2f, /* frequency= */ 1f, /* duration= */ 200)
+                .addTransition(Duration.ZERO, targetAmplitude(0.5f))
+                .addSustain(Duration.ofMillis(10))
+                .addTransition(Duration.ZERO, targetAmplitude(0.8f), targetFrequency(100f))
+                .addSustain(Duration.ofMillis(10))
+                .addTransition(Duration.ofMillis(100), targetAmplitude(1))
+                .addTransition(Duration.ofMillis(200),
+                        targetAmplitude(0.2f), targetFrequency(200f))
                 .build();
+
         assertEquals(TEST_WAVEFORM_BUILT, other);
         assertEquals(TEST_WAVEFORM_BUILT.hashCode(), other.hashCode());
 
-        VibrationEffect.WaveformBuilder builder = VibrationEffect.startWaveform()
-                .addStep(TEST_FLOAT_AMPLITUDE, (int) TEST_TIMING);
+        VibrationEffect.WaveformBuilder builder =
+                VibrationEffect.startWaveform(targetAmplitude(TEST_FLOAT_AMPLITUDE))
+                .addSustain(Duration.ofMillis(TEST_TIMING));
         assertEquals(TEST_ONE_SHOT, builder.build());
         assertEquals(TEST_ONE_SHOT.hashCode(), builder.build().hashCode());
 
         builder = VibrationEffect.startWaveform();
         for (int i = 0; i < TEST_TIMINGS.length; i++) {
-            builder.addStep(i % 2 == 0 ? 0 : VibrationEffect.DEFAULT_AMPLITUDE,
-                    (int) TEST_TIMINGS[i]);
-        }
-        assertEquals(TEST_WAVEFORM_NO_AMPLITUDES, builder.build());
-        assertEquals(TEST_WAVEFORM_NO_AMPLITUDES.hashCode(), builder.build().hashCode());
-
-        builder = VibrationEffect.startWaveform();
-        for (int i = 0; i < TEST_TIMINGS.length; i++) {
-            builder.addStep(TEST_FLOAT_AMPLITUDES[i], (int) TEST_TIMINGS[i]);
+            builder.addTransition(Duration.ZERO, targetAmplitude(TEST_FLOAT_AMPLITUDES[i]));
+            builder.addSustain(Duration.ofMillis(TEST_TIMINGS[i]));
         }
         assertEquals(TEST_WAVEFORM, builder.build());
         assertEquals(TEST_WAVEFORM.hashCode(), builder.build().hashCode());
     }
 
     @Test
+    public void testStartWaveformEqualsSustainCreatedViaTransitions() {
+        VibrationEffect effect = VibrationEffect.startWaveform()
+                .addTransition(Duration.ZERO, targetAmplitude(0.5f))
+                .addSustain(Duration.ofMillis(10))
+                .build();
+        VibrationEffect other = VibrationEffect.startWaveform(targetAmplitude(0.5f))
+                .addSustain(Duration.ofMillis(10))
+                .build();
+        assertEquals(effect, other);
+
+        effect = VibrationEffect.startWaveform(targetAmplitude(1f), targetFrequency(100f))
+                .addTransition(Duration.ofMillis(10), targetAmplitude(1f), targetFrequency(100f))
+                .build();
+        other = VibrationEffect.startWaveform(targetAmplitude(1f), targetFrequency(100f))
+                .addSustain(Duration.ofMillis(10))
+                .build();
+        assertEquals(effect, other);
+    }
+
+    @Test
     public void testStartWaveformNotEqualsDifferentNumberOfSteps() {
-        VibrationEffect other = VibrationEffect.startWaveform()
-                .addStep(/* amplitude= */ 0.5f, /* duration= */ 10)
-                .addRamp(/* amplitude= */ 1f, /* duration= */ 100)
+        VibrationEffect other = VibrationEffect.startWaveform(targetAmplitude(0.5f))
+                .addSustain(Duration.ofMillis(10))
+                .addTransition(Duration.ofMillis(100), targetAmplitude(1))
                 .build();
         assertNotEquals(TEST_WAVEFORM_BUILT, other);
     }
@@ -614,32 +711,21 @@
     @Test
     public void testStartWaveformNotEqualsDifferentTypesOfStep() {
         VibrationEffect first = VibrationEffect.startWaveform()
-                .addStep(/* amplitude= */ 0.5f, /* duration= */ 10)
+                .addTransition(Duration.ofMillis(10), targetAmplitude(0.5f))
                 .build();
-        VibrationEffect second = VibrationEffect.startWaveform()
-                .addRamp(/* amplitude= */ 0.5f, /* duration= */ 10)
+        VibrationEffect second = VibrationEffect.startWaveform(targetAmplitude(0.5f))
+                .addSustain(Duration.ofMillis(10))
                 .build();
         assertNotEquals(first, second);
     }
 
     @Test
-    public void testStartWaveformNotEqualsDifferentRepeatIndex() {
-        VibrationEffect first = VibrationEffect.startWaveform()
-                .addStep(/* amplitude= */ 0.5f, /* duration= */ 10)
-                .build(0);
-        VibrationEffect second = VibrationEffect.startWaveform()
-                .addStep(/* amplitude= */ 1f, /* duration= */ 10)
-                .build(-1);
-        assertNotEquals(first, second);
-    }
-
-    @Test
     public void testStartWaveformNotEqualsDifferentAmplitudes() {
         VibrationEffect first = VibrationEffect.startWaveform()
-                .addStep(/* amplitude= */ 0.5f, /* duration= */ 10)
+                .addTransition(Duration.ofMillis(10), targetAmplitude(0.5f))
                 .build();
         VibrationEffect second = VibrationEffect.startWaveform()
-                .addStep(/* amplitude= */ 1f, /* duration= */ 10)
+                .addTransition(Duration.ofMillis(10), targetAmplitude(0.8f))
                 .build();
         assertNotEquals(first, second);
     }
@@ -647,10 +733,10 @@
     @Test
     public void testStartWaveformNotEqualsDifferentFrequency() {
         VibrationEffect first = VibrationEffect.startWaveform()
-                .addStep(/* amplitude= */ 0.5f, /* frequency= */ 0.5f, /* duration= */ 10)
+                .addTransition(Duration.ofMillis(10), targetAmplitude(0.5f), targetFrequency(100f))
                 .build();
         VibrationEffect second = VibrationEffect.startWaveform()
-                .addStep(/* amplitude= */ 0.5f, /* frequency= */ -1f, /* duration= */ 10)
+                .addTransition(Duration.ofMillis(10), targetAmplitude(0.5f), targetFrequency(50f))
                 .build();
         assertNotEquals(first, second);
     }
@@ -658,10 +744,10 @@
     @Test
     public void testStartWaveformNotEqualsDifferentDuration() {
         VibrationEffect first = VibrationEffect.startWaveform()
-                .addRamp(/* amplitude= */ 0.5f, /* duration= */ 1)
+                .addTransition(Duration.ofMillis(10), targetAmplitude(0.5f), targetFrequency(50f))
                 .build();
         VibrationEffect second = VibrationEffect.startWaveform()
-                .addRamp(/* amplitude= */ 0.5f, /* duration= */ 10)
+                .addTransition(Duration.ofMillis(100), targetAmplitude(0.5f), targetFrequency(50f))
                 .build();
         assertNotEquals(first, second);
     }
@@ -671,23 +757,29 @@
         VibrationEffect.startWaveform().build();
     }
 
-    @Test
-    public void testStartWaveformFailsRepeatIndexOutOfBounds() {
-        assertThrows(IllegalArgumentException.class,
-                () -> VibrationEffect.startWaveform()
-                        .addStep(/* amplitude= */1, /* duration= */ 20)
-                        .build(-2));
+    @Test(expected = IllegalArgumentException.class)
+    public void testStartWaveformAddZeroDurationSustainIsInvalid() {
+        VibrationEffect.startWaveform().addSustain(Duration.ofNanos(1));
+    }
 
-        assertThrows(IllegalArgumentException.class,
-                () -> VibrationEffect.startWaveform()
-                        .addStep(/* amplitude= */1, /* duration= */ 20)
-                        .build(1));
+    @Test(expected = IllegalArgumentException.class)
+    public void testStartWaveformTransitionWithSameParameterTwiceIsInvalid() {
+        VibrationEffect.startWaveform().addTransition(Duration.ofSeconds(1),
+                targetAmplitude(0.8f), targetAmplitude(1f));
+    }
+
+    @Test
+    public void testStartWaveformZeroAmplitudeSustainIsSameAsOffPeriodOnlyComposition() {
+        assertEquals(
+                VibrationEffect.startWaveform().addSustain(Duration.ofMillis(1_000)).build(),
+                VibrationEffect.startComposition().addOffDuration(Duration.ofSeconds(1)).compose());
     }
 
     @Test
     public void testToString() {
         TEST_ONE_SHOT.toString();
         TEST_WAVEFORM.toString();
+        TEST_WAVEFORM_BUILT.toString();
         TEST_PREBAKED.toString();
         TEST_COMPOSED.toString();
     }
@@ -735,11 +827,12 @@
         assertTrue(index < composed.getSegments().size());
         VibrationEffectSegment segment = composed.getSegments().get(index);
         if (segment instanceof StepSegment) {
-            assertEquals(expected, ((StepSegment) composed.getSegments().get(index)).getFrequency(),
+            assertEquals(expected,
+                    ((StepSegment) composed.getSegments().get(index)).getFrequencyHz(),
                     TEST_TOLERANCE);
         } else if (segment instanceof RampSegment) {
             assertEquals(expected,
-                    ((RampSegment) composed.getSegments().get(index)).getEndFrequency(),
+                    ((RampSegment) composed.getSegments().get(index)).getEndFrequencyHz(),
                     TEST_TOLERANCE);
         } else {
             fail("Expected a step or ramp segment at index " + index + " of " + effect);
diff --git a/tests/tests/os/src/android/os/cts/VibratorManagerTest.java b/tests/tests/os/src/android/os/cts/VibratorManagerTest.java
index 398938bb..75275d6 100644
--- a/tests/tests/os/src/android/os/cts/VibratorManagerTest.java
+++ b/tests/tests/os/src/android/os/cts/VibratorManagerTest.java
@@ -16,14 +16,17 @@
 
 package android.os.cts;
 
+import static android.os.VibrationEffect.VibrationParameter.targetAmplitude;
+import static android.os.VibrationEffect.VibrationParameter.targetFrequency;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 
@@ -34,6 +37,7 @@
 import android.os.Vibrator;
 import android.os.Vibrator.OnVibratorStateChangedListener;
 import android.os.VibratorManager;
+import android.os.vibrator.VibratorFrequencyProfile;
 import android.util.SparseArray;
 
 import androidx.test.filters.LargeTest;
@@ -51,6 +55,7 @@
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
+import java.time.Duration;
 import java.util.Arrays;
 
 @RunWith(AndroidJUnit4.class)
@@ -68,15 +73,26 @@
     @Rule
     public final MockitoRule mMockitoRule = MockitoJUnit.rule();
 
-    private static final long CALLBACK_TIMEOUT_MILLIS = 5000;
+    private static final float TEST_TOLERANCE = 1e-5f;
+
+    private static final float MINIMUM_ACCEPTED_MEASUREMENT_INTERVAL_FREQUENCY = 1f;
+    private static final float MINIMUM_ACCEPTED_FREQUENCY = 1f;
+    private static final float MAXIMUM_ACCEPTED_FREQUENCY = 1_000f;
+
+    private static final long CALLBACK_TIMEOUT_MILLIS = 5_000;
     private static final VibrationAttributes VIBRATION_ATTRIBUTES =
             new VibrationAttributes.Builder()
                     .setUsage(VibrationAttributes.USAGE_TOUCH)
                     .build();
 
-    private VibratorManager mVibratorManager;
+    /**
+     * These listeners are used for test helper methods like asserting it starts/stops vibrating.
+     * It's not strongly required that the interactions with these mocks are validated by all tests.
+     */
     private final SparseArray<OnVibratorStateChangedListener> mStateListeners = new SparseArray<>();
 
+    private VibratorManager mVibratorManager;
+
     @Before
     public void setUp() {
         mVibratorManager =
@@ -87,13 +103,34 @@
             OnVibratorStateChangedListener listener = mock(OnVibratorStateChangedListener.class);
             mVibratorManager.getVibrator(vibratorId).addVibratorStateListener(listener);
             mStateListeners.put(vibratorId, listener);
-            reset(listener);
+            // Adding a listener to the Vibrator should trigger the callback once with the current
+            // vibrator state, so reset mocks to clear it for tests.
+            assertVibratorState(false);
+            clearInvocations(listener);
         }
     }
 
     @After
     public void cleanUp() {
+        // Clearing invocations so we can use these listeners to wait for the vibrator to
+        // asynchronously cancel the ongoing vibration, if any was left pending by a test.
+        for (int i = 0; i < mStateListeners.size(); i++) {
+            clearInvocations(mStateListeners.valueAt(i));
+        }
         mVibratorManager.cancel();
+
+        for (int i = 0; i < mStateListeners.size(); i++) {
+            int vibratorId = mStateListeners.keyAt(i);
+
+            // Wait for cancel to take effect, if device is still vibrating.
+            if (mVibratorManager.getVibrator(vibratorId).isVibrating()) {
+                assertStopsVibrating(vibratorId);
+            }
+
+            // Remove all listeners added by the tests.
+            mVibratorManager.getVibrator(vibratorId).removeVibratorStateListener(
+                    mStateListeners.valueAt(i));
+        }
     }
 
     @Test
@@ -108,20 +145,26 @@
 
     @LargeTest
     @Test
-    public void testVibrateOneShot() {
+    public void testVibrateOneShotStartsAndFinishesVibration() {
         VibrationEffect oneShot =
                 VibrationEffect.createOneShot(300, VibrationEffect.DEFAULT_AMPLITUDE);
         mVibratorManager.vibrate(CombinedVibration.createParallel(oneShot));
         assertStartsThenStopsVibrating(300);
+    }
 
-        oneShot = VibrationEffect.createOneShot(500, 255 /* Max amplitude */);
+    @Test
+    public void testVibrateOneShotMaxAmplitude() {
+        VibrationEffect oneShot = VibrationEffect.createOneShot(500, 255 /* Max amplitude */);
         mVibratorManager.vibrate(CombinedVibration.createParallel(oneShot));
         assertStartsVibrating();
 
         mVibratorManager.cancel();
         assertStopsVibrating();
+    }
 
-        oneShot = VibrationEffect.createOneShot(100, 1 /* Min amplitude */);
+    @Test
+    public void testVibrateOneShotMinAmplitude() {
+        VibrationEffect oneShot = VibrationEffect.createOneShot(100, 1 /* Min amplitude */);
         mVibratorManager.vibrate(CombinedVibration.createParallel(oneShot),
                 VIBRATION_ATTRIBUTES);
         assertStartsVibrating();
@@ -129,21 +172,78 @@
 
     @LargeTest
     @Test
-    public void testVibrateWaveform() {
+    public void testVibrateWaveformStartsAndFinishesVibration() {
         final long[] timings = new long[]{100, 200, 300, 400, 500};
         final int[] amplitudes = new int[]{64, 128, 255, 128, 64};
         VibrationEffect waveform = VibrationEffect.createWaveform(timings, amplitudes, -1);
         mVibratorManager.vibrate(CombinedVibration.createParallel(waveform));
         assertStartsThenStopsVibrating(1500);
+    }
 
-        waveform = VibrationEffect.createWaveform(timings, amplitudes, 0);
+    @LargeTest
+    @Test
+    public void testVibrateWaveformRepeats() {
+        final long[] timings = new long[]{100, 200, 300, 400, 500};
+        final int[] amplitudes = new int[]{64, 128, 255, 128, 64};
+        VibrationEffect waveform = VibrationEffect.createWaveform(timings, amplitudes, 0);
         mVibratorManager.vibrate(CombinedVibration.createParallel(waveform));
         assertStartsVibrating();
 
+        SystemClock.sleep(2000);
+        int[] vibratorIds = mVibratorManager.getVibratorIds();
+        for (int vibratorId : vibratorIds) {
+            assertTrue(mVibratorManager.getVibrator(vibratorId).isVibrating());
+        }
+
         mVibratorManager.cancel();
         assertStopsVibrating();
     }
 
+
+    @LargeTest
+    @Test
+    public void testVibrateWaveformWithFrequencyStartsAndFinishesVibration() {
+        int[] vibratorIds = mVibratorManager.getVibratorIds();
+        for (int vibratorId : vibratorIds) {
+            Vibrator vibrator = mVibratorManager.getVibrator(vibratorId);
+            if (!vibrator.hasFrequencyControl()) {
+                continue;
+            }
+            VibratorFrequencyProfile frequencyProfile = vibrator.getFrequencyProfile();
+
+            float minFrequency = frequencyProfile.getMinFrequency();
+            float maxFrequency = frequencyProfile.getMaxFrequency();
+            float resonantFrequency = vibrator.getResonantFrequency();
+            float sustainFrequency = Float.isNaN(resonantFrequency)
+                    ? (maxFrequency + minFrequency) / 2
+                    : resonantFrequency;
+
+            // Then ramp to zero amplitude at fixed frequency.
+            VibrationEffect waveform =
+                    VibrationEffect.startWaveform(targetAmplitude(0), targetFrequency(minFrequency))
+                            // Ramp from min to max frequency and from zero to max amplitude.
+                            .addTransition(Duration.ofMillis(10),
+                                    targetAmplitude(1), targetFrequency(maxFrequency))
+                            // Ramp back to min frequency and zero amplitude.
+                            .addTransition(Duration.ofMillis(10),
+                                    targetAmplitude(0), targetFrequency(minFrequency))
+                            // Then sustain at a fixed frequency and half amplitude.
+                            .addTransition(Duration.ZERO,
+                                    targetAmplitude(0.5f), targetFrequency(sustainFrequency))
+                            .addSustain(Duration.ofMillis(20))
+                            // Ramp from min to max frequency and at max amplitude.
+                            .addTransition(Duration.ZERO,
+                                    targetAmplitude(1), targetFrequency(minFrequency))
+                            .addTransition(Duration.ofMillis(10), targetFrequency(maxFrequency))
+                            // Ramp from max to min amplitude at max frequency.
+                            .addTransition(Duration.ofMillis(10), targetAmplitude(0))
+                            .build();
+            vibrator.vibrate(waveform);
+            assertStartsVibrating(vibratorId);
+            assertStopsVibrating();
+        }
+    }
+
     @Test
     public void testVibrateSingleVibrator() {
         int[] vibratorIds = mVibratorManager.getVibratorIds();
@@ -197,17 +297,81 @@
     }
 
     @Test
-    public void testVibrator() {
+    public void testSingleVibratorIsPresent() {
         for (int vibratorId : mVibratorManager.getVibratorIds()) {
             Vibrator vibrator = mVibratorManager.getVibrator(vibratorId);
             assertNotNull(vibrator);
             assertEquals(vibratorId, vibrator.getId());
             assertTrue(vibrator.hasVibrator());
+        }
+    }
 
-            // Just check these methods will not crash.
-            // We don't really have a way to test if the device supports each effect or not.
+    @Test
+    public void testSingleVibratorAmplitudeAndFrequencyControls() {
+        for (int vibratorId : mVibratorManager.getVibratorIds()) {
+            Vibrator vibrator = mVibratorManager.getVibrator(vibratorId);
+            assertNotNull(vibrator);
+
+            // Just check this method will not crash.
             vibrator.hasAmplitudeControl();
 
+            // Single vibrators should return the frequency profile when it has frequency control.
+            assertEquals(vibrator.hasFrequencyControl(),
+                    vibrator.getFrequencyProfile() != null);
+        }
+    }
+
+    @Test
+    public void testSingleVibratorFrequencyProfile() {
+        for (int vibratorId : mVibratorManager.getVibratorIds()) {
+            Vibrator vibrator = mVibratorManager.getVibrator(vibratorId);
+            VibratorFrequencyProfile frequencyProfile = vibrator.getFrequencyProfile();
+            if (frequencyProfile == null) {
+                continue;
+            }
+
+            float measurementIntervalHz = frequencyProfile.getMaxAmplitudeMeasurementInterval();
+            assertTrue(measurementIntervalHz >= MINIMUM_ACCEPTED_MEASUREMENT_INTERVAL_FREQUENCY);
+
+            float resonantFrequency = vibrator.getResonantFrequency();
+            float minFrequencyHz = frequencyProfile.getMinFrequency();
+            float maxFrequencyHz = frequencyProfile.getMaxFrequency();
+
+            assertTrue(minFrequencyHz >= MINIMUM_ACCEPTED_FREQUENCY);
+            assertTrue(maxFrequencyHz > minFrequencyHz);
+            assertTrue(maxFrequencyHz <= MAXIMUM_ACCEPTED_FREQUENCY);
+
+            if (!Float.isNaN(resonantFrequency)) {
+                // If the device has a resonant frequency, then it should be within the supported
+                // frequency range described by the profile.
+                assertTrue(resonantFrequency >= minFrequencyHz);
+                assertTrue(resonantFrequency <= maxFrequencyHz);
+            }
+
+            float[] measurements = frequencyProfile.getMaxAmplitudeMeasurements();
+
+            // There should be at least 3 points for a valid profile.
+            assertTrue(measurements.length > 2);
+            assertEquals(maxFrequencyHz,
+                    minFrequencyHz + ((measurements.length - 1) * measurementIntervalHz),
+                    TEST_TOLERANCE);
+
+            boolean hasPositiveMeasurement = false;
+            for (float measurement : measurements) {
+                assertTrue(measurement >= 0);
+                assertTrue(measurement <= 1);
+                hasPositiveMeasurement |= measurement > 0;
+            }
+            assertTrue(hasPositiveMeasurement);
+        }
+    }
+
+    @Test
+    public void testSingleVibratorEffectAndPrimitiveSupport() {
+        for (int vibratorId : mVibratorManager.getVibratorIds()) {
+            Vibrator vibrator = mVibratorManager.getVibrator(vibratorId);
+            assertNotNull(vibrator);
+
             // Just check these methods return valid support arrays.
             // We don't really have a way to test if the device supports each effect or not.
             assertEquals(2, vibrator.areEffectsSupported(
@@ -215,6 +379,14 @@
             assertEquals(2, vibrator.arePrimitivesSupported(
                     VibrationEffect.Composition.PRIMITIVE_CLICK,
                     VibrationEffect.Composition.PRIMITIVE_TICK).length);
+        }
+    }
+
+    @Test
+    public void testSingleVibratorVibrateAndCancel() {
+        for (int vibratorId : mVibratorManager.getVibratorIds()) {
+            Vibrator vibrator = mVibratorManager.getVibrator(vibratorId);
+            assertNotNull(vibrator);
 
             vibrator.vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE));
             assertStartsVibrating(vibratorId);
@@ -227,8 +399,7 @@
 
     private void assertStartsThenStopsVibrating(long duration) {
         for (int i = 0; i < mStateListeners.size(); i++) {
-            verify(mStateListeners.valueAt(i), timeout(CALLBACK_TIMEOUT_MILLIS).atLeastOnce())
-                    .onVibratorStateChanged(true);
+            assertVibratorState(mStateListeners.keyAt(i), true);
         }
         SystemClock.sleep(duration);
         assertVibratorState(false);
@@ -260,6 +431,5 @@
         OnVibratorStateChangedListener listener = mStateListeners.get(vibratorId);
         verify(listener, timeout(CALLBACK_TIMEOUT_MILLIS).atLeastOnce())
                 .onVibratorStateChanged(eq(expected));
-        reset(listener);
     }
 }
diff --git a/tests/tests/os/src/android/os/cts/VibratorTest.java b/tests/tests/os/src/android/os/cts/VibratorTest.java
index cf2460c..7df216c 100644
--- a/tests/tests/os/src/android/os/cts/VibratorTest.java
+++ b/tests/tests/os/src/android/os/cts/VibratorTest.java
@@ -16,23 +16,30 @@
 
 package android.os.cts;
 
+import static android.os.VibrationEffect.VibrationParameter.targetAmplitude;
+import static android.os.VibrationEffect.VibrationParameter.targetFrequency;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.junit.Assume.assumeNotNull;
+import static org.junit.Assume.assumeTrue;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.after;
+import static org.mockito.Mockito.clearInvocations;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.timeout;
 import static org.mockito.Mockito.verify;
 
 import android.media.AudioAttributes;
 import android.os.SystemClock;
+import android.os.VibrationAttributes;
 import android.os.VibrationEffect;
 import android.os.Vibrator;
 import android.os.Vibrator.OnVibratorStateChangedListener;
+import android.os.vibrator.VibratorFrequencyProfile;
 
 import androidx.test.filters.LargeTest;
 import androidx.test.platform.app.InstrumentationRegistry;
@@ -50,6 +57,9 @@
 import org.mockito.junit.MockitoJUnit;
 import org.mockito.junit.MockitoRule;
 
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Executors;
 
 @RunWith(AndroidJUnit4.class)
@@ -67,11 +77,21 @@
     @Rule
     public final MockitoRule mMockitoRule = MockitoJUnit.rule();
 
+    private static final float TEST_TOLERANCE = 1e-5f;
+
+    private static final float MINIMUM_ACCEPTED_MEASUREMENT_INTERVAL_FREQUENCY = 1f;
+    private static final float MINIMUM_ACCEPTED_FREQUENCY = 1f;
+    private static final float MAXIMUM_ACCEPTED_FREQUENCY = 1_000f;
+
     private static final AudioAttributes AUDIO_ATTRIBUTES =
             new AudioAttributes.Builder()
                     .setUsage(AudioAttributes.USAGE_MEDIA)
                     .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
                     .build();
+    private static final VibrationAttributes VIBRATION_ATTRIBUTES =
+            new VibrationAttributes.Builder()
+                    .setUsage(VibrationAttributes.USAGE_TOUCH)
+                    .build();
     private static final long CALLBACK_TIMEOUT_MILLIS = 5000;
     private static final int[] PREDEFINED_EFFECTS = new int[]{
             VibrationEffect.EFFECT_CLICK,
@@ -92,23 +112,73 @@
             VibrationEffect.Composition.PRIMITIVE_SPIN,
             VibrationEffect.Composition.PRIMITIVE_THUD,
     };
+    private static final int[] VIBRATION_USAGES = new int[] {
+            VibrationAttributes.USAGE_UNKNOWN,
+            VibrationAttributes.USAGE_ACCESSIBILITY,
+            VibrationAttributes.USAGE_ALARM,
+            VibrationAttributes.USAGE_COMMUNICATION_REQUEST,
+            VibrationAttributes.USAGE_HARDWARE_FEEDBACK,
+            VibrationAttributes.USAGE_MEDIA,
+            VibrationAttributes.USAGE_NOTIFICATION,
+            VibrationAttributes.USAGE_PHYSICAL_EMULATION,
+            VibrationAttributes.USAGE_RINGTONE,
+            VibrationAttributes.USAGE_TOUCH,
+    };
 
-    private Vibrator mVibrator;
+    /**
+     * This listener is used for test helper methods like asserting it starts/stops vibrating.
+     * It's not strongly required that the interactions with this mock are validated by all tests.
+     */
     @Mock
     private OnVibratorStateChangedListener mStateListener;
 
+    private Vibrator mVibrator;
+    /** Keep track of any listener created to be added to the vibrator, for cleanup purposes. */
+    private List<OnVibratorStateChangedListener> mStateListenersCreated = new ArrayList<>();
+
     @Before
     public void setUp() {
         mVibrator = InstrumentationRegistry.getInstrumentation().getContext().getSystemService(
                 Vibrator.class);
 
         mVibrator.addVibratorStateListener(mStateListener);
-        reset(mStateListener);
+        // Adding a listener to the Vibrator should trigger the callback once with the current
+        // vibrator state, so reset mocks to clear it for tests.
+        assertVibratorState(false);
+        clearInvocations(mStateListener);
     }
 
     @After
     public void cleanUp() {
+        // Clearing invocations so we can use this listener to wait for the vibrator to
+        // asynchronously cancel the ongoing vibration, if any was left pending by a test.
+        clearInvocations(mStateListener);
         mVibrator.cancel();
+
+        // Wait for cancel to take effect, if device is still vibrating.
+        if (mVibrator.isVibrating()) {
+            assertStopsVibrating();
+        }
+
+        // Remove all listeners added by the tests.
+        mVibrator.removeVibratorStateListener(mStateListener);
+        for (OnVibratorStateChangedListener listener : mStateListenersCreated) {
+            mVibrator.removeVibratorStateListener(listener);
+        }
+    }
+
+    @Test
+    public void getDefaultVibrationIntensity_returnsValidIntensityForAllUsages() {
+        for (int usage : VIBRATION_USAGES) {
+            int intensity = mVibrator.getDefaultVibrationIntensity(usage);
+            assertTrue("Error for usage " + usage + " with default intensity " + intensity,
+                    (intensity >= Vibrator.VIBRATION_INTENSITY_OFF)
+                            && (intensity <= Vibrator.VIBRATION_INTENSITY_HIGH));
+        }
+
+        assertEquals("Invalid usage expected to have same default as USAGE_UNKNOWN",
+                mVibrator.getDefaultVibrationIntensity(VibrationAttributes.USAGE_UNKNOWN),
+                mVibrator.getDefaultVibrationIntensity(-1));
     }
 
     @Test
@@ -156,34 +226,46 @@
 
     @LargeTest
     @Test
-    public void testVibrateOneShot() {
+    public void testVibrateOneShotStartsAndFinishesVibration() {
         VibrationEffect oneShot =
                 VibrationEffect.createOneShot(300, VibrationEffect.DEFAULT_AMPLITUDE);
         mVibrator.vibrate(oneShot);
         assertStartsThenStopsVibrating(300);
+    }
 
-        oneShot = VibrationEffect.createOneShot(10_000, 255 /* Max amplitude */);
+    @Test
+    public void testVibrateOneShotMaxAmplitude() {
+        VibrationEffect oneShot = VibrationEffect.createOneShot(10_000, 255 /* Max amplitude */);
         mVibrator.vibrate(oneShot);
         assertStartsVibrating();
 
         mVibrator.cancel();
         assertStopsVibrating();
+    }
 
-        oneShot = VibrationEffect.createOneShot(300, 1 /* Min amplitude */);
+    @Test
+    public void testVibrateOneShotMinAmplitude() {
+        VibrationEffect oneShot = VibrationEffect.createOneShot(300, 1 /* Min amplitude */);
         mVibrator.vibrate(oneShot, AUDIO_ATTRIBUTES);
         assertStartsVibrating();
     }
 
     @LargeTest
     @Test
-    public void testVibrateWaveform() {
-        final long[] timings = new long[] {100, 200, 300, 400, 500};
-        final int[] amplitudes = new int[] {64, 128, 255, 128, 64};
+    public void testVibrateWaveformStartsAndFinishesVibration() {
+        final long[] timings = new long[]{100, 200, 300, 400, 500};
+        final int[] amplitudes = new int[]{64, 128, 255, 128, 64};
         VibrationEffect waveform = VibrationEffect.createWaveform(timings, amplitudes, -1);
         mVibrator.vibrate(waveform);
         assertStartsThenStopsVibrating(1500);
+    }
 
-        waveform = VibrationEffect.createWaveform(timings, amplitudes, 0);
+    @LargeTest
+    @Test
+    public void testVibrateWaveformRepeats() {
+        final long[] timings = new long[] {100, 200, 300, 400, 500};
+        final int[] amplitudes = new int[] {64, 128, 255, 128, 64};
+        VibrationEffect waveform = VibrationEffect.createWaveform(timings, amplitudes, 0);
         mVibrator.vibrate(waveform, AUDIO_ATTRIBUTES);
         assertStartsVibrating();
 
@@ -194,6 +276,46 @@
         assertStopsVibrating();
     }
 
+    @LargeTest
+    @Test
+    public void testVibrateWaveformWithFrequencyStartsAndFinishesVibration() {
+        assumeTrue(mVibrator.hasFrequencyControl());
+        VibratorFrequencyProfile frequencyProfile = mVibrator.getFrequencyProfile();
+        assumeNotNull(frequencyProfile);
+
+        float minFrequency = Math.max(1f, frequencyProfile.getMinFrequency());
+        float maxFrequency = frequencyProfile.getMaxFrequency();
+        float resonantFrequency = mVibrator.getResonantFrequency();
+        float sustainFrequency = Float.isNaN(resonantFrequency)
+                ? (maxFrequency - minFrequency) / 2
+                : resonantFrequency;
+
+        // Ramp from min to max frequency and from zero to max amplitude.
+        // Then ramp to a fixed frequency at max amplitude.
+        // Then ramp to zero amplitude at fixed frequency.
+        VibrationEffect waveform =
+                VibrationEffect.startWaveform(targetAmplitude(0), targetFrequency(minFrequency))
+                        // Ramp from min to max frequency and from zero to max amplitude.
+                        .addTransition(Duration.ofMillis(10),
+                                targetAmplitude(1), targetFrequency(maxFrequency))
+                        // Ramp back to min frequency and zero amplitude.
+                        .addTransition(Duration.ofMillis(10),
+                                targetAmplitude(0), targetFrequency(minFrequency))
+                        // Then sustain at a fixed frequency and half amplitude.
+                        .addTransition(Duration.ZERO,
+                                targetAmplitude(0.5f), targetFrequency(sustainFrequency))
+                        .addSustain(Duration.ofMillis(20))
+                        // Ramp from min to max frequency and at max amplitude.
+                        .addTransition(Duration.ZERO,
+                                targetAmplitude(1), targetFrequency(minFrequency))
+                        .addTransition(Duration.ofMillis(10), targetFrequency(maxFrequency))
+                        // Ramp from max to min amplitude at max frequency.
+                        .addTransition(Duration.ofMillis(10), targetAmplitude(0))
+                        .build();
+        mVibrator.vibrate(waveform);
+        assertStartsThenStopsVibrating(50);
+    }
+
     @Test
     public void testVibratePredefined() {
         int[] supported = mVibrator.areEffectsSupported(PREDEFINED_EFFECTS);
@@ -221,6 +343,12 @@
     }
 
     @Test
+    public void testVibrateWithAttributes() {
+        mVibrator.vibrate(VibrationEffect.createOneShot(10, 10), VIBRATION_ATTRIBUTES);
+        assertStartsVibrating();
+    }
+
+    @Test
     public void testGetId() {
         // The system vibrator should not be mapped to any physical vibrator and use a default id.
         assertEquals(-1, mVibrator.getId());
@@ -241,6 +369,13 @@
     }
 
     @Test
+    public void testVibratorHasFrequencyControl() {
+        // Just make sure it doesn't crash when this is called; we don't really have a way to test
+        // if the frequency control works or not.
+        mVibrator.hasFrequencyControl();
+    }
+
+    @Test
     public void testVibratorEffectsAreSupported() {
         // Just make sure it doesn't crash when this is called and that it returns all queries;
         // We don't really have a way to test if the device supports each effect or not.
@@ -289,10 +424,87 @@
     }
 
     @Test
-    public void testVibratorIsVibrating() {
-        if (!mVibrator.hasVibrator()) {
-            return;
+    public void testVibratorResonantFrequency() {
+        // Check that the resonant frequency provided is NaN, or if it's a reasonable value.
+        float resonantFrequency = mVibrator.getResonantFrequency();
+        assertTrue(Float.isNaN(resonantFrequency)
+                || (resonantFrequency > 0 && resonantFrequency < MAXIMUM_ACCEPTED_FREQUENCY));
+    }
+
+    @Test
+    public void testVibratorQFactor() {
+        // Just make sure it doesn't crash when this is called;
+        // We don't really have a way to test if the device provides the Q-factor or not.
+        mVibrator.getQFactor();
+    }
+
+    @Test
+    public void testVibratorVibratorFrequencyProfileFrequencyControl() {
+        assumeNotNull(mVibrator.getFrequencyProfile());
+
+        // If the frequency profile is present then the vibrator must have frequency control.
+        // The other implication is not true if the default vibrator represents multiple vibrators.
+        assertTrue(mVibrator.hasFrequencyControl());
+    }
+
+    @Test
+    public void testVibratorFrequencyProfileMeasurementInterval() {
+        VibratorFrequencyProfile frequencyProfile = mVibrator.getFrequencyProfile();
+        assumeNotNull(frequencyProfile);
+
+        float measurementIntervalHz = frequencyProfile.getMaxAmplitudeMeasurementInterval();
+        assertTrue(measurementIntervalHz >= MINIMUM_ACCEPTED_MEASUREMENT_INTERVAL_FREQUENCY);
+    }
+
+    @Test
+    public void testVibratorFrequencyProfileSupportedFrequencyRange() {
+        VibratorFrequencyProfile frequencyProfile = mVibrator.getFrequencyProfile();
+        assumeNotNull(frequencyProfile);
+
+        float resonantFrequency = mVibrator.getResonantFrequency();
+        float minFrequencyHz = frequencyProfile.getMinFrequency();
+        float maxFrequencyHz = frequencyProfile.getMaxFrequency();
+
+        assertTrue(minFrequencyHz >= MINIMUM_ACCEPTED_FREQUENCY);
+        assertTrue(maxFrequencyHz > minFrequencyHz);
+        assertTrue(maxFrequencyHz <= MAXIMUM_ACCEPTED_FREQUENCY);
+
+        if (!Float.isNaN(resonantFrequency)) {
+            // If the device has a resonant frequency, then it should be within the supported
+            // frequency range described by the profile.
+            assertTrue(resonantFrequency >= minFrequencyHz);
+            assertTrue(resonantFrequency <= maxFrequencyHz);
         }
+    }
+
+    @Test
+    public void testVibratorFrequencyProfileOutputAccelerationMeasurements() {
+        VibratorFrequencyProfile frequencyProfile = mVibrator.getFrequencyProfile();
+        assumeNotNull(frequencyProfile);
+
+        float minFrequencyHz = frequencyProfile.getMinFrequency();
+        float maxFrequencyHz = frequencyProfile.getMaxFrequency();
+        float measurementIntervalHz = frequencyProfile.getMaxAmplitudeMeasurementInterval();
+        float[] measurements = frequencyProfile.getMaxAmplitudeMeasurements();
+
+        // There should be at least 3 points for a valid profile: min, center and max frequencies.
+        assertTrue(measurements.length > 2);
+        assertEquals(maxFrequencyHz,
+                minFrequencyHz + ((measurements.length - 1) * measurementIntervalHz),
+                TEST_TOLERANCE);
+
+        boolean hasPositiveMeasurement = false;
+        for (float measurement : measurements) {
+            assertTrue(measurement >= 0);
+            assertTrue(measurement <= 1);
+            hasPositiveMeasurement |= measurement > 0;
+        }
+        assertTrue(hasPositiveMeasurement);
+    }
+
+    @Test
+    public void testVibratorIsVibrating() {
+        assumeTrue(mVibrator.hasVibrator());
 
         assertFalse(mVibrator.isVibrating());
 
@@ -308,9 +520,7 @@
     @LargeTest
     @Test
     public void testVibratorVibratesNoLongerThanDuration() {
-        if (!mVibrator.hasVibrator()) {
-            return;
-        }
+        assumeTrue(mVibrator.hasVibrator());
 
         mVibrator.vibrate(1000);
         assertStartsVibrating();
@@ -322,12 +532,10 @@
     @LargeTest
     @Test
     public void testVibratorStateCallback() {
-        if (!mVibrator.hasVibrator()) {
-            return;
-        }
+        assumeTrue(mVibrator.hasVibrator());
 
-        OnVibratorStateChangedListener listener1 = mock(OnVibratorStateChangedListener.class);
-        OnVibratorStateChangedListener listener2 = mock(OnVibratorStateChangedListener.class);
+        OnVibratorStateChangedListener listener1 = newMockStateListener();
+        OnVibratorStateChangedListener listener2 = newMockStateListener();
         // Add listener1 on executor
         mVibrator.addVibratorStateListener(Executors.newSingleThreadExecutor(), listener1);
         // Add listener2 on main thread.
@@ -335,33 +543,52 @@
         verify(listener1, timeout(CALLBACK_TIMEOUT_MILLIS).times(1)).onVibratorStateChanged(false);
         verify(listener2, timeout(CALLBACK_TIMEOUT_MILLIS).times(1)).onVibratorStateChanged(false);
 
-        mVibrator.vibrate(1000);
+        mVibrator.vibrate(10);
+        assertStartsVibrating();
 
         verify(listener1, timeout(CALLBACK_TIMEOUT_MILLIS).times(1)).onVibratorStateChanged(true);
         verify(listener2, timeout(CALLBACK_TIMEOUT_MILLIS).times(1)).onVibratorStateChanged(true);
+        // The state changes back to false after vibration ends.
+        verify(listener1, timeout(CALLBACK_TIMEOUT_MILLIS).times(2)).onVibratorStateChanged(false);
+        verify(listener2, timeout(CALLBACK_TIMEOUT_MILLIS).times(2)).onVibratorStateChanged(false);
+    }
 
-        mVibrator.cancel();
-        assertStopsVibrating();
+    @LargeTest
+    @Test
+    public void testVibratorStateCallbackRemoval() {
+        assumeTrue(mVibrator.hasVibrator());
+
+        OnVibratorStateChangedListener listener1 = newMockStateListener();
+        OnVibratorStateChangedListener listener2 = newMockStateListener();
+        // Add listener1 on executor
+        mVibrator.addVibratorStateListener(Executors.newSingleThreadExecutor(), listener1);
+        // Add listener2 on main thread.
+        mVibrator.addVibratorStateListener(listener2);
+        verify(listener1, timeout(CALLBACK_TIMEOUT_MILLIS).times(1)).onVibratorStateChanged(false);
+        verify(listener2, timeout(CALLBACK_TIMEOUT_MILLIS).times(1)).onVibratorStateChanged(false);
 
         // Remove listener1 & listener2
         mVibrator.removeVibratorStateListener(listener1);
         mVibrator.removeVibratorStateListener(listener2);
-        reset(listener1);
-        reset(listener2);
 
         mVibrator.vibrate(1000);
         assertStartsVibrating();
 
-        verify(listener1, timeout(CALLBACK_TIMEOUT_MILLIS).times(0))
-                .onVibratorStateChanged(anyBoolean());
-        verify(listener2, timeout(CALLBACK_TIMEOUT_MILLIS).times(0))
-                .onVibratorStateChanged(anyBoolean());
+        // Wait the timeout to assert there was no more interactions with the removed listeners.
+        verify(listener1, after(CALLBACK_TIMEOUT_MILLIS).never()).onVibratorStateChanged(true);
+        // Previous call was blocking, so no need to wait for a timeout here as well.
+        verify(listener2, never()).onVibratorStateChanged(true);
+    }
+
+    private OnVibratorStateChangedListener newMockStateListener() {
+        OnVibratorStateChangedListener listener = mock(OnVibratorStateChangedListener.class);
+        mStateListenersCreated.add(listener);
+        return listener;
     }
 
     private void assertStartsThenStopsVibrating(long duration) {
         if (mVibrator.hasVibrator()) {
-            verify(mStateListener, timeout(CALLBACK_TIMEOUT_MILLIS).atLeastOnce())
-                    .onVibratorStateChanged(true);
+            assertVibratorState(true);
             SystemClock.sleep(duration);
             assertVibratorState(false);
         }
@@ -379,7 +606,6 @@
         if (mVibrator.hasVibrator()) {
             verify(mStateListener, timeout(CALLBACK_TIMEOUT_MILLIS).atLeastOnce())
                     .onVibratorStateChanged(eq(expected));
-            reset(mStateListener);
         }
     }
 }
diff --git a/tests/tests/os/src/android/os/storage/cts/StorageManagerCrossProfileSDCardTest.java b/tests/tests/os/src/android/os/storage/cts/StorageManagerCrossProfileSDCardTest.java
new file mode 100644
index 0000000..f86ed9d
--- /dev/null
+++ b/tests/tests/os/src/android/os/storage/cts/StorageManagerCrossProfileSDCardTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2022 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 android.os.storage.cts;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static java.util.stream.Collectors.joining;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.os.storage.StorageManager;
+import android.os.storage.StorageVolume;
+import android.platform.test.annotations.AppModeFull;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+import java.util.Optional;
+
+
+@RunWith(BedsteadJUnit4.class)
+public class StorageManagerCrossProfileSDCardTest {
+
+    @ClassRule
+    @Rule
+    public static DeviceState sDeviceState = new DeviceState();
+
+    private StorageManager mStorageManager;
+    private Context mContext;
+    private String mVolumeName;
+
+    @Before
+    public void setUp() throws Exception {
+        final Instrumentation inst = InstrumentationRegistry.getInstrumentation();
+        mContext = inst.getContext();
+        mStorageManager = mContext.getSystemService(StorageManager.class);
+        //Create a Virtual SD Card on the main system user
+        mVolumeName = StorageManagerHelper.createSDCardVirtualDisk();
+    }
+
+    @After
+    public void teardown() throws Exception {
+        StorageManagerHelper.removeVirtualDisk();
+    }
+
+
+    @Test
+    @RequireRunOnWorkProfile
+    @AppModeFull(reason = "Instant apps cannot access external storage")
+    public void testGetStorageVolumeSDCardWorkProfile() throws Exception {
+        List<StorageVolume> storageVolumes = mStorageManager.getStorageVolumes();
+        Optional<StorageVolume> sdCardStorageVolume =
+                storageVolumes.stream().filter(sv->sv.getPath().contains(mVolumeName)).findFirst();
+        assertWithMessage("The SdCard storage volume " + mVolumeName
+                + " mounted on the main user is present in "
+                + storageVolumes.stream().map(StorageVolume::getPath).collect(joining("\n")))
+                .that(sdCardStorageVolume.isPresent()).isFalse();
+    }
+}
diff --git a/tests/tests/os/src/android/os/storage/cts/StorageManagerCrossProfileUSBTest.java b/tests/tests/os/src/android/os/storage/cts/StorageManagerCrossProfileUSBTest.java
new file mode 100644
index 0000000..4391105
--- /dev/null
+++ b/tests/tests/os/src/android/os/storage/cts/StorageManagerCrossProfileUSBTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2022 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 android.os.storage.cts;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static java.util.stream.Collectors.joining;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.os.storage.StorageManager;
+import android.os.storage.StorageVolume;
+import android.platform.test.annotations.AppModeFull;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.RequireRunOnWorkProfile;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+import java.util.Optional;
+
+
+@RunWith(BedsteadJUnit4.class)
+public class StorageManagerCrossProfileUSBTest {
+
+    @ClassRule
+    @Rule
+    public static DeviceState sDeviceState = new DeviceState();
+
+    private StorageManager mStorageManager;
+    private Context mContext;
+    private String mVolumeName;
+
+    @Before
+    public void setUp() throws Exception {
+        final Instrumentation inst = InstrumentationRegistry.getInstrumentation();
+        mContext = inst.getContext();
+        mStorageManager = mContext.getSystemService(StorageManager.class);
+        //Create a Virtual USB on the main system user
+        mVolumeName = StorageManagerHelper.createUSBVirtualDisk();
+    }
+
+    @After
+    public void teardown() throws Exception {
+        StorageManagerHelper.removeVirtualDisk();
+    }
+
+
+    @Test
+    @RequireRunOnWorkProfile
+    @AppModeFull(reason = "Instant apps cannot access external storage")
+    public void testGetStorageVolumeUSBWorkProfile() throws Exception {
+        List<StorageVolume> storageVolumes = mStorageManager.getStorageVolumes();
+        Optional<StorageVolume> usbStorageVolume =
+                storageVolumes.stream().filter(sv->sv.getPath().contains(mVolumeName)).findFirst();
+        assertWithMessage("The USB storage volume: " + mVolumeName
+                + " mounted on the main user is not present in "
+                + storageVolumes.stream().map(StorageVolume::getPath).collect(joining("\n")))
+                .that(usbStorageVolume.isPresent()).isTrue();
+    }
+}
diff --git a/tests/tests/os/src/android/os/storage/cts/StorageManagerHelper.java b/tests/tests/os/src/android/os/storage/cts/StorageManagerHelper.java
new file mode 100644
index 0000000..d53a41e
--- /dev/null
+++ b/tests/tests/os/src/android/os/storage/cts/StorageManagerHelper.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2022 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 android.os.storage.cts;
+
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.google.common.collect.Iterables;
+
+import java.io.BufferedReader;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeoutException;
+import java.util.function.Supplier;
+
+final class StorageManagerHelper {
+
+    /**
+     * Creates a virtual disk that simulates SDCard on a device. It is
+     * mounted as a public visible disk.
+     * @return the volume name of the disk just created
+     * @throws Exception, if the volume could not be created
+     */
+    static String createSDCardVirtualDisk() throws Exception {
+        return createDiskAndGetVolumeName(true);
+    }
+    /**
+     * Creates a virtual disk that simulates USB on a device. It is
+     * mounted as a public invisible disk.
+     * @return the volume name of the disk just created
+     * @throws Exception, if the volume could not be created
+     */
+    static String createUSBVirtualDisk() throws Exception {
+        return createDiskAndGetVolumeName(false);
+    }
+
+    /**
+     * Removes the simulated disk
+     */
+    static void removeVirtualDisk() throws Exception {
+        executeShellCommand("sm set-virtual-disk false");
+        //sleep to make sure that it is unmounted
+        Thread.sleep(2000);
+    }
+
+    /**
+     * Create a public volume for testing and only return the one newly created as the volumeName.
+     */
+    public static String createDiskAndGetVolumeName(boolean visible) throws Exception {
+        //remove any existing volume that was mounted before
+        removeVirtualDisk();
+        String existingPublicVolume = getPublicVolumeExcluding(null);
+        executeShellCommand("sm set-force-adoptable " + (visible ? "on" : "off"));
+        executeShellCommand("sm set-virtual-disk true");
+        Thread.sleep(2000);
+        pollForCondition(StorageManagerHelper::partitionDisks,
+                "Could not create public volume in time");
+        return getPublicVolumeExcluding(existingPublicVolume);
+    }
+
+    private static boolean partitionDisks() {
+        try {
+            List<String> diskNames = executeShellCommand("sm list-disks");
+            if (!diskNames.isEmpty()) {
+                executeShellCommand("sm partition " + Iterables.getLast(diskNames) + " public");
+                return true;
+            }
+        } catch (Exception ignored) {
+            //ignored
+        }
+        return false;
+    }
+
+    private static void pollForCondition(Supplier<Boolean> condition, String errorMessage)
+            throws Exception {
+        Thread.sleep(2000);
+        for (int i = 0; i < 20; i++) {
+            if (condition.get()) {
+                return;
+            }
+            Thread.sleep(100);
+        }
+        throw new TimeoutException(errorMessage);
+    }
+
+    private static String getPublicVolumeExcluding(String excludingVolume) throws Exception {
+
+        List<String> volumes = executeShellCommand("sm list-volumes");
+        // list volumes will result in something like
+        // private mounted null
+        // public:7,281 mounted 3080-17E8
+        // emulated;0 mounted null
+        // and we are interested in 3080-17E8
+        for (String volume: volumes) {
+            if (volume.contains("public")
+                    && (excludingVolume == null || !volume.contains(excludingVolume))) {
+                //public:7,281 mounted 3080-17E8
+                String[] splits = volume.split(" ");
+                //Return the last snippet, that is 3080-17E8
+                return splits[splits.length - 1];
+            }
+        }
+        return null;
+    }
+
+    private static List<String> executeShellCommand(String command) throws Exception {
+        final ParcelFileDescriptor pfd = InstrumentationRegistry.getInstrumentation()
+                .getUiAutomation().executeShellCommand(command);
+        BufferedReader br = null;
+        try (InputStream in = new FileInputStream(pfd.getFileDescriptor())) {
+            br = new BufferedReader(new InputStreamReader(in, StandardCharsets.UTF_8));
+            String str = null;
+            List<String> output = new ArrayList<>();
+            while ((str = br.readLine()) != null) {
+                output.add(str);
+            }
+            return output;
+        } finally {
+            if (br != null) {
+                closeQuietly(br);
+            }
+            closeQuietly(pfd);
+        }
+    }
+
+    private static void closeQuietly(AutoCloseable closeable) {
+        if (closeable != null) {
+
+            try {
+                closeable.close();
+            } catch (RuntimeException rethrown) {
+                throw rethrown;
+            } catch (Exception ignored) {
+                Log.w("StorageManagerHelper", ignored.getMessage());
+            }
+        }
+    }
+}
diff --git a/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java b/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java
index 7150d51..e0edade 100644
--- a/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java
+++ b/tests/tests/os/src/android/os/storage/cts/StorageManagerTest.java
@@ -18,10 +18,13 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 import static org.testng.Assert.assertThrows;
 
+import static java.util.stream.Collectors.joining;
+
 import android.app.PendingIntent;
-import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
 import android.os.Environment;
@@ -38,6 +41,7 @@
 import android.os.storage.StorageManager.StorageVolumeCallback;
 import android.os.storage.StorageVolume;
 import android.platform.test.annotations.AppModeFull;
+import android.provider.DeviceConfig;
 import android.system.ErrnoException;
 import android.system.Os;
 import android.system.OsConstants;
@@ -48,6 +52,7 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.FileUtils;
+import com.android.compatibility.common.util.SystemUtil;
 
 import junit.framework.AssertionFailedError;
 
@@ -63,6 +68,7 @@
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
@@ -86,7 +92,7 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mStorageManager = (StorageManager) mContext.getSystemService(Context.STORAGE_SERVICE);
+        mStorageManager = mContext.getSystemService(StorageManager.class);
     }
 
     @AppModeFull(reason = "Instant apps cannot access external storage")
@@ -221,6 +227,7 @@
         final boolean removable = volume.isRemovable();
         final boolean emulated = volume.isEmulated();
         if (emulated) {
+            assertFalse("Should not be externally managed", volume.isExternallyManaged());
             assertFalse("Should not be removable", removable);
             assertNull("Should not have fsUuid", fsUuid);
             assertEquals("Should have uuid_default", StorageManager.UUID_DEFAULT, uuid);
@@ -284,6 +291,7 @@
                 mStorageManager.getStorageVolume(Environment.getStorageDirectory()));
 
         final File root = Environment.getExternalStorageDirectory();
+        Log.d("StorageManagerTest", "root: " + root);
         final StorageVolume primary = mStorageManager.getPrimaryStorageVolume();
         final StorageVolume rootVolume = mStorageManager.getStorageVolume(root);
         assertNotNull("No volume for root (" + root + ")", rootVolume);
@@ -292,9 +300,34 @@
         final File child = new File(root, "child");
         StorageVolume childVolume = mStorageManager.getStorageVolume(child);
         assertNotNull("No volume for child (" + child + ")", childVolume);
+        Log.d("StorageManagerTest", "child: " + childVolume.getPath());
         assertStorageVolumesEquals(primary, childVolume);
     }
 
+    @AppModeFull(reason = "Instant apps cannot access external storage")
+    public void testGetStorageVolumeUSB() throws Exception {
+        String volumeName = StorageManagerHelper.createUSBVirtualDisk();
+        Log.d(TAG, "testGetStorageVolumeUSB#volumeName: " + volumeName);
+        List<StorageVolume> storageVolumes = mStorageManager.getStorageVolumes();
+        Optional<StorageVolume> usbStorageVolume =
+                storageVolumes.stream().filter(sv->sv.getPath().contains(volumeName)).findFirst();
+        assertTrue("The USB storage volume mounted on the main user is not present in "
+                + storageVolumes.stream().map(StorageVolume::getPath)
+                .collect(joining("\n")), usbStorageVolume.isPresent());
+    }
+
+    @AppModeFull(reason = "Instant apps cannot access external storage")
+    public void testGetStorageVolumeSDCard() throws Exception {
+        String volumeName = StorageManagerHelper.createSDCardVirtualDisk();
+        Log.d(TAG, "testGetStorageVolumeSDCard#volumeName: " + volumeName);
+        List<StorageVolume> storageVolumes = mStorageManager.getStorageVolumes();
+        Optional<StorageVolume> sdCardStorageVolume =
+                storageVolumes.stream().filter(sv->sv.getPath().contains(volumeName)).findFirst();
+        assertTrue("The SdCard storage volume mounted on the main user is not present in "
+                        + storageVolumes.stream().map(StorageVolume::getPath)
+                        .collect(joining("\n")), sdCardStorageVolume.isPresent());
+    }
+
     private void assertNoUuid(File file) {
         try {
             final UUID uuid = mStorageManager.getUuidForPath(file);
@@ -806,15 +839,8 @@
         int REQUEST_CODE = 1;
         PendingIntent piActual = null;
 
-        // Without MANAGE_EXTERNAL_STORAGE permission, this call should fail.
-        assertThrows(
-                RuntimeException.class,
-                () -> mStorageManager.getManageSpaceActivityIntent(packageName, REQUEST_CODE));
-
-        // Adopt MANAGE_EXTERNAL_STORAGE permission and then try the API call. We launch
-        // the manageSpaceActivity in a new task.
-        InstrumentationRegistry.getInstrumentation().getUiAutomation().adoptShellPermissionIdentity(
-                android.Manifest.permission.MANAGE_EXTERNAL_STORAGE);
+        // Test should only pass with MANAGE_EXTERNAL_STORAGE permission
+        assertThat(Environment.isExternalStorageManager()).isTrue();
 
         // Invalid packageName should throw an IllegalArgumentException
         String invalidPackageName = "this.is.invalid";
@@ -1010,6 +1036,55 @@
         }
     }
 
+    public void testComputeStorageCacheBytes() throws Exception {
+        File mockFile = mock(File.class);
+
+        final int[] storageThresholdPercentHigh = new int[1];
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            storageThresholdPercentHigh[0] = DeviceConfig.getInt(
+                DeviceConfig.NAMESPACE_STORAGE_NATIVE_BOOT,
+                StorageManager.STORAGE_THRESHOLD_PERCENT_HIGH_KEY, 0);
+        });
+        assertTrue("storageThresholdPercentHigh [" + storageThresholdPercentHigh[0]
+                + "] expected to be greater than equal to 0", storageThresholdPercentHigh[0] >= 0);
+        assertTrue("storageThresholdPercentHigh [" + storageThresholdPercentHigh[0]
+                + "] expected to be lesser than equal to 100",
+                storageThresholdPercentHigh[0] <= 100);
+
+        when(mockFile.getUsableSpace()).thenReturn(10000L);
+        when(mockFile.getTotalSpace()).thenReturn(15000L);
+        final long[] resultHigh = new long[1];
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            resultHigh[0] = mStorageManager.computeStorageCacheBytes(mockFile);
+        });
+        assertTrue("" + resultHigh[0] + " expected to be greater than equal to 0",
+                resultHigh[0] >= 0L);
+        assertTrue("" + resultHigh[0] + " expected to be less than equal to total space",
+                resultHigh[0] <= mockFile.getTotalSpace());
+
+        when(mockFile.getUsableSpace()).thenReturn(10000L);
+        when(mockFile.getTotalSpace()).thenReturn(250000L);
+        final long[] resultLow = new long[1];
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            resultLow[0] = mStorageManager.computeStorageCacheBytes(mockFile);
+        });
+        assertTrue("" + resultLow[0] + " expected to be greater than equal to 0",
+                resultLow[0] >= 0L);
+        assertTrue("" + resultLow[0] + " expected to be less than equal to total space",
+                resultLow[0] <= mockFile.getTotalSpace());
+
+        when(mockFile.getUsableSpace()).thenReturn(10000L);
+        when(mockFile.getTotalSpace()).thenReturn(100000L);
+        final long[] resultModerate = new long[1];
+        SystemUtil.runWithShellPermissionIdentity(() -> {
+            resultModerate[0] = mStorageManager.computeStorageCacheBytes(mockFile);
+        });
+        assertTrue("" + resultModerate[0] + " expected to be greater than equal to 0",
+                resultModerate[0] >= 0L);
+        assertTrue("" + resultModerate[0] + " expected to be less than equal to total space",
+                resultModerate[0] <= mockFile.getTotalSpace());
+    }
+
     public static byte[] readFully(InputStream in) throws IOException {
         // Shamelessly borrowed from libcore.io.Streams
         try {
diff --git a/tests/tests/packageinstaller/TEST_MAPPING b/tests/tests/packageinstaller/TEST_MAPPING
index 0d326d5..a17298a 100644
--- a/tests/tests/packageinstaller/TEST_MAPPING
+++ b/tests/tests/packageinstaller/TEST_MAPPING
@@ -1,4 +1,30 @@
 {
+  "presubmit": [
+    {
+      "name": "CtsAdminPackageInstallerTestCases"
+    },
+    {
+      "name": "CtsPackageInstallTestCases"
+    },
+    {
+      "name": "CtsPackageInstallAppOpDefaultTestCases"
+    },
+    {
+      "name": "CtsPackageInstallAppOpDeniedTestCases"
+    },
+    {
+      "name": "CtsNoPermissionTestCases"
+    },
+    {
+      "name": "CtsNoPermissionTestCases25"
+    },
+    {
+      "name": "CtsPackageInstallerTapjackingTestCases"
+    },
+    {
+      "name": "CtsPackageUninstallTestCases"
+    }
+  ],
   "imports": [
     {
       "path": "cts/tests/tests/packageinstaller/atomicinstall"
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/Android.bp b/tests/tests/packageinstaller/adminpackageinstaller/Android.bp
index 40f85c4..62a44fc 100644
--- a/tests/tests/packageinstaller/adminpackageinstaller/Android.bp
+++ b/tests/tests/packageinstaller/adminpackageinstaller/Android.bp
@@ -25,6 +25,7 @@
         "ub-uiautomator",
         "androidx.test.rules",
         "androidx.legacy_legacy-support-v4",
+        "cts-install-lib",
     ],
     libs: ["android.test.base"],
     sdk_version: "test_current",
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/AndroidTest.xml b/tests/tests/packageinstaller/adminpackageinstaller/AndroidTest.xml
index 5deef30..4ef431c 100644
--- a/tests/tests/packageinstaller/adminpackageinstaller/AndroidTest.xml
+++ b/tests/tests/packageinstaller/adminpackageinstaller/AndroidTest.xml
@@ -29,7 +29,9 @@
 
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="mkdir -p /data/local/tmp/cts/packageinstaller/" />
+        <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.A" />
         <option name="teardown-command" value="rm -rf /data/local/tmp/cts"/>
+        <option name="teardown-command" value="pm uninstall com.android.cts.install.lib.testapp.A" />
     </target_preparer>
 
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/SessionCommitBroadcastTest.java b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/SessionCommitBroadcastTest.java
index 8d8d19e..6ebd026 100644
--- a/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/SessionCommitBroadcastTest.java
+++ b/tests/tests/packageinstaller/adminpackageinstaller/src/android/packageinstaller/admin/cts/SessionCommitBroadcastTest.java
@@ -28,6 +28,11 @@
 import android.os.UserManager;
 import android.text.TextUtils;
 
+import com.android.cts.install.lib.Install;
+import com.android.cts.install.lib.InstallUtils;
+import com.android.cts.install.lib.TestApp;
+import com.android.cts.install.lib.Uninstall;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -54,6 +59,7 @@
     @Override
     protected void tearDown() throws Exception {
         mContext.unregisterReceiver(mReceiver);
+        Uninstall.packages(TestApp.A);
     }
 
     public void testBroadcastNotReceivedForDifferentLauncher() throws Exception {
@@ -91,6 +97,36 @@
         assertEquals(TEST_APP_PKG, info.getAppPackageName());
     }
 
+    public void testBroadcastNotReceivedForUpdateInstall() throws Exception {
+        if (!mHasFeature) {
+            return;
+        }
+
+        try {
+            setLauncher(mThisAppLauncher.flattenToString());
+
+            int sessionId = Install.single(TestApp.A1).commit();
+            assertEquals(1, InstallUtils.getInstalledVersion(TestApp.A));
+            // Check the broadcast is received for a new install and session id matches
+            Intent intent = mReceiver.blockingGetIntent();
+            PackageInstaller.SessionInfo info =
+                    intent.getParcelableExtra(PackageInstaller.EXTRA_SESSION);
+            assertEquals(sessionId, info.getSessionId());
+
+            mContext.unregisterReceiver(mReceiver);
+            mReceiver = new SessionCommitReceiver();
+            Install.single(TestApp.A2).commit();
+            assertEquals(2, InstallUtils.getInstalledVersion(TestApp.A));
+
+            // Check no broadcast is received for an update install
+            intent = mReceiver.blockingGetIntent();
+            assertNull(intent);
+        } finally {
+            // Revert to default launcher
+            setLauncher(mDefaultLauncher.flattenToString());
+        }
+    }
+
     public void testBroadcastReceivedForNewInstall() throws Exception {
         if (!mHasFeature) {
             return;
diff --git a/tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/InstallSourceInfoTest.kt b/tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/InstallSourceInfoTest.kt
index 5396efc..546d514 100644
--- a/tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/InstallSourceInfoTest.kt
+++ b/tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/InstallSourceInfoTest.kt
@@ -57,10 +57,24 @@
     }
 
     @Test
+    fun InstallViaSessionByStore() {
+        installViaSession(PackageInstaller.PACKAGE_SOURCE_STORE)
+    }
+
+    @Test
+    fun InstallViaSessionByLocalFile() {
+        installViaSession(PackageInstaller.PACKAGE_SOURCE_LOCAL_FILE)
+    }
+
+    @Test
     fun InstallViaSession() {
+        installViaSession(null)
+    }
+
+    private fun installViaSession(packageSource: Int?) {
         assumeNotWatch()
 
-        startInstallationViaSession()
+        startInstallationViaSessionWithPackageSource(packageSource)
         clickInstallerUIButton(INSTALL_BUTTON_ID)
 
         // Install should have succeeded
@@ -70,6 +84,12 @@
         assertThat(info.getInstallingPackageName()).isEqualTo(ourPackageName)
         assertThat(info.getInitiatingPackageName()).isEqualTo(ourPackageName)
         assertThat(info.getOriginatingPackageName()).isNull()
+        if (packageSource != null) {
+            assertThat(info.getPackageSource()).isEqualTo(packageSource)
+        } else {
+            assertThat(info.getPackageSource()).isEqualTo(
+                    PackageInstaller.PACKAGE_SOURCE_UNSPECIFIED)
+        }
     }
 
     private fun getPackageInstallerPackageName(): String {
diff --git a/tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/PackageInstallerTestBase.kt b/tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/PackageInstallerTestBase.kt
index 6fc29db..5d71d34 100644
--- a/tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/PackageInstallerTestBase.kt
+++ b/tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/PackageInstallerTestBase.kt
@@ -50,7 +50,6 @@
 import java.util.concurrent.LinkedBlockingQueue
 import java.util.concurrent.TimeUnit
 
-const val TEST_APK_NAME = "CtsEmptyTestApp.apk"
 const val TEST_APK_PACKAGE_NAME = "android.packageinstaller.emptytestapp.cts"
 const val TEST_APK_EXTERNAL_LOCATION = "/data/local/tmp/cts/packageinstaller"
 const val INSTALL_ACTION_CB = "PackageInstallerTestBase.install_cb"
@@ -66,6 +65,10 @@
 const val INSTALL_INSTANT_APP = 0x00000800
 
 open class PackageInstallerTestBase {
+    companion object {
+        const val TEST_APK_NAME = "CtsEmptyTestApp.apk"
+    }
+
     @get:Rule
     val installDialogStarter = ActivityTestRule(FutureResultActivity::class.java)
 
@@ -138,6 +141,19 @@
     }
 
     protected fun startInstallationViaSession(installFlags: Int): CompletableFuture<Int> {
+        return startInstallationViaSession(installFlags, TEST_APK_NAME)
+    }
+
+    protected fun startInstallationViaSessionWithPackageSource(packageSource: Int?):
+            CompletableFuture<Int> {
+        return startInstallationViaSession(0 /* installFlags */, TEST_APK_NAME, packageSource)
+    }
+
+    private fun createSession(
+        installFlags: Int,
+        isMultiPackage: Boolean,
+        packageSource: Int?
+    ): Pair<Int, PackageInstaller.Session> {
         val pi = pm.packageInstaller
 
         // Create session
@@ -146,20 +162,34 @@
         if (installFlags and INSTALL_INSTANT_APP != 0) {
             sessionParam.setInstallAsInstantApp(true)
         }
+        if (isMultiPackage) {
+            sessionParam.setMultiPackage()
+        }
+        if (packageSource != null) {
+            sessionParam.setPackageSource(packageSource)
+        }
 
         val sessionId = pi.createSession(sessionParam)
         val session = pi.openSession(sessionId)!!
 
+        return Pair(sessionId, session)
+    }
+
+    private fun writeSession(session: PackageInstaller.Session, apkName: String) {
+        val apkFile = File(context.filesDir, apkName)
         // Write data to session
         apkFile.inputStream().use { fileOnDisk ->
-            session.openWrite(TEST_APK_NAME, 0, -1).use { sessionFile ->
+            session.openWrite(apkName, 0, -1).use { sessionFile ->
                 fileOnDisk.copyTo(sessionFile)
             }
         }
+    }
 
+    private fun commitSession(session: PackageInstaller.Session): CompletableFuture<Int> {
         // Commit session
         val dialog = FutureResultActivity.doAndAwaitStart {
-            val pendingIntent = PendingIntent.getBroadcast(context, 0, Intent(INSTALL_ACTION_CB),
+            val pendingIntent = PendingIntent.getBroadcast(
+                    context, 0, Intent(INSTALL_ACTION_CB),
                     FLAG_UPDATE_CURRENT or FLAG_MUTABLE)
             session.commit(pendingIntent.intentSender)
         }
@@ -170,6 +200,36 @@
         return dialog
     }
 
+    protected fun startInstallationViaSession(
+        installFlags: Int,
+        apkName: String
+    ): CompletableFuture<Int> {
+        return startInstallationViaSession(installFlags, apkName, null)
+    }
+
+    protected fun startInstallationViaSession(
+        installFlags: Int,
+        apkName: String,
+        packageSource: Int?
+    ): CompletableFuture<Int> {
+        val (sessionId, session) = createSession(installFlags, false, packageSource)
+        writeSession(session, apkName)
+        return commitSession(session)
+    }
+
+    protected fun startInstallationViaMultiPackageSession(
+        installFlags: Int,
+        vararg apkNames: String
+    ): CompletableFuture<Int> {
+        val (sessionId, session) = createSession(installFlags, true, null)
+        for (apkName in apkNames) {
+            val (childSessionId, childSession) = createSession(installFlags, false, null)
+            writeSession(childSession, apkName)
+            session.addChildSessionId(childSessionId)
+        }
+        return commitSession(session)
+    }
+
     /**
      * Start an installation via a session
      */
diff --git a/tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/SessionTest.kt b/tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/SessionTest.kt
index e81f1d1..957b66f 100644
--- a/tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/SessionTest.kt
+++ b/tests/tests/packageinstaller/install/src/android/packageinstaller/install/cts/SessionTest.kt
@@ -63,6 +63,27 @@
     }
 
     /**
+     * Check that we can install an app via a package-installer session
+     */
+    @Test
+    fun confirmMultiPackageInstallation() {
+        val installation = startInstallationViaMultiPackageSession(
+                installFlags = 0,
+                PackageInstallerTestBase.TEST_APK_NAME
+        )
+        clickInstallerUIButton(INSTALL_BUTTON_ID)
+
+        // Install should have succeeded
+        assertEquals(STATUS_SUCCESS, getInstallSessionResult())
+        assertInstalled()
+
+        // Even when the install succeeds the install confirm dialog returns 'canceled'
+        assertEquals(RESULT_CANCELED, installation.get(TIMEOUT, TimeUnit.MILLISECONDS))
+
+        assertTrue(AppOpsUtils.allowedOperationLogged(context.packageName, APP_OP_STR))
+    }
+
+    /**
      * Check that we can set an app category for an app we installed
      */
     @Test
diff --git a/tests/tests/packageinstaller/nopermission/AndroidTest.xml b/tests/tests/packageinstaller/nopermission/AndroidTest.xml
index 08ae8cc..49fcf89 100644
--- a/tests/tests/packageinstaller/nopermission/AndroidTest.xml
+++ b/tests/tests/packageinstaller/nopermission/AndroidTest.xml
@@ -20,6 +20,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
 
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="mkdir -p /data/local/tmp/cts/nopermission" />
diff --git a/tests/tests/packageinstaller/nopermission/src/android.packageinstaller.nopermission.cts/NoPermissionTests.kt b/tests/tests/packageinstaller/nopermission/src/android.packageinstaller.nopermission.cts/NoPermissionTests.kt
index e60e53a..43a3844 100644
--- a/tests/tests/packageinstaller/nopermission/src/android.packageinstaller.nopermission.cts/NoPermissionTests.kt
+++ b/tests/tests/packageinstaller/nopermission/src/android.packageinstaller.nopermission.cts/NoPermissionTests.kt
@@ -113,7 +113,8 @@
 
     @Before
     fun registerInstallResultReceiver() {
-        context.registerReceiver(receiver, IntentFilter(ACTION))
+        context.registerReceiver(receiver, IntentFilter(ACTION),
+                Context.RECEIVER_EXPORTED_UNAUDITED)
     }
 
     @Before
diff --git a/tests/tests/packageinstaller/nopermission25/AndroidTest.xml b/tests/tests/packageinstaller/nopermission25/AndroidTest.xml
index 3c69674..c84a81f 100644
--- a/tests/tests/packageinstaller/nopermission25/AndroidTest.xml
+++ b/tests/tests/packageinstaller/nopermission25/AndroidTest.xml
@@ -21,6 +21,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
 
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <option name="run-command" value="mkdir -p /data/local/tmp/cts/nopermission" />
diff --git a/tests/tests/packageinstaller/test-apps/SelfUninstallingTestApp/Android.bp b/tests/tests/packageinstaller/test-apps/SelfUninstallingTestApp/Android.bp
index 6aaeade..e501c90 100644
--- a/tests/tests/packageinstaller/test-apps/SelfUninstallingTestApp/Android.bp
+++ b/tests/tests/packageinstaller/test-apps/SelfUninstallingTestApp/Android.bp
@@ -30,7 +30,6 @@
 
     // tag this module as a cts test artifact
     test_suites: [
-        "arcts",
         "cts",
         "general-tests",
         "sts",
diff --git a/tests/tests/packageinstaller/test-apps/SelfUninstallingTestApp/src/android/packageinstaller/selfuninstalling/cts/SelfUninstallActivity.java b/tests/tests/packageinstaller/test-apps/SelfUninstallingTestApp/src/android/packageinstaller/selfuninstalling/cts/SelfUninstallActivity.java
index df5b1d4..8ff401e 100644
--- a/tests/tests/packageinstaller/test-apps/SelfUninstallingTestApp/src/android/packageinstaller/selfuninstalling/cts/SelfUninstallActivity.java
+++ b/tests/tests/packageinstaller/test-apps/SelfUninstallingTestApp/src/android/packageinstaller/selfuninstalling/cts/SelfUninstallActivity.java
@@ -28,6 +28,6 @@
                         Uri.fromParts("package", getPackageName(), null));
                 startActivity(i);
             }
-        }, new IntentFilter(ACTION_SELF_UNINSTALL));
+        }, new IntentFilter(ACTION_SELF_UNINSTALL), Context.RECEIVER_EXPORTED);
     }
 }
diff --git a/tests/tests/packageinstaller/uninstall/src/android/packageinstaller/uninstall/cts/UninstallPinnedTest.java b/tests/tests/packageinstaller/uninstall/src/android/packageinstaller/uninstall/cts/UninstallPinnedTest.java
index ef930af..bcea214 100644
--- a/tests/tests/packageinstaller/uninstall/src/android/packageinstaller/uninstall/cts/UninstallPinnedTest.java
+++ b/tests/tests/packageinstaller/uninstall/src/android/packageinstaller/uninstall/cts/UninstallPinnedTest.java
@@ -116,7 +116,7 @@
                 statusFuture.complete(
                         intent.getIntExtra(PackageInstaller.EXTRA_STATUS, Integer.MAX_VALUE));
             }
-        }, new IntentFilter(CALLBACK_ACTION));
+        }, new IntentFilter(CALLBACK_ACTION), Context.RECEIVER_EXPORTED);
 
         runWithShellPermissionIdentity(() -> {
             mContext.getPackageManager().getPackageInstaller().uninstall(TEST_PKG_NAME,
diff --git a/tests/tests/permission/AndroidTest.xml b/tests/tests/permission/AndroidTest.xml
index 8e4ff03..56a72c9 100644
--- a/tests/tests/permission/AndroidTest.xml
+++ b/tests/tests/permission/AndroidTest.xml
@@ -20,6 +20,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user"/>
     <option name="config-descriptor:metadata" key="token" value="SIM_CARD" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
 
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk30ModuleController" />
 
@@ -77,6 +78,7 @@
         <option name="push" value="CtsInstallPermissionUserApp.apk->/data/local/tmp/cts/permissions/CtsInstallPermissionUserApp.apk" />
         <option name="push" value="CtsInstallPermissionEscalatorApp.apk->/data/local/tmp/cts/permissions/CtsInstallPermissionEscalatorApp.apk" />
         <option name="push" value="CtsAppThatRequestsOneTimePermission.apk->/data/local/tmp/cts/permissions/CtsAppThatRequestsOneTimePermission.apk" />
+        <option name="push" value="CtsAppToTestRevokeSelfPermission.apk->/data/local/tmp/cts/permissions/CtsAppToTestRevokeSelfPermission.apk" />
         <option name="push" value="AppThatDefinesUndefinedPermissionGroupElement.apk->/data/local/tmp/cts/permissions/AppThatDefinesUndefinedPermissionGroupElement.apk" />
         <option name="push" value="CtsAppThatDefinesPermissionA.apk->/data/local/tmp/cts/permissions/CtsAppThatDefinesPermissionA.apk" />
         <option name="push" value="CtsAppThatAlsoDefinesPermissionA.apk->/data/local/tmp/cts/permissions/CtsAppThatAlsoDefinesPermissionA.apk" />
@@ -89,6 +91,7 @@
         <option name="push" value="CtsStorageEscalationApp28.apk->/data/local/tmp/cts/permissions/CtsStorageEscalationApp28.apk" />
         <option name="push" value="CtsStorageEscalationApp29Full.apk->/data/local/tmp/cts/permissions/CtsStorageEscalationApp29Full.apk" />
         <option name="push" value="CtsStorageEscalationApp29Scoped.apk->/data/local/tmp/cts/permissions/CtsStorageEscalationApp29Scoped.apk" />
+        <option name="push" value="CtsAppThatHasNotificationListener.apk->/data/local/tmp/cts/permissions/CtsAppThatHasNotificationListener.apk" />
     </target_preparer>
 
     <!-- Remove additional apps if installed -->
@@ -100,6 +103,7 @@
         <option name="teardown-command" value="pm uninstall android.permission.cts.revokepermissionwhenremoved.userapp" />
         <option name="teardown-command" value="pm uninstall android.permission.cts.revokepermissionwhenremoved.runtimepermissiondefinerapp" />
         <option name="teardown-command" value="pm uninstall android.permission.cts.revokepermissionwhenremoved.runtimepermissionuserapp" />
+        <option name="teardown-command" value="pm uninstall android.permission.cts.appthathasnotificationlistener" />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
diff --git a/tests/tests/permission/AppThatHasNotificationListener/Android.bp b/tests/tests/permission/AppThatHasNotificationListener/Android.bp
new file mode 100644
index 0000000..419ab5d
--- /dev/null
+++ b/tests/tests/permission/AppThatHasNotificationListener/Android.bp
@@ -0,0 +1,39 @@
+//
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsAppThatHasNotificationListener",
+    defaults: [
+        "cts_defaults",
+        "mts-target-sdk-version-current",
+    ],
+    sdk_version: "current",
+    min_sdk_version: "30",
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+        "sts",
+        "mts-permission",
+    ],
+    srcs: [
+        "src/**/*.java",
+    ],
+}
diff --git a/tests/tests/permission/AppThatHasNotificationListener/AndroidManifest.xml b/tests/tests/permission/AppThatHasNotificationListener/AndroidManifest.xml
new file mode 100644
index 0000000..03d23df
--- /dev/null
+++ b/tests/tests/permission/AppThatHasNotificationListener/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.permission.cts.appthathasnotificationlistener"
+          android:versionCode="1">
+
+    <application android:label="CtsNotificationListener">
+        <service
+            android:name=".CtsNotificationListenerService"
+            android:label="CtsNotificationListener"
+            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.service.notification.NotificationListenerService"/>
+            </intent-filter>
+        </service>
+    </application>
+</manifest>
diff --git a/tests/tests/permission/AppThatHasNotificationListener/src/android/permission/cts/appthathasnotificationlistener/CtsNotificationListenerService.java b/tests/tests/permission/AppThatHasNotificationListener/src/android/permission/cts/appthathasnotificationlistener/CtsNotificationListenerService.java
new file mode 100644
index 0000000..2bd423e
--- /dev/null
+++ b/tests/tests/permission/AppThatHasNotificationListener/src/android/permission/cts/appthathasnotificationlistener/CtsNotificationListenerService.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2022 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 android.permission.cts.appthathasnotificationlistener;
+
+import android.service.notification.NotificationListenerService;
+
+public class CtsNotificationListenerService extends NotificationListenerService {}
diff --git a/tests/tests/permission/AppToTestRevokeSelfPermission/Android.bp b/tests/tests/permission/AppToTestRevokeSelfPermission/Android.bp
new file mode 100644
index 0000000..6e200bf
--- /dev/null
+++ b/tests/tests/permission/AppToTestRevokeSelfPermission/Android.bp
@@ -0,0 +1,35 @@
+//
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsAppToTestRevokeSelfPermission",
+    defaults: [
+        "cts_defaults",
+        "mts-target-sdk-version-current",
+    ],
+    min_sdk_version: "30",
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "mts",
+        "general-tests",
+    ],
+    srcs: ["src/**/*.java"],
+}
diff --git a/tests/tests/permission/AppToTestRevokeSelfPermission/AndroidManifest.xml b/tests/tests/permission/AppToTestRevokeSelfPermission/AndroidManifest.xml
new file mode 100644
index 0000000..dbe58bf
--- /dev/null
+++ b/tests/tests/permission/AppToTestRevokeSelfPermission/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2021 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.permission.cts.apptotestrevokeselfpermission">
+
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.HIGH_SAMPLING_RATE_SENSORS" />
+
+    <application>
+        <activity android:name=".RevokePermission" android:exported="true"
+                  android:visibleToInstantApps="true" />
+    </application>
+</manifest>
diff --git a/tests/tests/permission/AppToTestRevokeSelfPermission/src/android/permission/cts/apptotestselfrevokepermission/RevokePermission.java b/tests/tests/permission/AppToTestRevokeSelfPermission/src/android/permission/cts/apptotestselfrevokepermission/RevokePermission.java
new file mode 100644
index 0000000..a1971f7
--- /dev/null
+++ b/tests/tests/permission/AppToTestRevokeSelfPermission/src/android/permission/cts/apptotestselfrevokepermission/RevokePermission.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 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 android.permission.cts.apptotestrevokeselfpermission;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+
+import java.util.Arrays;
+
+public class RevokePermission extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = getIntent();
+        String[] permissions = intent.getStringArrayExtra("permissions");
+        if (permissions == null) {
+            return;
+        }
+        if (permissions.length == 1) {
+            getApplicationContext().revokeSelfPermissionOnKill(permissions[0]);
+        } else {
+            getApplicationContext().revokeSelfPermissionsOnKill(Arrays.asList(permissions));
+        }
+    }
+}
diff --git a/tests/tests/permission/nativeTests/AndroidTest.xml b/tests/tests/permission/nativeTests/AndroidTest.xml
index 23064c5..7d1bdb0 100644
--- a/tests/tests/permission/nativeTests/AndroidTest.xml
+++ b/tests/tests/permission/nativeTests/AndroidTest.xml
@@ -18,6 +18,7 @@
     <option name="config-descriptor:metadata" key="component" value="framework" />
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
 
     <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
diff --git a/tests/tests/permission/permissionTestUtilLib/Android.bp b/tests/tests/permission/permissionTestUtilLib/Android.bp
index dd50015..36f89d7 100644
--- a/tests/tests/permission/permissionTestUtilLib/Android.bp
+++ b/tests/tests/permission/permissionTestUtilLib/Android.bp
@@ -19,13 +19,16 @@
 java_library {
     name: "permission-test-util-lib",
 
-    srcs: ["src/**/*.java"],
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.kt",
+    ],
 
     static_libs: [
         "ub-uiautomator",
         "compatibility-device-util-axt",
-        "androidx.test.ext.junit-nodeps"
-   ],
+        "androidx.test.ext.junit-nodeps",
+    ],
 
     sdk_version: "test_current",
 }
diff --git a/tests/tests/permission/permissionTestUtilLib/src/android/permission/cts/TestUtils.java b/tests/tests/permission/permissionTestUtilLib/src/android/permission/cts/TestUtils.java
new file mode 100644
index 0000000..dfcc38e
--- /dev/null
+++ b/tests/tests/permission/permissionTestUtilLib/src/android/permission/cts/TestUtils.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright (C) 2022 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 android.permission.cts;
+
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+
+/** Common test utilities */
+public class TestUtils {
+    private static final String LOG_TAG = TestUtils.class.getSimpleName();
+
+    /**
+     * A {@link java.util.concurrent.Callable} that can throw a {@link Throwable}
+     */
+    public interface ThrowingCallable<T> {
+        T call() throws Throwable;
+    }
+
+    /**
+     * A {@link Runnable} that can throw a {@link Throwable}
+     */
+    public interface ThrowingRunnable {
+        void run() throws Throwable;
+    }
+
+    /**
+     * Make sure that a {@link ThrowingRunnable} finishes without throwing a {@link
+     * Exception}.
+     *
+     * @param r       The {@link ThrowingRunnable} to run.
+     * @param timeout the maximum time to wait
+     */
+    public static void ensure(@NonNull ThrowingRunnable r, long timeout) throws Throwable {
+        ensure(() -> {
+            r.run();
+            return 0;
+        }, timeout);
+    }
+
+    /**
+     * Make sure that a {@link ThrowingCallable} finishes without throwing a {@link
+     * Exception}.
+     *
+     * @param r       The {@link ThrowingCallable} to run.
+     * @param timeout the maximum time to wait
+     * @return the return value from the callable
+     * @throws NullPointerException If the return value never becomes non-null
+     */
+    public static <T> T ensure(@NonNull ThrowingCallable<T> r, long timeout) throws Throwable {
+        long start = System.currentTimeMillis();
+
+        while (true) {
+            T res = r.call();
+            if (res == null) {
+                throw new NullPointerException("No result");
+            }
+
+            if (System.currentTimeMillis() - start < timeout) {
+                Thread.sleep(500);
+            } else {
+                return res;
+            }
+        }
+    }
+
+    /**
+     * Make sure that a {@link ThrowingRunnable} eventually finishes without throwing a {@link
+     * Exception}.
+     *
+     * @param r       The {@link ThrowingRunnable} to run.
+     * @param timeout the maximum time to wait
+     */
+    public static void eventually(@NonNull ThrowingRunnable r, long timeout) throws Throwable {
+        eventually(() -> {
+            r.run();
+            return 0;
+        }, timeout);
+    }
+
+    /**
+     * Make sure that a {@link ThrowingCallable} eventually finishes without throwing a {@link
+     * Exception}.
+     *
+     * @param r       The {@link ThrowingCallable} to run.
+     * @param timeout the maximum time to wait
+     * @return the return value from the callable
+     * @throws NullPointerException If the return value never becomes non-null
+     */
+    public static <T> T eventually(@NonNull ThrowingCallable<T> r, long timeout) throws Throwable {
+        long start = System.currentTimeMillis();
+
+        while (true) {
+            try {
+                T res = r.call();
+                if (res == null) {
+                    throw new NullPointerException("No result");
+                }
+
+                return res;
+            } catch (Throwable e) {
+                if (System.currentTimeMillis() - start < timeout) {
+                    Log.d(LOG_TAG, "Ignoring exception, occurred within valid wait time", e);
+
+                    Thread.sleep(500);
+                } else {
+                    throw e;
+                }
+            }
+        }
+    }
+}
diff --git a/tests/tests/permission/sdk28/AndroidTest.xml b/tests/tests/permission/sdk28/AndroidTest.xml
index e47b1ac..d1b5ac6 100644
--- a/tests/tests/permission/sdk28/AndroidTest.xml
+++ b/tests/tests/permission/sdk28/AndroidTest.xml
@@ -20,6 +20,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsPermissionTestCasesSdk28.apk" />
diff --git a/tests/tests/permission/src/android/permission/cts/AppIdleStatePermissionTest.java b/tests/tests/permission/src/android/permission/cts/AppIdleStatePermissionTest.java
index c3631bc..bba9963 100644
--- a/tests/tests/permission/src/android/permission/cts/AppIdleStatePermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/AppIdleStatePermissionTest.java
@@ -63,4 +63,30 @@
                     + pkgNames);
         }
     }
+
+    /**
+     * Verify that the {@link android.Manifest.permission#CHANGE_APP_LAUNCH_TIME_ESTIMATE}
+     * permission is only held by at most one package.
+     */
+    @Test
+    public void testChangeAppLaunchEstimatePermission() throws Exception {
+        final PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+        final List<PackageInfo> holding = pm.getPackagesHoldingPermissions(new String[]{
+                android.Manifest.permission.CHANGE_APP_LAUNCH_TIME_ESTIMATE
+        }, PackageManager.MATCH_SYSTEM_ONLY);
+
+        int count = 0;
+        String pkgNames = "";
+        for (PackageInfo pkg : holding) {
+            int uid = pm.getApplicationInfo(pkg.packageName, 0).uid;
+            if (UserHandle.isApp(uid)) {
+                pkgNames += pkg.packageName + "\n";
+                count++;
+            }
+        }
+        if (count > 1) {
+            fail("Only one app may hold the CHANGE_APP_LAUNCH_TIME_ESTIMATE permission;"
+                    + " found packages: \n" + pkgNames);
+        }
+    }
 }
\ No newline at end of file
diff --git a/tests/tests/permission/src/android/permission/cts/LocationAccessCheckTest.java b/tests/tests/permission/src/android/permission/cts/LocationAccessCheckTest.java
index a1c0bd1..fee9001 100644
--- a/tests/tests/permission/src/android/permission/cts/LocationAccessCheckTest.java
+++ b/tests/tests/permission/src/android/permission/cts/LocationAccessCheckTest.java
@@ -33,7 +33,7 @@
 import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
 import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
 import static com.android.server.job.nano.JobPackageHistoryProto.START_PERIODIC_JOB;
-import static com.android.server.job.nano.JobPackageHistoryProto.STOP_JOB;
+import static com.android.server.job.nano.JobPackageHistoryProto.STOP_PERIODIC_JOB;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
@@ -315,7 +315,7 @@
         // We can't simply require startTime <= endTime because the time being reported isn't
         // accurate, and sometimes the end time may come before the start time by around 100 ms.
         eventually(() -> {
-            long stopTime = getLastJobTime(STOP_JOB);
+            long stopTime = getLastJobTime(STOP_PERIODIC_JOB);
             assertTrue(stopTime + " !> " + beforeJob, stopTime > beforeJob);
         }, EXPECTED_TIMEOUT_MILLIS);
     }
diff --git a/tests/tests/permission/src/android/permission/cts/NearbyDevicesPermissionTest.java b/tests/tests/permission/src/android/permission/cts/NearbyDevicesPermissionTest.java
index f245001..3b91f98 100644
--- a/tests/tests/permission/src/android/permission/cts/NearbyDevicesPermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/NearbyDevicesPermissionTest.java
@@ -51,7 +51,6 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -292,11 +291,11 @@
 
     private void enableTestMode() {
         runShellCommandOrThrow("dumpsys activity service"
-                + " com.android.bluetooth/.btservice.AdapterService set-test-mode enabled");
+                + " com.android.bluetooth.btservice.AdapterService set-test-mode enabled");
     }
 
     private void disableTestMode() {
         runShellCommandOrThrow("dumpsys activity service"
-                + " com.android.bluetooth/.btservice.AdapterService set-test-mode disabled");
+                + " com.android.bluetooth.btservice.AdapterService set-test-mode disabled");
     }
 }
diff --git a/tests/tests/permission/src/android/permission/cts/NearbyDevicesRenouncePermissionTest.java b/tests/tests/permission/src/android/permission/cts/NearbyDevicesRenouncePermissionTest.java
index 1d678ed..700ca09 100644
--- a/tests/tests/permission/src/android/permission/cts/NearbyDevicesRenouncePermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/NearbyDevicesRenouncePermissionTest.java
@@ -280,12 +280,12 @@
 
     private void enableTestMode() {
         runShellCommandOrThrow("dumpsys activity service"
-                + " com.android.bluetooth/.btservice.AdapterService set-test-mode enabled");
+                + " com.android.bluetooth.btservice.AdapterService set-test-mode enabled");
     }
 
     private void disableTestMode() {
         runShellCommandOrThrow("dumpsys activity service"
-                + " com.android.bluetooth/.btservice.AdapterService set-test-mode disabled");
+                + " com.android.bluetooth.btservice.AdapterService set-test-mode disabled");
     }
 
 }
diff --git a/tests/tests/permission/src/android/permission/cts/NotificationListenerCheckTest.java b/tests/tests/permission/src/android/permission/cts/NotificationListenerCheckTest.java
new file mode 100644
index 0000000..a4e480a
--- /dev/null
+++ b/tests/tests/permission/src/android/permission/cts/NotificationListenerCheckTest.java
@@ -0,0 +1,651 @@
+/*
+ * Copyright (C) 2022 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 android.permission.cts;
+
+import static android.Manifest.permission.WRITE_DEVICE_CONFIG;
+import static android.content.Intent.ACTION_BOOT_COMPLETED;
+import static android.content.Intent.FLAG_RECEIVER_FOREGROUND;
+import static android.os.Process.myUserHandle;
+import static android.permission.cts.PermissionUtils.clearAppState;
+import static android.permission.cts.PermissionUtils.install;
+import static android.permission.cts.PermissionUtils.uninstallApp;
+import static android.permission.cts.TestUtils.ensure;
+import static android.permission.cts.TestUtils.eventually;
+
+import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
+import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
+import static com.android.server.job.nano.JobPackageHistoryProto.START_PERIODIC_JOB;
+import static com.android.server.job.nano.JobPackageHistoryProto.STOP_PERIODIC_JOB;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
+
+import static java.lang.Math.max;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import android.app.NotificationManager;
+import android.app.UiAutomation;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Build;
+import android.platform.test.annotations.AppModeFull;
+import android.provider.DeviceConfig;
+import android.service.notification.NotificationListenerService;
+import android.service.notification.StatusBarNotification;
+import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.DeviceConfigStateChangerRule;
+import com.android.compatibility.common.util.ProtoUtils;
+import com.android.compatibility.common.util.mainline.MainlineModule;
+import com.android.compatibility.common.util.mainline.ModuleDetector;
+import com.android.server.job.nano.JobPackageHistoryProto;
+import com.android.server.job.nano.JobSchedulerServiceDumpProto;
+import com.android.server.job.nano.JobSchedulerServiceDumpProto.RegisteredJob;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Tests the {@code NotificationListenerCheck} in permission controller.
+ */
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = "Cannot set system settings as instant app. Also we never show a notification"
+        + " listener check notification for instant apps.")
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+public class NotificationListenerCheckTest {
+    private static final String LOG_TAG = NotificationListenerCheckTest.class.getSimpleName();
+    private static final boolean DEBUG = false;
+
+    private static final String TEST_APP_PKG =
+            "android.permission.cts.appthathasnotificationlistener";
+    private static final String TEST_APP_LABEL = "CtsLocationAccess";
+    private static final String TEST_APP_NOTIFICATION_SERVICE =
+            TEST_APP_PKG + ".CtsNotificationListenerService";
+    private static final String TEST_APP_NOTIFICATION_LISTENER_APK =
+            "/data/local/tmp/cts/permissions/CtsAppThatHasNotificationListener.apk";
+
+    private static final int NOTIFICATION_LISTENER_CHECK_JOB_ID = 4;
+
+    /**
+     * Device config property for whether notification listener check is enabled on the device
+     */
+    private static final String PROPERTY_NOTIFICATION_LISTENER_CHECK_ENABLED =
+            "notification_listener_check_enabled";
+
+    /** Name of the flag that determines whether SafetyCenter is enabled. */
+    private static final String PROPERTY_SAFETY_CENTER_ENABLED = "safety_center_is_enabled";
+
+    /**
+     * Device config property for time period in milliseconds after which current enabled
+     * notification
+     * listeners are queried
+     */
+    private static final String PROPERTY_NOTIFICATION_LISTENER_CHECK_INTERVAL_MILLIS =
+            "notification_listener_check_interval_millis";
+
+    private static final Long OVERRIDE_NOTIFICATION_LISTENER_CHECK_INTERVAL_MILLIS =
+            SECONDS.toMillis(1);
+
+    private static final String PROPERTY_JOB_SCHEDULER_MAX_JOB_PER_RATE_LIMIT_WINDOW =
+            "qc_max_job_count_per_rate_limiting_window";
+
+    private static final String PROPERTY_JOB_SCHEDULER_RATE_LIMIT_WINDOW_MILLIS =
+            "qc_rate_limiting_window_ms";
+
+    /**
+     * ID for notification shown by
+     * {@link com.android.permissioncontroller.permission.service.v33.NotificationListenerCheck}.
+     */
+    public static final int NOTIFICATION_LISTENER_CHECK_NOTIFICATION_ID = 3;
+
+    private static final long UNEXPECTED_TIMEOUT_MILLIS = 10000;
+    private static final long EXPECTED_TIMEOUT_MILLIS = 15000;
+
+    private static final Context sContext = InstrumentationRegistry.getTargetContext();
+    private static final PackageManager sPackageManager = sContext.getPackageManager();
+    private static final UiAutomation sUiAutomation = InstrumentationRegistry.getInstrumentation()
+            .getUiAutomation();
+
+    private static final String PERMISSION_CONTROLLER_PKG = sContext.getPackageManager()
+            .getPermissionControllerPackageName();
+
+    private static List<ComponentName> sPreviouslyEnabledNotificationListeners;
+
+    // Override SafetyCenter enabled flag
+    @Rule
+    public DeviceConfigStateChangerRule sPrivacyDeviceConfigSafetyCenterEnabled =
+            new DeviceConfigStateChangerRule(sContext,
+                    DeviceConfig.NAMESPACE_PRIVACY,
+                    PROPERTY_SAFETY_CENTER_ENABLED,
+                    Boolean.toString(true));
+
+    // Override NlsCheck enabled flag
+    @Rule
+    public DeviceConfigStateChangerRule sPrivacyDeviceConfigNlsCheckEnabled =
+            new DeviceConfigStateChangerRule(sContext,
+                    DeviceConfig.NAMESPACE_PRIVACY,
+                    PROPERTY_NOTIFICATION_LISTENER_CHECK_ENABLED,
+                    Boolean.toString(true));
+
+    // Override general notification interval from once every day to once ever 1 second
+    @Rule
+    public DeviceConfigStateChangerRule sPrivacyDeviceConfigNlsCheckIntervalMillis =
+            new DeviceConfigStateChangerRule(sContext,
+                    DeviceConfig.NAMESPACE_PRIVACY,
+                    PROPERTY_NOTIFICATION_LISTENER_CHECK_INTERVAL_MILLIS,
+                    Long.toString(OVERRIDE_NOTIFICATION_LISTENER_CHECK_INTERVAL_MILLIS));
+
+    // Disable job scheduler throttling by allowing 300000 jobs per 30 sec
+    @Rule
+    public DeviceConfigStateChangerRule sJobSchedulerDeviceConfig1 =
+            new DeviceConfigStateChangerRule(sContext,
+                    DeviceConfig.NAMESPACE_JOB_SCHEDULER,
+                    PROPERTY_JOB_SCHEDULER_MAX_JOB_PER_RATE_LIMIT_WINDOW,
+                    Integer.toString(3000000));
+
+    // Disable job scheduler throttling by allowing 300000 jobs per 30 sec
+    @Rule
+    public DeviceConfigStateChangerRule sJobSchedulerDeviceConfig2 =
+            new DeviceConfigStateChangerRule(sContext,
+                    DeviceConfig.NAMESPACE_JOB_SCHEDULER,
+                    PROPERTY_JOB_SCHEDULER_RATE_LIMIT_WINDOW_MILLIS,
+                    Integer.toString(30000));
+
+    private static void setDeviceConfigPrivacyProperty(String propertyName, String value) {
+        runWithShellPermissionIdentity(() -> {
+            boolean valueWasSet =  DeviceConfig.setProperty(
+                    DeviceConfig.NAMESPACE_PRIVACY,
+                    /* name = */ propertyName,
+                    /* value = */ value,
+                    /* makeDefault = */ false);
+            if (!valueWasSet) {
+                throw new  IllegalStateException("Could not set " + propertyName + " to " + value);
+            }
+        }, WRITE_DEVICE_CONFIG);
+    }
+
+    /**
+     * Enabled or disable Safety Center
+     */
+    private static void setSafetyCenterEnabled(boolean enabled) {
+        setDeviceConfigPrivacyProperty(
+                PROPERTY_SAFETY_CENTER_ENABLED,
+                /* value = */ String.valueOf(enabled));
+    }
+
+    /**
+     * Enable or disable notification listener check
+     */
+    private static void setNotificationListenerCheckEnabled(boolean enabled) {
+        setDeviceConfigPrivacyProperty(
+                PROPERTY_NOTIFICATION_LISTENER_CHECK_ENABLED,
+                /* value = */ String.valueOf(enabled));
+    }
+
+    /**
+     * Allow or disallow a {@link NotificationListenerService} component for the current user
+     *
+     * @param listenerComponent {@link NotificationListenerService} component to allow or disallow
+     */
+    private static void setNotificationListenerServiceAllowed(ComponentName listenerComponent,
+            boolean allowed) {
+        String command = " cmd notification " + (allowed ? "allow_listener " : "disallow_listener ")
+                + listenerComponent.flattenToString();
+        runShellCommand(command);
+    }
+
+    private static void disallowPreexistingNotificationListeners() {
+        runWithShellPermissionIdentity(() -> {
+            NotificationManager notificationManager =
+                    sContext.getSystemService(NotificationManager.class);
+            sPreviouslyEnabledNotificationListeners =
+                    notificationManager.getEnabledNotificationListeners();
+        });
+        if (DEBUG) {
+            Log.d(LOG_TAG, "Found " + sPreviouslyEnabledNotificationListeners.size()
+                    + " previously allowed notification listeners. Disabling before test run.");
+        }
+        for (ComponentName listener : sPreviouslyEnabledNotificationListeners) {
+            setNotificationListenerServiceAllowed(listener, false);
+        }
+    }
+
+    private static void reallowPreexistingNotificationListeners() {
+        if (DEBUG) {
+            Log.d(LOG_TAG, "Re-allowing " + sPreviouslyEnabledNotificationListeners.size()
+                    + " previously allowed notification listeners found before test run.");
+        }
+        for (ComponentName listener : sPreviouslyEnabledNotificationListeners) {
+            setNotificationListenerServiceAllowed(listener, true);
+        }
+    }
+
+    private void allowTestAppNotificationListenerService() {
+        setNotificationListenerServiceAllowed(
+                new ComponentName(TEST_APP_PKG, TEST_APP_NOTIFICATION_SERVICE), true);
+    }
+
+    private void disallowTestAppNotificationListenerService() {
+        setNotificationListenerServiceAllowed(
+                new ComponentName(TEST_APP_PKG, TEST_APP_NOTIFICATION_SERVICE), false);
+    }
+
+    /**
+     * Get the state of the job scheduler
+     */
+    private static JobSchedulerServiceDumpProto getJobSchedulerDump() throws Exception {
+        return ProtoUtils.getProto(sUiAutomation, JobSchedulerServiceDumpProto.class,
+                ProtoUtils.DUMPSYS_JOB_SCHEDULER);
+    }
+
+    /**
+     * Get the last time the NOTIFICATION_LISTENER_CHECK_JOB_ID job was started/stopped for
+     * permission
+     * controller.
+     *
+     * @param event the job event (start/stop)
+     * @return the last time the event happened.
+     */
+    private static long getLastJobTime(int event) throws Exception {
+        int permControllerUid = sPackageManager.getPackageUid(PERMISSION_CONTROLLER_PKG, 0);
+
+        long lastTime = -1;
+
+        for (JobPackageHistoryProto.HistoryEvent historyEvent :
+                getJobSchedulerDump().history.historyEvent) {
+            if (historyEvent.uid == permControllerUid
+                    && historyEvent.jobId == NOTIFICATION_LISTENER_CHECK_JOB_ID
+                    && historyEvent.event == event) {
+                lastTime = max(lastTime,
+                        System.currentTimeMillis() - historyEvent.timeSinceEventMs);
+            }
+        }
+
+        return lastTime;
+    }
+
+    /**
+     * Force a run of the notification listener check.
+     */
+    private static void runNotificationListenerCheck() throws Throwable {
+        // Sleep a little to make sure we don't have overlap in timing
+        Thread.sleep(1000);
+
+        long beforeJob = System.currentTimeMillis();
+
+        // Sleep a little to avoid raciness in time keeping
+        Thread.sleep(1000);
+
+        runShellCommand("cmd jobscheduler run -u " + myUserHandle().getIdentifier() + " -f "
+                + PERMISSION_CONTROLLER_PKG + " " + NOTIFICATION_LISTENER_CHECK_JOB_ID);
+
+        eventually(() -> {
+            long startTime = getLastJobTime(START_PERIODIC_JOB);
+            assertTrue(startTime + " !> " + beforeJob, startTime > beforeJob);
+        }, EXPECTED_TIMEOUT_MILLIS);
+
+        // We can't simply require startTime <= endTime because the time being reported isn't
+        // accurate, and sometimes the end time may come before the start time by around 100 ms.
+        eventually(() -> {
+            long stopTime = getLastJobTime(STOP_PERIODIC_JOB);
+            assertTrue(stopTime + " !> " + beforeJob, stopTime > beforeJob);
+        }, EXPECTED_TIMEOUT_MILLIS);
+    }
+
+    /**
+     * Get a notifications thrown by the permission controller that are currently visible.
+     *
+     * @return {@link java.util.List} of {@link StatusBarNotification}
+     */
+    private List<StatusBarNotification> getPermissionControllerNotifications() throws Exception {
+        NotificationListenerService notificationService = NotificationListener.getInstance();
+        List<StatusBarNotification> permissionControllerNotifications = new ArrayList<>();
+
+        for (StatusBarNotification notification : notificationService.getActiveNotifications()) {
+            if (notification.getPackageName().equals(PERMISSION_CONTROLLER_PKG)) {
+                permissionControllerNotifications.add(notification);
+            }
+        }
+
+        return permissionControllerNotifications;
+    }
+
+    /**
+     * Get a notification listener notification that is currently visible.
+     *
+     * @param cancelNotification if {@code true} the notification is canceled inside this method
+     * @return The notification or {@code null} if there is none
+     */
+    private StatusBarNotification getNotification(boolean cancelNotification) throws Throwable {
+        NotificationListenerService notificationService = NotificationListener.getInstance();
+
+        List<StatusBarNotification> notifications = getPermissionControllerNotifications();
+        if (notifications.isEmpty()) {
+            return null;
+        }
+
+        for (StatusBarNotification notification : notifications) {
+            // There may be multiple notification listeners on device that are already allowed. Just
+            // check for a notification posted from the NotificationListenerCheck
+            if (notification.getId() == NOTIFICATION_LISTENER_CHECK_NOTIFICATION_ID) {
+                if (cancelNotification) {
+                    notificationService.cancelNotification(notification.getKey());
+
+                    // Wait for notification to get canceled
+                    eventually(() -> assertFalse(
+                            Arrays.asList(notificationService.getActiveNotifications()).contains(
+                                    notification)), UNEXPECTED_TIMEOUT_MILLIS);
+                }
+
+                return notification;
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Clears all permission controller notifications that are currently visible.
+     */
+    private void clearPermissionControllerNotifications() throws Throwable {
+        NotificationListenerService notificationService = NotificationListener.getInstance();
+
+        List<StatusBarNotification> notifications = getPermissionControllerNotifications();
+        if (notifications.isEmpty()) {
+            return;
+        }
+
+        for (StatusBarNotification notification : notifications) {
+            notificationService.cancelNotification(notification.getKey());
+
+            // Wait for notification to get canceled
+            eventually(() -> assertFalse(
+                    Arrays.asList(notificationService.getActiveNotifications()).contains(
+                            notification)), UNEXPECTED_TIMEOUT_MILLIS);
+        }
+    }
+
+    @BeforeClass
+    public static void beforeClassSetup() throws Exception {
+        // Disallow any OEM enabled NLS
+        disallowPreexistingNotificationListeners();
+
+        // Allow NLS used to verify notifications sent
+        setNotificationListenerServiceAllowed(
+                new ComponentName(sContext, NotificationListener.class), true);
+    }
+
+    @AfterClass
+    public static void afterClassTearDown() throws Throwable {
+        // Disallow NLS used to verify notifications sent
+        setNotificationListenerServiceAllowed(
+                new ComponentName(sContext, NotificationListener.class), false);
+
+        // Reallow any previously OEM allowed NLS
+        reallowPreexistingNotificationListeners();
+    }
+
+    @Before
+    public void setup() throws Throwable {
+        assumeNotPlayManaged();
+        wakeUpAndDismissKeyguard();
+        resetPermissionControllerBeforeEachTest();
+
+        // Cts NLS is required to verify sent Notifications, however, we don't want it to show up in
+        // testing
+        showAndDismissCtsNotificationListener();
+
+        clearNotifications();
+
+        // Sleep a little to avoid raciness in time keeping
+        Thread.sleep(1000);
+
+        // Install and allow the app with NLS for testing
+        install(TEST_APP_NOTIFICATION_LISTENER_APK);
+        allowTestAppNotificationListenerService();
+    }
+
+    @After
+    public void tearDown() throws Throwable {
+        // Disallow and uninstall the app with NLS for testing
+        disallowTestAppNotificationListenerService();
+        uninstallApp(TEST_APP_NOTIFICATION_LISTENER_APK);
+
+        clearNotifications();
+    }
+
+    /**
+     * Skip each test for play managed module
+     */
+    private void assumeNotPlayManaged() throws Exception {
+        assumeFalse(ModuleDetector.moduleIsPlayManaged(
+                sContext.getPackageManager(), MainlineModule.PERMISSION_CONTROLLER));
+    }
+
+    private void wakeUpAndDismissKeyguard() {
+        runShellCommand("input keyevent KEYCODE_WAKEUP");
+        runShellCommand("wm dismiss-keyguard");
+    }
+
+    /**
+     * Reset the permission controllers state before each test
+     */
+    private void resetPermissionControllerBeforeEachTest() throws Throwable {
+        resetPermissionController();
+
+        // ensure no posted notification listener notifications exits
+        eventually(() -> assertNull(getNotification(false)), UNEXPECTED_TIMEOUT_MILLIS);
+
+        // Reset job scheduler stats (to allow more jobs to be run)
+        runShellCommand(
+                "cmd jobscheduler reset-execution-quota -u " + myUserHandle().getIdentifier() + " "
+                        + PERMISSION_CONTROLLER_PKG);
+    }
+
+    /**
+     * Reset the permission controllers state.
+     */
+    private static void resetPermissionController() throws Throwable {
+        clearAppState(PERMISSION_CONTROLLER_PKG);
+        int currentUserId = myUserHandle().getIdentifier();
+
+        // Wait until jobs are cleared
+        eventually(() -> {
+            JobSchedulerServiceDumpProto dump = getJobSchedulerDump();
+
+            for (RegisteredJob job : dump.registeredJobs) {
+                if (job.dump.sourceUserId == currentUserId) {
+                    assertNotEquals(job.dump.sourcePackageName, PERMISSION_CONTROLLER_PKG);
+                }
+            }
+        }, UNEXPECTED_TIMEOUT_MILLIS);
+
+        // Setup up permission controller again (simulate a reboot)
+        Intent permissionControllerSetupIntent = null;
+        for (ResolveInfo ri : sContext.getPackageManager().queryBroadcastReceivers(
+                new Intent(ACTION_BOOT_COMPLETED), 0)) {
+            String pkg = ri.activityInfo.packageName;
+
+            if (pkg.equals(PERMISSION_CONTROLLER_PKG)) {
+                permissionControllerSetupIntent = new Intent()
+                        .setClassName(pkg, ri.activityInfo.name)
+                        .setFlags(FLAG_RECEIVER_FOREGROUND)
+                        .setPackage(PERMISSION_CONTROLLER_PKG);
+
+                sContext.sendBroadcast(permissionControllerSetupIntent);
+            }
+        }
+
+        // Wait until jobs are set up
+        eventually(() -> {
+            JobSchedulerServiceDumpProto dump = getJobSchedulerDump();
+
+            for (RegisteredJob job : dump.registeredJobs) {
+                if (job.dump.sourceUserId == currentUserId
+                        && job.dump.sourcePackageName.equals(PERMISSION_CONTROLLER_PKG)
+                        && job.dump.jobInfo.service.className.contains(
+                        "NotificationListenerCheck")) {
+                    return;
+                }
+            }
+
+            fail("Permission controller jobs not found");
+        }, UNEXPECTED_TIMEOUT_MILLIS);
+    }
+
+    /**
+     * Preshow/dismiss cts NotificationListener notification as it negatively affects test results
+     * (can result in unexpected test pass/failures)
+     */
+    private void showAndDismissCtsNotificationListener() throws Throwable {
+        // CtsNotificationListenerService isn't enabled at this point, but NotificationListener
+        // should be. Mark as notified by showing and dismissing
+        runNotificationListenerCheck();
+
+        // Sleep a little to avoid raciness in time keeping
+        Thread.sleep(1000);
+    }
+
+    /**
+     * Clear any notifications related to NotificationListenerCheck to ensure clean test setup
+     */
+    private void clearNotifications() throws Throwable {
+        // Clear notification if present
+        clearPermissionControllerNotifications();
+    }
+
+    @Test
+    public void noNotificationIfFeatureDisabled() throws Throwable {
+        setNotificationListenerCheckEnabled(false);
+
+        runNotificationListenerCheck();
+
+        ensure(() -> assertNull("Expected no notifications", getNotification(false)),
+                EXPECTED_TIMEOUT_MILLIS);
+    }
+
+    @Test
+    public void noNotificationIfSafetyCenterDisabled() throws Throwable {
+        setSafetyCenterEnabled(false);
+
+        runNotificationListenerCheck();
+
+        ensure(() -> assertNull("Expected no notifications", getNotification(false)),
+                EXPECTED_TIMEOUT_MILLIS);
+    }
+
+    @Test
+    public void notificationIsShown() throws Throwable {
+        runNotificationListenerCheck();
+
+        eventually(() -> assertNotNull("Expected notification, none found", getNotification(false)),
+                EXPECTED_TIMEOUT_MILLIS);
+    }
+
+    @Test
+    public void notificationIsShownOnlyOnce() throws Throwable {
+        runNotificationListenerCheck();
+        eventually(() -> assertNotNull(getNotification(true)), EXPECTED_TIMEOUT_MILLIS);
+
+        runNotificationListenerCheck();
+
+        ensure(() -> assertNull("Expected no notifications", getNotification(false)),
+                EXPECTED_TIMEOUT_MILLIS);
+    }
+
+    @Test
+    public void notificationIsShownAgainAfterClear() throws Throwable {
+        runNotificationListenerCheck();
+
+        eventually(() -> assertNotNull(getNotification(true)), EXPECTED_TIMEOUT_MILLIS);
+
+        clearAppState(TEST_APP_PKG);
+
+        // Wait until package is cleared and permission controller has cleared the state
+        Thread.sleep(10000);
+
+        allowTestAppNotificationListenerService();
+        runNotificationListenerCheck();
+
+        eventually(() -> assertNotNull(getNotification(true)), EXPECTED_TIMEOUT_MILLIS);
+    }
+
+    @Test
+    public void notificationIsShownAgainAfterUninstallAndReinstall() throws Throwable {
+        runNotificationListenerCheck();
+
+        eventually(() -> assertNotNull(getNotification(true)), EXPECTED_TIMEOUT_MILLIS);
+
+        uninstallApp(TEST_APP_PKG);
+
+        // Wait until package permission controller has cleared the state
+        Thread.sleep(2000);
+
+        install(TEST_APP_NOTIFICATION_LISTENER_APK);
+
+        allowTestAppNotificationListenerService();
+        runNotificationListenerCheck();
+
+        eventually(() -> assertNotNull(getNotification(true)), EXPECTED_TIMEOUT_MILLIS);
+    }
+
+    @Test
+    public void removeNotificationOnUninstall() throws Throwable {
+        runNotificationListenerCheck();
+
+        eventually(() -> assertNotNull(getNotification(false)), EXPECTED_TIMEOUT_MILLIS);
+
+        uninstallApp(TEST_APP_PKG);
+
+        // Wait until package permission controller has cleared the state
+        Thread.sleep(2000);
+
+        eventually(() -> assertNull(getNotification(false)), EXPECTED_TIMEOUT_MILLIS);
+    }
+
+    @Test
+    public void notificationIsNotShownAfterDisableAppNotificationListener() throws Throwable {
+        disallowTestAppNotificationListenerService();
+
+        runNotificationListenerCheck();
+
+        // We don't expect a notification, but try to trigger one anyway
+        ensure(() -> assertNull("Expected no notifications", getNotification(false)),
+                EXPECTED_TIMEOUT_MILLIS);
+    }
+}
diff --git a/tests/tests/permission/src/android/permission/cts/OneTimePermissionTest.java b/tests/tests/permission/src/android/permission/cts/OneTimePermissionTest.java
index f243b3b..c24d244 100644
--- a/tests/tests/permission/src/android/permission/cts/OneTimePermissionTest.java
+++ b/tests/tests/permission/src/android/permission/cts/OneTimePermissionTest.java
@@ -61,6 +61,7 @@
             "android.permission.cts.OneTimePermissionTest.EXTRA_FOREGROUND_SERVICE_STICKY";
 
     private static final long ONE_TIME_TIMEOUT_MILLIS = 5000;
+    private static final long ONE_TIME_KILLED_DELAY_MILLIS = 5000;
     private static final long ONE_TIME_TIMER_LOWER_GRACE_PERIOD = 1000;
     private static final long ONE_TIME_TIMER_UPPER_GRACE_PERIOD = 10000;
 
@@ -72,6 +73,7 @@
             mContext.getSystemService(ActivityManager.class);
 
     private String mOldOneTimePermissionTimeoutValue;
+    private String mOldOneTimePermissionKilledDelayValue;
 
     @Rule
     public IgnoreAllTestsRule mIgnoreAutomotive = new IgnoreAllTestsRule(
@@ -94,8 +96,13 @@
         runWithShellPermissionIdentity(() -> {
             mOldOneTimePermissionTimeoutValue = DeviceConfig.getProperty("permissions",
                     "one_time_permissions_timeout_millis");
+            mOldOneTimePermissionKilledDelayValue = DeviceConfig.getProperty("permissions",
+                    "one_time_permissions_killed_delay_millis");
             DeviceConfig.setProperty("permissions", "one_time_permissions_timeout_millis",
                     Long.toString(ONE_TIME_TIMEOUT_MILLIS), false);
+            DeviceConfig.setProperty("permissions",
+                    "one_time_permissions_killed_delay_millis",
+                    Long.toString(ONE_TIME_KILLED_DELAY_MILLIS), false);
         });
     }
 
@@ -107,8 +114,13 @@
     @After
     public void restoreDeviceForOneTime() {
         runWithShellPermissionIdentity(
-                () -> DeviceConfig.setProperty("permissions", "one_time_permissions_timeout_millis",
-                        mOldOneTimePermissionTimeoutValue, false));
+                () -> {
+                    DeviceConfig.setProperty("permissions", "one_time_permissions_timeout_millis",
+                            mOldOneTimePermissionTimeoutValue, false);
+                    DeviceConfig.setProperty("permissions",
+                            "one_time_permissions_killed_delay_millis",
+                            mOldOneTimePermissionKilledDelayValue, false);
+                });
     }
 
     @Test
diff --git a/tests/tests/permission/src/android/permission/cts/RevokeSelfPermissionTest.java b/tests/tests/permission/src/android/permission/cts/RevokeSelfPermissionTest.java
new file mode 100644
index 0000000..15b7130
--- /dev/null
+++ b/tests/tests/permission/src/android/permission/cts/RevokeSelfPermissionTest.java
@@ -0,0 +1,342 @@
+/*
+ * Copyright (C) 2021 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 android.permission.cts;
+
+import static android.Manifest.permission.ACCESS_BACKGROUND_LOCATION;
+import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
+import static android.Manifest.permission.ACCESS_FINE_LOCATION;
+import static android.Manifest.permission.CAMERA;
+import static android.Manifest.permission.HIGH_SAMPLING_RATE_SENSORS;
+import static android.app.ActivityManager.RunningAppProcessInfo.IMPORTANCE_FOREGROUND;
+import static android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED;
+import static android.content.pm.PackageManager.FLAG_PERMISSION_ONE_TIME;
+import static android.content.pm.PackageManager.FLAG_PERMISSION_USER_FIXED;
+import static android.content.pm.PackageManager.GET_PERMISSIONS;
+import static android.permission.cts.PermissionUtils.getPermissionFlags;
+import static android.permission.cts.PermissionUtils.grantPermission;
+import static android.permission.cts.PermissionUtils.setPermissionFlags;
+
+import static com.android.compatibility.common.util.SystemUtil.eventually;
+import static com.android.compatibility.common.util.SystemUtil.runShellCommand;
+import static com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
+import android.app.ActivityManager;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.provider.DeviceConfig;
+import android.support.test.uiautomator.UiDevice;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+public class RevokeSelfPermissionTest {
+    private static final String APP_PKG_NAME =
+            "android.permission.cts.apptotestrevokeselfpermission";
+    private static final String APK =
+            "/data/local/tmp/cts/permissions/CtsAppToTestRevokeSelfPermission.apk";
+    private static final long ONE_TIME_TIMEOUT_MILLIS = 500;
+    private static final long ONE_TIME_TIMER_UPPER_GRACE_PERIOD = 5000;
+
+    private final Instrumentation mInstrumentation =
+            InstrumentationRegistry.getInstrumentation();
+    private final Context mContext = mInstrumentation.getTargetContext();
+    private final ActivityManager mActivityManager =
+            mContext.getSystemService(ActivityManager.class);
+    private final UiDevice mUiDevice = UiDevice.getInstance(mInstrumentation);
+    private String mOldOneTimePermissionTimeoutValue;
+    private String mOldScreenOffTimeoutValue;
+    private String mOldSleepTimeoutValue;
+
+    @Before
+    public void wakeUpScreen() {
+        SystemUtil.runShellCommand("input keyevent KEYCODE_WAKEUP");
+        SystemUtil.runShellCommand("input keyevent 82");
+        mOldScreenOffTimeoutValue = SystemUtil.runShellCommand(
+                "settings get system screen_off_timeout");
+        mOldSleepTimeoutValue = SystemUtil.runShellCommand("settings get secure sleep_timeout");
+        SystemUtil.runShellCommand("settings put system screen_off_timeout -1");
+        SystemUtil.runShellCommand("settings put secure sleep_timeout -1");
+    }
+
+    @Before
+    public void prepareDeviceForOneTime() {
+        runWithShellPermissionIdentity(() -> {
+            mOldOneTimePermissionTimeoutValue = DeviceConfig.getProperty("permissions",
+                    "one_time_permissions_timeout_millis");
+            DeviceConfig.setProperty("permissions", "one_time_permissions_timeout_millis",
+                    Long.toString(ONE_TIME_TIMEOUT_MILLIS), false);
+        });
+    }
+
+    @After
+    public void uninstallApp() {
+        runShellCommand("pm uninstall " + APP_PKG_NAME);
+    }
+
+    @After
+    public void restoreDeviceForOneTime() {
+        runWithShellPermissionIdentity(() -> {
+            DeviceConfig.setProperty("permissions", "one_time_permissions_timeout_millis",
+                    mOldOneTimePermissionTimeoutValue, false);
+        });
+        SystemUtil.runShellCommand("settings put system screen_off_timeout "
+                + mOldScreenOffTimeoutValue);
+        SystemUtil.runShellCommand("settings put secure sleep_timeout " + mOldSleepTimeoutValue);
+    }
+
+    @Test
+    public void testMultiplePermissions() throws Throwable {
+        // Trying to revoke multiple permissions including some from the same permission group
+        // should work.
+        installApp();
+        String[] permissions = new String[] {ACCESS_COARSE_LOCATION, ACCESS_BACKGROUND_LOCATION,
+                CAMERA};
+        for (String permission : permissions) {
+            grantPermission(APP_PKG_NAME, permission);
+            assertGranted(ONE_TIME_TIMER_UPPER_GRACE_PERIOD, permission);
+        }
+        revokePermissions(permissions);
+        placeAppInBackground();
+        for (String permission : permissions) {
+            assertDenied(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD,
+                    permission);
+        }
+        uninstallApp();
+    }
+
+    @Test
+    public void testNormalPermission() throws Throwable {
+        // Trying to revoke a normal (non-runtime) permission should not actually revoke it.
+        installApp();
+        revokePermission(HIGH_SAMPLING_RATE_SENSORS);
+        placeAppInBackground();
+        try {
+            waitUntilPermissionRevoked(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD,
+                    HIGH_SAMPLING_RATE_SENSORS);
+            fail("android.permission.HIGH_SAMPLING_RATE_SENSORS was revoked");
+        } catch (Throwable expected) {
+            assertEquals(HIGH_SAMPLING_RATE_SENSORS + " not revoked",
+                    expected.getMessage());
+        }
+        uninstallApp();
+    }
+
+    @Test
+    public void testKillTriggersRevocation() throws Throwable {
+        // Killing the process should start the revocation right away
+        installApp();
+        grantPermission(APP_PKG_NAME, ACCESS_FINE_LOCATION);
+        assertGranted(ONE_TIME_TIMER_UPPER_GRACE_PERIOD, ACCESS_FINE_LOCATION);
+        revokePermission(ACCESS_FINE_LOCATION);
+        killApp();
+        assertDenied(ONE_TIME_TIMER_UPPER_GRACE_PERIOD, ACCESS_FINE_LOCATION);
+        uninstallApp();
+    }
+
+    @Test
+    public void testNoRevocationWhileForeground() throws Throwable {
+        // Even after calling revokeSelfPermissionOnKill, the permission should stay granted while
+        // the package is in the foreground.
+        installApp();
+        grantPermission(APP_PKG_NAME, ACCESS_FINE_LOCATION);
+        assertGranted(ONE_TIME_TIMER_UPPER_GRACE_PERIOD, ACCESS_FINE_LOCATION);
+        revokePermission(ACCESS_FINE_LOCATION);
+        keepAppInForeground(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD);
+        try {
+            waitUntilPermissionRevoked(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD,
+                    ACCESS_FINE_LOCATION);
+            fail("android.permission.ACCESS_FINE_LOCATION was revoked");
+        } catch (Throwable expected) {
+            assertEquals(ACCESS_FINE_LOCATION + " not revoked",
+                    expected.getMessage());
+        }
+        uninstallApp();
+    }
+
+    @Test
+    public void testRevokeLocationPermission() throws Throwable {
+        // Test behavior specific to location group: revoking fine location should not revoke coarse
+        // location, and background location should not be revoked as long as a foreground
+        // permission is still granted
+        installApp();
+        grantPermission(APP_PKG_NAME, ACCESS_COARSE_LOCATION);
+        assertGranted(ONE_TIME_TIMER_UPPER_GRACE_PERIOD, ACCESS_COARSE_LOCATION);
+        grantPermission(APP_PKG_NAME, ACCESS_FINE_LOCATION);
+        assertGranted(ONE_TIME_TIMER_UPPER_GRACE_PERIOD, ACCESS_FINE_LOCATION);
+        grantPermission(APP_PKG_NAME, ACCESS_BACKGROUND_LOCATION);
+        assertGranted(ONE_TIME_TIMER_UPPER_GRACE_PERIOD, ACCESS_BACKGROUND_LOCATION);
+        revokePermission(ACCESS_BACKGROUND_LOCATION);
+        killApp();
+        assertDenied(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD,
+                ACCESS_BACKGROUND_LOCATION);
+        assertGranted(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD,
+                ACCESS_COARSE_LOCATION);
+        assertGranted(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD,
+                ACCESS_FINE_LOCATION);
+        grantPermission(APP_PKG_NAME, ACCESS_BACKGROUND_LOCATION);
+        setPermissionFlags(APP_PKG_NAME, ACCESS_BACKGROUND_LOCATION, FLAG_PERMISSION_ONE_TIME, 0);
+        assertGranted(ONE_TIME_TIMER_UPPER_GRACE_PERIOD, ACCESS_BACKGROUND_LOCATION);
+        revokePermission(ACCESS_FINE_LOCATION);
+        killApp();
+        assertDenied(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD,
+                ACCESS_FINE_LOCATION);
+        assertGranted(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD,
+                ACCESS_COARSE_LOCATION);
+        assertGranted(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD,
+                ACCESS_BACKGROUND_LOCATION);
+        revokePermission(ACCESS_COARSE_LOCATION);
+        killApp();
+        assertDenied(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD,
+                ACCESS_COARSE_LOCATION);
+        assertDenied(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD,
+                ACCESS_BACKGROUND_LOCATION);
+        uninstallApp();
+    }
+
+    @Test
+    public void testNoRepromptWhenUserFixed() throws Throwable {
+        // If a permission has been USER_FIXED to not granted, then revoking the permission group
+        // should leave the USER_FIXED flag.
+        installApp();
+        grantPermission(APP_PKG_NAME, ACCESS_FINE_LOCATION);
+        setPermissionFlags(APP_PKG_NAME, ACCESS_BACKGROUND_LOCATION, FLAG_PERMISSION_USER_FIXED,
+                FLAG_PERMISSION_USER_FIXED);
+        revokePermission(ACCESS_FINE_LOCATION);
+        placeAppInBackground();
+        assertDenied(ONE_TIME_TIMEOUT_MILLIS + ONE_TIME_TIMER_UPPER_GRACE_PERIOD,
+                ACCESS_FINE_LOCATION);
+        int flags = getPermissionFlags(APP_PKG_NAME, ACCESS_BACKGROUND_LOCATION);
+        assertEquals(FLAG_PERMISSION_USER_FIXED, flags & FLAG_PERMISSION_USER_FIXED);
+        uninstallApp();
+    }
+
+
+    private void installApp() {
+        runShellCommand("pm install -r " + APK);
+    }
+
+    private void keepAppInForeground(long timeoutMillis) {
+        new Thread(() -> {
+            long start = System.currentTimeMillis();
+            while (System.currentTimeMillis() < start + timeoutMillis) {
+                runWithShellPermissionIdentity(() -> {
+                    if (mActivityManager.getPackageImportance(APP_PKG_NAME)
+                            > IMPORTANCE_FOREGROUND) {
+                        runShellCommand("am start-activity -W -n " + APP_PKG_NAME
+                                + "/.RevokePermission");
+                    }
+                });
+                try {
+                    Thread.sleep(100);
+                } catch (InterruptedException e) {
+                }
+            }
+        }).start();
+    }
+
+    private void placeAppInBackground() {
+        boolean[] hasExited = {false};
+        try {
+            new Thread(() -> {
+                while (!hasExited[0]) {
+                    mUiDevice.pressHome();
+                    mUiDevice.pressBack();
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                    }
+                }
+            }).start();
+            eventually(() -> {
+                runWithShellPermissionIdentity(() -> {
+                    if (mActivityManager.getPackageImportance(APP_PKG_NAME)
+                            <= IMPORTANCE_FOREGROUND) {
+                        throw new AssertionError("Unable to exit application");
+                    }
+                });
+            });
+        } finally {
+            hasExited[0] = true;
+        }
+    }
+
+    /**
+     * Start the app. The app will revoke the permission.
+     */
+    private void revokePermission(String permName) {
+        revokePermissions(new String[] { permName });
+    }
+
+    private void revokePermissions(String[] permissions) {
+        runShellCommand("am start-activity -W -n " + APP_PKG_NAME  + "/.RevokePermission"
+                + " --esa permissions " + String.join(",", permissions));
+    }
+
+    private void killApp() {
+        runShellCommand("am force-stop " + APP_PKG_NAME);
+    }
+
+    private void assertGrantedState(String s, String permissionName, int permissionGranted,
+            long timeoutMillis) {
+        eventually(() -> Assert.assertEquals(s, permissionGranted,
+                mContext.getPackageManager().checkPermission(permissionName, APP_PKG_NAME)),
+                timeoutMillis);
+    }
+
+    private void assertGranted(long timeoutMillis, String permissionName) {
+        assertGrantedState("Permission was never granted", permissionName,
+                PackageManager.PERMISSION_GRANTED, timeoutMillis);
+    }
+
+    private void assertDenied(long timeoutMillis, String permissionName) {
+        assertGrantedState("Permission was never revoked", permissionName,
+                PackageManager.PERMISSION_DENIED, timeoutMillis);
+    }
+
+    private void waitUntilPermissionRevoked(long timeoutMillis, String permName) throws Throwable {
+        try {
+            eventually(() -> {
+                PackageInfo appInfo = mContext.getPackageManager().getPackageInfo(APP_PKG_NAME,
+                        GET_PERMISSIONS);
+
+                for (int i = 0; i < appInfo.requestedPermissions.length; i++) {
+                    if (appInfo.requestedPermissions[i].equals(permName)
+                            && (
+                            (appInfo.requestedPermissionsFlags[i] & REQUESTED_PERMISSION_GRANTED)
+                                    == 0)) {
+                        return;
+                    }
+                }
+
+                fail(permName + " not revoked");
+            }, timeoutMillis);
+        } catch (RuntimeException e) {
+            throw e.getCause();
+        }
+    }
+}
diff --git a/tests/tests/permission/src/android/permission/cts/SdkSandboxPermissionTest.java b/tests/tests/permission/src/android/permission/cts/SdkSandboxPermissionTest.java
new file mode 100644
index 0000000..88fcaec
--- /dev/null
+++ b/tests/tests/permission/src/android/permission/cts/SdkSandboxPermissionTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2022 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 android.permission.cts;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Process;
+import android.platform.test.annotations.AppModeFull;
+
+import androidx.test.filters.SdkSuppress;
+import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for permission handling for sdk sandbox uid range.
+ */
+@AppModeFull(reason = "Instant apps can't access PermissionManager")
+@RunWith(AndroidJUnit4ClassRunner.class)
+public class SdkSandboxPermissionTest {
+
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSdkSandboxHasInternetPermission() throws Exception {
+        final Context ctx = getInstrumentation().getContext();
+        int ret = ctx.checkPermission(
+                Manifest.permission.INTERNET,
+                /* pid= */ -1 /* invalid pid */,
+                Process.toSdkSandboxUid(19999));
+        assertThat(ret).isEqualTo(PackageManager.PERMISSION_GRANTED);
+    }
+
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSdkSandboxDoesNotHaveFineLocationPermission() throws Exception {
+        final Context ctx = getInstrumentation().getContext();
+        int ret = ctx.checkPermission(
+                Manifest.permission.ACCESS_FINE_LOCATION,
+                /* pid= */ -1 /* invalid pid */,
+                Process.toSdkSandboxUid(19999));
+        assertThat(ret).isEqualTo(PackageManager.PERMISSION_DENIED);
+    }
+}
diff --git a/tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java b/tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java
index 0016704..036f47f 100755
--- a/tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java
+++ b/tests/tests/permission/src/android/permission/cts/SplitPermissionsSystemTest.java
@@ -24,9 +24,14 @@
 import static android.Manifest.permission.BLUETOOTH_ADMIN;
 import static android.Manifest.permission.BLUETOOTH_CONNECT;
 import static android.Manifest.permission.BLUETOOTH_SCAN;
+import static android.Manifest.permission.BODY_SENSORS;
+import static android.Manifest.permission.BODY_SENSORS_BACKGROUND;
 import static android.Manifest.permission.READ_CALL_LOG;
 import static android.Manifest.permission.READ_CONTACTS;
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
+import static android.Manifest.permission.READ_MEDIA_AUDIO;
+import static android.Manifest.permission.READ_MEDIA_IMAGES;
+import static android.Manifest.permission.READ_MEDIA_VIDEO;
 import static android.Manifest.permission.READ_PHONE_STATE;
 import static android.Manifest.permission.READ_PRIVILEGED_PHONE_STATE;
 import static android.Manifest.permission.WRITE_CALL_LOG;
@@ -100,7 +105,17 @@
                     }
                     break;
                 case WRITE_EXTERNAL_STORAGE:
-                    assertSplit(split, NO_TARGET, READ_EXTERNAL_STORAGE);
+                    if (newPermissions.contains(READ_EXTERNAL_STORAGE)) {
+                        assertSplit(split, NO_TARGET, READ_EXTERNAL_STORAGE);
+                    } else if (newPermissions.contains(ACCESS_MEDIA_LOCATION)) {
+                        assertSplit(split, Build.VERSION_CODES.Q, ACCESS_MEDIA_LOCATION);
+                    } else if (newPermissions.contains(READ_MEDIA_AUDIO)) {
+                        assertSplit(split, Build.VERSION_CODES.S_V2 + 1, READ_MEDIA_AUDIO);
+                    } else if (newPermissions.contains(READ_MEDIA_VIDEO)) {
+                        assertSplit(split, Build.VERSION_CODES.S_V2 + 1, READ_MEDIA_VIDEO);
+                    } else if (newPermissions.contains(READ_MEDIA_IMAGES)) {
+                        assertSplit(split, Build.VERSION_CODES.S_V2 + 1, READ_MEDIA_IMAGES);
+                    }
                     break;
                 case READ_CONTACTS:
                     assertSplit(split, Build.VERSION_CODES.JELLY_BEAN, READ_CALL_LOG);
@@ -112,7 +127,15 @@
                     assertSplit(split, Build.VERSION_CODES.Q, ACCESS_BACKGROUND_LOCATION);
                     break;
                 case READ_EXTERNAL_STORAGE:
-                    assertSplit(split, Build.VERSION_CODES.Q, ACCESS_MEDIA_LOCATION);
+                    if (newPermissions.contains(ACCESS_MEDIA_LOCATION)) {
+                        assertSplit(split, Build.VERSION_CODES.Q, ACCESS_MEDIA_LOCATION);
+                    } else if (newPermissions.contains(READ_MEDIA_AUDIO)) {
+                        assertSplit(split, Build.VERSION_CODES.S_V2 + 1, READ_MEDIA_AUDIO);
+                    } else if (newPermissions.contains(READ_MEDIA_VIDEO)) {
+                        assertSplit(split, Build.VERSION_CODES.S_V2 + 1, READ_MEDIA_VIDEO);
+                    } else if (newPermissions.contains(READ_MEDIA_IMAGES)) {
+                        assertSplit(split, Build.VERSION_CODES.S_V2 + 1, READ_MEDIA_IMAGES);
+                    }
                     break;
                 case READ_PRIVILEGED_PHONE_STATE:
                     assertSplit(split, NO_TARGET, READ_PHONE_STATE);
@@ -125,10 +148,13 @@
                     // STOPSHIP(b/184180558): replace with "S" once SDK is finalized
                     assertSplit(split, Build.VERSION_CODES.R + 1, BLUETOOTH, BLUETOOTH_ADMIN);
                     break;
+                case BODY_SENSORS:
+                    // STOPSHIP(b/212583342): replace with "T" once SDK is finalized
+                    assertSplit(split, Build.VERSION_CODES.S_V2 + 1, BODY_SENSORS_BACKGROUND);
             }
         }
 
-        assertEquals(13, seenSplits.size());
+        assertEquals(21, seenSplits.size());
     }
 
     private void assertSplit(SplitPermissionInfo split, int targetSdk, String... permission) {
diff --git a/tests/tests/permission/telephony/AndroidTest.xml b/tests/tests/permission/telephony/AndroidTest.xml
index cdf5ff1..3a8dc5e 100644
--- a/tests/tests/permission/telephony/AndroidTest.xml
+++ b/tests/tests/permission/telephony/AndroidTest.xml
@@ -21,6 +21,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
 
     <!-- Install main test suite apk -->
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
diff --git a/tests/tests/permission2/AndroidTest.xml b/tests/tests/permission2/AndroidTest.xml
index cc1bc7f..54ea94b 100644
--- a/tests/tests/permission2/AndroidTest.xml
+++ b/tests/tests/permission2/AndroidTest.xml
@@ -20,6 +20,7 @@
 
     <option name="config-descriptor:metadata" key="component" value="framework" />
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user"/>
     <option name="config-descriptor:metadata" key="token" value="SIM_CARD" />
diff --git a/tests/tests/permission2/res/raw/android_manifest.xml b/tests/tests/permission2/res/raw/android_manifest.xml
index fcc2c15..bd516b3 100644
--- a/tests/tests/permission2/res/raw/android_manifest.xml
+++ b/tests/tests/permission2/res/raw/android_manifest.xml
@@ -55,6 +55,7 @@
     <protected-broadcast android:name="android.intent.action.PACKAGE_VERIFIED" />
     <protected-broadcast android:name="android.intent.action.PACKAGES_SUSPENDED" />
     <protected-broadcast android:name="android.intent.action.PACKAGES_UNSUSPENDED" />
+    <protected-broadcast android:name="android.intent.action.PACKAGES_SUSPENSION_CHANGED" />
     <protected-broadcast android:name="android.intent.action.PACKAGE_UNSUSPENDED_MANUALLY" />
     <protected-broadcast android:name="android.intent.action.DISTRACTING_PACKAGES_CHANGED" />
     <protected-broadcast android:name="android.intent.action.ACTION_PREFERRED_ACTIVITY_CHANGED" />
@@ -63,6 +64,7 @@
     <protected-broadcast android:name="android.intent.action.CONFIGURATION_CHANGED" />
     <protected-broadcast android:name="android.intent.action.SPLIT_CONFIGURATION_CHANGED" />
     <protected-broadcast android:name="android.intent.action.LOCALE_CHANGED" />
+    <protected-broadcast android:name="android.intent.action.APPLICATION_LOCALE_CHANGED" />
     <protected-broadcast android:name="android.intent.action.BATTERY_CHANGED" />
     <protected-broadcast android:name="android.intent.action.BATTERY_LEVEL_CHANGED" />
     <protected-broadcast android:name="android.intent.action.BATTERY_LOW" />
@@ -105,6 +107,7 @@
     <protected-broadcast android:name="android.os.action.POWER_SAVE_WHITELIST_CHANGED" />
     <protected-broadcast android:name="android.os.action.POWER_SAVE_TEMP_WHITELIST_CHANGED" />
     <protected-broadcast android:name="android.os.action.POWER_SAVE_MODE_CHANGED_INTERNAL" />
+    <protected-broadcast android:name="android.os.action.LOW_POWER_STANDBY_ENABLED_CHANGED" />
     <protected-broadcast android:name="android.os.action.ENHANCED_DISCHARGE_PREDICTION_CHANGED" />
 
     <!-- @deprecated This is rarely used and will be phased out soon. -->
@@ -201,6 +204,11 @@
         android:name="android.bluetooth.hearingaid.profile.action.PLAYING_STATE_CHANGED" />
     <protected-broadcast
         android:name="android.bluetooth.hearingaid.profile.action.ACTIVE_DEVICE_CHANGED" />
+    <protected-broadcast android:name="android.bluetooth.action.CSIS_CONNECTION_STATE_CHANGED" />
+    <protected-broadcast android:name="android.bluetooth.action.CSIS_DEVICE_AVAILABLE" />
+    <protected-broadcast android:name="android.bluetooth.action.CSIS_SET_MEMBER_AVAILABLE" />
+    <protected-broadcast
+        android:name="android.bluetooth.volume-control.profile.action.CONNECTION_STATE_CHANGED" />
     <protected-broadcast
         android:name="android.bluetooth.a2dp.profile.action.CONNECTION_STATE_CHANGED" />
     <protected-broadcast
@@ -247,6 +255,11 @@
         android:name="com.android.bluetooth.BluetoothMapContentObserver.action.MESSAGE_DELIVERY" />
     <protected-broadcast
         android:name="android.bluetooth.pan.profile.action.CONNECTION_STATE_CHANGED" />
+    <protected-broadcast android:name="android.bluetooth.action.LE_AUDIO_CONNECTION_STATE_CHANGED" />
+    <protected-broadcast android:name="android.bluetooth.action.LE_AUDIO_ACTIVE_DEVICE_CHANGED" />
+    <protected-broadcast android:name="android.bluetooth.action.LE_AUDIO_CONF_CHANGED" />
+    <protected-broadcast android:name="android.bluetooth.action.LE_AUDIO_GROUP_NODE_STATUS_CHANGED" />
+    <protected-broadcast android:name="android.bluetooth.action.LE_AUDIO_GROUP_STATUS_CHANGED" />
     <protected-broadcast
         android:name="android.bluetooth.action.TETHERING_STATE_CHANGED" />
     <protected-broadcast android:name="android.bluetooth.pbap.profile.action.CONNECTION_STATE_CHANGED" />
@@ -550,6 +563,8 @@
     <protected-broadcast android:name="com.android.server.telecom.intent.action.CALLS_ADD_ENTRY" />
     <protected-broadcast android:name="com.android.settings.location.MODE_CHANGING" />
     <protected-broadcast android:name="com.android.settings.bluetooth.ACTION_DISMISS_PAIRING" />
+    <protected-broadcast android:name="com.android.settings.network.DELETE_SUBSCRIPTION" />
+    <protected-broadcast android:name="com.android.settings.network.SWITCH_TO_SUBSCRIPTION" />
     <protected-broadcast android:name="com.android.settings.wifi.action.NETWORK_REQUEST" />
 
     <protected-broadcast android:name="NotificationManagerService.TIMEOUT" />
@@ -616,7 +631,11 @@
 
     <protected-broadcast android:name="com.android.server.fingerprint.ACTION_LOCKOUT_RESET" />
     <protected-broadcast android:name="android.net.wifi.PASSPOINT_ICON_RECEIVED" />
+
     <protected-broadcast android:name="com.android.server.notification.CountdownConditionProvider" />
+    <protected-broadcast android:name="android.server.notification.action.ENABLE_NAS" />
+    <protected-broadcast android:name="android.server.notification.action.DISABLE_NAS" />
+    <protected-broadcast android:name="android.server.notification.action.LEARNMORE_NAS" />
 
     <protected-broadcast android:name="com.android.internal.location.ALARM_WAKEUP" />
     <protected-broadcast android:name="com.android.internal.location.ALARM_TIMEOUT" />
@@ -693,8 +712,96 @@
     <!-- Added in S -->
     <protected-broadcast android:name="android.scheduling.action.REBOOT_READY" />
     <protected-broadcast android:name="android.app.action.DEVICE_POLICY_CONSTANTS_CHANGED" />
-
     <protected-broadcast android:name="android.app.action.SCHEDULE_EXACT_ALARM_PERMISSION_STATE_CHANGED" />
+    <protected-broadcast android:name="android.app.action.SHOW_NEW_USER_DISCLAIMER" />
+
+    <!-- Moved from packages/services/Telephony in T -->
+    <protected-broadcast android:name="android.telecom.action.CURRENT_TTY_MODE_CHANGED" />
+    <protected-broadcast android:name="android.intent.action.SERVICE_STATE" />
+    <protected-broadcast android:name="android.intent.action.RADIO_TECHNOLOGY" />
+    <protected-broadcast android:name="android.intent.action.EMERGENCY_CALLBACK_MODE_CHANGED" />
+    <protected-broadcast android:name="android.intent.action.EMERGENCY_CALL_STATE_CHANGED" />
+    <protected-broadcast android:name="android.intent.action.SIG_STR" />
+    <protected-broadcast android:name="android.intent.action.ANY_DATA_STATE" />
+    <protected-broadcast android:name="android.intent.action.DATA_STALL_DETECTED" />
+    <protected-broadcast android:name="android.intent.action.SIM_STATE_CHANGED" />
+    <protected-broadcast android:name="android.intent.action.USER_ACTIVITY_NOTIFICATION" />
+    <protected-broadcast android:name="android.telephony.action.SHOW_NOTICE_ECM_BLOCK_OTHERS" />
+    <protected-broadcast android:name="android.intent.action.ACTION_MDN_STATE_CHANGED" />
+    <protected-broadcast android:name="android.telephony.action.SERVICE_PROVIDERS_UPDATED" />
+    <protected-broadcast android:name="android.provider.Telephony.SIM_FULL" />
+    <protected-broadcast android:name="com.android.internal.telephony.carrier_key_download_alarm" />
+    <protected-broadcast android:name="com.android.internal.telephony.data-restart-trysetup" />
+    <protected-broadcast android:name="com.android.internal.telephony.data-stall" />
+    <protected-broadcast android:name="com.android.internal.telephony.provisioning_apn_alarm" />
+    <protected-broadcast android:name="android.intent.action.DATA_SMS_RECEIVED" />
+    <protected-broadcast android:name="android.provider.Telephony.SMS_RECEIVED" />
+    <protected-broadcast android:name="android.provider.Telephony.SMS_DELIVER" />
+    <protected-broadcast android:name="android.provider.Telephony.SMS_REJECTED" />
+    <protected-broadcast android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
+    <protected-broadcast android:name="android.provider.Telephony.WAP_PUSH_RECEIVED" />
+    <protected-broadcast android:name="android.provider.Telephony.SMS_CB_RECEIVED" />
+    <protected-broadcast android:name="android.provider.action.SMS_EMERGENCY_CB_RECEIVED" />
+    <protected-broadcast android:name="android.provider.Telephony.SMS_SERVICE_CATEGORY_PROGRAM_DATA_RECEIVED" />
+    <protected-broadcast android:name="android.provider.Telephony.SECRET_CODE" />
+    <protected-broadcast android:name="com.android.internal.stk.command" />
+    <protected-broadcast android:name="com.android.internal.stk.session_end" />
+    <protected-broadcast android:name="com.android.internal.stk.icc_status_change" />
+    <protected-broadcast android:name="com.android.internal.stk.alpha_notify" />
+    <protected-broadcast android:name="com.android.internal.telephony.CARRIER_SIGNAL_REDIRECTED" />
+    <protected-broadcast android:name="com.android.internal.telephony.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED" />
+    <protected-broadcast android:name="com.android.internal.telephony.CARRIER_SIGNAL_PCO_VALUE" />
+    <protected-broadcast android:name="com.android.internal.telephony.CARRIER_SIGNAL_RESET" />
+    <protected-broadcast android:name="com.android.internal.telephony.CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE" />
+    <protected-broadcast android:name="com.android.internal.telephony.PROVISION" />
+    <protected-broadcast android:name="com.android.internal.telephony.ACTION_LINE1_NUMBER_ERROR_DETECTED" />
+    <protected-broadcast android:name="com.android.internal.provider.action.VOICEMAIL_SMS_RECEIVED" />
+    <protected-broadcast android:name="com.android.intent.isim_refresh" />
+    <protected-broadcast android:name="com.android.ims.ACTION_RCS_SERVICE_AVAILABLE" />
+    <protected-broadcast android:name="com.android.ims.ACTION_RCS_SERVICE_UNAVAILABLE" />
+    <protected-broadcast android:name="com.android.ims.ACTION_RCS_SERVICE_DIED" />
+    <protected-broadcast android:name="com.android.ims.ACTION_PRESENCE_CHANGED" />
+    <protected-broadcast android:name="com.android.ims.ACTION_PUBLISH_STATUS_CHANGED" />
+    <protected-broadcast android:name="com.android.ims.IMS_SERVICE_UP" />
+    <protected-broadcast android:name="com.android.ims.IMS_SERVICE_DOWN" />
+    <protected-broadcast android:name="com.android.ims.IMS_INCOMING_CALL" />
+    <protected-broadcast android:name="com.android.ims.internal.uce.UCE_SERVICE_UP" />
+    <protected-broadcast android:name="com.android.ims.internal.uce.UCE_SERVICE_DOWN" />
+    <protected-broadcast android:name="com.android.imsconnection.DISCONNECTED" />
+    <protected-broadcast android:name="com.android.intent.action.IMS_FEATURE_CHANGED" />
+    <protected-broadcast android:name="com.android.intent.action.IMS_CONFIG_CHANGED" />
+    <protected-broadcast android:name="android.telephony.ims.action.WFC_IMS_REGISTRATION_ERROR" />
+    <protected-broadcast android:name="com.android.phone.vvm.omtp.sms.REQUEST_SENT" />
+    <protected-broadcast android:name="com.android.phone.vvm.ACTION_VISUAL_VOICEMAIL_SERVICE_EVENT" />
+    <protected-broadcast android:name="com.android.internal.telephony.CARRIER_VVM_PACKAGE_INSTALLED" />
+    <protected-broadcast android:name="com.android.cellbroadcastreceiver.GET_LATEST_CB_AREA_INFO" />
+    <protected-broadcast android:name="com.android.internal.telephony.ACTION_CARRIER_CERTIFICATE_DOWNLOAD" />
+    <protected-broadcast android:name="com.android.internal.telephony.action.COUNTRY_OVERRIDE" />
+    <protected-broadcast android:name="com.android.internal.telephony.OPEN_DEFAULT_SMS_APP" />
+    <protected-broadcast android:name="com.android.internal.telephony.ACTION_TEST_OVERRIDE_CARRIER_ID" />
+    <protected-broadcast android:name="android.telephony.action.SIM_CARD_STATE_CHANGED" />
+    <protected-broadcast android:name="android.telephony.action.SIM_APPLICATION_STATE_CHANGED" />
+    <protected-broadcast android:name="android.telephony.action.SIM_SLOT_STATUS_CHANGED" />
+    <protected-broadcast android:name="android.telephony.action.SUBSCRIPTION_CARRIER_IDENTITY_CHANGED" />
+    <protected-broadcast android:name="android.telephony.action.SUBSCRIPTION_SPECIFIC_CARRIER_IDENTITY_CHANGED" />
+    <protected-broadcast android:name="android.telephony.action.TOGGLE_PROVISION" />
+    <protected-broadcast android:name="android.telephony.action.NETWORK_COUNTRY_CHANGED" />
+    <protected-broadcast android:name="android.telephony.action.PRIMARY_SUBSCRIPTION_LIST_CHANGED" />
+    <protected-broadcast android:name="android.telephony.action.MULTI_SIM_CONFIG_CHANGED" />
+    <protected-broadcast android:name="android.telephony.action.CARRIER_SIGNAL_RESET" />
+    <protected-broadcast android:name="android.telephony.action.CARRIER_SIGNAL_PCO_VALUE" />
+    <protected-broadcast android:name="android.telephony.action.CARRIER_SIGNAL_DEFAULT_NETWORK_AVAILABLE" />
+    <protected-broadcast android:name="android.telephony.action.CARRIER_SIGNAL_REDIRECTED" />
+    <protected-broadcast android:name="android.telephony.action.CARRIER_SIGNAL_REQUEST_NETWORK_FAILED" />
+    <protected-broadcast android:name="com.android.phone.settings.CARRIER_PROVISIONING" />
+    <protected-broadcast android:name="com.android.phone.settings.TRIGGER_CARRIER_PROVISIONING" />
+    <protected-broadcast android:name="android.telephony.action.ANOMALY_REPORTED" />
+    <protected-broadcast android:name="android.intent.action.SUBSCRIPTION_INFO_RECORD_ADDED" />
+    <protected-broadcast android:name="android.intent.action.ACTION_MANAGED_ROAMING_IND" />
+    <protected-broadcast android:name="android.telephony.ims.action.RCS_SINGLE_REGISTRATION_CAPABILITY_UPDATE" />
+
+    <!-- Added in T -->
+    <protected-broadcast android:name="android.app.action.LOST_MODE_LOCATION_UPDATE" />
 
     <!-- ====================================================================== -->
     <!--                          RUNTIME PERMISSIONS                           -->
@@ -738,7 +845,16 @@
         android:permissionGroup="android.permission-group.UNDEFINED"
         android:label="@string/permlab_writeContacts"
         android:description="@string/permdesc_writeContacts"
-        android:protectionLevel="dangerous" />
+      android:protectionLevel="dangerous" />
+
+    <!-- Allows an application to set default account for new contacts.
+        <p> This permission is only granted to system applications fulfilling the Contacts app role.
+        <p>Protection level: internal|role
+        @SystemApi
+        @hide
+    -->
+    <permission android:name="android.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS"
+        android:protectionLevel="internal|role" />
 
     <!-- ====================================================================== -->
     <!-- Permissions for accessing user's calendar                              -->
@@ -943,6 +1059,61 @@
         android:permissionFlags="softRestricted|immutablyRestricted"
         android:protectionLevel="dangerous" />
 
+    <!-- Required to be able to read audio files from shared storage.
+     <p>Protection level: dangerous -->
+    <permission-group android:name="android.permission-group.READ_MEDIA_AURAL"
+                      android:icon="@drawable/perm_group_read_media_aural"
+                      android:label="@string/permgrouplab_readMediaAural"
+                      android:description="@string/permgroupdesc_readMediaAural"
+                      android:priority="950" />
+
+    <!-- Allows an application to read audio files from external storage.
+      <p>This permission is enforced starting in API level
+      {@link android.os.Build.VERSION_CODES#TIRAMISU}.
+      For apps with a <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code
+      targetSdkVersion}</a> of {@link android.os.Build.VERSION_CODES#S} or lower, this permission
+      must not be used and the READ_EXTERNAL_STORAGE permission must be used instead.
+     <p>Protection level: dangerous -->
+    <permission android:name="android.permission.READ_MEDIA_AUDIO"
+                android:permissionGroup="android.permission-group.UNDEFINED"
+                android:label="@string/permlab_readMediaAudio"
+                android:description="@string/permdesc_readMediaAudio"
+                android:protectionLevel="dangerous" />
+
+    <!-- Required to be able to read image and video files from shared storage.
+     <p>Protection level: dangerous -->
+    <permission-group android:name="android.permission-group.READ_MEDIA_VISUAL"
+                      android:icon="@drawable/perm_group_read_media_visual"
+                      android:label="@string/permgrouplab_readMediaVisual"
+                      android:description="@string/permgroupdesc_readMediaVisual"
+                      android:priority="1000" />
+
+    <!-- Allows an application to read audio files from external storage.
+    <p>This permission is enforced starting in API level
+    {@link android.os.Build.VERSION_CODES#TIRAMISU}.
+    For apps with a <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code
+    targetSdkVersion}</a> of {@link android.os.Build.VERSION_CODES#S} or lower, this permission
+    must not be used and the READ_EXTERNAL_STORAGE permission must be used instead.
+   <p>Protection level: dangerous -->
+    <permission android:name="android.permission.READ_MEDIA_VIDEO"
+                android:permissionGroup="android.permission-group.UNDEFINED"
+                android:label="@string/permlab_readMediaVideo"
+                android:description="@string/permdesc_readMediaVideo"
+                android:protectionLevel="dangerous" />
+
+    <!-- Allows an application to read image files from external storage.
+      <p>This permission is enforced starting in API level
+      {@link android.os.Build.VERSION_CODES#TIRAMISU}.
+      For apps with a <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code
+      targetSdkVersion}</a> of {@link android.os.Build.VERSION_CODES#S} or lower, this permission
+      must not be used and the READ_EXTERNAL_STORAGE permission must be used instead.
+     <p>Protection level: dangerous -->
+    <permission android:name="android.permission.READ_MEDIA_IMAGES"
+                android:permissionGroup="android.permission-group.UNDEFINED"
+                android:label="@string/permlab_readMediaImage"
+                android:description="@string/permdesc_readMediaImage"
+                android:protectionLevel="dangerous" />
+
     <!-- Allows an application to write to external storage.
          <p class="note"><strong>Note:</strong> If <em>both</em> your <a
          href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code
@@ -1056,6 +1227,15 @@
         android:description="@string/permdesc_accessBackgroundLocation"
         android:protectionLevel="dangerous|instant" />
 
+    <!-- Allows an application (emergency or advanced driver-assistance app) to bypass
+    location settings.
+         <p>Not for use by third-party applications.
+         @SystemApi
+         @hide
+    -->
+    <permission android:name="android.permission.LOCATION_BYPASS"
+                android:protectionLevel="signature|privileged"/>
+
     <!-- ====================================================================== -->
     <!-- Permissions for accessing the call log                                 -->
     <!-- ====================================================================== -->
@@ -1451,10 +1631,28 @@
          measure what is happening inside their body, such as heart rate.
          <p>Protection level: dangerous -->
     <permission android:name="android.permission.BODY_SENSORS"
-        android:permissionGroup="android.permission-group.UNDEFINED"
-        android:label="@string/permlab_bodySensors"
-        android:description="@string/permdesc_bodySensors"
-        android:protectionLevel="dangerous" />
+                android:permissionGroup="android.permission-group.UNDEFINED"
+                android:label="@string/permlab_bodySensors"
+                android:description="@string/permdesc_bodySensors"
+                android:backgroundPermission="android.permission.BODY_SENSORS_BACKGROUND"
+                android:protectionLevel="dangerous" />
+
+    <!-- Allows an application to access data from sensors that the user uses to measure what is
+         happening inside their body, such as heart rate. If you're requesting this permission, you
+         must also request {@link #BODY_SENSORS}. Requesting this permission by itself doesn't give
+         you Body sensors access.
+         <p>Protection level: dangerous
+
+         <p> This is a hard restricted permission which cannot be held by an app until
+         the installer on record allowlists the permission. For more details see
+         {@link android.content.pm.PackageInstaller.SessionParams#setWhitelistedRestrictedPermissions(Set)}.
+    -->
+    <permission android:name="android.permission.BODY_SENSORS_BACKGROUND"
+                android:permissionGroup="android.permission-group.UNDEFINED"
+                android:label="@string/permlab_bodySensors_background"
+                android:description="@string/permdesc_bodySensors_background"
+                android:protectionLevel="dangerous"
+                android:permissionFlags="hardRestricted" />
 
     <!-- Allows an app to use fingerprint hardware.
          <p>Protection level: normal
@@ -1476,6 +1674,28 @@
         android:description="@string/permdesc_useBiometric"
         android:protectionLevel="normal" />
 
+   <!-- ======================================================================= -->
+    <!-- Permissions for posting notifications                                  -->
+    <!-- ====================================================================== -->
+    <eat-comment />
+
+    <!-- Used for permissions that are associated with posting notifications
+    -->
+    <permission-group android:name="android.permission-group.NOTIFICATIONS"
+          android:icon="@drawable/ic_notifications_alerted"
+          android:label="@string/permgrouplab_notifications"
+          android:description="@string/permgroupdesc_notifications"
+          android:priority="850" />
+
+    <!-- Allows an app to post notifications
+         <p>Protection level: dangerous
+    -->
+    <permission android:name="android.permission.POST_NOTIFICATIONS"
+                android:permissionGroup="android.permission-group.UNDEFINED"
+                android:label="@string/permlab_postNotification"
+                android:description="@string/permdesc_postNotification"
+                android:protectionLevel="dangerous|instant" />
+
     <!-- ====================================================================== -->
     <!-- REMOVED PERMISSIONS                                                    -->
     <!-- ====================================================================== -->
@@ -1702,6 +1922,13 @@
     <permission android:name="android.permission.ACCESS_MOCK_LOCATION"
         android:protectionLevel="signature" />
 
+    <!-- @SystemApi @hide Allows automotive applications to control location
+         suspend state for power management use cases.
+         <p>Not for use by third-party applications.
+    -->
+    <permission android:name="android.permission.CONTROL_AUTOMOTIVE_GNSS"
+        android:protectionLevel="signature|privileged" />
+
     <!-- ======================================= -->
     <!-- Permissions for accessing networks -->
     <!-- ======================================= -->
@@ -1739,6 +1966,23 @@
         android:label="@string/permlab_changeWifiState"
         android:protectionLevel="normal" />
 
+    <!-- This permission is used to let OEMs grant their trusted app access to a subset of
+     privileged wifi APIs to improve wifi performance. Allows applications to manage
+     Wi-Fi network selection related features such as enable or disable global auto-join,
+     modify connectivity scan intervals, and approve Wi-Fi Direct connections.
+     <p>Not for use by third-party applications. -->
+    <permission android:name="android.permission.MANAGE_WIFI_NETWORK_SELECTION"
+                android:protectionLevel="signature|privileged|knownSigner"
+                android:knownCerts="@array/wifi_known_signers" />
+
+    <!-- Allows applications to get notified when a Wi-Fi interface request cannot
+         be satisfied without tearing down one or more other interfaces, and provide a decision
+         whether to approve the request or reject it.
+         <p>Not for use by third-party applications. -->
+    <permission android:name="android.permission.MANAGE_WIFI_INTERFACES"
+                android:protectionLevel="signature|privileged|knownSigner"
+                android:knownCerts="@array/wifi_known_signers" />
+
     <!-- @SystemApi @hide Allows apps to create and manage IPsec tunnels.
          <p>Only granted to applications that are currently bound by the
          system for creating and managing IPsec-based interfaces.
@@ -1770,12 +2014,13 @@
     <permission android:name="android.permission.RECEIVE_WIFI_CREDENTIAL_CHANGE"
         android:protectionLevel="signature|privileged" />
 
-    <!-- @SystemApi @hide Allows an application to modify any wifi configuration, even if created
+    <!-- Allows an application to modify any wifi configuration, even if created
      by another application. Once reconfigured the original creator cannot make any further
      modifications.
      <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.OVERRIDE_WIFI_CONFIG"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|knownSigner"
+                android:knownCerts="@array/wifi_known_signers"  />
 
     <!-- Allows applications to act as network scorers. @hide @SystemApi-->
     <permission android:name="android.permission.SCORE_NETWORKS"
@@ -1851,7 +2096,7 @@
          @hide This should only be used by ManagedProvisioning app.
     -->
     <permission android:name="android.permission.NETWORK_MANAGED_PROVISIONING"
-        android:protectionLevel="signature" />
+        android:protectionLevel="signature|role" />
 
     <!-- Allows Carrier Provisioning to call methods in Networking services
          <p>Not for use by any other third-party or privileged applications.
@@ -1973,10 +2218,10 @@
     <!-- Required to be able to advertise and connect to nearby devices via Wi-Fi.
          <p>Protection level: dangerous -->
     <permission android:name="android.permission.NEARBY_WIFI_DEVICES"
-        android:permissionGroup="android.permission-group.UNDEFINED"
-        android:description="@string/permdesc_nearby_wifi_devices"
-        android:label="@string/permlab_nearby_wifi_devices"
-        android:protectionLevel="dangerous" />
+                android:permissionGroup="android.permission-group.UNDEFINED"
+                android:description="@string/permdesc_nearby_wifi_devices"
+                android:label="@string/permlab_nearby_wifi_devices"
+                android:protectionLevel="dangerous" />
 
     <!-- @SystemApi @TestApi Allows an application to suspend other apps, which will prevent the
          user from using them until they are unsuspended.
@@ -2216,6 +2461,18 @@
     <permission android:name="android.permission.MANAGE_FACTORY_RESET_PROTECTION"
         android:protectionLevel="signature|privileged"/>
 
+    <!-- ======================================== -->
+    <!-- Permissions for lost mode -->
+    <!-- ======================================== -->
+    <eat-comment />
+
+    <!-- @SystemApi Allows an application to trigger lost mode on an organization-owned device.
+         <p>Not for use by third-party applications.
+         @hide
+    -->
+    <permission android:name="android.permission.TRIGGER_LOST_MODE"
+        android:protectionLevel="signature|role"/>
+
     <!-- ================================== -->
     <!-- Permissions for accessing hardware -->
     <!-- ================================== -->
@@ -2312,10 +2569,10 @@
     <permission android:name="android.permission.OEM_UNLOCK_STATE"
         android:protectionLevel="signature" />
 
-    <!-- @hide Allows querying state of PersistentDataBlock
+    <!-- @SystemApi @hide Allows querying state of PersistentDataBlock
    <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.ACCESS_PDB_STATE"
-        android:protectionLevel="signature" />
+        android:protectionLevel="signature|role" />
 
     <!-- Allows testing if a passwords is forbidden by the admins.
          @hide <p>Not for use by third-party applications. -->
@@ -2373,7 +2630,7 @@
     <!-- @SystemApi @TestApi Allows read access to privileged phone state.
          @hide Used internally. -->
     <permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|role" />
 
     <!-- Allows to read device identifiers and use ICC based authentication like EAP-AKA.
          Often required in authentication to access the carrier's server and manage services
@@ -2388,7 +2645,7 @@
     <permission android:name="android.permission.READ_ACTIVE_EMERGENCY_SESSION"
         android:protectionLevel="signature" />
 
-    <!-- Allows listen permission to always reported signal strength.
+    <!-- Allows listen permission to always reported system signal strength.
          @hide Used internally. -->
     <permission android:name="android.permission.LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH"
         android:protectionLevel="signature" />
@@ -2481,6 +2738,15 @@
     <permission android:name="android.permission.BIND_CONNECTION_SERVICE"
         android:protectionLevel="signature|privileged" />
 
+    <!-- Must be required by a
+      android.service.wallpapereffectsgeneration.WallpaperEffectsGenerationService,
+      to ensure that only the system can bind to it.
+      @SystemApi @hide This is not a third-party API (intended for OEMs and system apps).
+      <p>Protection level: signature
+    -->
+    <permission android:name="android.permission.BIND_WALLPAPER_EFFECTS_GENERATION_SERVICE"
+        android:protectionLevel="signature" />
+
     <!-- Must be required by a {@link android.telecom.ConnectionService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature|privileged
@@ -2598,7 +2864,7 @@
          third-party apps.
     -->
     <permission android:name="android.permission.MANAGE_DOCUMENTS"
-        android:protectionLevel="signature|documenter" />
+        android:protectionLevel="signature|role" />
 
     <!-- Allows an application to manage access to crates, usually as part
          of a crates picker.
@@ -2615,7 +2881,7 @@
          <p>Not for use by third-party applications.
     -->
     <permission android:name="android.permission.CACHE_CONTENT"
-        android:protectionLevel="signature|documenter" />
+        android:protectionLevel="signature|role" />
 
     <!-- @SystemApi @hide
          Allows an application to aggressively allocate disk space.
@@ -2689,25 +2955,25 @@
          user-targeted broadcasts.  This permission is not available to
          third party applications. -->
     <permission android:name="android.permission.INTERACT_ACROSS_USERS"
-        android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development|role" />
 
     <!-- @SystemApi Fuller form of {@link android.Manifest.permission#INTERACT_ACROSS_USERS}
          that removes restrictions on where broadcasts can be sent and allows other
          types of interactions
          @hide -->
     <permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"
-        android:protectionLevel="signature|installer" />
+        android:protectionLevel="signature|installer|role" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
 
     <!-- Allows interaction across profiles in the same profile group. -->
     <permission android:name="android.permission.INTERACT_ACROSS_PROFILES"
         android:protectionLevel="signature|appop" />
 
-    <!-- Allows configuring apps to have the INTERACT_ACROSS_PROFILES permission so that they can
-         interact across profiles in the same profile group.
+    <!-- @SystemApi Allows configuring apps to have the INTERACT_ACROSS_PROFILES permission so that
+         they can interact across profiles in the same profile group.
          @hide -->
     <permission android:name="android.permission.CONFIGURE_INTERACT_ACROSS_PROFILES"
-        android:protectionLevel="signature" />
+        android:protectionLevel="signature|role" />
 
     <!-- @SystemApi @hide Allows starting activities across profiles in the same profile group. -->
     <permission android:name="android.permission.START_CROSS_PROFILE_ACTIVITIES"
@@ -2728,17 +2994,31 @@
     <permission android:name="android.permission.CREATE_USERS"
         android:protectionLevel="signature" />
 
+    <!-- @SystemApi @hide Allows an application to call APIs that allow it to query users on the
+         device. -->
+    <permission android:name="android.permission.QUERY_USERS"
+                android:protectionLevel="signature|role" />
+
     <!-- Allows an application to access data blobs across users. -->
     <permission android:name="android.permission.ACCESS_BLOBS_ACROSS_USERS"
         android:protectionLevel="signature|privileged|development|role" />
 
-    <!-- @hide Allows an application to set the profile owners and the device owner.
+    <!-- @SystemApi @hide Allows an application to set the profile owners and the device owner.
          This permission is not available to third party applications.-->
     <permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS"
-        android:protectionLevel="signature"
+        android:protectionLevel="signature|role"
         android:label="@string/permlab_manageProfileAndDeviceOwners"
         android:description="@string/permdesc_manageProfileAndDeviceOwners" />
 
+    <!-- @SystemApi @hide Allows an application to query device policies set by any admin on
+         the device.-->
+    <permission android:name="android.permission.QUERY_ADMIN_POLICY"
+                android:protectionLevel="signature|role" />
+
+    <!-- @SystemApi @hide Allows an application to set a device owner on retail demo devices.-->
+    <permission android:name="android.permission.PROVISION_DEMO_DEVICE"
+                android:protectionLevel="signature|setup" />
+
     <!-- @TestApi @hide Allows an application to reset the record of previous system update freeze
          periods. -->
     <permission android:name="android.permission.CLEAR_FREEZE_PERIOD"
@@ -2749,6 +3029,11 @@
     <permission android:name="android.permission.FORCE_DEVICE_POLICY_MANAGER_LOGS"
                 android:protectionLevel="signature" />
 
+    <!-- @SystemApi Allows an application to write to the security log buffer in logd.
+         @hide -->
+    <permission android:name="android.permission.WRITE_SECURITY_LOG"
+        android:protectionLevel="signature|privileged" />
+
     <!-- Allows an application to get full detailed information about
          recently running tasks, with full fidelity to the real state.
          @hide -->
@@ -2765,7 +3050,7 @@
 
     <!-- @SystemApi @TestApi @hide Allows an application to change to remove/kill tasks -->
     <permission android:name="android.permission.REMOVE_TASKS"
-        android:protectionLevel="signature|documenter|recents" />
+        android:protectionLevel="signature|recents|role" />
 
     <!-- @deprecated Use MANAGE_ACTIVITY_TASKS instead.
          @SystemApi @TestApi @hide Allows an application to create/manage/remove stacks -->
@@ -2788,7 +3073,7 @@
 
     <!-- @SystemApi @hide Allows an application to start activities from background -->
     <permission android:name="android.permission.START_ACTIVITIES_FROM_BACKGROUND"
-        android:protectionLevel="signature|privileged|vendorPrivileged|oem|verifier" />
+        android:protectionLevel="signature|privileged|vendorPrivileged|oem|verifier|role" />
 
     <!-- Allows an application to start foreground services from the background at any time.
          <em>This permission is not for use by third-party applications</em>,
@@ -2878,7 +3163,7 @@
 
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.SYSTEM_APPLICATION_OVERLAY"
-                android:protectionLevel="signature|recents|role"/>
+                android:protectionLevel="signature|recents|role|installer"/>
 
     <!-- @deprecated Use {@link android.Manifest.permission#REQUEST_COMPANION_RUN_IN_BACKGROUND}
          @hide
@@ -2902,7 +3187,13 @@
     <permission android:name="android.permission.SET_DISPLAY_OFFSET"
         android:protectionLevel="signature|privileged" />
 
-    <!-- Allows a companion app to run in the background.
+    <!-- Allows a companion app to run in the background. This permission implies
+         {@link android.Manifest.permission#REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND},
+         and allows to start a foreground service from the background.
+         If an app does not have to run in the background, but only needs to start a foreground
+         service from the background, consider using
+         {@link android.Manifest.permission#REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND},
+         which is less powerful.
          <p>Protection level: normal
     -->
     <permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND"
@@ -2912,6 +3203,7 @@
 
     <!-- Allows a companion app to start a foreground service from the background.
          {@see android.Manifest.permission#REQUEST_COMPANION_RUN_IN_BACKGROUND}
+         <p>Protection level: normal
          -->
     <permission android:name="android.permission.REQUEST_COMPANION_START_FOREGROUND_SERVICES_FROM_BACKGROUND"
         android:protectionLevel="normal"/>
@@ -2932,6 +3224,38 @@
     <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_WATCH"
                 android:protectionLevel="normal" />
 
+    <!-- Allows application to request to be associated with a virtual display capable of streaming
+         Android applications
+         ({@link android.companion.AssociationRequest#DEVICE_PROFILE_APP_STREAMING})
+         by {@link android.companion.CompanionDeviceManager}.
+        <p>Not for use by third-party applications.
+    -->
+    <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_APP_STREAMING"
+                android:protectionLevel="signature|privileged" />
+
+    <!-- Allows application to request to be associated with a vehicle head unit capable of
+         automotive projection
+         ({@link android.companion.AssociationRequest#DEVICE_PROFILE_AUTOMOTIVE_PROJECTION})
+         by {@link android.companion.CompanionDeviceManager}.
+        <p>Not for use by third-party applications.
+    -->
+    <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_AUTOMOTIVE_PROJECTION"
+                android:protectionLevel="internal|role" />
+
+    <!-- Allows application to request to be associated with a computer to share functionality
+        and/or data with other devices, such as notifications, photos and media
+        ({@link android.companion.AssociationRequest#DEVICE_PROFILE_COMPUTER})
+        by {@link android.companion.CompanionDeviceManager}.
+       <p>Not for use by third-party applications.
+   -->
+    <permission android:name="android.permission.REQUEST_COMPANION_PROFILE_COMPUTER"
+                android:protectionLevel="signature|privileged" />
+
+    <!-- Allows an application to create a "self-managed" association.
+    -->
+    <permission android:name="android.permission.REQUEST_COMPANION_SELF_MANAGED"
+                android:protectionLevel="signature|privileged" />
+
     <!-- Allows a companion app to associate to Wi-Fi.
          <p>Only for use by a single pre-approved app.
          @hide
@@ -2948,13 +3272,11 @@
                 android:protectionLevel="signature" />
 
     <!-- Allows an app to set and release automotive projection.
-         <p>Once permissions can be granted via role-only, this needs to be changed to
-          protectionLevel="role" and added to the SYSTEM_AUTOMOTIVE_PROJECTION role.
          @hide
          @SystemApi
     -->
     <permission android:name="android.permission.TOGGLE_AUTOMOTIVE_PROJECTION"
-                android:protectionLevel="signature|privileged" />
+                android:protectionLevel="internal|role" />
 
     <!-- Allows an app to prevent non-system-overlay windows from being drawn on top of it -->
     <permission android:name="android.permission.HIDE_OVERLAY_WINDOWS"
@@ -2998,7 +3320,7 @@
     <!-- Allows applications to set the system time directly.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.SET_TIME"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|role" />
 
     <!-- Allows applications to set the system time zone directly.
          <p>Not for use by third-party applications.
@@ -3006,7 +3328,7 @@
     <permission android:name="android.permission.SET_TIME_ZONE"
         android:label="@string/permlab_setTimeZone"
         android:description="@string/permdesc_setTimeZone"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|role" />
 
     <!-- Allows telephony to suggest the time / time zone.
          <p>Not for use by third-party applications.
@@ -3120,7 +3442,7 @@
          as locale.
          <p>Protection level: signature|privileged|development -->
     <permission android:name="android.permission.CHANGE_CONFIGURATION"
-        android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development|role" />
 
     <!-- Allows an application to read or write the system settings.
 
@@ -3137,7 +3459,7 @@
     <permission android:name="android.permission.WRITE_SETTINGS"
         android:label="@string/permlab_writeSettings"
         android:description="@string/permdesc_writeSettings"
-        android:protectionLevel="signature|preinstalled|appop|pre23" />
+        android:protectionLevel="signature|preinstalled|appop|pre23|role" />
 
     <!-- Allows an application to modify the Google service map.
     <p>Not for use by third-party applications. -->
@@ -3154,6 +3476,12 @@
     <permission android:name="android.permission.READ_DEVICE_CONFIG"
         android:protectionLevel="signature|preinstalled" />
 
+    <!-- @SystemApi @hide Allows applications like settings to read system-owned
+     application-specific locale configs.
+     <p>Not for use by third-party applications. -->
+    <permission android:name="android.permission.READ_APP_SPECIFIC_LOCALES"
+                android:protectionLevel="signature" />
+
     <!-- @hide Allows an application to monitor {@link android.provider.Settings.Config} access.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.MONITOR_DEVICE_CONFIG_ACCESS"
@@ -3376,6 +3704,29 @@
     <permission android:name="android.permission.UPDATE_FONTS"
         android:protectionLevel="signature|privileged" />
 
+    <!-- Allows an application to use the AttestationVerificationService.
+         @hide -->
+    <permission android:name="android.permission.USE_ATTESTATION_VERIFICATION_SERVICE"
+                android:protectionLevel="signature" />
+
+    <!-- Allows an application to export a AttestationVerificationService to verify attestations on
+         behalf of AttestationVerificationManager for system-defined attestation profiles.
+         @hide -->
+    <permission android:name="android.permission.VERIFY_ATTESTATION"
+                android:protectionLevel="signature" />
+
+    <!-- Must be required by any AttestationVerificationService to ensure that only the system can
+         bind to it.
+         @hide -->
+    <permission android:name="android.permission.BIND_ATTESTATION_VERIFICATION_SERVICE"
+                android:protectionLevel="signature" />
+
+    <!-- Allows the caller to generate keymint keys with the INCLUDE_UNIQUE_ID tag, which
+         uniquely identifies the device via the attestation certificate.
+         @hide @TestApi -->
+    <permission android:name="android.permission.REQUEST_UNIQUE_ID_ATTESTATION"
+         android:protectionLevel="signature" />
+
     <!-- ========================================= -->
     <!-- Permissions for special development tools -->
     <!-- ========================================= -->
@@ -3384,7 +3735,7 @@
     <!-- Allows an application to read or write the secure system settings.
     <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.WRITE_SECURE_SETTINGS"
-        android:protectionLevel="signature|privileged|development" />
+        android:protectionLevel="signature|privileged|development|role|installer" />
 
     <!-- Allows an application to retrieve state dump information from system services.
     <p>Not for use by third-party applications. -->
@@ -3523,6 +3874,13 @@
     <permission android:name="android.permission.GET_APP_OPS_STATS"
         android:protectionLevel="signature|privileged|development" />
 
+    <!-- @SystemApi @hide Allows an application to collect historical application operation
+         statistics.
+         <p>Not for use by third party applications.
+    -->
+    <permission android:name="android.permission.GET_HISTORICAL_APP_OPS_STATS"
+        android:protectionLevel="internal|role" />
+
     <!-- @SystemApi Allows an application to update application operation statistics. Not for
          use by third party apps.
          @hide -->
@@ -3644,7 +4002,7 @@
          to put the higher-level system there into a shutdown state.
          @hide -->
     <permission android:name="android.permission.SHUTDOWN"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|role" />
 
     <!-- @SystemApi Allows an application to tell the activity manager to temporarily
          stop application switches, putting it into a special mode that
@@ -3662,6 +4020,13 @@
     <permission android:name="android.permission.GET_TOP_ACTIVITY_INFO"
         android:protectionLevel="signature|recents" />
 
+    <!-- @SystemApi Allows an application to set the system audio caption and its UI
+         enabled state.
+         <p>Not for use by third-party applications.
+         @hide -->
+    <permission android:name="android.permission.SET_SYSTEM_AUDIO_CAPTION"
+                android:protectionLevel="signature|role" />
+
     <!-- Allows an application to retrieve the current state of keys and
          switches.
          <p>Not for use by third-party applications.
@@ -3784,6 +4149,17 @@
         android:protectionLevel="signature" />
     <uses-permission android:name="android.permission.BIND_ROTATION_RESOLVER_SERVICE" />
 
+    <!-- @SystemApi Allows an application to access ambient context service.
+         @hide <p>Not for use by third-party applications.</p> -->
+    <permission android:name="android.permission.ACCESS_AMBIENT_CONTEXT_EVENT"
+        android:protectionLevel="internal|role"/>
+
+    <!-- @SystemApi Required by a AmbientContextEventDetectionService
+         to ensure that only the service with this permission can bind to it.
+         @hide <p>Not for use by third-party applications.</p> -->
+    <permission android:name="android.permission.BIND_AMBIENT_CONTEXT_DETECTION_SERVICE"
+        android:protectionLevel="signature"/>
+
     <!-- Must be required by a {@link android.net.VpnService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature
@@ -3798,6 +4174,15 @@
     <permission android:name="android.permission.BIND_WALLPAPER"
         android:protectionLevel="signature|privileged" />
 
+    <!-- Must be required by a game service to ensure that only the
+         system can bind to it.
+         <p>Protection level: signature
+         @SystemApi
+         @hide
+    -->
+    <permission android:name="android.permission.BIND_GAME_SERVICE"
+        android:protectionLevel="signature" />
+
     <!-- Must be required by a {@link android.service.voice.VoiceInteractionService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature
@@ -3820,6 +4205,13 @@
     <permission android:name="android.permission.MANAGE_HOTWORD_DETECTION"
                 android:protectionLevel="internal|preinstalled" />
 
+    <!-- Allows an application to subscribe to keyguard locked (i.e., showing) state.
+         <p>Protection level: internal|role
+         <p>Intended for use by ROLE_ASSISTANT only.
+    -->
+    <permission android:name="android.permission.SUBSCRIBE_TO_KEYGUARD_LOCKED_STATE"
+                android:protectionLevel="internal|role"/>
+
     <!-- Must be required by a {@link android.service.autofill.AutofillService},
          to ensure that only the system can bind to it.
          <p>Protection level: signature
@@ -3858,6 +4250,14 @@
     <permission android:name="android.permission.BIND_TEXTCLASSIFIER_SERVICE"
                 android:protectionLevel="signature" />
 
+    <!-- Must be required by a android.service.selectiontoolbar.SelectionToolbarRenderService,
+         to ensure that only the system can bind to it.
+         @hide This is not a third-party API (intended for OEMs and system apps).
+         <p>Protection level: signature
+    -->
+    <permission android:name="android.permission.BIND_SELECTION_TOOLBAR_RENDER_SERVICE"
+                android:protectionLevel="signature" />
+
     <!-- Must be required by a android.service.contentcapture.ContentCaptureService,
          to ensure that only the system can bind to it.
          @SystemApi @hide This is not a third-party API (intended for OEMs and system apps).
@@ -3937,6 +4337,13 @@
     <permission android:name="android.permission.BIND_TV_INPUT"
         android:protectionLevel="signature|privileged" />
 
+    <!-- Must be required by a {@link android.media.tv.interactive.TvInteractiveAppService}
+         to ensure that only the system can bind to it.
+         <p>Protection level: signature|privileged
+    -->
+    <permission android:name="android.permission.BIND_TV_INTERACTIVE_APP"
+                android:protectionLevel="signature|privileged" />
+
     <!-- @SystemApi
          Must be required by a {@link com.android.media.tv.remoteprovider.TvRemoteProvider}
          to ensure that only the system can bind to it.
@@ -3946,6 +4353,15 @@
     <permission android:name="android.permission.BIND_TV_REMOTE_SERVICE"
         android:protectionLevel="signature|privileged" />
 
+    <!-- @SystemApi Allows TV input apps and TV apps to use TIS extension interfaces for
+         domain-specific features.
+         <p>Protection level: signature|privileged|vendorPrivileged
+         <p>Not for use by third-party applications.
+         @hide
+    -->
+    <permission android:name="android.permission.TIS_EXTENSION_INTERFACE"
+        android:protectionLevel="signature|privileged|vendorPrivileged" />
+
     <!-- @SystemApi
          Must be required for a virtual remote controller for TV.
          <p>Protection level: signature|privileged
@@ -4015,14 +4431,13 @@
          <p>Protection level: signature
     -->
     <permission android:name="android.permission.BIND_DEVICE_ADMIN"
-        android:protectionLevel="signature" />
+        android:protectionLevel="signature|role" />
 
     <!-- @SystemApi Required to add or remove another application as a device admin.
          <p>Not for use by third-party applications.
-         @hide
-         @removed -->
+         @hide -->
     <permission android:name="android.permission.MANAGE_DEVICE_ADMINS"
-        android:protectionLevel="signature" />
+        android:protectionLevel="signature|role" />
 
     <!-- @SystemApi Allows an app to reset the device password.
          <p>Not for use by third-party applications.
@@ -4059,7 +4474,8 @@
 
     <!-- Allows low-level access to setting the keyboard layout.
          <p>Not for use by third-party applications.
-         @hide -->
+         @hide
+         @TestApi -->
     <permission android:name="android.permission.SET_KEYBOARD_LAYOUT"
         android:protectionLevel="signature" />
 
@@ -4072,12 +4488,30 @@
     <permission android:name="android.permission.SCHEDULE_PRIORITIZED_ALARM"
                 android:protectionLevel="signature|privileged"/>
 
-    <!-- Allows an app to use exact alarm scheduling APIs to perform timing
-         sensitive background work.
+    <!-- Allows applications to use exact alarm APIs.
+         <p>Exact alarms should only be used for user-facing features.
+         For more details, see <a
+         href="{@docRoot}about/versions/12/behavior-changes-12#exact-alarm-permission">
+         Exact alarm permission</a>.
+         <p>Apps who hold this permission and target API level 31 or above, always stay in the
+         {@link android.app.usage.UsageStatsManager#STANDBY_BUCKET_WORKING_SET WORKING_SET} or
+         lower standby bucket.
+         Applications targeting API level 30 or below do not need this permission to use
+         exact alarm APIs.
      -->
     <permission android:name="android.permission.SCHEDULE_EXACT_ALARM"
         android:protectionLevel="normal|appop"/>
 
+    <!-- Allows apps to use exact alarms just like with SCHEDULE_EXACT_ALARM but without needing
+    to request this permission from the user.
+    <p><b>This is only for apps that rely on exact alarms for their core functionality.</b>
+    App stores may enforce policies to audit and review the use of this permission. Any app that
+    requests this but is found to not require exact alarms for its primary function may be
+    removed from the app store.
+    -->
+    <permission android:name="android.permission.USE_EXACT_ALARM"
+                android:protectionLevel="normal"/>
+
     <!-- Allows an application to query tablet mode state and monitor changes
          in it.
          <p>Not for use by third-party applications.
@@ -4127,14 +4561,14 @@
     <permission android:name="android.permission.INSTALL_PACKAGE_UPDATES"
         android:protectionLevel="signature|privileged" />
 
-    <!-- Allows an application to install existing system packages. This is a limited
+    <!-- @SystemApi Allows an application to install existing system packages. This is a limited
          version of {@link android.Manifest.permission#INSTALL_PACKAGES}.
          <p>Not for use by third-party applications.
          TODO(b/80204953): remove this permission once we have a long-term solution.
          @hide
     -->
     <permission android:name="com.android.permission.INSTALL_EXISTING_PACKAGES"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|role" />
 
     <!-- Allows an application to use the package installer v2 APIs.
          <p>The package installer v2 APIs are still a work in progress and we're
@@ -4152,6 +4586,16 @@
     <permission android:name="android.permission.INSTALL_TEST_ONLY_PACKAGE"
                 android:protectionLevel="signature" />
 
+    <!-- @SystemApi Allows an application to install DPCs only, an application is
+         considered a DPC if it has a {@link android.app.admin.DeviceAdminReceiver}
+         protected by {@link android.Manifest.permission#BIND_DEVICE_ADMIN).
+         This is a limited version of
+         {@link android.Manifest.permission#INSTALL_PACKAGES}.
+         @hide
+    -->
+    <permission android:name="android.permission.INSTALL_DPC_PACKAGES"
+                android:protectionLevel="signature|role" />
+
     <!-- Allows an application to use System Data Loaders.
          <p>Not for use by third-party applications.
          @hide
@@ -4219,7 +4663,7 @@
          when the application deleting the package is not the same application that installed the
          package. -->
     <permission android:name="android.permission.DELETE_PACKAGES"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|role" />
 
     <!-- @SystemApi Allows an application to move location of installed package.
          @hide -->
@@ -4235,7 +4679,7 @@
          enabled or not.
          <p>Not for use by third-party applications. -->
     <permission android:name="android.permission.CHANGE_COMPONENT_ENABLED_STATE"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|role" />
 
     <!-- @SystemApi Allows an application to grant specific permissions.
          @hide -->
@@ -4253,6 +4697,12 @@
     <permission android:name="android.permission.REVOKE_RUNTIME_PERMISSIONS"
          android:protectionLevel="signature|installer|verifier" />
 
+    <!-- @TestApi Allows an application to revoke the POST_NOTIFICATIONS permission from an app
+     without killing the app. Only granted to the shell.
+     @hide -->
+    <permission android:name="android.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL"
+                android:protectionLevel="signature" />
+
     <!-- @SystemApi Allows the system to read runtime permission state.
         @hide -->
     <permission android:name="android.permission.GET_RUNTIME_PERMISSIONS"
@@ -4326,6 +4776,11 @@
     <permission android:name="android.permission.REQUEST_OBSERVE_COMPANION_DEVICE_PRESENCE"
                 android:protectionLevel="normal" />
 
+    <!-- Allows an application to deliver companion messages to system
+         -->
+    <permission android:name="android.permission.DELIVER_COMPANION_MESSAGES"
+                android:protectionLevel="normal" />
+
     <!-- Allows an application to create new companion device associations.
          @SystemApi
          @hide -->
@@ -4448,6 +4903,12 @@
     <permission android:name="android.permission.MODIFY_REFRESH_RATE_SWITCHING_TYPE"
                 android:protectionLevel="signature" />
 
+    <!-- Allows an application to modify the user preferred display mode.
+         @hide
+         @TestApi -->
+    <permission android:name="android.permission.MODIFY_USER_PREFERRED_DISPLAY_MODE"
+                android:protectionLevel="signature" />
+
     <!-- @SystemApi Allows an application to control VPN.
          <p>Not for use by third-party applications.</p>
          @hide -->
@@ -4518,6 +4979,12 @@
     <permission android:name="android.permission.CAPTURE_AUDIO_HOTWORD"
         android:protectionLevel="signature|privileged|role" />
 
+    <!-- @SystemApi Allows an application to access the ultrasound content.
+         <p>Not for use by third-party applications.</p>
+         @hide -->
+    <permission android:name="android.permission.ACCESS_ULTRASOUND"
+        android:protectionLevel="signature|privileged" />
+
     <!-- Puts an application in the chain of trust for sound trigger
          operations. Being in the chain of trust allows an application to
          delegate an identity of a separate entity to the sound trigger system
@@ -4533,6 +5000,13 @@
     <permission android:name="android.permission.MODIFY_AUDIO_ROUTING"
         android:protectionLevel="signature|privileged|role" />
 
+    <!-- @SystemApi Allows an application to access the uplink and downlink audio of an ongoing
+    call.
+     <p>Not for use by third-party applications.</p>
+     @hide -->
+    <permission android:name="android.permission.CALL_AUDIO_INTERCEPTION"
+                android:protectionLevel="signature|privileged" />
+
     <!-- @TestApi Allows an application to query audio related state.
          @hide -->
     <permission android:name="android.permission.QUERY_AUDIO_STATE"
@@ -4628,6 +5102,11 @@
     <permission android:name="android.permission.USER_ACTIVITY"
         android:protectionLevel="signature|privileged" />
 
+    <!-- @hide @SystemApi Allows an application to manage Low Power Standby settings.
+         <p>Not for use by third-party applications. -->
+    <permission android:name="android.permission.MANAGE_LOW_POWER_STANDBY"
+                android:protectionLevel="signature|privileged" />
+
    <!-- @hide Allows low-level access to tun tap driver -->
     <permission android:name="android.permission.NET_TUNNELING"
         android:protectionLevel="signature" />
@@ -4676,7 +5155,7 @@
 
     <!-- Not for use by third-party applications. -->
     <permission android:name="android.permission.MASTER_CLEAR"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|role" />
 
     <!-- Allows an application to call any phone number, including emergency
          numbers, without going through the Dialer user interface for the user
@@ -4687,7 +5166,7 @@
 
     <!-- @SystemApi Allows an application to perform CDMA OTA provisioning @hide -->
     <permission android:name="android.permission.PERFORM_CDMA_PROVISIONING"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|role" />
 
     <!-- @SystemApi Allows an application to perform SIM Activation @hide -->
     <permission android:name="android.permission.PERFORM_SIM_ACTIVATION"
@@ -4714,6 +5193,14 @@
         android:protectionLevel="signature|privileged|development|appop|retailDemo" />
     <uses-permission android:name="android.permission.PACKAGE_USAGE_STATS" />
 
+    <!-- Allows an application to query broadcast response stats (see
+         {@link android.app.usage.BroadcastResponseStats}).
+         @SystemApi
+         @hide
+    -->
+    <permission android:name="android.permission.ACCESS_BROADCAST_RESPONSE_STATS"
+        android:protectionLevel="signature|privileged|development" />
+
     <!-- Allows a data loader to read a package's access logs. The access logs contain the
          set of pages referenced over time.
          <p>Declaring the permission implies intention to use the API and the user of the
@@ -4736,6 +5223,12 @@
     <permission android:name="android.permission.CHANGE_APP_IDLE_STATE"
         android:protectionLevel="signature|privileged" />
 
+    <!-- @hide @TestApi @SystemApi Allows an application to change the estimated launch time
+         of an app.
+         <p>Not for use by third-party applications. -->
+    <permission android:name="android.permission.CHANGE_APP_LAUNCH_TIME_ESTIMATE"
+        android:protectionLevel="signature|privileged" />
+
     <!-- @hide @SystemApi Allows an application to temporarily allowlist an inactive app to
          access the network and acquire wakelocks.
          <p>Not for use by third-party applications. -->
@@ -4883,6 +5376,11 @@
     <permission android:name="android.permission.SET_WALLPAPER_COMPONENT"
         android:protectionLevel="signature|privileged" />
 
+    <!-- @SystemApi Allows applications to set wallpaper dim amount.
+         @hide -->
+    <permission android:name="android.permission.SET_WALLPAPER_DIM_AMOUNT"
+        android:protectionLevel="signature|privileged" />
+
     <!-- @SystemApi Allows applications to read dream settings and dream state.
          @hide -->
     <permission android:name="android.permission.READ_DREAM_STATE"
@@ -4914,7 +5412,7 @@
         @hide
     -->
     <permission android:name="android.permission.CRYPT_KEEPER"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="signature|privileged|role" />
 
     <!-- @SystemApi Allows an application to read historical network usage for
          specific networks and applications. @hide -->
@@ -5059,10 +5557,10 @@
                 android:protectionLevel="signature|installer" />
     <uses-permission android:name="android.permission.MANAGE_NOTIFICATION_LISTENERS" />
 
-    <!-- Allows notifications to be colorized
+    <!-- @SystemApi Allows notifications to be colorized
          <p>Not for use by third-party applications. @hide -->
     <permission android:name="android.permission.USE_COLORIZED_NOTIFICATIONS"
-                android:protectionLevel="signature|setup" />
+                android:protectionLevel="signature|setup|role" />
 
     <!-- Allows access to keyguard secure storage.  Only allowed for system processes.
         @hide -->
@@ -5115,6 +5613,12 @@
     <permission android:name="android.permission.CONTROL_KEYGUARD_SECURE_NOTIFICATIONS"
         android:protectionLevel="signature|privileged" />
 
+    <!-- @SystemApi Allows an application to manage weak escrow token on the device. This permission
+         is not available to third party applications.
+         @hide -->
+    <permission android:name="android.permission.MANAGE_WEAK_ESCROW_TOKEN"
+        android:protectionLevel="signature|privileged" />
+
     <!-- Allows an application to listen to trust changes.  Only allowed for system processes.
         @hide -->
     <permission android:name="android.permission.TRUST_LISTENER"
@@ -5273,6 +5777,25 @@
         android:description="@string/permdesc_startViewPermissionUsage"
         android:protectionLevel="signature|installer" />
 
+    <!--
+        @SystemApi
+        Allows the holder to start the screen to review permission decisions.
+        <p>Protection level: signature|installer
+        @hide -->
+    <permission android:name="android.permission.START_REVIEW_PERMISSION_DECISIONS"
+        android:label="@string/permlab_startReviewPermissionDecisions"
+        android:description="@string/permdesc_startReviewPermissionDecisions"
+        android:protectionLevel="signature|installer" />
+
+    <!--
+        Allows the holder to start the screen with a list of app features.
+        <p>Protection level: signature|installer
+    -->
+    <permission android:name="android.permission.START_VIEW_APP_FEATURES"
+                android:label="@string/permlab_startViewAppFeatures"
+                android:description="@string/permdesc_startViewAppFeatures"
+                android:protectionLevel="signature|installer" />
+
     <!-- Allows an application to query whether DO_NOT_ASK_CREDENTIALS_ON_BOOT
          flag is set.
          @hide -->
@@ -5294,7 +5817,7 @@
     <!-- @SystemApi Allows access to MAC addresses of WiFi and Bluetooth peer devices.
         @hide -->
     <permission android:name="android.permission.PEERS_MAC_ADDRESS"
-                android:protectionLevel="signature|setup" />
+                android:protectionLevel="signature|setup|role" />
 
     <!-- Allows the Nfc stack to dispatch Nfc messages to applications. Applications
         can use this permission to ensure incoming Nfc messages are from the Nfc stack
@@ -5481,6 +6004,17 @@
     <permission android:name="android.permission.MANAGE_SMARTSPACE"
         android:protectionLevel="signature" />
 
+    <!-- @SystemApi Allows an application to manage the wallpaper effects
+      generation service.
+    @hide  <p>Not for use by third-party applications.</p> -->
+    <permission android:name="android.permission.MANAGE_WALLPAPER_EFFECTS_GENERATION"
+        android:protectionLevel="signature|privileged" />
+
+    <!-- @SystemApi Allows an application to manage the cloudsearch service.
+     @hide  <p>Not for use by third-party applications.</p> -->
+    <permission android:name="android.permission.MANAGE_CLOUDSEARCH"
+        android:protectionLevel="signature|privileged|role" />
+
     <!-- Allows an app to set the theme overlay in /vendor/overlay
          being used.
          @hide  <p>Not for use by third-party applications.</p> -->
@@ -5523,7 +6057,7 @@
     <!-- @SystemApi Allows an application to turn on / off quiet mode.
          @hide -->
     <permission android:name="android.permission.MODIFY_QUIET_MODE"
-                android:protectionLevel="signature|privileged|development" />
+                android:protectionLevel="signature|privileged|development|role" />
 
     <!-- Allows internal management of the camera framework
          @hide -->
@@ -5576,10 +6110,15 @@
     <permission android:name="android.permission.MANAGE_APPOPS"
                 android:protectionLevel="signature" />
 
-    <!-- @hide Permission that allows background clipboard access.
-         <p>Not for use by third-party applications. -->
+    <!-- @SystemApi Permission that allows background clipboard access.
+         @hide Not for use by third-party applications. -->
     <permission android:name="android.permission.READ_CLIPBOARD_IN_BACKGROUND"
-        android:protectionLevel="signature" />
+        android:protectionLevel="signature|role" />
+
+    <!-- @hide Permission that suppresses the notification when the clipboard is accessed.
+         <p>Not for use by third-party applications. -->
+    <permission android:name="android.permission.SUPPRESS_CLIPBOARD_ACCESS_NOTIFICATION"
+                android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows modifying accessibility state.
          @hide -->
@@ -5593,11 +6132,11 @@
     <permission android:name="android.permission.GRANT_PROFILE_OWNER_DEVICE_IDS_ACCESS"
         android:protectionLevel="signature" />
 
-    <!-- Allows an app to mark a profile owner as managing an organization-owned device.
+    <!-- @SystemApi Allows an app to mark a profile owner as managing an organization-owned device.
          <p>Not for use by third-party applications.
          @hide -->
     <permission android:name="android.permission.MARK_DEVICE_ORGANIZATION_OWNED"
-                android:protectionLevel="signature" />
+                android:protectionLevel="signature|role" />
 
     <!-- Allows financial apps to read filtered sms messages.
          Protection level: signature|appop
@@ -5634,7 +6173,7 @@
     <!-- @SystemApi Allows sensor privacy to be modified.
          @hide -->
     <permission android:name="android.permission.MANAGE_SENSOR_PRIVACY"
-                android:protectionLevel="internal|role" />
+                android:protectionLevel="internal|role|installer" />
 
     <!-- @SystemApi Allows sensor privacy changes to be observed.
          @hide -->
@@ -5684,7 +6223,7 @@
     <!-- Allows the use of FLAG_SLIPPERY, which permits touch events to slip from the current
          window to the window where the touch currently is on top of.  @hide -->
     <permission android:name="android.permission.ALLOW_SLIPPERY_TOUCHES"
-                android:protectionLevel="signature|recents" />
+                android:protectionLevel="signature|privileged|recents|role" />
     <!--  Allows the caller to change the associations between input devices and displays.
         Very dangerous! @hide -->
     <permission android:name="android.permission.ASSOCIATE_INPUT_DEVICE_TO_DISPLAY"
@@ -5693,6 +6232,8 @@
     <!-- Allows query of any normal app on the device, regardless of manifest declarations.
         <p>Protection level: normal -->
     <permission android:name="android.permission.QUERY_ALL_PACKAGES"
+                android:label="@string/permlab_queryAllPackages"
+                android:description="@string/permdesc_queryAllPackages"
                 android:protectionLevel="normal" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"/>
 
@@ -5715,9 +6256,19 @@
     <permission android:name="android.permission.ACCESS_TV_DESCRAMBLER"
         android:protectionLevel="signature|privileged|vendorPrivileged" />
 
-    <!-- Allows an application to create trusted displays. @hide -->
+    <!-- @SystemApi Allows an application to access shared filter of TV tuner HAL
+         <p>Not for use by third-party applications.
+         @hide -->
+    <permission android:name="android.permission.ACCESS_TV_SHARED_FILTER"
+        android:protectionLevel="signature|privileged|vendorPrivileged" />
+
+    <!-- Allows an application to create trusted displays. @hide @SystemApi -->
     <permission android:name="android.permission.ADD_TRUSTED_DISPLAY"
-                android:protectionLevel="signature" />
+                android:protectionLevel="signature|role" />
+
+    <!-- Allows an application to create always-unlocked displays. @hide @SystemApi -->
+    <permission android:name="android.permission.ADD_ALWAYS_UNLOCKED_DISPLAY"
+                android:protectionLevel="signature|role"/>
 
     <!-- @hide @SystemApi Allows an application to access locusId events in the usage stats. -->
     <permission android:name="android.permission.ACCESS_LOCUS_ID_USAGE_STATS"
@@ -5756,9 +6307,24 @@
     <permission android:name="android.permission.MANAGE_TOAST_RATE_LIMITING"
                 android:protectionLevel="signature" />
 
-    <!-- Allows managing the Game Mode
-     @hide Used internally. -->
+    <!-- @SystemApi Allows managing the Game Mode
+     @hide -->
     <permission android:name="android.permission.MANAGE_GAME_MODE"
+                android:protectionLevel="signature|privileged" />
+
+    <!-- @SystemApi Allows accessing the frame rate per second of a given application
+         @hide -->
+    <permission android:name="android.permission.ACCESS_FPS_COUNTER"
+                android:protectionLevel="signature|privileged" />
+
+    <!-- @SystemApi Allows managing the GameService APIs
+         @hide -->
+    <permission android:name="android.permission.MANAGE_GAME_ACTIVITY"
+                android:protectionLevel="signature|privileged" />
+
+    <!-- Allows managing the Game service
+         @hide @TestApi Used only for testing. -->
+    <permission android:name="android.permission.SET_GAME_SERVICE"
                 android:protectionLevel="signature" />
 
     <!-- @SystemApi Allows the holder to register callbacks to inform the RebootReadinessManager
@@ -5767,6 +6333,11 @@
     <permission android:name="android.permission.SIGNAL_REBOOT_READINESS"
                 android:protectionLevel="signature|privileged" />
 
+    <!-- @SystemApi Allows an application to change the touch mode state.
+         @hide -->
+    <permission android:name="android.permission.MODIFY_TOUCH_MODE_STATE"
+        android:protectionLevel="signature" />
+
     <!-- @hide Allows an application to get a People Tile preview for a given shortcut. -->
     <permission android:name="android.permission.GET_PEOPLE_TILE_PREVIEW"
         android:protectionLevel="signature|recents" />
@@ -5782,11 +6353,10 @@
     <permission android:name="android.permission.RENOUNCE_PERMISSIONS"
                 android:protectionLevel="signature|privileged" />
 
-    <!-- Allows an application to read nearby streaming policy. The policy allows the device
-         to stream its notifications and apps to nearby devices.
-         @hide -->
+    <!-- Allows an application to read nearby streaming policy. The policy controls
+         whether to allow the device to stream its notifications and apps to nearby devices. -->
     <permission android:name="android.permission.READ_NEARBY_STREAMING_POLICY"
-        android:protectionLevel="signature|privileged" />
+        android:protectionLevel="normal" />
 
     <!-- @SystemApi Allows the holder to set the source of the data when setting a clip on the
          clipboard.
@@ -5832,6 +6402,72 @@
     <permission android:name="android.permission.READ_GLOBAL_APP_SEARCH_DATA"
                 android:protectionLevel="internal|role" />
 
+    <!-- Allows an application to query over global data in AppSearch that's visible to the
+         ASSISTANT role.  -->
+    <permission android:name="android.permission.READ_ASSISTANT_APP_SEARCH_DATA"
+        android:protectionLevel="internal|role" />
+
+    <!-- Allows an application to query over global data in AppSearch that's visible to the
+         HOME role.  -->
+    <permission android:name="android.permission.READ_HOME_APP_SEARCH_DATA"
+        android:protectionLevel="internal|role" />
+
+    <!-- @SystemApi Allows an application to create virtual devices in VirtualDeviceManager.
+         @hide -->
+    <permission android:name="android.permission.CREATE_VIRTUAL_DEVICE"
+                android:protectionLevel="internal|role" />
+
+    <!-- @SystemApi Must be required by a safety source to send an update using the
+             {@link android.safetycenter.SafetyCenterManager}.
+             <p>Protection level: signature|privileged
+             @hide
+        -->
+    <permission android:name="android.permission.SEND_SAFETY_CENTER_UPDATE"
+                android:protectionLevel="signature|privileged" />
+
+    <!-- @SystemApi Allows an application to launch device manager setup screens.
+         <p>Not for use by third-party applications.
+         @hide
+    -->
+    <permission android:name="android.permission.LAUNCH_DEVICE_MANAGER_SETUP"
+        android:protectionLevel="signature|role" />
+
+    <!-- @SystemApi Allows an application to update certain device management related system
+         resources.
+         @hide -->
+    <permission android:name="android.permission.UPDATE_DEVICE_MANAGEMENT_RESOURCES"
+                android:protectionLevel="signature|role" />
+
+    <!-- @SystemApi Allows an app to read whether SafetyCenter is enabled/disabled.
+             <p>Protection level: signature|privileged
+             @hide
+        -->
+    <permission android:name="android.permission.READ_SAFETY_CENTER_STATUS"
+        android:protectionLevel="signature|privileged" />
+
+    <!-- @SystemApi Required to access the safety center internal APIs using the
+             {@link android.safetycenter.SafetyCenterManager}.
+             <p>Protection level: internal|installer|role
+             @hide
+        -->
+    <permission android:name="android.permission.MANAGE_SAFETY_CENTER"
+                android:protectionLevel="internal|installer|role" />
+
+    <!-- @SystemApi Allows an app to set keep-clear areas without restrictions on the size or
+        number of keep-clear areas (see {@link android.view.View#setPreferKeepClearRects}).
+        When the system arranges floating windows onscreen, it might decide to ignore keep-clear
+        areas from windows, whose owner does not have this permission.
+        @hide
+    -->
+    <permission android:name="android.permission.SET_UNRESTRICTED_KEEP_CLEAR_AREAS"
+                android:protectionLevel="signature|privileged" />
+
+    <!-- Allows an UID to be visible to the application based on an interaction between the
+         two apps. This permission is not intended to be held by apps.
+         @hide @TestApi  -->
+    <permission android:name="android.permission.MAKE_UID_VISIBLE"
+                android:protectionLevel="signature" />
+
     <!-- Attribution for Geofencing service. -->
     <attribution android:tag="GeofencingService" android:label="@string/geofencing_service"/>
     <!-- Attribution for Country Detector. -->
@@ -5889,7 +6525,6 @@
                   android:excludeFromRecents="true"
                   android:documentLaunchMode="never"
                   android:relinquishTaskIdentity="true"
-                  android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation|keyboard|keyboardHidden"
                   android:process=":ui"
                   android:visibleToInstantApps="true">
             <intent-filter>
@@ -5940,8 +6575,8 @@
                 android:process=":ui">
         </activity>
         <activity android:name="com.android.internal.app.PlatLogoActivity"
-                android:theme="@style/Theme.DeviceDefault.DayNight"
-                android:configChanges="orientation|keyboardHidden"
+                android:theme="@style/Theme.DeviceDefault.Wallpaper.NoTitleBar"
+                android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"
                 android:icon="@drawable/platlogo"
                 android:process=":ui">
         </activity>
@@ -6063,6 +6698,12 @@
                 android:process=":ui">
         </activity>
 
+        <activity android:name="com.android.internal.app.LaunchAfterAuthenticationActivity"
+                  android:theme="@style/Theme.Translucent.NoTitleBar"
+                  android:excludeFromRecents="true"
+                  android:process=":ui">
+        </activity>
+
         <activity android:name="com.android.settings.notification.NotificationAccessConfirmationActivity"
                   android:theme="@style/Theme.Dialog.Confirmation"
                   android:excludeFromRecents="true">
@@ -6250,7 +6891,7 @@
                  android:permission="android.permission.BIND_JOB_SERVICE" >
         </service>
 
-        <service android:name="com.android.server.pm.BackgroundDexOptService"
+        <service android:name="com.android.server.pm.BackgroundDexOptJobService"
                  android:exported="true"
                  android:permission="android.permission.BIND_JOB_SERVICE">
         </service>
diff --git a/tests/tests/permission2/res/raw/automotive_android_manifest.xml b/tests/tests/permission2/res/raw/automotive_android_manifest.xml
index d6ce2e1..71442c7 100644
--- a/tests/tests/permission2/res/raw/automotive_android_manifest.xml
+++ b/tests/tests/permission2/res/raw/automotive_android_manifest.xml
@@ -16,54 +16,60 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:androidprv="http://schemas.android.com/apk/prv/res/android"
-     package="com.android.car"
-     coreApp="true"
-     android:sharedUserId="android.uid.system">
+     package="com.android.car.updatable" >
 
-    <original-package android:name="com.android.car"/>
-     <permission-group android:name="android.car.permission-group.CAR_MONITORING"
-          android:icon="@drawable/perm_group_car"
-          android:description="@string/car_permission_desc"
-          android:label="@string/car_permission_label"/>
+    <permission-group android:name="android.car.permission-group.CAR_MONITORING"
+         android:icon="@drawable/perm_group_car"
+         android:description="@string/car_permission_desc"
+         android:label="@string/car_permission_label"/>
     <permission android:name="android.car.permission.CAR_ENERGY"
          android:permissionGroup="android.car.permission-group.CAR_MONITORING"
          android:protectionLevel="dangerous"
          android:label="@string/car_permission_label_energy"
          android:description="@string/car_permission_desc_energy"/>
+    <permission android:name="android.car.permission.CONTROL_CAR_ENERGY"
+                android:permissionGroup="android.car.permission-group.CAR_MONITORING"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_control_car_energy"
+                android:description="@string/car_permission_desc_control_car_energy"/>
+    <permission android:name="android.car.permission.ADJUST_RANGE_REMAINING"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_adjust_range_remaining"
+         android:description="@string/car_permission_desc_adjust_range_remaining"/>
     <permission android:name="android.car.permission.CAR_IDENTIFICATION"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_car_identification"
          android:description="@string/car_permission_desc_car_identification"/>
     <permission android:name="android.car.permission.CONTROL_CAR_CLIMATE"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_hvac"
          android:description="@string/car_permission_desc_hvac"/>
     <permission android:name="android.car.permission.CONTROL_CAR_DOORS"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_control_car_doors"
          android:description="@string/car_permission_desc_control_car_doors"/>
     <permission android:name="android.car.permission.CONTROL_CAR_WINDOWS"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_control_car_windows"
          android:description="@string/car_permission_desc_control_car_windows"/>
     <permission android:name="android.car.permission.CONTROL_CAR_MIRRORS"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_control_car_mirrors"
          android:description="@string/car_permission_desc_control_car_mirrors"/>
     <permission android:name="android.car.permission.CONTROL_CAR_SEATS"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_control_car_seats"
          android:description="@string/car_permission_desc_control_car_seats"/>
     <permission android:name="android.car.permission.CAR_MILEAGE"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_mileage"
          android:description="@string/car_permission_desc_mileage"/>
     <permission android:name="android.car.permission.CAR_TIRES"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_car_tires"
          android:description="@string/car_permission_desc_car_tires"/>
     <permission android:name="android.car.permission.READ_CAR_STEERING"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_car_steering"
          android:description="@string/car_permission_desc_car_steering"/>
     <permission android:name="android.car.permission.READ_CAR_DISPLAY_UNITS"
@@ -83,24 +89,28 @@
          android:protectionLevel="normal"
          android:label="@string/car_permission_label_car_energy_ports"
          android:description="@string/car_permission_desc_car_energy_ports"/>
+    <permission android:name="android.car.permission.CONTROL_CAR_ENERGY_PORTS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_control_car_energy_ports"
+         android:description="@string/car_permission_desc_control_car_energy_ports"/>
     <permission android:name="android.car.permission.CAR_ENGINE_DETAILED"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_car_engine_detailed"
          android:description="@string/car_permission_desc_car_engine_detailed"/>
     <permission android:name="android.car.permission.CAR_DYNAMICS_STATE"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_vehicle_dynamics_state"
          android:description="@string/car_permission_desc_vehicle_dynamics_state"/>
     <permission android:name="android.car.permission.CAR_VENDOR_EXTENSION"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_vendor_extension"
          android:description="@string/car_permission_desc_vendor_extension"/>
     <permission android:name="android.car.permission.CAR_PROJECTION"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_projection"
          android:description="@string/car_permission_desc_projection"/>
     <permission android:name="android.car.permission.ACCESS_CAR_PROJECTION_STATUS"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_access_projection_status"
          android:description="@string/car_permission_desc_access_projection_status"/>
     <permission android:name="android.car.permission.BIND_PROJECTION_SERVICE"
@@ -108,35 +118,56 @@
          android:label="@string/car_permission_label_bind_projection_service"
          android:description="@string/car_permission_desc_bind_projection_service"/>
     <permission android:name="android.car.permission.CAR_MOCK_VEHICLE_HAL"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_mock_vehicle_hal"
          android:description="@string/car_permission_desc_mock_vehicle_hal"/>
     <permission android:name="android.car.permission.CAR_INFO"
          android:protectionLevel="normal"
          android:label="@string/car_permission_label_car_info"
          android:description="@string/car_permission_desc_car_info"/>
+    <permission android:name="android.car.permission.PRIVILEGED_CAR_INFO"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_privileged_car_info"
+                android:description="@string/car_permission_desc_privileged_car_info"/>
+    <permission android:name="android.car.permission.READ_CAR_VENDOR_PERMISSION_INFO"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_vendor_permission_info"
+         android:description="@string/car_permission_desc_vendor_permission_info"/>
+
+    <!-- Allows an application to read the vehicle exterior environment information. For example,
+         it allows an application to read the vehicle exterior temperature and night mode status.
+         <p>Protection level: normal
+    -->
     <permission android:name="android.car.permission.CAR_EXTERIOR_ENVIRONMENT"
          android:protectionLevel="normal"
          android:label="@string/car_permission_label_car_exterior_environment"
          android:description="@string/car_permission_desc_car_exterior_environment"/>
+    <permission android:name="android.car.permission.CAR_EPOCH_TIME"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_car_epoch_time"
+                android:description="@string/car_permission_desc_car_epoch_time"/>
+    <permission android:name="android.car.permission.STORAGE_ENCRYPTION_BINDING_SEED"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_encryption_binding_seed"
+                android:description="@string/car_permission_desc_encryption_binding_seed"/>
     <permission android:name="android.car.permission.CAR_EXTERIOR_LIGHTS"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_car_exterior_lights"
          android:description="@string/car_permission_desc_car_exterior_lights"/>
     <permission android:name="android.car.permission.CONTROL_CAR_EXTERIOR_LIGHTS"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_control_car_exterior_lights"
          android:description="@string/car_permission_desc_control_car_exterior_lights"/>
     <permission android:name="android.car.permission.READ_CAR_INTERIOR_LIGHTS"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_car_interior_lights"
          android:description="@string/car_permission_desc_car_interior_lights"/>
     <permission android:name="android.car.permission.CONTROL_CAR_INTERIOR_LIGHTS"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_control_car_interior_lights"
          android:description="@string/car_permission_desc_control_car_interior_lights"/>
     <permission android:name="android.car.permission.CAR_POWER"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_car_power"
          android:description="@string/car_permission_desc_car_power"/>
     <permission android:name="android.car.permission.CAR_POWERTRAIN"
@@ -144,15 +175,15 @@
          android:label="@string/car_permission_label_car_powertrain"
          android:description="@string/car_permission_desc_car_powertrain"/>
     <permission android:name="android.car.permission.CAR_NAVIGATION_MANAGER"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_car_navigation_manager"
          android:description="@string/car_permission_desc_car_navigation_manager"/>
     <permission android:name="android.car.permission.CAR_DIAGNOSTICS"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_diag_read"
          android:description="@string/car_permission_desc_diag_read"/>
     <permission android:name="android.car.permission.CLEAR_CAR_DIAGNOSTICS"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_diag_clear"
          android:description="@string/car_permission_desc_diag_clear"/>
     <permission android:name="android.car.permission.BIND_VMS_CLIENT"
@@ -160,38 +191,105 @@
          android:label="@string/car_permission_label_bind_vms_client"
          android:description="@string/car_permission_desc_bind_vms_client"/>
     <permission android:name="android.car.permission.VMS_PUBLISHER"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_vms_publisher"
          android:description="@string/car_permission_desc_vms_publisher"/>
     <permission android:name="android.car.permission.VMS_SUBSCRIBER"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_vms_subscriber"
          android:description="@string/car_permission_desc_vms_subscriber"/>
     <permission android:name="android.car.permission.CAR_DRIVING_STATE"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_driving_state"
          android:description="@string/car_permission_desc_driving_state"/>
-    <!--  may replace this with system permission if proper one is defined. -->
+    <permission android:name="android.car.permission.USE_CAR_TELEMETRY_SERVICE"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_use_telemetry_service"
+                android:description="@string/car_permission_desc_use_telemetry_service"/>
+    <permission android:name="android.car.permission.REQUEST_CAR_EVS_ACTIVITY"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_request_evs_activity"
+                android:description="@string/car_permission_desc_request_evs_activity"/>
+    <permission android:name="android.car.permission.CONTROL_CAR_EVS_ACTIVITY"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_control_evs_activity"
+                android:description="@string/car_permission_desc_control_evs_activity"/>
+    <permission android:name="android.car.permission.USE_CAR_EVS_CAMERA"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_use_evs_camera"
+                android:description="@string/car_permission_desc_use_evs_camera"/>
+    <permission android:name="android.car.permission.MONITOR_CAR_EVS_STATUS"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_monitor_evs_status"
+                android:description="@string/car_permission_desc_monitor_evs_status"/>
     <permission android:name="android.car.permission.CONTROL_APP_BLOCKING"
-         android:protectionLevel="system|signature"
+         android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_control_app_blocking"
          android:description="@string/car_permission_desc_control_app_blocking"/>
-    <permission android:name="android.car.permission.ADJUST_RANGE_REMAINING"
+    <permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME"
          android:protectionLevel="signature|privileged"
-         android:label="@string/car_permission_label_adjust_range_remaining"
-         android:description="@string/car_permission_desc_adjust_range_remaining"/>
+         android:label="@string/car_permission_label_audio_volume"
+         android:description="@string/car_permission_desc_audio_volume"/>
+    <permission android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_audio_settings"
+         android:description="@string/car_permission_desc_audio_settings"/>
+    <permission android:name="android.car.permission.RECEIVE_CAR_AUDIO_DUCKING_EVENTS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_receive_ducking"
+         android:description="@string/car_permission_desc_receive_ducking"/>
+    <permission android:name="android.car.permission.BIND_INSTRUMENT_CLUSTER_RENDERER_SERVICE"
+         android:protectionLevel="signature"
+         android:label="@string/car_permission_label_bind_instrument_cluster_rendering"
+         android:description="@string/car_permission_desc_bind_instrument_cluster_rendering"/>
+    <permission android:name="android.car.permission.BIND_CAR_INPUT_SERVICE"
+         android:protectionLevel="signature"
+         android:label="@string/car_permission_label_bind_input_service"
+         android:description="@string/car_permission_desc_bind_input_service"/>
+    <permission android:name="android.car.permission.CAR_DISPLAY_IN_CLUSTER"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_car_display_in_cluster"
+         android:description="@string/car_permission_desc_car_display_in_cluster"/>
+    <permission android:name="android.car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_car_cluster_control"
+         android:description="@string/car_permission_desc_car_cluster_control"/>
+    <permission android:name="android.car.permission.CAR_MONITOR_CLUSTER_NAVIGATION_STATE"
+        android:protectionLevel="signature|privileged"
+        android:label="@string/car_permission_car_monitor_cluster_navigation_state"
+        android:description="@string/car_permission_desc_car_monitor_cluster_navigation_state"/>
+    <permission android:name="android.car.permission.CAR_HANDLE_USB_AOAP_DEVICE"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_handle_usb_aoap_device"
+         android:description="@string/car_permission_desc_car_handle_usb_aoap_device"/>
+    <permission android:name="android.car.permission.CAR_UX_RESTRICTIONS_CONFIGURATION"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_ux_restrictions_configuration"
+         android:description="@string/car_permission_desc_car_ux_restrictions_configuration"/>
     <permission android:name="android.car.permission.READ_CAR_OCCUPANT_AWARENESS_STATE"
          android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_read_car_occupant_awareness_state"
          android:description="@string/car_permission_desc_read_car_occupant_awareness_state"/>
-    <permission android:name="android.car.permission.CONTROL_CAR_ENERGY_PORTS"
-         android:protectionLevel="signature|privileged"
-         android:label="@string/car_permission_label_control_car_energy_ports"
-         android:description="@string/car_permission_desc_control_car_energy_ports"/>
+    <permission android:name="android.car.permission.ACCESS_PRIVATE_DISPLAY_ID"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_access_private_display_id"
+                android:description="@string/car_permission_desc_access_private_display_id"/>
     <permission android:name="android.car.permission.CONTROL_CAR_OCCUPANT_AWARENESS_SYSTEM"
          android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_control_car_occupant_awareness_system"
          android:description="@string/car_permission_desc_control_car_occupant_awareness_system"/>
+    <permission android:name="android.car.permission.STORAGE_MONITORING"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_storage_monitoring"
+         android:description="@string/car_permission_desc_storage_monitoring"/>
+    <permission android:name="android.car.permission.CAR_ENROLL_TRUST"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_enroll_trust"
+         android:description="@string/car_permission_desc_enroll_trust"/>
+    <permission android:name="android.car.permission.CAR_TEST_SERVICE"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_car_test_service"
+         android:description="@string/car_permission_desc_car_test_service"/>
     <permission android:name="android.car.permission.CONTROL_CAR_FEATURES"
          android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_control_car_features"
@@ -200,11 +298,14 @@
          android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_use_car_watchdog"
          android:description="@string/car_permission_desc_use_car_watchdog"/>
-    <permission android:name="android.car.permission.READ_CAR_VENDOR_PERMISSION_INFO"
+    <permission android:name="android.car.permission.CONTROL_CAR_WATCHDOG_CONFIG"
          android:protectionLevel="signature|privileged"
-         android:label="@string/car_permission_label_vendor_permission_info"
-         android:description="@string/car_permission_desc_vendor_permission_info"/>
-    <!-- Permission for vendor properties -->
+         android:label="@string/car_permission_label_control_car_watchdog_config"
+         android:description="@string/car_permission_desc_control_car_watchdog_config"/>
+    <permission android:name="android.car.permission.COLLECT_CAR_WATCHDOG_METRICS"
+         android:protectionLevel="signature|privileged"
+         android:label="@string/car_permission_label_collect_car_watchdog_metrics"
+         android:description="@string/car_permission_desc_collect_car_watchdog_metrics"/>
     <permission android:name="android.car.permission.GET_CAR_VENDOR_CATEGORY_WINDOW"
          android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_get_car_vendor_category_window"
@@ -349,202 +450,28 @@
          android:protectionLevel="signature|privileged"
          android:label="@string/car_permission_label_set_car_vendor_category_10"
          android:description="@string/car_permission_desc_set_car_vendor_category_10"/>
-
-    <permission android:name="android.car.permission.CAR_CONTROL_AUDIO_VOLUME"
-         android:protectionLevel="system|signature"
-         android:label="@string/car_permission_label_audio_volume"
-         android:description="@string/car_permission_desc_audio_volume"/>
-
-    <permission android:name="android.car.permission.CAR_CONTROL_AUDIO_SETTINGS"
-         android:protectionLevel="system|signature"
-         android:label="@string/car_permission_label_audio_settings"
-         android:description="@string/car_permission_desc_audio_settings"/>
-
-    <permission android:name="android.car.permission.RECEIVE_CAR_AUDIO_DUCKING_EVENTS"
-         android:protectionLevel="system|signature"
-         android:label="@string/car_permission_label_receive_ducking"
-         android:description="@string/car_permission_desc_receive_ducking"/>
-
-    <permission android:name="android.car.permission.BIND_INSTRUMENT_CLUSTER_RENDERER_SERVICE"
-         android:protectionLevel="signature"
-         android:label="@string/car_permission_label_bind_instrument_cluster_rendering"
-         android:description="@string/car_permission_desc_bind_instrument_cluster_rendering"/>
-
-    <permission android:name="android.car.permission.BIND_CAR_INPUT_SERVICE"
-         android:protectionLevel="signature"
-         android:label="@string/car_permission_label_bind_input_service"
-         android:description="@string/car_permission_desc_bind_input_service"/>
-
-    <permission android:name="android.car.permission.CAR_DISPLAY_IN_CLUSTER"
-         android:protectionLevel="system|signature"
-         android:label="@string/car_permission_car_display_in_cluster"
-         android:description="@string/car_permission_desc_car_display_in_cluster"/>
-
-    <permission android:name="android.car.permission.CAR_INSTRUMENT_CLUSTER_CONTROL"
-         android:protectionLevel="system|signature"
-         android:label="@string/car_permission_car_cluster_control"
-         android:description="@string/car_permission_desc_car_cluster_control"/>
-
-    <permission android:name="android.car.permission.CAR_MONITOR_CLUSTER_NAVIGATION_STATE"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_car_monitor_cluster_navigation_state"
-        android:description="@string/car_permission_desc_car_monitor_cluster_navigation_state"/>
-
-    <permission android:name="android.car.permission.CAR_HANDLE_USB_AOAP_DEVICE"
-         android:protectionLevel="system|signature"
-         android:label="@string/car_permission_label_car_handle_usb_aoap_device"
-         android:description="@string/car_permission_desc_car_handle_usb_aoap_device"/>
-
-    <permission android:name="android.car.permission.CAR_UX_RESTRICTIONS_CONFIGURATION"
-         android:protectionLevel="system|signature"
-         android:label="@string/car_permission_label_car_ux_restrictions_configuration"
-         android:description="@string/car_permission_desc_car_ux_restrictions_configuration"/>
-
-    <permission android:name="android.car.permission.STORAGE_MONITORING"
-         android:protectionLevel="system|signature"
-         android:label="@string/car_permission_label_storage_monitoring"
-         android:description="@string/car_permission_desc_storage_monitoring"/>
-
-    <permission android:name="android.car.permission.CAR_ENROLL_TRUST"
-         android:protectionLevel="system|signature"
-         android:label="@string/car_permission_label_enroll_trust"
-         android:description="@string/car_permission_desc_enroll_trust"/>
-
-    <permission android:name="android.car.permission.CAR_TEST_SERVICE"
-         android:protectionLevel="system|signature"
-         android:label="@string/car_permission_label_car_test_service"
-         android:description="@string/car_permission_desc_car_test_service"/>
-
-    <permission android:name="android.car.permission.ACCESS_PRIVATE_DISPLAY_ID"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_access_private_display_id"
-        android:description="@string/car_permission_desc_access_private_display_id"/>
-
-    <permission android:name="android.car.permission.MONITOR_CAR_EVS_STATUS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_monitor_evs_status"
-        android:description="@string/car_permission_desc_monitor_evs_status"/>
-
-    <permission android:name="android.car.permission.CONTROL_CAR_POWER_POLICY"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_car_power_policy"
-        android:description="@string/car_permission_desc_control_car_power_policy"/>
-
-    <permission android:name="android.car.permission.COLLECT_CAR_WATCHDOG_METRICS"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_collect_car_watchdog_metrics"
-        android:description="@string/car_permission_desc_collect_car_watchdog_metrics"/>
-
-    <permission android:name="android.car.permission.CONTROL_CAR_EVS_ACTIVITY"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_evs_activity"
-        android:description="@string/car_permission_desc_control_evs_activity"/>
-
-    <permission android:name="android.car.permission.REQUEST_CAR_EVS_ACTIVITY"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_request_evs_activity"
-        android:description="@string/car_permission_desc_request_evs_activity"/>
-
-    <permission android:name="android.car.permission.USE_CAR_EVS_CAMERA"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_use_evs_camera"
-        android:description="@string/car_permission_desc_use_evs_camera"/>
-
-    <permission android:name="android.car.permission.STORAGE_ENCRYPTION_BINDING_SEED"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_encryption_binding_seed"
-        android:description="@string/car_permission_desc_encryption_binding_seed"/>
-
-    <permission android:name="android.car.permission.READ_CAR_POWER_POLICY"
-        android:protectionLevel="normal"
-        android:label="@string/car_permission_label_read_car_power_policy"
-        android:description="@string/car_permission_desc_read_car_power_policy"/>
-
-    <permission android:name="android.car.permission.CAR_EPOCH_TIME"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_car_epoch_time"
-        android:description="@string/car_permission_desc_car_epoch_time"/>
-
-    <permission android:name="android.car.permission.CONTROL_CAR_WATCHDOG_CONFIG"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_control_car_watchdog_config"
-        android:description="@string/car_permission_desc_control_car_watchdog_config"/>
-
-    <permission android:name="android.car.permission.TEMPLATE_RENDERER"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_template_renderer"
-        android:description="@string/car_permission_desc_template_renderer"/>
-
     <permission android:name="android.car.permission.CAR_MONITOR_INPUT"
-        android:protectionLevel="signature|privileged"
-        android:label="@string/car_permission_label_monitor_input"
-        android:description="@string/car_permission_desc_monitor_input"/>
-
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_monitor_input"
+                android:description="@string/car_permission_desc_monitor_input"/>
+    <permission android:name="android.car.permission.READ_CAR_POWER_POLICY"
+                android:protectionLevel="normal"
+                android:label="@string/car_permission_label_read_car_power_policy"
+                android:description="@string/car_permission_desc_read_car_power_policy"/>
+    <permission android:name="android.car.permission.CONTROL_CAR_POWER_POLICY"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_control_car_power_policy"
+                android:description="@string/car_permission_desc_control_car_power_policy"/>
+    <permission android:name="android.car.permission.CONTROL_SHUTDOWN_PROCESS"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_adjust_shutdown_process"
+                android:description="@string/car_permission_desc_adjust_shutdown_process"/>
+    <permission android:name="android.car.permission.TEMPLATE_RENDERER"
+                android:protectionLevel="signature|privileged"
+                android:label="@string/car_permission_label_template_renderer"
+                android:description="@string/car_permission_desc_template_renderer"/>
     <permission android:name="android.car.permission.CONTROL_CAR_APP_LAUNCH"
         android:protectionLevel="signature|privileged"
         android:label="@string/car_permission_label_control_car_app_launch"
         android:description="@string/car_permission_desc_control_car_app_launch"/>
-
-    <uses-permission android:name="android.permission.CALL_PHONE"/>
-    <uses-permission android:name="android.permission.DEVICE_POWER"/>
-    <uses-permission android:name="android.permission.GRANT_RUNTIME_PERMISSIONS"/>
-    <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
-    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_TASKS"/>
-    <uses-permission android:name="android.permission.MODIFY_AUDIO_ROUTING"/>
-    <uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE"/>
-    <uses-permission android:name="android.permission.MODIFY_PHONE_STATE"/>
-    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
-    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
-    <uses-permission android:name="android.permission.REAL_GET_TASKS"/>
-    <uses-permission android:name="android.permission.REBOOT"/>
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
-    <uses-permission android:name="android.permission.REMOVE_TASKS"/>
-    <uses-permission android:name="android.permission.WRITE_SETTINGS"/>
-    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>
-    <uses-permission android:name="android.permission.BLUETOOTH"/>
-    <uses-permission android:name="android.permission.MANAGE_USERS"/>
-    <uses-permission android:name="android.permission.LOCATION_HARDWARE"/>
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
-    <uses-permission android:name="android.permission.PROVIDE_TRUST_AGENT"/>
-
-    <application android:label="@string/app_title"
-         android:directBootAware="true"
-         android:allowBackup="false"
-         android:persistent="true">
-
-        <uses-library android:name="android.test.runner"/>
-        <service android:name=".CarService"
-             android:singleUser="true"
-             android:exported="true">
-            <intent-filter>
-                <action android:name="android.car.ICar"/>
-            </intent-filter>
-        </service>
-        <service android:name=".PerUserCarService"
-             android:exported="false"/>
-
-        <service android:name="com.android.car.trust.CarBleTrustAgent"
-             android:permission="android.permission.BIND_TRUST_AGENT"
-             android:singleUser="true"
-             android:exported="true">
-            <intent-filter>
-                <action android:name="android.service.trust.TrustAgentService"/>
-                <category android:name="android.intent.category.DEFAULT"/>
-            </intent-filter>
-            <!-- Warning: the meta data must be included if the service is direct boot aware.
-                                If not included, the device will crash before boot completes. Rendering the
-                                device unusable. -->
-            <meta-data android:name="android.service.trust.trustagent"
-                 android:resource="@xml/car_trust_agent"/>
-        </service>
-        <activity android:name="com.android.car.pm.ActivityBlockingActivity"
-             android:excludeFromRecents="true"
-             android:theme="@android:style/Theme.Translucent.NoTitleBar"
-             android:exported="false"
-             android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-            </intent-filter>
-        </activity>
-    </application>
 </manifest>
diff --git a/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java b/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java
index 3b20f6d..edfcf3a 100644
--- a/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java
+++ b/tests/tests/permission2/src/android/permission2/cts/PermissionPolicyTest.java
@@ -22,12 +22,15 @@
 
 import static com.google.common.truth.Truth.assertWithMessage;
 
+import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.PermissionGroupInfo;
 import android.content.pm.PermissionInfo;
+import android.os.Process;
+import android.os.SystemProperties;
 import android.platform.test.annotations.AppModeFull;
 import android.util.ArrayMap;
 import android.util.ArraySet;
@@ -39,6 +42,7 @@
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.platform.app.InstrumentationRegistry;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.xmlpull.v1.XmlPullParser;
@@ -67,17 +71,12 @@
     private static final String MANAGE_COMPANION_DEVICES_PERMISSION
             = "android.permission.MANAGE_COMPANION_DEVICES";
 
-    private static final String ALLOW_SLIPPERY_TOUCHES_PERMISSION
-            = "android.permission.ALLOW_SLIPPERY_TOUCHES";
-
     private static final String LOG_TAG = "PermissionProtectionTest";
 
     private static final String PLATFORM_PACKAGE_NAME = "android";
 
     private static final String PLATFORM_ROOT_NAMESPACE = "android.";
 
-    private static final String AUTOMOTIVE_SERVICE_PACKAGE_NAME = "com.android.car";
-
     private static final String TAG_PERMISSION = "permission";
     private static final String TAG_PERMISSION_GROUP = "permission-group";
 
@@ -91,6 +90,18 @@
             InstrumentationRegistry.getInstrumentation().getTargetContext();
 
     @Test
+    public void shellIsOnlySystemAppThatRequestsRevokePostNotificationsWithoutKill() {
+        List<PackageInfo> pkgs = sContext.getPackageManager().getInstalledPackages(
+                PackageManager.PackageInfoFlags.of(
+                PackageManager.GET_PERMISSIONS | PackageManager.MATCH_ALL));
+        int shellUid = Process.myUserHandle().getUid(Process.SHELL_UID);
+        for (PackageInfo pkg : pkgs) {
+            Assert.assertFalse(pkg.applicationInfo.uid != shellUid
+                    && hasRevokeNotificationNoKillPermission(pkg));
+        }
+    }
+
+    @Test
     public void platformPermissionPolicyIsUnaltered() throws Exception {
         Map<String, PermissionInfo> declaredPermissionsMap =
                 getPermissionsForPackage(sContext, PLATFORM_PACKAGE_NAME);
@@ -111,8 +122,14 @@
 
         if (sContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
             expectedPermissions.addAll(loadExpectedPermissions(R.raw.automotive_android_manifest));
+            String carServicePackageName = SystemProperties.get("ro.android.car.carservice.package",
+                    null);
+
+            assertWithMessage("Car service package not defined").that(
+                    carServicePackageName).isNotNull();
+
             declaredPermissionsMap.putAll(
-                    getPermissionsForPackage(sContext, AUTOMOTIVE_SERVICE_PACKAGE_NAME));
+                    getPermissionsForPackage(sContext, carServicePackageName));
         }
 
         for (ExpectedPermissionInfo expectedPermission : expectedPermissions) {
@@ -239,6 +256,20 @@
         assertWithMessage("list of offending permissions").that(offendingList).isEmpty();
     }
 
+    private boolean hasRevokeNotificationNoKillPermission(PackageInfo info) {
+        if (info.requestedPermissions == null) {
+            return false;
+        }
+
+        for (int i = 0; i < info.requestedPermissions.length; i++) {
+            if (Manifest.permission.REVOKE_POST_NOTIFICATIONS_WITHOUT_KILL.equals(
+                    info.requestedPermissions[i])) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     private List<ExpectedPermissionInfo> loadExpectedPermissions(int resourceId) throws Exception {
         List<ExpectedPermissionInfo> permissions = new ArrayList<>();
         try (InputStream in = sContext.getResources().openRawResource(resourceId)) {
@@ -386,9 +417,6 @@
                 case "incidentReportApprover": {
                     protectionLevel |= PermissionInfo.PROTECTION_FLAG_INCIDENT_REPORT_APPROVER;
                 } break;
-                case "documenter": {
-                    protectionLevel |= PermissionInfo.PROTECTION_FLAG_DOCUMENTER;
-                } break;
                 case "appPredictor": {
                     protectionLevel |= PermissionInfo.PROTECTION_FLAG_APP_PREDICTOR;
                 } break;
@@ -410,6 +438,9 @@
                 case "role": {
                     protectionLevel |= PermissionInfo.PROTECTION_FLAG_ROLE;
                 } break;
+                case "knownSigner": {
+                    protectionLevel |= PermissionInfo.PROTECTION_FLAG_KNOWN_SIGNER;
+                } break;
             }
         }
         return protectionLevel;
@@ -444,9 +475,6 @@
                 return parseDate(SECURITY_PATCH).before(HIDE_NON_SYSTEM_OVERLAY_WINDOWS_PATCH_DATE);
             case MANAGE_COMPANION_DEVICES_PERMISSION:
                 return parseDate(SECURITY_PATCH).before(MANAGE_COMPANION_DEVICES_PATCH_DATE);
-            case ALLOW_SLIPPERY_TOUCHES_PERMISSION:
-                // In R and S branches, skip this permission
-                return true;
             default:
                 return false;
         }
diff --git a/tests/tests/permission2/src/android/permission2/cts/PrivappPermissionsTest.java b/tests/tests/permission2/src/android/permission2/cts/PrivappPermissionsTest.java
index 989f79c..a117799 100755
--- a/tests/tests/permission2/src/android/permission2/cts/PrivappPermissionsTest.java
+++ b/tests/tests/permission2/src/android/permission2/cts/PrivappPermissionsTest.java
@@ -44,8 +44,6 @@
 import com.android.compatibility.common.util.PropertyUtil;
 import com.android.compatibility.common.util.SystemUtil;
 
-import com.google.common.collect.ImmutableSet;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -72,27 +70,6 @@
 @AppModeFull(reason = "This test test platform properties, not capabilities of an apps")
 @RunWith(AndroidJUnit4.class)
 public class PrivappPermissionsTest {
-
-    // TODO(b/191740932): Migrate APK-in-APEX priv-app allowlists inside their respective modules,
-    // so that {@code adb shell cmd package get-privapp-permissions <packageName>} lists them.
-    private static final Set<String> APK_IN_APEX_ALLOWLIST_MIGRATION_BURNDOWN_LIST =
-            ImmutableSet.of(
-                // Updatable APEX packages
-                "com.google.android.networkstack.tethering",
-                "com.google.android.ext.services",
-                "com.google.android.providers.media.module",
-                "com.google.android.permissioncontroller",
-                "com.google.android.cellbroadcastreceiver",
-                "com.google.android.cellbroadcastservice",
-                // AOSP APEX packages
-                "com.android.networkstack.tethering",
-                "com.android.ext.services",
-                "com.android.providers.media.module",
-                "com.android.permissioncontroller",
-                "com.android.cellbroadcastreceiver",
-                "com.android.cellbroadcastservice"
-            );
-
     private static final String TAG = "PrivappPermissionsTest";
 
     private static final String PLATFORM_PACKAGE_NAME = "android";
@@ -130,12 +107,6 @@
                 continue;
             }
 
-            // Exempt apk-in-apexes that have not had their priv-app permission allowlist .xml
-            // migrated inside their respective APEXes.
-            if (APK_IN_APEX_ALLOWLIST_MIGRATION_BURNDOWN_LIST.contains(packageName)) {
-                continue;
-            }
-
             PackageInfo factoryPkg = pm
                     .getPackageInfo(packageName, MATCH_FACTORY_ONLY | GET_PERMISSIONS
                         | MATCH_UNINSTALLED_PACKAGES);
diff --git a/tests/tests/permission2/src/android/permission2/cts/ProtectedBroadcastsTest.java b/tests/tests/permission2/src/android/permission2/cts/ProtectedBroadcastsTest.java
index 7cbbd00..cf2a74b 100644
--- a/tests/tests/permission2/src/android/permission2/cts/ProtectedBroadcastsTest.java
+++ b/tests/tests/permission2/src/android/permission2/cts/ProtectedBroadcastsTest.java
@@ -17,6 +17,7 @@
 package android.permission2.cts;
 
 import android.content.Intent;
+import android.content.RestrictionsManager;
 import android.content.pm.PackageManager;
 import android.test.AndroidTestCase;
 
@@ -69,7 +70,9 @@
         "android.net.conn.TETHER_STATE_CHANGED",
         "android.net.conn.INET_CONDITION_ACTION",
         "android.net.conn.CAPTIVE_PORTAL_TEST_COMPLETED",
-        "com.android.server.inputmethod.InputMethodManagerService.SHOW_INPUT_METHOD_PICKER"
+        "com.android.server.inputmethod.InputMethodManagerService.SHOW_INPUT_METHOD_PICKER",
+        RestrictionsManager.ACTION_PERMISSION_RESPONSE_RECEIVED,
+        RestrictionsManager.ACTION_REQUEST_PERMISSION
     };
 
     private static final String BROADCASTS_TELEPHONY[] = new String[] {
diff --git a/tests/tests/permission2/src/android/permission2/cts/RuntimePermissionProperties.kt b/tests/tests/permission2/src/android/permission2/cts/RuntimePermissionProperties.kt
index dba2522..a1eca49 100644
--- a/tests/tests/permission2/src/android/permission2/cts/RuntimePermissionProperties.kt
+++ b/tests/tests/permission2/src/android/permission2/cts/RuntimePermissionProperties.kt
@@ -31,6 +31,7 @@
 import android.Manifest.permission.GET_ACCOUNTS
 import android.Manifest.permission.NEARBY_WIFI_DEVICES
 import android.Manifest.permission.PACKAGE_USAGE_STATS
+import android.Manifest.permission.POST_NOTIFICATIONS
 import android.Manifest.permission.PROCESS_OUTGOING_CALLS
 import android.Manifest.permission.READ_CALENDAR
 import android.Manifest.permission.READ_CALL_LOG
@@ -157,6 +158,7 @@
 
         // Add runtime permissions added in T which were _not_ split from a previously existing
         // runtime permission
+        expectedPerms.add(POST_NOTIFICATIONS)
         expectedPerms.add(NEARBY_WIFI_DEVICES)
 
         assertThat(expectedPerms).containsExactlyElementsIn(platformRuntimePerms.map { it.name })
diff --git a/tests/tests/permission3/Android.bp b/tests/tests/permission3/Android.bp
index ecc70dc..4928598 100644
--- a/tests/tests/permission3/Android.bp
+++ b/tests/tests/permission3/Android.bp
@@ -47,11 +47,19 @@
         ":CtsUsePermissionApp30",
         ":CtsUsePermissionApp30WithBackground",
         ":CtsUsePermissionApp30WithBluetooth",
+        ":CtsUsePermissionApp31",
+        ":CtsUsePermissionApp32",
         ":CtsUsePermissionAppLatest",
         ":CtsUsePermissionAppLatestNone",
         ":CtsUsePermissionAppWithOverlay",
         ":CtsAccessMicrophoneApp",
         ":CtsAccessMicrophoneApp2",
+        ":CtsAccessMicrophoneAppLocationProvider",
+        ":CtsAppLocationProviderWithSummary",
+        ":CtsHelperAppOverlay",
+        ":CtsCreateNotificationChannelsApp31",
+        ":CtsCreateNotificationChannelsApp33",
+        ":CtsDifferentPkgNameApp",
     ],
     test_suites: [
         "cts",
diff --git a/tests/tests/permission3/AndroidTest.xml b/tests/tests/permission3/AndroidTest.xml
index d708d76..384ea0b 100644
--- a/tests/tests/permission3/AndroidTest.xml
+++ b/tests/tests/permission3/AndroidTest.xml
@@ -21,6 +21,7 @@
     <option name="test-suite-tag" value="cts" />
 
     <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
@@ -41,6 +42,8 @@
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
         <option name="push" value="CtsAccessMicrophoneApp.apk->/data/local/tmp/cts/permission3/CtsAccessMicrophoneApp.apk" />
         <option name="push" value="CtsAccessMicrophoneApp2.apk->/data/local/tmp/cts/permission3/CtsAccessMicrophoneApp2.apk" />
+        <option name="push" value="CtsAccessMicrophoneAppLocationProvider.apk->/data/local/tmp/cts/permission3/CtsAccessMicrophoneAppLocationProvider.apk" />
+        <option name="push" value="CtsAppLocationProviderWithSummary.apk->/data/local/tmp/cts/permission3/CtsAppLocationProviderWithSummary.apk" />
         <option name="push" value="CtsPermissionPolicyApp25.apk->/data/local/tmp/cts/permission3/CtsPermissionPolicyApp25.apk" />
         <option name="push" value="CtsUsePermissionApp22.apk->/data/local/tmp/cts/permission3/CtsUsePermissionApp22.apk" />
         <option name="push" value="CtsUsePermissionApp22CalendarOnly.apk->/data/local/tmp/cts/permission3/CtsUsePermissionApp22CalendarOnly.apk" />
@@ -53,9 +56,15 @@
         <option name="push" value="CtsUsePermissionApp30.apk->/data/local/tmp/cts/permission3/CtsUsePermissionApp30.apk" />
         <option name="push" value="CtsUsePermissionApp30WithBackground.apk->/data/local/tmp/cts/permission3/CtsUsePermissionApp30WithBackground.apk" />
         <option name="push" value="CtsUsePermissionApp30WithBluetooth.apk->/data/local/tmp/cts/permission3/CtsUsePermissionApp30WithBluetooth.apk" />
+        <option name="push" value="CtsUsePermissionApp31.apk->/data/local/tmp/cts/permission3/CtsUsePermissionApp31.apk" />
+        <option name="push" value="CtsUsePermissionApp32.apk->/data/local/tmp/cts/permission3/CtsUsePermissionApp32.apk" />
         <option name="push" value="CtsUsePermissionAppLatest.apk->/data/local/tmp/cts/permission3/CtsUsePermissionAppLatest.apk" />
         <option name="push" value="CtsUsePermissionAppLatestNone.apk->/data/local/tmp/cts/permission3/CtsUsePermissionAppLatestNone.apk" />
         <option name="push" value="CtsUsePermissionAppWithOverlay.apk->/data/local/tmp/cts/permission3/CtsUsePermissionAppWithOverlay.apk" />
+        <option name="push" value="CtsHelperAppOverlay.apk->/data/local/tmp/cts/permission3/CtsHelperAppOverlay.apk" />
+        <option name="push" value="CtsCreateNotificationChannelsApp31.apk->/data/local/tmp/cts/permission3/CtsCreateNotificationChannelsApp31.apk" />
+        <option name="push" value="CtsCreateNotificationChannelsApp33.apk->/data/local/tmp/cts/permission3/CtsCreateNotificationChannelsApp33.apk" />
+        <option name="push" value="CtsDifferentPkgNameApp.apk->/data/local/tmp/cts/permission3/CtsDifferentPkgNameApp.apk" />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
diff --git a/tests/tests/permission3/CreateNotificationChannelsApp31/Android.bp b/tests/tests/permission3/CreateNotificationChannelsApp31/Android.bp
new file mode 100644
index 0000000..265a01c
--- /dev/null
+++ b/tests/tests/permission3/CreateNotificationChannelsApp31/Android.bp
@@ -0,0 +1,33 @@
+//
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsCreateNotificationChannelsApp31",
+    defaults: ["mts-target-sdk-version-current"],
+    min_sdk_version: "31",
+
+    static_libs: [
+        "kotlin-stdlib",
+    ],
+
+    srcs: [
+        "src/**/*.kt",
+    ],
+}
diff --git a/tests/tests/permission3/CreateNotificationChannelsApp31/AndroidManifest.xml b/tests/tests/permission3/CreateNotificationChannelsApp31/AndroidManifest.xml
new file mode 100644
index 0000000..8d24292
--- /dev/null
+++ b/tests/tests/permission3/CreateNotificationChannelsApp31/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.permission3.cts.usepermission"
+          android:versionCode="1">
+
+    <uses-sdk android:minSdkVersion="31" android:targetSdkVersion="31" />
+
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+
+    <application android:label="CreateNotif">
+        <activity android:name=".CreateNotificationChannelsActivity"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="usepermission.createchannels.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/tests/tests/permission3/CreateNotificationChannelsApp31/src/android/permission3/cts/usepermission/CreateNotificationChannelsActivity.kt b/tests/tests/permission3/CreateNotificationChannelsApp31/src/android/permission3/cts/usepermission/CreateNotificationChannelsActivity.kt
new file mode 100644
index 0000000..104655f
--- /dev/null
+++ b/tests/tests/permission3/CreateNotificationChannelsApp31/src/android/permission3/cts/usepermission/CreateNotificationChannelsActivity.kt
@@ -0,0 +1,133 @@
+/*
+ * Copyright (C) 2021 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 android.permission3.cts.usepermission
+
+import android.Manifest
+import android.app.Activity
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.os.Handler
+import android.os.Looper
+
+const val EXTRA_CREATE_CHANNELS = "extra_create"
+const val EXTRA_CREATE_CHANNELS_DELAYED = "extra_create_delayed"
+const val EXTRA_REQUEST_NOTIF_PERMISSION = "extra_request_notif_permission"
+const val EXTRA_REQUEST_OTHER_PERMISSIONS = "extra_request_permissions"
+const val EXTRA_REQUEST_OTHER_PERMISSIONS_DELAYED = "extra_request_permissions_delayed"
+const val EXTRA_START_SECOND_ACTIVITY = "extra_start_second_activity"
+const val EXTRA_START_SECOND_APP = "extra_start_second_app"
+const val SECONDARY_APP_INTENT = "emptyactivity.main"
+const val SECONDARY_APP_PKG = "android.permission3.cts.usepermissionother"
+const val CHANNEL_ID_31 = "test_channel_id"
+const val BROADCAST_ACTION = "usepermission.createchannels.BROADCAST"
+const val DELAY_MS = 1000L
+const val LONG_DELAY_MS = 2000L
+
+class CreateNotificationChannelsActivity : Activity() {
+    lateinit var notificationManager: NotificationManager
+    var launchActivityOnSecondResume = false
+    var isFirstResume = true
+    val handler = Handler(Looper.getMainLooper())
+
+    override fun onStart() {
+        val launchSecondActivity = intent.getBooleanExtra(EXTRA_START_SECOND_ACTIVITY, false)
+        notificationManager = baseContext.getSystemService(NotificationManager::class.java)!!
+        if (intent.getBooleanExtra(EXTRA_START_SECOND_APP, false)) {
+            handler.postDelayed({
+                val intent2 = Intent(SECONDARY_APP_INTENT)
+                intent2.`package` = SECONDARY_APP_PKG
+                intent2.addCategory(Intent.CATEGORY_DEFAULT)
+                handler.postDelayed({
+                    createChannel()
+                }, DELAY_MS)
+                startActivity(intent2)
+            }, LONG_DELAY_MS)
+        } else if (intent.getBooleanExtra(EXTRA_CREATE_CHANNELS, false)) {
+            createChannel()
+            if (launchSecondActivity) {
+                launchActivityOnSecondResume = true
+            }
+        } else if (intent.getBooleanExtra(EXTRA_CREATE_CHANNELS_DELAYED, false)) {
+            handler.postDelayed({
+                createChannel()
+            }, DELAY_MS)
+        } else {
+            if (launchSecondActivity) {
+                launchSecondActivity()
+            }
+        }
+
+
+        if (intent.getBooleanExtra(EXTRA_REQUEST_OTHER_PERMISSIONS, false)) {
+            requestPermissions(arrayOf(Manifest.permission.RECORD_AUDIO), 0)
+        } else if (intent.getBooleanExtra(EXTRA_REQUEST_OTHER_PERMISSIONS_DELAYED, false)) {
+            handler.postDelayed({
+                requestPermissions(arrayOf(Manifest.permission.RECORD_AUDIO), 0)
+            }, DELAY_MS)
+        }
+
+        if (intent.getBooleanExtra(EXTRA_REQUEST_NOTIF_PERMISSION, false)) {
+            requestPermissions(arrayOf(Manifest.permission.POST_NOTIFICATIONS), 0)
+        }
+
+        super.onStart()
+    }
+
+    private fun launchSecondActivity() {
+        handler.postDelayed({
+            val intent2 = Intent(Intent.ACTION_MAIN)
+            intent2.`package` = packageName
+            intent2.addCategory(Intent.CATEGORY_DEFAULT)
+            intent2.putExtra(EXTRA_CREATE_CHANNELS_DELAYED, true)
+            startActivity(intent2)
+                            }, LONG_DELAY_MS)
+    }
+
+    private fun createChannel() {
+        if (notificationManager.getNotificationChannel(CHANNEL_ID_31) == null) {
+            notificationManager.createNotificationChannel(NotificationChannel(CHANNEL_ID_31,
+                "Foreground Services", NotificationManager.IMPORTANCE_HIGH))
+        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (!isFirstResume && launchActivityOnSecondResume) {
+            launchSecondActivity()
+        }
+        isFirstResume = false
+    }
+
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        val grantedPerms = arrayListOf<String>()
+        for ((i, permName) in permissions.withIndex()) {
+            if (grantResults[i] == PackageManager.PERMISSION_GRANTED) {
+                grantedPerms.add(permName)
+            }
+        }
+        sendBroadcast(
+            Intent(BROADCAST_ACTION).putStringArrayListExtra(
+            PackageManager.EXTRA_REQUEST_PERMISSIONS_RESULTS, grantedPerms))
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/permission3/CreateNotificationChannelsApp33/Android.bp b/tests/tests/permission3/CreateNotificationChannelsApp33/Android.bp
new file mode 100644
index 0000000..876b68f
--- /dev/null
+++ b/tests/tests/permission3/CreateNotificationChannelsApp33/Android.bp
@@ -0,0 +1,35 @@
+//
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsCreateNotificationChannelsApp33",
+    defaults: ["mts-target-sdk-version-current"],
+    // TODO ntmyren: change to "33" when it is a valid target
+    sdk_version: "test_current",
+    min_sdk_version: "test_current",
+
+    static_libs: [
+        "kotlin-stdlib",
+    ],
+
+    srcs: [
+        "src/**/*.kt",
+    ],
+}
diff --git a/tests/tests/permission3/CreateNotificationChannelsApp33/AndroidManifest.xml b/tests/tests/permission3/CreateNotificationChannelsApp33/AndroidManifest.xml
new file mode 100644
index 0000000..0df09eb
--- /dev/null
+++ b/tests/tests/permission3/CreateNotificationChannelsApp33/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.permission3.cts.usepermission"
+          android:versionCode="1">
+
+    <uses-sdk android:minSdkVersion="33" android:targetSdkVersion="33" />
+
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
+
+    <application android:label="CreateNotif">
+        <activity android:name=".CreateNotificationChannelsActivity"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="usepermission.createchannels.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/tests/tests/permission3/CreateNotificationChannelsApp33/src/android/permission3/cts/usepermission/CreateNotificationChannelsActivity.kt b/tests/tests/permission3/CreateNotificationChannelsApp33/src/android/permission3/cts/usepermission/CreateNotificationChannelsActivity.kt
new file mode 100644
index 0000000..3870007
--- /dev/null
+++ b/tests/tests/permission3/CreateNotificationChannelsApp33/src/android/permission3/cts/usepermission/CreateNotificationChannelsActivity.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2021 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 android.permission3.cts.usepermission
+
+import android.Manifest
+import android.app.Activity
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.os.Handler
+import android.os.Looper
+
+const val EXTRA_DELETE_CHANNELS_ON_CLOSE = "extra_delete_channels_on_close"
+const val EXTRA_CREATE_CHANNELS = "extra_create"
+const val EXTRA_REQUEST_PERMISSIONS = "extra_request_permissions"
+const val EXTRA_REQUEST_PERMISSIONS_DELAYED = "extra_request_permissions_delayed"
+const val CHANNEL_ID = "channel_id"
+const val DELAY_MS = 1000L
+
+class CreateNotificationChannelsActivity : Activity() {
+    lateinit var notificationManager: NotificationManager
+    override fun onStart() {
+        val handler = Handler(Looper.getMainLooper())
+        notificationManager = baseContext.getSystemService(NotificationManager::class.java)!!
+        if (intent.getBooleanExtra(EXTRA_CREATE_CHANNELS, false)) {
+            if (notificationManager.getNotificationChannel(CHANNEL_ID) == null) {
+                notificationManager.createNotificationChannel(NotificationChannel(CHANNEL_ID,
+                        "Foreground Services", NotificationManager.IMPORTANCE_HIGH))
+            }
+        }
+
+        if (intent.getBooleanExtra(EXTRA_REQUEST_PERMISSIONS, false)) {
+            requestPermissions(arrayOf(Manifest.permission.POST_NOTIFICATIONS), 0)
+        } else if (intent.getBooleanExtra(EXTRA_REQUEST_PERMISSIONS_DELAYED, false)) {
+            handler.postDelayed({
+                requestPermissions(arrayOf(Manifest.permission.POST_NOTIFICATIONS), 0)
+            }, DELAY_MS)
+        }
+
+        super.onStart()
+    }
+
+    override fun onPause() {
+        if (intent.getBooleanExtra(EXTRA_DELETE_CHANNELS_ON_CLOSE, false)) {
+            notificationManager.deleteNotificationChannel(CHANNEL_ID)
+        }
+        super.onPause()
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/permission3/DifferentPkgNameApp/Android.bp b/tests/tests/permission3/DifferentPkgNameApp/Android.bp
new file mode 100644
index 0000000..3db3c30
--- /dev/null
+++ b/tests/tests/permission3/DifferentPkgNameApp/Android.bp
@@ -0,0 +1,33 @@
+//
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsDifferentPkgNameApp",
+    defaults: ["mts-target-sdk-version-current"],
+    min_sdk_version: "31",
+
+    static_libs: [
+        "kotlin-stdlib",
+    ],
+
+    srcs: [
+        "src/**/*.kt",
+    ],
+}
diff --git a/tests/tests/permission3/DifferentPkgNameApp/AndroidManifest.xml b/tests/tests/permission3/DifferentPkgNameApp/AndroidManifest.xml
new file mode 100644
index 0000000..77c45ba
--- /dev/null
+++ b/tests/tests/permission3/DifferentPkgNameApp/AndroidManifest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.permission3.cts.usepermissionother"
+          android:versionCode="1">
+
+    <uses-sdk android:minSdkVersion="31" android:targetSdkVersion="31" />
+
+    <application android:label="EmptyActivity">
+        <activity android:name=".EmptyActivity"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="emptyactivity.main" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/tests/tests/permission3/DifferentPkgNameApp/src/android/permission3/cts/usepermissionother/EmptyActivity.kt b/tests/tests/permission3/DifferentPkgNameApp/src/android/permission3/cts/usepermissionother/EmptyActivity.kt
new file mode 100644
index 0000000..e60466e
--- /dev/null
+++ b/tests/tests/permission3/DifferentPkgNameApp/src/android/permission3/cts/usepermissionother/EmptyActivity.kt
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2022 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 android.permission3.cts.usepermissionother
+
+import android.app.Activity
+
+class EmptyActivity : Activity()
\ No newline at end of file
diff --git a/tests/tests/permission3/HelperAppOverlay/Android.bp b/tests/tests/permission3/HelperAppOverlay/Android.bp
new file mode 100644
index 0000000..94d9653
--- /dev/null
+++ b/tests/tests/permission3/HelperAppOverlay/Android.bp
@@ -0,0 +1,32 @@
+//
+// Copyright (C) 2020 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsHelperAppOverlay",
+    defaults: ["mts-target-sdk-version-current"],
+    min_sdk_version: "30",
+    srcs: [
+        "src/**/*.kt",
+    ],
+    static_libs: [
+        "kotlin-stdlib",
+    ],
+    certificate: ":cts-testkey2",
+}
diff --git a/tests/tests/permission3/HelperAppOverlay/AndroidManifest.xml b/tests/tests/permission3/HelperAppOverlay/AndroidManifest.xml
new file mode 100644
index 0000000..04d5a4b
--- /dev/null
+++ b/tests/tests/permission3/HelperAppOverlay/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2020 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.permission3.cts.helper.overlay">
+
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+
+    <application>
+        <activity android:name=".OverlayActivity" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/tests/tests/permission3/HelperAppOverlay/src/android/permission3/cts/helper/overlay/OverlayActivity.kt b/tests/tests/permission3/HelperAppOverlay/src/android/permission3/cts/helper/overlay/OverlayActivity.kt
new file mode 100644
index 0000000..2c1497f
--- /dev/null
+++ b/tests/tests/permission3/HelperAppOverlay/src/android/permission3/cts/helper/overlay/OverlayActivity.kt
@@ -0,0 +1,26 @@
+package android.permission3.cts.helper.overlay
+
+import android.app.Activity
+import android.os.Bundle
+import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams.MATCH_PARENT
+import android.view.WindowManager
+import android.widget.LinearLayout
+import android.widget.TextView
+
+class OverlayActivity : Activity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val mainLayout = LinearLayout(this)
+        mainLayout.layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)
+        val textView = TextView(this)
+
+        textView.text = "Find me!"
+        mainLayout.addView(textView)
+
+        val windowParams = WindowManager.LayoutParams()
+        windowParams.type = WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY
+        windowManager.addView(mainLayout, windowParams)
+    }
+}
diff --git a/tests/tests/permission3/UsePermissionApp30WithBluetooth/src/android/permission3/cts/usepermission/AccessBluetoothOnCommand.kt b/tests/tests/permission3/UsePermissionApp30WithBluetooth/src/android/permission3/cts/usepermission/AccessBluetoothOnCommand.kt
index 9a09f18..1105009 100644
--- a/tests/tests/permission3/UsePermissionApp30WithBluetooth/src/android/permission3/cts/usepermission/AccessBluetoothOnCommand.kt
+++ b/tests/tests/permission3/UsePermissionApp30WithBluetooth/src/android/permission3/cts/usepermission/AccessBluetoothOnCommand.kt
@@ -31,7 +31,7 @@
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.atomic.AtomicInteger
 
-private const val TAG = "AccessBluetoothOnCommand"
+private const val LOG_TAG = "AccessBluetoothOnCommand"
 
 class AccessBluetoothOnCommand : ContentProvider() {
 
@@ -40,6 +40,7 @@
     }
 
     override fun call(authority: String, method: String, arg: String?, extras: Bundle?): Bundle? {
+        Log.v(LOG_TAG, "call() - start")
         val res = Bundle()
 
         var scanner: BluetoothLeScanner? = null
@@ -55,31 +56,36 @@
 
             scanCallback = object : ScanCallback() {
                 override fun onScanResult(callbackType: Int, result: ScanResult) {
-                    Log.v(TAG, "onScanResult() - result = $result")
+                    Log.v(LOG_TAG, "onScanResult() - result = $result")
                     observedScans.add(Base64.encodeToString(result.scanRecord!!.bytes, 0))
                 }
 
                 override fun onBatchScanResults(results: List<ScanResult>) {
+                    Log.v(LOG_TAG, "onBatchScanResults() - results.size = ${results.size}")
                     for (result in results) {
                         onScanResult(0, result)
                     }
                 }
 
                 override fun onScanFailed(errorCode: Int) {
-                    Log.v(TAG, "onScanFailed() - errorCode = $errorCode")
+                    Log.e(LOG_TAG, "onScanFailed() - errorCode = $errorCode")
                     observedErrorCode.set(errorCode)
                 }
             }
 
+            Log.v(LOG_TAG, "call() - startScan...")
             scanner.startScan(scanCallback)
 
             // Wait a few seconds to figure out what we actually observed
+            Log.v(LOG_TAG, "call() - sleep...")
             SystemClock.sleep(3000)
 
             if (observedErrorCode.get() > 0) {
+                Log.v(LOG_TAG, "call() observed error: ${observedErrorCode.get()}")
                 res.putInt(Intent.EXTRA_INDEX, Result.ERROR.ordinal)
                 return res
             }
+            Log.v(LOG_TAG, "call() - (scanCount=${observedScans.size})")
 
             when (observedScans.size) {
                 0 -> res.putInt(Intent.EXTRA_INDEX, Result.EMPTY.ordinal)
@@ -88,14 +94,17 @@
                 else -> res.putInt(Intent.EXTRA_INDEX, Result.UNKNOWN.ordinal)
             }
         } catch (t: Throwable) {
-            Log.v(TAG, "Failed to scan", t)
+            Log.e(LOG_TAG, "call() - EXCEPTION", t)
             res.putInt(Intent.EXTRA_INDEX, Result.EXCEPTION.ordinal)
         } finally {
             try {
+                Log.v(LOG_TAG, "call() - finally - stopScan...")
                 scanner!!.stopScan(scanCallback)
             } catch (e: Exception) {
+                Log.e(LOG_TAG, "call() - finally - EXCEPTION", e)
             }
         }
+        Log.v(LOG_TAG, "call() - end")
         return res
     }
 
diff --git a/tests/tests/permission3/UsePermissionApp31/Android.bp b/tests/tests/permission3/UsePermissionApp31/Android.bp
new file mode 100644
index 0000000..48a2d4f
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionApp31/Android.bp
@@ -0,0 +1,32 @@
+//
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsUsePermissionApp31",
+    srcs: [
+        ":CtsUsePermissionAppSrc",
+    ],
+    static_libs: [
+        "kotlin-stdlib",
+    ],
+    certificate: ":cts-testkey2",
+    target_sdk_version: "31",
+    min_sdk_version: "31",
+}
diff --git a/tests/tests/permission3/UsePermissionApp31/AndroidManifest.xml b/tests/tests/permission3/UsePermissionApp31/AndroidManifest.xml
new file mode 100644
index 0000000..dfa12b7
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionApp31/AndroidManifest.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.permission3.cts.usepermission">
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.BODY_SENSORS" />
+    <application>
+        <activity android:name=".CheckCalendarAccessActivity" android:exported="true" />
+        <activity android:name=".FinishOnCreateActivity" android:exported="true" />
+        <activity android:name=".RequestPermissionsActivity" android:exported="true" />
+    </application>
+</manifest>
diff --git a/tests/tests/permission3/UsePermissionApp32/Android.bp b/tests/tests/permission3/UsePermissionApp32/Android.bp
new file mode 100644
index 0000000..adf24cf
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionApp32/Android.bp
@@ -0,0 +1,33 @@
+//
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsUsePermissionApp32",
+    srcs: [
+        ":CtsUsePermissionAppSrc",
+    ],
+    static_libs: [
+        "kotlin-stdlib",
+    ],
+    certificate: ":cts-testkey2",
+
+    min_sdk_version: "32",
+    target_sdk_version: "32",
+}
diff --git a/tests/tests/permission3/UsePermissionApp32/AndroidManifest.xml b/tests/tests/permission3/UsePermissionApp32/AndroidManifest.xml
new file mode 100644
index 0000000..35df6c8
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionApp32/AndroidManifest.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.permission3.cts.usepermission">
+    <uses-permission android:name="android.permission.BODY_SENSORS" />
+    <application>
+        <activity android:name=".RequestPermissionsActivity" android:exported="true" />
+    </application>
+</manifest>
diff --git a/tests/tests/permission3/UsePermissionAppLatest/AndroidManifest.xml b/tests/tests/permission3/UsePermissionAppLatest/AndroidManifest.xml
index 1d8cdf3..0c125d0 100644
--- a/tests/tests/permission3/UsePermissionAppLatest/AndroidManifest.xml
+++ b/tests/tests/permission3/UsePermissionAppLatest/AndroidManifest.xml
@@ -25,7 +25,7 @@
     <uses-permission android:name="android.permission.RECEIVE_SMS" />
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-
+    <uses-permission android:name="android.permission.BODY_SENSORS" />
     <application>
         <activity android:name=".CheckCalendarAccessActivity" android:exported="true" />
         <activity android:name=".FinishOnCreateActivity" android:exported="true" />
diff --git a/tests/tests/permission3/UsePermissionAppLocationProvider/Android.bp b/tests/tests/permission3/UsePermissionAppLocationProvider/Android.bp
new file mode 100644
index 0000000..a2cd88d
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionAppLocationProvider/Android.bp
@@ -0,0 +1,31 @@
+//
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsAccessMicrophoneAppLocationProvider",
+    defaults: ["mts-target-sdk-version-current"],
+    min_sdk_version: "31",
+    srcs: [
+        "src/**/*.kt",
+    ],
+    static_libs: [
+        "kotlin-stdlib",
+    ],
+}
\ No newline at end of file
diff --git a/tests/tests/permission3/UsePermissionAppLocationProvider/AndroidManifest.xml b/tests/tests/permission3/UsePermissionAppLocationProvider/AndroidManifest.xml
new file mode 100644
index 0000000..56afc09
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionAppLocationProvider/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.permission3.cts.accessmicrophoneapplocationprovider">
+
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+
+    <attribution
+        android:label="@string/attribution_label"
+        android:tag="test.tag" />
+
+    <application
+        android:attributionsAreUserVisible="true"
+        android:label="LocationProviderWithMicApp">
+        <activity android:name=".AddLocationProviderActivity" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name=".UseMicrophoneActivity" android:exported="true"/>
+    </application>
+</manifest>
diff --git a/tests/tests/permission3/UsePermissionAppLocationProvider/res/values/strings.xml b/tests/tests/permission3/UsePermissionAppLocationProvider/res/values/strings.xml
new file mode 100644
index 0000000..9682d7f
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionAppLocationProvider/res/values/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<resources>
+    <string name="attribution_label">Attribution Label</string>
+</resources>
diff --git a/tests/tests/permission3/UsePermissionAppLocationProvider/src/android/permission3/cts/accessmicrophoneapplocationprovider/AddLocationProviderActivity.kt b/tests/tests/permission3/UsePermissionAppLocationProvider/src/android/permission3/cts/accessmicrophoneapplocationprovider/AddLocationProviderActivity.kt
new file mode 100644
index 0000000..3b3355cc
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionAppLocationProvider/src/android/permission3/cts/accessmicrophoneapplocationprovider/AddLocationProviderActivity.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 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 android.permission3.cts.accessmicrophoneapplocationprovider
+
+import android.app.Activity
+import android.location.Criteria
+import android.location.LocationManager
+import android.os.Bundle
+
+/**
+ * An activity that adds this package as a test location provider and uses microphone.
+ */
+class AddLocationProviderActivity : Activity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val attrContext = createAttributionContext("test.tag")
+        val locationManager = attrContext.getSystemService(LocationManager::class.java)
+        locationManager.addTestProvider(
+            packageName, false, false, false, false, false, false, false, Criteria.POWER_LOW,
+            Criteria.ACCURACY_COARSE
+        )
+
+        setResult(RESULT_OK)
+        finish()
+    }
+}
diff --git a/tests/tests/permission3/UsePermissionAppLocationProvider/src/android/permission3/cts/accessmicrophoneapplocationprovider/UseMicrophoneActivity.kt b/tests/tests/permission3/UsePermissionAppLocationProvider/src/android/permission3/cts/accessmicrophoneapplocationprovider/UseMicrophoneActivity.kt
new file mode 100644
index 0000000..0d8374f
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionAppLocationProvider/src/android/permission3/cts/accessmicrophoneapplocationprovider/UseMicrophoneActivity.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (C) 2021 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 android.permission3.cts.accessmicrophoneapplocationprovider
+
+import android.app.Activity
+import android.content.Context
+import android.media.AudioFormat
+import android.media.AudioRecord
+import android.media.MediaRecorder
+import android.os.Bundle
+import android.os.Handler
+
+private const val USE_DURATION_MS = 10000L
+private const val SAMPLE_RATE_HZ = 44100
+
+/**
+ * An activity that uses microphone.
+ */
+class UseMicrophoneActivity : Activity() {
+    private var recorder: AudioRecord? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val attrContext = createAttributionContext("test.tag")
+        useMic(attrContext)
+        setResult(RESULT_OK)
+        finish()
+    }
+
+    override fun finish() {
+        recorder?.stop()
+        recorder = null
+        super.finish()
+    }
+
+    override fun onStop() {
+        super.onStop()
+        finish()
+    }
+
+    private fun useMic(context: Context) {
+        recorder = AudioRecord.Builder()
+            .setAudioSource(MediaRecorder.AudioSource.MIC)
+            .setAudioFormat(AudioFormat.Builder()
+                .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                .setSampleRate(SAMPLE_RATE_HZ)
+                .setChannelMask(AudioFormat.CHANNEL_IN_MONO)
+                .build())
+            .setContext(context)
+            .build()
+        recorder?.startRecording()
+        Handler().postDelayed({ finish() }, USE_DURATION_MS)
+    }
+}
diff --git a/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/Android.bp b/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/Android.bp
new file mode 100644
index 0000000..91143ae
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/Android.bp
@@ -0,0 +1,31 @@
+//
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsAppLocationProviderWithSummary",
+    defaults: ["mts-target-sdk-version-current"],
+    min_sdk_version: "31",
+    srcs: [
+        "src/**/*.kt",
+    ],
+    static_libs: [
+        "kotlin-stdlib",
+    ],
+}
diff --git a/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/AndroidManifest.xml b/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/AndroidManifest.xml
new file mode 100644
index 0000000..020f613
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.permission3.cts.applocationproviderwithsummary">
+
+  <application
+      android:label="LocationProviderWithSummaryApp">
+    <activity android:name=".AddLocationProviderActivity" android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+    <activity android:name=".AllServicesActivity" android:exported="true">
+      <intent-filter>
+        <action android:name="android.intent.action.VIEW_APP_FEATURES" />
+      </intent-filter>
+      <meta-data
+          android:name="app_features_preference_summary"
+          android:resource="@string/summary_label"/>
+    </activity>
+  </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/res/values/strings.xml b/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/res/values/strings.xml
new file mode 100644
index 0000000..d6f150a
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/res/values/strings.xml
@@ -0,0 +1,19 @@
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+<resources>
+  <string name="attribution_label">Attribution label.</string>
+  <string name="summary_label">Services summary.</string>
+</resources>
diff --git a/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/src/AddLocationProviderActivity.kt b/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/src/AddLocationProviderActivity.kt
new file mode 100644
index 0000000..632bbb6
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/src/AddLocationProviderActivity.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2022 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 android.permission3.cts.applocationproviderwithsummary
+
+import android.app.Activity
+import android.location.Criteria
+import android.location.LocationManager
+import android.os.Bundle
+
+/**
+ * An activity that adds this package as a test location provider.
+ */
+class AddLocationProviderActivity : Activity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        val attrContext = createAttributionContext("test.tag")
+        val locationManager = attrContext.getSystemService(LocationManager::class.java)
+        locationManager.addTestProvider(
+            packageName, false, false, false, false, false, false, false, Criteria.POWER_LOW,
+            Criteria.ACCURACY_COARSE
+        )
+
+        setResult(RESULT_OK)
+        finish()
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/src/AllServicesActivity.kt b/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/src/AllServicesActivity.kt
new file mode 100644
index 0000000..94939de
--- /dev/null
+++ b/tests/tests/permission3/UsePermissionAppLocationProviderWithSummary/src/AllServicesActivity.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 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.
+ */
+import android.app.Activity
+import android.os.Bundle
+
+class AllServicesActivity : Activity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/permission3/UsePermissionAppWithOverlay/src/android/permission3/cts/usepermission/OverlayActivity.kt b/tests/tests/permission3/UsePermissionAppWithOverlay/src/android/permission3/cts/usepermission/OverlayActivity.kt
index 2f0b9fc5..ec6f607 100644
--- a/tests/tests/permission3/UsePermissionAppWithOverlay/src/android/permission3/cts/usepermission/OverlayActivity.kt
+++ b/tests/tests/permission3/UsePermissionAppWithOverlay/src/android/permission3/cts/usepermission/OverlayActivity.kt
@@ -18,14 +18,15 @@
         params.flags = (WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS or
                 WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL or
                 WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE or
-                WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+                WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON or
+                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN)
 
         if (!intent.getBooleanExtra(EXTRA_FULL_OVERLAY, true)) {
             params.gravity = Gravity.LEFT or Gravity.TOP
-            val left = intent.getIntExtra(DIALOG_LEFT, params.x)
-            val top = intent.getIntExtra(DIALOG_TOP, params.y)
-            val right = intent.getIntExtra(DIALOG_RIGHT, params.x + params.width)
-            val bottom = intent.getIntExtra(MESSAGE_BOTTOM, top + 1)
+            val left = intent.getIntExtra(OVERLAY_LEFT, params.x)
+            val top = intent.getIntExtra(OVERLAY_TOP, params.y)
+            val right = intent.getIntExtra(OVERLAY_RIGHT, params.x + params.width)
+            val bottom = intent.getIntExtra(OVERLAY_BOTTOM, top + 1)
             params.x = left
             params.y = top
             params.width = right - left
@@ -40,15 +41,15 @@
 
                 finish()
             }
-        }, IntentFilter(RequestPermissionsActivity.ACTION_HIDE_OVERLAY))
+        }, IntentFilter(RequestPermissionsActivity.ACTION_HIDE_OVERLAY), RECEIVER_EXPORTED)
     }
 
     companion object {
         const val EXTRA_FULL_OVERLAY = "android.permission3.cts.usepermission.extra.FULL_OVERLAY"
 
-        const val DIALOG_LEFT = "android.permission3.cts.usepermission.extra.DIALOG_LEFT"
-        const val DIALOG_TOP = "android.permission3.cts.usepermission.extra.DIALOG_TOP"
-        const val DIALOG_RIGHT = "android.permission3.cts.usepermission.extra.DIALOG_RIGHT"
-        const val MESSAGE_BOTTOM = "android.permission3.cts.usepermission.extra.MESSAGE_BOTTOM"
+        const val OVERLAY_LEFT = "android.permission3.cts.usepermission.extra.OVERLAY_LEFT"
+        const val OVERLAY_TOP = "android.permission3.cts.usepermission.extra.OVERLAY_TOP"
+        const val OVERLAY_RIGHT = "android.permission3.cts.usepermission.extra.OVERLAY_RIGHT"
+        const val OVERLAY_BOTTOM = "android.permission3.cts.usepermission.extra.OVERLAY_BOTTOM"
     }
-}
\ No newline at end of file
+}
diff --git a/tests/tests/permission3/UsePermissionAppWithOverlay/src/android/permission3/cts/usepermission/RequestPermissionsActivity.kt b/tests/tests/permission3/UsePermissionAppWithOverlay/src/android/permission3/cts/usepermission/RequestPermissionsActivity.kt
index c8ac47e..8735b40 100644
--- a/tests/tests/permission3/UsePermissionAppWithOverlay/src/android/permission3/cts/usepermission/RequestPermissionsActivity.kt
+++ b/tests/tests/permission3/UsePermissionAppWithOverlay/src/android/permission3/cts/usepermission/RequestPermissionsActivity.kt
@@ -42,7 +42,7 @@
                         .setComponent(ComponentName(context!!, OverlayActivity::class.java))
                         .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
             }
-        }, IntentFilter(ACTION_SHOW_OVERLAY))
+        }, IntentFilter(ACTION_SHOW_OVERLAY), RECEIVER_EXPORTED)
         Handler(mainLooper).post(this::eventuallyRequestPermission)
     }
 
diff --git a/tests/tests/permission3/src/android/permission3/cts/BasePermissionHubTest.kt b/tests/tests/permission3/src/android/permission3/cts/BasePermissionHubTest.kt
new file mode 100644
index 0000000..014a4f3
--- /dev/null
+++ b/tests/tests/permission3/src/android/permission3/cts/BasePermissionHubTest.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2021 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 android.permission3.cts
+
+import android.content.Intent
+import com.android.compatibility.common.util.SystemUtil
+
+/** Base class for the permission hub tests. */
+abstract class BasePermissionHubTest : BasePermissionTest() {
+
+    protected fun openMicrophoneTimeline() {
+        SystemUtil.runWithShellPermissionIdentity {
+            context.startActivity(Intent(Intent.ACTION_REVIEW_PERMISSION_HISTORY).apply {
+                putExtra(Intent.EXTRA_PERMISSION_GROUP_NAME,
+                    android.Manifest.permission_group.MICROPHONE)
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            })
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/permission3/src/android/permission3/cts/BasePermissionTest.kt b/tests/tests/permission3/src/android/permission3/cts/BasePermissionTest.kt
index c0ee17b..266b486 100644
--- a/tests/tests/permission3/src/android/permission3/cts/BasePermissionTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/BasePermissionTest.kt
@@ -22,11 +22,14 @@
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.res.Resources
+import android.os.SystemClock
 import android.provider.Settings
 import android.support.test.uiautomator.By
 import android.support.test.uiautomator.BySelector
+import android.support.test.uiautomator.StaleObjectException
 import android.support.test.uiautomator.UiDevice
 import android.support.test.uiautomator.UiObject2
+import android.text.Html
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.rule.ActivityTestRule
 import com.android.compatibility.common.util.DisableAnimationRule
@@ -59,6 +62,10 @@
     private val mPermissionControllerResources: Resources = context.createPackageContext(
             context.packageManager.permissionControllerPackageName, 0).resources
 
+    protected val isTv = packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
+    protected val isWatch = packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)
+    protected val isAutomotive = packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)
+
     @get:Rule
     val disableAnimationRule = DisableAnimationRule()
 
@@ -99,11 +106,14 @@
         pressHome()
     }
 
-    protected fun getPermissionControllerString(res: String): Pattern =
-            Pattern.compile(Pattern.quote(mPermissionControllerResources.getString(
-                    mPermissionControllerResources.getIdentifier(
-                            res, "string", "com.android.permissioncontroller"))),
-                    Pattern.CASE_INSENSITIVE or Pattern.UNICODE_CASE)
+    protected fun getPermissionControllerString(res: String, vararg formatArgs: Any): Pattern {
+        val textWithHtml = mPermissionControllerResources.getString(
+                mPermissionControllerResources.getIdentifier(
+                        res, "string", "com.android.permissioncontroller"), *formatArgs)
+        val textWithoutHtml = Html.fromHtml(textWithHtml, 0).toString()
+        return Pattern.compile(Pattern.quote(textWithoutHtml),
+                Pattern.CASE_INSENSITIVE or Pattern.UNICODE_CASE)
+    }
 
     protected fun installPackage(
         apkPath: String,
@@ -131,22 +141,41 @@
 
     protected fun waitFindObject(selector: BySelector): UiObject2 {
         waitForIdle()
-        return UiAutomatorUtils.waitFindObject(selector)
+        return findObjectWithRetry({ t -> UiAutomatorUtils.waitFindObject(selector, t) })!!
     }
 
     protected fun waitFindObject(selector: BySelector, timeoutMillis: Long): UiObject2 {
         waitForIdle()
-        return UiAutomatorUtils.waitFindObject(selector, timeoutMillis)
+        return findObjectWithRetry({ t -> UiAutomatorUtils.waitFindObject(selector, t) },
+                timeoutMillis)!!
     }
 
     protected fun waitFindObjectOrNull(selector: BySelector): UiObject2? {
         waitForIdle()
-        return UiAutomatorUtils.waitFindObjectOrNull(selector)
+        return findObjectWithRetry({ t -> UiAutomatorUtils.waitFindObjectOrNull(selector, t) })
     }
 
     protected fun waitFindObjectOrNull(selector: BySelector, timeoutMillis: Long): UiObject2? {
         waitForIdle()
-        return UiAutomatorUtils.waitFindObjectOrNull(selector, timeoutMillis)
+        return findObjectWithRetry({ t -> UiAutomatorUtils.waitFindObjectOrNull(selector, t) },
+                timeoutMillis)
+    }
+
+    private fun findObjectWithRetry(
+        automatorMethod: (timeoutMillis: Long) -> UiObject2?,
+        timeoutMillis: Long = 20_000L
+    ): UiObject2? {
+        waitForIdle()
+        val startTime = SystemClock.elapsedRealtime()
+        return try {
+            automatorMethod(timeoutMillis)
+        } catch (e: StaleObjectException) {
+            val remainingTime = timeoutMillis - (SystemClock.elapsedRealtime() - startTime)
+            if (remainingTime <= 0) {
+                throw e
+            }
+            automatorMethod(remainingTime)
+        }
     }
 
     protected fun click(selector: BySelector, timeoutMillis: Long = 20_000) {
diff --git a/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt b/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt
index 49ae67f..fe5892e 100644
--- a/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/BaseUsePermissionTest.kt
@@ -28,12 +28,11 @@
 import android.support.test.uiautomator.BySelector
 import android.support.test.uiautomator.UiScrollable
 import android.support.test.uiautomator.UiSelector
-import android.support.test.uiautomator.StaleObjectException
 import android.text.Spanned
 import android.text.style.ClickableSpan
-import android.util.Log
 import android.view.View
 import com.android.compatibility.common.util.SystemUtil.eventually
+import com.android.modules.utils.build.SdkLevel
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNotNull
@@ -54,6 +53,9 @@
         const val APP_APK_PATH_28 = "$APK_DIRECTORY/CtsUsePermissionApp28.apk"
         const val APP_APK_PATH_29 = "$APK_DIRECTORY/CtsUsePermissionApp29.apk"
         const val APP_APK_PATH_30 = "$APK_DIRECTORY/CtsUsePermissionApp30.apk"
+        const val APP_APK_PATH_31 = "$APK_DIRECTORY/CtsUsePermissionApp31.apk"
+        const val APP_APK_PATH_32 = "$APK_DIRECTORY/CtsUsePermissionApp32.apk"
+
         const val APP_APK_PATH_30_WITH_BACKGROUND =
                 "$APK_DIRECTORY/CtsUsePermissionApp30WithBackground.apk"
         const val APP_APK_PATH_30_WITH_BLUETOOTH =
@@ -61,7 +63,14 @@
         const val APP_APK_PATH_LATEST = "$APK_DIRECTORY/CtsUsePermissionAppLatest.apk"
         const val APP_APK_PATH_LATEST_NONE = "$APK_DIRECTORY/CtsUsePermissionAppLatestNone.apk"
         const val APP_APK_PATH_WITH_OVERLAY = "$APK_DIRECTORY/CtsUsePermissionAppWithOverlay.apk"
+        const val APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31 =
+            "$APK_DIRECTORY/CtsCreateNotificationChannelsApp31.apk"
+        const val APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_33 =
+            "$APK_DIRECTORY/CtsCreateNotificationChannelsApp33.apk"
+        const val APP_APK_PATH_OTHER_APP =
+            "$APK_DIRECTORY/CtsDifferentPkgNameApp.apk"
         const val APP_PACKAGE_NAME = "android.permission3.cts.usepermission"
+        const val OTHER_APP_PACKAGE_NAME = "android.permission3.cts.usepermissionother"
 
         const val ALLOW_BUTTON =
                 "com.android.permissioncontroller:id/permission_allow_button"
@@ -76,21 +85,38 @@
                 "com.android.permissioncontroller:" +
                         "id/permission_no_upgrade_and_dont_ask_again_button"
 
+        const val ALLOW_ALWAYS_RADIO_BUTTON =
+                "com.android.permissioncontroller:id/allow_always_radio_button"
         const val ALLOW_RADIO_BUTTON = "com.android.permissioncontroller:id/allow_radio_button"
         const val ALLOW_FOREGROUND_RADIO_BUTTON =
                 "com.android.permissioncontroller:id/allow_foreground_only_radio_button"
         const val ASK_RADIO_BUTTON = "com.android.permissioncontroller:id/ask_radio_button"
         const val DENY_RADIO_BUTTON = "com.android.permissioncontroller:id/deny_radio_button"
 
+        const val NOTIF_TEXT = "permgrouprequest_notifications"
+        const val NOTIF_CONTINUE_TEXT = "permgrouprequestcontinue_notifications"
         const val ALLOW_BUTTON_TEXT = "grant_dialog_button_allow"
         const val ALLOW_FOREGROUND_BUTTON_TEXT = "grant_dialog_button_allow_foreground"
         const val ALLOW_FOREGROUND_PREFERENCE_TEXT = "permission_access_only_foreground"
         const val ASK_BUTTON_TEXT = "app_permission_button_ask"
         const val ALLOW_ONE_TIME_BUTTON_TEXT = "grant_dialog_button_allow_one_time"
         const val DENY_BUTTON_TEXT = "grant_dialog_button_deny"
+        const val DENY_ANYWAY_BUTTON_TEXT = "grant_dialog_button_deny_anyway"
         const val DENY_AND_DONT_ASK_AGAIN_BUTTON_TEXT =
                 "grant_dialog_button_deny_and_dont_ask_again"
         const val NO_UPGRADE_AND_DONT_ASK_AGAIN_BUTTON_TEXT = "grant_dialog_button_no_upgrade"
+        const val ALERT_DIALOG_MESSAGE = "android:id/message"
+
+        const val REQUEST_LOCATION_MESSAGE = "permgrouprequest_location"
+
+        val STORAGE_AND_MEDIA_PERMISSIONS = setOf(
+            android.Manifest.permission.READ_EXTERNAL_STORAGE,
+            android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            android.Manifest.permission.ACCESS_MEDIA_LOCATION,
+            android.Manifest.permission.READ_MEDIA_AUDIO,
+            android.Manifest.permission.READ_MEDIA_IMAGES,
+            android.Manifest.permission.READ_MEDIA_VIDEO
+        )
     }
 
     enum class PermissionState {
@@ -99,10 +125,6 @@
         DENIED_WITH_PREJUDICE
     }
 
-    protected val isTv = packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
-    protected val isWatch = packageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)
-    protected val isAutomotive = packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)
-
     private val platformResources = context.createPackageContext("android", 0).resources
     private val permissionToLabelResNameMap = mapOf(
             // Contacts
@@ -132,6 +154,8 @@
                     to "@android:string/permgrouplab_location",
             android.Manifest.permission.ACCESS_COARSE_LOCATION
                     to "@android:string/permgrouplab_location",
+            android.Manifest.permission.ACCESS_BACKGROUND_LOCATION
+                    to "@android:string/permgrouplab_location",
             // Phone
             android.Manifest.permission.READ_PHONE_STATE
                     to "@android:string/permgrouplab_phone",
@@ -151,11 +175,21 @@
             android.Manifest.permission.CAMERA to "@android:string/permgrouplab_camera",
             // Body sensors
             android.Manifest.permission.BODY_SENSORS to "@android:string/permgrouplab_sensors",
+            android.Manifest.permission.BODY_SENSORS_BACKGROUND
+                    to "@android:string/permgrouplab_sensors",
             // Bluetooth
             android.Manifest.permission.BLUETOOTH_CONNECT to
                     "@android:string/permgrouplab_nearby_devices",
             android.Manifest.permission.BLUETOOTH_SCAN to
-                    "@android:string/permgrouplab_nearby_devices"
+                    "@android:string/permgrouplab_nearby_devices",
+            // Aural
+            android.Manifest.permission.READ_MEDIA_AUDIO to
+                "@android:string/permgrouplab_readMediaAural",
+            // Visual
+            android.Manifest.permission.READ_MEDIA_IMAGES to
+                "@android:string/permgrouplab_readMediaVisual",
+            android.Manifest.permission.READ_MEDIA_VIDEO to
+                "@android:string/permgrouplab_readMediaVisual"
     )
 
     @Before
@@ -249,6 +283,8 @@
             }
         )
         waitForIdle()
+        // Notification permission prompt is shown first, so get it out of the way
+        clickNotificationPermissionRequestAllowButton()
         // Perform the post-request action
         block()
         return future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
@@ -290,11 +326,27 @@
         block
     )
 
-    protected fun clickPermissionRequestAllowButton() {
+    protected fun clickPermissionRequestAllowButton(timeoutMillis: Long = 20000) {
         if (isAutomotive) {
-            click(By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)))
+            click(By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)), timeoutMillis)
         } else {
-            click(By.res(ALLOW_BUTTON))
+            click(By.res(ALLOW_BUTTON), timeoutMillis)
+        }
+    }
+
+    /**
+     * Only for use in tests that are not testing the notification permission popup
+     */
+    protected fun clickNotificationPermissionRequestAllowButton() {
+        if (waitFindObjectOrNull(By.text(getPermissionControllerString(
+                NOTIF_CONTINUE_TEXT, APP_PACKAGE_NAME)), 1000) != null ||
+                waitFindObjectOrNull(By.text(getPermissionControllerString(
+                        NOTIF_TEXT, APP_PACKAGE_NAME)), 1000) != null) {
+            if (isAutomotive) {
+                click(By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)))
+            } else {
+                click(By.res(ALLOW_BUTTON))
+            }
         }
     }
 
@@ -481,7 +533,7 @@
                                         "app_permission_button_allow_foreground"))
                             } else {
                                 By.text(getPermissionControllerString(
-                                                "app_permission_button_allow"))
+                                        "app_permission_button_allow"))
                             }
                         PermissionState.DENIED -> By.text(
                                 getPermissionControllerString("app_permission_button_deny"))
@@ -511,12 +563,8 @@
                         PermissionState.ALLOWED ->
                             if (showsForegroundOnlyButton(permission)) {
                                 By.res(ALLOW_FOREGROUND_RADIO_BUTTON)
-                            } else if (isMediaStorageButton(permission, targetSdk)) {
-                                // Uses "allow_foreground_only_radio_button" as id
-                                byTextRes(R.string.allow_media_storage)
-                            } else if (isAllStorageButton(permission, targetSdk)) {
-                                // Uses "allow_always_radio_button" as id
-                                byTextRes(R.string.allow_external_storage)
+                            } else if (showsAlwaysButton(permission)) {
+                                By.res(ALLOW_ALWAYS_RADIO_BUTTON)
                             } else {
                                 By.res(ALLOW_RADIO_BUTTON)
                             }
@@ -534,8 +582,18 @@
             if (!alreadyChecked) {
                 button.click()
             }
-            if (!alreadyChecked && isLegacyApp && wasGranted) {
+
+            val shouldShowStorageWarning = !isTv && !isWatch &&
+                SdkLevel.isAtLeastT() && targetSdk <= Build.VERSION_CODES.S_V2 &&
+                permission in STORAGE_AND_MEDIA_PERMISSIONS
+            if (shouldShowStorageWarning && state == PermissionState.ALLOWED) {
+                click(By.text(getPermissionControllerString(ALLOW_BUTTON_TEXT)))
+            } else if (shouldShowStorageWarning && state == PermissionState.DENIED) {
+                click(By.text(getPermissionControllerString(DENY_ANYWAY_BUTTON_TEXT)))
+            } else if (!alreadyChecked && isLegacyApp && wasGranted) {
                 if (!isTv) {
+                    // Wait for alert dialog to popup, then scroll to the bottom of it
+                    waitFindObject(By.res(ALERT_DIALOG_MESSAGE))
                     scrollToBottom()
                 }
 
@@ -587,34 +645,11 @@
             else -> false
         }
 
-    private fun isMediaStorageButton(permission: String, targetSdk: Int): Boolean =
-            if (isTv || isWatch) {
-                false
-            } else {
-                when (permission) {
-                    android.Manifest.permission.READ_EXTERNAL_STORAGE,
-                    android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                    android.Manifest.permission.ACCESS_MEDIA_LOCATION ->
-                        // Default behavior, can cause issues if OPSTR_LEGACY_STORAGE is set
-                        targetSdk >= Build.VERSION_CODES.P
-                    else -> false
-                }
-            }
-
-    private fun isAllStorageButton(permission: String, targetSdk: Int): Boolean =
-            if (isTv || isWatch) {
-                false
-            } else {
-                when (permission) {
-                    android.Manifest.permission.READ_EXTERNAL_STORAGE,
-                    android.Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                    android.Manifest.permission.ACCESS_MEDIA_LOCATION ->
-                        // Default behavior, can cause issues if OPSTR_LEGACY_STORAGE is set
-                        targetSdk < Build.VERSION_CODES.P
-                    android.Manifest.permission.MANAGE_EXTERNAL_STORAGE -> true
-                    else -> false
-                }
-            }
+    private fun showsAlwaysButton(permission: String): Boolean =
+        when (permission) {
+            android.Manifest.permission.ACCESS_BACKGROUND_LOCATION -> true
+            else -> false
+        }
 
     private fun scrollToBottom() {
         val scrollable = UiScrollable(UiSelector().scrollable(true)).apply {
@@ -654,6 +689,8 @@
                 )
             }
         )
+        waitForIdle()
+        clickNotificationPermissionRequestAllowButton()
         val result = future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
         assertEquals(Activity.RESULT_OK, result.resultCode)
         assertTrue(result.resultData!!.hasExtra("$APP_PACKAGE_NAME.HAS_ACCESS"))
diff --git a/tests/tests/permission3/src/android/permission3/cts/NoPermissionTest.kt b/tests/tests/permission3/src/android/permission3/cts/NoPermissionTest.kt
index 1d8ed8e..e04b37b 100644
--- a/tests/tests/permission3/src/android/permission3/cts/NoPermissionTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/NoPermissionTest.kt
@@ -18,6 +18,8 @@
 
 import android.app.Activity
 import androidx.test.runner.AndroidJUnit4
+import com.android.modules.utils.build.SdkLevel
+import org.junit.Assume
 import org.junit.Test
 import org.junit.runner.RunWith
 
@@ -25,6 +27,7 @@
 class NoPermissionTest : BaseUsePermissionTest() {
     @Test
     fun testStartActivity22() {
+        Assume.assumeFalse(SdkLevel.isAtLeastT())
         installPackage(APP_APK_PATH_22_NONE)
 
         startAppActivityAndAssertResultCode(Activity.RESULT_OK) {}
diff --git a/tests/tests/permission3/src/android/permission3/cts/NotificationPermissionTest.kt b/tests/tests/permission3/src/android/permission3/cts/NotificationPermissionTest.kt
new file mode 100644
index 0000000..4a63df5
--- /dev/null
+++ b/tests/tests/permission3/src/android/permission3/cts/NotificationPermissionTest.kt
@@ -0,0 +1,483 @@
+/*
+ * Copyright (C) 2021 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 android.permission3.cts
+
+import android.Manifest.permission.POST_NOTIFICATIONS
+import android.Manifest.permission.RECORD_AUDIO
+import android.app.ActivityManager
+import android.app.ActivityOptions
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.FLAG_PERMISSION_REVIEW_REQUIRED
+import android.content.pm.PackageManager.PERMISSION_GRANTED
+import android.os.Build
+import android.os.Process
+import android.os.UserHandle
+import android.provider.Settings
+import android.support.test.uiautomator.By
+import androidx.test.filters.SdkSuppress
+import com.android.compatibility.common.util.SystemUtil
+import com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity
+import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
+import org.junit.After
+import org.junit.Assert
+import org.junit.Before
+import org.junit.Test
+import java.util.concurrent.CountDownLatch
+
+const val EXTRA_DELETE_CHANNELS_ON_CLOSE = "extra_delete_channels_on_close"
+const val EXTRA_CREATE_CHANNELS = "extra_create"
+const val EXTRA_CREATE_CHANNELS_DELAYED = "extra_create_delayed"
+const val EXTRA_REQUEST_OTHER_PERMISSIONS = "extra_request_permissions"
+const val EXTRA_REQUEST_NOTIF_PERMISSION = "extra_request_notif_permission"
+const val EXTRA_REQUEST_PERMISSIONS_DELAYED = "extra_request_permissions_delayed"
+const val EXTRA_START_SECOND_ACTIVITY = "extra_start_second_activity"
+const val EXTRA_START_SECOND_APP = "extra_start_second_app"
+const val ACTIVITY_NAME = "CreateNotificationChannelsActivity"
+const val ACTIVITY_LABEL = "CreateNotif"
+const val SECOND_ACTIVITY_LABEL = "EmptyActivity"
+const val ALLOW = "to send you"
+const val CONTINUE_ALLOW = "to continue sending you"
+const val INTENT_ACTION = "usepermission.createchannels.MAIN"
+const val BROADCAST_ACTION = "usepermission.createchannels.BROADCAST"
+const val NOTIFICATION_PERMISSION_ENABLED = "notification_permission_enabled"
+const val EXPECTED_TIMEOUT_MS = 2000L
+
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+class NotificationPermissionTest : BaseUsePermissionTest() {
+
+    private val cr = callWithShellPermissionIdentity {
+        context.createContextAsUser(UserHandle.SYSTEM, 0).contentResolver
+    }
+    private var previousEnableState = 0
+    private var countDown: CountDownLatch = CountDownLatch(1)
+    private var allowedGroups = listOf<String>()
+    private val receiver: BroadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context?, intent: Intent?) {
+            allowedGroups = intent?.getStringArrayListExtra(
+                PackageManager.EXTRA_REQUEST_PERMISSIONS_RESULTS) ?: emptyList()
+            countDown.countDown()
+        }
+    }
+
+    @Before
+    fun setLatchAndEnablePermission() {
+        runWithShellPermissionIdentity {
+            previousEnableState = Settings.Secure.getInt(cr, NOTIFICATION_PERMISSION_ENABLED, 0)
+            Settings.Secure.putInt(cr, NOTIFICATION_PERMISSION_ENABLED, 1)
+        }
+        countDown = CountDownLatch(1)
+        allowedGroups = listOf()
+        context.registerReceiver(receiver, IntentFilter(BROADCAST_ACTION))
+    }
+
+    @After
+    fun resetPermissionAndRemoveReceiver() {
+        runWithShellPermissionIdentity {
+            Settings.Secure.putInt(cr, NOTIFICATION_PERMISSION_ENABLED, previousEnableState)
+        }
+        context.unregisterReceiver(receiver)
+    }
+
+    @Test
+    fun notificationPermissionAddedForLegacyApp() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        runWithShellPermissionIdentity {
+            Assert.assertTrue("SDK < 32 apps should have POST_NOTIFICATIONS added implicitly",
+                context.packageManager.getPackageInfo(APP_PACKAGE_NAME,
+                    PackageManager.GET_PERMISSIONS).requestedPermissions
+                    .contains(POST_NOTIFICATIONS))
+        }
+    }
+
+    @Test
+    fun notificationPermissionIsNotImplicitlyAddedTo33Apps() {
+        installPackage(APP_APK_PATH_LATEST_NONE, expectSuccess = true)
+        runWithShellPermissionIdentity {
+            val requestedPerms = context.packageManager.getPackageInfo(APP_PACKAGE_NAME,
+                    PackageManager.GET_PERMISSIONS).requestedPermissions
+            Assert.assertTrue("SDK >= 33 apps should NOT have POST_NOTIFICATIONS added implicitly",
+                    requestedPerms == null || !requestedPerms.contains(POST_NOTIFICATIONS))
+        }
+    }
+
+    @Test
+    fun reviewRequiredClearedForTAppsOnLaunch() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_33, expectSuccess = true)
+        setReviewRequired()
+        assertNotificationReviewRequiredState(shouldBeSet = true)
+        launchApp()
+        assertNotificationReviewRequiredState(shouldBeSet = false)
+    }
+
+    @Test
+    fun notificationPromptShowsForLegacyAppAfterCreatingNotificationChannels() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        setReviewRequired()
+        launchApp()
+        clickPermissionRequestAllowButton()
+    }
+
+    @Test
+    fun notificationPromptShowsForLegacyAppWithNotificationChannelsOnStart() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        setReviewRequired()
+        // create channels, then leave the app
+        launchApp()
+        killTestApp()
+        launchApp()
+        waitFindObject(By.textContains(CONTINUE_ALLOW))
+        clickPermissionRequestAllowButton()
+    }
+
+    @Test
+    fun nonReviewRequiredLegacyAppsDontShowContinuePrompt() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        setReviewRequired(false)
+        launchApp()
+        waitFindObject(By.textContains(ALLOW))
+    }
+
+    @Test
+    fun notificationPromptDoesNotShowForLegacyAppWithNoNotificationChannels_onLaunch() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        launchApp(createChannels = false)
+        assertDialogNotShowing()
+    }
+    @Test
+    fun notificationPromptDoesNotShowForNonLauncherIntentCategoryLaunches_onChannelCreate() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        launchApp(launcherCategory = false)
+        assertDialogNotShowing()
+    }
+
+    @Test
+    fun notificationPromptDoesNotShowForNonLauncherIntentCategoryLaunches_onLaunch() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        // create channels, then leave the app
+        launchApp()
+        killTestApp()
+        launchApp(launcherCategory = false)
+        assertDialogNotShowing()
+    }
+
+    @Test
+    fun notificationPromptDoesNotShowForNonMainIntentActionLaunches_onLaunch() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        // create channels, then leave the app
+        launchApp()
+        killTestApp()
+        launchApp(mainIntent = false)
+        assertDialogNotShowing()
+    }
+
+    @Test
+    fun notificationPromptDoesNotShowForNonMainIntentActionLaunches_onChannelCreate() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        launchApp(mainIntent = false)
+        assertDialogNotShowing()
+    }
+
+    @Test
+    fun notificationPromptShowsIfActivityOptionSet() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        // create channels, then leave the app
+        launchApp()
+        killTestApp()
+        launchApp(mainIntent = false, isEligibleForPromptOption = true)
+        clickPermissionRequestAllowButton()
+    }
+
+    @Test
+    fun notificationPromptShownForSubsequentStartsIfTaskStartWasLauncher() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        launchApp(startSecondActivity = true)
+        pressBack()
+        clickPermissionRequestAllowButton()
+    }
+
+    @Test
+    fun notificationPromptNotShownForSubsequentStartsIfTaskStartWasNotLauncher() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        launchApp(mainIntent = false, startSecondActivity = true)
+        assertDialogNotShowing()
+    }
+
+    @Test
+    fun notificationPromptShownForChannelCreateInSecondActivityIfTaskStartWasLauncher() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        launchApp(startSecondActivity = true, createChannels = false)
+        clickPermissionRequestAllowButton()
+    }
+
+    @Test
+    fun notificationPromptNotShownForChannelCreateInSecondActivityIfTaskStartWasntLauncher() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        launchApp(mainIntent = false, startSecondActivity = true, createChannels = false)
+        assertDialogNotShowing()
+    }
+
+    @Test
+    fun notificationPromptNotShownForSubsequentStartsIfSubsequentIsDifferentPkg() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        installPackage(APP_APK_PATH_OTHER_APP, expectSuccess = true)
+        // perform a launcher start, then start a secondary app
+        launchApp(startSecondaryAppAndCreateChannelsAfterSecondStart = true)
+        try {
+            waitFindObject(By.textContains(SECOND_ACTIVITY_LABEL))
+            assertDialogNotShowing()
+        } finally {
+            uninstallPackage(OTHER_APP_PACKAGE_NAME)
+        }
+    }
+
+    @Test
+    fun reviewRequiredNotClearedOnNonLauncherIntentCategoryLaunches() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_33, expectSuccess = true)
+        setReviewRequired()
+        launchApp(launcherCategory = false)
+        assertNotificationReviewRequiredState(true)
+    }
+
+    @Test
+    fun reviewRequiredNotClearedOnNonMainIntentActionLaunches() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_33, expectSuccess = true)
+        setReviewRequired()
+        launchApp(mainIntent = false)
+        assertNotificationReviewRequiredState(true)
+    }
+
+    @Test
+    fun reviewRequiredClearedIfActivityOptionSet() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_33, expectSuccess = true)
+        setReviewRequired()
+        launchApp(isEligibleForPromptOption = true)
+        assertNotificationReviewRequiredState(false)
+    }
+
+    @Test
+    fun notificationGrantedAndReviewRequiredClearedOnLegacyGrant() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        setReviewRequired()
+        launchApp()
+        clickPermissionRequestAllowButton()
+        assertAppPermissionGrantedState(POST_NOTIFICATIONS, granted = true)
+        assertNotificationReviewRequiredState(shouldBeSet = false)
+    }
+
+    @Test
+    fun notificationReviewRequiredClearedOnLegacyDeny() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        setReviewRequired()
+        launchApp()
+        clickPermissionRequestDenyButton()
+        waitForIdle()
+        SystemUtil.eventually {
+            assertNotificationReviewRequiredState(shouldBeSet = false)
+        }
+    }
+
+    @Test
+    fun nonSystemServerPackageCannotShowPromptForOtherPackage() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        runWithShellPermissionIdentity {
+            val grantPermission = Intent(PackageManager.ACTION_REQUEST_PERMISSIONS_FOR_OTHER)
+            grantPermission.putExtra(Intent.EXTRA_PACKAGE_NAME, APP_PACKAGE_NAME)
+            grantPermission.putExtra(PackageManager.EXTRA_REQUEST_PERMISSIONS_NAMES,
+                arrayOf(POST_NOTIFICATIONS))
+            grantPermission.setPackage(context.packageManager.permissionControllerPackageName)
+            grantPermission.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(grantPermission)
+        }
+        try {
+            clickPermissionRequestAllowButton(timeoutMillis = EXPECTED_TIMEOUT_MS)
+            Assert.fail("Expected not to find permission request dialog")
+        } catch (expected: RuntimeException) {
+            // Do nothing
+        }
+    }
+
+    @Test
+    fun mergeAppPermissionRequestIntoNotificationAndVerifyResult() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        launchApp(requestPermissionsDelayed = true)
+        clickPermissionRequestAllowButton()
+        assertAppPermissionGrantedState(POST_NOTIFICATIONS, granted = true)
+        clickPermissionRequestAllowForegroundButton()
+        assertAppPermissionGrantedState(RECORD_AUDIO, granted = true)
+        countDown.await()
+        // Result should contain only the microphone request
+        Assert.assertEquals(listOf(RECORD_AUDIO), allowedGroups)
+    }
+
+    @Test
+    fun mergeNotificationRequestIntoAppPermissionRequestAndVerifyResult() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        launchApp(createChannels = false, createChannelsDelayed = true, requestPermissions = true)
+        clickPermissionRequestAllowForegroundButton()
+        assertAppPermissionGrantedState(RECORD_AUDIO, granted = true)
+        clickPermissionRequestAllowButton()
+        assertAppPermissionGrantedState(POST_NOTIFICATIONS, granted = true)
+        countDown.await()
+        // Result should contain only the microphone request
+        Assert.assertEquals(listOf(RECORD_AUDIO), allowedGroups)
+    }
+
+    // Enable this test once droidfood code is removed
+    @Test
+    fun newlyInstalledLegacyAppsDontHaveReviewRequired() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        runWithShellPermissionIdentity {
+            Assert.assertEquals("expect REVIEW_REQUIRED to not be set", 0, context.packageManager
+                .getPermissionFlags(POST_NOTIFICATIONS, APP_PACKAGE_NAME, Process.myUserHandle())
+                and FLAG_PERMISSION_REVIEW_REQUIRED)
+        }
+    }
+
+    @Test
+    fun newlyInstalledTAppsDontHaveReviewRequired() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_33, expectSuccess = true)
+        runWithShellPermissionIdentity {
+            Assert.assertEquals("expect REVIEW_REQUIRED to not be set", 0, context.packageManager
+                .getPermissionFlags(POST_NOTIFICATIONS, APP_PACKAGE_NAME, Process.myUserHandle())
+                and FLAG_PERMISSION_REVIEW_REQUIRED)
+        }
+    }
+
+    @Test
+    fun reviewRequiredTAppsShowContinueMessage() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_33, expectSuccess = true)
+        setReviewRequired(true)
+        assertNotificationReviewRequiredState(true)
+        launchApp(requestPermissions = true)
+        waitFindObject(By.textContains(CONTINUE_ALLOW))
+    }
+
+    @Test
+    fun nonReviewRequiredTAppsShowAllowMessage() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_33, expectSuccess = true)
+        assertNotificationReviewRequiredState(false)
+        launchApp(requestPermissions = true)
+        waitFindObject(By.textContains(ALLOW))
+    }
+
+    @Test
+    fun legacyAppCannotExplicitlyRequestNotifications() {
+        installPackage(APP_APK_PATH_CREATE_NOTIFICATION_CHANNELS_31, expectSuccess = true)
+        launchApp(createChannels = false, requestNotificationPermission = true)
+        try {
+            clickPermissionRequestAllowButton(timeoutMillis = EXPECTED_TIMEOUT_MS)
+            Assert.fail("Expected not to find permission request dialog")
+        } catch (expected: RuntimeException) {
+            // Do nothing
+        }
+    }
+
+    private fun assertAppPermissionGrantedState(permission: String, granted: Boolean) {
+        SystemUtil.eventually {
+            runWithShellPermissionIdentity {
+                Assert.assertEquals("Expected $permission to be granted", context.packageManager
+                        .checkPermission(permission, APP_PACKAGE_NAME), PERMISSION_GRANTED)
+            }
+        }
+    }
+
+    private fun assertNotificationReviewRequiredState(shouldBeSet: Boolean) {
+        val flagSet = callWithShellPermissionIdentity {
+            (context.packageManager.getPermissionFlags(POST_NOTIFICATIONS,
+                APP_PACKAGE_NAME, Process.myUserHandle()) and FLAG_PERMISSION_REVIEW_REQUIRED) != 0
+        }
+        Assert.assertEquals("Unexpected REVIEW_REQUIRED state for POST_NOTIFICATIONS: ",
+            shouldBeSet, flagSet)
+    }
+
+    private fun setReviewRequired(set: Boolean = true) {
+        val flag = if (set) {
+            FLAG_PERMISSION_REVIEW_REQUIRED
+        } else {
+            0
+        }
+        runWithShellPermissionIdentity {
+            context.packageManager.updatePermissionFlags(POST_NOTIFICATIONS, APP_PACKAGE_NAME,
+                FLAG_PERMISSION_REVIEW_REQUIRED, flag, Process.myUserHandle())
+        }
+    }
+
+    private fun launchApp(
+        createChannels: Boolean = true,
+        createChannelsDelayed: Boolean = false,
+        requestNotificationPermission: Boolean = false,
+        requestPermissions: Boolean = false,
+        requestPermissionsDelayed: Boolean = false,
+        launcherCategory: Boolean = true,
+        mainIntent: Boolean = true,
+        isEligibleForPromptOption: Boolean = false,
+        startSecondActivity: Boolean = false,
+        startSecondaryAppAndCreateChannelsAfterSecondStart: Boolean = false
+    ) {
+        val intent = if (mainIntent && launcherCategory) {
+            packageManager.getLaunchIntentForPackage(APP_PACKAGE_NAME)!!
+        } else if (mainIntent) {
+            Intent(Intent.ACTION_MAIN)
+        } else {
+            Intent(INTENT_ACTION)
+        }
+
+        intent.`package` = APP_PACKAGE_NAME
+        intent.putExtra(EXTRA_CREATE_CHANNELS, createChannels)
+        if (!createChannels) {
+            intent.putExtra(EXTRA_CREATE_CHANNELS_DELAYED, createChannelsDelayed)
+        }
+        intent.putExtra(EXTRA_REQUEST_OTHER_PERMISSIONS, requestPermissions)
+        if (!requestPermissions) {
+            intent.putExtra(EXTRA_REQUEST_PERMISSIONS_DELAYED, requestPermissionsDelayed)
+        }
+        intent.putExtra(EXTRA_REQUEST_NOTIF_PERMISSION, requestNotificationPermission)
+        intent.putExtra(EXTRA_START_SECOND_ACTIVITY, startSecondActivity)
+        intent.putExtra(EXTRA_START_SECOND_APP, startSecondaryAppAndCreateChannelsAfterSecondStart)
+        intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+
+        val options = ActivityOptions.makeBasic()
+        options.isEligibleForLegacyPermissionPrompt = isEligibleForPromptOption
+        context.startActivity(intent, options.toBundle())
+
+        waitFindObject(By.textContains(ACTIVITY_LABEL))
+        waitForIdle()
+    }
+
+    private fun killTestApp() {
+        pressBack()
+        pressBack()
+        runWithShellPermissionIdentity {
+            val am = context.getSystemService(ActivityManager::class.java)!!
+            am.forceStopPackage(APP_PACKAGE_NAME)
+        }
+        waitForIdle()
+    }
+
+    private fun assertDialogNotShowing(timeoutMillis: Long = EXPECTED_TIMEOUT_MS) {
+        try {
+            clickPermissionRequestAllowButton(timeoutMillis)
+            Assert.fail("Expected not to find permission request dialog")
+        } catch (expected: RuntimeException) {
+            // Do nothing
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionAllServicesTest.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionAllServicesTest.kt
new file mode 100644
index 0000000..727a22f
--- /dev/null
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionAllServicesTest.kt
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2022 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 android.permission3.cts
+
+import android.app.Activity
+import android.app.AppOpsManager
+import com.android.compatibility.common.util.AppOpsUtils.setOpMode
+import android.content.ComponentName
+import android.content.Intent
+import android.location.LocationManager
+import android.net.Uri
+import android.provider.Settings
+import com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity
+import org.junit.Test
+import java.util.concurrent.TimeUnit
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Assert.assertNull
+import android.support.test.uiautomator.By
+import com.android.compatibility.common.util.SystemUtil.eventually
+
+class PermissionAllServicesTest : BasePermissionTest() {
+    val locationManager = context.getSystemService(LocationManager::class.java)!!
+
+    @Test
+    fun testAllServicesPreferenceShownWhenAppIsLocationProviderAndCanHandleClick() {
+        installPackage(LOCATION_PROVIDER_APP_APK_PATH_2, grantRuntimePermissions = true)
+        allowPackagesToMockLocation(LOCATION_PROVIDER_APP_PACKAGE_NAME_2)
+        enableAppAsLocationProvider(LOCATION_PROVIDER_APP_PACKAGE_NAME_2)
+
+        eventually({
+            try {
+                launchAppInfoActivity(LOCATION_PROVIDER_APP_PACKAGE_NAME_2)
+                waitFindObject(By.textContains(ALL_SERVICES_LABEL))
+            } catch (e: Exception) {
+                pressBack()
+                throw e
+            } }, 1000L)
+
+        uninstallPackage(LOCATION_PROVIDER_APP_PACKAGE_NAME_2, requireSuccess = false)
+        locationManager.removeTestProvider(LOCATION_PROVIDER_APP_APK_PATH_2)
+    }
+
+    @Test
+    fun testAllServicesSummaryShowsWhenAppIsLocationProviderAndCanHandleClick() {
+        installPackage(LOCATION_PROVIDER_APP_APK_PATH_2, grantRuntimePermissions = true)
+        allowPackagesToMockLocation(LOCATION_PROVIDER_APP_PACKAGE_NAME_2)
+        enableAppAsLocationProvider(LOCATION_PROVIDER_APP_PACKAGE_NAME_2)
+
+        eventually({
+            try {
+                launchAppInfoActivity(LOCATION_PROVIDER_APP_PACKAGE_NAME_2)
+                waitFindObject(By.textContains(SUMMARY))
+            } catch (e: Exception) {
+                pressBack()
+                throw e
+            } }, 1000L)
+
+        uninstallPackage(LOCATION_PROVIDER_APP_PACKAGE_NAME_2, requireSuccess = false)
+        locationManager.removeTestProvider(LOCATION_PROVIDER_APP_APK_PATH_2)
+    }
+
+    @Test
+    fun testAllServicesPreferenceNotShownWhenAppCannotHandleClick() {
+        installPackage(LOCATION_PROVIDER_APP_APK_PATH_1, grantRuntimePermissions = true)
+        allowPackagesToMockLocation(LOCATION_PROVIDER_APP_PACKAGE_NAME_1)
+        enableAppAsLocationProvider(LOCATION_PROVIDER_APP_PACKAGE_NAME_1)
+
+        eventually({
+            try {
+                launchAppInfoActivity(LOCATION_PROVIDER_APP_PACKAGE_NAME_1)
+                assertNull(waitFindObjectOrNull(By.textContains(ALL_SERVICES_LABEL)))
+            } catch (e: Exception) {
+                pressBack()
+                throw e
+            } }, 1000L)
+
+        uninstallPackage(LOCATION_PROVIDER_APP_PACKAGE_NAME_1, requireSuccess = false)
+        locationManager.removeTestProvider(LOCATION_PROVIDER_APP_APK_PATH_1)
+    }
+
+    @Test
+    fun testAllServicesPreferenceNotShownWhenAppIsNotLocationProvider() {
+        installPackage(NON_LOCATION_APP_APK_PATH, grantRuntimePermissions = true)
+
+        eventually({
+            try {
+                launchAppInfoActivity(NON_LOCATION_APP_PACKAGE_NAME)
+                assertNull(waitFindObjectOrNull(By.textContains(ALL_SERVICES_LABEL)))
+            } catch (e: Exception) {
+                pressBack()
+                throw e
+            } }, 1000L)
+
+        uninstallPackage(NON_LOCATION_APP_APK_PATH, requireSuccess = false)
+    }
+
+    private fun allowPackagesToMockLocation(packageName: String) {
+        setOpMode(packageName, AppOpsManager.OPSTR_MOCK_LOCATION, AppOpsManager.MODE_ALLOWED)
+        setOpMode(
+            context.packageName, AppOpsManager.OPSTR_MOCK_LOCATION, AppOpsManager.MODE_ALLOWED
+        )
+    }
+
+    private fun launchAppInfoActivity(packageName: String) {
+        context.startActivity(
+            Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply {
+                data = Uri.parse("package:$packageName")
+                addCategory(Intent.CATEGORY_DEFAULT)
+                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK)
+            })
+    }
+
+    private fun enableAppAsLocationProvider(appPackageName: String) {
+        // Add the test app as location provider.
+        val future = startActivityForFuture(
+            Intent().apply {
+                component = ComponentName(
+                    appPackageName, "$appPackageName.AddLocationProviderActivity"
+                )
+            })
+
+        val result = future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
+        assertEquals(Activity.RESULT_OK, result.resultCode)
+        assertTrue(
+            callWithShellPermissionIdentity {
+                locationManager.isProviderPackage(appPackageName)
+            }
+        )
+    }
+
+    companion object {
+        const val LOCATION_PROVIDER_APP_APK_PATH_1 =
+            "$APK_DIRECTORY/CtsAccessMicrophoneAppLocationProvider.apk"
+        const val NON_LOCATION_APP_APK_PATH = "$APK_DIRECTORY/CtsUsePermissionApp22.apk"
+        const val LOCATION_PROVIDER_APP_APK_PATH_2 =
+            "$APK_DIRECTORY/CtsAppLocationProviderWithSummary.apk"
+        const val NON_LOCATION_APP_PACKAGE_NAME = "android.permission3.cts.usepermission"
+        const val LOCATION_PROVIDER_APP_PACKAGE_NAME_1 =
+            "android.permission3.cts.accessmicrophoneapplocationprovider"
+        const val LOCATION_PROVIDER_APP_PACKAGE_NAME_2 =
+            "android.permission3.cts.applocationproviderwithsummary"
+        const val APP_LABEL = "LocationProviderWithSummaryApp"
+        const val ALL_SERVICES_LABEL = "All Services"
+        const val SUMMARY = "Services summary."
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionAttributionTest.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionAttributionTest.kt
new file mode 100644
index 0000000..9d718a2
--- /dev/null
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionAttributionTest.kt
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2021 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 android.permission3.cts
+
+import android.app.Activity
+import android.app.AppOpsManager
+import android.content.ComponentName
+import android.content.Intent
+import android.location.LocationManager
+import android.os.Build
+import android.provider.DeviceConfig
+import android.support.test.uiautomator.By
+import androidx.test.filters.SdkSuppress
+import com.android.compatibility.common.util.AppOpsUtils.setOpMode
+import com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity
+import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
+import com.android.modules.utils.build.SdkLevel
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Assume.assumeFalse
+import org.junit.Before
+import org.junit.Test
+import java.util.concurrent.TimeUnit
+
+/**
+ * Tests permission attribution for location providers.
+ */
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
+class PermissionAttributionTest : BasePermissionHubTest() {
+    private val micLabel = packageManager.getPermissionGroupInfo(
+        android.Manifest.permission_group.MICROPHONE, 0).loadLabel(packageManager).toString()
+    val locationManager = context.getSystemService(LocationManager::class.java)!!
+    private var wasEnabled = false
+
+    // Permission history is not available on Auto devices running S or below.
+    @Before
+    fun assumeNotAutoBelowT() {
+        assumeFalse(isAutomotive && !SdkLevel.isAtLeastT())
+    }
+
+    @Before
+    fun installAppLocationProviderAndAllowMockLocation() {
+        installPackage(APP_APK_PATH, grantRuntimePermissions = true)
+        // The package name of a mock location provider is the caller adding it, so we have to let
+        // the test app add itself.
+        setOpMode(APP_PACKAGE_NAME, AppOpsManager.OPSTR_MOCK_LOCATION, AppOpsManager.MODE_ALLOWED)
+    }
+
+    @Before
+    fun setup() {
+        // Allow ourselves to reliably remove the test location provider.
+        setOpMode(
+            context.packageName, AppOpsManager.OPSTR_MOCK_LOCATION, AppOpsManager.MODE_ALLOWED
+        )
+        wasEnabled = setSubattributionEnabledStateIfNeeded(true)
+    }
+
+    @After
+    fun teardown() {
+        locationManager.removeTestProvider(APP_PACKAGE_NAME)
+        if (!wasEnabled) {
+            setSubattributionEnabledStateIfNeeded(false)
+        }
+    }
+
+    @Test
+    fun testLocationProviderAttributionForMicrophone() {
+        enableAppAsLocationProvider()
+        useMicrophone()
+        openMicrophoneTimeline()
+
+        waitFindObject(By.textContains(micLabel))
+        waitFindObject(By.textContains(APP_LABEL))
+        waitFindObject(By.textContains(ATTRIBUTION_LABEL))
+    }
+
+    private fun enableAppAsLocationProvider() {
+        // Add the test app as location provider.
+        val future = startActivityForFuture(
+            Intent().apply {
+                component = ComponentName(
+                    APP_PACKAGE_NAME, "$APP_PACKAGE_NAME.AddLocationProviderActivity"
+                )
+            }
+        )
+        val result = future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
+        assertEquals(Activity.RESULT_OK, result.resultCode)
+        assertTrue(
+            callWithShellPermissionIdentity {
+                locationManager.isProviderPackage(APP_PACKAGE_NAME)
+            }
+        )
+    }
+
+    private fun useMicrophone() {
+        val future = startActivityForFuture(
+            Intent().apply {
+                component = ComponentName(
+                    APP_PACKAGE_NAME, "$APP_PACKAGE_NAME.UseMicrophoneActivity"
+                )
+            }
+        )
+        val result = future.get(TIMEOUT_MILLIS, TimeUnit.MILLISECONDS)
+        assertEquals(Activity.RESULT_OK, result.resultCode)
+    }
+
+    private fun setSubattributionEnabledStateIfNeeded(shouldBeEnabled: Boolean): Boolean {
+        var currentlyEnabled = false
+        runWithShellPermissionIdentity {
+            currentlyEnabled = DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_PRIVACY,
+                FLAG_SUBATTRIBUTION, false)
+            if (currentlyEnabled != shouldBeEnabled) {
+                DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY, FLAG_SUBATTRIBUTION,
+                    shouldBeEnabled.toString(), false)
+            }
+        }
+        return currentlyEnabled
+    }
+
+    companion object {
+        const val APP_APK_PATH = "$APK_DIRECTORY/CtsAccessMicrophoneAppLocationProvider.apk"
+        const val APP_PACKAGE_NAME = "android.permission3.cts.accessmicrophoneapplocationprovider"
+        const val APP_LABEL = "LocationProviderWithMicApp"
+        const val ATTRIBUTION_LABEL = "Attribution Label"
+        const val FLAG_SUBATTRIBUTION = "permissions_hub_subattribution_enabled"
+    }
+}
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionDecisionsTest.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionDecisionsTest.kt
new file mode 100644
index 0000000..13656b5
--- /dev/null
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionDecisionsTest.kt
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2022 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 android.permission3.cts
+
+import android.Manifest
+import android.content.Intent
+import android.os.Build
+import android.permission.PermissionManager
+import android.support.test.uiautomator.By
+import androidx.test.filters.SdkSuppress
+import com.android.compatibility.common.util.SystemUtil
+import org.junit.Assert.assertNull
+import org.junit.Assume.assumeTrue
+import org.junit.Before
+import org.junit.Test
+
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+class PermissionDecisionsTest : BaseUsePermissionTest() {
+
+    companion object {
+        const val ASSERT_ABSENT_SELECTOR_TIMEOUT_MS = 500L
+    }
+
+    // Permission decisions has only been implemented on Auto
+    @Before
+    fun assumeAuto() {
+        assumeTrue(isAutomotive)
+    }
+
+    @Test
+    fun testAcceptPermissionDialogShowsDecisionWithGrantedAccess() {
+        installPackage(APP_APK_PATH_30_WITH_BACKGROUND)
+        requestAppPermissionsAndAssertResult(Manifest.permission.ACCESS_FINE_LOCATION to true) {
+            clickPermissionRequestAllowForegroundButton()
+        }
+
+        openPermissionDecisions()
+        waitFindObject(By
+                .hasChild(By.text("You gave $APP_PACKAGE_NAME access to location"))
+                .hasChild(By.text("Today")))
+    }
+
+    @Test
+    fun testDenyPermissionDialogShowsDecisionWithDeniedAccess() {
+        installPackage(APP_APK_PATH_30_WITH_BACKGROUND)
+        requestAppPermissionsAndAssertResult(Manifest.permission.ACCESS_FINE_LOCATION to false) {
+            clickPermissionRequestDenyButton()
+        }
+
+        openPermissionDecisions()
+        waitFindObject(By
+                .hasChild(By.text("You denied $APP_PACKAGE_NAME access to location"))
+                .hasChild(By.text("Today")))
+    }
+
+    @Test
+    fun testAppUninstallRemovesDecision() {
+        installPackage(APP_APK_PATH_30_WITH_BACKGROUND)
+        requestAppPermissionsAndAssertResult(Manifest.permission.ACCESS_FINE_LOCATION to false) {
+            clickPermissionRequestDenyButton()
+        }
+        uninstallApp()
+
+        openPermissionDecisions()
+        assertNull(waitFindObjectOrNull(By
+                .hasChild(By.text("You denied $APP_PACKAGE_NAME access to location"))
+                .hasChild(By.text("Today")),
+                ASSERT_ABSENT_SELECTOR_TIMEOUT_MS))
+    }
+
+    @Test
+    fun testClickOnDecisionAndChangeAccessUpdatesDecision() {
+        installPackage(APP_APK_PATH_30_WITH_BACKGROUND)
+        requestAppPermissionsAndAssertResult(Manifest.permission.ACCESS_FINE_LOCATION to true) {
+            clickPermissionRequestAllowForegroundButton()
+        }
+
+        openPermissionDecisions()
+
+        waitFindObject(By
+                .hasChild(By.text("You gave $APP_PACKAGE_NAME access to location"))
+                .hasChild(By.text("Today")))
+                .click()
+
+        waitFindObject(By.text(APP_PACKAGE_NAME))
+        waitFindObject(By.text("Location access for this app"))
+
+        // change the permission on the app permission screen and verify that updates the decision
+        // page
+        waitFindObject(By.text("Don’t allow")).click()
+        pressBack()
+        waitFindObject(By
+                .hasChild(By.text("You denied $APP_PACKAGE_NAME access to location"))
+                .hasChild(By.text("Today")))
+    }
+
+    private fun openPermissionDecisions() {
+        SystemUtil.runWithShellPermissionIdentity {
+            context.startActivity(Intent(PermissionManager.ACTION_REVIEW_PERMISSION_DECISIONS)
+                    .apply {
+                        addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    })
+        }
+    }
+}
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionHistoryTest.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionHistoryTest.kt
index 794a731..5355fdc 100644
--- a/tests/tests/permission3/src/android/permission3/cts/PermissionHistoryTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionHistoryTest.kt
@@ -18,15 +18,17 @@
 
 import android.Manifest
 import android.content.Intent
-import android.content.pm.PackageManager.FEATURE_LEANBACK
-import android.content.pm.PackageManager.FEATURE_AUTOMOTIVE
 import android.os.Build
+import android.provider.DeviceConfig
+import android.provider.DeviceConfig.NAMESPACE_PRIVACY
 import android.support.test.uiautomator.By
 import androidx.test.filters.SdkSuppress
 import com.android.compatibility.common.util.SystemUtil
+import com.android.modules.utils.build.SdkLevel
 import org.junit.After
 import org.junit.Assume.assumeFalse
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 
 private const val APP_LABEL_1 = "CtsMicAccess"
@@ -37,22 +39,28 @@
 private const val HISTORY_PREFERENCE_ICON = "permission_history_icon"
 private const val HISTORY_PREFERENCE_TIME = "permission_history_time"
 private const val SHOW_SYSTEM = "Show system"
+private const val SHOW_7_DAYS = "Show 7 days"
+private const val SHOW_24_HOURS = "Show 24 hours"
 private const val MORE_OPTIONS = "More options"
+private const val TIMELINE_7_DAYS_DESCRIPTION = "in the past 7 days"
+private const val DASHBOARD_7_DAYS_DESCRIPTION = "7 days"
+private const val PRIV_DASH_7_DAY_ENABLED = "privacy_dashboard_7_day_toggle"
 
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
-class PermissionHistoryTest : BasePermissionTest() {
+class PermissionHistoryTest : BasePermissionHubTest() {
     private val micLabel = packageManager.getPermissionGroupInfo(
-            Manifest.permission_group.MICROPHONE, 0).loadLabel(packageManager).toString()
+        Manifest.permission_group.MICROPHONE, 0).loadLabel(packageManager).toString()
+    private var was7DayToggleEnabled = false
 
     // Permission history is not available on TV devices.
     @Before
-    fun assumeNotTv() =
-            assumeFalse(packageManager.hasSystemFeature(FEATURE_LEANBACK))
+    fun assumeNotTv() = assumeFalse(isTv)
 
-    // Permission history is not available on Auto devices.
+    // Permission history is not available on Auto devices running S or below.
     @Before
-    fun assumeNotAuto() =
-            assumeFalse(packageManager.hasSystemFeature(FEATURE_AUTOMOTIVE))
+    fun assumeNotAutoBelowT() {
+        assumeFalse(isAutomotive && !SdkLevel.isAtLeastT())
+    }
 
     @Before
     fun installApps() {
@@ -68,6 +76,24 @@
         uninstallPackage(APP2_PACKAGE_NAME, requireSuccess = false)
     }
 
+    @Before
+    fun setUpTest() {
+        SystemUtil.runWithShellPermissionIdentity {
+            was7DayToggleEnabled = DeviceConfig.getBoolean(NAMESPACE_PRIVACY,
+                    PRIV_DASH_7_DAY_ENABLED, false)
+            DeviceConfig.setProperty(NAMESPACE_PRIVACY,
+                    PRIV_DASH_7_DAY_ENABLED, true.toString(), false)
+        }
+    }
+
+    @After
+    fun tearDownTest() {
+        SystemUtil.runWithShellPermissionIdentity {
+            DeviceConfig.setProperty(NAMESPACE_PRIVACY,
+                    PRIV_DASH_7_DAY_ENABLED, was7DayToggleEnabled.toString(), false)
+        }
+    }
+
     @Test
     fun testMicrophoneAccessShowsUpOnPrivacyDashboard() {
         openMicrophoneApp(INTENT_ACTION_1)
@@ -75,13 +101,14 @@
 
         openPermissionDashboard()
         waitFindObject(By.res("android:id/title").textContains("Microphone")).click()
-        waitFindObject(By.descContains(micLabel))
+        waitFindObject(By.textContains(micLabel))
         waitFindObject(By.textContains(APP_LABEL_1))
         pressBack()
         pressBack()
     }
 
     @Test
+    @Ignore
     fun testToggleSystemApps() {
         // I had some hard time mocking a system app.
         // Hence here I am only testing if the toggle is there.
@@ -91,21 +118,83 @@
         waitFindObject(By.textContains(APP_LABEL_1))
 
         openMicrophoneTimeline()
-        val menuView = waitFindObject(By.descContains(MORE_OPTIONS))
-        menuView.click()
+        // Auto doesn't show the "Show system" action when it is disabled. If a system app ends up
+        // being installed for this test, then the Auto logic should be tested too.
+        if (!isAutomotive) {
+            val menuView = waitFindObject(By.descContains(MORE_OPTIONS))
+            menuView.click()
 
-        waitFindObject(By.text(SHOW_SYSTEM))
+            waitFindObject(By.text(SHOW_SYSTEM))
+        }
+
         pressBack()
         pressBack()
     }
 
     @Test
+    fun testToggleFrom24HoursTo7Days() {
+        // Auto doesn't support the 7 day view
+        assumeFalse(isAutomotive)
+
+        openMicrophoneApp(INTENT_ACTION_1)
+        waitFindObject(By.textContains(APP_LABEL_1))
+
+        openPermissionDashboard()
+        waitFindObject(By.descContains(MORE_OPTIONS)).click()
+        try {
+            waitFindObject(By.text(SHOW_7_DAYS)).click()
+        } catch (exception: RuntimeException) {
+            // If privacy dashboard was set to 7d instead of 24h,
+            // it will not be able to find the "Show 7 days" option.
+            // This block is to toggle it back to 24h if that happens.
+            waitFindObject(By.text(SHOW_24_HOURS)).click()
+            waitFindObject(By.descContains(MORE_OPTIONS)).click()
+            waitFindObject(By.text(SHOW_7_DAYS)).click()
+        }
+
+        waitFindObject(By.res("android:id/title").textContains("Microphone"))
+        waitFindObject(By.textContains(DASHBOARD_7_DAYS_DESCRIPTION))
+
+        pressBack()
+    }
+
+    @Test
+    @Ignore
+    fun testToggleFrom24HoursTo7DaysInTimeline() {
+        // Auto doesn't support the 7 day view
+        assumeFalse(isAutomotive)
+
+        openMicrophoneApp(INTENT_ACTION_1)
+        waitFindObject(By.textContains(APP_LABEL_1))
+
+        openMicrophoneTimeline()
+        waitFindObject(By.descContains(MORE_OPTIONS)).click()
+        try {
+            waitFindObject(By.text(SHOW_7_DAYS)).click()
+        } catch (exception: RuntimeException) {
+            // If privacy dashboard was set to 7d instead of 24h,
+            // it will not be able to find the "Show 7 days" option.
+            // This block is to toggle it back to 24h if that happens.
+            waitFindObject(By.text(SHOW_24_HOURS)).click()
+            waitFindObject(By.descContains(MORE_OPTIONS)).click()
+            waitFindObject(By.text(SHOW_7_DAYS)).click()
+        }
+
+        waitFindObject(By.descContains(micLabel))
+        waitFindObject(By.textContains(APP_LABEL_1))
+        waitFindObject(By.textContains(TIMELINE_7_DAYS_DESCRIPTION))
+
+        pressBack()
+    }
+
+    @Test
+    @Ignore
     fun testMicrophoneTimelineWithOneApp() {
         openMicrophoneApp(INTENT_ACTION_1)
         waitFindObject(By.textContains(APP_LABEL_1))
 
         openMicrophoneTimeline()
-        waitFindObject(By.descContains(micLabel))
+        waitFindObject(By.textContains(micLabel))
         waitFindObject(By.textContains(APP_LABEL_1))
         waitFindObject(By.res(
                 PERMISSION_CONTROLLER_PACKAGE_ID_PREFIX + HISTORY_PREFERENCE_ICON))
@@ -115,6 +204,7 @@
     }
 
     @Test
+    @Ignore
     fun testCameraTimelineWithMultipleApps() {
         openMicrophoneApp(INTENT_ACTION_1)
         waitFindObject(By.textContains(APP_LABEL_1))
@@ -123,7 +213,7 @@
         waitFindObject(By.textContains(APP_LABEL_2))
 
         openMicrophoneTimeline()
-        waitFindObject(By.descContains(micLabel))
+        waitFindObject(By.textContains(micLabel))
         waitFindObject(By.textContains(APP_LABEL_1))
         waitFindObject(By.textContains(APP_LABEL_2))
         pressBack()
@@ -135,15 +225,6 @@
         })
     }
 
-    private fun openMicrophoneTimeline() {
-        SystemUtil.runWithShellPermissionIdentity {
-            context.startActivity(Intent(Intent.ACTION_REVIEW_PERMISSION_HISTORY).apply {
-                putExtra(Intent.EXTRA_PERMISSION_GROUP_NAME, Manifest.permission_group.MICROPHONE)
-                addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            })
-        }
-    }
-
     private fun openPermissionDashboard() {
         SystemUtil.runWithShellPermissionIdentity {
             context.startActivity(Intent(Intent.ACTION_REVIEW_PERMISSION_USAGE).apply {
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionReviewTapjackingTest.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionReviewTapjackingTest.kt
new file mode 100644
index 0000000..fcd9036
--- /dev/null
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionReviewTapjackingTest.kt
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2020 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 android.permission3.cts
+
+import android.content.ComponentName
+import android.content.Intent
+import android.support.test.uiautomator.By
+import com.android.compatibility.common.util.SystemUtil
+import org.junit.After
+import org.junit.Assert
+import org.junit.Assume.assumeFalse
+import org.junit.Before
+import org.junit.Test
+import java.lang.Exception
+
+/**
+ * Tests permission review screen can't be tapjacked
+ */
+class PermissionReviewTapjackingTest : BaseUsePermissionTest() {
+
+    companion object {
+        const val HELPER_APP_OVERLAY = "$APK_DIRECTORY/CtsHelperAppOverlay.apk"
+        private const val HELPER_PACKAGE_NAME = "android.permission3.cts.helper.overlay"
+    }
+
+    @Before
+    fun installApp22AndApprovePermissionReview() {
+        assumeFalse(packageManager.arePermissionsIndividuallyControlled())
+
+        installPackage(APP_APK_PATH_22)
+        installPackage(HELPER_APP_OVERLAY)
+
+        SystemUtil.runShellCommandOrThrow(
+                "appops set $HELPER_PACKAGE_NAME android:system_alert_window allow")
+    }
+
+    @After
+    fun uninstallPackages() {
+        SystemUtil.runShellCommandOrThrow(
+                "pm uninstall $APP_PACKAGE_NAME")
+        SystemUtil.runShellCommandOrThrow(
+                "pm uninstall $HELPER_PACKAGE_NAME")
+    }
+
+    @Test
+    fun testOverlaysAreHidden() {
+        context.startActivity(Intent()
+                .setComponent(ComponentName(HELPER_PACKAGE_NAME,
+                        "$HELPER_PACKAGE_NAME.OverlayActivity"))
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
+        findOverlay()
+
+        context.startActivity(Intent()
+                .setComponent(ComponentName(APP_PACKAGE_NAME,
+                        "$APP_PACKAGE_NAME.FinishOnCreateActivity"))
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        )
+
+        waitFindObject(By.res("com.android.permissioncontroller:id/permissions_message"))
+
+        try {
+            findOverlay()
+            Assert.fail("Overlay was displayed")
+        } catch (e: Exception) {
+            // expected
+        }
+
+        pressHome()
+        findOverlay()
+    }
+
+    private fun findOverlay() = waitFindObject(By.text("Find me!"))
+}
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionReviewTest.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionReviewTest.kt
index 6b8678d..f5d7fc1 100644
--- a/tests/tests/permission3/src/android/permission3/cts/PermissionReviewTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionReviewTest.kt
@@ -20,11 +20,13 @@
 import android.content.ComponentName
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.os.ResultReceiver
 import android.support.test.uiautomator.By
+import androidx.test.filters.SdkSuppress
 import androidx.test.runner.AndroidJUnit4
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertNull
@@ -85,15 +87,15 @@
     fun testDenyGrantDenyCalendarDuringReview() {
         startAppActivityAndAssertResultCode(Activity.RESULT_OK) {
             // Deny
-            click(By.text("Calendar"))
+            clickPermissionControllerUi(By.text("Calendar"))
             // Confirm deny
             click(By.res("android:id/button1"))
 
             // Grant
-            click(By.text("Calendar"))
+            clickPermissionControllerUi(By.text("Calendar"))
 
             // Deny
-            click(By.text("Calendar"))
+            clickPermissionControllerUi(By.text("Calendar"))
 
             clickPermissionReviewContinue()
         }
@@ -114,6 +116,15 @@
     }
 
     @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "TIRAMISU")
+    fun testNotificationPermissionAddedToReview() {
+        startAppActivityAndAssertResultCode(Activity.RESULT_CANCELED) {
+            waitFindObject(By.text("Notifications"), 5000L)
+            clickPermissionReviewCancel()
+        }
+    }
+
+    @Test
     fun testReviewPermissionWhenServiceIsBound() {
         val results = LinkedBlockingQueue<Int>()
         // We are starting a activity instead of the service directly, because
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionSplitTest.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionSplitTest.kt
index 22074f7..9550934 100644
--- a/tests/tests/permission3/src/android/permission3/cts/PermissionSplitTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionSplitTest.kt
@@ -16,6 +16,8 @@
 
 package android.permission3.cts
 
+import android.os.Build
+import androidx.test.filters.SdkSuppress
 import org.junit.Assume.assumeFalse
 import org.junit.Before
 import org.junit.Test
@@ -53,6 +55,27 @@
         testLocationPermissionSplit(false)
     }
 
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    @Test
+    fun testBodySensorSplit() {
+        installPackage(APP_APK_PATH_31)
+        testBodySensorPermissionSplit(true)
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    @Test
+    fun testBodySensorSplit32() {
+        installPackage(APP_APK_PATH_32)
+        testBodySensorPermissionSplit(true)
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    @Test
+    fun testBodySensorNonSplit() {
+        installPackage(APP_APK_PATH_LATEST)
+        testBodySensorPermissionSplit(false)
+    }
+
     private fun testLocationPermissionSplit(expectSplit: Boolean) {
         assertAppHasPermission(android.Manifest.permission.ACCESS_FINE_LOCATION, false)
         assertAppHasPermission(android.Manifest.permission.ACCESS_BACKGROUND_LOCATION, false)
@@ -69,4 +92,21 @@
 
         assertAppHasPermission(android.Manifest.permission.ACCESS_BACKGROUND_LOCATION, expectSplit)
     }
+
+    private fun testBodySensorPermissionSplit(expectSplit: Boolean) {
+        assertAppHasPermission(android.Manifest.permission.BODY_SENSORS, false)
+        assertAppHasPermission(android.Manifest.permission.BODY_SENSORS_BACKGROUND, false)
+
+        requestAppPermissionsAndAssertResult(
+                android.Manifest.permission.BODY_SENSORS to true
+        ) {
+            if (expectSplit) {
+                clickPermissionRequestSettingsLinkAndAllowAlways()
+            } else {
+                clickPermissionRequestAllowForegroundButton()
+            }
+        }
+
+        assertAppHasPermission(android.Manifest.permission.BODY_SENSORS_BACKGROUND, expectSplit)
+    }
 }
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionTapjackingTest.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionTapjackingTest.kt
index 905d46e..b5b22cf 100644
--- a/tests/tests/permission3/src/android/permission3/cts/PermissionTapjackingTest.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionTapjackingTest.kt
@@ -20,7 +20,9 @@
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.graphics.Point
+import android.os.Build
 import android.support.test.uiautomator.By
+import androidx.test.filters.SdkSuppress
 import com.android.compatibility.common.util.SystemUtil
 import org.junit.Assume.assumeFalse
 import org.junit.Before
@@ -55,6 +57,7 @@
         tryClicking(buttonCenter)
     }
 
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
     @Test
     fun testTapjackGrantDialog_partialOverlay() {
         // PermissionController for television uses a floating window.
@@ -75,10 +78,10 @@
         // Wait for overlay to hide the dialog
         context.sendBroadcast(Intent(ACTION_SHOW_OVERLAY)
                 .putExtra(EXTRA_FULL_OVERLAY, false)
-                .putExtra(DIALOG_LEFT, overlayButtonBounds.left)
-                .putExtra(DIALOG_TOP, overlayButtonBounds.top)
-                .putExtra(DIALOG_RIGHT, overlayButtonBounds.right)
-                .putExtra(MESSAGE_BOTTOM, overlayButtonBounds.bottom))
+                .putExtra(OVERLAY_LEFT, overlayButtonBounds.left)
+                .putExtra(OVERLAY_TOP, overlayButtonBounds.top)
+                .putExtra(OVERLAY_RIGHT, overlayButtonBounds.right)
+                .putExtra(OVERLAY_BOTTOM, overlayButtonBounds.bottom))
         waitFindObject(By.res("android.permission3.cts.usepermission:id/overlay"))
 
         tryClicking(foregroundButtonCenter)
@@ -101,19 +104,16 @@
         // Permission should not be granted
         assertAppHasPermission(ACCESS_FINE_LOCATION, false)
 
-        // On Automotive the dialog gets closed by the tapjacking activity popping up
-        if (!isAutomotive) {
-            // Verify that clicking the dialog without the overlay still works
-            context.sendBroadcast(Intent(ACTION_HIDE_OVERLAY))
-            SystemUtil.eventually({
-                if (packageManager.checkPermission(ACCESS_FINE_LOCATION, APP_PACKAGE_NAME) ==
-                        PackageManager.PERMISSION_DENIED) {
-                    uiDevice.click(buttonCenter.x, buttonCenter.y)
-                    Thread.sleep(100)
-                }
-                assertAppHasPermission(ACCESS_FINE_LOCATION, true)
-            }, 10000)
-        }
+        // Verify that clicking the dialog without the overlay still works
+        context.sendBroadcast(Intent(ACTION_HIDE_OVERLAY))
+        SystemUtil.eventually({
+            if (packageManager.checkPermission(ACCESS_FINE_LOCATION, APP_PACKAGE_NAME) ==
+                    PackageManager.PERMISSION_DENIED) {
+                uiDevice.click(buttonCenter.x, buttonCenter.y)
+                Thread.sleep(100)
+            }
+            assertAppHasPermission(ACCESS_FINE_LOCATION, true)
+        }, 10000)
     }
 
     companion object {
@@ -122,9 +122,9 @@
 
         const val EXTRA_FULL_OVERLAY = "android.permission3.cts.usepermission.extra.FULL_OVERLAY"
 
-        const val DIALOG_LEFT = "android.permission3.cts.usepermission.extra.DIALOG_LEFT"
-        const val DIALOG_TOP = "android.permission3.cts.usepermission.extra.DIALOG_TOP"
-        const val DIALOG_RIGHT = "android.permission3.cts.usepermission.extra.DIALOG_RIGHT"
-        const val MESSAGE_BOTTOM = "android.permission3.cts.usepermission.extra.MESSAGE_BOTTOM"
+        const val OVERLAY_LEFT = "android.permission3.cts.usepermission.extra.OVERLAY_LEFT"
+        const val OVERLAY_TOP = "android.permission3.cts.usepermission.extra.OVERLAY_TOP"
+        const val OVERLAY_RIGHT = "android.permission3.cts.usepermission.extra.OVERLAY_RIGHT"
+        const val OVERLAY_BOTTOM = "android.permission3.cts.usepermission.extra.OVERLAY_BOTTOM"
     }
 }
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionTest23.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionTest23.kt
index 26fe615..f9c4496 100644
--- a/tests/tests/permission3/src/android/permission3/cts/PermissionTest23.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionTest23.kt
@@ -16,8 +16,10 @@
 
 package android.permission3.cts
 
+import android.content.pm.PackageManager
 import androidx.test.filters.FlakyTest
-import com.android.modules.utils.build.SdkLevel
+import com.android.compatibility.common.util.SystemUtil
+import org.junit.Assert
 import org.junit.Assume
 import org.junit.Before
 import org.junit.Test
@@ -182,11 +184,7 @@
         // Request the permission and allow it
         // Make sure the permission is granted
         requestAppPermissionsAndAssertResult(android.Manifest.permission.CAMERA to true) {
-            if (SdkLevel.isAtLeastS()) {
-                clickPermissionRequestAllowForegroundButton()
-            } else {
-                clickPermissionRequestAllowButton()
-            }
+            clickPermissionRequestAllowForegroundButton()
         }
     }
 
@@ -248,11 +246,10 @@
             android.Manifest.permission.READ_SMS,
             android.Manifest.permission.CALL_PHONE,
             android.Manifest.permission.RECORD_AUDIO,
-            android.Manifest.permission.BODY_SENSORS,
             android.Manifest.permission.CAMERA,
             android.Manifest.permission.READ_EXTERNAL_STORAGE, targetSdk = 23
         )
-        // Don't use UI for granting location permission as this shows another dialog
+        // Don't use UI for granting location and sensor permissions as they show another dialog
         uiAutomation.grantRuntimePermission(
             APP_PACKAGE_NAME, android.Manifest.permission.ACCESS_FINE_LOCATION
         )
@@ -262,6 +259,9 @@
         uiAutomation.grantRuntimePermission(
             APP_PACKAGE_NAME, android.Manifest.permission.ACCESS_BACKGROUND_LOCATION
         )
+        uiAutomation.grantRuntimePermission(
+            APP_PACKAGE_NAME, android.Manifest.permission.BODY_SENSORS
+        )
 
         uninstallPackage(APP_PACKAGE_NAME)
         installPackage(APP_APK_PATH_23)
@@ -290,11 +290,7 @@
             null to false,
             android.Manifest.permission.RECORD_AUDIO to true
         ) {
-            if (SdkLevel.isAtLeastS()) {
-                clickPermissionRequestAllowForegroundButton()
-            } else {
-                clickPermissionRequestAllowButton()
-            }
+            clickPermissionRequestAllowForegroundButton()
             clickPermissionRequestAllowButton()
         }
     }
@@ -306,6 +302,34 @@
         requestAppPermissionsAndAssertResult(INVALID_PERMISSION to false) {}
     }
 
+    @Test
+    fun testAskButtonSetsFlags() {
+        Assume.assumeFalse("other form factors might not support the ask button",
+                isTv || isAutomotive || isWatch)
+
+        grantAppPermissions(android.Manifest.permission.ACCESS_BACKGROUND_LOCATION, targetSdk = 23)
+        assertAppHasPermission(android.Manifest.permission.ACCESS_BACKGROUND_LOCATION, true)
+        assertAppHasPermission(android.Manifest.permission.ACCESS_FINE_LOCATION, true)
+        assertAppHasPermission(android.Manifest.permission.ACCESS_COARSE_LOCATION, true)
+
+        revokeAppPermissions(android.Manifest.permission.ACCESS_BACKGROUND_LOCATION, targetSdk = 23)
+        SystemUtil.runWithShellPermissionIdentity {
+            val perms = listOf(android.Manifest.permission.ACCESS_BACKGROUND_LOCATION,
+                    android.Manifest.permission.ACCESS_FINE_LOCATION,
+                    android.Manifest.permission.ACCESS_COARSE_LOCATION)
+            for (perm in perms) {
+                var flags = packageManager.getPermissionFlags(perm, APP_PACKAGE_NAME, context.user)
+                Assert.assertEquals("USER_SET should not be set for $perm", 0,
+                        flags and PackageManager.FLAG_PERMISSION_USER_SET)
+                Assert.assertEquals("USER_FIXED should not be set for $perm", 0,
+                        flags and PackageManager.FLAG_PERMISSION_USER_FIXED)
+                Assert.assertEquals("ONE_TIME should be set for $perm",
+                        PackageManager.FLAG_PERMISSION_ONE_TIME,
+                        flags and PackageManager.FLAG_PERMISSION_ONE_TIME)
+            }
+        }
+    }
+
     private fun denyPermissionRequestWithPrejudice() {
         if (isTv || isWatch) {
             clickPermissionRequestDontAskAgainButton()
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionTest30WithBluetooth.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionTest30WithBluetooth.kt
index c3b2bb5..448405d 100644
--- a/tests/tests/permission3/src/android/permission3/cts/PermissionTest30WithBluetooth.kt
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionTest30WithBluetooth.kt
@@ -30,6 +30,7 @@
 import android.os.Build
 import android.os.Process
 import android.os.UserHandle
+import android.util.Log
 import androidx.test.InstrumentationRegistry
 import androidx.test.filters.SdkSuppress
 import com.android.compatibility.common.util.SystemUtil.runShellCommandOrThrow
@@ -43,6 +44,8 @@
 import org.junit.Before
 import org.junit.Test
 
+private const val LOG_TAG = "PermissionTest30WithBluetooth"
+
 /**
  * Runtime Bluetooth-permission behavior of apps targeting API 30
  */
@@ -115,24 +118,27 @@
         }
     }
 
+    // TODO:(b/220030722) Remove verbose logging (after test is stabilized)
     @Test
     fun testGivenBluetoothIsDeniedWhenScanIsAttemptedThenThenGetEmptyScanResult() {
+
         assertTrue("Please enable location to run this test. Bluetooth scanning " +
                 "requires location to be enabled.", locationManager.isLocationEnabled())
-
         assertBluetoothRevokedCompatState(revoked = false)
-        // Should return empty while the app does not have location
+
+        Log.v(LOG_TAG, "Testing for: Given {BLUETOOTH_SCAN, !BLUETOOTH_SCAN.COMPAT_REVOKE, " +
+                "!ACCESS_*_LOCATION}, expect EMPTY")
         assertEquals(BluetoothScanResult.EMPTY, scanForBluetoothDevices())
 
+        Log.v(LOG_TAG, "Testing for: Given {BLUETOOTH_SCAN, !BLUETOOTH_SCAN.COMPAT_REVOKE, " +
+                "ACCESS_*_LOCATION}, expect FULL")
         uiAutomation.grantRuntimePermission(TEST_APP_PKG, ACCESS_FINE_LOCATION)
         uiAutomation.grantRuntimePermission(TEST_APP_PKG, ACCESS_BACKGROUND_LOCATION)
-        runWithShellPermissionIdentity {
-            context.getSystemService(AppOpsManager::class.java)!!.setUidMode(
-                AppOpsManager.OPSTR_FINE_LOCATION,
-                packageManager.getPackageUid(context.packageName, 0), AppOpsManager.MODE_ALLOWED)
-        }
-
+        setAppOp(context.packageName, AppOpsManager.OPSTR_FINE_LOCATION, AppOpsManager.MODE_ALLOWED)
         assertEquals(BluetoothScanResult.FULL, scanForBluetoothDevices())
+
+        Log.v(LOG_TAG, "Testing for: Given {BLUETOOTH_SCAN, BLUETOOTH_SCAN.COMPAT_REVOKE, " +
+                "ACCESS_*_LOCATION}, expect ERROR")
         revokeAppPermissions(BLUETOOTH_SCAN, isLegacyApp = true)
         assertBluetoothRevokedCompatState(revoked = true)
         val res = scanForBluetoothDevices()
@@ -141,6 +147,13 @@
         }
     }
 
+    private fun setAppOp(packageName: String, appOp: String, appOpMode: Int) {
+        runWithShellPermissionIdentity {
+            context.getSystemService(AppOpsManager::class.java)!!.setUidMode(
+                    appOp, packageManager.getPackageUid(packageName, 0), appOpMode)
+        }
+    }
+
     @Test
     fun testRevokedCompatPersistsOnReinstall() {
         assertBluetoothRevokedCompatState(revoked = false)
@@ -163,6 +176,7 @@
             }
         }
     }
+
     private fun scanForBluetoothDevices(): BluetoothScanResult {
         val resolver = InstrumentationRegistry.getTargetContext().getContentResolver()
         val result = resolver.call(TEST_APP_AUTHORITY, "", null, null)
@@ -173,8 +187,8 @@
         context.packageManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
 
     private fun enableTestMode() = runShellCommandOrThrow("dumpsys activity service" +
-        " com.android.bluetooth/.btservice.AdapterService set-test-mode enabled")
+        " com.android.bluetooth.btservice.AdapterService set-test-mode enabled")
 
     private fun disableTestMode() = runShellCommandOrThrow("dumpsys activity service" +
-        " com.android.bluetooth/.btservice.AdapterService set-test-mode disabled")
+        " com.android.bluetooth.btservice.AdapterService set-test-mode disabled")
 }
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionTestLatest.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionTestLatest.kt
new file mode 100644
index 0000000..d6e7a69
--- /dev/null
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionTestLatest.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2021 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 android.permission3.cts
+
+import android.os.Build
+import androidx.test.filters.SdkSuppress
+import org.junit.Assert
+import org.junit.Test
+
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+class PermissionTestLatest : BaseUsePermissionTest() {
+    /**
+     * Not exactly a cts type test but it needs to be run continuously. This test is supposed to
+     * start failing once the sdk integer is decided for T. This is important to have because it was
+     * assumed that the sdk int will be 33 in frameworks/base/data/etc/platform.xml. This test
+     * should be removed once the sdk is finalized.
+     */
+    @Test
+    fun testTApiVersionCodeIsNotSet() {
+        Assert.assertEquals(Build.VERSION_CODES.S_V2, Build.VERSION.SDK_INT)
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/permission3/src/android/permission3/cts/PermissionTestMediaPermissions.kt b/tests/tests/permission3/src/android/permission3/cts/PermissionTestMediaPermissions.kt
new file mode 100644
index 0000000..86dd1e8
--- /dev/null
+++ b/tests/tests/permission3/src/android/permission3/cts/PermissionTestMediaPermissions.kt
@@ -0,0 +1,112 @@
+/*
+ * Copyright (C) 2022 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 android.permission3.cts
+
+import android.os.Build
+import androidx.test.filters.SdkSuppress
+import org.junit.Assume.assumeFalse
+import org.junit.Before
+import org.junit.Test
+
+/**
+ * Tests media storage supergroup behavior. I.e., on a T+ platform, for legacy (targetSdk<T) apps,
+ * the storage permission groups (STORAGE, AURAL, and VISUAL) form a supergroup, which effectively
+ * treats them as one group and therefore their permission state must always be equal.
+ */
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+class PermissionTestMediaPermissions : BaseUsePermissionTest() {
+    private fun assertAllPermissionState(state: Boolean) {
+        for (permission in STORAGE_AND_MEDIA_PERMISSIONS) {
+            assertAppHasPermission(permission, state)
+        }
+    }
+
+    @Before
+    fun assumeNotTvOrWatch() {
+        assumeFalse(isTv)
+        assumeFalse(isWatch)
+    }
+
+    @Before
+    fun installApp23() {
+        installPackage(APP_APK_PATH_23)
+    }
+
+    @Before
+    fun assertAppStartsWithNoPermissions() {
+        assertAllPermissionState(false)
+    }
+
+    @Test
+    fun testWhenRESIsGrantedFromGrantDialogThenShouldGrantAllPermissions() {
+        requestAppPermissionsAndAssertResult(
+            android.Manifest.permission.READ_EXTERNAL_STORAGE to true
+        ) {
+            clickPermissionRequestAllowButton()
+        }
+        assertAllPermissionState(true)
+    }
+
+    @Test
+    fun testWhenRESIsGrantedManuallyThenShouldGrantAllPermissions() {
+        grantAppPermissions(android.Manifest.permission.READ_EXTERNAL_STORAGE, targetSdk = 23)
+        assertAllPermissionState(true)
+    }
+
+    @Test
+    fun testWhenAuralIsGrantedManuallyThenShouldGrantAllPermissions() {
+        grantAppPermissions(android.Manifest.permission.READ_MEDIA_AUDIO, targetSdk = 23)
+        assertAllPermissionState(true)
+    }
+
+    @Test
+    fun testWhenVisualIsGrantedManuallyThenShouldGrantAllPermissions() {
+        grantAppPermissions(android.Manifest.permission.READ_MEDIA_VIDEO, targetSdk = 23)
+        assertAllPermissionState(true)
+    }
+
+    @Test
+    fun testWhenRESIsDeniedFromGrantDialogThenShouldDenyAllPermissions() {
+        requestAppPermissionsAndAssertResult(
+            android.Manifest.permission.READ_EXTERNAL_STORAGE to false
+        ) {
+            clickPermissionRequestDenyButton()
+        }
+        assertAllPermissionState(false)
+    }
+
+    @Test
+    fun testWhenRESIsDeniedManuallyThenShouldDenyAllPermissions() {
+        grantAppPermissions(android.Manifest.permission.READ_EXTERNAL_STORAGE, targetSdk = 23)
+        revokeAppPermissions(android.Manifest.permission.READ_EXTERNAL_STORAGE, targetSdk = 23)
+        assertAllPermissionState(false)
+    }
+
+    @Test
+    fun testWhenAuralIsDeniedManuallyThenShouldDenyAllPermissions() {
+        grantAppPermissions(android.Manifest.permission.READ_MEDIA_AUDIO, targetSdk = 23)
+        revokeAppPermissions(android.Manifest.permission.READ_MEDIA_AUDIO, targetSdk = 23)
+        assertAllPermissionState(false)
+    }
+
+    @Test
+    fun testWhenVisualIsDeniedManuallyThenShouldDenyAllPermissions() {
+        grantAppPermissions(android.Manifest.permission.READ_MEDIA_VIDEO, targetSdk = 23)
+        revokeAppPermissions(android.Manifest.permission.READ_MEDIA_VIDEO, targetSdk = 23)
+        assertAllPermissionState(false)
+    }
+}
diff --git a/tests/tests/permission3/src/android/permission3/cts/SensorBlockedBannerTest.kt b/tests/tests/permission3/src/android/permission3/cts/SensorBlockedBannerTest.kt
new file mode 100644
index 0000000..0b88e01
--- /dev/null
+++ b/tests/tests/permission3/src/android/permission3/cts/SensorBlockedBannerTest.kt
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2021 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 android.permission3.cts
+
+import android.content.Intent
+import android.hardware.SensorPrivacyManager
+import android.hardware.SensorPrivacyManager.Sensors.CAMERA
+import android.hardware.SensorPrivacyManager.Sensors.MICROPHONE
+import android.location.LocationManager
+import android.Manifest.permission_group.CAMERA as CAMERA_PERMISSION_GROUP
+import android.Manifest.permission_group.LOCATION as LOCATION_PERMISSION_GROUP
+import android.Manifest.permission_group.MICROPHONE as MICROPHONE_PERMISSION_GROUP
+import android.os.Build
+import android.provider.DeviceConfig
+import android.support.test.uiautomator.By
+import androidx.test.filters.SdkSuppress
+import com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity
+import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
+import java.util.regex.Pattern
+import org.junit.After
+import org.junit.Assume
+import org.junit.Before
+import org.junit.Test
+
+/**
+ * Banner card display tests on sensors being blocked
+ */
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
+class SensorBlockedBannerTest : BaseUsePermissionTest() {
+    companion object {
+        const val LOCATION = -1
+        const val WARNING_BANNER_ENABLED = "warning_banner_enabled"
+        const val DELAY_MILLIS = 3000L
+    }
+
+    val sensorPrivacyManager = context.getSystemService(SensorPrivacyManager::class.java)!!
+    val locationManager = context.getSystemService(LocationManager::class.java)!!
+    private val originalEnabledValue = callWithShellPermissionIdentity {
+        DeviceConfig.getString(DeviceConfig.NAMESPACE_PRIVACY,
+                WARNING_BANNER_ENABLED, false.toString())
+    }
+
+    private val sensorToPermissionGroup = mapOf(CAMERA to CAMERA_PERMISSION_GROUP,
+            MICROPHONE to MICROPHONE_PERMISSION_GROUP,
+            LOCATION to LOCATION_PERMISSION_GROUP)
+
+    private val permToTitle = mapOf(CAMERA to "blocked_camera_title",
+            MICROPHONE to "blocked_microphone_title",
+            LOCATION to "blocked_location_title")
+
+    @Before
+    fun setup() {
+        Assume.assumeFalse(isTv)
+        // TODO(b/203784852) Auto will eventually support the blocked sensor banner, but there won't
+        // be support in T or below
+        Assume.assumeFalse(isAutomotive)
+        installPackage(APP_APK_PATH_31)
+        runWithShellPermissionIdentity {
+            DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+                WARNING_BANNER_ENABLED, true.toString(), false)
+        }
+    }
+
+    @After
+    fun restoreWarningBannerState() {
+        runWithShellPermissionIdentity {
+            DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+                    WARNING_BANNER_ENABLED, originalEnabledValue, false)
+        }
+    }
+
+    private fun navigateAndTest(sensor: Int) {
+        val permissionGroup = sensorToPermissionGroup.getOrDefault(sensor, "Break")
+        val intent = Intent(Intent.ACTION_MANAGE_PERMISSION_APPS)
+                .putExtra(Intent.EXTRA_PERMISSION_GROUP_NAME, permissionGroup)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+        runWithShellPermissionIdentity {
+            context.startActivity(intent)
+        }
+        val bannerTitle = permToTitle.getOrDefault(sensor, "Break")
+        waitFindObject(By.text(getPermissionControllerString(bannerTitle)))
+        pressBack()
+    }
+
+    private fun runSensorTest(sensor: Int) {
+        val blocked = isSensorPrivacyEnabled(sensor)
+        if (!blocked) {
+            setSensor(sensor, true)
+        }
+        navigateAndTest(sensor)
+        if (!blocked) {
+            setSensor(sensor, false)
+        }
+    }
+
+    @Test
+    fun testCameraCardDisplayed() {
+        Assume.assumeTrue(sensorPrivacyManager.supportsSensorToggle(CAMERA))
+        runSensorTest(CAMERA)
+    }
+
+    @Test
+    fun testMicCardDisplayed() {
+        Assume.assumeTrue(sensorPrivacyManager.supportsSensorToggle(MICROPHONE))
+        runSensorTest(MICROPHONE)
+    }
+
+    @Test
+    fun testLocationCardDisplayed() {
+        runSensorTest(LOCATION)
+    }
+
+    private fun setSensor(sensor: Int, enable: Boolean) {
+        if (sensor == LOCATION) {
+            runWithShellPermissionIdentity {
+                locationManager.setLocationEnabledForUser(!enable,
+                    android.os.Process.myUserHandle())
+                if (enable) {
+                    try {
+                        val closePattern = Pattern.compile("close", Pattern.CASE_INSENSITIVE)
+                        waitFindObjectOrNull(By.text(closePattern), DELAY_MILLIS)?.click()
+                    } catch (e: Exception) {
+                        // Do nothing, warning didn't show up so test can proceed
+                    }
+                }
+            }
+        } else {
+            runWithShellPermissionIdentity {
+                sensorPrivacyManager.setSensorPrivacy(SensorPrivacyManager.Sources.OTHER,
+                    sensor, enable)
+            }
+        }
+    }
+
+    private fun isSensorPrivacyEnabled(sensor: Int): Boolean {
+        return if (sensor == LOCATION) {
+            callWithShellPermissionIdentity {
+                !locationManager.isLocationEnabled()
+            }
+        } else {
+            callWithShellPermissionIdentity {
+                sensorPrivacyManager.isSensorPrivacyEnabled(sensor)
+            }
+        }
+    }
+}
diff --git a/tests/tests/permission4/AndroidManifest.xml b/tests/tests/permission4/AndroidManifest.xml
index d4cc71a..4c5e49a 100644
--- a/tests/tests/permission4/AndroidManifest.xml
+++ b/tests/tests/permission4/AndroidManifest.xml
@@ -22,12 +22,10 @@
 
     <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
 
     <application>
-
         <uses-library android:name="android.test.runner" />
-
-        <activity android:name=".StartForFutureActivity" />
     </application>
 
     <instrumentation
diff --git a/tests/tests/permission4/AndroidTest.xml b/tests/tests/permission4/AndroidTest.xml
index 71353aa..78fe62f 100644
--- a/tests/tests/permission4/AndroidTest.xml
+++ b/tests/tests/permission4/AndroidTest.xml
@@ -21,6 +21,7 @@
     <option name="test-suite-tag" value="cts" />
 
     <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
diff --git a/tests/tests/permission4/AppThatAccessesCameraAndMic/src/android/permission4/cts/appthataccessescameraandmic/AccessCameraOrMicActivity.kt b/tests/tests/permission4/AppThatAccessesCameraAndMic/src/android/permission4/cts/appthataccessescameraandmic/AccessCameraOrMicActivity.kt
index 06aef15..659f228 100644
--- a/tests/tests/permission4/AppThatAccessesCameraAndMic/src/android/permission4/cts/appthataccessescameraandmic/AccessCameraOrMicActivity.kt
+++ b/tests/tests/permission4/AppThatAccessesCameraAndMic/src/android/permission4/cts/appthataccessescameraandmic/AccessCameraOrMicActivity.kt
@@ -83,6 +83,7 @@
     }
 
     override fun finish() {
+        super.finish()
         cameraDevice?.close()
         cameraDevice = null
         recorder?.stop()
@@ -95,7 +96,6 @@
                     packageName)
         }
         appOpsManager = null
-        super.finish()
     }
 
     override fun onStop() {
diff --git a/tests/tests/permission4/src/android/permission4/cts/CameraMicIndicatorsPermissionTest.kt b/tests/tests/permission4/src/android/permission4/cts/CameraMicIndicatorsPermissionTest.kt
index e8f503e..f23faae 100644
--- a/tests/tests/permission4/src/android/permission4/cts/CameraMicIndicatorsPermissionTest.kt
+++ b/tests/tests/permission4/src/android/permission4/cts/CameraMicIndicatorsPermissionTest.kt
@@ -19,17 +19,21 @@
 import android.app.Instrumentation
 import android.app.UiAutomation
 import android.app.compat.CompatChanges
+import android.content.AttributionSource
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.hardware.camera2.CameraManager
+import android.os.Build
 import android.os.Process
+import android.permission.PermissionManager
 import android.provider.DeviceConfig
 import android.provider.Settings
 import android.server.wm.WindowManagerStateHelper
 import android.support.test.uiautomator.By
 import android.support.test.uiautomator.UiDevice
 import android.support.test.uiautomator.UiSelector
+import androidx.test.filters.SdkSuppress
 import androidx.test.platform.app.InstrumentationRegistry
 import com.android.compatibility.common.util.DisableAnimationRule
 import com.android.compatibility.common.util.SystemUtil.callWithShellPermissionIdentity
@@ -37,21 +41,31 @@
 import com.android.compatibility.common.util.SystemUtil.runShellCommand
 import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
 import org.junit.After
+import org.junit.Assert
+import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Assume.assumeFalse
 import org.junit.Assume.assumeTrue
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 
 private const val APP_LABEL = "CtsCameraMicAccess"
+private const val APP_PKG = "android.permission4.cts.appthataccessescameraandmic"
+private const val SHELL_PKG = "com.android.shell"
 private const val USE_CAMERA = "use_camera"
 private const val USE_MICROPHONE = "use_microphone"
 private const val USE_HOTWORD = "use_hotword"
 private const val INTENT_ACTION = "test.action.USE_CAMERA_OR_MIC"
 private const val PRIVACY_CHIP_ID = "com.android.systemui:id/privacy_chip"
+private const val CAR_MIC_PRIVACY_CHIP_ID = "com.android.systemui:id/mic_privacy_chip"
+private const val CAR_CAMERA_PRIVACY_CHIP_ID = "com.android.systemui:id/camera_privacy_chip"
+private const val PRIVACY_ITEM_ID = "com.android.systemui:id/privacy_item"
+private const val SAFETY_CENTER_ITEM_ID = "com.android.permissioncontroller:id/parent_card_view"
 private const val INDICATORS_FLAG = "camera_mic_icons_enabled"
 private const val PERMISSION_INDICATORS_NOT_PRESENT = 162547999L
 private const val IDLE_TIMEOUT_MILLIS: Long = 1000
@@ -65,19 +79,32 @@
     private val uiAutomation: UiAutomation = instrumentation.uiAutomation
     private val uiDevice: UiDevice = UiDevice.getInstance(instrumentation)
     private val packageManager: PackageManager = context.packageManager
+    private val permissionManager: PermissionManager =
+        context.getSystemService(PermissionManager::class.java)!!
 
     private val isTv = packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)
+    private val isCar = packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)
     private var wasEnabled = false
     private val micLabel = packageManager.getPermissionGroupInfo(
         Manifest.permission_group.MICROPHONE, 0).loadLabel(packageManager).toString()
     private val cameraLabel = packageManager.getPermissionGroupInfo(
         Manifest.permission_group.CAMERA, 0).loadLabel(packageManager).toString()
-
+    private var isScreenOn = false
     private var screenTimeoutBeforeTest: Long = 0L
 
     @get:Rule
     val disableAnimationRule = DisableAnimationRule()
 
+    companion object {
+        const val SAFETY_CENTER_ENABLED = "safety_center_is_enabled"
+        const val DELAY_MILLIS = 3000L
+    }
+
+    private val safetyCenterEnabled = callWithShellPermissionIdentity {
+        DeviceConfig.getString(DeviceConfig.NAMESPACE_PRIVACY,
+                SAFETY_CENTER_ENABLED, false.toString())
+    }
+
     @Before
     fun setUp() {
         runWithShellPermissionIdentity {
@@ -87,11 +114,16 @@
             Settings.System.putLong(
                 context.contentResolver, Settings.System.SCREEN_OFF_TIMEOUT, 1800000L
             )
+            DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+                    SAFETY_CENTER_ENABLED, false.toString(), false)
         }
 
-        uiDevice.wakeUp()
-        runShellCommand(instrumentation, "wm dismiss-keyguard")
-
+        if (!isScreenOn) {
+            uiDevice.wakeUp()
+            runShellCommand(instrumentation, "wm dismiss-keyguard")
+            Thread.sleep(DELAY_MILLIS)
+            isScreenOn = true
+        }
         uiDevice.findObject(By.text("Close"))?.click()
         wasEnabled = setIndicatorsEnabledStateIfNeeded(true)
         // If the change Id is not present, then isChangeEnabled will return true. To bypass this,
@@ -125,13 +157,14 @@
                 screenTimeoutBeforeTest
             )
         }
+        changeSafetyCenterFlag(safetyCenterEnabled)
         if (!isTv) {
             pressBack()
             pressBack()
         }
         pressHome()
         pressHome()
-        Thread.sleep(3000)
+        Thread.sleep(DELAY_MILLIS)
     }
 
     private fun openApp(useMic: Boolean, useCamera: Boolean, useHotword: Boolean) {
@@ -147,37 +180,132 @@
     fun testCameraIndicator() {
         val manager = context.getSystemService(CameraManager::class.java)!!
         assumeTrue(manager.cameraIdList.isNotEmpty())
+        changeSafetyCenterFlag(false.toString())
         testCameraAndMicIndicator(useMic = false, useCamera = true)
     }
 
     @Test
     fun testMicIndicator() {
+        changeSafetyCenterFlag(false.toString())
         testCameraAndMicIndicator(useMic = true, useCamera = false)
     }
 
     @Test
     fun testHotwordIndicatorBehavior() {
+        changeSafetyCenterFlag(false.toString())
         testCameraAndMicIndicator(useMic = false, useCamera = false, useHotword = true)
     }
 
+    @Test
+    fun testChainUsageWithOtherUsage() {
+        // TV has only the mic icon
+        assumeFalse(isTv)
+        // Car has separate panels for mic and camera for now.
+        // TODO(b/218788634): enable this test for car once the new camera indicator is implemented.
+        assumeFalse(isCar)
+        changeSafetyCenterFlag(false.toString())
+        testCameraAndMicIndicator(useMic = false, useCamera = true, chainUsage = true)
+    }
+
+    // Enable when safety center sends a broadcast on safety center flag value change
+    @Test
+    @Ignore
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    fun testSafetyCenterCameraIndicator() {
+        assumeFalse(isTv)
+        assumeFalse(isCar)
+        val manager = context.getSystemService(CameraManager::class.java)!!
+        assumeTrue(manager.cameraIdList.isNotEmpty())
+        changeSafetyCenterFlag(true.toString())
+        testCameraAndMicIndicator(useMic = false, useCamera = true, safetyCenterEnabled = true)
+    }
+
+    // Enable when safety center sends a broadcast on safety center flag value change
+    @Test
+    @Ignore
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    fun testSafetyCenterMicIndicator() {
+        assumeFalse(isTv)
+        assumeFalse(isCar)
+        changeSafetyCenterFlag(true.toString())
+        testCameraAndMicIndicator(useMic = true, useCamera = false, safetyCenterEnabled = true)
+    }
+
+    // Enable when safety center sends a broadcast on safety center flag value change
+    @Test
+    @Ignore
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    fun testSafetyCenterHotwordIndicatorBehavior() {
+        assumeFalse(isTv)
+        assumeFalse(isCar)
+        changeSafetyCenterFlag(true.toString())
+        testCameraAndMicIndicator(
+            useMic = false,
+            useCamera = false,
+            useHotword = true,
+            safetyCenterEnabled = true
+        )
+    }
+
+    // Enable when safety center sends a broadcast on safety center flag value change
+    @Test
+    @Ignore
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    fun testSafetyCenterChainUsageWithOtherUsage() {
+        assumeFalse(isTv)
+        assumeFalse(isCar)
+        changeSafetyCenterFlag(true.toString())
+        testCameraAndMicIndicator(
+            useMic = false,
+            useCamera = true,
+            chainUsage = true,
+            safetyCenterEnabled = true
+        )
+    }
+
     private fun testCameraAndMicIndicator(
         useMic: Boolean,
         useCamera: Boolean,
-        useHotword: Boolean = false
+        useHotword: Boolean = false,
+        chainUsage: Boolean = false,
+        safetyCenterEnabled: Boolean = false
     ) {
+        var chainAttribution: AttributionSource? = null
         openApp(useMic, useCamera, useHotword)
-        eventually {
-            val appView = uiDevice.findObject(UiSelector().textContains(APP_LABEL))
-            assertTrue("View with text $APP_LABEL not found", appView.exists())
-        }
+        try {
+            eventually {
+                val appView = uiDevice.findObject(UiSelector().textContains(APP_LABEL))
+                assertTrue("View with text $APP_LABEL not found", appView.exists())
+            }
+            if (chainUsage) {
+                chainAttribution = createChainAttribution()
+                runWithShellPermissionIdentity {
+                    val ret = permissionManager.checkPermissionForStartDataDelivery(
+                        Manifest.permission.RECORD_AUDIO, chainAttribution!!, "")
+                    Assert.assertEquals(PermissionManager.PERMISSION_GRANTED, ret)
+                }
+            }
 
-        if (isTv) {
-            assertTvIndicatorsShown(useMic, useCamera, useHotword)
-        } else if (packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE)) {
-            assertCarIndicatorsShown(useMic, useCamera, useHotword)
-        } else {
-            uiDevice.openQuickSettings()
-            assertPrivacyChipAndIndicatorsPresent(useMic, useCamera)
+            if (isTv) {
+                assertTvIndicatorsShown(useMic, useCamera, useHotword)
+            } else if (isCar) {
+                assertCarIndicatorsShown(useMic, useCamera, useHotword, chainUsage)
+            } else {
+                // Hotword gets remapped to RECORD_AUDIO on handheld, so handheld should show a mic
+                // indicator
+                uiDevice.openQuickSettings()
+                assertPrivacyChipAndIndicatorsPresent(
+                    useMic || useHotword,
+                    useCamera,
+                    chainUsage,
+                    safetyCenterEnabled
+                )
+            }
+        } finally {
+            if (chainAttribution != null) {
+                permissionManager.finishDataDelivery(Manifest.permission.RECORD_AUDIO,
+                chainAttribution!!)
+            }
         }
     }
 
@@ -199,44 +327,81 @@
         }
     }
 
-    private fun assertCarIndicatorsShown(useMic: Boolean, useCamera: Boolean, useHotword: Boolean) {
-        // Ensure the privacy chip is present (or not)
-        val chipFound = isChipPresent()
-        if (useMic) {
-            assertTrue("Did not find chip", chipFound)
-        } else if (useHotword || useCamera) {
-            assertFalse("Found chip, but did not expect to", chipFound)
+    private fun assertCarIndicatorsShown(
+        useMic: Boolean,
+        useCamera: Boolean,
+        useHotword: Boolean,
+        chainUsage: Boolean
+    ) {
+        eventually {
+            // Ensure the privacy chip is present (or not)
+            var micPrivacyChip = uiDevice.findObject(By.res(CAR_MIC_PRIVACY_CHIP_ID))
+            var cameraPrivacyChip = uiDevice.findObject(By.res(CAR_CAMERA_PRIVACY_CHIP_ID))
+            if (useMic) {
+                assertNotNull("Did not find mic chip", micPrivacyChip)
+                // Click to chip to show the panel.
+                micPrivacyChip.click()
+            } else if (useCamera) {
+                assertNotNull("Did not find camera chip", cameraPrivacyChip)
+                // Click to chip to show the panel.
+                cameraPrivacyChip.click()
+            } else if (useHotword) {
+                assertNull("Found mic chip, but did not expect to", micPrivacyChip)
+                assertNull("Found camera chip, but did not expect to", cameraPrivacyChip)
+            }
         }
 
         eventually {
-            if (useCamera || useHotword) {
-                // There should be no microphone dialog when using hot word and/or camera
+            if (chainUsage) {
+                // Not applicable for car
+                assertChainMicAndOtherCameraUsed(false)
+                return@eventually
+            }
+            if (useHotword) {
+                // There should be no privacy panel when using hot word
                 val micLabelView = uiDevice.findObject(UiSelector().textContains(micLabel))
                 assertFalse("View with text $micLabel found, but did not expect to",
-                        micLabelView.exists())
+                    micLabelView.exists())
+                val cameraLabelView = uiDevice.findObject(UiSelector().textContains(cameraLabel))
+                assertFalse("View with text $cameraLabel found, but did not expect to",
+                    cameraLabelView.exists())
                 val appView = uiDevice.findObject(UiSelector().textContains(APP_LABEL))
                 assertFalse("View with text $APP_LABEL found, but did not expect to",
-                        appView.exists())
+                    appView.exists())
             } else if (useMic) {
+                // There should be a mic privacy panel after mic privacy chip is clicked
                 val micLabelView = uiDevice.findObject(UiSelector().textContains(micLabel))
                 assertTrue("View with text $micLabel not found", micLabelView.exists())
                 val appView = uiDevice.findObject(UiSelector().textContains(APP_LABEL))
                 assertTrue("View with text $APP_LABEL not found", appView.exists())
+            } else if (useCamera) {
+                // There should be a camera privacy panel after camera privacy chip is clicked
+                val cameraLabelView = uiDevice.findObject(UiSelector().textContains(cameraLabel))
+                assertTrue("View with text $cameraLabel not found", cameraLabelView.exists())
+                val appView = uiDevice.findObject(UiSelector().textContains(APP_LABEL))
+                assertTrue("View with text $APP_LABEL not found", appView.exists())
             }
         }
     }
 
-    private fun assertPrivacyChipAndIndicatorsPresent(useMic: Boolean, useCamera: Boolean) {
-        // Ensure the privacy chip is present (or not)
-        val chipFound = isChipPresent()
-        if (useMic || useCamera) {
-            assertTrue("Did not find chip", chipFound)
-        } else { // hotword
-            assertFalse("Found chip, but did not expect to", chipFound)
-            return
+    private fun assertPrivacyChipAndIndicatorsPresent(
+        useMic: Boolean,
+        useCamera: Boolean,
+        chainUsage: Boolean,
+        safetyCenterEnabled: Boolean = false
+    ) {
+        // Ensure the privacy chip is present
+        eventually {
+            val privacyChip = uiDevice.findObject(UiSelector().resourceId(PRIVACY_CHIP_ID))
+            assertTrue("view with id $PRIVACY_CHIP_ID not found", privacyChip.exists())
+            privacyChip.click()
         }
 
         eventually {
+            if (chainUsage) {
+                assertChainMicAndOtherCameraUsed(safetyCenterEnabled)
+                return@eventually
+            }
             if (useMic) {
                 val iconView = uiDevice.findObject(UiSelector().descriptionContains(micLabel))
                 assertTrue("View with description $micLabel not found", iconView.exists())
@@ -247,22 +412,47 @@
             }
             val appView = uiDevice.findObject(UiSelector().textContains(APP_LABEL))
             assertTrue("View with text $APP_LABEL not found", appView.exists())
+            if (safetyCenterEnabled) {
+                assertTrue("Did not find safety center views",
+                    uiDevice.findObjects(By.res(SAFETY_CENTER_ITEM_ID)).size > 0)
+            }
         }
     }
 
-    private fun isChipPresent(): Boolean {
-        var chipFound = false
-        try {
-            eventually {
-                val privacyChip = uiDevice.findObject(By.res(PRIVACY_CHIP_ID))
-                assertNotNull("view with id $PRIVACY_CHIP_ID not found", privacyChip)
-                privacyChip.click()
-                chipFound = true
+    private fun createChainAttribution(): AttributionSource? {
+        var attrSource: AttributionSource? = null
+        runWithShellPermissionIdentity {
+            try {
+                val appUid = packageManager.getPackageUid(APP_PKG, 0)
+                val childAttribution = AttributionSource(appUid, APP_PKG, null)
+                val attribution = AttributionSource(Process.myUid(), context.packageName, null,
+                    null, permissionManager.registerAttributionSource(childAttribution))
+                attrSource = permissionManager.registerAttributionSource(attribution)
+            } catch (e: PackageManager.NameNotFoundException) {
+                Assert.fail("Expected to find a UID for $APP_LABEL")
             }
-        } catch (e: Exception) {
-            // Handle more gracefully after
         }
-        return chipFound
+        return attrSource
+    }
+
+    private fun assertChainMicAndOtherCameraUsed(safetyCenterEnabled: Boolean) {
+        val shellLabel = try {
+            context.packageManager.getApplicationInfo(SHELL_PKG, 0)
+                .loadLabel(context.packageManager).toString()
+        } catch (e: PackageManager.NameNotFoundException) {
+            "Did not find shell package"
+        }
+
+        val usageViews = if (safetyCenterEnabled) {
+            uiDevice.findObjects(By.res(SAFETY_CENTER_ITEM_ID))
+        } else {
+            uiDevice.findObjects(By.res(PRIVACY_ITEM_ID))
+        }
+        assertEquals("Expected two usage views", 2, usageViews.size)
+        val appViews = uiDevice.findObjects(By.textContains(APP_LABEL))
+        assertEquals("Expected two $APP_LABEL view", 2, appViews.size)
+        val shellView = uiDevice.findObjects(By.textContains(shellLabel))
+        assertEquals("Expected only one shell view", 1, shellView.size)
     }
 
     private fun pressBack() {
@@ -277,4 +467,11 @@
 
     private fun waitForIdle() =
         uiAutomation.waitForIdle(IDLE_TIMEOUT_MILLIS, TIMEOUT_MILLIS)
+
+    private fun changeSafetyCenterFlag(safetyCenterEnabled: String) {
+        runWithShellPermissionIdentity {
+            DeviceConfig.setProperty(DeviceConfig.NAMESPACE_PRIVACY,
+                    SAFETY_CENTER_ENABLED, safetyCenterEnabled, false)
+        }
+    }
 }
\ No newline at end of file
diff --git a/tests/tests/permission5/AndroidTest.xml b/tests/tests/permission5/AndroidTest.xml
index d449d9f..953df0d 100644
--- a/tests/tests/permission5/AndroidTest.xml
+++ b/tests/tests/permission5/AndroidTest.xml
@@ -21,6 +21,7 @@
     <option name="test-suite-tag" value="cts" />
 
     <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
diff --git a/tests/tests/permission5/src/android/permission5/cts/PermissionCheckerTest.kt b/tests/tests/permission5/src/android/permission5/cts/PermissionCheckerTest.kt
new file mode 100644
index 0000000..b7762c6
--- /dev/null
+++ b/tests/tests/permission5/src/android/permission5/cts/PermissionCheckerTest.kt
@@ -0,0 +1,158 @@
+/*
+ * Copyright (C) 2021 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 android.permission5.cts
+
+import android.app.AppOpsManager
+import android.content.AttributionSource
+import android.os.Process
+import android.permission.PermissionManager
+import android.platform.test.annotations.AppModeFull
+import androidx.test.platform.app.InstrumentationRegistry
+import com.android.compatibility.common.util.SystemUtil.runWithShellPermissionIdentity
+import com.google.common.truth.Truth.assertThat
+import org.junit.After
+import org.junit.Before
+import org.junit.Test
+
+@AppModeFull(reason = "Instant apps cannot hold READ_CALENDAR")
+class PermissionCheckerTest {
+    private val instrumentation = InstrumentationRegistry.getInstrumentation()
+    private val context = instrumentation.getContext()
+    private val packageManager = context.packageManager
+    private val appOpsManager = context.getSystemService(AppOpsManager::class.java)
+    private val permissionManager = context.getSystemService(PermissionManager::class.java)
+    private val currentUser = Process.myUserHandle()
+
+    private val helperUid = packageManager.getPackageUid(HELPER_PACKAGE_NAME, 0)
+    private val helperAttributionSource = AttributionSource.Builder(helperUid)
+        .setPackageName(HELPER_PACKAGE_NAME)
+        .build()
+
+    @Before
+    @After
+    fun resetHelperPermissionState() {
+        runWithShellPermissionIdentity {
+            Thread.sleep(1000)
+            packageManager.grantRuntimePermission(
+                HELPER_PACKAGE_NAME, HELPER_PERMISSION_NAME, currentUser
+            )
+            Thread.sleep(1000)
+            appOpsManager.setUidMode(HELPER_APP_OP_NAME, helperUid, AppOpsManager.MODE_ALLOWED)
+            Thread.sleep(1000)
+        }
+    }
+
+    @Test
+    fun testCheckPermissionForPreflight() {
+        assertThat(
+            permissionManager.checkPermissionForPreflight(
+                HELPER_PERMISSION_NAME, helperAttributionSource
+            )
+        ).isEqualTo(PermissionManager.PERMISSION_GRANTED)
+
+        runWithShellPermissionIdentity {
+            appOpsManager.setUidMode(HELPER_APP_OP_NAME, helperUid, AppOpsManager.MODE_IGNORED)
+        }
+        assertThat(
+            permissionManager.checkPermissionForPreflight(
+                HELPER_PERMISSION_NAME, helperAttributionSource
+            )
+        ).isEqualTo(PermissionManager.PERMISSION_SOFT_DENIED)
+
+        runWithShellPermissionIdentity {
+            packageManager.revokeRuntimePermission(
+                HELPER_PACKAGE_NAME, HELPER_PERMISSION_NAME, currentUser
+            )
+        }
+        assertThat(
+            permissionManager.checkPermissionForPreflight(
+                HELPER_PERMISSION_NAME, helperAttributionSource
+            )
+        ).isEqualTo(PermissionManager.PERMISSION_HARD_DENIED)
+    }
+
+    @Test
+    fun testCheckPermissionForDataDelivery() {
+        // checkPermissionForDataDelivery() requires UPDATE_APP_OPS_STATS.
+        runWithShellPermissionIdentity {
+            assertThat(
+                permissionManager.checkPermissionForDataDelivery(
+                    HELPER_PERMISSION_NAME, helperAttributionSource, null
+                )
+            ).isEqualTo(PermissionManager.PERMISSION_GRANTED)
+
+            appOpsManager.setUidMode(HELPER_APP_OP_NAME, helperUid, AppOpsManager.MODE_IGNORED)
+            assertThat(
+                permissionManager.checkPermissionForDataDelivery(
+                    HELPER_PERMISSION_NAME, helperAttributionSource, null
+                )
+            ).isEqualTo(PermissionManager.PERMISSION_SOFT_DENIED)
+
+            packageManager.revokeRuntimePermission(
+                HELPER_PACKAGE_NAME, HELPER_PERMISSION_NAME, currentUser
+            )
+            assertThat(
+                permissionManager.checkPermissionForDataDelivery(
+                    HELPER_PERMISSION_NAME, helperAttributionSource, null
+                )
+            ).isEqualTo(PermissionManager.PERMISSION_HARD_DENIED)
+        }
+    }
+
+    @Test
+    fun testCheckPermissionForDataDeliveryFromDataSource() {
+        runWithShellPermissionIdentity({
+            assertThat(
+                permissionManager.checkPermissionForDataDeliveryFromDataSource(
+                    HELPER_PERMISSION_NAME, helperAttributionSource, null
+                )
+            ).isEqualTo(PermissionManager.PERMISSION_GRANTED)
+        }, android.Manifest.permission.UPDATE_APP_OPS_STATS)
+
+        runWithShellPermissionIdentity {
+            appOpsManager.setUidMode(HELPER_APP_OP_NAME, helperUid, AppOpsManager.MODE_IGNORED)
+        }
+
+        runWithShellPermissionIdentity({
+            assertThat(
+                permissionManager.checkPermissionForDataDeliveryFromDataSource(
+                    HELPER_PERMISSION_NAME, helperAttributionSource, null
+                )
+            ).isEqualTo(PermissionManager.PERMISSION_SOFT_DENIED)
+        }, android.Manifest.permission.UPDATE_APP_OPS_STATS)
+
+        runWithShellPermissionIdentity {
+            packageManager.revokeRuntimePermission(
+                HELPER_PACKAGE_NAME, HELPER_PERMISSION_NAME, currentUser
+            )
+        }
+
+        runWithShellPermissionIdentity({
+            assertThat(
+                permissionManager.checkPermissionForDataDeliveryFromDataSource(
+                    HELPER_PERMISSION_NAME, helperAttributionSource, null
+                )
+            ).isEqualTo(PermissionManager.PERMISSION_SOFT_DENIED)
+        }, android.Manifest.permission.UPDATE_APP_OPS_STATS)
+    }
+
+    companion object {
+        private const val HELPER_PACKAGE_NAME = "android.permission5.cts.blamed"
+        private const val HELPER_PERMISSION_NAME = android.Manifest.permission.READ_CALENDAR
+        private const val HELPER_APP_OP_NAME = AppOpsManager.OPSTR_READ_CALENDAR
+    }
+}
diff --git a/tests/tests/persistentdataservice/Android.bp b/tests/tests/persistentdataservice/Android.bp
new file mode 100644
index 0000000..ce31120
--- /dev/null
+++ b/tests/tests/persistentdataservice/Android.bp
@@ -0,0 +1,36 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsPersistentDataBlockManagerTestCases",
+    defaults: ["cts_defaults"],
+    static_libs: [
+        "ctstestrunner-axt",
+         "Harrier",
+         "truth-prebuilt"
+    ],
+    libs: ["android.test.base"],
+    srcs: ["src/**/*.java"],
+    sdk_version: "test_current",
+    min_sdk_version: "27",
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
diff --git a/tests/tests/persistentdataservice/AndroidManifest.xml b/tests/tests/persistentdataservice/AndroidManifest.xml
new file mode 100644
index 0000000..e5db957
--- /dev/null
+++ b/tests/tests/persistentdataservice/AndroidManifest.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.persistentdata.cts">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <!-- This is a self-instrumenting test package. -->
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="android.persistentdata.cts"
+                     android:label="CTS tests of PersistentDataBlockManager">
+        <meta-data android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+    <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="17"></uses-sdk>
+
+</manifest>
+
diff --git a/tests/tests/persistentdataservice/AndroidTest.xml b/tests/tests/persistentdataservice/AndroidTest.xml
new file mode 100644
index 0000000..e47032f
--- /dev/null
+++ b/tests/tests/persistentdataservice/AndroidTest.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2015 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.
+-->
+<configuration description="Config for CTS PersistentDataBlockManager test cases">
+    <option name="test-suite-tag" value="cts" />
+
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+
+    <option name="not-shardable" value="true" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsPersistentDataBlockManagerTestCases.apk" />
+    </target_preparer>
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.persistentdata.cts" />
+        <option name="runtime-hint" value="8m30s" />
+    </test>
+</configuration>
diff --git a/tests/tests/persistentdataservice/OWNERS b/tests/tests/persistentdataservice/OWNERS
new file mode 100644
index 0000000..f4d73eb
--- /dev/null
+++ b/tests/tests/persistentdataservice/OWNERS
@@ -0,0 +1,3 @@
+# Bug component: 24950
+omakoto@google.com
+yamasani@google.com
diff --git a/tests/tests/persistentdataservice/TEST_MAPPING b/tests/tests/persistentdataservice/TEST_MAPPING
new file mode 100644
index 0000000..4772e4f
--- /dev/null
+++ b/tests/tests/persistentdataservice/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsPersistentDataBlockManagerTestCases"
+    }
+  ]
+}
diff --git a/tests/tests/persistentdataservice/src/android/service/persistentdata/PersistentDataBlockManagerTest.java b/tests/tests/persistentdataservice/src/android/service/persistentdata/PersistentDataBlockManagerTest.java
new file mode 100644
index 0000000..70e97ea
--- /dev/null
+++ b/tests/tests/persistentdataservice/src/android/service/persistentdata/PersistentDataBlockManagerTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2022 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 android.service.persistentdata;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.content.Context;
+
+import com.android.bedstead.harrier.BedsteadJUnit4;
+import com.android.bedstead.harrier.DeviceState;
+import com.android.bedstead.harrier.annotations.EnsureDoesNotHavePermission;
+import com.android.bedstead.harrier.annotations.EnsureHasPermission;
+import com.android.bedstead.nene.TestApis;
+
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(BedsteadJUnit4.class)
+public class PersistentDataBlockManagerTest {
+    @ClassRule
+    @Rule
+    public static final DeviceState sDeviceState = new DeviceState();
+
+    private static final Context sContext = TestApis.context().instrumentedContext();
+    private static final PersistentDataBlockManager sPersistentDataBlockManager =
+            sContext.getSystemService(PersistentDataBlockManager.class);
+
+    @EnsureHasPermission(android.Manifest.permission.ACCESS_PDB_STATE)
+    @Test
+    public void getPersistentDataPackageName_returnsNonNullResult() {
+        if (sPersistentDataBlockManager == null) {
+            return;
+        }
+        assertThat(sPersistentDataBlockManager.getPersistentDataPackageName()).isNotNull();
+    }
+
+    @EnsureDoesNotHavePermission(android.Manifest.permission.ACCESS_PDB_STATE)
+    @Test
+    public void getPersistentDataPackageName_withoutPermission_throwsException() {
+        if (sPersistentDataBlockManager == null) {
+            return;
+        }
+        assertThrows(SecurityException.class,
+                sPersistentDataBlockManager::getPersistentDataPackageName);
+    }
+}
diff --git a/tests/tests/provider/Android.bp b/tests/tests/provider/Android.bp
index 91566e3..5a1b7a0 100644
--- a/tests/tests/provider/Android.bp
+++ b/tests/tests/provider/Android.bp
@@ -47,6 +47,8 @@
     // uncomment when b/140885436 is fixed
     // sdk_version: "test_current",
     min_sdk_version: "21",
+    //TODO(b/227617884): Change target_sdk_version to 33 after T SDK finalization is complete
+    target_sdk_version: "10000",
 
     platform_apis: true,
 
diff --git a/tests/tests/provider/src/android/provider/cts/media/MediaStoreAudioTestHelper.java b/tests/tests/provider/src/android/provider/cts/media/MediaStoreAudioTestHelper.java
index ff5a1c8..c0e100c 100644
--- a/tests/tests/provider/src/android/provider/cts/media/MediaStoreAudioTestHelper.java
+++ b/tests/tests/provider/src/android/provider/cts/media/MediaStoreAudioTestHelper.java
@@ -24,6 +24,7 @@
 import android.provider.MediaStore.Audio.Media;
 import android.provider.cts.ProviderTestUtils;
 
+import androidx.annotation.RequiresApi;
 import androidx.test.filters.SdkSuppress;
 import androidx.test.runner.AndroidJUnit4;
 
@@ -91,7 +92,6 @@
         public static final int IS_RINGTONE = 0;
         public static final int IS_NOTIFICATION = 0;
         public static final int IS_ALARM = 0;
-        public static final int IS_RECORDING = 0;
         public static final int IS_MUSIC = 1;
         public static final int YEAR = 1992;
         public static final int TRACK = 1;
@@ -135,7 +135,6 @@
             values.put(Media.IS_MUSIC, IS_MUSIC);
             values.put(Media.IS_ALARM, IS_ALARM);
             values.put(Media.IS_NOTIFICATION, IS_NOTIFICATION);
-            values.put(Media.IS_RECORDING, IS_RECORDING);
             values.put(Media.IS_RINGTONE, IS_RINGTONE);
             return values;
         }
@@ -278,6 +277,28 @@
         }
     }
 
+    @RequiresApi(Build.VERSION_CODES.S)
+    public static class Audio7 extends Audio1 {
+        public static final int IS_RECORDING = 0;
+
+        private Audio7() {
+        }
+
+        private static Audio7 sInstance = new Audio7();
+
+        public static Audio7 getInstance() {
+            return sInstance;
+        }
+
+        @Override
+        public ContentValues getContentValues(String volumeName) {
+            ContentValues values = super.getContentValues(volumeName);
+            values.put(Media.DATA, values.getAsString(Media.DATA) + ".recording.mp3");
+            values.put(Media.IS_RECORDING, IS_RECORDING);
+            return values;
+        }
+    }
+
     @Test
     public void testStub() {
         // No-op test here to keep atest happy
diff --git a/tests/tests/provider/src/android/provider/cts/media/MediaStorePlacementTest.java b/tests/tests/provider/src/android/provider/cts/media/MediaStorePlacementTest.java
index d5a4e4a..c6768ab 100644
--- a/tests/tests/provider/src/android/provider/cts/media/MediaStorePlacementTest.java
+++ b/tests/tests/provider/src/android/provider/cts/media/MediaStorePlacementTest.java
@@ -221,12 +221,9 @@
                 Optional.of("Android/media/android.provider.cts/foo"), null));
         assertFalse(updatePlacement(uri,
                 Optional.of("Android/media/com.example/foo"), null));
-        try {
-            assertTrue(updatePlacementOrThrow(uri, Optional.of("DCIM"), null));
-        } catch (IllegalArgumentException tolerated) {
-            // update() above can either succeed or throw IllegalArgumentExxception based on the
-            // MediaProvider version.
-        }
+        assertTrue(updatePlacement(uri,
+                Optional.of("DCIM"), null));
+        assertFalse(updatePlacement(uri, Optional.of("Android/media"), null));
     }
 
     @Test
@@ -236,17 +233,13 @@
         final Uri uri = ProviderTestUtils.stageMedia(R.drawable.scenery,
                 mExternalImages, "image/jpeg");
 
+        assertTrue(updatePlacement(uri,
+                Optional.of("Android/media/android.provider.cts/foo"), null));
         assertFalse(updatePlacement(uri,
                 Optional.of("Android/media/com.example/foo"), null));
         assertTrue(updatePlacement(uri,
                 Optional.of("DCIM"), null));
-        try {
-            assertTrue(updatePlacementOrThrow(uri,
-                    Optional.of("Android/media/android.provider.cts/foo"), null));
-        } catch (IllegalArgumentException tolerated) {
-            // update() above can either succeed or throw IllegalArgumentExxception based on the
-            // MediaProvider version.
-        }
+        assertFalse(updatePlacement(uri, Optional.of("Android/media"), null));
     }
 
     @Test
@@ -327,8 +320,8 @@
                 ProviderTestUtils.stageFile(R.raw.scenery, file));
     }
 
-    private boolean updatePlacementOrThrow(Uri uri, Optional<String> path,
-            Optional<String> displayName) throws Exception {
+    private boolean updatePlacement(Uri uri, Optional<String> path, Optional<String> displayName)
+            throws Exception {
         final ContentValues values = new ContentValues();
         if (path != null) {
             values.put(MediaColumns.RELATIVE_PATH, path.orElse(null));
@@ -336,13 +329,8 @@
         if (displayName != null) {
             values.put(MediaColumns.DISPLAY_NAME, displayName.orElse(null));
         }
-        return (mContentResolver.update(uri, values, null, null) == 1);
-    }
-
-    private boolean updatePlacement(Uri uri, Optional<String> path,
-            Optional<String> displayName) {
         try {
-            return updatePlacementOrThrow(uri, path, displayName);
+            return (mContentResolver.update(uri, values, null, null) == 1);
         } catch (Exception tolerated) {
             return false;
         }
diff --git a/tests/tests/provider/src/android/provider/cts/media/MediaStoreUtils.java b/tests/tests/provider/src/android/provider/cts/media/MediaStoreUtils.java
index 49a33ad..da7f0fb 100644
--- a/tests/tests/provider/src/android/provider/cts/media/MediaStoreUtils.java
+++ b/tests/tests/provider/src/android/provider/cts/media/MediaStoreUtils.java
@@ -27,16 +27,16 @@
 import android.provider.MediaStore.MediaColumns;
 import android.text.format.DateUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.filters.SdkSuppress;
+
 import org.junit.Test;
 
 import java.io.FileNotFoundException;
 import java.io.OutputStream;
 import java.util.Objects;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.test.filters.SdkSuppress;
-
 @SdkSuppress(minSdkVersion = Build.VERSION_CODES.R)
 public class MediaStoreUtils {
     @Test
@@ -118,6 +118,10 @@
             }
         }
 
+        public void setIsFavorite(@Nullable Boolean isFavorite) {
+            this.insertValues.put(MediaColumns.IS_FAVORITE, isFavorite);
+        }
+
         /**
          * Optionally set the Uri from where the file has been downloaded. This is used
          * for files being added to {@link Downloads} table.
diff --git a/tests/tests/provider/src/android/provider/cts/media/MediaStore_Audio_MediaTest.java b/tests/tests/provider/src/android/provider/cts/media/MediaStore_Audio_MediaTest.java
index a196c5a..6a4c199 100644
--- a/tests/tests/provider/src/android/provider/cts/media/MediaStore_Audio_MediaTest.java
+++ b/tests/tests/provider/src/android/provider/cts/media/MediaStore_Audio_MediaTest.java
@@ -36,10 +36,10 @@
 import android.provider.MediaStore.Audio;
 import android.provider.MediaStore.Audio.Media;
 import android.provider.MediaStore.Files.FileColumns;
-import android.provider.MediaStore.MediaColumns;
 import android.provider.cts.ProviderTestUtils;
 import android.provider.cts.R;
 import android.provider.cts.media.MediaStoreAudioTestHelper.Audio1;
+import android.provider.cts.media.MediaStoreAudioTestHelper.Audio7;
 import android.provider.cts.media.MediaStoreUtils.PendingParams;
 import android.provider.cts.media.MediaStoreUtils.PendingSession;
 import android.util.Log;
@@ -157,7 +157,6 @@
             assertEquals(Audio1.IS_MUSIC, c.getInt(c.getColumnIndex(Media.IS_MUSIC)));
             assertEquals(Audio1.IS_NOTIFICATION, c.getInt(c.getColumnIndex(Media.IS_NOTIFICATION)));
             assertEquals(Audio1.IS_RINGTONE, c.getInt(c.getColumnIndex(Media.IS_RINGTONE)));
-            assertEquals(Audio1.IS_RECORDING, c.getInt(c.getColumnIndex(Media.IS_RECORDING)));
             assertEquals(Audio1.TRACK, c.getInt(c.getColumnIndex(Media.TRACK)));
             assertEquals(Audio1.YEAR, c.getInt(c.getColumnIndex(Media.YEAR)));
             String titleKey = c.getString(c.getColumnIndex(Media.TITLE_KEY));
@@ -186,6 +185,41 @@
         }
     }
 
+    /**
+     * The test case checks below behaviors:
+     * 1. The IS_RECORDING column is in Audio table in MediaStore's database since S OS. Insert with
+     *    IS_RECORDING column doesn't fail and we can query the result with IS_RECORDING column.
+     * 2. Validate IS_RECORDING is correctly set for database row.
+     */
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
+    public void testStoreNotAudioRecordingMedia() {
+        Audio7 audio7 = Audio7.getInstance();
+        ContentValues values = audio7.getContentValues(mVolumeName);
+        //insert
+        Uri mediaUri = Media.getContentUri(mVolumeName);
+        Uri uri = mContentResolver.insert(mediaUri, values);
+        assertNotNull(uri);
+
+        try (Cursor c = mContentResolver.query(uri, null, null, null, null)) {
+            assertEquals(1, c.getCount());
+            c.moveToFirst();
+            long id = c.getLong(c.getColumnIndex(Media._ID));
+            assertTrue(id > 0);
+            String expected = audio7.getContentValues(mVolumeName).getAsString(Media.DATA);
+            assertEquals(expected, c.getString(c.getColumnIndex(Media.DATA)));
+            assertEquals(Audio7.MIME_TYPE, c.getString(c.getColumnIndex(Media.MIME_TYPE)));
+            assertEquals(Audio7.IS_ALARM, c.getInt(c.getColumnIndex(Media.IS_ALARM)));
+            assertEquals(Audio7.IS_MUSIC, c.getInt(c.getColumnIndex(Media.IS_MUSIC)));
+            assertEquals(Audio7.IS_NOTIFICATION, c.getInt(c.getColumnIndex(Media.IS_NOTIFICATION)));
+            assertEquals(Audio7.IS_RINGTONE, c.getInt(c.getColumnIndex(Media.IS_RINGTONE)));
+            assertEquals(Audio7.IS_RECORDING, c.getInt(c.getColumnIndex(Media.IS_RECORDING)));
+        } finally {
+            // delete
+            mContentResolver.delete(uri, null, null);
+        }
+    }
+
     @Test(timeout = 60000)
     public void testCanonicalize() throws Exception {
         // Remove all audio left over from other tests
diff --git a/tests/tests/provider/src/android/provider/cts/settings/SettingsTest.java b/tests/tests/provider/src/android/provider/cts/settings/SettingsTest.java
index 97e1649..f8e74ab 100644
--- a/tests/tests/provider/src/android/provider/cts/settings/SettingsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/settings/SettingsTest.java
@@ -36,6 +36,7 @@
 import android.database.sqlite.SQLiteException;
 import android.net.Uri;
 import android.os.Binder;
+import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.RemoteException;
@@ -43,6 +44,7 @@
 import android.provider.Settings;
 
 import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SdkSuppress;
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.compatibility.common.util.SystemUtil;
@@ -372,6 +374,17 @@
 
     }
 
+    @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)
+    public void testDataRoamingAccessPermission() throws Exception {
+        try {
+            Settings.Global.getInt(getContext().getContentResolver(), Settings.Global.DATA_ROAMING);
+            fail("Expect throwing RuntimeException due readable maxTargetedSdk = S");
+        } catch (SecurityException e) {
+            // Expected.
+        }
+    }
+
     private Instrumentation getInstrumentation() {
         return InstrumentationRegistry.getInstrumentation();
     }
diff --git a/tests/tests/provider/src/android/provider/cts/settings/Settings_SecureTest.java b/tests/tests/provider/src/android/provider/cts/settings/Settings_SecureTest.java
index fd84677..693284f 100644
--- a/tests/tests/provider/src/android/provider/cts/settings/Settings_SecureTest.java
+++ b/tests/tests/provider/src/android/provider/cts/settings/Settings_SecureTest.java
@@ -114,10 +114,21 @@
         } catch (SettingNotFoundException expected) {
         }
 
+        if (!isFloat(Secure.getString(cr, STRING_VALUE_SETTING))) {
+            try {
+                Secure.getFloat(cr, STRING_VALUE_SETTING);
+                fail("SettingNotFoundException should have been thrown!");
+            } catch (SettingNotFoundException expected) {
+            }
+        }
+    }
+
+    private boolean isFloat(String str) {
         try {
-            Secure.getFloat(cr, STRING_VALUE_SETTING);
-            fail("SettingNotFoundException should have been thrown!");
-        } catch (SettingNotFoundException expected) {
+            Float.parseFloat(str);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
         }
     }
 
@@ -137,10 +148,21 @@
         } catch (SettingNotFoundException expected) {
         }
 
+        if (!isLong(Secure.getString(cr, STRING_VALUE_SETTING))) {
+            try {
+                Secure.getLong(cr, STRING_VALUE_SETTING);
+                fail("SettingNotFoundException should have been thrown!");
+            } catch (SettingNotFoundException expected) {
+            }
+        }
+    }
+
+    private boolean isLong(String str) {
         try {
-            Secure.getLong(cr, STRING_VALUE_SETTING);
-            fail("SettingNotFoundException should have been thrown!");
-        } catch (SettingNotFoundException expected) {
+            Long.parseLong(str);
+            return true;
+        } catch (NumberFormatException e) {
+            return false;
         }
     }
 
diff --git a/tests/tests/provider/src/android/provider/cts/settings/Settings_SystemTest.java b/tests/tests/provider/src/android/provider/cts/settings/Settings_SystemTest.java
index 2fc25b8..2f5155a 100644
--- a/tests/tests/provider/src/android/provider/cts/settings/Settings_SystemTest.java
+++ b/tests/tests/provider/src/android/provider/cts/settings/Settings_SystemTest.java
@@ -147,29 +147,35 @@
     @AsbSecurityTest(cveBugId = 156260178)
     public void testSystemSettingsRejectInvalidFontSizeScale() throws SettingNotFoundException {
         final ContentResolver cr = InstrumentationRegistry.getTargetContext().getContentResolver();
-        // First put in a valid value
-        assertTrue(System.putFloat(cr, FLOAT_FIELD, 1.15f));
+        final String originalFloatValue = System.getString(cr, FLOAT_FIELD);
         try {
-            assertFalse(System.putFloat(cr, FLOAT_FIELD, Float.MAX_VALUE));
-            fail("Should throw");
-        } catch (IllegalArgumentException e) {
+            // First put in a valid value
+            assertTrue(System.putFloat(cr, FLOAT_FIELD, 1.15f));
+            assertEquals(1.15f, System.getFloat(cr, FLOAT_FIELD), 0.001);
+            try {
+                assertFalse(System.putFloat(cr, FLOAT_FIELD, Float.MAX_VALUE));
+                fail("Should throw");
+            } catch (IllegalArgumentException e) {
+            }
+            try {
+                assertFalse(System.putFloat(cr, FLOAT_FIELD, -1f));
+                fail("Should throw");
+            } catch (IllegalArgumentException e) {
+            }
+            try {
+                assertFalse(System.putFloat(cr, FLOAT_FIELD, 0.1f));
+                fail("Should throw");
+            } catch (IllegalArgumentException e) {
+            }
+            try {
+                assertFalse(System.putFloat(cr, FLOAT_FIELD, 30.0f));
+                fail("Should throw");
+            } catch (IllegalArgumentException e) {
+            }
+            assertEquals(1.15f, System.getFloat(cr, FLOAT_FIELD), 0.001);
+        } finally {
+            assertTrue(System.putString(cr, FLOAT_FIELD, originalFloatValue));
         }
-        try {
-            assertFalse(System.putFloat(cr, FLOAT_FIELD, -1f));
-            fail("Should throw");
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-            assertFalse(System.putFloat(cr, FLOAT_FIELD, 0.1f));
-            fail("Should throw");
-        } catch (IllegalArgumentException e) {
-        }
-        try {
-            assertFalse(System.putFloat(cr, FLOAT_FIELD, 30.0f));
-            fail("Should throw");
-        } catch (IllegalArgumentException e) {
-        }
-        assertEquals(1.15f, System.getFloat(cr, FLOAT_FIELD), 0.001);
     }
 
     @Test
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/ImageProcessingTest.java b/tests/tests/renderscript/src/android/renderscript/cts/ImageProcessingTest.java
index c069760..9ee194e 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/ImageProcessingTest.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/ImageProcessingTest.java
@@ -119,9 +119,8 @@
         byte[] srcData = new byte[w * h * 4];
         byte[] dstData = new byte[w * h * 4];
         byte[] resultData = new byte[w * h * 4];
-        Script.LaunchOptions opt = new Script.LaunchOptions();
-        // unclipped but with options
-        for (int i = 0; i < 28; i++) {
+
+        for (int i = 0; i < 14; i++) {
             buildSrc(srcData, w, h);
             buildDst(dstData, w, h);
             src.copyFromUnchecked(srcData);
@@ -170,51 +169,71 @@
                 case 13:
                     mBlend.forEachMultiply(src, dst);
                     break;
-                case 14:
+            }
+            dst.copyTo(resultData);
+            String name = javaBlend(i, srcData, dstData, 0, w, 0, h, w);
+            assertTrue(name, similar(resultData,dstData));
+            Log.v("BlendUnit", name + " " + similar(resultData, dstData));
+        }
+
+        // Do the same but passing LaunchOptions
+        int xStart = 10;
+        int xEnd = 20;
+        int yStart = 3;
+        int yEnd = 6;
+        Script.LaunchOptions opt = new Script.LaunchOptions();
+        opt.setX(xStart, xEnd).setY(yStart, yEnd);
+        for (int i = 0; i < 14; i++) {
+            buildSrc(srcData, w, h);
+            buildDst(dstData, w, h);
+            src.copyFromUnchecked(srcData);
+            dst.copyFromUnchecked(dstData);
+            switch (i) {
+                case 0:
                     mBlend.forEachSrc(src, dst, opt);
                     break;
-                case 15:
+                case 1:
                     mBlend.forEachDst(src, dst, opt);
                     break;
-                case 16:
+                case 2:
                     mBlend.forEachSrcOver(src, dst, opt);
                     break;
-                case 17:
+                case 3:
                     mBlend.forEachDstOver(src, dst, opt);
                     break;
-                case 18:
+                case 4:
                     mBlend.forEachSrcIn(src, dst, opt);
                     break;
-                case 19:
+                case 5:
                     mBlend.forEachDstIn(src, dst, opt);
                     break;
-                case 20:
+                case 6:
                     mBlend.forEachSrcOut(src, dst, opt);
                     break;
-                case 21:
+                case 7:
                     mBlend.forEachDstOut(src, dst, opt);
                     break;
-                case 22:
+                case 8:
                     mBlend.forEachSrcAtop(src, dst, opt);
                     break;
-                case 23:
+                case 9:
                     mBlend.forEachDstAtop(src, dst, opt);
                     break;
-                case 24:
+                case 10:
                     mBlend.forEachXor(src, dst, opt);
                     break;
-                case 25:
+                case 11:
                     mBlend.forEachAdd(src, dst, opt);
                     break;
-                case 26:
+                case 12:
                     mBlend.forEachSubtract(src, dst, opt);
                     break;
-                case 27:
+                case 13:
                     mBlend.forEachMultiply(src, dst, opt);
                     break;
             }
             dst.copyTo(resultData);
-            String name = javaBlend(i%14, srcData, dstData);
+            String name = javaBlend(i, srcData, dstData, xStart, xEnd, yStart, yEnd, w);
             assertTrue(name, similar(resultData,dstData));
             Log.v("BlendUnit", name + " " + similar(resultData, dstData));
 
@@ -260,6 +279,18 @@
             srcData[i * 4 + 2] = (byte) 0; // blue
             srcData[i * 4 + 3] = (byte) y; // alpha
         }
+        // Manually set a few known problematic values.
+        // These created problems for SRC_OVER, SRC_ATOP
+        srcData[0] = 230 - 256;
+        srcData[1] = 200 - 256;
+        srcData[2] = 210 - 256;
+        srcData[3] = 7;
+
+        // These created problems for DST_OVER, DST_ATOP,
+        srcData[4] = 230 - 255;
+        srcData[5] = 200 - 256;
+        srcData[6] = 210 - 256;
+        srcData[7] = 245 - 256;
     }
 
     // Build a test pattern to be the destination pattern designed to provide a wide range of values
@@ -273,18 +304,29 @@
             dstData[i * 4 + 2] = (byte) y; // blue
             dstData[i * 4 + 3] = (byte) x; // alpha
         }
+        // Manually set a few known problematic values
+        dstData[0] = 170 - 256;
+        dstData[1] = 180 - 256;
+        dstData[2] = 230 - 256;
+        dstData[3] = 245 - 256;
 
+        dstData[4] = 170 - 256;
+        dstData[5] = 180 - 256;
+        dstData[6] = 230 - 256;
+        dstData[7] = 9;
     }
 
-    public String javaBlend(int type, byte[] src, byte[] dst) {
-
-        for (int i = 0; i < dst.length; i += 4) {
-            byte[] rgba = func[type].filter(src[i], src[i + 1], src[i + 2], src[i + 3],
-                    dst[i], dst[i + 1], dst[i + 2], dst[i + 3]);
-            dst[i] = rgba[0];
-            dst[i + 1] = rgba[1];
-            dst[i + 2] = rgba[2];
-            dst[i + 3] = rgba[3];
+    public String javaBlend(int type, byte[] src, byte[] dst, int xStart, int xEnd, int yStart, int yEnd, int width) {
+        for (int y = yStart; y < yEnd; y++) {
+            for (int x = xStart; x < xEnd; x++) {
+                int i = (y * width + x) * 4;
+                byte[] rgba = func[type].filter(src[i], src[i + 1], src[i + 2], src[i + 3],
+                        dst[i], dst[i + 1], dst[i + 2], dst[i + 3]);
+                dst[i] = rgba[0];
+                dst[i + 1] = rgba[1];
+                dst[i + 2] = rgba[2];
+                dst[i + 3] = rgba[3];
+            }
         }
         return func[type].name;
     }
diff --git a/tests/tests/renderscript/src/android/renderscript/cts/IntrinsicResize.java b/tests/tests/renderscript/src/android/renderscript/cts/IntrinsicResize.java
index e542f37..6639757 100644
--- a/tests/tests/renderscript/src/android/renderscript/cts/IntrinsicResize.java
+++ b/tests/tests/renderscript/src/android/renderscript/cts/IntrinsicResize.java
@@ -24,7 +24,7 @@
     static final int inX = 307;
     static final int inY = 157;
 
-    private void testResize(int w, int h, Element.DataType dt, int vecSize, float scaleX, float scaleY) {
+  private void testResize(int w, int h, Element.DataType dt, int vecSize, float scaleX, float scaleY, boolean useOpt) {
 
         Element e = makeElement(dt, vecSize);
 
@@ -42,9 +42,14 @@
         mAllocRef = makeAllocation(outW, outH, e);
         mAllocDst = makeAllocation(outW, outH, e);
 
+        Script.LaunchOptions options = makeClipper(10, 8, 40, 46);
         ScriptIntrinsicResize si = ScriptIntrinsicResize.create(mRS);
         si.setInput(mAllocSrc);
-        si.forEach_bicubic(mAllocRef);
+        if (useOpt) {
+          si.forEach_bicubic(mAllocRef, options);
+        } else {
+          si.forEach_bicubic(mAllocRef);
+        }
 
         ScriptC_intrinsic_resize sr = new ScriptC_intrinsic_resize(mRS);
         sr.set_scaleX((float)w/outW);
@@ -52,44 +57,77 @@
         sr.set_gIn(mAllocSrc);
         sr.set_gWidthIn(w);
         sr.set_gHeightIn(h);
-        if (dt == Element.DataType.UNSIGNED_8) {
+        if (useOpt) {
+          if (dt == Element.DataType.UNSIGNED_8) {
             switch(vecSize) {
-            case 4:
+              case 4:
+                sr.forEach_bicubic_U4(mAllocDst, options);
+                break;
+              case 3:
+                sr.forEach_bicubic_U3(mAllocDst, options);
+                break;
+              case 2:
+                sr.forEach_bicubic_U2(mAllocDst, options);
+                break;
+              case 1:
+                sr.forEach_bicubic_U1(mAllocDst, options);
+                break;
+            }
+          } else {
+            switch(vecSize) {
+              case 4:
+                sr.forEach_bicubic_F4(mAllocDst, options);
+                break;
+              case 3:
+                sr.forEach_bicubic_F3(mAllocDst, options);
+                break;
+              case 2:
+                sr.forEach_bicubic_F2(mAllocDst, options);
+                break;
+              case 1:
+                sr.forEach_bicubic_F1(mAllocDst, options);
+                break;
+            }
+          }
+        } else {
+          if (dt == Element.DataType.UNSIGNED_8) {
+            switch(vecSize) {
+              case 4:
                 sr.forEach_bicubic_U4(mAllocDst);
                 break;
-            case 3:
+              case 3:
                 sr.forEach_bicubic_U3(mAllocDst);
                 break;
-            case 2:
+              case 2:
                 sr.forEach_bicubic_U2(mAllocDst);
                 break;
-            case 1:
+              case 1:
                 sr.forEach_bicubic_U1(mAllocDst);
                 break;
             }
-        } else {
+          } else {
             switch(vecSize) {
-            case 4:
+              case 4:
                 sr.forEach_bicubic_F4(mAllocDst);
                 break;
-            case 3:
+              case 3:
                 sr.forEach_bicubic_F3(mAllocDst);
                 break;
-            case 2:
+              case 2:
                 sr.forEach_bicubic_F2(mAllocDst);
                 break;
-            case 1:
+              case 1:
                 sr.forEach_bicubic_F1(mAllocDst);
                 break;
             }
+          }
         }
 
-
         mVerify.set_gAllowedIntError(1);
         mVerify.invoke_verify(mAllocRef, mAllocDst, mAllocSrc);
-        if (outW == w && outH == h) {
+        //when scale = 1 and we're copyin the entire input, check with the original.
+        if (outW == w && outH == h && !useOpt) {
             mVerify.set_gAllowedIntError(0);
-            //when scale = 1, check with the original.
             mVerify.invoke_verify(mAllocRef, mAllocSrc, mAllocSrc);
             mVerify.invoke_verify(mAllocDst, mAllocSrc, mAllocSrc);
         }
@@ -101,343 +139,684 @@
 
 
     public void test_U8_4_SCALE10_10_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 1.f, 1.f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 1.f, 1.f, false);
         checkError();
     }
     public void test_U8_3_SCALE10_10_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 1.f, 1.f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 1.f, 1.f, false);
         checkError();
     }
     public void test_U8_2_SCALE10_10_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 1.f, 1.f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 1.f, 1.f, false);
         checkError();
     }
     public void test_U8_1_SCALE10_10_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 1.f, 1.f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 1.f, 1.f, false);
         checkError();
     }
 
     public void test_U8_4_SCALE20_20_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 2.f, 2.f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 2.f, 2.f, false);
         checkError();
     }
     public void test_U8_3_SCALE20_20_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 2.f, 2.f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 2.f, 2.f, false);
         checkError();
     }
     public void test_U8_2_SCALE20_20_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 2.f, 2.f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 2.f, 2.f, false);
         checkError();
     }
     public void test_U8_1_SCALE20_20_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 2.f, 2.f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 2.f, 2.f, false);
         checkError();
     }
 
     public void test_U8_4_SCALE05_20_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 0.5f, 2.f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 0.5f, 2.f, false);
         checkError();
     }
     public void test_U8_3_SCALE05_20_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 0.5f, 2.f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 0.5f, 2.f, false);
         checkError();
     }
     public void test_U8_2_SCALE05_20_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 0.5f, 2.f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 0.5f, 2.f, false);
         checkError();
     }
     public void test_U8_1_SCALE05_20_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 0.5f, 2.f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 0.5f, 2.f, false);
         checkError();
     }
 
     public void test_U8_4_SCALE20_05_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 2.f, 0.5f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 2.f, 0.5f, false);
         checkError();
     }
     public void test_U8_3_SCALE20_05_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 2.f, 0.5f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 2.f, 0.5f, false);
         checkError();
     }
     public void test_U8_2_SCALE20_05_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 2.f, 0.5f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 2.f, 0.5f, false);
         checkError();
     }
     public void test_U8_1_SCALE20_05_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 2.f, 0.5f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 2.f, 0.5f, false);
         checkError();
     }
 
     public void test_U8_4_SCALE05_05_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 0.5f, 0.5f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 0.5f, 0.5f, false);
         checkError();
     }
     public void test_U8_3_SCALE05_05_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 0.5f, 0.5f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 0.5f, 0.5f, false);
         checkError();
     }
     public void test_U8_2_SCALE05_05_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 0.5f, 0.5f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 0.5f, 0.5f, false);
         checkError();
     }
     public void test_U8_1_SCALE05_05_inSquare() {
-        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 0.5f, 0.5f);
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 0.5f, 0.5f, false);
         checkError();
     }
 
     public void test_U8_4_SCALE10_10_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 1.f, 1.f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 1.f, 1.f, false);
         checkError();
     }
     public void test_U8_3_SCALE10_10_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 1.f, 1.f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 1.f, 1.f, false);
         checkError();
     }
     public void test_U8_2_SCALE10_10_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 1.f, 1.f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 1.f, 1.f, false);
         checkError();
     }
     public void test_U8_1_SCALE10_10_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 1.f, 1.f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 1.f, 1.f, false);
         checkError();
     }
 
     public void test_U8_4_SCALE20_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 2.f, 2.f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 2.f, 2.f, false);
         checkError();
     }
     public void test_U8_3_SCALE20_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 2.f, 2.f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 2.f, 2.f, false);
         checkError();
     }
     public void test_U8_2_SCALE20_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 2.f, 2.f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 2.f, 2.f, false);
         checkError();
     }
     public void test_U8_1_SCALE20_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 2.f, 2.f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 2.f, 2.f, false);
         checkError();
     }
 
     public void test_U8_4_SCALE05_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 0.5f, 2.f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 0.5f, 2.f, false);
         checkError();
     }
     public void test_U8_3_SCALE05_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 0.5f, 2.f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 0.5f, 2.f, false);
         checkError();
     }
     public void test_U8_2_SCALE05_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 0.5f, 2.f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 0.5f, 2.f, false);
         checkError();
     }
     public void test_U8_1_SCALE05_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 0.5f, 2.f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 0.5f, 2.f, false);
         checkError();
     }
 
     public void test_U8_4_SCALE20_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 2.f, 0.5f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 2.f, 0.5f, false);
         checkError();
     }
     public void test_U8_3_SCALE20_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 2.f, 0.5f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 2.f, 0.5f, false);
         checkError();
     }
     public void test_U8_2_SCALE20_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 2.f, 0.5f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 2.f, 0.5f, false);
         checkError();
     }
     public void test_U8_1_SCALE20_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 2.f, 0.5f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 2.f, 0.5f, false);
         checkError();
     }
 
     public void test_U8_4_SCALE05_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 0.5f, 0.5f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 0.5f, 0.5f, false);
         checkError();
     }
     public void test_U8_3_SCALE05_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 0.5f, 0.5f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 0.5f, 0.5f, false);
         checkError();
     }
     public void test_U8_2_SCALE05_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 0.5f, 0.5f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 0.5f, 0.5f, false);
         checkError();
     }
     public void test_U8_1_SCALE05_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 0.5f, 0.5f);
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 0.5f, 0.5f, false);
         checkError();
     }
 
 
     public void test_F32_4_SCALE10_10_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 1.f, 1.f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 1.f, 1.f, false);
         checkError();
     }
     public void test_F32_3_SCALE10_10_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 1.f, 1.f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 1.f, 1.f, false);
         checkError();
     }
     public void test_F32_2_SCALE10_10_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 1.f, 1.f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 1.f, 1.f, false);
         checkError();
     }
     public void test_F32_1_SCALE10_10_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 1.f, 1.f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 1.f, 1.f, false);
         checkError();
     }
 
     public void test_F32_4_SCALE20_20_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 2.f, 2.f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 2.f, 2.f, false);
         checkError();
     }
     public void test_F32_3_SCALE20_20_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 2.f, 2.f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 2.f, 2.f, false);
         checkError();
     }
     public void test_F32_2_SCALE20_20_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 2.f, 2.f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 2.f, 2.f, false);
         checkError();
     }
     public void test_F32_1_SCALE20_20_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 2.f, 2.f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 2.f, 2.f, false);
         checkError();
     }
 
     public void test_F32_4_SCALE05_20_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 0.5f, 2.f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 0.5f, 2.f, false);
         checkError();
     }
     public void test_F32_3_SCALE05_20_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 0.5f, 2.f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 0.5f, 2.f, false);
         checkError();
     }
     public void test_F32_2_SCALE05_20_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 0.5f, 2.f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 0.5f, 2.f, false);
         checkError();
     }
     public void test_F32_1_SCALE05_20_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 0.5f, 2.f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 0.5f, 2.f, false);
         checkError();
     }
 
     public void test_F32_4_SCALE20_05_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 2.f, 0.5f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 2.f, 0.5f, false);
         checkError();
     }
     public void test_F32_3_SCALE20_05_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 2.f, 0.5f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 2.f, 0.5f, false);
         checkError();
     }
     public void test_F32_2_SCALE20_05_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 2.f, 0.5f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 2.f, 0.5f, false);
         checkError();
     }
     public void test_F32_1_SCALE20_05_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 2.f, 0.5f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 2.f, 0.5f, false);
         checkError();
     }
 
     public void test_F32_4_SCALE05_05_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 0.5f, 0.5f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 0.5f, 0.5f, false);
         checkError();
     }
     public void test_F32_3_SCALE05_05_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 0.5f, 0.5f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 0.5f, 0.5f, false);
         checkError();
     }
     public void test_F32_2_SCALE05_05_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 0.5f, 0.5f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 0.5f, 0.5f, false);
         checkError();
     }
     public void test_F32_1_SCALE05_05_inSquare() {
-        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 0.5f, 0.5f);
+        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 0.5f, 0.5f, false);
         checkError();
     }
 
     public void test_F32_4_SCALE10_10_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 1.f, 1.f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 1.f, 1.f, false);
         checkError();
     }
     public void test_F32_3_SCALE10_10_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 1.f, 1.f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 1.f, 1.f, false);
         checkError();
     }
     public void test_F32_2_SCALE10_10_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 1.f, 1.f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 1.f, 1.f, false);
         checkError();
     }
     public void test_F32_1_SCALE10_10_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 1.f, 1.f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 1.f, 1.f, false);
         checkError();
     }
 
     public void test_F32_4_SCALE20_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 2.f, 2.f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 2.f, 2.f, false);
         checkError();
     }
     public void test_F32_3_SCALE20_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 2.f, 2.f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 2.f, 2.f, false);
         checkError();
     }
     public void test_F32_2_SCALE20_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 2.f, 2.f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 2.f, 2.f, false);
         checkError();
     }
     public void test_F32_1_SCALE20_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 2.f, 2.f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 2.f, 2.f, false);
         checkError();
     }
 
     public void test_F32_4_SCALE05_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 0.5f, 2.f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 0.5f, 2.f, false);
         checkError();
     }
     public void test_F32_3_SCALE05_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 0.5f, 2.f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 0.5f, 2.f, false);
         checkError();
     }
     public void test_F32_2_SCALE05_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 0.5f, 2.f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 0.5f, 2.f, false);
         checkError();
     }
     public void test_F32_1_SCALE05_20_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 0.5f, 2.f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 0.5f, 2.f, false);
         checkError();
     }
 
     public void test_F32_4_SCALE20_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 2.f, 0.5f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 2.f, 0.5f, false);
         checkError();
     }
     public void test_F32_3_SCALE20_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 2.f, 0.5f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 2.f, 0.5f, false);
         checkError();
     }
     public void test_F32_2_SCALE20_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 2.f, 0.5f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 2.f, 0.5f, false);
         checkError();
     }
     public void test_F32_1_SCALE20_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 2.f, 0.5f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 2.f, 0.5f, false);
         checkError();
     }
 
     public void test_F32_4_SCALE05_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 0.5f, 0.5f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 0.5f, 0.5f, false);
         checkError();
     }
     public void test_F32_3_SCALE05_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 0.5f, 0.5f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 0.5f, 0.5f, false);
         checkError();
     }
     public void test_F32_2_SCALE05_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 0.5f, 0.5f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 0.5f, 0.5f, false);
         checkError();
     }
     public void test_F32_1_SCALE05_05_inRectangle() {
-        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 0.5f, 0.5f);
+        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 0.5f, 0.5f, false);
+        checkError();
+    }
+
+    public void test_U8_4_SCALE10_10_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 1.f, 1.f, true);
+        checkError();
+    }
+    public void test_U8_3_SCALE10_10_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 1.f, 1.f, true);
+        checkError();
+    }
+    public void test_U8_2_SCALE10_10_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 1.f, 1.f, true);
+        checkError();
+    }
+    public void test_U8_1_SCALE10_10_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 1.f, 1.f, true);
+        checkError();
+    }
+
+    public void test_U8_4_SCALE20_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 2.f, 2.f, true);
+        checkError();
+    }
+    public void test_U8_3_SCALE20_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 2.f, 2.f, true);
+        checkError();
+    }
+    public void test_U8_2_SCALE20_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 2.f, 2.f, true);
+        checkError();
+    }
+    public void test_U8_1_SCALE20_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 2.f, 2.f, true);
+        checkError();
+    }
+
+    public void test_U8_4_SCALE05_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 0.5f, 2.f, true);
+        checkError();
+    }
+    public void test_U8_3_SCALE05_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 0.5f, 2.f, true);
+        checkError();
+    }
+    public void test_U8_2_SCALE05_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 0.5f, 2.f, true);
+        checkError();
+    }
+    public void test_U8_1_SCALE05_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 0.5f, 2.f, true);
+        checkError();
+    }
+
+    public void test_U8_4_SCALE20_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 2.f, 0.5f, true);
+        checkError();
+    }
+    public void test_U8_3_SCALE20_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 2.f, 0.5f, true);
+        checkError();
+    }
+    public void test_U8_2_SCALE20_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 2.f, 0.5f, true);
+        checkError();
+    }
+    public void test_U8_1_SCALE20_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 2.f, 0.5f, true);
+        checkError();
+    }
+
+    public void test_U8_4_SCALE05_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 4, 0.5f, 0.5f, true);
+        checkError();
+    }
+    public void test_U8_3_SCALE05_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 3, 0.5f, 0.5f, true);
+        checkError();
+    }
+    public void test_U8_2_SCALE05_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 2, 0.5f, 0.5f, true);
+        checkError();
+    }
+    public void test_U8_1_SCALE05_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.UNSIGNED_8, 1, 0.5f, 0.5f, true);
+        checkError();
+    }
+
+    public void test_U8_4_SCALE10_10_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 1.f, 1.f, true);
+        checkError();
+    }
+    public void test_U8_3_SCALE10_10_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 1.f, 1.f, true);
+        checkError();
+    }
+    public void test_U8_2_SCALE10_10_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 1.f, 1.f, true);
+        checkError();
+    }
+    public void test_U8_1_SCALE10_10_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 1.f, 1.f, true);
+        checkError();
+    }
+
+    public void test_U8_4_SCALE20_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 2.f, 2.f, true);
+        checkError();
+    }
+    public void test_U8_3_SCALE20_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 2.f, 2.f, true);
+        checkError();
+    }
+    public void test_U8_2_SCALE20_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 2.f, 2.f, true);
+        checkError();
+    }
+    public void test_U8_1_SCALE20_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 2.f, 2.f, true);
+        checkError();
+    }
+
+    public void test_U8_4_SCALE05_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 0.5f, 2.f, true);
+        checkError();
+    }
+    public void test_U8_3_SCALE05_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 0.5f, 2.f, true);
+        checkError();
+    }
+    public void test_U8_2_SCALE05_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 0.5f, 2.f, true);
+        checkError();
+    }
+    public void test_U8_1_SCALE05_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 0.5f, 2.f, true);
+        checkError();
+    }
+
+    public void test_U8_4_SCALE20_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 2.f, 0.5f, true);
+        checkError();
+    }
+    public void test_U8_3_SCALE20_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 2.f, 0.5f, true);
+        checkError();
+    }
+    public void test_U8_2_SCALE20_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 2.f, 0.5f, true);
+        checkError();
+    }
+    public void test_U8_1_SCALE20_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 2.f, 0.5f, true);
+        checkError();
+    }
+
+    public void test_U8_4_SCALE05_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 4, 0.5f, 0.5f, true);
+        checkError();
+    }
+    public void test_U8_3_SCALE05_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 3, 0.5f, 0.5f, true);
+        checkError();
+    }
+    public void test_U8_2_SCALE05_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 2, 0.5f, 0.5f, true);
+        checkError();
+    }
+    public void test_U8_1_SCALE05_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.UNSIGNED_8, 1, 0.5f, 0.5f, true);
+        checkError();
+    }
+
+
+    public void test_F32_4_SCALE10_10_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 1.f, 1.f, true);
+        checkError();
+    }
+    public void test_F32_3_SCALE10_10_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 1.f, 1.f, true);
+        checkError();
+    }
+    public void test_F32_2_SCALE10_10_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 1.f, 1.f, true);
+        checkError();
+    }
+    public void test_F32_1_SCALE10_10_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 1.f, 1.f, true);
+        checkError();
+    }
+
+    public void test_F32_4_SCALE20_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 2.f, 2.f, true);
+        checkError();
+    }
+    public void test_F32_3_SCALE20_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 2.f, 2.f, true);
+        checkError();
+    }
+    public void test_F32_2_SCALE20_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 2.f, 2.f, true);
+        checkError();
+    }
+    public void test_F32_1_SCALE20_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 2.f, 2.f, true);
+        checkError();
+    }
+
+    public void test_F32_4_SCALE05_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 0.5f, 2.f, true);
+        checkError();
+    }
+    public void test_F32_3_SCALE05_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 0.5f, 2.f, true);
+        checkError();
+    }
+    public void test_F32_2_SCALE05_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 0.5f, 2.f, true);
+        checkError();
+    }
+    public void test_F32_1_SCALE05_20_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 0.5f, 2.f, true);
+        checkError();
+    }
+
+    public void test_F32_4_SCALE20_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 2.f, 0.5f, true);
+        checkError();
+    }
+    public void test_F32_3_SCALE20_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 2.f, 0.5f, true);
+        checkError();
+    }
+    public void test_F32_2_SCALE20_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 2.f, 0.5f, true);
+        checkError();
+    }
+    public void test_F32_1_SCALE20_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 2.f, 0.5f, true);
+        checkError();
+    }
+
+    public void test_F32_4_SCALE05_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 4, 0.5f, 0.5f, true);
+        checkError();
+    }
+    public void test_F32_3_SCALE05_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 3, 0.5f, 0.5f, true);
+        checkError();
+    }
+    public void test_F32_2_SCALE05_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 2, 0.5f, 0.5f, true);
+        checkError();
+    }
+    public void test_F32_1_SCALE05_05_inSquare_opt() {
+        testResize(inX, inX, Element.DataType.FLOAT_32, 1, 0.5f, 0.5f, true);
+        checkError();
+    }
+
+    public void test_F32_4_SCALE10_10_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 1.f, 1.f, true);
+        checkError();
+    }
+    public void test_F32_3_SCALE10_10_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 1.f, 1.f, true);
+        checkError();
+    }
+    public void test_F32_2_SCALE10_10_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 1.f, 1.f, true);
+        checkError();
+    }
+    public void test_F32_1_SCALE10_10_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 1.f, 1.f, true);
+        checkError();
+    }
+
+    public void test_F32_4_SCALE20_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 2.f, 2.f, true);
+        checkError();
+    }
+    public void test_F32_3_SCALE20_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 2.f, 2.f, true);
+        checkError();
+    }
+    public void test_F32_2_SCALE20_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 2.f, 2.f, true);
+        checkError();
+    }
+    public void test_F32_1_SCALE20_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 2.f, 2.f, true);
+        checkError();
+    }
+
+    public void test_F32_4_SCALE05_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 0.5f, 2.f, true);
+        checkError();
+    }
+    public void test_F32_3_SCALE05_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 0.5f, 2.f, true);
+        checkError();
+    }
+    public void test_F32_2_SCALE05_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 0.5f, 2.f, true);
+        checkError();
+    }
+    public void test_F32_1_SCALE05_20_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 0.5f, 2.f, true);
+        checkError();
+    }
+
+    public void test_F32_4_SCALE20_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 2.f, 0.5f, true);
+        checkError();
+    }
+    public void test_F32_3_SCALE20_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 2.f, 0.5f, true);
+        checkError();
+    }
+    public void test_F32_2_SCALE20_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 2.f, 0.5f, true);
+        checkError();
+    }
+    public void test_F32_1_SCALE20_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 2.f, 0.5f, true);
+        checkError();
+    }
+
+    public void test_F32_4_SCALE05_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 4, 0.5f, 0.5f, true);
+        checkError();
+    }
+    public void test_F32_3_SCALE05_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 3, 0.5f, 0.5f, true);
+        checkError();
+    }
+    public void test_F32_2_SCALE05_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 2, 0.5f, 0.5f, true);
+        checkError();
+    }
+    public void test_F32_1_SCALE05_05_inRectangle_opt() {
+        testResize(inX, inY, Element.DataType.FLOAT_32, 1, 0.5f, 0.5f, true);
         checkError();
     }
 
diff --git a/tests/tests/resourcesloader/OWNERS b/tests/tests/resourcesloader/OWNERS
index 0bccde9..5174db8 100644
--- a/tests/tests/resourcesloader/OWNERS
+++ b/tests/tests/resourcesloader/OWNERS
@@ -1,5 +1,5 @@
 # Bug component: 568761
-rtmitchell@google.com
+zyy@google.com
 chiuwinson@google.com
 toddke@google.com
 patb@google.com
diff --git a/tests/tests/role/Android.bp b/tests/tests/role/Android.bp
index a638561..ae1fdfd 100644
--- a/tests/tests/role/Android.bp
+++ b/tests/tests/role/Android.bp
@@ -43,5 +43,6 @@
     data: [
         ":CtsRoleTestApp",
         ":CtsRoleTestApp28",
+        ":CtsRoleTestApp33WithoutInCallService",
     ],
 }
diff --git a/tests/tests/role/AndroidTest.xml b/tests/tests/role/AndroidTest.xml
index 4a8189f..1794e8b 100644
--- a/tests/tests/role/AndroidTest.xml
+++ b/tests/tests/role/AndroidTest.xml
@@ -20,6 +20,7 @@
 
     <option name="test-suite-tag" value="cts" />
     <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="all_foldable_states" />
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
@@ -38,6 +39,7 @@
         <option name="cleanup" value="true" />
         <option name="push" value="CtsRoleTestApp.apk->/data/local/tmp/cts/role/CtsRoleTestApp.apk" />
         <option name="push" value="CtsRoleTestApp28.apk->/data/local/tmp/cts/role/CtsRoleTestApp28.apk" />
+        <option name="push" value="CtsRoleTestApp33WithoutInCallService.apk->/data/local/tmp/cts/role/CtsRoleTestApp33WithoutInCallService.apk" />
     </target_preparer>
 
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
diff --git a/tests/tests/role/CtsRoleTestApp/AndroidManifest.xml b/tests/tests/role/CtsRoleTestApp/AndroidManifest.xml
index eb17122..b2dfca9 100644
--- a/tests/tests/role/CtsRoleTestApp/AndroidManifest.xml
+++ b/tests/tests/role/CtsRoleTestApp/AndroidManifest.xml
@@ -54,7 +54,20 @@
                 <data android:scheme="tel" />
             </intent-filter>
         </activity>
-
+        <service
+            android:name=".DialerInCallService"
+            android:permission="android.permission.BIND_INCALL_SERVICE"
+            android:exported="true">
+            <meta-data
+                android:name="android.telecom.IN_CALL_SERVICE_UI"
+                android:value="true"/>
+            <meta-data
+                android:name="android.telecom.IN_CALL_SERVICE_CAR_MODE_UI"
+                android:value="false"/>
+            <intent-filter>
+                <action android:name="android.telecom.InCallService" />
+            </intent-filter>
+        </service>
         <!-- Sms -->
         <activity
             android:name=".SmsSendToActivity"
diff --git a/tests/tests/role/CtsRoleTestApp33WithoutInCallService/Android.bp b/tests/tests/role/CtsRoleTestApp33WithoutInCallService/Android.bp
new file mode 100644
index 0000000..7cce565
--- /dev/null
+++ b/tests/tests/role/CtsRoleTestApp33WithoutInCallService/Android.bp
@@ -0,0 +1,23 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsRoleTestApp33WithoutInCallService",
+    min_sdk_version: "30",
+    target_sdk_version: "33",
+}
diff --git a/tests/tests/role/CtsRoleTestApp33WithoutInCallService/AndroidManifest.xml b/tests/tests/role/CtsRoleTestApp33WithoutInCallService/AndroidManifest.xml
new file mode 100644
index 0000000..a6504ad
--- /dev/null
+++ b/tests/tests/role/CtsRoleTestApp33WithoutInCallService/AndroidManifest.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.app.role.cts.app33WithoutInCallService">
+    <application android:label="CtsRoleTestApp33WithoutInCallService">
+        <!-- Dialer -->
+        <activity
+            android:name=".DialerDialActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.DIAL" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:scheme="tel" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>
diff --git a/tests/tests/role/src/android/app/role/cts/RoleManagerTest.java b/tests/tests/role/src/android/app/role/cts/RoleManagerTest.java
index 766a927..4cc198c 100644
--- a/tests/tests/role/src/android/app/role/cts/RoleManagerTest.java
+++ b/tests/tests/role/src/android/app/role/cts/RoleManagerTest.java
@@ -111,6 +111,11 @@
     private static final String APP_28_CHANGE_DEFAULT_SMS_ACTIVITY_NAME = APP_28_PACKAGE_NAME
             + ".ChangeDefaultSmsActivity";
 
+    private static final String APP_33_WITHOUT_INCALLSERVICE_APK_PATH =
+            "/data/local/tmp/cts/role/CtsRoleTestApp33WithoutInCallService.apk";
+    private static final String APP_33_WITHOUT_INCALLSERVICE_PACKAGE_NAME =
+            "android.app.role.cts.app33WithoutInCallService";
+
     private static final String PERMISSION_MANAGE_ROLES_FROM_CONTROLLER =
             "com.android.permissioncontroller.permission.MANAGE_ROLES_FROM_CONTROLLER";
 
@@ -158,12 +163,14 @@
     public void installApp() throws Exception {
         installPackage(APP_APK_PATH);
         installPackage(APP_28_APK_PATH);
+        installPackage(APP_33_WITHOUT_INCALLSERVICE_APK_PATH);
     }
 
     @After
     public void uninstallApp() throws Exception {
         uninstallPackage(APP_PACKAGE_NAME);
         uninstallPackage(APP_28_PACKAGE_NAME);
+        uninstallPackage(APP_33_WITHOUT_INCALLSERVICE_PACKAGE_NAME);
     }
 
     @Before
@@ -537,6 +544,28 @@
     }
 
     @Test
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testHoldDialerRoleRequirementWithInCallServiceAndSdk()
+            throws Exception {
+        assumeTrue(sRoleManager.isRoleAvailable(RoleManager.ROLE_DIALER));
+        // target below sdk 33 without InCallService component can hold dialer role
+        addRoleHolder(
+                RoleManager.ROLE_DIALER, APP_28_PACKAGE_NAME, true);
+        assertIsRoleHolder(
+                RoleManager.ROLE_DIALER, APP_28_PACKAGE_NAME, true);
+        // target sdk 33 without InCallService component cannot hold dialer role
+        addRoleHolder(
+                RoleManager.ROLE_DIALER, APP_33_WITHOUT_INCALLSERVICE_PACKAGE_NAME, false);
+        assertIsRoleHolder(
+                RoleManager.ROLE_DIALER, APP_33_WITHOUT_INCALLSERVICE_PACKAGE_NAME, false);
+        // target sdk 33 with InCallService component can hold dialer role
+        addRoleHolder(
+                RoleManager.ROLE_DIALER, APP_PACKAGE_NAME, true);
+        assertIsRoleHolder(
+                RoleManager.ROLE_DIALER, APP_PACKAGE_NAME, true);
+    }
+
+    @Test
     public void
     targetSdk28AndChangeDefaultSmsForAnotherAppAsHolderAndAllowThenTheOtherAppIsDefaultSms()
             throws Exception {
diff --git a/tests/tests/role/src/android/app/role/cts/RoleShellCommandTest.kt b/tests/tests/role/src/android/app/role/cts/RoleShellCommandTest.kt
index 1a535c0..6ff4f10 100644
--- a/tests/tests/role/src/android/app/role/cts/RoleShellCommandTest.kt
+++ b/tests/tests/role/src/android/app/role/cts/RoleShellCommandTest.kt
@@ -43,6 +43,7 @@
     private val userId = UserHandle.myUserId()
 
     private var roleHolder: String? = null
+    private var wasBypassingRoleQualification: Boolean = false
 
     @Before
     fun saveRoleHolder() {
@@ -53,6 +54,11 @@
         }
     }
 
+    @Before
+    fun saveBypassingRoleQualification() {
+        wasBypassingRoleQualification = isBypassingRoleQualification()
+    }
+
     @After
     fun restoreRoleHolder() {
         removeRoleHolder()
@@ -60,6 +66,11 @@
         assertIsRoleHolder(false)
     }
 
+    @After
+    fun restoreBypassingRoleQualification() {
+        setBypassingRoleQualification(wasBypassingRoleQualification)
+    }
+
     @Before
     fun installApp() {
         installPackage(APP_APK_PATH)
@@ -117,6 +128,24 @@
         assertThat(runShellCommandOrThrow("dumpsys role")).contains(APP_PACKAGE_NAME)
     }
 
+    @Test
+    fun setBypassingRoleQualificationToTrueThenSetsToTrue() {
+        setBypassingRoleQualification(false)
+
+        runShellCommandOrThrow("cmd role set-bypassing-role-qualification true")
+
+        assertThat(isBypassingRoleQualification()).isTrue()
+    }
+
+    @Test
+    fun setBypassingRoleQualificationToFalseThenSetsToFalse() {
+        setBypassingRoleQualification(true)
+
+        runShellCommandOrThrow("cmd role set-bypassing-role-qualification false")
+
+        assertThat(isBypassingRoleQualification()).isFalse()
+    }
+
     private fun addRoleHolder(packageName: String = APP_PACKAGE_NAME) {
         runShellCommandOrThrow("cmd role add-role-holder --user $userId $ROLE_NAME $packageName")
     }
@@ -151,6 +180,15 @@
             .isEqualTo("Success")
     }
 
+    private fun isBypassingRoleQualification(): Boolean =
+        callWithShellPermissionIdentity { roleManager.isBypassingRoleQualification() }
+
+    private fun setBypassingRoleQualification(value: Boolean) {
+        callWithShellPermissionIdentity {
+            roleManager.setBypassingRoleQualification(value)
+        }
+    }
+
     companion object {
         private const val ROLE_NAME = RoleManager.ROLE_BROWSER
         private const val APP_APK_PATH = "/data/local/tmp/cts/role/CtsRoleTestApp.apk"
diff --git a/tests/tests/security/assets/exploit.zip b/tests/tests/security/assets/exploit.zip
new file mode 100644
index 0000000..05cc03f
--- /dev/null
+++ b/tests/tests/security/assets/exploit.zip
Binary files differ
diff --git a/tests/tests/security/src/android/security/cts/BluetoothIntentsTest.java b/tests/tests/security/src/android/security/cts/BluetoothIntentsTest.java
index a15ab42..6c7870d9 100644
--- a/tests/tests/security/src/android/security/cts/BluetoothIntentsTest.java
+++ b/tests/tests/security/src/android/security/cts/BluetoothIntentsTest.java
@@ -50,7 +50,7 @@
     try {
       Intent should_be_protected_broadcast = new Intent();
       should_be_protected_broadcast.setComponent(
-          new ComponentName("com.android.bluetooth",
+          new ComponentName("com.android.bluetooth.services",
             "com.android.bluetooth.opp.BluetoothOppReceiver"));
       should_be_protected_broadcast.setAction(prefix + action);
       getInstrumentation().getContext().sendBroadcast(should_be_protected_broadcast);
diff --git a/tests/tests/security/src/android/security/cts/FlagSlipperyTest.kt b/tests/tests/security/src/android/security/cts/FlagSlipperyTest.kt
index 0ceee07..6b02fec 100644
--- a/tests/tests/security/src/android/security/cts/FlagSlipperyTest.kt
+++ b/tests/tests/security/src/android/security/cts/FlagSlipperyTest.kt
@@ -29,6 +29,7 @@
 import android.view.WindowManager
 import android.view.WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY
 import android.view.WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+import android.view.WindowManager.LayoutParams.FLAG_SLIPPERY
 import androidx.test.core.app.ActivityScenario
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -49,8 +50,6 @@
 import java.util.concurrent.LinkedBlockingQueue
 import java.util.Queue
 
-val FLAG_SLIPPERY = 0x20000000 // android.view.WindowManager.LayoutParams.FLAG_SLIPPERY
-
 private fun getViewCenterOnScreen(v: View): Pair<Float, Float> {
     val location = IntArray(2)
     v.getLocationOnScreen(location)
diff --git a/tests/tests/security/src/android/security/cts/MotionEventTest.java b/tests/tests/security/src/android/security/cts/MotionEventTest.java
index c291ee4..dcdfc9b 100644
--- a/tests/tests/security/src/android/security/cts/MotionEventTest.java
+++ b/tests/tests/security/src/android/security/cts/MotionEventTest.java
@@ -39,8 +39,8 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
-import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -70,7 +70,7 @@
     public void setup() {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
     }
 
     /**
diff --git a/tests/tests/security/src/android/security/cts/WallpaperManagerTest.java b/tests/tests/security/src/android/security/cts/WallpaperManagerTest.java
new file mode 100644
index 0000000..d277a43
--- /dev/null
+++ b/tests/tests/security/src/android/security/cts/WallpaperManagerTest.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright (C) 2021 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 android.security.cts;
+
+import static android.view.Display.DEFAULT_DISPLAY;
+import static android.view.WindowManager.LayoutParams.TYPE_APPLICATION;
+
+import android.Manifest;
+import android.app.WallpaperManager;
+import android.content.Context;
+import android.content.res.AssetManager;
+import android.graphics.Rect;
+import android.hardware.display.DisplayManager;
+import android.net.Uri;
+import android.platform.test.annotations.AsbSecurityTest;
+import android.platform.test.annotations.RequiresDevice;
+import android.util.Log;
+import android.view.Display;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+import com.android.sts.common.util.StsExtraBusinessLogicTestCase;
+
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+@RunWith(AndroidJUnit4.class)
+public class WallpaperManagerTest extends StsExtraBusinessLogicTestCase {
+    private static final String TAG = "WallpaperManagerSTS";
+    private static final long PNG_SIZE = 7503368920L;
+
+    private Context mContext;
+    private WallpaperManager mWallpaperManager;
+
+    @Before
+    public void setUp() {
+        InstrumentationRegistry
+                .getInstrumentation()
+                .getUiAutomation()
+                .adoptShellPermissionIdentity(Manifest.permission.SET_WALLPAPER_HINTS,
+                        Manifest.permission.SET_WALLPAPER);
+        mContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        mWallpaperManager = WallpaperManager.getInstance(mContext);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        mWallpaperManager.clear(WallpaperManager.FLAG_SYSTEM | WallpaperManager.FLAG_LOCK);
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .dropShellPermissionIdentity();
+    }
+
+    // b/204316511
+    @Test
+    @AsbSecurityTest(cveBugId = 204316511)
+    public void testSetDisplayPadding() {
+        Rect validRect = new Rect(1, 1, 1, 1);
+        // This should work, no exception expected
+        mWallpaperManager.setDisplayPadding(validRect);
+
+        Rect negativeRect = new Rect(-1, 0 , 0, 0);
+        try {
+            mWallpaperManager.setDisplayPadding(negativeRect);
+            Assert.fail("setDisplayPadding should fail for a Rect with negative values");
+        } catch (IllegalArgumentException e) {
+            //Expected exception
+        }
+
+        DisplayManager dm = mContext.getSystemService(DisplayManager.class);
+        Display primaryDisplay = dm.getDisplay(DEFAULT_DISPLAY);
+        Context windowContext = mContext.createWindowContext(primaryDisplay,
+                TYPE_APPLICATION, null);
+        Display display = windowContext.getDisplay();
+
+        Rect tooWideRect = new Rect(0, 0, display.getMaximumSizeDimension() + 1, 0);
+        try {
+            mWallpaperManager.setDisplayPadding(tooWideRect);
+            Assert.fail("setDisplayPadding should fail for a Rect width larger than "
+                    + display.getMaximumSizeDimension());
+        } catch (IllegalArgumentException e) {
+            //Expected exception
+        }
+
+        Rect tooHighRect = new Rect(0, 0, 0, display.getMaximumSizeDimension() + 1);
+        try {
+            mWallpaperManager.setDisplayPadding(tooHighRect);
+            Assert.fail("setDisplayPadding should fail for a Rect height larger than "
+                    + display.getMaximumSizeDimension());
+        } catch (IllegalArgumentException e) {
+            //Expected exception
+        }
+    }
+
+    @RequiresDevice
+    @Test
+    @AsbSecurityTest(cveBugId = 204087139)
+    public void testSetMaliciousStream() {
+        unZipMaliciousImageFile();
+        final File testImage = unZipMaliciousImageFile();
+        Assert.assertTrue(testImage.exists());
+        try (InputStream s = mContext.getContentResolver()
+                .openInputStream(Uri.fromFile(testImage))) {
+            final int oldWallpaperId = mWallpaperManager.getWallpaperId(
+                    WallpaperManager.FLAG_SYSTEM);
+            final int newWallpaperId = mWallpaperManager.setStream(
+                    s, null, true,
+                    WallpaperManager.FLAG_SYSTEM | WallpaperManager.FLAG_LOCK);
+            Assert.assertNotEquals(oldWallpaperId, newWallpaperId);
+        } catch (IOException ex) {
+        } finally {
+            if (testImage.exists()) {
+                testImage.delete();
+            }
+        }
+    }
+
+    private File unZipMaliciousImageFile() {
+        File png = new File(mContext.getExternalFilesDir(null) + "/exploit.png");
+        if (!png.exists() || png.length() < PNG_SIZE) {
+            AssetManager am = mContext.getAssets();
+            try {
+                InputStream is = am.open("exploit.zip");
+                try (ZipInputStream zis = new ZipInputStream(
+                        new BufferedInputStream(is))) {
+                    ZipEntry ze;
+                    int count;
+                    byte[] buffer = new byte[8192];
+                    while ((ze = zis.getNextEntry()) != null) {
+                        File file = new File(mContext.getExternalFilesDir(
+                                null), ze.getName());
+                        if (ze.isDirectory()) {
+                            continue;
+                        }
+                        try (FileOutputStream fout = new FileOutputStream(file)) {
+                            while ((count = zis.read(buffer)) != -1) {
+                                fout.write(buffer, 0, count);
+                            }
+                        }
+                    }
+                }
+            } catch (Exception e) {
+                Log.e(TAG, "UnZip error:", e);
+            }
+        }
+        return png;
+    }
+}
diff --git a/tests/tests/sensorprivacy/src/android/sensorprivacy/cts/SensorPrivacyBaseTest.kt b/tests/tests/sensorprivacy/src/android/sensorprivacy/cts/SensorPrivacyBaseTest.kt
index bd21f9f..e74efca 100644
--- a/tests/tests/sensorprivacy/src/android/sensorprivacy/cts/SensorPrivacyBaseTest.kt
+++ b/tests/tests/sensorprivacy/src/android/sensorprivacy/cts/SensorPrivacyBaseTest.kt
@@ -22,6 +22,9 @@
 import android.content.pm.PackageManager
 import android.hardware.SensorPrivacyManager
 import android.hardware.SensorPrivacyManager.OnSensorPrivacyChangedListener
+import android.hardware.SensorPrivacyManager.TOGGLE_TYPE_HARDWARE
+import android.hardware.SensorPrivacyManager.TOGGLE_TYPE_SOFTWARE
+import android.hardware.SensorPrivacyManager.OnSensorPrivacyChangedListener.SensorPrivacyChangedParams
 import android.hardware.SensorPrivacyManager.Sensors.CAMERA
 import android.hardware.SensorPrivacyManager.Sensors.MICROPHONE
 import android.hardware.SensorPrivacyManager.Sources.OTHER
@@ -40,6 +43,7 @@
 import org.junit.After
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Assert.assertTrue
 import org.junit.Assume
@@ -60,6 +64,8 @@
                 "android.sensorprivacy.cts.usemiccamera.action.USE_MIC_CAM"
         const val MIC_CAM_OVERLAY_ACTIVITY_ACTION =
                 "android.sensorprivacy.cts.usemiccamera.overlay.action.USE_MIC_CAM"
+        const val SHOW_OVERLAY_ACTION =
+                "android.sensorprivacy.cts.usemiccamera.action.SHOW_OVERLAY_ACTION"
         const val FINISH_MIC_CAM_ACTIVITY_ACTION =
                 "android.sensorprivacy.cts.usemiccamera.action.FINISH_USE_MIC_CAM"
         const val USE_MIC_EXTRA =
@@ -93,6 +99,7 @@
         oldState = isSensorPrivacyEnabled()
         setSensor(false)
         Assume.assumeTrue(spm.supportsSensorToggle(sensor))
+        Assume.assumeTrue(spm.supportsSensorToggle(TOGGLE_TYPE_SOFTWARE, sensor))
         uiDevice.wakeUp()
         runShellCommandOrThrow("wm dismiss-keyguard")
         uiDevice.waitForIdle()
@@ -115,6 +122,31 @@
     }
 
     @Test
+    fun testSensorPrivacy_softwareToggle() {
+        setSensor(true)
+        assertTrue(isToggleSensorPrivacyEnabled(TOGGLE_TYPE_SOFTWARE))
+
+        setSensor(false)
+        assertFalse(isToggleSensorPrivacyEnabled(TOGGLE_TYPE_SOFTWARE))
+    }
+
+    @Test
+    fun testSensorPrivacy_hardwareToggle() {
+        // Default value should be false weather HW toggles
+        // are supported or not
+        assertFalse(isToggleSensorPrivacyEnabled(TOGGLE_TYPE_HARDWARE))
+    }
+
+    @Test
+    fun testSensorPrivacy_comboToggle() {
+        setSensor(sensor, true)
+        assertTrue(isCombinedSensorPrivacyEnabled())
+
+        setSensor(sensor, false)
+        assertFalse(isCombinedSensorPrivacyEnabled())
+    }
+
+    @Test
     fun testDialog() {
         testDialog(delayedActivity = false, delayedActivityNewTask = false)
     }
@@ -190,6 +222,95 @@
     }
 
     @Test
+    fun testToggleListener() {
+        val executor = Executors.newSingleThreadExecutor()
+        setSensor(false)
+        val latchEnabled = CountDownLatch(1)
+        val listenerSensorEnabled = object : OnSensorPrivacyChangedListener {
+            override fun onSensorPrivacyChanged(params: SensorPrivacyChangedParams) {
+                if (params.isEnabled && params.sensor == sensor) {
+                    latchEnabled.countDown()
+                }
+            }
+
+            override fun onSensorPrivacyChanged(sensor: Int, enabled: Boolean) {
+            }
+        }
+        runWithShellPermissionIdentity {
+            spm.addSensorPrivacyListener(executor, listenerSensorEnabled)
+        }
+        setSensor(true)
+        latchEnabled.await(100, TimeUnit.MILLISECONDS)
+        runWithShellPermissionIdentity {
+            spm.removeSensorPrivacyListener(listenerSensorEnabled)
+        }
+
+        val latchDisabled = CountDownLatch(1)
+        val listenerSensorDisabled = object : OnSensorPrivacyChangedListener {
+            override fun onSensorPrivacyChanged(params: SensorPrivacyChangedParams) {
+                if (!params.isEnabled && params.sensor == sensor) {
+                    latchDisabled.countDown()
+                }
+            }
+
+            override fun onSensorPrivacyChanged(sensor: Int, enabled: Boolean) {
+            }
+        }
+        runWithShellPermissionIdentity {
+            spm.addSensorPrivacyListener(executor, listenerSensorDisabled)
+        }
+        setSensor(false)
+        latchEnabled.await(100, TimeUnit.MILLISECONDS)
+        runWithShellPermissionIdentity {
+            spm.removeSensorPrivacyListener(listenerSensorDisabled)
+        }
+    }
+
+    @Test
+    fun testToggleListener_defaultExecutor() {
+        setSensor(false)
+        val latchEnabled = CountDownLatch(1)
+        var listenerSensorEnabled = object : OnSensorPrivacyChangedListener {
+            override fun onSensorPrivacyChanged(params: SensorPrivacyChangedParams) {
+                if (params.isEnabled && params.sensor == sensor) {
+                    latchEnabled.countDown()
+                }
+            }
+
+            override fun onSensorPrivacyChanged(sensor: Int, enabled: Boolean) {
+            }
+        }
+        runWithShellPermissionIdentity {
+            spm.addSensorPrivacyListener(listenerSensorEnabled)
+        }
+        setSensor(true)
+        latchEnabled.await(100, TimeUnit.MILLISECONDS)
+        runWithShellPermissionIdentity {
+            spm.removeSensorPrivacyListener(listenerSensorEnabled)
+        }
+
+        val latchDisabled = CountDownLatch(1)
+        val listenerSensorDisabled = object : OnSensorPrivacyChangedListener {
+            override fun onSensorPrivacyChanged(params: SensorPrivacyChangedParams) {
+                if (!params.isEnabled && params.sensor == sensor) {
+                    latchDisabled.countDown()
+                }
+            }
+
+            override fun onSensorPrivacyChanged(sensor: Int, enabled: Boolean) {
+            }
+        }
+        runWithShellPermissionIdentity {
+            spm.addSensorPrivacyListener(listenerSensorDisabled)
+        }
+        setSensor(false)
+        latchEnabled.await(100, TimeUnit.MILLISECONDS)
+        runWithShellPermissionIdentity {
+            spm.removeSensorPrivacyListener(listenerSensorDisabled)
+        }
+    }
+
+    @Test
     @AppModeFull(reason = "Instant apps can't manage keyguard")
     fun testCantChangeWhenLocked() {
         Assume.assumeTrue(packageManager
@@ -213,17 +334,20 @@
     }
 
     fun unblockSensorWithDialogAndAssert() {
-        val buttonResId = if (packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
-            "com.android.systemui:id/bottom_sheet_positive_button"
-        } else {
-            "android:id/button1"
-        }
+        val buttonResId = getDialogPositiveButtonId()
         UiAutomatorUtils.waitFindObject(By.res(buttonResId)).click()
         eventually {
             assertFalse(isSensorPrivacyEnabled())
         }
     }
 
+    private fun getDialogPositiveButtonId() =
+            if (packageManager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
+                "com.android.systemui:id/bottom_sheet_positive_button"
+            } else {
+                "android:id/button1"
+            }
+
     @Test
     @AppModeFull(reason = "Uses secondary app, instant apps have no visibility")
     fun testOpNotRunningWhileSensorPrivacyEnabled() {
@@ -335,6 +459,8 @@
     fun testTapjacking() {
         setSensor(true)
         startTestOverlayApp(false)
+        assertNotNull("Dialog never showed",
+                UiAutomatorUtils.waitFindObject(By.res(getDialogPositiveButtonId())))
         val view = UiAutomatorUtils.waitFindObjectOrNull(By.text("This Should Be Hidden"), 10_000)
         assertNull("Overlay should not have shown.", view)
     }
@@ -367,6 +493,8 @@
         context.startActivity(intent)
         // Wait for app to open
         UiAutomatorUtils.waitFindObject(By.textContains(ACTIVITY_TITLE_SNIP))
+
+        context.sendBroadcast(Intent(SHOW_OVERLAY_ACTION))
     }
 
     private fun finishTestApp() {
@@ -383,12 +511,30 @@
         }
     }
 
+    protected fun setSensor(sensor: Int, enable: Boolean) {
+        runWithShellPermissionIdentity {
+            spm.setSensorPrivacy(sensor, enable)
+        }
+    }
+
     private fun isSensorPrivacyEnabled(): Boolean {
         return callWithShellPermissionIdentity {
             spm.isSensorPrivacyEnabled(sensor)
         }
     }
 
+    private fun isToggleSensorPrivacyEnabled(toggleType: Int): Boolean {
+        return callWithShellPermissionIdentity {
+            spm.isSensorPrivacyEnabled(toggleType, sensor)
+        }
+    }
+
+    private fun isCombinedSensorPrivacyEnabled(): Boolean {
+        return callWithShellPermissionIdentity {
+            spm.areAnySensorPrivacyTogglesEnabled(sensor)
+        }
+    }
+
     private fun getOpForSensor(sensor: Int): String? {
         return when (sensor) {
             CAMERA -> AppOpsManager.OPSTR_CAMERA
@@ -443,7 +589,7 @@
         val password = byteArrayOf(1, 2, 3, 4)
         try {
             runWithShellPermissionIdentity {
-                km!!.setLock(KeyguardManager.PIN, password, KeyguardManager.PIN, null)
+                km.setLock(KeyguardManager.PIN, password, KeyguardManager.PIN, null)
             }
             eventually {
                 uiDevice.pressKeyCode(KeyEvent.KEYCODE_SLEEP)
@@ -460,7 +606,7 @@
             r.invoke()
         } finally {
             runWithShellPermissionIdentity {
-                km!!.setLock(KeyguardManager.PIN, null, KeyguardManager.PIN, password)
+                km.setLock(KeyguardManager.PIN, null, KeyguardManager.PIN, password)
             }
 
             // Recycle the screen power in case the keyguard is stuck open
diff --git a/tests/tests/sensorprivacy/test-apps/CtsUseMicOrCameraAndOverlayForSensorPrivacy/src/android/sensorprivacy/cts/usemiccamera/overlay/UseMicCamera.kt b/tests/tests/sensorprivacy/test-apps/CtsUseMicOrCameraAndOverlayForSensorPrivacy/src/android/sensorprivacy/cts/usemiccamera/overlay/UseMicCamera.kt
index 127564e..f33f327 100644
--- a/tests/tests/sensorprivacy/test-apps/CtsUseMicOrCameraAndOverlayForSensorPrivacy/src/android/sensorprivacy/cts/usemiccamera/overlay/UseMicCamera.kt
+++ b/tests/tests/sensorprivacy/test-apps/CtsUseMicOrCameraAndOverlayForSensorPrivacy/src/android/sensorprivacy/cts/usemiccamera/overlay/UseMicCamera.kt
@@ -38,6 +38,8 @@
     companion object {
         const val MIC_CAM_OVERLAY_ACTIVITY_ACTION =
                 "android.sensorprivacy.cts.usemiccamera.overlay.action.USE_MIC_CAM"
+        const val SHOW_OVERLAY_ACTION =
+                "android.sensorprivacy.cts.usemiccamera.action.SHOW_OVERLAY_ACTION"
         const val FINISH_MIC_CAM_ACTIVITY_ACTION =
                 "android.sensorprivacy.cts.usemiccamera.action.FINISH_USE_MIC_CAM"
         const val USE_MIC_EXTRA =
@@ -68,7 +70,17 @@
                 finishAndRemoveTask()
                 Runtime.getRuntime().exit(0)
             }
-        }, IntentFilter(FINISH_MIC_CAM_ACTIVITY_ACTION))
+        }, IntentFilter(FINISH_MIC_CAM_ACTIVITY_ACTION), Context.RECEIVER_EXPORTED)
+
+        registerReceiver(object : BroadcastReceiver() {
+            override fun onReceive(context: Context?, intent: Intent?) {
+                val intent = Intent(this@UseMicCamera, OverlayActivity::class.java)
+                if (intent.getBooleanExtra(DELAYED_ACTIVITY_NEW_TASK_EXTRA, false)) {
+                    intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                }
+                startActivity(intent)
+            }
+        }, IntentFilter(SHOW_OVERLAY_ACTION), Context.RECEIVER_EXPORTED)
 
         val useMic = intent.getBooleanExtra(USE_MIC_EXTRA, false)
         val useCam = intent.getBooleanExtra(USE_CAM_EXTRA, false)
@@ -80,13 +92,5 @@
                 cam = openCam(this, intent.getBooleanExtra(UseMicCamera.RETRY_CAM_EXTRA, false))
             }, 1000)
         }
-
-        handler.postDelayed({
-            val intent = Intent(this, OverlayActivity::class.java)
-            if (intent.getBooleanExtra(DELAYED_ACTIVITY_NEW_TASK_EXTRA, false)) {
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
-            }
-            startActivity(intent)
-        }, 2000)
     }
 }
diff --git a/tests/tests/sensorprivacy/test-apps/CtsUseMicOrCameraForSensorPrivacy/src/android/sensorprivacy/cts/usemiccamera/UseMicCamera.kt b/tests/tests/sensorprivacy/test-apps/CtsUseMicOrCameraForSensorPrivacy/src/android/sensorprivacy/cts/usemiccamera/UseMicCamera.kt
index 0e8be51..c1f7cd2 100644
--- a/tests/tests/sensorprivacy/test-apps/CtsUseMicOrCameraForSensorPrivacy/src/android/sensorprivacy/cts/usemiccamera/UseMicCamera.kt
+++ b/tests/tests/sensorprivacy/test-apps/CtsUseMicOrCameraForSensorPrivacy/src/android/sensorprivacy/cts/usemiccamera/UseMicCamera.kt
@@ -71,7 +71,7 @@
                         Process.myUid(), applicationContext.packageName)
                 finishAndRemoveTask()
             }
-        }, IntentFilter(FINISH_MIC_CAM_ACTIVITY_ACTION))
+        }, IntentFilter(FINISH_MIC_CAM_ACTIVITY_ACTION), Context.RECEIVER_EXPORTED)
 
         val useMic = intent.getBooleanExtra(USE_MIC_EXTRA, false)
         val useCam = intent.getBooleanExtra(USE_CAM_EXTRA, false)
diff --git a/tests/tests/settings/src/android/settings/cts/AppLocaleSettingsTest.java b/tests/tests/settings/src/android/settings/cts/AppLocaleSettingsTest.java
new file mode 100644
index 0000000..85f5e5d
--- /dev/null
+++ b/tests/tests/settings/src/android/settings/cts/AppLocaleSettingsTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2021 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 android.settings.cts;
+
+import static org.junit.Assert.assertTrue;
+
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.net.Uri;
+import android.os.RemoteException;
+import android.provider.Settings;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests to ensure the Activity to handle
+ * {@link Settings#ACTION_APP_LOCALE_SETTINGS}
+ */
+@RunWith(AndroidJUnit4.class)
+public class AppLocaleSettingsTest {
+    @Test
+    public void testAppLocaleSettingsExist() throws RemoteException {
+        final Intent intent = new Intent(Settings.ACTION_APP_LOCALE_SETTINGS);
+        intent.setData(Uri.parse("package:com.my.app"));
+        final ResolveInfo ri = InstrumentationRegistry.getTargetContext()
+                .getPackageManager().resolveActivity(
+                intent, PackageManager.MATCH_DEFAULT_ONLY);
+        assertTrue(ri != null);
+    }
+}
diff --git a/tests/tests/settings/src/android/settings/cts/SettingsMultiPaneDeepLinkTest.java b/tests/tests/settings/src/android/settings/cts/SettingsMultiPaneDeepLinkTest.java
index ea0e789..fcf2cac 100644
--- a/tests/tests/settings/src/android/settings/cts/SettingsMultiPaneDeepLinkTest.java
+++ b/tests/tests/settings/src/android/settings/cts/SettingsMultiPaneDeepLinkTest.java
@@ -52,14 +52,7 @@
 
     @Before
     public void setUp() throws Exception {
-        // runOnMainSync or SplitController#isSplitSupported will return wrong value for large
-        // screen devices.
-        InstrumentationRegistry.getInstrumentation().runOnMainSync(new Runnable() {
-            @Override
-            public void run() {
-                mIsSplitSupported = SplitController.getInstance().isSplitSupported();
-            }
-        });
+        mIsSplitSupported = SplitController.getInstance().isSplitSupported();
         mDeepLinkIntentResolveInfo = InstrumentationRegistry.getInstrumentation().getContext()
                 .getPackageManager().resolveActivity(
                 new Intent(Settings.ACTION_SETTINGS_EMBED_DEEP_LINK_ACTIVITY),
diff --git a/tests/tests/shortcutmanager/Android.bp b/tests/tests/shortcutmanager/Android.bp
index 776ce70..fab3c5e 100644
--- a/tests/tests/shortcutmanager/Android.bp
+++ b/tests/tests/shortcutmanager/Android.bp
@@ -26,6 +26,9 @@
         "android.test.runner",
         "android.test.base",
     ],
+    static_libs: [
+        "permission-test-util-lib",
+    ],
     srcs: ["src/**/*.java"],
     test_suites: [
         "cts",
diff --git a/tests/tests/shortcutmanager/common/src/android.content.pm.cts.shortcutmanager.common/ReplyUtil.java b/tests/tests/shortcutmanager/common/src/android.content.pm.cts.shortcutmanager.common/ReplyUtil.java
index b1b0ae5..9186338 100644
--- a/tests/tests/shortcutmanager/common/src/android.content.pm.cts.shortcutmanager.common/ReplyUtil.java
+++ b/tests/tests/shortcutmanager/common/src/android.content.pm.cts.shortcutmanager.common/ReplyUtil.java
@@ -83,7 +83,8 @@
             }
         };
 
-        context.registerReceiver(resultReceiver, filter);
+        context.registerReceiver(resultReceiver, filter,
+                Context.RECEIVER_EXPORTED_UNAUDITED);
 
         try {
             // Run the code.
diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerClientApiTest.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerClientApiTest.java
index 92335e9..cf3dc4a 100644
--- a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerClientApiTest.java
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerClientApiTest.java
@@ -25,21 +25,16 @@
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.setDefaultLauncher;
 
 import android.app.PendingIntent;
-import android.app.appsearch.AppSearchManager;
-import android.app.appsearch.SearchResult;
-import android.app.appsearch.SearchSpec;
 import android.content.ComponentName;
 import android.content.Intent;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager;
+import android.content.pm.Capability;
+import android.content.pm.CapabilityParams;
 import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
-import android.content.pm.Signature;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.Icon;
 import android.net.Uri;
 import android.test.suitebuilder.annotation.SmallTest;
-import android.util.ArraySet;
 
 import com.android.compatibility.common.util.CddTest;
 
@@ -49,13 +44,6 @@
 import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Executors;
 
 /**
  * Tests for {@link ShortcutManager} and {@link ShortcutInfo}.
@@ -607,6 +595,65 @@
         testSetDynamicShortcuts_details();
     }
 
+    public void testSetDynamicShortcuts_withCapabilities() {
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            assertTrue(getManager().setDynamicShortcuts(list(
+                    makeShortcutBuilder("s1")
+                            .setShortLabel("title1")
+                            .setIntent(new Intent("main").putExtra("k1", "yyy"))
+                            .addCapabilityBinding(
+                                    new Capability.Builder("action.intent.START_EXERCISE").build(),
+                                    new CapabilityParams.Builder("exercise.type", "running")
+                                            .addAlias("jogging")
+                                            .build())
+                            .addCapabilityBinding(
+                                    new Capability.Builder("action.intent.START_EXERCISE").build(),
+                                    new CapabilityParams.Builder("exercise.duration", "10m")
+                                            .build())
+                            .build(),
+                    makeShortcutBuilder("s2")
+                            .setShortLabel("title2")
+                            .setIntent(new Intent("main").putExtra("k1", "yyy"))
+                            .addCapabilityBinding(
+                                    new Capability.Builder("action.intent.STOP_EXERCISE").build(),
+                                    new CapabilityParams.Builder("exercise.type", "running")
+                                            .addAlias("jogging")
+                                            .build())
+                            .build(),
+                    makeShortcut("s3", "title3"))));
+        });
+
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            assertWith(getManager().getDynamicShortcuts())
+                    .areAllEnabled()
+                    .areAllDynamic()
+                    .haveIds("s1", "s2", "s3")
+                    .forShortcutWithId("s1", si -> {
+                        assertEquals(list(new Capability.Builder(
+                                "action.intent.START_EXERCISE").build()), si.getCapabilities());
+                        assertEquals(list(
+                                        new CapabilityParams.Builder("exercise.type", "running")
+                                                .addAlias("jogging").build(),
+                                        new CapabilityParams.Builder("exercise.duration", "10m")
+                                                .build()),
+                                si.getCapabilityParams(new Capability.Builder(
+                                        "action.intent.START_EXERCISE").build()));
+                    })
+                    .forShortcutWithId("s2", si -> {
+                        assertEquals(list(new Capability.Builder(
+                                "action.intent.STOP_EXERCISE").build()), si.getCapabilities());
+                        assertEquals(list(
+                                new CapabilityParams.Builder("exercise.type", "running")
+                                        .addAlias("jogging").build()),
+                                si.getCapabilityParams(new Capability.Builder(
+                                        "action.intent.STOP_EXERCISE").build()));
+                    })
+                    .forShortcutWithId("s3", si -> {
+                        assertEquals("title3", si.getShortLabel());
+                    });
+        });
+    }
+
     public void testAddDynamicShortcuts() {
         runWithCallerWithStrictMode(mPackageContext1, () -> {
             assertTrue(getManager().addDynamicShortcuts(list(
@@ -2226,6 +2273,127 @@
         });
     }
 
+    public void testSetShortcutsExcludedFromLauncher_ExcludedFromSearchResults() {
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            assertTrue(getManager().setDynamicShortcuts(list(
+                    makeShortcut("s1", "title1"),
+                    makeShortcut("s2", "title2"),
+                    makeShortcut("s3", "title3"),
+                    makeShortcutExcludedFromLauncher("s4"))));
+        });
+
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            assertWith(getManager().getDynamicShortcuts())
+                    .areAllEnabled()
+                    .areAllDynamic()
+                    .haveIds("s1", "s2", "s3")
+                    .forShortcutWithId("s1", si -> {
+                        assertEquals("title1", si.getShortLabel());
+                    })
+                    .forShortcutWithId("s2", si -> {
+                        assertEquals("title2", si.getShortLabel());
+                    })
+                    .forShortcutWithId("s3", si -> {
+                        assertEquals("title3", si.getShortLabel());
+                    });
+            assertWith(getManager().getPinnedShortcuts())
+                    .isEmpty();
+            assertWith(getManager().getManifestShortcuts())
+                    .isEmpty();
+        });
+
+        // Publish from different package.
+        runWithCallerWithStrictMode(mPackageContext2, () -> {
+            assertTrue(getManager().setDynamicShortcuts(list(
+                    makeShortcut("s1x", "title1x"),
+                    makeShortcutExcludedFromLauncher("seven"))));
+        });
+
+        runWithCallerWithStrictMode(mPackageContext2, () -> {
+            assertWith(getManager().getDynamicShortcuts())
+                    .areAllEnabled()
+                    .areAllDynamic()
+                    .haveIds("s1x")
+                    .forShortcutWithId("s1x", si -> {
+                        assertEquals("title1x", si.getShortLabel());
+                    });
+            assertWith(getManager().getPinnedShortcuts())
+                    .isEmpty();
+            assertWith(getManager().getManifestShortcuts())
+                    .isEmpty();
+        });
+
+        // Package 1 still has the same shortcuts.
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            assertWith(getManager().getDynamicShortcuts())
+                    .areAllEnabled()
+                    .areAllDynamic()
+                    .haveIds("s1", "s2", "s3")
+                    .forShortcutWithId("s1", si -> {
+                        assertEquals("title1", si.getShortLabel());
+                    })
+                    .forShortcutWithId("s2", si -> {
+                        assertEquals("title2", si.getShortLabel());
+                    })
+                    .forShortcutWithId("s3", si -> {
+                        assertEquals("title3", si.getShortLabel());
+                    });
+            assertWith(getManager().getPinnedShortcuts())
+                    .isEmpty();
+            assertWith(getManager().getManifestShortcuts())
+                    .isEmpty();
+        });
+
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            assertTrue(getManager().setDynamicShortcuts(list(
+                    makeShortcut("s2", "title2-updated"),
+                    makeShortcutExcludedFromLauncher("s4"))));
+        });
+
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            assertWith(getManager().getDynamicShortcuts())
+                    .areAllEnabled()
+                    .areAllDynamic()
+                    .haveIds("s2")
+                    .forShortcutWithId("s2", si -> {
+                        assertEquals("title2-updated", si.getShortLabel());
+                    });
+            assertWith(getManager().getPinnedShortcuts())
+                    .isEmpty();
+            assertWith(getManager().getManifestShortcuts())
+                    .isEmpty();
+        });
+
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            assertTrue(getManager().setDynamicShortcuts(
+                    list(makeShortcutExcludedFromLauncher("s4"))));
+        });
+
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            assertWith(getManager().getDynamicShortcuts())
+                    .isEmpty();
+            assertWith(getManager().getPinnedShortcuts())
+                    .isEmpty();
+            assertWith(getManager().getManifestShortcuts())
+                    .isEmpty();
+        });
+
+        // Package2 still has the same shortcuts.
+        runWithCallerWithStrictMode(mPackageContext2, () -> {
+            assertWith(getManager().getDynamicShortcuts())
+                    .areAllEnabled()
+                    .areAllDynamic()
+                    .haveIds("s1x")
+                    .forShortcutWithId("s1x", si -> {
+                        assertEquals("title1x", si.getShortLabel());
+                    });
+            assertWith(getManager().getPinnedShortcuts())
+                    .isEmpty();
+            assertWith(getManager().getManifestShortcuts())
+                    .isEmpty();
+        });
+    }
+
     // TODO Test auto rank adjustment.
     // TODO Test save & load.
 }
diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerCtsTestsBase.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerCtsTestsBase.java
index 7abd0a2..5ec9a90 100644
--- a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerCtsTestsBase.java
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerCtsTestsBase.java
@@ -18,6 +18,7 @@
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.*;
 
 import android.app.Activity;
+import android.app.ActivityManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.ContextWrapper;
@@ -37,10 +38,14 @@
 import android.os.StrictMode;
 import android.os.StrictMode.ThreadPolicy;
 import android.os.UserHandle;
-import androidx.annotation.NonNull;
+import android.provider.DeviceConfig;
 import android.test.InstrumentationTestCase;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
+
+import com.android.compatibility.common.util.SystemUtil;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -450,6 +455,17 @@
     }
 
     /**
+     * Make a shortcut excluded from launcher with an ID.
+     */
+    protected ShortcutInfo makeShortcutExcludedFromLauncher(String id) {
+        return makeShortcut(
+                id, "Title-" + id, /* activity =*/ null, /* icon =*/ null,
+                makeIntent(Intent.ACTION_VIEW, ShortcutActivity.class), /* rank =*/ 0,
+                /* locusId =*/ null, /* longLived =*/ true,
+                /* excludedSurfaces */ ShortcutInfo.SURFACE_LAUNCHER);
+    }
+
+    /**
      * Make multiple shortcuts with IDs.
      */
     protected List<ShortcutInfo> makeShortcuts(String... ids) {
@@ -482,11 +498,21 @@
      */
     protected ShortcutInfo makeShortcut(String id, String shortLabel, ComponentName activity,
             Icon icon, Intent intent, int rank, LocusId locusId, boolean longLived) {
+        return makeShortcut(id, shortLabel, activity, icon, intent, rank, locusId, longLived, 0);
+    }
+
+    /**
+     * Make a shortcut with details.
+     */
+    protected ShortcutInfo makeShortcut(String id, String shortLabel, ComponentName activity,
+            Icon icon, Intent intent, int rank, LocusId locusId, boolean longLived,
+            int excludedSurfaces) {
         final ShortcutInfo.Builder b = makeShortcutBuilder(id)
                 .setShortLabel(shortLabel)
                 .setRank(rank)
                 .setIntent(intent)
-                .setLongLived(longLived);
+                .setLongLived(longLived)
+                .setExcludedFromSurfaces(excludedSurfaces);
         if (activity != null) {
             b.setActivity(activity);
         } else if (mTargetActivityOverride != null) {
@@ -619,4 +645,11 @@
         }
         return getLauncherApps().getShortcuts(q, getUserHandle());
     }
+
+    protected boolean isAppSearchEnabled() {
+        return SystemUtil.runWithShellPermissionIdentity(() ->
+                DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_SYSTEMUI,
+                        "shortcut_appsearch_integration", true))
+                && !getTestContext().getSystemService(ActivityManager.class).isLowRamDevice();
+    }
 }
diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerLauncherApiTest.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerLauncherApiTest.java
index 33b9c90..edc1cd2 100644
--- a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerLauncherApiTest.java
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerLauncherApiTest.java
@@ -16,6 +16,7 @@
 package android.content.pm.cts.shortcutmanager;
 
 import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_GET_KEY_FIELDS_ONLY;
+import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_GET_PERSISTED_DATA;
 import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_DYNAMIC;
 import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_MANIFEST;
 import static android.content.pm.LauncherApps.ShortcutQuery.FLAG_MATCH_PINNED;
@@ -25,12 +26,20 @@
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.retryUntil;
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.setDefaultLauncher;
 
+import android.content.Intent;
 import android.content.LocusId;
+import android.content.pm.Capability;
+import android.content.pm.CapabilityParams;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
 import android.graphics.BitmapFactory;
 import android.graphics.drawable.Icon;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import com.android.compatibility.common.util.CddTest;
+import com.android.compatibility.common.util.SystemUtil;
+
+import java.util.List;
 
 @SmallTest
 public class ShortcutManagerLauncherApiTest extends ShortcutManagerCtsTestsBase {
@@ -411,4 +420,363 @@
         assertIconDimensions(icon2, getIconAsLauncher(
             mLauncherContext1, mPackageContext1.getPackageName(), "s2", false));
     }
+
+    public void testSetDynamicShortcuts_PersistsShortcutsToDisk() throws Exception {
+        if (!isAppSearchEnabled()) {
+            return;
+        }
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            final ShortcutManager manager = getManager();
+            // Verifies setDynamicShortcuts persists shortcuts into AppSearch
+            manager.setDynamicShortcuts(list(
+                    makeShortcutBuilder("s1")
+                            .setShortLabel("Title-s1")
+                            .setIntent(new Intent("main").putExtra("k1", "yyy"))
+                            .addCapabilityBinding(
+                                    new Capability.Builder("action.intent.START_EXERCISE").build(),
+                                    new CapabilityParams.Builder("exercise.type", "running")
+                                            .addAlias("jogging")
+                                            .build())
+                            .addCapabilityBinding(
+                                    new Capability.Builder("action.intent.START_EXERCISE").build(),
+                                    new CapabilityParams.Builder("exercise.duration", "10m")
+                                            .build())
+                            .build(),
+                    makeShortcut("s2"),
+                    makeShortcutExcludedFromLauncher("s3")
+            ));
+            // Verify shortcut excluded from launcher are not included in search result
+            assertWith(manager.getShortcuts(ShortcutManager.FLAG_MATCH_DYNAMIC))
+                    .haveIds("s1", "s2")
+                    .areAllDynamic();
+        });
+        Thread.sleep(5000);
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+        runWithCallerWithStrictMode(mLauncherContext1, () -> {
+            final List<ShortcutInfo> ret = getShortcutsAsLauncher(
+                    FLAG_GET_PERSISTED_DATA,
+                    mPackageContext1.getPackageName(),
+                    null,
+                    0,
+                    list("s1", "s2", "s3"),
+                    null);
+            // Package 1
+            assertWith(ret).haveIds("s1", "s2", "s3").forShortcutWithId("s1", si -> {
+                assertEquals(list(new Capability.Builder(
+                        "action.intent.START_EXERCISE").build()), si.getCapabilities());
+                assertEquals(list(
+                                new CapabilityParams.Builder("exercise.type", "running")
+                                        .addAlias("jogging").build(),
+                                new CapabilityParams.Builder("exercise.duration", "10m").build()),
+                        si.getCapabilityParams(new Capability.Builder(
+                                "action.intent.START_EXERCISE").build()));
+            });
+        });
+    }
+
+    public void testRemoveAllDynamicShortcuts_RemovesShortcutsFromDisk() throws Exception {
+        if (!isAppSearchEnabled()) {
+            return;
+        }
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            final ShortcutManager manager = getManager();
+            // Verifies setDynamicShortcuts persists shortcuts into AppSearch
+            manager.setDynamicShortcuts(list(
+                    makeShortcutBuilder("s1")
+                            .setShortLabel("Title-s1")
+                            .setIntent(new Intent("main").putExtra("k1", "yyy"))
+                            .addCapabilityBinding(
+                                    new Capability.Builder("action.intent.START_EXERCISE").build(),
+                                    new CapabilityParams.Builder("exercise.type", "running")
+                                            .addAlias("jogging")
+                                            .build())
+                            .addCapabilityBinding(
+                                    new Capability.Builder("action.intent.START_EXERCISE").build(),
+                                    new CapabilityParams.Builder("exercise.duration", "10m")
+                                            .build())
+                            .build(),
+                    makeShortcut("s2"),
+                    makeShortcutExcludedFromLauncher("s3")
+            ));
+            // Verify shortcut excluded from launcher are not included in search result
+            assertWith(manager.getShortcuts(ShortcutManager.FLAG_MATCH_DYNAMIC))
+                    .haveIds("s1", "s2")
+                    .areAllDynamic()
+                    .forShortcutWithId("s1", si -> {
+                        assertEquals(list(new Capability.Builder(
+                                "action.intent.START_EXERCISE").build()), si.getCapabilities());
+                        assertEquals(list(
+                                        new CapabilityParams.Builder("exercise.type", "running")
+                                                .addAlias("jogging").build(),
+                                        new CapabilityParams.Builder("exercise.duration", "10m")
+                                                .build()),
+                                si.getCapabilityParams(new Capability.Builder(
+                                        "action.intent.START_EXERCISE").build()));
+                    });
+        });
+        Thread.sleep(5000);
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            // Verifies removeAllDynamicShortcuts removes shortcuts from persistence layer
+            getManager().removeAllDynamicShortcuts();
+        });
+        Thread.sleep(5000);
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+        runWithCallerWithStrictMode(mLauncherContext1, () -> {
+            final List<ShortcutInfo> ret = getShortcutsAsLauncher(
+                    FLAG_GET_PERSISTED_DATA,
+                    mPackageContext1.getPackageName(),
+                    null,
+                    0,
+                    list("s1", "s2", "s3"),
+                    null);
+            assertWith(ret).isEmpty();
+        });
+    }
+
+    public void testAddDynamicShortcuts_PersistsShortcutsToDisk() throws Exception {
+        if (!isAppSearchEnabled()) {
+            return;
+        }
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            final ShortcutManager manager = getManager();
+            manager.setDynamicShortcuts(list(
+                    makeShortcutBuilder("s1")
+                            .setShortLabel("Title-s1")
+                            .setIntent(new Intent("main").putExtra("k1", "yyy"))
+                            .addCapabilityBinding(
+                                    new Capability.Builder("action.intent.START_EXERCISE").build(),
+                                    new CapabilityParams.Builder("exercise.type", "running")
+                                            .addAlias("jogging")
+                                            .build())
+                            .addCapabilityBinding(
+                                    new Capability.Builder("action.intent.START_EXERCISE").build(),
+                                    new CapabilityParams.Builder("exercise.duration", "10m")
+                                            .build())
+                            .build(),
+                    makeShortcut("s2"),
+                    makeShortcutExcludedFromLauncher("s3")
+            ));
+            // Verify shortcut excluded from launcher are not included in search result
+            assertWith(manager.getShortcuts(ShortcutManager.FLAG_MATCH_DYNAMIC))
+                    .haveIds("s1", "s2")
+                    .areAllDynamic()
+                    .forShortcutWithId("s1", si -> {
+                        assertEquals(list(new Capability.Builder(
+                                "action.intent.START_EXERCISE").build()), si.getCapabilities());
+                        assertEquals(list(
+                                        new CapabilityParams.Builder("exercise.type", "running")
+                                                .addAlias("jogging").build(),
+                                        new CapabilityParams.Builder("exercise.duration", "10m")
+                                                .build()),
+                                si.getCapabilityParams(new Capability.Builder(
+                                        "action.intent.START_EXERCISE").build()));
+                    });
+            // Verifies addDynamicShortcuts persists shortcuts into AppSearch
+            manager.addDynamicShortcuts(list(makeShortcut("s4"), makeShortcut("s5")));
+        });
+        Thread.sleep(5000);
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+        runWithCallerWithStrictMode(mLauncherContext1, () -> {
+            final List<ShortcutInfo> ret = getShortcutsAsLauncher(
+                    FLAG_GET_PERSISTED_DATA,
+                    mPackageContext1.getPackageName(),
+                    null,
+                    0,
+                    list("s1", "s2", "s3", "s4", "s5"),
+                    null);
+            assertWith(ret).haveIds("s1", "s2", "s3", "s4", "s5");
+        });
+    }
+
+    public void testPushDynamicShortcuts_PersistsShortcutsToDisk() throws Exception {
+        if (!isAppSearchEnabled()) {
+            return;
+        }
+        SystemUtil.runShellCommand("cmd shortcut override-config max_shortcuts=5");
+        runWithCallerWithStrictMode(mPackageContext1, () ->
+                getManager().setDynamicShortcuts(list(
+                        makeShortcutBuilder("s1")
+                                .setShortLabel("Title-s1")
+                                .setIntent(new Intent("main").putExtra("k1", "yyy"))
+                                .addCapabilityBinding(
+                                        new Capability.Builder(
+                                                "action.intent.START_EXERCISE").build(),
+                                        new CapabilityParams.Builder("exercise.type", "running")
+                                                .addAlias("jogging")
+                                                .build())
+                                .addCapabilityBinding(
+                                        new Capability.Builder(
+                                                "action.intent.START_EXERCISE").build(),
+                                        new CapabilityParams.Builder("exercise.duration", "10m")
+                                                .build())
+                                .build(),
+                        makeShortcut("s2"),
+                        makeShortcut("s3"),
+                        makeShortcutExcludedFromLauncher("s4"),
+                        makeShortcutExcludedFromLauncher("s5")
+                )));
+        Thread.sleep(5000);
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+        runWithCallerWithStrictMode(mLauncherContext1, () -> {
+            final List<ShortcutInfo> ret = getShortcutsAsLauncher(
+                    FLAG_GET_PERSISTED_DATA,
+                    mPackageContext1.getPackageName(),
+                    null,
+                    0,
+                    list("s1", "s2", "s3", "s4", "s5"),
+                    null);
+            assertWith(ret).haveIds("s1", "s2", "s3", "s4", "s5")
+                    .forShortcutWithId("s1", si -> {
+                        assertEquals(list(new Capability.Builder(
+                                "action.intent.START_EXERCISE").build()), si.getCapabilities());
+                        assertEquals(list(
+                                        new CapabilityParams.Builder("exercise.type", "running")
+                                                .addAlias("jogging").build(),
+                                        new CapabilityParams.Builder("exercise.duration", "10m")
+                                                .build()),
+                                si.getCapabilityParams(new Capability.Builder(
+                                "action.intent.START_EXERCISE").build()));
+                    });
+        });
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            // Verifies pushDynamicShortcuts further persists shortcuts into AppSearch without
+            // removing previous shortcuts when max number of shortcuts is reached.
+            getManager().pushDynamicShortcut(makeShortcut("s6"));
+        });
+        Thread.sleep(5000);
+        runWithCallerWithStrictMode(mLauncherContext1, () -> {
+            final List<ShortcutInfo> ret = getShortcutsAsLauncher(
+                    FLAG_GET_PERSISTED_DATA,
+                    mPackageContext1.getPackageName(),
+                    null,
+                    0,
+                    list("s1", "s2", "s3", "s4", "s5", "s6"),
+                    null);
+            assertWith(ret).haveIds("s1", "s2", "s3", "s4", "s5", "s6");
+        });
+        SystemUtil.runShellCommand("cmd shortcut reset-config");
+    }
+
+    public void testRemoveDynamicShortcuts_RemovesShortcutsFromDisk() throws Exception {
+        if (!isAppSearchEnabled()) {
+            return;
+        }
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            final ShortcutManager manager = getManager();
+            manager.setDynamicShortcuts(list(
+                    makeShortcut("s1"),
+                    makeShortcut("s2"),
+                    makeShortcutExcludedFromLauncher("s3"),
+                    makeShortcutExcludedFromLauncher("s4"),
+                    makeShortcutExcludedFromLauncher("s5")
+            ));
+            // Verifies removeDynamicShortcuts removes shortcuts from persistence layer
+            manager.removeDynamicShortcuts(list("s1"));
+        });
+        Thread.sleep(5000);
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+        runWithCallerWithStrictMode(mLauncherContext1, () -> {
+            final List<ShortcutInfo> ret = getShortcutsAsLauncher(
+                    FLAG_GET_PERSISTED_DATA,
+                    mPackageContext1.getPackageName(),
+                    null,
+                    0,
+                    list("s1", "s2", "s3", "s4", "s5"),
+                    null);
+            assertWith(ret).haveIds("s2", "s3", "s4", "s5");
+        });
+    }
+
+    public void testRemoveLongLivedShortcuts_RemovesShortcutsFromDisk() throws Exception {
+        if (!isAppSearchEnabled()) {
+            return;
+        }
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            final ShortcutManager manager = getManager();
+            manager.setDynamicShortcuts(list(
+                    makeShortcutExcludedFromLauncher("s1"),
+                    makeShortcut("s2"),
+                    makeShortcutExcludedFromLauncher("s3"),
+                    makeShortcut("s4"),
+                    makeShortcut("s5")
+            ));
+            manager.removeDynamicShortcuts(list("s2"));
+        });
+        Thread.sleep(5000);
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+        runWithCallerWithStrictMode(mLauncherContext1, () -> {
+            final List<ShortcutInfo> ret = getShortcutsAsLauncher(
+                    FLAG_GET_PERSISTED_DATA,
+                    mPackageContext1.getPackageName(),
+                    null,
+                    0,
+                    list("s1", "s2", "s3", "s4", "s5"),
+                    null);
+            assertWith(ret).haveIds("s1", "s3", "s4", "s5");
+        });
+    }
+
+    public void testDisableShortcuts_RemovesShortcutsFromDisk() throws Exception {
+        if (!isAppSearchEnabled()) {
+            return;
+        }
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            final ShortcutManager manager = getManager();
+            manager.setDynamicShortcuts(list(
+                    makeShortcut("s1"),
+                    makeShortcutExcludedFromLauncher("s2"),
+                    makeShortcut("s3"),
+                    makeShortcutExcludedFromLauncher("s4"),
+                    makeShortcut("s5")
+            ));
+            // Verifies disableShortcuts removes shortcuts from persistence layer
+            manager.disableShortcuts(list("s3"));
+        });
+        Thread.sleep(5000);
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+        runWithCallerWithStrictMode(mLauncherContext1, () -> {
+            final List<ShortcutInfo> ret = getShortcutsAsLauncher(
+                    FLAG_GET_PERSISTED_DATA,
+                    mPackageContext1.getPackageName(),
+                    null,
+                    0,
+                    list("s1", "s2", "s3", "s4", "s5"),
+                    null);
+            assertWith(ret).haveIds("s1", "s2", "s4", "s5");
+        });
+    }
+
+    public void testUpdateShortcuts_UpdateShortcutsOnDisk() throws Exception {
+        if (!isAppSearchEnabled()) {
+            return;
+        }
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            final ShortcutManager manager = getManager();
+            manager.setDynamicShortcuts(list(
+                    makeShortcut("s1"),
+                    makeShortcutExcludedFromLauncher("s2"),
+                    makeShortcut("s3"),
+                    makeShortcutExcludedFromLauncher("s4"),
+                    makeShortcut("s5")
+            ));
+            // Verifies shortcuts in persistence layer are being updated
+            manager.updateShortcuts(list(makeShortcut("s3", "custom")));
+        });
+        Thread.sleep(5000);
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+        runWithCallerWithStrictMode(mLauncherContext1, () -> {
+            final List<ShortcutInfo> ret = getShortcutsAsLauncher(
+                    FLAG_GET_PERSISTED_DATA,
+                    mPackageContext1.getPackageName(),
+                    null,
+                    0,
+                    list("s1", "s2", "s3", "s4", "s5"),
+                    null);
+            assertWith(ret)
+                    .haveIds("s1", "s2", "s3", "s4", "s5")
+                    .forShortcutWithId("s3", si -> {
+                        assertEquals("custom", si.getShortLabel());
+                    });
+        });
+    }
 }
diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerLauncherCallbackTest.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerLauncherCallbackTest.java
index 8467f9a..0de6253 100644
--- a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerLauncherCallbackTest.java
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerLauncherCallbackTest.java
@@ -29,6 +29,7 @@
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 
+import com.android.compatibility.common.util.CddTest;
 import com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.ShortcutListAsserter;
 
 import java.util.ArrayList;
@@ -36,20 +37,20 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Predicate;
 
-import com.android.compatibility.common.util.CddTest;
-
 @CddTest(requirement="3.8.1/C-2-3")
 @SmallTest
 public class ShortcutManagerLauncherCallbackTest extends ShortcutManagerCtsTestsBase {
 
     private static class MyCallback extends LauncherApps.Callback {
         private final HashSet<String> mInterestedPackages = new HashSet<String>();
-        private boolean called;
+        private final AtomicInteger mCallcount = new AtomicInteger(0);
         private String lastPackage;
         private final List<ShortcutInfo> lastShortcuts = new ArrayList<>();
 
+
         public MyCallback(String... interestedPackages) {
             mInterestedPackages.addAll(Arrays.asList(interestedPackages));
         }
@@ -98,17 +99,17 @@
             lastPackage = packageName;
             lastShortcuts.clear();
             lastShortcuts.addAll(shortcuts);
-            called = true;
+            mCallcount.incrementAndGet();
         }
 
         public synchronized void reset() {
             lastPackage = null;
             lastShortcuts.clear();
-            called = false;
+            mCallcount.set(0);
         }
 
         public synchronized boolean isCalled() {
-            return called;
+            return mCallcount.get() > 0;
         }
 
         public synchronized ShortcutListAsserter assertCalled(Context clientContext) {
@@ -343,6 +344,16 @@
                     .areAllDisabled();
             reset.run();
 
+            //-----------------------
+            Log.i(TAG, "testCallbacks: pushDynamicShortcut");
+            runWithCaller(mPackageContext1, () -> {
+                for (int i = 0; i < 100; i++) {
+                    getManager().pushDynamicShortcut(makeShortcut("s" + i));
+                }
+            });
+            retryUntil(c::isCalled, "callback not called.");
+            assertEquals(1, c.mCallcount.get());
+            reset.run();
         } finally {
             runWithCaller(mLauncherContext1, () -> {
                 if (registered.get()) {
diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerMiscTest.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerMiscTest.java
index 1d7e8fc..d77961e 100644
--- a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerMiscTest.java
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerMiscTest.java
@@ -17,6 +17,7 @@
 
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.getIconSize;
 
+import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
 import android.test.suitebuilder.annotation.SmallTest;
 
@@ -43,4 +44,13 @@
         assertEquals(iconDimension, manager.getIconMaxWidth());
         assertEquals(iconDimension, manager.getIconMaxHeight());
     }
+
+    public void testExcludedFromFields() throws Exception {
+        final ShortcutInfo s1 = makeShortcut("s1");
+        final ShortcutInfo s2 = makeShortcutExcludedFromLauncher("s2");
+        assertFalse(s1.isExcludedFromSurfaces(ShortcutInfo.SURFACE_LAUNCHER));
+        assertTrue(s2.isExcludedFromSurfaces(ShortcutInfo.SURFACE_LAUNCHER));
+        assertEquals(0, s1.getExcludedFromSurfaces());
+        assertEquals(ShortcutInfo.SURFACE_LAUNCHER, s2.getExcludedFromSurfaces());
+    }
 }
diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerRequestPinTest.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerRequestPinTest.java
index d7b506a..79efffb 100644
--- a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerRequestPinTest.java
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerRequestPinTest.java
@@ -16,7 +16,6 @@
 package android.content.pm.cts.shortcutmanager;
 
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.assertWith;
-import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.dumpsysShortcut;
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.list;
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.retryUntil;
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.setDefaultLauncher;
@@ -33,6 +32,7 @@
 import android.content.pm.cts.shortcutmanager.common.ReplyUtil;
 import android.os.PersistableBundle;
 import android.util.Log;
+
 import com.android.compatibility.common.util.CddTest;
 
 import java.util.HashMap;
@@ -43,6 +43,7 @@
     private static final String TAG = "ShortcutMRPT";
 
     private static final String SHORTCUT_ID = "s12345";
+    private static final String HIDDEN_SHORTCUT_ID = "s24680";
 
     @CddTest(requirement="[3.8.1/C-2-1],[3.8.1/C-3-1]")
     public void testIsRequestPinShortcutSupported() {
@@ -351,6 +352,29 @@
         }
     }
 
+    /**
+     * Same as {@link ShortcutManager#requestPinShortcut} except the app has no main activities.
+     */
+    public void testRequestPinShortcutExcludedFromLauncher_ThrowsException() {
+        setDefaultLauncher(getInstrumentation(), mLauncherContext1);
+
+        runWithCallerWithStrictMode(mPackageContext1, () -> {
+            final ShortcutInfo shortcut = makeShortcutBuilder(HIDDEN_SHORTCUT_ID)
+                    .setExcludedFromSurfaces(ShortcutInfo.SURFACE_LAUNCHER)
+                    .build();
+
+            Log.i(TAG, "Calling requestPinShortcut...");
+            boolean isIllegalArgumentExceptionThrown = false;
+            try {
+                assertTrue(getManager().requestPinShortcut(shortcut, /* intent sender */ null));
+            } catch (IllegalArgumentException e) {
+                isIllegalArgumentExceptionThrown = true;
+            }
+            assertTrue(isIllegalArgumentExceptionThrown);
+            Log.i(TAG, "Done.");
+        });
+    }
+
     // TODO Various other cases (already pinned, etc)
     // TODO Various error cases (missing mandatory fields, etc)
 }
diff --git a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerThrottlingTest.java b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerThrottlingTest.java
index 79b6bd1..d1e83f8 100644
--- a/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerThrottlingTest.java
+++ b/tests/tests/shortcutmanager/src/android/content/pm/cts/shortcutmanager/ShortcutManagerThrottlingTest.java
@@ -21,10 +21,12 @@
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.resetAllThrottling;
 import static com.android.server.pm.shortcutmanagertest.ShortcutManagerTestUtils.runCommandForNoOutput;
 
+import android.Manifest;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.pm.cts.shortcutmanager.common.Constants;
 import android.content.pm.cts.shortcutmanager.common.ReplyUtil;
+import android.permission.cts.PermissionUtils;
 import android.support.test.uiautomator.By;
 import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.UiObject2;
@@ -64,6 +66,8 @@
     protected void setUp() throws Exception {
         super.setUp();
 
+        PermissionUtils.grantPermission(TARGET_PACKAGE, Manifest.permission.POST_NOTIFICATIONS);
+
         resetAllThrottling(getInstrumentation());
 
         UiDevice.getInstance(getInstrumentation()).pressHome();
@@ -71,6 +75,12 @@
         runCommandForNoOutput(getInstrumentation(), "am force-stop " + TARGET_PACKAGE);
     }
 
+    @Override
+    protected void tearDown() throws Exception {
+        PermissionUtils.revokePermission(TARGET_PACKAGE, Manifest.permission.POST_NOTIFICATIONS);
+        super.tearDown();
+    }
+
     public void testSetDynamicShortcuts() throws InterruptedException {
         callTest(Constants.TEST_SET_DYNAMIC_SHORTCUTS);
     }
diff --git a/tests/tests/simphonebookprovider/src/android/provider/cts/simphonebook/SimPhonebookContract_ContentNotificationsTest.java b/tests/tests/simphonebookprovider/src/android/provider/cts/simphonebook/SimPhonebookContract_ContentNotificationsTest.java
index 1bbf1dd..e9162ff 100644
--- a/tests/tests/simphonebookprovider/src/android/provider/cts/simphonebook/SimPhonebookContract_ContentNotificationsTest.java
+++ b/tests/tests/simphonebookprovider/src/android/provider/cts/simphonebook/SimPhonebookContract_ContentNotificationsTest.java
@@ -20,18 +20,13 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import static org.hamcrest.Matchers.oneOf;
 import static org.junit.Assume.assumeThat;
-import static org.junit.Assume.assumeTrue;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
 
 import android.Manifest;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.net.Uri;
 import android.os.Handler;
@@ -40,7 +35,6 @@
 import android.provider.SimPhonebookContract.ElementaryFiles;
 import android.telephony.SubscriptionInfo;
 import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
 
 import androidx.annotation.Nullable;
 import androidx.test.core.app.ApplicationProvider;
@@ -50,9 +44,6 @@
 import com.android.compatibility.common.util.RequiredFeatureRule;
 import com.android.compatibility.common.util.SystemUtil;
 
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.SettableFuture;
-
 import org.hamcrest.Matchers;
 import org.junit.After;
 import org.junit.Before;
@@ -155,60 +146,6 @@
                 DEFAULT_TIMEOUT, () -> mObserver.observed.size() > 1);
     }
 
-    @Test
-    public void subscriptionsChange_notifiesObserver() throws Exception {
-        Resources resources = ApplicationProvider.getApplicationContext().getResources();
-        int id = resources.getIdentifier("config_hotswapCapable", "bool", "android");
-        boolean hotswapCapable = resources.getBoolean(id);
-        assumeTrue("Device does not support SIM hot swap", hotswapCapable);
-        assumeThat(mSubscriptionInfo, Matchers.notNullValue());
-        try {
-            setSimPower(0);
-
-            PollingCheck.check(
-                    "No content notifications observed for SIM removal",
-                    DEFAULT_TIMEOUT, () -> mObserver.observed.size() >= 1);
-            // It takes some time the SIM state transitions to finish so we sleep a bit to attempt
-            // to allow the notifications they trigger to stop so that the notifications we observe
-            // for the power on aren't polluted by the power off.
-            Thread.sleep(DEFAULT_TIMEOUT);
-            mObserver.observed.clear();
-        } finally {
-            setSimPower(1);
-        }
-        PollingCheck.check(
-                "No content notifications observed for SIM insertion",
-                DEFAULT_TIMEOUT, () -> mObserver.observed.size() >= 1);
-    }
-
-    private void setSimPower(int powerState) throws Exception {
-        TelephonyManager telephonyManager = ApplicationProvider.getApplicationContext()
-                .getSystemService(TelephonyManager.class);
-        int slotIndex = mSubscriptionInfo.getSimSlotIndex();
-        SettableFuture<Integer> resultFuture = SettableFuture.create();
-        SystemUtil.runWithShellPermissionIdentity(() -> telephonyManager.setSimPowerStateForSlot(
-                mSubscriptionInfo.getSimSlotIndex(), powerState,
-                MoreExecutors.directExecutor(), resultFuture::set),
-                Manifest.permission.MODIFY_PHONE_STATE, Manifest.permission.READ_PHONE_STATE);
-
-        int result = resultFuture.get(30, SECONDS);
-        assumeThat("setSimPowerStateForSlot failed for slot=" + slotIndex,
-                result, oneOf(
-                        TelephonyManager.SET_SIM_POWER_STATE_ALREADY_IN_STATE,
-                        TelephonyManager.SET_SIM_POWER_STATE_SUCCESS));
-        Thread.sleep(DEFAULT_TIMEOUT);
-        int simState = SystemUtil.runWithShellPermissionIdentity(() ->
-                        telephonyManager.getSimState(slotIndex),
-                Manifest.permission.READ_PHONE_STATE);
-        // This doesn't work on Cuttlefish so confirm the SIM was actually powered off.
-        if(powerState == 1) {
-            assumeThat(simState, Matchers.is(TelephonyManager.SIM_STATE_READY));
-        } else {
-            assumeThat(simState, Matchers.is(oneOf(TelephonyManager.SIM_STATE_ABSENT,
-                TelephonyManager.SIM_STATE_NOT_READY)));
-        }
-    }
-
     private static class RecordingContentObserver extends ContentObserver {
 
         List<Uri> observed = new CopyOnWriteArrayList<>();
diff --git a/tests/tests/slice/src/android/slice/cts/SlicePermissionsTest.java b/tests/tests/slice/src/android/slice/cts/SlicePermissionsTest.java
index c3cf011..0b1387a 100644
--- a/tests/tests/slice/src/android/slice/cts/SlicePermissionsTest.java
+++ b/tests/tests/slice/src/android/slice/cts/SlicePermissionsTest.java
@@ -14,7 +14,6 @@
 
 package android.slice.cts;
 
-import android.content.pm.PackageManager;
 import static android.content.pm.PackageManager.PERMISSION_DENIED;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 
@@ -22,8 +21,12 @@
 import static org.junit.Assume.assumeFalse;
 
 import android.app.slice.SliceManager;
+import android.app.slice.SliceProvider;
 import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Process;
 
@@ -35,6 +38,8 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.List;
+
 @RunWith(AndroidJUnit4.class)
 public class SlicePermissionsTest {
 
@@ -174,6 +179,14 @@
     }
 
     @Test
+    public void testPermissionIntent() {
+        Intent intent = SliceProvider.createPermissionIntent(mContext, BASE_URI, mTestPkg);
+        PackageManager pm = mContext.getPackageManager();
+        List<ResolveInfo> activities = pm.queryIntentActivities(intent, 0);
+        assertEquals(1, activities.size());
+    }
+
+    @Test
     public void testRevokeChild() {
         assumeFalse(isSliceDisabled);
         Uri uri = BASE_URI.buildUpon()
diff --git a/tests/tests/speech/OWNERS b/tests/tests/speech/OWNERS
index c9150c2..e72b790 100644
--- a/tests/tests/speech/OWNERS
+++ b/tests/tests/speech/OWNERS
@@ -1,2 +1,5 @@
 # Bug component: 63521
-rni@google.com
\ No newline at end of file
+volnov@google.com
+eugeniom@google.com
+schfan@google.com
+andreaambu@google.com
\ No newline at end of file
diff --git a/tests/tests/systemui/src/android/systemui/cts/MediaOutputDialogTest.java b/tests/tests/systemui/src/android/systemui/cts/MediaOutputDialogTest.java
new file mode 100644
index 0000000..c6e3ed2
--- /dev/null
+++ b/tests/tests/systemui/src/android/systemui/cts/MediaOutputDialogTest.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2022 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 android.systemui.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.BySelector;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.Until;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests related MediaOutputDialog:
+ *
+ * atest MediaDialogTest
+ */
+@RunWith(AndroidJUnit4.class)
+public class MediaOutputDialogTest {
+
+    private static final int TIMEOUT = 5000;
+    private static final String ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG =
+            "com.android.systemui.action.LAUNCH_MEDIA_OUTPUT_DIALOG";
+    private static final String SYSTEMUI_PACKAGE_NAME = "com.android.systemui";
+    public static final String EXTRA_PACKAGE_NAME = "package_name";
+    public static final String TEST_PACKAGE_NAME = "com.android.package.test";
+    private static final BySelector MEDIA_DIALOG_SELECTOR = By.res(SYSTEMUI_PACKAGE_NAME,
+            "media_output_dialog");
+
+    private Context mContext;
+    private UiDevice mDevice;
+    private String mLauncherPackage;
+    private boolean mHasTouchScreen;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getTargetContext();
+        mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        final PackageManager packageManager = mContext.getPackageManager();
+
+        mHasTouchScreen = packageManager.hasSystemFeature(PackageManager.FEATURE_TOUCHSCREEN)
+                || packageManager.hasSystemFeature(PackageManager.FEATURE_FAKETOUCH);
+
+        Intent launcherIntent = new Intent(Intent.ACTION_MAIN);
+        launcherIntent.addCategory(Intent.CATEGORY_HOME);
+        mLauncherPackage = packageManager.resolveActivity(launcherIntent,
+                PackageManager.MATCH_DEFAULT_ONLY).activityInfo.packageName;
+    }
+
+    @Test
+    public void mediaOutputDialog_correctDialog() {
+        assumeTrue(mHasTouchScreen);
+        launchMediaOutputDialog();
+
+        assertThat(mDevice.wait(Until.hasObject(MEDIA_DIALOG_SELECTOR), TIMEOUT)).isTrue();
+    }
+
+    private void launchMediaOutputDialog() {
+        mDevice.pressHome();
+        mDevice.wait(Until.hasObject(By.pkg(mLauncherPackage).depth(0)), TIMEOUT);
+
+        Intent intent = new Intent();
+        intent.setPackage(SYSTEMUI_PACKAGE_NAME)
+                .setAction(ACTION_LAUNCH_MEDIA_OUTPUT_DIALOG)
+                .putExtra(EXTRA_PACKAGE_NAME, TEST_PACKAGE_NAME);
+
+        mContext.sendBroadcast(intent);
+    }
+
+}
diff --git a/tests/tests/taskfpscallback/Android.bp b/tests/tests/taskfpscallback/Android.bp
new file mode 100644
index 0000000..8a89132
--- /dev/null
+++ b/tests/tests/taskfpscallback/Android.bp
@@ -0,0 +1,46 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsTaskFpsCallbackTestCases",
+    defaults: ["cts_defaults"],
+
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+
+    libs: [
+        "android.test.base",
+        "android.test.runner",
+    ],
+
+    static_libs: [
+        "androidx.test.core",
+        "compatibility-device-util-axt",
+        "ctsdeviceutillegacy-axt",
+        "ctstestrunner-axt",
+        "ctstestserver",
+        "junit",
+        "truth-prebuilt",
+    ],
+
+    srcs: ["src/**/*.java"],
+
+    sdk_version: "test_current",
+}
diff --git a/tests/tests/taskfpscallback/AndroidManifest.xml b/tests/tests/taskfpscallback/AndroidManifest.xml
new file mode 100644
index 0000000..f7bd875
--- /dev/null
+++ b/tests/tests/taskfpscallback/AndroidManifest.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2022 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+     package="android.taskfpscallback.cts">
+
+    <application>
+        <uses-library android:name="android.test.runner"/>
+        <activity android:name=".TaskFpsCallbackCtsActivity"
+                  android:label="TaskFpsCallbackCtsActivity"
+                  android:visibleToInstantApps="true"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+         android:targetPackage="android.taskfpscallback.cts"
+         android:label="CTS tests of android TaskFpsCallback service">
+        <meta-data android:name="listener"
+             android:value="com.android.cts.runner.CtsTestRunListener"/>
+    </instrumentation>
+</manifest>
diff --git a/tests/tests/taskfpscallback/AndroidTest.xml b/tests/tests/taskfpscallback/AndroidTest.xml
new file mode 100644
index 0000000..5a41eb4
--- /dev/null
+++ b/tests/tests/taskfpscallback/AndroidTest.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<configuration description="Config for CTS TaskFpsCallback test cases">
+    <option name="test-suite-tag" value="cts" />
+
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsTaskFpsCallbackTestCases.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.taskfpscallback.cts" />
+    </test>
+</configuration>
diff --git a/tests/tests/taskfpscallback/OWNERS b/tests/tests/taskfpscallback/OWNERS
new file mode 100644
index 0000000..d0186b0
--- /dev/null
+++ b/tests/tests/taskfpscallback/OWNERS
@@ -0,0 +1,3 @@
+# Bug component: 878256
+lpy@google.com
+xwxw@google.com
diff --git a/tests/tests/taskfpscallback/TEST_MAPPING b/tests/tests/taskfpscallback/TEST_MAPPING
new file mode 100644
index 0000000..4db2309
--- /dev/null
+++ b/tests/tests/taskfpscallback/TEST_MAPPING
@@ -0,0 +1,8 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsTaskFpsCallbackTestCases"
+    }
+  ]
+}
+
diff --git a/tests/tests/taskfpscallback/src/android/taskfpscallback/cts/TaskFpsCallbackCtsActivity.java b/tests/tests/taskfpscallback/src/android/taskfpscallback/cts/TaskFpsCallbackCtsActivity.java
new file mode 100644
index 0000000..284de4e
--- /dev/null
+++ b/tests/tests/taskfpscallback/src/android/taskfpscallback/cts/TaskFpsCallbackCtsActivity.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2022 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 android.taskfpscallback.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class TaskFpsCallbackCtsActivity extends Activity {
+
+    private static final String TAG = "TaskFpsCallbackCtsActivity";
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+}
diff --git a/tests/tests/taskfpscallback/src/android/taskfpscallback/cts/TaskFpsCallbackCtsTest.java b/tests/tests/taskfpscallback/src/android/taskfpscallback/cts/TaskFpsCallbackCtsTest.java
new file mode 100644
index 0000000..44cf60d
--- /dev/null
+++ b/tests/tests/taskfpscallback/src/android/taskfpscallback/cts/TaskFpsCallbackCtsTest.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2022 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 android.taskfpscallback.cts;
+
+import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
+
+import static org.junit.Assert.assertThrows;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.view.WindowManager;
+import android.window.TaskFpsCallback;
+
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.ShellIdentityUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@RunWith(AndroidJUnit4.class)
+public class TaskFpsCallbackCtsTest {
+    private static final String TAG = "TaskFpsCallbackCtsTest";
+
+    private TaskFpsCallbackCtsActivity mActivity;
+    private Context mContext;
+    private WindowManager mWindowManager;
+
+    @Rule
+    public ActivityScenarioRule<TaskFpsCallbackCtsActivity> mActivityRule =
+            new ActivityScenarioRule<>(TaskFpsCallbackCtsActivity.class);
+
+    @Before
+    public void setUp() {
+        mActivityRule.getScenario().onActivity(activity -> {
+            mActivity = activity;
+        });
+
+        final Instrumentation instrumentation = getInstrumentation();
+        mContext = instrumentation.getContext();
+        mWindowManager = mContext.getSystemService(WindowManager.class);
+    }
+
+    @Test
+    public void testRegister() throws Exception {
+        final TaskFpsCallback callback = new TaskFpsCallback() {
+            @Override
+            public void onFpsReported(float fps) {
+                // Ignore
+            }
+        };
+
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mWindowManager,
+                (windowManager) -> windowManager.registerTaskFpsCallback(
+                        mActivity.getTaskId(), Runnable::run, callback),
+                "android.permission.ACCESS_FPS_COUNTER");
+
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mWindowManager,
+                (windowManager) -> windowManager.unregisterTaskFpsCallback(callback),
+                "android.permission.ACCESS_FPS_COUNTER");
+    }
+
+    @Test
+    public void testRegisterWithoutPermission() {
+        final TaskFpsCallback callback = new TaskFpsCallback() {
+            @Override
+            public void onFpsReported(float fps) {
+                // Ignore
+            }
+        };
+        assertThrows(SecurityException.class, () -> mWindowManager.registerTaskFpsCallback(
+                mActivity.getTaskId(), Runnable::run, callback));
+    }
+}
diff --git a/tests/tests/telecom/Android.bp b/tests/tests/telecom/Android.bp
index 437743a..c056b0a 100644
--- a/tests/tests/telecom/Android.bp
+++ b/tests/tests/telecom/Android.bp
@@ -76,6 +76,7 @@
         "Api29InCallServiceTestApp/**/I*.aidl",
         "ThirdPtyDialerTestApp/**/*.java",
         "ThirdPtyDialerTestAppTwo/**/*.java",
+        "CarModeTestAppSelfManaged/**/*.java",
         "CarModeTestAppTwo/**/*.java",
     ],
     exclude_srcs: [
diff --git a/tests/tests/telecom/AndroidTest.xml b/tests/tests/telecom/AndroidTest.xml
index 8f17802..8ff4752 100644
--- a/tests/tests/telecom/AndroidTest.xml
+++ b/tests/tests/telecom/AndroidTest.xml
@@ -30,6 +30,7 @@
         <option name="test-file-name" value="CallScreeningServiceTestApp.apk" />
         <option name="test-file-name" value="CarModeTestApp.apk" />
         <option name="test-file-name" value="CarModeTestAppTwo.apk" />
+        <option name="test-file-name" value="CarModeTestAppSelfManaged.apk" />
         <option name="test-file-name" value="ThirdPtyDialerTestApp.apk" />
         <option name="test-file-name" value="ThirdPtyDialerTestAppTwo.apk" />
     </target_preparer>
diff --git a/tests/tests/telecom/CarModeTestAppSelfManaged/Android.bp b/tests/tests/telecom/CarModeTestAppSelfManaged/Android.bp
new file mode 100644
index 0000000..edc9f63
--- /dev/null
+++ b/tests/tests/telecom/CarModeTestAppSelfManaged/Android.bp
@@ -0,0 +1,38 @@
+// Copyright (C) 2019 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CarModeTestAppSelfManaged",
+    defaults: ["cts_defaults"],
+    srcs: [
+        "src/**/*.java",
+        ":car-mode-app-srcs",
+        ":car-mode-app-aidl",
+    ],
+    static_libs: [
+        "compatibility-device-util-axt",
+        "ctstestrunner-axt",
+        "androidx.test.rules",
+        "CtsTelecomMockLib",
+    ],
+    sdk_version: "test_current",
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
diff --git a/tests/tests/telecom/CarModeTestAppSelfManaged/AndroidManifest.xml b/tests/tests/telecom/CarModeTestAppSelfManaged/AndroidManifest.xml
new file mode 100644
index 0000000..c792dfd
--- /dev/null
+++ b/tests/tests/telecom/CarModeTestAppSelfManaged/AndroidManifest.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2019 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.telecom.cts.carmodetestappselfmanaged"
+          android:versionCode="1"
+          android:versionName="1.0">
+
+    <uses-permission android:name="android.permission.MANAGE_OWN_CALLS" />
+    <uses-permission android:name="android.permission.BIND_TELECOM_CONNECTION_SERVICE" />
+
+    <application android:label="CarModeTestAppSelfManaged">
+        <service android:name=".CtsCarModeInCallServiceSelfManaged"
+                 android:permission="android.permission.BIND_INCALL_SERVICE"
+                 android:launchMode="singleInstance"
+                 android:exported="true">
+            <meta-data android:name="android.telecom.IN_CALL_SERVICE_CAR_MODE_UI"
+                       android:value="true"/>
+            <meta-data android:name="android.telecom.INCLUDE_EXTERNAL_CALLS"
+                       android:value="true" />
+            <meta-data android:name="android.telecom.INCLUDE_SELF_MANAGED_CALLS"
+                       android:value="true" />
+            <intent-filter>
+                <action android:name="android.telecom.InCallService"/>
+            </intent-filter>
+        </service>
+
+        <service android:name=".CtsCarModeInCallServiceControlSelfManaged"
+                 android:launchMode="singleInstance"
+                 android:exported="true">
+            <intent-filter>
+                <action
+                    android:name="android.telecom.cts.carmodetestapp.ACTION_CAR_MODE_CONTROL"/>
+            </intent-filter>
+        </service>
+
+        <service android:name="android.telecom.cts.CtsSelfManagedConnectionService"
+                 android:permission="android.permission.BIND_TELECOM_CONNECTION_SERVICE"
+                 android:exported="true">
+            <intent-filter>
+                <action android:name="android.telecom.ConnectionService"/>
+            </intent-filter>
+        </service>
+
+    </application>
+</manifest>
\ No newline at end of file
diff --git a/tests/tests/telecom/CarModeTestAppSelfManaged/src/android/telecom/cts/carmodetestappselfmanaged/CtsCarModeInCallServiceControlSelfManaged.java b/tests/tests/telecom/CarModeTestAppSelfManaged/src/android/telecom/cts/carmodetestappselfmanaged/CtsCarModeInCallServiceControlSelfManaged.java
new file mode 100644
index 0000000..b6d5c10
--- /dev/null
+++ b/tests/tests/telecom/CarModeTestAppSelfManaged/src/android/telecom/cts/carmodetestappselfmanaged/CtsCarModeInCallServiceControlSelfManaged.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2019 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 android.telecom.cts.carmodetestappselfmanaged;
+
+import android.telecom.cts.carmodetestapp.CtsCarModeInCallServiceControl;
+
+public class CtsCarModeInCallServiceControlSelfManaged extends CtsCarModeInCallServiceControl {
+}
diff --git a/tests/tests/telecom/CarModeTestAppSelfManaged/src/android/telecom/cts/carmodetestappselfmanaged/CtsCarModeInCallServiceSelfManaged.java b/tests/tests/telecom/CarModeTestAppSelfManaged/src/android/telecom/cts/carmodetestappselfmanaged/CtsCarModeInCallServiceSelfManaged.java
new file mode 100644
index 0000000..e7b29e3
--- /dev/null
+++ b/tests/tests/telecom/CarModeTestAppSelfManaged/src/android/telecom/cts/carmodetestappselfmanaged/CtsCarModeInCallServiceSelfManaged.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright (C) 2019 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 android.telecom.cts.carmodetestappselfmanaged;
+
+import android.telecom.cts.carmodetestapp.CtsCarModeInCallService;
+
+public class CtsCarModeInCallServiceSelfManaged extends CtsCarModeInCallService {
+}
diff --git a/tests/tests/telecom/aidl/android/telecom/cts/carmodetestapp/ICtsCarModeInCallServiceControl.aidl b/tests/tests/telecom/aidl/android/telecom/cts/carmodetestapp/ICtsCarModeInCallServiceControl.aidl
index 5357afb..69cc839 100644
--- a/tests/tests/telecom/aidl/android/telecom/cts/carmodetestapp/ICtsCarModeInCallServiceControl.aidl
+++ b/tests/tests/telecom/aidl/android/telecom/cts/carmodetestapp/ICtsCarModeInCallServiceControl.aidl
@@ -15,6 +15,8 @@
  */
 
 package android.telecom.cts.carmodetestapp;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.PhoneAccount;
 
 interface ICtsCarModeInCallServiceControl {
     boolean isBound();
@@ -27,4 +29,8 @@
     boolean requestAutomotiveProjection();
     void releaseAutomotiveProjection();
     boolean checkBindStatus(boolean bind);
-}
+    List<PhoneAccountHandle> getSelfManagedPhoneAccounts();
+    List<PhoneAccountHandle> getOwnSelfManagedPhoneAccounts();
+    void registerPhoneAccount(in PhoneAccount phoneAccount);
+    void unregisterPhoneAccount(in PhoneAccountHandle phoneAccountHandle);
+}
\ No newline at end of file
diff --git a/tests/tests/telecom/src/android/telecom/cts/CarModeInCallServiceTest.java b/tests/tests/telecom/src/android/telecom/cts/CarModeInCallServiceTest.java
index 254b3d3..57af2d1 100644
--- a/tests/tests/telecom/src/android/telecom/cts/CarModeInCallServiceTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/CarModeInCallServiceTest.java
@@ -25,25 +25,20 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
-import android.content.res.Configuration;
 import android.content.pm.PackageManager;
+import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.telecom.TelecomManager;
 import android.telecom.cts.carmodetestapp.ICtsCarModeInCallServiceControl;
-import android.util.Log;
 
 import androidx.test.InstrumentationRegistry;
 
 import junit.framework.AssertionFailedError;
 
-import org.junit.Assert;
-import org.junit.Test;
-
 import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
 public class CarModeInCallServiceTest extends BaseTelecomTestWithMockServices {
@@ -574,6 +569,29 @@
         mInCallCallbacks.getService().disconnectAllCalls();
     }
 
+    public void testNoSwitchToCarModeWhenDisabledCarModeAppAutomotiveProjection() throws Exception {
+        if (!mShouldTestTelecom) {
+            return;
+        }
+        if (mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH)) {
+            return;
+        }
+
+        mContext.getPackageManager().setApplicationEnabledSetting(CARMODE_APP1_PACKAGE,
+                COMPONENT_ENABLED_STATE_DISABLED, DONT_KILL_APP);
+        mInCallCallbacks.resetLatch();
+
+        // Place a call and verify it went to the default dialer
+        placeAndVerifyCall();
+        verifyConnectionForOutgoingCall();
+
+        // Now, request automotive projection; shouldn't unbind from default dialer.
+        requestAndVerifyAutomotiveProjection(mCarModeIncallServiceControlOne, true);
+        assertFalse(mInCallCallbacks.waitForUnbind());
+
+        releaseAutomotiveProjection(mCarModeIncallServiceControlOne);
+    }
+
 
     /**
      * Places a call without verifying it is handled by the default dialer InCallService.
diff --git a/tests/tests/telecom/src/android/telecom/cts/EmergencyCallTests.java b/tests/tests/telecom/src/android/telecom/cts/EmergencyCallTests.java
index a1d9e6d..c9dac92 100644
--- a/tests/tests/telecom/src/android/telecom/cts/EmergencyCallTests.java
+++ b/tests/tests/telecom/src/android/telecom/cts/EmergencyCallTests.java
@@ -21,11 +21,18 @@
 import android.provider.CallLog;
 import android.telecom.Call;
 import android.telecom.Connection;
+import android.telecom.DisconnectCause;
+import android.telecom.PhoneAccount;
 
-import java.util.concurrent.CountDownLatch;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import java.util.ArrayList;
 
 public class EmergencyCallTests extends BaseTelecomTestWithMockServices {
 
+    // mirrors constant in PhoneAccountRegistrar called MAX_PHONE_ACCOUNT_REGISTRATIONS
+    public static final int MAX_PHONE_ACCOUNT_REGISTRATIONS = 10;
+
     @Override
     public void setUp() throws Exception {
         // Sets up this package as default dialer in super.
@@ -37,16 +44,68 @@
     }
 
     /**
+     * Tests a scenario where an emergency call could fail due to the presence of invalid
+     * {@link PhoneAccount} data.
+     * The seed and quantity for {@link TestUtils#generateRandomPhoneAccounts(long, int, String,
+     * String)} is chosen to represent a set of phone accounts which is known in AOSP to cause a
+     * failure placing an emergency call.  {@code 52L} was chosen as a random seed and {@code 50}
+     * was chosen as the set size for {@link PhoneAccount}s as these were observed in repeated test
+     * invocations to induce the failure method.
+     */
+    public void testEmergencyCallFailureDueToInvalidPhoneAccounts() throws Exception {
+        if (!mShouldTestTelecom) return;
+
+        // needed in order to call mTelecomManager.getPhoneAccountsForPackage()
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .adoptShellPermissionIdentity("android.permission.READ_PRIVILEGED_PHONE_STATE");
+
+        // determine the number of phone accounts already registered to this package.
+        int phoneAccountsRegisteredAlready = mTelecomManager.getPhoneAccountsForPackage().size();
+
+        // now, determine the number of accounts remaining
+        int numberOfAccountsThatCanBeRegistered =
+                MAX_PHONE_ACCOUNT_REGISTRATIONS - phoneAccountsRegisteredAlready;
+
+        // create the remaining phone accounts allowed
+        ArrayList<PhoneAccount> accounts = TestUtils.generateRandomPhoneAccounts(52L,
+                numberOfAccountsThatCanBeRegistered,
+                TestUtils.PACKAGE, TestUtils.COMPONENT);
+
+        try {
+            // register the phone accounts
+            accounts.stream().forEach(a -> mTelecomManager.registerPhoneAccount(a));
+            // assert all were registered successfully
+            assertTrue(mTelecomManager.getPhoneAccountsForPackage().size()
+                    >= MAX_PHONE_ACCOUNT_REGISTRATIONS);
+
+            // The existing start emergency call test is impacted if there is a failure due to
+            // excess phone accounts being present.
+            testStartEmergencyCall();
+        } finally {
+            accounts.stream().forEach(d -> mTelecomManager.unregisterPhoneAccount(
+                    d.getAccountHandle()));
+            // cleanup permission that was added
+            InstrumentationRegistry.getInstrumentation()
+                    .getUiAutomation().dropShellPermissionIdentity();
+        }
+    }
+
+    /**
      * Place an outgoing emergency call and ensure it is started successfully.
      */
     public void testStartEmergencyCall() throws Exception {
         if (!mShouldTestTelecom) return;
-        placeAndVerifyEmergencyCall(true /*supportsHold*/);
+        Connection conn = placeAndVerifyEmergencyCall(true /*supportsHold*/);
         Call eCall = getInCallService().getLastCall();
         assertCallState(eCall, Call.STATE_DIALING);
 
         assertIsInCall(true);
         assertIsInManagedCall(true);
+        conn.setActive();
+        conn.setDisconnected(new DisconnectCause(DisconnectCause.LOCAL));
+        conn.destroy();
+        assertConnectionState(conn, Connection.STATE_DISCONNECTED);
+        assertIsInCall(false);
     }
 
     /**
diff --git a/tests/tests/telecom/src/android/telecom/cts/InCallServiceFlagChecker.java b/tests/tests/telecom/src/android/telecom/cts/InCallServiceFlagChecker.java
new file mode 100644
index 0000000..33e611c
--- /dev/null
+++ b/tests/tests/telecom/src/android/telecom/cts/InCallServiceFlagChecker.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2022 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 android.telecom.cts;
+
+import android.content.Context;
+import android.util.Log;
+
+/**
+ * The CTS test class InCallServiceFlagChecker is meant to check flags passed into InCallController.
+ * Flags passed in InCallController can cause unwanted behavior.
+ */
+public class InCallServiceFlagChecker extends BaseTelecomTestWithMockServices {
+
+    public static final String LOG_TAG = InCallServiceFlagChecker.class.getName();
+    public static final String TARGET_SERVICE = ".MockInCallService:system";
+    public static final String DUMPSYS_COMMAND = "dumpsys activity services android.telecom.cts";
+    public static final String FLAGS_TEXT_MATCHER = "flags=0x";
+    public static final int FLAGS_OFFSET = FLAGS_TEXT_MATCHER.length();
+    public static final char SPACE_CHAR = ' ';
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+        NewOutgoingCallBroadcastReceiver.reset();
+        if (mShouldTestTelecom) {
+            setupConnectionService(null, FLAG_REGISTER | FLAG_ENABLE);
+        }
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        TestUtils.clearSystemDialerOverride(getInstrumentation());
+        TestUtils.removeTestEmergencyNumber(getInstrumentation(), TEST_EMERGENCY_NUMBER);
+    }
+
+    /**
+     * CTS test to ensure InCallService bindings DO NOT have BIND_ABOVE_CLIENT flag set on binding.
+     */
+    public void testIsBindAboveClientFlagSet() throws Exception {
+        if (!mShouldTestTelecom) {
+            return;
+        }
+
+        // Trigger InCallService so flags can be examined. Otherwise, the service will not show
+        // up when the dumpsys command is executed.
+        placeAndVerifyCall();
+        verifyConnectionForOutgoingCall();
+
+        // Dump the testing package, android.telecom.cts, service information. Doing so will expose
+        // if the BIND_ABOVE_CLIENT flag is set or not on our target InCallService.
+        String dumpOutput = TestUtils.executeShellCommand(getInstrumentation(), DUMPSYS_COMMAND);
+        assertNotNull(dumpOutput);
+        assertTrue(dumpOutput.length() > 0);
+        Log.i(LOG_TAG, dumpOutput);
+
+        // Take off chunk of unwanted pretext.
+        String targetSection = dumpOutput.substring(dumpOutput.indexOf(TARGET_SERVICE));
+        assertNotNull(targetSection);
+        assertTrue(targetSection.length() > 0);
+        Log.i(LOG_TAG, targetSection);
+
+        // extract the TARGET_SERVICE flags
+        int flagsValue = extractFlagsValue(targetSection);
+
+        // assert the Context.BIND_ABOVE_CLIENT flag is not set!
+        assertTrue((flagsValue & Context.BIND_ABOVE_CLIENT) != Context.BIND_ABOVE_CLIENT);
+    }
+
+
+    /**
+     * Find the first flag section of the given string which contains ConnectionRecordObject's
+     *
+     * @param s ConnectionRecordObject in string format.
+     * @return flags decimal value in the ConnectionRecordObject.
+     */
+    public int extractFlagsValue(String s) {
+        // builder to pull flag digits from dumped text
+        StringBuilder sb = new StringBuilder();
+
+        // find the flags=0x text to begin pulling flag digits
+        int i = s.indexOf(FLAGS_TEXT_MATCHER) + FLAGS_OFFSET;
+        int n = s.length();
+
+        // If (i == -1) then this means the flag information was never found.
+        assertTrue(i != -1); // assert we found flag info
+
+        // stop when either there is no more text or a space is encountered
+        while (i < n && s.charAt(i) != SPACE_CHAR) {
+            sb.append(s.charAt(i));
+            i++;
+        }
+
+        // convert string builder into string
+        String extractedFlagAsString = sb.toString();
+        assertNotNull(extractedFlagAsString);
+        assertTrue(extractedFlagAsString.length() > 0);
+        Log.i(LOG_TAG, extractedFlagAsString);
+
+        // convert the string into and integer and return value
+        return Integer.parseInt(extractedFlagAsString);
+    }
+}
diff --git a/tests/tests/telecom/src/android/telecom/cts/IncomingCallTest.java b/tests/tests/telecom/src/android/telecom/cts/IncomingCallTest.java
index 75594c3..8fa54f1 100644
--- a/tests/tests/telecom/src/android/telecom/cts/IncomingCallTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/IncomingCallTest.java
@@ -172,6 +172,50 @@
     }
 
     /**
+     * This test verifies that the local ringtone is not played when the call has an in_band
+     * ringtone associated with it.
+     */
+    public void testExtraCallHasInBandRingtone() throws Exception {
+        if (!mShouldTestTelecom) {
+            return;
+        }
+        ShellIdentityUtils.invokeStaticMethodWithShellPermissions(
+                (ShellIdentityUtils.StaticShellPermissionMethodHelper<Void>) () -> {
+                    RingtoneManager.setActualDefaultRingtoneUri(mContext,
+                            RingtoneManager.TYPE_RINGTONE,
+                            Settings.System.DEFAULT_RINGTONE_URI);
+                    return null;
+                });
+        LinkedBlockingQueue<Boolean> queue = new LinkedBlockingQueue(1);
+        setupConnectionService(null, FLAG_REGISTER | FLAG_ENABLE);
+        AudioManager audioManager = mContext.getSystemService(AudioManager.class);
+        AudioManager.AudioPlaybackCallback callback = new AudioManager.AudioPlaybackCallback() {
+            @Override
+            public void onPlaybackConfigChanged(List<AudioPlaybackConfiguration> configs) {
+                super.onPlaybackConfigChanged(configs);
+                boolean isPlayingRingtone = configs.stream()
+                        .anyMatch(c -> c.getAudioAttributes().getUsage()
+                                == USAGE_NOTIFICATION_RINGTONE);
+                if (isPlayingRingtone && queue.isEmpty()) {
+                    queue.add(isPlayingRingtone);
+                }
+            }
+        };
+        audioManager.registerAudioPlaybackCallback(callback, new Handler(Looper.getMainLooper()));
+        Bundle extras = new Bundle();
+        extras.putBoolean(TelecomManager.EXTRA_CALL_HAS_IN_BAND_RINGTONE, true);
+        Uri testNumber = createTestNumber();
+        addAndVerifyNewIncomingCall(testNumber, extras);
+        verifyConnectionForIncomingCall();
+        verifyPhoneStateListenerCallbacksForCall(CALL_STATE_RINGING,
+                testNumber.getSchemeSpecificPart());
+        Boolean ringing = queue.poll(WAIT_FOR_STATE_CHANGE_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        // ringing should be null as the state should not change (no ringing)
+        assertNull("Telecom should not have played a ringtone.", ringing);
+        audioManager.unregisterAudioPlaybackCallback(callback);
+    }
+
+    /**
      * Tests to be sure that new incoming calls can only be added using a valid PhoneAccountHandle
      * (b/26864502). If a PhoneAccount has not been registered for the PhoneAccountHandle, then
      * a SecurityException will be thrown.
diff --git a/tests/tests/telecom/src/android/telecom/cts/MockInCallService.java b/tests/tests/telecom/src/android/telecom/cts/MockInCallService.java
index 79ef2e5..d874d55 100644
--- a/tests/tests/telecom/src/android/telecom/cts/MockInCallService.java
+++ b/tests/tests/telecom/src/android/telecom/cts/MockInCallService.java
@@ -30,9 +30,12 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
 
 public class MockInCallService extends InCallService {
+    private static final long TEST_TIMEOUT = 5000L;
     private static String LOG_TAG = "MockInCallService";
     private final List<Call> mCalls = Collections.synchronizedList(new ArrayList<>());
     private final List<Call> mConferenceCalls = Collections.synchronizedList(new ArrayList<>());
@@ -42,6 +45,8 @@
 
     protected static final Object sLock = new Object();
     private static boolean mIsServiceBound = false;
+    private static CountDownLatch sBindLatch = new CountDownLatch(1);
+    private static CountDownLatch sUnbindLatch = new CountDownLatch(1);
 
     public static abstract class InCallServiceCallbacks {
         private MockInCallService mService;
@@ -80,6 +85,19 @@
         public void resetLock() {
             lock = new Semaphore(0);
         }
+
+        public void resetLatch() {
+            sBindLatch = new CountDownLatch(1);
+            sUnbindLatch = new CountDownLatch(1);
+        }
+
+        public boolean waitForUnbind() {
+            try {
+                return sUnbindLatch.await(TEST_TIMEOUT, TimeUnit.MILLISECONDS);
+            } catch (InterruptedException e) {
+                return false;
+            }
+        }
     }
 
     /**
diff --git a/tests/tests/telecom/src/android/telecom/cts/NullBindingConnectionService.java b/tests/tests/telecom/src/android/telecom/cts/NullBindingConnectionService.java
index 1debb7a..161d3ef 100644
--- a/tests/tests/telecom/src/android/telecom/cts/NullBindingConnectionService.java
+++ b/tests/tests/telecom/src/android/telecom/cts/NullBindingConnectionService.java
@@ -35,15 +35,17 @@
 
     @Override
     public IBinder onBind(Intent intent) {
-        sBindLatch.countDown();
+        CountDownLatch latch = sBindLatch;
         sUnbindLatch = new CountDownLatch(1);
+        latch.countDown();
         return null;
     }
 
     @Override
     public boolean onUnbind(Intent intent) {
-        sUnbindLatch.countDown();
+        CountDownLatch latch = sUnbindLatch;
         sBindLatch = new CountDownLatch(1);
+        latch.countDown();
         return false;
     }
 }
diff --git a/tests/tests/telecom/src/android/telecom/cts/PhoneAccountOperationsTest.java b/tests/tests/telecom/src/android/telecom/cts/PhoneAccountOperationsTest.java
index 5815aed..8fd9e0d 100644
--- a/tests/tests/telecom/src/android/telecom/cts/PhoneAccountOperationsTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/PhoneAccountOperationsTest.java
@@ -27,7 +27,6 @@
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
 import android.test.InstrumentationTestCase;
-import android.text.TextUtils;
 
 import com.android.compatibility.common.util.ShellIdentityUtils;
 
@@ -104,6 +103,17 @@
                     PhoneAccount.SCHEME_TEL, PhoneAccount.SCHEME_VOICEMAIL))
             .build();
 
+    private static PhoneAccount copyPhoneAccountAndOverrideCapabilities(
+            PhoneAccount base, int newCapabilities) {
+        return base.toBuilder().setCapabilities(newCapabilities).build();
+    }
+
+    private static PhoneAccount copyPhoneAccountAndAddCapabilities(
+            PhoneAccount base, int capabilitiesToAdd) {
+        return copyPhoneAccountAndOverrideCapabilities(
+                base, base.getCapabilities() | capabilitiesToAdd);
+    }
+
     private Context mContext;
     private TelecomManager mTelecomManager;
 
@@ -304,4 +314,88 @@
             TestUtils.setDefaultDialer(getInstrumentation(), previousDefaultDialer);
         }
     }
+
+    public void testRegisterPhoneAccount_VoiceIndicationCapabilities_NoPrerequisiteCapabilities()
+            throws Exception {
+        if (!shouldTestTelecom(mContext)) {
+            return;
+        }
+        try {
+            mTelecomManager.registerPhoneAccount(
+                    copyPhoneAccountAndAddCapabilities(
+                            TEST_NO_SIM_PHONE_ACCOUNT,
+                            PhoneAccount.CAPABILITY_SUPPORTS_VOICE_CALLING_INDICATIONS));
+            fail("TelecomManager.registerPhoneAccount should throw SecurityException if "
+                    + "PhoneAccounts declare CAPABILITY_SUPPORTS_VOICE_CALLING_INDICATIONS but not "
+                    + "CAPABILITY_SIM_SUBSCRIPTION or CAPABILITY_CONNECTION_MANAGER");
+        } catch (SecurityException e) {
+            // expected
+        }
+        try {
+            mTelecomManager.registerPhoneAccount(
+                    copyPhoneAccountAndAddCapabilities(
+                            TEST_NO_SIM_PHONE_ACCOUNT,
+                            PhoneAccount.CAPABILITY_VOICE_CALLING_AVAILABLE));
+            fail("TelecomManager.registerPhoneAccount should throw SecurityException if "
+                    + "PhoneAccounts declare CAPABILITY_VOICE_CALLING_AVAILABLE but not "
+                    + "CAPABILITY_SIM_SUBSCRIPTION or CAPABILITY_CONNECTION_MANAGER");
+        } catch (SecurityException e) {
+            // expected
+        }
+        try {
+            mTelecomManager.registerPhoneAccount(
+                    copyPhoneAccountAndAddCapabilities(
+                            TEST_NO_SIM_PHONE_ACCOUNT,
+                            PhoneAccount.CAPABILITY_SUPPORTS_VOICE_CALLING_INDICATIONS
+                                    | PhoneAccount.CAPABILITY_VOICE_CALLING_AVAILABLE));
+            fail("TelecomManager.registerPhoneAccount should throw SecurityException if "
+                    + "PhoneAccounts declare CAPABILITY_SUPPORTS_VOICE_CALLING_INDICATIONS and "
+                    + "CAPABILITY_VOICE_CALLING_AVAILABLE but not CAPABILITY_SIM_SUBSCRIPTION or "
+                    + "CAPABILITY_CONNECTION_MANAGER");
+        } catch (SecurityException e) {
+            // expected
+        }
+    }
+
+    public void testRegisterPhoneAccount_VoiceIndicationCapabilities_SimSubscription()
+            throws Exception {
+        if (!shouldTestTelecom(mContext)) {
+            return;
+        }
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                mTelecomManager,
+                tm ->
+                        tm.registerPhoneAccount(
+                                copyPhoneAccountAndAddCapabilities(
+                                        TEST_SIM_PHONE_ACCOUNT,
+                                        PhoneAccount
+                                                .CAPABILITY_SUPPORTS_VOICE_CALLING_INDICATIONS)),
+                "android.permission.REGISTER_SIM_SUBSCRIPTION");
+        PhoneAccount retrievedPhoneAccount =
+                mTelecomManager.getPhoneAccount(TEST_PHONE_ACCOUNT_HANDLE);
+        assertTrue(
+                "Phone account should have call SIM subscription & voice indication capability.",
+                retrievedPhoneAccount.hasCapabilities(
+                        PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION
+                                | PhoneAccount.CAPABILITY_SUPPORTS_VOICE_CALLING_INDICATIONS));
+
+        // Adding in CAPABILITY_VOICE_CALLING_AVAILABLE is how the account dynamically indicates
+        // whether it can _currently_ place voice calls or not.
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                mTelecomManager,
+                tm ->
+                        tm.registerPhoneAccount(
+                                copyPhoneAccountAndAddCapabilities(
+                                        TEST_SIM_PHONE_ACCOUNT,
+                                        PhoneAccount.CAPABILITY_SUPPORTS_VOICE_CALLING_INDICATIONS
+                                                | PhoneAccount.CAPABILITY_VOICE_CALLING_AVAILABLE)),
+                "android.permission.REGISTER_SIM_SUBSCRIPTION");
+        retrievedPhoneAccount = mTelecomManager.getPhoneAccount(TEST_PHONE_ACCOUNT_HANDLE);
+        assertTrue(
+                "Phone account should have call SIM subscription & voice indication capabilities.",
+                retrievedPhoneAccount.hasCapabilities(
+                        PhoneAccount.CAPABILITY_SIM_SUBSCRIPTION
+                                | PhoneAccount.CAPABILITY_SUPPORTS_VOICE_CALLING_INDICATIONS
+                                | PhoneAccount.CAPABILITY_VOICE_CALLING_AVAILABLE));
+    }
 }
diff --git a/tests/tests/telecom/src/android/telecom/cts/PhoneAccountRegistrarTest.java b/tests/tests/telecom/src/android/telecom/cts/PhoneAccountRegistrarTest.java
new file mode 100644
index 0000000..afc00e7
--- /dev/null
+++ b/tests/tests/telecom/src/android/telecom/cts/PhoneAccountRegistrarTest.java
@@ -0,0 +1,289 @@
+/*
+ * Copyright (C) 2021 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 android.telecom.cts;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.cts.carmodetestapp.ICtsCarModeInCallServiceControl;
+import android.telecom.cts.carmodetestappselfmanaged.CtsCarModeInCallServiceControlSelfManaged;
+import android.util.Log;
+
+import com.android.compatibility.common.util.ShellIdentityUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+public class PhoneAccountRegistrarTest extends BaseTelecomTestWithMockServices {
+
+    private static final String TAG = "PhoneAccountRegistrarTest";
+    private static final long TIMEOUT = 3000L;
+    public static final long SEED = 52L; // random seed chosen
+    public static final int MAX_PHONE_ACCOUNT_REGISTRATIONS = 10; // mirrors constant in...
+    // PhoneAccountRegistrar called MAX_PHONE_ACCOUNT_REGISTRATIONS
+
+    @Override
+    public void setUp() throws Exception {
+        // Sets up this package as default dialer in super.
+        super.setUp();
+        NewOutgoingCallBroadcastReceiver.reset();
+        if (!mShouldTestTelecom) return;
+        setupConnectionService(null, 0);
+        // cleanup any accounts registered to the test package before starting tests
+        cleanupPhoneAccounts();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        // cleanup any accounts registered to the test package after testing to avoid crashing other
+        // tests.
+        cleanupPhoneAccounts();
+        super.tearDown();
+    }
+
+    /**
+     * Test scenario where a single package can register MAX_PHONE_ACCOUNT_REGISTRATIONS via
+     * {@link android.telecom.TelecomManager#registerPhoneAccount(PhoneAccount)}  without an
+     * exception being thrown.
+     */
+    public void testRegisterMaxPhoneAccountsWithoutException() {
+        if (!mShouldTestTelecom) return;
+
+        // ensure the test starts without any phone accounts registered to the test package
+        cleanupPhoneAccounts();
+
+        //  determine the number of phone accounts that can be registered before hitting limit
+        int numberOfAccountsThatCanBeRegistered = MAX_PHONE_ACCOUNT_REGISTRATIONS
+                - getNumberOfPhoneAccountsRegisteredToTestPackage();
+
+        // create the remaining number of phone accounts via helper function
+        // in order to reach the upper bound MAX_PHONE_ACCOUNT_REGISTRATIONS
+        ArrayList<PhoneAccount> accounts = TestUtils.generateRandomPhoneAccounts(SEED,
+                numberOfAccountsThatCanBeRegistered, TestUtils.PACKAGE, TestUtils.COMPONENT);
+        try {
+            // register all accounts created
+            accounts.stream().forEach(a -> mTelecomManager.registerPhoneAccount(a));
+            // assert the maximum accounts that can be registered were registered successfully
+            assertEquals(MAX_PHONE_ACCOUNT_REGISTRATIONS,
+                    getNumberOfPhoneAccountsRegisteredToTestPackage());
+        } finally {
+            // cleanup accounts registered
+            accounts.stream().forEach(
+                    d -> mTelecomManager.unregisterPhoneAccount(d.getAccountHandle()));
+        }
+    }
+
+    /**
+     * Tests a scenario where a single package exceeds MAX_PHONE_ACCOUNT_REGISTRATIONS and
+     * an {@link IllegalArgumentException}  is thrown. Will fail if no exception is thrown.
+     */
+    public void testExceptionThrownDueUserExceededMaxPhoneAccountRegistrations()
+            throws IllegalArgumentException {
+        if (!mShouldTestTelecom) return;
+
+        // ensure the test starts without any phone accounts registered to the test package
+        cleanupPhoneAccounts();
+
+        // Create MAX_PHONE_ACCOUNT_REGISTRATIONS + 1 via helper function
+        ArrayList<PhoneAccount> accounts = TestUtils.generateRandomPhoneAccounts(SEED,
+                MAX_PHONE_ACCOUNT_REGISTRATIONS + 1, TestUtils.PACKAGE,
+                TestUtils.COMPONENT);
+
+        try {
+            // Try to register more phone accounts than allowed by the upper bound limit
+            // MAX_PHONE_ACCOUNT_REGISTRATIONS
+            accounts.stream().forEach(a -> mTelecomManager.registerPhoneAccount(a));
+            // A successful test should never reach this line of execution.
+            // However, if it does, fail the test by throwing a fail(...)
+            fail("Test failed. The test did not throw an IllegalArgumentException when "
+                    + "registering phone accounts over the upper bound: "
+                    + "MAX_PHONE_ACCOUNT_REGISTRATIONS");
+        } catch (IllegalArgumentException e) {
+            // Assert the IllegalArgumentException was thrown
+            assertNotNull(e.toString());
+        } finally {
+            // Cleanup accounts registered
+            accounts.stream().forEach(d -> mTelecomManager.unregisterPhoneAccount(
+                    d.getAccountHandle()));
+        }
+    }
+
+    /**
+     * Test scenario where two distinct packages register MAX_PHONE_ACCOUNT_REGISTRATIONS via
+     * {@link
+     * android.telecom.TelecomManager#registerPhoneAccount(PhoneAccount)} without an exception being
+     * thrown.
+     * This ensures that PhoneAccountRegistrar is handling {@link PhoneAccount} registrations
+     * to distinct packages correctly.
+     */
+    public void testTwoPackagesRegisterMax() throws Exception {
+        if (!mShouldTestTelecom) return;
+
+        // ensure the test starts without any phone accounts registered to the test package
+        cleanupPhoneAccounts();
+
+        //  determine the number of phone accounts that can be registered to package 1
+        int numberOfAccountsThatCanBeRegisteredToPackage1 = MAX_PHONE_ACCOUNT_REGISTRATIONS
+                - getNumberOfPhoneAccountsRegisteredToTestPackage();
+
+        // Create MAX phone accounts for package 1
+        ArrayList<PhoneAccount> accountsPackage1 = TestUtils.generateRandomPhoneAccounts(SEED,
+                numberOfAccountsThatCanBeRegisteredToPackage1, TestUtils.PACKAGE,
+                TestUtils.COMPONENT);
+
+        // Constants for creating a second package to register phone accounts
+        final String carPkgSelfManaged =
+                CtsCarModeInCallServiceControlSelfManaged.class
+                        .getPackage().getName();
+        final ComponentName carComponentSelfManaged = ComponentName.createRelative(
+                carPkgSelfManaged, CtsCarModeInCallServiceControlSelfManaged.class.getName());
+        final String carModeControl =
+                "android.telecom.cts.carmodetestapp.ACTION_CAR_MODE_CONTROL";
+
+        // Set up binding for second package. This is needed in order to bypass a SecurityException
+        // thrown by a second test package registering phone accounts.
+        TestServiceConnection control = setUpControl(carModeControl,
+                carComponentSelfManaged);
+
+        ICtsCarModeInCallServiceControl carModeIncallServiceControlSelfManaged =
+                ICtsCarModeInCallServiceControl.Stub
+                        .asInterface(control.getService());
+
+        carModeIncallServiceControlSelfManaged.reset(); //... done setting up binding
+
+        // Create MAX phone accounts for package 2
+        ArrayList<PhoneAccount> accountsPackage2 = TestUtils.generateRandomPhoneAccounts(SEED,
+                MAX_PHONE_ACCOUNT_REGISTRATIONS, carPkgSelfManaged,
+                TestUtils.SELF_MANAGED_COMPONENT);
+
+        try {
+
+            // register all accounts for package 1
+            accountsPackage1.stream().forEach(a -> mTelecomManager.registerPhoneAccount(a));
+
+
+            // register all phone accounts for package 2
+            for (int i = 0; i < MAX_PHONE_ACCOUNT_REGISTRATIONS; i++) {
+                carModeIncallServiceControlSelfManaged.registerPhoneAccount(
+                        accountsPackage2.get(i));
+            }
+
+        } finally {
+            // cleanup all phone accounts registered. Note, unregisterPhoneAccount will not
+            // cause a runtime error if no phone account is found when trying to unregister.
+
+            accountsPackage1.stream().forEach(d -> mTelecomManager.unregisterPhoneAccount(
+                    d.getAccountHandle()));
+
+            for (int i = 0; i < MAX_PHONE_ACCOUNT_REGISTRATIONS; i++) {
+                carModeIncallServiceControlSelfManaged.unregisterPhoneAccount(
+                        accountsPackage2.get(i).getAccountHandle());
+            }
+        }
+        // unbind from second package
+        mContext.unbindService(control);
+    }
+
+    // -- The following are helper methods for this testing class. --
+
+    private TestServiceConnection setUpControl(String action, ComponentName componentName) {
+        Intent bindIntent = new Intent(action);
+        bindIntent.setComponent(componentName);
+
+        TestServiceConnection
+                serviceConnection = new TestServiceConnection();
+        mContext.bindService(bindIntent, serviceConnection, Context.BIND_AUTO_CREATE);
+        if (!serviceConnection.waitBind()) {
+            fail("fail bind to service");
+        }
+        return serviceConnection;
+    }
+
+    private class TestServiceConnection implements ServiceConnection {
+        private IBinder mService;
+        private CountDownLatch mLatch = new CountDownLatch(1);
+        private boolean mIsConnected;
+
+        @Override
+        public void onServiceConnected(ComponentName componentName, IBinder service) {
+            Log.i(TAG, "Service Connected: " + componentName);
+            mService = service;
+            mIsConnected = true;
+            mLatch.countDown();
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName componentName) {
+            mService = null;
+        }
+
+        public IBinder getService() {
+            return mService;
+        }
+
+        public boolean waitBind() {
+            try {
+                mLatch.await(TIMEOUT, TimeUnit.MILLISECONDS);
+                return mIsConnected;
+            } catch (InterruptedException e) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Helper that cleans up any phone accounts registered to this testing package.  Requires
+     * the permission READ_PRIVILEGED_PHONE_STATE in order to invoke the
+     * getPhoneAccountsForPackage() method.
+     */
+    private void cleanupPhoneAccounts() {
+        if (mTelecomManager != null) {
+            // Get all handles registered to the testing package
+            List<PhoneAccountHandle> handles = ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelecomManager, (tm) -> tm.getPhoneAccountsForPackage(),
+                    "android.permission.READ_PRIVILEGED_PHONE_STATE");
+
+            // cleanup any extra phone accounts registered to the testing package
+            if (handles.size() > 0 && mTelecomManager != null) {
+                handles.stream().forEach(
+                        d -> mTelecomManager.unregisterPhoneAccount(d));
+            }
+        }
+    }
+
+    /**
+     * Helper that gets the number of phone accounts registered to the testing package. Requires
+     * the permission READ_PRIVILEGED_PHONE_STATE in order to invoke the
+     * getPhoneAccountsForPackage() method.
+     * @return number of phone accounts registered to the testing package.
+     */
+    private int getNumberOfPhoneAccountsRegisteredToTestPackage() {
+        if (mTelecomManager != null) {
+            return ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelecomManager, (tm) -> tm.getPhoneAccountsForPackage(),
+                    "android.permission.READ_PRIVILEGED_PHONE_STATE").size();
+        }
+        return 0;
+    }
+}
+
diff --git a/tests/tests/telecom/src/android/telecom/cts/SelfManagedConnectionTest.java b/tests/tests/telecom/src/android/telecom/cts/SelfManagedConnectionTest.java
index b7c05b7..3e3a1b4 100644
--- a/tests/tests/telecom/src/android/telecom/cts/SelfManagedConnectionTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/SelfManagedConnectionTest.java
@@ -24,13 +24,17 @@
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.res.Configuration;
+import android.graphics.Color;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.IBinder;
-import android.os.RemoteException;
 import android.os.UserHandle;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
 import android.telecom.cts.carmodetestapp.CtsCarModeInCallServiceControl;
 import android.telecom.cts.carmodetestapp.ICtsCarModeInCallServiceControl;
+import android.telecom.cts.carmodetestappselfmanaged.CtsCarModeInCallServiceControlSelfManaged;
 import android.telecom.cts.carmodetestapptwo.CtsCarModeInCallServiceControlTwo;
 import android.telecom.cts.thirdptydialer.CtsThirdPtyDialerInCallServiceControl;
 import android.telecom.cts.thirdptydialertwo.CtsThirdPtyDialerInCallServiceControlTwo;
@@ -38,6 +42,7 @@
 import android.telecom.cts.thirdptyincallservice.ICtsThirdPartyInCallServiceControl;
 import android.util.Log;
 
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
@@ -73,16 +78,41 @@
             CAR_DIALER_PKG_1, CtsCarModeInCallServiceControl.class.getName());
     private static final String CAR_DIALER_PKG_2 = CtsCarModeInCallServiceControlTwo.class
             .getPackage().getName();
+    private static final String CAR_SELF_MANAGED_PKG =
+            CtsCarModeInCallServiceControlSelfManaged.class
+                    .getPackage().getName();
     private static final ComponentName CAR_DIALER_2 = ComponentName.createRelative(
             CAR_DIALER_PKG_2, CtsCarModeInCallServiceControlTwo.class.getName());
+    private static final ComponentName CAR_SELF_MANAGED_COMPONENT = ComponentName.createRelative(
+            CAR_SELF_MANAGED_PKG, CtsCarModeInCallServiceControlSelfManaged.class.getName());
 
     private Uri TEST_ADDRESS = Uri.fromParts("tel", "6505551213", null);
 
+    private static final PhoneAccountHandle TEST_CAR_SELF_MANAGED_HANDLE =
+            new PhoneAccountHandle(
+                    new ComponentName(CAR_SELF_MANAGED_PKG, TestUtils.SELF_MANAGED_COMPONENT),
+                    TestUtils.SELF_MANAGED_ACCOUNT_ID_1);
+
+    private static final PhoneAccount TEST_SELF_MANAGED_PHONE_ACCOUNT = PhoneAccount.builder(
+                    TEST_CAR_SELF_MANAGED_HANDLE, TestUtils.SELF_MANAGED_ACCOUNT_LABEL)
+            .setAddress(Uri.parse("sip:test@test.com"))
+            .setSubscriptionAddress(Uri.parse("sip:test@test.com"))
+            .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED
+                    | PhoneAccount.CAPABILITY_SUPPORTS_VIDEO_CALLING
+                    | PhoneAccount.CAPABILITY_VIDEO_CALLING)
+            .setHighlightColor(Color.BLUE)
+            .setShortDescription(TestUtils.SELF_MANAGED_ACCOUNT_LABEL)
+            .addSupportedUriScheme(PhoneAccount.SCHEME_TEL)
+            .addSupportedUriScheme(PhoneAccount.SCHEME_SIP)
+            .setExtras(TestUtils.SELF_MANAGED_ACCOUNT_1_EXTRAS)
+            .build();
+
     private RoleManager mRoleManager;
     private String mDefaultDialer;
     private UiAutomation mUiAutomation;
     private ICtsCarModeInCallServiceControl mCarModeIncallServiceControlOne;
     private ICtsCarModeInCallServiceControl mCarModeIncallServiceControlTwo;
+    private ICtsCarModeInCallServiceControl mCarModeIncallServiceControlSelfManaged;
 
     private class TestServiceConnection implements ServiceConnection {
         private IBinder mService;
@@ -142,6 +172,7 @@
 
         disableAndVerifyCarMode(mCarModeIncallServiceControlOne, Configuration.UI_MODE_TYPE_NORMAL);
         disableAndVerifyCarMode(mCarModeIncallServiceControlTwo, Configuration.UI_MODE_TYPE_NORMAL);
+
         disconnectAllCallsAndVerify(mCarModeIncallServiceControlOne);
         disconnectAllCallsAndVerify(mCarModeIncallServiceControlTwo);
 
@@ -249,6 +280,43 @@
         mContext.unbindService(controlConn);
     }
 
+    /**
+     * Test {@link TelecomManager#getOwnSelfManagedPhoneAccounts} works on packages with only the
+     * {@link android.Manifest.permission#MANAGE_OWN_CALLS} permission.
+     */
+    public void testTelecomManagerGetSelfManagedPhoneAccountsForPackage() throws Exception {
+        if (!mShouldTestTelecom) {
+            return;
+        }
+        // bind to CarModeTestAppSelfManaged which only has the
+        // {@link android.Manifest.permission#MANAGE_OWN_CALLS} permission
+        TestServiceConnection control = setUpControl(CAR_MODE_CONTROL, CAR_SELF_MANAGED_COMPONENT);
+
+        mCarModeIncallServiceControlSelfManaged =
+                ICtsCarModeInCallServiceControl.Stub
+                        .asInterface(control.getService());
+
+        mCarModeIncallServiceControlSelfManaged.reset();
+
+        // register a self-managed phone account
+        mCarModeIncallServiceControlSelfManaged.registerPhoneAccount(
+                TEST_SELF_MANAGED_PHONE_ACCOUNT);
+
+        List<PhoneAccountHandle> pah =
+                mCarModeIncallServiceControlSelfManaged.getOwnSelfManagedPhoneAccounts();
+
+        // assert that we can get all the self-managed phone accounts registered to
+        // CarModeTestAppSelfManaged
+        assertEquals(1, pah.size());
+        assertTrue(pah.contains(TEST_CAR_SELF_MANAGED_HANDLE));
+
+        mCarModeIncallServiceControlSelfManaged.unregisterPhoneAccount(
+                TEST_CAR_SELF_MANAGED_HANDLE);
+
+        // unbind to CarModeTestAppSelfManaged
+        mContext.unbindService(control);
+    }
+
     public void testChangeCarModeApp() throws Exception {
         if (!mShouldTestTelecom) {
             return;
diff --git a/tests/tests/telecom/src/android/telecom/cts/TestUtils.java b/tests/tests/telecom/src/android/telecom/cts/TestUtils.java
index 0b74a9e..2560b94 100644
--- a/tests/tests/telecom/src/android/telecom/cts/TestUtils.java
+++ b/tests/tests/telecom/src/android/telecom/cts/TestUtils.java
@@ -49,6 +49,8 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Optional;
+import java.util.Random;
+import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
@@ -335,7 +337,7 @@
         }
         final PackageManager pm = context.getPackageManager();
         return pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) &&
-                pm.hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE);
+                pm.hasSystemFeature(PackageManager.FEATURE_TELECOM);
     }
 
     public static String setCallDiagnosticService(Instrumentation instrumentation,
@@ -799,4 +801,47 @@
     public static int deleteContact(ContentResolver contentResolver, Uri deleteUri) {
         return contentResolver.delete(deleteUri, null, null);
     }
+
+    /**
+     * Generates random phone accounts.
+     * @param seed random seed to use for random UUIDs; passed in for determinism.
+     * @param count How many phone accounts to use.
+     * @return Random phone accounts.
+     */
+    public static ArrayList<PhoneAccount> generateRandomPhoneAccounts(long seed, int count,
+            String packageName, String component) {
+        Random random = new Random(seed);
+        ArrayList<PhoneAccount> accounts = new ArrayList<>();
+        for (int ix = 0; ix < count; ix++) {
+            PhoneAccountHandle handle = new PhoneAccountHandle(
+                    new ComponentName(packageName, component), getRandomUuid(random).toString());
+            PhoneAccount acct = new PhoneAccount.Builder(handle, "TelecommTests")
+                    .setAddress(Uri.parse("sip:test@test.com"))
+                    .setSubscriptionAddress(Uri.parse("sip:test@test.com"))
+                    .setCapabilities(PhoneAccount.CAPABILITY_SELF_MANAGED
+                            | PhoneAccount.CAPABILITY_SUPPORTS_VIDEO_CALLING
+                            | PhoneAccount.CAPABILITY_VIDEO_CALLING)
+                    .setHighlightColor(Color.BLUE)
+                    .setShortDescription(TestUtils.SELF_MANAGED_ACCOUNT_LABEL)
+                    .addSupportedUriScheme(PhoneAccount.SCHEME_TEL)
+                    .addSupportedUriScheme(PhoneAccount.SCHEME_SIP)
+                    .setExtras(TestUtils.SELF_MANAGED_ACCOUNT_1_EXTRAS)
+                    .build();
+            accounts.add(acct);
+        }
+        return accounts;
+    }
+
+    /**
+     * Returns a random UUID based on the passed in Random generator.
+     * @param random Random generator.
+     * @return The UUID.
+     */
+    public static UUID getRandomUuid(Random random) {
+        byte[] array = new byte[16];
+        random.nextBytes(array);
+        return UUID.nameUUIDFromBytes(array);
+    }
+
+
 }
diff --git a/tests/tests/telecom/src/android/telecom/cts/WiredHeadsetTest.java b/tests/tests/telecom/src/android/telecom/cts/WiredHeadsetTest.java
index f4eee35..9125aca 100644
--- a/tests/tests/telecom/src/android/telecom/cts/WiredHeadsetTest.java
+++ b/tests/tests/telecom/src/android/telecom/cts/WiredHeadsetTest.java
@@ -17,7 +17,6 @@
 package android.telecom.cts;
 
 import android.telecom.Call;
-import android.telecom.CallAudioState;
 import android.telecom.Connection;
 
 /**
@@ -119,7 +118,8 @@
     }
 
     private void sendMediaButtonPress(boolean longPress) throws Exception {
-        final String command = "input keyevent " + (longPress ? "--longpress" : "--shortpress")
+        // request 3 seconds press when long press needed for stability
+        final String command = "input keyevent " + (longPress ? "--longpress 3" : "--shortpress")
                 + " KEYCODE_HEADSETHOOK";
         TestUtils.executeShellCommand(getInstrumentation(), command);
     }
diff --git a/tests/tests/telecom/src/android/telecom/cts/carmodetestapp/CtsCarModeInCallServiceControl.java b/tests/tests/telecom/src/android/telecom/cts/carmodetestapp/CtsCarModeInCallServiceControl.java
index fe38d3c..30ae53f 100644
--- a/tests/tests/telecom/src/android/telecom/cts/carmodetestapp/CtsCarModeInCallServiceControl.java
+++ b/tests/tests/telecom/src/android/telecom/cts/carmodetestapp/CtsCarModeInCallServiceControl.java
@@ -21,8 +21,14 @@
 import android.content.ComponentName;
 import android.content.Intent;
 import android.os.IBinder;
+import android.telecom.PhoneAccount;
+import android.telecom.PhoneAccountHandle;
+import android.telecom.TelecomManager;
 import android.util.Log;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Control class for the car mode app; allows CTS tests to perform operations using the car mode
  * test app.
@@ -97,6 +103,36 @@
         public boolean checkBindStatus(boolean bind) {
             return CtsCarModeInCallService.checkBindStatus(bind);
         }
+
+        @Override
+        public List<PhoneAccountHandle> getSelfManagedPhoneAccounts() {
+            TelecomManager telecomManager = getSystemService(TelecomManager.class);
+            return (telecomManager != null) ? telecomManager.getSelfManagedPhoneAccounts()
+                    : new ArrayList<>();
+        }
+
+        @Override
+        public List<PhoneAccountHandle> getOwnSelfManagedPhoneAccounts() {
+            TelecomManager telecomManager = getSystemService(TelecomManager.class);
+            return (telecomManager != null) ? telecomManager.getOwnSelfManagedPhoneAccounts()
+                    : new ArrayList<>();
+        }
+
+        @Override
+        public void registerPhoneAccount(PhoneAccount phoneAccount) {
+            TelecomManager telecomManager = getSystemService(TelecomManager.class);
+            if (telecomManager != null) {
+                telecomManager.registerPhoneAccount(phoneAccount);
+            }
+        }
+
+        @Override
+        public void unregisterPhoneAccount(PhoneAccountHandle phoneAccountHandle) {
+            TelecomManager telecomManager = getSystemService(TelecomManager.class);
+            if (telecomManager != null) {
+                telecomManager.unregisterPhoneAccount(phoneAccountHandle);
+            }
+        }
     };
 
     @Override
diff --git a/tests/tests/telephony/README.md b/tests/tests/telephony/README.md
new file mode 100644
index 0000000..f1f1a32
--- /dev/null
+++ b/tests/tests/telephony/README.md
@@ -0,0 +1,3 @@
+# Telephony CTS tests
+
+This directory contains the main set of Telephony CTS tests.
diff --git a/tests/tests/telephony/current/LocationAccessingApp/src/android/telephony/cts/locationaccessingapp/CtsLocationAccessService.java b/tests/tests/telephony/current/LocationAccessingApp/src/android/telephony/cts/locationaccessingapp/CtsLocationAccessService.java
index 0b9d9c3..25c3da1 100644
--- a/tests/tests/telephony/current/LocationAccessingApp/src/android/telephony/cts/locationaccessingapp/CtsLocationAccessService.java
+++ b/tests/tests/telephony/current/LocationAccessingApp/src/android/telephony/cts/locationaccessingapp/CtsLocationAccessService.java
@@ -77,7 +77,7 @@
                     }
                     break;
                 case COMMAND_GET_SERVICE_STATE_FROM_LISTENER:
-                    result = listenForServiceState();
+                    result = listenForServiceState(mTelephonyManager);
                     break;
                 case COMMAND_LISTEN_CELL_INFO:
                     result = listenForCellInfo();
@@ -147,7 +147,7 @@
         }
     }
 
-    private ServiceState listenForServiceState() {
+    public static ServiceState listenForServiceState(TelephonyManager telephonyManager) {
         LinkedBlockingQueue<ServiceState> queue = new LinkedBlockingQueue<>();
         HandlerThread handlerThread = new HandlerThread("Telephony location CTS");
         handlerThread.start();
@@ -160,7 +160,7 @@
             }
         };
 
-        mTelephonyManager.listen(listener, PhoneStateListener.LISTEN_SERVICE_STATE);
+        telephonyManager.listen(listener, PhoneStateListener.LISTEN_SERVICE_STATE);
 
         try {
             ServiceState ss = queue.poll(LISTENER_TIMEOUT, TimeUnit.MILLISECONDS);
diff --git a/tests/tests/telephony/current/permissions/Android.bp b/tests/tests/telephony/current/permissions/Android.bp
deleted file mode 100644
index f13b0e3..0000000
--- a/tests/tests/telephony/current/permissions/Android.bp
+++ /dev/null
@@ -1,40 +0,0 @@
-//
-// Copyright (C) 2020 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-android_test {
-    name: "CtsTelephonyTestCasesPermissionReadPhoneState",
-    defaults: ["cts_defaults"],
-    // Tag this module as a cts test artifact
-    test_suites: [
-        "cts",
-        "general-tests",
-    ],
-    // Include both the 32 and 64 bit versions
-    compile_multilib: "both",
-    static_libs: [
-        "ctstestrunner-axt",
-        "compatibility-device-util-axt",
-    ],
-    srcs: [
-    "src/**/*.java",
-    ":cts-telephony-utils"
-    ],
-    sdk_version: "test_current",
-}
diff --git a/tests/tests/telephony/current/permissions/AndroidManifest.xml b/tests/tests/telephony/current/permissions/AndroidManifest.xml
deleted file mode 100644
index 8247dcd..0000000
--- a/tests/tests/telephony/current/permissions/AndroidManifest.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (C) 2020 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.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.telephony.cts.telephonypermission" android:targetSandboxVersion="2">
-
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-
-    <!-- Must be debuggable for compat shell commands to work on user builds -->
-    <application android:debuggable="true" />
-
-    <!--
-        The CTS stubs package cannot be used as the target application here,
-        since that requires many permissions to be set. Instead, specify this
-        package itself as the target and include any stub activities needed.
-
-        This test package uses the default InstrumentationTestRunner, because
-        the InstrumentationCtsTestRunner is only available in the stubs
-        package. That runner cannot be added to this package either, since it
-        relies on hidden APIs.
-    -->
-    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="android.telephony.cts.telephonypermission"
-                     android:label="CTS tests of android.permission">
-        <meta-data android:name="listener"
-            android:value="com.android.cts.runner.CtsTestRunListener" />
-    </instrumentation>
-
-</manifest>
-
diff --git a/tests/tests/telephony/current/permissions/AndroidTest.xml b/tests/tests/telephony/current/permissions/AndroidTest.xml
deleted file mode 100644
index b3cce9e..0000000
--- a/tests/tests/telephony/current/permissions/AndroidTest.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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.
--->
-<configuration description="Config for CTS Telephony Permission test cases">
-    <option name="test-suite-tag" value="cts" />
-    <option name="config-descriptor:metadata" key="component" value="framework" />
-
-    <!-- Telephony permission tests do not use any permission not available to instant apps. -->
-    <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
-    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
-    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
-
-    <!-- Install main test suite apk -->
-    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
-        <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsTelephonyTestCasesPermissionReadPhoneState.apk" />
-    </target_preparer>
-
-    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="android.telephony.cts.telephonypermission" />
-        <option name="runtime-hint" value="1m" />
-    </test>
-</configuration>
diff --git a/tests/tests/telephony/current/permissions/src/android/telephony/cts/telephonypermission/TelephonyManagerReadPhoneStatePermissionTest.java b/tests/tests/telephony/current/permissions/src/android/telephony/cts/telephonypermission/TelephonyManagerReadPhoneStatePermissionTest.java
deleted file mode 100644
index 7d164d4..0000000
--- a/tests/tests/telephony/current/permissions/src/android/telephony/cts/telephonypermission/TelephonyManagerReadPhoneStatePermissionTest.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Copyright (C) 2020 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 android.telephony.cts.telephonypermission;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.fail;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.platform.test.annotations.AppModeFull;
-import android.telecom.PhoneAccount;
-import android.telecom.TelecomManager;
-import android.telephony.SubscriptionManager;
-import android.telephony.TelephonyManager;
-import android.telephony.cts.TelephonyUtils;
-import android.telephony.emergency.EmergencyNumber;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import com.android.compatibility.common.util.ShellIdentityUtils;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Test TelephonyManager APIs with READ_PHONE_STATE Permission.
- */
-@RunWith(AndroidJUnit4.class)
-@AppModeFull(reason = "Cannot grant the runtime permission in instant app mode")
-public class TelephonyManagerReadPhoneStatePermissionTest {
-
-    private boolean mHasTelephony;
-    TelephonyManager mTelephonyManager = null;
-    TelecomManager mTelecomManager = null;
-
-    @Before
-    public void setUp() throws Exception {
-        mHasTelephony = getContext().getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_TELEPHONY);
-        mTelephonyManager =
-                (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
-        assertNotNull(mTelephonyManager);
-        mTelecomManager =
-                (TelecomManager) getContext().getSystemService(Context.TELECOM_SERVICE);
-        assertNotNull(mTelecomManager);
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        TelephonyUtils.resetCompatCommand(InstrumentationRegistry.getInstrumentation(),
-                TelephonyUtils.CTS_APP_PACKAGE,
-                TelephonyUtils.ENABLE_GET_CALL_STATE_PERMISSION_PROTECTION_STRING);
-    }
-
-    /**
-     * Verify that TelephonyManager APIs requiring READ_PHONE_STATE Permission must work.
-     * <p>
-     * Requires Permission:
-     * {@link android.Manifest.permission#READ_PHONE_STATE}.
-     *
-     * APIs list:
-     * getDeviceSoftwareVersion()
-     * getCarrierConfig()
-     * getNetworkType()
-     * getDataNetworkType()
-     * getVoiceNetworkType()
-     * getGroupIdLevel1()
-     * getLine1AlphaTag()
-     * getVoiceMailNumber()
-     * getVisualVoicemailPackageName()
-     * getVoiceMailAlphaTag()
-     * getForbiddenPlmns()
-     * isDataRoamingEnabled()
-     * getSubscriptionId(@NonNull PhoneAccountHandle phoneAccountHandle)
-     * getServiceState()
-     * getEmergencyNumberList()
-     * getEmergencyNumberList(@EmergencyServiceCategories int categories)
-     * getPreferredOpportunisticDataSubscription()
-     * isModemEnabledForSlot(int slotIndex)
-     * isMultiSimSupported()
-     * doesSwitchMultiSimConfigTriggerReboot()
-     * getCallState() (when compat fwk enables enforcement)
-     * getCallStateForSubscription() (when compat fwk enables enforcement)
-     */
-    @Test
-    public void testTelephonyManagersAPIsRequiringReadPhoneStatePermissions() throws Exception {
-        if (!mHasTelephony) {
-            return;
-        }
-
-        try {
-            // We must ensure that compat fwk enables READ_PHONE_STATE enforcement
-            TelephonyUtils.enableCompatCommand(InstrumentationRegistry.getInstrumentation(),
-                    TelephonyUtils.CTS_APP_PACKAGE,
-                    TelephonyUtils.ENABLE_GET_CALL_STATE_PERMISSION_PROTECTION_STRING);
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getCallState());
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getCallStateForSubscription());
-        } catch (SecurityException e) {
-            fail("TelephonyManager#getCallState and TelephonyManager#getCallStateForSubscription "
-                    + "must not throw a SecurityException because READ_PHONE_STATE permission is "
-                    + "granted and TelecomManager#ENABLE_GET_CALL_STATE_PERMISSION_PROTECTION is "
-                    + "enabled.");
-        }
-
-        int subId = mTelephonyManager.getSubscriptionId();
-
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getNetworkType());
-        } catch (SecurityException e) {
-            fail("getNetworkType() must not throw a SecurityException with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getDeviceSoftwareVersion());
-        } catch (SecurityException e) {
-            fail("getDeviceSoftwareVersion() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getCarrierConfig());
-        } catch (SecurityException e) {
-            fail("getCarrierConfig() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getDataNetworkType());
-        } catch (SecurityException e) {
-            fail("getDataNetworkType() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getVoiceNetworkType());
-        } catch (SecurityException e) {
-            fail("getVoiceNetworkType() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getGroupIdLevel1());
-        } catch (SecurityException e) {
-            fail("getGroupIdLevel1() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getLine1AlphaTag());
-        } catch (SecurityException e) {
-            fail("getLine1AlphaTag() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getVoiceMailNumber());
-        } catch (SecurityException e) {
-            fail("getVoiceMailNumber() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getVisualVoicemailPackageName());
-        } catch (SecurityException e) {
-            fail("getVisualVoicemailPackageName() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getVoiceMailAlphaTag());
-        } catch (SecurityException e) {
-            fail("getVoiceMailAlphaTag() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getForbiddenPlmns());
-        } catch (SecurityException e) {
-            fail("getForbiddenPlmns() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.isDataRoamingEnabled());
-        } catch (SecurityException e) {
-            fail("isDataRoamingEnabled() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getSubscriptionId(
-                            mTelecomManager.getDefaultOutgoingPhoneAccount(
-                                    PhoneAccount.SCHEME_TEL)));
-        } catch (SecurityException e) {
-            fail("getSubscriptionId(phoneAccountHandle) must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getServiceState());
-        } catch (SecurityException e) {
-            fail("getServiceState() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getEmergencyNumberList());
-        } catch (SecurityException e) {
-            fail("getEmergencyNumberList() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getEmergencyNumberList(
-                            EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_POLICE));
-        } catch (SecurityException e) {
-            fail("getEmergencyNumberList(EMERGENCY_SERVICE_CATEGORY_POLICE) must"
-                    + " not throw a SecurityException with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.getPreferredOpportunisticDataSubscription());
-        } catch (SecurityException e) {
-            fail("getPreferredOpportunisticDataSubscription() must not throw"
-                    + " a SecurityException with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.isModemEnabledForSlot(
-                            SubscriptionManager.getSlotIndex(subId)));
-        } catch (SecurityException e) {
-            fail("isModemEnabledForSlot(slotIndex) must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.isMultiSimSupported());
-        } catch (SecurityException e) {
-            fail("isMultiSimSupported() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-        try {
-            ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTelephonyManager, (tm) -> tm.doesSwitchMultiSimConfigTriggerReboot());
-        } catch (SecurityException e) {
-            fail("doesSwitchMultiSimConfigTriggerReboot() must not throw a SecurityException"
-                    + " with READ_PHONE_STATE" + e);
-        }
-    }
-
-    private static Context getContext() {
-        return InstrumentationRegistry.getContext();
-    }
-}
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/CarrierConfigManagerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/CarrierConfigManagerTest.java
index e62adc5..e4b06ae 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/CarrierConfigManagerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/CarrierConfigManagerTest.java
@@ -35,7 +35,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
-
+import static org.junit.Assume.assumeTrue;
 
 import android.app.UiAutomation;
 import android.content.BroadcastReceiver;
@@ -70,7 +70,6 @@
     private CarrierConfigManager mConfigManager;
     private TelephonyManager mTelephonyManager;
     private SubscriptionManager mSubscriptionManager;
-    private PackageManager mPackageManager;
 
     // Use a long timeout to accommodate devices with lower amounts of memory, as it will take
     // longer for these devices to receive the broadcast (b/161963269). It is expected that all
@@ -80,6 +79,8 @@
 
     @Before
     public void setUp() throws Exception {
+        assumeTrue(getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
         mTelephonyManager = (TelephonyManager)
                 getContext().getSystemService(Context.TELEPHONY_SERVICE);
         mConfigManager = (CarrierConfigManager)
@@ -87,7 +88,6 @@
         mSubscriptionManager =
                 (SubscriptionManager)
                         getContext().getSystemService(Context.TELEPHONY_SUBSCRIPTION_SERVICE);
-        mPackageManager = getContext().getPackageManager();
     }
 
     @After
@@ -174,6 +174,14 @@
             assertEquals("KEY_CARRIER_USSD_METHOD_INT doesn't match static default.",
                     config.getInt(CarrierConfigManager.KEY_CARRIER_USSD_METHOD_INT),
                             CarrierConfigManager.USSD_OVER_CS_PREFERRED);
+            assertEquals("KEY_USAGE_SETTING_INT doesn't match static default.",
+                    config.getInt(CarrierConfigManager.KEY_CELLULAR_USAGE_SETTING_INT),
+                            SubscriptionManager.USAGE_SETTING_UNKNOWN);
+            assertEquals("KEY_ENABLE_CROSS_SIM_CALLING_ON_OPPORTUNISTIC_DATA_BOOL"
+                    + " doesn't match static default.",
+                    config.getBoolean(
+                      CarrierConfigManager.KEY_ENABLE_CROSS_SIM_CALLING_ON_OPPORTUNISTIC_DATA_BOOL),
+                      false);
         }
 
         // These key should return default values if not customized.
@@ -204,9 +212,6 @@
     @Test
     @AsbSecurityTest(cveBugId = 73136824)
     public void testRevokePermission() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
         PersistableBundle config;
 
         try {
@@ -370,5 +375,13 @@
             assertFalse(config.containsKey(KEY_CARRIER_VOLTE_PROVISIONED_BOOL));
             assertFalse(config.containsKey(CarrierConfigManager.Gps.KEY_SUPL_ES_STRING));
         }
+
+        config = mConfigManager.getConfigByComponentForSubId(
+                CarrierConfigManager.ImsVoice.KEY_PREFIX,
+                SubscriptionManager.getDefaultSubscriptionId());
+        if (config != null) {
+            assertTrue(config.containsKey(
+                    CarrierConfigManager.ImsVoice.KEY_AMRWB_PAYLOAD_DESCRIPTION_BUNDLE));
+        }
     }
 }
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/CarrierServiceTest.java b/tests/tests/telephony/current/src/android/telephony/cts/CarrierServiceTest.java
index a323cc5..6ac2b5a6 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/CarrierServiceTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/CarrierServiceTest.java
@@ -48,7 +48,7 @@
         PackageManager packageManager = getInstrumentation().getContext().getPackageManager();
         TelephonyManager telephonyManager =
                 getInstrumentation().getContext().getSystemService(TelephonyManager.class);
-        return packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
+        return packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)
                 && telephonyManager.getPhoneCount() > 0;
     }
 
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/IRadioConfigImpl.java b/tests/tests/telephony/current/src/android/telephony/cts/IRadioConfigImpl.java
index 86a2c8f7..b18a355 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/IRadioConfigImpl.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/IRadioConfigImpl.java
@@ -265,4 +265,14 @@
             Log.e(TAG, "null mRadioConfigIndication");
         }
     }
+
+    @Override
+    public String getInterfaceHash() {
+        return IRadioConfig.HASH;
+    }
+
+    @Override
+    public int getInterfaceVersion() {
+        return IRadioConfig.VERSION;
+    }
 }
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/IRadioDataImpl.java b/tests/tests/telephony/current/src/android/telephony/cts/IRadioDataImpl.java
index e9fff8e..92a22c3 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/IRadioDataImpl.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/IRadioDataImpl.java
@@ -222,4 +222,14 @@
             Log.e(TAG, "Failed to stopKeepalive from AIDL. Exception" + ex);
         }
     }
+
+    @Override
+    public String getInterfaceHash() {
+        return IRadioData.HASH;
+    }
+
+    @Override
+    public int getInterfaceVersion() {
+        return IRadioData.VERSION;
+    }
 }
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/IRadioModemImpl.java b/tests/tests/telephony/current/src/android/telephony/cts/IRadioModemImpl.java
index 4cca64b..8f6a9a9 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/IRadioModemImpl.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/IRadioModemImpl.java
@@ -472,4 +472,14 @@
                 break;
         }
     }
+
+    @Override
+    public String getInterfaceHash() {
+        return IRadioModem.HASH;
+    }
+
+    @Override
+    public int getInterfaceVersion() {
+        return IRadioModem.VERSION;
+    }
 }
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/IRadioNetworkImpl.java b/tests/tests/telephony/current/src/android/telephony/cts/IRadioNetworkImpl.java
index c914f79..fb3dbca 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/IRadioNetworkImpl.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/IRadioNetworkImpl.java
@@ -505,4 +505,14 @@
             Log.e(TAG, "Failed to getUsageSetting from AIDL. Exception" + ex);
         }
     }
+
+    @Override
+    public String getInterfaceHash() {
+        return IRadioNetwork.HASH;
+    }
+
+    @Override
+    public int getInterfaceVersion() {
+        return IRadioNetwork.VERSION;
+    }
 }
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/IRadioSimImpl.java b/tests/tests/telephony/current/src/android/telephony/cts/IRadioSimImpl.java
index 08980a3..b6e9d00 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/IRadioSimImpl.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/IRadioSimImpl.java
@@ -838,4 +838,14 @@
             Log.e(TAG, "null mRadioSimIndication");
         }
     }
+
+    @Override
+    public String getInterfaceHash() {
+        return IRadioSim.HASH;
+    }
+
+    @Override
+    public int getInterfaceVersion() {
+        return IRadioSim.VERSION;
+    }
 }
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/IRadioVoiceImpl.java b/tests/tests/telephony/current/src/android/telephony/cts/IRadioVoiceImpl.java
index 4a415cd..c6fdfdf 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/IRadioVoiceImpl.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/IRadioVoiceImpl.java
@@ -749,4 +749,14 @@
             Log.e(TAG, "null mRadioVoiceIndication");
         }
     }
+
+    @Override
+    public String getInterfaceHash() {
+        return IRadioVoice.HASH;
+    }
+
+    @Override
+    public int getInterfaceVersion() {
+        return IRadioVoice.VERSION;
+    }
 }
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/MmsTest.java b/tests/tests/telephony/current/src/android/telephony/cts/MmsTest.java
index 57b5a84..fe9cf2c 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/MmsTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/MmsTest.java
@@ -20,6 +20,7 @@
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
 import android.app.Activity;
 import android.app.PendingIntent;
@@ -94,17 +95,18 @@
     private Random mRandom;
     private SentReceiver mSentReceiver;
     private TelephonyManager mTelephonyManager;
-    private PackageManager mPackageManager;
 
     private static class SentReceiver extends BroadcastReceiver {
         private final Object mLock;
         private boolean mSuccess;
         private boolean mDone;
+        private int mExpectedErrorResultCode;
 
-        public SentReceiver() {
+        SentReceiver(int expectedErrorResultCode) {
             mLock = new Object();
             mSuccess = false;
             mDone = false;
+            mExpectedErrorResultCode = expectedErrorResultCode;
         }
 
         @Override
@@ -135,6 +137,9 @@
                 }
             } else {
                 Log.e(TAG, "Failure result=" + resultCode);
+                if (resultCode == mExpectedErrorResultCode) {
+                    mSuccess = true;
+                }
                 if (resultCode == SmsManager.MMS_ERROR_HTTP_FAILURE) {
                     final int httpError = intent.getIntExtra(SmsManager.EXTRA_MMS_HTTP_STATUS, 0);
                     Log.e(TAG, "HTTP failure=" + httpError);
@@ -161,7 +166,6 @@
                 Log.i(TAG, "Wait for sent: done=" + mDone + ", success=" + mSuccess);
                 return mDone && mSuccess;
             }
-
         }
     }
 
@@ -170,22 +174,30 @@
         mRandom = new Random();
         mTelephonyManager =
                 (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
-        mPackageManager = getContext().getPackageManager();
+        assumeTrue(getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_MESSAGING));
     }
 
     @Test
     public void testSendMmsMessage() {
-        sendMmsMessage(0L /* messageId */);
+        sendMmsMessage(0L /* messageId */, Activity.RESULT_OK, SmsManager.getDefault());
+    }
+
+    @Test
+    public void testSendMmsMessageWithInactiveSubscriptionId() {
+        int inactiveSubId = 127;
+        sendMmsMessage(0L /* messageId */, SmsManager.MMS_ERROR_INACTIVE_SUBSCRIPTION,
+                SmsManager.getSmsManagerForSubscriptionId(inactiveSubId));
     }
 
     @Test
     public void testSendMmsMessageWithMessageId() {
-        sendMmsMessage(MESSAGE_ID);
+        sendMmsMessage(MESSAGE_ID, Activity.RESULT_OK, SmsManager.getDefault());
     }
 
-    private void sendMmsMessage(long messageId) {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
-             || !doesSupportMMS()) {
+    private void sendMmsMessage(long messageId, int expectedErrorResultCode,
+            SmsManager smsManager) {
+        if (!doesSupportMMS()) {
             Log.i(TAG, "testSendMmsMessage skipped: no telephony available or MMS not supported");
             return;
         }
@@ -194,7 +206,7 @@
 
         final Context context = getContext();
         // Register sent receiver
-        mSentReceiver = new SentReceiver();
+        mSentReceiver = new SentReceiver(expectedErrorResultCode);
         context.registerReceiver(mSentReceiver, new IntentFilter(ACTION_MMS_SENT));
         // Create local provider file for sending PDU
         final String fileName = "send." + String.valueOf(Math.abs(mRandom.nextLong())) + ".dat";
@@ -213,14 +225,15 @@
         final PendingIntent pendingIntent = PendingIntent.getBroadcast(
                 context, 0, new Intent(ACTION_MMS_SENT), PendingIntent.FLAG_MUTABLE);
         if (messageId == 0L) {
-            SmsManager.getDefault().sendMultimediaMessage(context,
+            smsManager.sendMultimediaMessage(context,
                     contentUri, null/*locationUrl*/, null/*configOverrides*/, pendingIntent);
         } else {
-            SmsManager.getDefault().sendMultimediaMessage(context,
+            smsManager.sendMultimediaMessage(context,
                     contentUri, null/*locationUrl*/, null/*configOverrides*/, pendingIntent,
                     messageId);
         }
         assertTrue(mSentReceiver.waitForSuccess(SENT_TIMEOUT));
+        assertTrue(mSentReceiver.getResultCode() == expectedErrorResultCode);
         sendFile.delete();
     }
 
@@ -347,8 +360,7 @@
     }
 
     private void downloadMultimediaMessage(long messageId) {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
-                || !doesSupportMMS()) {
+        if (!doesSupportMMS()) {
             Log.i(TAG, "testSendMmsMessage skipped: no telephony available or MMS not supported");
             return;
         }
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/ServiceStateTest.java b/tests/tests/telephony/current/src/android/telephony/cts/ServiceStateTest.java
index 5d76420..f87ccd6 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/ServiceStateTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/ServiceStateTest.java
@@ -35,6 +35,7 @@
 import android.os.Build;
 import android.os.Parcel;
 import android.telephony.AccessNetworkConstants;
+import android.telephony.DataSpecificRegistrationInfo;
 import android.telephony.LteVopsSupportInfo;
 import android.telephony.NetworkRegistrationInfo;
 import android.telephony.NrVopsSupportInfo;
@@ -371,9 +372,12 @@
                 new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE,
                         LteVopsSupportInfo.LTE_STATUS_NOT_AVAILABLE);
 
-        NetworkRegistrationInfo wwanDataRegState = new NetworkRegistrationInfo(
-                NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
-                0, 0, 0, true, null, null, "", 0, false, false, false, vopsSupportInfo);
+        NetworkRegistrationInfo wwanDataRegState = new NetworkRegistrationInfo.Builder()
+                .setDomain(NetworkRegistrationInfo.DOMAIN_PS)
+                .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
+                .setDataSpecificInfo(new DataSpecificRegistrationInfo(
+                        0, false, false, false, vopsSupportInfo))
+                .setEmergencyOnly(true).build();
 
         ServiceState ss = new ServiceState();
 
@@ -386,9 +390,12 @@
                 new LteVopsSupportInfo(LteVopsSupportInfo.LTE_STATUS_SUPPORTED,
                         LteVopsSupportInfo.LTE_STATUS_NOT_SUPPORTED);
 
-        wwanDataRegState = new NetworkRegistrationInfo(
-                NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
-                0, 0, 0, true, null, null, "", 0, false, false, false, vopsSupportInfo);
+        wwanDataRegState = new NetworkRegistrationInfo.Builder()
+                .setDomain(NetworkRegistrationInfo.DOMAIN_PS)
+                .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
+                .setDataSpecificInfo(new DataSpecificRegistrationInfo(
+                        0, false, false, false, vopsSupportInfo))
+                .setEmergencyOnly(true).build();
         ss.addNetworkRegistrationInfo(wwanDataRegState);
         assertEquals(ss.getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,
                 AccessNetworkConstants.TRANSPORT_TYPE_WWAN), wwanDataRegState);
@@ -402,9 +409,12 @@
         vopsSupportInfo = new NrVopsSupportInfo(NrVopsSupportInfo.NR_STATUS_VOPS_NOT_SUPPORTED,
                 NrVopsSupportInfo.NR_STATUS_EMC_NOT_SUPPORTED,
                 NrVopsSupportInfo.NR_STATUS_EMF_NOT_SUPPORTED);
-        wwanDataRegState = new NetworkRegistrationInfo(
-                NetworkRegistrationInfo.DOMAIN_PS, AccessNetworkConstants.TRANSPORT_TYPE_WWAN,
-                0, 0, 0, true, null, null, "", 0, false, false, false, vopsSupportInfo);
+        wwanDataRegState = new NetworkRegistrationInfo.Builder()
+                .setDomain(NetworkRegistrationInfo.DOMAIN_PS)
+                .setTransportType(AccessNetworkConstants.TRANSPORT_TYPE_WWAN)
+                .setDataSpecificInfo(new DataSpecificRegistrationInfo(
+                        0, false, false, false, vopsSupportInfo))
+                .setEmergencyOnly(true).build();
         ss.addNetworkRegistrationInfo(wwanDataRegState);
         assertEquals(ss.getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_PS,
                 AccessNetworkConstants.TRANSPORT_TYPE_WWAN), wwanDataRegState);
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/SipManagerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/SipManagerTest.java
deleted file mode 100644
index 9cd1ff3..0000000
--- a/tests/tests/telephony/current/src/android/telephony/cts/SipManagerTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (C) 2020 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 android.telephony.cts;
-
-import static androidx.test.InstrumentationRegistry.getContext;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
-import android.content.Context;
-import android.net.sip.SipException;
-import android.net.sip.SipManager;
-import android.net.sip.SipProfile;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.text.ParseException;
-import java.util.List;
-
-public class SipManagerTest {
-    private Context mContext;
-    private SipManager mSipManager;
-    private static final String SIP_URI1 = "test1";
-    private static final String SIP_URI2 = "test2";
-
-    @Before
-    public void setUp() {
-        mContext = getContext();
-        mSipManager = SipManager.newInstance(mContext);
-    }
-
-    @After
-    public void tearDown() throws SipException {
-        if (mSipManager != null) {
-            for (SipProfile profile : mSipManager.getProfiles()) {
-                mSipManager.close(profile.getUriString());
-            }
-        }
-    }
-
-    @Test
-    public void testGetProfiles() throws SipException, ParseException {
-        if (!SipManager.isApiSupported(mContext)) {
-            return;
-        }
-        SipProfile sipProfile1 = new SipProfile.Builder(SIP_URI1).build();
-        SipProfile sipProfile2 = new SipProfile.Builder(SIP_URI2).build();
-        mSipManager.open(sipProfile1);
-        mSipManager.open(sipProfile2);
-        List<SipProfile> profiles = mSipManager.getProfiles();
-        assertEquals(2, profiles.size());
-        assertTrue(profiles.get(0).getUriString().contains(SIP_URI2));
-        assertTrue(profiles.get(1).getUriString().contains(SIP_URI1));
-    }
-}
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/SmsManagerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/SmsManagerTest.java
index 8a13736..59771fe 100755
--- a/tests/tests/telephony/current/src/android/telephony/cts/SmsManagerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/SmsManagerTest.java
@@ -112,7 +112,6 @@
     private static final String FINANCIAL_SMS_APP = "android.telephony.cts.financialsms";
 
     private TelephonyManager mTelephonyManager;
-    private PackageManager mPackageManager;
     private String mDestAddr;
     private String mText;
     private SmsBroadcastReceiver mSendReceiver;
@@ -139,24 +138,19 @@
 
     @Before
     public void setUp() throws Exception {
-        assumeTrue(InstrumentationRegistry.getContext().getPackageManager()
-                .hasSystemFeature(PackageManager.FEATURE_TELEPHONY));
+        assumeTrue(getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_MESSAGING));
 
         mContext = getContext();
         mTelephonyManager =
             (TelephonyManager) getContext().getSystemService(
                     Context.TELEPHONY_SERVICE);
-        mPackageManager = mContext.getPackageManager();
         mDestAddr = mTelephonyManager.getLine1Number();
         mText = "This is a test message";
 
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            mDeliveryReportSupported = false;
-        } else {
-            // exclude the networks that don't support SMS delivery report
-            String mccmnc = mTelephonyManager.getSimOperator();
-            mDeliveryReportSupported = !(CarrierCapability.NO_DELIVERY_REPORTS.contains(mccmnc));
-        }
+        // exclude the networks that don't support SMS delivery report
+        String mccmnc = mTelephonyManager.getSimOperator();
+        mDeliveryReportSupported = !(CarrierCapability.NO_DELIVERY_REPORTS.contains(mccmnc));
 
         // register receivers
         mSendIntent = new Intent(SMS_SEND_ACTION);
@@ -808,6 +802,17 @@
     }
 
     @Test
+    public void testResetAllCellBroadcastRanges() {
+        try {
+            executeWithShellPermissionIdentity(() -> {
+                getSmsManager().resetAllCellBroadcastRanges();
+            });
+        } catch (Exception e) {
+            // expected
+        }
+    }
+
+    @Test
     public void testCreateForSubscriptionId() {
         int testSubId = 123;
         SmsManager smsManager = mContext.getSystemService(SmsManager.class)
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/SmsMessageTest.java b/tests/tests/telephony/current/src/android/telephony/cts/SmsMessageTest.java
index 615c2a8..bd060b9 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/SmsMessageTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/SmsMessageTest.java
@@ -26,6 +26,8 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeFalse;
+import static org.junit.Assume.assumeTrue;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -88,18 +90,18 @@
 
     @Before
     public void setUp() throws Exception {
+        assumeTrue(getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_MESSAGING));
+        mPackageManager = getContext().getPackageManager();
         mTelephonyManager =
             (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
-        mPackageManager = getContext().getPackageManager();
     }
 
     @Test
     public void testCreateFromPdu() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
-                || mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_CDMA)) {
-            // TODO: temp workaround, need to adjust test to use CDMA pdus
-            return;
-        }
+        // TODO: temp workaround, need to adjust test to use CDMA pdus
+        assumeFalse(mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_CDMA));
 
         String pdu = "07916164260220F0040B914151245584F600006060605130308A04D4F29C0E";
         SmsMessage sms = SmsMessage.createFromPdu(hexStringToByteArray(pdu),
@@ -159,6 +161,14 @@
         assertEquals(sms.getMessageBody().length(), result[1]);
         assertRemaining(sms.getMessageBody().length(), result[2], SmsMessage.MAX_USER_DATA_SEPTETS);
         assertEquals(SmsMessage.ENCODING_7BIT, result[3]);
+
+        // Test createFromPdu to test ENCODING_KSC5601 (0x84 as DCS in pdu)
+        // The only way of retrieving the Data Coding Scheme is via SmsMessage#calculateLength,
+        // but it never returns ENCODING_KSC5601, so we're testing for ENCODING_16BIT instead.
+        pdu = "07916164260220F0040B914151245584F600846060605130308A04D4F29C0E";
+        sms = SmsMessage.createFromPdu(hexStringToByteArray(pdu), SmsMessage.FORMAT_3GPP);
+        result = SmsMessage.calculateLength(sms.getMessageBody(), false);
+        assertEquals(SmsMessage.ENCODING_16BIT, result[3]);
     }
 
     private void assertRemaining(int messageLength, int remaining, int maxChars) {
@@ -179,11 +189,9 @@
 
     @Test
     public void testCPHSVoiceMail() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
-                || mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_CDMA)) {
-            // TODO: temp workaround, need to adjust test to use CDMA pdus
-            return;
-        }
+        // TODO: temp workaround, need to adjust test to use CDMA pdus
+        assumeFalse(mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_CDMA));
 
         // "set MWI flag"
         String pdu = "07912160130310F20404D0110041006060627171118A0120";
@@ -223,11 +231,9 @@
 
     @Test
     public void testGetUserData() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
-                || mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_CDMA)) {
-            // TODO: temp workaround, need to adjust test to use CDMA pdus
-            return;
-        }
+        // TODO: temp workaround, need to adjust test to use CDMA pdus
+        assumeFalse(mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_CDMA));
 
         String pdu = "07914140279510F6440A8111110301003BF56080207130138A8C0B05040B8423F"
             + "000032A02010106276170706C69636174696F6E2F766E642E7761702E6D6D732D"
@@ -243,10 +249,6 @@
 
     @Test
     public void testGetSubmitPdu() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
-
         SmsMessage.SubmitPdu smsPdu;
         String scAddress = null, destinationAddress = null;
         String message = null;
@@ -284,11 +286,9 @@
 
     @Test
     public void testEmailGateway() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
-                || mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_CDMA)) {
-            // TODO: temp workaround, need to adjust test to use CDMA pdus
-            return;
-        }
+        // TODO: temp workaround, need to adjust test to use CDMA pdus
+        assumeFalse(mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_CDMA));
 
         String pdu = "07914151551512f204038105f300007011103164638a28e6f71b50c687db" +
                          "7076d9357eb7412f7a794e07cdeb6275794c07bde8e5391d247e93f3";
@@ -317,10 +317,6 @@
 
     @Test
     public void testCalculateLength() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
-
         int[] result = SmsMessage.calculateLength(LONG_TEXT_WITH_32BIT_CHARS, false);
         assertEquals(6, result.length);
         assertEquals(3, result[0]);
@@ -343,19 +339,12 @@
 
     @Test
     public void testCalculateLengthFlags() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
         int[] result = SmsMessage.calculateLength(LONG_TEXT_WITH_FLAGS, false);
         assertEquals(2, result[0]);
     }
 
     @Test
     public void testGetSmsPdu() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
-
         SmsMessage.SubmitPdu smsPdu;
         String scAddress = null;
         String destinationAddress = null;
@@ -391,9 +380,6 @@
 
     @Test
     public void testGetSubmitPduEncodedMessage() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
         String destinationAddress = "18004664411";
         String message = "This is a test message";
 
@@ -433,9 +419,6 @@
 
     @Test
     public void testCreateFromNativeSmsSubmitPdu() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
         // Short message with status RECEIVED_READ and size 0. See 3GPP2 C.S0023 3.4.27
         byte[] submitPdu = {1, 0};
         SmsMessage sms = SmsMessage.createFromNativeSmsSubmitPdu(submitPdu, true);
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/SmsUsageMonitorShortCodeTest.java b/tests/tests/telephony/current/src/android/telephony/cts/SmsUsageMonitorShortCodeTest.java
index 32c4258..def4335 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/SmsUsageMonitorShortCodeTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/SmsUsageMonitorShortCodeTest.java
@@ -17,25 +17,23 @@
 package android.telephony.cts;
 
 import static android.telephony.SmsManager.SMS_CATEGORY_FREE_SHORT_CODE;
-import static android.telephony.SmsManager.SMS_CATEGORY_STANDARD_SHORT_CODE;
 import static android.telephony.SmsManager.SMS_CATEGORY_NOT_SHORT_CODE;
 import static android.telephony.SmsManager.SMS_CATEGORY_POSSIBLE_PREMIUM_SHORT_CODE;
 import static android.telephony.SmsManager.SMS_CATEGORY_PREMIUM_SHORT_CODE;
+import static android.telephony.SmsManager.SMS_CATEGORY_STANDARD_SHORT_CODE;
 
 import static androidx.test.InstrumentationRegistry.getInstrumentation;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assume.assumeTrue;
 
 import android.content.Context;
 import android.content.pm.PackageManager;
-import android.telephony.SmsManager;
-import android.test.InstrumentationTestCase;
 import android.telephony.PhoneNumberUtils;
+import android.telephony.SmsManager;
 
 import androidx.test.annotation.UiThreadTest;
 
-import com.android.internal.telephony.SmsUsageMonitor;
-
 import org.junit.Before;
 import org.junit.Test;
 
@@ -44,7 +42,6 @@
  */
 public class SmsUsageMonitorShortCodeTest {
 
-    private PackageManager mPackageManager;
     private Context mContext;
 
     private static final class ShortCodeTest {
@@ -475,7 +472,8 @@
     @Before
     public void setUp() throws Exception {
         mContext = getInstrumentation().getTargetContext();
-        mPackageManager = mContext.getPackageManager();
+        assumeTrue(mContext.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_MESSAGING));
     }
 
     private static int expectedReturnCode(String address) {
@@ -486,11 +484,6 @@
     @UiThreadTest
     @Test
     public void testSmsShortCodeDestination() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            // do not test if device does not support telephony (voice or sms)
-            return;
-        }
-
         for (ShortCodeTest test : sShortCodeTests) {
             // It is intended that a short code number in country A may be an emergency number
             // in country B. It is intended that the destination will be changed because of this
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java
index e5d45d1..137a43b 100755
--- a/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/SubscriptionManagerTest.java
@@ -30,9 +30,14 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import android.annotation.Nullable;
 import android.app.UiAutomation;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.net.ConnectivityManager;
@@ -59,11 +64,13 @@
 import androidx.test.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.CarrierPrivilegeUtils;
+import com.android.compatibility.common.util.PropertyUtil;
 import com.android.compatibility.common.util.ShellIdentityUtils;
 import com.android.compatibility.common.util.SystemUtil;
 import com.android.compatibility.common.util.TestThread;
 import com.android.internal.util.ArrayUtils;
 
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -75,7 +82,9 @@
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
@@ -111,6 +120,51 @@
     private int mDefaultVoiceSubId;
     private String mPackageName;
     private SubscriptionManager mSm;
+    private SubscriptionManagerTest.CarrierConfigReceiver mReceiver;
+
+    private static class CarrierConfigReceiver extends BroadcastReceiver {
+        private CountDownLatch mLatch = new CountDownLatch(1);
+        private final int mSubId;
+
+        CarrierConfigReceiver(int subId) {
+            mSubId = subId;
+        }
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED.equals(intent.getAction())) {
+                int subId = intent.getIntExtra(CarrierConfigManager.EXTRA_SUBSCRIPTION_INDEX,
+                        SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+                if (mSubId == subId) {
+                    mLatch.countDown();
+                }
+            }
+        }
+
+        void clearQueue() {
+            mLatch = new CountDownLatch(1);
+        }
+
+        void waitForCarrierConfigChanged() throws Exception {
+            mLatch.await(5000, TimeUnit.MILLISECONDS);
+        }
+    }
+
+    private void overrideCarrierConfig(PersistableBundle bundle, int subId) throws Exception {
+        mReceiver = new CarrierConfigReceiver(subId);
+        IntentFilter filter = new IntentFilter(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED);
+        // ACTION_CARRIER_CONFIG_CHANGED is sticky, so we will get a callback right away.
+        InstrumentationRegistry.getContext().registerReceiver(mReceiver, filter);
+        mReceiver.waitForCarrierConfigChanged();
+        mReceiver.clearQueue();
+
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                InstrumentationRegistry.getContext().getSystemService(CarrierConfigManager.class),
+                (cm) -> cm.overrideConfig(subId, bundle));
+        mReceiver.waitForCarrierConfigChanged();
+        InstrumentationRegistry.getContext().unregisterReceiver(mReceiver);
+        mReceiver = null;
+    }
 
     /**
      * Callback used in testRegisterNetworkCallback that allows caller to block on
@@ -159,12 +213,21 @@
 
     @Before
     public void setUp() throws Exception {
-        if (!isSupported()) return;
+        assumeTrue(isSupported());
 
         mSm = InstrumentationRegistry.getContext().getSystemService(SubscriptionManager.class);
         mSubId = SubscriptionManager.getDefaultDataSubscriptionId();
         mDefaultVoiceSubId = SubscriptionManager.getDefaultVoiceSubscriptionId();
         mPackageName = InstrumentationRegistry.getContext().getPackageName();
+
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        if (mReceiver != null) {
+            InstrumentationRegistry.getContext().unregisterReceiver(mReceiver);
+            mReceiver = null;
+        }
     }
 
     /**
@@ -174,34 +237,25 @@
      */
     @Test
     public void testCorrectness() throws Exception {
-        if (!isSupported()) return;
-
         final boolean hasCellular = findCellularNetwork() != null;
-        if (isSupported() && !hasCellular) {
+        if (!hasCellular) {
             fail("Device claims to support " + PackageManager.FEATURE_TELEPHONY
                     + " but has no active cellular network, which is required for validation");
-        } else if (!isSupported() && hasCellular) {
-            fail("Device has active cellular network, but claims to not support "
-                    + PackageManager.FEATURE_TELEPHONY);
         }
 
-        if (isSupported()) {
-            if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
-                fail("Device must have a valid default data subId for validation");
-            }
+        if (mSubId == SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            fail("Device must have a valid default data subId for validation");
         }
     }
 
     @Test
     public void testGetActiveSubscriptionInfoCount() throws Exception {
-        if (!isSupported()) return;
         assertTrue(mSm.getActiveSubscriptionInfoCount() <=
                 mSm.getActiveSubscriptionInfoCountMax());
     }
 
     @Test
     public void testGetActiveSubscriptionInfoForIcc() throws Exception {
-        if (!isSupported()) return;
         SubscriptionInfo info = ShellIdentityUtils.invokeMethodWithShellPermissions(mSm,
                 (sm) -> sm.getActiveSubscriptionInfo(mSubId));
         assertNotNull(ShellIdentityUtils.invokeMethodWithShellPermissions(mSm,
@@ -210,13 +264,11 @@
 
     @Test
     public void testIsActiveSubscriptionId() throws Exception {
-        if (!isSupported()) return;
         assertTrue(mSm.isActiveSubscriptionId(mSubId));
     }
 
     @Test
     public void testGetSubscriptionIds() throws Exception {
-        if (!isSupported()) return;
         int slotId = SubscriptionManager.getSlotIndex(mSubId);
         int[] subIds = mSm.getSubscriptionIds(slotId);
         assertNotNull(subIds);
@@ -225,7 +277,6 @@
 
     @Test
     public void testGetResourcesForSubId() {
-        if (!isSupported()) return;
         Resources r = ShellIdentityUtils.invokeMethodWithShellPermissions(mSm,
                 (sm) -> sm.getResourcesForSubId(InstrumentationRegistry.getContext(), mSubId));
         // this is an old method which returns mcc/mnc as ints, so use the old SM.getMcc/Mnc methods
@@ -236,14 +287,11 @@
 
     @Test
     public void testIsUsableSubscriptionId() throws Exception {
-        if (!isSupported()) return;
         assertTrue(SubscriptionManager.isUsableSubscriptionId(mSubId));
     }
 
     @Test
     public void testActiveSubscriptions() throws Exception {
-        if (!isSupported()) return;
-
         List<SubscriptionInfo> subList = ShellIdentityUtils.invokeMethodWithShellPermissions(mSm,
                 (sm) -> sm.getActiveSubscriptionInfoList());
         int[] idList = ShellIdentityUtils.invokeMethodWithShellPermissions(mSm,
@@ -269,8 +317,6 @@
 
     @Test
     public void testSubscriptionPlans() throws Exception {
-        if (!isSupported()) return;
-
         // Make ourselves the owner
         setSubPlanOwner(mSubId, mPackageName);
 
@@ -305,8 +351,6 @@
 
     @Test
     public void testSubscriptionPlansOverrideCongested() throws Exception {
-        if (!isSupported()) return;
-
         final ConnectivityManager cm = InstrumentationRegistry.getContext()
                 .getSystemService(ConnectivityManager.class);
         final Network net = findCellularNetwork();
@@ -361,7 +405,7 @@
 
     @Test
     public void testSubscriptionInfoRecord() {
-        if (!isSupported() || !isAutomotive()) return;
+        if (!isAutomotive()) return;
 
         UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
         uiAutomation.adoptShellPermissionIdentity();
@@ -390,8 +434,6 @@
 
     @Test
     public void testSetDefaultVoiceSubId() {
-        if (!isSupported()) return;
-
         int oldSubId = SubscriptionManager.getDefaultVoiceSubscriptionId();
         InstrumentationRegistry.getInstrumentation().getUiAutomation()
                 .adoptShellPermissionIdentity();
@@ -409,8 +451,6 @@
 
     @Test
     public void testSubscriptionPlansOverrideUnmetered() throws Exception {
-        if (!isSupported()) return;
-
         final ConnectivityManager cm = InstrumentationRegistry.getContext()
                 .getSystemService(ConnectivityManager.class);
         final Network net = findCellularNetwork();
@@ -446,8 +486,6 @@
 
     @Test
     public void testSubscriptionPlansUnmetered() throws Exception {
-        if (!isSupported()) return;
-
         final ConnectivityManager cm = InstrumentationRegistry.getContext()
                 .getSystemService(ConnectivityManager.class);
         final Network net = findCellularNetwork();
@@ -495,8 +533,6 @@
 
     @Test
     public void testSubscriptionPlansInvalid() throws Exception {
-        if (!isSupported()) return;
-
         // Make ourselves the owner
         setSubPlanOwner(mSubId, mPackageName);
 
@@ -536,8 +572,6 @@
 
     @Test
     public void testSubscriptionPlansNetworkTypeValidation() throws Exception {
-        if (!isSupported()) return;
-
         // Make ourselves the owner
         setSubPlanOwner(mSubId, mPackageName);
 
@@ -594,8 +628,6 @@
 
     @Test
     public void testSubscriptionGrouping() throws Exception {
-        if (!isSupported()) return;
-
         // Set subscription group with current sub Id. This should fail
         // because we don't have MODIFY_PHONE_STATE or carrier privilege permission.
         List<Integer> subGroup = new ArrayList();
@@ -639,8 +671,6 @@
 
     @Test
     public void testSubscriptionGroupingWithPermission() throws Exception {
-        if (!isSupported()) return;
-
         // Set subscription group with current sub Id.
         List<Integer> subGroup = new ArrayList();
         subGroup.add(mSubId);
@@ -696,8 +726,6 @@
 
     @Test
     public void testAddSubscriptionIntoNewGroupWithPermission() throws Exception {
-        if (!isSupported()) return;
-
         // Set subscription group with current sub Id.
         List<Integer> subGroup = new ArrayList();
         subGroup.add(mSubId);
@@ -728,8 +756,6 @@
 
     @Test
     public void testSettingOpportunisticSubscription() throws Exception {
-        if (!isSupported()) return;
-
         // Set subscription to be opportunistic. This should fail
         // because we don't have MODIFY_PHONE_STATE or carrier privilege permission.
         try {
@@ -745,8 +771,6 @@
 
     @Test
     public void testMccMncString() {
-        if (!isSupported()) return;
-
         SubscriptionInfo info = mSm.getActiveSubscriptionInfo(mSubId);
         String mcc = info.getMccString();
         String mnc = info.getMncString();
@@ -756,8 +780,6 @@
 
     @Test
     public void testSetUiccApplicationsEnabled() throws Exception {
-        if (!isSupported()) return;
-
         boolean canDisable = ShellIdentityUtils.invokeMethodWithShellPermissions(mSm,
                 (sm) -> sm.canDisablePhysicalSubscription());
         if (canDisable) {
@@ -835,8 +857,6 @@
 
     @Test
     public void testSubscriptionInfoCarrierId() {
-        if (!isSupported()) return;
-
         SubscriptionInfo info = mSm.getActiveSubscriptionInfo(mSubId);
         int carrierId = info.getCarrierId();
         assertTrue(carrierId >= TelephonyManager.UNKNOWN_CARRIER_ID);
@@ -844,8 +864,6 @@
 
     @Test
     public void testGetOpportunisticSubscriptions() throws Exception {
-        if (!isSupported()) return;
-
         List<SubscriptionInfo> infoList = mSm.getOpportunisticSubscriptions();
 
         for (SubscriptionInfo info : infoList) {
@@ -855,7 +873,6 @@
 
     @Test
     public void testGetEnabledSubscriptionId() {
-        if (!isSupported()) return;
         int slotId = SubscriptionManager.getSlotIndex(mSubId);
         if (!SubscriptionManager.isValidSlotIndex(slotId)) {
             fail("Invalid slot id " + slotId + " for subscription id " + mSubId);
@@ -867,7 +884,6 @@
 
     @Test
     public void testSetAndCheckSubscriptionEnabled() {
-        if (!isSupported()) return;
         boolean enabled = executeWithShellPermissionAndDefault(false, mSm,
                 (sm) -> sm.isSubscriptionEnabled(mSubId));
 
@@ -956,8 +972,6 @@
 
     @Test
     public void testGetActiveDataSubscriptionId() {
-        if (!isSupported()) return;
-
         int activeDataSubIdCurrent = executeWithShellPermissionAndDefault(
                 SubscriptionManager.INVALID_SUBSCRIPTION_ID, mSm,
                 (sm) -> sm.getActiveDataSubscriptionId());
@@ -972,7 +986,6 @@
 
     @Test
     public void testSetPreferredDataSubscriptionId() {
-        if (!isSupported()) return;
         int preferredSubId = executeWithShellPermissionAndDefault(-1, mSm,
                 (sm) -> sm.getPreferredDataSubscriptionId());
         if (preferredSubId != SubscriptionManager.DEFAULT_SUBSCRIPTION_ID) {
@@ -994,8 +1007,6 @@
 
     @Test
     public void testRestoreAllSimSpecificSettingsFromBackup() throws Exception {
-        if (!isSupported()) return;
-
         int activeDataSubId = ShellIdentityUtils.invokeMethodWithShellPermissions(mSm,
                 (sm) -> sm.getActiveDataSubscriptionId());
         assertNotEquals(activeDataSubId, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
@@ -1099,8 +1110,6 @@
 
     @Test
     public void testSetAndGetD2DStatusSharing() {
-        if (!isSupported()) return;
-
         UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
         uiAutomation.adoptShellPermissionIdentity(MODIFY_PHONE_STATE);
         int originalD2DStatusSharing = mSm.getDeviceToDeviceStatusSharingPreference(mSubId);
@@ -1117,8 +1126,6 @@
 
     @Test
     public void testSetAndGetD2DSharingContacts() {
-        if (!isSupported()) return;
-
         UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
         uiAutomation.adoptShellPermissionIdentity(MODIFY_PHONE_STATE);
         List<Uri> originalD2DSharingContacts = mSm.getDeviceToDeviceStatusSharingContacts(mSubId);
@@ -1130,8 +1137,6 @@
 
     @Test
     public void tetsSetAndGetPhoneNumber() throws Exception {
-        if (!isSupported()) return;
-
         // The phone number may be anything depends on the state of SIM and device.
         // Simply call the getter and make sure no exception.
 
@@ -1215,6 +1220,81 @@
         }
     }
 
+    private Set<Integer> getSupportedUsageSettings() throws Exception {
+        final Set<Integer> supportedUsageSettings = new HashSet();
+        final Context context = InstrumentationRegistry.getContext();
+
+        // Vendors can add supported usage settings by adding resources.
+        try {
+            int[] usageSettingsFromResource = context.getResources().getIntArray(
+                com.android.internal.R.array.config_supported_cellular_usage_settings);
+
+            for (int setting : usageSettingsFromResource) {
+                supportedUsageSettings.add(setting);
+            }
+
+        } catch (Resources.NotFoundException ignore) {
+        }
+
+        // For devices shipping with Radio HAL 2.0 and/or non-HAL devices launching with T,
+        // the usage settings are required to be supported if the rest of the telephony stack
+        // has support for that mode of operation.
+        if (PropertyUtil.isVendorApiLevelAtLeast(android.os.Build.VERSION_CODES.TIRAMISU)) {
+            final PackageManager pm = InstrumentationRegistry.getContext().getPackageManager();
+
+            if (pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_DATA)) {
+                supportedUsageSettings.add(SubscriptionManager.USAGE_SETTING_DATA_CENTRIC);
+            }
+            if (pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_CALLING)) {
+                supportedUsageSettings.add(SubscriptionManager.USAGE_SETTING_VOICE_CENTRIC);
+            }
+        }
+
+        return supportedUsageSettings;
+    }
+
+    private int getUsageSetting() throws Exception {
+        SubscriptionInfo info = ShellIdentityUtils.invokeMethodWithShellPermissions(mSm,
+                (sm) -> sm.getActiveSubscriptionInfo(mSubId));
+        return info.getUsageSetting();
+    }
+
+    private void checkUsageSetting(int inputSetting, boolean isSupported) throws Exception {
+        final int initialSetting = getUsageSetting();
+
+        PersistableBundle bundle = new PersistableBundle();
+        bundle.putInt(CarrierConfigManager.KEY_CELLULAR_USAGE_SETTING_INT, inputSetting);
+        overrideCarrierConfig(bundle, mSubId);
+
+        final int newSetting = getUsageSetting();
+        assertEquals(isSupported ? inputSetting : initialSetting, newSetting);
+    }
+
+    @Test
+    public void testCellularUsageSetting() throws Exception {
+        Set<Integer> supportedUsageSettings = getSupportedUsageSettings();
+
+        // If any setting works, default must be allowed.
+        if (supportedUsageSettings.size() > 0) {
+            supportedUsageSettings.add(SubscriptionManager.USAGE_SETTING_DEFAULT);
+        }
+
+        final int[] allUsageSettings = new int[]{
+                SubscriptionManager.USAGE_SETTING_UNKNOWN,
+                SubscriptionManager.USAGE_SETTING_DEFAULT,
+                SubscriptionManager.USAGE_SETTING_VOICE_CENTRIC,
+                SubscriptionManager.USAGE_SETTING_DATA_CENTRIC,
+                3 /* undefined value */};
+
+        try {
+            for (int setting : allUsageSettings) {
+                checkUsageSetting(setting, supportedUsageSettings.contains(setting));
+            }
+        } finally {
+            overrideCarrierConfig(null, mSubId);
+        }
+    }
+
     @Nullable
     private PersistableBundle getBundleFromBackupData(byte[] data) {
         try (ByteArrayInputStream bis = new ByteArrayInputStream(data)) {
@@ -1224,13 +1304,6 @@
         }
     }
 
-    private void overrideCarrierConfig(PersistableBundle bundle, int subId) throws Exception {
-        CarrierConfigManager carrierConfigManager = InstrumentationRegistry.getContext()
-                .getSystemService(CarrierConfigManager.class);
-        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(carrierConfigManager,
-                (m) -> m.overrideConfig(subId, bundle));
-    }
-
     private void setPreferredDataSubId(int subId) {
         final LinkedBlockingQueue<Integer> resultQueue = new LinkedBlockingQueue<>(1);
         Executor executor = (command)-> command.run();
@@ -1347,8 +1420,8 @@
     }
 
     private static boolean isSupported() {
-        return InstrumentationRegistry.getContext().getPackageManager()
-                .hasSystemFeature(PackageManager.FEATURE_TELEPHONY);
+        return InstrumentationRegistry.getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION);
     }
 
     private static boolean isAutomotive() {
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyCallbackTest.java b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyCallbackTest.java
index 482cd92..89f34c4 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyCallbackTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyCallbackTest.java
@@ -185,7 +185,13 @@
 
     private void registerTelephonyCallback(@NonNull TelephonyCallback callback,
             boolean renounceFine, boolean renounceCoarse) {
-        mTelephonyManager.registerTelephonyCallback(renounceFine, renounceCoarse, mSimpleExecutor,
+        int includeLocationData = TelephonyManager.INCLUDE_LOCATION_DATA_FINE;
+        if (renounceFine && renounceCoarse) {
+            includeLocationData = TelephonyManager.INCLUDE_LOCATION_DATA_NONE;
+        } else if (renounceFine) {
+            includeLocationData = TelephonyManager.INCLUDE_LOCATION_DATA_COARSE;
+        }
+        mTelephonyManager.registerTelephonyCallback(includeLocationData, mSimpleExecutor,
                 callback);
     }
 
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyFeatureFlagsTest.java b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyFeatureFlagsTest.java
new file mode 100644
index 0000000..dbf81f2
--- /dev/null
+++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyFeatureFlagsTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2021 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 android.telephony.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static org.junit.Assert.assertTrue;
+
+import android.content.pm.PackageManager;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Tests for telephony related feature flags defined in {@link android.content.pm.PackageManager}
+ */
+public final class TelephonyFeatureFlagsTest {
+
+    private PackageManager mPackageManager;
+
+    @Before
+    public void setUp() {
+        mPackageManager = getContext().getPackageManager();
+    }
+
+    @Test
+    public void testFeatureFlagsValidation() throws Exception {
+        boolean hasFeatureTelecom = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELECOM);
+        boolean hasFeatureTelephony = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY);
+        boolean hasFeatureCalling = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_CALLING);
+        boolean hasFeatureCarrierLock = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_CARRIERLOCK);
+        boolean hasFeatureCdma = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_CDMA);
+        boolean hasFeatureData = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_DATA);
+        boolean hasFeatureEuicc = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_EUICC);
+        boolean hasFeatureEuiccMep = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_EUICC_MEP);
+        boolean hasFeatureGsm = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_GSM);
+        boolean hasFeatureIms = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_IMS);
+        boolean hasFeatureSingleReg = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION);
+        boolean hasFeatureMbms = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_MBMS);
+        boolean hasFeatureMessaging = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_MESSAGING);
+        boolean hasFeatureRadio = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS);
+        boolean hasFeatureSubscription = mPackageManager.hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION);
+
+        if (hasFeatureCalling) {
+            assertTrue(hasFeatureTelecom && hasFeatureRadio && hasFeatureSubscription);
+        }
+
+        if (hasFeatureCarrierLock) {
+            assertTrue(hasFeatureSubscription);
+        }
+
+        if (hasFeatureCdma) {
+            assertTrue(hasFeatureRadio);
+        }
+
+        if (hasFeatureData) {
+            assertTrue(hasFeatureRadio && hasFeatureSubscription);
+        }
+
+        if (hasFeatureEuicc) {
+            assertTrue(hasFeatureSubscription);
+        }
+
+        if (hasFeatureEuiccMep) {
+            assertTrue(hasFeatureEuicc);
+        }
+
+        if (hasFeatureGsm) {
+            assertTrue(hasFeatureRadio);
+        }
+
+        if (hasFeatureIms) {
+            assertTrue(hasFeatureData);
+        }
+
+        if (hasFeatureSingleReg) {
+            assertTrue(hasFeatureIms);
+        }
+
+        if (hasFeatureMbms) {
+            assertTrue(hasFeatureRadio && hasFeatureSubscription);
+        }
+
+        if (hasFeatureMessaging) {
+            assertTrue(hasFeatureRadio && hasFeatureSubscription);
+        }
+
+        if (hasFeatureRadio) {
+            assertTrue(hasFeatureTelephony);
+        }
+
+        if (hasFeatureSubscription) {
+            assertTrue(hasFeatureTelephony);
+        }
+    }
+}
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyLocationTests.java b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyLocationTests.java
index ed9b38d..f4a23d9 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyLocationTests.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyLocationTests.java
@@ -1,5 +1,7 @@
 package android.telephony.cts;
 
+import static androidx.test.InstrumentationRegistry.getInstrumentation;
+
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -7,8 +9,10 @@
 import static org.junit.Assert.fail;
 
 import android.Manifest;
+import android.app.UiAutomation;
 import android.content.ComponentName;
 import android.content.Context;
+import android.content.ContextParams;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
@@ -19,16 +23,21 @@
 import android.telephony.CellLocation;
 import android.telephony.NetworkRegistrationInfo;
 import android.telephony.ServiceState;
+import android.telephony.TelephonyManager;
 import android.telephony.cts.locationaccessingapp.CtsLocationAccessService;
 import android.telephony.cts.locationaccessingapp.ICtsLocationAccessControl;
 import android.text.TextUtils;
 
+import androidx.annotation.NonNull;
 import androidx.test.InstrumentationRegistry;
 
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.concurrent.Callable;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
@@ -106,6 +115,41 @@
     }
 
     @Test
+    public void testServiceStateLocationSanitizationWithRenouncedPermission() {
+        if (!mShouldTest) return;
+
+        TelephonyManagerTest.grantLocationPermissions();
+        HashSet<String> permissionsToRenounce =
+                new HashSet<>(Arrays.asList(android.Manifest.permission.ACCESS_FINE_LOCATION));
+
+        ServiceState ss =
+                getTelephonyManagerWithRenouncedPermissions(permissionsToRenounce)
+                .getServiceState();
+        assertServiceStateSanitization(ss, true);
+
+        permissionsToRenounce.add(android.Manifest.permission.ACCESS_COARSE_LOCATION);
+        ss = getTelephonyManagerWithRenouncedPermissions(permissionsToRenounce).getServiceState();
+        assertServiceStateSanitization(ss, false);
+    }
+
+    @Test
+    public void testServiceStateListeningWithRenouncedPermission() {
+        if (!mShouldTest) return;
+
+        TelephonyManagerTest.grantLocationPermissions();
+        HashSet<String> permissionsToRenounce =
+                new HashSet<>(Arrays.asList(android.Manifest.permission.ACCESS_FINE_LOCATION));
+        ServiceState ss = CtsLocationAccessService.listenForServiceState(
+                getTelephonyManagerWithRenouncedPermissions(permissionsToRenounce));
+        assertServiceStateSanitization(ss , true);
+
+        permissionsToRenounce.add(android.Manifest.permission.ACCESS_COARSE_LOCATION);
+        ss = CtsLocationAccessService.listenForServiceState(
+                getTelephonyManagerWithRenouncedPermissions(permissionsToRenounce));
+        assertServiceStateSanitization(ss, false);
+    }
+
+    @Test
     public void testServiceStateListeningWithoutPermissions() {
         if (!mShouldTest) return;
 
@@ -393,4 +437,29 @@
         assertTrue(TextUtils.isEmpty(state.getOperatorNumeric()));
     }
 
+    private TelephonyManager getTelephonyManagerWithRenouncedPermissions(
+                HashSet<String> permissionsToRenounce) {
+        Context context = InstrumentationRegistry.getContext();
+        try {
+            return callWithRenouncePermissions(() -> ((TelephonyManager) context.createContext(
+                new ContextParams.Builder()
+                    .setRenouncedPermissions(permissionsToRenounce)
+                    .setAttributionTag(context.getAttributionTag())
+                    .build()).getSystemService(Context.TELEPHONY_SERVICE)));
+        } catch (Exception e) {
+            fail("unable to get service state with renounced permissions:" + e);
+        }
+        return null;
+    }
+
+    private <T> T callWithRenouncePermissions(@NonNull Callable<T> callable)
+            throws Exception {
+        final UiAutomation automan = getInstrumentation().getUiAutomation();
+        automan.adoptShellPermissionIdentity(Manifest.permission.RENOUNCE_PERMISSIONS);
+        try {
+            return callable.call();
+        } finally {
+            automan.dropShellPermissionIdentity();
+        }
+    }
 }
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
index 5b2764d..1436e51 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/TelephonyManagerTest.java
@@ -32,6 +32,7 @@
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import android.Manifest.permission;
 import android.annotation.NonNull;
@@ -51,6 +52,7 @@
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Looper;
+import android.os.Parcel;
 import android.os.PersistableBundle;
 import android.os.Process;
 import android.os.SystemProperties;
@@ -138,6 +140,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Consumer;
+import java.util.function.Predicate;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
@@ -336,8 +339,10 @@
     @Before
     public void setUp() throws Exception {
         mCm = getContext().getSystemService(ConnectivityManager.class);
-        mSubscriptionManager = getContext().getSystemService(SubscriptionManager.class);
         mPackageManager = getContext().getPackageManager();
+        assumeTrue(mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY));
+
+        mSubscriptionManager = getContext().getSystemService(SubscriptionManager.class);
         mCarrierConfigManager = getContext().getSystemService(CarrierConfigManager.class);
         mSelfPackageName = getContext().getPackageName();
         mSelfCertHash = getCertHash(mSelfPackageName);
@@ -377,7 +382,6 @@
     }
 
     private void saveAllowedNetworkTypesForAllReasons() {
-        if (!hasCellular()) return;
         mIsAllowedNetworkTypeChanged = false;
         if (mAllowedNetworkTypesList == null) {
             mAllowedNetworkTypesList = new HashMap<>();
@@ -445,15 +449,14 @@
         }
     }
 
-    /** Checks whether the cellular stack should be running on this device. */
-    private boolean hasCellular() {
-        return mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
-                && mTelephonyManager.getPhoneCount() > 0;
+    /** Checks whether the telephony feature is supported. */
+    private boolean hasFeature(String feature) {
+        return mPackageManager.hasSystemFeature(feature);
     }
 
     @Test
     public void testHasCarrierPrivilegesViaCarrierConfigs() throws Exception {
-        if (!hasCellular()) return;
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
         PersistableBundle carrierConfig = mCarrierConfigManager.getConfigForSubId(mTestSub);
 
         try {
@@ -505,10 +508,8 @@
 
     @Test
     public void testDevicePolicyApn() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_DATA));
+
         // These methods aren't accessible to anything except system and phone by design, so we just
         // look for security exceptions here.
         try {
@@ -550,12 +551,6 @@
 
     @Test
     public void testListen() throws Throwable {
-        if (!InstrumentationRegistry.getContext().getPackageManager()
-                .hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires PackageManager.FEATURE_TELEPHONY");
-            return;
-        }
-
         if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
             // TODO: temp workaround, need to adjust test to for CDMA
             return;
@@ -637,11 +632,6 @@
      */
     @Test
     public void testTelephonyManager() {
-        if (!InstrumentationRegistry.getContext().getPackageManager()
-                .hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires PackageManager.FEATURE_TELEPHONY");
-            return;
-        }
         assertTrue(mTelephonyManager.getNetworkType() >= TelephonyManager.NETWORK_TYPE_UNKNOWN);
         assertTrue(mTelephonyManager.getPhoneType() >= TelephonyManager.PHONE_TYPE_NONE);
         assertTrue(mTelephonyManager.getSimState() >= TelephonyManager.SIM_STATE_UNKNOWN);
@@ -776,10 +766,8 @@
 
     @Test
     public void testGetCallForwarding() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CALLING));
+
         List<Integer> callForwardingReasons = new ArrayList<>();
         callForwardingReasons.add(CallForwardingInfo.REASON_UNCONDITIONAL);
         callForwardingReasons.add(CallForwardingInfo.REASON_BUSY);
@@ -842,10 +830,8 @@
 
     @Test
     public void testSetCallForwarding() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CALLING));
+
         List<Integer> callForwardingReasons = new ArrayList<>();
         callForwardingReasons.add(CallForwardingInfo.REASON_UNCONDITIONAL);
         callForwardingReasons.add(CallForwardingInfo.REASON_BUSY);
@@ -912,6 +898,7 @@
         validCallWaitingStatuses.add(TelephonyManager.CALL_WAITING_STATUS_DISABLED);
         validCallWaitingStatuses.add(TelephonyManager.CALL_WAITING_STATUS_UNKNOWN_ERROR);
         validCallWaitingStatuses.add(TelephonyManager.CALL_WAITING_STATUS_NOT_SUPPORTED);
+        validCallWaitingStatuses.add(TelephonyManager.CALL_WAITING_STATUS_FDN_CHECK_FAILURE);
 
         LinkedBlockingQueue<Integer> callWaitingStatusResult = new LinkedBlockingQueue<>(1);
         ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
@@ -923,13 +910,12 @@
 
     @Test
     public void testSetCallWaitingStatus() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CALLING));
+
         Set<Integer> validCallWaitingErrors = new HashSet<Integer>();
         validCallWaitingErrors.add(TelephonyManager.CALL_WAITING_STATUS_UNKNOWN_ERROR);
         validCallWaitingErrors.add(TelephonyManager.CALL_WAITING_STATUS_NOT_SUPPORTED);
+        validCallWaitingErrors.add(TelephonyManager.CALL_WAITING_STATUS_FDN_CHECK_FAILURE);
         Executor executor = getContext().getMainExecutor();
         {
             LinkedBlockingQueue<Integer> callWaitingResult = new LinkedBlockingQueue<>(1);
@@ -960,11 +946,6 @@
 
     @Test
     public void testGetRadioHalVersion() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG,"skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
-
         Pair<Integer, Integer> version = mTelephonyManager.getRadioHalVersion();
 
         // The version must be valid, and the versions start with 1.0
@@ -974,10 +955,6 @@
 
     @Test
     public void testCreateForPhoneAccountHandle() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires FEATURE_TELEPHONY");
-            return;
-        }
         if (!mTelephonyManager.isVoiceCapable()) {
             Log.d(TAG, "Skipping test that requires config_voice_capable is true");
             return;
@@ -1008,10 +985,6 @@
 
     @Test
     public void testGetPhoneAccountHandle() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires FEATURE_TELEPHONY");
-            return;
-        }
         TelecomManager telecomManager = getContext().getSystemService(TelecomManager.class);
         PhoneAccountHandle defaultAccount = telecomManager
                 .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
@@ -1065,11 +1038,6 @@
      */
     @Test
     public void testGetMaxNumberOfSimultaneouslyActiveSims() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires FEATURE_TELEPHONY");
-            return;
-        }
-
         int maxNum = mTelephonyManager.getMaxNumberOfSimultaneouslyActiveSims();
         assertTrue(maxNum >= 1);
     }
@@ -1247,30 +1215,26 @@
 
     @Test
     public void testGetNetworkCountryIso() {
-        if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            String countryCode = mTelephonyManager.getNetworkCountryIso();
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
+        String countryCode = mTelephonyManager.getNetworkCountryIso();
+        assertTrue("Country code '" + countryCode + "' did not match "
+                + ISO_COUNTRY_CODE_PATTERN,
+                Pattern.matches(ISO_COUNTRY_CODE_PATTERN, countryCode));
+
+        for (int i = 0; i < mTelephonyManager.getPhoneCount(); i++) {
+            countryCode = mTelephonyManager.getNetworkCountryIso(i);
+
             assertTrue("Country code '" + countryCode + "' did not match "
-                            + ISO_COUNTRY_CODE_PATTERN,
+                    + ISO_COUNTRY_CODE_PATTERN + " for slot " + i,
                     Pattern.matches(ISO_COUNTRY_CODE_PATTERN, countryCode));
-
-            for (int i = 0; i < mTelephonyManager.getPhoneCount(); i++) {
-                countryCode = mTelephonyManager.getNetworkCountryIso(i);
-
-                assertTrue("Country code '" + countryCode + "' did not match "
-                                + ISO_COUNTRY_CODE_PATTERN + " for slot " + i,
-                        Pattern.matches(ISO_COUNTRY_CODE_PATTERN, countryCode));
-            }
-        } else {
-            // Non-telephony may still have the property defined if it has a SIM.
         }
     }
 
     @Test
     public void testSetSystemSelectionChannels() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         LinkedBlockingQueue<Boolean> queue = new LinkedBlockingQueue<>(1);
         final UiAutomation uiAutomation =
                 InstrumentationRegistry.getInstrumentation().getUiAutomation();
@@ -1312,6 +1276,8 @@
 
     @Test
     public void testGetSimCountryIso() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         String countryCode = mTelephonyManager.getSimCountryIso();
         if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
             assertTrue("Country code '" + countryCode + "' did not match "
@@ -1324,11 +1290,6 @@
 
     @Test
     public void testResetSettings() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
-
         UserManager userManager = getContext().getSystemService(UserManager.class);
 
         boolean canChangeMobileNetworkSettings = userManager != null
@@ -1388,6 +1349,8 @@
 
     @Test
     public void testGetServiceState() throws InterruptedException {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         if (mCm.getNetworkInfo(ConnectivityManager.TYPE_MOBILE) == null) {
             Log.d(TAG, "Skipping test that requires ConnectivityManager.TYPE_MOBILE");
             return;
@@ -1417,11 +1380,12 @@
         }
 
         assertEquals(mServiceState, mTelephonyManager.getServiceState());
-        assertServiceStateSanitization(mServiceState, mTelephonyManager.getServiceState(true,
-                true));
+        assertServiceStateSanitization(mServiceState, mTelephonyManager.getServiceState(
+                TelephonyManager.INCLUDE_LOCATION_DATA_NONE));
         assertServiceStateFineLocationSanitization(mServiceState,
-                mTelephonyManager.getServiceState(true, false));
-        assertEquals(mServiceState, mTelephonyManager.getServiceState(false, true));
+                mTelephonyManager.getServiceState(TelephonyManager.INCLUDE_LOCATION_DATA_COARSE));
+        assertEquals(mServiceState, mTelephonyManager.getServiceState(
+                TelephonyManager.INCLUDE_LOCATION_DATA_FINE));
     }
 
     private void assertServiceStateSanitization(ServiceState expectedServiceState,
@@ -1459,6 +1423,8 @@
 
     @Test
     public void testGetServiceStateForInactiveSub() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         if (mCm.getNetworkInfo(ConnectivityManager.TYPE_MOBILE) == null) {
             Log.d(TAG, "Skipping test that requires ConnectivityManager.TYPE_MOBILE");
             return;
@@ -1481,6 +1447,8 @@
     @Test
     @CddTest(requirement = "7.4.1/C-4-1")
     public void testIWlanServiceState() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         if (mCm.getNetworkInfo(ConnectivityManager.TYPE_MOBILE) == null) {
             Log.d(TAG, "Skipping test that requires ConnectivityManager.TYPE_MOBILE");
             return;
@@ -1515,10 +1483,6 @@
 
     @Test
     public void testGetPhoneCapabilityAndVerify() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG,"skipping test that requires Telephony");
-            return;
-        }
         boolean is5gStandalone = getContext().getResources().getBoolean(
                 Resources.getSystem().getIdentifier("config_telephony5gStandalone", "bool",
                         "android"));
@@ -1627,10 +1591,6 @@
      */
     @Test
     public void testGetImeiForSlot() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
-
         for (int i = 0; i < mTelephonyManager.getPhoneCount(); i++) {
             // The compiler error 'local variables referenced from a lambda expression must be final
             // or effectively final' is reported when using i, so assign it to a final variable.
@@ -1655,9 +1615,7 @@
      */
     @Test
     public void testGetRadioPowerState() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // Also verify that no exception is thrown.
         assertThat(mTelephonyManager.getRadioPowerState()).isEqualTo(
@@ -1670,9 +1628,8 @@
      */
     @Test
     public void testSetCarrierDataEnabled() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_DATA));
+
         // Also verify that no exception is thrown.
         ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mTelephonyManager,
                 (tm) -> tm.setCarrierDataEnabled(false));
@@ -1681,14 +1638,13 @@
     }
 
     /**
-     * Verifies that {@link TelephonyManager#rebootRadio()} does not throw any exception
+     * Verifies that {@link TelephonyManager#rebootModem()} does not throw any exception
      * and final radio state is radio power on.
      */
     @Test
     public void testRebootRadio() throws Throwable {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         TestThread t = new TestThread(new Runnable() {
             public void run() {
                 Looper.prepare();
@@ -1719,10 +1675,11 @@
                 TelephonyManager.RADIO_POWER_ON);
         assertThat(mRadioRebootTriggered).isFalse();
         assertThat(mHasRadioPowerOff).isFalse();
-        boolean success = ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
-                (tm) -> tm.rebootRadio());
-        //skip this test if not supported or unsuccessful (success=false)
-        if(!success) {
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mTelephonyManager,
+                    (tm) -> tm.rebootModem());
+        } catch (Exception ex) {
+            //skip this test if not supported or unsuccessful (success=false)
             return;
         }
 
@@ -1784,9 +1741,8 @@
      */
     @Test
     public void testGetAidForAppType() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
                 (tm) -> tm.getAidForAppType(TelephonyManager.APPTYPE_SIM));
         ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
@@ -1804,9 +1760,8 @@
      */
     @Test
     public void testGetIsimDomain() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
                 (tm) -> tm.getIsimDomain());
     }
@@ -1818,9 +1773,8 @@
     @Ignore("API moved back to @hide for Android R.")
     @Test
     public void testGetIsimImpu() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
                 TelephonyManager::getIsimImpu);
         // Try without the correct permissions and ensure it fails.
@@ -1838,9 +1792,8 @@
      */
     @Test
     public void testNetworkRegistrationInfoRegisteredPlmn() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         // get NetworkRegistration object
         ServiceState ss = mTelephonyManager.getServiceState();
         assertNotNull(ss);
@@ -1872,9 +1825,8 @@
      */
     @Test
     public void testNetworkRegistrationInfoIsRoaming() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         // get NetworkRegistration object
         NetworkRegistrationInfo nwReg = mTelephonyManager.getServiceState()
                 .getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_CS,
@@ -1890,9 +1842,8 @@
      */
     @Test
     public void testNetworkRegistrationInfoGetRoamingType() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         // get NetworkRegistration object for voice
         NetworkRegistrationInfo nwReg = mTelephonyManager.getServiceState()
                 .getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_CS,
@@ -1916,9 +1867,8 @@
      */
     @Test
     public void testNetworkRegistationStateGetAccessNetworkTechnology() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         // get NetworkRegistration object for voice
         NetworkRegistrationInfo nwReg = mTelephonyManager.getServiceState()
                 .getNetworkRegistrationInfo(NetworkRegistrationInfo.DOMAIN_CS,
@@ -1940,6 +1890,8 @@
      */
     @Test
     public void testGetMeid() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CDMA));
+
         String meid = ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
                 (tm) -> tm.getMeid());
 
@@ -1955,9 +1907,7 @@
      */
     @Test
     public void testGetMeidForSlot() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CDMA));
 
         SubscriptionManager sm = getContext().getSystemService(SubscriptionManager.class);
         List<SubscriptionInfo> subInfos = sm.getActiveSubscriptionInfoList();
@@ -1993,10 +1943,6 @@
      */
     @Test
     public void testSendDialerSpecialCode() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires FEATURE_TELEPHONY");
-            return;
-        }
         try {
             mTelephonyManager.sendDialerSpecialCode("4636");
             fail("Expected SecurityException. App does not have carrier privileges or is not the "
@@ -2010,9 +1956,8 @@
      */
     @Test
     public void testGetForbiddenPlmns() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         String[] plmns = mTelephonyManager.getForbiddenPlmns();
 
         int phoneType = mTelephonyManager.getPhoneType();
@@ -2041,9 +1986,8 @@
      */
     @Test
     public void testSetForbiddenPlmns() {
-        if (!supportSetFplmn()) {
-            return;
-        }
+        assumeTrue(supportSetFplmn());
+
         String[] originalFplmns = mTelephonyManager.getForbiddenPlmns();
         try {
             int numFplmnsSet = ShellIdentityUtils.invokeMethodWithShellPermissions(
@@ -2065,9 +2009,8 @@
      */
     @Test
     public void testSetForbiddenPlmnsTruncate() {
-        if (!supportSetFplmn()) {
-            return;
-        }
+        assumeTrue(supportSetFplmn());
+
         String[] originalFplmns = mTelephonyManager.getForbiddenPlmns();
         try {
             List<String> targetFplmns = new ArrayList<>();
@@ -2098,9 +2041,8 @@
      */
     @Test
     public void testSetForbiddenPlmnsDelete() {
-        if (!supportSetFplmn()) {
-            return;
-        }
+        assumeTrue(supportSetFplmn());
+
         String[] originalFplmns = mTelephonyManager.getForbiddenPlmns();
         try {
             // Support test for empty SIM
@@ -2133,9 +2075,8 @@
      */
     @Test
     public void testSetForbiddenPlmnsVoid() {
-        if (!supportSetFplmn()) {
-            return;
-        }
+        assumeTrue(supportSetFplmn());
+
         String[] originalFplmns = mTelephonyManager.getForbiddenPlmns();
         try {
             ShellIdentityUtils.invokeMethodWithShellPermissions(
@@ -2151,9 +2092,7 @@
 
     @Test
     public void testGetEquivalentHomePlmns() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
 
         List<String> plmns = mTelephonyManager.getEquivalentHomePlmns();
 
@@ -2177,9 +2116,8 @@
      */
     @Test
     public void testGetManualNetworkSelectionPlmnNonPersisted() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         if (mTelephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_GSM) return;
 
         try {
@@ -2201,9 +2139,8 @@
      */
     @Test
     public void testGetManualNetworkSelectionPlmnPersisted() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         if (mTelephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_GSM) return;
 
         try {
@@ -2225,6 +2162,8 @@
      */
     @Test
     public void testGetCardIdForDefaultEuicc() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_EUICC));
+
         int cardId = mTelephonyManager.getCardIdForDefaultEuicc();
         assertTrue("Card ID for default EUICC is not a valid value",
                 cardId == TelephonyManager.UNSUPPORTED_CARD_ID
@@ -2237,10 +2176,8 @@
      */
     @Test
     public void testGetUiccCardsInfoException() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         try {
             // Requires READ_PRIVILEGED_PHONE_STATE or carrier privileges
             List<UiccCardInfo> infos = mTelephonyManager.getUiccCardsInfo();
@@ -2254,10 +2191,7 @@
      */
     @Test
     public void testGetUiccCardsInfo() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires FEATURE_TELEPHONY");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
 
         // The API requires either READ_PRIVILEGED_PHONE_STATE or carrier privileges
         try {
@@ -2306,9 +2240,7 @@
      */
     @Test
     public void testGetNetworkSelectionMode() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         try {
             ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mTelephonyManager,
@@ -2328,10 +2260,8 @@
      */
     @Test
     public void testSetNetworkSelectionModeAutomatic() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires FEATURE_TELEPHONY");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         try {
             mTelephonyManager.setNetworkSelectionModeAutomatic();
             fail("Expected SecurityException. App does not have carrier privileges.");
@@ -2346,10 +2276,8 @@
      */
     @Test
     public void testSetNetworkSelectionModeManual() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires FEATURE_TELEPHONY");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         try {
             mTelephonyManager.setNetworkSelectionModeManual(
                     "" /* operatorNumeric */, false /* persistSelection */);
@@ -2363,10 +2291,8 @@
      */
     @Test
     public void testIsManualNetworkSelectionAllowed() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires FEATURE_TELEPHONY");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         if (mTelephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_GSM) return;
 
         assertTrue(ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
@@ -2444,8 +2370,52 @@
         assertEquals(false, cq.isRtpInactivityDetected());
         assertEquals(false, cq.isIncomingSilenceDetectedAtCallSetup());
         assertEquals(false, cq.isOutgoingSilenceDetectedAtCallSetup());
+        assertEquals(0, cq.getNumVoiceFrames());
+        assertEquals(0, cq.getNumNoDataFrames());
+        assertEquals(0, cq.getNumDroppedRtpPackets());
+        assertEquals(0, cq.getMinPlayoutDelayMillis());
+        assertEquals(0, cq.getMaxPlayoutDelayMillis());
+        assertEquals(0, cq.getNumRtpSidPacketsReceived());
+        assertEquals(0, cq.getNumRtpDuplicatePackets());
     }
 
+    /**
+     * Validate CallQuality Parcel
+     */
+    @Test
+    public void testCallQualityParcel() {
+        CallQuality cq = new CallQuality.Builder()
+                .setDownlinkCallQualityLevel(CallQuality.CALL_QUALITY_NOT_AVAILABLE)
+                .setUplinkCallQualityLevel(CallQuality.CALL_QUALITY_NOT_AVAILABLE)
+                .setCallDurationMillis(20000)
+                .setNumRtpPacketsTransmitted(550)
+                .setNumRtpPacketsReceived(450)
+                .setNumRtpPacketsTransmittedLost(4)
+                .setNumRtpPacketsNotReceived(6)
+                .setAverageRelativeJitter(20)
+                .setMaxRelativeJitter(30)
+                .setAverageRoundTripTimeMillis(150)
+                .setCodecType(0)
+                .setRtpInactivityDetected(false)
+                .setIncomingSilenceDetectedAtCallSetup(false)
+                .setOutgoingSilenceDetectedAtCallSetup(false)
+                .setNumVoiceFrames(300)
+                .setNumNoDataFrames(300)
+                .setNumDroppedRtpPackets(5)
+                .setMinPlayoutDelayMillis(500)
+                .setMaxPlayoutDelayMillis(1000)
+                .setNumRtpSidPacketsReceived(300)
+                .setNumRtpDuplicatePackets(0)
+                .build();
+
+        Parcel stateParcel = Parcel.obtain();
+        cq.writeToParcel(stateParcel, 0);
+        stateParcel.setDataPosition(0);
+
+        CallQuality parcelCq = CallQuality.CREATOR.createFromParcel(stateParcel);
+        assertThat(cq).isEqualTo(parcelCq);
+
+    }
 
     // Reference: packages/services/Telephony/ecc/input/eccdata.txt
     private static final Map<String, String> EMERGENCY_NUMBERS_FOR_COUNTRIES =
@@ -2468,9 +2438,8 @@
      */
     @Test
     public void testGetEmergencyNumberList() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CALLING));
+
         Map<Integer, List<EmergencyNumber>> emergencyNumberList =
                 mTelephonyManager.getEmergencyNumberList();
 
@@ -2493,9 +2462,8 @@
      */
     @Test
     public void testGetEmergencyNumberListForCategories() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CALLING));
+
         Map<Integer, List<EmergencyNumber>> emergencyNumberList =
                 mTelephonyManager.getEmergencyNumberList(
                         EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_POLICE);
@@ -2524,9 +2492,7 @@
      */
     @Test
     public void testIsEmergencyNumber() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CALLING));
 
         for (Map.Entry<String, String> entry : EMERGENCY_NUMBERS_FOR_COUNTRIES.entrySet()) {
             if (mTelephonyManager.getNetworkCountryIso().equals(entry.getKey())) {
@@ -2540,9 +2506,7 @@
      */
     @Test
     public void testIsPotentialEmergencyNumber() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CALLING));
 
         String countryIso = mTelephonyManager.getNetworkCountryIso();
         String potentialEmergencyAddress = "91112345";
@@ -2563,14 +2527,9 @@
      */
     @Test
     public void testSetGetCallComposerStatus() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CALLING));
 
-        boolean hasImsFeature = mPackageManager.hasSystemFeature(
-                PackageManager.FEATURE_TELEPHONY_IMS);
-
-        if (hasImsFeature) {
+        if (hasFeature(PackageManager.FEATURE_TELEPHONY_IMS)) {
             ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mTelephonyManager,
                     tm -> tm.setCallComposerStatus(TelephonyManager.CALL_COMPOSER_STATUS_OFF));
             int status = ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
@@ -2602,9 +2561,8 @@
      */
     @Test
     public void testGetRadioAccessFamily() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         long raf = ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
                 (tm) -> tm.getSupportedRadioAccessFamily());
         assertThat(raf).isNotEqualTo(TelephonyManager.NETWORK_TYPE_BITMASK_UNKNOWN);
@@ -2625,6 +2583,8 @@
      */
     @Test
     public void testPreferredOpportunisticDataSubscription() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_DATA));
+
         int randomSubId = 1;
         int activeSubscriptionInfoCount = ShellIdentityUtils.invokeMethodWithShellPermissions(
                 mSubscriptionManager, (tm) -> tm.getActiveSubscriptionInfoCount());
@@ -2751,15 +2711,14 @@
      */
     @Test
     public void testUpdateAvailableNetworks() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         int randomSubId = 1;
         int activeSubscriptionInfoCount = ShellIdentityUtils.invokeMethodWithShellPermissions(
                 mSubscriptionManager, (tm) -> tm.getActiveSubscriptionInfoCount());
         boolean isOpportunisticNetworkEnabled = ShellIdentityUtils.invokeMethodWithShellPermissions(
                 mTelephonyManager, (tm) -> tm.isOpportunisticNetworkEnabled());
 
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
         if (!isOpportunisticNetworkEnabled) {
             return;
         }
@@ -2816,9 +2775,8 @@
 
     @Test
     public void testSwitchMultiSimConfig() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         try {
             mTelephonyManager.switchMultiSimConfig(mTelephonyManager.getActiveModemCount());
             fail("TelephonyManager#switchMultiSimConfig should require the MODIFY_PHONE_STATE"
@@ -2839,9 +2797,8 @@
 
     @Test
     public void testIccOpenLogicalChannelBySlot() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         // just verify no crash
         try {
             ShellIdentityUtils.invokeMethodWithShellPermissions(
@@ -2868,9 +2825,8 @@
 
     @Test
     public void testIccCloseLogicalChannelBySlot() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         // just verify no crash
         try {
             ShellIdentityUtils.invokeMethodWithShellPermissions(
@@ -2884,24 +2840,31 @@
         if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
             return;
         }
+        int slotIndex = getValidSlotIndexAndPort().getKey();
+        int portIndex = getValidSlotIndexAndPort().getValue();
         // just verify no crash
         try {
             ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                    mTelephonyManager, (tm) -> tm.iccCloseLogicalChannelByPort(0, 0, 0));
+                    mTelephonyManager, (tm) -> tm.iccCloseLogicalChannelByPort(
+                            slotIndex, portIndex, 0));
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            // IllegalArgumentException and IllegalStateException is okay, just not
+            // SecurityException
         } catch (SecurityException e) {
             // IllegalArgumentException is okay, just not SecurityException
             fail("iccCloseLogicalChannelByPort: SecurityException not expected");
         }
         try {
             ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                    mTelephonyManager, (tm) -> tm.iccCloseLogicalChannelByPort(0, -1, 0));
+                    mTelephonyManager, (tm) -> tm.iccCloseLogicalChannelByPort(slotIndex, -1, 0));
             fail("Expected IllegalArgumentException, invalid PortIndex");
         } catch (IllegalArgumentException e) {
             // IllegalArgumentException is expected
         }
         try {
             ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
-                    mTelephonyManager, (tm) -> tm.iccCloseLogicalChannelByPort(0, 0, -1));
+                    mTelephonyManager, (tm) -> tm.iccCloseLogicalChannelByPort(
+                            slotIndex, portIndex, -1));
             fail("Expected IllegalArgumentException, invalid channel");
         } catch (IllegalArgumentException e) {
             // IllegalArgumentException is expected
@@ -2910,9 +2873,8 @@
 
     @Test
     public void testIccTransmitApduLogicalChannelBySlot() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         int slotIndex = getValidSlotIndexAndPort().getKey();
         String result = ShellIdentityUtils.invokeMethodWithShellPermissions(
                 mTelephonyManager, (tm) -> tm.iccTransmitApduLogicalChannelBySlot(
@@ -2954,9 +2916,8 @@
     }
     @Test
     public void testIccTransmitApduBasicChannelBySlot() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         // just verify no crash
         int slotIndex = getValidSlotIndexAndPort().getKey();
         try {
@@ -3001,9 +2962,8 @@
 
     @Test
     public void testIsIccLockEnabled() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         // verify SecurityException
         try {
             mTelephonyManager.isIccLockEnabled();
@@ -3023,9 +2983,8 @@
 
     @Test
     public void testIsDataEnabledForApn() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_DATA));
+
         // verify SecurityException
         try {
             mTelephonyManager.isDataEnabledForApn(ApnSetting.TYPE_MMS);
@@ -3045,9 +3004,8 @@
 
     @Test
     public void testIsTetheringApnRequired() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_DATA));
+
         // verify SecurityException
         try {
             mTelephonyManager.isTetheringApnRequired();
@@ -3068,9 +3026,8 @@
 
     @Test
     public void testGetCarrierInfoForImsiEncryption() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         // test without permission: verify SecurityException
         try {
             mTelephonyManager.getCarrierInfoForImsiEncryption(TelephonyManager.KEY_TYPE_EPDG);
@@ -3161,9 +3118,8 @@
 
     @Test
     public void testResetCarrierKeysForImsiEncryption() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         // test without permission: verify SecurityException
         try {
             mTelephonyManager.resetCarrierKeysForImsiEncryption();
@@ -3183,9 +3139,8 @@
 
     @Test
     public void testIsInEmergencySmsMode() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_MESSAGING));
+
         // test without permission: verify SecurityException
         try {
             mTelephonyManager.isInEmergencySmsMode();
@@ -3205,9 +3160,7 @@
 
     @Test
     public void testGetSubscriptionId() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
 
         TelephonyManager tm = mTelephonyManager.createForSubscriptionId(1);
         int subId = tm.getSubscriptionId();
@@ -3216,9 +3169,7 @@
 
     @Test
     public void testSetAllowedNetworkTypes() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // test without permission: verify SecurityException
         long allowedNetworkTypes = TelephonyManager.NETWORK_TYPE_BITMASK_NR;
@@ -3248,9 +3199,7 @@
 
     @Test
     public void testDisAllowedNetworkTypes() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         long allowedNetworkTypes = -1 & (~TelephonyManager.NETWORK_TYPE_BITMASK_NR);
         long networkTypeBitmask = TelephonyManager.NETWORK_TYPE_BITMASK_NR
@@ -3291,9 +3240,7 @@
 
     @Test
     public void testSetAllowedNetworkTypesForReason() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // test without permission: verify SecurityException
         long allowedNetworkTypes = TelephonyManager.NETWORK_TYPE_BITMASK_NR;
@@ -3328,9 +3275,7 @@
 
     @Test
     public void testSetAllowedNetworkTypesForReason_moreReason() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // test without permission: verify SecurityException
         long allowedNetworkTypes1 = TelephonyManager.NETWORK_TYPE_BITMASK_NR
@@ -3401,9 +3346,7 @@
 
     @Test
     public void testIsApplicationOnUicc() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
 
         // Expect a security exception without permission.
         try {
@@ -3427,10 +3370,6 @@
 
     @Test
     public void testRequestModemActivityInfo() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
-
         InstrumentationRegistry.getInstrumentation().getUiAutomation()
                 .adoptShellPermissionIdentity("android.permission.MODIFY_PHONE_STATE");
         try {
@@ -3470,10 +3409,6 @@
 
     @Test
     public void testGetSupportedModemCount() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
-
         int supportedModemCount = mTelephonyManager.getSupportedModemCount();
         int activeModemCount = mTelephonyManager.getActiveModemCount();
         assertTrue(activeModemCount >= 0);
@@ -3513,10 +3448,6 @@
 
     @Test
     public void testIsModemEnabledForSlot() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
-
         int activeModemCount = mTelephonyManager.getActiveModemCount();
         for (int i = 0; i < activeModemCount; i++) {
             // Call isModemEnabledForSlot for each slot and verify no crash.
@@ -3526,12 +3457,8 @@
 
     @Test
     public void testOpportunisticNetworkState() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
-        if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_WATCH)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS)
+                && !mPackageManager.hasSystemFeature(PackageManager.FEATURE_WATCH));
 
         boolean isEnabled = ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
                 tm -> tm.isOpportunisticNetworkEnabled());
@@ -3549,9 +3476,8 @@
 
     @Test
     public void testGetSimApplicationState() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         int simApplicationState = mTelephonyManager.getSimApplicationState();
         assertTrue(Arrays.asList(TelephonyManager.SIM_STATE_UNKNOWN,
                 TelephonyManager.SIM_STATE_PIN_REQUIRED,
@@ -3576,10 +3502,40 @@
     }
 
     @Test
-    public void testGetSimCardState() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
+    public void testGetSimApplicationStateWithPhysicalSlotIndexAndPortIndex() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
+        try {
+            List<UiccCardInfo> cardInfoList =
+                    ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
+                            (tm) -> tm.getUiccCardsInfo());
+            for (UiccCardInfo cardInfo : cardInfoList) {
+                int physicalSlotIndex = cardInfo.getPhysicalSlotIndex();
+                List<UiccPortInfo> portInfoList = (List<UiccPortInfo>) cardInfo.getPorts();
+                for (UiccPortInfo uiccPortInfo : portInfoList) {
+                    int portIndex = uiccPortInfo.getPortIndex();
+                    int simApplicationState =
+                            ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
+                                    (tm) -> tm.getSimApplicationState(physicalSlotIndex,
+                                            portIndex));
+                    assertTrue(Arrays.asList(TelephonyManager.SIM_STATE_UNKNOWN,
+                            TelephonyManager.SIM_STATE_PIN_REQUIRED,
+                            TelephonyManager.SIM_STATE_PUK_REQUIRED,
+                            TelephonyManager.SIM_STATE_NETWORK_LOCKED,
+                            TelephonyManager.SIM_STATE_NOT_READY,
+                            TelephonyManager.SIM_STATE_PERM_DISABLED,
+                            TelephonyManager.SIM_STATE_LOADED).contains(simApplicationState));
+                }
+            }
+        } catch (SecurityException e) {
+            fail("Caller with READ_PRIVILEGED_PHONE_STATE should be able to call API");
         }
+    }
+
+    @Test
+    public void testGetSimCardState() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         int simCardState = mTelephonyManager.getSimCardState();
         assertTrue(Arrays.asList(TelephonyManager.SIM_STATE_UNKNOWN,
                 TelephonyManager.SIM_STATE_ABSENT,
@@ -3589,14 +3545,11 @@
     }
     @Test
     public void getSimCardStateTest() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         InstrumentationRegistry.getInstrumentation().getUiAutomation()
                 .adoptShellPermissionIdentity("android.permission.READ_PRIVILEGED_PHONE_STATE");
         List<UiccCardInfo> cardsInfo = mTelephonyManager.getUiccCardsInfo();
-        InstrumentationRegistry.getInstrumentation().getUiAutomation()
-                .dropShellPermissionIdentity();
         for (UiccCardInfo cardInfo : cardsInfo) {
             for (UiccPortInfo portInfo : cardInfo.getPorts()) {
                 int simCardState = mTelephonyManager.getSimCardState(cardInfo
@@ -3608,6 +3561,8 @@
                         TelephonyManager.SIM_STATE_PRESENT).contains(simCardState));
             }
         }
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .dropShellPermissionIdentity();
     }
 
     private boolean isDataEnabled() {
@@ -3617,10 +3572,11 @@
 
     @Test
     public void testThermalDataEnable() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_DATA));
 
+        // Perform this test on default data subscription.
+        mTelephonyManager = getContext().getSystemService(TelephonyManager.class)
+                .createForSubscriptionId(SubscriptionManager.getDefaultDataSubscriptionId());
         ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
                 mTelephonyManager,
                 (tm) -> tm.setDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_THERMAL,
@@ -3654,10 +3610,11 @@
 
     @Test
     public void testPolicyDataEnable() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_DATA));
 
+        // Perform this test on default data subscription.
+        mTelephonyManager = getContext().getSystemService(TelephonyManager.class)
+                .createForSubscriptionId(SubscriptionManager.getDefaultDataSubscriptionId());
         ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
                 mTelephonyManager,
                 (tm) -> tm.setDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_POLICY,
@@ -3691,10 +3648,11 @@
 
     @Test
     public void testCarrierDataEnable() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_DATA));
 
+        // Perform this test on default data subscription.
+        mTelephonyManager = getContext().getSystemService(TelephonyManager.class)
+                .createForSubscriptionId(SubscriptionManager.getDefaultDataSubscriptionId());
         ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
                 mTelephonyManager,
                 (tm) -> tm.setDataEnabledForReason(TelephonyManager.DATA_ENABLED_REASON_CARRIER,
@@ -3727,9 +3685,7 @@
 
     @Test
     public void testUserDataEnable() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_DATA));
 
         ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
                 mTelephonyManager,
@@ -3763,9 +3719,7 @@
 
     @Test
     public void testDataDuringVoiceCallPolicy() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_DATA));
 
         ShellIdentityUtils.ShellPermissionMethodHelper<Boolean, TelephonyManager> getPolicyHelper =
                 (tm) -> tm.isMobileDataPolicyEnabled(
@@ -3797,9 +3751,7 @@
 
     @Test
     public void testAlwaysAllowMmsDataPolicy() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_DATA));
 
         ShellIdentityUtils.ShellPermissionMethodHelper<Boolean, TelephonyManager> getPolicyHelper =
                 (tm) -> tm.isMobileDataPolicyEnabled(
@@ -3831,6 +3783,8 @@
 
     @Test
     public void testGetCdmaEnhancedRoamingIndicatorDisplayNumber() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CDMA));
+
         int index = mTelephonyManager.getCdmaEnhancedRoamingIndicatorDisplayNumber();
         int phoneType = mTelephonyManager.getPhoneType();
         if (phoneType == TelephonyManager.PHONE_TYPE_CDMA) {
@@ -3867,9 +3821,7 @@
 
     @Test
     public void testNrDualConnectivityEnable() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         if (!ShellIdentityUtils.invokeMethodWithShellPermissions(
                 mTelephonyManager, (tm) -> tm.isRadioInterfaceCapabilitySupported(
@@ -3913,10 +3865,8 @@
 
     @Test
     public void testCdmaRoamingMode() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
-                || mTelephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_CDMA) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
+                && mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA);
 
         // Save state
         int cdmaRoamingMode = ShellIdentityUtils.invokeMethodWithShellPermissions(mTelephonyManager,
@@ -3940,10 +3890,8 @@
 
     @Test
     public void testCdmaSubscriptionMode() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)
-                || mTelephonyManager.getPhoneType() != TelephonyManager.PHONE_TYPE_CDMA) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CDMA)
+                && mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA);
 
         // Save state
         int cdmaSubscriptionMode = ShellIdentityUtils.invokeMethodWithShellPermissions(
@@ -3967,9 +3915,8 @@
 
     @Test
     public void testPinResult() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         final String empty_pin = ""; // For getting current remaining pin attempt.
         final String pin = "fake_pin";
         final String puk = "fake_puk";
@@ -4017,10 +3964,7 @@
 
     @Test
     public void testSetSignalStrengthUpdateRequest_nullRequest() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // Verify NPE throws if set request with null object
         try {
@@ -4032,10 +3976,7 @@
 
     @Test
     public void testSetSignalStrengthUpdateRequest_noPermission() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         final SignalStrengthUpdateRequest normalRequest =
                 new SignalStrengthUpdateRequest.Builder()
@@ -4061,10 +4002,7 @@
 
     @Test
     public void testSetSignalStrengthUpdateRequest_systemThresholdReportingRequestedWhileIdle() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // Verify system privileged app with permission LISTEN_ALWAYS_REPORTED_SIGNAL_STRENGTH can
         // set systemThresholdReportingRequestedWhileIdle to true with empty thresholdInfos
@@ -4079,10 +4017,7 @@
 
     @Test
     public void testSetSignalStrengthUpdateRequest_hysteresisDbSet() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // Verify SE throws for app when set hysteresisDb in the SignalThresholdInfo
         SignalStrengthUpdateRequest requestWithHysteresisDbSet =
@@ -4109,10 +4044,7 @@
 
     @Test
     public void testSetSignalStrengthUpdateRequest_hysteresisMsSet() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // Verify SE throws for app when set hysteresisMs in the SignalThresholdInfo
         SignalStrengthUpdateRequest requestWithHysteresisMsSet =
@@ -4139,10 +4071,7 @@
 
     @Test
     public void testSetSignalStrengthUpdateRequest_isEnabledSet() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // Verify SE throws for app when set isEnabled in the SignalThresholdInfo
         SignalStrengthUpdateRequest requestWithThresholdIsEnabledSet =
@@ -4169,10 +4098,7 @@
 
     @Test
     public void testSetSignalStrengthUpdateRequest_tooShortThresholds() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // verify SE throws if app set too short thresholds
         SignalStrengthUpdateRequest requestWithTooShortThresholds =
@@ -4197,10 +4123,7 @@
 
     @Test
     public void testSetSignalStrengthUpdateRequest_tooLongThresholds() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // verify SE throws if app set too long thresholds
         SignalStrengthUpdateRequest requestWithTooLongThresholds =
@@ -4226,10 +4149,7 @@
 
     @Test
     public void testSetSignalStrengthUpdateRequest_duplicatedRequest() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         final SignalStrengthUpdateRequest normalRequest =
                 new SignalStrengthUpdateRequest.Builder()
@@ -4261,10 +4181,7 @@
 
     @Test
     public void testClearSignalStrengthUpdateRequest_nullRequest() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // Verify NPE should throw if clear request with null object
         try {
@@ -4276,10 +4193,7 @@
 
     @Test
     public void testClearSignalStrengthUpdateRequest_noPermission() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         final SignalStrengthUpdateRequest normalRequest =
                 new SignalStrengthUpdateRequest.Builder()
@@ -4305,10 +4219,7 @@
 
     @Test
     public void testClearSignalStrengthUpdateRequest_clearWithNoSet() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "skipping test on device without FEATURE_TELEPHONY present");
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         SignalStrengthUpdateRequest requestNeverSetBefore = new SignalStrengthUpdateRequest
                 .Builder()
@@ -4327,9 +4238,7 @@
 
     @Test
     public void testSendThermalMitigationRequest() throws Exception {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         StringBuilder cmdBuilder = new StringBuilder();
         cmdBuilder.append(THERMAL_MITIGATION_COMMAND_BASE).append(ALLOW_PACKAGE_SUBCOMMAND)
@@ -4447,7 +4356,7 @@
 
     @Test
     public void testIsRadioInterfaceCapabilitySupported() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) return;
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         assertFalse(mTelephonyManager.isRadioInterfaceCapabilitySupported("empty"));
         assertFalse(mTelephonyManager.isRadioInterfaceCapabilitySupported(null));
@@ -4456,7 +4365,7 @@
 
     @Test
     public void testGetAllCellInfo() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) return;
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
 
         // For IRadio <1.5, just verify that calling the method doesn't throw an error.
         if (mRadioVersion < RADIO_HAL_VERSION_1_5) {
@@ -4464,6 +4373,7 @@
             return;
         }
 
+        boolean connectedToNrCell = false;
         for (CellInfo cellInfo : mTelephonyManager.getAllCellInfo()) {
             CellIdentity cellIdentity = cellInfo.getCellIdentity();
             int[] bands;
@@ -4481,11 +4391,21 @@
                             || (band >= AccessNetworkConstants.NgranBands.BAND_257
                             && band <= AccessNetworkConstants.NgranBands.BAND_261));
                 }
+                if (cellInfo.isRegistered()) {
+                    connectedToNrCell = true;
+                }
             } else {
                 continue;
             }
             assertTrue(bands.length > 0);
         }
+
+        if (connectedToNrCell) {
+            assertEquals(TelephonyManager.NETWORK_TYPE_NR, mTelephonyManager.getDataNetworkType());
+        } else {
+            assertNotEquals(TelephonyManager.NETWORK_TYPE_NR,
+                    mTelephonyManager.getDataNetworkType());
+        }
     }
 
     /**
@@ -4701,7 +4621,7 @@
      * @return whether to proceed the test
      */
     private boolean supportSetFplmn() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+        if (!hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)) {
             return false;
         }
         return mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_GSM;
@@ -4748,12 +4668,6 @@
 
     @Test
     public void testRegisterTelephonyCallbackWithNonLooper() throws Throwable {
-        if (!InstrumentationRegistry.getContext().getPackageManager()
-                .hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires PackageManager.FEATURE_TELEPHONY");
-            return;
-        }
-
         mMockSignalStrengthsTelephonyCallback = new MockSignalStrengthsTelephonyCallback();
 
         // Test register, generates an mOnSignalStrengthsChanged event
@@ -4794,12 +4708,6 @@
 
     @Test
     public void testRegisterTelephonyCallback() throws Throwable {
-        if (!InstrumentationRegistry.getContext().getPackageManager()
-                .hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires PackageManager.FEATURE_TELEPHONY");
-            return;
-        }
-
         if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA) {
             // TODO: temp workaround, need to adjust test to for CDMA
             return;
@@ -4890,9 +4798,8 @@
      */
     @Test
     public void testGetNetworkSlicingConfiguration() {
-        if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            return;
-        }
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_RADIO_ACCESS));
+
         CompletableFuture<NetworkSlicingConfig> resultFuture = new CompletableFuture<>();
         ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(mTelephonyManager,
                 (tm) -> tm.getNetworkSlicingConfiguration(mSimpleExecutor, resultFuture::complete));
@@ -4900,6 +4807,8 @@
 
     @Test
     public void testCheckCarrierPrivilegesForPackageEnforcesReadPrivilege() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         try {
             InstrumentationRegistry.getInstrumentation().getUiAutomation()
                 .adoptShellPermissionIdentity("android.permission.READ_PRIVILEGED_PHONE_STATE");
@@ -4915,7 +4824,8 @@
 
     @Test
     public void testCheckCarrierPrivilegesForPackageThrowsExceptionWithoutReadPrivilege() {
-        if (!hasCellular()) return;
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         try {
             mTelephonyManager.checkCarrierPrivilegesForPackage(mSelfPackageName);
             fail("TelephonyManager#checkCarrierPrivilegesForPackage must be protected "
@@ -4927,6 +4837,8 @@
 
     @Test
     public void testCheckCarrierPrivilegesForPackageAnyPhone() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         try {
             mTelephonyManager.checkCarrierPrivilegesForPackageAnyPhone(mSelfPackageName);
             fail("TelephonyManager#checkCarrierPrivilegesForPackageAnyPhone must be protected "
@@ -4950,6 +4862,8 @@
 
     @Test
     public void testGetCarrierPackageNamesForIntentAndPhoneEnforcesReadPrivilege() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         try {
             InstrumentationRegistry.getInstrumentation().getUiAutomation()
                 .adoptShellPermissionIdentity("android.permission.READ_PRIVILEGED_PHONE_STATE");
@@ -4967,7 +4881,8 @@
 
     @Test
     public void testGetCarrierPackageNamesForIntentAndPhoneThrowsExceptionWithoutReadPrivilege() {
-        if (!hasCellular()) return;
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         try {
             Intent intent = new Intent();
             int phoneId = 1;
@@ -4984,6 +4899,8 @@
 
     @Test
     public void testGetPackagesWithCarrierPrivilegesEnforcesReadPrivilege() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         try {
             InstrumentationRegistry.getInstrumentation().getUiAutomation()
                 .adoptShellPermissionIdentity("android.permission.READ_PRIVILEGED_PHONE_STATE");
@@ -4999,7 +4916,8 @@
 
     @Test
     public void testGetPackagesWithCarrierPrivilegesThrowsExceptionWithoutReadPrivilege() {
-        if (!hasCellular()) return;
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         try {
             mTelephonyManager.getPackagesWithCarrierPrivileges();
             fail("TelephonyManager#getPackagesWithCarrierPrivileges must be protected "
@@ -5011,7 +4929,8 @@
 
     @Test
     public void testSimSlotMapping() {
-        if (!hasCellular()) return;
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         InstrumentationRegistry.getInstrumentation().getUiAutomation()
                 .adoptShellPermissionIdentity("android.permission.MODIFY_PHONE_STATE");
         // passing slotMapping combination
@@ -5073,6 +4992,10 @@
 
     @Test
     public void getUiccSlotInfoTest() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .adoptShellPermissionIdentity("android.permission.READ_PRIVILEGED_PHONE_STATE");
         UiccSlotInfo[] slotInfos = mTelephonyManager.getUiccSlotsInfo();
 
         if (slotInfos == null) {
@@ -5093,11 +5016,28 @@
                 portInfo.getPortIndex();
             }
         }
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .dropShellPermissionIdentity();
+    }
+
+    @Test
+    public void testGetUiccSlotInfosFailsWithoutReadPhoneStatePrivilege() {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+        try {
+            InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                    .dropShellPermissionIdentity();
+            mTelephonyManager.getUiccSlotsInfo();
+            fail("TelephonyManager#getUiccSlotsInfo must be protected "
+                    + "with READ_PRIVILEGED_PHONE_STATE");
+        } catch (SecurityException e) {
+            // expected
+        }
     }
 
     @Test
     public void getSimSlotMappingTestReadPermission() {
-        if (!hasCellular()) return;
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         try {
             Collection<UiccSlotMapping> simSlotMapping = mTelephonyManager.getSimSlotMapping();
             fail("Expected SecurityException, no READ_PRIVILEGED_PHONE_STATE permission");
@@ -5107,7 +5047,8 @@
     }
     @Test
     public void getSimSlotMappingTest() {
-        if (!hasCellular()) return;
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION));
+
         InstrumentationRegistry.getInstrumentation().getUiAutomation()
                 .adoptShellPermissionIdentity("android.permission.READ_PRIVILEGED_PHONE_STATE");
         try {
@@ -5134,5 +5075,148 @@
         }
         return true;
     }
+
+    private static class ServiceStateListener extends TelephonyCallback
+            implements TelephonyCallback.ServiceStateListener {
+        CountDownLatch mLatch;
+        Predicate<ServiceState> mStateToWaitFor;
+
+        ServiceStateListener(Predicate<ServiceState> stateToWaitFor) {
+            mLatch = new CountDownLatch(1);
+            mStateToWaitFor = stateToWaitFor;
+        }
+
+        @Override
+        public void onServiceStateChanged(ServiceState ss) {
+            if (mStateToWaitFor.test(ss)) {
+                mLatch.countDown();
+            }
+        }
+
+        public void waitForServiceStateChange(long timeout, TimeUnit unit) throws Exception {
+            if (!mLatch.await(timeout, unit)) {
+                throw new IllegalStateException("ServiceState did not change to satisfy condition");
+            }
+        }
+    }
+
+    private void waitForServiceState(Predicate<ServiceState> condition, long timeout, TimeUnit unit)
+            throws Exception {
+        ServiceStateListener callback = new ServiceStateListener(condition);
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                mTelephonyManager,
+                tm -> tm.registerTelephonyCallback(Runnable::run, callback));
+        try {
+            callback.waitForServiceStateChange(timeout, unit);
+        } finally {
+            mTelephonyManager.unregisterTelephonyCallback(callback);
+        }
+    }
+
+    private static class RadioPowerStateListener extends TelephonyCallback
+            implements TelephonyCallback.RadioPowerStateListener {
+        CountDownLatch mLatch;
+        @RadioPowerState int mStateToWaitFor;
+
+        RadioPowerStateListener(@RadioPowerState int stateToWaitFor) {
+            mLatch = new CountDownLatch(1);
+            mStateToWaitFor = stateToWaitFor;
+        }
+
+        @Override
+        public void onRadioPowerStateChanged(@RadioPowerState int state) {
+            if (state == mStateToWaitFor) {
+                mLatch.countDown();
+            }
+        }
+
+        public void waitForRadioPowerStateChange() throws Exception {
+            if (!mLatch.await(10, TimeUnit.SECONDS)) {
+                throw new IllegalStateException(
+                        "Radio power state did not change to " + mStateToWaitFor);
+            }
+        }
+    }
+
+    private void setRadioPower(boolean powerOn) throws Exception {
+        RadioPowerStateListener callback =
+                new RadioPowerStateListener(
+                        powerOn
+                                ? TelephonyManager.RADIO_POWER_ON
+                                : TelephonyManager.RADIO_POWER_OFF);
+        ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                mTelephonyManager,
+                tm -> tm.registerTelephonyCallback(Runnable::run, callback),
+                permission.READ_PRIVILEGED_PHONE_STATE);
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                    mTelephonyManager,
+                    tm -> tm.setRadioEnabled(powerOn),
+                    permission.MODIFY_PHONE_STATE);
+            callback.waitForRadioPowerStateChange();
+        } finally {
+            mTelephonyManager.unregisterTelephonyCallback(callback);
+        }
+    }
+
+    @Test
+    public void testSetVoiceServiceStateOverride() throws Exception {
+        assumeTrue(hasFeature(PackageManager.FEATURE_TELEPHONY_CALLING));
+
+        boolean turnedRadioOff = false;
+        boolean setServiceStateOverride = false;
+        try {
+            if (mTelephonyManager.getServiceState().getState() == ServiceState.STATE_IN_SERVICE) {
+                Log.i(TAG, "testSetVoiceServiceStateOverride: turning radio off to force OOS");
+                setRadioPower(false);
+                turnedRadioOff = true;
+                // Wait until ServiceState reflects the power change
+                waitForServiceState(
+                        ss -> ss.getState() != ServiceState.STATE_IN_SERVICE, 10, TimeUnit.SECONDS);
+            }
+            // This could be OUT_OF_SERVICE or POWER_OFF, it doesn't really matter for this test as
+            // long as it's not IN_SERVICE
+            int originalServiceState = mTelephonyManager.getServiceState().getState();
+            Log.i(TAG, "testSetVoiceServiceStateOverride: originalSS = " + originalServiceState);
+            assertNotEquals(ServiceState.STATE_IN_SERVICE, originalServiceState);
+
+            // We should see the override reflected by both ServiceStateListener and getServiceState
+            ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                    mTelephonyManager,
+                    tm -> tm.setVoiceServiceStateOverride(true),
+                    permission.BIND_TELECOM_CONNECTION_SERVICE);
+            setServiceStateOverride = true;
+            waitForServiceState(
+                    ss -> ss.getState() == ServiceState.STATE_IN_SERVICE, 5, TimeUnit.SECONDS);
+            assertEquals(
+                    ServiceState.STATE_IN_SERVICE, mTelephonyManager.getServiceState().getState());
+
+            // When we take away the override, things flip back to the original state since there
+            // were no other material changes made to the device that would impact ServiceState
+            ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                    mTelephonyManager,
+                    tm -> tm.setVoiceServiceStateOverride(false),
+                    permission.BIND_TELECOM_CONNECTION_SERVICE);
+            waitForServiceState(ss -> ss.getState() == originalServiceState, 5, TimeUnit.SECONDS);
+            assertEquals(originalServiceState, mTelephonyManager.getServiceState().getState());
+        } finally {
+            if (setServiceStateOverride) {
+                // No harm in calling this again if we already did, but call just in case we failed
+                // an assertion related to setOverride(true)
+                ShellIdentityUtils.invokeMethodWithShellPermissionsNoReturn(
+                        mTelephonyManager,
+                        tm -> tm.setVoiceServiceStateOverride(false),
+                        permission.BIND_TELECOM_CONNECTION_SERVICE);
+            }
+            if (turnedRadioOff) {
+                // Turn the radio back on and wait for ServiceState to become stable again so we
+                // don't cause flakes in other tests
+                Log.i(TAG, "testSetVoiceServiceStateOverride: turning radio back on");
+                setRadioPower(true);
+                waitForServiceState(
+                        ss -> ss.getState() == ServiceState.STATE_IN_SERVICE, 30, TimeUnit.SECONDS);
+            }
+        }
+    }
 }
 
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/UiccSlotMappingTest.java b/tests/tests/telephony/current/src/android/telephony/cts/UiccSlotMappingTest.java
new file mode 100644
index 0000000..95b7f8b
--- /dev/null
+++ b/tests/tests/telephony/current/src/android/telephony/cts/UiccSlotMappingTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2022 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 android.telephony.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.os.Parcel;
+import android.telephony.UiccSlotMapping;
+
+import org.junit.Test;
+
+public class UiccSlotMappingTest {
+    private static final int PORT_INDEX = 0;
+    private static final int PHYSICAL_SLOT_INDEX = 0;
+    private static final int LOGICAL_SLOT_INDEX = 0;
+
+    @Test
+    public void testConstructorAndGetters() {
+        UiccSlotMapping uiccSlotMapping = new UiccSlotMapping(
+                PORT_INDEX, PHYSICAL_SLOT_INDEX, LOGICAL_SLOT_INDEX);
+
+        assertThat(uiccSlotMapping.getPortIndex()).isEqualTo(PORT_INDEX);
+        assertThat(uiccSlotMapping.getPhysicalSlotIndex()).isEqualTo(PHYSICAL_SLOT_INDEX);
+        assertThat(uiccSlotMapping.getLogicalSlotIndex()).isEqualTo(LOGICAL_SLOT_INDEX);
+    }
+
+    @Test
+    public void testEquals() {
+        UiccSlotMapping uiccSlotMappingObject = new UiccSlotMapping(
+                PORT_INDEX, PHYSICAL_SLOT_INDEX, LOGICAL_SLOT_INDEX);
+        UiccSlotMapping uiccSlotMappingEqualObject = new UiccSlotMapping(
+                PORT_INDEX, PHYSICAL_SLOT_INDEX, LOGICAL_SLOT_INDEX);
+
+        assertThat(uiccSlotMappingObject).isEqualTo(uiccSlotMappingEqualObject);
+    }
+
+    @Test
+    public void testNotEqual() {
+        UiccSlotMapping uiccSlotMappingObject = new UiccSlotMapping(
+                PORT_INDEX, PHYSICAL_SLOT_INDEX, LOGICAL_SLOT_INDEX);
+        UiccSlotMapping uiccSlotMappingNotEqualObject = new UiccSlotMapping(
+                /* portIndex= */ 0, /* phycalSlotIndex= */1, /* logicalSlotIndex= */ 1);
+
+        assertThat(uiccSlotMappingObject).isNotEqualTo(uiccSlotMappingNotEqualObject);
+    }
+
+    @Test
+    public void testParcel() {
+        UiccSlotMapping uiccSlotMapping = new UiccSlotMapping(
+                PORT_INDEX, PHYSICAL_SLOT_INDEX, LOGICAL_SLOT_INDEX);
+
+        Parcel parcel = Parcel.obtain();
+        uiccSlotMapping.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        UiccSlotMapping uiccSlotMappingParcel = UiccSlotMapping.CREATOR.createFromParcel(parcel);
+
+        assertThat(uiccSlotMapping).isEqualTo(uiccSlotMappingParcel);
+    }
+}
diff --git a/tests/tests/telephony/current/src/android/telephony/cts/VisualVoicemailServiceTest.java b/tests/tests/telephony/current/src/android/telephony/cts/VisualVoicemailServiceTest.java
index 31ba58f..3f6d02f 100644
--- a/tests/tests/telephony/current/src/android/telephony/cts/VisualVoicemailServiceTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/cts/VisualVoicemailServiceTest.java
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import android.app.Instrumentation;
 import android.content.BroadcastReceiver;
@@ -40,7 +41,6 @@
 import android.os.ParcelFileDescriptor;
 import android.provider.Telephony.Sms;
 import android.provider.Telephony.Sms.Intents;
-import androidx.annotation.Nullable;
 import android.telecom.PhoneAccount;
 import android.telecom.PhoneAccountHandle;
 import android.telecom.TelecomManager;
@@ -52,6 +52,12 @@
 import android.text.TextUtils;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -66,10 +72,6 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 public class VisualVoicemailServiceTest {
 
     private static final String TAG = "VvmServiceTest";
@@ -81,7 +83,7 @@
     private static final String PACKAGE = "android.telephony.cts";
 
     private static final long EVENT_RECEIVED_TIMEOUT_MILLIS = 60_000;
-    private static final long EVENT_NOT_RECEIVED_TIMEOUT_MILLIS = 1_000;
+    private static final long EVENT_NOT_RECEIVED_TIMEOUT_MILLIS = 5_000;
 
     private Context mContext;
     private TelephonyManager mTelephonyManager;
@@ -96,20 +98,20 @@
     @Before
     public void setUp() throws Exception {
         mContext = getInstrumentation().getContext();
-        if (hasTelephony(mContext)) {
-            mPreviousDefaultDialer = getDefaultDialer(getInstrumentation());
-            setDefaultDialer(getInstrumentation(), PACKAGE);
+        assumeTrue(hasFeatureSupported(mContext));
 
-            TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);
-            mPhoneAccountHandle = telecomManager
-                    .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
-            assertNotNull(mPhoneAccountHandle);
-            mPhoneNumber = telecomManager.getLine1Number(mPhoneAccountHandle);
-            assertNotNull(mPhoneNumber, "Tests require a line1 number for the active SIM.");
+        mPreviousDefaultDialer = getDefaultDialer(getInstrumentation());
+        setDefaultDialer(getInstrumentation(), PACKAGE);
 
-            mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
-                    .createForPhoneAccountHandle(mPhoneAccountHandle);
-        }
+        TelecomManager telecomManager = mContext.getSystemService(TelecomManager.class);
+        mPhoneAccountHandle = telecomManager
+                .getDefaultOutgoingPhoneAccount(PhoneAccount.SCHEME_TEL);
+        assertNotNull(mPhoneAccountHandle);
+        mPhoneNumber = telecomManager.getLine1Number(mPhoneAccountHandle);
+        assertNotNull(mPhoneNumber, "Tests require a line1 number for the active SIM.");
+
+        mTelephonyManager = mContext.getSystemService(TelephonyManager.class)
+                .createForPhoneAccountHandle(mPhoneAccountHandle);
 
         PackageManager packageManager = mContext.getPackageManager();
         packageManager.setComponentEnabledSetting(
@@ -122,7 +124,7 @@
 
     @After
     public void tearDown() throws Exception {
-        if (hasTelephony(mContext)) {
+        if (hasFeatureSupported(mContext)) {
             if (!TextUtils.isEmpty(mPreviousDefaultDialer)) {
                 setDefaultDialer(getInstrumentation(), mPreviousDefaultDialer);
             }
@@ -135,11 +137,6 @@
 
     @Test
     public void testPermissionlessService_ignored() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
-
         PackageManager packageManager = mContext.getPackageManager();
         packageManager.setComponentEnabledSetting(
                 new ComponentName(mContext, MockVisualVoicemailService.class),
@@ -184,10 +181,6 @@
 
     @Test
     public void testFilter() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         VisualVoicemailSms result = getSmsFromText("//CTSVVM",
                 "//CTSVVM:STATUS:st=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1");
 
@@ -204,10 +197,6 @@
 
     @Test
     public void testFilter_data() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         if (!hasDataSms()) {
             Log.d(TAG, "skipping test that requires data SMS feature");
             return;
@@ -233,10 +222,6 @@
 
     @Test
     public void testFilter_TrailingSemiColon() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         VisualVoicemailSms result = getSmsFromText("//CTSVVM",
                 "//CTSVVM:STATUS:st=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1;");
 
@@ -253,10 +238,6 @@
 
     @Test
     public void testFilter_EmptyPrefix() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         VisualVoicemailSms result = getSmsFromText("//CTSVVM",
                 "//CTSVVM::st=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1");
 
@@ -273,10 +254,6 @@
 
     @Test
     public void testFilter_EmptyField() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         VisualVoicemailSms result = getSmsFromText("//CTSVVM",
                 "//CTSVVM:STATUS:");
         assertTrue(result.getFields().isEmpty());
@@ -284,90 +261,54 @@
 
     @Test
     public void testFilterFail_NotVvm() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         assertVisualVoicemailSmsNotReceived("//CTSVVM",
                 "helloworld");
     }
 
     @Test
     public void testFilterFail_PrefixMismatch() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         assertVisualVoicemailSmsNotReceived("//CTSVVM",
                 "//FOOVVM:STATUS:st=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1");
     }
 
     @Test
     public void testFilterFail_MissingFirstColon() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         assertVisualVoicemailSmsNotReceived("//CTSVVM",
                 "//CTSVVMSTATUS:st=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1");
     }
 
     @Test
     public void testFilterFail_MissingSecondColon() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         assertVisualVoicemailSmsNotReceived("//CTSVVM",
                 "//CTSVVM:STATUSst=R;rc=0;srv=1;dn=1;ipt=1;spt=0;u=eg@example.com;pw=1");
     }
 
     @Test
     public void testFilterFail_MessageEndAfterClientPrefix() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         assertVisualVoicemailSmsNotReceived("//CTSVVM",
                 "//CTSVVM:");
     }
 
     @Test
     public void testFilterFail_MessageEndAfterPrefix() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         assertVisualVoicemailSmsNotReceived("//CTSVVM",
                 "//CTSVVM:STATUS");
     }
 
     @Test
     public void testFilterFail_InvalidKeyValuePair() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         assertVisualVoicemailSmsNotReceived("//CTSVVM",
                 "//CTSVVM:STATUS:key");
     }
 
     @Test
     public void testFilterFail_InvalidMissingKey() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         assertVisualVoicemailSmsNotReceived("//CTSVVM",
                 "//CTSVVM:STATUS:=value");
     }
 
     @Test
     public void testFilter_MissingValue() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         VisualVoicemailSms result = getSmsFromText("//CTSVVM",
                 "//CTSVVM:STATUS:key=");
         assertEquals("STATUS", result.getPrefix());
@@ -376,10 +317,6 @@
 
     @Test
     public void testFilter_originatingNumber_match_filtered() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         VisualVoicemailSmsFilterSettings settings = new VisualVoicemailSmsFilterSettings.Builder()
                 .setClientPrefix("//CTSVVM")
                 .setOriginatingNumbers(Arrays.asList(mPhoneNumber))
@@ -390,10 +327,6 @@
 
     @Test
     public void testFilter_originatingNumber_mismatch_notFiltered() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         VisualVoicemailSmsFilterSettings settings = new VisualVoicemailSmsFilterSettings.Builder()
                 .setClientPrefix("//CTSVVM")
                 .setOriginatingNumbers(Arrays.asList("1"))
@@ -404,10 +337,6 @@
 
     @Test
     public void testFilter_port_match() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         if (!hasDataSms()) {
             Log.d(TAG, "skipping test that requires data SMS feature");
             return;
@@ -423,10 +352,6 @@
 
     @Test
     public void testFilter_port_mismatch() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         if (!hasDataSms()) {
             Log.d(TAG, "skipping test that requires data SMS feature");
             return;
@@ -442,10 +367,6 @@
 
     @Test
     public void testFilter_port_anydata() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         if (!hasDataSms()) {
             Log.d(TAG, "skipping test that requires data SMS feature");
             return;
@@ -464,10 +385,6 @@
      */
     @Test
     public void testFilter_port_anydata_notData() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         if (!hasDataSms()) {
             Log.d(TAG, "skipping test that requires data SMS feature");
             return;
@@ -483,10 +400,6 @@
 
     @Test
     public void testGetVisualVoicemailPackageName_isSelf() {
-        if (!hasTelephony(mContext)) {
-            Log.d(TAG, "skipping test that requires telephony feature");
-            return;
-        }
         assertEquals(PACKAGE, mTelephonyManager.getVisualVoicemailPackageName());
     }
 
@@ -704,10 +617,9 @@
         }
     }
 
-    private static boolean hasTelephony(Context context) {
-        final PackageManager packageManager = context.getPackageManager();
-        return packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) &&
-                packageManager.hasSystemFeature(PackageManager.FEATURE_CONNECTION_SERVICE);
+    private static boolean hasFeatureSupported(Context context) {
+        return context.getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY_CALLING);
     }
 
     private boolean hasDataSms() {
diff --git a/tests/tests/telephony/current/src/android/telephony/euicc/cts/EuiccManagerTest.java b/tests/tests/telephony/current/src/android/telephony/euicc/cts/EuiccManagerTest.java
index c871586..2cb2ecc 100644
--- a/tests/tests/telephony/current/src/android/telephony/euicc/cts/EuiccManagerTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/euicc/cts/EuiccManagerTest.java
@@ -28,16 +28,23 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.telephony.TelephonyManager;
+import android.telephony.UiccCardInfo;
+import android.telephony.UiccPortInfo;
+import android.telephony.cts.TelephonyUtils;
 import android.telephony.euicc.DownloadableSubscription;
 import android.telephony.euicc.EuiccCardManager;
 import android.telephony.euicc.EuiccInfo;
 import android.telephony.euicc.EuiccManager;
+import android.text.TextUtils;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.runner.AndroidJUnit4;
 
+import com.android.compatibility.common.util.ShellIdentityUtils;
+
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -70,6 +77,8 @@
                     ACTION_ERASE_SUBSCRIPTIONS,
                     ACTION_START_TEST_RESOLUTION_ACTIVITY,
             };
+    private static final String SWITCH_WITHOUT_PORT_INDEX_EXCEPTION_ON_DISABLE_STRING =
+            "SWITCH_WITHOUT_PORT_INDEX_EXCEPTION_ON_DISABLE";
 
     private EuiccManager mEuiccManager;
     private CallbackReceiver mCallbackReceiver;
@@ -182,6 +191,65 @@
                 EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_ERROR, mCallbackReceiver.getResultCode());
     }
 
+    @Ignore("b/221887933") // TODO: Enable the test case after framework code is uncommented
+    @Test
+    public void testSwitchToSubscritionDisableWithNoPortAndChangesCompatDisabled()
+            throws Exception {
+        // test disabled state only for now
+        if (mEuiccManager.isEnabled()) {
+            return;
+        }
+        // disable compact change
+        TelephonyUtils.disableCompatCommand(InstrumentationRegistry.getInstrumentation(),
+                TelephonyUtils.CTS_APP_PACKAGE,
+                SWITCH_WITHOUT_PORT_INDEX_EXCEPTION_ON_DISABLE_STRING);
+
+        // set up CountDownLatch and receiver
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        mCallbackReceiver = new CallbackReceiver(countDownLatch);
+        getContext()
+                .registerReceiver(
+                        mCallbackReceiver, new IntentFilter(ACTION_SWITCH_TO_SUBSCRIPTION));
+
+        // call switchToSubscription()
+        PendingIntent callbackIntent = createCallbackIntent(ACTION_SWITCH_TO_SUBSCRIPTION);
+        mEuiccManager.switchToSubscription(-1, callbackIntent);
+
+        // wait for callback
+        try {
+            countDownLatch.await(CALLBACK_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            fail(e.toString());
+        }
+
+        // verify correct result code is received
+        assertEquals(
+                EuiccManager.EMBEDDED_SUBSCRIPTION_RESULT_ERROR, mCallbackReceiver.getResultCode());
+
+        // reset compat change
+        TelephonyUtils.resetCompatCommand(InstrumentationRegistry.getInstrumentation(),
+                TelephonyUtils.CTS_APP_PACKAGE,
+                SWITCH_WITHOUT_PORT_INDEX_EXCEPTION_ON_DISABLE_STRING);
+    }
+
+    @Ignore("b/221887933") // TODO: Enable the test case after framework code is uncommented
+    @Test
+    public void testSwitchToSubscriptionDisableWithNoPort() throws Exception {
+        // test disabled state only for now
+        if (mEuiccManager.isEnabled()) {
+            return;
+        }
+
+        PendingIntent callbackIntent = createCallbackIntent(ACTION_SWITCH_TO_SUBSCRIPTION);
+
+        try {
+            mEuiccManager.switchToSubscription(-1, callbackIntent);
+            fail("IllegalArgumentException expected");
+        } catch (IllegalArgumentException e) {
+            // expected for android T and beyond
+        }
+    }
+
     @Test
     public void testSwitchToSubscription() {
         // test disabled state only for now
@@ -196,7 +264,7 @@
                 .registerReceiver(
                         mCallbackReceiver, new IntentFilter(ACTION_SWITCH_TO_SUBSCRIPTION));
 
-        // call deleteSubscription()
+        // call switchToSubscription()
         PendingIntent callbackIntent = createCallbackIntent(ACTION_SWITCH_TO_SUBSCRIPTION);
         mEuiccManager.switchToSubscription(4, callbackIntent);
 
@@ -226,7 +294,7 @@
                 .registerReceiver(
                         mCallbackReceiver, new IntentFilter(ACTION_SWITCH_TO_SUBSCRIPTION));
 
-        // call deleteSubscription()
+        // call switchToSubscription()
         PendingIntent callbackIntent = createCallbackIntent(ACTION_SWITCH_TO_SUBSCRIPTION);
         mEuiccManager.switchToSubscription(4, TelephonyManager.DEFAULT_PORT_INDEX, callbackIntent);
 
@@ -500,6 +568,43 @@
         mEuiccManager.setUnsupportedCountries(originalUnsupportedCountry);
     }
 
+    @Test
+    public void testIsSimPortAvailableWithInvalidPortIndex() throws Exception {
+        // Only test it when EuiccManager is enabled.
+        if (!mEuiccManager.isEnabled()) {
+            return;
+        }
+
+        boolean result = mEuiccManager.isSimPortAvailable(/* portIndex= */ -1);
+
+        assertFalse(result);
+    }
+
+    @Test
+    public void testIsSimPortAvailableWithValidPorts() throws Exception {
+        // Only test it when EuiccManager is enabled.
+        if (!mEuiccManager.isEnabled()) {
+            return;
+        }
+        // Get all the available UiccCardInfos.
+        TelephonyManager telephonyManager = getContext().getSystemService(TelephonyManager.class);
+        List<UiccCardInfo> uiccCardInfos =
+                ShellIdentityUtils.invokeMethodWithShellPermissions(telephonyManager,
+                        (tm) -> tm.getUiccCardsInfo());
+        for (UiccCardInfo cardInfo : uiccCardInfos) {
+            List<UiccPortInfo> portInfoList = (List<UiccPortInfo>) cardInfo.getPorts();
+            if (cardInfo.isEuicc()) {
+                for (UiccPortInfo portInfo : portInfoList) {
+                    // Check if port is active and no profile install on it.
+                    if (portInfo.isActive() && TextUtils.isEmpty(portInfo.getIccId())) {
+                        boolean result = mEuiccManager.isSimPortAvailable(portInfo.getPortIndex());
+                        assertTrue(result);
+                    }
+                }
+            }
+        }
+    }
+
     private Context getContext() {
         return InstrumentationRegistry.getContext();
     }
diff --git a/tests/tests/telephony/current/src/android/telephony/euicc/cts/EuiccServiceTest.java b/tests/tests/telephony/current/src/android/telephony/euicc/cts/EuiccServiceTest.java
index 9416ba3..17a408a 100644
--- a/tests/tests/telephony/current/src/android/telephony/euicc/cts/EuiccServiceTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/euicc/cts/EuiccServiceTest.java
@@ -324,6 +324,7 @@
 
         mEuiccServiceBinder.downloadSubscription(
                 MOCK_SLOT_ID,
+                MOCK_PORT_ID,
                 subscription,
                 true /*switchAfterDownload*/,
                 true /*forceDeactivateSim*/,
@@ -444,6 +445,32 @@
     }
 
     @Test
+    public void testOnSwitchToSubscriptionWithPort() throws Exception {
+        mCountDownLatch = new CountDownLatch(1);
+
+        mEuiccServiceBinder.switchToSubscription(
+                MOCK_SLOT_ID,
+                MOCK_PORT_ID,
+                MOCK_ICCID,
+                true /*forceDeactivateSim*/,
+                new ISwitchToSubscriptionCallback.Stub() {
+                    @Override
+                    public void onComplete(int result) {
+                        assertEquals(EuiccService.RESULT_OK, result);
+                    }
+                },
+                true /* usePortIndex */);
+
+        try {
+            mCountDownLatch.await(CALLBACK_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException e) {
+            fail(e.toString());
+        }
+
+        assertTrue(mCallback.isMethodCalled());
+    }
+
+    @Test
     public void testOnUpdateSubscriptionNickname() throws Exception {
         mCountDownLatch = new CountDownLatch(1);
 
diff --git a/tests/tests/telephony/current/src/android/telephony/euicc/cts/EuiccTestResolutionActivity.java b/tests/tests/telephony/current/src/android/telephony/euicc/cts/EuiccTestResolutionActivity.java
index c6f9ba7..2994ee1 100644
--- a/tests/tests/telephony/current/src/android/telephony/euicc/cts/EuiccTestResolutionActivity.java
+++ b/tests/tests/telephony/current/src/android/telephony/euicc/cts/EuiccTestResolutionActivity.java
@@ -22,6 +22,7 @@
 import android.content.Intent;
 import android.content.IntentSender;
 import android.os.Bundle;
+import android.service.euicc.EuiccService;
 import android.telephony.euicc.EuiccManager;
 
 /**
@@ -92,6 +93,7 @@
 
     private PendingIntent createCallbackIntent(String action) {
         Intent intent = new Intent(action);
+        intent.putExtra(EuiccService.EXTRA_RESOLUTION_SUBSCRIPTION_ID, 0);
         return PendingIntent.getBroadcast(
                 getApplicationContext(), REQUEST_CODE, intent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_MUTABLE_UNAUDITED);
     }
diff --git a/tests/tests/telephony/current/src/android/telephony/euicc/cts/MockEuiccService.java b/tests/tests/telephony/current/src/android/telephony/euicc/cts/MockEuiccService.java
index 698ac75..cfbedc3 100644
--- a/tests/tests/telephony/current/src/android/telephony/euicc/cts/MockEuiccService.java
+++ b/tests/tests/telephony/current/src/android/telephony/euicc/cts/MockEuiccService.java
@@ -121,6 +121,19 @@
     }
 
     @Override
+    public DownloadSubscriptionResult onDownloadSubscription(
+            int slotId,
+            int portIndex,
+            @NonNull DownloadableSubscription subscription,
+            boolean switchAfterDownload,
+            boolean forceDeactivateSim,
+            @Nullable Bundle resolvedBundle) {
+        sMockEuiccServiceCallback.setMethodCalled();
+        return onDownloadSubscription(slotId, subscription, switchAfterDownload,
+                forceDeactivateSim, resolvedBundle);
+    }
+
+    @Override
     public @NonNull GetEuiccProfileInfoListResult onGetEuiccProfileInfoList(int slotId) {
         sMockEuiccServiceCallback.setMethodCalled();
         return new GetEuiccProfileInfoListResult(
diff --git a/tests/tests/telephony/current/src/android/telephony/gba/cts/GbaServiceTest.java b/tests/tests/telephony/current/src/android/telephony/gba/cts/GbaServiceTest.java
index 0a16299..985aca9 100644
--- a/tests/tests/telephony/current/src/android/telephony/gba/cts/GbaServiceTest.java
+++ b/tests/tests/telephony/current/src/android/telephony/gba/cts/GbaServiceTest.java
@@ -21,6 +21,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
 import android.app.Instrumentation;
 import android.content.pm.PackageManager;
@@ -97,9 +98,7 @@
 
     @Before
     public void setUp() throws Exception {
-        if (!isFeatureSupported()) {
-            return;
-        }
+        assumeTrue(isFeatureSupported());
 
         setService(SERVICE_PACKAGE);
         setReleaseTime(RELEASE_DEFAULT);
@@ -107,20 +106,12 @@
 
     @Test (expected = SecurityException.class)
     public void testPermissions() {
-        if (!isFeatureSupported()) {
-            throw new SecurityException("Feaure is not supported");
-        }
-
         runGbaFailCase(TelephonyManager.GBA_FAILURE_REASON_FEATURE_NOT_SUPPORTED,
                 android.Manifest.permission.READ_PHONE_STATE);
     }
 
     @Test
     public void testAuthSuccess() {
-        if (!isFeatureSupported()) {
-            return;
-        }
-
         Random rand = new Random();
 
         for (int i = 0; i < 20; i++) {
@@ -172,10 +163,6 @@
 
     @Test
     public void testGbaNotSupported() throws Exception {
-        if (!isFeatureSupported()) {
-            return;
-        }
-
         setService("");
         sConfig.setConfig(true, new byte[16], BTID, TelephonyManager.GBA_FAILURE_REASON_UNKNOWN);
 
@@ -187,10 +174,6 @@
 
     @Test
     public void testAuthFail() {
-        if (!isFeatureSupported()) {
-            return;
-        }
-
         for (int r = TelephonyManager.GBA_FAILURE_REASON_UNKNOWN;
                 r <= TelephonyManager.GBA_FAILURE_REASON_SECURITY_PROTOCOL_NOT_SUPPORTED; r++) {
             sConfig.setConfig(false, new byte[16], BTID, r);
@@ -235,10 +218,6 @@
 
     @Test
     public void testServiceReleaseDefault() throws Exception {
-        if (!isFeatureSupported()) {
-            return;
-        }
-
         int ss = sConfig.getServiceState();
         boolean isExpected = (ss == TestGbaConfig.STATE_UNKNOWN
                 || ss == TestGbaConfig.STATE_REMOVED
@@ -256,10 +235,6 @@
 
     @Test
     public void testServiceReleaseDuration() throws Exception {
-        if (!isFeatureSupported()) {
-            return;
-        }
-
         int ss = sConfig.getServiceState();
         boolean isExpected = (ss == TestGbaConfig.STATE_UNKNOWN
                 || ss == TestGbaConfig.STATE_REMOVED
@@ -281,10 +256,6 @@
 
     @Test
     public void testServiceNoRelease() throws Exception {
-        if (!isFeatureSupported()) {
-            return;
-        }
-
         int ss = sConfig.getServiceState();
         boolean isExpected = (ss == TestGbaConfig.STATE_UNKNOWN
                 || ss == TestGbaConfig.STATE_REMOVED
@@ -325,7 +296,7 @@
 
     private static boolean isFeatureSupported() {
         if (!InstrumentationRegistry.getContext().getPackageManager().hasSystemFeature(
-                PackageManager.FEATURE_TELEPHONY)) {
+                PackageManager.FEATURE_TELEPHONY_SUBSCRIPTION)) {
             return false;
         }
 
diff --git a/tests/tests/telephony/current/src/android/telephony/ims/cts/ImsUtils.java b/tests/tests/telephony/current/src/android/telephony/ims/cts/ImsUtils.java
index 4d87c9b..95b95d0 100644
--- a/tests/tests/telephony/current/src/android/telephony/ims/cts/ImsUtils.java
+++ b/tests/tests/telephony/current/src/android/telephony/ims/cts/ImsUtils.java
@@ -62,18 +62,13 @@
     public static boolean shouldTestImsService() {
         final PackageManager pm = InstrumentationRegistry.getInstrumentation().getContext()
                 .getPackageManager();
-        boolean hasTelephony = pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY);
-        boolean hasIms = pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_IMS);
-        return hasTelephony && hasIms;
+        return pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_IMS);
     }
 
     public static boolean shouldTestImsSingleRegistration() {
         final PackageManager pm = InstrumentationRegistry.getInstrumentation().getContext()
                 .getPackageManager();
-        boolean hasIms = pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_IMS);
-        boolean hasSingleReg = pm.hasSystemFeature(
-                PackageManager.FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION);
-        return hasIms && hasSingleReg;
+        return pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY_IMS_SINGLE_REGISTRATION);
     }
 
     public static int getPreferredActiveSubId() {
diff --git a/tests/tests/telephony/sdk28/Android.bp b/tests/tests/telephony/sdk28/Android.bp
deleted file mode 100644
index bf23f39..0000000
--- a/tests/tests/telephony/sdk28/Android.bp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (C) 2015 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 {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-}
-
-android_test {
-    name: "CtsTelephonySdk28TestCases",
-    defaults: ["cts_defaults"],
-    static_libs: [
-        "ctstestrunner-axt",
-        "compatibility-device-util-axt",
-    ],
-    srcs: ["src/**/*.java"],
-    // TODO: what can be done here? it used to be
-    // sdk_version: "28", but this is not compatible with compatibility-device-util-axt
-    sdk_version: "test_current",
-    // Tag this module as a cts test artifact
-    test_suites: [
-        "cts",
-        "general-tests",
-    ],
-    libs: [
-        "android.test.runner",
-        "android.test.base",
-    ],
-}
diff --git a/tests/tests/telephony/sdk28/AndroidManifest.xml b/tests/tests/telephony/sdk28/AndroidManifest.xml
deleted file mode 100644
index 7955df5..0000000
--- a/tests/tests/telephony/sdk28/AndroidManifest.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="android.telephony.sdk28.cts">
-    <uses-sdk android:targetSdkVersion="28"
-              android:minSdkVersion="28"
-              android:maxSdkVersion="28" />
-
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-
-    <application>
-        <uses-library android:name="android.test.runner" />
-    </application>
-
-    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
-                     android:targetPackage="android.telephony.sdk28.cts">
-        <meta-data android:name="listener"
-            android:value="com.android.cts.runner.CtsTestRunListener" />
-    </instrumentation>
-
-</manifest>
-
diff --git a/tests/tests/telephony/sdk28/AndroidTest.xml b/tests/tests/telephony/sdk28/AndroidTest.xml
deleted file mode 100644
index b165ade..0000000
--- a/tests/tests/telephony/sdk28/AndroidTest.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-<configuration description="Config for CTS Telephony test cases">
-    <option name="test-suite-tag" value="cts" />
-    <option name="config-descriptor:metadata" key="component" value="telecom" />
-    <option name="config-descriptor:metadata" key="token" value="SIM_CARD" />
-    <option name="not-shardable" value="true" />
-    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
-    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
-    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
-    <option name="config-descriptor:metadata" key="token" value="SIM_CARD" />
-    <target_preparer class="android.telephony.cts.preconditions.TelephonyPreparer">
-        <option name="apk" value="CtsTelephonyPreparerApp.apk" />
-        <option name="package" value="android.telephony.cts.preconditions.preparerApp" />
-    </target_preparer>
-    <target_preparer class="android.telephony.cts.preconditions.TelephonyCleaner">
-        <option name="apk" value="CtsTelephonyCleanerApp.apk" />
-        <option name="package" value="android.telephony.cts.preconditions.cleanerApp" />
-    </target_preparer>
-    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
-        <option name="cleanup-apks" value="true" />
-        <option name="test-file-name" value="CtsTelephonySdk28TestCases.apk" />
-    </target_preparer>
-    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
-        <option name="package" value="android.telephony.sdk28.cts" />
-        <option name="hidden-api-checks" value="false"/>
-    </test>
-</configuration>
diff --git a/tests/tests/telephony/sdk28/TEST_MAPPING b/tests/tests/telephony/sdk28/TEST_MAPPING
deleted file mode 100644
index 141ee9e..0000000
--- a/tests/tests/telephony/sdk28/TEST_MAPPING
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "presubmit": [
-    {
-      "name": "CtsTelephonySdk28TestCases"
-    }
-  ]
-}
diff --git a/tests/tests/telephony/sdk28/src/android/telephony/sdk28/cts/CellInfoTest.java b/tests/tests/telephony/sdk28/src/android/telephony/sdk28/cts/CellInfoTest.java
deleted file mode 100644
index 09c890a..0000000
--- a/tests/tests/telephony/sdk28/src/android/telephony/sdk28/cts/CellInfoTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2019 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 android.telephony.sdk28.cts;
-
-import static androidx.test.InstrumentationRegistry.getContext;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.telephony.AccessNetworkConstants;
-import android.telephony.CellInfo;
-import android.telephony.NetworkRegistrationInfo;
-import android.telephony.ServiceState;
-import android.telephony.TelephonyManager;
-import android.util.Log;
-
-import com.android.compatibility.common.util.ShellIdentityUtils;
-
-import org.junit.Before;
-import org.junit.Test;
-
-import java.util.List;
-
-public class CellInfoTest {
-    private static final String TAG = "CellInfoTest";
-
-    private static final int MAX_WAIT_SECONDS = 15;
-    private static final int POLL_INTERVAL_MILLIS = 1000;
-
-    private static final String[] sPermissions = new String[] {
-            android.Manifest.permission.READ_PHONE_STATE,
-            android.Manifest.permission.ACCESS_COARSE_LOCATION};
-
-    private TelephonyManager mTm;
-    private PackageManager mPm;
-
-    private boolean isCamped() {
-        ServiceState ss = ShellIdentityUtils.invokeMethodWithShellPermissions(
-                mTm, TelephonyManager::getServiceState);
-
-        if (ss == null) return false;
-        if (ss.getState() == ServiceState.STATE_EMERGENCY_ONLY) return true;
-        List<NetworkRegistrationInfo> nris = ss.getNetworkRegistrationInfoList();
-        for (NetworkRegistrationInfo nri : nris) {
-            if (nri.getTransportType() != AccessNetworkConstants.TRANSPORT_TYPE_WWAN) continue;
-            if (nri.isRegistered()) return true;
-        }
-        return false;
-    }
-
-    @Before
-    public void setUp() throws Exception {
-        mTm = (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
-        mPm = getContext().getPackageManager();
-
-        for (String permission : sPermissions) {
-            assertTrue("Something (not this test) has denied needed permission=" + permission,
-                    getContext().checkSelfPermission(permission)
-                            == android.content.pm.PackageManager.PERMISSION_GRANTED);
-        }
-    }
-
-    @Test
-    public void testCellInfoSdk28() {
-        if (!mPm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-            Log.d(TAG, "Skipping test that requires FEATURE_TELEPHONY");
-            return;
-        }
-
-        if (!isCamped()) fail("Device is not camped to a cell");
-
-        List<CellInfo> cellInfo = ShellIdentityUtils.invokeMethodWithShellPermissions(
-                mTm, TelephonyManager::getAllCellInfo);
-
-        // getAllCellInfo should never return null, and there should be at least one entry.
-        assertNotNull("TelephonyManager.getAllCellInfo() returned NULL CellInfo", cellInfo);
-        assertFalse("TelephonyManager.getAllCellInfo() returned an empty list", cellInfo.isEmpty());
-
-        final long initialTime = cellInfo.get(0).getTimeStamp();
-
-        for(int i = 0; i < MAX_WAIT_SECONDS; i++) {
-            try {
-                Thread.sleep(POLL_INTERVAL_MILLIS); // 1 second
-            } catch (InterruptedException ie) {
-                fail("Thread was interrupted");
-            }
-            List<CellInfo> newCellInfo = ShellIdentityUtils.invokeMethodWithShellPermissions(
-                    mTm, TelephonyManager::getAllCellInfo);
-            assertNotNull("TelephonyManager.getAllCellInfo() returned NULL CellInfo", newCellInfo);
-            assertFalse("TelephonyManager.getAllCellInfo() returned an empty list",
-                    newCellInfo.isEmpty());
-            // Test that new CellInfo has been retrieved from the modem
-            if (newCellInfo.get(0).getTimeStamp() != initialTime) return;
-        }
-        fail("CellInfo failed to update after " + MAX_WAIT_SECONDS + " seconds.");
-    }
-}
diff --git a/tests/tests/telephony/sdk28/src/android/telephony/sdk28/cts/PhoneStateListenerTest.java b/tests/tests/telephony/sdk28/src/android/telephony/sdk28/cts/PhoneStateListenerTest.java
deleted file mode 100644
index c890a2a..0000000
--- a/tests/tests/telephony/sdk28/src/android/telephony/sdk28/cts/PhoneStateListenerTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (C) 2009 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 android.telephony.sdk28.cts;
-
-import static androidx.test.InstrumentationRegistry.getContext;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import android.content.Context;
-import android.content.pm.PackageManager;
-import android.os.Looper;
-import android.telephony.PhoneStateListener;
-import android.telephony.ServiceState;
-import android.telephony.TelephonyManager;
-import android.util.Log;
-
-import androidx.test.filters.FlakyTest;
-
-import com.android.compatibility.common.util.TestThread;
-
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-@FlakyTest
-public class PhoneStateListenerTest {
-
-    public static final long WAIT_TIME = 1000;
-    private boolean mOnServiceStateChangedCalled;
-    private TelephonyManager mTelephonyManager;
-    private PhoneStateListener mListener;
-    private final Object mLock = new Object();
-    private boolean mHasTelephony = true;
-    private static final String TAG = "android.telephony.cts.PhoneStateListenerTest";
-
-    @Before
-    public void setUp() throws Exception {
-        mTelephonyManager =
-                (TelephonyManager)getContext().getSystemService(Context.TELEPHONY_SERVICE);
-
-        PackageManager packageManager = getContext().getPackageManager();
-        if (packageManager != null) {
-            if (!packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
-                Log.d(TAG, "Some tests requiring FEATURE_TELEPHONY will be skipped");
-                mHasTelephony = false;
-            }
-        }
-    }
-
-    @After
-    public void tearDown() throws Exception {
-        if (mListener != null) {
-            // unregister the listener
-            mTelephonyManager.listen(mListener, PhoneStateListener.LISTEN_NONE);
-        }
-    }
-
-    @Test
-    public void testPhoneStateListener() {
-        Looper.prepare();
-        new PhoneStateListener();
-    }
-
-    @Test
-    public void testOnUnRegisterFollowedByRegister() throws Throwable {
-        if (!mHasTelephony) {
-            return;
-        }
-
-        TestThread t = new TestThread(new Runnable() {
-            public void run() {
-                Looper.prepare();
-
-                mListener = new PhoneStateListener() {
-                    @Override
-                    public void onServiceStateChanged(ServiceState serviceState) {
-                        synchronized(mLock) {
-                            mOnServiceStateChangedCalled = true;
-                            mLock.notify();
-                        }
-                    }
-                };
-                mTelephonyManager.listen(mListener, PhoneStateListener.LISTEN_SERVICE_STATE);
-
-                Looper.loop();
-            }
-        });
-
-        assertFalse(mOnServiceStateChangedCalled);
-        t.start();
-
-        synchronized (mLock) {
-            if (!mOnServiceStateChangedCalled){
-                mLock.wait(WAIT_TIME);
-            }
-        }
-        t.checkException();
-        assertTrue(mOnServiceStateChangedCalled);
-
-        // reset and un-register
-        mOnServiceStateChangedCalled = false;
-        if (mListener != null) {
-            // un-register the listener
-            mTelephonyManager.listen(mListener, PhoneStateListener.LISTEN_NONE);
-        }
-        synchronized (mLock) {
-            if (!mOnServiceStateChangedCalled){
-                mLock.wait(WAIT_TIME);
-            }
-        }
-        assertFalse(mOnServiceStateChangedCalled);
-
-        // re-register the listener
-        mTelephonyManager.listen(mListener, PhoneStateListener.LISTEN_SERVICE_STATE);
-        synchronized (mLock) {
-            if (!mOnServiceStateChangedCalled){
-                mLock.wait(WAIT_TIME);
-            }
-        }
-        t.checkException();
-        assertTrue(mOnServiceStateChangedCalled);
-    }
-}
diff --git a/tests/tests/telephony2/README.md b/tests/tests/telephony2/README.md
new file mode 100644
index 0000000..38deeca
--- /dev/null
+++ b/tests/tests/telephony2/README.md
@@ -0,0 +1,5 @@
+# Telephony2 CTS tests
+
+This directory contains the set of Telephony CTS tests used to exercise permissions.
+For instance, we may want to verify that an API call throws an exception without
+READ_PHONE_STATE.
diff --git a/tests/tests/telephony2/src/android/telephony2/cts/CallStateListenerPermissionTest.java b/tests/tests/telephony2/src/android/telephony2/cts/CallStateListenerPermissionTest.java
index b580930..25cd10c 100644
--- a/tests/tests/telephony2/src/android/telephony2/cts/CallStateListenerPermissionTest.java
+++ b/tests/tests/telephony2/src/android/telephony2/cts/CallStateListenerPermissionTest.java
@@ -24,6 +24,7 @@
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
 
 import android.content.Context;
 import android.telephony.PhoneStateListener;
@@ -63,6 +64,7 @@
     @Before
     public void setUp() throws Exception {
         mContext = InstrumentationRegistry.getContext();
+        assumeTrue(mContext.getPackageManager().hasSystemFeature(FEATURE_TELEPHONY));
     }
 
     /**
@@ -71,10 +73,6 @@
      */
     @Test
     public void testRegisterWithNoCallLogPermission() {
-        if (!mContext.getPackageManager().hasSystemFeature(FEATURE_TELEPHONY)) {
-            return;
-        }
-
         TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
         assertNotNull(telephonyManager);
 
@@ -97,10 +95,6 @@
      */
     @Test
     public void testCallStatePermission() throws Exception {
-        if (!mContext.getPackageManager().hasSystemFeature(FEATURE_TELEPHONY)) {
-            return;
-        }
-
         TelephonyManager telephonyManager = mContext.getSystemService(TelephonyManager.class);
         assertNotNull(telephonyManager);
         MyTelephonyCallback callback = new MyTelephonyCallback();
diff --git a/tests/tests/telephony2/src/android/telephony2/cts/TelephonyManagerReadPhoneStatePermissionTest.java b/tests/tests/telephony2/src/android/telephony2/cts/TelephonyManagerReadPhoneStatePermissionTest.java
new file mode 100644
index 0000000..214a3f7
--- /dev/null
+++ b/tests/tests/telephony2/src/android/telephony2/cts/TelephonyManagerReadPhoneStatePermissionTest.java
@@ -0,0 +1,274 @@
+/*
+ * Copyright (C) 2020 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 android.telephony2.cts;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.fail;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.platform.test.annotations.AppModeFull;
+import android.telecom.PhoneAccount;
+import android.telecom.TelecomManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+import android.telephony.cts.TelephonyUtils;
+import android.telephony.emergency.EmergencyNumber;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.ShellIdentityUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test TelephonyManager APIs with READ_PHONE_STATE Permission.
+ */
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = "Cannot grant the runtime permission in instant app mode")
+public class TelephonyManagerReadPhoneStatePermissionTest {
+
+    private boolean mHasTelephony;
+    TelephonyManager mTelephonyManager = null;
+    TelecomManager mTelecomManager = null;
+
+    @Before
+    public void setUp() throws Exception {
+        mHasTelephony = getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY);
+        mTelephonyManager =
+                (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
+        assertNotNull(mTelephonyManager);
+        mTelecomManager =
+                (TelecomManager) getContext().getSystemService(Context.TELECOM_SERVICE);
+        assertNotNull(mTelecomManager);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        TelephonyUtils.resetCompatCommand(InstrumentationRegistry.getInstrumentation(),
+                TelephonyUtils.CTS_APP_PACKAGE,
+                TelephonyUtils.ENABLE_GET_CALL_STATE_PERMISSION_PROTECTION_STRING);
+    }
+
+    /**
+     * Verify that TelephonyManager APIs requiring READ_PHONE_STATE Permission must work.
+     * <p>
+     * Requires Permission:
+     * {@link android.Manifest.permission#READ_PHONE_STATE}.
+     *
+     * APIs list:
+     * getDeviceSoftwareVersion()
+     * getCarrierConfig()
+     * getNetworkType()
+     * getDataNetworkType()
+     * getVoiceNetworkType()
+     * getGroupIdLevel1()
+     * getLine1AlphaTag()
+     * getVoiceMailNumber()
+     * getVisualVoicemailPackageName()
+     * getVoiceMailAlphaTag()
+     * getForbiddenPlmns()
+     * isDataRoamingEnabled()
+     * getSubscriptionId(@NonNull PhoneAccountHandle phoneAccountHandle)
+     * getServiceState()
+     * getEmergencyNumberList()
+     * getEmergencyNumberList(@EmergencyServiceCategories int categories)
+     * getPreferredOpportunisticDataSubscription()
+     * isModemEnabledForSlot(int slotIndex)
+     * isMultiSimSupported()
+     * doesSwitchMultiSimConfigTriggerReboot()
+     * getCallState() (when compat fwk enables enforcement)
+     * getCallStateForSubscription() (when compat fwk enables enforcement)
+     */
+    @Test
+    public void testTelephonyManagersAPIsRequiringReadPhoneStatePermissions() throws Exception {
+        if (!mHasTelephony) {
+            return;
+        }
+
+        try {
+            // We must ensure that compat fwk enables READ_PHONE_STATE enforcement
+            TelephonyUtils.enableCompatCommand(InstrumentationRegistry.getInstrumentation(),
+                    TelephonyUtils.CTS_APP_PACKAGE,
+                    TelephonyUtils.ENABLE_GET_CALL_STATE_PERMISSION_PROTECTION_STRING);
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getCallState());
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getCallStateForSubscription());
+        } catch (SecurityException e) {
+            fail("TelephonyManager#getCallState and TelephonyManager#getCallStateForSubscription "
+                    + "must not throw a SecurityException because READ_PHONE_STATE permission is "
+                    + "granted and TelecomManager#ENABLE_GET_CALL_STATE_PERMISSION_PROTECTION is "
+                    + "enabled.");
+        }
+
+        int subId = mTelephonyManager.getSubscriptionId();
+
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getNetworkType());
+        } catch (SecurityException e) {
+            fail("getNetworkType() must not throw a SecurityException with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getDeviceSoftwareVersion());
+        } catch (SecurityException e) {
+            fail("getDeviceSoftwareVersion() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getCarrierConfig());
+        } catch (SecurityException e) {
+            fail("getCarrierConfig() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getDataNetworkType());
+        } catch (SecurityException e) {
+            fail("getDataNetworkType() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getVoiceNetworkType());
+        } catch (SecurityException e) {
+            fail("getVoiceNetworkType() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getGroupIdLevel1());
+        } catch (SecurityException e) {
+            fail("getGroupIdLevel1() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getLine1AlphaTag());
+        } catch (SecurityException e) {
+            fail("getLine1AlphaTag() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getVoiceMailNumber());
+        } catch (SecurityException e) {
+            fail("getVoiceMailNumber() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getVisualVoicemailPackageName());
+        } catch (SecurityException e) {
+            fail("getVisualVoicemailPackageName() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getVoiceMailAlphaTag());
+        } catch (SecurityException e) {
+            fail("getVoiceMailAlphaTag() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getForbiddenPlmns());
+        } catch (SecurityException e) {
+            fail("getForbiddenPlmns() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.isDataRoamingEnabled());
+        } catch (SecurityException e) {
+            fail("isDataRoamingEnabled() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getSubscriptionId(
+                            mTelecomManager.getDefaultOutgoingPhoneAccount(
+                                    PhoneAccount.SCHEME_TEL)));
+        } catch (SecurityException e) {
+            fail("getSubscriptionId(phoneAccountHandle) must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getServiceState());
+        } catch (SecurityException e) {
+            fail("getServiceState() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getEmergencyNumberList());
+        } catch (SecurityException e) {
+            fail("getEmergencyNumberList() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getEmergencyNumberList(
+                            EmergencyNumber.EMERGENCY_SERVICE_CATEGORY_POLICE));
+        } catch (SecurityException e) {
+            fail("getEmergencyNumberList(EMERGENCY_SERVICE_CATEGORY_POLICE) must"
+                    + " not throw a SecurityException with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.getPreferredOpportunisticDataSubscription());
+        } catch (SecurityException e) {
+            fail("getPreferredOpportunisticDataSubscription() must not throw"
+                    + " a SecurityException with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.isModemEnabledForSlot(
+                            SubscriptionManager.getSlotIndex(subId)));
+        } catch (SecurityException e) {
+            fail("isModemEnabledForSlot(slotIndex) must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.isMultiSimSupported());
+        } catch (SecurityException e) {
+            fail("isMultiSimSupported() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+        try {
+            ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTelephonyManager, (tm) -> tm.doesSwitchMultiSimConfigTriggerReboot());
+        } catch (SecurityException e) {
+            fail("doesSwitchMultiSimConfigTriggerReboot() must not throw a SecurityException"
+                    + " with READ_PHONE_STATE" + e);
+        }
+    }
+
+    private static Context getContext() {
+        return InstrumentationRegistry.getContext();
+    }
+}
diff --git a/tests/tests/telephony3/Android.bp b/tests/tests/telephony3/Android.bp
index 5284cda..e5697e5 100644
--- a/tests/tests/telephony3/Android.bp
+++ b/tests/tests/telephony3/Android.bp
@@ -19,7 +19,10 @@
 android_test {
     name: "CtsTelephony3TestCases",
     defaults: ["cts_defaults"],
-    static_libs: ["ctstestrunner-axt"],
+    static_libs: [
+        "ctstestrunner-axt",
+        "compatibility-device-util-axt",
+    ],
     srcs: ["src/**/*.java"],
     // The SDK version is set to 28 to test device identifier access for apps with
     // the READ_PHONE_STATE permission targeting pre-Q.
diff --git a/tests/tests/telephony3/AndroidManifest.xml b/tests/tests/telephony3/AndroidManifest.xml
index 3a53a6c..22372b8 100644
--- a/tests/tests/telephony3/AndroidManifest.xml
+++ b/tests/tests/telephony3/AndroidManifest.xml
@@ -18,6 +18,7 @@
     package="android.telephony3.cts">
 
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
     <application>
         <uses-library android:name="android.test.runner" />
diff --git a/tests/tests/telephony3/README.md b/tests/tests/telephony3/README.md
new file mode 100644
index 0000000..b99b747
--- /dev/null
+++ b/tests/tests/telephony3/README.md
@@ -0,0 +1,4 @@
+# Telephony3 CTS tests
+
+This directory contains the set of Telephony CTS tests which verify behavior on
+sdk28 (Android P, which was released in 2018).
diff --git a/tests/tests/telephony3/src/android/telephony3/cts/CellInfoTest.java b/tests/tests/telephony3/src/android/telephony3/cts/CellInfoTest.java
new file mode 100644
index 0000000..9eb6aa0
--- /dev/null
+++ b/tests/tests/telephony3/src/android/telephony3/cts/CellInfoTest.java
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2019 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 android.telephony3.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.telephony.CellInfo;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import com.android.compatibility.common.util.ShellIdentityUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import java.util.List;
+
+public class CellInfoTest {
+    private static final String TAG = "CellInfoTest";
+
+    private static final int MAX_WAIT_SECONDS = 15;
+    private static final int POLL_INTERVAL_MILLIS = 1000;
+
+    private static final String[] sPermissions = new String[] {
+            android.Manifest.permission.READ_PHONE_STATE,
+            android.Manifest.permission.ACCESS_COARSE_LOCATION};
+
+    private TelephonyManager mTm;
+    private PackageManager mPm;
+
+    private boolean isCamped() {
+        return (mTm.getVoiceNetworkType() != TelephonyManager.NETWORK_TYPE_UNKNOWN
+                || mTm.getDataNetworkType() != TelephonyManager.NETWORK_TYPE_UNKNOWN);
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        mTm = (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
+        mPm = getContext().getPackageManager();
+
+        for (String permission : sPermissions) {
+            assertTrue("Something (not this test) has denied needed permission=" + permission,
+                    getContext().checkSelfPermission(permission)
+                            == android.content.pm.PackageManager.PERMISSION_GRANTED);
+        }
+    }
+
+    @Test
+    public void testCellInfoSdk28() {
+        if (!mPm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+            Log.d(TAG, "Skipping test that requires FEATURE_TELEPHONY");
+            return;
+        }
+
+        if (!isCamped()) fail("Device is not camped to a cell");
+
+        List<CellInfo> cellInfo = ShellIdentityUtils.invokeMethodWithShellPermissions(
+                mTm, TelephonyManager::getAllCellInfo);
+
+        // getAllCellInfo should never return null, and there should be at least one entry.
+        assertNotNull("TelephonyManager.getAllCellInfo() returned NULL CellInfo", cellInfo);
+        assertFalse("TelephonyManager.getAllCellInfo() returned an empty list", cellInfo.isEmpty());
+
+        final long initialTime = cellInfo.get(0).getTimeStamp();
+
+        for (int i = 0; i < MAX_WAIT_SECONDS; i++) {
+            try {
+                Thread.sleep(POLL_INTERVAL_MILLIS); // 1 second
+            } catch (InterruptedException ie) {
+                fail("Thread was interrupted");
+            }
+            List<CellInfo> newCellInfo = ShellIdentityUtils.invokeMethodWithShellPermissions(
+                    mTm, TelephonyManager::getAllCellInfo);
+            assertNotNull("TelephonyManager.getAllCellInfo() returned NULL CellInfo", newCellInfo);
+            assertFalse("TelephonyManager.getAllCellInfo() returned an empty list",
+                    newCellInfo.isEmpty());
+            // Test that new CellInfo has been retrieved from the modem
+            if (newCellInfo.get(0).getTimeStamp() != initialTime) return;
+        }
+        fail("CellInfo failed to update after " + MAX_WAIT_SECONDS + " seconds.");
+    }
+}
diff --git a/tests/tests/telephony3/src/android/telephony3/cts/PhoneStateListenerTest.java b/tests/tests/telephony3/src/android/telephony3/cts/PhoneStateListenerTest.java
new file mode 100644
index 0000000..01b3a2a
--- /dev/null
+++ b/tests/tests/telephony3/src/android/telephony3/cts/PhoneStateListenerTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2009 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 android.telephony3.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Looper;
+import android.telephony.PhoneStateListener;
+import android.telephony.ServiceState;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import androidx.test.filters.FlakyTest;
+
+import com.android.compatibility.common.util.TestThread;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+@FlakyTest
+public class PhoneStateListenerTest {
+
+    public static final long WAIT_TIME = 1000;
+    private boolean mOnServiceStateChangedCalled;
+    private TelephonyManager mTelephonyManager;
+    private PhoneStateListener mListener;
+    private final Object mLock = new Object();
+    private boolean mHasTelephony = true;
+    private static final String TAG = "android.telephony.cts.PhoneStateListenerTest";
+
+    @Before
+    public void setUp() throws Exception {
+        mTelephonyManager =
+                (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
+
+        PackageManager packageManager = getContext().getPackageManager();
+        if (packageManager != null) {
+            if (!packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY)) {
+                Log.d(TAG, "Some tests requiring FEATURE_TELEPHONY will be skipped");
+                mHasTelephony = false;
+            }
+        }
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        if (mListener != null) {
+            // unregister the listener
+            mTelephonyManager.listen(mListener, PhoneStateListener.LISTEN_NONE);
+        }
+    }
+
+    @Test
+    public void testPhoneStateListener() {
+        Looper.prepare();
+        new PhoneStateListener();
+    }
+
+    @Test
+    public void testOnUnRegisterFollowedByRegister() throws Throwable {
+        if (!mHasTelephony) {
+            return;
+        }
+
+        TestThread t = new TestThread(new Runnable() {
+            public void run() {
+                Looper.prepare();
+
+                mListener = new PhoneStateListener() {
+                    @Override
+                    public void onServiceStateChanged(ServiceState serviceState) {
+                        synchronized (mLock) {
+                            mOnServiceStateChangedCalled = true;
+                            mLock.notify();
+                        }
+                    }
+                };
+                mTelephonyManager.listen(mListener, PhoneStateListener.LISTEN_SERVICE_STATE);
+
+                Looper.loop();
+            }
+        });
+
+        assertFalse(mOnServiceStateChangedCalled);
+        t.start();
+
+        synchronized (mLock) {
+            if (!mOnServiceStateChangedCalled) {
+                mLock.wait(WAIT_TIME);
+            }
+        }
+        t.checkException();
+        assertTrue(mOnServiceStateChangedCalled);
+
+        // reset and un-register
+        mOnServiceStateChangedCalled = false;
+        if (mListener != null) {
+            // un-register the listener
+            mTelephonyManager.listen(mListener, PhoneStateListener.LISTEN_NONE);
+        }
+        synchronized (mLock) {
+            if (!mOnServiceStateChangedCalled) {
+                mLock.wait(WAIT_TIME);
+            }
+        }
+        assertFalse(mOnServiceStateChangedCalled);
+
+        // re-register the listener
+        mTelephonyManager.listen(mListener, PhoneStateListener.LISTEN_SERVICE_STATE);
+        synchronized (mLock) {
+            if (!mOnServiceStateChangedCalled) {
+                mLock.wait(WAIT_TIME);
+            }
+        }
+        t.checkException();
+        assertTrue(mOnServiceStateChangedCalled);
+    }
+}
diff --git a/tests/tests/telephony4/README.md b/tests/tests/telephony4/README.md
new file mode 100644
index 0000000..2a41615
--- /dev/null
+++ b/tests/tests/telephony4/README.md
@@ -0,0 +1,4 @@
+# Telephony4 CTS tests
+
+This directory contains the set of Telephony CTS tests which involve carrier privileges.
+The test apk is signed with android_telephony_cts_testkey.
diff --git a/tests/tests/telephony4/src/android/telephony4/cts/SimRestrictedApisTest.java b/tests/tests/telephony4/src/android/telephony4/cts/SimRestrictedApisTest.java
index 92904b2..4dd61b4 100644
--- a/tests/tests/telephony4/src/android/telephony4/cts/SimRestrictedApisTest.java
+++ b/tests/tests/telephony4/src/android/telephony4/cts/SimRestrictedApisTest.java
@@ -19,8 +19,10 @@
 import static androidx.test.InstrumentationRegistry.getContext;
 
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
 
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.os.AsyncTask;
 import android.telephony.SmsManager;
 import android.telephony.TelephonyManager;
@@ -37,6 +39,9 @@
 
     @Before
     public void setUp() throws Exception {
+        assumeTrue(getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_TELEPHONY));
+
         mTelephonyManager =
                 (TelephonyManager) getContext().getSystemService(Context.TELEPHONY_SERVICE);
     }
diff --git a/tests/tests/telephony5/src/android/telephony5/cts/TelephonyManagerReadNonDangerousPermissionTest.java b/tests/tests/telephony5/src/android/telephony5/cts/TelephonyManagerReadNonDangerousPermissionTest.java
index df0b9d6..c01916f 100644
--- a/tests/tests/telephony5/src/android/telephony5/cts/TelephonyManagerReadNonDangerousPermissionTest.java
+++ b/tests/tests/telephony5/src/android/telephony5/cts/TelephonyManagerReadNonDangerousPermissionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.telephony2.cts;
+package android.telephony5.cts;
 
 import static org.junit.Assert.fail;
 
diff --git a/tests/tests/telephonyprovider/src/android/telephonyprovider/cts/MmsTest.java b/tests/tests/telephonyprovider/src/android/telephonyprovider/cts/MmsTest.java
index 36cf75b..7748400 100644
--- a/tests/tests/telephonyprovider/src/android/telephonyprovider/cts/MmsTest.java
+++ b/tests/tests/telephonyprovider/src/android/telephonyprovider/cts/MmsTest.java
@@ -22,6 +22,9 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
+
 import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -521,5 +524,62 @@
         values.put(Telephony.Mms.MESSAGE_TYPE, messageType);
         return mContentResolver.insert(uri, values);
     }
+
+    /**
+     * Verifies that subqueries are not allowed with a restricted view
+     */
+    @Test
+    public void testSubqueryNotAllowed()  throws Throwable  {
+        int messageType = PduHeaders.MESSAGE_TYPE_NOTIFICATION_IND;
+        String expectedSubject = "testMmsQuery_canViewNotificationIndMessages";
+        Uri uri = insertTestMms(expectedSubject, messageType);
+        assertThat(uri).isNotNull();
+
+        DefaultSmsAppHelper.stopBeingDefaultSmsApp();
+        {
+            // selection
+            assertThrows(IllegalArgumentException.class, () -> mContentResolver.query(
+                    Telephony.Mms.CONTENT_URI, null,
+                    "seen=(SELECT seen FROM sms LIMIT 1)", null, null));
+        }
+
+        {
+            // projection
+            assertThrows(IllegalArgumentException.class, () -> mContentResolver.query(
+                    Telephony.Mms.CONTENT_URI,
+                    new String[] {"(SELECT seen from sms LIMIT 1) AS d"},
+                    null, null, null));
+        }
+
+        {
+            // sort order
+            assertThrows(IllegalArgumentException.class, () -> mContentResolver.query(
+                    Telephony.Mms.CONTENT_URI, null, null, null,
+                    "CASE (SELECT count(seen) FROM sms) WHEN 0 THEN 1 ELSE 0 END DESC"));
+        }
+
+        DefaultSmsAppHelper.ensureDefaultSmsApp();
+        {
+            // selection
+            Cursor cursor1 = mContentResolver.query(Telephony.Mms.CONTENT_URI,
+                    null, "seen=(SELECT seen FROM sms LIMIT 1)", null, null);
+            assertNotNull(cursor1);
+        }
+
+        {
+            // projection
+            Cursor cursor1 = mContentResolver.query(Telephony.Mms.CONTENT_URI,
+                    new String[] {"(SELECT seen from sms LIMIT 1) AS d"}, null, null, null);
+            assertNotNull(cursor1);
+        }
+
+        {
+            // sort order
+            Cursor cursor1 = mContentResolver.query(Telephony.Mms.CONTENT_URI,
+                    null, null, null,
+                    "CASE (SELECT count(seen) FROM sms) WHEN 0 THEN 1 ELSE 0 END DESC");
+            assertNotNull(cursor1);
+        }
+    }
 }
 
diff --git a/tests/tests/text/OWNERS b/tests/tests/text/OWNERS
index 73d670f6..b52adb9 100644
--- a/tests/tests/text/OWNERS
+++ b/tests/tests/text/OWNERS
@@ -4,6 +4,5 @@
 siyamed@google.com
 nona@google.com
 clarabayarri@google.com
-nfuller@google.com
 ngeoffray@google.com
 vichang@google.com
diff --git a/tests/tests/text/assets/fonts/LowGlyphFont.ttf b/tests/tests/text/assets/fonts/LowGlyphFont.ttf
new file mode 100644
index 0000000..751926e
--- /dev/null
+++ b/tests/tests/text/assets/fonts/LowGlyphFont.ttf
Binary files differ
diff --git a/tests/tests/text/assets/fonts/LowGlyphFont.ttx b/tests/tests/text/assets/fonts/LowGlyphFont.ttx
new file mode 100644
index 0000000..f613ee8
--- /dev/null
+++ b/tests/tests/text/assets/fonts/LowGlyphFont.ttx
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
+
+  <GlyphOrder>
+    <GlyphID id="0" name=".notdef"/>
+    <GlyphID id="1" name="a"/>
+  </GlyphOrder>
+
+  <head>
+    <tableVersion value="1.0"/>
+    <fontRevision value="1.0"/>
+    <checkSumAdjustment value="0x640cdb2f"/>
+    <magicNumber value="0x5f0f3cf5"/>
+    <flags value="00000000 00000011"/>
+    <unitsPerEm value="1000"/>
+    <created value="Fri Mar 17 07:26:00 2017"/>
+    <macStyle value="00000000 00000000"/>
+    <lowestRecPPEM value="7"/>
+    <fontDirectionHint value="2"/>
+    <glyphDataFormat value="0"/>
+  </head>
+
+  <hhea>
+    <tableVersion value="1.0"/>
+    <ascent value="1000"/>
+    <descent value="-1000"/>
+    <lineGap value="0"/>
+    <caretSlopeRise value="1"/>
+    <caretSlopeRun value="0"/>
+    <caretOffset value="0"/>
+    <reserved0 value="0"/>
+    <reserved1 value="0"/>
+    <reserved2 value="0"/>
+    <reserved3 value="0"/>
+    <metricDataFormat value="0"/>
+  </hhea>
+
+  <maxp>
+    <tableVersion value="0x10000"/>
+    <maxZones value="0"/>
+    <maxTwilightPoints value="0"/>
+    <maxStorage value="0"/>
+    <maxFunctionDefs value="0"/>
+    <maxInstructionDefs value="0"/>
+    <maxStackElements value="0"/>
+    <maxSizeOfInstructions value="0"/>
+    <maxComponentElements value="0"/>
+  </maxp>
+
+  <OS_2>
+    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
+         will be recalculated by the compiler -->
+    <version value="3"/>
+    <xAvgCharWidth value="594"/>
+    <usWeightClass value="400"/>
+    <usWidthClass value="5"/>
+    <fsType value="00000000 00001000"/>
+    <ySubscriptXSize value="650"/>
+    <ySubscriptYSize value="600"/>
+    <ySubscriptXOffset value="0"/>
+    <ySubscriptYOffset value="75"/>
+    <ySuperscriptXSize value="650"/>
+    <ySuperscriptYSize value="600"/>
+    <ySuperscriptXOffset value="0"/>
+    <ySuperscriptYOffset value="350"/>
+    <yStrikeoutSize value="50"/>
+    <yStrikeoutPosition value="300"/>
+    <sFamilyClass value="0"/>
+    <panose>
+      <bFamilyType value="0"/>
+      <bSerifStyle value="0"/>
+      <bWeight value="5"/>
+      <bProportion value="0"/>
+      <bContrast value="0"/>
+      <bStrokeVariation value="0"/>
+      <bArmStyle value="0"/>
+      <bLetterForm value="0"/>
+      <bMidline value="0"/>
+      <bXHeight value="0"/>
+    </panose>
+    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
+    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
+    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
+    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
+    <achVendID value="UKWN"/>
+    <fsSelection value="00000000 01000000"/>
+    <usFirstCharIndex value="32"/>
+    <usLastCharIndex value="122"/>
+    <sTypoAscender value="800"/>
+    <sTypoDescender value="-200"/>
+    <sTypoLineGap value="200"/>
+    <usWinAscent value="1000"/>
+    <usWinDescent value="200"/>
+    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
+    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
+    <sxHeight value="500"/>
+    <sCapHeight value="700"/>
+    <usDefaultChar value="0"/>
+    <usBreakChar value="32"/>
+    <usMaxContext value="0"/>
+  </OS_2>
+
+  <hmtx>
+    <mtx name=".notdef" width="500" lsb="93"/>
+    <mtx name="a" width="1000" lsb="93"/>  <!-- 3em -->
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_4 platformID="3" platEncID="10" language="0">
+      <map code="0x0061" name="a" />
+    </cmap_format_4>
+  </cmap>
+
+  <loca>
+    <!-- The 'loca' table will be calculated by the compiler -->
+  </loca>
+
+  <glyf>
+    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0" />
+    <TTGlyph name="a" xMin="0" yMin="-1000" xMax="1000" yMax="1000">
+      <contour>
+        <pt x="0" y="-1000" on="1" />
+        <pt x="0" y="1000" on="1" />
+        <pt x="1000" y="1000" on="1" />
+        <pt x="1000" y="-1000" on="1" />
+      </contour>
+      <instructions />
+    </TTGlyph>
+  </glyf>
+
+  <name>
+    <namerecord nameID="0" platformID="3" platEncID="1" langID="0x409">
+      Copyright (C) 2017 The Android Open Source Project
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      LowGlyph Test Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      LowGlyph Test Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="13" platformID="3" platEncID="1" langID="0x409">
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      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.
+    </namerecord>
+    <namerecord nameID="14" platformID="3" platEncID="1" langID="0x409">
+      http://www.apache.org/licenses/LICENSE-2.0
+    </namerecord>
+  </name>
+
+  <post>
+    <formatType value="3.0"/>
+    <italicAngle value="0.0"/>
+    <underlinePosition value="-75"/>
+    <underlineThickness value="50"/>
+    <isFixedPitch value="0"/>
+    <minMemType42 value="0"/>
+    <maxMemType42 value="0"/>
+    <minMemType1 value="0"/>
+    <maxMemType1 value="0"/>
+  </post>
+
+</ttFont>
diff --git a/tests/tests/text/assets/fonts/StaticLayoutTouchLocation.ttf b/tests/tests/text/assets/fonts/StaticLayoutTouchLocation.ttf
new file mode 100644
index 0000000..42a7362b
--- /dev/null
+++ b/tests/tests/text/assets/fonts/StaticLayoutTouchLocation.ttf
Binary files differ
diff --git a/tests/tests/text/assets/fonts/StaticLayoutTouchLocation.ttx b/tests/tests/text/assets/fonts/StaticLayoutTouchLocation.ttx
new file mode 100644
index 0000000..c7ad6e6
--- /dev/null
+++ b/tests/tests/text/assets/fonts/StaticLayoutTouchLocation.ttx
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
+
+  <GlyphOrder>
+    <GlyphID id="0" name=".notdef"/>
+    <GlyphID id="1" name="1em"/>
+  </GlyphOrder>
+
+  <head>
+    <tableVersion value="1.0"/>
+    <fontRevision value="1.0"/>
+    <checkSumAdjustment value="0x640cdb2f"/>
+    <magicNumber value="0x5f0f3cf5"/>
+    <flags value="00000000 00000011"/>
+    <unitsPerEm value="1000"/>
+    <created value="Thu Feb 15 18:29:10 2018"/>
+    <macStyle value="00000000 00000000"/>
+    <lowestRecPPEM value="7"/>
+    <fontDirectionHint value="2"/>
+    <glyphDataFormat value="0"/>
+  </head>
+
+  <hhea>
+    <tableVersion value="0x00010000"/>
+    <ascent value="1000"/>
+    <descent value="-200"/>
+    <lineGap value="0"/>
+    <caretSlopeRise value="1"/>
+    <caretSlopeRun value="0"/>
+    <caretOffset value="0"/>
+    <reserved0 value="0"/>
+    <reserved1 value="0"/>
+    <reserved2 value="0"/>
+    <reserved3 value="0"/>
+    <metricDataFormat value="0"/>
+  </hhea>
+
+  <maxp>
+    <tableVersion value="0x10000"/>
+    <maxZones value="0"/>
+    <maxTwilightPoints value="0"/>
+    <maxStorage value="0"/>
+    <maxFunctionDefs value="0"/>
+    <maxInstructionDefs value="0"/>
+    <maxStackElements value="0"/>
+    <maxSizeOfInstructions value="0"/>
+    <maxComponentElements value="0"/>
+  </maxp>
+
+  <OS_2>
+    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
+         will be recalculated by the compiler -->
+    <version value="3"/>
+    <xAvgCharWidth value="594"/>
+    <usWeightClass value="100"/>
+    <usWidthClass value="5"/>
+    <fsType value="00000000 00001000"/>
+    <ySubscriptXSize value="650"/>
+    <ySubscriptYSize value="600"/>
+    <ySubscriptXOffset value="0"/>
+    <ySubscriptYOffset value="75"/>
+    <ySuperscriptXSize value="650"/>
+    <ySuperscriptYSize value="600"/>
+    <ySuperscriptXOffset value="0"/>
+    <ySuperscriptYOffset value="350"/>
+    <yStrikeoutSize value="50"/>
+    <yStrikeoutPosition value="300"/>
+    <sFamilyClass value="0"/>
+    <panose>
+      <bFamilyType value="0"/>
+      <bSerifStyle value="0"/>
+      <bWeight value="5"/>
+      <bProportion value="0"/>
+      <bContrast value="0"/>
+      <bStrokeVariation value="0"/>
+      <bArmStyle value="0"/>
+      <bLetterForm value="0"/>
+      <bMidline value="0"/>
+      <bXHeight value="0"/>
+    </panose>
+    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
+    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
+    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
+    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
+    <achVendID value="UKWN"/>
+    <fsSelection value="00000000 01000000"/>
+    <usFirstCharIndex value="32"/>
+    <usLastCharIndex value="122"/>
+    <sTypoAscender value="800"/>
+    <sTypoDescender value="-200"/>
+    <sTypoLineGap value="200"/>
+    <usWinAscent value="1000"/>
+    <usWinDescent value="200"/>
+    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
+    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
+    <sxHeight value="500"/>
+    <sCapHeight value="700"/>
+    <usDefaultChar value="0"/>
+    <usBreakChar value="32"/>
+    <usMaxContext value="0"/>
+  </OS_2>
+
+  <hmtx>
+    <mtx name=".notdef" width="500" lsb="93"/>
+    <mtx name="1em" width="1000" lsb="0"/>
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_4 platformID="3" platEncID="10" language="0">
+        <map code="0x0020" name="1em" /> <!-- SPACE -->
+        <map code="0x0061" name="1em" /> <!-- SPACE -->
+        <map code="0x0627" name="1em" /> <!-- SPACE -->
+    </cmap_format_4>
+  </cmap>
+
+  <loca>
+    <!-- The 'loca' table will be calculated by the compiler -->
+  </loca>
+
+  <glyf>
+    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0" />
+    <TTGlyph name="1em" xMin="0" yMin="0" xMax="1000" yMax="1000">
+        <contour>
+            <pt x="0" y="0" on="1"/>
+            <pt x="1000" y="500" on="1"/>
+            <pt x="0" y="1000" on="1"/>
+        </contour>
+        <instructions />
+    </TTGlyph>
+  </glyf>
+
+  <name>
+    <namerecord nameID="0" platformID="3" platEncID="1" langID="0x409">
+      Copyright (C) 2021 The Android Open Source Project
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      Sample Font For Touch Location Test
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      Sample Font For Touch Location Test
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFontForTouchLocationTest-Regular
+    </namerecord>
+    <namerecord nameID="13" platformID="3" platEncID="1" langID="0x409">
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      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.
+    </namerecord>
+    <namerecord nameID="14" platformID="3" platEncID="1" langID="0x409">
+      http://www.apache.org/licenses/LICENSE-2.0
+    </namerecord>
+  </name>
+
+  <post>
+    <formatType value="3.0"/>
+    <italicAngle value="0.0"/>
+    <underlinePosition value="-75"/>
+    <underlineThickness value="50"/>
+    <isFixedPitch value="0"/>
+    <minMemType42 value="0"/>
+    <maxMemType42 value="0"/>
+    <minMemType1 value="0"/>
+    <maxMemType1 value="0"/>
+  </post>
+
+</ttFont>
diff --git a/tests/tests/text/assets/fonts/TallGlyphFont.ttf b/tests/tests/text/assets/fonts/TallGlyphFont.ttf
new file mode 100644
index 0000000..b6768e3
--- /dev/null
+++ b/tests/tests/text/assets/fonts/TallGlyphFont.ttf
Binary files differ
diff --git a/tests/tests/text/assets/fonts/TallGlyphFont.ttx b/tests/tests/text/assets/fonts/TallGlyphFont.ttx
new file mode 100644
index 0000000..5855933
--- /dev/null
+++ b/tests/tests/text/assets/fonts/TallGlyphFont.ttx
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2017 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.
+-->
+<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.0">
+
+  <GlyphOrder>
+    <GlyphID id="0" name=".notdef"/>
+    <GlyphID id="1" name="U+1000"/>
+  </GlyphOrder>
+
+  <head>
+    <tableVersion value="1.0"/>
+    <fontRevision value="1.0"/>
+    <checkSumAdjustment value="0x640cdb2f"/>
+    <magicNumber value="0x5f0f3cf5"/>
+    <flags value="00000000 00000011"/>
+    <unitsPerEm value="1000"/>
+    <created value="Fri Mar 17 07:26:00 2017"/>
+    <macStyle value="00000000 00000000"/>
+    <lowestRecPPEM value="7"/>
+    <fontDirectionHint value="2"/>
+    <glyphDataFormat value="0"/>
+  </head>
+
+  <hhea>
+    <tableVersion value="1.0"/>
+    <ascent value="3000"/>
+    <descent value="-3000"/>
+    <lineGap value="0"/>
+    <caretSlopeRise value="1"/>
+    <caretSlopeRun value="0"/>
+    <caretOffset value="0"/>
+    <reserved0 value="0"/>
+    <reserved1 value="0"/>
+    <reserved2 value="0"/>
+    <reserved3 value="0"/>
+    <metricDataFormat value="0"/>
+  </hhea>
+
+  <maxp>
+    <tableVersion value="0x10000"/>
+    <maxZones value="0"/>
+    <maxTwilightPoints value="0"/>
+    <maxStorage value="0"/>
+    <maxFunctionDefs value="0"/>
+    <maxInstructionDefs value="0"/>
+    <maxStackElements value="0"/>
+    <maxSizeOfInstructions value="0"/>
+    <maxComponentElements value="0"/>
+  </maxp>
+
+  <OS_2>
+    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'
+         will be recalculated by the compiler -->
+    <version value="3"/>
+    <xAvgCharWidth value="594"/>
+    <usWeightClass value="400"/>
+    <usWidthClass value="5"/>
+    <fsType value="00000000 00001000"/>
+    <ySubscriptXSize value="650"/>
+    <ySubscriptYSize value="600"/>
+    <ySubscriptXOffset value="0"/>
+    <ySubscriptYOffset value="75"/>
+    <ySuperscriptXSize value="650"/>
+    <ySuperscriptYSize value="600"/>
+    <ySuperscriptXOffset value="0"/>
+    <ySuperscriptYOffset value="350"/>
+    <yStrikeoutSize value="50"/>
+    <yStrikeoutPosition value="300"/>
+    <sFamilyClass value="0"/>
+    <panose>
+      <bFamilyType value="0"/>
+      <bSerifStyle value="0"/>
+      <bWeight value="5"/>
+      <bProportion value="0"/>
+      <bContrast value="0"/>
+      <bStrokeVariation value="0"/>
+      <bArmStyle value="0"/>
+      <bLetterForm value="0"/>
+      <bMidline value="0"/>
+      <bXHeight value="0"/>
+    </panose>
+    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>
+    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>
+    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>
+    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>
+    <achVendID value="UKWN"/>
+    <fsSelection value="00000000 01000000"/>
+    <usFirstCharIndex value="32"/>
+    <usLastCharIndex value="122"/>
+    <sTypoAscender value="800"/>
+    <sTypoDescender value="-200"/>
+    <sTypoLineGap value="200"/>
+    <usWinAscent value="1000"/>
+    <usWinDescent value="200"/>
+    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>
+    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>
+    <sxHeight value="500"/>
+    <sCapHeight value="700"/>
+    <usDefaultChar value="0"/>
+    <usBreakChar value="32"/>
+    <usMaxContext value="0"/>
+  </OS_2>
+
+  <hmtx>
+    <mtx name=".notdef" width="500" lsb="93"/>
+    <mtx name="U+1000" width="3000" lsb="93"/>  <!-- 3em -->
+  </hmtx>
+
+  <cmap>
+    <tableVersion version="0"/>
+    <cmap_format_4 platformID="3" platEncID="10" language="0">
+      <map code="0x1000" name="U+1000" />
+    </cmap_format_4>
+  </cmap>
+
+  <loca>
+    <!-- The 'loca' table will be calculated by the compiler -->
+  </loca>
+
+  <glyf>
+    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0" />
+    <TTGlyph name="U+1000" xMin="0" yMin="-3000" xMax="3000" yMax="3000">
+      <contour>
+        <pt x="0" y="-3000" on="1" />
+        <pt x="0" y="3000" on="1" />
+        <pt x="3000" y="3000" on="1" />
+        <pt x="3000" y="-3000" on="1" />
+      </contour>
+      <instructions />
+    </TTGlyph>
+  </glyf>
+
+  <name>
+    <namerecord nameID="0" platformID="3" platEncID="1" langID="0x409">
+      Copyright (C) 2017 The Android Open Source Project
+    </namerecord>
+    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">
+      TallGlyph Test Font
+    </namerecord>
+    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">
+      Regular
+    </namerecord>
+    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">
+      TallGlyph Test Font
+    </namerecord>
+    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">
+      SampleFont-Regular
+    </namerecord>
+    <namerecord nameID="13" platformID="3" platEncID="1" langID="0x409">
+      Licensed under the Apache License, Version 2.0 (the "License");
+      you may not use this file except in compliance with the License.
+      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.
+    </namerecord>
+    <namerecord nameID="14" platformID="3" platEncID="1" langID="0x409">
+      http://www.apache.org/licenses/LICENSE-2.0
+    </namerecord>
+  </name>
+
+  <post>
+    <formatType value="3.0"/>
+    <italicAngle value="0.0"/>
+    <underlinePosition value="-75"/>
+    <underlineThickness value="50"/>
+    <isFixedPitch value="0"/>
+    <minMemType42 value="0"/>
+    <maxMemType42 value="0"/>
+    <minMemType1 value="0"/>
+    <maxMemType1 value="0"/>
+  </post>
+
+</ttFont>
diff --git a/tests/tests/text/src/android/text/cts/BoringLayoutFallbackLineSpacingTest.java b/tests/tests/text/src/android/text/cts/BoringLayoutFallbackLineSpacingTest.java
new file mode 100644
index 0000000..9c59b62
--- /dev/null
+++ b/tests/tests/text/src/android/text/cts/BoringLayoutFallbackLineSpacingTest.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2021 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 android.text.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.res.AssetManager;
+import android.graphics.Typeface;
+import android.graphics.fonts.Font;
+import android.graphics.fonts.FontFamily;
+import android.platform.test.annotations.Presubmit;
+import android.text.BoringLayout;
+import android.text.Layout;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextDirectionHeuristics;
+import android.text.TextPaint;
+import android.text.style.TypefaceSpan;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+
+/**
+ * Tests StaticLayout vertical metrics behavior.
+ */
+@Presubmit
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class BoringLayoutFallbackLineSpacingTest {
+
+    @Test
+    public void testFallbackSpacing_Metrics() throws IOException {
+        AssetManager am =
+                InstrumentationRegistry.getInstrumentation().getTargetContext().getAssets();
+        Typeface typeface = new Typeface.CustomFallbackBuilder(
+                new FontFamily.Builder(
+                        new Font.Builder(am, "fonts/LowGlyphFont.ttf").build()
+                ).build()
+        ).addCustomFallback(
+                new FontFamily.Builder(
+                        new Font.Builder(am, "fonts/TallGlyphFont.ttf").build()
+                ).build()
+        ).build();
+
+        TextPaint p = new TextPaint();
+        p.setTextSize(100);  // make 1 em = 100 pixels
+        p.setTypeface(typeface);
+
+        String text = "a\u1000";
+        BoringLayout.Metrics boring = BoringLayout.isBoring(
+                text, p, TextDirectionHeuristics.LTR, false /* useFallbackLineSpacing */, null);
+
+        BoringLayout.Metrics fallbackLineSpacingBoring = BoringLayout.isBoring(
+                text, p, TextDirectionHeuristics.LTR, true /* useFallbackLineSpacing */, null);
+
+
+        // LowGlyphFont has -1 em ascent and 1 em descent. TallGlyphFont has -3em ascent and 3em
+        // descent.
+        assertThat(boring.ascent).isEqualTo(-100);
+        assertThat(boring.descent).isEqualTo(100);
+        assertThat(fallbackLineSpacingBoring.ascent).isEqualTo(-300);
+        assertThat(fallbackLineSpacingBoring.descent).isEqualTo(300);
+    }
+
+    @Test
+    public void testFallbackSpacing_Layout() throws IOException {
+        AssetManager am =
+                InstrumentationRegistry.getInstrumentation().getTargetContext().getAssets();
+        Typeface typeface = new Typeface.CustomFallbackBuilder(
+                new FontFamily.Builder(
+                        new Font.Builder(am, "fonts/LowGlyphFont.ttf").build()
+                ).build()
+        ).addCustomFallback(
+                new FontFamily.Builder(
+                        new Font.Builder(am, "fonts/TallGlyphFont.ttf").build()
+                ).build()
+        ).build();
+
+        TextPaint p = new TextPaint();
+        p.setTextSize(100);  // make 1 em = 100 pixels
+        p.setTypeface(typeface);
+
+        String text = "a\u1000";
+        BoringLayout.Metrics metrics = BoringLayout.isBoring(text, p, TextDirectionHeuristics.LTR,
+                false /* useFallbackLineSpacing */, null);
+        BoringLayout layout = BoringLayout.make(
+                text, p,
+                Integer.MAX_VALUE /* outer width */,
+                Layout.Alignment.ALIGN_NORMAL,
+                1.0f /* spacing mult */,
+                0.0f /* spacing add */,
+                metrics,
+                false /* includePad */);
+        BoringLayout includePadLayout = BoringLayout.make(
+                text, p,
+                Integer.MAX_VALUE /* outer width */,
+                Layout.Alignment.ALIGN_NORMAL,
+                1.0f /* spacing mult */,
+                0.0f /* spacing add */,
+                metrics,
+                true /* includePad */);
+
+        BoringLayout.Metrics fallbackMetrics = BoringLayout.isBoring(text, p,
+                TextDirectionHeuristics.LTR, true /* useFallbackLineSpacing */, null);
+        BoringLayout fallbackLayout = BoringLayout.make(
+                text, p,
+                Integer.MAX_VALUE /* outer width */,
+                Layout.Alignment.ALIGN_NORMAL,
+                1.0f /* spacing mult */,
+                0.0f /* spacing add */,
+                fallbackMetrics,
+                false /* includePad */);
+        BoringLayout includePadFallbackLayout = BoringLayout.make(
+                text, p,
+                Integer.MAX_VALUE /* outer width */,
+                Layout.Alignment.ALIGN_NORMAL,
+                1.0f /* spacing mult */,
+                0.0f /* spacing add */,
+                fallbackMetrics,
+                true /* includePad */);
+
+
+        // LowGlyphFont has -1 em ascent and 1 em descent. TallGlyphFont has -3em ascent and 3em
+        // descent.
+        assertThat(layout.getLineBottom(0)).isEqualTo(200);
+        assertThat(includePadLayout.getLineBottom(0)).isEqualTo(200);
+        assertThat(fallbackLayout.getLineBottom(0)).isEqualTo(600);
+        assertThat(includePadFallbackLayout.getLineBottom(0)).isEqualTo(600);
+    }
+
+    @Test
+    public void testReplacementSpans() {
+        SpannableString ss = new SpannableString("Hello, World.");
+        ss.setSpan(new TypefaceSpan(Typeface.SERIF), 5, 10, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+        TextPaint paint = new TextPaint();
+
+        BoringLayout.isBoring(ss, paint, TextDirectionHeuristics.FIRSTSTRONG_LTR, true, null);
+    }
+
+}
diff --git a/tests/tests/text/src/android/text/cts/BoringLayoutTest.java b/tests/tests/text/src/android/text/cts/BoringLayoutTest.java
index cb62639..d0f1de0 100644
--- a/tests/tests/text/src/android/text/cts/BoringLayoutTest.java
+++ b/tests/tests/text/src/android/text/cts/BoringLayoutTest.java
@@ -551,6 +551,70 @@
         }
     }
 
+    @Test
+    public void testSetGetUseFallbackLineSpacing_True() {
+        String text = "Hello, world";
+        String text2 = "Hello, Android";
+        TextPaint paint = new TextPaint();
+        BoringLayout.Metrics m = BoringLayout.isBoring(text, paint, TextDirectionHeuristics.LTR,
+                true, null);
+
+        BoringLayout bl = BoringLayout.make("hello, world", new TextPaint(),
+                100 /* outer width */,
+                Alignment.ALIGN_NORMAL,
+                m,
+                false /* include font padding */,
+                null,
+                100 /* ellipsis width */,
+                true);
+
+        assertTrue(bl.isFallbackLineSpacingEnabled());
+
+        BoringLayout bl2 = bl.replaceOrMake(text2, paint,
+                200 /* outer width */,
+                Alignment.ALIGN_CENTER,
+                m,
+                true /* include font padding */,
+                null,
+                100 /* ellipsis width */,
+                false);
+
+        assertFalse(bl2.isFallbackLineSpacingEnabled());
+
+    }
+
+    @Test
+    public void testSetGetUseFallbackLineSpacing_False() {
+        String text = "Hello, world";
+        String text2 = "Hello, Android";
+        TextPaint paint = new TextPaint();
+        BoringLayout.Metrics m = BoringLayout.isBoring(text, paint, TextDirectionHeuristics.LTR,
+                false, null);
+
+        BoringLayout bl = BoringLayout.make("hello, world", new TextPaint(),
+                100 /* outer width */,
+                Alignment.ALIGN_NORMAL,
+                m,
+                false /* include font padding */,
+                null,
+                100 /* ellipsis width */,
+                false);
+
+        assertFalse(bl.isFallbackLineSpacingEnabled());
+
+        BoringLayout bl2 = bl.replaceOrMake(text2, paint,
+                200 /* outer width */,
+                Alignment.ALIGN_CENTER,
+                m,
+                true /* include font padding */,
+                null,
+                100 /* ellipsis width */,
+                true);
+
+        assertTrue(bl2.isFallbackLineSpacingEnabled());
+
+    }
+
     private static Metrics createMetrics(
             final int top,
             final int ascent,
diff --git a/tests/tests/text/src/android/text/cts/FallbackLineSpacingTest.java b/tests/tests/text/src/android/text/cts/FallbackLineSpacingTest.java
new file mode 100644
index 0000000..2717cc4
--- /dev/null
+++ b/tests/tests/text/src/android/text/cts/FallbackLineSpacingTest.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright (C) 2021 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 android.text.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.res.AssetManager;
+import android.graphics.Paint;
+import android.graphics.Typeface;
+import android.graphics.fonts.Font;
+import android.graphics.fonts.FontFamily;
+import android.platform.test.annotations.Presubmit;
+import android.text.TextPaint;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+
+/**
+ * Tests StaticLayout vertical metrics behavior.
+ */
+@Presubmit
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class FallbackLineSpacingTest {
+
+    @Test
+    public void testFallbackSpacing() throws IOException {
+        AssetManager am =
+                InstrumentationRegistry.getInstrumentation().getTargetContext().getAssets();
+        Typeface typeface = new Typeface.CustomFallbackBuilder(
+                new FontFamily.Builder(
+                        new Font.Builder(am, "fonts/LowGlyphFont.ttf").build()
+                ).build()
+        ).addCustomFallback(
+                new FontFamily.Builder(
+                        new Font.Builder(am, "fonts/TallGlyphFont.ttf").build()
+                ).build()
+        ).build();
+
+        TextPaint p = new TextPaint();
+        p.setTextSize(100);  // make 1 em = 100 pixels
+        p.setTypeface(typeface);
+
+        String text = "a\u1000";
+
+        Paint.FontMetricsInt fmi = new Paint.FontMetricsInt();
+        p.getFontMetricsInt(text, 0, text.length(), 0, text.length(), false, fmi);
+        assertThat(fmi.top).isEqualTo(-300);
+        assertThat(fmi.ascent).isEqualTo(-300);
+        assertThat(fmi.descent).isEqualTo(300);
+        assertThat(fmi.bottom).isEqualTo(300);
+
+        p.getFontMetricsInt(text, 0, 1, 0, text.length(), false, fmi);
+        assertThat(fmi.top).isEqualTo(-100);
+        assertThat(fmi.ascent).isEqualTo(-100);
+        assertThat(fmi.descent).isEqualTo(100);
+        assertThat(fmi.bottom).isEqualTo(100);
+
+        p.getFontMetricsInt(text, 1, 1, 0, text.length(), false, fmi);
+        assertThat(fmi.top).isEqualTo(-300);
+        assertThat(fmi.ascent).isEqualTo(-300);
+        assertThat(fmi.descent).isEqualTo(300);
+        assertThat(fmi.bottom).isEqualTo(300);
+    }
+
+    @Test
+    public void testEmptyString() {
+        Paint.FontMetricsInt fmi = new Paint.FontMetricsInt();
+        Paint paint = new Paint();
+        paint.setTextSize(100);  // make 1em = 100 pixels
+        paint.getFontMetricsInt("a", 0, 0, 0, 0, false, fmi);
+
+        Paint.FontMetricsInt noTextFmi = paint.getFontMetricsInt();
+
+        assertThat(fmi).isEqualTo(noTextFmi);
+    }
+
+    @Test
+    public void testEmptyCharArray() {
+        Paint.FontMetricsInt fmi = new Paint.FontMetricsInt();
+        Paint paint = new Paint();
+        paint.setTextSize(100);  // make 1em = 100 pixels
+        paint.getFontMetricsInt("a".toCharArray(), 0, 0, 0, 0, false, fmi);
+
+        Paint.FontMetricsInt noTextFmi = paint.getFontMetricsInt();
+
+        assertThat(fmi).isEqualTo(noTextFmi);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNullTextArgument_String() {
+        new Paint().getFontMetricsInt((String) null, 0, 0, 0, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testNullTextArgument_CharArgument() {
+        new Paint().getFontMetricsInt((char[]) null, 0, 0, 0, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    // start argument test cases
+    @Test(expected = IllegalArgumentException.class)
+    public void testSmallStartArgument_String() {
+        new Paint().getFontMetricsInt("a", -1, 0, 0, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSmallStartArgument_CharArray() {
+        new Paint().getFontMetricsInt("a".toCharArray(), -1, 0, 0, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testLargeStartArgument_String() {
+        new Paint().getFontMetricsInt("a", 2, 0, 0, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testLargeStartArgument_CharArray() {
+        new Paint().getFontMetricsInt("a".toCharArray(), 2, 0, 0, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    // count argument test cases
+    @Test(expected = IllegalArgumentException.class)
+    public void testSmallCountArgument_String() {
+        new Paint().getFontMetricsInt("a", 0, -1, 0, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSmalCountArgument_CharArray() {
+        new Paint().getFontMetricsInt("a".toCharArray(), 0, -1, 0, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testLargeCountArgument_String() {
+        new Paint().getFontMetricsInt("a", 0, 2, 0, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testLargeCountArgument_CharArray() {
+        new Paint().getFontMetricsInt("a".toCharArray(), 0, 2, 0, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    // ctxStart argument test cases
+    @Test(expected = IllegalArgumentException.class)
+    public void testSmallCtxStartArgument_String() {
+        new Paint().getFontMetricsInt("a", 0, 1, -1, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSmallCtxStartArgument_CharArray() {
+        new Paint().getFontMetricsInt("a".toCharArray(), 0, 1, -1, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testLargeCtxStartArgument_String() {
+        new Paint().getFontMetricsInt("a", 0, 1, 2, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testLargeCtxStartArgument_CharArray() {
+        new Paint().getFontMetricsInt("a".toCharArray(), 0, 1, 2, 0, false,
+                new Paint.FontMetricsInt());
+    }
+
+    // count argument test cases
+    @Test(expected = IllegalArgumentException.class)
+    public void testSmallCtxCountArgument_String() {
+        new Paint().getFontMetricsInt("a", 0, 1, 0, -1, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSmalCtxCountArgument_CharArray() {
+        new Paint().getFontMetricsInt("a".toCharArray(), 0, 1, 0, -1, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testLargeCtxCountArgument_String() {
+        new Paint().getFontMetricsInt("a", 0, 1, 0, 2, false,
+                new Paint.FontMetricsInt());
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testLargeCtxCountArgument_CharArray() {
+        new Paint().getFontMetricsInt("a".toCharArray(), 0, 1, 0, 2, false,
+                new Paint.FontMetricsInt());
+    }
+
+    // count argument test cases
+    @Test(expected = IllegalArgumentException.class)
+    public void testSmallNullOutArgument_String() {
+        new Paint().getFontMetricsInt("a", 0, 1, 0, 1, false, null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testSmalNullOutArgument_CharArray() {
+        new Paint().getFontMetricsInt("a".toCharArray(), 0, 1, 0, 1, false, null);
+    }
+
+}
diff --git a/tests/tests/text/src/android/text/cts/FontFileTestUtil.java b/tests/tests/text/src/android/text/cts/FontFileTestUtil.java
new file mode 100644
index 0000000..6fbab1f
--- /dev/null
+++ b/tests/tests/text/src/android/text/cts/FontFileTestUtil.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2021 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 android.text.cts;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.FileChannel;
+import java.nio.charset.StandardCharsets;
+
+public class FontFileTestUtil {
+    private static final int SFNT_VERSION_1 = 0x00010000;
+    private static final int SFNT_VERSION_OTTO = 0x4F54544F;
+    private static final int TTC_TAG = 0x74746366;
+    private static final int NAME_TAG = 0x6E616D65;
+    private static final int GPOS_TAG = 0x47504F53;
+    private static final int CHWS_TAG = 0x63687773;
+
+    public static String getPostScriptName(File file, int index) {
+        try (FileInputStream fis = new FileInputStream(file)) {
+            final FileChannel fc = fis.getChannel();
+            long size = fc.size();
+            ByteBuffer buffer = fc.map(FileChannel.MapMode.READ_ONLY, 0, size)
+                    .order(ByteOrder.BIG_ENDIAN);
+
+            int magicNumber = buffer.getInt(0);
+
+            int fontOffset = 0;
+            int numFonts = buffer.getInt(8);
+            if (index >= numFonts) {
+                return null;
+            }
+
+            if (magicNumber == TTC_TAG) {
+                fontOffset = buffer.getInt(12 + 4 * index);
+                magicNumber = buffer.getInt(fontOffset);
+                if (magicNumber != SFNT_VERSION_1 && magicNumber != SFNT_VERSION_OTTO) {
+                    throw new IOException("Unknown magic number at 0th font: #" + magicNumber);
+                }
+            } else if (magicNumber != SFNT_VERSION_1 && magicNumber != SFNT_VERSION_OTTO) {
+                throw new IOException("Unknown magic number: #" + magicNumber);
+            }
+
+            int numTables = buffer.getShort(fontOffset + 4);  // offset to number of table
+            int nameTableOffset = 0;
+            for (int i = 0; i < numTables; ++i) {
+                int tableEntryOffset = fontOffset + 12 + i * 16;
+                int tableTag = buffer.getInt(tableEntryOffset);
+                if (tableTag == NAME_TAG) {
+                    nameTableOffset = buffer.getInt(tableEntryOffset + 8);
+                    break;
+                }
+            }
+
+            if (nameTableOffset == 0) {
+                throw new IOException("name table not found.");
+            }
+
+            int nameTableCount = buffer.getShort(nameTableOffset + 2);
+            int storageOffset = buffer.getShort(nameTableOffset + 4);
+
+            for (int i = 0; i < nameTableCount; ++i) {
+                int platformID = buffer.getShort(nameTableOffset + 6 + i * 12);
+                int encodingID = buffer.getShort(nameTableOffset + 6 + i * 12 + 2);
+                int languageID = buffer.getShort(nameTableOffset + 6 + i * 12 + 4);
+                int nameID = buffer.getShort(nameTableOffset + 6 + i * 12 + 6);
+                int length = buffer.getShort(nameTableOffset + 6 + i * 12 + 8);
+                int stringOffset = buffer.getShort(nameTableOffset + 6 + i * 12 + 10);
+
+                if (nameID == 6 && platformID == 3 && encodingID == 1 && languageID == 1033) {
+                    byte[] name = new byte[length];
+                    ByteBuffer slice = buffer.slice();
+                    slice.position(nameTableOffset + storageOffset + stringOffset);
+                    slice.get(name);
+                    // encoded in UTF-16BE for platform ID = 3
+                    return new String(name, StandardCharsets.UTF_16BE);
+                }
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return null;
+    }
+}
diff --git a/tests/tests/text/src/android/text/cts/NotoCJKFontRequirement.java b/tests/tests/text/src/android/text/cts/NotoCJKFontRequirement.java
new file mode 100644
index 0000000..ef751ce
--- /dev/null
+++ b/tests/tests/text/src/android/text/cts/NotoCJKFontRequirement.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright (C) 2021 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 android.text.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.res.Resources;
+import android.graphics.Paint;
+import android.graphics.Typeface;
+import android.graphics.fonts.Font;
+import android.graphics.fonts.FontFamily;
+import android.graphics.fonts.SystemFonts;
+import android.graphics.text.PositionedGlyphs;
+import android.graphics.text.TextRunShaper;
+import android.icu.util.ULocale;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class NotoCJKFontRequirement {
+
+    private static final String TEST_OPEN_DOUBLE_KEY_BRACKET = "\u300C\u300E";
+
+    private static final Set<String> CJK_SCRIPT = new HashSet<>(Arrays.asList(
+            "Hani",  // General Han character
+            "Hans",  // Simplified Chinese
+            "Hant",  // Tranditional Chinese
+            "Hira", "Hrkt", "Jpan", "Kana",  // Japanese
+            "Hang", "Kore" // Hangul
+    ));
+
+    private boolean isCJKSupported() {
+        final String[] localeNames = Resources.getSystem().getStringArray(
+                Resources.getSystem().getIdentifier("supported_locales", "array", "android"));
+        for (String locale : localeNames) {
+            final ULocale uLocale = ULocale.addLikelySubtags(ULocale.forLanguageTag(locale));
+            final String script = uLocale.getScript();
+
+            if (CJK_SCRIPT.contains(script)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    // List of CJK font configuration.
+    private static final Set<String> CJK_FONT_PSNAMES = new HashSet<>();
+
+    static {
+        CJK_FONT_PSNAMES.add("NotoSansCJKsc-Regular");
+        CJK_FONT_PSNAMES.add("NotoSansCJKtc-Regular");
+        CJK_FONT_PSNAMES.add("NotoSansCJKjp-Regular");
+        CJK_FONT_PSNAMES.add("NotoSansCJKkr-Regular");
+        CJK_FONT_PSNAMES.add("NotoSerifCJKsc-Regular");
+        CJK_FONT_PSNAMES.add("NotoSerifCJKtc-Regular");
+        CJK_FONT_PSNAMES.add("NotoSerifCJKjp-Regular");
+        CJK_FONT_PSNAMES.add("NotoSerifCJKkr-Regular");
+    };
+
+    // Returns list of Noto CJK fonts.
+    private static List<Font> getNotoCJKFonts() {
+        final ArrayList<Font> cjkFonts = new ArrayList<>();
+
+        for (Font font : SystemFonts.getAvailableFonts()) {
+            String psName = FontFileTestUtil.getPostScriptName(font.getFile(), font.getTtcIndex());
+            if (CJK_FONT_PSNAMES.contains(psName)) {
+                cjkFonts.add(font);
+            }
+        }
+
+        return cjkFonts;
+    }
+
+    @Test
+    public void testContextualSpacing() {
+        if (!isCJKSupported()) {
+            return;  // If the device doesn't support CJK language, don't require chws font.
+        }
+
+        Paint paint = new Paint();
+
+        // Only expect chws feature on NotoCJK fonts.
+        getNotoCJKFonts().forEach(font -> {
+            Typeface tf = new Typeface.CustomFallbackBuilder(
+                    new FontFamily.Builder(font).build()
+            ).build();
+
+            paint.setTextSize(100f);  // Make 1em = 100px
+            paint.setTypeface(tf);
+            paint.setFontFeatureSettings("\"chws\" 0");
+
+            PositionedGlyphs offGlyphs = TextRunShaper.shapeTextRun(
+                    TEST_OPEN_DOUBLE_KEY_BRACKET,
+                    0, TEST_OPEN_DOUBLE_KEY_BRACKET.length(),
+                    0, TEST_OPEN_DOUBLE_KEY_BRACKET.length(),
+                    0f, 0f, false /* LTR */, paint);
+
+            paint.setFontFeatureSettings("\"chws\" 1");
+
+            PositionedGlyphs onGlyphs = TextRunShaper.shapeTextRun(
+                    TEST_OPEN_DOUBLE_KEY_BRACKET,
+                    0, TEST_OPEN_DOUBLE_KEY_BRACKET.length(),
+                    0, TEST_OPEN_DOUBLE_KEY_BRACKET.length(),
+                    0f, 0f, false /* LTR */, paint);
+
+            assertThat(onGlyphs.getGlyphX(1)).isLessThan(offGlyphs.getGlyphX(1));
+        });
+    }
+}
diff --git a/tests/tests/text/src/android/text/cts/PrecomputedTextTest.java b/tests/tests/text/src/android/text/cts/PrecomputedTextTest.java
index a0ecfc6..1713ffd 100644
--- a/tests/tests/text/src/android/text/cts/PrecomputedTextTest.java
+++ b/tests/tests/text/src/android/text/cts/PrecomputedTextTest.java
@@ -19,6 +19,8 @@
 import static android.text.TextDirectionHeuristics.LTR;
 import static android.text.TextDirectionHeuristics.RTL;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -27,19 +29,26 @@
 import static org.junit.Assert.fail;
 
 import android.content.Context;
+import android.content.res.AssetManager;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.Typeface;
+import android.graphics.fonts.Font;
+import android.graphics.fonts.FontFamily;
+import android.graphics.text.LineBreakConfig;
 import android.text.Layout;
 import android.text.PrecomputedText;
 import android.text.PrecomputedText.Params;
 import android.text.Spannable;
+import android.text.SpannableString;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextDirectionHeuristics;
 import android.text.TextPaint;
+import android.text.style.AbsoluteSizeSpan;
 import android.text.style.BackgroundColorSpan;
 import android.text.style.LocaleSpan;
 import android.text.style.TextAppearanceSpan;
@@ -54,6 +63,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.IOException;
 import java.util.Locale;
 
 @SmallTest
@@ -88,6 +98,24 @@
                 .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)
                 .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
                 .setTextDirection(LTR).build());
+
+        LineBreakConfig strictNoneConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_STRICT)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+        assertNotNull(new Params.Builder(PAINT)
+                .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)
+                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
+                .setLineBreakConfig(strictNoneConfig)
+                .setTextDirection(LTR).build());
+
+        LineBreakConfig nonePhraseConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_NONE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE).build();
+        assertNotNull(new Params.Builder(PAINT)
+                .setBreakStrategy(Layout.BREAK_STRATEGY_SIMPLE)
+                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
+                .setLineBreakConfig(nonePhraseConfig)
+                .setTextDirection(LTR).build());
     }
 
     @Test
@@ -99,6 +127,12 @@
                         .getHyphenationFrequency());
         assertEquals(RTL, new Params.Builder(PAINT).setTextDirection(RTL).build()
                 .getTextDirection());
+
+        LineBreakConfig lineBreakConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_STRICT)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE).build();
+        assertTrue(lineBreakConfig.equals(new Params.Builder(PAINT)
+                .setLineBreakConfig(lineBreakConfig).build().getLineBreakConfig()));
     }
 
     @Test
@@ -112,10 +146,24 @@
     }
 
     @Test
+    public void testParams_defaultLineBreakConfig() {
+        // Verify it will return the pre-defined instance with the default value if the
+        // LineBreakConfig has not been set to Params before.
+        LineBreakConfig config = new Params.Builder(PAINT).build().getLineBreakConfig();
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_NONE, config.getLineBreakStyle());
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE, config.getLineBreakWordStyle());
+    }
+
+    @Test
     public void testParams_equals() {
+        LineBreakConfig config = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_STRICT)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE).build();
+
         final Params base = new Params.Builder(PAINT)
                 .setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY)
                 .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
+                .setLineBreakConfig(config)
                 .setTextDirection(LTR).build();
 
         assertFalse(base.equals(null));
@@ -125,6 +173,7 @@
         Params other = new Params.Builder(PAINT)
                 .setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY)
                 .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
+                .setLineBreakConfig(config)
                 .setTextDirection(LTR).build();
         assertTrue(base.equals(other));
         assertTrue(other.equals(base));
@@ -727,4 +776,79 @@
         assertSameOutput(ssb, 3, firstLineLen - 3, 0, ssb.length(), paint);
         assertSameOutput(ssb, 3, firstLineLen - 3, 2, ssb.length() - 2, paint);
     }
+
+    private TextPaint getTestPaint() {
+        try {
+            AssetManager am =
+                    androidx.test.platform.app.InstrumentationRegistry.getInstrumentation()
+                            .getTargetContext().getAssets();
+            Typeface typeface = new Typeface.CustomFallbackBuilder(
+                    new FontFamily.Builder(
+                            new Font.Builder(am, "fonts/LowGlyphFont.ttf").build()
+                    ).build()
+            ).addCustomFallback(
+                    new FontFamily.Builder(
+                            new Font.Builder(am, "fonts/TallGlyphFont.ttf").build()
+                    ).build()
+            ).build();
+
+            TextPaint p = new TextPaint();
+            p.setTextSize(100);  // make 1 em = 100 pixels
+            p.setTypeface(typeface);
+            return p;
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Test
+    public void testMetricsInt() {
+        final TextPaint paint = getTestPaint();
+        final Params param = new Params.Builder(paint).build();
+        final SpannableString ss = new SpannableString("a\u1000");
+
+        PrecomputedText pt = PrecomputedText.create(ss, param);
+        Paint.FontMetricsInt fmi = new Paint.FontMetricsInt();
+        pt.getFontMetricsInt(0, ss.length(), fmi);
+
+        Paint.FontMetricsInt expected = new Paint.FontMetricsInt();
+        paint.getFontMetricsInt(ss, 0, ss.length(), 0, ss.length(), false, expected);
+
+        assertThat(fmi).isEqualTo(expected);
+    }
+
+    @Test
+    public void testMetricsInt_Substring() {
+        final TextPaint paint = getTestPaint();
+        final Params param = new Params.Builder(paint).build();
+        final SpannableString ss = new SpannableString("a\u1000");
+
+        PrecomputedText pt = PrecomputedText.create(ss, param);
+        Paint.FontMetricsInt fmi = new Paint.FontMetricsInt();
+        Paint.FontMetricsInt expected = new Paint.FontMetricsInt();
+
+        pt.getFontMetricsInt(0, 1, fmi);
+        paint.getFontMetricsInt(ss, 0, 1, 0, 1, false, expected);
+        assertThat(fmi).isEqualTo(expected);
+
+        pt.getFontMetricsInt(1, 2, fmi);
+        paint.getFontMetricsInt(ss, 1, 1, 1, 1, false, expected);
+        assertThat(fmi).isEqualTo(expected);
+    }
+
+    @Test
+    public void testMetricsInt_MultiStyle() {
+        final TextPaint paint = getTestPaint();
+        final Params param = new Params.Builder(paint).build();
+        final SpannableString ss = new SpannableString("a\u1000");
+        ss.setSpan(new AbsoluteSizeSpan(10), 0, 1, Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
+
+        PrecomputedText pt = PrecomputedText.create(ss, param);
+        Paint.FontMetricsInt fmi = new Paint.FontMetricsInt();
+        Paint.FontMetricsInt expected = new Paint.FontMetricsInt();
+
+        pt.getFontMetricsInt(0, 2, fmi);
+        paint.getFontMetricsInt(ss, 0, 2, 0, 2, false, expected);
+        assertThat(fmi).isEqualTo(expected);
+    }
 }
diff --git a/tests/tests/text/src/android/text/cts/StaticLayoutBidiTouchTest.java b/tests/tests/text/src/android/text/cts/StaticLayoutBidiTouchTest.java
new file mode 100644
index 0000000..641b278
--- /dev/null
+++ b/tests/tests/text/src/android/text/cts/StaticLayoutBidiTouchTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2019 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 android.text.cts;
+
+import static org.junit.Assert.assertNotNull;
+
+import android.content.res.AssetManager;
+import android.graphics.Typeface;
+import android.platform.test.annotations.AsbSecurityTest;
+import android.text.Layout;
+import android.text.SpannableString;
+import android.text.StaticLayout;
+import android.text.TextDirectionHeuristics;
+import android.text.TextPaint;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class StaticLayoutBidiTouchTest {
+
+    @Test
+    @AsbSecurityTest(cveBugId = 193849901)
+    public void touchOffsetTest() {
+        AssetManager am = InstrumentationRegistry.getInstrumentation().getContext().getAssets();
+        TextPaint p = new TextPaint();
+        Typeface tf = new Typeface.Builder(am, "fonts/StaticLayoutTouchLocation.ttf").build();
+        assertNotNull(tf);
+        p.setTypeface(tf);
+        p.setTextSize(10f);
+
+        CharSequence text = new SpannableString("\u0627\u0020\u2066\u0020\u0061");
+        int width = 10;
+        Layout layout = StaticLayout.Builder.obtain(text, 0, text.length(), p, width)
+                .setTextDirection(TextDirectionHeuristics.RTL)
+                .build();
+
+        // Accessing from left with 20 dividing points.
+        for (int i = 0; i < layout.getLineCount(); ++i) {
+            for (float w = 0; w < layout.getLineWidth(i); w += layout.getLineWidth(i) / 20f) {
+                layout.getOffsetForHorizontal(i, w);
+            }
+        }
+    }
+}
diff --git a/tests/tests/text/src/android/text/cts/StaticLayoutFallbackLineSpacingTest.java b/tests/tests/text/src/android/text/cts/StaticLayoutFallbackLineSpacingTest.java
new file mode 100644
index 0000000..8c6d761
--- /dev/null
+++ b/tests/tests/text/src/android/text/cts/StaticLayoutFallbackLineSpacingTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2021 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 android.text.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.res.AssetManager;
+import android.graphics.Typeface;
+import android.graphics.fonts.Font;
+import android.graphics.fonts.FontFamily;
+import android.graphics.text.PositionedGlyphs;
+import android.graphics.text.TextRunShaper;
+import android.platform.test.annotations.Presubmit;
+import android.text.StaticLayout;
+import android.text.TextPaint;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.IOException;
+
+/**
+ * Tests StaticLayout vertical metrics behavior.
+ */
+@Presubmit
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class StaticLayoutFallbackLineSpacingTest {
+
+    @Test
+    public void testFallbackSpacing() throws IOException {
+        AssetManager am =
+                InstrumentationRegistry.getInstrumentation().getTargetContext().getAssets();
+        Typeface typeface = new Typeface.CustomFallbackBuilder(
+                new FontFamily.Builder(
+                        new Font.Builder(am, "fonts/LowGlyphFont.ttf").build()
+                ).build()
+        ).addCustomFallback(
+                new FontFamily.Builder(
+                        new Font.Builder(am, "fonts/TallGlyphFont.ttf").build()
+                ).build()
+        ).build();
+
+        TextPaint p = new TextPaint();
+        p.setTextSize(100);  // make 1 em = 100 pixels
+        p.setTypeface(typeface);
+
+        PositionedGlyphs glyphs = TextRunShaper.shapeTextRun("a", 0, 1, 0, 1, 0, 0, false, p);
+        // LowGlyphFont has -1 em ascent and 1 em descent.
+        assertThat(glyphs.getAscent()).isEqualTo(-100);
+        assertThat(glyphs.getDescent()).isEqualTo(100);
+
+        glyphs = TextRunShaper.shapeTextRun("\u1000", 0, 1, 0, 1, 0, 0, false, p);
+        // TallGlyphFont has -3 em ascent and 3 em descent.
+        assertThat(glyphs.getAscent()).isEqualTo(-300);
+        assertThat(glyphs.getDescent()).isEqualTo(300);
+
+        String text = "a\u1000";
+        glyphs = TextRunShaper.shapeTextRun(
+                text, 0, text.length(), 0, text.length(), 0, 0, false, p);
+
+        // TallGlyphFont has -3em ascent and 3em descent.
+        assertThat(glyphs.getAscent()).isEqualTo(-300);
+        assertThat(glyphs.getDescent()).isEqualTo(300);
+
+        StaticLayout layout = StaticLayout.Builder.obtain(
+                text, 0, text.length(), p, Integer.MAX_VALUE)
+                .setUseLineSpacingFromFallbacks(true)
+                .setIncludePad(true)
+                .build();
+        assertThat(layout.getLineBottom(0)).isEqualTo(600);
+    }
+
+}
diff --git a/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingVariantsTest.java b/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingVariantsTest.java
index f3781b6..502a91d 100644
--- a/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingVariantsTest.java
+++ b/tests/tests/text/src/android/text/cts/StaticLayoutLineBreakingVariantsTest.java
@@ -20,6 +20,7 @@
 
 import android.content.Context;
 import android.graphics.Typeface;
+import android.graphics.text.LineBreakConfig;
 import android.os.LocaleList;
 import android.text.StaticLayout;
 import android.text.TextPaint;
@@ -47,13 +48,18 @@
         return paint;
     }
 
-    private static StaticLayout buildLayout(String text, LocaleList locales, int width) {
-        return StaticLayout.Builder.obtain(
-                text, 0, text.length(), setupPaint(locales), width).build();
+    private static StaticLayout buildLayout(String text, LocaleList locales,
+            LineBreakConfig lineBreakConfig, int width) {
+        StaticLayout.Builder builder = StaticLayout.Builder.obtain(text, 0, text.length(),
+                setupPaint(locales), width);
+        builder.setLineBreakConfig(lineBreakConfig);
+        return builder.build();
     }
 
-    private static void assertLineBreak(String text, String locale, int width, String... expected) {
-        final StaticLayout layout = buildLayout(text, LocaleList.forLanguageTags(locale), width);
+    private static void assertLineBreak(String text, String locale,
+            LineBreakConfig lineBreakConfig, int width, String... expected) {
+        final StaticLayout layout = buildLayout(text, LocaleList.forLanguageTags(locale),
+                lineBreakConfig, width);
         assertEquals(expected.length, layout.getLineCount());
 
         int currentExpectedOffset = 0;
@@ -73,39 +79,52 @@
     //        \u30D0\u30C3\u30C6\u30EA\u30FC\u30BB\u30FC\u30D0\u30FC
     // loose :^     ^     ^     ^     ^     ^     ^     ^     ^     ^
     // strict:^           ^     ^           ^           ^           ^
+    // phrase:^                                                     ^
     private static final String SAMPLE_TEXT =
             "\u30D0\u30C3\u30C6\u30EA\u30FC\u30BB\u30FC\u30D0\u30FC";
 
+    // Another test string is "I'm also curious about new models." in Japanese.
+    // Here are the list of breaking points.
+    //         \u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B\u306A\u308B\u3057\u3002
+    // loose : ^     ^     ^     ^     ^     ^     ^     ^     ^     ^     ^           ^
+    // strict: ^     ^     ^     ^     ^     ^     ^     ^     ^     ^     ^           ^
+    // phrase: ^                 ^                 ^           ^                       ^
+    private static final String SAMPLE_TEXT2 =
+            "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B\u306A\u308B\u3057\u3002";
+
     @Test
     public void testBreakVariant_loose() {
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-loose", 90, SAMPLE_TEXT);
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-loose", 80,
+        LineBreakConfig config = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_LOOSE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 90, SAMPLE_TEXT);
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 80,
                 "\u30D0\u30C3\u30C6\u30EA\u30FC\u30BB\u30FC\u30D0",
                 "\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-loose", 70,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 70,
                 "\u30D0\u30C3\u30C6\u30EA\u30FC\u30BB\u30FC",
                 "\u30D0\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-loose", 60,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 60,
                 "\u30D0\u30C3\u30C6\u30EA\u30FC\u30BB",
                 "\u30FC\u30D0\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-loose", 50,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 50,
                 "\u30D0\u30C3\u30C6\u30EA\u30FC",
                 "\u30BB\u30FC\u30D0\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-loose", 40,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 40,
                 "\u30D0\u30C3\u30C6\u30EA",
                 "\u30FC\u30BB\u30FC\u30D0",
                 "\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-loose", 30,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 30,
                 "\u30D0\u30C3\u30C6",
                 "\u30EA\u30FC\u30BB",
                 "\u30FC\u30D0\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-loose", 20,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 20,
                 "\u30D0\u30C3",
                 "\u30C6\u30EA",
                 "\u30FC\u30BB",
                 "\u30FC\u30D0",
                 "\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-loose", 10,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 10,
                 "\u30D0",
                 "\u30C3",
                 "\u30C6",
@@ -118,36 +137,98 @@
     }
 
     @Test
+    public void testBreakVariant_loose_text2() {
+        LineBreakConfig config = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_LOOSE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 120, SAMPLE_TEXT2);
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 110,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B\u306A\u308B",
+                "\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 100,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B\u306A\u308B",
+                "\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 90,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B\u306A",
+                "\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 80,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B",
+                "\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 70,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17",
+                "\u306B\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 60,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082",
+                "\u6C17\u306B\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 50,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E",
+                "\u3082\u6C17\u306B\u306A\u308B",
+                "\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 40,
+                "\u65B0\u3057\u3044\u6A5F",
+                "\u7A2E\u3082\u6C17\u306B",
+                "\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 30,
+                "\u65B0\u3057\u3044",
+                "\u6A5F\u7A2E\u3082",
+                "\u6C17\u306B\u306A",
+                "\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 20,
+                "\u65B0\u3057",
+                "\u3044\u6A5F",
+                "\u7A2E\u3082",
+                "\u6C17\u306B",
+                "\u306A\u308B",
+                "\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 10,
+                "\u65B0",
+                "\u3057",
+                "\u3044",
+                "\u6A5F",
+                "\u7A2E",
+                "\u3082",
+                "\u6C17",
+                "\u306B",
+                "\u306A",
+                "\u308B",
+                "\u3057",
+                "\u3002");
+    }
+
+    @Test
     public void testBreakVariant_strict() {
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-strict", 90, SAMPLE_TEXT);
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-strict", 80,
+        LineBreakConfig config = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_STRICT)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 90, SAMPLE_TEXT);
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 80,
                 "\u30D0\u30C3\u30C6\u30EA\u30FC\u30BB\u30FC",
                 "\u30D0\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-strict", 70,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 70,
                 "\u30D0\u30C3\u30C6\u30EA\u30FC\u30BB\u30FC",
                 "\u30D0\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-strict", 60,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 60,
                 "\u30D0\u30C3\u30C6\u30EA\u30FC",
                 "\u30BB\u30FC\u30D0\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-strict", 50,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 50,
                 "\u30D0\u30C3\u30C6\u30EA\u30FC",
                 "\u30BB\u30FC\u30D0\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-strict", 40,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 40,
                 "\u30D0\u30C3\u30C6",
                 "\u30EA\u30FC\u30BB\u30FC",
                 "\u30D0\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-strict", 30,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 30,
                 "\u30D0\u30C3\u30C6",
                 "\u30EA\u30FC",
                 "\u30BB\u30FC",
                 "\u30D0\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-strict", 20,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 20,
                 "\u30D0\u30C3",
                 "\u30C6",
                 "\u30EA\u30FC",
                 "\u30BB\u30FC",
                 "\u30D0\u30FC");
-        assertLineBreak(SAMPLE_TEXT, "ja-JP-u-lb-strict", 10,
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 10,
                 "\u30D0",
                 "\u30C3",
                 "\u30C6",
@@ -158,4 +239,170 @@
                 "\u30D0",
                 "\u30FC");
     }
+
+    @Test
+    public void testBreakVariant_strict_text2() {
+        LineBreakConfig config = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_STRICT)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 120, SAMPLE_TEXT2);
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 110,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B\u306A\u308B",
+                "\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 100,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B\u306A\u308B",
+                "\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 90,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B\u306A",
+                "\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 80,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B",
+                "\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 70,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17",
+                "\u306B\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 60,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082",
+                "\u6C17\u306B\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 50,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E",
+                "\u3082\u6C17\u306B\u306A\u308B",
+                "\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 40,
+                "\u65B0\u3057\u3044\u6A5F",
+                "\u7A2E\u3082\u6C17\u306B",
+                "\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 30,
+                "\u65B0\u3057\u3044",
+                "\u6A5F\u7A2E\u3082",
+                "\u6C17\u306B\u306A",
+                "\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 20,
+                "\u65B0\u3057",
+                "\u3044\u6A5F",
+                "\u7A2E\u3082",
+                "\u6C17\u306B",
+                "\u306A\u308B",
+                "\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 10,
+                "\u65B0",
+                "\u3057",
+                "\u3044",
+                "\u6A5F",
+                "\u7A2E",
+                "\u3082",
+                "\u6C17",
+                "\u306B",
+                "\u306A",
+                "\u308B",
+                "\u3057",
+                "\u3002");
+    }
+
+
+    @Test
+    public void testBreakVariant_phrase() {
+        LineBreakConfig config = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_NONE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE).build();
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 90, SAMPLE_TEXT);
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 80,
+                "\u30D0\u30C3\u30C6\u30EA\u30FC\u30BB\u30FC\u30D0",
+                "\u30FC");
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 70,
+                "\u30D0\u30C3\u30C6\u30EA\u30FC\u30BB\u30FC",
+                "\u30D0\u30FC");
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 60,
+                "\u30D0\u30C3\u30C6\u30EA\u30FC\u30BB",
+                "\u30FC\u30D0\u30FC");
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 50,
+                "\u30D0\u30C3\u30C6\u30EA\u30FC",
+                "\u30BB\u30FC\u30D0\u30FC");
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 40,
+                "\u30D0\u30C3\u30C6\u30EA",
+                "\u30FC\u30BB\u30FC\u30D0",
+                "\u30FC");
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 30,
+                "\u30D0\u30C3\u30C6",
+                "\u30EA\u30FC\u30BB",
+                "\u30FC\u30D0\u30FC");
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 20,
+                "\u30D0\u30C3",
+                "\u30C6\u30EA",
+                "\u30FC\u30BB",
+                "\u30FC\u30D0",
+                "\u30FC");
+        assertLineBreak(SAMPLE_TEXT, "ja-JP", config, 10,
+                "\u30D0",
+                "\u30C3",
+                "\u30C6",
+                "\u30EA",
+                "\u30FC",
+                "\u30BB",
+                "\u30FC",
+                "\u30D0",
+                "\u30FC");
+    }
+
+    @Test
+    public void testBreakVariant_phrase_text2() {
+        LineBreakConfig config = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_LOOSE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE).build();
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 120, SAMPLE_TEXT2);
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 110,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B",
+                "\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 100,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B",
+                "\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 90,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B",
+                "\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 80,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082\u6C17\u306B",
+                "\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 70,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082",
+                "\u6C17\u306B\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 60,
+                "\u65B0\u3057\u3044\u6A5F\u7A2E\u3082",
+                "\u6C17\u306B\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 50,
+                "\u65B0\u3057\u3044",
+                "\u6A5F\u7A2E\u3082\u6C17\u306B",
+                "\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 40,
+                "\u65B0\u3057\u3044",
+                "\u6A5F\u7A2E\u3082",
+                "\u6C17\u306B",
+                "\u306A\u308B\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 30,
+                "\u65B0\u3057\u3044",
+                "\u6A5F\u7A2E\u3082",
+                "\u6C17\u306B",
+                "\u306A\u308B\u3057",
+                "\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 20,
+                "\u65B0\u3057",
+                "\u3044",
+                "\u6A5F\u7A2E",
+                "\u3082",
+                "\u6C17\u306B",
+                "\u306A\u308B",
+                "\u3057\u3002");
+        assertLineBreak(SAMPLE_TEXT2, "ja-JP", config, 10,
+                "\u65B0",
+                "\u3057",
+                "\u3044",
+                "\u6A5F",
+                "\u7A2E",
+                "\u3082",
+                "\u6C17",
+                "\u306B",
+                "\u306A",
+                "\u308B",
+                "\u3057",
+                "\u3002");
+    }
 }
diff --git a/tests/tests/text/src/android/text/cts/StaticLayoutTest.java b/tests/tests/text/src/android/text/cts/StaticLayoutTest.java
index 456ca78..3ce16a6 100644
--- a/tests/tests/text/src/android/text/cts/StaticLayoutTest.java
+++ b/tests/tests/text/src/android/text/cts/StaticLayoutTest.java
@@ -32,6 +32,7 @@
 import android.graphics.Paint;
 import android.graphics.Paint.FontMetricsInt;
 import android.graphics.Typeface;
+import android.graphics.text.LineBreakConfig;
 import android.os.LocaleList;
 import android.platform.test.annotations.AsbSecurityTest;
 import android.text.Editable;
@@ -238,6 +239,38 @@
             StaticLayout layout = builder.build();
             assertNotNull(layout);
         }
+        {
+            // setLineBreakConfig
+            LineBreakConfig lineBreakConfig = new LineBreakConfig.Builder()
+                    .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_STYLE_STRICT)
+                    .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+
+            StaticLayout.Builder builder = StaticLayout.Builder.obtain(LAYOUT_TEXT, 0,
+                    LAYOUT_TEXT.length(), mDefaultPaint, DEFAULT_OUTER_WIDTH);
+            builder.setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY);
+            builder.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
+            builder.setIncludePad(true);
+            builder.setIndents(null, null);
+            builder.setLineBreakConfig(lineBreakConfig);
+            StaticLayout layout = builder.build();
+            assertNotNull(layout);
+        }
+        {
+            // setLineBreakConfig with word style(lw=phrase)
+            LineBreakConfig lineBreakConfig = new LineBreakConfig.Builder()
+                    .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_STYLE_NONE)
+                    .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE).build();
+
+            StaticLayout.Builder builder = StaticLayout.Builder.obtain(LAYOUT_TEXT, 0,
+                    LAYOUT_TEXT.length(), mDefaultPaint, DEFAULT_OUTER_WIDTH);
+            builder.setBreakStrategy(Layout.BREAK_STRATEGY_HIGH_QUALITY);
+            builder.setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_FULL);
+            builder.setIncludePad(true);
+            builder.setIndents(null, null);
+            builder.setLineBreakConfig(lineBreakConfig);
+            StaticLayout layout = builder.build();
+            assertNotNull(layout);
+        }
     }
 
     @Test
diff --git a/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java b/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java
index 1618bba..a810899 100644
--- a/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/ArrowKeyMovementMethodTest.java
@@ -96,7 +96,7 @@
                     WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
 
             activity.setContentView(mTextView);
-            mTextView.setFocusable(true);
+            mTextView.setFocusableInTouchMode(true);
             mTextView.requestFocus();
         });
         PollingCheck.waitFor(() -> mTextView.isFocused() && (mTextView.getLayout() != null));
@@ -916,7 +916,7 @@
     @Test
     public void testOnTouchEventWithNullLayout() {
         initTextViewWithNullLayout();
-        mTextView.setFocusable(true);
+        mTextView.setFocusableInTouchMode(true);
         mTextView.requestFocus();
         assertTrue(mTextView.isFocused());
 
diff --git a/tests/tests/text/src/android/text/method/cts/BaseMovementMethodTest.java b/tests/tests/text/src/android/text/method/cts/BaseMovementMethodTest.java
index f98ffcc..bc03371 100644
--- a/tests/tests/text/src/android/text/method/cts/BaseMovementMethodTest.java
+++ b/tests/tests/text/src/android/text/method/cts/BaseMovementMethodTest.java
@@ -194,6 +194,7 @@
         mActivityRule.runOnUiThread(() -> {
             activity.setContentView(layout, new ViewGroup.LayoutParams(MATCH_PARENT,
                     MATCH_PARENT));
+            textView.setFocusableInTouchMode(true);
             textView.requestFocus();
         });
         mInstrumentation.waitForIdleSync();
diff --git a/tests/tests/text/src/android/text/style/cts/StyleSpanTest.java b/tests/tests/text/src/android/text/style/cts/StyleSpanTest.java
index 723fa27..df4a6d9 100644
--- a/tests/tests/text/src/android/text/style/cts/StyleSpanTest.java
+++ b/tests/tests/text/src/android/text/style/cts/StyleSpanTest.java
@@ -19,7 +19,9 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import android.content.res.Configuration;
 import android.graphics.Typeface;
+import android.graphics.fonts.FontStyle;
 import android.os.Parcel;
 import android.text.TextPaint;
 import android.text.style.StyleSpan;
@@ -43,6 +45,8 @@
             p.setDataPosition(0);
             StyleSpan fromParcel = new StyleSpan(p);
             assertEquals(2, fromParcel.getStyle());
+            assertEquals(Configuration.FONT_WEIGHT_ADJUSTMENT_UNDEFINED,
+                    fromParcel.getFontWeightAdjustment());
             new StyleSpan(-2);
         } finally {
             p.recycle();
@@ -59,7 +63,14 @@
     }
 
     @Test
-    public void testUpdateMeasureState() {
+    public void testGetFontWeightAdjustment() {
+        StyleSpan styleSpan = new StyleSpan(2, 300);
+        assertEquals(300, styleSpan.getFontWeightAdjustment());
+    }
+
+
+    @Test
+    public void testUpdateMeasureState_withStyle() {
         StyleSpan styleSpan = new StyleSpan(Typeface.BOLD);
 
         TextPaint tp = new TextPaint();
@@ -75,6 +86,24 @@
         assertEquals(Typeface.BOLD, tp.getTypeface().getStyle());
     }
 
+    @Test
+    public void testUpdateMeasureState_withFontWeightAdjustment() {
+        StyleSpan styleSpan = new StyleSpan(Typeface.BOLD, 300);
+
+        TextPaint tp = new TextPaint();
+        Typeface tf = Typeface.defaultFromStyle(Typeface.NORMAL);
+        tp.setTypeface(tf);
+
+        assertNotNull(tp.getTypeface());
+        assertEquals(Typeface.NORMAL, tp.getTypeface().getStyle());
+
+        styleSpan.updateMeasureState(tp);
+
+        assertNotNull(tp.getTypeface());
+        assertEquals(Typeface.BOLD, tp.getTypeface().getStyle());
+        assertEquals(tp.getTypeface().getWeight(), FontStyle.FONT_WEIGHT_MAX);
+    }
+
     @Test(expected=NullPointerException.class)
     public void testUpdateMeasureStateNull() {
         StyleSpan styleSpan = new StyleSpan(Typeface.BOLD);
@@ -83,7 +112,7 @@
     }
 
     @Test
-    public void testUpdateDrawState() {
+    public void testUpdateDrawState_withStyle() {
         StyleSpan styleSpan = new StyleSpan(Typeface.BOLD);
 
         TextPaint tp = new TextPaint();
@@ -99,6 +128,25 @@
         assertEquals(Typeface.BOLD, tp.getTypeface().getStyle());
     }
 
+    @Test
+    public void testUpdateDrawState_withFontWeightAdjustment() {
+        StyleSpan styleSpan = new StyleSpan(Typeface.BOLD, 300);
+
+        TextPaint tp = new TextPaint();
+        Typeface tf = Typeface.defaultFromStyle(Typeface.NORMAL);
+        tp.setTypeface(tf);
+
+        assertNotNull(tp.getTypeface());
+        assertEquals(Typeface.NORMAL, tp.getTypeface().getStyle());
+
+        styleSpan.updateDrawState(tp);
+
+        assertNotNull(tp.getTypeface());
+        assertEquals(Typeface.BOLD, tp.getTypeface().getStyle());
+        assertEquals(tp.getTypeface().getWeight(), FontStyle.FONT_WEIGHT_MAX);
+    }
+
+
     @Test(expected=NullPointerException.class)
     public void testUpdateDrawStateNull() {
         StyleSpan styleSpan = new StyleSpan(Typeface.BOLD);
diff --git a/tests/tests/text/src/android/text/style/cts/SuggestionRangeSpanTest.java b/tests/tests/text/src/android/text/style/cts/SuggestionRangeSpanTest.java
new file mode 100644
index 0000000..a83e50f
--- /dev/null
+++ b/tests/tests/text/src/android/text/style/cts/SuggestionRangeSpanTest.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2021 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 android.text.style.cts;
+
+import static org.junit.Assert.assertEquals;
+
+import android.os.Parcel;
+import android.text.TextPaint;
+import android.text.style.SuggestionRangeSpan;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test {@link SuggestionRangeSpan}.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class SuggestionRangeSpanTest {
+    @Test
+    public void testConstructor() {
+        final SuggestionRangeSpan span = new SuggestionRangeSpan();
+        assertEquals(0, span.getBackgroundColor());
+    }
+
+    @Test
+    public void testSerializationDeserialization() {
+        final SuggestionRangeSpan original = new SuggestionRangeSpan();
+        original.setBackgroundColor(1);
+        Parcel parcel = null;
+        final SuggestionRangeSpan clone;
+        try {
+            parcel = Parcel.obtain();
+            original.writeToParcel(parcel, 0);
+            parcel.setDataPosition(0);
+            clone = SuggestionRangeSpan.CREATOR.createFromParcel(parcel);
+        } finally {
+            if (parcel != null) {
+                parcel.recycle();
+            }
+        }
+        assertEquals(original.getBackgroundColor(), clone.getBackgroundColor());
+    }
+
+    @Test
+    public void testSetAndGetBackgroundColor() {
+        final SuggestionRangeSpan span = new SuggestionRangeSpan();
+        assertEquals(0, span.getBackgroundColor());
+
+        span.setBackgroundColor(1);
+        assertEquals(1, span.getBackgroundColor());
+    }
+
+    @Test
+    public void testUpdateDrawState() {
+        final SuggestionRangeSpan span = new SuggestionRangeSpan();
+        span.setBackgroundColor(1);
+        TextPaint tp = new TextPaint();
+        span.updateDrawState(tp);
+        assertEquals(1, tp.bgColor);
+    }
+}
+
diff --git a/tests/tests/textclassifier/OWNERS b/tests/tests/textclassifier/OWNERS
index 3da8126..3e84e0b 100644
--- a/tests/tests/textclassifier/OWNERS
+++ b/tests/tests/textclassifier/OWNERS
@@ -1,3 +1,2 @@
 # Bug component: 709498
-
 include platform/frameworks/base:/core/java/android/view/textclassifier/OWNERS
diff --git a/tests/tests/textclassifier/src/android/view/textclassifier/cts/CtsTextClassifierService.java b/tests/tests/textclassifier/src/android/view/textclassifier/cts/CtsTextClassifierService.java
index b88b7d7..6127f10 100644
--- a/tests/tests/textclassifier/src/android/view/textclassifier/cts/CtsTextClassifierService.java
+++ b/tests/tests/textclassifier/src/android/view/textclassifier/cts/CtsTextClassifierService.java
@@ -52,6 +52,8 @@
     private static final String TAG = "CtsTextClassifierService";
     public static final String MY_PACKAGE = "android.view.textclassifier.cts";
 
+    public static final int DEFAULT_API_WAIT_TIMEOUT = 1_000;
+
     private static final Icon ICON_RES =
             Icon.createWithResource("android", android.R.drawable.btn_star);
     static final Icon ICON_URI =
@@ -64,7 +66,7 @@
 
     private final Map<String, List<TextClassificationSessionId>> mRequestSessions =
             new ArrayMap<>();
-    private final CountDownLatch mRequestLatch = new CountDownLatch(1);
+    private CountDownLatch mRequestLatch = new CountDownLatch(1);
 
     /**
      * Returns the TestWatcher that was used for the testing.
@@ -82,6 +84,14 @@
         return Collections.unmodifiableMap(mRequestSessions);
     }
 
+    void resetRequestLatch(int count) {
+        mRequestLatch = new CountDownLatch(count);
+    }
+
+    void awaitQuery() {
+        awaitQuery(DEFAULT_API_WAIT_TIMEOUT);
+    }
+
     void awaitQuery(long timeoutMillis) {
         try {
             mRequestLatch.await(timeoutMillis, TimeUnit.MILLISECONDS);
diff --git a/tests/tests/textclassifier/src/android/view/textclassifier/cts/SelectionEventTest.java b/tests/tests/textclassifier/src/android/view/textclassifier/cts/SelectionEventTest.java
index 72550c4..d86ffb1 100644
--- a/tests/tests/textclassifier/src/android/view/textclassifier/cts/SelectionEventTest.java
+++ b/tests/tests/textclassifier/src/android/view/textclassifier/cts/SelectionEventTest.java
@@ -16,6 +16,11 @@
 
 package android.view.textclassifier.cts;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import android.view.textclassifier.SelectionEvent;
+import android.view.textclassifier.TextClassifier;
+
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
@@ -27,7 +32,23 @@
 public class SelectionEventTest {
 
     @Test
-    public void testSelectionEvent_placeholder() {
-        // TODO: add tests for SelectionEvent
+    public void testSelectionEvent() {
+        SelectionEvent event = SelectionEvent.createSelectionActionEvent(0, 1,
+                SelectionEvent.ACTION_COPY);
+        assertThat(event.getEventType()).isEqualTo(SelectionEvent.ACTION_COPY);
+        assertThat(event.getStart()).isEqualTo(0);
+        assertThat(event.getEnd()).isEqualTo(0);
+        assertThat(event.getInvocationMethod()).isEqualTo(SelectionEvent.INVOCATION_UNKNOWN);
+        assertThat(event.getEntityType()).isEqualTo(TextClassifier.TYPE_UNKNOWN);
+        assertThat(event.getEventIndex()).isEqualTo(0);
+        assertThat(event.getPackageName()).isEqualTo("");
+        assertThat(event.getSmartStart()).isEqualTo(0);
+        assertThat(event.getSmartEnd()).isEqualTo(0);
+        assertThat(event.getWidgetType()).isEqualTo(TextClassifier.WIDGET_TYPE_UNKNOWN);
+        assertThat(event.getWidgetVersion()).isNull();
+        assertThat(event.getResultId()).isEqualTo("");
+        assertThat(event.getEventTime()).isEqualTo(0);
+        assertThat(event.getDurationSinceSessionStart()).isEqualTo(0);
+        assertThat(event.getDurationSincePreviousEvent()).isEqualTo(0);
     }
 }
diff --git a/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextClassificationTest.java b/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextClassificationTest.java
index 5f18026..bafac32 100644
--- a/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextClassificationTest.java
+++ b/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextClassificationTest.java
@@ -42,6 +42,10 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class TextClassificationTest {
@@ -174,14 +178,18 @@
 
     @Test
     public void testTextClassificationRequest() {
+        final ZonedDateTime referenceTime = ZonedDateTime.ofInstant(Instant.ofEpochMilli(1000L),
+                ZoneId.of("UTC"));
         final TextClassification.Request request =
                 new TextClassification.Request.Builder(TEXT, START, END)
                         .setDefaultLocales(LOCALES)
+                        .setReferenceTime(referenceTime)
                         .setExtras(BUNDLE)
                         .build();
 
         assertEquals(LOCALES, request.getDefaultLocales());
         assertEquals(BUNDLE_VALUE, request.getExtras().getString(BUNDLE_KEY));
+        assertEquals(referenceTime, request.getReferenceTime());
     }
 
     @Test
diff --git a/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextClassifierServiceSwapTest.java b/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextClassifierServiceSwapTest.java
index a95460b..a732832 100644
--- a/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextClassifierServiceSwapTest.java
+++ b/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextClassifierServiceSwapTest.java
@@ -21,19 +21,21 @@
 
 import static org.junit.Assume.assumeTrue;
 
-import android.app.Instrumentation;
 import android.app.PendingIntent;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.drawable.Icon;
+import android.os.CancellationSignal;
 import android.os.SystemClock;
+import android.service.textclassifier.TextClassifierService;
+import android.view.textclassifier.ConversationActions;
+import android.view.textclassifier.SelectionEvent;
 import android.view.textclassifier.TextClassification;
 import android.view.textclassifier.TextClassificationContext;
 import android.view.textclassifier.TextClassificationManager;
 import android.view.textclassifier.TextClassificationSessionId;
 import android.view.textclassifier.TextClassifier;
-import android.view.textclassifier.TextLanguage;
 import android.view.textclassifier.TextSelection;
 
 import androidx.core.os.BuildCompat;
@@ -50,7 +52,9 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 /**
  * Tests for TextClassifierService query related functions.
@@ -94,14 +98,14 @@
         final CtsTextClassifierService service = mTestWatcher.getService();
 
         // Wait a delay for the query is delivered.
-        service.awaitQuery(1_000);
+        service.awaitQuery();
 
         // Verify the request was not passed to the service.
         assertThat(service.getRequestSessions()).isEmpty();
     }
 
     @Test
-    public void multipleActiveSessions() throws Exception {
+    public void testMultipleActiveSessions() throws Exception {
         final TextClassification.Request request =
                 new TextClassification.Request.Builder("Hello World", 0, 1).build();
         final TextClassificationManager tcm =
@@ -113,14 +117,72 @@
                 tcm.createTextClassificationSession(mTextClassificationContext);
 
         firstSession.classifyText(request);
-        secondSessionSession.classifyText(request);
         final CtsTextClassifierService service = mTestWatcher.getService();
-        service.awaitQuery(1_000);
+        service.awaitQuery();
+
+        service.resetRequestLatch(1);
+        secondSessionSession.classifyText(request);
+        service.awaitQuery();
 
         final List<TextClassificationSessionId> sessionIds =
                 service.getRequestSessions().get("onClassifyText");
         assertThat(sessionIds).hasSize(2);
         assertThat(sessionIds.get(0).getValue()).isNotEqualTo(sessionIds.get(1).getValue());
+
+        service.resetRequestLatch(2);
+        firstSession.destroy();
+        secondSessionSession.destroy();
+        service.awaitQuery();
+
+        final List<TextClassificationSessionId> destroyedSessionIds =
+                service.getRequestSessions().get("onDestroyTextClassificationSession");
+        assertThat(destroyedSessionIds).hasSize(2);
+        firstSession.isDestroyed();
+        secondSessionSession.isDestroyed();
+    }
+
+    private void serviceOnSuggestConversationActions(CtsTextClassifierService service)
+            throws Exception {
+        ConversationActions.Request conversationActionRequest =
+                new ConversationActions.Request.Builder(Collections.emptyList()).build();
+        // TODO: add @TestApi for TextClassificationSessionId and use it
+        SelectionEvent event =
+                SelectionEvent.createSelectionStartedEvent(
+                        SelectionEvent.INVOCATION_LINK, 1);
+        final CountDownLatch onSuccessLatch = new CountDownLatch(1);
+        service.onSuggestConversationActions(event.getSessionId(),
+                conversationActionRequest, new CancellationSignal(),
+                new TextClassifierService.Callback<ConversationActions>() {
+                    @Override
+                    public void onFailure(CharSequence charSequence) {
+                        // do nothing
+                    }
+
+                    @Override
+                    public void onSuccess(ConversationActions o) {
+                        onSuccessLatch.countDown();
+                    }
+                });
+        onSuccessLatch.await();
+        final List<TextClassificationSessionId> sessionIds =
+                service.getRequestSessions().get("onSuggestConversationActions");
+        assertThat(sessionIds).hasSize(1);
+    }
+
+    @Test
+    public void testTextClassifierServiceApiCoverage() throws Exception {
+        // Implemented for API test coverage only
+        // Any method that is better tested not be called here.
+        // We already have tests for the TC APIs
+        // We however need to directly query the TextClassifierService methods in the tests for
+        // code coverage.
+        CtsTextClassifierService service = new CtsTextClassifierService();
+
+        service.onConnected();
+
+        serviceOnSuggestConversationActions(service);
+
+        service.onDisconnected();
     }
 
     @Test
diff --git a/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextLinksTest.java b/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextLinksTest.java
index 1414ed7..3592c96 100644
--- a/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextLinksTest.java
+++ b/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextLinksTest.java
@@ -231,6 +231,7 @@
         assertNull(request.getDefaultLocales());
         assertTrue(request.getExtras().isEmpty());
         assertNull(request.getEntityConfig());
+        assertNull(request.getCallingPackageName());
     }
 
     @Test
@@ -253,6 +254,7 @@
                 TextClassifier.HINT_TEXT_IS_EDITABLE,
                 request.getEntityConfig().getHints().iterator().next());
         assertEquals(referenceTime, request.getReferenceTime());
+        assertNull(request.getCallingPackageName());
     }
 
 }
diff --git a/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextViewIntegrationTest.java b/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextViewIntegrationTest.java
index 4e71d2a..b96293f 100644
--- a/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextViewIntegrationTest.java
+++ b/tests/tests/textclassifier/src/android/view/textclassifier/cts/TextViewIntegrationTest.java
@@ -22,26 +22,20 @@
 
 import static androidx.test.espresso.Espresso.onView;
 import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.RootMatchers.isPlatformPopup;
-import static androidx.test.espresso.matcher.ViewMatchers.hasDescendant;
 import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withTagValue;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.hamcrest.CoreMatchers.allOf;
-import static org.hamcrest.CoreMatchers.is;
 
 import android.app.PendingIntent;
 import android.app.RemoteAction;
 import android.content.ContentResolver;
 import android.content.Intent;
-import android.content.pm.PackageManager;
 import android.graphics.drawable.Icon;
 import android.net.Uri;
-import android.os.RemoteException;
 import android.provider.Settings;
 import android.text.Spannable;
 import android.text.SpannableString;
@@ -57,9 +51,9 @@
 import androidx.core.os.BuildCompat;
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.core.app.ApplicationProvider;
-import androidx.test.espresso.ViewInteraction;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.uiautomator.By;
 import androidx.test.uiautomator.UiDevice;
 
 import com.android.compatibility.common.util.ShellUtils;
@@ -73,13 +67,12 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import java.io.IOException;
 import java.util.Collections;
 import java.util.concurrent.atomic.AtomicInteger;
 
 public class TextViewIntegrationTest {
-    private final static String LOG_TAG = "TextViewIntegrationTest";
-    private final static String TOOLBAR_TAG = "floating_toolbar";
+    private static final String LOG_TAG = "TextViewIntegrationTest";
+    private static final String TOOLBAR_ITEM_LABEL = "TB@#%!";
 
     private SimpleTextClassifier mSimpleTextClassifier;
 
@@ -90,6 +83,9 @@
     private static float sOriginalAnimationDurationScale;
     private static float sOriginalTransitionAnimationDurationScale;
 
+    private static final UiDevice sDevice =
+            UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+
     @Before
     public void setup() throws Exception {
         Assume.assumeTrue(
@@ -97,7 +93,7 @@
                         .hasSystemFeature(FEATURE_TOUCHSCREEN));
         workAroundNotificationShadeWindowIssue();
         mSimpleTextClassifier = new SimpleTextClassifier();
-        UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()).wakeUp();
+        sDevice.wakeUp();
         dismissKeyguard();
         closeSystemDialog();
     }
@@ -177,7 +173,6 @@
         onView(withId(R.id.textview)).perform(TextViewActions.tapOnTextAtIndex(clickIndex.get()));
 
         assertFloatingToolbarIsDisplayed();
-        assertFloatingToolbarContainsItem("Test");
     }
 
     @Test
@@ -228,7 +223,6 @@
                 TextViewActions.longTapOnTextAtIndex(clickIndex.get()));
 
         assertFloatingToolbarIsDisplayed();
-        assertFloatingToolbarContainsItem("Test");
     }
 
     private Spannable createLinkifiedText(CharSequence text) {
@@ -248,16 +242,9 @@
         return linkifiedText;
     }
 
-    private static ViewInteraction onFloatingToolBar() {
-        return onView(withTagValue(is(TOOLBAR_TAG))).inRoot(isPlatformPopup());
-    }
-
     private static void assertFloatingToolbarIsDisplayed() {
-        onFloatingToolBar().check(matches(isDisplayed()));
-    }
-
-    private static void assertFloatingToolbarContainsItem(String itemLabel) {
-        onFloatingToolBar().check(matches(hasDescendant(withText(itemLabel))));
+        // Simply check that the toolbar item is visible.
+        assertThat(sDevice.hasObject(By.text(TOOLBAR_ITEM_LABEL))).isTrue();
     }
 
     /**
@@ -320,7 +307,7 @@
                     PendingIntent.FLAG_IMMUTABLE);
 
             RemoteAction remoteAction =
-                    new RemoteAction(NO_ICON, "Test", "content description", pendingIntent);
+                    new RemoteAction(NO_ICON, TOOLBAR_ITEM_LABEL, "cont-descr", pendingIntent);
             remoteAction.setShouldShowIcon(false);
             builder.addAction(remoteAction);
             return builder.build();
diff --git a/tests/tests/time/TEST_MAPPING b/tests/tests/time/TEST_MAPPING
new file mode 100644
index 0000000..9b183e2
--- /dev/null
+++ b/tests/tests/time/TEST_MAPPING
@@ -0,0 +1,12 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsTimeTestCases",
+      "options": [
+        {
+          "exclude-annotation": "androidx.test.filters.FlakyTest"
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/tests/time/shell_utils/common/android/app/time/cts/shell/DeviceConfigKeys.java b/tests/tests/time/shell_utils/common/android/app/time/cts/shell/DeviceConfigKeys.java
index 67c0289..d2f8996 100644
--- a/tests/tests/time/shell_utils/common/android/app/time/cts/shell/DeviceConfigKeys.java
+++ b/tests/tests/time/shell_utils/common/android/app/time/cts/shell/DeviceConfigKeys.java
@@ -33,53 +33,15 @@
      * Keys and values associated with the location_time_zone_manager.
      * See also {@link LocationTimeZoneManagerShellHelper}.
      */
-    final class LocationTimeZoneManager {
+    public final class LocationTimeZoneManager {
 
         private LocationTimeZoneManager() {
             // No need to instantiate.
         }
 
-        /**
-         * The key for the server flag that can override the device config for whether the primary
-         * location time zone provider is enabled, disabled, or (for testing) in simulation mode.
-         */
-        static final String KEY_PRIMARY_LOCATION_TIME_ZONE_PROVIDER_MODE_OVERRIDE =
-                "primary_location_time_zone_provider_mode_override";
-
-        /**
-         * The key for the server flag that can override the device config for whether the secondary
-         * location time zone provider is enabled or disabled, or (for testing) in simulation mode.
-         */
-        static final String KEY_SECONDARY_LOCATION_TIME_ZONE_PROVIDER_MODE_OVERRIDE =
-                "secondary_location_time_zone_provider_mode_override";
-
-        /**
-         * The "simulated" provider mode.
-         * For use with {@link #KEY_PRIMARY_LOCATION_TIME_ZONE_PROVIDER_MODE_OVERRIDE} and {@link
-         * #KEY_SECONDARY_LOCATION_TIME_ZONE_PROVIDER_MODE_OVERRIDE}.
-         */
-        static final String PROVIDER_MODE_SIMULATED = "simulated";
-
-        /**
-         * The "disabled" provider mode (equivalent to there being no provider configured).
-         * For use with {@link #KEY_PRIMARY_LOCATION_TIME_ZONE_PROVIDER_MODE_OVERRIDE} and {@link
-         * #KEY_SECONDARY_LOCATION_TIME_ZONE_PROVIDER_MODE_OVERRIDE}.
-         */
-        static final String PROVIDER_MODE_DISABLED = "disabled";
-
-        /**
-         * The key for the server flag that can override the device config for the package name of
-         * the primary provider (when enabled).
-         */
-        static final String KEY_PRIMARY_LOCATION_TIME_ZONE_PROVIDER_PACKAGE_NAME_OVERRIDE =
-                "primary_location_time_zone_provider_package_name_override";
-
-        /**
-         * The key for the server flag that can override the device config for the package name of
-         * the secondary provider (when enabled).
-         */
-        static final String KEY_SECONDARY_LOCATION_TIME_ZONE_PROVIDER_PACKAGE_NAME_OVERRIDE =
-                "secondary_location_time_zone_provider_package_name_override";
+        /** The key for the setting that controls rate limiting of provider events. */
+        public static final String KEY_LTZP_EVENT_FILTERING_AGE_THRESHOLD_MILLIS =
+                "ltzp_event_filtering_age_threshold_millis";
     }
 
     /**
diff --git a/tests/tests/time/shell_utils/common/android/app/time/cts/shell/DeviceConfigShellHelper.java b/tests/tests/time/shell_utils/common/android/app/time/cts/shell/DeviceConfigShellHelper.java
index 550daf8..b128a69 100644
--- a/tests/tests/time/shell_utils/common/android/app/time/cts/shell/DeviceConfigShellHelper.java
+++ b/tests/tests/time/shell_utils/common/android/app/time/cts/shell/DeviceConfigShellHelper.java
@@ -38,17 +38,20 @@
 public class DeviceConfigShellHelper {
 
     /**
-     * Value used with {@link #setSyncModeForTest}, {@link #setSyncDisabled(String)}.
+     * Value used with {@link #setSyncModeForTest}, {@link #getSyncDisabled()},
+     * {@link #setSyncDisabled(String)}.
      */
     public static final String SYNC_DISABLED_MODE_NONE = "none";
 
     /**
-     * Value used with {@link #setSyncModeForTest}, {@link #setSyncDisabled(String)}.
+     * Value used with {@link #setSyncModeForTest}, {@link #getSyncDisabled()},
+     * {@link #setSyncDisabled(String)}.
      */
     public static final String SYNC_DISABLED_MODE_UNTIL_REBOOT = "until_reboot";
 
     /**
-     * Value used with {@link #setSyncModeForTest}, {@link #setSyncDisabled(String)}.
+     * Value used with {@link #setSyncModeForTest}, {@link #getSyncDisabled()},
+     * {@link #setSyncDisabled(String)}.
      */
     public static final String SYNC_DISABLED_MODE_PERSISTENT = "persistent";
 
@@ -64,11 +67,13 @@
     }
 
     /**
-     * Executes "is_sync_disabled_for_tests". Returns {@code true} or {@code false}.
+     * Executes "get_sync_disabled_for_tests". Returns the output, expected to be one of
+     * {@link #SYNC_DISABLED_MODE_PERSISTENT}, {@link #SYNC_DISABLED_MODE_UNTIL_REBOOT} or
+     * {@link #SYNC_DISABLED_MODE_NONE}.
      */
-    public boolean isSyncDisabled() throws Exception {
-        String cmd = SHELL_CMD_PREFIX + "is_sync_disabled_for_tests";
-        return mShellCommandExecutor.executeToBoolean(cmd);
+    public String getSyncDisabled() throws Exception {
+        String cmd = SHELL_CMD_PREFIX + "get_sync_disabled_for_tests";
+        return mShellCommandExecutor.executeToTrimmedString(cmd);
     }
 
     /**
@@ -135,7 +140,7 @@
             NamespaceEntries namespaceValues = list(namespacetoSave);
             savedValues.add(namespaceValues);
         }
-        PreTestState preTestState = new PreTestState(isSyncDisabled(), savedValues);
+        PreTestState preTestState = new PreTestState(getSyncDisabled(), savedValues);
         setSyncDisabled(syncMode);
         return preTestState;
     }
@@ -155,8 +160,7 @@
                     subMap(oldEntries.keyValues, difference.entriesDiffering().keySet());
             putAll(oldEntries.namespace, entriesToUpdate);
         }
-        setSyncDisabled(restoreState.mIsSyncDisabled
-                ? SYNC_DISABLED_MODE_UNTIL_REBOOT : SYNC_DISABLED_MODE_NONE);
+        setSyncDisabled(restoreState.mSyncDisabledMode);
     }
 
     private static <X, Y> Map<X, Y> subMap(Map<X, Y> keyValues, Set<X> keySet) {
@@ -177,11 +181,11 @@
 
     /** Opaque saved state information. */
     public static class PreTestState {
-        private final boolean mIsSyncDisabled;
+        private final String mSyncDisabledMode;
         private final List<NamespaceEntries> mSavedValues = new ArrayList<>();
 
-        private PreTestState(boolean isSyncDisabled, List<NamespaceEntries> values) {
-            mIsSyncDisabled = isSyncDisabled;
+        private PreTestState(String syncDisabledMode, List<NamespaceEntries> values) {
+            mSyncDisabledMode = syncDisabledMode;
             mSavedValues.addAll(values);
         }
     }
diff --git a/tests/tests/time/shell_utils/common/android/app/time/cts/shell/DeviceShellCommandExecutor.java b/tests/tests/time/shell_utils/common/android/app/time/cts/shell/DeviceShellCommandExecutor.java
index c999181..dc17c63 100644
--- a/tests/tests/time/shell_utils/common/android/app/time/cts/shell/DeviceShellCommandExecutor.java
+++ b/tests/tests/time/shell_utils/common/android/app/time/cts/shell/DeviceShellCommandExecutor.java
@@ -86,6 +86,6 @@
      * Converts command line bytes to a String.
      */
     protected static String parseBytesAsString(byte[] result) {
-        return new String(result, 0, result.length, StandardCharsets.ISO_8859_1);
+        return new String(result, 0, result.length, StandardCharsets.UTF_8);
     }
 }
diff --git a/tests/tests/time/shell_utils/common/android/app/time/cts/shell/FakeTimeZoneProviderAppShellHelper.java b/tests/tests/time/shell_utils/common/android/app/time/cts/shell/FakeTimeZoneProviderAppShellHelper.java
new file mode 100644
index 0000000..2c99860
--- /dev/null
+++ b/tests/tests/time/shell_utils/common/android/app/time/cts/shell/FakeTimeZoneProviderAppShellHelper.java
@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) 2021 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 android.app.time.cts.shell;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * A class for interacting with the fake {@link android.service.timezone.TimeZoneProviderService} in
+ * the fake TimeZoneProviderService app.
+ */
+public final class FakeTimeZoneProviderAppShellHelper {
+
+    /** The name of the app's APK. */
+    public static final String FAKE_TZPS_APP_APK = "CtsFakeTimeZoneProvidersApp.apk";
+
+    /** The package name of the app. */
+    public static final String FAKE_TZPS_APP_PACKAGE = "com.android.time.cts.fake_tzps_app";
+
+    /** The ID of the primary location time zone provider. */
+    public static final String FAKE_PRIMARY_LOCATION_TIME_ZONE_PROVIDER_ID =
+            "FakeLocationTimeZoneProviderService1";
+
+    /** The ID of the secondary location time zone provider. */
+    public static final String FAKE_SECONDARY_LOCATION_TIME_ZONE_PROVIDER_ID =
+                    "FakeLocationTimeZoneProviderService2";
+
+    // The following constant values correspond to enum values from
+    // frameworks/base/core/proto/android/app/location_time_zone_manager.proto
+    public static final int PROVIDER_STATE_UNKNOWN = 0;
+    public static final int PROVIDER_STATE_INITIALIZING = 1;
+    public static final int PROVIDER_STATE_CERTAIN = 2;
+    public static final int PROVIDER_STATE_UNCERTAIN = 3;
+    public static final int PROVIDER_STATE_DISABLED = 4;
+    public static final int PROVIDER_STATE_PERM_FAILED = 5;
+    public static final int PROVIDER_STATE_DESTROYED = 6;
+
+    private static final String METHOD_GET_STATE = "get_state";
+    private static final String CALL_RESULT_KEY_GET_STATE_STATE = "state";
+    private static final String METHOD_REPORT_PERMANENT_FAILURE = "perm_fail";
+    private static final String METHOD_REPORT_UNCERTAIN = "uncertain";
+    private static final String METHOD_REPORT_SUCCESS = "success";
+    private static final String METHOD_PING = "ping";
+
+    /** A single string, comma separated, may be empty. */
+    private static final String CALL_EXTRA_KEY_SUCCESS_SUGGESTION_ZONE_IDS = "zone_ids";
+
+    private static final String SHELL_COMMAND_PREFIX = "content ";
+    private static final String AUTHORITY = "faketzpsapp ";
+
+    private final DeviceShellCommandExecutor mShellCommandExecutor;
+
+    public FakeTimeZoneProviderAppShellHelper(DeviceShellCommandExecutor shellCommandExecutor) {
+        mShellCommandExecutor = Objects.requireNonNull(shellCommandExecutor);
+    }
+
+    /**
+     * Throws an exception if the app is not installed / available within a reasonable time.
+     */
+    public void waitForInstallation() throws Exception {
+        long timeoutMs = 10000;
+        long delayUntilMillis = System.currentTimeMillis() + timeoutMs;
+        while (System.currentTimeMillis() <= delayUntilMillis) {
+            try {
+                ping();
+                return;
+            } catch (AssertionError e) {
+                // Not present yet.
+            }
+            Thread.sleep(100);
+        }
+        fail("Installation did not happen in time");
+    }
+
+    public FakeTimeZoneProviderShellHelper getPrimaryLocationProviderHelper() {
+        return getProviderHelper(FAKE_PRIMARY_LOCATION_TIME_ZONE_PROVIDER_ID);
+    }
+
+    public FakeTimeZoneProviderShellHelper getSecondaryLocationProviderHelper() {
+        return getProviderHelper(FAKE_SECONDARY_LOCATION_TIME_ZONE_PROVIDER_ID);
+    }
+
+    private FakeTimeZoneProviderShellHelper getProviderHelper(String providerId) {
+        return new FakeTimeZoneProviderShellHelper(providerId);
+    }
+
+    /**
+     * A helper for interacting with a specific {@link
+     * android.service.timezone.TimeZoneProviderService}.
+     */
+    public final class FakeTimeZoneProviderShellHelper {
+
+        private final String mProviderId;
+
+        private FakeTimeZoneProviderShellHelper(String providerId) {
+            mProviderId = Objects.requireNonNull(providerId);
+        }
+
+        public void reportUncertain() throws Exception {
+            executeContentProviderCall(mProviderId, METHOD_REPORT_UNCERTAIN, null);
+        }
+
+        public void reportPermanentFailure() throws Exception {
+            executeContentProviderCall(mProviderId, METHOD_REPORT_PERMANENT_FAILURE, null);
+        }
+
+        public void reportSuccess(String zoneId) throws Exception {
+            reportSuccess(Collections.singletonList(zoneId));
+        }
+
+        public void reportSuccess(List<String> zoneIds) throws Exception {
+            String zoneIdsExtra = String.join(",", zoneIds);
+            Map<String, String> extras = new HashMap<>();
+            extras.put(CALL_EXTRA_KEY_SUCCESS_SUGGESTION_ZONE_IDS, zoneIdsExtra);
+
+            executeContentProviderCall(mProviderId, METHOD_REPORT_SUCCESS, extras);
+        }
+
+        public int getState() throws Exception {
+            String stateResult = executeContentProviderCall(mProviderId, METHOD_GET_STATE, null);
+            Pattern pattern = Pattern.compile(".*" + CALL_RESULT_KEY_GET_STATE_STATE + "=(.).*");
+            Matcher matcher = pattern.matcher(stateResult);
+            if (!matcher.matches()) {
+                throw new RuntimeException("Unknown result format: " + stateResult);
+            }
+            return Integer.parseInt(matcher.group(1));
+        }
+
+        public void assertCurrentState(int expectedState) throws Exception {
+            assertEquals(expectedState, getState());
+        }
+
+        public boolean exists() throws Exception {
+            try {
+                getState();
+                return true;
+            } catch (AssertionError e) {
+                return false;
+            }
+        }
+
+        public void assertCreated() throws Exception {
+            assertTrue(exists());
+        }
+
+        public void assertNotCreated() throws Exception {
+            assertFalse(exists());
+        }
+    }
+
+    private void ping() throws Exception {
+        String cmd = String.format("call --uri content://%s --method %s", AUTHORITY, METHOD_PING);
+        mShellCommandExecutor.executeToTrimmedString(SHELL_COMMAND_PREFIX + cmd);
+    }
+
+    private String executeContentProviderCall(
+            String providerId, String method, Map<String, String> extras) throws Exception {
+        String cmd = String.format("call --uri content://%s --method %s --arg %s",
+                AUTHORITY, method, providerId);
+        if (extras != null) {
+            for (Map.Entry<String, String> entry : extras.entrySet()) {
+                cmd += String.format(" --extra %s:s:%s", entry.getKey(), entry.getValue());
+            }
+        }
+        return mShellCommandExecutor.executeToTrimmedString(SHELL_COMMAND_PREFIX + cmd);
+    }
+}
diff --git a/tests/tests/time/shell_utils/common/android/app/time/cts/shell/LocationTimeZoneManagerShellHelper.java b/tests/tests/time/shell_utils/common/android/app/time/cts/shell/LocationTimeZoneManagerShellHelper.java
index 416443c..2417808 100644
--- a/tests/tests/time/shell_utils/common/android/app/time/cts/shell/LocationTimeZoneManagerShellHelper.java
+++ b/tests/tests/time/shell_utils/common/android/app/time/cts/shell/LocationTimeZoneManagerShellHelper.java
@@ -15,10 +15,6 @@
  */
 package android.app.time.cts.shell;
 
-import static android.app.time.cts.shell.DeviceConfigKeys.LocationTimeZoneManager.KEY_PRIMARY_LOCATION_TIME_ZONE_PROVIDER_MODE_OVERRIDE;
-import static android.app.time.cts.shell.DeviceConfigKeys.LocationTimeZoneManager.KEY_SECONDARY_LOCATION_TIME_ZONE_PROVIDER_MODE_OVERRIDE;
-import static android.app.time.cts.shell.DeviceConfigKeys.NAMESPACE_SYSTEM_TIME;
-
 import static org.junit.Assume.assumeTrue;
 
 import java.io.BufferedReader;
@@ -30,47 +26,6 @@
  * command-line interface.
  */
 public class LocationTimeZoneManagerShellHelper {
-    /**
-     * The index of the primary location time zone provider, used for shell commands.
-     */
-    public static final int PRIMARY_PROVIDER_INDEX = 0;
-
-    /**
-     * The index of the secondary location time zone provider, used for shell commands.
-     */
-    public static final int SECONDARY_PROVIDER_INDEX = 1;
-
-    /**
-     * The "disabled" provider mode (equivalent to there being no provider configured).
-     */
-    public static final String PROVIDER_MODE_DISABLED =
-            DeviceConfigKeys.LocationTimeZoneManager.PROVIDER_MODE_DISABLED;
-
-    /**
-     * The "simulated" provider mode.
-     */
-    public static final String PROVIDER_MODE_SIMULATED =
-            DeviceConfigKeys.LocationTimeZoneManager.PROVIDER_MODE_SIMULATED;
-
-    /**
-     * Simulated provider test command that simulates the bind succeeding.
-     */
-    public static final String SIMULATED_PROVIDER_TEST_COMMAND_ON_BIND = "on_bind";
-
-    /**
-     * Simulated provider test command that simulates the provider reporting uncertainty.
-     */
-    public static final String SIMULATED_PROVIDER_TEST_COMMAND_UNCERTAIN = "uncertain";
-
-    /**
-     * Simulated provider test command that simulates a successful time zone detection.
-     */
-    public static final String SIMULATED_PROVIDER_TEST_COMMAND_SUCCESS = "success";
-
-    /**
-     * Argument for {@link #SIMULATED_PROVIDER_TEST_COMMAND_SUCCESS} to specify TZDB time zone IDs.
-     */
-    public static final String SIMULATED_PROVIDER_TEST_COMMAND_SUCCESS_ARG_KEY_TZ = "tz";
 
     /**
      * The name of the service for shell commands.
@@ -88,10 +43,10 @@
     private static final String SHELL_COMMAND_STOP = "stop";
 
     /**
-     * A shell command that tells the service to record state information during tests. The next
-     * argument value is "true" or "false".
+     * A shell command that clears recorded provider state information during tests.
      */
-    private static final String SHELL_COMMAND_RECORD_PROVIDER_STATES = "record_provider_states";
+    private static final String SHELL_COMMAND_CLEAR_RECORDED_PROVIDER_STATES =
+            "clear_recorded_provider_states";
 
     /**
      * A shell command that tells the service to dump its current state.
@@ -103,20 +58,22 @@
      */
     private static final String DUMP_STATE_OPTION_PROTO = "proto";
 
+    /** A shell command that starts the location_time_zone_manager with named test providers. */
+    public static final String SHELL_COMMAND_START_WITH_TEST_PROVIDERS =
+            "start_with_test_providers";
+
     /**
-     * A shell command that sends test commands to a provider
+     * The token that can be passed to {@link #SHELL_COMMAND_START_WITH_TEST_PROVIDERS} to indicate
+     * there is no provider.
      */
-    private static final String SHELL_COMMAND_SEND_PROVIDER_TEST_COMMAND =
-            "send_provider_test_command";
+    public static final String NULL_PACKAGE_NAME_TOKEN = "@null";
 
     private static final String SHELL_CMD_PREFIX = "cmd " + SERVICE_NAME + " ";
 
     private final DeviceShellCommandExecutor mShellCommandExecutor;
-    private final DeviceConfigShellHelper mDeviceConfigShellHelper;
 
     public LocationTimeZoneManagerShellHelper(DeviceShellCommandExecutor shellCommandExecutor) {
         mShellCommandExecutor = Objects.requireNonNull(shellCommandExecutor);
-        mDeviceConfigShellHelper = new DeviceConfigShellHelper(shellCommandExecutor);
     }
 
     /**
@@ -156,66 +113,38 @@
         mShellCommandExecutor.executeToTrimmedString(SHELL_CMD_PREFIX + SHELL_COMMAND_STOP);
     }
 
-    /** Executes "record_provider_states". */
-    public void recordProviderStates(boolean enabled) throws Exception {
-        String cmd = String.format("%s %s", SHELL_COMMAND_RECORD_PROVIDER_STATES, enabled);
+    /** Executes "clear_recorded_provider_states". */
+    public void clearRecordedProviderStates() throws Exception {
+        String cmd = SHELL_COMMAND_CLEAR_RECORDED_PROVIDER_STATES;
         mShellCommandExecutor.executeToTrimmedString(SHELL_CMD_PREFIX + cmd);
     }
 
-    /** Executes "dump_state". */
+    /**
+     * Executes "dump_state". Raw proto bytes are returned as host protos tend to use "full" proto,
+     * device protos use "lite".
+     **/
     public byte[] dumpState() throws Exception {
         String cmd = String.format("%s --%s", SHELL_COMMAND_DUMP_STATE, DUMP_STATE_OPTION_PROTO);
         return mShellCommandExecutor.executeToBytes(SHELL_CMD_PREFIX + cmd);
     }
 
-    /** Modifies a provider's mode using "device_config" commands. */
-    public void setProviderModeOverride(int providerIndex, String mode) throws Exception {
-        String deviceConfigKey;
-        if (providerIndex == PRIMARY_PROVIDER_INDEX) {
-            deviceConfigKey = KEY_PRIMARY_LOCATION_TIME_ZONE_PROVIDER_MODE_OVERRIDE;
-        } else {
-            deviceConfigKey = KEY_SECONDARY_LOCATION_TIME_ZONE_PROVIDER_MODE_OVERRIDE;
-        }
-
-        if (mode == null) {
-            mDeviceConfigShellHelper.delete(NAMESPACE_SYSTEM_TIME, deviceConfigKey);
-        } else {
-            mDeviceConfigShellHelper.put(NAMESPACE_SYSTEM_TIME, deviceConfigKey, mode);
-        }
-    }
-
-    /**
-     * Simulates a provider successfully binding using the "send_provider_test_command" command.
-     */
-    public void simulateProviderBind(int providerIndex) throws Exception {
-        sendProviderTestCommand(providerIndex, SIMULATED_PROVIDER_TEST_COMMAND_ON_BIND);
-    }
-
-    /**
-     * Simulates a provider generating an uncertain report using the "send_provider_test_command"
-     * command.
-     */
-    public void simulateProviderUncertain(int providerIndex) throws Exception {
-        sendProviderTestCommand(providerIndex, SIMULATED_PROVIDER_TEST_COMMAND_UNCERTAIN);
-    }
-
-    /**
-     * Simulates a provider generating a suggestion using the "send_provider_test_command" command.
-     */
-    public void simulateProviderSuggestion(int providerIndex, String... zoneIds)
+    /** Executes "start_with_test_providers". */
+    public void startWithTestProviders(String testPrimaryLocationTimeZoneProviderPackageName,
+            String testSecondaryLocationTimeZoneProviderPackageName, boolean recordProviderStates)
             throws Exception {
-        String timeZoneIds = String.join("&", zoneIds);
-        String testCommand = String.format("%s %s=string_array:%s",
-                SIMULATED_PROVIDER_TEST_COMMAND_SUCCESS,
-                SIMULATED_PROVIDER_TEST_COMMAND_SUCCESS_ARG_KEY_TZ,
-                timeZoneIds);
-        sendProviderTestCommand(providerIndex, testCommand);
+        testPrimaryLocationTimeZoneProviderPackageName =
+                replaceNullPackageNameWithToken(testPrimaryLocationTimeZoneProviderPackageName);
+        testSecondaryLocationTimeZoneProviderPackageName =
+                replaceNullPackageNameWithToken(testSecondaryLocationTimeZoneProviderPackageName);
+        String cmd = String.format("%s %s %s %s",
+                SHELL_COMMAND_START_WITH_TEST_PROVIDERS,
+                testPrimaryLocationTimeZoneProviderPackageName,
+                testSecondaryLocationTimeZoneProviderPackageName,
+                recordProviderStates);
+        mShellCommandExecutor.executeToBytes(SHELL_CMD_PREFIX + cmd);
     }
 
-    /** Executes "send_provider_test_command". */
-    private void sendProviderTestCommand(int providerIndex, String testCommand) throws Exception {
-        String cmd = String.format("%s %s %s",
-                SHELL_COMMAND_SEND_PROVIDER_TEST_COMMAND, providerIndex, testCommand);
-        mShellCommandExecutor.executeToTrimmedString(SHELL_CMD_PREFIX + cmd);
+    private static String replaceNullPackageNameWithToken(String packageName) {
+        return packageName == null ? NULL_PACKAGE_NAME_TOKEN : packageName;
     }
 }
diff --git a/tests/tests/time/shell_utils/device/android/app/time/cts/shell/device/InstrumentationShellCommandExecutor.java b/tests/tests/time/shell_utils/device/android/app/time/cts/shell/device/InstrumentationShellCommandExecutor.java
index 5d7d7ac..2ae437f 100644
--- a/tests/tests/time/shell_utils/device/android/app/time/cts/shell/device/InstrumentationShellCommandExecutor.java
+++ b/tests/tests/time/shell_utils/device/android/app/time/cts/shell/device/InstrumentationShellCommandExecutor.java
@@ -48,7 +48,7 @@
         byte[] stdOut = readBytesAndClose(parcelFileDescriptors[0]);
         byte[] stdErr = readBytesAndClose(parcelFileDescriptors[2]);
         if (stdErr.length > 0) {
-            fail("Command \'" + command + "\'produced stderr: "
+            fail("Command \'" + command + "\' produced stderr: "
                     + parseBytesAsString(stdErr).trim());
         }
         return stdOut;
diff --git a/tests/tests/time/shell_utils/host/android/app/time/cts/shell/host/HostShellCommandExecutor.java b/tests/tests/time/shell_utils/host/android/app/time/cts/shell/host/HostShellCommandExecutor.java
index 5356617..85b41aa 100644
--- a/tests/tests/time/shell_utils/host/android/app/time/cts/shell/host/HostShellCommandExecutor.java
+++ b/tests/tests/time/shell_utils/host/android/app/time/cts/shell/host/HostShellCommandExecutor.java
@@ -15,17 +15,24 @@
  */
 package android.app.time.cts.shell.host;
 
+import static org.junit.Assert.fail;
+
 import android.app.time.cts.shell.DeviceShellCommandExecutor;
 
 import androidx.annotation.NonNull;
 
-import com.android.tradefed.device.CollectingByteOutputReceiver;
 import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.util.CommandResult;
 
+import java.io.ByteArrayOutputStream;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 public final class HostShellCommandExecutor extends DeviceShellCommandExecutor {
 
+    private static final long MAX_TIMEOUT_FOR_COMMAND_MILLIS = 2 * 60 * 1000;
+    private static final int RETRY_ATTEMPTS = 1;
+
     private final ITestDevice mDevice;
 
     public HostShellCommandExecutor(@NonNull ITestDevice device) {
@@ -35,9 +42,17 @@
     @Override
     @NonNull
     protected byte[] executeToBytesInternal(String command) throws Exception {
-        CollectingByteOutputReceiver bytesReceiver = new CollectingByteOutputReceiver();
-        mDevice.executeShellCommand(command, bytesReceiver);
-        return bytesReceiver.getOutput();
+        ByteArrayOutputStream stdOutBytesReceiver = new ByteArrayOutputStream();
+        ByteArrayOutputStream stdErrBytesReceiver = new ByteArrayOutputStream();
+        CommandResult result = mDevice.executeShellV2Command(
+                command, /*pipeAsInput=*/null, stdOutBytesReceiver, stdErrBytesReceiver,
+                MAX_TIMEOUT_FOR_COMMAND_MILLIS, TimeUnit.MILLISECONDS, RETRY_ATTEMPTS);
+        if (result.getExitCode() != 0 || stdErrBytesReceiver.size() > 0) {
+            fail("Command \'" + command + "\' produced exitCode=" + result.getExitCode()
+                    + " and stderr="
+                    + parseBytesAsString(stdErrBytesReceiver.toByteArray()).trim());
+        }
+        return stdOutBytesReceiver.toByteArray();
     }
 
     @Override
diff --git a/tests/tests/toast/AndroidTest.xml b/tests/tests/toast/AndroidTest.xml
index 4195e03..0a26b42 100644
--- a/tests/tests/toast/AndroidTest.xml
+++ b/tests/tests/toast/AndroidTest.xml
@@ -16,6 +16,7 @@
 <configuration description="Config for Toast test cases">
     <option name="test-suite-tag" value="cts" />
     <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="all_foldable_states" />
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
diff --git a/tests/tests/toastlegacy/AndroidTest.xml b/tests/tests/toastlegacy/AndroidTest.xml
index 95d5a02..2d6c4c6 100644
--- a/tests/tests/toastlegacy/AndroidTest.xml
+++ b/tests/tests/toastlegacy/AndroidTest.xml
@@ -16,6 +16,7 @@
 <configuration description="Config for Toast legacy test cases">
     <option name="test-suite-tag" value="cts" />
     <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="all_foldable_states" />
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
diff --git a/tests/tests/tv/Android.bp b/tests/tests/tv/Android.bp
index f9f2ee4..438393f 100644
--- a/tests/tests/tv/Android.bp
+++ b/tests/tests/tv/Android.bp
@@ -18,7 +18,7 @@
 
 android_library {
     name: "CtsTvTestCases_lib",
-    srcs: ["src/**/*.java"],
+    srcs: ["src/**/*.java", "src/**/*.aidl"],
     libs: [
         "platform-test-annotations",
         "android.test.runner",
diff --git a/tests/tests/tv/AndroidManifest.xml b/tests/tests/tv/AndroidManifest.xml
index 6f1b399..db42f35 100644
--- a/tests/tests/tv/AndroidManifest.xml
+++ b/tests/tests/tv/AndroidManifest.xml
@@ -46,6 +46,14 @@
             </intent-filter>
         </activity>
 
+        <service android:name="android.media.tv.tuner.cts.SharedFilterTestService"
+             android:process=":SharedFilterTestService"
+             android:exported="true"/>
+
+        <service android:name="android.media.tv.tuner.cts.TunerResourceTestService"
+             android:process=":TunerResourceTestService"
+             android:exported="true"/>
+
         <service android:name="android.media.tv.cts.StubTunerTvInputService"
              android:permission="android.permission.BIND_TV_INPUT"
              android:label="TV input stub"
@@ -128,6 +136,26 @@
                  android:resource="@xml/stub_tv_input_service"/>
         </service>
 
+        <service android:name="android.media.tv.interactive.cts.StubTvInputService2"
+             android:permission="android.permission.BIND_TV_INPUT"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.media.tv.TvInputService"/>
+            </intent-filter>
+            <meta-data android:name="android.media.tv.input"
+                 android:resource="@xml/stub_tv_input_service"/>
+        </service>
+
+        <service android:name="android.media.tv.interactive.cts.StubTvInteractiveAppService"
+             android:permission="android.permission.BIND_TV_INTERACTIVE_APP"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.media.tv.interactive.TvInteractiveAppService"/>
+            </intent-filter>
+            <meta-data android:name="android.media.tv.interactive.app"
+                 android:resource="@xml/stub_tv_iapp_service"/>
+        </service>
+
         <activity android:name="android.media.tv.cts.TvViewStubActivity"
              android:exported="true">
             <intent-filter>
@@ -142,6 +170,14 @@
                 <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
             </intent-filter>
         </activity>
+
+        <activity android:name="android.media.tv.interactive.cts.TvInteractiveAppViewStubActivity"
+             android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
     </application>
 
     <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
diff --git a/tests/tests/tv/AndroidTest.xml b/tests/tests/tv/AndroidTest.xml
index 7370234..aa3017e 100644
--- a/tests/tests/tv/AndroidTest.xml
+++ b/tests/tests/tv/AndroidTest.xml
@@ -20,6 +20,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsTvTestCases.apk" />
diff --git a/tests/tests/tv/res/layout/tviappview_layout.xml b/tests/tests/tv/res/layout/tviappview_layout.xml
new file mode 100644
index 0000000..9cd3912
--- /dev/null
+++ b/tests/tests/tv/res/layout/tviappview_layout.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.media.tv.interactive.TvInteractiveAppView
+        android:id="@+id/tviappview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <android.media.tv.TvView
+        android:id="@+id/tviapp_tvview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+</LinearLayout>
diff --git a/tests/tests/tv/res/values/arrays.xml b/tests/tests/tv/res/values/arrays.xml
new file mode 100644
index 0000000..3794d0b
--- /dev/null
+++ b/tests/tests/tv/res/values/arrays.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string-array name="sub_iapp_service_types">
+        <item>ginga</item>
+        <item>hbbtv</item>
+    </string-array>
+</resources>
diff --git a/tests/tests/tv/res/xml/stub_tv_iapp_service.xml b/tests/tests/tv/res/xml/stub_tv_iapp_service.xml
new file mode 100644
index 0000000..5537dfa
--- /dev/null
+++ b/tests/tests/tv/res/xml/stub_tv_iapp_service.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<tv-interactive-app xmlns:android="http://schemas.android.com/apk/res/android"
+    android:supportedTypes="@array/sub_iapp_service_types"
+    android:canPauseRecording="true" />
diff --git a/tests/tests/tv/src/android/media/tv/cts/StubTvInputService.java b/tests/tests/tv/src/android/media/tv/cts/StubTvInputService.java
index b70dc62..14ac567 100644
--- a/tests/tests/tv/src/android/media/tv/cts/StubTvInputService.java
+++ b/tests/tests/tv/src/android/media/tv/cts/StubTvInputService.java
@@ -30,8 +30,8 @@
         return new StubSessionImpl(this);
     }
 
-    private static class StubSessionImpl extends Session {
-        StubSessionImpl(Context context) {
+    public static class StubSessionImpl extends Session {
+        public StubSessionImpl(Context context) {
             super(context);
         }
 
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java b/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
index 22b4b1b..e814362 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvInputManagerTest.java
@@ -17,6 +17,8 @@
 package android.media.tv.cts;
 
 import android.app.Activity;
+import android.app.ActivityManager;
+import android.app.ActivityManager.RunningAppProcessInfo;
 import android.app.Instrumentation;
 import android.content.ComponentName;
 import android.content.Context;
@@ -36,14 +38,18 @@
 import android.media.tv.TvInputManager;
 import android.media.tv.TvInputManager.Hardware;
 import android.media.tv.TvInputManager.HardwareCallback;
+import android.media.tv.TvInputManager.Session;
+import android.media.tv.TvInputManager.SessionCallback;
 import android.media.tv.TvInputService;
 import android.media.tv.TvStreamConfig;
 import android.media.tv.TvView;
+import android.media.tv.tunerresourcemanager.TunerResourceManager;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
+import android.os.Looper;
 import android.test.ActivityInstrumentationTestCase2;
 import android.tv.cts.R;
 
@@ -67,6 +73,7 @@
 public class TvInputManagerTest extends ActivityInstrumentationTestCase2<TvViewStubActivity> {
     /** The maximum time to wait for an operation. */
     private static final long TIME_OUT_MS = 15000L;
+    private static final int PRIORITY_HINT_USE_CASE_TYPE_INVALID = 1000;
 
     private static final int DUMMY_DEVICE_ID = Integer.MAX_VALUE;
     private static final String[] VALID_TV_INPUT_SERVICES = {
@@ -101,11 +108,14 @@
             "android.permission.TV_INPUT_HARDWARE";
     private static final String PERMISSION_TUNER_RESOURCE_ACCESS =
             "android.permission.TUNER_RESOURCE_ACCESS";
+    private static final String PERMISSION_TIS_EXTENSION_INTERFACE =
+            "android.permission.TIS_EXTENSION_INTERFACE";
     private static final String[] BASE_SHELL_PERMISSIONS = {
             PERMISSION_ACCESS_WATCHED_PROGRAMS,
             PERMISSION_WRITE_EPG_DATA,
             PERMISSION_ACCESS_TUNED_INFO,
-            PERMISSION_TUNER_RESOURCE_ACCESS
+            PERMISSION_TUNER_RESOURCE_ACCESS,
+            PERMISSION_TIS_EXTENSION_INTERFACE
     };
 
     private String mStubId;
@@ -581,7 +591,9 @@
                 deviceId, mStubTvInputInfo, null /*tvInputSessionId*/,
                 TvInputService.PRIORITY_HINT_USE_CASE_TYPE_PLAYBACK,
                 executor, callback);
-        assertNotNull(hardware);
+        if (hardware == null) {
+            return;
+        }
 
         // Override audio sink
         try {
@@ -661,6 +673,88 @@
         }
     }
 
+    public void testGetClientPriority() {
+        if (!Utils.hasTvInputFramework(getActivity()) || !Utils.hasTunerFeature(getActivity())) {
+            return;
+        }
+
+        // Use the test api to get priorities in tunerResourceManagerUseCaseConfig.xml
+        TunerResourceManager trm = (TunerResourceManager) getActivity()
+            .getSystemService(Context.TV_TUNER_RESOURCE_MGR_SERVICE);
+        int fgLivePriority = trm.getConfigPriority(TvInputService.PRIORITY_HINT_USE_CASE_TYPE_LIVE,
+                true);
+        int bgLivePriority = trm.getConfigPriority(TvInputService.PRIORITY_HINT_USE_CASE_TYPE_LIVE,
+                false);
+        int fgDefaultPriority = trm.getConfigPriority(PRIORITY_HINT_USE_CASE_TYPE_INVALID, true);
+        int bgDefaultPriority = trm.getConfigPriority(PRIORITY_HINT_USE_CASE_TYPE_INVALID, false);
+        boolean isForeground = checkIsForeground(android.os.Process.myPid());
+
+        int priority = mManager.getClientPriority(TvInputService.PRIORITY_HINT_USE_CASE_TYPE_LIVE);
+        assertTrue(priority == (isForeground ? fgLivePriority : bgLivePriority));
+
+        try {
+            priority = mManager.getClientPriority(
+                    PRIORITY_HINT_USE_CASE_TYPE_INVALID /* invalid use case type */);
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+
+        Handler handler = new Handler(Looper.getMainLooper());
+        final SessionCallback sessionCallback = new SessionCallback();
+        mManager.createSession(mStubId, sessionCallback, handler);
+        PollingCheck.waitFor(TIME_OUT_MS, () -> sessionCallback.getSession() != null);
+        Session session = sessionCallback.getSession();
+        String sessionId = StubTvInputService2.getSessionId();
+        assertNotNull(sessionId);
+
+        priority = mManager.getClientPriority(
+                TvInputService.PRIORITY_HINT_USE_CASE_TYPE_LIVE, sessionId /* valid sessionId */);
+        assertTrue(priority == (isForeground ? fgLivePriority : bgLivePriority));
+
+        try {
+            priority = mManager.getClientPriority(
+                    PRIORITY_HINT_USE_CASE_TYPE_INVALID /* invalid use case type */,
+                    sessionId /* valid sessionId */);
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+
+        session.release();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> StubTvInputService2.getSessionId() == null);
+
+        priority = mManager.getClientPriority(
+                TvInputService.PRIORITY_HINT_USE_CASE_TYPE_LIVE, sessionId /* invalid sessionId */);
+        assertTrue(priority == bgLivePriority);
+
+        try {
+            priority = mManager.getClientPriority(
+                    PRIORITY_HINT_USE_CASE_TYPE_INVALID /* invalid use case type */,
+                    sessionId /* invalid sessionId */);
+        } catch (IllegalArgumentException e) {
+            // pass
+        }
+    }
+
+    public void testGetClientPid() {
+        if (!Utils.hasTvInputFramework(getActivity())) {
+            return;
+        }
+
+        Handler handler = new Handler(Looper.getMainLooper());
+        final SessionCallback sessionCallback = new SessionCallback();
+        mManager.createSession(mStubId, sessionCallback, handler);
+        PollingCheck.waitFor(TIME_OUT_MS, () -> sessionCallback.getSession() != null);
+        Session session = sessionCallback.getSession();
+        String sessionId = StubTvInputService2.getSessionId();
+        assertNotNull(sessionId);
+
+        int pid = mManager.getClientPid(sessionId);
+        assertTrue(pid == android.os.Process.myPid());
+
+        session.release();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> StubTvInputService2.getSessionId() == null);
+    }
+
     private static class LoggingCallback extends TvInputManager.TvInputCallback {
         private final List<String> mAddedInputs = new ArrayList<>();
         private final List<String> mRemovedInputs = new ArrayList<>();
@@ -711,9 +805,27 @@
     }
 
     public static class StubTvInputService2 extends StubTvInputService {
+        static String sTvInputSessionId;
+
+        public static String getSessionId() {
+            return sTvInputSessionId;
+        }
+
         @Override
-        public Session onCreateSession(String inputId) {
-            return null;
+        public Session onCreateSession(String inputId, String tvInputSessionId) {
+            sTvInputSessionId = tvInputSessionId;
+            return new StubSessionImpl2(this);
+        }
+
+        public static class StubSessionImpl2 extends StubTvInputService.StubSessionImpl {
+            StubSessionImpl2(Context context) {
+                super(context);
+            }
+
+            @Override
+            public void onRelease() {
+                sTvInputSessionId = null;
+            }
         }
     }
 
@@ -767,16 +879,19 @@
 
         @Override
         public List<String> getAvailableExtensionInterfaceNames() {
+            super.getAvailableExtensionInterfaceNames();
             return new ArrayList<>(sAvailableExtensionInterfaceMap.keySet());
         }
 
         @Override
         public String getExtensionInterfacePermission(String name) {
+            super.getExtensionInterfacePermission(name);
             return sAvailableExtensionInterfaceMap.get(name);
         }
 
         @Override
         public IBinder getExtensionInterface(String name) {
+            super.getExtensionInterface(name);
             if (sAvailableExtensionInterfaceMap.containsKey(name)) {
                 return new Binder();
             } else {
@@ -791,4 +906,33 @@
             r.run();
         }
     }
+
+    private class SessionCallback extends TvInputManager.SessionCallback {
+        private TvInputManager.Session mSession;
+
+        public TvInputManager.Session getSession() {
+            return mSession;
+        }
+
+        @Override
+        public void onSessionCreated(TvInputManager.Session session) {
+            mSession = session;
+        }
+    }
+
+    private boolean checkIsForeground(int pid) {
+        ActivityManager am = (ActivityManager) getActivity()
+            .getSystemService(Context.ACTIVITY_SERVICE);
+        List<RunningAppProcessInfo> appProcesses = am.getRunningAppProcesses();
+        if (appProcesses == null) {
+            return false;
+        }
+        for (RunningAppProcessInfo appProcess : appProcesses) {
+            if (appProcess.pid == pid
+                    && appProcess.importance == RunningAppProcessInfo.IMPORTANCE_FOREGROUND) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java b/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java
index e643161..222c7bd 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvInputServiceTest.java
@@ -17,6 +17,7 @@
 package android.media.tv.cts;
 
 import static androidx.test.ext.truth.view.MotionEventSubject.assertThat;
+
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
@@ -26,6 +27,7 @@
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.media.PlaybackParams;
+import android.media.tv.AitInfo;
 import android.media.tv.TvContentRating;
 import android.media.tv.TvContract;
 import android.media.tv.TvInputInfo;
@@ -35,6 +37,7 @@
 import android.media.tv.TvView;
 import android.media.tv.cts.TvInputServiceTest.CountingTvInputService.CountingRecordingSession;
 import android.media.tv.cts.TvInputServiceTest.CountingTvInputService.CountingSession;
+import android.media.tv.interactive.TvInteractiveAppServiceInfo;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -119,6 +122,7 @@
         private int mContentAllowedCount;
         private int mContentBlockedCount;
         private int mTimeShiftStatusChangedCount;
+        private int mAitInfoUpdatedCount;
 
         private Uri mChannelRetunedUri;
         private Integer mVideoUnavailableReason;
@@ -127,6 +131,7 @@
         private List<TvTrackInfo> mTracksChangedTrackList;
         private TvContentRating mContentBlockedRating;
         private Integer mTimeShiftStatusChangedStatus;
+        private AitInfo mAitInfo;
 
         @Override
         public void onChannelRetuned(String inputId, Uri channelUri) {
@@ -180,6 +185,11 @@
             mTimeShiftStatusChangedStatus = status;
         }
 
+        public void onAitInfoUpdated(String inputId, AitInfo aitInfo) {
+            mAitInfoUpdatedCount++;
+            mAitInfo = aitInfo;
+        }
+
         public void resetCounts() {
             mChannelRetunedCount = 0;
             mVideoAvailableCount = 0;
@@ -189,6 +199,7 @@
             mContentAllowedCount = 0;
             mContentBlockedCount = 0;
             mTimeShiftStatusChangedCount = 0;
+            mAitInfoUpdatedCount = 0;
         }
 
         public void resetPassedValues() {
@@ -199,6 +210,7 @@
             mTracksChangedTrackList = null;
             mContentBlockedRating = null;
             mTimeShiftStatusChangedStatus = null;
+            mAitInfo = null;
         }
     }
 
@@ -434,6 +446,7 @@
     }
 
     @Test
+    @Ignore("b/216866512")
     public void verifyCallbackDisconnected() {
         resetCounts();
 
@@ -726,6 +739,21 @@
     }
 
     @Test
+    public void verifyCommandSetInteractiveAppNotificationEnabled() {
+        tune(CHANNEL_0);
+        final String action =
+                "android.media.tv.cts.TvInputServiceTest.setInteractiveAppNotificationEnabled";
+
+        onTvView(tvView -> tvView.setInteractiveAppNotificationEnabled(true));
+        mInstrumentation.waitForIdleSync();
+        final CountingSession session =
+                waitForSessionCheck(s -> s.mSetInteractiveAppNotificationEnabledCount > 0);
+
+        assertThat(session.mSetInteractiveAppNotificationEnabledCount).isEqualTo(1);
+        assertThat(session.mInteractiveAppNotificationEnabled).isEqualTo(true);
+    }
+
+    @Test
     public void verifyCallbackChannelRetuned() {
         final CountingSession session = tune(CHANNEL_0);
         resetPassedValues();
@@ -845,6 +873,22 @@
     }
 
     @Test
+    public void verifyCallbackAitInfoUpdated() {
+        final CountingSession session = tune(CHANNEL_0);
+        resetCounts();
+        resetPassedValues();
+
+        session.notifyAitInfoUpdated(
+                new AitInfo(TvInteractiveAppServiceInfo.INTERACTIVE_APP_TYPE_HBBTV, 2));
+        PollingCheck.waitFor(TIME_OUT, () -> mCallback.mAitInfoUpdatedCount > 0);
+
+        assertThat(mCallback.mAitInfoUpdatedCount).isEqualTo(1);
+        assertThat(mCallback.mAitInfo.getType())
+                .isEqualTo(TvInteractiveAppServiceInfo.INTERACTIVE_APP_TYPE_HBBTV);
+        assertThat(mCallback.mAitInfo.getVersion()).isEqualTo(2);
+    }
+
+    @Test
     public void verifyCallbackLayoutSurface() {
         final CountingSession session = tune(CHANNEL_0);
         final int left = 10;
@@ -1095,6 +1139,7 @@
             public volatile long mTimeShiftGetCurrentPositionCount;
             public volatile long mTimeShiftGetStartPositionCount;
             public volatile int mAppPrivateCommandCount;
+            public volatile int mSetInteractiveAppNotificationEnabledCount;
 
             public volatile String mAppPrivateCommandAction;
             public volatile Bundle mAppPrivateCommandData;
@@ -1121,6 +1166,7 @@
             public volatile Uri mRecordedProgramUri;
             public volatile Integer mOverlayViewSizeChangedWidth;
             public volatile Integer mOverlayViewSizeChangedHeight;
+            public volatile Boolean mInteractiveAppNotificationEnabled;
 
 
             CountingSession(Context context, @Nullable String sessionId) {
@@ -1153,6 +1199,7 @@
                 mTimeShiftGetCurrentPositionCount = 0;
                 mTimeShiftGetStartPositionCount = 0;
                 mAppPrivateCommandCount = 0;
+                mSetInteractiveAppNotificationEnabledCount = 0;
             }
 
             public void resetPassedValues() {
@@ -1181,6 +1228,7 @@
                 mRecordedProgramUri = null;
                 mOverlayViewSizeChangedWidth = null;
                 mOverlayViewSizeChangedHeight = null;
+                mInteractiveAppNotificationEnabled = null;
             }
 
             @Override
@@ -1340,6 +1388,12 @@
                 mOverlayViewSizeChangedWidth = width;
                 mOverlayViewSizeChangedHeight = height;
             }
+
+            @Override
+            public void onSetInteractiveAppNotificationEnabled(boolean enabled) {
+                mSetInteractiveAppNotificationEnabledCount++;
+                mInteractiveAppNotificationEnabled = enabled;
+            }
         }
 
         public static class CountingRecordingSession extends RecordingSession {
diff --git a/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java b/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java
index 13effcd..52b0921 100644
--- a/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java
+++ b/tests/tests/tv/src/android/media/tv/cts/TvViewTest.java
@@ -30,16 +30,18 @@
 import android.os.Bundle;
 import android.test.ActivityInstrumentationTestCase2;
 import android.test.UiThreadTest;
+import android.tv.cts.R;
 import android.util.ArrayMap;
 import android.util.SparseIntArray;
 import android.view.InputEvent;
 import android.view.KeyEvent;
-import android.tv.cts.R;
 
 import androidx.test.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.PollingCheck;
 
+import org.junit.Ignore;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -466,7 +468,8 @@
         }.run();
     }
 
-    public void testDisconnected() throws Throwable {
+    @Ignore("b/216866512")
+    public void ignoredTestDisconnected() throws Throwable {
         if (!Utils.hasTvInputFramework(getActivity())) {
             return;
         }
diff --git a/tests/tests/tv/src/android/media/tv/cts/Utils.java b/tests/tests/tv/src/android/media/tv/cts/Utils.java
index 01a93f6..ad70ac4 100644
--- a/tests/tests/tv/src/android/media/tv/cts/Utils.java
+++ b/tests/tests/tv/src/android/media/tv/cts/Utils.java
@@ -18,4 +18,7 @@
         return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LIVE_TV);
     }
 
+    public static boolean hasTunerFeature(Context context) {
+        return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TUNER);
+    }
 }
diff --git a/tests/tests/tv/src/android/media/tv/interactive/cts/StubTvInputService2.java b/tests/tests/tv/src/android/media/tv/interactive/cts/StubTvInputService2.java
new file mode 100644
index 0000000..867647a
--- /dev/null
+++ b/tests/tests/tv/src/android/media/tv/interactive/cts/StubTvInputService2.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright (C) 2021 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 android.media.tv.interactive.cts;
+
+import android.content.Context;
+import android.media.tv.AdRequest;
+import android.media.tv.AdResponse;
+import android.media.tv.AitInfo;
+import android.media.tv.BroadcastInfoRequest;
+import android.media.tv.BroadcastInfoResponse;
+import android.media.tv.TvInputService;
+import android.net.Uri;
+import android.view.Surface;
+
+public class StubTvInputService2 extends TvInputService {
+    static String sTvInputSessionId;
+    public static StubSessionImpl2 sStubSessionImpl2;
+
+    public static String getSessionId() {
+        return sTvInputSessionId;
+    }
+
+    @Override
+    public Session onCreateSession(String inputId, String tvInputSessionId) {
+        sTvInputSessionId = tvInputSessionId;
+        sStubSessionImpl2 = new StubSessionImpl2(this);
+        return sStubSessionImpl2;
+    }
+
+    @Override
+    public Session onCreateSession(String inputId) {
+        return new StubSessionImpl2(this);
+    }
+
+    public static class StubSessionImpl2 extends TvInputService.Session {
+        public int mAdRequestCount;
+        public int mBroadcastInfoRequestCount;
+
+        public AdRequest mAdRequest;
+        public BroadcastInfoRequest mBroadcastInfoRequest;
+
+        StubSessionImpl2(Context context) {
+            super(context);
+        }
+
+        public void resetValues() {
+            mAdRequestCount = 0;
+            mBroadcastInfoRequestCount = 0;
+
+            mAdRequest = null;
+            mBroadcastInfoRequest = null;
+        }
+
+        @Override
+        public void onRelease() {
+            sTvInputSessionId = null;
+        }
+
+        @Override
+        public boolean onSetSurface(Surface surface) {
+            return false;
+        }
+
+        @Override
+        public void onSetStreamVolume(float volume) {
+        }
+
+        @Override
+        public boolean onTune(Uri channelUri) {
+            return false;
+        }
+
+        @Override
+        public void onSetCaptionEnabled(boolean enabled) {
+        }
+
+        @Override
+        public void onRequestAd(AdRequest request) {
+            super.onRequestAd(request);
+            mAdRequestCount++;
+            mAdRequest = request;
+        }
+
+        @Override
+        public void onRequestBroadcastInfo(BroadcastInfoRequest request) {
+            super.onRequestBroadcastInfo(request);
+            mBroadcastInfoRequestCount++;
+            mBroadcastInfoRequest = request;
+        }
+
+        @Override
+        public void onRemoveBroadcastInfo(int info) {
+            super.onRemoveBroadcastInfo(info);
+        }
+
+        @Override
+        public void onSetInteractiveAppNotificationEnabled(boolean enable) {
+            super.onSetInteractiveAppNotificationEnabled(enable);
+        }
+
+        @Override
+        public void notifyAdResponse(AdResponse response) {
+            super.notifyAdResponse(response);
+        }
+
+        @Override
+        public void notifyAitInfoUpdated(AitInfo info) {
+            super.notifyAitInfoUpdated(info);
+        }
+
+        @Override
+        public void notifyBroadcastInfoResponse(BroadcastInfoResponse response) {
+            super.notifyBroadcastInfoResponse(response);
+        }
+
+        @Override
+        public void notifySignalStrength(int strength) {
+            super.notifySignalStrength(strength);
+        }
+
+        @Override
+        public void notifyTuned(Uri uri) {
+            super.notifyTuned(uri);
+        }
+    }
+}
diff --git a/tests/tests/tv/src/android/media/tv/interactive/cts/StubTvInteractiveAppService.java b/tests/tests/tv/src/android/media/tv/interactive/cts/StubTvInteractiveAppService.java
new file mode 100644
index 0000000..b4d3f63
--- /dev/null
+++ b/tests/tests/tv/src/android/media/tv/interactive/cts/StubTvInteractiveAppService.java
@@ -0,0 +1,416 @@
+/*
+ * Copyright (C) 2021 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 android.media.tv.interactive.cts;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.media.tv.AdRequest;
+import android.media.tv.AdResponse;
+import android.media.tv.BroadcastInfoRequest;
+import android.media.tv.BroadcastInfoResponse;
+import android.media.tv.TvContentRating;
+import android.media.tv.TvTrackInfo;
+import android.media.tv.interactive.AppLinkInfo;
+import android.media.tv.interactive.TvInteractiveAppManager;
+import android.media.tv.interactive.TvInteractiveAppService;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.KeyEvent;
+import android.view.MotionEvent;
+import android.view.Surface;
+import android.view.View;
+
+import java.util.List;
+
+/**
+ * Stub implementation of (@link android.media.tv.interactive.TvInteractiveAppService}.
+ */
+public class StubTvInteractiveAppService extends TvInteractiveAppService {
+
+    public static StubSessionImpl sSession;
+    public static int sType;
+    public static Bundle sAppLinkCommand = null;
+    public static AppLinkInfo sAppLinkInfo = null;
+
+    @Override
+    public Session onCreateSession(String iAppServiceId, int type) {
+        sSession = new StubSessionImpl(this);
+        return sSession;
+    }
+
+    @Override
+    public void onAppLinkCommand(Bundle command) {
+        super.onAppLinkCommand(command);
+        sAppLinkCommand = command;
+    }
+
+    @Override
+    public void onRegisterAppLinkInfo(AppLinkInfo bundle) {
+        super.onRegisterAppLinkInfo(bundle);
+        sAppLinkInfo = bundle;
+    }
+
+    @Override
+    public void onUnregisterAppLinkInfo(AppLinkInfo bundle) {
+        super.onUnregisterAppLinkInfo(bundle);
+        sAppLinkInfo = null;
+    }
+
+    public static class StubSessionImpl extends Session {
+        public int mSetSurfaceCount;
+        public int mSurfaceChangedCount;
+        public int mStartInteractiveAppCount;
+        public int mStopInteractiveAppCount;
+        public int mKeyDownCount;
+        public int mKeyUpCount;
+        public int mKeyMultipleCount;
+        public int mVideoAvailableCount;
+        public int mTunedCount;
+        public int mCreateBiIAppCount;
+        public int mDestroyBiIAppCount;
+        public int mAdResponseCount;
+        public int mBroadcastInfoResponseCount;
+        public int mSigningResultCount;
+        public int mErrorCount;
+
+        public Integer mKeyDownCode;
+        public Integer mKeyUpCode;
+        public Integer mKeyMultipleCode;
+        public KeyEvent mKeyDownEvent;
+        public KeyEvent mKeyUpEvent;
+        public KeyEvent mKeyMultipleEvent;
+        public Uri mTunedUri;
+        public Uri mCreateBiIAppUri;
+        public Bundle mCreateBiIAppParams;
+        public String mDestroyBiIAppId;
+        public AdResponse mAdResponse;
+        public BroadcastInfoResponse mBroadcastInfoResponse;
+
+        StubSessionImpl(Context context) {
+            super(context);
+        }
+
+        public void resetValues() {
+            mSetSurfaceCount = 0;
+            mSurfaceChangedCount = 0;
+            mStartInteractiveAppCount = 0;
+            mStopInteractiveAppCount = 0;
+            mKeyDownCount = 0;
+            mKeyUpCount = 0;
+            mKeyMultipleCount = 0;
+            mVideoAvailableCount = 0;
+            mTunedCount = 0;
+            mCreateBiIAppCount = 0;
+            mDestroyBiIAppCount = 0;
+            mAdResponseCount = 0;
+            mBroadcastInfoResponseCount = 0;
+            mSigningResultCount = 0;
+            mErrorCount = 0;
+
+            mKeyDownCode = null;
+            mKeyUpCode = null;
+            mKeyMultipleCode = null;
+            mKeyDownEvent = null;
+            mKeyUpEvent = null;
+            mKeyMultipleEvent = null;
+            mTunedUri = null;
+            mCreateBiIAppUri = null;
+            mCreateBiIAppParams = null;
+            mDestroyBiIAppId = null;
+            mAdResponse = null;
+            mBroadcastInfoResponse = null;
+        }
+
+        @Override
+        public void layoutSurface(int left, int top, int right, int bottom) {
+            super.layoutSurface(left, top, right, bottom);
+        }
+
+        @Override
+        public void notifySessionStateChanged(int state, int err) {
+            super.notifySessionStateChanged(state, err);
+        }
+
+        @Override
+        public void removeBroadcastInfo(int requestId) {
+            super.removeBroadcastInfo(requestId);
+        }
+
+        @Override
+        public void requestAd(AdRequest request) {
+            super.requestAd(request);
+        }
+
+        @Override
+        public void requestBroadcastInfo(BroadcastInfoRequest request) {
+            super.requestBroadcastInfo(request);
+        }
+
+        @Override
+        public void requestCurrentChannelLcn() {
+            super.requestCurrentChannelLcn();
+        }
+
+        @Override
+        public void requestCurrentChannelUri() {
+            super.requestCurrentChannelUri();
+        }
+
+        @Override
+        public void requestCurrentTvInputId() {
+            super.requestCurrentTvInputId();
+        }
+
+        @Override
+        public void requestStreamVolume() {
+            super.requestStreamVolume();
+        }
+
+        @Override
+        public void requestTrackInfoList() {
+            super.requestTrackInfoList();
+        }
+
+        @Override
+        public void sendPlaybackCommandRequest(String cmdType, Bundle parameters) {
+            super.sendPlaybackCommandRequest(cmdType, parameters);
+        }
+
+        @Override
+        public void setMediaViewEnabled(boolean enable) {
+            super.setMediaViewEnabled(enable);
+        }
+
+        @Override
+        public void setVideoBounds(Rect rect) {
+            super.setVideoBounds(rect);
+        }
+
+        @Override
+        public void onStartInteractiveApp() {
+            super.onStartInteractiveApp();
+            mStartInteractiveAppCount++;
+            notifySessionStateChanged(
+                    TvInteractiveAppManager.INTERACTIVE_APP_STATE_RUNNING,
+                    TvInteractiveAppManager.ERROR_NONE);
+        }
+
+        @Override
+        public void onStopInteractiveApp() {
+            super.onStopInteractiveApp();
+            mStopInteractiveAppCount++;
+        }
+
+        @Override
+        public void onRelease() {
+        }
+
+        @Override
+        public boolean onSetSurface(Surface surface) {
+            mSetSurfaceCount++;
+            return false;
+        }
+
+        @Override
+        public void onSurfaceChanged(int format, int width, int height) {
+            super.onSurfaceChanged(format, width, height);
+            mSurfaceChangedCount++;
+        }
+
+        @Override
+        public boolean onKeyDown(int keyCode, KeyEvent event) {
+            super.onKeyDown(keyCode, event);
+            mKeyDownCount++;
+            mKeyDownCode = keyCode;
+            mKeyDownEvent = event;
+            return false;
+        }
+
+        @Override
+        public boolean onKeyLongPress(int keyCode, KeyEvent event) {
+            super.onKeyLongPress(keyCode, event);
+            return false;
+        }
+
+        @Override
+        public boolean onKeyUp(int keyCode, KeyEvent event) {
+            super.onKeyUp(keyCode, event);
+            mKeyUpCount++;
+            mKeyUpCode = keyCode;
+            mKeyUpEvent = event;
+            return false;
+        }
+
+        @Override
+        public boolean onKeyMultiple(int keyCode, int count, KeyEvent event) {
+            super.onKeyMultiple(keyCode, count, event);
+            mKeyMultipleCount++;
+            mKeyMultipleCode = keyCode;
+            mKeyMultipleEvent = event;
+            return false;
+        }
+
+        @Override
+        public void onCreateBiInteractiveAppRequest(Uri biIAppUri, Bundle params) {
+            super.onCreateBiInteractiveAppRequest(biIAppUri, params);
+            mCreateBiIAppCount++;
+            mCreateBiIAppUri = biIAppUri;
+            mCreateBiIAppParams = params;
+            notifyBiInteractiveAppCreated(biIAppUri, "biIAppId");
+        }
+
+        @Override
+        public void onDestroyBiInteractiveAppRequest(String biIAppId) {
+            super.onDestroyBiInteractiveAppRequest(biIAppId);
+            mDestroyBiIAppCount++;
+            mDestroyBiIAppId = biIAppId;
+        }
+
+        @Override
+        public void onTuned(Uri uri) {
+            super.onTuned(uri);
+            mTunedCount++;
+            mTunedUri = uri;
+        }
+
+        @Override
+        public void onVideoAvailable() {
+            super.onVideoAvailable();
+            mVideoAvailableCount++;
+        }
+
+        @Override
+        public void onAdResponse(AdResponse response) {
+            super.onAdResponse(response);
+            mAdResponseCount++;
+            mAdResponse = response;
+        }
+
+        @Override
+        public void onBroadcastInfoResponse(BroadcastInfoResponse response) {
+            super.onBroadcastInfoResponse(response);
+            mBroadcastInfoResponseCount++;
+            mBroadcastInfoResponse = response;
+        }
+
+        @Override
+        public void onContentAllowed() {
+            super.onContentAllowed();
+        }
+
+        @Override
+        public void onContentBlocked(TvContentRating rating) {
+            super.onContentBlocked(rating);
+        }
+
+        @Override
+        public View onCreateMediaView() {
+            super.onCreateMediaView();
+            return null;
+        }
+
+        @Override
+        public void onCurrentChannelLcn(int lcn) {
+            super.onCurrentChannelLcn(lcn);
+        }
+
+        @Override
+        public void onCurrentChannelUri(Uri uri) {
+            super.onCurrentChannelUri(uri);
+        }
+
+        @Override
+        public void onCurrentTvInputId(String id) {
+            super.onCurrentTvInputId(id);
+        }
+
+        @Override
+        public boolean onGenericMotionEvent(MotionEvent event) {
+            super.onGenericMotionEvent(event);
+            return false;
+        }
+
+        @Override
+        public void onMediaViewSizeChanged(int w, int h) {
+            super.onMediaViewSizeChanged(w, h);
+        }
+
+        @Override
+        public void onResetInteractiveApp() {
+            super.onResetInteractiveApp();
+        }
+
+        @Override
+        public void onSetTeletextAppEnabled(boolean enable) {
+            super.onSetTeletextAppEnabled(enable);
+        }
+
+        @Override
+        public void onSignalStrength(int strength) {
+            super.onSignalStrength(strength);
+        }
+
+        @Override
+        public void onStreamVolume(float v) {
+            super.onStreamVolume(v);
+        }
+
+        @Override
+        public boolean onTouchEvent(MotionEvent event) {
+            super.onTouchEvent(event);
+            return false;
+        }
+
+        @Override
+        public void onTrackInfoList(List<TvTrackInfo> infos) {
+            super.onTrackInfoList(infos);
+        }
+
+        @Override
+        public void onTrackSelected(int type, String id) {
+            super.onTrackSelected(type, id);
+        }
+
+        @Override
+        public boolean onTrackballEvent(MotionEvent event) {
+            super.onTrackballEvent(event);
+            return false;
+        }
+
+        @Override
+        public void onTracksChanged(List<TvTrackInfo> infos) {
+            super.onTracksChanged(infos);
+        }
+
+        @Override
+        public void onVideoUnavailable(int reason) {
+            super.onVideoUnavailable(reason);
+        }
+
+        @Override
+        public void onSigningResult(String signingId, byte[] result) {
+            super.onSigningResult(signingId, result);
+            mSigningResultCount++;
+        }
+
+        @Override
+        public void onError(String errMsg, Bundle params) {
+            super.onError(errMsg, params);
+            mErrorCount++;
+        }
+    }
+}
diff --git a/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppManagerTest.java b/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppManagerTest.java
new file mode 100644
index 0000000..250575a
--- /dev/null
+++ b/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppManagerTest.java
@@ -0,0 +1,273 @@
+/*
+ * Copyright (C) 2021 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 android.media.tv.interactive.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertNotNull;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.media.tv.interactive.AppLinkInfo;
+import android.media.tv.interactive.TvInteractiveAppManager;
+import android.media.tv.interactive.TvInteractiveAppServiceInfo;
+import android.media.tv.interactive.TvInteractiveAppView;
+import android.os.Bundle;
+import android.os.ConditionVariable;
+import android.tv.cts.R;
+
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.RequiredFeatureRule;
+
+import junit.framework.AssertionFailedError;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.List;
+import java.util.concurrent.Executor;
+
+/**
+ * Test {@link android.media.tv.interactive.TvInteractiveAppManager}.
+ */
+@RunWith(AndroidJUnit4.class)
+public class TvInteractiveAppManagerTest {
+    private static final long TIME_OUT_MS = 20000L;
+
+    private Instrumentation mInstrumentation;
+    private ActivityScenario<TvInteractiveAppViewStubActivity> mActivityScenario;
+    private TvInteractiveAppViewStubActivity mActivity;
+    private TvInteractiveAppView mTvInteractiveAppView;
+    private TvInteractiveAppManager mManager;
+
+    private final MockCallback mCallback = new MockCallback();
+
+    public static class MockCallback extends TvInteractiveAppManager.TvInteractiveAppCallback {
+        private String mIAppServiceId;
+        private int mType;
+        private int mState;
+        private int mErr;
+
+        @Override
+        public void onInteractiveAppServiceAdded(String iAppServiceId) {
+            super.onInteractiveAppServiceAdded(iAppServiceId);
+        }
+
+        @Override
+        public void onInteractiveAppServiceRemoved(String iAppServiceId) {
+            super.onInteractiveAppServiceRemoved(iAppServiceId);
+        }
+
+        @Override
+        public void onInteractiveAppServiceUpdated(String iAppServiceId) {
+            super.onInteractiveAppServiceUpdated(iAppServiceId);
+        }
+
+        @Override
+        public void onTvInteractiveAppServiceInfoUpdated(TvInteractiveAppServiceInfo iAppInfo) {
+            super.onTvInteractiveAppServiceInfoUpdated(iAppInfo);
+        }
+
+        @Override
+        public void onTvInteractiveAppServiceStateChanged(
+                String iAppServiceId, int type, int state, int err) {
+            super.onTvInteractiveAppServiceStateChanged(iAppServiceId, type, state, err);
+            mIAppServiceId = iAppServiceId;
+            mType = type;
+            mState = state;
+            mErr = err;
+        }
+    }
+
+    @Rule
+    public RequiredFeatureRule featureRule = new RequiredFeatureRule(
+            PackageManager.FEATURE_LIVE_TV);
+
+
+    private TvInteractiveAppView findTvInteractiveAppViewById(int id) {
+        return (TvInteractiveAppView) mActivity.findViewById(id);
+    }
+
+    private void runTestOnUiThread(final Runnable r) throws Throwable {
+        final Throwable[] exceptions = new Throwable[1];
+        mInstrumentation.runOnMainSync(new Runnable() {
+            public void run() {
+                try {
+                    r.run();
+                } catch (Throwable throwable) {
+                    exceptions[0] = throwable;
+                }
+            }
+        });
+        if (exceptions[0] != null) {
+            throw exceptions[0];
+        }
+    }
+
+    private Executor getExecutor() {
+        return Runnable::run;
+    }
+
+    @Before
+    public void setUp() throws Throwable {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setClass(
+                mInstrumentation.getTargetContext(), TvInteractiveAppViewStubActivity.class);
+
+        // DO NOT use ActivityScenario.launch(Class), which can cause ActivityNotFoundException
+        // related to BootstrapActivity.
+        mActivityScenario = ActivityScenario.launch(intent);
+        ConditionVariable activityReferenceObtained = new ConditionVariable();
+        mActivityScenario.onActivity(activity -> {
+            mActivity = activity;
+            activityReferenceObtained.open();
+        });
+        activityReferenceObtained.block(TIME_OUT_MS);
+
+        assertNotNull("Failed to acquire activity reference.", mActivity);
+        mTvInteractiveAppView = findTvInteractiveAppViewById(R.id.tviappview);
+        assertNotNull("Failed to find TvInteractiveAppView.", mTvInteractiveAppView);
+
+        mManager = (TvInteractiveAppManager) mActivity.getSystemService(
+                Context.TV_INTERACTIVE_APP_SERVICE);
+        assertNotNull("Failed to get TvInteractiveAppManager.", mManager);
+        runTestOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mManager.registerCallback(getExecutor(), mCallback);
+            }
+        });
+    }
+
+    @After
+    public void tearDown() throws Throwable {
+        runTestOnUiThread(new Runnable() {
+            public void run() {
+                mManager.unregisterCallback(mCallback);
+                mTvInteractiveAppView.reset();
+            }
+        });
+        mInstrumentation.waitForIdleSync();
+        mActivity = null;
+        mActivityScenario.close();
+    }
+
+    @Test
+    public void testGetTvInteractiveAppServiceInfoList() throws Exception {
+        List<TvInteractiveAppServiceInfo> list = mManager.getTvInteractiveAppServiceList();
+
+        for (TvInteractiveAppServiceInfo info : list) {
+            if (info.getServiceInfo().name.equals(StubTvInteractiveAppService.class.getName())
+                    && info.getSupportedTypes()
+                    == (TvInteractiveAppServiceInfo.INTERACTIVE_APP_TYPE_HBBTV
+                            | TvInteractiveAppServiceInfo.INTERACTIVE_APP_TYPE_GINGA)) {
+                return;
+            }
+        }
+        throw new AssertionFailedError(
+                "getTvInteractiveAppServiceList() doesn't contain valid "
+                        + "TvInteractiveAppServiceInfo: "
+                        + StubTvInteractiveAppService.class.getName());
+    }
+
+    @Test
+    public void testAppLinkCommand() throws Exception {
+        List<TvInteractiveAppServiceInfo> list = mManager.getTvInteractiveAppServiceList();
+
+        TvInteractiveAppServiceInfo stubInfo = null;
+        for (TvInteractiveAppServiceInfo info : list) {
+            if (info.getServiceInfo().name.equals(StubTvInteractiveAppService.class.getName())) {
+                stubInfo = info;
+                break;
+            }
+        }
+        assertNotNull(stubInfo);
+
+        Bundle bundle = new Bundle();
+        bundle.putString(TvInteractiveAppManager.APP_LINK_KEY_PACKAGE_NAME, "pkg_name");
+        bundle.putString(TvInteractiveAppManager.APP_LINK_KEY_CLASS_NAME, "clazz_name");
+
+        mManager.sendAppLinkCommand(stubInfo.getId(), bundle);
+        PollingCheck.waitFor(
+                TIME_OUT_MS, () -> StubTvInteractiveAppService.sAppLinkCommand != null);
+
+        assertBundlesAreEqual(StubTvInteractiveAppService.sAppLinkCommand, bundle);
+    }
+
+    @Test
+    public void testAppLinkInfo() throws Exception {
+        List<TvInteractiveAppServiceInfo> list = mManager.getTvInteractiveAppServiceList();
+
+        TvInteractiveAppServiceInfo stubInfo = null;
+        for (TvInteractiveAppServiceInfo info : list) {
+            if (info.getServiceInfo().name.equals(StubTvInteractiveAppService.class.getName())) {
+                stubInfo = info;
+                break;
+            }
+        }
+        assertNotNull(stubInfo);
+
+        AppLinkInfo info = new AppLinkInfo("pkg_name", "clazz_name", "https://uri.test");
+
+        mManager.registerAppLinkInfo(stubInfo.getId(), info);
+        PollingCheck.waitFor(
+                TIME_OUT_MS, () -> StubTvInteractiveAppService.sAppLinkInfo != null);
+        assertThat(StubTvInteractiveAppService.sAppLinkInfo.getComponentName().getPackageName())
+                .isEqualTo("pkg_name");
+        assertThat(StubTvInteractiveAppService.sAppLinkInfo.getComponentName().getClassName())
+                .isEqualTo("clazz_name");
+        assertThat(StubTvInteractiveAppService.sAppLinkInfo.getUri().toString())
+                .isEqualTo("https://uri.test");
+
+        mManager.unregisterAppLinkInfo(stubInfo.getId(), info);
+        PollingCheck.waitFor(
+                TIME_OUT_MS, () -> StubTvInteractiveAppService.sAppLinkInfo == null);
+
+        info = new AppLinkInfo("pkg2", "class2", "http://applinkinfo.com");
+
+        mManager.registerAppLinkInfo(stubInfo.getId(), info);
+        PollingCheck.waitFor(
+                TIME_OUT_MS, () -> StubTvInteractiveAppService.sAppLinkInfo != null);
+        assertThat(StubTvInteractiveAppService.sAppLinkInfo.getComponentName().getPackageName())
+                .isEqualTo("pkg2");
+        assertThat(StubTvInteractiveAppService.sAppLinkInfo.getComponentName().getClassName())
+                .isEqualTo("class2");
+        assertThat(StubTvInteractiveAppService.sAppLinkInfo.getUri().toString())
+                .isEqualTo("http://applinkinfo.com");
+    }
+
+    private static void assertBundlesAreEqual(Bundle actual, Bundle expected) {
+        if (expected != null && actual != null) {
+            assertThat(actual.keySet()).isEqualTo(expected.keySet());
+            for (String key : expected.keySet()) {
+                assertThat(actual.get(key)).isEqualTo(expected.get(key));
+            }
+        } else {
+            assertThat(actual).isEqualTo(expected);
+        }
+    }
+}
diff --git a/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppServiceTest.java b/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppServiceTest.java
new file mode 100644
index 0000000..8eae6fc
--- /dev/null
+++ b/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppServiceTest.java
@@ -0,0 +1,1179 @@
+/*
+ * Copyright (C) 2021 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 android.media.tv.interactive.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertNotNull;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Rect;
+import android.media.tv.AdRequest;
+import android.media.tv.AdResponse;
+import android.media.tv.AitInfo;
+import android.media.tv.BroadcastInfoRequest;
+import android.media.tv.BroadcastInfoResponse;
+import android.media.tv.CommandRequest;
+import android.media.tv.CommandResponse;
+import android.media.tv.DsmccRequest;
+import android.media.tv.DsmccResponse;
+import android.media.tv.PesRequest;
+import android.media.tv.PesResponse;
+import android.media.tv.SectionRequest;
+import android.media.tv.SectionResponse;
+import android.media.tv.StreamEventRequest;
+import android.media.tv.StreamEventResponse;
+import android.media.tv.TableRequest;
+import android.media.tv.TableResponse;
+import android.media.tv.TimelineRequest;
+import android.media.tv.TimelineResponse;
+import android.media.tv.TsRequest;
+import android.media.tv.TsResponse;
+import android.media.tv.TvContract;
+import android.media.tv.TvInputInfo;
+import android.media.tv.TvInputManager;
+import android.media.tv.TvTrackInfo;
+import android.media.tv.TvView;
+import android.media.tv.interactive.TvInteractiveAppManager;
+import android.media.tv.interactive.TvInteractiveAppServiceInfo;
+import android.media.tv.interactive.TvInteractiveAppView;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.ConditionVariable;
+import android.os.ParcelFileDescriptor;
+import android.tv.cts.R;
+import android.view.InputEvent;
+import android.view.KeyEvent;
+import android.view.SurfaceView;
+import android.view.View;
+
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.RequiredFeatureRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.Executor;
+
+/**
+ * Test {@link android.media.tv.interactive.TvInteractiveAppService}.
+ */
+@RunWith(AndroidJUnit4.class)
+public class TvInteractiveAppServiceTest {
+    private static final long TIME_OUT_MS = 20000L;
+    private static final Uri CHANNEL_0 = TvContract.buildChannelUri(0);
+
+    private Instrumentation mInstrumentation;
+    private ActivityScenario<TvInteractiveAppViewStubActivity> mActivityScenario;
+    private TvInteractiveAppViewStubActivity mActivity;
+    private TvInteractiveAppView mTvIAppView;
+
+    private TvView mTvView;
+    private TvInteractiveAppManager mManager;
+    private TvInteractiveAppServiceInfo mStubInfo;
+    private StubTvInteractiveAppService.StubSessionImpl mSession;
+    private TvInputManager mTvInputManager;
+    private TvInputInfo mTvInputInfo;
+    private StubTvInputService2.StubSessionImpl2 mInputSession;
+
+    @Rule
+    public RequiredFeatureRule featureRule = new RequiredFeatureRule(
+            PackageManager.FEATURE_LIVE_TV);
+
+    private final MockCallback mCallback = new MockCallback();
+    private final MockTvInputCallback mTvInputCallback = new MockTvInputCallback();
+
+    public static class MockCallback extends TvInteractiveAppView.TvInteractiveAppCallback {
+        private int mRequestCurrentChannelUriCount = 0;
+        private int mStateChangedCount = 0;
+        private int mBiIAppCreatedCount = 0;
+        private int mRequestSigningCount = 0;
+
+        private String mIAppServiceId = null;
+        private Integer mState = null;
+        private Integer mErr = null;
+        private Uri mBiIAppUri = null;
+        private String mBiIAppId = null;
+
+        private void resetValues() {
+            mRequestCurrentChannelUriCount = 0;
+            mStateChangedCount = 0;
+            mBiIAppCreatedCount = 0;
+            mRequestSigningCount = 0;
+
+            mIAppServiceId = null;
+            mState = null;
+            mErr = null;
+            mBiIAppUri = null;
+            mBiIAppId = null;
+        }
+
+        @Override
+        public void onRequestCurrentChannelUri(String iAppServiceId) {
+            super.onRequestCurrentChannelUri(iAppServiceId);
+            mRequestCurrentChannelUriCount++;
+        }
+
+        @Override
+        public void onRequestSigning(String iAppServiceId, String signingId,
+                String algorithm, String alias, byte[] data) {
+            super.onRequestSigning(iAppServiceId, signingId, algorithm, alias, data);
+            mRequestSigningCount++;
+        }
+
+        @Override
+        public void onStateChanged(String iAppServiceId, int state, int err) {
+            super.onStateChanged(iAppServiceId, state, err);
+            mStateChangedCount++;
+            mIAppServiceId = iAppServiceId;
+            mState = state;
+            mErr = err;
+        }
+
+        @Override
+        public void onBiInteractiveAppCreated(String iAppServiceId, Uri biIAppUri,
+                String biIAppId) {
+            super.onBiInteractiveAppCreated(iAppServiceId, biIAppUri, biIAppId);
+            mBiIAppCreatedCount++;
+            mIAppServiceId = iAppServiceId;
+            mBiIAppUri = biIAppUri;
+            mBiIAppId = biIAppId;
+        }
+
+        @Override
+        public void onPlaybackCommandRequest(String id, String type, Bundle bundle) {
+            super.onPlaybackCommandRequest(id, type, bundle);
+        }
+
+        @Override
+        public void onRequestCurrentChannelLcn(String id) {
+            super.onRequestCurrentChannelLcn(id);
+        }
+
+        @Override
+        public void onRequestCurrentTvInputId(String id) {
+            super.onRequestCurrentTvInputId(id);
+        }
+
+        @Override
+        public void onRequestStreamVolume(String id) {
+            super.onRequestStreamVolume(id);
+        }
+
+        @Override
+        public void onRequestTrackInfoList(String id) {
+            super.onRequestTrackInfoList(id);
+        }
+
+        @Override
+        public void onSetVideoBounds(String id, Rect rect) {
+            super.onSetVideoBounds(id, rect);
+        }
+
+        @Override
+        public void onTeletextAppStateChanged(String id, int state) {
+            super.onTeletextAppStateChanged(id, state);
+        }
+
+    }
+
+    public static class MockTvInputCallback extends TvView.TvInputCallback {
+        private int mAitInfoUpdatedCount = 0;
+
+        private AitInfo mAitInfo = null;
+
+        private void resetValues() {
+            mAitInfoUpdatedCount = 0;
+
+            mAitInfo = null;
+        }
+
+        public void onAitInfoUpdated(String inputId, AitInfo aitInfo) {
+            super.onAitInfoUpdated(inputId, aitInfo);
+            mAitInfoUpdatedCount++;
+            mAitInfo = aitInfo;
+        }
+        public void onSignalStrengthUpdated(String inputId, int strength) {
+            super.onSignalStrengthUpdated(inputId, strength);
+        }
+        public void onTuned(String inputId, Uri uri) {
+            super.onTuned(inputId, uri);
+        }
+    }
+
+    private TvInteractiveAppView findTvInteractiveAppViewById(int id) {
+        return (TvInteractiveAppView) mActivity.findViewById(id);
+    }
+
+    private TvView findTvViewById(int id) {
+        return (TvView) mActivity.findViewById(id);
+    }
+
+    private void runTestOnUiThread(final Runnable r) throws Throwable {
+        final Throwable[] exceptions = new Throwable[1];
+        mInstrumentation.runOnMainSync(new Runnable() {
+            public void run() {
+                try {
+                    r.run();
+                } catch (Throwable throwable) {
+                    exceptions[0] = throwable;
+                }
+            }
+        });
+        if (exceptions[0] != null) {
+            throw exceptions[0];
+        }
+    }
+
+    private void linkTvView() {
+        assertNotNull(mSession);
+        mSession.resetValues();
+        mTvView.setCallback(mTvInputCallback);
+        mTvView.tune(mTvInputInfo.getId(), CHANNEL_0);
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mTvView.getInputSession() != null);
+        mInputSession = StubTvInputService2.sStubSessionImpl2;
+        assertNotNull(mInputSession);
+        mInputSession.resetValues();
+
+        mTvIAppView.setTvView(mTvView);
+        mTvView.setInteractiveAppNotificationEnabled(true);
+    }
+
+    private Executor getExecutor() {
+        return Runnable::run;
+    }
+
+    private static Bundle createTestBundle() {
+        Bundle b = new Bundle();
+        b.putString("stringKey", new String("Test String"));
+        return b;
+    }
+
+    private static Uri createTestUri() {
+        return Uri.parse("content://com.example/");
+    }
+
+    @Before
+    public void setUp() throws Throwable {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setClass(
+                mInstrumentation.getTargetContext(), TvInteractiveAppViewStubActivity.class);
+
+        // DO NOT use ActivityScenario.launch(Class), which can cause ActivityNotFoundException
+        // related to BootstrapActivity.
+        mActivityScenario = ActivityScenario.launch(intent);
+        ConditionVariable activityReferenceObtained = new ConditionVariable();
+        mActivityScenario.onActivity(activity -> {
+            mActivity = activity;
+            activityReferenceObtained.open();
+        });
+        activityReferenceObtained.block(TIME_OUT_MS);
+
+        assertNotNull("Failed to acquire activity reference.", mActivity);
+        mTvIAppView = findTvInteractiveAppViewById(R.id.tviappview);
+        assertNotNull("Failed to find TvInteractiveAppView.", mTvIAppView);
+        mTvView = findTvViewById(R.id.tviapp_tvview);
+        assertNotNull("Failed to find TvView.", mTvView);
+
+        mManager = (TvInteractiveAppManager) mActivity.getSystemService(
+                Context.TV_INTERACTIVE_APP_SERVICE);
+        assertNotNull("Failed to get TvInteractiveAppManager.", mManager);
+
+        for (TvInteractiveAppServiceInfo info : mManager.getTvInteractiveAppServiceList()) {
+            if (info.getServiceInfo().name.equals(StubTvInteractiveAppService.class.getName())) {
+                mStubInfo = info;
+            }
+        }
+        assertNotNull(mStubInfo);
+        mTvIAppView.setCallback(getExecutor(), mCallback);
+        mTvIAppView.setOnUnhandledInputEventListener(getExecutor(),
+                new TvInteractiveAppView.OnUnhandledInputEventListener() {
+                    @Override
+                    public boolean onUnhandledInputEvent(InputEvent event) {
+                        return true;
+                    }
+                });
+        mTvIAppView.prepareInteractiveApp(mStubInfo.getId(), 1);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mTvIAppView.getInteractiveAppSession() != null);
+        mSession = StubTvInteractiveAppService.sSession;
+
+        mTvInputManager = (TvInputManager) mActivity.getSystemService(Context.TV_INPUT_SERVICE);
+        assertNotNull("Failed to get TvInputManager.", mTvInputManager);
+
+        for (TvInputInfo info : mTvInputManager.getTvInputList()) {
+            if (info.getServiceInfo().name.equals(StubTvInputService2.class.getName())) {
+                mTvInputInfo = info;
+            }
+        }
+        assertNotNull(mTvInputInfo);
+    }
+
+    @After
+    public void tearDown() throws Throwable {
+        runTestOnUiThread(new Runnable() {
+            public void run() {
+                mTvIAppView.reset();
+                mTvView.reset();
+            }
+        });
+        mInstrumentation.waitForIdleSync();
+        mActivity = null;
+        mActivityScenario.close();
+    }
+
+    @Test
+    public void testRequestCurrentChannelUri() throws Throwable {
+        assertNotNull(mSession);
+        mCallback.resetValues();
+        mSession.requestCurrentChannelUri();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mCallback.mRequestCurrentChannelUriCount > 0);
+
+        assertThat(mCallback.mRequestCurrentChannelUriCount).isEqualTo(1);
+    }
+
+    @Test
+    public void testRequestSigning() throws Throwable {
+        assertNotNull(mSession);
+        mCallback.resetValues();
+        mSession.requestSigning("id", "algo", "alias", new byte[1]);
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mCallback.mRequestSigningCount > 0);
+
+        assertThat(mCallback.mRequestSigningCount).isEqualTo(1);
+        // TODO: check values
+    }
+
+    @Test
+    public void testSendSigningResult() {
+        assertNotNull(mSession);
+        mSession.resetValues();
+
+        mTvIAppView.sendSigningResult("id", new byte[1]);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mSigningResultCount > 0);
+
+        assertThat(mSession.mSigningResultCount).isEqualTo(1);
+        // TODO: check values
+    }
+
+    @Test
+    public void testNotifyError() {
+        assertNotNull(mSession);
+        mSession.resetValues();
+
+        mTvIAppView.notifyError("msg", new Bundle());
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mErrorCount > 0);
+
+        assertThat(mSession.mErrorCount).isEqualTo(1);
+        // TODO: check values
+    }
+
+    @Test
+    public void testSetSurface() throws Throwable {
+        assertNotNull(mSession);
+
+        assertThat(mSession.mSetSurfaceCount).isEqualTo(1);
+    }
+
+    @Test
+    public void testLayoutSurface() throws Throwable {
+        assertNotNull(mSession);
+
+        final int left = 10;
+        final int top = 20;
+        final int right = 30;
+        final int bottom = 40;
+
+        mSession.layoutSurface(left, top, right, bottom);
+
+        new PollingCheck(TIME_OUT_MS) {
+            @Override
+            protected boolean check() {
+                int childCount = mTvIAppView.getChildCount();
+                for (int i = 0; i < childCount; ++i) {
+                    View v = mTvIAppView.getChildAt(i);
+                    if (v instanceof SurfaceView) {
+                        return v.getLeft() == left
+                            && v.getTop() == top
+                            && v.getRight() == right
+                            && v.getBottom() == bottom;
+                    }
+                }
+                return false;
+            }
+        }.run();
+        assertThat(mSession.mSurfaceChangedCount > 0).isTrue();
+    }
+
+    @Test
+    public void testSessionStateChanged() throws Throwable {
+        assertNotNull(mSession);
+        mCallback.resetValues();
+        mSession.notifySessionStateChanged(
+                TvInteractiveAppManager.INTERACTIVE_APP_STATE_ERROR,
+                TvInteractiveAppManager.ERROR_UNKNOWN);
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mCallback.mStateChangedCount > 0);
+
+        assertThat(mCallback.mStateChangedCount).isEqualTo(1);
+        assertThat(mCallback.mIAppServiceId).isEqualTo(mStubInfo.getId());
+        assertThat(mCallback.mState)
+                .isEqualTo(TvInteractiveAppManager.INTERACTIVE_APP_STATE_ERROR);
+        assertThat(mCallback.mErr).isEqualTo(TvInteractiveAppManager.ERROR_UNKNOWN);
+    }
+
+    @Test
+    public void testStartStopInteractiveApp() throws Throwable {
+        assertNotNull(mSession);
+        mSession.resetValues();
+        mTvIAppView.startInteractiveApp();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mStartInteractiveAppCount > 0);
+        assertThat(mSession.mStartInteractiveAppCount).isEqualTo(1);
+
+        assertNotNull(mSession);
+        mSession.resetValues();
+        mTvIAppView.stopInteractiveApp();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mStopInteractiveAppCount > 0);
+        assertThat(mSession.mStopInteractiveAppCount).isEqualTo(1);
+    }
+
+    @Test
+    public void testDispatchKeyDown() {
+        assertNotNull(mSession);
+        mSession.resetValues();
+        final int keyCode = KeyEvent.KEYCODE_Q;
+        final KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, keyCode);
+
+        mTvIAppView.dispatchKeyEvent(event);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mKeyDownCount > 0);
+
+        assertThat(mSession.mKeyDownCount).isEqualTo(1);
+        assertThat(mSession.mKeyDownCode).isEqualTo(keyCode);
+        assertKeyEventEquals(mSession.mKeyDownEvent, event);
+    }
+
+    @Test
+    public void testDispatchKeyUp() {
+        assertNotNull(mSession);
+        mSession.resetValues();
+        final int keyCode = KeyEvent.KEYCODE_I;
+        final KeyEvent event = new KeyEvent(KeyEvent.ACTION_UP, keyCode);
+
+        mTvIAppView.dispatchKeyEvent(event);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mKeyUpCount > 0);
+
+        assertThat(mSession.mKeyUpCount).isEqualTo(1);
+        assertThat(mSession.mKeyUpCode).isEqualTo(keyCode);
+        assertKeyEventEquals(mSession.mKeyUpEvent, event);
+    }
+
+    @Test
+    public void testDispatchKeyMultiple() {
+        assertNotNull(mSession);
+        mSession.resetValues();
+        final int keyCode = KeyEvent.KEYCODE_L;
+        final KeyEvent event = new KeyEvent(KeyEvent.ACTION_MULTIPLE, keyCode);
+
+        mTvIAppView.dispatchKeyEvent(event);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mKeyMultipleCount > 0);
+
+        assertThat(mSession.mKeyMultipleCount).isEqualTo(1);
+        assertThat(mSession.mKeyMultipleCode).isEqualTo(keyCode);
+        assertKeyEventEquals(mSession.mKeyMultipleEvent, event);
+    }
+
+    @Test
+    public void testDispatchUnhandledInputEvent() {
+        final int keyCode = KeyEvent.KEYCODE_I;
+        final KeyEvent event = new KeyEvent(KeyEvent.ACTION_UP, keyCode);
+
+        assertThat(mTvIAppView.dispatchUnhandledInputEvent(event)).isTrue();
+    }
+
+    @Test
+    public void testCreateBiInteractiveApp() {
+        assertNotNull(mSession);
+        mSession.resetValues();
+        mCallback.resetValues();
+        final Bundle bundle = createTestBundle();
+        final Uri uri = createTestUri();
+        final String biIAppId = "biIAppId";
+
+        mTvIAppView.createBiInteractiveApp(uri, bundle);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mCallback.mBiIAppCreatedCount > 0);
+
+        assertThat(mSession.mCreateBiIAppCount).isEqualTo(1);
+        assertThat(mSession.mCreateBiIAppUri).isEqualTo(uri);
+        assertBundlesAreEqual(mSession.mCreateBiIAppParams, bundle);
+
+        assertThat(mCallback.mIAppServiceId).isEqualTo(mStubInfo.getId());
+        assertThat(mCallback.mBiIAppUri).isEqualTo(uri);
+        assertThat(mCallback.mBiIAppId).isEqualTo(biIAppId);
+
+        mTvIAppView.destroyBiInteractiveApp(biIAppId);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mDestroyBiIAppCount > 0);
+
+        assertThat(mSession.mDestroyBiIAppCount).isEqualTo(1);
+        assertThat(mSession.mDestroyBiIAppId).isEqualTo(biIAppId);
+    }
+
+    @Test
+    public void testTuned() {
+        linkTvView();
+
+        mInputSession.notifyTuned(CHANNEL_0);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mTunedCount > 0);
+
+        assertThat(mSession.mTunedCount).isEqualTo(1);
+        assertThat(mSession.mTunedUri).isEqualTo(CHANNEL_0);
+    }
+
+    @Test
+    public void testVideoAvailable() {
+        linkTvView();
+
+        mInputSession.notifyVideoAvailable();
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mVideoAvailableCount > 0);
+
+        assertThat(mSession.mVideoAvailableCount).isEqualTo(1);
+    }
+
+    @Test
+    public void testAdRequest() throws Throwable {
+        linkTvView();
+
+        File tmpFile = File.createTempFile("cts_tv_interactive_app", "tias_test");
+        ParcelFileDescriptor fd =
+                ParcelFileDescriptor.open(tmpFile, ParcelFileDescriptor.MODE_READ_WRITE);
+        AdRequest adRequest = new AdRequest(
+                567, AdRequest.REQUEST_TYPE_START, fd, 787L, 989L, 100L, "MMM", new Bundle());
+        mSession.requestAd(adRequest);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mInputSession.mAdRequestCount > 0);
+
+        assertThat(mInputSession.mAdRequestCount).isEqualTo(1);
+        assertThat(mInputSession.mAdRequest.getId()).isEqualTo(567);
+        assertThat(mInputSession.mAdRequest.getRequestType())
+                .isEqualTo(AdRequest.REQUEST_TYPE_START);
+        assertNotNull(mInputSession.mAdRequest.getFileDescriptor());
+        assertThat(mInputSession.mAdRequest.getStartTimeMillis()).isEqualTo(787L);
+        assertThat(mInputSession.mAdRequest.getStopTimeMillis()).isEqualTo(989L);
+        assertThat(mInputSession.mAdRequest.getEchoIntervalMillis()).isEqualTo(100L);
+        assertThat(mInputSession.mAdRequest.getMediaFileType()).isEqualTo("MMM");
+        assertNotNull(mInputSession.mAdRequest.getMetadata());
+
+        fd.close();
+        tmpFile.delete();
+    }
+
+    @Test
+    public void testAdResponse() throws Throwable {
+        linkTvView();
+
+        AdResponse adResponse = new AdResponse(767, AdResponse.RESPONSE_TYPE_PLAYING, 909L);
+        mInputSession.notifyAdResponse(adResponse);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mAdResponseCount > 0);
+
+        assertThat(mSession.mAdResponseCount).isEqualTo(1);
+        assertThat(mSession.mAdResponse.getId()).isEqualTo(767);
+        assertThat(mSession.mAdResponse.getResponseType())
+                .isEqualTo(AdResponse.RESPONSE_TYPE_PLAYING);
+        assertThat(mSession.mAdResponse.getElapsedTimeMillis()).isEqualTo(909L);
+    }
+
+    @Test
+    public void testAitInfo() throws Throwable {
+        linkTvView();
+        mTvInputCallback.resetValues();
+
+        mInputSession.notifyAitInfoUpdated(
+                new AitInfo(TvInteractiveAppServiceInfo.INTERACTIVE_APP_TYPE_HBBTV, 2));
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mTvInputCallback.mAitInfoUpdatedCount > 0);
+
+        assertThat(mTvInputCallback.mAitInfoUpdatedCount).isEqualTo(1);
+        assertThat(mTvInputCallback.mAitInfo.getType())
+                .isEqualTo(TvInteractiveAppServiceInfo.INTERACTIVE_APP_TYPE_HBBTV);
+        assertThat(mTvInputCallback.mAitInfo.getVersion()).isEqualTo(2);
+    }
+
+    @Test
+    public void testSignalStrength() throws Throwable {
+        linkTvView();
+
+        mInputSession.notifySignalStrength(TvInputManager.SIGNAL_STRENGTH_STRONG);
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testRemoveBroadcastInfo() throws Throwable {
+        linkTvView();
+
+        mSession.removeBroadcastInfo(23);
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testNotifyBiInteractiveAppCreated() throws Throwable {
+        mSession.notifyBiInteractiveAppCreated(createTestUri(), "testAppId");
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testTeletextAppState() throws Throwable {
+        mSession.notifyTeletextAppStateChanged(TvInteractiveAppManager.TELETEXT_APP_STATE_HIDE);
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testRequestCurrentChannelLcn() throws Throwable {
+        mSession.requestCurrentChannelLcn();
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testRequestCurrentTvInputId() throws Throwable {
+        mSession.requestCurrentTvInputId();
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testRequestStreamVolume() throws Throwable {
+        mSession.requestStreamVolume();
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testRequestTrackInfoList() throws Throwable {
+        mSession.requestTrackInfoList();
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testSendPlaybackCommandRequest() throws Throwable {
+        mSession.sendPlaybackCommandRequest(mStubInfo.getId(), createTestBundle());
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testSetMediaViewEnabled() throws Throwable {
+        mSession.setMediaViewEnabled(false);
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testSetVideoBounds() throws Throwable {
+        mSession.setVideoBounds(new Rect());
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testResetInteractiveApp() throws Throwable {
+        mTvIAppView.resetInteractiveApp();
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testSendCurrentChannelLcn() throws Throwable {
+        mTvIAppView.sendCurrentChannelLcn(1);
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testSendCurrentChannelUri() throws Throwable {
+        mTvIAppView.sendCurrentChannelUri(createTestUri());
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testSendCurrentTvInputId() throws Throwable {
+        mTvIAppView.sendCurrentTvInputId("input_id");
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testSendStreamVolume() throws Throwable {
+        mTvIAppView.sendStreamVolume(0.1f);
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testSendTrackInfoList() throws Throwable {
+        mTvIAppView.sendTrackInfoList(new ArrayList<TvTrackInfo>());
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testSetTeletextAppEnabled() throws Throwable {
+        mTvIAppView.setTeletextAppEnabled(false);
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testTsRequest() throws Throwable {
+        linkTvView();
+
+        TsRequest request = new TsRequest(1, BroadcastInfoRequest.REQUEST_OPTION_REPEAT, 11);
+        mSession.requestBroadcastInfo(request);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mInputSession.mBroadcastInfoRequestCount > 0);
+
+        request = (TsRequest) mInputSession.mBroadcastInfoRequest;
+        assertThat(mInputSession.mBroadcastInfoRequestCount).isEqualTo(1);
+        assertThat(request.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_TS);
+        assertThat(request.getRequestId()).isEqualTo(1);
+        assertThat(request.getOption()).isEqualTo(BroadcastInfoRequest.REQUEST_OPTION_REPEAT);
+        assertThat(request.getTsPid()).isEqualTo(11);
+    }
+
+    @Test
+    public void testCommandRequest() throws Throwable {
+        linkTvView();
+
+        CommandRequest request = new CommandRequest(2, BroadcastInfoRequest.REQUEST_OPTION_REPEAT,
+                "nameSpace1", "name2", "requestArgs", CommandRequest.ARGUMENT_TYPE_XML);
+        mSession.requestBroadcastInfo(request);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mInputSession.mBroadcastInfoRequestCount > 0);
+
+        request = (CommandRequest) mInputSession.mBroadcastInfoRequest;
+        assertThat(mInputSession.mBroadcastInfoRequestCount).isEqualTo(1);
+        assertThat(request.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_COMMAND);
+        assertThat(request.getRequestId()).isEqualTo(2);
+        assertThat(request.getOption()).isEqualTo(BroadcastInfoRequest.REQUEST_OPTION_REPEAT);
+        assertThat(request.getNamespace()).isEqualTo("nameSpace1");
+        assertThat(request.getName()).isEqualTo("name2");
+        assertThat(request.getArguments()).isEqualTo("requestArgs");
+        assertThat(request.getArgumentType()).isEqualTo(CommandRequest.ARGUMENT_TYPE_XML);
+    }
+
+    @Test
+    public void testDsmccRequest() throws Throwable {
+        linkTvView();
+
+        final Uri uri = createTestUri();
+        DsmccRequest request = new DsmccRequest(3, BroadcastInfoRequest.REQUEST_OPTION_REPEAT,
+                uri);
+        mSession.requestBroadcastInfo(request);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mInputSession.mBroadcastInfoRequestCount > 0);
+
+        request = (DsmccRequest) mInputSession.mBroadcastInfoRequest;
+        assertThat(mInputSession.mBroadcastInfoRequestCount).isEqualTo(1);
+        assertThat(request.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_DSMCC);
+        assertThat(request.getRequestId()).isEqualTo(3);
+        assertThat(request.getOption()).isEqualTo(BroadcastInfoRequest.REQUEST_OPTION_REPEAT);
+        assertThat(request.getUri()).isEqualTo(uri);
+    }
+
+    @Test
+    public void testPesRequest() throws Throwable {
+        linkTvView();
+
+        PesRequest request = new PesRequest(4, BroadcastInfoRequest.REQUEST_OPTION_REPEAT, 44, 444);
+        mSession.requestBroadcastInfo(request);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mInputSession.mBroadcastInfoRequestCount > 0);
+
+        request = (PesRequest) mInputSession.mBroadcastInfoRequest;
+        assertThat(mInputSession.mBroadcastInfoRequestCount).isEqualTo(1);
+        assertThat(request.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_PES);
+        assertThat(request.getRequestId()).isEqualTo(4);
+        assertThat(request.getOption()).isEqualTo(BroadcastInfoRequest.REQUEST_OPTION_REPEAT);
+        assertThat(request.getTsPid()).isEqualTo(44);
+        assertThat(request.getStreamId()).isEqualTo(444);
+    }
+
+    @Test
+    public void testSectionRequest() throws Throwable {
+        linkTvView();
+
+        SectionRequest request = new SectionRequest(5, BroadcastInfoRequest.REQUEST_OPTION_REPEAT,
+                55, 555, 5555);
+        mSession.requestBroadcastInfo(request);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mInputSession.mBroadcastInfoRequestCount > 0);
+
+        request = (SectionRequest) mInputSession.mBroadcastInfoRequest;
+        assertThat(mInputSession.mBroadcastInfoRequestCount).isEqualTo(1);
+        assertThat(request.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_SECTION);
+        assertThat(request.getRequestId()).isEqualTo(5);
+        assertThat(request.getOption()).isEqualTo(BroadcastInfoRequest.REQUEST_OPTION_REPEAT);
+        assertThat(request.getTsPid()).isEqualTo(55);
+        assertThat(request.getTableId()).isEqualTo(555);
+        assertThat(request.getVersion()).isEqualTo(5555);
+    }
+
+    @Test
+    public void testStreamEventRequest() throws Throwable {
+        linkTvView();
+
+        final Uri uri = createTestUri();
+        StreamEventRequest request = new StreamEventRequest(6,
+                BroadcastInfoRequest.REQUEST_OPTION_REPEAT, uri, "testName");
+        mSession.requestBroadcastInfo(request);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mInputSession.mBroadcastInfoRequestCount > 0);
+
+        request = (StreamEventRequest) mInputSession.mBroadcastInfoRequest;
+        assertThat(mInputSession.mBroadcastInfoRequestCount).isEqualTo(1);
+        assertThat(request.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_STREAM_EVENT);
+        assertThat(request.getRequestId()).isEqualTo(6);
+        assertThat(request.getOption()).isEqualTo(BroadcastInfoRequest.REQUEST_OPTION_REPEAT);
+        assertThat(request.getTargetUri()).isEqualTo(uri);
+        assertThat(request.getEventName()).isEqualTo("testName");
+    }
+
+    @Test
+    public void testTableRequest() throws Throwable {
+        linkTvView();
+
+        TableRequest request = new TableRequest(7, BroadcastInfoRequest.REQUEST_OPTION_REPEAT, 77,
+                TableRequest.TABLE_NAME_PMT, 777);
+        mSession.requestBroadcastInfo(request);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mInputSession.mBroadcastInfoRequestCount > 0);
+
+        request = (TableRequest) mInputSession.mBroadcastInfoRequest;
+        assertThat(mInputSession.mBroadcastInfoRequestCount).isEqualTo(1);
+        assertThat(request.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_TABLE);
+        assertThat(request.getRequestId()).isEqualTo(7);
+        assertThat(request.getOption()).isEqualTo(BroadcastInfoRequest.REQUEST_OPTION_REPEAT);
+        assertThat(request.getTableId()).isEqualTo(77);
+        assertThat(request.getTableName()).isEqualTo(TableRequest.TABLE_NAME_PMT);
+        assertThat(request.getVersion()).isEqualTo(777);
+    }
+
+    @Test
+    public void testTimelineRequest() throws Throwable {
+        linkTvView();
+
+        TimelineRequest request = new TimelineRequest(8, BroadcastInfoRequest.REQUEST_OPTION_REPEAT,
+                8000);
+        mSession.requestBroadcastInfo(request);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mInputSession.mBroadcastInfoRequestCount > 0);
+
+        request = (TimelineRequest) mInputSession.mBroadcastInfoRequest;
+        assertThat(mInputSession.mBroadcastInfoRequestCount).isEqualTo(1);
+        assertThat(request.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_TIMELINE);
+        assertThat(request.getRequestId()).isEqualTo(8);
+        assertThat(request.getOption()).isEqualTo(BroadcastInfoRequest.REQUEST_OPTION_REPEAT);
+        assertThat(request.getIntervalMillis()).isEqualTo(8000);
+    }
+
+    @Test
+    public void testTsResponse() throws Throwable {
+        linkTvView();
+
+        TsResponse response = new TsResponse(1, 11, BroadcastInfoResponse.RESPONSE_RESULT_OK,
+                "TestToken");
+        mInputSession.notifyBroadcastInfoResponse(response);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mBroadcastInfoResponseCount > 0);
+
+        response = (TsResponse) mSession.mBroadcastInfoResponse;
+        assertThat(mSession.mBroadcastInfoResponseCount).isEqualTo(1);
+        assertThat(response.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_TS);
+        assertThat(response.getRequestId()).isEqualTo(1);
+        assertThat(response.getSequence()).isEqualTo(11);
+        assertThat(response.getResponseResult()).isEqualTo(
+                BroadcastInfoResponse.RESPONSE_RESULT_OK);
+        assertThat(response.getSharedFilterToken()).isEqualTo("TestToken");
+    }
+
+    @Test
+    public void testCommandResponse() throws Throwable {
+        linkTvView();
+
+        CommandResponse response = new CommandResponse(2, 22,
+                BroadcastInfoResponse.RESPONSE_RESULT_OK, "commandResponse",
+                CommandResponse.RESPONSE_TYPE_JSON);
+        mInputSession.notifyBroadcastInfoResponse(response);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mBroadcastInfoResponseCount > 0);
+
+        response = (CommandResponse) mSession.mBroadcastInfoResponse;
+        assertThat(mSession.mBroadcastInfoResponseCount).isEqualTo(1);
+        assertThat(response.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_COMMAND);
+        assertThat(response.getRequestId()).isEqualTo(2);
+        assertThat(response.getSequence()).isEqualTo(22);
+        assertThat(response.getResponseResult()).isEqualTo(
+                BroadcastInfoResponse.RESPONSE_RESULT_OK);
+        assertThat(response.getResponse()).isEqualTo("commandResponse");
+        assertThat(response.getResponseType()).isEqualTo(CommandResponse.RESPONSE_TYPE_JSON);
+    }
+
+    @Test
+    public void testDsmccResponse() throws Throwable {
+        linkTvView();
+
+        File tmpFile = File.createTempFile("cts_tv_interactive_app", "tias_test");
+        ParcelFileDescriptor fd =
+                ParcelFileDescriptor.open(tmpFile, ParcelFileDescriptor.MODE_READ_WRITE);
+        final List<String> childList = new ArrayList(Arrays.asList("c1", "c2", "c3"));
+        final int[] eventIds = new int[] {1, 2, 3};
+        final String[] eventNames = new String[] {"event1", "event2", "event3"};
+        DsmccResponse response = new DsmccResponse(3, 3, BroadcastInfoResponse.RESPONSE_RESULT_OK,
+                fd);
+
+        mInputSession.notifyBroadcastInfoResponse(response);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mBroadcastInfoResponseCount > 0);
+
+        response = (DsmccResponse) mSession.mBroadcastInfoResponse;
+        assertThat(mSession.mBroadcastInfoResponseCount).isEqualTo(1);
+        assertThat(response.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_DSMCC);
+        assertThat(response.getRequestId()).isEqualTo(3);
+        assertThat(response.getResponseResult()).isEqualTo(
+                BroadcastInfoResponse.RESPONSE_RESULT_OK);
+        assertThat(response.getBiopMessageType()).isEqualTo(DsmccResponse.BIOP_MESSAGE_TYPE_FILE);
+        assertNotNull(response.getFile());
+
+        response = new DsmccResponse(3, 3, BroadcastInfoResponse.RESPONSE_RESULT_OK, true,
+                childList);
+        mInputSession.notifyBroadcastInfoResponse(response);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mBroadcastInfoResponseCount > 1);
+
+        response = (DsmccResponse) mSession.mBroadcastInfoResponse;
+        assertThat(mSession.mBroadcastInfoResponseCount).isEqualTo(2);
+        assertThat(response.getBiopMessageType()).isEqualTo(
+                DsmccResponse.BIOP_MESSAGE_TYPE_SERVICE_GATEWAY);
+        assertNotNull(response.getChildList());
+
+        response = new DsmccResponse(3, 3, BroadcastInfoResponse.RESPONSE_RESULT_OK, eventIds,
+                eventNames);
+        mInputSession.notifyBroadcastInfoResponse(response);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mBroadcastInfoResponseCount > 2);
+
+        response = (DsmccResponse) mSession.mBroadcastInfoResponse;
+        assertThat(mSession.mBroadcastInfoResponseCount).isEqualTo(3);
+        assertThat(response.getBiopMessageType()).isEqualTo(DsmccResponse.BIOP_MESSAGE_TYPE_STREAM);
+        assertNotNull(response.getStreamEventIds());
+        assertNotNull(response.getStreamEventNames());
+
+        fd.close();
+        tmpFile.delete();
+    }
+
+    @Test
+    public void testPesResponse() throws Throwable {
+        linkTvView();
+
+        PesResponse response = new PesResponse(4, 44, BroadcastInfoResponse.RESPONSE_RESULT_OK,
+                "testShardFilterToken");
+        mInputSession.notifyBroadcastInfoResponse(response);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mBroadcastInfoResponseCount > 0);
+
+        response = (PesResponse) mSession.mBroadcastInfoResponse;
+        assertThat(mSession.mBroadcastInfoResponseCount).isEqualTo(1);
+        assertThat(response.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_PES);
+        assertThat(response.getRequestId()).isEqualTo(4);
+        assertThat(response.getSequence()).isEqualTo(44);
+        assertThat(response.getResponseResult()).isEqualTo(
+                BroadcastInfoResponse.RESPONSE_RESULT_OK);
+        assertThat(response.getSharedFilterToken()).isEqualTo("testShardFilterToken");
+    }
+
+    @Test
+    public void testSectionResponse() throws Throwable {
+        linkTvView();
+
+        final Bundle bundle = createTestBundle();
+        SectionResponse response = new SectionResponse(5, 55,
+                BroadcastInfoResponse.RESPONSE_RESULT_OK, 555, 5555, bundle);
+        mInputSession.notifyBroadcastInfoResponse(response);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mBroadcastInfoResponseCount > 0);
+
+        response = (SectionResponse) mSession.mBroadcastInfoResponse;
+        assertThat(mSession.mBroadcastInfoResponseCount).isEqualTo(1);
+        assertThat(response.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_SECTION);
+        assertThat(response.getRequestId()).isEqualTo(5);
+        assertThat(response.getSequence()).isEqualTo(55);
+        assertThat(response.getResponseResult()).isEqualTo(
+                BroadcastInfoResponse.RESPONSE_RESULT_OK);
+        assertThat(response.getSessionId()).isEqualTo(555);
+        assertThat(response.getVersion()).isEqualTo(5555);
+        assertBundlesAreEqual(response.getSessionData(), bundle);
+    }
+
+    @Test
+    public void testStreamEventResponse() throws Throwable {
+        linkTvView();
+
+        final byte[] data = new byte[] {1, 2, 3};
+        StreamEventResponse response = new StreamEventResponse(6, 66,
+                BroadcastInfoResponse.RESPONSE_RESULT_OK, 666, 6666, data);
+        mInputSession.notifyBroadcastInfoResponse(response);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mBroadcastInfoResponseCount > 0);
+
+        response = (StreamEventResponse) mSession.mBroadcastInfoResponse;
+        assertThat(mSession.mBroadcastInfoResponseCount).isEqualTo(1);
+        assertThat(response.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_STREAM_EVENT);
+        assertThat(response.getRequestId()).isEqualTo(6);
+        assertThat(response.getSequence()).isEqualTo(66);
+        assertThat(response.getResponseResult()).isEqualTo(
+                BroadcastInfoResponse.RESPONSE_RESULT_OK);
+        assertThat(response.getEventId()).isEqualTo(666);
+        assertThat(response.getNptMillis()).isEqualTo(6666);
+        assertNotNull(response.getData());
+    }
+
+    @Test
+    public void testTableResponse() throws Throwable {
+        linkTvView();
+
+        final Uri uri = createTestUri();
+        TableResponse response = new TableResponse(7, 77, BroadcastInfoResponse.RESPONSE_RESULT_OK,
+                uri, 777, 7777);
+        mInputSession.notifyBroadcastInfoResponse(response);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mBroadcastInfoResponseCount > 0);
+
+        response = (TableResponse) mSession.mBroadcastInfoResponse;
+        assertThat(mSession.mBroadcastInfoResponseCount).isEqualTo(1);
+        assertThat(response.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_TABLE);
+        assertThat(response.getRequestId()).isEqualTo(7);
+        assertThat(response.getSequence()).isEqualTo(77);
+        assertThat(response.getResponseResult()).isEqualTo(
+                BroadcastInfoResponse.RESPONSE_RESULT_OK);
+        assertThat(response.getTableUri()).isEqualTo(uri);
+        assertThat(response.getVersion()).isEqualTo(777);
+        assertThat(response.getSize()).isEqualTo(7777);
+    }
+
+    @Test
+    public void testTimelineResponse() throws Throwable {
+        linkTvView();
+
+        TimelineResponse response = new TimelineResponse(8, 88,
+                BroadcastInfoResponse.RESPONSE_RESULT_OK, "test_selector", 1, 10, 100, 1000);
+        mInputSession.notifyBroadcastInfoResponse(response);
+        mInstrumentation.waitForIdleSync();
+        PollingCheck.waitFor(TIME_OUT_MS, () -> mSession.mBroadcastInfoResponseCount > 0);
+
+        response = (TimelineResponse) mSession.mBroadcastInfoResponse;
+        assertThat(mSession.mBroadcastInfoResponseCount).isEqualTo(1);
+        assertThat(response.getType()).isEqualTo(TvInputManager.BROADCAST_INFO_TYPE_TIMELINE);
+        assertThat(response.getRequestId()).isEqualTo(8);
+        assertThat(response.getSequence()).isEqualTo(88);
+        assertThat(response.getResponseResult()).isEqualTo(
+                BroadcastInfoResponse.RESPONSE_RESULT_OK);
+        assertThat(response.getSelector().toString()).isEqualTo("test_selector");
+        assertThat(response.getUnitsPerTick()).isEqualTo(1);
+        assertThat(response.getUnitsPerSecond()).isEqualTo(10);
+        assertThat(response.getWallClock()).isEqualTo(100);
+        assertThat(response.getTicks()).isEqualTo(1000);
+    }
+
+    @Test
+    public void testViewOnAttachedToWindow() {
+        mActivity.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                mTvIAppView.onAttachedToWindow();
+            }
+        });
+
+    }
+
+    @Test
+    public void testViewOnDetachedFromWindow() {
+        mTvIAppView.onDetachedFromWindow();
+    }
+
+    @Test
+    public void testViewOnLayout() {
+        int left = 1, top = 10, right = 5, bottom = 20;
+        mTvIAppView.onLayout(true, left, top, right, bottom);
+    }
+
+    @Test
+    public void testViewOnMeasure() {
+        int widthMeasureSpec = 5, heightMeasureSpec = 10;
+        mTvIAppView.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+
+    @Test
+    public void testViewOnVisibilityChanged() {
+        mTvIAppView.onVisibilityChanged(mTvIAppView, View.VISIBLE);
+    }
+
+    @Test
+    public void testOnUnhandledInputEvent() {
+        final int keyCode = KeyEvent.KEYCODE_Q;
+        final KeyEvent event = new KeyEvent(KeyEvent.ACTION_DOWN, keyCode);
+        mTvIAppView.onUnhandledInputEvent(event);
+    }
+
+    public static void assertKeyEventEquals(KeyEvent actual, KeyEvent expected) {
+        if (expected != null && actual != null) {
+            assertThat(actual.getDownTime()).isEqualTo(expected.getDownTime());
+            assertThat(actual.getEventTime()).isEqualTo(expected.getEventTime());
+            assertThat(actual.getAction()).isEqualTo(expected.getAction());
+            assertThat(actual.getKeyCode()).isEqualTo(expected.getKeyCode());
+            assertThat(actual.getRepeatCount()).isEqualTo(expected.getRepeatCount());
+            assertThat(actual.getMetaState()).isEqualTo(expected.getMetaState());
+            assertThat(actual.getDeviceId()).isEqualTo(expected.getDeviceId());
+            assertThat(actual.getScanCode()).isEqualTo(expected.getScanCode());
+            assertThat(actual.getFlags()).isEqualTo(expected.getFlags());
+            assertThat(actual.getSource()).isEqualTo(expected.getSource());
+            assertThat(actual.getCharacters()).isEqualTo(expected.getCharacters());
+        } else {
+            assertThat(actual).isEqualTo(expected);
+        }
+    }
+
+    private static void assertBundlesAreEqual(Bundle actual, Bundle expected) {
+        if (expected != null && actual != null) {
+            assertThat(actual.keySet()).isEqualTo(expected.keySet());
+            for (String key : expected.keySet()) {
+                assertThat(actual.get(key)).isEqualTo(expected.get(key));
+            }
+        } else {
+            assertThat(actual).isEqualTo(expected);
+        }
+    }
+}
diff --git a/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppViewStubActivity.java b/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppViewStubActivity.java
new file mode 100644
index 0000000..a57bbc2
--- /dev/null
+++ b/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppViewStubActivity.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 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 android.media.tv.interactive.cts;
+
+import android.app.Activity;
+import android.media.tv.TvView;
+import android.media.tv.interactive.TvInteractiveAppView;
+import android.os.Bundle;
+import android.tv.cts.R;
+
+public class TvInteractiveAppViewStubActivity extends Activity {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.tviappview_layout);
+    }
+
+    public TvInteractiveAppView getTvInteractiveAppView() {
+        return findViewById(R.id.tviappview);
+    }
+
+    public TvView getTvView() {
+        return findViewById(R.id.tviapp_tvview);
+    }
+}
diff --git a/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppViewTest.java b/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppViewTest.java
new file mode 100644
index 0000000..103eec9
--- /dev/null
+++ b/tests/tests/tv/src/android/media/tv/interactive/cts/TvInteractiveAppViewTest.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright (C) 2021 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 android.media.tv.interactive.cts;
+
+import static org.junit.Assert.assertNotNull;
+
+import android.app.Instrumentation;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.media.tv.interactive.TvInteractiveAppManager;
+import android.media.tv.interactive.TvInteractiveAppServiceInfo;
+import android.media.tv.interactive.TvInteractiveAppView;
+import android.os.ConditionVariable;
+import android.tv.cts.R;
+import android.view.InputEvent;
+
+import androidx.test.core.app.ActivityScenario;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.RequiredFeatureRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.concurrent.Executor;
+
+/**
+ * Test {@link android.media.tv.interactive.TvInteractiveAppView}.
+ */
+@RunWith(AndroidJUnit4.class)
+public class TvInteractiveAppViewTest {
+    private static final long TIME_OUT_MS = 20000L;
+
+    private Instrumentation mInstrumentation;
+    private ActivityScenario<TvInteractiveAppViewStubActivity> mActivityScenario;
+    private TvInteractiveAppViewStubActivity mActivity;
+    private TvInteractiveAppView mTvInteractiveAppView;
+    private TvInteractiveAppManager mManager;
+    private TvInteractiveAppServiceInfo mStubInfo;
+    private TvInteractiveAppView.OnUnhandledInputEventListener mOnUnhandledInputEventListener;
+
+    @Rule
+    public RequiredFeatureRule featureRule = new RequiredFeatureRule(
+            PackageManager.FEATURE_LIVE_TV);
+
+    private final MockCallback mCallback = new MockCallback();
+
+    public static class MockCallback extends TvInteractiveAppView.TvInteractiveAppCallback {
+        private String mInteractiveAppServiceId;
+        private int mState = -1;
+        private int mErr = -1;
+
+        @Override
+        public void onStateChanged(String interactiveAppServiceId, int state, int err) {
+            super.onStateChanged(interactiveAppServiceId, state, err);
+            mInteractiveAppServiceId = interactiveAppServiceId;
+            mState = state;
+            mErr = err;
+        }
+    }
+
+    private TvInteractiveAppView findTvInteractiveAppViewById(int id) {
+        return (TvInteractiveAppView) mActivity.findViewById(id);
+    }
+
+    private void runTestOnUiThread(final Runnable r) throws Throwable {
+        final Throwable[] exceptions = new Throwable[1];
+        mInstrumentation.runOnMainSync(new Runnable() {
+            public void run() {
+                try {
+                    r.run();
+                } catch (Throwable throwable) {
+                    exceptions[0] = throwable;
+                }
+            }
+        });
+        if (exceptions[0] != null) {
+            throw exceptions[0];
+        }
+    }
+
+    private Executor getExecutor() {
+        return Runnable::run;
+    }
+
+    @Before
+    public void setUp() throws Throwable {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setClass(
+                mInstrumentation.getTargetContext(), TvInteractiveAppViewStubActivity.class);
+
+        // DO NOT use ActivityScenario.launch(Class), which can cause ActivityNotFoundException
+        // related to BootstrapActivity.
+        mActivityScenario = ActivityScenario.launch(intent);
+        ConditionVariable activityReferenceObtained = new ConditionVariable();
+        mActivityScenario.onActivity(activity -> {
+            mActivity = activity;
+            activityReferenceObtained.open();
+        });
+        activityReferenceObtained.block(TIME_OUT_MS);
+
+        assertNotNull("Failed to acquire activity reference.", mActivity);
+        mTvInteractiveAppView = findTvInteractiveAppViewById(R.id.tviappview);
+        assertNotNull("Failed to find TvInteractiveAppView.", mTvInteractiveAppView);
+
+        mManager = (TvInteractiveAppManager) mActivity.getSystemService(
+                Context.TV_INTERACTIVE_APP_SERVICE);
+        assertNotNull("Failed to get TvInteractiveAppManager.", mManager);
+
+        for (TvInteractiveAppServiceInfo info : mManager.getTvInteractiveAppServiceList()) {
+            if (info.getServiceInfo().name.equals(StubTvInteractiveAppService.class.getName())) {
+                mStubInfo = info;
+            }
+        }
+        assertNotNull(mStubInfo);
+        mTvInteractiveAppView.setCallback(getExecutor(), mCallback);
+    }
+
+    @After
+    public void tearDown() throws Throwable {
+        runTestOnUiThread(new Runnable() {
+            public void run() {
+                mTvInteractiveAppView.clearCallback();
+                mTvInteractiveAppView.clearOnUnhandledInputEventListener();
+                mTvInteractiveAppView.reset();
+            }
+        });
+        mInstrumentation.waitForIdleSync();
+        mActivity = null;
+        mActivityScenario.close();
+    }
+
+    @Test
+    public void testConstructor() throws Throwable {
+        runTestOnUiThread(new Runnable() {
+            public void run() {
+                new TvInteractiveAppView(mActivity);
+                new TvInteractiveAppView(mActivity, null);
+                new TvInteractiveAppView(mActivity, null, 0);
+            }
+        });
+    }
+
+    @Test
+    public void testStartInteractiveApp() throws Throwable {
+        mTvInteractiveAppView.prepareInteractiveApp(mStubInfo.getId(), 1);
+        mInstrumentation.waitForIdleSync();
+        new PollingCheck(TIME_OUT_MS) {
+            @Override
+            protected boolean check() {
+                return mTvInteractiveAppView.getInteractiveAppSession() != null;
+            }
+        }.run();
+        mTvInteractiveAppView.startInteractiveApp();
+        new PollingCheck(TIME_OUT_MS) {
+            @Override
+            protected boolean check() {
+                return mCallback.mInteractiveAppServiceId == mStubInfo.getId()
+                        && mCallback.mState
+                        == TvInteractiveAppManager.INTERACTIVE_APP_STATE_RUNNING
+                        && mCallback.mErr == TvInteractiveAppManager.ERROR_NONE;
+            }
+        }.run();
+    }
+
+    @Test
+    public void testGetOnUnhandledInputEventListener() {
+        mOnUnhandledInputEventListener = new TvInteractiveAppView.OnUnhandledInputEventListener() {
+            @Override
+            public boolean onUnhandledInputEvent(InputEvent event) {
+                return true;
+            }
+        };
+        mTvInteractiveAppView.setOnUnhandledInputEventListener(getExecutor(),
+                mOnUnhandledInputEventListener);
+        new PollingCheck(TIME_OUT_MS) {
+            @Override
+            protected boolean check() {
+                return mTvInteractiveAppView.getOnUnhandledInputEventListener()
+                        == mOnUnhandledInputEventListener;
+            }
+        }.run();
+    }
+}
diff --git a/tests/tests/tv/src/android/media/tv/tuner/cts/ISharedFilterTestServer.aidl b/tests/tests/tv/src/android/media/tv/tuner/cts/ISharedFilterTestServer.aidl
new file mode 100644
index 0000000..2bf73a4
--- /dev/null
+++ b/tests/tests/tv/src/android/media/tv/tuner/cts/ISharedFilterTestServer.aidl
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2021 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 android.media.tv.tuner.cts;
+
+interface ISharedFilterTestServer {
+    String acquireSharedFilterToken();
+    void closeFilter();
+    void freeSharedFilterToken(String token);
+    boolean verifySharedFilter(String token);
+}
diff --git a/tests/tests/tv/src/android/media/tv/tuner/cts/ITunerResourceTestServer.aidl b/tests/tests/tv/src/android/media/tv/tuner/cts/ITunerResourceTestServer.aidl
new file mode 100644
index 0000000..199f0c0
--- /dev/null
+++ b/tests/tests/tv/src/android/media/tv/tuner/cts/ITunerResourceTestServer.aidl
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2021 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 android.media.tv.tuner.cts;
+
+interface ITunerResourceTestServer {
+    void createTuner(int useCase);
+    int tune(int frontendIndex);
+    oneway void tuneAsync(int frontendIndex);
+    void closeTuner();
+    boolean verifyTunerIsNull();
+}
diff --git a/tests/tests/tv/src/android/media/tv/tuner/cts/SharedFilterTestService.java b/tests/tests/tv/src/android/media/tv/tuner/cts/SharedFilterTestService.java
new file mode 100644
index 0000000..d8381fd
--- /dev/null
+++ b/tests/tests/tv/src/android/media/tv/tuner/cts/SharedFilterTestService.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2021 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 android.media.tv.tuner.cts;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.media.tv.tuner.Tuner;
+import android.media.tv.tuner.cts.ISharedFilterTestServer;
+import android.media.tv.tuner.filter.Filter;
+import android.media.tv.tuner.filter.FilterCallback;
+import android.media.tv.tuner.filter.FilterEvent;
+import android.media.tv.tuner.filter.SharedFilter;
+import android.media.tv.tuner.filter.SharedFilterCallback;
+import android.media.tv.tuner.frontend.FrontendInfo;
+import android.os.IBinder;
+import android.util.Log;
+
+import java.util.List;
+import java.util.concurrent.Executor;
+
+public class SharedFilterTestService extends Service {
+    private static final String TAG = "SharedFilterTestService";
+    private Context mContext = null;
+    private Tuner mTuner = null;
+    private Filter mFilter = null;
+    private boolean mTuning = false;
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        mContext = this;
+        mTuner = new Tuner(mContext, null, 100);
+        return new SharedFilterTestServer();
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        mTuner.close();
+        mTuner = null;
+        return false;
+    }
+
+    private class SharedFilterTestServer extends ISharedFilterTestServer.Stub {
+        @Override
+        public String acquireSharedFilterToken() {
+            mFilter = TunerTest.createTsSectionFilter(
+                    mTuner, getExecutor(), getFilterCallback());
+
+            // Tune a frontend before start the filter
+            List<FrontendInfo> infos = mTuner.getAvailableFrontendInfos();
+            mTuner.tune(TunerTest.createFrontendSettings(infos.get(0)));
+            mTuning = true;
+
+            return mFilter.acquireSharedFilterToken();
+        }
+
+        @Override
+        public void closeFilter() {
+            if (mTuning) {
+                mTuner.cancelTuning();
+                mTuning = false;
+            }
+            mFilter.close();
+            mFilter = null;
+        }
+
+        @Override
+        public void freeSharedFilterToken(String token) {
+            if (mTuning) {
+                mTuner.cancelTuning();
+                mTuning = false;
+            }
+            mFilter.freeSharedFilterToken(token);
+        }
+
+        @Override
+        public boolean verifySharedFilter(String token) {
+            SharedFilter f = Tuner.openSharedFilter(
+                    mContext, token, getExecutor(), getSharedFilterCallback());
+            if (f == null) {
+                Log.e(TAG, "SharedFilter is null");
+                return false;
+            }
+            if (f.start() != Tuner.RESULT_SUCCESS) {
+                f = null;
+                Log.e(TAG, "Failed to start SharedFilter");
+                return false;
+            }
+            if (f.flush() != Tuner.RESULT_SUCCESS) {
+                f.close();
+                f = null;
+                Log.e(TAG, "Failed to flush SharedFilter");
+                return false;
+            }
+            int size = f.read(new byte[3], 0, 3);
+            if (size < 0 || size > 3) {
+                f.close();
+                f = null;
+                Log.e(TAG, "Failed to read from SharedFilter");
+                return false;
+            }
+            if (f.stop() != Tuner.RESULT_SUCCESS) {
+                f.close();
+                f = null;
+                Log.e(TAG, "Failed to stop SharedFilter");
+                return false;
+            }
+            f.close();
+            f = null;
+            return true;
+        }
+    }
+
+    private FilterCallback getFilterCallback() {
+        return new FilterCallback() {
+            @Override
+            public void onFilterEvent(Filter filter, FilterEvent[] events) {}
+            @Override
+            public void onFilterStatusChanged(Filter filter, int status) {}
+        };
+    }
+
+    private SharedFilterCallback getSharedFilterCallback() {
+        return new SharedFilterCallback() {
+            @Override
+            public void onFilterEvent(SharedFilter filter, FilterEvent[] events) {}
+            @Override
+            public void onFilterStatusChanged(SharedFilter filter, int status) {}
+        };
+    }
+
+    private Executor getExecutor() { return Runnable::run; }
+}
diff --git a/tests/tests/tv/src/android/media/tv/tuner/cts/TunerDvrTest.java b/tests/tests/tv/src/android/media/tv/tuner/cts/TunerDvrTest.java
index 834acad..8d47bb6 100644
--- a/tests/tests/tv/src/android/media/tv/tuner/cts/TunerDvrTest.java
+++ b/tests/tests/tv/src/android/media/tv/tuner/cts/TunerDvrTest.java
@@ -160,6 +160,13 @@
         d.flush();
         assertEquals(3, d.read(3));
         assertEquals(3, d.read(new byte[3], 0, 3));
+        assertEquals(0, d.seek(0));
+        assertEquals(3, d.read(3));
+        assertEquals(3, d.read(new byte[3], 0, 3));
+        assertEquals(5, d.seek(5));
+        assertEquals(2, d.read(3));
+        assertEquals(10, d.seek(10));
+        assertEquals(0, d.read(3));
         d.stop();
         d.close();
 
diff --git a/tests/tests/tv/src/android/media/tv/tuner/cts/TunerFilterTest.java b/tests/tests/tv/src/android/media/tv/tuner/cts/TunerFilterTest.java
index bde450f..bca68cb 100644
--- a/tests/tests/tv/src/android/media/tv/tuner/cts/TunerFilterTest.java
+++ b/tests/tests/tv/src/android/media/tv/tuner/cts/TunerFilterTest.java
@@ -85,6 +85,7 @@
                 AvSettings
                         .builder(Filter.TYPE_TS, true) // is Audio
                         .setPassthrough(false)
+                        .setUseSecureMemory(false)
                         .setAudioStreamType(AvSettings.AUDIO_STREAM_TYPE_MPEG1)
                         .build();
 
@@ -94,10 +95,14 @@
         } else {
             assertEquals(settings.getAudioStreamType(), AvSettings.AUDIO_STREAM_TYPE_UNDEFINED);
         }
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            assertEquals(settings.useSecureMemory(), false);
+        }
 
         settings = AvSettings
                 .builder(Filter.TYPE_TS, false) // is Video
                 .setPassthrough(false)
+                .setUseSecureMemory(true)
                 .setVideoStreamType(AvSettings.VIDEO_STREAM_TYPE_MPEG1)
                 .build();
 
@@ -107,6 +112,9 @@
         } else {
             assertEquals(settings.getVideoStreamType(), AvSettings.VIDEO_STREAM_TYPE_UNDEFINED);
         }
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            assertEquals(settings.useSecureMemory(), true);
+        }
     }
 
     @Test
@@ -193,6 +201,48 @@
     }
 
     @Test
+    public void testMmtpSectionSettingsWithSectionBits() throws Exception {
+        SectionSettingsWithSectionBits settings =
+                SectionSettingsWithSectionBits.builder(Filter.TYPE_MMTP)
+                        .setCrcEnabled(true)
+                        .setBitWidthOfLengthField(16)
+                        .setRepeat(false)
+                        .setRaw(false)
+                        .setFilter(new byte[] {2, 3, 4})
+                        .setMask(new byte[] {7, 6, 5, 4})
+                        .setMode(new byte[] {22, 55, 33})
+                        .build();
+
+        assertTrue(settings.isCrcEnabled());
+        assertFalse(settings.isRepeat());
+        assertFalse(settings.isRaw());
+        assertEquals(settings.getLengthFieldBitWidth(), 16);
+        Assert.assertArrayEquals(new byte[] {2, 3, 4}, settings.getFilterBytes());
+        Assert.assertArrayEquals(new byte[] {7, 6, 5, 4}, settings.getMask());
+        Assert.assertArrayEquals(new byte[] {22, 55, 33}, settings.getMode());
+    }
+
+    @Test
+    public void testMMtpSectionSettingsWithTableInfo() throws Exception {
+        SectionSettingsWithTableInfo settings =
+                SectionSettingsWithTableInfo.builder(Filter.TYPE_MMTP)
+                        .setTableId(11)
+                        .setVersion(2)
+                        .setCrcEnabled(true)
+                        .setBitWidthOfLengthField(32)
+                        .setRepeat(true)
+                        .setRaw(true)
+                        .build();
+
+        assertEquals(11, settings.getTableId());
+        assertEquals(2, settings.getVersion());
+        assertTrue(settings.isCrcEnabled());
+        assertEquals(settings.getLengthFieldBitWidth(), 32);
+        assertTrue(settings.isRepeat());
+        assertTrue(settings.isRaw());
+    }
+
+    @Test
     public void testAlpFilterConfiguration() throws Exception {
         AlpFilterConfiguration config =
                 AlpFilterConfiguration
diff --git a/tests/tests/tv/src/android/media/tv/tuner/cts/TunerFrontendTest.java b/tests/tests/tv/src/android/media/tv/tuner/cts/TunerFrontendTest.java
index 9bd036a..2a923fe 100644
--- a/tests/tests/tv/src/android/media/tv/tuner/cts/TunerFrontendTest.java
+++ b/tests/tests/tv/src/android/media/tv/tuner/cts/TunerFrontendTest.java
@@ -99,7 +99,7 @@
     }
 
     @Test
-    public void testAnalogFrontendSettings() throws Exception {
+    public void testAnalogFrontendSettingsWithIntFrequency() throws Exception {
         AnalogFrontendSettings settings =
                 AnalogFrontendSettings
                         .builder()
@@ -136,7 +136,7 @@
     }
 
     @Test
-    public void testAtsc3FrontendSettings() throws Exception {
+    public void testAtsc3FrontendSettingsWithIntFrequency() throws Exception {
         Atsc3PlpSettings plp1 =
                 Atsc3PlpSettings
                         .builder()
@@ -201,7 +201,7 @@
     }
 
     @Test
-    public void testAtscFrontendSettings() throws Exception {
+    public void testAtscFrontendSettingsWithIntFrequency() throws Exception {
         AtscFrontendSettings settings =
                 AtscFrontendSettings
                         .builder()
@@ -227,7 +227,7 @@
     }
 
     @Test
-    public void testDvbcFrontendSettings() throws Exception {
+    public void testDvbcFrontendSettingsWithIntFrequency() throws Exception {
         DvbcFrontendSettings settings =
                 DvbcFrontendSettings
                         .builder()
@@ -267,7 +267,7 @@
     }
 
     @Test
-    public void testDvbsFrontendSettings() throws Exception {
+    public void testDvbsFrontendSettingsWithIntFrequency() throws Exception {
         DvbsCodeRate codeRate =
                 DvbsCodeRate
                         .builder()
@@ -328,7 +328,7 @@
     }
 
     @Test
-    public void testDvbtFrontendSettings() throws Exception {
+    public void testDvbtFrontendSettingsWithIntFrequency() throws Exception {
         DvbtFrontendSettings settings =
                 DvbtFrontendSettings
                         .builder()
@@ -382,7 +382,7 @@
     }
 
     @Test
-    public void testIsdbs3FrontendSettings() throws Exception {
+    public void testIsdbs3FrontendSettingsWithIntFrequency() throws Exception {
         Isdbs3FrontendSettings settings =
                 Isdbs3FrontendSettings
                         .builder()
@@ -418,7 +418,7 @@
     }
 
     @Test
-    public void testIsdbsFrontendSettings() throws Exception {
+    public void testIsdbsFrontendSettingsWithIntFrequency() throws Exception {
         IsdbsFrontendSettings settings =
                 IsdbsFrontendSettings
                         .builder()
@@ -455,28 +455,46 @@
     }
 
     @Test
-    public void testIsdbtFrontendSettings() throws Exception {
-        IsdbtFrontendSettings settings =
-                IsdbtFrontendSettings
-                        .builder()
-                        .setFrequency(9)
-                        .setModulation(IsdbtFrontendSettings.MODULATION_MOD_64QAM)
-                        .setBandwidth(IsdbtFrontendSettings.BANDWIDTH_8MHZ)
-                        .setMode(IsdbtFrontendSettings.MODE_2)
-                        .setCodeRate(DvbtFrontendSettings.CODERATE_7_8)
-                        .setGuardInterval(DvbtFrontendSettings.GUARD_INTERVAL_1_4)
-                        .setServiceAreaId(10)
-                        .build();
+    public void testIsdbtFrontendSettingsWithIntFrequency() throws Exception {
+        IsdbtFrontendSettings.Builder builder = IsdbtFrontendSettings.builder();
+        builder.setFrequency(9);
+        builder.setModulation(IsdbtFrontendSettings.MODULATION_MOD_64QAM);
+        builder.setBandwidth(IsdbtFrontendSettings.BANDWIDTH_8MHZ);
+        builder.setMode(IsdbtFrontendSettings.MODE_2);
+        builder.setCodeRate(DvbtFrontendSettings.CODERATE_7_8);
+        builder.setGuardInterval(DvbtFrontendSettings.GUARD_INTERVAL_1_4);
+        builder.setServiceAreaId(10);
 
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            IsdbtFrontendSettings.IsdbtLayerSettings.Builder layerBuilder =
+                    IsdbtFrontendSettings.IsdbtLayerSettings.builder();
+            layerBuilder.setTimeInterleaveMode(IsdbtFrontendSettings.TIME_INTERLEAVE_MODE_AUTO);
+            layerBuilder.setModulation(IsdbtFrontendSettings.MODULATION_MOD_16QAM);
+            layerBuilder.setCodeRate(DvbtFrontendSettings.CODERATE_5_6);
+            layerBuilder.setNumberOfSegments(0xFF);
+            IsdbtFrontendSettings.IsdbtLayerSettings layer = layerBuilder.build();
+            builder.setLayerSettings(new IsdbtFrontendSettings.IsdbtLayerSettings[] {layer, layer});
+            builder.setPartialReceptionFlag(IsdbtFrontendSettings.PARTIAL_RECEPTION_FLAG_TRUE);
+        }
+
+        IsdbtFrontendSettings settings = builder.build();
         settings.setSpectralInversion(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL);
         settings.setEndFrequency(100);
 
         assertEquals(FrontendSettings.TYPE_ISDBT, settings.getType());
         assertEquals(9, settings.getFrequency());
-        assertEquals(IsdbtFrontendSettings.MODULATION_MOD_64QAM, settings.getModulation());
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            assertEquals(IsdbtFrontendSettings.MODULATION_UNDEFINED, settings.getModulation());
+        } else {
+            assertEquals(IsdbtFrontendSettings.MODULATION_MOD_64QAM, settings.getModulation());
+        }
         assertEquals(IsdbtFrontendSettings.BANDWIDTH_8MHZ, settings.getBandwidth());
         assertEquals(IsdbtFrontendSettings.MODE_2, settings.getMode());
-        assertEquals(DvbtFrontendSettings.CODERATE_7_8, settings.getCodeRate());
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            assertEquals(DvbtFrontendSettings.CODERATE_UNDEFINED, settings.getCodeRate());
+        } else {
+            assertEquals(DvbtFrontendSettings.CODERATE_7_8, settings.getCodeRate());
+        }
         assertEquals(DvbtFrontendSettings.GUARD_INTERVAL_1_4, settings.getGuardInterval());
         assertEquals(10, settings.getServiceAreaId());
         if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
@@ -488,10 +506,27 @@
                     settings.getFrontendSpectralInversion());
             assertEquals(Tuner.INVALID_FRONTEND_SETTING_FREQUENCY, settings.getEndFrequency());
         }
+
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            IsdbtFrontendSettings.IsdbtLayerSettings[] layers = settings.getLayerSettings();
+            assertEquals(layers.length, 2);
+            assertEquals(layers[0].getModulation(), IsdbtFrontendSettings.MODULATION_MOD_16QAM);
+            assertEquals(layers[0].getCodeRate(), DvbtFrontendSettings.CODERATE_5_6);
+            assertEquals(layers[0].getTimeInterleaveMode(),
+                    IsdbtFrontendSettings.TIME_INTERLEAVE_MODE_AUTO);
+            assertEquals(layers[0].getNumberOfSegments(), 0xFF);
+            assertEquals(layers[1].getModulation(), IsdbtFrontendSettings.MODULATION_MOD_16QAM);
+            assertEquals(layers[1].getCodeRate(), DvbtFrontendSettings.CODERATE_5_6);
+            assertEquals(layers[1].getTimeInterleaveMode(),
+                    IsdbtFrontendSettings.TIME_INTERLEAVE_MODE_AUTO);
+            assertEquals(layers[1].getNumberOfSegments(), 0xFF);
+            assertEquals(settings.getPartialReceptionFlag(),
+                    IsdbtFrontendSettings.PARTIAL_RECEPTION_FLAG_TRUE);
+        }
     }
 
     @Test
-    public void testDtmbFrontendSettings() throws Exception {
+    public void testDtmbFrontendSettingsWithIntFrequency() throws Exception {
         if (!TunerVersionChecker.checkHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1,
                 TAG + ": testDtmbFrontendSettings")) {
             return;
@@ -521,8 +556,9 @@
     }
 
     @Test
-    public void testFrontendInfo() throws Exception {
+    public void testFrontendInfoWithIntFrequency() throws Exception {
         List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null) return;
         List<FrontendInfo> infos = mTuner.getAvailableFrontendInfos();
         Map<Integer, FrontendInfo> infoMap = new HashMap<>();
         for (FrontendInfo info : infos) {
@@ -583,6 +619,526 @@
         assertTrue(infoMap.isEmpty());
     }
 
+    @Test
+    public void testAnalogFrontendSettingsWithLongFrequency() throws Exception {
+        AnalogFrontendSettings settings =
+                AnalogFrontendSettings
+                        .builder()
+                        .setFrequencyLong(1)
+                        .setSignalType(AnalogFrontendSettings.SIGNAL_TYPE_NTSC)
+                        .setSifStandard(AnalogFrontendSettings.SIF_BG_NICAM)
+                        .setAftFlag(AnalogFrontendSettings.AFT_FLAG_TRUE)
+                        .build();
+
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            settings.setSpectralInversion(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL);
+            settings.setEndFrequencyLong(100);
+        } else {
+            settings.setSpectralInversion(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL);
+            settings.setEndFrequencyLong(Tuner.INVALID_FRONTEND_SETTING_FREQUENCY);
+        }
+
+        assertEquals(FrontendSettings.TYPE_ANALOG, settings.getType());
+        assertEquals(1, settings.getFrequencyLong());
+        assertEquals(AnalogFrontendSettings.SIGNAL_TYPE_NTSC, settings.getSignalType());
+        assertEquals(AnalogFrontendSettings.SIF_BG_NICAM, settings.getSifStandard());
+        assertEquals(AnalogFrontendSettings.AFT_FLAG_TRUE, settings.getAftFlag());
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            assertEquals(AnalogFrontendSettings.AFT_FLAG_TRUE, settings.getAftFlag());
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(100, settings.getEndFrequencyLong());
+        } else {
+            assertEquals(AnalogFrontendSettings.AFT_FLAG_UNDEFINED, settings.getAftFlag());
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_UNDEFINED,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(Tuner.INVALID_FRONTEND_SETTING_FREQUENCY, settings.getEndFrequencyLong());
+        }
+    }
+
+    @Test
+    public void testAtsc3FrontendSettingsWithLongFrequency() throws Exception {
+        Atsc3PlpSettings plp1 =
+                Atsc3PlpSettings
+                        .builder()
+                        .setPlpId(1)
+                        .setModulation(Atsc3FrontendSettings.MODULATION_MOD_QPSK)
+                        .setInterleaveMode(Atsc3FrontendSettings.TIME_INTERLEAVE_MODE_AUTO)
+                        .setCodeRate(Atsc3FrontendSettings.CODERATE_6_15)
+                        .setFec(Atsc3FrontendSettings.FEC_BCH_LDPC_64K)
+                        .build();
+
+        Atsc3PlpSettings plp2 =
+                Atsc3PlpSettings
+                        .builder()
+                        .setPlpId(2)
+                        .setModulation(Atsc3FrontendSettings.MODULATION_MOD_QPSK)
+                        .setInterleaveMode(Atsc3FrontendSettings.TIME_INTERLEAVE_MODE_HTI)
+                        .setCodeRate(Atsc3FrontendSettings.CODERATE_UNDEFINED)
+                        .setFec(Atsc3FrontendSettings.FEC_LDPC_16K)
+                        .build();
+
+        Atsc3FrontendSettings settings =
+                Atsc3FrontendSettings
+                        .builder()
+                        .setFrequencyLong(2)
+                        .setBandwidth(Atsc3FrontendSettings.BANDWIDTH_BANDWIDTH_6MHZ)
+                        .setDemodOutputFormat(Atsc3FrontendSettings.MODULATION_MOD_QPSK)
+                        .setPlpSettings(new Atsc3PlpSettings[] {plp1, plp2})
+                        .build();
+
+        settings.setSpectralInversion(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL);
+        settings.setEndFrequencyLong(100);
+
+        assertEquals(FrontendSettings.TYPE_ATSC3, settings.getType());
+        assertEquals(2, settings.getFrequencyLong());
+        assertEquals(Atsc3FrontendSettings.BANDWIDTH_BANDWIDTH_6MHZ, settings.getBandwidth());
+        assertEquals(Atsc3FrontendSettings.MODULATION_MOD_QPSK, settings.getDemodOutputFormat());
+
+        Atsc3PlpSettings[] plps = settings.getPlpSettings();
+        assertEquals(2, plps.length);
+
+        assertEquals(1, plps[0].getPlpId());
+        assertEquals(Atsc3FrontendSettings.MODULATION_MOD_QPSK, plps[0].getModulation());
+        assertEquals(Atsc3FrontendSettings.TIME_INTERLEAVE_MODE_AUTO, plps[0].getInterleaveMode());
+        assertEquals(Atsc3FrontendSettings.CODERATE_6_15, plps[0].getCodeRate());
+        assertEquals(Atsc3FrontendSettings.FEC_BCH_LDPC_64K, plps[0].getFec());
+
+        assertEquals(2, plps[1].getPlpId());
+        assertEquals(Atsc3FrontendSettings.MODULATION_MOD_QPSK, plps[1].getModulation());
+        assertEquals(Atsc3FrontendSettings.TIME_INTERLEAVE_MODE_HTI, plps[1].getInterleaveMode());
+        assertEquals(Atsc3FrontendSettings.CODERATE_UNDEFINED, plps[1].getCodeRate());
+        assertEquals(Atsc3FrontendSettings.FEC_LDPC_16K, plps[1].getFec());
+
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(100, settings.getEndFrequencyLong());
+        } else {
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_UNDEFINED,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(Tuner.INVALID_FRONTEND_SETTING_FREQUENCY, settings.getEndFrequencyLong());
+        }
+    }
+
+    @Test
+    public void testAtscFrontendSettingsWithLongFrequency() throws Exception {
+        AtscFrontendSettings settings =
+                AtscFrontendSettings
+                        .builder()
+                        .setFrequencyLong(3)
+                        .setModulation(AtscFrontendSettings.MODULATION_MOD_8VSB)
+                        .build();
+
+        settings.setSpectralInversion(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL);
+        settings.setEndFrequencyLong(100);
+
+        assertEquals(FrontendSettings.TYPE_ATSC, settings.getType());
+        assertEquals(3, settings.getFrequencyLong());
+        assertEquals(AtscFrontendSettings.MODULATION_MOD_8VSB, settings.getModulation());
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(100, settings.getEndFrequencyLong());
+        } else {
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_UNDEFINED,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(Tuner.INVALID_FRONTEND_SETTING_FREQUENCY, settings.getEndFrequencyLong());
+        }
+    }
+
+    @Test
+    public void testDvbcFrontendSettingsWithLongFrequency() throws Exception {
+        DvbcFrontendSettings settings =
+                DvbcFrontendSettings
+                        .builder()
+                        .setFrequencyLong(4)
+                        .setModulation(DvbcFrontendSettings.MODULATION_MOD_32QAM)
+                        .setInnerFec(FrontendSettings.FEC_8_15)
+                        .setSymbolRate(3)
+                        .setOuterFec(DvbcFrontendSettings.OUTER_FEC_OUTER_FEC_RS)
+                        .setAnnex(DvbcFrontendSettings.ANNEX_B)
+                        .setTimeInterleaveMode(DvbcFrontendSettings.TIME_INTERLEAVE_MODE_AUTO)
+                        .setBandwidth(DvbcFrontendSettings.BANDWIDTH_5MHZ)
+                        // DvbcFrontendSettings.SpectralInversion is deprecated in Android 12. Use
+                        // FrontendSettings.FrontendSpectralInversion instead.
+                        .setSpectralInversion(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL)
+                        .build();
+
+        settings.setEndFrequencyLong(100);
+
+        assertEquals(FrontendSettings.TYPE_DVBC, settings.getType());
+        assertEquals(4, settings.getFrequencyLong());
+        assertEquals(DvbcFrontendSettings.MODULATION_MOD_32QAM, settings.getModulation());
+        assertEquals(FrontendSettings.FEC_8_15, settings.getInnerFec());
+        assertEquals(3, settings.getSymbolRate());
+        assertEquals(DvbcFrontendSettings.OUTER_FEC_OUTER_FEC_RS, settings.getOuterFec());
+        assertEquals(DvbcFrontendSettings.ANNEX_B, settings.getAnnex());
+        assertEquals(DvbcFrontendSettings.TIME_INTERLEAVE_MODE_AUTO,
+                settings.getTimeInterleaveMode());
+        assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL,
+                settings.getSpectralInversion());
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            assertEquals(100, settings.getEndFrequencyLong());
+            assertEquals(DvbcFrontendSettings.BANDWIDTH_5MHZ, settings.getBandwidth());
+        } else {
+            assertEquals(Tuner.INVALID_FRONTEND_SETTING_FREQUENCY, settings.getEndFrequencyLong());
+            assertEquals(DvbcFrontendSettings.BANDWIDTH_UNDEFINED, settings.getBandwidth());
+        }
+    }
+
+    @Test
+    public void testDvbsFrontendSettingsWithLongFrequency() throws Exception {
+        DvbsCodeRate codeRate =
+                DvbsCodeRate
+                        .builder()
+                        .setInnerFec(FrontendSettings.FEC_9_10)
+                        .setLinear(true)
+                        .setShortFrameEnabled(false)
+                        .setBitsPer1000Symbol(55)
+                        .build();
+
+        DvbsFrontendSettings settings =
+                DvbsFrontendSettings
+                        .builder()
+                        .setFrequencyLong(5)
+                        .setModulation(DvbsFrontendSettings.MODULATION_MOD_ACM)
+                        .setCodeRate(codeRate)
+                        .setSymbolRate(3)
+                        .setRolloff(DvbsFrontendSettings.ROLLOFF_0_15)
+                        .setPilot(DvbsFrontendSettings.PILOT_OFF)
+                        .setInputStreamId(1)
+                        .setStandard(DvbsFrontendSettings.STANDARD_S2)
+                        .setVcmMode(DvbsFrontendSettings.VCM_MODE_MANUAL)
+                        .setScanType(DvbsFrontendSettings.SCAN_TYPE_DIRECT)
+                        .setCanHandleDiseqcRxMessage(true)
+                        .build();
+
+        settings.setSpectralInversion(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL);
+        settings.setEndFrequencyLong(100);
+
+        assertEquals(FrontendSettings.TYPE_DVBS, settings.getType());
+        assertEquals(5, settings.getFrequencyLong());
+        assertEquals(DvbsFrontendSettings.MODULATION_MOD_ACM, settings.getModulation());
+        assertEquals(3, settings.getSymbolRate());
+        assertEquals(DvbsFrontendSettings.ROLLOFF_0_15, settings.getRolloff());
+        assertEquals(DvbsFrontendSettings.PILOT_OFF, settings.getPilot());
+        assertEquals(1, settings.getInputStreamId());
+        assertEquals(DvbsFrontendSettings.STANDARD_S2, settings.getStandard());
+        assertEquals(DvbsFrontendSettings.VCM_MODE_MANUAL, settings.getVcmMode());
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            assertEquals(DvbsFrontendSettings.SCAN_TYPE_DIRECT, settings.getScanType());
+            assertTrue(settings.canHandleDiseqcRxMessage());
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(100, settings.getEndFrequencyLong());
+        } else {
+            assertEquals(DvbsFrontendSettings.SCAN_TYPE_UNDEFINED, settings.getScanType());
+            assertFalse(settings.canHandleDiseqcRxMessage());
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_UNDEFINED,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(Tuner.INVALID_FRONTEND_SETTING_FREQUENCY, settings.getEndFrequencyLong());
+        }
+
+        DvbsCodeRate cr = settings.getCodeRate();
+        assertNotNull(cr);
+        assertEquals(FrontendSettings.FEC_9_10, cr.getInnerFec());
+        assertEquals(true, cr.isLinear());
+        assertEquals(false, cr.isShortFrameEnabled());
+        assertEquals(55, cr.getBitsPer1000Symbol());
+    }
+
+    @Test
+    public void testDvbtFrontendSettingsWithLongFrequency() throws Exception {
+        DvbtFrontendSettings settings =
+                DvbtFrontendSettings
+                        .builder()
+                        .setFrequencyLong(6)
+                        .setTransmissionMode(DvbtFrontendSettings.TRANSMISSION_MODE_EXTENDED_32K)
+                        .setBandwidth(DvbtFrontendSettings.BANDWIDTH_1_7MHZ)
+                        .setConstellation(DvbtFrontendSettings.CONSTELLATION_16QAM_R)
+                        .setHierarchy(DvbtFrontendSettings.HIERARCHY_4_NATIVE)
+                        .setHighPriorityCodeRate(DvbtFrontendSettings.CODERATE_6_7)
+                        .setLowPriorityCodeRate(DvbtFrontendSettings.CODERATE_2_3)
+                        .setGuardInterval(DvbtFrontendSettings.GUARD_INTERVAL_19_128)
+                        .setHighPriority(true)
+                        .setStandard(DvbtFrontendSettings.STANDARD_T2)
+                        .setMiso(false)
+                        .setPlpMode(DvbtFrontendSettings.PLP_MODE_MANUAL)
+                        .setPlpId(333)
+                        .setPlpGroupId(777)
+                        .build();
+
+        settings.setSpectralInversion(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL);
+        settings.setEndFrequencyLong(100);
+
+        assertEquals(FrontendSettings.TYPE_DVBT, settings.getType());
+        assertEquals(6, settings.getFrequencyLong());
+        assertEquals(DvbtFrontendSettings.BANDWIDTH_1_7MHZ, settings.getBandwidth());
+        assertEquals(DvbtFrontendSettings.HIERARCHY_4_NATIVE, settings.getHierarchy());
+        assertEquals(DvbtFrontendSettings.CODERATE_6_7, settings.getHighPriorityCodeRate());
+        assertEquals(DvbtFrontendSettings.CODERATE_2_3, settings.getLowPriorityCodeRate());
+        assertEquals(DvbtFrontendSettings.GUARD_INTERVAL_19_128, settings.getGuardInterval());
+        assertEquals(true, settings.isHighPriority());
+        assertEquals(DvbtFrontendSettings.STANDARD_T2, settings.getStandard());
+        assertEquals(false, settings.isMiso());
+        assertEquals(DvbtFrontendSettings.PLP_MODE_MANUAL, settings.getPlpMode());
+        assertEquals(333, settings.getPlpId());
+        assertEquals(777, settings.getPlpGroupId());
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            assertEquals(DvbtFrontendSettings.TRANSMISSION_MODE_EXTENDED_32K,
+                    settings.getTransmissionMode());
+            assertEquals(DvbtFrontendSettings.CONSTELLATION_16QAM_R, settings.getConstellation());
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(100, settings.getEndFrequencyLong());
+        } else {
+            assertEquals(DvbtFrontendSettings.TRANSMISSION_MODE_UNDEFINED,
+                    settings.getTransmissionMode());
+            assertEquals(DvbtFrontendSettings.CONSTELLATION_UNDEFINED, settings.getConstellation());
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_UNDEFINED,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(Tuner.INVALID_FRONTEND_SETTING_FREQUENCY, settings.getEndFrequencyLong());
+        }
+    }
+
+    @Test
+    public void testIsdbs3FrontendSettingsWithLongFrequency() throws Exception {
+        Isdbs3FrontendSettings settings =
+                Isdbs3FrontendSettings
+                        .builder()
+                        .setFrequencyLong(7)
+                        .setStreamId(2)
+                        .setStreamIdType(IsdbsFrontendSettings.STREAM_ID_TYPE_ID)
+                        .setModulation(Isdbs3FrontendSettings.MODULATION_MOD_BPSK)
+                        .setCodeRate(Isdbs3FrontendSettings.CODERATE_1_3)
+                        .setSymbolRate(555)
+                        .setRolloff(Isdbs3FrontendSettings.ROLLOFF_0_03)
+                        .build();
+
+        settings.setSpectralInversion(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL);
+        settings.setEndFrequencyLong(100);
+
+        assertEquals(FrontendSettings.TYPE_ISDBS3, settings.getType());
+        assertEquals(7, settings.getFrequencyLong());
+        assertEquals(2, settings.getStreamId());
+        assertEquals(IsdbsFrontendSettings.STREAM_ID_TYPE_ID, settings.getStreamIdType());
+        assertEquals(Isdbs3FrontendSettings.MODULATION_MOD_BPSK, settings.getModulation());
+        assertEquals(Isdbs3FrontendSettings.CODERATE_1_3, settings.getCodeRate());
+        assertEquals(555, settings.getSymbolRate());
+        assertEquals(Isdbs3FrontendSettings.ROLLOFF_0_03, settings.getRolloff());
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(100, settings.getEndFrequencyLong());
+        } else {
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_UNDEFINED,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(Tuner.INVALID_FRONTEND_SETTING_FREQUENCY, settings.getEndFrequencyLong());
+        }
+    }
+
+    @Test
+    public void testIsdbsFrontendSettingsWithLongFrequency() throws Exception {
+        IsdbsFrontendSettings settings =
+                IsdbsFrontendSettings
+                        .builder()
+                        .setFrequencyLong(8)
+                        .setStreamId(3)
+                        .setStreamIdType(IsdbsFrontendSettings.STREAM_ID_TYPE_RELATIVE_NUMBER)
+                        .setModulation(IsdbsFrontendSettings.MODULATION_AUTO)
+                        .setCodeRate(IsdbsFrontendSettings.CODERATE_3_4)
+                        .setSymbolRate(667)
+                        .setRolloff(IsdbsFrontendSettings.ROLLOFF_0_35)
+                        .build();
+
+        settings.setSpectralInversion(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL);
+        settings.setEndFrequencyLong(100);
+
+        assertEquals(FrontendSettings.TYPE_ISDBS, settings.getType());
+        assertEquals(8, settings.getFrequencyLong());
+        assertEquals(3, settings.getStreamId());
+        assertEquals(
+                IsdbsFrontendSettings.STREAM_ID_TYPE_RELATIVE_NUMBER, settings.getStreamIdType());
+        assertEquals(IsdbsFrontendSettings.MODULATION_AUTO, settings.getModulation());
+        assertEquals(IsdbsFrontendSettings.CODERATE_3_4, settings.getCodeRate());
+        assertEquals(667, settings.getSymbolRate());
+        assertEquals(IsdbsFrontendSettings.ROLLOFF_0_35, settings.getRolloff());
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(100, settings.getEndFrequencyLong());
+        } else {
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_UNDEFINED,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(Tuner.INVALID_FRONTEND_SETTING_FREQUENCY, settings.getEndFrequencyLong());
+        }
+    }
+
+    @Test
+    public void testIsdbtFrontendSettingsWithLongFrequency() throws Exception {
+        IsdbtFrontendSettings.Builder builder = IsdbtFrontendSettings.builder();
+        builder.setFrequencyLong(9);
+        builder.setModulation(IsdbtFrontendSettings.MODULATION_MOD_64QAM);
+        builder.setBandwidth(IsdbtFrontendSettings.BANDWIDTH_8MHZ);
+        builder.setMode(IsdbtFrontendSettings.MODE_2);
+        builder.setCodeRate(DvbtFrontendSettings.CODERATE_7_8);
+        builder.setGuardInterval(DvbtFrontendSettings.GUARD_INTERVAL_1_4);
+        builder.setServiceAreaId(10);
+
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            IsdbtFrontendSettings.IsdbtLayerSettings.Builder layerBuilder =
+                    IsdbtFrontendSettings.IsdbtLayerSettings.builder();
+            layerBuilder.setTimeInterleaveMode(IsdbtFrontendSettings.TIME_INTERLEAVE_MODE_AUTO);
+            layerBuilder.setModulation(IsdbtFrontendSettings.MODULATION_MOD_16QAM);
+            layerBuilder.setCodeRate(DvbtFrontendSettings.CODERATE_5_6);
+            layerBuilder.setNumberOfSegments(0xFF);
+            IsdbtFrontendSettings.IsdbtLayerSettings layer = layerBuilder.build();
+            builder.setLayerSettings(new IsdbtFrontendSettings.IsdbtLayerSettings[] {layer, layer});
+            builder.setPartialReceptionFlag(IsdbtFrontendSettings.PARTIAL_RECEPTION_FLAG_TRUE);
+        }
+
+        IsdbtFrontendSettings settings = builder.build();
+        settings.setSpectralInversion(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL);
+        settings.setEndFrequencyLong(100);
+
+        assertEquals(FrontendSettings.TYPE_ISDBT, settings.getType());
+        assertEquals(9, settings.getFrequencyLong());
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            assertEquals(IsdbtFrontendSettings.MODULATION_UNDEFINED, settings.getModulation());
+        } else {
+            assertEquals(IsdbtFrontendSettings.MODULATION_MOD_64QAM, settings.getModulation());
+        }
+        assertEquals(IsdbtFrontendSettings.BANDWIDTH_8MHZ, settings.getBandwidth());
+        assertEquals(IsdbtFrontendSettings.MODE_2, settings.getMode());
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            assertEquals(DvbtFrontendSettings.CODERATE_UNDEFINED, settings.getCodeRate());
+        } else {
+            assertEquals(DvbtFrontendSettings.CODERATE_7_8, settings.getCodeRate());
+        }
+        assertEquals(DvbtFrontendSettings.GUARD_INTERVAL_1_4, settings.getGuardInterval());
+        assertEquals(10, settings.getServiceAreaId());
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_NORMAL,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(100, settings.getEndFrequencyLong());
+        } else {
+            assertEquals(FrontendSettings.FRONTEND_SPECTRAL_INVERSION_UNDEFINED,
+                    settings.getFrontendSpectralInversion());
+            assertEquals(Tuner.INVALID_FRONTEND_SETTING_FREQUENCY, settings.getEndFrequencyLong());
+        }
+
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            IsdbtFrontendSettings.IsdbtLayerSettings[] layers = settings.getLayerSettings();
+            assertEquals(layers.length, 2);
+            assertEquals(layers[0].getModulation(), IsdbtFrontendSettings.MODULATION_MOD_16QAM);
+            assertEquals(layers[0].getCodeRate(), DvbtFrontendSettings.CODERATE_5_6);
+            assertEquals(layers[0].getTimeInterleaveMode(),
+                    IsdbtFrontendSettings.TIME_INTERLEAVE_MODE_AUTO);
+            assertEquals(layers[0].getNumberOfSegments(), 0xFF);
+            assertEquals(layers[1].getModulation(), IsdbtFrontendSettings.MODULATION_MOD_16QAM);
+            assertEquals(layers[1].getCodeRate(), DvbtFrontendSettings.CODERATE_5_6);
+            assertEquals(layers[1].getTimeInterleaveMode(),
+                    IsdbtFrontendSettings.TIME_INTERLEAVE_MODE_AUTO);
+            assertEquals(layers[1].getNumberOfSegments(), 0xFF);
+            assertEquals(settings.getPartialReceptionFlag(),
+                    IsdbtFrontendSettings.PARTIAL_RECEPTION_FLAG_TRUE);
+        }
+    }
+
+    @Test
+    public void testDtmbFrontendSettingsWithLongFrequency() throws Exception {
+        if (!TunerVersionChecker.checkHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1,
+                TAG + ": testDtmbFrontendSettings")) {
+            return;
+        }
+        DtmbFrontendSettings settings =
+                DtmbFrontendSettings
+                        .builder()
+                        .setFrequencyLong(6)
+                        .setModulation(DtmbFrontendSettings.MODULATION_CONSTELLATION_4QAM)
+                        .setCodeRate(DtmbFrontendSettings.CODERATE_2_5)
+                        .setTransmissionMode(DtmbFrontendSettings.TRANSMISSION_MODE_C1)
+                        .setBandwidth(DtmbFrontendSettings.BANDWIDTH_8MHZ)
+                        .setTimeInterleaveMode(
+                                DtmbFrontendSettings.TIME_INTERLEAVE_MODE_TIMER_INT_240)
+                        .setGuardInterval(DtmbFrontendSettings.GUARD_INTERVAL_PN_945_VARIOUS)
+                        .build();
+        assertEquals(FrontendSettings.TYPE_DTMB, settings.getType());
+        assertEquals(6, settings.getFrequencyLong());
+        assertEquals(DtmbFrontendSettings.TRANSMISSION_MODE_C1, settings.getTransmissionMode());
+        assertEquals(DtmbFrontendSettings.BANDWIDTH_8MHZ, settings.getBandwidth());
+        assertEquals(DtmbFrontendSettings.MODULATION_CONSTELLATION_4QAM, settings.getModulation());
+        assertEquals(DtmbFrontendSettings.TIME_INTERLEAVE_MODE_TIMER_INT_240,
+                settings.getTimeInterleaveMode());
+        assertEquals(DtmbFrontendSettings.CODERATE_2_5, settings.getCodeRate());
+        assertEquals(DtmbFrontendSettings.GUARD_INTERVAL_PN_945_VARIOUS,
+                settings.getGuardInterval());
+    }
+
+    @Test
+    public void testFrontendInfoWithLongFrequency() throws Exception {
+        List<Integer> ids = mTuner.getFrontendIds();
+        List<FrontendInfo> infos = mTuner.getAvailableFrontendInfos();
+        Map<Integer, FrontendInfo> infoMap = new HashMap<>();
+        for (FrontendInfo info : infos) {
+            infoMap.put(info.getId(), info);
+        }
+        for (int id : ids) {
+            FrontendInfo info = mTuner.getFrontendInfoById(id);
+            FrontendInfo infoFromMap = infoMap.get(id);
+            assertNotNull(info);
+            assertThat(info).isEqualTo(infoFromMap);
+            assertEquals(id, info.getId());
+            assertTrue(info.getFrequencyRangeLong().getLower() > 0);
+            assertTrue(info.getSymbolRateRange().getLower() >= 0);
+            assertTrue(info.getAcquireRangeLong() > 0);
+            info.getExclusiveGroupId();
+            info.getStatusCapabilities();
+
+            FrontendCapabilities caps = info.getFrontendCapabilities();
+            if (info.getType() <= FrontendSettings.TYPE_ISDBT) {
+                assertNotNull(caps);
+            }
+            switch(info.getType()) {
+                case FrontendSettings.TYPE_ANALOG:
+                    testAnalogFrontendCapabilities(caps);
+                    break;
+                case FrontendSettings.TYPE_ATSC3:
+                    testAtsc3FrontendCapabilities(caps);
+                    break;
+                case FrontendSettings.TYPE_ATSC:
+                    testAtscFrontendCapabilities(caps);
+                    break;
+                case FrontendSettings.TYPE_DVBC:
+                    testDvbcFrontendCapabilities(caps);
+                    break;
+                case FrontendSettings.TYPE_DVBS:
+                    testDvbsFrontendCapabilities(caps);
+                    break;
+                case FrontendSettings.TYPE_DVBT:
+                    testDvbtFrontendCapabilities(caps);
+                    break;
+                case FrontendSettings.TYPE_ISDBS3:
+                    testIsdbs3FrontendCapabilities(caps);
+                    break;
+                case FrontendSettings.TYPE_ISDBS:
+                    testIsdbsFrontendCapabilities(caps);
+                    break;
+                case FrontendSettings.TYPE_ISDBT:
+                    testIsdbtFrontendCapabilities(caps);
+                    break;
+                case FrontendSettings.TYPE_DTMB:
+                    testDtmbFrontendCapabilities(caps);
+                    break;
+                default:
+                    break;
+            }
+            infoMap.remove(id);
+        }
+        assertTrue(infoMap.isEmpty());
+    }
+
     private void testAnalogFrontendCapabilities(FrontendCapabilities caps) throws Exception {
         assertTrue(caps instanceof AnalogFrontendCapabilities);
         AnalogFrontendCapabilities analogCaps = (AnalogFrontendCapabilities) caps;
@@ -660,6 +1216,9 @@
         isdbtCaps.getModulationCapability();
         isdbtCaps.getCodeRateCapability();
         isdbtCaps.getGuardIntervalCapability();
+        isdbtCaps.getTimeInterleaveModeCapability();
+        isdbtCaps.isSegmentAutoSupported();
+        isdbtCaps.isFullSegmentSupported();
     }
 
     private void testDtmbFrontendCapabilities(FrontendCapabilities caps) throws Exception {
diff --git a/tests/tests/tv/src/android/media/tv/tuner/cts/TunerResourceTestService.java b/tests/tests/tv/src/android/media/tv/tuner/cts/TunerResourceTestService.java
new file mode 100644
index 0000000..e714508
--- /dev/null
+++ b/tests/tests/tv/src/android/media/tv/tuner/cts/TunerResourceTestService.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2021 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 android.media.tv.tuner.cts;
+
+import android.app.Service;
+import android.content.Context;
+import android.content.Intent;
+import android.hardware.tv.tuner.Result;
+import android.media.tv.tuner.Tuner;
+import android.media.tv.tuner.frontend.FrontendInfo;
+import android.media.tv.tuner.frontend.FrontendSettings;
+import android.os.IBinder;
+import android.util.Log;
+
+import java.util.List;
+
+public class TunerResourceTestService extends Service {
+    private static final String TAG = "TunerResourceTestService";
+    private Context mContext = null;
+    private Tuner mTuner = null;
+    private FrontendSettings mFeSettings;
+    private FrontendInfo mFeInfo;
+    private final Object mLock = new Object();
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        mContext = this;
+        return mBinder;
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        synchronized (mLock) {
+            closeTunerInternal();
+            return false;
+        }
+    }
+
+    private void closeTunerInternal() {
+        if (mTuner != null) {
+            mTuner.close();
+            mTuner = null;
+        }
+    }
+
+    private int tuneInternal(int frontendIndex) {
+        // make sure mTuner is not null
+        if (mTuner == null) {
+            Log.e(TAG, "tune called on null tuner");
+            return Result.INVALID_STATE;
+        }
+
+        // construct FrontendSettings to tune
+        List<FrontendInfo> infos = mTuner.getAvailableFrontendInfos();
+        mFeInfo = infos.get(frontendIndex);
+        mFeSettings = TunerTest.createFrontendSettings(mFeInfo);
+
+        // tune
+        return  mTuner.tune(mFeSettings);
+    }
+
+    private final ITunerResourceTestServer.Stub mBinder = new ITunerResourceTestServer.Stub() {
+        public void createTuner(int useCase) {
+            synchronized (mLock) {
+                closeTunerInternal();
+                mTuner = new Tuner(mContext, null, useCase);
+            }
+        }
+
+        public void tuneAsync(int frontendIndex) {
+            synchronized (mLock) {
+                tuneInternal(frontendIndex);
+            }
+        }
+
+        public int tune(int frontendIndex) {
+            synchronized (mLock) {
+                return tuneInternal(frontendIndex);
+            }
+        }
+
+        public void closeTuner() {
+            synchronized (mLock) {
+                closeTunerInternal();
+            }
+        }
+
+        public boolean verifyTunerIsNull() {
+            synchronized (mLock) {
+                return mTuner == null;
+            }
+        }
+    };
+}
diff --git a/tests/tests/tv/src/android/media/tv/tuner/cts/TunerTest.java b/tests/tests/tv/src/android/media/tv/tuner/cts/TunerTest.java
index 62fa719..8e39664 100644
--- a/tests/tests/tv/src/android/media/tv/tuner/cts/TunerTest.java
+++ b/tests/tests/tv/src/android/media/tv/tuner/cts/TunerTest.java
@@ -20,9 +20,14 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import android.content.ComponentName;
 import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
 import android.content.pm.PackageManager;
 import android.media.tv.tuner.DemuxCapabilities;
 import android.media.tv.tuner.Descrambler;
@@ -58,6 +63,8 @@
 import android.media.tv.tuner.filter.SectionSettingsWithSectionBits;
 import android.media.tv.tuner.filter.SectionSettingsWithTableInfo;
 import android.media.tv.tuner.filter.Settings;
+import android.media.tv.tuner.filter.SharedFilter;
+import android.media.tv.tuner.filter.SharedFilterCallback;
 import android.media.tv.tuner.filter.TemiEvent;
 import android.media.tv.tuner.filter.TimeFilter;
 import android.media.tv.tuner.filter.TlvFilterConfiguration;
@@ -83,6 +90,7 @@
 import android.media.tv.tuner.frontend.FrontendSettings;
 import android.media.tv.tuner.frontend.FrontendStatus;
 import android.media.tv.tuner.frontend.FrontendStatus.Atsc3PlpTuningInfo;
+import android.media.tv.tuner.frontend.FrontendStatusReadiness;
 import android.media.tv.tuner.frontend.Isdbs3FrontendCapabilities;
 import android.media.tv.tuner.frontend.Isdbs3FrontendSettings;
 import android.media.tv.tuner.frontend.IsdbsFrontendCapabilities;
@@ -91,6 +99,14 @@
 import android.media.tv.tuner.frontend.IsdbtFrontendSettings;
 import android.media.tv.tuner.frontend.OnTuneEventListener;
 import android.media.tv.tuner.frontend.ScanCallback;
+import android.media.tv.tunerresourcemanager.TunerFrontendInfo;
+import android.media.tv.tunerresourcemanager.TunerFrontendRequest;
+import android.media.tv.tunerresourcemanager.TunerResourceManager;
+import android.os.ConditionVariable;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.SmallTest;
@@ -100,15 +116,19 @@
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.time.Duration;
+import java.time.Instant;
 import java.util.List;
+import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
 
 @RunWith(AndroidJUnit4.class)
 @SmallTest
@@ -119,11 +139,130 @@
     public RequiredFeatureRule featureRule = new RequiredFeatureRule(
             PackageManager.FEATURE_TUNER);
 
-    private static final int TIMEOUT_MS = 10000;
+    private static final int TIMEOUT_MS = 10 * 1000;  // 10 seconds
+    private static final int SCAN_TIMEOUT_MS = 2 * 60 * 1000; // 2 minutes
+    private static final long TIMEOUT_BINDER_SERVICE_SEC = 2;
 
     private Context mContext;
     private Tuner mTuner;
     private CountDownLatch mLockLatch = new CountDownLatch(1);
+    private TunerResourceManager mTunerResourceManager = null;
+    private TestServiceConnection mConnection;
+    private ISharedFilterTestServer mSharedFilterTestServer;
+
+    private class TestServiceConnection implements ServiceConnection {
+        private BlockingQueue<IBinder> mBlockingQueue = new LinkedBlockingQueue<>();
+
+        public void onServiceConnected(ComponentName componentName, IBinder service) {
+            mBlockingQueue.offer(service);
+        }
+
+        public void onServiceDisconnected(ComponentName componentName) {}
+
+        public IBinder getService() throws Exception {
+            final IBinder service =
+                    mBlockingQueue.poll(TIMEOUT_BINDER_SERVICE_SEC, TimeUnit.SECONDS);
+            return service;
+        }
+    }
+
+    private class TunerResourceTestServiceConnection implements ServiceConnection {
+        private BlockingQueue<IBinder> mBlockingQueue = new LinkedBlockingQueue<>();
+
+        @Override
+        public void onServiceConnected(ComponentName componentName, IBinder service) {
+            mBlockingQueue.offer(service);
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName componentName){}
+
+        public ITunerResourceTestServer getService() throws Exception {
+            final IBinder service =
+                    mBlockingQueue.poll(TIMEOUT_BINDER_SERVICE_SEC, TimeUnit.SECONDS);
+            return ITunerResourceTestServer.Stub.asInterface(service);
+        }
+    }
+
+    private class TunerTestOnTuneEventListener implements OnTuneEventListener {
+        public static final int INVALID_TUNE_EVENT = -1;
+        private static final int SLEEP_TIME_MS = 100;
+        private static final int TIMEOUT_MS = 500;
+        private final ReentrantLock mLock = new ReentrantLock();
+        private final ConditionVariable mCV = new ConditionVariable();
+        private int mLastTuneEvent = INVALID_TUNE_EVENT;
+
+        @Override
+        public void onTuneEvent(int tuneEvent) {
+            synchronized (mLock) {
+                mLastTuneEvent = tuneEvent;
+                mCV.open();
+            }
+        }
+
+        public void resetLastTuneEvent() {
+            synchronized (mLock) {
+                mLastTuneEvent = INVALID_TUNE_EVENT;
+            }
+        }
+
+        public int getLastTuneEvent() {
+            try {
+                // yield to let the callback handling execute
+                Thread.sleep(SLEEP_TIME_MS);
+            } catch (Exception e) {
+                // ignore exception
+            }
+            synchronized (mLock) {
+                mCV.block(TIMEOUT_MS);
+                mCV.close();
+                return mLastTuneEvent;
+            }
+        }
+    }
+
+    private class TunerTestLnbCallback implements LnbCallback {
+        public static final int INVALID_LNB_EVENT = -1;
+        private static final int SLEEP_TIME_MS = 100;
+        private static final int TIMEOUT_MS = 500;
+        private final ReentrantLock mDMLock = new ReentrantLock();
+        private final ConditionVariable mDMCV = new ConditionVariable();
+        private boolean mOnDiseqcMessageCalled = false;
+
+        // will not test this as there is no good way to trigger this
+        @Override
+        public void onEvent(int lnbEventType) {}
+
+        // will test this instead
+        @Override
+        public void onDiseqcMessage(byte[] diseqcMessage) {
+            synchronized (mDMLock) {
+                mOnDiseqcMessageCalled = true;
+                mDMCV.open();
+            }
+        }
+
+        public void resetOnDiseqcMessageCalled() {
+            synchronized (mDMLock) {
+                mOnDiseqcMessageCalled = false;
+            }
+        }
+
+        public boolean getOnDiseqcMessageCalled() {
+            try {
+                // yield to let the callback handling execute
+                Thread.sleep(SLEEP_TIME_MS);
+            } catch (Exception e) {
+                // ignore exception
+            }
+
+            synchronized (mDMLock) {
+                mDMCV.block(TIMEOUT_MS);
+                mDMCV.close();
+                return mOnDiseqcMessageCalled;
+            }
+        }
+    }
 
     @Before
     public void setUp() throws Exception {
@@ -151,59 +290,116 @@
         assertNotNull(mTuner);
         int version = TunerVersionChecker.getTunerVersion();
         assertTrue(version >= TunerVersionChecker.TUNER_VERSION_1_0);
-        assertTrue(version <= TunerVersionChecker.TUNER_VERSION_1_1);
+        assertTrue(version <= TunerVersionChecker.TUNER_VERSION_2_0);
     }
 
     @Test
-    public void testTuning() throws Exception {
+    public void testFrontendHardwareInfo() throws Exception {
+        String hwInfo = null;
+        try {
+            hwInfo = mTuner.getCurrentFrontendHardwareInfo();
+            if (TunerVersionChecker.isHigherOrEqualVersionTo(
+                    TunerVersionChecker.TUNER_VERSION_2_0)) {
+                fail("Get Frontend hardware info should throw IllegalStateException.");
+            } else {
+                assertNull(hwInfo);
+            }
+        } catch (IllegalStateException e) {
+            // pass
+        }
+
         List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null) return;
         assertFalse(ids.isEmpty());
 
         FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
         int res = mTuner.tune(createFrontendSettings(info));
-        assertEquals(Tuner.RESULT_SUCCESS, res);
-        assertEquals(Tuner.RESULT_SUCCESS, mTuner.setLnaEnabled(false));
+        hwInfo = mTuner.getCurrentFrontendHardwareInfo();
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            assertNotNull(hwInfo);
+            assertFalse(hwInfo.isEmpty());
+        } else {
+            assertNull(hwInfo);
+        }
         res = mTuner.cancelTuning();
         assertEquals(Tuner.RESULT_SUCCESS, res);
     }
 
     @Test
-    public void testScanning() throws Exception {
+    public void testTuning() throws Exception {
         List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null) return;
         assertFalse(ids.isEmpty());
-        for (int id : ids) {
-            FrontendInfo info = mTuner.getFrontendInfoById(id);
-            if (info != null) {
-                mLockLatch = new CountDownLatch(1);
-                int res = mTuner.scan(
+
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        int res = mTuner.tune(createFrontendSettings(info));
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        res = mTuner.setLnaEnabled(false);
+        assertTrue((res == Tuner.RESULT_SUCCESS) || (res == Tuner.RESULT_UNAVAILABLE));
+        res = mTuner.cancelTuning();
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+    }
+
+    @Test
+    public void testMultiTuning() throws Exception {
+        List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null) return;
+        assertFalse(ids.isEmpty());
+
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        int res = mTuner.tune(createFrontendSettings(info));
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        res = mTuner.cancelTuning();
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        // Tune again with the same frontend.
+        mTuner.tune(createFrontendSettings(info));
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        res = mTuner.cancelTuning();
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        for (int i = 1; i < ids.size(); i++) {
+            FrontendInfo info2 = mTuner.getFrontendInfoById(ids.get(i));
+            if (info2.getType() != info.getType()) {
+                res = mTuner.tune(createFrontendSettings(info2));
+                assertEquals(Tuner.RESULT_INVALID_STATE, res);
+            }
+        }
+    }
+
+    @Test
+    public void testScanning() throws Exception {
+        // Use the same test approach as testTune since it is not possible to test all frontends on
+        // one signal source
+        List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null) return;
+        assertFalse(ids.isEmpty());
+
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        int res = mTuner.scan(
                         createFrontendSettings(info),
                         Tuner.SCAN_TYPE_AUTO,
                         getExecutor(),
                         getScanCallback());
-               assertEquals(Tuner.RESULT_SUCCESS, res);
-               assertTrue(mLockLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
-               res = mTuner.cancelScanning();
-               assertEquals(Tuner.RESULT_SUCCESS, res);
-            }
-        }
-        mLockLatch = null;
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        res = mTuner.cancelScanning();
+        assertEquals(Tuner.RESULT_SUCCESS, res);
     }
 
     @Test
     public void testFrontendStatus() throws Exception {
         List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null) return;
         assertFalse(ids.isEmpty());
 
         for (int id : ids) {
-            if (mTuner == null) {
-                mTuner = new Tuner(mContext, null, 100);
-            }
-            FrontendInfo info = mTuner.getFrontendInfoById(id);
-            int res = mTuner.tune(createFrontendSettings(info));
+            Tuner tuner = new Tuner(mContext, null, 100);
+            FrontendInfo info = tuner.getFrontendInfoById(id);
+            int res = tuner.tune(createFrontendSettings(info));
 
             int[] statusCapabilities = info.getStatusCapabilities();
             assertNotNull(statusCapabilities);
-            FrontendStatus status = mTuner.getFrontendStatus(statusCapabilities);
+            FrontendStatus status = tuner.getFrontendStatus(statusCapabilities);
             assertNotNull(status);
 
             for (int i = 0; i < statusCapabilities.length; i++) {
@@ -257,12 +453,14 @@
                         status.isLnaOn();
                         break;
                     case FrontendStatus.FRONTEND_STATUS_TYPE_LAYER_ERROR:
-                        status.getLayerErrors();
+                        boolean[] r = status.getLayerErrors();
+                        assertNotNull(r);
                         break;
                     case FrontendStatus.FRONTEND_STATUS_TYPE_MER:
                         status.getMer();
                         break;
                     case FrontendStatus.FRONTEND_STATUS_TYPE_FREQ_OFFSET:
+                        status.getFreqOffsetLong();
                         status.getFreqOffset();
                         break;
                     case FrontendStatus.FRONTEND_STATUS_TYPE_HIERARCHY:
@@ -282,10 +480,12 @@
                         }
                         break;
                     case FrontendStatus.FRONTEND_STATUS_TYPE_BERS:
-                        status.getBers();
+                        int[] b = status.getBers();
+                        assertNotNull(b);
                         break;
                     case FrontendStatus.FRONTEND_STATUS_TYPE_CODERATES:
-                        status.getCodeRates();
+                        int[] c = status.getCodeRates();
+                        assertNotNull(c);
                         break;
                     case FrontendStatus.FRONTEND_STATUS_TYPE_BANDWIDTH:
                         status.getBandwidth();
@@ -303,16 +503,20 @@
                         status.getSystemId();
                         break;
                     case FrontendStatus.FRONTEND_STATUS_TYPE_INTERLEAVINGS:
-                        status.getInterleaving();
+                        int[] l = status.getInterleaving();
+                        assertNotNull(l);
                         break;
                     case FrontendStatus.FRONTEND_STATUS_TYPE_ISDBT_SEGMENTS:
-                        status.getIsdbtSegment();
+                        int[] segment = status.getIsdbtSegment();
+                        assertNotNull(segment);
                         break;
                     case FrontendStatus.FRONTEND_STATUS_TYPE_TS_DATA_RATES:
-                        status.getTsDataRate();
+                        int[] rates = status.getTsDataRate();
+                        assertNotNull(rates);
                         break;
                     case FrontendStatus.FRONTEND_STATUS_TYPE_MODULATIONS_EXT:
-                        status.getExtendedModulations();
+                        int[] modulations = status.getExtendedModulations();
+                        assertNotNull(modulations);
                         break;
                     case FrontendStatus.FRONTEND_STATUS_TYPE_ROLL_OFF:
                         status.getRollOff();
@@ -326,10 +530,81 @@
                     case FrontendStatus.FRONTEND_STATUS_TYPE_IS_SHORT_FRAMES_ENABLED:
                         status.isShortFramesEnabled();
                         break;
+                    case FrontendStatus.FRONTEND_STATUS_TYPE_ISDBT_MODE:
+                        status.getIsdbtMode();
+                        break;
+                    case FrontendStatus.FRONTEND_STATUS_TYPE_ISDBT_PARTIAL_RECEPTION_FLAG:
+                        status.getIsdbtPartialReceptionFlag();
+                        break;
+                    case FrontendStatus.FRONTEND_STATUS_TYPE_STREAM_IDS:
+                        int[] streamIds = status.getStreamIds();
+                        assertNotNull(streamIds);
+                        break;
+                    case FrontendStatus.FRONTEND_STATUS_TYPE_DVBT_CELL_IDS:
+                        int[] cellIds = status.getDvbtCellIds();
+                        assertNotNull(cellIds);
+                        break;
+                    case FrontendStatus.FRONTEND_STATUS_TYPE_ATSC3_ALL_PLP_INFO:
+                        List<Atsc3PlpInfo> plps = status.getAllAtsc3PlpInfo();
+                        assertFalse(plps.isEmpty());
+                        break;
                 }
             }
-            mTuner.close();
-            mTuner = null;
+            tuner.close();
+            tuner = null;
+        }
+    }
+
+    @Test
+    public void testFrontendStatusReadiness() throws Exception {
+        // Test w/o active frontend
+        try {
+            int[] caps = {0};
+            List<FrontendStatusReadiness> readiness = mTuner.getFrontendStatusReadiness(caps);
+            if (TunerVersionChecker.isHigherOrEqualVersionTo(
+                        TunerVersionChecker.TUNER_VERSION_2_0)) {
+                fail("Get Frontend Status Readiness should throw IllegalStateException.");
+            } else {
+                assertFalse(readiness.isEmpty());
+            }
+        } catch (IllegalStateException e) {
+            // pass
+        }
+
+        List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null)
+            return;
+        assertFalse(ids.isEmpty());
+
+        for (int id : ids) {
+            Tuner tuner = new Tuner(mContext, null, 100);
+            FrontendInfo info = tuner.getFrontendInfoById(id);
+            int res = tuner.tune(createFrontendSettings(info));
+
+            int[] statusCapabilities = info.getStatusCapabilities();
+            assertNotNull(statusCapabilities);
+            List<FrontendStatusReadiness> readiness =
+                    tuner.getFrontendStatusReadiness(statusCapabilities);
+            if (TunerVersionChecker.isHigherOrEqualVersionTo(
+                        TunerVersionChecker.TUNER_VERSION_2_0)) {
+                assertEquals(readiness.size(), statusCapabilities.length);
+                for (int i = 0; i < readiness.size(); i++) {
+                    assertEquals(readiness.get(i).getStatusType(), statusCapabilities[i]);
+                    int r = readiness.get(i).getStatusReadiness();
+                    if (r == FrontendStatusReadiness.FRONTEND_STATUS_READINESS_UNAVAILABLE
+                            || r == FrontendStatusReadiness.FRONTEND_STATUS_READINESS_UNSTABLE
+                            || r == FrontendStatusReadiness.FRONTEND_STATUS_READINESS_STABLE) {
+                        // pass
+                    } else {
+                        fail("Get Frontend Status Readiness returned wrong readiness " + r);
+                    }
+                }
+            } else {
+                assertNull(readiness);
+            }
+            tuner.cancelTuning();
+            tuner.close();
+            tuner = null;
         }
     }
 
@@ -346,6 +621,57 @@
     }
 
     @Test
+    public void testLnbAddAndRemoveCallback() throws Exception {
+        TunerTestLnbCallback lnbCB1 = new TunerTestLnbCallback();
+        Lnb lnb = mTuner.openLnb(getExecutor(), lnbCB1);
+        if (lnb == null) {
+            return;
+        }
+
+        assertEquals(lnb.setVoltage(Lnb.VOLTAGE_5V), Tuner.RESULT_SUCCESS);
+        assertEquals(lnb.setTone(Lnb.TONE_NONE), Tuner.RESULT_SUCCESS);
+        assertEquals(
+                lnb.setSatellitePosition(Lnb.POSITION_A), Tuner.RESULT_SUCCESS);
+        lnb.sendDiseqcMessage(new byte[] {1, 2});
+        assertTrue(lnbCB1.getOnDiseqcMessageCalled());
+        lnbCB1.resetOnDiseqcMessageCalled();
+
+        List<Integer> ids = mTuner.getFrontendIds();
+        assertFalse(ids.isEmpty());
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        FrontendSettings feSettings = createFrontendSettings(info);
+        int res = mTuner.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        // create sharee
+        Tuner sharee = new Tuner(mContext, null, 100);
+        sharee.shareFrontendFromTuner(mTuner);
+        TunerTestLnbCallback lnbCB2 = new TunerTestLnbCallback();
+
+        // add it as sharee
+        lnb.addCallback(getExecutor(), lnbCB2);
+
+        // check callback
+        lnb.sendDiseqcMessage(new byte[] {1, 2});
+        assertTrue(lnbCB1.getOnDiseqcMessageCalled());
+        lnbCB1.resetOnDiseqcMessageCalled();
+        assertTrue(lnbCB2.getOnDiseqcMessageCalled());
+        lnbCB2.resetOnDiseqcMessageCalled();
+
+        // remove sharee the sharee (should succeed)
+        assertTrue(lnb.removeCallback(lnbCB2));
+
+        // check callback (only the original owner gets callback
+        lnb.sendDiseqcMessage(new byte[] {1, 2});
+        assertTrue(lnbCB1.getOnDiseqcMessageCalled());
+        lnbCB1.resetOnDiseqcMessageCalled();
+        assertFalse(lnbCB2.getOnDiseqcMessageCalled());
+        lnbCB2.resetOnDiseqcMessageCalled();
+
+        sharee.close();
+    }
+
+    @Test
     public void testOpenLnbByname() throws Exception {
         Lnb lnb = mTuner.openLnbByName("default", getExecutor(), getLnbCallback());
         if (lnb != null) {
@@ -367,6 +693,7 @@
     public void testFrontendToCiCam() throws Exception {
         // tune to get frontend resource
         List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null) return;
         assertFalse(ids.isEmpty());
         FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
         int res = mTuner.tune(createFrontendSettings(info));
@@ -389,13 +716,65 @@
     }
 
     @Test
+    public void testRemoveOutputPid() throws Exception {
+        // Test w/o active frontend
+        try {
+            int status = mTuner.removeOutputPid(10);
+            if (TunerVersionChecker.isHigherOrEqualVersionTo(
+                        TunerVersionChecker.TUNER_VERSION_2_0)) {
+                fail("Remove output PID should throw IllegalStateException.");
+            } else {
+                assertEquals(status, Tuner.RESULT_UNAVAILABLE);
+            }
+        } catch (IllegalStateException e) {
+            // pass
+        }
+
+        // tune to get frontend resource
+        List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null)
+            return;
+        assertFalse(ids.isEmpty());
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        int res = mTuner.tune(createFrontendSettings(info));
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            // TODO: get real CiCam id from MediaCas
+            res = mTuner.connectFrontendToCiCam(0);
+        } else {
+            assertEquals(Tuner.INVALID_LTS_ID, mTuner.connectFrontendToCiCam(0));
+        }
+
+        int status = mTuner.removeOutputPid(10);
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            if (status != Tuner.RESULT_SUCCESS) {
+                assertEquals(status, Tuner.RESULT_UNAVAILABLE);
+            }
+        } else {
+            assertEquals(status, Tuner.RESULT_UNAVAILABLE);
+        }
+
+        if (res != Tuner.INVALID_LTS_ID) {
+            assertEquals(mTuner.disconnectFrontendToCiCam(0), Tuner.RESULT_SUCCESS);
+        } else {
+            // Make sure the connectFrontendToCiCam only fails because the current device
+            // does not support connecting frontend to cicam
+            assertEquals(mTuner.disconnectFrontendToCiCam(0), Tuner.RESULT_UNAVAILABLE);
+        }
+    }
+
+    @Test
     public void testAvSyncId() throws Exception {
     // open filter to get demux resource
         Filter f = mTuner.openFilter(
                 Filter.TYPE_TS, Filter.SUBTYPE_AUDIO, 1000, getExecutor(), getFilterCallback());
+        assertNotNull(f);
+        assertNotEquals(Tuner.INVALID_FILTER_ID, f.getId());
         Settings settings = AvSettings
                 .builder(Filter.TYPE_TS, true)
                 .setPassthrough(false)
+                .setUseSecureMemory(false)
                 .setAudioStreamType(AvSettings.AUDIO_STREAM_TYPE_MPEG1)
                 .build();
         FilterConfiguration config = TsFilterConfiguration
@@ -441,6 +820,7 @@
 
         // Tune a frontend before start the filter
         List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null) return;
         assertFalse(ids.isEmpty());
 
         FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
@@ -467,6 +847,7 @@
         Settings settings = AvSettings
                 .builder(Filter.TYPE_TS, true)
                 .setPassthrough(false)
+                .setUseSecureMemory(false)
                 .setAudioStreamType(AvSettings.AUDIO_STREAM_TYPE_MPEG1)
                 .build();
         FilterConfiguration config = TsFilterConfiguration
@@ -478,6 +859,7 @@
 
         // Tune a frontend before start the filter
         List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null) return;
         assertFalse(ids.isEmpty());
 
         FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
@@ -509,7 +891,7 @@
     public void testIpFilter() throws Exception {
         Filter f = mTuner.openFilter(
                 Filter.TYPE_IP, Filter.SUBTYPE_IP, 1000, getExecutor(), getFilterCallback());
-        assertNotNull(f);
+        if (f == null) return;
         assertNotEquals(Tuner.INVALID_FILTER_ID, f.getId());
 
         FilterConfiguration config = IpFilterConfiguration
@@ -526,6 +908,7 @@
 
         // Tune a frontend before start the filter
         List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null) return;
         assertFalse(ids.isEmpty());
 
         FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
@@ -544,7 +927,7 @@
     public void testAlpSectionFilterConfig() throws Exception {
         Filter f = mTuner.openFilter(
                 Filter.TYPE_ALP, Filter.SUBTYPE_SECTION, 1000, getExecutor(), getFilterCallback());
-        assertNotNull(f);
+        if (f == null) return;
         assertNotEquals(Tuner.INVALID_FILTER_ID, f.getId());
 
         SectionSettingsWithSectionBits settings =
@@ -574,7 +957,7 @@
     public void testMmtpPesFilterConfig() throws Exception {
         Filter f = mTuner.openFilter(
                 Filter.TYPE_MMTP, Filter.SUBTYPE_PES, 1000, getExecutor(), getFilterCallback());
-        assertNotNull(f);
+        if (f == null) return;
         assertNotEquals(Tuner.INVALID_FILTER_ID, f.getId());
 
         PesSettings settings =
@@ -600,14 +983,22 @@
         Filter f = mTuner.openFilter(
                 Filter.TYPE_MMTP, Filter.SUBTYPE_DOWNLOAD,
                 1000, getExecutor(), getFilterCallback());
-        assertNotNull(f);
+        if (f == null) return;
         assertNotEquals(Tuner.INVALID_FILTER_ID, f.getId());
 
-        DownloadSettings settings =
-                DownloadSettings
-                        .builder(Filter.TYPE_MMTP)
-                        .setDownloadId(2)
-                        .build();
+        DownloadSettings.Builder builder = DownloadSettings.builder(Filter.TYPE_MMTP);
+        if (!TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            builder.setUseDownloadId(true);
+        }
+        builder.setDownloadId(2);
+        DownloadSettings settings = builder.build();
+        if (!TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            assertEquals(settings.useDownloadId(), true);
+        } else {
+            assertEquals(settings.useDownloadId(), false);
+        }
+        assertEquals(settings.getDownloadId(), 2);
+
         MmtpFilterConfiguration config =
                 MmtpFilterConfiguration
                         .builder()
@@ -631,6 +1022,7 @@
                 AvSettings
                         .builder(Filter.TYPE_TS, true) // is Audio
                         .setPassthrough(false)
+                        .setUseSecureMemory(false)
                         .setAudioStreamType(AvSettings.AUDIO_STREAM_TYPE_MPEG1)
                         .build();
         TsFilterConfiguration config =
@@ -677,7 +1069,7 @@
     public void testTlvTlvFilterConfig() throws Exception {
         Filter f = mTuner.openFilter(
                 Filter.TYPE_TLV, Filter.SUBTYPE_TLV, 1000, getExecutor(), getFilterCallback());
-        assertNotNull(f);
+        if (f == null) return;
         assertNotEquals(Tuner.INVALID_FILTER_ID, f.getId());
 
         TlvFilterConfiguration config =
@@ -778,18 +1170,1290 @@
     }
 
     @Test
+    public void testResourceReclaimed() throws Exception {
+        List<Integer> ids = mTuner.getFrontendIds();
+        assertFalse(ids.isEmpty());
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        FrontendSettings feSettings = createFrontendSettings(info);
+
+        // first tune with mTuner to acquire resource
+        int res = mTuner.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        assertNotNull(mTuner.getFrontendInfo());
+
+        // now tune with a higher priority tuner to have mTuner's resource reclaimed
+        Tuner higherPrioTuner = new Tuner(mContext, null, 200);
+        res = higherPrioTuner.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        assertNotNull(higherPrioTuner.getFrontendInfo());
+
+        higherPrioTuner.close();
+    }
+
+    // TODO: change this to use ITunerResourceTestServer
+    @Test
+    public void testResourceReclaimedDifferentThread() throws Exception {
+        List<Integer> ids = mTuner.getFrontendIds();
+        assertFalse(ids.isEmpty());
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        FrontendSettings feSettings = createFrontendSettings(info);
+
+        // first tune with mTuner to acquire resource
+        int res = mTuner.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        assertNotNull(mTuner.getFrontendInfo());
+
+        // now tune with a higher priority tuner to have mTuner's resource reclaimed
+        TunerHandler tunerHandler = createTunerHandler(null);
+        Message msgCreate = new Message();
+        msgCreate.what = MSG_TUNER_HANDLER_CREATE;
+        msgCreate.arg1 = 200;
+        tunerHandler.sendMessage(msgCreate);
+        mTunerHandlerTaskComplete.block();
+        mTunerHandlerTaskComplete.close();
+
+        Message msgTune = new Message();
+        msgTune.what = MSG_TUNER_HANDLER_TUNE;
+        msgTune.obj = (Object) feSettings;
+        tunerHandler.sendMessage(msgTune);
+
+        // call mTuner.close in parallel
+        int sleepMS = 1;
+        //int sleepMS = (int) (Math.random() * 3.);
+        try {
+            Thread.sleep(sleepMS);
+        } catch (Exception e) { } // ignore
+        mTuner.close();
+        mTuner = null;
+
+        mTunerHandlerTaskComplete.block();
+        mTunerHandlerTaskComplete.close();
+        res = tunerHandler.getResult();
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        Tuner higherPrioTuner = tunerHandler.getTuner();
+        assertNotNull(higherPrioTuner.getFrontendInfo());
+
+        Message msgClose = new Message();
+        msgClose.what = MSG_TUNER_HANDLER_CLOSE;
+        tunerHandler.sendMessage(msgClose);
+
+    }
+
+    @Test
+    public void testResourceReclaimedDifferentProcess() throws Exception {
+        List<Integer> ids = mTuner.getFrontendIds();
+        int frontendIndex = 0;
+        assertFalse(ids.isEmpty());
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(frontendIndex));
+        FrontendSettings feSettings = createFrontendSettings(info);
+
+        // set up the test server
+        TunerResourceTestServiceConnection connection = new TunerResourceTestServiceConnection();
+        ITunerResourceTestServer tunerResourceTestServer = null;
+        Intent intent = new Intent(mContext, TunerResourceTestService.class);
+
+        // get the TunerResourceTestService
+        mContext.bindService(intent, connection, Context.BIND_AUTO_CREATE);
+        tunerResourceTestServer = connection.getService();
+
+        // CASE1 - normal reclaim
+        //
+        // first tune with mTuner to acquire resource
+        int res = mTuner.tune(feSettings);
+        boolean tunerReclaimed = false;
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        assertNotNull(mTuner.getFrontendInfo());
+
+        // now tune with a higher priority tuner to have mTuner's resource reclaimed
+
+        // create higher priority tuner
+        tunerResourceTestServer.createTuner(200);
+
+        // now tune on higher priority tuner to get mTuner reclaimed
+        res = tunerResourceTestServer.tune(frontendIndex);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        try {
+            int[] statusCapabilities = info.getStatusCapabilities();
+            mTuner.getFrontendStatus(statusCapabilities);
+
+        } catch (IllegalStateException e) {
+            tunerReclaimed = true;
+            mTuner.close();
+            mTuner = null;
+        }
+
+        // confirm if the mTuner is reclaimed
+        assertTrue(tunerReclaimed);
+
+        tunerResourceTestServer.closeTuner();
+        assertTrue(tunerResourceTestServer.verifyTunerIsNull());
+
+
+        // CASE2 - race between Tuner#close() and reclaim
+        mTuner = new Tuner(mContext, null, 100);
+        res = mTuner.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        assertNotNull(mTuner.getFrontendInfo());
+
+        tunerResourceTestServer.createTuner(200);
+        tunerResourceTestServer.tuneAsync(frontendIndex);
+
+        // adjust timing to induce race/deadlock
+        int sleepMS = 4;
+        //int sleepMS = (int) (Math.random() * 5.);
+        try {
+            Thread.sleep(sleepMS);
+        } catch (Exception e) { } // ignore
+        mTuner.close();
+        mTuner = null;
+
+        tunerResourceTestServer.closeTuner();
+
+        // unbind
+        mContext.unbindService(connection);
+    }
+
+    @Test
     public void testShareFrontendFromTuner() throws Exception {
+        Tuner tuner100 = new Tuner(mContext, null, 100);
+        List<Integer> ids = tuner100.getFrontendIds();
+        assertFalse(ids.isEmpty());
+        FrontendInfo info = tuner100.getFrontendInfoById(ids.get(0));
+        FrontendSettings feSettings = createFrontendSettings(info);
+        int[] statusTypes = {1};
+        boolean exceptionThrown = false;
+        int res;
+
+        // CASE1: check resource reclaim while sharee's priority < owner's priority
+        // let tuner100 share from tuner200
+        Tuner tuner200 = new Tuner(mContext, null, 200);
+        res = tuner200.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        info = tuner200.getFrontendInfoById(ids.get(0));
+        res = tuner200.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        tuner100 = new Tuner(mContext, null, 100);
+        tuner100.shareFrontendFromTuner(tuner200);
+        // call openFilter to trigger ITunerDemux.setFrontendDataSourceById()
+        Filter f = tuner100.openFilter(
+                Filter.TYPE_TS, Filter.SUBTYPE_SECTION, 1000, getExecutor(), getFilterCallback());
+        assertNotNull(f);
+
+        // setup onTuneCallback
+        TunerTestOnTuneEventListener cb100 = new TunerTestOnTuneEventListener();
+        TunerTestOnTuneEventListener cb200 = new TunerTestOnTuneEventListener();
+
+        // tune again on the owner
+        info = tuner200.getFrontendInfoById(ids.get(1));
+        tuner100.setOnTuneEventListener(getExecutor(), cb100);
+        tuner200.setOnTuneEventListener(getExecutor(), cb200);
+        res = tuner200.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        assertEquals(OnTuneEventListener.SIGNAL_LOCKED, cb100.getLastTuneEvent());
+        assertEquals(OnTuneEventListener.SIGNAL_LOCKED, cb200.getLastTuneEvent());
+        tuner100.clearOnTuneEventListener();
+        tuner200.clearOnTuneEventListener();
+
+        // now let the higher priority tuner steal the resource
+        Tuner tuner300 = new Tuner(mContext, null, 300);
+        res = tuner300.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        // confirm owner & sharee's resource gets reclaimed by confirming an exception is thrown
+        exceptionThrown = false;
+        try {
+            tuner200.getFrontendStatus(statusTypes);
+        } catch (Exception e) {
+            exceptionThrown = true;
+        }
+        assertTrue(exceptionThrown);
+
+        exceptionThrown = false;
+        try {
+            tuner100.getFrontendStatus(statusTypes);
+        } catch (Exception e) {
+            exceptionThrown = true;
+        }
+        assertTrue(exceptionThrown);
+
+        tuner100.close();
+        tuner200.close();
+        tuner300.close();
+
+
+        // CASE2: check resource reclaim fail when sharee's priority > new requester
+        tuner100 = new Tuner(mContext, null, 100);
+        res = tuner100.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        tuner300 = new Tuner(mContext, null, 300);
+        tuner300.shareFrontendFromTuner(tuner100);
+        f = tuner100.openFilter(
+                Filter.TYPE_TS, Filter.SUBTYPE_SECTION, 1000, getExecutor(), getFilterCallback());
+        assertNotNull(f);
+
+        tuner200 = new Tuner(mContext, null, 200);
+        res = tuner200.tune(feSettings);
+        assertNotEquals(Tuner.RESULT_SUCCESS, res);
+
+        // confirm the original tuner is still intact
+        res = tuner100.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        tuner100.close();
+        tuner200.close();
+        tuner300.close();
+    }
+
+    private void testTransferFeOwnershipSingleTuner() {
+        List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null) {
+            return;
+        }
+        assertFalse(ids.isEmpty());
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        FrontendSettings feSettings = createFrontendSettings(info);
+
+        // SCENARIO 1 - transfer and close the previous owner
+
+        // First create a tuner and tune() to acquire frontend resource
+        Tuner tunerA = new Tuner(mContext, null, 100);
+        int res = tunerA.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        // Create another tuner and share frontend from tunerA
+        Tuner tunerB = new Tuner(mContext, null, 500);
+        tunerB.shareFrontendFromTuner(tunerA);
+        DvrRecorder d = tunerB.openDvrRecorder(100, getExecutor(), getRecordListener());
+        assertNotNull(d);
+
+        // Call transferOwner in the wrong configurations and confirm it fails
+        assertEquals(Tuner.RESULT_INVALID_STATE, tunerB.transferOwner(tunerA));
+        Tuner nonSharee = new Tuner(mContext, null, 300);
+        assertEquals(Tuner.RESULT_INVALID_STATE, tunerA.transferOwner(nonSharee));
+        nonSharee.close();
+
+        // Now call it correctly to transfer ownership from tunerA to tunerB
+        assertEquals(Tuner.RESULT_SUCCESS, tunerA.transferOwner(tunerB));
+
+        // Close the original owner (tunerA)
+        tunerA.close();
+
+        // Confirm the new owner (tunerB) is still functional
+        assertNotNull(tunerB.getFrontendInfo());
+
+        // Close the new owner (tunerB)
+        d.close();
+        tunerB.close();
+
+        // SCENARIO 2 - transfer and closeFrontend and tune on the previous owner
+
+        // First create a tuner and tune() to acquire frontend resource
+        tunerA = new Tuner(mContext, null, 200);
+        res = tunerA.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        // Create another tuner and share frontend from tunerA
+        tunerB = new Tuner(mContext, null, 100);
+        tunerB.shareFrontendFromTuner(tunerA);
+        assertNotNull(tunerB.getFrontendInfo());
+
+        // Transfer ownership from tunerA to tunerB
+        assertEquals(Tuner.RESULT_SUCCESS, tunerA.transferOwner(tunerB));
+
+        // Close frontend for the original owner (tunerA)
+        tunerA.closeFrontend();
+
+        // Confirm tune works without going through Tuner.close() even after transferOwner()
+        // The purpose isn't to get tunerB's frontend revoked, but doing so as singletuner
+        // based test has wider coverage
+        res = tunerA.tune(feSettings); // this should reclaim tunerB
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        // Confirm tuberB is revoked
+        assertNull(tunerB.getFrontendInfo());
+
+        // Close tunerA
+        tunerA.close();
+
+        // close TunerB just in case
+        tunerB.close();
+    }
+
+    private void testTransferFeAndCiCamOwnership() {
+        List<Integer> ids = mTuner.getFrontendIds();
+        assertNotNull(ids);
+        assertFalse(ids.isEmpty());
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        FrontendSettings feSettings = createFrontendSettings(info);
+
+        // Create tuner and tune to get frontend resource
+        Tuner tunerA = new Tuner(mContext, null, 100);
+        assertEquals(Tuner.RESULT_SUCCESS, tunerA.tune(feSettings));
+
+        int ciCamId = 0;
+        boolean linkCiCamToFrontendSupported = false;
+
+        // connect CiCam to Frontend
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_1_1)) {
+            // TODO: get real CiCam id from MediaCas
+            assertEquals(Tuner.RESULT_SUCCESS, tunerA.connectFrontendToCiCam(ciCamId));
+            linkCiCamToFrontendSupported = true;
+        } else {
+            assertEquals(Tuner.INVALID_LTS_ID, tunerA.connectFrontendToCiCam(ciCamId));
+        }
+
+        // connect CiCam to Demux
+        assertEquals(Tuner.RESULT_SUCCESS, tunerA.connectCiCam(ciCamId));
+
+        // start another tuner and connect the same CiCam to its own demux
+        Tuner tunerB = new Tuner(mContext, null, 400);
+        tunerB.shareFrontendFromTuner(tunerA);
+        assertNotNull(tunerB.getFrontendInfo());
+        assertEquals(Tuner.RESULT_SUCCESS, tunerB.connectCiCam(ciCamId));
+
+        // unlink CiCam to Demux in tunerA and transfer ownership
+        assertEquals(Tuner.RESULT_SUCCESS, tunerA.disconnectCiCam());
+        assertEquals(Tuner.RESULT_SUCCESS, tunerA.transferOwner(tunerB));
+
+        // close the original owner
+        tunerA.close();
+
+        // disconnect CiCam from demux
+        assertEquals(Tuner.RESULT_SUCCESS, tunerB.disconnectCiCam());
+
+        // let Tuner.close() handle the release of CiCam
+        tunerB.close();
+
+        // now that the CiCam is released, disconnectFrontendToCiCam() should fail
+        assertEquals(Tuner.RESULT_UNAVAILABLE, tunerB.disconnectFrontendToCiCam(ciCamId));
+
+        // see if tune still works just in case
+        tunerA = new Tuner(mContext, null, 100);
+        assertEquals(Tuner.RESULT_SUCCESS, tunerA.tune(feSettings));
+        tunerA.close();
+    }
+
+    private void testTransferFeAndLnbOwnership() {
+        List<Integer> ids = mTuner.getFrontendIds();
+        assertNotNull(ids);
+        assertFalse(ids.isEmpty());
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        FrontendSettings feSettings = createFrontendSettings(info);
+
+        // Create tuner and tune to acquire frontend resource
+        Tuner tunerA = new Tuner(mContext, null, 100);
+        assertEquals(Tuner.RESULT_SUCCESS, tunerA.tune(feSettings));
+
+        // Open Lnb and check the callback
+        TunerTestLnbCallback lnbCB1 = new TunerTestLnbCallback();
+        Lnb lnbA = tunerA.openLnb(getExecutor(), lnbCB1);
+        assertNotNull(lnbA);
+        lnbA.setVoltage(Lnb.VOLTAGE_5V);
+        lnbA.setTone(Lnb.TONE_CONTINUOUS);
+        lnbA.sendDiseqcMessage(new byte[] {1, 2});
+        assertTrue(lnbCB1.getOnDiseqcMessageCalled());
+        lnbCB1.resetOnDiseqcMessageCalled();
+
+        // Create another tuner and share from tunerB
+        Tuner tunerB = new Tuner(mContext, null, 300);
+        tunerB.shareFrontendFromTuner(tunerA);
+
+        // add sharee and check the callback
+        TunerTestLnbCallback lnbCB2 = new TunerTestLnbCallback();
+        lnbA.addCallback(getExecutor(), lnbCB2);
+        lnbA.sendDiseqcMessage(new byte[] {1, 2});
+        assertTrue(lnbCB1.getOnDiseqcMessageCalled());
+        lnbCB1.resetOnDiseqcMessageCalled();
+        assertTrue(lnbCB2.getOnDiseqcMessageCalled());
+        lnbCB2.resetOnDiseqcMessageCalled();
+
+        // transfer owner and check callback
+        assertEquals(Tuner.RESULT_SUCCESS, tunerA.transferOwner(tunerB));
+        lnbA.sendDiseqcMessage(new byte[] {1, 2});
+        assertTrue(lnbCB1.getOnDiseqcMessageCalled());
+        lnbCB1.resetOnDiseqcMessageCalled();
+        assertTrue(lnbCB2.getOnDiseqcMessageCalled());
+        lnbCB2.resetOnDiseqcMessageCalled();
+
+        // remove the owner callback (just for testing)
+        assertTrue(lnbA.removeCallback(lnbCB2));
+
+        // remove sharee and check callback
+        assertTrue(lnbA.removeCallback(lnbCB1));
+        lnbA.sendDiseqcMessage(new byte[] {1, 2});
+        assertFalse(lnbCB1.getOnDiseqcMessageCalled());
+        lnbCB1.resetOnDiseqcMessageCalled();
+        assertFalse(lnbCB2.getOnDiseqcMessageCalled());
+        lnbCB2.resetOnDiseqcMessageCalled();
+
+        // close the original owner
+        tunerA.close();
+
+        // confirm the new owner is still intact
+        int[] statusCapabilities = info.getStatusCapabilities();
+        assertNotNull(statusCapabilities);
+        FrontendStatus status = tunerB.getFrontendStatus(statusCapabilities);
+        assertNotNull(status);
+
+        tunerB.close();
+    }
+
+    @Test
+    public void testTransferOwner() throws Exception {
+        testTransferFeOwnershipSingleTuner();
+        testTransferFeAndCiCamOwnership();
+        testTransferFeAndLnbOwnership();
+    }
+
+    @Test
+    public void testClose() throws Exception {
         Tuner other = new Tuner(mContext, null, 100);
+
         List<Integer> ids = other.getFrontendIds();
+        if (ids == null) return;
         assertFalse(ids.isEmpty());
         FrontendInfo info = other.getFrontendInfoById(ids.get(0));
 
-        // call tune() to open frontend resource
-        int res = other.tune(createFrontendSettings(info));
+        FrontendSettings feSettings = createFrontendSettings(info);
+        int res = other.tune(feSettings);
         assertEquals(Tuner.RESULT_SUCCESS, res);
         assertNotNull(other.getFrontendInfo());
-        mTuner.shareFrontendFromTuner(other);
+
         other.close();
+
+        // make sure pre-existing tuner is still functional
+        res = mTuner.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        assertNotNull(mTuner.getFrontendInfo());
+
+        // Frontend sharing scenario 1: close owner first
+        // create sharee
+        Tuner sharee = new Tuner(mContext, null, 100);
+        sharee.shareFrontendFromTuner(mTuner);
+
+        // close the owner
+        mTuner.close();
+        mTuner = null;
+
+        // check the sharee is also closed
+        // tune() would have failed even before close() but still..
+        // TODO: fix this once callback sharing is implemented
+        res = sharee.tune(feSettings);
+        assertEquals(Tuner.RESULT_UNAVAILABLE, res);
+
+        sharee.close();
+
+        // Frontend sharing scenario 2: close sharee first
+        // create owner first
+        mTuner = new Tuner(mContext, null, 100);
+        res = mTuner.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        // create sharee
+        sharee = new Tuner(mContext, null, 100);
+        sharee.shareFrontendFromTuner(mTuner);
+
+        // close sharee
+        sharee.close();
+
+        // confirm owner is still intact
+        int[] statusCapabilities = info.getStatusCapabilities();
+        assertNotNull(statusCapabilities);
+        FrontendStatus status = mTuner.getFrontendStatus(statusCapabilities);
+        assertNotNull(status);
+
+    }
+
+    @Test
+    public void testCloseFrontend() throws Exception {
+        List<Integer> ids = mTuner.getFrontendIds();
+        if (ids == null) {
+            return;
+        }
+
+        // SCENARIO 1 - without Lnb
+        assertFalse(ids.isEmpty());
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        FrontendSettings feSettings = createFrontendSettings(info);
+        int res = mTuner.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        assertNotNull(mTuner.getFrontendInfo());
+
+        // now close frontend
+        mTuner.closeFrontend();
+
+        // confirm frontend is closed
+        int[] statusCapabilities = info.getStatusCapabilities();
+        boolean frontendClosed = false;
+        try {
+            mTuner.getFrontendStatus(statusCapabilities);
+
+        } catch (IllegalStateException e) {
+            frontendClosed = true;
+        }
+        assertTrue(frontendClosed);
+
+        // now tune to a different setting
+        info = mTuner.getFrontendInfoById(ids.get(1));
+        feSettings = createFrontendSettings(info);
+        mTuner.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        assertNotNull(mTuner.getFrontendInfo());
+        FrontendStatus status = mTuner.getFrontendStatus(statusCapabilities);
+        assertNotNull(status);
+
+        // SCENARIO 2 - with Lnb
+
+        TunerTestLnbCallback lnbCB1 = new TunerTestLnbCallback();
+        Lnb lnb = mTuner.openLnb(getExecutor(), lnbCB1);
+        if (lnb == null) {
+            return;
+        }
+
+        mTuner.closeFrontend();
+        // confirm frontend is closed
+        statusCapabilities = info.getStatusCapabilities();
+        frontendClosed = false;
+        try {
+            mTuner.getFrontendStatus(statusCapabilities);
+
+        } catch (IllegalStateException e) {
+            frontendClosed = true;
+        }
+        assertTrue(frontendClosed);
+
+        info = mTuner.getFrontendInfoById(ids.get(0));
+        feSettings = createFrontendSettings(info);
+        mTuner.tune(feSettings);
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        assertNotNull(mTuner.getFrontendInfo());
+        status = mTuner.getFrontendStatus(statusCapabilities);
+        assertNotNull(status);
+    }
+
+    @Test
+    public void testHasUnusedFrontend1() throws Exception {
+        prepTRMCustomFeResourceMapTest();
+
+        // Use try block to ensure restoring the TunerResourceManager
+        // Note: the handles will be changed from the original value, but should be OK
+        try {
+            TunerFrontendInfo[] infos = new TunerFrontendInfo[6];
+            // tunerFrontendInfo(handle, FrontendSettings.TYPE_*, exclusiveGroupId
+            infos[0] = tunerFrontendInfo(1, FrontendSettings.TYPE_DVBT, 1);
+            infos[1] = tunerFrontendInfo(2, FrontendSettings.TYPE_DVBC, 1);
+            infos[2] = tunerFrontendInfo(3, FrontendSettings.TYPE_DVBS, 1);
+            infos[3] = tunerFrontendInfo(4, FrontendSettings.TYPE_DVBT, 2);
+            infos[4] = tunerFrontendInfo(5, FrontendSettings.TYPE_DVBC, 2);
+            infos[5] = tunerFrontendInfo(6, FrontendSettings.TYPE_DVBS, 2);
+
+            mTunerResourceManager.setFrontendInfoList(infos);
+
+            Tuner A = new Tuner(mContext, null, 100);
+            Tuner B = new Tuner(mContext, null, 100);
+            Tuner C = new Tuner(mContext, null, 100);
+
+            // check before anyone holds resource
+            assertFalse(A.hasUnusedFrontend(FrontendSettings.TYPE_UNDEFINED));
+            assertFalse(A.hasUnusedFrontend(FrontendSettings.TYPE_ATSC));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBC));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBS));
+
+            // let B hold resource
+            assignFeResource(B.getClientId(), FrontendSettings.TYPE_DVBT,
+                             true /* expectedResult */, 1 /* expectedHandle */);
+
+            // check when one of the two exclusive groups are held
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBC));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBS));
+
+            assertTrue(B.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+
+            // let C hold the resource
+            assignFeResource(C.getClientId(), FrontendSettings.TYPE_DVBC,
+                             true /* expectedResult */, 5 /* expectedHandle */);
+
+            assertFalse(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+            assertFalse(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBC));
+            assertFalse(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBS));
+
+            assertFalse(B.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+            assertFalse(C.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+
+            // let go of B's resource
+            B.close();
+
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBC));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBS));
+
+            assertTrue(B.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+            assertTrue(C.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+
+            C.close();
+            A.close();
+        } catch (Exception e) {
+            throw (e);
+        } finally {
+            cleanupTRMCustomFeResourceMapTest();
+        }
+    }
+
+    @Test
+    public void testHasUnusedFrontend2() throws Exception {
+        prepTRMCustomFeResourceMapTest();
+
+        // Use try block to ensure restoring the TunerResourceManager
+        // Note: the handles will be changed from the original value, but should be OK
+        try {
+            TunerFrontendInfo[] infos = new TunerFrontendInfo[5];
+            // tunerFrontendInfo(handle, FrontendSettings.TYPE_*, exclusiveGroupId
+            infos[0] = tunerFrontendInfo(1, FrontendSettings.TYPE_DVBT, 1);
+            infos[1] = tunerFrontendInfo(2, FrontendSettings.TYPE_DVBC, 1);
+            infos[2] = tunerFrontendInfo(3, FrontendSettings.TYPE_DVBT, 2);
+            infos[3] = tunerFrontendInfo(4, FrontendSettings.TYPE_DVBC, 2);
+            infos[4] = tunerFrontendInfo(5, FrontendSettings.TYPE_DVBS, 3);
+
+            mTunerResourceManager.setFrontendInfoList(infos);
+
+            Tuner A = new Tuner(mContext, null, 100);
+            Tuner B = new Tuner(mContext, null, 100);
+            Tuner C = new Tuner(mContext, null, 100);
+
+            // let B hold resource
+            assignFeResource(B.getClientId(), FrontendSettings.TYPE_DVBT,
+                             true /* expectedResult */, 1 /* expectedHandle */);
+
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBC));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBS));
+
+            // let C hold the resource
+            assignFeResource(C.getClientId(), FrontendSettings.TYPE_DVBC,
+                             true /* expectedResult */, 4 /* expectedHandle */);
+
+            assertFalse(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+            assertFalse(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBC));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBS));
+
+            B.close();
+            C.close();
+        } catch (Exception e) {
+            throw (e);
+        } finally {
+            cleanupTRMCustomFeResourceMapTest();
+        }
+    }
+
+    @Test
+    public void testHasUnusedFrontend3() throws Exception {
+        prepTRMCustomFeResourceMapTest();
+
+        // Use try block to ensure restoring the TunerResourceManager
+        // Note: the handles will be changed from the original value, but should be OK
+        try {
+            TunerFrontendInfo[] infos = new TunerFrontendInfo[6];
+            // tunerFrontendInfo(handle, FrontendSettings.TYPE_*, exclusiveGroupId
+            infos[0] = tunerFrontendInfo(1, FrontendSettings.TYPE_DVBT, 1);
+            infos[1] = tunerFrontendInfo(2, FrontendSettings.TYPE_DVBC, 1);
+            infos[2] = tunerFrontendInfo(3, FrontendSettings.TYPE_DVBS, 1);
+            infos[3] = tunerFrontendInfo(4, FrontendSettings.TYPE_DVBT, 2);
+            infos[4] = tunerFrontendInfo(5, FrontendSettings.TYPE_DVBC, 2);
+            infos[5] = tunerFrontendInfo(6, FrontendSettings.TYPE_DVBS, 2);
+
+            mTunerResourceManager.setFrontendInfoList(infos);
+
+            Tuner A = new Tuner(mContext, null, 100);
+            Tuner B = new Tuner(mContext, null, 100);
+            Tuner C = new Tuner(mContext, null, 100);
+
+            // let B hold resource
+            assignFeResource(B.getClientId(), FrontendSettings.TYPE_DVBT,
+                             true /* expectedResult */, 1 /* expectedHandle */);
+
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBC));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBS));
+
+            // let C share from B
+            mTunerResourceManager.shareFrontend(C.getClientId(), B.getClientId());
+
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBT));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBC));
+            assertTrue(A.hasUnusedFrontend(FrontendSettings.TYPE_DVBS));
+
+            A.close();
+            C.close();
+            B.close();
+        } catch (Exception e) {
+            throw (e);
+        } finally {
+            cleanupTRMCustomFeResourceMapTest();
+        }
+    }
+
+    @Test
+    public void testIsLowestPriorityCornerCases() throws Exception {
+        prepTRMCustomFeResourceMapTest();
+
+        // Use try block to ensure restoring the TunerResourceManager
+        // Note: the handles will be changed from the original value, but should be OK
+        try {
+            setupSingleTunerSetupForIsLowestPriority();
+
+            // must return true when non existing frontend type is specified
+            assertTrue(mTuner.isLowestPriority(FrontendSettings.TYPE_UNDEFINED));
+            assertTrue(mTuner.isLowestPriority(FrontendSettings.TYPE_ATSC));
+
+            // must return true when no one is holding the resource
+            assertTrue(mTuner.isLowestPriority(FrontendSettings.TYPE_DVBT));
+            assertTrue(mTuner.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertTrue(mTuner.isLowestPriority(FrontendSettings.TYPE_DVBT));
+
+            // must return true when the callee is the only one holding the resource
+            assignFeResource(mTuner.getClientId(), FrontendSettings.TYPE_DVBT,
+                             true /* expectedResult */, 1 /* expectedHandle */);
+            assertTrue(mTuner.isLowestPriority(FrontendSettings.TYPE_DVBT));
+            assertTrue(mTuner.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertTrue(mTuner.isLowestPriority(FrontendSettings.TYPE_DVBT));
+
+        } catch (Exception e) {
+            throw (e);
+        } finally {
+            cleanupTRMCustomFeResourceMapTest();
+        }
+    }
+
+    @Test
+    public void testIsLowestPriorityTwoClients() throws Exception {
+        prepTRMCustomFeResourceMapTest();
+
+        // Use try block to ensure restoring the TunerResourceManager
+        // Note: the handles will be changed from the original value, but should be OK
+        try {
+            setupSingleTunerSetupForIsLowestPriority();
+            testTwoClientsForIsLowestPriority(200, 100); // A > B
+            testTwoClientsForIsLowestPriority(100, 200); // A < B
+            testTwoClientsForIsLowestPriority(100, 100); // A = B
+
+            setupDualTunerSetupForIsLowestPriority();
+            testTwoClientsForIsLowestPriority(200, 100); // A > B
+            testTwoClientsForIsLowestPriority(100, 200); // A < B
+            testTwoClientsForIsLowestPriority(100, 100); // A = B
+        } catch (Exception e) {
+            throw (e);
+        } finally {
+            cleanupTRMCustomFeResourceMapTest();
+        }
+    }
+
+    @Test
+    public void testIsLowestPriorityThreeClients() throws Exception {
+        prepTRMCustomFeResourceMapTest();
+
+        // Use try block to ensure restoring the TunerResourceManager
+        // Note: the handles will be changed from the original value, but should be OK
+        try {
+            setupDualTunerSetupForIsLowestPriority();
+            testThreeClientsForIsLowestPriority(300, 200, 100); // A > B > C
+            testThreeClientsForIsLowestPriority(300, 100, 200); // A > C > B
+            testThreeClientsForIsLowestPriority(200, 300, 100); // B > A > C
+            testThreeClientsForIsLowestPriority(200, 100, 300); // C > A > B
+            testThreeClientsForIsLowestPriority(100, 300, 200); // B > C > A
+            testThreeClientsForIsLowestPriority(100, 200, 300); // C > B > A
+            testThreeClientsForIsLowestPriority(100, 100, 100); // A = B = C
+            testThreeClientsForIsLowestPriority(200, 200, 100); // A = B > C
+            testThreeClientsForIsLowestPriority(200, 100, 100); // A > B = C
+            testThreeClientsForIsLowestPriority(200, 100, 200); // A = C > B
+            testThreeClientsForIsLowestPriority(200, 300, 200); // B > A = C
+            testThreeClientsForIsLowestPriority(100, 100, 200); // C > A = B
+            testThreeClientsForIsLowestPriority(100, 200, 200); // B = C > A
+        } catch (Exception e) {
+            throw (e);
+        } finally {
+            cleanupTRMCustomFeResourceMapTest();
+        }
+    }
+
+    private TunerFrontendInfo tunerFrontendInfo(
+            int handle, int frontendType, int exclusiveGroupId) {
+        TunerFrontendInfo info = new TunerFrontendInfo();
+        info.handle = handle;
+        info.type = frontendType;
+        info.exclusiveGroupId = exclusiveGroupId;
+        return info;
+    }
+
+    /**
+     * Prep function for TunerTest that requires custom frontend resource map
+     */
+    private void prepTRMCustomFeResourceMapTest() {
+        if (mTunerResourceManager == null) {
+            mTunerResourceManager = (TunerResourceManager)
+                    mContext.getSystemService(Context.TV_TUNER_RESOURCE_MGR_SERVICE);
+        }
+        mTunerResourceManager.storeResourceMap(TunerResourceManager.TUNER_RESOURCE_TYPE_FRONTEND);
+        mTunerResourceManager.clearResourceMap(TunerResourceManager.TUNER_RESOURCE_TYPE_FRONTEND);
+    }
+
+    /**
+     * Clean up function for TunerTest that requires custom frontend resource map
+     */
+    private void cleanupTRMCustomFeResourceMapTest() {
+        // first close mTuner in case a frontend resource is opened
+        if (mTuner != null) {
+            mTuner.close();
+            mTuner = null;
+        }
+
+        // now restore the original frontend resource map
+        if (mTunerResourceManager != null) {
+            mTunerResourceManager.restoreResourceMap(
+                    TunerResourceManager.TUNER_RESOURCE_TYPE_FRONTEND);
+        }
+    }
+
+    private void clearFrontendInfoList() {
+        if (mTunerResourceManager != null) {
+            mTunerResourceManager.clearResourceMap(
+                    TunerResourceManager.TUNER_RESOURCE_TYPE_FRONTEND);
+        }
+    }
+
+    private void assignFeResource(int clientId, int frontendType,
+                                  boolean expectedResult, int expectedHandle) {
+        int[] feHandle = new int[1];
+        TunerFrontendRequest request = new TunerFrontendRequest();
+        request.clientId = clientId;
+        request.frontendType = frontendType;
+        boolean granted = mTunerResourceManager.requestFrontend(request, feHandle);
+        assertEquals(granted, expectedResult);
+        assertEquals(feHandle[0], expectedHandle);
+    }
+
+    private void setupSingleTunerSetupForIsLowestPriority() {
+        // first clear the frontend resource to register new set of resources
+        clearFrontendInfoList();
+
+        TunerFrontendInfo[] infos = new TunerFrontendInfo[3];
+        // tunerFrontendInfo(handle, FrontendSettings.TYPE_*, exclusiveGroupId
+        infos[0] = tunerFrontendInfo(1, FrontendSettings.TYPE_DVBT, 1);
+        infos[1] = tunerFrontendInfo(2, FrontendSettings.TYPE_DVBC, 1);
+        infos[2] = tunerFrontendInfo(3, FrontendSettings.TYPE_DVBS, 1);
+
+        mTunerResourceManager.setFrontendInfoList(infos);
+    }
+
+    private void setupDualTunerSetupForIsLowestPriority() {
+        // first clear the frontend resource to register new set of resources
+        clearFrontendInfoList();
+
+        TunerFrontendInfo[] infos = new TunerFrontendInfo[6];
+        // tunerFrontendInfo(handle, FrontendSettings.TYPE_*, exclusiveGroupId
+        infos[0] = tunerFrontendInfo(1, FrontendSettings.TYPE_DVBT, 1);
+        infos[1] = tunerFrontendInfo(2, FrontendSettings.TYPE_DVBC, 1);
+        infos[2] = tunerFrontendInfo(3, FrontendSettings.TYPE_DVBS, 1);
+        infos[3] = tunerFrontendInfo(4, FrontendSettings.TYPE_DVBT, 2);
+        infos[4] = tunerFrontendInfo(5, FrontendSettings.TYPE_DVBC, 2);
+        infos[5] = tunerFrontendInfo(6, FrontendSettings.TYPE_DVBS, 2);
+
+        mTunerResourceManager.setFrontendInfoList(infos);
+    }
+
+
+    private void testTwoClientsForIsLowestPriority(int prioA, int prioB) {
+
+        Tuner A = new Tuner(mContext, null, prioA);
+        Tuner B = new Tuner(mContext, null, prioB);
+
+        // all should return true
+        assertTrue(A.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        assertTrue(B.isLowestPriority(FrontendSettings.TYPE_DVBC));
+
+        // let A hold resource
+        assignFeResource(A.getClientId(), FrontendSettings.TYPE_DVBT,
+                         true /* expectedResult */, 1 /* expectedHandle */);
+
+        // should return true for A as A is the sole holder
+        assertTrue(A.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        // should return false for B only if A < B
+        if ( prioA < prioB ) {
+            assertFalse(B.isLowestPriority(FrontendSettings.TYPE_DVBC));
+        } else {
+            assertTrue(B.isLowestPriority(FrontendSettings.TYPE_DVBC));
+        }
+
+        A.close();
+        B.close();
+    }
+
+    private void testThreeClientsForIsLowestPriority(int prioA, int prioB, int prioC) {
+
+        Tuner A = new Tuner(mContext, null, prioA);
+        Tuner B = new Tuner(mContext, null, prioB);
+        Tuner C = new Tuner(mContext, null, prioC);
+
+        // all should return true
+        assertTrue(A.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        assertTrue(B.isLowestPriority(FrontendSettings.TYPE_DVBC));
+        assertTrue(C.isLowestPriority(FrontendSettings.TYPE_DVBS));
+
+        // let A & C hold resource
+        assignFeResource(A.getClientId(), FrontendSettings.TYPE_DVBT,
+                         true /* expectedResult */, 1 /* expectedHandle */);
+
+        assignFeResource(C.getClientId(), FrontendSettings.TYPE_DVBC,
+                         true /* expectedResult */, 5 /* expectedHandle */);
+
+        // should return false for B only if A < B
+        if (prioA > prioB && prioB > prioC) {
+            assertFalse(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertFalse(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertTrue(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioA > prioC && prioC > prioB) {
+            assertFalse(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertTrue(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertTrue(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioA > prioC && prioC > prioB) {
+            assertFalse(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertTrue(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertTrue(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioB > prioA && prioA > prioC) {
+            assertFalse(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertFalse(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertTrue(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioC > prioA && prioA > prioB) {
+            assertTrue(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertTrue(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertFalse(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioB > prioC && prioC > prioA) {
+            assertTrue(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertFalse(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertFalse(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioC > prioB && prioB > prioA) {
+            assertTrue(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertFalse(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertFalse(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioA == prioB && prioB == prioC) {
+            assertTrue(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertTrue(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertTrue(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioA == prioB && prioB > prioC) {
+            assertFalse(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertFalse(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertTrue(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioA > prioB && prioB == prioC) {
+            assertFalse(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertTrue(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertTrue(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioA == prioC && prioC > prioB) {
+            assertTrue(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertTrue(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertTrue(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioB > prioA && prioA == prioC) {
+            assertTrue(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertFalse(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertTrue(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioC > prioA && prioA == prioB) {
+            assertTrue(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertTrue(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertFalse(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        } else if (prioB == prioC && prioC > prioA) {
+            assertTrue(A.isLowestPriority(FrontendSettings.TYPE_DVBC));
+            assertFalse(B.isLowestPriority(FrontendSettings.TYPE_DVBS));
+            assertFalse(C.isLowestPriority(FrontendSettings.TYPE_DVBT));
+        }
+
+        A.close();
+        B.close();
+        C.close();
+    }
+
+    @Test
+    public void testSharedFilterOneProcess() throws Exception {
+        Filter f = createTsSectionFilter(mTuner, getExecutor(), getFilterCallback());
+        assertTrue(f != null);
+
+        String token1 = f.acquireSharedFilterToken();
+        assertTrue(token1 != null);
+
+        String token2 = f.acquireSharedFilterToken();
+        assertTrue(token2 == null);
+
+        // Tune a frontend before start the filter
+        List<Integer> ids = mTuner.getFrontendIds();
+        assertFalse(ids.isEmpty());
+
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        int res = mTuner.tune(createFrontendSettings(info));
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        Settings settings = SectionSettingsWithTableInfo
+                .builder(Filter.TYPE_TS)
+                .setTableId(2)
+                .setVersion(1)
+                .setCrcEnabled(true)
+                .setRaw(false)
+                .setRepeat(false)
+                .build();
+        FilterConfiguration config = TsFilterConfiguration
+                .builder()
+                .setTpid(10)
+                .setSettings(settings)
+                .build();
+
+        assertEquals(f.configure(config), Tuner.RESULT_INVALID_STATE);
+        assertEquals(f.setMonitorEventMask(Filter.MONITOR_EVENT_SCRAMBLING_STATUS),
+                Tuner.RESULT_INVALID_STATE);
+        assertEquals(f.setDataSource(null), Tuner.RESULT_INVALID_STATE);
+        assertEquals(f.start(), Tuner.RESULT_INVALID_STATE);
+        assertEquals(f.flush(), Tuner.RESULT_INVALID_STATE);
+        assertEquals(f.read(new byte[3], 0, 3), 0);
+        assertEquals(f.stop(), Tuner.RESULT_INVALID_STATE);
+
+        res = mTuner.cancelTuning();
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        f.freeSharedFilterToken(token1);
+        f.close();
+        f = null;
+    }
+
+    @Test
+    public void testSharedFilterTwoProcessesCloseInSharedFilter() throws Exception {
+        mConnection = new TestServiceConnection();
+        mContext.bindService(new Intent(mContext, SharedFilterTestService.class), mConnection,
+                Context.BIND_AUTO_CREATE);
+        mSharedFilterTestServer =
+                ISharedFilterTestServer.Stub.asInterface(mConnection.getService());
+
+        String token = mSharedFilterTestServer.acquireSharedFilterToken();
+        assertTrue(token != null);
+        SharedFilter f =
+                Tuner.openSharedFilter(mContext, token, getExecutor(), getSharedFilterCallback());
+        assertTrue(f != null);
+
+        assertEquals(f.start(), Tuner.RESULT_SUCCESS);
+        assertEquals(f.flush(), Tuner.RESULT_SUCCESS);
+        int size = f.read(new byte[3], 0, 3);
+        assertTrue(size >= 0 && size <= 3);
+        assertEquals(f.stop(), Tuner.RESULT_SUCCESS);
+
+        mLockLatch = new CountDownLatch(1);
+        f.close();
+        f = null;
+        mSharedFilterTestServer.closeFilter();
+        Thread.sleep(2000);
+        assertEquals(mLockLatch.getCount(), 1);
+        mLockLatch = null;
+
+        mContext.unbindService(mConnection);
+    }
+
+    @Test
+    public void testSharedFilterTwoProcessesCloseInFilter() throws Exception {
+        mConnection = new TestServiceConnection();
+        mContext.bindService(new Intent(mContext, SharedFilterTestService.class), mConnection,
+                Context.BIND_AUTO_CREATE);
+        mSharedFilterTestServer =
+                ISharedFilterTestServer.Stub.asInterface(mConnection.getService());
+
+        String token = mSharedFilterTestServer.acquireSharedFilterToken();
+        assertTrue(token != null);
+
+        SharedFilter f =
+                Tuner.openSharedFilter(mContext, token, getExecutor(), getSharedFilterCallback());
+        assertTrue(f != null);
+
+        assertEquals(f.start(), Tuner.RESULT_SUCCESS);
+        assertEquals(f.flush(), Tuner.RESULT_SUCCESS);
+        int size = f.read(new byte[3], 0, 3);
+        assertTrue(size >= 0 && size <= 3);
+        assertEquals(f.stop(), Tuner.RESULT_SUCCESS);
+
+        mLockLatch = new CountDownLatch(1);
+        mSharedFilterTestServer.closeFilter();
+        assertTrue(mLockLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        mLockLatch = null;
+        f.close();
+        f = null;
+
+        mContext.unbindService(mConnection);
+    }
+
+    @Test
+    public void testSharedFilterTwoProcessesReleaseInFilter() throws Exception {
+        mConnection = new TestServiceConnection();
+        mContext.bindService(new Intent(mContext, SharedFilterTestService.class), mConnection,
+                Context.BIND_AUTO_CREATE);
+        mSharedFilterTestServer =
+                ISharedFilterTestServer.Stub.asInterface(mConnection.getService());
+
+        String token = mSharedFilterTestServer.acquireSharedFilterToken();
+        assertTrue(token != null);
+
+        SharedFilter f =
+                Tuner.openSharedFilter(mContext, token, getExecutor(), getSharedFilterCallback());
+        assertTrue(f != null);
+
+        assertEquals(f.start(), Tuner.RESULT_SUCCESS);
+        assertEquals(f.flush(), Tuner.RESULT_SUCCESS);
+        int size = f.read(new byte[3], 0, 3);
+        assertTrue(size >= 0 && size <= 3);
+        assertEquals(f.stop(), Tuner.RESULT_SUCCESS);
+
+        mLockLatch = new CountDownLatch(1);
+        mSharedFilterTestServer.freeSharedFilterToken(token);
+        assertTrue(mLockLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+        mLockLatch = null;
+
+        mSharedFilterTestServer.closeFilter();
+        f.close();
+        f = null;
+
+        mContext.unbindService(mConnection);
+    }
+
+    @Test
+    public void testSharedFilterTwoProcessesVerifySharedFilter() throws Exception {
+        mConnection = new TestServiceConnection();
+        mContext.bindService(new Intent(mContext, SharedFilterTestService.class), mConnection,
+                Context.BIND_AUTO_CREATE);
+        mSharedFilterTestServer =
+                ISharedFilterTestServer.Stub.asInterface(mConnection.getService());
+
+        Filter f = createTsSectionFilter(mTuner, getExecutor(), getFilterCallback());
+        assertTrue(f != null);
+
+        String token = f.acquireSharedFilterToken();
+        assertTrue(token != null);
+
+        // Tune a frontend before start the shared filter
+        List<Integer> ids = mTuner.getFrontendIds();
+        assertFalse(ids.isEmpty());
+
+        FrontendInfo info = mTuner.getFrontendInfoById(ids.get(0));
+        int res = mTuner.tune(createFrontendSettings(info));
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+        assertTrue(mSharedFilterTestServer.verifySharedFilter(token));
+
+        res = mTuner.cancelTuning();
+        assertEquals(Tuner.RESULT_SUCCESS, res);
+
+        f.freeSharedFilterToken(token);
+        f.close();
+        f = null;
+
+        mContext.unbindService(mConnection);
+    }
+
+    @Test
+    public void testFilterTimeDelay() throws Exception {
+        Filter f = createTsSectionFilter(mTuner, getExecutor(), getFilterCallback());
+
+        int timeDelayInMs = 5000;
+        Instant start = Instant.now();
+        int status = f.delayCallbackForDurationMillis(timeDelayInMs);
+
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            // start / stop prevents initial race condition after first setting the time delay.
+            f.start();
+            f.stop();
+
+            mLockLatch = new CountDownLatch(1);
+            f.start();
+            assertTrue(mLockLatch.await(TIMEOUT_MS, TimeUnit.MILLISECONDS));
+
+            Instant finish = Instant.now();
+            Duration timeElapsed = Duration.between(start, finish);
+            assertTrue(timeElapsed.toMillis() >= timeDelayInMs);
+        } else {
+            assertEquals(Tuner.RESULT_UNAVAILABLE, status);
+        }
+        f.close();
+        f = null;
+    }
+
+    @Test
+    public void testFilterDataSizeDelay() throws Exception {
+        Filter f = createTsSectionFilter(mTuner, getExecutor(), getFilterCallback());
+        int status = f.delayCallbackUntilBytesAccumulated(5000);
+        if (TunerVersionChecker.isHigherOrEqualVersionTo(TunerVersionChecker.TUNER_VERSION_2_0)) {
+            assertEquals(Tuner.RESULT_SUCCESS, status);
+        } else {
+            assertEquals(Tuner.RESULT_UNAVAILABLE, status);
+        }
+        f.close();
+    }
+
+    @Test
+    public void testMaxNumberOfFrontends() throws Exception {
+        List<Integer> ids = mTuner.getFrontendIds();
+        assertFalse(ids.isEmpty());
+        for (int i = 0; i < ids.size(); i++) {
+            int type = mTuner.getFrontendInfoById(ids.get(i)).getType();
+            if (TunerVersionChecker.isHigherOrEqualVersionTo(
+                        TunerVersionChecker.TUNER_VERSION_2_0)) {
+                int defaultMax = -1;
+                int status;
+                // Check default value
+                defaultMax = mTuner.getMaxNumberOfFrontends(type);
+                assertTrue(defaultMax > 0);
+                // Set to -1
+                status = mTuner.setMaxNumberOfFrontends(type, -1);
+                assertEquals(Tuner.RESULT_INVALID_ARGUMENT, status);
+                // Set to defaultMax + 1
+                status = mTuner.setMaxNumberOfFrontends(type, defaultMax + 1);
+                assertEquals(Tuner.RESULT_INVALID_ARGUMENT, status);
+                // Set to 0
+                status = mTuner.setMaxNumberOfFrontends(type, 0);
+                assertEquals(Tuner.RESULT_SUCCESS, status);
+                // Check after set
+                int currentMax = -1;
+                currentMax = mTuner.getMaxNumberOfFrontends(type);
+                assertEquals(currentMax, 0);
+                // Reset to default
+                status = mTuner.setMaxNumberOfFrontends(type, defaultMax);
+                assertEquals(Tuner.RESULT_SUCCESS, status);
+                currentMax = mTuner.getMaxNumberOfFrontends(type);
+                assertEquals(defaultMax, currentMax);
+            } else {
+                int defaultMax = mTuner.getMaxNumberOfFrontends(type);
+                assertEquals(defaultMax, -1);
+                int status = mTuner.setMaxNumberOfFrontends(type, 0);
+                assertEquals(Tuner.RESULT_UNAVAILABLE, status);
+            }
+        }
+    }
+
+    public static Filter createTsSectionFilter(
+            Tuner tuner, Executor e, FilterCallback cb) {
+        Filter f = tuner.openFilter(Filter.TYPE_TS, Filter.SUBTYPE_SECTION, 1000, e, cb);
+        Settings settings = SectionSettingsWithTableInfo
+                .builder(Filter.TYPE_TS)
+                .setTableId(2)
+                .setVersion(1)
+                .setCrcEnabled(true)
+                .setRaw(false)
+                .setRepeat(false)
+                .build();
+        FilterConfiguration config = TsFilterConfiguration
+                .builder()
+                .setTpid(10)
+                .setSettings(settings)
+                .build();
+        f.configure(config);
+        f.setMonitorEventMask(
+                Filter.MONITOR_EVENT_SCRAMBLING_STATUS | Filter.MONITOR_EVENT_IP_CID_CHANGE);
+
+        return f;
     }
 
     private boolean hasTuner() {
@@ -838,14 +2502,33 @@
                         testRestartEvent(filter, (RestartEvent) e);
                     }
                 }
+                if (mLockLatch != null) {
+                    mLockLatch.countDown();
+                }
             }
             @Override
             public void onFilterStatusChanged(Filter filter, int status) {}
         };
     }
 
+    private SharedFilterCallback getSharedFilterCallback() {
+        return new SharedFilterCallback() {
+            @Override
+            public void onFilterEvent(SharedFilter filter, FilterEvent[] events) {}
+            @Override
+            public void onFilterStatusChanged(SharedFilter filter, int status) {
+                if (status == SharedFilter.STATUS_INACCESSIBLE) {
+                    if (mLockLatch != null) {
+                        mLockLatch.countDown();
+                    }
+                }
+            }
+        };
+    }
+
     private void testDownloadEvent(Filter filter, DownloadEvent e) {
         e.getItemId();
+        e.getDownloadId();
         e.getMpuSequenceNumber();
         e.getItemFragmentIndex();
         e.getLastItemFragmentIndex();
@@ -868,6 +2551,8 @@
         e.getStreamId();
         e.isPtsPresent();
         e.getPts();
+        e.isDtsPresent();
+        e.getDts();
         e.getDataLength();
         e.getOffset();
         e.getLinearBlock();
@@ -876,6 +2561,7 @@
         e.getAudioHandle();
         e.getMpuSequenceNumber();
         e.isPrivateData();
+        e.getScIndexMask();
         AudioDescriptor ad = e.getExtraMetaData();
         if (ad != null) {
             ad.getAdFade();
@@ -917,7 +2603,8 @@
         e.getTableId();
         e.getVersion();
         e.getSectionNumber();
-        long length = e.getDataLength();
+        e.getDataLength();
+        long length = e.getDataLengthLong();
         if (length > 0) {
             byte[] buffer = new byte[(int) length];
             assertNotEquals(0, filter.read(buffer, 0, length));
@@ -969,10 +2656,10 @@
         };
     }
 
-    private FrontendSettings createFrontendSettings(FrontendInfo info) {
+    static public FrontendSettings createFrontendSettings(FrontendInfo info) {
             FrontendCapabilities caps = info.getFrontendCapabilities();
-            int minFreq = info.getFrequencyRange().getLower();
-            int maxFreq = info.getFrequencyRange().getUpper();
+            long minFreq = info.getFrequencyRangeLong().getLower();
+            long maxFreq = info.getFrequencyRangeLong().getUpper();
             FrontendCapabilities feCaps = info.getFrontendCapabilities();
             switch(info.getType()) {
                 case FrontendSettings.TYPE_ANALOG: {
@@ -981,7 +2668,7 @@
                     int sif = getFirstCapable(analogCaps.getSifStandardCapability());
                     return AnalogFrontendSettings
                             .builder()
-                            .setFrequency(minFreq)
+                            .setFrequencyLong(55250000) //2nd freq of VHF
                             .setSignalType(signalType)
                             .setSifStandard(sif)
                             .build();
@@ -993,11 +2680,11 @@
                     Atsc3FrontendSettings settings =
                             Atsc3FrontendSettings
                                     .builder()
-                                    .setFrequency(minFreq)
+                                    .setFrequencyLong(473000000) // 1st freq of UHF
                                     .setBandwidth(bandwidth)
                                     .setDemodOutputFormat(demod)
                                     .build();
-                    settings.setEndFrequency(maxFreq);
+                    settings.setEndFrequencyLong(maxFreq);
                     return settings;
                 }
                 case FrontendSettings.TYPE_ATSC: {
@@ -1005,7 +2692,7 @@
                     int modulation = getFirstCapable(atscCaps.getModulationCapability());
                     return AtscFrontendSettings
                             .builder()
-                            .setFrequency(minFreq)
+                            .setFrequencyLong(479000000) // 2nd freq of UHF
                             .setModulation(modulation)
                             .build();
                 }
@@ -1017,12 +2704,12 @@
                     DvbcFrontendSettings settings =
                             DvbcFrontendSettings
                                     .builder()
-                                    .setFrequency(minFreq)
+                                    .setFrequencyLong(490000000)
                                     .setModulation(modulation)
                                     .setInnerFec(fec)
                                     .setAnnex(annex)
                                     .build();
-                    settings.setEndFrequency(maxFreq);
+                    settings.setEndFrequencyLong(maxFreq);
                     return settings;
                 }
                 case FrontendSettings.TYPE_DVBS: {
@@ -1032,11 +2719,11 @@
                     DvbsFrontendSettings settings =
                             DvbsFrontendSettings
                                     .builder()
-                                    .setFrequency(minFreq)
+                                    .setFrequencyLong(950000000) //950Mhz
                                     .setModulation(modulation)
                                     .setStandard(standard)
                                     .build();
-                    settings.setEndFrequency(maxFreq);
+                    settings.setEndFrequencyLong(maxFreq);
                     return settings;
                 }
                 case FrontendSettings.TYPE_DVBT: {
@@ -1047,9 +2734,9 @@
                     int codeRate = getFirstCapable(dvbtCaps.getCodeRateCapability());
                     int hierarchy = getFirstCapable(dvbtCaps.getHierarchyCapability());
                     int guardInterval = getFirstCapable(dvbtCaps.getGuardIntervalCapability());
-                    return DvbtFrontendSettings
+                    DvbtFrontendSettings settings = DvbtFrontendSettings
                             .builder()
-                            .setFrequency(minFreq)
+                            .setFrequencyLong(498000000)
                             .setTransmissionMode(transmission)
                             .setBandwidth(bandwidth)
                             .setConstellation(constellation)
@@ -1060,28 +2747,34 @@
                             .setStandard(DvbtFrontendSettings.STANDARD_T)
                             .setMiso(false)
                             .build();
+                    settings.setEndFrequencyLong(maxFreq);
+                    return settings;
                 }
                 case FrontendSettings.TYPE_ISDBS3: {
                     Isdbs3FrontendCapabilities isdbs3Caps = (Isdbs3FrontendCapabilities) caps;
                     int modulation = getFirstCapable(isdbs3Caps.getModulationCapability());
                     int codeRate = getFirstCapable(isdbs3Caps.getCodeRateCapability());
-                    return Isdbs3FrontendSettings
+                    Isdbs3FrontendSettings settings = Isdbs3FrontendSettings
                             .builder()
-                            .setFrequency(minFreq)
+                            .setFrequencyLong(1000000000) //1000 Mhz
                             .setModulation(modulation)
                             .setCodeRate(codeRate)
                             .build();
+                    settings.setEndFrequencyLong(maxFreq);
+                    return settings;
                 }
                 case FrontendSettings.TYPE_ISDBS: {
                     IsdbsFrontendCapabilities isdbsCaps = (IsdbsFrontendCapabilities) caps;
                     int modulation = getFirstCapable(isdbsCaps.getModulationCapability());
                     int codeRate = getFirstCapable(isdbsCaps.getCodeRateCapability());
-                    return IsdbsFrontendSettings
+                    IsdbsFrontendSettings settings = IsdbsFrontendSettings
                             .builder()
-                            .setFrequency(minFreq)
+                            .setFrequencyLong(1050000000) //1050 Mhz
                             .setModulation(modulation)
                             .setCodeRate(codeRate)
                             .build();
+                    settings.setEndFrequencyLong(maxFreq);
+                    return settings;
                 }
                 case FrontendSettings.TYPE_ISDBT: {
                     IsdbtFrontendCapabilities isdbtCaps = (IsdbtFrontendCapabilities) caps;
@@ -1090,15 +2783,45 @@
                     int modulation = getFirstCapable(isdbtCaps.getModulationCapability());
                     int codeRate = getFirstCapable(isdbtCaps.getCodeRateCapability());
                     int guardInterval = getFirstCapable(isdbtCaps.getGuardIntervalCapability());
-                    return IsdbtFrontendSettings
-                            .builder()
-                            .setFrequency(minFreq)
-                            .setModulation(modulation)
-                            .setBandwidth(bandwidth)
-                            .setMode(mode)
-                            .setCodeRate(codeRate)
-                            .setGuardInterval(guardInterval)
-                            .build();
+                    int timeInterleaveMode =
+                            getFirstCapable(isdbtCaps.getTimeInterleaveModeCapability());
+                    boolean isSegmentAutoSupported = isdbtCaps.isSegmentAutoSupported();
+                    boolean isFullSegmentSupported = isdbtCaps.isFullSegmentSupported();
+
+                    IsdbtFrontendSettings.Builder builder = IsdbtFrontendSettings.builder();
+                    builder.setFrequencyLong(527143000); //22 ch    527.143 MHz
+                    builder.setBandwidth(bandwidth);
+                    builder.setMode(mode);
+                    builder.setGuardInterval(guardInterval);
+
+                    if (!TunerVersionChecker.isHigherOrEqualVersionTo(
+                                TunerVersionChecker.TUNER_VERSION_2_0)) {
+                        builder.setModulation(modulation);
+                        builder.setCodeRate(codeRate);
+                    } else {
+                        IsdbtFrontendSettings.IsdbtLayerSettings.Builder layerBuilder =
+                                IsdbtFrontendSettings.IsdbtLayerSettings.builder();
+                        layerBuilder.setTimeInterleaveMode(timeInterleaveMode);
+                        layerBuilder.setModulation(modulation);
+                        layerBuilder.setCodeRate(codeRate);
+                        if (isSegmentAutoSupported) {
+                            layerBuilder.setNumberOfSegments(0xFF);
+                        } else {
+                            if (isFullSegmentSupported) {
+                                layerBuilder.setNumberOfSegments(13);
+                            } else {
+                                layerBuilder.setNumberOfSegments(1);
+                            }
+                        }
+                        IsdbtFrontendSettings.IsdbtLayerSettings layer = layerBuilder.build();
+                        builder.setLayerSettings(
+                                new IsdbtFrontendSettings.IsdbtLayerSettings[] {layer});
+                        builder.setPartialReceptionFlag(
+                                IsdbtFrontendSettings.PARTIAL_RECEPTION_FLAG_TRUE);
+                    }
+                    IsdbtFrontendSettings settings = builder.build();
+                    settings.setEndFrequencyLong(maxFreq);
+                    return settings;
                 }
                 case FrontendSettings.TYPE_DTMB: {
                     DtmbFrontendCapabilities dtmbCaps = (DtmbFrontendCapabilities) caps;
@@ -1113,7 +2836,7 @@
                     DtmbFrontendSettings settings =
                             DtmbFrontendSettings
                                     .builder()
-                                    .setFrequency(minFreq)
+                                    .setFrequencyLong(506000000)
                                     .setModulation(modulation)
                                     .setTransmissionMode(transmissionMode)
                                     .setBandwidth(bandwidth)
@@ -1121,7 +2844,7 @@
                                     .setGuardInterval(guardInterval)
                                     .setTimeInterleaveMode(timeInterleaveMode)
                                     .build();
-                    settings.setEndFrequency(maxFreq);
+                    settings.setEndFrequencyLong(maxFreq);
                     return settings;
                 }
                 default:
@@ -1130,7 +2853,7 @@
         return null;
     }
 
-    private int getFirstCapable(int caps) {
+    static public int getFirstCapable(int caps) {
         if (caps == 0) return 0;
         int mask = 1;
         while ((mask & caps) == 0) {
@@ -1139,7 +2862,7 @@
         return (mask & caps);
     }
 
-    private long getFirstCapable(long caps) {
+    static public long getFirstCapable(long caps) {
         if (caps == 0) return 0;
         long mask = 1;
         while ((mask & caps) == 0) {
@@ -1158,6 +2881,14 @@
             }
 
             @Override
+            public void onUnlocked() {
+                ScanCallback.super.onUnlocked();
+                if (mLockLatch != null) {
+                    mLockLatch.countDown();
+                }
+            }
+
+            @Override
             public void onScanStopped() {}
 
             @Override
@@ -1167,6 +2898,11 @@
             public void onFrequenciesReported(int[] frequency) {}
 
             @Override
+            public void onFrequenciesLongReported(long[] frequencies) {
+                ScanCallback.super.onFrequenciesLongReported(frequencies);
+            }
+
+            @Override
             public void onSymbolRatesReported(int[] rate) {}
 
             @Override
@@ -1217,6 +2953,80 @@
             public void onDvbcAnnexReported(int dvbcAnnext) {
                 ScanCallback.super.onDvbcAnnexReported(dvbcAnnext);
             }
+
+            @Override
+            public void onDvbtCellIdsReported(int[] dvbtCellIds) {
+                ScanCallback.super.onDvbtCellIdsReported(dvbtCellIds);
+            }
         };
     }
+
+    // TunerHandler utility for testing Tuner api calls in a different thread
+    private static final int MSG_TUNER_HANDLER_CREATE = 1;
+    private static final int MSG_TUNER_HANDLER_TUNE = 2;
+    private static final int MSG_TUNER_HANDLER_CLOSE = 3;
+
+    private ConditionVariable mTunerHandlerTaskComplete = new ConditionVariable();
+
+    private TunerHandler createTunerHandler(Looper looper) {
+        if (looper != null) {
+            return new TunerHandler(looper);
+        } else if ((looper = Looper.myLooper()) != null) {
+            return new TunerHandler(looper);
+        } else if ((looper = Looper.getMainLooper()) != null) {
+            return new TunerHandler(looper);
+        }
+        return null;
+    }
+
+    private class TunerHandler extends Handler {
+        Object mLock = new Object();
+        Tuner mHandlersTuner;
+        int mResult;
+
+        private TunerHandler(Looper looper) {
+            super(looper);
+        }
+
+        public Tuner getTuner() {
+            synchronized (mLock) {
+                return mHandlersTuner;
+            }
+        }
+
+        public int getResult() {
+            synchronized (mLock) {
+                return mResult;
+            }
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            switch (msg.what) {
+                case MSG_TUNER_HANDLER_CREATE: {
+                    synchronized (mLock) {
+                        int useCase = msg.arg1;
+                        mHandlersTuner = new Tuner(mContext, null, useCase);
+                    }
+                    break;
+                }
+                case MSG_TUNER_HANDLER_TUNE: {
+                    synchronized (mLock) {
+                        FrontendSettings feSettings = (FrontendSettings) msg.obj;
+                        mResult = mHandlersTuner.tune(feSettings);
+                    }
+                    break;
+                }
+                case MSG_TUNER_HANDLER_CLOSE: {
+                    synchronized (mLock) {
+                        mHandlersTuner.close();
+                    }
+                    break;
+                }
+                default:
+                    break;
+            }
+            mTunerHandlerTaskComplete.open();
+        }
+    }
 }
diff --git a/tests/tests/uidmigration/Android.bp b/tests/tests/uidmigration/Android.bp
new file mode 100644
index 0000000..4f98ae6
--- /dev/null
+++ b/tests/tests/uidmigration/Android.bp
@@ -0,0 +1,41 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsSharedUserMigrationTestCases",
+    defaults: ["cts_defaults"],
+    static_libs: [
+        "compatibility-device-util-axt",
+        "androidx.test.rules",
+        "ctstestrunner-axt",
+        "permission-test-util-lib",
+        "services.core",
+        "CtsSharedUserMigrationTestLibs",
+    ],
+    libs: [
+        "android.test.runner",
+        "android.test.base",
+    ],
+    srcs: ["src/**/*.kt"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    platform_apis: true,
+}
diff --git a/tests/tests/uidmigration/AndroidManifest.xml b/tests/tests/uidmigration/AndroidManifest.xml
new file mode 100644
index 0000000..c3530da
--- /dev/null
+++ b/tests/tests/uidmigration/AndroidManifest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="android.uidmigration.cts" >
+
+    <application android:label="SharedUserMigrationTest" />
+
+    <instrumentation
+        android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:targetPackage="android.uidmigration.cts"
+        android:label="CTS tests of android.uidmigration" >
+        <meta-data
+            android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
diff --git a/tests/tests/uidmigration/AndroidTest.xml b/tests/tests/uidmigration/AndroidTest.xml
new file mode 100644
index 0000000..0b0e0ca
--- /dev/null
+++ b/tests/tests/uidmigration/AndroidTest.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<configuration description="Config for CTS Shared UID Migration test cases">
+    <option name="test-suite-tag" value="cts" />
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+    <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
+        <option name="cleanup" value="true" />
+        <option name="push" value="CtsSharedUserMigrationInstallTestApp.apk->/data/local/tmp/cts/uidmigration/InstallTestApp.apk" />
+        <option name="push" value="CtsSharedUserMigrationInstallTestApp2.apk->/data/local/tmp/cts/uidmigration/InstallTestApp2.apk" />
+        <option name="push" value="CtsSharedUserMigrationInstallTestApp3.apk->/data/local/tmp/cts/uidmigration/InstallTestApp3.apk" />
+        <option name="push" value="CtsSharedUserMigrationInstallTestApp4.apk->/data/local/tmp/cts/uidmigration/InstallTestApp4.apk" />
+        <option name="push" value="CtsSharedUserMigrationPermissionTestApp1.apk->/data/local/tmp/cts/uidmigration/PermissionTestApp1.apk" />
+        <option name="push" value="CtsSharedUserMigrationPermissionTestApp2.apk->/data/local/tmp/cts/uidmigration/PermissionTestApp2.apk" />
+        <option name="push" value="CtsSharedUserMigrationPermissionTestApp3.apk->/data/local/tmp/cts/uidmigration/PermissionTestApp3.apk" />
+        <option name="push" value="CtsSharedUserMigrationDataTestApp1.apk->/data/local/tmp/cts/uidmigration/DataTestApp1.apk" />
+        <option name="push" value="CtsSharedUserMigrationDataTestApp2.apk->/data/local/tmp/cts/uidmigration/DataTestApp2.apk" />
+    </target_preparer>
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsSharedUserMigrationTestCases.apk" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.uidmigration.cts" />
+    </test>
+</configuration>
diff --git a/tests/tests/uidmigration/DataTestApp/Android.bp b/tests/tests/uidmigration/DataTestApp/Android.bp
new file mode 100644
index 0000000..6779334
--- /dev/null
+++ b/tests/tests/uidmigration/DataTestApp/Android.bp
@@ -0,0 +1,48 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsSharedUserMigrationDataTestApp1",
+    defaults: ["cts_defaults"],
+    sdk_version: "current",
+    static_libs: [
+        "CtsSharedUserMigrationTestLibs",
+    ],
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    srcs: ["src/**/*.kt"],
+}
+
+android_test_helper_app {
+    name: "CtsSharedUserMigrationDataTestApp2",
+    defaults: ["cts_defaults"],
+    sdk_version: "current",
+    static_libs: [
+        "CtsSharedUserMigrationTestLibs",
+    ],
+    manifest: "AndroidManifest2.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    srcs: ["src/**/*.kt"],
+}
diff --git a/tests/tests/uidmigration/DataTestApp/AndroidManifest.xml b/tests/tests/uidmigration/DataTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..4c0339f
--- /dev/null
+++ b/tests/tests/uidmigration/DataTestApp/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.uidmigration.cts.DataTestApp"
+    android:sharedUserId="android.uidmigration.cts" >
+
+    <queries>
+        <package android:name="android.uidmigration.cts" />
+    </queries>
+
+    <application>
+        <provider
+            android:name="android.uidmigration.cts.DataProvider"
+            android:authorities="android.uidmigration.cts.DataTestApp.provider"
+            android:exported="true" />
+        <receiver
+            android:name="android.uidmigration.cts.DataTestReceiver"
+            android:exported="false" >
+            <intent-filter>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
diff --git a/tests/tests/uidmigration/DataTestApp/AndroidManifest2.xml b/tests/tests/uidmigration/DataTestApp/AndroidManifest2.xml
new file mode 100644
index 0000000..996cc80
--- /dev/null
+++ b/tests/tests/uidmigration/DataTestApp/AndroidManifest2.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.uidmigration.cts.DataTestApp"
+    android:sharedUserId="android.uidmigration.cts"
+    android:sharedUserMaxSdkVersion="32" >
+
+    <queries>
+        <package android:name="android.uidmigration.cts" />
+    </queries>
+
+    <application>
+        <provider
+            android:name="android.uidmigration.cts.DataProvider"
+            android:authorities="android.uidmigration.cts.DataTestApp.provider"
+            android:exported="true" />
+        <receiver
+            android:name="android.uidmigration.cts.DataTestReceiver"
+            android:exported="false" >
+            <intent-filter>
+                <action android:name="android.intent.action.MY_PACKAGE_REPLACED" />
+            </intent-filter>
+        </receiver>
+    </application>
+</manifest>
diff --git a/tests/tests/uidmigration/DataTestApp/src/android/uidmigration/cts/DataProvider.kt b/tests/tests/uidmigration/DataTestApp/src/android/uidmigration/cts/DataProvider.kt
new file mode 100644
index 0000000..ef77854
--- /dev/null
+++ b/tests/tests/uidmigration/DataTestApp/src/android/uidmigration/cts/DataProvider.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2021 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 android.uidmigration.cts
+
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Bundle
+import java.util.UUID
+
+class DataProvider : BaseProvider() {
+
+    companion object {
+        private const val RESULT_KEY = "result"
+    }
+
+    private lateinit var mPrefs: SharedPreferences
+
+    override fun onCreate(): Boolean {
+        mPrefs = requireContext().getSharedPreferences("prefs", Context.MODE_PRIVATE)
+        return true
+    }
+
+    // The first time this method is called, it returns a new random UUID and stores it in prefs.
+    // After an upgrade, if data migration works properly, it returns the previously generated UUID.
+    // The tester app asserts that the UUIDs returned before/after the upgrade to be the same.
+    private fun checkData(): Bundle {
+        val prefsKey = "uuid"
+        val data = Bundle()
+        val uuid = mPrefs.getString(prefsKey, null) ?: UUID.randomUUID().toString().also {
+            mPrefs.edit().putString(prefsKey, it).commit()
+        }
+        data.putString(RESULT_KEY, uuid)
+        return data
+    }
+
+    override fun call(method: String, arg: String?, extras: Bundle?): Bundle {
+        return when (method) {
+            "data" -> checkData()
+            else -> Bundle()
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/uidmigration/DataTestApp/src/android/uidmigration/cts/DataTestReceiver.kt b/tests/tests/uidmigration/DataTestApp/src/android/uidmigration/cts/DataTestReceiver.kt
new file mode 100644
index 0000000..cf0cbfe
--- /dev/null
+++ b/tests/tests/uidmigration/DataTestApp/src/android/uidmigration/cts/DataTestReceiver.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2021 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 android.uidmigration.cts
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.os.Process
+
+class DataTestReceiver : BroadcastReceiver() {
+    override fun onReceive(context: Context, intent: Intent) {
+        when (intent.action) {
+            Intent.ACTION_MY_PACKAGE_REPLACED -> {
+                // Notify the tester app
+                val i = Intent(Const.ACTION_UPDATE_ACK)
+                i.setPackage(Const.CTS_TEST_PKG)
+                i.putExtra(Intent.EXTRA_UID, Process.myUid())
+                context.sendBroadcast(i)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/uidmigration/InstallTestApp/Android.bp b/tests/tests/uidmigration/InstallTestApp/Android.bp
new file mode 100644
index 0000000..91620f8
--- /dev/null
+++ b/tests/tests/uidmigration/InstallTestApp/Android.bp
@@ -0,0 +1,64 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsSharedUserMigrationInstallTestApp",
+    defaults: ["cts_defaults"],
+    sdk_version: "current",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsSharedUserMigrationInstallTestApp2",
+    package_name: "android.uidmigration.cts.InstallTestApp2",
+    defaults: ["cts_defaults"],
+    sdk_version: "current",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsSharedUserMigrationInstallTestApp3",
+    defaults: ["cts_defaults"],
+    manifest: "AndroidManifest3.xml",
+    sdk_version: "current",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsSharedUserMigrationInstallTestApp4",
+    defaults: ["cts_defaults"],
+    manifest: "AndroidManifest4.xml",
+    sdk_version: "current",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
diff --git a/tests/tests/uidmigration/InstallTestApp/AndroidManifest.xml b/tests/tests/uidmigration/InstallTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..c49500f
--- /dev/null
+++ b/tests/tests/uidmigration/InstallTestApp/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="android.uidmigration.cts.InstallTestApp"
+        android:sharedUserId="android.uidmigration.cts" >
+    <application android:hasCode="false"/>
+</manifest>
diff --git a/tests/tests/uidmigration/InstallTestApp/AndroidManifest3.xml b/tests/tests/uidmigration/InstallTestApp/AndroidManifest3.xml
new file mode 100644
index 0000000..5b9eb27
--- /dev/null
+++ b/tests/tests/uidmigration/InstallTestApp/AndroidManifest3.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="android.uidmigration.cts.InstallTestApp" >
+    <application android:hasCode="false"/>
+</manifest>
diff --git a/tests/tests/uidmigration/InstallTestApp/AndroidManifest4.xml b/tests/tests/uidmigration/InstallTestApp/AndroidManifest4.xml
new file mode 100644
index 0000000..fd52958
--- /dev/null
+++ b/tests/tests/uidmigration/InstallTestApp/AndroidManifest4.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        package="android.uidmigration.cts.InstallTestApp"
+        android:sharedUserId="android.uidmigration.cts"
+        android:sharedUserMaxSdkVersion="32" >
+    <application android:hasCode="false"/>
+</manifest>
diff --git a/tests/tests/uidmigration/OWNERS b/tests/tests/uidmigration/OWNERS
new file mode 100644
index 0000000..966a94a
--- /dev/null
+++ b/tests/tests/uidmigration/OWNERS
@@ -0,0 +1,4 @@
+# Bug component: 315013
+topjohnwu@google.com
+ashfall@google.com
+mpgroover@google.com
diff --git a/tests/tests/uidmigration/PermissionTestApp/Android.bp b/tests/tests/uidmigration/PermissionTestApp/Android.bp
new file mode 100644
index 0000000..2bdc777
--- /dev/null
+++ b/tests/tests/uidmigration/PermissionTestApp/Android.bp
@@ -0,0 +1,52 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsSharedUserMigrationPermissionTestApp1",
+    defaults: ["cts_defaults"],
+    sdk_version: "current",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsSharedUserMigrationPermissionTestApp2",
+    defaults: ["cts_defaults"],
+    sdk_version: "current",
+    manifest: "AndroidManifest2.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+android_test_helper_app {
+    name: "CtsSharedUserMigrationPermissionTestApp3",
+    defaults: ["cts_defaults"],
+    sdk_version: "current",
+    manifest: "AndroidManifest3.xml",
+    // tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
diff --git a/tests/tests/uidmigration/PermissionTestApp/AndroidManifest.xml b/tests/tests/uidmigration/PermissionTestApp/AndroidManifest.xml
new file mode 100644
index 0000000..17fe125
--- /dev/null
+++ b/tests/tests/uidmigration/PermissionTestApp/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.uidmigration.cts.PermissionTestApp"
+    android:sharedUserId="android.uidmigration.cts" >
+    <application android:hasCode="false"/>
+</manifest>
diff --git a/tests/tests/uidmigration/PermissionTestApp/AndroidManifest2.xml b/tests/tests/uidmigration/PermissionTestApp/AndroidManifest2.xml
new file mode 100644
index 0000000..9f8e5ac
--- /dev/null
+++ b/tests/tests/uidmigration/PermissionTestApp/AndroidManifest2.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.uidmigration.cts.PermissionTestApp.secondary"
+    android:sharedUserId="android.uidmigration.cts" >
+
+     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+     <uses-permission android:name="android.permission.INTERNET" />
+
+    <application android:hasCode="false"/>
+</manifest>
diff --git a/tests/tests/uidmigration/PermissionTestApp/AndroidManifest3.xml b/tests/tests/uidmigration/PermissionTestApp/AndroidManifest3.xml
new file mode 100644
index 0000000..0098414
--- /dev/null
+++ b/tests/tests/uidmigration/PermissionTestApp/AndroidManifest3.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.uidmigration.cts.PermissionTestApp.secondary"
+    android:sharedUserId="android.uidmigration.cts"
+    android:sharedUserMaxSdkVersion="32" >
+
+     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+     <uses-permission android:name="android.permission.INTERNET" />
+
+    <application android:hasCode="false"/>
+</manifest>
diff --git a/tests/tests/uidmigration/TEST_MAPPING b/tests/tests/uidmigration/TEST_MAPPING
new file mode 100644
index 0000000..d63d02c
--- /dev/null
+++ b/tests/tests/uidmigration/TEST_MAPPING
@@ -0,0 +1,12 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsSharedUserMigrationTestCases",
+      "options": [
+        {
+          "include-filter": "android.uidmigration.cts"
+        }
+      ]
+    }
+  ]
+}
diff --git a/tests/tests/uidmigration/lib/Android.bp b/tests/tests/uidmigration/lib/Android.bp
new file mode 100644
index 0000000..79aa69f
--- /dev/null
+++ b/tests/tests/uidmigration/lib/Android.bp
@@ -0,0 +1,22 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_library {
+    name: "CtsSharedUserMigrationTestLibs",
+    srcs: ["src/**/*.kt"],
+}
diff --git a/tests/tests/uidmigration/lib/src/android/uidmigration/cts/BaseProvider.kt b/tests/tests/uidmigration/lib/src/android/uidmigration/cts/BaseProvider.kt
new file mode 100644
index 0000000..0516ae4
--- /dev/null
+++ b/tests/tests/uidmigration/lib/src/android/uidmigration/cts/BaseProvider.kt
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2022 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 android.uidmigration.cts
+
+import android.content.ContentProvider
+import android.content.ContentValues
+import android.database.Cursor
+import android.net.Uri
+
+abstract class BaseProvider : ContentProvider() {
+    override fun onCreate() = true
+    override fun getType(uri: Uri): String? = null
+    override fun insert(uri: Uri, values: ContentValues?): Uri? = null
+    override fun delete(uri: Uri, selection: String?, selectionArgs: Array<out String>?) = 0
+    override fun update(
+        uri: Uri,
+        values: ContentValues?,
+        selection: String?,
+        selectionArgs: Array<out String>?
+    ) = 0
+
+    override fun query(
+        uri: Uri,
+        projection: Array<out String>?,
+        selection: String?,
+        selectionArgs: Array<out String>?,
+        sortOrder: String?
+    ): Cursor? = null
+}
\ No newline at end of file
diff --git a/tests/tests/uidmigration/lib/src/android/uidmigration/cts/Const.kt b/tests/tests/uidmigration/lib/src/android/uidmigration/cts/Const.kt
new file mode 100644
index 0000000..9064aa5
--- /dev/null
+++ b/tests/tests/uidmigration/lib/src/android/uidmigration/cts/Const.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2022 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 android.uidmigration.cts
+
+object Const {
+    const val CTS_TEST_PKG = "android.uidmigration.cts"
+    const val INSTALL_TEST_PKG = "android.uidmigration.cts.InstallTestApp"
+    const val INSTALL_TEST_PKG2 = "${INSTALL_TEST_PKG}2"
+    const val PERM_TEST_PKG = "android.uidmigration.cts.PermissionTestApp"
+    const val DATA_TEST_PKG = "android.uidmigration.cts.DataTestApp"
+    const val ACTION_UPDATE_ACK = "android.uidmigration.cts.ACTION_UPDATE_ACK"
+}
\ No newline at end of file
diff --git a/tests/tests/uidmigration/src/android/uidmigration/cts/AppIdMigrationTest.kt b/tests/tests/uidmigration/src/android/uidmigration/cts/AppIdMigrationTest.kt
new file mode 100644
index 0000000..1cc9980
--- /dev/null
+++ b/tests/tests/uidmigration/src/android/uidmigration/cts/AppIdMigrationTest.kt
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2021 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 android.uidmigration.cts
+
+import android.Manifest.permission.INTERNET
+import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
+import android.content.Context
+import android.content.pm.PackageManager
+import android.content.pm.PackageManager.PackageInfoFlags
+import android.permission.cts.PermissionUtils
+import android.permission.cts.PermissionUtils.isPermissionGranted
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.server.pm.SharedUidMigration.LIVE_TRANSITION
+import org.junit.After
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Ignore
+import org.junit.Test
+import org.junit.runner.RunWith
+
+// All tests ignored: appId migration is disabled (http://b/220015249)
+@RunWith(AndroidJUnit4::class)
+class AppIdMigrationTest {
+
+    companion object {
+        private const val RESULT_KEY = "result"
+    }
+
+    private lateinit var mContext: Context
+    private lateinit var mPm: PackageManager
+
+    @Before
+    fun setup() {
+        mContext = ApplicationProvider.getApplicationContext<Context>()
+        mPm = mContext.packageManager
+    }
+
+    @After
+    fun tearDown() {
+        uninstallPackage(Const.INSTALL_TEST_PKG)
+        uninstallPackage(Const.INSTALL_TEST_PKG + "2")
+        uninstallPackage(Const.PERM_TEST_PKG)
+        uninstallPackage(Const.PERM_TEST_PKG + ".secondary")
+        uninstallPackage(Const.DATA_TEST_PKG)
+    }
+
+    @Ignore
+    @Test
+    fun testAppInstall() = withStrategy(LIVE_TRANSITION) {
+        assertTrue(installPackage(InstallTest.APK))
+        assertTrue(installPackage(InstallTest.APK2))
+
+        // Both app should share the same UID.
+        val uid = mPm.getPackageUid(Const.INSTALL_TEST_PKG, PackageInfoFlags.of(0))
+        var pkgs = mPm.getPackagesForUid(uid).assertNotNull()
+        assertTrue(pkgs.sameAs(Const.INSTALL_TEST_PKG, Const.INSTALL_TEST_PKG + "2"))
+
+        // Should not allow upgrading to an APK that directly removes sharedUserId.
+        assertFalse(installPackage(InstallTest.APK3))
+
+        // Leave shared UID.
+        assertTrue(installPackage(InstallTest.APK4))
+        pkgs = mPm.getPackagesForUid(uid).assertNotNull()
+        assertTrue(pkgs.sameAs(Const.INSTALL_TEST_PKG + "2"))
+
+        uninstallPackage(Const.INSTALL_TEST_PKG)
+        uninstallPackage(Const.INSTALL_TEST_PKG + "2")
+    }
+
+    @Ignore
+    @Test
+    fun testPermissionMigration() = withStrategy(LIVE_TRANSITION) {
+        val apk = "$TMP_APK_PATH/PermissionTestApp"
+        assertTrue(installPackage(apk + "1.apk"))
+        assertTrue(installPackage(apk + "2.apk"))
+        val secondaryPkg = Const.PERM_TEST_PKG + ".secondary"
+
+        // Runtime permissions are not granted by default.
+        assertFalse(isPermissionGranted(secondaryPkg, WRITE_EXTERNAL_STORAGE))
+
+        // Grant a runtime permission.
+        PermissionUtils.grantPermission(secondaryPkg, WRITE_EXTERNAL_STORAGE)
+
+        // All apps in the UID group should have the same permissions.
+        assertTrue(isPermissionGranted(Const.PERM_TEST_PKG, INTERNET))
+        assertTrue(isPermissionGranted(Const.PERM_TEST_PKG, WRITE_EXTERNAL_STORAGE))
+        assertTrue(isPermissionGranted(secondaryPkg, INTERNET))
+        assertTrue(isPermissionGranted(secondaryPkg, WRITE_EXTERNAL_STORAGE))
+
+        // Upgrade and leave shared UID.
+        assertTrue(installPackage(apk + "3.apk"))
+
+        // The app in the original UID group should no longer have the permissions.
+        assertFalse(isPermissionGranted(Const.PERM_TEST_PKG, INTERNET))
+        assertFalse(isPermissionGranted(Const.PERM_TEST_PKG, WRITE_EXTERNAL_STORAGE))
+
+        // The upgraded app should still have the permissions.
+        assertTrue(isPermissionGranted(secondaryPkg, INTERNET))
+        assertTrue(isPermissionGranted(secondaryPkg, WRITE_EXTERNAL_STORAGE))
+        uninstallPackage(Const.PERM_TEST_PKG)
+        uninstallPackage(secondaryPkg)
+    }
+
+    @Ignore
+    @Test
+    fun testDataMigration() = withStrategy(LIVE_TRANSITION) {
+        val apk = "$TMP_APK_PATH/DataTestApp"
+        assertTrue(installPackage(apk + "1.apk"))
+        val oldUid = mPm.getPackageUid(Const.DATA_TEST_PKG, PackageInfoFlags.of(0))
+        val authority = Const.DATA_TEST_PKG + ".provider"
+        val resolver = mContext.contentResolver
+
+        // Ask the app to generate a new random UUID and persist in data.
+        var result = resolver.call(authority, "data", null, null).assertNotNull()
+        val oldUUID = result.getString(RESULT_KEY).assertNotNull()
+
+        // Update the data test APK and make sure UID changed.
+        assertTrue(installPackage(apk + "2.apk"))
+        val newUid = mPm.getPackageUid(Const.DATA_TEST_PKG, PackageInfoFlags.of(0))
+        assertNotEquals(oldUid, newUid)
+
+        // Ask the app again for a UUID. If data migration is working, it shall be the same.
+        result = resolver.call(authority, "data", null, null).assertNotNull()
+        val newUUID = result.getString(RESULT_KEY)
+        assertEquals(oldUUID, newUUID)
+        uninstallPackage(Const.DATA_TEST_PKG)
+    }
+}
diff --git a/tests/tests/uidmigration/src/android/uidmigration/cts/Common.kt b/tests/tests/uidmigration/src/android/uidmigration/cts/Common.kt
new file mode 100644
index 0000000..4a0a8863
--- /dev/null
+++ b/tests/tests/uidmigration/src/android/uidmigration/cts/Common.kt
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2022 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 android.uidmigration.cts
+
+import android.content.pm.PackageManager
+import com.android.compatibility.common.util.SystemUtil.runShellCommand
+import com.android.server.pm.SharedUidMigration
+import com.android.server.pm.SharedUidMigration.PROPERTY_KEY
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertNotNull
+
+const val TMP_APK_PATH = "/data/local/tmp/cts/uidmigration"
+
+val FLAG_ZERO = PackageManager.PackageInfoFlags.of(0)
+
+// What each APK meant
+// APK : pkg , with sharedUserId
+// APK2: pkg2, with sharedUserId
+// APK3: pkg , with sharedUserId removed
+// APK4: pkg , with sharedUserMaxSdkVersion="32"
+
+object InstallTest {
+    const val APK = "$TMP_APK_PATH/InstallTestApp.apk"
+    const val APK2 = "$TMP_APK_PATH/InstallTestApp2.apk"
+    const val APK3 = "$TMP_APK_PATH/InstallTestApp3.apk"
+    const val APK4 = "$TMP_APK_PATH/InstallTestApp4.apk"
+}
+
+@Suppress("NOTHING_TO_INLINE")
+inline fun <T> T?.assertNotNull(): T {
+    assertNotNull(this)
+    return this!!
+}
+
+@Suppress("NOTHING_TO_INLINE")
+inline fun assertEquals(a: Int, b: Int) = assertEquals(a.toLong(), b.toLong())
+
+// Identical regardless of order
+fun <T> Array<T>.sameAs(vararg items: T) =
+        size == items.size && all { items.contains(it) } && items.all { contains(it) }
+
+fun installPackage(apkPath: String): Boolean {
+    return runShellCommand("pm install --force-queryable -t $apkPath") == "Success\n"
+}
+
+fun uninstallPackage(packageName: String) {
+    runShellCommand("pm uninstall $packageName")
+}
+
+@SharedUidMigration.Strategy
+var migrationStrategy: Int
+    get() = SharedUidMigration.getCurrentStrategy()
+    set(value) { runShellCommand("setprop $PROPERTY_KEY $value") }
+
+inline fun withStrategy(strategy: Int? = null, body: () -> Unit) {
+    if (SharedUidMigration.isDisabled()) {
+        // Nothing to test if shared UID migration is disabled
+        return
+    }
+
+    val backup = migrationStrategy
+    strategy?.let { migrationStrategy = it }
+    try {
+        body.invoke()
+    } finally {
+        // Always restore the device state no matter what happened
+        migrationStrategy = backup
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/uidmigration/src/android/uidmigration/cts/SharedUserMigrationTest.kt b/tests/tests/uidmigration/src/android/uidmigration/cts/SharedUserMigrationTest.kt
new file mode 100644
index 0000000..1f7af46
--- /dev/null
+++ b/tests/tests/uidmigration/src/android/uidmigration/cts/SharedUserMigrationTest.kt
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2022 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 android.uidmigration.cts
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.os.Build
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import com.android.server.pm.SharedUidMigration.BEST_EFFORT
+import com.android.server.pm.SharedUidMigration.NEW_INSTALL_ONLY
+import org.junit.After
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotEquals
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertNull
+import org.junit.Assert.assertTrue
+import org.junit.Before
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class SharedUserMigrationTest {
+
+    private lateinit var mContext: Context
+    private lateinit var mPm: PackageManager
+
+    @Before
+    fun setup() {
+        mContext = ApplicationProvider.getApplicationContext<Context>()
+        mPm = mContext.packageManager
+    }
+
+    @After
+    fun tearDown() {
+        uninstallPackage(Const.INSTALL_TEST_PKG)
+        uninstallPackage(Const.INSTALL_TEST_PKG2)
+    }
+
+    // Restore and ensure both test apps are sharing UID.
+    private fun reset(uid: Int) {
+        uninstallPackage(Const.INSTALL_TEST_PKG)
+        assertTrue(installPackage(InstallTest.APK))
+        val pkgs = mPm.getPackagesForUid(uid).assertNotNull()
+        assertTrue(pkgs.sameAs(Const.INSTALL_TEST_PKG, Const.INSTALL_TEST_PKG2))
+    }
+
+    private fun testNewInstallOnly(uid: Int) {
+        migrationStrategy = NEW_INSTALL_ONLY
+
+        // Should not allow upgrading to an APK that directly removes sharedUserId.
+        assertFalse(installPackage(InstallTest.APK3))
+
+        // Directly parsing APK4 should return no sharedUserId.
+        var pkgInfo = mPm.getPackageArchiveInfo(InstallTest.APK4, FLAG_ZERO).assertNotNull()
+        assertNull(pkgInfo.sharedUserId)
+
+        assertTrue(installPackage(InstallTest.APK4))
+        var pkgs = mPm.getPackagesForUid(uid).assertNotNull()
+        // With NEW_INSTALL_ONLY, upgrades should not change appId.
+        assertTrue(pkgs.sameAs(Const.INSTALL_TEST_PKG, Const.INSTALL_TEST_PKG2))
+        pkgInfo = mPm.getPackageInfo(Const.INSTALL_TEST_PKG, FLAG_ZERO)
+        assertNotNull(pkgInfo.sharedUserId)
+
+        // Should not allow re-joining sharedUserId.
+        assertFalse(installPackage(InstallTest.APK))
+
+        // Uninstall and install a new pkg leaving shared UID
+        uninstallPackage(Const.INSTALL_TEST_PKG)
+        assertTrue(installPackage(InstallTest.APK4))
+        pkgs = mPm.getPackagesForUid(uid).assertNotNull()
+        // Newly installed apps with sharedUserMaxSdkVersion set should not join shared UID.
+        assertTrue(pkgs.sameAs(Const.INSTALL_TEST_PKG2))
+        pkgInfo = mPm.getPackageInfo(Const.INSTALL_TEST_PKG, FLAG_ZERO)
+        assertNull(pkgInfo.sharedUserId)
+    }
+
+    private fun testBestEffort(uid: Int) {
+        migrationStrategy = BEST_EFFORT
+
+        assertTrue(installPackage(InstallTest.APK4))
+        var pkgs = mPm.getPackagesForUid(uid).assertNotNull()
+        // With BEST_EFFORT, upgrades should also not change appId.
+        assertTrue(pkgs.sameAs(Const.INSTALL_TEST_PKG, Const.INSTALL_TEST_PKG2))
+        var pkgInfo = mPm.getPackageInfo(Const.INSTALL_TEST_PKG, FLAG_ZERO)
+        assertNotNull(pkgInfo.sharedUserId)
+
+        val oldUidName = mPm.getNameForUid(uid)
+        uninstallPackage(Const.INSTALL_TEST_PKG2)
+
+        // There should be only 1 package left in the shared UID group.
+        // This should trigger the transparent shared UID migration.
+        pkgs = mPm.getPackagesForUid(uid).assertNotNull()
+        assertTrue(pkgs.sameAs(Const.INSTALL_TEST_PKG))
+
+        // Confirm that the internal PackageSetting is actually migrated.
+        val newUidName = mPm.getNameForUid(uid)
+        assertNotEquals(oldUidName, newUidName)
+        pkgInfo = mPm.getPackageInfo(Const.INSTALL_TEST_PKG, FLAG_ZERO)
+        assertNull(pkgInfo.sharedUserId)
+
+        // Even installing another shared UID app, the appId shall not be reused.
+        assertTrue(installPackage(InstallTest.APK2))
+        pkgs = mPm.getPackagesForUid(uid).assertNotNull()
+        assertTrue(pkgs.sameAs(Const.INSTALL_TEST_PKG))
+    }
+
+    @Test
+    fun testAppInstall() = withStrategy {
+        assertTrue(installPackage(InstallTest.APK))
+        assertTrue(installPackage(InstallTest.APK2))
+
+        // Both app should share the same UID.
+        val uid = mPm.getPackageUid(Const.INSTALL_TEST_PKG, FLAG_ZERO)
+        val pkgs = mPm.getPackagesForUid(uid).assertNotNull()
+        assertTrue(pkgs.sameAs(Const.INSTALL_TEST_PKG, Const.INSTALL_TEST_PKG2))
+
+        if (Build.IS_USERDEBUG) {
+            testNewInstallOnly(uid)
+            reset(uid)
+            testBestEffort(uid)
+        } else {
+            when (migrationStrategy) {
+                NEW_INSTALL_ONLY -> testNewInstallOnly(uid)
+                BEST_EFFORT -> testBestEffort(uid)
+            }
+        }
+
+        tearDown()
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/uirendering/res/layout/draw_order.xml b/tests/tests/uirendering/res/layout/draw_order.xml
new file mode 100644
index 0000000..0ca1efc
--- /dev/null
+++ b/tests/tests/uirendering/res/layout/draw_order.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2021 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.
+  -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="@dimen/test_width"
+             android:layout_height="@dimen/test_height">
+    <View
+        android:id="@+id/blueview"
+        android:layout_width="@dimen/test_width"
+        android:layout_height="@dimen/test_height"
+        android:background="#0000FF" />
+    <View
+        android:id="@+id/greenview"
+        android:layout_width="@dimen/test_width"
+        android:layout_height="@dimen/test_height"
+        android:background="#00FF00" />
+</FrameLayout>
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/AntiAliasingVerifier.java b/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/AntiAliasingVerifier.java
new file mode 100644
index 0000000..c05a3ce
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/bitmapverifiers/AntiAliasingVerifier.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2021 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 android.uirendering.cts.bitmapverifiers;
+
+import android.graphics.Rect;
+import android.uirendering.cts.util.CompareUtils;
+
+/**
+ * Tests to see if there is rectangle of a given color, anti-aliased. It checks this by
+ * verifying that a nonzero number of pixels in the area lie strictly between the inner
+ * and outer colors (eg, they are a blend of the two). To verify that a rectangle is
+ * correctly rendered overall, create a RegionVerifier with one Rect to cover the inner
+ * region and another to cover the border region.
+ *
+ * Note that AA is tested by matching the final color against a blend of the inner/outer
+ * colors. To ensure correctness in this test, callers should simplify the test to include
+ * simple colors, eg, Black/Blue and no use of White (which includes colors in all channels).
+ */
+public class AntiAliasingVerifier extends PerPixelBitmapVerifier {
+    private int mOuterColor;
+    private int mInnerColor;
+    private Rect mBorderRect;
+    private int mVerifiedAAPixels = 0;
+
+    public AntiAliasingVerifier(int outerColor, int innerColor, Rect borderRect) {
+        // Zero tolerance since we use failures as signal to test for AA pixels
+        this(outerColor, innerColor, borderRect, 0);
+    }
+
+    public AntiAliasingVerifier(int outerColor, int innerColor, Rect borderRect, int tolerance) {
+        super(tolerance);
+        mOuterColor = outerColor;
+        mInnerColor = innerColor;
+        mBorderRect = borderRect;
+    }
+
+    @Override
+    protected int getExpectedColor(int x, int y) {
+        return mBorderRect.contains(x, y) ? mInnerColor : mOuterColor;
+    }
+
+    @Override
+    public boolean verify(int[] bitmap, int offset, int stride, int width, int height) {
+        boolean result = super.verify(bitmap, offset, stride, width, height);
+        // At a minimum, all but maybe the two end pixels on the left should be AA
+        result &= (mVerifiedAAPixels > (mBorderRect.height() - 2));
+        return result;
+    }
+
+    protected boolean verifyPixel(int x, int y, int observedColor) {
+        boolean result = super.verifyPixel(x, y, observedColor);
+        if (!result) {
+            result = CompareUtils.verifyPixelBetweenColors(observedColor, mOuterColor, mInnerColor);
+            if (result) {
+                ++mVerifiedAAPixels;
+            }
+        }
+        return result;
+    }
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/AImageDecoderTest.kt b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/AImageDecoderTest.kt
index b007698..84f0803 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/AImageDecoderTest.kt
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/AImageDecoderTest.kt
@@ -32,6 +32,8 @@
 import android.uirendering.cts.bitmapverifiers.GoldenImageVerifier
 import android.uirendering.cts.bitmapverifiers.RectVerifier
 import android.uirendering.cts.bitmapverifiers.RegionVerifier
+import android.uirendering.cts.differencevisualizers.PassFailVisualizer
+import android.uirendering.cts.util.BitmapDumper
 import junitparams.JUnitParamsRunner
 import junitparams.Parameters
 import org.junit.Test
@@ -53,6 +55,8 @@
     private val ANDROID_IMAGE_DECODER_FINISHED = -10
     private val ANDROID_IMAGE_DECODER_INVALID_STATE = -11
 
+    private val DEBUG_CAPTURE_IMAGES = false
+
     private fun getAssets(): AssetManager {
         return InstrumentationRegistry.getTargetContext().getAssets()
     }
@@ -144,6 +148,7 @@
      * @param mssimThreshold The minimum MSSIM value to accept as similar. Some
      *                       images do not match exactly, but they've been
      *                       manually verified to look the same.
+     * @param testName Optional name of the calling test for BitmapDumper.
      */
     private fun decodeAndCropFrames(
         image: String,
@@ -151,7 +156,8 @@
         numFrames: Int,
         scaleFactor: Float,
         crop: Crop,
-        mssimThreshold: Double
+        mssimThreshold: Double,
+        testName: String = ""
     ) {
         val decodeAndCropper = DecodeAndCropper(image, scaleFactor, crop)
         var expectedBm = decodeAndCropper.bitmap
@@ -176,7 +182,13 @@
         while (true) {
             nDecode(decoder, testBm, ANDROID_IMAGE_DECODER_SUCCESS)
             val verifier = GoldenImageVerifier(expectedBm, MSSIMComparer(mssimThreshold))
-            assertTrue(verifier.verify(testBm), "$image has mismatch in frame $i")
+            if (!verifier.verify(testBm)) {
+                if (DEBUG_CAPTURE_IMAGES) {
+                    BitmapDumper.dumpBitmaps(expectedBm, testBm, "$testName(${image}_$i)",
+                            "AImageDecoderTest", PassFailVisualizer());
+                }
+                fail("$image has mismatch in frame $i")
+            }
             expectedBm.recycle()
 
             i++
@@ -216,7 +228,11 @@
     @Test
     @Parameters(method = "animationsAndFrames")
     fun testDecodeFramesScaleDown(image: String, frameName: String, numFrames: Int) {
-        decodeAndCropFrames(image, frameName, numFrames, .5f, Crop.None, .749)
+        // Perceptually, this image looks reasonable, but the MSSIM is low enough to be
+        // meaningless. It has been manually verified.
+        if (image == "alphabetAnim.gif") return
+        decodeAndCropFrames(image, frameName, numFrames, .5f, Crop.None, .749,
+                "testDecodeFramesScaleDown")
     }
 
     @Test
@@ -240,7 +256,11 @@
     @Test
     @Parameters(method = "animationsAndFrames")
     fun testDecodeFramesAndCropTopScaleDown(image: String, frameName: String, numFrames: Int) {
-        decodeAndCropFrames(image, frameName, numFrames, .5f, Crop.Top, .749)
+        // Perceptually, this image looks reasonable, but the MSSIM is low enough to be
+        // meaningless. It has been manually verified.
+        if (image == "alphabetAnim.gif") return
+        decodeAndCropFrames(image, frameName, numFrames, .5f, Crop.Top, .749,
+                "testDecodeFramesAndCropTopScaleDown")
     }
 
     @Test
@@ -264,7 +284,11 @@
     @Test
     @Parameters(method = "animationsAndFrames")
     fun testDecodeFramesAndCropLeftScaleDown(image: String, frameName: String, numFrames: Int) {
-        decodeAndCropFrames(image, frameName, numFrames, .5f, Crop.Left, .596)
+        // Perceptually, this image looks reasonable, but the MSSIM is low enough to be
+        // meaningless. It has been manually verified.
+        if (image == "alphabetAnim.gif") return
+        decodeAndCropFrames(image, frameName, numFrames, .5f, Crop.Left, .596,
+                "testDecodeFramesAndCropLeftScaleDown")
     }
 
     @Test
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/BitmapTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/BitmapTests.java
index 907c88a..912004a 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/BitmapTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/BitmapTests.java
@@ -28,6 +28,7 @@
 import android.graphics.Picture;
 import android.graphics.Rect;
 import android.os.Handler;
+import android.os.Looper;
 import android.uirendering.cts.R;
 import android.uirendering.cts.bitmapcomparers.MSSIMComparer;
 import android.uirendering.cts.bitmapverifiers.BitmapVerifier;
@@ -49,6 +50,7 @@
 import org.junit.runner.RunWith;
 
 import java.util.Arrays;
+import java.util.function.Function;
 
 @LargeTest
 @RunWith(AndroidJUnit4.class)
@@ -88,6 +90,7 @@
     public void testChangeDuringRtAnimation() {
         class RtOnlyFrameCounter implements Window.OnFrameMetricsAvailableListener {
             private int count = 0;
+            Function<Integer, Void> onCountChanged = null;
 
             @Override
             public void onFrameMetricsAvailable(Window window, FrameMetrics frameMetrics,
@@ -96,6 +99,9 @@
                         && frameMetrics.getMetric(FrameMetrics.INPUT_HANDLING_DURATION) == 0
                         && frameMetrics.getMetric(FrameMetrics.LAYOUT_MEASURE_DURATION) == 0) {
                     count++;
+                    if (onCountChanged != null) {
+                        onCountChanged.apply(count);
+                    }
                 };
             }
 
@@ -121,19 +127,15 @@
                 mAnimator.setDuration(3000);
                 mAnimator.start();
 
-                Handler handler = new Handler();
-                handler.postDelayed(new Runnable() {
-                    @Override
-                    public void run() {
+                Handler handler = new Handler(Looper.getMainLooper());
+                counter.onCountChanged = (Integer count) -> {
+                    // Ensure we've produced a couple frames and should now be in the RenderThread
+                    // animation. So bitmap changes shouldn't be observed.
+                    if (count >= 2) {
                         child.setColor(Color.RED);
-                        try {
-                            Thread.sleep(1000);
-                        } catch (Exception e) {
-                            // do nothing
-                        }
-                        child.setColor(Color.BLUE);
                     }
-                }, 1000);
+                    return null;
+                };
                 getActivity().getWindow().addOnFrameMetricsAvailableListener(counter, handler);
             }
 
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/CanvasTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/CanvasTests.java
index de5da22..311e89b 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/CanvasTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/CanvasTests.java
@@ -32,6 +32,7 @@
 import android.graphics.RadialGradient;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.Region;
 import android.graphics.Shader;
 import android.uirendering.cts.R;
 import android.uirendering.cts.bitmapverifiers.BitmapVerifier;
@@ -40,13 +41,15 @@
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
-import androidx.test.runner.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+
 @MediumTest
-@RunWith(AndroidJUnit4.class)
+@RunWith(JUnitParamsRunner.class)
 public class CanvasTests extends ActivityTestBase {
 
     private static final int PAINT_COLOR = 0xff00ff00;
@@ -68,8 +71,12 @@
         return immutableBitmap;
     }
 
+    public Bitmap getMutableBitmap(Bitmap.Config config) {
+        return Bitmap.createBitmap(BITMAP_WIDTH, BITMAP_HEIGHT, config);
+    }
+
     public Bitmap getMutableBitmap() {
-        return Bitmap.createBitmap(BITMAP_WIDTH, BITMAP_HEIGHT, Bitmap.Config.ARGB_8888);
+        return getMutableBitmap(Bitmap.Config.ARGB_8888);
     }
 
     @Test
@@ -167,7 +174,7 @@
                 .runWithVerifier(new SamplePointVerifier(testPoints, colors));
     }
 
-    private void drawRotatedBitmap(boolean aa, Canvas canvas) {
+    private void drawRotatedBitmap(boolean aa, Canvas canvas, Bitmap.Config config) {
         // create a black bitmap to be drawn to the canvas
         Bitmap bm = getMutableBitmap();
         bm.eraseColor(Color.BLACK);
@@ -185,23 +192,32 @@
         canvas.drawBitmap(bm, 0, 0, aaPaint);
     }
 
+    private Object[] testConfigs() {
+        return new Object[] {
+            Bitmap.Config.ARGB_8888,
+            Bitmap.Config.RGBA_1010102
+        };
+    }
+
     @Test
-    public void testDrawRotatedBitmapWithAA() {
+    @Parameters(method = "testConfigs")
+    public void testDrawRotatedBitmapWithAA(Bitmap.Config config) {
         createTest()
                 .addCanvasClient((canvas, width, height) -> {
                     canvas.setDensity(400);
-                    drawRotatedBitmap(true, canvas);
+                    drawRotatedBitmap(true, canvas, config);
                 })
                 // Test asserts there are more than 10 grey pixels.
                 .runWithVerifier(AntiAliasPixelCounter.aaVerifier(Color.WHITE, Color.BLACK, 10));
     }
 
     @Test
-    public void testDrawRotatedBitmapWithoutAA() {
+    @Parameters(method = "testConfigs")
+    public void testDrawRotatedBitmapWithoutAA(Bitmap.Config config) {
         createTest()
                 .addCanvasClient((canvas, width, height) -> {
                     canvas.setDensity(400);
-                    drawRotatedBitmap(false, canvas);
+                    drawRotatedBitmap(false, canvas, config);
                 })
                 // Test asserts there are no grey pixels.
                 .runWithVerifier(AntiAliasPixelCounter.noAAVerifier(Color.WHITE, Color.BLACK));
@@ -837,6 +853,60 @@
     }
 
     @Test
+    public void testClipIntersectAndDifference() {
+        Point[] testPoints = {
+            new Point(1, 1),
+            new Point(10, 10),
+            new Point(25, 25)
+        };
+        int[] colors = {
+            Color.WHITE,
+            Color.RED,
+            Color.GREEN
+        };
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    // Base is white
+                    Paint paint = new Paint();
+                    paint.setColor(Color.WHITE);
+                    canvas.drawRect(0, 0, width, height, paint);
+
+                    // Fill inset with green, which will later be overwitten with
+                    // red except for a subsequent difference clip op
+                    canvas.clipRect(5, 5, width - 5, height - 5);
+                    paint.setColor(Color.GREEN);
+                    canvas.drawRect(0, 0, width, height, paint);
+
+                    // Cut out the inner region, so that it remains green
+                    canvas.clipOutRect(20, 20, width - 20, height - 20);
+                    paint.setColor(Color.RED);
+                    canvas.drawRect(0, 0, width, height, paint);
+                })
+                .runWithVerifier(new SamplePointVerifier(testPoints, colors));
+    }
+
+    // Expanding region ops (replace, reverse diff, union, and xor) are not allowed for clipping
+    @Test(expected = IllegalArgumentException.class)
+    public void testClipReplace() {
+        new Canvas(getMutableBitmap()).clipRect(0, 0, 10, 10, Region.Op.REPLACE);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testClipReverseDifference() {
+        new Canvas(getMutableBitmap()).clipRect(0, 0, 10, 10, Region.Op.REVERSE_DIFFERENCE);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testClipUnion() {
+        new Canvas(getMutableBitmap()).clipRect(0, 0, 10, 10, Region.Op.UNION);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testClipXor() {
+        new Canvas(getMutableBitmap()).clipRect(0, 0, 10, 10, Region.Op.XOR);
+    }
+
+    @Test
     public void testAntiAliasClipping() {
         createTest()
                 .addCanvasClient((canvas, width, height) -> {
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/DrawingOrderTest.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/DrawingOrderTest.java
new file mode 100644
index 0000000..97d6a67
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/DrawingOrderTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2021 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 android.uirendering.cts.testclasses;
+
+import android.graphics.Color;
+import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapverifiers.ColorVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+import android.uirendering.cts.testinfrastructure.ViewInitializer;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class DrawingOrderTest extends ActivityTestBase {
+
+    @Test
+    public void testDefaultDrawOrder() {
+        createTest().addLayout(R.layout.draw_order, null)
+                .runWithVerifier(new ColorVerifier(Color.GREEN));
+    }
+
+    @Test
+    public void testTranslationZOrder() {
+        createTest().addLayout(R.layout.draw_order, (ViewInitializer) view -> {
+            view.findViewById(R.id.blueview).setTranslationZ(4);
+            view.findViewById(R.id.greenview).setTranslationZ(0);
+        }).runWithVerifier(new ColorVerifier(Color.BLUE));
+    }
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/Nulls.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/Nulls.java
new file mode 100644
index 0000000..11e8b56
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/Nulls.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2021 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 android.uirendering.cts.testclasses;
+
+/** Indirection for the Java flow analysis to allow passing `null` for @Nonnull parameters. */
+public class Nulls {
+    @SuppressWarnings("null")
+    public static <T> T type() {
+        return null;
+    }
+
+    @SuppressWarnings("null")
+    public static <T> T[] array() {
+        return null;
+    }
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/RenderNodeTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/RenderNodeTests.java
index bed338c..ae79f4c 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/RenderNodeTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/RenderNodeTests.java
@@ -36,6 +36,7 @@
 import android.graphics.Rect;
 import android.graphics.RenderEffect;
 import android.graphics.RenderNode;
+import android.graphics.RuntimeShader;
 import android.graphics.Shader;
 import android.graphics.drawable.Drawable;
 import android.uirendering.cts.R;
@@ -872,6 +873,42 @@
             );
     }
 
+    private static String sRedBlueInversionShader = ""
+            + "uniform shader inputShader;"
+            +  "vec4 main(vec2 coord) { "
+            + "  vec4 color = inputShader.eval(coord);"
+            + "  return vec4(color.b, color.g, color.r, color.a);"
+            + "}";
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testRuntimeShaderRenderEffectInvalidUinformName() {
+        RuntimeShader shader = new RuntimeShader(sRedBlueInversionShader);
+        RenderEffect runtimeEffect = RenderEffect.createRuntimeShaderEffect(
+                shader, "invalidUniformName");
+    }
+
+    @Test
+    public void testRuntimeShaderRenderEffect() {
+        RuntimeShader shader = new RuntimeShader(sRedBlueInversionShader);
+        RenderEffect runtimeEffect = RenderEffect.createRuntimeShaderEffect(
+                shader, "inputShader");
+        final RenderNode renderNode = new RenderNode(null);
+        renderNode.setRenderEffect(runtimeEffect);
+        renderNode.setPosition(0, 0, TEST_WIDTH, TEST_HEIGHT);
+        {
+            Canvas recordingCanvas = renderNode.beginRecording();
+            Paint paint = new Paint();
+            paint.setColor(Color.BLUE);
+            recordingCanvas.drawRect(0, 0, TEST_WIDTH, TEST_HEIGHT, paint);
+            renderNode.endRecording();
+        }
+
+        createTest()
+                .addCanvasClientWithoutUsingPicture((canvas, width, height) -> {
+                    canvas.drawRenderNode(renderNode);
+                }, true)
+                .runWithVerifier(new ColorVerifier(Color.RED));
+    }
 
     @Test
     public void testBlurShaderLargeRadiiEdgeReplication() {
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/RuntimeShaderTests.kt b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/RuntimeShaderTests.kt
new file mode 100644
index 0000000..86da6df
--- /dev/null
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/RuntimeShaderTests.kt
@@ -0,0 +1,531 @@
+/*
+ * Copyright (C) 2021 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 android.uirendering.cts.testclasses
+
+import android.graphics.Bitmap
+import android.graphics.BitmapShader
+import android.graphics.BlendMode
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.ColorSpace
+import android.graphics.ComposeShader
+import android.graphics.Matrix
+import android.graphics.Paint
+import android.graphics.Picture
+import android.graphics.Rect
+import android.graphics.RuntimeShader
+import android.graphics.Shader
+import android.uirendering.cts.bitmapverifiers.RectVerifier
+import android.uirendering.cts.testinfrastructure.ActivityTestBase
+import android.uirendering.cts.testinfrastructure.CanvasClient
+import android.util.Half
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.MediumTest
+import org.junit.Assert
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+@MediumTest
+@RunWith(AndroidJUnit4::class)
+class RuntimeShaderTests : ActivityTestBase() {
+
+    @Test(expected = NullPointerException::class)
+    fun createWithNullInput() {
+        RuntimeShader(Nulls.type<String>())
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun createWithEmptyInput() {
+        RuntimeShader("")
+    }
+
+    val bitmapShader = BitmapShader(Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888),
+                                    Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
+
+    @Test(expected = NullPointerException::class)
+    fun setNullUniformName() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setFloatUniform(Nulls.type<String>(), 0.0f)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setEmptyUniformName() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setFloatUniform("", 0.0f)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setInvalidUniformName() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setFloatUniform("invalid", 0.0f)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setInvalidUniformType() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setFloatUniform("inputInt", 1.0f)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setInvalidUniformLength() {
+        val shader = RuntimeShader(simpleColorShader)
+        shader.setFloatUniform("inputNonColor", 1.0f, 1.0f, 1.0f)
+    }
+
+    @Test(expected = NullPointerException::class)
+    fun setNullIntUniformName() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setIntUniform(Nulls.type<String>(), 0)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setEmptyIntUniformName() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setIntUniform("", 0)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setInvalidIntUniformName() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setIntUniform("invalid", 0)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setInvalidIntUniformType() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setIntUniform("inputFloat", 1)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setInvalidIntUniformLength() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setIntUniform("inputInt", 1, 2)
+    }
+
+    @Test(expected = NullPointerException::class)
+    fun setNullColorName() {
+        val shader = RuntimeShader(simpleColorShader)
+        shader.setColorUniform(Nulls.type<String>(), 0)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setEmptyColorName() {
+        val shader = RuntimeShader(simpleColorShader)
+        shader.setColorUniform("", 0)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setInvalidColorName() {
+        val shader = RuntimeShader(simpleColorShader)
+        shader.setColorUniform("invalid", 0)
+    }
+
+    @Test(expected = NullPointerException::class)
+    fun setNullColorValue() {
+        val shader = RuntimeShader(simpleColorShader)
+        shader.setColorUniform("inputColor", Nulls.type<Color>())
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setColorValueNonColorUniform() {
+        val shader = RuntimeShader(simpleColorShader)
+        shader.setColorUniform("inputNonColor", Color.BLUE)
+    }
+
+    @Test(expected = NullPointerException::class)
+    fun setNullShaderName() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setInputShader(Nulls.type<String>(), bitmapShader)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setEmptyShaderName() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setInputShader("", bitmapShader)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setInvalidShaderName() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setInputShader("invalid", bitmapShader)
+    }
+
+    @Test(expected = NullPointerException::class)
+    fun setNullShaderValue() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setInputShader("inputShader", Nulls.type<Shader>())
+    }
+
+    @Test(expected = NullPointerException::class)
+    fun setNullBufferName() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setInputBuffer(Nulls.type<String>(), bitmapShader)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setEmptyBufferName() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setInputBuffer("", bitmapShader)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun setInvalidBufferName() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setInputBuffer("invalid", bitmapShader)
+    }
+
+    @Test(expected = NullPointerException::class)
+    fun setNullBufferValue() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setInputBuffer("inputShader", Nulls.type<BitmapShader>())
+    }
+
+    @Test
+    fun testDefaultUniform() {
+        val shader = RuntimeShader(simpleShader)
+        shader.setInputShader("inputShader", RuntimeShader(simpleRedShader))
+
+        val paint = Paint()
+        paint.shader = shader
+
+        val rect = Rect(10, 10, 80, 80)
+
+        createTest().addCanvasClient(CanvasClient
+                { canvas: Canvas, width: Int, height: Int -> canvas.drawRect(rect, paint) },
+                true).runWithVerifier(RectVerifier(Color.WHITE, Color.BLACK, rect))
+    }
+
+    @Test
+    fun testDefaultColorUniform() {
+        val shader = RuntimeShader(simpleColorShader)
+
+        val paint = Paint()
+        paint.shader = shader
+        paint.blendMode = BlendMode.SRC
+
+        val rect = Rect(10, 10, 80, 80)
+
+        createTest().addCanvasClient(CanvasClient
+                { canvas: Canvas, width: Int, height: Int -> canvas.drawRect(rect, paint) },
+                true).runWithVerifier(RectVerifier(Color.WHITE, Color.TRANSPARENT, rect))
+    }
+
+    @Test
+    fun testDefaultInputShader() {
+        val paint = Paint()
+        paint.color = Color.BLUE
+        paint.shader = RuntimeShader(mBlackIfInputNotOpaqueShader)
+
+        val rect = Rect(10, 10, 80, 80)
+
+        createTest().addCanvasClient(CanvasClient
+                { canvas: Canvas, width: Int, height: Int -> canvas.drawRect(rect, paint) },
+                true).runWithVerifier(RectVerifier(Color.WHITE, paint.color, rect))
+    }
+
+    @Test
+    fun testDefaultInputShaderWithPaintAlpha() {
+        val paint = Paint()
+        paint.color = Color.argb(0.5f, 0.0f, 0.0f, 1.0f)
+        paint.shader = RuntimeShader(mBlackIfInputNotOpaqueShader)
+        paint.blendMode = BlendMode.SRC
+
+        val rect = Rect(10, 10, 80, 80)
+
+        // The shader should be evaluated with an opaque paint color and the paint's alpha will be
+        // applied after the shader returns but before it is blended into the destination
+        createTest().addCanvasClient(CanvasClient
+                { canvas: Canvas, width: Int, height: Int -> canvas.drawRect(rect, paint) },
+                true).runWithVerifier(RectVerifier(Color.WHITE, paint.color, rect))
+    }
+
+    @Test
+    fun testInputShaderWithPaintAlpha() {
+        val shader = RuntimeShader(mBlackIfInputNotOpaqueShader)
+        shader.setInputShader("inputShader", RuntimeShader(mSemiTransparentBlueShader))
+
+        val paint = Paint()
+        paint.color = Color.argb(0.5f, 0.0f, 1.0f, .0f)
+        paint.shader = shader
+        paint.blendMode = BlendMode.SRC
+
+        val rect = Rect(10, 10, 80, 80)
+
+        // The shader should be evaluated first then the paint's alpha will be applied after the
+        // shader returns but before it is blended into the destination
+        createTest().addCanvasClient(CanvasClient
+                { canvas: Canvas, width: Int, height: Int -> canvas.drawRect(rect, paint) },
+                true).runWithVerifier(RectVerifier(Color.WHITE, Color.BLACK, rect))
+    }
+
+    @Test
+    fun testInputShaderWithFiltering() {
+        val bitmap = Bitmap.createBitmap(2, 2, Bitmap.Config.ARGB_8888)
+        bitmap.setPixel(0, 0, Color.RED)
+        bitmap.setPixel(1, 0, Color.BLUE)
+        bitmap.setPixel(0, 1, Color.BLUE)
+        bitmap.setPixel(1, 1, Color.RED)
+
+        val bitmapShader = BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
+
+        // use slightly left than half to avoid any confusion on which pixel
+        // is sampled with FILTER_MODE_NEAREST
+        val matrix = Matrix()
+        matrix.postScale(0.49f, 0.49f)
+        bitmapShader.setLocalMatrix(matrix)
+
+        val shader = RuntimeShader(samplingShader)
+        shader.setInputShader("inputShader", bitmapShader)
+
+        val rect = Rect(0, 0, 1, 1)
+        val paint = Paint()
+
+        // The bitmap shader should be sampled with FILTER_MODE_NEAREST as the paint's filtering
+        // flag is not respected
+        paint.shader = shader
+        paint.blendMode = BlendMode.SRC
+        createTest().addCanvasClient(CanvasClient
+                { canvas: Canvas, width: Int, height: Int -> canvas.drawRect(rect, paint) },
+                true).runWithVerifier(RectVerifier(Color.WHITE, Color.RED, rect))
+
+        // The bitmap shader should be sampled with FILTER_MODE_LINEAR as the paint's filtering
+        // flag is not respected
+        paint.isFilterBitmap = false
+        bitmapShader.filterMode = BitmapShader.FILTER_MODE_LINEAR
+        shader.setInputShader("inputShader", bitmapShader)
+        createTest().addCanvasClient(CanvasClient
+                { canvas: Canvas, width: Int, height: Int -> canvas.drawRect(rect, paint) },
+                true).runWithVerifier(RectVerifier(Color.WHITE,
+                Color.valueOf(0.5f, 0.0f, 0.5f).toArgb(), rect))
+    }
+
+    @Test
+    fun testInputBuffer() {
+        val unpremulColor = Color.valueOf(0.75f, 0.0f, 1.0f, 0.5f)
+
+        // create a buffer and put an unpremul value into it
+        val srcBuf = ByteBuffer.allocate(8)
+        srcBuf.order(ByteOrder.LITTLE_ENDIAN)
+        srcBuf.putShort(Half(unpremulColor.red()).halfValue())
+        srcBuf.putShort(Half(unpremulColor.green()).halfValue())
+        srcBuf.putShort(Half(unpremulColor.blue()).halfValue())
+        srcBuf.putShort(Half(unpremulColor.alpha()).halfValue())
+        srcBuf.rewind()
+
+        // create a bitmap with the unpremul value and set a colorspace to something that is
+        // different from the destination
+        val bitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.RGBA_F16,
+                true, ColorSpace.get(ColorSpace.Named.BT2020))
+        bitmap.copyPixelsFromBuffer(srcBuf)
+        bitmap.setPremultiplied(false)
+
+        val bitmapShader = BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
+        val shader = RuntimeShader(sampleComparisonShader)
+        shader.setFloatUniform("expectedSample", unpremulColor.components)
+
+        val rect = Rect(0, 0, 1, 1)
+        val paint = Paint()
+        paint.shader = shader
+        paint.blendMode = BlendMode.SRC
+
+        // Use setInputBuffer and let the shader verify that the sample contents were unaltered.
+        shader.setInputBuffer("inputShader", bitmapShader)
+        createTest().addCanvasClient(CanvasClient
+                { canvas: Canvas, width: Int, height: Int -> canvas.drawRect(rect, paint) },
+                true).runWithVerifier(RectVerifier(Color.WHITE, Color.GREEN, rect))
+
+        // Use setInputShader to treating it like a normal bitmap instead of data to verify
+        // everything is working as expected
+        shader.setInputShader("inputShader", bitmapShader)
+        createTest().addCanvasClient(CanvasClient
+                { canvas: Canvas, width: Int, height: Int -> canvas.drawRect(rect, paint) },
+                true).runWithVerifier(RectVerifier(Color.WHITE, Color.RED, rect))
+    }
+
+    @Test
+    fun testBasicColorUniform() {
+        val color = Color.valueOf(Color.BLUE).convert(ColorSpace.get(ColorSpace.Named.BT2020))
+        val shader = RuntimeShader(simpleColorShader)
+        shader.setColorUniform("inputColor", color)
+
+        val paint = Paint()
+        paint.shader = shader
+
+        val rect = Rect(10, 10, 80, 80)
+
+        createTest().addCanvasClient(CanvasClient
+                { canvas: Canvas, width: Int, height: Int -> canvas.drawRect(rect, paint) },
+                true).runWithVerifier(RectVerifier(Color.WHITE, Color.BLUE, rect))
+    }
+
+    @Test
+    fun testLinearColorIntrinsic() {
+        val colorA = Color.valueOf(0.75f, 0.25f, 0.0f, 1.0f)
+        val colorB = Color.valueOf(0.0f, 0.75f, 0.25f, 1.0f)
+        val shader = RuntimeShader(linearMixShader)
+        shader.setColorUniform("inputColorA", colorA)
+        shader.setColorUniform("inputColorB", colorB)
+
+        val linearExtendedSRGB = ColorSpace.get(ColorSpace.Named.LINEAR_EXTENDED_SRGB)
+        val linearColorA = colorA.convert(linearExtendedSRGB)
+        val linearColorB = colorB.convert(linearExtendedSRGB)
+        val linearColorMix = Color.valueOf((linearColorA.red() + linearColorB.red()) / 2.0f,
+                (linearColorA.green() + linearColorB.green()) / 2.0f,
+                (linearColorA.blue() + linearColorB.blue()) / 2.0f,
+                (linearColorA.alpha() + linearColorB.alpha()) / 2.0f,
+                linearExtendedSRGB)
+
+        val paint = Paint()
+        paint.shader = shader
+
+        val rect = Rect(10, 10, 80, 80)
+
+        createTest().addCanvasClient(CanvasClient
+        { canvas: Canvas, width: Int, height: Int -> canvas.drawRect(rect, paint) },
+                true).runWithVerifier(RectVerifier(Color.WHITE, linearColorMix.toArgb(), rect, 4))
+    }
+
+    @Test
+    fun testDrawThroughPicture() {
+        val rect = Rect(10, 10, 80, 80)
+        val picture = Picture()
+        run {
+            val paint = Paint()
+            paint.shader = RuntimeShader(simpleRedShader)
+
+            val canvas = picture.beginRecording(TEST_WIDTH, TEST_HEIGHT)
+            canvas.clipRect(rect)
+            canvas.drawPaint(paint)
+            picture.endRecording()
+        }
+        Assert.assertTrue(picture.requiresHardwareAcceleration())
+
+        createTest().addCanvasClient(CanvasClient
+        { canvas: Canvas, width: Int, height: Int -> canvas.drawPicture(picture) },
+                true).runWithVerifier(RectVerifier(Color.WHITE, Color.RED, rect))
+    }
+
+    @Test
+    fun testDrawThroughPictureWithComposeShader() {
+        val rect = Rect(10, 10, 80, 80)
+        val picture = Picture()
+        run {
+            val paint = Paint()
+            val runtimeShader = RuntimeShader(simpleRedShader)
+            paint.shader = ComposeShader(runtimeShader, bitmapShader, BlendMode.DST)
+
+            val canvas = picture.beginRecording(TEST_WIDTH, TEST_HEIGHT)
+            canvas.clipRect(rect)
+            canvas.drawPaint(paint)
+            picture.endRecording()
+        }
+        Assert.assertTrue(picture.requiresHardwareAcceleration())
+
+        createTest().addCanvasClient(CanvasClient
+        { canvas: Canvas, width: Int, height: Int -> canvas.drawPicture(picture) },
+                true).runWithVerifier(RectVerifier(Color.WHITE, Color.RED, rect))
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun testDrawIntoSoftwareCanvas() {
+        val paint = Paint()
+        paint.shader = RuntimeShader(simpleRedShader)
+
+        val canvas = Canvas(Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888))
+        canvas.drawRect(0f, 0f, 10f, 10f, paint)
+    }
+
+    @Test(expected = IllegalArgumentException::class)
+    fun testDrawIntoSoftwareCanvasWithComposeShader() {
+        val paint = Paint()
+        paint.shader = ComposeShader(RuntimeShader(simpleRedShader), bitmapShader, BlendMode.SRC)
+
+        val canvas = Canvas(Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888))
+        canvas.drawRect(0f, 0f, 10f, 10f, paint)
+    }
+
+    val mSemiTransparentBlueShader = """
+        vec4 main(vec2 coord) {
+          return vec4(0.0, 0.0, 0.5, 0.5);
+        }"""
+    val simpleRedShader = """
+       vec4 main(vec2 coord) {
+          return vec4(1.0, 0.0, 0.0, 1.0);
+       }"""
+    val simpleColorShader = """
+        layout(color) uniform vec4 inputColor;
+        uniform vec4 inputNonColor;
+        uniform int useNonColor;
+       vec4 main(vec2 coord) {
+          vec4 outputColor = inputColor;
+          if (useNonColor != 0) {
+            outputColor = inputNonColor;
+          }
+          return outputColor;
+       }"""
+    val linearMixShader = """
+        layout(color) uniform vec4 inputColorA;
+        layout(color) uniform vec4 inputColorB;
+       vec4 main(vec2 coord) {
+          vec3 linColorA = toLinearSrgb(inputColorA.rgb);
+          vec3 linColorB = toLinearSrgb(inputColorB.rgb);
+          if (linColorA == inputColorA.rgb) {
+            return vec4(1.0, 0.0, 0.0, 1.0);
+          }
+          if (linColorB == inputColorB.rgb) {
+            return vec4(0.0, 0.0, 0.0, 1.0);
+          }
+          vec3 linMixedColor = mix(linColorA, linColorB, 0.5);
+          return fromLinearSrgb(linMixedColor).rgb1;
+       }"""
+    val samplingShader = """
+        uniform shader inputShader;
+        vec4 main(vec2 coord) {
+          return inputShader.eval(coord).rgba;
+        }"""
+    val sampleComparisonShader = """
+        uniform shader inputShader;
+        uniform vec4 expectedSample;
+        vec4 main(vec2 coord) {
+          vec4 sampledValue = inputShader.eval(coord);
+          if (sampledValue == expectedSample) {
+            return vec4(0.0, 1.0, 0.0, 1.0);
+          }
+          return vec4(1.0, 0.0, 0.0, 1.0);
+        }"""
+    val simpleShader = """
+        uniform shader inputShader;
+        uniform float inputFloat;
+        uniform int inputInt;
+       vec4 main(vec2 coord) {
+          float alpha = float(100 - inputInt) / 100.0;
+          return vec4(inputShader.eval(coord).rgb * inputFloat, alpha);
+       }"""
+    val mBlackIfInputNotOpaqueShader = """
+        uniform shader inputShader;
+        vec4 main(vec2 coord) {
+          vec4 color = inputShader.eval(coord);
+          float multiplier = 1.0;
+          if (color.a != 1.0) {
+            multiplier = 0.0;
+          }
+          return vec4(color.rgb * multiplier, 1.0);
+        }"""
+}
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShaderTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShaderTests.java
index 651b7f9..58d3e17 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShaderTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ShaderTests.java
@@ -176,4 +176,24 @@
                 })
                 .runWithVerifier(new ColorVerifier(Color.WHITE));
     }
+
+    @Test
+    public void testSinglePixelBitmapShaderWith1010102Config() {
+        createTest()
+                .addCanvasClient(new CanvasClient() {
+                    Paint mPaint = new Paint();
+                    @Override
+                    public void draw(Canvas canvas, int width, int height) {
+                        if (mPaint.getShader() == null) {
+                            Bitmap shaderBitmap = Bitmap.createBitmap(
+                                    1, 1, Bitmap.Config.RGBA_1010102);
+                            shaderBitmap.eraseColor(Color.BLUE);
+                            mPaint.setShader(new BitmapShader(shaderBitmap,
+                                    Shader.TileMode.REPEAT, Shader.TileMode.REPEAT));
+                        }
+                        canvas.drawRect(0, 0, width, height, mPaint);
+                    }
+                })
+                .runWithVerifier(new ColorVerifier(Color.BLUE));
+    }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ViewClippingTests.java b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ViewClippingTests.java
index 5defe4b..7fa1441 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ViewClippingTests.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testclasses/ViewClippingTests.java
@@ -1,14 +1,16 @@
 package android.uirendering.cts.testclasses;
 
-import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import android.graphics.Color;
 import android.graphics.Outline;
 import android.graphics.Path;
 import android.graphics.Rect;
 import android.uirendering.cts.R;
+import android.uirendering.cts.bitmapverifiers.AntiAliasingVerifier;
 import android.uirendering.cts.bitmapverifiers.BitmapVerifier;
 import android.uirendering.cts.bitmapverifiers.RectVerifier;
+import android.uirendering.cts.bitmapverifiers.RegionVerifier;
 import android.uirendering.cts.testclasses.view.UnclippedBlueView;
 import android.uirendering.cts.testinfrastructure.ActivityTestBase;
 import android.uirendering.cts.testinfrastructure.ViewInitializer;
@@ -35,7 +37,12 @@
     static final Rect BOUNDS_RECT = new Rect(0, 0, 80, 80);
     static final Rect PADDED_RECT = new Rect(15, 16, 63, 62);
     static final Rect OUTLINE_RECT = new Rect(1, 2, 78, 79);
+    static final Rect ANTI_ALIAS_OUTLINE_RECT = new Rect(20, 10, 80, 80);
     static final Rect CLIP_BOUNDS_RECT = new Rect(10, 20, 50, 60);
+    static final Rect CONCAVE_OUTLINE_RECT1 = new Rect(0, 0, 10, 90);
+    static final Rect CONCAVE_TEST_RECT1 = new Rect(0, 10, 90, 90);
+    static final Rect CONCAVE_OUTLINE_RECT2 = new Rect(0, 0, 90, 10);
+    static final Rect CONCAVE_TEST_RECT2 = new Rect(10, 0, 90, 90);
 
     static final ViewInitializer BOUNDS_CLIP_INIT =
             rootView -> ((ViewGroup)rootView).setClipChildren(true);
@@ -49,6 +56,7 @@
 
     static final ViewInitializer OUTLINE_CLIP_INIT = rootView -> {
         View child = rootView.findViewById(R.id.child);
+//        ((ViewGroup)(child.getParent())).setBackgroundColor(Color.WHITE);
         child.setOutlineProvider(new ViewOutlineProvider() {
             @Override
             public void getOutline(View view, Outline outline) {
@@ -58,6 +66,48 @@
         child.setClipToOutline(true);
     };
 
+    static final ViewInitializer OUTLINE_CLIP_AA_INIT = rootView -> {
+        View child = rootView.findViewById(R.id.child);
+        ((ViewGroup) (child.getParent())).setBackgroundColor(Color.BLACK);
+        child.setOutlineProvider(new ViewOutlineProvider() {
+            Path mPath = new Path();
+            @Override
+            public void getOutline(View view, Outline outline) {
+                mPath.rewind();
+                // We're using the AA outline rect as a starting point, but shifting one of the
+                // vetices slightly to force AA for this not-quite-rectangle
+                mPath.moveTo(ANTI_ALIAS_OUTLINE_RECT.left, ANTI_ALIAS_OUTLINE_RECT.top);
+                mPath.lineTo(ANTI_ALIAS_OUTLINE_RECT.right, ANTI_ALIAS_OUTLINE_RECT.top);
+                mPath.lineTo(ANTI_ALIAS_OUTLINE_RECT.right, ANTI_ALIAS_OUTLINE_RECT.bottom);
+                mPath.lineTo(ANTI_ALIAS_OUTLINE_RECT.left + 1, ANTI_ALIAS_OUTLINE_RECT.bottom);
+                mPath.close();
+                outline.setPath(mPath);
+            }
+        });
+        child.setClipToOutline(true);
+    };
+
+    static final ViewInitializer CONCAVE_CLIP_INIT = rootView -> {
+        View child = rootView.findViewById(R.id.child);
+        ((ViewGroup) (child.getParent())).setBackgroundColor(Color.BLACK);
+        child.setOutlineProvider(new ViewOutlineProvider() {
+            Path mPath = new Path();
+            @Override
+            public void getOutline(View view, Outline outline) {
+                mPath.rewind();
+                mPath.addRect(CONCAVE_OUTLINE_RECT1.left, CONCAVE_OUTLINE_RECT1.top,
+                        CONCAVE_OUTLINE_RECT1.right, CONCAVE_OUTLINE_RECT1.bottom,
+                        Path.Direction.CW);
+                mPath.addRect(CONCAVE_OUTLINE_RECT2.left, CONCAVE_OUTLINE_RECT2.top,
+                        CONCAVE_OUTLINE_RECT2.right, CONCAVE_OUTLINE_RECT2.bottom,
+                        Path.Direction.CW);
+                outline.setPath(mPath);
+                assertTrue(outline.canClip());
+            }
+        });
+        child.setClipToOutline(true);
+    };
+
     static final ViewInitializer CLIP_BOUNDS_CLIP_INIT =
             view -> view.setClipBounds(CLIP_BOUNDS_RECT);
 
@@ -66,6 +116,18 @@
         return new RectVerifier(Color.WHITE, Color.BLUE, blueBoundsRect, 75);
     }
 
+    static BitmapVerifier makeConcaveClipVerifier() {
+        return new RegionVerifier()
+                .addVerifier(CONCAVE_TEST_RECT1, new RectVerifier(Color.BLACK, Color.BLUE,
+                        CONCAVE_OUTLINE_RECT1, 75))
+                .addVerifier(CONCAVE_TEST_RECT2, new RectVerifier(Color.BLACK, Color.BLUE,
+                        CONCAVE_OUTLINE_RECT2, 75));
+    }
+
+    static BitmapVerifier makeAAClipVerifier(Rect blueBoundsRect) {
+        return new AntiAliasingVerifier(Color.BLACK, Color.BLUE, blueBoundsRect);
+    }
+
     @Test
     public void testSimpleUnclipped() {
         createTest()
@@ -109,10 +171,16 @@
     }
 
     @Test
+    public void testAntiAliasedOutlineClip() {
+        // NOTE: Only HW is supported
+        createTest()
+                .addLayout(R.layout.blue_padded_layout, OUTLINE_CLIP_AA_INIT, true)
+                .runWithVerifier(makeAAClipVerifier(ANTI_ALIAS_OUTLINE_RECT));
+    }
+
+    @Test
     public void testOvalOutlineClip() {
-        // In hw this works because clipping to an arbitrary path (i.e. not a rectangle, round rect
-        // or circle) isn't supported, and is no-op'd.
-        // In sw this works because Outline clipping isn't supported.
+        // As of Android T, Outline clipping is enabled for all shapes.
         createTest()
                 .addLayout(R.layout.blue_padded_layout, view -> {
                     view.setOutlineProvider(new ViewOutlineProvider() {
@@ -123,10 +191,10 @@
                             mPath.addOval(0, 0, view.getWidth(), view.getHeight(),
                                     Path.Direction.CW);
                             outline.setPath(mPath);
-                            assertFalse(outline.canClip());
+                            assertTrue(outline.canClip());
                         }
                     });
-                    view.setClipToOutline(true); // should do nothing
+                    view.setClipToOutline(false); // should do nothing
                 })
                 .runWithVerifier(makeClipVerifier(FULL_RECT));
     }
@@ -137,23 +205,9 @@
         // path, but it does not result in clipping, which is only supported when explicitly calling
         // one of the other setters. (hw no-op's the arbitrary path, and sw doesn't support Outline
         // clipping.)
+        // As of T, path clipping is enabled for all Outline shapes.
         createTest()
-                .addLayout(R.layout.blue_padded_layout, view -> {
-                    view.setOutlineProvider(new ViewOutlineProvider() {
-                        Path mPath = new Path();
-                        @Override
-                        public void getOutline(View view, Outline outline) {
-                            mPath.reset();
-                            mPath.addRect(0, 0, 10, 100, Path.Direction.CW);
-                            mPath.addRect(0, 0, 100, 10, Path.Direction.CW);
-                            assertFalse(mPath.isConvex());
-
-                            outline.setPath(mPath);
-                            assertFalse(outline.canClip());
-                        }
-                    });
-                    view.setClipToOutline(true); // should do nothing
-                })
-                .runWithVerifier(makeClipVerifier(FULL_RECT));
+                .addLayout(R.layout.blue_padded_layout, CONCAVE_CLIP_INIT, true)
+                .runWithVerifier(makeConcaveClipVerifier());
     }
 }
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DrawActivity.kt b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DrawActivity.kt
index a5d40cf..7a91ab9 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DrawActivity.kt
+++ b/tests/tests/uirendering/src/android/uirendering/cts/testinfrastructure/DrawActivity.kt
@@ -82,6 +82,7 @@
 
         window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or
                 View.SYSTEM_UI_FLAG_FULLSCREEN
+        window.decorView.keepScreenOn = true
         mHandler = RenderSpecHandler()
 
         setContentView(R.layout.test_container)
@@ -119,7 +120,6 @@
             } catch (e: InterruptedException) {
                 throw AssertionError(e)
             }
-
         }
         assertNotNull("Timeout waiting for draw", mPositionInfo)
         return mPositionInfo!!
diff --git a/tests/tests/uirendering/src/android/uirendering/cts/util/CompareUtils.java b/tests/tests/uirendering/src/android/uirendering/cts/util/CompareUtils.java
index c80a778..de7d149 100644
--- a/tests/tests/uirendering/src/android/uirendering/cts/util/CompareUtils.java
+++ b/tests/tests/uirendering/src/android/uirendering/cts/util/CompareUtils.java
@@ -25,4 +25,16 @@
                 && Math.abs(Color.green(color) - average) <= threshold
                 && Math.abs(Color.blue(color) - average) <= threshold;
     }
+
+    /**
+     * @return True if color strictly between inner and outer colors. This verifies that the
+     * color is a mixture of the two, not just one or the other (for anti-aliased pixels).
+     */
+    public static boolean verifyPixelBetweenColors(int color, int expectedOuterColor,
+            int expectedInnerColor) {
+        if (color == expectedInnerColor || color == expectedOuterColor) {
+            return false;
+        }
+        return color == ((color & expectedInnerColor) | (color & expectedOuterColor));
+    }
 }
diff --git a/tests/tests/uirendering27/src/android/uirendering/cts/testclasses/ExpandingClipTest.java b/tests/tests/uirendering27/src/android/uirendering/cts/testclasses/ExpandingClipTest.java
new file mode 100644
index 0000000..eceb056
--- /dev/null
+++ b/tests/tests/uirendering27/src/android/uirendering/cts/testclasses/ExpandingClipTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2021 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 android.uirendering.cts.testclasses;
+
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.Point;
+import android.graphics.Region;
+import android.uirendering.cts.bitmapverifiers.ColorVerifier;
+import android.uirendering.cts.bitmapverifiers.SamplePointVerifier;
+import android.uirendering.cts.testinfrastructure.ActivityTestBase;
+
+import androidx.test.filters.SmallTest;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class ExpandingClipTest extends ActivityTestBase {
+
+    @Test
+    public void testClipReplace() {
+        // The replace op should function correctly on apps compatible with version 27
+        Point[] testPoints = {
+            new Point(0, 5),
+            new Point(10, 5)
+        };
+        int[] colors = {
+            Color.WHITE,
+            Color.BLUE
+        };
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    Paint paint = new Paint();
+                    paint.setColor(Color.WHITE);
+                    canvas.drawRect(0, 0, width, height, paint);
+
+                    // These are exclusive, but if the replace op properly
+                    // removes the earlier intersect, only the right portion of
+                    // the canvas will be filled with blue.
+                    canvas.clipRect(0, 0, 5, height);
+                    canvas.clipRect(5, 0, width, height, Region.Op.REPLACE);
+
+                    paint.setColor(Color.BLUE);
+                    canvas.drawRect(0, 0, width, height, paint);
+                })
+                .runWithVerifier(new SamplePointVerifier(testPoints, colors));
+    }
+
+    @Test
+    public void testClipUnsupportedExpandingOps() {
+        // Test that other expanding clip ops are silently ignored for v27
+        createTest()
+                .addCanvasClient((canvas, width, height) -> {
+                    // Should not modify clip state so later draw fills bitmap
+                    canvas.clipRect(0, 0, 5, 5, Region.Op.REVERSE_DIFFERENCE);
+                    canvas.clipRect(5, 5, 10, 10, Region.Op.XOR);
+                    canvas.clipRect(10, 10, 15, 15, Region.Op.UNION);
+
+                    Paint paint = new Paint();
+                    paint.setColor(Color.RED);
+                    canvas.drawRect(0, 0, width, height, paint);
+                })
+                .runWithVerifier(new ColorVerifier(Color.RED));
+    }
+}
\ No newline at end of file
diff --git a/tests/tests/usb/Android.bp b/tests/tests/usb/Android.bp
index 2a93d18..5bdf83c 100644
--- a/tests/tests/usb/Android.bp
+++ b/tests/tests/usb/Android.bp
@@ -23,6 +23,7 @@
     defaults: ["cts_defaults"],
     static_libs: [
 	"ctstestrunner-axt",
+	"CtsMockInputMethodLib",
     ],
     libs: [
         "android.test.runner",
diff --git a/tests/tests/usb/AndroidTest.xml b/tests/tests/usb/AndroidTest.xml
index fb75184..ef71236 100644
--- a/tests/tests/usb/AndroidTest.xml
+++ b/tests/tests/usb/AndroidTest.xml
@@ -19,6 +19,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsUsbManagerTestCases.apk" />
diff --git a/tests/tests/usb/src/android/usb/cts/UsbPortApiTest.java b/tests/tests/usb/src/android/usb/cts/UsbPortApiTest.java
new file mode 100644
index 0000000..cf269b9
--- /dev/null
+++ b/tests/tests/usb/src/android/usb/cts/UsbPortApiTest.java
@@ -0,0 +1,204 @@
+/*
+ * Copyright (C) 2021 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 android.usb.cts;
+
+import static android.Manifest.permission.MANAGE_USB;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
+
+import android.app.UiAutomation;
+import android.content.pm.PackageManager;
+import android.content.Context;
+import android.hardware.usb.IUsbOperationInternal;
+import android.hardware.usb.UsbManager;
+import android.hardware.usb.UsbPort;
+import android.util.Log;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.runner.AndroidJUnit4;
+
+import java.util.function.Consumer;
+import java.util.concurrent.Executor;
+
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+/**
+ * Unit tests for {@link android.hardware.usb.UsbPort}.
+ * Note: MUST claimed MANAGE_USB permission in Manifest
+ */
+@RunWith(AndroidJUnit4.class)
+public class UsbPortApiTest {
+    private static final String TAG = UsbPortApiTest.class.getSimpleName();
+
+    private Context mContext;
+
+    private UsbManager mUsbManagerSys =
+        InstrumentationRegistry.getContext().getSystemService(UsbManager.class);
+    private UsbManager mUsbManagerMock;
+    @Mock private android.hardware.usb.IUsbManager mMockUsbService;
+
+    private UsbPort mUsbPort;
+    private UsbPort mMockUsbPort;
+
+    private UiAutomation mUiAutomation =
+        InstrumentationRegistry.getInstrumentation().getUiAutomation();
+
+    private Executor mExecutor;
+    private Consumer<Integer> mConsumer;
+
+    @Before
+    public void setUp() {
+        mContext = InstrumentationRegistry.getContext();
+        mExecutor = mContext.getMainExecutor();
+        PackageManager pm = mContext.getPackageManager();
+        MockitoAnnotations.initMocks(this);
+
+        Assert.assertNotNull(mUsbManagerSys);
+        Assert.assertNotNull(mUsbManagerMock =
+                new UsbManager(mContext, mMockUsbService));
+        mUsbPort = new UsbPort(mUsbManagerSys, "1", 0, 0, true, true);
+    }
+
+    /**
+     * Verify NO SecurityException.
+     */
+    @Test
+    public void test_UsbApiForResetUsbPort() throws Exception {
+        // Adopt MANAGE_USB permission.
+        mUiAutomation.adoptShellPermissionIdentity(MANAGE_USB);
+
+        mMockUsbPort = new UsbPort(mUsbManagerMock, "1", 0, 0, true, true);
+        boolean result = true;
+
+        mConsumer = new Consumer<Integer>(){
+            public void accept(Integer status){
+                Log.d(TAG, "Consumer status:" + status);
+            };
+        };
+        // Should pass with permission.
+        mMockUsbService.resetUsbPort(anyString(), anyInt(),
+                  any(IUsbOperationInternal.class));
+        mMockUsbPort.resetUsbPort(mExecutor, mConsumer);
+
+        // Drop MANAGE_USB permission.
+        mUiAutomation.dropShellPermissionIdentity();
+
+        try {
+            mUsbPort.resetUsbPort(mExecutor, mConsumer);
+            Assert.fail("SecurityException not thrown for resetUsbPort when MANAGE_USB is not acquired.");
+        } catch (SecurityException secEx) {
+            Log.d(TAG, "SecurityException expected on resetUsbPort  when MANAGE_USB is not acquired.");
+        }
+    }
+
+    /**
+     * Verify that SecurityException is thrown when MANAGE_USB is not
+     * held and not thrown when MANAGE_USB is held.
+     */
+    @Test
+    public void test_UsbApiForEnableUsbDataWhileDocked() throws Exception {
+        // Adopt MANAGE_USB permission.
+        mUiAutomation.adoptShellPermissionIdentity(MANAGE_USB);
+
+        // Should pass with permission.
+        try {
+            mUsbPort.enableUsbDataWhileDocked();
+        } catch (SecurityException secEx) {
+            Assert.fail("Unexpected SecurityException on enableUsbDataWhileDocked.");
+        }
+
+        // Drop MANAGE_USB permission.
+        mUiAutomation.dropShellPermissionIdentity();
+
+        try {
+            mUsbPort.enableUsbDataWhileDocked();
+            Assert.fail(
+                "SecurityException not thrown for enableUsbDataWhileDocked when MANAGE_USB is not acquired.");
+        } catch (SecurityException secEx) {
+            Log.i(TAG,
+                "SecurityException expected on enableUsbDataWhileDocked when MANAGE_USB is not acquired.");
+        }
+    }
+
+    /**
+     * Verify that SecurityException is thrown when MANAGE_USB is not
+     * held and not thrown when MANAGE_USB is held.
+     */
+    @Test
+    public void test_UsbApiForEnableUsbData() throws Exception {
+        // Adopt MANAGE_USB permission.
+        mUiAutomation.adoptShellPermissionIdentity(MANAGE_USB);
+
+        // Should pass with permission.
+        try {
+            mUsbPort.enableUsbData(true);
+        } catch (SecurityException secEx) {
+            Assert.fail("Unexpected SecurityException on enableUsbData.");
+        }
+
+        // Drop MANAGE_USB permission.
+        mUiAutomation.dropShellPermissionIdentity();
+
+        try {
+            mUsbPort.enableUsbData(true);
+            Assert.fail(
+                "SecurityException not thrown for enableUsbData when MANAGE_USB is not acquired.");
+        } catch (SecurityException secEx) {
+            Log.i(TAG,
+                "SecurityException expected on enableUsbData when MANAGE_USB is not acquired.");
+        }
+    }
+
+    /**
+     * Verify that SecurityException is thrown when MANAGE_USB is not
+     * held and not thrown when MANAGE_USB is held.
+     */
+    @Test
+    public void test_UsbApiForEnableLimitPowerTransfer() throws Exception {
+        // Adopt MANAGE_USB permission.
+        mUiAutomation.adoptShellPermissionIdentity(MANAGE_USB);
+
+        // Should pass with permission.
+        try {
+            mUsbPort.enableLimitPowerTransfer(false);
+        } catch (SecurityException secEx) {
+            Assert.fail("Unexpected SecurityException on enableLimitPowerTransfer.");
+        }
+
+        // Drop MANAGE_USB permission.
+        mUiAutomation.dropShellPermissionIdentity();
+
+        try {
+            mUsbPort.enableLimitPowerTransfer(false);
+            Assert.fail(
+                "SecurityException not thrown for enableLimitPowerTransfer when MANAGE_USB is not acquired.");
+        } catch (SecurityException secEx) {
+            Log.i(TAG,
+                "SecurityException expected on enableLimitPowerTransfer when MANAGE_USB is not acquired.");
+        }
+    }
+}
diff --git a/tests/tests/util/AndroidTest.xml b/tests/tests/util/AndroidTest.xml
index 5af112e..13379cc 100644
--- a/tests/tests/util/AndroidTest.xml
+++ b/tests/tests/util/AndroidTest.xml
@@ -19,6 +19,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="parameter" value="all_foldable_states" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsUtilTestCases.apk" />
diff --git a/tests/tests/util/src/android/util/cts/ArrayMapTest.java b/tests/tests/util/src/android/util/cts/ArrayMapTest.java
index b70166b..377182f 100644
--- a/tests/tests/util/src/android/util/cts/ArrayMapTest.java
+++ b/tests/tests/util/src/android/util/cts/ArrayMapTest.java
@@ -46,6 +46,7 @@
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Set;
+import java.util.function.BiFunction;
 
 @SmallTest
 @RunWith(AndroidJUnit4.class)
@@ -635,6 +636,20 @@
         }
     }
 
+    @Test
+    public void testForEach() {
+        ArrayMap<String, Integer> map = new ArrayMap<>();
+
+        for (int i = 0; i < 50; ++i) {
+            map.put(Integer.toString(i), i * 10);
+        }
+
+        // Make sure forEach goes through all of the elements.
+        HashMap<String, Integer> seen = new HashMap<>();
+        map.forEach(seen::put);
+        compareMaps(seen, map);
+    }
+
     /**
      * The entrySet Iterator returns itself from each call to {@code next()}.
      * This is unusual behavior for {@link Iterator#next()}; this test ensures that
@@ -699,4 +714,20 @@
             fail("ArrayMap removeAll failure, expect empty, but " + map);
         }
     }
+
+    @Test
+    public void testReplaceAll() {
+        final ArrayMap<Integer, Integer> map = new ArrayMap<>();
+        final ArrayMap<Integer, Integer> expectedMap = new ArrayMap<>();
+        final BiFunction<Integer, Integer, Integer> function = (k, v) -> 2 * v;
+        for (Integer i : Arrays.asList(0, 1, 2, 3, 4, 5)) {
+            map.put(i, i);
+            expectedMap.put(i, 2 * i);
+        }
+
+        map.replaceAll(function);
+        if (!compare(map, expectedMap)) {
+            fail("ArrayMap replaceAll failure, expect " + expectedMap + ", but " + map);
+        }
+    }
 }
diff --git a/tests/tests/util/src/android/util/cts/ArraySetTest.java b/tests/tests/util/src/android/util/cts/ArraySetTest.java
index 70d307a..42309e3 100644
--- a/tests/tests/util/src/android/util/cts/ArraySetTest.java
+++ b/tests/tests/util/src/android/util/cts/ArraySetTest.java
@@ -412,6 +412,20 @@
     }
 
     @Test
+    public void testForEach() {
+        ArraySet<Integer> set = new ArraySet<>();
+
+        for (int i = 0; i < 50; ++i) {
+            set.add(i * 10);
+        }
+
+        // Make sure forEach goes through all of the elements.
+        HashSet<Integer> seen = new HashSet<>();
+        set.forEach(seen::add);
+        compareSets(seen, set);
+    }
+
+    @Test
     public void testIndexOf() {
         ArraySet<Integer> set = new ArraySet<>();
 
diff --git a/tests/tests/util/src/android/util/cts/DumpableTest.java b/tests/tests/util/src/android/util/cts/DumpableTest.java
new file mode 100644
index 0000000..d006f95
--- /dev/null
+++ b/tests/tests/util/src/android/util/cts/DumpableTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2022 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 android.util.cts;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.util.Dumpable;
+
+import org.junit.Test;
+
+import java.io.PrintWriter;
+
+public final class DumpableTest {
+
+    @Test
+    public void testGetDumpableName() {
+        Dumpable dumpable = new BondJamesBond();
+        assertWithMessage("dumpable (%s) name", dumpable).that(dumpable.getDumpableName())
+                .isEqualTo("android.util.cts.DumpableTest$BondJamesBond");
+    }
+
+    private static final class BondJamesBond implements Dumpable {
+
+        @Override
+        public void dump(PrintWriter writer, String[] args) {
+            throw new UnsupportedOperationException("Shaken, not stirred");
+        }
+    }
+}
diff --git a/tests/tests/view/Android.bp b/tests/tests/view/Android.bp
index 9df71d1..a2d863b 100644
--- a/tests/tests/view/Android.bp
+++ b/tests/tests/view/Android.bp
@@ -40,6 +40,8 @@
         "ctsdeviceutillegacy-axt",
         "ctstestrunner-axt",
         "cts-input-lib",
+        "cts-hardware-lib",
+        "junit-params",
         "mockito-target-minus-junit4",
         "platform-test-annotations",
         "ub-uiautomator",
diff --git a/tests/tests/view/AndroidManifest.xml b/tests/tests/view/AndroidManifest.xml
index a892da1..514c6fa 100644
--- a/tests/tests/view/AndroidManifest.xml
+++ b/tests/tests/view/AndroidManifest.xml
@@ -148,6 +148,17 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="android.view.cts.SDRTestActivity"
+            android:theme="@android:style/Theme.DeviceDefault.NoActionBar"
+            android:screenOrientation="locked"
+            android:label="SDRTestActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+
         <activity android:name="android.view.cts.TextureViewCameraActivity"
              android:screenOrientation="locked"
              android:exported="true">
@@ -411,7 +422,7 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="android.view.cts.InputDeviceKeyLayoutMapTestActivity"
+        <activity android:name="android.view.cts.input.InputDeviceKeyLayoutMapTestActivity"
              android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
@@ -461,6 +472,13 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="android.view.cts.InputQueueCtsActivity"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+        </activity>
+
         <!-- Overrides the activity declaration in AndroidX test library to remove the starting
              animation. -->
         <activity
@@ -468,6 +486,21 @@
             tools:replace="android:theme"
             android:theme="@style/WhiteBackgroundTheme" />
 
+        <activity android:name="android.view.cts.OnBackInvokedDispatcherTestActivity"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.view.cts.AutoHandwritingActivity"
+                  android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+        </activity>
+
         <service android:name="android.view.textclassifier.cts.CtsTextClassifierService"
              android:exported="true"
              android:permission="android.permission.BIND_TEXTCLASSIFIER_SERVICE">
diff --git a/tests/tests/view/jni/Android.bp b/tests/tests/view/jni/Android.bp
index 107650e..de254ed 100644
--- a/tests/tests/view/jni/Android.bp
+++ b/tests/tests/view/jni/Android.bp
@@ -33,6 +33,7 @@
         "android_view_cts_ASurfaceControlTest.cpp",
         "android_view_cts_ChoreographerNativeTest.cpp",
         "android_view_cts_InputDeviceKeyLayoutMapTest.cpp",
+        "android_view_cts_InputQueueTest.cpp",
     ],
 
     shared_libs: [
diff --git a/tests/tests/view/jni/ChoreographerTestUtils.h b/tests/tests/view/jni/ChoreographerTestUtils.h
new file mode 100644
index 0000000..58866a0
--- /dev/null
+++ b/tests/tests/view/jni/ChoreographerTestUtils.h
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2021 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.
+ *
+ */
+
+#include <android/choreographer.h>
+#include <android/log.h>
+#include <android/looper.h>
+#include <android/trace.h>
+#include <jni.h>
+#include <jniAssert.h>
+#include <sys/time.h>
+#include <time.h>
+
+#include <chrono>
+#include <cinttypes>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <limits>
+#include <mutex>
+#include <set>
+#include <sstream>
+#include <string>
+#include <thread>
+#include <tuple>
+#include <vector>
+
+using namespace std::chrono_literals;
+static constexpr std::chrono::nanoseconds NOMINAL_VSYNC_PERIOD{16ms};
+static constexpr std::chrono::nanoseconds DELAY_PERIOD{NOMINAL_VSYNC_PERIOD * 5};
+static constexpr std::chrono::nanoseconds ZERO{std::chrono::nanoseconds::zero()};
+
+#define NANOS_PER_SECOND 1000000000LL
+static int64_t systemTime() {
+    struct timespec time;
+    int result = clock_gettime(CLOCK_MONOTONIC, &time);
+    if (result < 0) {
+        return -errno;
+    }
+    return (time.tv_sec * NANOS_PER_SECOND) + time.tv_nsec;
+}
+
+static std::mutex gLock;
+struct Callback {
+    Callback(const char* name) : name(name) {}
+    std::string name;
+    int count{0};
+    std::chrono::nanoseconds frameTime{0LL};
+};
+
+struct VsyncCallback : Callback {
+    VsyncCallback(const char* name, JNIEnv* env) : Callback(name), env(env) {}
+
+    struct FrameTime {
+        FrameTime(const AChoreographerFrameCallbackData* callbackData, int index)
+              : vsyncId(AChoreographerFrameCallbackData_getFrameTimelineVsyncId(callbackData,
+                                                                                index)),
+                expectedPresentTime(
+                        AChoreographerFrameCallbackData_getFrameTimelineExpectedPresentationTimeNanos(
+                                callbackData, index)),
+                deadline(AChoreographerFrameCallbackData_getFrameTimelineDeadlineNanos(callbackData,
+                                                                                       index)) {}
+
+        const AVsyncId vsyncId{-1};
+        const int64_t expectedPresentTime{-1};
+        const int64_t deadline{-1};
+    };
+
+    void populate(const AChoreographerFrameCallbackData* callbackData) {
+        size_t index = AChoreographerFrameCallbackData_getPreferredFrameTimelineIndex(callbackData);
+        preferredFrameTimelineIndex = index;
+
+        size_t length = AChoreographerFrameCallbackData_getFrameTimelinesLength(callbackData);
+        {
+            std::lock_guard<std::mutex> _l{gLock};
+            ASSERT(length >= 1, "Frame timelines should not be empty");
+            ASSERT(index < length, "Frame timeline index must be less than length");
+        }
+        timeline.reserve(length);
+
+        for (int i = 0; i < length; i++) {
+            timeline.push_back(FrameTime(callbackData, i));
+        }
+    }
+
+    size_t getPreferredFrameTimelineIndex() const { return preferredFrameTimelineIndex; }
+    const std::vector<FrameTime>& getTimeline() const { return timeline; }
+
+private:
+    JNIEnv* env;
+    size_t preferredFrameTimelineIndex{std::numeric_limits<size_t>::max()};
+    std::vector<FrameTime> timeline;
+};
+
+static void vsyncCallback(int64_t frameTimeNanos, void* data) {
+    std::lock_guard<std::mutex> _l(gLock);
+    ATrace_beginSection("vsyncCallback base");
+    Callback* cb = static_cast<Callback*>(data);
+    cb->count++;
+    cb->frameTime = std::chrono::nanoseconds{frameTimeNanos};
+    ATrace_endSection();
+}
+
+static void vsyncCallback(const AChoreographerFrameCallbackData* callbackData, void* data) {
+    ATrace_beginSection("vsyncCallback");
+    vsyncCallback(AChoreographerFrameCallbackData_getFrameTimeNanos(callbackData), data);
+
+    VsyncCallback* cb = static_cast<VsyncCallback*>(data);
+    cb->populate(callbackData);
+    ATrace_endSection();
+}
+
+static void frameCallback64(int64_t frameTimeNanos, void* data) {
+    vsyncCallback(frameTimeNanos, data);
+}
+
+static void frameCallback(long frameTimeNanos, void* data) {
+    vsyncCallback((int64_t)frameTimeNanos, data);
+}
+
+static std::chrono::nanoseconds now() {
+    return std::chrono::steady_clock::now().time_since_epoch();
+}
+
+static void verifyCallback(JNIEnv* env, const Callback& cb, int expectedCount,
+                           std::chrono::nanoseconds startTime, std::chrono::nanoseconds maxTime) {
+    std::lock_guard<std::mutex> _l{gLock};
+    ASSERT(cb.count == expectedCount, "Choreographer failed to invoke '%s' %d times - actual: %d",
+           cb.name.c_str(), expectedCount, cb.count);
+    if (maxTime > ZERO) {
+        auto duration = cb.frameTime - startTime;
+        ASSERT(duration < maxTime, "Callback '%s' has incorrect frame time in invocation %d",
+               cb.name.c_str(), expectedCount);
+    }
+}
diff --git a/tests/tests/view/jni/CtsViewJniOnLoad.cpp b/tests/tests/view/jni/CtsViewJniOnLoad.cpp
index 2d4b3d7..92d57b4 100644
--- a/tests/tests/view/jni/CtsViewJniOnLoad.cpp
+++ b/tests/tests/view/jni/CtsViewJniOnLoad.cpp
@@ -23,6 +23,7 @@
 extern int register_android_view_cts_AKeyEventNativeTest(JNIEnv *env);
 extern int register_android_view_cts_AMotionEventNativeTest(JNIEnv *env);
 extern int register_android_view_cts_InputDeviceKeyLayoutMapTest(JNIEnv *env);
+extern int register_android_view_cts_InputQueueTest(JNIEnv *env);
 
 jint JNI_OnLoad(JavaVM *vm, void *) {
     JNIEnv *env = NULL;
@@ -44,5 +45,8 @@
     if (register_android_view_cts_InputDeviceKeyLayoutMapTest(env)) {
         return JNI_ERR;
     }
+    if (register_android_view_cts_InputQueueTest(env)) {
+        return JNI_ERR;
+    }
     return JNI_VERSION_1_4;
 }
diff --git a/tests/tests/view/jni/android_view_cts_AInputNativeTest.cpp b/tests/tests/view/jni/android_view_cts_AInputNativeTest.cpp
index 87670c4..c3d1885 100644
--- a/tests/tests/view/jni/android_view_cts_AInputNativeTest.cpp
+++ b/tests/tests/view/jni/android_view_cts_AInputNativeTest.cpp
@@ -37,6 +37,8 @@
     jmethodID getPointerCount;
     jmethodID getRawX;
     jmethodID getRawY;
+    jmethodID getActionButton;
+    jmethodID getClassification;
 } gMotionEventMethodIds;
 
 static struct KeyEventMethodId {
@@ -55,6 +57,8 @@
     jlong eventTime = env->CallLongMethod(obj, gMotionEventMethodIds.getEventTime) * NS_PER_MS;
     jint metaState = env->CallIntMethod(obj, gMotionEventMethodIds.getMetaState);
     jint pointerCount = env->CallIntMethod(obj, gMotionEventMethodIds.getPointerCount);
+    jint actionButton = env->CallIntMethod(obj, gMotionEventMethodIds.getActionButton);
+    jint classification = env->CallIntMethod(obj, gMotionEventMethodIds.getClassification);
 
     ASSERT(AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION, "Wrong event type %d.",
            AInputEvent_getType(event));
@@ -77,6 +81,14 @@
            "Wrong pointer count %zu not equal to %d", AMotionEvent_getPointerCount(event),
            pointerCount);
 
+    ASSERT(AMotionEvent_getActionButton(event) == actionButton,
+           "Wrong action button %d not equal to %d", AMotionEvent_getActionButton(event),
+           actionButton);
+
+    ASSERT(AMotionEvent_getClassification(event) == classification,
+           "Wrong classification %hhd not equal to %hhd", AMotionEvent_getClassification(event),
+           classification);
+
     for (int i = 0; i < pointerCount; i++) {
         jfloat rawX = env->CallFloatMethod(obj, gMotionEventMethodIds.getRawX, i);
         jfloat rawY = env->CallFloatMethod(obj, gMotionEventMethodIds.getRawY, i);
@@ -135,6 +147,8 @@
     gMotionEventMethodIds.getPointerCount = env->GetMethodID(clazz, "getPointerCount", "()I");
     gMotionEventMethodIds.getRawX = env->GetMethodID(clazz, "getRawX", "(I)F");
     gMotionEventMethodIds.getRawY = env->GetMethodID(clazz, "getRawY", "(I)F");
+    gMotionEventMethodIds.getActionButton = env->GetMethodID(clazz, "getActionButton", "()I");
+    gMotionEventMethodIds.getClassification = env->GetMethodID(clazz, "getClassification", "()I");
     jclass clazzTest = env->FindClass("android/view/cts/MotionEventTest");
     return env->RegisterNatives(clazzTest, JNI_METHODS_MOTION.data(), JNI_METHODS_MOTION.size());
 }
diff --git a/tests/tests/view/jni/android_view_cts_ASurfaceControlTest.cpp b/tests/tests/view/jni/android_view_cts_ASurfaceControlTest.cpp
index f315fbc..4689b14 100644
--- a/tests/tests/view/jni/android_view_cts_ASurfaceControlTest.cpp
+++ b/tests/tests/view/jni/android_view_cts_ASurfaceControlTest.cpp
@@ -16,12 +16,17 @@
 
 #define LOG_TAG "ASurfaceControlTest"
 
+#include <ChoreographerTestUtils.h>
+#include <android/choreographer.h>
 #include <android/data_space.h>
 #include <android/hardware_buffer.h>
+#include <android/hardware_buffer_jni.h>
 #include <android/log.h>
+#include <android/looper.h>
 #include <android/native_window_jni.h>
 #include <android/surface_control.h>
 #include <android/sync.h>
+#include <android/trace.h>
 #include <errno.h>
 #include <jni.h>
 #include <poll.h>
@@ -43,16 +48,6 @@
     jmethodID onTransactionComplete;
 } gTransactionCompleteListenerClassInfo;
 
-#define NANOS_PER_SECOND 1000000000LL
-int64_t systemTime() {
-    struct timespec time;
-    int result = clock_gettime(CLOCK_MONOTONIC, &time);
-    if (result < 0) {
-        return -errno;
-    }
-    return (time.tv_sec * NANOS_PER_SECOND) + time.tv_nsec;
-}
-
 static AHardwareBuffer* allocateBuffer(int32_t width, int32_t height) {
     AHardwareBuffer* buffer = nullptr;
     AHardwareBuffer_Desc desc = {};
@@ -98,6 +93,7 @@
     AHardwareBuffer_lock(buffer, AHARDWAREBUFFER_USAGE_CPU_WRITE_OFTEN, -1, &rect,
                                              &data);
     if (!data) {
+        AHardwareBuffer_release(buffer);
         return true;
     }
 
@@ -109,6 +105,16 @@
     return false;
 }
 
+jobject Utils_getSolidBuffer(JNIEnv* env, jobject /*clazz*/, jint width, jint height, jint color) {
+    AHardwareBuffer* buffer;
+    if (getSolidBuffer(width, height, static_cast<uint32_t>(color), &buffer, nullptr)) {
+        return nullptr;
+    }
+    jobject result = AHardwareBuffer_toHardwareBuffer(env, buffer);
+    AHardwareBuffer_release(buffer);
+    return result;
+}
+
 static bool getQuadrantBuffer(int32_t width, int32_t height, jint colorTopLeft,
                               jint colorTopRight, jint colorBottomRight,
                               jint colorBottomLeft,
@@ -143,6 +149,26 @@
     return false;
 }
 
+jobject Utils_getQuadrantBuffer(JNIEnv* env, jobject /*clazz*/, jint width, jint height,
+                                jint colorTopLeft, jint colorTopRight, jint colorBottomRight,
+                                jint colorBottomLeft) {
+    AHardwareBuffer* buffer;
+    if (getQuadrantBuffer(width, height, colorTopLeft, colorTopRight, colorBottomRight,
+                          colorBottomLeft, &buffer, nullptr)) {
+        return nullptr;
+    }
+    jobject result = AHardwareBuffer_toHardwareBuffer(env, buffer);
+    AHardwareBuffer_release(buffer);
+    return result;
+}
+
+jlong Utils_getBufferId(JNIEnv* env, jobject /*clazz*/, jobject jHardwareBuffer) {
+    AHardwareBuffer* buffer = AHardwareBuffer_fromHardwareBuffer(env, jHardwareBuffer);
+    uint64_t id = 0;
+    AHardwareBuffer_getId(buffer, &id);
+    return id;
+}
+
 jlong SurfaceTransaction_create(JNIEnv* /*env*/, jclass) {
     return reinterpret_cast<jlong>(ASurfaceTransaction_create());
 }
@@ -544,6 +570,77 @@
                                     nullptr, transactionCallbackWithoutContextThunk);
 }
 
+void SurfaceTransaction_setFrameTimeline(JNIEnv* /*env*/, jclass, jlong surfaceTransaction,
+                                         jlong vsyncId) {
+    ASurfaceTransaction_setFrameTimeline(reinterpret_cast<ASurfaceTransaction*>(surfaceTransaction),
+                                         vsyncId);
+}
+
+static struct {
+    jclass clazz;
+    jmethodID constructor;
+} gFrameTimelineClassInfo;
+
+static struct {
+    jclass clazz;
+    jmethodID constructor;
+} gFrameCallbackDataClassInfo;
+
+static void verifyChoreographer(JNIEnv* env, AChoreographer* choreographer) {
+    ASSERT(choreographer != nullptr, "Choreographer setup unsuccessful");
+}
+
+static void verifyPollCallback(JNIEnv* env, int result) {
+    ASSERT(result == ALOOPER_POLL_CALLBACK, "Callback failed with error: %d", result);
+}
+
+/** Gets VSync information from Choreographer, including a collection of frame timelines and
+ * platform-preferred index using Choreographer. */
+jobject SurfaceControlTest_getFrameTimelines(JNIEnv* env, jclass) {
+    ALooper_prepare(0);
+    ATrace_beginSection("Getting Choreographer instance");
+    AChoreographer* choreographer = AChoreographer_getInstance();
+    ATrace_endSection();
+    verifyChoreographer(env, choreographer);
+
+    VsyncCallback cb1("cb1", env);
+    auto start = now();
+    ATrace_beginSection("postVsyncCallback");
+    AChoreographer_postVsyncCallback(choreographer, vsyncCallback, &cb1);
+    ATrace_endSection();
+    auto delayPeriod = std::chrono::duration_cast<std::chrono::milliseconds>(DELAY_PERIOD).count();
+    ATrace_beginSection("ALooper_pollOnce");
+    int result = ALooper_pollOnce(delayPeriod * 5, nullptr, nullptr, nullptr);
+    ATrace_endSection();
+    verifyPollCallback(env, result);
+    verifyCallback(env, cb1, 1, start, NOMINAL_VSYNC_PERIOD * 3);
+
+    jobjectArray frameTimelineObjs =
+            env->NewObjectArray(cb1.getTimeline().size(), gFrameTimelineClassInfo.clazz,
+                                /*initial element*/ NULL);
+    if (env->ExceptionCheck()) {
+        env->ExceptionDescribe();
+        env->ExceptionClear();
+        return NULL;
+    }
+    if (frameTimelineObjs == NULL) {
+        jniThrowRuntimeException(env, "Failed to create FrameTimeline array");
+        return NULL;
+    }
+    for (int i = 0; i < cb1.getTimeline().size(); i++) {
+        VsyncCallback::FrameTime frameTimeline = cb1.getTimeline()[i];
+        jobject frameTimelineObj =
+                env->NewObject(gFrameTimelineClassInfo.clazz, gFrameTimelineClassInfo.constructor,
+                               frameTimeline.vsyncId, frameTimeline.expectedPresentTime,
+                               frameTimeline.deadline);
+        env->SetObjectArrayElement(frameTimelineObjs, i, frameTimelineObj);
+    }
+
+    return env->NewObject(gFrameCallbackDataClassInfo.clazz,
+                          gFrameCallbackDataClassInfo.constructor, frameTimelineObjs,
+                          cb1.getPreferredFrameTimelineIndex());
+}
+
 static const JNINativeMethod JNI_METHODS[] = {
         {"nSurfaceTransaction_create", "()J", (void*)SurfaceTransaction_create},
         {"nSurfaceTransaction_delete", "(J)V", (void*)SurfaceTransaction_delete},
@@ -591,6 +688,17 @@
         {"nSurfaceTransaction_setOnCommitCallbackWithoutContext",
          "(JLandroid/view/cts/util/ASurfaceControlTestUtils$TransactionCompleteListener;)V",
          (void*)SurfaceTransaction_setOnCommitCallbackWithoutContext},
+        {"nSurfaceTransaction_setFrameTimeline", "(JJ)V",
+         (void*)SurfaceTransaction_setFrameTimeline},
+        {"getSolidBuffer", "(III)Landroid/hardware/HardwareBuffer;", (void*)Utils_getSolidBuffer},
+        {"getQuadrantBuffer", "(IIIIII)Landroid/hardware/HardwareBuffer;",
+         (void*)Utils_getQuadrantBuffer},
+        {"getBufferId", "(Landroid/hardware/HardwareBuffer;)J", (void*)Utils_getBufferId},
+};
+
+static const JNINativeMethod FRAME_TIMELINE_JNI_METHODS[] = {
+        {"nGetFrameTimelines", "()Landroid/view/cts/util/FrameCallbackData;",
+         (void*)SurfaceControlTest_getFrameTimelines},
 };
 
 }  // anonymous namespace
@@ -602,6 +710,22 @@
             static_cast<jclass>(env->NewGlobalRef(transactionCompleteListenerClazz));
     gTransactionCompleteListenerClassInfo.onTransactionComplete =
             env->GetMethodID(transactionCompleteListenerClazz, "onTransactionComplete", "(JJ)V");
+
+    gFrameTimelineClassInfo.clazz = static_cast<jclass>(env->NewGlobalRef(
+            env->FindClass("android/view/cts/util/FrameCallbackData$FrameTimeline")));
+    gFrameTimelineClassInfo.constructor =
+            env->GetMethodID(gFrameTimelineClassInfo.clazz, "<init>", "(JJJ)V");
+
+    gFrameCallbackDataClassInfo.clazz = static_cast<jclass>(
+            env->NewGlobalRef(env->FindClass("android/view/cts/util/FrameCallbackData")));
+    gFrameCallbackDataClassInfo.constructor =
+            env->GetMethodID(gFrameCallbackDataClassInfo.clazz, "<init>",
+                             "([Landroid/view/cts/util/FrameCallbackData$FrameTimeline;I)V");
+
+    jclass frameCallbackDataClass = env->FindClass("android/view/cts/util/FrameCallbackData");
+    env->RegisterNatives(frameCallbackDataClass, FRAME_TIMELINE_JNI_METHODS,
+                         sizeof(FRAME_TIMELINE_JNI_METHODS) / sizeof(JNINativeMethod));
+
     jclass clazz = env->FindClass("android/view/cts/util/ASurfaceControlTestUtils");
     return env->RegisterNatives(clazz, JNI_METHODS, sizeof(JNI_METHODS) / sizeof(JNINativeMethod));
 }
diff --git a/tests/tests/view/jni/android_view_cts_ChoreographerNativeTest.cpp b/tests/tests/view/jni/android_view_cts_ChoreographerNativeTest.cpp
index 6206418..f1e81ff 100644
--- a/tests/tests/view/jni/android_view_cts_ChoreographerNativeTest.cpp
+++ b/tests/tests/view/jni/android_view_cts_ChoreographerNativeTest.cpp
@@ -15,6 +15,7 @@
  *
  */
 
+#include <ChoreographerTestUtils.h>
 #include <android/choreographer.h>
 #include <android/looper.h>
 #include <jni.h>
@@ -25,27 +26,20 @@
 #include <cmath>
 #include <cstdlib>
 #include <cstring>
+#include <limits>
 #include <mutex>
 #include <set>
 #include <sstream>
 #include <string>
 #include <thread>
+#include <tuple>
+#include <vector>
 
 #define LOG_TAG "ChoreographerNativeTest"
 
-#define ASSERT(condition, format, args...) \
-        if (!(condition)) { \
-            fail(env, format, ## args); \
-            return; \
-        }
-
 
 using namespace std::chrono_literals;
 
-static constexpr std::chrono::nanoseconds NOMINAL_VSYNC_PERIOD{16ms};
-static constexpr std::chrono::nanoseconds DELAY_PERIOD{NOMINAL_VSYNC_PERIOD * 5};
-static constexpr std::chrono::nanoseconds ZERO{std::chrono::nanoseconds::zero()};
-
 struct {
     struct {
         jclass clazz;
@@ -53,14 +47,7 @@
     } choreographerNativeTest;
 } gJni;
 
-static std::mutex gLock;
 static std::set<int64_t> gSupportedRefreshPeriods;
-struct Callback {
-    Callback(const char* name): name(name) {}
-    std::string name;
-    int count{0};
-    std::chrono::nanoseconds frameTime{0LL};
-};
 
 struct RefreshRateCallback {
     RefreshRateCallback(const char* name): name(name) {}
@@ -79,17 +66,6 @@
     std::chrono::nanoseconds vsyncPeriod{0LL};
 };
 
-static void frameCallback64(int64_t frameTimeNanos, void* data) {
-    std::lock_guard<std::mutex> _l(gLock);
-    Callback* cb = static_cast<Callback*>(data);
-    cb->count++;
-    cb->frameTime = std::chrono::nanoseconds{frameTimeNanos};
-}
-
-static void frameCallback(long frameTimeNanos, void* data) {
-    frameCallback64((int64_t) frameTimeNanos, data);
-}
-
 static void refreshRateCallback(int64_t vsyncPeriodNanos, void* data) {
     std::lock_guard<std::mutex> _l(gLock);
     RefreshRateCallback* cb = static_cast<RefreshRateCallback*>(data);
@@ -108,37 +84,6 @@
                             static_cast<int>(std::round(1e9f / cb->vsyncPeriod.count())));
 }
 
-static std::chrono::nanoseconds now() {
-    return std::chrono::steady_clock::now().time_since_epoch();
-}
-
-static void fail(JNIEnv* env, const char* format, ...) {
-    va_list args;
-
-    va_start(args, format);
-    char *msg;
-    int rc = vasprintf(&msg, format, args);
-    va_end(args);
-
-    jclass exClass;
-    const char *className = "java/lang/AssertionError";
-    exClass = env->FindClass(className);
-    env->ThrowNew(exClass, msg);
-    free(msg);
-}
-
-static void verifyCallback(JNIEnv* env, const Callback& cb, int expectedCount,
-                           std::chrono::nanoseconds startTime, std::chrono::nanoseconds maxTime) {
-    std::lock_guard<std::mutex> _l{gLock};
-    ASSERT(cb.count == expectedCount, "Choreographer failed to invoke '%s' %d times - actual: %d",
-           cb.name.c_str(), expectedCount, cb.count);
-    if (maxTime > ZERO) {
-        auto duration = cb.frameTime - startTime;
-        ASSERT(duration < maxTime, "Callback '%s' has incorrect frame time in invocation %d",
-               cb.name.c_str(), expectedCount);
-    }
-}
-
 static std::string dumpSupportedRefreshPeriods() {
     std::stringstream ss;
     ss << "{ ";
@@ -190,6 +135,101 @@
     return choreographer != nullptr;
 }
 
+static void
+android_view_cts_ChoreographerNativeTest_testPostVsyncCallbackWithoutDelayEventuallyRunsCallback(
+        JNIEnv* env, jclass, jlong choreographerPtr) {
+    AChoreographer* choreographer = reinterpret_cast<AChoreographer*>(choreographerPtr);
+    VsyncCallback cb1("cb1", env);
+    VsyncCallback cb2("cb2", env);
+    auto start = now();
+
+    AChoreographer_postVsyncCallback(choreographer, vsyncCallback, &cb1);
+    AChoreographer_postVsyncCallback(choreographer, vsyncCallback, &cb2);
+    std::this_thread::sleep_for(NOMINAL_VSYNC_PERIOD * 3);
+
+    verifyCallback(env, cb1, 1, start, NOMINAL_VSYNC_PERIOD * 3);
+    verifyCallback(env, cb2, 1, start, NOMINAL_VSYNC_PERIOD * 3);
+    {
+        std::lock_guard<std::mutex> _l{gLock};
+        auto delta = cb2.frameTime - cb1.frameTime;
+        ASSERT(delta == ZERO || delta > ZERO && delta < NOMINAL_VSYNC_PERIOD * 2,
+               "Callback 1 and 2 have frame times too large of a delta in frame times");
+    }
+
+    AChoreographer_postVsyncCallback(choreographer, vsyncCallback, &cb1);
+    start = now();
+    std::this_thread::sleep_for(NOMINAL_VSYNC_PERIOD * 3);
+    verifyCallback(env, cb1, 2, start, NOMINAL_VSYNC_PERIOD * 3);
+    verifyCallback(env, cb2, 1, start, ZERO);
+}
+
+static void android_view_cts_ChoreographerNativeTest_testFrameCallbackDataVsyncIdValid(
+        JNIEnv* env, jclass, jlong choreographerPtr) {
+    AChoreographer* choreographer = reinterpret_cast<AChoreographer*>(choreographerPtr);
+    VsyncCallback cb1("cb1", env);
+    auto start = now();
+
+    AChoreographer_postVsyncCallback(choreographer, vsyncCallback, &cb1);
+    std::this_thread::sleep_for(NOMINAL_VSYNC_PERIOD * 3);
+
+    verifyCallback(env, cb1, 1, start, NOMINAL_VSYNC_PERIOD * 3);
+    std::lock_guard<std::mutex> _l{gLock};
+    for (const VsyncCallback::FrameTime& frameTime : cb1.getTimeline()) {
+        int64_t vsyncId = frameTime.vsyncId;
+        ASSERT(vsyncId >= 0, "Invalid vsync ID");
+        ASSERT(std::count_if(cb1.getTimeline().begin(), cb1.getTimeline().end(),
+                             [vsyncId](const VsyncCallback::FrameTime& ft) {
+                                 return ft.vsyncId == vsyncId;
+                             }) == 1,
+               "Vsync ID is not unique");
+    }
+}
+
+static void android_view_cts_ChoreographerNativeTest_testFrameCallbackDataDeadlineInFuture(
+        JNIEnv* env, jclass, jlong choreographerPtr) {
+    AChoreographer* choreographer = reinterpret_cast<AChoreographer*>(choreographerPtr);
+    VsyncCallback cb1("cb1", env);
+    auto start = now();
+
+    AChoreographer_postVsyncCallback(choreographer, vsyncCallback, &cb1);
+    std::this_thread::sleep_for(NOMINAL_VSYNC_PERIOD * 3);
+
+    verifyCallback(env, cb1, 1, start, NOMINAL_VSYNC_PERIOD * 3);
+    std::lock_guard<std::mutex> _l{gLock};
+    for (auto [i, lastValue] = std::tuple{0, cb1.frameTime}; i < cb1.getTimeline().size(); i++) {
+        auto deadline = std::chrono::nanoseconds{cb1.getTimeline()[i].deadline};
+        ASSERT(deadline > std::chrono::nanoseconds{start}, "Deadline must be after start time");
+        ASSERT(deadline > cb1.frameTime, "Deadline must be after frame time");
+        ASSERT(deadline > lastValue, "Deadline must be greater than last frame deadline");
+        lastValue = deadline;
+    }
+}
+
+static void
+android_view_cts_ChoreographerNativeTest_testFrameCallbackDataExpectedPresentTimeInFuture(
+        JNIEnv* env, jclass, jlong choreographerPtr) {
+    AChoreographer* choreographer = reinterpret_cast<AChoreographer*>(choreographerPtr);
+    VsyncCallback cb1("cb1", env);
+    auto start = now();
+
+    AChoreographer_postVsyncCallback(choreographer, vsyncCallback, &cb1);
+    std::this_thread::sleep_for(NOMINAL_VSYNC_PERIOD * 3);
+
+    verifyCallback(env, cb1, 1, start, NOMINAL_VSYNC_PERIOD * 3);
+    std::lock_guard<std::mutex> _l{gLock};
+    for (auto [i, lastValue] = std::tuple{0, cb1.frameTime}; i < cb1.getTimeline().size(); i++) {
+        auto expectedPresentTime =
+                std::chrono::nanoseconds(cb1.getTimeline()[i].expectedPresentTime);
+        auto deadline = std::chrono::nanoseconds(cb1.getTimeline()[i].deadline);
+        ASSERT(expectedPresentTime > cb1.frameTime,
+               "Expected present time must be after frame time");
+        ASSERT(expectedPresentTime > deadline, "Expected present time must be after deadline");
+        ASSERT(expectedPresentTime > lastValue,
+               "Expected present time must be greater than last frame expected present time");
+        lastValue = expectedPresentTime;
+    }
+}
+
 static void android_view_cts_ChoreographerNativeTest_testPostCallback64WithoutDelayEventuallyRunsCallback(
         JNIEnv* env, jclass, jlong choreographerPtr) {
     AChoreographer* choreographer = reinterpret_cast<AChoreographer*>(choreographerPtr);
@@ -510,6 +550,14 @@
          (void*)android_view_cts_ChoreographerNativeTest_getChoreographer},
         {"nativePrepareChoreographerTests", "(J[J)Z",
          (void*)android_view_cts_ChoreographerNativeTest_prepareChoreographerTests},
+        {"nativeTestPostVsyncCallbackWithoutDelayEventuallyRunsCallbacks", "(J)V",
+         (void*)android_view_cts_ChoreographerNativeTest_testPostVsyncCallbackWithoutDelayEventuallyRunsCallback},
+        {"nativeTestFrameCallbackDataVsyncIdValid", "(J)V",
+         (void*)android_view_cts_ChoreographerNativeTest_testFrameCallbackDataVsyncIdValid},
+        {"nativeTestFrameCallbackDataDeadlineInFuture", "(J)V",
+         (void*)android_view_cts_ChoreographerNativeTest_testFrameCallbackDataDeadlineInFuture},
+        {"nativeTestFrameCallbackDataExpectedPresentTimeInFuture", "(J)V",
+         (void*)android_view_cts_ChoreographerNativeTest_testFrameCallbackDataExpectedPresentTimeInFuture},
         {"nativeTestPostCallback64WithoutDelayEventuallyRunsCallbacks", "(J)V",
          (void*)android_view_cts_ChoreographerNativeTest_testPostCallback64WithoutDelayEventuallyRunsCallback},
         {"nativeTestPostCallback64WithDelayEventuallyRunsCallbacks", "(J)V",
diff --git a/tests/tests/view/jni/android_view_cts_InputDeviceKeyLayoutMapTest.cpp b/tests/tests/view/jni/android_view_cts_InputDeviceKeyLayoutMapTest.cpp
index 4d2c810..8f25d39 100644
--- a/tests/tests/view/jni/android_view_cts_InputDeviceKeyLayoutMapTest.cpp
+++ b/tests/tests/view/jni/android_view_cts_InputDeviceKeyLayoutMapTest.cpp
@@ -107,6 +107,6 @@
 };
 
 int register_android_view_cts_InputDeviceKeyLayoutMapTest(JNIEnv* env) {
-    jclass clazz = env->FindClass("android/view/cts/InputDeviceKeyLayoutMapTest");
+    jclass clazz = env->FindClass("android/view/cts/input/InputDeviceKeyLayoutMapTest");
     return env->RegisterNatives(clazz, gMethods, sizeof(gMethods) / sizeof(JNINativeMethod));
 }
diff --git a/tests/tests/view/jni/android_view_cts_InputQueueTest.cpp b/tests/tests/view/jni/android_view_cts_InputQueueTest.cpp
new file mode 100644
index 0000000..769c95b
--- /dev/null
+++ b/tests/tests/view/jni/android_view_cts_InputQueueTest.cpp
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2021 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.
+ *
+ */
+
+#include <android/input.h>
+#include <jni.h>
+#include <jniAssert.h>
+
+#include <array>
+#include <thread>
+
+#define LOG_TAG "InputQueueTest"
+
+bool waitForEvent(JNIEnv *env, jclass /* clazz */, jobject inputQueue) {
+    constexpr size_t NUM_TRIES = 5;
+    for (size_t i = 0; i < NUM_TRIES; i++) {
+        AInputQueue *nativeQueue = AInputQueue_fromJava(env, inputQueue);
+        if (nativeQueue != nullptr) {
+            int32_t numEvents = AInputQueue_hasEvents(nativeQueue);
+            if (numEvents > 0) {
+                return true;
+            }
+        }
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    }
+    return false;
+}
+
+void inputQueueTest(JNIEnv *env, jclass /* clazz */, jobject inputQueue) {
+    AInputQueue *nativeQueue = AInputQueue_fromJava(env, inputQueue);
+    ASSERT(nativeQueue != nullptr, "Native input queue not returned");
+    AInputEvent *event = nullptr;
+    ASSERT(AInputQueue_getEvent(nativeQueue, &event) >= 0, "getEvent did not succeed");
+    ASSERT(AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION, "Wrong event type");
+    ASSERT(AKeyEvent_getAction(event) == AKEY_EVENT_ACTION_DOWN, "Wrong action");
+    AInputQueue_finishEvent(nativeQueue, event, true);
+}
+
+const std::array<JNINativeMethod, 2> JNI_METHODS = {{
+        {"waitForEvent", "(Landroid/view/InputQueue;)Z", (void *)waitForEvent},
+        {"inputQueueTest", "(Landroid/view/InputQueue;)V", (void *)inputQueueTest},
+}};
+
+jint register_android_view_cts_InputQueueTest(JNIEnv *env) {
+    jclass clazzTest = env->FindClass("android/view/cts/InputQueueTest");
+    return env->RegisterNatives(clazzTest, JNI_METHODS.data(), JNI_METHODS.size());
+}
diff --git a/tests/tests/view/res/anim/anim_translate.xml b/tests/tests/view/res/anim/anim_translate.xml
index 6659c2b..48c8b6f 100644
--- a/tests/tests/view/res/anim/anim_translate.xml
+++ b/tests/tests/view/res/anim/anim_translate.xml
@@ -17,7 +17,7 @@
 
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
     android:interpolator="@android:anim/accelerate_interpolator"
-    android:fromXDelta="100%p"
+    android:fromXDelta="100dp"
     android:toXDelta="0"
     android:fromYDelta="100%p"
     android:toYDelta="0"
diff --git a/tests/tests/view/res/layout/handwriting_layout.xml b/tests/tests/view/res/layout/handwriting_layout.xml
new file mode 100644
index 0000000..6f13a84
--- /dev/null
+++ b/tests/tests/view/res/layout/handwriting_layout.xml
@@ -0,0 +1,40 @@
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical" android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/textview"
+        android:autoHandwritingEnabled="true"
+        android:layout_width="100dp"
+        android:layout_height="20dp" />
+    <View
+        android:id="@+id/auto_handwriting_enabled"
+        android:autoHandwritingEnabled="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+    <View
+        android:id="@+id/auto_handwriting_disabled"
+        android:autoHandwritingEnabled="false"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+    <View
+        android:id="@+id/auto_handwriting_default"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/tests/tests/view/res/layout/onbackinvokeddispatcher_dialog_layout.xml b/tests/tests/view/res/layout/onbackinvokeddispatcher_dialog_layout.xml
new file mode 100644
index 0000000..b8c365a
--- /dev/null
+++ b/tests/tests/view/res/layout/onbackinvokeddispatcher_dialog_layout.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2022 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.
+ */
+-->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <View
+        android:id="@+id/test_view_in_dialog"
+        android:layout_width="100px"
+        android:layout_height="100px"
+        android:layout_centerInParent="true"
+        android:background="#FFF"/>
+
+</RelativeLayout>
diff --git a/tests/tests/view/res/layout/onbackinvokeddispatcher_layout.xml b/tests/tests/view/res/layout/onbackinvokeddispatcher_layout.xml
new file mode 100644
index 0000000..40ff58b
--- /dev/null
+++ b/tests/tests/view/res/layout/onbackinvokeddispatcher_layout.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2022 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.
+ */
+-->
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <View
+        android:id="@+id/test_view"
+        android:layout_width="100px"
+        android:layout_height="100px"
+        android:layout_centerInParent="true"
+        android:background="#FFF"/>
+
+</RelativeLayout>
diff --git a/tests/tests/view/src/android/view/animation/cts/TranslateAnimationTest.java b/tests/tests/view/src/android/view/animation/cts/TranslateAnimationTest.java
index e7cd3eb..0343999 100644
--- a/tests/tests/view/src/android/view/animation/cts/TranslateAnimationTest.java
+++ b/tests/tests/view/src/android/view/animation/cts/TranslateAnimationTest.java
@@ -27,9 +27,11 @@
 import android.content.res.XmlResourceParser;
 import android.graphics.Matrix;
 import android.util.AttributeSet;
+import android.util.TypedValue;
 import android.util.Xml;
 import android.view.View;
 import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.view.animation.LinearInterpolator;
 import android.view.animation.Transformation;
 import android.view.animation.TranslateAnimation;
@@ -50,7 +52,7 @@
 public class TranslateAnimationTest {
     private static final long DURATION = 1000;
     private static final float POSITION_DELTA = 0.001f;
-    private static final float FROM_X_DETLTA = 0.0f;
+    private static final float FROM_X_DELTA = 0.0f;
     private static final float TO_X_DELTA = 10.0f;
     private static final float FROM_Y_DELTA = 0.0f;
     private static final float TO_Y_DELTA = 20.0f;
@@ -103,7 +105,7 @@
         final View animWindow = mActivity.findViewById(R.id.anim_window);
         final Transformation transformation = new Transformation();
         final MyTranslateAnimation translateAnimation =
-                new MyTranslateAnimation(FROM_X_DETLTA, TO_X_DELTA, FROM_Y_DELTA, TO_Y_DELTA);
+                new MyTranslateAnimation(FROM_X_DELTA, TO_X_DELTA, FROM_Y_DELTA, TO_Y_DELTA);
         translateAnimation.setDuration(DURATION);
         translateAnimation.setInterpolator(new LinearInterpolator());
         assertFalse(translateAnimation.isInitialized());
@@ -118,13 +120,13 @@
         // Test applyTransformation() in method getTransformation()
         translateAnimation.getTransformation(startTime, transformation);
         transformation.getMatrix().getValues(values);
-        assertEquals(FROM_X_DETLTA, values[Matrix.MTRANS_X], POSITION_DELTA);
+        assertEquals(FROM_X_DELTA, values[Matrix.MTRANS_X], POSITION_DELTA);
         assertEquals(FROM_Y_DELTA, values[Matrix.MTRANS_Y], POSITION_DELTA);
 
         transformation.clear();
         translateAnimation.getTransformation(startTime + DURATION / 2, transformation);
         transformation.getMatrix().getValues(values);
-        assertEquals((TO_X_DELTA + FROM_X_DETLTA) / 2, values[Matrix.MTRANS_X], POSITION_DELTA);
+        assertEquals((TO_X_DELTA + FROM_X_DELTA) / 2, values[Matrix.MTRANS_X], POSITION_DELTA);
         assertEquals((TO_Y_DELTA + FROM_Y_DELTA) / 2, values[Matrix.MTRANS_Y], POSITION_DELTA);
 
         transformation.clear();
@@ -138,14 +140,14 @@
         transformation.clear();
         translateAnimation.applyTransformation(0.0f, transformation);
         transformation.getMatrix().getValues(values);
-        assertEquals(FROM_X_DETLTA, values[Matrix.MTRANS_X], POSITION_DELTA);
+        assertEquals(FROM_X_DELTA, values[Matrix.MTRANS_X], POSITION_DELTA);
         assertEquals(FROM_Y_DELTA, values[Matrix.MTRANS_Y], POSITION_DELTA);
 
         // Test time of middle 0.5
         transformation.clear();
         translateAnimation.applyTransformation(0.5f, transformation);
         transformation.getMatrix().getValues(values);
-        assertEquals((TO_X_DELTA + FROM_X_DETLTA) / 2,
+        assertEquals((TO_X_DELTA + FROM_X_DELTA) / 2,
                 values[Matrix.MTRANS_X], POSITION_DELTA);
         assertEquals((TO_Y_DELTA + FROM_Y_DELTA) / 2,
                 values[Matrix.MTRANS_Y], POSITION_DELTA);
@@ -205,6 +207,23 @@
         assertEquals(RELATIVE_TO_Y_DELTA * actualHeight, values[Matrix.MTRANS_Y], POSITION_DELTA);
     }
 
+    @Test
+    public void testComplexNumbers() throws Throwable  {
+        TranslateAnimation translateAnimation =
+                (TranslateAnimation) AnimationUtils.loadAnimation(mActivity, R.anim.anim_translate);
+
+        float[] values = new float[9];
+        final Transformation transformation = new Transformation();
+        translateAnimation.initialize(0, 0, 0, 0);
+        translateAnimation.getTransformation(translateAnimation.getStartTime(), transformation);
+        transformation.getMatrix().getValues(values);
+
+        // Ensure that fromXDelta is 100dp (defined in anim_translate.xml).
+        float expectedFromXDelta = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 100f,
+                mActivity.getResources().getDisplayMetrics());
+        assertEquals(expectedFromXDelta, values[Matrix.MTRANS_X], POSITION_DELTA);
+    }
+
     private static class MyTranslateAnimation extends TranslateAnimation {
         public MyTranslateAnimation(float fromXDelta, float toXDelta, float fromYDelta,
                 float toYDelta) {
diff --git a/tests/tests/view/src/android/view/cts/ASurfaceControlTest.java b/tests/tests/view/src/android/view/cts/ASurfaceControlTest.java
index 1b120f9..95ed1db0 100644
--- a/tests/tests/view/src/android/view/cts/ASurfaceControlTest.java
+++ b/tests/tests/view/src/android/view/cts/ASurfaceControlTest.java
@@ -18,6 +18,7 @@
 
 import static android.server.wm.ActivityManagerTestBase.createFullscreenActivityScenarioRule;
 import static android.view.cts.surfacevalidator.ASurfaceControlTestActivity.MultiRectChecker;
+import static android.view.cts.surfacevalidator.ASurfaceControlTestActivity.WAIT_TIMEOUT_S;
 import static android.view.cts.util.ASurfaceControlTestUtils.applyAndDeleteSurfaceTransaction;
 import static android.view.cts.util.ASurfaceControlTestUtils.createSurfaceTransaction;
 import static android.view.cts.util.ASurfaceControlTestUtils.nSurfaceControl_acquire;
@@ -30,6 +31,7 @@
 import static android.view.cts.util.ASurfaceControlTestUtils.nSurfaceTransaction_releaseBuffer;
 import static android.view.cts.util.ASurfaceControlTestUtils.nSurfaceTransaction_setDamageRegion;
 import static android.view.cts.util.ASurfaceControlTestUtils.nSurfaceTransaction_setDesiredPresentTime;
+import static android.view.cts.util.ASurfaceControlTestUtils.nSurfaceTransaction_setFrameTimeline;
 import static android.view.cts.util.ASurfaceControlTestUtils.nSurfaceTransaction_setOnCommitCallback;
 import static android.view.cts.util.ASurfaceControlTestUtils.nSurfaceTransaction_setOnCommitCallbackWithoutContext;
 import static android.view.cts.util.ASurfaceControlTestUtils.nSurfaceTransaction_setOnCompleteCallback;
@@ -48,14 +50,17 @@
 import static android.view.cts.util.ASurfaceControlTestUtils.setScale;
 import static android.view.cts.util.ASurfaceControlTestUtils.setVisibility;
 import static android.view.cts.util.ASurfaceControlTestUtils.setZOrder;
+import static android.view.cts.util.FrameCallbackData.nGetFrameTimelines;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.os.SystemClock;
+import android.os.Trace;
 import android.platform.test.annotations.RequiresDevice;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
@@ -65,11 +70,14 @@
 import android.view.cts.surfacevalidator.ASurfaceControlTestActivity.PixelChecker;
 import android.view.cts.surfacevalidator.PixelColor;
 import android.view.cts.util.ASurfaceControlTestUtils;
+import android.view.cts.util.FrameCallbackData;
+import android.view.cts.util.FrameCallbackData.FrameTimeline;
 
 import androidx.annotation.NonNull;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.runner.AndroidJUnit4;
 
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -238,7 +246,7 @@
 
     private void verifyTest(BasicSurfaceHolderCallback callback, PixelChecker pixelChecker) {
         SurfaceHolderCallback surfaceHolderCallback = new SurfaceHolderCallback(callback);
-        mActivity.verifyTest(surfaceHolderCallback, pixelChecker);
+        mActivity.verifyTest(surfaceHolderCallback, pixelChecker, mName);
     }
 
     @Test
@@ -447,7 +455,7 @@
                         long surfaceControl = createFromWindow(holder.getSurface());
 
                         setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
-                                PixelColor.RED);
+                                PixelColor.TRANSLUCENT_RED);
                         setBufferOpaque(surfaceControl, true);
                     }
                 },
@@ -460,7 +468,7 @@
     }
 
     @Test
-    public void testSurfaceTransaction_setBufferOpaque_transparent() {
+    public void testSurfaceTransaction_setBufferOpaque_translucent() {
         verifyTest(
                 new BasicSurfaceHolderCallback() {
                     @Override
@@ -468,7 +476,7 @@
                         long surfaceControl = createFromWindow(holder.getSurface());
 
                         setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
-                                PixelColor.TRANSPARENT_RED);
+                                PixelColor.TRANSLUCENT_RED);
                         setBufferOpaque(surfaceControl, false);
                     }
                 },
@@ -669,7 +677,6 @@
                         setGeometry(surfaceControl2, 0, 0, 100, 100, 70, 20, 90, 50, 0);
                     }
                 },
-
                 new MultiRectChecker(DEFAULT_RECT) {
                     @Override
                     public PixelColor getExpectedColor(int x, int y) {
@@ -697,7 +704,6 @@
                                 PixelColor.MAGENTA, PixelColor.GREEN);
                     }
                 },
-
                 new MultiRectChecker(DEFAULT_RECT) {
                     @Override
                     public PixelColor getExpectedColor(int x, int y) {
@@ -1619,6 +1625,74 @@
     }
 
     @Test
+    public void testSurfaceTransaction_scaleToZero() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        long parentSurfaceControl = createFromWindow(holder.getSurface());
+                        long childSurfaceControl = create(parentSurfaceControl);
+
+                        setSolidBuffer(parentSurfaceControl,
+                                DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT, PixelColor.YELLOW);
+                        setSolidBuffer(childSurfaceControl,
+                                DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT, PixelColor.RED);
+                        setScale(childSurfaceControl, 0f, 0f);
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) {
+                    @Override
+                    public boolean checkPixels(int matchingPixelCount, int width, int height) {
+                        return matchingPixelCount > 9000 & matchingPixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setPositionAndScale() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        long surfaceControl = createFromWindow(holder.getSurface());
+
+                        setQuadrantBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED, PixelColor.BLUE,
+                                PixelColor.MAGENTA, PixelColor.GREEN);
+
+                        // Set the position to -50, -50 in parent space then scale 2x in each
+                        // direction relative to 0,0. The end result should be a -50,-50,150,150
+                        // buffer coverage or essentially a 2x center-scale
+
+                        setPosition(surfaceControl, -50, -50);
+                        setScale(surfaceControl, 2, 2);
+                    }
+                },
+                new MultiRectChecker(new Rect(0, 0, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT)) {
+                    @Override
+                    public PixelColor getExpectedColor(int x, int y) {
+                        int halfWidth = DEFAULT_LAYOUT_WIDTH / 2;
+                        int halfHeight = DEFAULT_LAYOUT_HEIGHT / 2;
+                        if (x < halfWidth && y < halfHeight) {
+                            return RED;
+                        } else if (x >= halfWidth && y < halfHeight) {
+                            return BLUE;
+                        } else if (x < halfWidth && y >= halfHeight) {
+                            return GREEN;
+                        } else {
+                            return MAGENTA;
+                        }
+                    }
+
+                    @Override
+                    public boolean checkPixels(int matchingPixelCount, int width, int height) {
+                        // There will be sampling artifacts along the center line, ignore those
+                        return matchingPixelCount > 9000 && matchingPixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
     public void testSurfaceTransaction_setBufferTransform90() {
         verifyTest(
                 new BasicSurfaceHolderCallback() {
@@ -1764,6 +1838,147 @@
                 });
     }
 
+    private void verifySetFrameTimeline(boolean mUsePreferredIndex, SurfaceHolder holder) {
+        TimedTransactionListener onCompleteCallback = new TimedTransactionListener();
+        long surfaceControl = nSurfaceControl_createFromWindow(holder.getSurface());
+        assertTrue("failed to create surface control", surfaceControl != 0);
+        long surfaceTransaction = createSurfaceTransaction();
+        long buffer = nSurfaceTransaction_setSolidBuffer(surfaceControl, surfaceTransaction,
+                DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT, PixelColor.RED);
+        assertTrue("failed to set buffer", buffer != 0);
+
+        // Get choreographer frame timelines.
+        FrameCallbackData frameCallbackData = nGetFrameTimelines();
+        FrameTimeline[] frameTimelines = frameCallbackData.getFrameTimelines();
+        assertTrue("Frame timelines length needs to be greater than 1", frameTimelines
+                .length > 1);
+        long interval = frameTimelines[1].getDeadline() - frameTimelines[0].getDeadline();
+
+        int timelineIndex = frameCallbackData.getPreferredFrameTimelineIndex();
+        if (!mUsePreferredIndex) {
+            assertNotEquals("Preferred frame timeline index should not be last index",
+                    frameTimelines.length - 1,
+                    frameCallbackData.getPreferredFrameTimelineIndex());
+            timelineIndex = frameTimelines.length - 1;
+        }
+        long vsyncId = frameTimelines[timelineIndex].getVsyncId();
+        Trace.beginSection("Surface transaction created " + vsyncId);
+        nSurfaceTransaction_setFrameTimeline(surfaceTransaction, vsyncId);
+        nSurfaceTransaction_setOnCompleteCallback(surfaceTransaction,
+                true /* waitForFence */, onCompleteCallback);
+        applyAndDeleteSurfaceTransaction(surfaceTransaction);
+        Trace.endSection();
+
+        Trace.beginSection("Wait for complete callback " + vsyncId);
+        // Wait for callbacks to fire.
+        try {
+            onCompleteCallback.mLatch.await(1, TimeUnit.SECONDS);
+        } catch (InterruptedException e) {
+        }
+        if (onCompleteCallback.mLatch.getCount() > 0) {
+            Log.e(TAG, "Failed to wait for callback");
+        }
+        Trace.endSection();
+
+        assertEquals(0, onCompleteCallback.mLatch.getCount());
+        assertTrue(onCompleteCallback.mCallbackTime > 0);
+        assertTrue(onCompleteCallback.mLatchTime > 0);
+
+        FrameTimeline frameTimeline = frameTimelines[timelineIndex];
+        long lowerThreshold = frameTimeline.getExpectedPresentTime() - interval / 2;
+        assertTrue("Presented too early using frame timeline index=" + timelineIndex
+                        + " (preferred index="
+                        + frameCallbackData.getPreferredFrameTimelineIndex()
+                        + "), vsyncId=" + frameTimeline.getVsyncId() + ", presentTime="
+                        + onCompleteCallback.mPresentTime + ", expectedPresentTime="
+                        + frameTimeline.getExpectedPresentTime()
+                        + ", diff (ns)="
+                        + (frameTimeline.getExpectedPresentTime()
+                        - onCompleteCallback.mPresentTime),
+                frameTimeline.getExpectedPresentTime() >= lowerThreshold);
+        long upperThreshold = frameTimeline.getExpectedPresentTime() + interval / 2;
+        assertTrue("Present too late using frame timeline index=" + timelineIndex
+                        + " (preferred index="
+                        + frameCallbackData.getPreferredFrameTimelineIndex()
+                        + "), vsyncId=" + frameTimeline.getVsyncId() + ", presentTime="
+                        + onCompleteCallback.mPresentTime + ", expectedPresentTime="
+                        + frameTimeline.getExpectedPresentTime()
+                        + ", diff (ns)="
+                        + (frameTimeline.getExpectedPresentTime()
+                        - onCompleteCallback.mPresentTime),
+                frameTimeline.getExpectedPresentTime() < upperThreshold);
+    }
+
+    @Test
+    @RequiresDevice // emulators can't support sync fences
+    public void testSurfaceTransaction_setFrameTimeline_preferredIndex() {
+        Trace.beginSection(
+                "testSurfaceTransaction_setFrameTimeline_preferredIndex");
+        Trace.endSection();
+
+        BasicSurfaceHolderCallback basicSurfaceHolderCallback = new BasicSurfaceHolderCallback() {
+            @Override
+            public void surfaceCreated(SurfaceHolder surfaceHolder) {
+                // Noop.
+            }
+        };
+        final CountDownLatch readyFence = new CountDownLatch(1);
+        ASurfaceControlTestActivity.SurfaceHolderCallback surfaceHolderCallback =
+                new ASurfaceControlTestActivity.SurfaceHolderCallback(
+                        new SurfaceHolderCallback(basicSurfaceHolderCallback), readyFence,
+                        mActivity.getParentFrameLayout().getViewTreeObserver());
+        mActivity.createSurface(surfaceHolderCallback);
+        try {
+            assertTrue("timeout", readyFence.await(WAIT_TIMEOUT_S, TimeUnit.SECONDS));
+        } catch (InterruptedException e) {
+            Assert.fail("interrupted");
+        }
+        verifySetFrameTimeline(true, mActivity.getSurfaceView().getHolder());
+        mActivity.verifyScreenshot(
+                new PixelChecker(PixelColor.RED) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                }, mName);
+
+    }
+
+    @Test
+    @RequiresDevice // emulators can't support sync fences
+    public void testSurfaceTransaction_setFrameTimeline_notPreferredIndex() {
+        Trace.beginSection(
+                "testSurfaceTransaction_setFrameTimeline_notPreferredIndex");
+        Trace.endSection();
+
+        BasicSurfaceHolderCallback basicSurfaceHolderCallback = new BasicSurfaceHolderCallback() {
+            @Override
+            public void surfaceCreated(SurfaceHolder surfaceHolder) {
+                // Noop.
+            }
+        };
+        final CountDownLatch readyFence = new CountDownLatch(1);
+        ASurfaceControlTestActivity.SurfaceHolderCallback surfaceHolderCallback =
+                new ASurfaceControlTestActivity.SurfaceHolderCallback(
+                        new SurfaceHolderCallback(basicSurfaceHolderCallback), readyFence,
+                        mActivity.getParentFrameLayout().getViewTreeObserver());
+        mActivity.createSurface(surfaceHolderCallback);
+        try {
+            assertTrue("timeout", readyFence.await(WAIT_TIMEOUT_S, TimeUnit.SECONDS));
+        } catch (InterruptedException e) {
+            Assert.fail("interrupted");
+        }
+        verifySetFrameTimeline(false, mActivity.getSurfaceView().getHolder());
+        mActivity.verifyScreenshot(
+                new PixelChecker(PixelColor.RED) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                }, mName);
+
+    }
+
     static class TimedTransactionListener implements
             ASurfaceControlTestUtils.TransactionCompleteListener {
         long mCallbackTime = -1;
diff --git a/tests/tests/view/src/android/view/cts/AttachedSurfaceControlTest.java b/tests/tests/view/src/android/view/cts/AttachedSurfaceControlTest.java
index 962d75a..ba711c4 100644
--- a/tests/tests/view/src/android/view/cts/AttachedSurfaceControlTest.java
+++ b/tests/tests/view/src/android/view/cts/AttachedSurfaceControlTest.java
@@ -93,7 +93,9 @@
 
     @After
     public void teardown() {
-        mOrientationSession.close();
+        if (mOrientationSession != null) {
+            mOrientationSession.close();
+        }
     }
 
     @Test
diff --git a/tests/tests/view/src/android/view/cts/AutoHandwritingActivity.java b/tests/tests/view/src/android/view/cts/AutoHandwritingActivity.java
new file mode 100644
index 0000000..ab828b9
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/AutoHandwritingActivity.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2022 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 android.view.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class AutoHandwritingActivity extends Activity {
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.handwriting_layout);
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/AutoHandwritingTest.java b/tests/tests/view/src/android/view/cts/AutoHandwritingTest.java
new file mode 100644
index 0000000..df0997a
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/AutoHandwritingTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright (C) 2022 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 android.view.cts;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import android.app.Activity;
+import android.view.View;
+
+import androidx.test.filters.MediumTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@MediumTest
+@RunWith(AndroidJUnit4.class)
+public class AutoHandwritingTest {
+
+    @Rule
+    public ActivityTestRule<AutoHandwritingActivity> mActivityRule =
+            new ActivityTestRule<>(AutoHandwritingActivity.class);
+
+    @Test
+    public void autoHandwriting_defaultValueIsTrue() {
+        Activity activity = mActivityRule.getActivity();
+        View view = activity.findViewById(R.id.auto_handwriting_default);
+
+        assertTrue(view.isAutoHandwritingEnabled());
+    }
+
+    @Test
+    public void autoHandwriting_setToTrueInXml() {
+        Activity activity = mActivityRule.getActivity();
+        View view = activity.findViewById(R.id.auto_handwriting_enabled);
+
+        assertTrue(view.isAutoHandwritingEnabled());
+    }
+
+    @Test
+    public void autoHandwriting_setToFalseInXml() {
+        Activity activity = mActivityRule.getActivity();
+        View view = activity.findViewById(R.id.auto_handwriting_disabled);
+
+        assertFalse(view.isAutoHandwritingEnabled());
+    }
+
+    @Test
+    public void autoHandwriting_setToFalse() {
+        Activity activity = mActivityRule.getActivity();
+        View view = activity.findViewById(R.id.auto_handwriting_enabled);
+        assertTrue(view.isAutoHandwritingEnabled());
+
+        view.setAutoHandwritingEnabled(false);
+        assertFalse(view.isAutoHandwritingEnabled());
+    }
+
+    @Test
+    public void autoHandwriting_setToTrue() {
+        Activity activity = mActivityRule.getActivity();
+        View view = activity.findViewById(R.id.auto_handwriting_disabled);
+        assertFalse(view.isAutoHandwritingEnabled());
+
+        view.setAutoHandwritingEnabled(true);
+        assertTrue(view.isAutoHandwritingEnabled());
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/ChoreographerNativeTest.java b/tests/tests/view/src/android/view/cts/ChoreographerNativeTest.java
index 96aa43b..b9e7f11 100644
--- a/tests/tests/view/src/android/view/cts/ChoreographerNativeTest.java
+++ b/tests/tests/view/src/android/view/cts/ChoreographerNativeTest.java
@@ -75,6 +75,14 @@
     private static native void nativeTestPostCallback64WithoutDelayEventuallyRunsCallbacks(
             long ptr);
     private static native void nativeTestPostCallback64WithDelayEventuallyRunsCallbacks(long ptr);
+    private static native void nativeTestPostVsyncCallbackWithoutDelayEventuallyRunsCallbacks(
+            long ptr);
+    private static native void nativeTestFrameCallbackDataVsyncIdValid(
+            long ptr);
+    private static native void nativeTestFrameCallbackDataDeadlineInFuture(
+            long ptr);
+    private static native void nativeTestFrameCallbackDataExpectedPresentTimeInFuture(
+            long ptr);
     private static native void nativeTestPostCallbackMixedWithoutDelayEventuallyRunsCallbacks(
             long ptr);
     private static native void nativeTestPostCallbackMixedWithDelayEventuallyRunsCallbacks(
@@ -122,6 +130,30 @@
 
     @MediumTest
     @Test
+    public void testPostVsyncCallbackWithoutDelayEventuallyRunsCallbacks() {
+        nativeTestPostVsyncCallbackWithoutDelayEventuallyRunsCallbacks(mChoreographerPtr);
+    }
+
+    @MediumTest
+    @Test
+    public void testFrameCallbackDataVsyncIdValid() {
+        nativeTestFrameCallbackDataVsyncIdValid(mChoreographerPtr);
+    }
+
+    @MediumTest
+    @Test
+    public void testFrameCallbackDataDeadlineInFuture() {
+        nativeTestFrameCallbackDataDeadlineInFuture(mChoreographerPtr);
+    }
+
+    @MediumTest
+    @Test
+    public void testFrameCallbackDataExpectedPresentTimeInFuture() {
+        nativeTestFrameCallbackDataExpectedPresentTimeInFuture(mChoreographerPtr);
+    }
+
+    @MediumTest
+    @Test
     public void testPostCallback64WithoutDelayEventuallyRunsCallbacks() {
         nativeTestPostCallback64WithoutDelayEventuallyRunsCallbacks(mChoreographerPtr);
     }
diff --git a/tests/tests/view/src/android/view/cts/ChoreographerTest.java b/tests/tests/view/src/android/view/cts/ChoreographerTest.java
index 3760b73..c3c137b 100644
--- a/tests/tests/view/src/android/view/cts/ChoreographerTest.java
+++ b/tests/tests/view/src/android/view/cts/ChoreographerTest.java
@@ -25,7 +25,10 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
 
+import android.os.Handler;
+import android.os.Looper;
 import android.os.SystemClock;
+import android.util.Log;
 import android.view.Choreographer;
 
 import androidx.test.annotation.UiThreadTest;
@@ -37,9 +40,13 @@
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;
 
+import java.util.HashSet;
+import java.util.Set;
+
 @MediumTest
 @RunWith(AndroidJUnit4.class)
 public class ChoreographerTest {
+    private static final String TAG = ChoreographerTest.class.getSimpleName();
     private static final long NOMINAL_VSYNC_PERIOD = 16;
     private static final long DELAY_PERIOD = NOMINAL_VSYNC_PERIOD * 5;
     private static final long NANOS_PER_MS = 1000000;
@@ -290,4 +297,190 @@
     public void testRemoveNullFrameCallback() {
         mChoreographer.removeFrameCallback(null);
     }
+
+    @Test
+    public void testPostVsyncCallbackWithoutDelay() {
+        final Choreographer.VsyncCallback addedCallback1 = mock(
+                Choreographer.VsyncCallback.class);
+        final Choreographer.VsyncCallback addedCallback2 = mock(
+                Choreographer.VsyncCallback.class);
+        final Choreographer.VsyncCallback removedCallback = mock(
+                Choreographer.VsyncCallback.class);
+
+        // Add and remove a few callbacks.
+        long postTimeNanos = System.nanoTime();
+        mChoreographer.postVsyncCallback(addedCallback1);
+        mChoreographer.postVsyncCallback(addedCallback2);
+        mChoreographer.postVsyncCallback(removedCallback);
+        mChoreographer.removeVsyncCallback(removedCallback);
+
+        // We expect the remaining callbacks to have been invoked once.
+        ArgumentCaptor<Choreographer.FrameData> captor1 = ArgumentCaptor.forClass(
+                Choreographer.FrameData.class);
+        ArgumentCaptor<Choreographer.FrameData> captor2 = ArgumentCaptor.forClass(
+                Choreographer.FrameData.class);
+        verify(addedCallback1, timeout(NOMINAL_VSYNC_PERIOD * 10).times(1)).onVsync(
+                captor1.capture());
+        verify(addedCallback2, times(1)).onVsync(captor2.capture());
+        verifyZeroInteractions(removedCallback);
+        assertTimeDeltaLessThan(captor1.getValue().getFrameTimeNanos() - postTimeNanos,
+                NOMINAL_VSYNC_PERIOD * 10 * NANOS_PER_MS);
+        assertTimeDeltaLessThan(captor2.getValue().getFrameTimeNanos() - postTimeNanos,
+                NOMINAL_VSYNC_PERIOD * 10 * NANOS_PER_MS);
+
+        // If we post a callback again, then it should be invoked again.
+        postTimeNanos = System.nanoTime();
+        mChoreographer.postVsyncCallback(addedCallback1);
+
+        verify(addedCallback1, timeout(NOMINAL_VSYNC_PERIOD * 10).times(2)).onVsync(
+                captor1.capture());
+        verify(addedCallback2, times(1)).onVsync(captor2.capture());
+        verifyZeroInteractions(removedCallback);
+        assertTimeDeltaLessThan(captor1.getValue().getFrameTimeNanos() - postTimeNanos,
+                NOMINAL_VSYNC_PERIOD * 10 * NANOS_PER_MS);
+        // Callback #2 is not invoked a second time so the time delta is not checked here.
+    }
+
+    @Test
+    public void testPostVsyncCallbackFrameDataPreferredFrameTimelineValid() {
+        final Choreographer.VsyncCallback addedCallback = mock(
+                Choreographer.VsyncCallback.class);
+        long postTimeNanos = System.nanoTime();
+        mChoreographer.postVsyncCallback(addedCallback);
+
+        ArgumentCaptor<Choreographer.FrameData> captor = ArgumentCaptor.forClass(
+                Choreographer.FrameData.class);
+        verify(addedCallback, timeout(NOMINAL_VSYNC_PERIOD * 10).times(1)).onVsync(
+                captor.capture());
+
+        Choreographer.FrameData frameData = captor.getValue();
+        assertTrue("Number of frame timelines should be greater than 0",
+                frameData.getFrameTimelines().length > 0);
+        Set<Choreographer.FrameTimeline> frameTimelines = Set.of(frameData.getFrameTimelines());
+        assertTrue("Preferred frame timeline is not included in frame timelines",
+                frameTimelines.contains(frameData.getPreferredFrameTimeline()));
+    }
+
+    @Test
+    public void testPostVsyncCallbackFrameDataVsyncIdValid() {
+        final Choreographer.VsyncCallback addedCallback = mock(
+                Choreographer.VsyncCallback.class);
+        long postTimeNanos = System.nanoTime();
+        mChoreographer.postVsyncCallback(addedCallback);
+
+        ArgumentCaptor<Choreographer.FrameData> captor = ArgumentCaptor.forClass(
+                Choreographer.FrameData.class);
+        verify(addedCallback, timeout(NOMINAL_VSYNC_PERIOD * 10).times(1)).onVsync(
+                captor.capture());
+
+        Choreographer.FrameData frameData = captor.getValue();
+        assertTrue("Number of frame timelines should be greater than 0",
+                frameData.getFrameTimelines().length > 0);
+        HashSet<Long> pastVsyncIds = new HashSet();
+        for (Choreographer.FrameTimeline frameTimeline : frameData.getFrameTimelines()) {
+            long vsyncId = frameTimeline.getVsyncId();
+            assertTrue("Invalid vsync ID", vsyncId > 0);
+            assertTrue("Vsync ID should be unique", !pastVsyncIds.contains(vsyncId));
+            pastVsyncIds.add(vsyncId);
+        }
+    }
+
+    @Test
+    public void testPostVsyncCallbackFrameDataDeadlineInFuture() {
+        final Choreographer.VsyncCallback addedCallback = mock(
+                Choreographer.VsyncCallback.class);
+        long postTimeNanos = System.nanoTime();
+        mChoreographer.postVsyncCallback(addedCallback);
+
+        ArgumentCaptor<Choreographer.FrameData> captor = ArgumentCaptor.forClass(
+                Choreographer.FrameData.class);
+        verify(addedCallback, timeout(NOMINAL_VSYNC_PERIOD * 10).times(1)).onVsync(
+                captor.capture());
+
+        Choreographer.FrameData frameData = captor.getValue();
+        assertTrue("Number of frame timelines should be greater than 0",
+                frameData.getFrameTimelines().length > 0);
+        long lastValue = frameData.getFrameTimeNanos();
+        for (Choreographer.FrameTimeline frameTimeline : frameData.getFrameTimelines()) {
+            long deadline = frameTimeline.getDeadlineNanos();
+            assertTrue("Deadline must be after start time", deadline > postTimeNanos);
+            assertTrue("Deadline must be after frame time",
+                    deadline > frameData.getFrameTimeNanos());
+            assertTrue("Deadline must be after the previous frame deadline",
+                    deadline > lastValue);
+            lastValue = deadline;
+        }
+    }
+
+    @Test
+    public void testPostVsyncCallbackFrameDataExpectedPresentationTimeInFuture() {
+        final Choreographer.VsyncCallback addedCallback = mock(
+                Choreographer.VsyncCallback.class);
+        long postTimeNanos = System.nanoTime();
+        mChoreographer.postVsyncCallback(addedCallback);
+
+        ArgumentCaptor<Choreographer.FrameData> captor = ArgumentCaptor.forClass(
+                Choreographer.FrameData.class);
+        verify(addedCallback, timeout(NOMINAL_VSYNC_PERIOD * 10).times(1)).onVsync(
+                captor.capture());
+
+        Choreographer.FrameData frameData = captor.getValue();
+        assertTrue("Number of frame timelines should be greater than 0",
+                frameData.getFrameTimelines().length > 0);
+        long lastValue = frameData.getFrameTimeNanos();
+        for (Choreographer.FrameTimeline frameTimeline : frameData.getFrameTimelines()) {
+            long expectedPresentationTime = frameTimeline.getExpectedPresentationTimeNanos();
+            assertTrue("Expected presentation time must be after start time",
+                    expectedPresentationTime > postTimeNanos);
+            assertTrue("Expected presentation time must be after frame time",
+                    expectedPresentationTime > frameData.getFrameTimeNanos());
+            assertTrue(
+                    "Expected presentation time must be after the previous frame expected "
+                            + "presentation time",
+                    expectedPresentationTime > lastValue);
+            lastValue = expectedPresentationTime;
+        }
+    }
+
+    @Test
+    public void testPostVsyncCallbackFrameDelayed() {
+        final Choreographer.VsyncCallback addedCallback = mock(
+                Choreographer.VsyncCallback.class);
+        long postTimeNanos = System.nanoTime();
+        mChoreographer.postVsyncCallback(addedCallback);
+
+        // The callback is posted and pending. Wait using the handler which is using the same UI
+        // thread as Choreographer, so that the thread is busy and the frame delayed logic can
+        // run for test.
+        long sleepTimeMs = NOMINAL_VSYNC_PERIOD * 3;
+        Looper looper = Looper.getMainLooper();
+        Handler handler = new Handler(looper);
+        handler.post(new Runnable(){
+            @Override
+            public void run() {
+                SystemClock.sleep(sleepTimeMs);
+                Log.d(TAG, "Slept for ms: " + sleepTimeMs);
+            }
+        });
+
+        ArgumentCaptor<Choreographer.FrameData> captor = ArgumentCaptor.forClass(
+                Choreographer.FrameData.class);
+        verify(addedCallback, timeout(NOMINAL_VSYNC_PERIOD * 10).times(1)).onVsync(
+                captor.capture());
+
+        Choreographer.FrameData frameData = captor.getValue();
+        long frameInterval = NOMINAL_VSYNC_PERIOD * 1000000;
+        assertTrue("Expected frame time updated to be later", frameData.getFrameTimeNanos()
+                > postTimeNanos + sleepTimeMs * 1000000 - frameInterval);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testPostNullVsyncCallback() {
+        mChoreographer.postVsyncCallback(null);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testRemoveNullVsyncCallback() {
+        mChoreographer.removeVsyncCallback(null);
+    }
 }
diff --git a/tests/tests/view/src/android/view/cts/input/InputEventInterceptTestActivity.java b/tests/tests/view/src/android/view/cts/InputEventInterceptTestActivity.java
similarity index 100%
rename from tests/tests/view/src/android/view/cts/input/InputEventInterceptTestActivity.java
rename to tests/tests/view/src/android/view/cts/InputEventInterceptTestActivity.java
diff --git a/tests/tests/view/src/android/view/cts/InputQueueCtsActivity.java b/tests/tests/view/src/android/view/cts/InputQueueCtsActivity.java
new file mode 100644
index 0000000..2705f53
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/InputQueueCtsActivity.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2021 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 android.view.cts;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.view.InputQueue;
+
+public class InputQueueCtsActivity extends Activity implements InputQueue.Callback {
+    private InputQueue mInputQueue;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        getWindow().takeInputQueue(this);
+    }
+
+    @Override
+    public void onInputQueueCreated(InputQueue inputQueue) {
+        mInputQueue = inputQueue;
+    }
+
+    @Override
+    public void onInputQueueDestroyed(InputQueue inputQueue) {}
+
+    public InputQueue getInputQueue() {
+        return mInputQueue;
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/InputQueueTest.java b/tests/tests/view/src/android/view/cts/InputQueueTest.java
new file mode 100644
index 0000000..aefa38c
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/InputQueueTest.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2021 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 android.view.cts;
+
+import static org.junit.Assert.assertTrue;
+
+import android.app.Instrumentation;
+import android.os.SystemClock;
+import android.view.InputQueue;
+import android.view.MotionEvent;
+import android.view.Window;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.SmallTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Test {@link AInputQueue}.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class InputQueueTest {
+    private static final String LOG_TAG = InputQueueTest.class.getSimpleName();
+    static {
+        System.loadLibrary("ctsview_jni");
+    }
+
+    private final Instrumentation mInstrumentation = InstrumentationRegistry.getInstrumentation();
+
+    private static native boolean waitForEvent(InputQueue inputQueue);
+    private static native void inputQueueTest(InputQueue inputQueue);
+
+    @Rule
+    public ActivityTestRule<InputQueueCtsActivity> mTestActivityRule =
+            new ActivityTestRule<>(InputQueueCtsActivity.class);
+
+    @Test
+    public void testNativeInputQueue() throws Throwable {
+        InputQueueCtsActivity activity = mTestActivityRule.getActivity();
+        Window window = activity.getWindow();
+        InputQueue inputQueue = activity.getInputQueue();
+
+        // An event is created Java-side.
+        long now = SystemClock.uptimeMillis();
+        MotionEvent event = MotionEvent.obtain(now, now, MotionEvent.ACTION_DOWN, 0, 0, 0);
+        window.injectInputEvent(event);
+
+        assertTrue("Timed out waiting for event", waitForEvent(inputQueue));
+
+        inputQueueTest(inputQueue); // Check the injected event is received on the native side.
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/MotionEventTest.java b/tests/tests/view/src/android/view/cts/MotionEventTest.java
index 92e5832..06a0219 100644
--- a/tests/tests/view/src/android/view/cts/MotionEventTest.java
+++ b/tests/tests/view/src/android/view/cts/MotionEventTest.java
@@ -169,10 +169,10 @@
     public void testObtainFromPropertyArrays() {
         PointerCoordsBuilder coordsBuilder0 =
                 withCoords(X_3F, Y_4F).withPressure(PRESSURE_1F).withSize(SIZE_1F).
-                        withTool(1.2f, 1.4f);
+                        withTool(1.2f, 1.4f).withGenericAxis1(2.6f);
         PointerCoordsBuilder coordsBuilder1 =
                 withCoords(X_3F + 1.0f, Y_4F - 2.0f).withPressure(PRESSURE_1F + 0.2f).
-                        withSize(SIZE_1F + 0.5f).withTouch(2.2f, 0.6f);
+                        withSize(SIZE_1F + 0.5f).withTouch(2.2f, 0.6f).withGenericAxis1(2.6f);
 
         PointerPropertiesBuilder propertiesBuilder0 =
                 withProperties(0, MotionEvent.TOOL_TYPE_FINGER);
@@ -451,9 +451,11 @@
     @Test
     public void testGetCurrentDataWithTwoPointers() {
         PointerCoordsBuilder coordsBuilder0 =
-                withCoords(10.0f, 20.0f).withPressure(1.2f).withSize(2.0f).withTool(1.2f, 1.4f);
+                withCoords(10.0f, 20.0f).withPressure(1.2f).withSize(2.0f).withTool(1.2f,
+                        1.4f).withGenericAxis1(4.4f);
         PointerCoordsBuilder coordsBuilder1 =
-                withCoords(30.0f, 40.0f).withPressure(1.4f).withSize(3.0f).withTouch(2.2f, 0.6f);
+                withCoords(30.0f, 40.0f).withPressure(1.4f).withSize(3.0f).withTouch(2.2f,
+                        0.6f).withGenericAxis1(6.6f);
 
         PointerPropertiesBuilder propertiesBuilder0 =
                 withProperties(0, MotionEvent.TOOL_TYPE_FINGER);
@@ -484,9 +486,11 @@
     @Test
     public void testGetRawCoordsWithTwoPointers() {
         PointerCoordsBuilder coordsBuilder0 =
-                withCoords(10.0f, 20.0f).withPressure(1.2f).withSize(2.0f).withTool(1.2f, 1.4f);
+                withCoords(10.0f, 20.0f).withPressure(1.2f).withSize(2.0f).withTool(1.2f,
+                        1.4f).withGenericAxis1(4.4f);
         PointerCoordsBuilder coordsBuilder1 =
-                withCoords(30.0f, 40.0f).withPressure(1.4f).withSize(3.0f).withTouch(2.2f, 0.6f);
+                withCoords(30.0f, 40.0f).withPressure(1.4f).withSize(3.0f).withTouch(2.2f,
+                        0.6f).withGenericAxis1(6.6f);
 
         PointerPropertiesBuilder propertiesBuilder0 =
                 withProperties(0, MotionEvent.TOOL_TYPE_FINGER);
@@ -518,10 +522,10 @@
         // PHASE 1 - construct the initial data for the event
         PointerCoordsBuilder coordsBuilderInitial0 =
                 withCoords(10.0f, 20.0f).withPressure(1.2f).withSize(2.0f).withTool(1.2f, 1.4f).
-                        withTouch(0.7f, 0.6f).withOrientation(2.0f);
+                        withTouch(0.7f, 0.6f).withOrientation(2.0f).withGenericAxis1(4.4f);
         PointerCoordsBuilder coordsBuilderInitial1 =
                 withCoords(30.0f, 40.0f).withPressure(1.4f).withSize(3.0f).withTool(1.3f, 1.7f).
-                        withTouch(2.7f, 3.6f).withOrientation(1.0f);
+                        withTouch(2.7f, 3.6f).withOrientation(1.0f).withGenericAxis1(5.4f);
 
         PointerPropertiesBuilder propertiesBuilder0 =
                 withProperties(0, MotionEvent.TOOL_TYPE_FINGER);
@@ -547,10 +551,10 @@
         // PHASE 2 - add a new batch of data to our event
         PointerCoordsBuilder coordsBuilderNext0 =
                 withCoords(15.0f, 25.0f).withPressure(1.6f).withSize(2.2f).withTool(1.2f, 1.4f).
-                        withTouch(1.0f, 0.9f).withOrientation(2.2f);
+                        withTouch(1.0f, 0.9f).withOrientation(2.2f).withGenericAxis1(7.4f);
         PointerCoordsBuilder coordsBuilderNext1 =
                 withCoords(35.0f, 45.0f).withPressure(1.8f).withSize(3.2f).withTool(1.2f, 1.4f).
-                        withTouch(0.7f, 0.6f).withOrientation(2.9f);
+                        withTouch(0.7f, 0.6f).withOrientation(2.9f).withGenericAxis1(8.4f);
 
         mMotionEventDynamic.addBatch(mEventTime + 10,
                 new PointerCoords[] { coordsBuilderNext0.build(), coordsBuilderNext1.build() }, 0);
@@ -576,10 +580,10 @@
         // PHASE 3 - add one more new batch of data to our event
         PointerCoordsBuilder coordsBuilderLast0 =
                 withCoords(18.0f, 28.0f).withPressure(1.1f).withSize(2.9f).withTool(1.5f, 1.9f).
-                        withTouch(1.2f, 5.0f).withOrientation(3.2f);
+                        withTouch(1.2f, 5.0f).withOrientation(3.1f).withGenericAxis1(1.4f);
         PointerCoordsBuilder coordsBuilderLast1 =
                 withCoords(38.0f, 48.0f).withPressure(1.2f).withSize(2.5f).withTool(0.2f, 0.4f).
-                        withTouch(2.7f, 4.6f).withOrientation(0.2f);
+                        withTouch(2.7f, 4.6f).withOrientation(0.2f).withGenericAxis1(5.4f);
 
         mMotionEventDynamic.addBatch(mEventTime + 20,
                 new PointerCoords[] { coordsBuilderLast0.build(), coordsBuilderLast1.build() }, 0);
@@ -676,7 +680,8 @@
             originalRawCoords[i] = new PointerCoords(c);
         }
         final MotionEvent event = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE,
-                pointerCount, pointerIds, pointerCoords, 0, 0, 0, 0, 0, 0, 0);
+                pointerCount, pointerIds, pointerCoords, 0, 0, 0, 0, 0,
+                InputDevice.SOURCE_TOUCHSCREEN, 0);
         dump("Original points.", event);
 
         // Check original raw X and Y assumption.
@@ -1006,7 +1011,8 @@
     @Test
     public void testNativeConverter() {
         final MotionEvent event = MotionEvent.obtain(mDownTime, mEventTime,
-                MotionEvent.ACTION_MOVE, X_3F, Y_4F, META_STATE);
+                MotionEvent.ACTION_BUTTON_PRESS, X_3F, Y_4F, META_STATE);
+        event.setActionButton(MotionEvent.BUTTON_PRIMARY);
         nativeMotionEventTest(event);
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/MotionEventUtils.java b/tests/tests/view/src/android/view/cts/MotionEventUtils.java
index 74291c7..3747a46 100644
--- a/tests/tests/view/src/android/view/cts/MotionEventUtils.java
+++ b/tests/tests/view/src/android/view/cts/MotionEventUtils.java
@@ -84,6 +84,7 @@
         private float toolMajor;
         private float toolMinor;
         private float orientation;
+        private float generic1;
 
         public PointerCoordsBuilder withPressure(float pressure) {
             this.pressure = pressure;
@@ -112,6 +113,11 @@
             return this;
         }
 
+        public PointerCoordsBuilder withGenericAxis1(float generic1) {
+            this.generic1 = generic1;
+            return this;
+        }
+
         public PointerCoords build() {
             final PointerCoords pointerCoords = new PointerCoords();
             pointerCoords.x = x;
@@ -123,6 +129,7 @@
             pointerCoords.toolMajor = toolMajor;
             pointerCoords.toolMinor = toolMinor;
             pointerCoords.orientation = orientation;
+            pointerCoords.setAxisValue(MotionEvent.AXIS_GENERIC_1, generic1);
             return pointerCoords;
         }
 
@@ -167,6 +174,9 @@
                     that.getOrientation(), this.orientation, DELTA);
             assertEquals("Orientation should be the same",
                     that.getAxisValue(MotionEvent.AXIS_ORIENTATION), this.orientation, DELTA);
+
+            assertEquals("Generic axis 1 should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_GENERIC_1), this.generic1, DELTA);
         }
 
         public void verifyMatches(MotionEvent that, int pointerIndex) {
@@ -220,6 +230,10 @@
             assertEquals("Orientation should be the same",
                     that.getAxisValue(MotionEvent.AXIS_ORIENTATION, pointerIndex), this.orientation,
                         DELTA);
+
+            assertEquals("Generic axis 1 should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_GENERIC_1, pointerIndex), this.generic1,
+                    DELTA);
         }
 
         public void verifyMatchesHistorical(MotionEvent that, int position) {
@@ -273,6 +287,10 @@
             assertEquals("Orientation should be the same",
                     that.getHistoricalAxisValue(MotionEvent.AXIS_ORIENTATION, position),
                     this.orientation, DELTA);
+
+            assertEquals("Generic axis 1 should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_GENERIC_1, position),
+                    this.generic1, DELTA);
         }
 
         public void verifyMatchesHistorical(MotionEvent that, int pointerIndex, int position) {
@@ -334,6 +352,10 @@
                     that.getHistoricalAxisValue(MotionEvent.AXIS_ORIENTATION,
                             pointerIndex, position),
                     this.orientation, DELTA);
+
+            assertEquals("Generic axis 1 should be the same",
+                    that.getHistoricalAxisValue(MotionEvent.AXIS_GENERIC_1, pointerIndex, position),
+                    this.generic1, DELTA);
         }
 
         public void verifyMatchesPointerCoords(PointerCoords that) {
@@ -373,6 +395,9 @@
                     that.orientation, this.orientation, DELTA);
             assertEquals("Orientation should be the same",
                     that.getAxisValue(MotionEvent.AXIS_ORIENTATION), this.orientation, DELTA);
+
+            assertEquals("Generic axis 1 should be the same",
+                    that.getAxisValue(MotionEvent.AXIS_GENERIC_1), this.generic1, DELTA);
         }
 
         public void verifyMatchesPointerCoords(MotionEvent motionEvent, int pointerIndex) {
diff --git a/tests/tests/view/src/android/view/cts/MotionEvent_PointerCoordsTest.java b/tests/tests/view/src/android/view/cts/MotionEvent_PointerCoordsTest.java
index e39f1cb..6ed2d34 100644
--- a/tests/tests/view/src/android/view/cts/MotionEvent_PointerCoordsTest.java
+++ b/tests/tests/view/src/android/view/cts/MotionEvent_PointerCoordsTest.java
@@ -40,7 +40,7 @@
     @Before
     public void setup() {
         mBuilder = withCoords(10.0f, 20.0f).withPressure(1.2f).withSize(2.0f).withTool(1.2f, 1.4f).
-                withTouch(3.0f, 2.4f);
+                withTouch(3.0f, 2.4f).withGenericAxis1(4.4f);
         mPointerCoords = mBuilder.build();
     }
 
@@ -54,42 +54,56 @@
         // Change value of X
         mPointerCoords.setAxisValue(MotionEvent.AXIS_X, 15.0f);
         withCoords(15.0f, 20.0f).withPressure(1.2f).withSize(2.0f).withTool(1.2f, 1.4f).
-                withTouch(3.0f, 2.4f).verifyMatchesPointerCoords(mPointerCoords);
+                withTouch(3.0f, 2.4f).withGenericAxis1(4.4f).verifyMatchesPointerCoords(
+                mPointerCoords);
 
         // Change value of Y
         mPointerCoords.setAxisValue(MotionEvent.AXIS_Y, 25.0f);
         withCoords(15.0f, 25.0f).withPressure(1.2f).withSize(2.0f).withTool(1.2f, 1.4f).
-                withTouch(3.0f, 2.4f).verifyMatchesPointerCoords(mPointerCoords);
+                withTouch(3.0f, 2.4f).withGenericAxis1(4.4f).verifyMatchesPointerCoords(
+                mPointerCoords);
 
         // Change value of pressure
         mPointerCoords.setAxisValue(MotionEvent.AXIS_PRESSURE, 2.2f);
         withCoords(15.0f, 25.0f).withPressure(2.2f).withSize(2.0f).withTool(1.2f, 1.4f).
-                withTouch(3.0f, 2.4f).verifyMatchesPointerCoords(mPointerCoords);
+                withTouch(3.0f, 2.4f).withGenericAxis1(4.4f).verifyMatchesPointerCoords(
+                mPointerCoords);
 
         // Change value of size
         mPointerCoords.setAxisValue(MotionEvent.AXIS_SIZE, 10.0f);
         withCoords(15.0f, 25.0f).withPressure(2.2f).withSize(10.0f).withTool(1.2f, 1.4f).
-                withTouch(3.0f, 2.4f).verifyMatchesPointerCoords(mPointerCoords);
+                withTouch(3.0f, 2.4f).withGenericAxis1(4.4f).verifyMatchesPointerCoords(
+                mPointerCoords);
 
         // Change value of tool major
         mPointerCoords.setAxisValue(MotionEvent.AXIS_TOOL_MAJOR, 7.0f);
         withCoords(15.0f, 25.0f).withPressure(2.2f).withSize(10.0f).withTool(7.0f, 1.4f).
-                withTouch(3.0f, 2.4f).verifyMatchesPointerCoords(mPointerCoords);
+                withTouch(3.0f, 2.4f).withGenericAxis1(4.4f).verifyMatchesPointerCoords(
+                mPointerCoords);
 
         // Change value of tool minor
         mPointerCoords.setAxisValue(MotionEvent.AXIS_TOOL_MINOR, 2.0f);
         withCoords(15.0f, 25.0f).withPressure(2.2f).withSize(10.0f).withTool(7.0f, 2.0f).
-                withTouch(3.0f, 2.4f).verifyMatchesPointerCoords(mPointerCoords);
+                withTouch(3.0f, 2.4f).withGenericAxis1(4.4f).verifyMatchesPointerCoords(
+                mPointerCoords);
 
         // Change value of tool major
         mPointerCoords.setAxisValue(MotionEvent.AXIS_TOUCH_MAJOR, 5.0f);
         withCoords(15.0f, 25.0f).withPressure(2.2f).withSize(10.0f).withTool(7.0f, 2.0f).
-                withTouch(5.0f, 2.4f).verifyMatchesPointerCoords(mPointerCoords);
+                withTouch(5.0f, 2.4f).withGenericAxis1(4.4f).verifyMatchesPointerCoords(
+                mPointerCoords);
 
         // Change value of tool minor
         mPointerCoords.setAxisValue(MotionEvent.AXIS_TOUCH_MINOR, 2.1f);
         withCoords(15.0f, 25.0f).withPressure(2.2f).withSize(10.0f).withTool(7.0f, 2.0f).
-                withTouch(5.0f, 2.1f).verifyMatchesPointerCoords(mPointerCoords);
+                withTouch(5.0f, 2.1f).withGenericAxis1(4.4f).verifyMatchesPointerCoords(
+                mPointerCoords);
+
+        // Change value of axis generic 1
+        mPointerCoords.setAxisValue(MotionEvent.AXIS_GENERIC_1, 4.6f);
+        withCoords(15.0f, 25.0f).withPressure(2.2f).withSize(10.0f).withTool(7.0f, 2.0f)
+                .withTouch(5.0f, 2.1f).withGenericAxis1(4.6f).verifyMatchesPointerCoords(
+                mPointerCoords);
     }
 
     @Test
@@ -103,6 +117,7 @@
     public void testClear() {
         mPointerCoords.clear();
         withCoords(0.0f, 0.0f).withPressure(0.0f).withSize(0.0f).withTool(0.0f, 0.0f).
-                withTouch(0.0f, 0.0f).verifyMatchesPointerCoords(mPointerCoords);
+                withTouch(0.0f, 0.0f).withGenericAxis1(0.0f).verifyMatchesPointerCoords(
+                mPointerCoords);
     }
 }
diff --git a/tests/tests/view/src/android/view/cts/OnBackInvokedDispatcherTest.java b/tests/tests/view/src/android/view/cts/OnBackInvokedDispatcherTest.java
new file mode 100644
index 0000000..4d0d24b
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/OnBackInvokedDispatcherTest.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright (C) 2022 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 android.view.cts;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import android.app.Dialog;
+import android.view.View;
+import android.widget.FrameLayout;
+import android.window.OnBackInvokedCallback;
+import android.window.OnBackInvokedDispatcher;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.filters.MediumTest;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+
+import java.util.HashMap;
+
+/**
+ * Test {@link OnBackInvokedDispatcher}.
+ */
+@MediumTest
+public class OnBackInvokedDispatcherTest {
+    private OnBackInvokedDispatcherTestActivity mActivity;
+    private Dialog mDialog;
+
+    @Rule
+    public ActivityScenarioRule<OnBackInvokedDispatcherTestActivity> mActivityRule =
+            new ActivityScenarioRule<>(OnBackInvokedDispatcherTestActivity.class);
+
+    @Before
+    public void setUp() {
+        mActivityRule.getScenario().moveToState(Lifecycle.State.RESUMED);
+        mActivityRule.getScenario().onActivity(activity -> {
+            mActivity = activity;
+            mDialog = mActivity.getDialog();
+        });
+    }
+
+    @Test
+    public void testGetDispatcherOnDialog() {
+        OnBackInvokedDispatcher dialogDispatcher = mDialog.getOnBackInvokedDispatcher();
+        assertNotNull("OnBackInvokedDispatcher on Dialog should not be null", dialogDispatcher);
+    }
+
+    @Test
+    public void findDispatcherOnView() {
+        final OnBackInvokedDispatcher[] windowOnBackInvokedDispatcher = {null};
+        mActivityRule.getScenario().onActivity(activity -> {
+            mActivity = activity;
+            mDialog = mActivity.getDialog();
+            View view = new View(activity) {
+                @Override
+                protected void onAttachedToWindow() {
+                    super.onAttachedToWindow();
+                    windowOnBackInvokedDispatcher[0] = findOnBackInvokedDispatcher();
+                }
+            };
+            assertNull("View is not attached, it should not have an OnBackInvokedDispatcher",
+                    view.findOnBackInvokedDispatcher());
+            activity.setContentView(view);
+        });
+        assertNotNull("View is attached, it should have an OnBackInvokedDispatcher",
+                windowOnBackInvokedDispatcher[0]);
+    }
+
+    @Test
+    public void findDispatcherOnViewGroup() {
+        final HashMap<String, View> viewMap = new HashMap<>();
+        mActivityRule.getScenario().onActivity(activity -> {
+            mActivity = activity;
+            mDialog = mActivity.getDialog();
+            FrameLayout root = new FrameLayout(activity) {
+                @Nullable
+                @Override
+                public OnBackInvokedDispatcher findOnBackInvokedDispatcherForChild(
+                        @NonNull View child, @NonNull View requester) {
+                    viewMap.put("root_child", child);
+                    viewMap.put("root_requester", requester);
+                    return super.findOnBackInvokedDispatcherForChild(child, requester);
+                }
+            };
+            FrameLayout parent = new FrameLayout(activity) {
+                @Nullable
+                @Override
+                public OnBackInvokedDispatcher findOnBackInvokedDispatcherForChild(
+                        @NonNull View child, @NonNull View requester) {
+                    viewMap.put("parent_child", child);
+                    viewMap.put("parent_requester", requester);
+                    return super.findOnBackInvokedDispatcherForChild(child, requester);
+                }
+            };
+            View view = new View(activity);
+            viewMap.put("root", root);
+            viewMap.put("parent", parent);
+            viewMap.put("view", view);
+
+            root.addView(parent);
+            parent.addView(view);
+            activity.setContentView(root);
+        });
+
+        View view = viewMap.get("view");
+        View parent = viewMap.get("parent");
+        assertNotNull("View is attached, it should have an OnBackInvokedDispatcher",
+                view.findOnBackInvokedDispatcher());
+        assertEquals("Requester from root should be the leaf view",
+                view, viewMap.get("root_requester"));
+        assertEquals("Child from root should be the direct child",
+                parent, viewMap.get("root_child"));
+        assertEquals("Requester from direct parent should be the direct child",
+                view, viewMap.get("parent_requester"));
+        assertEquals("Child from parent should be the direct child",
+                view, viewMap.get("parent_child"));
+    }
+
+    @Test
+    public void testRegisterAndUnregisterCallbacks() {
+        OnBackInvokedDispatcher dispatcher = mActivity.getOnBackInvokedDispatcher();
+        OnBackInvokedCallback callback1 = createBackCallback();
+        OnBackInvokedCallback callback2 = createBackCallback();
+        dispatcher.registerOnBackInvokedCallback(
+                OnBackInvokedDispatcher.PRIORITY_OVERLAY, callback1);
+        dispatcher.registerOnBackInvokedCallback(
+                OnBackInvokedDispatcher.PRIORITY_DEFAULT, callback2);
+        dispatcher.unregisterOnBackInvokedCallback(callback2);
+        dispatcher.unregisterOnBackInvokedCallback(callback1);
+        dispatcher.unregisterOnBackInvokedCallback(callback2);
+    }
+
+    private OnBackInvokedCallback createBackCallback() {
+        return () -> {};
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/OnBackInvokedDispatcherTestActivity.java b/tests/tests/view/src/android/view/cts/OnBackInvokedDispatcherTestActivity.java
new file mode 100644
index 0000000..233147c
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/OnBackInvokedDispatcherTestActivity.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2016 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 android.view.cts;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.os.Bundle;
+
+public class OnBackInvokedDispatcherTestActivity extends Activity {
+    private Dialog mDialog;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.onbackinvokeddispatcher_layout);
+        mDialog = new Dialog(this, 0);
+        mDialog.setContentView(R.layout.onbackinvokeddispatcher_dialog_layout);
+        mDialog.show();
+    }
+
+    public Dialog getDialog() {
+        return mDialog;
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/SDRTestActivity.java b/tests/tests/view/src/android/view/cts/SDRTestActivity.java
new file mode 100644
index 0000000..c862a31
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/SDRTestActivity.java
@@ -0,0 +1,92 @@
+/**
+ * Copyright (C) 2022 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 android.view.cts;
+
+import android.app.Activity;
+import android.graphics.SurfaceTexture;
+import android.os.Bundle;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
+import android.view.TextureView;
+import android.view.TextureView.SurfaceTextureListener;
+import android.view.ViewGroup.LayoutParams;
+import android.widget.FrameLayout;
+
+public class SDRTestActivity extends Activity
+        implements SurfaceHolder.Callback, SurfaceTextureListener {
+    private SurfaceView mSurfaceView;
+    private TextureView mTextureView;
+
+    @Override
+    public void surfaceCreated(SurfaceHolder holder) {}
+
+    @Override
+    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
+
+    @Override
+    public void surfaceDestroyed(SurfaceHolder holder) {}
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mTextureView = new TextureView(this);
+        mSurfaceView = new SurfaceView(this);
+        mTextureView.setSurfaceTextureListener(this);
+
+        FrameLayout content = new FrameLayout(this);
+        content.addView(mSurfaceView,
+                LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+        content.addView(mTextureView,
+                LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT);
+
+        mSurfaceView.getHolder().addCallback(this);
+        setContentView(content);
+    }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+    }
+
+    @Override
+    public void onEnterAnimationComplete() {
+        super.onEnterAnimationComplete();
+    }
+
+    public TextureView getTextureView() {
+        return mTextureView;
+    }
+
+    public SurfaceView getSurfaceView() {
+        return mSurfaceView;
+    }
+
+    @Override
+    public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int height) {}
+
+    @Override
+    public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int height) {}
+
+    @Override
+    public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {
+        return true;
+    }
+
+    @Override
+    public void onSurfaceTextureUpdated(SurfaceTexture surface) {}
+}
+
diff --git a/tests/tests/view/src/android/view/cts/SetTouchableRegionTest.java b/tests/tests/view/src/android/view/cts/SetTouchableRegionTest.java
new file mode 100644
index 0000000..ad73c21
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/SetTouchableRegionTest.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2022 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 android.view.cts;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+import android.app.Activity;
+import android.app.Instrumentation;
+import android.content.Context;
+import android.graphics.Region;
+import android.view.AttachedSurfaceControl;
+import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.PopupWindow;
+
+import com.android.compatibility.common.util.CtsTouchUtils;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.LargeTest;
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+@RunWith(AndroidJUnit4.class)
+public class SetTouchableRegionTest {
+    private Instrumentation mInstrumentation;
+    private Activity mActivity;
+    @Rule
+    public ActivityTestRule<CtsActivity> mActivityRule =
+        new ActivityTestRule<>(CtsActivity.class);
+
+    class MotionRecordingView extends View {
+        public MotionRecordingView(Context context) {
+            super(context);
+        }
+
+        boolean mGotEvent = false;
+        public boolean onTouchEvent(MotionEvent e) {
+            super.onTouchEvent(e);
+            synchronized (this) {
+                mGotEvent = true;
+            }
+            return true;
+        }
+        boolean gotEvent() {
+            synchronized (this) {
+                return mGotEvent;
+            }
+        }
+        void reset() {
+            synchronized (this) {
+                mGotEvent = false;
+            }
+        }
+    }
+    MotionRecordingView mMotionRecordingView;
+    View mPopupView;
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        mActivity = mActivityRule.getActivity();
+    }
+
+    void tapSync() {
+        mInstrumentation.waitForIdleSync();
+        assertFalse(mMotionRecordingView.gotEvent());
+
+        CtsTouchUtils.emulateTapOnViewCenter(mInstrumentation, mActivityRule, mMotionRecordingView);
+        mInstrumentation.waitForIdleSync();
+    }
+
+    @Test
+    public void testClickthroughRegion() throws Throwable {
+        mActivityRule.runOnUiThread(() -> {
+            mMotionRecordingView = new MotionRecordingView(mActivity);
+            mActivity.setContentView(mMotionRecordingView);
+        });
+        tapSync();
+        // We have a view filling our entire hierarchy and so a tap should reach it
+        assertTrue(mMotionRecordingView.gotEvent());
+
+        mActivityRule.runOnUiThread(() -> {
+            mPopupView = new View(mActivity);
+            PopupWindow popup = new PopupWindow(mPopupView,
+                ViewGroup.LayoutParams.FILL_PARENT,
+                ViewGroup.LayoutParams.FILL_PARENT);
+            popup.showAtLocation(mMotionRecordingView, Gravity.NO_GRAVITY, 0, 0);
+        });
+        mMotionRecordingView.reset();
+        tapSync();
+        // However now we have covered ourselves with a FILL_PARENT popup window
+        // and so the tap should not reach us
+        assertFalse(mMotionRecordingView.gotEvent());
+
+        mActivityRule.runOnUiThread(() -> {
+            mPopupView.getRootSurfaceControl().setTouchableRegion(new Region());
+        });
+        tapSync();
+        // But now we have punched a touchable region hole in the popup window and
+        // we should be reachable again.
+        assertTrue(mMotionRecordingView.gotEvent());
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/SurfaceControlTest.java b/tests/tests/view/src/android/view/cts/SurfaceControlTest.java
new file mode 100644
index 0000000..8857ba7
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/SurfaceControlTest.java
@@ -0,0 +1,1493 @@
+/*
+ * Copyright 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 android.view.cts;
+
+import static android.server.wm.ActivityManagerTestBase.createFullscreenActivityScenarioRule;
+import static android.view.cts.util.ASurfaceControlTestUtils.getBufferId;
+import static android.view.cts.util.ASurfaceControlTestUtils.getQuadrantBuffer;
+import static android.view.cts.util.ASurfaceControlTestUtils.getSolidBuffer;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ColorSpace;
+import android.graphics.Rect;
+import android.graphics.Region;
+import android.hardware.DataSpace;
+import android.hardware.HardwareBuffer;
+import android.hardware.SyncFence;
+import android.test.suitebuilder.annotation.LargeTest;
+import android.util.Log;
+import android.view.SurfaceControl;
+import android.view.SurfaceHolder;
+import android.view.cts.surfacevalidator.ASurfaceControlTestActivity;
+import android.view.cts.surfacevalidator.ASurfaceControlTestActivity.MultiRectChecker;
+import android.view.cts.surfacevalidator.ASurfaceControlTestActivity.PixelChecker;
+import android.view.cts.surfacevalidator.PixelColor;
+
+import androidx.test.ext.junit.rules.ActivityScenarioRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.cts.hardware.SyncFenceUtil;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestName;
+import org.junit.runner.RunWith;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class SurfaceControlTest {
+    static {
+        System.loadLibrary("ctsview_jni");
+    }
+
+    private static final String TAG = SurfaceControlTest.class.getSimpleName();
+    private static final boolean DEBUG = false;
+
+    private static final int DEFAULT_LAYOUT_WIDTH = 100;
+    private static final int DEFAULT_LAYOUT_HEIGHT = 100;
+
+    private static final PixelColor RED = new PixelColor(PixelColor.RED);
+    private static final PixelColor BLUE = new PixelColor(PixelColor.BLUE);
+    private static final PixelColor MAGENTA = new PixelColor(PixelColor.MAGENTA);
+    private static final PixelColor GREEN = new PixelColor(PixelColor.GREEN);
+    private static final PixelColor YELLOW = new PixelColor(PixelColor.YELLOW);
+
+    @Rule
+    public ActivityScenarioRule<ASurfaceControlTestActivity> mActivityRule =
+            createFullscreenActivityScenarioRule(ASurfaceControlTestActivity.class);
+
+    @Rule
+    public TestName mName = new TestName();
+
+    private ASurfaceControlTestActivity mActivity;
+
+    @Before
+    public void setup() {
+        mActivityRule.getScenario().onActivity(activity -> mActivity = activity);
+    }
+
+    SurfaceControl getHostSurfaceControl() {
+        return mActivity.getSurfaceControl();
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // SurfaceHolder.Callbacks
+    ///////////////////////////////////////////////////////////////////////////
+
+    private abstract class BasicSurfaceHolderCallback implements SurfaceHolder.Callback {
+        private final Set<SurfaceControl> mSurfaceControls = new HashSet<>();
+        private final Set<HardwareBuffer> mBuffers = new HashSet<>();
+
+        @Override
+        public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+            Canvas canvas = holder.lockCanvas();
+            canvas.drawColor(Color.YELLOW);
+            holder.unlockCanvasAndPost(canvas);
+        }
+
+        @Override
+        public void surfaceDestroyed(SurfaceHolder holder) {
+            SurfaceControl.Transaction transaction = new SurfaceControl.Transaction();
+            for (SurfaceControl surfaceControl : mSurfaceControls) {
+                transaction.reparent(surfaceControl, null);
+            }
+            transaction.apply();
+            mSurfaceControls.clear();
+
+            for (HardwareBuffer buffer : mBuffers) {
+                buffer.close();
+            }
+            mBuffers.clear();
+        }
+
+        public SurfaceControl createFromWindow(SurfaceHolder surfaceHolder) {
+            assertNotNull("No parent?", getHostSurfaceControl());
+            SurfaceControl surfaceControl = new SurfaceControl.Builder()
+                    .setParent(getHostSurfaceControl())
+                    .setName("SurfaceControl_createFromWindowLayer")
+                    .setHidden(false)
+                    .build();
+            mSurfaceControls.add(surfaceControl);
+            return surfaceControl;
+        }
+
+        public SurfaceControl create(SurfaceControl parentSurfaceControl) {
+            assertNotNull("No parent?", parentSurfaceControl);
+            SurfaceControl surfaceControl = new SurfaceControl.Builder()
+                    .setParent(parentSurfaceControl)
+                    .setName("SurfaceControl_create")
+                    .setHidden(false)
+                    .build();
+            mSurfaceControls.add(surfaceControl);
+            return surfaceControl;
+        }
+
+        public void setSolidBuffer(SurfaceControl surfaceControl,
+                int width, int height, int color) {
+            HardwareBuffer buffer = getSolidBuffer(width, height, color);
+            assertNotNull("failed to make solid buffer", buffer);
+            new SurfaceControl.Transaction()
+                    .setBuffer(surfaceControl, buffer)
+                    .apply();
+            mBuffers.add(buffer);
+        }
+
+        public void setSolidBuffer(SurfaceControl surfaceControl,
+                int width, int height, int color, int dataSpace) {
+            HardwareBuffer buffer = getSolidBuffer(width, height, color);
+            assertNotNull("failed to make solid buffer", buffer);
+            new SurfaceControl.Transaction()
+                    .setBuffer(surfaceControl, buffer)
+                    .setDataSpace(surfaceControl, dataSpace)
+                    .apply();
+            mBuffers.add(buffer);
+        }
+
+        public void setSolidBuffer(SurfaceControl surfaceControl,
+                int width, int height, int color, SyncFence fence) {
+            HardwareBuffer buffer = getSolidBuffer(width, height, color);
+            assertNotNull("failed to make solid buffer", buffer);
+            new SurfaceControl.Transaction()
+                    .setBuffer(surfaceControl, buffer, fence)
+                    .apply();
+            mBuffers.add(buffer);
+        }
+
+        public void setQuadrantBuffer(SurfaceControl surfaceControl,
+                int width, int height, int colorTopLeft, int colorTopRight, int colorBottomRight,
+                int colorBottomLeft) {
+            HardwareBuffer buffer = getQuadrantBuffer(width, height, colorTopLeft, colorTopRight,
+                    colorBottomRight, colorBottomLeft);
+            assertNotNull("failed to make solid buffer", buffer);
+            new SurfaceControl.Transaction()
+                    .setBuffer(surfaceControl, buffer)
+                    .apply();
+            mBuffers.add(buffer);
+        }
+
+        public void setSourceToDefaultDest(SurfaceControl surfaceControl, Rect src) {
+            float scaleY = DEFAULT_LAYOUT_HEIGHT / (float) src.height();
+            float scaleX = DEFAULT_LAYOUT_WIDTH / (float) src.width();
+            new SurfaceControl.Transaction()
+                    .setCrop(surfaceControl, new Rect(0, 0,
+                            DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT))
+                    .setPosition(surfaceControl, -src.left * scaleX, -src.top * scaleY)
+                    .setScale(surfaceControl, scaleX, scaleY)
+                    .apply();
+        }
+    }
+
+    ///////////////////////////////////////////////////////////////////////////
+    // Tests
+    ///////////////////////////////////////////////////////////////////////////
+
+    private void verifyTest(SurfaceHolder.Callback callback, PixelChecker pixelChecker) {
+        mActivity.verifyTest(callback, pixelChecker, mName);
+    }
+
+    // INTRO: The following tests run a series of commands and verify the
+    // output based on the number of pixels with a certain color on the display.
+    //
+    // The interface being tested is a NDK api but the only way to record the display
+    // through public apis is in through the SDK. So the test logic and test verification
+    // is in Java but the hooks that call into the NDK api are jni code.
+    //
+    // The set up is done during the surfaceCreated callback. In most cases, the
+    // test uses the opportunity to create a child layer through createFromWindow and
+    // performs operations on the child layer.
+    //
+    // When there is no visible buffer for the layer(s) the color defaults to black.
+    // The test cases allow a +/- 10% error rate. This is based on the error
+    // rate allowed in the SurfaceViewSyncTests
+
+    @Test
+    public void testSurfaceControl_createFromWindow() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        createFromWindow(holder);
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceControl_create() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl parentSurfaceControl = createFromWindow(holder);
+                        SurfaceControl childSurfaceControl = create(parentSurfaceControl);
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceControl_acquire() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setBuffer() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setBuffer_parentAndChild() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl parentSurfaceControl = createFromWindow(holder);
+                        SurfaceControl childSurfaceControl = create(parentSurfaceControl);
+
+                        setSolidBuffer(parentSurfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.BLUE);
+                        setSolidBuffer(childSurfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED);
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setBuffer_childOnly() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl parentSurfaceControl = createFromWindow(holder);
+                        SurfaceControl childSurfaceControl = create(parentSurfaceControl);
+
+                        setSolidBuffer(childSurfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED);
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setVisibility_show() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        new SurfaceControl.Transaction()
+                                .setVisibility(surfaceControl, true)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setVisibility_hide() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        new SurfaceControl.Transaction()
+                                .setVisibility(surfaceControl, false)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setBufferOpaque_opaque() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.TRANSLUCENT_RED);
+                        new SurfaceControl.Transaction()
+                                .setOpaque(surfaceControl, true)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setBufferOpaque_translucent() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.TRANSLUCENT_RED);
+                        new SurfaceControl.Transaction()
+                                .setOpaque(surfaceControl, false)
+                                .apply();
+                    }
+                },
+                // setBufferOpaque is an optimization that can be used by SurfaceFlinger.
+                // It isn't required to affect SurfaceFlinger's behavior.
+                //
+                // Ideally we would check for a specific blending of red with a layer below
+                // it. Unfortunately we don't know what blending the layer will use and
+                // we don't know what variation the GPU/DPU/blitter might have. Although
+                // we don't know what shade of red might be present, we can at least check
+                // that the optimization doesn't cause the framework to drop the buffer entirely.
+                new PixelChecker(PixelColor.YELLOW) {
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount == 0;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDestinationRect() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDestinationRect_small() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        new SurfaceControl.Transaction()
+                                .setScale(surfaceControl, .4f, .4f)
+                                .setPosition(surfaceControl, 10, 10)
+                                .apply();
+                    }
+                },
+                new MultiRectChecker(new Rect(0, 0, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT)) {
+                    @Override
+                    public PixelColor getExpectedColor(int x, int y) {
+                        if (x >= 10 && x < 50 && y >= 10 && y < 50) {
+                            return RED;
+                        }
+                        return YELLOW;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDestinationRect_smallScaleFirst() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        new SurfaceControl.Transaction()
+                                .setScale(surfaceControl, .4f, .4f)
+                                .apply();
+                        new SurfaceControl.Transaction()
+                                .setPosition(surfaceControl, 10, 10)
+                                .apply();
+                    }
+                },
+                new MultiRectChecker(new Rect(0, 0, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT)) {
+                    @Override
+                    public PixelColor getExpectedColor(int x, int y) {
+                        if (x >= 10 && x < 50 && y >= 10 && y < 50) {
+                            return RED;
+                        }
+                        return YELLOW;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDestinationRect_smallPositionFirst() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        new SurfaceControl.Transaction()
+                                .setPosition(surfaceControl, 10, 10)
+                                .apply();
+                        new SurfaceControl.Transaction()
+                                .setScale(surfaceControl, .4f, .4f)
+                                .apply();
+                    }
+                },
+                new MultiRectChecker(new Rect(0, 0, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT)) {
+                    @Override
+                    public PixelColor getExpectedColor(int x, int y) {
+                        if (x >= 10 && x < 50 && y >= 10 && y < 50) {
+                            return RED;
+                        }
+                        return YELLOW;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDestinationRect_parentSmall() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl parentSurfaceControl = createFromWindow(holder);
+                        SurfaceControl childSurfaceControl = create(parentSurfaceControl);
+
+                        setSolidBuffer(childSurfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED);
+                        new SurfaceControl.Transaction()
+                                .setScale(parentSurfaceControl, .4f, .4f)
+                                .setPosition(parentSurfaceControl, 10, 10)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //1600
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 1440 && pixelCount < 1760;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDestinationRect_childSmall() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl parentSurfaceControl = createFromWindow(holder);
+                        SurfaceControl childSurfaceControl = create(parentSurfaceControl);
+
+                        setSolidBuffer(childSurfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED);
+                        new SurfaceControl.Transaction()
+                                .setScale(childSurfaceControl, .4f, .4f)
+                                .setPosition(childSurfaceControl, 10, 10)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //1600
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 1440 && pixelCount < 1760;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDestinationRect_extraLarge() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        new SurfaceControl.Transaction()
+                                .setScale(surfaceControl, 3f, 3f)
+                                .setPosition(surfaceControl, -100, -100)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDestinationRect_childExtraLarge() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl parentSurfaceControl = createFromWindow(holder);
+                        SurfaceControl childSurfaceControl = create(parentSurfaceControl);
+
+                        setSolidBuffer(childSurfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED);
+                        new SurfaceControl.Transaction()
+                                .setScale(childSurfaceControl, 3f, 3f)
+                                .setPosition(childSurfaceControl, -100, -100)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDestinationRect_negativeOffset() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        new SurfaceControl.Transaction()
+                                .setPosition(surfaceControl, -20, -30)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //5600 (w = 80, h = 70)
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 5000 && pixelCount < 6000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDestinationRect_outOfParentBounds() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        new SurfaceControl.Transaction()
+                                .setPosition(surfaceControl, 50, 50)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.RED) { //2500
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 2250 && pixelCount < 2750;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDestinationRect_twoLayers() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl1 = createFromWindow(holder);
+                        SurfaceControl surfaceControl2 = createFromWindow(holder);
+
+                        setSolidBuffer(surfaceControl1, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        setSolidBuffer(surfaceControl2, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.BLUE);
+                        new SurfaceControl.Transaction()
+                                .setPosition(surfaceControl1, 10, 10)
+                                .setScale(surfaceControl1, .2f, .3f)
+                                .apply();
+                        new SurfaceControl.Transaction()
+                                .setPosition(surfaceControl2, 70, 20)
+                                .setScale(surfaceControl2, .2f, .3f)
+                                .apply();
+                    }
+                },
+
+                new MultiRectChecker(new Rect(0, 0, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT)) {
+                    @Override
+                    public PixelColor getExpectedColor(int x, int y) {
+                        if (x >= 10 && x < 30 && y >= 10 && y < 40) {
+                            return RED;
+                        } else if (x >= 70 && x < 90 && y >= 20 && y < 50) {
+                            return BLUE;
+                        } else {
+                            return YELLOW;
+                        }
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setSourceRect() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setQuadrantBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED, PixelColor.BLUE,
+                                PixelColor.MAGENTA, PixelColor.GREEN);
+                    }
+                },
+
+                new MultiRectChecker(new Rect(0, 0, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT)) {
+                    @Override
+                    public PixelColor getExpectedColor(int x, int y) {
+                        int halfWidth = DEFAULT_LAYOUT_WIDTH / 2;
+                        int halfHeight = DEFAULT_LAYOUT_HEIGHT / 2;
+                        if (x < halfWidth && y < halfHeight) {
+                            return RED;
+                        } else if (x >= halfWidth && y < halfHeight) {
+                            return BLUE;
+                        } else if (x < halfWidth && y >= halfHeight) {
+                            return GREEN;
+                        } else {
+                            return MAGENTA;
+                        }
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setSourceRect_small() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setQuadrantBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED, PixelColor.BLUE,
+                                PixelColor.MAGENTA, PixelColor.GREEN);
+                        setSourceToDefaultDest(surfaceControl, new Rect(60, 10, 90, 90));
+                    }
+                },
+                new PixelChecker(PixelColor.MAGENTA) { //5000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 4500 && pixelCount < 5500;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setSourceRect_smallCentered() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setQuadrantBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED, PixelColor.BLUE,
+                                PixelColor.MAGENTA, PixelColor.GREEN);
+                        setSourceToDefaultDest(surfaceControl, new Rect(40, 40, 60, 60));
+                    }
+                },
+
+                new MultiRectChecker(new Rect(0, 0, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT)) {
+                    @Override
+                    public PixelColor getExpectedColor(int x, int y) {
+                        int halfWidth = DEFAULT_LAYOUT_WIDTH / 2;
+                        int halfHeight = DEFAULT_LAYOUT_HEIGHT / 2;
+                        if (x < halfWidth && y < halfHeight) {
+                            return RED;
+                        } else if (x >= halfWidth && y < halfHeight) {
+                            return BLUE;
+                        } else if (x < halfWidth && y >= halfHeight) {
+                            return GREEN;
+                        } else {
+                            return MAGENTA;
+                        }
+                    }
+
+                    @Override
+                    public boolean checkPixels(int matchingPixelCount, int width, int height) {
+                        // There will be sampling artifacts along the center line, ignore those
+                        return matchingPixelCount > 9000 && matchingPixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setCropRect_extraLarge() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setQuadrantBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED, PixelColor.BLUE,
+                                PixelColor.MAGENTA, PixelColor.GREEN);
+                        new SurfaceControl.Transaction()
+                                .setCrop(surfaceControl, new Rect(-50, -50, 150, 150))
+                                .apply();
+                    }
+                },
+
+                new MultiRectChecker(new Rect(0, 0, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT)) {
+                    @Override
+                    public PixelColor getExpectedColor(int x, int y) {
+                        int halfWidth = DEFAULT_LAYOUT_WIDTH / 2;
+                        int halfHeight = DEFAULT_LAYOUT_HEIGHT / 2;
+                        if (x < halfWidth && y < halfHeight) {
+                            return RED;
+                        } else if (x >= halfWidth && y < halfHeight) {
+                            return BLUE;
+                        } else if (x < halfWidth && y >= halfHeight) {
+                            return GREEN;
+                        } else {
+                            return MAGENTA;
+                        }
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setCropRect_badOffset() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setQuadrantBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED, PixelColor.BLUE,
+                                PixelColor.MAGENTA, PixelColor.GREEN);
+                        new SurfaceControl.Transaction()
+                                .setCrop(surfaceControl, new Rect(-50, -50, 50, 50))
+                                .apply();
+                    }
+                },
+                new MultiRectChecker(new Rect(0, 0, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT)) {
+                    @Override
+                    public PixelColor getExpectedColor(int x, int y) {
+                        int halfWidth = DEFAULT_LAYOUT_WIDTH / 2;
+                        int halfHeight = DEFAULT_LAYOUT_HEIGHT / 2;
+                        if (x < halfWidth && y < halfHeight) {
+                            return RED;
+                        } else {
+                            return YELLOW;
+                        }
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setCropRect_invalidCropWidth() {
+        final AtomicBoolean caughtException = new AtomicBoolean(false);
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.YELLOW);
+                        try {
+                            new SurfaceControl.Transaction()
+                                    .setCrop(surfaceControl, new Rect(0, 0, -1, 100))
+                                    .apply();
+                        } catch (IllegalArgumentException e) {
+                            caughtException.set(true);
+                        }
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) { //10000
+                    @Override
+                    public boolean checkPixels(int matchingPixelCount, int width, int height) {
+                        return matchingPixelCount > 9000 && matchingPixelCount < 11000;
+                    }
+                }
+        );
+        assertTrue(caughtException.get());
+    }
+
+    @Test
+    public void testSurfaceTransaction_setCropRect_invalidCropHeight() {
+        final AtomicBoolean caughtException = new AtomicBoolean(false);
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.YELLOW);
+                        try {
+                            new SurfaceControl.Transaction()
+                                    .setCrop(surfaceControl, new Rect(0, 0, 100, -1))
+                                    .apply();
+                        } catch (IllegalArgumentException e) {
+                            caughtException.set(true);
+                        }
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) { //10000
+                    @Override
+                    public boolean checkPixels(int matchingPixelCount, int width, int height) {
+                        return matchingPixelCount > 9000 && matchingPixelCount < 11000;
+                    }
+                }
+        );
+        assertTrue(caughtException.get());
+    }
+
+    @Test
+    public void testSurfaceTransaction_setTransform_flipH() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setQuadrantBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED, PixelColor.BLUE,
+                                PixelColor.MAGENTA, PixelColor.GREEN);
+                        new SurfaceControl.Transaction()
+                                .setBufferTransform(surfaceControl, 1)
+                                .apply();
+                    }
+                },
+                new MultiRectChecker(new Rect(0, 0, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT)) {
+                    @Override
+                    public PixelColor getExpectedColor(int x, int y) {
+                        int halfWidth = DEFAULT_LAYOUT_WIDTH / 2;
+                        int halfHeight = DEFAULT_LAYOUT_HEIGHT / 2;
+                        if (x < halfWidth && y < halfHeight) {
+                            return BLUE;
+                        } else if (x >= halfWidth && y < halfHeight) {
+                            return RED;
+                        } else if (x < halfWidth && y >= halfHeight) {
+                            return MAGENTA;
+                        } else {
+                            return GREEN;
+                        }
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setTransform_rotate180() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+
+                        setQuadrantBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.RED, PixelColor.BLUE,
+                                PixelColor.MAGENTA, PixelColor.GREEN);
+                        setSourceToDefaultDest(surfaceControl, new Rect(0, 50, 50, 100));
+                        new SurfaceControl.Transaction()
+                                .setBufferTransform(surfaceControl, 3)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.BLUE) { // 10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDamageRegion_all() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+
+                        HardwareBuffer blueBuffer = getSolidBuffer(DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.BLUE);
+                        Region damageRegion = new Region();
+                        damageRegion.op(0, 0, 25, 25, Region.Op.UNION);
+                        damageRegion.op(25, 25, 100, 100, Region.Op.UNION);
+                        new SurfaceControl.Transaction()
+                                .setBuffer(surfaceControl, blueBuffer)
+                                .setDamageRegion(surfaceControl, damageRegion)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.BLUE) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setZOrder_zero() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl1 = createFromWindow(holder);
+                        SurfaceControl surfaceControl2 = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl1, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        setSolidBuffer(surfaceControl2, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.MAGENTA);
+
+                        new SurfaceControl.Transaction()
+                                .setLayer(surfaceControl1, 1)
+                                .setLayer(surfaceControl2, 0)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) {
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount == 0;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setZOrder_positive() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl1 = createFromWindow(holder);
+                        SurfaceControl surfaceControl2 = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl1, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        setSolidBuffer(surfaceControl2, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.MAGENTA);
+
+                        new SurfaceControl.Transaction()
+                                .setLayer(surfaceControl1, 1)
+                                .setLayer(surfaceControl2, 5)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.RED) {
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount == 0;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setZOrder_negative() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl1 = createFromWindow(holder);
+                        SurfaceControl surfaceControl2 = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl1, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        setSolidBuffer(surfaceControl2, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.MAGENTA);
+
+                        new SurfaceControl.Transaction()
+                                .setLayer(surfaceControl1, 1)
+                                .setLayer(surfaceControl2, -15)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) {
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount == 0;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setZOrder_max() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl1 = createFromWindow(holder);
+                        SurfaceControl surfaceControl2 = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl1, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        setSolidBuffer(surfaceControl2, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.MAGENTA);
+
+                        new SurfaceControl.Transaction()
+                                .setLayer(surfaceControl1, 1)
+                                .setLayer(surfaceControl2, Integer.MAX_VALUE)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.RED) {
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount == 0;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setZOrder_min() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl1 = createFromWindow(holder);
+                        SurfaceControl surfaceControl2 = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl1, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.RED);
+                        setSolidBuffer(surfaceControl2, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.MAGENTA);
+
+                        new SurfaceControl.Transaction()
+                                .setLayer(surfaceControl1, 1)
+                                .setLayer(surfaceControl2, Integer.MIN_VALUE)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) {
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount == 0;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDataSpace_srgb() {
+        final int darkRed = 0xFF00006F;
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                darkRed, DataSpace.DATASPACE_SRGB);
+                    }
+                },
+                new PixelChecker(darkRed) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_setDataSpace_bt2020() {
+        final int darkRed = 0xFF00006F;
+        long converted = Color.convert(0x6F / 255.f, 0f, 0f, 1f,
+                ColorSpace.get(ColorSpace.Named.BT2020), ColorSpace.get(ColorSpace.Named.SRGB));
+        assertTrue(Color.isSrgb(converted));
+        int argb = Color.toArgb(converted);
+        // PixelChecker uses a ABGR for some reason (endian mismatch with native?), swizzle to match
+        int asABGR = 0xFF000000 | Color.red(argb);
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                darkRed, DataSpace.DATASPACE_BT2020);
+                    }
+                },
+                new PixelChecker(asABGR) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_nullSyncFence() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.BLUE, null);
+                    }
+                },
+                new PixelChecker(PixelColor.BLUE) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_invalidSyncFence() {
+        SyncFence fence = SyncFenceUtil.createUselessFence();
+        if (fence == null) {
+            // Extension not supported
+            Log.d(TAG, "Skipping test, EGL_ANDROID_native_fence_sync not available");
+            return;
+        }
+        fence.close();
+        assertFalse(fence.isValid());
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.BLUE, fence);
+                    }
+                },
+                new PixelChecker(PixelColor.BLUE) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceTransaction_withSyncFence() {
+        SyncFence fence = SyncFenceUtil.createUselessFence();
+        if (fence == null) {
+            // Extension not supported
+            Log.d(TAG, "Skipping test, EGL_ANDROID_native_fence_sync not available");
+            return;
+        }
+        assertTrue(fence.isValid());
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.BLUE, fence);
+                    }
+                },
+                new PixelChecker(PixelColor.BLUE) { //10000
+                    @Override
+                    public boolean checkPixels(int pixelCount, int width, int height) {
+                        return pixelCount > 9000 && pixelCount < 11000;
+                    }
+                });
+    }
+
+    @Test
+    public void testSurfaceControl_scaleToZero() {
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl parentSurfaceControl = createFromWindow(holder);
+                        SurfaceControl childSurfaceControl = create(parentSurfaceControl);
+
+                        setSolidBuffer(parentSurfaceControl,
+                                DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT, PixelColor.YELLOW);
+                        setSolidBuffer(childSurfaceControl,
+                                DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT, PixelColor.RED);
+                        new SurfaceControl.Transaction()
+                                .setScale(childSurfaceControl, 0, 0)
+                                .apply();
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) { //10000
+                    @Override
+                    public boolean checkPixels(int matchingPixelCount, int width, int height) {
+                        return matchingPixelCount > 9000 && matchingPixelCount < 11000;
+                    }
+                }
+        );
+    }
+
+    @Test
+    public void testSurfaceTransaction_negativeScaleX() {
+        final AtomicBoolean caughtException = new AtomicBoolean(false);
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.YELLOW);
+                        try {
+                            new SurfaceControl.Transaction()
+                                    .setScale(surfaceControl, -1, 1)
+                                    .apply();
+                        } catch (IllegalArgumentException e) {
+                            caughtException.set(true);
+                        }
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) { //10000
+                    @Override
+                    public boolean checkPixels(int matchingPixelCount, int width, int height) {
+                        return matchingPixelCount > 9000 && matchingPixelCount < 11000;
+                    }
+                }
+        );
+        assertTrue(caughtException.get());
+    }
+
+    @Test
+    public void testSurfaceTransaction_negativeScaleY() {
+        final AtomicBoolean caughtException = new AtomicBoolean(false);
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        setSolidBuffer(surfaceControl, DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT,
+                                PixelColor.YELLOW);
+                        try {
+                            new SurfaceControl.Transaction()
+                                    .setScale(surfaceControl, 1, -1)
+                                    .apply();
+                        } catch (IllegalArgumentException e) {
+                            caughtException.set(true);
+                        }
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) { //10000
+                    @Override
+                    public boolean checkPixels(int matchingPixelCount, int width, int height) {
+                        return matchingPixelCount > 9000 && matchingPixelCount < 11000;
+                    }
+                }
+        );
+        assertTrue(caughtException.get());
+    }
+
+    @Test
+    public void testReleaseBufferCallback() throws InterruptedException {
+        final int setBufferCount = 3;
+        CountDownLatch releaseCounter = new CountDownLatch(setBufferCount);
+        long[] bufferIds = new long[setBufferCount];
+        long[] receivedCallbacks = new long[setBufferCount];
+        SyncFence[] receivedFences = new SyncFence[setBufferCount];
+        long timeBeforeTest = System.nanoTime();
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        for (int i = 0; i < setBufferCount; i++) {
+                            HardwareBuffer buffer = getSolidBuffer(DEFAULT_LAYOUT_WIDTH,
+                                    DEFAULT_LAYOUT_HEIGHT, PixelColor.YELLOW);
+                            final int receiveIndex = i;
+                            final long bufferId = getBufferId(buffer);
+                            bufferIds[receiveIndex] = bufferId;
+                            new SurfaceControl.Transaction()
+                                    .setBuffer(surfaceControl, buffer, null,
+                                            (SyncFence fence) -> {
+                                                receivedCallbacks[receiveIndex] = bufferId;
+                                                receivedFences[receiveIndex] = fence;
+                                                releaseCounter.countDown();
+                                            })
+                                    .apply();
+                            buffer.close();
+                        }
+                        setSolidBuffer(surfaceControl,
+                                DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT, PixelColor.YELLOW);
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) {
+                    @Override
+                    public boolean checkPixels(int matchingPixelCount, int width, int height) {
+                        return matchingPixelCount > 9000 && matchingPixelCount < 11000;
+                    }
+                }
+        );
+
+        assertTrue(releaseCounter.await(5, TimeUnit.SECONDS));
+        for (int i = 0; i < setBufferCount; i++) {
+            assertEquals(bufferIds[i], receivedCallbacks[i]);
+            if (i > 0) {
+                assertNotEquals(bufferIds[i], bufferIds[i - 1]);
+            }
+            SyncFence fence = receivedFences[i];
+            assertNotNull(fence);
+            if (fence.isValid()) {
+                fence.awaitForever();
+                assertTrue(fence.getSignalTime() > timeBeforeTest);
+                assertTrue(fence.getSignalTime() < System.nanoTime());
+                fence.close();
+            }
+        }
+    }
+
+    @Test
+    public void testReleaseBufferCallbackSameBuffer() throws InterruptedException {
+        final int setBufferCount = 3;
+        CountDownLatch releaseCounter = new CountDownLatch(setBufferCount);
+        long[] bufferIds = new long[setBufferCount];
+        long[] receivedCallbacks = new long[setBufferCount];
+        SyncFence[] receivedFences = new SyncFence[setBufferCount];
+        long timeBeforeTest = System.nanoTime();
+        verifyTest(
+                new BasicSurfaceHolderCallback() {
+                    @Override
+                    public void surfaceCreated(SurfaceHolder holder) {
+                        SurfaceControl surfaceControl = createFromWindow(holder);
+                        HardwareBuffer buffer = getSolidBuffer(DEFAULT_LAYOUT_WIDTH,
+                                DEFAULT_LAYOUT_HEIGHT, PixelColor.YELLOW);
+                        for (int i = 0; i < setBufferCount; i++) {
+                            final int receiveIndex = i;
+                            final long bufferId = getBufferId(buffer);
+                            bufferIds[receiveIndex] = bufferId;
+                            new SurfaceControl.Transaction()
+                                    .setBuffer(surfaceControl, buffer, null,
+                                            (SyncFence fence) -> {
+                                                receivedCallbacks[receiveIndex] = bufferId;
+                                                receivedFences[receiveIndex] = fence;
+                                                releaseCounter.countDown();
+                                            })
+                                    .apply();
+                        }
+                        buffer.close();
+                        setSolidBuffer(surfaceControl,
+                                DEFAULT_LAYOUT_WIDTH, DEFAULT_LAYOUT_HEIGHT, PixelColor.YELLOW);
+                    }
+                },
+                new PixelChecker(PixelColor.YELLOW) {
+                    @Override
+                    public boolean checkPixels(int matchingPixelCount, int width, int height) {
+                        return matchingPixelCount > 9000 && matchingPixelCount < 11000;
+                    }
+                }
+        );
+
+        assertTrue(releaseCounter.await(5, TimeUnit.SECONDS));
+        for (int i = 0; i < setBufferCount; i++) {
+            assertEquals(bufferIds[i], receivedCallbacks[i]);
+            if (i > 0) {
+                assertEquals(bufferIds[i], bufferIds[i - 1]);
+            }
+            SyncFence fence = receivedFences[i];
+            assertNotNull(fence);
+            if (fence.isValid()) {
+                fence.awaitForever();
+                assertTrue(fence.getSignalTime() > timeBeforeTest);
+                assertTrue(fence.getSignalTime() < System.nanoTime());
+                fence.close();
+            }
+        }
+    }
+}
diff --git a/tests/tests/view/src/android/view/cts/SurfaceViewSyncTest.java b/tests/tests/view/src/android/view/cts/SurfaceViewSyncTest.java
index 645d9fa..7cd613c 100644
--- a/tests/tests/view/src/android/view/cts/SurfaceViewSyncTest.java
+++ b/tests/tests/view/src/android/view/cts/SurfaceViewSyncTest.java
@@ -177,6 +177,38 @@
         return makeInfinite(ObjectAnimator.ofPropertyValuesHolder(view, pvhX, pvhY));
     };
 
+    private static AnimationFactory sFixedSizeWithViewSizeAnimationFactory = view -> {
+        ValueAnimator anim = ValueAnimator.ofInt(0, 100);
+        anim.addUpdateListener(valueAnimator -> {
+            ViewGroup.LayoutParams layoutParams = view.getLayoutParams();
+            layoutParams.width++;
+            if (layoutParams.height++ > 1500) {
+                layoutParams.height = 320;
+                layoutParams.width = 240;
+            }
+            view.setLayoutParams(layoutParams);
+
+            if ((Integer) valueAnimator.getAnimatedValue() % 3 == 0) {
+                ((SurfaceView) view).getHolder().setFixedSize(320, 240);
+            } else if ((Integer) valueAnimator.getAnimatedValue() % 7 == 0) {
+                ((SurfaceView) view).getHolder().setFixedSize(1280, 960);
+            }
+        });
+        return makeInfinite(anim);
+    };
+
+    private static AnimationFactory sFixedSizeAnimationFactory = view -> {
+        ValueAnimator anim = ValueAnimator.ofInt(0, 100);
+        anim.addUpdateListener(valueAnimator -> {
+            if ((Integer) valueAnimator.getAnimatedValue() % 2 == 0) {
+                ((SurfaceView) view).getHolder().setFixedSize(320, 240);
+            } else {
+                ((SurfaceView) view).getHolder().setFixedSize(1280, 960);
+            }
+        });
+        return makeInfinite(anim);
+    };
+
     private AnimationFactory sTranslateAnimationFactory = view -> {
         PropertyValuesHolder pvhX = PropertyValuesHolder.ofFloat(View.TRANSLATION_X, 10f, 30f);
         PropertyValuesHolder pvhY = PropertyValuesHolder.ofFloat(View.TRANSLATION_Y, 10f, 30f);
@@ -263,6 +295,43 @@
                 }), mName);
     }
 
+
+    /**
+     * Change requested surface size and SurfaceView size and verify buffers always fill to
+     * SurfaceView size. b/190449942
+     */
+    @Test
+    public void testSurfaceViewFixedSizeWithViewSizeChanges() throws Throwable {
+        mActivity.verifyTest(new AnimationTestCase(
+                sVideoViewFactory,
+                new FrameLayout.LayoutParams(640, 480, Gravity.LEFT | Gravity.TOP),
+                sFixedSizeWithViewSizeAnimationFactory,
+                new PixelChecker() {
+                    @Override
+                    public boolean checkPixels(int blackishPixelCount, int width, int height) {
+                        return blackishPixelCount == 0;
+                    }
+                }), mName);
+    }
+
+    /**
+     * Change requested surface size and verify buffers always fill to SurfaceView size.
+     * b/194458377
+     */
+    @Test
+    public void testSurfaceViewFixedSizeChanges() throws Throwable {
+        mActivity.verifyTest(new AnimationTestCase(
+                sVideoViewFactory,
+                new FrameLayout.LayoutParams(640, 480, Gravity.LEFT | Gravity.TOP),
+                sFixedSizeAnimationFactory,
+                new PixelChecker() {
+                    @Override
+                    public boolean checkPixels(int blackishPixelCount, int width, int height) {
+                        return blackishPixelCount == 0;
+                    }
+                }), mName);
+    }
+
     @Test
     public void testVideoSurfaceViewTranslate() throws Throwable {
         mActivity.verifyTest(new AnimationTestCase(
diff --git a/tests/tests/view/src/android/view/cts/TextureViewTest.java b/tests/tests/view/src/android/view/cts/TextureViewTest.java
index 6d949c6..3140c2a 100644
--- a/tests/tests/view/src/android/view/cts/TextureViewTest.java
+++ b/tests/tests/view/src/android/view/cts/TextureViewTest.java
@@ -24,29 +24,46 @@
 import static android.opengl.GLES20.glScissor;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import android.app.Instrumentation;
 import android.graphics.Bitmap;
+import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.ColorSpace;
 import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.PixelFormat;
 import android.graphics.Point;
 import android.graphics.Rect;
 import android.graphics.RectF;
+import android.graphics.SurfaceTexture;
+import android.hardware.DataSpace;
+import android.media.Image;
+import android.media.ImageWriter;
 import android.util.Half;
 import android.view.PixelCopy;
+import android.view.Surface;
+import android.view.SurfaceHolder;
+import android.view.SurfaceView;
 import android.view.TextureView;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
+import android.view.cts.util.BitmapDumper;
 
+import androidx.test.InstrumentationRegistry;
 import androidx.test.filters.MediumTest;
 import androidx.test.rule.ActivityTestRule;
-import androidx.test.runner.AndroidJUnit4;
 
 import com.android.compatibility.common.util.SynchronousPixelCopy;
 import com.android.compatibility.common.util.WidgetTestUtils;
 
+import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
@@ -54,10 +71,15 @@
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
+import junitparams.JUnitParamsRunner;
+import junitparams.Parameters;
+
 @MediumTest
-@RunWith(AndroidJUnit4.class)
+@RunWith(JUnitParamsRunner.class)
 public class TextureViewTest {
 
     static final int EGL_GL_COLORSPACE_SRGB_KHR = 0x3089;
@@ -68,11 +90,23 @@
     static final int EGL_GL_COLORSPACE_SCRGB_EXT = 0x3351;
     static final int EGL_GL_COLORSPACE_SCRGB_LINEAR_EXT = 0x3350;
 
+    private Instrumentation mInstrumentation;
+
+    @Before
+    public void setup() {
+        mInstrumentation = InstrumentationRegistry.getInstrumentation();
+        assertNotNull(mInstrumentation);
+    }
+
     @Rule
     public ActivityTestRule<TextureViewCtsActivity> mActivityRule =
             new ActivityTestRule<>(TextureViewCtsActivity.class, false, false);
 
     @Rule
+    public ActivityTestRule<SDRTestActivity> mSDRActivityRule =
+            new ActivityTestRule<>(SDRTestActivity.class, false, false);
+
+    @Rule
     public TestName mTestName = new TestName();
 
     @Test
@@ -225,6 +259,203 @@
                 screenshot.getPixel(texturePos.right - 10, texturePos.bottom - 10));
     }
 
+    private static Object[] testDataSpaces() {
+        return new Integer[] {
+            DataSpace.DATASPACE_SCRGB_LINEAR,
+            DataSpace.DATASPACE_SRGB,
+            DataSpace.DATASPACE_SCRGB,
+            DataSpace.DATASPACE_DISPLAY_P3,
+            DataSpace.DATASPACE_ADOBE_RGB,
+            DataSpace.DATASPACE_BT2020,
+            DataSpace.DATASPACE_BT709,
+            DataSpace.DATASPACE_DCI_P3,
+            DataSpace.DATASPACE_SRGB_LINEAR
+        };
+    }
+
+    @Test
+    @Parameters(method = "testDataSpaces")
+    public void testSDRFromSurfaceViewAndTextureView(int dataSpace) throws Throwable {
+        final int tiffanyBlue = 0xFF0ABAB5;
+        Color color = Color.valueOf(tiffanyBlue).convert(ColorSpace.getFromDataSpace(dataSpace));
+        long converted = color.pack();
+        assertNotEquals(Color.valueOf(tiffanyBlue).toArgb(), color);
+
+        final SDRTestActivity activity =
+                mSDRActivityRule.launchActivity(/*startIntent*/ null);
+
+        TextureView textureView = activity.getTextureView();
+        int width = textureView.getWidth();
+        int height = textureView.getHeight();
+
+        // through textureView, paint left part
+        SurfaceTexture surfaceTexture = textureView.getSurfaceTexture();
+        Surface surface = new Surface(surfaceTexture);
+        assertTrue(surface.isValid());
+
+        ImageWriter writer = new ImageWriter
+                .Builder(surface)
+                .setHardwareBufferFormat(PixelFormat.RGBA_8888)
+                .setDataSpace(dataSpace)
+                .build();
+        Image image = writer.dequeueInputImage();
+        assertEquals(dataSpace, image.getDataSpace());
+        Image.Plane plane = image.getPlanes()[0];
+        Bitmap bitmap = Bitmap.createBitmap(plane.getRowStride() / 4, image.getHeight(),
+                Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        Paint paint = new Paint();
+        paint.setAntiAlias(false);
+        paint.setColor(converted);
+        canvas.drawRect(width / 2, 0f, width, height, paint);
+        bitmap.copyPixelsToBuffer(plane.getBuffer());
+        writer.queueInputImage(image);
+
+        final Rect textureViewPos = new Rect();
+        WidgetTestUtils.runOnMainAndDrawSync(mSDRActivityRule,
+                activity.findViewById(android.R.id.content), () -> {
+                int[] outLocation = new int[2];
+                textureView.getLocationInSurface(outLocation);
+                textureViewPos.left = outLocation[0] + width / 2;
+                textureViewPos.top = outLocation[1];
+                textureViewPos.right = textureViewPos.left + width / 2;
+                textureViewPos.bottom = textureViewPos.top + height;
+            });
+
+        Bitmap textureViewScreenshot = Bitmap.createBitmap(
+                textureViewPos.width(), textureViewPos.height(), Bitmap.Config.ARGB_8888);
+        int textureViewResult =
+                new SynchronousPixelCopy().request(surface, textureViewPos, textureViewScreenshot);
+        assertEquals("Copy request failed", PixelCopy.SUCCESS, textureViewResult);
+
+        // through surfaceView, paint right part
+        SurfaceView surfaceView = activity.getSurfaceView();
+        surfaceView.getHolder().addCallback(new SurfaceHolder.Callback() {
+            @Override
+            public void surfaceCreated(SurfaceHolder holder) {
+                ImageWriter writer = new ImageWriter
+                        .Builder(holder.getSurface())
+                        .setHardwareBufferFormat(PixelFormat.RGBA_8888)
+                        .setDataSpace(dataSpace)
+                        .build();
+                Image image = writer.dequeueInputImage();
+                assertEquals(dataSpace, image.getDataSpace());
+                Image.Plane plane = image.getPlanes()[0];
+                Bitmap bitmap = Bitmap.createBitmap(plane.getRowStride() / 4, image.getHeight(),
+                        Bitmap.Config.ARGB_8888);
+                Canvas canvas = new Canvas(bitmap);
+                Paint paint = new Paint();
+                paint.setAntiAlias(false);
+                paint.setColor(converted);
+                canvas.drawRect(0f, 0f, width / 2, height, paint);
+                bitmap.copyPixelsToBuffer(plane.getBuffer());
+                writer.queueInputImage(image);
+            }
+
+            @Override
+            public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {}
+
+            @Override
+            public void surfaceDestroyed(SurfaceHolder holder) {}
+        });
+
+        // wait here to ensure SF has latched the buffer that has been queued in
+        // this is the easiest way to solve copy failure but sacrifice the performance.
+        Thread.sleep(100);
+        final Rect surfaceViewPos = new Rect();
+        WidgetTestUtils.runOnMainAndDrawSync(mSDRActivityRule, surfaceView, () -> {
+            ((ViewGroup) surfaceView.getParent()).removeView(surfaceView);
+            activity.setContentView(surfaceView);
+            int[] outLocation = new int[2];
+            surfaceView.getLocationInSurface(outLocation);
+            surfaceViewPos.left = outLocation[0];
+            surfaceViewPos.top = outLocation[1];
+            surfaceViewPos.right = surfaceViewPos.left + width / 2;
+            surfaceViewPos.bottom = surfaceViewPos.top + height;
+        });
+
+        Bitmap surfaceViewScreenshot = mInstrumentation
+                .getUiAutomation()
+                .takeScreenshot(activity.getWindow());
+        // resize screenshot to left part
+        surfaceViewScreenshot.setWidth(surfaceViewPos.width());
+        surfaceViewScreenshot.setHeight(surfaceViewPos.height());
+        assertEquals(ColorSpace.get(ColorSpace.Named.SRGB),
+                surfaceViewScreenshot.getColorSpace());
+
+        int surfaceViewResult = new SynchronousPixelCopy()
+                .request(surfaceView, surfaceViewPos, surfaceViewScreenshot);
+        assertEquals("Copy request failed", PixelCopy.SUCCESS, surfaceViewResult);
+
+        assertTrue(textureViewScreenshot.sameAs(surfaceViewScreenshot));
+    }
+
+    @Test
+    public void testCropRect() throws Throwable {
+        final TextureViewCtsActivity activity = mActivityRule.launchActivity(/*startIntent*/ null);
+        activity.waitForSurface();
+        mActivityRule.runOnUiThread(activity::removeCover);
+        TextureView textureView = activity.getTextureView();
+        int textureWidth = textureView.getWidth();
+        int textureHeight = textureView.getHeight();
+        SurfaceTexture surfaceTexture = textureView.getSurfaceTexture();
+        Surface surface = new Surface(surfaceTexture);
+        assertTrue(surface.isValid());
+        ImageWriter writer = ImageWriter.newInstance(surface, /*maxImages*/ 1);
+        Image image = writer.dequeueInputImage();
+        Image.Plane plane = image.getPlanes()[0];
+        Bitmap bitmap = Bitmap.createBitmap(plane.getRowStride() / 4, image.getHeight(),
+                Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        Paint paint = new Paint();
+        paint.setAntiAlias(false);
+        paint.setColor(Color.YELLOW);
+        canvas.drawRect(0f, 0f, textureWidth, textureHeight, paint);
+        paint.setColor(Color.BLACK);
+        canvas.drawRect(2f, 2f, textureWidth - 2f, textureHeight - 2f, paint);
+
+        image.setCropRect(new Rect(1, 1, textureWidth - 1, textureHeight - 1));
+        bitmap.copyPixelsToBuffer(plane.getBuffer());
+        writer.queueInputImage(image);
+        waitForDraw(textureView);
+
+        final Rect viewPos = new Rect();
+        mActivityRule.runOnUiThread(() -> {
+            int[] outLocation = new int[2];
+            textureView.getLocationInSurface(outLocation);
+            viewPos.left = outLocation[0];
+            viewPos.top = outLocation[1];
+            viewPos.right = viewPos.left + textureView.getWidth();
+            viewPos.bottom = viewPos.top + textureView.getHeight();
+        });
+        SynchronousPixelCopy pixelCopy = new SynchronousPixelCopy();
+        // Capture the portion of the screen that contains the texture view only.
+        Window window = activity.getWindow();
+        bitmap = Bitmap.createBitmap(viewPos.width(), viewPos.height(),
+                Bitmap.Config.ARGB_8888);
+        int result = pixelCopy.request(window, viewPos, bitmap);
+        assertEquals("Copy request failed", PixelCopy.SUCCESS, result);
+        assertBitmapEdgeColor(bitmap, Color.YELLOW);
+    }
+
+    // TODO(b/220361081) replace with runOnMainAndDrawSync once we have the
+    // runOnMainAndDrawSync updated to use the registerFrameCommitCallback
+    private void waitForDraw(final View view) throws Throwable {
+        final CountDownLatch latch = new CountDownLatch(1);
+        mActivityRule.runOnUiThread(() -> {
+            view.getViewTreeObserver().registerFrameCommitCallback(latch::countDown);
+            view.invalidate();
+        });
+        assertTrue(latch.await(1, TimeUnit.SECONDS));
+    }
+
+    private boolean pixelsAreSame(int ideal, int given, int threshold) {
+        int error = Math.abs(Color.red(ideal) - Color.red(given));
+        error += Math.abs(Color.green(ideal) - Color.green(given));
+        error += Math.abs(Color.blue(ideal) - Color.blue(given));
+        return (error < threshold);
+    }
+
     @Test
     public void testGetBitmap_8888_P3() throws Throwable {
         testGetBitmap(EGL_GL_COLORSPACE_DISPLAY_P3_EXT, ColorSpace.get(ColorSpace.Named.DISPLAY_P3),
@@ -593,4 +824,45 @@
         PixelCopyTest.assertBitmapQuadColor(mTestName.getMethodName(), "TextureViewTest",
                 bitmap, topLeft, topRight, bottomLeft, bottomRight);
     }
+
+    private void assertBitmapEdgeColor(Bitmap bitmap, int edgeColor) {
+        // Just quickly sample a few pixels on the edge and assert
+        // they are edge color, then assert that just inside the edge is a different color
+        assertBitmapColor("Top edge", bitmap, edgeColor, bitmap.getWidth() / 2, 0);
+        assertBitmapNotColor("Top edge", bitmap, edgeColor, bitmap.getWidth() / 2, 2);
+
+        assertBitmapColor("Left edge", bitmap, edgeColor, 0, bitmap.getHeight() / 2);
+        assertBitmapNotColor("Left edge", bitmap, edgeColor, 2, bitmap.getHeight() / 2);
+
+        assertBitmapColor("Bottom edge", bitmap, edgeColor,
+                bitmap.getWidth() / 2, bitmap.getHeight() - 1);
+        assertBitmapNotColor("Bottom edge", bitmap, edgeColor,
+                bitmap.getWidth() / 2, bitmap.getHeight() - 3);
+
+        assertBitmapColor("Right edge", bitmap, edgeColor,
+                bitmap.getWidth() - 1, bitmap.getHeight() / 2);
+        assertBitmapNotColor("Right edge", bitmap, edgeColor,
+                bitmap.getWidth() - 3, bitmap.getHeight() / 2);
+    }
+
+    private void failBitmap(Bitmap bitmap, String message) {
+        BitmapDumper.dumpBitmap(bitmap, mTestName.getMethodName(), "TextureViewTest");
+        Assert.fail(message);
+    }
+
+    private void assertBitmapColor(String debug, Bitmap bitmap, int color, int x, int y) {
+        int pixel = bitmap.getPixel(x, y);
+        if (!pixelsAreSame(color, pixel, 10)) {
+            failBitmap(bitmap, debug + "; expected=" + Integer.toHexString(color) + ", actual="
+                    + Integer.toHexString(pixel));
+        }
+    }
+
+    private void assertBitmapNotColor(String debug, Bitmap bitmap, int color, int x, int y) {
+        int pixel = bitmap.getPixel(x, y);
+        if (pixelsAreSame(color, pixel, 10)) {
+            failBitmap(bitmap, debug + "; actual=" + Integer.toHexString(pixel)
+                    + " shouldn't have matched " + Integer.toHexString(color));
+        }
+    }
 }
diff --git a/tests/tests/view/src/android/view/cts/VerifyInputEventTest.java b/tests/tests/view/src/android/view/cts/VerifyInputEventTest.java
index c74bd43..c4bfb11 100644
--- a/tests/tests/view/src/android/view/cts/VerifyInputEventTest.java
+++ b/tests/tests/view/src/android/view/cts/VerifyInputEventTest.java
@@ -34,6 +34,7 @@
 import android.graphics.Point;
 import android.hardware.input.InputManager;
 import android.os.SystemClock;
+import android.view.InputDevice;
 import android.view.InputEvent;
 import android.view.KeyCharacterMap;
 import android.view.KeyEvent;
@@ -65,7 +66,7 @@
 @RunWith(AndroidJUnit4.class)
 public class VerifyInputEventTest {
     private static final int NANOS_PER_MILLISECOND = 1000000;
-    private static final float STRICT_TOLERANCE = 0;
+    private static final float EPSILON = 0.001f;
     private static final int INJECTED_EVENT_DEVICE_ID = KeyCharacterMap.VIRTUAL_KEYBOARD;
 
     private InputManager mInputManager;
@@ -158,6 +159,7 @@
         final long downTime = SystemClock.uptimeMillis();
         MotionEvent downEvent = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN,
                 point.x, point.y, 0 /*metaState*/);
+        downEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN);
         mAutomation.injectInputEvent(downEvent, true);
         MotionEvent received = waitForMotion();
         VerifiedInputEvent verified = mInputManager.verifyInputEvent(received);
@@ -168,6 +170,7 @@
         // Send UP event for consistency
         MotionEvent upEvent = MotionEvent.obtain(downTime, SystemClock.uptimeMillis(),
                 MotionEvent.ACTION_UP, point.x, point.y, 0 /*metaState*/);
+        upEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN);
         mAutomation.injectInputEvent(upEvent, true);
         waitForMotion();
     }
@@ -184,6 +187,7 @@
         final long downTime = SystemClock.uptimeMillis();
         MotionEvent downEvent = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN,
                 point.x, point.y, 0 /*metaState*/);
+        downEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN);
         mAutomation.injectInputEvent(downEvent, true);
         waitForMotion(); // we will not be using the received event
         VerifiedInputEvent verified = mInputManager.verifyInputEvent(downEvent);
@@ -192,6 +196,7 @@
         // Send UP event for consistency
         MotionEvent upEvent = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_UP,
                 point.x, point.y, 0 /*metaState*/);
+        upEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN);
         mAutomation.injectInputEvent(upEvent, true);
         waitForMotion();
     }
@@ -207,6 +212,7 @@
         final long downTime = SystemClock.uptimeMillis();
         MotionEvent downEvent = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN,
                 point.x, point.y, 0 /*metaState*/);
+        downEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN);
         mAutomation.injectInputEvent(downEvent, true);
         MotionEvent received = waitForMotion();
         // use the received event, by modify its action
@@ -217,6 +223,7 @@
         // Send UP event for consistency
         MotionEvent upEvent = MotionEvent.obtain(downTime, SystemClock.uptimeMillis(),
                 MotionEvent.ACTION_UP, point.x, point.y, 0 /*metaState*/);
+        upEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN);
         mAutomation.injectInputEvent(upEvent, true);
         waitForMotion();
     }
@@ -263,6 +270,7 @@
         MotionEvent downEvent = MotionEvent.obtain(downTime, downTime, MotionEvent.ACTION_DOWN,
                 point.x, point.y, 1 /*pressure*/, 1 /*size*/, 0 /*metaState*/,
                 0 /*xPrecision*/, 0 /*yPrecision*/, 1 /*deviceId*/, 0 /*edgeFlags*/);
+        downEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN);
         mAutomation.injectInputEvent(downEvent, true);
         MotionEvent received = waitForMotion();
         assertEquals(INJECTED_EVENT_DEVICE_ID, received.getDeviceId());
@@ -276,6 +284,7 @@
                 MotionEvent.ACTION_UP, point.x, point.y, 0 /*pressure*/, 1 /*size*/,
                 0 /*metaState*/, 0 /*xPrecision*/, 0 /*yPrecision*/,
                 1 /*deviceId*/, 0 /*edgeFlags*/);
+        upEvent.setSource(InputDevice.SOURCE_TOUCHSCREEN);
         mAutomation.injectInputEvent(upEvent, true);
         waitForMotion();
     }
@@ -327,8 +336,8 @@
         assertTrue(verified instanceof VerifiedMotionEvent);
         VerifiedMotionEvent verifiedMotion = (VerifiedMotionEvent) verified;
 
-        assertEquals(motionEvent.getRawX(), verifiedMotion.getRawX(), STRICT_TOLERANCE);
-        assertEquals(motionEvent.getRawY(), verifiedMotion.getRawY(), STRICT_TOLERANCE);
+        assertEquals(motionEvent.getRawX(), verifiedMotion.getRawX(), EPSILON);
+        assertEquals(motionEvent.getRawY(), verifiedMotion.getRawY(), EPSILON);
         assertEquals(motionEvent.getActionMasked(), verifiedMotion.getActionMasked());
         assertEquals(motionEvent.getDownTime() * NANOS_PER_MILLISECOND,
                 verifiedMotion.getDownTimeNanos());
diff --git a/tests/tests/view/src/android/view/cts/input/InputDeviceEnabledTest.java b/tests/tests/view/src/android/view/cts/input/InputDeviceEnabledTest.java
index fb1cb13..32693b4 100644
--- a/tests/tests/view/src/android/view/cts/input/InputDeviceEnabledTest.java
+++ b/tests/tests/view/src/android/view/cts/input/InputDeviceEnabledTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.view.cts;
+package android.view.cts.input;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
diff --git a/tests/tests/view/src/android/view/cts/input/InputDeviceKeyLayoutMapTest.java b/tests/tests/view/src/android/view/cts/input/InputDeviceKeyLayoutMapTest.java
index ff99963..ca53a1551 100644
--- a/tests/tests/view/src/android/view/cts/input/InputDeviceKeyLayoutMapTest.java
+++ b/tests/tests/view/src/android/view/cts/input/InputDeviceKeyLayoutMapTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.view.cts;
+package android.view.cts.input;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -23,6 +23,7 @@
 import android.app.Instrumentation;
 import android.view.InputDevice;
 import android.view.KeyEvent;
+import android.view.cts.R;
 
 import androidx.annotation.NonNull;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -30,7 +31,7 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
-import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 import com.android.cts.input.InputJsonParser;
 import com.android.cts.input.UinputDevice;
 
@@ -95,7 +96,7 @@
     @Before
     public void setup() {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        PollingCheck.waitFor(mActivityRule.getActivity()::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivityRule.getActivity());
         mParser = new InputJsonParser(mInstrumentation.getTargetContext());
         mKeyLayout = nativeLoadKeyLayout(mParser.readRegisterCommand(R.raw.Generic));
         mUinputDevice = new UinputDevice(mInstrumentation, DEVICE_ID, GOOGLE_VENDOR_ID,
diff --git a/tests/tests/view/src/android/view/cts/input/InputDeviceKeyLayoutMapTestActivity.java b/tests/tests/view/src/android/view/cts/input/InputDeviceKeyLayoutMapTestActivity.java
index 5c77984..61efe0f 100644
--- a/tests/tests/view/src/android/view/cts/input/InputDeviceKeyLayoutMapTestActivity.java
+++ b/tests/tests/view/src/android/view/cts/input/InputDeviceKeyLayoutMapTestActivity.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.view.cts;
+package android.view.cts.input;
 
 import static org.junit.Assert.fail;
 
diff --git a/tests/tests/view/src/android/view/cts/input/InputDeviceMultiDeviceKeyEventTest.java b/tests/tests/view/src/android/view/cts/input/InputDeviceMultiDeviceKeyEventTest.java
index 31d5e6e..eb53bae 100644
--- a/tests/tests/view/src/android/view/cts/input/InputDeviceMultiDeviceKeyEventTest.java
+++ b/tests/tests/view/src/android/view/cts/input/InputDeviceMultiDeviceKeyEventTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.view.cts;
+package android.view.cts.input;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
@@ -32,7 +32,7 @@
 import androidx.test.platform.app.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
 
-import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 import com.android.cts.input.UinputDevice;
 
 import org.json.JSONArray;
@@ -91,7 +91,7 @@
     @Before
     public void setup() {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        PollingCheck.waitFor(mActivityRule.getActivity()::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivityRule.getActivity());
         for (int i = 0; i < NUM_DEVICES; i++) {
             final int jsonDeviceId = i + 1;
             mUinputDevices[i] = new UinputDevice(mInstrumentation, jsonDeviceId,
diff --git a/tests/tests/view/src/android/view/cts/input/InputDeviceSensorManagerTest.java b/tests/tests/view/src/android/view/cts/input/InputDeviceSensorManagerTest.java
index a088a31..1d34150 100644
--- a/tests/tests/view/src/android/view/cts/input/InputDeviceSensorManagerTest.java
+++ b/tests/tests/view/src/android/view/cts/input/InputDeviceSensorManagerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.view.cts;
+package android.view.cts.input;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -36,13 +36,13 @@
 import android.os.SystemClock;
 import android.util.Log;
 import android.view.InputDevice;
+import android.view.cts.R;
 
 import androidx.annotation.NonNull;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 import androidx.test.platform.app.InstrumentationRegistry;
 
-import com.android.cts.input.InputJsonParser;
 import com.android.cts.input.UinputDevice;
 
 import org.junit.After;
@@ -102,12 +102,10 @@
 
     private InputManager mInputManager;
     private UinputDevice mUinputDevice;
-    private InputJsonParser mParser;
     private Instrumentation mInstrumentation;
     private SensorManager mSensorManager;
     private HandlerThread mSensorThread = null;
     private Handler mSensorHandler = null;
-    private int mDeviceId;
     private final Object mLock = new Object();
 
     private class Callback extends SensorManager.DynamicSensorCallback {
@@ -373,14 +371,10 @@
         mInputManager = mInstrumentation.getTargetContext().getSystemService(InputManager.class);
         assertNotNull(mInputManager);
 
-        mParser = new InputJsonParser(mInstrumentation.getTargetContext());
-        mDeviceId = mParser.readDeviceId(resourceId);
-        String registerCommand = mParser.readRegisterCommand(resourceId);
-        final int vendorId = mParser.readVendorId(resourceId);
-        final int productId = mParser.readProductId(resourceId);
-        mUinputDevice = new UinputDevice(mInstrumentation, mDeviceId,
-            vendorId, productId, InputDevice.SOURCE_KEYBOARD, registerCommand);
-        mSensorManager = getSensorManager(vendorId, productId);
+        mUinputDevice = UinputDevice.create(mInstrumentation, R.raw.gamepad_sensors_register,
+                InputDevice.SOURCE_KEYBOARD);
+        mSensorManager = getSensorManager(mUinputDevice.getVendorId(),
+                mUinputDevice.getProductId());
         assertNotNull(mSensorManager);
 
         mSensorThread = new HandlerThread("SensorThread");
diff --git a/tests/tests/view/src/android/view/cts/input/InputDeviceVibratorManagerTest.java b/tests/tests/view/src/android/view/cts/input/InputDeviceVibratorManagerTest.java
index fca9854..61445ee 100644
--- a/tests/tests/view/src/android/view/cts/input/InputDeviceVibratorManagerTest.java
+++ b/tests/tests/view/src/android/view/cts/input/InputDeviceVibratorManagerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.view.cts;
+package android.view.cts.input;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -29,6 +29,7 @@
 import android.os.VibratorManager;
 import android.util.Log;
 import android.view.InputDevice;
+import android.view.cts.R;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
@@ -61,6 +62,7 @@
     private InputJsonParser mParser;
     private Instrumentation mInstrumentation;
     private VibratorManager mVibratorManager;
+    /** The device id inside the resource file (register command) */
     private int mDeviceId;
 
     /**
@@ -85,18 +87,16 @@
 
     @Before
     public void setup() {
-        final int resourceId = R.raw.google_gamepad_register;
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mInputManager = mInstrumentation.getTargetContext().getSystemService(InputManager.class);
         assertNotNull(mInputManager);
         mParser = new InputJsonParser(mInstrumentation.getTargetContext());
-        mDeviceId = mParser.readDeviceId(resourceId);
-        String registerCommand = mParser.readRegisterCommand(resourceId);
-        mUinputDevice = new UinputDevice(mInstrumentation, mDeviceId,
-                mParser.readVendorId(resourceId), mParser.readProductId(resourceId),
-                InputDevice.SOURCE_KEYBOARD, registerCommand);
-        mVibratorManager = getVibratorManager(mParser.readVendorId(resourceId),
-                mParser.readProductId(resourceId));
+
+        mUinputDevice = UinputDevice.create(mInstrumentation, R.raw.google_gamepad_register,
+                InputDevice.SOURCE_KEYBOARD);
+        mDeviceId = mUinputDevice.getRegisterCommandDeviceId();
+        mVibratorManager = getVibratorManager(mUinputDevice.getVendorId(),
+                mUinputDevice.getProductId());
         assertTrue(mVibratorManager != null);
     }
 
diff --git a/tests/tests/view/src/android/view/cts/input/InputDeviceVibratorTest.java b/tests/tests/view/src/android/view/cts/input/InputDeviceVibratorTest.java
index f2d3397..fc81cbd 100644
--- a/tests/tests/view/src/android/view/cts/input/InputDeviceVibratorTest.java
+++ b/tests/tests/view/src/android/view/cts/input/InputDeviceVibratorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package android.view.cts;
+package android.view.cts.input;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -34,6 +34,7 @@
 import android.os.Vibrator.OnVibratorStateChangedListener;
 import android.util.Log;
 import android.view.InputDevice;
+import android.view.cts.R;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
@@ -72,6 +73,7 @@
     private InputJsonParser mParser;
     private Instrumentation mInstrumentation;
     private Vibrator mVibrator;
+    /** The device id inside the resource file (register command) */
     private int mDeviceId;
 
     @Rule
@@ -102,20 +104,16 @@
 
     @Before
     public void setup() {
-        final int resourceId = R.raw.google_gamepad_register;
-
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mInputManager = mInstrumentation.getTargetContext().getSystemService(InputManager.class);
         assertNotNull(mInputManager);
         mParser = new InputJsonParser(mInstrumentation.getTargetContext());
-        mDeviceId = mParser.readDeviceId(resourceId);
-        String registerCommand = mParser.readRegisterCommand(resourceId);
-        mUinputDevice = new UinputDevice(mInstrumentation, mDeviceId,
-                mParser.readVendorId(resourceId), mParser.readProductId(resourceId),
-                InputDevice.SOURCE_KEYBOARD, registerCommand);
-        mVibrator = getVibrator(mParser.readVendorId(resourceId),
-                mParser.readProductId(resourceId));
-        assertTrue(mVibrator != null);
+
+        mUinputDevice = UinputDevice.create(mInstrumentation, R.raw.google_gamepad_register,
+                InputDevice.SOURCE_KEYBOARD);
+        mDeviceId = mUinputDevice.getRegisterCommandDeviceId();
+        mVibrator = getVibrator(mUinputDevice.getVendorId(), mUinputDevice.getProductId());
+        assertNotNull(mVibrator);
         mVibrator.addVibratorStateListener(mListener);
         verify(mListener, timeout(CALLBACK_TIMEOUT_MILLIS)
                 .times(1)).onVibratorStateChanged(false);
diff --git a/tests/tests/view/src/android/view/cts/input/InputEventTest.java b/tests/tests/view/src/android/view/cts/input/InputEventTest.java
deleted file mode 100644
index 6ce80d3..0000000
--- a/tests/tests/view/src/android/view/cts/input/InputEventTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright (C) 2020 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 android.view.cts.input;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-
-import android.text.TextUtils;
-import android.util.ArrayMap;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-
-import androidx.test.filters.SmallTest;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import java.util.Map;
-
-@SmallTest
-@RunWith(AndroidJUnit4.class)
-public class InputEventTest {
-
-    @Test
-    public void testKeyCodeToString() {
-        assertEquals("KEYCODE_UNKNOWN", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_UNKNOWN));
-        assertEquals("KEYCODE_HOME", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_HOME));
-        assertEquals("KEYCODE_0", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_0));
-        assertEquals("KEYCODE_POWER", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_POWER));
-        assertEquals("KEYCODE_A", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_A));
-        assertEquals("KEYCODE_SPACE", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_SPACE));
-        assertEquals("KEYCODE_MENU", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_MENU));
-        assertEquals("KEYCODE_BACK", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_BACK));
-        assertEquals("KEYCODE_BUTTON_A", KeyEvent.keyCodeToString(KeyEvent.KEYCODE_BUTTON_A));
-        assertEquals("KEYCODE_PROFILE_SWITCH",
-                        KeyEvent.keyCodeToString(KeyEvent.KEYCODE_PROFILE_SWITCH));
-    }
-
-    @Test
-    public void testAxisFromToString() {
-        final Map<Integer, String> axes = new ArrayMap<Integer, String>();
-        axes.put(MotionEvent.AXIS_X, "AXIS_X");
-        axes.put(MotionEvent.AXIS_Y, "AXIS_Y");
-        axes.put(MotionEvent.AXIS_PRESSURE, "AXIS_PRESSURE");
-        axes.put(MotionEvent.AXIS_SIZE, "AXIS_SIZE");
-        axes.put(MotionEvent.AXIS_TOUCH_MAJOR, "AXIS_TOUCH_MAJOR");
-        axes.put(MotionEvent.AXIS_TOUCH_MINOR, "AXIS_TOUCH_MINOR");
-        axes.put(MotionEvent.AXIS_TOOL_MAJOR, "AXIS_TOOL_MAJOR");
-        axes.put(MotionEvent.AXIS_TOOL_MINOR, "AXIS_TOOL_MINOR");
-        axes.put(MotionEvent.AXIS_ORIENTATION, "AXIS_ORIENTATION");
-        axes.put(MotionEvent.AXIS_VSCROLL, "AXIS_VSCROLL");
-        axes.put(MotionEvent.AXIS_HSCROLL, "AXIS_HSCROLL");
-        axes.put(MotionEvent.AXIS_Z, "AXIS_Z");
-        axes.put(MotionEvent.AXIS_RX, "AXIS_RX");
-        axes.put(MotionEvent.AXIS_RY, "AXIS_RY");
-        axes.put(MotionEvent.AXIS_RZ, "AXIS_RZ");
-        axes.put(MotionEvent.AXIS_HAT_X, "AXIS_HAT_X");
-        axes.put(MotionEvent.AXIS_HAT_Y, "AXIS_HAT_Y");
-        axes.put(MotionEvent.AXIS_LTRIGGER, "AXIS_LTRIGGER");
-        axes.put(MotionEvent.AXIS_RTRIGGER, "AXIS_RTRIGGER");
-        axes.put(MotionEvent.AXIS_THROTTLE, "AXIS_THROTTLE");
-        axes.put(MotionEvent.AXIS_RUDDER, "AXIS_RUDDER");
-        axes.put(MotionEvent.AXIS_WHEEL, "AXIS_WHEEL");
-        axes.put(MotionEvent.AXIS_GAS, "AXIS_GAS");
-        axes.put(MotionEvent.AXIS_BRAKE, "AXIS_BRAKE");
-        axes.put(MotionEvent.AXIS_DISTANCE, "AXIS_DISTANCE");
-        axes.put(MotionEvent.AXIS_TILT, "AXIS_TILT");
-        axes.put(MotionEvent.AXIS_SCROLL, "AXIS_SCROLL");
-        axes.put(MotionEvent.AXIS_RELATIVE_X, "AXIS_RELATIVE_X");
-        axes.put(MotionEvent.AXIS_RELATIVE_Y, "AXIS_RELATIVE_Y");
-        axes.put(MotionEvent.AXIS_GENERIC_1, "AXIS_GENERIC_1");
-        axes.put(MotionEvent.AXIS_GENERIC_2, "AXIS_GENERIC_2");
-        axes.put(MotionEvent.AXIS_GENERIC_3, "AXIS_GENERIC_3");
-        axes.put(MotionEvent.AXIS_GENERIC_4, "AXIS_GENERIC_4");
-        axes.put(MotionEvent.AXIS_GENERIC_5, "AXIS_GENERIC_5");
-        axes.put(MotionEvent.AXIS_GENERIC_6, "AXIS_GENERIC_6");
-        axes.put(MotionEvent.AXIS_GENERIC_7, "AXIS_GENERIC_7");
-        axes.put(MotionEvent.AXIS_GENERIC_8, "AXIS_GENERIC_8");
-        axes.put(MotionEvent.AXIS_GENERIC_9, "AXIS_GENERIC_9");
-        axes.put(MotionEvent.AXIS_GENERIC_10, "AXIS_GENERIC_10");
-        axes.put(MotionEvent.AXIS_GENERIC_11, "AXIS_GENERIC_11");
-        axes.put(MotionEvent.AXIS_GENERIC_12, "AXIS_GENERIC_12");
-        axes.put(MotionEvent.AXIS_GENERIC_13, "AXIS_GENERIC_13");
-        axes.put(MotionEvent.AXIS_GENERIC_14, "AXIS_GENERIC_14");
-        axes.put(MotionEvent.AXIS_GENERIC_15, "AXIS_GENERIC_15");
-        axes.put(MotionEvent.AXIS_GENERIC_16, "AXIS_GENERIC_16");
-        // As Axes values definition is not continuous from AXIS_RELATIVE_Y to AXIS_GENERIC_1,
-        // Need to verify MotionEvent.axisToString returns axis name correctly.
-        // Also verify that we are not crashing on those calls, and that the return result on each
-        // is not empty. We do expect the two-way call chain of to/from to get us back to the
-        // original integer value.
-        for (Map.Entry<Integer, String> entry : axes.entrySet()) {
-            final int axis = entry.getKey();
-            String axisToString = MotionEvent.axisToString(entry.getKey());
-            assertFalse(TextUtils.isEmpty(axisToString));
-            assertEquals(axisToString, entry.getValue());
-            assertEquals(axis, MotionEvent.axisFromString(axisToString));
-        }
-    }
-}
diff --git a/tests/tests/view/src/android/view/cts/util/ASurfaceControlTestUtils.java b/tests/tests/view/src/android/view/cts/util/ASurfaceControlTestUtils.java
index a0926b7..27d9a63 100644
--- a/tests/tests/view/src/android/view/cts/util/ASurfaceControlTestUtils.java
+++ b/tests/tests/view/src/android/view/cts/util/ASurfaceControlTestUtils.java
@@ -19,6 +19,7 @@
 import static org.junit.Assert.assertTrue;
 
 import android.graphics.Rect;
+import android.hardware.HardwareBuffer;
 import android.view.Surface;
 
 public class ASurfaceControlTestUtils {
@@ -170,4 +171,11 @@
             long surfaceTransaction, boolean waitForFence, TransactionCompleteListener listener);
     public static native void nSurfaceTransaction_setOnCommitCallbackWithoutContext(
             long surfaceTransaction, TransactionCompleteListener listener);
+    public static native void nSurfaceTransaction_setFrameTimeline(long surfaceTransaction,
+            long vsyncId);
+
+    public static native HardwareBuffer getSolidBuffer(int width, int height, int color);
+    public static native HardwareBuffer getQuadrantBuffer(int width, int height,
+            int colorTopLeft, int colorTopRight, int colorBottomRight, int colorBottomLeft);
+    public static native long getBufferId(HardwareBuffer buffer);
 }
diff --git a/tests/tests/view/src/android/view/cts/util/FrameCallbackData.java b/tests/tests/view/src/android/view/cts/util/FrameCallbackData.java
new file mode 100644
index 0000000..9e5cd68
--- /dev/null
+++ b/tests/tests/view/src/android/view/cts/util/FrameCallbackData.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2021 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 android.view.cts.util;
+
+public class FrameCallbackData {
+    static {
+        System.loadLibrary("ctsview_jni");
+    }
+
+    public static class FrameTimeline {
+        FrameTimeline(long vsyncId, long expectedPresentTime, long deadline) {
+            mVsyncId = vsyncId;
+            mExpectedPresentTime = expectedPresentTime;
+            mDeadline = deadline;
+        }
+
+        public long getVsyncId() {
+            return mVsyncId;
+        }
+
+        public long getExpectedPresentTime() {
+            return mExpectedPresentTime;
+        }
+
+        public long getDeadline() {
+            return mDeadline;
+        }
+
+        private long mVsyncId;
+        private long mExpectedPresentTime;
+        private long mDeadline;
+    }
+
+    FrameCallbackData(
+            FrameTimeline[] frameTimelines, int preferredFrameTimelineIndex) {
+        mFrameTimelines = frameTimelines;
+        mPreferredFrameTimelineIndex = preferredFrameTimelineIndex;
+    }
+
+    public FrameTimeline[] getFrameTimelines() {
+        return mFrameTimelines;
+    }
+
+    public int getPreferredFrameTimelineIndex() {
+        return mPreferredFrameTimelineIndex;
+    }
+
+    private FrameTimeline[] mFrameTimelines;
+    private int mPreferredFrameTimelineIndex;
+
+    public static native FrameCallbackData nGetFrameTimelines();
+}
diff --git a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/ASurfaceControlTestActivity.java b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/ASurfaceControlTestActivity.java
index ccecf85..64a6314 100644
--- a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/ASurfaceControlTestActivity.java
+++ b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/ASurfaceControlTestActivity.java
@@ -29,19 +29,31 @@
 import android.graphics.Color;
 import android.graphics.Rect;
 import android.os.Bundle;
+import android.os.Environment;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
 import android.view.Gravity;
 import android.view.PointerIcon;
+import android.view.SurfaceControl;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
+import android.view.ViewTreeObserver;
+import android.view.WindowInsets;
+import android.view.WindowInsetsAnimation;
 import android.view.WindowManager;
 import android.widget.FrameLayout;
 
 import androidx.annotation.NonNull;
 
+import org.junit.Assert;
+import org.junit.rules.TestName;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -53,7 +65,7 @@
     private static final int DEFAULT_LAYOUT_HEIGHT = 100;
     private static final int OFFSET_X = 100;
     private static final int OFFSET_Y = 100;
-    private static final long WAIT_TIMEOUT_S = 5;
+    public static final long WAIT_TIMEOUT_S = 5;
 
     private final Handler mHandler = new Handler(Looper.getMainLooper());
     private volatile boolean mOnWatch;
@@ -66,7 +78,9 @@
 
     private Instrumentation mInstrumentation;
 
+    private final InsetsAnimationCallback mInsetsAnimationCallback = new InsetsAnimationCallback();
     private final CountDownLatch mReadyToStart = new CountDownLatch(1);
+    private CountDownLatch mTransactionCommittedLatch;
 
     @Override
     public void onEnterAnimationComplete() {
@@ -83,10 +97,12 @@
             return;
         }
 
-        getWindow().getDecorView().setSystemUiVisibility(
+        final View decorView = getWindow().getDecorView();
+        decorView.setWindowInsetsAnimationCallback(mInsetsAnimationCallback);
+        decorView.setSystemUiVisibility(
                 View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_FULLSCREEN);
         // Set the NULL pointer icon so that it won't obstruct the captured image.
-        getWindow().getDecorView().setPointerIcon(
+        decorView.setPointerIcon(
                 PointerIcon.getSystemIcon(this, PointerIcon.TYPE_NULL));
         getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
@@ -103,8 +119,39 @@
         mInstrumentation = getInstrumentation();
     }
 
+    public SurfaceControl getSurfaceControl() {
+        return mSurfaceView.getSurfaceControl();
+    }
+
     public void verifyTest(SurfaceHolder.Callback surfaceHolderCallback,
-            PixelChecker pixelChecker) {
+            PixelChecker pixelChecker, TestName name) {
+        verifyTest(surfaceHolderCallback, pixelChecker, name, 0);
+    }
+
+    public void verifyTest(SurfaceHolder.Callback surfaceHolderCallback,
+            PixelChecker pixelChecker, TestName name, int numOfTransactionToListen) {
+        final boolean waitForTransactionLatch = numOfTransactionToListen > 0;
+        final CountDownLatch readyFence = new CountDownLatch(1);
+        if (waitForTransactionLatch) {
+            mTransactionCommittedLatch = new CountDownLatch(numOfTransactionToListen);
+        }
+        SurfaceHolderCallback surfaceHolderCallbackWrapper = new SurfaceHolderCallback(
+                surfaceHolderCallback,
+                readyFence, mParent.getViewTreeObserver());
+        createSurface(surfaceHolderCallbackWrapper);
+        try {
+            if (waitForTransactionLatch) {
+                assertTrue("timeout",
+                        mTransactionCommittedLatch.await(WAIT_TIMEOUT_S, TimeUnit.SECONDS));
+            }
+            assertTrue("timeout", readyFence.await(WAIT_TIMEOUT_S, TimeUnit.SECONDS));
+        } catch (InterruptedException e) {
+            Assert.fail("interrupted");
+        }
+        verifyScreenshot(pixelChecker, name);
+    }
+
+    public void createSurface(SurfaceHolderCallback surfaceHolderCallback) {
         try {
             mReadyToStart.await(5, TimeUnit.SECONDS);
         } catch (InterruptedException e) {
@@ -120,14 +167,19 @@
             return;
         }
 
-        final SurfaceHolderCallback surfaceHolderCallbackWrapper =
-                new SurfaceHolderCallback(surfaceHolderCallback);
         mHandler.post(() -> {
-            mSurfaceView.getHolder().addCallback(surfaceHolderCallbackWrapper);
+            mSurfaceView.getHolder().addCallback(surfaceHolderCallback);
             mParent.addView(mSurfaceView, mLayoutParams);
         });
-        mInstrumentation.waitForIdleSync();
-        surfaceHolderCallbackWrapper.waitForSurfaceCreated();
+    }
+
+    public void verifyScreenshot(PixelChecker pixelChecker, TestName name) {
+        // Wait for the stable insets update. The position of the surface view is in correct before
+        // the update. Sometimes this callback isn't called, so we don't want to fail the test
+        // because it times out.
+        if (!mInsetsAnimationCallback.waitForInsetsAnimation()) {
+            Log.w(TAG, "Insets animation wait timed out.");
+        }
 
         final CountDownLatch countDownLatch = new CountDownLatch(1);
         UiAutomation uiAutomation = mInstrumentation.getUiAutomation();
@@ -151,6 +203,9 @@
         Rect bounds = pixelChecker.getBoundsToCheck(swBitmap);
         boolean success = pixelChecker.checkPixels(numMatchingPixels, swBitmap.getWidth(),
                 swBitmap.getHeight());
+        if (!success) {
+            saveFailureCapture(swBitmap, name);
+        }
         swBitmap.recycle();
 
         assertTrue("Actual matched pixels:" + numMatchingPixels
@@ -161,6 +216,14 @@
         return mSurfaceView;
     }
 
+    public FrameLayout getParentFrameLayout() {
+        return mParent;
+    }
+
+    public void transactionCommitted() {
+        mTransactionCommittedLatch.countDown();
+    }
+
     public abstract static class MultiRectChecker extends RectChecker {
         public MultiRectChecker(Rect boundsToCheck) {
             super(boundsToCheck);
@@ -219,7 +282,7 @@
             for (int x = boundsToCheck.left; x < boundsToCheck.right; x++) {
                 for (int y = boundsToCheck.top; y < boundsToCheck.bottom; y++) {
                     int color = bitmap.getPixel(x + OFFSET_X, y + OFFSET_Y);
-                    if (matchesColor(getExpectedColor(x, y), color)) {
+                    if (getExpectedColor(x, y).matchesColor(color)) {
                         numMatchingPixels++;
                     } else if (DEBUG && mLogWhenNoMatch && numErrorsLogged < 100) {
                         // We don't want to spam the logcat with errors if something is really
@@ -237,22 +300,6 @@
             return numMatchingPixels;
         }
 
-        boolean matchesColor(PixelColor expectedColor, int color) {
-            final float red = Color.red(color);
-            final float green = Color.green(color);
-            final float blue = Color.blue(color);
-            final float alpha = Color.alpha(color);
-
-            return alpha <= expectedColor.mMaxAlpha
-                    && alpha >= expectedColor.mMinAlpha
-                    && red <= expectedColor.mMaxRed
-                    && red >= expectedColor.mMinRed
-                    && green <= expectedColor.mMaxGreen
-                    && green >= expectedColor.mMinGreen
-                    && blue <= expectedColor.mMaxBlue
-                    && blue >= expectedColor.mMinBlue;
-        }
-
         public abstract boolean checkPixels(int matchingPixelCount, int width, int height);
 
         public Rect getBoundsToCheck(Bitmap bitmap) {
@@ -267,16 +314,19 @@
     public static class SurfaceHolderCallback implements SurfaceHolder.Callback {
         private final SurfaceHolder.Callback mTestCallback;
         private final CountDownLatch mSurfaceCreatedLatch;
+        private final ViewTreeObserver mViewTreeObserver;
 
-        SurfaceHolderCallback(SurfaceHolder.Callback callback) {
+        public SurfaceHolderCallback(SurfaceHolder.Callback callback, CountDownLatch readyFence,
+                ViewTreeObserver viewTreeObserver) {
             mTestCallback = callback;
-            mSurfaceCreatedLatch = new CountDownLatch(1);
+            mSurfaceCreatedLatch = readyFence;
+            mViewTreeObserver = viewTreeObserver;
         }
 
         @Override
         public void surfaceCreated(@NonNull SurfaceHolder holder) {
             mTestCallback.surfaceCreated(holder);
-            mSurfaceCreatedLatch.countDown();
+            mViewTreeObserver.registerFrameCommitCallback(mSurfaceCreatedLatch::countDown);
         }
 
         @Override
@@ -289,11 +339,58 @@
         public void surfaceDestroyed(@NonNull SurfaceHolder holder) {
             mTestCallback.surfaceDestroyed(holder);
         }
+    }
 
-        public void waitForSurfaceCreated() {
+    private void saveFailureCapture(Bitmap failFrame, TestName name) {
+        String directoryName = Environment.getExternalStorageDirectory()
+                + "/" + getClass().getSimpleName()
+                + "/" + name.getMethodName();
+        File testDirectory = new File(directoryName);
+        if (testDirectory.exists()) {
+            String[] children = testDirectory.list();
+            for (String file : children) {
+                new File(testDirectory, file).delete();
+            }
+        } else {
+            testDirectory.mkdirs();
+        }
+
+        String bitmapName = "frame.png";
+        Log.d(TAG, "Saving file : " + bitmapName + " in directory : " + directoryName);
+
+        File file = new File(directoryName, bitmapName);
+        try (FileOutputStream fileStream = new FileOutputStream(file)) {
+            failFrame.compress(Bitmap.CompressFormat.PNG, 85, fileStream);
+            fileStream.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static class InsetsAnimationCallback extends WindowInsetsAnimation.Callback {
+        private CountDownLatch mLatch = new CountDownLatch(1);
+
+        private InsetsAnimationCallback() {
+            super(DISPATCH_MODE_CONTINUE_ON_SUBTREE);
+        }
+
+        @Override
+        public WindowInsets onProgress(
+                WindowInsets insets, List<WindowInsetsAnimation> runningAnimations) {
+            return insets;
+        }
+
+        @Override
+        public void onEnd(WindowInsetsAnimation animation) {
+            mLatch.countDown();
+        }
+
+        private boolean waitForInsetsAnimation() {
             try {
-                mSurfaceCreatedLatch.await(WAIT_TIMEOUT_S, TimeUnit.SECONDS);
+                return mLatch.await(WAIT_TIMEOUT_S, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
+                // Should never happen
+                throw new RuntimeException(e);
             }
         }
     }
diff --git a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/BitmapPixelChecker.java b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/BitmapPixelChecker.java
new file mode 100644
index 0000000..97cb450
--- /dev/null
+++ b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/BitmapPixelChecker.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2022 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 android.view.cts.surfacevalidator;
+
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.Rect;
+import android.util.Log;
+
+public class BitmapPixelChecker {
+    private static final String TAG = "BitmapPixelChecker";
+    private final PixelColor mPixelColor;
+    private final boolean mLogWhenNoMatch;
+
+    public BitmapPixelChecker(int color) {
+        this(color, true);
+    }
+
+    public BitmapPixelChecker(int color, boolean logWhenNoMatch) {
+        mPixelColor = new PixelColor(color);
+        mLogWhenNoMatch = logWhenNoMatch;
+    }
+
+    public int getNumMatchingPixels(Bitmap bitmap, Rect bounds) {
+        int numMatchingPixels = 0;
+        int numErrorsLogged = 0;
+        for (int x = bounds.left; x < bounds.right; x++) {
+            for (int y = bounds.top; y < bounds.bottom; y++) {
+                int color = bitmap.getPixel(x, y);
+                if (getExpectedColor(x, y).matchesColor(color)) {
+                    numMatchingPixels++;
+                } else if (mLogWhenNoMatch && numErrorsLogged < 100) {
+                    // We don't want to spam the logcat with errors if something is really
+                    // broken. Only log the first 100 errors.
+                    PixelColor expected = getExpectedColor(x, y);
+                    int expectedColor = Color.argb(expected.mAlpha, expected.mRed,
+                            expected.mGreen, expected.mBlue);
+                    Log.e(TAG, String.format(
+                            "Failed to match (%d, %d) color=0x%08X expected=0x%08X", x, y,
+                            color, expectedColor));
+                    numErrorsLogged++;
+                }
+            }
+        }
+        return numMatchingPixels;
+    }
+
+    public PixelColor getExpectedColor(int x, int y) {
+        return mPixelColor;
+    }
+}
diff --git a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java
index 4bdc106..e5a7ecf 100644
--- a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java
+++ b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/CapturedActivity.java
@@ -261,6 +261,8 @@
                     (FrameLayout) findViewById(android.R.id.content));
         });
 
+        animationTestCase.waitForReady();
+
         mHandler.postDelayed(() -> {
             Log.d(TAG, "Starting capture");
 
diff --git a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/ISurfaceValidatorTestCase.java b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/ISurfaceValidatorTestCase.java
index 0de06d2..71810d9 100644
--- a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/ISurfaceValidatorTestCase.java
+++ b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/ISurfaceValidatorTestCase.java
@@ -37,4 +37,8 @@
         boundsToCheck.offset(topLeft[0], topLeft[1]);
         return  boundsToCheck;
     }
+
+    default void waitForReady() {
+        return;
+    }
 }
diff --git a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/PixelColor.java b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/PixelColor.java
index ab71181..c669d51 100644
--- a/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/PixelColor.java
+++ b/tests/tests/view/surfacevalidator/src/android/view/cts/surfacevalidator/PixelColor.java
@@ -15,6 +15,8 @@
  */
 package android.view.cts.surfacevalidator;
 
+import android.graphics.Color;
+
 public class PixelColor {
     public static final int BLACK = 0xFF000000;
     public static final int RED = 0xFF0000FF;
@@ -24,8 +26,7 @@
     public static final int MAGENTA = 0xFFFF00FF;
     public static final int WHITE = 0xFFFFFFFF;
 
-    public static final int TRANSPARENT_RED = 0x7F0000FF;
-    public static final int TRANSPARENT_BLUE = 0x7FFF0000;
+    public static final int TRANSLUCENT_RED = 0x7F0000FF;
     public static final int TRANSPARENT = 0x00000000;
 
     // Default to black
@@ -70,4 +71,21 @@
     private int getMaxValue(short color) {
         return Math.min(color + 4, 0xFF);
     }
+
+    public boolean matchesColor(int color) {
+        final float red = Color.red(color);
+        final float green = Color.green(color);
+        final float blue = Color.blue(color);
+        final float alpha = Color.alpha(color);
+
+        return alpha <= mMaxAlpha
+                && alpha >= mMinAlpha
+                && red <= mMaxRed
+                && red >= mMinRed
+                && green <= mMaxGreen
+                && green >= mMinGreen
+                && blue <= mMaxBlue
+                && blue >= mMinBlue;
+    }
+
 }
diff --git a/tests/tests/virtualdevice/Android.bp b/tests/tests/virtualdevice/Android.bp
new file mode 100644
index 0000000..5952408
--- /dev/null
+++ b/tests/tests/virtualdevice/Android.bp
@@ -0,0 +1,56 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsVirtualDevicesTestCases",
+
+    defaults: ["cts_defaults"],
+
+    platform_apis: true,
+
+    libs: [
+        "android.test.runner",
+        "android.test.base",
+    ],
+
+    static_libs: [
+        "androidx.test.ext.junit",
+        "compatibility-device-util-axt",
+        "ctstestrunner-axt",
+        "CtsVirtualDeviceCommonLib",
+        "junit",
+    ],
+
+    srcs: [
+        "src/**/*.java",
+        ":CtsVirtualDevicesTestAidl",
+    ],
+
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
+
+filegroup {
+    name: "CtsVirtualDevicesTestAidl",
+    srcs: [
+        "aidl/**/*.aidl",
+    ],
+}
diff --git a/tests/tests/virtualdevice/AndroidManifest.xml b/tests/tests/virtualdevice/AndroidManifest.xml
new file mode 100644
index 0000000..bc6d1c4
--- /dev/null
+++ b/tests/tests/virtualdevice/AndroidManifest.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (C) 2021 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.
+ -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.virtualdevice.cts">
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+        <activity android:name=".util.EmptyActivity"
+            android:allowEmbedded="true"
+            android:exported="false" />
+    </application>
+
+    <uses-feature android:name="android.software.companion_device_setup" />
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+                     android:targetPackage="android.virtualdevice.cts"
+                     android:label="CTS tests of android.companion.virtual">
+        <meta-data android:name="listener"
+            android:value="com.android.cts.runner.CtsTestRunListener" />
+    </instrumentation>
+
+</manifest>
+
diff --git a/tests/tests/virtualdevice/AndroidTest.xml b/tests/tests/virtualdevice/AndroidTest.xml
new file mode 100644
index 0000000..c7db7f5
--- /dev/null
+++ b/tests/tests/virtualdevice/AndroidTest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+<configuration description="Configuration for Virtual Device Manager Tests">
+    <option name="config-descriptor:metadata" key="component" value="framework" />
+    <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+
+    <option name="not-shardable" value="true" />
+    <option name="test-suite-tag" value="cts" />
+
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <option name="test-file-name" value="CtsVirtualDevicesTestCases.apk" />
+        <option name="test-file-name" value="CtsVirtualDeviceStreamedTestApp.apk" />
+    </target_preparer>
+
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="input keyevent KEYCODE_WAKEUP" />
+        <option name="run-command" value="wm dismiss-keyguard" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
+        <option name="package" value="android.virtualdevice.cts" />
+        <option name="runtime-hint" value="1s" />
+    </test>
+</configuration>
diff --git a/tests/tests/virtualdevice/aidl/android/virtualdevice/cts/IStreamedTestApp.aidl b/tests/tests/virtualdevice/aidl/android/virtualdevice/cts/IStreamedTestApp.aidl
new file mode 100644
index 0000000..67d25b7
--- /dev/null
+++ b/tests/tests/virtualdevice/aidl/android/virtualdevice/cts/IStreamedTestApp.aidl
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.cts;
+
+import android.app.PendingIntent;
+import android.os.ResultReceiver;
+
+interface IStreamedTestApp {
+    PendingIntent createActivityPendingIntent(in ResultReceiver resultReceiver);
+    PendingIntent createServicePendingIntent(boolean trampoline, in ResultReceiver resultReceiver);
+}
\ No newline at end of file
diff --git a/tests/tests/virtualdevice/app/Android.bp b/tests/tests/virtualdevice/app/Android.bp
new file mode 100644
index 0000000..43f2818
--- /dev/null
+++ b/tests/tests/virtualdevice/app/Android.bp
@@ -0,0 +1,35 @@
+// Copyright (C) 2021 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test_helper_app {
+    name: "CtsVirtualDeviceStreamedTestApp",
+    srcs: [
+        "src/**/*.java",
+        "//cts/tests/tests/virtualdevice:CtsVirtualDevicesTestAidl",
+    ],
+    static_libs: [
+        "CtsVirtualDeviceCommonLib",
+    ],
+    manifest: "AndroidManifest.xml",
+    defaults: ["cts_defaults"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+}
diff --git a/tests/tests/virtualdevice/app/AndroidManifest.xml b/tests/tests/virtualdevice/app/AndroidManifest.xml
new file mode 100644
index 0000000..c43c9d7
--- /dev/null
+++ b/tests/tests/virtualdevice/app/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.virtualdevice.streamedtestapp">
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <application>
+        <activity android:name=".MainActivity"
+            android:allowEmbedded="true"
+            android:exported="true" />
+
+        <activity android:name=".NoEmbedActivity"
+            android:exported="true" />
+
+        <activity android:name=".CannotDisplayOnRemoteActivity"
+            android:allowEmbedded="true"
+            android:canDisplayOnRemoteDevices="false"
+            android:exported="true" />
+
+        <service android:name=".StreamedAppService"
+            android:exported="true" />
+    </application>
+
+</manifest>
+
diff --git a/tests/tests/virtualdevice/app/src/android/virtualdevice/streamedtestapp/CannotDisplayOnRemoteActivity.java b/tests/tests/virtualdevice/app/src/android/virtualdevice/streamedtestapp/CannotDisplayOnRemoteActivity.java
new file mode 100644
index 0000000..9dbcae3
--- /dev/null
+++ b/tests/tests/virtualdevice/app/src/android/virtualdevice/streamedtestapp/CannotDisplayOnRemoteActivity.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.streamedtestapp;
+
+/**
+ * Same as MainActivity, but with canDisplayOnRemoteDevices="false" in the manifest.
+ */
+public class CannotDisplayOnRemoteActivity extends MainActivity {
+}
diff --git a/tests/tests/virtualdevice/app/src/android/virtualdevice/streamedtestapp/MainActivity.java b/tests/tests/virtualdevice/app/src/android/virtualdevice/streamedtestapp/MainActivity.java
new file mode 100644
index 0000000..7eba35c
--- /dev/null
+++ b/tests/tests/virtualdevice/app/src/android/virtualdevice/streamedtestapp/MainActivity.java
@@ -0,0 +1,456 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.streamedtestapp;
+
+import static android.hardware.camera2.CameraAccessException.CAMERA_DISABLED;
+import static android.hardware.camera2.CameraAccessException.CAMERA_DISCONNECTED;
+import static android.media.AudioFormat.CHANNEL_OUT_MONO;
+import static android.media.AudioFormat.ENCODING_PCM_16BIT;
+import static android.media.AudioFormat.ENCODING_PCM_FLOAT;
+import static android.media.AudioRecord.READ_BLOCKING;
+import static android.virtualdevice.cts.common.ActivityResultReceiver.ACTION_SEND_ACTIVITY_RESULT;
+import static android.virtualdevice.cts.common.ActivityResultReceiver.EXTRA_LAST_RECORDED_NONZERO_VALUE;
+import static android.virtualdevice.cts.common.ActivityResultReceiver.EXTRA_POWER_SPECTRUM_AT_FREQUENCY;
+import static android.virtualdevice.cts.common.ActivityResultReceiver.EXTRA_POWER_SPECTRUM_NOT_FREQUENCY;
+import static android.virtualdevice.cts.common.AudioHelper.ACTION_PLAY_AUDIO;
+import static android.virtualdevice.cts.common.AudioHelper.ACTION_RECORD_AUDIO;
+import static android.virtualdevice.cts.common.AudioHelper.AMPLITUDE;
+import static android.virtualdevice.cts.common.AudioHelper.BUFFER_SIZE_IN_BYTES;
+import static android.virtualdevice.cts.common.AudioHelper.BYTE_ARRAY;
+import static android.virtualdevice.cts.common.AudioHelper.BYTE_BUFFER;
+import static android.virtualdevice.cts.common.AudioHelper.BYTE_VALUE;
+import static android.virtualdevice.cts.common.AudioHelper.CHANNEL_COUNT;
+import static android.virtualdevice.cts.common.AudioHelper.EXTRA_AUDIO_DATA_TYPE;
+import static android.virtualdevice.cts.common.AudioHelper.FLOAT_ARRAY;
+import static android.virtualdevice.cts.common.AudioHelper.FLOAT_VALUE;
+import static android.virtualdevice.cts.common.AudioHelper.FREQUENCY;
+import static android.virtualdevice.cts.common.AudioHelper.NUMBER_OF_SAMPLES;
+import static android.virtualdevice.cts.common.AudioHelper.SAMPLE_RATE;
+import static android.virtualdevice.cts.common.AudioHelper.SHORT_ARRAY;
+import static android.virtualdevice.cts.common.AudioHelper.SHORT_VALUE;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.Activity;
+import android.app.KeyguardManager;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Intent;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.media.AudioFormat;
+import android.media.AudioManager;
+import android.media.AudioRecord;
+import android.media.AudioTrack;
+import android.media.MediaRecorder;
+import android.os.Bundle;
+import android.os.ResultReceiver;
+import android.util.Log;
+import android.virtualdevice.cts.common.AudioHelper;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.Future;
+
+/**
+ * Test activity to be streamed in the virtual device.
+ */
+public class MainActivity extends Activity {
+
+    private static final String TAG = "StreamedTestApp";
+    static final String PACKAGE_NAME = "android.virtualdevice.streamedtestapp";
+
+    /**
+     * Tell this activity to call the {@link #EXTRA_ACTIVITY_LAUNCHED_RECEIVER} with
+     * {@link #RESULT_OK} when it is launched.
+     */
+    static final String ACTION_CALL_RESULT_RECEIVER =
+            PACKAGE_NAME + ".CALL_RESULT_RECEIVER";
+
+    /**
+     * Tell this activity to call the API (KeyguardManager.isDeviceSecure) when launched.
+     */
+    static final String ACTION_CALL_IS_DEVICE_SECURE =
+            PACKAGE_NAME + ".ACTION_CALL_IS_DEVICE_SECURE";
+
+    /**
+     * Extra in the result data that contains the integer display ID when the receiver for
+     * {@link #ACTION_CALL_RESULT_RECEIVER} is called.
+     */
+    static final String EXTRA_DISPLAY = "display";
+
+    /**
+     * Tell this activity to test camera access when it is launched. It will get the String camera
+     * id to try opening from {@link #EXTRA_CAMERA_ID}, and put the test outcome in
+     * {@link #EXTRA_CAMERA_RESULT} on the activity result intent. If the result was that the
+     * onError callback happened, then {@link #EXTRA_CAMERA_ON_ERROR_CODE} will contain the error
+     * code.
+     */
+    static final String ACTION_TEST_CAMERA =
+            "android.virtualdevice.streamedtestapp.TEST_CAMERA";
+    static final String EXTRA_CAMERA_ID = "cameraId";
+    static final String EXTRA_CAMERA_RESULT = "cameraResult";
+    public static final String EXTRA_CAMERA_ON_ERROR_CODE = "cameraOnErrorCode";
+
+    /**
+     * Tell this activity to test clipboard when it is launched. This will attempt to read the
+     * existing string in clipboard, put that in the activity result (as
+     * {@link #EXTRA_CLIPBOARD_STRING}), and add the string in {@link #EXTRA_CLIPBOARD_STRING} in
+     * the intent extra to the clipboard.
+     */
+    static final String ACTION_TEST_CLIPBOARD =
+            PACKAGE_NAME + ".TEST_CLIPBOARD";
+    static final String EXTRA_ACTIVITY_LAUNCHED_RECEIVER = "activityLaunchedReceiver";
+    static final String EXTRA_CLIPBOARD_STRING = "clipboardString";
+    static final String EXTRA_IS_DEVICE_SECURE = "isDeviceSecure";
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        setTitle(getClass().getSimpleName());
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        String action = getIntent().getAction();
+        if (action != null) {
+            switch (action) {
+                case ACTION_CALL_RESULT_RECEIVER:
+                    Log.d(TAG, "Handling intent receiver");
+                    ResultReceiver resultReceiver =
+                            getIntent().getParcelableExtra(EXTRA_ACTIVITY_LAUNCHED_RECEIVER);
+                    Bundle result = new Bundle();
+                    result.putInt(EXTRA_DISPLAY, getDisplay().getDisplayId());
+                    resultReceiver.send(Activity.RESULT_OK, result);
+                    finish();
+                    break;
+                case ACTION_TEST_CLIPBOARD:
+                    Log.d(TAG, "Testing clipboard");
+                    testClipboard();
+                    break;
+                case ACTION_TEST_CAMERA:
+                    Log.d(TAG, "Testing camera");
+                    testCamera();
+                    break;
+                case ACTION_CALL_IS_DEVICE_SECURE:
+                    Log.d(TAG, "Handling ACTION_CALL_IS_DEVICE_SECURE");
+                    Intent resultData = new Intent();
+                    KeyguardManager km = getSystemService(KeyguardManager.class);
+                    boolean isDeviceSecure = km.isDeviceSecure();
+                    resultData.putExtra(EXTRA_IS_DEVICE_SECURE, isDeviceSecure);
+                    setResult(RESULT_OK, resultData);
+                    finish();
+                    break;
+                case ACTION_PLAY_AUDIO:
+                    @AudioHelper.DataType int playDataType = getIntent().getIntExtra(
+                            EXTRA_AUDIO_DATA_TYPE, -1);
+                    int playEncoding =
+                            playDataType == FLOAT_ARRAY ? ENCODING_PCM_FLOAT : ENCODING_PCM_16BIT;
+                    int bufferSize = AudioTrack.getMinBufferSize(SAMPLE_RATE, CHANNEL_OUT_MONO,
+                            playEncoding);
+                    AudioTrack audioTrack = new AudioTrack(AudioManager.STREAM_MUSIC, SAMPLE_RATE,
+                            CHANNEL_OUT_MONO, playEncoding, bufferSize, AudioTrack.MODE_STREAM);
+                    audioTrack.play();
+                    switch (playDataType) {
+                        case BYTE_BUFFER:
+                            playAudioFromByteBuffer(audioTrack);
+                            break;
+                        case BYTE_ARRAY:
+                            playAudioFromByteArray(audioTrack);
+                            break;
+                        case SHORT_ARRAY:
+                            playAudioFromShortArray(audioTrack);
+                            break;
+                        case FLOAT_ARRAY:
+                            playAudioFromFloatArray(audioTrack);
+                            break;
+                    }
+                    break;
+                case ACTION_RECORD_AUDIO:
+                    @AudioHelper.DataType int recordDataType = getIntent().getIntExtra(
+                            EXTRA_AUDIO_DATA_TYPE, -1);
+                    int recordEncoding =
+                            recordDataType == FLOAT_ARRAY ? ENCODING_PCM_FLOAT : ENCODING_PCM_16BIT;
+                    AudioRecord audioRecord = new AudioRecord(MediaRecorder.AudioSource.MIC,
+                            SAMPLE_RATE,
+                            AudioFormat.CHANNEL_IN_MONO, recordEncoding, BUFFER_SIZE_IN_BYTES);
+                    audioRecord.startRecording();
+                    switch (recordDataType) {
+                        case BYTE_BUFFER:
+                            recordAudioToByteBuffer(audioRecord);
+                            break;
+                        case BYTE_ARRAY:
+                            recordAudioToByteArray(audioRecord);
+                            break;
+                        case SHORT_ARRAY:
+                            recordAudioToShortArray(audioRecord);
+                            break;
+                        case FLOAT_ARRAY:
+                            recordAudioToFloatArray(audioRecord);
+                            break;
+                    }
+                    break;
+                default:
+                    Log.w(TAG, "Unknown action: " + action);
+            }
+        }
+    }
+
+    private void testClipboard() {
+        Intent resultData = new Intent();
+        ClipboardManager clipboardManager = getSystemService(ClipboardManager.class);
+        resultData.putExtra(EXTRA_CLIPBOARD_STRING, clipboardManager.getPrimaryClip());
+
+        String clipboardContent = getIntent().getStringExtra(EXTRA_CLIPBOARD_STRING);
+        if (clipboardContent != null) {
+            clipboardManager.setPrimaryClip(
+                    new ClipData(
+                            "CTS clip data",
+                            new String[]{"application/text"},
+                            new ClipData.Item(clipboardContent)));
+            Log.d(TAG, "Wrote \"" + clipboardContent + "\" to clipboard");
+        } else {
+            Log.w(TAG, "Clipboard content is null");
+        }
+
+        setResult(Activity.RESULT_OK, resultData);
+        finish();
+    }
+
+    private void testCamera() {
+        Intent resultData = new Intent();
+        CameraManager cameraManager = getSystemService(CameraManager.class);
+        String cameraId = null;
+        try {
+            cameraId = getIntent().getStringExtra(EXTRA_CAMERA_ID);
+            Log.d(TAG, "opening camera " + cameraId);
+            cameraManager.openCamera(cameraId,
+                    new CameraDevice.StateCallback() {
+                        @Override
+                        public void onOpened(@NonNull CameraDevice camera) {
+                            Log.d(TAG, "onOpened");
+                        }
+
+                        @Override
+                        public void onDisconnected(@NonNull CameraDevice camera) {
+                            Log.d(TAG, "onDisconnected");
+                            resultData.putExtra(EXTRA_CAMERA_RESULT, "onDisconnected");
+                            setResult(Activity.RESULT_OK, resultData);
+                            finish();
+                        }
+
+                        @Override
+                        public void onError(@NonNull CameraDevice camera, int error) {
+                            Log.d(TAG, "onError " + error);
+                            resultData.putExtra(EXTRA_CAMERA_RESULT, "onError");
+                            resultData.putExtra(EXTRA_CAMERA_ON_ERROR_CODE, error);
+                            setResult(Activity.RESULT_OK, resultData);
+                            finish();
+                        }
+                    }, null);
+        } catch (CameraAccessException e) {
+            int reason = e.getReason();
+            if (reason == CAMERA_DISABLED || reason == CAMERA_DISCONNECTED) {
+                // ok to ignore - we should get one of the onDisconnected or onError callbacks above
+                Log.d(TAG, "saw expected CameraAccessException for reason:" + reason);
+            } else {
+                Log.e(TAG, "got unexpected CameraAccessException with reason:" + reason, e);
+            }
+        } catch (IllegalArgumentException e) {
+            Log.e(TAG, "IllegalArgumentException - maybe invalid camera id? (" + cameraId + ")", e);
+        }
+    }
+
+    private void playAudioFromByteBuffer(AudioTrack audioTrack) {
+        // Write to the audio track asynchronously to avoid ANRs.
+        Future<?> unusedFuture = CompletableFuture.runAsync(() -> {
+            ByteBuffer audioData = AudioHelper.createAudioData(
+                    SAMPLE_RATE, NUMBER_OF_SAMPLES, CHANNEL_COUNT, FREQUENCY, AMPLITUDE);
+
+            int remainingSamples = NUMBER_OF_SAMPLES;
+            while (remainingSamples > 0) {
+                remainingSamples -= audioTrack.write(audioData, audioData.remaining(),
+                        AudioTrack.WRITE_BLOCKING);
+            }
+            audioTrack.release();
+
+            Intent intent = new Intent(ACTION_SEND_ACTIVITY_RESULT);
+            sendBroadcast(intent);
+            finish();
+        });
+    }
+
+    private void playAudioFromByteArray(AudioTrack audioTrack) {
+        // Write to the audio track asynchronously to avoid ANRs.
+        Future<?> unusedFuture = CompletableFuture.runAsync(() -> {
+            byte[] audioData = new byte[NUMBER_OF_SAMPLES];
+            for (int i = 0; i < audioData.length; i++) {
+                audioData[i] = BYTE_VALUE;
+            }
+
+            int remainingSamples = audioData.length;
+            while (remainingSamples > 0) {
+                remainingSamples -= audioTrack.write(audioData, 0, audioData.length);
+            }
+            audioTrack.release();
+
+            Intent intent = new Intent(ACTION_SEND_ACTIVITY_RESULT);
+            sendBroadcast(intent);
+            finish();
+        });
+    }
+
+    private void playAudioFromShortArray(AudioTrack audioTrack) {
+        // Write to the audio track asynchronously to avoid ANRs.
+        Future<?> unusedFuture = CompletableFuture.runAsync(() -> {
+            short[] audioData = new short[NUMBER_OF_SAMPLES];
+            for (int i = 0; i < audioData.length; i++) {
+                audioData[i] = SHORT_VALUE;
+            }
+
+            int remainingSamples = audioData.length;
+            while (remainingSamples > 0) {
+                remainingSamples -= audioTrack.write(audioData, 0, audioData.length);
+            }
+            audioTrack.release();
+
+            Intent intent = new Intent(ACTION_SEND_ACTIVITY_RESULT);
+            sendBroadcast(intent);
+            finish();
+        });
+    }
+
+    private void playAudioFromFloatArray(AudioTrack audioTrack) {
+        // Write to the audio track asynchronously to avoid ANRs.
+        Future<?> unusedFuture = CompletableFuture.runAsync(() -> {
+            float[] audioData = new float[NUMBER_OF_SAMPLES];
+            for (int i = 0; i < audioData.length; i++) {
+                audioData[i] = FLOAT_VALUE;
+            }
+
+            int remainingSamples = audioData.length;
+            while (remainingSamples > 0) {
+                remainingSamples -= audioTrack.write(audioData, 0, audioData.length,
+                        AudioTrack.WRITE_BLOCKING);
+            }
+            audioTrack.release();
+
+            Intent intent = new Intent(ACTION_SEND_ACTIVITY_RESULT);
+            sendBroadcast(intent);
+            finish();
+        });
+    }
+
+    private void recordAudioToByteBuffer(AudioRecord audioRecord) {
+        // Read from the audio record asynchronously to avoid ANRs.
+        Future<?> unusedFuture = CompletableFuture.runAsync(() -> {
+            AudioHelper.CapturedAudio capturedAudio = new AudioHelper.CapturedAudio(audioRecord);
+            double powerSpectrumNotFrequency = capturedAudio.getPowerSpectrum(FREQUENCY + 100);
+            double powerSpectrumAtFrequency = capturedAudio.getPowerSpectrum(FREQUENCY);
+            audioRecord.release();
+
+            Intent intent = new Intent(ACTION_SEND_ACTIVITY_RESULT);
+            intent.putExtra(EXTRA_POWER_SPECTRUM_NOT_FREQUENCY, powerSpectrumNotFrequency);
+            intent.putExtra(EXTRA_POWER_SPECTRUM_AT_FREQUENCY, powerSpectrumAtFrequency);
+            sendBroadcast(intent);
+            finish();
+        });
+    }
+
+    private void recordAudioToByteArray(AudioRecord audioRecord) {
+        // Read from the audio record asynchronously to avoid ANRs.
+        Future<?> unusedFuture = CompletableFuture.runAsync(() -> {
+            byte[] audioData = new byte[BUFFER_SIZE_IN_BYTES];
+            while (true) {
+                int bytesRead = audioRecord.read(audioData, 0, audioData.length);
+                if (bytesRead == 0) {
+                    continue;
+                }
+                break;
+            }
+            byte value = 0;
+            for (int i = 0; i < audioData.length; i++) {
+                if (audioData[i] != 0) {
+                    value = audioData[i];
+                    break;
+                }
+            }
+            audioRecord.release();
+
+            Intent intent = new Intent(ACTION_SEND_ACTIVITY_RESULT);
+            intent.putExtra(EXTRA_LAST_RECORDED_NONZERO_VALUE, value);
+            sendBroadcast(intent);
+            finish();
+        });
+    }
+
+    private void recordAudioToShortArray(AudioRecord audioRecord) {
+        // Read from the audio record asynchronously to avoid ANRs.
+        Future<?> unusedFuture = CompletableFuture.runAsync(() -> {
+            short[] audioData = new short[BUFFER_SIZE_IN_BYTES / 2];
+            while (true) {
+                int bytesRead = audioRecord.read(audioData, 0, audioData.length);
+                if (bytesRead == 0) {
+                    continue;
+                }
+                break;
+            }
+            short value = 0;
+            for (int i = 0; i < audioData.length; i++) {
+                if (audioData[i] != 0) {
+                    value = audioData[i];
+                    break;
+                }
+            }
+            audioRecord.release();
+
+            Intent intent = new Intent(ACTION_SEND_ACTIVITY_RESULT);
+            intent.putExtra(EXTRA_LAST_RECORDED_NONZERO_VALUE, value);
+            sendBroadcast(intent);
+            finish();
+        });
+    }
+
+    private void recordAudioToFloatArray(AudioRecord audioRecord) {
+        // Read from the audio record asynchronously to avoid ANRs.
+        Future<?> unusedFuture = CompletableFuture.runAsync(() -> {
+            float[] audioData = new float[BUFFER_SIZE_IN_BYTES / 4];
+            while (true) {
+                int bytesRead = audioRecord.read(audioData, 0, audioData.length, READ_BLOCKING);
+                if (bytesRead == 0) {
+                    continue;
+                }
+                break;
+            }
+            float value = 0f;
+            for (int i = 0; i < audioData.length; i++) {
+                if (Float.compare(audioData[i], 0.0f) != 0) {
+                    value = audioData[i];
+                    break;
+                }
+            }
+            audioRecord.release();
+
+            Intent intent = new Intent(ACTION_SEND_ACTIVITY_RESULT);
+            intent.putExtra(EXTRA_LAST_RECORDED_NONZERO_VALUE, value);
+            sendBroadcast(intent);
+            finish();
+        });
+    }
+}
diff --git a/tests/tests/virtualdevice/app/src/android/virtualdevice/streamedtestapp/NoEmbedActivity.java b/tests/tests/virtualdevice/app/src/android/virtualdevice/streamedtestapp/NoEmbedActivity.java
new file mode 100644
index 0000000..3c77a46
--- /dev/null
+++ b/tests/tests/virtualdevice/app/src/android/virtualdevice/streamedtestapp/NoEmbedActivity.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.streamedtestapp;
+
+/**
+ * Same as MainActivity, but without allowEmbedded="true" in the manifest.
+ */
+public class NoEmbedActivity extends MainActivity {
+}
diff --git a/tests/tests/virtualdevice/app/src/android/virtualdevice/streamedtestapp/StreamedAppService.java b/tests/tests/virtualdevice/app/src/android/virtualdevice/streamedtestapp/StreamedAppService.java
new file mode 100644
index 0000000..b270a5b
--- /dev/null
+++ b/tests/tests/virtualdevice/app/src/android/virtualdevice/streamedtestapp/StreamedAppService.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.streamedtestapp;
+
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+import android.os.ResultReceiver;
+import android.util.Log;
+import android.virtualdevice.cts.IStreamedTestApp;
+
+/**
+ * Service for communicating between the CTS test and this streamed test app.
+ */
+public class StreamedAppService extends Service {
+
+    private static final String TAG = "StreamedAppService";
+
+    /**
+     * Tell this service to start {@link MainActivity}.
+     */
+    private static final String ACTION_START_MAIN_ACTIVITY =
+            "android.virtualdevice.streamedtestapp.START_MAIN_ACTIVITY";
+
+    /**
+     * Tell this service to do nothing.
+     */
+    private static final String ACTION_NO_OP = "android.virtualdevice.streamedtestapp.NO_OP";
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        switch (intent.getAction()) {
+            case ACTION_START_MAIN_ACTIVITY:
+                Intent activityIntent = new Intent(this, MainActivity.class)
+                        .setAction(MainActivity.ACTION_CALL_RESULT_RECEIVER)
+                        .putExtras(intent)
+                        .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                startActivity(activityIntent);
+                break;
+            case ACTION_NO_OP:
+                break;
+            default:
+                Log.w(TAG, "Unknown action: " + intent.getAction());
+        }
+        return START_STICKY;
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return new IStreamedTestApp.Stub() {
+
+            @Override
+            public PendingIntent createActivityPendingIntent(ResultReceiver resultReceiver) {
+                Intent intent = new Intent(MainActivity.ACTION_CALL_RESULT_RECEIVER)
+                        .setClass(StreamedAppService.this, MainActivity.class);
+                intent.putExtra(MainActivity.EXTRA_ACTIVITY_LAUNCHED_RECEIVER, resultReceiver);
+                return PendingIntent.getActivity(
+                        StreamedAppService.this, 1, intent, PendingIntent.FLAG_IMMUTABLE);
+            }
+
+            @Override
+            public PendingIntent createServicePendingIntent(
+                    boolean trampoline, ResultReceiver resultReceiver) {
+                Intent intent = new Intent(trampoline ? ACTION_START_MAIN_ACTIVITY : ACTION_NO_OP)
+                        .setClass(StreamedAppService.this, StreamedAppService.class);
+                intent.putExtra(MainActivity.EXTRA_ACTIVITY_LAUNCHED_RECEIVER, resultReceiver);
+                return PendingIntent.getService(
+                        StreamedAppService.this, 1, intent, PendingIntent.FLAG_IMMUTABLE);
+            }
+        };
+    }
+}
diff --git a/tests/tests/virtualdevice/common/Android.bp b/tests/tests/virtualdevice/common/Android.bp
new file mode 100644
index 0000000..2579570
--- /dev/null
+++ b/tests/tests/virtualdevice/common/Android.bp
@@ -0,0 +1,29 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_library {
+    name: "CtsVirtualDeviceCommonLib",
+    srcs: [
+        "aidl/**/*.aidl",
+        "src/**/*.java",
+    ],
+    static_libs: [
+        "androidx.test.ext.junit",
+    ],
+    manifest: "AndroidManifest.xml",
+}
diff --git a/tests/tests/virtualdevice/common/AndroidManifest.xml b/tests/tests/virtualdevice/common/AndroidManifest.xml
new file mode 100644
index 0000000..c3046ba
--- /dev/null
+++ b/tests/tests/virtualdevice/common/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="android.virtualdevice.cts.common">
+    <application />
+</manifest>
diff --git a/tests/tests/virtualdevice/common/src/android/virtualdevice/cts/common/ActivityResultReceiver.java b/tests/tests/virtualdevice/common/src/android/virtualdevice/cts/common/ActivityResultReceiver.java
new file mode 100644
index 0000000..7073aeb
--- /dev/null
+++ b/tests/tests/virtualdevice/common/src/android/virtualdevice/cts/common/ActivityResultReceiver.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.cts.common;
+
+import android.annotation.Nullable;
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+
+/**
+ * Class for listening for data sent by an activity through {@link Activity#sendBroadcast(Intent)}.
+ */
+public class ActivityResultReceiver extends BroadcastReceiver {
+    /** Action for the activity to send data. */
+    public static final String ACTION_SEND_ACTIVITY_RESULT =
+            "android.virtualdevice.cts.SEND_ACTIVITY_RESULT";
+
+    /** Extra for sending the computed power spectrum at expected audio frequency. */
+    public static final String EXTRA_POWER_SPECTRUM_AT_FREQUENCY = "powerSpectrumAtFrequency";
+
+    /** Extra for sending the computed power spectrum off expected audio frequency. */
+    public static final String EXTRA_POWER_SPECTRUM_NOT_FREQUENCY = "powerSpectrumNotFrequency";
+
+    /** Extra for sending the value of recorded audio data. */
+    public static final String EXTRA_LAST_RECORDED_NONZERO_VALUE = "lastRecordedNonZeroValue";
+
+    public interface Callback {
+        void onActivityResult(Intent data);
+    }
+
+    @Nullable
+    private Callback mCallback;
+    private final Context mContext;
+
+    public ActivityResultReceiver(Context context) {
+        mContext = context;
+    }
+
+    public void register(@Nullable Callback callback) {
+        mCallback = callback;
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(ACTION_SEND_ACTIVITY_RESULT);
+        mContext.registerReceiver(/* receiver= */ this, filter);
+    }
+
+    public void unregister() {
+        mCallback = null;
+        mContext.unregisterReceiver(/* receiver= */ this);
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (mCallback != null) {
+            mCallback.onActivityResult(intent);
+        }
+    }
+}
diff --git a/tests/tests/virtualdevice/common/src/android/virtualdevice/cts/common/AudioHelper.java b/tests/tests/virtualdevice/common/src/android/virtualdevice/cts/common/AudioHelper.java
new file mode 100644
index 0000000..16f67cc2
--- /dev/null
+++ b/tests/tests/virtualdevice/common/src/android/virtualdevice/cts/common/AudioHelper.java
@@ -0,0 +1,265 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.cts.common;
+
+import static android.media.AudioRecord.READ_BLOCKING;
+import static android.media.AudioRecord.READ_NON_BLOCKING;
+
+import android.annotation.IntDef;
+import android.companion.virtual.audio.AudioCapture;
+import android.media.AudioRecord;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+/**
+ * Utility methods for creating and processing audio data.
+ */
+public final class AudioHelper {
+    /** Tells the activity to play audio for testing. */
+    public static final String ACTION_PLAY_AUDIO = "android.virtualdevice.cts.PLAY_AUDIO";
+
+    /** Tells the activity to record audio for testing. */
+    public static final String ACTION_RECORD_AUDIO = "android.virtualdevice.cts.RECORD_AUDIO";
+
+    /** Tells the activity to play or record for which audio data type. */
+    public static final String EXTRA_AUDIO_DATA_TYPE = "audio_data_type";
+
+    @IntDef({
+            BYTE_BUFFER,
+            BYTE_ARRAY,
+            SHORT_ARRAY,
+            FLOAT_ARRAY,
+    })
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface DataType {}
+
+    public static final int BYTE_BUFFER = 1;
+    public static final int BYTE_ARRAY = 2;
+    public static final int SHORT_ARRAY = 3;
+    public static final int FLOAT_ARRAY = 4;
+
+    /** Values for read and write verification. */
+    public static final byte BYTE_VALUE = 8;
+    public static final short SHORT_VALUE = 16;
+    public static final float FLOAT_VALUE = 0.8f;
+
+    /** Constants of audio config for testing. */
+    public static final int FREQUENCY = 264;
+    public static final int SAMPLE_RATE = 44100;
+    public static final int CHANNEL_COUNT = 1;
+    public static final int AMPLITUDE = 32767;
+    public static final int BUFFER_SIZE_IN_BYTES = 65536;
+    public static final int NUMBER_OF_SAMPLES = computeNumSamples(/* timeMs= */ 1000, SAMPLE_RATE,
+            CHANNEL_COUNT);
+
+    public static class CapturedAudio {
+        private int mSamplingRate;
+        private int mChannelCount;
+        private ByteBuffer mCapturedData;
+        private byte mByteValue;
+        private short mShortValue;
+        private float mFloatValue;
+
+        public CapturedAudio(AudioRecord audioRecord) {
+            mSamplingRate = audioRecord.getSampleRate();
+            mChannelCount = audioRecord.getChannelCount();
+            ByteBuffer byteBuffer = ByteBuffer.allocateDirect(BUFFER_SIZE_IN_BYTES).order(
+                    ByteOrder.nativeOrder());
+            while (true) {
+                // Read the first buffer with non-zero data
+                byteBuffer.clear();
+                int bytesRead = audioRecord.read(byteBuffer, BUFFER_SIZE_IN_BYTES);
+                if (bytesRead == 0 || isAllZero(byteBuffer)) {
+                    continue;
+                }
+                mCapturedData = byteBuffer;
+                break;
+            }
+        }
+
+        public CapturedAudio(AudioCapture audioCapture, ByteBuffer byteBuffer, int readMode) {
+            mSamplingRate = audioCapture.getFormat().getSampleRate();
+            mChannelCount = audioCapture.getFormat().getChannelCount();
+            while (true) {
+                // Read the first buffer with non-zero data
+                byteBuffer.clear();
+                int bytesRead;
+                if (readMode == READ_BLOCKING || readMode == READ_NON_BLOCKING) {
+                    bytesRead = audioCapture.read(byteBuffer, BUFFER_SIZE_IN_BYTES, readMode);
+                } else {
+                    bytesRead = audioCapture.read(byteBuffer, BUFFER_SIZE_IN_BYTES);
+                }
+                if (bytesRead == 0 || isAllZero(byteBuffer)) {
+                    continue;
+                }
+                mCapturedData = byteBuffer;
+                break;
+            }
+        }
+
+        public CapturedAudio(AudioCapture audioCapture, byte[] audioData, int readMode) {
+            while (true) {
+                int bytesRead;
+                if (readMode == READ_BLOCKING || readMode == READ_NON_BLOCKING) {
+                    bytesRead = audioCapture.read(audioData, 0, audioData.length, readMode);
+                } else {
+                    bytesRead = audioCapture.read(audioData, 0, audioData.length);
+                }
+                if (bytesRead == 0) {
+                    continue;
+                }
+                break;
+            }
+            for (int i = 0; i < audioData.length; i++) {
+                if (audioData[i] != 0) {
+                    mByteValue = audioData[i];
+                    break;
+                }
+            }
+        }
+
+        public CapturedAudio(AudioCapture audioCapture, short[] audioData, int readMode) {
+            while (true) {
+                int bytesRead;
+                if (readMode == READ_BLOCKING || readMode == READ_NON_BLOCKING) {
+                    bytesRead = audioCapture.read(audioData, 0, audioData.length, readMode);
+                } else {
+                    bytesRead = audioCapture.read(audioData, 0, audioData.length);
+                }
+                if (bytesRead == 0) {
+                    continue;
+                }
+                break;
+            }
+            for (int i = 0; i < audioData.length; i++) {
+                if (audioData[i] != 0) {
+                    mShortValue = audioData[i];
+                    break;
+                }
+            }
+        }
+
+        public CapturedAudio(AudioCapture audioCapture, float[] audioData, int readMode) {
+            while (true) {
+                int bytesRead = audioCapture.read(audioData, 0, audioData.length, readMode);
+                if (bytesRead == 0) {
+                    continue;
+                }
+                break;
+            }
+            for (int i = 0; i < audioData.length; i++) {
+                if (audioData[i] != 0) {
+                    mFloatValue = audioData[i];
+                    break;
+                }
+            }
+        }
+
+        public double getPowerSpectrum(int frequency) {
+            return getCapturedPowerSpectrum(mSamplingRate, mChannelCount, mCapturedData, frequency);
+        }
+
+        public byte getByteValue() {
+            return mByteValue;
+        }
+
+        public short getShortValue() {
+            return mShortValue;
+        }
+
+        public float getFloatValue() {
+            return mFloatValue;
+        }
+    }
+
+    public static int computeNumSamples(int timeMs, int samplingRate, int channelCount) {
+        return (int) ((long) timeMs * samplingRate * channelCount / 1000);
+    }
+
+    public static ByteBuffer createAudioData(int samplingRate, int numSamples, int channelCount,
+            double signalFrequencyHz, float amplitude) {
+        ByteBuffer playBuffer =
+                ByteBuffer.allocateDirect(numSamples * 2).order(ByteOrder.nativeOrder());
+        final double multiplier = 2f * Math.PI * signalFrequencyHz / samplingRate;
+        for (int i = 0; i < numSamples; ) {
+            double vDouble = amplitude * Math.sin(multiplier * (i / channelCount));
+            short v = (short) vDouble;
+            for (int c = 0; c < channelCount; c++) {
+                playBuffer.putShort(i * 2, v);
+                i++;
+            }
+        }
+        return playBuffer;
+    }
+
+    public static double getCapturedPowerSpectrum(
+            int samplingFreq, int channelCount, ByteBuffer capturedData,
+            int expectedSignalFreq) {
+        double power = 0;
+        int length = capturedData.remaining() / 2;  // PCM16, so 2 bytes for each
+        for (int i = 0; i < channelCount; i++) {
+            // Get the power in that channel
+            double goertzel = goertzel(
+                    expectedSignalFreq,
+                    samplingFreq,
+                    capturedData,
+                    /* offset= */ i,
+                    length,
+                    channelCount);
+            power += goertzel / channelCount;
+        }
+        return power;
+    }
+
+    /**
+     * Computes the relative power of a given frequency within a frame of the signal.
+     * See: http://en.wikipedia.org/wiki/Goertzel_algorithm
+     */
+    private static double goertzel(int signalFreq, int samplingFreq,
+            ByteBuffer samples, int offset, int length, int stride) {
+        final int n = length / stride;
+        final double coeff = Math.cos(signalFreq * 2 * Math.PI / samplingFreq) * 2;
+        double s1 = 0;
+        double s2 = 0;
+        double rms = 0;
+        for (int i = 0; i < n; i++) {
+            double hamming = 0.54 - 0.46 * Math.cos(2 * Math.PI * i / (n - 1));
+            double x = samples.getShort(i * 2 * stride + offset) * hamming; // apply hamming window
+            double s = x + coeff * s1 - s2;
+            s2 = s1;
+            s1 = s;
+            rms += x * x;
+        }
+        rms = Math.sqrt(rms / n);
+        double magnitude = s2 * s2 + s1 * s1 - coeff * s1 * s2;
+        return Math.sqrt(magnitude) / n / rms;
+    }
+
+    private static boolean isAllZero(ByteBuffer byteBuffer) {
+        int position = byteBuffer.position();
+        int limit = byteBuffer.limit();
+        for (int i = position; i < limit; i += 2) {
+            if (byteBuffer.getShort(i) != 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+}
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/ActivityBlockingTest.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/ActivityBlockingTest.java
new file mode 100644
index 0000000..ab1aaf1
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/ActivityBlockingTest.java
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2021 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 android.virtualdevice.cts;
+
+import static android.Manifest.permission.ACTIVITY_EMBEDDING;
+import static android.Manifest.permission.ADD_ALWAYS_UNLOCKED_DISPLAY;
+import static android.Manifest.permission.ADD_TRUSTED_DISPLAY;
+import static android.Manifest.permission.CREATE_VIRTUAL_DEVICE;
+import static android.Manifest.permission.REAL_GET_TASKS;
+import static android.Manifest.permission.WAKE_LOCK;
+import static android.virtualdevice.cts.util.VirtualDeviceTestUtils.createActivityOptions;
+import static android.virtualdevice.cts.util.VirtualDeviceTestUtils.createResultReceiver;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
+import static org.junit.Assert.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.argThat;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.after;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.app.Activity;
+import android.companion.virtual.VirtualDeviceManager;
+import android.companion.virtual.VirtualDeviceManager.VirtualDevice;
+import android.companion.virtual.VirtualDeviceParams;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.PixelFormat;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.VirtualDisplay;
+import android.media.ImageReader;
+import android.os.ResultReceiver;
+import android.platform.test.annotations.AppModeFull;
+import android.virtualdevice.cts.util.EmptyActivity;
+import android.virtualdevice.cts.util.FakeAssociationRule;
+import android.virtualdevice.cts.util.TestAppHelper;
+import android.virtualdevice.cts.util.VirtualDeviceTestUtils.OnReceiveResultListener;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.AdoptShellPermissionsRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Set;
+
+/**
+ * Tests for blocking of activities that should not be shown on the virtual device.
+ */
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = "VirtualDeviceManager cannot be accessed by instant apps")
+public class ActivityBlockingTest {
+
+    private static final VirtualDeviceParams DEFAULT_VIRTUAL_DEVICE_PARAMS =
+            new VirtualDeviceParams.Builder().build();
+
+    @Rule
+    public AdoptShellPermissionsRule mAdoptShellPermissionsRule = new AdoptShellPermissionsRule(
+            InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+            ACTIVITY_EMBEDDING,
+            ADD_ALWAYS_UNLOCKED_DISPLAY,
+            ADD_TRUSTED_DISPLAY,
+            CREATE_VIRTUAL_DEVICE,
+            REAL_GET_TASKS,
+            WAKE_LOCK);
+
+    @Rule
+    public FakeAssociationRule mFakeAssociationRule = new FakeAssociationRule();
+
+    private VirtualDeviceManager mVirtualDeviceManager;
+    @Nullable private VirtualDevice mVirtualDevice;
+    @Mock
+    private VirtualDisplay.Callback mVirtualDisplayCallback;
+    @Mock
+    private OnReceiveResultListener mOnReceiveResultListener;
+    private ResultReceiver mResultReceiver;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        Context context = getApplicationContext();
+        mVirtualDeviceManager = context.getSystemService(VirtualDeviceManager.class);
+        mResultReceiver = createResultReceiver(mOnReceiveResultListener);
+    }
+
+    @After
+    public void tearDown() {
+        if (mVirtualDevice != null) {
+            mVirtualDevice.close();
+        }
+    }
+
+    @Test
+    public void nonTrustedDisplay_startNonEmbeddableActivity_shouldThrowSecurityException() {
+        VirtualDisplay virtualDisplay = createVirtualDisplay(DEFAULT_VIRTUAL_DEVICE_PARAMS,
+                /* virtualDisplayFlags= */ 0);
+
+        Intent intent = TestAppHelper.createNoEmbedIntent()
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        assertThrows(SecurityException.class, () ->
+                InstrumentationRegistry.getInstrumentation().getTargetContext()
+                        .startActivity(intent, createActivityOptions(virtualDisplay)));
+    }
+
+    @Test
+    public void cannotDisplayOnRemoteActivity_shouldBeBlockedFromLaunching() {
+        VirtualDisplay virtualDisplay = createVirtualDisplay(DEFAULT_VIRTUAL_DEVICE_PARAMS,
+                /* virtualDisplayFlags= */ 0);
+
+        EmptyActivity emptyActivity = (EmptyActivity) InstrumentationRegistry.getInstrumentation()
+                .startActivitySync(
+                        new Intent(getApplicationContext(), EmptyActivity.class)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                                        | Intent.FLAG_ACTIVITY_CLEAR_TASK),
+                        createActivityOptions(virtualDisplay));
+
+        emptyActivity.startActivity(TestAppHelper.createCannotDisplayOnRemoteIntent(
+                /* newTask= */ true, mResultReceiver));
+        verify(mOnReceiveResultListener, after(3000).never())
+                .onReceiveResult(anyInt(), any());
+
+        emptyActivity.startActivity(TestAppHelper.createCannotDisplayOnRemoteIntent(
+                /* newTask= */ false, mResultReceiver));
+        verify(mOnReceiveResultListener, after(3000).never())
+                .onReceiveResult(anyInt(), any());
+    }
+
+    @Test
+    public void trustedDisplay_startNonEmbeddableActivity_shouldSucceed() {
+        VirtualDisplay virtualDisplay = createVirtualDisplay(DEFAULT_VIRTUAL_DEVICE_PARAMS,
+                DisplayManager.VIRTUAL_DISPLAY_FLAG_TRUSTED);
+
+        Intent intent = TestAppHelper.createActivityLaunchedReceiverIntent(mResultReceiver)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        InstrumentationRegistry.getInstrumentation().getTargetContext()
+                .startActivity(intent, createActivityOptions(virtualDisplay));
+
+        verify(mOnReceiveResultListener, timeout(3000)).onReceiveResult(
+                eq(Activity.RESULT_OK),
+                argThat(result ->
+                        result.getInt(TestAppHelper.EXTRA_DISPLAY)
+                                == virtualDisplay.getDisplay().getDisplayId()));
+    }
+
+    @Test
+    public void setAllowedActivities_shouldBlockNonAllowedActivities() {
+        Context context = getApplicationContext();
+        ComponentName emptyActivityComponentName = new ComponentName(context, EmptyActivity.class);
+        VirtualDisplay virtualDisplay = createVirtualDisplay(new VirtualDeviceParams.Builder()
+                        .setAllowedActivities(Set.of(emptyActivityComponentName))
+                        .build(),
+                /* virtualDisplayFlags= */ 0);
+
+        EmptyActivity emptyActivity = (EmptyActivity) InstrumentationRegistry.getInstrumentation()
+                .startActivitySync(
+                        new Intent().setComponent(emptyActivityComponentName)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                                        | Intent.FLAG_ACTIVITY_CLEAR_TASK),
+                        createActivityOptions(virtualDisplay));
+
+        emptyActivity.startActivity(
+                TestAppHelper.createActivityLaunchedReceiverIntent(mResultReceiver));
+
+        verify(mOnReceiveResultListener, after(3000).never())
+                .onReceiveResult(anyInt(), any());
+    }
+
+    @Test
+    public void setBlockedActivities_shouldBlockActivityFromLaunching() {
+        Context context = getApplicationContext();
+        ComponentName emptyActivityComponentName = new ComponentName(context, EmptyActivity.class);
+        VirtualDisplay virtualDisplay = createVirtualDisplay(new VirtualDeviceParams.Builder()
+                        .setBlockedActivities(Set.of(TestAppHelper.MAIN_ACTIVITY_COMPONENT))
+                        .build(),
+                /* virtualDisplayFlags= */ 0);
+
+        EmptyActivity emptyActivity = (EmptyActivity) InstrumentationRegistry.getInstrumentation()
+                .startActivitySync(
+                        new Intent().setComponent(emptyActivityComponentName)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                                        | Intent.FLAG_ACTIVITY_CLEAR_TASK),
+                        createActivityOptions(virtualDisplay));
+
+        emptyActivity.startActivity(
+                TestAppHelper.createActivityLaunchedReceiverIntent(mResultReceiver));
+
+        verify(mOnReceiveResultListener, after(3000).never())
+                .onReceiveResult(anyInt(), any());
+    }
+
+    private VirtualDisplay createVirtualDisplay(@NonNull VirtualDeviceParams virtualDeviceParams,
+            int virtualDisplayFlags) {
+        mVirtualDevice = mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(), virtualDeviceParams);
+        ImageReader reader = ImageReader.newInstance(/* width= */ 100, /* height= */ 100,
+                PixelFormat.RGBA_8888, /* maxImages= */ 1);
+        return mVirtualDevice.createVirtualDisplay(
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 240,
+                reader.getSurface(),
+                virtualDisplayFlags,
+                Runnable::run,
+                mVirtualDisplayCallback);
+    }
+}
+
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/ActivityManagementTest.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/ActivityManagementTest.java
new file mode 100644
index 0000000..344cccc
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/ActivityManagementTest.java
@@ -0,0 +1,327 @@
+/*
+ * Copyright (C) 2021 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 android.virtualdevice.cts;
+
+import static android.Manifest.permission.ACTIVITY_EMBEDDING;
+import static android.Manifest.permission.ADD_ALWAYS_UNLOCKED_DISPLAY;
+import static android.Manifest.permission.ADD_TRUSTED_DISPLAY;
+import static android.Manifest.permission.CREATE_VIRTUAL_DEVICE;
+import static android.Manifest.permission.WAKE_LOCK;
+import static android.virtualdevice.cts.util.VirtualDeviceTestUtils.createActivityOptions;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.Mockito.after;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+
+import android.annotation.Nullable;
+import android.app.Activity;
+import android.app.PendingIntent;
+import android.companion.virtual.VirtualDeviceManager;
+import android.companion.virtual.VirtualDeviceManager.ActivityListener;
+import android.companion.virtual.VirtualDeviceManager.VirtualDevice;
+import android.companion.virtual.VirtualDeviceParams;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.hardware.display.VirtualDisplay;
+import android.os.Bundle;
+import android.os.ResultReceiver;
+import android.platform.test.annotations.AppModeFull;
+import android.virtualdevice.cts.util.EmptyActivity;
+import android.virtualdevice.cts.util.FakeAssociationRule;
+import android.virtualdevice.cts.util.TestAppHelper;
+import android.virtualdevice.cts.util.TestAppHelper.ServiceConnectionFuture;
+import android.virtualdevice.cts.util.VirtualDeviceTestUtils;
+import android.virtualdevice.cts.util.VirtualDeviceTestUtils.OnReceiveResultListener;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.AdoptShellPermissionsRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.TimeUnit;
+import java.util.function.IntConsumer;
+
+/**
+ * Tests for activity management, like launching and listening to activity change events, in the
+ * virtual device.
+ */
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = "VirtualDeviceManager cannot be accessed by instant apps")
+public class ActivityManagementTest {
+
+    private static final VirtualDeviceParams DEFAULT_VIRTUAL_DEVICE_PARAMS =
+            new VirtualDeviceParams.Builder().build();
+
+    @Rule
+    public AdoptShellPermissionsRule mAdoptShellPermissionsRule = new AdoptShellPermissionsRule(
+            InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+            ACTIVITY_EMBEDDING,
+            ADD_ALWAYS_UNLOCKED_DISPLAY,
+            ADD_TRUSTED_DISPLAY,
+            CREATE_VIRTUAL_DEVICE,
+            WAKE_LOCK);
+
+    @Rule
+    public FakeAssociationRule mFakeAssociationRule = new FakeAssociationRule();
+
+    private VirtualDeviceManager mVirtualDeviceManager;
+    @Nullable private VirtualDevice mVirtualDevice;
+    @Mock
+    private VirtualDisplay.Callback mVirtualDisplayCallback;
+    @Mock
+    private IntConsumer mLaunchCompleteListener;
+    @Nullable private ServiceConnectionFuture<IStreamedTestApp> mServiceConnection;
+    @Mock
+    private OnReceiveResultListener mOnReceiveResultListener;
+    private ResultReceiver mResultReceiver;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        Context context = getApplicationContext();
+        mVirtualDeviceManager = context.getSystemService(VirtualDeviceManager.class);
+        mResultReceiver = VirtualDeviceTestUtils.createResultReceiver(mOnReceiveResultListener);
+    }
+
+    @After
+    public void tearDown() {
+        try {
+            if (mServiceConnection != null) {
+                getApplicationContext().unbindService(mServiceConnection);
+            }
+        } catch (IllegalArgumentException e) {
+            // Ignore if the service failed to bind
+        }
+        if (mVirtualDevice != null) {
+            mVirtualDevice.close();
+        }
+    }
+
+    @Test
+    public void activityListener_shouldCallOnExecutor() {
+        Context context = getApplicationContext();
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS);
+        ActivityListener activityListener = mock(ActivityListener.class);
+        Executor mockExecutor = mock(Executor.class);
+        mVirtualDevice.addActivityListener(mockExecutor, activityListener);
+        VirtualDisplay virtualDisplay = mVirtualDevice.createVirtualDisplay(
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 240,
+                /* surface= */ null,
+                /* flags= */ 0,
+                Runnable::run,
+                mVirtualDisplayCallback);
+        InstrumentationRegistry.getInstrumentation()
+                .startActivitySync(
+                        new Intent(context, EmptyActivity.class)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                                        | Intent.FLAG_ACTIVITY_CLEAR_TASK),
+                        createActivityOptions(virtualDisplay));
+
+        // Callback should not be called yet since the executor is mocked
+        verify(activityListener, never()).onTopActivityChanged(
+                eq(virtualDisplay.getDisplay().getDisplayId()),
+                eq(new ComponentName(context, EmptyActivity.class)));
+
+        ArgumentCaptor<Runnable> runnableCaptor = ArgumentCaptor.forClass(Runnable.class);
+        verify(mockExecutor).execute(runnableCaptor.capture());
+
+        runnableCaptor.getValue().run();
+        verify(activityListener).onTopActivityChanged(
+                eq(virtualDisplay.getDisplay().getDisplayId()),
+                eq(new ComponentName(context, EmptyActivity.class)));
+    }
+
+    @Test
+    public void removeActivityListener_shouldStopCallbacks() {
+        Context context = getApplicationContext();
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS);
+        ActivityListener activityListener = mock(ActivityListener.class);
+        mVirtualDevice.addActivityListener(context.getMainExecutor(), activityListener);
+        VirtualDisplay virtualDisplay = mVirtualDevice.createVirtualDisplay(
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 240,
+                /* surface= */ null,
+                /* flags= */ 0,
+                Runnable::run,
+                mVirtualDisplayCallback);
+        EmptyActivity emptyActivity = (EmptyActivity) InstrumentationRegistry.getInstrumentation()
+                .startActivitySync(
+                        new Intent(context, EmptyActivity.class)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                                        | Intent.FLAG_ACTIVITY_CLEAR_TASK),
+                        createActivityOptions(virtualDisplay));
+
+        verify(activityListener).onTopActivityChanged(
+                eq(virtualDisplay.getDisplay().getDisplayId()),
+                eq(new ComponentName(context, EmptyActivity.class)));
+
+
+        mVirtualDevice.removeActivityListener(activityListener);
+        emptyActivity.finish();
+
+        verifyNoMoreInteractions(activityListener);
+    }
+
+    @Test
+    public void activityListener_shouldCallOnTopActivityChange() {
+        Context context = getApplicationContext();
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS);
+        ActivityListener activityListener = mock(ActivityListener.class);
+        mVirtualDevice.addActivityListener(context.getMainExecutor(), activityListener);
+        VirtualDisplay virtualDisplay = mVirtualDevice.createVirtualDisplay(
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 240,
+                /* surface= */ null,
+                /* flags= */ 0,
+                Runnable::run,
+                mVirtualDisplayCallback);
+        EmptyActivity emptyActivity = (EmptyActivity) InstrumentationRegistry.getInstrumentation()
+                .startActivitySync(
+                        new Intent(context, EmptyActivity.class)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                                        | Intent.FLAG_ACTIVITY_CLEAR_TASK),
+                        createActivityOptions(virtualDisplay));
+
+        verify(activityListener).onTopActivityChanged(
+                eq(virtualDisplay.getDisplay().getDisplayId()),
+                eq(new ComponentName(context, EmptyActivity.class)));
+
+        emptyActivity.finish();
+
+        verify(activityListener, timeout(3000))
+                .onDisplayEmpty(eq(virtualDisplay.getDisplay().getDisplayId()));
+    }
+
+    @Test
+    public void launchPendingIntent_activityIntent_shouldLaunchActivity() throws Exception {
+        PendingIntent pendingIntent = getTestAppService()
+                .createActivityPendingIntent(mResultReceiver);
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS);
+        VirtualDisplay virtualDisplay = mVirtualDevice.createVirtualDisplay(
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 240,
+                /* surface= */ null,
+                /* flags= */ 0,
+                Runnable::run,
+                mVirtualDisplayCallback);
+
+        mVirtualDevice.launchPendingIntent(virtualDisplay.getDisplay().getDisplayId(),
+                pendingIntent, Runnable::run, mLaunchCompleteListener);
+
+        verify(mOnReceiveResultListener, timeout(5000)).onReceiveResult(
+                eq(Activity.RESULT_OK), nullable(Bundle.class));
+        verify(mLaunchCompleteListener).accept(eq(VirtualDeviceManager.LAUNCH_SUCCESS));
+    }
+
+    @Test
+    public void launchPendingIntent_serviceIntent_shouldLaunchTrampolineActivity()
+            throws Exception {
+        PendingIntent pendingIntent = getTestAppService()
+                .createServicePendingIntent(/* trampoline= */ true, mResultReceiver);
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS);
+        VirtualDisplay virtualDisplay = mVirtualDevice.createVirtualDisplay(
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 240,
+                /* surface= */ null,
+                /* flags= */ 0,
+                Runnable::run,
+                mVirtualDisplayCallback);
+
+        mVirtualDevice.launchPendingIntent(
+                virtualDisplay.getDisplay().getDisplayId(),
+                pendingIntent, Runnable::run,
+                mLaunchCompleteListener);
+
+        verify(mOnReceiveResultListener, timeout(5000)).onReceiveResult(
+                eq(Activity.RESULT_OK), nullable(Bundle.class));
+        verify(mLaunchCompleteListener).accept(eq(VirtualDeviceManager.LAUNCH_SUCCESS));
+    }
+
+    @Test
+    public void launchPendingIntent_serviceIntentNoTrampoline_shouldBeNoOp()
+            throws Exception {
+        PendingIntent pendingIntent = getTestAppService()
+                .createServicePendingIntent(/* trampoline=*/ false, mResultReceiver);
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS);
+        VirtualDisplay virtualDisplay = mVirtualDevice.createVirtualDisplay(
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 240,
+                /* surface= */ null,
+                /* flags= */ 0,
+                Runnable::run,
+                mVirtualDisplayCallback);
+
+        mVirtualDevice.launchPendingIntent(
+                virtualDisplay.getDisplay().getDisplayId(),
+                pendingIntent,
+                Runnable::run,
+                mLaunchCompleteListener);
+
+        verify(mOnReceiveResultListener, after(5000).never()).onReceiveResult(
+                eq(Activity.RESULT_OK), nullable(Bundle.class));
+        verify(mLaunchCompleteListener).accept(eq(VirtualDeviceManager.LAUNCH_FAILURE_NO_ACTIVITY));
+    }
+
+    private IStreamedTestApp getTestAppService() throws Exception {
+        mServiceConnection = TestAppHelper.createTestAppService();
+        return mServiceConnection.getFuture().get(10, TimeUnit.SECONDS);
+    }
+}
+
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/CreateVirtualDisplayTest.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/CreateVirtualDisplayTest.java
new file mode 100644
index 0000000..13fe872
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/CreateVirtualDisplayTest.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright (C) 2021 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 android.virtualdevice.cts;
+
+import static android.Manifest.permission.ACTIVITY_EMBEDDING;
+import static android.Manifest.permission.ADD_ALWAYS_UNLOCKED_DISPLAY;
+import static android.Manifest.permission.ADD_TRUSTED_DISPLAY;
+import static android.Manifest.permission.CREATE_VIRTUAL_DEVICE;
+import static android.Manifest.permission.WAKE_LOCK;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.assertThrows;
+
+import android.annotation.Nullable;
+import android.companion.virtual.VirtualDeviceManager;
+import android.companion.virtual.VirtualDeviceManager.VirtualDevice;
+import android.companion.virtual.VirtualDeviceParams;
+import android.content.Context;
+import android.hardware.display.VirtualDisplay;
+import android.platform.test.annotations.AppModeFull;
+import android.view.Display;
+import android.virtualdevice.cts.util.FakeAssociationRule;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.AdoptShellPermissionsRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = " cannot be accessed by instant apps")
+public class CreateVirtualDisplayTest {
+
+    private static final VirtualDeviceParams DEFAULT_VIRTUAL_DEVICE_PARAMS =
+            new VirtualDeviceParams.Builder().build();
+
+    @Rule
+    public AdoptShellPermissionsRule mAdoptShellPermissionsRule = new AdoptShellPermissionsRule(
+            InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+            ACTIVITY_EMBEDDING,
+            ADD_ALWAYS_UNLOCKED_DISPLAY,
+            ADD_TRUSTED_DISPLAY,
+            CREATE_VIRTUAL_DEVICE,
+            WAKE_LOCK);
+
+    @Rule
+    public FakeAssociationRule mFakeAssociationRule = new FakeAssociationRule();
+
+    private VirtualDeviceManager mVirtualDeviceManager;
+    @Nullable
+    private VirtualDevice mVirtualDevice;
+    @Mock
+    private VirtualDisplay.Callback mVirtualDisplayCallback;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        Context context = getApplicationContext();
+        mVirtualDeviceManager = context.getSystemService(VirtualDeviceManager.class);
+    }
+
+    @After
+    public void tearDown() {
+        if (mVirtualDevice != null) {
+            mVirtualDevice.close();
+        }
+    }
+
+    @Test
+    public void createVirtualDisplay_shouldNotBeNull() {
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS);
+        VirtualDisplay virtualDisplay = mVirtualDevice.createVirtualDisplay(
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 240,
+                /* surface= */ null,
+                /* flags= */ 0,
+                Runnable::run,
+                mVirtualDisplayCallback);
+        assertThat(virtualDisplay).isNotNull();
+        int displayFlags = virtualDisplay.getDisplay().getFlags();
+        assertWithMessage(
+                String.format(
+                        "Virtual display flags (0x%x) should contain FLAG_OWN_DISPLAY_GROUP",
+                        displayFlags))
+                .that(displayFlags & Display.FLAG_OWN_DISPLAY_GROUP)
+                .isNotEqualTo(0);
+    }
+
+    @Ignore("Need allow_always_unlocked_virtual_displays flag to be on by default")
+    @Test
+    public void createVirtualDisplay_alwaysUnlocked_shouldSpecifyFlagInVirtualDisplays() {
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        new VirtualDeviceParams.Builder()
+                                .setLockState(VirtualDeviceParams.LOCK_STATE_ALWAYS_UNLOCKED)
+                                .build());
+        VirtualDisplay virtualDisplay = mVirtualDevice.createVirtualDisplay(
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 240,
+                /* surface= */ null,
+                /* flags= */ 0,
+                Runnable::run,
+                mVirtualDisplayCallback);
+        assertThat(virtualDisplay).isNotNull();
+        int displayFlags = virtualDisplay.getDisplay().getFlags();
+        assertWithMessage(
+                String.format(
+                        "Virtual display flags (0x%x) should contain FLAG_ALWAYS_UNLOCKED",
+                        displayFlags))
+                .that(displayFlags & Display.FLAG_ALWAYS_UNLOCKED)
+                .isNotEqualTo(0);
+    }
+
+    @Test
+    public void createVirtualDisplay_nullExecutorAndCallback_shouldSucceed() {
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS);
+        VirtualDisplay virtualDisplay = mVirtualDevice.createVirtualDisplay(
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 240,
+                /* surface= */ null,
+                /* flags= */ 0,
+                /* executor= */ null,
+                /* callback= */ null);
+        assertThat(virtualDisplay).isNotNull();
+    }
+
+    @Test
+    public void createVirtualDisplay_nullExecutorButNonNullCallback_shouldThrow() {
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS);
+
+        assertThrows(NullPointerException.class, () ->
+                mVirtualDevice.createVirtualDisplay(
+                        /* width= */ 100,
+                        /* height= */ 100,
+                        /* densityDpi= */ 240,
+                        /* surface= */ null,
+                        /* flags= */ 0,
+                        /* executor= */ null,
+                        mVirtualDisplayCallback));
+    }
+}
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/DefaultDisplayIsDeviceSecureTest.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/DefaultDisplayIsDeviceSecureTest.java
new file mode 100644
index 0000000..539017b
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/DefaultDisplayIsDeviceSecureTest.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.cts;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+
+import android.app.Activity;
+import android.app.KeyguardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.platform.test.annotations.AppModeFull;
+import android.virtualdevice.cts.util.EmptyActivity;
+import android.virtualdevice.cts.util.TestAppHelper;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = "KeyguardManager cannot be accessed by instant apps")
+public class DefaultDisplayIsDeviceSecureTest {
+
+    @Test
+    public void isDeviceSecure_checkReturnValuesOnDefaultDisplay() {
+        Context context = getApplicationContext();
+        KeyguardManager km = context.getSystemService(KeyguardManager.class);
+        boolean isKeyguardSecure = km.isKeyguardSecure();
+
+        EmptyActivity activity = (EmptyActivity) InstrumentationRegistry.getInstrumentation()
+                .startActivitySync(
+                        new Intent(context, EmptyActivity.class)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                                        | Intent.FLAG_ACTIVITY_CLEAR_TASK));
+
+        EmptyActivity.Callback callback = mock(EmptyActivity.Callback.class);
+        activity.setCallback(callback);
+
+        int requestCode = 1;
+        activity.startActivityForResult(
+                TestAppHelper.createKeyguardManagerIsDeviceSecureTestIntent(),
+                requestCode);
+
+        ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
+        verify(callback, timeout(5000)).onActivityResult(
+                eq(requestCode), eq(Activity.RESULT_OK), intentArgumentCaptor.capture());
+        Intent resultData = intentArgumentCaptor.getValue();
+        activity.finish();
+
+        assertThat(resultData).isNotNull();
+        boolean isDeviceSecure = resultData.getBooleanExtra(
+                TestAppHelper.EXTRA_IS_DEVICE_SECURE, false);
+        assertThat(isDeviceSecure).isEqualTo(isKeyguardSecure);
+    }
+}
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/StreamedAppBehaviorTest.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/StreamedAppBehaviorTest.java
new file mode 100644
index 0000000..205daae
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/StreamedAppBehaviorTest.java
@@ -0,0 +1,239 @@
+/*
+ * Copyright (C) 2021 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 android.virtualdevice.cts;
+
+import static android.Manifest.permission.ACTIVITY_EMBEDDING;
+import static android.Manifest.permission.ADD_TRUSTED_DISPLAY;
+import static android.Manifest.permission.CREATE_VIRTUAL_DEVICE;
+import static android.Manifest.permission.READ_CLIPBOARD_IN_BACKGROUND;
+import static android.Manifest.permission.WAKE_LOCK;
+import static android.virtualdevice.cts.util.VirtualDeviceTestUtils.createActivityOptions;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.TruthJUnit.assume;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+
+import android.annotation.Nullable;
+import android.app.Activity;
+import android.companion.virtual.VirtualDeviceManager;
+import android.companion.virtual.VirtualDeviceManager.ActivityListener;
+import android.companion.virtual.VirtualDeviceManager.VirtualDevice;
+import android.companion.virtual.VirtualDeviceParams;
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.hardware.camera2.CameraAccessException;
+import android.hardware.camera2.CameraDevice;
+import android.hardware.camera2.CameraManager;
+import android.hardware.display.VirtualDisplay;
+import android.platform.test.annotations.AppModeFull;
+import android.virtualdevice.cts.util.EmptyActivity;
+import android.virtualdevice.cts.util.FakeAssociationRule;
+import android.virtualdevice.cts.util.TestAppHelper;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.AdoptShellPermissionsRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = "VirtualDeviceManager cannot be accessed by instant apps")
+public class StreamedAppBehaviorTest {
+
+    private static final VirtualDeviceParams DEFAULT_VIRTUAL_DEVICE_PARAMS =
+            new VirtualDeviceParams.Builder().build();
+
+    @Rule
+    public AdoptShellPermissionsRule mAdoptShellPermissionsRule = new AdoptShellPermissionsRule(
+            InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+            ACTIVITY_EMBEDDING,
+            ADD_TRUSTED_DISPLAY,
+            CREATE_VIRTUAL_DEVICE,
+            READ_CLIPBOARD_IN_BACKGROUND,
+            WAKE_LOCK);
+
+    @Rule
+    public FakeAssociationRule mFakeAssociationRule = new FakeAssociationRule();
+
+    private VirtualDeviceManager mVirtualDeviceManager;
+    @Nullable private VirtualDevice mVirtualDevice;
+    @Nullable private VirtualDisplay mVirtualDisplay;
+    private Context mContext;
+    @Mock
+    private VirtualDisplay.Callback mVirtualDisplayCallback;
+    @Mock
+    private ActivityListener mActivityListener;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mContext = getApplicationContext();
+        mVirtualDeviceManager = mContext.getSystemService(VirtualDeviceManager.class);
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS);
+        mVirtualDevice.addActivityListener(mContext.getMainExecutor(), mActivityListener);
+        mVirtualDisplay = mVirtualDevice.createVirtualDisplay(
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 240,
+                /* surface= */ null,
+                /* flags= */ 0,
+                Runnable::run,
+                mVirtualDisplayCallback);
+    }
+
+    @After
+    public void tearDown() {
+        if (mVirtualDisplay != null) {
+            mVirtualDisplay.release();
+        }
+        if (mVirtualDevice != null) {
+            mVirtualDevice.close();
+        }
+    }
+
+    @Test
+    public void appsInVirtualDevice_shouldNotHaveAccessToClipboard() {
+        ClipboardManager clipboardManager = mContext.getSystemService(ClipboardManager.class);
+        clipboardManager.setPrimaryClip(
+                new ClipData(
+                        "CTS test clip",
+                        new String[] { "application/text" },
+                        new ClipData.Item("clipboard content from test")));
+
+        EmptyActivity activity = (EmptyActivity) InstrumentationRegistry.getInstrumentation()
+                .startActivitySync(
+                        new Intent(mContext, EmptyActivity.class)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                                        | Intent.FLAG_ACTIVITY_CLEAR_TASK),
+                        createActivityOptions(mVirtualDisplay));
+
+        EmptyActivity.Callback callback = mock(EmptyActivity.Callback.class);
+        activity.setCallback(callback);
+
+        int requestCode = 1;
+        activity.startActivityForResult(
+                TestAppHelper.createClipboardTestIntent("clipboard content from app"),
+                requestCode,
+                createActivityOptions(mVirtualDisplay));
+
+        ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
+        verify(callback, timeout(10000)).onActivityResult(
+                eq(requestCode), eq(Activity.RESULT_OK), intentArgumentCaptor.capture());
+        Intent resultData = intentArgumentCaptor.getValue();
+        // This is important to get us off of the virtual display so we can read the clipboard
+        activity.finish();
+
+        assertThat(resultData).isNotNull();
+        ClipData appReadClipData = resultData.getParcelableExtra("readClip");
+        assertThat(appReadClipData).isNull();
+        verify(mActivityListener, timeout(3000))
+                .onDisplayEmpty(eq(mVirtualDisplay.getDisplay().getDisplayId()));
+        assertThat(clipboardManager.getPrimaryClip().getItemAt(0).getText().toString())
+                .isEqualTo("clipboard content from test");
+    }
+
+    @Test
+    public void appsInVirtualDevice_shouldNotHaveAccessToCamera() throws CameraAccessException {
+        CameraManager manager = mContext.getSystemService(CameraManager.class);
+        String[] cameras = manager.getCameraIdList();
+        assume().that(cameras).isNotNull();
+
+        for (String cameraId : cameras) {
+            EmptyActivity activity =
+                    (EmptyActivity) InstrumentationRegistry.getInstrumentation()
+                            .startActivitySync(
+                                    new Intent(mContext, EmptyActivity.class)
+                                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                                                    | Intent.FLAG_ACTIVITY_CLEAR_TASK),
+                                    createActivityOptions(mVirtualDisplay));
+
+            EmptyActivity.Callback callback = mock(EmptyActivity.Callback.class);
+            activity.setCallback(callback);
+
+            int requestCode = 1;
+            activity.startActivityForResult(
+                    TestAppHelper.createCameraAccessTestIntent().putExtra(
+                            TestAppHelper.EXTRA_CAMERA_ID, cameraId),
+                    requestCode,
+                    createActivityOptions(mVirtualDisplay));
+
+            ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
+            verify(callback, timeout(10000)).onActivityResult(
+                    eq(requestCode), eq(Activity.RESULT_OK), intentArgumentCaptor.capture());
+            Intent resultData = intentArgumentCaptor.getValue();
+            activity.finish();
+
+            assertThat(resultData).isNotNull();
+            String result = resultData.getStringExtra(TestAppHelper.EXTRA_CAMERA_RESULT);
+            assertThat(result).isAnyOf("onDisconnected", "onError");
+            if (result.equals("onError")) {
+                int error = resultData.getIntExtra(TestAppHelper.EXTRA_CAMERA_ON_ERROR_CODE, -1);
+                assertThat(error).isEqualTo(CameraDevice.StateCallback.ERROR_CAMERA_DISABLED);
+            }
+        }
+    }
+
+    @Test
+    public void isDeviceSecure_shouldReturnFalseOnVirtualDisplay() {
+        EmptyActivity activity = (EmptyActivity) InstrumentationRegistry.getInstrumentation()
+                .startActivitySync(
+                        new Intent(mContext, EmptyActivity.class)
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK
+                                        | Intent.FLAG_ACTIVITY_CLEAR_TASK),
+                        createActivityOptions(mVirtualDisplay));
+
+        EmptyActivity.Callback callback = mock(EmptyActivity.Callback.class);
+        activity.setCallback(callback);
+
+        int requestCode = 1;
+        activity.startActivityForResult(
+                TestAppHelper.createKeyguardManagerIsDeviceSecureTestIntent(),
+                requestCode,
+                createActivityOptions(mVirtualDisplay));
+
+        ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
+        verify(callback, timeout(5000)).onActivityResult(
+                eq(requestCode), eq(Activity.RESULT_OK), intentArgumentCaptor.capture());
+        Intent resultData = intentArgumentCaptor.getValue();
+        // This is important to get us off of the virtual display
+        activity.finish();
+
+        assertThat(resultData).isNotNull();
+        boolean isDeviceSecure = resultData.getBooleanExtra(
+                TestAppHelper.EXTRA_IS_DEVICE_SECURE, true);
+        assertThat(isDeviceSecure).isFalse();
+    }
+}
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/VirtualAudioTest.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/VirtualAudioTest.java
new file mode 100644
index 0000000..d39ee52
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/VirtualAudioTest.java
@@ -0,0 +1,517 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.cts;
+
+import static android.Manifest.permission.ACTIVITY_EMBEDDING;
+import static android.Manifest.permission.ADD_ALWAYS_UNLOCKED_DISPLAY;
+import static android.Manifest.permission.ADD_TRUSTED_DISPLAY;
+import static android.Manifest.permission.CAPTURE_AUDIO_OUTPUT;
+import static android.Manifest.permission.CREATE_VIRTUAL_DEVICE;
+import static android.Manifest.permission.MODIFY_AUDIO_ROUTING;
+import static android.Manifest.permission.REAL_GET_TASKS;
+import static android.Manifest.permission.WAKE_LOCK;
+import static android.hardware.display.DisplayManager.VIRTUAL_DISPLAY_FLAG_TRUSTED;
+import static android.media.AudioFormat.CHANNEL_IN_MONO;
+import static android.media.AudioFormat.ENCODING_PCM_16BIT;
+import static android.media.AudioFormat.ENCODING_PCM_FLOAT;
+import static android.media.AudioRecord.READ_BLOCKING;
+import static android.media.AudioRecord.RECORDSTATE_RECORDING;
+import static android.media.AudioRecord.RECORDSTATE_STOPPED;
+import static android.media.AudioTrack.PLAYSTATE_PLAYING;
+import static android.media.AudioTrack.PLAYSTATE_STOPPED;
+import static android.media.AudioTrack.WRITE_BLOCKING;
+import static android.media.AudioTrack.WRITE_NON_BLOCKING;
+import static android.virtualdevice.cts.common.ActivityResultReceiver.EXTRA_LAST_RECORDED_NONZERO_VALUE;
+import static android.virtualdevice.cts.common.ActivityResultReceiver.EXTRA_POWER_SPECTRUM_AT_FREQUENCY;
+import static android.virtualdevice.cts.common.ActivityResultReceiver.EXTRA_POWER_SPECTRUM_NOT_FREQUENCY;
+import static android.virtualdevice.cts.common.AudioHelper.ACTION_PLAY_AUDIO;
+import static android.virtualdevice.cts.common.AudioHelper.ACTION_RECORD_AUDIO;
+import static android.virtualdevice.cts.common.AudioHelper.AMPLITUDE;
+import static android.virtualdevice.cts.common.AudioHelper.BUFFER_SIZE_IN_BYTES;
+import static android.virtualdevice.cts.common.AudioHelper.BYTE_ARRAY;
+import static android.virtualdevice.cts.common.AudioHelper.BYTE_BUFFER;
+import static android.virtualdevice.cts.common.AudioHelper.BYTE_VALUE;
+import static android.virtualdevice.cts.common.AudioHelper.CHANNEL_COUNT;
+import static android.virtualdevice.cts.common.AudioHelper.EXTRA_AUDIO_DATA_TYPE;
+import static android.virtualdevice.cts.common.AudioHelper.FLOAT_ARRAY;
+import static android.virtualdevice.cts.common.AudioHelper.FLOAT_VALUE;
+import static android.virtualdevice.cts.common.AudioHelper.FREQUENCY;
+import static android.virtualdevice.cts.common.AudioHelper.NUMBER_OF_SAMPLES;
+import static android.virtualdevice.cts.common.AudioHelper.SAMPLE_RATE;
+import static android.virtualdevice.cts.common.AudioHelper.SHORT_ARRAY;
+import static android.virtualdevice.cts.common.AudioHelper.SHORT_VALUE;
+import static android.virtualdevice.cts.util.TestAppHelper.MAIN_ACTIVITY_COMPONENT;
+import static android.virtualdevice.cts.util.VirtualDeviceTestUtils.createActivityOptions;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+
+import android.companion.virtual.VirtualDeviceManager;
+import android.companion.virtual.VirtualDeviceManager.VirtualDevice;
+import android.companion.virtual.VirtualDeviceParams;
+import android.companion.virtual.audio.AudioCapture;
+import android.companion.virtual.audio.AudioInjection;
+import android.companion.virtual.audio.VirtualAudioDevice;
+import android.companion.virtual.audio.VirtualAudioDevice.AudioConfigurationChangeCallback;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.hardware.display.VirtualDisplay;
+import android.media.AudioFormat;
+import android.platform.test.annotations.AppModeFull;
+import android.virtualdevice.cts.common.ActivityResultReceiver;
+import android.virtualdevice.cts.common.AudioHelper;
+import android.virtualdevice.cts.util.FakeAssociationRule;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.AdoptShellPermissionsRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+/**
+ * Tests for injection and capturing of audio from streamed apps
+ */
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = "VirtualDeviceManager cannot be accessed by instant apps")
+public class VirtualAudioTest {
+    /**
+     * Captured signal should be mostly single frequency and power of that frequency should be
+     * over this much of total power.
+     */
+    public static final double POWER_THRESHOLD_FOR_PRESENT = 0.4f;
+
+    /**
+     * The other signals should have very weak power and should not exceed this value
+     */
+    public static final double POWER_THRESHOLD_FOR_ABSENT = 0.02f;
+
+    private static final VirtualDeviceParams DEFAULT_VIRTUAL_DEVICE_PARAMS =
+            new VirtualDeviceParams.Builder().build();
+
+    @Rule
+    public AdoptShellPermissionsRule mAdoptShellPermissionsRule = new AdoptShellPermissionsRule(
+            InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+            ACTIVITY_EMBEDDING,
+            ADD_ALWAYS_UNLOCKED_DISPLAY,
+            ADD_TRUSTED_DISPLAY,
+            CREATE_VIRTUAL_DEVICE,
+            REAL_GET_TASKS,
+            WAKE_LOCK,
+            MODIFY_AUDIO_ROUTING,
+            CAPTURE_AUDIO_OUTPUT);
+    @Rule
+    public FakeAssociationRule mFakeAssociationRule = new FakeAssociationRule();
+
+    private VirtualDevice mVirtualDevice;
+    private VirtualDisplay mVirtualDisplay;
+    private VirtualAudioDevice mVirtualAudioDevice;
+
+    @Mock
+    private VirtualDisplay.Callback mVirtualDisplayCallback;
+    @Mock
+    private AudioConfigurationChangeCallback mAudioConfigurationChangeCallback;
+    @Mock
+    private ActivityResultReceiver.Callback mActivityResultCallback;
+    @Captor
+    private ArgumentCaptor<Intent> mIntentCaptor;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        Context context = getApplicationContext();
+        assumeTrue(
+                context.getPackageManager()
+                        .hasSystemFeature(PackageManager.FEATURE_COMPANION_DEVICE_SETUP));
+
+        VirtualDeviceManager vdm = context.getSystemService(VirtualDeviceManager.class);
+        mVirtualDevice = vdm.createVirtualDevice(
+                mFakeAssociationRule.getAssociationInfo().getId(),
+                DEFAULT_VIRTUAL_DEVICE_PARAMS);
+        mVirtualDisplay = mVirtualDevice.createVirtualDisplay(
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 240,
+                /* surface= */ null,
+                /* flags= */ VIRTUAL_DISPLAY_FLAG_TRUSTED,
+                Runnable::run,
+                mVirtualDisplayCallback);
+    }
+
+    @After
+    public void tearDown() {
+        if (mVirtualDevice != null) {
+            mVirtualDevice.close();
+        }
+        if (mVirtualDisplay != null) {
+            mVirtualDisplay.release();
+        }
+        if (mVirtualAudioDevice != null) {
+            mVirtualAudioDevice.close();
+        }
+    }
+
+    @Test
+    public void audioCapture_createCorrectly() {
+        mVirtualAudioDevice = mVirtualDevice.createVirtualAudioDevice(
+                mVirtualDisplay, /* executor= */ null, /* callback= */ null);
+        AudioFormat audioFormat = createCaptureFormat(ENCODING_PCM_16BIT);
+        AudioCapture audioCapture = mVirtualAudioDevice.startAudioCapture(audioFormat);
+        assertThat(audioCapture).isNotNull();
+        assertThat(audioCapture.getFormat()).isEqualTo(audioFormat);
+        assertThat(mVirtualAudioDevice.getAudioCapture()).isEqualTo(audioCapture);
+
+        audioCapture.startRecording();
+        assertThat(audioCapture.getRecordingState()).isEqualTo(RECORDSTATE_RECORDING);
+        audioCapture.stop();
+        assertThat(audioCapture.getRecordingState()).isEqualTo(RECORDSTATE_STOPPED);
+    }
+
+    @Test
+    public void audioInjection_createCorrectly() {
+        mVirtualAudioDevice = mVirtualDevice.createVirtualAudioDevice(
+                mVirtualDisplay, /* executor= */ null, /* callback= */ null);
+        AudioFormat audioFormat = createInjectionFormat(ENCODING_PCM_16BIT);
+        AudioInjection audioInjection = mVirtualAudioDevice.startAudioInjection(audioFormat);
+        assertThat(audioInjection).isNotNull();
+        assertThat(audioInjection.getFormat()).isEqualTo(audioFormat);
+        assertThat(mVirtualAudioDevice.getAudioInjection()).isEqualTo(audioInjection);
+
+        audioInjection.play();
+        assertThat(audioInjection.getPlayState()).isEqualTo(PLAYSTATE_PLAYING);
+        audioInjection.stop();
+        assertThat(audioInjection.getPlayState()).isEqualTo(PLAYSTATE_STOPPED);
+    }
+
+    @Test
+    public void audioCapture_receivesAudioConfigurationChangeCallback() {
+        mVirtualAudioDevice = mVirtualDevice.createVirtualAudioDevice(
+                mVirtualDisplay, /* executor= */ null, mAudioConfigurationChangeCallback);
+        AudioFormat audioFormat = createCaptureFormat(ENCODING_PCM_16BIT);
+        mVirtualAudioDevice.startAudioCapture(audioFormat);
+
+        ActivityResultReceiver activityResultReceiver = new ActivityResultReceiver(
+                getApplicationContext());
+        activityResultReceiver.register(mActivityResultCallback);
+        InstrumentationRegistry.getInstrumentation().getTargetContext().startActivity(
+                createPlayAudioIntent(BYTE_BUFFER),
+                createActivityOptions(mVirtualDisplay));
+        verify(mAudioConfigurationChangeCallback, timeout(5000).atLeastOnce())
+                .onPlaybackConfigChanged(any());
+        verify(mActivityResultCallback, timeout(5000)).onActivityResult(
+                mIntentCaptor.capture());
+        activityResultReceiver.unregister();
+    }
+
+    @Test
+    public void audioInjection_receivesAudioConfigurationChangeCallback() {
+        mVirtualAudioDevice = mVirtualDevice.createVirtualAudioDevice(
+                mVirtualDisplay, /* executor= */ null, mAudioConfigurationChangeCallback);
+        AudioFormat audioFormat = createInjectionFormat(ENCODING_PCM_16BIT);
+        mVirtualAudioDevice.startAudioInjection(audioFormat);
+
+        ActivityResultReceiver activityResultReceiver = new ActivityResultReceiver(
+                getApplicationContext());
+        activityResultReceiver.register(mActivityResultCallback);
+        InstrumentationRegistry.getInstrumentation().getTargetContext().startActivity(
+                createAudioRecordIntent(BYTE_BUFFER),
+                createActivityOptions(mVirtualDisplay));
+        verify(mAudioConfigurationChangeCallback, timeout(5000).atLeastOnce())
+                .onRecordingConfigChanged(any());
+        verify(mActivityResultCallback, timeout(5000)).onActivityResult(
+                mIntentCaptor.capture());
+        activityResultReceiver.unregister();
+    }
+
+    @Test
+    public void audioCapture_readByteBuffer_shouldCaptureAppPlaybackFrequency() {
+        runAudioCaptureTest(BYTE_BUFFER, /* readMode= */ -1);
+    }
+
+    @Test
+    public void audioCapture_readByteBufferBlocking_shouldCaptureAppPlaybackFrequency() {
+        runAudioCaptureTest(BYTE_BUFFER, /* readMode= */ READ_BLOCKING);
+    }
+
+    @Test
+    public void audioCapture_readByteArray_shouldCaptureAppPlaybackData() {
+        runAudioCaptureTest(BYTE_ARRAY, /* readMode= */ -1);
+    }
+
+    @Test
+    public void audioCapture_readByteArrayBlocking_shouldCaptureAppPlaybackData() {
+        runAudioCaptureTest(BYTE_ARRAY, /* readMode= */ READ_BLOCKING);
+    }
+
+    @Test
+    public void audioCapture_readShortArray_shouldCaptureAppPlaybackData() {
+        runAudioCaptureTest(SHORT_ARRAY, /* readMode= */ -1);
+    }
+
+    @Test
+    public void audioCapture_readShortArrayBlocking_shouldCaptureAppPlaybackData() {
+        runAudioCaptureTest(SHORT_ARRAY, /* readMode= */ READ_BLOCKING);
+    }
+
+    @Test
+    public void audioCapture_readFloatArray_shouldCaptureAppPlaybackData() {
+        runAudioCaptureTest(FLOAT_ARRAY, /* readMode= */ READ_BLOCKING);
+    }
+
+    @Test
+    public void audioInjection_writeByteBuffer_appShouldRecordInjectedFrequency() {
+        runAudioInjectionTest(BYTE_BUFFER, /* writeMode= */
+                WRITE_BLOCKING, /* timestamp= */ 0);
+    }
+
+    @Test
+    public void audioInjection_writeByteBufferWithTimestamp_appShouldRecordInjectedFrequency() {
+        runAudioInjectionTest(BYTE_BUFFER, /* writeMode= */
+                WRITE_BLOCKING, /* timestamp= */ 50);
+    }
+
+    @Test
+    public void audioInjection_writeByteArray_appShouldRecordInjectedData() {
+        runAudioInjectionTest(BYTE_ARRAY, /* writeMode= */ -1, /* timestamp= */ 0);
+    }
+
+    @Test
+    public void audioInjection_writeByteArrayBlocking_appShouldRecordInjectedData() {
+        runAudioInjectionTest(BYTE_ARRAY, /* writeMode= */ WRITE_BLOCKING, /* timestamp= */
+                0);
+    }
+
+    @Test
+    public void audioInjection_writeShortArray_appShouldRecordInjectedData() {
+        runAudioInjectionTest(SHORT_ARRAY, /* writeMode= */ -1, /* timestamp= */ 0);
+    }
+
+    @Test
+    public void audioInjection_writeShortArrayBlocking_appShouldRecordInjectedData() {
+        runAudioInjectionTest(SHORT_ARRAY, /* writeMode= */
+                WRITE_BLOCKING, /* timestamp= */ 0);
+    }
+
+    @Test
+    public void audioInjection_writeFloatArray_appShouldRecordInjectedData() {
+        runAudioInjectionTest(FLOAT_ARRAY, /* writeMode= */
+                WRITE_BLOCKING, /* timestamp= */ 0);
+    }
+
+    private void runAudioCaptureTest(@AudioHelper.DataType int dataType, int readMode) {
+        mVirtualAudioDevice = mVirtualDevice.createVirtualAudioDevice(
+                mVirtualDisplay, /* executor= */ null, /* callback= */ null);
+        int encoding = dataType == FLOAT_ARRAY ? ENCODING_PCM_FLOAT : ENCODING_PCM_16BIT;
+        AudioCapture audioCapture = mVirtualAudioDevice.startAudioCapture(
+                createCaptureFormat(encoding));
+
+        ActivityResultReceiver activityResultReceiver = new ActivityResultReceiver(
+                getApplicationContext());
+        activityResultReceiver.register(mActivityResultCallback);
+        InstrumentationRegistry.getInstrumentation().getTargetContext().startActivity(
+                createPlayAudioIntent(dataType),
+                createActivityOptions(mVirtualDisplay));
+
+        AudioHelper.CapturedAudio capturedAudio = null;
+        switch (dataType) {
+            case BYTE_BUFFER:
+                ByteBuffer byteBuffer = ByteBuffer.allocateDirect(BUFFER_SIZE_IN_BYTES).order(
+                        ByteOrder.nativeOrder());
+                capturedAudio = new AudioHelper.CapturedAudio(audioCapture, byteBuffer, readMode);
+                assertThat(capturedAudio.getPowerSpectrum(FREQUENCY + 100))
+                        .isLessThan(POWER_THRESHOLD_FOR_ABSENT);
+                assertThat(capturedAudio.getPowerSpectrum(FREQUENCY))
+                        .isGreaterThan(POWER_THRESHOLD_FOR_PRESENT);
+                break;
+            case BYTE_ARRAY:
+                byte[] byteArray = new byte[BUFFER_SIZE_IN_BYTES];
+                capturedAudio = new AudioHelper.CapturedAudio(audioCapture, byteArray, readMode);
+                assertThat(capturedAudio.getByteValue()).isEqualTo(BYTE_VALUE);
+                break;
+            case SHORT_ARRAY:
+                short[] shortArray = new short[BUFFER_SIZE_IN_BYTES / 2];
+                capturedAudio = new AudioHelper.CapturedAudio(audioCapture, shortArray, readMode);
+                assertThat(capturedAudio.getShortValue()).isEqualTo(SHORT_VALUE);
+                break;
+            case FLOAT_ARRAY:
+                float[] floatArray = new float[BUFFER_SIZE_IN_BYTES / 4];
+                capturedAudio = new AudioHelper.CapturedAudio(audioCapture, floatArray, readMode);
+                float roundOffError = Math.abs(capturedAudio.getFloatValue() - FLOAT_VALUE);
+                assertThat(roundOffError).isLessThan(0.001f);
+                break;
+        }
+
+        verify(mActivityResultCallback, timeout(5000)).onActivityResult(
+                mIntentCaptor.capture());
+        activityResultReceiver.unregister();
+    }
+
+    private void runAudioInjectionTest(@AudioHelper.DataType int dataType, int writeMode,
+            long timestamp) {
+        mVirtualAudioDevice = mVirtualDevice.createVirtualAudioDevice(
+                mVirtualDisplay, /* executor= */ null, /* callback= */ null);
+        int encoding = dataType == FLOAT_ARRAY ? ENCODING_PCM_FLOAT : ENCODING_PCM_16BIT;
+        AudioInjection audioInjection = mVirtualAudioDevice.startAudioInjection(
+                createInjectionFormat(encoding));
+
+        ActivityResultReceiver activityResultReceiver = new ActivityResultReceiver(
+                getApplicationContext());
+        activityResultReceiver.register(mActivityResultCallback);
+        InstrumentationRegistry.getInstrumentation().getTargetContext().startActivity(
+                createAudioRecordIntent(dataType),
+                createActivityOptions(mVirtualDisplay));
+
+        int remaining;
+        switch (dataType) {
+            case BYTE_BUFFER:
+                ByteBuffer byteBuffer = AudioHelper.createAudioData(
+                        SAMPLE_RATE, NUMBER_OF_SAMPLES, CHANNEL_COUNT, FREQUENCY, AMPLITUDE);
+                remaining = byteBuffer.remaining();
+                while (remaining > 0) {
+                    if (timestamp != 0) {
+                        remaining -= audioInjection.write(byteBuffer, byteBuffer.remaining(),
+                                writeMode, timestamp);
+                    } else {
+                        remaining -= audioInjection.write(byteBuffer, byteBuffer.remaining(),
+                                writeMode);
+                    }
+                }
+                break;
+            case BYTE_ARRAY:
+                byte[] byteArray = new byte[NUMBER_OF_SAMPLES];
+                for (int i = 0; i < byteArray.length; i++) {
+                    byteArray[i] = BYTE_VALUE;
+                }
+                remaining = byteArray.length;
+                while (remaining > 0) {
+                    if (writeMode == WRITE_BLOCKING || writeMode == WRITE_NON_BLOCKING) {
+                        remaining -= audioInjection.write(byteArray, 0, byteArray.length,
+                                writeMode);
+                    } else {
+                        remaining -= audioInjection.write(byteArray, 0, byteArray.length);
+                    }
+                }
+                break;
+            case SHORT_ARRAY:
+                short[] shortArray = new short[NUMBER_OF_SAMPLES];
+                for (int i = 0; i < shortArray.length; i++) {
+                    shortArray[i] = SHORT_VALUE;
+                }
+                remaining = shortArray.length;
+                while (remaining > 0) {
+                    if (writeMode == WRITE_BLOCKING || writeMode == WRITE_NON_BLOCKING) {
+                        remaining -= audioInjection.write(shortArray, 0, shortArray.length,
+                                writeMode);
+                    } else {
+                        remaining -= audioInjection.write(shortArray, 0, shortArray.length);
+                    }
+                }
+                break;
+            case FLOAT_ARRAY:
+                float[] floatArray = new float[NUMBER_OF_SAMPLES];
+                for (int i = 0; i < floatArray.length; i++) {
+                    floatArray[i] = FLOAT_VALUE;
+                }
+                remaining = floatArray.length;
+                while (remaining > 0) {
+                    remaining -= audioInjection.write(floatArray, 0, floatArray.length, writeMode);
+                }
+                break;
+        }
+
+        verify(mActivityResultCallback, timeout(5000)).onActivityResult(
+                mIntentCaptor.capture());
+        Intent intent = mIntentCaptor.getValue();
+        assertThat(intent).isNotNull();
+        activityResultReceiver.unregister();
+
+        switch (dataType) {
+            case BYTE_BUFFER:
+                double powerSpectrumAtFrequency = intent.getDoubleExtra(
+                        EXTRA_POWER_SPECTRUM_AT_FREQUENCY,
+                        0);
+                double powerSpectrumNotFrequency = intent.getDoubleExtra(
+                        EXTRA_POWER_SPECTRUM_NOT_FREQUENCY,
+                        0);
+                assertThat(powerSpectrumNotFrequency).isLessThan(POWER_THRESHOLD_FOR_ABSENT);
+                assertThat(powerSpectrumAtFrequency).isGreaterThan(POWER_THRESHOLD_FOR_PRESENT);
+                break;
+            case BYTE_ARRAY:
+                byte byteValue = intent.getByteExtra(EXTRA_LAST_RECORDED_NONZERO_VALUE,
+                        Byte.MIN_VALUE);
+                assertThat(byteValue).isEqualTo(BYTE_VALUE);
+                break;
+            case SHORT_ARRAY:
+                short shortValue = intent.getShortExtra(EXTRA_LAST_RECORDED_NONZERO_VALUE,
+                        Short.MIN_VALUE);
+                assertThat(shortValue).isEqualTo(SHORT_VALUE);
+                break;
+            case FLOAT_ARRAY:
+                float floatValue = intent.getFloatExtra(EXTRA_LAST_RECORDED_NONZERO_VALUE, 0);
+                float roundOffError = Math.abs(floatValue - FLOAT_VALUE);
+                assertThat(roundOffError).isLessThan(0.001f);
+                break;
+        }
+    }
+
+    private static AudioFormat createCaptureFormat(int encoding) {
+        return new AudioFormat.Builder()
+                .setSampleRate(SAMPLE_RATE)
+                .setEncoding(encoding)
+                .setChannelMask(CHANNEL_IN_MONO)
+                .build();
+    }
+
+    private static AudioFormat createInjectionFormat(int encoding) {
+        return new AudioFormat.Builder()
+                .setSampleRate(SAMPLE_RATE)
+                .setEncoding(encoding)
+                .setChannelMask(CHANNEL_IN_MONO)
+                .build();
+    }
+
+    private static Intent createPlayAudioIntent(@AudioHelper.DataType int dataType) {
+        return new Intent(ACTION_PLAY_AUDIO)
+                .putExtra(EXTRA_AUDIO_DATA_TYPE, dataType)
+                .setComponent(MAIN_ACTIVITY_COMPONENT)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+    }
+
+    private static Intent createAudioRecordIntent(@AudioHelper.DataType int dataType) {
+        return new Intent(ACTION_RECORD_AUDIO)
+                .putExtra(EXTRA_AUDIO_DATA_TYPE, dataType)
+                .setComponent(MAIN_ACTIVITY_COMPONENT)
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+    }
+}
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/VirtualDeviceManagerBasicTest.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/VirtualDeviceManagerBasicTest.java
new file mode 100644
index 0000000..bb25267
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/VirtualDeviceManagerBasicTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright (C) 2021 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 android.virtualdevice.cts;
+
+import static android.Manifest.permission.ACTIVITY_EMBEDDING;
+import static android.Manifest.permission.ADD_ALWAYS_UNLOCKED_DISPLAY;
+import static android.Manifest.permission.CREATE_VIRTUAL_DEVICE;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.annotation.Nullable;
+import android.companion.virtual.VirtualDeviceManager;
+import android.companion.virtual.VirtualDeviceManager.VirtualDevice;
+import android.companion.virtual.VirtualDeviceParams;
+import android.content.Context;
+import android.platform.test.annotations.AppModeFull;
+import android.virtualdevice.cts.util.FakeAssociationRule;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.AdoptShellPermissionsRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = "VirtualDeviceManager cannot be accessed by instant apps")
+public class VirtualDeviceManagerBasicTest {
+
+    private static final VirtualDeviceParams DEFAULT_VIRTUAL_DEVICE_PARAMS =
+            new VirtualDeviceParams.Builder().build();
+
+    @Rule
+    public AdoptShellPermissionsRule mAdoptShellPermissionsRule = new AdoptShellPermissionsRule(
+            InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+            ACTIVITY_EMBEDDING,
+            ADD_ALWAYS_UNLOCKED_DISPLAY,
+            CREATE_VIRTUAL_DEVICE);
+
+    @Rule
+    public FakeAssociationRule mFakeAssociationRule = new FakeAssociationRule();
+
+    private VirtualDeviceManager mVirtualDeviceManager;
+    @Nullable private VirtualDevice mVirtualDevice;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        Context context = getApplicationContext();
+        mVirtualDeviceManager = context.getSystemService(VirtualDeviceManager.class);
+    }
+
+    @After
+    public void tearDown() {
+        if (mVirtualDevice != null) {
+            mVirtualDevice.close();
+        }
+    }
+
+    @Test
+    public void createVirtualDevice_shouldNotThrowException() {
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS);
+        assertThat(mVirtualDevice).isNotNull();
+    }
+
+    @Test
+    public void createVirtualDevice_noPermission_shouldThrowSecurityException() {
+        InstrumentationRegistry.getInstrumentation().getUiAutomation()
+                .dropShellPermissionIdentity();
+
+        assertThrows(
+                SecurityException.class,
+                () -> mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS));
+    }
+
+    @Test
+    public void createVirtualDevice_invalidAssociationId_shouldThrowIllegalArgumentException() {
+        assertThrows(
+                IllegalArgumentException.class,
+                () -> mVirtualDeviceManager.createVirtualDevice(
+                        /* associationId= */ -1,
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS));
+    }
+}
+
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/VirtualDeviceParamsTest.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/VirtualDeviceParamsTest.java
new file mode 100644
index 0000000..6619e24
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/VirtualDeviceParamsTest.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertThrows;
+
+import android.companion.virtual.VirtualDeviceParams;
+import android.content.ComponentName;
+import android.os.UserHandle;
+import android.platform.test.annotations.AppModeFull;
+import android.virtualdevice.cts.util.TestAppHelper;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Set;
+
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = "VirtualDeviceManager cannot be accessed by instant apps")
+public class VirtualDeviceParamsTest {
+
+    @Test
+    public void setAllowedAndBlockedCrossTaskNavigations_shouldThrowException() {
+        VirtualDeviceParams.Builder paramsBuilder = new VirtualDeviceParams.Builder();
+        assertThrows(IllegalArgumentException.class, () -> {
+            paramsBuilder.setAllowedCrossTaskNavigations(Set.of(
+                    TestAppHelper.MAIN_ACTIVITY_COMPONENT));
+            paramsBuilder.setBlockedCrossTaskNavigations(Set.of());
+        });
+
+    }
+
+    @Test
+    public void setBlockedAndAllowedCrossTaskNavigations_shouldThrowException() {
+        VirtualDeviceParams.Builder paramsBuilder = new VirtualDeviceParams.Builder();
+        assertThrows(IllegalArgumentException.class, () -> {
+            paramsBuilder.setBlockedCrossTaskNavigations(Set.of(
+                    TestAppHelper.MAIN_ACTIVITY_COMPONENT));
+            paramsBuilder.setAllowedCrossTaskNavigations(Set.of());
+        });
+
+    }
+
+    @Test
+    public void getAllowedCrossTaskNavigations_shouldReturnConfiguredSet() {
+        VirtualDeviceParams params = new VirtualDeviceParams.Builder()
+                .setAllowedCrossTaskNavigations(
+                        Set.of(
+                                new ComponentName("test", "test.Activity1"),
+                                new ComponentName("test", "test.Activity2")))
+                .build();
+
+        assertThat(params.getAllowedCrossTaskNavigations()).containsExactly(
+                new ComponentName("test", "test.Activity1"),
+                new ComponentName("test", "test.Activity2"));
+        assertThat(params.getDefaultNavigationPolicy())
+                .isEqualTo(VirtualDeviceParams.NAVIGATION_POLICY_DEFAULT_BLOCKED);
+    }
+
+    @Test
+    public void getBlockedCrossTaskNavigations_shouldReturnConfiguredSet() {
+        VirtualDeviceParams params = new VirtualDeviceParams.Builder()
+                .setBlockedCrossTaskNavigations(
+                        Set.of(
+                                new ComponentName("test", "test.Activity1"),
+                                new ComponentName("test", "test.Activity2")))
+                .build();
+
+        assertThat(params.getBlockedCrossTaskNavigations()).containsExactly(
+                new ComponentName("test", "test.Activity1"),
+                new ComponentName("test", "test.Activity2"));
+        assertThat(params.getDefaultNavigationPolicy())
+                .isEqualTo(VirtualDeviceParams.NAVIGATION_POLICY_DEFAULT_ALLOWED);
+    }
+
+    @Test
+    public void setAllowedAndBlockedActivities_shouldThrowException() {
+        VirtualDeviceParams.Builder paramsBuilder = new VirtualDeviceParams.Builder();
+        assertThrows(IllegalArgumentException.class, () -> {
+            paramsBuilder.setAllowedActivities(Set.of(TestAppHelper.MAIN_ACTIVITY_COMPONENT));
+            paramsBuilder.setBlockedActivities(Set.of());
+        });
+    }
+
+    @Test
+    public void setBlockedAndAllowedActivities_shouldThrowException() {
+        VirtualDeviceParams.Builder paramsBuilder = new VirtualDeviceParams.Builder();
+        assertThrows(IllegalArgumentException.class, () -> {
+            paramsBuilder.setBlockedActivities(Set.of(TestAppHelper.MAIN_ACTIVITY_COMPONENT));
+            paramsBuilder.setAllowedActivities(Set.of());
+        });
+    }
+
+    @Test
+    public void getAllowedActivities_shouldReturnConfiguredSet() {
+        VirtualDeviceParams params = new VirtualDeviceParams.Builder()
+                .setAllowedActivities(
+                        Set.of(
+                                new ComponentName("test", "test.Activity1"),
+                                new ComponentName("test", "test.Activity2")))
+                .build();
+
+        assertThat(params.getAllowedActivities()).containsExactly(
+                new ComponentName("test", "test.Activity1"),
+                new ComponentName("test", "test.Activity2"));
+        assertThat(params.getDefaultActivityPolicy())
+                .isEqualTo(VirtualDeviceParams.ACTIVITY_POLICY_DEFAULT_BLOCKED);
+    }
+
+    @Test
+    public void getBlockedActivities_shouldReturnConfiguredSet() {
+        VirtualDeviceParams params = new VirtualDeviceParams.Builder()
+                .setBlockedActivities(
+                        Set.of(
+                                new ComponentName("test", "test.Activity1"),
+                                new ComponentName("test", "test.Activity2")))
+                .build();
+
+        assertThat(params.getBlockedActivities()).containsExactly(
+                new ComponentName("test", "test.Activity1"),
+                new ComponentName("test", "test.Activity2"));
+        assertThat(params.getDefaultActivityPolicy())
+                .isEqualTo(VirtualDeviceParams.ACTIVITY_POLICY_DEFAULT_ALLOWED);
+    }
+
+    @Test
+    public void getLockState_shouldReturnConfiguredValue() {
+        VirtualDeviceParams params = new VirtualDeviceParams.Builder()
+                .setLockState(VirtualDeviceParams.LOCK_STATE_ALWAYS_UNLOCKED)
+                .build();
+
+        assertThat(params.getLockState()).isEqualTo(VirtualDeviceParams.LOCK_STATE_ALWAYS_UNLOCKED);
+    }
+
+    @Test
+    public void getUsersWithMatchingAccounts_shouldReturnConfiguredSet() {
+        VirtualDeviceParams params = new VirtualDeviceParams.Builder()
+                .setUsersWithMatchingAccounts(Set.of(UserHandle.SYSTEM))
+                .build();
+
+        assertThat(params.getUsersWithMatchingAccounts()).containsExactly(UserHandle.SYSTEM);
+    }
+}
+
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/VirtualInputTest.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/VirtualInputTest.java
new file mode 100644
index 0000000..52dbb37
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/VirtualInputTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2021 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 android.virtualdevice.cts;
+
+import static android.Manifest.permission.ACTIVITY_EMBEDDING;
+import static android.Manifest.permission.ADD_ALWAYS_UNLOCKED_DISPLAY;
+import static android.Manifest.permission.ADD_TRUSTED_DISPLAY;
+import static android.Manifest.permission.CREATE_VIRTUAL_DEVICE;
+import static android.Manifest.permission.WAKE_LOCK;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
+import static org.junit.Assert.assertThrows;
+
+import android.annotation.Nullable;
+import android.companion.virtual.VirtualDeviceManager;
+import android.companion.virtual.VirtualDeviceManager.VirtualDevice;
+import android.companion.virtual.VirtualDeviceParams;
+import android.content.Context;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.VirtualDisplay;
+import android.platform.test.annotations.AppModeFull;
+import android.virtualdevice.cts.util.FakeAssociationRule;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.AdoptShellPermissionsRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = "VirtualDeviceManager cannot be accessed by instant apps")
+public class VirtualInputTest {
+
+    private static final VirtualDeviceParams DEFAULT_VIRTUAL_DEVICE_PARAMS =
+            new VirtualDeviceParams.Builder().build();
+
+    @Rule
+    public AdoptShellPermissionsRule mAdoptShellPermissionsRule = new AdoptShellPermissionsRule(
+            InstrumentationRegistry.getInstrumentation().getUiAutomation(),
+            ACTIVITY_EMBEDDING,
+            ADD_ALWAYS_UNLOCKED_DISPLAY,
+            ADD_TRUSTED_DISPLAY,
+            CREATE_VIRTUAL_DEVICE,
+            WAKE_LOCK);
+
+    @Rule
+    public FakeAssociationRule mFakeAssociationRule = new FakeAssociationRule();
+
+    private VirtualDeviceManager mVirtualDeviceManager;
+    @Nullable private VirtualDevice mVirtualDevice;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        Context context = getApplicationContext();
+        mVirtualDeviceManager = context.getSystemService(VirtualDeviceManager.class);
+    }
+
+    @After
+    public void tearDown() {
+        if (mVirtualDevice != null) {
+            mVirtualDevice.close();
+        }
+    }
+
+    @Test
+    public void createVirtualKeyboard_noDisplay_shouldThrowSecurityException() {
+        mVirtualDevice =
+                mVirtualDeviceManager.createVirtualDevice(
+                        mFakeAssociationRule.getAssociationInfo().getId(),
+                        DEFAULT_VIRTUAL_DEVICE_PARAMS);
+        DisplayManager displayManager =
+                getApplicationContext().getSystemService(DisplayManager.class);
+        // Virtual displays created directly using DisplayManager should not be allowed to create
+        // associated virtual keyboards
+        VirtualDisplay testVirtualDisplay = displayManager.createVirtualDisplay(
+                /* displayName= */ "testVirtualDisplay",
+                /* width= */ 100,
+                /* height= */ 100,
+                /* densityDpi= */ 100,
+                /* surface= */ null,
+                /* flags= */ 0);
+
+        assertThrows(
+                SecurityException.class,
+                () -> mVirtualDevice.createVirtualKeyboard(
+                        testVirtualDisplay,
+                        "testVirtualKeyboard",
+                        /* vendorId= */ 0,
+                        /* productId= */ 0));
+    }
+}
+
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/util/EmptyActivity.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/util/EmptyActivity.java
new file mode 100644
index 0000000..53ed9a9
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/util/EmptyActivity.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.cts.util;
+
+
+import android.annotation.Nullable;
+import android.app.Activity;
+import android.content.Intent;
+
+/**
+ * An empty activity to allow this CTS test to get foreground status, for things like accessing
+ * clipboard data.
+ */
+public class EmptyActivity extends Activity {
+
+    public interface Callback {
+        void onActivityResult(int requestCode, int resultCode, Intent data);
+    }
+
+    @Nullable private Callback mCallback;
+
+    public void setCallback(@Nullable Callback callback) {
+        mCallback = callback;
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if (mCallback != null) {
+            mCallback.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+}
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/util/FakeAssociationRule.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/util/FakeAssociationRule.java
new file mode 100644
index 0000000..1493271
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/util/FakeAssociationRule.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.cts.util;
+
+import static androidx.test.core.app.ApplicationProvider.getApplicationContext;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assume.assumeTrue;
+
+import android.companion.AssociationInfo;
+import android.companion.CompanionDeviceManager;
+import android.content.pm.PackageManager;
+import android.os.Process;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.SystemUtil;
+
+import org.junit.rules.ExternalResource;
+
+import java.util.List;
+
+/**
+ * A test rule that creates a {@link CompanionDeviceManager} association with the instrumented
+ * package for the duration of the test.
+ */
+public class FakeAssociationRule extends ExternalResource {
+
+    private static final String FAKE_ASSOCIATION_ADDRESS = "00:00:00:00:00:10";
+
+    private AssociationInfo mAssociationInfo;
+    private CompanionDeviceManager mCompanionDeviceManager;
+
+    @Override
+    protected void before() throws Throwable {
+        super.before();
+        assumeTrue(
+                getApplicationContext().getPackageManager()
+                        .hasSystemFeature(PackageManager.FEATURE_COMPANION_DEVICE_SETUP));
+        mCompanionDeviceManager =
+                getApplicationContext().getSystemService(CompanionDeviceManager.class);
+        clearExistingAssociations();
+        SystemUtil.runShellCommand(String.format("cmd companiondevice associate %d %s %s",
+                Process.myUserHandle().getIdentifier(),
+                InstrumentationRegistry.getInstrumentation().getTargetContext().getPackageName(),
+                FAKE_ASSOCIATION_ADDRESS));
+        List<AssociationInfo> associations = mCompanionDeviceManager.getMyAssociations();
+        assertThat(associations).hasSize(1);
+        mAssociationInfo = associations.get(0);
+    }
+
+    @Override
+    protected void after() {
+        super.after();
+        if (mAssociationInfo != null) {
+            mCompanionDeviceManager.disassociate(mAssociationInfo.getId());
+        }
+    }
+
+    private void clearExistingAssociations() {
+        List<AssociationInfo> associations = mCompanionDeviceManager.getMyAssociations();
+        for (AssociationInfo association : associations) {
+            mCompanionDeviceManager.disassociate(association.getId());
+        }
+        assertThat(mCompanionDeviceManager.getMyAssociations()).isEmpty();
+    }
+
+    public AssociationInfo getAssociationInfo() {
+        return mAssociationInfo;
+    }
+}
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/util/TestAppHelper.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/util/TestAppHelper.java
new file mode 100644
index 0000000..e07323f
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/util/TestAppHelper.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.cts.util;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.ServiceConnection;
+import android.os.IBinder;
+import android.os.IInterface;
+import android.os.ResultReceiver;
+import android.virtualdevice.cts.IStreamedTestApp;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.function.Function;
+
+/**
+ * Helper for interacting with {@code android.virtualdevice.streamedtestapp}.
+ */
+public class TestAppHelper {
+    static final String PACKAGE_NAME = "android.virtualdevice.streamedtestapp";
+    static final String MAIN_ACTIVITY = "android.virtualdevice.streamedtestapp.MainActivity";
+    static final String NO_EMBED_ACTIVITY = "android.virtualdevice.streamedtestapp.NoEmbedActivity";
+    static final String CANNOT_DISPLAY_ON_REMOTE_ACTIVITY =
+            "android.virtualdevice.streamedtestapp.CannotDisplayOnRemoteActivity";
+    static final String STREAMED_APP_SERVICE =
+            "android.virtualdevice.streamedtestapp.StreamedAppService";
+
+    /** @see android.virtualdevice.streamedtestapp.MainActivity */
+    static final String ACTION_TEST_CAMERA =
+            "android.virtualdevice.streamedtestapp.TEST_CAMERA";
+    /** @see android.virtualdevice.streamedtestapp.MainActivity */
+    public static final String EXTRA_CAMERA_ID = "cameraId";
+    /** @see android.virtualdevice.streamedtestapp.MainActivity */
+    public static final String EXTRA_CAMERA_RESULT = "cameraResult";
+    /** @see android.virtualdevice.streamedtestapp.MainActivity */
+    public static final String EXTRA_CAMERA_ON_ERROR_CODE = "cameraOnErrorCode";
+
+    /** @see android.virtualdevice.streamedtestapp.MainActivity */
+    static final String ACTION_TEST_CLIPBOARD =
+            "android.virtualdevice.streamedtestapp.TEST_CLIPBOARD";
+    /** @see android.virtualdevice.streamedtestapp.MainActivity */
+    static final String EXTRA_CLIPBOARD_STRING = "clipboardString";
+
+    static final String ACTION_CALL_RESULT_RECEIVER =
+            "android.virtualdevice.streamedtestapp.CALL_RESULT_RECEIVER";
+    static final String EXTRA_ACTIVITY_LAUNCHED_RECEIVER = "activityLaunchedReceiver";
+    public static final String EXTRA_DISPLAY = "display";
+
+    /** @see android.virtualdevice.streamedtestapp.MainActivity */
+    public static final String ACTION_CALL_IS_DEVICE_SECURE =
+            PACKAGE_NAME + ".ACTION_CALL_IS_DEVICE_SECURE";
+
+    public static final String EXTRA_IS_DEVICE_SECURE = "isDeviceSecure";
+
+    public static final ComponentName MAIN_ACTIVITY_COMPONENT = new ComponentName(
+            PACKAGE_NAME, MAIN_ACTIVITY);
+
+    public static Intent createCameraAccessTestIntent() {
+        return new Intent(ACTION_TEST_CAMERA)
+                .setComponent(MAIN_ACTIVITY_COMPONENT);
+    }
+
+    public static Intent createClipboardTestIntent(String clipboardString) {
+        return new Intent(ACTION_TEST_CLIPBOARD)
+                .setComponent(MAIN_ACTIVITY_COMPONENT)
+                .putExtra(EXTRA_CLIPBOARD_STRING, clipboardString);
+    }
+
+    public static Intent createNoActionIntent() {
+        return new Intent().setComponent(MAIN_ACTIVITY_COMPONENT);
+    }
+
+    public static Intent createNoEmbedIntent() {
+        return new Intent().setClassName(PACKAGE_NAME, NO_EMBED_ACTIVITY);
+    }
+
+    public static Intent createCannotDisplayOnRemoteIntent(boolean newTask,
+            ResultReceiver resultReceiver) {
+        Intent intent = new Intent(ACTION_CALL_RESULT_RECEIVER)
+                .setClassName(PACKAGE_NAME, CANNOT_DISPLAY_ON_REMOTE_ACTIVITY)
+                .putExtra(EXTRA_ACTIVITY_LAUNCHED_RECEIVER, resultReceiver);
+        if (newTask) {
+            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+        }
+        return intent;
+    }
+
+    public static Intent createActivityLaunchedReceiverIntent(ResultReceiver resultReceiver) {
+        return new Intent(ACTION_CALL_RESULT_RECEIVER)
+                .setComponent(MAIN_ACTIVITY_COMPONENT)
+                .putExtra(EXTRA_ACTIVITY_LAUNCHED_RECEIVER, resultReceiver);
+    }
+
+    public static Intent createKeyguardManagerIsDeviceSecureTestIntent() {
+        return new Intent(ACTION_CALL_IS_DEVICE_SECURE)
+                .setComponent(MAIN_ACTIVITY_COMPONENT);
+    }
+
+    public static ServiceConnectionFuture<IStreamedTestApp> createTestAppService() {
+        Context targetContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        ServiceConnectionFuture<IStreamedTestApp> connection =
+                new ServiceConnectionFuture<IStreamedTestApp>(IStreamedTestApp.Stub::asInterface);
+        boolean bindResult = targetContext.bindService(
+                new Intent().setClassName(PACKAGE_NAME, STREAMED_APP_SERVICE),
+                connection,
+                Context.BIND_AUTO_CREATE);
+        assertThat(bindResult).isTrue();
+        return connection;
+    }
+
+    public static class ServiceConnectionFuture<T extends IInterface> implements ServiceConnection {
+
+        private final CompletableFuture<T> mFuture = new CompletableFuture<>();
+        private final Function<IBinder, T> mAsInterfaceFunc;
+
+        ServiceConnectionFuture(Function<IBinder, T> asInterfaceFunc) {
+            mAsInterfaceFunc = asInterfaceFunc;
+        }
+
+        @Override
+        public void onServiceConnected(ComponentName name, IBinder service) {
+            mFuture.complete(mAsInterfaceFunc.apply(service));
+        }
+
+        @Override
+        public void onServiceDisconnected(ComponentName name) {
+            // If the future is already completed, then it will stay completed with the old value.
+            mFuture.completeExceptionally(new Exception("Service disconnected"));
+        }
+
+        public CompletableFuture<T> getFuture() {
+            return mFuture;
+        }
+    }
+}
diff --git a/tests/tests/virtualdevice/src/android/virtualdevice/cts/util/VirtualDeviceTestUtils.java b/tests/tests/virtualdevice/src/android/virtualdevice/cts/util/VirtualDeviceTestUtils.java
new file mode 100644
index 0000000..926250d
--- /dev/null
+++ b/tests/tests/virtualdevice/src/android/virtualdevice/cts/util/VirtualDeviceTestUtils.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2022 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 android.virtualdevice.cts.util;
+
+import android.app.ActivityOptions;
+import android.hardware.display.VirtualDisplay;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Parcel;
+import android.os.ResultReceiver;
+
+/**
+ * Test utilities for Virtual Device tests.
+ */
+public final class VirtualDeviceTestUtils {
+
+    public static ResultReceiver createResultReceiver(OnReceiveResultListener listener) {
+        ResultReceiver receiver = new ResultReceiver(new Handler(Looper.getMainLooper())) {
+            @Override
+            protected void onReceiveResult(int resultCode, Bundle resultData) {
+                listener.onReceiveResult(resultCode, resultData);
+            }
+        };
+        // Erase the subclass to make the given result receiver safe to include inside Bundles
+        // (See b/177985835).
+        Parcel parcel = Parcel.obtain();
+        receiver.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        receiver = ResultReceiver.CREATOR.createFromParcel(parcel);
+        parcel.recycle();
+        return receiver;
+    }
+
+    /**
+     * Interface mimicking {@link ResultReceiver}, allowing it to be mocked.
+     */
+    public interface OnReceiveResultListener {
+        void onReceiveResult(int resultCode, Bundle resultData);
+    }
+
+    public static Bundle createActivityOptions(VirtualDisplay virtualDisplay) {
+        return ActivityOptions.makeBasic()
+                .setLaunchDisplayId(virtualDisplay.getDisplay().getDisplayId())
+                .toBundle();
+    }
+
+    private VirtualDeviceTestUtils() {}
+}
diff --git a/tests/tests/voiceRecognition/OWNERS b/tests/tests/voiceRecognition/OWNERS
index fac43c0..5168f30 100644
--- a/tests/tests/voiceRecognition/OWNERS
+++ b/tests/tests/voiceRecognition/OWNERS
@@ -5,4 +5,5 @@
 schfan@google.com
 
 # Framework team as backup
+
 include platform/frameworks/base:/core/java/android/service/voice/OWNERS
diff --git a/tests/tests/voiceRecognition/src/android/voicerecognition/cts/AbstractRecognitionServiceTest.java b/tests/tests/voiceRecognition/src/android/voicerecognition/cts/AbstractRecognitionServiceTest.java
index 6debb44..bff8660 100644
--- a/tests/tests/voiceRecognition/src/android/voicerecognition/cts/AbstractRecognitionServiceTest.java
+++ b/tests/tests/voiceRecognition/src/android/voicerecognition/cts/AbstractRecognitionServiceTest.java
@@ -16,8 +16,10 @@
 
 package android.voicerecognition.cts;
 
+import static android.voicerecognition.cts.CallbackMethod.CALLBACK_METHOD_END_SEGMENTED_SESSION;
 import static android.voicerecognition.cts.CallbackMethod.CALLBACK_METHOD_ERROR;
 import static android.voicerecognition.cts.CallbackMethod.CALLBACK_METHOD_RESULTS;
+import static android.voicerecognition.cts.CallbackMethod.CALLBACK_METHOD_SEGMENTS_RESULTS;
 import static android.voicerecognition.cts.CallbackMethod.CALLBACK_METHOD_UNSPECIFIED;
 import static android.voicerecognition.cts.RecognizerMethod.RECOGNIZER_METHOD_CANCEL;
 import static android.voicerecognition.cts.RecognizerMethod.RECOGNIZER_METHOD_DESTROY;
@@ -32,11 +34,16 @@
 
 import static org.junit.Assert.fail;
 
+import android.content.Intent;
 import android.os.SystemClock;
+import android.speech.RecognitionSupport;
+import android.speech.RecognitionSupportCallback;
+import android.speech.RecognizerIntent;
 import android.speech.SpeechRecognizer;
 import android.support.test.uiautomator.UiDevice;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.test.InstrumentationRegistry;
 import androidx.test.rule.ActivityTestRule;
@@ -109,6 +116,76 @@
     }
 
     @Test
+    public void testCanCheckForSupport() throws Throwable {
+        mUiDevice.waitForIdle();
+        assertThat(mActivity.mRecognizer).isNotNull();
+        setCurrentRecognizer(mActivity.mRecognizer, IN_PACKAGE_RECOGNITION_SERVICE);
+        mUiDevice.waitForIdle();
+
+        List<RecognitionSupport> supportResults = new ArrayList<>();
+        List<Integer> errors = new ArrayList<>();
+        RecognitionSupportCallback supportCallback = new RecognitionSupportCallback() {
+            @Override
+            public void onSupportResult(@NonNull RecognitionSupport recognitionSupport) {
+                supportResults.add(recognitionSupport);
+            }
+
+            @Override
+            public void onError(int error) {
+                errors.add(error);
+            }
+        };
+        Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
+        mActivity.checkRecognitionSupport(intent, supportCallback);
+        PollingCheck.waitFor(SEQUENCE_TEST_WAIT_TIMEOUT_MS,
+                () -> supportResults.size() + errors.size() > 0);
+        assertThat(supportResults).isEmpty();
+        assertThat(errors).containsExactly(SpeechRecognizer.ERROR_CANNOT_CHECK_SUPPORT);
+
+        errors.clear();
+        RecognitionSupport rs = new RecognitionSupport.Builder()
+                .setInstalledOnDeviceLanguages(new ArrayList<>(List.of("es")))
+                .addInstalledOnDeviceLanguage("en")
+                .setPendingOnDeviceLanguages(new ArrayList<>(List.of("ru")))
+                .addPendingOnDeviceLanguage("jp")
+                .setSupportedOnDeviceLanguages(new ArrayList<>(List.of("pt")))
+                .addSupportedOnDeviceLanguage("de")
+                .setOnlineLanguages(new ArrayList<>(List.of("zh")))
+                .addOnlineLanguage("fr")
+                .build();
+        CtsRecognitionService.sConsumerQueue.add(c -> c.onSupportResult(rs));
+
+        mActivity.checkRecognitionSupport(intent, supportCallback);
+        PollingCheck.waitFor(SEQUENCE_TEST_WAIT_TIMEOUT_MS,
+                () -> supportResults.size() + errors.size() > 0);
+        assertThat(errors).isEmpty();
+        assertThat(supportResults).containsExactly(rs);
+        assertThat(rs.getInstalledOnDeviceLanguages())
+                .isEqualTo(List.of("es", "en"));
+        assertThat(rs.getPendingOnDeviceLanguages())
+                .isEqualTo(List.of("ru", "jp"));
+        assertThat(rs.getSupportedOnDeviceLanguages())
+                .isEqualTo(List.of("pt", "de"));
+        assertThat(rs.getOnlineLanguages())
+                .isEqualTo(List.of("zh", "fr"));
+    }
+
+    @Test
+    public void testCanTriggerModelDownload() throws Throwable {
+        mUiDevice.waitForIdle();
+        assertThat(mActivity.mRecognizer).isNotNull();
+        setCurrentRecognizer(mActivity.mRecognizer, IN_PACKAGE_RECOGNITION_SERVICE);
+        mUiDevice.waitForIdle();
+
+        CtsRecognitionService.sDownloadTriggers.clear();
+        Intent intent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
+        mActivity.triggerModelDownload(intent);
+        PollingCheck.waitFor(SEQUENCE_TEST_WAIT_TIMEOUT_MS,
+                () -> CtsRecognitionService.sDownloadTriggers.size() > 0);
+        assertThat(CtsRecognitionService.sDownloadTriggers).hasSize(1);
+    }
+
+    @Test
     public void sequenceTest_startListening_stopListening_results() {
         executeSequenceTest(
                 /* service methods to call: */ ImmutableList.of(
@@ -172,6 +249,25 @@
     }
 
     @Test
+    public void setSequenceTest_startListening_segment_endofsession() {
+        executeSequenceTest(
+                /* service methods to call: */ ImmutableList.of(
+                        RECOGNIZER_METHOD_START_LISTENING,
+                        RECOGNIZER_METHOD_STOP_LISTENING
+                        ),
+                /* callback methods to call: */ ImmutableList.of(
+                        CALLBACK_METHOD_SEGMENTS_RESULTS,
+                        CALLBACK_METHOD_END_SEGMENTED_SESSION
+                        ),
+                /* expected service methods propagated: */ ImmutableList.of(true, true, true),
+                /* expected callback methods invoked: */ ImmutableList.of(
+                        CALLBACK_METHOD_SEGMENTS_RESULTS,
+                        CALLBACK_METHOD_END_SEGMENTED_SESSION
+                )
+        );
+    }
+
+    @Test
     public void sequenceTest_startListening_cancel() {
         executeSequenceTest(
                 /* service methods to call: */ ImmutableList.of(
diff --git a/tests/tests/voiceRecognition/src/android/voicerecognition/cts/CallbackMethod.java b/tests/tests/voiceRecognition/src/android/voicerecognition/cts/CallbackMethod.java
index b8622f4..fb6c0a5 100644
--- a/tests/tests/voiceRecognition/src/android/voicerecognition/cts/CallbackMethod.java
+++ b/tests/tests/voiceRecognition/src/android/voicerecognition/cts/CallbackMethod.java
@@ -25,5 +25,7 @@
     CALLBACK_METHOD_PARTIAL_RESULTS,
     CALLBACK_METHOD_READY_FOR_SPEECH,
     CALLBACK_METHOD_RESULTS,
-    CALLBACK_METHOD_RMS_CHANGED
+    CALLBACK_METHOD_RMS_CHANGED,
+    CALLBACK_METHOD_SEGMENTS_RESULTS,
+    CALLBACK_METHOD_END_SEGMENTED_SESSION
 }
diff --git a/tests/tests/voiceRecognition/src/android/voicerecognition/cts/CtsRecognitionService.java b/tests/tests/voiceRecognition/src/android/voicerecognition/cts/CtsRecognitionService.java
index 5627c9d..983824f 100644
--- a/tests/tests/voiceRecognition/src/android/voicerecognition/cts/CtsRecognitionService.java
+++ b/tests/tests/voiceRecognition/src/android/voicerecognition/cts/CtsRecognitionService.java
@@ -21,6 +21,7 @@
 import static android.voicerecognition.cts.TestObjects.READY_FOR_SPEECH_BUNDLE;
 import static android.voicerecognition.cts.TestObjects.RESULTS_BUNDLE;
 import static android.voicerecognition.cts.TestObjects.RMS_CHANGED_VALUE;
+import static android.voicerecognition.cts.TestObjects.SEGMENT_RESULTS_BUNDLE;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -29,14 +30,18 @@
 import android.content.Intent;
 import android.os.RemoteException;
 import android.speech.RecognitionService;
+import android.speech.SpeechRecognizer;
 import android.util.Log;
 
+import androidx.annotation.NonNull;
+
 import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Queue;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.function.Consumer;
 
 public class CtsRecognitionService extends RecognitionService {
     private static final String TAG = CtsRecognitionService.class.getSimpleName();
@@ -44,6 +49,8 @@
     public static List<RecognizerMethod> sInvokedRecognizerMethods = new ArrayList<>();
     public static Queue<CallbackMethod> sInstructedCallbackMethods = new ArrayDeque<>();
     public static AtomicBoolean sIsActive = new AtomicBoolean(false);
+    public static Queue<Consumer<SupportCallback>> sConsumerQueue = new ArrayDeque<>();
+    public static List<Intent> sDownloadTriggers = new ArrayList<>();
 
     private final Random mRandom = new Random();
 
@@ -70,6 +77,23 @@
     }
 
     @Override
+    public void onCheckRecognitionSupport(
+            @NonNull Intent recognizerIntent,
+            @NonNull SupportCallback supportCallback) {
+        Consumer<SupportCallback> consumer = sConsumerQueue.poll();
+        if (consumer == null) {
+            supportCallback.onError(SpeechRecognizer.ERROR_CANNOT_CHECK_SUPPORT);
+        } else {
+            consumer.accept(supportCallback);
+        }
+    }
+
+    @Override
+    public void onTriggerModelDownload(@NonNull Intent recognizerIntent) {
+        sDownloadTriggers.add(recognizerIntent);
+    }
+
+    @Override
     protected void onCancel(Callback listener) {
         sIsActive.set(true);
         assertThat(listener.getCallingUid()).isEqualTo(android.os.Process.myUid());
@@ -120,6 +144,12 @@
                 case CALLBACK_METHOD_RMS_CHANGED:
                     listener.rmsChanged(RMS_CHANGED_VALUE);
                     break;
+                case CALLBACK_METHOD_SEGMENTS_RESULTS:
+                    listener.segmentResults(SEGMENT_RESULTS_BUNDLE);
+                    break;
+                case CALLBACK_METHOD_END_SEGMENTED_SESSION:
+                    listener.endOfSegmentedSession();
+                    break;
                 default:
                     fail();
             }
diff --git a/tests/tests/voiceRecognition/src/android/voicerecognition/cts/SpeechRecognitionActivity.java b/tests/tests/voiceRecognition/src/android/voicerecognition/cts/SpeechRecognitionActivity.java
index a9d506a..0ac7e7a 100644
--- a/tests/tests/voiceRecognition/src/android/voicerecognition/cts/SpeechRecognitionActivity.java
+++ b/tests/tests/voiceRecognition/src/android/voicerecognition/cts/SpeechRecognitionActivity.java
@@ -22,13 +22,16 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.speech.RecognitionListener;
+import android.speech.RecognitionSupportCallback;
 import android.speech.RecognizerIntent;
 import android.speech.SpeechRecognizer;
-import android.util.Log;
+
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
 
 /**
  * An activity that uses SpeechRecognition APIs. SpeechRecognition will bind the RecognitionService
@@ -86,6 +89,15 @@
         mHandler.post(mRecognizer::destroy);
     }
 
+    public void checkRecognitionSupport(Intent intent, RecognitionSupportCallback rsc) {
+        mHandler.post(() -> mRecognizer.checkRecognitionSupport(intent,
+                Executors.newSingleThreadExecutor(), rsc));
+    }
+
+    public void triggerModelDownload(Intent intent) {
+        mHandler.post(() -> mRecognizer.triggerModelDownload(intent));
+    }
+
     public void init(boolean onDevice, String customRecognizerComponent) {
         mHandler = new Handler(getMainLooper());
         mHandler.post(() -> {
@@ -151,6 +163,16 @@
         }
 
         @Override
+        public void onSegmentResults(@NonNull Bundle segmentResults) {
+            mCallbackMethodsInvoked.add(CallbackMethod.CALLBACK_METHOD_SEGMENTS_RESULTS);
+        }
+
+        @Override
+        public void onEndOfSegmentedSession() {
+            mCallbackMethodsInvoked.add(CallbackMethod.CALLBACK_METHOD_END_SEGMENTED_SESSION);
+        }
+
+        @Override
         public void onEvent(int eventType, Bundle params) {
         }
     }
diff --git a/tests/tests/voiceRecognition/src/android/voicerecognition/cts/TestObjects.java b/tests/tests/voiceRecognition/src/android/voicerecognition/cts/TestObjects.java
index b507f21..99fa452 100644
--- a/tests/tests/voiceRecognition/src/android/voicerecognition/cts/TestObjects.java
+++ b/tests/tests/voiceRecognition/src/android/voicerecognition/cts/TestObjects.java
@@ -41,4 +41,8 @@
     static {
         START_LISTENING_INTENT.putExtra("d", 'd');
     }
+    public static final Bundle SEGMENT_RESULTS_BUNDLE = new Bundle();
+    static {
+        SEGMENT_RESULTS_BUNDLE.putChar("e", 'e');
+    }
 }
diff --git a/tests/tests/voiceinteraction/TEST_MAPPING b/tests/tests/voiceinteraction/TEST_MAPPING
index b22a259..7c84b9c 100644
--- a/tests/tests/voiceinteraction/TEST_MAPPING
+++ b/tests/tests/voiceinteraction/TEST_MAPPING
@@ -5,6 +5,19 @@
       "options": [
         {
           "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        // TODO(b/225076204): Remove the following four test cases after fixing the test fail.
+        {
+          "exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_createDetectorTwiceQuickly_triggerSuccess"
+        },
+        {
+          "exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_onDetectFromDsp_success"
+        },
+        {
+          "exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_onDetectFromExternalSource_success"
+        },
+        {
+          "exclude-filter": "android.voiceinteraction.cts.HotwordDetectionServiceBasicTest#testHotwordDetectionService_onDetectFromMic_success"
         }
       ]
     }
diff --git a/tests/tests/voiceinteraction/common/src/android/voiceinteraction/common/Utils.java b/tests/tests/voiceinteraction/common/src/android/voiceinteraction/common/Utils.java
index 5188b54..be61d93 100644
--- a/tests/tests/voiceinteraction/common/src/android/voiceinteraction/common/Utils.java
+++ b/tests/tests/voiceinteraction/common/src/android/voiceinteraction/common/Utils.java
@@ -92,6 +92,8 @@
     public static final int HOTWORD_DETECTION_SERVICE_DSP_ONREJECT_TEST = 105;
     public static final int HOTWORD_DETECTION_SERVICE_PROCESS_DIED_TEST = 106;
     public static final int HOTWORD_DETECTION_SERVICE_CALL_STOP_RECOGNITION = 107;
+    public static final int HOTWORD_DETECTION_SERVICE_DSP_DESTROY_DETECTOR = 108;
+    public static final int HOTWORD_DETECTION_SERVICE_SOFTWARE_DESTROY_DETECTOR = 109;
 
     public static final int HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS = 1;
     public static final int HOTWORD_DETECTION_SERVICE_TRIGGER_ILLEGAL_STATE_EXCEPTION = 2;
@@ -161,6 +163,7 @@
     public static final String DIRECT_ACTIONS_ACTIVITY_CMD_DESTROYED_INTERACTOR =
             "destroyedInteractor";
     public static final String DIRECT_ACTIONS_ACTIVITY_CMD_INVALIDATE_ACTIONS = "invalidateActions";
+    public static final String DIRECT_ACTIONS_ACTIVITY_CMD_GET_PACKAGE_NAME = "getpackagename";
 
     public static final String DIRECT_ACTIONS_RESULT_PERFORMED = "performed";
     public static final String DIRECT_ACTIONS_RESULT_CANCELLED = "cancelled";
@@ -179,6 +182,8 @@
 
     public static final String HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT =
             "android.intent.action.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT";
+    public static final String HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT_INTENT =
+            "android.intent.action.HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT";
     public static final String HOTWORD_DETECTION_SERVICE_ONDETECT_RESULT_INTENT =
             "android.intent.action.HOTWORD_DETECTION_SERVICE_ONDETECT_RESULT";
     public static final String KEY_SERVICE_TYPE = "serviceType";
diff --git a/tests/tests/voiceinteraction/service/src/android/voiceinteraction/service/BasicVoiceInteractionService.java b/tests/tests/voiceinteraction/service/src/android/voiceinteraction/service/BasicVoiceInteractionService.java
index 337d017..9cd284b 100644
--- a/tests/tests/voiceinteraction/service/src/android/voiceinteraction/service/BasicVoiceInteractionService.java
+++ b/tests/tests/voiceinteraction/service/src/android/voiceinteraction/service/BasicVoiceInteractionService.java
@@ -24,6 +24,8 @@
 import android.Manifest;
 import android.app.UiAutomation;
 import android.content.Intent;
+import android.hardware.soundtrigger.SoundTrigger;
+import android.hardware.soundtrigger.SoundTrigger.KeyphraseRecognitionExtra;
 import android.media.AudioFormat;
 import android.os.ParcelFileDescriptor;
 import android.os.Parcelable;
@@ -41,6 +43,8 @@
 import androidx.annotation.NonNull;
 import androidx.test.platform.app.InstrumentationRegistry;
 
+import com.google.common.collect.ImmutableList;
+
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.ByteBuffer;
@@ -55,9 +59,9 @@
 
     public static String KEY_FAKE_DATA = "fakeData";
     public static String VALUE_FAKE_DATA = "fakeData";
-    public static byte[] FAKE_BYTE_ARRAY_DATA = new byte[] {1, 2, 3};
+    public static byte[] FAKE_BYTE_ARRAY_DATA = new byte[]{1, 2, 3};
     public static byte[] FAKE_HOTWORD_AUDIO_DATA =
-            new byte[] {'h', 'o', 't', 'w', 'o', 'r', 'd', '!'};
+            new byte[]{'h', 'o', 't', 'w', 'o', 'r', 'd', '!'};
 
     private boolean mReady = false;
     private AlwaysOnHotwordDetector mAlwaysOnHotwordDetector = null;
@@ -86,70 +90,101 @@
 
         final int testEvent = intent.getIntExtra(Utils.KEY_TEST_EVENT, -1);
         Log.i(TAG, "testEvent = " + testEvent);
-        if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_TEST) {
-            runWithShellPermissionIdentity(() -> {
-                mAlwaysOnHotwordDetector = callCreateAlwaysOnHotwordDetector();
-            }, Manifest.permission.MANAGE_HOTWORD_DETECTION);
-        } else if (testEvent == Utils.VIS_WITHOUT_MANAGE_HOTWORD_DETECTION_PERMISSION_TEST) {
-            runWithShellPermissionIdentity(() -> callCreateAlwaysOnHotwordDetector(),
-                    Manifest.permission.BIND_HOTWORD_DETECTION_SERVICE);
-        } else if (testEvent == Utils.VIS_HOLD_BIND_HOTWORD_DETECTION_PERMISSION_TEST) {
-            runWithShellPermissionIdentity(() -> callCreateAlwaysOnHotwordDetector());
-        } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_DSP_ONDETECT_TEST) {
-            // need to retain the identity until the callback is triggered
-            uiAutomation.adoptShellPermissionIdentity(RECORD_AUDIO, CAPTURE_AUDIO_HOTWORD);
-            if (mAlwaysOnHotwordDetector != null) {
-                mAlwaysOnHotwordDetector.triggerHardwareRecognitionEventForTest(/* status */ 0,
-                        /* soundModelHandle */ 100, /* captureAvailable */ true,
-                        /* captureSession */ 101, /* captureDelayMs */ 1000,
-                        /* capturePreambleMs */ 1001, /* triggerInData */ true,
-                        createFakeAudioFormat(), new byte[1024]);
-            }
-        } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_DSP_ONREJECT_TEST) {
-            runWithShellPermissionIdentity(() -> {
+
+        try {
+            if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_TEST) {
+                runWithShellPermissionIdentity(() -> {
+                    mAlwaysOnHotwordDetector = callCreateAlwaysOnHotwordDetector();
+                }, Manifest.permission.MANAGE_HOTWORD_DETECTION);
+            } else if (testEvent == Utils.VIS_WITHOUT_MANAGE_HOTWORD_DETECTION_PERMISSION_TEST) {
+                runWithShellPermissionIdentity(() -> callCreateAlwaysOnHotwordDetector(),
+                        Manifest.permission.BIND_HOTWORD_DETECTION_SERVICE);
+            } else if (testEvent == Utils.VIS_HOLD_BIND_HOTWORD_DETECTION_PERMISSION_TEST) {
+                runWithShellPermissionIdentity(() -> callCreateAlwaysOnHotwordDetector());
+            } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_DSP_ONDETECT_TEST) {
+                // need to retain the identity until the callback is triggered
+                uiAutomation.adoptShellPermissionIdentity(RECORD_AUDIO, CAPTURE_AUDIO_HOTWORD);
                 if (mAlwaysOnHotwordDetector != null) {
                     mAlwaysOnHotwordDetector.triggerHardwareRecognitionEventForTest(/* status */ 0,
                             /* soundModelHandle */ 100, /* captureAvailable */ true,
                             /* captureSession */ 101, /* captureDelayMs */ 1000,
                             /* capturePreambleMs */ 1001, /* triggerInData */ true,
-                            createFakeAudioFormat(), null);
+                            createFakeAudioFormat(), new byte[1024],
+                            ImmutableList.of(new KeyphraseRecognitionExtra(
+                                    MainHotwordDetectionService.DEFAULT_PHRASE_ID,
+                                    SoundTrigger.RECOGNITION_MODE_VOICE_TRIGGER, 100)));
                 }
-            });
-        } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_EXTERNAL_SOURCE_ONDETECT_TEST) {
-            uiAutomation.adoptShellPermissionIdentity(RECORD_AUDIO, CAPTURE_AUDIO_HOTWORD);
-            if (mAlwaysOnHotwordDetector != null) {
-                ParcelFileDescriptor audioStream = createFakeAudioStream();
-                if (audioStream != null) {
-                    mAlwaysOnHotwordDetector.startRecognition(
-                            audioStream,
-                            createFakeAudioFormat(),
-                            createFakePersistableBundleData());
-                }
-            }
-        } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_FROM_SOFTWARE_TRIGGER_TEST) {
-            runWithShellPermissionIdentity(() -> {
-                mSoftwareHotwordDetector = callCreateSoftwareHotwordDetector();
-            }, Manifest.permission.MANAGE_HOTWORD_DETECTION);
-        } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_MIC_ONDETECT_TEST) {
-            uiAutomation.adoptShellPermissionIdentity(RECORD_AUDIO, CAPTURE_AUDIO_HOTWORD);
-            if (mSoftwareHotwordDetector != null) {
-                mSoftwareHotwordDetector.startRecognition();
-            }
-        } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_CALL_STOP_RECOGNITION) {
-            if (mSoftwareHotwordDetector != null) {
-                mSoftwareHotwordDetector.stopRecognition();
-            }
-        } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_PROCESS_DIED_TEST) {
-            runWithShellPermissionIdentity(() -> {
+            } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_DSP_ONREJECT_TEST) {
+                runWithShellPermissionIdentity(() -> {
+                    if (mAlwaysOnHotwordDetector != null) {
+                        mAlwaysOnHotwordDetector.triggerHardwareRecognitionEventForTest(/* status */
+                                0,
+                                /* soundModelHandle */ 100, /* captureAvailable */ true,
+                                /* captureSession */ 101, /* captureDelayMs */ 1000,
+                                /* capturePreambleMs */ 1001, /* triggerInData */ true,
+                                createFakeAudioFormat(), null,
+                                ImmutableList.of(new KeyphraseRecognitionExtra(
+                                        MainHotwordDetectionService.DEFAULT_PHRASE_ID,
+                                        SoundTrigger.RECOGNITION_MODE_VOICE_TRIGGER, 100)));
+                    }
+                });
+            } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_EXTERNAL_SOURCE_ONDETECT_TEST) {
+                uiAutomation.adoptShellPermissionIdentity(RECORD_AUDIO, CAPTURE_AUDIO_HOTWORD);
                 if (mAlwaysOnHotwordDetector != null) {
-                    PersistableBundle persistableBundle = new PersistableBundle();
-                    persistableBundle.putInt(Utils.KEY_TEST_SCENARIO,
-                            Utils.HOTWORD_DETECTION_SERVICE_ON_UPDATE_STATE_CRASH);
-                    mAlwaysOnHotwordDetector.updateState(
-                            persistableBundle,
-                            createFakeSharedMemoryData());
+                    ParcelFileDescriptor audioStream = createFakeAudioStream();
+                    if (audioStream != null) {
+                        mAlwaysOnHotwordDetector.startRecognition(
+                                audioStream,
+                                createFakeAudioFormat(),
+                                createFakePersistableBundleData());
+                    }
                 }
-            }, Manifest.permission.MANAGE_HOTWORD_DETECTION);
+            } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_FROM_SOFTWARE_TRIGGER_TEST) {
+                runWithShellPermissionIdentity(() -> {
+                    mSoftwareHotwordDetector = callCreateSoftwareHotwordDetector();
+                }, Manifest.permission.MANAGE_HOTWORD_DETECTION);
+            } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_MIC_ONDETECT_TEST) {
+                uiAutomation.adoptShellPermissionIdentity(RECORD_AUDIO, CAPTURE_AUDIO_HOTWORD);
+                if (mSoftwareHotwordDetector != null) {
+                    mSoftwareHotwordDetector.startRecognition();
+                }
+            } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_CALL_STOP_RECOGNITION) {
+                if (mSoftwareHotwordDetector != null) {
+                    mSoftwareHotwordDetector.stopRecognition();
+                }
+            } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_PROCESS_DIED_TEST) {
+                runWithShellPermissionIdentity(() -> {
+                    if (mAlwaysOnHotwordDetector != null) {
+                        PersistableBundle persistableBundle = new PersistableBundle();
+                        persistableBundle.putInt(Utils.KEY_TEST_SCENARIO,
+                                Utils.HOTWORD_DETECTION_SERVICE_ON_UPDATE_STATE_CRASH);
+                        mAlwaysOnHotwordDetector.updateState(
+                                persistableBundle,
+                                createFakeSharedMemoryData());
+                    }
+                }, Manifest.permission.MANAGE_HOTWORD_DETECTION);
+            } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_DSP_DESTROY_DETECTOR) {
+                if (mAlwaysOnHotwordDetector != null) {
+                    Log.i(TAG, "destroying AlwaysOnHotwordDetector");
+                    mAlwaysOnHotwordDetector.destroy();
+                    broadcastIntentWithResult(
+                            Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
+                            Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
+                }
+            } else if (testEvent == Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_DESTROY_DETECTOR) {
+                if (mSoftwareHotwordDetector != null) {
+                    Log.i(TAG, "destroying SoftwareHotwordDetector");
+                    mSoftwareHotwordDetector.destroy();
+                    broadcastIntentWithResult(
+                            Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT_INTENT,
+                            Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
+                }
+            }
+        } catch (IllegalStateException e) {
+            Log.w(TAG, "performing testEvent: " + testEvent + ", exception: " + e);
+            broadcastIntentWithResult(
+                    Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
+                    Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_ILLEGAL_STATE_EXCEPTION);
         }
 
         return START_NOT_STICKY;
@@ -214,8 +249,13 @@
                         @Override
                         public void onHotwordDetectionServiceInitialized(int status) {
                             super.onHotwordDetectionServiceInitialized(status);
-                            Log.i(TAG, "onHotwordDetectionServiceInitialized");
-                            verifyHotwordDetectionServiceInitializedStatus(status);
+                            Log.i(TAG, "onHotwordDetectionServiceInitialized status = " + status);
+                            if (status != HotwordDetectionService.INITIALIZATION_STATUS_SUCCESS) {
+                                return;
+                            }
+                            broadcastIntentWithResult(
+                                    Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
+                                    Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
                         }
 
                         @Override
@@ -257,7 +297,7 @@
                         public void onError() {
                             Log.i(TAG, "onError");
                             broadcastIntentWithResult(
-                                    Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
+                                    Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT_INTENT,
                                     Utils.HOTWORD_DETECTION_SERVICE_GET_ERROR);
                         }
 
@@ -278,7 +318,13 @@
 
                         @Override
                         public void onHotwordDetectionServiceInitialized(int status) {
-                            verifyHotwordDetectionServiceInitializedStatus(status);
+                            Log.i(TAG, "onHotwordDetectionServiceInitialized status = " + status);
+                            if (status != HotwordDetectionService.INITIALIZATION_STATUS_SUCCESS) {
+                                return;
+                            }
+                            broadcastIntentWithResult(
+                                    Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT_INTENT,
+                                    Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
                         }
 
                         @Override
@@ -363,12 +409,4 @@
             mTempParcelFileDescriptor = null;
         }
     }
-
-    private void verifyHotwordDetectionServiceInitializedStatus(int status) {
-        if (status == HotwordDetectionService.INITIALIZATION_STATUS_SUCCESS) {
-            broadcastIntentWithResult(
-                    Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
-                    Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
-        }
-    }
 }
diff --git a/tests/tests/voiceinteraction/service/src/android/voiceinteraction/service/MainHotwordDetectionService.java b/tests/tests/voiceinteraction/service/src/android/voiceinteraction/service/MainHotwordDetectionService.java
index 4fb3f8e..f7668b5 100644
--- a/tests/tests/voiceinteraction/service/src/android/voiceinteraction/service/MainHotwordDetectionService.java
+++ b/tests/tests/voiceinteraction/service/src/android/voiceinteraction/service/MainHotwordDetectionService.java
@@ -49,6 +49,7 @@
 public class MainHotwordDetectionService extends HotwordDetectionService {
     static final String TAG = "MainHotwordDetectionService";
 
+    public static final int DEFAULT_PHRASE_ID = 5;
     public static final HotwordDetectedResult DETECTED_RESULT =
             new HotwordDetectedResult.Builder()
                     .setAudioChannel(CHANNEL_IN_FRONT)
@@ -56,27 +57,27 @@
                     .setHotwordDetectionPersonalized(true)
                     .setHotwordDurationMillis(1000)
                     .setHotwordOffsetMillis(500)
-                    .setHotwordPhraseId(5)
+                    .setHotwordPhraseId(DEFAULT_PHRASE_ID)
                     .setPersonalizedScore(10)
                     .setScore(15)
                     .build();
     public static final HotwordDetectedResult DETECTED_RESULT_AFTER_STOP_DETECTION =
             new HotwordDetectedResult.Builder()
+                    .setHotwordPhraseId(DEFAULT_PHRASE_ID)
                     .setScore(57)
                     .build();
     public static final HotwordDetectedResult DETECTED_RESULT_FOR_MIC_FAILURE =
             new HotwordDetectedResult.Builder()
+                    .setHotwordPhraseId(DEFAULT_PHRASE_ID)
                     .setScore(58)
                     .build();
     public static final HotwordRejectedResult REJECTED_RESULT =
             new HotwordRejectedResult.Builder()
                     .setConfidenceLevel(HotwordRejectedResult.CONFIDENCE_LEVEL_MEDIUM)
                     .build();
-
-    private Handler mHandler;
     @NonNull
     private final Object mLock = new Object();
-
+    private Handler mHandler;
     @GuardedBy("mLock")
     private boolean mStopDetectionCalled;
 
@@ -111,6 +112,8 @@
             PersistableBundle persistableBundle = new PersistableBundle();
             HotwordDetectedResult hotwordDetectedResult =
                     new HotwordDetectedResult.Builder()
+                            .setHotwordPhraseId(eventPayload.getKeyphraseRecognitionExtras().get(
+                                    0).getKeyphraseId())
                             .setExtras(persistableBundle)
                             .build();
             int key = 0;
@@ -168,7 +171,7 @@
             Log.d(TAG, "fis.available() = " + fis.available());
             byte[] buffer = new byte[8];
             fis.read(buffer, 0, 8);
-            if(isSame(buffer, BasicVoiceInteractionService.FAKE_HOTWORD_AUDIO_DATA,
+            if (isSame(buffer, BasicVoiceInteractionService.FAKE_HOTWORD_AUDIO_DATA,
                     buffer.length)) {
                 Log.d(TAG, "call callback.onDetected");
                 callback.onDetected(DETECTED_RESULT);
@@ -200,8 +203,8 @@
                 mHandler.postDelayed(mDetectionJob, 1500);
             } else {
                 Log.d(TAG, "Sending detected result after stop detection");
-                // We can't store and use this callback in onStopDetection (not valid anymore there), so
-                // instead we trigger detection again to report the event.
+                // We can't store and use this callback in onStopDetection (not valid anymore
+                // there), so instead we trigger detection again to report the event.
                 callback.onDetected(DETECTED_RESULT_AFTER_STOP_DETECTION);
             }
         }
diff --git a/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/DirectActionsTest.java b/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/DirectActionsTest.java
index 4ece6b9..3c74da6 100644
--- a/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/DirectActionsTest.java
+++ b/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/DirectActionsTest.java
@@ -79,6 +79,23 @@
 
     @AppModeFull(reason = "testPerformDirectAction() is enough")
     @Test
+    public void testGetPackageName() throws Exception {
+        mActivityControl.startActivity();
+        mSessionControl.startVoiceInteractionSession();
+        try {
+            // Get the actions to set up the VoiceInteractor
+            mSessionControl.getDirectActions();
+
+            String packageName = mActivityControl.getPackageName();
+            assertThat(packageName).isEqualTo("android.voiceinteraction.service");
+        } finally {
+            mSessionControl.stopVoiceInteractionSession();
+            mActivityControl.finishActivity();
+        }
+    }
+
+    @AppModeFull(reason = "testPerformDirectAction() is enough")
+    @Test
     public void testCancelPerformedDirectAction() throws Exception {
         mActivityControl.startActivity();
         mSessionControl.startVoiceInteractionSession();
@@ -232,6 +249,13 @@
             return result.getBoolean(Utils.DIRECT_ACTIONS_KEY_RESULT);
         }
 
+        private String getPackageName()
+                throws Exception {
+            final Bundle result = executeRemoteCommand(
+                    Utils.DIRECT_ACTIONS_ACTIVITY_CMD_GET_PACKAGE_NAME);
+            return result.getString(Utils.DIRECT_ACTIONS_KEY_RESULT);
+        }
+
         void finishActivity() throws Exception {
             executeRemoteCommand(Utils.VOICE_INTERACTION_ACTIVITY_CMD_FINISH);
         }
@@ -316,3 +340,4 @@
                 .that(Utils.DIRECT_ACTIONS_RESULT_CANCELLED).isEqualTo(status);
     }
 }
+
diff --git a/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/HotwordDetectionServiceBasicTest.java b/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/HotwordDetectionServiceBasicTest.java
index d25632a..257b66b 100644
--- a/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/HotwordDetectionServiceBasicTest.java
+++ b/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/HotwordDetectionServiceBasicTest.java
@@ -40,7 +40,6 @@
 import android.support.test.uiautomator.By;
 import android.support.test.uiautomator.UiDevice;
 import android.support.test.uiautomator.Until;
-import android.util.Log;
 import android.voiceinteraction.common.Utils;
 import android.voiceinteraction.service.EventPayloadParcelable;
 import android.voiceinteraction.service.MainHotwordDetectionService;
@@ -124,6 +123,39 @@
     }
 
     @Test
+    @RequiresDevice
+    public void testHotwordDetectionService_createDetectorTwiceQuickly_triggerSuccess()
+            throws Throwable {
+        Thread.sleep(CLEAR_CHIP_MS);
+        final BlockingBroadcastReceiver softwareReceiver = new BlockingBroadcastReceiver(mContext,
+                Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT_INTENT);
+        final BlockingBroadcastReceiver receiver = new BlockingBroadcastReceiver(mContext,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT);
+        softwareReceiver.register();
+        receiver.register();
+
+        // Create SoftwareHotwordDetector
+        testHotwordDetection(Utils.HOTWORD_DETECTION_SERVICE_FROM_SOFTWARE_TRIGGER_TEST,
+                Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT_INTENT,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
+
+        // Destroy detector
+        testHotwordDetection(Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_DESTROY_DETECTOR,
+                Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT_INTENT,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
+
+        // Create AlwaysOnHotwordDetector
+        testHotwordDetection(Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_TEST,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
+
+        verifyDetectedResult(
+                performAndGetDetectionResult(Utils.HOTWORD_DETECTION_SERVICE_DSP_ONDETECT_TEST),
+                MainHotwordDetectionService.DETECTED_RESULT);
+        verifyMicrophoneChip(true);
+    }
+
+    @Test
     public void testVoiceInteractionService_withoutManageHotwordDetectionPermission_triggerFailure()
             throws Throwable {
         testHotwordDetection(Utils.VIS_WITHOUT_MANAGE_HOTWORD_DETECTION_PERMISSION_TEST,
@@ -193,7 +225,7 @@
         Thread.sleep(CLEAR_CHIP_MS);
         // Create SoftwareHotwordDetector and wait the HotwordDetectionService ready
         testHotwordDetection(Utils.HOTWORD_DETECTION_SERVICE_FROM_SOFTWARE_TRIGGER_TEST,
-                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
+                Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT_INTENT,
                 Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
 
         verifyDetectedResult(
@@ -208,7 +240,7 @@
             throws Throwable {
         // Create SoftwareHotwordDetector and wait the HotwordDetectionService ready
         testHotwordDetection(Utils.HOTWORD_DETECTION_SERVICE_FROM_SOFTWARE_TRIGGER_TEST,
-                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
+                Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT_INTENT,
                 Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
 
         // The HotwordDetectionService can't report any result after recognition is stopped. So
@@ -228,7 +260,7 @@
     public void testHotwordDetectionService_concurrentCapture() throws Throwable {
         // Create SoftwareHotwordDetector and wait the HotwordDetectionService ready
         testHotwordDetection(Utils.HOTWORD_DETECTION_SERVICE_FROM_SOFTWARE_TRIGGER_TEST,
-                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
+                Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT_INTENT,
                 Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
 
         SystemUtil.runWithShellPermissionIdentity(() -> {
@@ -282,6 +314,40 @@
         Thread.sleep(TIMEOUT_MS);
     }
 
+    @Test
+    public void testHotwordDetectionService_destroyDspDetector_activeDetectorRemoved() {
+        // Create AlwaysOnHotwordDetector
+        testHotwordDetection(Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_TEST,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
+
+        testHotwordDetection(Utils.HOTWORD_DETECTION_SERVICE_DSP_DESTROY_DETECTOR,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
+
+        // Can no longer use the detector because it is in an invalid state
+        testHotwordDetection(Utils.HOTWORD_DETECTION_SERVICE_DSP_ONDETECT_TEST,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_ILLEGAL_STATE_EXCEPTION);
+    }
+
+    @Test
+    public void testHotwordDetectionService_destroySoftwareDetector_activeDetectorRemoved() {
+        // Create SoftwareHotwordDetector
+        testHotwordDetection(Utils.HOTWORD_DETECTION_SERVICE_FROM_SOFTWARE_TRIGGER_TEST,
+                Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT_INTENT,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
+
+        testHotwordDetection(Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_DESTROY_DETECTOR,
+                Utils.HOTWORD_DETECTION_SERVICE_SOFTWARE_TRIGGER_RESULT_INTENT,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_SUCCESS);
+
+        // Can no longer use the detector because it is in an invalid state
+        testHotwordDetection(Utils.HOTWORD_DETECTION_SERVICE_MIC_ONDETECT_TEST,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_RESULT_INTENT,
+                Utils.HOTWORD_DETECTION_SERVICE_TRIGGER_ILLEGAL_STATE_EXCEPTION);
+    }
+
     private void testHotwordDetection(int testType, String expectedIntent, int expectedResult) {
         final BlockingBroadcastReceiver receiver = new BlockingBroadcastReceiver(mContext,
                 expectedIntent);
diff --git a/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/VoiceInteractionTest.java b/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/VoiceInteractionTest.java
index bc43563..328931b 100644
--- a/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/VoiceInteractionTest.java
+++ b/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/VoiceInteractionTest.java
@@ -30,6 +30,8 @@
 import android.util.Log;
 import android.voiceinteraction.common.Utils;
 
+import androidx.test.rule.ActivityTestRule;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -38,8 +40,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import androidx.test.rule.ActivityTestRule;
-
 // TODO: ideally we should split testAll() into multiple tests, and run at least one of them
 // on instant
 @AppModeFull(reason = "DirectActionsTest is enough")
@@ -59,7 +59,8 @@
     @Before
     public void setUp() throws Exception {
         mReceiver = new TestResultsReceiver();
-        mContext.registerReceiver(mReceiver, new IntentFilter(Utils.BROADCAST_INTENT));
+        mContext.registerReceiver(mReceiver, new IntentFilter(Utils.BROADCAST_INTENT),
+                Context.RECEIVER_EXPORTED);
         startTestActivity();
     }
 
diff --git a/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/unittests/AlwaysOnHotwordDetectorEventPayloadTest.java b/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/unittests/AlwaysOnHotwordDetectorEventPayloadTest.java
new file mode 100644
index 0000000..b3d80b8
--- /dev/null
+++ b/tests/tests/voiceinteraction/src/android/voiceinteraction/cts/unittests/AlwaysOnHotwordDetectorEventPayloadTest.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2022 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 android.voiceinteraction.cts.unittests;
+
+import static android.media.AudioFormat.CHANNEL_IN_FRONT;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.hardware.soundtrigger.SoundTrigger;
+import android.media.AudioFormat;
+import android.os.ParcelFileDescriptor;
+import android.service.voice.AlwaysOnHotwordDetector;
+import android.service.voice.HotwordDetectedResult;
+
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.google.common.collect.ImmutableList;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.io.File;
+import java.util.List;
+
+/**
+ * Unit test for the {@link AlwaysOnHotwordDetector.EventPayload} class
+ */
+@RunWith(AndroidJUnit4.class)
+public class AlwaysOnHotwordDetectorEventPayloadTest {
+
+    @Test
+    public void testEventPayload_verifyDefaultValues() {
+        final AlwaysOnHotwordDetector.EventPayload eventPayload =
+                new AlwaysOnHotwordDetector.EventPayload.Builder().build();
+        assertThat(eventPayload.getCaptureAudioFormat()).isNull();
+        assertThat(eventPayload.getTriggerAudio()).isNull();
+        assertThat(eventPayload.getDataFormat()).isEqualTo(
+                AlwaysOnHotwordDetector.EventPayload.DATA_FORMAT_RAW);
+        assertThat(eventPayload.getData()).isNull();
+        assertThat(eventPayload.getHotwordDetectedResult()).isNull();
+        assertThat(eventPayload.getAudioStream()).isNull();
+        assertThat(eventPayload.getKeyphraseRecognitionExtras()).isEmpty();
+    }
+
+    @Test
+    public void testEventPayload_getCaptureAudioFormat() {
+        AudioFormat audioFormat =
+                new AudioFormat.Builder()
+                        .setSampleRate(32000)
+                        .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
+                        .setChannelMask(AudioFormat.CHANNEL_IN_MONO).build();
+        final AlwaysOnHotwordDetector.EventPayload eventPayload =
+                new AlwaysOnHotwordDetector.EventPayload.Builder()
+                        .setCaptureAudioFormat(audioFormat)
+                        .build();
+        assertThat(eventPayload.getCaptureAudioFormat()).isEqualTo(audioFormat);
+    }
+
+    @Test
+    public void testEventPayload_getTriggerAudio_noTriggerInData_dataNonNull() {
+        byte[] data = new byte[]{0, 1, 2, 3, 4};
+        final AlwaysOnHotwordDetector.EventPayload eventPayload =
+                new AlwaysOnHotwordDetector.EventPayload.Builder()
+                        .setData(data)
+                        .build();
+        assertThat(eventPayload.getDataFormat()).isEqualTo(
+                AlwaysOnHotwordDetector.EventPayload.DATA_FORMAT_RAW);
+        assertThat(eventPayload.getTriggerAudio()).isNull();
+        assertThat(eventPayload.getData()).isEqualTo(data);
+    }
+
+    @Test
+    public void testEventPayload_getTriggerAudio_triggerInData_dataNonNull() {
+        byte[] data = new byte[]{0, 1, 2, 3, 4};
+        final AlwaysOnHotwordDetector.EventPayload eventPayload =
+                new AlwaysOnHotwordDetector.EventPayload.Builder()
+                        .setData(data)
+                        .setDataFormat(
+                                AlwaysOnHotwordDetector.EventPayload.DATA_FORMAT_TRIGGER_AUDIO)
+                        .build();
+        assertThat(eventPayload.getDataFormat()).isEqualTo(
+                AlwaysOnHotwordDetector.EventPayload.DATA_FORMAT_TRIGGER_AUDIO);
+        assertThat(eventPayload.getTriggerAudio()).isEqualTo(data);
+        assertThat(eventPayload.getData()).isEqualTo(data);
+    }
+
+    @Test
+    public void testEventPayload_getHotwordDetectedResult() {
+        HotwordDetectedResult hotwordDetectedResult = new HotwordDetectedResult.Builder()
+                .setAudioChannel(CHANNEL_IN_FRONT)
+                .setConfidenceLevel(HotwordDetectedResult.CONFIDENCE_LEVEL_HIGH)
+                .setHotwordDetectionPersonalized(true)
+                .setHotwordDurationMillis(1000)
+                .setHotwordOffsetMillis(500)
+                .setHotwordPhraseId(5)
+                .setPersonalizedScore(10)
+                .setScore(15)
+                .build();
+        final AlwaysOnHotwordDetector.EventPayload eventPayload =
+                new AlwaysOnHotwordDetector.EventPayload.Builder()
+                        .setHotwordDetectedResult(hotwordDetectedResult)
+                        .build();
+        assertThat(eventPayload.getHotwordDetectedResult()).isEqualTo(hotwordDetectedResult);
+    }
+
+    @Test
+    public void testEventPayload_getAudioStream() throws Exception {
+        ParcelFileDescriptor fileDescriptor = ParcelFileDescriptor.open(new File("/dev/null"),
+                ParcelFileDescriptor.MODE_READ_ONLY);
+        final AlwaysOnHotwordDetector.EventPayload eventPayload =
+                new AlwaysOnHotwordDetector.EventPayload.Builder()
+                        .setAudioStream(fileDescriptor)
+                        .build();
+        assertThat(eventPayload.getAudioStream()).isEqualTo(fileDescriptor);
+    }
+
+    @Test
+    public void testEventPayload_getKeyphraseRecognitionExtras() {
+        final int firstKeyphraseId = 1;
+        final int secondKeyphraseId = 2;
+        final int firstKephraseRecognitionMode = SoundTrigger.RECOGNITION_MODE_VOICE_TRIGGER;
+        final int secondKephraseRecognitionMode = SoundTrigger.RECOGNITION_MODE_USER_IDENTIFICATION
+                | SoundTrigger.RECOGNITION_MODE_VOICE_TRIGGER;
+        final int firstCoarseConfidenceLevel = 98;
+        final int secondCoarseConfidenceLevel = 97;
+        SoundTrigger.KeyphraseRecognitionExtra firstKeyphraseExtra =
+                new SoundTrigger.KeyphraseRecognitionExtra(firstKeyphraseId,
+                        firstKephraseRecognitionMode, firstCoarseConfidenceLevel);
+        SoundTrigger.KeyphraseRecognitionExtra secondKeyphraseExtra =
+                new SoundTrigger.KeyphraseRecognitionExtra(
+                        secondKeyphraseId, secondKephraseRecognitionMode,
+                        secondCoarseConfidenceLevel);
+        List<SoundTrigger.KeyphraseRecognitionExtra> keyphraseRecognitionExtras = ImmutableList.of(
+                firstKeyphraseExtra, secondKeyphraseExtra);
+
+        final AlwaysOnHotwordDetector.EventPayload eventPayload =
+                new AlwaysOnHotwordDetector.EventPayload.Builder()
+                        .setKeyphraseRecognitionExtras(keyphraseRecognitionExtras)
+                        .build();
+        assertThat(eventPayload.getKeyphraseRecognitionExtras()).isEqualTo(
+                keyphraseRecognitionExtras);
+    }
+}
diff --git a/tests/tests/voiceinteraction/testapp/src/android/voiceinteraction/testapp/DirectActionsActivity.java b/tests/tests/voiceinteraction/testapp/src/android/voiceinteraction/testapp/DirectActionsActivity.java
index 4b6d2e3..7a7c07c 100644
--- a/tests/tests/voiceinteraction/testapp/src/android/voiceinteraction/testapp/DirectActionsActivity.java
+++ b/tests/tests/voiceinteraction/testapp/src/android/voiceinteraction/testapp/DirectActionsActivity.java
@@ -73,6 +73,11 @@
                             Utils.VOICE_INTERACTION_KEY_CALLBACK);
                     invalidateDirectActions(commandCallback);
                 } break;
+                case Utils.DIRECT_ACTIONS_ACTIVITY_CMD_GET_PACKAGE_NAME: {
+                    final RemoteCallback commandCallback = cmdArgs.getParcelable(
+                            Utils.VOICE_INTERACTION_KEY_CALLBACK);
+                    getPackageName(commandCallback);
+                } break;
             }
         });
 
@@ -157,6 +162,14 @@
         callback.sendResult(result);
     }
 
+    private void getPackageName(@NonNull RemoteCallback callback) {
+        String packageName = getVoiceInteractor().getPackageName();
+        final Bundle result = new Bundle();
+        result.putString(Utils.DIRECT_ACTIONS_KEY_RESULT, packageName);
+        Log.v(TAG, "getPackageName(): " + Utils.toBundleString(result));
+        callback.sendResult(result);
+    }
+
     private void doFinish(@NonNull RemoteCallback callback) {
         finish();
         final Bundle result = new Bundle();
diff --git a/tests/tests/voicesettings/src/android/voicesettings/cts/BroadcastTestBase.java b/tests/tests/voicesettings/src/android/voicesettings/cts/BroadcastTestBase.java
index b734b47..328980a0 100644
--- a/tests/tests/voicesettings/src/android/voicesettings/cts/BroadcastTestBase.java
+++ b/tests/tests/voicesettings/src/android/voicesettings/cts/BroadcastTestBase.java
@@ -130,7 +130,8 @@
         mLatch = new CountDownLatch(1);
         mActivityDoneReceiver = new ActivityDoneReceiver();
         mContext.registerReceiver(mActivityDoneReceiver,
-                new IntentFilter(BroadcastUtils.BROADCAST_INTENT + testCaseType.toString()));
+                new IntentFilter(BroadcastUtils.BROADCAST_INTENT + testCaseType.toString()),
+                Context.RECEIVER_EXPORTED);
     }
 
     protected boolean startTestAndWaitForBroadcast(BroadcastUtils.TestcaseType testCaseType,
diff --git a/tests/tests/webkit/Android.bp b/tests/tests/webkit/Android.bp
index 30cb45f..d8175dd 100644
--- a/tests/tests/webkit/Android.bp
+++ b/tests/tests/webkit/Android.bp
@@ -31,7 +31,10 @@
         "ctstestrunner-axt",
         "hamcrest-library",
     ],
-    srcs: ["src/**/*.java"],
+    srcs: [
+        "src/**/*.java",
+        "src/**/*.aidl",
+    ],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
diff --git a/tests/tests/webkit/AndroidManifest.xml b/tests/tests/webkit/AndroidManifest.xml
index cbb0ccf..96e9e6c 100644
--- a/tests/tests/webkit/AndroidManifest.xml
+++ b/tests/tests/webkit/AndroidManifest.xml
@@ -64,6 +64,28 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="android.webkit.cts.WebViewDarkThemeCtsActivity"
+             android:label="WebViewDarkThemeCtsActivity"
+             android:screenOrientation="nosensor"
+             android:exported="true"
+             android:theme="@android:style/Theme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="android.webkit.cts.WebViewLightThemeCtsActivity"
+             android:label="WebViewLightThemeCtsActivity"
+             android:screenOrientation="nosensor"
+             android:exported="true"
+             android:theme="@android:style/Theme.Light">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.FRAMEWORK_INSTRUMENTATION_TEST"/>
+            </intent-filter>
+        </activity>
+
         <service android:name="android.webkit.cts.TestProcessServiceA"
              android:process=":testprocessA"
              android:exported="false"/>
diff --git a/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java b/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
index 65cc8e6..4e390c9 100644
--- a/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/CookieManagerTest.java
@@ -172,7 +172,7 @@
         final String url = "http://www.example.com";
         final String cookie = "name=test";
         mCookieManager.setCookie(url, cookie, null);
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 String c = mCookieManager.getCookie(url);
@@ -255,7 +255,7 @@
 
         mCookieManager.removeSessionCookies(null);
         allCookies = mCookieManager.getCookie(url);
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 String c = mCookieManager.getCookie(url);
@@ -266,7 +266,7 @@
         }.run();
 
         mCookieManager.removeAllCookies(null);
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return !mCookieManager.hasCookies();
@@ -452,7 +452,7 @@
     }
 
     private void waitForCookie(final String url) {
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return mCookieManager.getCookie(url) != null;
diff --git a/tests/tests/webkit/src/android/webkit/cts/ITestProcessService.aidl b/tests/tests/webkit/src/android/webkit/cts/ITestProcessService.aidl
new file mode 100644
index 0000000..173c644
--- /dev/null
+++ b/tests/tests/webkit/src/android/webkit/cts/ITestProcessService.aidl
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2021 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 android.webkit.cts;
+
+import android.os.Bundle;
+
+interface ITestProcessService {
+    /**
+     * Runs the given test class.
+     *
+     * <p>This is a sync call.
+     *
+     * @param testClassName the name of a test class that extends {@code
+     *     TestProcessClient#TestRunnable}.
+     * @return test result as a bundle. If the test passes, the bundle will be empty. If it fails,
+     *     it will contain the failure exception as a Serializable.
+     */
+    Bundle run(String testClassName);
+
+    /**
+     * Terminates the TestProcessService process.
+     *
+     * <p>This is a sync call.
+     */
+    void exit();
+}
diff --git a/tests/tests/webkit/src/android/webkit/cts/PacProcessorTest.java b/tests/tests/webkit/src/android/webkit/cts/PacProcessorTest.java
index 5204f56..ee6f11f 100644
--- a/tests/tests/webkit/src/android/webkit/cts/PacProcessorTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/PacProcessorTest.java
@@ -23,6 +23,7 @@
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
+import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,6 +38,11 @@
         mProcess = TestProcessClient.createProcessB(context);
     }
 
+    @After
+    public void tearDown() throws Throwable {
+        mProcess.close();
+    }
+
     static class TestCreatePacProcessor extends TestProcessClient.TestRunnable {
         @Override
         public void run(Context ctx) {
diff --git a/tests/tests/webkit/src/android/webkit/cts/PostMessageTest.java b/tests/tests/webkit/src/android/webkit/cts/PostMessageTest.java
index c2fff9e..da5664e 100644
--- a/tests/tests/webkit/src/android/webkit/cts/PostMessageTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/PostMessageTest.java
@@ -35,8 +35,6 @@
 import java.util.concurrent.BlockingQueue;
 
 public class PostMessageTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
-    public static final long TIMEOUT = 20000L;
-
     private WebView mWebView;
     private WebViewOnUiThread mOnUiThread;
 
@@ -96,7 +94,7 @@
     }
 
     private void waitForTitle(final String title) {
-        new PollingCheck(TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return mOnUiThread.getTitle().equals(title);
diff --git a/tests/tests/webkit/src/android/webkit/cts/TestProcessClient.java b/tests/tests/webkit/src/android/webkit/cts/TestProcessClient.java
index ba6ae47..0a3946e 100644
--- a/tests/tests/webkit/src/android/webkit/cts/TestProcessClient.java
+++ b/tests/tests/webkit/src/android/webkit/cts/TestProcessClient.java
@@ -20,11 +20,11 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.os.Bundle;
+import android.os.DeadObjectException;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
-import android.os.Message;
-import android.os.Messenger;
 import android.os.RemoteException;
 
 import com.android.internal.annotations.GuardedBy;
@@ -32,24 +32,30 @@
 import com.google.common.util.concurrent.SettableFuture;
 
 import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
 
+/**
+ * IPC interface to run tests in a freshly spawned service process.
+ *
+ * CTS test modules usually run all tests in the same process, but some WebView tests
+ * need to verify things that only happen once per process. This client interface allows
+ * two separate service processes to be created which are guaranteed to be freshly launched
+ * and to not have loaded the WebView implementation before the test runs. The caller must
+ * close() the client once it's done with it to allow the service process to exit.
+ * The two service processes are identical to each other (A and B are arbitrary labels); we
+ * have two in case a test needs to run more than one thing at once.
+ */
 class TestProcessClient extends Assert implements AutoCloseable, ServiceConnection {
     private Context mContext;
 
-    static final long REMOTE_TIMEOUT_MS = 5000;
-
     private static final long CONNECT_TIMEOUT_MS = 5000;
 
     private Object mLock = new Object();
-    @GuardedBy("mLock")
-    private Messenger mService;
-    @GuardedBy("mLock")
-    private Integer mLastResult;
-    @GuardedBy("mLock")
-    private Throwable mLastException;
 
-    private final Messenger mReplyHandler = new Messenger(new ReplyHandler(Looper.getMainLooper()));
+    @GuardedBy("mLock")
+    private ITestProcessService mService;
+
+    @GuardedBy("mLock")
+    private boolean mIsConnectionClosed = false;
 
     public static TestProcessClient createProcessA(Context context) throws Throwable {
         return new TestProcessClient(context, TestProcessServiceA.class);
@@ -59,22 +65,18 @@
         return new TestProcessClient(context, TestProcessServiceB.class);
     }
 
-    /**
-     * Subclass this to implement test code to run on the service side.
-     */
-    static abstract class TestRunnable extends Assert {
+    /** Subclass this to implement test code to run on the service side. */
+    abstract static class TestRunnable extends Assert {
         public abstract void run(Context ctx) throws Throwable;
     }
 
-    /**
-     * Subclass this to implement test code that runs on the main looper on the service side.
-     */
-    static abstract class UiThreadTestRunnable extends TestRunnable {
+    /** Subclass this to implement test code that runs on the main looper on the service side. */
+    abstract static class UiThreadTestRunnable extends TestRunnable {
         // A handler for the main thread.
         private static final Handler sMainThreadHandler = new Handler(Looper.getMainLooper());
 
         @Override
-        final public void run(Context ctx) throws Throwable {
+        public final void run(Context ctx) throws Throwable {
             final SettableFuture<Void> exceptionPropagatingFuture = SettableFuture.create();
             sMainThreadHandler.post(new Runnable() {
                 @Override
@@ -95,6 +97,7 @@
 
     static class ProcessFreshChecker extends TestRunnable {
         private static Object sFreshLock = new Object();
+
         @GuardedBy("sFreshLock")
         private static boolean sFreshProcess = true;
 
@@ -104,10 +107,9 @@
                 if (!sFreshProcess) {
                     fail("Service process was unexpectedly reused");
                 }
-                sFreshProcess = true;
+                sFreshProcess = false;
             }
         }
-
     }
 
     private TestProcessClient(Context context, Class service) throws Throwable {
@@ -124,48 +126,35 @@
         }
 
         // Check that we're using an actual fresh process.
-        // 1000ms timeout is plenty since the service is already running.
-        run(ProcessFreshChecker.class, 1000);
+        run(ProcessFreshChecker.class);
     }
 
     public void run(Class runnableClass) throws Throwable {
-        run(runnableClass, REMOTE_TIMEOUT_MS);
-    }
-
-    public void run(Class runnableClass, long timeoutMs) throws Throwable {
-        Message m = Message.obtain(null, TestProcessService.MSG_RUN_TEST);
-        m.replyTo = mReplyHandler;
-        m.getData().putString(TestProcessService.TEST_CLASS_KEY, runnableClass.getName());
-        int result;
-        Throwable exception;
+        Bundle result;
         synchronized (mLock) {
-            mService.send(m);
-            if (mLastResult == null) {
-                mLock.wait(timeoutMs);
-                if (mLastResult == null) {
-                    fail("Timeout waiting for result");
-                }
-            }
-            result = mLastResult;
-            mLastResult = null;
-            exception = mLastException;
-            mLastException = null;
+            result = mService.run(runnableClass.getName());
         }
-        if (result == TestProcessService.REPLY_EXCEPTION) {
+        Throwable exception =
+                (Throwable) result.getSerializable(TestProcessService.REPLY_EXCEPTION_KEY);
+        if (exception != null) {
             throw exception;
-        } else if (result != TestProcessService.REPLY_OK) {
-            fail("Unknown result from service: " + result);
         }
     }
 
     public void close() {
         synchronized (mLock) {
-            if (mService != null) {
-                try {
-                    mService.send(Message.obtain(null, TestProcessService.MSG_EXIT_PROCESS));
-                } catch (RemoteException e) {}
-                mService = null;
-                mContext.unbindService(this);
+            if (mIsConnectionClosed) {
+                return;
+            }
+            mIsConnectionClosed = true;
+            try {
+                if (mService != null) {
+                    mService.exit();
+                    fail("This should result in a DeadObjectException");
+                }
+            } catch (DeadObjectException e) {
+            } catch (RemoteException e) {
+                throw new RuntimeException(e);
             }
         }
     }
@@ -173,7 +162,7 @@
     @Override
     public void onServiceConnected(ComponentName className, IBinder service) {
         synchronized (mLock) {
-            mService = new Messenger(service);
+            mService = ITestProcessService.Stub.asInterface(service);
             mLock.notify();
         }
     }
@@ -183,26 +172,10 @@
         synchronized (mLock) {
             mService = null;
             mContext.unbindService(this);
-            mLastResult = TestProcessService.REPLY_EXCEPTION;
-            mLastException = new AssertionFailedError("Service disconnected unexpectedly");
             mLock.notify();
-        }
-    }
-
-    private class ReplyHandler extends Handler {
-        ReplyHandler(Looper looper) {
-            super(looper);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            synchronized (mLock) {
-                mLastResult = msg.what;
-                if (msg.what == TestProcessService.REPLY_EXCEPTION) {
-                    mLastException = (Throwable) msg.getData().getSerializable(
-                            TestProcessService.REPLY_EXCEPTION_KEY);
-                }
-                mLock.notify();
+            // Service wasn't explicitly disconnected in the close() method.
+            if (!mIsConnectionClosed) {
+                fail("Service disconnected unexpectedly");
             }
         }
     }
diff --git a/tests/tests/webkit/src/android/webkit/cts/TestProcessClientTest.java b/tests/tests/webkit/src/android/webkit/cts/TestProcessClientTest.java
new file mode 100644
index 0000000..f605f64
--- /dev/null
+++ b/tests/tests/webkit/src/android/webkit/cts/TestProcessClientTest.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright (C) 2021 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 android.webkit.cts;
+
+import android.content.Context;
+import android.os.Looper;
+import android.test.InstrumentationTestCase;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import junit.framework.Assert;
+import junit.framework.AssertionFailedError;
+
+import java.io.IOException;
+
+/**
+ * Test various scenarios of using {@link TestProcessService} and {@link TestProcessClient}
+ * framework to run tests cases in freshly created test processes.
+ */
+public class TestProcessClientTest extends InstrumentationTestCase {
+
+    static class TestRunningOnUiThread extends TestProcessClient.UiThreadTestRunnable {
+        @Override
+        protected void runOnUiThread(Context ctx) throws Throwable {
+            Assert.assertTrue(
+                    "Test is not running on the main thread",
+                    Looper.getMainLooper().isCurrentThread());
+        }
+    }
+
+    static class TestRunningOnDefaultThread extends TestProcessClient.TestRunnable {
+        private static Looper sLooper;
+
+        @Override
+        public void run(Context ctx) throws Throwable {
+            Assert.assertFalse(
+                    "Default thread should be different from the main thread",
+                    Looper.getMainLooper().isCurrentThread());
+            if (sLooper == null) {
+                sLooper = Looper.myLooper();
+                Assert.assertNotNull("The default thread should have a looper", sLooper);
+            } else {
+                Assert.assertTrue(
+                        "Test cases should run on the same thread", sLooper.isCurrentThread());
+            }
+        }
+    }
+
+    public void testRunDifferentRunnables() throws Throwable {
+        Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        try (TestProcessClient process = TestProcessClient.createProcessA(context)) {
+            process.run(TestRunningOnUiThread.class);
+            process.run(TestRunningOnDefaultThread.class);
+            process.run(TestRunningOnDefaultThread.class);
+        }
+    }
+
+    static class TestNullPointerException extends TestProcessClient.TestRunnable {
+        @Override
+        public void run(Context ctx) throws Throwable {
+            throw new NullPointerException("Test NullPointerException, should be caught");
+        }
+    }
+
+    /**
+     * Test throwing an exception that is handled by the Parcel class: {@link
+     * Parcel#writeException(java.lang.Exception)}.
+     */
+    public void testThrowingNullPointerException() throws Throwable {
+        Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        try (TestProcessClient process = TestProcessClient.createProcessA(context)) {
+            process.run(TestNullPointerException.class);
+            fail("A NullPointerException is expected to be thrown");
+        } catch (NullPointerException e) {
+
+        }
+    }
+
+    static class TestIOException extends TestProcessClient.TestRunnable {
+        @Override
+        public void run(Context ctx) throws Throwable {
+            throw new IOException("Test IOException, should be caught");
+        }
+    }
+
+    /**
+     * Test throwing an exception that is not handled by the Parcel class: {@link
+     * Parcel#writeException(java.lang.Exception)}.
+     */
+    public void testThrowingIOException() throws Throwable {
+        Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        try (TestProcessClient process = TestProcessClient.createProcessA(context)) {
+            process.run(TestIOException.class);
+            fail("An IOException is expected to be thrown");
+        } catch (IOException e) {
+        }
+    }
+
+    static class TestFailedAssertion extends TestProcessClient.TestRunnable {
+        @Override
+        public void run(Context ctx) throws Throwable {
+            fail("This assertion should be caught");
+        }
+    }
+
+    /**
+     * Test that junit assertions failures are propagated as expected.
+     */
+    public void testFailedAssertion() throws Throwable {
+        Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        try (TestProcessClient process = TestProcessClient.createProcessA(context)) {
+            process.run(TestFailedAssertion.class);
+            fail("An AssertionFailedError is expected to be thrown");
+        } catch (AssertionFailedError e) {
+            Assert.assertEquals("This assertion should be caught", e.getMessage());
+        }
+    }
+}
diff --git a/tests/tests/webkit/src/android/webkit/cts/TestProcessService.java b/tests/tests/webkit/src/android/webkit/cts/TestProcessService.java
index 499d18c..f3c80b2 100644
--- a/tests/tests/webkit/src/android/webkit/cts/TestProcessService.java
+++ b/tests/tests/webkit/src/android/webkit/cts/TestProcessService.java
@@ -17,79 +17,53 @@
 package android.webkit.cts;
 
 import android.app.Service;
-import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.IBinder;
-import android.os.Looper;
-import android.os.Message;
-import android.os.Messenger;
-import android.os.RemoteException;
 
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
+import com.google.common.util.concurrent.SettableFuture;
 
 // Subclasses are the ones that get actually used, so make this abstract
 abstract class TestProcessService extends Service {
-    static final int MSG_RUN_TEST = 0;
-    static final int MSG_EXIT_PROCESS = 1;
-    static final String TEST_CLASS_KEY = "class";
-
-    static final int REPLY_OK = 0;
-    static final int REPLY_EXCEPTION = 1;
     static final String REPLY_EXCEPTION_KEY = "exception";
 
-    @Override
-    public IBinder onBind(Intent intent) {
-        return mMessenger.getBinder();
-    }
-
-    final Messenger mMessenger;
+    private final Handler mHandler;
 
     public TestProcessService() {
-        HandlerThread backgroundThread = new HandlerThread("TestThread");
-        backgroundThread.start();
-        mMessenger = new Messenger(new IncomingHandler(backgroundThread.getLooper()));
+        HandlerThread handlerThread = new HandlerThread("TestThread");
+        handlerThread.start();
+        mHandler = new Handler(handlerThread.getLooper());
     }
 
-    private class IncomingHandler extends Handler {
-        IncomingHandler(Looper looper) {
-            super(looper);
+    private final ITestProcessService.Stub mBinder = new ITestProcessService.Stub() {
+        @Override
+        public Bundle run(String testClassName) {
+            final SettableFuture<Bundle> testResultFuture = SettableFuture.create();
+            mHandler.post(() -> {
+                Bundle testResultBundle = new Bundle();
+                try {
+                    Class testClass = Class.forName(testClassName);
+                    TestProcessClient.TestRunnable test =
+                            (TestProcessClient.TestRunnable) testClass.newInstance();
+                    test.run(TestProcessService.this);
+                } catch (Throwable t) {
+                    testResultBundle.putSerializable(REPLY_EXCEPTION_KEY, t);
+                }
+                testResultFuture.set(testResultBundle);
+            });
+            return WebkitUtils.waitForFuture(testResultFuture);
         }
 
         @Override
-        public void handleMessage(Message msg) {
-            if (msg.what == MSG_EXIT_PROCESS) {
-                System.exit(0);
-            }
-
-            try {
-                if (msg.what != MSG_RUN_TEST) {
-                    throw new AssertionFailedError("Unknown service message " + msg.what);
-                }
-
-                String testClassName = msg.getData().getString(TEST_CLASS_KEY);
-                Class testClass = Class.forName(testClassName);
-                TestProcessClient.TestRunnable test =
-                        (TestProcessClient.TestRunnable) testClass.newInstance();
-                test.run(TestProcessService.this);
-            } catch (Throwable t) {
-                try {
-                    Message m = Message.obtain(null, REPLY_EXCEPTION);
-                    m.getData().putSerializable(REPLY_EXCEPTION_KEY, t);
-                    msg.replyTo.send(m);
-                } catch (RemoteException e) {
-                    throw new RuntimeException(e);
-                }
-                return;
-            }
-
-            try {
-                msg.replyTo.send(Message.obtain(null, REPLY_OK));
-            } catch (RemoteException e) {
-                throw new RuntimeException(e);
-            }
+        public void exit() {
+            System.exit(0);
         }
+    };
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return mBinder;
     }
 }
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java b/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
index bd81019..b40e672 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebBackForwardListTest.java
@@ -27,8 +27,6 @@
 
 public class WebBackForwardListTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
 
-    private static final int TEST_TIMEOUT = 10000;
-
     private WebViewOnUiThread mOnUiThread;
 
     public WebBackForwardListTest() {
@@ -85,7 +83,7 @@
     }
 
     private void checkBackForwardList(final String... url) {
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 if (mOnUiThread.getProgress() < 100) {
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
index e658152..f7528c3 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebChromeClientTest.java
@@ -46,7 +46,6 @@
 
 @AppModeFull
 public class WebChromeClientTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
-    private static final long TEST_TIMEOUT = 5000L;
     private static final String JAVASCRIPT_UNLOAD = "javascript unload";
     private static final String LISTENER_ADDED = "listener added";
     private static final String TOUCH_RECEIVED = "touch received";
@@ -97,7 +96,7 @@
         String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
         mOnUiThread.loadUrlAndWaitForCompletion(url);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webChromeClient.hadOnProgressChanged();
@@ -116,7 +115,7 @@
         String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
         mOnUiThread.loadUrlAndWaitForCompletion(url);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webChromeClient.hadOnReceivedTitle();
@@ -148,7 +147,7 @@
         String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
         mOnUiThread.loadUrlAndWaitForCompletion(url);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webChromeClient.hadOnReceivedIcon();
@@ -173,7 +172,7 @@
         mOnUiThread.loadUrlAndWaitForCompletion(mWebServer.
                 getAssetUrl(TestHtmlConstants.JS_WINDOW_URL));
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webChromeClient.hadOnCreateWindow();
@@ -181,7 +180,7 @@
         }.run();
 
         if (expectWindowClose) {
-            new PollingCheck(TEST_TIMEOUT) {
+            new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
                 @Override
                 protected boolean check() {
                     return webChromeClient.hadOnCloseWindow();
@@ -275,7 +274,7 @@
         String url = mWebServer.getAssetUrl(TestHtmlConstants.JS_ALERT_URL);
         mOnUiThread.loadUrlAndWaitForCompletion(url);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webChromeClient.hadOnJsAlert();
@@ -300,7 +299,7 @@
         String url = mWebServer.getAssetUrl(TestHtmlConstants.JS_CONFIRM_URL);
         mOnUiThread.loadUrlAndWaitForCompletion(url);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webChromeClient.hadOnJsConfirm();
@@ -327,14 +326,14 @@
         String url = mWebServer.getAssetUrl(TestHtmlConstants.JS_PROMPT_URL);
         mOnUiThread.loadUrlAndWaitForCompletion(url);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webChromeClient.hadOnJsPrompt();
             }
         }.run();
         // the result returned by the client gets set as the page title
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return mOnUiThread.getTitle().equals(promptResult);
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java b/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
index cae5ff8..45529ec 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebHistoryItemTest.java
@@ -30,7 +30,6 @@
 
 @AppModeFull
 public class WebHistoryItemTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
-    private final static long TEST_TIMEOUT = 10000;
     private CtsTestServer mWebServer;
     private WebViewOnUiThread mOnUiThread;
     private WebIconDatabase mIconDb;
@@ -95,7 +94,7 @@
 
         String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
         mOnUiThread.loadUrlAndWaitForCompletion(url);
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return waitForIconClient.receivedIcon();
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
index 513db9b..e7fd40e 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebSettingsTest.java
@@ -22,53 +22,43 @@
 
 import android.content.Context;
 import android.graphics.Bitmap;
-import android.graphics.Color;
 import android.net.http.SslError;
 import android.os.Build;
 import android.os.Message;
 import android.platform.test.annotations.AppModeFull;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Base64;
-import android.util.Log;
 import android.view.ViewGroup;
-import android.webkit.ConsoleMessage;
 import android.webkit.SslErrorHandler;
 import android.webkit.WebChromeClient;
 import android.webkit.WebIconDatabase;
-import android.webkit.WebResourceResponse;
 import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
 import android.webkit.WebSettings;
 import android.webkit.WebSettings.TextSize;
 import android.webkit.WebStorage;
 import android.webkit.WebView;
-import android.webkit.WebViewClient;
 import android.webkit.cts.WebViewSyncLoader.WaitForLoadedClient;
 import android.webkit.cts.WebViewSyncLoader.WaitForProgressClient;
 
 import com.android.compatibility.common.util.NullWebViewUtils;
 import com.android.compatibility.common.util.PollingCheck;
+
 import com.google.common.util.concurrent.SettableFuture;
 
 import java.io.ByteArrayInputStream;
 import java.io.FileOutputStream;
 import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Tests for {@link android.webkit.WebSettings}
  */
 @AppModeFull
 public class WebSettingsTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
-
-    private static final int WEBVIEW_TIMEOUT = 5000;
     private static final String LOG_TAG = "WebSettingsTest";
 
     private final String EMPTY_IMAGE_HEIGHT = "0";
@@ -515,7 +505,7 @@
         mSettings.setJavaScriptCanOpenWindowsAutomatically(false);
         assertFalse(mSettings.getJavaScriptCanOpenWindowsAutomatically());
         mOnUiThread.loadUrl(mWebServer.getAssetUrl(TestHtmlConstants.POPUP_URL));
-        new PollingCheck(WEBVIEW_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return "Popup blocked".equals(mOnUiThread.getTitle());
@@ -536,7 +526,7 @@
         mSettings.setJavaScriptEnabled(true);
         assertTrue(mSettings.getJavaScriptEnabled());
         loadAssetUrl(TestHtmlConstants.JAVASCRIPT_URL);
-        new PollingCheck(WEBVIEW_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return "javascript on".equals(mOnUiThread.getTitle());
@@ -546,7 +536,7 @@
         mSettings.setJavaScriptEnabled(false);
         assertFalse(mSettings.getJavaScriptEnabled());
         loadAssetUrl(TestHtmlConstants.JAVASCRIPT_URL);
-        new PollingCheck(WEBVIEW_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return "javascript off".equals(mOnUiThread.getTitle());
@@ -737,7 +727,7 @@
         mSettings.setJavaScriptEnabled(true);
 
         mOnUiThread.loadUrlAndWaitForCompletion(url);
-        new PollingCheck(WEBVIEW_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             protected boolean check() {
                 return "Loaded".equals(mOnUiThread.getTitle());
             }
@@ -764,7 +754,7 @@
         mSettings.setJavaScriptEnabled(true);
 
         mOnUiThread.loadUrlAndWaitForCompletion(url);
-        new PollingCheck(WEBVIEW_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return "Loaded".equals(mOnUiThread.getTitle());
@@ -1185,29 +1175,6 @@
         assertTrue("Can enable Safe Browsing", mSettings.getSafeBrowsingEnabled());
     }
 
-    private  int[] getBitmapPixels(Bitmap bitmap, int x, int y, int width, int height) {
-        int[] pixels = new int[width * height];
-        bitmap.getPixels(pixels, 0, width, x, y, width, height);
-        return pixels;
-    }
-
-    private Map<Integer,Integer> getBitmapHistogram(Bitmap bitmap, int x, int y, int width, int height) {
-        HashMap<Integer, Integer> histogram = new HashMap();
-        for (int pixel : getBitmapPixels(bitmap, x, y, width, height)) {
-            histogram.put(pixel, histogram.getOrDefault(pixel, 0) + 1);
-        }
-        return histogram;
-    }
-
-    public void testForceDark_default() throws Throwable {
-        if (!NullWebViewUtils.isWebViewAvailable()) {
-            return;
-        }
-
-        assertEquals("The default force dark state should be AUTO",
-                mSettings.getForceDark(), WebSettings.FORCE_DARK_AUTO);
-    }
-
     private void setWebViewSize(int width, int height) {
         // Set the webview size to 64x64
         WebkitUtils.onMainThreadSync(() -> {
@@ -1220,46 +1187,6 @@
 
     }
 
-    public void testForceDark_rendersDark() throws Throwable {
-        if (!NullWebViewUtils.isWebViewAvailable()) {
-            return;
-        }
-
-        setWebViewSize(64, 64);
-
-        // Set the webview non-focusable to avoid drawing the focus highlight.
-        WebkitUtils.onMainThreadSync(() -> {
-            mOnUiThread.getWebView().setFocusable(false);
-        });
-
-        Map<Integer, Integer> histogram;
-        Integer[] colourValues;
-
-        // Loading about:blank into a force-dark-on webview should result in a dark background
-        mSettings.setForceDark(WebSettings.FORCE_DARK_ON);
-        assertEquals("Force dark should have been set to ON",
-                mSettings.getForceDark(), WebSettings.FORCE_DARK_ON);
-
-        mOnUiThread.loadUrlAndWaitForCompletion("about:blank");
-        histogram = getBitmapHistogram(mOnUiThread.captureBitmap(), 0, 0, 64, 64);
-        assertEquals("Bitmap should have a single colour", histogram.size(), 1);
-        colourValues = histogram.keySet().toArray(new Integer[0]);
-        assertThat("Bitmap colour should be dark",
-                Color.luminance(colourValues[0]), lessThan(0.5f));
-
-        // Loading about:blank into a force-dark-off webview should result in a light background
-        mSettings.setForceDark(WebSettings.FORCE_DARK_OFF);
-        assertEquals("Force dark should have been set to OFF",
-                mSettings.getForceDark(), WebSettings.FORCE_DARK_OFF);
-
-        mOnUiThread.loadUrlAndWaitForCompletion("about:blank");
-        histogram = getBitmapHistogram(mOnUiThread.captureBitmap(), 0, 0, 64, 64);
-        assertEquals("Bitmap should have a single colour", histogram.size(), 1);
-        colourValues = histogram.keySet().toArray(new Integer[0]);
-        assertThat("Bitmap colour should be light",
-                Color.luminance(colourValues[0]), greaterThan(0.5f));
-    }
-
     /**
      * Starts the internal web server. The server will be shut down automatically
      * during tearDown().
@@ -1297,7 +1224,7 @@
     }
 
     private void waitForNonEmptyImage() {
-        new PollingCheck(WEBVIEW_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return !EMPTY_IMAGE_HEIGHT.equals(mOnUiThread.getTitle());
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
index 0161540..dd10626 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewClientTest.java
@@ -51,7 +51,6 @@
 
 @AppModeFull
 public class WebViewClientTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
-    private static final long TEST_TIMEOUT = 5000;
     private static final String TEST_URL = "http://www.example.com/";
 
     private WebViewOnUiThread mOnUiThread;
@@ -78,7 +77,7 @@
         final WebViewCtsActivity activity = getActivity();
         WebView webview = activity.getWebView();
         if (webview != null) {
-            new PollingCheck(TEST_TIMEOUT) {
+            new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
                 @Override
                     protected boolean check() {
                     return activity.hasWindowFocus();
@@ -178,13 +177,13 @@
           final int childCallCount = childWebViewClient.getShouldOverrideUrlLoadingCallCount();
           mOnUiThread.loadUrl(mWebServer.getAssetUrl(TestHtmlConstants.BLANK_TAG_URL));
 
-          new PollingCheck(TEST_TIMEOUT) {
+          new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
               @Override
               protected boolean check() {
                   return childWebViewClient.hasOnPageFinishedCalled();
               }
           }.run();
-          new PollingCheck(TEST_TIMEOUT) {
+          new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
               @Override
               protected boolean check() {
                   return childWebViewClient.getShouldOverrideUrlLoadingCallCount() > childCallCount;
@@ -197,7 +196,7 @@
         final int childCallCount = childWebViewClient.getShouldOverrideUrlLoadingCallCount();
         final int mainCallCount = mainWebViewClient.getShouldOverrideUrlLoadingCallCount();
         clickOnLinkUsingJs("link", childWebViewOnUiThread);
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return childWebViewClient.getShouldOverrideUrlLoadingCallCount() > childCallCount;
@@ -230,21 +229,21 @@
         assertFalse(webViewClient.hasOnPageFinishedCalled());
         mOnUiThread.loadUrlAndWaitForCompletion(url);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webViewClient.hasOnPageStartedCalled();
             }
         }.run();
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webViewClient.hasOnLoadResourceCalled();
             }
         }.run();
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webViewClient.hasOnPageFinishedCalled();
@@ -273,7 +272,7 @@
             assertFalse(webViewClient.hasOnReceivedLoginRequest());
             mOnUiThread.loadUrlAndWaitForCompletion(url);
             assertTrue(webViewClient.hasOnReceivedLoginRequest());
-            new PollingCheck(TEST_TIMEOUT) {
+            new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
                 @Override
                 protected boolean check() {
                     return webViewClient.hasOnReceivedLoginRequest();
@@ -361,7 +360,7 @@
                 url.equals(mOnUiThread.getUrl()));
         // reloading the current URL should trigger the callback
         mOnUiThread.reload();
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webViewClient.hasOnFormResubmissionCalled();
@@ -382,7 +381,7 @@
         String url2 = mWebServer.getAssetUrl(TestHtmlConstants.BR_TAG_URL);
         mOnUiThread.loadUrlAndWaitForCompletion(url1);
         mOnUiThread.loadUrlAndWaitForCompletion(url2);
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webViewClient.hasDoUpdateVisitedHistoryCalled();
@@ -428,7 +427,7 @@
         assertFalse(webViewClient.hasOnUnhandledKeyEventCalled());
         sendKeys(KeyEvent.KEYCODE_1);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webViewClient.hasOnUnhandledKeyEventCalled();
@@ -448,7 +447,7 @@
         String url1 = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
         mOnUiThread.loadUrlAndWaitForCompletion(url1);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return mOnUiThread.canZoomIn();
@@ -456,7 +455,7 @@
         }.run();
 
         assertTrue(mOnUiThread.zoomIn());
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webViewClient.hasOnScaleChangedCalled();
@@ -618,7 +617,7 @@
         final MockWebViewClient webViewClient = new MockWebViewClient();
         mOnUiThread.setWebViewClient(webViewClient);
         mOnUiThread.loadUrl("chrome://kill");
-        new PollingCheck(TEST_TIMEOUT * 5) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return webViewClient.hasRenderProcessGoneCalled();
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewDarkModeDarkThemeTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewDarkModeDarkThemeTest.java
new file mode 100644
index 0000000..9e81c14
--- /dev/null
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewDarkModeDarkThemeTest.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright (C) 2022 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 android.webkit.cts;
+
+import static org.hamcrest.Matchers.greaterThan;
+import static org.hamcrest.Matchers.lessThan;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import android.graphics.Color;
+
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.NullWebViewUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Map;
+
+/**
+ * Tests for {@link android.webkit.WebSettings#setAlgorithmicDarkeningAllowed(boolean)}
+ */
+@RunWith(AndroidJUnit4.class)
+public class WebViewDarkModeDarkThemeTest extends WebViewDarkModeTestBase {
+
+    @Rule
+    public ActivityTestRule<WebViewDarkThemeCtsActivity> mActivityRule =
+            new ActivityTestRule<>(WebViewDarkThemeCtsActivity.class);
+
+    @Before
+    public void setUp() throws Exception {
+        init(mActivityRule.getActivity());
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        cleanup();
+    }
+
+
+    @Test
+    public void testSimplifiedDarkMode_rendersDark() throws Throwable {
+        if (!NullWebViewUtils.isWebViewAvailable()) {
+            return;
+        }
+
+        setWebViewSize(64, 64);
+
+        // Set the webview non-focusable to avoid drawing the focus highlight.
+        WebkitUtils.onMainThreadSync(() -> {
+            getOnUiThread().getWebView().setFocusable(false);
+        });
+
+        Map<Integer, Integer> histogram;
+        Integer[] colourValues;
+
+        // Loading about:blank which doesn't support dark style result in a light background.
+        assertFalse("Algorithmic darkening should be disallowed by default",
+                getSettings().isAlgorithmicDarkeningAllowed());
+
+        getOnUiThread().loadUrlAndWaitForCompletion("about:blank");
+
+        assertEquals("prefers-color-scheme shall set to dark.", "true",
+                getOnUiThread().evaluateJavascriptSync(
+                        "window.matchMedia && "
+                        + "window.matchMedia('(prefers-color-scheme: dark)').matches"));
+        histogram = getBitmapHistogram(getOnUiThread().captureBitmap(), 0, 0, 64, 64);
+        assertEquals("Bitmap should have a single colour", histogram.size(), 1);
+        colourValues = histogram.keySet().toArray(new Integer[0]);
+        assertThat("Bitmap colour should be light",
+                Color.luminance(colourValues[0]), greaterThan(0.5f));
+
+        // Allowing algorithmic darkening in dark theme app should result in a dark background.
+        getSettings().setAlgorithmicDarkeningAllowed(true);
+        assertTrue("Algorithmic darkening should be allowed",
+                getSettings().isAlgorithmicDarkeningAllowed());
+        getOnUiThread().loadUrlAndWaitForCompletion("about:blank");
+        assertEquals("prefers-color-scheme shall set to dark.", "true",
+                getOnUiThread().evaluateJavascriptSync(
+                        "window.matchMedia && "
+                        + "window.matchMedia('(prefers-color-scheme: dark)').matches"));
+        histogram = getBitmapHistogram(getOnUiThread().captureBitmap(), 0, 0, 64, 64);
+        assertEquals("Bitmap should have a single colour", histogram.size(), 1);
+        colourValues = histogram.keySet().toArray(new Integer[0]);
+        assertThat("Bitmap colour should be dark",
+                Color.luminance(colourValues[0]), lessThan(0.5f));
+    }
+}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewDarkModeLightThemeTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewDarkModeLightThemeTest.java
new file mode 100644
index 0000000..4bab6da
--- /dev/null
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewDarkModeLightThemeTest.java
@@ -0,0 +1,106 @@
+/*
+ * Copyright (C) 2022 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 android.webkit.cts;
+
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import android.graphics.Color;
+
+import androidx.test.rule.ActivityTestRule;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.NullWebViewUtils;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Map;
+
+/**
+ * Tests for {@link android.webkit.WebSettings#setAlgorithmicDarkeningAllowed(boolean)}
+ */
+@RunWith(AndroidJUnit4.class)
+public class WebViewDarkModeLightThemeTest extends WebViewDarkModeTestBase {
+
+    @Rule
+    public ActivityTestRule<WebViewLightThemeCtsActivity> mActivityRule =
+            new ActivityTestRule<>(WebViewLightThemeCtsActivity.class);
+
+    @Before
+    public void setUp() throws Exception {
+        init(mActivityRule.getActivity());
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        cleanup();
+    }
+
+
+    @Test
+    public void testSimplifedDarkMode_rendersLight() throws Throwable {
+        if (!NullWebViewUtils.isWebViewAvailable()) {
+            return;
+        }
+
+        setWebViewSize(64, 64);
+
+        // Set the webview non-focusable to avoid drawing the focus highlight.
+        WebkitUtils.onMainThreadSync(() -> {
+            getOnUiThread().getWebView().setFocusable(false);
+        });
+
+        Map<Integer, Integer> histogram;
+        Integer[] colourValues;
+
+        // Loading about:blank into a light theme app should result in a light background.
+        assertFalse("Algorithmic darkening should be disallowed by default",
+                getSettings().isAlgorithmicDarkeningAllowed());
+
+        getOnUiThread().loadUrlAndWaitForCompletion("about:blank");
+        // Verify prefers-color-scheme set to light.
+        assertEquals("false", getOnUiThread().evaluateJavascriptSync(
+                    "window.matchMedia && "
+                    + "window.matchMedia('(prefers-color-scheme: dark)').matches"));
+        histogram = getBitmapHistogram(getOnUiThread().captureBitmap(), 0, 0, 64, 64);
+        assertEquals("Bitmap should have a single colour", histogram.size(), 1);
+        colourValues = histogram.keySet().toArray(new Integer[0]);
+        assertThat("Bitmap colour should be light",
+                Color.luminance(colourValues[0]), greaterThan(0.5f));
+
+        // Allowing algorithmic darkening in a light theme app won't effect the web contents.
+        getSettings().setAlgorithmicDarkeningAllowed(true);
+        assertTrue("Algorithmic darkening should be allowed",
+                getSettings().isAlgorithmicDarkeningAllowed());
+        getOnUiThread().loadUrlAndWaitForCompletion("about:blank");
+        assertEquals("false", getOnUiThread().evaluateJavascriptSync(
+                    "window.matchMedia && "
+                    + "window.matchMedia('(prefers-color-scheme: dark)').matches"));
+        histogram = getBitmapHistogram(getOnUiThread().captureBitmap(), 0, 0, 64, 64);
+        assertEquals("Bitmap should have a single colour", histogram.size(), 1);
+        colourValues = histogram.keySet().toArray(new Integer[0]);
+        assertThat("Bitmap colour should be light",
+                Color.luminance(colourValues[0]), greaterThan(0.5f));
+    }
+}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewDarkModeTestBase.java b/tests/tests/webkit/src/android/webkit/cts/WebViewDarkModeTestBase.java
new file mode 100644
index 0000000..bdac212
--- /dev/null
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewDarkModeTestBase.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2022 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 android.webkit.cts;
+
+import android.graphics.Bitmap;
+import android.view.ViewGroup;
+import android.webkit.WebSettings;
+import android.webkit.WebView;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Base class for the dark mode related tests.
+ */
+public class WebViewDarkModeTestBase {
+
+    private WebViewOnUiThread mOnUiThread;
+    private WebSettings mSettings;
+
+    public void init(WebViewCtsActivity activity) {
+        WebView webview = activity.getWebView();
+        if (webview != null) {
+            mOnUiThread = new WebViewOnUiThread(webview);
+            mSettings = mOnUiThread.getSettings();
+            mSettings.setJavaScriptEnabled(true);
+        }
+    }
+
+    public void cleanup() {
+        if (mOnUiThread != null) {
+            mOnUiThread.cleanUp();
+        }
+    }
+
+    public void setWebViewSize(int width, int height) {
+        // Set the webview size to 64x64
+        WebkitUtils.onMainThreadSync(() -> {
+            WebView webView = mOnUiThread.getWebView();
+            ViewGroup.LayoutParams params = webView.getLayoutParams();
+            params.height = height;
+            params.width = width;
+            webView.setLayoutParams(params);
+        });
+    }
+
+    public WebViewOnUiThread getOnUiThread() {
+        return mOnUiThread;
+    }
+
+    public WebSettings getSettings() {
+        return mSettings;
+    }
+
+    private static int[] getBitmapPixels(Bitmap bitmap, int x, int y, int width, int height) {
+        int[] pixels = new int[width * height];
+        bitmap.getPixels(pixels, 0, width, x, y, width, height);
+        return pixels;
+    }
+
+    public static Map<Integer, Integer> getBitmapHistogram(
+            Bitmap bitmap, int x, int y, int width, int height) {
+        HashMap<Integer, Integer> histogram = new HashMap();
+        for (int pixel : getBitmapPixels(bitmap, x, y, width, height)) {
+            histogram.put(pixel, histogram.getOrDefault(pixel, 0) + 1);
+        }
+        return histogram;
+    }
+}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewDarkThemeCtsActivity.java b/tests/tests/webkit/src/android/webkit/cts/WebViewDarkThemeCtsActivity.java
new file mode 100644
index 0000000..d14ff27
--- /dev/null
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewDarkThemeCtsActivity.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2022 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 android.webkit.cts;
+
+/**
+ * Actitvity with dark theme regardless the device's UI mode or theme.
+ */
+public class WebViewDarkThemeCtsActivity extends WebViewCtsActivity {
+}
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewLightThemeCtsActivity.java b/tests/tests/webkit/src/android/webkit/cts/WebViewLightThemeCtsActivity.java
new file mode 100644
index 0000000..c6aee25
--- /dev/null
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewLightThemeCtsActivity.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2022 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 android.webkit.cts;
+
+/**
+ * Actitvity with light theme regardless the device's UI mode or theme.
+ */
+public class WebViewLightThemeCtsActivity extends WebViewCtsActivity {
+}
+
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewSslTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewSslTest.java
index f9496ab..1796464 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewSslTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewSslTest.java
@@ -446,7 +446,7 @@
         final WebViewCtsActivity activity = getActivity();
         mWebView = activity.getWebView();
         if (mWebView != null) {
-            new PollingCheck() {
+            new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
                 @Override
                     protected boolean check() {
                         return activity.hasWindowFocus();
@@ -561,21 +561,24 @@
         mOnUiThread.setWebViewClient(webViewClient);
         mOnUiThread.clearSslPreferences();
         mOnUiThread.loadUrlAndWaitForCompletion(url);
-        assertTrue(webViewClient.wasOnReceivedSslErrorCalled());
+        assertTrue("onReceivedSslError should be called",
+                webViewClient.wasOnReceivedSslErrorCalled());
 
         // Load the page again. We expect another call to
         // WebViewClient.onReceivedSslError() since we cleared sslpreferences.
         mOnUiThread.clearSslPreferences();
         webViewClient.resetCallCounts();
         mOnUiThread.loadUrlAndWaitForCompletion(url);
-        assertTrue(webViewClient.wasOnReceivedSslErrorCalled());
+        assertTrue("onReceivedSslError should be called again after clearing SSL preferences",
+                webViewClient.wasOnReceivedSslErrorCalled());
         assertEquals(TestHtmlConstants.HELLO_WORLD_TITLE, mOnUiThread.getTitle());
 
         // Load the page once again, without clearing the sslpreferences.
         // Make sure we do not get the callback.
         webViewClient.resetCallCounts();
         mOnUiThread.loadUrlAndWaitForCompletion(url);
-        assertFalse(webViewClient.wasOnReceivedSslErrorCalled());
+        assertFalse("onReceivedSslError should not be called when SSL preferences are not cleared",
+                webViewClient.wasOnReceivedSslErrorCalled());
         assertEquals(TestHtmlConstants.HELLO_WORLD_TITLE, mOnUiThread.getTitle());
     }
 
@@ -670,14 +673,16 @@
         mOnUiThread.setWebViewClient(webViewClient);
         mOnUiThread.clearSslPreferences();
         mOnUiThread.loadUrlAndWaitForCompletion(firstUrl);
-        assertTrue(webViewClient.wasOnReceivedSslErrorCalled());
+        assertTrue("onReceivedSslError should be called on loading first page",
+                webViewClient.wasOnReceivedSslErrorCalled());
 
         // Load the second page. We don't expect a call to
         // WebViewClient.onReceivedSslError(), but the page should load.
         webViewClient.resetCallCounts();
         final String sameHostUrl = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL2);
         mOnUiThread.loadUrlAndWaitForCompletion(sameHostUrl);
-        assertFalse(webViewClient.wasOnReceivedSslErrorCalled());
+        assertFalse("onReceivedSslError should not be called on loading second page",
+                webViewClient.wasOnReceivedSslErrorCalled());
         assertEquals("Second page", mOnUiThread.getTitle());
     }
 
@@ -693,7 +698,8 @@
         mOnUiThread.setWebViewClient(webViewClient);
         mOnUiThread.clearSslPreferences();
         mOnUiThread.loadUrlAndWaitForCompletion(firstUrl);
-        assertTrue(webViewClient.wasOnReceivedSslErrorCalled());
+        assertTrue("onReceivedSslError should be called when request is sent to localhost",
+                webViewClient.wasOnReceivedSslErrorCalled());
 
         // Load the second page. We expect another call to
         // WebViewClient.onReceivedSslError().
@@ -703,7 +709,8 @@
         final String differentHostUrl = mWebServer.getAssetUrl(TestHtmlConstants.HTML_URL2).replace(
                 "localhost", "127.0.0.1");
         mOnUiThread.loadUrlAndWaitForCompletion(differentHostUrl);
-        assertTrue(webViewClient.wasOnReceivedSslErrorCalled());
+        assertTrue("onReceivedSslError should be called when request is sent to 127.0.0.1",
+                webViewClient.wasOnReceivedSslErrorCalled());
         assertEquals("Second page", mOnUiThread.getTitle());
     }
 
@@ -955,7 +962,7 @@
         });
         // Wait until clearclientcertpreferences clears the preferences. Generally this is just a
         // thread hopping.
-        new PollingCheck(WebViewTest.TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return cleared.get();
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
index e5a0041..abe44ea 100755
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewTest.java
@@ -122,7 +122,6 @@
 
 @AppModeFull
 public class WebViewTest extends ActivityInstrumentationTestCase2<WebViewCtsActivity> {
-    public static final long TEST_TIMEOUT = 20000L;
     private static final int INITIAL_PROGRESS = 100;
     private static final String X_REQUESTED_WITH = "X-Requested-With";
     private static final String PRINTER_TEST_FILE = "print.pdf";
@@ -169,7 +168,7 @@
         final WebViewCtsActivity activity = getActivity();
         mWebView = activity.getWebView();
         if (mWebView != null) {
-            new PollingCheck() {
+            new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
                 @Override
                     protected boolean check() {
                         return activity.hasWindowFocus();
@@ -608,7 +607,7 @@
             private synchronized String waitForResult() {
                 while (!mWasProvideResultCalled) {
                     try {
-                        wait(TEST_TIMEOUT);
+                        wait(WebkitUtils.TEST_TIMEOUT_MS);
                     } catch (InterruptedException e) {
                         continue;
                     }
@@ -883,7 +882,7 @@
             });
             if (isPictureFilledWithColor(pictureRef.get(), color))
                 break;
-            new PollingCheck(TEST_TIMEOUT) {
+            new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
                 @Override
                 protected boolean check() {
                     return listener.callCount > oldCallCount;
@@ -942,7 +941,7 @@
         final String url = mWebServer.getAssetUrl(TestHtmlConstants.HELLO_WORLD_URL);
         mOnUiThread.setPictureListener(listener);
         mOnUiThread.loadUrlAndWaitForCompletion(url);
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return listener.callCount > 0;
@@ -954,7 +953,7 @@
         final int oldCallCount = listener.callCount;
         final String newUrl = mWebServer.getAssetUrl(TestHtmlConstants.SMALL_IMG_URL);
         mOnUiThread.loadUrlAndWaitForCompletion(newUrl);
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return listener.callCount > oldCallCount;
@@ -1264,7 +1263,7 @@
         };
 
         mOnUiThread.saveWebArchive(baseName, autoName, callback);
-        assertTrue(saving.tryAcquire(TEST_TIMEOUT, TimeUnit.MILLISECONDS));
+        assertTrue(saving.tryAcquire(WebkitUtils.TEST_TIMEOUT_MS, TimeUnit.MILLISECONDS));
     }
 
     public void testSaveWebArchive() throws Throwable {
@@ -1532,7 +1531,7 @@
 
         // Wait for UI thread to settle and receive page dimentions from renderer
         // such that we can invoke page down.
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                  return mOnUiThread.pageDown(false);
@@ -1557,7 +1556,7 @@
 
         // jump to the bottom
         assertTrue(mOnUiThread.pageDown(true));
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return bottomScrollY == mOnUiThread.getScrollY();
@@ -1566,7 +1565,7 @@
 
         // jump to the top
         assertTrue(mOnUiThread.pageUp(true));
-         new PollingCheck() {
+         new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return topScrollY == mOnUiThread.getScrollY();
@@ -1580,7 +1579,7 @@
         }
         mOnUiThread.loadDataAndWaitForCompletion(
                 "<html><body></body></html>", "text/html", null);
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return mOnUiThread.getScale() != 0 && mOnUiThread.getContentHeight() != 0
@@ -1620,7 +1619,7 @@
                 + "px;margin:0px auto;\">Get the height of HTML content.</p>";
         mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
                 + "</body></html>", "text/html", null);
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return mOnUiThread.getContentHeight() > pageHeight;
@@ -1630,7 +1629,7 @@
         final int extraSpace = mOnUiThread.getContentHeight() - pageHeight;
         mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
                 + p + "</body></html>", "text/html", null);
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 // |pageHeight| is accurate, |extraSpace| = getContentheight() - |pageHeight|, so it
@@ -1684,7 +1683,7 @@
                 "width:" + dimension + "px\">Test fling scroll.</p>";
         mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
                 + "</body></html>", "text/html", null);
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return mOnUiThread.getContentHeight() >= dimension;
@@ -1697,7 +1696,7 @@
 
         mOnUiThread.flingScroll(10000, 10000);
 
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return mOnUiThread.getScrollX() > previousScrollX &&
@@ -1727,7 +1726,7 @@
         handler.reset();
         getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_TAB);
         mOnUiThread.requestFocusNodeHref(hrefMsg);
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 boolean done = false;
@@ -1752,7 +1751,7 @@
         hrefMsg2.setTarget(handler);
         getInstrumentation().sendKeyDownUpSync(KeyEvent.KEYCODE_TAB);
         mOnUiThread.requestFocusNodeHref(hrefMsg2);
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 boolean done = false;
@@ -1830,7 +1829,7 @@
                         middleX, middleY, 0));
         getInstrumentation().waitForIdleSync();
         mOnUiThread.requestImageRef(msg);
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 boolean done = false;
@@ -1933,7 +1932,7 @@
         mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
                 + "</body></html>", "text/html", null);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return Math.abs(defaultScale - mOnUiThread.getScale()) < .01f;
@@ -1945,7 +1944,7 @@
         mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
                 + "2" + "</body></html>", "text/html", null);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return Math.abs(defaultScale - mOnUiThread.getScale()) < .01f;
@@ -1956,7 +1955,7 @@
         mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
                 + "3" + "</body></html>", "text/html", null);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return Math.abs(0.5 - mOnUiThread.getScale()) < .01f;
@@ -1967,7 +1966,7 @@
         mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
                 + "4" + "</body></html>", "text/html", null);
 
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return Math.abs(defaultScale - mOnUiThread.getScale()) < .01f;
@@ -2045,7 +2044,7 @@
         assertEquals(2, saveList.getCurrentIndex());
 
         // wait for the list items to get inflated
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return restoreList.getItemAtIndex(0).getUrl() != null &&
@@ -2081,7 +2080,7 @@
         String p = "<p style=\"height:" + dimension + "px;width:" + dimension + "px\">&nbsp;</p>";
         mOnUiThread.loadDataAndWaitForCompletion("<html><body>" + p
                 + "</body></html>", "text/html", null);
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return mOnUiThread.getContentHeight() >= dimension;
@@ -2180,7 +2179,7 @@
         mOnUiThread.setNetworkAvailable(false);
 
         // Wait for the DOM to receive notification of the network state change.
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return mOnUiThread.getTitle().equals("OFFLINE");
@@ -2190,7 +2189,7 @@
         mOnUiThread.setNetworkAvailable(true);
 
         // Wait for the DOM to receive notification of the network state change.
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return mOnUiThread.getTitle().equals("ONLINE");
@@ -2317,7 +2316,7 @@
 
         final String EXPECTED_TITLE = "test";
         mOnUiThread.evaluateJavascript("document.title='" + EXPECTED_TITLE + "';", null);
-        new PollingCheck(TEST_TIMEOUT) {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 return mOnUiThread.getTitle().equals(EXPECTED_TITLE);
@@ -2732,7 +2731,7 @@
 
     private void pollingCheckWebBackForwardList(final String currUrl, final int currIndex,
             final int size) {
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
             protected boolean check() {
                 WebBackForwardList list = mWebView.copyBackForwardList();
diff --git a/tests/tests/webkit/src/android/webkit/cts/WebViewZoomTest.java b/tests/tests/webkit/src/android/webkit/cts/WebViewZoomTest.java
index 2f247f2..dc160b2 100644
--- a/tests/tests/webkit/src/android/webkit/cts/WebViewZoomTest.java
+++ b/tests/tests/webkit/src/android/webkit/cts/WebViewZoomTest.java
@@ -69,7 +69,7 @@
         mOnUiThread = new WebViewOnUiThread(mWebView);
         mOnUiThread.requestFocus();
 
-        new PollingCheck() {
+        new PollingCheck(WebkitUtils.TEST_TIMEOUT_MS) {
             @Override
                 protected boolean check() {
                     return activity.hasWindowFocus();
@@ -108,7 +108,8 @@
     }
 
     private void setUpPage() throws Exception {
-        assertFalse(mWebViewClient.onScaleChangedCalled());
+        assertFalse("onScaleChanged has already been called before page has been setup",
+                mWebViewClient.onScaleChangedCalled());
         assertNull(mWebServer);
         // Pass CtsTestserver.SslMode.TRUST_ANY_CLIENT to make the server serve https URLs yet do
         // not ask client for client authentication.
@@ -261,11 +262,14 @@
         if (!NullWebViewUtils.isWebViewAvailable()) {
             return;
         }
-        assertFalse(mWebViewClient.onScaleChangedCalled());
+        assertFalse("There is an onScaleChanged before we call setUpPage()",
+                mWebViewClient.onScaleChangedCalled());
 
         setUpPage();
 
-        assertFalse(mWebViewClient.onScaleChangedCalled());
+        assertFalse("There is an onScaleChanged left over from setUpPage()",
+                mWebViewClient.onScaleChangedCalled());
+
         assertTrue(mOnUiThread.zoomIn());
         ScaleChangedState state = mWebViewClient.waitForNextScaleChange();
         assertEquals(
@@ -278,7 +282,8 @@
         // that a scale change does *not* happen.
         try {
             Thread.sleep(500);
-            assertFalse(mWebViewClient.onScaleChangedCalled());
+            assertFalse("There is an onScaleChanged left over from previous scale change",
+                    mWebViewClient.onScaleChangedCalled());
             assertEquals(currScale, mOnUiThread.getScale());
         } catch (InterruptedException e) {
             fail("Interrupted");
diff --git a/tests/tests/widget/Android.bp b/tests/tests/widget/Android.bp
index 414dd0f..98290f0 100644
--- a/tests/tests/widget/Android.bp
+++ b/tests/tests/widget/Android.bp
@@ -24,13 +24,14 @@
         "androidx.annotation_annotation",
         "androidx.test.ext.junit",
         "androidx.test.rules",
-	"ctsdeviceutillegacy-axt",
+        "ctsdeviceutillegacy-axt",
         "mockito-target-minus-junit4",
         "android-common",
         "compatibility-device-util-axt",
         "ctstestrunner-axt",
         "platform-test-annotations",
         "truth-prebuilt",
+        "CtsMockInputMethodLib",
     ],
 
     libs: ["android.test.runner"],
diff --git a/tests/tests/widget/AndroidTest.xml b/tests/tests/widget/AndroidTest.xml
index 27476fb..f2eb9ef 100644
--- a/tests/tests/widget/AndroidTest.xml
+++ b/tests/tests/widget/AndroidTest.xml
@@ -33,6 +33,16 @@
         <option name="test-file-name" value="CtsWidgetTestCases.apk" />
     </target_preparer>
 
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true" />
+        <!--
+            MockIME always needs to be installed as a full package, even when CTS is running
+            for instant apps.
+        -->
+        <option name="force-install-mode" value="FULL"/>
+        <option name="test-file-name" value="CtsMockInputMethod.apk" />
+    </target_preparer>
+
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <!--
             To fail-fast in case test-ime setup somehow failed.  Consider increasing the
diff --git a/tests/tests/widget/OWNERS b/tests/tests/widget/OWNERS
index 12f176d..2f13877 100644
--- a/tests/tests/widget/OWNERS
+++ b/tests/tests/widget/OWNERS
@@ -1,5 +1,3 @@
 # Bug component: 25700
 adamp@google.com
 mount@google.com
-shepshapard@google.com
-clarabayarri@google.com
diff --git a/tests/tests/widget/res/layout/edittext_layout.xml b/tests/tests/widget/res/layout/edittext_layout.xml
index 7157d92..5be5244 100644
--- a/tests/tests/widget/res/layout/edittext_layout.xml
+++ b/tests/tests/widget/res/layout/edittext_layout.xml
@@ -55,5 +55,12 @@
             android:autoSizeTextType="uniform"
             android:textSize="50dp"
             android:autoSizeStepGranularity="2dp" />
+
+        <EditText
+            android:id="@+id/edittext_conversion_suggestion"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textEnableTextConversionSuggestions"
+            android:text="@string/edit_text" />
     </LinearLayout>
 </ScrollView>
diff --git a/tests/tests/widget/res/layout/textview_layout.xml b/tests/tests/widget/res/layout/textview_layout.xml
index 6f1c188..5412860 100644
--- a/tests/tests/widget/res/layout/textview_layout.xml
+++ b/tests/tests/widget/res/layout/textview_layout.xml
@@ -453,6 +453,50 @@
                 android:lineSpacingMultiplier="0.5"
                 android:lineHeight="@dimen/textview_lineHeight" />
 
+            <TextView
+                android:id="@+id/textview_line_break_style_default"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sample_text" />
+
+            <TextView
+                android:id="@+id/textview_line_break_style_none"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sample_text"
+                android:lineBreakStyle="none"
+                android:lineBreakWordStyle="phrase" />
+
+            <TextView
+                android:id="@+id/textview_line_break_style_loose"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sample_text"
+                android:lineBreakStyle="loose"
+                android:lineBreakWordStyle="none" />
+
+            <TextView
+                android:id="@+id/textview_line_break_style_normal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sample_text"
+                android:lineBreakStyle="normal"
+                android:lineBreakWordStyle="phrase" />
+
+            <TextView
+                android:id="@+id/textview_line_break_style_strict"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sample_text"
+                android:lineBreakStyle="strict"
+                android:lineBreakWordStyle="none" />
+
+            <TextView
+                android:id="@+id/textview_line_break_with_style"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/sample_text"
+                style="@style/LineBreakConfig_loose_phrase" />
         </LinearLayout>
 
 </ScrollView>
diff --git a/tests/tests/widget/res/values/styles.xml b/tests/tests/widget/res/values/styles.xml
index a3ff68b..f75cabf 100644
--- a/tests/tests/widget/res/values/styles.xml
+++ b/tests/tests/widget/res/values/styles.xml
@@ -438,4 +438,17 @@
     </style>
 
     <style name="ExplicitStyle2" />
+
+    <style name="LineBreakStyle_strict">
+        <item name="android:lineBreakStyle">strict</item>
+    </style>
+
+    <style name="LineBreakWordStyle_phrase">
+        <item name="android:lineBreakWordStyle">phrase</item>
+    </style>
+
+    <style name="LineBreakConfig_loose_phrase">
+        <item name="android:lineBreakStyle">loose</item>
+        <item name="android:lineBreakWordStyle">phrase</item>
+    </style>
 </resources>
diff --git a/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java b/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
index f02f893..084aa7c 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsListViewTest.java
@@ -83,6 +83,7 @@
 import com.android.compatibility.common.util.CtsTouchUtils;
 import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.hamcrest.MatcherAssert;
 import org.junit.Before;
@@ -137,7 +138,7 @@
         // Always use the activity context
         mContext = activity;
 
-        PollingCheck.waitFor(activity::hasWindowFocus);
+        WindowUtil.waitForFocus(activity);
 
         XmlPullParser parser = mContext.getResources().getXml(R.layout.listview_layout);
         WidgetTestUtils.beginDocument(parser, "FrameLayout");
@@ -427,6 +428,8 @@
         assertEquals(v.getLeft(), r.left);
         assertEquals(v.getTop(), r.top);
         assertEquals(v.getBottom(), r.bottom);
+
+
     }
 
     @Test
@@ -475,6 +478,54 @@
     }
 
     @Test
+    public void testSelectedChildViewEnabled() throws Throwable {
+        // leave touch-mode
+        mInstrumentation.setInTouchMode(false);
+        setAdapter();
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mListView, () -> {
+            mListView.requestFocus();
+            mListView.setSelectionFromTop(1, 0);
+        });
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_TAB);
+
+        final int enabledState = (new MyListView(mContext)).getEnabledStateConstant();
+        final Drawable d = mListView.getSelector();
+        assertTrue(d.isStateful());
+        int[] state;
+        boolean enabledFound;
+
+        assertTrue(mListView.isSelectedChildViewEnabled());
+
+        // If selectedChildViewEnabled is false, then the selector shouldn't contain ENABLED state.
+        mListView.setSelectedChildViewEnabled(false);
+        assertFalse(mListView.isSelectedChildViewEnabled());
+        mActivityRule.runOnUiThread(() -> mListView.refreshDrawableState());
+        state = d.getState();
+        enabledFound = false;
+        for (int i = state.length - 1; i >= 0; i--) {
+            if (state[i] == enabledState) {
+                enabledFound = true;
+                break;
+            }
+        }
+        assertFalse(enabledFound);
+
+        // If selectedChildViewEnabled is true, then the selector should contain ENABLED state.
+        mListView.setSelectedChildViewEnabled(true);
+        assertTrue(mListView.isSelectedChildViewEnabled());
+        mActivityRule.runOnUiThread(() -> mListView.refreshDrawableState());
+        state = d.getState();
+        enabledFound = false;
+        for (int i = state.length - 1; i >= 0; i--) {
+            if (state[i] == enabledState) {
+                enabledFound = true;
+                break;
+            }
+        }
+        assertTrue(enabledFound);
+    }
+
+    @Test
     public void testSetScrollIndicators() throws Throwable {
         final Activity activity = mActivityRule.getActivity();
         TextView tv1 = (TextView) activity.findViewById(R.id.headerview1);
@@ -683,7 +734,9 @@
 
         final AbsListView.OnItemLongClickListener mockOnItemLongClickListener =
                 mock(AbsListView.OnItemLongClickListener.class);
-        listView.setOnItemLongClickListener(mockOnItemLongClickListener);
+        mActivityRule.runOnUiThread(
+                () -> listView.setOnItemLongClickListener(mockOnItemLongClickListener)
+        );
 
         verifyZeroInteractions(mockOnItemLongClickListener);
 
@@ -1220,15 +1273,20 @@
             mActivityRule.getActivity().setContentView(listView);
             listView.setAdapter(mCountriesAdapter);
         });
-
         View row = listView.getChildAt(0);
-        Rect r = new Rect();
-        r.set(0, listView.getHeight() - (row.getHeight() >> 1),
-                row.getWidth(), listView.getHeight() + (row.getHeight() >> 1));
 
+        // Initialize the test scrolled down by half the height of the first child.
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, listView, () -> {
+            listView.scrollListBy(row.getHeight() / 2);
+        });
         listView.resetIsOnScrollChangedCalled();
         assertFalse(listView.isOnScrollChangedCalled());
-        listView.requestChildRectangleOnScreen(row, r, true);
+
+        // Scroll the first child back completely into view (back to the top of the AbsListView).
+        Rect r = new Rect();
+        r.set(0, 0, row.getWidth(), row.getHeight());
+        mActivityRule.runOnUiThread(() -> listView.requestChildRectangleOnScreen(row, r, true));
+
         assertTrue(listView.isOnScrollChangedCalled());
     }
 
@@ -1401,5 +1459,9 @@
         public void resetIsOnScrollChangedCalled() {
             mIsOnScrollChangedCalled = false;
         }
+
+        public int getEnabledStateConstant() {
+            return ENABLED_STATE_SET[0];
+        }
     }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/AbsListView_ScrollTest.java b/tests/tests/widget/src/android/widget/cts/AbsListView_ScrollTest.java
index 15ba71b..d770869 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsListView_ScrollTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsListView_ScrollTest.java
@@ -43,8 +43,8 @@
 
 import com.android.compatibility.common.util.CtsTouchUtils;
 import com.android.compatibility.common.util.CtsTouchUtils.EventInjectionListener;
-import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -90,7 +90,7 @@
 
         final Activity activity = mActivityRule.getActivity();
 
-        PollingCheck.waitFor(() -> activity.hasWindowFocus());
+        WindowUtil.waitForFocus(activity);
 
         mCountriesAdapter = new ArrayAdapter<>(mContext,
                 R.layout.listitemfixed_layout, COUNTRY_LIST);
diff --git a/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java b/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java
index 9840273..43fff44 100644
--- a/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AbsSeekBarTest.java
@@ -222,7 +222,7 @@
         final int keyProgressIncrement = 2;
         mActivityRule.runOnUiThread(() -> {
             seekBar.setKeyProgressIncrement(keyProgressIncrement);
-            seekBar.setFocusable(true);
+            seekBar.setFocusableInTouchMode(true);
             seekBar.requestFocus();
         });
         PollingCheck.waitFor(1000, seekBar::hasWindowFocus);
diff --git a/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java b/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
index 417025f..c0c12b0 100644
--- a/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/AutoCompleteTextViewTest.java
@@ -77,6 +77,7 @@
 
 import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import com.google.common.collect.ImmutableList;
 
@@ -145,13 +146,11 @@
     @Before
     public void setup() {
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
-
+        WindowUtil.waitForFocus(mActivity);
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
-        mAutoCompleteTextView = (AutoCompleteTextView) mActivity
-                .findViewById(R.id.autocompletetv_edit);
-        mMockAutoCompleteTextView = (MockAutoCompleteTextView) mActivity
-                .findViewById(R.id.autocompletetv_custom);
+        mAutoCompleteTextView = mActivity.findViewById(R.id.autocompletetv_edit);
+        mAutoCompleteTextView.setFocusableInTouchMode(true);
+        mMockAutoCompleteTextView = mActivity.findViewById(R.id.autocompletetv_custom);
         mAdapter = new ArrayAdapter<>(mActivity,
                 android.R.layout.simple_dropdown_item_1line, WORDS);
         KeyCharacterMap keymap = KeyCharacterMap.load(KeyCharacterMap.VIRTUAL_KEYBOARD);
@@ -823,6 +822,15 @@
         assertFalse(mAutoCompleteTextView.isPopupShowing());
 
         WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mAutoCompleteTextView, () -> {
+            mAutoCompleteTextView.showDropDown();
+        });
+        assertTrue(mAutoCompleteTextView.isPopupShowing());
+
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_ESCAPE);
+        // KeyEscape will also close the popup.
+        assertFalse(mAutoCompleteTextView.isPopupShowing());
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mAutoCompleteTextView, () -> {
             mAutoCompleteTextView.dismissDropDown();
             mAutoCompleteTextView.setText(STRING_TEST);
         });
diff --git a/tests/tests/widget/src/android/widget/cts/CheckedTextViewTest.java b/tests/tests/widget/src/android/widget/cts/CheckedTextViewTest.java
index 4078e74..c02a47c 100644
--- a/tests/tests/widget/src/android/widget/cts/CheckedTextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/CheckedTextViewTest.java
@@ -135,9 +135,11 @@
         assertTrue(view1.isChecked());
         assertTrue(view2.isChecked());
 
-        view0.setChecked(true);
-        view1.setChecked(false);
-        view2.setChecked(false);
+        mActivityRule.runOnUiThread(() -> {
+            view0.setChecked(true);
+            view1.setChecked(false);
+            view2.setChecked(false);
+        });
         assertTrue(view0.isChecked());
         assertFalse(view1.isChecked());
         assertFalse(view2.isChecked());
diff --git a/tests/tests/widget/src/android/widget/cts/DialerFilterTest.java b/tests/tests/widget/src/android/widget/cts/DialerFilterTest.java
index e3fe5bd..c3c70f0 100644
--- a/tests/tests/widget/src/android/widget/cts/DialerFilterTest.java
+++ b/tests/tests/widget/src/android/widget/cts/DialerFilterTest.java
@@ -46,8 +46,8 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.compatibility.common.util.CtsKeyEventUtil;
-import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -70,7 +70,7 @@
     public void setup() {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
 
         mDialerFilter = (DialerFilter) mActivity.findViewById(R.id.dialer_filter);
     }
diff --git a/tests/tests/widget/src/android/widget/cts/EditTextTest.java b/tests/tests/widget/src/android/widget/cts/EditTextTest.java
index 5ea4bee..2370562 100755
--- a/tests/tests/widget/src/android/widget/cts/EditTextTest.java
+++ b/tests/tests/widget/src/android/widget/cts/EditTextTest.java
@@ -16,6 +16,8 @@
 
 package android.widget.cts;
 
+import static com.android.cts.mockime.ImeEventStreamTestUtils.expectEvent;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -27,8 +29,13 @@
 import android.content.Context;
 import android.content.res.Configuration;
 import android.graphics.Point;
+import android.os.SystemClock;
+import android.support.test.uiautomator.By;
+import android.support.test.uiautomator.UiDevice;
+import android.support.test.uiautomator.UiObject2;
 import android.text.Editable;
 import android.text.InputFilter;
+import android.text.InputType;
 import android.text.Layout;
 import android.text.Spanned;
 import android.text.TextUtils;
@@ -40,6 +47,7 @@
 import android.util.TypedValue;
 import android.util.Xml;
 import android.view.KeyEvent;
+import android.view.ViewConfiguration;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.inputmethod.EditorInfo;
 import android.widget.EditText;
@@ -54,6 +62,9 @@
 
 import com.android.compatibility.common.util.CtsKeyEventUtil;
 import com.android.compatibility.common.util.CtsTouchUtils;
+import com.android.cts.mockime.ImeEventStream;
+import com.android.cts.mockime.ImeSettings;
+import com.android.cts.mockime.MockImeSession;
 
 import org.junit.After;
 import org.junit.Before;
@@ -63,6 +74,7 @@
 import org.xmlpull.v1.XmlPullParser;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
 @SmallTest
@@ -693,4 +705,59 @@
         assertEquals(et.getFilters()[0], myFilter);
     }
 
+    @UiThreadTest
+    @Test
+    public void testInputTypeForConversionSuggestions() {
+        EditText editText = new EditText(mActivity);
+        editText.setInputType(EditorInfo.TYPE_CLASS_TEXT
+                | EditorInfo.TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS);
+        editText.setText(mActivity.getResources().getText(R.string.even_more_long_text));
+
+        // The value of the input type is put into the EditorInfo parameter, and then the
+        // InputMethodManager can retrieve the value of the input type from EditorInfo.
+        EditorInfo editorInfo = new EditorInfo();
+        editText.onCreateInputConnection(editorInfo);
+
+        assertEquals(InputType.TYPE_CLASS_TEXT
+                | InputType.TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS,
+                        editorInfo.inputType);
+    }
+
+    @UiThreadTest
+    @Test
+    public void testAttributeTextConversionSuggestion() {
+        mActivity.setContentView(R.layout.edittext_layout);
+        TextView tv = (TextView) mActivity.findViewById(
+                R.id.edittext_conversion_suggestion);
+
+        assertEquals(InputType.TYPE_CLASS_TEXT
+                | InputType.TYPE_TEXT_FLAG_ENABLE_TEXT_CONVERSION_SUGGESTIONS, tv.getInputType());
+    }
+
+    @Test
+    public void testClickTwice_showIme() throws Throwable {
+        try (MockImeSession imeSession = MockImeSession.create(
+                mInstrumentation.getContext(),
+                mInstrumentation.getUiAutomation(),
+                new ImeSettings.Builder())) {
+
+            clickOnEditText1();
+            mInstrumentation.waitForIdleSync();
+
+            clickOnEditText1();
+            mInstrumentation.waitForIdleSync();
+
+            final ImeEventStream stream = imeSession.openEventStream();
+            expectEvent(stream,
+                    event -> "showSoftInput".equals(event.getEventName()),
+                    TimeUnit.SECONDS.toMillis(2));
+        }
+    }
+
+    private void clickOnEditText1() throws Exception {
+        final UiObject2 object = UiDevice.getInstance(mInstrumentation)
+                .findObject(By.res("android.widget.cts", "edittext_simple1"));
+        object.click();
+        SystemClock.sleep(ViewConfiguration.getDoubleTapTimeout() + 50);
+    }
 }
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java
index 192d4ba..590f7f6 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewBasicTest.java
@@ -35,8 +35,8 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.compatibility.common.util.CtsKeyEventUtil;
-import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -62,7 +62,7 @@
     public void setup() {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
         mExpandableListView = mActivity.getExpandableListView();
         mAdapter = mExpandableListView.getExpandableListAdapter();
         mListUtil = new ListUtil(mExpandableListView, mInstrumentation);
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
index 5baaeeb..ac0f633 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewTest.java
@@ -55,8 +55,8 @@
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -79,7 +79,7 @@
     public void setup() {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
         mExpandableListView = mActivity.getExpandableListView();
     }
 
diff --git a/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java b/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java
index a6e0796..d18ce75 100644
--- a/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ExpandableListViewWithHeadersTest.java
@@ -32,8 +32,8 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.compatibility.common.util.CtsKeyEventUtil;
-import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -56,7 +56,7 @@
     public void setup() {
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
         mExpandableListView = mActivity.getExpandableListView();
         mListUtil = new ListUtil(mExpandableListView, mInstrumentation);
     }
diff --git a/tests/tests/widget/src/android/widget/cts/GridViewTest.java b/tests/tests/widget/src/android/widget/cts/GridViewTest.java
index 22b20a0..ab4a4f8 100644
--- a/tests/tests/widget/src/android/widget/cts/GridViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/GridViewTest.java
@@ -63,8 +63,8 @@
 import androidx.test.runner.AndroidJUnit4;
 
 import com.android.compatibility.common.util.CtsKeyEventUtil;
-import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -95,7 +95,7 @@
         mActivity = mActivityRule.getActivity();
         mGridView = (GridView) mActivity.findViewById(R.id.gridview);
 
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
     }
 
     @Test
diff --git a/tests/tests/widget/src/android/widget/cts/ImageViewTest.java b/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
index b3392b3..c1fcf20 100644
--- a/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ImageViewTest.java
@@ -324,9 +324,11 @@
         assertNull(mImageViewRegular.getDrawable());
 
         final Drawable drawable = mActivity.getDrawable(R.drawable.testimage);
+        drawable.setLevel(1);
         mImageViewRegular.setImageDrawable(drawable);
         assertTrue(mImageViewRegular.isLayoutRequested());
         assertNotNull(mImageViewRegular.getDrawable());
+        assertEquals(1, mImageViewRegular.getDrawable().getLevel());
         BitmapDrawable testimageBitmap = (BitmapDrawable) drawable;
         Drawable imageViewDrawable = mImageViewRegular.getDrawable();
         BitmapDrawable imageViewBitmap = (BitmapDrawable) imageViewDrawable;
@@ -335,6 +337,21 @@
 
     @UiThreadTest
     @Test
+    public void testSetImageLevelAfterSetImageDrawable() {
+        mImageViewRegular.setImageDrawable(null);
+        assertNull(mImageViewRegular.getDrawable());
+
+        final Drawable drawable = mActivity.getDrawable(R.drawable.testimage);
+        drawable.setLevel(1);
+        mImageViewRegular.setImageDrawable(drawable);
+        assertEquals(1, mImageViewRegular.getDrawable().getLevel());
+        mImageViewRegular.setImageLevel(3);
+        mImageViewRegular.setImageDrawable(drawable);
+        assertEquals(3, mImageViewRegular.getDrawable().getLevel());
+    }
+
+    @UiThreadTest
+    @Test
     public void testSetImageBitmap() {
         mImageViewRegular.setImageBitmap(null);
         // A BitmapDrawable is always created for the ImageView.
diff --git a/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java b/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java
index 8d9e2a2..d26f6c4 100644
--- a/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ListPopupWindowTest.java
@@ -689,6 +689,21 @@
     }
 
     @Test
+    public void testNoDefaultDismissalWithEscapeButton() {
+        mPopupWindowBuilder = new Builder().withDismissListener();
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mActivity.getWindow().getDecorView(),
+                mPopupWindowBuilder::show);
+
+        // Send ESCAPE key event. As we don't have any custom code that dismisses ListPopupWindow,
+        // and ListPopupWindow doesn't track that system-level key event on its own, ListPopupWindow
+        // should stay visible
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_ESCAPE);
+        verify(mPopupWindowBuilder.mOnDismissListener, never()).onDismiss();
+        assertTrue(mPopupWindow.isShowing());
+    }
+
+
+    @Test
     public void testCustomDismissalWithBackButton() {
         WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mActivity.getWindow().getDecorView(),
                 () -> {
diff --git a/tests/tests/widget/src/android/widget/cts/MagnifierTest.java b/tests/tests/widget/src/android/widget/cts/MagnifierTest.java
index ef3e4cd..fd39af3 100644
--- a/tests/tests/widget/src/android/widget/cts/MagnifierTest.java
+++ b/tests/tests/widget/src/android/widget/cts/MagnifierTest.java
@@ -52,8 +52,8 @@
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -92,7 +92,7 @@
     @Before
     public void setup() throws Throwable {
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
 
         mDisplayMetrics = mActivity.getResources().getDisplayMetrics();
         // Do not run the tests, unless the device screen is big enough to fit a magnifier
diff --git a/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java b/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
index 03d7187..abdb426 100644
--- a/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/MediaControllerTest.java
@@ -16,6 +16,8 @@
 
 package android.widget.cts;
 
+import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_EXT_ENABLE_ON_BACK_INVOKED_CALLBACK;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -26,6 +28,7 @@
 import android.content.Context;
 import android.util.AttributeSet;
 import android.util.Xml;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.MediaController;
@@ -151,6 +154,32 @@
         PollingCheck.waitFor(500, mMediaController::isShowing);
     }
 
+    @Test
+    public void testOnBackInvokedCallback() throws Throwable {
+        // Enable the new back dispatch
+        mActivity.getApplicationInfo().privateFlagsExt |=
+                PRIVATE_FLAG_EXT_ENABLE_ON_BACK_INVOKED_CALLBACK;
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mActivity.getWindow().getDecorView(),
+                () -> mMediaController = new MediaController(mActivity, true));
+
+        final MockMediaPlayerControl mediaPlayerControl = new MockMediaPlayerControl();
+        mMediaController.setMediaPlayer(mediaPlayerControl);
+
+        final VideoView videoView =
+                (VideoView) mActivity.findViewById(R.id.mediacontroller_videoview);
+        mMediaController.setAnchorView(videoView);
+
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mActivity.getWindow().getDecorView(),
+                mMediaController::show);
+        assertTrue(mMediaController.isShowing());
+
+        mInstrumentation.sendCharacterSync(KeyEvent.KEYCODE_BACK);
+        mInstrumentation.waitForIdleSync();
+        WidgetTestUtils.runOnMainAndDrawSync(mActivityRule, mActivity.getWindow().getDecorView(),
+                mMediaController::hide);
+        assertFalse(mMediaController.isShowing());
+    }
+
     private String prepareSampleVideo() {
         final String VIDEO_NAME   = "testvideo.3gp";
 
diff --git a/tests/tests/widget/src/android/widget/cts/SpinnerTest.java b/tests/tests/widget/src/android/widget/cts/SpinnerTest.java
index 02cc7e6..bca2bc7 100755
--- a/tests/tests/widget/src/android/widget/cts/SpinnerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/SpinnerTest.java
@@ -425,6 +425,12 @@
         TestUtils.assertAllPixelsOfColor("Drop down should be yellow", dropDownBackground,
                 dropDownBackground.getBounds().width(), dropDownBackground.getBounds().height(),
                 false, Color.YELLOW, 1, true);
+
+        waitForHasFocusMS(SPINNER_HAS_FOCUS_DELAY_MS);
+        // Dismiss the popup with the emulated escape key
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_ESCAPE);
+        // Verify that we're not showing the popup
+        PollingCheck.waitFor(() -> !mSpinnerDropdownMode.isPopupShowing());
     }
 
     @Test
@@ -463,6 +469,11 @@
         PollingCheck.waitFor(() -> mSpinnerDialogMode.isPopupShowing());
         // And test that getPopupBackground returns null
         assertNull(mSpinnerDialogMode.getPopupBackground());
+
+        // Use emulated escape key to close popup
+        mInstrumentation.sendKeyDownUpSync(KeyEvent.KEYCODE_ESCAPE);
+        // Verify that we're not showing the popup
+        PollingCheck.waitFor(() -> !mSpinnerDropdownMode.isPopupShowing());
     }
 
     private void waitForHasFocusMS(int milliseconds) {
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewFadingEdgeTest.java b/tests/tests/widget/src/android/widget/cts/TextViewFadingEdgeTest.java
index e3e1fe1..911e402 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewFadingEdgeTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewFadingEdgeTest.java
@@ -37,8 +37,8 @@
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.WidgetTestUtils;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -139,7 +139,7 @@
     @Before
     public void setup() {
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
     }
 
     @Test
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewReceiveContentTest.java b/tests/tests/widget/src/android/widget/cts/TextViewReceiveContentTest.java
index e44acde..9aceba3 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewReceiveContentTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewReceiveContentTest.java
@@ -69,7 +69,7 @@
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.After;
 import org.junit.Assert;
@@ -102,7 +102,7 @@
     @Before
     public void before() {
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
         mTextView = mActivity.findViewById(R.id.textview_text);
         mDefaultReceiver = new TextViewOnReceiveContentListener();
 
diff --git a/tests/tests/widget/src/android/widget/cts/TextViewTest.java b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
index c24510a..000ae80 100644
--- a/tests/tests/widget/src/android/widget/cts/TextViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TextViewTest.java
@@ -16,6 +16,8 @@
 
 package android.widget.cts;
 
+import static android.content.pm.ApplicationInfo.PRIVATE_FLAG_EXT_ENABLE_ON_BACK_INVOKED_CALLBACK;
+
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
@@ -66,6 +68,7 @@
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.graphics.fonts.FontStyle;
+import android.graphics.text.LineBreakConfig;
 import android.icu.lang.UCharacter;
 import android.net.Uri;
 import android.os.Bundle;
@@ -171,6 +174,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.Objects;
 
 /**
  * Test {@link TextView}.
@@ -6867,6 +6871,40 @@
         verify(mockActionModeCallback, times(1)).onDestroyActionMode(any(ActionMode.class));
     }
 
+    @Test
+    public void testOnBackInvokedCallback() throws Throwable {
+        final String text = "abcde";
+        // Enable the new back dispatch
+        mActivity.getApplicationInfo().privateFlagsExt |=
+                PRIVATE_FLAG_EXT_ENABLE_ON_BACK_INVOKED_CALLBACK;
+        mActivityRule.runOnUiThread(() -> {
+            mTextView = new EditText(mActivity);
+            mActivity.setContentView(mTextView);
+            mTextView.setText(text, BufferType.SPANNABLE);
+            mTextView.setTextIsSelectable(true);
+            mTextView.requestFocus();
+            mTextView.setSelected(true);
+            mTextView.setTextClassifier(TextClassifier.NO_OP);
+        });
+
+        mInstrumentation.waitForIdleSync();
+        mActivityRule.runOnUiThread(() -> {
+            // Set selection and try to start action mode.
+            final Bundle args = new Bundle();
+            args.putInt(AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_START_INT, 0);
+            args.putInt(AccessibilityNodeInfo.ACTION_ARGUMENT_SELECTION_END_INT, text.length());
+            mTextView.performAccessibilityAction(
+                    AccessibilityNodeInfo.ACTION_SET_SELECTION, args);
+        });
+        mInstrumentation.waitForIdleSync();
+        assertTrue(mTextView.hasSelection());
+
+        // Trigger back
+        mInstrumentation.sendCharacterSync(KeyEvent.KEYCODE_BACK);
+        mInstrumentation.waitForIdleSync();
+        assertFalse(mTextView.hasSelection());
+    }
+
     @UiThreadTest
     @Test
     public void testSetAndGetCustomInsertionActionMode() {
@@ -8548,6 +8586,15 @@
 
         mTextView.setTextMetricsParams(param);
         assertTrue(param.equals(mTextView.getTextMetricsParams()));
+
+        mTextView.setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_STRICT);
+        mTextView.setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE);
+
+        PrecomputedText.Params resultParams = mTextView.getTextMetricsParams();
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_STRICT,
+                resultParams.getLineBreakConfig().getLineBreakStyle());
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE,
+                resultParams.getLineBreakConfig().getLineBreakWordStyle());
     }
 
     @Test
@@ -8591,6 +8638,225 @@
     }
 
     @Test
+    public void testLineBreakConfigDefaultValue() {
+        final Context context = InstrumentationRegistry.getTargetContext();
+        final TextView textView = new TextView(context);
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_NONE, textView.getLineBreakStyle());
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE, textView.getLineBreakWordStyle());
+    }
+
+    @UiThreadTest
+    @Test
+    public void testSetGetLineBreakConfig() {
+        TextView tv = new TextView(mActivity);
+        tv.setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_NONE);
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_NONE, tv.getLineBreakStyle());
+
+        tv.setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_LOOSE);
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_LOOSE, tv.getLineBreakStyle());
+
+        tv.setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_NORMAL);
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_NORMAL, tv.getLineBreakStyle());
+
+        tv.setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_STRICT);
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_STRICT, tv.getLineBreakStyle());
+
+        tv.setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE);
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE, tv.getLineBreakWordStyle());
+
+        tv.setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE);
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE, tv.getLineBreakWordStyle());
+    }
+
+    @Test
+    public void testUpdateLineBreakConfigBuilder() {
+        LineBreakConfig.Builder builder = new LineBreakConfig.Builder();
+        builder.setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_STRICT)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE);
+        LineBreakConfig resultConfig = builder.build();
+
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_STRICT, resultConfig.getLineBreakStyle());
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE,
+                resultConfig.getLineBreakWordStyle());
+    }
+
+    @Test
+    public void testLineBreakConfigByStyle() {
+        TextView defaultTv = findTextView(R.id.textview_line_break_style_default);
+        TextView nonePhraseTv = findTextView(R.id.textview_line_break_style_none);
+        TextView looseNoneTv = findTextView(R.id.textview_line_break_style_loose);
+        TextView normalPhraseTv = findTextView(R.id.textview_line_break_style_normal);
+        TextView strictNoneTv = findTextView(R.id.textview_line_break_style_strict);
+        TextView loosePhraseTv = findTextView(R.id.textview_line_break_with_style);
+
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_NONE, defaultTv.getLineBreakStyle());
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE, defaultTv.getLineBreakWordStyle());
+
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_NONE, nonePhraseTv.getLineBreakStyle());
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE,
+                nonePhraseTv.getLineBreakWordStyle());
+
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_LOOSE, looseNoneTv.getLineBreakStyle());
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE,
+                looseNoneTv.getLineBreakWordStyle());
+
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_NORMAL, normalPhraseTv.getLineBreakStyle());
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE,
+                normalPhraseTv.getLineBreakWordStyle());
+
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_STRICT, strictNoneTv.getLineBreakStyle());
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE,
+                strictNoneTv.getLineBreakWordStyle());
+
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_LOOSE, loosePhraseTv.getLineBreakStyle());
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE,
+                loosePhraseTv.getLineBreakWordStyle());
+    }
+
+    @Test
+    public void testLineBreakConfigWithTextAppearance() {
+        TextView textView = new TextView(mActivity);
+        textView.setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_LOOSE);
+        textView.setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE);
+
+        // Override the line break config via TextAppearance.
+        textView.setTextAppearance(R.style.LineBreakStyle_strict);
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_STRICT, textView.getLineBreakStyle());
+
+        textView.setTextAppearance(R.style.LineBreakWordStyle_phrase);
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE,
+                textView.getLineBreakWordStyle());
+
+        textView.setTextAppearance(R.style.LineBreakConfig_loose_phrase);
+        assertEquals(LineBreakConfig.LINE_BREAK_STYLE_LOOSE, textView.getLineBreakStyle());
+        assertEquals(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE,
+                textView.getLineBreakWordStyle());
+    }
+
+    @Test
+    public void testLineBreakStyleEquals_returnsFalseIfStyleIsDifferent() {
+        LineBreakConfig looseNoneConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_LOOSE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+
+        LineBreakConfig normalNoneConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_NORMAL)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+
+        LineBreakConfig strictNoneConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_STRICT)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+
+        // Verify the lineBreakConfig instances are not equals.
+        assertFalse(looseNoneConfig.equals(normalNoneConfig));
+        assertFalse(looseNoneConfig.equals(strictNoneConfig));
+        assertFalse(normalNoneConfig.equals(strictNoneConfig));
+        assertFalse(Objects.equals(looseNoneConfig, normalNoneConfig));
+        assertFalse(Objects.equals(looseNoneConfig, strictNoneConfig));
+        assertFalse(Objects.equals(normalNoneConfig, strictNoneConfig));
+    }
+
+    @Test
+    public void testLineBreakStyleEquals_returnsTrueIfStyleIsNotDifferent() {
+        LineBreakConfig looseNoneConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_LOOSE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+
+        LineBreakConfig newLooseNoneConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_LOOSE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+
+        assertTrue(newLooseNoneConfig.equals(looseNoneConfig));
+        assertTrue(Objects.equals(newLooseNoneConfig, looseNoneConfig));
+
+        LineBreakConfig normalNoneConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_NORMAL)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+
+        LineBreakConfig newNormalNoneConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_NORMAL)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+
+        assertTrue(newNormalNoneConfig.equals(normalNoneConfig));
+        assertTrue(Objects.equals(newNormalNoneConfig, normalNoneConfig));
+
+        LineBreakConfig strictNoneConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_STRICT)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+
+        LineBreakConfig newStringNoneStrictConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_STRICT)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+
+        assertTrue(newStringNoneStrictConfig.equals(strictNoneConfig));
+        assertTrue(Objects.equals(newStringNoneStrictConfig, strictNoneConfig));
+    }
+
+    @Test
+    public void testLineBreakWordStyleEquals_returnsFalseIfWordStyleIsDifferent() {
+        LineBreakConfig nonePhraseConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_NONE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE).build();
+
+        LineBreakConfig noneNoneConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_NONE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE).build();
+
+        // Verify the lineBreakConfig instances are not equals.
+        assertFalse(nonePhraseConfig.equals(noneNoneConfig));
+        assertFalse(Objects.equals(nonePhraseConfig, noneNoneConfig));
+    }
+
+    @Test
+    public void testLineBreakWordStyleEquals_returnsTrueIfWordStyleIsNotDifferent() {
+        LineBreakConfig nonePhraseConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_NONE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE).build();
+
+        LineBreakConfig newNonePhraseConfig = new LineBreakConfig.Builder()
+                .setLineBreakStyle(LineBreakConfig.LINE_BREAK_STYLE_NONE)
+                .setLineBreakWordStyle(LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE).build();
+        assertTrue(nonePhraseConfig.equals(newNonePhraseConfig));
+        assertTrue(Objects.equals(nonePhraseConfig, newNonePhraseConfig));
+    }
+
+    @Test
+    public void testLineBreakConfigEquals_returnFalseIfValueOfConfigIsDifferent() {
+        LineBreakConfig[] lineBreakConfigArray = new LineBreakConfig[8];
+
+        int[] lineBreakStyleArray = {
+            LineBreakConfig.LINE_BREAK_STYLE_NONE,
+            LineBreakConfig.LINE_BREAK_STYLE_LOOSE,
+            LineBreakConfig.LINE_BREAK_STYLE_NORMAL,
+            LineBreakConfig.LINE_BREAK_STYLE_STRICT,
+        };
+
+        int[] lineBreakWordStyleArray = {
+            LineBreakConfig.LINE_BREAK_WORD_STYLE_NONE,
+            LineBreakConfig.LINE_BREAK_WORD_STYLE_PHRASE,
+        };
+
+        int index = 0;
+        for (int lineBreakStyle : lineBreakStyleArray) {
+            for (int lineBreakWordStyle : lineBreakWordStyleArray) {
+                lineBreakConfigArray[index++] = new LineBreakConfig.Builder()
+                        .setLineBreakStyle(lineBreakStyle)
+                        .setLineBreakWordStyle(lineBreakWordStyle).build();
+            }
+        }
+
+        // Verify the lineBreakConfig instances are not equal.
+        for (int i = 0; i < lineBreakConfigArray.length - 1; i++) {
+            LineBreakConfig lbConfig = lineBreakConfigArray[i];
+            for (int j = i + 1; j < lineBreakConfigArray.length; j++) {
+                LineBreakConfig comparedLbConfig = lineBreakConfigArray[j];
+                assertFalse(lbConfig.equals(comparedLbConfig));
+                assertFalse(Objects.equals(lbConfig, comparedLbConfig));
+            }
+        }
+    }
+
+    @Test
     public void testHyphenationFrequencyDefaultValue() {
         final Context context = InstrumentationRegistry.getTargetContext();
         final TextView textView = new TextView(context);
diff --git a/tests/tests/widget/src/android/widget/cts/TimePickerTest.java b/tests/tests/widget/src/android/widget/cts/TimePickerTest.java
index 9e4e8b3..6f7bbeb 100644
--- a/tests/tests/widget/src/android/widget/cts/TimePickerTest.java
+++ b/tests/tests/widget/src/android/widget/cts/TimePickerTest.java
@@ -46,7 +46,7 @@
 
 import com.android.compatibility.common.util.CtsKeyEventUtil;
 import com.android.compatibility.common.util.CtsTouchUtils;
-import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -78,7 +78,7 @@
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mActivity = mActivityRule.getActivity();
         mTimePicker = (TimePicker) mActivity.findViewById(R.id.timepicker_clock);
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
     }
 
     @Test
diff --git a/tests/tests/widget/src/android/widget/cts/ToastTest.java b/tests/tests/widget/src/android/widget/cts/ToastTest.java
index 01339eb..e21a64c 100644
--- a/tests/tests/widget/src/android/widget/cts/ToastTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ToastTest.java
@@ -266,7 +266,7 @@
         assertNull(view.getParent());
         assertEquals(View.VISIBLE, view.getVisibility());
 
-        runOnMainAndDrawSync(view, mToast::show);
+        runOnMainAndDrawSync(view, () -> showToastWithNotificationPermission(mToast));
 
         // view will be attached to screen when show it
         assertEquals(View.VISIBLE, view.getVisibility());
@@ -277,7 +277,7 @@
     public void testShow_whenTextToast() throws Throwable {
         makeTextToast();
 
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToastWithNotificationPermission(mToast));
 
         assertTextToastShownAndHidden();
     }
@@ -288,7 +288,7 @@
         // Measure the length of a long toast.
         makeTextToast();
         long start1 = SystemClock.uptimeMillis();
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToastWithNotificationPermission(mToast));
         assertEquals(Toast.LENGTH_LONG, mToast.getDuration());
         assertTextToastShownAndHidden();
         long longDurationMs = SystemClock.uptimeMillis() - start1;
@@ -296,10 +296,10 @@
         // Call show in the middle of the toast duration.
         makeTextToast();
         long start2 = SystemClock.uptimeMillis();
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToastWithNotificationPermission(mToast));
         assertEquals(Toast.LENGTH_LONG, mToast.getDuration());
         SystemClock.sleep(longDurationMs / 2);
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToastWithNotificationPermission(mToast));
         assertTextToastShownAndHidden();
         long repeatCallDurationMs = SystemClock.uptimeMillis() - start2;
 
@@ -315,7 +315,7 @@
         // Measure the length of a long toast.
         makeCustomToast();
         long start1 = SystemClock.uptimeMillis();
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToastWithNotificationPermission(mToast));
         assertEquals(Toast.LENGTH_LONG, mToast.getDuration());
         assertCustomToastShownAndHidden(mToast.getView());
         long longDurationMs = SystemClock.uptimeMillis() - start1;
@@ -323,10 +323,10 @@
         // Call show in the middle of the toast duration.
         makeCustomToast();
         long start2 = SystemClock.uptimeMillis();
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToastWithNotificationPermission(mToast));
         assertEquals(Toast.LENGTH_LONG, mToast.getDuration());
         SystemClock.sleep(longDurationMs / 2);
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToastWithNotificationPermission(mToast));
         assertCustomToastShownAndHidden(mToast.getView());
         long repeatCallDurationMs = SystemClock.uptimeMillis() - start2;
 
@@ -342,7 +342,7 @@
         Toast toast = new Toast(mContext);
         // do not have any views or text
         assertNull(toast.getView());
-        toast.show();
+        showToastWithNotificationPermission(mToast);
     }
 
     @Test
@@ -354,7 +354,7 @@
         // view has not been attached to screen yet
         assertNull(view.getParent());
         mActivityRule.runOnUiThread(() -> {
-            mToast.show();
+            showToastWithNotificationPermission(mToast);
             mToast.cancel();
         });
 
@@ -372,7 +372,7 @@
 
         runOnMainAndDrawSync(imageView, () -> {
             mToast.setView(imageView);
-            mToast.show();
+            showToastWithNotificationPermission(mToast);
         });
         assertSame(imageView, mToast.getView());
         assertCustomToastShownAndHidden(imageView);
@@ -382,7 +382,8 @@
     public void testAccessDuration_whenCustomToast() throws Throwable {
         long start = SystemClock.uptimeMillis();
         makeCustomToast();
-        runOnMainAndDrawSync(mToast.getView(), mToast::show);
+        runOnMainAndDrawSync(mToast.getView(),
+                () -> showToastWithNotificationPermission(mToast));
         assertEquals(Toast.LENGTH_LONG, mToast.getDuration());
 
         View view = mToast.getView();
@@ -392,7 +393,7 @@
         start = SystemClock.uptimeMillis();
         runOnMainAndDrawSync(mToast.getView(), () -> {
             mToast.setDuration(Toast.LENGTH_SHORT);
-            mToast.show();
+            showToastWithNotificationPermission(mToast);
         });
         assertEquals(Toast.LENGTH_SHORT, mToast.getDuration());
 
@@ -407,7 +408,7 @@
     public void testAccessDuration_whenTextToast() throws Throwable {
         long start = SystemClock.uptimeMillis();
         makeTextToast();
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToast(mToast, true));
         assertEquals(Toast.LENGTH_LONG, mToast.getDuration());
 
         assertTextToastShownAndHidden();
@@ -417,7 +418,7 @@
         makeTextToast();
         mActivityRule.runOnUiThread(() -> {
             mToast.setDuration(Toast.LENGTH_SHORT);
-            mToast.show();
+            showToastWithNotificationPermission(mToast);
         });
         assertEquals(Toast.LENGTH_SHORT, mToast.getDuration());
 
@@ -432,7 +433,7 @@
         makeCustomToast();
         final Runnable showToast = () -> {
             mToast.setDuration(Toast.LENGTH_SHORT);
-            mToast.show();
+            showToastWithNotificationPermission(mToast);
         };
         long start = SystemClock.uptimeMillis();
         runOnMainAndDrawSync(mToast.getView(), showToast);
@@ -463,7 +464,7 @@
         makeTextToast();
         final Runnable showToast = () -> {
             mToast.setDuration(Toast.LENGTH_SHORT);
-            mToast.show();
+            showToastWithNotificationPermission(mToast);
         };
         long start = SystemClock.uptimeMillis();
         mActivityRule.runOnUiThread(showToast);
@@ -505,7 +506,7 @@
                 lock.notifyAll();
             }
         };
-        manager.addAccessibilityServicesStateChangeListener(listener, null);
+        manager.addAccessibilityServicesStateChangeListener(listener);
         try {
             TestUtils.waitOn(lock,
                     () -> manager.getRecommendedTimeoutMillis(0,
@@ -536,7 +537,7 @@
         final float vertical1 = 1.0f;
         runOnMainAndDrawSync(view, () -> {
             mToast.setMargin(horizontal1, vertical1);
-            mToast.show();
+            showToastWithNotificationPermission(mToast);
             registerLayoutListener(mToast.getView());
         });
         assertCustomToastShown(view);
@@ -556,7 +557,7 @@
         final float vertical2 = 0.1f;
         runOnMainAndDrawSync(view, () -> {
             mToast.setMargin(horizontal2, vertical2);
-            mToast.show();
+            showToastWithNotificationPermission(mToast);
             registerLayoutListener(mToast.getView());
         });
         assertCustomToastShown(view);
@@ -594,7 +595,7 @@
         makeCustomToast();
         runOnMainAndDrawSync(mToast.getView(), () -> {
             mToast.setGravity(Gravity.CENTER, 0, 0);
-            mToast.show();
+            showToastWithNotificationPermission(mToast);
             registerLayoutListener(mToast.getView());
         });
         View view = mToast.getView();
@@ -609,7 +610,7 @@
 
         runOnMainAndDrawSync(mToast.getView(), () -> {
             mToast.setGravity(Gravity.BOTTOM, 0, 0);
-            mToast.show();
+            showToastWithNotificationPermission(mToast);
             registerLayoutListener(mToast.getView());
         });
         view = mToast.getView();
@@ -765,7 +766,7 @@
                     mToast.removeCallback(testCallback);
                 });
 
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToastWithNotificationPermission(mToast));
 
         assertTextToastShownAndHidden();
         assertFalse(toastShown.isDone());
@@ -788,7 +789,7 @@
                     mToast.addCallback(new ConditionCallback(toastShown, toastHidden));
                 });
 
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToastWithNotificationPermission(mToast));
 
         assertTrue(toastShown.block(TIME_OUT));
         assertTrue(toastHidden.block(TIME_OUT));
@@ -802,17 +803,20 @@
         mActivityRule.runOnUiThread(
                 () -> mToast.addCallback(new ConditionCallback(toastShown, toastHidden)));
 
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToastWithNotificationPermission(mToast));
 
         assertTrue(toastShown.block(TIME_OUT));
         assertTrue(toastHidden.block(TIME_OUT));
     }
 
     @Test
-    public void testTextToastAllowed_whenInTheForeground() throws Throwable {
+    public void testTextToastAllowed_whenInTheForeground()
+            throws Throwable {
         makeTextToast();
 
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(
+                () -> showToastWithoutNotificationPermission(mToast)
+        );
 
         assertTextToastShownAndHidden();
     }
@@ -824,24 +828,47 @@
         // View has not been attached to screen yet
         assertNull(view.getParent());
 
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(
+                () -> showToastWithoutNotificationPermission(mToast)
+        );
 
         assertCustomToastShownAndHidden(view);
     }
 
     @Test
-    public void testTextToastAllowed_whenInTheBackground() throws Throwable {
+    public void testTextToastAllowed_whenInTheBackground_withNotificationPermission()
+            throws Throwable {
         assumeFalse("Skipping test: Watch does not support new Toast behavior yet", isWatch());
         // Make it background
         mActivityRule.finishActivity();
         makeTextToast();
 
-        mActivityRule.runOnUiThread(mToast::show);
-
+        mActivityRule.runOnUiThread(
+                () -> showToastWithNotificationPermission(mToast)
+        );
         assertTextToastShownAndHidden();
     }
 
     @Test
+    public void testTextToastNotAllowed_whenInTheBackground_withoutNotificationPermission()
+            throws Throwable {
+        assumeFalse("Skipping test: Watch does not support new Toast behavior yet", isWatch());
+
+        // Make it background
+        mActivityRule.finishActivity();
+        // may take time for the app process importance to get downgraded from foreground:
+        SystemClock.sleep(TIME_FOR_UI_OPERATION);
+
+        List<TextToastInfo> toastInfoList = createTextToasts(1, "Text", Toast.LENGTH_SHORT);
+
+        mActivityRule.runOnUiThread(
+                () -> showToastWithoutNotificationPermission(toastInfoList.get(0).getToast())
+        );
+
+        assertTextToastNotShown(toastInfoList.get(0));
+    }
+
+    @Test
     public void testCustomToastBlocked_whenInTheBackground() throws Throwable {
         // Make it background
         mActivityRule.finishActivity();
@@ -850,7 +877,7 @@
         // View has not been attached to screen yet
         assertNull(view.getParent());
 
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToastWithNotificationPermission(mToast));
 
         assertCustomToastNotShown(view);
     }
@@ -870,7 +897,7 @@
         makeCustomToast();
         View view = mToast.getView();
 
-        mActivityRule.runOnUiThread(mToast::show);
+        mActivityRule.runOnUiThread(() -> showToastWithNotificationPermission(mToast));
 
         assertCustomToastNotShown(view);
 
@@ -906,8 +933,10 @@
                 event -> event.getEventType() == AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED;
 
         AccessibilityEvent event = mUiAutomation.executeAndWaitForEvent(
-                () -> uncheck(() -> mActivityRule.runOnUiThread(mToast::show)), filter, TIME_OUT);
-
+                () -> uncheck(() -> mActivityRule.runOnUiThread(
+                        () -> showToastWithNotificationPermission(mToast))),
+                filter,
+                TIME_OUT);
         assertThat(event.getEventType()).isEqualTo(
                 AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED);
         assertThat(event.getClassName()).isEqualTo(Toast.class.getCanonicalName());
@@ -922,7 +951,10 @@
                 event -> event.getEventType() == AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED;
 
         AccessibilityEvent event = mUiAutomation.executeAndWaitForEvent(
-                () -> uncheck(() -> mActivityRule.runOnUiThread(mToast::show)), filter, TIME_OUT);
+                () -> uncheck(() -> mActivityRule.runOnUiThread(
+                        () -> showToastWithNotificationPermission(mToast))),
+                filter,
+                TIME_OUT);
 
         assertThat(event.getEventType()).isEqualTo(
                 AccessibilityEvent.TYPE_NOTIFICATION_STATE_CHANGED);
@@ -1063,14 +1095,14 @@
     private void showToasts(List<? extends ToastInfo> toasts) throws Throwable {
         mActivityRule.runOnUiThread(() -> {
             for (ToastInfo t : toasts) {
-                t.getToast().show();
+                showToast(t.getToast(), /* run with POST_NOTIFICATION permission */true);
             }
         });
     }
 
     private void showToast(ToastInfo toast) throws Throwable {
         mActivityRule.runOnUiThread(() -> {
-            toast.getToast().show();
+            showToast(toast.getToast(), /* run with POST_NOTIFICATION permission */true);
         });
     }
 
@@ -1144,6 +1176,22 @@
         }
     }
 
+    private static void showToastWithNotificationPermission(Toast toast) {
+        showToast(toast, true);
+    }
+
+    private static void showToastWithoutNotificationPermission(Toast toast) {
+        showToast(toast, false);
+    }
+
+    private static void showToast(Toast toast, boolean runWithPostNotificationPermission) {
+        if (runWithPostNotificationPermission) {
+            SystemUtil.runWithShellPermissionIdentity(() -> toast.show());
+        } else {
+            toast.show();
+        }
+    }
+
     private interface ThrowingRunnable {
         void run() throws Throwable;
     }
diff --git a/tests/tests/widget/src/android/widget/cts/inline/InlineContentViewTest.java b/tests/tests/widget/src/android/widget/cts/inline/InlineContentViewTest.java
index 7ac3bc5..ff8875e 100644
--- a/tests/tests/widget/src/android/widget/cts/inline/InlineContentViewTest.java
+++ b/tests/tests/widget/src/android/widget/cts/inline/InlineContentViewTest.java
@@ -32,7 +32,7 @@
 import androidx.test.rule.ActivityTestRule;
 import androidx.test.runner.AndroidJUnit4;
 
-import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.WindowUtil;
 
 import org.junit.Before;
 import org.junit.Rule;
@@ -60,7 +60,7 @@
         mInstrumentation = InstrumentationRegistry.getInstrumentation();
         mContext = mInstrumentation.getTargetContext();
         mActivity = mActivityRule.getActivity();
-        PollingCheck.waitFor(mActivity::hasWindowFocus);
+        WindowUtil.waitForFocus(mActivity);
         mInlineContentView = new InlineContentView(mContext);
     }
 
diff --git a/tests/tests/widget29/OWNERS b/tests/tests/widget29/OWNERS
index 03429e3..d415939 100644
--- a/tests/tests/widget29/OWNERS
+++ b/tests/tests/widget29/OWNERS
@@ -1,6 +1,5 @@
 # Bug component: 25700
 adamp@google.com
 mount@google.com
-shepshapard@google.com
 clarabayarri@google.com
 brufino@google.com
diff --git a/tests/tests/widget29/src/android/widget/cts29/ToastTest.java b/tests/tests/widget29/src/android/widget/cts29/ToastTest.java
index 8269843..725415d 100644
--- a/tests/tests/widget29/src/android/widget/cts29/ToastTest.java
+++ b/tests/tests/widget29/src/android/widget/cts29/ToastTest.java
@@ -284,7 +284,7 @@
                 lock.notifyAll();
             }
         };
-        manager.addAccessibilityServicesStateChangeListener(listener, null);
+        manager.addAccessibilityServicesStateChangeListener(listener);
         try {
             TestUtils.waitOn(lock,
                     () -> manager.getRecommendedTimeoutMillis(0,
diff --git a/tests/tests/wifi/AndroidManifest.xml b/tests/tests/wifi/AndroidManifest.xml
index 0e40a37..d2acb5a 100644
--- a/tests/tests/wifi/AndroidManifest.xml
+++ b/tests/tests/wifi/AndroidManifest.xml
@@ -35,6 +35,8 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES"
+                     android:usesPermissionFlags="neverForLocation" />
 
     <!-- usesCleartextTraffic is needed by WifiManagerTest#sendTraffic to send HTTP traffic
          (as opposed to HTTPS). -->
diff --git a/tests/tests/wifi/AndroidTest.xml b/tests/tests/wifi/AndroidTest.xml
index 421a9f7..5da40ea 100644
--- a/tests/tests/wifi/AndroidTest.xml
+++ b/tests/tests/wifi/AndroidTest.xml
@@ -43,6 +43,5 @@
 
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
         <option name="mainline-module-package-name" value="com.google.android.wifi" />
-        <option name="mainline-module-package-name" value="com.google.android.tethering" />
     </object>
 </configuration>
diff --git a/tests/tests/wifi/src/android/net/wifi/aware/cts/SingleDeviceTest.java b/tests/tests/wifi/src/android/net/wifi/aware/cts/SingleDeviceTest.java
index e50d3a6..0f0c739 100644
--- a/tests/tests/wifi/src/android/net/wifi/aware/cts/SingleDeviceTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/aware/cts/SingleDeviceTest.java
@@ -17,6 +17,7 @@
 package android.net.wifi.aware.cts;
 
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.mock;
 
 import android.content.BroadcastReceiver;
@@ -30,7 +31,9 @@
 import android.net.NetworkCapabilities;
 import android.net.NetworkRequest;
 import android.net.wifi.WifiManager;
+import android.net.wifi.WifiScanner;
 import android.net.wifi.aware.AttachCallback;
+import android.net.wifi.aware.AwareParams;
 import android.net.wifi.aware.AwareResources;
 import android.net.wifi.aware.Characteristics;
 import android.net.wifi.aware.DiscoverySession;
@@ -40,8 +43,10 @@
 import android.net.wifi.aware.PeerHandle;
 import android.net.wifi.aware.PublishConfig;
 import android.net.wifi.aware.PublishDiscoverySession;
+import android.net.wifi.aware.ServiceDiscoveryInfo;
 import android.net.wifi.aware.SubscribeConfig;
 import android.net.wifi.aware.SubscribeDiscoverySession;
+import android.net.wifi.aware.WifiAwareDataPathSecurityConfig;
 import android.net.wifi.aware.WifiAwareManager;
 import android.net.wifi.aware.WifiAwareNetworkSpecifier;
 import android.net.wifi.aware.WifiAwareSession;
@@ -53,6 +58,8 @@
 import android.os.Parcel;
 import android.platform.test.annotations.AppModeFull;
 
+import androidx.test.filters.SdkSuppress;
+
 import com.android.compatibility.common.util.ApiLevelUtil;
 import com.android.compatibility.common.util.ShellIdentityUtils;
 import com.android.compatibility.common.util.SystemUtil;
@@ -103,7 +110,7 @@
     // used to store any WifiAwareSession allocated during tests - will clean-up after tests
     private List<WifiAwareSession> mSessions = new ArrayList<>();
 
-    private class WifiAwareBroadcastReceiver extends BroadcastReceiver {
+    private class WifiAwareStateBroadcastReceiver extends BroadcastReceiver {
         private final Object mLock = new Object();
         private CountDownLatch mBlocker = new CountDownLatch(1);
         private int mCountNumber = 0;
@@ -132,6 +139,41 @@
         }
     }
 
+    private class WifiAwareResourcesBroadcastReceiver extends BroadcastReceiver {
+        private final Object mLock = new Object();
+        private CountDownLatch mBlocker = new CountDownLatch(1);
+        private int mCountNumber = 0;
+        private AwareResources mResources = null;
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (WifiAwareManager.ACTION_WIFI_AWARE_RESOURCE_CHANGED.equals(intent.getAction())) {
+                synchronized (mLock) {
+                    mCountNumber += 1;
+                    mBlocker.countDown();
+                    mBlocker = new CountDownLatch(1);
+                    mResources = intent.getParcelableExtra(WifiAwareManager.EXTRA_AWARE_RESOURCES);
+                }
+            }
+        }
+
+        boolean waitForStateChange() throws InterruptedException {
+            CountDownLatch blocker;
+            synchronized (mLock) {
+                mCountNumber--;
+                if (mCountNumber >= 0) {
+                    return true;
+                }
+                blocker = mBlocker;
+            }
+            return blocker.await(WAIT_FOR_AWARE_CHANGE_SECS, TimeUnit.SECONDS);
+        }
+
+        public AwareResources getResources() {
+            return mResources;
+        }
+    }
+
     private class AttachCallbackTest extends AttachCallback {
         static final int ATTACHED = 0;
         static final int ATTACH_FAILED = 1;
@@ -157,6 +199,14 @@
             mBlocker.countDown();
         }
 
+        @Override
+        public void onAwareSessionTerminated() {
+            synchronized (mLock) {
+                mSessions.remove(mSession);
+            }
+            mSession = null;
+        }
+
         /**
          * Waits for any of the callbacks to be called - or an error (timeout, interruption).
          * Returns one of the ATTACHED, ATTACH_FAILED, or ERROR values.
@@ -164,6 +214,7 @@
         int waitForAnyCallback() {
             try {
                 boolean noTimeout = mBlocker.await(WAIT_FOR_AWARE_CHANGE_SECS, TimeUnit.SECONDS);
+                mBlocker = new CountDownLatch(1);
                 if (noTimeout) {
                     return mCallbackCalled;
                 } else {
@@ -278,6 +329,11 @@
         }
 
         @Override
+        public void onServiceDiscovered(ServiceDiscoveryInfo info) {
+            processCallback(ON_SERVICE_DISCOVERED);
+        }
+
+        @Override
         public void onMessageSendSucceeded(int messageId) {
             processCallback(ON_MESSAGE_SEND_SUCCEEDED);
         }
@@ -428,7 +484,7 @@
 
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(WifiAwareManager.ACTION_WIFI_AWARE_STATE_CHANGED);
-        WifiAwareBroadcastReceiver receiver = new WifiAwareBroadcastReceiver();
+        WifiAwareStateBroadcastReceiver receiver = new WifiAwareStateBroadcastReceiver();
         mContext.registerReceiver(receiver, intentFilter);
         if (!mWifiAwareManager.isAvailable()) {
             assertTrue("Timeout waiting for Wi-Fi Aware to change status",
@@ -477,11 +533,19 @@
                 characteristics.getMaxServiceSpecificInfoLength(), 255);
         assertEquals("Match Filter Length", characteristics.getMaxMatchFilterLength(), 255);
         assertNotEquals("Cipher suites", characteristics.getSupportedCipherSuites(), 0);
+        assertTrue("Max number of NDP", characteristics.getNumberOfSupportedDataPaths() > 0);
+        assertTrue("Max number of NDI", characteristics.getNumberOfSupportedDataInterfaces() > 0);
+        assertTrue("Max number of Publish sessions",
+                characteristics.getNumberOfSupportedPublishSessions() > 0);
+        assertTrue("Max number of Subscribe sessions",
+                characteristics.getNumberOfSupportedSubscribeSessions() > 0);
         if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.S)) {
-            mWifiAwareManager.enableInstantCommunicationMode(true);
+            ShellIdentityUtils.invokeWithShellPermissions(() ->
+                    mWifiAwareManager.enableInstantCommunicationMode(true));
             assertEquals(mWifiAwareManager.isInstantCommunicationModeEnabled(),
                     characteristics.isInstantCommunicationModeSupported());
-            mWifiAwareManager.enableInstantCommunicationMode(false);
+            ShellIdentityUtils.invokeWithShellPermissions(() ->
+                    mWifiAwareManager.enableInstantCommunicationMode(false));
         }
     }
 
@@ -516,7 +580,7 @@
         intentFilter.addAction(WifiAwareManager.ACTION_WIFI_AWARE_STATE_CHANGED);
 
         // 1. Disable Wi-Fi
-        WifiAwareBroadcastReceiver receiver1 = new WifiAwareBroadcastReceiver();
+        WifiAwareStateBroadcastReceiver receiver1 = new WifiAwareStateBroadcastReceiver();
         mContext.registerReceiver(receiver1, intentFilter);
         SystemUtil.runShellCommand("svc wifi disable");
 
@@ -531,7 +595,7 @@
         assertFalse("Wi-Fi Aware is available (should not be)", mWifiAwareManager.isAvailable());
 
         // 2. Enable Wi-Fi
-        WifiAwareBroadcastReceiver receiver2 = new WifiAwareBroadcastReceiver();
+        WifiAwareStateBroadcastReceiver receiver2 = new WifiAwareStateBroadcastReceiver();
         mContext.registerReceiver(receiver2, intentFilter);
         SystemUtil.runShellCommand("svc wifi enable");
 
@@ -548,8 +612,10 @@
             return;
         }
 
-        WifiAwareSession session = attachAndGetSession();
-        session.close();
+        AttachCallbackTest callback = attachAndGetCallback();
+        callback.getSession().close();
+        callback.waitForAnyCallback();
+        assertNull(callback.getSession());
         if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
             assertFalse(mWifiAwareManager.isDeviceAttached());
         }
@@ -596,23 +662,23 @@
     /**
      * Validate a successful publish discovery session lifetime: publish, update publish, destroy.
      */
-    public void testPublishDiscoverySuccess() {
+    public void testPublishDiscoverySuccess() throws Exception {
         if (!TestUtils.shouldTestWifiAware(getContext())) {
             return;
         }
-
-        final String serviceName = "ValidName";
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(WifiAwareManager.ACTION_WIFI_AWARE_RESOURCE_CHANGED);
+        WifiAwareResourcesBroadcastReceiver receiver = new WifiAwareResourcesBroadcastReceiver();
+        mContext.registerReceiver(receiver, intentFilter);
+        final String serviceName = "PublishName";
 
         WifiAwareSession session = attachAndGetSession();
 
         PublishConfig publishConfig = new PublishConfig.Builder().setServiceName(
                 serviceName).build();
         DiscoverySessionCallbackTest discoveryCb = new DiscoverySessionCallbackTest();
-        int numOfAllPublishSessions = 0;
-        if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
-            numOfAllPublishSessions = mWifiAwareManager
-                    .getAvailableAwareResources().getAvailablePublishSessionsCount();
-        }
+        int numOfAllPublishSessions = mWifiAwareManager
+                .getAvailableAwareResources().getAvailablePublishSessionsCount();
 
         // 1. publish
         session.publish(publishConfig, discoveryCb, mHandler);
@@ -624,10 +690,15 @@
                 DiscoverySessionCallbackTest.ON_SERVICE_DISCOVERED));
         assertFalse(discoveryCb.waitForCallback(
                 DiscoverySessionCallbackTest.ON_SESSION_DISCOVERED_LOST));
-        if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
-            assertEquals(numOfAllPublishSessions - 1, mWifiAwareManager
+        assertEquals(numOfAllPublishSessions - 1, mWifiAwareManager
                     .getAvailableAwareResources().getAvailablePublishSessionsCount());
+        //TODO(211696926): Change to isAtLeast() when SDK finalize.
+        if (ApiLevelUtil.codenameStartsWith("T")) {
+            assertTrue("Time out waiting for resource change", receiver.waitForStateChange());
+            assertEquals(numOfAllPublishSessions - 1, receiver.getResources()
+                    .getAvailablePublishSessionsCount());
         }
+
         // 2. update-publish
         publishConfig = new PublishConfig.Builder().setServiceName(
                 serviceName).setServiceSpecificInfo("extras".getBytes()).build();
@@ -644,11 +715,15 @@
         discoverySession.updatePublish(publishConfig);
         assertFalse("Publish update post destroy", discoveryCb.waitForCallback(
                 DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
-        if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
-            assertEquals(numOfAllPublishSessions, mWifiAwareManager
-                    .getAvailableAwareResources().getAvailablePublishSessionsCount());
+        assertEquals(numOfAllPublishSessions, mWifiAwareManager
+                .getAvailableAwareResources().getAvailablePublishSessionsCount());
+        //TODO(211696926): Change to isAtLeast() when SDK finalize.
+        if (ApiLevelUtil.codenameStartsWith("T")) {
+            assertTrue("Time out waiting for resource change", receiver.waitForStateChange());
+            assertEquals(numOfAllPublishSessions, receiver.getResources()
+                    .getAvailablePublishSessionsCount());
+            session.close();
         }
-        session.close();
     }
 
     /**
@@ -660,7 +735,7 @@
             return;
         }
 
-        final String serviceName = "ValidName";
+        final String serviceName = "PublishName";
         final int ttlSec = 5;
 
         WifiAwareSession session = attachAndGetSession();
@@ -692,26 +767,135 @@
     }
 
     /**
-     * Validate a successful subscribe discovery session lifetime: subscribe, update subscribe,
-     * destroy.
+     * Validate successful publish session with security config.
      */
-    public void testSubscribeDiscoverySuccess() {
+    public void testPublishWithSecurityConfig() {
         if (!TestUtils.shouldTestWifiAware(getContext())) {
             return;
         }
 
-        final String serviceName = "ValidName";
+        final String serviceName = "PublishName";
+        final String passphrase = "SomePassword";
+        final byte[] pmk = "01234567890123456789012345678901".getBytes();
+        final byte[] pmkId = "0123456789012345".getBytes();
+
+
+        WifiAwareSession session = attachAndGetSession();
+        WifiAwareDataPathSecurityConfig securityConfig = new WifiAwareDataPathSecurityConfig
+                .Builder(Characteristics.WIFI_AWARE_CIPHER_SUITE_NCS_SK_128)
+                .setPskPassphrase(passphrase)
+                .build();
+        assertEquals(passphrase, securityConfig.getPskPassphrase());
+        assertEquals(Characteristics.WIFI_AWARE_CIPHER_SUITE_NCS_SK_128,
+                securityConfig.getCipherSuite());
+        assertNull(securityConfig.getPmkId());
+        assertNull(securityConfig.getPmk());
+
+        PublishConfig.Builder builder = new PublishConfig.Builder()
+                .setServiceName(serviceName)
+                .setDataPathSecurityConfig(securityConfig);
+        PublishConfig publishConfig = builder.build();
+        assertEquals(securityConfig, publishConfig.getSecurityConfig());
+        DiscoverySessionCallbackTest discoveryCb = new DiscoverySessionCallbackTest();
+
+        // 1. publish
+        session.publish(publishConfig, discoveryCb, mHandler);
+        assertTrue("Publish started",
+                discoveryCb.waitForCallback(DiscoverySessionCallbackTest.ON_PUBLISH_STARTED));
+        PublishDiscoverySession discoverySession = discoveryCb.getPublishDiscoverySession();
+        assertNotNull("Publish session", discoverySession);
+        assertFalse(discoveryCb.waitForCallback(
+                DiscoverySessionCallbackTest.ON_SERVICE_DISCOVERED));
+        assertFalse(discoveryCb.waitForCallback(
+                DiscoverySessionCallbackTest.ON_SESSION_DISCOVERED_LOST));
+
+        // 2. update to PK cipher suite
+        if ((mWifiAwareManager.getCharacteristics().getSupportedCipherSuites()
+                & Characteristics.WIFI_AWARE_CIPHER_SUITE_NCS_PK_128) != 0) {
+            securityConfig = new WifiAwareDataPathSecurityConfig
+                    .Builder(Characteristics.WIFI_AWARE_CIPHER_SUITE_NCS_PK_128)
+                    .setPmk(pmk)
+                    .setPmkId(pmkId)
+                    .build();
+            publishConfig = new PublishConfig.Builder()
+                    .setServiceName(serviceName)
+                    .setDataPathSecurityConfig(securityConfig)
+                    .build();
+            discoverySession.updatePublish(publishConfig);
+            assertTrue("Publish update", discoveryCb.waitForCallback(
+                    DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
+        }
+
+        // 3. destroy
+        assertFalse("Publish not terminated", discoveryCb.hasCallbackAlreadyHappened(
+                DiscoverySessionCallbackTest.ON_SESSION_TERMINATED));
+        discoverySession.close();
+        session.close();
+    }
+
+    /**
+     * Validate success publish with instant communacation enabled.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testPublishWithInstantCommunicationModeSuccess() {
+        if (!TestUtils.shouldTestWifiAware(getContext())) {
+            return;
+        }
+        Characteristics characteristics = mWifiAwareManager.getCharacteristics();
+        if (!characteristics.isInstantCommunicationModeSupported()) {
+            return;
+        }
+        final String serviceName = "PublishName";
+        WifiAwareSession session = attachAndGetSession();
+
+        PublishConfig publishConfig = new PublishConfig.Builder()
+                .setServiceName(serviceName)
+                .setInstantCommunicationModeEnabled(true, WifiScanner.WIFI_BAND_24_GHZ)
+                .build();
+        assertEquals(WifiScanner.WIFI_BAND_24_GHZ, publishConfig.getInstantCommunicationBand());
+        assertTrue(publishConfig.isInstantCommunicationModeEnabled());
+
+        DiscoverySessionCallbackTest discoveryCb = new DiscoverySessionCallbackTest();
+
+        // 1. publish
+        session.publish(publishConfig, discoveryCb, mHandler);
+        assertTrue("Publish started",
+                discoveryCb.waitForCallback(DiscoverySessionCallbackTest.ON_PUBLISH_STARTED));
+        PublishDiscoverySession discoverySession = discoveryCb.getPublishDiscoverySession();
+        assertNotNull("Publish session", discoverySession);
+        assertFalse(discoveryCb.waitForCallback(
+                DiscoverySessionCallbackTest.ON_SERVICE_DISCOVERED));
+        assertFalse(discoveryCb.waitForCallback(
+                DiscoverySessionCallbackTest.ON_SESSION_DISCOVERED_LOST));
+
+        // 2. destroy
+        assertFalse("Publish not terminated", discoveryCb.hasCallbackAlreadyHappened(
+                DiscoverySessionCallbackTest.ON_SESSION_TERMINATED));
+        discoverySession.close();
+        session.close();
+    }
+
+    /**
+     * Validate a successful subscribe discovery session lifetime: subscribe, update subscribe,
+     * destroy.
+     */
+    public void testSubscribeDiscoverySuccess() throws Exception {
+        if (!TestUtils.shouldTestWifiAware(getContext())) {
+            return;
+        }
+        IntentFilter intentFilter = new IntentFilter();
+        intentFilter.addAction(WifiAwareManager.ACTION_WIFI_AWARE_RESOURCE_CHANGED);
+        WifiAwareResourcesBroadcastReceiver receiver = new WifiAwareResourcesBroadcastReceiver();
+        mContext.registerReceiver(receiver, intentFilter);
+        final String serviceName = "SubscribeName";
 
         WifiAwareSession session = attachAndGetSession();
 
         SubscribeConfig subscribeConfig = new SubscribeConfig.Builder().setServiceName(
                 serviceName).build();
         DiscoverySessionCallbackTest discoveryCb = new DiscoverySessionCallbackTest();
-        int numOfAllSubscribeSessions = 0;
-        if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
-            numOfAllSubscribeSessions = mWifiAwareManager
-                    .getAvailableAwareResources().getAvailableSubscribeSessionsCount();
-        }
+        int numOfAllSubscribeSessions = mWifiAwareManager
+                .getAvailableAwareResources().getAvailableSubscribeSessionsCount();
         // 1. subscribe
         session.subscribe(subscribeConfig, discoveryCb, mHandler);
         assertTrue("Subscribe started",
@@ -722,9 +906,13 @@
                 DiscoverySessionCallbackTest.ON_SERVICE_DISCOVERED));
         assertFalse(discoveryCb.waitForCallback(
                 DiscoverySessionCallbackTest.ON_SESSION_DISCOVERED_LOST));
-        if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
-            assertEquals(numOfAllSubscribeSessions - 1, mWifiAwareManager
-                    .getAvailableAwareResources().getAvailableSubscribeSessionsCount());
+        assertEquals(numOfAllSubscribeSessions - 1, mWifiAwareManager
+                .getAvailableAwareResources().getAvailableSubscribeSessionsCount());
+        //TODO(211696926): Change to isAtLeast() when SDK finalize.
+        if (ApiLevelUtil.codenameStartsWith("T")) {
+            assertTrue("Time out waiting for resource change", receiver.waitForStateChange());
+            assertEquals(numOfAllSubscribeSessions - 1, receiver.getResources()
+                    .getAvailableSubscribeSessionsCount());
         }
 
         // 2. update-subscribe
@@ -751,10 +939,58 @@
         discoverySession.updateSubscribe(subscribeConfig);
         assertFalse("Subscribe update post destroy", discoveryCb.waitForCallback(
                 DiscoverySessionCallbackTest.ON_SESSION_CONFIG_UPDATED));
-        if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
-            assertEquals(numOfAllSubscribeSessions, mWifiAwareManager
-                    .getAvailableAwareResources().getAvailableSubscribeSessionsCount());
+        assertEquals(numOfAllSubscribeSessions, mWifiAwareManager
+                .getAvailableAwareResources().getAvailableSubscribeSessionsCount());
+        //TODO(211696926): Change to isAtLeast() when SDK finalize.
+        if (ApiLevelUtil.codenameStartsWith("T")) {
+            assertTrue("Time out waiting for resource change", receiver.waitForStateChange());
+            assertEquals(numOfAllSubscribeSessions, receiver.getResources()
+                    .getAvailableSubscribeSessionsCount());
         }
+
+        session.close();
+    }
+
+    /**
+     * Validate success subscribe with instant communication enabled.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSubscribeWithInstantCommunicationModeSuccess() {
+        if (!TestUtils.shouldTestWifiAware(getContext())) {
+            return;
+        }
+        Characteristics characteristics = mWifiAwareManager.getCharacteristics();
+        if (!characteristics.isInstantCommunicationModeSupported()) {
+            return;
+        }
+        final String serviceName = "SubscribeName";
+        WifiAwareSession session = attachAndGetSession();
+
+        SubscribeConfig subscribeConfig = new SubscribeConfig.Builder()
+                .setServiceName(serviceName)
+                .setInstantCommunicationModeEnabled(true, WifiScanner.WIFI_BAND_24_GHZ)
+                .build();
+
+        assertEquals(WifiScanner.WIFI_BAND_24_GHZ, subscribeConfig.getInstantCommunicationBand());
+        assertTrue(subscribeConfig.isInstantCommunicationModeEnabled());
+
+        DiscoverySessionCallbackTest discoveryCb = new DiscoverySessionCallbackTest();
+
+        // 1. subscribe
+        session.subscribe(subscribeConfig, discoveryCb, mHandler);
+        assertTrue("Subscribe started",
+                discoveryCb.waitForCallback(DiscoverySessionCallbackTest.ON_SUBSCRIBE_STARTED));
+        SubscribeDiscoverySession discoverySession = discoveryCb.getSubscribeDiscoverySession();
+        assertNotNull("Subscribe session", discoverySession);
+        assertFalse(discoveryCb.waitForCallback(
+                DiscoverySessionCallbackTest.ON_SERVICE_DISCOVERED));
+        assertFalse(discoveryCb.waitForCallback(
+                DiscoverySessionCallbackTest.ON_SESSION_DISCOVERED_LOST));
+
+        // 3. destroy
+        assertFalse("Subscribe not terminated", discoveryCb.hasCallbackAlreadyHappened(
+                DiscoverySessionCallbackTest.ON_SESSION_TERMINATED));
+        discoverySession.close();
         session.close();
     }
 
@@ -767,7 +1003,7 @@
             return;
         }
 
-        final String serviceName = "ValidName";
+        final String serviceName = "SubscribeName";
         final int ttlSec = 5;
 
         WifiAwareSession session = attachAndGetSession();
@@ -977,9 +1213,6 @@
      * Test AwareResources constructor function.
      */
     public void testAwareResourcesConstructor() {
-        if (!WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
-            return;
-        }
         AwareResources awareResources = new AwareResources(AVAILABLE_DATA_PATH_COUNT,
                 AVAILABLE_PUBLISH_SESSION_COUNT, AVAILABLE_SUBSCRIBE_SESSION_COUNT);
         assertEquals(AVAILABLE_DATA_PATH_COUNT, awareResources.getAvailableDataPathsCount());
@@ -989,6 +1222,47 @@
                 .getAvailableSubscribeSessionsCount());
     }
 
+    /**
+     * Verify setAwareParams works when have permission
+     */
+    public void testAwareParams() {
+        if (!TestUtils.shouldTestWifiAware(getContext())) {
+            return;
+        }
+        AwareParams params = new AwareParams();
+        params.setDiscoveryWindowWakeInterval24Ghz(5);
+        params.setDiscoveryWindowWakeInterval5Ghz(5);
+        params.setDiscoveryBeaconIntervalMillis(50);
+        params.setDwEarlyTerminationEnabled(true);
+        params.setMacRandomizationIntervalSeconds(1000);
+        params.setNumSpatialStreamsInDiscovery(1);
+        assertEquals(5, params.getDiscoveryWindowWakeInterval24Ghz());
+        assertEquals(5, params.getDiscoveryWindowWakeInterval5Ghz());
+        assertEquals(50, params.getDiscoveryBeaconIntervalMillis());
+        assertEquals(1000, params.getMacRandomizationIntervalSeconds());
+        assertEquals(1, params.getNumSpatialStreamsInDiscovery());
+        assertTrue(params.isDwEarlyTerminationEnabled());
+        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)
+                || ApiLevelUtil.codenameStartsWith("T")) {
+            ShellIdentityUtils.invokeWithShellPermissions(
+                    () -> mWifiAwareManager.setAwareParams(params)
+            );
+            ShellIdentityUtils.invokeWithShellPermissions(
+                    () -> mWifiAwareManager.setAwareParams(null)
+            );
+        }
+    }
+
+    /**
+     * Verify setAwareParams throw exception without permission
+     */
+    public void testAwareParamsWithoutPermission() {
+        if (!TestUtils.shouldTestWifiAware(getContext())) {
+            return;
+        }
+        assertThrows(SecurityException.class, () -> mWifiAwareManager.setAwareParams(null));
+    }
+
     // local utilities
 
     private WifiAwareSession attachAndGetSession() {
@@ -1005,4 +1279,14 @@
 
         return session;
     }
+
+    // local utilities
+
+    private AttachCallbackTest attachAndGetCallback() {
+        AttachCallbackTest attachCb = new AttachCallbackTest();
+        mWifiAwareManager.attach(attachCb, mHandler);
+        int cbCalled = attachCb.waitForAnyCallback();
+        assertEquals("Wi-Fi Aware attach", AttachCallbackTest.ATTACHED, cbCalled);
+        return attachCb;
+    }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/ConcurrencyTest.java b/tests/tests/wifi/src/android/net/wifi/cts/ConcurrencyTest.java
index 188c2a9..92e1212 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/ConcurrencyTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/ConcurrencyTest.java
@@ -25,28 +25,34 @@
 import android.content.pm.PackageManager;
 import android.net.ConnectivityManager;
 import android.net.ConnectivityManager.NetworkCallback;
+import android.net.MacAddress;
 import android.net.Network;
 import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
 import android.net.NetworkRequest;
+import android.net.wifi.ScanResult;
 import android.net.wifi.WifiManager;
+import android.net.wifi.p2p.WifiP2pConfig;
 import android.net.wifi.p2p.WifiP2pDevice;
 import android.net.wifi.p2p.WifiP2pGroup;
 import android.net.wifi.p2p.WifiP2pGroupList;
 import android.net.wifi.p2p.WifiP2pInfo;
 import android.net.wifi.p2p.WifiP2pManager;
+import android.net.wifi.p2p.WifiP2pManager.ExternalApproverRequestListener;
 import android.net.wifi.p2p.nsd.WifiP2pServiceInfo;
 import android.net.wifi.p2p.nsd.WifiP2pUpnpServiceInfo;
-import android.provider.Settings;
+import android.os.Build;
 import android.platform.test.annotations.AppModeFull;
-import android.test.AndroidTestCase;
+import android.provider.Settings;
 import android.util.Log;
 
+import androidx.test.filters.SdkSuppress;
+
 import com.android.compatibility.common.util.ShellIdentityUtils;
 import com.android.compatibility.common.util.SystemUtil;
 
-import java.util.Arrays;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.BitSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -82,6 +88,23 @@
         public String deviceName;
         public WifiP2pGroupList persistentGroups;
         public WifiP2pGroup group = new WifiP2pGroup();
+
+        // External approver
+        public boolean isAttached;
+        public boolean isDetached;
+
+        public void reset() {
+            valid = false;
+
+            networkInfo = null;
+            p2pInfo = null;
+            deviceName = null;
+            persistentGroups = null;
+            group = null;
+
+            isAttached = false;
+            isDetached = false;
+        }
     }
 
     private WifiManager mWifiManager;
@@ -90,6 +113,7 @@
     private MySync mMySync = new MySync();
     private MyResponse mMyResponse = new MyResponse();
     private boolean mWasVerboseLoggingEnabled;
+    private WifiP2pConfig mTestWifiP2pPeerConfig;
 
     private static final String TAG = "ConcurrencyTest";
     private static final int TIMEOUT_MSEC = 6000;
@@ -191,6 +215,10 @@
         mMySync.expectedP2pState = WifiP2pManager.WIFI_P2P_STATE_DISABLED;
         mMySync.expectedDiscoveryState = WifiP2pManager.WIFI_P2P_DISCOVERY_STOPPED;
         mMySync.expectedNetworkInfo = null;
+
+        // for general connect command
+        mTestWifiP2pPeerConfig = new WifiP2pConfig();
+        mTestWifiP2pPeerConfig.deviceAddress = "aa:bb:cc:dd:ee:ff";
     }
 
     @Override
@@ -271,12 +299,7 @@
 
     private void resetResponse(MyResponse responseObj) {
         synchronized (responseObj) {
-            responseObj.valid = false;
-            responseObj.networkInfo = null;
-            responseObj.p2pInfo = null;
-            responseObj.deviceName = null;
-            responseObj.persistentGroups = null;
-            responseObj.group = null;
+            responseObj.reset();
         }
     }
 
@@ -725,11 +748,9 @@
         });
 
         resetResponse(mMyResponse);
-        ShellIdentityUtils.invokeWithShellPermissions(() -> {
-            mWifiP2pManager.stopListening(mWifiP2pChannel, mActionListener);
-            assertTrue(waitForServiceResponse(mMyResponse));
-            assertTrue(mMyResponse.success);
-        });
+        mWifiP2pManager.stopListening(mWifiP2pChannel, mActionListener);
+        assertTrue(waitForServiceResponse(mMyResponse));
+        assertTrue(mMyResponse.success);
     }
 
     public void testP2pService() {
@@ -773,4 +794,276 @@
         assertTrue(waitForServiceResponse(mMyResponse));
         assertTrue(mMyResponse.success);
     }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)
+    public void testRemoveClient() {
+        if (!setupWifiP2p()) {
+            return;
+        }
+
+        if (!mWifiP2pManager.isGroupClientRemovalSupported()) return;
+
+        resetResponse(mMyResponse);
+        mWifiP2pManager.createGroup(mWifiP2pChannel, mActionListener);
+        assertTrue(waitForServiceResponse(mMyResponse));
+        assertTrue(mMyResponse.success);
+
+        // The first network state might be IDLE due to
+        // lazy initialization, but not CONNECTED.
+        for (int i = 0; i < 2; i++) {
+            assertTrue(waitForBroadcasts(MySync.NETWORK_INFO));
+            assertNotNull(mMySync.expectedNetworkInfo);
+            if (NetworkInfo.DetailedState.CONNECTED
+                    == mMySync.expectedNetworkInfo.getDetailedState()) {
+                break;
+            }
+            assertEquals(NetworkInfo.DetailedState.IDLE,
+                    mMySync.expectedNetworkInfo.getDetailedState());
+        }
+        assertEquals(NetworkInfo.DetailedState.CONNECTED,
+                mMySync.expectedNetworkInfo.getDetailedState());
+
+        resetResponse(mMyResponse);
+        MacAddress peerMacAddress = MacAddress.fromString(mTestWifiP2pPeerConfig.deviceAddress);
+        mWifiP2pManager.removeClient(
+                mWifiP2pChannel, peerMacAddress, mActionListener);
+        assertTrue(waitForServiceResponse(mMyResponse));
+        assertTrue(mMyResponse.success);
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)
+    public void testDiscoverPeersOnSpecificFreq() {
+        if (!setupWifiP2p()) {
+            return;
+        }
+
+        if (!mWifiP2pManager.isChannelConstrainedDiscoverySupported()) return;
+
+        resetResponse(mMyResponse);
+        mWifiP2pManager.requestDiscoveryState(
+                mWifiP2pChannel, new WifiP2pManager.DiscoveryStateListener() {
+                    @Override
+                    public void onDiscoveryStateAvailable(int state) {
+                        synchronized (mMyResponse) {
+                            mMyResponse.valid = true;
+                            mMyResponse.discoveryState = state;
+                            mMyResponse.notify();
+                        }
+                    }
+                });
+        assertTrue(waitForServiceResponse(mMyResponse));
+        assertEquals(WifiP2pManager.WIFI_P2P_DISCOVERY_STOPPED, mMyResponse.discoveryState);
+
+        // If there is any saved network and this device is connecting to this saved network,
+        // p2p discovery might be blocked during DHCP provision.
+        int retryCount = 3;
+        while (retryCount > 0) {
+            resetResponse(mMyResponse);
+            mWifiP2pManager.discoverPeersOnSpecificFrequency(mWifiP2pChannel,
+                    2412, mActionListener);
+            assertTrue(waitForServiceResponse(mMyResponse));
+            if (mMyResponse.success
+                    || mMyResponse.failureReason != WifiP2pManager.BUSY) {
+                break;
+            }
+            Log.w(TAG, "Discovery is blocked, try again!");
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException ex) { }
+            retryCount--;
+        }
+        assertTrue(mMyResponse.success);
+        assertTrue(waitForBroadcasts(MySync.DISCOVERY_STATE));
+
+        resetResponse(mMyResponse);
+        mWifiP2pManager.requestDiscoveryState(mWifiP2pChannel,
+                new WifiP2pManager.DiscoveryStateListener() {
+                    @Override
+                    public void onDiscoveryStateAvailable(int state) {
+                        synchronized (mMyResponse) {
+                            mMyResponse.valid = true;
+                            mMyResponse.discoveryState = state;
+                            mMyResponse.notify();
+                        }
+                    }
+                });
+        assertTrue(waitForServiceResponse(mMyResponse));
+        assertEquals(WifiP2pManager.WIFI_P2P_DISCOVERY_STARTED, mMyResponse.discoveryState);
+
+        mWifiP2pManager.stopPeerDiscovery(mWifiP2pChannel, null);
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)
+    public void testDiscoverPeersOnSocialChannelsOnly() {
+        if (!setupWifiP2p()) {
+            return;
+        }
+
+        if (!mWifiP2pManager.isChannelConstrainedDiscoverySupported()) return;
+
+        resetResponse(mMyResponse);
+        mWifiP2pManager.requestDiscoveryState(
+                mWifiP2pChannel, new WifiP2pManager.DiscoveryStateListener() {
+                    @Override
+                    public void onDiscoveryStateAvailable(int state) {
+                        synchronized (mMyResponse) {
+                            mMyResponse.valid = true;
+                            mMyResponse.discoveryState = state;
+                            mMyResponse.notify();
+                        }
+                    }
+                });
+        assertTrue(waitForServiceResponse(mMyResponse));
+        assertEquals(WifiP2pManager.WIFI_P2P_DISCOVERY_STOPPED, mMyResponse.discoveryState);
+
+        // If there is any saved network and this device is connecting to this saved network,
+        // p2p discovery might be blocked during DHCP provision.
+        int retryCount = 3;
+        while (retryCount > 0) {
+            resetResponse(mMyResponse);
+            mWifiP2pManager.discoverPeersOnSocialChannels(mWifiP2pChannel, mActionListener);
+            assertTrue(waitForServiceResponse(mMyResponse));
+            if (mMyResponse.success
+                    || mMyResponse.failureReason != WifiP2pManager.BUSY) {
+                break;
+            }
+            Log.w(TAG, "Discovery is blocked, try again!");
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException ex) { }
+            retryCount--;
+        }
+        assertTrue(mMyResponse.success);
+        assertTrue(waitForBroadcasts(MySync.DISCOVERY_STATE));
+
+        resetResponse(mMyResponse);
+        mWifiP2pManager.requestDiscoveryState(mWifiP2pChannel,
+                new WifiP2pManager.DiscoveryStateListener() {
+                    @Override
+                    public void onDiscoveryStateAvailable(int state) {
+                        synchronized (mMyResponse) {
+                            mMyResponse.valid = true;
+                            mMyResponse.discoveryState = state;
+                            mMyResponse.notify();
+                        }
+                    }
+                });
+        assertTrue(waitForServiceResponse(mMyResponse));
+        assertEquals(WifiP2pManager.WIFI_P2P_DISCOVERY_STARTED, mMyResponse.discoveryState);
+
+        mWifiP2pManager.stopPeerDiscovery(mWifiP2pChannel, null);
+    }
+
+    public void testP2pSetVendorElements() {
+        if (!setupWifiP2p()) {
+            return;
+        }
+
+        if (!mWifiP2pManager.isSetVendorElementsSupported()) return;
+
+        // Vendor-Specific EID is 221.
+        List<ScanResult.InformationElement> ies = new ArrayList<>(Arrays.asList(
+                new ScanResult.InformationElement(221, 0,
+                        new byte[]{(byte) 1, (byte) 2, (byte) 3, (byte) 4})));
+        resetResponse(mMyResponse);
+        ShellIdentityUtils.invokeWithShellPermissions(() -> {
+            mWifiP2pManager.setVendorElements(mWifiP2pChannel, ies, mActionListener);
+            assertTrue(waitForServiceResponse(mMyResponse));
+            assertTrue(mMyResponse.success);
+        });
+
+        resetResponse(mMyResponse);
+        mWifiP2pManager.discoverPeers(mWifiP2pChannel, mActionListener);
+        assertTrue(waitForServiceResponse(mMyResponse));
+    }
+
+    /** Test IEs whose size is greater than the maximum allowed size. */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)
+    public void testP2pSetVendorElementsOverMaximumAllowedSize() {
+        if (!setupWifiP2p()) {
+            return;
+        }
+
+        List<ScanResult.InformationElement> ies = new ArrayList<>();
+        ies.add(new ScanResult.InformationElement(221, 0,
+                new byte[WifiP2pManager.getP2pMaxAllowedVendorElementsLengthBytes() + 1]));
+        resetResponse(mMyResponse);
+        ShellIdentityUtils.invokeWithShellPermissions(() -> {
+            try {
+                mWifiP2pManager.setVendorElements(mWifiP2pChannel, ies, mActionListener);
+                fail("Should raise IllegalArgumentException");
+            } catch (IllegalArgumentException ex) {
+                // expected
+                return;
+            }
+        });
+    }
+
+    /** Test that external approver APIs. */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)
+    public void testP2pExternalApprover() {
+        final MacAddress peer = MacAddress.fromString("11:22:33:44:55:66");
+        if (!setupWifiP2p()) {
+            return;
+        }
+
+        ExternalApproverRequestListener listener =
+                new ExternalApproverRequestListener() {
+                    @Override
+                    public void onAttached(MacAddress deviceAddress) {
+                        synchronized (mMyResponse) {
+                            assertEquals(peer, deviceAddress);
+                            mMyResponse.valid = true;
+                            mMyResponse.isAttached = true;
+                            mMyResponse.notify();
+                        }
+                    }
+                    @Override
+                    public void onDetached(MacAddress deviceAddress, int reason) {
+                        synchronized (mMyResponse) {
+                            assertEquals(peer, deviceAddress);
+                            assertEquals(
+                                    ExternalApproverRequestListener.APPROVER_DETACH_REASON_REMOVE,
+                                    reason);
+                            mMyResponse.valid = true;
+                            mMyResponse.isDetached = true;
+                            mMyResponse.notify();
+                        }
+                    }
+                    @Override
+                    public void onConnectionRequested(int requestType, WifiP2pConfig config,
+                            WifiP2pDevice device) {
+                    }
+                    @Override
+                    public void onPinGenerated(MacAddress deviceAddress, String pin) {
+                    }
+            };
+
+        resetResponse(mMyResponse);
+
+        ShellIdentityUtils.invokeWithShellPermissions(() -> {
+            mWifiP2pManager.addExternalApprover(mWifiP2pChannel, peer, listener);
+        });
+        assertTrue(waitForServiceResponse(mMyResponse));
+        assertTrue(mMyResponse.isAttached);
+        assertFalse(mMyResponse.isDetached);
+
+        // Just ignore the result as there is no real incoming request.
+        ShellIdentityUtils.invokeWithShellPermissions(() -> {
+            mWifiP2pManager.setConnectionRequestResult(mWifiP2pChannel, peer,
+                    WifiP2pManager.CONNECTION_REQUEST_ACCEPT, null);
+        });
+        ShellIdentityUtils.invokeWithShellPermissions(() -> {
+            mWifiP2pManager.setConnectionRequestResult(mWifiP2pChannel, peer,
+                    WifiP2pManager.CONNECTION_REQUEST_ACCEPT, "12345678", null);
+        });
+
+        resetResponse(mMyResponse);
+        ShellIdentityUtils.invokeWithShellPermissions(() -> {
+            mWifiP2pManager.removeExternalApprover(mWifiP2pChannel, peer, null);
+        });
+        assertTrue(waitForServiceResponse(mMyResponse));
+        assertTrue(mMyResponse.isDetached);
+        assertFalse(mMyResponse.isAttached);
+    }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/ConnectedNetworkScorerTest.java b/tests/tests/wifi/src/android/net/wifi/cts/ConnectedNetworkScorerTest.java
index 30be41c..ae5ffe5e 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/ConnectedNetworkScorerTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/ConnectedNetworkScorerTest.java
@@ -23,12 +23,12 @@
 import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PAID;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE;
 import static android.net.wifi.WifiUsabilityStatsEntry.ContentionTimeStats;
-import static android.net.wifi.WifiUsabilityStatsEntry.RadioStats;
-import static android.net.wifi.WifiUsabilityStatsEntry.RateStats;
 import static android.net.wifi.WifiUsabilityStatsEntry.PROBE_STATUS_FAILURE;
 import static android.net.wifi.WifiUsabilityStatsEntry.PROBE_STATUS_NO_PROBE;
 import static android.net.wifi.WifiUsabilityStatsEntry.PROBE_STATUS_SUCCESS;
 import static android.net.wifi.WifiUsabilityStatsEntry.PROBE_STATUS_UNKNOWN;
+import static android.net.wifi.WifiUsabilityStatsEntry.RadioStats;
+import static android.net.wifi.WifiUsabilityStatsEntry.RateStats;
 import static android.net.wifi.WifiUsabilityStatsEntry.WME_ACCESS_CATEGORY_BE;
 import static android.net.wifi.WifiUsabilityStatsEntry.WME_ACCESS_CATEGORY_BK;
 import static android.net.wifi.WifiUsabilityStatsEntry.WME_ACCESS_CATEGORY_VI;
@@ -48,12 +48,14 @@
 import android.app.UiAutomation;
 import android.content.Context;
 import android.net.ConnectivityManager;
+import android.net.DhcpOption;
 import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiConnectedSessionInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiNetworkSpecifier;
 import android.net.wifi.WifiNetworkSuggestion;
+import android.net.wifi.WifiSsid;
 import android.net.wifi.WifiUsabilityStatsEntry;
-import android.net.wifi.WifiConnectedSessionInfo;
 import android.os.Build;
 import android.platform.test.annotations.AppModeFull;
 import android.support.test.uiautomator.UiDevice;
@@ -76,6 +78,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.Set;
@@ -286,7 +289,8 @@
                     assertEquals(1, contentionStats.getContentionTimeMaxMicros());
                     assertEquals(4, contentionStats.getContentionTimeAvgMicros());
                     assertEquals(10, contentionStats.getContentionNumSamples());
-                    assertThat(statsEntry.getChannelUtilizationRatio()).isIn(Range.closed(0, 255));
+                    // Note that -1 is also a possible returned value for utilization ratio.
+                    assertThat(statsEntry.getChannelUtilizationRatio()).isIn(Range.closed(-1, 255));
                     if (mTelephonyManager != null) {
                         boolean isCellularDataAvailable =
                                 mTelephonyManager.getDataState() == TelephonyManager.DATA_CONNECTED;
@@ -761,7 +765,7 @@
                     }
                     return mTestHelper.testConnectionFlowWithSuggestionWithShellIdentity(
                             testNetwork, suggestionBuilder.build(), executorService,
-                            restrictedNetworkCapabilities);
+                            restrictedNetworkCapabilities, false/* restrictedNetwork */);
                 }
         );
     }
@@ -790,4 +794,47 @@
         testSetWifiConnectedNetworkScorerForRestrictedSuggestionConnection(
                 Set.of(NET_CAPABILITY_OEM_PRIVATE));
     }
+
+    /**
+     * Tests the
+     * {@link android.net.wifi.WifiManager#addCustomDhcpOptions(Object, Object, List)} and
+     * {@link android.net.wifi.WifiManager#removeCustomDhcpOptions(Object, Object)}.
+     *
+     * Verifies that these APIs can be invoked successfully with permissions.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    @Test
+    public void testAddAndRemoveCustomDhcpOptions() throws Exception {
+        UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        try {
+            uiAutomation.adoptShellPermissionIdentity();
+            WifiSsid ssid = WifiSsid.fromBytes(new byte[]{0x12, 0x34, 0x56});
+            byte[] oui = new byte[]{0x00, 0x01, 0x02};
+            List<DhcpOption> options = new ArrayList<DhcpOption>();
+            mWifiManager.addCustomDhcpOptions(ssid, oui, options);
+            mWifiManager.removeCustomDhcpOptions(ssid, oui);
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    /**
+     * Tests the
+     * {@link android.net.wifi.WifiManager#addCustomDhcpOptions(Object, Object, List)}.
+     *
+     * Verifies that SecurityException is thrown when permissions are missing.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    @Test
+    public void testAddCustomDhcpOptionsOnMissingPermissions() throws Exception {
+        try {
+            WifiSsid ssid = WifiSsid.fromBytes(new byte[]{0x12, 0x34, 0x56});
+            byte[] oui = new byte[]{0x00, 0x01, 0x02};
+            List<DhcpOption> options = new ArrayList<DhcpOption>();
+            mWifiManager.addCustomDhcpOptions(ssid, oui, options);
+            fail("Expected SecurityException");
+        } catch (SecurityException e) {
+            // expected
+        }
+    }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/MultiStaConcurrencyMultiInternetWifiNetworkTest.java b/tests/tests/wifi/src/android/net/wifi/cts/MultiStaConcurrencyMultiInternetWifiNetworkTest.java
new file mode 100644
index 0000000..65eef6d
--- /dev/null
+++ b/tests/tests/wifi/src/android/net/wifi/cts/MultiStaConcurrencyMultiInternetWifiNetworkTest.java
@@ -0,0 +1,328 @@
+/*
+ * Copyright (C) 2021 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 android.net.wifi.cts;
+
+import static android.os.Process.myUid;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.LinkProperties;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.TransportInfo;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+import android.platform.test.annotations.AppModeFull;
+import android.support.test.uiautomator.UiDevice;
+import android.util.ArrayMap;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.SdkSuppress;
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.PollingCheck;
+import com.android.compatibility.common.util.ShellIdentityUtils;
+import com.android.modules.utils.build.SdkLevel;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+/**
+ * Tests multiple concurrent connection flow on devices that support multi STA concurrency
+ * (indicated via {@link WifiManager#isStaConcurrencyForMultiInternetSupported()}.
+ *
+ * Tests the entire connection flow using issuing connectivity manager requests with
+ * network specifier containing bands.
+ *
+ * Assumes that all the saved networks is either open/WPA1/WPA2/WPA3 authenticated network.
+ */
+@SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+@AppModeFull(reason = "Cannot get WifiManager in instant app mode")
+@LargeTest
+@RunWith(AndroidJUnit4.class)
+public class MultiStaConcurrencyMultiInternetWifiNetworkTest extends WifiJUnit4TestBase {
+    private static final String TAG = "MultiStaConcurrencyMultiInternetWifiNetworkTest";
+    private static boolean sWasVerboseLoggingEnabled;
+    private static boolean sWasScanThrottleEnabled;
+    private static boolean sWasWifiEnabled;
+    private static boolean sShouldRunTest = false;
+
+    private Context mContext;
+    private WifiManager mWifiManager;
+    private ConnectivityManager mConnectivityManager;
+    private UiDevice mUiDevice;
+    private ScheduledExecutorService mExecutorService;
+    private TestHelper mTestHelper;
+    // Map from band to list of WifiConfiguration, for matching networks.
+    private Map<Integer, List<WifiConfiguration>> mMatchingNetworksMap;
+    // Map from network SSID to set of bands.
+    private Map<String, Set<Integer>> mMatchingNetworksBands;
+
+    private static final int DURATION_MILLIS = 20_000;
+
+    private final ConnectivityManager.NetworkCallback mNetworkCallback =
+            new ConnectivityManager.NetworkCallback(
+                    ConnectivityManager.NetworkCallback.FLAG_INCLUDE_LOCATION_INFO) {
+                @Override
+                public void onLinkPropertiesChanged(@NonNull Network network,
+                        @NonNull LinkProperties lp) {
+                    final boolean isPrimary = isPrimaryWifiNetwork(
+                            mConnectivityManager.getNetworkCapabilities(network));
+                    Log.d(TAG, "onLinkPropertiesChanged: " + network + " primary " + isPrimary);
+                }
+
+                @Override
+                public void onCapabilitiesChanged(@NonNull Network network,
+                        @NonNull NetworkCapabilities networkCapabilities) {
+                    final boolean isPrimary = isPrimaryWifiNetwork(
+                            mConnectivityManager.getNetworkCapabilities(network));
+                    Log.d(TAG, "onCapabilitiesChanged: " + network + " primary " + isPrimary
+                            + " cap " + networkCapabilities);
+                }
+
+                @Override
+                public void onLost(@NonNull Network network) {
+                    final boolean isPrimary = isPrimaryWifiNetwork(
+                            mConnectivityManager.getNetworkCapabilities(network));
+                }
+            };
+
+    @BeforeClass
+    public static void setUpClass() throws Exception {
+        Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        // skip the test if WiFi is not supported.
+        // Don't use assumeTrue in @BeforeClass
+        if (!WifiFeature.isWifiSupported(context)) return;
+        if (!SdkLevel.isAtLeastT()) return;
+        sShouldRunTest = true;
+        Log.i(TAG, "sShouldRunTest " + sShouldRunTest);
+
+        WifiManager wifiManager = context.getSystemService(WifiManager.class);
+        assertThat(wifiManager).isNotNull();
+
+        // Turn on verbose logging for tests
+        sWasVerboseLoggingEnabled = ShellIdentityUtils.invokeWithShellPermissions(
+                () -> wifiManager.isVerboseLoggingEnabled());
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> wifiManager.setVerboseLoggingEnabled(true));
+        // Disable scan throttling for tests.
+        sWasScanThrottleEnabled = ShellIdentityUtils.invokeWithShellPermissions(
+                () -> wifiManager.isScanThrottleEnabled());
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> wifiManager.setScanThrottleEnabled(false));
+
+        // Enable Wifi
+        ShellIdentityUtils.invokeWithShellPermissions(() -> wifiManager.setWifiEnabled(true));
+        // Make sure wifi is enabled
+        PollingCheck.check("Wifi not enabled", DURATION_MILLIS, () -> wifiManager.isWifiEnabled());
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        if (!sShouldRunTest) return;
+
+        Context context = InstrumentationRegistry.getInstrumentation().getContext();
+        WifiManager wifiManager = context.getSystemService(WifiManager.class);
+        assertThat(wifiManager).isNotNull();
+
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> wifiManager.setScanThrottleEnabled(sWasScanThrottleEnabled));
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> wifiManager.setVerboseLoggingEnabled(sWasVerboseLoggingEnabled));
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> wifiManager.setWifiEnabled(sWasWifiEnabled));
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        assumeTrue(sShouldRunTest);
+        mContext = InstrumentationRegistry.getInstrumentation().getContext();
+        mWifiManager = mContext.getSystemService(WifiManager.class);
+        mConnectivityManager = mContext.getSystemService(ConnectivityManager.class);
+        mUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        mExecutorService = Executors.newSingleThreadScheduledExecutor();
+        mTestHelper = new TestHelper(mContext, mUiDevice);
+
+        // Skip the test if WiFi is not supported.
+        assumeTrue("Wifi not supported", WifiFeature.isWifiSupported(mContext));
+        // Skip if multi STA for internet feature not supported.
+        assumeTrue("isStaConcurrencyForMultiInternetSupported",
+                mWifiManager.isStaConcurrencyForMultiInternetSupported());
+
+        // Turn screen on
+        mTestHelper.turnScreenOn();
+
+        // Clear any existing app state before each test.
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.removeAppState(myUid(), mContext.getPackageName()));
+
+        // This test assumes a CTS test environment with at least 2 connectable bssid's, in
+        // different bands. We need 2 AP's for the test:
+        // 1. Dual-band (DBS) AP [the bands being 2.4 + 5]
+        // 2. Single-band AP with a different SSID.
+        // We need 2 saved networks for the 2 AP's and the device in range to proceed.
+        // The test will check if there are 2 BSSIDs in range and in different bands from
+        // the saved network.
+        List<WifiConfiguration> savedNetworks = ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.getPrivilegedConfiguredNetworks());
+        mMatchingNetworksMap =
+                TestHelper.findMatchingSavedNetworksWithBssidByBand(mWifiManager, savedNetworks);
+        assertWithMessage("Need at least 2 saved network bssids in different bands").that(
+                mMatchingNetworksMap.size()).isAtLeast(2);
+
+        mMatchingNetworksBands = new ArrayMap<>();
+        for (Map.Entry<Integer, List<WifiConfiguration>> entry : mMatchingNetworksMap.entrySet()) {
+            final int band = entry.getKey();
+            for (WifiConfiguration network : entry.getValue()) {
+                if (mMatchingNetworksBands.containsKey(network.SSID)) {
+                    mMatchingNetworksBands.get(network.SSID).add(band);
+                } else {
+                    mMatchingNetworksBands.put(network.SSID, new HashSet<>(Arrays.asList(band)));
+                }
+            }
+        }
+        // Disconnect networks already connected. Make sure the test starts with no network
+        // connections.
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> {
+                    mWifiManager.disconnect();
+                });
+
+        // Wait for Wifi to be disconnected.
+        PollingCheck.check(
+                "Wifi not disconnected",
+                DURATION_MILLIS,
+                () -> mTestHelper.getNumWifiConnections() == 0);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        if (!sShouldRunTest) return;
+        // Re-enable networks.
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> {
+                    for (WifiConfiguration savedNetwork : mWifiManager.getConfiguredNetworks()) {
+                        mWifiManager.enableNetwork(savedNetwork.networkId, false);
+                    }
+                    setMultiInternetMode(WifiManager.WIFI_MULTI_INTERNET_MODE_DISABLED);
+                });
+
+        mExecutorService.shutdownNow();
+        // Clear any existing app state after each test.
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.removeAppState(myUid(), mContext.getPackageName()));
+        mTestHelper.turnScreenOff();
+    }
+
+    private boolean isPrimaryWifiNetwork(@Nullable NetworkCapabilities networkCapabilities) {
+        if (networkCapabilities == null) {
+            return false;
+        }
+        final TransportInfo transportInfo = networkCapabilities.getTransportInfo();
+        if (!(transportInfo instanceof WifiInfo)) {
+            return false;
+        }
+        return ((WifiInfo) transportInfo).isPrimary();
+    }
+
+    private void setMultiInternetMode(int multiInternetMode) {
+        mWifiManager.setStaConcurrencyForMultiInternetMode(multiInternetMode);
+        try {
+            PollingCheck.check("Wifi not enabled", DURATION_MILLIS,
+                    () -> mWifiManager.isWifiEnabled());
+        } catch (Exception e) {
+            fail("Cant get wifi state");
+        }
+        int mode = mWifiManager.getStaConcurrencyForMultiInternetMode();
+        assertEquals(multiInternetMode, mode);
+    }
+
+    /**
+     * Tests the concurrent connection flow.
+     * 1. Connect to a network using internet connectivity API.
+     * 2. Connect to a network using enabling multi internet API.
+     * 3. Verify that both connections are active.
+     */
+    @Test
+    public void testConnectToSecondaryNetworkWhenConnectedToInternetNetworkMultiAp()
+            throws Exception {
+        assertWithMessage("Need at least 2 saved network ssids in different bands").that(
+                mMatchingNetworksBands.size()).isAtLeast(2);
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> {
+                    setMultiInternetMode(WifiManager.WIFI_MULTI_INTERNET_MODE_MULTI_AP);
+                });
+        mTestHelper.testMultiInternetConnectionFlowWithShellIdentity(mExecutorService, true);
+    }
+
+    /**
+     * Tests the concurrent connection flow.
+     * 1. Connect to a network using internet connectivity API.
+     * 2. Connect to a network using enabling multi internet API.
+     * 3. Verify that both connections are active.
+     */
+    @Test
+    public void testConnectToSecondaryNetworkWhenConnectedToInternetNetworkDBS() throws Exception {
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> {
+                    setMultiInternetMode(WifiManager.WIFI_MULTI_INTERNET_MODE_DBS_AP);
+                });
+
+        mTestHelper.testMultiInternetConnectionFlowWithShellIdentity(mExecutorService, true);
+    }
+
+    /**
+     * Tests the concurrent connection flow fails without enabling the MultiInternetState.
+     * 1. Connect to a network using internet connectivity API.
+     * 2. Connect to a network using enabling multi internet API.
+     * 3. Verify that both connections are active.
+     */
+    @Test
+    public void testConnectToSecondaryNetworkWhenConnectedToInternetNetworkFail() throws Exception {
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> {
+                    setMultiInternetMode(WifiManager.WIFI_MULTI_INTERNET_MODE_DISABLED);
+                });
+
+        mTestHelper.testMultiInternetConnectionFlowWithShellIdentity(mExecutorService, false);
+    }
+}
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/MultiStaConcurrencyRestrictedWifiNetworkSuggestionTest.java b/tests/tests/wifi/src/android/net/wifi/cts/MultiStaConcurrencyRestrictedWifiNetworkSuggestionTest.java
index 271035f..8b030da 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/MultiStaConcurrencyRestrictedWifiNetworkSuggestionTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/MultiStaConcurrencyRestrictedWifiNetworkSuggestionTest.java
@@ -244,7 +244,7 @@
                         .build();
         mNsNetworkCallback = mTestHelper.testConnectionFlowWithSuggestion(
                 mTestNetworkForRestrictedConnection, suggestion, mExecutorService,
-                Set.of(NET_CAPABILITY_OEM_PAID));
+                Set.of(NET_CAPABILITY_OEM_PAID), false/* restrictedNetwork */);
 
         // Ensure that there are 2 wifi connections available for apps.
         assertThat(mTestHelper.getNumWifiConnections()).isEqualTo(2);
@@ -266,7 +266,7 @@
                         .build();
         mNsNetworkCallback = mTestHelper.testConnectionFlowWithSuggestion(
                 mTestNetworkForRestrictedConnection, suggestion, mExecutorService,
-                Set.of(NET_CAPABILITY_OEM_PAID));
+                Set.of(NET_CAPABILITY_OEM_PAID), false);
 
         // Now trigger internet connectivity.
         mNetworkCallback = mTestHelper.testConnectionFlowWithConnect(
@@ -296,7 +296,7 @@
                         .build();
         mNsNetworkCallback = mTestHelper.testConnectionFlowWithSuggestion(
                 mTestNetworkForRestrictedConnection, suggestion, mExecutorService,
-                Set.of(NET_CAPABILITY_OEM_PRIVATE));
+                Set.of(NET_CAPABILITY_OEM_PRIVATE), false/* restrictedNetwork */);
 
         // Ensure that there are 2 wifi connections available for apps.
         assertThat(mTestHelper.getNumWifiConnections()).isEqualTo(2);
@@ -318,7 +318,7 @@
                         .build();
         mNsNetworkCallback = mTestHelper.testConnectionFlowWithSuggestion(
                 mTestNetworkForRestrictedConnection, suggestion, mExecutorService,
-                Set.of(NET_CAPABILITY_OEM_PRIVATE));
+                Set.of(NET_CAPABILITY_OEM_PRIVATE), false/* restrictedNetwork */);
 
         // Now trigger internet connectivity.
         mNetworkCallback = mTestHelper.testConnectionFlowWithConnect(
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/ScanResultTest.java b/tests/tests/wifi/src/android/net/wifi/cts/ScanResultTest.java
index 98ba803..95e47cd 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/ScanResultTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/ScanResultTest.java
@@ -19,25 +19,32 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
-import java.nio.ByteBuffer;
-import java.util.List;
-
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.net.wifi.MloLink;
 import android.net.wifi.ScanResult;
 import android.net.wifi.ScanResult.InformationElement;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiManager.WifiLock;
+import android.net.wifi.WifiScanner;
+import android.net.wifi.WifiSsid;
+import android.os.Parcel;
 import android.platform.test.annotations.AppModeFull;
-import android.test.AndroidTestCase;
+import android.support.test.uiautomator.UiDevice;
+
+import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.ShellIdentityUtils;
 import com.android.compatibility.common.util.SystemUtil;
 
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
 @AppModeFull(reason = "Cannot get WifiManager in instant app mode")
 public class ScanResultTest extends WifiJUnit3TestBase {
     private static class MySync {
@@ -46,6 +53,7 @@
 
     private WifiManager mWifiManager;
     private WifiLock mWifiLock;
+    private TestHelper mTestHelper;
     private static MySync mMySync;
     private boolean mWasVerboseLoggingEnabled;
     private boolean mWasScanThrottleEnabled;
@@ -67,6 +75,9 @@
     private static final long SCAN_FIND_BSSID_WAIT_MSEC = 5_000L;
     private static final int WIFI_CONNECT_TIMEOUT_MILLIS = 30_000;
 
+    // Note: defined in ScanRequestProxy.java
+    public static final int SCAN_REQUEST_THROTTLE_MAX_IN_TIME_WINDOW_FG_APPS = 4;
+
     private static final String TEST_SSID = "TEST_SSID";
     public static final String TEST_BSSID = "04:ac:fe:45:34:10";
     public static final String TEST_CAPS = "CCMP";
@@ -119,6 +130,9 @@
         mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
         assertThat(mWifiManager).isNotNull();
 
+        mTestHelper = new TestHelper(InstrumentationRegistry.getInstrumentation().getContext(),
+                UiDevice.getInstance(InstrumentationRegistry.getInstrumentation()));
+
         // turn on verbose logging for tests
         mWasVerboseLoggingEnabled = ShellIdentityUtils.invokeWithShellPermissions(
                 () -> mWifiManager.isVerboseLoggingEnabled());
@@ -283,6 +297,7 @@
 
         ScanResult scanResult = new ScanResult();
         scanResult.SSID = TEST_SSID;
+        scanResult.setWifiSsid(WifiSsid.fromBytes(TEST_SSID.getBytes(StandardCharsets.UTF_8)));
         scanResult.BSSID = TEST_BSSID;
         scanResult.capabilities = TEST_CAPS;
         scanResult.level = TEST_LEVEL;
@@ -291,6 +306,7 @@
 
         ScanResult scanResult2 = new ScanResult(scanResult);
         assertThat(scanResult2.SSID).isEqualTo(TEST_SSID);
+        assertThat(scanResult2.getWifiSsid()).isEqualTo(scanResult.getWifiSsid());
         assertThat(scanResult2.BSSID).isEqualTo(TEST_BSSID);
         assertThat(scanResult2.capabilities).isEqualTo(TEST_CAPS);
         assertThat(scanResult2.level).isEqualTo(TEST_LEVEL);
@@ -338,5 +354,87 @@
                 .that("\"" + scanResultSsidUnquoted + "\"")
                 .isEqualTo(wifiInfoSsidQuoted);
         assertThat(currentNetwork.frequency).isEqualTo(wifiInfo.getFrequency());
+        assertThat(currentNetwork.getSecurityTypes())
+                .asList().contains(wifiInfo.getCurrentSecurityType());
+    }
+
+    /**
+     * Verify that scan throttling is enforced.
+     */
+    public void testScanThrottling() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+
+        // re-enable scan throttling
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.setScanThrottleEnabled(true));
+        mTestHelper.turnScreenOn();
+
+        synchronized (mMySync) {
+            for (int i = 0; i < SCAN_REQUEST_THROTTLE_MAX_IN_TIME_WINDOW_FG_APPS; ++i) {
+                mWifiManager.startScan();
+                assertTrue("Iteration #" + i,
+                        waitForBroadcast(SCAN_WAIT_MSEC, STATE_SCAN_RESULTS_AVAILABLE));
+            }
+
+            mWifiManager.startScan();
+            assertTrue("Should be throttled", waitForBroadcast(SCAN_WAIT_MSEC, STATE_SCAN_FAILURE));
+        }
+    }
+
+    /**
+     * Test MLO Attributes in ScanResult Constructor (WiFi-7)
+     */
+    public void testScanResultMloAttributes() {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+
+        ScanResult scanResult = new ScanResult();
+        assertNull(scanResult.getApMldMacAddress());
+        assertEquals(MloLink.INVALID_MLO_LINK_ID, scanResult.getApMloLinkId());
+        assertNotNull(scanResult.getAffiliatedMloLinks());
+        assertTrue(scanResult.getAffiliatedMloLinks().isEmpty());
+    }
+
+    /**
+     * Test MLO Link Constructor (WiFi-7)
+     */
+    public void testMloLinkConstructor() {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+
+        MloLink mloLink = new MloLink();
+        assertEquals(WifiScanner.WIFI_BAND_UNSPECIFIED, mloLink.getBand());
+        assertEquals(0, mloLink.getChannel());
+        assertEquals(MloLink.INVALID_MLO_LINK_ID, mloLink.getLinkId());
+        assertNull(mloLink.getStaMacAddress());
+        assertNull(mloLink.getApMacAddress());
+        assertEquals(MloLink.MLO_LINK_STATE_UNASSOCIATED, mloLink.getState());
+    }
+
+    /**
+     * Test MLO Link parcelable APIs
+     */
+    public void testMloLinkParcelable() {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+
+        Parcel p = Parcel.obtain();
+        MloLink mloLink = new MloLink();
+
+        mloLink.writeToParcel(p, 0);
+        p.setDataPosition(0);
+        MloLink newMloLink = MloLink.CREATOR.createFromParcel(p);
+        assertEquals(mloLink, newMloLink);
+        assertEquals("hashCode() did not get right hashCode",
+                mloLink.hashCode(), newMloLink.hashCode());
     }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/TestHelper.java b/tests/tests/wifi/src/android/net/wifi/cts/TestHelper.java
index c845138..02193c3 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/TestHelper.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/TestHelper.java
@@ -20,6 +20,7 @@
 import static android.Manifest.permission.NETWORK_SETTINGS;
 import static android.net.ConnectivityManager.NetworkCallback.FLAG_INCLUDE_LOCATION_INFO;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET;
+import static android.net.NetworkCapabilities.NET_CAPABILITY_NOT_RESTRICTED;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PAID;
 import static android.net.NetworkCapabilities.NET_CAPABILITY_OEM_PRIVATE;
 import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
@@ -27,6 +28,11 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import android.annotation.NonNull;
@@ -47,16 +53,19 @@
 import android.os.WorkSource;
 import android.support.test.uiautomator.UiDevice;
 import android.text.TextUtils;
+import android.util.ArrayMap;
 import android.util.Log;
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.ApiLevelUtil;
+import com.android.compatibility.common.util.PollingCheck;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
@@ -104,8 +113,12 @@
         private final CountDownLatch mCountDownLatch;
         public boolean onAvailableCalled = false;
 
-        TestScanResultsCallback(CountDownLatch countDownLatch) {
-            mCountDownLatch = countDownLatch;
+        TestScanResultsCallback() {
+            mCountDownLatch = new CountDownLatch(1);
+        }
+
+        public void await() throws InterruptedException {
+            mCountDownLatch.await(DURATION_MILLIS, TimeUnit.MILLISECONDS);
         }
 
         @Override
@@ -125,22 +138,45 @@
      *
      * @param wifiManager WifiManager service
      * @param savedNetworks List of saved networks on the device.
+     * @return List of WifiConfiguration with matching bssid.
      */
     public static List<WifiConfiguration> findMatchingSavedNetworksWithBssid(
             @NonNull WifiManager wifiManager, @NonNull List<WifiConfiguration> savedNetworks) {
         if (savedNetworks.isEmpty()) return Collections.emptyList();
         List<WifiConfiguration> matchingNetworksWithBssids = new ArrayList<>();
-        CountDownLatch countDownLatch = new CountDownLatch(1);
+        Map<Integer, List<WifiConfiguration>> networksMap =
+                findMatchingSavedNetworksWithBssidByBand(wifiManager, savedNetworks);
+        for (List<WifiConfiguration> configs : networksMap.values()) {
+            matchingNetworksWithBssids.addAll(configs);
+        }
+        return matchingNetworksWithBssids;
+    }
+
+    /**
+     * Loops through all the saved networks available in the scan results. Returns a map of lists of
+     * WifiConfiguration with the matching bssid filled in {@link WifiConfiguration#BSSID}.
+     *
+     * Note:
+     * a) If there are more than 2 networks with the same SSID, but different credential type, then
+     * this matching may pick the wrong one.
+     *
+     * @param wifiManager WifiManager service
+     * @param savedNetworks List of saved networks on the device.
+     * @return Map from band to the list of WifiConfiguration with matching bssid.
+     */
+    public static Map<Integer, List<WifiConfiguration>> findMatchingSavedNetworksWithBssidByBand(
+            @NonNull WifiManager wifiManager, @NonNull List<WifiConfiguration> savedNetworks) {
+        if (savedNetworks.isEmpty()) return Collections.emptyMap();
+        Map<Integer, List<WifiConfiguration>> matchingNetworksWithBssids = new ArrayMap<>();
         for (int i = 0; i < SCAN_RETRY_CNT_TO_FIND_MATCHING_BSSID; i++) {
             // Trigger a scan to get fresh scan results.
-            TestScanResultsCallback scanResultsCallback =
-                    new TestScanResultsCallback(countDownLatch);
+            TestScanResultsCallback scanResultsCallback = new TestScanResultsCallback();
             try {
                 wifiManager.registerScanResultsCallback(
                         Executors.newSingleThreadExecutor(), scanResultsCallback);
                 wifiManager.startScan(new WorkSource(myUid()));
                 // now wait for callback
-                countDownLatch.await(DURATION_MILLIS, TimeUnit.MILLISECONDS);
+                scanResultsCallback.await();
             } catch (InterruptedException e) {
             } finally {
                 wifiManager.unregisterScanResultsCallback(scanResultsCallback);
@@ -157,7 +193,13 @@
                     // make a copy in case we have 2 bssid's for the same network.
                     WifiConfiguration matchingNetworkCopy = new WifiConfiguration(matchingNetwork);
                     matchingNetworkCopy.BSSID = scanResult.BSSID;
-                    matchingNetworksWithBssids.add(matchingNetworkCopy);
+                    List<WifiConfiguration> bandConfigs = matchingNetworksWithBssids.get(
+                            scanResult.getBand());
+                    if (bandConfigs == null) {
+                        bandConfigs = new ArrayList<>();
+                        matchingNetworksWithBssids.put(scanResult.getBand(), bandConfigs);
+                    }
+                    bandConfigs.add(matchingNetworkCopy);
                 }
             }
             if (!matchingNetworksWithBssids.isEmpty()) break;
@@ -226,47 +268,70 @@
                 .setBssid(MacAddress.fromString(network.BSSID));
     }
 
-    private static class TestNetworkCallback extends ConnectivityManager.NetworkCallback {
-        private final CountDownLatch mCountDownLatch;
+    public static class TestNetworkCallback extends ConnectivityManager.NetworkCallback {
+        private CountDownLatch mBlocker;
         public boolean onAvailableCalled = false;
         public boolean onUnavailableCalled = false;
+        public boolean onLostCalled = false;
         public NetworkCapabilities networkCapabilities;
 
-        TestNetworkCallback(@NonNull CountDownLatch countDownLatch) {
-            mCountDownLatch = countDownLatch;
+        TestNetworkCallback() {
+            mBlocker = new CountDownLatch(1);
         }
 
-        TestNetworkCallback(@NonNull CountDownLatch countDownLatch, int flags) {
+        TestNetworkCallback(int flags) {
             super(flags);
-            mCountDownLatch = countDownLatch;
+            mBlocker = new CountDownLatch(1);
+        }
+
+        public boolean await(long timeout) throws Exception {
+            return mBlocker.await(timeout, TimeUnit.MILLISECONDS);
         }
 
         @Override
         public void onAvailable(Network network) {
+            Log.i(TAG, "onAvailable " + network);
             onAvailableCalled = true;
         }
 
         @Override
         public void onCapabilitiesChanged(Network network,
                 NetworkCapabilities networkCapabilities) {
+            Log.i(TAG, "onCapabilitiesChanged " + network);
             this.networkCapabilities = networkCapabilities;
-            mCountDownLatch.countDown();
+            mBlocker.countDown();
         }
 
         @Override
         public void onUnavailable() {
+            Log.i(TAG, "onUnavailable ");
             onUnavailableCalled = true;
-            mCountDownLatch.countDown();
+            mBlocker.countDown();
+        }
+
+        @Override
+        public void onLost(Network network) {
+            onLostCalled = true;
+            mBlocker.countDown();
+        }
+
+        boolean waitForAnyCallback(int timeout) {
+            try {
+                boolean noTimeout = mBlocker.await(timeout, TimeUnit.MILLISECONDS);
+                mBlocker = new CountDownLatch(1);
+                return noTimeout;
+            } catch (InterruptedException e) {
+                return false;
+            }
         }
     }
 
-    private static TestNetworkCallback createTestNetworkCallback(
-            @NonNull CountDownLatch countDownLatch) {
+    private static TestNetworkCallback createTestNetworkCallback() {
         if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.S)) {
             // flags for NetworkCallback only introduced in S.
-            return new TestNetworkCallback(countDownLatch, FLAG_INCLUDE_LOCATION_INFO);
+            return new TestNetworkCallback(FLAG_INCLUDE_LOCATION_INFO);
         } else {
-            return new TestNetworkCallback(countDownLatch);
+            return new TestNetworkCallback();
         }
     }
 
@@ -320,9 +385,8 @@
     public ConnectivityManager.NetworkCallback testConnectionFlowWithConnect(
             @NonNull WifiConfiguration network) throws Exception {
         CountDownLatch countDownLatchAl = new CountDownLatch(1);
-        CountDownLatch countDownLatchNr = new CountDownLatch(1);
         TestActionListener actionListener = new TestActionListener(countDownLatchAl);
-        TestNetworkCallback testNetworkCallback = createTestNetworkCallback(countDownLatchNr);
+        TestNetworkCallback testNetworkCallback = createTestNetworkCallback();
         UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
         try {
             uiAutomation.adoptShellPermissionIdentity();
@@ -346,8 +410,8 @@
             assertThat(actionListener.onSuccessCalled).isTrue();
 
             // Wait for connection to complete & ensure we are connected to the saved network.
-            assertThat(countDownLatchNr.await(
-                    DURATION_NETWORK_CONNECTION_MILLIS, TimeUnit.MILLISECONDS)).isTrue();
+            assertThat(testNetworkCallback.waitForAnyCallback(DURATION_NETWORK_CONNECTION_MILLIS))
+                    .isTrue();
             assertThat(testNetworkCallback.onAvailableCalled).isTrue();
             final WifiInfo wifiInfo = getWifiInfo(testNetworkCallback.networkCapabilities);
             assertConnectionEquals(network, wifiInfo);
@@ -379,15 +443,18 @@
      * @param restrictedNetworkCapabilities Whether this connection should be restricted with
      *                                    the provided capability.
      *
+     * @param isRestricted whether the suggestion is for a restricted network
      * @return NetworkCallback used for the connection (can be used by client to release the
      * connection.
      */
     public ConnectivityManager.NetworkCallback testConnectionFlowWithSuggestionWithShellIdentity(
             WifiConfiguration network, WifiNetworkSuggestion suggestion,
             @NonNull ScheduledExecutorService executorService,
-            @NonNull Set<Integer> restrictedNetworkCapabilities) throws Exception {
+            @NonNull Set<Integer> restrictedNetworkCapabilities,
+            boolean isRestricted) throws Exception {
         return testConnectionFlowWithSuggestionInternal(
-                network, suggestion, executorService, restrictedNetworkCapabilities, true);
+                network, suggestion, executorService, restrictedNetworkCapabilities, true,
+                isRestricted);
     }
 
     /**
@@ -402,19 +469,22 @@
      * @param restrictedNetworkCapabilities Whether this connection should be restricted with
      *                                    the provided capability.
      *
+     * @param isRestricted whether the suggestion is for a restricted network
      * @return NetworkCallback used for the connection (can be used by client to release the
      * connection.
      */
     public ConnectivityManager.NetworkCallback testConnectionFlowWithSuggestion(
             WifiConfiguration network, WifiNetworkSuggestion suggestion,
             @NonNull ScheduledExecutorService executorService,
-            @NonNull Set<Integer> restrictedNetworkCapabilities) throws Exception {
+            @NonNull Set<Integer> restrictedNetworkCapabilities,
+            boolean isRestricted) throws Exception {
         final UiAutomation uiAutomation =
                 InstrumentationRegistry.getInstrumentation().getUiAutomation();
         try {
             uiAutomation.adoptShellPermissionIdentity(NETWORK_SETTINGS, CONNECTIVITY_INTERNAL);
             return testConnectionFlowWithSuggestionWithShellIdentity(
-                    network, suggestion, executorService, restrictedNetworkCapabilities);
+                    network, suggestion, executorService, restrictedNetworkCapabilities,
+                    isRestricted);
         } finally {
             uiAutomation.dropShellPermissionIdentity();
         }
@@ -441,7 +511,8 @@
         try {
             uiAutomation.adoptShellPermissionIdentity(NETWORK_SETTINGS, CONNECTIVITY_INTERNAL);
             return testConnectionFlowWithSuggestionInternal(
-                    network, suggestion, executorService, restrictedNetworkCapabilities, false);
+                    network, suggestion, executorService, restrictedNetworkCapabilities, false,
+                    false/* restrictedNetwork */);
         } finally {
             uiAutomation.dropShellPermissionIdentity();
         }
@@ -457,6 +528,7 @@
      *                                    the provided capability.
      * @param expectConnectionSuccess Whether to expect connection success or not.
      *
+     * @param isRestricted whether the suggestion is for a restricted network
      * @return NetworkCallback used for the connection (can be used by client to release the
      * connection.
      */
@@ -464,16 +536,15 @@
             WifiConfiguration network, WifiNetworkSuggestion suggestion,
             @NonNull ScheduledExecutorService executorService,
             @NonNull Set<Integer> restrictedNetworkCapabilities,
-            boolean expectConnectionSuccess) throws Exception {
-        CountDownLatch countDownLatch = new CountDownLatch(1);
+            boolean expectConnectionSuccess, boolean isRestricted) throws Exception {
         // File the network request & wait for the callback.
-        TestNetworkCallback testNetworkCallback = createTestNetworkCallback(countDownLatch);
+        TestNetworkCallback testNetworkCallback = createTestNetworkCallback();
         try {
             // File a request for restricted (oem paid) wifi network.
             NetworkRequest.Builder nrBuilder = new NetworkRequest.Builder()
                     .addTransportType(TRANSPORT_WIFI)
                     .addCapability(NET_CAPABILITY_INTERNET);
-            if (restrictedNetworkCapabilities.isEmpty()) {
+            if (restrictedNetworkCapabilities.isEmpty() && !isRestricted) {
                 // If not a restricted connection, a network callback is sufficient.
                 mConnectivityManager.registerNetworkCallback(
                         nrBuilder.build(), testNetworkCallback);
@@ -481,6 +552,7 @@
                 for (Integer restrictedNetworkCapability : restrictedNetworkCapabilities) {
                     nrBuilder.addCapability(restrictedNetworkCapability);
                 }
+                nrBuilder.removeCapability(NET_CAPABILITY_NOT_RESTRICTED);
                 mConnectivityManager.requestNetwork(nrBuilder.build(), testNetworkCallback);
             }
             // Add wifi network suggestion.
@@ -496,22 +568,21 @@
             }, 0, DURATION_MILLIS, TimeUnit.MILLISECONDS);
             if (expectConnectionSuccess) {
                 // now wait for connection to complete and wait for callback
-                assertThat(countDownLatch.await(
-                        DURATION_NETWORK_CONNECTION_MILLIS, TimeUnit.MILLISECONDS)).isTrue();
+                assertThat(testNetworkCallback
+                        .waitForAnyCallback(DURATION_NETWORK_CONNECTION_MILLIS)).isTrue();
                 assertThat(testNetworkCallback.onAvailableCalled).isTrue();
                 final WifiInfo wifiInfo = getWifiInfo(testNetworkCallback.networkCapabilities);
                 assertConnectionEquals(network, wifiInfo);
-                if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(mContext)) {
-                    assertThat(wifiInfo.isTrusted()).isTrue();
-                    WifiInfo redact = wifiInfo
-                            .makeCopy(NetworkCapabilities.REDACT_FOR_ACCESS_FINE_LOCATION);
-                    assertThat(wifiInfo.getInformationElements()).isNotNull();
-                    assertThat(redact.getInformationElements()).isNull();
-                    assertThat(redact.getApplicableRedactions()).isEqualTo(
-                            NetworkCapabilities.REDACT_FOR_ACCESS_FINE_LOCATION
-                            | NetworkCapabilities.REDACT_FOR_LOCAL_MAC_ADDRESS
-                            | NetworkCapabilities.REDACT_FOR_NETWORK_SETTINGS);
-                }
+                assertThat(wifiInfo.isTrusted()).isTrue();
+                assertThat(wifiInfo.isRestricted()).isEqualTo(isRestricted);
+                WifiInfo redact = wifiInfo
+                        .makeCopy(NetworkCapabilities.REDACT_FOR_ACCESS_FINE_LOCATION);
+                assertThat(wifiInfo.getInformationElements()).isNotNull();
+                assertThat(redact.getInformationElements()).isNull();
+                assertThat(redact.getApplicableRedactions()).isEqualTo(
+                        NetworkCapabilities.REDACT_FOR_ACCESS_FINE_LOCATION
+                                | NetworkCapabilities.REDACT_FOR_LOCAL_MAC_ADDRESS
+                                | NetworkCapabilities.REDACT_FOR_NETWORK_SETTINGS);
                 if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.S)) {
                     // If STA concurrency for restricted connection is supported, this should not
                     // be the primary connection.
@@ -524,8 +595,8 @@
                 }
             } else {
                 // now wait for connection to timeout.
-                assertThat(countDownLatch.await(
-                        DURATION_NETWORK_CONNECTION_MILLIS, TimeUnit.MILLISECONDS)).isFalse();
+                assertThat(testNetworkCallback
+                        .waitForAnyCallback(DURATION_NETWORK_CONNECTION_MILLIS)).isFalse();
             }
         } catch (Throwable e /* catch assertions & exceptions */) {
             try {
@@ -672,9 +743,8 @@
     public ConnectivityManager.NetworkCallback testConnectionFlowWithSpecifierWithShellIdentity(
             WifiConfiguration network, WifiNetworkSpecifier specifier, boolean shouldUserReject)
             throws Exception {
-        CountDownLatch countDownLatch = new CountDownLatch(1);
         // File the network request & wait for the callback.
-        TestNetworkCallback testNetworkCallback = createTestNetworkCallback(countDownLatch);
+        TestNetworkCallback testNetworkCallback = createTestNetworkCallback();
 
         // Fork a thread to handle the UI interactions.
         Thread uiThread = new Thread(() -> {
@@ -703,8 +773,8 @@
             // Start the UI interactions.
             uiThread.run();
             // now wait for callback
-            assertThat(countDownLatch.await(
-                    DURATION_NETWORK_CONNECTION_MILLIS, TimeUnit.MILLISECONDS)).isTrue();
+            assertThat(testNetworkCallback.waitForAnyCallback(DURATION_NETWORK_CONNECTION_MILLIS))
+                    .isTrue();
             if (shouldUserReject) {
                 assertThat(testNetworkCallback.onUnavailableCalled).isTrue();
             } else {
@@ -771,8 +841,9 @@
     public long getNumWifiConnections() {
         Network[] networks = mConnectivityManager.getAllNetworks();
         return Arrays.stream(networks)
-                .filter(n ->
-                        mConnectivityManager.getNetworkCapabilities(n).hasTransport(TRANSPORT_WIFI))
+                .filter(n -> mConnectivityManager.getNetworkCapabilities(n) != null
+                        && mConnectivityManager.getNetworkCapabilities(n)
+                                .hasTransport(TRANSPORT_WIFI))
                 .count();
     }
 
@@ -783,8 +854,7 @@
      * @throws Exception
      */
     public void assertWifiInternetConnectionAvailable() throws Exception {
-        CountDownLatch countDownLatchNr = new CountDownLatch(1);
-        TestNetworkCallback testNetworkCallback = createTestNetworkCallback(countDownLatchNr);
+        TestNetworkCallback testNetworkCallback = createTestNetworkCallback();
         try {
             // File a callback for wifi network.
             NetworkRequest.Builder builder = new NetworkRequest.Builder()
@@ -799,8 +869,8 @@
             mConnectivityManager.registerNetworkCallback(builder.build(), testNetworkCallback);
             // Wait for connection to complete & ensure we are connected to some network capable
             // of providing internet access.
-            assertThat(countDownLatchNr.await(
-                    DURATION_NETWORK_CONNECTION_MILLIS, TimeUnit.MILLISECONDS)).isTrue();
+            assertThat(testNetworkCallback.waitForAnyCallback(DURATION_NETWORK_CONNECTION_MILLIS))
+                    .isTrue();
             assertThat(testNetworkCallback.onAvailableCalled).isTrue();
         } finally {
             mConnectivityManager.unregisterNetworkCallback(testNetworkCallback);
@@ -825,4 +895,168 @@
         }
     }
 
+    /**
+     * Create a network request for specified band in a network specifier.
+     */
+    private NetworkRequest createNetworkRequestForInternet(int band) {
+        final NetworkRequest networkRequest = new NetworkRequest.Builder()
+                .clearCapabilities()
+                .addCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET)
+                .addTransportType(TRANSPORT_WIFI)
+                .setNetworkSpecifier(new WifiNetworkSpecifier.Builder()
+                        .setBand(band).build())
+                .build();
+        return networkRequest;
+    }
+
+    /**
+     * Check if a wifi network info is as expected for multi internet connections.
+     * @return the WifiInfo of the network.
+     */
+    private WifiInfo checkWifiNetworkInfo(TestNetworkCallback testNetworkCallback,
+            int band) {
+        if (testNetworkCallback.networkCapabilities == null) {
+            return null;
+        }
+        WifiInfo wifiInfo = getWifiInfo(testNetworkCallback.networkCapabilities);
+        assertTrue(wifiInfo.isTrusted());
+        assertFalse(wifiInfo.isRestricted());
+        WifiInfo redact = wifiInfo
+                .makeCopy(NetworkCapabilities.REDACT_FOR_ACCESS_FINE_LOCATION);
+        assertNotNull(wifiInfo.getInformationElements());
+        assertNull(redact.getInformationElements());
+        assertEquals(NetworkCapabilities.REDACT_FOR_ACCESS_FINE_LOCATION
+                        | NetworkCapabilities.REDACT_FOR_LOCAL_MAC_ADDRESS
+                        | NetworkCapabilities.REDACT_FOR_NETWORK_SETTINGS,
+                        redact.getApplicableRedactions());
+        assertEquals(band, getBandFromFrequency(wifiInfo.getFrequency()));
+
+        return wifiInfo;
+    }
+
+    /**
+     * Tests the entire connection success/failure flow using the provided suggestion.
+     *
+     * @param executorService Excutor service to run scan periodically (to trigger connection).
+     * @param expectConnectionSuccess Whether to expect connection success or not.
+     */
+    private void testMultiInternetConnectionFlowInternal(
+            @NonNull ScheduledExecutorService executorService,
+            boolean expectConnectionSuccess) throws Exception {
+        // File the network request & wait for the callback.
+        TestNetworkCallback testNetworkCallback2G = createTestNetworkCallback();
+        TestNetworkCallback testNetworkCallback5G = createTestNetworkCallback();
+        final NetworkRequest networkRequest2G = createNetworkRequestForInternet(
+                ScanResult.WIFI_BAND_24_GHZ);
+        final NetworkRequest networkRequest5G = createNetworkRequestForInternet(
+                ScanResult.WIFI_BAND_5_GHZ);
+         // Make sure wifi is connected to primary after wifi enabled with saved network.
+        PollingCheck.check("Wifi not connected", DURATION_NETWORK_CONNECTION_MILLIS,
+                () -> getNumWifiConnections() > 0);
+        try {
+            // Request both 2G and 5G wifi networks.
+            mConnectivityManager.requestNetwork(networkRequest2G, testNetworkCallback2G);
+            mConnectivityManager.requestNetwork(networkRequest5G, testNetworkCallback5G);
+            // Wait for the request to reach the wifi stack before kick-start periodic scans.
+            Thread.sleep(200);
+            boolean band2gFound = false;
+            boolean band5gFound = false;
+            // now wait for connection to complete and wait for callback
+            WifiInfo primaryInfo = null;
+            WifiInfo secondaryInfo = null;
+            if (testNetworkCallback2G.await(DURATION_NETWORK_CONNECTION_MILLIS)) {
+                WifiInfo info2g = checkWifiNetworkInfo(testNetworkCallback2G,
+                        ScanResult.WIFI_BAND_24_GHZ);
+                if (info2g != null) {
+                    if (info2g.isPrimary()) {
+                        primaryInfo = info2g;
+                    } else {
+                        secondaryInfo = info2g;
+                    }
+                    band2gFound = true;
+                }
+            }
+            if (testNetworkCallback5G.await(DURATION_NETWORK_CONNECTION_MILLIS)) {
+                WifiInfo info5g = checkWifiNetworkInfo(testNetworkCallback5G,
+                        ScanResult.WIFI_BAND_5_GHZ);
+                if (info5g != null) {
+                    if (info5g.isPrimary()) {
+                        primaryInfo = info5g;
+                    } else {
+                        secondaryInfo = info5g;
+                    }
+                    band5gFound = true;
+                }
+            }
+            if (expectConnectionSuccess) {
+                // Ensure both primary and non-primary networks are created.
+                assertTrue("Network not found on 2g", band2gFound);
+                assertTrue("Network not found on 5g", band5gFound);
+                assertFalse("Network unavailable on 2g", testNetworkCallback2G.onUnavailableCalled);
+                assertFalse("Network unavailable on 5g", testNetworkCallback5G.onUnavailableCalled);
+                assertNotNull("No primary network info", primaryInfo);
+                assertNotNull("No secondary network info", secondaryInfo);
+                assertFalse("Primary and secondary networks are same",
+                        primaryInfo.equals(secondaryInfo));
+                // Ensure that there are 2 wifi connections available for apps.
+                assertEquals("Expecting 2 Wifi networks", 2, getNumWifiConnections());
+                // Check if the networks meets the expected requested multi internet state
+                int mode = mWifiManager.getStaConcurrencyForMultiInternetMode();
+                if (mode == mWifiManager.WIFI_MULTI_INTERNET_MODE_MULTI_AP) {
+                    // Multi AP state allows connecting to same network or multi APs in other
+                    // networks, with different BSSIDs.
+                    assertFalse("Can not connect to same bssid" + primaryInfo.getBSSID()
+                            + " / " + secondaryInfo.getBSSID(),
+                            TextUtils.equals(primaryInfo.getBSSID(), secondaryInfo.getBSSID()));
+                } else if (mode == mWifiManager.WIFI_MULTI_INTERNET_MODE_DBS_AP) {
+                    assertTrue("NETWORK_DBS mode can only connect to the same SSID but got "
+                            + primaryInfo.getSSID() + " / " + secondaryInfo.getSSID(),
+                            TextUtils.equals(primaryInfo.getSSID(), secondaryInfo.getSSID()));
+                    assertEquals("NETWORK_DBS mode can only connect to the same network Id but got"
+                            + primaryInfo.getNetworkId() + " / " + secondaryInfo.getNetworkId(),
+                            primaryInfo.getNetworkId(), secondaryInfo.getNetworkId());
+                    assertEquals("NETWORK_DBS mode can only connect to same security type but got"
+                            + primaryInfo.getCurrentSecurityType() + " / "
+                            + secondaryInfo.getCurrentSecurityType(),
+                            primaryInfo.getCurrentSecurityType(),
+                            secondaryInfo.getCurrentSecurityType());
+                } else {
+                    fail("Invalid multi internet mode " + mode);
+                }
+            } else {
+                // Ensure no band specified wifi connection is created.
+                assertTrue(testNetworkCallback2G.onUnavailableCalled
+                        || testNetworkCallback5G.onUnavailableCalled);
+                // Only one wifi network
+                assertEquals("There should be only one wifi network but got "
+                        + getNumWifiConnections(), 1, getNumWifiConnections());
+            }
+        } finally {
+            mConnectivityManager.unregisterNetworkCallback(testNetworkCallback2G);
+            mConnectivityManager.unregisterNetworkCallback(testNetworkCallback5G);
+            executorService.shutdown();
+        }
+    }
+
+    /**
+     * Tests the entire connection success flow using the provided suggestion.
+     *
+     * Note: The caller needs to invoke this after acquiring shell identity.
+     *
+     * @param executorService Excutor service to run scan periodically (to trigger connection).
+     * @param expectConnectionSuccess Whether to expect connection success or not.
+     */
+    public void testMultiInternetConnectionFlowWithShellIdentity(
+            @NonNull ScheduledExecutorService executorService,
+            boolean expectConnectionSuccess) throws Exception {
+        final UiAutomation uiAutomation =
+                InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        try {
+            uiAutomation.adoptShellPermissionIdentity(NETWORK_SETTINGS, CONNECTIVITY_INTERNAL);
+            testMultiInternetConnectionFlowInternal(
+                    executorService, expectConnectionSuccess);
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiConfigurationTest.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiConfigurationTest.java
index 3bd8b28..95a85b2 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiConfigurationTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiConfigurationTest.java
@@ -16,6 +16,10 @@
 
 package android.net.wifi.cts;
 
+import static android.net.wifi.WifiConfiguration.RANDOMIZATION_AUTO;
+import static android.net.wifi.WifiConfiguration.RANDOMIZATION_NONE;
+import static android.net.wifi.WifiConfiguration.RANDOMIZATION_NON_PERSISTENT;
+import static android.net.wifi.WifiConfiguration.RANDOMIZATION_PERSISTENT;
 import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_EAP;
 import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_EAP_SUITE_B;
 import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE;
@@ -27,6 +31,8 @@
 import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_WAPI_CERT;
 import static android.net.wifi.WifiConfiguration.SECURITY_TYPE_WAPI_PSK;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiManager;
@@ -140,4 +146,42 @@
         configuration.setDeletionPriority(1);
         assertEquals(1, configuration.getDeletionPriority());
     }
+
+    public void testSetGetMacRandomizationSetting() throws Exception {
+        WifiConfiguration configuration = new WifiConfiguration();
+
+        configuration.setMacRandomizationSetting(RANDOMIZATION_NONE);
+        assertEquals(RANDOMIZATION_NONE, configuration.getMacRandomizationSetting());
+
+        configuration.setMacRandomizationSetting(RANDOMIZATION_PERSISTENT);
+        assertEquals(RANDOMIZATION_PERSISTENT, configuration.getMacRandomizationSetting());
+
+        configuration.setMacRandomizationSetting(RANDOMIZATION_NON_PERSISTENT);
+        assertEquals(RANDOMIZATION_NON_PERSISTENT, configuration.getMacRandomizationSetting());
+
+        configuration.setMacRandomizationSetting(RANDOMIZATION_AUTO);
+        assertEquals(RANDOMIZATION_AUTO, configuration.getMacRandomizationSetting());
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testGetDefaultDppAkmConfigurations() throws Exception {
+        WifiConfiguration configuration = new WifiConfiguration();
+
+        assertFalse(configuration.isDppConfigurator());
+        assertThat(configuration.getDppCSignKey()).isNotNull();
+        assertThat(configuration.getDppConnector()).isNotNull();
+        assertThat(configuration.getDppNetAccessKey()).isNotNull();
+        assertThat(configuration.getDppPrivateEcKey()).isNotNull();
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSetGetIsRepeaterEnabled() throws Exception {
+        WifiConfiguration configuration = new WifiConfiguration();
+
+        assertFalse(configuration.isRepeaterEnabled());
+        configuration.setRepeaterEnabled(true);
+        assertTrue(configuration.isRepeaterEnabled());
+        configuration.setRepeaterEnabled(false);
+        assertFalse(configuration.isRepeaterEnabled());
+    }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiEnterpriseConfigTest.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiEnterpriseConfigTest.java
index a9402ba..16cc8a0 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiEnterpriseConfigTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiEnterpriseConfigTest.java
@@ -1009,4 +1009,37 @@
         config.setDecoratedIdentityPrefix(TEST_DECORATED_IDENTITY_PREFIX);
         assertEquals(TEST_DECORATED_IDENTITY_PREFIX, config.getDecoratedIdentityPrefix());
     }
+
+    // TODO(b/196180536): Wait for T SDK finalization before changing
+    // to `@SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)`
+    @SdkSuppress(minSdkVersion = 31)
+    public void testSetGetTrustOnFirstUse() {
+        if (!hasWifi()) {
+            return;
+        }
+        WifiEnterpriseConfig config = new WifiEnterpriseConfig();
+        assertFalse(config.isTrustOnFirstUseEnabled());
+        config.enableTrustOnFirstUse(true);
+        assertTrue(config.isTrustOnFirstUseEnabled());
+        config.enableTrustOnFirstUse(false);
+        assertFalse(config.isTrustOnFirstUseEnabled());
+    }
+
+    // TODO(b/196180536): Wait for T SDK finalization before changing
+    // to `@SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)`
+    @SdkSuppress(minSdkVersion = 31)
+    public void testHasCaCertificate() {
+        if (!hasWifi()) {
+            return;
+        }
+        WifiEnterpriseConfig config = new WifiEnterpriseConfig();
+        assertFalse(config.hasCaCertificate());
+        config.setCaPath("/tmp/ca.cert");
+        assertTrue(config.hasCaCertificate());
+
+        config = new WifiEnterpriseConfig();
+        assertFalse(config.hasCaCertificate());
+        config.setCaCertificate(FakeKeys.CA_CERT0);
+        assertTrue(config.hasCaCertificate());
+    }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiFeature.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiFeature.java
index 4876ff0..0bcc653 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiFeature.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiFeature.java
@@ -34,4 +34,14 @@
         final PackageManager pm = context.getPackageManager();
         return pm.hasSystemFeature(PackageManager.FEATURE_TELEPHONY);
     }
+
+    public static boolean isRttSupported(Context context) {
+        final PackageManager pm = context.getPackageManager();
+        return pm.hasSystemFeature(PackageManager.FEATURE_WIFI_RTT);
+    }
+
+    public static boolean isAwareSupported(Context context) {
+        final PackageManager pm = context.getPackageManager();
+        return pm.hasSystemFeature(PackageManager.FEATURE_WIFI_AWARE);
+    }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiHotspot2Test.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiHotspot2Test.java
index 1bf8726..7f7504d 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiHotspot2Test.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiHotspot2Test.java
@@ -23,7 +23,6 @@
 import android.net.wifi.hotspot2.PasspointConfiguration;
 import android.net.wifi.hotspot2.pps.Credential;
 import android.net.wifi.hotspot2.pps.HomeSp;
-import android.test.AndroidTestCase;
 import android.text.TextUtils;
 
 import java.lang.reflect.Constructor;
@@ -57,6 +56,8 @@
     private static final String TEST_NAI = "test.access.com";
     private static final List<Integer> TEST_METHOD_LIST =
             Arrays.asList(1 /* METHOD_SOAP_XML_SPP */);
+    private static final long SUBSCRIPTION_EXPIRATION_TIME_MS = 1643996661000L;
+
     @Override
     protected void setUp() throws Exception {
         super.setUp();
@@ -86,11 +87,11 @@
     }
 
     /**
-     * Tests {@link PasspointConfiguration#getSubscriptionExpirationTimeMillis()} method.
+     * Tests {@link PasspointConfiguration#getSubscriptionExpirationTimeMillis()} and
+     * {@link PasspointConfiguration#setSubscriptionExpirationTimeInMillis(long)}
      * <p>
-     * Test default value
      */
-    public void testGetSubscriptionExpirationTimeMillis() throws Exception {
+    public void testGetSetSubscriptionExpirationTimeMillis() throws Exception {
         if (!WifiFeature.isWifiSupported(getContext())) {
             // skip the test if WiFi is not supported
             return;
@@ -98,6 +99,10 @@
         PasspointConfiguration passpointConfiguration = new PasspointConfiguration();
         assertEquals(Long.MIN_VALUE,
                 passpointConfiguration.getSubscriptionExpirationTimeMillis());
+        passpointConfiguration
+                .setSubscriptionExpirationTimeInMillis(SUBSCRIPTION_EXPIRATION_TIME_MS);
+        assertEquals(SUBSCRIPTION_EXPIRATION_TIME_MS,
+                passpointConfiguration.getSubscriptionExpirationTimeMillis());
     }
 
     /**
@@ -485,4 +490,5 @@
         assertEquals(friendlyName, osuProvider.getFriendlyName());
         assertEquals(TEST_SERVER_URI, osuProvider.getServerUri());
     }
+
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiInfoTest.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiInfoTest.java
index f8a875c..93e848c 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiInfoTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiInfoTest.java
@@ -22,6 +22,7 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.net.wifi.MloLink;
 import android.net.wifi.ScanResult;
 import android.net.wifi.SupplicantState;
 import android.net.wifi.WifiInfo;
@@ -281,4 +282,23 @@
         info = builder.build();
         assertEquals(WifiInfo.SECURITY_TYPE_SAE, info.getCurrentSecurityType());
     }
+
+    /**
+     * Test MLO Attributes (WiFi-7)
+     */
+    public void testWifiInfoMloAttributes() {
+        // Verify that MLO Attributes are initialzed correctly
+        WifiInfo.Builder builder = new WifiInfo.Builder()
+                .setSsid(TEST_SSID.getBytes(StandardCharsets.UTF_8))
+                .setBssid(TEST_BSSID)
+                .setRssi(TEST_RSSI)
+                .setNetworkId(TEST_NETWORK_ID);
+
+        WifiInfo wifiInfo = builder.build();
+
+        assertNull(wifiInfo.getApMldMacAddress());
+        assertEquals(MloLink.INVALID_MLO_LINK_ID, wifiInfo.getApMloLinkId());
+        assertNotNull(wifiInfo.getAffiliatedMloLinks());
+        assertTrue(wifiInfo.getAffiliatedMloLinks().isEmpty());
+    }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiJUnit3TestBase.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiJUnit3TestBase.java
index d884a50..baa266b 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiJUnit3TestBase.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiJUnit3TestBase.java
@@ -49,8 +49,9 @@
     @Override
     protected void tearDown() throws Exception {
         if (mWasLocationEnabledForTest) {
-            mLocationManager.setLocationEnabledForUser(
-                    false, UserHandle.getUserHandleForUid(Process.myUid()));
+            ShellIdentityUtils.invokeWithShellPermissions(() ->
+                    mLocationManager.setLocationEnabledForUser(
+                            false, UserHandle.getUserHandleForUid(Process.myUid())));
         }
 
         super.tearDown();
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiJUnit4TestBase.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiJUnit4TestBase.java
index 6bc6885..05a5d73 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiJUnit4TestBase.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiJUnit4TestBase.java
@@ -20,43 +20,43 @@
 import android.location.LocationManager;
 import android.os.Process;
 import android.os.UserHandle;
-import android.test.AndroidTestCase;
 
 import androidx.test.platform.app.InstrumentationRegistry;
 
 import com.android.compatibility.common.util.ShellIdentityUtils;
 
-import org.junit.After;
-import org.junit.Before;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 
 /**
  * Base test for Wifi JUnit4 tests that enables/disables location
  */
 public abstract class WifiJUnit4TestBase {
 
-    private LocationManager mLocationManager;
-    private boolean mWasLocationEnabledForTest = false;
+    private static LocationManager sLocationManager;
+    private static boolean sWasLocationEnabledForTest = false;
 
-    @Before
-    public void enableLocationIfNotEnabled() throws Exception {
+    @BeforeClass
+    public static void enableLocationIfNotEnabled() throws Exception {
         Context context = InstrumentationRegistry.getInstrumentation().getContext();
 
-        mLocationManager = context.getSystemService(LocationManager.class);
-        if (!mLocationManager.isLocationEnabled()) {
+        sLocationManager = context.getSystemService(LocationManager.class);
+        if (!sLocationManager.isLocationEnabled()) {
             // Turn on location if it isn't on already
-            ShellIdentityUtils.invokeWithShellPermissions(() ->
-                mLocationManager.setLocationEnabledForUser(
-                    true, UserHandle.getUserHandleForUid(Process.myUid())));
+            ShellIdentityUtils.invokeWithShellPermissions(
+                    () -> sLocationManager.setLocationEnabledForUser(
+                            true, UserHandle.getUserHandleForUid(Process.myUid())));
 
-            mWasLocationEnabledForTest = true;
+            sWasLocationEnabledForTest = true;
         }
     }
 
-    @After
-    public void disableLocationIfOriginallyDisabled() throws Exception {
-        if (mWasLocationEnabledForTest) {
-            mLocationManager.setLocationEnabledForUser(
-                    false, UserHandle.getUserHandleForUid(Process.myUid()));
+    @AfterClass
+    public static void disableLocationIfOriginallyDisabled() throws Exception {
+        if (sWasLocationEnabledForTest) {
+            ShellIdentityUtils.invokeWithShellPermissions(() ->
+                    sLocationManager.setLocationEnabledForUser(
+                            false, UserHandle.getUserHandleForUid(Process.myUid())));
         }
     }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
index a8dfee4..479c0eb3 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiManagerTest.java
@@ -29,10 +29,14 @@
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth.assertWithMessage;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThrows;
 
 import android.annotation.NonNull;
 import android.app.UiAutomation;
+import android.app.admin.DevicePolicyManager;
+import android.app.admin.WifiSsidPolicy;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -63,6 +67,8 @@
 import android.net.wifi.WifiManager.WifiLock;
 import android.net.wifi.WifiNetworkConnectionStatistics;
 import android.net.wifi.WifiNetworkSuggestion;
+import android.net.wifi.WifiScanner;
+import android.net.wifi.WifiSsid;
 import android.net.wifi.hotspot2.ConfigParser;
 import android.net.wifi.hotspot2.OsuProvider;
 import android.net.wifi.hotspot2.PasspointConfiguration;
@@ -108,6 +114,8 @@
 import java.net.HttpURLConnection;
 import java.net.InetAddress;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -123,6 +131,10 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 @AppModeFull(reason = "Cannot get WifiManager in instant app mode")
@@ -165,9 +177,11 @@
     private static final int SCAN_TEST_WAIT_DURATION_MS = 15_000;
     private static final int TEST_WAIT_DURATION_MS = 10_000;
     private static final int WIFI_CONNECT_TIMEOUT_MILLIS = 30_000;
+    private static final int WIFI_PNO_CONNECT_TIMEOUT_MILLIS = 90_000;
     private static final int WAIT_MSEC = 60;
     private static final int DURATION_SCREEN_TOGGLE = 2000;
     private static final int DURATION_SETTINGS_TOGGLE = 1_000;
+    private static final int DURATION_SOFTAP_START_MS = 6_000;
     private static final int WIFI_SCAN_TEST_CACHE_DELAY_MILLIS = 3 * 60 * 1000;
 
     private static final int ENFORCED_NUM_NETWORK_SUGGESTIONS_PER_APP = 50;
@@ -189,6 +203,15 @@
     private static final String TEST_COUNTRY_CODE = "JP";
     private static final String TEST_DOM_SUBJECT_MATCH = "domSubjectMatch";
     private static final int TEST_SUB_ID = 2;
+    private static final int EID_VSA = 221; // Copied from ScanResult.InformationElement
+    private static final List<ScanResult.InformationElement> TEST_VENDOR_ELEMENTS =
+            new ArrayList<>(Arrays.asList(
+                    new ScanResult.InformationElement(221, 0, new byte[]{ 1, 2, 3, 4 }),
+                    new ScanResult.InformationElement(
+                            221,
+                            0,
+                            new byte[]{ (byte) 170, (byte) 187, (byte) 204, (byte) 221 })
+            ));
 
     private IntentFilter mIntentFilter;
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -439,6 +462,10 @@
         }
     }
 
+    private void waitForConnection(int timeoutMillis) throws Exception {
+        waitForNetworkInfoState(NetworkInfo.State.CONNECTED, timeoutMillis);
+    }
+
     private void waitForConnection() throws Exception {
         waitForNetworkInfoState(NetworkInfo.State.CONNECTED, WIFI_CONNECT_TIMEOUT_MILLIS);
     }
@@ -510,7 +537,7 @@
             fail("Please enable location for this test - since Marshmallow WiFi scan results are"
                     + " empty when location is disabled!");
         }
-        runWithScanningEnabled(() -> {
+        runWithScanning(() -> {
             setWifiEnabled(false);
             Thread.sleep(TEST_WAIT_DURATION_MS);
             startScan();
@@ -525,7 +552,7 @@
             final String TAG = "Test";
             assertNotNull(mWifiManager.createWifiLock(TAG));
             assertNotNull(mWifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL, TAG));
-        });
+        }, true /* run with enabled*/);
     }
 
     /**
@@ -684,6 +711,15 @@
         return getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE);
     }
 
+    private boolean hasWifiDirect() {
+        return getContext().getPackageManager().hasSystemFeature(
+                PackageManager.FEATURE_WIFI_DIRECT);
+    }
+
+    private boolean hasWifiAware() {
+        return getContext().getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_AWARE);
+    }
+
     public void testSignal() {
         if (!WifiFeature.isWifiSupported(getContext())) {
             // skip the test if WiFi is not supported
@@ -988,18 +1024,18 @@
         }
 
         TestExecutor executor = new TestExecutor();
-        TestSoftApCallback capabilityCallback = new TestSoftApCallback(mLock);
+        TestSoftApCallback lohsSoftApCallback = new TestSoftApCallback(mLock);
         UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
         List<Integer> supportedSoftApBands = new ArrayList<>();
         try {
             uiAutomation.adoptShellPermissionIdentity();
-            verifyRegisterSoftApCallback(executor, capabilityCallback);
+            verifyLohsRegisterSoftApCallback(executor, lohsSoftApCallback);
             supportedSoftApBands = getSupportedSoftApBand(
-                    capabilityCallback.getCurrentSoftApCapability());
+                    lohsSoftApCallback.getCurrentSoftApCapability());
         } catch (Exception ex) {
         } finally {
             // clean up
-            mWifiManager.unregisterSoftApCallback(capabilityCallback);
+            unregisterLocalOnlyHotspotSoftApCallback(lohsSoftApCallback);
             uiAutomation.dropShellPermissionIdentity();
         }
         TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(mLock);
@@ -1148,6 +1184,46 @@
     }
 
     /**
+     * Verify setting the scan schedule.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSetScreenOnScanSchedule() {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        List<WifiManager.ScreenOnScanSchedule> schedules = new ArrayList<>();
+        schedules.add(new WifiManager.ScreenOnScanSchedule(Duration.ofSeconds(20),
+                WifiScanner.SCAN_TYPE_HIGH_ACCURACY));
+        schedules.add(new WifiManager.ScreenOnScanSchedule(Duration.ofSeconds(40),
+                WifiScanner.SCAN_TYPE_LOW_LATENCY));
+        assertEquals(20, schedules.get(0).getScanInterval().toSeconds());
+        assertEquals(40, schedules.get(1).getScanInterval().toSeconds());
+        assertEquals(WifiScanner.SCAN_TYPE_HIGH_ACCURACY, schedules.get(0).getScanType());
+        assertEquals(WifiScanner.SCAN_TYPE_LOW_LATENCY, schedules.get(1).getScanType());
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.setScreenOnScanSchedule(schedules));
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.setScreenOnScanSchedule(null));
+
+        // Creating an invalid ScanSchedule should throw an exception
+        assertThrows(IllegalArgumentException.class, () -> new WifiManager.ScreenOnScanSchedule(
+                null, WifiScanner.SCAN_TYPE_HIGH_ACCURACY));
+    }
+
+    /**
+     * Verify a normal app cannot set the scan schedule.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSetScreenOnScanScheduleNoPermission() {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        assertThrows(SecurityException.class, () -> mWifiManager.setScreenOnScanSchedule(null));
+    }
+
+    /**
      * Test coverage for the constructor of AddNetworkResult.
      */
     public void testAddNetworkResultCreation() {
@@ -1168,6 +1244,271 @@
     }
 
     /**
+     * Verify {@link WifiManager#setSsidsAllowlist(Set)} can be called with sufficient
+     * privilege.
+     */
+    public void testGetAndSetSsidsAllowlist() {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        Set<WifiSsid> ssids = new ArraySet<>();
+        ssids.add(WifiSsid.fromBytes("TEST_SSID_1".getBytes(StandardCharsets.UTF_8)));
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.setSsidsAllowlist(ssids));
+
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> assertEquals("Ssids should match", ssids,
+                        mWifiManager.getSsidsAllowlist()));
+
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.setSsidsAllowlist(Collections.EMPTY_SET));
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> assertEquals("Should equal to empty set",
+                        Collections.EMPTY_SET,
+                        mWifiManager.getSsidsAllowlist()));
+
+        try {
+            mWifiManager.setSsidsAllowlist(Collections.EMPTY_SET);
+            fail("Expected SecurityException when called without permission");
+        } catch (SecurityException e) {
+            // expect the exception
+        }
+    }
+
+    class TestPnoScanResultsCallback implements WifiManager.PnoScanResultsCallback {
+        public CountDownLatch latch = new CountDownLatch(1);
+        private boolean mRegisterSuccess;
+        private int mRegisterFailedReason = -1;
+        private int mRemovedReason = -1;
+        private List<ScanResult> mScanResults;
+
+        @Override
+        public void onScanResultsAvailable(List<ScanResult> scanResults) {
+            latch.countDown();
+            mScanResults = scanResults;
+        }
+
+        @Override
+        public void onRegisterSuccess() {
+            latch.countDown();
+            mRegisterSuccess = true;
+        }
+
+        @Override
+        public void onRegisterFailed(int reason) {
+            latch.countDown();
+            mRegisterFailedReason = reason;
+        }
+
+        @Override
+        public void onRemoved(int reason) {
+            latch.countDown();
+            mRemovedReason = reason;
+        }
+
+        public boolean isRegisterSuccess() {
+            return mRegisterSuccess;
+        }
+
+        public int getRemovedReason() {
+            return mRemovedReason;
+        }
+
+        public int getRegisterFailedReason() {
+            return mRegisterFailedReason;
+        }
+
+        public List<ScanResult> getScanResults() {
+            return mScanResults;
+        }
+    }
+
+    /**
+     * Verify {@link WifiManager#setExternalPnoScanRequest(List, int[], Executor,
+     * WifiManager.PnoScanResultsCallback)} can be called with proper permissions.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSetExternalPnoScanRequestSuccess() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        TestPnoScanResultsCallback callback = new TestPnoScanResultsCallback();
+        List<WifiSsid> ssids = new ArrayList<>();
+        ssids.add(WifiSsid.fromBytes("TEST_SSID_1".getBytes(StandardCharsets.UTF_8)));
+        int[] frequencies = new int[] {2412, 5180, 5805};
+
+        assertFalse("Callback should be initialized unregistered", callback.isRegisterSuccess());
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.setExternalPnoScanRequest(
+                        ssids, frequencies, Executors.newSingleThreadExecutor(), callback));
+
+        callback.latch.await(TEST_WAIT_DURATION_MS, TimeUnit.MILLISECONDS);
+        if (mWifiManager.isPreferredNetworkOffloadSupported()) {
+            assertTrue("Expect register success or failed due to resource busy",
+                    callback.isRegisterSuccess()
+                    || callback.getRegisterFailedReason() == WifiManager.PnoScanResultsCallback
+                            .REGISTER_PNO_CALLBACK_RESOURCE_BUSY);
+        } else {
+            assertEquals("Expect register fail due to not supported.",
+                    WifiManager.PnoScanResultsCallback.REGISTER_PNO_CALLBACK_PNO_NOT_SUPPORTED,
+                    callback.getRegisterFailedReason());
+        }
+        mWifiManager.clearExternalPnoScanRequest();
+    }
+
+    /**
+     * Verify {@link WifiManager#setExternalPnoScanRequest(List, int[], Executor,
+     * WifiManager.PnoScanResultsCallback)} can be called with null frequency.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSetExternalPnoScanRequestSuccessNullFrequency() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        TestPnoScanResultsCallback callback = new TestPnoScanResultsCallback();
+        List<WifiSsid> ssids = new ArrayList<>();
+        ssids.add(WifiSsid.fromBytes("TEST_SSID_1".getBytes(StandardCharsets.UTF_8)));
+
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.setExternalPnoScanRequest(
+                        ssids, null, Executors.newSingleThreadExecutor(), callback));
+        mWifiManager.clearExternalPnoScanRequest();
+    }
+
+    /**
+     * Verify {@link WifiManager#setExternalPnoScanRequest(List, int[], Executor,
+     * WifiManager.PnoScanResultsCallback)} throws an Exception if called with too many SSIDs.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSetExternalPnoScanRequestTooManySsidsException() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        TestPnoScanResultsCallback callback = new TestPnoScanResultsCallback();
+        List<WifiSsid> ssids = new ArrayList<>();
+        ssids.add(WifiSsid.fromBytes("TEST_SSID_1".getBytes(StandardCharsets.UTF_8)));
+        ssids.add(WifiSsid.fromBytes("TEST_SSID_2".getBytes(StandardCharsets.UTF_8)));
+        ssids.add(WifiSsid.fromBytes("TEST_SSID_3".getBytes(StandardCharsets.UTF_8)));
+
+        assertFalse("Callback should be initialized unregistered", callback.isRegisterSuccess());
+        assertThrows(IllegalArgumentException.class, () -> {
+            ShellIdentityUtils.invokeWithShellPermissions(
+                    () -> mWifiManager.setExternalPnoScanRequest(
+                            ssids, null, Executors.newSingleThreadExecutor(), callback));
+        });
+    }
+
+    /**
+     * Verify {@link WifiManager#setExternalPnoScanRequest(List, int[], Executor,
+     * WifiManager.PnoScanResultsCallback)} throws an Exception if called with too many frequencies.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSetExternalPnoScanRequestTooManyFrequenciesException() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        TestPnoScanResultsCallback callback = new TestPnoScanResultsCallback();
+        List<WifiSsid> ssids = new ArrayList<>();
+        ssids.add(WifiSsid.fromBytes("TEST_SSID_1".getBytes(StandardCharsets.UTF_8)));
+        int[] frequencies = new int[] {2412, 2417, 2422, 2427, 2432, 2437, 2447, 2452, 2457, 2462,
+                5180, 5200, 5220, 5240, 5745, 5765, 5785, 5805};
+
+        assertFalse("Callback should be initialized unregistered", callback.isRegisterSuccess());
+        assertThrows(IllegalArgumentException.class, () -> {
+            ShellIdentityUtils.invokeWithShellPermissions(
+                    () -> mWifiManager.setExternalPnoScanRequest(
+                            ssids, frequencies, Executors.newSingleThreadExecutor(), callback));
+        });
+    }
+
+    /**
+     * Verify {@link WifiManager#setExternalPnoScanRequest(List, int[], Executor,
+     * WifiManager.PnoScanResultsCallback)} cannot be called without permission.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSetExternalPnoScanRequestNoPermission() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        TestExecutor executor = new TestExecutor();
+        TestPnoScanResultsCallback callback = new TestPnoScanResultsCallback();
+        List<WifiSsid> ssids = new ArrayList<>();
+        ssids.add(WifiSsid.fromBytes("TEST_SSID_1".getBytes(StandardCharsets.UTF_8)));
+
+        assertFalse("Callback should be initialized unregistered", callback.isRegisterSuccess());
+        assertThrows(SecurityException.class,
+                () -> mWifiManager.setExternalPnoScanRequest(ssids, null, executor, callback));
+    }
+
+    /**
+     * Verify the invalid and valid usages of {@code WifiManager#getLastCallerInfoForApi}.
+     */
+    public void testGetLastCallerInfoForApi() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        AtomicReference<String> packageName = new AtomicReference<>();
+        AtomicBoolean enabled = new AtomicBoolean(false);
+        BiConsumer<String, Boolean> listener = new BiConsumer<String, Boolean>() {
+            @Override
+            public void accept(String caller, Boolean value) {
+                synchronized (mLock) {
+                    packageName.set(caller);
+                    enabled.set(value);
+                    mLock.notify();
+                }
+            }
+        };
+        // Test invalid inputs trigger IllegalArgumentException
+        assertThrows("Invalid apiType should trigger exception", IllegalArgumentException.class,
+                () -> mWifiManager.getLastCallerInfoForApi(-1, mExecutor, listener));
+        assertThrows("null executor should trigger exception", IllegalArgumentException.class,
+                () -> mWifiManager.getLastCallerInfoForApi(WifiManager.API_SOFT_AP, null,
+                        listener));
+        assertThrows("null listener should trigger exception", IllegalArgumentException.class,
+                () -> mWifiManager.getLastCallerInfoForApi(WifiManager.API_SOFT_AP, mExecutor,
+                        null));
+
+        // Test caller with no permission triggers SecurityException.
+        assertThrows("No permission should trigger SecurityException", SecurityException.class,
+                () -> mWifiManager.getLastCallerInfoForApi(WifiManager.API_SOFT_AP,
+                        mExecutor, listener));
+
+        String expectedPackage = "com.android.shell";
+        boolean isEnabledBefore = mWifiManager.isWifiEnabled();
+        // toggle wifi and verify getting last caller
+        setWifiEnabled(!isEnabledBefore);
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.getLastCallerInfoForApi(WifiManager.API_WIFI_ENABLED, mExecutor,
+                        listener));
+        synchronized (mLock) {
+            mLock.wait(TEST_WAIT_DURATION_MS);
+        }
+
+        assertEquals("package does not match", expectedPackage, packageName.get());
+        assertEquals("enabled does not match", !isEnabledBefore, enabled.get());
+
+        // toggle wifi again and verify last caller
+        packageName.set(null);
+        setWifiEnabled(isEnabledBefore);
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.getLastCallerInfoForApi(WifiManager.API_WIFI_ENABLED, mExecutor,
+                        listener));
+        synchronized (mLock) {
+            mLock.wait(TEST_WAIT_DURATION_MS);
+        }
+        assertEquals("package does not match", expectedPackage, packageName.get());
+        assertEquals("enabled does not match", isEnabledBefore, enabled.get());
+    }
+
+    /**
      * Verify that {@link WifiManager#addNetworkPrivileged(WifiConfiguration)} throws a
      * SecurityException when called by a normal app.
      */
@@ -1214,6 +1555,36 @@
     }
 
     /**
+     * Verify {@link WifiManager#getPrivilegedConnectedNetwork()} returns the currently
+     * connected WifiConfiguration with randomized MAC address filtered out.
+     */
+    public void testGetPrivilegedConnectedNetworkSuccess() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        setWifiEnabled(true);
+        UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        try {
+            uiAutomation.adoptShellPermissionIdentity();
+            mWifiManager.startScan();
+            waitForConnection(); // ensures that there is at-least 1 saved network on the device.
+
+            WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
+            int curNetworkId = wifiInfo.getNetworkId();
+            assertNotEquals("Should be connected to valid networkId", INVALID_NETWORK_ID,
+                    curNetworkId);
+            WifiConfiguration curConfig = mWifiManager.getPrivilegedConnectedNetwork();
+            assertEquals("NetworkId should match", curNetworkId, curConfig.networkId);
+            assertEquals("SSID should match", wifiInfo.getSSID(), curConfig.SSID);
+            assertEquals("Randomized MAC should be filtered out", WifiInfo.DEFAULT_MAC_ADDRESS,
+                    curConfig.getRandomizedMacAddress().toString());
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    /**
      * Verify {@link WifiManager#addNetworkPrivileged(WifiConfiguration)} works properly when the
      * calling app has permissions.
      */
@@ -1332,14 +1703,15 @@
             // Skip the test if wifi module version is older than S.
             return;
         }
-        List<WifiConfiguration> testConfigs = new ArrayList<>();
-        testConfigs.add(createConfig("test-open-owe-jdur", WifiConfiguration.SECURITY_TYPE_OPEN));
-        testConfigs.add(createConfig("test-open-owe-jdur", WifiConfiguration.SECURITY_TYPE_OWE));
-        testConfigs.add(createConfig("test-psk-sae-ijfe", WifiConfiguration.SECURITY_TYPE_PSK));
-        testConfigs.add(createConfig("test-psk-sae-ijfe", WifiConfiguration.SECURITY_TYPE_SAE));
-        testConfigs.add(createConfig("test-wpa2e-wpa3e-plki",
+        List<WifiConfiguration> baseConfigs = new ArrayList<>();
+        baseConfigs.add(createConfig("test-open-owe-jdur", WifiConfiguration.SECURITY_TYPE_OPEN));
+        baseConfigs.add(createConfig("test-psk-sae-ijfe", WifiConfiguration.SECURITY_TYPE_PSK));
+        baseConfigs.add(createConfig("test-wpa2e-wpa3e-plki",
                 WifiConfiguration.SECURITY_TYPE_EAP));
-        testConfigs.add(createConfig("test-wpa2e-wpa3e-plki",
+        List<WifiConfiguration> upgradeConfigs = new ArrayList<>();
+        upgradeConfigs.add(createConfig("test-open-owe-jdur", WifiConfiguration.SECURITY_TYPE_OWE));
+        upgradeConfigs.add(createConfig("test-psk-sae-ijfe", WifiConfiguration.SECURITY_TYPE_SAE));
+        upgradeConfigs.add(createConfig("test-wpa2e-wpa3e-plki",
                 WifiConfiguration.SECURITY_TYPE_EAP_WPA3_ENTERPRISE));
         UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
         try {
@@ -1349,46 +1721,51 @@
                     mWifiManager.getPrivilegedConfiguredNetworks().size();
             final int originalCallerConfiguredNetworksNumber =
                 mWifiManager.getCallerConfiguredNetworks().size();
-            for (WifiConfiguration c: testConfigs) {
+            for (WifiConfiguration c: baseConfigs) {
                 WifiManager.AddNetworkResult result = mWifiManager.addNetworkPrivileged(c);
                 assertEquals(WifiManager.AddNetworkResult.STATUS_SUCCESS, result.statusCode);
                 assertTrue(result.networkId >= 0);
                 c.networkId = result.networkId;
             }
-            List<WifiConfiguration> expectedConfigs = testConfigs;
+            for (WifiConfiguration c: upgradeConfigs) {
+                WifiManager.AddNetworkResult result = mWifiManager.addNetworkPrivileged(c);
+                assertEquals(WifiManager.AddNetworkResult.STATUS_SUCCESS, result.statusCode);
+                assertTrue(result.networkId >= 0);
+                c.networkId = result.networkId;
+            }
+            // open/owe, psk/sae, and wpa2e/wpa3e should be merged
+            // so they should have the same network ID.
+            for (int i = 0; i < baseConfigs.size(); i++) {
+                assertEquals(baseConfigs.get(i).networkId, upgradeConfigs.get(i).networkId);
+            }
+
+            int numAddedConfigs = baseConfigs.size();
+            List<WifiConfiguration> expectedConfigs = new ArrayList<>(baseConfigs);
             if (SdkLevel.isAtLeastS()) {
-                // open/owe, psk/sae, and wpa2e/wpa3e should be merged
-                // so they should have the same network ID.
-                assertEquals(testConfigs.get(0).networkId, testConfigs.get(1).networkId);
-                assertEquals(testConfigs.get(2).networkId, testConfigs.get(3).networkId);
-                assertEquals(testConfigs.get(4).networkId, testConfigs.get(5).networkId);
-            } else {
-                // Network IDs for different security types should be unique for R
-                assertNotEquals(testConfigs.get(0).networkId, testConfigs.get(1).networkId);
-                assertNotEquals(testConfigs.get(2).networkId, testConfigs.get(3).networkId);
-                assertNotEquals(testConfigs.get(4).networkId, testConfigs.get(5).networkId);
-                // WPA3-Enterprise is omitted when WPA2-Enterprise is present for R
-                expectedConfigs = testConfigs.subList(0, 5);
+                // S devices and above will return one additional config per each security type
+                // added, so we include the number of both base and upgrade configs.
+                numAddedConfigs += upgradeConfigs.size();
+                expectedConfigs.addAll(upgradeConfigs);
             }
             List<WifiConfiguration> configuredNetworks = mWifiManager.getConfiguredNetworks();
-            assertEquals(originalConfiguredNetworksNumber + expectedConfigs.size(),
+            assertEquals(originalConfiguredNetworksNumber + numAddedConfigs,
                     configuredNetworks.size());
             assertConfigsAreFound(expectedConfigs, configuredNetworks);
 
             List<WifiConfiguration> privilegedConfiguredNetworks =
                     mWifiManager.getPrivilegedConfiguredNetworks();
-            assertEquals(originalPrivilegedConfiguredNetworksNumber + expectedConfigs.size(),
+            assertEquals(originalPrivilegedConfiguredNetworksNumber + numAddedConfigs,
                     privilegedConfiguredNetworks.size());
             assertConfigsAreFound(expectedConfigs, privilegedConfiguredNetworks);
 
             List<WifiConfiguration> callerConfiguredNetworks =
                     mWifiManager.getCallerConfiguredNetworks();
-            assertEquals(originalCallerConfiguredNetworksNumber + expectedConfigs.size(),
+            assertEquals(originalCallerConfiguredNetworksNumber + numAddedConfigs,
                     callerConfiguredNetworks.size());
             assertConfigsAreFound(expectedConfigs, callerConfiguredNetworks);
 
         } finally {
-            for (WifiConfiguration c: testConfigs) {
+            for (WifiConfiguration c: baseConfigs) {
                 if (c.networkId >= 0) {
                     mWifiManager.removeNetwork(c.networkId);
                 }
@@ -1463,6 +1840,89 @@
         }
     }
 
+    private SoftApConfiguration.Builder generateSoftApConfigBuilderWithSsid(String ssid) {
+        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)
+                || ApiLevelUtil.codenameStartsWith("T")) {
+            return new SoftApConfiguration.Builder().setWifiSsid(
+                    WifiSsid.fromBytes(ssid.getBytes(StandardCharsets.UTF_8)));
+        }
+        return new SoftApConfiguration.Builder().setSsid(ssid);
+    }
+
+    private void assertSsidEquals(SoftApConfiguration config, String expectedSsid) {
+        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)
+                || ApiLevelUtil.codenameStartsWith("T")) {
+            assertEquals(WifiSsid.fromBytes(expectedSsid.getBytes(StandardCharsets.UTF_8)),
+                    config.getWifiSsid());
+        } else {
+            assertEquals(expectedSsid, config.getSsid());
+        }
+    }
+
+    private void unregisterLocalOnlyHotspotSoftApCallback(TestSoftApCallback lohsSoftApCallback) {
+        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)
+                || ApiLevelUtil.codenameStartsWith("T")) {
+            mWifiManager.unregisterLocalOnlyHotspotSoftApCallback(lohsSoftApCallback);
+        } else {
+            mWifiManager.unregisterSoftApCallback(lohsSoftApCallback);
+        }
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testStartLocalOnlyHotspotWithSupportedBand() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+
+        // check that softap mode is supported by the device
+        if (!mWifiManager.isPortableHotspotSupported()) {
+            return;
+        }
+
+        TestExecutor executor = new TestExecutor();
+        TestSoftApCallback lohsSoftApCallback = new TestSoftApCallback(mLock);
+        UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        boolean wifiEnabled = mWifiManager.isWifiEnabled();
+        try {
+            uiAutomation.adoptShellPermissionIdentity();
+            verifyLohsRegisterSoftApCallback(executor, lohsSoftApCallback);
+            SoftApConfiguration.Builder customConfigBuilder =
+                    generateSoftApConfigBuilderWithSsid(TEST_SSID_UNQUOTED)
+                    .setPassphrase(TEST_PASSPHRASE, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
+
+            SparseIntArray testBandsAndChannels = getAvailableBandAndChannelForTesting(
+                    lohsSoftApCallback.getCurrentSoftApCapability());
+
+            for (int i = 0; i < testBandsAndChannels.size(); i++) {
+                TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(mLock);
+                int testBand = testBandsAndChannels.keyAt(i);
+                customConfigBuilder.setBand(testBand);
+                mWifiManager.startLocalOnlyHotspot(customConfigBuilder.build(), executor, callback);
+                // now wait for callback
+                Thread.sleep(DURATION_SOFTAP_START_MS);
+
+                // Verify callback is run on the supplied executor
+                assertFalse(callback.onStartedCalled);
+                executor.runAll();
+                assertTrue(callback.onStartedCalled);
+                assertNotNull(callback.reservation);
+                SoftApConfiguration softApConfig = callback.reservation.getSoftApConfiguration();
+                assertEquals(
+                        WifiSsid.fromBytes(TEST_SSID_UNQUOTED.getBytes(StandardCharsets.UTF_8)),
+                        softApConfig.getWifiSsid());
+                assertEquals(TEST_PASSPHRASE, softApConfig.getPassphrase());
+                assertEquals(testBand, softApConfig.getBand());
+                assertTrue(lohsSoftApCallback.getCurrentSoftApInfo().getFrequency() > 0);
+                stopLocalOnlyHotspot(callback, wifiEnabled);
+            }
+        } finally {
+            // clean up
+            mWifiManager.unregisterSoftApCallback(lohsSoftApCallback);
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
     public void testStartLocalOnlyHotspotWithConfigBssid() throws Exception {
         if (!WifiFeature.isWifiSupported(getContext())) {
             // skip the test if WiFi is not supported
@@ -1475,22 +1935,23 @@
 
         TestExecutor executor = new TestExecutor();
         TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(mLock);
-        TestSoftApCallback capabilityCallback = new TestSoftApCallback(mLock);
+        TestSoftApCallback lohsSoftApCallback = new TestSoftApCallback(mLock);
         UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
         boolean wifiEnabled = mWifiManager.isWifiEnabled();
         try {
             uiAutomation.adoptShellPermissionIdentity();
-            verifyRegisterSoftApCallback(executor, capabilityCallback);
-            SoftApConfiguration.Builder customConfigBuilder = new SoftApConfiguration.Builder()
-                    .setSsid(TEST_SSID_UNQUOTED)
+            verifyLohsRegisterSoftApCallback(executor, lohsSoftApCallback);
+            SoftApConfiguration.Builder customConfigBuilder =
+                    generateSoftApConfigBuilderWithSsid(TEST_SSID_UNQUOTED)
                     .setPassphrase(TEST_PASSPHRASE, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK);
 
-            boolean isSupportCustomizedMac = capabilityCallback.getCurrentSoftApCapability()
+            boolean isSupportCustomizedMac = lohsSoftApCallback.getCurrentSoftApCapability()
                         .areFeaturesSupported(
                         SoftApCapability.SOFTAP_FEATURE_MAC_ADDRESS_CUSTOMIZATION)
                     && PropertyUtil.isVndkApiLevelNewerThan(Build.VERSION_CODES.S);
             if (isSupportCustomizedMac) {
-                customConfigBuilder.setBssid(TEST_MAC);
+                customConfigBuilder.setBssid(TEST_MAC).setMacRandomizationSetting(
+                            SoftApConfiguration.RANDOMIZATION_NONE);
             }
             SoftApConfiguration customConfig = customConfigBuilder.build();
 
@@ -1509,12 +1970,12 @@
             if (isSupportCustomizedMac) {
                 assertEquals(TEST_MAC, softApConfig.getBssid());
             }
-            assertEquals(TEST_SSID_UNQUOTED, softApConfig.getSsid());
+            assertSsidEquals(softApConfig, TEST_SSID_UNQUOTED);
             assertEquals(TEST_PASSPHRASE, softApConfig.getPassphrase());
         } finally {
             // clean up
             stopLocalOnlyHotspot(callback, wifiEnabled);
-            mWifiManager.unregisterSoftApCallback(capabilityCallback);
+            unregisterLocalOnlyHotspotSoftApCallback(lohsSoftApCallback);
             uiAutomation.dropShellPermissionIdentity();
         }
     }
@@ -1528,10 +1989,11 @@
         if (!mWifiManager.isPortableHotspotSupported()) {
             return;
         }
-        SoftApConfiguration customConfig = new SoftApConfiguration.Builder()
-                .setSsid(TEST_SSID_UNQUOTED)
+        SoftApConfiguration customConfig =
+                generateSoftApConfigBuilderWithSsid(TEST_SSID_UNQUOTED)
                 .setPassphrase(TEST_PASSPHRASE, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)
                 .build();
+
         TestExecutor executor = new TestExecutor();
         TestLocalOnlyHotspotCallback callback = new TestLocalOnlyHotspotCallback(mLock);
         UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
@@ -1551,7 +2013,7 @@
             assertNotNull(callback.reservation);
             SoftApConfiguration softApConfig = callback.reservation.getSoftApConfiguration();
             assertNotNull(softApConfig);
-            assertEquals(TEST_SSID_UNQUOTED, softApConfig.getSsid());
+            assertSsidEquals(softApConfig, TEST_SSID_UNQUOTED);
             assertEquals(TEST_PASSPHRASE, softApConfig.getPassphrase());
         } finally {
             // clean up
@@ -1924,19 +2386,19 @@
         }
     }
 
-    private void runWithScanningEnabled(ThrowingRunnable r) throws Exception {
-        boolean wasScanEnabledForTest = false;
-        if (!mWifiManager.isScanAlwaysAvailable()) {
+    private void runWithScanning(ThrowingRunnable r, boolean isEnabled) throws Exception {
+        boolean scanModeChangedForTest = false;
+        if (mWifiManager.isScanAlwaysAvailable() != isEnabled) {
             ShellIdentityUtils.invokeWithShellPermissions(
-                    () -> mWifiManager.setScanAlwaysAvailable(true));
-            wasScanEnabledForTest = true;
+                    () -> mWifiManager.setScanAlwaysAvailable(isEnabled));
+            scanModeChangedForTest = true;
         }
         try {
             r.run();
         } finally {
-            if (wasScanEnabledForTest) {
+            if (scanModeChangedForTest) {
                 ShellIdentityUtils.invokeWithShellPermissions(
-                        () -> mWifiManager.setScanAlwaysAvailable(false));
+                        () -> mWifiManager.setScanAlwaysAvailable(!isEnabled));
             }
         }
     }
@@ -1964,7 +2426,7 @@
             fail("Please enable location for this test - since Marshmallow WiFi scan results are"
                     + " empty when location is disabled!");
         }
-        runWithScanningEnabled(() -> {
+        runWithScanning(() -> {
             setWifiEnabled(false);
             turnScreenOn();
             assertWifiScanningIsOn();
@@ -1973,7 +2435,7 @@
             assertWifiScanningIsOn();
             turnScreenOn();
             assertWifiScanningIsOn();
-        });
+        }, true /* run with enabled*/);
     }
 
     /**
@@ -1998,7 +2460,7 @@
             fail("Please enable location for this test - since Marshmallow WiFi scan results are"
                     + " empty when location is disabled!");
         }
-        runWithScanningEnabled(() -> {
+        runWithScanning(() -> {
             setWifiEnabled(true);
             turnScreenOn();
             assertWifiScanningIsOn();
@@ -2007,7 +2469,7 @@
             assertWifiScanningIsOn();
             turnScreenOn();
             assertWifiScanningIsOn();
-        });
+        }, true /* run with enabled*/);
     }
 
     /**
@@ -2032,6 +2494,27 @@
                 () -> {
                     executor.runAll();
                     // Verify callback is run on the supplied executor and called
+                    return callback.getOnStateChangedCalled()
+                            && callback.getOnSoftapInfoChangedCalledCount() > 0
+                            && callback.getOnSoftApCapabilityChangedCalled()
+                            && callback.getOnConnectedClientCalled();
+                });
+    }
+
+    private void verifyLohsRegisterSoftApCallback(TestExecutor executor,
+            TestSoftApCallback callback) throws Exception {
+        // Register callback to get SoftApCapability
+        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)
+                || ApiLevelUtil.codenameStartsWith("T")) {
+            mWifiManager.registerLocalOnlyHotspotSoftApCallback(executor, callback);
+        } else {
+            mWifiManager.registerSoftApCallback(executor, callback);
+        }
+        PollingCheck.check(
+                "SoftAp register failed!", 5_000,
+                () -> {
+                    executor.runAll();
+                    // Verify callback is run on the supplied executor and called
                     return callback.getOnStateChangedCalled() &&
                             callback.getOnSoftapInfoChangedCalledCount() > 0 &&
                             callback.getOnSoftApCapabilityChangedCalled() &&
@@ -2047,10 +2530,26 @@
         if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.S)) {
             assertTrue(currentConfig.isUserConfiguration());
         }
+        assertNotNull(currentConfig.getPersistentRandomizedMacAddress());
+
+        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)
+                || ApiLevelUtil.codenameStartsWith("T")) {
+            // Verify set/get with the deprecated set/getSsid()
+            SoftApConfiguration oldSsidConfig = new SoftApConfiguration.Builder(targetConfig)
+                    .setWifiSsid(null)
+                    .setSsid(targetConfig.getSsid()).build();
+            mWifiManager.setSoftApConfiguration(oldSsidConfig);
+            currentConfig = mWifiManager.getSoftApConfiguration();
+            compareSoftApConfiguration(oldSsidConfig, currentConfig);
+        }
     }
 
     private void compareSoftApConfiguration(SoftApConfiguration currentConfig,
         SoftApConfiguration testSoftApConfig) {
+        if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)
+                || ApiLevelUtil.codenameStartsWith("T")) {
+            assertEquals(currentConfig.getWifiSsid(), testSoftApConfig.getWifiSsid());
+        }
         assertEquals(currentConfig.getSsid(), testSoftApConfig.getSsid());
         assertEquals(currentConfig.getBssid(), testSoftApConfig.getBssid());
         assertEquals(currentConfig.getSecurityType(), testSoftApConfig.getSecurityType());
@@ -2079,6 +2578,26 @@
                     testSoftApConfig.isBridgedModeOpportunisticShutdownEnabled());
             assertEquals(currentConfig.isIeee80211axEnabled(),
                     testSoftApConfig.isIeee80211axEnabled());
+            if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)
+                    || ApiLevelUtil.codenameStartsWith("T")) {
+                assertEquals(currentConfig.getBridgedModeOpportunisticShutdownTimeoutMillis(),
+                        testSoftApConfig.getBridgedModeOpportunisticShutdownTimeoutMillis());
+                assertEquals(currentConfig.isIeee80211beEnabled(),
+                        testSoftApConfig.isIeee80211beEnabled());
+                assertEquals(currentConfig.getVendorElements(),
+                        testSoftApConfig.getVendorElements());
+                assertArrayEquals(
+                        currentConfig.getAllowedAcsChannels(SoftApConfiguration.BAND_2GHZ),
+                        testSoftApConfig.getAllowedAcsChannels(SoftApConfiguration.BAND_2GHZ));
+                assertArrayEquals(
+                        currentConfig.getAllowedAcsChannels(SoftApConfiguration.BAND_5GHZ),
+                        testSoftApConfig.getAllowedAcsChannels(SoftApConfiguration.BAND_5GHZ));
+                assertArrayEquals(
+                        currentConfig.getAllowedAcsChannels(SoftApConfiguration.BAND_6GHZ),
+                        testSoftApConfig.getAllowedAcsChannels(SoftApConfiguration.BAND_6GHZ));
+                assertEquals(currentConfig.getMaxChannelBandwidth(),
+                        testSoftApConfig.getMaxChannelBandwidth());
+            }
         }
     }
 
@@ -2096,7 +2615,6 @@
             PollingCheck.check(
                 "SoftAp turn off failed!", 2_000,
                 () -> mWifiManager.isWifiApEnabled() == false);
-            mTetheringManager.stopTethering(ConnectivityManager.TETHERING_WIFI);
         }
     }
 
@@ -2145,6 +2663,35 @@
         return testBandsAndChannels;
     }
 
+    /**
+     * Test SoftApConfiguration#getPersistentRandomizedMacAddress(). There are two test cases in
+     * this test.
+     * 1. configure two different SoftApConfigurations (different SSID) and verify that randomized
+     * MAC address is different.
+     * 2. configure A then B then A (SSIDs) and verify that the 1st and 3rd MAC addresses are the
+     * same.
+     */
+    public void testSoftApConfigurationGetPersistentRandomizedMacAddress() throws Exception {
+        SoftApConfiguration currentConfig = ShellIdentityUtils.invokeWithShellPermissions(
+                mWifiManager::getSoftApConfiguration);
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.setSoftApConfiguration(new SoftApConfiguration.Builder()
+                .setSsid(currentConfig.getSsid() + "test").build()));
+        SoftApConfiguration changedSsidConfig = ShellIdentityUtils.invokeWithShellPermissions(
+                mWifiManager::getSoftApConfiguration);
+        assertNotEquals(currentConfig.getPersistentRandomizedMacAddress(),
+                changedSsidConfig.getPersistentRandomizedMacAddress());
+
+        // set currentConfig
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.setSoftApConfiguration(currentConfig));
+
+        SoftApConfiguration changedSsidBackConfig = ShellIdentityUtils.invokeWithShellPermissions(
+                mWifiManager::getSoftApConfiguration);
+
+        assertEquals(currentConfig.getPersistentRandomizedMacAddress(),
+                changedSsidBackConfig.getPersistentRandomizedMacAddress());
+    }
 
     /**
      * Test bridged AP enable succeeful when device supports it.
@@ -2175,11 +2722,12 @@
             int[] expectedBands = {SoftApConfiguration.BAND_2GHZ,
                     SoftApConfiguration.BAND_2GHZ | SoftApConfiguration.BAND_5GHZ};
             // Test bridged SoftApConfiguration set and get (setBands)
-            SoftApConfiguration testSoftApConfig = new SoftApConfiguration.Builder()
-                    .setSsid(TEST_SSID_UNQUOTED)
+            SoftApConfiguration testSoftApConfig =
+                    generateSoftApConfigBuilderWithSsid(TEST_SSID_UNQUOTED)
                     .setPassphrase(TEST_PASSPHRASE, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)
                     .setBands(expectedBands)
                     .build();
+
             boolean shouldFallbackToSingleAp = shouldFallbackToSingleAp(testBands,
                     callback.getCurrentSoftApCapability());
             verifySetGetSoftApConfig(testSoftApConfig);
@@ -2242,8 +2790,8 @@
                 dual_channels.put(SoftApConfiguration.BAND_5GHZ,
                         callback.getCurrentSoftApCapability()
                         .getSupportedChannelList(SoftApConfiguration.BAND_5GHZ)[0]);
-                SoftApConfiguration testSoftApConfig = new SoftApConfiguration.Builder()
-                        .setSsid(TEST_SSID_UNQUOTED)
+                SoftApConfiguration testSoftApConfig =
+                        generateSoftApConfigBuilderWithSsid(TEST_SSID_UNQUOTED)
                         .setPassphrase(TEST_PASSPHRASE, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)
                         .setChannels(dual_channels)
                         .build();
@@ -2294,8 +2842,8 @@
             turnOffWifiAndTetheredHotspotIfEnabled();
             verifyRegisterSoftApCallback(executor, callback);
 
-            SoftApConfiguration.Builder softApConfigBuilder = new SoftApConfiguration.Builder()
-                    .setSsid(TEST_SSID_UNQUOTED)
+            SoftApConfiguration.Builder softApConfigBuilder =
+                     generateSoftApConfigBuilderWithSsid(TEST_SSID_UNQUOTED)
                     .setPassphrase(TEST_PASSPHRASE, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)
                     .setAutoShutdownEnabled(true)
                     .setShutdownTimeoutMillis(100000)
@@ -2303,6 +2851,19 @@
                             callback.getCurrentSoftApCapability()).keyAt(0))
                     .setHiddenSsid(false);
 
+            if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)
+                    || ApiLevelUtil.codenameStartsWith("T")) {
+                softApConfigBuilder.setBridgedModeOpportunisticShutdownTimeoutMillis(30_000);
+                softApConfigBuilder.setVendorElements(TEST_VENDOR_ELEMENTS);
+                softApConfigBuilder.setAllowedAcsChannels(
+                        SoftApConfiguration.BAND_2GHZ, new int[] {1, 6, 11});
+                softApConfigBuilder.setAllowedAcsChannels(
+                        SoftApConfiguration.BAND_5GHZ, new int[] {149});
+                softApConfigBuilder.setAllowedAcsChannels(
+                        SoftApConfiguration.BAND_6GHZ, new int[] {});
+                softApConfigBuilder.setMaxChannelBandwidth(SoftApInfo.CHANNEL_WIDTH_80MHZ);
+            }
+
             // Test SoftApConfiguration set and get
             verifySetGetSoftApConfig(softApConfigBuilder.build());
 
@@ -2351,6 +2912,16 @@
                 verifySetGetSoftApConfig(softApConfigBuilder.build());
             }
 
+            // Test 11 BE control config
+            if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.TIRAMISU)
+                    || ApiLevelUtil.codenameStartsWith("T")) {
+                if (callback.getCurrentSoftApCapability()
+                        .areFeaturesSupported(SoftApCapability.SOFTAP_FEATURE_IEEE80211_BE)) {
+                    softApConfigBuilder.setIeee80211beEnabled(true);
+                    verifySetGetSoftApConfig(softApConfigBuilder.build());
+                }
+            }
+
             if (ApiLevelUtil.isAtLeast(Build.VERSION_CODES.S)) {
                 softApConfigBuilder.setBridgedModeOpportunisticShutdownEnabled(false);
                 verifySetGetSoftApConfig(softApConfigBuilder.build());
@@ -2400,12 +2971,15 @@
                     SoftApCapability.SOFTAP_FEATURE_MAC_ADDRESS_CUSTOMIZATION)
                     && PropertyUtil.isVndkApiLevelNewerThan(Build.VERSION_CODES.S);
 
-            SoftApConfiguration.Builder testSoftApConfigBuilder = new SoftApConfiguration.Builder()
-                    .setSsid(TEST_SSID_UNQUOTED)
+            SoftApConfiguration.Builder testSoftApConfigBuilder =
+                     generateSoftApConfigBuilderWithSsid(TEST_SSID_UNQUOTED)
                     .setPassphrase(TEST_PASSPHRASE, SoftApConfiguration.SECURITY_TYPE_WPA2_PSK)
                     .setChannel(testBandsAndChannels.valueAt(0), testBandsAndChannels.keyAt(0));
 
-            if (isSupportCustomizedMac) testSoftApConfigBuilder.setBssid(TEST_MAC);
+            if (isSupportCustomizedMac) {
+                testSoftApConfigBuilder.setBssid(TEST_MAC)
+                        .setMacRandomizationSetting(SoftApConfiguration.RANDOMIZATION_NONE);
+            }
 
             SoftApConfiguration testSoftApConfig = testSoftApConfigBuilder.build();
 
@@ -2542,17 +3116,8 @@
             assertTrue(actionListener.onSuccessCalled);
             // Wait for connection to complete & ensure we are connected to the saved network.
             waitForConnection();
-            if (SdkLevel.isAtLeastS()) {
-                assertEquals(savedNetworkToConnect.networkId,
-                        mWifiManager.getConnectionInfo().getNetworkId());
-            } else {
-                // In R, auto-upgraded network IDs may be different from the original saved network.
-                // Since we may end up selecting the auto-upgraded network ID for connection and end
-                // up connected to the original saved network with a different network ID, we should
-                // instead match by SSID.
-                assertEquals(savedNetworkToConnect.SSID,
-                        mWifiManager.getConnectionInfo().getSSID());
-            }
+            assertEquals(savedNetworkToConnect.networkId,
+                    mWifiManager.getConnectionInfo().getNetworkId());
         } finally {
             // Re-enable all saved networks before exiting.
             if (savedNetworks != null) {
@@ -2867,7 +3432,7 @@
         }
 
         // make sure we're connected
-        waitForConnection();
+        waitForConnection(WIFI_PNO_CONNECT_TIMEOUT_MILLIS);
 
         WifiInfo currentNetwork = ShellIdentityUtils.invokeWithShellPermissions(
                 mWifiManager::getConnectionInfo);
@@ -3302,6 +3867,111 @@
         waitForConnection();
     }
 
+    private class TestActiveCountryCodeChangedCallback implements
+            WifiManager.ActiveCountryCodeChangedCallback  {
+        private String mCurrentCountryCode;
+        private boolean mIsOnActiveCountryCodeChangedCalled = false;
+        private boolean mIsOnCountryCodeInactiveCalled = false;
+
+        public boolean isOnActiveCountryCodeChangedCalled() {
+            return mIsOnActiveCountryCodeChangedCalled;
+        }
+
+        public boolean isOnCountryCodeInactiveCalled() {
+            return mIsOnCountryCodeInactiveCalled;
+        }
+        public void resetCallbackCallededHistory() {
+            mIsOnActiveCountryCodeChangedCalled = false;
+            mIsOnCountryCodeInactiveCalled = false;
+        }
+
+        public String getCurrentDriverCountryCode() {
+            return mCurrentCountryCode;
+        }
+
+        @Override
+        public void onActiveCountryCodeChanged(String country) {
+            Log.d(TAG, "Receive DriverCountryCodeChanged to " + country);
+            mCurrentCountryCode = country;
+            mIsOnActiveCountryCodeChangedCalled = true;
+        }
+
+        @Override
+        public void onCountryCodeInactive() {
+            Log.d(TAG, "Receive onCountryCodeInactive");
+            mCurrentCountryCode = null;
+            mIsOnCountryCodeInactiveCalled = true;
+        }
+    }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testActiveCountryCodeChangedCallback() throws Exception {
+        TestActiveCountryCodeChangedCallback testCountryCodeChangedCallback =
+                new TestActiveCountryCodeChangedCallback();
+        TestExecutor executor = new TestExecutor();
+        UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        try {
+            uiAutomation.adoptShellPermissionIdentity();
+            turnOffWifiAndTetheredHotspotIfEnabled();
+            // Run with scanning disable to make sure there is no active mode.
+            runWithScanning(() -> {
+                mWifiManager.registerActiveCountryCodeChangedCallback(
+                        executor, testCountryCodeChangedCallback);
+
+
+                PollingCheck.check(
+                        "DriverCountryCode is non-null when wifi off",
+                        5000,
+                        () -> {
+                            executor.runAll();
+                            return testCountryCodeChangedCallback
+                                        .isOnCountryCodeInactiveCalled()
+                                    && testCountryCodeChangedCallback.getCurrentDriverCountryCode()
+                                            == null;
+                        });
+                // Enable wifi to make sure country code has been updated.
+                setWifiEnabled(true);
+                PollingCheck.check(
+                        "DriverCountryCode is null when wifi on",
+                        5000,
+                        () -> {
+                            executor.runAll();
+                            return testCountryCodeChangedCallback
+                                        .isOnActiveCountryCodeChangedCalled()
+                                    && testCountryCodeChangedCallback.getCurrentDriverCountryCode()
+                                            != null;
+                        });
+                // Disable wifi to trigger country code change
+                setWifiEnabled(false);
+                PollingCheck.check(
+                        "DriverCountryCode should be null when wifi off",
+                        5000,
+                        () -> {
+                            executor.runAll();
+                            return testCountryCodeChangedCallback.isOnCountryCodeInactiveCalled()
+                                    && testCountryCodeChangedCallback
+                                            .getCurrentDriverCountryCode() == null;
+                        });
+                mWifiManager.unregisterActiveCountryCodeChangedCallback(
+                            testCountryCodeChangedCallback);
+                testCountryCodeChangedCallback.resetCallbackCallededHistory();
+                setWifiEnabled(true);
+                // Check there is no callback has been called.
+                PollingCheck.check(
+                        "Callback is called after unregister",
+                        5000,
+                        () -> {
+                            executor.runAll();
+                            return !testCountryCodeChangedCallback.isOnCountryCodeInactiveCalled()
+                                    && !testCountryCodeChangedCallback
+                                            .isOnActiveCountryCodeChangedCalled();
+                        });
+            }, false /* Run with disabled */);
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
     /**
      * Test that the wifi country code is either null, or a length-2 string.
      */
@@ -3357,10 +4027,26 @@
                 WIFI_CONNECT_TIMEOUT_MILLIS,
                 () -> mWifiManager.getConnectionInfo().getNetworkId() != -1);
 
+        String networkKey = mWifiManager.getConnectionInfo().getNetworkKey();
+        assertNotNull(networkKey);
+
         Network wifiCurrentNetwork = ShellIdentityUtils.invokeWithShellPermissions(
                 mWifiManager::getCurrentNetwork);
         assertNotNull(wifiCurrentNetwork);
 
+        List<WifiConfiguration> configuredNetwork = ShellIdentityUtils.invokeWithShellPermissions(
+                mWifiManager::getConfiguredNetworks);
+
+        boolean isNetworkKeyExist = false;
+        for (WifiConfiguration config : configuredNetwork) {
+            if (config.getAllNetworkKeys().contains(networkKey)) {
+                isNetworkKeyExist = true;
+                break;
+            }
+        }
+
+        assertTrue(isNetworkKeyExist);
+
         TestNetworkCallback networkCallbackListener = new TestNetworkCallback(mLock);
         synchronized (mLock) {
             try {
@@ -3554,6 +4240,8 @@
                 mWifiManager.isWifiStandardSupported(ScanResult.WIFI_STANDARD_11AC);
         boolean is11axSupportedEnabled =
                 mWifiManager.isWifiStandardSupported(ScanResult.WIFI_STANDARD_11AX);
+        boolean is11beSupportedEnabled =
+                mWifiManager.isWifiStandardSupported(ScanResult.WIFI_STANDARD_11BE);
 
         // Check for WiFi standards support with wifi disabled
         setWifiEnabled(false);
@@ -3570,6 +4258,8 @@
                 mWifiManager.isWifiStandardSupported(ScanResult.WIFI_STANDARD_11AC);
         boolean is11axSupportedDisabled =
                 mWifiManager.isWifiStandardSupported(ScanResult.WIFI_STANDARD_11AX);
+        boolean is11beSupportedDisabled =
+                mWifiManager.isWifiStandardSupported(ScanResult.WIFI_STANDARD_11BE);
 
         if (isLegacySupportedDisabled) {
             assertTrue(isLegacySupportedEnabled);
@@ -3586,6 +4276,10 @@
         if (is11axSupportedDisabled) {
             assertTrue(is11axSupportedEnabled);
         }
+
+        if (is11beSupportedDisabled) {
+            assertTrue(is11beSupportedEnabled);
+        }
     }
 
     private static PasspointConfiguration createPasspointConfiguration() {
@@ -3775,7 +4469,7 @@
         assertEquals(WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS,
                 mWifiManager.addNetworkSuggestions(Arrays.asList(suggestion)));
         verifySuggestionFoundWithMacRandomizationSetting(TEST_SSID,
-                WifiConfiguration.RANDOMIZATION_NON_PERSISTENT);
+                WifiNetworkSuggestion.RANDOMIZATION_NON_PERSISTENT);
 
         suggestion = new WifiNetworkSuggestion.Builder()
                 .setSsid(TEST_SSID).setWpa2Passphrase(TEST_PASSPHRASE)
@@ -3783,7 +4477,7 @@
         assertEquals(WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS,
                 mWifiManager.addNetworkSuggestions(Arrays.asList(suggestion)));
         verifySuggestionFoundWithMacRandomizationSetting(TEST_SSID,
-                WifiConfiguration.RANDOMIZATION_PERSISTENT);
+                WifiNetworkSuggestion.RANDOMIZATION_PERSISTENT);
     }
 
     private void verifySuggestionFoundWithMacRandomizationSetting(String ssid,
@@ -3791,8 +4485,7 @@
         List<WifiNetworkSuggestion> retrievedSuggestions = mWifiManager.getNetworkSuggestions();
         for (WifiNetworkSuggestion entry : retrievedSuggestions) {
             if (entry.getSsid().equals(ssid)) {
-                assertEquals(macRandomizationSetting,
-                        entry.getWifiConfiguration().macRandomizationSetting);
+                assertEquals(macRandomizationSetting, entry.getMacRandomizationSetting());
                 return; // pass test after the MAC randomization setting is verified.
             }
         }
@@ -3994,6 +4687,10 @@
             mWifiManager.startScan();
             ensureNotConnected();
 
+            // verify null is returned when attempting to get current configured network.
+            WifiConfiguration config = mWifiManager.getPrivilegedConnectedNetwork();
+            assertNull("config should be null because wifi is not connected", config);
+
             // Now enable autojoin on all networks.
             mWifiManager.allowAutojoinGlobal(true);
 
@@ -4008,6 +4705,57 @@
     }
 
     /**
+     * Verify the invalid and valid usages of {@code WifiManager#queryAutojoinGlobal}.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testQueryAutojoinGlobal() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+
+        AtomicBoolean enabled = new AtomicBoolean(false);
+        Consumer<Boolean> listener = new Consumer<Boolean>() {
+            @Override
+            public void accept(Boolean value) {
+                synchronized (mLock) {
+                    enabled.set(value);
+                    mLock.notify();
+                }
+            }
+        };
+        // Test invalid inputs trigger IllegalArgumentException
+        assertThrows("null executor should trigger exception", NullPointerException.class,
+                () -> mWifiManager.queryAutojoinGlobal(null, listener));
+        assertThrows("null listener should trigger exception", NullPointerException.class,
+                () -> mWifiManager.queryAutojoinGlobal(mExecutor, null));
+
+        // Test caller with no permission triggers SecurityException.
+        assertThrows("No permission should trigger SecurityException", SecurityException.class,
+                () -> mWifiManager.queryAutojoinGlobal(mExecutor, listener));
+
+        // Test get/set autojoin global enabled
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.allowAutojoinGlobal(true));
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.queryAutojoinGlobal(mExecutor, listener));
+        synchronized (mLock) {
+            mLock.wait(TEST_WAIT_DURATION_MS);
+        }
+        assertTrue(enabled.get());
+
+        // Test get/set autojoin global disabled
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.allowAutojoinGlobal(false));
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.queryAutojoinGlobal(mExecutor, listener));
+        synchronized (mLock) {
+            mLock.wait(TEST_WAIT_DURATION_MS);
+        }
+        assertFalse(enabled.get());
+    }
+
+    /**
      * Tests {@link WifiManager#isWapiSupported()} does not crash.
      */
     public void testIsWapiSupported() throws Exception {
@@ -4148,6 +4896,20 @@
         }
     }
 
+    /**
+     * Tests {@link WifiManager#isTrustOnFirstUseSupported()} does not crash.
+     */
+    // TODO(b/196180536): Wait for T SDK finalization before changing
+    // to `@SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)`
+    @SdkSuppress(minSdkVersion = 31)
+    public void testIsTrustOnFirstUseSupported() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        mWifiManager.isTrustOnFirstUseSupported();
+    }
+
     public class TestCoexCallback extends WifiManager.CoexCallback {
         private Object mCoexLock;
         private int mOnCoexUnsafeChannelChangedCount;
@@ -4391,6 +5153,60 @@
     }
 
     /**
+     * Tests {@link WifiManager#setWifiPasspointEnabled)} raise security exception without
+     * permission.
+     */
+    // TODO(b/139192273): Wait for T SDK finalization before changing
+    // to `@SdkSuppress(minSdkVersion = Build.VERSION_CODES.T)`
+    @SdkSuppress(minSdkVersion = 31)
+    public void testEnablePasspointWithoutPermission() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        try {
+            mWifiManager.setWifiPasspointEnabled(true);
+            fail("setWifiPasspointEnabled() expected to fail - privileged call");
+        } catch (SecurityException e) {
+            // expected
+        }
+    }
+
+    /**
+     * Tests {@link WifiManager#setWifiPasspointEnabled)} does not crash and returns success.
+     */
+    // TODO(b/139192273): Wait for T SDK finalization before changing
+    // to `@SdkSuppress(minSdkVersion = Build.VERSION_CODES.T)`
+    @SdkSuppress(minSdkVersion = 31)
+    public void testEnablePasspoint() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+
+        // The below API only works with privileged permissions (obtained via shell identity
+        // for test)
+        UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        try {
+            uiAutomation.adoptShellPermissionIdentity();
+            // Check if passpoint is enabled by default.
+            assertTrue(mWifiManager.isWifiPasspointEnabled());
+            // Try to disable passpoint
+            mWifiManager.setWifiPasspointEnabled(false);
+            PollingCheck.check(
+                "Wifi passpoint turn off failed!", 2_000,
+                () -> mWifiManager.isWifiPasspointEnabled() == false);
+            // Try to enable passpoint
+            mWifiManager.setWifiPasspointEnabled(true);
+            PollingCheck.check(
+                "Wifi passpoint turn on failed!", 2_000,
+                () -> mWifiManager.isWifiPasspointEnabled() == true);
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    /**
      * Tests {@link WifiManager#isDecoratedIdentitySupported)} does not crash.
      */
     public void testIsDecoratedIdentitySupported() throws Exception {
@@ -4570,4 +5386,258 @@
             mBlocker.countDown();
         }
     }
+
+    /**
+     * Tests {@link WifiManager#setStaConcurrencyForMultiInternetMode)} raise security exception
+     * without permission.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testIsStaConcurrencyForMultiInternetSupported() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        // ensure no crash.
+        mWifiManager.isStaConcurrencyForMultiInternetSupported();
+    }
+
+    /**
+     * Tests {@link WifiManager#setStaConcurrencyForMultiInternetMode)} raise security exception
+     * without permission.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSetStaConcurrencyForMultiInternetModeWithoutPermission() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())
+                || !mWifiManager.isStaConcurrencyForMultiInternetSupported()) {
+            // skip the test if WiFi is not supported or multi internet feature not supported.
+            return;
+        }
+        try {
+            mWifiManager.setStaConcurrencyForMultiInternetMode(
+                    WifiManager.WIFI_MULTI_INTERNET_MODE_DISABLED);
+            fail("setWifiPasspointEnabled() expected to fail - privileged call");
+        } catch (SecurityException e) {
+            // expected
+        }
+    }
+
+    /**
+     * Tests {@link WifiManager#setStaConcurrencyForMultiInternetMode)} does not crash.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testSetStaConcurrencyForMultiInternetMode() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())
+                || !mWifiManager.isStaConcurrencyForMultiInternetSupported()) {
+            // skip the test if WiFi is not supported or multi internet feature not supported.
+            return;
+        }
+
+        // The below API only works with privileged permissions (obtained via shell identity
+        // for test)
+        UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        try {
+            uiAutomation.adoptShellPermissionIdentity();
+            // Try to disable multi internet
+            mWifiManager.setStaConcurrencyForMultiInternetMode(
+                    WifiManager.WIFI_MULTI_INTERNET_MODE_DISABLED);
+            PollingCheck.check(
+                    "Wifi multi internet disable failed!", 2_000,
+                    () -> mWifiManager.getStaConcurrencyForMultiInternetMode()
+                            == WifiManager.WIFI_MULTI_INTERNET_MODE_DISABLED);
+            // Try to enable multi internet
+            mWifiManager.setStaConcurrencyForMultiInternetMode(
+                    WifiManager.WIFI_MULTI_INTERNET_MODE_MULTI_AP);
+            PollingCheck.check(
+                    "Wifi multi internet turn on failed!", 2_000,
+                    () -> mWifiManager.getStaConcurrencyForMultiInternetMode()
+                            == WifiManager.WIFI_MULTI_INTERNET_MODE_MULTI_AP);
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    /**
+     * Tests {@link WifiConfiguration#setBssidAllowlist(List)}.
+     */
+    public void testBssidAllowlist() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        // Trigger a scan & wait for connection to one of the saved networks.
+        mWifiManager.startScan();
+        waitForConnection();
+
+        UiAutomation uiAutomation = InstrumentationRegistry.getInstrumentation().getUiAutomation();
+        List<WifiConfiguration> savedNetworks = null;
+        try {
+            uiAutomation.adoptShellPermissionIdentity();
+
+            WifiInfo wifiInfo = mWifiManager.getConnectionInfo();
+            String connectedBssid = wifiInfo.getBSSID();
+            int networkId = wifiInfo.getNetworkId();
+
+            // Set empty BSSID allow list to block all APs
+            savedNetworks = mWifiManager.getConfiguredNetworks();
+            for (WifiConfiguration network : savedNetworks) {
+                network.setBssidAllowlist(Collections.emptyList());
+                mWifiManager.updateNetwork(network);
+            }
+            // trigger a disconnect and wait for disconnect.
+            mWifiManager.disconnect();
+            waitForDisconnection();
+
+            // Now trigger scan and ensure that the device does not connect to any networks.
+            mWifiManager.startScan();
+            ensureNotConnected();
+
+            // Set the previous connected BSSID on that network. Other network set with a fake
+            // (not visible) BSSID only
+            for (WifiConfiguration network : savedNetworks) {
+                if (network.networkId == networkId) {
+                    network.setBssidAllowlist(List.of(MacAddress.fromString(connectedBssid)));
+                    mWifiManager.updateNetwork(network);
+                } else {
+                    network.setBssidAllowlist(List.of(MacAddress.fromString(TEST_BSSID)));
+                    mWifiManager.updateNetwork(network);
+                }
+            }
+
+            // Trigger a scan & wait for connection to one of the saved networks.
+            mWifiManager.startScan();
+            waitForConnection();
+            wifiInfo = mWifiManager.getConnectionInfo();
+            assertEquals(networkId, wifiInfo.getNetworkId());
+            assertEquals(connectedBssid, wifiInfo.getBSSID());
+        } finally {
+            // Reset BSSID allow list to accept all APs
+            for (WifiConfiguration network : savedNetworks) {
+                assertNotNull(network.getBssidAllowlist());
+                network.setBssidAllowlist(null);
+                mWifiManager.updateNetwork(network);
+            }
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    /**
+     * Tests {@link WifiManager#notifyMinimumRequiredWifiSecurityLevelChanged(int)}
+     * raise security exception without permission.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testNotifyMinimumRequiredWifiSecurityLevelChangedWithoutPermission()
+            throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported.
+            return;
+        }
+        assertThrows(SecurityException.class,
+                () -> mWifiManager.notifyMinimumRequiredWifiSecurityLevelChanged(
+                        DevicePolicyManager.WIFI_SECURITY_PERSONAL));
+    }
+
+    /**
+     * Tests {@link WifiManager#notifyMinimumRequiredWifiSecurityLevelChanged(int)}
+     * raise security exception without permission.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testNotifyWifiSsidPolicyChangedWithoutPermission() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported.
+            return;
+        }
+        WifiSsidPolicy policy = new WifiSsidPolicy(
+                WifiSsidPolicy.WIFI_SSID_POLICY_TYPE_ALLOWLIST, new ArraySet<>(Arrays.asList(
+                WifiSsid.fromBytes("ssid".getBytes(StandardCharsets.UTF_8)))));
+        try {
+            mWifiManager.notifyWifiSsidPolicyChanged(policy);
+            fail("Expected security exception due to lack of permission");
+        } catch (SecurityException e) {
+            // expected
+        }
+    }
+
+    /**
+     * Verifies that
+     * {@link WifiManager#reportCreateInterfaceImpact(int, boolean, Executor, BiConsumer)} raises
+     * a security exception without permission.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testIsItPossibleToCreateInterfaceNotAllowed() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+
+        assertThrows(SecurityException.class, () -> mWifiManager.reportCreateInterfaceImpact(
+                WifiManager.WIFI_INTERFACE_TYPE_AP, false, mExecutor,
+                (canBeCreatedLocal, interfacesWhichWillBeDeletedLocal) -> {
+                    // should not get here (security exception!)
+                }));
+    }
+
+    /**
+     * Verifies
+     * {@link WifiManager#reportCreateInterfaceImpact(int, boolean, Executor, BiConsumer)} .
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testIsItPossibleToCreateInterface() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+
+        AtomicBoolean called = new AtomicBoolean(false);
+        AtomicBoolean canBeCreated = new AtomicBoolean(false);
+        AtomicReference<Set<WifiManager.InterfaceCreationImpact>>
+                interfacesWhichWillBeDeleted = new AtomicReference<>(null);
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> mWifiManager.reportCreateInterfaceImpact(
+                        WifiManager.WIFI_INTERFACE_TYPE_AP, false, mExecutor,
+                        (canBeCreatedLocal, interfacesWhichWillBeDeletedLocal) -> {
+                            synchronized (mLock) {
+                                canBeCreated.set(canBeCreatedLocal);
+                                called.set(true);
+                                interfacesWhichWillBeDeleted.set(interfacesWhichWillBeDeletedLocal);
+                                mLock.notify();
+                            }
+                        }));
+        synchronized (mLock) {
+            mLock.wait(TEST_WAIT_DURATION_MS);
+        }
+        assertTrue(called.get());
+        if (canBeCreated.get()) {
+            for (WifiManager.InterfaceCreationImpact entry : interfacesWhichWillBeDeleted.get()) {
+                int interfaceType = entry.getInterfaceType();
+                assertTrue(interfaceType == WifiManager.WIFI_INTERFACE_TYPE_STA
+                        || interfaceType == WifiManager.WIFI_INTERFACE_TYPE_AP
+                        || interfaceType == WifiManager.WIFI_INTERFACE_TYPE_DIRECT
+                        || interfaceType == WifiManager.WIFI_INTERFACE_TYPE_AWARE);
+                Set<String> packages = entry.getPackages();
+                for (String p : packages) {
+                    assertNotNull(p);
+                }
+            }
+        }
+
+        // verify the WifiManager.InterfaceCreationImpact APIs
+        int interfaceType = WifiManager.WIFI_INTERFACE_TYPE_STA;
+        Set<String> packages = Set.of("package1", "packages2");
+        WifiManager.InterfaceCreationImpact element = new WifiManager.InterfaceCreationImpact(
+                interfaceType, packages);
+        assertEquals(interfaceType, element.getInterfaceType());
+        assertEquals(packages, element.getPackages());
+    }
+
+    /**
+     * Tests {@link WifiManager#isEasyConnectDppAkmSupported)} does not crash.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    public void testIsEasyConnectDppAkmSupported() throws Exception {
+        if (!WifiFeature.isWifiSupported(getContext())) {
+            // skip the test if WiFi is not supported
+            return;
+        }
+        mWifiManager.isEasyConnectDppAkmSupported();
+    }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiNetworkSuggestionTest.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiNetworkSuggestionTest.java
index 5e54e9b..759b582 100644
--- a/tests/tests/wifi/src/android/net/wifi/cts/WifiNetworkSuggestionTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiNetworkSuggestionTest.java
@@ -23,12 +23,13 @@
 import static android.os.Process.myUid;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.common.truth.Truth.assertWithMessage;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
@@ -42,10 +43,12 @@
 import android.net.wifi.WifiEnterpriseConfig;
 import android.net.wifi.WifiManager;
 import android.net.wifi.WifiNetworkSuggestion;
+import android.net.wifi.WifiSsid;
 import android.net.wifi.hotspot2.PasspointConfiguration;
 import android.net.wifi.hotspot2.pps.Credential;
 import android.net.wifi.hotspot2.pps.HomeSp;
 import android.os.Build;
+import android.os.ParcelUuid;
 import android.platform.test.annotations.AppModeFull;
 import android.support.test.uiautomator.UiDevice;
 import android.telephony.TelephonyManager;
@@ -68,6 +71,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.security.KeyFactory;
 import java.security.NoSuchAlgorithmException;
@@ -93,6 +97,11 @@
     private static final int TEST_PRIORITY = 5;
     private static final int TEST_PRIORITY_GROUP = 1;
     private static final int TEST_SUB_ID = 1;
+    private static final ParcelUuid GROUP_UUID = ParcelUuid
+            .fromString("0000110B-0000-1000-8000-00805F9B34FB");
+    private static final int DURATION_NETWORK_DISCONNECT_MILLIS = 3_000;
+    private static final int DURATION_NETWORK_LINGER_MILLIS = 30_000;
+    private static final int DURATION_NETWORK_UPDATE = 10_000;
 
     private static boolean sWasVerboseLoggingEnabled;
     private static boolean sWasScanThrottleEnabled;
@@ -993,6 +1002,20 @@
     }
 
     /**
+     * Tests {@link android.net.wifi.WifiNetworkSuggestion.Builder} class, with SubscriptionGroup
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    @Test
+    public void testBuilderWithSubscriptionGroup() throws Exception {
+        WifiNetworkSuggestion suggestion =
+                new WifiNetworkSuggestion.Builder()
+                        .setSsid(TEST_SSID)
+                        .setSubscriptionGroup(GROUP_UUID)
+                        .build();
+        assertEquals(GROUP_UUID, suggestion.getSubscriptionGroup());
+    }
+
+    /**
      * Helper function for creating a {@link PasspointConfiguration} for testing.
      *
      * @return {@link PasspointConfiguration}
@@ -1101,11 +1124,29 @@
     }
 
     /**
-     * Connect to a network using suggestion API.
+     * Tests {@link android.net.wifi.WifiNetworkSuggestion.Builder} class with non-unicode ssid
+     */
+    @Test
+    public void testBuilderWithNonUnicodeSsid() {
+        byte[] ssid = "服務集識別碼".getBytes(Charset.forName("GBK"));
+        WifiNetworkSuggestion suggestion = new WifiNetworkSuggestion.Builder()
+                .setWifiSsid(WifiSsid.fromBytes(ssid))
+                .build();
+        assertArrayEquals(ssid, suggestion.getWifiSsid().getBytes());
+        assertNull(suggestion.getSsid());
+
+        // If WifiSsid is empty, will throw an exception.
+        assertThrows(IllegalArgumentException.class,
+                () -> new WifiNetworkSuggestion.Builder().setWifiSsid(WifiSsid.fromBytes(null)));
+    }
+
+    /**
+     * Connect to a network using suggestion API then remove with
+     * {@link WifiManager#ACTION_REMOVE_SUGGESTION_DISCONNECT}
      */
     @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
     @Test
-    public void testConnectToSuggestion() throws Exception {
+    public void testConnectToSuggestionThenRemoveWithImmediateDisconnect() throws Exception {
         assertNotNull(sTestNetwork);
         WifiNetworkSuggestion suggestion =
                 TestHelper.createSuggestionBuilderWithCredentialFromSavedNetworkWithBssid(
@@ -1113,7 +1154,60 @@
                         .build();
         sNsNetworkCallback = sTestHelper.testConnectionFlowWithSuggestion(
                 sTestNetwork, suggestion, mExecutorService,
-                Set.of() /* restrictedNetworkCapability */);
+                Set.of()/* restrictedNetworkCapability */, false/* restrictedNetwork */);
+        TestHelper.TestNetworkCallback callback = (TestHelper.TestNetworkCallback)
+                sNsNetworkCallback;
+        while (callback.waitForAnyCallback(DURATION_NETWORK_UPDATE));
+        sWifiManager.removeNetworkSuggestions(List.of(suggestion),
+                WifiManager.ACTION_REMOVE_SUGGESTION_DISCONNECT);
+        callback.waitForAnyCallback(DURATION_NETWORK_DISCONNECT_MILLIS);
+        assertTrue(callback.onLostCalled);
+    }
+
+    /**
+     * Connect to a network using suggestion API, then remove with
+     * {@link WifiManager#ACTION_REMOVE_SUGGESTION_LINGER}
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
+    @Test
+    public void testConnectToSuggestionThenRemoveWithLingering() throws Exception {
+        assertNotNull(sTestNetwork);
+        WifiNetworkSuggestion suggestion =
+                TestHelper.createSuggestionBuilderWithCredentialFromSavedNetworkWithBssid(
+                                sTestNetwork)
+                        .build();
+        sNsNetworkCallback = sTestHelper.testConnectionFlowWithSuggestion(
+                sTestNetwork, suggestion, mExecutorService,
+                Set.of()/* restrictedNetworkCapability */, false/* restrictedNetwork */);
+        TestHelper.TestNetworkCallback callback = (TestHelper.TestNetworkCallback)
+                sNsNetworkCallback;
+        while (callback.waitForAnyCallback(DURATION_NETWORK_UPDATE));
+        sWifiManager.removeNetworkSuggestions(List.of(suggestion),
+                WifiManager.ACTION_REMOVE_SUGGESTION_LINGER);
+        callback.waitForAnyCallback(DURATION_NETWORK_DISCONNECT_MILLIS);
+        // Should not disconnect immediately
+        assertFalse(callback.onLostCalled);
+        // After linger time out, should disconnect.
+        Thread.sleep(DURATION_NETWORK_LINGER_MILLIS);
+        assertTrue(callback.onLostCalled);
+    }
+
+    /**
+     * Connect to a restricted network using suggestion API.
+     */
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.S)
+    @Test
+    public void testConnectToRestrictedSuggestion() throws Exception {
+        assertNotNull(sTestNetwork);
+        WifiNetworkSuggestion suggestion =
+                TestHelper.createSuggestionBuilderWithCredentialFromSavedNetworkWithBssid(
+                        sTestNetwork)
+                        .setRestricted(true)
+                        .build();
+        assertTrue(suggestion.isRestricted());
+        sNsNetworkCallback = sTestHelper.testConnectionFlowWithSuggestion(
+                sTestNetwork, suggestion, mExecutorService,
+                Set.of()/* restrictedNetworkCapability */, true);
     }
 
     /**
@@ -1129,7 +1223,7 @@
                         .setOemPaid(true)
                         .build();
         sNsNetworkCallback = sTestHelper.testConnectionFlowWithSuggestion(
-                sTestNetwork, suggestion, mExecutorService, Set.of(NET_CAPABILITY_OEM_PAID));
+                sTestNetwork, suggestion, mExecutorService, Set.of(NET_CAPABILITY_OEM_PAID), false);
     }
 
     /**
@@ -1147,7 +1241,7 @@
                         .build();
         sNsNetworkCallback = sTestHelper.testConnectionFlowWithSuggestion(
                 sTestNetwork, suggestion, mExecutorService,
-                Set.of(NET_CAPABILITY_OEM_PAID, NET_CAPABILITY_OEM_PRIVATE));
+                Set.of(NET_CAPABILITY_OEM_PAID, NET_CAPABILITY_OEM_PRIVATE), false);
     }
 
     /**
@@ -1163,7 +1257,8 @@
                         .setOemPrivate(true)
                         .build();
         sNsNetworkCallback = sTestHelper.testConnectionFlowWithSuggestion(
-                sTestNetwork, suggestion, mExecutorService, Set.of(NET_CAPABILITY_OEM_PRIVATE));
+                sTestNetwork, suggestion, mExecutorService, Set.of(NET_CAPABILITY_OEM_PRIVATE),
+                false);
     }
 
     /**
diff --git a/tests/tests/wifi/src/android/net/wifi/cts/WifiSsidTest.java b/tests/tests/wifi/src/android/net/wifi/cts/WifiSsidTest.java
new file mode 100644
index 0000000..c162f9e
--- /dev/null
+++ b/tests/tests/wifi/src/android/net/wifi/cts/WifiSsidTest.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (C) 2021 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 android.net.wifi.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.net.wifi.WifiSsid;
+import android.os.Parcel;
+
+import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.List;
+
+public class WifiSsidTest extends WifiJUnit3TestBase {
+
+    private static final String TEST_SSID_UTF_8 = "Test SSID";
+    private static final String TEST_SSID_UTF_8_QUOTED = "\"" + TEST_SSID_UTF_8 + "\"";
+    private static final byte[] TEST_SSID_UTF_8_BYTES =
+            TEST_SSID_UTF_8.getBytes(StandardCharsets.UTF_8);
+    private static final String TEST_SSID_UTF_8_HEX = "546573742053534944";
+
+    private static final byte[] TEST_SSID_NON_UTF_8_BYTES =
+            "服務集識別碼".getBytes(Charset.forName("GBK"));
+    private static final String TEST_SSID_NON_UTF_8_HEX = "B7FE84D5BCAFD7528465B461";
+
+    /**
+     * Verify the behavior of fromByteArray()
+     */
+    public void testFromByteArray() {
+        WifiSsid wifiSsidUtf8 = WifiSsid.fromBytes(TEST_SSID_UTF_8_BYTES);
+        assertThat(wifiSsidUtf8).isNotNull();
+        assertThat(wifiSsidUtf8.getBytes()).isEqualTo(TEST_SSID_UTF_8_BYTES);
+
+        WifiSsid wifiSsidNonUtf8 = WifiSsid.fromBytes(TEST_SSID_NON_UTF_8_BYTES);
+        assertThat(wifiSsidNonUtf8).isNotNull();
+        assertThat(wifiSsidNonUtf8.getBytes()).isEqualTo(TEST_SSID_NON_UTF_8_BYTES);
+
+        WifiSsid wifiSsidEmpty = WifiSsid.fromBytes(new byte[0]);
+        assertThat(wifiSsidEmpty).isNotNull();
+        assertThat(wifiSsidEmpty.getBytes()).isEmpty();
+
+        WifiSsid wifiSsidNull = WifiSsid.fromBytes(null);
+        assertThat(wifiSsidNull).isNotNull();
+        assertThat(wifiSsidNull.getBytes()).isEmpty();
+
+        try {
+            WifiSsid.fromBytes(new byte[33]);
+            fail("Expected IllegalArgumentException for byte array length greater than 32.");
+        } catch (IllegalArgumentException e) {
+            // Success
+        }
+    }
+
+    /**
+     * Verify the behavior of the Parcelable interface implementation.
+     */
+    public void testParcelable() throws Exception {
+        List<WifiSsid> testWifiSsids = Arrays.asList(
+                WifiSsid.fromBytes(TEST_SSID_UTF_8_BYTES),
+                WifiSsid.fromBytes(TEST_SSID_NON_UTF_8_BYTES));
+
+        for (WifiSsid wifiSsid : testWifiSsids) {
+            Parcel parcel = Parcel.obtain();
+            wifiSsid.writeToParcel(parcel, 0);
+            parcel.setDataPosition(0);
+            assertThat(WifiSsid.CREATOR.createFromParcel(parcel)).isEqualTo(wifiSsid);
+        }
+    }
+}
diff --git a/tests/tests/wifi/src/android/net/wifi/nl80211/cts/WifiNl80211ManagerTest.java b/tests/tests/wifi/src/android/net/wifi/nl80211/cts/WifiNl80211ManagerTest.java
index 79defe2..f1780b2 100644
--- a/tests/tests/wifi/src/android/net/wifi/nl80211/cts/WifiNl80211ManagerTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/nl80211/cts/WifiNl80211ManagerTest.java
@@ -21,6 +21,7 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
 import android.content.Context;
@@ -130,6 +131,15 @@
         } catch (Exception ignore) {}
     }
 
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU, codeName = "Tiramisu")
+    @Test
+    public void testGetMaxSsidsPerScan() {
+        try {
+            WifiNl80211Manager manager = mContext.getSystemService(WifiNl80211Manager.class);
+            manager.getMaxSsidsPerScan("wlan0");
+        } catch (Exception ignore) { }
+    }
+
     @Test
     public void testSetOnServiceDeadCallback() {
         try {
@@ -151,9 +161,22 @@
         // Register listener and unregister listener for API coverage only.
         // Since current cts don't have sufficient permission to call WifiNl80211Manager API.
         // Assert register fail because the CTS don't have sufficient permission to call
-        // WifiNl80211Manager API which are guarded by selinux.
+        // WifiNl80211Manager API which is guarded by selinux.
         assertFalse(manager.registerCountryCodeChangedListener(executor,
                 testCountryCodeChangeListener));
         manager.unregisterCountryCodeChangedListener(testCountryCodeChangeListener);
     }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)
+    @Test
+    public void testNotifyCountryCodeChanged() {
+        WifiNl80211Manager manager = mContext.getSystemService(WifiNl80211Manager.class);
+        // Assert fail because the CTS don't have sufficient permission to call
+        // WifiNl80211Manager API which is guarded by selinux.
+        try {
+            manager.notifyCountryCodeChanged("US");
+            fail("notifyCountryCodeChanged doesn't throws RuntimeException");
+        } catch (RuntimeException re) {
+        }
+    }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/p2p/cts/WifiP2pDeviceTest.java b/tests/tests/wifi/src/android/net/wifi/p2p/cts/WifiP2pDeviceTest.java
index 1510d7c..70ca07d 100644
--- a/tests/tests/wifi/src/android/net/wifi/p2p/cts/WifiP2pDeviceTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/p2p/cts/WifiP2pDeviceTest.java
@@ -16,10 +16,12 @@
 
 package android.net.wifi.p2p.cts;
 
-import android.net.InetAddresses;
 import android.net.wifi.p2p.WifiP2pDevice;
+import android.os.Build;
 import android.test.AndroidTestCase;
 
+import androidx.test.filters.SdkSuppress;
+
 public class WifiP2pDeviceTest extends AndroidTestCase {
 
     public void testDefaultWpsMethodSupportCheck() {
@@ -35,4 +37,10 @@
 
         assertFalse(dev.isServiceDiscoveryCapable());
     }
+
+    @SdkSuppress(minSdkVersion = Build.VERSION_CODES.TIRAMISU)
+    public void testGetVendorElements() {
+        WifiP2pDevice dev = new WifiP2pDevice();
+        dev.getVendorElements();
+    }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/rtt/cts/TestBase.java b/tests/tests/wifi/src/android/net/wifi/rtt/cts/TestBase.java
index c69fd7c..bdec62b 100644
--- a/tests/tests/wifi/src/android/net/wifi/rtt/cts/TestBase.java
+++ b/tests/tests/wifi/src/android/net/wifi/rtt/cts/TestBase.java
@@ -16,6 +16,12 @@
 
 package android.net.wifi.rtt.cts;
 
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -24,18 +30,33 @@
 import android.location.LocationManager;
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiManager;
-import android.net.wifi.cts.WifiJUnit3TestBase;
+import android.net.wifi.cts.TestHelper;
+import android.net.wifi.cts.WifiFeature;
+import android.net.wifi.cts.WifiJUnit4TestBase;
 import android.net.wifi.rtt.RangingResult;
 import android.net.wifi.rtt.RangingResultCallback;
 import android.net.wifi.rtt.WifiRttManager;
 import android.os.Handler;
 import android.os.HandlerExecutor;
 import android.os.HandlerThread;
+import android.support.test.uiautomator.UiDevice;
 
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.ShellIdentityUtils;
-import com.android.compatibility.common.util.SystemUtil;
 
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Random;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
@@ -44,7 +65,7 @@
  * Base class for Wi-Fi RTT CTS test cases. Provides a uniform configuration and event management
  * facility.
  */
-public class TestBase extends WifiJUnit3TestBase {
+public class TestBase extends WifiJUnit4TestBase {
     protected static final String TAG = "WifiRttCtsTests";
 
     // wait for Wi-Fi RTT to become available
@@ -59,101 +80,114 @@
     // Interval between failure scans
     private static final int INTERVAL_BETWEEN_FAILURE_SCAN_MILLIS = 5_000;
 
+    private static final int DURATION_MILLIS = 10_000;
+
+    // Number of scans to do while searching for APs supporting IEEE 802.11mc
+    private static final int NUM_SCANS_SEARCHING_FOR_IEEE80211MC_AP = 5;
+
     // 5GHz Frequency band
     private static final int FREQUENCY_OF_5GHZ_BAND_IN_MHZ = 5_000;
+    private static Context sContext;
+    private static boolean sShouldRunTest;
+    private static UiDevice sUiDevice;
+    private static TestHelper sTestHelper;
+    private static boolean sWasVerboseLoggingEnabled;
+    private static WifiManager sWifiManager;
+    private static Boolean sWasScanThrottleEnabled;
+    private static boolean sWasWifiEnabled;
+    private static ScanResult s11McScanResult;
+    private static ScanResult sNone11McScanResult;
 
     protected WifiRttManager mWifiRttManager;
-    protected WifiManager mWifiManager;
-    private LocationManager mLocationManager;
-    private WifiManager.WifiLock mWifiLock;
 
     private final HandlerThread mHandlerThread = new HandlerThread("SingleDeviceTest");
     protected final Executor mExecutor;
-    private Boolean mWasVerboseLoggingEnabled;
 
     {
         mHandlerThread.start();
         mExecutor = new HandlerExecutor(new Handler(mHandlerThread.getLooper()));
     }
 
-    /**
-     * Returns a flag indicating whether or not Wi-Fi RTT should be tested. Wi-Fi RTT
-     * should be tested if the feature is supported on the current device.
-     */
-    static boolean shouldTestWifiRtt(Context context) {
-        final PackageManager pm = context.getPackageManager();
-        return pm.hasSystemFeature(PackageManager.FEATURE_WIFI_RTT);
-    }
+    @BeforeClass
+    public static void setupClass() throws Exception {
+        sContext = InstrumentationRegistry.getInstrumentation().getContext();
+        // skip the test if WiFi is not supported
+        // Don't use assumeTrue in @BeforeClass
+        if (!WifiFeature.isWifiSupported(sContext)) return;
+        if (!WifiFeature.isRttSupported(sContext)) return;
+        // skip the test if location is not supported
+        if (!sContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LOCATION)) return;
+        // skip if the location is disabled
+        if (!sContext.getSystemService(LocationManager.class).isLocationEnabled()) return;
 
-    /**
-     * Returns a flag indicating whether or not Wi-Fi Aware should be tested. Wi-Fi Aware
-     * should be tested if the feature is supported on the current device.
-     */
-    static boolean shouldTestWifiAware(Context context) {
-        final PackageManager pm = context.getPackageManager();
-        return pm.hasSystemFeature(PackageManager.FEATURE_WIFI_AWARE);
-    }
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
-
-        if (!shouldTestWifiRtt(getContext())) {
-            return;
-        }
-
-        mLocationManager = (LocationManager) getContext().getSystemService(
-                Context.LOCATION_SERVICE);
-        assertTrue("RTT testing requires Location to be enabled",
-                mLocationManager.isLocationEnabled());
-
-        mWifiRttManager = (WifiRttManager) getContext().getSystemService(
-                Context.WIFI_RTT_RANGING_SERVICE);
-        assertNotNull("Wi-Fi RTT Manager", mWifiRttManager);
-
-        mWifiManager = (WifiManager) getContext().getSystemService(Context.WIFI_SERVICE);
-        assertNotNull("Wi-Fi Manager", mWifiManager);
+        sWifiManager = sContext.getSystemService(WifiManager.class);
+        assertThat(sWifiManager).isNotNull();
+        sShouldRunTest = true;
+        sUiDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
+        sTestHelper = new TestHelper(sContext, sUiDevice);
 
         // turn on verbose logging for tests
-        mWasVerboseLoggingEnabled = ShellIdentityUtils.invokeWithShellPermissions(
-                () -> mWifiManager.isVerboseLoggingEnabled());
+        sWasVerboseLoggingEnabled = ShellIdentityUtils.invokeWithShellPermissions(
+                () -> sWifiManager.isVerboseLoggingEnabled());
         ShellIdentityUtils.invokeWithShellPermissions(
-                () -> mWifiManager.setVerboseLoggingEnabled(true));
+                () -> sWifiManager.setVerboseLoggingEnabled(true));
+        // Disable scan throttling for tests.
+        sWasScanThrottleEnabled = ShellIdentityUtils.invokeWithShellPermissions(
+                () -> sWifiManager.isScanThrottleEnabled());
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> sWifiManager.setScanThrottleEnabled(false));
+        // Disable auto join
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> sWifiManager.allowAutojoinGlobal(false));
 
-        mWifiLock = mWifiManager.createWifiLock(TAG);
-        mWifiLock.acquire();
-        if (!mWifiManager.isWifiEnabled()) {
-            SystemUtil.runShellCommand("svc wifi enable");
-            // Turn on Wi-Fi may trigger connection. Wait connection state stable.
-            scanAps();
-            Thread.sleep(WAIT_FOR_CONNECTION_FINISH_MS);
+        // turn screen on
+        sTestHelper.turnScreenOn();
+        // enable Wifi
+        sWasWifiEnabled = ShellIdentityUtils.invokeWithShellPermissions(
+                () -> sWifiManager.isWifiEnabled());
+        if (!sWifiManager.isWifiEnabled()) {
+            ShellIdentityUtils.invokeWithShellPermissions(() -> sWifiManager.setWifiEnabled(true));
         }
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(WifiRttManager.ACTION_WIFI_RTT_STATE_CHANGED);
-        WifiRttBroadcastReceiver receiver = new WifiRttBroadcastReceiver();
-        mContext.registerReceiver(receiver, intentFilter);
+        PollingCheck.check("Wifi not enabled", DURATION_MILLIS, () -> sWifiManager.isWifiEnabled());
+        scanForTestAp();
+        Thread.sleep(DURATION_MILLIS);
+    }
+
+    @AfterClass
+    public static void tearDownClass() throws Exception {
+        if (!sShouldRunTest) return;
+
+        // turn screen off
+        sTestHelper.turnScreenOff();
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> sWifiManager.setScanThrottleEnabled(sWasScanThrottleEnabled));
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> sWifiManager.setVerboseLoggingEnabled(sWasVerboseLoggingEnabled));
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> sWifiManager.setWifiEnabled(sWasWifiEnabled));
+        ShellIdentityUtils.invokeWithShellPermissions(
+                () -> sWifiManager.allowAutojoinGlobal(true));
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        assumeTrue(sShouldRunTest);
+        mWifiRttManager = sContext.getSystemService(WifiRttManager.class);
+        assertNotNull("Wi-Fi RTT Manager", mWifiRttManager);
         if (!mWifiRttManager.isAvailable()) {
+            IntentFilter intentFilter = new IntentFilter();
+            intentFilter.addAction(WifiRttManager.ACTION_WIFI_RTT_STATE_CHANGED);
+            WifiRttBroadcastReceiver receiver = new WifiRttBroadcastReceiver();
+            sContext.registerReceiver(receiver, intentFilter);
             assertTrue("Timeout waiting for Wi-Fi RTT to change status",
                     receiver.waitForStateChange());
             assertTrue("Wi-Fi RTT is not available (should be)", mWifiRttManager.isAvailable());
         }
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        if (!shouldTestWifiRtt(getContext())) {
-            super.tearDown();
-            return;
-        }
-
-        ShellIdentityUtils.invokeWithShellPermissions(
-                () -> mWifiManager.setVerboseLoggingEnabled(mWasVerboseLoggingEnabled));
-
-        super.tearDown();
-    }
-
-    class WifiRttBroadcastReceiver extends BroadcastReceiver {
-        private CountDownLatch mBlocker = new CountDownLatch(1);
+    static class WifiRttBroadcastReceiver extends BroadcastReceiver {
+        private final CountDownLatch mBlocker = new CountDownLatch(1);
 
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -167,8 +201,8 @@
         }
     }
 
-    class WifiScansBroadcastReceiver extends BroadcastReceiver {
-        private CountDownLatch mBlocker = new CountDownLatch(1);
+    static class WifiScansBroadcastReceiver extends BroadcastReceiver {
+        private final CountDownLatch mBlocker = new CountDownLatch(1);
 
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -182,8 +216,8 @@
         }
     }
 
-    class ResultCallback extends RangingResultCallback {
-        private CountDownLatch mBlocker = new CountDownLatch(1);
+    static class ResultCallback extends RangingResultCallback {
+        private final CountDownLatch mBlocker = new CountDownLatch(1);
         private int mCode; // 0: success, otherwise RangingResultCallback STATUS_CODE_*.
         private List<RangingResult> mResults;
 
@@ -228,78 +262,90 @@
     /**
      * Start a scan and return a list of observed ScanResults (APs).
      */
-    protected List<ScanResult> scanAps() throws InterruptedException {
+    private static List<ScanResult> scanAps() throws InterruptedException {
         IntentFilter intentFilter = new IntentFilter();
         intentFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
         WifiScansBroadcastReceiver receiver = new WifiScansBroadcastReceiver();
-        mContext.registerReceiver(receiver, intentFilter);
+        sContext.registerReceiver(receiver, intentFilter);
 
-        mWifiManager.startScan();
+        sWifiManager.startScan();
         receiver.waitForStateChange();
-        mContext.unregisterReceiver(receiver);
-        return mWifiManager.getScanResults();
+        sContext.unregisterReceiver(receiver);
+        return sWifiManager.getScanResults();
     }
 
-    /**
-     * Start a scan and return a test AP which supports IEEE 802.11mc and which has the highest
-     * RSSI. Will perform N (parameterized) scans and get the best AP across both scans.
-     *
-     * Returns null if test AP is not found in the specified number of scans.
-     *
-     * @param numScanRetries Maximum number of scans retries (in addition to first scan).
-     */
-    protected ScanResult scanForTest11mcCapableAp(int numScanRetries)
+    private static void scanForTestAp()
             throws InterruptedException {
         int scanCount = 0;
-        ScanResult bestTestAp = null;
-        while (scanCount <= numScanRetries) {
+
+        Map<String, ScanResult> ap24Ghz = new HashMap<>();
+        Map<String, ScanResult> ap5Ghz = new HashMap<>();
+        while (scanCount <= NUM_SCANS_SEARCHING_FOR_IEEE80211MC_AP) {
             for (ScanResult scanResult : scanAps()) {
                 if (!scanResult.is80211mcResponder()) {
+                    if (scanResult.centerFreq0 < FREQUENCY_OF_5GHZ_BAND_IN_MHZ) {
+                        continue;
+                    }
+                    if (sNone11McScanResult == null
+                            || scanResult.level > sNone11McScanResult.level) {
+                        sNone11McScanResult = scanResult;
+                    }
                     continue;
                 }
-                if (bestTestAp == null || scanResult.level > bestTestAp.level) {
-                    bestTestAp = scanResult;
+                if (scanResult.level < -70) {
+                    continue;
+                }
+                if (is24Ghz(scanResult.frequency)) {
+                    ap24Ghz.put(scanResult.BSSID, scanResult);
+                } else if (is5Ghz(scanResult.frequency)) {
+                    ap5Ghz.put(scanResult.BSSID, scanResult);
                 }
             }
-            if (bestTestAp == null) {
+            if (sNone11McScanResult == null) {
                 // Ongoing connection may cause scan failure, wait for a while before next scan.
                 Thread.sleep(INTERVAL_BETWEEN_FAILURE_SCAN_MILLIS);
             }
             scanCount++;
         }
-        return bestTestAp;
+
+        if (!ap5Ghz.isEmpty()) {
+            s11McScanResult = getRandomScanResult(ap5Ghz.values());
+            return;
+        }
+        s11McScanResult = getRandomScanResult(ap24Ghz.values());
     }
 
-    /**
-     * Start a scan and return a test AP which does NOT support IEEE 802.11mc, with a BSS in the
-     * 5GHz band, and which has the highest RSSI. Will perform N (parameterized) scans and get
-     * the best AP across all scan results.
-     *
-     * Returns null if test AP is not found in the specified number of scans.
-     *
-     * @param numScanRetries Maximum number of scans retries (in addition to first scan).
-     */
-    protected ScanResult scanForTestNon11mcCapableAp(int numScanRetries)
-            throws InterruptedException {
-        int scanCount = 0;
-        ScanResult bestTestAp = null;
-        while (scanCount <= numScanRetries) {
-            for (ScanResult scanResult : scanAps()) {
-                // Ensure using a 5GHz or greater channel
-                if (scanResult.is80211mcResponder()
-                        || scanResult.centerFreq0 < FREQUENCY_OF_5GHZ_BAND_IN_MHZ) {
-                    continue;
-                }
-                if (bestTestAp == null || scanResult.level > bestTestAp.level) {
-                    bestTestAp = scanResult;
-                }
-            }
-            if (bestTestAp == null) {
-                // Ongoing connection may cause scan failure, wait for a while before next scan.
-                Thread.sleep(INTERVAL_BETWEEN_FAILURE_SCAN_MILLIS);
-            }
-            scanCount++;
+    static Context getContext() {
+        return sContext;
+    }
+
+    static ScanResult getS11McScanResult() {
+        return s11McScanResult;
+    }
+
+    static ScanResult getNone11McScanResult() {
+        return sNone11McScanResult;
+    }
+
+    private static boolean is24Ghz(int freq) {
+        return freq >= 2142 && freq <= 2484;
+    }
+
+    private static boolean is5Ghz(int freq) {
+        return freq >= 5160 && freq <= 5885;
+    }
+
+    private static ScanResult getRandomScanResult(Collection<ScanResult> scanResults) {
+        if (scanResults.isEmpty()) {
+            return null;
         }
-        return bestTestAp;
+        int index = new Random().nextInt(scanResults.size());
+        return new ArrayList<>(scanResults).get(index);
+    }
+    private static ScanResult getHighestRssiScanResult(Collection<ScanResult> scanResults) {
+        if (scanResults.isEmpty()) {
+            return null;
+        }
+        return scanResults.stream().max(Comparator.comparingInt(a -> a.level)).get();
     }
 }
diff --git a/tests/tests/wifi/src/android/net/wifi/rtt/cts/WifiRttTest.java b/tests/tests/wifi/src/android/net/wifi/rtt/cts/WifiRttTest.java
index a8866f2..2a3f67a 100644
--- a/tests/tests/wifi/src/android/net/wifi/rtt/cts/WifiRttTest.java
+++ b/tests/tests/wifi/src/android/net/wifi/rtt/cts/WifiRttTest.java
@@ -16,21 +16,37 @@
 
 package android.net.wifi.rtt.cts;
 
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.Mockito.mock;
 
 import android.net.MacAddress;
 import android.net.wifi.ScanResult;
 import android.net.wifi.aware.PeerHandle;
 import android.net.wifi.cts.WifiBuildCompat;
+import android.net.wifi.cts.WifiFeature;
 import android.net.wifi.rtt.RangingRequest;
 import android.net.wifi.rtt.RangingResult;
+import android.net.wifi.rtt.ResponderConfig;
 import android.net.wifi.rtt.ResponderLocation;
 import android.platform.test.annotations.AppModeFull;
 
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.LargeTest;
+
 import com.android.compatibility.common.util.DeviceReportLog;
 import com.android.compatibility.common.util.ResultType;
 import com.android.compatibility.common.util.ResultUnit;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -39,6 +55,8 @@
  * Wi-Fi RTT CTS test: range to all available Access Points which support IEEE 802.11mc.
  */
 @AppModeFull(reason = "Cannot get WifiManager in instant app mode")
+@LargeTest
+@RunWith(AndroidJUnit4.class)
 public class WifiRttTest extends TestBase {
     // Number of scans to do while searching for APs supporting IEEE 802.11mc
     private static final int NUM_SCANS_SEARCHING_FOR_IEEE80211MC_AP = 5;
@@ -47,7 +65,7 @@
     private static final int NUM_OF_RTT_ITERATIONS = 10;
 
     // Maximum failure rate of RTT measurements (percentage)
-    private static final int MAX_FAILURE_RATE_PERCENT = 10;
+    private static final int MAX_FAILURE_RATE_PERCENT = 20;
 
     // Maximum variation from the average measurement (measures consistency)
     private static final int MAX_VARIATION_FROM_AVERAGE_DISTANCE_MM = 2000;
@@ -55,6 +73,9 @@
     // Maximum failure rate of one-sided RTT measurements (percentage)
     private static final int MAX_NON11MC_FAILURE_RATE_PERCENT = 40;
 
+    // Maximum non-8011mc variation from the average measurement (measures consistency)
+    private static final int MAX_NON11MC_VARIATION_FROM_AVERAGE_DISTANCE_MM = 4000;
+
     // Minimum valid RSSI value
     private static final int MIN_VALID_RSSI = -100;
 
@@ -62,30 +83,27 @@
     private static final MacAddress MAC = MacAddress.fromString("00:01:02:03:04:05");
 
     // Interval between two ranging request.
-    private static final int intervalMs = 200;
+    private static final int INTERVAL_MS = 1000;
 
     /**
-     * Test Wi-Fi RTT ranging operation:
+     * Test Wi-Fi RTT ranging operation using ScanResults in request:
      * - Scan for visible APs for the test AP (which is validated to support IEEE 802.11mc)
      * - Perform N (constant) RTT operations
      * - Validate:
      *   - Failure ratio < threshold (constant)
      *   - Result margin < threshold (constant)
      */
-    public void testRangingToTest11mcAp() throws InterruptedException {
-        if (!shouldTestWifiRtt(getContext())) {
-            return;
-        }
-
+    @Test
+    public void testRangingToTest11mcApUsingScanResult() throws InterruptedException {
         // Scan for IEEE 802.11mc supporting APs
-        ScanResult testAp = scanForTest11mcCapableAp(NUM_SCANS_SEARCHING_FOR_IEEE80211MC_AP);
+        ScanResult testAp = getS11McScanResult();
         assertNotNull(
                 "Cannot find any test APs which support RTT / IEEE 802.11mc - please verify that "
                         + "your test setup includes them!", testAp);
-
         // Perform RTT operations
         RangingRequest.Builder builder = new RangingRequest.Builder();
         builder.addAccessPoint(testAp);
+
         if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
             builder.setRttBurstSize(RangingRequest.getMaxRttBurstSize());
             assertTrue(RangingRequest.getDefaultRttBurstSize()
@@ -93,11 +111,119 @@
             assertTrue(RangingRequest.getDefaultRttBurstSize()
                     <= RangingRequest.getMaxRttBurstSize());
         }
+
         RangingRequest request = builder.build();
         if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
             assertEquals(1, request.getRttResponders().size());
         }
+        range11mcApRequest(request, testAp);
+    }
 
+    /**
+     * Test Wi-Fi RTT ranging using ResponderConfig in the single responder RangingRequest API.
+     * - Scan for visible APs for the test AP (which is validated to support IEEE 802.11mc)
+     * - Perform N (constant) RTT operations
+     * - Validate:
+     *   - Failure ratio < threshold (constant)
+     *   - Result margin < threshold (constant)
+     */
+    @Test
+    public void testRangingToTest11mcApUsingResponderConfig() throws InterruptedException {
+        // Scan for IEEE 802.11mc supporting APs
+        ScanResult testAp = getS11McScanResult();
+        assertNotNull(
+                "Cannot find any test APs which support RTT / IEEE 802.11mc - please verify that "
+                        + "your test setup includes them!", testAp);
+        int preamble = ResponderConfig.fromScanResult(testAp).getPreamble();
+
+        // Create a ResponderConfig from the builder API.
+        ResponderConfig.Builder responderBuilder = new ResponderConfig.Builder();
+        ResponderConfig responder = responderBuilder
+                .setMacAddress(MacAddress.fromString(testAp.BSSID))
+                .set80211mcSupported(testAp.is80211mcResponder())
+                .setChannelWidth(testAp.channelWidth)
+                .setFrequencyMhz(testAp.frequency)
+                .setCenterFreq0Mhz(testAp.centerFreq0)
+                .setCenterFreq1Mhz(testAp.centerFreq1)
+                .setPreamble(preamble)
+                .build();
+
+        // Validate ResponderConfig.Builder set method arguments match getter methods.
+        assertTrue(responder.getMacAddress().toString().equalsIgnoreCase(testAp.BSSID)
+                        && responder.is80211mcSupported() == testAp.is80211mcResponder()
+                        && responder.getChannelWidth() == testAp.channelWidth
+                        && responder.getFrequencyMhz() == testAp.frequency
+                        && responder.getCenterFreq0Mhz() == testAp.centerFreq0
+                        && responder.getCenterFreq1Mhz() == testAp.centerFreq1
+                        && responder.getPreamble() == preamble);
+
+        // Perform RTT operations
+        RangingRequest.Builder builder = new RangingRequest.Builder();
+        builder.addResponder(responder);
+
+        if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
+            builder.setRttBurstSize(RangingRequest.getMaxRttBurstSize());
+            assertTrue(RangingRequest.getDefaultRttBurstSize()
+                    >= RangingRequest.getMinRttBurstSize());
+            assertTrue(RangingRequest.getDefaultRttBurstSize()
+                    <= RangingRequest.getMaxRttBurstSize());
+        }
+
+        RangingRequest request = builder.build();
+
+        if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
+            assertEquals(1, request.getRttResponders().size());
+        }
+        range11mcApRequest(request, testAp);
+    }
+
+    /**
+     * Test Wi-Fi RTT ranging using ResponderConfig in the multi-Responder RangingRequest API.
+     * - Scan for visible APs for the test AP (which is validated to support IEEE 802.11mc)
+     * - Perform N (constant) RTT operations
+     * - Validate:
+     *   - Failure ratio < threshold (constant)
+     *   - Result margin < threshold (constant)
+     */
+    @Test
+    public void testRangingToTest11mcApUsingListResponderConfig() throws InterruptedException {
+        // Scan for IEEE 802.11mc supporting APs
+        ScanResult testAp = getS11McScanResult();
+        assertNotNull(
+                "Cannot find any test APs which support RTT / IEEE 802.11mc - please verify that "
+                        + "your test setup includes them!", testAp);
+        ResponderConfig responder = ResponderConfig.fromScanResult(testAp);
+        // Perform RTT operations
+        RangingRequest.Builder builder = new RangingRequest.Builder();
+        List<ResponderConfig> responders = new ArrayList<>();
+        responders.add(responder);
+        builder.addResponders(responders);
+
+        if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
+            builder.setRttBurstSize(RangingRequest.getMaxRttBurstSize());
+            assertTrue(RangingRequest.getDefaultRttBurstSize()
+                    >= RangingRequest.getMinRttBurstSize());
+            assertTrue(RangingRequest.getDefaultRttBurstSize()
+                    <= RangingRequest.getMaxRttBurstSize());
+        }
+
+        RangingRequest request = builder.build();
+
+        if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
+            assertEquals(1, request.getRttResponders().size());
+        }
+        range11mcApRequest(request, testAp);
+    }
+
+    /**
+     * Utility method for validating a ranging request.
+     *
+     * @param request the ranging request that is being tested
+     * @param testAp the original test scan result to provide feedback on failure conditions
+     */
+    private void range11mcApRequest(RangingRequest request, ScanResult testAp)
+            throws InterruptedException {
+        Thread.sleep(5000);
         List<RangingResult> allResults = new ArrayList<>();
         int numFailures = 0;
         int distanceSum = 0;
@@ -165,10 +291,12 @@
                 byte[] currentLci = result.getLci();
                 byte[] currentLcr = result.getLcr();
                 if (i - numFailures > 0) {
-                    assertTrue("Wi-Fi RTT results: invalid result (LCI mismatch) on iteration " + i,
-                            Arrays.equals(currentLci, lastLci));
-                    assertTrue("Wi-Fi RTT results: invalid result (LCR mismatch) on iteration " + i,
-                            Arrays.equals(currentLcr, lastLcr));
+                    assertArrayEquals(
+                            "Wi-Fi RTT results: invalid result (LCI mismatch) on iteration " + i,
+                            currentLci, lastLci);
+                    assertArrayEquals(
+                            "Wi-Fi RTT results: invalid result (LCR mismatch) on iteration " + i,
+                            currentLcr, lastLcr);
                 }
                 lastLci = currentLci;
                 lastLcr = currentLcr;
@@ -176,7 +304,7 @@
                 numFailures++;
             }
             // Sleep a while to avoid stress AP.
-            Thread.sleep(intervalMs);
+            Thread.sleep(INTERVAL_MS);
         }
 
         // Save results to log
@@ -199,8 +327,7 @@
 
         // Analyze results
         assertTrue("Wi-Fi RTT failure rate exceeds threshold: FAIL=" + numFailures + ", ITERATIONS="
-                        + NUM_OF_RTT_ITERATIONS + ", AP RSSI=" + testAp.level
-                        + ", AP SSID=" + testAp.SSID,
+                        + NUM_OF_RTT_ITERATIONS + ", AP=" + testAp,
                 numFailures <= NUM_OF_RTT_ITERATIONS * MAX_FAILURE_RATE_PERCENT / 100);
         if (numFailures != NUM_OF_RTT_ITERATIONS) {
             double distanceAvg = (double) distanceSum / (NUM_OF_RTT_ITERATIONS - numFailures);
@@ -211,21 +338,21 @@
                             + (distanceAvg - distanceMin),
                     (distanceAvg - distanceMin) <= MAX_VARIATION_FROM_AVERAGE_DISTANCE_MM);
             for (int i = 0; i < numGoodResults; ++i) {
-                assertNotSame("Number of attempted measurements is 0", 0, numAttempted[i]);
-                assertNotSame("Number of successful measurements is 0", 0, numSuccessful[i]);
+                assertNotEquals("Number of attempted measurements is 0", 0, numAttempted[i]);
+                assertNotEquals("Number of successful measurements is 0", 0, numSuccessful[i]);
             }
         }
     }
 
+
+
     /**
      * Validate that when a request contains more range operations than allowed (by API) that we
      * get an exception.
      */
+    @Test
     public void testRequestTooLarge() throws InterruptedException {
-        if (!shouldTestWifiRtt(getContext())) {
-            return;
-        }
-        ScanResult testAp = scanForTest11mcCapableAp(NUM_SCANS_SEARCHING_FOR_IEEE80211MC_AP);
+        ScanResult testAp = getS11McScanResult();
         assertNotNull(
                 "Cannot find any test APs which support RTT / IEEE 802.11mc - please verify that "
                         + "your test setup includes them!", testAp);
@@ -239,7 +366,7 @@
 
         ScanResult testApNon80211mc = null;
         if (WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
-            testApNon80211mc = scanForTestNon11mcCapableAp(NUM_SCANS_SEARCHING_FOR_IEEE80211MC_AP);
+            testApNon80211mc = getNone11McScanResult();
         }
         if (testApNon80211mc == null) {
             builder.addAccessPoints(List.of(testAp, testAp, testAp));
@@ -261,12 +388,10 @@
     /**
      * Verify ResponderLocation API
      */
+    @Test
     public void testRangingToTestApWithResponderLocation() throws InterruptedException {
-        if (!shouldTestWifiRtt(getContext())) {
-            return;
-        }
         // Scan for IEEE 802.11mc supporting APs
-        ScanResult testAp = scanForTest11mcCapableAp(NUM_SCANS_SEARCHING_FOR_IEEE80211MC_AP);
+        ScanResult testAp = getS11McScanResult();
         assertNotNull(
                 "Cannot find any test APs which support RTT / IEEE 802.11mc - please verify that "
                         + "your test setup includes them!", testAp);
@@ -415,8 +540,9 @@
     /**
      * Verify ranging request with aware peer Mac address and peer handle.
      */
+    @Test
     public void testAwareRttWithMacAddress() throws InterruptedException {
-        if (!(shouldTestWifiRtt(getContext()) && shouldTestWifiAware(getContext()))) {
+        if (!WifiFeature.isAwareSupported(getContext())) {
             return;
         }
         RangingRequest request = new RangingRequest.Builder()
@@ -434,8 +560,9 @@
     /**
      * Verify ranging request with aware peer handle.
      */
+    @Test
     public void testAwareRttWithPeerHandle() throws InterruptedException {
-        if (!(shouldTestWifiRtt(getContext()) && shouldTestWifiAware(getContext()))) {
+        if (WifiFeature.isAwareSupported(getContext())) {
             return;
         }
         PeerHandle peerHandle = mock(PeerHandle.class);
@@ -451,7 +578,7 @@
     }
 
     /**
-     * Test Wi-Fi One-sided RTT ranging operation:
+     * Test Wi-Fi One-sided RTT ranging operation using ScanResult in request:
      * - Scan for visible APs for the test AP (which do not support IEEE 802.11mc) and are operating
      * - in the 5GHz band.
      * - Perform N (constant) RTT operations
@@ -460,14 +587,14 @@
      *   - Failure ratio < threshold (constant)
      *   - Result margin < threshold (constant)
      */
-    public void testRangingToTestNon11mcAp() throws InterruptedException {
-        if (!shouldTestWifiRtt(getContext())
-                || !WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
+    @Test
+    public void testRangingToTestNon11mcApUsingScanResult() throws InterruptedException {
+        if (!WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
             return;
         }
 
         // Scan for Non-IEEE 802.11mc supporting APs
-        ScanResult testAp = scanForTestNon11mcCapableAp(NUM_SCANS_SEARCHING_FOR_IEEE80211MC_AP);
+        ScanResult testAp = getNone11McScanResult();
         assertNotNull(
                 "Cannot find any test APs which are Non-IEEE 802.11mc - please verify that"
                         + " your test setup includes them!", testAp);
@@ -478,6 +605,53 @@
         builder.setRttBurstSize(RangingRequest.getMaxRttBurstSize());
         RangingRequest request = builder.build();
 
+        // Perform the rquest
+        rangeNon11mcApRequest(request, testAp, MAX_NON11MC_VARIATION_FROM_AVERAGE_DISTANCE_MM);
+    }
+
+    /**
+     * Test Wi-Fi one-sided RTT ranging operation using ResponderConfig in request:
+     * - Scan for visible APs for the test AP (which do not support IEEE 802.11mc) and are operating
+     * - in the 5GHz band.
+     * - Perform N (constant) RTT operations
+     * - Remove outliers while insuring greater than 50% of the results still remain
+     * - Validate:
+     *   - Failure ratio < threshold (constant)
+     *   - Result margin < threshold (constant)
+     */
+    @Test
+    public void testRangingToTestNon11mcApUsingResponderConfig() throws InterruptedException {
+        if (!WifiBuildCompat.isPlatformOrWifiModuleAtLeastS(getContext())) {
+            return;
+        }
+
+        // Scan for Non-IEEE 802.11mc supporting APs
+        ScanResult testAp = getNone11McScanResult();
+        assertNotNull(
+                "Cannot find any test APs which are Non-IEEE 802.11mc - please verify that"
+                        + " your test setup includes them!", testAp);
+
+        ResponderConfig responder = ResponderConfig.fromScanResult(testAp);
+
+        // Perform RTT operations
+        RangingRequest.Builder builder = new RangingRequest.Builder();
+        builder.addResponder(responder);
+        builder.setRttBurstSize(RangingRequest.getMaxRttBurstSize());
+        RangingRequest request = builder.build();
+
+        // Perform the rquest
+        rangeNon11mcApRequest(request, testAp, MAX_NON11MC_VARIATION_FROM_AVERAGE_DISTANCE_MM);
+    }
+
+    /**
+     * Utility method for validating a ranging request to a non-80211mc AP.
+     *
+     * @param request the ranging request that is being tested
+     * @param testAp the original test scan result to provide feedback on failure conditions
+     */
+    private void rangeNon11mcApRequest(RangingRequest request, ScanResult testAp,
+            int variationLimit) throws InterruptedException {
+        Thread.sleep(5000);
         List<RangingResult> allResults = new ArrayList<>();
         int numFailures = 0;
         int distanceSum = 0;
@@ -538,10 +712,12 @@
                 byte[] currentLci = result.getLci();
                 byte[] currentLcr = result.getLcr();
                 if (i - numFailures > 0) {
-                    assertTrue("Wi-Fi RTT results: invalid result (LCI mismatch) on iteration " + i,
-                            Arrays.equals(currentLci, lastLci));
-                    assertTrue("Wi-Fi RTT results: invalid result (LCR mismatch) on iteration " + i,
-                            Arrays.equals(currentLcr, lastLcr));
+                    assertArrayEquals(
+                            "Wi-Fi RTT results: invalid result (LCI mismatch) on iteration " + i,
+                            currentLci, lastLci);
+                    assertArrayEquals(
+                            "Wi-Fi RTT results: invalid result (LCR mismatch) on iteration " + i,
+                            currentLcr, lastLcr);
                 }
                 lastLci = currentLci;
                 lastLcr = currentLcr;
@@ -549,7 +725,7 @@
                 numFailures++;
             }
             // Sleep a while to avoid stress AP.
-            Thread.sleep(intervalMs);
+            Thread.sleep(INTERVAL_MS);
         }
         // Save results to log
         int numGoodResults = NUM_OF_RTT_ITERATIONS - numFailures;
@@ -571,55 +747,58 @@
                 ResultType.NEUTRAL, ResultUnit.NONE);
         reportLog.submit();
 
-        /** TODO(b/192909380): enable the performance verification after device fix.
-            // Analyze results
-            assertTrue("Wi-Fi RTT failure rate exceeds threshold: FAIL=" + numFailures
-                            + ", ITERATIONS="
-                            + NUM_OF_RTT_ITERATIONS + ", AP RSSI=" + testAp.level
-                            + ", AP SSID=" + testAp.SSID,
-                    numFailures <= NUM_OF_RTT_ITERATIONS * MAX_NON11MC_FAILURE_RATE_PERCENT / 100);
+        // This bug below has been addressed by making the test parameters for Non-80211mc devices
+        // less stringent. Please update the bug if this does not solve the problem.
+        // TODO(b/192909380): enable the performance verification after device fix.
 
-            if (numFailures != NUM_OF_RTT_ITERATIONS) {
-                // Calculate an initial average using all measurements to determine distance outliers
-                double distanceAvg = (double) distanceSum / (NUM_OF_RTT_ITERATIONS - numFailures);
-                // Now figure out the distance outliers and mark them in the distance inclusion map
-                int validDistances = 0;
-                for (int i = 0; i < (NUM_OF_RTT_ITERATIONS - numFailures); i++) {
-                    if (distanceMms[i] - MAX_VARIATION_FROM_AVERAGE_DISTANCE_MM < distanceAvg) {
-                        // Distances that are in range for the distribution are included in the map
-                        distanceInclusionMap[i] = true;
-                        validDistances++;
-                    } else {
-                        // Distances that are out of range for the distribution are excluded in the map
-                        distanceInclusionMap[i] = false;
-                    }
-                }
+        // Analyze results
+        assertTrue("Wi-Fi RTT failure rate exceeds threshold: FAIL=" + numFailures
+                        + ", ITERATIONS="
+                        + NUM_OF_RTT_ITERATIONS + ", AP=" + testAp,
+                numFailures <= NUM_OF_RTT_ITERATIONS * MAX_NON11MC_FAILURE_RATE_PERCENT / 100);
 
-                assertTrue("After fails+outlier removal greater that 50% distances must remain: " +
-                        NUM_OF_RTT_ITERATIONS / 2, validDistances > NUM_OF_RTT_ITERATIONS / 2);
+        if (numFailures != NUM_OF_RTT_ITERATIONS) {
+            // Calculate an initial average using all measurements to determine distance outliers
+            double distanceAvg = (double) distanceSum / (NUM_OF_RTT_ITERATIONS - numFailures);
+            // Now figure out the distance outliers and mark them in the distance inclusion map
+            int validDistances = 0;
+            for (int i = 0; i < (NUM_OF_RTT_ITERATIONS - numFailures); i++) {
+                if (distanceMms[i] - variationLimit < distanceAvg) {
+                    // Distances that are in range for the distribution are included in the map
+                    distanceInclusionMap[i] = true;
+                    validDistances++;
+                } else {
+                    // Distances that are out of range for the distribution are excluded in the map
+                    distanceInclusionMap[i] = false;
+                }
+            }
 
-                // Remove the distance outliers and find the new average, min and max.
-                distanceSum = 0;
-                distanceMax = Integer.MIN_VALUE;
-                distanceMin = Integer.MAX_VALUE;
-                for (int i = 0; i < (NUM_OF_RTT_ITERATIONS - numFailures); i++) {
-                    if (distanceInclusionMap[i]) {
-                        distanceSum += distanceMms[i];
-                        distanceMin = Math.min(distanceMin, distanceMms[i]);
-                        distanceMax = Math.max(distanceMax, distanceMms[i]);
-                    }
+            assertTrue("After fails+outlier removal greater that 50% distances must remain: "
+                    + NUM_OF_RTT_ITERATIONS / 2, validDistances > NUM_OF_RTT_ITERATIONS / 2);
+
+            // Remove the distance outliers and find the new average, min and max.
+            distanceSum = 0;
+            distanceMax = Integer.MIN_VALUE;
+            distanceMin = Integer.MAX_VALUE;
+            for (int i = 0; i < (NUM_OF_RTT_ITERATIONS - numFailures); i++) {
+                if (distanceInclusionMap[i]) {
+                    distanceSum += distanceMms[i];
+                    distanceMin = Math.min(distanceMin, distanceMms[i]);
+                    distanceMax = Math.max(distanceMax, distanceMms[i]);
                 }
-                distanceAvg = (double) distanceSum / validDistances;
-                assertTrue("Wi-Fi RTT: Variation (max direction) exceeds threshold, Variation ="
-                                + (distanceMax - distanceAvg),
-                        (distanceMax - distanceAvg) <= MAX_VARIATION_FROM_AVERAGE_DISTANCE_MM);
-                assertTrue("Wi-Fi RTT: Variation (min direction) exceeds threshold, Variation ="
-                                + (distanceAvg - distanceMin),
-                        (distanceAvg - distanceMin) <= MAX_VARIATION_FROM_AVERAGE_DISTANCE_MM);
-                for (int i = 0; i < numGoodResults; ++i) {
-                    assertNotSame("Number of attempted measurements is 0", 0, numAttempted[i]);
-                    assertNotSame("Number of successful measurements is 0", 0, numSuccessful[i]);
-                }
-         */
+            }
+            distanceAvg = (double) distanceSum / validDistances;
+            assertTrue("Wi-Fi RTT: Variation (max direction) exceeds threshold, Variation ="
+                            + (distanceMax - distanceAvg),
+                    (distanceMax - distanceAvg) <= variationLimit);
+            assertTrue("Wi-Fi RTT: Variation (min direction) exceeds threshold, Variation ="
+                            + (distanceAvg - distanceMin),
+                    (distanceAvg - distanceMin) <= variationLimit);
+            for (int i = 0; i < numGoodResults; ++i) {
+                assertNotEquals("Number of attempted measurements is 0", 0, numAttempted[i]);
+                assertNotEquals("Number of successful measurements is 0", 0, numSuccessful[i]);
+            }
+        }
+
     }
 }
diff --git a/tests/translation/AndroidManifest.xml b/tests/translation/AndroidManifest.xml
index b20fe08..1ed4560 100644
--- a/tests/translation/AndroidManifest.xml
+++ b/tests/translation/AndroidManifest.xml
@@ -18,6 +18,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="android.translation.cts">
 
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <application android:label="Translation TestCase">
         <uses-library android:name="android.test.runner"/>
 
diff --git a/tests/translation/AndroidTest.xml b/tests/translation/AndroidTest.xml
index 6f213f5..e113244 100644
--- a/tests/translation/AndroidTest.xml
+++ b/tests/translation/AndroidTest.xml
@@ -41,4 +41,10 @@
     <!-- dismiss all system dialogs before launch test -->
     <option name="run-command" value="am broadcast -a android.intent.action.CLOSE_SYSTEM_DIALOGS" />
   </target_preparer>
+  <!-- Collect the files generated on error -->
+  <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">
+    <option name="directory-keys" value="/sdcard/CtsTranslationTestCases" />
+    <option name="collect-on-run-ended-only" value="true" />
+    <option name="clean-up" value="false" />
+  </metrics_collector>
 </configuration>
diff --git a/tests/translation/src/android/translation/cts/CtsTestIme.java b/tests/translation/src/android/translation/cts/CtsTestIme.java
index b07be05..2588405 100644
--- a/tests/translation/src/android/translation/cts/CtsTestIme.java
+++ b/tests/translation/src/android/translation/cts/CtsTestIme.java
@@ -22,10 +22,11 @@
 import static android.translation.cts.Helper.ACTION_ASSERT_UI_TRANSLATION_CALLBACK_ON_START;
 import static android.translation.cts.Helper.ACTION_REGISTER_UI_TRANSLATION_CALLBACK;
 import static android.translation.cts.Helper.ACTION_UNREGISTER_UI_TRANSLATION_CALLBACK;
+import static android.translation.cts.Helper.EXTRA_CALL_COUNT;
 import static android.translation.cts.Helper.EXTRA_FINISH_COMMAND;
+import static android.translation.cts.Helper.EXTRA_PACKAGE_NAME;
 import static android.translation.cts.Helper.EXTRA_SOURCE_LOCALE;
 import static android.translation.cts.Helper.EXTRA_TARGET_LOCALE;
-import static android.translation.cts.Helper.EXTRA_VERIFY_RESULT;
 
 import android.app.PendingIntent;
 import android.app.PendingIntent.CanceledException;
@@ -33,16 +34,12 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.icu.util.ULocale;
 import android.inputmethodservice.InputMethodService;
-import android.view.View;
-import android.view.inputmethod.EditorInfo;
-import android.view.translation.UiTranslationManager;
-import android.view.translation.UiTranslationStateCallback;
-import android.widget.LinearLayout;
 import android.util.Log;
-import android.util.Pair;
-import java.util.concurrent.CountDownLatch;
+import android.view.View;
+import android.view.translation.UiTranslationManager;
+import android.widget.LinearLayout;
+
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
@@ -100,28 +97,32 @@
     }
 
     void assertOnStart(Intent intent) {
-        final Pair<ULocale, ULocale> startedLanguagePair = mCallback.getStartedLanguagePair();
         final Intent result = new Intent();
-        result.putExtra(EXTRA_SOURCE_LOCALE, startedLanguagePair.first);
-        result.putExtra(EXTRA_TARGET_LOCALE, startedLanguagePair.second);
+        result.putExtra(EXTRA_SOURCE_LOCALE, mCallback.getStartedSourceLocale());
+        result.putExtra(EXTRA_TARGET_LOCALE, mCallback.getStartedTargetLocale());
+        result.putExtra(EXTRA_CALL_COUNT, mCallback.getStartedCallCount());
+        result.putExtra(EXTRA_PACKAGE_NAME, mCallback.getStartedPackageName());
         notifyCommandDone(intent, result);
     }
 
     void assertOnFinish(Intent intent) {
         final Intent result = new Intent();
-        result.putExtra(EXTRA_VERIFY_RESULT, mCallback.isOnFinishedCalled());
+        result.putExtra(EXTRA_CALL_COUNT, mCallback.getFinishedCallCount());
+        result.putExtra(EXTRA_PACKAGE_NAME, mCallback.getFinishedPackageName());
         notifyCommandDone(intent, result);
     }
 
     void assertOnResume(Intent intent) {
         final Intent result = new Intent();
-        result.putExtra(EXTRA_VERIFY_RESULT, mCallback.isOnResumedCalled());
+        result.putExtra(EXTRA_CALL_COUNT, mCallback.getResumedCallCount());
+        result.putExtra(EXTRA_PACKAGE_NAME, mCallback.getResumedPackageName());
         notifyCommandDone(intent, result);
     }
 
     void assertOnPause(Intent intent) {
         final Intent result = new Intent();
-        result.putExtra(EXTRA_VERIFY_RESULT, mCallback.isOnPausedCalled());
+        result.putExtra(EXTRA_CALL_COUNT, mCallback.getPausedCallCount());
+        result.putExtra(EXTRA_PACKAGE_NAME, mCallback.getPausedPackageName());
         notifyCommandDone(intent, result);
     }
 
@@ -130,7 +131,7 @@
         if (pendingIntent != null) {
             try {
                 final String action = sourceIntent.getAction();
-                switch(action) {
+                switch (action) {
                     case ACTION_REGISTER_UI_TRANSLATION_CALLBACK:
                     case ACTION_UNREGISTER_UI_TRANSLATION_CALLBACK:
                         pendingIntent.send();
@@ -164,7 +165,7 @@
         @Override
         public void onReceive(Context context, Intent intent) {
             final String action = intent.getAction();
-            switch(action) {
+            switch (action) {
                 case ACTION_REGISTER_UI_TRANSLATION_CALLBACK:
                     registerUiTranslationStateCallback(intent);
                     break;
@@ -194,7 +195,7 @@
             filter.addAction(ACTION_ASSERT_UI_TRANSLATION_CALLBACK_ON_FINISH);
             filter.addAction(ACTION_ASSERT_UI_TRANSLATION_CALLBACK_ON_RESUME);
             filter.addAction(ACTION_ASSERT_UI_TRANSLATION_CALLBACK_ON_PAUSE);
-            mContext.registerReceiver(this, filter);
+            mContext.registerReceiver(this, filter, Context.RECEIVER_NOT_EXPORTED);
         }
 
         void unRegister() {
diff --git a/tests/translation/src/android/translation/cts/CtsTranslationService.java b/tests/translation/src/android/translation/cts/CtsTranslationService.java
index 49f70cd..b7d50d5 100644
--- a/tests/translation/src/android/translation/cts/CtsTranslationService.java
+++ b/tests/translation/src/android/translation/cts/CtsTranslationService.java
@@ -65,6 +65,8 @@
 
     private final CountDownLatch mSessionDestroyedLatch = new CountDownLatch(1);
 
+    private TranslationContext mTranslationContext;
+
     /**
      * Timeout for Translation cts.
      */
@@ -109,6 +111,7 @@
     public void onCreateTranslationSession(@NonNull TranslationContext translationContext,
             int sessionId, @NonNull Consumer<Boolean> callback) {
         Log.v(TAG, "onCreateTranslationSession");
+        mTranslationContext = translationContext;
         callback.accept(true);
     }
 
@@ -116,6 +119,7 @@
     public void onFinishTranslationSession(int sessionId) {
         Log.v(TAG, "onFinishTranslationSession");
         mSessionDestroyedLatch.countDown();
+        mTranslationContext = null;
     }
 
     @Override
@@ -149,6 +153,10 @@
         return sServiceWatcher;
     }
 
+    TranslationContext getTranslationContext() {
+        return mTranslationContext;
+    }
+
     /**
      * Wait the Translation session destroyed.
      */
diff --git a/tests/translation/src/android/translation/cts/FakeTranslationStateCallback.java b/tests/translation/src/android/translation/cts/FakeTranslationStateCallback.java
index 0bd269d..1ff0903 100644
--- a/tests/translation/src/android/translation/cts/FakeTranslationStateCallback.java
+++ b/tests/translation/src/android/translation/cts/FakeTranslationStateCallback.java
@@ -18,8 +18,6 @@
 
 import android.icu.util.ULocale;
 import android.util.Log;
-import android.util.Pair;
-import android.view.View;
 import android.view.translation.UiTranslationStateCallback;
 
 /**
@@ -29,73 +27,136 @@
 
     private static final String TAG = "MockTranslationStateCallback";
 
-    private boolean mStartCalled;
-    private boolean mFinishCalled;
-    private boolean mPausedCalled;
-    private boolean mResumedCalled;
     private ULocale mSourceLocale;
     private ULocale mTargetLocale;
+    private String mStartedPackageName;
+    private String mResumedPackageName;
+    private String mPausedPackageName;
+    private String mFinishedPackageName;
+    private int mStartedCallCount = 0;
+    private int mResumedCallCount = 0;
+    private int mPausedCallCount = 0;
+    private int mFinishedCallCount = 0;
 
     FakeTranslationStateCallback() {
         resetStates();
     }
 
     void resetStates() {
-        mStartCalled = false;
-        mFinishCalled = false;
-        mPausedCalled = false;
-        mResumedCalled = false;
-        mSourceLocale = null;
-        mTargetLocale = null;
+        synchronized (this) {
+            mSourceLocale = null;
+            mTargetLocale = null;
+            mStartedPackageName = null;
+            mResumedPackageName = null;
+            mPausedPackageName = null;
+            mFinishedPackageName = null;
+            mStartedCallCount = 0;
+            mResumedCallCount = 0;
+            mPausedCallCount = 0;
+            mFinishedCallCount = 0;
+        }
     }
 
-    Pair<ULocale, ULocale> getStartedLanguagePair() {
-        return new Pair<>(mSourceLocale, mTargetLocale);
+    ULocale getStartedSourceLocale() {
+        return mSourceLocale;
     }
 
-    boolean isOnStartedCalled() {
-        return mStartCalled;
+    ULocale getStartedTargetLocale() {
+        return mTargetLocale;
     }
 
-    boolean isOnFinishedCalled() {
-        return mFinishCalled;
+    String getStartedPackageName() {
+        return mStartedPackageName;
     }
 
-    boolean isOnPausedCalled() {
-        return mPausedCalled;
+    String getResumedPackageName() {
+        return mResumedPackageName;
     }
 
-    boolean isOnResumedCalled() {
-        return mResumedCalled;
+    String getPausedPackageName() {
+        return mPausedPackageName;
     }
 
+    String getFinishedPackageName() {
+        return mFinishedPackageName;
+    }
+
+    int getStartedCallCount() {
+        return mStartedCallCount;
+    }
+
+    int getResumedCallCount() {
+        return mResumedCallCount;
+    }
+
+    int getPausedCallCount() {
+        return mPausedCallCount;
+    }
+
+    int getFinishedCallCount() {
+        return mFinishedCallCount;
+    }
+
+    @Override
+    public void onStarted(ULocale sourceLocale, ULocale targetLocale, String packageName) {
+        Log.d(TAG, "onStarted, source=" + sourceLocale.getLanguage() + " targetLocale="
+                + targetLocale.getLanguage());
+        synchronized (this) {
+            mSourceLocale = sourceLocale;
+            mTargetLocale = targetLocale;
+            mStartedPackageName = packageName;
+            mStartedCallCount++;
+        }
+    }
+
+    @Override
+    public void onResumed(ULocale sourceLocale, ULocale targetLocale, String packageName) {
+        Log.d(TAG, "onResumed, source=" + sourceLocale.getLanguage() + " targetLocale="
+                + targetLocale.getLanguage() + " packageName=" + packageName);
+        synchronized (this) {
+            mResumedPackageName = packageName;
+            mResumedCallCount++;
+        }
+    }
+
+    @Override
+    public void onPaused(String packageName) {
+        Log.d(TAG, "onPaused");
+        synchronized (this) {
+            mPausedPackageName = packageName;
+            mPausedCallCount++;
+        }
+    }
+
+    @Override
+    public void onFinished(String packageName) {
+        Log.d(TAG, "onFinished");
+        synchronized (this) {
+            mFinishedPackageName = packageName;
+            mFinishedCallCount++;
+        }
+    }
+
+    // Old callback methods below shouldn't be called
+    // TODO: Add a separate callback class and test to get test coverage for these methods
+
     @Override
     public void onStarted(ULocale sourceLocale, ULocale targetLocale) {
-        UiTranslationStateCallback.super.onStarted(sourceLocale, targetLocale);
-        Log.d(TAG, "onStarted, source=" + sourceLocale.getLanguage() + " targetLocale="
-                + targetLocale.getLanguage());
-        mStartCalled = true;
-        mSourceLocale = sourceLocale;
-        mTargetLocale = targetLocale;
-    }
-
-    @Override
-    public void onResumed(ULocale sourceLocale, ULocale targetLocale) {
-        UiTranslationStateCallback.super.onResumed(sourceLocale, targetLocale);
-        Log.d(TAG, "onResumed, source=" + sourceLocale.getLanguage() + " targetLocale="
-                + targetLocale.getLanguage());
-        mResumedCalled = true;
+        throw new RuntimeException("Old callback methods shouldn't be called.");
     }
 
     @Override
     public void onPaused() {
-        Log.d(TAG, "onPaused");
-        mPausedCalled = true;
+        throw new RuntimeException("Old callback methods shouldn't be called.");
+    }
+
+    @Override
+    public void onResumed(ULocale sourceLocale, ULocale targetLocale) {
+        throw new RuntimeException("Old callback methods shouldn't be called.");
     }
 
     @Override
     public void onFinished() {
-        Log.d(TAG, "onFinished");
-        mFinishCalled = true;
+        throw new RuntimeException("Old callback methods shouldn't be called.");
     }
 }
diff --git a/tests/translation/src/android/translation/cts/Helper.java b/tests/translation/src/android/translation/cts/Helper.java
index 12e4e66..041b055 100644
--- a/tests/translation/src/android/translation/cts/Helper.java
+++ b/tests/translation/src/android/translation/cts/Helper.java
@@ -18,11 +18,13 @@
 
 import static com.android.compatibility.common.util.ShellUtils.runShellCommand;
 
+import android.app.Instrumentation;
+import android.app.UiAutomation;
 import android.content.ContentCaptureOptions;
 import android.content.Context;
+import android.graphics.Bitmap;
 import android.os.UserHandle;
 import android.util.Log;
-import android.view.contentcapture.ContentCaptureContext;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.uiautomator.By;
@@ -30,6 +32,11 @@
 import androidx.test.uiautomator.UiObject2;
 import androidx.test.uiautomator.Until;
 
+import com.android.compatibility.common.util.BitmapUtils;
+
+import java.io.File;
+import java.io.IOException;
+
 /**
  * Helper for common funcionalities.
  */
@@ -55,9 +62,11 @@
     public static final String EXTRA_FINISH_COMMAND = "finish_command";
     public static final String EXTRA_SOURCE_LOCALE = "source_locale";
     public static final String EXTRA_TARGET_LOCALE = "target_locale";
-    public static final String EXTRA_VERIFY_RESULT = "verify_result";
+    public static final String EXTRA_PACKAGE_NAME = "package_name";
+    public static final String EXTRA_CALL_COUNT = "call_count";
 
     public static final String CUSTOM_TRANSLATION_ID_MY_TAG = "myTag";
+    public static final String LOCAL_TEST_FILES_DIR = "/sdcard/CtsTranslationTestCases";
     private static final String LOG_TAG = "log.tag.UiTranslation";
 
     /**
@@ -166,4 +175,69 @@
         Log.d(TAG, "disableDebugLog(), set level  " + level);
         System.setProperty(LOG_TAG, level);
     }
-}
\ No newline at end of file
+
+    // TODO: Move to a library that can be shared for smart os components.
+    /**
+     * Takes a screenshot and save it in the file system for analysis.
+     */
+    public static void takeScreenshotAndSave(Context context, String testName,
+            String targetFolder) {
+        File file = null;
+        try {
+            file = createTestFile(testName,"sreenshot.png", targetFolder);
+            if (file != null) {
+                Log.i(TAG, "Taking screenshot on " + file);
+                final Bitmap screenshot = takeScreenshot();
+                saveBitmapToFile(screenshot, file);
+            }
+        } catch (Exception e) {
+            Log.e(TAG, "Error taking screenshot and saving on " + file, e);
+        }
+    }
+
+    public static File saveBitmapToFile(Bitmap bitmap, File file) {
+        Log.i(TAG, "Saving bitmap at " + file);
+        BitmapUtils.saveBitmap(bitmap, file.getParent(), file.getName());
+        return file;
+    }
+
+    private static Bitmap takeScreenshot() {
+        final Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
+        UiAutomation automan = instrumentation.getUiAutomation();
+        final Bitmap bitmap = automan.takeScreenshot();
+        return bitmap;
+    }
+
+    public static File createTestFile(String testName, String name, String targetFolder)
+            throws IOException {
+        final File dir = getLocalDirectory(targetFolder);
+        if (dir == null) return null;
+        final String prefix = testName.replaceAll("\\.|\\(|\\/", "_").replaceAll("\\)", "");
+        final String filename = prefix + "-" + name;
+
+        return createFile(dir, filename);
+    }
+
+    private static File getLocalDirectory(String targetFolder) {
+        final File dir = new File(targetFolder);
+        dir.mkdirs();
+        if (!dir.exists()) {
+            Log.e(TAG, "Could not create directory " + dir);
+            return null;
+        }
+        return dir;
+    }
+
+    private static File createFile(File dir, String filename) throws IOException {
+        final File file = new File(dir, filename);
+        if (file.exists()) {
+            Log.v(TAG, "Deleting file " + file);
+            file.delete();
+        }
+        if (!file.createNewFile()) {
+            Log.e(TAG, "Could not create file " + file);
+            return null;
+        }
+        return file;
+    }
+}
diff --git a/tests/translation/src/android/translation/cts/TranslationManagerTest.java b/tests/translation/src/android/translation/cts/TranslationManagerTest.java
index 128f5a8..67fa455 100644
--- a/tests/translation/src/android/translation/cts/TranslationManagerTest.java
+++ b/tests/translation/src/android/translation/cts/TranslationManagerTest.java
@@ -21,6 +21,7 @@
 import static com.android.compatibility.common.util.ActivitiesWatcher.ActivityLifecycle.RESUMED;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 
 import android.app.Application;
 import android.app.PendingIntent;
@@ -42,6 +43,7 @@
 import android.view.translation.TranslationSpec;
 import android.view.translation.Translator;
 
+import androidx.annotation.NonNull;
 import androidx.test.core.app.ApplicationProvider;
 import androidx.test.runner.AndroidJUnit4;
 
@@ -120,7 +122,7 @@
     }
 
     @Test
-    public void testTranslationCapabilityUpdateListener() throws Exception{
+    public void testTranslationCapabilityUpdateListener() throws Exception {
         // enable cts translation service
         enableCtsTranslationService();
 
@@ -128,9 +130,9 @@
         // text to text capability
         final TranslationCapability updatedText2TextCapability =
                 new TranslationCapability(TranslationCapability.STATE_ON_DEVICE,
-                new TranslationSpec(ULocale.ENGLISH, DATA_FORMAT_TEXT),
-                new TranslationSpec(ULocale.FRENCH, DATA_FORMAT_TEXT),
-                true, 0);
+                        new TranslationSpec(ULocale.ENGLISH, DATA_FORMAT_TEXT),
+                        new TranslationSpec(ULocale.FRENCH, DATA_FORMAT_TEXT),
+                        true, 0);
         // text to image capability
         final TranslationCapability updatedText2ImageCapability =
                 new TranslationCapability(TranslationCapability.STATE_ON_DEVICE,
@@ -198,7 +200,7 @@
     }
 
     @Test
-    public void testSingleTranslation() throws Exception{
+    public void testSingleTranslation() throws Exception {
         enableCtsTranslationService();
 
         final TranslationManager manager = sContext.getSystemService(TranslationManager.class);
@@ -211,26 +213,7 @@
                                 .build())
                         .build());
 
-        final TranslationContext translationContext = new TranslationContext.Builder(
-                new TranslationSpec(ULocale.ENGLISH,
-                        TranslationSpec.DATA_FORMAT_TEXT),
-                new TranslationSpec(ULocale.FRENCH,
-                        TranslationSpec.DATA_FORMAT_TEXT))
-                .build();
-
-        final CountDownLatch createTranslatorLatch = new CountDownLatch(1);
-        final AtomicReference<Translator> translatorRef = new AtomicReference<>();
-        manager.createOnDeviceTranslator(translationContext, r -> r.run(),
-                new Consumer<Translator>() {
-                    @Override
-                    public void accept(Translator translator) {
-                        createTranslatorLatch.countDown();
-                        translatorRef.set(translator);
-                    }
-                });
-
-        createTranslatorLatch.await(5_000, TimeUnit.MILLISECONDS);
-        final Translator translator = translatorRef.get();
+        final Translator translator = createTranslator(manager, createTranslationContext());
 
         try {
             mServiceWatcher.waitOnConnected();
@@ -246,17 +229,20 @@
         values.add(TranslationRequestValue.forText("hello world"));
         translator.translate(new TranslationRequest.Builder()
                         .setTranslationRequestValues(values)
-                        .build(), new CancellationSignal(), (r) -> r.run(),
-                new Consumer<TranslationResponse>() {
-                    @Override
-                    public void accept(TranslationResponse translationResponse) {
-                        responseRef.set(translationResponse);
-                        translationLatch.countDown();
-                    }
+                        .build(), new CancellationSignal(), Runnable::run,
+                translationResponse -> {
+                    responseRef.set(translationResponse);
+                    translationLatch.countDown();
                 });
 
         sTranslationReplier.getNextTranslationRequest();
 
+        CtsTranslationService translationService =
+                mServiceWatcher.getService();
+        TranslationContext sessionContext = translationService.getTranslationContext();
+        assertThat(sessionContext).isNotNull();
+        assertThat(sessionContext.getActivityId()).isNull();
+
         translator.destroy();
         assertThat(translator.isDestroyed()).isTrue();
         try {
@@ -287,7 +273,7 @@
     }
 
     @Test
-    public void testTranslation_partialResponses() throws Exception{
+    public void testTranslation_partialResponses() throws Exception {
         enableCtsTranslationService();
 
         final TranslationManager manager = sContext.getSystemService(TranslationManager.class);
@@ -308,23 +294,7 @@
                         .setFinalResponse(true)
                         .build());
 
-        final TranslationContext translationContext = new TranslationContext.Builder(
-                new TranslationSpec(ULocale.ENGLISH,
-                        TranslationSpec.DATA_FORMAT_TEXT),
-                new TranslationSpec(ULocale.FRENCH,
-                        TranslationSpec.DATA_FORMAT_TEXT))
-                .build();
-
-        final CountDownLatch createTranslatorLatch = new CountDownLatch(1);
-        final AtomicReference<Translator> translatorRef = new AtomicReference<>();
-        manager.createOnDeviceTranslator(translationContext, r -> r.run(),
-                translator -> {
-                    createTranslatorLatch.countDown();
-                    translatorRef.set(translator);
-                });
-
-        createTranslatorLatch.await(5_000, TimeUnit.MILLISECONDS);
-        final Translator translator = translatorRef.get();
+        final Translator translator = createTranslator(manager, createTranslationContext());
 
         try {
             mServiceWatcher.waitOnConnected();
@@ -337,13 +307,13 @@
 
         final CountDownLatch translationLatch = new CountDownLatch(2);
         final AtomicReference<List<TranslationResponse>> responsesRef = new AtomicReference<>();
-        responsesRef.set(new ArrayList<TranslationResponse>());
+        responsesRef.set(new ArrayList<>());
         final ArrayList<TranslationRequestValue> values = new ArrayList<>();
         values.add(TranslationRequestValue.forText("hello world"));
         translator.translate(new TranslationRequest.Builder()
                         .setTranslationRequestValues(values)
                         .setFlags(TranslationRequest.FLAG_PARTIAL_RESPONSES)
-                        .build(), new CancellationSignal(), (r) -> r.run(),
+                        .build(), new CancellationSignal(), Runnable::run,
                 translationResponse -> {
                     responsesRef.getAndUpdate(responses -> {
                         responses.add(translationResponse);
@@ -400,7 +370,7 @@
     }
 
     @Test
-    public void testTranslationCancelled() throws Exception{
+    public void testTranslationCancelled() throws Exception {
         enableCtsTranslationService();
 
         final TranslationManager manager = sContext.getSystemService(TranslationManager.class);
@@ -413,27 +383,7 @@
                                 .build())
                         .build());
 
-        final CountDownLatch translationLatch = new CountDownLatch(1);
-        final AtomicReference<TranslationResponse> responseRef = new AtomicReference<>();
-
-        final TranslationContext translationContext = new TranslationContext.Builder(
-                new TranslationSpec(ULocale.ENGLISH, TranslationSpec.DATA_FORMAT_TEXT),
-                new TranslationSpec(ULocale.FRENCH, TranslationSpec.DATA_FORMAT_TEXT))
-                .build();
-
-        final CountDownLatch createTranslatorLatch = new CountDownLatch(1);
-        final AtomicReference<Translator> translatorRef = new AtomicReference<>();
-        manager.createOnDeviceTranslator(translationContext, r -> r.run(),
-                new Consumer<Translator>() {
-                    @Override
-                    public void accept(Translator translator) {
-                        createTranslatorLatch.countDown();
-                        translatorRef.set(translator);
-                    }
-                });
-
-        createTranslatorLatch.await(5_000, TimeUnit.MILLISECONDS);
-        final Translator translator = translatorRef.get();
+        final Translator translator = createTranslator(manager, createTranslationContext());
 
         try {
             mServiceWatcher.waitOnConnected();
@@ -443,21 +393,19 @@
 
         assertThat(translator.isDestroyed()).isFalse();
 
-        final Consumer<TranslationResponse> callback = new Consumer<TranslationResponse>() {
-            @Override
-            public void accept(TranslationResponse translationResponse) {
-                responseRef.set(translationResponse);
-                translationLatch.countDown();
-            }
-        };
-
         final CancellationSignal cancellationSignal = new CancellationSignal();
 
+        final CountDownLatch translationLatch = new CountDownLatch(1);
+        final AtomicReference<TranslationResponse> responseRef = new AtomicReference<>();
         final ArrayList<TranslationRequestValue> values = new ArrayList<>();
         values.add(TranslationRequestValue.forText("hello world"));
         translator.translate(new TranslationRequest.Builder()
-                .setTranslationRequestValues(values)
-                .build(), cancellationSignal, (r) -> r.run(), callback);
+                        .setTranslationRequestValues(values)
+                        .build(), cancellationSignal, Runnable::run,
+                translationResponse -> {
+                    responseRef.set(translationResponse);
+                    translationLatch.countDown();
+                });
 
         // TODO: implement with cancellation signal listener
         // cancel translation request
@@ -475,7 +423,7 @@
     }
 
     @Test
-    public void testGetTranslationCapabilities() throws Exception{
+    public void testGetTranslationCapabilities() throws Exception {
         enableCtsTranslationService();
 
         final TranslationManager manager = sContext.getSystemService(TranslationManager.class);
@@ -507,7 +455,7 @@
     }
 
     @Test
-    public void testGetTranslationSettingsActivityIntent() throws Exception{
+    public void testGetTranslationSettingsActivityIntent() throws Exception {
         enableCtsTranslationService();
 
         final TranslationManager manager = sContext.getSystemService(TranslationManager.class);
@@ -527,6 +475,41 @@
         watcher.waitFor(RESUMED);
     }
 
+    @Test
+    public void testTranslatorsAreNotCached() throws Exception {
+        enableCtsTranslationService();
+
+        final TranslationManager manager = sContext.getSystemService(TranslationManager.class);
+
+        final TranslationContext translationContext = createTranslationContext();
+        final Translator translator1 = createTranslator(manager, translationContext);
+        final Translator translator2 = createTranslator(manager, translationContext);
+
+        assertWithMessage("The same Translator was returned for the same TranslationContext")
+                .that(translator1).isNotEqualTo(translator2);
+    }
+
+    private TranslationContext createTranslationContext() {
+        return new TranslationContext.Builder(
+                new TranslationSpec(ULocale.ENGLISH, TranslationSpec.DATA_FORMAT_TEXT),
+                new TranslationSpec(ULocale.FRENCH, TranslationSpec.DATA_FORMAT_TEXT))
+                .build();
+    }
+
+    private Translator createTranslator(@NonNull TranslationManager manager,
+            @NonNull TranslationContext translationContext) throws Exception {
+        final CountDownLatch createTranslatorLatch = new CountDownLatch(1);
+        final AtomicReference<Translator> translatorRef = new AtomicReference<>();
+        manager.createOnDeviceTranslator(translationContext, Runnable::run,
+                translator -> {
+                    createTranslatorLatch.countDown();
+                    translatorRef.set(translator);
+                });
+
+        createTranslatorLatch.await(5_000, TimeUnit.MILLISECONDS);
+        return translatorRef.get();
+    }
+
     //TODO(183605243): add test for cancelling translation.
 
     protected void enableCtsTranslationService() {
diff --git a/tests/translation/src/android/translation/cts/TranslationTestWatcher.java b/tests/translation/src/android/translation/cts/TranslationTestWatcher.java
new file mode 100644
index 0000000..ba80df2
--- /dev/null
+++ b/tests/translation/src/android/translation/cts/TranslationTestWatcher.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2021 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 android.translation.cts;
+
+import android.util.Log;
+
+import com.android.compatibility.common.util.TestNameUtils;
+
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
+
+/**
+ * Custom {@link TestWatcher} that  used for UiTranslationManagerTest.
+ */
+public final class TranslationTestWatcher extends TestWatcher {
+
+    private static final String TAG = "TranslationTestWatcher";
+
+    @Override
+    protected void starting(Description description) {
+        final String testName = description.getDisplayName();
+        Log.i(TAG, "Starting " + testName);
+        TestNameUtils.setCurrentTestName(testName);
+    }
+
+    @Override
+    protected void finished(Description description) {
+        final String testName = description.getDisplayName();
+        Log.i(TAG, "Finished " + testName);
+        TestNameUtils.setCurrentTestName(null);
+    }
+}
diff --git a/tests/translation/src/android/translation/cts/UiTranslationManagerTest.java b/tests/translation/src/android/translation/cts/UiTranslationManagerTest.java
index ca3c8ca..7a0d6f1 100644
--- a/tests/translation/src/android/translation/cts/UiTranslationManagerTest.java
+++ b/tests/translation/src/android/translation/cts/UiTranslationManagerTest.java
@@ -25,10 +25,11 @@
 import static android.translation.cts.Helper.ACTION_ASSERT_UI_TRANSLATION_CALLBACK_ON_START;
 import static android.translation.cts.Helper.ACTION_REGISTER_UI_TRANSLATION_CALLBACK;
 import static android.translation.cts.Helper.ACTION_UNREGISTER_UI_TRANSLATION_CALLBACK;
+import static android.translation.cts.Helper.EXTRA_CALL_COUNT;
 import static android.translation.cts.Helper.EXTRA_FINISH_COMMAND;
+import static android.translation.cts.Helper.EXTRA_PACKAGE_NAME;
 import static android.translation.cts.Helper.EXTRA_SOURCE_LOCALE;
 import static android.translation.cts.Helper.EXTRA_TARGET_LOCALE;
-import static android.translation.cts.Helper.EXTRA_VERIFY_RESULT;
 import static android.view.translation.TranslationResponseValue.STATUS_SUCCESS;
 
 import static com.android.compatibility.common.util.ShellUtils.runShellCommand;
@@ -59,6 +60,7 @@
 import android.view.autofill.AutofillId;
 import android.view.contentcapture.ContentCaptureContext;
 import android.view.inputmethod.InputMethodManager;
+import android.view.translation.TranslationContext;
 import android.view.translation.TranslationRequest;
 import android.view.translation.TranslationResponse;
 import android.view.translation.TranslationResponseValue;
@@ -82,6 +84,7 @@
 import com.android.compatibility.common.util.PollingCheck;
 import com.android.compatibility.common.util.RequiredServiceRule;
 import com.android.compatibility.common.util.SystemUtil;
+import com.android.compatibility.common.util.TestNameUtils;
 
 import org.junit.After;
 import org.junit.AfterClass;
@@ -116,11 +119,15 @@
 
     private static final String TAG = "UiTranslationManagerTest";
 
-    private static final long UI_WAIT_TIMEOUT = 2000;
+    private static final long UI_WAIT_TIMEOUT = 2500;
 
     // TODO: Use fw definition when it becomes public or testapi
     private static final String ID_CONTENT_DESCRIPTION = "android:content_description";
 
+    // TODO(b/225466478): This should have a different package from CtsTestIme
+    // Should be whatever package this class is in
+    private static final String CTS_TESTS_PACKAGE = "android.translation.cts";
+
     private static Context sContext;
     private static CtsTranslationService.TranslationReplier sTranslationReplier;
 
@@ -144,6 +151,9 @@
     public final RequiredServiceRule mTranslationServiceRule =
             new RequiredServiceRule(TRANSLATION_MANAGER_SERVICE);
 
+    @Rule
+    public final TranslationTestWatcher mTranslationTestWatcher = new TranslationTestWatcher();
+
     @BeforeClass
     public static void oneTimeSetup() {
         sContext = ApplicationProvider.getApplicationContext();
@@ -181,65 +191,77 @@
 
     @Test
     public void testUiTranslation() throws Throwable {
-        final Pair<List<AutofillId>, ContentCaptureContext> result =
-                enableServicesAndStartActivityForTranslation();
+        try {
+            final Pair<List<AutofillId>, ContentCaptureContext> result =
+                    enableServicesAndStartActivityForTranslation();
 
-        final CharSequence originalText = mTextView.getText();
-        final List<AutofillId> views = result.first;
-        final ContentCaptureContext contentCaptureContext = result.second;
+            final CharSequence originalText = mTextView.getText();
+            final List<AutofillId> views = result.first;
+            final ContentCaptureContext contentCaptureContext = result.second;
 
-        final String translatedText = "success";
-        final UiObject2 helloText = Helper.findObjectByResId(Helper.ACTIVITY_PACKAGE,
-                SimpleActivity.HELLO_TEXT_ID);
-        assertThat(helloText).isNotNull();
-        // Set response
-        final TranslationResponse response = createViewsTranslationResponse(views, translatedText);
-        sTranslationReplier.addResponse(response);
+            final String translatedText = "success";
+            final UiObject2 helloText = Helper.findObjectByResId(Helper.ACTIVITY_PACKAGE,
+                    SimpleActivity.HELLO_TEXT_ID);
+            assertThat(helloText).isNotNull();
+            // Set response
+            final TranslationResponse response =
+                    createViewsTranslationResponse(views, translatedText);
+            sTranslationReplier.addResponse(response);
 
-        startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
+            startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
 
-        // Check request
-        final TranslationRequest request = sTranslationReplier.getNextTranslationRequest();
-        final List<ViewTranslationRequest> requests = request.getViewTranslationRequests();
-        final ViewTranslationRequest viewRequest = requests.get(0);
-        assertThat(viewRequest.getAutofillId()).isEqualTo(views.get(0));
-        assertThat(viewRequest.getKeys().size()).isEqualTo(1);
-        assertThat(viewRequest.getKeys()).containsExactly(ViewTranslationRequest.ID_TEXT);
-        assertThat(viewRequest.getValue(ViewTranslationRequest.ID_TEXT).getText())
-                .isEqualTo(originalText.toString());
+            // Check request
+            final TranslationRequest request = sTranslationReplier.getNextTranslationRequest();
+            final List<ViewTranslationRequest> requests = request.getViewTranslationRequests();
+            final ViewTranslationRequest viewRequest = requests.get(0);
+            assertThat(viewRequest.getAutofillId()).isEqualTo(views.get(0));
+            assertThat(viewRequest.getKeys().size()).isEqualTo(1);
+            assertThat(viewRequest.getKeys()).containsExactly(ViewTranslationRequest.ID_TEXT);
+            assertThat(viewRequest.getValue(ViewTranslationRequest.ID_TEXT).getText())
+                    .isEqualTo(originalText.toString());
+            CtsTranslationService translationService =
+                    mTranslationServiceServiceWatcher.getService();
+            TranslationContext translationContext = translationService.getTranslationContext();
+            assertThat(translationContext).isNotNull();
+            assertThat(translationContext.getActivityId()).isNotNull();
+            assertThat(translationContext.getActivityId())
+                    .isEqualTo(contentCaptureContext.getActivityId());
 
-        assertThat(helloText.getText()).isEqualTo(translatedText);
-        assertThat(mTextView.getViewTranslationResponse())
-                .isEqualTo(response.getViewTranslationResponses().get(0));
+            assertThat(helloText.getText()).isEqualTo(translatedText);
+            assertThat(mTextView.getViewTranslationResponse())
+                    .isEqualTo(response.getViewTranslationResponses().get(0));
 
-        pauseUiTranslation(contentCaptureContext);
+            pauseUiTranslation(contentCaptureContext);
 
-        assertThat(helloText.getText()).isEqualTo(originalText.toString());
+            assertThat(helloText.getText()).isEqualTo(originalText.toString());
 
-        resumeUiTranslation(contentCaptureContext);
+            resumeUiTranslation(contentCaptureContext);
 
-        assertThat(helloText.getText()).isEqualTo(translatedText);
+            assertThat(helloText.getText()).isEqualTo(translatedText);
 
-        finishUiTranslation(contentCaptureContext);
+            finishUiTranslation(contentCaptureContext);
 
-        assertThat(helloText.getText()).isEqualTo(originalText.toString());
+            assertThat(helloText.getText()).isEqualTo(originalText.toString());
 
-        // Check the Translation session is destroyed after calling finishTranslation()
-        CtsTranslationService translationService =
-                mTranslationServiceServiceWatcher.getService();
-        translationService.awaitSessionDestroyed();
+            // Check the Translation session is destroyed after calling finishTranslation()
+            translationService.awaitSessionDestroyed();
 
-        // Test re-translating.
-        sTranslationReplier.addResponse(createViewsTranslationResponse(views, translatedText));
+            // Test re-translating.
+            sTranslationReplier.addResponse(createViewsTranslationResponse(views, translatedText));
 
-        startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
+            startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
 
-        assertThat(helloText.getText()).isEqualTo(translatedText);
+            assertThat(helloText.getText()).isEqualTo(translatedText);
 
-        // Also make sure pausing still works.
-        pauseUiTranslation(contentCaptureContext);
+            // Also make sure pausing still works.
+            pauseUiTranslation(contentCaptureContext);
 
-        assertThat(helloText.getText()).isEqualTo(originalText.toString());
+            assertThat(helloText.getText()).isEqualTo(originalText.toString());
+        } catch (Throwable t) {
+            Helper.takeScreenshotAndSave(sContext, TestNameUtils.getCurrentTestName(),
+                    Helper.LOCAL_TEST_FILES_DIR);
+            throw t;
+        }
     }
 
     @Test
@@ -297,6 +319,7 @@
     }
 
     @Test
+    @FlakyTest(bugId = 192418800)
     public void testPauseUiTranslationThenStartUiTranslation() throws Throwable {
         final Pair<List<AutofillId>, ContentCaptureContext> result =
                 enableServicesAndStartActivityForTranslation();
@@ -345,19 +368,22 @@
         startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
 
         ArgumentCaptor<View> viewArgumentCaptor = ArgumentCaptor.forClass(View.class);
-        Mockito.verify(mockCallback, Mockito.times(1)).onShowTranslation(viewArgumentCaptor.capture());
+        Mockito.verify(mockCallback, Mockito.times(1)).onShowTranslation(
+                viewArgumentCaptor.capture());
         TextView capturedView = (TextView) viewArgumentCaptor.getValue();
         assertThat(capturedView.getAutofillId()).isEqualTo(mTextView.getAutofillId());
 
         pauseUiTranslation(contentCaptureContext);
 
-        Mockito.verify(mockCallback, Mockito.times(1)).onHideTranslation(viewArgumentCaptor.capture());
+        Mockito.verify(mockCallback, Mockito.times(1)).onHideTranslation(
+                viewArgumentCaptor.capture());
         capturedView = (TextView) viewArgumentCaptor.getValue();
         assertThat(capturedView.getAutofillId()).isEqualTo(mTextView.getAutofillId());
 
         resumeUiTranslation(contentCaptureContext);
 
-        Mockito.verify(mockCallback, Mockito.times(2)).onShowTranslation(viewArgumentCaptor.capture());
+        Mockito.verify(mockCallback, Mockito.times(2)).onShowTranslation(
+                viewArgumentCaptor.capture());
         capturedView = (TextView) viewArgumentCaptor.getValue();
         assertThat(capturedView.getAutofillId()).isEqualTo(mTextView.getAutofillId());
 
@@ -378,82 +404,94 @@
     @Test
     @FlakyTest(bugId = 192418800)
     public void testUiTranslation_ViewTranslationCallback_paddingText() throws Throwable {
-        final Pair<List<AutofillId>, ContentCaptureContext> result =
-                enableServicesAndStartActivityForTranslation();
-        final List<AutofillId> views = result.first;
-        final ContentCaptureContext contentCaptureContext = result.second;
+        try {
+            final Pair<List<AutofillId>, ContentCaptureContext> result =
+                    enableServicesAndStartActivityForTranslation();
+            final List<AutofillId> views = result.first;
+            final ContentCaptureContext contentCaptureContext = result.second;
 
-        // Set response
-        final CharSequence originalText = mTextView.getText();
-        final CharSequence translatedText = "Translated World";
-        sTranslationReplier.addResponse(
-                createViewsTranslationResponse(views, translatedText.toString()));
+            // Set response
+            final CharSequence originalText = mTextView.getText();
+            final CharSequence translatedText = "Translated World";
+            sTranslationReplier.addResponse(
+                    createViewsTranslationResponse(views, translatedText.toString()));
 
-        // Use TextView default ViewTranslationCallback implementation
-        startUiTranslation(/* shouldPadContent */ true, views, contentCaptureContext);
+            // Use TextView default ViewTranslationCallback implementation
+            startUiTranslation(/* shouldPadContent */ true, views, contentCaptureContext);
 
-        CharSequence currentText = mTextView.getText();
-        assertThat(currentText.length()).isNotEqualTo(originalText.length());
-        assertThat(currentText.length()).isEqualTo(translatedText.length());
+            CharSequence currentText = mTextView.getText();
+            assertThat(currentText.length()).isNotEqualTo(originalText.length());
+            assertThat(currentText.length()).isEqualTo(translatedText.length());
 
-        finishUiTranslation(contentCaptureContext);
+            finishUiTranslation(contentCaptureContext);
 
-        // Set Customized ViewTranslationCallback
-        ViewTranslationCallback mockCallback = Mockito.mock(ViewTranslationCallback.class);
-        mTextView.setViewTranslationCallback(mockCallback);
+            // Set Customized ViewTranslationCallback
+            ViewTranslationCallback mockCallback = Mockito.mock(ViewTranslationCallback.class);
+            mTextView.setViewTranslationCallback(mockCallback);
 
-        startUiTranslation(/* shouldPadContent */ true, views, contentCaptureContext);
+            startUiTranslation(/* shouldPadContent */ true, views, contentCaptureContext);
 
-        assertThat(mTextView.getText().length()).isEqualTo(originalText.length());
+            assertThat(mTextView.getText().length()).isEqualTo(originalText.length());
+        } catch (Throwable t) {
+            Helper.takeScreenshotAndSave(sContext, TestNameUtils.getCurrentTestName(),
+                    Helper.LOCAL_TEST_FILES_DIR);
+            throw t;
+        }
     }
 
     @Test
     public void testUiTranslation_hasContentDescription() throws Throwable {
-        final Pair<List<AutofillId>, ContentCaptureContext> result =
-                enableServicesAndStartActivityForTranslation();
-        final List<AutofillId> views = result.first;
-        final ContentCaptureContext contentCaptureContext = result.second;
+        try {
+            final Pair<List<AutofillId>, ContentCaptureContext> result =
+                    enableServicesAndStartActivityForTranslation();
+            final List<AutofillId> views = result.first;
+            final ContentCaptureContext contentCaptureContext = result.second;
 
-        // Set response
-        final CharSequence translatedText = "Translated World";
-        final CharSequence originalDescription = "Hello Description";
-        mActivityScenario.onActivity(activity -> {
-            mTextView.setContentDescription(originalDescription);
-        });
-        sTranslationReplier.addResponse(
-                createViewsTranslationResponse(views, translatedText.toString()));
+            // Set response
+            final CharSequence translatedText = "Translated World";
+            final CharSequence originalDescription = "Hello Description";
+            mActivityScenario.onActivity(activity -> {
+                mTextView.setContentDescription(originalDescription);
+            });
+            sTranslationReplier.addResponse(
+                    createViewsTranslationResponse(views, translatedText.toString()));
 
-        // Use TextView default ViewTranslationCallback implementation
-        startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
+            // Use TextView default ViewTranslationCallback implementation
+            startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
 
-        assertThat(mTextView.getContentDescription().toString())
-                .isEqualTo(translatedText.toString());
+            assertThat(mTextView.getContentDescription().toString())
+                    .isEqualTo(translatedText.toString());
 
-        // Check request to make sure the content description key doesn't be changed
-        final TranslationRequest request = sTranslationReplier.getNextTranslationRequest();
-        final List<ViewTranslationRequest> requests = request.getViewTranslationRequests();
-        final ViewTranslationRequest viewRequest = requests.get(0);
-        assertThat(viewRequest.getAutofillId()).isEqualTo(views.get(0));
-        assertThat(viewRequest.getKeys().size()).isEqualTo(2);
-        assertThat(viewRequest.getKeys()).containsExactly(ID_CONTENT_DESCRIPTION,
-                ViewTranslationRequest.ID_TEXT);
-        assertThat(viewRequest.getValue(ID_CONTENT_DESCRIPTION).getText())
-                .isEqualTo(originalDescription);
+            // Check request to make sure the content description key doesn't be changed
+            final TranslationRequest request = sTranslationReplier.getNextTranslationRequest();
+            final List<ViewTranslationRequest> requests = request.getViewTranslationRequests();
+            final ViewTranslationRequest viewRequest = requests.get(0);
+            assertThat(viewRequest.getAutofillId()).isEqualTo(views.get(0));
+            assertThat(viewRequest.getKeys().size()).isEqualTo(2);
+            assertThat(viewRequest.getKeys()).containsExactly(ID_CONTENT_DESCRIPTION,
+                    ViewTranslationRequest.ID_TEXT);
+            assertThat(viewRequest.getValue(ID_CONTENT_DESCRIPTION).getText())
+                    .isEqualTo(originalDescription);
 
-        pauseUiTranslation(contentCaptureContext);
+            pauseUiTranslation(contentCaptureContext);
 
-        assertThat(mTextView.getContentDescription().toString())
-                .isEqualTo(originalDescription.toString());
+            assertThat(mTextView.getContentDescription().toString())
+                    .isEqualTo(originalDescription.toString());
 
-        resumeUiTranslation(contentCaptureContext);
+            resumeUiTranslation(contentCaptureContext);
 
-        assertThat(mTextView.getContentDescription().toString())
-                .isEqualTo(translatedText.toString());
+            assertThat(mTextView.getContentDescription().toString())
+                    .isEqualTo(translatedText.toString());
 
-        finishUiTranslation(contentCaptureContext);
+            finishUiTranslation(contentCaptureContext);
 
-        assertThat(mTextView.getContentDescription().toString())
-                .isEqualTo(originalDescription.toString());
+            assertThat(mTextView.getContentDescription().toString())
+                    .isEqualTo(originalDescription.toString());
+        } catch (Throwable t) {
+            Helper.takeScreenshotAndSave(sContext, TestNameUtils.getCurrentTestName(),
+                    Helper.LOCAL_TEST_FILES_DIR);
+            throw t;
+        }
     }
 
     @Test
@@ -485,8 +523,12 @@
                     (ULocale) onStartIntent.getSerializableExtra(EXTRA_SOURCE_LOCALE);
             ULocale receivedTarget =
                     (ULocale) onStartIntent.getSerializableExtra(EXTRA_TARGET_LOCALE);
+            int startedCallCount = onStartIntent.getIntExtra(EXTRA_CALL_COUNT, -999);
+            String startedPackageName = onStartIntent.getStringExtra(EXTRA_PACKAGE_NAME);
             assertThat(receivedSource).isEqualTo(ULocale.ENGLISH);
             assertThat(receivedTarget).isEqualTo(ULocale.FRENCH);
+            assertThat(startedCallCount).isEqualTo(1);
+            assertThat(startedPackageName).isEqualTo(CTS_TESTS_PACKAGE);
             onStartResultReceiver.unregisterQuietly();
 
             pauseUiTranslation(contentCaptureContext);
@@ -496,9 +538,10 @@
                     ACTION_ASSERT_UI_TRANSLATION_CALLBACK_ON_PAUSE, true);
             // Get result to check the onPaused() was called
             Intent onPausedIntent = onPausedResultReceiver.awaitForBroadcast();
-            boolean onPausedVerifyResult =
-                    onPausedIntent.getBooleanExtra(EXTRA_VERIFY_RESULT, false);
-            assertThat(onPausedVerifyResult).isTrue();
+            int pausedCallCount = onPausedIntent.getIntExtra(EXTRA_CALL_COUNT, -999);
+            String pausedPackageName = onPausedIntent.getStringExtra(EXTRA_PACKAGE_NAME);
+            assertThat(pausedCallCount).isEqualTo(1);
+            assertThat(pausedPackageName).isEqualTo(CTS_TESTS_PACKAGE);
             onPausedResultReceiver.unregisterQuietly();
 
             resumeUiTranslation(contentCaptureContext);
@@ -508,9 +551,10 @@
                     ACTION_ASSERT_UI_TRANSLATION_CALLBACK_ON_RESUME, true);
             // Get result to check the onResumed was called
             Intent onResumedIntent = onResumedResultReceiver.awaitForBroadcast();
-            boolean onResumedVerifyResult =
-                    onResumedIntent.getBooleanExtra(EXTRA_VERIFY_RESULT, false);
-            assertThat(onResumedVerifyResult).isTrue();
+            int resumedCallCount = onResumedIntent.getIntExtra(EXTRA_CALL_COUNT, -999);
+            String resumedPackageName = onResumedIntent.getStringExtra(EXTRA_PACKAGE_NAME);
+            assertThat(resumedCallCount).isEqualTo(1);
+            assertThat(resumedPackageName).isEqualTo(CTS_TESTS_PACKAGE);
             onResumedResultReceiver.unregisterQuietly();
 
             // Send broadcast to request IME to unregister callback
@@ -523,11 +567,12 @@
 
             BlockingBroadcastReceiver onFinishResultReceiver =
                     sendCommandToIme(ACTION_ASSERT_UI_TRANSLATION_CALLBACK_ON_FINISH, true);
-            // Get result to check onFinish() didn't be called.
+            // Get result to check onFinish() isn't called.
             Intent onFinishIntent = onFinishResultReceiver.awaitForBroadcast();
-            boolean onFinishVerifyResult =
-                    onFinishIntent.getBooleanExtra(EXTRA_VERIFY_RESULT, true);
-            assertThat(onFinishVerifyResult).isFalse();
+            int finishedCallCount = onFinishIntent.getIntExtra(EXTRA_CALL_COUNT, -999);
+            String finishedPackageName = onFinishIntent.getStringExtra(EXTRA_PACKAGE_NAME);
+            assertThat(finishedCallCount).isEqualTo(0);
+            assertThat(finishedPackageName).isNull();
             onFinishResultReceiver.unregisterQuietly();
 
             // TODO(b/191417938): add tests for the Activity destroyed for IME package callback
@@ -557,23 +602,212 @@
         // TODO(b/191417938): add tests for the Activity isn't the same package of the
         //  registered callback app
         Mockito.verify(mockCallback, Mockito.times(1))
-                .onStarted(any(ULocale.class), any(ULocale.class));
+                .onStarted(any(ULocale.class), any(ULocale.class), any(String.class));
+
+        pauseUiTranslation(contentCaptureContext);
+
+        Mockito.verify(mockCallback, Mockito.times(1)).onPaused(any(String.class));
+
+        resumeUiTranslation(contentCaptureContext);
+
+        Mockito.verify(mockCallback, Mockito.times(1))
+                .onResumed(any(ULocale.class), any(ULocale.class), any(String.class));
 
         finishUiTranslation(contentCaptureContext);
 
-        Mockito.verify(mockCallback, Mockito.times(1))
-                .onFinished();
+        Mockito.verify(mockCallback, Mockito.times(1)).onFinished(any(String.class));
 
         // Make sure onFinished will not be called twice.
         mActivityScenario.moveToState(Lifecycle.State.DESTROYED);
         mActivityScenario = null;
-        Mockito.verify(mockCallback, Mockito.times(1))
-                .onFinished();
+        SystemClock.sleep(UI_WAIT_TIMEOUT);
+        Mockito.verify(mockCallback, Mockito.times(1)).onFinished(any(String.class));
 
         // TODO(b/191417938): add a test to verify startUiTranslation + Activity destroyed.
     }
 
     @Test
+    public void testCallbackRegisteredAfterTranslationStarted() throws Throwable {
+        final Pair<List<AutofillId>, ContentCaptureContext> result =
+                enableServicesAndStartActivityForTranslation();
+
+        final List<AutofillId> views = result.first;
+        final ContentCaptureContext contentCaptureContext = result.second;
+
+        UiTranslationManager manager =
+                sContext.getSystemService(UiTranslationManager.class);
+        // Set response
+        sTranslationReplier.addResponse(createViewsTranslationResponse(views, "success"));
+
+        startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
+
+        // Register callback
+        final Executor executor = Executors.newSingleThreadExecutor();
+        UiTranslationStateCallback mockCallback = Mockito.mock(UiTranslationStateCallback.class);
+        manager.registerUiTranslationStateCallback(executor, mockCallback);
+        SystemClock.sleep(UI_WAIT_TIMEOUT);
+
+        // Callback should receive onStarted.
+        Mockito.verify(mockCallback, Mockito.times(1))
+                .onStarted(any(ULocale.class), any(ULocale.class), any(String.class));
+
+        pauseUiTranslation(contentCaptureContext);
+
+        Mockito.verify(mockCallback, Mockito.times(1)).onPaused(any(String.class));
+
+        resumeUiTranslation(contentCaptureContext);
+
+        Mockito.verify(mockCallback, Mockito.times(1))
+                .onResumed(any(ULocale.class), any(ULocale.class), any(String.class));
+
+        finishUiTranslation(contentCaptureContext);
+
+        Mockito.verify(mockCallback, Mockito.times(1)).onFinished(any(String.class));
+
+        // Make sure onFinished will not be called twice.
+        mActivityScenario.moveToState(Lifecycle.State.DESTROYED);
+        mActivityScenario = null;
+        SystemClock.sleep(UI_WAIT_TIMEOUT);
+        Mockito.verify(mockCallback, Mockito.times(1)).onFinished(any(String.class));
+    }
+
+    @Test
+    public void testCallbackRegisteredAfterTranslationStartedAndPaused() throws Throwable {
+        final Pair<List<AutofillId>, ContentCaptureContext> result =
+                enableServicesAndStartActivityForTranslation();
+
+        final List<AutofillId> views = result.first;
+        final ContentCaptureContext contentCaptureContext = result.second;
+
+        UiTranslationManager manager =
+                sContext.getSystemService(UiTranslationManager.class);
+        // Set response
+        sTranslationReplier.addResponse(createViewsTranslationResponse(views, "success"));
+
+        startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
+
+        pauseUiTranslation(contentCaptureContext);
+
+        // Register callback
+        final Executor executor = Executors.newSingleThreadExecutor();
+        UiTranslationStateCallback mockCallback = Mockito.mock(UiTranslationStateCallback.class);
+        manager.registerUiTranslationStateCallback(executor, mockCallback);
+        SystemClock.sleep(UI_WAIT_TIMEOUT);
+
+        // Callback should receive onStarted and onPaused events.
+        Mockito.verify(mockCallback, Mockito.times(1))
+                .onStarted(any(ULocale.class), any(ULocale.class), any(String.class));
+
+        Mockito.verify(mockCallback, Mockito.times(1)).onPaused(any(String.class));
+
+        resumeUiTranslation(contentCaptureContext);
+
+        Mockito.verify(mockCallback, Mockito.times(1))
+                .onResumed(any(ULocale.class), any(ULocale.class), any(String.class));
+
+        finishUiTranslation(contentCaptureContext);
+
+        Mockito.verify(mockCallback, Mockito.times(1)).onFinished(any(String.class));
+
+        // Make sure onFinished will not be called twice.
+        mActivityScenario.moveToState(Lifecycle.State.DESTROYED);
+        mActivityScenario = null;
+        SystemClock.sleep(UI_WAIT_TIMEOUT);
+        Mockito.verify(mockCallback, Mockito.times(1)).onFinished(any(String.class));
+    }
+
+    @Test
+    public void testCallbackRegisteredAfterTranslationStartedPausedAndResumed() throws Throwable {
+        final Pair<List<AutofillId>, ContentCaptureContext> result =
+                enableServicesAndStartActivityForTranslation();
+
+        final List<AutofillId> views = result.first;
+        final ContentCaptureContext contentCaptureContext = result.second;
+
+        UiTranslationManager manager =
+                sContext.getSystemService(UiTranslationManager.class);
+        // Set response
+        sTranslationReplier.addResponse(createViewsTranslationResponse(views, "success"));
+
+        startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
+
+        pauseUiTranslation(contentCaptureContext);
+
+        resumeUiTranslation(contentCaptureContext);
+
+        // Register callback
+        final Executor executor = Executors.newSingleThreadExecutor();
+        UiTranslationStateCallback mockCallback = Mockito.mock(UiTranslationStateCallback.class);
+        manager.registerUiTranslationStateCallback(executor, mockCallback);
+        SystemClock.sleep(UI_WAIT_TIMEOUT);
+
+        // Callback should receive onStarted event but NOT an onPaused event, because translation
+        // was already resumed prior to registration.
+        Mockito.verify(mockCallback, Mockito.times(1))
+                .onStarted(any(ULocale.class), any(ULocale.class), any(String.class));
+
+        Mockito.verify(mockCallback, Mockito.never()).onPaused(any(String.class));
+
+        Mockito.verify(mockCallback, Mockito.never())
+                .onResumed(any(ULocale.class), any(ULocale.class), any(String.class));
+
+        finishUiTranslation(contentCaptureContext);
+
+        Mockito.verify(mockCallback, Mockito.times(1)).onFinished(any(String.class));
+
+        // Make sure onFinished will not be called twice.
+        mActivityScenario.moveToState(Lifecycle.State.DESTROYED);
+        mActivityScenario = null;
+        SystemClock.sleep(UI_WAIT_TIMEOUT);
+        Mockito.verify(mockCallback, Mockito.times(1)).onFinished(any(String.class));
+    }
+
+    @Test
+    public void testCallbackRegisteredAfterTranslationFinished() throws Throwable {
+        final Pair<List<AutofillId>, ContentCaptureContext> result =
+                enableServicesAndStartActivityForTranslation();
+
+        final List<AutofillId> views = result.first;
+        final ContentCaptureContext contentCaptureContext = result.second;
+
+        UiTranslationManager manager =
+                sContext.getSystemService(UiTranslationManager.class);
+        // Set response
+        sTranslationReplier.addResponse(createViewsTranslationResponse(views, "success"));
+
+        startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
+
+        pauseUiTranslation(contentCaptureContext);
+
+        resumeUiTranslation(contentCaptureContext);
+
+        finishUiTranslation(contentCaptureContext);
+
+        // Register callback
+        final Executor executor = Executors.newSingleThreadExecutor();
+        UiTranslationStateCallback mockCallback = Mockito.mock(UiTranslationStateCallback.class);
+        manager.registerUiTranslationStateCallback(executor, mockCallback);
+        SystemClock.sleep(UI_WAIT_TIMEOUT);
+
+        // Callback should receive no events.
+        Mockito.verify(mockCallback, Mockito.never())
+                .onStarted(any(ULocale.class), any(ULocale.class), any(String.class));
+
+        Mockito.verify(mockCallback, Mockito.never()).onPaused(any(String.class));
+
+        Mockito.verify(mockCallback, Mockito.never())
+                .onResumed(any(ULocale.class), any(ULocale.class), any(String.class));
+
+        Mockito.verify(mockCallback, Mockito.never()).onFinished(any(String.class));
+
+        // Make sure onFinished will not be called at all.
+        mActivityScenario.moveToState(Lifecycle.State.DESTROYED);
+        mActivityScenario = null;
+        SystemClock.sleep(UI_WAIT_TIMEOUT);
+        Mockito.verify(mockCallback, Mockito.never()).onFinished(any(String.class));
+    }
+
+    @Test
     public void testVirtualViewUiTranslation() throws Throwable {
         // Enable CTS ContentCaptureService
         CtsContentCaptureService contentcaptureService = enableContentCaptureService();
@@ -644,68 +878,80 @@
 
     @Test
     public void testUiTranslation_translationResponseNotSetForCustomTextView() throws Throwable {
-        // Enable CTS ContentCaptureService
-        CtsContentCaptureService contentcaptureService = enableContentCaptureService();
-        // Start Activity and get needed information
-        final List<AutofillId> views = startCustomTextViewActivityAndGetViewsForTranslation();
+        try {
+            // Enable CTS ContentCaptureService
+            CtsContentCaptureService contentcaptureService = enableContentCaptureService();
+            // Start Activity and get needed information
+            final List<AutofillId> views = startCustomTextViewActivityAndGetViewsForTranslation();
 
-        // Wait session created and get the ConttCaptureContext from ContentCaptureService
-        final ContentCaptureContext contentCaptureContext =
-                getContentCaptureContextFromContentCaptureService(contentcaptureService);
+            // Wait session created and get the ConttCaptureContext from ContentCaptureService
+            final ContentCaptureContext contentCaptureContext =
+                    getContentCaptureContextFromContentCaptureService(contentcaptureService);
 
-        // enable CTS TranslationService
-        mTranslationServiceServiceWatcher = CtsTranslationService.setServiceWatcher();
-        Helper.setTemporaryTranslationService(CtsTranslationService.SERVICE_NAME);
+            // enable CTS TranslationService
+            mTranslationServiceServiceWatcher = CtsTranslationService.setServiceWatcher();
+            Helper.setTemporaryTranslationService(CtsTranslationService.SERVICE_NAME);
 
-        // Set response
-        final TranslationResponse expectedResponse =
-                createViewsTranslationResponse(views, "success");
-        sTranslationReplier.addResponse(expectedResponse);
+            // Set response
+            final TranslationResponse expectedResponse =
+                    createViewsTranslationResponse(views, "success");
+            sTranslationReplier.addResponse(expectedResponse);
 
-        startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
+            startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
 
-        // Verify result. Translation response doesn't set, it should show original text
-        assertThat(mResponseNotSetTextView.getSavedResponse()).isNotNull();
-        final UiObject2 responseNotSetText = Helper.findObjectByResId(Helper.ACTIVITY_PACKAGE,
-                CustomTextViewActivity.ID_RESPONSE_NOT_SET_TEXT);
-        assertThat(responseNotSetText).isNotNull();
-        assertThat(responseNotSetText.getText()).isEqualTo("Hello World 1");
+            // Verify result. Translation response doesn't set, it should show original text
+            assertThat(mResponseNotSetTextView.getSavedResponse()).isNotNull();
+            final UiObject2 responseNotSetText = Helper.findObjectByResId(Helper.ACTIVITY_PACKAGE,
+                    CustomTextViewActivity.ID_RESPONSE_NOT_SET_TEXT);
+            assertThat(responseNotSetText).isNotNull();
+            assertThat(responseNotSetText.getText()).isEqualTo("Hello World 1");
+        } catch (Throwable t) {
+            Helper.takeScreenshotAndSave(sContext, TestNameUtils.getCurrentTestName(),
+                    Helper.LOCAL_TEST_FILES_DIR);
+            throw t;
+        }
     }
 
     @Test
     @FlakyTest(bugId = 192418800)
     public void testUiTranslation_customTextView() throws Throwable {
-        // Enable CTS ContentCaptureService
-        CtsContentCaptureService contentcaptureService = enableContentCaptureService();
-        // Start Activity and get needed information
-        final List<AutofillId> views = startCustomTextViewActivityAndGetViewsForTranslation();
+        try {
+            // Enable CTS ContentCaptureService
+            CtsContentCaptureService contentcaptureService = enableContentCaptureService();
+            // Start Activity and get needed information
+            final List<AutofillId> views = startCustomTextViewActivityAndGetViewsForTranslation();
 
-        // Wait session created and get the ConttCaptureContext from ContentCaptureService
-        final ContentCaptureContext contentCaptureContext =
-                getContentCaptureContextFromContentCaptureService(contentcaptureService);
+            // Wait session created and get the ConttCaptureContext from ContentCaptureService
+            final ContentCaptureContext contentCaptureContext =
+                    getContentCaptureContextFromContentCaptureService(contentcaptureService);
 
-        // enable CTS TranslationService
-        mTranslationServiceServiceWatcher = CtsTranslationService.setServiceWatcher();
-        Helper.setTemporaryTranslationService(CtsTranslationService.SERVICE_NAME);
+            // enable CTS TranslationService
+            mTranslationServiceServiceWatcher = CtsTranslationService.setServiceWatcher();
+            Helper.setTemporaryTranslationService(CtsTranslationService.SERVICE_NAME);
 
-        final String translatedText = "success";
-        // Set response
-        final TranslationResponse expectedResponse =
-                createViewsTranslationResponse(views, translatedText);
-        sTranslationReplier.addResponse(expectedResponse);
+            final String translatedText = "success";
+            // Set response
+            final TranslationResponse expectedResponse =
+                    createViewsTranslationResponse(views, translatedText);
+            sTranslationReplier.addResponse(expectedResponse);
 
-        startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
+            startUiTranslation(/* shouldPadContent */ false, views, contentCaptureContext);
 
-        // Verify result.
-        assertThat(mCustomTextView.isMyTagTranslationSupported()).isTrue();
-        final UiObject2 customText = Helper.findObjectByResId(Helper.ACTIVITY_PACKAGE,
-                CustomTextViewActivity.ID_CUSTOM_TEXT);
-        assertThat(customText).isNotNull();
-        assertThat(customText.getText()).isEqualTo(translatedText);
+            // Verify result.
+            assertThat(mCustomTextView.isMyTagTranslationSupported()).isTrue();
+            final UiObject2 customText = Helper.findObjectByResId(Helper.ACTIVITY_PACKAGE,
+                    CustomTextViewActivity.ID_CUSTOM_TEXT);
+            assertThat(customText).isNotNull();
+            assertThat(customText.getText()).isEqualTo(translatedText);
 
-        finishUiTranslation(contentCaptureContext);
+            finishUiTranslation(contentCaptureContext);
 
-        assertThat(customText.getText()).isEqualTo("Hello World 2");
+            assertThat(customText.getText()).isEqualTo("Hello World 2");
+        } catch (Throwable t) {
+            Helper.takeScreenshotAndSave(sContext, TestNameUtils.getCurrentTestName(),
+                    Helper.LOCAL_TEST_FILES_DIR);
+            throw t;
+        }
     }
 
     private void startUiTranslation(boolean shouldPadContent, List<AutofillId> views,
@@ -762,7 +1008,7 @@
         mCustomTextViewActivityScenario.onActivity(activity -> {
             mResponseNotSetTextView = activity.getResponseNotSetText();
             mCustomTextView = activity.getCustomText();
-           // Get the views that need to be translated.
+            // Get the views that need to be translated.
             viewAutofillIdsRef.set(activity.getViewsForTranslation());
         });
         return viewAutofillIdsRef.get();
diff --git a/tests/uwb/Android.bp b/tests/uwb/Android.bp
index 7bcdc37..94a4f50 100644
--- a/tests/uwb/Android.bp
+++ b/tests/uwb/Android.bp
@@ -18,11 +18,15 @@
 
 android_test {
     name: "CtsUwbTestCases",
-    defaults: ["cts_defaults"],
+    defaults: [
+        "cts_defaults",
+        "framework-uwb-cts-defaults",
+    ],
     // Tag this module as a cts test artifact
     test_suites: [
         "cts",
         "general-tests",
+        "mts-uwb",
     ],
     libs: ["android.test.runner"],
     static_libs: [
@@ -30,6 +34,8 @@
         "ctstestrunner-axt",
         "compatibility-device-util-axt",
         "mockito-target-minus-junit4",
+        "com.uwb.support.fira",
+        "com.uwb.support.multichip",
     ],
     srcs: ["src/**/*.java"],
     platform_apis: true,
diff --git a/tests/uwb/AndroidTest.xml b/tests/uwb/AndroidTest.xml
index f0bb20a..3104ec5 100644
--- a/tests/uwb/AndroidTest.xml
+++ b/tests/uwb/AndroidTest.xml
@@ -19,6 +19,7 @@
     <option name="config-descriptor:metadata" key="parameter" value="instant_app" />
     <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
     <option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+    <option name="config-descriptor:metadata" key="mainline-param" value="com.google.android.uwb.apex" />
     <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsUwbTestCases.apk" />
@@ -26,4 +27,7 @@
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.uwb.cts" />
     </test>
+    <object type="module_controller" class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+        <option name="mainline-module-package-name" value="com.google.android.uwb" />
+    </object>
 </configuration>
diff --git a/tests/uwb/OWNERS b/tests/uwb/OWNERS
index 7ba57cf..c4ad416 100644
--- a/tests/uwb/OWNERS
+++ b/tests/uwb/OWNERS
@@ -1,5 +1,2 @@
-# Bug component: 898555
-bstack@google.com
-eliptus@google.com
-jsolnit@google.com
-zachoverflow@google.com
+# Bug component: 1042770
+include platform/packages/modules/Uwb:/OWNERS
diff --git a/tests/uwb/src/android/uwb/cts/RangingMeasurementTest.java b/tests/uwb/src/android/uwb/cts/RangingMeasurementTest.java
index d57a636..bc5c2fd 100644
--- a/tests/uwb/src/android/uwb/cts/RangingMeasurementTest.java
+++ b/tests/uwb/src/android/uwb/cts/RangingMeasurementTest.java
@@ -17,6 +17,7 @@
 package android.uwb.cts;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import android.os.Parcel;
@@ -38,6 +39,8 @@
 @SmallTest
 @RunWith(AndroidJUnit4.class)
 public class RangingMeasurementTest {
+    private static final int TEST_RSSI_DBM = -80;
+    private static final int INVALID_RSSI_DBM = -129;
 
     @Test
     public void testBuilder() {
@@ -45,7 +48,12 @@
         UwbAddress address = UwbTestUtils.getUwbAddress(false);
         long time = SystemClock.elapsedRealtimeNanos();
         AngleOfArrivalMeasurement angleMeasurement = UwbTestUtils.getAngleOfArrivalMeasurement();
+        AngleOfArrivalMeasurement destinationAngleMeasurement =
+                UwbTestUtils.getAngleOfArrivalMeasurement();
         DistanceMeasurement distanceMeasurement = UwbTestUtils.getDistanceMeasurement();
+        int los = RangingMeasurement.NLOS;
+        int measurementFocus = RangingMeasurement.MEASUREMENT_FOCUS_RANGE;
+
 
         RangingMeasurement.Builder builder = new RangingMeasurement.Builder();
 
@@ -58,17 +66,45 @@
         builder.setAngleOfArrivalMeasurement(angleMeasurement);
         tryBuild(builder, false);
 
+        builder.setDestinationAngleOfArrivalMeasurement(destinationAngleMeasurement);
+        tryBuild(builder, false);
+
         builder.setDistanceMeasurement(distanceMeasurement);
         tryBuild(builder, false);
 
+        builder.setRssiDbm(TEST_RSSI_DBM);
+        tryBuild(builder, false);
+
         builder.setRemoteDeviceAddress(address);
+        tryBuild(builder, true);
+
+        builder.setLineOfSight(los);
+        tryBuild(builder, true);
+
+        builder.setMeasurementFocus(measurementFocus);
         RangingMeasurement measurement = tryBuild(builder, true);
 
         assertEquals(status, measurement.getStatus());
         assertEquals(address, measurement.getRemoteDeviceAddress());
         assertEquals(time, measurement.getElapsedRealtimeNanos());
         assertEquals(angleMeasurement, measurement.getAngleOfArrivalMeasurement());
+        assertEquals(destinationAngleMeasurement,
+                measurement.getDestinationAngleOfArrivalMeasurement());
         assertEquals(distanceMeasurement, measurement.getDistanceMeasurement());
+        assertEquals(los, measurement.getLineOfSight());
+        assertEquals(measurementFocus, measurement.getMeasurementFocus());
+        assertEquals(TEST_RSSI_DBM, measurement.getRssiDbm());
+    }
+
+    @Test
+    public void testInvalidRssi() {
+        RangingMeasurement.Builder builder = new RangingMeasurement.Builder();
+        try {
+            builder.setRssiDbm(INVALID_RSSI_DBM);
+            fail("Expected RangingMeasurement.Builder.setRssiDbm() to fail");
+        } catch (Exception e) {
+            assertTrue(e.getMessage().contains("Invalid"));
+        }
     }
 
     private RangingMeasurement tryBuild(RangingMeasurement.Builder builder,
diff --git a/tests/uwb/src/android/uwb/cts/RangingSessionTest.java b/tests/uwb/src/android/uwb/cts/RangingSessionTest.java
index b9725f1..6fcdc74 100644
--- a/tests/uwb/src/android/uwb/cts/RangingSessionTest.java
+++ b/tests/uwb/src/android/uwb/cts/RangingSessionTest.java
@@ -16,6 +16,8 @@
 
 package android.uwb.cts;
 
+import static android.uwb.RangingSession.Callback.REASON_BAD_PARAMETERS;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -34,6 +36,7 @@
 import android.uwb.RangingReport;
 import android.uwb.RangingSession;
 import android.uwb.SessionHandle;
+import android.uwb.UwbAddress;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
@@ -53,6 +56,7 @@
 public class RangingSessionTest {
     private static final Executor EXECUTOR = UwbTestUtils.getExecutor();
     private static final PersistableBundle PARAMS = new PersistableBundle();
+    private static final UwbAddress UWB_ADDRESS = UwbAddress.fromBytes(new byte[] {0x00, 0x56});
     private static final @RangingSession.Callback.Reason int REASON =
             RangingSession.Callback.REASON_GENERIC_ERROR;
 
@@ -73,6 +77,29 @@
     }
 
     @Test
+    public void testOnRangingOpened_OnServiceDiscoveredConnectedCalled() {
+        SessionHandle handle = new SessionHandle(123);
+        RangingSession.Callback callback = mock(RangingSession.Callback.class);
+        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
+        verifyOpenState(session, false);
+
+        session.onRangingOpened();
+        verifyOpenState(session, true);
+
+        // Verify that the onOpenSuccess callback was invoked
+        verify(callback, times(1)).onOpened(eq(session));
+        verify(callback, times(0)).onClosed(anyInt(), any());
+
+        session.onServiceDiscovered(PARAMS);
+        verify(callback, times(1)).onServiceDiscovered(eq(PARAMS));
+
+        session.onServiceConnected(PARAMS);
+        verify(callback, times(1)).onServiceConnected(eq(PARAMS));
+    }
+
+
+    @Test
     public void testOnRangingOpened_CannotOpenClosedSession() {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
@@ -180,38 +207,146 @@
     }
 
     @Test
-    public void testReconfigure_OnlyWhenOpened() throws RemoteException {
+    public void testStop_CannotStopIfOpenFailed() throws RemoteException {
         SessionHandle handle = new SessionHandle(123);
         RangingSession.Callback callback = mock(RangingSession.Callback.class);
         IUwbAdapter adapter = mock(IUwbAdapter.class);
         RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
         doAnswer(new StartAnswer(session)).when(adapter).startRanging(any(), any());
+        doAnswer(new StopAnswer(session)).when(adapter).stopRanging(any());
+        session.onRangingOpened();
+        session.start(PARAMS);
+
+        verifyNoThrowIllegalState(() -> session.onRangingOpenFailed(REASON_BAD_PARAMETERS, PARAMS));
+        verify(callback, times(1)).onOpenFailed(
+                REASON_BAD_PARAMETERS, PARAMS);
+
+        // Calling stop again should throw an illegal state
+        verifyThrowIllegalState(session::stop);
+        verify(callback, times(0)).onStopped(anyInt(), any());
+    }
+
+    @Test
+    public void testCallbacks_OnlyWhenOpened() throws RemoteException {
+        SessionHandle handle = new SessionHandle(123);
+        RangingSession.Callback callback = mock(RangingSession.Callback.class);
+        IUwbAdapter adapter = mock(IUwbAdapter.class);
+        RangingSession session = new RangingSession(EXECUTOR, callback, adapter, handle);
+        doAnswer(new OpenAnswer(session)).when(adapter).openRanging(
+                any(), any(), any(), any(), any());
+        doAnswer(new StartAnswer(session)).when(adapter).startRanging(any(), any());
         doAnswer(new ReconfigureAnswer(session)).when(adapter).reconfigureRanging(any(), any());
+        doAnswer(new PauseAnswer(session)).when(adapter).pause(any(), any());
+        doAnswer(new ResumeAnswer(session)).when(adapter).resume(any(), any());
+        doAnswer(new ControleeAddAnswer(session)).when(adapter).addControlee(any(), any());
+        doAnswer(new ControleeRemoveAnswer(session)).when(adapter).removeControlee(any(), any());
+        doAnswer(new DataSendAnswer(session)).when(adapter).sendData(any(), any(), any(), any());
+        doAnswer(new StopAnswer(session)).when(adapter).stopRanging(any());
+        doAnswer(new CloseAnswer(session)).when(adapter).closeRanging(any());
 
         verifyThrowIllegalState(() -> session.reconfigure(PARAMS));
         verify(callback, times(0)).onReconfigured(any());
         verifyOpenState(session, false);
 
         session.onRangingOpened();
+        verifyOpenState(session, true);
+        verify(callback, times(1)).onOpened(any());
         verifyNoThrowIllegalState(() -> session.reconfigure(PARAMS));
         verify(callback, times(1)).onReconfigured(any());
+        verifyThrowIllegalState(() -> session.pause(PARAMS));
+        verify(callback, times(0)).onPaused(any());
+        verifyThrowIllegalState(() -> session.resume(PARAMS));
+        verify(callback, times(0)).onResumed(any());
+        verifyNoThrowIllegalState(() -> session.addControlee(PARAMS));
+        verify(callback, times(1)).onControleeAdded(any());
+        verifyNoThrowIllegalState(() -> session.removeControlee(PARAMS));
+        verify(callback, times(1)).onControleeRemoved(any());
+        verifyThrowIllegalState(() -> session.sendData(
+                UWB_ADDRESS, PARAMS, new byte[] {0x05, 0x1}));
+        verify(callback, times(0)).onDataSent(any(), any());
+
+        session.onRangingStartFailed(REASON_BAD_PARAMETERS, PARAMS);
         verifyOpenState(session, true);
+        verify(callback, times(1)).onStartFailed(
+                REASON_BAD_PARAMETERS, PARAMS);
 
         session.onRangingStarted(PARAMS);
+        verifyOpenState(session, true);
         verifyNoThrowIllegalState(() -> session.reconfigure(PARAMS));
         verify(callback, times(2)).onReconfigured(any());
-        verifyOpenState(session, true);
+        verifyNoThrowIllegalState(() -> session.reconfigure(null));
+        verify(callback, times(1)).onReconfigureFailed(
+                eq(REASON_BAD_PARAMETERS), any());
+        verifyNoThrowIllegalState(() -> session.pause(PARAMS));
+        verify(callback, times(1)).onPaused(any());
+        verifyNoThrowIllegalState(() -> session.pause(null));
+        verify(callback, times(1)).onPauseFailed(
+                eq(REASON_BAD_PARAMETERS), any());
+        verifyNoThrowIllegalState(() -> session.resume(PARAMS));
+        verify(callback, times(1)).onResumed(any());
+        verifyNoThrowIllegalState(() -> session.resume(null));
+        verify(callback, times(1)).onResumeFailed(
+                eq(REASON_BAD_PARAMETERS), any());
+        verifyNoThrowIllegalState(() -> session.addControlee(PARAMS));
+        verify(callback, times(2)).onControleeAdded(any());
+        verifyNoThrowIllegalState(() -> session.addControlee(null));
+        verify(callback, times(1)).onControleeAddFailed(
+                eq(REASON_BAD_PARAMETERS), any());
+        verifyNoThrowIllegalState(() -> session.removeControlee(PARAMS));
+        verify(callback, times(2)).onControleeRemoved(any());
+        verifyNoThrowIllegalState(() -> session.removeControlee(null));
+        verify(callback, times(1)).onControleeRemoveFailed(
+                eq(REASON_BAD_PARAMETERS), any());
+        verifyNoThrowIllegalState(() -> session.sendData(
+                UWB_ADDRESS, PARAMS, new byte[] {0x05, 0x1}));
+        verify(callback, times(1)).onDataSent(any(), any());
+        verifyNoThrowIllegalState(() -> session.sendData(
+                null, PARAMS, new byte[] {0x05, 0x1}));
+        verify(callback, times(1)).onDataSendFailed(
+                eq(null), eq(REASON_BAD_PARAMETERS), any());
 
-        session.onRangingStopped(REASON, PARAMS);
+        session.onDataReceived(UWB_ADDRESS, PARAMS, new byte[] {0x5, 0x7});
+        verify(callback, times(1)).onDataReceived(
+                UWB_ADDRESS, PARAMS, new byte[] {0x5, 0x7});
+        session.onDataReceiveFailed(UWB_ADDRESS, REASON_BAD_PARAMETERS, PARAMS);
+        verify(callback, times(1)).onDataReceiveFailed(
+                UWB_ADDRESS, REASON_BAD_PARAMETERS, PARAMS);
+
+        session.stop();
+        verifyOpenState(session, true);
+        verify(callback, times(1)).onStopped(REASON, PARAMS);
+
         verifyNoThrowIllegalState(() -> session.reconfigure(PARAMS));
         verify(callback, times(3)).onReconfigured(any());
-        verifyOpenState(session, true);
+        verifyThrowIllegalState(() -> session.pause(PARAMS));
+        verify(callback, times(1)).onPaused(any());
+        verifyThrowIllegalState(() -> session.resume(PARAMS));
+        verify(callback, times(1)).onResumed(any());
+        verifyNoThrowIllegalState(() -> session.addControlee(PARAMS));
+        verify(callback, times(3)).onControleeAdded(any());
+        verifyNoThrowIllegalState(() -> session.removeControlee(PARAMS));
+        verify(callback, times(3)).onControleeRemoved(any());
+        verifyThrowIllegalState(() -> session.sendData(
+                UWB_ADDRESS, PARAMS, new byte[] {0x05, 0x1}));
+        verify(callback, times(1)).onDataSent(any(), any());
 
+        session.close();
+        verifyOpenState(session, false);
+        verify(callback, times(1)).onClosed(REASON, PARAMS);
 
-        session.onRangingClosed(REASON, PARAMS);
         verifyThrowIllegalState(() -> session.reconfigure(PARAMS));
         verify(callback, times(3)).onReconfigured(any());
-        verifyOpenState(session, false);
+        verifyThrowIllegalState(() -> session.pause(PARAMS));
+        verify(callback, times(1)).onPaused(any());
+        verifyThrowIllegalState(() -> session.resume(PARAMS));
+        verify(callback, times(1)).onResumed(any());
+        verifyThrowIllegalState(() -> session.addControlee(PARAMS));
+        verify(callback, times(3)).onControleeAdded(any());
+        verifyThrowIllegalState(() -> session.removeControlee(PARAMS));
+        verify(callback, times(3)).onControleeRemoved(any());
+        verifyThrowIllegalState(() -> session.sendData(
+                UWB_ADDRESS, PARAMS, new byte[] {0x05, 0x1}));
+        verify(callback, times(1)).onDataSent(any(), any());
     }
 
     @Test
@@ -332,6 +467,23 @@
         }
     }
 
+    class OpenAnswer extends AdapterAnswer {
+        OpenAnswer(RangingSession session) {
+            super(session);
+        }
+
+        @Override
+        public Object answer(InvocationOnMock invocation) {
+            PersistableBundle argParams = invocation.getArgument(1);
+            if (argParams != null) {
+                mSession.onRangingOpened();
+            } else {
+                mSession.onRangingOpenFailed(REASON_BAD_PARAMETERS, PARAMS);
+            }
+            return null;
+        }
+    }
+
     class StartAnswer extends AdapterAnswer {
         StartAnswer(RangingSession session) {
             super(session);
@@ -339,7 +491,12 @@
 
         @Override
         public Object answer(InvocationOnMock invocation) {
-            mSession.onRangingStarted(PARAMS);
+            PersistableBundle argParams = invocation.getArgument(1);
+            if (argParams != null) {
+                mSession.onRangingStarted(PARAMS);
+            } else {
+                mSession.onRangingStartFailed(REASON_BAD_PARAMETERS, PARAMS);
+            }
             return null;
         }
     }
@@ -351,7 +508,97 @@
 
         @Override
         public Object answer(InvocationOnMock invocation) {
-            mSession.onRangingReconfigured(PARAMS);
+            PersistableBundle argParams = invocation.getArgument(1);
+            if (argParams != null) {
+                mSession.onRangingReconfigured(PARAMS);
+            } else {
+                mSession.onRangingReconfigureFailed(REASON_BAD_PARAMETERS, PARAMS);
+            }
+            return null;
+        }
+    }
+
+    class PauseAnswer extends AdapterAnswer {
+        PauseAnswer(RangingSession session) {
+            super(session);
+        }
+
+        @Override
+        public Object answer(InvocationOnMock invocation) {
+            PersistableBundle argParams = invocation.getArgument(1);
+            if (argParams != null) {
+                mSession.onRangingPaused(PARAMS);
+            } else {
+                mSession.onRangingPauseFailed(REASON_BAD_PARAMETERS, PARAMS);
+            }
+            return null;
+        }
+    }
+
+    class ResumeAnswer extends AdapterAnswer {
+        ResumeAnswer(RangingSession session) {
+            super(session);
+        }
+
+        @Override
+        public Object answer(InvocationOnMock invocation) {
+            PersistableBundle argParams = invocation.getArgument(1);
+            if (argParams != null) {
+                mSession.onRangingResumed(PARAMS);
+            } else {
+                mSession.onRangingResumeFailed(REASON_BAD_PARAMETERS, PARAMS);
+            }
+            return null;
+        }
+    }
+
+    class ControleeAddAnswer extends AdapterAnswer {
+        ControleeAddAnswer(RangingSession session) {
+            super(session);
+        }
+
+        @Override
+        public Object answer(InvocationOnMock invocation) {
+            PersistableBundle argParams = invocation.getArgument(1);
+            if (argParams != null) {
+                mSession.onControleeAdded(PARAMS);
+            } else {
+                mSession.onControleeAddFailed(REASON_BAD_PARAMETERS, PARAMS);
+            }
+            return null;
+        }
+    }
+
+    class ControleeRemoveAnswer extends AdapterAnswer {
+        ControleeRemoveAnswer(RangingSession session) {
+            super(session);
+        }
+
+        @Override
+        public Object answer(InvocationOnMock invocation) {
+            PersistableBundle argParams = invocation.getArgument(1);
+            if (argParams != null) {
+                mSession.onControleeRemoved(PARAMS);
+            } else {
+                mSession.onControleeRemoveFailed(REASON_BAD_PARAMETERS, PARAMS);
+            }
+            return null;
+        }
+    }
+
+    class DataSendAnswer extends AdapterAnswer {
+        DataSendAnswer(RangingSession session) {
+            super(session);
+        }
+
+        @Override
+        public Object answer(InvocationOnMock invocation) {
+            UwbAddress argParams = invocation.getArgument(1);
+            if (argParams != null) {
+                mSession.onDataSent(UWB_ADDRESS, PARAMS);
+            } else {
+                mSession.onDataSendFailed(null, REASON_BAD_PARAMETERS, PARAMS);
+            }
             return null;
         }
     }
diff --git a/tests/uwb/src/android/uwb/cts/UwbFrameworkInitializerTest.java b/tests/uwb/src/android/uwb/cts/UwbFrameworkInitializerTest.java
new file mode 100644
index 0000000..ddd22c6
--- /dev/null
+++ b/tests/uwb/src/android/uwb/cts/UwbFrameworkInitializerTest.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2021 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 android.uwb.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeTrue;
+
+import android.content.Context;
+import android.platform.test.annotations.AppModeFull;
+import android.uwb.UwbFrameworkInitializer;
+import android.uwb.UwbManager;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import androidx.test.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+import androidx.test.filters.SmallTest;
+
+/**
+ * Test of {@link UwbManager}.
+ */
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+@AppModeFull(reason = "Cannot get UwbManager in instant app mode")
+public class UwbFrameworkInitializerTest {
+    private final Context mContext = InstrumentationRegistry.getContext();
+    private UwbManager mUwbManager;
+
+    @Before
+    public void setup() throws Exception {
+        mUwbManager = mContext.getSystemService(UwbManager.class);
+        assumeTrue(UwbTestUtils.isUwbSupported(mContext));
+        assertThat(mUwbManager).isNotNull();
+    }
+
+    /**
+     * UwbFrameworkInitializer.registerServiceWrappers() should only be called by
+     * SystemServiceRegistry during boot up when Uwb is first initialized. Calling this API at
+     * any other time should throw an exception.
+     */
+    @Test
+    public void testRegisterServiceWrappers_failsWhenCalledOutsideOfSystemServiceRegistry() {
+        try {
+            UwbFrameworkInitializer.registerServiceWrappers();
+            fail("Expected exception when calling "
+                    + "UwbFrameworkInitializer.registerServiceWrappers() outside of "
+                    + "SystemServiceRegistry!");
+        } catch (IllegalStateException expected) { }
+    }
+}
diff --git a/tests/uwb/src/android/uwb/cts/UwbManagerTest.java b/tests/uwb/src/android/uwb/cts/UwbManagerTest.java
index a887709..8e3c098 100644
--- a/tests/uwb/src/android/uwb/cts/UwbManagerTest.java
+++ b/tests/uwb/src/android/uwb/cts/UwbManagerTest.java
@@ -18,11 +18,15 @@
 
 import static android.Manifest.permission.UWB_PRIVILEGED;
 import static android.Manifest.permission.UWB_RANGING;
+import static android.uwb.UwbManager.AdapterStateCallback.STATE_DISABLED;
+import static android.uwb.UwbManager.AdapterStateCallback.STATE_ENABLED_ACTIVE;
+import static android.uwb.UwbManager.AdapterStateCallback.STATE_ENABLED_INACTIVE;
 
 import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;
 
 import static com.google.common.truth.Truth.assertThat;
 
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
@@ -40,16 +44,26 @@
 import android.util.Log;
 import android.uwb.RangingReport;
 import android.uwb.RangingSession;
+import android.uwb.UwbAddress;
 import android.uwb.UwbManager;
 
 import androidx.test.InstrumentationRegistry;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.SmallTest;
 
+import com.android.compatibility.common.util.ShellIdentityUtils;
+
+import com.google.uwb.support.fira.FiraOpenSessionParams;
+import com.google.uwb.support.fira.FiraParams;
+import com.google.uwb.support.fira.FiraProtocolVersion;
+import com.google.uwb.support.multichip.ChipInfoParams;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.util.List;
+import java.util.Random;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.Executors;
@@ -66,12 +80,43 @@
 
     private final Context mContext = InstrumentationRegistry.getContext();
     private UwbManager mUwbManager;
+    private String mDefaultChipId;
 
     @Before
-    public void setup() {
+    public void setup() throws Exception {
         mUwbManager = mContext.getSystemService(UwbManager.class);
         assumeTrue(UwbTestUtils.isUwbSupported(mContext));
         assertThat(mUwbManager).isNotNull();
+
+        // Ensure UWB is toggled on.
+        ShellIdentityUtils.invokeWithShellPermissions(() -> {
+            if (!mUwbManager.isUwbEnabled()) {
+                try {
+                    setUwbEnabledAndWaitForCompletion(true);
+                } catch (Exception e) {
+                    fail("Exception while processing UWB toggle " + e);
+                }
+            }
+            mDefaultChipId = mUwbManager.getDefaultChipId();
+        });
+    }
+
+    // Should be invoked with shell permissions.
+    private void setUwbEnabledAndWaitForCompletion(boolean enabled) throws Exception {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        int adapterState = enabled ? STATE_ENABLED_INACTIVE : STATE_DISABLED;
+        AdapterStateCallback adapterStateCallback =
+                new AdapterStateCallback(countDownLatch, adapterState);
+        try {
+            mUwbManager.registerAdapterStateCallback(
+                    Executors.newSingleThreadExecutor(), adapterStateCallback);
+            mUwbManager.setUwbEnabled(enabled);
+            assertThat(countDownLatch.await(2, TimeUnit.SECONDS)).isTrue();
+            assertThat(mUwbManager.isUwbEnabled()).isEqualTo(enabled);
+            assertThat(adapterStateCallback.state).isEqualTo(adapterState);
+        } finally {
+            mUwbManager.unregisterAdapterStateCallback(adapterStateCallback);
+        }
     }
 
     @Test
@@ -89,6 +134,49 @@
     }
 
     @Test
+    public void testGetSpecificationInfoWithChipId() {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        try {
+            // Needs UWB_PRIVILEGED permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            PersistableBundle persistableBundle =
+                    mUwbManager.getSpecificationInfo(mDefaultChipId);
+            assertThat(persistableBundle).isNotNull();
+            assertThat(persistableBundle.isEmpty()).isFalse();
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testGetChipInfos() {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        try {
+            // Needs UWB_PRIVILEGED permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            List<PersistableBundle> chipInfos = mUwbManager.getChipInfos();
+            assertThat(chipInfos).hasSize(1);
+            ChipInfoParams chipInfoParams = ChipInfoParams.fromBundle(chipInfos.get(0));
+            assertThat(chipInfoParams.getChipId()).isEqualTo(mDefaultChipId);
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testGetSpecificationInfoWithInvalidChipId() {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        try {
+            // Needs UWB_PRIVILEGED permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            assertThrows(IllegalArgumentException.class,
+                    () -> mUwbManager.getSpecificationInfo("invalidChipId"));
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
     public void testGetSpecificationInfoWithoutUwbPrivileged() {
         try {
             mUwbManager.getSpecificationInfo();
@@ -100,6 +188,18 @@
         }
     }
 
+    @Test
+    public void testGetSpecificationInfoWithChipIdWithoutUwbPrivileged() {
+        try {
+            mUwbManager.getSpecificationInfo(mDefaultChipId);
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
 
     @Test
     public void testElapsedRealtimeResolutionNanos() {
@@ -114,6 +214,32 @@
     }
 
     @Test
+    public void testElapsedRealtimeResolutionNanosWithChipId() {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        try {
+            // Needs UWB_PRIVILEGED permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            assertThat(mUwbManager.elapsedRealtimeResolutionNanos(mDefaultChipId) >= 0L)
+                    .isTrue();
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testElapsedRealtimeResolutionNanosWithInvalidChipId() {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        try {
+            // Needs UWB_PRIVILEGED permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            assertThrows(IllegalArgumentException.class,
+                    () -> mUwbManager.elapsedRealtimeResolutionNanos("invalidChipId"));
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
     public void testElapsedRealtimeResolutionNanosWithoutUwbPrivileged() {
         try {
             mUwbManager.elapsedRealtimeResolutionNanos();
@@ -125,31 +251,296 @@
         }
     }
 
-    private class RangingSessionCallback implements RangingSession.Callback {
+    @Test
+    public void testElapsedRealtimeResolutionNanosWithChipIdWithoutUwbPrivileged() {
+        try {
+            mUwbManager.elapsedRealtimeResolutionNanos(mDefaultChipId);
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
+    @Test
+    public void testAddServiceProfileWithoutUwbPrivileged() {
+        try {
+            mUwbManager.addServiceProfile(new PersistableBundle());
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
+    @Test
+    public void testRemoveServiceProfileWithoutUwbPrivileged() {
+        try {
+            mUwbManager.removeServiceProfile(new PersistableBundle());
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
+
+    @Test
+    public void testGetAllServiceProfilesWithoutUwbPrivileged() {
+        try {
+            mUwbManager.getAllServiceProfiles();
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
+    @Test
+    public void testGetAdfProvisioningAuthoritiesWithoutUwbPrivileged() {
+        try {
+            mUwbManager.getAdfProvisioningAuthorities(new PersistableBundle());
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
+    @Test
+    public void testGetAdfCertificateInfoWithoutUwbPrivileged() {
+        try {
+            mUwbManager.getAdfCertificateInfo(new PersistableBundle());
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
+    @Test
+    public void testGetChipInfosWithoutUwbPrivileged() {
+        try {
+            mUwbManager.getChipInfos();
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
+    @Test
+    public void testSendVendorUciWithoutUwbPrivileged() {
+        try {
+            mUwbManager.sendVendorUciMessage(10, 0, new byte[0]);
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
+    private class AdfProvisionStateCallback extends UwbManager.AdfProvisionStateCallback {
         private final CountDownLatch mCountDownLatch;
 
+        public boolean onSuccessCalled;
+        public boolean onFailedCalled;
+
+        AdfProvisionStateCallback(@NonNull CountDownLatch countDownLatch) {
+            mCountDownLatch = countDownLatch;
+        }
+
+        @Override
+        public void onProfileAdfsProvisioned(@NonNull PersistableBundle params) {
+            onSuccessCalled = true;
+            mCountDownLatch.countDown();
+        }
+
+        @Override
+        public void onProfileAdfsProvisionFailed(int reason, @NonNull PersistableBundle params) {
+            onFailedCalled = true;
+            mCountDownLatch.countDown();
+        }
+    }
+
+    @Test
+    public void testProvisionProfileAdfByScriptWithoutUwbPrivileged() {
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        AdfProvisionStateCallback adfProvisionStateCallback =
+                new AdfProvisionStateCallback(countDownLatch);
+        try {
+            mUwbManager.provisionProfileAdfByScript(
+                    new PersistableBundle(),
+                    Executors.newSingleThreadExecutor(),
+                    adfProvisionStateCallback);
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
+    @Test
+    public void testRemoveProfileAdfWithoutUwbPrivileged() {
+        try {
+            mUwbManager.removeProfileAdf(new PersistableBundle());
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
+    private class UwbVendorUciCallback implements UwbManager.UwbVendorUciCallback {
+        private final CountDownLatch mRspCountDownLatch;
+        private final CountDownLatch mNtfCountDownLatch;
+
+        public int gid;
+        public int oid;
+        public byte[] payload;
+
+        UwbVendorUciCallback(
+                @NonNull CountDownLatch rspCountDownLatch,
+                @NonNull CountDownLatch ntfCountDownLatch) {
+            mRspCountDownLatch = rspCountDownLatch;
+            mNtfCountDownLatch = ntfCountDownLatch;
+        }
+
+        @Override
+        public void onVendorUciResponse(int gid, int oid, byte[] payload) {
+            this.gid = gid;
+            this.oid = oid;
+            this.payload = payload;
+            mRspCountDownLatch.countDown();
+        }
+
+        @Override
+        public void onVendorUciNotification(int gid, int oid, byte[] payload) {
+            this.gid = gid;
+            this.oid = oid;
+            this.payload = payload;
+            mNtfCountDownLatch.countDown();
+        }
+    }
+
+    @Test
+    public void testRegisterVendorUciCallbackWithoutUwbPrivileged() {
+        UwbManager.UwbVendorUciCallback cb =
+                new UwbVendorUciCallback(new CountDownLatch(1), new CountDownLatch(1));
+        try {
+            mUwbManager.registerUwbVendorUciCallback(
+                    Executors.newSingleThreadExecutor(), cb);
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
+    @Test
+    public void testUnregisterVendorUciCallbackWithoutUwbPrivileged() {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        UwbManager.UwbVendorUciCallback cb =
+                new UwbVendorUciCallback(new CountDownLatch(1), new CountDownLatch(1));
+        try {
+            // Needs UWB_PRIVILEGED & UWB_RANGING permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            mUwbManager.registerUwbVendorUciCallback(
+                    Executors.newSingleThreadExecutor(), cb);
+        } catch (SecurityException e) {
+            /* pass */
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+        try {
+            mUwbManager.unregisterUwbVendorUciCallback(cb);
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        }
+    }
+
+    @Test
+    public void testInvalidCallbackUnregisterVendorUciCallback() {
+        UwbManager.UwbVendorUciCallback cb =
+                new UwbVendorUciCallback(new CountDownLatch(1), new CountDownLatch(1));
+        try {
+            mUwbManager.registerUwbVendorUciCallback(
+                    Executors.newSingleThreadExecutor(), cb);
+        } catch (SecurityException e) {
+            /* registration failed */
+        }
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        try {
+            // Needs UWB_PRIVILEGED permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            mUwbManager.unregisterUwbVendorUciCallback(cb);
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    private class RangingSessionCallback implements RangingSession.Callback {
+        private CountDownLatch mCtrlCountDownLatch;
+        private CountDownLatch mResultCountDownLatch;
+
         public boolean onOpenedCalled;
         public boolean onOpenFailedCalled;
+        public boolean onStartedCalled;
+        public boolean onStartFailedCalled;
+        public boolean onClosedCalled;
         public RangingSession rangingSession;
+        public RangingReport rangingReport;
 
-        RangingSessionCallback(@NonNull CountDownLatch countDownLatch) {
-            mCountDownLatch = countDownLatch;
+        RangingSessionCallback(
+                @NonNull CountDownLatch ctrlCountDownLatch) {
+            this(ctrlCountDownLatch, null /* resultCountDownLaynch */);
+        }
+
+        RangingSessionCallback(
+                @NonNull CountDownLatch ctrlCountDownLatch,
+                @Nullable CountDownLatch resultCountDownLatch) {
+            mCtrlCountDownLatch = ctrlCountDownLatch;
+            mResultCountDownLatch = resultCountDownLatch;
+        }
+
+        public void replaceCtrlCountDownLatch(@NonNull CountDownLatch countDownLatch) {
+            mCtrlCountDownLatch = countDownLatch;
         }
 
         public void onOpened(@NonNull RangingSession session) {
             onOpenedCalled = true;
             rangingSession = session;
-            mCountDownLatch.countDown();
+            mCtrlCountDownLatch.countDown();
         }
 
         public void onOpenFailed(@Reason int reason, @NonNull PersistableBundle params) {
             onOpenFailedCalled = true;
-            mCountDownLatch.countDown();
+            mCtrlCountDownLatch.countDown();
         }
 
-        public void onStarted(@NonNull PersistableBundle sessionInfo) { }
+        public void onStarted(@NonNull PersistableBundle sessionInfo) {
+            onStartedCalled = true;
+            mCtrlCountDownLatch.countDown();
+        }
 
-        public void onStartFailed(@Reason int reason, @NonNull PersistableBundle params) { }
+        public void onStartFailed(@Reason int reason, @NonNull PersistableBundle params) {
+            onStartFailedCalled = true;
+            mCtrlCountDownLatch.countDown();
+        }
 
         public void onReconfigured(@NonNull PersistableBundle params) { }
 
@@ -159,13 +550,40 @@
 
         public void onStopFailed(@Reason int reason, @NonNull PersistableBundle params) { }
 
-        public void onClosed(@Reason int reason, @NonNull PersistableBundle parameters) { }
+        public void onClosed(@Reason int reason, @NonNull PersistableBundle parameters) {
+            onClosedCalled = true;
+            mCtrlCountDownLatch.countDown();
+        }
 
-        public void onReportReceived(@NonNull RangingReport rangingReport) { }
+        public void onReportReceived(@NonNull RangingReport rangingReport) {
+            if (mResultCountDownLatch != null) {
+                this.rangingReport = rangingReport;
+                mResultCountDownLatch.countDown();
+            }
+        }
     }
 
     @Test
-    public void testOpenRangingSessionWithBadParams() throws Exception {
+    public void testOpenRangingSessionWithInvalidChipId() {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        RangingSessionCallback rangingSessionCallback = new RangingSessionCallback(countDownLatch);
+        try {
+            // Needs UWB_PRIVILEGED & UWB_RANGING permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            // Try to start a ranging session with invalid params, should fail.
+            assertThrows(IllegalArgumentException.class, () -> mUwbManager.openRangingSession(
+                    new PersistableBundle(),
+                    Executors.newSingleThreadExecutor(),
+                    rangingSessionCallback,
+                    "invalidChipId"));
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testOpenRangingSessionWithChipIdWithBadParams() throws Exception {
         UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
         CancellationSignal cancellationSignal = null;
         CountDownLatch countDownLatch = new CountDownLatch(1);
@@ -177,7 +595,35 @@
             cancellationSignal = mUwbManager.openRangingSession(
                     new PersistableBundle(),
                     Executors.newSingleThreadExecutor(),
-                    rangingSessionCallback);
+                    rangingSessionCallback,
+                    mDefaultChipId);
+            // Wait for the on start failed callback.
+            assertThat(countDownLatch.await(1, TimeUnit.SECONDS)).isTrue();
+            assertThat(rangingSessionCallback.onOpenedCalled).isFalse();
+            assertThat(rangingSessionCallback.onOpenFailedCalled).isTrue();
+        } finally {
+            if (cancellationSignal != null) {
+                cancellationSignal.cancel();
+            }
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testOpenRangingSessionWithInvalidChipIdWithBadParams() throws Exception {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        CancellationSignal cancellationSignal = null;
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        RangingSessionCallback rangingSessionCallback = new RangingSessionCallback(countDownLatch);
+        try {
+            // Needs UWB_PRIVILEGED & UWB_RANGING permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            // Try to start a ranging session with invalid params, should fail.
+            cancellationSignal = mUwbManager.openRangingSession(
+                    new PersistableBundle(),
+                    Executors.newSingleThreadExecutor(),
+                    rangingSessionCallback,
+                    mDefaultChipId);
             // Wait for the on start failed callback.
             assertThat(countDownLatch.await(1, TimeUnit.SECONDS)).isTrue();
             assertThat(rangingSessionCallback.onOpenedCalled).isFalse();
@@ -212,6 +658,26 @@
         }
     }
 
+    @Test
+    public void testOpenRangingSessionWithChipIdWithoutUwbPrivileged() {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        try {
+            // Only hold UWB_RANGING permission
+            uiAutomation.adoptShellPermissionIdentity(UWB_RANGING);
+            mUwbManager.openRangingSession(new PersistableBundle(),
+                    Executors.newSingleThreadExecutor(),
+                    new RangingSessionCallback(new CountDownLatch(1)),
+                    mDefaultChipId);
+            // should fail if the call was successful without UWB_PRIVILEGED permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
     /**
      * Simulates the app holding UWB_PRIVILEGED permission, but not UWB_RANGING.
      */
@@ -234,6 +700,26 @@
         }
     }
 
+    @Test
+    public void testOpenRangingSessionWithChipIdWithoutUwbRanging() {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        try {
+            // Needs UWB_PRIVILEGED permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity(UWB_PRIVILEGED);
+            mUwbManager.openRangingSession(new PersistableBundle(),
+                    Executors.newSingleThreadExecutor(),
+                    new RangingSessionCallback(new CountDownLatch(1)),
+                    mDefaultChipId);
+            // should fail if the call was successful without UWB_RANGING permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
     private AttributionSource getShellAttributionSourceWithRenouncedPermissions(
             @Nullable Set<String> renouncedPermissions) {
         try {
@@ -288,4 +774,204 @@
             uiAutomation.dropShellPermissionIdentity();
         }
     }
+
+    @Test
+    public void testOpenRangingSessionWithChipIdWithoutUwbRangingInNextAttributeSource() {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        try {
+            // Only hold UWB_PRIVILEGED permission
+            uiAutomation.adoptShellPermissionIdentity();
+            Context shellContextWithUwbRangingRenounced =
+                    createShellContextWithRenouncedPermissionsAndAttributionSource(
+                            Set.of(UWB_RANGING));
+            UwbManager uwbManagerWithUwbRangingRenounced =
+                    shellContextWithUwbRangingRenounced.getSystemService(UwbManager.class);
+            uwbManagerWithUwbRangingRenounced.openRangingSession(new PersistableBundle(),
+                    Executors.newSingleThreadExecutor(),
+                    new RangingSessionCallback(new CountDownLatch(1)),
+                    mDefaultChipId);
+            // should fail if the call was successful without UWB_RANGING permission.
+            fail();
+        } catch (SecurityException e) {
+            /* pass */
+            Log.i(TAG, "Failed with expected security exception: " + e);
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testFiraRangingSession() throws Exception {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        CancellationSignal cancellationSignal = null;
+        CountDownLatch countDownLatch = new CountDownLatch(1);
+        CountDownLatch resultCountDownLatch = new CountDownLatch(1);
+        RangingSessionCallback rangingSessionCallback =
+                new RangingSessionCallback(countDownLatch, resultCountDownLatch);
+        FiraOpenSessionParams firaOpenSessionParams = new FiraOpenSessionParams.Builder()
+                .setProtocolVersion(new FiraProtocolVersion(1, 1))
+                .setSessionId(1)
+                .setStsConfig(FiraParams.STS_CONFIG_STATIC)
+                .setVendorId(new byte[]{0x5, 0x6})
+                .setStaticStsIV(new byte[]{0x5, 0x6, 0x9, 0xa, 0x4, 0x6})
+                .setDeviceType(FiraParams.RANGING_DEVICE_TYPE_CONTROLLER)
+                .setDeviceRole(FiraParams.RANGING_DEVICE_ROLE_INITIATOR)
+                .setMultiNodeMode(FiraParams.MULTI_NODE_MODE_UNICAST)
+                .setDeviceAddress(UwbAddress.fromBytes(new byte[] {0x5, 6}))
+                .setDestAddressList(List.of(UwbAddress.fromBytes(new byte[] {0x5, 6})))
+                .build();
+        try {
+            // Needs UWB_PRIVILEGED & UWB_RANGING permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            // Try to start a ranging session with invalid params, should fail.
+            cancellationSignal = mUwbManager.openRangingSession(
+                    firaOpenSessionParams.toBundle(),
+                    Executors.newSingleThreadExecutor(),
+                    rangingSessionCallback,
+                    mDefaultChipId);
+            // Wait for the on opened callback.
+            assertThat(countDownLatch.await(1, TimeUnit.SECONDS)).isTrue();
+            assertThat(rangingSessionCallback.onOpenedCalled).isTrue();
+            assertThat(rangingSessionCallback.onOpenFailedCalled).isFalse();
+            assertThat(rangingSessionCallback.rangingSession).isNotNull();
+
+            countDownLatch = new CountDownLatch(1);
+            rangingSessionCallback.replaceCtrlCountDownLatch(countDownLatch);
+            rangingSessionCallback.rangingSession.start(new PersistableBundle());
+            // Wait for the on started callback.
+            assertThat(countDownLatch.await(1, TimeUnit.SECONDS)).isTrue();
+            assertThat(rangingSessionCallback.onStartedCalled).isTrue();
+            assertThat(rangingSessionCallback.onStartFailedCalled).isFalse();
+
+            // Wait for the on ranging report callback.
+            assertThat(resultCountDownLatch.await(1, TimeUnit.SECONDS)).isTrue();
+            assertThat(rangingSessionCallback.rangingReport).isNotNull();
+
+            // Check the UWB state.
+            assertThat(mUwbManager.getAdapterState()).isEqualTo(STATE_ENABLED_ACTIVE);
+
+            // Stop ongoing session.
+            rangingSessionCallback.rangingSession.stop();
+        } finally {
+            if (cancellationSignal != null) {
+                countDownLatch = new CountDownLatch(1);
+                rangingSessionCallback.replaceCtrlCountDownLatch(countDownLatch);
+
+                // Close session.
+                cancellationSignal.cancel();
+
+                // Wait for the on closed callback.
+                assertThat(countDownLatch.await(1, TimeUnit.SECONDS)).isTrue();
+                assertThat(rangingSessionCallback.onClosedCalled).isTrue();
+            }
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    private class AdapterStateCallback implements UwbManager.AdapterStateCallback {
+        private final CountDownLatch mCountDownLatch;
+        private final @State Integer mWaitForState;
+        public int state;
+        public int reason;
+
+        AdapterStateCallback(@NonNull CountDownLatch countDownLatch,
+                @Nullable @State Integer waitForState) {
+            mCountDownLatch = countDownLatch;
+            mWaitForState = waitForState;
+        }
+
+        public void onStateChanged(@State int state, @StateChangedReason int reason) {
+            this.state = state;
+            this.reason = reason;
+            if (mWaitForState != null) {
+                if (mWaitForState == state) {
+                    mCountDownLatch.countDown();
+                }
+            } else {
+                mCountDownLatch.countDown();
+            }
+        }
+    }
+
+    @Test
+    public void testUwbStateToggle() throws Exception {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        try {
+            // Needs UWB_PRIVILEGED permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            assertThat(mUwbManager.isUwbEnabled()).isTrue();
+            assertThat(mUwbManager.getAdapterState()).isEqualTo(STATE_ENABLED_INACTIVE);
+            // Toggle the state
+            setUwbEnabledAndWaitForCompletion(false);
+            assertThat(mUwbManager.getAdapterState()).isEqualTo(STATE_DISABLED);
+        } finally {
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testSendVendorUciMessage() throws Exception {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        CountDownLatch rspCountDownLatch = new CountDownLatch(1);
+        CountDownLatch ntfCountDownLatch = new CountDownLatch(1);
+        UwbVendorUciCallback cb =
+                new UwbVendorUciCallback(rspCountDownLatch, ntfCountDownLatch);
+        try {
+            // Needs UWB_PRIVILEGED & UWB_RANGING permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            mUwbManager.registerUwbVendorUciCallback(
+                    Executors.newSingleThreadExecutor(), cb);
+
+            // Send random payload with a vendor gid.
+            byte[] payload = new byte[100];
+            new Random().nextBytes(payload);
+            int gid = 9;
+            int oid = 1;
+            mUwbManager.sendVendorUciMessage(gid, oid, payload);
+
+            // Wait for response.
+            assertThat(rspCountDownLatch.await(1, TimeUnit.SECONDS)).isTrue();
+            assertThat(cb.gid).isEqualTo(gid);
+            assertThat(cb.oid).isEqualTo(oid);
+            assertThat(cb.payload).isNotEmpty();
+        } catch (SecurityException e) {
+            /* pass */
+        } finally {
+            mUwbManager.unregisterUwbVendorUciCallback(cb);
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
+
+    @Test
+    public void testSendVendorUciMessageWithFragmentedPackets() throws Exception {
+        UiAutomation uiAutomation = getInstrumentation().getUiAutomation();
+        CountDownLatch rspCountDownLatch = new CountDownLatch(1);
+        CountDownLatch ntfCountDownLatch = new CountDownLatch(1);
+        UwbVendorUciCallback cb =
+                new UwbVendorUciCallback(rspCountDownLatch, ntfCountDownLatch);
+        try {
+            // Needs UWB_PRIVILEGED & UWB_RANGING permission which is held by shell.
+            uiAutomation.adoptShellPermissionIdentity();
+            mUwbManager.registerUwbVendorUciCallback(
+                    Executors.newSingleThreadExecutor(), cb);
+
+            // Send random payload > 255 bytes with a vendor gid.
+            byte[] payload = new byte[400];
+            new Random().nextBytes(payload);
+            int gid = 9;
+            int oid = 1;
+            mUwbManager.sendVendorUciMessage(gid, oid, payload);
+
+            // Wait for response.
+            assertThat(rspCountDownLatch.await(1, TimeUnit.SECONDS)).isTrue();
+            assertThat(cb.gid).isEqualTo(gid);
+            assertThat(cb.oid).isEqualTo(oid);
+            assertThat(cb.payload).isNotEmpty();
+        } catch (SecurityException e) {
+            /* pass */
+        } finally {
+            mUwbManager.unregisterUwbVendorUciCallback(cb);
+            uiAutomation.dropShellPermissionIdentity();
+        }
+    }
 }
diff --git a/tests/uwb/src/android/uwb/cts/UwbTestUtils.java b/tests/uwb/src/android/uwb/cts/UwbTestUtils.java
index 3790b52..041b66c 100644
--- a/tests/uwb/src/android/uwb/cts/UwbTestUtils.java
+++ b/tests/uwb/src/android/uwb/cts/UwbTestUtils.java
@@ -67,9 +67,13 @@
         return new RangingMeasurement.Builder()
                 .setDistanceMeasurement(getDistanceMeasurement())
                 .setAngleOfArrivalMeasurement(getAngleOfArrivalMeasurement())
+                .setDestinationAngleOfArrivalMeasurement(getAngleOfArrivalMeasurement())
                 .setElapsedRealtimeNanos(SystemClock.elapsedRealtimeNanos())
                 .setRemoteDeviceAddress(address != null ? address : getUwbAddress(false))
                 .setStatus(RangingMeasurement.RANGING_STATUS_SUCCESS)
+                .setLineOfSight(RangingMeasurement.NLOS)
+                .setMeasurementFocus(RangingMeasurement.MEASUREMENT_FOCUS_RANGE)
+                .setRssiDbm(-85)
                 .build();
     }
 
diff --git a/tests/wallpapereffectsgeneration/Android.bp b/tests/wallpapereffectsgeneration/Android.bp
new file mode 100644
index 0000000..a3f3145
--- /dev/null
+++ b/tests/wallpapereffectsgeneration/Android.bp
@@ -0,0 +1,35 @@
+// Copyright (C) 2022 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 {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+android_test {
+    name: "CtsWallpaperEffectsGenerationServiceTestCases",
+    defaults: ["cts_defaults"],
+    static_libs: [
+        "androidx.annotation_annotation",
+        "compatibility-device-util-axt",
+        "ctstestrunner-axt",
+        "truth-prebuilt",
+    ],
+    srcs: ["src/**/*.java"],
+    // Tag this module as a cts test artifact
+    test_suites: [
+        "cts",
+        "general-tests",
+    ],
+    sdk_version: "test_current",
+}
diff --git a/tests/wallpapereffectsgeneration/AndroidManifest.xml b/tests/wallpapereffectsgeneration/AndroidManifest.xml
new file mode 100644
index 0000000..80662d9
--- /dev/null
+++ b/tests/wallpapereffectsgeneration/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2022 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.
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="android.wallpapereffectsgeneration.cts"
+    android:targetSandboxVersion="2">
+
+    <application>
+        <service android:name=".CtsWallpaperEffectsGenerationService"
+            android:exported="true"
+            android:label="CtsTestWallpaperEffectsGenerationService"
+            android:permission="android.permission.BIND_WALLPAPER_EFFECTS_GENERATION_SERVICE">
+            <intent-filter>
+                <!-- This constant must match WallpaperEffectsGenerationService.SERVICE_INTERFACE -->
+                <action android:name="android.service.wallpapereffectsgeneration.WallpaperEffectsGenerationService"/>
+            </intent-filter>
+        </service>
+
+        <uses-library android:name="android.test.runner"/>
+
+    </application>
+
+    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"
+        android:label="CTS tests for the WallpaperEffectsGeneration System APIs."
+        android:targetPackage="android.wallpapereffectsgeneration.cts">
+    </instrumentation>
+
+</manifest>
\ No newline at end of file
diff --git a/tests/wallpapereffectsgeneration/AndroidTest.xml b/tests/wallpapereffectsgeneration/AndroidTest.xml
new file mode 100644
index 0000000..a60936f
--- /dev/null
+++ b/tests/wallpapereffectsgeneration/AndroidTest.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2022 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.
+-->
+<configuration description="Config for WallpaperEffectsGeneration CTS tests.">
+    <option name="test-suite-tag" value="cts"/>
+    <option name="config-descriptor:metadata" key="component" value="framework"/>
+    <option name="config-descriptor:metadata" key="parameter" value="not_instant_app"/>
+    <option name="config-descriptor:metadata" key="parameter" value="not_multi_abi"/>
+    <option name="config-descriptor:metadata" key="parameter" value="secondary_user"/>
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true"/>
+        <option name="test-file-name" value="CtsWallpaperEffectsGenerationServiceTestCases.apk"/>
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest">
+        <option name="package" value="android.wallpapereffectsgeneration.cts"/>
+    </test>
+
+</configuration>
\ No newline at end of file
diff --git a/tests/wallpapereffectsgeneration/OWNERS b/tests/wallpapereffectsgeneration/OWNERS
new file mode 100644
index 0000000..39cdd55
--- /dev/null
+++ b/tests/wallpapereffectsgeneration/OWNERS
@@ -0,0 +1,4 @@
+susharon@google.com
+shanh@google.com
+huiwu@google.com
+srazdan@google.com
\ No newline at end of file
diff --git a/tests/wallpapereffectsgeneration/TEST_MAPPING b/tests/wallpapereffectsgeneration/TEST_MAPPING
new file mode 100644
index 0000000..1dbe8e1
--- /dev/null
+++ b/tests/wallpapereffectsgeneration/TEST_MAPPING
@@ -0,0 +1,7 @@
+{
+  "presubmit": [
+    {
+      "name": "CtsWallpaperEffectsGenerationServiceTestCases"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/CameraAttributesTest.java b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/CameraAttributesTest.java
new file mode 100644
index 0000000..4a2d277
--- /dev/null
+++ b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/CameraAttributesTest.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2022 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 android.wallpapereffectsgeneration.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.wallpapereffectsgeneration.CameraAttributes;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link CameraAttributes}
+ *
+ * atest CtsWallpaperEffectsGenerationServiceTestCases
+ */
+
+@RunWith(AndroidJUnit4.class)
+public class CameraAttributesTest {
+    private static final String TAG = "WallpaperEffectsGenerationTest";
+
+    @Test
+    public void testCreateCameraAttributesRequest() {
+        final float[] anchorPointInWorldSpace = new float[]{0.5f, 1.5f, -1.0f};
+        final float[] anchorPointInOutputUvSpace = new float[]{0.5f, 2.5f};
+        final float yaw = 35.2f;
+        final float pitch = 45.6f;
+        final float dolly = 0.3f;
+        final float fov = 60.0f;
+        final float frustumNear = 0.5f;
+        final float frustumFar = 200.0f;
+
+        CameraAttributes attributes = new CameraAttributes.Builder(anchorPointInWorldSpace,
+                anchorPointInOutputUvSpace)
+                .setCameraOrbitYawDegrees(yaw)
+                .setCameraOrbitPitchDegrees(pitch)
+                .setDollyDistanceInWorldSpace(dolly)
+                .setVerticalFovDegrees(fov)
+                .setFrustumNearInWorldSpace(frustumNear)
+                .setFrustumFarInWorldSpace(frustumFar)
+                .build();
+
+        /** Check the original attributes. */
+        assertThat(attributes.getAnchorPointInWorldSpace()).isEqualTo(anchorPointInWorldSpace);
+        assertThat(attributes.getAnchorPointInOutputUvSpace()).isEqualTo(
+                anchorPointInOutputUvSpace);
+        assertThat(attributes.getCameraOrbitYawDegrees()).isEqualTo(yaw);
+        assertThat(attributes.getCameraOrbitPitchDegrees()).isEqualTo(pitch);
+        assertThat(attributes.getDollyDistanceInWorldSpace()).isEqualTo(dolly);
+        assertThat(attributes.getVerticalFovDegrees()).isEqualTo(fov);
+        assertThat(attributes.getFrustumNearInWorldSpace()).isEqualTo(frustumNear);
+        assertThat(attributes.getFrustumFarInWorldSpace()).isEqualTo(frustumFar);
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        attributes.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        CameraAttributes copy =
+                CameraAttributes.CREATOR.createFromParcel(parcel);
+        /** Check the copied attributes */
+        assertThat(copy.getAnchorPointInWorldSpace()).isEqualTo(anchorPointInWorldSpace);
+        assertThat(copy.getAnchorPointInOutputUvSpace()).isEqualTo(anchorPointInOutputUvSpace);
+        assertThat(copy.getCameraOrbitYawDegrees()).isEqualTo(yaw);
+        assertThat(copy.getCameraOrbitPitchDegrees()).isEqualTo(pitch);
+        assertThat(copy.getDollyDistanceInWorldSpace()).isEqualTo(dolly);
+        assertThat(copy.getVerticalFovDegrees()).isEqualTo(fov);
+        assertThat(copy.getFrustumNearInWorldSpace()).isEqualTo(frustumNear);
+        assertThat(copy.getFrustumFarInWorldSpace()).isEqualTo(frustumFar);
+
+        parcel.recycle();
+    }
+}
diff --git a/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/CinematicEffectRequestTest.java b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/CinematicEffectRequestTest.java
new file mode 100644
index 0000000..23b2e7e
--- /dev/null
+++ b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/CinematicEffectRequestTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2022 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 android.wallpapereffectsgeneration.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.wallpapereffectsgeneration.CinematicEffectRequest;
+import android.graphics.Bitmap;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.UUID;
+
+/**
+ * Tests for {@link CinematicEffectRequest}
+ *
+ * atest CtsWallpaperEffectsGenerationServiceTestCases
+ */
+
+@RunWith(AndroidJUnit4.class)
+public class CinematicEffectRequestTest {
+    private static final String TAG = "WallpaperEffectsGenerationTest";
+
+    @Test
+    public void testCreateCinematicEffectRequest() {
+        final String taskId = UUID.randomUUID().toString();
+        final Bitmap bmp = Bitmap.createBitmap(320, 480, Bitmap.Config.ARGB_8888);
+        CinematicEffectRequest request = new CinematicEffectRequest(taskId, bmp);
+
+        /** Check the original request. */
+        assertThat(request.getTaskId()).isEqualTo(taskId);
+        assertThat(request.getBitmap()).isEqualTo(bmp);
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        request.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        CinematicEffectRequest copy =
+                CinematicEffectRequest.CREATOR.createFromParcel(parcel);
+        /** Check the copied request. */
+        assertThat(copy.getTaskId()).isEqualTo(taskId);
+        assertThat(copy.getBitmap().sameAs(bmp)).isTrue();
+
+        parcel.recycle();
+    }
+}
diff --git a/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/CinematicEffectResponseTest.java b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/CinematicEffectResponseTest.java
new file mode 100644
index 0000000..0ec9131
--- /dev/null
+++ b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/CinematicEffectResponseTest.java
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2022 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 android.wallpapereffectsgeneration.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.wallpapereffectsgeneration.CameraAttributes;
+import android.app.wallpapereffectsgeneration.CinematicEffectResponse;
+import android.app.wallpapereffectsgeneration.TexturedMesh;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.os.Parcel;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * Tests for {@link CinematicEffectResponse}
+ *
+ * atest CtsWallpaperEffectsGenerationServiceTestCases
+ */
+
+@RunWith(AndroidJUnit4.class)
+public class CinematicEffectResponseTest {
+    private static final String TAG = "WallpaperEffectsGenerationTest";
+
+    @Test
+    public void testCreateCinematicEffectResponse() {
+        final int statusCode = CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_OK;
+        final String taskId = UUID.randomUUID().toString();
+        final int imageContentType = CinematicEffectResponse.IMAGE_CONTENT_TYPE_LANDSCAPE;
+        final Bitmap bmp = Bitmap.createBitmap(3200, 4800, Config.ARGB_8888);
+        final float[] vertices = WallpaperEffectsGenerationTestUtils.createVertices(1500000);
+        final int[] indices = WallpaperEffectsGenerationTestUtils.createIndices(1500000);
+        final int indicesLayoutType = TexturedMesh.INDICES_LAYOUT_TRIANGLES;
+        final int verticesLayoutType = TexturedMesh.VERTICES_LAYOUT_POSITION3_UV2;
+
+        final TexturedMesh texturedMesh = new TexturedMesh.Builder(bmp)
+                .setIndices(indices)
+                .setVertices(vertices)
+                .setIndicesLayoutType(indicesLayoutType)
+                .setVerticesLayoutType(verticesLayoutType).build();
+        List<TexturedMesh> texturedMeshes = new ArrayList<TexturedMesh>();
+        texturedMeshes.add(texturedMesh);
+
+        final float[] anchorPointInWorldSpace1 = new float[]{0.5f, 1.5f, -1.0f};
+        final float[] anchorPointInOutputUvSpace1 = new float[]{0.5f, 2.5f};
+        final float yaw1 = 35.2f;
+        final float pitch1 = 45.6f;
+        final float dolly1 = 0.3f;
+        final float fov1 = 60.0f;
+        final float frustumNear1 = 0.5f;
+        final float frustumFar1 = 200.0f;
+        final float[] anchorPointInWorldSpace2 = new float[]{0.6f, 1.6f, -1.1f};
+        final float[] anchorPointInOutputUvSpace2 = new float[]{0.6f, 2.6f};
+        final float yaw2 = 35.1f;
+        final float pitch2 = 45.4f;
+        final float dolly2 = 0.4f;
+        final float fov2 = 45.0f;
+        final float frustumNear2 = 0.6f;
+        final float frustumFar2 = 220.0f;
+
+        final CameraAttributes attributes1 =
+                new CameraAttributes.Builder(anchorPointInWorldSpace1,
+                        anchorPointInOutputUvSpace1)
+                        .setCameraOrbitYawDegrees(yaw1)
+                        .setCameraOrbitPitchDegrees(pitch1)
+                        .setDollyDistanceInWorldSpace(dolly1)
+                        .setVerticalFovDegrees(fov1)
+                        .setFrustumNearInWorldSpace(frustumNear1)
+                        .setFrustumFarInWorldSpace(frustumFar1)
+                        .build();
+        final CameraAttributes attributes2 =
+                new CameraAttributes.Builder(anchorPointInWorldSpace2,
+                        anchorPointInOutputUvSpace2)
+                        .setCameraOrbitYawDegrees(yaw2)
+                        .setCameraOrbitPitchDegrees(pitch2)
+                        .setDollyDistanceInWorldSpace(dolly2)
+                        .setVerticalFovDegrees(fov2)
+                        .setFrustumNearInWorldSpace(frustumNear2)
+                        .setFrustumFarInWorldSpace(frustumFar2)
+                        .build();
+
+        CinematicEffectResponse response =
+                new CinematicEffectResponse.Builder(statusCode, taskId)
+                        .setImageContentType(imageContentType)
+                        .setTexturedMeshes(texturedMeshes)
+                        .setStartKeyFrame(attributes1)
+                        .setEndKeyFrame(attributes2)
+                        .build();
+
+        /** Check the original request. */
+        assertThat(response.getStatusCode()).isEqualTo(statusCode);
+        assertThat(response.getTaskId()).isEqualTo(taskId);
+        assertThat(response.getImageContentType()).isEqualTo(imageContentType);
+
+        assertThat(response.getTexturedMeshes().size()).isEqualTo(1);
+        final TexturedMesh mesh = response.getTexturedMeshes().get(0);
+        assertThat(mesh.getBitmap()).isEqualTo(bmp);
+        assertThat(mesh.getIndices()).isEqualTo(indices);
+        assertThat(mesh.getVertices()).isEqualTo(vertices);
+        assertThat(mesh.getIndicesLayoutType()).isEqualTo(indicesLayoutType);
+        assertThat(mesh.getVerticesLayoutType()).isEqualTo(verticesLayoutType);
+
+        CameraAttributes startAttributes = response.getStartKeyFrame();
+        assertThat(startAttributes.getAnchorPointInWorldSpace()).isEqualTo(
+                anchorPointInWorldSpace1);
+        assertThat(startAttributes.getAnchorPointInOutputUvSpace()).isEqualTo(
+                anchorPointInOutputUvSpace1);
+        assertThat(startAttributes.getCameraOrbitYawDegrees()).isEqualTo(yaw1);
+        assertThat(startAttributes.getCameraOrbitPitchDegrees()).isEqualTo(pitch1);
+        assertThat(startAttributes.getDollyDistanceInWorldSpace()).isEqualTo(dolly1);
+        assertThat(startAttributes.getVerticalFovDegrees()).isEqualTo(fov1);
+        assertThat(startAttributes.getFrustumNearInWorldSpace()).isEqualTo(frustumNear1);
+        assertThat(startAttributes.getFrustumFarInWorldSpace()).isEqualTo(frustumFar1);
+
+        CameraAttributes endAttributes = response.getEndKeyFrame();
+        assertThat(endAttributes.getAnchorPointInWorldSpace()).isEqualTo(anchorPointInWorldSpace2);
+        assertThat(endAttributes.getAnchorPointInOutputUvSpace()).isEqualTo(
+                anchorPointInOutputUvSpace2);
+        assertThat(endAttributes.getCameraOrbitYawDegrees()).isEqualTo(yaw2);
+        assertThat(endAttributes.getCameraOrbitPitchDegrees()).isEqualTo(pitch2);
+        assertThat(endAttributes.getDollyDistanceInWorldSpace()).isEqualTo(dolly2);
+        assertThat(endAttributes.getVerticalFovDegrees()).isEqualTo(fov2);
+        assertThat(endAttributes.getFrustumNearInWorldSpace()).isEqualTo(frustumNear2);
+        assertThat(endAttributes.getFrustumFarInWorldSpace()).isEqualTo(frustumFar2);
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        response.writeToParcel(parcel, 0);
+        parcel.setDataPosition(0);
+        CinematicEffectResponse copy =
+                CinematicEffectResponse.CREATOR.createFromParcel(parcel);
+
+        /** Check the copied response. */
+        assertThat(copy.getStatusCode()).isEqualTo(statusCode);
+        assertThat(copy.getTaskId()).isEqualTo(taskId);
+        assertThat(copy.getImageContentType()).isEqualTo(imageContentType);
+
+        assertThat(copy.getTexturedMeshes().size()).isEqualTo(1);
+        final TexturedMesh meshCopy = copy.getTexturedMeshes().get(0);
+        assertThat(meshCopy.getBitmap().sameAs(bmp)).isTrue();
+        assertThat(meshCopy.getIndices()).isEqualTo(indices);
+        assertThat(meshCopy.getVertices()).isEqualTo(vertices);
+        assertThat(meshCopy.getIndicesLayoutType()).isEqualTo(indicesLayoutType);
+        assertThat(meshCopy.getVerticesLayoutType()).isEqualTo(verticesLayoutType);
+
+        CameraAttributes startAttributesCopy = copy.getStartKeyFrame();
+        assertThat(startAttributesCopy.getAnchorPointInWorldSpace()).isEqualTo(
+                anchorPointInWorldSpace1);
+        assertThat(startAttributesCopy.getAnchorPointInOutputUvSpace()).isEqualTo(
+                anchorPointInOutputUvSpace1);
+        assertThat(startAttributesCopy.getCameraOrbitYawDegrees()).isEqualTo(yaw1);
+        assertThat(startAttributesCopy.getCameraOrbitPitchDegrees()).isEqualTo(pitch1);
+        assertThat(startAttributesCopy.getDollyDistanceInWorldSpace()).isEqualTo(dolly1);
+        assertThat(startAttributesCopy.getVerticalFovDegrees()).isEqualTo(fov1);
+        assertThat(startAttributesCopy.getFrustumNearInWorldSpace()).isEqualTo(frustumNear1);
+        assertThat(startAttributesCopy.getFrustumFarInWorldSpace()).isEqualTo(frustumFar1);
+
+        CameraAttributes endAttributesCopy = copy.getEndKeyFrame();
+        assertThat(endAttributesCopy.getAnchorPointInWorldSpace())
+                .isEqualTo(anchorPointInWorldSpace2);
+        assertThat(endAttributesCopy.getAnchorPointInOutputUvSpace()).isEqualTo(
+                anchorPointInOutputUvSpace2);
+        assertThat(endAttributesCopy.getCameraOrbitYawDegrees()).isEqualTo(yaw2);
+        assertThat(endAttributesCopy.getCameraOrbitPitchDegrees()).isEqualTo(pitch2);
+        assertThat(endAttributesCopy.getDollyDistanceInWorldSpace()).isEqualTo(dolly2);
+        assertThat(endAttributesCopy.getVerticalFovDegrees()).isEqualTo(fov2);
+        assertThat(endAttributesCopy.getFrustumNearInWorldSpace()).isEqualTo(frustumNear2);
+        assertThat(endAttributesCopy.getFrustumFarInWorldSpace()).isEqualTo(frustumFar2);
+
+        parcel.recycle();
+    }
+}
diff --git a/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/CtsWallpaperEffectsGenerationService.java b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/CtsWallpaperEffectsGenerationService.java
new file mode 100644
index 0000000..99b49bf
--- /dev/null
+++ b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/CtsWallpaperEffectsGenerationService.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2022 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 android.wallpapereffectsgeneration.cts;
+
+import static android.app.wallpapereffectsgeneration.CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_ERROR;
+import static android.app.wallpapereffectsgeneration.CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_NOT_READY;
+import static android.app.wallpapereffectsgeneration.CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_OK;
+
+import android.app.wallpapereffectsgeneration.CinematicEffectRequest;
+import android.app.wallpapereffectsgeneration.CinematicEffectResponse;
+import android.service.wallpapereffectsgeneration.WallpaperEffectsGenerationService;
+import android.util.Log;
+
+import java.util.concurrent.CountDownLatch;
+
+/**
+ * WallpaperEffectsGenerationService implementation for cts tests.
+ */
+public class CtsWallpaperEffectsGenerationService extends WallpaperEffectsGenerationService {
+    private static final String TAG =
+            "WallpaperEffectsGenerationTest["
+                    + CtsWallpaperEffectsGenerationService.class.getSimpleName() + "]";
+    private static final boolean DEBUG = false;
+    public static final String SERVICE_NAME = "android.wallpapereffectsgeneration.cts/."
+            + CtsWallpaperEffectsGenerationService.class.getSimpleName();
+
+    private static Watcher sWatcher;
+
+    @Override
+    public void onCreate() {
+        if (DEBUG) Log.d(TAG, "CtsWallpaperEffectsGenerationService onCreate");
+        super.onCreate();
+        sWatcher.created.countDown();
+    }
+
+    @Override
+    public void onGenerateCinematicEffect(CinematicEffectRequest cinematicEffectRequest) {
+        if (DEBUG) {
+            Log.d(TAG, "onGenerateCinematicEffect taskId = "
+                    + cinematicEffectRequest.getTaskId() + ".");
+        }
+
+        sWatcher.verifier.onGenerateCinematicEffect(cinematicEffectRequest);
+
+        String taskId = cinematicEffectRequest.getTaskId();
+        if (taskId.contains("pending")) {
+            // Do nothing. Simulate it takes a long time to process.
+            return;
+        }
+        if (taskId.contains("error")) {
+            super.returnCinematicEffectResponse(
+                    createCinematicEffectResponse(taskId, CINEMATIC_EFFECT_STATUS_ERROR));
+        } else if (taskId.contains("initial")) {
+            // Use this status code to tell the difference between initial call and calls in the
+            // real test case.
+            super.returnCinematicEffectResponse(
+                    createCinematicEffectResponse(taskId, CINEMATIC_EFFECT_STATUS_NOT_READY));
+        } else {
+            super.returnCinematicEffectResponse(
+                    createCinematicEffectResponse(taskId, CINEMATIC_EFFECT_STATUS_OK));
+        }
+        sWatcher.requested.countDown();
+    }
+
+    private CinematicEffectResponse createCinematicEffectResponse(String taskId, int status) {
+        return new CinematicEffectResponse.Builder(status, taskId).build();
+    }
+
+
+    @Override
+    public void onDestroy() {
+        if (DEBUG) {
+            Log.d(TAG, "onDestroy");
+        }
+        super.onDestroy();
+        sWatcher.destroyed.countDown();
+    }
+
+    public static Watcher setWatcher() {
+        if (DEBUG) {
+            Log.d(TAG, " setWatcher");
+        }
+        if (sWatcher != null) {
+            throw new IllegalStateException("Set watcher with watcher already set");
+        }
+        sWatcher = new Watcher();
+        return sWatcher;
+    }
+
+    public static void clearWatcher() {
+        if (DEBUG) Log.d(TAG, "clearWatcher");
+        sWatcher = null;
+    }
+
+    public static final class Watcher {
+        public CountDownLatch created = new CountDownLatch(1);
+        public CountDownLatch requested = new CountDownLatch(1);
+        public CountDownLatch initialCallReturned = new CountDownLatch(1);
+        public CountDownLatch destroyed = new CountDownLatch(1);
+        public CountDownLatch okResponse = new CountDownLatch(1);
+        public CountDownLatch errorResponse = new CountDownLatch(1);
+        public CountDownLatch pendingResponse = new CountDownLatch(1);
+        public CountDownLatch tooManyRequestsResponse = new CountDownLatch(1);
+
+        /**
+         * Can be used to verify that API specific service methods are called. Not a real mock as
+         * the system isn't talking to this directly, it has calls proxied to it.
+         */
+        public CtsWallpaperEffectsGenerationService verifier;
+    }
+}
diff --git a/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/TexturedMeshTest.java b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/TexturedMeshTest.java
new file mode 100644
index 0000000..929c636
--- /dev/null
+++ b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/TexturedMeshTest.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright (C) 2022 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 android.wallpapereffectsgeneration.cts;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.app.wallpapereffectsgeneration.TexturedMesh;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.Config;
+import android.os.Parcel;
+import android.util.Log;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+/**
+ * Tests for {@link TexturedMesh}
+ *
+ * atest CtsWallpaperEffectsGenerationServiceTestCases
+ */
+
+@RunWith(AndroidJUnit4.class)
+public class TexturedMeshTest {
+    private static final String TAG = "WallpaperEffectsGenerationTest";
+
+    @Test
+    public void testCreateTexturedMeshRequest() {
+        final Bitmap bmp = Bitmap.createBitmap(3200, 4800, Config.ARGB_8888);
+        final float[] vertices = WallpaperEffectsGenerationTestUtils.createVertices(1500000);
+        final int[] indices = WallpaperEffectsGenerationTestUtils.createIndices(500000);
+        final int indicesLayoutType = TexturedMesh.INDICES_LAYOUT_TRIANGLES;
+        final int verticesLayoutType = TexturedMesh.VERTICES_LAYOUT_POSITION3_UV2;
+
+        TexturedMesh texturedMesh = new TexturedMesh.Builder(bmp)
+                .setIndices(indices)
+                .setVertices(vertices)
+                .setIndicesLayoutType(indicesLayoutType)
+                .setVerticesLayoutType(verticesLayoutType).build();
+
+        /** Check the original mesh. */
+        assertThat(texturedMesh.getBitmap()).isEqualTo(bmp);
+        assertThat(texturedMesh.getIndices()).isEqualTo(indices);
+        assertThat(texturedMesh.getVertices()).isEqualTo(vertices);
+        assertThat(texturedMesh.getIndicesLayoutType()).isEqualTo(indicesLayoutType);
+        assertThat(texturedMesh.getVerticesLayoutType()).isEqualTo(verticesLayoutType);
+
+        Parcel parcel = Parcel.obtain();
+        parcel.setDataPosition(0);
+        texturedMesh.writeToParcel(parcel, 0);
+        Log.i(TAG, "textured mesh size = " + parcel.dataSize());
+        parcel.setDataPosition(0);
+        TexturedMesh copy =
+                TexturedMesh.CREATOR.createFromParcel(parcel);
+        /** Check the copied mesh. */
+        assertThat(copy.getBitmap().sameAs(bmp)).isTrue();
+        assertThat(copy.getIndices()).isEqualTo(indices);
+        assertThat(copy.getVertices()).isEqualTo(vertices);
+        assertThat(copy.getIndicesLayoutType()).isEqualTo(indicesLayoutType);
+        assertThat(copy.getVerticesLayoutType()).isEqualTo(verticesLayoutType);
+
+        parcel.recycle();
+    }
+}
diff --git a/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/WallpaperEffectsGenerationManagerTest.java b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/WallpaperEffectsGenerationManagerTest.java
new file mode 100644
index 0000000..79bbdbb
--- /dev/null
+++ b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/WallpaperEffectsGenerationManagerTest.java
@@ -0,0 +1,244 @@
+/*
+ * Copyright (C) 2022 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.
+ */
+
+/**
+ * Tests for {@link android.app.wallpapereffectsgeneration.WallpaperEffectsGenerationManager}
+ *
+ * atest CtsWallpaperEffectsGenerationServiceTestCases
+ */
+package android.wallpapereffectsgeneration.cts;
+
+import static androidx.test.InstrumentationRegistry.getContext;
+
+import static com.android.compatibility.common.util.ShellUtils.runShellCommand;
+
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.reset;
+import static org.mockito.Mockito.timeout;
+import static org.mockito.Mockito.verify;
+
+import android.app.wallpapereffectsgeneration.CinematicEffectRequest;
+import android.app.wallpapereffectsgeneration.CinematicEffectResponse;
+import android.app.wallpapereffectsgeneration.WallpaperEffectsGenerationManager;
+import android.app.wallpapereffectsgeneration.WallpaperEffectsGenerationManager.CinematicEffectListener;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.os.Process;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.test.runner.AndroidJUnit4;
+
+import com.android.compatibility.common.util.RequiredServiceRule;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Tests for {@link WallpaperEffectsGenerationManager}
+ *
+ * atest CtsWallpaperEffectsGenerationServiceTestCases
+ */
+
+@RunWith(AndroidJUnit4.class)
+public class WallpaperEffectsGenerationManagerTest {
+    private static final String TAG = "WallpaperEffectsGenerationTest";
+    private static final boolean DEBUG = false;
+    private static final long VERIFY_TIMEOUT_MS = 5_000;
+    private static final long SERVICE_LIFECYCLE_TIMEOUT_MS = 20_000;
+
+    @Rule
+    public final RequiredServiceRule mRequiredServiceRule =
+            new RequiredServiceRule(Context.WALLPAPER_EFFECTS_GENERATION_SERVICE);
+
+    private WallpaperEffectsGenerationManager mManager;
+    private CtsWallpaperEffectsGenerationService.Watcher mWatcher;
+    private CinematicEffectRequest mInitialTaskRequest =
+            createCinematicEffectRequest("initial-task");
+
+    @Before
+    public void setup() throws Exception {
+        mWatcher = CtsWallpaperEffectsGenerationService.setWatcher();
+        mManager = getContext().getSystemService(WallpaperEffectsGenerationManager.class);
+        setService(CtsWallpaperEffectsGenerationService.SERVICE_NAME);
+        // The wallpaper effects generation services are created lazily,
+        // call one method to start the service for these tests.
+        mWatcher.verifier = Mockito.mock(CtsWallpaperEffectsGenerationService.class);
+        reset(mWatcher.verifier);
+        mManager.generateCinematicEffect(mInitialTaskRequest,
+                Executors.newSingleThreadExecutor(),
+                createCinematicEffectListener());
+        await(mWatcher.created, "Waiting for onCreated()");
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        setService(null);
+        await(mWatcher.destroyed, "Waiting for onDestroyed()");
+        mWatcher = null;
+        CtsWallpaperEffectsGenerationService.clearWatcher();
+    }
+
+    @Test
+    public void testWallpaperEffectsGenerationServiceConnection() {
+        // In test setup, 1st request is already made.
+        assertNotNull(mManager);
+        // Check the 1st call in setup was received by service.
+        await(mWatcher.requested, "Waiting for requested.");
+        await(mWatcher.initialCallReturned, "Result is produced");
+        // Check the request the server received is the request sent.
+        verifyService().onGenerateCinematicEffect(eq(mInitialTaskRequest));
+    }
+
+    @Test
+    public void testGenerateCinematicEffect_okResponse() {
+        mWatcher.verifier = Mockito.mock(CtsWallpaperEffectsGenerationService.class);
+        reset(mWatcher.verifier);
+        assertNotNull(mManager);
+        // Let the initial request in setup finishes.
+        await(mWatcher.requested, "Waiting for connect call finishes.");
+        CinematicEffectRequest request = createSimpleCinematicEffectRequest("ok-task");
+
+        mManager.generateCinematicEffect(request, Executors.newSingleThreadExecutor(),
+                createCinematicEffectListener());
+        await(mWatcher.okResponse, "Result is okay");
+        verifyService().onGenerateCinematicEffect(eq(request));
+    }
+
+    @Test
+    public void testGenerateCinematicEffect_errorResponse() {
+        mWatcher.verifier = Mockito.mock(CtsWallpaperEffectsGenerationService.class);
+        reset(mWatcher.verifier);
+        assertNotNull(mManager);
+        // Let the initial request in setup finishes.
+        await(mWatcher.initialCallReturned, "Waiting for connect call finishes.");
+        CinematicEffectRequest request = createSimpleCinematicEffectRequest("error-task");
+        mManager.generateCinematicEffect(request, Executors.newSingleThreadExecutor(),
+                createCinematicEffectListener());
+        await(mWatcher.errorResponse, "Result is error");
+        verifyService().onGenerateCinematicEffect(eq(request));
+    }
+
+    @Test
+    public void testGenerateCinematicEffect_pendingResponse() {
+        mWatcher.verifier = Mockito.mock(CtsWallpaperEffectsGenerationService.class);
+        reset(mWatcher.verifier);
+        assertNotNull(mManager);
+        // Let the initial request in setup finishes.
+        await(mWatcher.initialCallReturned, "Waiting for requested call finishes.");
+        CinematicEffectRequest request1 = createCinematicEffectRequest("pending-task-id");
+        CinematicEffectRequest request2 = createCinematicEffectRequest("pending-task-id");
+        mManager.generateCinematicEffect(request1, Executors.newSingleThreadExecutor(),
+                createCinematicEffectListener());
+        mManager.generateCinematicEffect(request2, Executors.newSingleThreadExecutor(),
+                createCinematicEffectListener());
+        await(mWatcher.pendingResponse, "Second request immediately fail with pending response");
+    }
+
+    @Test
+    public void testGenerateCinematicEffect_tooManyRequestsResponse() {
+        mWatcher.verifier = Mockito.mock(CtsWallpaperEffectsGenerationService.class);
+        reset(mWatcher.verifier);
+        assertNotNull(mManager);
+        // Let the initial request in setup finishes.
+        await(mWatcher.initialCallReturned, "Waiting for connect call finishes.");
+        CinematicEffectRequest request1 = createCinematicEffectRequest("pending-task-id");
+        CinematicEffectRequest request2 = createCinematicEffectRequest("other-task-id");
+        mManager.generateCinematicEffect(request1, Executors.newSingleThreadExecutor(),
+                createCinematicEffectListener());
+        mManager.generateCinematicEffect(request2, Executors.newSingleThreadExecutor(),
+                createCinematicEffectListener());
+        await(mWatcher.tooManyRequestsResponse,
+                "Second request immediately fail with too many requests response");
+    }
+
+    private CinematicEffectListener createCinematicEffectListener() {
+        return cinematicEffectResponse -> {
+            Log.d(TAG, "cinematic effect response taskId = " + cinematicEffectResponse.getTaskId()
+                    + ", status code = " + cinematicEffectResponse.getStatusCode());
+            if (cinematicEffectResponse.getStatusCode()
+                    == CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_OK) {
+                mWatcher.okResponse.countDown();
+            } else if (cinematicEffectResponse.getStatusCode()
+                    == CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_PENDING) {
+                mWatcher.pendingResponse.countDown();
+            } else if (cinematicEffectResponse.getStatusCode()
+                    == CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_TOO_MANY_REQUESTS) {
+                mWatcher.tooManyRequestsResponse.countDown();
+            } else if (cinematicEffectResponse.getStatusCode()
+                    == CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_NOT_READY) {
+                // This case is used to check the 1st request in the "Setup" method finishes.
+                mWatcher.initialCallReturned.countDown();
+            } else if (cinematicEffectResponse.getStatusCode()
+                    == CinematicEffectResponse.CINEMATIC_EFFECT_STATUS_ERROR) {
+                mWatcher.errorResponse.countDown();
+            }
+        };
+    }
+
+    private CinematicEffectRequest createCinematicEffectRequest(String taskId) {
+        Bitmap bmp = Bitmap.createBitmap(32, 48, Bitmap.Config.ARGB_8888);
+        return new CinematicEffectRequest(taskId, bmp);
+    }
+
+    private CtsWallpaperEffectsGenerationService verifyService() {
+        return verify(mWatcher.verifier, timeout(VERIFY_TIMEOUT_MS));
+    }
+
+    private void setService(String service) {
+        if (DEBUG) {
+            Log.d(TAG, "Setting WallpaperEffectsGeneration service to " + service);
+        }
+        int userId = Process.myUserHandle().getIdentifier();
+        String shellCommand = "";
+        if (service != null) {
+            shellCommand = "cmd wallpaper_effects_generation set temporary-service "
+                    + userId + " " + service + " 60000";
+        } else {
+            shellCommand = "cmd wallpaper_effects_generation set temporary-service " + userId;
+        }
+        if (DEBUG) {
+            Log.d(TAG, "runShellCommand(): " + shellCommand);
+        }
+        runShellCommand(shellCommand);
+    }
+
+    private void await(@NonNull CountDownLatch latch, @NonNull String message) {
+        try {
+            assertWithMessage(message).that(
+                    latch.await(SERVICE_LIFECYCLE_TIMEOUT_MS, TimeUnit.MILLISECONDS)).isTrue();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new IllegalStateException("Interrupted while: " + message);
+        }
+    }
+
+    private CinematicEffectRequest createSimpleCinematicEffectRequest(String taskId) {
+        return new CinematicEffectRequest(taskId,
+                Bitmap.createBitmap(32, 48, Bitmap.Config.ARGB_8888));
+    }
+}
diff --git a/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/WallpaperEffectsGenerationTestUtils.java b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/WallpaperEffectsGenerationTestUtils.java
new file mode 100644
index 0000000..50462d4
--- /dev/null
+++ b/tests/wallpapereffectsgeneration/src/android/wallpapereffectsgeneration/cts/WallpaperEffectsGenerationTestUtils.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2022 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 android.wallpapereffectsgeneration.cts;
+
+public class WallpaperEffectsGenerationTestUtils {
+
+    public static float[] createVertices(int verticesNum) {
+        float[] vertices = new float[verticesNum];
+        for (int i = 0; i < verticesNum; i++) {
+            vertices[i] = (float) i;
+        }
+        return vertices;
+    }
+
+    public static int[] createIndices(int indicesNum) {
+        int[] indices = new int[indicesNum];
+        for (int i = 0; i < indicesNum; i++) {
+            indices[i] =  i;
+        }
+        return indices;
+    }
+}
diff --git a/tools/cts-device-info/Android.bp b/tools/cts-device-info/Android.bp
index 3196fdd..8733a64 100644
--- a/tools/cts-device-info/Android.bp
+++ b/tools/cts-device-info/Android.bp
@@ -73,6 +73,8 @@
         " -a com.android.compatibility.common.deviceinfo.GenericDeviceInfo " +
         " -a com.android.compatibility.common.deviceinfo.GlesStubActivity " +
         " -a com.android.compatibility.common.deviceinfo.GraphicsDeviceInfo " +
+        " -a com.android.compatibility.common.deviceinfo.HapticsDeviceInfo " +
+        " -a com.android.compatibility.common.deviceinfo.InputDeviceInfo " +
         " -a com.android.compatibility.common.deviceinfo.LocaleDeviceInfo " +
         " -a com.android.compatibility.common.deviceinfo.MediaDeviceInfo " +
         " -a com.android.compatibility.common.deviceinfo.MemoryDeviceInfo " +
diff --git a/tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java b/tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java
index 4a12d70..d1161f6 100644
--- a/tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java
+++ b/tools/cts-device-info/src/com/android/cts/deviceinfo/CameraDeviceInfo.java
@@ -637,6 +637,8 @@
         charsKeyNames.add(CameraCharacteristics.CONTROL_ZOOM_RATIO_RANGE.getName());
         charsKeyNames.add(CameraCharacteristics.EDGE_AVAILABLE_EDGE_MODES.getName());
         charsKeyNames.add(CameraCharacteristics.FLASH_INFO_AVAILABLE.getName());
+        charsKeyNames.add(CameraCharacteristics.FLASH_INFO_STRENGTH_MAXIMUM_LEVEL.getName());
+        charsKeyNames.add(CameraCharacteristics.FLASH_INFO_STRENGTH_DEFAULT_LEVEL.getName());
         charsKeyNames.add(CameraCharacteristics.HOT_PIXEL_AVAILABLE_HOT_PIXEL_MODES.getName());
         charsKeyNames.add(CameraCharacteristics.JPEG_AVAILABLE_THUMBNAIL_SIZES.getName());
         charsKeyNames.add(CameraCharacteristics.LENS_FACING.getName());
@@ -658,6 +660,8 @@
         charsKeyNames.add(CameraCharacteristics.REQUEST_PIPELINE_MAX_DEPTH.getName());
         charsKeyNames.add(CameraCharacteristics.REQUEST_PARTIAL_RESULT_COUNT.getName());
         charsKeyNames.add(CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES.getName());
+        charsKeyNames.add(CameraCharacteristics.REQUEST_AVAILABLE_DYNAMIC_RANGE_PROFILES.getName());
+        charsKeyNames.add(CameraCharacteristics.REQUEST_RECOMMENDED_TEN_BIT_DYNAMIC_RANGE_PROFILE.getName());
         charsKeyNames.add(CameraCharacteristics.SCALER_AVAILABLE_MAX_DIGITAL_ZOOM.getName());
         charsKeyNames.add(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP.getName());
         charsKeyNames.add(CameraCharacteristics.SCALER_CROPPING_TYPE.getName());
@@ -668,6 +672,10 @@
         charsKeyNames.add(CameraCharacteristics.SCALER_MULTI_RESOLUTION_STREAM_CONFIGURATION_MAP.getName());
         charsKeyNames.add(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP_MAXIMUM_RESOLUTION.getName());
         charsKeyNames.add(CameraCharacteristics.SCALER_MANDATORY_MAXIMUM_RESOLUTION_STREAM_COMBINATIONS.getName());
+        charsKeyNames.add(CameraCharacteristics.SCALER_MANDATORY_TEN_BIT_OUTPUT_STREAM_COMBINATIONS.getName());
+        charsKeyNames.add(CameraCharacteristics.SCALER_MANDATORY_PREVIEW_STABILIZATION_OUTPUT_STREAM_COMBINATIONS.getName());
+        charsKeyNames.add(CameraCharacteristics.SCALER_AVAILABLE_STREAM_USE_CASES.getName());
+        charsKeyNames.add(CameraCharacteristics.SCALER_MANDATORY_USE_CASE_STREAM_COMBINATIONS.getName());
         charsKeyNames.add(CameraCharacteristics.SENSOR_REFERENCE_ILLUMINANT1.getName());
         charsKeyNames.add(CameraCharacteristics.SENSOR_REFERENCE_ILLUMINANT2.getName());
         charsKeyNames.add(CameraCharacteristics.SENSOR_CALIBRATION_TRANSFORM1.getName());
@@ -712,6 +720,8 @@
         charsKeyNames.add(CameraCharacteristics.DEPTH_DEPTH_IS_EXCLUSIVE.getName());
         charsKeyNames.add(CameraCharacteristics.LOGICAL_MULTI_CAMERA_SENSOR_SYNC_TYPE.getName());
         charsKeyNames.add(CameraCharacteristics.DISTORTION_CORRECTION_AVAILABLE_MODES.getName());
+        charsKeyNames.add(CameraCharacteristics.AUTOMOTIVE_LOCATION.getName());
+        charsKeyNames.add(CameraCharacteristics.AUTOMOTIVE_LENS_FACING.getName());
 
         return charsKeyNames;
     }
diff --git a/tools/cts-tradefed/OWNERS b/tools/cts-tradefed/OWNERS
index 790c317..d27cf19 100644
--- a/tools/cts-tradefed/OWNERS
+++ b/tools/cts-tradefed/OWNERS
@@ -1,6 +1,5 @@
 #  Android EngProd Approvers
 guangzhu@google.com
-fdeng@google.com
 normancheung@google.com
 jdesprez@google.com
 
@@ -15,4 +14,4 @@
 per-file cts-on-csi*.xml = ycchen@google.com, hsinyichen@google.com, tyanh@google.com
 per-file csi-*.xml = ycchen@google.com, hsinyichen@google.com, tyanh@google.com
 per-file cts-on-gsi*.xml = bettyzhou@google.com, ycchen@google.com, hsinyichen@google.com, tyanh@google.com
-
+per-file cts-known-failures.xml = rossyeh@google.com, mariay@google.com, robinjacob@google.com
diff --git a/tools/cts-tradefed/res/config/cts-known-failures.xml b/tools/cts-tradefed/res/config/cts-known-failures.xml
index 46f96ca..1da1953 100644
--- a/tools/cts-tradefed/res/config/cts-known-failures.xml
+++ b/tools/cts-tradefed/res/config/cts-known-failures.xml
@@ -255,22 +255,7 @@
     <option name="compatibility:exclude-filter" value="CtsDevicePolicyManagerTestCases com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testSetCameraDisabledLogged" />
     <option name="compatibility:exclude-filter" value="CtsDevicePolicyManagerTestCases com.android.cts.devicepolicy.MixedProfileOwnerTest#testSetCameraDisabledLogged" />
 
-    <!-- b/204721335 -->
-    <option name="compatibility:exclude-filter" value="CtsWindowManagerJetpackTestCases android.server.wm.jetpack.SidecarTest#testSidecarInterface_onWindowLayoutChangeListener" />
-    <option name="compatibility:exclude-filter" value="CtsWindowManagerJetpackTestCases android.server.wm.jetpack.SidecarTest#testSidecarInterface_getWindowLayoutInfo" />
-
-    <!-- b/209382234 -->
-    <option name="compatibility:exclude-filter" value="CtsDevicePolicyTestCases android.devicepolicy.cts.KeyManagementTest" />
-    <option name="compatibility:exclude-filter" value="CtsDevicePolicyTestCases[run-on-work-profile] android.devicepolicy.cts.KeyManagementTest" />
-    <option name="compatibility:exclude-filter" value="CtsDevicePolicyTestCases[run-on-secondary-user] android.devicepolicy.cts.KeyManagementTest" />
-
-    <!-- b/203177211 -->
-    <option name="compatibility:exclude-filter" value="CtsAppSecurityHostTestCases android.appsecurity.cts.ListeningPortsTest#testNoRemotelyAccessibleListeningUdpPorts" />
-
-  <!-- b/182630972, b/214019488 -->
+    <!-- b/182630972, b/214019488 -->
     <option name="compatibility:exclude-filter" value="CtsWindowManagerDeviceTestCases android.server.wm.PinnedStackTests#testEnterPipWithMinimalSize" />
 
-    <!-- b/205492302 -->
-    <option name="compatibility:exclude-filter" value="CtsDevicePolicyManagerTestCases com.android.cts.devicepolicy.OrgOwnedProfileOwnerTest#testSetCameraDisabled" />
-
 </configuration>
diff --git a/tools/cts-tradefed/res/config/cts-on-gsi-exclude-non-hal.xml b/tools/cts-tradefed/res/config/cts-on-gsi-exclude-non-hal.xml
index 76e93f3c..d3a4100 100644
--- a/tools/cts-tradefed/res/config/cts-on-gsi-exclude-non-hal.xml
+++ b/tools/cts-tradefed/res/config/cts-on-gsi-exclude-non-hal.xml
@@ -64,7 +64,6 @@
     <option name="compatibility:exclude-filter" value="CtsClassLoaderFactoryInMemoryDexClassLoaderTestCases" />
     <option name="compatibility:exclude-filter" value="CtsClassLoaderFactoryPathClassLoaderTestCases" />
     <option name="compatibility:exclude-filter" value="CtsClassloaderSplitsHostTestCases" />
-    <option name="compatibility:exclude-filter" value="CtsCodePathHostTestCases" />
     <option name="compatibility:exclude-filter" value="CtsCompilationTestCases" />
     <option name="compatibility:exclude-filter" value="CtsContactsProviderTestCases" />
     <option name="compatibility:exclude-filter" value="CtsContactsProviderWipe" />
@@ -218,6 +217,7 @@
     <option name="compatibility:exclude-filter" value="CtsPackageInstallAppOpDeniedTestCases" />
     <option name="compatibility:exclude-filter" value="CtsPackageInstallerTapjackingTestCases" />
     <option name="compatibility:exclude-filter" value="CtsPackageInstallTestCases" />
+    <option name="compatibility:exclude-filter" value="CtsPackageSettingHostTestCases" />
     <option name="compatibility:exclude-filter" value="CtsPackageUninstallTestCases" />
     <option name="compatibility:exclude-filter" value="CtsPackageWatchdogTestCases" />
     <option name="compatibility:exclude-filter" value="CtsProtoTestCases" />
diff --git a/tools/cts-tradefed/res/config/cts-on-gsi-exclude.xml b/tools/cts-tradefed/res/config/cts-on-gsi-exclude.xml
index d07400f..16287c5 100644
--- a/tools/cts-tradefed/res/config/cts-on-gsi-exclude.xml
+++ b/tools/cts-tradefed/res/config/cts-on-gsi-exclude.xml
@@ -70,6 +70,7 @@
 
     <!-- b/183234756, b/80388296, b/110260628, b/159295445, b/159294948 CtsDevicePolicyManagerTestCases -->
     <option name="compatibility:exclude-filter" value="CtsDevicePolicyManagerTestCases" />
+    <option name="compatibility:exclude-filter" value="CtsDevicePolicyTestCases" />
 
     <!-- b/183985653 -->
     <option name="compatibility:module-arg" value="CtsDeqpTestCases:include-filter:dEQP-EGL.*" />
@@ -77,8 +78,8 @@
     <option name="compatibility:module-arg" value="CtsDeqpTestCases:include-filter:dEQP-GLES3.functional.prerequisite#*" />
     <option name="compatibility:module-arg" value="CtsDeqpTestCases:include-filter:dEQP-VK.api.smoke#*" />
 
-    <!-- b/183659262 Remove CtsPreferenceTestCases from cts-on-gsi -->
-    <option name="compatibility:exclude-filter" value="CtsPreferenceTestCases" />
+    <!-- b/183636777 Remove CtsShortcutManagerPackage4 from cts-on-gsi -->
+    <option name="compatibility:exclude-filter" value="CtsShortcutManagerPackage4" />
 
     <!-- b/185451791. Can't have single overlay package for both AOSP version and Google-signed mainline modules -->
     <option name="compatibility:exclude-filter" value="CtsWifiTestCases android.net.wifi.cts.ConcurrencyTest#testPersistentGroupOperation" />
@@ -102,9 +103,5 @@
     <!-- b/203177211 -->
     <option name="compatibility:exclude-filter" value="CtsAppSecurityHostTestCases android.appsecurity.cts.ListeningPortsTest#testNoRemotelyAccessibleListeningUdpPorts" />
 
-    <!-- b/212223944 -->
-    <option name="compatibility:exclude-filter" value="CtsViewTestCases android.view.cts.ASurfaceControlTest#testSurfaceTransaction_setDesiredPresentTime_30ms" />
-    <option name="compatibility:exclude-filter" value="CtsViewTestCases android.view.cts.ASurfaceControlTest#testSurfaceTransaction_setDesiredPresentTime_100ms" />
-
 
 </configuration>
diff --git a/tools/cts-tradefed/res/config/cts-sim-include.xml b/tools/cts-tradefed/res/config/cts-sim-include.xml
index 656c008..522c8761 100644
--- a/tools/cts-tradefed/res/config/cts-sim-include.xml
+++ b/tools/cts-tradefed/res/config/cts-sim-include.xml
@@ -40,7 +40,6 @@
     <option name="compatibility:include-filter" value="CtsTelephonyTestCases" />
     <option name="compatibility:include-filter" value="CtsTelephony2TestCases" />
     <option name="compatibility:include-filter" value="CtsTelephony3TestCases" />
-    <option name="compatibility:include-filter" value="CtsTelephonySdk28TestCases" />
     <option name="compatibility:include-filter" value="CtsTetheringTest" />
     <option name="compatibility:include-filter" value="CtsUsageStatsTestCases" />
     <option name="compatibility:include-filter" value="CtsVcnTestCases" />
diff --git a/tools/cts-tradefed/res/config/cts-validation-exclude.xml b/tools/cts-tradefed/res/config/cts-validation-exclude.xml
index d24d281..b389c27 100644
--- a/tools/cts-tradefed/res/config/cts-validation-exclude.xml
+++ b/tools/cts-tradefed/res/config/cts-validation-exclude.xml
@@ -96,7 +96,7 @@
     <option name="compatibility:exclude-filter" value="CtsDeviceIdleHostTestCases" />
     <option name="compatibility:exclude-filter" value="CtsLegacyNotification27TestCases" />
     <option name="compatibility:exclude-filter" value="CtsAppEnumerationTestCases" />
-    <option name="compatibility:exclude-filter" value="CtsCodePathHostTestCases" />
+    <option name="compatibility:exclude-filter" value="CtsPackageSettingHostTestCases" />
     <option name="compatibility:exclude-filter" value="CtsAccessibilityTestCases" />
     <option name="compatibility:exclude-filter" value="CtsTvTestCases" />
     <option name="compatibility:exclude-filter" value="CtsSettingsHostTestCases" />